27753 files changed, 44156 insertions, 3541 deletions

diff --git a/src/test/COMPILER_TESTS.md b/tests/COMPILER_TESTS.md
index ea540bd0b..ea540bd0b 100644
--- a/src/test/COMPILER_TESTS.md
+++ b/tests/COMPILER_TESTS.md
diff --git a/src/test/assembly/aarch64-naked-fn-no-bti-prolog.rs b/tests/assembly/aarch64-naked-fn-no-bti-prolog.rs
index 79b0bb2d7..79b0bb2d7 100644
--- a/src/test/assembly/aarch64-naked-fn-no-bti-prolog.rs
+++ b/tests/assembly/aarch64-naked-fn-no-bti-prolog.rs
diff --git a/src/test/assembly/aarch64-pointer-auth.rs b/tests/assembly/aarch64-pointer-auth.rs
index da14cd026..da14cd026 100644
--- a/src/test/assembly/aarch64-pointer-auth.rs
+++ b/tests/assembly/aarch64-pointer-auth.rs
diff --git a/src/test/assembly/align_offset.rs b/tests/assembly/align_offset.rs
index c5eefca34..c5eefca34 100644
--- a/src/test/assembly/align_offset.rs
+++ b/tests/assembly/align_offset.rs
diff --git a/src/test/assembly/asm/aarch64-el2vmsa.rs b/tests/assembly/asm/aarch64-el2vmsa.rs
index 1908ffb8f..1908ffb8f 100644
--- a/src/test/assembly/asm/aarch64-el2vmsa.rs
+++ b/tests/assembly/asm/aarch64-el2vmsa.rs
diff --git a/src/test/assembly/asm/aarch64-modifiers.rs b/tests/assembly/asm/aarch64-modifiers.rs
index 5196aa9fa..5196aa9fa 100644
--- a/src/test/assembly/asm/aarch64-modifiers.rs
+++ b/tests/assembly/asm/aarch64-modifiers.rs
diff --git a/src/test/assembly/asm/aarch64-outline-atomics.rs b/tests/assembly/asm/aarch64-outline-atomics.rs
index c2ec4e911..c2ec4e911 100644
--- a/src/test/assembly/asm/aarch64-outline-atomics.rs
+++ b/tests/assembly/asm/aarch64-outline-atomics.rs
diff --git a/src/test/assembly/asm/aarch64-types.rs b/tests/assembly/asm/aarch64-types.rs
index 66c39a48c..66c39a48c 100644
--- a/src/test/assembly/asm/aarch64-types.rs
+++ b/tests/assembly/asm/aarch64-types.rs
diff --git a/src/test/assembly/asm/arm-modifiers.rs b/tests/assembly/asm/arm-modifiers.rs
index 88ffeaecf..88ffeaecf 100644
--- a/src/test/assembly/asm/arm-modifiers.rs
+++ b/tests/assembly/asm/arm-modifiers.rs
diff --git a/src/test/assembly/asm/arm-types.rs b/tests/assembly/asm/arm-types.rs
index b22a26ce3..b22a26ce3 100644
--- a/src/test/assembly/asm/arm-types.rs
+++ b/tests/assembly/asm/arm-types.rs
diff --git a/src/test/assembly/asm/avr-modifiers.rs b/tests/assembly/asm/avr-modifiers.rs
index ffdc8f2e3..ffdc8f2e3 100644
--- a/src/test/assembly/asm/avr-modifiers.rs
+++ b/tests/assembly/asm/avr-modifiers.rs
diff --git a/src/test/assembly/asm/avr-types.rs b/tests/assembly/asm/avr-types.rs
index b2d11a882..b2d11a882 100644
--- a/src/test/assembly/asm/avr-types.rs
+++ b/tests/assembly/asm/avr-types.rs
diff --git a/src/test/assembly/asm/bpf-types.rs b/tests/assembly/asm/bpf-types.rs
index e177b8d0d..e177b8d0d 100644
--- a/src/test/assembly/asm/bpf-types.rs
+++ b/tests/assembly/asm/bpf-types.rs
diff --git a/src/test/assembly/asm/global_asm.rs b/tests/assembly/asm/global_asm.rs
index 0b361a7ed..0b361a7ed 100644
--- a/src/test/assembly/asm/global_asm.rs
+++ b/tests/assembly/asm/global_asm.rs
diff --git a/src/test/assembly/asm/hexagon-types.rs b/tests/assembly/asm/hexagon-types.rs
index af16faedb..af16faedb 100644
--- a/src/test/assembly/asm/hexagon-types.rs
+++ b/tests/assembly/asm/hexagon-types.rs
diff --git a/src/test/assembly/asm/mips-types.rs b/tests/assembly/asm/mips-types.rs
index 6aa28b062..6aa28b062 100644
--- a/src/test/assembly/asm/mips-types.rs
+++ b/tests/assembly/asm/mips-types.rs
diff --git a/src/test/assembly/asm/msp430-types.rs b/tests/assembly/asm/msp430-types.rs
index 2c73b3b09..2c73b3b09 100644
--- a/src/test/assembly/asm/msp430-types.rs
+++ b/tests/assembly/asm/msp430-types.rs
diff --git a/src/test/assembly/asm/nvptx-types.rs b/tests/assembly/asm/nvptx-types.rs
index c319946b5..c319946b5 100644
--- a/src/test/assembly/asm/nvptx-types.rs
+++ b/tests/assembly/asm/nvptx-types.rs
diff --git a/src/test/assembly/asm/powerpc-types.rs b/tests/assembly/asm/powerpc-types.rs
index e27b00520..e27b00520 100644
--- a/src/test/assembly/asm/powerpc-types.rs
+++ b/tests/assembly/asm/powerpc-types.rs
diff --git a/src/test/assembly/asm/riscv-types.rs b/tests/assembly/asm/riscv-types.rs
index f18ba294d..f18ba294d 100644
--- a/src/test/assembly/asm/riscv-types.rs
+++ b/tests/assembly/asm/riscv-types.rs
diff --git a/src/test/assembly/asm/s390x-types.rs b/tests/assembly/asm/s390x-types.rs
index 2fb404dd9..2fb404dd9 100644
--- a/src/test/assembly/asm/s390x-types.rs
+++ b/tests/assembly/asm/s390x-types.rs
diff --git a/src/test/assembly/asm/wasm-types.rs b/tests/assembly/asm/wasm-types.rs
index 3b1ac1b45..3b1ac1b45 100644
--- a/src/test/assembly/asm/wasm-types.rs
+++ b/tests/assembly/asm/wasm-types.rs
diff --git a/src/test/assembly/asm/x86-modifiers.rs b/tests/assembly/asm/x86-modifiers.rs
index 574fdf12c..574fdf12c 100644
--- a/src/test/assembly/asm/x86-modifiers.rs
+++ b/tests/assembly/asm/x86-modifiers.rs
diff --git a/src/test/assembly/asm/x86-types.rs b/tests/assembly/asm/x86-types.rs
index 81be79cba..81be79cba 100644
--- a/src/test/assembly/asm/x86-types.rs
+++ b/tests/assembly/asm/x86-types.rs
diff --git a/src/test/assembly/auxiliary/breakpoint-panic-handler.rs b/tests/assembly/auxiliary/breakpoint-panic-handler.rs
index d54c1181e..d54c1181e 100644
--- a/src/test/assembly/auxiliary/breakpoint-panic-handler.rs
+++ b/tests/assembly/auxiliary/breakpoint-panic-handler.rs
diff --git a/src/test/assembly/auxiliary/non-inline-dependency.rs b/tests/assembly/auxiliary/non-inline-dependency.rs
index 57f3ee87c..57f3ee87c 100644
--- a/src/test/assembly/auxiliary/non-inline-dependency.rs
+++ b/tests/assembly/auxiliary/non-inline-dependency.rs
diff --git a/src/test/assembly/dwarf5.rs b/tests/assembly/dwarf5.rs
index f41e6bd55..f41e6bd55 100644
--- a/src/test/assembly/dwarf5.rs
+++ b/tests/assembly/dwarf5.rs
diff --git a/src/test/assembly/is_aligned.rs b/tests/assembly/is_aligned.rs
index 04b5de834..620a3da94 100644
--- a/src/test/assembly/is_aligned.rs
+++ b/tests/assembly/is_aligned.rs
@@ -1,5 +1,5 @@
 // assembly-output: emit-asm
-// min-llvm-version: 14.0
+// min-llvm-version: 15.0
 // only-x86_64
 // revisions: opt-speed opt-size
 // [opt-speed] compile-flags: -Copt-level=1
diff --git a/src/test/assembly/niche-prefer-zero.rs b/tests/assembly/niche-prefer-zero.rs
index 0ab37a618..0ab37a618 100644
--- a/src/test/assembly/niche-prefer-zero.rs
+++ b/tests/assembly/niche-prefer-zero.rs
diff --git a/src/test/assembly/nvptx-arch-default.rs b/tests/assembly/nvptx-arch-default.rs
index 8a71a6370..8a71a6370 100644
--- a/src/test/assembly/nvptx-arch-default.rs
+++ b/tests/assembly/nvptx-arch-default.rs
diff --git a/src/test/assembly/nvptx-arch-emit-asm.rs b/tests/assembly/nvptx-arch-emit-asm.rs
index b252b450f..b252b450f 100644
--- a/src/test/assembly/nvptx-arch-emit-asm.rs
+++ b/tests/assembly/nvptx-arch-emit-asm.rs
diff --git a/src/test/assembly/nvptx-arch-link-arg.rs b/tests/assembly/nvptx-arch-link-arg.rs
index 025a9ad49..025a9ad49 100644
--- a/src/test/assembly/nvptx-arch-link-arg.rs
+++ b/tests/assembly/nvptx-arch-link-arg.rs
diff --git a/src/test/assembly/nvptx-arch-target-cpu.rs b/tests/assembly/nvptx-arch-target-cpu.rs
index 824ee9cd8..824ee9cd8 100644
--- a/src/test/assembly/nvptx-arch-target-cpu.rs
+++ b/tests/assembly/nvptx-arch-target-cpu.rs
diff --git a/src/test/assembly/nvptx-atomics.rs b/tests/assembly/nvptx-atomics.rs
index f96398064..f96398064 100644
--- a/src/test/assembly/nvptx-atomics.rs
+++ b/tests/assembly/nvptx-atomics.rs
diff --git a/src/test/assembly/nvptx-internalizing.rs b/tests/assembly/nvptx-internalizing.rs
index 0004fcea7..0004fcea7 100644
--- a/src/test/assembly/nvptx-internalizing.rs
+++ b/tests/assembly/nvptx-internalizing.rs
diff --git a/src/test/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs b/tests/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs
index 5bf44f949..5bf44f949 100644
--- a/src/test/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs
+++ b/tests/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs
diff --git a/src/test/assembly/nvptx-linking-binary.rs b/tests/assembly/nvptx-linking-binary.rs
index 64b9c2f17..64b9c2f17 100644
--- a/src/test/assembly/nvptx-linking-binary.rs
+++ b/tests/assembly/nvptx-linking-binary.rs
diff --git a/src/test/assembly/nvptx-linking-cdylib.rs b/tests/assembly/nvptx-linking-cdylib.rs
index bdbc30ea9..bdbc30ea9 100644
--- a/src/test/assembly/nvptx-linking-cdylib.rs
+++ b/tests/assembly/nvptx-linking-cdylib.rs
diff --git a/src/test/assembly/nvptx-safe-naming.rs b/tests/assembly/nvptx-safe-naming.rs
index 80bb04fc0..80bb04fc0 100644
--- a/src/test/assembly/nvptx-safe-naming.rs
+++ b/tests/assembly/nvptx-safe-naming.rs
diff --git a/src/test/assembly/panic-no-unwind-no-uwtable.rs b/tests/assembly/panic-no-unwind-no-uwtable.rs
index 499d4e698..499d4e698 100644
--- a/src/test/assembly/panic-no-unwind-no-uwtable.rs
+++ b/tests/assembly/panic-no-unwind-no-uwtable.rs
diff --git a/src/test/assembly/panic-unwind-no-uwtable.rs b/tests/assembly/panic-unwind-no-uwtable.rs
index 8eed72b2f..8eed72b2f 100644
--- a/src/test/assembly/panic-unwind-no-uwtable.rs
+++ b/tests/assembly/panic-unwind-no-uwtable.rs
diff --git a/src/test/assembly/pic-relocation-model.rs b/tests/assembly/pic-relocation-model.rs
index 72471ffcd..72471ffcd 100644
--- a/src/test/assembly/pic-relocation-model.rs
+++ b/tests/assembly/pic-relocation-model.rs
diff --git a/src/test/assembly/pie-relocation-model.rs b/tests/assembly/pie-relocation-model.rs
index e40797e03..e40797e03 100644
--- a/src/test/assembly/pie-relocation-model.rs
+++ b/tests/assembly/pie-relocation-model.rs
diff --git a/src/test/assembly/sparc-struct-abi.rs b/tests/assembly/sparc-struct-abi.rs
index 6309dd420..6309dd420 100644
--- a/src/test/assembly/sparc-struct-abi.rs
+++ b/tests/assembly/sparc-struct-abi.rs
diff --git a/src/test/assembly/stack-protector/stack-protector-heuristics-effect.rs b/tests/assembly/stack-protector/stack-protector-heuristics-effect.rs
index 7c2b60550..7c2b60550 100644
--- a/src/test/assembly/stack-protector/stack-protector-heuristics-effect.rs
+++ b/tests/assembly/stack-protector/stack-protector-heuristics-effect.rs
diff --git a/src/test/assembly/stack-protector/stack-protector-target-support.rs b/tests/assembly/stack-protector/stack-protector-target-support.rs
index 2fb62e93e..d5b48105e 100644
--- a/src/test/assembly/stack-protector/stack-protector-target-support.rs
+++ b/tests/assembly/stack-protector/stack-protector-target-support.rs
@@ -26,7 +26,7 @@
 // [r9] needs-llvm-components: aarch64
 // [r10] compile-flags: --target aarch64-apple-ios
 // [r10] needs-llvm-components: aarch64
-// [r11] compile-flags: --target aarch64-fuchsia
+// [r11] compile-flags: --target aarch64-unknown-fuchsia
 // [r11] needs-llvm-components: aarch64
 // [r12] compile-flags: --target aarch64-linux-android
 // [r12] needs-llvm-components: aarch64
@@ -156,7 +156,7 @@
 // [r74] needs-llvm-components: x86
 // [r75] compile-flags:--target x86_64-fortanix-unknown-sgx
 // [r75] needs-llvm-components: x86
-// [r76] compile-flags:--target x86_64-fuchsia
+// [r76] compile-flags:--target x86_64-unknown-fuchsia
 // [r76] needs-llvm-components: x86
 // [r77] compile-flags:--target x86_64-linux-android
 // [r77] needs-llvm-components: x86
diff --git a/src/test/assembly/static-relocation-model.rs b/tests/assembly/static-relocation-model.rs
index faa2e3952..faa2e3952 100644
--- a/src/test/assembly/static-relocation-model.rs
+++ b/tests/assembly/static-relocation-model.rs
diff --git a/src/test/assembly/strict_provenance.rs b/tests/assembly/strict_provenance.rs
index 01f1957d5..01f1957d5 100644
--- a/src/test/assembly/strict_provenance.rs
+++ b/tests/assembly/strict_provenance.rs
diff --git a/src/test/assembly/target-feature-multiple.rs b/tests/assembly/target-feature-multiple.rs
index 18d896e86..5c5d93863 100644
--- a/src/test/assembly/target-feature-multiple.rs
+++ b/tests/assembly/target-feature-multiple.rs
@@ -14,7 +14,7 @@
 // > LLVM ERROR: Cannot select: 0x7f00f400c010: i32,i32,ch = X86ISD::RDSEED 0x7f00f400bfa8:2
 // > In function: foo
 //
-// See also src/test/codegen/target-feature-overrides.rs
+// See also tests/codegen/target-feature-overrides.rs
 #![feature(no_core, lang_items, link_llvm_intrinsics, abi_unadjusted)]
 #![crate_type = "lib"]
 #![no_core]
diff --git a/src/test/assembly/x86-stack-probes.rs b/tests/assembly/x86-stack-probes.rs
index c7141fb20..c7141fb20 100644
--- a/src/test/assembly/x86-stack-probes.rs
+++ b/tests/assembly/x86-stack-probes.rs
diff --git a/src/test/assembly/x86_64-floating-point-clamp.rs b/tests/assembly/x86_64-floating-point-clamp.rs
index 0f3b465d0..0f3b465d0 100644
--- a/src/test/assembly/x86_64-floating-point-clamp.rs
+++ b/tests/assembly/x86_64-floating-point-clamp.rs
diff --git a/src/test/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-load.rs b/tests/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-load.rs
index 79d82cf70..79d82cf70 100644
--- a/src/test/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-load.rs
+++ b/tests/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-load.rs
diff --git a/src/test/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-ret.rs b/tests/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-ret.rs
index a21ef6b75..a21ef6b75 100644
--- a/src/test/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-ret.rs
+++ b/tests/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-ret.rs
diff --git a/src/test/assembly/x86_64-fortanix-unknown-sgx-lvi-inline-assembly.rs b/tests/assembly/x86_64-fortanix-unknown-sgx-lvi-inline-assembly.rs
index c316379d5..c316379d5 100644
--- a/src/test/assembly/x86_64-fortanix-unknown-sgx-lvi-inline-assembly.rs
+++ b/tests/assembly/x86_64-fortanix-unknown-sgx-lvi-inline-assembly.rs
diff --git a/src/test/assembly/x86_64-naked-fn-no-cet-prolog.rs b/tests/assembly/x86_64-naked-fn-no-cet-prolog.rs
index bedcded73..bedcded73 100644
--- a/src/test/assembly/x86_64-naked-fn-no-cet-prolog.rs
+++ b/tests/assembly/x86_64-naked-fn-no-cet-prolog.rs
diff --git a/tests/assembly/x86_64-no-jump-tables.rs b/tests/assembly/x86_64-no-jump-tables.rs
new file mode 100644
index 000000000..007c3591a
--- /dev/null
+++ b/tests/assembly/x86_64-no-jump-tables.rs
@@ -0,0 +1,34 @@
+// Test that jump tables are (not) emitted when the `-Zno-jump-tables`
+// flag is (not) set.
+
+// revisions: unset set
+// assembly-output: emit-asm
+// compile-flags: -O
+// [set] compile-flags: -Zno-jump-tables
+// only-x86_64
+
+#![crate_type = "lib"]
+
+extern "C" {
+    fn bar1();
+    fn bar2();
+    fn bar3();
+    fn bar4();
+    fn bar5();
+    fn bar6();
+}
+
+// CHECK-LABEL: foo:
+#[no_mangle]
+pub unsafe fn foo(x: i32) {
+    // unset: LJTI0_0
+    // set-NOT: LJTI0_0
+    match x {
+        1 => bar1(),
+        2 => bar2(),
+        3 => bar3(),
+        4 => bar4(),
+        5 => bar5(),
+        _ => bar6(),
+    }
+}
diff --git a/src/test/assembly/x86_64-sse_crc.rs b/tests/assembly/x86_64-sse_crc.rs
index cdbf057b8..cdbf057b8 100644
--- a/src/test/assembly/x86_64-sse_crc.rs
+++ b/tests/assembly/x86_64-sse_crc.rs
diff --git a/src/test/auxiliary/rust_test_helpers.c b/tests/auxiliary/rust_test_helpers.c
index 977ea487a..977ea487a 100644
--- a/src/test/auxiliary/rust_test_helpers.c
+++ b/tests/auxiliary/rust_test_helpers.c
diff --git a/src/test/codegen-units/item-collection/asm-sym.rs b/tests/codegen-units/item-collection/asm-sym.rs
index 8bafb95bc..8bafb95bc 100644
--- a/src/test/codegen-units/item-collection/asm-sym.rs
+++ b/tests/codegen-units/item-collection/asm-sym.rs
diff --git a/src/test/codegen-units/item-collection/auxiliary/cgu_export_trait_method.rs b/tests/codegen-units/item-collection/auxiliary/cgu_export_trait_method.rs
index ecea26dc4..ecea26dc4 100644
--- a/src/test/codegen-units/item-collection/auxiliary/cgu_export_trait_method.rs
+++ b/tests/codegen-units/item-collection/auxiliary/cgu_export_trait_method.rs
diff --git a/src/test/codegen-units/item-collection/auxiliary/cgu_extern_closures.rs b/tests/codegen-units/item-collection/auxiliary/cgu_extern_closures.rs
index 05ea0a89f..05ea0a89f 100644
--- a/src/test/codegen-units/item-collection/auxiliary/cgu_extern_closures.rs
+++ b/tests/codegen-units/item-collection/auxiliary/cgu_extern_closures.rs
diff --git a/src/test/codegen-units/item-collection/auxiliary/cgu_generic_function.rs b/tests/codegen-units/item-collection/auxiliary/cgu_generic_function.rs
index 3926f2957..3926f2957 100644
--- a/src/test/codegen-units/item-collection/auxiliary/cgu_generic_function.rs
+++ b/tests/codegen-units/item-collection/auxiliary/cgu_generic_function.rs
diff --git a/src/test/codegen-units/item-collection/cross-crate-closures.rs b/tests/codegen-units/item-collection/cross-crate-closures.rs
index 6af344fab..6af344fab 100644
--- a/src/test/codegen-units/item-collection/cross-crate-closures.rs
+++ b/tests/codegen-units/item-collection/cross-crate-closures.rs
diff --git a/src/test/codegen-units/item-collection/cross-crate-generic-functions.rs b/tests/codegen-units/item-collection/cross-crate-generic-functions.rs
index 7289ceee9..7289ceee9 100644
--- a/src/test/codegen-units/item-collection/cross-crate-generic-functions.rs
+++ b/tests/codegen-units/item-collection/cross-crate-generic-functions.rs
diff --git a/src/test/codegen-units/item-collection/cross-crate-trait-method.rs b/tests/codegen-units/item-collection/cross-crate-trait-method.rs
index dc0984c8a..dc0984c8a 100644
--- a/src/test/codegen-units/item-collection/cross-crate-trait-method.rs
+++ b/tests/codegen-units/item-collection/cross-crate-trait-method.rs
diff --git a/src/test/codegen-units/item-collection/drop_in_place_intrinsic.rs b/tests/codegen-units/item-collection/drop_in_place_intrinsic.rs
index a3f1fb5e7..a3f1fb5e7 100644
--- a/src/test/codegen-units/item-collection/drop_in_place_intrinsic.rs
+++ b/tests/codegen-units/item-collection/drop_in_place_intrinsic.rs
diff --git a/src/test/codegen-units/item-collection/function-as-argument.rs b/tests/codegen-units/item-collection/function-as-argument.rs
index ea500c311..ea500c311 100644
--- a/src/test/codegen-units/item-collection/function-as-argument.rs
+++ b/tests/codegen-units/item-collection/function-as-argument.rs
diff --git a/src/test/codegen-units/item-collection/generic-drop-glue.rs b/tests/codegen-units/item-collection/generic-drop-glue.rs
index 6df4ff7e5..6df4ff7e5 100644
--- a/src/test/codegen-units/item-collection/generic-drop-glue.rs
+++ b/tests/codegen-units/item-collection/generic-drop-glue.rs
diff --git a/src/test/codegen-units/item-collection/generic-functions.rs b/tests/codegen-units/item-collection/generic-functions.rs
index 04383bb8e..04383bb8e 100644
--- a/src/test/codegen-units/item-collection/generic-functions.rs
+++ b/tests/codegen-units/item-collection/generic-functions.rs
diff --git a/src/test/codegen-units/item-collection/generic-impl.rs b/tests/codegen-units/item-collection/generic-impl.rs
index 4260230c2..4260230c2 100644
--- a/src/test/codegen-units/item-collection/generic-impl.rs
+++ b/tests/codegen-units/item-collection/generic-impl.rs
diff --git a/src/test/codegen-units/item-collection/impl-in-non-instantiated-generic.rs b/tests/codegen-units/item-collection/impl-in-non-instantiated-generic.rs
index c01398eb2..c01398eb2 100644
--- a/src/test/codegen-units/item-collection/impl-in-non-instantiated-generic.rs
+++ b/tests/codegen-units/item-collection/impl-in-non-instantiated-generic.rs
diff --git a/src/test/codegen-units/item-collection/implicit-panic-call.rs b/tests/codegen-units/item-collection/implicit-panic-call.rs
index abec7ad50..abec7ad50 100644
--- a/src/test/codegen-units/item-collection/implicit-panic-call.rs
+++ b/tests/codegen-units/item-collection/implicit-panic-call.rs
diff --git a/src/test/codegen-units/item-collection/instantiation-through-vtable.rs b/tests/codegen-units/item-collection/instantiation-through-vtable.rs
index e78226d40..e78226d40 100644
--- a/src/test/codegen-units/item-collection/instantiation-through-vtable.rs
+++ b/tests/codegen-units/item-collection/instantiation-through-vtable.rs
diff --git a/src/test/codegen-units/item-collection/items-within-generic-items.rs b/tests/codegen-units/item-collection/items-within-generic-items.rs
index d37d7f7d9..d37d7f7d9 100644
--- a/src/test/codegen-units/item-collection/items-within-generic-items.rs
+++ b/tests/codegen-units/item-collection/items-within-generic-items.rs
diff --git a/src/test/codegen-units/item-collection/non-generic-closures.rs b/tests/codegen-units/item-collection/non-generic-closures.rs
index 379fbcf26..379fbcf26 100644
--- a/src/test/codegen-units/item-collection/non-generic-closures.rs
+++ b/tests/codegen-units/item-collection/non-generic-closures.rs
diff --git a/src/test/codegen-units/item-collection/non-generic-drop-glue.rs b/tests/codegen-units/item-collection/non-generic-drop-glue.rs
index 06f76f7db..06f76f7db 100644
--- a/src/test/codegen-units/item-collection/non-generic-drop-glue.rs
+++ b/tests/codegen-units/item-collection/non-generic-drop-glue.rs
diff --git a/src/test/codegen-units/item-collection/non-generic-functions.rs b/tests/codegen-units/item-collection/non-generic-functions.rs
index 092e64562..092e64562 100644
--- a/src/test/codegen-units/item-collection/non-generic-functions.rs
+++ b/tests/codegen-units/item-collection/non-generic-functions.rs
diff --git a/src/test/codegen-units/item-collection/overloaded-operators.rs b/tests/codegen-units/item-collection/overloaded-operators.rs
index 2be7eba1d..2be7eba1d 100644
--- a/src/test/codegen-units/item-collection/overloaded-operators.rs
+++ b/tests/codegen-units/item-collection/overloaded-operators.rs
diff --git a/src/test/codegen-units/item-collection/static-init.rs b/tests/codegen-units/item-collection/static-init.rs
index 287ec8f24..287ec8f24 100644
--- a/src/test/codegen-units/item-collection/static-init.rs
+++ b/tests/codegen-units/item-collection/static-init.rs
diff --git a/src/test/codegen-units/item-collection/statics-and-consts.rs b/tests/codegen-units/item-collection/statics-and-consts.rs
index 49a8d3dff..49a8d3dff 100644
--- a/src/test/codegen-units/item-collection/statics-and-consts.rs
+++ b/tests/codegen-units/item-collection/statics-and-consts.rs
diff --git a/src/test/codegen-units/item-collection/trait-implementations.rs b/tests/codegen-units/item-collection/trait-implementations.rs
index a816cb032..a816cb032 100644
--- a/src/test/codegen-units/item-collection/trait-implementations.rs
+++ b/tests/codegen-units/item-collection/trait-implementations.rs
diff --git a/src/test/codegen-units/item-collection/trait-method-as-argument.rs b/tests/codegen-units/item-collection/trait-method-as-argument.rs
index 235569728..235569728 100644
--- a/src/test/codegen-units/item-collection/trait-method-as-argument.rs
+++ b/tests/codegen-units/item-collection/trait-method-as-argument.rs
diff --git a/src/test/codegen-units/item-collection/trait-method-default-impl.rs b/tests/codegen-units/item-collection/trait-method-default-impl.rs
index bfcdb6fa1..bfcdb6fa1 100644
--- a/src/test/codegen-units/item-collection/trait-method-default-impl.rs
+++ b/tests/codegen-units/item-collection/trait-method-default-impl.rs
diff --git a/src/test/codegen-units/item-collection/transitive-drop-glue.rs b/tests/codegen-units/item-collection/transitive-drop-glue.rs
index e286c800b..e286c800b 100644
--- a/src/test/codegen-units/item-collection/transitive-drop-glue.rs
+++ b/tests/codegen-units/item-collection/transitive-drop-glue.rs
diff --git a/src/test/codegen-units/item-collection/tuple-drop-glue.rs b/tests/codegen-units/item-collection/tuple-drop-glue.rs
index ae3b2e081..ae3b2e081 100644
--- a/src/test/codegen-units/item-collection/tuple-drop-glue.rs
+++ b/tests/codegen-units/item-collection/tuple-drop-glue.rs
diff --git a/src/test/codegen-units/item-collection/unreferenced-const-fn.rs b/tests/codegen-units/item-collection/unreferenced-const-fn.rs
index 17b92eae0..17b92eae0 100644
--- a/src/test/codegen-units/item-collection/unreferenced-const-fn.rs
+++ b/tests/codegen-units/item-collection/unreferenced-const-fn.rs
diff --git a/src/test/codegen-units/item-collection/unreferenced-inline-function.rs b/tests/codegen-units/item-collection/unreferenced-inline-function.rs
index 4d095e4d6..4d095e4d6 100644
--- a/src/test/codegen-units/item-collection/unreferenced-inline-function.rs
+++ b/tests/codegen-units/item-collection/unreferenced-inline-function.rs
diff --git a/src/test/codegen-units/item-collection/unsizing.rs b/tests/codegen-units/item-collection/unsizing.rs
index 111a72312..111a72312 100644
--- a/src/test/codegen-units/item-collection/unsizing.rs
+++ b/tests/codegen-units/item-collection/unsizing.rs
diff --git a/src/test/codegen-units/item-collection/unused-traits-and-generics.rs b/tests/codegen-units/item-collection/unused-traits-and-generics.rs
index 561dc1a5c..561dc1a5c 100644
--- a/src/test/codegen-units/item-collection/unused-traits-and-generics.rs
+++ b/tests/codegen-units/item-collection/unused-traits-and-generics.rs
diff --git a/src/test/codegen-units/partitioning/auxiliary/cgu_explicit_inlining.rs b/tests/codegen-units/partitioning/auxiliary/cgu_explicit_inlining.rs
index 4a3a63cc1..4a3a63cc1 100644
--- a/src/test/codegen-units/partitioning/auxiliary/cgu_explicit_inlining.rs
+++ b/tests/codegen-units/partitioning/auxiliary/cgu_explicit_inlining.rs
diff --git a/src/test/codegen-units/partitioning/auxiliary/cgu_extern_drop_glue.rs b/tests/codegen-units/partitioning/auxiliary/cgu_extern_drop_glue.rs
index b5fec2337..b5fec2337 100644
--- a/src/test/codegen-units/partitioning/auxiliary/cgu_extern_drop_glue.rs
+++ b/tests/codegen-units/partitioning/auxiliary/cgu_extern_drop_glue.rs
diff --git a/src/test/codegen-units/partitioning/auxiliary/cgu_generic_function.rs b/tests/codegen-units/partitioning/auxiliary/cgu_generic_function.rs
index 3926f2957..3926f2957 100644
--- a/src/test/codegen-units/partitioning/auxiliary/cgu_generic_function.rs
+++ b/tests/codegen-units/partitioning/auxiliary/cgu_generic_function.rs
diff --git a/src/test/codegen-units/partitioning/auxiliary/shared_generics_aux.rs b/tests/codegen-units/partitioning/auxiliary/shared_generics_aux.rs
index ffbd0dc54..ffbd0dc54 100644
--- a/src/test/codegen-units/partitioning/auxiliary/shared_generics_aux.rs
+++ b/tests/codegen-units/partitioning/auxiliary/shared_generics_aux.rs
diff --git a/src/test/codegen-units/partitioning/extern-drop-glue.rs b/tests/codegen-units/partitioning/extern-drop-glue.rs
index c73d2a10a..c73d2a10a 100644
--- a/src/test/codegen-units/partitioning/extern-drop-glue.rs
+++ b/tests/codegen-units/partitioning/extern-drop-glue.rs
diff --git a/src/test/codegen-units/partitioning/extern-generic.rs b/tests/codegen-units/partitioning/extern-generic.rs
index 638ec079a..638ec079a 100644
--- a/src/test/codegen-units/partitioning/extern-generic.rs
+++ b/tests/codegen-units/partitioning/extern-generic.rs
diff --git a/src/test/codegen-units/partitioning/incremental-merging.rs b/tests/codegen-units/partitioning/incremental-merging.rs
index 118b7bdf4..118b7bdf4 100644
--- a/src/test/codegen-units/partitioning/incremental-merging.rs
+++ b/tests/codegen-units/partitioning/incremental-merging.rs
diff --git a/src/test/codegen-units/partitioning/inlining-from-extern-crate.rs b/tests/codegen-units/partitioning/inlining-from-extern-crate.rs
index 1cc21632e..1cc21632e 100644
--- a/src/test/codegen-units/partitioning/inlining-from-extern-crate.rs
+++ b/tests/codegen-units/partitioning/inlining-from-extern-crate.rs
diff --git a/src/test/codegen-units/partitioning/local-drop-glue.rs b/tests/codegen-units/partitioning/local-drop-glue.rs
index 2fd853a44..2fd853a44 100644
--- a/src/test/codegen-units/partitioning/local-drop-glue.rs
+++ b/tests/codegen-units/partitioning/local-drop-glue.rs
diff --git a/src/test/codegen-units/partitioning/local-generic.rs b/tests/codegen-units/partitioning/local-generic.rs
index 38aec7291..38aec7291 100644
--- a/src/test/codegen-units/partitioning/local-generic.rs
+++ b/tests/codegen-units/partitioning/local-generic.rs
diff --git a/src/test/codegen-units/partitioning/local-inlining-but-not-all.rs b/tests/codegen-units/partitioning/local-inlining-but-not-all.rs
index 318f0c28a..318f0c28a 100644
--- a/src/test/codegen-units/partitioning/local-inlining-but-not-all.rs
+++ b/tests/codegen-units/partitioning/local-inlining-but-not-all.rs
diff --git a/src/test/codegen-units/partitioning/local-inlining.rs b/tests/codegen-units/partitioning/local-inlining.rs
index 841a428e9..841a428e9 100644
--- a/src/test/codegen-units/partitioning/local-inlining.rs
+++ b/tests/codegen-units/partitioning/local-inlining.rs
diff --git a/src/test/codegen-units/partitioning/local-transitive-inlining.rs b/tests/codegen-units/partitioning/local-transitive-inlining.rs
index 03c37954d..03c37954d 100644
--- a/src/test/codegen-units/partitioning/local-transitive-inlining.rs
+++ b/tests/codegen-units/partitioning/local-transitive-inlining.rs
diff --git a/src/test/codegen-units/partitioning/methods-are-with-self-type.rs b/tests/codegen-units/partitioning/methods-are-with-self-type.rs
index 8220dc12e..8220dc12e 100644
--- a/src/test/codegen-units/partitioning/methods-are-with-self-type.rs
+++ b/tests/codegen-units/partitioning/methods-are-with-self-type.rs
diff --git a/src/test/codegen-units/partitioning/regular-modules.rs b/tests/codegen-units/partitioning/regular-modules.rs
index ce7fe9c3a..ce7fe9c3a 100644
--- a/src/test/codegen-units/partitioning/regular-modules.rs
+++ b/tests/codegen-units/partitioning/regular-modules.rs
diff --git a/src/test/codegen-units/partitioning/shared-generics.rs b/tests/codegen-units/partitioning/shared-generics.rs
index ebe96bfb7..ebe96bfb7 100644
--- a/src/test/codegen-units/partitioning/shared-generics.rs
+++ b/tests/codegen-units/partitioning/shared-generics.rs
diff --git a/src/test/codegen-units/partitioning/statics.rs b/tests/codegen-units/partitioning/statics.rs
index b11d6696d..b11d6696d 100644
--- a/src/test/codegen-units/partitioning/statics.rs
+++ b/tests/codegen-units/partitioning/statics.rs
diff --git a/src/test/codegen-units/partitioning/vtable-through-const.rs b/tests/codegen-units/partitioning/vtable-through-const.rs
index cedcca804..cedcca804 100644
--- a/src/test/codegen-units/partitioning/vtable-through-const.rs
+++ b/tests/codegen-units/partitioning/vtable-through-const.rs
diff --git a/src/test/codegen-units/polymorphization/unused_type_parameters.rs b/tests/codegen-units/polymorphization/unused_type_parameters.rs
index c2e06d067..c2e06d067 100644
--- a/src/test/codegen-units/polymorphization/unused_type_parameters.rs
+++ b/tests/codegen-units/polymorphization/unused_type_parameters.rs
diff --git a/src/test/codegen/README.md b/tests/codegen/README.md
index 8f2daaafc..8f2daaafc 100644
--- a/src/test/codegen/README.md
+++ b/tests/codegen/README.md
diff --git a/src/test/codegen/abi-efiapi.rs b/tests/codegen/abi-efiapi.rs
index 9061d7432..9502ebf59 100644
--- a/src/test/codegen/abi-efiapi.rs
+++ b/tests/codegen/abi-efiapi.rs
@@ -14,7 +14,7 @@
 // compile-flags: -C no-prepopulate-passes
 
 #![crate_type = "lib"]
-#![feature(no_core, lang_items, abi_efiapi)]
+#![feature(no_core, lang_items)]
 #![no_core]
 
 #[lang="sized"]
diff --git a/src/test/codegen/abi-main-signature-16bit-c-int.rs b/tests/codegen/abi-main-signature-16bit-c-int.rs
index 4ed491dfb..4ed491dfb 100644
--- a/src/test/codegen/abi-main-signature-16bit-c-int.rs
+++ b/tests/codegen/abi-main-signature-16bit-c-int.rs
diff --git a/src/test/codegen/abi-main-signature-32bit-c-int.rs b/tests/codegen/abi-main-signature-32bit-c-int.rs
index 7f22ddcfc..7f22ddcfc 100644
--- a/src/test/codegen/abi-main-signature-32bit-c-int.rs
+++ b/tests/codegen/abi-main-signature-32bit-c-int.rs
diff --git a/src/test/codegen/abi-repr-ext.rs b/tests/codegen/abi-repr-ext.rs
index 23ade3c72..23ade3c72 100644
--- a/src/test/codegen/abi-repr-ext.rs
+++ b/tests/codegen/abi-repr-ext.rs
diff --git a/src/test/codegen/abi-sysv64.rs b/tests/codegen/abi-sysv64.rs
index dfc312279..3c2d4e719 100644
--- a/src/test/codegen/abi-sysv64.rs
+++ b/tests/codegen/abi-sysv64.rs
@@ -3,7 +3,7 @@
 // of the sysv64 abi.
 //
 // needs-llvm-components: x86
-// compile-flags: -C no-prepopulate-passes --target=x86_64-unknown-linux-gnu
+// compile-flags: -C no-prepopulate-passes --target=x86_64-unknown-linux-gnu -Copt-level=0
 
 #![crate_type = "lib"]
 #![no_core]
diff --git a/src/test/codegen/abi-x86-interrupt.rs b/tests/codegen/abi-x86-interrupt.rs
index d612f603e..928ad5a9b 100644
--- a/src/test/codegen/abi-x86-interrupt.rs
+++ b/tests/codegen/abi-x86-interrupt.rs
@@ -3,7 +3,7 @@
 // of the x86-interrupt abi.
 
 // needs-llvm-components: x86
-// compile-flags: -C no-prepopulate-passes --target=x86_64-unknown-linux-gnu
+// compile-flags: -C no-prepopulate-passes --target=x86_64-unknown-linux-gnu -Copt-level=0
 
 #![crate_type = "lib"]
 #![no_core]
diff --git a/src/test/codegen/abi-x86_64_sysv.rs b/tests/codegen/abi-x86_64_sysv.rs
index 84e06023e..84e06023e 100644
--- a/src/test/codegen/abi-x86_64_sysv.rs
+++ b/tests/codegen/abi-x86_64_sysv.rs
diff --git a/src/test/codegen/adjustments.rs b/tests/codegen/adjustments.rs
index 39880c934..6d2247517 100644
--- a/src/test/codegen/adjustments.rs
+++ b/tests/codegen/adjustments.rs
@@ -1,4 +1,4 @@
-// compile-flags: -C no-prepopulate-passes
+// compile-flags: -C no-prepopulate-passes -Copt-level=0
 
 #![crate_type = "lib"]
 
diff --git a/src/test/codegen/align-enum.rs b/tests/codegen/align-enum.rs
index 70f09ace0..70f09ace0 100644
--- a/src/test/codegen/align-enum.rs
+++ b/tests/codegen/align-enum.rs
diff --git a/src/test/codegen/align-fn.rs b/tests/codegen/align-fn.rs
index c5886cf28..c5886cf28 100644
--- a/src/test/codegen/align-fn.rs
+++ b/tests/codegen/align-fn.rs
diff --git a/src/test/codegen/align-struct.rs b/tests/codegen/align-struct.rs
index a2f47354b..a2f47354b 100644
--- a/src/test/codegen/align-struct.rs
+++ b/tests/codegen/align-struct.rs
diff --git a/src/test/codegen/alloc-optimisation.rs b/tests/codegen/alloc-optimisation.rs
index c3ffaeb95..c3ffaeb95 100644
--- a/src/test/codegen/alloc-optimisation.rs
+++ b/tests/codegen/alloc-optimisation.rs
diff --git a/src/test/codegen/array-clone.rs b/tests/codegen/array-clone.rs
index 0d42963bc..0d42963bc 100644
--- a/src/test/codegen/array-clone.rs
+++ b/tests/codegen/array-clone.rs
diff --git a/src/test/codegen/array-equality.rs b/tests/codegen/array-equality.rs
index cd5e82a92..cd5e82a92 100644
--- a/src/test/codegen/array-equality.rs
+++ b/tests/codegen/array-equality.rs
diff --git a/src/test/codegen/asm-clobber_abi.rs b/tests/codegen/asm-clobber_abi.rs
index f70caea2f..f70caea2f 100644
--- a/src/test/codegen/asm-clobber_abi.rs
+++ b/tests/codegen/asm-clobber_abi.rs
diff --git a/src/test/codegen/asm-clobbers.rs b/tests/codegen/asm-clobbers.rs
index 2ef10a283..2ef10a283 100644
--- a/src/test/codegen/asm-clobbers.rs
+++ b/tests/codegen/asm-clobbers.rs
diff --git a/src/test/codegen/asm-may_unwind.rs b/tests/codegen/asm-may_unwind.rs
index c97933035..c97933035 100644
--- a/src/test/codegen/asm-may_unwind.rs
+++ b/tests/codegen/asm-may_unwind.rs
diff --git a/src/test/codegen/asm-multiple-options.rs b/tests/codegen/asm-multiple-options.rs
index 1ae37d627..1ae37d627 100644
--- a/src/test/codegen/asm-multiple-options.rs
+++ b/tests/codegen/asm-multiple-options.rs
diff --git a/src/test/codegen/asm-options.rs b/tests/codegen/asm-options.rs
index 963b60cfe..963b60cfe 100644
--- a/src/test/codegen/asm-options.rs
+++ b/tests/codegen/asm-options.rs
diff --git a/src/test/codegen/asm-powerpc-clobbers.rs b/tests/codegen/asm-powerpc-clobbers.rs
index 10b20ba6b..10b20ba6b 100644
--- a/src/test/codegen/asm-powerpc-clobbers.rs
+++ b/tests/codegen/asm-powerpc-clobbers.rs
diff --git a/src/test/codegen/asm-sanitize-llvm.rs b/tests/codegen/asm-sanitize-llvm.rs
index 6dcacd08c..6dcacd08c 100644
--- a/src/test/codegen/asm-sanitize-llvm.rs
+++ b/tests/codegen/asm-sanitize-llvm.rs
diff --git a/src/test/codegen/asm-target-clobbers.rs b/tests/codegen/asm-target-clobbers.rs
index ac30e18ec..ac30e18ec 100644
--- a/src/test/codegen/asm-target-clobbers.rs
+++ b/tests/codegen/asm-target-clobbers.rs
diff --git a/src/test/codegen/async-fn-debug-awaitee-field.rs b/tests/codegen/async-fn-debug-awaitee-field.rs
index bc2686158..bc2686158 100644
--- a/src/test/codegen/async-fn-debug-awaitee-field.rs
+++ b/tests/codegen/async-fn-debug-awaitee-field.rs
diff --git a/src/test/codegen/async-fn-debug-msvc.rs b/tests/codegen/async-fn-debug-msvc.rs
index 73c652c9d..73c652c9d 100644
--- a/src/test/codegen/async-fn-debug-msvc.rs
+++ b/tests/codegen/async-fn-debug-msvc.rs
diff --git a/src/test/codegen/async-fn-debug.rs b/tests/codegen/async-fn-debug.rs
index 9f6058a71..9f6058a71 100644
--- a/src/test/codegen/async-fn-debug.rs
+++ b/tests/codegen/async-fn-debug.rs
diff --git a/src/test/codegen/atomic-operations.rs b/tests/codegen/atomic-operations.rs
index d2bc618df..d2bc618df 100644
--- a/src/test/codegen/atomic-operations.rs
+++ b/tests/codegen/atomic-operations.rs
diff --git a/src/test/codegen/autovectorize-f32x4.rs b/tests/codegen/autovectorize-f32x4.rs
index 6b09c8fc9..6b09c8fc9 100644
--- a/src/test/codegen/autovectorize-f32x4.rs
+++ b/tests/codegen/autovectorize-f32x4.rs
diff --git a/src/test/codegen/auxiliary/extern_decl.rs b/tests/codegen/auxiliary/extern_decl.rs
index edc483518..edc483518 100644
--- a/src/test/codegen/auxiliary/extern_decl.rs
+++ b/tests/codegen/auxiliary/extern_decl.rs
diff --git a/src/test/codegen/auxiliary/nounwind.rs b/tests/codegen/auxiliary/nounwind.rs
index 73c5aee33..73c5aee33 100644
--- a/src/test/codegen/auxiliary/nounwind.rs
+++ b/tests/codegen/auxiliary/nounwind.rs
diff --git a/src/test/codegen/auxiliary/static_dllimport_aux.rs b/tests/codegen/auxiliary/static_dllimport_aux.rs
index afb0dc42f..afb0dc42f 100644
--- a/src/test/codegen/auxiliary/static_dllimport_aux.rs
+++ b/tests/codegen/auxiliary/static_dllimport_aux.rs
diff --git a/src/test/codegen/auxiliary/thread_local_aux.rs b/tests/codegen/auxiliary/thread_local_aux.rs
index bebaa7754..bebaa7754 100644
--- a/src/test/codegen/auxiliary/thread_local_aux.rs
+++ b/tests/codegen/auxiliary/thread_local_aux.rs
diff --git a/tests/codegen/avr/avr-func-addrspace.rs b/tests/codegen/avr/avr-func-addrspace.rs
new file mode 100644
index 000000000..e9740e30d
--- /dev/null
+++ b/tests/codegen/avr/avr-func-addrspace.rs
@@ -0,0 +1,111 @@
+// compile-flags: -O --target=avr-unknown-gnu-atmega328 --crate-type=rlib
+// needs-llvm-components: avr
+
+// This test validates that function pointers can be stored in global variables
+// and called upon. It ensures that Rust emits function pointers in the correct
+// address space to LLVM so that an assertion error relating to casting is
+// not triggered.
+//
+// It also validates that functions can be called through function pointers
+// through traits.
+
+#![feature(no_core, lang_items, intrinsics, unboxed_closures, arbitrary_self_types)]
+#![crate_type = "lib"]
+#![no_core]
+
+#[lang = "sized"]
+pub trait Sized { }
+#[lang = "copy"]
+pub trait Copy { }
+#[lang = "receiver"]
+pub trait Receiver { }
+#[lang = "tuple_trait"]
+pub trait Tuple { }
+
+pub struct Result<T, E> { _a: T, _b: E }
+
+impl Copy for usize {}
+impl Copy for &usize {}
+
+#[lang = "drop_in_place"]
+pub unsafe fn drop_in_place<T: ?Sized>(_: *mut T) {}
+
+#[lang = "fn_once"]
+pub trait FnOnce<Args: Tuple> {
+    #[lang = "fn_once_output"]
+    type Output;
+
+    extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
+
+#[lang = "fn_mut"]
+pub trait FnMut<Args: Tuple> : FnOnce<Args> {
+    extern "rust-call" fn call_mut(&mut self, args: Args) -> Self::Output;
+}
+
+#[lang = "fn"]
+pub trait Fn<Args: Tuple>: FnOnce<Args> {
+    /// Performs the call operation.
+    extern "rust-call" fn call(&self, args: Args) -> Self::Output;
+}
+
+extern "rust-intrinsic" {
+    pub fn transmute<Src, Dst>(src: Src) -> Dst;
+}
+
+pub static mut STORAGE_FOO: fn(&usize, &mut u32) -> Result<(), ()> = arbitrary_black_box;
+pub static mut STORAGE_BAR: u32 = 12;
+
+fn arbitrary_black_box(ptr: &usize, _: &mut u32) -> Result<(), ()> {
+    let raw_ptr = ptr as *const usize;
+    let _v: usize = unsafe { *raw_ptr };
+    loop {}
+}
+
+#[inline(never)]
+#[no_mangle]
+fn call_through_fn_trait(a: &mut impl Fn<(), Output=()>) {
+    (*a)()
+}
+
+#[inline(never)]
+fn update_bar_value() {
+    unsafe {
+        STORAGE_BAR = 88;
+    }
+}
+
+// CHECK: define dso_local void @test(){{.+}}addrspace(1)
+#[no_mangle]
+pub extern "C" fn test() {
+    let mut buf = 7;
+
+    // A call through the Fn trait must use address space 1.
+    //
+    // CHECK: call{{.+}}addrspace(1) void @call_through_fn_trait()
+    call_through_fn_trait(&mut update_bar_value);
+
+    // A call through a global variable must use address space 1.
+    // CHECK: load {{.*}}addrspace(1){{.+}}FOO
+    unsafe {
+        STORAGE_FOO(&1, &mut buf);
+    }
+}
+
+// Validate that we can codegen transmutes between data ptrs and fn ptrs.
+
+// CHECK: define{{.+}}{{void \(\) addrspace\(1\)\*|ptr addrspace\(1\)}} @transmute_data_ptr_to_fn({{\{\}\*|ptr}}{{.*}} %x)
+#[no_mangle]
+pub unsafe fn transmute_data_ptr_to_fn(x: *const ()) -> fn() {
+    // It doesn't matter precisely how this is codegenned (through memory or an addrspacecast),
+    // as long as it doesn't cause a verifier error by using `bitcast`.
+    transmute(x)
+}
+
+// CHECK: define{{.+}}{{\{\}\*|ptr}} @transmute_fn_ptr_to_data({{void \(\) addrspace\(1\)\*|ptr addrspace\(1\)}}{{.*}} %x)
+#[no_mangle]
+pub unsafe fn transmute_fn_ptr_to_data(x: fn()) -> *const () {
+    // It doesn't matter precisely how this is codegenned (through memory or an addrspacecast),
+    // as long as it doesn't cause a verifier error by using `bitcast`.
+    transmute(x)
+}
diff --git a/src/test/codegen/binary-search-index-no-bound-check.rs b/tests/codegen/binary-search-index-no-bound-check.rs
index c1766a4a4..c1766a4a4 100644
--- a/src/test/codegen/binary-search-index-no-bound-check.rs
+++ b/tests/codegen/binary-search-index-no-bound-check.rs
diff --git a/src/test/codegen/bool-cmp.rs b/tests/codegen/bool-cmp.rs
index 5090f7c37..5090f7c37 100644
--- a/src/test/codegen/bool-cmp.rs
+++ b/tests/codegen/bool-cmp.rs
diff --git a/tests/codegen/box-maybe-uninit-llvm14.rs b/tests/codegen/box-maybe-uninit-llvm14.rs
new file mode 100644
index 000000000..b0c88f76c
--- /dev/null
+++ b/tests/codegen/box-maybe-uninit-llvm14.rs
@@ -0,0 +1,34 @@
+// compile-flags: -O
+
+// Once we're done with llvm 14 and earlier, this test can be deleted.
+
+#![crate_type = "lib"]
+
+use std::mem::MaybeUninit;
+
+// Boxing a `MaybeUninit` value should not copy junk from the stack
+#[no_mangle]
+pub fn box_uninitialized() -> Box<MaybeUninit<usize>> {
+    // CHECK-LABEL: @box_uninitialized
+    // CHECK-NOT: store
+    // CHECK-NOT: alloca
+    // CHECK-NOT: memcpy
+    // CHECK-NOT: memset
+    Box::new(MaybeUninit::uninit())
+}
+
+// https://github.com/rust-lang/rust/issues/58201
+#[no_mangle]
+pub fn box_uninitialized2() -> Box<MaybeUninit<[usize; 1024 * 1024]>> {
+    // CHECK-LABEL: @box_uninitialized2
+    // CHECK-NOT: store
+    // CHECK-NOT: alloca
+    // CHECK-NOT: memcpy
+    // CHECK-NOT: memset
+    Box::new(MaybeUninit::uninit())
+}
+
+// Hide the LLVM 15+ `allocalign` attribute in the declaration of __rust_alloc
+// from the CHECK-NOT above. We don't check the attributes here because we can't rely
+// on all of them being set until LLVM 15.
+// CHECK: declare noalias{{.*}} @__rust_alloc(i{{[0-9]+}} noundef, i{{[0-9]+.*}} noundef)
diff --git a/tests/codegen/box-maybe-uninit.rs b/tests/codegen/box-maybe-uninit.rs
new file mode 100644
index 000000000..2f8896699
--- /dev/null
+++ b/tests/codegen/box-maybe-uninit.rs
@@ -0,0 +1,33 @@
+// compile-flags: -O
+// min-llvm-version: 15.0
+#![crate_type = "lib"]
+
+use std::mem::MaybeUninit;
+
+// Boxing a `MaybeUninit` value should not copy junk from the stack
+#[no_mangle]
+pub fn box_uninitialized() -> Box<MaybeUninit<usize>> {
+    // CHECK-LABEL: @box_uninitialized
+    // CHECK-NOT: store
+    // CHECK-NOT: alloca
+    // CHECK-NOT: memcpy
+    // CHECK-NOT: memset
+    Box::new(MaybeUninit::uninit())
+}
+
+// https://github.com/rust-lang/rust/issues/58201
+#[no_mangle]
+pub fn box_uninitialized2() -> Box<MaybeUninit<[usize; 1024 * 1024]>> {
+    // CHECK-LABEL: @box_uninitialized2
+    // CHECK-NOT: store
+    // CHECK-NOT: alloca
+    // CHECK-NOT: memcpy
+    // CHECK-NOT: memset
+    Box::new(MaybeUninit::uninit())
+}
+
+// Hide the `allocalign` attribute in the declaration of __rust_alloc
+// from the CHECK-NOT above, and also verify the attributes got set reasonably.
+// CHECK: declare noalias noundef ptr @__rust_alloc(i{{[0-9]+}} noundef, i{{[0-9]+}} allocalign noundef) unnamed_addr [[RUST_ALLOC_ATTRS:#[0-9]+]]
+
+// CHECK-DAG: attributes [[RUST_ALLOC_ATTRS]] = { {{.*}} allockind("alloc,uninitialized,aligned") allocsize(0) uwtable "alloc-family"="__rust_alloc" {{.*}} }
diff --git a/src/test/codegen/bpf-alu32.rs b/tests/codegen/bpf-alu32.rs
index c68bffd03..c68bffd03 100644
--- a/src/test/codegen/bpf-alu32.rs
+++ b/tests/codegen/bpf-alu32.rs
diff --git a/src/test/codegen/branch-protection.rs b/tests/codegen/branch-protection.rs
index 994c71b26..994c71b26 100644
--- a/src/test/codegen/branch-protection.rs
+++ b/tests/codegen/branch-protection.rs
diff --git a/src/test/codegen/c-variadic-copy.rs b/tests/codegen/c-variadic-copy.rs
index 4c61c4fcf..4c61c4fcf 100644
--- a/src/test/codegen/c-variadic-copy.rs
+++ b/tests/codegen/c-variadic-copy.rs
diff --git a/src/test/codegen/c-variadic-opt.rs b/tests/codegen/c-variadic-opt.rs
index 969dce80f..969dce80f 100644
--- a/src/test/codegen/c-variadic-opt.rs
+++ b/tests/codegen/c-variadic-opt.rs
diff --git a/src/test/codegen/c-variadic.rs b/tests/codegen/c-variadic.rs
index a5be56c47..cab326522 100644
--- a/src/test/codegen/c-variadic.rs
+++ b/tests/codegen/c-variadic.rs
@@ -1,5 +1,5 @@
 // ignore-wasm32-bare compiled with panic=abort by default
-// compile-flags: -C no-prepopulate-passes
+// compile-flags: -C no-prepopulate-passes -Copt-level=0
 //
 
 #![crate_type = "lib"]
diff --git a/src/test/codegen/call-llvm-intrinsics.rs b/tests/codegen/call-llvm-intrinsics.rs
index 998099c23..cb8abae19 100644
--- a/src/test/codegen/call-llvm-intrinsics.rs
+++ b/tests/codegen/call-llvm-intrinsics.rs
@@ -1,4 +1,4 @@
-// compile-flags: -C no-prepopulate-passes
+// compile-flags: -C no-prepopulate-passes -Copt-level=0
 
 // ignore-riscv64
 
diff --git a/src/test/codegen/call-metadata.rs b/tests/codegen/call-metadata.rs
index 1c30c08d3..1c30c08d3 100644
--- a/src/test/codegen/call-metadata.rs
+++ b/tests/codegen/call-metadata.rs
diff --git a/src/test/codegen/catch-unwind.rs b/tests/codegen/catch-unwind.rs
index 3ea3a24bf..b90ef104c 100644
--- a/src/test/codegen/catch-unwind.rs
+++ b/tests/codegen/catch-unwind.rs
@@ -8,6 +8,8 @@
 // On riscv the closure is another function, placed before fn foo so CHECK can't
 // find it
 // ignore-riscv64 FIXME
+// On s390x the closure is also in another function
+// ignore-s390x FIXME
 
 #![crate_type = "lib"]
 #![feature(c_unwind)]
diff --git a/src/test/codegen/cdylib-external-inline-fns.rs b/tests/codegen/cdylib-external-inline-fns.rs
index 9118afd43..9118afd43 100644
--- a/src/test/codegen/cdylib-external-inline-fns.rs
+++ b/tests/codegen/cdylib-external-inline-fns.rs
diff --git a/src/test/codegen/cf-protection.rs b/tests/codegen/cf-protection.rs
index ccbc863f5..ccbc863f5 100644
--- a/src/test/codegen/cf-protection.rs
+++ b/tests/codegen/cf-protection.rs
diff --git a/src/test/codegen/cfguard-checks.rs b/tests/codegen/cfguard-checks.rs
index 571a2654b..571a2654b 100644
--- a/src/test/codegen/cfguard-checks.rs
+++ b/tests/codegen/cfguard-checks.rs
diff --git a/src/test/codegen/cfguard-disabled.rs b/tests/codegen/cfguard-disabled.rs
index c3f8f4116..c3f8f4116 100644
--- a/src/test/codegen/cfguard-disabled.rs
+++ b/tests/codegen/cfguard-disabled.rs
diff --git a/src/test/codegen/cfguard-nochecks.rs b/tests/codegen/cfguard-nochecks.rs
index 3847c3e81..3847c3e81 100644
--- a/src/test/codegen/cfguard-nochecks.rs
+++ b/tests/codegen/cfguard-nochecks.rs
diff --git a/src/test/codegen/cfguard-non-msvc.rs b/tests/codegen/cfguard-non-msvc.rs
index 6278a951e..6278a951e 100644
--- a/src/test/codegen/cfguard-non-msvc.rs
+++ b/tests/codegen/cfguard-non-msvc.rs
diff --git a/src/test/codegen/codemodels.rs b/tests/codegen/codemodels.rs
index 2328f5feb..2328f5feb 100644
--- a/src/test/codegen/codemodels.rs
+++ b/tests/codegen/codemodels.rs
diff --git a/src/test/codegen/coercions.rs b/tests/codegen/coercions.rs
index d645ca6b1..d645ca6b1 100644
--- a/src/test/codegen/coercions.rs
+++ b/tests/codegen/coercions.rs
diff --git a/src/test/codegen/cold-call-declare-and-call.rs b/tests/codegen/cold-call-declare-and-call.rs
index 71d49478b..71d49478b 100644
--- a/src/test/codegen/cold-call-declare-and-call.rs
+++ b/tests/codegen/cold-call-declare-and-call.rs
diff --git a/tests/codegen/comparison-operators-newtype.rs b/tests/codegen/comparison-operators-newtype.rs
new file mode 100644
index 000000000..683a2bd4f
--- /dev/null
+++ b/tests/codegen/comparison-operators-newtype.rs
@@ -0,0 +1,49 @@
+// The `derive(PartialOrd)` for a newtype doesn't override `lt`/`le`/`gt`/`ge`.
+// This double-checks that the `Option<Ordering>` intermediate values used
+// in the operators for such a type all optimize away.
+
+// compile-flags: -C opt-level=1
+// min-llvm-version: 15.0
+
+#![crate_type = "lib"]
+
+use std::cmp::Ordering;
+
+#[derive(PartialOrd, PartialEq)]
+pub struct Foo(u16);
+
+// CHECK-LABEL: @check_lt
+// CHECK-SAME: (i16 noundef %[[A:.+]], i16 noundef %[[B:.+]])
+#[no_mangle]
+pub fn check_lt(a: Foo, b: Foo) -> bool {
+    // CHECK: %[[R:.+]] = icmp ult i16 %[[A]], %[[B]]
+    // CHECK-NEXT: ret i1 %[[R]]
+    a < b
+}
+
+// CHECK-LABEL: @check_le
+// CHECK-SAME: (i16 noundef %[[A:.+]], i16 noundef %[[B:.+]])
+#[no_mangle]
+pub fn check_le(a: Foo, b: Foo) -> bool {
+    // CHECK: %[[R:.+]] = icmp ule i16 %[[A]], %[[B]]
+    // CHECK-NEXT: ret i1 %[[R]]
+    a <= b
+}
+
+// CHECK-LABEL: @check_gt
+// CHECK-SAME: (i16 noundef %[[A:.+]], i16 noundef %[[B:.+]])
+#[no_mangle]
+pub fn check_gt(a: Foo, b: Foo) -> bool {
+    // CHECK: %[[R:.+]] = icmp ugt i16 %[[A]], %[[B]]
+    // CHECK-NEXT: ret i1 %[[R]]
+    a > b
+}
+
+// CHECK-LABEL: @check_ge
+// CHECK-SAME: (i16 noundef %[[A:.+]], i16 noundef %[[B:.+]])
+#[no_mangle]
+pub fn check_ge(a: Foo, b: Foo) -> bool {
+    // CHECK: %[[R:.+]] = icmp uge i16 %[[A]], %[[B]]
+    // CHECK-NEXT: ret i1 %[[R]]
+    a >= b
+}
diff --git a/src/test/codegen/consts.rs b/tests/codegen/consts.rs
index 260d9de86..260d9de86 100644
--- a/src/test/codegen/consts.rs
+++ b/tests/codegen/consts.rs
diff --git a/src/test/codegen/dealloc-no-unwind.rs b/tests/codegen/dealloc-no-unwind.rs
index 3812ef44f..3812ef44f 100644
--- a/src/test/codegen/dealloc-no-unwind.rs
+++ b/tests/codegen/dealloc-no-unwind.rs
diff --git a/src/test/codegen/debug-alignment.rs b/tests/codegen/debug-alignment.rs
index f6c1062e0..f6c1062e0 100644
--- a/src/test/codegen/debug-alignment.rs
+++ b/tests/codegen/debug-alignment.rs
diff --git a/src/test/codegen/debug-column-msvc.rs b/tests/codegen/debug-column-msvc.rs
index aad8b372a..aad8b372a 100644
--- a/src/test/codegen/debug-column-msvc.rs
+++ b/tests/codegen/debug-column-msvc.rs
diff --git a/src/test/codegen/debug-column.rs b/tests/codegen/debug-column.rs
index e61642b8e..e61642b8e 100644
--- a/src/test/codegen/debug-column.rs
+++ b/tests/codegen/debug-column.rs
diff --git a/src/test/codegen/debug-compile-unit-path.rs b/tests/codegen/debug-compile-unit-path.rs
index 3661be046..3661be046 100644
--- a/src/test/codegen/debug-compile-unit-path.rs
+++ b/tests/codegen/debug-compile-unit-path.rs
diff --git a/src/test/codegen/debug-linkage-name.rs b/tests/codegen/debug-linkage-name.rs
index 9011a7da5..9011a7da5 100644
--- a/src/test/codegen/debug-linkage-name.rs
+++ b/tests/codegen/debug-linkage-name.rs
diff --git a/src/test/codegen/debug-vtable.rs b/tests/codegen/debug-vtable.rs
index bdd312878..bdd312878 100644
--- a/src/test/codegen/debug-vtable.rs
+++ b/tests/codegen/debug-vtable.rs
diff --git a/src/test/codegen/debuginfo-generic-closure-env-names.rs b/tests/codegen/debuginfo-generic-closure-env-names.rs
index b29f8b4a0..b29f8b4a0 100644
--- a/src/test/codegen/debuginfo-generic-closure-env-names.rs
+++ b/tests/codegen/debuginfo-generic-closure-env-names.rs
diff --git a/src/test/codegen/deduced-param-attrs.rs b/tests/codegen/deduced-param-attrs.rs
index 153046eef..153046eef 100644
--- a/src/test/codegen/deduced-param-attrs.rs
+++ b/tests/codegen/deduced-param-attrs.rs
diff --git a/src/test/codegen/default-requires-uwtable.rs b/tests/codegen/default-requires-uwtable.rs
index 5d77d3f14..5d77d3f14 100644
--- a/src/test/codegen/default-requires-uwtable.rs
+++ b/tests/codegen/default-requires-uwtable.rs
diff --git a/src/test/codegen/dllimports/auxiliary/dummy.rs b/tests/codegen/dllimports/auxiliary/dummy.rs
index 113a164f1..113a164f1 100644
--- a/src/test/codegen/dllimports/auxiliary/dummy.rs
+++ b/tests/codegen/dllimports/auxiliary/dummy.rs
diff --git a/src/test/codegen/dllimports/auxiliary/wrapper.rs b/tests/codegen/dllimports/auxiliary/wrapper.rs
index 7aa90920a..7aa90920a 100644
--- a/src/test/codegen/dllimports/auxiliary/wrapper.rs
+++ b/tests/codegen/dllimports/auxiliary/wrapper.rs
diff --git a/tests/codegen/dllimports/main.rs b/tests/codegen/dllimports/main.rs
new file mode 100644
index 000000000..383940e95
--- /dev/null
+++ b/tests/codegen/dllimports/main.rs
@@ -0,0 +1,43 @@
+ // This test is for *-windows-msvc only.
+// only-windows
+// ignore-gnu
+
+// aux-build:dummy.rs
+// aux-build:wrapper.rs
+
+extern crate wrapper;
+
+// Check that external symbols coming from foreign dylibs are adorned with 'dllimport',
+// whereas symbols coming from foreign staticlibs are not. (RFC-1717)
+
+// CHECK: @dylib_global1 = external dllimport local_unnamed_addr global i32
+// CHECK: @dylib_global2 = external dllimport local_unnamed_addr global i32
+// CHECK: @static_global1 = external local_unnamed_addr global i32
+// CHECK: @static_global2 = external local_unnamed_addr global i32
+
+// CHECK: declare dllimport noundef i32 @dylib_func1(i32 noundef)
+// CHECK: declare dllimport noundef i32 @dylib_func2(i32 noundef)
+// CHECK: declare noundef i32 @static_func1(i32 noundef)
+// CHECK: declare noundef i32 @static_func2(i32 noundef)
+
+#[link(name = "dummy", kind="dylib")]
+extern "C" {
+    pub fn dylib_func1(x: i32) -> i32;
+    pub static dylib_global1: i32;
+}
+
+#[link(name = "dummy", kind="static")]
+extern "C" {
+    pub fn static_func1(x: i32) -> i32;
+    pub static static_global1: i32;
+}
+
+fn main() {
+    unsafe {
+        dylib_func1(dylib_global1);
+        wrapper::dylib_func2(wrapper::dylib_global2);
+
+        static_func1(static_global1);
+        wrapper::static_func2(wrapper::static_global2);
+    }
+}
diff --git a/src/test/codegen/drop.rs b/tests/codegen/drop.rs
index 994028271..994028271 100644
--- a/src/test/codegen/drop.rs
+++ b/tests/codegen/drop.rs
diff --git a/tests/codegen/dst-vtable-align-nonzero.rs b/tests/codegen/dst-vtable-align-nonzero.rs
new file mode 100644
index 000000000..54f6e7f99
--- /dev/null
+++ b/tests/codegen/dst-vtable-align-nonzero.rs
@@ -0,0 +1,61 @@
+// compile-flags: -O -Z merge-functions=disabled
+
+#![crate_type = "lib"]
+#![feature(core_intrinsics)]
+
+// This test checks that we annotate alignment loads from vtables with nonzero range metadata,
+// and that this allows LLVM to eliminate redundant `align >= 1` checks.
+
+pub trait Trait {
+    fn f(&self);
+}
+
+pub struct WrapperWithAlign1<T: ?Sized> { x: u8, y: T }
+
+pub struct WrapperWithAlign2<T: ?Sized> { x: u16, y: T }
+
+pub struct Struct<W: ?Sized> {
+    _field: i8,
+    dst: W,
+}
+
+// CHECK-LABEL: @eliminates_runtime_check_when_align_1
+#[no_mangle]
+pub fn eliminates_runtime_check_when_align_1(
+    x: &Struct<WrapperWithAlign1<dyn Trait>>
+) -> &WrapperWithAlign1<dyn Trait> {
+    // CHECK: load [[USIZE:i[0-9]+]], {{.+}} !range [[RANGE_META:![0-9]+]]
+    // CHECK-NOT: llvm.umax
+    // CHECK-NOT: icmp
+    // CHECK-NOT: select
+    // CHECK: ret
+    &x.dst
+}
+
+// CHECK-LABEL: @does_not_eliminate_runtime_check_when_align_2
+#[no_mangle]
+pub fn does_not_eliminate_runtime_check_when_align_2(
+    x: &Struct<WrapperWithAlign2<dyn Trait>>
+) -> &WrapperWithAlign2<dyn Trait> {
+    // CHECK: [[X0:%[0-9]+]] = load [[USIZE]], {{.+}} !range [[RANGE_META]]
+    // CHECK: {{icmp|llvm.umax}}
+    // CHECK: ret
+    &x.dst
+}
+
+// CHECK-LABEL: @align_load_from_align_of_val
+#[no_mangle]
+pub fn align_load_from_align_of_val(x: &dyn Trait) -> usize {
+    // CHECK: {{%[0-9]+}} = load [[USIZE]], {{.+}} !range [[RANGE_META]]
+    core::mem::align_of_val(x)
+}
+
+// CHECK-LABEL: @align_load_from_vtable_align_intrinsic
+#[no_mangle]
+pub unsafe fn align_load_from_vtable_align_intrinsic(x: &dyn Trait) -> usize {
+    let (data, vtable): (*const (), *const ()) = core::mem::transmute(x);
+    // CHECK: {{%[0-9]+}} = load [[USIZE]], {{.+}} !range [[RANGE_META]]
+    core::intrinsics::vtable_align(vtable)
+}
+
+// CHECK: [[RANGE_META]] = !{[[USIZE]] 1, [[USIZE]] 0}
diff --git a/tests/codegen/dst-vtable-size-range.rs b/tests/codegen/dst-vtable-size-range.rs
new file mode 100644
index 000000000..671c8abde
--- /dev/null
+++ b/tests/codegen/dst-vtable-size-range.rs
@@ -0,0 +1,35 @@
+// compile-flags: -O -Z merge-functions=disabled
+
+#![crate_type = "lib"]
+#![feature(core_intrinsics)]
+
+// Check that we annotate size loads from vtables with 0..(isize::MAX + 1) range metadata.
+
+pub trait Trait {
+    fn f(&self);
+}
+
+// Note that rustc uses inclusive bounds, but LLVM uses exclusive bounds for range metadata.
+// CHECK-LABEL: @generate_exclusive_bound
+#[no_mangle]
+pub fn generate_exclusive_bound() -> usize {
+    // CHECK: ret [[USIZE:i[0-9]+]] [[EXCLUSIVE_BOUND:[-0-9]+]]
+    isize::MAX as usize + 1
+}
+
+// CHECK-LABEL: @size_load_from_size_of_val
+#[no_mangle]
+pub fn size_load_from_size_of_val(x: &dyn Trait) -> usize {
+    // CHECK: {{%[0-9]+}} = load [[USIZE]], {{.+}} !range [[RANGE_META:![0-9]+]]
+    core::mem::size_of_val(x)
+}
+
+// CHECK-LABEL: @size_load_from_vtable_size_intrinsic
+#[no_mangle]
+pub unsafe fn size_load_from_vtable_size_intrinsic(x: &dyn Trait) -> usize {
+    let (data, vtable): (*const (), *const ()) = core::mem::transmute(x);
+    // CHECK: {{%[0-9]+}} = load [[USIZE]], {{.+}} !range [[RANGE_META]]
+    core::intrinsics::vtable_size(vtable)
+}
+
+// CHECK: [[RANGE_META]] = !{[[USIZE]] 0, [[USIZE]] [[EXCLUSIVE_BOUND]]}
diff --git a/src/test/codegen/enum-bounds-check-derived-idx.rs b/tests/codegen/enum-bounds-check-derived-idx.rs
index aa66c2ed0..aa66c2ed0 100644
--- a/src/test/codegen/enum-bounds-check-derived-idx.rs
+++ b/tests/codegen/enum-bounds-check-derived-idx.rs
diff --git a/src/test/codegen/enum-bounds-check-issue-13926.rs b/tests/codegen/enum-bounds-check-issue-13926.rs
index b26945bc5..b26945bc5 100644
--- a/src/test/codegen/enum-bounds-check-issue-13926.rs
+++ b/tests/codegen/enum-bounds-check-issue-13926.rs
diff --git a/src/test/codegen/enum-bounds-check-issue-82871.rs b/tests/codegen/enum-bounds-check-issue-82871.rs
index 32fdc4a5f..32fdc4a5f 100644
--- a/src/test/codegen/enum-bounds-check-issue-82871.rs
+++ b/tests/codegen/enum-bounds-check-issue-82871.rs
diff --git a/src/test/codegen/enum-bounds-check.rs b/tests/codegen/enum-bounds-check.rs
index 17322d591..17322d591 100644
--- a/src/test/codegen/enum-bounds-check.rs
+++ b/tests/codegen/enum-bounds-check.rs
diff --git a/src/test/codegen/enum-debug-clike.rs b/tests/codegen/enum-debug-clike.rs
index 1e369a2c4..1e369a2c4 100644
--- a/src/test/codegen/enum-debug-clike.rs
+++ b/tests/codegen/enum-debug-clike.rs
diff --git a/src/test/codegen/enum-debug-niche-2.rs b/tests/codegen/enum-debug-niche-2.rs
index 9c72ad9d2..9c72ad9d2 100644
--- a/src/test/codegen/enum-debug-niche-2.rs
+++ b/tests/codegen/enum-debug-niche-2.rs
diff --git a/src/test/codegen/enum-debug-niche.rs b/tests/codegen/enum-debug-niche.rs
index b718a6854..b718a6854 100644
--- a/src/test/codegen/enum-debug-niche.rs
+++ b/tests/codegen/enum-debug-niche.rs
diff --git a/src/test/codegen/enum-debug-tagged.rs b/tests/codegen/enum-debug-tagged.rs
index 095c49ac3..095c49ac3 100644
--- a/src/test/codegen/enum-debug-tagged.rs
+++ b/tests/codegen/enum-debug-tagged.rs
diff --git a/src/test/codegen/enum-discriminant-value.rs b/tests/codegen/enum-discriminant-value.rs
index cc14c2120..cc14c2120 100644
--- a/src/test/codegen/enum-discriminant-value.rs
+++ b/tests/codegen/enum-discriminant-value.rs
diff --git a/src/test/codegen/enum-match.rs b/tests/codegen/enum-match.rs
index 44f1b408d..5f8063a27 100644
--- a/src/test/codegen/enum-match.rs
+++ b/tests/codegen/enum-match.rs
@@ -11,7 +11,7 @@ pub enum Enum0 {
     B,
 }
 
-// CHECK: define i8 @match0{{.*}}
+// CHECK: define noundef i8 @match0{{.*}}
 // CHECK-NEXT: start:
 // CHECK-NEXT: %1 = icmp eq i8 %0, 2
 // CHECK-NEXT: %2 = and i8 %0, 1
@@ -32,10 +32,10 @@ pub enum Enum1 {
     C,
 }
 
-// CHECK: define i8 @match1{{.*}}
+// CHECK: define noundef i8 @match1{{.*}}
 // CHECK-NEXT: start:
-// CHECK-NEXT: %1 = {{.*}}call i8 @llvm.usub.sat.i8(i8 %0, i8 1)
-// CHECK-NEXT: switch i8 %1, label {{.*}} [
+// CHECK-NEXT: [[DISCR:%.*]] = {{.*}}call i8 @llvm.usub.sat.i8(i8 %0, i8 1)
+// CHECK-NEXT: switch i8 [[DISCR]], label {{.*}} [
 #[no_mangle]
 pub fn match1(e: Enum1) -> u8 {
     use Enum1::*;
@@ -88,7 +88,7 @@ pub enum Enum2 {
     E,
 }
 
-// CHECK: define i8 @match2{{.*}}
+// CHECK: define noundef i8 @match2{{.*}}
 // CHECK-NEXT: start:
 // CHECK-NEXT: %1 = add i8 %0, 2
 // CHECK-NEXT: %2 = zext i8 %1 to i64
diff --git a/src/test/codegen/export-no-mangle.rs b/tests/codegen/export-no-mangle.rs
index a89d48ee1..a89d48ee1 100644
--- a/src/test/codegen/export-no-mangle.rs
+++ b/tests/codegen/export-no-mangle.rs
diff --git a/src/test/codegen/external-no-mangle-fns.rs b/tests/codegen/external-no-mangle-fns.rs
index 70349b2ec..70349b2ec 100644
--- a/src/test/codegen/external-no-mangle-fns.rs
+++ b/tests/codegen/external-no-mangle-fns.rs
diff --git a/src/test/codegen/external-no-mangle-statics.rs b/tests/codegen/external-no-mangle-statics.rs
index c6ecb7aa9..c6ecb7aa9 100644
--- a/src/test/codegen/external-no-mangle-statics.rs
+++ b/tests/codegen/external-no-mangle-statics.rs
diff --git a/tests/codegen/fastcall-inreg.rs b/tests/codegen/fastcall-inreg.rs
new file mode 100644
index 000000000..02f5d5459
--- /dev/null
+++ b/tests/codegen/fastcall-inreg.rs
@@ -0,0 +1,41 @@
+// Checks if the "fastcall" calling convention marks function arguments
+// as "inreg" like the C/C++ compilers for the platforms.
+// x86 only.
+
+// compile-flags: --target i686-unknown-linux-gnu -O -C no-prepopulate-passes
+// needs-llvm-components: x86
+
+#![crate_type = "lib"]
+#![no_core]
+#![feature(no_core, lang_items)]
+
+#[lang = "sized"]
+trait Sized {}
+#[lang = "copy"]
+trait Copy {}
+
+pub mod tests {
+    // CHECK: @f1(i32 inreg noundef %_1, i32 inreg noundef %_2, i32 noundef %_3)
+    #[no_mangle]
+    pub extern "fastcall" fn f1(_: i32, _: i32, _: i32) {}
+
+    // CHECK: @f2({{i32\*|ptr}} inreg noundef %_1, {{i32\*|ptr}} inreg noundef %_2, {{i32\*|ptr}} noundef %_3)
+    #[no_mangle]
+    pub extern "fastcall" fn f2(_: *const i32, _: *const i32, _: *const i32) {}
+
+    // CHECK: @f3(float noundef %_1, i32 inreg noundef %_2, i32 inreg noundef %_3, i32 noundef %_4)
+    #[no_mangle]
+    pub extern "fastcall" fn f3(_: f32, _: i32, _: i32, _: i32) {}
+
+    // CHECK: @f4(i32 inreg noundef %_1, float noundef %_2, i32 inreg noundef %_3, i32 noundef %_4)
+    #[no_mangle]
+    pub extern "fastcall" fn f4(_: i32, _: f32, _: i32, _: i32) {}
+
+    // CHECK: @f5(i64 noundef %_1, i32 noundef %_2)
+    #[no_mangle]
+    pub extern "fastcall" fn f5(_: i64, _: i32) {}
+
+    // CHECK: @f6(i1 inreg noundef zeroext %_1, i32 inreg noundef %_2, i32 noundef %_3)
+    #[no_mangle]
+    pub extern "fastcall" fn f6(_: bool, _: i32, _: i32) {}
+}
diff --git a/src/test/codegen/fatptr.rs b/tests/codegen/fatptr.rs
index 1c49b5714..1c49b5714 100644
--- a/src/test/codegen/fatptr.rs
+++ b/tests/codegen/fatptr.rs
diff --git a/src/test/codegen/fewer-names.rs b/tests/codegen/fewer-names.rs
index 7307e0379..ac8cba06b 100644
--- a/src/test/codegen/fewer-names.rs
+++ b/tests/codegen/fewer-names.rs
@@ -7,11 +7,11 @@
 
 #[no_mangle]
 pub fn sum(x: u32, y: u32) -> u32 {
-// YES-LABEL: define{{.*}}i32 @sum(i32 %0, i32 %1)
+// YES-LABEL: define{{.*}}i32 @sum(i32 noundef %0, i32 noundef %1)
 // YES-NEXT:    %3 = add i32 %1, %0
 // YES-NEXT:    ret i32 %3
 
-// NO-LABEL: define{{.*}}i32 @sum(i32 %x, i32 %y)
+// NO-LABEL: define{{.*}}i32 @sum(i32 noundef %x, i32 noundef %y)
 // NO-NEXT:  start:
 // NO-NEXT:    %z = add i32 %y, %x
 // NO-NEXT:    ret i32 %z
diff --git a/src/test/codegen/ffi-const.rs b/tests/codegen/ffi-const.rs
index 937205034..937205034 100644
--- a/src/test/codegen/ffi-const.rs
+++ b/tests/codegen/ffi-const.rs
diff --git a/src/test/codegen/ffi-out-of-bounds-loads.rs b/tests/codegen/ffi-out-of-bounds-loads.rs
index 099726b2f..099726b2f 100644
--- a/src/test/codegen/ffi-out-of-bounds-loads.rs
+++ b/tests/codegen/ffi-out-of-bounds-loads.rs
diff --git a/src/test/codegen/ffi-pure.rs b/tests/codegen/ffi-pure.rs
index 2ed735813..2ed735813 100644
--- a/src/test/codegen/ffi-pure.rs
+++ b/tests/codegen/ffi-pure.rs
diff --git a/src/test/codegen/ffi-returns-twice.rs b/tests/codegen/ffi-returns-twice.rs
index 0fbe03f0b..0fbe03f0b 100644
--- a/src/test/codegen/ffi-returns-twice.rs
+++ b/tests/codegen/ffi-returns-twice.rs
diff --git a/src/test/codegen/float_math.rs b/tests/codegen/float_math.rs
index 592e09452..592e09452 100644
--- a/src/test/codegen/float_math.rs
+++ b/tests/codegen/float_math.rs
diff --git a/src/test/codegen/fn-impl-trait-self.rs b/tests/codegen/fn-impl-trait-self.rs
index 0abc8a409..0abc8a409 100644
--- a/src/test/codegen/fn-impl-trait-self.rs
+++ b/tests/codegen/fn-impl-trait-self.rs
diff --git a/src/test/codegen/foo.s b/tests/codegen/foo.s
index 304d82aa0..304d82aa0 100644
--- a/src/test/codegen/foo.s
+++ b/tests/codegen/foo.s
diff --git a/src/test/codegen/force-frame-pointers.rs b/tests/codegen/force-frame-pointers.rs
index 637c42346..637c42346 100644
--- a/src/test/codegen/force-frame-pointers.rs
+++ b/tests/codegen/force-frame-pointers.rs
diff --git a/src/test/codegen/force-no-unwind-tables.rs b/tests/codegen/force-no-unwind-tables.rs
index 3ee23f05e..3ee23f05e 100644
--- a/src/test/codegen/force-no-unwind-tables.rs
+++ b/tests/codegen/force-no-unwind-tables.rs
diff --git a/src/test/codegen/force-unwind-tables.rs b/tests/codegen/force-unwind-tables.rs
index 4c0a5602c..4c0a5602c 100644
--- a/src/test/codegen/force-unwind-tables.rs
+++ b/tests/codegen/force-unwind-tables.rs
diff --git a/src/test/codegen/frame-pointer.rs b/tests/codegen/frame-pointer.rs
index f7c02d479..d8933262e 100644
--- a/src/test/codegen/frame-pointer.rs
+++ b/tests/codegen/frame-pointer.rs
@@ -1,4 +1,4 @@
-// compile-flags: --crate-type=rlib
+// compile-flags: --crate-type=rlib -Copt-level=0
 // revisions: aarch64-apple aarch64-linux force x64-apple x64-linux
 // [aarch64-apple] needs-llvm-components: aarch64
 // [aarch64-apple] compile-flags: --target=aarch64-apple-darwin
diff --git a/src/test/codegen/function-arguments-noopt.rs b/tests/codegen/function-arguments-noopt.rs
index ff76405a4..ff76405a4 100644
--- a/src/test/codegen/function-arguments-noopt.rs
+++ b/tests/codegen/function-arguments-noopt.rs
diff --git a/src/test/codegen/function-arguments.rs b/tests/codegen/function-arguments.rs
index 44fee9523..1f979d7b9 100644
--- a/src/test/codegen/function-arguments.rs
+++ b/tests/codegen/function-arguments.rs
@@ -1,11 +1,11 @@
 // compile-flags: -O -C no-prepopulate-passes
 
 #![crate_type = "lib"]
-#![feature(rustc_attrs)]
 
 use std::mem::MaybeUninit;
 use std::num::NonZeroU64;
 use std::marker::PhantomPinned;
+use std::ptr::NonNull;
 
 pub struct S {
   _field: [i32; 8],
@@ -61,7 +61,7 @@ pub fn maybeuninit_char(x: MaybeUninit<char>) -> MaybeUninit<char> {
   x
 }
 
-// CHECK: i64 @int(i64 %x)
+// CHECK: noundef i64 @int(i64 noundef %x)
 #[no_mangle]
 pub fn int(x: u64) -> u64 {
   x
@@ -73,7 +73,7 @@ pub fn nonzero_int(x: NonZeroU64) -> NonZeroU64 {
   x
 }
 
-// CHECK: i64 @option_nonzero_int(i64 %x)
+// CHECK: noundef i64 @option_nonzero_int(i64 noundef %x)
 #[no_mangle]
 pub fn option_nonzero_int(x: Option<NonZeroU64>) -> Option<NonZeroU64> {
   x
@@ -138,14 +138,30 @@ pub fn indirect_struct(_: S) {
 pub fn borrowed_struct(_: &S) {
 }
 
-// CHECK: @raw_struct({{%S\*|ptr}} %_1)
+// CHECK: @option_borrow({{i32\*|ptr}} noalias noundef readonly align 4 dereferenceable_or_null(4) %x)
+#[no_mangle]
+pub fn option_borrow(x: Option<&i32>) {
+}
+
+// CHECK: @option_borrow_mut({{i32\*|ptr}} noalias noundef align 4 dereferenceable_or_null(4) %x)
+#[no_mangle]
+pub fn option_borrow_mut(x: Option<&mut i32>) {
+}
+
+// CHECK: @raw_struct({{%S\*|ptr}} noundef %_1)
 #[no_mangle]
 pub fn raw_struct(_: *const S) {
 }
 
+// CHECK: @raw_option_nonnull_struct({{i32\*|ptr}} noundef %_1)
+#[no_mangle]
+pub fn raw_option_nonnull_struct(_: Option<NonNull<S>>) {
+}
+
+
 // `Box` can get deallocated during execution of the function, so it should
 // not get `dereferenceable`.
-// CHECK: noalias noundef nonnull align 4 {{i32\*|ptr}} @_box({{i32\*|ptr}} noalias noundef nonnull align 4 %x)
+// CHECK: noundef nonnull align 4 {{i32\*|ptr}} @_box({{i32\*|ptr}} noalias noundef nonnull align 4 %x)
 #[no_mangle]
 pub fn _box(x: Box<i32>) -> Box<i32> {
   x
@@ -160,35 +176,35 @@ pub fn struct_return() -> S {
 }
 
 // Hack to get the correct size for the length part in slices
-// CHECK: @helper([[USIZE:i[0-9]+]] %_1)
+// CHECK: @helper([[USIZE:i[0-9]+]] noundef %_1)
 #[no_mangle]
 pub fn helper(_: usize) {
 }
 
-// CHECK: @slice({{\[0 x i8\]\*|ptr}} noalias noundef nonnull readonly align 1 %_1.0, [[USIZE]] %_1.1)
+// CHECK: @slice({{\[0 x i8\]\*|ptr}} noalias noundef nonnull readonly align 1 %_1.0, [[USIZE]] noundef %_1.1)
 // FIXME #25759 This should also have `nocapture`
 #[no_mangle]
 pub fn slice(_: &[u8]) {
 }
 
-// CHECK: @mutable_slice({{\[0 x i8\]\*|ptr}} noalias noundef nonnull align 1 %_1.0, [[USIZE]] %_1.1)
+// CHECK: @mutable_slice({{\[0 x i8\]\*|ptr}} noalias noundef nonnull align 1 %_1.0, [[USIZE]] noundef %_1.1)
 // FIXME #25759 This should also have `nocapture`
 #[no_mangle]
 pub fn mutable_slice(_: &mut [u8]) {
 }
 
-// CHECK: @unsafe_slice({{\[0 x i16\]\*|ptr}} noundef nonnull align 2 %_1.0, [[USIZE]] %_1.1)
+// CHECK: @unsafe_slice({{\[0 x i16\]\*|ptr}} noundef nonnull align 2 %_1.0, [[USIZE]] noundef %_1.1)
 // unsafe interior means this isn't actually readonly and there may be aliases ...
 #[no_mangle]
 pub fn unsafe_slice(_: &[UnsafeInner]) {
 }
 
-// CHECK: @raw_slice({{\[0 x i8\]\*|ptr}} %_1.0, [[USIZE]] %_1.1)
+// CHECK: @raw_slice({{\[0 x i8\]\*|ptr}} noundef %_1.0, [[USIZE]] noundef %_1.1)
 #[no_mangle]
 pub fn raw_slice(_: *const [u8]) {
 }
 
-// CHECK: @str({{\[0 x i8\]\*|ptr}} noalias noundef nonnull readonly align 1 %_1.0, [[USIZE]] %_1.1)
+// CHECK: @str({{\[0 x i8\]\*|ptr}} noalias noundef nonnull readonly align 1 %_1.0, [[USIZE]] noundef %_1.1)
 // FIXME #25759 This should also have `nocapture`
 #[no_mangle]
 pub fn str(_: &[u8]) {
@@ -197,26 +213,36 @@ pub fn str(_: &[u8]) {
 // CHECK: @trait_borrow({{\{\}\*|ptr}} noundef nonnull align 1 %_1.0, {{.+}} noalias noundef readonly align {{.*}} dereferenceable({{.*}}) %_1.1)
 // FIXME #25759 This should also have `nocapture`
 #[no_mangle]
-pub fn trait_borrow(_: &Drop) {
+pub fn trait_borrow(_: &dyn Drop) {
+}
+
+// CHECK: @option_trait_borrow({{i8\*|ptr}} noundef align 1 %x.0, {{i8\*|ptr}} %x.1)
+#[no_mangle]
+pub fn option_trait_borrow(x: Option<&dyn Drop>) {
+}
+
+// CHECK: @option_trait_borrow_mut({{i8\*|ptr}} noundef align 1 %x.0, {{i8\*|ptr}} %x.1)
+#[no_mangle]
+pub fn option_trait_borrow_mut(x: Option<&mut dyn Drop>) {
 }
 
-// CHECK: @trait_raw({{\{\}\*|ptr}} %_1.0, {{.+}} noalias noundef readonly align {{.*}} dereferenceable({{.*}}) %_1.1)
+// CHECK: @trait_raw({{\{\}\*|ptr}} noundef %_1.0, {{.+}} noalias noundef readonly align {{.*}} dereferenceable({{.*}}) %_1.1)
 #[no_mangle]
-pub fn trait_raw(_: *const Drop) {
+pub fn trait_raw(_: *const dyn Drop) {
 }
 
 // CHECK: @trait_box({{\{\}\*|ptr}} noalias noundef nonnull align 1{{( %0)?}}, {{.+}} noalias noundef readonly align {{.*}} dereferenceable({{.*}}){{( %1)?}})
 #[no_mangle]
-pub fn trait_box(_: Box<Drop>) {
+pub fn trait_box(_: Box<dyn Drop>) {
 }
 
 // CHECK: { {{i8\*|ptr}}, {{i8\*|ptr}} } @trait_option({{i8\*|ptr}} noalias noundef align 1 %x.0, {{i8\*|ptr}} %x.1)
 #[no_mangle]
-pub fn trait_option(x: Option<Box<Drop>>) -> Option<Box<Drop>> {
+pub fn trait_option(x: Option<Box<dyn Drop>>) -> Option<Box<dyn Drop>> {
   x
 }
 
-// CHECK: { {{\[0 x i16\]\*|ptr}}, [[USIZE]] } @return_slice({{\[0 x i16\]\*|ptr}} noalias noundef nonnull readonly align 2 %x.0, [[USIZE]] %x.1)
+// CHECK: { {{\[0 x i16\]\*|ptr}}, [[USIZE]] } @return_slice({{\[0 x i16\]\*|ptr}} noalias noundef nonnull readonly align 2 %x.0, [[USIZE]] noundef %x.1)
 #[no_mangle]
 pub fn return_slice(x: &[u16]) -> &[u16] {
   x
diff --git a/src/test/codegen/gdb_debug_script_load.rs b/tests/codegen/gdb_debug_script_load.rs
index 002be8d1b..002be8d1b 100644
--- a/src/test/codegen/gdb_debug_script_load.rs
+++ b/tests/codegen/gdb_debug_script_load.rs
diff --git a/src/test/codegen/generator-debug-msvc.rs b/tests/codegen/generator-debug-msvc.rs
index 9d70ccdef..9d70ccdef 100644
--- a/src/test/codegen/generator-debug-msvc.rs
+++ b/tests/codegen/generator-debug-msvc.rs
diff --git a/src/test/codegen/generator-debug.rs b/tests/codegen/generator-debug.rs
index 3ec860f2c..3ec860f2c 100644
--- a/src/test/codegen/generator-debug.rs
+++ b/tests/codegen/generator-debug.rs
diff --git a/src/test/codegen/generic-debug.rs b/tests/codegen/generic-debug.rs
index eea16805c..eea16805c 100644
--- a/src/test/codegen/generic-debug.rs
+++ b/tests/codegen/generic-debug.rs
diff --git a/src/test/codegen/global_asm.rs b/tests/codegen/global_asm.rs
index fab84868f..fab84868f 100644
--- a/src/test/codegen/global_asm.rs
+++ b/tests/codegen/global_asm.rs
diff --git a/src/test/codegen/global_asm_include.rs b/tests/codegen/global_asm_include.rs
index 02ee91645..02ee91645 100644
--- a/src/test/codegen/global_asm_include.rs
+++ b/tests/codegen/global_asm_include.rs
diff --git a/src/test/codegen/global_asm_x2.rs b/tests/codegen/global_asm_x2.rs
index bdcf0ea84..bdcf0ea84 100644
--- a/src/test/codegen/global_asm_x2.rs
+++ b/tests/codegen/global_asm_x2.rs
diff --git a/src/test/codegen/i686-macosx-deployment-target.rs b/tests/codegen/i686-macosx-deployment-target.rs
index 17258a264..17258a264 100644
--- a/src/test/codegen/i686-macosx-deployment-target.rs
+++ b/tests/codegen/i686-macosx-deployment-target.rs
diff --git a/src/test/codegen/i686-no-macosx-deployment-target.rs b/tests/codegen/i686-no-macosx-deployment-target.rs
index 043040a95..043040a95 100644
--- a/src/test/codegen/i686-no-macosx-deployment-target.rs
+++ b/tests/codegen/i686-no-macosx-deployment-target.rs
diff --git a/src/test/codegen/inline-always-works-always.rs b/tests/codegen/inline-always-works-always.rs
index 912af782a..912af782a 100644
--- a/src/test/codegen/inline-always-works-always.rs
+++ b/tests/codegen/inline-always-works-always.rs
diff --git a/src/test/codegen/inline-debuginfo.rs b/tests/codegen/inline-debuginfo.rs
index 5b230361f..5b230361f 100644
--- a/src/test/codegen/inline-debuginfo.rs
+++ b/tests/codegen/inline-debuginfo.rs
diff --git a/src/test/codegen/inline-hint.rs b/tests/codegen/inline-hint.rs
index d3ea1915a..d3ea1915a 100644
--- a/src/test/codegen/inline-hint.rs
+++ b/tests/codegen/inline-hint.rs
diff --git a/src/test/codegen/instrument-coverage.rs b/tests/codegen/instrument-coverage.rs
index 78f8875a2..78f8875a2 100644
--- a/src/test/codegen/instrument-coverage.rs
+++ b/tests/codegen/instrument-coverage.rs
diff --git a/src/test/codegen/instrument-mcount.rs b/tests/codegen/instrument-mcount.rs
index b26076e7a..b26076e7a 100644
--- a/src/test/codegen/instrument-mcount.rs
+++ b/tests/codegen/instrument-mcount.rs
diff --git a/src/test/codegen/integer-cmp.rs b/tests/codegen/integer-cmp.rs
index 8ada3cf09..8ada3cf09 100644
--- a/src/test/codegen/integer-cmp.rs
+++ b/tests/codegen/integer-cmp.rs
diff --git a/src/test/codegen/integer-overflow.rs b/tests/codegen/integer-overflow.rs
index 183de56db..183de56db 100644
--- a/src/test/codegen/integer-overflow.rs
+++ b/tests/codegen/integer-overflow.rs
diff --git a/src/test/codegen/internalize-closures.rs b/tests/codegen/internalize-closures.rs
index ab3dc3fba..ab3dc3fba 100644
--- a/src/test/codegen/internalize-closures.rs
+++ b/tests/codegen/internalize-closures.rs
diff --git a/src/test/codegen/intrinsic-no-unnamed-attr.rs b/tests/codegen/intrinsic-no-unnamed-attr.rs
index c8a8e0b3e..c8a8e0b3e 100644
--- a/src/test/codegen/intrinsic-no-unnamed-attr.rs
+++ b/tests/codegen/intrinsic-no-unnamed-attr.rs
diff --git a/src/test/codegen/intrinsics/const_eval_select.rs b/tests/codegen/intrinsics/const_eval_select.rs
index db8a04763..f3877dc6b 100644
--- a/src/test/codegen/intrinsics/const_eval_select.rs
+++ b/tests/codegen/intrinsics/const_eval_select.rs
@@ -1,4 +1,4 @@
-// compile-flags: -C no-prepopulate-passes
+// compile-flags: -C no-prepopulate-passes -Copt-level=0
 
 #![crate_type = "lib"]
 #![feature(const_eval_select)]
diff --git a/src/test/codegen/intrinsics/exact_div.rs b/tests/codegen/intrinsics/exact_div.rs
index 68eaa3999..68eaa3999 100644
--- a/src/test/codegen/intrinsics/exact_div.rs
+++ b/tests/codegen/intrinsics/exact_div.rs
diff --git a/src/test/codegen/intrinsics/likely.rs b/tests/codegen/intrinsics/likely.rs
index c5a0185bd..c5a0185bd 100644
--- a/src/test/codegen/intrinsics/likely.rs
+++ b/tests/codegen/intrinsics/likely.rs
diff --git a/src/test/codegen/intrinsics/mask.rs b/tests/codegen/intrinsics/mask.rs
index 2e984db1b..8f93da2e5 100644
--- a/src/test/codegen/intrinsics/mask.rs
+++ b/tests/codegen/intrinsics/mask.rs
@@ -1,3 +1,4 @@
+// compile-flags: -Copt-level=0
 #![crate_type = "lib"]
 #![feature(core_intrinsics)]
 
@@ -6,6 +7,6 @@
 #[no_mangle]
 pub fn mask_ptr(ptr: *const u16, mask: usize) -> *const u16 {
     // CHECK: call
-    // CHECK-SAME: @llvm.ptrmask.{{p0|p0i8}}.[[WORD]]({{ptr|i8\*}} {{%ptr|%0}}, [[WORD]] %mask)
+    // CHECK-SAME: @llvm.ptrmask.{{p0|p0i8}}.[[WORD]]({{ptr|i8\*}} {{%ptr|%1}}, [[WORD]] %mask)
     core::intrinsics::ptr_mask(ptr, mask)
 }
diff --git a/src/test/codegen/intrinsics/nearby.rs b/tests/codegen/intrinsics/nearby.rs
index 520fe2f18..520fe2f18 100644
--- a/src/test/codegen/intrinsics/nearby.rs
+++ b/tests/codegen/intrinsics/nearby.rs
diff --git a/src/test/codegen/intrinsics/nontemporal.rs b/tests/codegen/intrinsics/nontemporal.rs
index d8ee29452..d8ee29452 100644
--- a/src/test/codegen/intrinsics/nontemporal.rs
+++ b/tests/codegen/intrinsics/nontemporal.rs
diff --git a/src/test/codegen/intrinsics/offset_from.rs b/tests/codegen/intrinsics/offset_from.rs
index d0de4c835..d0de4c835 100644
--- a/src/test/codegen/intrinsics/offset_from.rs
+++ b/tests/codegen/intrinsics/offset_from.rs
diff --git a/src/test/codegen/intrinsics/prefetch.rs b/tests/codegen/intrinsics/prefetch.rs
index 59d7fa638..59d7fa638 100644
--- a/src/test/codegen/intrinsics/prefetch.rs
+++ b/tests/codegen/intrinsics/prefetch.rs
diff --git a/src/test/codegen/intrinsics/unchecked_math.rs b/tests/codegen/intrinsics/unchecked_math.rs
index 419c120ed..419c120ed 100644
--- a/src/test/codegen/intrinsics/unchecked_math.rs
+++ b/tests/codegen/intrinsics/unchecked_math.rs
diff --git a/src/test/codegen/intrinsics/volatile.rs b/tests/codegen/intrinsics/volatile.rs
index 7980c00e7..7980c00e7 100644
--- a/src/test/codegen/intrinsics/volatile.rs
+++ b/tests/codegen/intrinsics/volatile.rs
diff --git a/src/test/codegen/intrinsics/volatile_order.rs b/tests/codegen/intrinsics/volatile_order.rs
index 99469831a..99469831a 100644
--- a/src/test/codegen/intrinsics/volatile_order.rs
+++ b/tests/codegen/intrinsics/volatile_order.rs
diff --git a/src/test/codegen/issue-103285-ptr-addr-overflow-check.rs b/tests/codegen/issue-103285-ptr-addr-overflow-check.rs
index a3499babe..a3499babe 100644
--- a/src/test/codegen/issue-103285-ptr-addr-overflow-check.rs
+++ b/tests/codegen/issue-103285-ptr-addr-overflow-check.rs
diff --git a/tests/codegen/issue-103840.rs b/tests/codegen/issue-103840.rs
new file mode 100644
index 000000000..f19d7031b
--- /dev/null
+++ b/tests/codegen/issue-103840.rs
@@ -0,0 +1,9 @@
+// compile-flags: -O
+#![crate_type = "lib"]
+
+pub fn foo(t: &mut Vec<usize>) {
+    // CHECK-NOT: __rust_dealloc
+    let mut taken = std::mem::take(t);
+    taken.pop();
+    *t = taken;
+}
diff --git a/tests/codegen/issue-105386-ub-in-debuginfo.rs b/tests/codegen/issue-105386-ub-in-debuginfo.rs
new file mode 100644
index 000000000..d54ac9e33
--- /dev/null
+++ b/tests/codegen/issue-105386-ub-in-debuginfo.rs
@@ -0,0 +1,22 @@
+// compile-flags: --crate-type=lib -O -Cdebuginfo=2 -Cno-prepopulate-passes
+// min-llvm-version: 15.0 # this test uses opaque pointer notation
+#![feature(stmt_expr_attributes)]
+
+pub struct S([usize; 8]);
+
+#[no_mangle]
+pub fn outer_function(x: S, y: S) -> usize {
+    (#[inline(always)]|| {
+        let _z = x;
+        y.0[0]
+    })()
+}
+
+// Check that we do not attempt to load from the spilled arg before it is assigned to
+// when generating debuginfo.
+// CHECK-LABEL: @outer_function
+// CHECK: [[spill:%.*]] = alloca %"[closure@{{.*.rs}}:9:23: 9:25]"
+// CHECK-NOT: [[ptr_tmp:%.*]] = getelementptr inbounds %"[closure@{{.*.rs}}:9:23: 9:25]", ptr [[spill]]
+// CHECK-NOT: [[load:%.*]] = load ptr, ptr
+// CHECK: call void @llvm.lifetime.start{{.*}}({{.*}}, ptr [[spill]])
+// CHECK: call void @llvm.memcpy{{.*}}(ptr {{align .*}} [[spill]], ptr {{align .*}} %x
diff --git a/src/test/codegen/issue-13018.rs b/tests/codegen/issue-13018.rs
index b70ea1f48..b70ea1f48 100644
--- a/src/test/codegen/issue-13018.rs
+++ b/tests/codegen/issue-13018.rs
diff --git a/src/test/codegen/issue-15953.rs b/tests/codegen/issue-15953.rs
index 28d284289..28d284289 100644
--- a/src/test/codegen/issue-15953.rs
+++ b/tests/codegen/issue-15953.rs
diff --git a/src/test/codegen/issue-27130.rs b/tests/codegen/issue-27130.rs
index e5ee94e1f..e5ee94e1f 100644
--- a/src/test/codegen/issue-27130.rs
+++ b/tests/codegen/issue-27130.rs
diff --git a/src/test/codegen/issue-32031.rs b/tests/codegen/issue-32031.rs
index 82ba32557..abef92c19 100644
--- a/src/test/codegen/issue-32031.rs
+++ b/tests/codegen/issue-32031.rs
@@ -1,4 +1,4 @@
-// compile-flags: -C no-prepopulate-passes
+// compile-flags: -C no-prepopulate-passes -Copt-level=0
 
 #![crate_type = "lib"]
 
diff --git a/src/test/codegen/issue-32364.rs b/tests/codegen/issue-32364.rs
index 85493a4bb..85493a4bb 100644
--- a/src/test/codegen/issue-32364.rs
+++ b/tests/codegen/issue-32364.rs
diff --git a/src/test/codegen/issue-34634.rs b/tests/codegen/issue-34634.rs
index f53fa240c..f53fa240c 100644
--- a/src/test/codegen/issue-34634.rs
+++ b/tests/codegen/issue-34634.rs
diff --git a/src/test/codegen/issue-34947-pow-i32.rs b/tests/codegen/issue-34947-pow-i32.rs
index 653da8e8b..653da8e8b 100644
--- a/src/test/codegen/issue-34947-pow-i32.rs
+++ b/tests/codegen/issue-34947-pow-i32.rs
diff --git a/src/test/codegen/issue-37945.rs b/tests/codegen/issue-37945.rs
index fe54375bb..fe54375bb 100644
--- a/src/test/codegen/issue-37945.rs
+++ b/tests/codegen/issue-37945.rs
diff --git a/src/test/codegen/issue-44056-macos-tls-align.rs b/tests/codegen/issue-44056-macos-tls-align.rs
index 1a3923f1b..1a3923f1b 100644
--- a/src/test/codegen/issue-44056-macos-tls-align.rs
+++ b/tests/codegen/issue-44056-macos-tls-align.rs
diff --git a/src/test/codegen/issue-45222.rs b/tests/codegen/issue-45222.rs
index e9b05e648..e9b05e648 100644
--- a/src/test/codegen/issue-45222.rs
+++ b/tests/codegen/issue-45222.rs
diff --git a/src/test/codegen/issue-45466.rs b/tests/codegen/issue-45466.rs
index c79542767..c79542767 100644
--- a/src/test/codegen/issue-45466.rs
+++ b/tests/codegen/issue-45466.rs
diff --git a/src/test/codegen/issue-45964-bounds-check-slice-pos.rs b/tests/codegen/issue-45964-bounds-check-slice-pos.rs
index aa59c713b..1daa213fc 100644
--- a/src/test/codegen/issue-45964-bounds-check-slice-pos.rs
+++ b/tests/codegen/issue-45964-bounds-check-slice-pos.rs
@@ -2,6 +2,7 @@
 // prevent optimizing away bounds checks
 
 // compile-flags: -O
+// ignore-debug: the debug assertions get in the way
 
 #![crate_type="rlib"]
 
diff --git a/src/test/codegen/issue-47278.rs b/tests/codegen/issue-47278.rs
index 9076274f4..9076274f4 100644
--- a/src/test/codegen/issue-47278.rs
+++ b/tests/codegen/issue-47278.rs
diff --git a/src/test/codegen/issue-47442.rs b/tests/codegen/issue-47442.rs
index 6944336d3..6944336d3 100644
--- a/src/test/codegen/issue-47442.rs
+++ b/tests/codegen/issue-47442.rs
diff --git a/src/test/codegen/issue-56267-2.rs b/tests/codegen/issue-56267-2.rs
index 4dc9ebfeb..4dc9ebfeb 100644
--- a/src/test/codegen/issue-56267-2.rs
+++ b/tests/codegen/issue-56267-2.rs
diff --git a/src/test/codegen/issue-56267.rs b/tests/codegen/issue-56267.rs
index 7bdd25779..7bdd25779 100644
--- a/src/test/codegen/issue-56267.rs
+++ b/tests/codegen/issue-56267.rs
diff --git a/src/test/codegen/issue-56927.rs b/tests/codegen/issue-56927.rs
index 044d72181..044d72181 100644
--- a/src/test/codegen/issue-56927.rs
+++ b/tests/codegen/issue-56927.rs
diff --git a/src/test/codegen/issue-58881.rs b/tests/codegen/issue-58881.rs
index 0900a3337..00f8953d9 100644
--- a/src/test/codegen/issue-58881.rs
+++ b/tests/codegen/issue-58881.rs
@@ -1,4 +1,4 @@
-// compile-flags: -C no-prepopulate-passes
+// compile-flags: -C no-prepopulate-passes -Copt-level=0
 //
 // only-x86_64
 // ignore-windows
diff --git a/src/test/codegen/issue-59352.rs b/tests/codegen/issue-59352.rs
index d271fe027..d271fe027 100644
--- a/src/test/codegen/issue-59352.rs
+++ b/tests/codegen/issue-59352.rs
diff --git a/src/test/codegen/issue-69101-bounds-check.rs b/tests/codegen/issue-69101-bounds-check.rs
index a3aca3a29..a3aca3a29 100644
--- a/src/test/codegen/issue-69101-bounds-check.rs
+++ b/tests/codegen/issue-69101-bounds-check.rs
diff --git a/src/test/codegen/issue-73031.rs b/tests/codegen/issue-73031.rs
index a09c4bcfb..a09c4bcfb 100644
--- a/src/test/codegen/issue-73031.rs
+++ b/tests/codegen/issue-73031.rs
diff --git a/src/test/codegen/issue-73338-effecient-cmp.rs b/tests/codegen/issue-73338-effecient-cmp.rs
index 85c2bbfd0..85c2bbfd0 100644
--- a/src/test/codegen/issue-73338-effecient-cmp.rs
+++ b/tests/codegen/issue-73338-effecient-cmp.rs
diff --git a/src/test/codegen/issue-73396-bounds-check-after-position.rs b/tests/codegen/issue-73396-bounds-check-after-position.rs
index 8d07a67a1..8d07a67a1 100644
--- a/src/test/codegen/issue-73396-bounds-check-after-position.rs
+++ b/tests/codegen/issue-73396-bounds-check-after-position.rs
diff --git a/src/test/codegen/issue-73827-bounds-check-index-in-subexpr.rs b/tests/codegen/issue-73827-bounds-check-index-in-subexpr.rs
index 1ad05906e..1ad05906e 100644
--- a/src/test/codegen/issue-73827-bounds-check-index-in-subexpr.rs
+++ b/tests/codegen/issue-73827-bounds-check-index-in-subexpr.rs
diff --git a/src/test/codegen/issue-75525-bounds-checks.rs b/tests/codegen/issue-75525-bounds-checks.rs
index 2d363d8f7..2d363d8f7 100644
--- a/src/test/codegen/issue-75525-bounds-checks.rs
+++ b/tests/codegen/issue-75525-bounds-checks.rs
diff --git a/src/test/codegen/issue-75546.rs b/tests/codegen/issue-75546.rs
index 470a9e040..470a9e040 100644
--- a/src/test/codegen/issue-75546.rs
+++ b/tests/codegen/issue-75546.rs
diff --git a/src/test/codegen/issue-75659.rs b/tests/codegen/issue-75659.rs
index 6bcb59aff..6bcb59aff 100644
--- a/src/test/codegen/issue-75659.rs
+++ b/tests/codegen/issue-75659.rs
diff --git a/src/test/codegen/issue-77812.rs b/tests/codegen/issue-77812.rs
index 4cc824145..4cc824145 100644
--- a/src/test/codegen/issue-77812.rs
+++ b/tests/codegen/issue-77812.rs
diff --git a/src/test/codegen/issue-81408-dllimport-thinlto-windows.rs b/tests/codegen/issue-81408-dllimport-thinlto-windows.rs
index 0b6ab4f7e..0b6ab4f7e 100644
--- a/src/test/codegen/issue-81408-dllimport-thinlto-windows.rs
+++ b/tests/codegen/issue-81408-dllimport-thinlto-windows.rs
diff --git a/src/test/codegen/issue-84268.rs b/tests/codegen/issue-84268.rs
index 7ca195447..7ca195447 100644
--- a/src/test/codegen/issue-84268.rs
+++ b/tests/codegen/issue-84268.rs
diff --git a/src/test/codegen/issue-85872-multiple-reverse.rs b/tests/codegen/issue-85872-multiple-reverse.rs
index 591a1aca7..591a1aca7 100644
--- a/src/test/codegen/issue-85872-multiple-reverse.rs
+++ b/tests/codegen/issue-85872-multiple-reverse.rs
diff --git a/tests/codegen/issue-86106.rs b/tests/codegen/issue-86106.rs
new file mode 100644
index 000000000..9ccbcb24f
--- /dev/null
+++ b/tests/codegen/issue-86106.rs
@@ -0,0 +1,62 @@
+// min-llvm-version: 15.0
+// compile-flags: -C opt-level=3 -Z merge-functions=disabled
+
+// The below two functions ensure that both `String::new()` and `"".to_string()`
+// produce the identical code.
+
+#![crate_type = "lib"]
+
+// CHECK-LABEL: define void @string_new
+#[no_mangle]
+pub fn string_new() -> String {
+    // CHECK-NOT: load i8
+    // CHECK: store i{{32|64}}
+    // CHECK-NEXT: getelementptr
+    // CHECK-NEXT: store ptr
+    // CHECK-NEXT: getelementptr
+    // CHECK-NEXT: store i{{32|64}}
+    // CHECK-NEXT: ret void
+    String::new()
+}
+
+// CHECK-LABEL: define void @empty_to_string
+#[no_mangle]
+pub fn empty_to_string() -> String {
+    // CHECK-NOT: load i8
+    // CHECK: store i{{32|64}}
+    // CHECK-NEXT: getelementptr
+    // CHECK-NEXT: store ptr
+    // CHECK-NEXT: getelementptr
+    // CHECK-NEXT: store i{{32|64}}
+    // CHECK-NEXT: ret void
+    "".to_string()
+}
+
+// The below two functions ensure that both `vec![]` and `vec![].clone()`
+// produce the identical code.
+
+// CHECK-LABEL: @empty_vec
+#[no_mangle]
+pub fn empty_vec() -> Vec<u8> {
+    // CHECK: store i{{32|64}}
+    // CHECK-NOT: load i8
+    // CHECK-NEXT: getelementptr
+    // CHECK-NEXT: store ptr
+    // CHECK-NEXT: getelementptr
+    // CHECK-NEXT: store i{{32|64}}
+    // CHECK-NEXT: ret void
+    vec![]
+}
+
+// CHECK-LABEL: @empty_vec_clone
+#[no_mangle]
+pub fn empty_vec_clone() -> Vec<u8> {
+    // CHECK: store i{{32|64}}
+    // CHECK-NOT: load i8
+    // CHECK-NEXT: getelementptr
+    // CHECK-NEXT: store ptr
+    // CHECK-NEXT: getelementptr
+    // CHECK-NEXT: store i{{32|64}}
+    // CHECK-NEXT: ret void
+    vec![].clone()
+}
diff --git a/src/test/codegen/issue-96274.rs b/tests/codegen/issue-96274.rs
index 28bfcce0d..28bfcce0d 100644
--- a/src/test/codegen/issue-96274.rs
+++ b/tests/codegen/issue-96274.rs
diff --git a/src/test/codegen/issue-96497-slice-size-nowrap.rs b/tests/codegen/issue-96497-slice-size-nowrap.rs
index a5dbef934..0413ed6b2 100644
--- a/src/test/codegen/issue-96497-slice-size-nowrap.rs
+++ b/tests/codegen/issue-96497-slice-size-nowrap.rs
@@ -3,7 +3,7 @@
 // in some situations, see https://github.com/rust-lang/rust/issues/96497#issuecomment-1112865218
 
 // compile-flags: -O
-// min-llvm-version: 14.0
+// min-llvm-version: 15.0
 
 #![crate_type="lib"]
 
diff --git a/src/test/codegen/issue-98156-const-arg-temp-lifetime.rs b/tests/codegen/issue-98156-const-arg-temp-lifetime.rs
index 12ace5fff..12ace5fff 100644
--- a/src/test/codegen/issue-98156-const-arg-temp-lifetime.rs
+++ b/tests/codegen/issue-98156-const-arg-temp-lifetime.rs
diff --git a/src/test/codegen/issue-98294-get-mut-copy-from-slice-opt.rs b/tests/codegen/issue-98294-get-mut-copy-from-slice-opt.rs
index 7da29cd79..7da29cd79 100644
--- a/src/test/codegen/issue-98294-get-mut-copy-from-slice-opt.rs
+++ b/tests/codegen/issue-98294-get-mut-copy-from-slice-opt.rs
diff --git a/src/test/codegen/iter-repeat-n-trivial-drop.rs b/tests/codegen/iter-repeat-n-trivial-drop.rs
index 20e1d9b4d..24059f190 100644
--- a/src/test/codegen/iter-repeat-n-trivial-drop.rs
+++ b/tests/codegen/iter-repeat-n-trivial-drop.rs
@@ -46,7 +46,7 @@ pub fn iter_repeat_n_next(it: &mut std::iter::RepeatN<NotCopy>) -> Option<NotCop
 #[no_mangle]
 // CHECK-LABEL: @vec_extend_via_iter_repeat_n
 pub fn vec_extend_via_iter_repeat_n() -> Vec<u8> {
-    // CHECK: %[[ADDR:.+]] = tail call dereferenceable_or_null(1234) ptr @__rust_alloc(i64 1234, i64 1)
+    // CHECK: %[[ADDR:.+]] = tail call noundef dereferenceable_or_null(1234) ptr @__rust_alloc(i64 noundef 1234, i64 noundef 1)
     // CHECK: tail call void @llvm.memset.p0.i64(ptr noundef nonnull align 1 dereferenceable(1234) %[[ADDR]], i8 42, i64 1234,
 
     let n = 1234_usize;
diff --git a/src/test/codegen/layout-size-checks.rs b/tests/codegen/layout-size-checks.rs
index d067cc10a..d067cc10a 100644
--- a/src/test/codegen/layout-size-checks.rs
+++ b/tests/codegen/layout-size-checks.rs
diff --git a/src/test/codegen/lifetime_start_end.rs b/tests/codegen/lifetime_start_end.rs
index 471a0b8ce..471a0b8ce 100644
--- a/src/test/codegen/lifetime_start_end.rs
+++ b/tests/codegen/lifetime_start_end.rs
diff --git a/src/test/codegen/link-dead-code.rs b/tests/codegen/link-dead-code.rs
index de5a237c5..de5a237c5 100644
--- a/src/test/codegen/link-dead-code.rs
+++ b/tests/codegen/link-dead-code.rs
diff --git a/src/test/codegen/link_section.rs b/tests/codegen/link_section.rs
index 88b8692b0..88b8692b0 100644
--- a/src/test/codegen/link_section.rs
+++ b/tests/codegen/link_section.rs
diff --git a/src/test/codegen/loads.rs b/tests/codegen/loads.rs
index f448306ba..f29a26596 100644
--- a/src/test/codegen/loads.rs
+++ b/tests/codegen/loads.rs
@@ -50,8 +50,8 @@ pub fn load_scalar_pair<'a>(x: &(&'a i32, &'a Align16)) -> (&'a i32, &'a Align16
 // CHECK-LABEL: @load_raw_pointer
 #[no_mangle]
 pub fn load_raw_pointer<'a>(x: &*const i32) -> *const i32 {
-    // loaded raw pointer should not have !nonnull, !align, or !noundef metadata
-    // CHECK: load {{i32\*|ptr}}, {{i32\*\*|ptr}} %x, align [[PTR_ALIGNMENT]]{{$}}
+    // loaded raw pointer should not have !nonnull or !align metadata
+    // CHECK: load {{i32\*|ptr}}, {{i32\*\*|ptr}} %x, align [[PTR_ALIGNMENT]], !noundef ![[NOUNDEF:[0-9]+]]{{$}}
     *x
 }
 
@@ -93,7 +93,7 @@ pub fn load_maybeuninit_enum_bool(x: &MaybeUninit<MyBool>) -> MaybeUninit<MyBool
 // CHECK-LABEL: @load_int
 #[no_mangle]
 pub fn load_int(x: &u16) -> u16 {
-    // CHECK: load i16, {{i16\*|ptr}} %x, align 2{{$}}
+    // CHECK: load i16, {{i16\*|ptr}} %x, align 2, !noundef ![[NOUNDEF]]{{$}}
     *x
 }
 
@@ -107,7 +107,7 @@ pub fn load_nonzero_int(x: &NonZeroU16) -> NonZeroU16 {
 // CHECK-LABEL: @load_option_nonzero_int
 #[no_mangle]
 pub fn load_option_nonzero_int(x: &Option<NonZeroU16>) -> Option<NonZeroU16> {
-    // CHECK: load i16, {{i16\*|ptr}} %x, align 2{{$}}
+    // CHECK: load i16, {{i16\*|ptr}} %x, align 2, !noundef ![[NOUNDEF]]{{$}}
     *x
 }
 
diff --git a/src/test/codegen/local-generics-in-exe-internalized.rs b/tests/codegen/local-generics-in-exe-internalized.rs
index e5430fbf1..e5430fbf1 100644
--- a/src/test/codegen/local-generics-in-exe-internalized.rs
+++ b/tests/codegen/local-generics-in-exe-internalized.rs
diff --git a/src/test/codegen/lto-removes-invokes.rs b/tests/codegen/lto-removes-invokes.rs
index 3979a97dc..3979a97dc 100644
--- a/src/test/codegen/lto-removes-invokes.rs
+++ b/tests/codegen/lto-removes-invokes.rs
diff --git a/src/test/codegen/mainsubprogram.rs b/tests/codegen/mainsubprogram.rs
index 790db3343..790db3343 100644
--- a/src/test/codegen/mainsubprogram.rs
+++ b/tests/codegen/mainsubprogram.rs
diff --git a/src/test/codegen/mainsubprogramstart.rs b/tests/codegen/mainsubprogramstart.rs
index d4de9f59a..d4de9f59a 100644
--- a/src/test/codegen/mainsubprogramstart.rs
+++ b/tests/codegen/mainsubprogramstart.rs
diff --git a/src/test/codegen/match-optimized.rs b/tests/codegen/match-optimized.rs
index 36402cc73..520c46a0d 100644
--- a/src/test/codegen/match-optimized.rs
+++ b/tests/codegen/match-optimized.rs
@@ -42,7 +42,7 @@ pub enum E2 {
 }
 
 // For optimized code we produce a switch with an unreachable target as the `otherwise` so LLVM
-// knows the possible values. Compare with `src/test/codegen/match-unoptimized.rs`.
+// knows the possible values. Compare with `tests/codegen/match-unoptimized.rs`.
 
 // CHECK-LABEL: @exhaustive_match_2
 #[no_mangle]
diff --git a/src/test/codegen/match-optimizes-away.rs b/tests/codegen/match-optimizes-away.rs
index 8f66c518c..8f66c518c 100644
--- a/src/test/codegen/match-optimizes-away.rs
+++ b/tests/codegen/match-optimizes-away.rs
diff --git a/src/test/codegen/match-unoptimized.rs b/tests/codegen/match-unoptimized.rs
index be40b29e3..78ea4f9b4 100644
--- a/src/test/codegen/match-unoptimized.rs
+++ b/tests/codegen/match-unoptimized.rs
@@ -9,7 +9,7 @@ pub enum E2 {
 }
 
 // For unoptimized code we produce a `br` instead of a `switch`. Compare with
-// `src/test/codegen/match-optimized.rs`
+// `tests/codegen/match-optimized.rs`
 
 // CHECK-LABEL: @exhaustive_match_2
 #[no_mangle]
diff --git a/src/test/codegen/mem-replace-direct-memcpy.rs b/tests/codegen/mem-replace-direct-memcpy.rs
index e8bbf0e1b..e8bbf0e1b 100644
--- a/src/test/codegen/mem-replace-direct-memcpy.rs
+++ b/tests/codegen/mem-replace-direct-memcpy.rs
diff --git a/src/test/codegen/merge-functions.rs b/tests/codegen/merge-functions.rs
index 8e8fe5c96..8e8fe5c96 100644
--- a/src/test/codegen/merge-functions.rs
+++ b/tests/codegen/merge-functions.rs
diff --git a/src/test/codegen/mir-inlined-line-numbers.rs b/tests/codegen/mir-inlined-line-numbers.rs
index 19d83f0ee..19d83f0ee 100644
--- a/src/test/codegen/mir-inlined-line-numbers.rs
+++ b/tests/codegen/mir-inlined-line-numbers.rs
diff --git a/src/test/codegen/mir_zst_stores.rs b/tests/codegen/mir_zst_stores.rs
index 17e7ba309..17e7ba309 100644
--- a/src/test/codegen/mir_zst_stores.rs
+++ b/tests/codegen/mir_zst_stores.rs
diff --git a/tests/codegen/move-operands.rs b/tests/codegen/move-operands.rs
new file mode 100644
index 000000000..6c51324a3
--- /dev/null
+++ b/tests/codegen/move-operands.rs
@@ -0,0 +1,12 @@
+// compile-flags: -C no-prepopulate-passes -Zmir-enable-passes=+DestinationPropagation
+
+#![crate_type = "lib"]
+
+type T = [u8; 256];
+
+#[no_mangle]
+pub fn f(a: T, b: fn(_: T, _: T)) {
+    // CHECK: call void @llvm.memcpy.{{.*}}({{i8\*|ptr}} align 1 %{{.*}}, {{i8\*|ptr}} align 1 %{{.*}}, {{.*}} 256, i1 false)
+    // CHECK-NOT: call void @llvm.memcpy.{{.*}}({{i8\*|ptr}} align 1 %{{.*}}, {{i8\*|ptr}} align 1 %{{.*}}, {{.*}} 256, i1 false)
+    b(a, a)
+}
diff --git a/src/test/codegen/naked-functions.rs b/tests/codegen/naked-functions.rs
index 51c7a0c61..e05bbc26e 100644
--- a/src/test/codegen/naked-functions.rs
+++ b/tests/codegen/naked-functions.rs
@@ -1,4 +1,4 @@
-// compile-flags: -C no-prepopulate-passes
+// compile-flags: -C no-prepopulate-passes -Copt-level=0
 // needs-asm-support
 // only-x86_64
 
diff --git a/src/test/codegen/naked-nocoverage.rs b/tests/codegen/naked-nocoverage.rs
index 91a6260bf..91a6260bf 100644
--- a/src/test/codegen/naked-nocoverage.rs
+++ b/tests/codegen/naked-nocoverage.rs
diff --git a/src/test/codegen/naked-noinline.rs b/tests/codegen/naked-noinline.rs
index c0ac69f4e..c0ac69f4e 100644
--- a/src/test/codegen/naked-noinline.rs
+++ b/tests/codegen/naked-noinline.rs
diff --git a/src/test/codegen/no-assumes-on-casts.rs b/tests/codegen/no-assumes-on-casts.rs
index b5cfa2775..b5cfa2775 100644
--- a/src/test/codegen/no-assumes-on-casts.rs
+++ b/tests/codegen/no-assumes-on-casts.rs
diff --git a/src/test/codegen/no-dllimport-w-cross-lang-lto.rs b/tests/codegen/no-dllimport-w-cross-lang-lto.rs
index 33fc2bc15..33fc2bc15 100644
--- a/src/test/codegen/no-dllimport-w-cross-lang-lto.rs
+++ b/tests/codegen/no-dllimport-w-cross-lang-lto.rs
diff --git a/tests/codegen/no-jump-tables.rs b/tests/codegen/no-jump-tables.rs
new file mode 100644
index 000000000..8e2cb4756
--- /dev/null
+++ b/tests/codegen/no-jump-tables.rs
@@ -0,0 +1,22 @@
+// Test that the `no-jump-tables` function attribute are (not) emitted when
+// the `-Zno-jump-tables` flag is (not) set.
+
+// revisions: unset set
+// needs-llvm-components: x86
+// compile-flags: --target x86_64-unknown-linux-gnu
+// [set] compile-flags: -Zno-jump-tables
+
+#![crate_type = "lib"]
+#![feature(no_core, lang_items)]
+#![no_core]
+
+#[lang = "sized"]
+trait Sized {}
+
+#[no_mangle]
+pub fn foo() {
+    // CHECK: @foo() unnamed_addr #0
+
+    // unset-NOT: attributes #0 = { {{.*}}"no-jump-tables"="true"{{.*}} }
+    // set: attributes #0 = { {{.*}}"no-jump-tables"="true"{{.*}} }
+}
diff --git a/src/test/codegen/no-plt.rs b/tests/codegen/no-plt.rs
index b36e9ae88..b36e9ae88 100644
--- a/src/test/codegen/no-plt.rs
+++ b/tests/codegen/no-plt.rs
diff --git a/src/test/codegen/noalias-box-off.rs b/tests/codegen/noalias-box-off.rs
index afd17c7c1..afd17c7c1 100644
--- a/src/test/codegen/noalias-box-off.rs
+++ b/tests/codegen/noalias-box-off.rs
diff --git a/src/test/codegen/noalias-box.rs b/tests/codegen/noalias-box.rs
index a3d1f093d..a3d1f093d 100644
--- a/src/test/codegen/noalias-box.rs
+++ b/tests/codegen/noalias-box.rs
diff --git a/tests/codegen/noalias-flag.rs b/tests/codegen/noalias-flag.rs
new file mode 100644
index 000000000..a9ec61e28
--- /dev/null
+++ b/tests/codegen/noalias-flag.rs
@@ -0,0 +1,23 @@
+// compile-flags: -O -Zmutable-noalias=no
+
+#![crate_type = "lib"]
+
+// `-Zmutable-noalias=no` should disable noalias on mut refs...
+
+// CHECK-LABEL: @test_mut_ref(
+// CHECK-NOT: noalias
+// CHECK-SAME: %x
+#[no_mangle]
+pub fn test_mut_ref(x: &mut i32) -> &mut i32 {
+    x
+}
+
+// ...but not on shared refs
+
+// CHECK-LABEL: @test_ref(
+// CHECK-SAME: noalias
+// CHECK-SAME: %x
+#[no_mangle]
+pub fn test_ref(x: &i32) -> &i32 {
+    x
+}
diff --git a/src/test/codegen/noalias-refcell.rs b/tests/codegen/noalias-refcell.rs
index dba73937a..dba73937a 100644
--- a/src/test/codegen/noalias-refcell.rs
+++ b/tests/codegen/noalias-refcell.rs
diff --git a/src/test/codegen/noalias-rwlockreadguard.rs b/tests/codegen/noalias-rwlockreadguard.rs
index 7f7b46c85..7f7b46c85 100644
--- a/src/test/codegen/noalias-rwlockreadguard.rs
+++ b/tests/codegen/noalias-rwlockreadguard.rs
diff --git a/src/test/codegen/noalias-unpin.rs b/tests/codegen/noalias-unpin.rs
index 8ca9b98ee..8ca9b98ee 100644
--- a/src/test/codegen/noalias-unpin.rs
+++ b/tests/codegen/noalias-unpin.rs
diff --git a/src/test/codegen/non-terminate/infinite-loop-1.rs b/tests/codegen/non-terminate/infinite-loop-1.rs
index fa9c66b47..fa9c66b47 100644
--- a/src/test/codegen/non-terminate/infinite-loop-1.rs
+++ b/tests/codegen/non-terminate/infinite-loop-1.rs
diff --git a/src/test/codegen/non-terminate/infinite-loop-2.rs b/tests/codegen/non-terminate/infinite-loop-2.rs
index 81d62ab33..81d62ab33 100644
--- a/src/test/codegen/non-terminate/infinite-loop-2.rs
+++ b/tests/codegen/non-terminate/infinite-loop-2.rs
diff --git a/src/test/codegen/non-terminate/infinite-recursion.rs b/tests/codegen/non-terminate/infinite-recursion.rs
index 6d1f2d4bf..6d1f2d4bf 100644
--- a/src/test/codegen/non-terminate/infinite-recursion.rs
+++ b/tests/codegen/non-terminate/infinite-recursion.rs
diff --git a/src/test/codegen/non-terminate/nonempty-infinite-loop.rs b/tests/codegen/non-terminate/nonempty-infinite-loop.rs
index 5e25e04fc..5e25e04fc 100644
--- a/src/test/codegen/non-terminate/nonempty-infinite-loop.rs
+++ b/tests/codegen/non-terminate/nonempty-infinite-loop.rs
diff --git a/src/test/codegen/noreturn-uninhabited.rs b/tests/codegen/noreturn-uninhabited.rs
index 49f93cf62..49f93cf62 100644
--- a/src/test/codegen/noreturn-uninhabited.rs
+++ b/tests/codegen/noreturn-uninhabited.rs
diff --git a/src/test/codegen/noreturnflag.rs b/tests/codegen/noreturnflag.rs
index 95c100571..95c100571 100644
--- a/src/test/codegen/noreturnflag.rs
+++ b/tests/codegen/noreturnflag.rs
diff --git a/src/test/codegen/nounwind.rs b/tests/codegen/nounwind.rs
index f639c60b8..f639c60b8 100644
--- a/src/test/codegen/nounwind.rs
+++ b/tests/codegen/nounwind.rs
diff --git a/src/test/codegen/nrvo.rs b/tests/codegen/nrvo.rs
index fddb0d1fb..fddb0d1fb 100644
--- a/src/test/codegen/nrvo.rs
+++ b/tests/codegen/nrvo.rs
diff --git a/src/test/codegen/optimize-attr-1.rs b/tests/codegen/optimize-attr-1.rs
index 22abe06e7..22abe06e7 100644
--- a/src/test/codegen/optimize-attr-1.rs
+++ b/tests/codegen/optimize-attr-1.rs
diff --git a/src/test/codegen/option-nonzero-eq.rs b/tests/codegen/option-nonzero-eq.rs
index 598dcc19b..598dcc19b 100644
--- a/src/test/codegen/option-nonzero-eq.rs
+++ b/tests/codegen/option-nonzero-eq.rs
diff --git a/src/test/codegen/packed.rs b/tests/codegen/packed.rs
index fd63b4f0a..fd63b4f0a 100644
--- a/src/test/codegen/packed.rs
+++ b/tests/codegen/packed.rs
diff --git a/src/test/codegen/panic-abort-windows.rs b/tests/codegen/panic-abort-windows.rs
index 2ee29762d..2ee29762d 100644
--- a/src/test/codegen/panic-abort-windows.rs
+++ b/tests/codegen/panic-abort-windows.rs
diff --git a/src/test/codegen/panic-in-drop-abort.rs b/tests/codegen/panic-in-drop-abort.rs
index 7a84484c4..7a84484c4 100644
--- a/src/test/codegen/panic-in-drop-abort.rs
+++ b/tests/codegen/panic-in-drop-abort.rs
diff --git a/src/test/codegen/panic-unwind-default-uwtable.rs b/tests/codegen/panic-unwind-default-uwtable.rs
index 4c85008cf..4c85008cf 100644
--- a/src/test/codegen/panic-unwind-default-uwtable.rs
+++ b/tests/codegen/panic-unwind-default-uwtable.rs
diff --git a/src/test/codegen/personality_lifetimes.rs b/tests/codegen/personality_lifetimes.rs
index 2104022f5..2104022f5 100644
--- a/src/test/codegen/personality_lifetimes.rs
+++ b/tests/codegen/personality_lifetimes.rs
diff --git a/tests/codegen/pgo-counter-bias.rs b/tests/codegen/pgo-counter-bias.rs
new file mode 100644
index 000000000..28caa7f4a
--- /dev/null
+++ b/tests/codegen/pgo-counter-bias.rs
@@ -0,0 +1,10 @@
+// Test that __llvm_profile_counter_bias does not get internalized by lto.
+
+// ignore-macos -runtime-counter-relocation not honored on Mach-O
+// compile-flags: -Cprofile-generate -Cllvm-args=-runtime-counter-relocation -Clto=fat
+// needs-profiler-support
+// no-prefer-dynamic
+
+// CHECK: @__llvm_profile_counter_bias = {{.*}}global
+
+pub fn main() {}
diff --git a/src/test/codegen/pgo-instrumentation.rs b/tests/codegen/pgo-instrumentation.rs
index 05c2d2fc0..05c2d2fc0 100644
--- a/src/test/codegen/pgo-instrumentation.rs
+++ b/tests/codegen/pgo-instrumentation.rs
diff --git a/src/test/codegen/pic-relocation-model.rs b/tests/codegen/pic-relocation-model.rs
index 602a08067..518e949ff 100644
--- a/src/test/codegen/pic-relocation-model.rs
+++ b/tests/codegen/pic-relocation-model.rs
@@ -1,4 +1,4 @@
-// compile-flags: -C relocation-model=pic
+// compile-flags: -C relocation-model=pic -Copt-level=0
 
 #![crate_type = "rlib"]
 
diff --git a/src/test/codegen/pie-relocation-model.rs b/tests/codegen/pie-relocation-model.rs
index ec44edc06..941cca922 100644
--- a/src/test/codegen/pie-relocation-model.rs
+++ b/tests/codegen/pie-relocation-model.rs
@@ -1,4 +1,4 @@
-// compile-flags: -C relocation-model=pie
+// compile-flags: -C relocation-model=pie -Copt-level=0
 // only-x86_64-unknown-linux-gnu
 
 #![crate_type = "rlib"]
diff --git a/src/test/codegen/refs.rs b/tests/codegen/refs.rs
index 0b796754d..a52897667 100644
--- a/src/test/codegen/refs.rs
+++ b/tests/codegen/refs.rs
@@ -1,4 +1,4 @@
-// compile-flags: -C no-prepopulate-passes -Zmir-opt-level=0
+// compile-flags: -C no-prepopulate-passes -Zmir-opt-level=0 -Copt-level=0
 
 #![crate_type = "lib"]
 
diff --git a/src/test/codegen/remap_path_prefix/aux_mod.rs b/tests/codegen/remap_path_prefix/aux_mod.rs
index 44cc4bb72..44cc4bb72 100644
--- a/src/test/codegen/remap_path_prefix/aux_mod.rs
+++ b/tests/codegen/remap_path_prefix/aux_mod.rs
diff --git a/src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs b/tests/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs
index 887915955..887915955 100644
--- a/src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs
+++ b/tests/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs
diff --git a/src/test/codegen/remap_path_prefix/auxiliary/xcrate-generic.rs b/tests/codegen/remap_path_prefix/auxiliary/xcrate-generic.rs
index 59092dbf6..59092dbf6 100644
--- a/src/test/codegen/remap_path_prefix/auxiliary/xcrate-generic.rs
+++ b/tests/codegen/remap_path_prefix/auxiliary/xcrate-generic.rs
diff --git a/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs b/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
index b66abc6be..b66abc6be 100644
--- a/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs
+++ b/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
diff --git a/tests/codegen/remap_path_prefix/main.rs b/tests/codegen/remap_path_prefix/main.rs
new file mode 100644
index 000000000..78ebbccfc
--- /dev/null
+++ b/tests/codegen/remap_path_prefix/main.rs
@@ -0,0 +1,28 @@
+// ignore-windows
+//
+
+// compile-flags: -g  -C no-prepopulate-passes --remap-path-prefix={{cwd}}=/the/cwd --remap-path-prefix={{src-base}}=/the/src -Zinline-mir=no
+// aux-build:remap_path_prefix_aux.rs
+
+extern crate remap_path_prefix_aux;
+
+// Here we check that submodules and include files are found using the path without
+// remapping. This test requires that rustc is called with an absolute path.
+mod aux_mod;
+include!("aux_mod.rs");
+
+// Here we check that the expansion of the file!() macro is mapped.
+// CHECK: @alloc2 = private unnamed_addr constant <{ [34 x i8] }> <{ [34 x i8] c"/the/src/remap_path_prefix/main.rs" }>
+pub static FILE_PATH: &'static str = file!();
+
+fn main() {
+    remap_path_prefix_aux::some_aux_function();
+    aux_mod::some_aux_mod_function();
+    some_aux_mod_function();
+}
+
+// Here we check that local debuginfo is mapped correctly.
+// CHECK: !DIFile(filename: "/the/src/remap_path_prefix/main.rs", directory: ""
+
+// And here that debuginfo from other crates are expanded to absolute paths.
+// CHECK: !DIFile(filename: "/the/aux-src/remap_path_prefix_aux.rs", directory: ""
diff --git a/src/test/codegen/remap_path_prefix/xcrate-generic.rs b/tests/codegen/remap_path_prefix/xcrate-generic.rs
index 7a9d2ca9b..7a9d2ca9b 100644
--- a/src/test/codegen/remap_path_prefix/xcrate-generic.rs
+++ b/tests/codegen/remap_path_prefix/xcrate-generic.rs
diff --git a/src/test/codegen/repeat-trusted-len.rs b/tests/codegen/repeat-trusted-len.rs
index 87c8fe135..87c8fe135 100644
--- a/src/test/codegen/repeat-trusted-len.rs
+++ b/tests/codegen/repeat-trusted-len.rs
diff --git a/src/test/codegen/repr-transparent-aggregates-1.rs b/tests/codegen/repr-transparent-aggregates-1.rs
index 9d18c5f03..f733de12b 100644
--- a/src/test/codegen/repr-transparent-aggregates-1.rs
+++ b/tests/codegen/repr-transparent-aggregates-1.rs
@@ -8,6 +8,7 @@
 // ignore-powerpc
 // ignore-powerpc64
 // ignore-riscv64 see codegen/riscv-abi
+// ignore-s390x
 // ignore-windows
 // See repr-transparent.rs
 
diff --git a/src/test/codegen/repr-transparent-aggregates-2.rs b/tests/codegen/repr-transparent-aggregates-2.rs
index df7e88f08..df7e88f08 100644
--- a/src/test/codegen/repr-transparent-aggregates-2.rs
+++ b/tests/codegen/repr-transparent-aggregates-2.rs
diff --git a/src/test/codegen/repr-transparent-aggregates-3.rs b/tests/codegen/repr-transparent-aggregates-3.rs
index 0db17e6b1..0db17e6b1 100644
--- a/src/test/codegen/repr-transparent-aggregates-3.rs
+++ b/tests/codegen/repr-transparent-aggregates-3.rs
diff --git a/src/test/codegen/repr-transparent-sysv64.rs b/tests/codegen/repr-transparent-sysv64.rs
index 886b0dd9e..886b0dd9e 100644
--- a/src/test/codegen/repr-transparent-sysv64.rs
+++ b/tests/codegen/repr-transparent-sysv64.rs
diff --git a/src/test/codegen/repr-transparent.rs b/tests/codegen/repr-transparent.rs
index c68ba8460..311cbfbaa 100644
--- a/src/test/codegen/repr-transparent.rs
+++ b/tests/codegen/repr-transparent.rs
@@ -2,6 +2,7 @@
 
 // ignore-riscv64 riscv64 has an i128 type used with test_Vector
 // see codegen/riscv-abi for riscv functiona call tests
+// ignore-s390x s390x with default march passes vector types per reference
 
 #![crate_type="lib"]
 #![feature(repr_simd, transparent_unions)]
@@ -17,21 +18,21 @@ pub struct Zst2(());
 #[repr(transparent)]
 pub struct F32(f32);
 
-// CHECK: define{{.*}}float @test_F32(float %_1)
+// CHECK: define{{.*}}float @test_F32(float noundef %_1)
 #[no_mangle]
 pub extern "C" fn test_F32(_: F32) -> F32 { loop {} }
 
 #[repr(transparent)]
 pub struct Ptr(*mut u8);
 
-// CHECK: define{{.*}}{{i8\*|ptr}} @test_Ptr({{i8\*|ptr}} %_1)
+// CHECK: define{{.*}}{{i8\*|ptr}} @test_Ptr({{i8\*|ptr}} noundef %_1)
 #[no_mangle]
 pub extern "C" fn test_Ptr(_: Ptr) -> Ptr { loop {} }
 
 #[repr(transparent)]
 pub struct WithZst(u64, Zst1);
 
-// CHECK: define{{.*}}i64 @test_WithZst(i64 %_1)
+// CHECK: define{{.*}}i64 @test_WithZst(i64 noundef %_1)
 #[no_mangle]
 pub extern "C" fn test_WithZst(_: WithZst) -> WithZst { loop {} }
 
@@ -39,14 +40,14 @@ pub extern "C" fn test_WithZst(_: WithZst) -> WithZst { loop {} }
 pub struct WithZeroSizedArray(*const f32, [i8; 0]);
 
 // Apparently we use i32* when newtype-unwrapping f32 pointers. Whatever.
-// CHECK: define{{.*}}{{i32\*|ptr}} @test_WithZeroSizedArray({{i32\*|ptr}} %_1)
+// CHECK: define{{.*}}{{i32\*|ptr}} @test_WithZeroSizedArray({{i32\*|ptr}} noundef %_1)
 #[no_mangle]
 pub extern "C" fn test_WithZeroSizedArray(_: WithZeroSizedArray) -> WithZeroSizedArray { loop {} }
 
 #[repr(transparent)]
 pub struct Generic<T>(T);
 
-// CHECK: define{{.*}}double @test_Generic(double %_1)
+// CHECK: define{{.*}}double @test_Generic(double noundef %_1)
 #[no_mangle]
 pub extern "C" fn test_Generic(_: Generic<f64>) -> Generic<f64> { loop {} }
 
@@ -63,7 +64,7 @@ pub extern "C" fn test_Gpz(_: GenericPlusZst<Bool>) -> GenericPlusZst<Bool> { lo
 #[repr(transparent)]
 pub struct LifetimePhantom<'a, T: 'a>(*const T, PhantomData<&'a T>);
 
-// CHECK: define{{.*}}{{i16\*|ptr}} @test_LifetimePhantom({{i16\*|ptr}} %_1)
+// CHECK: define{{.*}}{{i16\*|ptr}} @test_LifetimePhantom({{i16\*|ptr}} noundef %_1)
 #[no_mangle]
 pub extern "C" fn test_LifetimePhantom(_: LifetimePhantom<i16>) -> LifetimePhantom<i16> { loop {} }
 
@@ -73,28 +74,28 @@ pub struct UnitPhantom<T, U> { val: T, unit: PhantomData<U> }
 
 pub struct Px;
 
-// CHECK: define{{.*}}float @test_UnitPhantom(float %_1)
+// CHECK: define{{.*}}float @test_UnitPhantom(float noundef %_1)
 #[no_mangle]
 pub extern "C" fn test_UnitPhantom(_: UnitPhantom<f32, Px>) -> UnitPhantom<f32, Px> { loop {} }
 
 #[repr(transparent)]
 pub struct TwoZsts(Zst1, i8, Zst2);
 
-// CHECK: define{{( dso_local)?}}{{( signext)?}} i8 @test_TwoZsts(i8{{( signext)?}} %_1)
+// CHECK: define{{( dso_local)?}} noundef{{( signext)?}} i8 @test_TwoZsts(i8 noundef{{( signext)?}} %_1)
 #[no_mangle]
 pub extern "C" fn test_TwoZsts(_: TwoZsts) -> TwoZsts { loop {} }
 
 #[repr(transparent)]
 pub struct Nested1(Zst2, Generic<f64>);
 
-// CHECK: define{{.*}}double @test_Nested1(double %_1)
+// CHECK: define{{.*}}double @test_Nested1(double noundef %_1)
 #[no_mangle]
 pub extern "C" fn test_Nested1(_: Nested1) -> Nested1 { loop {} }
 
 #[repr(transparent)]
 pub struct Nested2(Nested1, Zst1);
 
-// CHECK: define{{.*}}double @test_Nested2(double %_1)
+// CHECK: define{{.*}}double @test_Nested2(double noundef %_1)
 #[no_mangle]
 pub extern "C" fn test_Nested2(_: Nested2) -> Nested2 { loop {} }
 
@@ -114,7 +115,7 @@ impl<T: ?Sized> Mirror for T { type It = Self; }
 #[repr(transparent)]
 pub struct StructWithProjection(<f32 as Mirror>::It);
 
-// CHECK: define{{.*}}float @test_Projection(float %_1)
+// CHECK: define{{.*}}float @test_Projection(float noundef %_1)
 #[no_mangle]
 pub extern "C" fn test_Projection(_: StructWithProjection) -> StructWithProjection { loop {} }
 
@@ -123,7 +124,7 @@ pub enum EnumF32 {
     Variant(F32)
 }
 
-// CHECK: define{{.*}}float @test_EnumF32(float %_1)
+// CHECK: define{{.*}}float @test_EnumF32(float noundef %_1)
 #[no_mangle]
 pub extern "C" fn test_EnumF32(_: EnumF32) -> EnumF32 { loop {} }
 
@@ -132,7 +133,7 @@ pub enum EnumF32WithZsts {
     Variant(Zst1, F32, Zst2)
 }
 
-// CHECK: define{{.*}}float @test_EnumF32WithZsts(float %_1)
+// CHECK: define{{.*}}float @test_EnumF32WithZsts(float noundef %_1)
 #[no_mangle]
 pub extern "C" fn test_EnumF32WithZsts(_: EnumF32WithZsts) -> EnumF32WithZsts { loop {} }
 
@@ -141,7 +142,7 @@ pub union UnionF32 {
     field: F32,
 }
 
-// CHECK: define{{.*}}float @test_UnionF32(float %_1)
+// CHECK: define{{.*}} float @test_UnionF32(float %_1)
 #[no_mangle]
 pub extern "C" fn test_UnionF32(_: UnionF32) -> UnionF32 { loop {} }
 
diff --git a/src/test/codegen/riscv-abi/call-llvm-intrinsics.rs b/tests/codegen/riscv-abi/call-llvm-intrinsics.rs
index 31a88f2c0..31a88f2c0 100644
--- a/src/test/codegen/riscv-abi/call-llvm-intrinsics.rs
+++ b/tests/codegen/riscv-abi/call-llvm-intrinsics.rs
diff --git a/src/test/codegen/riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs b/tests/codegen/riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs
index 61c4b7b51..045f01985 100644
--- a/src/test/codegen/riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs
+++ b/tests/codegen/riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs
@@ -29,25 +29,25 @@ pub extern "C" fn f_scalar_0(a: bool) -> bool {
     a
 }
 
-// CHECK: define signext i8 @f_scalar_1(i8 signext %x)
+// CHECK: define noundef signext i8 @f_scalar_1(i8 noundef signext %x)
 #[no_mangle]
 pub extern "C" fn f_scalar_1(x: i8) -> i8 {
     x
 }
 
-// CHECK: define zeroext i8 @f_scalar_2(i8 zeroext %x)
+// CHECK: define noundef zeroext i8 @f_scalar_2(i8 noundef zeroext %x)
 #[no_mangle]
 pub extern "C" fn f_scalar_2(x: u8) -> u8 {
     x
 }
 
-// CHECK: define signext i32 @f_scalar_3(i32 signext %x)
+// CHECK: define noundef signext i32 @f_scalar_3(i32 noundef signext %x)
 #[no_mangle]
 pub extern "C" fn f_scalar_3(x: i32) -> u32 {
     x as u32
 }
 
-// CHECK: define i64 @f_scalar_4(i64 %x)
+// CHECK: define noundef i64 @f_scalar_4(i64 noundef %x)
 #[no_mangle]
 pub extern "C" fn f_scalar_4(x: i64) -> i64 {
     x
@@ -132,13 +132,13 @@ pub struct Large {
 pub extern "C" fn f_agg_large(mut x: Large) {
 }
 
-// CHECK: define void @f_agg_large_ret({{%Large\*|ptr}} {{.*}}sret{{.*}}, i32 signext %i, i8 signext %j)
+// CHECK: define void @f_agg_large_ret({{%Large\*|ptr}} {{.*}}sret{{.*}}, i32 noundef signext %i, i8 noundef signext %j)
 #[no_mangle]
 pub extern "C" fn f_agg_large_ret(i: i32, j: i8) -> Large {
     Large { a: 1, b: 2, c: 3, d: 4 }
 }
 
-// CHECK: define void @f_scalar_stack_1(i64 %0, [2 x i64] %1, i128 %2, {{%Large\*|ptr}} {{.*}}%d, i8 zeroext %e, i8 signext %f, i8 %g, i8 %h)
+// CHECK: define void @f_scalar_stack_1(i64 %0, [2 x i64] %1, i128 %2, {{%Large\*|ptr}} {{.*}}%d, i8 noundef zeroext %e, i8 noundef signext %f, i8 noundef %g, i8 noundef %h)
 #[no_mangle]
 pub extern "C" fn f_scalar_stack_1(
     a: Tiny,
@@ -152,7 +152,7 @@ pub extern "C" fn f_scalar_stack_1(
 ) {
 }
 
-// CHECK: define void @f_scalar_stack_2({{%Large\*|ptr}} {{.*}}sret{{.*}} %0, i64 %a, i128 %1, i128 %2, i64 %d, i8 zeroext %e, i8 %f, i8 %g)
+// CHECK: define void @f_scalar_stack_2({{%Large\*|ptr}} {{.*}}sret{{.*}} %0, i64 noundef %a, i128 %1, i128 %2, i64 noundef %d, i8 noundef zeroext %e, i8 noundef %f, i8 noundef %g)
 #[no_mangle]
 pub extern "C" fn f_scalar_stack_2(
     a: u64,
@@ -172,7 +172,7 @@ extern "C" {
 
 #[no_mangle]
 pub unsafe extern "C" fn f_va_caller() {
-    // CHECK: call signext i32 (i32, ...) @f_va_callee(i32 signext 1, i32 signext 2, i64 3, double {{.*}}, double {{.*}}, i64 {{.*}}, [2 x i64] {{.*}}, i128 {{.*}}, {{%Large\*|ptr}} {{.*}})
+    // CHECK: call noundef signext i32 (i32, ...) @f_va_callee(i32 noundef signext 1, i32 noundef signext 2, i64 noundef 3, double {{.*}}, double {{.*}}, i64 {{.*}}, [2 x i64] {{.*}}, i128 {{.*}}, {{%Large\*|ptr}} {{.*}})
     f_va_callee(
         1,
         2i32,
@@ -184,6 +184,6 @@ pub unsafe extern "C" fn f_va_caller() {
         SmallAligned { a: 11 },
         Large { a: 12, b: 13, c: 14, d: 15 },
     );
-    // CHECK: call signext i32 (i32, ...) @f_va_callee(i32 signext 1, i32 signext 2, i32 signext 3, i32 signext 4, i128 {{.*}}, i32 signext 6, i32 signext 7, i32 8, i32 9)
+    // CHECK: call noundef signext i32 (i32, ...) @f_va_callee(i32 noundef signext 1, i32 noundef signext 2, i32 noundef signext 3, i32 noundef signext 4, i128 {{.*}}, i32 noundef signext 6, i32 noundef signext 7, i32 noundef 8, i32 noundef 9)
     f_va_callee(1, 2i32, 3i32, 4i32, SmallAligned { a: 5 }, 6i32, 7i32, 8i32, 9i32);
 }
diff --git a/src/test/codegen/riscv-abi/riscv64-lp64d-abi.rs b/tests/codegen/riscv-abi/riscv64-lp64d-abi.rs
index 1555acadf..1555acadf 100644
--- a/src/test/codegen/riscv-abi/riscv64-lp64d-abi.rs
+++ b/tests/codegen/riscv-abi/riscv64-lp64d-abi.rs
diff --git a/src/test/codegen/riscv-abi/riscv64-lp64f-lp64d-abi.rs b/tests/codegen/riscv-abi/riscv64-lp64f-lp64d-abi.rs
index f08fabed4..f08fabed4 100644
--- a/src/test/codegen/riscv-abi/riscv64-lp64f-lp64d-abi.rs
+++ b/tests/codegen/riscv-abi/riscv64-lp64f-lp64d-abi.rs
diff --git a/src/test/codegen/sanitizer-cfi-add-canonical-jump-tables-flag.rs b/tests/codegen/sanitizer-cfi-add-canonical-jump-tables-flag.rs
index c42fbba74..c42fbba74 100644
--- a/src/test/codegen/sanitizer-cfi-add-canonical-jump-tables-flag.rs
+++ b/tests/codegen/sanitizer-cfi-add-canonical-jump-tables-flag.rs
diff --git a/src/test/codegen/sanitizer-cfi-emit-type-checks.rs b/tests/codegen/sanitizer-cfi-emit-type-checks.rs
index 8be5186de..597b867eb 100644
--- a/src/test/codegen/sanitizer-cfi-emit-type-checks.rs
+++ b/tests/codegen/sanitizer-cfi-emit-type-checks.rs
@@ -1,7 +1,7 @@
 // Verifies that pointer type membership tests for indirect calls are emitted.
 //
 // needs-sanitizer-cfi
-// compile-flags: -Clto -Cno-prepopulate-passes -Ctarget-feature=-crt-static -Zsanitizer=cfi
+// compile-flags: -Clto -Cno-prepopulate-passes -Ctarget-feature=-crt-static -Zsanitizer=cfi -Copt-level=0
 
 #![crate_type="lib"]
 
diff --git a/src/test/codegen/sanitizer-cfi-emit-type-metadata-id-itanium-cxx-abi.rs b/tests/codegen/sanitizer-cfi-emit-type-metadata-id-itanium-cxx-abi.rs
index ece2adbdf..b9c339143 100644
--- a/src/test/codegen/sanitizer-cfi-emit-type-metadata-id-itanium-cxx-abi.rs
+++ b/tests/codegen/sanitizer-cfi-emit-type-metadata-id-itanium-cxx-abi.rs
@@ -131,6 +131,13 @@ pub struct Type13<'a> {
     member3: &'a Type13<'a>,
 }
 
+// Helper type to allow `Type14<Bar>` to be a unique ID
+pub struct Bar;
+
+// repr(transparent) parameterized type
+#[repr(transparent)]
+pub struct Type14<T>(T);
+
 pub fn foo0(_: ()) { }
 // CHECK: define{{.*}}foo0{{.*}}!type ![[TYPE0:[0-9]+]]
 pub fn foo1(_: c_void, _: ()) { }
@@ -425,6 +432,12 @@ pub fn foo145(_: Type13, _: Type13) { }
 // CHECK: define{{.*}}foo145{{.*}}!type ![[TYPE145:[0-9]+]]
 pub fn foo146(_: Type13, _: Type13, _: Type13) { }
 // CHECK: define{{.*}}foo146{{.*}}!type ![[TYPE146:[0-9]+]]
+pub fn foo147(_: Type14<Bar>) { }
+// CHECK: define{{.*}}foo147{{.*}}!type ![[TYPE147:[0-9]+]]
+pub fn foo148(_: Type14<Bar>, _: Type14<Bar>) { }
+// CHECK: define{{.*}}foo148{{.*}}!type ![[TYPE148:[0-9]+]]
+pub fn foo149(_: Type14<Bar>, _: Type14<Bar>, _: Type14<Bar>) { }
+// CHECK: define{{.*}}foo149{{.*}}!type ![[TYPE149:[0-9]+]]
 
 // CHECK: ![[TYPE0]] = !{i64 0, !"_ZTSFvvE"}
 // CHECK: ![[TYPE1]] = !{i64 0, !"_ZTSFvvvE"}
@@ -570,6 +583,9 @@ pub fn foo146(_: Type13, _: Type13, _: Type13) { }
 // CHECK: ![[TYPE141]] = !{i64 0, !"_ZTSFvu{{[0-9]+}}NtC{{[[:print:]]+}}_51sanitizer_cfi_emit_type_metadata_id_itanium_cxx_abi3FooE"}
 // CHECK: ![[TYPE142]] = !{i64 0, !"_ZTSFvu{{[0-9]+}}NtC{{[[:print:]]+}}_51sanitizer_cfi_emit_type_metadata_id_itanium_cxx_abi3FooS_E"}
 // CHECK: ![[TYPE143]] = !{i64 0, !"_ZTSFvu{{[0-9]+}}NtC{{[[:print:]]+}}_51sanitizer_cfi_emit_type_metadata_id_itanium_cxx_abi3FooS_S_E"}
-// CHECK: ![[TYPE144]] = !{i64 0, !"_ZTSFvu3refIu3refIvEEE"}
-// CHECK: ![[TYPE145]] = !{i64 0, !"_ZTSFvu3refIu3refIvEES0_E"}
-// CHECK: ![[TYPE146]] = !{i64 0, !"_ZTSFvu3refIu3refIvEES0_S0_E"}
+// CHECK: ![[TYPE144]] = !{i64 0, !"_ZTSFvu3refIvEE"}
+// CHECK: ![[TYPE145]] = !{i64 0, !"_ZTSFvu3refIvES_E"}
+// CHECK: ![[TYPE146]] = !{i64 0, !"_ZTSFvu3refIvES_S_E"}
+// CHECK: ![[TYPE147]] = !{i64 0, !"_ZTSFvu{{[0-9]+}}NtC{{[[:print:]]+}}_51sanitizer_cfi_emit_type_metadata_id_itanium_cxx_abi3BarE
+// CHECK: ![[TYPE148]] = !{i64 0, !"_ZTSFvu{{[0-9]+}}NtC{{[[:print:]]+}}_51sanitizer_cfi_emit_type_metadata_id_itanium_cxx_abi3BarS_E
+// CHECK: ![[TYPE149]] = !{i64 0, !"_ZTSFvu{{[0-9]+}}NtC{{[[:print:]]+}}_51sanitizer_cfi_emit_type_metadata_id_itanium_cxx_abi3BarS_S_E
diff --git a/src/test/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi.rs b/tests/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi.rs
index bafc4c659..bafc4c659 100644
--- a/src/test/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi.rs
+++ b/tests/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi.rs
diff --git a/tests/codegen/sanitizer-kcfi-add-kcfi-flag.rs b/tests/codegen/sanitizer-kcfi-add-kcfi-flag.rs
new file mode 100644
index 000000000..c2eb852ae
--- /dev/null
+++ b/tests/codegen/sanitizer-kcfi-add-kcfi-flag.rs
@@ -0,0 +1,11 @@
+// Verifies that "kcfi" module flag is added.
+//
+// needs-sanitizer-kcfi
+// compile-flags: -Ctarget-feature=-crt-static -Zsanitizer=kcfi
+
+#![crate_type="lib"]
+
+pub fn foo() {
+}
+
+// CHECK: !{{[0-9]+}} = !{i32 4, !"kcfi", i32 1}
diff --git a/tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi.rs b/tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi.rs
new file mode 100644
index 000000000..2537df80a
--- /dev/null
+++ b/tests/codegen/sanitizer-kcfi-emit-kcfi-operand-bundle-itanium-cxx-abi.rs
@@ -0,0 +1,44 @@
+// Verifies that KCFI type metadata for functions are emitted.
+//
+// revisions: aarch64 x86_64
+// [aarch64] compile-flags: --target aarch64-unknown-none
+// [aarch64] needs-llvm-components: aarch64
+// [x86_64] compile-flags: --target x86_64-unknown-none
+// [x86_64] needs-llvm-components:
+// compile-flags: -Cno-prepopulate-passes -Zsanitizer=kcfi -Copt-level=0
+
+#![crate_type="lib"]
+#![feature(no_core, lang_items)]
+#![no_core]
+
+#[lang="sized"]
+trait Sized { }
+#[lang="copy"]
+trait Copy { }
+
+impl Copy for i32 {}
+
+pub fn foo(f: fn(i32) -> i32, arg: i32) -> i32 {
+    // CHECK-LABEL: define{{.*}}foo
+    // CHECK-SAME: {{.*}}!{{<unknown kind #36>|kcfi_type}} ![[TYPE1:[0-9]+]]
+    // CHECK: call i32 %f(i32 %arg){{.*}}[ "kcfi"(i32 -1666898348) ]
+    f(arg)
+}
+
+pub fn bar(f: fn(i32, i32) -> i32, arg1: i32, arg2: i32) -> i32 {
+    // CHECK-LABEL: define{{.*}}bar
+    // CHECK-SAME: {{.*}}!{{<unknown kind #36>|kcfi_type}} ![[TYPE2:[0-9]+]]
+    // CHECK: call i32 %f(i32 %arg1, i32 %arg2){{.*}}[ "kcfi"(i32 -1789026986) ]
+    f(arg1, arg2)
+}
+
+pub fn baz(f: fn(i32, i32, i32) -> i32, arg1: i32, arg2: i32, arg3: i32) -> i32 {
+    // CHECK-LABEL: define{{.*}}baz
+    // CHECK-SAME: {{.*}}!{{<unknown kind #36>|kcfi_type}} ![[TYPE3:[0-9]+]]
+    // CHECK: call i32 %f(i32 %arg1, i32 %arg2, i32 %arg3){{.*}}[ "kcfi"(i32 1248878270) ]
+    f(arg1, arg2, arg3)
+}
+
+// CHECK: ![[TYPE1]] = !{i32 653723426}
+// CHECK: ![[TYPE2]] = !{i32 412174924}
+// CHECK: ![[TYPE3]] = !{i32 -636668840}
diff --git a/src/test/codegen/sanitizer-memory-track-orgins.rs b/tests/codegen/sanitizer-memory-track-orgins.rs
index 4bd50508d..4bd50508d 100644
--- a/src/test/codegen/sanitizer-memory-track-orgins.rs
+++ b/tests/codegen/sanitizer-memory-track-orgins.rs
diff --git a/src/test/codegen/sanitizer-no-sanitize-inlining.rs b/tests/codegen/sanitizer-no-sanitize-inlining.rs
index f4af60bae..f4af60bae 100644
--- a/src/test/codegen/sanitizer-no-sanitize-inlining.rs
+++ b/tests/codegen/sanitizer-no-sanitize-inlining.rs
diff --git a/src/test/codegen/sanitizer-no-sanitize.rs b/tests/codegen/sanitizer-no-sanitize.rs
index fb9d249da..fb9d249da 100644
--- a/src/test/codegen/sanitizer-no-sanitize.rs
+++ b/tests/codegen/sanitizer-no-sanitize.rs
diff --git a/src/test/codegen/sanitizer-recover.rs b/tests/codegen/sanitizer-recover.rs
index 7ce0fa0a2..7b00fcf8e 100644
--- a/src/test/codegen/sanitizer-recover.rs
+++ b/tests/codegen/sanitizer-recover.rs
@@ -6,8 +6,8 @@
 // revisions:ASAN ASAN-RECOVER MSAN MSAN-RECOVER MSAN-RECOVER-LTO
 // no-prefer-dynamic
 //
-//[ASAN]             compile-flags: -Zsanitizer=address
-//[ASAN-RECOVER]     compile-flags: -Zsanitizer=address -Zsanitizer-recover=address
+//[ASAN]             compile-flags: -Zsanitizer=address -Copt-level=0
+//[ASAN-RECOVER]     compile-flags: -Zsanitizer=address -Zsanitizer-recover=address -Copt-level=0
 //[MSAN]             compile-flags: -Zsanitizer=memory
 //[MSAN-RECOVER]     compile-flags: -Zsanitizer=memory  -Zsanitizer-recover=memory
 //[MSAN-RECOVER-LTO] compile-flags: -Zsanitizer=memory  -Zsanitizer-recover=memory -C lto=fat
@@ -26,17 +26,17 @@
 // ASAN-RECOVER-NOT:     unreachable
 // ASAN:               }
 //
-// MSAN-LABEL: define dso_local i32 @penguin(
+// MSAN-LABEL: define dso_local noundef i32 @penguin(
 // MSAN:         call void @__msan_warning{{(_with_origin_noreturn\(i32 0\)|_noreturn\(\))}}
 // MSAN:         unreachable
 // MSAN:       }
 //
-// MSAN-RECOVER-LABEL: define dso_local i32 @penguin(
+// MSAN-RECOVER-LABEL: define dso_local noundef i32 @penguin(
 // MSAN-RECOVER:         call void @__msan_warning{{(_with_origin\(i32 0\)|\(\))}}
 // MSAN-RECOVER-NOT:     unreachable
 // MSAN-RECOVER:       }
 //
-// MSAN-RECOVER-LTO-LABEL: define dso_local i32 @penguin(
+// MSAN-RECOVER-LTO-LABEL: define dso_local noundef i32 @penguin(
 // MSAN-RECOVER-LTO:          call void @__msan_warning{{(_with_origin\(i32 0\)|\(\))}}
 // MSAN-RECOVER-LTO-NOT:      unreachable
 // MSAN-RECOVER-LTO:       }
diff --git a/src/test/codegen/sanitizer_memtag_attr_check.rs b/tests/codegen/sanitizer_memtag_attr_check.rs
index 2fd362656..2fd362656 100644
--- a/src/test/codegen/sanitizer_memtag_attr_check.rs
+++ b/tests/codegen/sanitizer_memtag_attr_check.rs
diff --git a/src/test/codegen/sanitizer_scs_attr_check.rs b/tests/codegen/sanitizer_scs_attr_check.rs
index a885d9117..a885d9117 100644
--- a/src/test/codegen/sanitizer_scs_attr_check.rs
+++ b/tests/codegen/sanitizer_scs_attr_check.rs
diff --git a/src/test/codegen/scalar-pair-bool.rs b/tests/codegen/scalar-pair-bool.rs
index 264f28fdb..8e8365b6a 100644
--- a/src/test/codegen/scalar-pair-bool.rs
+++ b/tests/codegen/scalar-pair-bool.rs
@@ -8,13 +8,13 @@ pub fn pair_bool_bool(pair: (bool, bool)) -> (bool, bool) {
     pair
 }
 
-// CHECK: define{{.*}}{ i8, i32 } @pair_bool_i32(i1 noundef zeroext %pair.0, i32 %pair.1)
+// CHECK: define{{.*}}{ i8, i32 } @pair_bool_i32(i1 noundef zeroext %pair.0, i32 noundef %pair.1)
 #[no_mangle]
 pub fn pair_bool_i32(pair: (bool, i32)) -> (bool, i32) {
     pair
 }
 
-// CHECK: define{{.*}}{ i32, i8 } @pair_i32_bool(i32 %pair.0, i1 noundef zeroext %pair.1)
+// CHECK: define{{.*}}{ i32, i8 } @pair_i32_bool(i32 noundef %pair.0, i1 noundef zeroext %pair.1)
 #[no_mangle]
 pub fn pair_i32_bool(pair: (i32, bool)) -> (i32, bool) {
     pair
diff --git a/src/test/codegen/set-discriminant-invalid.rs b/tests/codegen/set-discriminant-invalid.rs
index bccb9e4c7..bccb9e4c7 100644
--- a/src/test/codegen/set-discriminant-invalid.rs
+++ b/tests/codegen/set-discriminant-invalid.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-abs.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-abs.rs
index e7bb2327a..e7bb2327a 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-abs.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-abs.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-ceil.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-ceil.rs
index e33482d75..e33482d75 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-ceil.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-ceil.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-cos.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-cos.rs
index 0f52952bc..0f52952bc 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-cos.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-cos.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-exp.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-exp.rs
index 1154acf69..1154acf69 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-exp.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-exp.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-exp2.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-exp2.rs
index 929dc9ac8..929dc9ac8 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-exp2.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-exp2.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-floor.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-floor.rs
index 56ca644f6..56ca644f6 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-floor.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-floor.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-fma.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-fma.rs
index fd65cb72b..fd65cb72b 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-fma.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-fma.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-fsqrt.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-fsqrt.rs
index adc191925..adc191925 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-fsqrt.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-fsqrt.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-log.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-log.rs
index c072519c0..c072519c0 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-log.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-log.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-log10.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-log10.rs
index 5fd648995..5fd648995 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-log10.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-log10.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-log2.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-log2.rs
index 35175f0ca..35175f0ca 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-log2.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-log2.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-minmax.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-minmax.rs
index 4e0abed78..4e0abed78 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-minmax.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-minmax.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-pow.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-pow.rs
index 3b8d611ab..3b8d611ab 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-pow.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-pow.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-powi.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-powi.rs
index e80c50c10..e80c50c10 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-powi.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-powi.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-sin.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-float-sin.rs
index 9e3fab49a..9e3fab49a 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-float-sin.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-float-sin.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-arithmetic-saturating.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-generic-arithmetic-saturating.rs
index 6fb0ceb40..6fb0ceb40 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-arithmetic-saturating.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-generic-arithmetic-saturating.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-bitmask.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-generic-bitmask.rs
index 4a98d797b..4a98d797b 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-bitmask.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-generic-bitmask.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-extract-insert.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-generic-extract-insert.rs
index b5b0b1330..b5b0b1330 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-extract-insert.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-generic-extract-insert.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-gather.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-generic-gather.rs
index cacc32f2f..cacc32f2f 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-gather.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-generic-gather.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-scatter.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-generic-scatter.rs
index 94ecaf609..94ecaf609 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-scatter.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-generic-scatter.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-select.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-generic-select.rs
index 03bb22655..03bb22655 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-select.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-generic-select.rs
diff --git a/src/test/codegen/simd-intrinsic/simd-intrinsic-transmute-array.rs b/tests/codegen/simd-intrinsic/simd-intrinsic-transmute-array.rs
index db5b60567..db5b60567 100644
--- a/src/test/codegen/simd-intrinsic/simd-intrinsic-transmute-array.rs
+++ b/tests/codegen/simd-intrinsic/simd-intrinsic-transmute-array.rs
diff --git a/src/test/codegen/simd-wide-sum.rs b/tests/codegen/simd-wide-sum.rs
index 04314dc29..04314dc29 100644
--- a/src/test/codegen/simd-wide-sum.rs
+++ b/tests/codegen/simd-wide-sum.rs
diff --git a/src/test/codegen/simd_arith_offset.rs b/tests/codegen/simd_arith_offset.rs
index 7b623a22a..7b623a22a 100644
--- a/src/test/codegen/simd_arith_offset.rs
+++ b/tests/codegen/simd_arith_offset.rs
diff --git a/src/test/codegen/slice-as_chunks.rs b/tests/codegen/slice-as_chunks.rs
index 48e3f73fc..48e3f73fc 100644
--- a/src/test/codegen/slice-as_chunks.rs
+++ b/tests/codegen/slice-as_chunks.rs
diff --git a/src/test/codegen/slice-init.rs b/tests/codegen/slice-init.rs
index 794b773a7..794b773a7 100644
--- a/src/test/codegen/slice-init.rs
+++ b/tests/codegen/slice-init.rs
diff --git a/src/test/codegen/slice-iter-len-eq-zero.rs b/tests/codegen/slice-iter-len-eq-zero.rs
index 894b0ec3d..894b0ec3d 100644
--- a/src/test/codegen/slice-iter-len-eq-zero.rs
+++ b/tests/codegen/slice-iter-len-eq-zero.rs
diff --git a/src/test/codegen/slice-position-bounds-check.rs b/tests/codegen/slice-position-bounds-check.rs
index b494f42b2..b494f42b2 100644
--- a/src/test/codegen/slice-position-bounds-check.rs
+++ b/tests/codegen/slice-position-bounds-check.rs
diff --git a/src/test/codegen/slice-ref-equality.rs b/tests/codegen/slice-ref-equality.rs
index 47fde12bf..47fde12bf 100644
--- a/src/test/codegen/slice-ref-equality.rs
+++ b/tests/codegen/slice-ref-equality.rs
diff --git a/src/test/codegen/slice-reverse.rs b/tests/codegen/slice-reverse.rs
index e50b22f3a..e50b22f3a 100644
--- a/src/test/codegen/slice-reverse.rs
+++ b/tests/codegen/slice-reverse.rs
diff --git a/src/test/codegen/slice-windows-no-bounds-check.rs b/tests/codegen/slice-windows-no-bounds-check.rs
index 4f5f4425c..4f5f4425c 100644
--- a/src/test/codegen/slice-windows-no-bounds-check.rs
+++ b/tests/codegen/slice-windows-no-bounds-check.rs
diff --git a/src/test/codegen/slice_as_from_ptr_range.rs b/tests/codegen/slice_as_from_ptr_range.rs
index 0e3fefd97..0e3fefd97 100644
--- a/src/test/codegen/slice_as_from_ptr_range.rs
+++ b/tests/codegen/slice_as_from_ptr_range.rs
diff --git a/src/test/codegen/some-abis-do-extend-params-to-32-bits.rs b/tests/codegen/some-abis-do-extend-params-to-32-bits.rs
index 7fc34af3d..9f2d9d065 100644
--- a/src/test/codegen/some-abis-do-extend-params-to-32-bits.rs
+++ b/tests/codegen/some-abis-do-extend-params-to-32-bits.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Cno-prepopulate-passes
+// compile-flags: -Cno-prepopulate-passes -Copt-level=0
 
 // revisions:x86_64 i686 aarch64-apple aarch64-windows aarch64-linux arm riscv
 
diff --git a/src/test/codegen/some-global-nonnull.rs b/tests/codegen/some-global-nonnull.rs
index 59c47de41..59c47de41 100644
--- a/src/test/codegen/some-global-nonnull.rs
+++ b/tests/codegen/some-global-nonnull.rs
diff --git a/src/test/codegen/sparc-struct-abi.rs b/tests/codegen/sparc-struct-abi.rs
index e8816e4f3..e8816e4f3 100644
--- a/src/test/codegen/sparc-struct-abi.rs
+++ b/tests/codegen/sparc-struct-abi.rs
diff --git a/src/test/codegen/src-hash-algorithm/src-hash-algorithm-md5.rs b/tests/codegen/src-hash-algorithm/src-hash-algorithm-md5.rs
index 64be11277..64be11277 100644
--- a/src/test/codegen/src-hash-algorithm/src-hash-algorithm-md5.rs
+++ b/tests/codegen/src-hash-algorithm/src-hash-algorithm-md5.rs
diff --git a/src/test/codegen/src-hash-algorithm/src-hash-algorithm-sha1.rs b/tests/codegen/src-hash-algorithm/src-hash-algorithm-sha1.rs
index 54e071521..54e071521 100644
--- a/src/test/codegen/src-hash-algorithm/src-hash-algorithm-sha1.rs
+++ b/tests/codegen/src-hash-algorithm/src-hash-algorithm-sha1.rs
diff --git a/src/test/codegen/src-hash-algorithm/src-hash-algorithm-sha256.rs b/tests/codegen/src-hash-algorithm/src-hash-algorithm-sha256.rs
index dc7db8e23..dc7db8e23 100644
--- a/src/test/codegen/src-hash-algorithm/src-hash-algorithm-sha256.rs
+++ b/tests/codegen/src-hash-algorithm/src-hash-algorithm-sha256.rs
diff --git a/src/test/codegen/sse42-implies-crc32.rs b/tests/codegen/sse42-implies-crc32.rs
index 47b1a8993..47b1a8993 100644
--- a/src/test/codegen/sse42-implies-crc32.rs
+++ b/tests/codegen/sse42-implies-crc32.rs
diff --git a/src/test/codegen/stack-probes-call.rs b/tests/codegen/stack-probes-call.rs
index a18fd41c2..a18fd41c2 100644
--- a/src/test/codegen/stack-probes-call.rs
+++ b/tests/codegen/stack-probes-call.rs
diff --git a/src/test/codegen/stack-probes-inline.rs b/tests/codegen/stack-probes-inline.rs
index a6b781de5..a6b781de5 100644
--- a/src/test/codegen/stack-probes-inline.rs
+++ b/tests/codegen/stack-probes-inline.rs
diff --git a/src/test/codegen/stack-protector.rs b/tests/codegen/stack-protector.rs
index a24e6f1e4..a24e6f1e4 100644
--- a/src/test/codegen/stack-protector.rs
+++ b/tests/codegen/stack-protector.rs
diff --git a/src/test/codegen/static-relocation-model-msvc.rs b/tests/codegen/static-relocation-model-msvc.rs
index b2afc7deb..735ef7081 100644
--- a/src/test/codegen/static-relocation-model-msvc.rs
+++ b/tests/codegen/static-relocation-model-msvc.rs
@@ -15,8 +15,8 @@ extern crate extern_decl;
 // it to be marked `dso_local` as well, given the static relocation model.
 //
 // CHECK: @extern_static = external dso_local local_unnamed_addr global i8
-// CHECK: define dso_local i8 @access_extern() {{.*}}
-// CHECK: declare dso_local i8 @extern_fn() {{.*}}
+// CHECK: define dso_local noundef i8 @access_extern() {{.*}}
+// CHECK: declare dso_local noundef i8 @extern_fn() {{.*}}
 
 #[no_mangle]
 pub fn access_extern() -> u8 {
diff --git a/src/test/codegen/staticlib-external-inline-fns.rs b/tests/codegen/staticlib-external-inline-fns.rs
index 432c063e8..432c063e8 100644
--- a/src/test/codegen/staticlib-external-inline-fns.rs
+++ b/tests/codegen/staticlib-external-inline-fns.rs
diff --git a/src/test/codegen/stores.rs b/tests/codegen/stores.rs
index 837256e53..837256e53 100644
--- a/src/test/codegen/stores.rs
+++ b/tests/codegen/stores.rs
diff --git a/src/test/codegen/swap-large-types.rs b/tests/codegen/swap-large-types.rs
index 4a6840357..4a6840357 100644
--- a/src/test/codegen/swap-large-types.rs
+++ b/tests/codegen/swap-large-types.rs
diff --git a/src/test/codegen/swap-simd-types.rs b/tests/codegen/swap-simd-types.rs
index c90b277eb..c90b277eb 100644
--- a/src/test/codegen/swap-simd-types.rs
+++ b/tests/codegen/swap-simd-types.rs
diff --git a/src/test/codegen/swap-small-types.rs b/tests/codegen/swap-small-types.rs
index 03e2a2327..03e2a2327 100644
--- a/src/test/codegen/swap-small-types.rs
+++ b/tests/codegen/swap-small-types.rs
diff --git a/src/test/codegen/target-cpu-on-functions.rs b/tests/codegen/target-cpu-on-functions.rs
index c043eceb5..c043eceb5 100644
--- a/src/test/codegen/target-cpu-on-functions.rs
+++ b/tests/codegen/target-cpu-on-functions.rs
diff --git a/src/test/codegen/target-feature-overrides.rs b/tests/codegen/target-feature-overrides.rs
index 4be77e36e..1bebf66f0 100644
--- a/src/test/codegen/target-feature-overrides.rs
+++ b/tests/codegen/target-feature-overrides.rs
@@ -4,7 +4,7 @@
 // [COMPAT] compile-flags: -Ctarget-feature=+avx2,+avx
 // [INCOMPAT] compile-flags: -Ctarget-feature=-avx2,-avx
 
-// See also src/test/assembly/target-feature-multiple.rs
+// See also tests/assembly/target-feature-multiple.rs
 #![feature(no_core, lang_items)]
 #![crate_type = "lib"]
 #![no_core]
diff --git a/src/test/codegen/thread-local.rs b/tests/codegen/thread-local.rs
index 0f1b29ca7..0f1b29ca7 100644
--- a/src/test/codegen/thread-local.rs
+++ b/tests/codegen/thread-local.rs
diff --git a/src/test/codegen/to_vec.rs b/tests/codegen/to_vec.rs
index 60dc4efcb..60dc4efcb 100644
--- a/src/test/codegen/to_vec.rs
+++ b/tests/codegen/to_vec.rs
diff --git a/src/test/codegen/transmute-scalar.rs b/tests/codegen/transmute-scalar.rs
index a7e5deeff..260dcbac0 100644
--- a/src/test/codegen/transmute-scalar.rs
+++ b/tests/codegen/transmute-scalar.rs
@@ -5,7 +5,7 @@
 // FIXME(eddyb) all of these tests show memory stores and loads, even after a
 // scalar `bitcast`, more special-casing is required to remove `alloca` usage.
 
-// CHECK-LABEL: define{{.*}}i32 @f32_to_bits(float %x)
+// CHECK-LABEL: define{{.*}}i32 @f32_to_bits(float noundef %x)
 // CHECK: store i32 %{{.*}}, {{.*}} %0
 // CHECK-NEXT: %[[RES:.*]] = load i32, {{.*}} %0
 // CHECK: ret i32 %[[RES]]
@@ -24,7 +24,7 @@ pub fn bool_to_byte(b: bool) -> u8 {
     unsafe { std::mem::transmute(b) }
 }
 
-// CHECK-LABEL: define{{.*}}noundef zeroext i1 @byte_to_bool(i8 %byte)
+// CHECK-LABEL: define{{.*}}noundef zeroext i1 @byte_to_bool(i8 noundef %byte)
 // CHECK: %1 = trunc i8 %byte to i1
 // CHECK-NEXT: %2 = zext i1 %1 to i8
 // CHECK-NEXT: store i8 %2, {{.*}} %0
@@ -36,7 +36,7 @@ pub unsafe fn byte_to_bool(byte: u8) -> bool {
     std::mem::transmute(byte)
 }
 
-// CHECK-LABEL: define{{.*}}{{i8\*|ptr}} @ptr_to_ptr({{i16\*|ptr}} %p)
+// CHECK-LABEL: define{{.*}}{{i8\*|ptr}} @ptr_to_ptr({{i16\*|ptr}} noundef %p)
 // CHECK: store {{i8\*|ptr}} %{{.*}}, {{.*}} %0
 // CHECK-NEXT: %[[RES:.*]] = load {{i8\*|ptr}}, {{.*}} %0
 // CHECK: ret {{i8\*|ptr}} %[[RES]]
@@ -52,7 +52,7 @@ pub fn ptr_to_ptr(p: *mut u16) -> *mut u8 {
 // Tests below show the non-special-cased behavior (with the possible
 // future special-cased instructions in the "NOTE(eddyb)" comments).
 
-// CHECK: define{{.*}}[[USIZE:i[0-9]+]] @ptr_to_int({{i16\*|ptr}} %p)
+// CHECK: define{{.*}}[[USIZE:i[0-9]+]] @ptr_to_int({{i16\*|ptr}} noundef %p)
 
 // NOTE(eddyb) see above, the following two CHECK lines should ideally be this:
 //        %2 = ptrtoint i16* %p to [[USIZE]]
@@ -66,7 +66,7 @@ pub fn ptr_to_int(p: *mut u16) -> usize {
     unsafe { std::mem::transmute(p) }
 }
 
-// CHECK: define{{.*}}{{i16\*|ptr}} @int_to_ptr([[USIZE]] %i)
+// CHECK: define{{.*}}{{i16\*|ptr}} @int_to_ptr([[USIZE]] noundef %i)
 
 // NOTE(eddyb) see above, the following two CHECK lines should ideally be this:
 //        %2 = inttoptr [[USIZE]] %i to i16*
diff --git a/src/test/codegen/try_identity.rs b/tests/codegen/try_identity.rs
index 92be90014..92be90014 100644
--- a/src/test/codegen/try_identity.rs
+++ b/tests/codegen/try_identity.rs
diff --git a/src/test/codegen/try_question_mark_nop.rs b/tests/codegen/try_question_mark_nop.rs
index d23938776..d23938776 100644
--- a/src/test/codegen/try_question_mark_nop.rs
+++ b/tests/codegen/try_question_mark_nop.rs
diff --git a/src/test/codegen/tune-cpu-on-functions.rs b/tests/codegen/tune-cpu-on-functions.rs
index ed8dc0e93..ed8dc0e93 100644
--- a/src/test/codegen/tune-cpu-on-functions.rs
+++ b/tests/codegen/tune-cpu-on-functions.rs
diff --git a/src/test/codegen/tuple-layout-opt.rs b/tests/codegen/tuple-layout-opt.rs
index e86c75f3f..35f760851 100644
--- a/src/test/codegen/tuple-layout-opt.rs
+++ b/tests/codegen/tuple-layout-opt.rs
@@ -1,5 +1,5 @@
 // ignore-emscripten
-// compile-flags: -C no-prepopulate-passes
+// compile-flags: -C no-prepopulate-passes -Copt-level=0
 
 // Test that tuples get optimized layout, in particular with a ZST in the last field (#63244)
 
diff --git a/src/test/codegen/unchecked-float-casts.rs b/tests/codegen/unchecked-float-casts.rs
index 4e3bfcd43..4e3bfcd43 100644
--- a/src/test/codegen/unchecked-float-casts.rs
+++ b/tests/codegen/unchecked-float-casts.rs
diff --git a/src/test/codegen/unchecked_shifts.rs b/tests/codegen/unchecked_shifts.rs
index 60d0cb09a..60d0cb09a 100644
--- a/src/test/codegen/unchecked_shifts.rs
+++ b/tests/codegen/unchecked_shifts.rs
diff --git a/src/test/codegen/uninit-consts.rs b/tests/codegen/uninit-consts.rs
index 4c07740b3..98a6761f8 100644
--- a/src/test/codegen/uninit-consts.rs
+++ b/tests/codegen/uninit-consts.rs
@@ -14,7 +14,7 @@ pub struct PartiallyUninit {
 
 // CHECK: [[FULLY_UNINIT:@[0-9]+]] = private unnamed_addr constant <{ [10 x i8] }> undef
 
-// CHECK: [[PARTIALLY_UNINIT:@[0-9]+]] = private unnamed_addr constant <{ [4 x i8], [12 x i8] }> <{ [4 x i8] c"\EF\BE\AD\DE", [12 x i8] undef }>, align 4
+// CHECK: [[PARTIALLY_UNINIT:@[0-9]+]] = private unnamed_addr constant <{ [4 x i8], [12 x i8] }> <{ [4 x i8] c"{{\\EF\\BE\\AD\\DE|\\DE\\AD\\BE\\EF}}", [12 x i8] undef }>, align 4
 
 // This shouldn't contain undef, since it contains more chunks
 // than the default value of uninit_const_chunk_threshold.
diff --git a/src/test/codegen/union-abi.rs b/tests/codegen/union-abi.rs
index c18f2a49f..c18f2a49f 100644
--- a/src/test/codegen/union-abi.rs
+++ b/tests/codegen/union-abi.rs
diff --git a/src/test/codegen/unpadded-simd.rs b/tests/codegen/unpadded-simd.rs
index eb44dbd93..eb44dbd93 100644
--- a/src/test/codegen/unpadded-simd.rs
+++ b/tests/codegen/unpadded-simd.rs
diff --git a/src/test/codegen/unwind-abis/aapcs-unwind-abi.rs b/tests/codegen/unwind-abis/aapcs-unwind-abi.rs
index c092e28a0..c092e28a0 100644
--- a/src/test/codegen/unwind-abis/aapcs-unwind-abi.rs
+++ b/tests/codegen/unwind-abis/aapcs-unwind-abi.rs
diff --git a/src/test/codegen/unwind-abis/c-unwind-abi-panic-abort.rs b/tests/codegen/unwind-abis/c-unwind-abi-panic-abort.rs
index 8447bbeb1..ea5bae18e 100644
--- a/src/test/codegen/unwind-abis/c-unwind-abi-panic-abort.rs
+++ b/tests/codegen/unwind-abis/c-unwind-abi-panic-abort.rs
@@ -9,7 +9,8 @@
 // CHECK: @rust_item_that_can_unwind() unnamed_addr [[ATTR0:#[0-9]+]]
 #[no_mangle]
 pub unsafe extern "C-unwind" fn rust_item_that_can_unwind() {
-    // CHECK: call void @_ZN4core9panicking15panic_no_unwind
+    // Handle both legacy and v0 symbol mangling.
+    // CHECK: call void @{{.*core9panicking19panic_cannot_unwind}}
     may_unwind();
 }
 
diff --git a/src/test/codegen/unwind-abis/c-unwind-abi.rs b/tests/codegen/unwind-abis/c-unwind-abi.rs
index e258dbcac..e258dbcac 100644
--- a/src/test/codegen/unwind-abis/c-unwind-abi.rs
+++ b/tests/codegen/unwind-abis/c-unwind-abi.rs
diff --git a/src/test/codegen/unwind-abis/cdecl-unwind-abi.rs b/tests/codegen/unwind-abis/cdecl-unwind-abi.rs
index 19a722883..19a722883 100644
--- a/src/test/codegen/unwind-abis/cdecl-unwind-abi.rs
+++ b/tests/codegen/unwind-abis/cdecl-unwind-abi.rs
diff --git a/src/test/codegen/unwind-abis/fastcall-unwind-abi.rs b/tests/codegen/unwind-abis/fastcall-unwind-abi.rs
index b74099a5d..b74099a5d 100644
--- a/src/test/codegen/unwind-abis/fastcall-unwind-abi.rs
+++ b/tests/codegen/unwind-abis/fastcall-unwind-abi.rs
diff --git a/src/test/codegen/unwind-abis/nounwind-on-stable-panic-abort.rs b/tests/codegen/unwind-abis/nounwind-on-stable-panic-abort.rs
index 106d593b2..106d593b2 100644
--- a/src/test/codegen/unwind-abis/nounwind-on-stable-panic-abort.rs
+++ b/tests/codegen/unwind-abis/nounwind-on-stable-panic-abort.rs
diff --git a/src/test/codegen/unwind-abis/nounwind-on-stable-panic-unwind.rs b/tests/codegen/unwind-abis/nounwind-on-stable-panic-unwind.rs
index c1c5bbdda..c1c5bbdda 100644
--- a/src/test/codegen/unwind-abis/nounwind-on-stable-panic-unwind.rs
+++ b/tests/codegen/unwind-abis/nounwind-on-stable-panic-unwind.rs
diff --git a/src/test/codegen/unwind-abis/nounwind.rs b/tests/codegen/unwind-abis/nounwind.rs
index c46d71733..c46d71733 100644
--- a/src/test/codegen/unwind-abis/nounwind.rs
+++ b/tests/codegen/unwind-abis/nounwind.rs
diff --git a/src/test/codegen/unwind-abis/stdcall-unwind-abi.rs b/tests/codegen/unwind-abis/stdcall-unwind-abi.rs
index 8eff0719f..8eff0719f 100644
--- a/src/test/codegen/unwind-abis/stdcall-unwind-abi.rs
+++ b/tests/codegen/unwind-abis/stdcall-unwind-abi.rs
diff --git a/src/test/codegen/unwind-abis/system-unwind-abi.rs b/tests/codegen/unwind-abis/system-unwind-abi.rs
index 2591c1d48..2591c1d48 100644
--- a/src/test/codegen/unwind-abis/system-unwind-abi.rs
+++ b/tests/codegen/unwind-abis/system-unwind-abi.rs
diff --git a/src/test/codegen/unwind-abis/sysv64-unwind-abi.rs b/tests/codegen/unwind-abis/sysv64-unwind-abi.rs
index 694fde17c..694fde17c 100644
--- a/src/test/codegen/unwind-abis/sysv64-unwind-abi.rs
+++ b/tests/codegen/unwind-abis/sysv64-unwind-abi.rs
diff --git a/src/test/codegen/unwind-abis/thiscall-unwind-abi.rs b/tests/codegen/unwind-abis/thiscall-unwind-abi.rs
index 7e81367fc..7e81367fc 100644
--- a/src/test/codegen/unwind-abis/thiscall-unwind-abi.rs
+++ b/tests/codegen/unwind-abis/thiscall-unwind-abi.rs
diff --git a/src/test/codegen/unwind-abis/vectorcall-unwind-abi.rs b/tests/codegen/unwind-abis/vectorcall-unwind-abi.rs
index d7eca2a97..d7eca2a97 100644
--- a/src/test/codegen/unwind-abis/vectorcall-unwind-abi.rs
+++ b/tests/codegen/unwind-abis/vectorcall-unwind-abi.rs
diff --git a/src/test/codegen/unwind-abis/win64-unwind-abi.rs b/tests/codegen/unwind-abis/win64-unwind-abi.rs
index 6591348c3..6591348c3 100644
--- a/src/test/codegen/unwind-abis/win64-unwind-abi.rs
+++ b/tests/codegen/unwind-abis/win64-unwind-abi.rs
diff --git a/tests/codegen/unwind-and-panic-abort.rs b/tests/codegen/unwind-and-panic-abort.rs
new file mode 100644
index 000000000..e43e73b96
--- /dev/null
+++ b/tests/codegen/unwind-and-panic-abort.rs
@@ -0,0 +1,17 @@
+// compile-flags: -C panic=abort
+
+#![crate_type = "lib"]
+#![feature(c_unwind)]
+
+extern "C-unwind" {
+    fn bar();
+}
+
+// CHECK: Function Attrs:{{.*}}nounwind
+// CHECK-NEXT: define{{.*}}void @foo
+// Handle both legacy and v0 symbol mangling.
+// CHECK: call void @{{.*core9panicking19panic_cannot_unwind}}
+#[no_mangle]
+pub unsafe extern "C" fn foo() {
+    bar();
+}
diff --git a/src/test/codegen/unwind-extern-exports.rs b/tests/codegen/unwind-extern-exports.rs
index 6ac3c079f..6ac3c079f 100644
--- a/src/test/codegen/unwind-extern-exports.rs
+++ b/tests/codegen/unwind-extern-exports.rs
diff --git a/src/test/codegen/unwind-extern-imports.rs b/tests/codegen/unwind-extern-imports.rs
index e33e3e805..e33e3e805 100644
--- a/src/test/codegen/unwind-extern-imports.rs
+++ b/tests/codegen/unwind-extern-imports.rs
diff --git a/src/test/codegen/used_with_arg.rs b/tests/codegen/used_with_arg.rs
index 4515cb2ae..4515cb2ae 100644
--- a/src/test/codegen/used_with_arg.rs
+++ b/tests/codegen/used_with_arg.rs
diff --git a/src/test/codegen/var-names.rs b/tests/codegen/var-names.rs
index 8f1b03870..d4715efad 100644
--- a/src/test/codegen/var-names.rs
+++ b/tests/codegen/var-names.rs
@@ -2,7 +2,7 @@
 
 #![crate_type = "lib"]
 
-// CHECK-LABEL: define{{.*}}i32 @test(i32 %a, i32 %b)
+// CHECK-LABEL: define{{.*}}i32 @test(i32 noundef %a, i32 noundef %b)
 #[no_mangle]
 pub fn test(a: u32, b: u32) -> u32 {
     let c = a + b;
diff --git a/src/test/codegen/vec-calloc-llvm14.rs b/tests/codegen/vec-calloc-llvm14.rs
index 08302796c..08302796c 100644
--- a/src/test/codegen/vec-calloc-llvm14.rs
+++ b/tests/codegen/vec-calloc-llvm14.rs
diff --git a/src/test/codegen/vec-calloc.rs b/tests/codegen/vec-calloc.rs
index ae6e448f1..4481a9d1e 100644
--- a/src/test/codegen/vec-calloc.rs
+++ b/tests/codegen/vec-calloc.rs
@@ -161,7 +161,24 @@ pub fn vec_option_bool(n: usize) -> Vec<Option<bool>> {
     vec![Some(false); n]
 }
 
+// CHECK-LABEL: @vec_option_i32
+#[no_mangle]
+pub fn vec_option_i32(n: usize) -> Vec<Option<i32>> {
+    // CHECK-NOT: call {{.*}}alloc::vec::from_elem
+    // CHECK-NOT: call {{.*}}reserve
+    // CHECK-NOT: call {{.*}}__rust_alloc(
+
+    // CHECK: call {{.*}}__rust_alloc_zeroed(
+
+    // CHECK-NOT: call {{.*}}alloc::vec::from_elem
+    // CHECK-NOT: call {{.*}}reserve
+    // CHECK-NOT: call {{.*}}__rust_alloc(
+
+    // CHECK: ret void
+    vec![None; n]
+}
+
 // Ensure that __rust_alloc_zeroed gets the right attributes for LLVM to optimize it away.
-// CHECK: declare noalias ptr @__rust_alloc_zeroed(i64, i64 allocalign) unnamed_addr [[RUST_ALLOC_ZEROED_ATTRS:#[0-9]+]]
+// CHECK: declare noalias noundef ptr @__rust_alloc_zeroed(i64 noundef, i64 allocalign noundef) unnamed_addr [[RUST_ALLOC_ZEROED_ATTRS:#[0-9]+]]
 
 // CHECK-DAG: attributes [[RUST_ALLOC_ZEROED_ATTRS]] = { {{.*}} allockind("alloc,zeroed,aligned") allocsize(0) uwtable "alloc-family"="__rust_alloc" {{.*}} }
diff --git a/src/test/codegen/vec-in-place.rs b/tests/codegen/vec-in-place.rs
index 5df366905..5df366905 100644
--- a/src/test/codegen/vec-in-place.rs
+++ b/tests/codegen/vec-in-place.rs
diff --git a/src/test/codegen/vec-iter-collect-len.rs b/tests/codegen/vec-iter-collect-len.rs
index 73348ddd0..73348ddd0 100644
--- a/src/test/codegen/vec-iter-collect-len.rs
+++ b/tests/codegen/vec-iter-collect-len.rs
diff --git a/src/test/codegen/vec-optimizes-away.rs b/tests/codegen/vec-optimizes-away.rs
index 9143fad23..9143fad23 100644
--- a/src/test/codegen/vec-optimizes-away.rs
+++ b/tests/codegen/vec-optimizes-away.rs
diff --git a/tests/codegen/vec-shrink-panik.rs b/tests/codegen/vec-shrink-panik.rs
new file mode 100644
index 000000000..aa6589dc3
--- /dev/null
+++ b/tests/codegen/vec-shrink-panik.rs
@@ -0,0 +1,47 @@
+// compile-flags: -O
+// ignore-debug: the debug assertions get in the way
+#![crate_type = "lib"]
+#![feature(shrink_to)]
+
+// Make sure that `Vec::shrink_to_fit` never emits panics via `RawVec::shrink_to_fit`,
+// "Tried to shrink to a larger capacity", because the length is *always* <= capacity.
+
+// CHECK-LABEL: @shrink_to_fit
+#[no_mangle]
+pub fn shrink_to_fit(vec: &mut Vec<u32>) {
+    // CHECK-NOT: panic
+    vec.shrink_to_fit();
+}
+
+// CHECK-LABEL: @issue71861
+#[no_mangle]
+pub fn issue71861(vec: Vec<u32>) -> Box<[u32]> {
+    // CHECK-NOT: panic
+
+    // Call to panic_cannot_unwind in case of double-panic is expected,
+    // but other panics are not.
+    // CHECK: cleanup
+    // CHECK-NEXT: ; call core::panicking::panic_cannot_unwind
+    // CHECK-NEXT: panic_cannot_unwind
+
+    // CHECK-NOT: panic
+    vec.into_boxed_slice()
+}
+
+// CHECK-LABEL: @issue75636
+#[no_mangle]
+pub fn issue75636<'a>(iter: &[&'a str]) -> Box<[&'a str]> {
+    // CHECK-NOT: panic
+
+    // Call to panic_cannot_unwind in case of double-panic is expected,
+    // but other panics are not.
+    // CHECK: cleanup
+    // CHECK-NEXT: ; call core::panicking::panic_cannot_unwind
+    // CHECK-NEXT: panic_cannot_unwind
+
+    // CHECK-NOT: panic
+    iter.iter().copied().collect()
+}
+
+// CHECK: ; core::panicking::panic_cannot_unwind
+// CHECK: declare void @{{.*}}panic_cannot_unwind
diff --git a/src/test/codegen/vecdeque_no_panic.rs b/tests/codegen/vecdeque_no_panic.rs
index cbf420bad..cbf420bad 100644
--- a/src/test/codegen/vecdeque_no_panic.rs
+++ b/tests/codegen/vecdeque_no_panic.rs
diff --git a/src/test/codegen/virtual-function-elimination-32bit.rs b/tests/codegen/virtual-function-elimination-32bit.rs
index 6f963363a..6f963363a 100644
--- a/src/test/codegen/virtual-function-elimination-32bit.rs
+++ b/tests/codegen/virtual-function-elimination-32bit.rs
diff --git a/src/test/codegen/virtual-function-elimination.rs b/tests/codegen/virtual-function-elimination.rs
index 4cf7e12fe..4cf7e12fe 100644
--- a/src/test/codegen/virtual-function-elimination.rs
+++ b/tests/codegen/virtual-function-elimination.rs
diff --git a/src/test/codegen/wasm_casts_trapping.rs b/tests/codegen/wasm_casts_trapping.rs
index eb06c4975..eb06c4975 100644
--- a/src/test/codegen/wasm_casts_trapping.rs
+++ b/tests/codegen/wasm_casts_trapping.rs
diff --git a/src/test/codegen/x86_64-macosx-deployment-target.rs b/tests/codegen/x86_64-macosx-deployment-target.rs
index 8e673d11d..8e673d11d 100644
--- a/src/test/codegen/x86_64-macosx-deployment-target.rs
+++ b/tests/codegen/x86_64-macosx-deployment-target.rs
diff --git a/src/test/codegen/x86_64-no-macosx-deployment-target.rs b/tests/codegen/x86_64-no-macosx-deployment-target.rs
index 25ae6924d..25ae6924d 100644
--- a/src/test/codegen/x86_64-no-macosx-deployment-target.rs
+++ b/tests/codegen/x86_64-no-macosx-deployment-target.rs
diff --git a/src/test/codegen/zip.rs b/tests/codegen/zip.rs
index e55f4f1a2..e55f4f1a2 100644
--- a/src/test/codegen/zip.rs
+++ b/tests/codegen/zip.rs
diff --git a/src/test/codegen/zst-offset.rs b/tests/codegen/zst-offset.rs
index 29d2a1754..cef4b9bda 100644
--- a/src/test/codegen/zst-offset.rs
+++ b/tests/codegen/zst-offset.rs
@@ -1,4 +1,4 @@
-// compile-flags: -C no-prepopulate-passes
+// compile-flags: -C no-prepopulate-passes -Copt-level=0
 
 #![crate_type = "lib"]
 #![feature(repr_simd)]
@@ -15,7 +15,7 @@ pub fn helper(_: usize) {
 pub fn scalar_layout(s: &(u64, ())) {
 // CHECK: getelementptr i8, {{.+}}, [[USIZE]] 8
     let x = &s.1;
-    &x; // keep variable in an alloca
+    witness(&x); // keep variable in an alloca
 }
 
 // Check that we correctly generate a GEP for a ZST that is not included in ScalarPair layout
@@ -24,7 +24,7 @@ pub fn scalar_layout(s: &(u64, ())) {
 pub fn scalarpair_layout(s: &(u64, u32, ())) {
 // CHECK: getelementptr i8, {{.+}}, [[USIZE]] 12
     let x = &s.2;
-    &x; // keep variable in an alloca
+    witness(&x); // keep variable in an alloca
 }
 
 #[repr(simd)]
@@ -36,5 +36,8 @@ pub struct U64x4(u64, u64, u64, u64);
 pub fn vector_layout(s: &(U64x4, ())) {
 // CHECK: getelementptr i8, {{.+}}, [[USIZE]] 32
     let x = &s.1;
-    &x; // keep variable in an alloca
+    witness(&x); // keep variable in an alloca
 }
+
+#[inline(never)]
+fn witness(_: &impl Sized) {}
diff --git a/src/test/debuginfo/associated-types.rs b/tests/debuginfo/associated-types.rs
index 0a0ce3c67..0a0ce3c67 100644
--- a/src/test/debuginfo/associated-types.rs
+++ b/tests/debuginfo/associated-types.rs
diff --git a/src/test/debuginfo/auxiliary/cross_crate_debuginfo_type_uniquing.rs b/tests/debuginfo/auxiliary/cross_crate_debuginfo_type_uniquing.rs
index b9bb3ba72..b9bb3ba72 100644
--- a/src/test/debuginfo/auxiliary/cross_crate_debuginfo_type_uniquing.rs
+++ b/tests/debuginfo/auxiliary/cross_crate_debuginfo_type_uniquing.rs
diff --git a/src/test/debuginfo/auxiliary/cross_crate_spans.rs b/tests/debuginfo/auxiliary/cross_crate_spans.rs
index efe5e4195..efe5e4195 100644
--- a/src/test/debuginfo/auxiliary/cross_crate_spans.rs
+++ b/tests/debuginfo/auxiliary/cross_crate_spans.rs
diff --git a/src/test/debuginfo/auxiliary/dependency-with-embedded-visualizers.natvis b/tests/debuginfo/auxiliary/dependency-with-embedded-visualizers.natvis
index 5900fcc01..5900fcc01 100644
--- a/src/test/debuginfo/auxiliary/dependency-with-embedded-visualizers.natvis
+++ b/tests/debuginfo/auxiliary/dependency-with-embedded-visualizers.natvis
diff --git a/src/test/debuginfo/auxiliary/dependency-with-embedded-visualizers.py b/tests/debuginfo/auxiliary/dependency-with-embedded-visualizers.py
index 2635ed487..2635ed487 100644
--- a/src/test/debuginfo/auxiliary/dependency-with-embedded-visualizers.py
+++ b/tests/debuginfo/auxiliary/dependency-with-embedded-visualizers.py
diff --git a/src/test/debuginfo/auxiliary/dependency-with-embedded-visualizers.rs b/tests/debuginfo/auxiliary/dependency-with-embedded-visualizers.rs
index 327515b10..327515b10 100644
--- a/src/test/debuginfo/auxiliary/dependency-with-embedded-visualizers.rs
+++ b/tests/debuginfo/auxiliary/dependency-with-embedded-visualizers.rs
diff --git a/src/test/debuginfo/auxiliary/issue-13213-aux.rs b/tests/debuginfo/auxiliary/issue-13213-aux.rs
index bde98b445..bde98b445 100644
--- a/src/test/debuginfo/auxiliary/issue-13213-aux.rs
+++ b/tests/debuginfo/auxiliary/issue-13213-aux.rs
diff --git a/src/test/debuginfo/auxiliary/macro-stepping.rs b/tests/debuginfo/auxiliary/macro-stepping.rs
index 4447dd22d..4447dd22d 100644
--- a/src/test/debuginfo/auxiliary/macro-stepping.rs
+++ b/tests/debuginfo/auxiliary/macro-stepping.rs
diff --git a/src/test/debuginfo/basic-types-globals-metadata.rs b/tests/debuginfo/basic-types-globals-metadata.rs
index 3934d3c7a..3934d3c7a 100644
--- a/src/test/debuginfo/basic-types-globals-metadata.rs
+++ b/tests/debuginfo/basic-types-globals-metadata.rs
diff --git a/src/test/debuginfo/basic-types-globals.rs b/tests/debuginfo/basic-types-globals.rs
index 8a3df8ba2..8a3df8ba2 100644
--- a/src/test/debuginfo/basic-types-globals.rs
+++ b/tests/debuginfo/basic-types-globals.rs
diff --git a/src/test/debuginfo/basic-types-metadata.rs b/tests/debuginfo/basic-types-metadata.rs
index ca0a6e232..ca0a6e232 100644
--- a/src/test/debuginfo/basic-types-metadata.rs
+++ b/tests/debuginfo/basic-types-metadata.rs
diff --git a/src/test/debuginfo/basic-types-mut-globals.rs b/tests/debuginfo/basic-types-mut-globals.rs
index 9b0c46fa4..9b0c46fa4 100644
--- a/src/test/debuginfo/basic-types-mut-globals.rs
+++ b/tests/debuginfo/basic-types-mut-globals.rs
diff --git a/src/test/debuginfo/basic-types.rs b/tests/debuginfo/basic-types.rs
index 9e82f0714..9e82f0714 100644
--- a/src/test/debuginfo/basic-types.rs
+++ b/tests/debuginfo/basic-types.rs
diff --git a/src/test/debuginfo/borrowed-basic.rs b/tests/debuginfo/borrowed-basic.rs
index 45f5df228..45f5df228 100644
--- a/src/test/debuginfo/borrowed-basic.rs
+++ b/tests/debuginfo/borrowed-basic.rs
diff --git a/src/test/debuginfo/borrowed-c-style-enum.rs b/tests/debuginfo/borrowed-c-style-enum.rs
index f212ff395..f212ff395 100644
--- a/src/test/debuginfo/borrowed-c-style-enum.rs
+++ b/tests/debuginfo/borrowed-c-style-enum.rs
diff --git a/src/test/debuginfo/borrowed-enum.rs b/tests/debuginfo/borrowed-enum.rs
index f3e465dc6..f3e465dc6 100644
--- a/src/test/debuginfo/borrowed-enum.rs
+++ b/tests/debuginfo/borrowed-enum.rs
diff --git a/src/test/debuginfo/borrowed-struct.rs b/tests/debuginfo/borrowed-struct.rs
index fe945266b..fe945266b 100644
--- a/src/test/debuginfo/borrowed-struct.rs
+++ b/tests/debuginfo/borrowed-struct.rs
diff --git a/src/test/debuginfo/borrowed-tuple.rs b/tests/debuginfo/borrowed-tuple.rs
index cc28e49c4..cc28e49c4 100644
--- a/src/test/debuginfo/borrowed-tuple.rs
+++ b/tests/debuginfo/borrowed-tuple.rs
diff --git a/src/test/debuginfo/borrowed-unique-basic.rs b/tests/debuginfo/borrowed-unique-basic.rs
index 94229bf27..94229bf27 100644
--- a/src/test/debuginfo/borrowed-unique-basic.rs
+++ b/tests/debuginfo/borrowed-unique-basic.rs
diff --git a/src/test/debuginfo/box.rs b/tests/debuginfo/box.rs
index 3713c8c13..3713c8c13 100644
--- a/src/test/debuginfo/box.rs
+++ b/tests/debuginfo/box.rs
diff --git a/src/test/debuginfo/boxed-struct.rs b/tests/debuginfo/boxed-struct.rs
index 64bc12475..64bc12475 100644
--- a/src/test/debuginfo/boxed-struct.rs
+++ b/tests/debuginfo/boxed-struct.rs
diff --git a/src/test/debuginfo/by-value-non-immediate-argument.rs b/tests/debuginfo/by-value-non-immediate-argument.rs
index b417567dc..b417567dc 100644
--- a/src/test/debuginfo/by-value-non-immediate-argument.rs
+++ b/tests/debuginfo/by-value-non-immediate-argument.rs
diff --git a/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs b/tests/debuginfo/by-value-self-argument-in-trait-impl.rs
index e60cfc924..e60cfc924 100644
--- a/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs
+++ b/tests/debuginfo/by-value-self-argument-in-trait-impl.rs
diff --git a/src/test/debuginfo/c-style-enum-in-composite.rs b/tests/debuginfo/c-style-enum-in-composite.rs
index 2ed49de58..2ed49de58 100644
--- a/src/test/debuginfo/c-style-enum-in-composite.rs
+++ b/tests/debuginfo/c-style-enum-in-composite.rs
diff --git a/src/test/debuginfo/c-style-enum.rs b/tests/debuginfo/c-style-enum.rs
index dce34fc0d..dce34fc0d 100644
--- a/src/test/debuginfo/c-style-enum.rs
+++ b/tests/debuginfo/c-style-enum.rs
diff --git a/src/test/debuginfo/captured-fields-1.rs b/tests/debuginfo/captured-fields-1.rs
index afbf942d4..afbf942d4 100644
--- a/src/test/debuginfo/captured-fields-1.rs
+++ b/tests/debuginfo/captured-fields-1.rs
diff --git a/src/test/debuginfo/captured-fields-2.rs b/tests/debuginfo/captured-fields-2.rs
index c872354a9..c872354a9 100644
--- a/src/test/debuginfo/captured-fields-2.rs
+++ b/tests/debuginfo/captured-fields-2.rs
diff --git a/src/test/debuginfo/closure-in-generic-function.rs b/tests/debuginfo/closure-in-generic-function.rs
index 91d7ddc54..91d7ddc54 100644
--- a/src/test/debuginfo/closure-in-generic-function.rs
+++ b/tests/debuginfo/closure-in-generic-function.rs
diff --git a/src/test/debuginfo/collapse-debuginfo-no-attr-flag.rs b/tests/debuginfo/collapse-debuginfo-no-attr-flag.rs
index 413f61201..413f61201 100644
--- a/src/test/debuginfo/collapse-debuginfo-no-attr-flag.rs
+++ b/tests/debuginfo/collapse-debuginfo-no-attr-flag.rs
diff --git a/src/test/debuginfo/collapse-debuginfo-no-attr.rs b/tests/debuginfo/collapse-debuginfo-no-attr.rs
index 230c8795b..230c8795b 100644
--- a/src/test/debuginfo/collapse-debuginfo-no-attr.rs
+++ b/tests/debuginfo/collapse-debuginfo-no-attr.rs
diff --git a/src/test/debuginfo/collapse-debuginfo-with-attr-flag.rs b/tests/debuginfo/collapse-debuginfo-with-attr-flag.rs
index 183cf537e..183cf537e 100644
--- a/src/test/debuginfo/collapse-debuginfo-with-attr-flag.rs
+++ b/tests/debuginfo/collapse-debuginfo-with-attr-flag.rs
diff --git a/src/test/debuginfo/collapse-debuginfo-with-attr.rs b/tests/debuginfo/collapse-debuginfo-with-attr.rs
index 34d03c18b..34d03c18b 100644
--- a/src/test/debuginfo/collapse-debuginfo-with-attr.rs
+++ b/tests/debuginfo/collapse-debuginfo-with-attr.rs
diff --git a/src/test/debuginfo/constant-debug-locs.rs b/tests/debuginfo/constant-debug-locs.rs
index bf85fdca4..bf85fdca4 100644
--- a/src/test/debuginfo/constant-debug-locs.rs
+++ b/tests/debuginfo/constant-debug-locs.rs
diff --git a/src/test/debuginfo/constant-in-match-pattern.rs b/tests/debuginfo/constant-in-match-pattern.rs
index e1b533b72..e1b533b72 100644
--- a/src/test/debuginfo/constant-in-match-pattern.rs
+++ b/tests/debuginfo/constant-in-match-pattern.rs
diff --git a/src/test/debuginfo/cross-crate-spans.rs b/tests/debuginfo/cross-crate-spans.rs
index 7c58e1db2..7c58e1db2 100644
--- a/src/test/debuginfo/cross-crate-spans.rs
+++ b/tests/debuginfo/cross-crate-spans.rs
diff --git a/src/test/debuginfo/cross-crate-type-uniquing.rs b/tests/debuginfo/cross-crate-type-uniquing.rs
index 5974ddb3a..5974ddb3a 100644
--- a/src/test/debuginfo/cross-crate-type-uniquing.rs
+++ b/tests/debuginfo/cross-crate-type-uniquing.rs
diff --git a/src/test/debuginfo/destructured-fn-argument.rs b/tests/debuginfo/destructured-fn-argument.rs
index 9cd3874a5..9cd3874a5 100644
--- a/src/test/debuginfo/destructured-fn-argument.rs
+++ b/tests/debuginfo/destructured-fn-argument.rs
diff --git a/src/test/debuginfo/destructured-for-loop-variable.rs b/tests/debuginfo/destructured-for-loop-variable.rs
index 15cb88ef2..15cb88ef2 100644
--- a/src/test/debuginfo/destructured-for-loop-variable.rs
+++ b/tests/debuginfo/destructured-for-loop-variable.rs
diff --git a/src/test/debuginfo/destructured-local.rs b/tests/debuginfo/destructured-local.rs
index 3a2a88977..3a2a88977 100644
--- a/src/test/debuginfo/destructured-local.rs
+++ b/tests/debuginfo/destructured-local.rs
diff --git a/src/test/debuginfo/drop-locations.rs b/tests/debuginfo/drop-locations.rs
index c195f4620..c195f4620 100644
--- a/src/test/debuginfo/drop-locations.rs
+++ b/tests/debuginfo/drop-locations.rs
diff --git a/src/test/debuginfo/duration-type.rs b/tests/debuginfo/duration-type.rs
index bc0266d64..bc0266d64 100644
--- a/src/test/debuginfo/duration-type.rs
+++ b/tests/debuginfo/duration-type.rs
diff --git a/src/test/debuginfo/embedded-visualizer-point.natvis b/tests/debuginfo/embedded-visualizer-point.natvis
index d7bf6885d..d7bf6885d 100644
--- a/src/test/debuginfo/embedded-visualizer-point.natvis
+++ b/tests/debuginfo/embedded-visualizer-point.natvis
diff --git a/src/test/debuginfo/embedded-visualizer-point.py b/tests/debuginfo/embedded-visualizer-point.py
index d6b1af007..d6b1af007 100644
--- a/src/test/debuginfo/embedded-visualizer-point.py
+++ b/tests/debuginfo/embedded-visualizer-point.py
diff --git a/src/test/debuginfo/embedded-visualizer.natvis b/tests/debuginfo/embedded-visualizer.natvis
index 100437f90..100437f90 100644
--- a/src/test/debuginfo/embedded-visualizer.natvis
+++ b/tests/debuginfo/embedded-visualizer.natvis
diff --git a/src/test/debuginfo/embedded-visualizer.py b/tests/debuginfo/embedded-visualizer.py
index 8e4fab616..8e4fab616 100644
--- a/src/test/debuginfo/embedded-visualizer.py
+++ b/tests/debuginfo/embedded-visualizer.py
diff --git a/src/test/debuginfo/embedded-visualizer.rs b/tests/debuginfo/embedded-visualizer.rs
index 0269015b4..0269015b4 100644
--- a/src/test/debuginfo/embedded-visualizer.rs
+++ b/tests/debuginfo/embedded-visualizer.rs
diff --git a/src/test/debuginfo/empty-string.rs b/tests/debuginfo/empty-string.rs
index 66eb8bae2..66eb8bae2 100644
--- a/src/test/debuginfo/empty-string.rs
+++ b/tests/debuginfo/empty-string.rs
diff --git a/src/test/debuginfo/enum-thinlto.rs b/tests/debuginfo/enum-thinlto.rs
index b10e04a4a..b10e04a4a 100644
--- a/src/test/debuginfo/enum-thinlto.rs
+++ b/tests/debuginfo/enum-thinlto.rs
diff --git a/src/test/debuginfo/evec-in-struct.rs b/tests/debuginfo/evec-in-struct.rs
index 0d94cd224..0d94cd224 100644
--- a/src/test/debuginfo/evec-in-struct.rs
+++ b/tests/debuginfo/evec-in-struct.rs
diff --git a/src/test/debuginfo/extern-c-fn.rs b/tests/debuginfo/extern-c-fn.rs
index 17a452ec6..17a452ec6 100644
--- a/src/test/debuginfo/extern-c-fn.rs
+++ b/tests/debuginfo/extern-c-fn.rs
diff --git a/src/test/debuginfo/fixed-sized-array.rs b/tests/debuginfo/fixed-sized-array.rs
index d8899224d..d8899224d 100644
--- a/src/test/debuginfo/fixed-sized-array.rs
+++ b/tests/debuginfo/fixed-sized-array.rs
diff --git a/src/test/debuginfo/function-arg-initialization.rs b/tests/debuginfo/function-arg-initialization.rs
index dea133951..dea133951 100644
--- a/src/test/debuginfo/function-arg-initialization.rs
+++ b/tests/debuginfo/function-arg-initialization.rs
diff --git a/src/test/debuginfo/function-arguments.rs b/tests/debuginfo/function-arguments.rs
index 5cfd7d1f8..5cfd7d1f8 100644
--- a/src/test/debuginfo/function-arguments.rs
+++ b/tests/debuginfo/function-arguments.rs
diff --git a/src/test/debuginfo/function-call.rs b/tests/debuginfo/function-call.rs
index 75334558b..75334558b 100644
--- a/src/test/debuginfo/function-call.rs
+++ b/tests/debuginfo/function-call.rs
diff --git a/src/test/debuginfo/function-names.rs b/tests/debuginfo/function-names.rs
index 2227de3b3..2227de3b3 100644
--- a/src/test/debuginfo/function-names.rs
+++ b/tests/debuginfo/function-names.rs
diff --git a/src/test/debuginfo/function-prologue-stepping-regular.rs b/tests/debuginfo/function-prologue-stepping-regular.rs
index 699ff84ee..699ff84ee 100644
--- a/src/test/debuginfo/function-prologue-stepping-regular.rs
+++ b/tests/debuginfo/function-prologue-stepping-regular.rs
diff --git a/src/test/debuginfo/gdb-char.rs b/tests/debuginfo/gdb-char.rs
index 1863405bf..1863405bf 100644
--- a/src/test/debuginfo/gdb-char.rs
+++ b/tests/debuginfo/gdb-char.rs
diff --git a/src/test/debuginfo/gdb-pretty-struct-and-enums.rs b/tests/debuginfo/gdb-pretty-struct-and-enums.rs
index 3314f0a4e..3314f0a4e 100644
--- a/src/test/debuginfo/gdb-pretty-struct-and-enums.rs
+++ b/tests/debuginfo/gdb-pretty-struct-and-enums.rs
diff --git a/src/test/debuginfo/generator-locals.rs b/tests/debuginfo/generator-locals.rs
index fd46c1a8b..fd46c1a8b 100644
--- a/src/test/debuginfo/generator-locals.rs
+++ b/tests/debuginfo/generator-locals.rs
diff --git a/src/test/debuginfo/generator-objects.rs b/tests/debuginfo/generator-objects.rs
index 11c4ae2f6..11c4ae2f6 100644
--- a/src/test/debuginfo/generator-objects.rs
+++ b/tests/debuginfo/generator-objects.rs
diff --git a/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs b/tests/debuginfo/generic-enum-with-different-disr-sizes.rs
index adcb04da3..adcb04da3 100644
--- a/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs
+++ b/tests/debuginfo/generic-enum-with-different-disr-sizes.rs
diff --git a/src/test/debuginfo/generic-function.rs b/tests/debuginfo/generic-function.rs
index e8f3940c8..e8f3940c8 100644
--- a/src/test/debuginfo/generic-function.rs
+++ b/tests/debuginfo/generic-function.rs
diff --git a/src/test/debuginfo/generic-functions-nested.rs b/tests/debuginfo/generic-functions-nested.rs
index 4c4297f94..4c4297f94 100644
--- a/src/test/debuginfo/generic-functions-nested.rs
+++ b/tests/debuginfo/generic-functions-nested.rs
diff --git a/src/test/debuginfo/generic-method-on-generic-struct.rs b/tests/debuginfo/generic-method-on-generic-struct.rs
index 97609ef5d..97609ef5d 100644
--- a/src/test/debuginfo/generic-method-on-generic-struct.rs
+++ b/tests/debuginfo/generic-method-on-generic-struct.rs
diff --git a/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs b/tests/debuginfo/generic-static-method-on-struct-and-enum.rs
index b0ac8ae85..b0ac8ae85 100644
--- a/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs
+++ b/tests/debuginfo/generic-static-method-on-struct-and-enum.rs
diff --git a/src/test/debuginfo/generic-struct-style-enum.rs b/tests/debuginfo/generic-struct-style-enum.rs
index 764330ae2..764330ae2 100644
--- a/src/test/debuginfo/generic-struct-style-enum.rs
+++ b/tests/debuginfo/generic-struct-style-enum.rs
diff --git a/src/test/debuginfo/generic-struct.rs b/tests/debuginfo/generic-struct.rs
index 5fa5ce800..5fa5ce800 100644
--- a/src/test/debuginfo/generic-struct.rs
+++ b/tests/debuginfo/generic-struct.rs
diff --git a/src/test/debuginfo/generic-tuple-style-enum.rs b/tests/debuginfo/generic-tuple-style-enum.rs
index 60362e54e..60362e54e 100644
--- a/src/test/debuginfo/generic-tuple-style-enum.rs
+++ b/tests/debuginfo/generic-tuple-style-enum.rs
diff --git a/src/test/debuginfo/include_string.rs b/tests/debuginfo/include_string.rs
index 30e9deabb..30e9deabb 100644
--- a/src/test/debuginfo/include_string.rs
+++ b/tests/debuginfo/include_string.rs
diff --git a/src/test/debuginfo/issue-12886.rs b/tests/debuginfo/issue-12886.rs
index 389221cbb..389221cbb 100644
--- a/src/test/debuginfo/issue-12886.rs
+++ b/tests/debuginfo/issue-12886.rs
diff --git a/src/test/debuginfo/issue-13213.rs b/tests/debuginfo/issue-13213.rs
index 393478460..393478460 100644
--- a/src/test/debuginfo/issue-13213.rs
+++ b/tests/debuginfo/issue-13213.rs
diff --git a/src/test/debuginfo/issue-14411.rs b/tests/debuginfo/issue-14411.rs
index 19609f428..19609f428 100644
--- a/src/test/debuginfo/issue-14411.rs
+++ b/tests/debuginfo/issue-14411.rs
diff --git a/src/test/debuginfo/issue-22656.rs b/tests/debuginfo/issue-22656.rs
index f28656627..f28656627 100644
--- a/src/test/debuginfo/issue-22656.rs
+++ b/tests/debuginfo/issue-22656.rs
diff --git a/src/test/debuginfo/issue-57822.rs b/tests/debuginfo/issue-57822.rs
index 62e7eb13c..62e7eb13c 100644
--- a/src/test/debuginfo/issue-57822.rs
+++ b/tests/debuginfo/issue-57822.rs
diff --git a/src/test/debuginfo/issue-7712.rs b/tests/debuginfo/issue-7712.rs
index 3a7565f55..3a7565f55 100644
--- a/src/test/debuginfo/issue-7712.rs
+++ b/tests/debuginfo/issue-7712.rs
diff --git a/src/test/debuginfo/lexical-scope-in-for-loop.rs b/tests/debuginfo/lexical-scope-in-for-loop.rs
index 28acab5cb..28acab5cb 100644
--- a/src/test/debuginfo/lexical-scope-in-for-loop.rs
+++ b/tests/debuginfo/lexical-scope-in-for-loop.rs
diff --git a/src/test/debuginfo/lexical-scope-in-if-let.rs b/tests/debuginfo/lexical-scope-in-if-let.rs
index 8fee459bd..8fee459bd 100644
--- a/src/test/debuginfo/lexical-scope-in-if-let.rs
+++ b/tests/debuginfo/lexical-scope-in-if-let.rs
diff --git a/src/test/debuginfo/lexical-scope-in-if.rs b/tests/debuginfo/lexical-scope-in-if.rs
index 06bef329d..06bef329d 100644
--- a/src/test/debuginfo/lexical-scope-in-if.rs
+++ b/tests/debuginfo/lexical-scope-in-if.rs
diff --git a/src/test/debuginfo/lexical-scope-in-match.rs b/tests/debuginfo/lexical-scope-in-match.rs
index 64b7c809d..64b7c809d 100644
--- a/src/test/debuginfo/lexical-scope-in-match.rs
+++ b/tests/debuginfo/lexical-scope-in-match.rs
diff --git a/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs b/tests/debuginfo/lexical-scope-in-parameterless-closure.rs
index d6b947fad..d6b947fad 100644
--- a/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs
+++ b/tests/debuginfo/lexical-scope-in-parameterless-closure.rs
diff --git a/src/test/debuginfo/lexical-scope-in-stack-closure.rs b/tests/debuginfo/lexical-scope-in-stack-closure.rs
index 18d9a809e..18d9a809e 100644
--- a/src/test/debuginfo/lexical-scope-in-stack-closure.rs
+++ b/tests/debuginfo/lexical-scope-in-stack-closure.rs
diff --git a/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs b/tests/debuginfo/lexical-scope-in-unconditional-loop.rs
index 6b6af2063..6b6af2063 100644
--- a/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs
+++ b/tests/debuginfo/lexical-scope-in-unconditional-loop.rs
diff --git a/src/test/debuginfo/lexical-scope-in-unique-closure.rs b/tests/debuginfo/lexical-scope-in-unique-closure.rs
index 9dd44ae8b..9dd44ae8b 100644
--- a/src/test/debuginfo/lexical-scope-in-unique-closure.rs
+++ b/tests/debuginfo/lexical-scope-in-unique-closure.rs
diff --git a/src/test/debuginfo/lexical-scope-in-while.rs b/tests/debuginfo/lexical-scope-in-while.rs
index 07f4a846f..07f4a846f 100644
--- a/src/test/debuginfo/lexical-scope-in-while.rs
+++ b/tests/debuginfo/lexical-scope-in-while.rs
diff --git a/src/test/debuginfo/lexical-scope-with-macro.rs b/tests/debuginfo/lexical-scope-with-macro.rs
index 3dab79392..3dab79392 100644
--- a/src/test/debuginfo/lexical-scope-with-macro.rs
+++ b/tests/debuginfo/lexical-scope-with-macro.rs
diff --git a/src/test/debuginfo/lexical-scopes-in-block-expression.rs b/tests/debuginfo/lexical-scopes-in-block-expression.rs
index 72621ffc7..72621ffc7 100644
--- a/src/test/debuginfo/lexical-scopes-in-block-expression.rs
+++ b/tests/debuginfo/lexical-scopes-in-block-expression.rs
diff --git a/src/test/debuginfo/limited-debuginfo.rs b/tests/debuginfo/limited-debuginfo.rs
index bd381cd0e..bd381cd0e 100644
--- a/src/test/debuginfo/limited-debuginfo.rs
+++ b/tests/debuginfo/limited-debuginfo.rs
diff --git a/src/test/debuginfo/macro-stepping.inc b/tests/debuginfo/macro-stepping.inc
index 1bcbcfd6c..1bcbcfd6c 100644
--- a/src/test/debuginfo/macro-stepping.inc
+++ b/tests/debuginfo/macro-stepping.inc
diff --git a/src/test/debuginfo/macro-stepping.rs b/tests/debuginfo/macro-stepping.rs
index e4b2b7b79..e4b2b7b79 100644
--- a/src/test/debuginfo/macro-stepping.rs
+++ b/tests/debuginfo/macro-stepping.rs
diff --git a/src/test/debuginfo/marker-types.rs b/tests/debuginfo/marker-types.rs
index 8373d7856..8373d7856 100644
--- a/src/test/debuginfo/marker-types.rs
+++ b/tests/debuginfo/marker-types.rs
diff --git a/src/test/debuginfo/method-on-enum.rs b/tests/debuginfo/method-on-enum.rs
index aaa9bd9d6..aaa9bd9d6 100644
--- a/src/test/debuginfo/method-on-enum.rs
+++ b/tests/debuginfo/method-on-enum.rs
diff --git a/src/test/debuginfo/method-on-generic-struct.rs b/tests/debuginfo/method-on-generic-struct.rs
index bf0474491..bf0474491 100644
--- a/src/test/debuginfo/method-on-generic-struct.rs
+++ b/tests/debuginfo/method-on-generic-struct.rs
diff --git a/src/test/debuginfo/method-on-struct.rs b/tests/debuginfo/method-on-struct.rs
index deed4f9cc..deed4f9cc 100644
--- a/src/test/debuginfo/method-on-struct.rs
+++ b/tests/debuginfo/method-on-struct.rs
diff --git a/src/test/debuginfo/method-on-trait.rs b/tests/debuginfo/method-on-trait.rs
index 7ebebfa72..7ebebfa72 100644
--- a/src/test/debuginfo/method-on-trait.rs
+++ b/tests/debuginfo/method-on-trait.rs
diff --git a/src/test/debuginfo/method-on-tuple-struct.rs b/tests/debuginfo/method-on-tuple-struct.rs
index a5a87b2ad..a5a87b2ad 100644
--- a/src/test/debuginfo/method-on-tuple-struct.rs
+++ b/tests/debuginfo/method-on-tuple-struct.rs
diff --git a/src/test/debuginfo/msvc-pretty-enums.rs b/tests/debuginfo/msvc-pretty-enums.rs
index d66e4c660..d66e4c660 100644
--- a/src/test/debuginfo/msvc-pretty-enums.rs
+++ b/tests/debuginfo/msvc-pretty-enums.rs
diff --git a/src/test/debuginfo/msvc-scalarpair-params.rs b/tests/debuginfo/msvc-scalarpair-params.rs
index ae67f6981..ae67f6981 100644
--- a/src/test/debuginfo/msvc-scalarpair-params.rs
+++ b/tests/debuginfo/msvc-scalarpair-params.rs
diff --git a/src/test/debuginfo/multi-byte-chars.rs b/tests/debuginfo/multi-byte-chars.rs
index 5c68a88f2..5c68a88f2 100644
--- a/src/test/debuginfo/multi-byte-chars.rs
+++ b/tests/debuginfo/multi-byte-chars.rs
diff --git a/src/test/debuginfo/multi-cgu.rs b/tests/debuginfo/multi-cgu.rs
index 0ca7ce60e..0ca7ce60e 100644
--- a/src/test/debuginfo/multi-cgu.rs
+++ b/tests/debuginfo/multi-cgu.rs
diff --git a/src/test/debuginfo/multiple-functions-equal-var-names.rs b/tests/debuginfo/multiple-functions-equal-var-names.rs
index 32b639c7f..32b639c7f 100644
--- a/src/test/debuginfo/multiple-functions-equal-var-names.rs
+++ b/tests/debuginfo/multiple-functions-equal-var-names.rs
diff --git a/src/test/debuginfo/multiple-functions.rs b/tests/debuginfo/multiple-functions.rs
index 873857b6a..873857b6a 100644
--- a/src/test/debuginfo/multiple-functions.rs
+++ b/tests/debuginfo/multiple-functions.rs
diff --git a/src/test/debuginfo/mutable-locs.rs b/tests/debuginfo/mutable-locs.rs
index 688483e43..688483e43 100644
--- a/src/test/debuginfo/mutable-locs.rs
+++ b/tests/debuginfo/mutable-locs.rs
diff --git a/src/test/debuginfo/mutex.rs b/tests/debuginfo/mutex.rs
index 61ec6a812..61ec6a812 100644
--- a/src/test/debuginfo/mutex.rs
+++ b/tests/debuginfo/mutex.rs
diff --git a/src/test/debuginfo/name-shadowing-and-scope-nesting.rs b/tests/debuginfo/name-shadowing-and-scope-nesting.rs
index 6cee893ce..6cee893ce 100644
--- a/src/test/debuginfo/name-shadowing-and-scope-nesting.rs
+++ b/tests/debuginfo/name-shadowing-and-scope-nesting.rs
diff --git a/src/test/debuginfo/no_mangle-info.rs b/tests/debuginfo/no_mangle-info.rs
index e22d36874..e22d36874 100644
--- a/src/test/debuginfo/no_mangle-info.rs
+++ b/tests/debuginfo/no_mangle-info.rs
diff --git a/src/test/debuginfo/numeric-types.rs b/tests/debuginfo/numeric-types.rs
index c41c9ee21..c41c9ee21 100644
--- a/src/test/debuginfo/numeric-types.rs
+++ b/tests/debuginfo/numeric-types.rs
diff --git a/src/test/debuginfo/option-like-enum.rs b/tests/debuginfo/option-like-enum.rs
index 04d08b9e6..04d08b9e6 100644
--- a/src/test/debuginfo/option-like-enum.rs
+++ b/tests/debuginfo/option-like-enum.rs
diff --git a/src/test/debuginfo/packed-struct-with-destructor.rs b/tests/debuginfo/packed-struct-with-destructor.rs
index 196d85b41..196d85b41 100644
--- a/src/test/debuginfo/packed-struct-with-destructor.rs
+++ b/tests/debuginfo/packed-struct-with-destructor.rs
diff --git a/src/test/debuginfo/packed-struct.rs b/tests/debuginfo/packed-struct.rs
index 7d1893a94..7d1893a94 100644
--- a/src/test/debuginfo/packed-struct.rs
+++ b/tests/debuginfo/packed-struct.rs
diff --git a/src/test/debuginfo/pretty-huge-vec.rs b/tests/debuginfo/pretty-huge-vec.rs
index 84f76ba4e..84f76ba4e 100644
--- a/src/test/debuginfo/pretty-huge-vec.rs
+++ b/tests/debuginfo/pretty-huge-vec.rs
diff --git a/src/test/debuginfo/pretty-slices.rs b/tests/debuginfo/pretty-slices.rs
index 6adc8757b..6adc8757b 100644
--- a/src/test/debuginfo/pretty-slices.rs
+++ b/tests/debuginfo/pretty-slices.rs
diff --git a/src/test/debuginfo/pretty-std-collections-hash.rs b/tests/debuginfo/pretty-std-collections-hash.rs
index 40bde8606..40bde8606 100644
--- a/src/test/debuginfo/pretty-std-collections-hash.rs
+++ b/tests/debuginfo/pretty-std-collections-hash.rs
diff --git a/src/test/debuginfo/pretty-std-collections.rs b/tests/debuginfo/pretty-std-collections.rs
index 93597aa7e..93597aa7e 100644
--- a/src/test/debuginfo/pretty-std-collections.rs
+++ b/tests/debuginfo/pretty-std-collections.rs
diff --git a/src/test/debuginfo/pretty-std.rs b/tests/debuginfo/pretty-std.rs
index 7bb2810c2..7bb2810c2 100644
--- a/src/test/debuginfo/pretty-std.rs
+++ b/tests/debuginfo/pretty-std.rs
diff --git a/src/test/debuginfo/pretty-uninitialized-vec.rs b/tests/debuginfo/pretty-uninitialized-vec.rs
index 61791f48f..61791f48f 100644
--- a/src/test/debuginfo/pretty-uninitialized-vec.rs
+++ b/tests/debuginfo/pretty-uninitialized-vec.rs
diff --git a/src/test/debuginfo/range-types.rs b/tests/debuginfo/range-types.rs
index 7362a50a0..7362a50a0 100644
--- a/src/test/debuginfo/range-types.rs
+++ b/tests/debuginfo/range-types.rs
diff --git a/src/test/debuginfo/rc_arc.rs b/tests/debuginfo/rc_arc.rs
index 5d5492d72..5d5492d72 100644
--- a/src/test/debuginfo/rc_arc.rs
+++ b/tests/debuginfo/rc_arc.rs
diff --git a/src/test/debuginfo/recursive-enum.rs b/tests/debuginfo/recursive-enum.rs
index a62d4807a..a62d4807a 100644
--- a/src/test/debuginfo/recursive-enum.rs
+++ b/tests/debuginfo/recursive-enum.rs
diff --git a/src/test/debuginfo/recursive-struct.rs b/tests/debuginfo/recursive-struct.rs
index eb14af8c5..eb14af8c5 100644
--- a/src/test/debuginfo/recursive-struct.rs
+++ b/tests/debuginfo/recursive-struct.rs
diff --git a/src/test/debuginfo/result-types.rs b/tests/debuginfo/result-types.rs
index f1944fa38..f1944fa38 100644
--- a/src/test/debuginfo/result-types.rs
+++ b/tests/debuginfo/result-types.rs
diff --git a/src/test/debuginfo/rwlock-read.rs b/tests/debuginfo/rwlock-read.rs
index bc42f92f0..bc42f92f0 100644
--- a/src/test/debuginfo/rwlock-read.rs
+++ b/tests/debuginfo/rwlock-read.rs
diff --git a/src/test/debuginfo/rwlock-write.rs b/tests/debuginfo/rwlock-write.rs
index 8decf54c1..8decf54c1 100644
--- a/src/test/debuginfo/rwlock-write.rs
+++ b/tests/debuginfo/rwlock-write.rs
diff --git a/src/test/debuginfo/self-in-default-method.rs b/tests/debuginfo/self-in-default-method.rs
index b8b5add09..b8b5add09 100644
--- a/src/test/debuginfo/self-in-default-method.rs
+++ b/tests/debuginfo/self-in-default-method.rs
diff --git a/src/test/debuginfo/self-in-generic-default-method.rs b/tests/debuginfo/self-in-generic-default-method.rs
index efce449e3..efce449e3 100644
--- a/src/test/debuginfo/self-in-generic-default-method.rs
+++ b/tests/debuginfo/self-in-generic-default-method.rs
diff --git a/src/test/debuginfo/shadowed-argument.rs b/tests/debuginfo/shadowed-argument.rs
index 0835273ac..0835273ac 100644
--- a/src/test/debuginfo/shadowed-argument.rs
+++ b/tests/debuginfo/shadowed-argument.rs
diff --git a/src/test/debuginfo/shadowed-variable.rs b/tests/debuginfo/shadowed-variable.rs
index 9f060811f..9f060811f 100644
--- a/src/test/debuginfo/shadowed-variable.rs
+++ b/tests/debuginfo/shadowed-variable.rs
diff --git a/src/test/debuginfo/should-fail.rs b/tests/debuginfo/should-fail.rs
index eef6d99d2..eef6d99d2 100644
--- a/src/test/debuginfo/should-fail.rs
+++ b/tests/debuginfo/should-fail.rs
diff --git a/src/test/debuginfo/simd.rs b/tests/debuginfo/simd.rs
index b7bfe44b6..b7bfe44b6 100644
--- a/src/test/debuginfo/simd.rs
+++ b/tests/debuginfo/simd.rs
diff --git a/src/test/debuginfo/simple-lexical-scope.rs b/tests/debuginfo/simple-lexical-scope.rs
index 01db79e1e..01db79e1e 100644
--- a/src/test/debuginfo/simple-lexical-scope.rs
+++ b/tests/debuginfo/simple-lexical-scope.rs
diff --git a/src/test/debuginfo/simple-struct.rs b/tests/debuginfo/simple-struct.rs
index aa3cf023a..aa3cf023a 100644
--- a/src/test/debuginfo/simple-struct.rs
+++ b/tests/debuginfo/simple-struct.rs
diff --git a/src/test/debuginfo/simple-tuple.rs b/tests/debuginfo/simple-tuple.rs
index 0807cfedc..0807cfedc 100644
--- a/src/test/debuginfo/simple-tuple.rs
+++ b/tests/debuginfo/simple-tuple.rs
diff --git a/src/test/debuginfo/static-method-on-struct-and-enum.rs b/tests/debuginfo/static-method-on-struct-and-enum.rs
index 864c61c15..864c61c15 100644
--- a/src/test/debuginfo/static-method-on-struct-and-enum.rs
+++ b/tests/debuginfo/static-method-on-struct-and-enum.rs
diff --git a/src/test/debuginfo/step-into-match.rs b/tests/debuginfo/step-into-match.rs
index 4a5f78570..4a5f78570 100644
--- a/src/test/debuginfo/step-into-match.rs
+++ b/tests/debuginfo/step-into-match.rs
diff --git a/src/test/debuginfo/struct-in-enum.rs b/tests/debuginfo/struct-in-enum.rs
index 41d15af14..41d15af14 100644
--- a/src/test/debuginfo/struct-in-enum.rs
+++ b/tests/debuginfo/struct-in-enum.rs
diff --git a/src/test/debuginfo/struct-in-struct.rs b/tests/debuginfo/struct-in-struct.rs
index a9e7797ec..a9e7797ec 100644
--- a/src/test/debuginfo/struct-in-struct.rs
+++ b/tests/debuginfo/struct-in-struct.rs
diff --git a/src/test/debuginfo/struct-namespace.rs b/tests/debuginfo/struct-namespace.rs
index 81752c269..81752c269 100644
--- a/src/test/debuginfo/struct-namespace.rs
+++ b/tests/debuginfo/struct-namespace.rs
diff --git a/src/test/debuginfo/struct-style-enum.rs b/tests/debuginfo/struct-style-enum.rs
index 3d819e368..3d819e368 100644
--- a/src/test/debuginfo/struct-style-enum.rs
+++ b/tests/debuginfo/struct-style-enum.rs
diff --git a/src/test/debuginfo/struct-with-destructor.rs b/tests/debuginfo/struct-with-destructor.rs
index 4334cd902..4334cd902 100644
--- a/src/test/debuginfo/struct-with-destructor.rs
+++ b/tests/debuginfo/struct-with-destructor.rs
diff --git a/src/test/debuginfo/text-to-include-1.txt b/tests/debuginfo/text-to-include-1.txt
index ba055272a..ba055272a 100644
--- a/src/test/debuginfo/text-to-include-1.txt
+++ b/tests/debuginfo/text-to-include-1.txt
diff --git a/src/test/debuginfo/text-to-include-2.txt b/tests/debuginfo/text-to-include-2.txt
index a59d2057e..a59d2057e 100644
--- a/src/test/debuginfo/text-to-include-2.txt
+++ b/tests/debuginfo/text-to-include-2.txt
diff --git a/src/test/debuginfo/text-to-include-3.txt b/tests/debuginfo/text-to-include-3.txt
index 6163f7dd4..6163f7dd4 100644
--- a/src/test/debuginfo/text-to-include-3.txt
+++ b/tests/debuginfo/text-to-include-3.txt
diff --git a/src/test/debuginfo/thread-names.rs b/tests/debuginfo/thread-names.rs
index 7a35a5189..7a35a5189 100644
--- a/src/test/debuginfo/thread-names.rs
+++ b/tests/debuginfo/thread-names.rs
diff --git a/src/test/debuginfo/thread.rs b/tests/debuginfo/thread.rs
index 388d50c5c..388d50c5c 100644
--- a/src/test/debuginfo/thread.rs
+++ b/tests/debuginfo/thread.rs
diff --git a/src/test/debuginfo/trait-pointers.rs b/tests/debuginfo/trait-pointers.rs
index e12daaf11..e12daaf11 100644
--- a/src/test/debuginfo/trait-pointers.rs
+++ b/tests/debuginfo/trait-pointers.rs
diff --git a/src/test/debuginfo/tuple-in-struct.rs b/tests/debuginfo/tuple-in-struct.rs
index 759eab8e8..759eab8e8 100644
--- a/src/test/debuginfo/tuple-in-struct.rs
+++ b/tests/debuginfo/tuple-in-struct.rs
diff --git a/src/test/debuginfo/tuple-in-tuple.rs b/tests/debuginfo/tuple-in-tuple.rs
index 578db74e9..578db74e9 100644
--- a/src/test/debuginfo/tuple-in-tuple.rs
+++ b/tests/debuginfo/tuple-in-tuple.rs
diff --git a/src/test/debuginfo/tuple-struct.rs b/tests/debuginfo/tuple-struct.rs
index b8702f970..b8702f970 100644
--- a/src/test/debuginfo/tuple-struct.rs
+++ b/tests/debuginfo/tuple-struct.rs
diff --git a/src/test/debuginfo/tuple-style-enum.rs b/tests/debuginfo/tuple-style-enum.rs
index 39ead172e..39ead172e 100644
--- a/src/test/debuginfo/tuple-style-enum.rs
+++ b/tests/debuginfo/tuple-style-enum.rs
diff --git a/src/test/debuginfo/type-names.cdb.js b/tests/debuginfo/type-names.cdb.js
index 8f8b20bfa..8f8b20bfa 100644
--- a/src/test/debuginfo/type-names.cdb.js
+++ b/tests/debuginfo/type-names.cdb.js
diff --git a/src/test/debuginfo/type-names.rs b/tests/debuginfo/type-names.rs
index d7b79a845..d7b79a845 100644
--- a/src/test/debuginfo/type-names.rs
+++ b/tests/debuginfo/type-names.rs
diff --git a/src/test/debuginfo/union-smoke.rs b/tests/debuginfo/union-smoke.rs
index 4d4b6cc96..4d4b6cc96 100644
--- a/src/test/debuginfo/union-smoke.rs
+++ b/tests/debuginfo/union-smoke.rs
diff --git a/src/test/debuginfo/unique-enum.rs b/tests/debuginfo/unique-enum.rs
index d7dfaeefe..d7dfaeefe 100644
--- a/src/test/debuginfo/unique-enum.rs
+++ b/tests/debuginfo/unique-enum.rs
diff --git a/src/test/debuginfo/unit-type.rs b/tests/debuginfo/unit-type.rs
index 7aab41a3e..7aab41a3e 100644
--- a/src/test/debuginfo/unit-type.rs
+++ b/tests/debuginfo/unit-type.rs
diff --git a/src/test/debuginfo/unreachable-locals.rs b/tests/debuginfo/unreachable-locals.rs
index 5787f819c..5787f819c 100644
--- a/src/test/debuginfo/unreachable-locals.rs
+++ b/tests/debuginfo/unreachable-locals.rs
diff --git a/src/test/debuginfo/unsized.rs b/tests/debuginfo/unsized.rs
index b1ec9b068..b1ec9b068 100644
--- a/src/test/debuginfo/unsized.rs
+++ b/tests/debuginfo/unsized.rs
diff --git a/src/test/debuginfo/var-captured-in-nested-closure.rs b/tests/debuginfo/var-captured-in-nested-closure.rs
index 537c0b50b..537c0b50b 100644
--- a/src/test/debuginfo/var-captured-in-nested-closure.rs
+++ b/tests/debuginfo/var-captured-in-nested-closure.rs
diff --git a/src/test/debuginfo/var-captured-in-sendable-closure.rs b/tests/debuginfo/var-captured-in-sendable-closure.rs
index 39930e04e..39930e04e 100644
--- a/src/test/debuginfo/var-captured-in-sendable-closure.rs
+++ b/tests/debuginfo/var-captured-in-sendable-closure.rs
diff --git a/src/test/debuginfo/var-captured-in-stack-closure.rs b/tests/debuginfo/var-captured-in-stack-closure.rs
index d68409a9d..d68409a9d 100644
--- a/src/test/debuginfo/var-captured-in-stack-closure.rs
+++ b/tests/debuginfo/var-captured-in-stack-closure.rs
diff --git a/src/test/debuginfo/vec-slices.rs b/tests/debuginfo/vec-slices.rs
index 7d88e45ca..7d88e45ca 100644
--- a/src/test/debuginfo/vec-slices.rs
+++ b/tests/debuginfo/vec-slices.rs
diff --git a/src/test/debuginfo/vec.rs b/tests/debuginfo/vec.rs
index 895661816..895661816 100644
--- a/src/test/debuginfo/vec.rs
+++ b/tests/debuginfo/vec.rs
diff --git a/src/test/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.rs b/tests/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.rs
index 16aaad348..16aaad348 100644
--- a/src/test/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.rs
+++ b/tests/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.rs
diff --git a/src/test/incremental/add_private_fn_at_krate_root_cc/struct_point.rs b/tests/incremental/add_private_fn_at_krate_root_cc/struct_point.rs
index ea1ea1943..ea1ea1943 100644
--- a/src/test/incremental/add_private_fn_at_krate_root_cc/struct_point.rs
+++ b/tests/incremental/add_private_fn_at_krate_root_cc/struct_point.rs
diff --git a/src/test/incremental/async-lifetimes.rs b/tests/incremental/async-lifetimes.rs
index 90a0b93b9..90a0b93b9 100644
--- a/src/test/incremental/async-lifetimes.rs
+++ b/tests/incremental/async-lifetimes.rs
diff --git a/src/test/incremental/auxiliary/incremental_proc_macro_aux.rs b/tests/incremental/auxiliary/incremental_proc_macro_aux.rs
index 6961450b4..6961450b4 100644
--- a/src/test/incremental/auxiliary/incremental_proc_macro_aux.rs
+++ b/tests/incremental/auxiliary/incremental_proc_macro_aux.rs
diff --git a/src/test/incremental/auxiliary/issue-49482-macro-def.rs b/tests/incremental/auxiliary/issue-49482-macro-def.rs
index bfa7abb1a..bfa7abb1a 100644
--- a/src/test/incremental/auxiliary/issue-49482-macro-def.rs
+++ b/tests/incremental/auxiliary/issue-49482-macro-def.rs
diff --git a/src/test/incremental/auxiliary/issue-49482-reexport.rs b/tests/incremental/auxiliary/issue-49482-reexport.rs
index 39f19e3f1..39f19e3f1 100644
--- a/src/test/incremental/auxiliary/issue-49482-reexport.rs
+++ b/tests/incremental/auxiliary/issue-49482-reexport.rs
diff --git a/src/test/incremental/auxiliary/issue-54059.rs b/tests/incremental/auxiliary/issue-54059.rs
index fa2814a77..fa2814a77 100644
--- a/src/test/incremental/auxiliary/issue-54059.rs
+++ b/tests/incremental/auxiliary/issue-54059.rs
diff --git a/src/test/incremental/auxiliary/issue-79661.rs b/tests/incremental/auxiliary/issue-79661.rs
index cd32a52eb..cd32a52eb 100644
--- a/src/test/incremental/auxiliary/issue-79661.rs
+++ b/tests/incremental/auxiliary/issue-79661.rs
diff --git a/src/test/incremental/auxiliary/issue-79890.rs b/tests/incremental/auxiliary/issue-79890.rs
index 8eaeafa52..8eaeafa52 100644
--- a/src/test/incremental/auxiliary/issue-79890.rs
+++ b/tests/incremental/auxiliary/issue-79890.rs
diff --git a/src/test/incremental/auxiliary/rustc-rust-log-aux.rs b/tests/incremental/auxiliary/rustc-rust-log-aux.rs
index a361373dc..a361373dc 100644
--- a/src/test/incremental/auxiliary/rustc-rust-log-aux.rs
+++ b/tests/incremental/auxiliary/rustc-rust-log-aux.rs
diff --git a/src/test/incremental/cache_file_headers.rs b/tests/incremental/cache_file_headers.rs
index 9cf611c33..9cf611c33 100644
--- a/src/test/incremental/cache_file_headers.rs
+++ b/tests/incremental/cache_file_headers.rs
diff --git a/src/test/incremental/callee_caller_cross_crate/auxiliary/a.rs b/tests/incremental/callee_caller_cross_crate/auxiliary/a.rs
index 6445f87f7..6445f87f7 100644
--- a/src/test/incremental/callee_caller_cross_crate/auxiliary/a.rs
+++ b/tests/incremental/callee_caller_cross_crate/auxiliary/a.rs
diff --git a/src/test/incremental/callee_caller_cross_crate/b.rs b/tests/incremental/callee_caller_cross_crate/b.rs
index 084ed232a..084ed232a 100644
--- a/src/test/incremental/callee_caller_cross_crate/b.rs
+++ b/tests/incremental/callee_caller_cross_crate/b.rs
diff --git a/src/test/incremental/change_add_field/struct_point.rs b/tests/incremental/change_add_field/struct_point.rs
index 3308ea562..3308ea562 100644
--- a/src/test/incremental/change_add_field/struct_point.rs
+++ b/tests/incremental/change_add_field/struct_point.rs
diff --git a/src/test/incremental/change_crate_dep_kind.rs b/tests/incremental/change_crate_dep_kind.rs
index 8c35f6ca0..8c35f6ca0 100644
--- a/src/test/incremental/change_crate_dep_kind.rs
+++ b/tests/incremental/change_crate_dep_kind.rs
diff --git a/src/test/incremental/change_crate_order/auxiliary/a.rs b/tests/incremental/change_crate_order/auxiliary/a.rs
index 1bd48714a..1bd48714a 100644
--- a/src/test/incremental/change_crate_order/auxiliary/a.rs
+++ b/tests/incremental/change_crate_order/auxiliary/a.rs
diff --git a/src/test/incremental/change_crate_order/auxiliary/b.rs b/tests/incremental/change_crate_order/auxiliary/b.rs
index 001b88912..001b88912 100644
--- a/src/test/incremental/change_crate_order/auxiliary/b.rs
+++ b/tests/incremental/change_crate_order/auxiliary/b.rs
diff --git a/src/test/incremental/change_crate_order/main.rs b/tests/incremental/change_crate_order/main.rs
index 7448b54dd..7448b54dd 100644
--- a/src/test/incremental/change_crate_order/main.rs
+++ b/tests/incremental/change_crate_order/main.rs
diff --git a/src/test/incremental/change_implementation_cross_crate/auxiliary/a.rs b/tests/incremental/change_implementation_cross_crate/auxiliary/a.rs
index 7320a97b9..7320a97b9 100644
--- a/src/test/incremental/change_implementation_cross_crate/auxiliary/a.rs
+++ b/tests/incremental/change_implementation_cross_crate/auxiliary/a.rs
diff --git a/src/test/incremental/change_implementation_cross_crate/main.rs b/tests/incremental/change_implementation_cross_crate/main.rs
index dee9ebd74..dee9ebd74 100644
--- a/src/test/incremental/change_implementation_cross_crate/main.rs
+++ b/tests/incremental/change_implementation_cross_crate/main.rs
diff --git a/src/test/incremental/change_name_of_static_in_fn.rs b/tests/incremental/change_name_of_static_in_fn.rs
index fd16ad2dc..fd16ad2dc 100644
--- a/src/test/incremental/change_name_of_static_in_fn.rs
+++ b/tests/incremental/change_name_of_static_in_fn.rs
diff --git a/src/test/incremental/change_private_fn/struct_point.rs b/tests/incremental/change_private_fn/struct_point.rs
index d57267adc..d57267adc 100644
--- a/src/test/incremental/change_private_fn/struct_point.rs
+++ b/tests/incremental/change_private_fn/struct_point.rs
diff --git a/src/test/incremental/change_private_fn_cc/auxiliary/point.rs b/tests/incremental/change_private_fn_cc/auxiliary/point.rs
index 483f20572..483f20572 100644
--- a/src/test/incremental/change_private_fn_cc/auxiliary/point.rs
+++ b/tests/incremental/change_private_fn_cc/auxiliary/point.rs
diff --git a/src/test/incremental/change_private_fn_cc/struct_point.rs b/tests/incremental/change_private_fn_cc/struct_point.rs
index 1c27ec3a3..1c27ec3a3 100644
--- a/src/test/incremental/change_private_fn_cc/struct_point.rs
+++ b/tests/incremental/change_private_fn_cc/struct_point.rs
diff --git a/src/test/incremental/change_private_impl_method/struct_point.rs b/tests/incremental/change_private_impl_method/struct_point.rs
index cf43e4757..cf43e4757 100644
--- a/src/test/incremental/change_private_impl_method/struct_point.rs
+++ b/tests/incremental/change_private_impl_method/struct_point.rs
diff --git a/src/test/incremental/change_private_impl_method_cc/auxiliary/point.rs b/tests/incremental/change_private_impl_method_cc/auxiliary/point.rs
index 2441da06b..2441da06b 100644
--- a/src/test/incremental/change_private_impl_method_cc/auxiliary/point.rs
+++ b/tests/incremental/change_private_impl_method_cc/auxiliary/point.rs
diff --git a/src/test/incremental/change_private_impl_method_cc/struct_point.rs b/tests/incremental/change_private_impl_method_cc/struct_point.rs
index 9fe8b5df9..9fe8b5df9 100644
--- a/src/test/incremental/change_private_impl_method_cc/struct_point.rs
+++ b/tests/incremental/change_private_impl_method_cc/struct_point.rs
diff --git a/src/test/incremental/change_pub_inherent_method_body/struct_point.rs b/tests/incremental/change_pub_inherent_method_body/struct_point.rs
index 1b87b18fc..1b87b18fc 100644
--- a/src/test/incremental/change_pub_inherent_method_body/struct_point.rs
+++ b/tests/incremental/change_pub_inherent_method_body/struct_point.rs
diff --git a/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs b/tests/incremental/change_pub_inherent_method_sig/struct_point.rs
index 0a6729567..0a6729567 100644
--- a/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs
+++ b/tests/incremental/change_pub_inherent_method_sig/struct_point.rs
diff --git a/src/test/incremental/change_symbol_export_status.rs b/tests/incremental/change_symbol_export_status.rs
index dd3dce4e7..83737a022 100644
--- a/src/test/incremental/change_symbol_export_status.rs
+++ b/tests/incremental/change_symbol_export_status.rs
@@ -2,8 +2,6 @@
 // compile-flags: -Zquery-dep-graph
 // [rpass1]compile-flags: -Zincremental-ignore-spans
 // [rpass2]compile-flags: -Zincremental-ignore-spans
-// [rpass3]compile-flags: -Zincremental-relative-spans
-// [rpass4]compile-flags: -Zincremental-relative-spans
 
 #![feature(rustc_attrs)]
 #![rustc_partition_reused(module = "change_symbol_export_status-mod1", cfg = "rpass2")]
diff --git a/src/test/incremental/commandline-args.rs b/tests/incremental/commandline-args.rs
index 35b7183db..35b7183db 100644
--- a/src/test/incremental/commandline-args.rs
+++ b/tests/incremental/commandline-args.rs
diff --git a/src/test/incremental/const-generics/hash-tyvid-regression-1.rs b/tests/incremental/const-generics/hash-tyvid-regression-1.rs
index 5ff7b19d8..5ff7b19d8 100644
--- a/src/test/incremental/const-generics/hash-tyvid-regression-1.rs
+++ b/tests/incremental/const-generics/hash-tyvid-regression-1.rs
diff --git a/src/test/incremental/const-generics/hash-tyvid-regression-2.rs b/tests/incremental/const-generics/hash-tyvid-regression-2.rs
index 5cdd43cd7..5cdd43cd7 100644
--- a/src/test/incremental/const-generics/hash-tyvid-regression-2.rs
+++ b/tests/incremental/const-generics/hash-tyvid-regression-2.rs
diff --git a/src/test/incremental/const-generics/hash-tyvid-regression-3.rs b/tests/incremental/const-generics/hash-tyvid-regression-3.rs
index 61f568f79..61f568f79 100644
--- a/src/test/incremental/const-generics/hash-tyvid-regression-3.rs
+++ b/tests/incremental/const-generics/hash-tyvid-regression-3.rs
diff --git a/src/test/incremental/const-generics/hash-tyvid-regression-4.rs b/tests/incremental/const-generics/hash-tyvid-regression-4.rs
index 12e8ac7ab..12e8ac7ab 100644
--- a/src/test/incremental/const-generics/hash-tyvid-regression-4.rs
+++ b/tests/incremental/const-generics/hash-tyvid-regression-4.rs
diff --git a/src/test/incremental/const-generics/issue-61338.rs b/tests/incremental/const-generics/issue-61338.rs
index e9d67fee2..e9d67fee2 100644
--- a/src/test/incremental/const-generics/issue-61338.rs
+++ b/tests/incremental/const-generics/issue-61338.rs
diff --git a/src/test/incremental/const-generics/issue-61516.rs b/tests/incremental/const-generics/issue-61516.rs
index c781484d1..c781484d1 100644
--- a/src/test/incremental/const-generics/issue-61516.rs
+++ b/tests/incremental/const-generics/issue-61516.rs
diff --git a/src/test/incremental/const-generics/issue-62536.rs b/tests/incremental/const-generics/issue-62536.rs
index 93c1dbf44..93c1dbf44 100644
--- a/src/test/incremental/const-generics/issue-62536.rs
+++ b/tests/incremental/const-generics/issue-62536.rs
diff --git a/src/test/incremental/const-generics/issue-64087.rs b/tests/incremental/const-generics/issue-64087.rs
index 81c813531..81c813531 100644
--- a/src/test/incremental/const-generics/issue-64087.rs
+++ b/tests/incremental/const-generics/issue-64087.rs
diff --git a/src/test/incremental/const-generics/issue-65623.rs b/tests/incremental/const-generics/issue-65623.rs
index 22bbcbcab..22bbcbcab 100644
--- a/src/test/incremental/const-generics/issue-65623.rs
+++ b/tests/incremental/const-generics/issue-65623.rs
diff --git a/src/test/incremental/const-generics/issue-68477.rs b/tests/incremental/const-generics/issue-68477.rs
index 9e35cf93d..9e35cf93d 100644
--- a/src/test/incremental/const-generics/issue-68477.rs
+++ b/tests/incremental/const-generics/issue-68477.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-1.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-1.rs
index 8262a2a21..8262a2a21 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-1.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-1.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-2.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-2.rs
index 92bbcba4b..92bbcba4b 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-2.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-2.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-3.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-3.rs
index fc114f224..fc114f224 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-3.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-3.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-82034.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-82034.rs
index c05d8355c..c05d8355c 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-82034.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-82034.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-1.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-1.rs
index 8886a556d..8886a556d 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-1.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-1.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-3.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-3.rs
index 5b2f5edc8..5b2f5edc8 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-3.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-3.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-86953.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-86953.rs
index d659c5676..d659c5676 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-86953.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-86953.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-88022.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-88022.rs
index 5f5435ba9..5f5435ba9 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-88022.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-88022.rs
diff --git a/src/test/incremental/crate_hash_reorder.rs b/tests/incremental/crate_hash_reorder.rs
index ca476b4d2..ca476b4d2 100644
--- a/src/test/incremental/crate_hash_reorder.rs
+++ b/tests/incremental/crate_hash_reorder.rs
diff --git a/src/test/incremental/cyclic-trait-hierarchy.rs b/tests/incremental/cyclic-trait-hierarchy.rs
index b502e7207..b502e7207 100644
--- a/src/test/incremental/cyclic-trait-hierarchy.rs
+++ b/tests/incremental/cyclic-trait-hierarchy.rs
diff --git a/src/test/incremental/delayed_span_bug.rs b/tests/incremental/delayed_span_bug.rs
index 2529e531e..2529e531e 100644
--- a/src/test/incremental/delayed_span_bug.rs
+++ b/tests/incremental/delayed_span_bug.rs
diff --git a/src/test/incremental/dirty_clean.rs b/tests/incremental/dirty_clean.rs
index 11d999ab3..11d999ab3 100644
--- a/src/test/incremental/dirty_clean.rs
+++ b/tests/incremental/dirty_clean.rs
diff --git a/src/test/incremental/extern_static/issue-49153.rs b/tests/incremental/extern_static/issue-49153.rs
index f1dbac288..f1dbac288 100644
--- a/src/test/incremental/extern_static/issue-49153.rs
+++ b/tests/incremental/extern_static/issue-49153.rs
diff --git a/src/test/incremental/feature_gate.rs b/tests/incremental/feature_gate.rs
index 5317a9962..5317a9962 100644
--- a/src/test/incremental/feature_gate.rs
+++ b/tests/incremental/feature_gate.rs
diff --git a/src/test/incremental/foreign.rs b/tests/incremental/foreign.rs
index f46f92eb5..f46f92eb5 100644
--- a/src/test/incremental/foreign.rs
+++ b/tests/incremental/foreign.rs
diff --git a/src/test/incremental/hash-module-order.rs b/tests/incremental/hash-module-order.rs
index fe9af9eeb..fe9af9eeb 100644
--- a/src/test/incremental/hash-module-order.rs
+++ b/tests/incremental/hash-module-order.rs
diff --git a/src/test/incremental/hashes/call_expressions.rs b/tests/incremental/hashes/call_expressions.rs
index f3a7722cd..65df2e829 100644
--- a/src/test/incremental/hashes/call_expressions.rs
+++ b/tests/incremental/hashes/call_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 
 #![allow(warnings)]
diff --git a/src/test/incremental/hashes/closure_expressions.rs b/tests/incremental/hashes/closure_expressions.rs
index c769246b2..927bcd96e 100644
--- a/src/test/incremental/hashes/closure_expressions.rs
+++ b/tests/incremental/hashes/closure_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
@@ -45,9 +42,9 @@ pub fn add_parameter() {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir, typeck")]
+#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, typeck")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(cfg="cfail5", except="hir_owner_nodes, optimized_mir, typeck")]
+#[rustc_clean(cfg="cfail5", except="hir_owner_nodes, typeck")]
 #[rustc_clean(cfg="cfail6")]
 pub fn add_parameter() {
     let x = 0u32;
diff --git a/src/test/incremental/hashes/consts.rs b/tests/incremental/hashes/consts.rs
index eaef63386..eaef63386 100644
--- a/src/test/incremental/hashes/consts.rs
+++ b/tests/incremental/hashes/consts.rs
diff --git a/src/test/incremental/hashes/enum_constructors.rs b/tests/incremental/hashes/enum_constructors.rs
index 70ef10645..db367d070 100644
--- a/src/test/incremental/hashes/enum_constructors.rs
+++ b/tests/incremental/hashes/enum_constructors.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/enum_defs.rs b/tests/incremental/hashes/enum_defs.rs
index 0f8898c38..bc83723a9 100644
--- a/src/test/incremental/hashes/enum_defs.rs
+++ b/tests/incremental/hashes/enum_defs.rs
@@ -16,9 +16,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/exported_vs_not.rs b/tests/incremental/hashes/exported_vs_not.rs
index 87fd21fd1..9ac9ae24f 100644
--- a/src/test/incremental/hashes/exported_vs_not.rs
+++ b/tests/incremental/hashes/exported_vs_not.rs
@@ -4,9 +4,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/extern_mods.rs b/tests/incremental/hashes/extern_mods.rs
index 3121abbea..1906843c7 100644
--- a/src/test/incremental/hashes/extern_mods.rs
+++ b/tests/incremental/hashes/extern_mods.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/for_loops.rs b/tests/incremental/hashes/for_loops.rs
index 16d6af016..193e792c8 100644
--- a/src/test/incremental/hashes/for_loops.rs
+++ b/tests/incremental/hashes/for_loops.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/function_interfaces.rs b/tests/incremental/hashes/function_interfaces.rs
index 3ff949fbb..182ca7d92 100644
--- a/src/test/incremental/hashes/function_interfaces.rs
+++ b/tests/incremental/hashes/function_interfaces.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(linkage)]
diff --git a/src/test/incremental/hashes/if_expressions.rs b/tests/incremental/hashes/if_expressions.rs
index cff557dcb..937fd3ac8 100644
--- a/src/test/incremental/hashes/if_expressions.rs
+++ b/tests/incremental/hashes/if_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/indexing_expressions.rs b/tests/incremental/hashes/indexing_expressions.rs
index 9ef468472..b1ac6f6fa 100644
--- a/src/test/incremental/hashes/indexing_expressions.rs
+++ b/tests/incremental/hashes/indexing_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/inherent_impls.rs b/tests/incremental/hashes/inherent_impls.rs
index 1abbff32c..285f857c9 100644
--- a/src/test/incremental/hashes/inherent_impls.rs
+++ b/tests/incremental/hashes/inherent_impls.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 
 #![allow(warnings)]
diff --git a/src/test/incremental/hashes/inline_asm.rs b/tests/incremental/hashes/inline_asm.rs
index dc878d682..3118aa135 100644
--- a/src/test/incremental/hashes/inline_asm.rs
+++ b/tests/incremental/hashes/inline_asm.rs
@@ -12,9 +12,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/let_expressions.rs b/tests/incremental/hashes/let_expressions.rs
index 01320cd51..180bf6fec 100644
--- a/src/test/incremental/hashes/let_expressions.rs
+++ b/tests/incremental/hashes/let_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/loop_expressions.rs b/tests/incremental/hashes/loop_expressions.rs
index a12cd0d02..87b86479d 100644
--- a/src/test/incremental/hashes/loop_expressions.rs
+++ b/tests/incremental/hashes/loop_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
@@ -187,9 +184,9 @@ pub fn change_continue_label() {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, typeck")]
+#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(cfg="cfail5", except="hir_owner_nodes, typeck, optimized_mir")]
+#[rustc_clean(cfg="cfail5", except="hir_owner_nodes, optimized_mir")]
 #[rustc_clean(cfg="cfail6")]
 pub fn change_continue_label() {
     let mut _x = 0;
diff --git a/src/test/incremental/hashes/match_expressions.rs b/tests/incremental/hashes/match_expressions.rs
index fa054c7de..4429df683 100644
--- a/src/test/incremental/hashes/match_expressions.rs
+++ b/tests/incremental/hashes/match_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/panic_exprs.rs b/tests/incremental/hashes/panic_exprs.rs
index 37d10d922..37d10d922 100644
--- a/src/test/incremental/hashes/panic_exprs.rs
+++ b/tests/incremental/hashes/panic_exprs.rs
diff --git a/src/test/incremental/hashes/statics.rs b/tests/incremental/hashes/statics.rs
index 67d87f5c4..bb83f8300 100644
--- a/src/test/incremental/hashes/statics.rs
+++ b/tests/incremental/hashes/statics.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/struct_constructors.rs b/tests/incremental/hashes/struct_constructors.rs
index fc9671cb4..e50e5674c 100644
--- a/src/test/incremental/hashes/struct_constructors.rs
+++ b/tests/incremental/hashes/struct_constructors.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/struct_defs.rs b/tests/incremental/hashes/struct_defs.rs
index 7a91722d7..4a2706b4f 100644
--- a/src/test/incremental/hashes/struct_defs.rs
+++ b/tests/incremental/hashes/struct_defs.rs
@@ -16,9 +16,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/trait_defs.rs b/tests/incremental/hashes/trait_defs.rs
index c453eeceb..b583bee2f 100644
--- a/src/test/incremental/hashes/trait_defs.rs
+++ b/tests/incremental/hashes/trait_defs.rs
@@ -16,9 +16,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/trait_impls.rs b/tests/incremental/hashes/trait_impls.rs
index f555f555f..3b2e18d17 100644
--- a/src/test/incremental/hashes/trait_impls.rs
+++ b/tests/incremental/hashes/trait_impls.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/type_defs.rs b/tests/incremental/hashes/type_defs.rs
index 79398eb07..79398eb07 100644
--- a/src/test/incremental/hashes/type_defs.rs
+++ b/tests/incremental/hashes/type_defs.rs
diff --git a/src/test/incremental/hashes/unary_and_binary_exprs.rs b/tests/incremental/hashes/unary_and_binary_exprs.rs
index 18fb71635..58af51eef 100644
--- a/src/test/incremental/hashes/unary_and_binary_exprs.rs
+++ b/tests/incremental/hashes/unary_and_binary_exprs.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/while_let_loops.rs b/tests/incremental/hashes/while_let_loops.rs
index f81855e42..c81b0d0af 100644
--- a/src/test/incremental/hashes/while_let_loops.rs
+++ b/tests/incremental/hashes/while_let_loops.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
@@ -158,9 +155,9 @@ pub fn change_break_label() {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck")]
+#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,typeck")]
+#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
 #[rustc_clean(cfg="cfail6")]
 pub fn change_break_label() {
     let mut _x = 0;
@@ -210,9 +207,9 @@ pub fn change_continue_label() {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck")]
+#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,typeck")]
+#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
 #[rustc_clean(cfg="cfail6")]
 pub fn change_continue_label() {
     let mut _x = 0;
diff --git a/src/test/incremental/hashes/while_loops.rs b/tests/incremental/hashes/while_loops.rs
index e432cf8fe..c1cc0b62b 100644
--- a/src/test/incremental/hashes/while_loops.rs
+++ b/tests/incremental/hashes/while_loops.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
@@ -158,9 +155,9 @@ pub fn change_break_label() {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
+#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
+#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir")]
 #[rustc_clean(cfg="cfail6")]
 pub fn change_break_label() {
     let mut _x = 0;
@@ -212,9 +209,9 @@ pub fn change_continue_label() {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck")]
+#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,typeck,optimized_mir")]
+#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir")]
 #[rustc_clean(cfg="cfail6")]
 pub fn change_continue_label() {
     let mut _x = 0;
diff --git a/src/test/incremental/hello_world.rs b/tests/incremental/hello_world.rs
index d5ec6e92b..d5ec6e92b 100644
--- a/src/test/incremental/hello_world.rs
+++ b/tests/incremental/hello_world.rs
diff --git a/src/test/incremental/hygiene/auxiliary/cached_hygiene.rs b/tests/incremental/hygiene/auxiliary/cached_hygiene.rs
index b31f60e97..b31f60e97 100644
--- a/src/test/incremental/hygiene/auxiliary/cached_hygiene.rs
+++ b/tests/incremental/hygiene/auxiliary/cached_hygiene.rs
diff --git a/src/test/incremental/hygiene/load_cached_hygiene.rs b/tests/incremental/hygiene/load_cached_hygiene.rs
index 355d33458..355d33458 100644
--- a/src/test/incremental/hygiene/load_cached_hygiene.rs
+++ b/tests/incremental/hygiene/load_cached_hygiene.rs
diff --git a/src/test/incremental/ich_method_call_trait_scope.rs b/tests/incremental/ich_method_call_trait_scope.rs
index 5566506c0..5566506c0 100644
--- a/src/test/incremental/ich_method_call_trait_scope.rs
+++ b/tests/incremental/ich_method_call_trait_scope.rs
diff --git a/src/test/incremental/ich_nested_items.rs b/tests/incremental/ich_nested_items.rs
index 379c09575..379c09575 100644
--- a/src/test/incremental/ich_nested_items.rs
+++ b/tests/incremental/ich_nested_items.rs
diff --git a/src/test/incremental/ich_resolve_results.rs b/tests/incremental/ich_resolve_results.rs
index e6ab6bceb..e6ab6bceb 100644
--- a/src/test/incremental/ich_resolve_results.rs
+++ b/tests/incremental/ich_resolve_results.rs
diff --git a/src/test/incremental/incremental_proc_macro.rs b/tests/incremental/incremental_proc_macro.rs
index becc1538f..becc1538f 100644
--- a/src/test/incremental/incremental_proc_macro.rs
+++ b/tests/incremental/incremental_proc_macro.rs
diff --git a/src/test/incremental/inlined_hir_34991/main.rs b/tests/incremental/inlined_hir_34991/main.rs
index bb76a0bb8..bb76a0bb8 100644
--- a/src/test/incremental/inlined_hir_34991/main.rs
+++ b/tests/incremental/inlined_hir_34991/main.rs
diff --git a/src/test/incremental/issue-100521-change-struct-name-assocty.rs b/tests/incremental/issue-100521-change-struct-name-assocty.rs
index 7f8d1e608..7f8d1e608 100644
--- a/src/test/incremental/issue-100521-change-struct-name-assocty.rs
+++ b/tests/incremental/issue-100521-change-struct-name-assocty.rs
diff --git a/src/test/incremental/issue-101518.rs b/tests/incremental/issue-101518.rs
index 501be175f..501be175f 100644
--- a/src/test/incremental/issue-101518.rs
+++ b/tests/incremental/issue-101518.rs
diff --git a/src/test/incremental/issue-35593.rs b/tests/incremental/issue-35593.rs
index 009e37d17..009e37d17 100644
--- a/src/test/incremental/issue-35593.rs
+++ b/tests/incremental/issue-35593.rs
diff --git a/src/test/incremental/issue-38222.rs b/tests/incremental/issue-38222.rs
index 20d4d4200..20d4d4200 100644
--- a/src/test/incremental/issue-38222.rs
+++ b/tests/incremental/issue-38222.rs
diff --git a/src/test/incremental/issue-39569.rs b/tests/incremental/issue-39569.rs
index 881ecfca7..881ecfca7 100644
--- a/src/test/incremental/issue-39569.rs
+++ b/tests/incremental/issue-39569.rs
diff --git a/src/test/incremental/issue-39828/auxiliary/generic.rs b/tests/incremental/issue-39828/auxiliary/generic.rs
index a5bb0d65f..a5bb0d65f 100644
--- a/src/test/incremental/issue-39828/auxiliary/generic.rs
+++ b/tests/incremental/issue-39828/auxiliary/generic.rs
diff --git a/src/test/incremental/issue-39828/issue-39828.rs b/tests/incremental/issue-39828/issue-39828.rs
index 8cef916ff..8cef916ff 100644
--- a/src/test/incremental/issue-39828/issue-39828.rs
+++ b/tests/incremental/issue-39828/issue-39828.rs
diff --git a/src/test/incremental/issue-42602.rs b/tests/incremental/issue-42602.rs
index b8d5303fb..b8d5303fb 100644
--- a/src/test/incremental/issue-42602.rs
+++ b/tests/incremental/issue-42602.rs
diff --git a/src/test/incremental/issue-49043.rs b/tests/incremental/issue-49043.rs
index 8d13718b8..8d13718b8 100644
--- a/src/test/incremental/issue-49043.rs
+++ b/tests/incremental/issue-49043.rs
diff --git a/src/test/incremental/issue-49482.rs b/tests/incremental/issue-49482.rs
index 042ecc0f2..042ecc0f2 100644
--- a/src/test/incremental/issue-49482.rs
+++ b/tests/incremental/issue-49482.rs
diff --git a/src/test/incremental/issue-49595/auxiliary/lit_a.rs b/tests/incremental/issue-49595/auxiliary/lit_a.rs
index 295a0b481..295a0b481 100644
--- a/src/test/incremental/issue-49595/auxiliary/lit_a.rs
+++ b/tests/incremental/issue-49595/auxiliary/lit_a.rs
diff --git a/src/test/incremental/issue-49595/auxiliary/lit_b.rs b/tests/incremental/issue-49595/auxiliary/lit_b.rs
index 5d377edfb..5d377edfb 100644
--- a/src/test/incremental/issue-49595/auxiliary/lit_b.rs
+++ b/tests/incremental/issue-49595/auxiliary/lit_b.rs
diff --git a/src/test/incremental/issue-49595/issue-49595.rs b/tests/incremental/issue-49595/issue-49595.rs
index 7b1096a64..7b1096a64 100644
--- a/src/test/incremental/issue-49595/issue-49595.rs
+++ b/tests/incremental/issue-49595/issue-49595.rs
diff --git a/src/test/incremental/issue-51409.rs b/tests/incremental/issue-51409.rs
index 280094ec0..280094ec0 100644
--- a/src/test/incremental/issue-51409.rs
+++ b/tests/incremental/issue-51409.rs
diff --git a/src/test/incremental/issue-54059.rs b/tests/incremental/issue-54059.rs
index 0a5a54750..0a5a54750 100644
--- a/src/test/incremental/issue-54059.rs
+++ b/tests/incremental/issue-54059.rs
diff --git a/src/test/incremental/issue-54242.rs b/tests/incremental/issue-54242.rs
index 806c84152..806c84152 100644
--- a/src/test/incremental/issue-54242.rs
+++ b/tests/incremental/issue-54242.rs
diff --git a/src/test/incremental/issue-59523-on-implemented-is-not-unused.rs b/tests/incremental/issue-59523-on-implemented-is-not-unused.rs
index fa52ca90b..fa52ca90b 100644
--- a/src/test/incremental/issue-59523-on-implemented-is-not-unused.rs
+++ b/tests/incremental/issue-59523-on-implemented-is-not-unused.rs
diff --git a/src/test/incremental/issue-59524-layout-scalar-valid-range-is-not-unused.rs b/tests/incremental/issue-59524-layout-scalar-valid-range-is-not-unused.rs
index bfb5e539c..bfb5e539c 100644
--- a/src/test/incremental/issue-59524-layout-scalar-valid-range-is-not-unused.rs
+++ b/tests/incremental/issue-59524-layout-scalar-valid-range-is-not-unused.rs
diff --git a/src/test/incremental/issue-60629.rs b/tests/incremental/issue-60629.rs
index 4807af4b3..4807af4b3 100644
--- a/src/test/incremental/issue-60629.rs
+++ b/tests/incremental/issue-60629.rs
diff --git a/src/test/incremental/issue-61323.rs b/tests/incremental/issue-61323.rs
index 7ce47947c..7ce47947c 100644
--- a/src/test/incremental/issue-61323.rs
+++ b/tests/incremental/issue-61323.rs
diff --git a/src/test/incremental/issue-61530.rs b/tests/incremental/issue-61530.rs
index edb3d60ba..edb3d60ba 100644
--- a/src/test/incremental/issue-61530.rs
+++ b/tests/incremental/issue-61530.rs
diff --git a/src/test/incremental/issue-62649-path-collisions-happen.rs b/tests/incremental/issue-62649-path-collisions-happen.rs
index ee81be76b..ee81be76b 100644
--- a/src/test/incremental/issue-62649-path-collisions-happen.rs
+++ b/tests/incremental/issue-62649-path-collisions-happen.rs
diff --git a/src/test/incremental/issue-69596.rs b/tests/incremental/issue-69596.rs
index dc587fdc4..dc587fdc4 100644
--- a/src/test/incremental/issue-69596.rs
+++ b/tests/incremental/issue-69596.rs
diff --git a/src/test/incremental/issue-72386.rs b/tests/incremental/issue-72386.rs
index 5917152e1..5917152e1 100644
--- a/src/test/incremental/issue-72386.rs
+++ b/tests/incremental/issue-72386.rs
diff --git a/src/test/incremental/issue-79661-missing-def-path-hash.rs b/tests/incremental/issue-79661-missing-def-path-hash.rs
index f86fb33fb..f86fb33fb 100644
--- a/src/test/incremental/issue-79661-missing-def-path-hash.rs
+++ b/tests/incremental/issue-79661-missing-def-path-hash.rs
diff --git a/src/test/incremental/issue-79890-imported-crates-changed.rs b/tests/incremental/issue-79890-imported-crates-changed.rs
index 93daa5ca9..93daa5ca9 100644
--- a/src/test/incremental/issue-79890-imported-crates-changed.rs
+++ b/tests/incremental/issue-79890-imported-crates-changed.rs
diff --git a/src/test/incremental/issue-80336-invalid-span.rs b/tests/incremental/issue-80336-invalid-span.rs
index 7757d9159..7757d9159 100644
--- a/src/test/incremental/issue-80336-invalid-span.rs
+++ b/tests/incremental/issue-80336-invalid-span.rs
diff --git a/src/test/incremental/issue-80691-bad-eval-cache.rs b/tests/incremental/issue-80691-bad-eval-cache.rs
index 1a644fd88..1a644fd88 100644
--- a/src/test/incremental/issue-80691-bad-eval-cache.rs
+++ b/tests/incremental/issue-80691-bad-eval-cache.rs
diff --git a/src/test/incremental/issue-82920-predicate-order-miscompile.rs b/tests/incremental/issue-82920-predicate-order-miscompile.rs
index 793af679c..793af679c 100644
--- a/src/test/incremental/issue-82920-predicate-order-miscompile.rs
+++ b/tests/incremental/issue-82920-predicate-order-miscompile.rs
diff --git a/src/test/incremental/issue-84252-global-alloc.rs b/tests/incremental/issue-84252-global-alloc.rs
index d2438df89..d2438df89 100644
--- a/src/test/incremental/issue-84252-global-alloc.rs
+++ b/tests/incremental/issue-84252-global-alloc.rs
diff --git a/src/test/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-lib.rs b/tests/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-lib.rs
index 2453af5b6..2453af5b6 100644
--- a/src/test/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-lib.rs
+++ b/tests/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-lib.rs
diff --git a/src/test/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-mod.rs b/tests/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-mod.rs
index 747174b1e..747174b1e 100644
--- a/src/test/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-mod.rs
+++ b/tests/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-mod.rs
diff --git a/src/test/incremental/issue-85197-invalid-span/auxiliary/respan.rs b/tests/incremental/issue-85197-invalid-span/auxiliary/respan.rs
index 5088eab62..5088eab62 100644
--- a/src/test/incremental/issue-85197-invalid-span/auxiliary/respan.rs
+++ b/tests/incremental/issue-85197-invalid-span/auxiliary/respan.rs
diff --git a/src/test/incremental/issue-85197-invalid-span/invalid_span_main.rs b/tests/incremental/issue-85197-invalid-span/invalid_span_main.rs
index f358460b3..f358460b3 100644
--- a/src/test/incremental/issue-85197-invalid-span/invalid_span_main.rs
+++ b/tests/incremental/issue-85197-invalid-span/invalid_span_main.rs
diff --git a/src/test/incremental/issue-85360-eval-obligation-ice.rs b/tests/incremental/issue-85360-eval-obligation-ice.rs
index 1796c9d19..1796c9d19 100644
--- a/src/test/incremental/issue-85360-eval-obligation-ice.rs
+++ b/tests/incremental/issue-85360-eval-obligation-ice.rs
diff --git a/src/test/incremental/issue-86753.rs b/tests/incremental/issue-86753.rs
index 4d6c4354e..4d6c4354e 100644
--- a/src/test/incremental/issue-86753.rs
+++ b/tests/incremental/issue-86753.rs
diff --git a/src/test/incremental/issue-92163-missing-sourcefile/auxiliary/first_crate.rs b/tests/incremental/issue-92163-missing-sourcefile/auxiliary/first_crate.rs
index 134afd4fb..134afd4fb 100644
--- a/src/test/incremental/issue-92163-missing-sourcefile/auxiliary/first_crate.rs
+++ b/tests/incremental/issue-92163-missing-sourcefile/auxiliary/first_crate.rs
diff --git a/src/test/incremental/issue-92163-missing-sourcefile/auxiliary/second_crate.rs b/tests/incremental/issue-92163-missing-sourcefile/auxiliary/second_crate.rs
index ab7961f38..ab7961f38 100644
--- a/src/test/incremental/issue-92163-missing-sourcefile/auxiliary/second_crate.rs
+++ b/tests/incremental/issue-92163-missing-sourcefile/auxiliary/second_crate.rs
diff --git a/src/test/incremental/issue-92163-missing-sourcefile/issue_92163_main.rs b/tests/incremental/issue-92163-missing-sourcefile/issue_92163_main.rs
index e9219c6f5..e9219c6f5 100644
--- a/src/test/incremental/issue-92163-missing-sourcefile/issue_92163_main.rs
+++ b/tests/incremental/issue-92163-missing-sourcefile/issue_92163_main.rs
diff --git a/src/test/incremental/issue-92987-provisional-dep-node.rs b/tests/incremental/issue-92987-provisional-dep-node.rs
index a48a8373c..a48a8373c 100644
--- a/src/test/incremental/issue-92987-provisional-dep-node.rs
+++ b/tests/incremental/issue-92987-provisional-dep-node.rs
diff --git a/src/test/incremental/issue-96319-coinductive-cycle.rs b/tests/incremental/issue-96319-coinductive-cycle.rs
index b5ff9112a..b5ff9112a 100644
--- a/src/test/incremental/issue-96319-coinductive-cycle.rs
+++ b/tests/incremental/issue-96319-coinductive-cycle.rs
diff --git a/src/test/incremental/krate-inherent.rs b/tests/incremental/krate-inherent.rs
index 2c04e1105..2c04e1105 100644
--- a/src/test/incremental/krate-inherent.rs
+++ b/tests/incremental/krate-inherent.rs
diff --git a/src/test/incremental/krate-inlined.rs b/tests/incremental/krate-inlined.rs
index 6b1db74a3..6b1db74a3 100644
--- a/src/test/incremental/krate-inlined.rs
+++ b/tests/incremental/krate-inlined.rs
diff --git a/src/test/incremental/krate_reassign_34991/auxiliary/a.rs b/tests/incremental/krate_reassign_34991/auxiliary/a.rs
index 69be8d3bc..69be8d3bc 100644
--- a/src/test/incremental/krate_reassign_34991/auxiliary/a.rs
+++ b/tests/incremental/krate_reassign_34991/auxiliary/a.rs
diff --git a/src/test/incremental/krate_reassign_34991/main.rs b/tests/incremental/krate_reassign_34991/main.rs
index c4ae19ac9..c4ae19ac9 100644
--- a/src/test/incremental/krate_reassign_34991/main.rs
+++ b/tests/incremental/krate_reassign_34991/main.rs
diff --git a/src/test/incremental/link_order/auxiliary/my_lib.rs b/tests/incremental/link_order/auxiliary/my_lib.rs
index 1e7d82305..1e7d82305 100644
--- a/src/test/incremental/link_order/auxiliary/my_lib.rs
+++ b/tests/incremental/link_order/auxiliary/my_lib.rs
diff --git a/src/test/incremental/link_order/main.rs b/tests/incremental/link_order/main.rs
index d211c295b..d211c295b 100644
--- a/src/test/incremental/link_order/main.rs
+++ b/tests/incremental/link_order/main.rs
diff --git a/src/test/incremental/lto-in-linker.rs b/tests/incremental/lto-in-linker.rs
index 0e8c1ebb9..0e8c1ebb9 100644
--- a/src/test/incremental/lto-in-linker.rs
+++ b/tests/incremental/lto-in-linker.rs
diff --git a/src/test/incremental/lto.rs b/tests/incremental/lto.rs
index 2a3e3c246..2a3e3c246 100644
--- a/src/test/incremental/lto.rs
+++ b/tests/incremental/lto.rs
diff --git a/src/test/incremental/macro_export.rs b/tests/incremental/macro_export.rs
index 044d63fd2..044d63fd2 100644
--- a/src/test/incremental/macro_export.rs
+++ b/tests/incremental/macro_export.rs
diff --git a/src/test/incremental/mir-opt.rs b/tests/incremental/mir-opt.rs
index 5bd863439..5bd863439 100644
--- a/src/test/incremental/mir-opt.rs
+++ b/tests/incremental/mir-opt.rs
diff --git a/src/test/incremental/no_mangle.rs b/tests/incremental/no_mangle.rs
index b1c9b2bc3..b1c9b2bc3 100644
--- a/src/test/incremental/no_mangle.rs
+++ b/tests/incremental/no_mangle.rs
diff --git a/src/test/incremental/remapped_paths_cc/auxiliary/extern_crate.rs b/tests/incremental/remapped_paths_cc/auxiliary/extern_crate.rs
index 627b99445..627b99445 100644
--- a/src/test/incremental/remapped_paths_cc/auxiliary/extern_crate.rs
+++ b/tests/incremental/remapped_paths_cc/auxiliary/extern_crate.rs
diff --git a/src/test/incremental/remapped_paths_cc/main.rs b/tests/incremental/remapped_paths_cc/main.rs
index b01f02444..b01f02444 100644
--- a/src/test/incremental/remapped_paths_cc/main.rs
+++ b/tests/incremental/remapped_paths_cc/main.rs
diff --git a/src/test/incremental/remove-private-item-cross-crate/auxiliary/a.rs b/tests/incremental/remove-private-item-cross-crate/auxiliary/a.rs
index 279a6f078..279a6f078 100644
--- a/src/test/incremental/remove-private-item-cross-crate/auxiliary/a.rs
+++ b/tests/incremental/remove-private-item-cross-crate/auxiliary/a.rs
diff --git a/src/test/incremental/remove-private-item-cross-crate/main.rs b/tests/incremental/remove-private-item-cross-crate/main.rs
index c831ab6fe..c831ab6fe 100644
--- a/src/test/incremental/remove-private-item-cross-crate/main.rs
+++ b/tests/incremental/remove-private-item-cross-crate/main.rs
diff --git a/src/test/incremental/remove_crate/auxiliary/extern_crate.rs b/tests/incremental/remove_crate/auxiliary/extern_crate.rs
index 1cafdf49d..1cafdf49d 100644
--- a/src/test/incremental/remove_crate/auxiliary/extern_crate.rs
+++ b/tests/incremental/remove_crate/auxiliary/extern_crate.rs
diff --git a/src/test/incremental/remove_crate/main.rs b/tests/incremental/remove_crate/main.rs
index 14b80df0d..14b80df0d 100644
--- a/src/test/incremental/remove_crate/main.rs
+++ b/tests/incremental/remove_crate/main.rs
diff --git a/src/test/incremental/remove_source_file/auxiliary/mod.rs b/tests/incremental/remove_source_file/auxiliary/mod.rs
index 96a366d96..96a366d96 100644
--- a/src/test/incremental/remove_source_file/auxiliary/mod.rs
+++ b/tests/incremental/remove_source_file/auxiliary/mod.rs
diff --git a/src/test/incremental/remove_source_file/main.rs b/tests/incremental/remove_source_file/main.rs
index b2411c094..b2411c094 100644
--- a/src/test/incremental/remove_source_file/main.rs
+++ b/tests/incremental/remove_source_file/main.rs
diff --git a/src/test/incremental/reorder_vtable.rs b/tests/incremental/reorder_vtable.rs
index 8dacba633..8dacba633 100644
--- a/src/test/incremental/reorder_vtable.rs
+++ b/tests/incremental/reorder_vtable.rs
diff --git a/src/test/incremental/rlib-lto.rs b/tests/incremental/rlib-lto.rs
index 752fee5a0..752fee5a0 100644
--- a/src/test/incremental/rlib-lto.rs
+++ b/tests/incremental/rlib-lto.rs
diff --git a/src/test/incremental/rlib_cross_crate/auxiliary/a.rs b/tests/incremental/rlib_cross_crate/auxiliary/a.rs
index 5a26df9ae..5a26df9ae 100644
--- a/src/test/incremental/rlib_cross_crate/auxiliary/a.rs
+++ b/tests/incremental/rlib_cross_crate/auxiliary/a.rs
diff --git a/src/test/incremental/rlib_cross_crate/b.rs b/tests/incremental/rlib_cross_crate/b.rs
index 639cfc918..639cfc918 100644
--- a/src/test/incremental/rlib_cross_crate/b.rs
+++ b/tests/incremental/rlib_cross_crate/b.rs
diff --git a/src/test/incremental/rustc-rust-log.rs b/tests/incremental/rustc-rust-log.rs
index 566f0d96d..566f0d96d 100644
--- a/src/test/incremental/rustc-rust-log.rs
+++ b/tests/incremental/rustc-rust-log.rs
diff --git a/src/test/incremental/source_loc_macros.rs b/tests/incremental/source_loc_macros.rs
index e5f04e5dc..e5f04e5dc 100644
--- a/src/test/incremental/source_loc_macros.rs
+++ b/tests/incremental/source_loc_macros.rs
diff --git a/src/test/incremental/span_hash_stable/auxiliary/mod.rs b/tests/incremental/span_hash_stable/auxiliary/mod.rs
index f3824db4c..f3824db4c 100644
--- a/src/test/incremental/span_hash_stable/auxiliary/mod.rs
+++ b/tests/incremental/span_hash_stable/auxiliary/mod.rs
diff --git a/src/test/incremental/span_hash_stable/auxiliary/sub1.rs b/tests/incremental/span_hash_stable/auxiliary/sub1.rs
index 70e2ea06b..70e2ea06b 100644
--- a/src/test/incremental/span_hash_stable/auxiliary/sub1.rs
+++ b/tests/incremental/span_hash_stable/auxiliary/sub1.rs
diff --git a/src/test/incremental/span_hash_stable/auxiliary/sub2.rs b/tests/incremental/span_hash_stable/auxiliary/sub2.rs
index 1167cdb0a..1167cdb0a 100644
--- a/src/test/incremental/span_hash_stable/auxiliary/sub2.rs
+++ b/tests/incremental/span_hash_stable/auxiliary/sub2.rs
diff --git a/src/test/incremental/span_hash_stable/main.rs b/tests/incremental/span_hash_stable/main.rs
index 367416430..367416430 100644
--- a/src/test/incremental/span_hash_stable/main.rs
+++ b/tests/incremental/span_hash_stable/main.rs
diff --git a/src/test/incremental/spans_in_type_debuginfo.rs b/tests/incremental/spans_in_type_debuginfo.rs
index f5cae15a4..f5cae15a4 100644
--- a/src/test/incremental/spans_in_type_debuginfo.rs
+++ b/tests/incremental/spans_in_type_debuginfo.rs
diff --git a/tests/incremental/spans_significant_w_debuginfo.rs b/tests/incremental/spans_significant_w_debuginfo.rs
new file mode 100644
index 000000000..38ab28461
--- /dev/null
+++ b/tests/incremental/spans_significant_w_debuginfo.rs
@@ -0,0 +1,17 @@
+// This test makes sure that just changing a definition's location in the
+// source file also changes its incr. comp. hash, if debuginfo is enabled.
+
+// revisions:rpass1 rpass2
+
+// ignore-asmjs wasm2js does not support source maps yet
+// compile-flags: -g -Z query-dep-graph
+
+#![feature(rustc_attrs)]
+#![rustc_partition_codegened(module = "spans_significant_w_debuginfo", cfg = "rpass2")]
+
+#[cfg(rpass1)]
+pub fn main() {}
+
+#[cfg(rpass2)]
+#[rustc_clean(cfg = "rpass2")]
+pub fn main() {}
diff --git a/tests/incremental/spans_significant_w_panic.rs b/tests/incremental/spans_significant_w_panic.rs
new file mode 100644
index 000000000..085e4cd78
--- /dev/null
+++ b/tests/incremental/spans_significant_w_panic.rs
@@ -0,0 +1,24 @@
+// This test makes sure that just changing a definition's location in the
+// source file also changes its incr. comp. hash, if debuginfo is enabled.
+
+// revisions:rpass1 rpass2
+
+// compile-flags: -C overflow-checks=on -Z query-dep-graph
+
+#![feature(rustc_attrs)]
+#![rustc_partition_codegened(module = "spans_significant_w_panic", cfg = "rpass2")]
+
+#[cfg(rpass1)]
+pub fn main() {
+    if std::hint::black_box(false) {
+        panic!()
+    }
+}
+
+#[cfg(rpass2)]
+#[rustc_clean(cfg = "rpass2")]
+pub fn main() {
+    if std::hint::black_box(false) {
+        panic!()
+    }
+}
diff --git a/src/test/incremental/spike-neg1.rs b/tests/incremental/spike-neg1.rs
index 97812ffe3..97812ffe3 100644
--- a/src/test/incremental/spike-neg1.rs
+++ b/tests/incremental/spike-neg1.rs
diff --git a/src/test/incremental/spike-neg2.rs b/tests/incremental/spike-neg2.rs
index 3bb1914fd..3bb1914fd 100644
--- a/src/test/incremental/spike-neg2.rs
+++ b/tests/incremental/spike-neg2.rs
diff --git a/src/test/incremental/spike.rs b/tests/incremental/spike.rs
index a6a05e7c3..a6a05e7c3 100644
--- a/src/test/incremental/spike.rs
+++ b/tests/incremental/spike.rs
diff --git a/src/test/incremental/split_debuginfo_cached.rs b/tests/incremental/split_debuginfo_cached.rs
index ba8385f89..ba8385f89 100644
--- a/src/test/incremental/split_debuginfo_cached.rs
+++ b/tests/incremental/split_debuginfo_cached.rs
diff --git a/src/test/incremental/split_debuginfo_mode.rs b/tests/incremental/split_debuginfo_mode.rs
index edc1a80d3..edc1a80d3 100644
--- a/src/test/incremental/split_debuginfo_mode.rs
+++ b/tests/incremental/split_debuginfo_mode.rs
diff --git a/src/test/incremental/static_cycle/b.rs b/tests/incremental/static_cycle/b.rs
index 064213fba..064213fba 100644
--- a/src/test/incremental/static_cycle/b.rs
+++ b/tests/incremental/static_cycle/b.rs
diff --git a/src/test/incremental/static_refering_to_other_static/issue-49081.rs b/tests/incremental/static_refering_to_other_static/issue-49081.rs
index 8e3715d1d..8e3715d1d 100644
--- a/src/test/incremental/static_refering_to_other_static/issue-49081.rs
+++ b/tests/incremental/static_refering_to_other_static/issue-49081.rs
diff --git a/src/test/incremental/static_refering_to_other_static2/issue.rs b/tests/incremental/static_refering_to_other_static2/issue.rs
index 720bb1e22..720bb1e22 100644
--- a/src/test/incremental/static_refering_to_other_static2/issue.rs
+++ b/tests/incremental/static_refering_to_other_static2/issue.rs
diff --git a/src/test/incremental/static_refering_to_other_static3/issue.rs b/tests/incremental/static_refering_to_other_static3/issue.rs
index 80999813d..80999813d 100644
--- a/src/test/incremental/static_refering_to_other_static3/issue.rs
+++ b/tests/incremental/static_refering_to_other_static3/issue.rs
diff --git a/src/test/incremental/static_stable_hash/issue-49301.rs b/tests/incremental/static_stable_hash/issue-49301.rs
index fdd05c72c..fdd05c72c 100644
--- a/src/test/incremental/static_stable_hash/issue-49301.rs
+++ b/tests/incremental/static_stable_hash/issue-49301.rs
diff --git a/tests/incremental/string_constant.rs b/tests/incremental/string_constant.rs
new file mode 100644
index 000000000..e15a8d18f
--- /dev/null
+++ b/tests/incremental/string_constant.rs
@@ -0,0 +1,42 @@
+// revisions: cfail1 cfail2
+// compile-flags: -Z query-dep-graph
+// build-pass (FIXME(62277): could be check-pass?)
+
+#![allow(warnings)]
+#![feature(rustc_attrs)]
+#![crate_type = "rlib"]
+
+// Here the only thing which changes is the string constant in `x`.
+// Therefore, the compiler deduces (correctly) that typeck is not
+// needed even for callers of `x`.
+
+pub mod x {
+    #[cfg(cfail1)]
+    pub fn x() {
+        println!("{}", "1");
+    }
+
+    #[cfg(cfail2)]
+    #[rustc_clean(except = "hir_owner_nodes,promoted_mir", cfg = "cfail2")]
+    pub fn x() {
+        println!("{}", "2");
+    }
+}
+
+pub mod y {
+    use x;
+
+    #[rustc_clean(cfg = "cfail2")]
+    pub fn y() {
+        x::x();
+    }
+}
+
+pub mod z {
+    use y;
+
+    #[rustc_clean(cfg = "cfail2")]
+    pub fn z() {
+        y::y();
+    }
+}
diff --git a/src/test/incremental/struct_add_field.rs b/tests/incremental/struct_add_field.rs
index 720854f16..720854f16 100644
--- a/src/test/incremental/struct_add_field.rs
+++ b/tests/incremental/struct_add_field.rs
diff --git a/src/test/incremental/struct_change_field_name.rs b/tests/incremental/struct_change_field_name.rs
index a7c79e9d7..a7c79e9d7 100644
--- a/src/test/incremental/struct_change_field_name.rs
+++ b/tests/incremental/struct_change_field_name.rs
diff --git a/src/test/incremental/struct_change_field_type.rs b/tests/incremental/struct_change_field_type.rs
index 37d2fba99..37d2fba99 100644
--- a/src/test/incremental/struct_change_field_type.rs
+++ b/tests/incremental/struct_change_field_type.rs
diff --git a/src/test/incremental/struct_change_field_type_cross_crate/auxiliary/a.rs b/tests/incremental/struct_change_field_type_cross_crate/auxiliary/a.rs
index d3ddb32c3..d3ddb32c3 100644
--- a/src/test/incremental/struct_change_field_type_cross_crate/auxiliary/a.rs
+++ b/tests/incremental/struct_change_field_type_cross_crate/auxiliary/a.rs
diff --git a/src/test/incremental/struct_change_field_type_cross_crate/b.rs b/tests/incremental/struct_change_field_type_cross_crate/b.rs
index c78207bcb..c78207bcb 100644
--- a/src/test/incremental/struct_change_field_type_cross_crate/b.rs
+++ b/tests/incremental/struct_change_field_type_cross_crate/b.rs
diff --git a/src/test/incremental/struct_change_nothing.rs b/tests/incremental/struct_change_nothing.rs
index de30c818c..de30c818c 100644
--- a/src/test/incremental/struct_change_nothing.rs
+++ b/tests/incremental/struct_change_nothing.rs
diff --git a/src/test/incremental/struct_remove_field.rs b/tests/incremental/struct_remove_field.rs
index b97a87e09..b97a87e09 100644
--- a/src/test/incremental/struct_remove_field.rs
+++ b/tests/incremental/struct_remove_field.rs
diff --git a/src/test/incremental/thinlto/cgu_invalidated_via_import.rs b/tests/incremental/thinlto/cgu_invalidated_via_import.rs
index 5fe435d79..5fe435d79 100644
--- a/src/test/incremental/thinlto/cgu_invalidated_via_import.rs
+++ b/tests/incremental/thinlto/cgu_invalidated_via_import.rs
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_export_added.rs b/tests/incremental/thinlto/cgu_invalidated_when_export_added.rs
index 95f3b8ae4..95f3b8ae4 100644
--- a/src/test/incremental/thinlto/cgu_invalidated_when_export_added.rs
+++ b/tests/incremental/thinlto/cgu_invalidated_when_export_added.rs
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_export_removed.rs b/tests/incremental/thinlto/cgu_invalidated_when_export_removed.rs
index e86ebd354..e86ebd354 100644
--- a/src/test/incremental/thinlto/cgu_invalidated_when_export_removed.rs
+++ b/tests/incremental/thinlto/cgu_invalidated_when_export_removed.rs
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_import_added.rs b/tests/incremental/thinlto/cgu_invalidated_when_import_added.rs
index 9c17c8745..9c17c8745 100644
--- a/src/test/incremental/thinlto/cgu_invalidated_when_import_added.rs
+++ b/tests/incremental/thinlto/cgu_invalidated_when_import_added.rs
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs b/tests/incremental/thinlto/cgu_invalidated_when_import_removed.rs
index fc53acf75..fc53acf75 100644
--- a/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs
+++ b/tests/incremental/thinlto/cgu_invalidated_when_import_removed.rs
diff --git a/tests/incremental/thinlto/cgu_keeps_identical_fn.rs b/tests/incremental/thinlto/cgu_keeps_identical_fn.rs
new file mode 100644
index 000000000..368a726ea
--- /dev/null
+++ b/tests/incremental/thinlto/cgu_keeps_identical_fn.rs
@@ -0,0 +1,49 @@
+// This test is almost identical to `cgu_invalided_via_import`, except that
+// the two versions of `inline_fn` are identical. Neither version of `inlined_fn`
+// ends up with any spans in its LLVM bitecode, so LLVM is able to skip
+// re-building any modules which import 'inlined_fn'
+
+// revisions: cfail1 cfail2 cfail3
+// compile-flags: -Z query-dep-graph -O
+// build-pass (FIXME(62277): could be check-pass?)
+
+#![feature(rustc_attrs)]
+#![crate_type = "rlib"]
+#![rustc_expected_cgu_reuse(module = "cgu_keeps_identical_fn-foo", cfg = "cfail2", kind = "no")]
+#![rustc_expected_cgu_reuse(
+    module = "cgu_keeps_identical_fn-foo",
+    cfg = "cfail3",
+    kind = "post-lto"
+)]
+#![rustc_expected_cgu_reuse(
+    module = "cgu_keeps_identical_fn-bar",
+    cfg = "cfail2",
+    kind = "post-lto"
+)]
+#![rustc_expected_cgu_reuse(
+    module = "cgu_keeps_identical_fn-bar",
+    cfg = "cfail3",
+    kind = "post-lto"
+)]
+
+mod foo {
+
+    // Trivial functions like this one are imported very reliably by ThinLTO.
+    #[cfg(any(cfail1, cfail4))]
+    pub fn inlined_fn() -> u32 {
+        1234
+    }
+
+    #[cfg(not(any(cfail1, cfail4)))]
+    pub fn inlined_fn() -> u32 {
+        1234
+    }
+}
+
+pub mod bar {
+    use foo::inlined_fn;
+
+    pub fn caller() -> u32 {
+        inlined_fn()
+    }
+}
diff --git a/src/test/incremental/thinlto/independent_cgus_dont_affect_each_other.rs b/tests/incremental/thinlto/independent_cgus_dont_affect_each_other.rs
index 045f20119..045f20119 100644
--- a/src/test/incremental/thinlto/independent_cgus_dont_affect_each_other.rs
+++ b/tests/incremental/thinlto/independent_cgus_dont_affect_each_other.rs
diff --git a/src/test/incremental/type_alias_cross_crate/auxiliary/a.rs b/tests/incremental/type_alias_cross_crate/auxiliary/a.rs
index 61fe297d7..61fe297d7 100644
--- a/src/test/incremental/type_alias_cross_crate/auxiliary/a.rs
+++ b/tests/incremental/type_alias_cross_crate/auxiliary/a.rs
diff --git a/src/test/incremental/type_alias_cross_crate/b.rs b/tests/incremental/type_alias_cross_crate/b.rs
index f6c252684..f6c252684 100644
--- a/src/test/incremental/type_alias_cross_crate/b.rs
+++ b/tests/incremental/type_alias_cross_crate/b.rs
diff --git a/src/test/incremental/unchecked_dirty_clean.rs b/tests/incremental/unchecked_dirty_clean.rs
index 3c8692a30..3c8692a30 100644
--- a/src/test/incremental/unchecked_dirty_clean.rs
+++ b/tests/incremental/unchecked_dirty_clean.rs
diff --git a/src/test/incremental/warnings-reemitted.rs b/tests/incremental/warnings-reemitted.rs
index 0e6b88232..0e6b88232 100644
--- a/src/test/incremental/warnings-reemitted.rs
+++ b/tests/incremental/warnings-reemitted.rs
diff --git a/src/test/mir-opt/76803_regression.encode.SimplifyBranchSame.diff b/tests/mir-opt/76803_regression.encode.SimplifyBranchSame.diff
index 57e298625..9780332d8 100644
--- a/src/test/mir-opt/76803_regression.encode.SimplifyBranchSame.diff
+++ b/tests/mir-opt/76803_regression.encode.SimplifyBranchSame.diff
@@ -8,7 +8,7 @@
   
       bb0: {
           _2 = discriminant(_1);           // scope 0 at $DIR/76803_regression.rs:+1:11: +1:12
-          switchInt(move _2) -> [0_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/76803_regression.rs:+1:5: +1:12
+          switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/76803_regression.rs:+1:5: +1:12
       }
   
       bb1: {
diff --git a/src/test/mir-opt/76803_regression.rs b/tests/mir-opt/76803_regression.rs
index 05dc3c978..05dc3c978 100644
--- a/src/test/mir-opt/76803_regression.rs
+++ b/tests/mir-opt/76803_regression.rs
diff --git a/src/test/mir-opt/README.md b/tests/mir-opt/README.md
index 0721d9f70..0721d9f70 100644
--- a/src/test/mir-opt/README.md
+++ b/tests/mir-opt/README.md
diff --git a/src/test/mir-opt/address_of.address_of_reborrow.SimplifyCfg-initial.after.mir b/tests/mir-opt/address_of.address_of_reborrow.SimplifyCfg-initial.after.mir
index 5f8b2f931..5f8b2f931 100644
--- a/src/test/mir-opt/address_of.address_of_reborrow.SimplifyCfg-initial.after.mir
+++ b/tests/mir-opt/address_of.address_of_reborrow.SimplifyCfg-initial.after.mir
diff --git a/src/test/mir-opt/address_of.borrow_and_cast.SimplifyCfg-initial.after.mir b/tests/mir-opt/address_of.borrow_and_cast.SimplifyCfg-initial.after.mir
index 4c67376b5..4c67376b5 100644
--- a/src/test/mir-opt/address_of.borrow_and_cast.SimplifyCfg-initial.after.mir
+++ b/tests/mir-opt/address_of.borrow_and_cast.SimplifyCfg-initial.after.mir
diff --git a/src/test/mir-opt/address_of.rs b/tests/mir-opt/address_of.rs
index c4bea5613..c4bea5613 100644
--- a/src/test/mir-opt/address_of.rs
+++ b/tests/mir-opt/address_of.rs
diff --git a/src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir
index af5178d40..af5178d40 100644
--- a/src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir
+++ b/tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir
diff --git a/src/test/mir-opt/array_index_is_temporary.rs b/tests/mir-opt/array_index_is_temporary.rs
index e7bde81d4..e7bde81d4 100644
--- a/src/test/mir-opt/array_index_is_temporary.rs
+++ b/tests/mir-opt/array_index_is_temporary.rs
diff --git a/src/test/mir-opt/asm_unwind_panic_abort.main.AbortUnwindingCalls.after.mir b/tests/mir-opt/asm_unwind_panic_abort.main.AbortUnwindingCalls.after.mir
index 2487ef5c2..2487ef5c2 100644
--- a/src/test/mir-opt/asm_unwind_panic_abort.main.AbortUnwindingCalls.after.mir
+++ b/tests/mir-opt/asm_unwind_panic_abort.main.AbortUnwindingCalls.after.mir
diff --git a/src/test/mir-opt/asm_unwind_panic_abort.rs b/tests/mir-opt/asm_unwind_panic_abort.rs
index ad8f9398e..ad8f9398e 100644
--- a/src/test/mir-opt/asm_unwind_panic_abort.rs
+++ b/tests/mir-opt/asm_unwind_panic_abort.rs
diff --git a/src/test/mir-opt/basic_assignment.main.SimplifyCfg-initial.after.mir b/tests/mir-opt/basic_assignment.main.SimplifyCfg-initial.after.mir
index 1f099cd5e..1f099cd5e 100644
--- a/src/test/mir-opt/basic_assignment.main.SimplifyCfg-initial.after.mir
+++ b/tests/mir-opt/basic_assignment.main.SimplifyCfg-initial.after.mir
diff --git a/src/test/mir-opt/basic_assignment.rs b/tests/mir-opt/basic_assignment.rs
index ac350271e..ac350271e 100644
--- a/src/test/mir-opt/basic_assignment.rs
+++ b/tests/mir-opt/basic_assignment.rs
diff --git a/src/test/mir-opt/bool_compare.opt1.InstCombine.diff b/tests/mir-opt/bool_compare.opt1.InstCombine.diff
index 9c5a9fa9a..0af5d82d3 100644
--- a/src/test/mir-opt/bool_compare.opt1.InstCombine.diff
+++ b/tests/mir-opt/bool_compare.opt1.InstCombine.diff
@@ -14,7 +14,7 @@
 -         _2 = Ne(move _3, const true);    // scope 0 at $DIR/bool_compare.rs:+1:8: +1:17
 +         _2 = Not(move _3);               // scope 0 at $DIR/bool_compare.rs:+1:8: +1:17
           StorageDead(_3);                 // scope 0 at $DIR/bool_compare.rs:+1:16: +1:17
-          switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/bool_compare.rs:+1:8: +1:17
+          switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/bool_compare.rs:+1:8: +1:17
       }
   
       bb1: {
diff --git a/src/test/mir-opt/bool_compare.opt2.InstCombine.diff b/tests/mir-opt/bool_compare.opt2.InstCombine.diff
index 58c52c4b7..f5d1febd9 100644
--- a/src/test/mir-opt/bool_compare.opt2.InstCombine.diff
+++ b/tests/mir-opt/bool_compare.opt2.InstCombine.diff
@@ -14,7 +14,7 @@
 -         _2 = Ne(const true, move _3);    // scope 0 at $DIR/bool_compare.rs:+1:8: +1:17
 +         _2 = Not(move _3);               // scope 0 at $DIR/bool_compare.rs:+1:8: +1:17
           StorageDead(_3);                 // scope 0 at $DIR/bool_compare.rs:+1:16: +1:17
-          switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/bool_compare.rs:+1:8: +1:17
+          switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/bool_compare.rs:+1:8: +1:17
       }
   
       bb1: {
diff --git a/src/test/mir-opt/bool_compare.opt3.InstCombine.diff b/tests/mir-opt/bool_compare.opt3.InstCombine.diff
index 676428c95..e7432adac 100644
--- a/src/test/mir-opt/bool_compare.opt3.InstCombine.diff
+++ b/tests/mir-opt/bool_compare.opt3.InstCombine.diff
@@ -14,7 +14,7 @@
 -         _2 = Eq(move _3, const false);   // scope 0 at $DIR/bool_compare.rs:+1:8: +1:18
 +         _2 = Not(move _3);               // scope 0 at $DIR/bool_compare.rs:+1:8: +1:18
           StorageDead(_3);                 // scope 0 at $DIR/bool_compare.rs:+1:17: +1:18
-          switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/bool_compare.rs:+1:8: +1:18
+          switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/bool_compare.rs:+1:8: +1:18
       }
   
       bb1: {
diff --git a/src/test/mir-opt/bool_compare.opt4.InstCombine.diff b/tests/mir-opt/bool_compare.opt4.InstCombine.diff
index addfcd769..6b3e27772 100644
--- a/src/test/mir-opt/bool_compare.opt4.InstCombine.diff
+++ b/tests/mir-opt/bool_compare.opt4.InstCombine.diff
@@ -14,7 +14,7 @@
 -         _2 = Eq(const false, move _3);   // scope 0 at $DIR/bool_compare.rs:+1:8: +1:18
 +         _2 = Not(move _3);               // scope 0 at $DIR/bool_compare.rs:+1:8: +1:18
           StorageDead(_3);                 // scope 0 at $DIR/bool_compare.rs:+1:17: +1:18
-          switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/bool_compare.rs:+1:8: +1:18
+          switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/bool_compare.rs:+1:8: +1:18
       }
   
       bb1: {
diff --git a/src/test/mir-opt/bool_compare.rs b/tests/mir-opt/bool_compare.rs
index 4435bf5b0..4435bf5b0 100644
--- a/src/test/mir-opt/bool_compare.rs
+++ b/tests/mir-opt/bool_compare.rs
diff --git a/src/test/mir-opt/box_expr.main.ElaborateDrops.before.mir b/tests/mir-opt/box_expr.main.ElaborateDrops.before.mir
index 49133138d..49133138d 100644
--- a/src/test/mir-opt/box_expr.main.ElaborateDrops.before.mir
+++ b/tests/mir-opt/box_expr.main.ElaborateDrops.before.mir
diff --git a/src/test/mir-opt/box_expr.rs b/tests/mir-opt/box_expr.rs
index a214504f6..a214504f6 100644
--- a/src/test/mir-opt/box_expr.rs
+++ b/tests/mir-opt/box_expr.rs
diff --git a/tests/mir-opt/building/async_await.a-{closure#0}.generator_resume.0.mir b/tests/mir-opt/building/async_await.a-{closure#0}.generator_resume.0.mir
new file mode 100644
index 000000000..2a7f90fe9
--- /dev/null
+++ b/tests/mir-opt/building/async_await.a-{closure#0}.generator_resume.0.mir
@@ -0,0 +1,41 @@
+// MIR for `a::{closure#0}` 0 generator_resume
+/* generator_layout = GeneratorLayout {
+    field_tys: {},
+    variant_fields: {
+        Unresumed(0): [],
+        Returned (1): [],
+        Panicked (2): [],
+    },
+    storage_conflicts: BitMatrix(0x0) {},
+} */
+
+fn a::{closure#0}(_1: Pin<&mut [async fn body@$DIR/async_await.rs:11:14: 11:16]>, _2: &mut Context<'_>) -> Poll<()> {
+    debug _task_context => _4;           // in scope 0 at $DIR/async_await.rs:+0:14: +0:16
+    let mut _0: std::task::Poll<()>;     // return place in scope 0 at $DIR/async_await.rs:+0:14: +0:16
+    let mut _3: ();                      // in scope 0 at $DIR/async_await.rs:+0:14: +0:16
+    let mut _4: &mut std::task::Context<'_>; // in scope 0 at $DIR/async_await.rs:+0:14: +0:16
+    let mut _5: u32;                     // in scope 0 at $DIR/async_await.rs:+0:14: +0:16
+
+    bb0: {
+        _5 = discriminant((*(_1.0: &mut [async fn body@$DIR/async_await.rs:11:14: 11:16]))); // scope 0 at $DIR/async_await.rs:+0:14: +0:16
+        switchInt(move _5) -> [0: bb1, 1: bb2, otherwise: bb3]; // scope 0 at $DIR/async_await.rs:+0:14: +0:16
+    }
+
+    bb1: {
+        _4 = move _2;                    // scope 0 at $DIR/async_await.rs:+0:14: +0:16
+        _3 = const ();                   // scope 0 at $DIR/async_await.rs:+0:14: +0:16
+        Deinit(_0);                      // scope 0 at $DIR/async_await.rs:+0:16: +0:16
+        ((_0 as Ready).0: ()) = move _3; // scope 0 at $DIR/async_await.rs:+0:16: +0:16
+        discriminant(_0) = 0;            // scope 0 at $DIR/async_await.rs:+0:16: +0:16
+        discriminant((*(_1.0: &mut [async fn body@$DIR/async_await.rs:11:14: 11:16]))) = 1; // scope 0 at $DIR/async_await.rs:+0:16: +0:16
+        return;                          // scope 0 at $DIR/async_await.rs:+0:16: +0:16
+    }
+
+    bb2: {
+        assert(const false, "`async fn` resumed after completion") -> bb2; // scope 0 at $DIR/async_await.rs:+0:14: +0:16
+    }
+
+    bb3: {
+        unreachable;                     // scope 0 at $DIR/async_await.rs:+0:14: +0:16
+    }
+}
diff --git a/tests/mir-opt/building/async_await.b-{closure#0}.generator_resume.0.mir b/tests/mir-opt/building/async_await.b-{closure#0}.generator_resume.0.mir
new file mode 100644
index 000000000..05edc4797
--- /dev/null
+++ b/tests/mir-opt/building/async_await.b-{closure#0}.generator_resume.0.mir
@@ -0,0 +1,337 @@
+// MIR for `b::{closure#0}` 0 generator_resume
+/* generator_layout = GeneratorLayout {
+    field_tys: {
+        _0: impl std::future::Future<Output = ()>,
+        _1: impl std::future::Future<Output = ()>,
+    },
+    variant_fields: {
+        Unresumed(0): [],
+        Returned (1): [],
+        Panicked (2): [],
+        Suspend0 (3): [_0],
+        Suspend1 (4): [_1],
+    },
+    storage_conflicts: BitMatrix(2x2) {
+        (_0, _0),
+        (_1, _1),
+    },
+} */
+
+fn b::{closure#0}(_1: Pin<&mut [async fn body@$DIR/async_await.rs:14:18: 17:2]>, _2: &mut Context<'_>) -> Poll<()> {
+    debug _task_context => _38;          // in scope 0 at $DIR/async_await.rs:+0:18: +3:2
+    let mut _0: std::task::Poll<()>;     // return place in scope 0 at $DIR/async_await.rs:+0:18: +3:2
+    let _3: ();                          // in scope 0 at $DIR/async_await.rs:+1:5: +1:14
+    let mut _4: impl std::future::Future<Output = ()>; // in scope 0 at $DIR/async_await.rs:+1:8: +1:14
+    let mut _5: impl std::future::Future<Output = ()>; // in scope 0 at $DIR/async_await.rs:+1:5: +1:8
+    let mut _6: impl std::future::Future<Output = ()>; // in scope 0 at $DIR/async_await.rs:+1:8: +1:14
+    let mut _7: ();                      // in scope 0 at $DIR/async_await.rs:+0:18: +3:2
+    let _8: ();                          // in scope 0 at $DIR/async_await.rs:+1:8: +1:14
+    let mut _9: std::task::Poll<()>;     // in scope 0 at $DIR/async_await.rs:+1:8: +1:14
+    let mut _10: std::pin::Pin<&mut impl std::future::Future<Output = ()>>; // in scope 0 at $DIR/async_await.rs:+1:8: +1:14
+    let mut _11: &mut impl std::future::Future<Output = ()>; // in scope 0 at $DIR/async_await.rs:+1:8: +1:14
+    let mut _12: &mut impl std::future::Future<Output = ()>; // in scope 0 at $DIR/async_await.rs:+1:8: +1:14
+    let mut _13: &mut std::task::Context<'_>; // in scope 0 at $DIR/async_await.rs:+1:5: +1:14
+    let mut _14: &mut std::task::Context<'_>; // in scope 0 at $DIR/async_await.rs:+1:5: +1:14
+    let mut _15: &mut std::task::Context<'_>; // in scope 0 at $DIR/async_await.rs:+1:8: +1:14
+    let mut _16: isize;                  // in scope 0 at $DIR/async_await.rs:+1:8: +1:14
+    let mut _18: !;                      // in scope 0 at $DIR/async_await.rs:+1:5: +1:14
+    let mut _19: &mut std::task::Context<'_>; // in scope 0 at $DIR/async_await.rs:+1:8: +1:14
+    let mut _20: ();                     // in scope 0 at $DIR/async_await.rs:+1:8: +1:14
+    let mut _21: impl std::future::Future<Output = ()>; // in scope 0 at $DIR/async_await.rs:+2:8: +2:14
+    let mut _22: impl std::future::Future<Output = ()>; // in scope 0 at $DIR/async_await.rs:+2:5: +2:8
+    let mut _23: impl std::future::Future<Output = ()>; // in scope 0 at $DIR/async_await.rs:+2:8: +2:14
+    let _24: ();                         // in scope 0 at $DIR/async_await.rs:+2:8: +2:14
+    let mut _25: std::task::Poll<()>;    // in scope 0 at $DIR/async_await.rs:+2:8: +2:14
+    let mut _26: std::pin::Pin<&mut impl std::future::Future<Output = ()>>; // in scope 0 at $DIR/async_await.rs:+2:8: +2:14
+    let mut _27: &mut impl std::future::Future<Output = ()>; // in scope 0 at $DIR/async_await.rs:+2:8: +2:14
+    let mut _28: &mut impl std::future::Future<Output = ()>; // in scope 0 at $DIR/async_await.rs:+2:8: +2:14
+    let mut _29: &mut std::task::Context<'_>; // in scope 0 at $DIR/async_await.rs:+2:5: +2:14
+    let mut _30: &mut std::task::Context<'_>; // in scope 0 at $DIR/async_await.rs:+2:5: +2:14
+    let mut _31: &mut std::task::Context<'_>; // in scope 0 at $DIR/async_await.rs:+2:8: +2:14
+    let mut _32: isize;                  // in scope 0 at $DIR/async_await.rs:+2:8: +2:14
+    let mut _34: !;                      // in scope 0 at $DIR/async_await.rs:+2:5: +2:14
+    let mut _35: &mut std::task::Context<'_>; // in scope 0 at $DIR/async_await.rs:+2:8: +2:14
+    let mut _36: ();                     // in scope 0 at $DIR/async_await.rs:+2:8: +2:14
+    let mut _37: ();                     // in scope 0 at $DIR/async_await.rs:+0:18: +3:2
+    let mut _38: &mut std::task::Context<'_>; // in scope 0 at $DIR/async_await.rs:+0:18: +3:2
+    let mut _39: u32;                    // in scope 0 at $DIR/async_await.rs:+0:18: +3:2
+    scope 1 {
+        debug __awaitee => (((*(_1.0: &mut [async fn body@$DIR/async_await.rs:14:18: 17:2])) as variant#3).0: impl std::future::Future<Output = ()>); // in scope 1 at $DIR/async_await.rs:+1:8: +1:14
+        let _17: ();                     // in scope 1 at $DIR/async_await.rs:+1:5: +1:14
+        scope 2 {
+        }
+        scope 3 {
+            debug result => _17;         // in scope 3 at $DIR/async_await.rs:+1:5: +1:14
+        }
+    }
+    scope 4 {
+        debug __awaitee => (((*(_1.0: &mut [async fn body@$DIR/async_await.rs:14:18: 17:2])) as variant#4).0: impl std::future::Future<Output = ()>); // in scope 4 at $DIR/async_await.rs:+2:8: +2:14
+        let _33: ();                     // in scope 4 at $DIR/async_await.rs:+2:5: +2:14
+        scope 5 {
+        }
+        scope 6 {
+            debug result => _33;         // in scope 6 at $DIR/async_await.rs:+2:5: +2:14
+        }
+    }
+
+    bb0: {
+        _39 = discriminant((*(_1.0: &mut [async fn body@$DIR/async_await.rs:14:18: 17:2]))); // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+        switchInt(move _39) -> [0: bb1, 1: bb29, 3: bb27, 4: bb28, otherwise: bb30]; // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+    }
+
+    bb1: {
+        _38 = move _2;                   // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+        StorageLive(_3);                 // scope 0 at $DIR/async_await.rs:+1:5: +1:14
+        StorageLive(_4);                 // scope 0 at $DIR/async_await.rs:+1:8: +1:14
+        StorageLive(_5);                 // scope 0 at $DIR/async_await.rs:+1:5: +1:8
+        _5 = a() -> bb2;                 // scope 0 at $DIR/async_await.rs:+1:5: +1:8
+                                         // mir::Constant
+                                         // + span: $DIR/async_await.rs:15:5: 15:6
+                                         // + literal: Const { ty: fn() -> impl Future<Output = ()> {a}, val: Value(<ZST>) }
+    }
+
+    bb2: {
+        _4 = <impl Future<Output = ()> as IntoFuture>::into_future(move _5) -> bb3; // scope 0 at $DIR/async_await.rs:+1:8: +1:14
+                                         // mir::Constant
+                                         // + span: $DIR/async_await.rs:15:8: 15:14
+                                         // + literal: Const { ty: fn(impl Future<Output = ()>) -> <impl Future<Output = ()> as IntoFuture>::IntoFuture {<impl Future<Output = ()> as IntoFuture>::into_future}, val: Value(<ZST>) }
+    }
+
+    bb3: {
+        StorageDead(_5);                 // scope 0 at $DIR/async_await.rs:+1:13: +1:14
+        nop;                             // scope 0 at $DIR/async_await.rs:+1:8: +1:14
+        (((*(_1.0: &mut [async fn body@$DIR/async_await.rs:14:18: 17:2])) as variant#3).0: impl std::future::Future<Output = ()>) = move _4; // scope 0 at $DIR/async_await.rs:+1:8: +1:14
+        goto -> bb4;                     // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+    }
+
+    bb4: {
+        StorageLive(_8);                 // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+        StorageLive(_9);                 // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+        StorageLive(_10);                // scope 2 at $DIR/async_await.rs:+1:8: +1:14
+        StorageLive(_11);                // scope 2 at $DIR/async_await.rs:+1:8: +1:14
+        StorageLive(_12);                // scope 2 at $DIR/async_await.rs:+1:8: +1:14
+        _12 = &mut (((*(_1.0: &mut [async fn body@$DIR/async_await.rs:14:18: 17:2])) as variant#3).0: impl std::future::Future<Output = ()>); // scope 2 at $DIR/async_await.rs:+1:8: +1:14
+        _11 = &mut (*_12);               // scope 2 at $DIR/async_await.rs:+1:8: +1:14
+        _10 = Pin::<&mut impl Future<Output = ()>>::new_unchecked(move _11) -> bb5; // scope 2 at $DIR/async_await.rs:+1:8: +1:14
+                                         // mir::Constant
+                                         // + span: $DIR/async_await.rs:15:8: 15:14
+                                         // + literal: Const { ty: unsafe fn(&mut impl Future<Output = ()>) -> Pin<&mut impl Future<Output = ()>> {Pin::<&mut impl Future<Output = ()>>::new_unchecked}, val: Value(<ZST>) }
+    }
+
+    bb5: {
+        StorageDead(_11);                // scope 2 at $DIR/async_await.rs:+1:13: +1:14
+        StorageLive(_13);                // scope 2 at $DIR/async_await.rs:+1:5: +1:14
+        StorageLive(_14);                // scope 2 at $DIR/async_await.rs:+1:5: +1:14
+        StorageLive(_15);                // scope 2 at $DIR/async_await.rs:+1:8: +1:14
+        _15 = _38;                       // scope 2 at $DIR/async_await.rs:+1:8: +1:14
+        _14 = move _15;                  // scope 2 at $DIR/async_await.rs:+1:5: +1:14
+        goto -> bb6;                     // scope 2 at $DIR/async_await.rs:+1:5: +1:14
+    }
+
+    bb6: {
+        _13 = &mut (*_14);               // scope 2 at $DIR/async_await.rs:+1:5: +1:14
+        StorageDead(_15);                // scope 2 at $DIR/async_await.rs:+1:13: +1:14
+        _9 = <impl Future<Output = ()> as Future>::poll(move _10, move _13) -> bb7; // scope 2 at $DIR/async_await.rs:+1:8: +1:14
+                                         // mir::Constant
+                                         // + span: $DIR/async_await.rs:15:8: 15:14
+                                         // + literal: Const { ty: for<'a, 'b, 'c> fn(Pin<&'a mut impl Future<Output = ()>>, &'b mut Context<'c>) -> Poll<<impl Future<Output = ()> as Future>::Output> {<impl Future<Output = ()> as Future>::poll}, val: Value(<ZST>) }
+    }
+
+    bb7: {
+        StorageDead(_13);                // scope 2 at $DIR/async_await.rs:+1:13: +1:14
+        StorageDead(_10);                // scope 2 at $DIR/async_await.rs:+1:13: +1:14
+        _16 = discriminant(_9);          // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+        switchInt(move _16) -> [0: bb10, 1: bb8, otherwise: bb9]; // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+    }
+
+    bb8: {
+        _8 = const ();                   // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+        StorageDead(_14);                // scope 1 at $DIR/async_await.rs:+1:13: +1:14
+        StorageDead(_12);                // scope 1 at $DIR/async_await.rs:+1:13: +1:14
+        StorageDead(_9);                 // scope 1 at $DIR/async_await.rs:+1:13: +1:14
+        StorageDead(_8);                 // scope 1 at $DIR/async_await.rs:+1:13: +1:14
+        StorageLive(_19);                // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+        StorageLive(_20);                // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+        _20 = ();                        // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+        Deinit(_0);                      // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+        discriminant(_0) = 1;            // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+        discriminant((*(_1.0: &mut [async fn body@$DIR/async_await.rs:14:18: 17:2]))) = 3; // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+        return;                          // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+    }
+
+    bb9: {
+        unreachable;                     // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+    }
+
+    bb10: {
+        StorageLive(_17);                // scope 1 at $DIR/async_await.rs:+1:5: +1:14
+        _17 = ((_9 as Ready).0: ());     // scope 1 at $DIR/async_await.rs:+1:5: +1:14
+        _3 = _17;                        // scope 3 at $DIR/async_await.rs:+1:5: +1:14
+        StorageDead(_17);                // scope 1 at $DIR/async_await.rs:+1:13: +1:14
+        StorageDead(_14);                // scope 1 at $DIR/async_await.rs:+1:13: +1:14
+        StorageDead(_12);                // scope 1 at $DIR/async_await.rs:+1:13: +1:14
+        StorageDead(_9);                 // scope 1 at $DIR/async_await.rs:+1:13: +1:14
+        StorageDead(_8);                 // scope 1 at $DIR/async_await.rs:+1:13: +1:14
+        goto -> bb12;                    // scope 0 at $DIR/async_await.rs:+1:13: +1:14
+    }
+
+    bb11: {
+        StorageDead(_20);                // scope 1 at $DIR/async_await.rs:+1:13: +1:14
+        _38 = move _19;                  // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+        StorageDead(_19);                // scope 1 at $DIR/async_await.rs:+1:13: +1:14
+        _7 = const ();                   // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+        goto -> bb4;                     // scope 1 at $DIR/async_await.rs:+1:8: +1:14
+    }
+
+    bb12: {
+        nop;                             // scope 0 at $DIR/async_await.rs:+1:13: +1:14
+        goto -> bb13;                    // scope 0 at $DIR/async_await.rs:+1:14: +1:15
+    }
+
+    bb13: {
+        StorageDead(_4);                 // scope 0 at $DIR/async_await.rs:+1:14: +1:15
+        StorageDead(_3);                 // scope 0 at $DIR/async_await.rs:+1:14: +1:15
+        StorageLive(_21);                // scope 0 at $DIR/async_await.rs:+2:8: +2:14
+        StorageLive(_22);                // scope 0 at $DIR/async_await.rs:+2:5: +2:8
+        _22 = a() -> bb14;               // scope 0 at $DIR/async_await.rs:+2:5: +2:8
+                                         // mir::Constant
+                                         // + span: $DIR/async_await.rs:16:5: 16:6
+                                         // + literal: Const { ty: fn() -> impl Future<Output = ()> {a}, val: Value(<ZST>) }
+    }
+
+    bb14: {
+        _21 = <impl Future<Output = ()> as IntoFuture>::into_future(move _22) -> bb15; // scope 0 at $DIR/async_await.rs:+2:8: +2:14
+                                         // mir::Constant
+                                         // + span: $DIR/async_await.rs:16:8: 16:14
+                                         // + literal: Const { ty: fn(impl Future<Output = ()>) -> <impl Future<Output = ()> as IntoFuture>::IntoFuture {<impl Future<Output = ()> as IntoFuture>::into_future}, val: Value(<ZST>) }
+    }
+
+    bb15: {
+        StorageDead(_22);                // scope 0 at $DIR/async_await.rs:+2:13: +2:14
+        nop;                             // scope 0 at $DIR/async_await.rs:+2:8: +2:14
+        (((*(_1.0: &mut [async fn body@$DIR/async_await.rs:14:18: 17:2])) as variant#4).0: impl std::future::Future<Output = ()>) = move _21; // scope 0 at $DIR/async_await.rs:+2:8: +2:14
+        goto -> bb16;                    // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+    }
+
+    bb16: {
+        StorageLive(_24);                // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+        StorageLive(_25);                // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+        StorageLive(_26);                // scope 5 at $DIR/async_await.rs:+2:8: +2:14
+        StorageLive(_27);                // scope 5 at $DIR/async_await.rs:+2:8: +2:14
+        StorageLive(_28);                // scope 5 at $DIR/async_await.rs:+2:8: +2:14
+        _28 = &mut (((*(_1.0: &mut [async fn body@$DIR/async_await.rs:14:18: 17:2])) as variant#4).0: impl std::future::Future<Output = ()>); // scope 5 at $DIR/async_await.rs:+2:8: +2:14
+        _27 = &mut (*_28);               // scope 5 at $DIR/async_await.rs:+2:8: +2:14
+        _26 = Pin::<&mut impl Future<Output = ()>>::new_unchecked(move _27) -> bb17; // scope 5 at $DIR/async_await.rs:+2:8: +2:14
+                                         // mir::Constant
+                                         // + span: $DIR/async_await.rs:16:8: 16:14
+                                         // + literal: Const { ty: unsafe fn(&mut impl Future<Output = ()>) -> Pin<&mut impl Future<Output = ()>> {Pin::<&mut impl Future<Output = ()>>::new_unchecked}, val: Value(<ZST>) }
+    }
+
+    bb17: {
+        StorageDead(_27);                // scope 5 at $DIR/async_await.rs:+2:13: +2:14
+        StorageLive(_29);                // scope 5 at $DIR/async_await.rs:+2:5: +2:14
+        StorageLive(_30);                // scope 5 at $DIR/async_await.rs:+2:5: +2:14
+        StorageLive(_31);                // scope 5 at $DIR/async_await.rs:+2:8: +2:14
+        _31 = _38;                       // scope 5 at $DIR/async_await.rs:+2:8: +2:14
+        _30 = move _31;                  // scope 5 at $DIR/async_await.rs:+2:5: +2:14
+        goto -> bb18;                    // scope 5 at $DIR/async_await.rs:+2:5: +2:14
+    }
+
+    bb18: {
+        _29 = &mut (*_30);               // scope 5 at $DIR/async_await.rs:+2:5: +2:14
+        StorageDead(_31);                // scope 5 at $DIR/async_await.rs:+2:13: +2:14
+        _25 = <impl Future<Output = ()> as Future>::poll(move _26, move _29) -> bb19; // scope 5 at $DIR/async_await.rs:+2:8: +2:14
+                                         // mir::Constant
+                                         // + span: $DIR/async_await.rs:16:8: 16:14
+                                         // + literal: Const { ty: for<'a, 'b, 'c> fn(Pin<&'a mut impl Future<Output = ()>>, &'b mut Context<'c>) -> Poll<<impl Future<Output = ()> as Future>::Output> {<impl Future<Output = ()> as Future>::poll}, val: Value(<ZST>) }
+    }
+
+    bb19: {
+        StorageDead(_29);                // scope 5 at $DIR/async_await.rs:+2:13: +2:14
+        StorageDead(_26);                // scope 5 at $DIR/async_await.rs:+2:13: +2:14
+        _32 = discriminant(_25);         // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+        switchInt(move _32) -> [0: bb22, 1: bb20, otherwise: bb21]; // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+    }
+
+    bb20: {
+        _24 = const ();                  // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+        StorageDead(_30);                // scope 4 at $DIR/async_await.rs:+2:13: +2:14
+        StorageDead(_28);                // scope 4 at $DIR/async_await.rs:+2:13: +2:14
+        StorageDead(_25);                // scope 4 at $DIR/async_await.rs:+2:13: +2:14
+        StorageDead(_24);                // scope 4 at $DIR/async_await.rs:+2:13: +2:14
+        StorageLive(_35);                // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+        StorageLive(_36);                // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+        _36 = ();                        // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+        Deinit(_0);                      // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+        discriminant(_0) = 1;            // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+        discriminant((*(_1.0: &mut [async fn body@$DIR/async_await.rs:14:18: 17:2]))) = 4; // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+        return;                          // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+    }
+
+    bb21: {
+        unreachable;                     // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+    }
+
+    bb22: {
+        StorageLive(_33);                // scope 4 at $DIR/async_await.rs:+2:5: +2:14
+        _33 = ((_25 as Ready).0: ());    // scope 4 at $DIR/async_await.rs:+2:5: +2:14
+        _37 = _33;                       // scope 6 at $DIR/async_await.rs:+2:5: +2:14
+        StorageDead(_33);                // scope 4 at $DIR/async_await.rs:+2:13: +2:14
+        StorageDead(_30);                // scope 4 at $DIR/async_await.rs:+2:13: +2:14
+        StorageDead(_28);                // scope 4 at $DIR/async_await.rs:+2:13: +2:14
+        StorageDead(_25);                // scope 4 at $DIR/async_await.rs:+2:13: +2:14
+        StorageDead(_24);                // scope 4 at $DIR/async_await.rs:+2:13: +2:14
+        goto -> bb24;                    // scope 0 at $DIR/async_await.rs:+2:13: +2:14
+    }
+
+    bb23: {
+        StorageDead(_36);                // scope 4 at $DIR/async_await.rs:+2:13: +2:14
+        _38 = move _35;                  // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+        StorageDead(_35);                // scope 4 at $DIR/async_await.rs:+2:13: +2:14
+        _7 = const ();                   // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+        goto -> bb16;                    // scope 4 at $DIR/async_await.rs:+2:8: +2:14
+    }
+
+    bb24: {
+        nop;                             // scope 0 at $DIR/async_await.rs:+2:13: +2:14
+        goto -> bb25;                    // scope 0 at $DIR/async_await.rs:+3:1: +3:2
+    }
+
+    bb25: {
+        StorageDead(_21);                // scope 0 at $DIR/async_await.rs:+3:1: +3:2
+        goto -> bb26;                    // scope 0 at $DIR/async_await.rs:+3:1: +3:2
+    }
+
+    bb26: {
+        Deinit(_0);                      // scope 0 at $DIR/async_await.rs:+3:2: +3:2
+        ((_0 as Ready).0: ()) = move _37; // scope 0 at $DIR/async_await.rs:+3:2: +3:2
+        discriminant(_0) = 0;            // scope 0 at $DIR/async_await.rs:+3:2: +3:2
+        discriminant((*(_1.0: &mut [async fn body@$DIR/async_await.rs:14:18: 17:2]))) = 1; // scope 0 at $DIR/async_await.rs:+3:2: +3:2
+        return;                          // scope 0 at $DIR/async_await.rs:+3:2: +3:2
+    }
+
+    bb27: {
+        StorageLive(_3);                 // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+        StorageLive(_4);                 // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+        StorageLive(_19);                // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+        StorageLive(_20);                // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+        _19 = move _2;                   // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+        goto -> bb11;                    // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+    }
+
+    bb28: {
+        StorageLive(_21);                // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+        StorageLive(_35);                // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+        StorageLive(_36);                // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+        _35 = move _2;                   // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+        goto -> bb23;                    // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+    }
+
+    bb29: {
+        assert(const false, "`async fn` resumed after completion") -> bb29; // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+    }
+
+    bb30: {
+        unreachable;                     // scope 0 at $DIR/async_await.rs:+0:18: +3:2
+    }
+}
diff --git a/tests/mir-opt/building/async_await.rs b/tests/mir-opt/building/async_await.rs
new file mode 100644
index 000000000..0b991e3b8
--- /dev/null
+++ b/tests/mir-opt/building/async_await.rs
@@ -0,0 +1,17 @@
+// This test makes sure that the generator MIR pass eliminates all calls to
+// `get_context`, and that the MIR argument type for an async fn and all locals
+// related to `yield` are `&mut Context`, and its return type is `Poll`.
+
+// edition:2018
+// compile-flags: -C panic=abort
+
+#![crate_type = "lib"]
+
+// EMIT_MIR async_await.a-{closure#0}.generator_resume.0.mir
+async fn a() {}
+
+// EMIT_MIR async_await.b-{closure#0}.generator_resume.0.mir
+pub async fn b() {
+    a().await;
+    a().await
+}
diff --git a/src/test/mir-opt/building/custom/arbitrary_let.arbitrary_let.built.after.mir b/tests/mir-opt/building/custom/arbitrary_let.arbitrary_let.built.after.mir
index 20dd251e7..20dd251e7 100644
--- a/src/test/mir-opt/building/custom/arbitrary_let.arbitrary_let.built.after.mir
+++ b/tests/mir-opt/building/custom/arbitrary_let.arbitrary_let.built.after.mir
diff --git a/src/test/mir-opt/building/custom/arbitrary_let.rs b/tests/mir-opt/building/custom/arbitrary_let.rs
index 776df3151..776df3151 100644
--- a/src/test/mir-opt/building/custom/arbitrary_let.rs
+++ b/tests/mir-opt/building/custom/arbitrary_let.rs
diff --git a/src/test/mir-opt/building/custom/consts.consts.built.after.mir b/tests/mir-opt/building/custom/consts.consts.built.after.mir
index ba753cfc2..ba753cfc2 100644
--- a/src/test/mir-opt/building/custom/consts.consts.built.after.mir
+++ b/tests/mir-opt/building/custom/consts.consts.built.after.mir
diff --git a/src/test/mir-opt/building/custom/consts.rs b/tests/mir-opt/building/custom/consts.rs
index ff4fe1a93..16d10eb59 100644
--- a/src/test/mir-opt/building/custom/consts.rs
+++ b/tests/mir-opt/building/custom/consts.rs
@@ -18,8 +18,8 @@ fn consts<const C: u32>() {
     })
 }
 
-static S: i32 = 5;
-static mut T: i32 = 10;
+static S: i32 = 0x05050505;
+static mut T: i32 = 0x0a0a0a0a;
 // EMIT_MIR consts.statics.built.after.mir
 #[custom_mir(dialect = "built")]
 fn statics() {
diff --git a/src/test/mir-opt/building/custom/consts.statics.built.after.mir b/tests/mir-opt/building/custom/consts.statics.built.after.mir
index ee768e263..bfef976aa 100644
--- a/src/test/mir-opt/building/custom/consts.statics.built.after.mir
+++ b/tests/mir-opt/building/custom/consts.statics.built.after.mir
@@ -19,9 +19,9 @@ fn statics() -> () {
 }
 
 alloc2 (static: T, size: 4, align: 4) {
-    0a 00 00 00                                     │ ....
+    0a 0a 0a 0a                                     │ ....
 }
 
 alloc1 (static: S, size: 4, align: 4) {
-    05 00 00 00                                     │ ....
+    05 05 05 05                                     │ ....
 }
diff --git a/tests/mir-opt/building/custom/enums.rs b/tests/mir-opt/building/custom/enums.rs
new file mode 100644
index 000000000..e5cd45637
--- /dev/null
+++ b/tests/mir-opt/building/custom/enums.rs
@@ -0,0 +1,120 @@
+#![feature(custom_mir, core_intrinsics)]
+
+extern crate core;
+use core::intrinsics::mir::*;
+
+// EMIT_MIR enums.switch_bool.built.after.mir
+#[custom_mir(dialect = "built")]
+pub fn switch_bool(b: bool) -> u32 {
+    mir!(
+        {
+            match b {
+                true => t,
+                false => f,
+                _ => f,
+            }
+        }
+
+        t = {
+            RET = 5;
+            Return()
+        }
+
+        f = {
+            RET = 10;
+            Return()
+        }
+    )
+}
+
+// EMIT_MIR enums.switch_option.built.after.mir
+#[custom_mir(dialect = "built")]
+pub fn switch_option(option: Option<()>) -> bool {
+    mir!(
+        {
+            let discr = Discriminant(option);
+            match discr {
+                0 => n,
+                1 => s,
+                _ => s,
+            }
+        }
+
+        n = {
+            RET = false;
+            Return()
+        }
+
+        s = {
+            RET = true;
+            Return()
+        }
+    )
+}
+
+#[repr(u8)]
+enum Bool {
+    False = 0,
+    True = 1,
+}
+
+// EMIT_MIR enums.switch_option_repr.built.after.mir
+#[custom_mir(dialect = "built")]
+fn switch_option_repr(option: Bool) -> bool {
+    mir!(
+        {
+            let discr = Discriminant(option);
+            match discr {
+                0 => f,
+                _ => t,
+            }
+        }
+
+        t = {
+            RET = true;
+            Return()
+        }
+
+        f = {
+            RET = false;
+            Return()
+        }
+    )
+}
+
+// EMIT_MIR enums.set_discr.built.after.mir
+#[custom_mir(dialect = "runtime", phase = "initial")]
+fn set_discr(option: &mut Option<()>) {
+    mir!({
+        SetDiscriminant(*option, 0);
+        Return()
+    })
+}
+
+// EMIT_MIR enums.set_discr_repr.built.after.mir
+#[custom_mir(dialect = "runtime", phase = "initial")]
+fn set_discr_repr(b: &mut Bool) {
+    mir!({
+        SetDiscriminant(*b, 0);
+        Return()
+    })
+}
+
+fn main() {
+    assert_eq!(switch_bool(true), 5);
+    assert_eq!(switch_bool(false), 10);
+
+    assert_eq!(switch_option(Some(())), true);
+    assert_eq!(switch_option(None), false);
+
+    assert_eq!(switch_option_repr(Bool::True), true);
+    assert_eq!(switch_option_repr(Bool::False), false);
+
+    let mut opt = Some(());
+    set_discr(&mut opt);
+    assert_eq!(opt, None);
+
+    let mut b = Bool::True;
+    set_discr_repr(&mut b);
+    assert!(matches!(b, Bool::False));
+}
diff --git a/tests/mir-opt/building/custom/enums.set_discr.built.after.mir b/tests/mir-opt/building/custom/enums.set_discr.built.after.mir
new file mode 100644
index 000000000..7de9ed098
--- /dev/null
+++ b/tests/mir-opt/building/custom/enums.set_discr.built.after.mir
@@ -0,0 +1,10 @@
+// MIR for `set_discr` after built
+
+fn set_discr(_1: &mut Option<()>) -> () {
+    let mut _0: ();                      // return place in scope 0 at $DIR/enums.rs:+0:39: +0:39
+
+    bb0: {
+        discriminant((*_1)) = 0;         // scope 0 at $DIR/enums.rs:+2:9: +2:36
+        return;                          // scope 0 at $DIR/enums.rs:+3:9: +3:17
+    }
+}
diff --git a/tests/mir-opt/building/custom/enums.set_discr_repr.built.after.mir b/tests/mir-opt/building/custom/enums.set_discr_repr.built.after.mir
new file mode 100644
index 000000000..6fdc3d0f4
--- /dev/null
+++ b/tests/mir-opt/building/custom/enums.set_discr_repr.built.after.mir
@@ -0,0 +1,10 @@
+// MIR for `set_discr_repr` after built
+
+fn set_discr_repr(_1: &mut Bool) -> () {
+    let mut _0: ();                      // return place in scope 0 at $DIR/enums.rs:+0:33: +0:33
+
+    bb0: {
+        discriminant((*_1)) = 0;         // scope 0 at $DIR/enums.rs:+2:9: +2:31
+        return;                          // scope 0 at $DIR/enums.rs:+3:9: +3:17
+    }
+}
diff --git a/tests/mir-opt/building/custom/enums.switch_bool.built.after.mir b/tests/mir-opt/building/custom/enums.switch_bool.built.after.mir
new file mode 100644
index 000000000..95c57d2dc
--- /dev/null
+++ b/tests/mir-opt/building/custom/enums.switch_bool.built.after.mir
@@ -0,0 +1,19 @@
+// MIR for `switch_bool` after built
+
+fn switch_bool(_1: bool) -> u32 {
+    let mut _0: u32;                     // return place in scope 0 at $DIR/enums.rs:+0:32: +0:35
+
+    bb0: {
+        switchInt(_1) -> [1: bb1, 0: bb2, otherwise: bb2]; // scope 0 at $DIR/enums.rs:+3:13: +7:14
+    }
+
+    bb1: {
+        _0 = const 5_u32;                // scope 0 at $DIR/enums.rs:+11:13: +11:20
+        return;                          // scope 0 at $DIR/enums.rs:+12:13: +12:21
+    }
+
+    bb2: {
+        _0 = const 10_u32;               // scope 0 at $DIR/enums.rs:+16:13: +16:21
+        return;                          // scope 0 at $DIR/enums.rs:+17:13: +17:21
+    }
+}
diff --git a/tests/mir-opt/building/custom/enums.switch_option.built.after.mir b/tests/mir-opt/building/custom/enums.switch_option.built.after.mir
new file mode 100644
index 000000000..a659ba7c1
--- /dev/null
+++ b/tests/mir-opt/building/custom/enums.switch_option.built.after.mir
@@ -0,0 +1,21 @@
+// MIR for `switch_option` after built
+
+fn switch_option(_1: Option<()>) -> bool {
+    let mut _0: bool;                    // return place in scope 0 at $DIR/enums.rs:+0:45: +0:49
+    let mut _2: isize;                   // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+
+    bb0: {
+        _2 = discriminant(_1);           // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+        switchInt(_2) -> [0: bb1, 1: bb2, otherwise: bb2]; // scope 0 at $DIR/enums.rs:+4:13: +8:14
+    }
+
+    bb1: {
+        _0 = const false;                // scope 0 at $DIR/enums.rs:+12:13: +12:24
+        return;                          // scope 0 at $DIR/enums.rs:+13:13: +13:21
+    }
+
+    bb2: {
+        _0 = const true;                 // scope 0 at $DIR/enums.rs:+17:13: +17:23
+        return;                          // scope 0 at $DIR/enums.rs:+18:13: +18:21
+    }
+}
diff --git a/tests/mir-opt/building/custom/enums.switch_option_repr.built.after.mir b/tests/mir-opt/building/custom/enums.switch_option_repr.built.after.mir
new file mode 100644
index 000000000..d60e4b1b7
--- /dev/null
+++ b/tests/mir-opt/building/custom/enums.switch_option_repr.built.after.mir
@@ -0,0 +1,21 @@
+// MIR for `switch_option_repr` after built
+
+fn switch_option_repr(_1: Bool) -> bool {
+    let mut _0: bool;                    // return place in scope 0 at $DIR/enums.rs:+0:40: +0:44
+    let mut _2: u8;                      // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+
+    bb0: {
+        _2 = discriminant(_1);           // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+        switchInt(_2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/enums.rs:+4:13: +7:14
+    }
+
+    bb1: {
+        _0 = const true;                 // scope 0 at $DIR/enums.rs:+11:13: +11:23
+        return;                          // scope 0 at $DIR/enums.rs:+12:13: +12:21
+    }
+
+    bb2: {
+        _0 = const false;                // scope 0 at $DIR/enums.rs:+16:13: +16:24
+        return;                          // scope 0 at $DIR/enums.rs:+17:13: +17:21
+    }
+}
diff --git a/tests/mir-opt/building/custom/projections.rs b/tests/mir-opt/building/custom/projections.rs
new file mode 100644
index 000000000..5e472e531
--- /dev/null
+++ b/tests/mir-opt/building/custom/projections.rs
@@ -0,0 +1,85 @@
+#![feature(custom_mir, core_intrinsics)]
+
+extern crate core;
+use core::intrinsics::mir::*;
+
+union U {
+    a: i32,
+    b: u32,
+}
+
+// EMIT_MIR projections.unions.built.after.mir
+#[custom_mir(dialect = "built")]
+fn unions(u: U) -> i32 {
+    mir!({
+        RET = u.a;
+        Return()
+    })
+}
+
+// EMIT_MIR projections.tuples.built.after.mir
+#[custom_mir(dialect = "analysis", phase = "post-cleanup")]
+fn tuples(i: (u32, i32)) -> (u32, i32) {
+    mir!(
+        // FIXME(JakobDegen): This is necessary because we can't give type hints for `RET`
+        let temp: (u32, i32);
+        {
+            temp.0 = i.0;
+            temp.1 = i.1;
+
+            RET = temp;
+            Return()
+        }
+    )
+}
+
+// EMIT_MIR projections.unwrap.built.after.mir
+#[custom_mir(dialect = "built")]
+fn unwrap(opt: Option<i32>) -> i32 {
+    mir!({
+        RET = Field(Variant(opt, 1), 0);
+        Return()
+    })
+}
+
+// EMIT_MIR projections.unwrap_deref.built.after.mir
+#[custom_mir(dialect = "built")]
+fn unwrap_deref(opt: Option<&i32>) -> i32 {
+    mir!({
+        RET = *Field::<&i32>(Variant(opt, 1), 0);
+        Return()
+    })
+}
+
+// EMIT_MIR projections.set.built.after.mir
+#[custom_mir(dialect = "built")]
+fn set(opt: &mut Option<i32>) {
+    mir!({
+        place!(Field(Variant(*opt, 1), 0)) = 10;
+        Return()
+    })
+}
+
+// EMIT_MIR projections.simple_index.built.after.mir
+#[custom_mir(dialect = "built")]
+fn simple_index(a: [i32; 10], b: &[i32]) -> i32 {
+    mir!({
+        let temp = 3;
+        RET = a[temp];
+        RET = (*b)[temp];
+        Return()
+    })
+}
+
+fn main() {
+    assert_eq!(unions(U { a: 5 }), 5);
+    assert_eq!(tuples((5, 6)), (5, 6));
+
+    assert_eq!(unwrap(Some(5)), 5);
+    assert_eq!(unwrap_deref(Some(&5)), 5);
+    let mut o = Some(5);
+    set(&mut o);
+    assert_eq!(o, Some(10));
+
+    assert_eq!(simple_index([0; 10], &[0; 10]), 0);
+}
diff --git a/tests/mir-opt/building/custom/projections.set.built.after.mir b/tests/mir-opt/building/custom/projections.set.built.after.mir
new file mode 100644
index 000000000..2f15176a6
--- /dev/null
+++ b/tests/mir-opt/building/custom/projections.set.built.after.mir
@@ -0,0 +1,10 @@
+// MIR for `set` after built
+
+fn set(_1: &mut Option<i32>) -> () {
+    let mut _0: ();                      // return place in scope 0 at $DIR/projections.rs:+0:31: +0:31
+
+    bb0: {
+        (((*_1) as variant#1).0: i32) = const 10_i32; // scope 0 at $DIR/projections.rs:+2:9: +2:48
+        return;                          // scope 0 at $DIR/projections.rs:+3:9: +3:17
+    }
+}
diff --git a/tests/mir-opt/building/custom/projections.simple_index.built.after.mir b/tests/mir-opt/building/custom/projections.simple_index.built.after.mir
new file mode 100644
index 000000000..fc422e4b3
--- /dev/null
+++ b/tests/mir-opt/building/custom/projections.simple_index.built.after.mir
@@ -0,0 +1,13 @@
+// MIR for `simple_index` after built
+
+fn simple_index(_1: [i32; 10], _2: &[i32]) -> i32 {
+    let mut _0: i32;                     // return place in scope 0 at $DIR/projections.rs:+0:45: +0:48
+    let mut _3: usize;                   // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+
+    bb0: {
+        _3 = const 3_usize;              // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+        _0 = _1[_3];                     // scope 0 at $DIR/projections.rs:+3:9: +3:22
+        _0 = (*_2)[_3];                  // scope 0 at $DIR/projections.rs:+4:9: +4:25
+        return;                          // scope 0 at $DIR/projections.rs:+5:9: +5:17
+    }
+}
diff --git a/tests/mir-opt/building/custom/projections.tuples.built.after.mir b/tests/mir-opt/building/custom/projections.tuples.built.after.mir
new file mode 100644
index 000000000..65487d3c9
--- /dev/null
+++ b/tests/mir-opt/building/custom/projections.tuples.built.after.mir
@@ -0,0 +1,13 @@
+// MIR for `tuples` after built
+
+fn tuples(_1: (u32, i32)) -> (u32, i32) {
+    let mut _0: (u32, i32);              // return place in scope 0 at $DIR/projections.rs:+0:29: +0:39
+    let mut _2: (u32, i32);              // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+
+    bb0: {
+        (_2.0: u32) = (_1.0: u32);       // scope 0 at $DIR/projections.rs:+5:13: +5:25
+        (_2.1: i32) = (_1.1: i32);       // scope 0 at $DIR/projections.rs:+6:13: +6:25
+        _0 = _2;                         // scope 0 at $DIR/projections.rs:+8:13: +8:23
+        return;                          // scope 0 at $DIR/projections.rs:+9:13: +9:21
+    }
+}
diff --git a/tests/mir-opt/building/custom/projections.unions.built.after.mir b/tests/mir-opt/building/custom/projections.unions.built.after.mir
new file mode 100644
index 000000000..922538a5f
--- /dev/null
+++ b/tests/mir-opt/building/custom/projections.unions.built.after.mir
@@ -0,0 +1,10 @@
+// MIR for `unions` after built
+
+fn unions(_1: U) -> i32 {
+    let mut _0: i32;                     // return place in scope 0 at $DIR/projections.rs:+0:20: +0:23
+
+    bb0: {
+        _0 = (_1.0: i32);                // scope 0 at $DIR/projections.rs:+2:9: +2:18
+        return;                          // scope 0 at $DIR/projections.rs:+3:9: +3:17
+    }
+}
diff --git a/tests/mir-opt/building/custom/projections.unwrap.built.after.mir b/tests/mir-opt/building/custom/projections.unwrap.built.after.mir
new file mode 100644
index 000000000..75b03a3c3
--- /dev/null
+++ b/tests/mir-opt/building/custom/projections.unwrap.built.after.mir
@@ -0,0 +1,10 @@
+// MIR for `unwrap` after built
+
+fn unwrap(_1: Option<i32>) -> i32 {
+    let mut _0: i32;                     // return place in scope 0 at $DIR/projections.rs:+0:32: +0:35
+
+    bb0: {
+        _0 = ((_1 as variant#1).0: i32); // scope 0 at $DIR/projections.rs:+2:9: +2:40
+        return;                          // scope 0 at $DIR/projections.rs:+3:9: +3:17
+    }
+}
diff --git a/tests/mir-opt/building/custom/projections.unwrap_deref.built.after.mir b/tests/mir-opt/building/custom/projections.unwrap_deref.built.after.mir
new file mode 100644
index 000000000..c6b0f7efa
--- /dev/null
+++ b/tests/mir-opt/building/custom/projections.unwrap_deref.built.after.mir
@@ -0,0 +1,10 @@
+// MIR for `unwrap_deref` after built
+
+fn unwrap_deref(_1: Option<&i32>) -> i32 {
+    let mut _0: i32;                     // return place in scope 0 at $DIR/projections.rs:+0:39: +0:42
+
+    bb0: {
+        _0 = (*((_1 as variant#1).0: &i32)); // scope 0 at $DIR/projections.rs:+2:9: +2:49
+        return;                          // scope 0 at $DIR/projections.rs:+3:9: +3:17
+    }
+}
diff --git a/src/test/mir-opt/building/custom/references.immut_ref.built.after.mir b/tests/mir-opt/building/custom/references.immut_ref.built.after.mir
index 4d38d45c0..f5ee11262 100644
--- a/src/test/mir-opt/building/custom/references.immut_ref.built.after.mir
+++ b/tests/mir-opt/building/custom/references.immut_ref.built.after.mir
@@ -6,9 +6,8 @@ fn immut_ref(_1: &i32) -> &i32 {
 
     bb0: {
         _2 = &raw const (*_1);           // scope 0 at $DIR/references.rs:+5:13: +5:29
-        Retag([raw] _2);                 // scope 0 at $DIR/references.rs:+6:13: +6:24
-        _0 = &(*_2);                     // scope 0 at $DIR/references.rs:+7:13: +7:23
-        Retag(_0);                       // scope 0 at $DIR/references.rs:+8:13: +8:23
-        return;                          // scope 0 at $DIR/references.rs:+9:13: +9:21
+        _0 = &(*_2);                     // scope 0 at $DIR/references.rs:+6:13: +6:23
+        Retag(_0);                       // scope 0 at $DIR/references.rs:+7:13: +7:23
+        return;                          // scope 0 at $DIR/references.rs:+8:13: +8:21
     }
 }
diff --git a/src/test/mir-opt/building/custom/references.mut_ref.built.after.mir b/tests/mir-opt/building/custom/references.mut_ref.built.after.mir
index 01bc8a9cd..8e2ffc33b 100644
--- a/src/test/mir-opt/building/custom/references.mut_ref.built.after.mir
+++ b/tests/mir-opt/building/custom/references.mut_ref.built.after.mir
@@ -6,9 +6,8 @@ fn mut_ref(_1: &mut i32) -> &mut i32 {
 
     bb0: {
         _2 = &raw mut (*_1);             // scope 0 at $DIR/references.rs:+5:13: +5:33
-        Retag([raw] _2);                 // scope 0 at $DIR/references.rs:+6:13: +6:24
-        _0 = &mut (*_2);                 // scope 0 at $DIR/references.rs:+7:13: +7:26
-        Retag(_0);                       // scope 0 at $DIR/references.rs:+8:13: +8:23
-        return;                          // scope 0 at $DIR/references.rs:+9:13: +9:21
+        _0 = &mut (*_2);                 // scope 0 at $DIR/references.rs:+6:13: +6:26
+        Retag(_0);                       // scope 0 at $DIR/references.rs:+7:13: +7:23
+        return;                          // scope 0 at $DIR/references.rs:+8:13: +8:21
     }
 }
diff --git a/tests/mir-opt/building/custom/references.raw_pointer.built.after.mir b/tests/mir-opt/building/custom/references.raw_pointer.built.after.mir
new file mode 100644
index 000000000..775e5e3ad
--- /dev/null
+++ b/tests/mir-opt/building/custom/references.raw_pointer.built.after.mir
@@ -0,0 +1,10 @@
+// MIR for `raw_pointer` after built
+
+fn raw_pointer(_1: *const i32) -> *const i32 {
+    let mut _0: *const i32;              // return place in scope 0 at $DIR/references.rs:+0:38: +0:48
+
+    bb0: {
+        _0 = &raw const (*_1);           // scope 0 at $DIR/references.rs:+4:9: +4:27
+        return;                          // scope 0 at $DIR/references.rs:+5:9: +5:17
+    }
+}
diff --git a/tests/mir-opt/building/custom/references.rs b/tests/mir-opt/building/custom/references.rs
new file mode 100644
index 000000000..a1c896de0
--- /dev/null
+++ b/tests/mir-opt/building/custom/references.rs
@@ -0,0 +1,55 @@
+#![feature(custom_mir, core_intrinsics)]
+
+extern crate core;
+use core::intrinsics::mir::*;
+use core::ptr::{addr_of, addr_of_mut};
+
+// EMIT_MIR references.mut_ref.built.after.mir
+#[custom_mir(dialect = "runtime", phase = "optimized")]
+pub fn mut_ref(x: &mut i32) -> &mut i32 {
+    mir!(
+        let t: *mut i32;
+
+        {
+            t = addr_of_mut!(*x);
+            RET = &mut *t;
+            Retag(RET);
+            Return()
+        }
+    )
+}
+
+// EMIT_MIR references.immut_ref.built.after.mir
+#[custom_mir(dialect = "runtime", phase = "optimized")]
+pub fn immut_ref(x: &i32) -> &i32 {
+    mir!(
+        let t: *const i32;
+
+        {
+            t = addr_of!(*x);
+            RET = & *t;
+            Retag(RET);
+            Return()
+        }
+    )
+}
+
+// EMIT_MIR references.raw_pointer.built.after.mir
+#[custom_mir(dialect = "built")]
+pub fn raw_pointer(x: *const i32) -> *const i32 {
+    // Regression test for a bug in which unsafetyck was not correctly turned off for
+    // `dialect = "built"`
+    mir!({
+        RET = addr_of!(*x);
+        Return()
+    })
+}
+
+fn main() {
+    let mut x = 5;
+    assert_eq!(*mut_ref(&mut x), 5);
+    assert_eq!(*immut_ref(&x), 5);
+    unsafe {
+        assert_eq!(*raw_pointer(addr_of!(x)), 5);
+    }
+}
diff --git a/src/test/mir-opt/building/custom/simple_assign.rs b/tests/mir-opt/building/custom/simple_assign.rs
index ec6dbe1d0..db041aab2 100644
--- a/src/test/mir-opt/building/custom/simple_assign.rs
+++ b/tests/mir-opt/building/custom/simple_assign.rs
@@ -11,12 +11,14 @@ pub fn simple(x: i32) -> i32 {
         let temp2: _;
 
         {
+            StorageLive(temp1);
             temp1 = x;
             Goto(exit)
         }
 
         exit = {
             temp2 = Move(temp1);
+            StorageDead(temp1);
             RET = temp2;
             Return()
         }
diff --git a/tests/mir-opt/building/custom/simple_assign.simple.built.after.mir b/tests/mir-opt/building/custom/simple_assign.simple.built.after.mir
new file mode 100644
index 000000000..743016708
--- /dev/null
+++ b/tests/mir-opt/building/custom/simple_assign.simple.built.after.mir
@@ -0,0 +1,20 @@
+// MIR for `simple` after built
+
+fn simple(_1: i32) -> i32 {
+    let mut _0: i32;                     // return place in scope 0 at $DIR/simple_assign.rs:+0:26: +0:29
+    let mut _2: i32;                     // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _3: i32;                     // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+
+    bb0: {
+        StorageLive(_2);                 // scope 0 at $DIR/simple_assign.rs:+6:13: +6:31
+        _2 = _1;                         // scope 0 at $DIR/simple_assign.rs:+7:13: +7:22
+        goto -> bb1;                     // scope 0 at $DIR/simple_assign.rs:+8:13: +8:23
+    }
+
+    bb1: {
+        _3 = move _2;                    // scope 0 at $DIR/simple_assign.rs:+12:13: +12:32
+        StorageDead(_2);                 // scope 0 at $DIR/simple_assign.rs:+13:13: +13:31
+        _0 = _3;                         // scope 0 at $DIR/simple_assign.rs:+14:13: +14:24
+        return;                          // scope 0 at $DIR/simple_assign.rs:+15:13: +15:21
+    }
+}
diff --git a/src/test/mir-opt/building/custom/simple_assign.simple_ref.built.after.mir b/tests/mir-opt/building/custom/simple_assign.simple_ref.built.after.mir
index 2b0e8f104..2b0e8f104 100644
--- a/src/test/mir-opt/building/custom/simple_assign.simple_ref.built.after.mir
+++ b/tests/mir-opt/building/custom/simple_assign.simple_ref.built.after.mir
diff --git a/tests/mir-opt/building/custom/terminators.assert_nonzero.built.after.mir b/tests/mir-opt/building/custom/terminators.assert_nonzero.built.after.mir
new file mode 100644
index 000000000..a1a27226b
--- /dev/null
+++ b/tests/mir-opt/building/custom/terminators.assert_nonzero.built.after.mir
@@ -0,0 +1,17 @@
+// MIR for `assert_nonzero` after built
+
+fn assert_nonzero(_1: i32) -> () {
+    let mut _0: ();                      // return place in scope 0 at $DIR/terminators.rs:+0:27: +0:27
+
+    bb0: {
+        switchInt(_1) -> [0: bb1, otherwise: bb2]; // scope 0 at $DIR/terminators.rs:+3:13: +6:14
+    }
+
+    bb1: {
+        unreachable;                     // scope 0 at $DIR/terminators.rs:+10:13: +10:26
+    }
+
+    bb2: {
+        return;                          // scope 0 at $DIR/terminators.rs:+14:13: +14:21
+    }
+}
diff --git a/tests/mir-opt/building/custom/terminators.direct_call.built.after.mir b/tests/mir-opt/building/custom/terminators.direct_call.built.after.mir
new file mode 100644
index 000000000..1b2345a96
--- /dev/null
+++ b/tests/mir-opt/building/custom/terminators.direct_call.built.after.mir
@@ -0,0 +1,16 @@
+// MIR for `direct_call` after built
+
+fn direct_call(_1: i32) -> i32 {
+    let mut _0: i32;                     // return place in scope 0 at $DIR/terminators.rs:+0:27: +0:30
+
+    bb0: {
+        _0 = ident::<i32>(_1) -> bb1;    // scope 0 at $DIR/terminators.rs:+3:13: +3:42
+                                         // mir::Constant
+                                         // + span: $DIR/terminators.rs:15:33: 15:38
+                                         // + literal: Const { ty: fn(i32) -> i32 {ident::<i32>}, val: Value(<ZST>) }
+    }
+
+    bb1: {
+        return;                          // scope 0 at $DIR/terminators.rs:+7:13: +7:21
+    }
+}
diff --git a/tests/mir-opt/building/custom/terminators.drop_first.built.after.mir b/tests/mir-opt/building/custom/terminators.drop_first.built.after.mir
new file mode 100644
index 000000000..c903e5946
--- /dev/null
+++ b/tests/mir-opt/building/custom/terminators.drop_first.built.after.mir
@@ -0,0 +1,13 @@
+// MIR for `drop_first` after built
+
+fn drop_first(_1: WriteOnDrop<'_>, _2: WriteOnDrop<'_>) -> () {
+    let mut _0: ();                      // return place in scope 0 at $DIR/terminators.rs:+0:59: +0:59
+
+    bb0: {
+        replace(_1 <- move _2) -> bb1;   // scope 0 at $DIR/terminators.rs:+3:13: +3:49
+    }
+
+    bb1: {
+        return;                          // scope 0 at $DIR/terminators.rs:+7:13: +7:21
+    }
+}
diff --git a/tests/mir-opt/building/custom/terminators.drop_second.built.after.mir b/tests/mir-opt/building/custom/terminators.drop_second.built.after.mir
new file mode 100644
index 000000000..f14246f2d
--- /dev/null
+++ b/tests/mir-opt/building/custom/terminators.drop_second.built.after.mir
@@ -0,0 +1,13 @@
+// MIR for `drop_second` after built
+
+fn drop_second(_1: WriteOnDrop<'_>, _2: WriteOnDrop<'_>) -> () {
+    let mut _0: ();                      // return place in scope 0 at $DIR/terminators.rs:+0:60: +0:60
+
+    bb0: {
+        drop(_2) -> bb1;                 // scope 0 at $DIR/terminators.rs:+3:13: +3:30
+    }
+
+    bb1: {
+        return;                          // scope 0 at $DIR/terminators.rs:+7:13: +7:21
+    }
+}
diff --git a/tests/mir-opt/building/custom/terminators.indirect_call.built.after.mir b/tests/mir-opt/building/custom/terminators.indirect_call.built.after.mir
new file mode 100644
index 000000000..2f1b14069
--- /dev/null
+++ b/tests/mir-opt/building/custom/terminators.indirect_call.built.after.mir
@@ -0,0 +1,13 @@
+// MIR for `indirect_call` after built
+
+fn indirect_call(_1: i32, _2: fn(i32) -> i32) -> i32 {
+    let mut _0: i32;                     // return place in scope 0 at $DIR/terminators.rs:+0:48: +0:51
+
+    bb0: {
+        _0 = _2(_1) -> bb1;              // scope 0 at $DIR/terminators.rs:+3:13: +3:38
+    }
+
+    bb1: {
+        return;                          // scope 0 at $DIR/terminators.rs:+7:13: +7:21
+    }
+}
diff --git a/tests/mir-opt/building/custom/terminators.rs b/tests/mir-opt/building/custom/terminators.rs
new file mode 100644
index 000000000..c23233fcf
--- /dev/null
+++ b/tests/mir-opt/building/custom/terminators.rs
@@ -0,0 +1,108 @@
+#![feature(custom_mir, core_intrinsics)]
+
+extern crate core;
+use core::intrinsics::mir::*;
+
+fn ident<T>(t: T) -> T {
+    t
+}
+
+// EMIT_MIR terminators.direct_call.built.after.mir
+#[custom_mir(dialect = "built")]
+fn direct_call(x: i32) -> i32 {
+    mir!(
+        {
+            Call(RET, retblock, ident(x))
+        }
+
+        retblock = {
+            Return()
+        }
+    )
+}
+
+// EMIT_MIR terminators.indirect_call.built.after.mir
+#[custom_mir(dialect = "built")]
+fn indirect_call(x: i32, f: fn(i32) -> i32) -> i32 {
+    mir!(
+        {
+            Call(RET, retblock, f(x))
+        }
+
+        retblock = {
+            Return()
+        }
+    )
+}
+
+struct WriteOnDrop<'a>(&'a mut i32, i32);
+
+impl<'a> Drop for WriteOnDrop<'a> {
+    fn drop(&mut self) {
+        *self.0 = self.1;
+    }
+}
+
+// EMIT_MIR terminators.drop_first.built.after.mir
+#[custom_mir(dialect = "built")]
+fn drop_first<'a>(a: WriteOnDrop<'a>, b: WriteOnDrop<'a>) {
+    mir!(
+        {
+            DropAndReplace(a, Move(b), retblock)
+        }
+
+        retblock = {
+            Return()
+        }
+    )
+}
+
+// EMIT_MIR terminators.drop_second.built.after.mir
+#[custom_mir(dialect = "built")]
+fn drop_second<'a>(a: WriteOnDrop<'a>, b: WriteOnDrop<'a>) {
+    mir!(
+        {
+            Drop(b, retblock)
+        }
+
+        retblock = {
+            Return()
+        }
+    )
+}
+
+// EMIT_MIR terminators.assert_nonzero.built.after.mir
+#[custom_mir(dialect = "built")]
+fn assert_nonzero(a: i32) {
+    mir!(
+        {
+            match a {
+                0 => unreachable,
+                _ => retblock
+            }
+        }
+
+        unreachable = {
+            Unreachable()
+        }
+
+        retblock = {
+            Return()
+        }
+    )
+}
+
+fn main() {
+    assert_eq!(direct_call(5), 5);
+    assert_eq!(indirect_call(5, ident), 5);
+
+    let mut a = 0;
+    let mut b = 0;
+    drop_first(WriteOnDrop(&mut a, 1), WriteOnDrop(&mut b, 1));
+    assert_eq!((a, b), (1, 0));
+
+    let mut a = 0;
+    let mut b = 0;
+    drop_second(WriteOnDrop(&mut a, 1), WriteOnDrop(&mut b, 1));
+    assert_eq!((a, b), (0, 1));
+}
diff --git a/src/test/mir-opt/building/enum_cast.bar.built.after.mir b/tests/mir-opt/building/enum_cast.bar.built.after.mir
index 0746e0b49..0746e0b49 100644
--- a/src/test/mir-opt/building/enum_cast.bar.built.after.mir
+++ b/tests/mir-opt/building/enum_cast.bar.built.after.mir
diff --git a/src/test/mir-opt/building/enum_cast.boo.built.after.mir b/tests/mir-opt/building/enum_cast.boo.built.after.mir
index 699c876b0..699c876b0 100644
--- a/src/test/mir-opt/building/enum_cast.boo.built.after.mir
+++ b/tests/mir-opt/building/enum_cast.boo.built.after.mir
diff --git a/src/test/mir-opt/building/enum_cast.droppy.built.after.mir b/tests/mir-opt/building/enum_cast.droppy.built.after.mir
index 5231c2eab..5231c2eab 100644
--- a/src/test/mir-opt/building/enum_cast.droppy.built.after.mir
+++ b/tests/mir-opt/building/enum_cast.droppy.built.after.mir
diff --git a/src/test/mir-opt/building/enum_cast.foo.built.after.mir b/tests/mir-opt/building/enum_cast.foo.built.after.mir
index 17e0abf2e..17e0abf2e 100644
--- a/src/test/mir-opt/building/enum_cast.foo.built.after.mir
+++ b/tests/mir-opt/building/enum_cast.foo.built.after.mir
diff --git a/src/test/mir-opt/building/enum_cast.rs b/tests/mir-opt/building/enum_cast.rs
index 98fd5acfb..98fd5acfb 100644
--- a/src/test/mir-opt/building/enum_cast.rs
+++ b/tests/mir-opt/building/enum_cast.rs
diff --git a/src/test/mir-opt/building/issue_101867.main.built.after.mir b/tests/mir-opt/building/issue_101867.main.built.after.mir
index 0ebd840cf..628a33f10 100644
--- a/src/test/mir-opt/building/issue_101867.main.built.after.mir
+++ b/tests/mir-opt/building/issue_101867.main.built.after.mir
@@ -27,7 +27,7 @@ fn main() -> () {
         StorageLive(_5);                 // scope 1 at $DIR/issue_101867.rs:+2:14: +2:15
         FakeRead(ForMatchedPlace(None), _1); // scope 1 at $DIR/issue_101867.rs:+2:19: +2:20
         _6 = discriminant(_1);           // scope 1 at $DIR/issue_101867.rs:+2:19: +2:20
-        switchInt(move _6) -> [1_isize: bb4, otherwise: bb3]; // scope 1 at $DIR/issue_101867.rs:+2:9: +2:16
+        switchInt(move _6) -> [1: bb4, otherwise: bb3]; // scope 1 at $DIR/issue_101867.rs:+2:9: +2:16
     }
 
     bb1: {
diff --git a/src/test/mir-opt/building/issue_101867.rs b/tests/mir-opt/building/issue_101867.rs
index a32d8cb37..a32d8cb37 100644
--- a/src/test/mir-opt/building/issue_101867.rs
+++ b/tests/mir-opt/building/issue_101867.rs
diff --git a/src/test/mir-opt/building/issue_49232.main.built.after.mir b/tests/mir-opt/building/issue_49232.main.built.after.mir
index 9182bcaa2..de5e4c0f6 100644
--- a/src/test/mir-opt/building/issue_49232.main.built.after.mir
+++ b/tests/mir-opt/building/issue_49232.main.built.after.mir
@@ -25,7 +25,7 @@ fn main() -> () {
         StorageLive(_3);                 // scope 0 at $DIR/issue_49232.rs:+3:19: +3:23
         _3 = const true;                 // scope 0 at $DIR/issue_49232.rs:+3:19: +3:23
         FakeRead(ForMatchedPlace(None), _3); // scope 0 at $DIR/issue_49232.rs:+3:19: +3:23
-        switchInt(_3) -> [false: bb3, otherwise: bb4]; // scope 0 at $DIR/issue_49232.rs:+3:13: +3:23
+        switchInt(_3) -> [0: bb3, otherwise: bb4]; // scope 0 at $DIR/issue_49232.rs:+3:13: +3:23
     }
 
     bb3: {
diff --git a/src/test/mir-opt/building/issue_49232.rs b/tests/mir-opt/building/issue_49232.rs
index 7e9f0de81..7e9f0de81 100644
--- a/src/test/mir-opt/building/issue_49232.rs
+++ b/tests/mir-opt/building/issue_49232.rs
diff --git a/src/test/mir-opt/building/match_false_edges.full_tested_match.built.after.mir b/tests/mir-opt/building/match_false_edges.full_tested_match.built.after.mir
index 9a190c3d6..cb36bc64d 100644
--- a/src/test/mir-opt/building/match_false_edges.full_tested_match.built.after.mir
+++ b/tests/mir-opt/building/match_false_edges.full_tested_match.built.after.mir
@@ -28,7 +28,7 @@ fn full_tested_match() -> () {
         _2 = Option::<i32>::Some(const 42_i32); // scope 0 at $DIR/match_false_edges.rs:+1:19: +1:27
         FakeRead(ForMatchedPlace(None), _2); // scope 0 at $DIR/match_false_edges.rs:+1:19: +1:27
         _3 = discriminant(_2);           // scope 0 at $DIR/match_false_edges.rs:+1:19: +1:27
-        switchInt(move _3) -> [0_isize: bb1, 1_isize: bb2, otherwise: bb4]; // scope 0 at $DIR/match_false_edges.rs:+1:13: +1:27
+        switchInt(move _3) -> [0: bb1, 1: bb2, otherwise: bb4]; // scope 0 at $DIR/match_false_edges.rs:+1:13: +1:27
     }
 
     bb1: {
@@ -60,7 +60,7 @@ fn full_tested_match() -> () {
     }
 
     bb6: {
-        switchInt(move _7) -> [false: bb8, otherwise: bb7]; // scope 0 at $DIR/match_false_edges.rs:+2:20: +2:27
+        switchInt(move _7) -> [0: bb8, otherwise: bb7]; // scope 0 at $DIR/match_false_edges.rs:+2:20: +2:27
     }
 
     bb7: {
diff --git a/src/test/mir-opt/building/match_false_edges.full_tested_match2.built.after.mir b/tests/mir-opt/building/match_false_edges.full_tested_match2.built.after.mir
index 1c9953e7e..7f8755faa 100644
--- a/src/test/mir-opt/building/match_false_edges.full_tested_match2.built.after.mir
+++ b/tests/mir-opt/building/match_false_edges.full_tested_match2.built.after.mir
@@ -28,7 +28,7 @@ fn full_tested_match2() -> () {
         _2 = Option::<i32>::Some(const 42_i32); // scope 0 at $DIR/match_false_edges.rs:+1:19: +1:27
         FakeRead(ForMatchedPlace(None), _2); // scope 0 at $DIR/match_false_edges.rs:+1:19: +1:27
         _3 = discriminant(_2);           // scope 0 at $DIR/match_false_edges.rs:+1:19: +1:27
-        switchInt(move _3) -> [0_isize: bb1, 1_isize: bb2, otherwise: bb4]; // scope 0 at $DIR/match_false_edges.rs:+1:13: +1:27
+        switchInt(move _3) -> [0: bb1, 1: bb2, otherwise: bb4]; // scope 0 at $DIR/match_false_edges.rs:+1:13: +1:27
     }
 
     bb1: {
@@ -66,7 +66,7 @@ fn full_tested_match2() -> () {
     }
 
     bb6: {
-        switchInt(move _7) -> [false: bb8, otherwise: bb7]; // scope 0 at $DIR/match_false_edges.rs:+2:20: +2:27
+        switchInt(move _7) -> [0: bb8, otherwise: bb7]; // scope 0 at $DIR/match_false_edges.rs:+2:20: +2:27
     }
 
     bb7: {
diff --git a/src/test/mir-opt/building/match_false_edges.main.built.after.mir b/tests/mir-opt/building/match_false_edges.main.built.after.mir
index 08c67d39d..e8b93f437 100644
--- a/src/test/mir-opt/building/match_false_edges.main.built.after.mir
+++ b/tests/mir-opt/building/match_false_edges.main.built.after.mir
@@ -39,7 +39,7 @@ fn main() -> () {
         _2 = Option::<i32>::Some(const 1_i32); // scope 0 at $DIR/match_false_edges.rs:+1:19: +1:26
         FakeRead(ForMatchedPlace(None), _2); // scope 0 at $DIR/match_false_edges.rs:+1:19: +1:26
         _4 = discriminant(_2);           // scope 0 at $DIR/match_false_edges.rs:+1:19: +1:26
-        switchInt(move _4) -> [1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/match_false_edges.rs:+1:13: +1:26
+        switchInt(move _4) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/match_false_edges.rs:+1:13: +1:26
     }
 
     bb1: {
@@ -56,7 +56,7 @@ fn main() -> () {
 
     bb4: {
         _3 = discriminant(_2);           // scope 0 at $DIR/match_false_edges.rs:+1:19: +1:26
-        switchInt(move _3) -> [1_isize: bb6, otherwise: bb5]; // scope 0 at $DIR/match_false_edges.rs:+1:13: +1:26
+        switchInt(move _3) -> [1: bb6, otherwise: bb5]; // scope 0 at $DIR/match_false_edges.rs:+1:13: +1:26
     }
 
     bb5: {
@@ -87,7 +87,7 @@ fn main() -> () {
     }
 
     bb9: {
-        switchInt(move _8) -> [false: bb11, otherwise: bb10]; // scope 0 at $DIR/match_false_edges.rs:+2:21: +2:28
+        switchInt(move _8) -> [0: bb11, otherwise: bb10]; // scope 0 at $DIR/match_false_edges.rs:+2:21: +2:28
     }
 
     bb10: {
@@ -134,7 +134,7 @@ fn main() -> () {
     }
 
     bb15: {
-        switchInt(move _12) -> [false: bb17, otherwise: bb16]; // scope 0 at $DIR/match_false_edges.rs:+4:20: +4:29
+        switchInt(move _12) -> [0: bb17, otherwise: bb16]; // scope 0 at $DIR/match_false_edges.rs:+4:20: +4:29
     }
 
     bb16: {
diff --git a/src/test/mir-opt/building/match_false_edges.rs b/tests/mir-opt/building/match_false_edges.rs
index ddfcc1493..ddfcc1493 100644
--- a/src/test/mir-opt/building/match_false_edges.rs
+++ b/tests/mir-opt/building/match_false_edges.rs
diff --git a/src/test/mir-opt/building/receiver_ptr_mutability.main.built.after.mir b/tests/mir-opt/building/receiver_ptr_mutability.main.built.after.mir
index 41eb00363..41eb00363 100644
--- a/src/test/mir-opt/building/receiver_ptr_mutability.main.built.after.mir
+++ b/tests/mir-opt/building/receiver_ptr_mutability.main.built.after.mir
diff --git a/src/test/mir-opt/building/receiver_ptr_mutability.rs b/tests/mir-opt/building/receiver_ptr_mutability.rs
index 668530968..668530968 100644
--- a/src/test/mir-opt/building/receiver_ptr_mutability.rs
+++ b/tests/mir-opt/building/receiver_ptr_mutability.rs
diff --git a/src/test/mir-opt/building/simple_match.match_bool.built.after.mir b/tests/mir-opt/building/simple_match.match_bool.built.after.mir
index a4516026c..aa2fd4632 100644
--- a/src/test/mir-opt/building/simple_match.match_bool.built.after.mir
+++ b/tests/mir-opt/building/simple_match.match_bool.built.after.mir
@@ -6,7 +6,7 @@ fn match_bool(_1: bool) -> usize {
 
     bb0: {
         FakeRead(ForMatchedPlace(None), _1); // scope 0 at $DIR/simple_match.rs:+1:11: +1:12
-        switchInt(_1) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/simple_match.rs:+1:5: +1:12
+        switchInt(_1) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/simple_match.rs:+1:5: +1:12
     }
 
     bb1: {
diff --git a/src/test/mir-opt/building/simple_match.rs b/tests/mir-opt/building/simple_match.rs
index 0ef97dde6..0ef97dde6 100644
--- a/src/test/mir-opt/building/simple_match.rs
+++ b/tests/mir-opt/building/simple_match.rs
diff --git a/src/test/mir-opt/building/storage_live_dead_in_statics.XXX.built.after.mir b/tests/mir-opt/building/storage_live_dead_in_statics.XXX.built.after.mir
index 1d3f77e07..1d3f77e07 100644
--- a/src/test/mir-opt/building/storage_live_dead_in_statics.XXX.built.after.mir
+++ b/tests/mir-opt/building/storage_live_dead_in_statics.XXX.built.after.mir
diff --git a/src/test/mir-opt/building/storage_live_dead_in_statics.rs b/tests/mir-opt/building/storage_live_dead_in_statics.rs
index 79f709148..79f709148 100644
--- a/src/test/mir-opt/building/storage_live_dead_in_statics.rs
+++ b/tests/mir-opt/building/storage_live_dead_in_statics.rs
diff --git a/src/test/mir-opt/building/uniform_array_move_out.move_out_by_subslice.built.after.mir b/tests/mir-opt/building/uniform_array_move_out.move_out_by_subslice.built.after.mir
index 234cd0839..234cd0839 100644
--- a/src/test/mir-opt/building/uniform_array_move_out.move_out_by_subslice.built.after.mir
+++ b/tests/mir-opt/building/uniform_array_move_out.move_out_by_subslice.built.after.mir
diff --git a/src/test/mir-opt/building/uniform_array_move_out.move_out_from_end.built.after.mir b/tests/mir-opt/building/uniform_array_move_out.move_out_from_end.built.after.mir
index 24a189498..24a189498 100644
--- a/src/test/mir-opt/building/uniform_array_move_out.move_out_from_end.built.after.mir
+++ b/tests/mir-opt/building/uniform_array_move_out.move_out_from_end.built.after.mir
diff --git a/src/test/mir-opt/building/uniform_array_move_out.rs b/tests/mir-opt/building/uniform_array_move_out.rs
index e925036ec..e925036ec 100644
--- a/src/test/mir-opt/building/uniform_array_move_out.rs
+++ b/tests/mir-opt/building/uniform_array_move_out.rs
diff --git a/src/test/mir-opt/byte_slice.main.SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/byte_slice.main.SimplifyCfg-elaborate-drops.after.mir
index 73f5655a1..73f5655a1 100644
--- a/src/test/mir-opt/byte_slice.main.SimplifyCfg-elaborate-drops.after.mir
+++ b/tests/mir-opt/byte_slice.main.SimplifyCfg-elaborate-drops.after.mir
diff --git a/src/test/mir-opt/byte_slice.rs b/tests/mir-opt/byte_slice.rs
index 48e9c48c1..48e9c48c1 100644
--- a/src/test/mir-opt/byte_slice.rs
+++ b/tests/mir-opt/byte_slice.rs
diff --git a/src/test/mir-opt/combine_array_len.norm2.InstCombine.diff b/tests/mir-opt/combine_array_len.norm2.InstCombine.diff
index c73150f94..c73150f94 100644
--- a/src/test/mir-opt/combine_array_len.norm2.InstCombine.diff
+++ b/tests/mir-opt/combine_array_len.norm2.InstCombine.diff
diff --git a/src/test/mir-opt/combine_array_len.rs b/tests/mir-opt/combine_array_len.rs
index 3ef3bd09a..3ef3bd09a 100644
--- a/src/test/mir-opt/combine_array_len.rs
+++ b/tests/mir-opt/combine_array_len.rs
diff --git a/src/test/mir-opt/combine_clone_of_primitives.rs b/tests/mir-opt/combine_clone_of_primitives.rs
index 7cc50a86e..7cc50a86e 100644
--- a/src/test/mir-opt/combine_clone_of_primitives.rs
+++ b/tests/mir-opt/combine_clone_of_primitives.rs
diff --git a/src/test/mir-opt/combine_clone_of_primitives.{impl#0}-clone.InstCombine.diff b/tests/mir-opt/combine_clone_of_primitives.{impl#0}-clone.InstCombine.diff
index 6f01553ee..6f01553ee 100644
--- a/src/test/mir-opt/combine_clone_of_primitives.{impl#0}-clone.InstCombine.diff
+++ b/tests/mir-opt/combine_clone_of_primitives.{impl#0}-clone.InstCombine.diff
diff --git a/src/test/mir-opt/const_allocation.main.ConstProp.after.32bit.mir b/tests/mir-opt/const_allocation.main.ConstProp.after.32bit.mir
index da5a64cac..6140fc52f 100644
--- a/src/test/mir-opt/const_allocation.main.ConstProp.after.32bit.mir
+++ b/tests/mir-opt/const_allocation.main.ConstProp.after.32bit.mir
@@ -10,12 +10,12 @@ fn main() -> () {
         StorageLive(_2);                 // scope 0 at $DIR/const_allocation.rs:+1:5: +1:8
         _2 = const {alloc1: &&[(Option<i32>, &[&str])]}; // scope 0 at $DIR/const_allocation.rs:+1:5: +1:8
                                          // mir::Constant
-                                         // + span: $DIR/const_allocation.rs:8:5: 8:8
+                                         // + span: $DIR/const_allocation.rs:9:5: 9:8
                                          // + literal: Const { ty: &&[(Option<i32>, &[&str])], val: Value(Scalar(alloc1)) }
         _1 = (*_2);                      // scope 0 at $DIR/const_allocation.rs:+1:5: +1:8
         StorageDead(_2);                 // scope 0 at $DIR/const_allocation.rs:+1:8: +1:9
         StorageDead(_1);                 // scope 0 at $DIR/const_allocation.rs:+1:8: +1:9
-        nop;                             // scope 0 at $DIR/const_allocation.rs:+0:11: +2:2
+        _0 = const ();                   // scope 0 at $DIR/const_allocation.rs:+0:11: +2:2
         return;                          // scope 0 at $DIR/const_allocation.rs:+2:2: +2:2
     }
 }
diff --git a/src/test/mir-opt/const_allocation.main.ConstProp.after.64bit.mir b/tests/mir-opt/const_allocation.main.ConstProp.after.64bit.mir
index febd99068..b2ed23c68 100644
--- a/src/test/mir-opt/const_allocation.main.ConstProp.after.64bit.mir
+++ b/tests/mir-opt/const_allocation.main.ConstProp.after.64bit.mir
@@ -10,12 +10,12 @@ fn main() -> () {
         StorageLive(_2);                 // scope 0 at $DIR/const_allocation.rs:+1:5: +1:8
         _2 = const {alloc1: &&[(Option<i32>, &[&str])]}; // scope 0 at $DIR/const_allocation.rs:+1:5: +1:8
                                          // mir::Constant
-                                         // + span: $DIR/const_allocation.rs:8:5: 8:8
+                                         // + span: $DIR/const_allocation.rs:9:5: 9:8
                                          // + literal: Const { ty: &&[(Option<i32>, &[&str])], val: Value(Scalar(alloc1)) }
         _1 = (*_2);                      // scope 0 at $DIR/const_allocation.rs:+1:5: +1:8
         StorageDead(_2);                 // scope 0 at $DIR/const_allocation.rs:+1:8: +1:9
         StorageDead(_1);                 // scope 0 at $DIR/const_allocation.rs:+1:8: +1:9
-        nop;                             // scope 0 at $DIR/const_allocation.rs:+0:11: +2:2
+        _0 = const ();                   // scope 0 at $DIR/const_allocation.rs:+0:11: +2:2
         return;                          // scope 0 at $DIR/const_allocation.rs:+2:2: +2:2
     }
 }
diff --git a/src/test/mir-opt/const_allocation.rs b/tests/mir-opt/const_allocation.rs
index b0fcb86fc..91a2455eb 100644
--- a/src/test/mir-opt/const_allocation.rs
+++ b/tests/mir-opt/const_allocation.rs
@@ -1,3 +1,4 @@
+// unit-test: ConstProp
 // ignore-endian-big
 // EMIT_MIR_FOR_EACH_BIT_WIDTH
 static FOO: &[(Option<i32>, &[&str])] =
diff --git a/src/test/mir-opt/const_allocation2.main.ConstProp.after.32bit.mir b/tests/mir-opt/const_allocation2.main.ConstProp.after.32bit.mir
index 389641f20..aab005c52 100644
--- a/src/test/mir-opt/const_allocation2.main.ConstProp.after.32bit.mir
+++ b/tests/mir-opt/const_allocation2.main.ConstProp.after.32bit.mir
@@ -10,12 +10,12 @@ fn main() -> () {
         StorageLive(_2);                 // scope 0 at $DIR/const_allocation2.rs:+1:5: +1:8
         _2 = const {alloc1: &&[(Option<i32>, &[&u8])]}; // scope 0 at $DIR/const_allocation2.rs:+1:5: +1:8
                                          // mir::Constant
-                                         // + span: $DIR/const_allocation2.rs:5:5: 5:8
+                                         // + span: $DIR/const_allocation2.rs:6:5: 6:8
                                          // + literal: Const { ty: &&[(Option<i32>, &[&u8])], val: Value(Scalar(alloc1)) }
         _1 = (*_2);                      // scope 0 at $DIR/const_allocation2.rs:+1:5: +1:8
         StorageDead(_2);                 // scope 0 at $DIR/const_allocation2.rs:+1:8: +1:9
         StorageDead(_1);                 // scope 0 at $DIR/const_allocation2.rs:+1:8: +1:9
-        nop;                             // scope 0 at $DIR/const_allocation2.rs:+0:11: +2:2
+        _0 = const ();                   // scope 0 at $DIR/const_allocation2.rs:+0:11: +2:2
         return;                          // scope 0 at $DIR/const_allocation2.rs:+2:2: +2:2
     }
 }
diff --git a/src/test/mir-opt/const_allocation2.main.ConstProp.after.64bit.mir b/tests/mir-opt/const_allocation2.main.ConstProp.after.64bit.mir
index ce3848e92..0eff9474c 100644
--- a/src/test/mir-opt/const_allocation2.main.ConstProp.after.64bit.mir
+++ b/tests/mir-opt/const_allocation2.main.ConstProp.after.64bit.mir
@@ -10,12 +10,12 @@ fn main() -> () {
         StorageLive(_2);                 // scope 0 at $DIR/const_allocation2.rs:+1:5: +1:8
         _2 = const {alloc1: &&[(Option<i32>, &[&u8])]}; // scope 0 at $DIR/const_allocation2.rs:+1:5: +1:8
                                          // mir::Constant
-                                         // + span: $DIR/const_allocation2.rs:5:5: 5:8
+                                         // + span: $DIR/const_allocation2.rs:6:5: 6:8
                                          // + literal: Const { ty: &&[(Option<i32>, &[&u8])], val: Value(Scalar(alloc1)) }
         _1 = (*_2);                      // scope 0 at $DIR/const_allocation2.rs:+1:5: +1:8
         StorageDead(_2);                 // scope 0 at $DIR/const_allocation2.rs:+1:8: +1:9
         StorageDead(_1);                 // scope 0 at $DIR/const_allocation2.rs:+1:8: +1:9
-        nop;                             // scope 0 at $DIR/const_allocation2.rs:+0:11: +2:2
+        _0 = const ();                   // scope 0 at $DIR/const_allocation2.rs:+0:11: +2:2
         return;                          // scope 0 at $DIR/const_allocation2.rs:+2:2: +2:2
     }
 }
diff --git a/src/test/mir-opt/const_allocation2.rs b/tests/mir-opt/const_allocation2.rs
index 30afedffb..f2870aa47 100644
--- a/src/test/mir-opt/const_allocation2.rs
+++ b/tests/mir-opt/const_allocation2.rs
@@ -1,3 +1,4 @@
+// unit-test: ConstProp
 // ignore-endian-big
 // EMIT_MIR_FOR_EACH_BIT_WIDTH
 // EMIT_MIR const_allocation2.main.ConstProp.after.mir
diff --git a/src/test/mir-opt/const_allocation3.main.ConstProp.after.32bit.mir b/tests/mir-opt/const_allocation3.main.ConstProp.after.32bit.mir
index b72519159..55c6db5d0 100644
--- a/src/test/mir-opt/const_allocation3.main.ConstProp.after.32bit.mir
+++ b/tests/mir-opt/const_allocation3.main.ConstProp.after.32bit.mir
@@ -10,12 +10,12 @@ fn main() -> () {
         StorageLive(_2);                 // scope 0 at $DIR/const_allocation3.rs:+1:5: +1:8
         _2 = const {alloc1: &&Packed};   // scope 0 at $DIR/const_allocation3.rs:+1:5: +1:8
                                          // mir::Constant
-                                         // + span: $DIR/const_allocation3.rs:5:5: 5:8
+                                         // + span: $DIR/const_allocation3.rs:6:5: 6:8
                                          // + literal: Const { ty: &&Packed, val: Value(Scalar(alloc1)) }
         _1 = (*_2);                      // scope 0 at $DIR/const_allocation3.rs:+1:5: +1:8
         StorageDead(_2);                 // scope 0 at $DIR/const_allocation3.rs:+1:8: +1:9
         StorageDead(_1);                 // scope 0 at $DIR/const_allocation3.rs:+1:8: +1:9
-        nop;                             // scope 0 at $DIR/const_allocation3.rs:+0:11: +2:2
+        _0 = const ();                   // scope 0 at $DIR/const_allocation3.rs:+0:11: +2:2
         return;                          // scope 0 at $DIR/const_allocation3.rs:+2:2: +2:2
     }
 }
diff --git a/src/test/mir-opt/const_allocation3.main.ConstProp.after.64bit.mir b/tests/mir-opt/const_allocation3.main.ConstProp.after.64bit.mir
index 6bd047c7d..27492a7fd 100644
--- a/src/test/mir-opt/const_allocation3.main.ConstProp.after.64bit.mir
+++ b/tests/mir-opt/const_allocation3.main.ConstProp.after.64bit.mir
@@ -10,12 +10,12 @@ fn main() -> () {
         StorageLive(_2);                 // scope 0 at $DIR/const_allocation3.rs:+1:5: +1:8
         _2 = const {alloc1: &&Packed};   // scope 0 at $DIR/const_allocation3.rs:+1:5: +1:8
                                          // mir::Constant
-                                         // + span: $DIR/const_allocation3.rs:5:5: 5:8
+                                         // + span: $DIR/const_allocation3.rs:6:5: 6:8
                                          // + literal: Const { ty: &&Packed, val: Value(Scalar(alloc1)) }
         _1 = (*_2);                      // scope 0 at $DIR/const_allocation3.rs:+1:5: +1:8
         StorageDead(_2);                 // scope 0 at $DIR/const_allocation3.rs:+1:8: +1:9
         StorageDead(_1);                 // scope 0 at $DIR/const_allocation3.rs:+1:8: +1:9
-        nop;                             // scope 0 at $DIR/const_allocation3.rs:+0:11: +2:2
+        _0 = const ();                   // scope 0 at $DIR/const_allocation3.rs:+0:11: +2:2
         return;                          // scope 0 at $DIR/const_allocation3.rs:+2:2: +2:2
     }
 }
diff --git a/src/test/mir-opt/const_allocation3.rs b/tests/mir-opt/const_allocation3.rs
index ddeb32ab9..da3fd089b 100644
--- a/src/test/mir-opt/const_allocation3.rs
+++ b/tests/mir-opt/const_allocation3.rs
@@ -1,3 +1,4 @@
+// unit-test: ConstProp
 // ignore-endian-big
 // EMIT_MIR_FOR_EACH_BIT_WIDTH
 // EMIT_MIR const_allocation3.main.ConstProp.after.mir
diff --git a/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff b/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff
new file mode 100644
index 000000000..dd548adde
--- /dev/null
+++ b/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff
@@ -0,0 +1,126 @@
+- // MIR for `main` before ConstDebugInfo
++ // MIR for `main` after ConstDebugInfo
+  
+  fn main() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/const_debuginfo.rs:+0:11: +0:11
+      let _1: u8;                          // in scope 0 at $DIR/const_debuginfo.rs:+1:9: +1:10
+      let mut _5: u8;                      // in scope 0 at $DIR/const_debuginfo.rs:+4:15: +4:20
+      let mut _6: u8;                      // in scope 0 at $DIR/const_debuginfo.rs:+4:15: +4:16
+      let mut _7: u8;                      // in scope 0 at $DIR/const_debuginfo.rs:+4:19: +4:20
+      let mut _8: u8;                      // in scope 0 at $DIR/const_debuginfo.rs:+4:23: +4:24
+      let mut _12: u32;                    // in scope 0 at $DIR/const_debuginfo.rs:+13:13: +13:16
+      let mut _13: u32;                    // in scope 0 at $DIR/const_debuginfo.rs:+13:19: +13:22
+      scope 1 {
+-         debug x => _1;                   // in scope 1 at $DIR/const_debuginfo.rs:+1:9: +1:10
++         debug x => const 1_u8;           // in scope 1 at $DIR/const_debuginfo.rs:+1:9: +1:10
+          let _2: u8;                      // in scope 1 at $DIR/const_debuginfo.rs:+2:9: +2:10
+          scope 2 {
+-             debug y => _2;               // in scope 2 at $DIR/const_debuginfo.rs:+2:9: +2:10
++             debug y => const 2_u8;       // in scope 2 at $DIR/const_debuginfo.rs:+2:9: +2:10
+              let _3: u8;                  // in scope 2 at $DIR/const_debuginfo.rs:+3:9: +3:10
+              scope 3 {
+-                 debug z => _3;           // in scope 3 at $DIR/const_debuginfo.rs:+3:9: +3:10
++                 debug z => const 3_u8;   // in scope 3 at $DIR/const_debuginfo.rs:+3:9: +3:10
+                  let _4: u8;              // in scope 3 at $DIR/const_debuginfo.rs:+4:9: +4:12
+                  scope 4 {
+-                     debug sum => _4;     // in scope 4 at $DIR/const_debuginfo.rs:+4:9: +4:12
++                     debug sum => const 6_u8; // in scope 4 at $DIR/const_debuginfo.rs:+4:9: +4:12
+                      let _9: &str;        // in scope 4 at $DIR/const_debuginfo.rs:+6:9: +6:10
+                      scope 5 {
+-                         debug s => _9;   // in scope 5 at $DIR/const_debuginfo.rs:+6:9: +6:10
++                         debug s => const "hello, world!"; // in scope 5 at $DIR/const_debuginfo.rs:+6:9: +6:10
+                          let _14: bool;   // in scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
+                          let _15: bool;   // in scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
+                          let _16: u32;    // in scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
+                          scope 6 {
+                              debug f => (bool, bool, u32){ .0 => _14, .1 => _15, .2 => _16, }; // in scope 6 at $DIR/const_debuginfo.rs:+8:9: +8:10
+                              let _10: std::option::Option<u16>; // in scope 6 at $DIR/const_debuginfo.rs:+10:9: +10:10
+                              scope 7 {
+                                  debug o => _10; // in scope 7 at $DIR/const_debuginfo.rs:+10:9: +10:10
+                                  let _17: u32; // in scope 7 at $DIR/const_debuginfo.rs:+12:9: +12:10
+                                  let _18: u32; // in scope 7 at $DIR/const_debuginfo.rs:+12:9: +12:10
+                                  scope 8 {
+                                      debug p => Point{ .0 => _17, .1 => _18, }; // in scope 8 at $DIR/const_debuginfo.rs:+12:9: +12:10
+                                      let _11: u32; // in scope 8 at $DIR/const_debuginfo.rs:+13:9: +13:10
+                                      scope 9 {
+-                                         debug a => _11; // in scope 9 at $DIR/const_debuginfo.rs:+13:9: +13:10
++                                         debug a => const 64_u32; // in scope 9 at $DIR/const_debuginfo.rs:+13:9: +13:10
+                                      }
+                                  }
+                              }
+                          }
+                      }
+                  }
+              }
+          }
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/const_debuginfo.rs:+1:9: +1:10
+          _1 = const 1_u8;                 // scope 0 at $DIR/const_debuginfo.rs:+1:13: +1:16
+          StorageLive(_2);                 // scope 1 at $DIR/const_debuginfo.rs:+2:9: +2:10
+          _2 = const 2_u8;                 // scope 1 at $DIR/const_debuginfo.rs:+2:13: +2:16
+          StorageLive(_3);                 // scope 2 at $DIR/const_debuginfo.rs:+3:9: +3:10
+          _3 = const 3_u8;                 // scope 2 at $DIR/const_debuginfo.rs:+3:13: +3:16
+          StorageLive(_4);                 // scope 3 at $DIR/const_debuginfo.rs:+4:9: +4:12
+          StorageLive(_5);                 // scope 3 at $DIR/const_debuginfo.rs:+4:15: +4:20
+          StorageLive(_6);                 // scope 3 at $DIR/const_debuginfo.rs:+4:15: +4:16
+          _6 = const 1_u8;                 // scope 3 at $DIR/const_debuginfo.rs:+4:15: +4:16
+          StorageLive(_7);                 // scope 3 at $DIR/const_debuginfo.rs:+4:19: +4:20
+          _7 = const 2_u8;                 // scope 3 at $DIR/const_debuginfo.rs:+4:19: +4:20
+          _5 = const 3_u8;                 // scope 3 at $DIR/const_debuginfo.rs:+4:15: +4:20
+          StorageDead(_7);                 // scope 3 at $DIR/const_debuginfo.rs:+4:19: +4:20
+          StorageDead(_6);                 // scope 3 at $DIR/const_debuginfo.rs:+4:19: +4:20
+          StorageLive(_8);                 // scope 3 at $DIR/const_debuginfo.rs:+4:23: +4:24
+          _8 = const 3_u8;                 // scope 3 at $DIR/const_debuginfo.rs:+4:23: +4:24
+          _4 = const 6_u8;                 // scope 3 at $DIR/const_debuginfo.rs:+4:15: +4:24
+          StorageDead(_8);                 // scope 3 at $DIR/const_debuginfo.rs:+4:23: +4:24
+          StorageDead(_5);                 // scope 3 at $DIR/const_debuginfo.rs:+4:23: +4:24
+          StorageLive(_9);                 // scope 4 at $DIR/const_debuginfo.rs:+6:9: +6:10
+          _9 = const "hello, world!";      // scope 4 at $DIR/const_debuginfo.rs:+6:13: +6:28
+                                           // mir::Constant
+                                           // + span: $DIR/const_debuginfo.rs:14:13: 14:28
+                                           // + literal: Const { ty: &str, val: Value(Slice(..)) }
+          StorageLive(_14);                // scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
+          StorageLive(_15);                // scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
+          StorageLive(_16);                // scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
+          Deinit(_14);                     // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
+          Deinit(_15);                     // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
+          Deinit(_16);                     // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
+          _14 = const true;                // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
+          _15 = const false;               // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
+          _16 = const 123_u32;             // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
+          StorageLive(_10);                // scope 6 at $DIR/const_debuginfo.rs:+10:9: +10:10
+          Deinit(_10);                     // scope 6 at $DIR/const_debuginfo.rs:+10:13: +10:24
+          ((_10 as Some).0: u16) = const 99_u16; // scope 6 at $DIR/const_debuginfo.rs:+10:13: +10:24
+          discriminant(_10) = 1;           // scope 6 at $DIR/const_debuginfo.rs:+10:13: +10:24
+          StorageLive(_17);                // scope 7 at $DIR/const_debuginfo.rs:+12:9: +12:10
+          StorageLive(_18);                // scope 7 at $DIR/const_debuginfo.rs:+12:9: +12:10
+          Deinit(_17);                     // scope 7 at $DIR/const_debuginfo.rs:+12:13: +12:35
+          Deinit(_18);                     // scope 7 at $DIR/const_debuginfo.rs:+12:13: +12:35
+          _17 = const 32_u32;              // scope 7 at $DIR/const_debuginfo.rs:+12:13: +12:35
+          _18 = const 32_u32;              // scope 7 at $DIR/const_debuginfo.rs:+12:13: +12:35
+          StorageLive(_11);                // scope 8 at $DIR/const_debuginfo.rs:+13:9: +13:10
+          StorageLive(_12);                // scope 8 at $DIR/const_debuginfo.rs:+13:13: +13:16
+          _12 = const 32_u32;              // scope 8 at $DIR/const_debuginfo.rs:+13:13: +13:16
+          StorageLive(_13);                // scope 8 at $DIR/const_debuginfo.rs:+13:19: +13:22
+          _13 = const 32_u32;              // scope 8 at $DIR/const_debuginfo.rs:+13:19: +13:22
+          _11 = const 64_u32;              // scope 8 at $DIR/const_debuginfo.rs:+13:13: +13:22
+          StorageDead(_13);                // scope 8 at $DIR/const_debuginfo.rs:+13:21: +13:22
+          StorageDead(_12);                // scope 8 at $DIR/const_debuginfo.rs:+13:21: +13:22
+          StorageDead(_11);                // scope 8 at $DIR/const_debuginfo.rs:+14:1: +14:2
+          StorageDead(_17);                // scope 7 at $DIR/const_debuginfo.rs:+14:1: +14:2
+          StorageDead(_18);                // scope 7 at $DIR/const_debuginfo.rs:+14:1: +14:2
+          StorageDead(_10);                // scope 6 at $DIR/const_debuginfo.rs:+14:1: +14:2
+          StorageDead(_14);                // scope 5 at $DIR/const_debuginfo.rs:+14:1: +14:2
+          StorageDead(_15);                // scope 5 at $DIR/const_debuginfo.rs:+14:1: +14:2
+          StorageDead(_16);                // scope 5 at $DIR/const_debuginfo.rs:+14:1: +14:2
+          StorageDead(_9);                 // scope 4 at $DIR/const_debuginfo.rs:+14:1: +14:2
+          StorageDead(_4);                 // scope 3 at $DIR/const_debuginfo.rs:+14:1: +14:2
+          StorageDead(_3);                 // scope 2 at $DIR/const_debuginfo.rs:+14:1: +14:2
+          StorageDead(_2);                 // scope 1 at $DIR/const_debuginfo.rs:+14:1: +14:2
+          StorageDead(_1);                 // scope 0 at $DIR/const_debuginfo.rs:+14:1: +14:2
+          return;                          // scope 0 at $DIR/const_debuginfo.rs:+14:2: +14:2
+      }
+  }
+  
diff --git a/src/test/mir-opt/const_debuginfo.rs b/tests/mir-opt/const_debuginfo.rs
index a188da385..a188da385 100644
--- a/src/test/mir-opt/const_debuginfo.rs
+++ b/tests/mir-opt/const_debuginfo.rs
diff --git a/src/test/mir-opt/const_goto.issue_77355_opt.ConstGoto.diff b/tests/mir-opt/const_goto.issue_77355_opt.ConstGoto.diff
index fade2d0bc..a717d1bbd 100644
--- a/src/test/mir-opt/const_goto.issue_77355_opt.ConstGoto.diff
+++ b/tests/mir-opt/const_goto.issue_77355_opt.ConstGoto.diff
@@ -11,9 +11,9 @@
       bb0: {
 -         StorageLive(_2);                 // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
 -         _3 = discriminant(_1);           // scope 0 at $DIR/const_goto.rs:+1:17: +1:20
--         switchInt(move _3) -> [1_isize: bb2, 2_isize: bb2, otherwise: bb1]; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+-         switchInt(move _3) -> [1: bb2, 2: bb2, otherwise: bb1]; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
 +         _2 = discriminant(_1);           // scope 0 at $DIR/const_goto.rs:+1:17: +1:20
-+         switchInt(move _2) -> [1_isize: bb2, 2_isize: bb2, otherwise: bb1]; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
++         switchInt(move _2) -> [1: bb2, 2: bb2, otherwise: bb1]; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
       }
   
       bb1: {
@@ -29,7 +29,7 @@
 -     }
 - 
 -     bb3: {
--         switchInt(move _2) -> [false: bb5, otherwise: bb4]; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+-         switchInt(move _2) -> [0: bb5, otherwise: bb4]; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
 -     }
 - 
 -     bb4: {
diff --git a/src/test/mir-opt/const_goto.rs b/tests/mir-opt/const_goto.rs
index 6f84f186b..6f84f186b 100644
--- a/src/test/mir-opt/const_goto.rs
+++ b/tests/mir-opt/const_goto.rs
diff --git a/src/test/mir-opt/const_goto_const_eval_fail.f.ConstGoto.diff b/tests/mir-opt/const_goto_const_eval_fail.f.ConstGoto.diff
index 623297aeb..24be8c9b8 100644
--- a/src/test/mir-opt/const_goto_const_eval_fail.f.ConstGoto.diff
+++ b/tests/mir-opt/const_goto_const_eval_fail.f.ConstGoto.diff
@@ -10,7 +10,7 @@
           StorageLive(_1);                 // scope 0 at $DIR/const_goto_const_eval_fail.rs:+1:11: +6:6
           StorageLive(_2);                 // scope 0 at $DIR/const_goto_const_eval_fail.rs:+2:15: +2:16
           _2 = const A;                    // scope 0 at $DIR/const_goto_const_eval_fail.rs:+2:15: +2:16
-          switchInt(_2) -> [1_i32: bb2, 2_i32: bb2, 3_i32: bb2, otherwise: bb1]; // scope 0 at $DIR/const_goto_const_eval_fail.rs:+2:9: +2:16
+          switchInt(_2) -> [1: bb2, 2: bb2, 3: bb2, otherwise: bb1]; // scope 0 at $DIR/const_goto_const_eval_fail.rs:+2:9: +2:16
       }
   
       bb1: {
@@ -21,11 +21,11 @@
       bb2: {
           _1 = const B;                    // scope 0 at $DIR/const_goto_const_eval_fail.rs:+3:26: +3:27
 -         goto -> bb3;                     // scope 0 at $DIR/const_goto_const_eval_fail.rs:+3:26: +3:27
-+         switchInt(_1) -> [false: bb4, otherwise: bb3]; // scope 0 at $DIR/const_goto_const_eval_fail.rs:+1:5: +6:6
++         switchInt(_1) -> [0: bb4, otherwise: bb3]; // scope 0 at $DIR/const_goto_const_eval_fail.rs:+1:5: +6:6
       }
   
       bb3: {
--         switchInt(_1) -> [false: bb5, otherwise: bb4]; // scope 0 at $DIR/const_goto_const_eval_fail.rs:+1:5: +6:6
+-         switchInt(_1) -> [0: bb5, otherwise: bb4]; // scope 0 at $DIR/const_goto_const_eval_fail.rs:+1:5: +6:6
 -     }
 - 
 -     bb4: {
diff --git a/src/test/mir-opt/const_goto_const_eval_fail.rs b/tests/mir-opt/const_goto_const_eval_fail.rs
index 3b85fe6ab..3b85fe6ab 100644
--- a/src/test/mir-opt/const_goto_const_eval_fail.rs
+++ b/tests/mir-opt/const_goto_const_eval_fail.rs
diff --git a/src/test/mir-opt/const_goto_storage.match_nested_if.ConstGoto.diff b/tests/mir-opt/const_goto_storage.match_nested_if.ConstGoto.diff
index 81c356cb1..f54577259 100644
--- a/src/test/mir-opt/const_goto_storage.match_nested_if.ConstGoto.diff
+++ b/tests/mir-opt/const_goto_storage.match_nested_if.ConstGoto.diff
@@ -23,10 +23,10 @@
 -         StorageLive(_5);                 // scope 0 at $DIR/const_goto_storage.rs:+2:21: +2:52
 -         StorageLive(_6);                 // scope 0 at $DIR/const_goto_storage.rs:+2:24: +2:28
 -         _6 = const true;                 // scope 0 at $DIR/const_goto_storage.rs:+2:24: +2:28
--         switchInt(move _6) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/const_goto_storage.rs:+2:24: +2:28
+-         switchInt(move _6) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/const_goto_storage.rs:+2:24: +2:28
 +         StorageLive(_2);                 // scope 0 at $DIR/const_goto_storage.rs:+2:24: +2:28
 +         _2 = const true;                 // scope 0 at $DIR/const_goto_storage.rs:+2:24: +2:28
-+         switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/const_goto_storage.rs:+2:24: +2:28
++         switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/const_goto_storage.rs:+2:24: +2:28
       }
   
       bb1: {
@@ -41,7 +41,7 @@
 - 
 -     bb3: {
 -         StorageDead(_6);                 // scope 0 at $DIR/const_goto_storage.rs:+2:51: +2:52
--         switchInt(move _5) -> [false: bb5, otherwise: bb4]; // scope 0 at $DIR/const_goto_storage.rs:+2:21: +2:52
+-         switchInt(move _5) -> [0: bb5, otherwise: bb4]; // scope 0 at $DIR/const_goto_storage.rs:+2:21: +2:52
 -     }
 - 
 -     bb4: {
@@ -56,7 +56,7 @@
 - 
 -     bb6: {
 -         StorageDead(_5);                 // scope 0 at $DIR/const_goto_storage.rs:+2:75: +2:76
--         switchInt(move _4) -> [false: bb8, otherwise: bb7]; // scope 0 at $DIR/const_goto_storage.rs:+2:18: +2:76
+-         switchInt(move _4) -> [0: bb8, otherwise: bb7]; // scope 0 at $DIR/const_goto_storage.rs:+2:18: +2:76
 -     }
 - 
 -     bb7: {
@@ -70,7 +70,7 @@
 -     }
 - 
 -     bb9: {
--         switchInt(move _3) -> [false: bb11, otherwise: bb10]; // scope 0 at $DIR/const_goto_storage.rs:+2:15: +6:10
+-         switchInt(move _3) -> [0: bb11, otherwise: bb10]; // scope 0 at $DIR/const_goto_storage.rs:+2:15: +6:10
 -     }
 - 
 -     bb10: {
diff --git a/src/test/mir-opt/const_goto_storage.rs b/tests/mir-opt/const_goto_storage.rs
index 459599c73..459599c73 100644
--- a/src/test/mir-opt/const_goto_storage.rs
+++ b/tests/mir-opt/const_goto_storage.rs
diff --git a/src/test/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir
index 028480bdc..028480bdc 100644
--- a/src/test/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir
+++ b/tests/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir
diff --git a/src/test/mir-opt/const_promotion_extern_static.BAR.PromoteTemps.diff b/tests/mir-opt/const_promotion_extern_static.BAR.PromoteTemps.diff
index 2ef437811..2ef437811 100644
--- a/src/test/mir-opt/const_promotion_extern_static.BAR.PromoteTemps.diff
+++ b/tests/mir-opt/const_promotion_extern_static.BAR.PromoteTemps.diff
diff --git a/src/test/mir-opt/const_promotion_extern_static.BOP.built.after.mir b/tests/mir-opt/const_promotion_extern_static.BOP.built.after.mir
index 476fc49a1..476fc49a1 100644
--- a/src/test/mir-opt/const_promotion_extern_static.BOP.built.after.mir
+++ b/tests/mir-opt/const_promotion_extern_static.BOP.built.after.mir
diff --git a/src/test/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir
index 41657b53f..41657b53f 100644
--- a/src/test/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir
+++ b/tests/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir
diff --git a/src/test/mir-opt/const_promotion_extern_static.FOO.PromoteTemps.diff b/tests/mir-opt/const_promotion_extern_static.FOO.PromoteTemps.diff
index 25ba0face..25ba0face 100644
--- a/src/test/mir-opt/const_promotion_extern_static.FOO.PromoteTemps.diff
+++ b/tests/mir-opt/const_promotion_extern_static.FOO.PromoteTemps.diff
diff --git a/src/test/mir-opt/const_promotion_extern_static.rs b/tests/mir-opt/const_promotion_extern_static.rs
index e4261cfe5..e4261cfe5 100644
--- a/src/test/mir-opt/const_promotion_extern_static.rs
+++ b/tests/mir-opt/const_promotion_extern_static.rs
diff --git a/src/test/mir-opt/const_prop/aggregate.main.ConstProp.diff b/tests/mir-opt/const_prop/aggregate.main.ConstProp.diff
index 04378dbf3..04378dbf3 100644
--- a/src/test/mir-opt/const_prop/aggregate.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/aggregate.main.ConstProp.diff
diff --git a/src/test/mir-opt/const_prop/aggregate.main.PreCodegen.after.mir b/tests/mir-opt/const_prop/aggregate.main.PreCodegen.after.mir
index cfc9a72e3..cfc9a72e3 100644
--- a/src/test/mir-opt/const_prop/aggregate.main.PreCodegen.after.mir
+++ b/tests/mir-opt/const_prop/aggregate.main.PreCodegen.after.mir
diff --git a/src/test/mir-opt/const_prop/aggregate.rs b/tests/mir-opt/const_prop/aggregate.rs
index 6a3080384..6a3080384 100644
--- a/src/test/mir-opt/const_prop/aggregate.rs
+++ b/tests/mir-opt/const_prop/aggregate.rs
diff --git a/src/test/mir-opt/const_prop/array_index.main.ConstProp.32bit.diff b/tests/mir-opt/const_prop/array_index.main.ConstProp.32bit.diff
index 439b2a3e1..439b2a3e1 100644
--- a/src/test/mir-opt/const_prop/array_index.main.ConstProp.32bit.diff
+++ b/tests/mir-opt/const_prop/array_index.main.ConstProp.32bit.diff
diff --git a/src/test/mir-opt/const_prop/array_index.main.ConstProp.64bit.diff b/tests/mir-opt/const_prop/array_index.main.ConstProp.64bit.diff
index 439b2a3e1..439b2a3e1 100644
--- a/src/test/mir-opt/const_prop/array_index.main.ConstProp.64bit.diff
+++ b/tests/mir-opt/const_prop/array_index.main.ConstProp.64bit.diff
diff --git a/src/test/mir-opt/const_prop/array_index.rs b/tests/mir-opt/const_prop/array_index.rs
index d31c2827b..d31c2827b 100644
--- a/src/test/mir-opt/const_prop/array_index.rs
+++ b/tests/mir-opt/const_prop/array_index.rs
diff --git a/src/test/mir-opt/const_prop/bad_op_div_by_zero.main.ConstProp.diff b/tests/mir-opt/const_prop/bad_op_div_by_zero.main.ConstProp.diff
index bea32a67e..bea32a67e 100644
--- a/src/test/mir-opt/const_prop/bad_op_div_by_zero.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/bad_op_div_by_zero.main.ConstProp.diff
diff --git a/src/test/mir-opt/const_prop/bad_op_div_by_zero.rs b/tests/mir-opt/const_prop/bad_op_div_by_zero.rs
index a6fd325ec..a6fd325ec 100644
--- a/src/test/mir-opt/const_prop/bad_op_div_by_zero.rs
+++ b/tests/mir-opt/const_prop/bad_op_div_by_zero.rs
diff --git a/src/test/mir-opt/const_prop/bad_op_mod_by_zero.main.ConstProp.diff b/tests/mir-opt/const_prop/bad_op_mod_by_zero.main.ConstProp.diff
index 221513042..8485703e3 100644
--- a/src/test/mir-opt/const_prop/bad_op_mod_by_zero.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/bad_op_mod_by_zero.main.ConstProp.diff
@@ -45,7 +45,6 @@
 -         _2 = Rem(const 1_i32, move _3);  // scope 1 at $DIR/bad_op_mod_by_zero.rs:+2:14: +2:19
 +         _2 = Rem(const 1_i32, const 0_i32); // scope 1 at $DIR/bad_op_mod_by_zero.rs:+2:14: +2:19
           StorageDead(_3);                 // scope 1 at $DIR/bad_op_mod_by_zero.rs:+2:18: +2:19
-          nop;                             // scope 0 at $DIR/bad_op_mod_by_zero.rs:+0:11: +3:2
           StorageDead(_2);                 // scope 1 at $DIR/bad_op_mod_by_zero.rs:+3:1: +3:2
           StorageDead(_1);                 // scope 0 at $DIR/bad_op_mod_by_zero.rs:+3:1: +3:2
           return;                          // scope 0 at $DIR/bad_op_mod_by_zero.rs:+3:2: +3:2
diff --git a/src/test/mir-opt/const_prop/bad_op_mod_by_zero.rs b/tests/mir-opt/const_prop/bad_op_mod_by_zero.rs
index cc16a4a5a..cc16a4a5a 100644
--- a/src/test/mir-opt/const_prop/bad_op_mod_by_zero.rs
+++ b/tests/mir-opt/const_prop/bad_op_mod_by_zero.rs
diff --git a/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.diff b/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.diff
new file mode 100644
index 000000000..27e41d486
--- /dev/null
+++ b/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.diff
@@ -0,0 +1,54 @@
+- // MIR for `main` before ConstProp
++ // MIR for `main` after ConstProp
+  
+  fn main() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+0:11: +0:11
+      let _1: *const [i32];                // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:9: +1:10
+      let mut _2: *const [i32; 3];         // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+      let _3: &[i32; 3];                   // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+      let _5: usize;                       // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:23: +3:24
+      let mut _6: usize;                   // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
+      let mut _7: bool;                    // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
+      let mut _8: &[i32; 3];               // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+      scope 1 {
+          debug a => _1;                   // in scope 1 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:9: +1:10
+          scope 2 {
+              let _4: i32;                 // in scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:13: +3:15
+              scope 3 {
+                  debug _b => _4;          // in scope 3 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:13: +3:15
+              }
+          }
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:9: +1:10
+          StorageLive(_2);                 // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+          StorageLive(_3);                 // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+          _8 = const _;                    // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+                                           // mir::Constant
+                                           // + span: $DIR/bad_op_unsafe_oob_for_slices.rs:5:25: 5:35
+                                           // + literal: Const { ty: &[i32; 3], val: Unevaluated(main, [], Some(promoted[0])) }
+          _3 = _8;                         // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+          _2 = &raw const (*_3);           // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+          _1 = move _2 as *const [i32] (Pointer(Unsize)); // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+          StorageDead(_2);                 // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:34: +1:35
+          StorageDead(_3);                 // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:35: +1:36
+          StorageLive(_4);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:13: +3:15
+          StorageLive(_5);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:23: +3:24
+          _5 = const 3_usize;              // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:23: +3:24
+          _6 = Len((*_1));                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
+-         _7 = Lt(_5, _6);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
+-         assert(move _7, "index out of bounds: the length is {} but the index is {}", move _6, _5) -> bb1; // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
++         _7 = Lt(const 3_usize, _6);      // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
++         assert(move _7, "index out of bounds: the length is {} but the index is {}", move _6, const 3_usize) -> bb1; // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
+      }
+  
+      bb1: {
+          _4 = (*_1)[_5];                  // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
+          StorageDead(_5);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:25: +3:26
+          StorageDead(_4);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+4:5: +4:6
+          StorageDead(_1);                 // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+5:1: +5:2
+          return;                          // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+5:2: +5:2
+      }
+  }
+  
diff --git a/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.64bit.diff b/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.64bit.diff
new file mode 100644
index 000000000..27e41d486
--- /dev/null
+++ b/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.64bit.diff
@@ -0,0 +1,54 @@
+- // MIR for `main` before ConstProp
++ // MIR for `main` after ConstProp
+  
+  fn main() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+0:11: +0:11
+      let _1: *const [i32];                // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:9: +1:10
+      let mut _2: *const [i32; 3];         // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+      let _3: &[i32; 3];                   // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+      let _5: usize;                       // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:23: +3:24
+      let mut _6: usize;                   // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
+      let mut _7: bool;                    // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
+      let mut _8: &[i32; 3];               // in scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+      scope 1 {
+          debug a => _1;                   // in scope 1 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:9: +1:10
+          scope 2 {
+              let _4: i32;                 // in scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:13: +3:15
+              scope 3 {
+                  debug _b => _4;          // in scope 3 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:13: +3:15
+              }
+          }
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:9: +1:10
+          StorageLive(_2);                 // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+          StorageLive(_3);                 // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+          _8 = const _;                    // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+                                           // mir::Constant
+                                           // + span: $DIR/bad_op_unsafe_oob_for_slices.rs:5:25: 5:35
+                                           // + literal: Const { ty: &[i32; 3], val: Unevaluated(main, [], Some(promoted[0])) }
+          _3 = _8;                         // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+          _2 = &raw const (*_3);           // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+          _1 = move _2 as *const [i32] (Pointer(Unsize)); // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
+          StorageDead(_2);                 // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:34: +1:35
+          StorageDead(_3);                 // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:35: +1:36
+          StorageLive(_4);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:13: +3:15
+          StorageLive(_5);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:23: +3:24
+          _5 = const 3_usize;              // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:23: +3:24
+          _6 = Len((*_1));                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
+-         _7 = Lt(_5, _6);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
+-         assert(move _7, "index out of bounds: the length is {} but the index is {}", move _6, _5) -> bb1; // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
++         _7 = Lt(const 3_usize, _6);      // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
++         assert(move _7, "index out of bounds: the length is {} but the index is {}", move _6, const 3_usize) -> bb1; // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
+      }
+  
+      bb1: {
+          _4 = (*_1)[_5];                  // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
+          StorageDead(_5);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:25: +3:26
+          StorageDead(_4);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+4:5: +4:6
+          StorageDead(_1);                 // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+5:1: +5:2
+          return;                          // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+5:2: +5:2
+      }
+  }
+  
diff --git a/src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.rs b/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.rs
index cf22b06d5..cf22b06d5 100644
--- a/src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.rs
+++ b/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.rs
diff --git a/src/test/mir-opt/const_prop/boolean_identities.rs b/tests/mir-opt/const_prop/boolean_identities.rs
index c7b609949..c7b609949 100644
--- a/src/test/mir-opt/const_prop/boolean_identities.rs
+++ b/tests/mir-opt/const_prop/boolean_identities.rs
diff --git a/src/test/mir-opt/const_prop/boolean_identities.test.ConstProp.diff b/tests/mir-opt/const_prop/boolean_identities.test.ConstProp.diff
index 0de800917..0de800917 100644
--- a/src/test/mir-opt/const_prop/boolean_identities.test.ConstProp.diff
+++ b/tests/mir-opt/const_prop/boolean_identities.test.ConstProp.diff
diff --git a/src/test/mir-opt/const_prop/boxes.main.ConstProp.diff b/tests/mir-opt/const_prop/boxes.main.ConstProp.diff
index 5ec421eb2..5ec421eb2 100644
--- a/src/test/mir-opt/const_prop/boxes.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/boxes.main.ConstProp.diff
diff --git a/src/test/mir-opt/const_prop/boxes.rs b/tests/mir-opt/const_prop/boxes.rs
index d287830db..d287830db 100644
--- a/src/test/mir-opt/const_prop/boxes.rs
+++ b/tests/mir-opt/const_prop/boxes.rs
diff --git a/src/test/mir-opt/const_prop/cast.main.ConstProp.diff b/tests/mir-opt/const_prop/cast.main.ConstProp.diff
index 1d4dfc29f..1d4dfc29f 100644
--- a/src/test/mir-opt/const_prop/cast.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/cast.main.ConstProp.diff
diff --git a/src/test/mir-opt/const_prop/cast.rs b/tests/mir-opt/const_prop/cast.rs
index 984086eda..984086eda 100644
--- a/src/test/mir-opt/const_prop/cast.rs
+++ b/tests/mir-opt/const_prop/cast.rs
diff --git a/src/test/mir-opt/const_prop/checked_add.main.ConstProp.diff b/tests/mir-opt/const_prop/checked_add.main.ConstProp.diff
index 96d0d2566..96d0d2566 100644
--- a/src/test/mir-opt/const_prop/checked_add.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/checked_add.main.ConstProp.diff
diff --git a/src/test/mir-opt/const_prop/checked_add.rs b/tests/mir-opt/const_prop/checked_add.rs
index b9860da4c..b9860da4c 100644
--- a/src/test/mir-opt/const_prop/checked_add.rs
+++ b/tests/mir-opt/const_prop/checked_add.rs
diff --git a/src/test/mir-opt/const_prop/const_prop_fails_gracefully.main.ConstProp.diff b/tests/mir-opt/const_prop/const_prop_fails_gracefully.main.ConstProp.diff
index bea7114c7..bea7114c7 100644
--- a/src/test/mir-opt/const_prop/const_prop_fails_gracefully.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/const_prop_fails_gracefully.main.ConstProp.diff
diff --git a/src/test/mir-opt/const_prop/const_prop_fails_gracefully.rs b/tests/mir-opt/const_prop/const_prop_fails_gracefully.rs
index 0a3dcbd38..0a3dcbd38 100644
--- a/src/test/mir-opt/const_prop/const_prop_fails_gracefully.rs
+++ b/tests/mir-opt/const_prop/const_prop_fails_gracefully.rs
diff --git a/src/test/mir-opt/const_prop/control_flow_simplification.hello.ConstProp.diff b/tests/mir-opt/const_prop/control_flow_simplification.hello.ConstProp.diff
index 8b3b9d0a4..f270ab8b6 100644
--- a/src/test/mir-opt/const_prop/control_flow_simplification.hello.ConstProp.diff
+++ b/tests/mir-opt/const_prop/control_flow_simplification.hello.ConstProp.diff
@@ -9,8 +9,8 @@
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/control_flow_simplification.rs:+1:8: +1:21
           _1 = const _;                    // scope 0 at $DIR/control_flow_simplification.rs:+1:8: +1:21
--         switchInt(move _1) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/control_flow_simplification.rs:+1:8: +1:21
-+         switchInt(const false) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/control_flow_simplification.rs:+1:8: +1:21
+-         switchInt(move _1) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/control_flow_simplification.rs:+1:8: +1:21
++         switchInt(const false) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/control_flow_simplification.rs:+1:8: +1:21
       }
   
       bb1: {
@@ -25,7 +25,6 @@
       }
   
       bb2: {
-          nop;                             // scope 0 at $DIR/control_flow_simplification.rs:+3:6: +3:6
           StorageDead(_1);                 // scope 0 at $DIR/control_flow_simplification.rs:+3:5: +3:6
           return;                          // scope 0 at $DIR/control_flow_simplification.rs:+4:2: +4:2
       }
diff --git a/src/test/mir-opt/const_prop/control_flow_simplification.hello.PreCodegen.before.mir b/tests/mir-opt/const_prop/control_flow_simplification.hello.PreCodegen.before.mir
index 9f7528f0c..9f7528f0c 100644
--- a/src/test/mir-opt/const_prop/control_flow_simplification.hello.PreCodegen.before.mir
+++ b/tests/mir-opt/const_prop/control_flow_simplification.hello.PreCodegen.before.mir
diff --git a/src/test/mir-opt/const_prop/control_flow_simplification.rs b/tests/mir-opt/const_prop/control_flow_simplification.rs
index 7dbe8e734..7dbe8e734 100644
--- a/src/test/mir-opt/const_prop/control_flow_simplification.rs
+++ b/tests/mir-opt/const_prop/control_flow_simplification.rs
diff --git a/src/test/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff b/tests/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff
index 6b29bb59c..b4dccecc6 100644
--- a/src/test/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff
+++ b/tests/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff
@@ -21,13 +21,13 @@
           ((_3 as Some).0: bool) = const true; // scope 2 at $DIR/discriminant.rs:+1:34: +1:44
           discriminant(_3) = 1;            // scope 2 at $DIR/discriminant.rs:+1:34: +1:44
 -         _4 = discriminant(_3);           // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
--         switchInt(move _4) -> [1_isize: bb1, otherwise: bb3]; // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
+-         switchInt(move _4) -> [1: bb1, otherwise: bb3]; // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
 +         _4 = const 1_isize;              // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
-+         switchInt(const 1_isize) -> [1_isize: bb1, otherwise: bb3]; // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
++         switchInt(const 1_isize) -> [1: bb1, otherwise: bb3]; // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
       }
   
       bb1: {
-          switchInt(((_3 as Some).0: bool)) -> [false: bb3, otherwise: bb2]; // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
+          switchInt(((_3 as Some).0: bool)) -> [0: bb3, otherwise: bb2]; // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
       }
   
       bb2: {
diff --git a/src/test/mir-opt/const_prop/discriminant.main.ConstProp.64bit.diff b/tests/mir-opt/const_prop/discriminant.main.ConstProp.64bit.diff
index 6b29bb59c..b4dccecc6 100644
--- a/src/test/mir-opt/const_prop/discriminant.main.ConstProp.64bit.diff
+++ b/tests/mir-opt/const_prop/discriminant.main.ConstProp.64bit.diff
@@ -21,13 +21,13 @@
           ((_3 as Some).0: bool) = const true; // scope 2 at $DIR/discriminant.rs:+1:34: +1:44
           discriminant(_3) = 1;            // scope 2 at $DIR/discriminant.rs:+1:34: +1:44
 -         _4 = discriminant(_3);           // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
--         switchInt(move _4) -> [1_isize: bb1, otherwise: bb3]; // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
+-         switchInt(move _4) -> [1: bb1, otherwise: bb3]; // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
 +         _4 = const 1_isize;              // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
-+         switchInt(const 1_isize) -> [1_isize: bb1, otherwise: bb3]; // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
++         switchInt(const 1_isize) -> [1: bb1, otherwise: bb3]; // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
       }
   
       bb1: {
-          switchInt(((_3 as Some).0: bool)) -> [false: bb3, otherwise: bb2]; // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
+          switchInt(((_3 as Some).0: bool)) -> [0: bb3, otherwise: bb2]; // scope 2 at $DIR/discriminant.rs:+1:21: +1:31
       }
   
       bb2: {
diff --git a/src/test/mir-opt/const_prop/discriminant.rs b/tests/mir-opt/const_prop/discriminant.rs
index fdd67ca8a..fdd67ca8a 100644
--- a/src/test/mir-opt/const_prop/discriminant.rs
+++ b/tests/mir-opt/const_prop/discriminant.rs
diff --git a/src/test/mir-opt/const_prop/indirect.main.ConstProp.diff b/tests/mir-opt/const_prop/indirect.main.ConstProp.diff
index f4c0c5c5e..f4c0c5c5e 100644
--- a/src/test/mir-opt/const_prop/indirect.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/indirect.main.ConstProp.diff
diff --git a/src/test/mir-opt/const_prop/indirect.rs b/tests/mir-opt/const_prop/indirect.rs
index 44916cbfe..44916cbfe 100644
--- a/src/test/mir-opt/const_prop/indirect.rs
+++ b/tests/mir-opt/const_prop/indirect.rs
diff --git a/src/test/mir-opt/const_prop/invalid_constant.main.ConstProp.diff b/tests/mir-opt/const_prop/invalid_constant.main.ConstProp.diff
index 67a4dc3c0..6c4757c1a 100644
--- a/src/test/mir-opt/const_prop/invalid_constant.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/invalid_constant.main.ConstProp.diff
@@ -7,8 +7,6 @@
       let mut _2: main::InvalidChar;       // in scope 0 at $DIR/invalid_constant.rs:+6:34: +6:63
       let mut _4: E;                       // in scope 0 at $DIR/invalid_constant.rs:+13:25: +13:59
       let mut _5: main::InvalidTag;        // in scope 0 at $DIR/invalid_constant.rs:+13:34: +13:55
-      let mut _7: Empty;                   // in scope 0 at $DIR/invalid_constant.rs:+20:35: +20:73
-      let mut _8: main::NoVariants;        // in scope 0 at $DIR/invalid_constant.rs:+20:44: +20:65
       scope 1 {
           debug _invalid_char => _1;       // in scope 1 at $DIR/invalid_constant.rs:+6:9: +6:22
           let _3: [E; 1];                  // in scope 1 at $DIR/invalid_constant.rs:+13:9: +13:21
@@ -17,9 +15,9 @@
               let _6: [Empty; 1];          // in scope 3 at $DIR/invalid_constant.rs:+20:9: +20:31
               scope 5 {
                   debug _enum_without_variants => _6; // in scope 5 at $DIR/invalid_constant.rs:+20:9: +20:31
-                  let _9: main::Str<"���">; // in scope 5 at $DIR/invalid_constant.rs:+24:9: +24:22
+                  let _7: main::Str<"���">; // in scope 5 at $DIR/invalid_constant.rs:+24:9: +24:22
                   scope 7 {
-                      debug _non_utf8_str => _9; // in scope 7 at $DIR/invalid_constant.rs:+24:9: +24:22
+                      debug _non_utf8_str => _7; // in scope 7 at $DIR/invalid_constant.rs:+24:9: +24:22
                   }
               }
               scope 6 {
@@ -57,17 +55,8 @@
           StorageDead(_4);                 // scope 1 at $DIR/invalid_constant.rs:+13:59: +13:60
           StorageDead(_5);                 // scope 1 at $DIR/invalid_constant.rs:+13:60: +13:61
           StorageLive(_6);                 // scope 3 at $DIR/invalid_constant.rs:+20:9: +20:31
-          StorageLive(_7);                 // scope 3 at $DIR/invalid_constant.rs:+20:35: +20:73
-          StorageLive(_8);                 // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:65
-          Deinit(_8);                      // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:65
-          (_8.0: u32) = const 0_u32;       // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:65
-          nop;                             // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:71
-          nop;                             // scope 3 at $DIR/invalid_constant.rs:+20:34: +20:74
-          StorageDead(_7);                 // scope 3 at $DIR/invalid_constant.rs:+20:73: +20:74
-          StorageDead(_8);                 // scope 3 at $DIR/invalid_constant.rs:+20:74: +20:75
-          StorageLive(_9);                 // scope 5 at $DIR/invalid_constant.rs:+24:9: +24:22
-          nop;                             // scope 0 at $DIR/invalid_constant.rs:+0:11: +27:2
-          StorageDead(_9);                 // scope 5 at $DIR/invalid_constant.rs:+27:1: +27:2
+          StorageLive(_7);                 // scope 5 at $DIR/invalid_constant.rs:+24:9: +24:22
+          StorageDead(_7);                 // scope 5 at $DIR/invalid_constant.rs:+27:1: +27:2
           StorageDead(_6);                 // scope 3 at $DIR/invalid_constant.rs:+27:1: +27:2
           StorageDead(_3);                 // scope 1 at $DIR/invalid_constant.rs:+27:1: +27:2
           StorageDead(_1);                 // scope 0 at $DIR/invalid_constant.rs:+27:1: +27:2
diff --git a/src/test/mir-opt/const_prop/invalid_constant.rs b/tests/mir-opt/const_prop/invalid_constant.rs
index 0337a7ca8..0337a7ca8 100644
--- a/src/test/mir-opt/const_prop/invalid_constant.rs
+++ b/tests/mir-opt/const_prop/invalid_constant.rs
diff --git a/tests/mir-opt/const_prop/issue_66971.main.ConstProp.diff b/tests/mir-opt/const_prop/issue_66971.main.ConstProp.diff
new file mode 100644
index 000000000..488e772d0
--- /dev/null
+++ b/tests/mir-opt/const_prop/issue_66971.main.ConstProp.diff
@@ -0,0 +1,27 @@
+- // MIR for `main` before ConstProp
++ // MIR for `main` after ConstProp
+  
+  fn main() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/issue_66971.rs:+0:11: +0:11
+      let _1: ();                          // in scope 0 at $DIR/issue_66971.rs:+1:5: +1:23
+      let mut _2: ((), u8, u8);            // in scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/issue_66971.rs:+1:5: +1:23
+          StorageLive(_2);                 // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
+          Deinit(_2);                      // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
+          (_2.1: u8) = const 0_u8;         // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
+          (_2.2: u8) = const 0_u8;         // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
+          _1 = encode(move _2) -> bb1;     // scope 0 at $DIR/issue_66971.rs:+1:5: +1:23
+                                           // mir::Constant
+                                           // + span: $DIR/issue_66971.rs:17:5: 17:11
+                                           // + literal: Const { ty: fn(((), u8, u8)) {encode}, val: Value(<ZST>) }
+      }
+  
+      bb1: {
+          StorageDead(_2);                 // scope 0 at $DIR/issue_66971.rs:+1:22: +1:23
+          StorageDead(_1);                 // scope 0 at $DIR/issue_66971.rs:+1:23: +1:24
+          return;                          // scope 0 at $DIR/issue_66971.rs:+2:2: +2:2
+      }
+  }
+  
diff --git a/src/test/mir-opt/const_prop/issue_66971.rs b/tests/mir-opt/const_prop/issue_66971.rs
index 6ca03438e..6ca03438e 100644
--- a/src/test/mir-opt/const_prop/issue_66971.rs
+++ b/tests/mir-opt/const_prop/issue_66971.rs
diff --git a/src/test/mir-opt/const_prop/issue_67019.main.ConstProp.diff b/tests/mir-opt/const_prop/issue_67019.main.ConstProp.diff
index 79cd8bf48..cd5304859 100644
--- a/src/test/mir-opt/const_prop/issue_67019.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/issue_67019.main.ConstProp.diff
@@ -27,7 +27,6 @@
       bb1: {
           StorageDead(_2);                 // scope 0 at $DIR/issue_67019.rs:+1:19: +1:20
           StorageDead(_1);                 // scope 0 at $DIR/issue_67019.rs:+1:20: +1:21
-          nop;                             // scope 0 at $DIR/issue_67019.rs:+0:11: +2:2
           return;                          // scope 0 at $DIR/issue_67019.rs:+2:2: +2:2
       }
   }
diff --git a/src/test/mir-opt/const_prop/issue_67019.rs b/tests/mir-opt/const_prop/issue_67019.rs
index ffc6fa1f2..ffc6fa1f2 100644
--- a/src/test/mir-opt/const_prop/issue_67019.rs
+++ b/tests/mir-opt/const_prop/issue_67019.rs
diff --git a/src/test/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.diff b/tests/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.diff
index 96de39258..5331e5b82 100644
--- a/src/test/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.diff
+++ b/tests/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.diff
@@ -29,7 +29,6 @@
           _1 = _2[_3];                     // scope 0 at $DIR/large_array_index.rs:+2:17: +2:32
           StorageDead(_3);                 // scope 0 at $DIR/large_array_index.rs:+2:32: +2:33
           StorageDead(_2);                 // scope 0 at $DIR/large_array_index.rs:+2:32: +2:33
-          nop;                             // scope 0 at $DIR/large_array_index.rs:+0:11: +3:2
           StorageDead(_1);                 // scope 0 at $DIR/large_array_index.rs:+3:1: +3:2
           return;                          // scope 0 at $DIR/large_array_index.rs:+3:2: +3:2
       }
diff --git a/src/test/mir-opt/const_prop/large_array_index.main.ConstProp.64bit.diff b/tests/mir-opt/const_prop/large_array_index.main.ConstProp.64bit.diff
index 96de39258..5331e5b82 100644
--- a/src/test/mir-opt/const_prop/large_array_index.main.ConstProp.64bit.diff
+++ b/tests/mir-opt/const_prop/large_array_index.main.ConstProp.64bit.diff
@@ -29,7 +29,6 @@
           _1 = _2[_3];                     // scope 0 at $DIR/large_array_index.rs:+2:17: +2:32
           StorageDead(_3);                 // scope 0 at $DIR/large_array_index.rs:+2:32: +2:33
           StorageDead(_2);                 // scope 0 at $DIR/large_array_index.rs:+2:32: +2:33
-          nop;                             // scope 0 at $DIR/large_array_index.rs:+0:11: +3:2
           StorageDead(_1);                 // scope 0 at $DIR/large_array_index.rs:+3:1: +3:2
           return;                          // scope 0 at $DIR/large_array_index.rs:+3:2: +3:2
       }
diff --git a/src/test/mir-opt/const_prop/large_array_index.rs b/tests/mir-opt/const_prop/large_array_index.rs
index 48d134376..48d134376 100644
--- a/src/test/mir-opt/const_prop/large_array_index.rs
+++ b/tests/mir-opt/const_prop/large_array_index.rs
diff --git a/src/test/mir-opt/const_prop/mult_by_zero.rs b/tests/mir-opt/const_prop/mult_by_zero.rs
index c839f92f2..c839f92f2 100644
--- a/src/test/mir-opt/const_prop/mult_by_zero.rs
+++ b/tests/mir-opt/const_prop/mult_by_zero.rs
diff --git a/src/test/mir-opt/const_prop/mult_by_zero.test.ConstProp.diff b/tests/mir-opt/const_prop/mult_by_zero.test.ConstProp.diff
index 629c8e601..629c8e601 100644
--- a/src/test/mir-opt/const_prop/mult_by_zero.test.ConstProp.diff
+++ b/tests/mir-opt/const_prop/mult_by_zero.test.ConstProp.diff
diff --git a/src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff b/tests/mir-opt/const_prop/mutable_variable.main.ConstProp.diff
index 3bbd6a87f..a672c457a 100644
--- a/src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/mutable_variable.main.ConstProp.diff
@@ -19,7 +19,6 @@
           StorageLive(_2);                 // scope 1 at $DIR/mutable_variable.rs:+3:9: +3:10
 -         _2 = _1;                         // scope 1 at $DIR/mutable_variable.rs:+3:13: +3:14
 +         _2 = const 99_i32;               // scope 1 at $DIR/mutable_variable.rs:+3:13: +3:14
-          nop;                             // scope 0 at $DIR/mutable_variable.rs:+0:11: +4:2
           StorageDead(_2);                 // scope 1 at $DIR/mutable_variable.rs:+4:1: +4:2
           StorageDead(_1);                 // scope 0 at $DIR/mutable_variable.rs:+4:1: +4:2
           return;                          // scope 0 at $DIR/mutable_variable.rs:+4:2: +4:2
diff --git a/src/test/mir-opt/const_prop/mutable_variable.rs b/tests/mir-opt/const_prop/mutable_variable.rs
index cb01719dd..cb01719dd 100644
--- a/src/test/mir-opt/const_prop/mutable_variable.rs
+++ b/tests/mir-opt/const_prop/mutable_variable.rs
diff --git a/src/test/mir-opt/const_prop/mutable_variable_aggregate.main.ConstProp.diff b/tests/mir-opt/const_prop/mutable_variable_aggregate.main.ConstProp.diff
index fed6a98b9..f6bf52206 100644
--- a/src/test/mir-opt/const_prop/mutable_variable_aggregate.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/mutable_variable_aggregate.main.ConstProp.diff
@@ -21,7 +21,6 @@
           StorageLive(_2);                 // scope 1 at $DIR/mutable_variable_aggregate.rs:+3:9: +3:10
 -         _2 = _1;                         // scope 1 at $DIR/mutable_variable_aggregate.rs:+3:13: +3:14
 +         _2 = const (42_i32, 99_i32);     // scope 1 at $DIR/mutable_variable_aggregate.rs:+3:13: +3:14
-          nop;                             // scope 0 at $DIR/mutable_variable_aggregate.rs:+0:11: +4:2
           StorageDead(_2);                 // scope 1 at $DIR/mutable_variable_aggregate.rs:+4:1: +4:2
           StorageDead(_1);                 // scope 0 at $DIR/mutable_variable_aggregate.rs:+4:1: +4:2
           return;                          // scope 0 at $DIR/mutable_variable_aggregate.rs:+4:2: +4:2
diff --git a/src/test/mir-opt/const_prop/mutable_variable_aggregate.rs b/tests/mir-opt/const_prop/mutable_variable_aggregate.rs
index d4ff8d890..d4ff8d890 100644
--- a/src/test/mir-opt/const_prop/mutable_variable_aggregate.rs
+++ b/tests/mir-opt/const_prop/mutable_variable_aggregate.rs
diff --git a/src/test/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.ConstProp.diff b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.ConstProp.diff
index 90eebd8fe..213a70227 100644
--- a/src/test/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.ConstProp.diff
@@ -26,7 +26,6 @@
           ((*_2).1: i32) = const 99_i32;   // scope 2 at $DIR/mutable_variable_aggregate_mut_ref.rs:+3:5: +3:13
           StorageLive(_3);                 // scope 2 at $DIR/mutable_variable_aggregate_mut_ref.rs:+4:9: +4:10
           _3 = _1;                         // scope 2 at $DIR/mutable_variable_aggregate_mut_ref.rs:+4:13: +4:14
-          nop;                             // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:+0:11: +5:2
           StorageDead(_3);                 // scope 2 at $DIR/mutable_variable_aggregate_mut_ref.rs:+5:1: +5:2
           StorageDead(_2);                 // scope 1 at $DIR/mutable_variable_aggregate_mut_ref.rs:+5:1: +5:2
           StorageDead(_1);                 // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:+5:1: +5:2
diff --git a/src/test/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs
index 9060f7e9b..9060f7e9b 100644
--- a/src/test/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs
+++ b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs
diff --git a/src/test/mir-opt/const_prop/mutable_variable_aggregate_partial_read.main.ConstProp.diff b/tests/mir-opt/const_prop/mutable_variable_aggregate_partial_read.main.ConstProp.diff
index 6eda503c1..149aa6290 100644
--- a/src/test/mir-opt/const_prop/mutable_variable_aggregate_partial_read.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/mutable_variable_aggregate_partial_read.main.ConstProp.diff
@@ -26,7 +26,6 @@
           StorageLive(_2);                 // scope 1 at $DIR/mutable_variable_aggregate_partial_read.rs:+4:9: +4:10
 -         _2 = (_1.1: i32);                // scope 1 at $DIR/mutable_variable_aggregate_partial_read.rs:+4:13: +4:16
 +         _2 = const 99_i32;               // scope 1 at $DIR/mutable_variable_aggregate_partial_read.rs:+4:13: +4:16
-          nop;                             // scope 0 at $DIR/mutable_variable_aggregate_partial_read.rs:+0:11: +5:2
           StorageDead(_2);                 // scope 1 at $DIR/mutable_variable_aggregate_partial_read.rs:+5:1: +5:2
           StorageDead(_1);                 // scope 0 at $DIR/mutable_variable_aggregate_partial_read.rs:+5:1: +5:2
           return;                          // scope 0 at $DIR/mutable_variable_aggregate_partial_read.rs:+5:2: +5:2
diff --git a/src/test/mir-opt/const_prop/mutable_variable_aggregate_partial_read.rs b/tests/mir-opt/const_prop/mutable_variable_aggregate_partial_read.rs
index cb59509ff..cb59509ff 100644
--- a/src/test/mir-opt/const_prop/mutable_variable_aggregate_partial_read.rs
+++ b/tests/mir-opt/const_prop/mutable_variable_aggregate_partial_read.rs
diff --git a/tests/mir-opt/const_prop/mutable_variable_no_prop.main.ConstProp.diff b/tests/mir-opt/const_prop/mutable_variable_no_prop.main.ConstProp.diff
new file mode 100644
index 000000000..7fa29cccd
--- /dev/null
+++ b/tests/mir-opt/const_prop/mutable_variable_no_prop.main.ConstProp.diff
@@ -0,0 +1,43 @@
+- // MIR for `main` before ConstProp
++ // MIR for `main` after ConstProp
+  
+  fn main() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/mutable_variable_no_prop.rs:+0:11: +0:11
+      let mut _1: u32;                     // in scope 0 at $DIR/mutable_variable_no_prop.rs:+1:9: +1:14
+      let mut _2: u32;                     // in scope 0 at $DIR/mutable_variable_no_prop.rs:+3:13: +3:19
+      let mut _3: *mut u32;                // in scope 0 at $DIR/mutable_variable_no_prop.rs:+3:13: +3:19
+      scope 1 {
+          debug x => _1;                   // in scope 1 at $DIR/mutable_variable_no_prop.rs:+1:9: +1:14
+          let _4: u32;                     // in scope 1 at $DIR/mutable_variable_no_prop.rs:+5:9: +5:10
+          scope 2 {
+          }
+          scope 3 {
+              debug y => _4;               // in scope 3 at $DIR/mutable_variable_no_prop.rs:+5:9: +5:10
+          }
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/mutable_variable_no_prop.rs:+1:9: +1:14
+          _1 = const 42_u32;               // scope 0 at $DIR/mutable_variable_no_prop.rs:+1:17: +1:19
+          StorageLive(_2);                 // scope 2 at $DIR/mutable_variable_no_prop.rs:+3:13: +3:19
+          StorageLive(_3);                 // scope 2 at $DIR/mutable_variable_no_prop.rs:+3:13: +3:19
+          _3 = const {alloc1: *mut u32};   // scope 2 at $DIR/mutable_variable_no_prop.rs:+3:13: +3:19
+                                           // mir::Constant
+                                           // + span: $DIR/mutable_variable_no_prop.rs:10:13: 10:19
+                                           // + literal: Const { ty: *mut u32, val: Value(Scalar(alloc1)) }
+          _2 = (*_3);                      // scope 2 at $DIR/mutable_variable_no_prop.rs:+3:13: +3:19
+          _1 = move _2;                    // scope 2 at $DIR/mutable_variable_no_prop.rs:+3:9: +3:19
+          StorageDead(_2);                 // scope 2 at $DIR/mutable_variable_no_prop.rs:+3:18: +3:19
+          StorageDead(_3);                 // scope 2 at $DIR/mutable_variable_no_prop.rs:+3:19: +3:20
+          StorageLive(_4);                 // scope 1 at $DIR/mutable_variable_no_prop.rs:+5:9: +5:10
+          _4 = _1;                         // scope 1 at $DIR/mutable_variable_no_prop.rs:+5:13: +5:14
+          StorageDead(_4);                 // scope 1 at $DIR/mutable_variable_no_prop.rs:+6:1: +6:2
+          StorageDead(_1);                 // scope 0 at $DIR/mutable_variable_no_prop.rs:+6:1: +6:2
+          return;                          // scope 0 at $DIR/mutable_variable_no_prop.rs:+6:2: +6:2
+      }
+  }
+  
+  alloc1 (static: STATIC, size: 4, align: 4) {
+      42 42 42 42                                     │ BBBB
+  }
+  
diff --git a/src/test/mir-opt/const_prop/mutable_variable_no_prop.rs b/tests/mir-opt/const_prop/mutable_variable_no_prop.rs
index 8c23c5fcf..b69ec931a 100644
--- a/src/test/mir-opt/const_prop/mutable_variable_no_prop.rs
+++ b/tests/mir-opt/const_prop/mutable_variable_no_prop.rs
@@ -1,7 +1,7 @@
 // unit-test
 // compile-flags: -O
 
-static mut STATIC: u32 = 42;
+static mut STATIC: u32 = 0x42424242;
 
 // EMIT_MIR mutable_variable_no_prop.main.ConstProp.diff
 fn main() {
diff --git a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.ConstProp.diff b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.ConstProp.diff
new file mode 100644
index 000000000..c3f77b960
--- /dev/null
+++ b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.ConstProp.diff
@@ -0,0 +1,57 @@
+- // MIR for `main` before ConstProp
++ // MIR for `main` after ConstProp
+  
+  fn main() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/mutable_variable_unprop_assign.rs:+0:11: +0:11
+      let _1: i32;                         // in scope 0 at $DIR/mutable_variable_unprop_assign.rs:+1:9: +1:10
+      let mut _2: i32;                     // in scope 0 at $DIR/mutable_variable_unprop_assign.rs:+3:11: +3:12
+      scope 1 {
+          debug a => _1;                   // in scope 1 at $DIR/mutable_variable_unprop_assign.rs:+1:9: +1:10
+          let mut _5: i32;                 // in scope 1 at $DIR/mutable_variable_unprop_assign.rs:+2:9: +2:14
+          let mut _6: i32;                 // in scope 1 at $DIR/mutable_variable_unprop_assign.rs:+2:9: +2:14
+          scope 2 {
+              debug x => (i32, i32){ .0 => _5, .1 => _6, }; // in scope 2 at $DIR/mutable_variable_unprop_assign.rs:+2:9: +2:14
+              let _3: i32;                 // in scope 2 at $DIR/mutable_variable_unprop_assign.rs:+4:9: +4:10
+              scope 3 {
+                  debug y => _3;           // in scope 3 at $DIR/mutable_variable_unprop_assign.rs:+4:9: +4:10
+                  let _4: i32;             // in scope 3 at $DIR/mutable_variable_unprop_assign.rs:+5:9: +5:10
+                  scope 4 {
+                      debug z => _4;       // in scope 4 at $DIR/mutable_variable_unprop_assign.rs:+5:9: +5:10
+                  }
+              }
+          }
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/mutable_variable_unprop_assign.rs:+1:9: +1:10
+          _1 = foo() -> bb1;               // scope 0 at $DIR/mutable_variable_unprop_assign.rs:+1:13: +1:18
+                                           // mir::Constant
+                                           // + span: $DIR/mutable_variable_unprop_assign.rs:6:13: 6:16
+                                           // + literal: Const { ty: fn() -> i32 {foo}, val: Value(<ZST>) }
+      }
+  
+      bb1: {
+          StorageLive(_5);                 // scope 1 at $DIR/mutable_variable_unprop_assign.rs:+2:9: +2:14
+          StorageLive(_6);                 // scope 1 at $DIR/mutable_variable_unprop_assign.rs:+2:9: +2:14
+          Deinit(_5);                      // scope 1 at $DIR/mutable_variable_unprop_assign.rs:+2:29: +2:35
+          Deinit(_6);                      // scope 1 at $DIR/mutable_variable_unprop_assign.rs:+2:29: +2:35
+          _5 = const 1_i32;                // scope 1 at $DIR/mutable_variable_unprop_assign.rs:+2:29: +2:35
+          _6 = const 2_i32;                // scope 1 at $DIR/mutable_variable_unprop_assign.rs:+2:29: +2:35
+          StorageLive(_2);                 // scope 2 at $DIR/mutable_variable_unprop_assign.rs:+3:11: +3:12
+          _2 = _1;                         // scope 2 at $DIR/mutable_variable_unprop_assign.rs:+3:11: +3:12
+          _6 = move _2;                    // scope 2 at $DIR/mutable_variable_unprop_assign.rs:+3:5: +3:12
+          StorageDead(_2);                 // scope 2 at $DIR/mutable_variable_unprop_assign.rs:+3:11: +3:12
+          StorageLive(_3);                 // scope 2 at $DIR/mutable_variable_unprop_assign.rs:+4:9: +4:10
+          _3 = _6;                         // scope 2 at $DIR/mutable_variable_unprop_assign.rs:+4:13: +4:16
+          StorageLive(_4);                 // scope 3 at $DIR/mutable_variable_unprop_assign.rs:+5:9: +5:10
+-         _4 = _5;                         // scope 3 at $DIR/mutable_variable_unprop_assign.rs:+5:13: +5:16
++         _4 = const 1_i32;                // scope 3 at $DIR/mutable_variable_unprop_assign.rs:+5:13: +5:16
+          StorageDead(_4);                 // scope 3 at $DIR/mutable_variable_unprop_assign.rs:+6:1: +6:2
+          StorageDead(_3);                 // scope 2 at $DIR/mutable_variable_unprop_assign.rs:+6:1: +6:2
+          StorageDead(_5);                 // scope 1 at $DIR/mutable_variable_unprop_assign.rs:+6:1: +6:2
+          StorageDead(_6);                 // scope 1 at $DIR/mutable_variable_unprop_assign.rs:+6:1: +6:2
+          StorageDead(_1);                 // scope 0 at $DIR/mutable_variable_unprop_assign.rs:+6:1: +6:2
+          return;                          // scope 0 at $DIR/mutable_variable_unprop_assign.rs:+6:2: +6:2
+      }
+  }
+  
diff --git a/src/test/mir-opt/const_prop/mutable_variable_unprop_assign.rs b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs
index b077cfd3e..b077cfd3e 100644
--- a/src/test/mir-opt/const_prop/mutable_variable_unprop_assign.rs
+++ b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs
diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.32bit.diff b/tests/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.32bit.diff
index 7e8ebd31a..7c7aeac4c 100644
--- a/src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.32bit.diff
+++ b/tests/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.32bit.diff
@@ -9,9 +9,7 @@
       let _5: usize;                       // in scope 0 at $DIR/optimizes_into_variable.rs:+2:32: +2:33
       let mut _6: usize;                   // in scope 0 at $DIR/optimizes_into_variable.rs:+2:13: +2:34
       let mut _7: bool;                    // in scope 0 at $DIR/optimizes_into_variable.rs:+2:13: +2:34
-      let mut _9: Point;                   // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-      let mut _10: u32;                    // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-      let mut _11: u32;                    // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
+      let mut _9: u32;                     // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
       scope 1 {
           debug x => _1;                   // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
           let _3: i32;                     // in scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
@@ -53,17 +51,12 @@
           StorageDead(_5);                 // scope 1 at $DIR/optimizes_into_variable.rs:+2:34: +2:35
           StorageDead(_4);                 // scope 1 at $DIR/optimizes_into_variable.rs:+2:34: +2:35
           StorageLive(_8);                 // scope 2 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
-          StorageLive(_10);                // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-          StorageLive(_11);                // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-          Deinit(_10);                     // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-          Deinit(_11);                     // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-          _10 = const 12_u32;              // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-          _11 = const 42_u32;              // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
--         _8 = _11;                        // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:38
+          StorageLive(_9);                 // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
+          Deinit(_9);                      // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
+          _9 = const 42_u32;               // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
+-         _8 = _9;                         // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:38
 +         _8 = const 42_u32;               // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:38
-          StorageDead(_10);                // scope 2 at $DIR/optimizes_into_variable.rs:+3:38: +3:39
-          StorageDead(_11);                // scope 2 at $DIR/optimizes_into_variable.rs:+3:38: +3:39
-          nop;                             // scope 0 at $DIR/optimizes_into_variable.rs:+0:11: +4:2
+          StorageDead(_9);                 // scope 2 at $DIR/optimizes_into_variable.rs:+3:38: +3:39
           StorageDead(_8);                 // scope 2 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
           StorageDead(_3);                 // scope 1 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
           StorageDead(_1);                 // scope 0 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.64bit.diff b/tests/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.64bit.diff
index 7e8ebd31a..7c7aeac4c 100644
--- a/src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.64bit.diff
+++ b/tests/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.64bit.diff
@@ -9,9 +9,7 @@
       let _5: usize;                       // in scope 0 at $DIR/optimizes_into_variable.rs:+2:32: +2:33
       let mut _6: usize;                   // in scope 0 at $DIR/optimizes_into_variable.rs:+2:13: +2:34
       let mut _7: bool;                    // in scope 0 at $DIR/optimizes_into_variable.rs:+2:13: +2:34
-      let mut _9: Point;                   // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-      let mut _10: u32;                    // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-      let mut _11: u32;                    // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
+      let mut _9: u32;                     // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
       scope 1 {
           debug x => _1;                   // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
           let _3: i32;                     // in scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
@@ -53,17 +51,12 @@
           StorageDead(_5);                 // scope 1 at $DIR/optimizes_into_variable.rs:+2:34: +2:35
           StorageDead(_4);                 // scope 1 at $DIR/optimizes_into_variable.rs:+2:34: +2:35
           StorageLive(_8);                 // scope 2 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
-          StorageLive(_10);                // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-          StorageLive(_11);                // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-          Deinit(_10);                     // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-          Deinit(_11);                     // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-          _10 = const 12_u32;              // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
-          _11 = const 42_u32;              // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
--         _8 = _11;                        // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:38
+          StorageLive(_9);                 // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
+          Deinit(_9);                      // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
+          _9 = const 42_u32;               // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
+-         _8 = _9;                         // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:38
 +         _8 = const 42_u32;               // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:38
-          StorageDead(_10);                // scope 2 at $DIR/optimizes_into_variable.rs:+3:38: +3:39
-          StorageDead(_11);                // scope 2 at $DIR/optimizes_into_variable.rs:+3:38: +3:39
-          nop;                             // scope 0 at $DIR/optimizes_into_variable.rs:+0:11: +4:2
+          StorageDead(_9);                 // scope 2 at $DIR/optimizes_into_variable.rs:+3:38: +3:39
           StorageDead(_8);                 // scope 2 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
           StorageDead(_3);                 // scope 1 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
           StorageDead(_1);                 // scope 0 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.main.PreCodegen.after.32bit.mir b/tests/mir-opt/const_prop/optimizes_into_variable.main.PreCodegen.after.32bit.mir
index 9db87cfc8..9db87cfc8 100644
--- a/src/test/mir-opt/const_prop/optimizes_into_variable.main.PreCodegen.after.32bit.mir
+++ b/tests/mir-opt/const_prop/optimizes_into_variable.main.PreCodegen.after.32bit.mir
diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.main.PreCodegen.after.64bit.mir b/tests/mir-opt/const_prop/optimizes_into_variable.main.PreCodegen.after.64bit.mir
index 9db87cfc8..9db87cfc8 100644
--- a/src/test/mir-opt/const_prop/optimizes_into_variable.main.PreCodegen.after.64bit.mir
+++ b/tests/mir-opt/const_prop/optimizes_into_variable.main.PreCodegen.after.64bit.mir
diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.main.ScalarReplacementOfAggregates.32bit.diff b/tests/mir-opt/const_prop/optimizes_into_variable.main.ScalarReplacementOfAggregates.32bit.diff
index 3f9f3b2ea..3f9f3b2ea 100644
--- a/src/test/mir-opt/const_prop/optimizes_into_variable.main.ScalarReplacementOfAggregates.32bit.diff
+++ b/tests/mir-opt/const_prop/optimizes_into_variable.main.ScalarReplacementOfAggregates.32bit.diff
diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.main.ScalarReplacementOfAggregates.64bit.diff b/tests/mir-opt/const_prop/optimizes_into_variable.main.ScalarReplacementOfAggregates.64bit.diff
index 3f9f3b2ea..3f9f3b2ea 100644
--- a/src/test/mir-opt/const_prop/optimizes_into_variable.main.ScalarReplacementOfAggregates.64bit.diff
+++ b/tests/mir-opt/const_prop/optimizes_into_variable.main.ScalarReplacementOfAggregates.64bit.diff
diff --git a/tests/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals-final.after.32bit.mir b/tests/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals-final.after.32bit.mir
new file mode 100644
index 000000000..d926b9df7
--- /dev/null
+++ b/tests/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals-final.after.32bit.mir
@@ -0,0 +1,27 @@
+// MIR for `main` after SimplifyLocals-final
+
+fn main() -> () {
+    let mut _0: ();                      // return place in scope 0 at $DIR/optimizes_into_variable.rs:+0:11: +0:11
+    let _1: i32;                         // in scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
+    scope 1 {
+        debug x => _1;                   // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
+        let _2: i32;                     // in scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
+        scope 2 {
+            debug y => _2;               // in scope 2 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
+            let _3: u32;                 // in scope 2 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
+            scope 3 {
+                debug z => _3;           // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
+            }
+        }
+    }
+
+    bb0: {
+        StorageLive(_1);                 // scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
+        StorageLive(_2);                 // scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
+        StorageLive(_3);                 // scope 2 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
+        StorageDead(_3);                 // scope 2 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
+        StorageDead(_2);                 // scope 1 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
+        StorageDead(_1);                 // scope 0 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
+        return;                          // scope 0 at $DIR/optimizes_into_variable.rs:+4:2: +4:2
+    }
+}
diff --git a/tests/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals-final.after.64bit.mir b/tests/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals-final.after.64bit.mir
new file mode 100644
index 000000000..d926b9df7
--- /dev/null
+++ b/tests/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals-final.after.64bit.mir
@@ -0,0 +1,27 @@
+// MIR for `main` after SimplifyLocals-final
+
+fn main() -> () {
+    let mut _0: ();                      // return place in scope 0 at $DIR/optimizes_into_variable.rs:+0:11: +0:11
+    let _1: i32;                         // in scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
+    scope 1 {
+        debug x => _1;                   // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
+        let _2: i32;                     // in scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
+        scope 2 {
+            debug y => _2;               // in scope 2 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
+            let _3: u32;                 // in scope 2 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
+            scope 3 {
+                debug z => _3;           // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
+            }
+        }
+    }
+
+    bb0: {
+        StorageLive(_1);                 // scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
+        StorageLive(_2);                 // scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
+        StorageLive(_3);                 // scope 2 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
+        StorageDead(_3);                 // scope 2 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
+        StorageDead(_2);                 // scope 1 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
+        StorageDead(_1);                 // scope 0 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
+        return;                          // scope 0 at $DIR/optimizes_into_variable.rs:+4:2: +4:2
+    }
+}
diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.rs b/tests/mir-opt/const_prop/optimizes_into_variable.rs
index 025666548..abea07e20 100644
--- a/src/test/mir-opt/const_prop/optimizes_into_variable.rs
+++ b/tests/mir-opt/const_prop/optimizes_into_variable.rs
@@ -9,7 +9,7 @@ struct Point {
 // EMIT_MIR_FOR_EACH_BIT_WIDTH
 // EMIT_MIR optimizes_into_variable.main.ScalarReplacementOfAggregates.diff
 // EMIT_MIR optimizes_into_variable.main.ConstProp.diff
-// EMIT_MIR optimizes_into_variable.main.SimplifyLocals.after.mir
+// EMIT_MIR optimizes_into_variable.main.SimplifyLocals-final.after.mir
 // EMIT_MIR optimizes_into_variable.main.PreCodegen.after.mir
 fn main() {
     let x = 2 + 2;
diff --git a/src/test/mir-opt/const_prop/read_immutable_static.main.ConstProp.diff b/tests/mir-opt/const_prop/read_immutable_static.main.ConstProp.diff
index b9c283a54..388c6ca81 100644
--- a/src/test/mir-opt/const_prop/read_immutable_static.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/read_immutable_static.main.ConstProp.diff
@@ -36,7 +36,6 @@
           StorageDead(_2);                 // scope 0 at $DIR/read_immutable_static.rs:+1:21: +1:22
           StorageDead(_5);                 // scope 0 at $DIR/read_immutable_static.rs:+1:22: +1:23
           StorageDead(_3);                 // scope 0 at $DIR/read_immutable_static.rs:+1:22: +1:23
-          nop;                             // scope 0 at $DIR/read_immutable_static.rs:+0:11: +2:2
           StorageDead(_1);                 // scope 0 at $DIR/read_immutable_static.rs:+2:1: +2:2
           return;                          // scope 0 at $DIR/read_immutable_static.rs:+2:2: +2:2
       }
diff --git a/src/test/mir-opt/const_prop/read_immutable_static.rs b/tests/mir-opt/const_prop/read_immutable_static.rs
index 4f7afe6ca..4f7afe6ca 100644
--- a/src/test/mir-opt/const_prop/read_immutable_static.rs
+++ b/tests/mir-opt/const_prop/read_immutable_static.rs
diff --git a/src/test/mir-opt/const_prop/ref_deref.main.ConstProp.diff b/tests/mir-opt/const_prop/ref_deref.main.ConstProp.diff
index 09ce67ff1..8a73f0390 100644
--- a/src/test/mir-opt/const_prop/ref_deref.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/ref_deref.main.ConstProp.diff
@@ -13,7 +13,7 @@
           StorageLive(_2);                 // scope 0 at $DIR/ref_deref.rs:+1:6: +1:10
           _4 = const _;                    // scope 0 at $DIR/ref_deref.rs:+1:6: +1:10
                                            // mir::Constant
-                                           // + span: $DIR/ref_deref.rs:5:6: 5:10
+                                           // + span: $DIR/ref_deref.rs:6:6: 6:10
                                            // + literal: Const { ty: &i32, val: Unevaluated(main, [], Some(promoted[0])) }
           _2 = _4;                         // scope 0 at $DIR/ref_deref.rs:+1:6: +1:10
 -         _1 = (*_2);                      // scope 0 at $DIR/ref_deref.rs:+1:5: +1:10
diff --git a/src/test/mir-opt/const_prop/ref_deref.main.PromoteTemps.diff b/tests/mir-opt/const_prop/ref_deref.main.PromoteTemps.diff
index 902cd7850..015ec4d07 100644
--- a/src/test/mir-opt/const_prop/ref_deref.main.PromoteTemps.diff
+++ b/tests/mir-opt/const_prop/ref_deref.main.PromoteTemps.diff
@@ -16,7 +16,7 @@
 -         _2 = &_3;                        // scope 0 at $DIR/ref_deref.rs:+1:6: +1:10
 +         _4 = const _;                    // scope 0 at $DIR/ref_deref.rs:+1:6: +1:10
 +                                          // mir::Constant
-+                                          // + span: $DIR/ref_deref.rs:5:6: 5:10
++                                          // + span: $DIR/ref_deref.rs:6:6: 6:10
 +                                          // + literal: Const { ty: &i32, val: Unevaluated(main, [], Some(promoted[0])) }
 +         _2 = &(*_4);                     // scope 0 at $DIR/ref_deref.rs:+1:6: +1:10
           _1 = (*_2);                      // scope 0 at $DIR/ref_deref.rs:+1:5: +1:10
diff --git a/tests/mir-opt/const_prop/ref_deref.rs b/tests/mir-opt/const_prop/ref_deref.rs
new file mode 100644
index 000000000..d2549c8b6
--- /dev/null
+++ b/tests/mir-opt/const_prop/ref_deref.rs
@@ -0,0 +1,7 @@
+// compile-flags: -Zmir-enable-passes=-SimplifyLocals-before-const-prop
+// EMIT_MIR ref_deref.main.PromoteTemps.diff
+// EMIT_MIR ref_deref.main.ConstProp.diff
+
+fn main() {
+    *(&4);
+}
diff --git a/src/test/mir-opt/const_prop/ref_deref_project.main.ConstProp.diff b/tests/mir-opt/const_prop/ref_deref_project.main.ConstProp.diff
index ec3d90433..ec3d90433 100644
--- a/src/test/mir-opt/const_prop/ref_deref_project.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/ref_deref_project.main.ConstProp.diff
diff --git a/src/test/mir-opt/const_prop/ref_deref_project.main.PromoteTemps.diff b/tests/mir-opt/const_prop/ref_deref_project.main.PromoteTemps.diff
index cd0616e65..cd0616e65 100644
--- a/src/test/mir-opt/const_prop/ref_deref_project.main.PromoteTemps.diff
+++ b/tests/mir-opt/const_prop/ref_deref_project.main.PromoteTemps.diff
diff --git a/tests/mir-opt/const_prop/ref_deref_project.rs b/tests/mir-opt/const_prop/ref_deref_project.rs
new file mode 100644
index 000000000..2fdd4e153
--- /dev/null
+++ b/tests/mir-opt/const_prop/ref_deref_project.rs
@@ -0,0 +1,7 @@
+// compile-flags: -Zmir-enable-passes=-SimplifyLocals-before-const-prop
+// EMIT_MIR ref_deref_project.main.PromoteTemps.diff
+// EMIT_MIR ref_deref_project.main.ConstProp.diff
+
+fn main() {
+    *(&(4, 5).1); // This does not currently propagate (#67862)
+}
diff --git a/tests/mir-opt/const_prop/reify_fn_ptr.main.ConstProp.diff b/tests/mir-opt/const_prop/reify_fn_ptr.main.ConstProp.diff
new file mode 100644
index 000000000..15c93f270
--- /dev/null
+++ b/tests/mir-opt/const_prop/reify_fn_ptr.main.ConstProp.diff
@@ -0,0 +1,24 @@
+- // MIR for `main` before ConstProp
++ // MIR for `main` after ConstProp
+  
+  fn main() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/reify_fn_ptr.rs:+0:11: +0:11
+      let mut _1: usize;                   // in scope 0 at $DIR/reify_fn_ptr.rs:+1:13: +1:26
+      let mut _2: fn();                    // in scope 0 at $DIR/reify_fn_ptr.rs:+1:13: +1:17
+      scope 1 {
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/reify_fn_ptr.rs:+1:13: +1:26
+          StorageLive(_2);                 // scope 0 at $DIR/reify_fn_ptr.rs:+1:13: +1:17
+          _2 = main as fn() (Pointer(ReifyFnPointer)); // scope 0 at $DIR/reify_fn_ptr.rs:+1:13: +1:17
+                                           // mir::Constant
+                                           // + span: $DIR/reify_fn_ptr.rs:4:13: 4:17
+                                           // + literal: Const { ty: fn() {main}, val: Value(<ZST>) }
+          _1 = move _2 as usize (PointerExposeAddress); // scope 0 at $DIR/reify_fn_ptr.rs:+1:13: +1:26
+          StorageDead(_2);                 // scope 0 at $DIR/reify_fn_ptr.rs:+1:25: +1:26
+          StorageDead(_1);                 // scope 0 at $DIR/reify_fn_ptr.rs:+1:40: +1:41
+          return;                          // scope 0 at $DIR/reify_fn_ptr.rs:+2:2: +2:2
+      }
+  }
+  
diff --git a/src/test/mir-opt/const_prop/reify_fn_ptr.rs b/tests/mir-opt/const_prop/reify_fn_ptr.rs
index bfe2563ad..bfe2563ad 100644
--- a/src/test/mir-opt/const_prop/reify_fn_ptr.rs
+++ b/tests/mir-opt/const_prop/reify_fn_ptr.rs
diff --git a/src/test/mir-opt/const_prop/repeat.main.ConstProp.32bit.diff b/tests/mir-opt/const_prop/repeat.main.ConstProp.32bit.diff
index 7c4977996..636032adb 100644
--- a/src/test/mir-opt/const_prop/repeat.main.ConstProp.32bit.diff
+++ b/tests/mir-opt/const_prop/repeat.main.ConstProp.32bit.diff
@@ -35,7 +35,6 @@
           StorageDead(_2);                 // scope 0 at $DIR/repeat.rs:+1:31: +1:32
           StorageDead(_4);                 // scope 0 at $DIR/repeat.rs:+1:32: +1:33
           StorageDead(_3);                 // scope 0 at $DIR/repeat.rs:+1:32: +1:33
-          nop;                             // scope 0 at $DIR/repeat.rs:+0:11: +2:2
           StorageDead(_1);                 // scope 0 at $DIR/repeat.rs:+2:1: +2:2
           return;                          // scope 0 at $DIR/repeat.rs:+2:2: +2:2
       }
diff --git a/src/test/mir-opt/const_prop/repeat.main.ConstProp.64bit.diff b/tests/mir-opt/const_prop/repeat.main.ConstProp.64bit.diff
index 7c4977996..636032adb 100644
--- a/src/test/mir-opt/const_prop/repeat.main.ConstProp.64bit.diff
+++ b/tests/mir-opt/const_prop/repeat.main.ConstProp.64bit.diff
@@ -35,7 +35,6 @@
           StorageDead(_2);                 // scope 0 at $DIR/repeat.rs:+1:31: +1:32
           StorageDead(_4);                 // scope 0 at $DIR/repeat.rs:+1:32: +1:33
           StorageDead(_3);                 // scope 0 at $DIR/repeat.rs:+1:32: +1:33
-          nop;                             // scope 0 at $DIR/repeat.rs:+0:11: +2:2
           StorageDead(_1);                 // scope 0 at $DIR/repeat.rs:+2:1: +2:2
           return;                          // scope 0 at $DIR/repeat.rs:+2:2: +2:2
       }
diff --git a/src/test/mir-opt/const_prop/repeat.rs b/tests/mir-opt/const_prop/repeat.rs
index 36d9b9fc6..36d9b9fc6 100644
--- a/src/test/mir-opt/const_prop/repeat.rs
+++ b/tests/mir-opt/const_prop/repeat.rs
diff --git a/src/test/mir-opt/const_prop/return_place.add.ConstProp.diff b/tests/mir-opt/const_prop/return_place.add.ConstProp.diff
index 5ebd8a520..5ebd8a520 100644
--- a/src/test/mir-opt/const_prop/return_place.add.ConstProp.diff
+++ b/tests/mir-opt/const_prop/return_place.add.ConstProp.diff
diff --git a/src/test/mir-opt/const_prop/return_place.add.PreCodegen.before.mir b/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.mir
index ececd9942..ececd9942 100644
--- a/src/test/mir-opt/const_prop/return_place.add.PreCodegen.before.mir
+++ b/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.mir
diff --git a/src/test/mir-opt/const_prop/return_place.rs b/tests/mir-opt/const_prop/return_place.rs
index 06a853696..06a853696 100644
--- a/src/test/mir-opt/const_prop/return_place.rs
+++ b/tests/mir-opt/const_prop/return_place.rs
diff --git a/src/test/mir-opt/const_prop/scalar_literal_propagation.main.ConstProp.diff b/tests/mir-opt/const_prop/scalar_literal_propagation.main.ConstProp.diff
index 5920937e0..d518eff04 100644
--- a/src/test/mir-opt/const_prop/scalar_literal_propagation.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/scalar_literal_propagation.main.ConstProp.diff
@@ -27,7 +27,6 @@
       bb1: {
           StorageDead(_3);                 // scope 1 at $DIR/scalar_literal_propagation.rs:+2:14: +2:15
           StorageDead(_2);                 // scope 1 at $DIR/scalar_literal_propagation.rs:+2:15: +2:16
-          nop;                             // scope 0 at $DIR/scalar_literal_propagation.rs:+0:11: +3:2
           StorageDead(_1);                 // scope 0 at $DIR/scalar_literal_propagation.rs:+3:1: +3:2
           return;                          // scope 0 at $DIR/scalar_literal_propagation.rs:+3:2: +3:2
       }
diff --git a/src/test/mir-opt/const_prop/scalar_literal_propagation.rs b/tests/mir-opt/const_prop/scalar_literal_propagation.rs
index 8724e4d57..8724e4d57 100644
--- a/src/test/mir-opt/const_prop/scalar_literal_propagation.rs
+++ b/tests/mir-opt/const_prop/scalar_literal_propagation.rs
diff --git a/src/test/mir-opt/const_prop/slice_len.main.ConstProp.32bit.diff b/tests/mir-opt/const_prop/slice_len.main.ConstProp.32bit.diff
index 624376769..9017fd18e 100644
--- a/src/test/mir-opt/const_prop/slice_len.main.ConstProp.32bit.diff
+++ b/tests/mir-opt/const_prop/slice_len.main.ConstProp.32bit.diff
@@ -12,7 +12,6 @@
       let mut _7: usize;                   // in scope 0 at $DIR/slice_len.rs:+1:5: +1:33
       let mut _8: bool;                    // in scope 0 at $DIR/slice_len.rs:+1:5: +1:33
       let mut _9: &[u32; 3];               // in scope 0 at $DIR/slice_len.rs:+1:6: +1:19
-      let mut _10: &[u32; 3];              // in scope 0 at $DIR/slice_len.rs:+1:6: +1:19
   
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
@@ -21,20 +20,18 @@
           StorageLive(_4);                 // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
           _9 = const _;                    // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
                                            // mir::Constant
-                                           // + span: $DIR/slice_len.rs:5:6: 5:19
+                                           // + span: $DIR/slice_len.rs:6:6: 6:19
                                            // + literal: Const { ty: &[u32; 3], val: Unevaluated(main, [], Some(promoted[0])) }
           _4 = _9;                         // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
           _3 = _4;                         // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
-          StorageLive(_10);                // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
-          _10 = _3;                        // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
           _2 = move _3 as &[u32] (Pointer(Unsize)); // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
           StorageDead(_3);                 // scope 0 at $DIR/slice_len.rs:+1:18: +1:19
           StorageLive(_6);                 // scope 0 at $DIR/slice_len.rs:+1:31: +1:32
           _6 = const 1_usize;              // scope 0 at $DIR/slice_len.rs:+1:31: +1:32
-          _7 = const 3_usize;              // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
-          StorageDead(_10);                // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
+-         _7 = Len((*_2));                 // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
 -         _8 = Lt(_6, _7);                 // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
 -         assert(move _8, "index out of bounds: the length is {} but the index is {}", move _7, _6) -> bb1; // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
++         _7 = const 3_usize;              // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
 +         _8 = const true;                 // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
 +         assert(const true, "index out of bounds: the length is {} but the index is {}", const 3_usize, const 1_usize) -> bb1; // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
       }
diff --git a/src/test/mir-opt/const_prop/slice_len.main.ConstProp.64bit.diff b/tests/mir-opt/const_prop/slice_len.main.ConstProp.64bit.diff
index 624376769..9017fd18e 100644
--- a/src/test/mir-opt/const_prop/slice_len.main.ConstProp.64bit.diff
+++ b/tests/mir-opt/const_prop/slice_len.main.ConstProp.64bit.diff
@@ -12,7 +12,6 @@
       let mut _7: usize;                   // in scope 0 at $DIR/slice_len.rs:+1:5: +1:33
       let mut _8: bool;                    // in scope 0 at $DIR/slice_len.rs:+1:5: +1:33
       let mut _9: &[u32; 3];               // in scope 0 at $DIR/slice_len.rs:+1:6: +1:19
-      let mut _10: &[u32; 3];              // in scope 0 at $DIR/slice_len.rs:+1:6: +1:19
   
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
@@ -21,20 +20,18 @@
           StorageLive(_4);                 // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
           _9 = const _;                    // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
                                            // mir::Constant
-                                           // + span: $DIR/slice_len.rs:5:6: 5:19
+                                           // + span: $DIR/slice_len.rs:6:6: 6:19
                                            // + literal: Const { ty: &[u32; 3], val: Unevaluated(main, [], Some(promoted[0])) }
           _4 = _9;                         // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
           _3 = _4;                         // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
-          StorageLive(_10);                // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
-          _10 = _3;                        // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
           _2 = move _3 as &[u32] (Pointer(Unsize)); // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
           StorageDead(_3);                 // scope 0 at $DIR/slice_len.rs:+1:18: +1:19
           StorageLive(_6);                 // scope 0 at $DIR/slice_len.rs:+1:31: +1:32
           _6 = const 1_usize;              // scope 0 at $DIR/slice_len.rs:+1:31: +1:32
-          _7 = const 3_usize;              // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
-          StorageDead(_10);                // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
+-         _7 = Len((*_2));                 // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
 -         _8 = Lt(_6, _7);                 // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
 -         assert(move _8, "index out of bounds: the length is {} but the index is {}", move _7, _6) -> bb1; // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
++         _7 = const 3_usize;              // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
 +         _8 = const true;                 // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
 +         assert(const true, "index out of bounds: the length is {} but the index is {}", const 3_usize, const 1_usize) -> bb1; // scope 0 at $DIR/slice_len.rs:+1:5: +1:33
       }
diff --git a/tests/mir-opt/const_prop/slice_len.rs b/tests/mir-opt/const_prop/slice_len.rs
new file mode 100644
index 000000000..eaaf34b96
--- /dev/null
+++ b/tests/mir-opt/const_prop/slice_len.rs
@@ -0,0 +1,7 @@
+// compile-flags: -Zmir-enable-passes=-SimplifyLocals-before-const-prop
+// EMIT_MIR_FOR_EACH_BIT_WIDTH
+
+// EMIT_MIR slice_len.main.ConstProp.diff
+fn main() {
+    (&[1u32, 2, 3] as &[u32])[1];
+}
diff --git a/src/test/mir-opt/const_prop/switch_int.main.ConstProp.diff b/tests/mir-opt/const_prop/switch_int.main.ConstProp.diff
index 9d7c2784d..ddc1a4493 100644
--- a/src/test/mir-opt/const_prop/switch_int.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/switch_int.main.ConstProp.diff
@@ -8,8 +8,8 @@
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/switch_int.rs:+1:11: +1:12
           _1 = const 1_i32;                // scope 0 at $DIR/switch_int.rs:+1:11: +1:12
--         switchInt(_1) -> [1_i32: bb2, otherwise: bb1]; // scope 0 at $DIR/switch_int.rs:+1:5: +1:12
-+         switchInt(const 1_i32) -> [1_i32: bb2, otherwise: bb1]; // scope 0 at $DIR/switch_int.rs:+1:5: +1:12
+-         switchInt(_1) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/switch_int.rs:+1:5: +1:12
++         switchInt(const 1_i32) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/switch_int.rs:+1:5: +1:12
       }
   
       bb1: {
diff --git a/src/test/mir-opt/const_prop/switch_int.main.SimplifyConstCondition-after-const-prop.diff b/tests/mir-opt/const_prop/switch_int.main.SimplifyConstCondition-after-const-prop.diff
index 74f9eafe4..09c47ee6e 100644
--- a/src/test/mir-opt/const_prop/switch_int.main.SimplifyConstCondition-after-const-prop.diff
+++ b/tests/mir-opt/const_prop/switch_int.main.SimplifyConstCondition-after-const-prop.diff
@@ -8,7 +8,7 @@
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/switch_int.rs:+1:11: +1:12
           _1 = const 1_i32;                // scope 0 at $DIR/switch_int.rs:+1:11: +1:12
--         switchInt(const 1_i32) -> [1_i32: bb2, otherwise: bb1]; // scope 0 at $DIR/switch_int.rs:+1:5: +1:12
+-         switchInt(const 1_i32) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/switch_int.rs:+1:5: +1:12
 +         goto -> bb2;                     // scope 0 at $DIR/switch_int.rs:+1:5: +1:12
       }
   
diff --git a/src/test/mir-opt/const_prop/switch_int.rs b/tests/mir-opt/const_prop/switch_int.rs
index d7319eca1..d7319eca1 100644
--- a/src/test/mir-opt/const_prop/switch_int.rs
+++ b/tests/mir-opt/const_prop/switch_int.rs
diff --git a/src/test/mir-opt/const_prop/tuple_literal_propagation.main.ConstProp.diff b/tests/mir-opt/const_prop/tuple_literal_propagation.main.ConstProp.diff
index a0603c60d..e4c92b617 100644
--- a/src/test/mir-opt/const_prop/tuple_literal_propagation.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/tuple_literal_propagation.main.ConstProp.diff
@@ -28,7 +28,6 @@
       bb1: {
           StorageDead(_3);                 // scope 1 at $DIR/tuple_literal_propagation.rs:+3:14: +3:15
           StorageDead(_2);                 // scope 1 at $DIR/tuple_literal_propagation.rs:+3:15: +3:16
-          nop;                             // scope 0 at $DIR/tuple_literal_propagation.rs:+0:11: +4:2
           StorageDead(_1);                 // scope 0 at $DIR/tuple_literal_propagation.rs:+4:1: +4:2
           return;                          // scope 0 at $DIR/tuple_literal_propagation.rs:+4:2: +4:2
       }
diff --git a/src/test/mir-opt/const_prop/tuple_literal_propagation.rs b/tests/mir-opt/const_prop/tuple_literal_propagation.rs
index e644baec4..e644baec4 100644
--- a/src/test/mir-opt/const_prop/tuple_literal_propagation.rs
+++ b/tests/mir-opt/const_prop/tuple_literal_propagation.rs
diff --git a/tests/mir-opt/const_prop_miscompile.bar.ConstProp.diff b/tests/mir-opt/const_prop_miscompile.bar.ConstProp.diff
new file mode 100644
index 000000000..ea9fec0aa
--- /dev/null
+++ b/tests/mir-opt/const_prop_miscompile.bar.ConstProp.diff
@@ -0,0 +1,37 @@
+- // MIR for `bar` before ConstProp
++ // MIR for `bar` after ConstProp
+  
+  fn bar() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/const_prop_miscompile.rs:+0:10: +0:10
+      let mut _1: (i32,);                  // in scope 0 at $DIR/const_prop_miscompile.rs:+1:9: +1:14
+      let mut _2: *mut i32;                // in scope 0 at $DIR/const_prop_miscompile.rs:+3:10: +3:22
+      let mut _4: i32;                     // in scope 0 at $DIR/const_prop_miscompile.rs:+5:13: +5:20
+      scope 1 {
+          debug v => _1;                   // in scope 1 at $DIR/const_prop_miscompile.rs:+1:9: +1:14
+          let _3: bool;                    // in scope 1 at $DIR/const_prop_miscompile.rs:+5:9: +5:10
+          scope 2 {
+          }
+          scope 3 {
+              debug y => _3;               // in scope 3 at $DIR/const_prop_miscompile.rs:+5:9: +5:10
+          }
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/const_prop_miscompile.rs:+1:9: +1:14
+          Deinit(_1);                      // scope 0 at $DIR/const_prop_miscompile.rs:+1:17: +1:21
+          (_1.0: i32) = const 1_i32;       // scope 0 at $DIR/const_prop_miscompile.rs:+1:17: +1:21
+          StorageLive(_2);                 // scope 2 at $DIR/const_prop_miscompile.rs:+3:10: +3:22
+          _2 = &raw mut (_1.0: i32);       // scope 2 at $DIR/const_prop_miscompile.rs:+3:10: +3:22
+          (*_2) = const 5_i32;             // scope 2 at $DIR/const_prop_miscompile.rs:+3:9: +3:26
+          StorageDead(_2);                 // scope 2 at $DIR/const_prop_miscompile.rs:+3:26: +3:27
+          StorageLive(_3);                 // scope 1 at $DIR/const_prop_miscompile.rs:+5:9: +5:10
+          StorageLive(_4);                 // scope 1 at $DIR/const_prop_miscompile.rs:+5:13: +5:20
+          _4 = (_1.0: i32);                // scope 1 at $DIR/const_prop_miscompile.rs:+5:15: +5:18
+          _3 = Eq(move _4, const 5_i32);   // scope 1 at $DIR/const_prop_miscompile.rs:+5:13: +5:25
+          StorageDead(_4);                 // scope 1 at $DIR/const_prop_miscompile.rs:+5:24: +5:25
+          StorageDead(_3);                 // scope 1 at $DIR/const_prop_miscompile.rs:+6:1: +6:2
+          StorageDead(_1);                 // scope 0 at $DIR/const_prop_miscompile.rs:+6:1: +6:2
+          return;                          // scope 0 at $DIR/const_prop_miscompile.rs:+6:2: +6:2
+      }
+  }
+  
diff --git a/src/test/mir-opt/const_prop_miscompile.foo.ConstProp.diff b/tests/mir-opt/const_prop_miscompile.foo.ConstProp.diff
index e8bd98cf8..043f40474 100644
--- a/src/test/mir-opt/const_prop_miscompile.foo.ConstProp.diff
+++ b/tests/mir-opt/const_prop_miscompile.foo.ConstProp.diff
@@ -27,7 +27,6 @@
           _4 = (_1.0: i32);                // scope 1 at $DIR/const_prop_miscompile.rs:+3:15: +3:18
           _3 = Eq(move _4, const 5_i32);   // scope 1 at $DIR/const_prop_miscompile.rs:+3:13: +3:25
           StorageDead(_4);                 // scope 1 at $DIR/const_prop_miscompile.rs:+3:24: +3:25
-          nop;                             // scope 0 at $DIR/const_prop_miscompile.rs:+0:10: +4:2
           StorageDead(_3);                 // scope 1 at $DIR/const_prop_miscompile.rs:+4:1: +4:2
           StorageDead(_1);                 // scope 0 at $DIR/const_prop_miscompile.rs:+4:1: +4:2
           return;                          // scope 0 at $DIR/const_prop_miscompile.rs:+4:2: +4:2
diff --git a/src/test/mir-opt/const_prop_miscompile.rs b/tests/mir-opt/const_prop_miscompile.rs
index bc54556b3..bc54556b3 100644
--- a/src/test/mir-opt/const_prop_miscompile.rs
+++ b/tests/mir-opt/const_prop_miscompile.rs
diff --git a/src/test/mir-opt/coverage_graphviz.bar.InstrumentCoverage.0.dot b/tests/mir-opt/coverage_graphviz.bar.InstrumentCoverage.0.dot
index 03df5c950..03df5c950 100644
--- a/src/test/mir-opt/coverage_graphviz.bar.InstrumentCoverage.0.dot
+++ b/tests/mir-opt/coverage_graphviz.bar.InstrumentCoverage.0.dot
diff --git a/src/test/mir-opt/coverage_graphviz.main.InstrumentCoverage.0.dot b/tests/mir-opt/coverage_graphviz.main.InstrumentCoverage.0.dot
index fd21b14af..c4d389b2d 100644
--- a/src/test/mir-opt/coverage_graphviz.main.InstrumentCoverage.0.dot
+++ b/tests/mir-opt/coverage_graphviz.main.InstrumentCoverage.0.dot
@@ -7,7 +7,7 @@ digraph Cov_0_3 {
     bcb1__Cov_0_3 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">bcb1</td></tr><tr><td align="left" balign="left">Expression(bcb0 + bcb3) at 10:5-11:17<br align="left"/>    11:12-11:17: @2.Call: _2 = bar() -&gt; [return: bb3, unwind: bb6]</td></tr><tr><td align="left" balign="left">bb1: FalseUnwind<br align="left"/>bb2: Call</td></tr><tr><td align="left" balign="left">bb3: SwitchInt</td></tr></table>>];
     bcb0__Cov_0_3 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">bcb0</td></tr><tr><td align="left" balign="left"></td></tr><tr><td align="left" balign="left">Counter(bcb0) at 9:1-9:11<br align="left"/>    </td></tr><tr><td align="left" balign="left">bb0: Goto</td></tr></table>>];
     bcb3__Cov_0_3 -> bcb1__Cov_0_3 [label=<>];
-    bcb1__Cov_0_3 -> bcb3__Cov_0_3 [label=<false>];
+    bcb1__Cov_0_3 -> bcb3__Cov_0_3 [label=<0>];
     bcb1__Cov_0_3 -> bcb2__Cov_0_3 [label=<otherwise>];
     bcb0__Cov_0_3 -> bcb1__Cov_0_3 [label=<>];
 }
diff --git a/src/test/mir-opt/coverage_graphviz.rs b/tests/mir-opt/coverage_graphviz.rs
index 09403bb3a..09403bb3a 100644
--- a/src/test/mir-opt/coverage_graphviz.rs
+++ b/tests/mir-opt/coverage_graphviz.rs
diff --git a/src/test/mir-opt/dataflow-const-prop/cast.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/cast.main.DataflowConstProp.diff
index bf9ab8669..bf9ab8669 100644
--- a/src/test/mir-opt/dataflow-const-prop/cast.main.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/cast.main.DataflowConstProp.diff
diff --git a/src/test/mir-opt/dataflow-const-prop/cast.rs b/tests/mir-opt/dataflow-const-prop/cast.rs
index 484403f7f..484403f7f 100644
--- a/src/test/mir-opt/dataflow-const-prop/cast.rs
+++ b/tests/mir-opt/dataflow-const-prop/cast.rs
diff --git a/src/test/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.diff
index a4ebd0c8c..a4ebd0c8c 100644
--- a/src/test/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.diff
diff --git a/src/test/mir-opt/dataflow-const-prop/checked.rs b/tests/mir-opt/dataflow-const-prop/checked.rs
index 0738a4ee5..0738a4ee5 100644
--- a/src/test/mir-opt/dataflow-const-prop/checked.rs
+++ b/tests/mir-opt/dataflow-const-prop/checked.rs
diff --git a/src/test/mir-opt/dataflow-const-prop/enum.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/enum.main.DataflowConstProp.diff
index 2ced794e6..fce18fae4 100644
--- a/src/test/mir-opt/dataflow-const-prop/enum.main.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/enum.main.DataflowConstProp.diff
@@ -28,7 +28,7 @@
           discriminant(_1) = 0;            // scope 0 at $DIR/enum.rs:+1:13: +1:21
           StorageLive(_2);                 // scope 1 at $DIR/enum.rs:+2:9: +2:10
           _3 = discriminant(_1);           // scope 1 at $DIR/enum.rs:+2:19: +2:20
-          switchInt(move _3) -> [0_isize: bb3, 1_isize: bb1, otherwise: bb2]; // scope 1 at $DIR/enum.rs:+2:13: +2:20
+          switchInt(move _3) -> [0: bb3, 1: bb1, otherwise: bb2]; // scope 1 at $DIR/enum.rs:+2:13: +2:20
       }
   
       bb1: {
diff --git a/src/test/mir-opt/dataflow-const-prop/enum.rs b/tests/mir-opt/dataflow-const-prop/enum.rs
index 13288577d..13288577d 100644
--- a/src/test/mir-opt/dataflow-const-prop/enum.rs
+++ b/tests/mir-opt/dataflow-const-prop/enum.rs
diff --git a/src/test/mir-opt/dataflow-const-prop/if.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/if.main.DataflowConstProp.diff
index 26808c70f..32489b4bd 100644
--- a/src/test/mir-opt/dataflow-const-prop/if.main.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/if.main.DataflowConstProp.diff
@@ -42,8 +42,8 @@
 +         _4 = const 1_i32;                // scope 1 at $DIR/if.rs:+2:16: +2:17
 +         _3 = const true;                 // scope 1 at $DIR/if.rs:+2:16: +2:22
           StorageDead(_4);                 // scope 1 at $DIR/if.rs:+2:21: +2:22
--         switchInt(move _3) -> [false: bb2, otherwise: bb1]; // scope 1 at $DIR/if.rs:+2:16: +2:22
-+         switchInt(const true) -> [false: bb2, otherwise: bb1]; // scope 1 at $DIR/if.rs:+2:16: +2:22
+-         switchInt(move _3) -> [0: bb2, otherwise: bb1]; // scope 1 at $DIR/if.rs:+2:16: +2:22
++         switchInt(const true) -> [0: bb2, otherwise: bb1]; // scope 1 at $DIR/if.rs:+2:16: +2:22
       }
   
       bb1: {
@@ -73,8 +73,8 @@
 +         _9 = const 1_i32;                // scope 3 at $DIR/if.rs:+5:16: +5:17
 +         _8 = const true;                 // scope 3 at $DIR/if.rs:+5:16: +5:22
           StorageDead(_9);                 // scope 3 at $DIR/if.rs:+5:21: +5:22
--         switchInt(move _8) -> [false: bb5, otherwise: bb4]; // scope 3 at $DIR/if.rs:+5:16: +5:22
-+         switchInt(const true) -> [false: bb5, otherwise: bb4]; // scope 3 at $DIR/if.rs:+5:16: +5:22
+-         switchInt(move _8) -> [0: bb5, otherwise: bb4]; // scope 3 at $DIR/if.rs:+5:16: +5:22
++         switchInt(const true) -> [0: bb5, otherwise: bb4]; // scope 3 at $DIR/if.rs:+5:16: +5:22
       }
   
       bb4: {
diff --git a/src/test/mir-opt/dataflow-const-prop/if.rs b/tests/mir-opt/dataflow-const-prop/if.rs
index 34fc35790..34fc35790 100644
--- a/src/test/mir-opt/dataflow-const-prop/if.rs
+++ b/tests/mir-opt/dataflow-const-prop/if.rs
diff --git a/tests/mir-opt/dataflow-const-prop/inherit_overflow.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/inherit_overflow.main.DataflowConstProp.diff
new file mode 100644
index 000000000..02aafd7ac
--- /dev/null
+++ b/tests/mir-opt/dataflow-const-prop/inherit_overflow.main.DataflowConstProp.diff
@@ -0,0 +1,39 @@
+- // MIR for `main` before DataflowConstProp
++ // MIR for `main` after DataflowConstProp
+  
+  fn main() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/inherit_overflow.rs:+0:11: +0:11
+      let mut _1: u8;                      // in scope 0 at $DIR/inherit_overflow.rs:+3:13: +3:47
+      let mut _2: u8;                      // in scope 0 at $DIR/inherit_overflow.rs:+3:13: +3:47
+      scope 1 {
+      }
+      scope 2 (inlined <u8 as Add>::add) { // at $DIR/inherit_overflow.rs:7:13: 7:47
+          debug self => _1;                // in scope 2 at $SRC_DIR/core/src/ops/arith.rs:LL:COL
+          debug other => _2;               // in scope 2 at $SRC_DIR/core/src/ops/arith.rs:LL:COL
+          let mut _3: u8;                  // in scope 2 at $SRC_DIR/core/src/ops/arith.rs:LL:COL
+          let mut _4: u8;                  // in scope 2 at $SRC_DIR/core/src/ops/arith.rs:LL:COL
+          let mut _5: (u8, bool);          // in scope 2 at $SRC_DIR/core/src/ops/arith.rs:LL:COL
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/inherit_overflow.rs:+3:13: +3:47
+          _1 = const u8::MAX;              // scope 0 at $DIR/inherit_overflow.rs:+3:13: +3:47
+          StorageLive(_2);                 // scope 0 at $DIR/inherit_overflow.rs:+3:13: +3:47
+          _2 = const 1_u8;                 // scope 0 at $DIR/inherit_overflow.rs:+3:13: +3:47
+          StorageLive(_3);                 // scope 2 at $SRC_DIR/core/src/ops/arith.rs:LL:COL
+          _3 = const u8::MAX;              // scope 2 at $SRC_DIR/core/src/ops/arith.rs:LL:COL
+          StorageLive(_4);                 // scope 2 at $SRC_DIR/core/src/ops/arith.rs:LL:COL
+          _4 = const 1_u8;                 // scope 2 at $SRC_DIR/core/src/ops/arith.rs:LL:COL
+          _5 = CheckedAdd(const u8::MAX, const 1_u8); // scope 2 at $SRC_DIR/core/src/ops/arith.rs:LL:COL
+          assert(!move (_5.1: bool), "attempt to compute `{} + {}`, which would overflow", const u8::MAX, const 1_u8) -> bb1; // scope 2 at $SRC_DIR/core/src/ops/arith.rs:LL:COL
+      }
+  
+      bb1: {
+          StorageDead(_4);                 // scope 2 at $SRC_DIR/core/src/ops/arith.rs:LL:COL
+          StorageDead(_3);                 // scope 2 at $SRC_DIR/core/src/ops/arith.rs:LL:COL
+          StorageDead(_2);                 // scope 0 at $DIR/inherit_overflow.rs:+3:13: +3:47
+          StorageDead(_1);                 // scope 0 at $DIR/inherit_overflow.rs:+3:13: +3:47
+          return;                          // scope 0 at $DIR/inherit_overflow.rs:+4:2: +4:2
+      }
+  }
+  
diff --git a/src/test/mir-opt/dataflow-const-prop/inherit_overflow.rs b/tests/mir-opt/dataflow-const-prop/inherit_overflow.rs
index 2f2d9d010..2f2d9d010 100644
--- a/src/test/mir-opt/dataflow-const-prop/inherit_overflow.rs
+++ b/tests/mir-opt/dataflow-const-prop/inherit_overflow.rs
diff --git a/src/test/mir-opt/dataflow-const-prop/issue_81605.f.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/issue_81605.f.DataflowConstProp.diff
index 881d80f7c..5a8788497 100644
--- a/src/test/mir-opt/dataflow-const-prop/issue_81605.f.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/issue_81605.f.DataflowConstProp.diff
@@ -10,8 +10,8 @@
           StorageLive(_1);                 // scope 0 at $DIR/issue_81605.rs:+1:9: +1:33
           StorageLive(_2);                 // scope 0 at $DIR/issue_81605.rs:+1:12: +1:16
           _2 = const true;                 // scope 0 at $DIR/issue_81605.rs:+1:12: +1:16
--         switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/issue_81605.rs:+1:12: +1:16
-+         switchInt(const true) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/issue_81605.rs:+1:12: +1:16
+-         switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/issue_81605.rs:+1:12: +1:16
++         switchInt(const true) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/issue_81605.rs:+1:12: +1:16
       }
   
       bb1: {
diff --git a/src/test/mir-opt/dataflow-const-prop/issue_81605.rs b/tests/mir-opt/dataflow-const-prop/issue_81605.rs
index d75e2a28b..d75e2a28b 100644
--- a/src/test/mir-opt/dataflow-const-prop/issue_81605.rs
+++ b/tests/mir-opt/dataflow-const-prop/issue_81605.rs
diff --git a/src/test/mir-opt/dataflow-const-prop/ref_without_sb.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/ref_without_sb.main.DataflowConstProp.diff
index 158f187f1..158f187f1 100644
--- a/src/test/mir-opt/dataflow-const-prop/ref_without_sb.main.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/ref_without_sb.main.DataflowConstProp.diff
diff --git a/src/test/mir-opt/dataflow-const-prop/ref_without_sb.rs b/tests/mir-opt/dataflow-const-prop/ref_without_sb.rs
index 2fd480b09..2fd480b09 100644
--- a/src/test/mir-opt/dataflow-const-prop/ref_without_sb.rs
+++ b/tests/mir-opt/dataflow-const-prop/ref_without_sb.rs
diff --git a/src/test/mir-opt/dataflow-const-prop/repr_transparent.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/repr_transparent.main.DataflowConstProp.diff
index f66b00a9a..f66b00a9a 100644
--- a/src/test/mir-opt/dataflow-const-prop/repr_transparent.main.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/repr_transparent.main.DataflowConstProp.diff
diff --git a/src/test/mir-opt/dataflow-const-prop/repr_transparent.rs b/tests/mir-opt/dataflow-const-prop/repr_transparent.rs
index 4ce0ca4df..4ce0ca4df 100644
--- a/src/test/mir-opt/dataflow-const-prop/repr_transparent.rs
+++ b/tests/mir-opt/dataflow-const-prop/repr_transparent.rs
diff --git a/src/test/mir-opt/dataflow-const-prop/self_assign.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/self_assign.main.DataflowConstProp.diff
index df08eff94..df08eff94 100644
--- a/src/test/mir-opt/dataflow-const-prop/self_assign.main.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/self_assign.main.DataflowConstProp.diff
diff --git a/src/test/mir-opt/dataflow-const-prop/self_assign.rs b/tests/mir-opt/dataflow-const-prop/self_assign.rs
index 8de2195f9..8de2195f9 100644
--- a/src/test/mir-opt/dataflow-const-prop/self_assign.rs
+++ b/tests/mir-opt/dataflow-const-prop/self_assign.rs
diff --git a/src/test/mir-opt/dataflow-const-prop/self_assign_add.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/self_assign_add.main.DataflowConstProp.diff
index c09e4061e..c09e4061e 100644
--- a/src/test/mir-opt/dataflow-const-prop/self_assign_add.main.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/self_assign_add.main.DataflowConstProp.diff
diff --git a/src/test/mir-opt/dataflow-const-prop/self_assign_add.rs b/tests/mir-opt/dataflow-const-prop/self_assign_add.rs
index e32827624..e32827624 100644
--- a/src/test/mir-opt/dataflow-const-prop/self_assign_add.rs
+++ b/tests/mir-opt/dataflow-const-prop/self_assign_add.rs
diff --git a/src/test/mir-opt/dataflow-const-prop/sibling_ptr.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/sibling_ptr.main.DataflowConstProp.diff
index 8126d4b85..8126d4b85 100644
--- a/src/test/mir-opt/dataflow-const-prop/sibling_ptr.main.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/sibling_ptr.main.DataflowConstProp.diff
diff --git a/src/test/mir-opt/dataflow-const-prop/sibling_ptr.rs b/tests/mir-opt/dataflow-const-prop/sibling_ptr.rs
index 87ef00d18..87ef00d18 100644
--- a/src/test/mir-opt/dataflow-const-prop/sibling_ptr.rs
+++ b/tests/mir-opt/dataflow-const-prop/sibling_ptr.rs
diff --git a/src/test/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.diff
index cfb2706c1..cfb2706c1 100644
--- a/src/test/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.diff
diff --git a/src/test/mir-opt/dataflow-const-prop/struct.rs b/tests/mir-opt/dataflow-const-prop/struct.rs
index 841b279e0..841b279e0 100644
--- a/src/test/mir-opt/dataflow-const-prop/struct.rs
+++ b/tests/mir-opt/dataflow-const-prop/struct.rs
diff --git a/src/test/mir-opt/dataflow-const-prop/terminator.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/terminator.main.DataflowConstProp.diff
index 8018400e7..8018400e7 100644
--- a/src/test/mir-opt/dataflow-const-prop/terminator.main.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/terminator.main.DataflowConstProp.diff
diff --git a/src/test/mir-opt/dataflow-const-prop/terminator.rs b/tests/mir-opt/dataflow-const-prop/terminator.rs
index d151f666a..d151f666a 100644
--- a/src/test/mir-opt/dataflow-const-prop/terminator.rs
+++ b/tests/mir-opt/dataflow-const-prop/terminator.rs
diff --git a/src/test/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.diff
index e028def00..e028def00 100644
--- a/src/test/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.diff
diff --git a/src/test/mir-opt/dataflow-const-prop/tuple.rs b/tests/mir-opt/dataflow-const-prop/tuple.rs
index 92c70eab0..92c70eab0 100644
--- a/src/test/mir-opt/dataflow-const-prop/tuple.rs
+++ b/tests/mir-opt/dataflow-const-prop/tuple.rs
diff --git a/src/test/mir-opt/dead-store-elimination/cycle.cycle.DeadStoreElimination.diff b/tests/mir-opt/dead-store-elimination/cycle.cycle.DeadStoreElimination.diff
index 61d24c3b5..cd3b792fb 100644
--- a/src/test/mir-opt/dead-store-elimination/cycle.cycle.DeadStoreElimination.diff
+++ b/tests/mir-opt/dead-store-elimination/cycle.cycle.DeadStoreElimination.diff
@@ -37,8 +37,8 @@
       }
   
       bb2: {
--         switchInt(move _5) -> [false: bb4, otherwise: bb3]; // scope 0 at $DIR/cycle.rs:+3:11: +3:17
-+         switchInt(move _4) -> [false: bb4, otherwise: bb3]; // scope 0 at $DIR/cycle.rs:+3:11: +3:17
+-         switchInt(move _5) -> [0: bb4, otherwise: bb3]; // scope 0 at $DIR/cycle.rs:+3:11: +3:17
++         switchInt(move _4) -> [0: bb4, otherwise: bb3]; // scope 0 at $DIR/cycle.rs:+3:11: +3:17
       }
   
       bb3: {
@@ -59,14 +59,6 @@
 -         _4 = const ();                   // scope 0 at $DIR/cycle.rs:+3:18: +8:6
 -         StorageDead(_6);                 // scope 0 at $DIR/cycle.rs:+8:5: +8:6
 +         StorageLive(_5);                 // scope 0 at $DIR/cycle.rs:+4:13: +4:17
-+         nop;                             // scope 0 at $DIR/cycle.rs:+4:20: +4:21
-+         nop;                             // scope 1 at $DIR/cycle.rs:+5:13: +5:14
-+         nop;                             // scope 1 at $DIR/cycle.rs:+5:9: +5:14
-+         nop;                             // scope 1 at $DIR/cycle.rs:+6:13: +6:14
-+         nop;                             // scope 1 at $DIR/cycle.rs:+6:9: +6:14
-+         nop;                             // scope 1 at $DIR/cycle.rs:+7:13: +7:17
-+         nop;                             // scope 1 at $DIR/cycle.rs:+7:9: +7:17
-+         nop;                             // scope 0 at $DIR/cycle.rs:+3:18: +8:6
           StorageDead(_5);                 // scope 0 at $DIR/cycle.rs:+8:5: +8:6
 +         StorageDead(_4);                 // scope 0 at $DIR/cycle.rs:+8:5: +8:6
           goto -> bb1;                     // scope 0 at $DIR/cycle.rs:+3:5: +8:6
diff --git a/src/test/mir-opt/dead-store-elimination/cycle.rs b/tests/mir-opt/dead-store-elimination/cycle.rs
index b35ce0bcb..b35ce0bcb 100644
--- a/src/test/mir-opt/dead-store-elimination/cycle.rs
+++ b/tests/mir-opt/dead-store-elimination/cycle.rs
diff --git a/src/test/mir-opt/dead-store-elimination/provenance_soundness.pointer_to_int.DeadStoreElimination.diff b/tests/mir-opt/dead-store-elimination/provenance_soundness.pointer_to_int.DeadStoreElimination.diff
index 89f1846b4..89f1846b4 100644
--- a/src/test/mir-opt/dead-store-elimination/provenance_soundness.pointer_to_int.DeadStoreElimination.diff
+++ b/tests/mir-opt/dead-store-elimination/provenance_soundness.pointer_to_int.DeadStoreElimination.diff
diff --git a/src/test/mir-opt/dead-store-elimination/provenance_soundness.retags.DeadStoreElimination.diff b/tests/mir-opt/dead-store-elimination/provenance_soundness.retags.DeadStoreElimination.diff
index b5f98233b..b5f98233b 100644
--- a/src/test/mir-opt/dead-store-elimination/provenance_soundness.retags.DeadStoreElimination.diff
+++ b/tests/mir-opt/dead-store-elimination/provenance_soundness.retags.DeadStoreElimination.diff
diff --git a/src/test/mir-opt/dead-store-elimination/provenance_soundness.rs b/tests/mir-opt/dead-store-elimination/provenance_soundness.rs
index 11314e990..11314e990 100644
--- a/src/test/mir-opt/dead-store-elimination/provenance_soundness.rs
+++ b/tests/mir-opt/dead-store-elimination/provenance_soundness.rs
diff --git a/src/test/mir-opt/deaggregator_test.bar.Deaggregator.diff b/tests/mir-opt/deaggregator_test.bar.Deaggregator.diff
index db136485a..db136485a 100644
--- a/src/test/mir-opt/deaggregator_test.bar.Deaggregator.diff
+++ b/tests/mir-opt/deaggregator_test.bar.Deaggregator.diff
diff --git a/src/test/mir-opt/deaggregator_test.rs b/tests/mir-opt/deaggregator_test.rs
index ee59402af..ee59402af 100644
--- a/src/test/mir-opt/deaggregator_test.rs
+++ b/tests/mir-opt/deaggregator_test.rs
diff --git a/src/test/mir-opt/deaggregator_test_enum.bar.Deaggregator.diff b/tests/mir-opt/deaggregator_test_enum.bar.Deaggregator.diff
index f28c2b482..f28c2b482 100644
--- a/src/test/mir-opt/deaggregator_test_enum.bar.Deaggregator.diff
+++ b/tests/mir-opt/deaggregator_test_enum.bar.Deaggregator.diff
diff --git a/src/test/mir-opt/deaggregator_test_enum.rs b/tests/mir-opt/deaggregator_test_enum.rs
index ea402dafd..ea402dafd 100644
--- a/src/test/mir-opt/deaggregator_test_enum.rs
+++ b/tests/mir-opt/deaggregator_test_enum.rs
diff --git a/src/test/mir-opt/deaggregator_test_enum_2.rs b/tests/mir-opt/deaggregator_test_enum_2.rs
index 955c31732..955c31732 100644
--- a/src/test/mir-opt/deaggregator_test_enum_2.rs
+++ b/tests/mir-opt/deaggregator_test_enum_2.rs
diff --git a/src/test/mir-opt/deaggregator_test_enum_2.test1.Deaggregator.diff b/tests/mir-opt/deaggregator_test_enum_2.test1.Deaggregator.diff
index fb18089e0..210d3849e 100644
--- a/src/test/mir-opt/deaggregator_test_enum_2.test1.Deaggregator.diff
+++ b/tests/mir-opt/deaggregator_test_enum_2.test1.Deaggregator.diff
@@ -12,7 +12,7 @@
       bb0: {
           StorageLive(_3);                 // scope 0 at $DIR/deaggregator_test_enum_2.rs:+1:8: +1:9
           _3 = _1;                         // scope 0 at $DIR/deaggregator_test_enum_2.rs:+1:8: +1:9
-          switchInt(move _3) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/deaggregator_test_enum_2.rs:+1:8: +1:9
+          switchInt(move _3) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/deaggregator_test_enum_2.rs:+1:8: +1:9
       }
   
       bb1: {
diff --git a/src/test/mir-opt/deaggregator_test_multiple.rs b/tests/mir-opt/deaggregator_test_multiple.rs
index 46305fe21..46305fe21 100644
--- a/src/test/mir-opt/deaggregator_test_multiple.rs
+++ b/tests/mir-opt/deaggregator_test_multiple.rs
diff --git a/src/test/mir-opt/deaggregator_test_multiple.test.Deaggregator.diff b/tests/mir-opt/deaggregator_test_multiple.test.Deaggregator.diff
index cf5da273c..cf5da273c 100644
--- a/src/test/mir-opt/deaggregator_test_multiple.test.Deaggregator.diff
+++ b/tests/mir-opt/deaggregator_test_multiple.test.Deaggregator.diff
diff --git a/src/test/mir-opt/deduplicate_blocks.is_line_doc_comment_2.DeduplicateBlocks.diff b/tests/mir-opt/deduplicate_blocks.is_line_doc_comment_2.DeduplicateBlocks.diff
index 995611f0e..3b1f81175 100644
--- a/src/test/mir-opt/deduplicate_blocks.is_line_doc_comment_2.DeduplicateBlocks.diff
+++ b/tests/mir-opt/deduplicate_blocks.is_line_doc_comment_2.DeduplicateBlocks.diff
@@ -28,44 +28,44 @@
           _7 = Len((*_2));                 // scope 0 at $DIR/deduplicate_blocks.rs:+2:9: +2:37
           _8 = const 4_usize;              // scope 0 at $DIR/deduplicate_blocks.rs:+2:9: +2:37
           _9 = Ge(move _7, move _8);       // scope 0 at $DIR/deduplicate_blocks.rs:+2:9: +2:37
-          switchInt(move _9) -> [false: bb6, otherwise: bb2]; // scope 0 at $DIR/deduplicate_blocks.rs:+2:9: +2:37
+          switchInt(move _9) -> [0: bb6, otherwise: bb2]; // scope 0 at $DIR/deduplicate_blocks.rs:+2:9: +2:37
       }
   
       bb2: {
-          switchInt((*_2)[0 of 4]) -> [47_u8: bb3, otherwise: bb6]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
+          switchInt((*_2)[0 of 4]) -> [47: bb3, otherwise: bb6]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
       }
   
       bb3: {
-          switchInt((*_2)[1 of 4]) -> [47_u8: bb4, otherwise: bb6]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
+          switchInt((*_2)[1 of 4]) -> [47: bb4, otherwise: bb6]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
       }
   
       bb4: {
-          switchInt((*_2)[2 of 4]) -> [47_u8: bb5, otherwise: bb6]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
+          switchInt((*_2)[2 of 4]) -> [47: bb5, otherwise: bb6]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
       }
   
       bb5: {
--         switchInt((*_2)[3 of 4]) -> [47_u8: bb11, otherwise: bb6]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
-+         switchInt((*_2)[3 of 4]) -> [47_u8: bb10, otherwise: bb6]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
+-         switchInt((*_2)[3 of 4]) -> [47: bb11, otherwise: bb6]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
++         switchInt((*_2)[3 of 4]) -> [47: bb10, otherwise: bb6]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
       }
   
       bb6: {
           _4 = Len((*_2));                 // scope 0 at $DIR/deduplicate_blocks.rs:+3:9: +3:31
           _5 = const 3_usize;              // scope 0 at $DIR/deduplicate_blocks.rs:+3:9: +3:31
           _6 = Ge(move _4, move _5);       // scope 0 at $DIR/deduplicate_blocks.rs:+3:9: +3:31
-          switchInt(move _6) -> [false: bb10, otherwise: bb7]; // scope 0 at $DIR/deduplicate_blocks.rs:+3:9: +3:31
+          switchInt(move _6) -> [0: bb10, otherwise: bb7]; // scope 0 at $DIR/deduplicate_blocks.rs:+3:9: +3:31
       }
   
       bb7: {
-          switchInt((*_2)[0 of 3]) -> [47_u8: bb8, otherwise: bb10]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
+          switchInt((*_2)[0 of 3]) -> [47: bb8, otherwise: bb10]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
       }
   
       bb8: {
-          switchInt((*_2)[1 of 3]) -> [47_u8: bb9, otherwise: bb10]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
+          switchInt((*_2)[1 of 3]) -> [47: bb9, otherwise: bb10]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
       }
   
       bb9: {
--         switchInt((*_2)[2 of 3]) -> [47_u8: bb12, 33_u8: bb13, otherwise: bb10]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
-+         switchInt((*_2)[2 of 3]) -> [47_u8: bb11, 33_u8: bb11, otherwise: bb10]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
+-         switchInt((*_2)[2 of 3]) -> [47: bb12, 33: bb13, otherwise: bb10]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
++         switchInt((*_2)[2 of 3]) -> [47: bb11, 33: bb11, otherwise: bb10]; // scope 0 at $DIR/deduplicate_blocks.rs:+1:5: +1:23
       }
   
       bb10: {
diff --git a/src/test/mir-opt/deduplicate_blocks.rs b/tests/mir-opt/deduplicate_blocks.rs
index 2b9eed99e..2b9eed99e 100644
--- a/src/test/mir-opt/deduplicate_blocks.rs
+++ b/tests/mir-opt/deduplicate_blocks.rs
diff --git a/src/test/mir-opt/deref-patterns/string.foo.PreCodegen.after.mir b/tests/mir-opt/deref-patterns/string.foo.PreCodegen.after.mir
index 5b185082d..9597a0c83 100644
--- a/src/test/mir-opt/deref-patterns/string.foo.PreCodegen.after.mir
+++ b/tests/mir-opt/deref-patterns/string.foo.PreCodegen.after.mir
@@ -17,7 +17,7 @@ fn foo(_1: Option<String>) -> i32 {
         _7 = const false;                // scope 0 at $DIR/string.rs:+1:11: +1:12
         _7 = const true;                 // scope 0 at $DIR/string.rs:+1:11: +1:12
         _5 = discriminant(_1);           // scope 0 at $DIR/string.rs:+1:11: +1:12
-        switchInt(move _5) -> [1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/string.rs:+1:5: +1:12
+        switchInt(move _5) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/string.rs:+1:5: +1:12
     }
 
     bb1: {
@@ -47,7 +47,7 @@ fn foo(_1: Option<String>) -> i32 {
     }
 
     bb4: {
-        switchInt(move _4) -> [false: bb1, otherwise: bb5]; // scope 0 at $DIR/string.rs:+2:14: +2:17
+        switchInt(move _4) -> [0: bb1, otherwise: bb5]; // scope 0 at $DIR/string.rs:+2:14: +2:17
     }
 
     bb5: {
@@ -69,6 +69,6 @@ fn foo(_1: Option<String>) -> i32 {
     }
 
     bb9: {
-        switchInt(_7) -> [false: bb7, otherwise: bb8]; // scope 0 at $DIR/string.rs:+5:1: +5:2
+        switchInt(_7) -> [0: bb7, otherwise: bb8]; // scope 0 at $DIR/string.rs:+5:1: +5:2
     }
 }
diff --git a/src/test/mir-opt/deref-patterns/string.rs b/tests/mir-opt/deref-patterns/string.rs
index 3a99c44aa..3a99c44aa 100644
--- a/src/test/mir-opt/deref-patterns/string.rs
+++ b/tests/mir-opt/deref-patterns/string.rs
diff --git a/src/test/mir-opt/derefer_complex_case.main.Derefer.diff b/tests/mir-opt/derefer_complex_case.main.Derefer.diff
index 713d56c38..fa3eeedc4 100644
--- a/src/test/mir-opt/derefer_complex_case.main.Derefer.diff
+++ b/tests/mir-opt/derefer_complex_case.main.Derefer.diff
@@ -62,7 +62,7 @@
       bb3: {
           StorageDead(_8);                 // scope 1 at $DIR/derefer_complex_case.rs:+1:25: +1:26
           _10 = discriminant(_7);          // scope 1 at $DIR/derefer_complex_case.rs:+1:17: +1:26
-          switchInt(move _10) -> [0_isize: bb6, 1_isize: bb4, otherwise: bb5]; // scope 1 at $DIR/derefer_complex_case.rs:+1:17: +1:26
+          switchInt(move _10) -> [0: bb6, 1: bb4, otherwise: bb5]; // scope 1 at $DIR/derefer_complex_case.rs:+1:17: +1:26
       }
   
       bb4: {
diff --git a/src/test/mir-opt/derefer_complex_case.rs b/tests/mir-opt/derefer_complex_case.rs
index dc48cee95..dc48cee95 100644
--- a/src/test/mir-opt/derefer_complex_case.rs
+++ b/tests/mir-opt/derefer_complex_case.rs
diff --git a/src/test/mir-opt/derefer_inline_test.main.Derefer.diff b/tests/mir-opt/derefer_inline_test.main.Derefer.diff
index 3540df308..3540df308 100644
--- a/src/test/mir-opt/derefer_inline_test.main.Derefer.diff
+++ b/tests/mir-opt/derefer_inline_test.main.Derefer.diff
diff --git a/src/test/mir-opt/derefer_inline_test.rs b/tests/mir-opt/derefer_inline_test.rs
index cc06a7dd8..cc06a7dd8 100644
--- a/src/test/mir-opt/derefer_inline_test.rs
+++ b/tests/mir-opt/derefer_inline_test.rs
diff --git a/src/test/mir-opt/derefer_terminator_test.main.Derefer.diff b/tests/mir-opt/derefer_terminator_test.main.Derefer.diff
index 60f7b9d56..ab2388d13 100644
--- a/src/test/mir-opt/derefer_terminator_test.main.Derefer.diff
+++ b/tests/mir-opt/derefer_terminator_test.main.Derefer.diff
@@ -54,11 +54,11 @@
           _6 = &_7;                        // scope 2 at $DIR/derefer_terminator_test.rs:+3:18: +3:21
           _5 = &_6;                        // scope 2 at $DIR/derefer_terminator_test.rs:+3:17: +3:21
           _4 = &_5;                        // scope 2 at $DIR/derefer_terminator_test.rs:+3:15: +3:22
--         switchInt((*(*(*(*_4))))) -> [false: bb3, otherwise: bb4]; // scope 2 at $DIR/derefer_terminator_test.rs:+3:5: +3:22
+-         switchInt((*(*(*(*_4))))) -> [0: bb3, otherwise: bb4]; // scope 2 at $DIR/derefer_terminator_test.rs:+3:5: +3:22
 +         _10 = deref_copy (*_4);          // scope 2 at $DIR/derefer_terminator_test.rs:+3:5: +3:22
 +         _11 = deref_copy (*_10);         // scope 2 at $DIR/derefer_terminator_test.rs:+3:5: +3:22
 +         _12 = deref_copy (*_11);         // scope 2 at $DIR/derefer_terminator_test.rs:+3:5: +3:22
-+         switchInt((*_12)) -> [false: bb3, otherwise: bb4]; // scope 2 at $DIR/derefer_terminator_test.rs:+3:5: +3:22
++         switchInt((*_12)) -> [0: bb3, otherwise: bb4]; // scope 2 at $DIR/derefer_terminator_test.rs:+3:5: +3:22
       }
   
       bb3: {
diff --git a/src/test/mir-opt/derefer_terminator_test.rs b/tests/mir-opt/derefer_terminator_test.rs
index d6750c29d..d6750c29d 100644
--- a/src/test/mir-opt/derefer_terminator_test.rs
+++ b/tests/mir-opt/derefer_terminator_test.rs
diff --git a/src/test/mir-opt/derefer_test.main.Derefer.diff b/tests/mir-opt/derefer_test.main.Derefer.diff
index 87306d818..87306d818 100644
--- a/src/test/mir-opt/derefer_test.main.Derefer.diff
+++ b/tests/mir-opt/derefer_test.main.Derefer.diff
diff --git a/src/test/mir-opt/derefer_test.rs b/tests/mir-opt/derefer_test.rs
index fad0fe8eb..fad0fe8eb 100644
--- a/src/test/mir-opt/derefer_test.rs
+++ b/tests/mir-opt/derefer_test.rs
diff --git a/src/test/mir-opt/derefer_test_multiple.main.Derefer.diff b/tests/mir-opt/derefer_test_multiple.main.Derefer.diff
index 3e40db118..3e40db118 100644
--- a/src/test/mir-opt/derefer_test_multiple.main.Derefer.diff
+++ b/tests/mir-opt/derefer_test_multiple.main.Derefer.diff
diff --git a/src/test/mir-opt/derefer_test_multiple.rs b/tests/mir-opt/derefer_test_multiple.rs
index 0b3888b07..0b3888b07 100644
--- a/src/test/mir-opt/derefer_test_multiple.rs
+++ b/tests/mir-opt/derefer_test_multiple.rs
diff --git a/src/test/mir-opt/dest-prop/branch.foo.DestinationPropagation.diff b/tests/mir-opt/dest-prop/branch.foo.DestinationPropagation.diff
index 5fa7013d5..9c7296632 100644
--- a/src/test/mir-opt/dest-prop/branch.foo.DestinationPropagation.diff
+++ b/tests/mir-opt/dest-prop/branch.foo.DestinationPropagation.diff
@@ -37,7 +37,7 @@
       }
   
       bb2: {
-          switchInt(move _3) -> [false: bb4, otherwise: bb3]; // scope 1 at $DIR/branch.rs:+3:16: +3:22
+          switchInt(move _3) -> [0: bb4, otherwise: bb3]; // scope 1 at $DIR/branch.rs:+3:16: +3:22
       }
   
       bb3: {
diff --git a/src/test/mir-opt/dest-prop/branch.rs b/tests/mir-opt/dest-prop/branch.rs
index 898c908b1..898c908b1 100644
--- a/src/test/mir-opt/dest-prop/branch.rs
+++ b/tests/mir-opt/dest-prop/branch.rs
diff --git a/src/test/mir-opt/dest-prop/copy_propagation_arg.arg_src.DestinationPropagation.diff b/tests/mir-opt/dest-prop/copy_propagation_arg.arg_src.DestinationPropagation.diff
index 4343a5935..4343a5935 100644
--- a/src/test/mir-opt/dest-prop/copy_propagation_arg.arg_src.DestinationPropagation.diff
+++ b/tests/mir-opt/dest-prop/copy_propagation_arg.arg_src.DestinationPropagation.diff
diff --git a/src/test/mir-opt/dest-prop/copy_propagation_arg.bar.DestinationPropagation.diff b/tests/mir-opt/dest-prop/copy_propagation_arg.bar.DestinationPropagation.diff
index 298991b5a..298991b5a 100644
--- a/src/test/mir-opt/dest-prop/copy_propagation_arg.bar.DestinationPropagation.diff
+++ b/tests/mir-opt/dest-prop/copy_propagation_arg.bar.DestinationPropagation.diff
diff --git a/src/test/mir-opt/dest-prop/copy_propagation_arg.baz.DestinationPropagation.diff b/tests/mir-opt/dest-prop/copy_propagation_arg.baz.DestinationPropagation.diff
index bc88787e6..bc88787e6 100644
--- a/src/test/mir-opt/dest-prop/copy_propagation_arg.baz.DestinationPropagation.diff
+++ b/tests/mir-opt/dest-prop/copy_propagation_arg.baz.DestinationPropagation.diff
diff --git a/src/test/mir-opt/dest-prop/copy_propagation_arg.foo.DestinationPropagation.diff b/tests/mir-opt/dest-prop/copy_propagation_arg.foo.DestinationPropagation.diff
index d37a9f71d..d37a9f71d 100644
--- a/src/test/mir-opt/dest-prop/copy_propagation_arg.foo.DestinationPropagation.diff
+++ b/tests/mir-opt/dest-prop/copy_propagation_arg.foo.DestinationPropagation.diff
diff --git a/src/test/mir-opt/dest-prop/copy_propagation_arg.rs b/tests/mir-opt/dest-prop/copy_propagation_arg.rs
index 31be6c931..31be6c931 100644
--- a/src/test/mir-opt/dest-prop/copy_propagation_arg.rs
+++ b/tests/mir-opt/dest-prop/copy_propagation_arg.rs
diff --git a/src/test/mir-opt/dest-prop/cycle.main.DestinationPropagation.diff b/tests/mir-opt/dest-prop/cycle.main.DestinationPropagation.diff
index cfc203c5f..cfc203c5f 100644
--- a/src/test/mir-opt/dest-prop/cycle.main.DestinationPropagation.diff
+++ b/tests/mir-opt/dest-prop/cycle.main.DestinationPropagation.diff
diff --git a/src/test/mir-opt/dest-prop/cycle.rs b/tests/mir-opt/dest-prop/cycle.rs
index 6182878f3..6182878f3 100644
--- a/src/test/mir-opt/dest-prop/cycle.rs
+++ b/tests/mir-opt/dest-prop/cycle.rs
diff --git a/src/test/mir-opt/dest-prop/dead_stores_79191.f.DestinationPropagation.after.mir b/tests/mir-opt/dest-prop/dead_stores_79191.f.DestinationPropagation.after.mir
index 63cac133b..63cac133b 100644
--- a/src/test/mir-opt/dest-prop/dead_stores_79191.f.DestinationPropagation.after.mir
+++ b/tests/mir-opt/dest-prop/dead_stores_79191.f.DestinationPropagation.after.mir
diff --git a/src/test/mir-opt/dest-prop/dead_stores_79191.rs b/tests/mir-opt/dest-prop/dead_stores_79191.rs
index 43e0bf664..43e0bf664 100644
--- a/src/test/mir-opt/dest-prop/dead_stores_79191.rs
+++ b/tests/mir-opt/dest-prop/dead_stores_79191.rs
diff --git a/src/test/mir-opt/dest-prop/dead_stores_better.f.DestinationPropagation.after.mir b/tests/mir-opt/dest-prop/dead_stores_better.f.DestinationPropagation.after.mir
index ba7f76d28..26068931a 100644
--- a/src/test/mir-opt/dest-prop/dead_stores_better.f.DestinationPropagation.after.mir
+++ b/tests/mir-opt/dest-prop/dead_stores_better.f.DestinationPropagation.after.mir
@@ -13,7 +13,6 @@ fn f(_1: usize) -> usize {
     bb0: {
         nop;                             // scope 0 at $DIR/dead_stores_better.rs:+1:9: +1:10
         nop;                             // scope 0 at $DIR/dead_stores_better.rs:+1:13: +1:14
-        nop;                             // scope 1 at $DIR/dead_stores_better.rs:+2:5: +2:10
         nop;                             // scope 1 at $DIR/dead_stores_better.rs:+3:9: +3:10
         nop;                             // scope 1 at $DIR/dead_stores_better.rs:+3:9: +3:10
         nop;                             // scope 1 at $DIR/dead_stores_better.rs:+3:5: +3:10
diff --git a/src/test/mir-opt/dest-prop/dead_stores_better.rs b/tests/mir-opt/dest-prop/dead_stores_better.rs
index 003ad57d8..003ad57d8 100644
--- a/src/test/mir-opt/dest-prop/dead_stores_better.rs
+++ b/tests/mir-opt/dest-prop/dead_stores_better.rs
diff --git a/src/test/mir-opt/dest-prop/simple.nrvo.DestinationPropagation.diff b/tests/mir-opt/dest-prop/simple.nrvo.DestinationPropagation.diff
index c2a3a0025..c2a3a0025 100644
--- a/src/test/mir-opt/dest-prop/simple.nrvo.DestinationPropagation.diff
+++ b/tests/mir-opt/dest-prop/simple.nrvo.DestinationPropagation.diff
diff --git a/src/test/mir-opt/dest-prop/simple.rs b/tests/mir-opt/dest-prop/simple.rs
index d4c27228f..d4c27228f 100644
--- a/src/test/mir-opt/dest-prop/simple.rs
+++ b/tests/mir-opt/dest-prop/simple.rs
diff --git a/src/test/mir-opt/dest-prop/union.main.DestinationPropagation.diff b/tests/mir-opt/dest-prop/union.main.DestinationPropagation.diff
index 85d994bc8..fbed31788 100644
--- a/src/test/mir-opt/dest-prop/union.main.DestinationPropagation.diff
+++ b/tests/mir-opt/dest-prop/union.main.DestinationPropagation.diff
@@ -25,11 +25,8 @@
       }
   
       bb1: {
-          nop;                             // scope 0 at $DIR/union.rs:+5:14: +5:30
-          nop;                             // scope 0 at $DIR/union.rs:+5:14: +5:30
           StorageDead(_2);                 // scope 0 at $DIR/union.rs:+5:29: +5:30
           StorageLive(_3);                 // scope 1 at $DIR/union.rs:+7:10: +7:26
-          nop;                             // scope 2 at $DIR/union.rs:+7:19: +7:24
           StorageDead(_3);                 // scope 1 at $DIR/union.rs:+7:26: +7:27
           StorageDead(_1);                 // scope 0 at $DIR/union.rs:+8:1: +8:2
           return;                          // scope 0 at $DIR/union.rs:+8:2: +8:2
diff --git a/src/test/mir-opt/dest-prop/union.rs b/tests/mir-opt/dest-prop/union.rs
index eb6cb09fc..eb6cb09fc 100644
--- a/src/test/mir-opt/dest-prop/union.rs
+++ b/tests/mir-opt/dest-prop/union.rs
diff --git a/tests/mir-opt/dest-prop/unreachable.f.DestinationPropagation.diff b/tests/mir-opt/dest-prop/unreachable.f.DestinationPropagation.diff
new file mode 100644
index 000000000..9ea756c27
--- /dev/null
+++ b/tests/mir-opt/dest-prop/unreachable.f.DestinationPropagation.diff
@@ -0,0 +1,86 @@
+- // MIR for `f` before DestinationPropagation
++ // MIR for `f` after DestinationPropagation
+  
+  fn f(_1: T) -> () {
+      debug a => _1;                       // in scope 0 at $DIR/unreachable.rs:+0:19: +0:20
+      let mut _0: ();                      // return place in scope 0 at $DIR/unreachable.rs:+0:25: +0:25
+      let _2: T;                           // in scope 0 at $DIR/unreachable.rs:+1:9: +1:10
+      let mut _3: bool;                    // in scope 0 at $DIR/unreachable.rs:+2:8: +2:13
+      let _4: ();                          // in scope 0 at $DIR/unreachable.rs:+3:9: +3:16
+      let mut _5: T;                       // in scope 0 at $DIR/unreachable.rs:+3:11: +3:12
+      let mut _6: T;                       // in scope 0 at $DIR/unreachable.rs:+3:14: +3:15
+      let _7: ();                          // in scope 0 at $DIR/unreachable.rs:+5:9: +5:16
+      let mut _8: T;                       // in scope 0 at $DIR/unreachable.rs:+5:11: +5:12
+      let mut _9: T;                       // in scope 0 at $DIR/unreachable.rs:+5:14: +5:15
+      scope 1 {
+-         debug b => _2;                   // in scope 1 at $DIR/unreachable.rs:+1:9: +1:10
++         debug b => _1;                   // in scope 1 at $DIR/unreachable.rs:+1:9: +1:10
+      }
+  
+      bb0: {
+-         StorageLive(_2);                 // scope 0 at $DIR/unreachable.rs:+1:9: +1:10
+-         _2 = _1;                         // scope 0 at $DIR/unreachable.rs:+1:13: +1:14
++         nop;                             // scope 0 at $DIR/unreachable.rs:+1:9: +1:10
++         nop;                             // scope 0 at $DIR/unreachable.rs:+1:13: +1:14
+          StorageLive(_3);                 // scope 1 at $DIR/unreachable.rs:+2:8: +2:13
+          _3 = const false;                // scope 1 at $DIR/unreachable.rs:+2:8: +2:13
+-         goto -> bb3;                     // scope 1 at $DIR/unreachable.rs:+2:8: +2:13
++         goto -> bb1;                     // scope 1 at $DIR/unreachable.rs:+2:8: +2:13
+      }
+  
+      bb1: {
+-         StorageLive(_4);                 // scope 1 at $DIR/unreachable.rs:+3:9: +3:16
+-         StorageLive(_5);                 // scope 1 at $DIR/unreachable.rs:+3:11: +3:12
+-         _5 = _1;                         // scope 1 at $DIR/unreachable.rs:+3:11: +3:12
+-         StorageLive(_6);                 // scope 1 at $DIR/unreachable.rs:+3:14: +3:15
+-         _6 = _2;                         // scope 1 at $DIR/unreachable.rs:+3:14: +3:15
+-         _4 = g::<T>(move _5, move _6) -> bb2; // scope 1 at $DIR/unreachable.rs:+3:9: +3:16
+-                                          // mir::Constant
+-                                          // + span: $DIR/unreachable.rs:11:9: 11:10
+-                                          // + literal: Const { ty: fn(T, T) {g::<T>}, val: Value(<ZST>) }
+-     }
+- 
+-     bb2: {
+-         StorageDead(_6);                 // scope 1 at $DIR/unreachable.rs:+3:15: +3:16
+-         StorageDead(_5);                 // scope 1 at $DIR/unreachable.rs:+3:15: +3:16
+-         StorageDead(_4);                 // scope 1 at $DIR/unreachable.rs:+3:16: +3:17
+-         _0 = const ();                   // scope 1 at $DIR/unreachable.rs:+2:14: +4:6
+-         goto -> bb5;                     // scope 1 at $DIR/unreachable.rs:+2:5: +6:6
+-     }
+- 
+-     bb3: {
+          StorageLive(_7);                 // scope 1 at $DIR/unreachable.rs:+5:9: +5:16
+-         StorageLive(_8);                 // scope 1 at $DIR/unreachable.rs:+5:11: +5:12
+-         _8 = _2;                         // scope 1 at $DIR/unreachable.rs:+5:11: +5:12
++         nop;                             // scope 1 at $DIR/unreachable.rs:+5:11: +5:12
++         nop;                             // scope 1 at $DIR/unreachable.rs:+5:11: +5:12
+          StorageLive(_9);                 // scope 1 at $DIR/unreachable.rs:+5:14: +5:15
+-         _9 = _2;                         // scope 1 at $DIR/unreachable.rs:+5:14: +5:15
+-         _7 = g::<T>(move _8, move _9) -> bb4; // scope 1 at $DIR/unreachable.rs:+5:9: +5:16
++         _9 = _1;                         // scope 1 at $DIR/unreachable.rs:+5:14: +5:15
++         _7 = g::<T>(move _1, move _9) -> bb2; // scope 1 at $DIR/unreachable.rs:+5:9: +5:16
+                                           // mir::Constant
+                                           // + span: $DIR/unreachable.rs:13:9: 13:10
+                                           // + literal: Const { ty: fn(T, T) {g::<T>}, val: Value(<ZST>) }
+      }
+  
+-     bb4: {
++     bb2: {
+          StorageDead(_9);                 // scope 1 at $DIR/unreachable.rs:+5:15: +5:16
+-         StorageDead(_8);                 // scope 1 at $DIR/unreachable.rs:+5:15: +5:16
++         nop;                             // scope 1 at $DIR/unreachable.rs:+5:15: +5:16
+          StorageDead(_7);                 // scope 1 at $DIR/unreachable.rs:+5:16: +5:17
+          _0 = const ();                   // scope 1 at $DIR/unreachable.rs:+4:12: +6:6
+-         goto -> bb5;                     // scope 1 at $DIR/unreachable.rs:+2:5: +6:6
++         goto -> bb3;                     // scope 1 at $DIR/unreachable.rs:+2:5: +6:6
+      }
+  
+-     bb5: {
++     bb3: {
+          StorageDead(_3);                 // scope 1 at $DIR/unreachable.rs:+6:5: +6:6
+-         StorageDead(_2);                 // scope 0 at $DIR/unreachable.rs:+7:1: +7:2
++         nop;                             // scope 0 at $DIR/unreachable.rs:+7:1: +7:2
+          return;                          // scope 0 at $DIR/unreachable.rs:+7:2: +7:2
+      }
+  }
+  
diff --git a/tests/mir-opt/dest-prop/unreachable.rs b/tests/mir-opt/dest-prop/unreachable.rs
new file mode 100644
index 000000000..32b5def98
--- /dev/null
+++ b/tests/mir-opt/dest-prop/unreachable.rs
@@ -0,0 +1,18 @@
+// Check that unreachable code is removed after the destination propagation.
+// Regression test for issue #105428.
+//
+// compile-flags: --crate-type=lib -Zmir-opt-level=0
+// compile-flags: -Zmir-enable-passes=+ConstProp,+SimplifyConstCondition-after-const-prop,+DestinationPropagation
+
+// EMIT_MIR unreachable.f.DestinationPropagation.diff
+pub fn f<T: Copy>(a: T) {
+    let b = a;
+    if false {
+        g(a, b);
+    } else {
+        g(b, b);
+    }
+}
+
+#[inline(never)]
+pub fn g<T: Copy>(_: T, _: T) {}
diff --git a/tests/mir-opt/div_overflow.const_dividend.PreCodegen.after.mir b/tests/mir-opt/div_overflow.const_dividend.PreCodegen.after.mir
new file mode 100644
index 000000000..d7f66a6bf
--- /dev/null
+++ b/tests/mir-opt/div_overflow.const_dividend.PreCodegen.after.mir
@@ -0,0 +1,17 @@
+// MIR for `const_dividend` after PreCodegen
+
+fn const_dividend(_1: i32) -> i32 {
+    debug a => _1;                       // in scope 0 at $DIR/div_overflow.rs:+0:23: +0:24
+    let mut _0: i32;                     // return place in scope 0 at $DIR/div_overflow.rs:+0:34: +0:37
+    let mut _2: bool;                    // in scope 0 at $DIR/div_overflow.rs:+1:5: +1:12
+
+    bb0: {
+        _2 = Eq(_1, const 0_i32);        // scope 0 at $DIR/div_overflow.rs:+1:5: +1:12
+        assert(!move _2, "attempt to divide `{}` by zero", const 256_i32) -> bb1; // scope 0 at $DIR/div_overflow.rs:+1:5: +1:12
+    }
+
+    bb1: {
+        _0 = Div(const 256_i32, move _1); // scope 0 at $DIR/div_overflow.rs:+1:5: +1:12
+        return;                          // scope 0 at $DIR/div_overflow.rs:+2:2: +2:2
+    }
+}
diff --git a/tests/mir-opt/div_overflow.const_divisor.PreCodegen.after.mir b/tests/mir-opt/div_overflow.const_divisor.PreCodegen.after.mir
new file mode 100644
index 000000000..7b7ab1978
--- /dev/null
+++ b/tests/mir-opt/div_overflow.const_divisor.PreCodegen.after.mir
@@ -0,0 +1,11 @@
+// MIR for `const_divisor` after PreCodegen
+
+fn const_divisor(_1: i32) -> i32 {
+    debug a => _1;                       // in scope 0 at $DIR/div_overflow.rs:+0:22: +0:23
+    let mut _0: i32;                     // return place in scope 0 at $DIR/div_overflow.rs:+0:33: +0:36
+
+    bb0: {
+        _0 = Div(move _1, const 256_i32); // scope 0 at $DIR/div_overflow.rs:+1:5: +1:12
+        return;                          // scope 0 at $DIR/div_overflow.rs:+2:2: +2:2
+    }
+}
diff --git a/tests/mir-opt/div_overflow.rs b/tests/mir-opt/div_overflow.rs
new file mode 100644
index 000000000..10ce5bc0f
--- /dev/null
+++ b/tests/mir-opt/div_overflow.rs
@@ -0,0 +1,18 @@
+// compile-flags: -Copt-level=0 -Coverflow-checks=yes
+
+// Tests that division with a const does not emit a panicking branch for overflow
+
+// EMIT_MIR div_overflow.const_divisor.PreCodegen.after.mir
+pub fn const_divisor(a: i32) -> i32 {
+    a / 256
+}
+
+// EMIT_MIR div_overflow.const_dividend.PreCodegen.after.mir
+pub fn const_dividend(a: i32) -> i32 {
+    256 / a
+}
+
+fn main() {
+    const_divisor(123);
+    const_dividend(123);
+}
diff --git a/src/test/mir-opt/early_otherwise_branch.opt1.EarlyOtherwiseBranch.diff b/tests/mir-opt/early_otherwise_branch.opt1.EarlyOtherwiseBranch.diff
index 89d8106ae..98a02ee38 100644
--- a/src/test/mir-opt/early_otherwise_branch.opt1.EarlyOtherwiseBranch.diff
+++ b/tests/mir-opt/early_otherwise_branch.opt1.EarlyOtherwiseBranch.diff
@@ -31,13 +31,13 @@
           StorageDead(_5);                 // scope 0 at $DIR/early_otherwise_branch.rs:+1:16: +1:17
           StorageDead(_4);                 // scope 0 at $DIR/early_otherwise_branch.rs:+1:16: +1:17
           _7 = discriminant((_3.0: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch.rs:+1:11: +1:17
--         switchInt(move _7) -> [1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
+-         switchInt(move _7) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         StorageLive(_10);                // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         _10 = discriminant((_3.1: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         StorageLive(_11);                // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         _11 = Ne(_7, move _10);          // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         StorageDead(_10);                // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
-+         switchInt(move _11) -> [false: bb4, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
++         switchInt(move _11) -> [0: bb4, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
       }
   
       bb1: {
@@ -49,7 +49,7 @@
   
       bb2: {
 -         _6 = discriminant((_3.1: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch.rs:+1:11: +1:17
--         switchInt(move _6) -> [1_isize: bb3, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
+-         switchInt(move _6) -> [1: bb3, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 -     }
 - 
 -     bb3: {
@@ -72,7 +72,7 @@
 + 
 +     bb4: {
 +         StorageDead(_11);                // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
-+         switchInt(_7) -> [1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
++         switchInt(_7) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
       }
   }
   
diff --git a/src/test/mir-opt/early_otherwise_branch.opt2.EarlyOtherwiseBranch.diff b/tests/mir-opt/early_otherwise_branch.opt2.EarlyOtherwiseBranch.diff
index 1a9efa930..aa75c44b8 100644
--- a/src/test/mir-opt/early_otherwise_branch.opt2.EarlyOtherwiseBranch.diff
+++ b/tests/mir-opt/early_otherwise_branch.opt2.EarlyOtherwiseBranch.diff
@@ -32,18 +32,18 @@
           StorageDead(_5);                 // scope 0 at $DIR/early_otherwise_branch.rs:+1:16: +1:17
           StorageDead(_4);                 // scope 0 at $DIR/early_otherwise_branch.rs:+1:16: +1:17
           _8 = discriminant((_3.0: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch.rs:+1:11: +1:17
--         switchInt(move _8) -> [0_isize: bb1, 1_isize: bb3, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
+-         switchInt(move _8) -> [0: bb1, 1: bb3, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         StorageLive(_11);                // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         _11 = discriminant((_3.1: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         StorageLive(_12);                // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         _12 = Ne(_8, move _11);          // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         StorageDead(_11);                // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
-+         switchInt(move _12) -> [false: bb5, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
++         switchInt(move _12) -> [0: bb5, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
       }
   
       bb1: {
 -         _6 = discriminant((_3.1: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch.rs:+1:11: +1:17
--         switchInt(move _6) -> [0_isize: bb5, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
+-         switchInt(move _6) -> [0: bb5, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 -     }
 - 
 -     bb2: {
@@ -55,7 +55,7 @@
   
 -     bb3: {
 -         _7 = discriminant((_3.1: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch.rs:+1:11: +1:17
--         switchInt(move _7) -> [1_isize: bb4, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
+-         switchInt(move _7) -> [1: bb4, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 -     }
 - 
 -     bb4: {
@@ -86,7 +86,7 @@
 + 
 +     bb5: {
 +         StorageDead(_12);                // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
-+         switchInt(_8) -> [0_isize: bb3, 1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
++         switchInt(_8) -> [0: bb3, 1: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
       }
   }
   
diff --git a/src/test/mir-opt/early_otherwise_branch.opt3.EarlyOtherwiseBranch.diff b/tests/mir-opt/early_otherwise_branch.opt3.EarlyOtherwiseBranch.diff
index 309a72ae5..cea6ff7cd 100644
--- a/src/test/mir-opt/early_otherwise_branch.opt3.EarlyOtherwiseBranch.diff
+++ b/tests/mir-opt/early_otherwise_branch.opt3.EarlyOtherwiseBranch.diff
@@ -31,13 +31,13 @@
           StorageDead(_5);                 // scope 0 at $DIR/early_otherwise_branch.rs:+1:16: +1:17
           StorageDead(_4);                 // scope 0 at $DIR/early_otherwise_branch.rs:+1:16: +1:17
           _7 = discriminant((_3.0: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch.rs:+1:11: +1:17
--         switchInt(move _7) -> [1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
+-         switchInt(move _7) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         StorageLive(_10);                // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         _10 = discriminant((_3.1: std::option::Option<bool>)); // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         StorageLive(_11);                // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         _11 = Ne(_7, move _10);          // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 +         StorageDead(_10);                // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
-+         switchInt(move _11) -> [false: bb4, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
++         switchInt(move _11) -> [0: bb4, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
       }
   
       bb1: {
@@ -49,7 +49,7 @@
   
       bb2: {
 -         _6 = discriminant((_3.1: std::option::Option<bool>)); // scope 0 at $DIR/early_otherwise_branch.rs:+1:11: +1:17
--         switchInt(move _6) -> [1_isize: bb3, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
+-         switchInt(move _6) -> [1: bb3, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
 -     }
 - 
 -     bb3: {
@@ -72,7 +72,7 @@
 + 
 +     bb4: {
 +         StorageDead(_11);                // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
-+         switchInt(_7) -> [1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
++         switchInt(_7) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch.rs:+1:5: +1:17
       }
   }
   
diff --git a/src/test/mir-opt/early_otherwise_branch.rs b/tests/mir-opt/early_otherwise_branch.rs
index 7be9fbd03..7be9fbd03 100644
--- a/src/test/mir-opt/early_otherwise_branch.rs
+++ b/tests/mir-opt/early_otherwise_branch.rs
diff --git a/src/test/mir-opt/early_otherwise_branch_3_element_tuple.opt1.EarlyOtherwiseBranch.diff b/tests/mir-opt/early_otherwise_branch_3_element_tuple.opt1.EarlyOtherwiseBranch.diff
index 9574f32f7..b90d70ce4 100644
--- a/src/test/mir-opt/early_otherwise_branch_3_element_tuple.opt1.EarlyOtherwiseBranch.diff
+++ b/tests/mir-opt/early_otherwise_branch_3_element_tuple.opt1.EarlyOtherwiseBranch.diff
@@ -42,13 +42,13 @@
           StorageDead(_6);                 // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:19: +1:20
           StorageDead(_5);                 // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:19: +1:20
           _10 = discriminant((_4.0: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:11: +1:20
--         switchInt(move _10) -> [1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
+-         switchInt(move _10) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
 +         StorageLive(_14);                // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
 +         _14 = discriminant((_4.1: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
 +         StorageLive(_15);                // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
 +         _15 = Ne(_10, move _14);         // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
 +         StorageDead(_14);                // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
-+         switchInt(move _15) -> [false: bb5, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
++         switchInt(move _15) -> [0: bb5, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
       }
   
       bb1: {
@@ -61,13 +61,13 @@
   
       bb2: {
 -         _9 = discriminant((_4.1: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:11: +1:20
--         switchInt(move _9) -> [1_isize: bb3, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
+-         switchInt(move _9) -> [1: bb3, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
 -     }
 - 
 -     bb3: {
           _8 = discriminant((_4.2: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:11: +1:20
--         switchInt(move _8) -> [1_isize: bb4, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
-+         switchInt(move _8) -> [1_isize: bb3, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
+-         switchInt(move _8) -> [1: bb4, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
++         switchInt(move _8) -> [1: bb3, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
       }
   
 -     bb4: {
@@ -94,7 +94,7 @@
 + 
 +     bb5: {
 +         StorageDead(_15);                // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
-+         switchInt(_10) -> [1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
++         switchInt(_10) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_3_element_tuple.rs:+1:5: +1:20
       }
   }
   
diff --git a/src/test/mir-opt/early_otherwise_branch_3_element_tuple.rs b/tests/mir-opt/early_otherwise_branch_3_element_tuple.rs
index 76055e133..76055e133 100644
--- a/src/test/mir-opt/early_otherwise_branch_3_element_tuple.rs
+++ b/tests/mir-opt/early_otherwise_branch_3_element_tuple.rs
diff --git a/src/test/mir-opt/early_otherwise_branch_68867.rs b/tests/mir-opt/early_otherwise_branch_68867.rs
index a6a56f3a9..a6a56f3a9 100644
--- a/src/test/mir-opt/early_otherwise_branch_68867.rs
+++ b/tests/mir-opt/early_otherwise_branch_68867.rs
diff --git a/src/test/mir-opt/early_otherwise_branch_68867.try_sum.EarlyOtherwiseBranch.diff b/tests/mir-opt/early_otherwise_branch_68867.try_sum.EarlyOtherwiseBranch.diff
index 6bc025bb5..9edd1a39f 100644
--- a/src/test/mir-opt/early_otherwise_branch_68867.try_sum.EarlyOtherwiseBranch.diff
+++ b/tests/mir-opt/early_otherwise_branch_68867.try_sum.EarlyOtherwiseBranch.diff
@@ -80,13 +80,13 @@
           StorageDead(_5);                 // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:23: +5:24
           _34 = deref_copy (_4.0: &ViewportPercentageLength); // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:14: +5:24
           _11 = discriminant((*_34));      // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:14: +5:24
-          switchInt(move _11) -> [0_isize: bb1, 1_isize: bb3, 2_isize: bb4, 3_isize: bb5, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:8: +5:24
+          switchInt(move _11) -> [0: bb1, 1: bb3, 2: bb4, 3: bb5, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:8: +5:24
       }
   
       bb1: {
           _35 = deref_copy (_4.1: &ViewportPercentageLength); // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:14: +5:24
           _7 = discriminant((*_35));       // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:14: +5:24
-          switchInt(move _7) -> [0_isize: bb6, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:8: +5:24
+          switchInt(move _7) -> [0: bb6, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:8: +5:24
       }
   
       bb2: {
@@ -104,19 +104,19 @@
       bb3: {
           _36 = deref_copy (_4.1: &ViewportPercentageLength); // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:14: +5:24
           _8 = discriminant((*_36));       // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:14: +5:24
-          switchInt(move _8) -> [1_isize: bb7, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:8: +5:24
+          switchInt(move _8) -> [1: bb7, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:8: +5:24
       }
   
       bb4: {
           _37 = deref_copy (_4.1: &ViewportPercentageLength); // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:14: +5:24
           _9 = discriminant((*_37));       // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:14: +5:24
-          switchInt(move _9) -> [2_isize: bb8, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:8: +5:24
+          switchInt(move _9) -> [2: bb8, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:8: +5:24
       }
   
       bb5: {
           _38 = deref_copy (_4.1: &ViewportPercentageLength); // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:14: +5:24
           _10 = discriminant((*_38));      // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:14: +5:24
-          switchInt(move _10) -> [3_isize: bb9, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:8: +5:24
+          switchInt(move _10) -> [3: bb9, otherwise: bb2]; // scope 0 at $DIR/early_otherwise_branch_68867.rs:+5:8: +5:24
       }
   
       bb6: {
diff --git a/src/test/mir-opt/early_otherwise_branch_noopt.noopt1.EarlyOtherwiseBranch.diff b/tests/mir-opt/early_otherwise_branch_noopt.noopt1.EarlyOtherwiseBranch.diff
index 321f57951..82d8b2fc5 100644
--- a/src/test/mir-opt/early_otherwise_branch_noopt.noopt1.EarlyOtherwiseBranch.diff
+++ b/tests/mir-opt/early_otherwise_branch_noopt.noopt1.EarlyOtherwiseBranch.diff
@@ -38,12 +38,12 @@
           StorageDead(_5);                 // scope 0 at $DIR/early_otherwise_branch_noopt.rs:+1:16: +1:17
           StorageDead(_4);                 // scope 0 at $DIR/early_otherwise_branch_noopt.rs:+1:16: +1:17
           _8 = discriminant((_3.0: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch_noopt.rs:+1:11: +1:17
-          switchInt(move _8) -> [0_isize: bb1, 1_isize: bb4, otherwise: bb3]; // scope 0 at $DIR/early_otherwise_branch_noopt.rs:+1:5: +1:17
+          switchInt(move _8) -> [0: bb1, 1: bb4, otherwise: bb3]; // scope 0 at $DIR/early_otherwise_branch_noopt.rs:+1:5: +1:17
       }
   
       bb1: {
           _6 = discriminant((_3.1: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch_noopt.rs:+1:11: +1:17
-          switchInt(move _6) -> [0_isize: bb2, 1_isize: bb7, otherwise: bb3]; // scope 0 at $DIR/early_otherwise_branch_noopt.rs:+1:5: +1:17
+          switchInt(move _6) -> [0: bb2, 1: bb7, otherwise: bb3]; // scope 0 at $DIR/early_otherwise_branch_noopt.rs:+1:5: +1:17
       }
   
       bb2: {
@@ -57,7 +57,7 @@
   
       bb4: {
           _7 = discriminant((_3.1: std::option::Option<u32>)); // scope 0 at $DIR/early_otherwise_branch_noopt.rs:+1:11: +1:17
-          switchInt(move _7) -> [0_isize: bb6, 1_isize: bb5, otherwise: bb3]; // scope 0 at $DIR/early_otherwise_branch_noopt.rs:+1:5: +1:17
+          switchInt(move _7) -> [0: bb6, 1: bb5, otherwise: bb3]; // scope 0 at $DIR/early_otherwise_branch_noopt.rs:+1:5: +1:17
       }
   
       bb5: {
diff --git a/src/test/mir-opt/early_otherwise_branch_noopt.rs b/tests/mir-opt/early_otherwise_branch_noopt.rs
index ef766bbd4..ef766bbd4 100644
--- a/src/test/mir-opt/early_otherwise_branch_noopt.rs
+++ b/tests/mir-opt/early_otherwise_branch_noopt.rs
diff --git a/src/test/mir-opt/early_otherwise_branch_soundness.no_deref_ptr.EarlyOtherwiseBranch.diff b/tests/mir-opt/early_otherwise_branch_soundness.no_deref_ptr.EarlyOtherwiseBranch.diff
index 8b556acb2..a3fa2529b 100644
--- a/src/test/mir-opt/early_otherwise_branch_soundness.no_deref_ptr.EarlyOtherwiseBranch.diff
+++ b/tests/mir-opt/early_otherwise_branch_soundness.no_deref_ptr.EarlyOtherwiseBranch.diff
@@ -14,7 +14,7 @@
   
       bb0: {
           _3 = discriminant(_1);           // scope 0 at $DIR/early_otherwise_branch_soundness.rs:+1:11: +1:12
-          switchInt(move _3) -> [1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_soundness.rs:+1:5: +1:12
+          switchInt(move _3) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/early_otherwise_branch_soundness.rs:+1:5: +1:12
       }
   
       bb1: {
@@ -24,7 +24,7 @@
   
       bb2: {
           _4 = discriminant((*_2));        // scope 0 at $DIR/early_otherwise_branch_soundness.rs:+3:26: +3:28
-          switchInt(move _4) -> [1_isize: bb4, otherwise: bb3]; // scope 0 at $DIR/early_otherwise_branch_soundness.rs:+3:20: +3:28
+          switchInt(move _4) -> [1: bb4, otherwise: bb3]; // scope 0 at $DIR/early_otherwise_branch_soundness.rs:+3:20: +3:28
       }
   
       bb3: {
diff --git a/src/test/mir-opt/early_otherwise_branch_soundness.no_downcast.EarlyOtherwiseBranch.diff b/tests/mir-opt/early_otherwise_branch_soundness.no_downcast.EarlyOtherwiseBranch.diff
index 659aed18f..6d0224b54 100644
--- a/src/test/mir-opt/early_otherwise_branch_soundness.no_downcast.EarlyOtherwiseBranch.diff
+++ b/tests/mir-opt/early_otherwise_branch_soundness.no_downcast.EarlyOtherwiseBranch.diff
@@ -12,13 +12,13 @@
   
       bb0: {
           _3 = discriminant((*_1));        // scope 1 at $DIR/early_otherwise_branch_soundness.rs:+1:12: +1:31
-          switchInt(move _3) -> [1_isize: bb1, otherwise: bb3]; // scope 1 at $DIR/early_otherwise_branch_soundness.rs:+1:12: +1:31
+          switchInt(move _3) -> [1: bb1, otherwise: bb3]; // scope 1 at $DIR/early_otherwise_branch_soundness.rs:+1:12: +1:31
       }
   
       bb1: {
           _4 = deref_copy (((*_1) as Some).0: &E<'_>); // scope 1 at $DIR/early_otherwise_branch_soundness.rs:+1:12: +1:31
           _2 = discriminant((*_4));        // scope 1 at $DIR/early_otherwise_branch_soundness.rs:+1:12: +1:31
-          switchInt(move _2) -> [1_isize: bb2, otherwise: bb3]; // scope 1 at $DIR/early_otherwise_branch_soundness.rs:+1:12: +1:31
+          switchInt(move _2) -> [1: bb2, otherwise: bb3]; // scope 1 at $DIR/early_otherwise_branch_soundness.rs:+1:12: +1:31
       }
   
       bb2: {
diff --git a/src/test/mir-opt/early_otherwise_branch_soundness.rs b/tests/mir-opt/early_otherwise_branch_soundness.rs
index cd4589232..cd4589232 100644
--- a/src/test/mir-opt/early_otherwise_branch_soundness.rs
+++ b/tests/mir-opt/early_otherwise_branch_soundness.rs
diff --git a/src/test/mir-opt/equal_true.opt.InstCombine.diff b/tests/mir-opt/equal_true.opt.InstCombine.diff
index 89982308e..8b542a7c1 100644
--- a/src/test/mir-opt/equal_true.opt.InstCombine.diff
+++ b/tests/mir-opt/equal_true.opt.InstCombine.diff
@@ -14,7 +14,7 @@
 -         _2 = Eq(move _3, const true);    // scope 0 at $DIR/equal_true.rs:+1:8: +1:17
 +         _2 = move _3;                    // scope 0 at $DIR/equal_true.rs:+1:8: +1:17
           StorageDead(_3);                 // scope 0 at $DIR/equal_true.rs:+1:16: +1:17
-          switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/equal_true.rs:+1:8: +1:17
+          switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/equal_true.rs:+1:8: +1:17
       }
   
       bb1: {
diff --git a/src/test/mir-opt/equal_true.rs b/tests/mir-opt/equal_true.rs
index 717d10c6d..717d10c6d 100644
--- a/src/test/mir-opt/equal_true.rs
+++ b/tests/mir-opt/equal_true.rs
diff --git a/src/test/mir-opt/exponential_or.match_tuple.SimplifyCfg-initial.after.mir b/tests/mir-opt/exponential_or.match_tuple.SimplifyCfg-initial.after.mir
index 08481777e..ab9550499 100644
--- a/src/test/mir-opt/exponential_or.match_tuple.SimplifyCfg-initial.after.mir
+++ b/tests/mir-opt/exponential_or.match_tuple.SimplifyCfg-initial.after.mir
@@ -19,7 +19,7 @@ fn match_tuple(_1: (u32, bool, Option<i32>, u32)) -> u32 {
 
     bb0: {
         FakeRead(ForMatchedPlace(None), _1); // scope 0 at $DIR/exponential_or.rs:+1:11: +1:12
-        switchInt((_1.0: u32)) -> [1_u32: bb2, 4_u32: bb2, otherwise: bb1]; // scope 0 at $DIR/exponential_or.rs:+2:15: +2:20
+        switchInt((_1.0: u32)) -> [1: bb2, 4: bb2, otherwise: bb1]; // scope 0 at $DIR/exponential_or.rs:+2:15: +2:20
     }
 
     bb1: {
@@ -29,31 +29,31 @@ fn match_tuple(_1: (u32, bool, Option<i32>, u32)) -> u32 {
 
     bb2: {
         _2 = discriminant((_1.2: std::option::Option<i32>)); // scope 0 at $DIR/exponential_or.rs:+2:37: +2:55
-        switchInt(move _2) -> [0_isize: bb4, 1_isize: bb3, otherwise: bb1]; // scope 0 at $DIR/exponential_or.rs:+2:37: +2:55
+        switchInt(move _2) -> [0: bb4, 1: bb3, otherwise: bb1]; // scope 0 at $DIR/exponential_or.rs:+2:37: +2:55
     }
 
     bb3: {
-        switchInt((((_1.2: std::option::Option<i32>) as Some).0: i32)) -> [1_i32: bb4, 8_i32: bb4, otherwise: bb1]; // scope 0 at $DIR/exponential_or.rs:+2:37: +2:55
+        switchInt((((_1.2: std::option::Option<i32>) as Some).0: i32)) -> [1: bb4, 8: bb4, otherwise: bb1]; // scope 0 at $DIR/exponential_or.rs:+2:37: +2:55
     }
 
     bb4: {
         _5 = Le(const 6_u32, (_1.3: u32)); // scope 0 at $DIR/exponential_or.rs:+2:62: +2:67
-        switchInt(move _5) -> [false: bb6, otherwise: bb5]; // scope 0 at $DIR/exponential_or.rs:+2:62: +2:67
+        switchInt(move _5) -> [0: bb6, otherwise: bb5]; // scope 0 at $DIR/exponential_or.rs:+2:62: +2:67
     }
 
     bb5: {
         _6 = Le((_1.3: u32), const 9_u32); // scope 0 at $DIR/exponential_or.rs:+2:62: +2:67
-        switchInt(move _6) -> [false: bb6, otherwise: bb8]; // scope 0 at $DIR/exponential_or.rs:+2:62: +2:67
+        switchInt(move _6) -> [0: bb6, otherwise: bb8]; // scope 0 at $DIR/exponential_or.rs:+2:62: +2:67
     }
 
     bb6: {
         _3 = Le(const 13_u32, (_1.3: u32)); // scope 0 at $DIR/exponential_or.rs:+2:70: +2:77
-        switchInt(move _3) -> [false: bb1, otherwise: bb7]; // scope 0 at $DIR/exponential_or.rs:+2:70: +2:77
+        switchInt(move _3) -> [0: bb1, otherwise: bb7]; // scope 0 at $DIR/exponential_or.rs:+2:70: +2:77
     }
 
     bb7: {
         _4 = Le((_1.3: u32), const 16_u32); // scope 0 at $DIR/exponential_or.rs:+2:70: +2:77
-        switchInt(move _4) -> [false: bb1, otherwise: bb8]; // scope 0 at $DIR/exponential_or.rs:+2:70: +2:77
+        switchInt(move _4) -> [0: bb1, otherwise: bb8]; // scope 0 at $DIR/exponential_or.rs:+2:70: +2:77
     }
 
     bb8: {
diff --git a/src/test/mir-opt/exponential_or.rs b/tests/mir-opt/exponential_or.rs
index 0b8be8385..0b8be8385 100644
--- a/src/test/mir-opt/exponential_or.rs
+++ b/tests/mir-opt/exponential_or.rs
diff --git a/src/test/mir-opt/fn_ptr_shim.core.ops-function-Fn-call.AddMovesForPackedDrops.before.mir b/tests/mir-opt/fn_ptr_shim.core.ops-function-Fn-call.AddMovesForPackedDrops.before.mir
index c63433d36..c63433d36 100644
--- a/src/test/mir-opt/fn_ptr_shim.core.ops-function-Fn-call.AddMovesForPackedDrops.before.mir
+++ b/tests/mir-opt/fn_ptr_shim.core.ops-function-Fn-call.AddMovesForPackedDrops.before.mir
diff --git a/src/test/mir-opt/fn_ptr_shim.rs b/tests/mir-opt/fn_ptr_shim.rs
index 64fbdc9de..64fbdc9de 100644
--- a/src/test/mir-opt/fn_ptr_shim.rs
+++ b/tests/mir-opt/fn_ptr_shim.rs
diff --git a/src/test/mir-opt/funky_arms.float_to_exponential_common.ConstProp.diff b/tests/mir-opt/funky_arms.float_to_exponential_common.ConstProp.diff
index 6ab63e82e..c1c2cde71 100644
--- a/src/test/mir-opt/funky_arms.float_to_exponential_common.ConstProp.diff
+++ b/tests/mir-opt/funky_arms.float_to_exponential_common.ConstProp.diff
@@ -47,7 +47,7 @@
       bb1: {
           StorageDead(_5);                 // scope 0 at $DIR/funky_arms.rs:+4:36: +4:37
           StorageLive(_6);                 // scope 1 at $DIR/funky_arms.rs:+8:9: +8:13
-          switchInt(_4) -> [false: bb3, otherwise: bb2]; // scope 1 at $DIR/funky_arms.rs:+8:16: +8:32
+          switchInt(_4) -> [0: bb3, otherwise: bb2]; // scope 1 at $DIR/funky_arms.rs:+8:16: +8:32
       }
   
       bb2: {
@@ -75,7 +75,7 @@
       bb5: {
           StorageDead(_8);                 // scope 3 at $DIR/funky_arms.rs:+13:44: +13:45
           _9 = discriminant(_7);           // scope 3 at $DIR/funky_arms.rs:+13:12: +13:27
-          switchInt(move _9) -> [1_isize: bb6, otherwise: bb8]; // scope 3 at $DIR/funky_arms.rs:+13:12: +13:27
+          switchInt(move _9) -> [1: bb6, otherwise: bb8]; // scope 3 at $DIR/funky_arms.rs:+13:12: +13:27
       }
   
       bb6: {
diff --git a/src/test/mir-opt/funky_arms.rs b/tests/mir-opt/funky_arms.rs
index 3e70d85e0..3e70d85e0 100644
--- a/src/test/mir-opt/funky_arms.rs
+++ b/tests/mir-opt/funky_arms.rs
diff --git a/src/test/mir-opt/generator_drop_cleanup.main-{closure#0}.generator_drop.0.mir b/tests/mir-opt/generator_drop_cleanup.main-{closure#0}.generator_drop.0.mir
index c3b08bf06..a8e090020 100644
--- a/src/test/mir-opt/generator_drop_cleanup.main-{closure#0}.generator_drop.0.mir
+++ b/tests/mir-opt/generator_drop_cleanup.main-{closure#0}.generator_drop.0.mir
@@ -29,7 +29,7 @@ fn main::{closure#0}(_1: *mut [generator@$DIR/generator_drop_cleanup.rs:10:15: 1
 
     bb0: {
         _8 = discriminant((*_1));        // scope 0 at $DIR/generator_drop_cleanup.rs:+0:15: +3:6
-        switchInt(move _8) -> [0_u32: bb7, 3_u32: bb10, otherwise: bb11]; // scope 0 at $DIR/generator_drop_cleanup.rs:+0:15: +3:6
+        switchInt(move _8) -> [0: bb7, 3: bb10, otherwise: bb11]; // scope 0 at $DIR/generator_drop_cleanup.rs:+0:15: +3:6
     }
 
     bb1: {
diff --git a/src/test/mir-opt/generator_drop_cleanup.rs b/tests/mir-opt/generator_drop_cleanup.rs
index 82c1292cb..82c1292cb 100644
--- a/src/test/mir-opt/generator_drop_cleanup.rs
+++ b/tests/mir-opt/generator_drop_cleanup.rs
diff --git a/src/test/mir-opt/generator_storage_dead_unwind.main-{closure#0}.StateTransform.before.mir b/tests/mir-opt/generator_storage_dead_unwind.main-{closure#0}.StateTransform.before.mir
index cfbe0aaf2..cfbe0aaf2 100644
--- a/src/test/mir-opt/generator_storage_dead_unwind.main-{closure#0}.StateTransform.before.mir
+++ b/tests/mir-opt/generator_storage_dead_unwind.main-{closure#0}.StateTransform.before.mir
diff --git a/src/test/mir-opt/generator_storage_dead_unwind.rs b/tests/mir-opt/generator_storage_dead_unwind.rs
index b72170ade..b72170ade 100644
--- a/src/test/mir-opt/generator_storage_dead_unwind.rs
+++ b/tests/mir-opt/generator_storage_dead_unwind.rs
diff --git a/src/test/mir-opt/generator_tiny.main-{closure#0}.generator_resume.0.mir b/tests/mir-opt/generator_tiny.main-{closure#0}.generator_resume.0.mir
index fee6da2c6..b3d3c768a 100644
--- a/src/test/mir-opt/generator_tiny.main-{closure#0}.generator_resume.0.mir
+++ b/tests/mir-opt/generator_tiny.main-{closure#0}.generator_resume.0.mir
@@ -32,7 +32,7 @@ fn main::{closure#0}(_1: Pin<&mut [generator@$DIR/generator_tiny.rs:19:16: 19:24
 
     bb0: {
         _11 = discriminant((*(_1.0: &mut [generator@$DIR/generator_tiny.rs:19:16: 19:24]))); // scope 0 at $DIR/generator_tiny.rs:+0:16: +6:6
-        switchInt(move _11) -> [0_u32: bb1, 3_u32: bb5, otherwise: bb6]; // scope 0 at $DIR/generator_tiny.rs:+0:16: +6:6
+        switchInt(move _11) -> [0: bb1, 3: bb5, otherwise: bb6]; // scope 0 at $DIR/generator_tiny.rs:+0:16: +6:6
     }
 
     bb1: {
diff --git a/src/test/mir-opt/generator_tiny.rs b/tests/mir-opt/generator_tiny.rs
index 7dad63a61..7dad63a61 100644
--- a/src/test/mir-opt/generator_tiny.rs
+++ b/tests/mir-opt/generator_tiny.rs
diff --git a/src/test/mir-opt/graphviz.main.built.after.dot b/tests/mir-opt/graphviz.main.built.after.dot
index 8d1da7f1b..8d1da7f1b 100644
--- a/src/test/mir-opt/graphviz.main.built.after.dot
+++ b/tests/mir-opt/graphviz.main.built.after.dot
diff --git a/src/test/mir-opt/graphviz.rs b/tests/mir-opt/graphviz.rs
index 6906b86c2..6906b86c2 100644
--- a/src/test/mir-opt/graphviz.rs
+++ b/tests/mir-opt/graphviz.rs
diff --git a/src/test/mir-opt/if_condition_int.dont_opt_bool.SimplifyComparisonIntegral.diff b/tests/mir-opt/if_condition_int.dont_opt_bool.SimplifyComparisonIntegral.diff
index 94180d203..de4235c9e 100644
--- a/src/test/mir-opt/if_condition_int.dont_opt_bool.SimplifyComparisonIntegral.diff
+++ b/tests/mir-opt/if_condition_int.dont_opt_bool.SimplifyComparisonIntegral.diff
@@ -9,7 +9,7 @@
       bb0: {
           StorageLive(_2);                 // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:9
           _2 = _1;                         // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:9
-          switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:9
+          switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:9
       }
   
       bb1: {
diff --git a/src/test/mir-opt/if_condition_int.dont_opt_floats.SimplifyComparisonIntegral.diff b/tests/mir-opt/if_condition_int.dont_opt_floats.SimplifyComparisonIntegral.diff
index b22c7eac6..754c6579a 100644
--- a/src/test/mir-opt/if_condition_int.dont_opt_floats.SimplifyComparisonIntegral.diff
+++ b/tests/mir-opt/if_condition_int.dont_opt_floats.SimplifyComparisonIntegral.diff
@@ -13,7 +13,7 @@
           _3 = _1;                         // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:9
           _2 = Eq(move _3, const -42f32);  // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:18
           StorageDead(_3);                 // scope 0 at $DIR/if_condition_int.rs:+1:17: +1:18
-          switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:18
+          switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:18
       }
   
       bb1: {
diff --git a/src/test/mir-opt/if_condition_int.dont_remove_comparison.SimplifyComparisonIntegral.diff b/tests/mir-opt/if_condition_int.dont_remove_comparison.SimplifyComparisonIntegral.diff
index cc0995f99..ff23839e2 100644
--- a/src/test/mir-opt/if_condition_int.dont_remove_comparison.SimplifyComparisonIntegral.diff
+++ b/tests/mir-opt/if_condition_int.dont_remove_comparison.SimplifyComparisonIntegral.diff
@@ -20,10 +20,10 @@
           _3 = _1;                         // scope 0 at $DIR/if_condition_int.rs:+1:13: +1:14
 -         _2 = Eq(move _3, const 17_i8);   // scope 0 at $DIR/if_condition_int.rs:+1:13: +1:20
 -         StorageDead(_3);                 // scope 0 at $DIR/if_condition_int.rs:+1:19: +1:20
--         switchInt(_2) -> [false: bb2, otherwise: bb1]; // scope 1 at $DIR/if_condition_int.rs:+2:5: +2:12
+-         switchInt(_2) -> [0: bb2, otherwise: bb1]; // scope 1 at $DIR/if_condition_int.rs:+2:5: +2:12
 +         _2 = Eq(_3, const 17_i8);        // scope 0 at $DIR/if_condition_int.rs:+1:13: +1:20
 +         nop;                             // scope 0 at $DIR/if_condition_int.rs:+1:19: +1:20
-+         switchInt(move _3) -> [17_i8: bb1, otherwise: bb2]; // scope 1 at $DIR/if_condition_int.rs:+2:5: +2:12
++         switchInt(move _3) -> [17: bb1, otherwise: bb2]; // scope 1 at $DIR/if_condition_int.rs:+2:5: +2:12
       }
   
       bb1: {
diff --git a/src/test/mir-opt/if_condition_int.opt_char.SimplifyComparisonIntegral.diff b/tests/mir-opt/if_condition_int.opt_char.SimplifyComparisonIntegral.diff
index 801ea0402..5964d76a4 100644
--- a/src/test/mir-opt/if_condition_int.opt_char.SimplifyComparisonIntegral.diff
+++ b/tests/mir-opt/if_condition_int.opt_char.SimplifyComparisonIntegral.diff
@@ -13,10 +13,10 @@
           _3 = _1;                         // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:9
 -         _2 = Eq(move _3, const 'x');     // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:16
 -         StorageDead(_3);                 // scope 0 at $DIR/if_condition_int.rs:+1:15: +1:16
--         switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:16
+-         switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:16
 +         nop;                             // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:16
 +         nop;                             // scope 0 at $DIR/if_condition_int.rs:+1:15: +1:16
-+         switchInt(move _3) -> ['x': bb1, otherwise: bb2]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:16
++         switchInt(move _3) -> [120: bb1, otherwise: bb2]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:16
       }
   
       bb1: {
diff --git a/src/test/mir-opt/if_condition_int.opt_i8.SimplifyComparisonIntegral.diff b/tests/mir-opt/if_condition_int.opt_i8.SimplifyComparisonIntegral.diff
index 4297f4d64..98918cc74 100644
--- a/src/test/mir-opt/if_condition_int.opt_i8.SimplifyComparisonIntegral.diff
+++ b/tests/mir-opt/if_condition_int.opt_i8.SimplifyComparisonIntegral.diff
@@ -13,10 +13,10 @@
           _3 = _1;                         // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:9
 -         _2 = Eq(move _3, const 42_i8);   // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
 -         StorageDead(_3);                 // scope 0 at $DIR/if_condition_int.rs:+1:14: +1:15
--         switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
+-         switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
 +         nop;                             // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
 +         nop;                             // scope 0 at $DIR/if_condition_int.rs:+1:14: +1:15
-+         switchInt(move _3) -> [42_i8: bb1, otherwise: bb2]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
++         switchInt(move _3) -> [42: bb1, otherwise: bb2]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
       }
   
       bb1: {
diff --git a/src/test/mir-opt/if_condition_int.opt_multiple_ifs.SimplifyComparisonIntegral.diff b/tests/mir-opt/if_condition_int.opt_multiple_ifs.SimplifyComparisonIntegral.diff
index 8fb794abb..db38140b8 100644
--- a/src/test/mir-opt/if_condition_int.opt_multiple_ifs.SimplifyComparisonIntegral.diff
+++ b/tests/mir-opt/if_condition_int.opt_multiple_ifs.SimplifyComparisonIntegral.diff
@@ -15,10 +15,10 @@
           _3 = _1;                         // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:9
 -         _2 = Eq(move _3, const 42_u32);  // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
 -         StorageDead(_3);                 // scope 0 at $DIR/if_condition_int.rs:+1:14: +1:15
--         switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
+-         switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
 +         nop;                             // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
 +         nop;                             // scope 0 at $DIR/if_condition_int.rs:+1:14: +1:15
-+         switchInt(move _3) -> [42_u32: bb1, otherwise: bb2]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
++         switchInt(move _3) -> [42: bb1, otherwise: bb2]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
       }
   
       bb1: {
@@ -34,10 +34,10 @@
           _5 = _1;                         // scope 0 at $DIR/if_condition_int.rs:+3:15: +3:16
 -         _4 = Ne(move _5, const 21_u32);  // scope 0 at $DIR/if_condition_int.rs:+3:15: +3:22
 -         StorageDead(_5);                 // scope 0 at $DIR/if_condition_int.rs:+3:21: +3:22
--         switchInt(move _4) -> [false: bb4, otherwise: bb3]; // scope 0 at $DIR/if_condition_int.rs:+3:15: +3:22
+-         switchInt(move _4) -> [0: bb4, otherwise: bb3]; // scope 0 at $DIR/if_condition_int.rs:+3:15: +3:22
 +         nop;                             // scope 0 at $DIR/if_condition_int.rs:+3:15: +3:22
 +         nop;                             // scope 0 at $DIR/if_condition_int.rs:+3:21: +3:22
-+         switchInt(move _5) -> [21_u32: bb4, otherwise: bb3]; // scope 0 at $DIR/if_condition_int.rs:+3:15: +3:22
++         switchInt(move _5) -> [21: bb4, otherwise: bb3]; // scope 0 at $DIR/if_condition_int.rs:+3:15: +3:22
       }
   
       bb3: {
diff --git a/src/test/mir-opt/if_condition_int.opt_negative.SimplifyComparisonIntegral.diff b/tests/mir-opt/if_condition_int.opt_negative.SimplifyComparisonIntegral.diff
index 992253ea7..1a1ac4caa 100644
--- a/src/test/mir-opt/if_condition_int.opt_negative.SimplifyComparisonIntegral.diff
+++ b/tests/mir-opt/if_condition_int.opt_negative.SimplifyComparisonIntegral.diff
@@ -13,10 +13,10 @@
           _3 = _1;                         // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:9
 -         _2 = Eq(move _3, const -42_i32); // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:16
 -         StorageDead(_3);                 // scope 0 at $DIR/if_condition_int.rs:+1:15: +1:16
--         switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:16
+-         switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:16
 +         nop;                             // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:16
 +         nop;                             // scope 0 at $DIR/if_condition_int.rs:+1:15: +1:16
-+         switchInt(move _3) -> [-42_i32: bb1, otherwise: bb2]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:16
++         switchInt(move _3) -> [4294967254: bb1, otherwise: bb2]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:16
       }
   
       bb1: {
diff --git a/src/test/mir-opt/if_condition_int.opt_u32.SimplifyComparisonIntegral.diff b/tests/mir-opt/if_condition_int.opt_u32.SimplifyComparisonIntegral.diff
index 7cea9472d..fc3f50227 100644
--- a/src/test/mir-opt/if_condition_int.opt_u32.SimplifyComparisonIntegral.diff
+++ b/tests/mir-opt/if_condition_int.opt_u32.SimplifyComparisonIntegral.diff
@@ -13,10 +13,10 @@
           _3 = _1;                         // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:9
 -         _2 = Eq(move _3, const 42_u32);  // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
 -         StorageDead(_3);                 // scope 0 at $DIR/if_condition_int.rs:+1:14: +1:15
--         switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
+-         switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
 +         nop;                             // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
 +         nop;                             // scope 0 at $DIR/if_condition_int.rs:+1:14: +1:15
-+         switchInt(move _3) -> [42_u32: bb1, otherwise: bb2]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
++         switchInt(move _3) -> [42: bb1, otherwise: bb2]; // scope 0 at $DIR/if_condition_int.rs:+1:8: +1:15
       }
   
       bb1: {
diff --git a/src/test/mir-opt/if_condition_int.rs b/tests/mir-opt/if_condition_int.rs
index 398311e6b..398311e6b 100644
--- a/src/test/mir-opt/if_condition_int.rs
+++ b/tests/mir-opt/if_condition_int.rs
diff --git a/src/test/mir-opt/inline/asm_unwind.main.Inline.diff b/tests/mir-opt/inline/asm_unwind.main.Inline.diff
index f1b62ac38..f1b62ac38 100644
--- a/src/test/mir-opt/inline/asm_unwind.main.Inline.diff
+++ b/tests/mir-opt/inline/asm_unwind.main.Inline.diff
diff --git a/src/test/mir-opt/inline/asm_unwind.rs b/tests/mir-opt/inline/asm_unwind.rs
index c03feb433..c03feb433 100644
--- a/src/test/mir-opt/inline/asm_unwind.rs
+++ b/tests/mir-opt/inline/asm_unwind.rs
diff --git a/src/test/mir-opt/inline/caller_with_trivial_bound.foo.Inline.diff b/tests/mir-opt/inline/caller_with_trivial_bound.foo.Inline.diff
index 8b0300678..8b0300678 100644
--- a/src/test/mir-opt/inline/caller_with_trivial_bound.foo.Inline.diff
+++ b/tests/mir-opt/inline/caller_with_trivial_bound.foo.Inline.diff
diff --git a/src/test/mir-opt/inline/caller_with_trivial_bound.rs b/tests/mir-opt/inline/caller_with_trivial_bound.rs
index 8545db894..8545db894 100644
--- a/src/test/mir-opt/inline/caller_with_trivial_bound.rs
+++ b/tests/mir-opt/inline/caller_with_trivial_bound.rs
diff --git a/src/test/mir-opt/inline/cycle.f.Inline.diff b/tests/mir-opt/inline/cycle.f.Inline.diff
index 75ea69a42..75ea69a42 100644
--- a/src/test/mir-opt/inline/cycle.f.Inline.diff
+++ b/tests/mir-opt/inline/cycle.f.Inline.diff
diff --git a/src/test/mir-opt/inline/cycle.g.Inline.diff b/tests/mir-opt/inline/cycle.g.Inline.diff
index afe157ccd..5f3ee467c 100644
--- a/src/test/mir-opt/inline/cycle.g.Inline.diff
+++ b/tests/mir-opt/inline/cycle.g.Inline.diff
@@ -10,6 +10,8 @@
 +         let _3: ();                      // in scope 1 at $DIR/cycle.rs:6:5: 6:8
 +         let mut _4: &fn() {main};        // in scope 1 at $DIR/cycle.rs:6:5: 6:6
 +         let mut _5: ();                  // in scope 1 at $DIR/cycle.rs:6:5: 6:8
++         scope 2 (inlined <fn() {main} as Fn<()>>::call - shim(fn() {main})) { // at $DIR/cycle.rs:6:5: 6:8
++         }
 +     }
   
       bb0: {
@@ -27,10 +29,7 @@
 +         StorageLive(_4);                 // scope 1 at $DIR/cycle.rs:6:5: 6:6
 +         _4 = &_2;                        // scope 1 at $DIR/cycle.rs:6:5: 6:6
 +         StorageLive(_5);                 // scope 1 at $DIR/cycle.rs:6:5: 6:8
-+         _3 = <fn() {main} as Fn<()>>::call(move _4, move _5) -> [return: bb2, unwind: bb3]; // scope 1 at $DIR/cycle.rs:6:5: 6:8
-+                                          // mir::Constant
-+                                          // + span: $DIR/cycle.rs:6:5: 6:6
-+                                          // + literal: Const { ty: for<'a> extern "rust-call" fn(&'a fn() {main}, ()) -> <fn() {main} as FnOnce<()>>::Output {<fn() {main} as Fn<()>>::call}, val: Value(<ZST>) }
++         _3 = move (*_4)() -> [return: bb4, unwind: bb2]; // scope 2 at $SRC_DIR/core/src/ops/function.rs:LL:COL
       }
   
       bb1: {
@@ -40,19 +39,19 @@
           return;                          // scope 0 at $DIR/cycle.rs:+2:2: +2:2
 +     }
 + 
-+     bb2: {
-+         StorageDead(_5);                 // scope 1 at $DIR/cycle.rs:6:7: 6:8
-+         StorageDead(_4);                 // scope 1 at $DIR/cycle.rs:6:7: 6:8
-+         StorageDead(_3);                 // scope 1 at $DIR/cycle.rs:6:8: 6:9
-+         drop(_2) -> bb1;                 // scope 1 at $DIR/cycle.rs:7:1: 7:2
++     bb2 (cleanup): {
++         drop(_2) -> bb3;                 // scope 1 at $DIR/cycle.rs:7:1: 7:2
 +     }
 + 
 +     bb3 (cleanup): {
-+         drop(_2) -> bb4;                 // scope 1 at $DIR/cycle.rs:7:1: 7:2
++         resume;                          // scope 1 at $DIR/cycle.rs:5:1: 7:2
 +     }
 + 
-+     bb4 (cleanup): {
-+         resume;                          // scope 1 at $DIR/cycle.rs:5:1: 7:2
++     bb4: {
++         StorageDead(_5);                 // scope 1 at $DIR/cycle.rs:6:7: 6:8
++         StorageDead(_4);                 // scope 1 at $DIR/cycle.rs:6:7: 6:8
++         StorageDead(_3);                 // scope 1 at $DIR/cycle.rs:6:8: 6:9
++         drop(_2) -> bb1;                 // scope 1 at $DIR/cycle.rs:7:1: 7:2
       }
   }
   
diff --git a/src/test/mir-opt/inline/cycle.main.Inline.diff b/tests/mir-opt/inline/cycle.main.Inline.diff
index bd89e09ec..6b4c63bbd 100644
--- a/src/test/mir-opt/inline/cycle.main.Inline.diff
+++ b/tests/mir-opt/inline/cycle.main.Inline.diff
@@ -10,6 +10,8 @@
 +         let _3: ();                      // in scope 1 at $DIR/cycle.rs:6:5: 6:8
 +         let mut _4: &fn() {g};           // in scope 1 at $DIR/cycle.rs:6:5: 6:6
 +         let mut _5: ();                  // in scope 1 at $DIR/cycle.rs:6:5: 6:8
++         scope 2 (inlined <fn() {g} as Fn<()>>::call - shim(fn() {g})) { // at $DIR/cycle.rs:6:5: 6:8
++         }
 +     }
   
       bb0: {
@@ -27,10 +29,7 @@
 +         StorageLive(_4);                 // scope 1 at $DIR/cycle.rs:6:5: 6:6
 +         _4 = &_2;                        // scope 1 at $DIR/cycle.rs:6:5: 6:6
 +         StorageLive(_5);                 // scope 1 at $DIR/cycle.rs:6:5: 6:8
-+         _3 = <fn() {g} as Fn<()>>::call(move _4, move _5) -> [return: bb2, unwind: bb3]; // scope 1 at $DIR/cycle.rs:6:5: 6:8
-+                                          // mir::Constant
-+                                          // + span: $DIR/cycle.rs:6:5: 6:6
-+                                          // + literal: Const { ty: for<'a> extern "rust-call" fn(&'a fn() {g}, ()) -> <fn() {g} as FnOnce<()>>::Output {<fn() {g} as Fn<()>>::call}, val: Value(<ZST>) }
++         _3 = move (*_4)() -> [return: bb4, unwind: bb2]; // scope 2 at $SRC_DIR/core/src/ops/function.rs:LL:COL
       }
   
       bb1: {
@@ -40,19 +39,19 @@
           return;                          // scope 0 at $DIR/cycle.rs:+2:2: +2:2
 +     }
 + 
-+     bb2: {
-+         StorageDead(_5);                 // scope 1 at $DIR/cycle.rs:6:7: 6:8
-+         StorageDead(_4);                 // scope 1 at $DIR/cycle.rs:6:7: 6:8
-+         StorageDead(_3);                 // scope 1 at $DIR/cycle.rs:6:8: 6:9
-+         drop(_2) -> bb1;                 // scope 1 at $DIR/cycle.rs:7:1: 7:2
++     bb2 (cleanup): {
++         drop(_2) -> bb3;                 // scope 1 at $DIR/cycle.rs:7:1: 7:2
 +     }
 + 
 +     bb3 (cleanup): {
-+         drop(_2) -> bb4;                 // scope 1 at $DIR/cycle.rs:7:1: 7:2
++         resume;                          // scope 1 at $DIR/cycle.rs:5:1: 7:2
 +     }
 + 
-+     bb4 (cleanup): {
-+         resume;                          // scope 1 at $DIR/cycle.rs:5:1: 7:2
++     bb4: {
++         StorageDead(_5);                 // scope 1 at $DIR/cycle.rs:6:7: 6:8
++         StorageDead(_4);                 // scope 1 at $DIR/cycle.rs:6:7: 6:8
++         StorageDead(_3);                 // scope 1 at $DIR/cycle.rs:6:8: 6:9
++         drop(_2) -> bb1;                 // scope 1 at $DIR/cycle.rs:7:1: 7:2
       }
   }
   
diff --git a/src/test/mir-opt/inline/cycle.rs b/tests/mir-opt/inline/cycle.rs
index 9e8950d8a..9e8950d8a 100644
--- a/src/test/mir-opt/inline/cycle.rs
+++ b/tests/mir-opt/inline/cycle.rs
diff --git a/src/test/mir-opt/inline/dyn_trait.get_query.Inline.diff b/tests/mir-opt/inline/dyn_trait.get_query.Inline.diff
index 8ea1a0757..8ea1a0757 100644
--- a/src/test/mir-opt/inline/dyn_trait.get_query.Inline.diff
+++ b/tests/mir-opt/inline/dyn_trait.get_query.Inline.diff
diff --git a/src/test/mir-opt/inline/dyn_trait.mk_cycle.Inline.diff b/tests/mir-opt/inline/dyn_trait.mk_cycle.Inline.diff
index 7653a5ded..7653a5ded 100644
--- a/src/test/mir-opt/inline/dyn_trait.mk_cycle.Inline.diff
+++ b/tests/mir-opt/inline/dyn_trait.mk_cycle.Inline.diff
diff --git a/src/test/mir-opt/inline/dyn_trait.rs b/tests/mir-opt/inline/dyn_trait.rs
index 6a46e1e07..6a46e1e07 100644
--- a/src/test/mir-opt/inline/dyn_trait.rs
+++ b/tests/mir-opt/inline/dyn_trait.rs
diff --git a/src/test/mir-opt/inline/dyn_trait.try_execute_query.Inline.diff b/tests/mir-opt/inline/dyn_trait.try_execute_query.Inline.diff
index a71d73b74..a71d73b74 100644
--- a/src/test/mir-opt/inline/dyn_trait.try_execute_query.Inline.diff
+++ b/tests/mir-opt/inline/dyn_trait.try_execute_query.Inline.diff
diff --git a/tests/mir-opt/inline/exponential_runtime.main.Inline.diff b/tests/mir-opt/inline/exponential_runtime.main.Inline.diff
new file mode 100644
index 000000000..7fd62be7a
--- /dev/null
+++ b/tests/mir-opt/inline/exponential_runtime.main.Inline.diff
@@ -0,0 +1,75 @@
+- // MIR for `main` before Inline
++ // MIR for `main` after Inline
+  
+  fn main() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/exponential_runtime.rs:+0:11: +0:11
+      let _1: ();                          // in scope 0 at $DIR/exponential_runtime.rs:+1:5: +1:22
++     scope 1 (inlined <() as G>::call) {  // at $DIR/exponential_runtime.rs:86:5: 86:22
++         let _2: ();                      // in scope 1 at $DIR/exponential_runtime.rs:73:9: 73:25
++         let _3: ();                      // in scope 1 at $DIR/exponential_runtime.rs:74:9: 74:25
++         let _4: ();                      // in scope 1 at $DIR/exponential_runtime.rs:75:9: 75:25
++         scope 2 (inlined <() as F>::call) { // at $DIR/exponential_runtime.rs:73:9: 73:25
++             let _5: ();                  // in scope 2 at $DIR/exponential_runtime.rs:61:9: 61:25
++             let _6: ();                  // in scope 2 at $DIR/exponential_runtime.rs:62:9: 62:25
++             let _7: ();                  // in scope 2 at $DIR/exponential_runtime.rs:63:9: 63:25
++         }
++     }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/exponential_runtime.rs:+1:5: +1:22
+-         _1 = <() as G>::call() -> bb1;   // scope 0 at $DIR/exponential_runtime.rs:+1:5: +1:22
++         StorageLive(_2);                 // scope 1 at $DIR/exponential_runtime.rs:73:9: 73:25
++         StorageLive(_5);                 // scope 2 at $DIR/exponential_runtime.rs:61:9: 61:25
++         _5 = <() as E>::call() -> bb3;   // scope 2 at $DIR/exponential_runtime.rs:61:9: 61:25
+                                           // mir::Constant
+-                                          // + span: $DIR/exponential_runtime.rs:86:5: 86:20
+-                                          // + literal: Const { ty: fn() {<() as G>::call}, val: Value(<ZST>) }
++                                          // + span: $DIR/exponential_runtime.rs:61:9: 61:23
++                                          // + literal: Const { ty: fn() {<() as E>::call}, val: Value(<ZST>) }
+      }
+  
+      bb1: {
++         StorageDead(_3);                 // scope 1 at $DIR/exponential_runtime.rs:74:25: 74:26
++         StorageLive(_4);                 // scope 1 at $DIR/exponential_runtime.rs:75:9: 75:25
++         _4 = <() as F>::call() -> bb2;   // scope 1 at $DIR/exponential_runtime.rs:75:9: 75:25
++                                          // mir::Constant
++                                          // + span: $DIR/exponential_runtime.rs:75:9: 75:23
++                                          // + literal: Const { ty: fn() {<() as F>::call}, val: Value(<ZST>) }
++     }
++ 
++     bb2: {
++         StorageDead(_4);                 // scope 1 at $DIR/exponential_runtime.rs:75:25: 75:26
+          StorageDead(_1);                 // scope 0 at $DIR/exponential_runtime.rs:+1:22: +1:23
+          _0 = const ();                   // scope 0 at $DIR/exponential_runtime.rs:+0:11: +2:2
+          return;                          // scope 0 at $DIR/exponential_runtime.rs:+2:2: +2:2
++     }
++ 
++     bb3: {
++         StorageDead(_5);                 // scope 2 at $DIR/exponential_runtime.rs:61:25: 61:26
++         StorageLive(_6);                 // scope 2 at $DIR/exponential_runtime.rs:62:9: 62:25
++         _6 = <() as E>::call() -> bb4;   // scope 2 at $DIR/exponential_runtime.rs:62:9: 62:25
++                                          // mir::Constant
++                                          // + span: $DIR/exponential_runtime.rs:62:9: 62:23
++                                          // + literal: Const { ty: fn() {<() as E>::call}, val: Value(<ZST>) }
++     }
++ 
++     bb4: {
++         StorageDead(_6);                 // scope 2 at $DIR/exponential_runtime.rs:62:25: 62:26
++         StorageLive(_7);                 // scope 2 at $DIR/exponential_runtime.rs:63:9: 63:25
++         _7 = <() as E>::call() -> bb5;   // scope 2 at $DIR/exponential_runtime.rs:63:9: 63:25
++                                          // mir::Constant
++                                          // + span: $DIR/exponential_runtime.rs:63:9: 63:23
++                                          // + literal: Const { ty: fn() {<() as E>::call}, val: Value(<ZST>) }
++     }
++ 
++     bb5: {
++         StorageDead(_7);                 // scope 2 at $DIR/exponential_runtime.rs:63:25: 63:26
++         StorageDead(_2);                 // scope 1 at $DIR/exponential_runtime.rs:73:25: 73:26
++         StorageLive(_3);                 // scope 1 at $DIR/exponential_runtime.rs:74:9: 74:25
++         _3 = <() as F>::call() -> bb1;   // scope 1 at $DIR/exponential_runtime.rs:74:9: 74:25
++                                          // mir::Constant
++                                          // + span: $DIR/exponential_runtime.rs:74:9: 74:23
++                                          // + literal: Const { ty: fn() {<() as F>::call}, val: Value(<ZST>) }
+      }
+  }
+  
diff --git a/src/test/mir-opt/inline/exponential_runtime.rs b/tests/mir-opt/inline/exponential_runtime.rs
index d9219d76a..d9219d76a 100644
--- a/src/test/mir-opt/inline/exponential_runtime.rs
+++ b/tests/mir-opt/inline/exponential_runtime.rs
diff --git a/src/test/mir-opt/inline/inline_any_operand.bar.Inline.after.mir b/tests/mir-opt/inline/inline_any_operand.bar.Inline.after.mir
index 3502c2586..3502c2586 100644
--- a/src/test/mir-opt/inline/inline_any_operand.bar.Inline.after.mir
+++ b/tests/mir-opt/inline/inline_any_operand.bar.Inline.after.mir
diff --git a/src/test/mir-opt/inline/inline_any_operand.rs b/tests/mir-opt/inline/inline_any_operand.rs
index fb0de020f..fb0de020f 100644
--- a/src/test/mir-opt/inline/inline_any_operand.rs
+++ b/tests/mir-opt/inline/inline_any_operand.rs
diff --git a/src/test/mir-opt/inline/inline_async.rs b/tests/mir-opt/inline/inline_async.rs
index 5c838159b..5c838159b 100644
--- a/src/test/mir-opt/inline/inline_async.rs
+++ b/tests/mir-opt/inline/inline_async.rs
diff --git a/src/test/mir-opt/inline/inline_closure.foo.Inline.after.mir b/tests/mir-opt/inline/inline_closure.foo.Inline.after.mir
index 9eb3a01ee..9eb3a01ee 100644
--- a/src/test/mir-opt/inline/inline_closure.foo.Inline.after.mir
+++ b/tests/mir-opt/inline/inline_closure.foo.Inline.after.mir
diff --git a/src/test/mir-opt/inline/inline_closure.rs b/tests/mir-opt/inline/inline_closure.rs
index 715fd0138..715fd0138 100644
--- a/src/test/mir-opt/inline/inline_closure.rs
+++ b/tests/mir-opt/inline/inline_closure.rs
diff --git a/src/test/mir-opt/inline/inline_closure_borrows_arg.foo.Inline.after.mir b/tests/mir-opt/inline/inline_closure_borrows_arg.foo.Inline.after.mir
index dd32eb2d8..dd32eb2d8 100644
--- a/src/test/mir-opt/inline/inline_closure_borrows_arg.foo.Inline.after.mir
+++ b/tests/mir-opt/inline/inline_closure_borrows_arg.foo.Inline.after.mir
diff --git a/src/test/mir-opt/inline/inline_closure_borrows_arg.rs b/tests/mir-opt/inline/inline_closure_borrows_arg.rs
index d76bc33f5..d76bc33f5 100644
--- a/src/test/mir-opt/inline/inline_closure_borrows_arg.rs
+++ b/tests/mir-opt/inline/inline_closure_borrows_arg.rs
diff --git a/src/test/mir-opt/inline/inline_closure_captures.foo.Inline.after.mir b/tests/mir-opt/inline/inline_closure_captures.foo.Inline.after.mir
index fd19c2886..fd19c2886 100644
--- a/src/test/mir-opt/inline/inline_closure_captures.foo.Inline.after.mir
+++ b/tests/mir-opt/inline/inline_closure_captures.foo.Inline.after.mir
diff --git a/src/test/mir-opt/inline/inline_closure_captures.rs b/tests/mir-opt/inline/inline_closure_captures.rs
index 52b6817e4..52b6817e4 100644
--- a/src/test/mir-opt/inline/inline_closure_captures.rs
+++ b/tests/mir-opt/inline/inline_closure_captures.rs
diff --git a/src/test/mir-opt/inline/inline_compatibility.inlined_no_sanitize.Inline.diff b/tests/mir-opt/inline/inline_compatibility.inlined_no_sanitize.Inline.diff
index e30a5e116..e30a5e116 100644
--- a/src/test/mir-opt/inline/inline_compatibility.inlined_no_sanitize.Inline.diff
+++ b/tests/mir-opt/inline/inline_compatibility.inlined_no_sanitize.Inline.diff
diff --git a/src/test/mir-opt/inline/inline_compatibility.inlined_target_feature.Inline.diff b/tests/mir-opt/inline/inline_compatibility.inlined_target_feature.Inline.diff
index c2b3c46a3..c2b3c46a3 100644
--- a/src/test/mir-opt/inline/inline_compatibility.inlined_target_feature.Inline.diff
+++ b/tests/mir-opt/inline/inline_compatibility.inlined_target_feature.Inline.diff
diff --git a/src/test/mir-opt/inline/inline_compatibility.not_inlined_c_variadic.Inline.diff b/tests/mir-opt/inline/inline_compatibility.not_inlined_c_variadic.Inline.diff
index 0ca5a5f70..0ca5a5f70 100644
--- a/src/test/mir-opt/inline/inline_compatibility.not_inlined_c_variadic.Inline.diff
+++ b/tests/mir-opt/inline/inline_compatibility.not_inlined_c_variadic.Inline.diff
diff --git a/src/test/mir-opt/inline/inline_compatibility.not_inlined_no_sanitize.Inline.diff b/tests/mir-opt/inline/inline_compatibility.not_inlined_no_sanitize.Inline.diff
index 00d405c77..00d405c77 100644
--- a/src/test/mir-opt/inline/inline_compatibility.not_inlined_no_sanitize.Inline.diff
+++ b/tests/mir-opt/inline/inline_compatibility.not_inlined_no_sanitize.Inline.diff
diff --git a/src/test/mir-opt/inline/inline_compatibility.not_inlined_target_feature.Inline.diff b/tests/mir-opt/inline/inline_compatibility.not_inlined_target_feature.Inline.diff
index 8b9c86f55..8b9c86f55 100644
--- a/src/test/mir-opt/inline/inline_compatibility.not_inlined_target_feature.Inline.diff
+++ b/tests/mir-opt/inline/inline_compatibility.not_inlined_target_feature.Inline.diff
diff --git a/src/test/mir-opt/inline/inline_compatibility.rs b/tests/mir-opt/inline/inline_compatibility.rs
index 30aff0a64..30aff0a64 100644
--- a/src/test/mir-opt/inline/inline_compatibility.rs
+++ b/tests/mir-opt/inline/inline_compatibility.rs
diff --git a/tests/mir-opt/inline/inline_cycle.one.Inline.diff b/tests/mir-opt/inline/inline_cycle.one.Inline.diff
new file mode 100644
index 000000000..5510cd7bc
--- /dev/null
+++ b/tests/mir-opt/inline/inline_cycle.one.Inline.diff
@@ -0,0 +1,30 @@
+- // MIR for `one` before Inline
++ // MIR for `one` after Inline
+  
+  fn one() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/inline_cycle.rs:+0:10: +0:10
+      let _1: ();                          // in scope 0 at $DIR/inline_cycle.rs:+1:5: +1:24
++     scope 1 (inlined <C as Call>::call) { // at $DIR/inline_cycle.rs:14:5: 14:24
++         scope 2 (inlined <A<C> as Call>::call) { // at $DIR/inline_cycle.rs:43:9: 43:23
++             scope 3 (inlined <B<C> as Call>::call) { // at $DIR/inline_cycle.rs:28:9: 28:31
++             }
++         }
++     }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/inline_cycle.rs:+1:5: +1:24
+-         _1 = <C as Call>::call() -> bb1; // scope 0 at $DIR/inline_cycle.rs:+1:5: +1:24
++         _1 = <C as Call>::call() -> bb1; // scope 3 at $DIR/inline_cycle.rs:36:9: 36:28
+                                           // mir::Constant
+-                                          // + span: $DIR/inline_cycle.rs:14:5: 14:22
++                                          // + span: $DIR/inline_cycle.rs:36:9: 36:26
+                                           // + literal: Const { ty: fn() {<C as Call>::call}, val: Value(<ZST>) }
+      }
+  
+      bb1: {
+          StorageDead(_1);                 // scope 0 at $DIR/inline_cycle.rs:+1:24: +1:25
+          _0 = const ();                   // scope 0 at $DIR/inline_cycle.rs:+0:10: +2:2
+          return;                          // scope 0 at $DIR/inline_cycle.rs:+2:2: +2:2
+      }
+  }
+  
diff --git a/src/test/mir-opt/inline/inline_cycle.rs b/tests/mir-opt/inline/inline_cycle.rs
index 63ad57de1..63ad57de1 100644
--- a/src/test/mir-opt/inline/inline_cycle.rs
+++ b/tests/mir-opt/inline/inline_cycle.rs
diff --git a/src/test/mir-opt/inline/inline_cycle.two.Inline.diff b/tests/mir-opt/inline/inline_cycle.two.Inline.diff
index a940848c2..64c0065b5 100644
--- a/src/test/mir-opt/inline/inline_cycle.two.Inline.diff
+++ b/tests/mir-opt/inline/inline_cycle.two.Inline.diff
@@ -9,6 +9,8 @@
 +         debug f => _2;                   // in scope 1 at $DIR/inline_cycle.rs:53:22: 53:23
 +         let _3: ();                      // in scope 1 at $DIR/inline_cycle.rs:54:5: 54:8
 +         let mut _4: ();                  // in scope 1 at $DIR/inline_cycle.rs:54:5: 54:8
++         scope 2 (inlined <fn() {f} as FnOnce<()>>::call_once - shim(fn() {f})) { // at $DIR/inline_cycle.rs:54:5: 54:8
++         }
 +     }
   
       bb0: {
@@ -24,10 +26,7 @@
                                            // + literal: Const { ty: fn() {f}, val: Value(<ZST>) }
 +         StorageLive(_3);                 // scope 1 at $DIR/inline_cycle.rs:54:5: 54:8
 +         StorageLive(_4);                 // scope 1 at $DIR/inline_cycle.rs:54:5: 54:8
-+         _3 = <fn() {f} as FnOnce<()>>::call_once(move _2, move _4) -> bb1; // scope 1 at $DIR/inline_cycle.rs:54:5: 54:8
-+                                          // mir::Constant
-+                                          // + span: $DIR/inline_cycle.rs:54:5: 54:6
-+                                          // + literal: Const { ty: extern "rust-call" fn(fn() {f}, ()) -> <fn() {f} as FnOnce<()>>::Output {<fn() {f} as FnOnce<()>>::call_once}, val: Value(<ZST>) }
++         _3 = move _2() -> bb1;           // scope 2 at $SRC_DIR/core/src/ops/function.rs:LL:COL
       }
   
       bb1: {
diff --git a/src/test/mir-opt/inline/inline_cycle_generic.main.Inline.diff b/tests/mir-opt/inline/inline_cycle_generic.main.Inline.diff
index 04de3e61e..52debab4d 100644
--- a/src/test/mir-opt/inline/inline_cycle_generic.main.Inline.diff
+++ b/tests/mir-opt/inline/inline_cycle_generic.main.Inline.diff
@@ -6,18 +6,21 @@
       let _1: ();                          // in scope 0 at $DIR/inline_cycle_generic.rs:+1:5: +1:24
 +     scope 1 (inlined <C as Call>::call) { // at $DIR/inline_cycle_generic.rs:9:5: 9:24
 +         scope 2 (inlined <B<A> as Call>::call) { // at $DIR/inline_cycle_generic.rs:38:9: 38:31
++             scope 3 (inlined <A as Call>::call) { // at $DIR/inline_cycle_generic.rs:31:9: 31:28
++                 scope 4 (inlined <B<C> as Call>::call) { // at $DIR/inline_cycle_generic.rs:23:9: 23:31
++                 }
++             }
 +         }
 +     }
   
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/inline_cycle_generic.rs:+1:5: +1:24
 -         _1 = <C as Call>::call() -> bb1; // scope 0 at $DIR/inline_cycle_generic.rs:+1:5: +1:24
-+         _1 = <A as Call>::call() -> bb1; // scope 2 at $DIR/inline_cycle_generic.rs:31:9: 31:28
++         _1 = <C as Call>::call() -> bb1; // scope 4 at $DIR/inline_cycle_generic.rs:31:9: 31:28
                                            // mir::Constant
 -                                          // + span: $DIR/inline_cycle_generic.rs:9:5: 9:22
--                                          // + literal: Const { ty: fn() {<C as Call>::call}, val: Value(<ZST>) }
 +                                          // + span: $DIR/inline_cycle_generic.rs:31:9: 31:26
-+                                          // + literal: Const { ty: fn() {<A as Call>::call}, val: Value(<ZST>) }
+                                           // + literal: Const { ty: fn() {<C as Call>::call}, val: Value(<ZST>) }
       }
   
       bb1: {
diff --git a/src/test/mir-opt/inline/inline_cycle_generic.rs b/tests/mir-opt/inline/inline_cycle_generic.rs
index 24b4f3793..24b4f3793 100644
--- a/src/test/mir-opt/inline/inline_cycle_generic.rs
+++ b/tests/mir-opt/inline/inline_cycle_generic.rs
diff --git a/src/test/mir-opt/inline/inline_diverging.f.Inline.diff b/tests/mir-opt/inline/inline_diverging.f.Inline.diff
index b49191f49..b49191f49 100644
--- a/src/test/mir-opt/inline/inline_diverging.f.Inline.diff
+++ b/tests/mir-opt/inline/inline_diverging.f.Inline.diff
diff --git a/src/test/mir-opt/inline/inline_diverging.g.Inline.diff b/tests/mir-opt/inline/inline_diverging.g.Inline.diff
index 1e703a8fd..b787a19f4 100644
--- a/src/test/mir-opt/inline/inline_diverging.g.Inline.diff
+++ b/tests/mir-opt/inline/inline_diverging.g.Inline.diff
@@ -19,7 +19,7 @@
           _3 = _1;                         // scope 0 at $DIR/inline_diverging.rs:+1:8: +1:9
           _2 = Gt(move _3, const 0_i32);   // scope 0 at $DIR/inline_diverging.rs:+1:8: +1:13
           StorageDead(_3);                 // scope 0 at $DIR/inline_diverging.rs:+1:12: +1:13
-          switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/inline_diverging.rs:+1:8: +1:13
+          switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/inline_diverging.rs:+1:8: +1:13
       }
   
       bb1: {
diff --git a/src/test/mir-opt/inline/inline_diverging.h.Inline.diff b/tests/mir-opt/inline/inline_diverging.h.Inline.diff
index a01bcf164..f82fcf4c8 100644
--- a/src/test/mir-opt/inline/inline_diverging.h.Inline.diff
+++ b/tests/mir-opt/inline/inline_diverging.h.Inline.diff
@@ -20,6 +20,8 @@
 +                 debug b => _9;           // in scope 3 at $DIR/inline_diverging.rs:28:9: 28:10
 +             }
 +         }
++         scope 4 (inlined <fn() -> ! {sleep} as Fn<()>>::call - shim(fn() -> ! {sleep})) { // at $DIR/inline_diverging.rs:27:13: 27:16
++         }
 +     }
   
       bb0: {
@@ -38,25 +40,10 @@
 +         StorageLive(_4);                 // scope 1 at $DIR/inline_diverging.rs:27:13: 27:14
 +         _4 = &_2;                        // scope 1 at $DIR/inline_diverging.rs:27:13: 27:14
 +         StorageLive(_5);                 // scope 1 at $DIR/inline_diverging.rs:27:13: 27:16
-+         _3 = <fn() -> ! {sleep} as Fn<()>>::call(move _4, move _5) -> [return: bb1, unwind: bb5]; // scope 1 at $DIR/inline_diverging.rs:27:13: 27:16
-+                                          // mir::Constant
-+                                          // + span: $DIR/inline_diverging.rs:27:13: 27:14
-+                                          // + literal: Const { ty: for<'a> extern "rust-call" fn(&'a fn() -> ! {sleep}, ()) -> <fn() -> ! {sleep} as FnOnce<()>>::Output {<fn() -> ! {sleep} as Fn<()>>::call}, val: Value(<ZST>) }
++         _3 = move (*_4)() -> [return: bb6, unwind: bb4]; // scope 4 at $SRC_DIR/core/src/ops/function.rs:LL:COL
 +     }
 + 
 +     bb1: {
-+         StorageDead(_5);                 // scope 1 at $DIR/inline_diverging.rs:27:15: 27:16
-+         StorageDead(_4);                 // scope 1 at $DIR/inline_diverging.rs:27:15: 27:16
-+         StorageLive(_6);                 // scope 2 at $DIR/inline_diverging.rs:28:13: 28:14
-+         _6 = &_2;                        // scope 2 at $DIR/inline_diverging.rs:28:13: 28:14
-+         StorageLive(_7);                 // scope 2 at $DIR/inline_diverging.rs:28:13: 28:16
-+         _9 = <fn() -> ! {sleep} as Fn<()>>::call(move _6, move _7) -> [return: bb2, unwind: bb4]; // scope 2 at $DIR/inline_diverging.rs:28:13: 28:16
-+                                          // mir::Constant
-+                                          // + span: $DIR/inline_diverging.rs:28:13: 28:14
-+                                          // + literal: Const { ty: for<'a> extern "rust-call" fn(&'a fn() -> ! {sleep}, ()) -> <fn() -> ! {sleep} as FnOnce<()>>::Output {<fn() -> ! {sleep} as Fn<()>>::call}, val: Value(<ZST>) }
-+     }
-+ 
-+     bb2: {
 +         StorageDead(_7);                 // scope 2 at $DIR/inline_diverging.rs:28:15: 28:16
 +         StorageDead(_6);                 // scope 2 at $DIR/inline_diverging.rs:28:15: 28:16
 +         StorageLive(_8);                 // scope 3 at $DIR/inline_diverging.rs:29:6: 29:7
@@ -66,23 +53,35 @@
 +         (_1.1: !) = move _9;             // scope 3 at $DIR/inline_diverging.rs:29:5: 29:11
 +         StorageDead(_8);                 // scope 3 at $DIR/inline_diverging.rs:29:10: 29:11
 +         StorageDead(_3);                 // scope 1 at $DIR/inline_diverging.rs:30:1: 30:2
-+         drop(_2) -> bb3;                 // scope 1 at $DIR/inline_diverging.rs:30:1: 30:2
++         drop(_2) -> bb2;                 // scope 1 at $DIR/inline_diverging.rs:30:1: 30:2
 +     }
 + 
-+     bb3: {
++     bb2: {
 +         unreachable;                     // scope 0 at $DIR/inline_diverging.rs:30:2: 30:2
 +     }
 + 
++     bb3 (cleanup): {
++         drop(_3) -> bb4;                 // scope 1 at $DIR/inline_diverging.rs:30:1: 30:2
++     }
++ 
 +     bb4 (cleanup): {
-+         drop(_3) -> bb5;                 // scope 1 at $DIR/inline_diverging.rs:30:1: 30:2
++         drop(_2) -> bb5;                 // scope 1 at $DIR/inline_diverging.rs:30:1: 30:2
 +     }
 + 
 +     bb5 (cleanup): {
-+         drop(_2) -> bb6;                 // scope 1 at $DIR/inline_diverging.rs:30:1: 30:2
++         resume;                          // scope 1 at $DIR/inline_diverging.rs:26:1: 30:2
 +     }
 + 
-+     bb6 (cleanup): {
-+         resume;                          // scope 1 at $DIR/inline_diverging.rs:26:1: 30:2
++     bb6: {
++         StorageDead(_5);                 // scope 1 at $DIR/inline_diverging.rs:27:15: 27:16
++         StorageDead(_4);                 // scope 1 at $DIR/inline_diverging.rs:27:15: 27:16
++         StorageLive(_6);                 // scope 2 at $DIR/inline_diverging.rs:28:13: 28:14
++         _6 = &_2;                        // scope 2 at $DIR/inline_diverging.rs:28:13: 28:14
++         StorageLive(_7);                 // scope 2 at $DIR/inline_diverging.rs:28:13: 28:16
++         _9 = <fn() -> ! {sleep} as Fn<()>>::call(move _6, move _7) -> [return: bb1, unwind: bb3]; // scope 2 at $DIR/inline_diverging.rs:28:13: 28:16
++                                          // mir::Constant
++                                          // + span: $DIR/inline_diverging.rs:28:13: 28:14
++                                          // + literal: Const { ty: for<'a> extern "rust-call" fn(&'a fn() -> ! {sleep}, ()) -> <fn() -> ! {sleep} as FnOnce<()>>::Output {<fn() -> ! {sleep} as Fn<()>>::call}, val: Value(<ZST>) }
       }
   }
   
diff --git a/src/test/mir-opt/inline/inline_diverging.rs b/tests/mir-opt/inline/inline_diverging.rs
index ae6f814c2..ae6f814c2 100644
--- a/src/test/mir-opt/inline/inline_diverging.rs
+++ b/tests/mir-opt/inline/inline_diverging.rs
diff --git a/src/test/mir-opt/inline/inline_generator.main.Inline.diff b/tests/mir-opt/inline/inline_generator.main.Inline.diff
index 91bff3d32..f27b64c30 100644
--- a/src/test/mir-opt/inline/inline_generator.main.Inline.diff
+++ b/tests/mir-opt/inline/inline_generator.main.Inline.diff
@@ -7,7 +7,7 @@
       let mut _2: std::pin::Pin<&mut [generator@$DIR/inline_generator.rs:15:5: 15:8]>; // in scope 0 at $DIR/inline_generator.rs:+1:14: +1:32
       let mut _3: &mut [generator@$DIR/inline_generator.rs:15:5: 15:8]; // in scope 0 at $DIR/inline_generator.rs:+1:23: +1:31
       let mut _4: [generator@$DIR/inline_generator.rs:15:5: 15:8]; // in scope 0 at $DIR/inline_generator.rs:+1:28: +1:31
-+     let mut _7: bool;                    // in scope 0 at $DIR/inline_generator.rs:+1:14: +1:46
++     let mut _7: bool;                    // in scope 0 at $DIR/inline_generator.rs:+1:33: +1:46
       scope 1 {
           debug _r => _1;                  // in scope 1 at $DIR/inline_generator.rs:+1:9: +1:11
       }
@@ -23,7 +23,7 @@
 +             }
 +         }
 +     }
-+     scope 6 (inlined g::{closure#0}) {   // at $DIR/inline_generator.rs:9:14: 9:46
++     scope 6 (inlined g::{closure#0}) {   // at $DIR/inline_generator.rs:9:33: 9:46
 +         debug a => _7;                   // in scope 6 at $DIR/inline_generator.rs:15:6: 15:7
 +         let mut _8: i32;                 // in scope 6 at $DIR/inline_generator.rs:15:17: 15:39
 +         let mut _9: u32;                 // in scope 6 at $DIR/inline_generator.rs:15:5: 15:41
@@ -68,16 +68,16 @@
 -                                          // mir::Constant
 -                                          // + span: $DIR/inline_generator.rs:9:33: 9:39
 -                                          // + literal: Const { ty: for<'a> fn(Pin<&'a mut [generator@$DIR/inline_generator.rs:15:5: 15:8]>, bool) -> GeneratorState<<[generator@$DIR/inline_generator.rs:15:5: 15:8] as Generator<bool>>::Yield, <[generator@$DIR/inline_generator.rs:15:5: 15:8] as Generator<bool>>::Return> {<[generator@$DIR/inline_generator.rs:15:5: 15:8] as Generator<bool>>::resume}, val: Value(<ZST>) }
-+         StorageLive(_7);                 // scope 0 at $DIR/inline_generator.rs:+1:14: +1:46
-+         _7 = const false;                // scope 0 at $DIR/inline_generator.rs:+1:14: +1:46
++         StorageLive(_7);                 // scope 0 at $DIR/inline_generator.rs:+1:33: +1:46
++         _7 = const false;                // scope 0 at $DIR/inline_generator.rs:+1:33: +1:46
 +         _10 = deref_copy (_2.0: &mut [generator@$DIR/inline_generator.rs:15:5: 15:8]); // scope 6 at $DIR/inline_generator.rs:15:5: 15:41
 +         _9 = discriminant((*_10));       // scope 6 at $DIR/inline_generator.rs:15:5: 15:41
-+         switchInt(move _9) -> [0_u32: bb3, 1_u32: bb8, 3_u32: bb7, otherwise: bb9]; // scope 6 at $DIR/inline_generator.rs:15:5: 15:41
++         switchInt(move _9) -> [0: bb3, 1: bb8, 3: bb7, otherwise: bb9]; // scope 6 at $DIR/inline_generator.rs:15:5: 15:41
       }
   
 -     bb3: {
 +     bb1: {
-+         StorageDead(_7);                 // scope 0 at $DIR/inline_generator.rs:+1:14: +1:46
++         StorageDead(_7);                 // scope 0 at $DIR/inline_generator.rs:+1:33: +1:46
           StorageDead(_2);                 // scope 0 at $DIR/inline_generator.rs:+1:45: +1:46
           StorageDead(_4);                 // scope 0 at $DIR/inline_generator.rs:+1:46: +1:47
           _0 = const ();                   // scope 0 at $DIR/inline_generator.rs:+0:11: +2:2
@@ -92,7 +92,7 @@
 + 
 +     bb3: {
 +         StorageLive(_8);                 // scope 6 at $DIR/inline_generator.rs:15:17: 15:39
-+         switchInt(move _7) -> [false: bb5, otherwise: bb4]; // scope 6 at $DIR/inline_generator.rs:15:20: 15:21
++         switchInt(move _7) -> [0: bb5, otherwise: bb4]; // scope 6 at $DIR/inline_generator.rs:15:20: 15:21
 +     }
 + 
 +     bb4: {
diff --git a/src/test/mir-opt/inline/inline_generator.rs b/tests/mir-opt/inline/inline_generator.rs
index d11b3e548..d11b3e548 100644
--- a/src/test/mir-opt/inline/inline_generator.rs
+++ b/tests/mir-opt/inline/inline_generator.rs
diff --git a/src/test/mir-opt/inline/inline_instruction_set.default.Inline.diff b/tests/mir-opt/inline/inline_instruction_set.default.Inline.diff
index f1988ea4b..f1988ea4b 100644
--- a/src/test/mir-opt/inline/inline_instruction_set.default.Inline.diff
+++ b/tests/mir-opt/inline/inline_instruction_set.default.Inline.diff
diff --git a/src/test/mir-opt/inline/inline_instruction_set.rs b/tests/mir-opt/inline/inline_instruction_set.rs
index 5dfb04943..5dfb04943 100644
--- a/src/test/mir-opt/inline/inline_instruction_set.rs
+++ b/tests/mir-opt/inline/inline_instruction_set.rs
diff --git a/src/test/mir-opt/inline/inline_instruction_set.t32.Inline.diff b/tests/mir-opt/inline/inline_instruction_set.t32.Inline.diff
index e777b2cc2..e777b2cc2 100644
--- a/src/test/mir-opt/inline/inline_instruction_set.t32.Inline.diff
+++ b/tests/mir-opt/inline/inline_instruction_set.t32.Inline.diff
diff --git a/src/test/mir-opt/inline/inline_into_box_place.main.Inline.diff b/tests/mir-opt/inline/inline_into_box_place.main.Inline.diff
index 2a4dc9e3e..a28da146e 100644
--- a/src/test/mir-opt/inline/inline_into_box_place.main.Inline.diff
+++ b/tests/mir-opt/inline/inline_into_box_place.main.Inline.diff
@@ -11,13 +11,14 @@
       let mut _6: ();                      // in scope 0 at $DIR/inline_into_box_place.rs:+1:42: +1:43
       let mut _7: *const std::vec::Vec<u32>; // in scope 0 at $DIR/inline_into_box_place.rs:+1:29: +1:43
 +     let mut _8: &mut std::vec::Vec<u32>; // in scope 0 at $DIR/inline_into_box_place.rs:+1:33: +1:43
++     let mut _9: std::vec::Vec<u32>;      // in scope 0 at $DIR/inline_into_box_place.rs:+1:33: +1:43
       scope 1 {
           debug _x => _1;                  // in scope 1 at $DIR/inline_into_box_place.rs:+1:9: +1:11
       }
       scope 2 {
       }
 +     scope 3 (inlined Vec::<u32>::new) {  // at $DIR/inline_into_box_place.rs:8:33: 8:43
-+         let mut _9: alloc::raw_vec::RawVec<u32>; // in scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
++         let mut _10: alloc::raw_vec::RawVec<u32>; // in scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
 +     }
   
       bb0: {
@@ -37,8 +38,9 @@
 -         (*_7) = Vec::<u32>::new() -> [return: bb2, unwind: bb5]; // scope 0 at $DIR/inline_into_box_place.rs:+1:33: +1:43
 +         StorageLive(_8);                 // scope 0 at $DIR/inline_into_box_place.rs:+1:33: +1:43
 +         _8 = &mut (*_7);                 // scope 0 at $DIR/inline_into_box_place.rs:+1:33: +1:43
-+         StorageLive(_9);                 // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-+         _9 = const _;                    // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
++         StorageLive(_9);                 // scope 0 at $DIR/inline_into_box_place.rs:+1:33: +1:43
++         StorageLive(_10);                // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
++         _10 = const _;                   // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
                                            // mir::Constant
 -                                          // + span: $DIR/inline_into_box_place.rs:8:33: 8:41
 -                                          // + user_ty: UserType(1)
@@ -49,10 +51,12 @@
 +                                          // + span: $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
 +                                          // + user_ty: UserType(0)
 +                                          // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Unevaluated(alloc::raw_vec::RawVec::<T>::NEW, [u32], None) }
-+         Deinit((*_8));                   // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-+         ((*_8).0: alloc::raw_vec::RawVec<u32>) = move _9; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-+         ((*_8).1: usize) = const 0_usize; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-+         StorageDead(_9);                 // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
++         Deinit(_9);                      // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
++         (_9.0: alloc::raw_vec::RawVec<u32>) = move _10; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
++         (_9.1: usize) = const 0_usize;   // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
++         StorageDead(_10);                // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
++         (*_8) = move _9;                 // scope 0 at $DIR/inline_into_box_place.rs:+1:33: +1:43
++         StorageDead(_9);                 // scope 0 at $DIR/inline_into_box_place.rs:+1:33: +1:43
 +         StorageDead(_8);                 // scope 0 at $DIR/inline_into_box_place.rs:+1:33: +1:43
           _1 = move _5;                    // scope 0 at $DIR/inline_into_box_place.rs:+1:29: +1:43
           StorageDead(_5);                 // scope 0 at $DIR/inline_into_box_place.rs:+1:42: +1:43
diff --git a/src/test/mir-opt/inline/inline_into_box_place.rs b/tests/mir-opt/inline/inline_into_box_place.rs
index 232bcc7b2..232bcc7b2 100644
--- a/src/test/mir-opt/inline/inline_into_box_place.rs
+++ b/tests/mir-opt/inline/inline_into_box_place.rs
diff --git a/src/test/mir-opt/inline/inline_options.main.Inline.after.mir b/tests/mir-opt/inline/inline_options.main.Inline.after.mir
index 1c590be94..1c590be94 100644
--- a/src/test/mir-opt/inline/inline_options.main.Inline.after.mir
+++ b/tests/mir-opt/inline/inline_options.main.Inline.after.mir
diff --git a/src/test/mir-opt/inline/inline_options.rs b/tests/mir-opt/inline/inline_options.rs
index 477f050b6..477f050b6 100644
--- a/src/test/mir-opt/inline/inline_options.rs
+++ b/tests/mir-opt/inline/inline_options.rs
diff --git a/src/test/mir-opt/inline/inline_retag.bar.Inline.after.mir b/tests/mir-opt/inline/inline_retag.bar.Inline.after.mir
index 60149ff36..60149ff36 100644
--- a/src/test/mir-opt/inline/inline_retag.bar.Inline.after.mir
+++ b/tests/mir-opt/inline/inline_retag.bar.Inline.after.mir
diff --git a/src/test/mir-opt/inline/inline_retag.rs b/tests/mir-opt/inline/inline_retag.rs
index c6950f269..c6950f269 100644
--- a/src/test/mir-opt/inline/inline_retag.rs
+++ b/tests/mir-opt/inline/inline_retag.rs
diff --git a/src/test/mir-opt/inline/inline_shims.clone.Inline.diff b/tests/mir-opt/inline/inline_shims.clone.Inline.diff
index 969573ba3..09dd35c4c 100644
--- a/src/test/mir-opt/inline/inline_shims.clone.Inline.diff
+++ b/tests/mir-opt/inline/inline_shims.clone.Inline.diff
@@ -5,7 +5,7 @@
       debug f => _1;                       // in scope 0 at $DIR/inline_shims.rs:+0:20: +0:21
       let mut _0: fn(A, B);                // return place in scope 0 at $DIR/inline_shims.rs:+0:36: +0:44
       let mut _2: &fn(A, B);               // in scope 0 at $DIR/inline_shims.rs:+1:5: +1:14
-+     scope 1 (inlined <fn(A, B) as Clone>::clone - shim(fn(A, B))) { // at $DIR/inline_shims.rs:6:5: 6:14
++     scope 1 (inlined <fn(A, B) as Clone>::clone - shim(fn(A, B))) { // at $DIR/inline_shims.rs:6:7: 6:14
 +     }
   
       bb0: {
diff --git a/src/test/mir-opt/inline/inline_shims.drop.Inline.diff b/tests/mir-opt/inline/inline_shims.drop.Inline.diff
index 7a54beca2..36ddb189e 100644
--- a/src/test/mir-opt/inline/inline_shims.drop.Inline.diff
+++ b/tests/mir-opt/inline/inline_shims.drop.Inline.diff
@@ -39,7 +39,7 @@
 +         StorageLive(_6);                 // scope 2 at $DIR/inline_shims.rs:+2:14: +2:40
 +         StorageLive(_7);                 // scope 2 at $DIR/inline_shims.rs:+2:14: +2:40
 +         _6 = discriminant((*_5));        // scope 3 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-+         switchInt(move _6) -> [0_isize: bb2, otherwise: bb3]; // scope 3 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
++         switchInt(move _6) -> [0: bb2, otherwise: bb3]; // scope 3 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
       }
   
       bb2: {
diff --git a/src/test/mir-opt/inline/inline_shims.rs b/tests/mir-opt/inline/inline_shims.rs
index 7c8618f71..7c8618f71 100644
--- a/src/test/mir-opt/inline/inline_shims.rs
+++ b/tests/mir-opt/inline/inline_shims.rs
diff --git a/src/test/mir-opt/inline/inline_specialization.main.Inline.diff b/tests/mir-opt/inline/inline_specialization.main.Inline.diff
index af08296ed..af08296ed 100644
--- a/src/test/mir-opt/inline/inline_specialization.main.Inline.diff
+++ b/tests/mir-opt/inline/inline_specialization.main.Inline.diff
diff --git a/src/test/mir-opt/inline/inline_specialization.rs b/tests/mir-opt/inline/inline_specialization.rs
index 87275b4e5..87275b4e5 100644
--- a/src/test/mir-opt/inline/inline_specialization.rs
+++ b/tests/mir-opt/inline/inline_specialization.rs
diff --git a/src/test/mir-opt/inline/inline_trait_method.rs b/tests/mir-opt/inline/inline_trait_method.rs
index 74be53f55..74be53f55 100644
--- a/src/test/mir-opt/inline/inline_trait_method.rs
+++ b/tests/mir-opt/inline/inline_trait_method.rs
diff --git a/src/test/mir-opt/inline/inline_trait_method.test.Inline.after.mir b/tests/mir-opt/inline/inline_trait_method.test.Inline.after.mir
index 637bf282a..637bf282a 100644
--- a/src/test/mir-opt/inline/inline_trait_method.test.Inline.after.mir
+++ b/tests/mir-opt/inline/inline_trait_method.test.Inline.after.mir
diff --git a/src/test/mir-opt/inline/inline_trait_method_2.rs b/tests/mir-opt/inline/inline_trait_method_2.rs
index 378e71a25..378e71a25 100644
--- a/src/test/mir-opt/inline/inline_trait_method_2.rs
+++ b/tests/mir-opt/inline/inline_trait_method_2.rs
diff --git a/src/test/mir-opt/inline/inline_trait_method_2.test2.Inline.after.mir b/tests/mir-opt/inline/inline_trait_method_2.test2.Inline.after.mir
index 73aea719e..73aea719e 100644
--- a/src/test/mir-opt/inline/inline_trait_method_2.test2.Inline.after.mir
+++ b/tests/mir-opt/inline/inline_trait_method_2.test2.Inline.after.mir
diff --git a/tests/mir-opt/inline/issue_106141.outer.Inline.diff b/tests/mir-opt/inline/issue_106141.outer.Inline.diff
new file mode 100644
index 000000000..97361fa5f
--- /dev/null
+++ b/tests/mir-opt/inline/issue_106141.outer.Inline.diff
@@ -0,0 +1,55 @@
+- // MIR for `outer` before Inline
++ // MIR for `outer` after Inline
+  
+  fn outer() -> usize {
+      let mut _0: usize;                   // return place in scope 0 at $DIR/issue_106141.rs:+0:19: +0:24
++     scope 1 (inlined inner) {            // at $DIR/issue_106141.rs:2:5: 2:12
++         let mut _1: bool;                // in scope 1 at $DIR/issue_106141.rs:13:8: 13:21
++         let mut _2: bool;                // in scope 1 at $DIR/issue_106141.rs:13:8: 13:21
++         let mut _3: &[bool; 1];          // in scope 1 at $DIR/issue_106141.rs:11:18: 11:25
++         scope 2 {
++             debug buffer => _3;          // in scope 2 at $DIR/issue_106141.rs:11:9: 11:15
++             scope 3 {
++                 debug index => _0;       // in scope 3 at $DIR/issue_106141.rs:12:9: 12:14
++             }
++         }
++     }
+  
+      bb0: {
+-         _0 = inner() -> bb1;             // scope 0 at $DIR/issue_106141.rs:+1:5: +1:12
++         StorageLive(_3);                 // scope 0 at $DIR/issue_106141.rs:+1:5: +1:12
++         _3 = const _;                    // scope 1 at $DIR/issue_106141.rs:11:18: 11:25
+                                           // mir::Constant
+-                                          // + span: $DIR/issue_106141.rs:2:5: 2:10
+-                                          // + literal: Const { ty: fn() -> usize {inner}, val: Value(<ZST>) }
++                                          // + span: $DIR/issue_106141.rs:11:18: 11:25
++                                          // + literal: Const { ty: &[bool; 1], val: Unevaluated(inner, [], Some(promoted[0])) }
++         _0 = index() -> bb1;             // scope 2 at $DIR/issue_106141.rs:12:17: 12:24
++                                          // mir::Constant
++                                          // + span: $DIR/issue_106141.rs:12:17: 12:22
++                                          // + literal: Const { ty: fn() -> usize {index}, val: Value(<ZST>) }
+      }
+  
+      bb1: {
++         StorageLive(_1);                 // scope 3 at $DIR/issue_106141.rs:13:8: 13:21
++         _2 = Lt(_0, const 1_usize);      // scope 3 at $DIR/issue_106141.rs:13:8: 13:21
++         assert(move _2, "index out of bounds: the length is {} but the index is {}", const 1_usize, _0) -> bb2; // scope 3 at $DIR/issue_106141.rs:13:8: 13:21
++     }
++ 
++     bb2: {
++         _1 = (*_3)[_0];                  // scope 3 at $DIR/issue_106141.rs:13:8: 13:21
++         switchInt(move _1) -> [0: bb3, otherwise: bb4]; // scope 3 at $DIR/issue_106141.rs:13:8: 13:21
++     }
++ 
++     bb3: {
++         _0 = const 0_usize;              // scope 3 at $DIR/issue_106141.rs:16:9: 16:10
++         goto -> bb4;                     // scope 3 at $DIR/issue_106141.rs:13:5: 17:6
++     }
++ 
++     bb4: {
++         StorageDead(_1);                 // scope 3 at $DIR/issue_106141.rs:17:5: 17:6
++         StorageDead(_3);                 // scope 0 at $DIR/issue_106141.rs:+1:5: +1:12
+          return;                          // scope 0 at $DIR/issue_106141.rs:+2:2: +2:2
+      }
+  }
+  
diff --git a/tests/mir-opt/inline/issue_106141.rs b/tests/mir-opt/inline/issue_106141.rs
new file mode 100644
index 000000000..c8288b7f3
--- /dev/null
+++ b/tests/mir-opt/inline/issue_106141.rs
@@ -0,0 +1,24 @@
+pub fn outer() -> usize {
+    inner()
+}
+
+fn index() -> usize {
+    loop {}
+}
+
+#[inline]
+fn inner() -> usize {
+    let buffer = &[true];
+    let index = index();
+    if buffer[index] {
+        index
+    } else {
+        0
+    }
+}
+
+fn main() {
+    outer();
+}
+
+// EMIT_MIR issue_106141.outer.Inline.diff
diff --git a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.a.Inline.after.mir b/tests/mir-opt/inline/issue_58867_inline_as_ref_as_mut.a.Inline.after.mir
index 777681e1c..dc0c32350 100644
--- a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.a.Inline.after.mir
+++ b/tests/mir-opt/inline/issue_58867_inline_as_ref_as_mut.a.Inline.after.mir
@@ -6,7 +6,7 @@ fn a(_1: &mut [T]) -> &mut [T] {
     let mut _2: &mut [T];                // in scope 0 at $DIR/issue_58867_inline_as_ref_as_mut.rs:+1:5: +1:15
     let mut _3: &mut [T];                // in scope 0 at $DIR/issue_58867_inline_as_ref_as_mut.rs:+1:5: +1:15
     let mut _4: &mut [T];                // in scope 0 at $DIR/issue_58867_inline_as_ref_as_mut.rs:+1:5: +1:15
-    scope 1 (inlined <[T] as AsMut<[T]>>::as_mut) { // at $DIR/issue_58867_inline_as_ref_as_mut.rs:3:5: 3:15
+    scope 1 (inlined <[T] as AsMut<[T]>>::as_mut) { // at $DIR/issue_58867_inline_as_ref_as_mut.rs:3:7: 3:15
         debug self => _4;                // in scope 1 at $SRC_DIR/core/src/convert/mod.rs:LL:COL
         let mut _5: &mut [T];            // in scope 1 at $SRC_DIR/core/src/convert/mod.rs:LL:COL
     }
diff --git a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.b.Inline.after.mir b/tests/mir-opt/inline/issue_58867_inline_as_ref_as_mut.b.Inline.after.mir
index 83545c991..b6aff3014 100644
--- a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.b.Inline.after.mir
+++ b/tests/mir-opt/inline/issue_58867_inline_as_ref_as_mut.b.Inline.after.mir
@@ -6,7 +6,7 @@ fn b(_1: &mut Box<T>) -> &mut T {
     let mut _2: &mut T;                  // in scope 0 at $DIR/issue_58867_inline_as_ref_as_mut.rs:+1:5: +1:15
     let mut _3: &mut T;                  // in scope 0 at $DIR/issue_58867_inline_as_ref_as_mut.rs:+1:5: +1:15
     let mut _4: &mut std::boxed::Box<T>; // in scope 0 at $DIR/issue_58867_inline_as_ref_as_mut.rs:+1:5: +1:15
-    scope 1 (inlined <Box<T> as AsMut<T>>::as_mut) { // at $DIR/issue_58867_inline_as_ref_as_mut.rs:8:5: 8:15
+    scope 1 (inlined <Box<T> as AsMut<T>>::as_mut) { // at $DIR/issue_58867_inline_as_ref_as_mut.rs:8:7: 8:15
         debug self => _4;                // in scope 1 at $SRC_DIR/alloc/src/boxed.rs:LL:COL
         let mut _5: &mut T;              // in scope 1 at $SRC_DIR/alloc/src/boxed.rs:LL:COL
         let mut _6: &mut T;              // in scope 1 at $SRC_DIR/alloc/src/boxed.rs:LL:COL
diff --git a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.c.Inline.after.mir b/tests/mir-opt/inline/issue_58867_inline_as_ref_as_mut.c.Inline.after.mir
index ed4e9927c..af830d249 100644
--- a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.c.Inline.after.mir
+++ b/tests/mir-opt/inline/issue_58867_inline_as_ref_as_mut.c.Inline.after.mir
@@ -5,7 +5,7 @@ fn c(_1: &[T]) -> &[T] {
     let mut _0: &[T];                    // return place in scope 0 at $DIR/issue_58867_inline_as_ref_as_mut.rs:+0:25: +0:29
     let _2: &[T];                        // in scope 0 at $DIR/issue_58867_inline_as_ref_as_mut.rs:+1:5: +1:15
     let mut _3: &[T];                    // in scope 0 at $DIR/issue_58867_inline_as_ref_as_mut.rs:+1:5: +1:15
-    scope 1 (inlined <[T] as AsRef<[T]>>::as_ref) { // at $DIR/issue_58867_inline_as_ref_as_mut.rs:13:5: 13:15
+    scope 1 (inlined <[T] as AsRef<[T]>>::as_ref) { // at $DIR/issue_58867_inline_as_ref_as_mut.rs:13:7: 13:15
         debug self => _3;                // in scope 1 at $SRC_DIR/core/src/convert/mod.rs:LL:COL
     }
 
diff --git a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.d.Inline.after.mir b/tests/mir-opt/inline/issue_58867_inline_as_ref_as_mut.d.Inline.after.mir
index 18a2670be..4f9342247 100644
--- a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.d.Inline.after.mir
+++ b/tests/mir-opt/inline/issue_58867_inline_as_ref_as_mut.d.Inline.after.mir
@@ -5,7 +5,7 @@ fn d(_1: &Box<T>) -> &T {
     let mut _0: &T;                      // return place in scope 0 at $DIR/issue_58867_inline_as_ref_as_mut.rs:+0:28: +0:30
     let _2: &T;                          // in scope 0 at $DIR/issue_58867_inline_as_ref_as_mut.rs:+1:5: +1:15
     let mut _3: &std::boxed::Box<T>;     // in scope 0 at $DIR/issue_58867_inline_as_ref_as_mut.rs:+1:5: +1:15
-    scope 1 (inlined <Box<T> as AsRef<T>>::as_ref) { // at $DIR/issue_58867_inline_as_ref_as_mut.rs:18:5: 18:15
+    scope 1 (inlined <Box<T> as AsRef<T>>::as_ref) { // at $DIR/issue_58867_inline_as_ref_as_mut.rs:18:7: 18:15
         debug self => _3;                // in scope 1 at $SRC_DIR/alloc/src/boxed.rs:LL:COL
         let mut _4: std::boxed::Box<T>;  // in scope 1 at $SRC_DIR/alloc/src/boxed.rs:LL:COL
         let mut _5: *const T;            // in scope 1 at $SRC_DIR/alloc/src/boxed.rs:LL:COL
diff --git a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.rs b/tests/mir-opt/inline/issue_58867_inline_as_ref_as_mut.rs
index 94f926d39..94f926d39 100644
--- a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.rs
+++ b/tests/mir-opt/inline/issue_58867_inline_as_ref_as_mut.rs
diff --git a/src/test/mir-opt/inline/issue_76997_inline_scopes_parenting.main.Inline.after.mir b/tests/mir-opt/inline/issue_76997_inline_scopes_parenting.main.Inline.after.mir
index d99ae1a6c..d99ae1a6c 100644
--- a/src/test/mir-opt/inline/issue_76997_inline_scopes_parenting.main.Inline.after.mir
+++ b/tests/mir-opt/inline/issue_76997_inline_scopes_parenting.main.Inline.after.mir
diff --git a/src/test/mir-opt/inline/issue_76997_inline_scopes_parenting.rs b/tests/mir-opt/inline/issue_76997_inline_scopes_parenting.rs
index 76d806acc..76d806acc 100644
--- a/src/test/mir-opt/inline/issue_76997_inline_scopes_parenting.rs
+++ b/tests/mir-opt/inline/issue_76997_inline_scopes_parenting.rs
diff --git a/src/test/mir-opt/inline/issue_78442.bar.Inline.diff b/tests/mir-opt/inline/issue_78442.bar.Inline.diff
index 51a98465f..51a98465f 100644
--- a/src/test/mir-opt/inline/issue_78442.bar.Inline.diff
+++ b/tests/mir-opt/inline/issue_78442.bar.Inline.diff
diff --git a/src/test/mir-opt/inline/issue_78442.bar.RevealAll.diff b/tests/mir-opt/inline/issue_78442.bar.RevealAll.diff
index e47466c5e..e47466c5e 100644
--- a/src/test/mir-opt/inline/issue_78442.bar.RevealAll.diff
+++ b/tests/mir-opt/inline/issue_78442.bar.RevealAll.diff
diff --git a/src/test/mir-opt/inline/issue_78442.rs b/tests/mir-opt/inline/issue_78442.rs
index aa8ede2df..aa8ede2df 100644
--- a/src/test/mir-opt/inline/issue_78442.rs
+++ b/tests/mir-opt/inline/issue_78442.rs
diff --git a/src/test/mir-opt/inline/polymorphic_recursion.rs b/tests/mir-opt/inline/polymorphic_recursion.rs
index 7388722b7..7388722b7 100644
--- a/src/test/mir-opt/inline/polymorphic_recursion.rs
+++ b/tests/mir-opt/inline/polymorphic_recursion.rs
diff --git a/src/test/mir-opt/instrument_coverage.bar.InstrumentCoverage.diff b/tests/mir-opt/instrument_coverage.bar.InstrumentCoverage.diff
index a3cee3ecf..a3cee3ecf 100644
--- a/src/test/mir-opt/instrument_coverage.bar.InstrumentCoverage.diff
+++ b/tests/mir-opt/instrument_coverage.bar.InstrumentCoverage.diff
diff --git a/src/test/mir-opt/instrument_coverage.main.InstrumentCoverage.diff b/tests/mir-opt/instrument_coverage.main.InstrumentCoverage.diff
index 81d552823..2f6f5f87e 100644
--- a/src/test/mir-opt/instrument_coverage.main.InstrumentCoverage.diff
+++ b/tests/mir-opt/instrument_coverage.main.InstrumentCoverage.diff
@@ -26,7 +26,7 @@
       }
   
       bb3: {
-          switchInt(move _2) -> [false: bb5, otherwise: bb4]; // scope 0 at /the/src/instrument_coverage.rs:+2:12: +2:17
+          switchInt(move _2) -> [0: bb5, otherwise: bb4]; // scope 0 at /the/src/instrument_coverage.rs:+2:12: +2:17
       }
   
       bb4: {
diff --git a/src/test/mir-opt/instrument_coverage.rs b/tests/mir-opt/instrument_coverage.rs
index 7f6a0a0eb..7f6a0a0eb 100644
--- a/src/test/mir-opt/instrument_coverage.rs
+++ b/tests/mir-opt/instrument_coverage.rs
diff --git a/src/test/mir-opt/issue_101973.inner.ConstProp.diff b/tests/mir-opt/issue_101973.inner.ConstProp.diff
index 8fe60a024..b2706e5a4 100644
--- a/src/test/mir-opt/issue_101973.inner.ConstProp.diff
+++ b/tests/mir-opt/issue_101973.inner.ConstProp.diff
@@ -23,7 +23,7 @@
               debug out => _4;             // in scope 2 at $DIR/issue_101973.rs:6:9: 6:16
           }
       }
-      scope 3 (inlined core::num::<impl u32>::rotate_right) { // at $DIR/issue_101973.rs:14:5: 14:58
+      scope 3 (inlined core::num::<impl u32>::rotate_right) { // at $DIR/issue_101973.rs:14:18: 14:58
           debug self => _4;                // in scope 3 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
           debug n => _6;                   // in scope 3 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
           let mut _15: u32;                // in scope 3 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
diff --git a/src/test/mir-opt/issue_101973.rs b/tests/mir-opt/issue_101973.rs
index 216659a23..216659a23 100644
--- a/src/test/mir-opt/issue_101973.rs
+++ b/tests/mir-opt/issue_101973.rs
diff --git a/src/test/mir-opt/issue_38669.main.SimplifyCfg-initial.after.mir b/tests/mir-opt/issue_38669.main.SimplifyCfg-initial.after.mir
index 822100818..b0d5b291b 100644
--- a/src/test/mir-opt/issue_38669.main.SimplifyCfg-initial.after.mir
+++ b/tests/mir-opt/issue_38669.main.SimplifyCfg-initial.after.mir
@@ -26,7 +26,7 @@ fn main() -> () {
         StorageLive(_3);                 // scope 1 at $DIR/issue_38669.rs:+3:9: +5:10
         StorageLive(_4);                 // scope 1 at $DIR/issue_38669.rs:+3:12: +3:24
         _4 = _1;                         // scope 1 at $DIR/issue_38669.rs:+3:12: +3:24
-        switchInt(move _4) -> [false: bb4, otherwise: bb3]; // scope 1 at $DIR/issue_38669.rs:+3:12: +3:24
+        switchInt(move _4) -> [0: bb4, otherwise: bb3]; // scope 1 at $DIR/issue_38669.rs:+3:12: +3:24
     }
 
     bb3: {
diff --git a/src/test/mir-opt/issue_38669.rs b/tests/mir-opt/issue_38669.rs
index db3f89472..db3f89472 100644
--- a/src/test/mir-opt/issue_38669.rs
+++ b/tests/mir-opt/issue_38669.rs
diff --git a/src/test/mir-opt/issue_41110.main.ElaborateDrops.after.mir b/tests/mir-opt/issue_41110.main.ElaborateDrops.after.mir
index c573ad5a8..c2ea3ac50 100644
--- a/src/test/mir-opt/issue_41110.main.ElaborateDrops.after.mir
+++ b/tests/mir-opt/issue_41110.main.ElaborateDrops.after.mir
@@ -65,6 +65,6 @@ fn main() -> () {
     }
 
     bb8 (cleanup): {
-        switchInt(_5) -> [false: bb6, otherwise: bb7]; // scope 0 at $DIR/issue_41110.rs:+1:27: +1:28
+        switchInt(_5) -> [0: bb6, otherwise: bb7]; // scope 0 at $DIR/issue_41110.rs:+1:27: +1:28
     }
 }
diff --git a/src/test/mir-opt/issue_41110.rs b/tests/mir-opt/issue_41110.rs
index 638dc601e..638dc601e 100644
--- a/src/test/mir-opt/issue_41110.rs
+++ b/tests/mir-opt/issue_41110.rs
diff --git a/src/test/mir-opt/issue_41110.test.ElaborateDrops.after.mir b/tests/mir-opt/issue_41110.test.ElaborateDrops.after.mir
index 470b03232..82989c3f0 100644
--- a/src/test/mir-opt/issue_41110.test.ElaborateDrops.after.mir
+++ b/tests/mir-opt/issue_41110.test.ElaborateDrops.after.mir
@@ -96,6 +96,6 @@ fn test() -> () {
     }
 
     bb14 (cleanup): {
-        switchInt(_6) -> [false: bb10, otherwise: bb13]; // scope 0 at $DIR/issue_41110.rs:+5:1: +5:2
+        switchInt(_6) -> [0: bb10, otherwise: bb13]; // scope 0 at $DIR/issue_41110.rs:+5:1: +5:2
     }
 }
diff --git a/src/test/mir-opt/issue_41697.rs b/tests/mir-opt/issue_41697.rs
index cbd8633a3..cbd8633a3 100644
--- a/src/test/mir-opt/issue_41697.rs
+++ b/tests/mir-opt/issue_41697.rs
diff --git a/src/test/mir-opt/issue_41697.{impl#0}-{constant#0}.SimplifyCfg-promote-consts.after.mir b/tests/mir-opt/issue_41697.{impl#0}-{constant#0}.SimplifyCfg-promote-consts.after.mir
index 8af087d84..8af087d84 100644
--- a/src/test/mir-opt/issue_41697.{impl#0}-{constant#0}.SimplifyCfg-promote-consts.after.mir
+++ b/tests/mir-opt/issue_41697.{impl#0}-{constant#0}.SimplifyCfg-promote-consts.after.mir
diff --git a/src/test/mir-opt/issue_41888.main.ElaborateDrops.after.mir b/tests/mir-opt/issue_41888.main.ElaborateDrops.after.mir
index 73372c97b..005042732 100644
--- a/src/test/mir-opt/issue_41888.main.ElaborateDrops.after.mir
+++ b/tests/mir-opt/issue_41888.main.ElaborateDrops.after.mir
@@ -33,7 +33,7 @@ fn main() -> () {
     }
 
     bb1: {
-        switchInt(move _2) -> [false: bb7, otherwise: bb2]; // scope 1 at $DIR/issue_41888.rs:+2:8: +2:14
+        switchInt(move _2) -> [0: bb7, otherwise: bb2]; // scope 1 at $DIR/issue_41888.rs:+2:8: +2:14
     }
 
     bb2: {
@@ -52,7 +52,7 @@ fn main() -> () {
     bb4: {
         StorageDead(_3);                 // scope 1 at $DIR/issue_41888.rs:+3:19: +3:20
         _5 = discriminant(_1);           // scope 2 at $DIR/issue_41888.rs:+4:16: +4:24
-        switchInt(move _5) -> [0_isize: bb5, otherwise: bb6]; // scope 2 at $DIR/issue_41888.rs:+4:16: +4:24
+        switchInt(move _5) -> [0: bb5, otherwise: bb6]; // scope 2 at $DIR/issue_41888.rs:+4:16: +4:24
     }
 
     bb5: {
@@ -134,19 +134,19 @@ fn main() -> () {
 
     bb19: {
         _10 = discriminant(_1);          // scope 0 at $DIR/issue_41888.rs:+9:1: +9:2
-        switchInt(move _10) -> [0_isize: bb15, otherwise: bb17]; // scope 0 at $DIR/issue_41888.rs:+9:1: +9:2
+        switchInt(move _10) -> [0: bb15, otherwise: bb17]; // scope 0 at $DIR/issue_41888.rs:+9:1: +9:2
     }
 
     bb20: {
-        switchInt(_7) -> [false: bb15, otherwise: bb19]; // scope 0 at $DIR/issue_41888.rs:+9:1: +9:2
+        switchInt(_7) -> [0: bb15, otherwise: bb19]; // scope 0 at $DIR/issue_41888.rs:+9:1: +9:2
     }
 
     bb21 (cleanup): {
         _11 = discriminant(_1);          // scope 0 at $DIR/issue_41888.rs:+9:1: +9:2
-        switchInt(move _11) -> [0_isize: bb16, otherwise: bb18]; // scope 0 at $DIR/issue_41888.rs:+9:1: +9:2
+        switchInt(move _11) -> [0: bb16, otherwise: bb18]; // scope 0 at $DIR/issue_41888.rs:+9:1: +9:2
     }
 
     bb22 (cleanup): {
-        switchInt(_7) -> [false: bb12, otherwise: bb21]; // scope 0 at $DIR/issue_41888.rs:+9:1: +9:2
+        switchInt(_7) -> [0: bb12, otherwise: bb21]; // scope 0 at $DIR/issue_41888.rs:+9:1: +9:2
     }
 }
diff --git a/src/test/mir-opt/issue_41888.rs b/tests/mir-opt/issue_41888.rs
index c1046c14d..c1046c14d 100644
--- a/src/test/mir-opt/issue_41888.rs
+++ b/tests/mir-opt/issue_41888.rs
diff --git a/src/test/mir-opt/issue_62289.rs b/tests/mir-opt/issue_62289.rs
index 37e3390d5..37e3390d5 100644
--- a/src/test/mir-opt/issue_62289.rs
+++ b/tests/mir-opt/issue_62289.rs
diff --git a/src/test/mir-opt/issue_62289.test.ElaborateDrops.before.mir b/tests/mir-opt/issue_62289.test.ElaborateDrops.before.mir
index 6969a66ac..adfa3a773 100644
--- a/src/test/mir-opt/issue_62289.test.ElaborateDrops.before.mir
+++ b/tests/mir-opt/issue_62289.test.ElaborateDrops.before.mir
@@ -52,7 +52,7 @@ fn test() -> Option<Box<u32>> {
     bb2: {
         StorageDead(_7);                 // scope 0 at $DIR/issue_62289.rs:+1:19: +1:20
         _8 = discriminant(_6);           // scope 0 at $DIR/issue_62289.rs:+1:15: +1:20
-        switchInt(move _8) -> [0_isize: bb3, 1_isize: bb5, otherwise: bb4]; // scope 0 at $DIR/issue_62289.rs:+1:15: +1:20
+        switchInt(move _8) -> [0: bb3, 1: bb5, otherwise: bb4]; // scope 0 at $DIR/issue_62289.rs:+1:15: +1:20
     }
 
     bb3: {
diff --git a/src/test/mir-opt/issue_72181.bar.built.after.mir b/tests/mir-opt/issue_72181.bar.built.after.mir
index ebee89001..ebee89001 100644
--- a/src/test/mir-opt/issue_72181.bar.built.after.mir
+++ b/tests/mir-opt/issue_72181.bar.built.after.mir
diff --git a/src/test/mir-opt/issue_72181.foo.built.after.mir b/tests/mir-opt/issue_72181.foo.built.after.mir
index 90c978520..90c978520 100644
--- a/src/test/mir-opt/issue_72181.foo.built.after.mir
+++ b/tests/mir-opt/issue_72181.foo.built.after.mir
diff --git a/src/test/mir-opt/issue_72181.main.built.after.mir b/tests/mir-opt/issue_72181.main.built.after.mir
index e86836927..e86836927 100644
--- a/src/test/mir-opt/issue_72181.main.built.after.mir
+++ b/tests/mir-opt/issue_72181.main.built.after.mir
diff --git a/src/test/mir-opt/issue_72181.rs b/tests/mir-opt/issue_72181.rs
index 6a32d4bbe..6a32d4bbe 100644
--- a/src/test/mir-opt/issue_72181.rs
+++ b/tests/mir-opt/issue_72181.rs
diff --git a/src/test/mir-opt/issue_72181_1.f.built.after.mir b/tests/mir-opt/issue_72181_1.f.built.after.mir
index 4086da520..4086da520 100644
--- a/src/test/mir-opt/issue_72181_1.f.built.after.mir
+++ b/tests/mir-opt/issue_72181_1.f.built.after.mir
diff --git a/src/test/mir-opt/issue_72181_1.main.built.after.mir b/tests/mir-opt/issue_72181_1.main.built.after.mir
index 2172f3aa9..2172f3aa9 100644
--- a/src/test/mir-opt/issue_72181_1.main.built.after.mir
+++ b/tests/mir-opt/issue_72181_1.main.built.after.mir
diff --git a/src/test/mir-opt/issue_72181_1.rs b/tests/mir-opt/issue_72181_1.rs
index 8ae2599ec..8ae2599ec 100644
--- a/src/test/mir-opt/issue_72181_1.rs
+++ b/tests/mir-opt/issue_72181_1.rs
diff --git a/tests/mir-opt/issue_73223.main.SimplifyArmIdentity.diff b/tests/mir-opt/issue_73223.main.SimplifyArmIdentity.diff
new file mode 100644
index 000000000..bf3bcfdb5
--- /dev/null
+++ b/tests/mir-opt/issue_73223.main.SimplifyArmIdentity.diff
@@ -0,0 +1,156 @@
+- // MIR for `main` before SimplifyArmIdentity
++ // MIR for `main` after SimplifyArmIdentity
+  
+  fn main() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/issue_73223.rs:+0:11: +0:11
+      let _1: i32;                         // in scope 0 at $DIR/issue_73223.rs:+1:9: +1:14
+      let mut _2: std::option::Option<i32>; // in scope 0 at $DIR/issue_73223.rs:+1:23: +1:30
+      let mut _3: isize;                   // in scope 0 at $DIR/issue_73223.rs:+2:9: +2:16
+      let _4: i32;                         // in scope 0 at $DIR/issue_73223.rs:+2:14: +2:15
+      let mut _6: i32;                     // in scope 0 at $DIR/issue_73223.rs:+6:22: +6:27
+      let mut _7: &i32;                    // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let mut _8: &i32;                    // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let mut _11: bool;                   // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let mut _12: bool;                   // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let mut _13: i32;                    // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let mut _14: i32;                    // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let _16: !;                          // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let mut _17: core::panicking::AssertKind; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let mut _18: &i32;                   // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let _19: &i32;                       // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let mut _20: &i32;                   // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let _21: &i32;                       // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let mut _22: std::option::Option<std::fmt::Arguments<'_>>; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let mut _24: &i32;                   // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      let mut _25: &i32;                   // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      scope 1 {
+          debug split => _1;               // in scope 1 at $DIR/issue_73223.rs:+1:9: +1:14
+          let _5: std::option::Option<i32>; // in scope 1 at $DIR/issue_73223.rs:+6:9: +6:14
+          scope 3 {
+              debug _prev => _5;           // in scope 3 at $DIR/issue_73223.rs:+6:9: +6:14
+              let _9: &i32;                // in scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+              let _10: &i32;               // in scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+              let mut _23: &i32;           // in scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+              scope 4 {
+                  debug left_val => _9;    // in scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+                  debug right_val => _10;  // in scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+                  let _15: core::panicking::AssertKind; // in scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+                  scope 5 {
+                      debug kind => _15;   // in scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+                  }
+              }
+          }
+      }
+      scope 2 {
+          debug v => _4;                   // in scope 2 at $DIR/issue_73223.rs:+2:14: +2:15
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/issue_73223.rs:+1:9: +1:14
+          StorageLive(_2);                 // scope 0 at $DIR/issue_73223.rs:+1:23: +1:30
+          Deinit(_2);                      // scope 0 at $DIR/issue_73223.rs:+1:23: +1:30
+          ((_2 as Some).0: i32) = const 1_i32; // scope 0 at $DIR/issue_73223.rs:+1:23: +1:30
+          discriminant(_2) = 1;            // scope 0 at $DIR/issue_73223.rs:+1:23: +1:30
+          _3 = const 1_isize;              // scope 0 at $DIR/issue_73223.rs:+1:23: +1:30
+          goto -> bb3;                     // scope 0 at $DIR/issue_73223.rs:+1:17: +1:30
+      }
+  
+      bb1: {
+          StorageDead(_2);                 // scope 0 at $DIR/issue_73223.rs:+4:6: +4:7
+          StorageDead(_1);                 // scope 0 at $DIR/issue_73223.rs:+8:1: +8:2
+          return;                          // scope 0 at $DIR/issue_73223.rs:+8:2: +8:2
+      }
+  
+      bb2: {
+          unreachable;                     // scope 0 at $DIR/issue_73223.rs:+1:23: +1:30
+      }
+  
+      bb3: {
+          StorageLive(_4);                 // scope 0 at $DIR/issue_73223.rs:+2:14: +2:15
+          _4 = ((_2 as Some).0: i32);      // scope 0 at $DIR/issue_73223.rs:+2:14: +2:15
+          _1 = _4;                         // scope 2 at $DIR/issue_73223.rs:+2:20: +2:21
+          StorageDead(_4);                 // scope 0 at $DIR/issue_73223.rs:+2:20: +2:21
+          StorageDead(_2);                 // scope 0 at $DIR/issue_73223.rs:+4:6: +4:7
+          StorageLive(_5);                 // scope 1 at $DIR/issue_73223.rs:+6:9: +6:14
+          StorageLive(_6);                 // scope 1 at $DIR/issue_73223.rs:+6:22: +6:27
+          _6 = _1;                         // scope 1 at $DIR/issue_73223.rs:+6:22: +6:27
+          Deinit(_5);                      // scope 1 at $DIR/issue_73223.rs:+6:17: +6:28
+          ((_5 as Some).0: i32) = move _6; // scope 1 at $DIR/issue_73223.rs:+6:17: +6:28
+          discriminant(_5) = 1;            // scope 1 at $DIR/issue_73223.rs:+6:17: +6:28
+          StorageDead(_6);                 // scope 1 at $DIR/issue_73223.rs:+6:27: +6:28
+          StorageLive(_24);                // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_25);                // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_7);                 // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _7 = &_1;                        // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_8);                 // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _23 = const _;                   // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+                                           // mir::Constant
+                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
+                                           // + literal: Const { ty: &i32, val: Unevaluated(main, [], Some(promoted[0])) }
+          _8 = _23;                        // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          Deinit(_24);                     // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          Deinit(_25);                     // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _24 = move _7;                   // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _25 = move _8;                   // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageDead(_8);                 // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageDead(_7);                 // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_9);                 // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _9 = _24;                        // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_10);                // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _10 = _25;                       // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_11);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_12);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_13);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _13 = (*_9);                     // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_14);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _14 = const 1_i32;               // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _12 = Eq(move _13, const 1_i32); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageDead(_14);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageDead(_13);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _11 = Not(move _12);             // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageDead(_12);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          switchInt(move _11) -> [0: bb5, otherwise: bb4]; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+      }
+  
+      bb4: {
+          StorageLive(_15);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          Deinit(_15);                     // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          discriminant(_15) = 0;           // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_16);                // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_17);                // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _17 = const core::panicking::AssertKind::Eq; // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+                                           // mir::Constant
+                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
+                                           // + literal: Const { ty: core::panicking::AssertKind, val: Value(Scalar(0x00)) }
+          StorageLive(_18);                // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_19);                // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _19 = _9;                        // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _18 = _19;                       // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_20);                // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_21);                // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _21 = _10;                       // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _20 = _21;                       // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageLive(_22);                // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          Deinit(_22);                     // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          discriminant(_22) = 0;           // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          _16 = core::panicking::assert_failed::<i32, i32>(const core::panicking::AssertKind::Eq, move _18, move _20, move _22); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+                                           // mir::Constant
+                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
+                                           // + literal: Const { ty: for<'a, 'b, 'c> fn(core::panicking::AssertKind, &'a i32, &'b i32, Option<Arguments<'c>>) -> ! {core::panicking::assert_failed::<i32, i32>}, val: Value(<ZST>) }
+                                           // mir::Constant
+                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
+                                           // + literal: Const { ty: core::panicking::AssertKind, val: Value(Scalar(0x00)) }
+      }
+  
+      bb5: {
+          StorageDead(_11);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageDead(_10);                // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageDead(_9);                 // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageDead(_24);                // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageDead(_25);                // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+          StorageDead(_5);                 // scope 1 at $DIR/issue_73223.rs:+8:1: +8:2
+          StorageDead(_1);                 // scope 0 at $DIR/issue_73223.rs:+8:1: +8:2
+          return;                          // scope 0 at $DIR/issue_73223.rs:+8:2: +8:2
+      }
+  }
+  
diff --git a/src/test/mir-opt/issue_73223.rs b/tests/mir-opt/issue_73223.rs
index be114cab7..be114cab7 100644
--- a/src/test/mir-opt/issue_73223.rs
+++ b/tests/mir-opt/issue_73223.rs
diff --git a/src/test/mir-opt/issue_76432.rs b/tests/mir-opt/issue_76432.rs
index c8b405ca8..c8b405ca8 100644
--- a/src/test/mir-opt/issue_76432.rs
+++ b/tests/mir-opt/issue_76432.rs
diff --git a/tests/mir-opt/issue_76432.test.SimplifyComparisonIntegral.diff b/tests/mir-opt/issue_76432.test.SimplifyComparisonIntegral.diff
new file mode 100644
index 000000000..c24543dae
--- /dev/null
+++ b/tests/mir-opt/issue_76432.test.SimplifyComparisonIntegral.diff
@@ -0,0 +1,84 @@
+- // MIR for `test` before SimplifyComparisonIntegral
++ // MIR for `test` after SimplifyComparisonIntegral
+  
+  fn test(_1: T) -> () {
+      debug x => _1;                       // in scope 0 at $DIR/issue_76432.rs:+0:38: +0:39
+      let mut _0: ();                      // return place in scope 0 at $DIR/issue_76432.rs:+0:44: +0:44
+      let _2: &[T];                        // in scope 0 at $DIR/issue_76432.rs:+1:9: +1:10
+      let mut _3: &[T; 3];                 // in scope 0 at $DIR/issue_76432.rs:+1:19: +1:29
+      let _4: &[T; 3];                     // in scope 0 at $DIR/issue_76432.rs:+1:19: +1:29
+      let _5: [T; 3];                      // in scope 0 at $DIR/issue_76432.rs:+1:20: +1:29
+      let mut _6: T;                       // in scope 0 at $DIR/issue_76432.rs:+1:21: +1:22
+      let mut _7: T;                       // in scope 0 at $DIR/issue_76432.rs:+1:24: +1:25
+      let mut _8: T;                       // in scope 0 at $DIR/issue_76432.rs:+1:27: +1:28
+      let mut _9: usize;                   // in scope 0 at $DIR/issue_76432.rs:+3:9: +3:33
+      let mut _10: usize;                  // in scope 0 at $DIR/issue_76432.rs:+3:9: +3:33
+      let mut _11: bool;                   // in scope 0 at $DIR/issue_76432.rs:+3:9: +3:33
+      let mut _15: !;                      // in scope 0 at $SRC_DIR/core/src/panic.rs:LL:COL
+      scope 1 {
+          debug v => _2;                   // in scope 1 at $DIR/issue_76432.rs:+1:9: +1:10
+          let _12: &T;                     // in scope 1 at $DIR/issue_76432.rs:+3:10: +3:16
+          let _13: &T;                     // in scope 1 at $DIR/issue_76432.rs:+3:18: +3:24
+          let _14: &T;                     // in scope 1 at $DIR/issue_76432.rs:+3:26: +3:32
+          scope 2 {
+              debug v1 => _12;             // in scope 2 at $DIR/issue_76432.rs:+3:10: +3:16
+              debug v2 => _13;             // in scope 2 at $DIR/issue_76432.rs:+3:18: +3:24
+              debug v3 => _14;             // in scope 2 at $DIR/issue_76432.rs:+3:26: +3:32
+          }
+      }
+  
+      bb0: {
+          StorageLive(_2);                 // scope 0 at $DIR/issue_76432.rs:+1:9: +1:10
+          StorageLive(_3);                 // scope 0 at $DIR/issue_76432.rs:+1:19: +1:29
+          StorageLive(_4);                 // scope 0 at $DIR/issue_76432.rs:+1:19: +1:29
+          StorageLive(_5);                 // scope 0 at $DIR/issue_76432.rs:+1:20: +1:29
+          StorageLive(_6);                 // scope 0 at $DIR/issue_76432.rs:+1:21: +1:22
+          _6 = _1;                         // scope 0 at $DIR/issue_76432.rs:+1:21: +1:22
+          StorageLive(_7);                 // scope 0 at $DIR/issue_76432.rs:+1:24: +1:25
+          _7 = _1;                         // scope 0 at $DIR/issue_76432.rs:+1:24: +1:25
+          StorageLive(_8);                 // scope 0 at $DIR/issue_76432.rs:+1:27: +1:28
+          _8 = _1;                         // scope 0 at $DIR/issue_76432.rs:+1:27: +1:28
+          _5 = [move _6, move _7, move _8]; // scope 0 at $DIR/issue_76432.rs:+1:20: +1:29
+          StorageDead(_8);                 // scope 0 at $DIR/issue_76432.rs:+1:28: +1:29
+          StorageDead(_7);                 // scope 0 at $DIR/issue_76432.rs:+1:28: +1:29
+          StorageDead(_6);                 // scope 0 at $DIR/issue_76432.rs:+1:28: +1:29
+          _4 = &_5;                        // scope 0 at $DIR/issue_76432.rs:+1:19: +1:29
+          _3 = _4;                         // scope 0 at $DIR/issue_76432.rs:+1:19: +1:29
+          _2 = move _3 as &[T] (Pointer(Unsize)); // scope 0 at $DIR/issue_76432.rs:+1:19: +1:29
+          StorageDead(_3);                 // scope 0 at $DIR/issue_76432.rs:+1:28: +1:29
+          StorageDead(_4);                 // scope 0 at $DIR/issue_76432.rs:+1:29: +1:30
+          _9 = Len((*_2));                 // scope 1 at $DIR/issue_76432.rs:+3:9: +3:33
+          _10 = const 3_usize;             // scope 1 at $DIR/issue_76432.rs:+3:9: +3:33
+-         _11 = Eq(move _9, const 3_usize); // scope 1 at $DIR/issue_76432.rs:+3:9: +3:33
+-         switchInt(move _11) -> [0: bb1, otherwise: bb2]; // scope 1 at $DIR/issue_76432.rs:+3:9: +3:33
++         nop;                             // scope 1 at $DIR/issue_76432.rs:+3:9: +3:33
++         switchInt(move _9) -> [3: bb2, otherwise: bb1]; // scope 1 at $DIR/issue_76432.rs:+3:9: +3:33
+      }
+  
+      bb1: {
+          StorageLive(_15);                // scope 1 at $SRC_DIR/core/src/panic.rs:LL:COL
+          _15 = core::panicking::panic(const "internal error: entered unreachable code"); // scope 1 at $SRC_DIR/core/src/panic.rs:LL:COL
+                                           // mir::Constant
+                                           // + span: $SRC_DIR/core/src/panic.rs:LL:COL
+                                           // + literal: Const { ty: fn(&'static str) -> ! {core::panicking::panic}, val: Value(<ZST>) }
+                                           // mir::Constant
+                                           // + span: $SRC_DIR/core/src/panic.rs:LL:COL
+                                           // + literal: Const { ty: &str, val: Value(Slice(..)) }
+      }
+  
+      bb2: {
+          StorageLive(_12);                // scope 1 at $DIR/issue_76432.rs:+3:10: +3:16
+          _12 = &(*_2)[0 of 3];            // scope 1 at $DIR/issue_76432.rs:+3:10: +3:16
+          StorageLive(_13);                // scope 1 at $DIR/issue_76432.rs:+3:18: +3:24
+          _13 = &(*_2)[1 of 3];            // scope 1 at $DIR/issue_76432.rs:+3:18: +3:24
+          StorageLive(_14);                // scope 1 at $DIR/issue_76432.rs:+3:26: +3:32
+          _14 = &(*_2)[2 of 3];            // scope 1 at $DIR/issue_76432.rs:+3:26: +3:32
+          StorageDead(_14);                // scope 1 at $DIR/issue_76432.rs:+3:84: +3:85
+          StorageDead(_13);                // scope 1 at $DIR/issue_76432.rs:+3:84: +3:85
+          StorageDead(_12);                // scope 1 at $DIR/issue_76432.rs:+3:84: +3:85
+          StorageDead(_5);                 // scope 0 at $DIR/issue_76432.rs:+6:1: +6:2
+          StorageDead(_2);                 // scope 0 at $DIR/issue_76432.rs:+6:1: +6:2
+          return;                          // scope 0 at $DIR/issue_76432.rs:+6:2: +6:2
+      }
+  }
+  
diff --git a/src/test/mir-opt/issue_78192.f.InstCombine.diff b/tests/mir-opt/issue_78192.f.InstCombine.diff
index 116ca304c..116ca304c 100644
--- a/src/test/mir-opt/issue_78192.f.InstCombine.diff
+++ b/tests/mir-opt/issue_78192.f.InstCombine.diff
diff --git a/src/test/mir-opt/issue_78192.rs b/tests/mir-opt/issue_78192.rs
index 39f665402..39f665402 100644
--- a/src/test/mir-opt/issue_78192.rs
+++ b/tests/mir-opt/issue_78192.rs
diff --git a/src/test/mir-opt/issue_91633.bar.built.after.mir b/tests/mir-opt/issue_91633.bar.built.after.mir
index c3fb90e84..c3fb90e84 100644
--- a/src/test/mir-opt/issue_91633.bar.built.after.mir
+++ b/tests/mir-opt/issue_91633.bar.built.after.mir
diff --git a/src/test/mir-opt/issue_91633.foo.built.after.mir b/tests/mir-opt/issue_91633.foo.built.after.mir
index 4e3dd365e..4e3dd365e 100644
--- a/src/test/mir-opt/issue_91633.foo.built.after.mir
+++ b/tests/mir-opt/issue_91633.foo.built.after.mir
diff --git a/src/test/mir-opt/issue_91633.fun.built.after.mir b/tests/mir-opt/issue_91633.fun.built.after.mir
index 42486d3a5..42486d3a5 100644
--- a/src/test/mir-opt/issue_91633.fun.built.after.mir
+++ b/tests/mir-opt/issue_91633.fun.built.after.mir
diff --git a/src/test/mir-opt/issue_91633.hey.built.after.mir b/tests/mir-opt/issue_91633.hey.built.after.mir
index ccb06dd59..ccb06dd59 100644
--- a/src/test/mir-opt/issue_91633.hey.built.after.mir
+++ b/tests/mir-opt/issue_91633.hey.built.after.mir
diff --git a/src/test/mir-opt/issue_91633.rs b/tests/mir-opt/issue_91633.rs
index 9127cacc9..9127cacc9 100644
--- a/src/test/mir-opt/issue_91633.rs
+++ b/tests/mir-opt/issue_91633.rs
diff --git a/src/test/mir-opt/issue_99325.main.built.after.mir b/tests/mir-opt/issue_99325.main.built.after.mir
index 3db40412b..3e035c18d 100644
--- a/src/test/mir-opt/issue_99325.main.built.after.mir
+++ b/tests/mir-opt/issue_99325.main.built.after.mir
@@ -109,7 +109,7 @@ fn main() -> () {
         StorageDead(_12);                // scope 1 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
         _10 = Not(move _11);             // scope 1 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
         StorageDead(_11);                // scope 1 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-        switchInt(move _10) -> [false: bb4, otherwise: bb3]; // scope 1 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+        switchInt(move _10) -> [0: bb4, otherwise: bb3]; // scope 1 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
     }
 
     bb3: {
@@ -218,7 +218,7 @@ fn main() -> () {
         StorageDead(_33);                // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
         _31 = Not(move _32);             // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
         StorageDead(_32);                // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-        switchInt(move _31) -> [false: bb13, otherwise: bb12]; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+        switchInt(move _31) -> [0: bb13, otherwise: bb12]; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
     }
 
     bb12: {
diff --git a/src/test/mir-opt/issue_99325.rs b/tests/mir-opt/issue_99325.rs
index fe819cddb..fe819cddb 100644
--- a/src/test/mir-opt/issue_99325.rs
+++ b/tests/mir-opt/issue_99325.rs
diff --git a/src/test/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.mir b/tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.mir
index 5a2f4feff..c17d221f8 100644
--- a/src/test/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.mir
+++ b/tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.mir
@@ -4,9 +4,9 @@ fn num_to_digit(_1: char) -> u32 {
     debug num => _1;                     // in scope 0 at $DIR/issue_59352.rs:+0:21: +0:24
     let mut _0: u32;                     // return place in scope 0 at $DIR/issue_59352.rs:+0:35: +0:38
     let mut _2: std::option::Option<u32>; // in scope 0 at $DIR/issue_59352.rs:+2:26: +2:41
-    let mut _3: u32;                     // in scope 0 at $DIR/issue_59352.rs:+2:8: +2:23
+    let mut _3: u32;                     // in scope 0 at $DIR/issue_59352.rs:+2:12: +2:23
     let mut _9: isize;                   // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-    scope 1 (inlined char::methods::<impl char>::is_digit) { // at $DIR/issue_59352.rs:14:8: 14:23
+    scope 1 (inlined char::methods::<impl char>::is_digit) { // at $DIR/issue_59352.rs:14:12: 14:23
         debug self => _1;                // in scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
         debug radix => _3;               // in scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
         let mut _4: &std::option::Option<u32>; // in scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
@@ -16,7 +16,7 @@ fn num_to_digit(_1: char) -> u32 {
             debug self => _4;            // in scope 2 at $SRC_DIR/core/src/option.rs:LL:COL
         }
     }
-    scope 3 (inlined #[track_caller] Option::<u32>::unwrap) { // at $DIR/issue_59352.rs:14:26: 14:50
+    scope 3 (inlined #[track_caller] Option::<u32>::unwrap) { // at $DIR/issue_59352.rs:14:42: 14:50
         debug self => _2;                // in scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
         let mut _7: isize;               // in scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
         let mut _8: !;                   // in scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
@@ -26,7 +26,7 @@ fn num_to_digit(_1: char) -> u32 {
     }
 
     bb0: {
-        StorageLive(_3);                 // scope 0 at $DIR/issue_59352.rs:+2:8: +2:23
+        StorageLive(_3);                 // scope 0 at $DIR/issue_59352.rs:+2:12: +2:23
         StorageLive(_4);                 // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
         StorageLive(_5);                 // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
         StorageLive(_6);                 // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
@@ -47,7 +47,7 @@ fn num_to_digit(_1: char) -> u32 {
 
     bb2: {
         _7 = discriminant(_2);           // scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
-        switchInt(move _7) -> [0_isize: bb6, 1_isize: bb8, otherwise: bb7]; // scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
+        switchInt(move _7) -> [0: bb6, 1: bb8, otherwise: bb7]; // scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
     }
 
     bb3: {
@@ -65,8 +65,8 @@ fn num_to_digit(_1: char) -> u32 {
         _9 = discriminant((*_4));        // scope 2 at $SRC_DIR/core/src/option.rs:LL:COL
         StorageDead(_4);                 // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
         StorageDead(_5);                 // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
-        StorageDead(_3);                 // scope 0 at $DIR/issue_59352.rs:+2:8: +2:23
-        switchInt(move _9) -> [1_isize: bb1, otherwise: bb3]; // scope 0 at $DIR/issue_59352.rs:+2:8: +2:23
+        StorageDead(_3);                 // scope 0 at $DIR/issue_59352.rs:+2:12: +2:23
+        switchInt(move _9) -> [1: bb1, otherwise: bb3]; // scope 0 at $DIR/issue_59352.rs:+2:8: +2:23
     }
 
     bb6: {
diff --git a/src/test/mir-opt/issues/issue_59352.rs b/tests/mir-opt/issues/issue_59352.rs
index 1e0045555..1e0045555 100644
--- a/src/test/mir-opt/issues/issue_59352.rs
+++ b/tests/mir-opt/issues/issue_59352.rs
diff --git a/src/test/mir-opt/issues/issue_75439.foo.MatchBranchSimplification.diff b/tests/mir-opt/issues/issue_75439.foo.MatchBranchSimplification.diff
index 87066cc62..938047803 100644
--- a/src/test/mir-opt/issues/issue_75439.foo.MatchBranchSimplification.diff
+++ b/tests/mir-opt/issues/issue_75439.foo.MatchBranchSimplification.diff
@@ -26,21 +26,21 @@
           _3 = _1;                         // scope 2 at $DIR/issue_75439.rs:+2:47: +2:52
           _2 = transmute::<[u8; 16], [u32; 4]>(move _3) -> bb1; // scope 2 at $DIR/issue_75439.rs:+2:37: +2:53
                                            // mir::Constant
-                                           // + span: $DIR/issue_75439.rs:7:37: 7:46
+                                           // + span: $DIR/issue_75439.rs:8:37: 8:46
                                            // + literal: Const { ty: unsafe extern "rust-intrinsic" fn([u8; 16]) -> [u32; 4] {transmute::<[u8; 16], [u32; 4]>}, val: Value(<ZST>) }
       }
   
       bb1: {
           StorageDead(_3);                 // scope 2 at $DIR/issue_75439.rs:+2:52: +2:53
-          switchInt(_2[0 of 4]) -> [0_u32: bb2, otherwise: bb8]; // scope 3 at $DIR/issue_75439.rs:+4:12: +4:30
+          switchInt(_2[0 of 4]) -> [0: bb2, otherwise: bb8]; // scope 3 at $DIR/issue_75439.rs:+4:12: +4:30
       }
   
       bb2: {
-          switchInt(_2[1 of 4]) -> [0_u32: bb3, otherwise: bb8]; // scope 3 at $DIR/issue_75439.rs:+4:12: +4:30
+          switchInt(_2[1 of 4]) -> [0: bb3, otherwise: bb8]; // scope 3 at $DIR/issue_75439.rs:+4:12: +4:30
       }
   
       bb3: {
-          switchInt(_2[2 of 4]) -> [0_u32: bb5, 4294901760_u32: bb6, otherwise: bb8]; // scope 3 at $DIR/issue_75439.rs:+4:12: +4:30
+          switchInt(_2[2 of 4]) -> [0: bb5, 4294901760: bb6, otherwise: bb8]; // scope 3 at $DIR/issue_75439.rs:+4:12: +4:30
       }
   
       bb4: {
@@ -49,7 +49,7 @@
           _6 = _4;                         // scope 4 at $DIR/issue_75439.rs:+5:33: +5:35
           _5 = transmute::<u32, [u8; 4]>(move _6) -> bb7; // scope 4 at $DIR/issue_75439.rs:+5:23: +5:36
                                            // mir::Constant
-                                           // + span: $DIR/issue_75439.rs:10:23: 10:32
+                                           // + span: $DIR/issue_75439.rs:11:23: 11:32
                                            // + literal: Const { ty: unsafe extern "rust-intrinsic" fn(u32) -> [u8; 4] {transmute::<u32, [u8; 4]>}, val: Value(<ZST>) }
       }
   
diff --git a/src/test/mir-opt/issues/issue_75439.rs b/tests/mir-opt/issues/issue_75439.rs
index ae2e03631..4c749a150 100644
--- a/src/test/mir-opt/issues/issue_75439.rs
+++ b/tests/mir-opt/issues/issue_75439.rs
@@ -1,4 +1,5 @@
 // EMIT_MIR issue_75439.foo.MatchBranchSimplification.diff
+// ignore-endian-big
 
 use std::mem::transmute;
 
diff --git a/src/test/mir-opt/loop_test.main.SimplifyCfg-promote-consts.after.mir b/tests/mir-opt/loop_test.main.SimplifyCfg-promote-consts.after.mir
index 5981ab885..4ee2dae49 100644
--- a/src/test/mir-opt/loop_test.main.SimplifyCfg-promote-consts.after.mir
+++ b/tests/mir-opt/loop_test.main.SimplifyCfg-promote-consts.after.mir
@@ -16,7 +16,7 @@ fn main() -> () {
         StorageLive(_1);                 // scope 0 at $DIR/loop_test.rs:+4:5: +6:6
         StorageLive(_2);                 // scope 0 at $DIR/loop_test.rs:+4:8: +4:12
         _2 = const true;                 // scope 0 at $DIR/loop_test.rs:+4:8: +4:12
-        switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/loop_test.rs:+4:8: +4:12
+        switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/loop_test.rs:+4:8: +4:12
     }
 
     bb1: {
diff --git a/src/test/mir-opt/loop_test.rs b/tests/mir-opt/loop_test.rs
index 7ded5b575..7ded5b575 100644
--- a/src/test/mir-opt/loop_test.rs
+++ b/tests/mir-opt/loop_test.rs
diff --git a/src/test/mir-opt/lower_array_len.array_bound.NormalizeArrayLen.diff b/tests/mir-opt/lower_array_len.array_bound.NormalizeArrayLen.diff
index 049bbeac8..9bc7060e9 100644
--- a/src/test/mir-opt/lower_array_len.array_bound.NormalizeArrayLen.diff
+++ b/tests/mir-opt/lower_array_len.array_bound.NormalizeArrayLen.diff
@@ -38,7 +38,7 @@
           _3 = Lt(move _4, move _5);       // scope 0 at $DIR/lower_array_len.rs:+1:8: +1:27
           StorageDead(_5);                 // scope 0 at $DIR/lower_array_len.rs:+1:26: +1:27
           StorageDead(_4);                 // scope 0 at $DIR/lower_array_len.rs:+1:26: +1:27
-          switchInt(move _3) -> [false: bb4, otherwise: bb2]; // scope 0 at $DIR/lower_array_len.rs:+1:8: +1:27
+          switchInt(move _3) -> [0: bb4, otherwise: bb2]; // scope 0 at $DIR/lower_array_len.rs:+1:8: +1:27
       }
   
       bb2: {
diff --git a/src/test/mir-opt/lower_array_len.array_bound_mut.NormalizeArrayLen.diff b/tests/mir-opt/lower_array_len.array_bound_mut.NormalizeArrayLen.diff
index 40ec01eeb..cf427cfd1 100644
--- a/src/test/mir-opt/lower_array_len.array_bound_mut.NormalizeArrayLen.diff
+++ b/tests/mir-opt/lower_array_len.array_bound_mut.NormalizeArrayLen.diff
@@ -41,7 +41,7 @@
           _3 = Lt(move _4, move _5);       // scope 0 at $DIR/lower_array_len.rs:+1:8: +1:27
           StorageDead(_5);                 // scope 0 at $DIR/lower_array_len.rs:+1:26: +1:27
           StorageDead(_4);                 // scope 0 at $DIR/lower_array_len.rs:+1:26: +1:27
-          switchInt(move _3) -> [false: bb4, otherwise: bb2]; // scope 0 at $DIR/lower_array_len.rs:+1:8: +1:27
+          switchInt(move _3) -> [0: bb4, otherwise: bb2]; // scope 0 at $DIR/lower_array_len.rs:+1:8: +1:27
       }
   
       bb2: {
diff --git a/src/test/mir-opt/lower_array_len.array_len.NormalizeArrayLen.diff b/tests/mir-opt/lower_array_len.array_len.NormalizeArrayLen.diff
index 3ed68f5f7..3ed68f5f7 100644
--- a/src/test/mir-opt/lower_array_len.array_len.NormalizeArrayLen.diff
+++ b/tests/mir-opt/lower_array_len.array_len.NormalizeArrayLen.diff
diff --git a/src/test/mir-opt/lower_array_len.array_len_by_value.NormalizeArrayLen.diff b/tests/mir-opt/lower_array_len.array_len_by_value.NormalizeArrayLen.diff
index f0e0cdcfd..f0e0cdcfd 100644
--- a/src/test/mir-opt/lower_array_len.array_len_by_value.NormalizeArrayLen.diff
+++ b/tests/mir-opt/lower_array_len.array_len_by_value.NormalizeArrayLen.diff
diff --git a/src/test/mir-opt/lower_array_len.rs b/tests/mir-opt/lower_array_len.rs
index ea0224b21..ea0224b21 100644
--- a/src/test/mir-opt/lower_array_len.rs
+++ b/tests/mir-opt/lower_array_len.rs
diff --git a/src/test/mir-opt/lower_array_len_e2e.array_bound.PreCodegen.after.mir b/tests/mir-opt/lower_array_len_e2e.array_bound.PreCodegen.after.mir
index 9b1b07f38..701c2ad70 100644
--- a/src/test/mir-opt/lower_array_len_e2e.array_bound.PreCodegen.after.mir
+++ b/tests/mir-opt/lower_array_len_e2e.array_bound.PreCodegen.after.mir
@@ -19,7 +19,7 @@ fn array_bound(_1: usize, _2: &[u8; N]) -> u8 {
         _3 = Lt(move _4, move _5);       // scope 0 at $DIR/lower_array_len_e2e.rs:+1:8: +1:27
         StorageDead(_5);                 // scope 0 at $DIR/lower_array_len_e2e.rs:+1:26: +1:27
         StorageDead(_4);                 // scope 0 at $DIR/lower_array_len_e2e.rs:+1:26: +1:27
-        switchInt(move _3) -> [false: bb3, otherwise: bb1]; // scope 0 at $DIR/lower_array_len_e2e.rs:+1:8: +1:27
+        switchInt(move _3) -> [0: bb3, otherwise: bb1]; // scope 0 at $DIR/lower_array_len_e2e.rs:+1:8: +1:27
     }
 
     bb1: {
diff --git a/src/test/mir-opt/lower_array_len_e2e.array_bound_mut.PreCodegen.after.mir b/tests/mir-opt/lower_array_len_e2e.array_bound_mut.PreCodegen.after.mir
index 29e379777..0440cfce2 100644
--- a/src/test/mir-opt/lower_array_len_e2e.array_bound_mut.PreCodegen.after.mir
+++ b/tests/mir-opt/lower_array_len_e2e.array_bound_mut.PreCodegen.after.mir
@@ -22,7 +22,7 @@ fn array_bound_mut(_1: usize, _2: &mut [u8; N]) -> u8 {
         _3 = Lt(move _4, move _5);       // scope 0 at $DIR/lower_array_len_e2e.rs:+1:8: +1:27
         StorageDead(_5);                 // scope 0 at $DIR/lower_array_len_e2e.rs:+1:26: +1:27
         StorageDead(_4);                 // scope 0 at $DIR/lower_array_len_e2e.rs:+1:26: +1:27
-        switchInt(move _3) -> [false: bb3, otherwise: bb1]; // scope 0 at $DIR/lower_array_len_e2e.rs:+1:8: +1:27
+        switchInt(move _3) -> [0: bb3, otherwise: bb1]; // scope 0 at $DIR/lower_array_len_e2e.rs:+1:8: +1:27
     }
 
     bb1: {
diff --git a/src/test/mir-opt/lower_array_len_e2e.array_len.PreCodegen.after.mir b/tests/mir-opt/lower_array_len_e2e.array_len.PreCodegen.after.mir
index 4b19f6795..4b19f6795 100644
--- a/src/test/mir-opt/lower_array_len_e2e.array_len.PreCodegen.after.mir
+++ b/tests/mir-opt/lower_array_len_e2e.array_len.PreCodegen.after.mir
diff --git a/src/test/mir-opt/lower_array_len_e2e.array_len_by_value.PreCodegen.after.mir b/tests/mir-opt/lower_array_len_e2e.array_len_by_value.PreCodegen.after.mir
index 4dc0ba9a2..4dc0ba9a2 100644
--- a/src/test/mir-opt/lower_array_len_e2e.array_len_by_value.PreCodegen.after.mir
+++ b/tests/mir-opt/lower_array_len_e2e.array_len_by_value.PreCodegen.after.mir
diff --git a/src/test/mir-opt/lower_array_len_e2e.rs b/tests/mir-opt/lower_array_len_e2e.rs
index 49b35d509..d8e4e521e 100644
--- a/src/test/mir-opt/lower_array_len_e2e.rs
+++ b/tests/mir-opt/lower_array_len_e2e.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z mir-opt-level=4
+// compile-flags: -Z mir-opt-level=4 -Zunsound-mir-opts
 
 // EMIT_MIR lower_array_len_e2e.array_bound.PreCodegen.after.mir
 pub fn array_bound<const N: usize>(index: usize, slice: &[u8; N]) -> u8 {
diff --git a/src/test/mir-opt/lower_intrinsics.align_of.LowerIntrinsics.diff b/tests/mir-opt/lower_intrinsics.align_of.LowerIntrinsics.diff
index 3389db733..3389db733 100644
--- a/src/test/mir-opt/lower_intrinsics.align_of.LowerIntrinsics.diff
+++ b/tests/mir-opt/lower_intrinsics.align_of.LowerIntrinsics.diff
diff --git a/src/test/mir-opt/lower_intrinsics.assume.LowerIntrinsics.diff b/tests/mir-opt/lower_intrinsics.assume.LowerIntrinsics.diff
index d9898d8e0..d9898d8e0 100644
--- a/src/test/mir-opt/lower_intrinsics.assume.LowerIntrinsics.diff
+++ b/tests/mir-opt/lower_intrinsics.assume.LowerIntrinsics.diff
diff --git a/src/test/mir-opt/lower_intrinsics.discriminant.LowerIntrinsics.diff b/tests/mir-opt/lower_intrinsics.discriminant.LowerIntrinsics.diff
index d962ef8cb..d962ef8cb 100644
--- a/src/test/mir-opt/lower_intrinsics.discriminant.LowerIntrinsics.diff
+++ b/tests/mir-opt/lower_intrinsics.discriminant.LowerIntrinsics.diff
diff --git a/src/test/mir-opt/lower_intrinsics.f_copy_nonoverlapping.LowerIntrinsics.diff b/tests/mir-opt/lower_intrinsics.f_copy_nonoverlapping.LowerIntrinsics.diff
index ec15fd1ef..ec15fd1ef 100644
--- a/src/test/mir-opt/lower_intrinsics.f_copy_nonoverlapping.LowerIntrinsics.diff
+++ b/tests/mir-opt/lower_intrinsics.f_copy_nonoverlapping.LowerIntrinsics.diff
diff --git a/src/test/mir-opt/lower_intrinsics.forget.LowerIntrinsics.diff b/tests/mir-opt/lower_intrinsics.forget.LowerIntrinsics.diff
index 4cbbc02c9..4cbbc02c9 100644
--- a/src/test/mir-opt/lower_intrinsics.forget.LowerIntrinsics.diff
+++ b/tests/mir-opt/lower_intrinsics.forget.LowerIntrinsics.diff
diff --git a/src/test/mir-opt/lower_intrinsics.non_const.LowerIntrinsics.diff b/tests/mir-opt/lower_intrinsics.non_const.LowerIntrinsics.diff
index d8cd5f59a..d8cd5f59a 100644
--- a/src/test/mir-opt/lower_intrinsics.non_const.LowerIntrinsics.diff
+++ b/tests/mir-opt/lower_intrinsics.non_const.LowerIntrinsics.diff
diff --git a/src/test/mir-opt/lower_intrinsics.rs b/tests/mir-opt/lower_intrinsics.rs
index 66dae0e46..66dae0e46 100644
--- a/src/test/mir-opt/lower_intrinsics.rs
+++ b/tests/mir-opt/lower_intrinsics.rs
diff --git a/src/test/mir-opt/lower_intrinsics.size_of.LowerIntrinsics.diff b/tests/mir-opt/lower_intrinsics.size_of.LowerIntrinsics.diff
index cf0ab73a5..cf0ab73a5 100644
--- a/src/test/mir-opt/lower_intrinsics.size_of.LowerIntrinsics.diff
+++ b/tests/mir-opt/lower_intrinsics.size_of.LowerIntrinsics.diff
diff --git a/src/test/mir-opt/lower_intrinsics.unreachable.LowerIntrinsics.diff b/tests/mir-opt/lower_intrinsics.unreachable.LowerIntrinsics.diff
index 6f17d4451..6f17d4451 100644
--- a/src/test/mir-opt/lower_intrinsics.unreachable.LowerIntrinsics.diff
+++ b/tests/mir-opt/lower_intrinsics.unreachable.LowerIntrinsics.diff
diff --git a/src/test/mir-opt/lower_intrinsics.wrapping.LowerIntrinsics.diff b/tests/mir-opt/lower_intrinsics.wrapping.LowerIntrinsics.diff
index 22ef75fd8..22ef75fd8 100644
--- a/src/test/mir-opt/lower_intrinsics.wrapping.LowerIntrinsics.diff
+++ b/tests/mir-opt/lower_intrinsics.wrapping.LowerIntrinsics.diff
diff --git a/src/test/mir-opt/lower_intrinsics_e2e.f_u64.PreCodegen.after.mir b/tests/mir-opt/lower_intrinsics_e2e.f_u64.PreCodegen.after.mir
index f6d8bdd74..f6d8bdd74 100644
--- a/src/test/mir-opt/lower_intrinsics_e2e.f_u64.PreCodegen.after.mir
+++ b/tests/mir-opt/lower_intrinsics_e2e.f_u64.PreCodegen.after.mir
diff --git a/src/test/mir-opt/lower_intrinsics_e2e.f_unit.PreCodegen.after.mir b/tests/mir-opt/lower_intrinsics_e2e.f_unit.PreCodegen.after.mir
index b672e1a6e..b672e1a6e 100644
--- a/src/test/mir-opt/lower_intrinsics_e2e.f_unit.PreCodegen.after.mir
+++ b/tests/mir-opt/lower_intrinsics_e2e.f_unit.PreCodegen.after.mir
diff --git a/src/test/mir-opt/lower_intrinsics_e2e.rs b/tests/mir-opt/lower_intrinsics_e2e.rs
index 872ef59b0..872ef59b0 100644
--- a/src/test/mir-opt/lower_intrinsics_e2e.rs
+++ b/tests/mir-opt/lower_intrinsics_e2e.rs
diff --git a/src/test/mir-opt/lower_slice_len.bound.LowerSliceLenCalls.diff b/tests/mir-opt/lower_slice_len.bound.LowerSliceLenCalls.diff
index 5f5d6e68f..2b0370cf3 100644
--- a/src/test/mir-opt/lower_slice_len.bound.LowerSliceLenCalls.diff
+++ b/tests/mir-opt/lower_slice_len.bound.LowerSliceLenCalls.diff
@@ -33,7 +33,7 @@
           _3 = Lt(move _4, move _5);       // scope 0 at $DIR/lower_slice_len.rs:+1:8: +1:27
           StorageDead(_5);                 // scope 0 at $DIR/lower_slice_len.rs:+1:26: +1:27
           StorageDead(_4);                 // scope 0 at $DIR/lower_slice_len.rs:+1:26: +1:27
-          switchInt(move _3) -> [false: bb4, otherwise: bb2]; // scope 0 at $DIR/lower_slice_len.rs:+1:8: +1:27
+          switchInt(move _3) -> [0: bb4, otherwise: bb2]; // scope 0 at $DIR/lower_slice_len.rs:+1:8: +1:27
       }
   
       bb2: {
diff --git a/src/test/mir-opt/lower_slice_len.rs b/tests/mir-opt/lower_slice_len.rs
index 12955aed1..12955aed1 100644
--- a/src/test/mir-opt/lower_slice_len.rs
+++ b/tests/mir-opt/lower_slice_len.rs
diff --git a/src/test/mir-opt/match_arm_scopes.complicated_match.SimplifyCfg-initial.after-ElaborateDrops.after.diff b/tests/mir-opt/match_arm_scopes.complicated_match.SimplifyCfg-initial.after-ElaborateDrops.after.diff
index d3db3b182..84e4d35f9 100644
--- a/src/test/mir-opt/match_arm_scopes.complicated_match.SimplifyCfg-initial.after-ElaborateDrops.after.diff
+++ b/tests/mir-opt/match_arm_scopes.complicated_match.SimplifyCfg-initial.after-ElaborateDrops.after.diff
@@ -32,18 +32,18 @@
   
       bb0: {
 -         FakeRead(ForMatchedPlace(None), _2); // scope 0 at $DIR/match_arm_scopes.rs:+1:11: +1:16
--         switchInt((_2.0: bool)) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/match_arm_scopes.rs:+1:5: +1:16
-+         switchInt((_2.0: bool)) -> [false: bb5, otherwise: bb1]; // scope 0 at $DIR/match_arm_scopes.rs:+1:5: +1:16
+-         switchInt((_2.0: bool)) -> [0: bb1, otherwise: bb2]; // scope 0 at $DIR/match_arm_scopes.rs:+1:5: +1:16
++         switchInt((_2.0: bool)) -> [0: bb5, otherwise: bb1]; // scope 0 at $DIR/match_arm_scopes.rs:+1:5: +1:16
       }
   
       bb1: {
 -         falseEdge -> [real: bb8, imaginary: bb3]; // scope 0 at $DIR/match_arm_scopes.rs:+2:9: +2:22
-+         switchInt((_2.1: bool)) -> [false: bb10, otherwise: bb2]; // scope 0 at $DIR/match_arm_scopes.rs:+1:5: +1:16
++         switchInt((_2.1: bool)) -> [0: bb10, otherwise: bb2]; // scope 0 at $DIR/match_arm_scopes.rs:+1:5: +1:16
       }
   
       bb2: {
--         switchInt((_2.1: bool)) -> [false: bb3, otherwise: bb4]; // scope 0 at $DIR/match_arm_scopes.rs:+1:5: +1:16
-+         switchInt((_2.0: bool)) -> [false: bb3, otherwise: bb17]; // scope 0 at $DIR/match_arm_scopes.rs:+1:5: +1:16
+-         switchInt((_2.1: bool)) -> [0: bb3, otherwise: bb4]; // scope 0 at $DIR/match_arm_scopes.rs:+1:5: +1:16
++         switchInt((_2.0: bool)) -> [0: bb3, otherwise: bb17]; // scope 0 at $DIR/match_arm_scopes.rs:+1:5: +1:16
       }
   
       bb3: {
@@ -51,7 +51,7 @@
 -     }
 - 
 -     bb4: {
--         switchInt((_2.0: bool)) -> [false: bb6, otherwise: bb5]; // scope 0 at $DIR/match_arm_scopes.rs:+1:5: +1:16
+-         switchInt((_2.0: bool)) -> [0: bb6, otherwise: bb5]; // scope 0 at $DIR/match_arm_scopes.rs:+1:5: +1:16
 -     }
 - 
 -     bb5: {
@@ -85,8 +85,8 @@
           StorageLive(_9);                 // scope 0 at $DIR/match_arm_scopes.rs:+2:42: +2:73
           StorageLive(_10);                // scope 0 at $DIR/match_arm_scopes.rs:+2:45: +2:49
           _10 = _1;                        // scope 0 at $DIR/match_arm_scopes.rs:+2:45: +2:49
--         switchInt(move _10) -> [false: bb10, otherwise: bb9]; // scope 0 at $DIR/match_arm_scopes.rs:+2:45: +2:49
-+         switchInt(move _10) -> [false: bb7, otherwise: bb6]; // scope 0 at $DIR/match_arm_scopes.rs:+2:45: +2:49
+-         switchInt(move _10) -> [0: bb10, otherwise: bb9]; // scope 0 at $DIR/match_arm_scopes.rs:+2:45: +2:49
++         switchInt(move _10) -> [0: bb7, otherwise: bb6]; // scope 0 at $DIR/match_arm_scopes.rs:+2:45: +2:49
       }
   
 -     bb9: {
@@ -101,8 +101,8 @@
 -     bb10: {
 +     bb7: {
           _9 = (*_6);                      // scope 0 at $DIR/match_arm_scopes.rs:+2:70: +2:71
--         switchInt(move _9) -> [false: bb12, otherwise: bb11]; // scope 0 at $DIR/match_arm_scopes.rs:+2:42: +2:73
-+         switchInt(move _9) -> [false: bb9, otherwise: bb8]; // scope 0 at $DIR/match_arm_scopes.rs:+2:42: +2:73
+-         switchInt(move _9) -> [0: bb12, otherwise: bb11]; // scope 0 at $DIR/match_arm_scopes.rs:+2:42: +2:73
++         switchInt(move _9) -> [0: bb9, otherwise: bb8]; // scope 0 at $DIR/match_arm_scopes.rs:+2:42: +2:73
       }
   
 -     bb11: {
@@ -142,8 +142,8 @@
           StorageLive(_12);                // scope 0 at $DIR/match_arm_scopes.rs:+2:42: +2:73
           StorageLive(_13);                // scope 0 at $DIR/match_arm_scopes.rs:+2:45: +2:49
           _13 = _1;                        // scope 0 at $DIR/match_arm_scopes.rs:+2:45: +2:49
--         switchInt(move _13) -> [false: bb15, otherwise: bb14]; // scope 0 at $DIR/match_arm_scopes.rs:+2:45: +2:49
-+         switchInt(move _13) -> [false: bb12, otherwise: bb11]; // scope 0 at $DIR/match_arm_scopes.rs:+2:45: +2:49
+-         switchInt(move _13) -> [0: bb15, otherwise: bb14]; // scope 0 at $DIR/match_arm_scopes.rs:+2:45: +2:49
++         switchInt(move _13) -> [0: bb12, otherwise: bb11]; // scope 0 at $DIR/match_arm_scopes.rs:+2:45: +2:49
       }
   
 -     bb14: {
@@ -158,8 +158,8 @@
 -     bb15: {
 +     bb12: {
           _12 = (*_6);                     // scope 0 at $DIR/match_arm_scopes.rs:+2:70: +2:71
--         switchInt(move _12) -> [false: bb17, otherwise: bb16]; // scope 0 at $DIR/match_arm_scopes.rs:+2:42: +2:73
-+         switchInt(move _12) -> [false: bb14, otherwise: bb13]; // scope 0 at $DIR/match_arm_scopes.rs:+2:42: +2:73
+-         switchInt(move _12) -> [0: bb17, otherwise: bb16]; // scope 0 at $DIR/match_arm_scopes.rs:+2:42: +2:73
++         switchInt(move _12) -> [0: bb14, otherwise: bb13]; // scope 0 at $DIR/match_arm_scopes.rs:+2:42: +2:73
       }
   
 -     bb16: {
diff --git a/src/test/mir-opt/match_arm_scopes.rs b/tests/mir-opt/match_arm_scopes.rs
index 7b7de7788..7b7de7788 100644
--- a/src/test/mir-opt/match_arm_scopes.rs
+++ b/tests/mir-opt/match_arm_scopes.rs
diff --git a/src/test/mir-opt/match_test.main.SimplifyCfg-initial.after.mir b/tests/mir-opt/match_test.main.SimplifyCfg-initial.after.mir
index b184ffc40..d51dbf425 100644
--- a/src/test/mir-opt/match_test.main.SimplifyCfg-initial.after.mir
+++ b/tests/mir-opt/match_test.main.SimplifyCfg-initial.after.mir
@@ -28,12 +28,12 @@ fn main() -> () {
         StorageLive(_3);                 // scope 2 at $DIR/match_test.rs:+6:5: +11:6
         FakeRead(ForMatchedPlace(None), _1); // scope 2 at $DIR/match_test.rs:+6:11: +6:12
         _6 = Le(const 0_i32, _1);        // scope 2 at $DIR/match_test.rs:+7:9: +7:14
-        switchInt(move _6) -> [false: bb4, otherwise: bb1]; // scope 2 at $DIR/match_test.rs:+7:9: +7:14
+        switchInt(move _6) -> [0: bb4, otherwise: bb1]; // scope 2 at $DIR/match_test.rs:+7:9: +7:14
     }
 
     bb1: {
         _7 = Lt(_1, const 10_i32);       // scope 2 at $DIR/match_test.rs:+7:9: +7:14
-        switchInt(move _7) -> [false: bb4, otherwise: bb2]; // scope 2 at $DIR/match_test.rs:+7:9: +7:14
+        switchInt(move _7) -> [0: bb4, otherwise: bb2]; // scope 2 at $DIR/match_test.rs:+7:9: +7:14
     }
 
     bb2: {
@@ -47,12 +47,12 @@ fn main() -> () {
 
     bb4: {
         _4 = Le(const 10_i32, _1);       // scope 2 at $DIR/match_test.rs:+8:9: +8:16
-        switchInt(move _4) -> [false: bb7, otherwise: bb5]; // scope 2 at $DIR/match_test.rs:+8:9: +8:16
+        switchInt(move _4) -> [0: bb7, otherwise: bb5]; // scope 2 at $DIR/match_test.rs:+8:9: +8:16
     }
 
     bb5: {
         _5 = Le(_1, const 20_i32);       // scope 2 at $DIR/match_test.rs:+8:9: +8:16
-        switchInt(move _5) -> [false: bb7, otherwise: bb6]; // scope 2 at $DIR/match_test.rs:+8:9: +8:16
+        switchInt(move _5) -> [0: bb7, otherwise: bb6]; // scope 2 at $DIR/match_test.rs:+8:9: +8:16
     }
 
     bb6: {
@@ -60,7 +60,7 @@ fn main() -> () {
     }
 
     bb7: {
-        switchInt(_1) -> [-1_i32: bb8, otherwise: bb3]; // scope 2 at $DIR/match_test.rs:+6:5: +6:12
+        switchInt(_1) -> [4294967295: bb8, otherwise: bb3]; // scope 2 at $DIR/match_test.rs:+6:5: +6:12
     }
 
     bb8: {
@@ -71,7 +71,7 @@ fn main() -> () {
         _8 = &shallow _1;                // scope 2 at $DIR/match_test.rs:+6:11: +6:12
         StorageLive(_9);                 // scope 2 at $DIR/match_test.rs:+7:18: +7:19
         _9 = _2;                         // scope 2 at $DIR/match_test.rs:+7:18: +7:19
-        switchInt(move _9) -> [false: bb11, otherwise: bb10]; // scope 2 at $DIR/match_test.rs:+7:18: +7:19
+        switchInt(move _9) -> [0: bb11, otherwise: bb10]; // scope 2 at $DIR/match_test.rs:+7:18: +7:19
     }
 
     bb10: {
diff --git a/src/test/mir-opt/match_test.rs b/tests/mir-opt/match_test.rs
index 3a2107790..3a2107790 100644
--- a/src/test/mir-opt/match_test.rs
+++ b/tests/mir-opt/match_test.rs
diff --git a/src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff b/tests/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff
index f9eeb1ea5..be91b0bfe 100644
--- a/src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff
+++ b/tests/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff
@@ -33,7 +33,7 @@
           StorageLive(_4);                 // scope 2 at $DIR/matches_reduce_branches.rs:+3:9: +3:10
           StorageLive(_5);                 // scope 3 at $DIR/matches_reduce_branches.rs:+4:9: +4:10
           StorageLive(_6);                 // scope 4 at $DIR/matches_reduce_branches.rs:+6:5: +21:6
--         switchInt(_1) -> [7_i32: bb2, otherwise: bb1]; // scope 4 at $DIR/matches_reduce_branches.rs:+6:5: +6:12
+-         switchInt(_1) -> [7: bb2, otherwise: bb1]; // scope 4 at $DIR/matches_reduce_branches.rs:+6:5: +6:12
 -     }
 - 
 -     bb1: {
diff --git a/src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff b/tests/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff
index 0b40b3be8..aa8092ece 100644
--- a/src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff
+++ b/tests/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff
@@ -11,12 +11,12 @@
       bb0: {
           StorageLive(_2);                 // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           _3 = discriminant(_1);           // scope 0 at $DIR/matches_reduce_branches.rs:+1:17: +1:20
--         switchInt(move _3) -> [0_isize: bb2, otherwise: bb1]; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+-         switchInt(move _3) -> [0: bb2, otherwise: bb1]; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
 +         StorageLive(_4);                 // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
 +         _4 = move _3;                    // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
 +         _2 = Eq(_4, const 0_isize);      // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
 +         StorageDead(_4);                 // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-+         switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
++         switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
       }
   
       bb1: {
@@ -30,7 +30,7 @@
 -     }
 - 
 -     bb3: {
--         switchInt(move _2) -> [false: bb5, otherwise: bb4]; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+-         switchInt(move _2) -> [0: bb5, otherwise: bb4]; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
 -     }
 - 
 -     bb4: {
diff --git a/src/test/mir-opt/matches_reduce_branches.match_nested_if.MatchBranchSimplification.diff b/tests/mir-opt/matches_reduce_branches.match_nested_if.MatchBranchSimplification.diff
index b8c7722cd..193104dd3 100644
--- a/src/test/mir-opt/matches_reduce_branches.match_nested_if.MatchBranchSimplification.diff
+++ b/tests/mir-opt/matches_reduce_branches.match_nested_if.MatchBranchSimplification.diff
@@ -26,7 +26,7 @@
           StorageLive(_5);                 // scope 0 at $DIR/matches_reduce_branches.rs:+2:21: +2:52
           StorageLive(_6);                 // scope 0 at $DIR/matches_reduce_branches.rs:+2:24: +2:28
           _6 = const true;                 // scope 0 at $DIR/matches_reduce_branches.rs:+2:24: +2:28
--         switchInt(move _6) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/matches_reduce_branches.rs:+2:24: +2:28
+-         switchInt(move _6) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/matches_reduce_branches.rs:+2:24: +2:28
 -     }
 - 
 -     bb1: {
@@ -45,7 +45,7 @@
 +         _5 = Ne(_7, const false);        // scope 0 at $DIR/matches_reduce_branches.rs:+2:45: +2:50
 +         StorageDead(_7);                 // scope 0 at $DIR/matches_reduce_branches.rs:+2:24: +2:28
           StorageDead(_6);                 // scope 0 at $DIR/matches_reduce_branches.rs:+2:51: +2:52
--         switchInt(move _5) -> [false: bb5, otherwise: bb4]; // scope 0 at $DIR/matches_reduce_branches.rs:+2:21: +2:52
+-         switchInt(move _5) -> [0: bb5, otherwise: bb4]; // scope 0 at $DIR/matches_reduce_branches.rs:+2:21: +2:52
 -     }
 - 
 -     bb4: {
@@ -64,7 +64,7 @@
 +         _4 = Ne(_8, const false);        // scope 0 at $DIR/matches_reduce_branches.rs:+2:69: +2:74
 +         StorageDead(_8);                 // scope 0 at $DIR/matches_reduce_branches.rs:+2:21: +2:52
           StorageDead(_5);                 // scope 0 at $DIR/matches_reduce_branches.rs:+2:75: +2:76
--         switchInt(move _4) -> [false: bb8, otherwise: bb7]; // scope 0 at $DIR/matches_reduce_branches.rs:+2:18: +2:76
+-         switchInt(move _4) -> [0: bb8, otherwise: bb7]; // scope 0 at $DIR/matches_reduce_branches.rs:+2:18: +2:76
 -     }
 - 
 -     bb7: {
@@ -78,7 +78,7 @@
 -     }
 - 
 -     bb9: {
--         switchInt(move _3) -> [false: bb11, otherwise: bb10]; // scope 0 at $DIR/matches_reduce_branches.rs:+2:15: +6:10
+-         switchInt(move _3) -> [0: bb11, otherwise: bb10]; // scope 0 at $DIR/matches_reduce_branches.rs:+2:15: +6:10
 -     }
 - 
 -     bb10: {
diff --git a/src/test/mir-opt/matches_reduce_branches.rs b/tests/mir-opt/matches_reduce_branches.rs
index a81d5f7b4..a81d5f7b4 100644
--- a/src/test/mir-opt/matches_reduce_branches.rs
+++ b/tests/mir-opt/matches_reduce_branches.rs
diff --git a/src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff b/tests/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff
index 1b4dddc1d..3766d99a4 100644
--- a/src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff
+++ b/tests/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff
@@ -8,7 +8,7 @@
   
       bb0: {
           _2 = discriminant(_1);           // scope 0 at $DIR/matches_u8.rs:+1:11: +1:12
-          switchInt(move _2) -> [0_isize: bb3, 1_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/matches_u8.rs:+1:5: +1:12
+          switchInt(move _2) -> [0: bb3, 1: bb1, otherwise: bb2]; // scope 0 at $DIR/matches_u8.rs:+1:5: +1:12
       }
   
       bb1: {
diff --git a/src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff b/tests/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff
index 6e734852e..b5146cd53 100644
--- a/src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff
+++ b/tests/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff
@@ -8,7 +8,7 @@
   
       bb0: {
           _2 = discriminant(_1);           // scope 0 at $DIR/matches_u8.rs:+1:11: +1:12
-          switchInt(move _2) -> [0_isize: bb3, 1_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/matches_u8.rs:+1:5: +1:12
+          switchInt(move _2) -> [0: bb3, 1: bb1, otherwise: bb2]; // scope 0 at $DIR/matches_u8.rs:+1:5: +1:12
       }
   
       bb1: {
diff --git a/src/test/mir-opt/matches_u8.rs b/tests/mir-opt/matches_u8.rs
index 422c3a95e..422c3a95e 100644
--- a/src/test/mir-opt/matches_u8.rs
+++ b/tests/mir-opt/matches_u8.rs
diff --git a/src/test/mir-opt/multiple_return_terminators.rs b/tests/mir-opt/multiple_return_terminators.rs
index a2b902d14..a2b902d14 100644
--- a/src/test/mir-opt/multiple_return_terminators.rs
+++ b/tests/mir-opt/multiple_return_terminators.rs
diff --git a/src/test/mir-opt/multiple_return_terminators.test.MultipleReturnTerminators.diff b/tests/mir-opt/multiple_return_terminators.test.MultipleReturnTerminators.diff
index 48a11c950..48a11c950 100644
--- a/src/test/mir-opt/multiple_return_terminators.test.MultipleReturnTerminators.diff
+++ b/tests/mir-opt/multiple_return_terminators.test.MultipleReturnTerminators.diff
diff --git a/src/test/mir-opt/nll/named_lifetimes_basic.rs b/tests/mir-opt/nll/named_lifetimes_basic.rs
index 843716033..843716033 100644
--- a/src/test/mir-opt/nll/named_lifetimes_basic.rs
+++ b/tests/mir-opt/nll/named_lifetimes_basic.rs
diff --git a/src/test/mir-opt/nll/named_lifetimes_basic.use_x.nll.0.mir b/tests/mir-opt/nll/named_lifetimes_basic.use_x.nll.0.mir
index 6cd6d8b77..6cd6d8b77 100644
--- a/src/test/mir-opt/nll/named_lifetimes_basic.use_x.nll.0.mir
+++ b/tests/mir-opt/nll/named_lifetimes_basic.use_x.nll.0.mir
diff --git a/src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.32bit.mir b/tests/mir-opt/nll/region_subtyping_basic.main.nll.0.32bit.mir
index 3e3fda614..798e45df8 100644
--- a/src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.32bit.mir
+++ b/tests/mir-opt/nll/region_subtyping_basic.main.nll.0.32bit.mir
@@ -22,7 +22,7 @@
 |
 fn main() -> () {
     let mut _0: ();                      // return place in scope 0 at $DIR/region_subtyping_basic.rs:+0:11: +0:11
-    let mut _1: [usize; Const { ty: usize, kind: Value(Leaf(0x00000003)) }]; // in scope 0 at $DIR/region_subtyping_basic.rs:+1:9: +1:14
+    let mut _1: [usize; Const(Value(Leaf(0x00000003)): usize)]; // in scope 0 at $DIR/region_subtyping_basic.rs:+1:9: +1:14
     let _3: usize;                       // in scope 0 at $DIR/region_subtyping_basic.rs:+2:16: +2:17
     let mut _4: usize;                   // in scope 0 at $DIR/region_subtyping_basic.rs:+2:14: +2:18
     let mut _5: bool;                    // in scope 0 at $DIR/region_subtyping_basic.rs:+2:14: +2:18
@@ -62,7 +62,7 @@ fn main() -> () {
         FakeRead(ForLet(None), _6);      // bb1[4]: scope 2 at $DIR/region_subtyping_basic.rs:+3:9: +3:10
         StorageLive(_7);                 // bb1[5]: scope 3 at $DIR/region_subtyping_basic.rs:+4:8: +4:12
         _7 = const ConstValue(Scalar(0x01): bool); // bb1[6]: scope 3 at $DIR/region_subtyping_basic.rs:+4:8: +4:12
-        switchInt(move _7) -> [ConstValue(Scalar(0x00): bool): bb4, otherwise: bb2]; // bb1[7]: scope 3 at $DIR/region_subtyping_basic.rs:+4:8: +4:12
+        switchInt(move _7) -> [0: bb4, otherwise: bb2]; // bb1[7]: scope 3 at $DIR/region_subtyping_basic.rs:+4:8: +4:12
     }
 
     bb2: {
diff --git a/src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.64bit.mir b/tests/mir-opt/nll/region_subtyping_basic.main.nll.0.64bit.mir
index 39a53702a..4767bfc76 100644
--- a/src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.64bit.mir
+++ b/tests/mir-opt/nll/region_subtyping_basic.main.nll.0.64bit.mir
@@ -22,7 +22,7 @@
 |
 fn main() -> () {
     let mut _0: ();                      // return place in scope 0 at $DIR/region_subtyping_basic.rs:+0:11: +0:11
-    let mut _1: [usize; Const { ty: usize, kind: Value(Leaf(0x0000000000000003)) }]; // in scope 0 at $DIR/region_subtyping_basic.rs:+1:9: +1:14
+    let mut _1: [usize; Const(Value(Leaf(0x0000000000000003)): usize)]; // in scope 0 at $DIR/region_subtyping_basic.rs:+1:9: +1:14
     let _3: usize;                       // in scope 0 at $DIR/region_subtyping_basic.rs:+2:16: +2:17
     let mut _4: usize;                   // in scope 0 at $DIR/region_subtyping_basic.rs:+2:14: +2:18
     let mut _5: bool;                    // in scope 0 at $DIR/region_subtyping_basic.rs:+2:14: +2:18
@@ -62,7 +62,7 @@ fn main() -> () {
         FakeRead(ForLet(None), _6);      // bb1[4]: scope 2 at $DIR/region_subtyping_basic.rs:+3:9: +3:10
         StorageLive(_7);                 // bb1[5]: scope 3 at $DIR/region_subtyping_basic.rs:+4:8: +4:12
         _7 = const ConstValue(Scalar(0x01): bool); // bb1[6]: scope 3 at $DIR/region_subtyping_basic.rs:+4:8: +4:12
-        switchInt(move _7) -> [ConstValue(Scalar(0x00): bool): bb4, otherwise: bb2]; // bb1[7]: scope 3 at $DIR/region_subtyping_basic.rs:+4:8: +4:12
+        switchInt(move _7) -> [0: bb4, otherwise: bb2]; // bb1[7]: scope 3 at $DIR/region_subtyping_basic.rs:+4:8: +4:12
     }
 
     bb2: {
diff --git a/src/test/mir-opt/nll/region_subtyping_basic.rs b/tests/mir-opt/nll/region_subtyping_basic.rs
index 64332f302..64332f302 100644
--- a/src/test/mir-opt/nll/region_subtyping_basic.rs
+++ b/tests/mir-opt/nll/region_subtyping_basic.rs
diff --git a/src/test/mir-opt/no_drop_for_inactive_variant.rs b/tests/mir-opt/no_drop_for_inactive_variant.rs
index 34e2b1a13..34e2b1a13 100644
--- a/src/test/mir-opt/no_drop_for_inactive_variant.rs
+++ b/tests/mir-opt/no_drop_for_inactive_variant.rs
diff --git a/src/test/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.mir
index e708255ce..69327b7af 100644
--- a/src/test/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.mir
+++ b/tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.mir
@@ -15,7 +15,7 @@ fn unwrap(_1: Option<T>) -> T {
 
     bb0: {
         _2 = discriminant(_1);           // scope 0 at $DIR/no_drop_for_inactive_variant.rs:+1:11: +1:14
-        switchInt(move _2) -> [0_isize: bb1, 1_isize: bb3, otherwise: bb2]; // scope 0 at $DIR/no_drop_for_inactive_variant.rs:+1:5: +1:14
+        switchInt(move _2) -> [0: bb1, 1: bb3, otherwise: bb2]; // scope 0 at $DIR/no_drop_for_inactive_variant.rs:+1:5: +1:14
     }
 
     bb1: {
diff --git a/src/test/mir-opt/no_spurious_drop_after_call.main.ElaborateDrops.before.mir b/tests/mir-opt/no_spurious_drop_after_call.main.ElaborateDrops.before.mir
index 0cb34a2f2..0cb34a2f2 100644
--- a/src/test/mir-opt/no_spurious_drop_after_call.main.ElaborateDrops.before.mir
+++ b/tests/mir-opt/no_spurious_drop_after_call.main.ElaborateDrops.before.mir
diff --git a/src/test/mir-opt/no_spurious_drop_after_call.rs b/tests/mir-opt/no_spurious_drop_after_call.rs
index bb5bb9aa4..bb5bb9aa4 100644
--- a/src/test/mir-opt/no_spurious_drop_after_call.rs
+++ b/tests/mir-opt/no_spurious_drop_after_call.rs
diff --git a/src/test/mir-opt/not_equal_false.opt.InstCombine.diff b/tests/mir-opt/not_equal_false.opt.InstCombine.diff
index 5009d0906..b558c35ac 100644
--- a/src/test/mir-opt/not_equal_false.opt.InstCombine.diff
+++ b/tests/mir-opt/not_equal_false.opt.InstCombine.diff
@@ -14,7 +14,7 @@
 -         _2 = Ne(move _3, const false);   // scope 0 at $DIR/not_equal_false.rs:+1:8: +1:18
 +         _2 = move _3;                    // scope 0 at $DIR/not_equal_false.rs:+1:8: +1:18
           StorageDead(_3);                 // scope 0 at $DIR/not_equal_false.rs:+1:17: +1:18
-          switchInt(move _2) -> [false: bb2, otherwise: bb1]; // scope 0 at $DIR/not_equal_false.rs:+1:8: +1:18
+          switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/not_equal_false.rs:+1:8: +1:18
       }
   
       bb1: {
diff --git a/src/test/mir-opt/not_equal_false.rs b/tests/mir-opt/not_equal_false.rs
index 2ae03da40..2ae03da40 100644
--- a/src/test/mir-opt/not_equal_false.rs
+++ b/tests/mir-opt/not_equal_false.rs
diff --git a/src/test/mir-opt/nrvo_simple.nrvo.RenameReturnPlace.diff b/tests/mir-opt/nrvo_simple.nrvo.RenameReturnPlace.diff
index 61a16065b..61a16065b 100644
--- a/src/test/mir-opt/nrvo_simple.nrvo.RenameReturnPlace.diff
+++ b/tests/mir-opt/nrvo_simple.nrvo.RenameReturnPlace.diff
diff --git a/src/test/mir-opt/nrvo_simple.rs b/tests/mir-opt/nrvo_simple.rs
index 5786ae621..5786ae621 100644
--- a/src/test/mir-opt/nrvo_simple.rs
+++ b/tests/mir-opt/nrvo_simple.rs
diff --git a/src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir
index e52253486..e52253486 100644
--- a/src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir
+++ b/tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir
diff --git a/src/test/mir-opt/packed_struct_drop_aligned.rs b/tests/mir-opt/packed_struct_drop_aligned.rs
index cb6524260..cb6524260 100644
--- a/src/test/mir-opt/packed_struct_drop_aligned.rs
+++ b/tests/mir-opt/packed_struct_drop_aligned.rs
diff --git a/tests/mir-opt/remove_fake_borrows.match_guard.CleanupPostBorrowck.diff b/tests/mir-opt/remove_fake_borrows.match_guard.CleanupPostBorrowck.diff
new file mode 100644
index 000000000..0b3da98a5
--- /dev/null
+++ b/tests/mir-opt/remove_fake_borrows.match_guard.CleanupPostBorrowck.diff
@@ -0,0 +1,74 @@
+- // MIR for `match_guard` before CleanupPostBorrowck
++ // MIR for `match_guard` after CleanupPostBorrowck
+  
+  fn match_guard(_1: Option<&&i32>, _2: bool) -> i32 {
+      debug x => _1;                       // in scope 0 at $DIR/remove_fake_borrows.rs:+0:16: +0:17
+      debug c => _2;                       // in scope 0 at $DIR/remove_fake_borrows.rs:+0:34: +0:35
+      let mut _0: i32;                     // return place in scope 0 at $DIR/remove_fake_borrows.rs:+0:46: +0:49
+      let mut _3: isize;                   // in scope 0 at $DIR/remove_fake_borrows.rs:+2:9: +2:16
+      let mut _4: &std::option::Option<&&i32>; // in scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
+      let mut _5: &&i32;                   // in scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
+      let mut _6: &&&i32;                  // in scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
+      let mut _7: &i32;                    // in scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
+      let mut _8: bool;                    // in scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
+  
+      bb0: {
+-         FakeRead(ForMatchedPlace(None), _1); // scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
++         nop;                             // scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
+          _3 = discriminant(_1);           // scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
+          switchInt(move _3) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/remove_fake_borrows.rs:+1:5: +1:12
+      }
+  
+      bb1: {
+          _0 = const 1_i32;                // scope 0 at $DIR/remove_fake_borrows.rs:+3:14: +3:15
+          goto -> bb7;                     // scope 0 at $DIR/remove_fake_borrows.rs:+3:14: +3:15
+      }
+  
+      bb2: {
+          switchInt((*(*((_1 as Some).0: &&i32)))) -> [0: bb3, otherwise: bb1]; // scope 0 at $DIR/remove_fake_borrows.rs:+1:5: +1:12
+      }
+  
+      bb3: {
+-         falseEdge -> [real: bb4, imaginary: bb1]; // scope 0 at $DIR/remove_fake_borrows.rs:+2:9: +2:16
++         goto -> bb4;                     // scope 0 at $DIR/remove_fake_borrows.rs:+2:9: +2:16
+      }
+  
+      bb4: {
+-         _4 = &shallow _1;                // scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
+-         _5 = &shallow (*((_1 as Some).0: &&i32)); // scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
+-         _6 = &shallow ((_1 as Some).0: &&i32); // scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
+-         _7 = &shallow (*(*((_1 as Some).0: &&i32))); // scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
++         nop;                             // scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
++         nop;                             // scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
++         nop;                             // scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
++         nop;                             // scope 0 at $DIR/remove_fake_borrows.rs:+1:11: +1:12
+          StorageLive(_8);                 // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
+          _8 = _2;                         // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
+          switchInt(move _8) -> [0: bb6, otherwise: bb5]; // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
+      }
+  
+      bb5: {
+          StorageDead(_8);                 // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
+-         FakeRead(ForMatchGuard, _4);     // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
+-         FakeRead(ForMatchGuard, _5);     // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
+-         FakeRead(ForMatchGuard, _6);     // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
+-         FakeRead(ForMatchGuard, _7);     // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
++         nop;                             // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
++         nop;                             // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
++         nop;                             // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
++         nop;                             // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
+          _0 = const 0_i32;                // scope 0 at $DIR/remove_fake_borrows.rs:+2:25: +2:26
+          goto -> bb7;                     // scope 0 at $DIR/remove_fake_borrows.rs:+2:25: +2:26
+      }
+  
+      bb6: {
+          StorageDead(_8);                 // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
+-         falseEdge -> [real: bb1, imaginary: bb1]; // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
++         goto -> bb1;                     // scope 0 at $DIR/remove_fake_borrows.rs:+2:20: +2:21
+      }
+  
+      bb7: {
+          return;                          // scope 0 at $DIR/remove_fake_borrows.rs:+5:2: +5:2
+      }
+  }
+  
diff --git a/src/test/mir-opt/remove_fake_borrows.rs b/tests/mir-opt/remove_fake_borrows.rs
index a980f386b..d26c6f5d7 100644
--- a/src/test/mir-opt/remove_fake_borrows.rs
+++ b/tests/mir-opt/remove_fake_borrows.rs
@@ -2,7 +2,7 @@
 
 // ignore-wasm32-bare compiled with panic=abort by default
 
-// EMIT_MIR remove_fake_borrows.match_guard.CleanupNonCodegenStatements.diff
+// EMIT_MIR remove_fake_borrows.match_guard.CleanupPostBorrowck.diff
 fn match_guard(x: Option<&&i32>, c: bool) -> i32 {
     match x {
         Some(0) if c => 0,
diff --git a/src/test/mir-opt/remove_never_const.no_codegen.PreCodegen.after.mir b/tests/mir-opt/remove_never_const.no_codegen.PreCodegen.after.mir
index 8eb0e9c8f..8eb0e9c8f 100644
--- a/src/test/mir-opt/remove_never_const.no_codegen.PreCodegen.after.mir
+++ b/tests/mir-opt/remove_never_const.no_codegen.PreCodegen.after.mir
diff --git a/src/test/mir-opt/remove_never_const.rs b/tests/mir-opt/remove_never_const.rs
index 16095cfdd..160cc9555 100644
--- a/src/test/mir-opt/remove_never_const.rs
+++ b/tests/mir-opt/remove_never_const.rs
@@ -1,6 +1,6 @@
 // This was originally a regression test for #66975 - ensure that we do not generate never typed
 // consts in codegen. We also have tests for this that catches the error, see
-// src/test/ui/consts/const-eval/index-out-of-bounds-never-type.rs.
+// tests/ui/consts/const-eval/index-out-of-bounds-never-type.rs.
 
 // Force generation of optimized mir for functions that do not reach codegen.
 // compile-flags: --emit mir,link
diff --git a/src/test/mir-opt/remove_storage_markers.main.RemoveStorageMarkers.diff b/tests/mir-opt/remove_storage_markers.main.RemoveStorageMarkers.diff
index 188aa5564..ed1d0b87f 100644
--- a/src/test/mir-opt/remove_storage_markers.main.RemoveStorageMarkers.diff
+++ b/tests/mir-opt/remove_storage_markers.main.RemoveStorageMarkers.diff
@@ -63,7 +63,7 @@
       bb3: {
 -         StorageDead(_8);                 // scope 2 at $DIR/remove_storage_markers.rs:+2:18: +2:19
           _10 = discriminant(_7);          // scope 2 at $DIR/remove_storage_markers.rs:+2:14: +2:19
-          switchInt(move _10) -> [0_isize: bb6, 1_isize: bb4, otherwise: bb5]; // scope 2 at $DIR/remove_storage_markers.rs:+2:14: +2:19
+          switchInt(move _10) -> [0: bb6, 1: bb4, otherwise: bb5]; // scope 2 at $DIR/remove_storage_markers.rs:+2:14: +2:19
       }
   
       bb4: {
diff --git a/src/test/mir-opt/remove_storage_markers.rs b/tests/mir-opt/remove_storage_markers.rs
index f00b82691..f00b82691 100644
--- a/src/test/mir-opt/remove_storage_markers.rs
+++ b/tests/mir-opt/remove_storage_markers.rs
diff --git a/src/test/mir-opt/remove_unneeded_drops.cannot_opt_generic.RemoveUnneededDrops.diff b/tests/mir-opt/remove_unneeded_drops.cannot_opt_generic.RemoveUnneededDrops.diff
index 07e4dd418..07e4dd418 100644
--- a/src/test/mir-opt/remove_unneeded_drops.cannot_opt_generic.RemoveUnneededDrops.diff
+++ b/tests/mir-opt/remove_unneeded_drops.cannot_opt_generic.RemoveUnneededDrops.diff
diff --git a/src/test/mir-opt/remove_unneeded_drops.dont_opt.RemoveUnneededDrops.diff b/tests/mir-opt/remove_unneeded_drops.dont_opt.RemoveUnneededDrops.diff
index e809ca4e9..e809ca4e9 100644
--- a/src/test/mir-opt/remove_unneeded_drops.dont_opt.RemoveUnneededDrops.diff
+++ b/tests/mir-opt/remove_unneeded_drops.dont_opt.RemoveUnneededDrops.diff
diff --git a/src/test/mir-opt/remove_unneeded_drops.opt.RemoveUnneededDrops.diff b/tests/mir-opt/remove_unneeded_drops.opt.RemoveUnneededDrops.diff
index 087f76dbd..087f76dbd 100644
--- a/src/test/mir-opt/remove_unneeded_drops.opt.RemoveUnneededDrops.diff
+++ b/tests/mir-opt/remove_unneeded_drops.opt.RemoveUnneededDrops.diff
diff --git a/src/test/mir-opt/remove_unneeded_drops.opt_generic_copy.RemoveUnneededDrops.diff b/tests/mir-opt/remove_unneeded_drops.opt_generic_copy.RemoveUnneededDrops.diff
index 933d6895f..933d6895f 100644
--- a/src/test/mir-opt/remove_unneeded_drops.opt_generic_copy.RemoveUnneededDrops.diff
+++ b/tests/mir-opt/remove_unneeded_drops.opt_generic_copy.RemoveUnneededDrops.diff
diff --git a/src/test/mir-opt/remove_unneeded_drops.rs b/tests/mir-opt/remove_unneeded_drops.rs
index 1052f2886..1052f2886 100644
--- a/src/test/mir-opt/remove_unneeded_drops.rs
+++ b/tests/mir-opt/remove_unneeded_drops.rs
diff --git a/src/test/mir-opt/remove_zsts.get_union.PreCodegen.after.mir b/tests/mir-opt/remove_zsts.get_union.PreCodegen.after.mir
index 12e914e25..12e914e25 100644
--- a/src/test/mir-opt/remove_zsts.get_union.PreCodegen.after.mir
+++ b/tests/mir-opt/remove_zsts.get_union.PreCodegen.after.mir
diff --git a/src/test/mir-opt/remove_zsts.get_union.RemoveZsts.diff b/tests/mir-opt/remove_zsts.get_union.RemoveZsts.diff
index 169b7b105..169b7b105 100644
--- a/src/test/mir-opt/remove_zsts.get_union.RemoveZsts.diff
+++ b/tests/mir-opt/remove_zsts.get_union.RemoveZsts.diff
diff --git a/src/test/mir-opt/remove_zsts.rs b/tests/mir-opt/remove_zsts.rs
index 1cf7ad6e3..1cf7ad6e3 100644
--- a/src/test/mir-opt/remove_zsts.rs
+++ b/tests/mir-opt/remove_zsts.rs
diff --git a/src/test/mir-opt/retag.array_casts.SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/retag.array_casts.SimplifyCfg-elaborate-drops.after.mir
index 7b69b3e07..19b726e74 100644
--- a/src/test/mir-opt/retag.array_casts.SimplifyCfg-elaborate-drops.after.mir
+++ b/tests/mir-opt/retag.array_casts.SimplifyCfg-elaborate-drops.after.mir
@@ -145,7 +145,7 @@ fn array_casts() -> () {
         StorageDead(_24);                // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
         _22 = Not(move _23);             // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
         StorageDead(_23);                // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-        switchInt(move _22) -> [false: bb4, otherwise: bb3]; // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
+        switchInt(move _22) -> [0: bb4, otherwise: bb3]; // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
     }
 
     bb3: {
diff --git a/tests/mir-opt/retag.core.ptr-drop_in_place.Test.SimplifyCfg-make_shim.after.mir b/tests/mir-opt/retag.core.ptr-drop_in_place.Test.SimplifyCfg-make_shim.after.mir
new file mode 100644
index 000000000..f495f147b
--- /dev/null
+++ b/tests/mir-opt/retag.core.ptr-drop_in_place.Test.SimplifyCfg-make_shim.after.mir
@@ -0,0 +1,22 @@
+// MIR for `std::ptr::drop_in_place` after SimplifyCfg-make_shim
+
+fn std::ptr::drop_in_place(_1: *mut Test) -> () {
+    let mut _0: ();                      // return place in scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+    let mut _2: &mut Test;               // in scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+    let mut _3: &mut Test;               // in scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+    let mut _4: ();                      // in scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+
+    bb0: {
+        _2 = &mut (*_1);                 // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+        Retag([fn entry] _2);            // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+        _3 = &mut (*_2);                 // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+        _4 = <Test as Drop>::drop(move _3) -> bb1; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+                                         // mir::Constant
+                                         // + span: $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+                                         // + literal: Const { ty: for<'a> fn(&'a mut Test) {<Test as Drop>::drop}, val: Value(<ZST>) }
+    }
+
+    bb1: {
+        return;                          // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+    }
+}
diff --git a/src/test/mir-opt/retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.mir
index 9e5c119a2..9e5c119a2 100644
--- a/src/test/mir-opt/retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.mir
+++ b/tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.mir
diff --git a/src/test/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.mir
index b853e4505..b853e4505 100644
--- a/src/test/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.mir
+++ b/tests/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.mir
diff --git a/src/test/mir-opt/retag.rs b/tests/mir-opt/retag.rs
index 86deb0e7c..86deb0e7c 100644
--- a/src/test/mir-opt/retag.rs
+++ b/tests/mir-opt/retag.rs
diff --git a/src/test/mir-opt/retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.mir
index 4b50205fa..4b50205fa 100644
--- a/src/test/mir-opt/retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.mir
+++ b/tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.mir
diff --git a/src/test/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.mir
index f32a84e4c..f32a84e4c 100644
--- a/src/test/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.mir
+++ b/tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.mir
diff --git a/src/test/mir-opt/return_an_array.rs b/tests/mir-opt/return_an_array.rs
index bea3c317c..bea3c317c 100644
--- a/src/test/mir-opt/return_an_array.rs
+++ b/tests/mir-opt/return_an_array.rs
diff --git a/src/test/mir-opt/separate_const_switch.identity.SeparateConstSwitch.diff b/tests/mir-opt/separate_const_switch.identity.SeparateConstSwitch.diff
index b28c6f687..e57544e09 100644
--- a/src/test/mir-opt/separate_const_switch.identity.SeparateConstSwitch.diff
+++ b/tests/mir-opt/separate_const_switch.identity.SeparateConstSwitch.diff
@@ -22,6 +22,9 @@
                   let mut _18: i32;        // in scope 8 at $SRC_DIR/core/src/result.rs:LL:COL
                   scope 9 {
                       debug e => _16;      // in scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
+                      scope 10 (inlined <i32 as From<i32>>::from) { // at $SRC_DIR/core/src/result.rs:LL:COL
+                          debug t => _18;  // in scope 10 at $SRC_DIR/core/src/convert/mod.rs:LL:COL
+                      }
                   }
               }
           }
@@ -53,14 +56,14 @@
           StorageLive(_4);                 // scope 0 at $DIR/separate_const_switch.rs:+1:8: +1:9
           _4 = _1;                         // scope 0 at $DIR/separate_const_switch.rs:+1:8: +1:9
           _10 = discriminant(_4);          // scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
--         switchInt(move _10) -> [0_isize: bb7, 1_isize: bb5, otherwise: bb6]; // scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
-+         switchInt(move _10) -> [0_isize: bb6, 1_isize: bb4, otherwise: bb5]; // scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
+-         switchInt(move _10) -> [0: bb7, 1: bb5, otherwise: bb6]; // scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
++         switchInt(move _10) -> [0: bb6, 1: bb4, otherwise: bb5]; // scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
       }
   
       bb1: {
 -         StorageDead(_4);                 // scope 0 at $DIR/separate_const_switch.rs:+1:9: +1:10
 -         _5 = discriminant(_3);           // scope 0 at $DIR/separate_const_switch.rs:+1:8: +1:10
--         switchInt(move _5) -> [0_isize: bb2, 1_isize: bb4, otherwise: bb3]; // scope 0 at $DIR/separate_const_switch.rs:+1:8: +1:10
+-         switchInt(move _5) -> [0: bb2, 1: bb4, otherwise: bb3]; // scope 0 at $DIR/separate_const_switch.rs:+1:8: +1:10
 -     }
 - 
 -     bb2: {
@@ -92,11 +95,18 @@
           StorageLive(_17);                // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
           StorageLive(_18);                // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
           _18 = move _16;                  // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
--         _17 = <i32 as From<i32>>::from(move _18) -> bb8; // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
-+         _17 = <i32 as From<i32>>::from(move _18) -> bb7; // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
-                                           // mir::Constant
-                                           // + span: $SRC_DIR/core/src/result.rs:LL:COL
-                                           // + literal: Const { ty: fn(i32) -> i32 {<i32 as From<i32>>::from}, val: Value(<ZST>) }
+          _17 = move _18;                  // scope 10 at $SRC_DIR/core/src/convert/mod.rs:LL:COL
+          StorageDead(_18);                // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
+          Deinit(_0);                      // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
+          ((_0 as Err).0: i32) = move _17; // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
+          discriminant(_0) = 1;            // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
+          StorageDead(_17);                // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
+          StorageDead(_16);                // scope 8 at $SRC_DIR/core/src/result.rs:LL:COL
+          StorageDead(_8);                 // scope 2 at $DIR/separate_const_switch.rs:+1:9: +1:10
+          StorageDead(_6);                 // scope 0 at $DIR/separate_const_switch.rs:+1:9: +1:10
+          StorageDead(_2);                 // scope 0 at $DIR/separate_const_switch.rs:+1:10: +1:11
+          StorageDead(_3);                 // scope 0 at $DIR/separate_const_switch.rs:+2:1: +2:2
+          return;                          // scope 0 at $DIR/separate_const_switch.rs:+2:2: +2:2
       }
   
 -     bb5: {
@@ -118,7 +128,7 @@
 -         goto -> bb1;                     // scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
 +         StorageDead(_4);                 // scope 0 at $DIR/separate_const_switch.rs:+1:9: +1:10
 +         _5 = discriminant(_3);           // scope 0 at $DIR/separate_const_switch.rs:+1:8: +1:10
-+         switchInt(move _5) -> [0_isize: bb1, 1_isize: bb3, otherwise: bb2]; // scope 0 at $DIR/separate_const_switch.rs:+1:8: +1:10
++         switchInt(move _5) -> [0: bb1, 1: bb3, otherwise: bb2]; // scope 0 at $DIR/separate_const_switch.rs:+1:8: +1:10
       }
   
 -     bb6: {
@@ -140,22 +150,7 @@
 -         goto -> bb1;                     // scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
 +         StorageDead(_4);                 // scope 0 at $DIR/separate_const_switch.rs:+1:9: +1:10
 +         _5 = discriminant(_3);           // scope 0 at $DIR/separate_const_switch.rs:+1:8: +1:10
-+         switchInt(move _5) -> [0_isize: bb1, 1_isize: bb3, otherwise: bb2]; // scope 0 at $DIR/separate_const_switch.rs:+1:8: +1:10
-      }
-  
--     bb8: {
-+     bb7: {
-          StorageDead(_18);                // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
-          Deinit(_0);                      // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
-          ((_0 as Err).0: i32) = move _17; // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
-          discriminant(_0) = 1;            // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
-          StorageDead(_17);                // scope 9 at $SRC_DIR/core/src/result.rs:LL:COL
-          StorageDead(_16);                // scope 8 at $SRC_DIR/core/src/result.rs:LL:COL
-          StorageDead(_8);                 // scope 2 at $DIR/separate_const_switch.rs:+1:9: +1:10
-          StorageDead(_6);                 // scope 0 at $DIR/separate_const_switch.rs:+1:9: +1:10
-          StorageDead(_2);                 // scope 0 at $DIR/separate_const_switch.rs:+1:10: +1:11
-          StorageDead(_3);                 // scope 0 at $DIR/separate_const_switch.rs:+2:1: +2:2
-          return;                          // scope 0 at $DIR/separate_const_switch.rs:+2:2: +2:2
++         switchInt(move _5) -> [0: bb1, 1: bb3, otherwise: bb2]; // scope 0 at $DIR/separate_const_switch.rs:+1:8: +1:10
       }
   }
   
diff --git a/src/test/mir-opt/separate_const_switch.rs b/tests/mir-opt/separate_const_switch.rs
index c809e5629..c809e5629 100644
--- a/src/test/mir-opt/separate_const_switch.rs
+++ b/tests/mir-opt/separate_const_switch.rs
diff --git a/src/test/mir-opt/separate_const_switch.too_complex.SeparateConstSwitch.diff b/tests/mir-opt/separate_const_switch.too_complex.SeparateConstSwitch.diff
index 437979081..8cc0c6a18 100644
--- a/src/test/mir-opt/separate_const_switch.too_complex.SeparateConstSwitch.diff
+++ b/tests/mir-opt/separate_const_switch.too_complex.SeparateConstSwitch.diff
@@ -30,7 +30,7 @@
       bb0: {
           StorageLive(_2);                 // scope 0 at $DIR/separate_const_switch.rs:+5:11: +10:6
           _3 = discriminant(_1);           // scope 0 at $DIR/separate_const_switch.rs:+6:15: +6:16
-          switchInt(move _3) -> [0_isize: bb3, 1_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/separate_const_switch.rs:+6:9: +6:16
+          switchInt(move _3) -> [0: bb3, 1: bb1, otherwise: bb2]; // scope 0 at $DIR/separate_const_switch.rs:+6:9: +6:16
       }
   
       bb1: {
@@ -45,7 +45,7 @@
           StorageDead(_6);                 // scope 0 at $DIR/separate_const_switch.rs:+8:43: +8:44
 -         goto -> bb4;                     // scope 0 at $DIR/separate_const_switch.rs:+8:43: +8:44
 +         _8 = discriminant(_2);           // scope 0 at $DIR/separate_const_switch.rs:+5:11: +10:6
-+         switchInt(move _8) -> [0_isize: bb6, 1_isize: bb4, otherwise: bb5]; // scope 0 at $DIR/separate_const_switch.rs:+5:5: +10:6
++         switchInt(move _8) -> [0: bb6, 1: bb4, otherwise: bb5]; // scope 0 at $DIR/separate_const_switch.rs:+5:5: +10:6
       }
   
       bb2: {
@@ -67,8 +67,8 @@
 - 
 -     bb4: {
           _8 = discriminant(_2);           // scope 0 at $DIR/separate_const_switch.rs:+5:11: +10:6
--         switchInt(move _8) -> [0_isize: bb7, 1_isize: bb5, otherwise: bb6]; // scope 0 at $DIR/separate_const_switch.rs:+5:5: +10:6
-+         switchInt(move _8) -> [0_isize: bb6, 1_isize: bb4, otherwise: bb5]; // scope 0 at $DIR/separate_const_switch.rs:+5:5: +10:6
+-         switchInt(move _8) -> [0: bb7, 1: bb5, otherwise: bb6]; // scope 0 at $DIR/separate_const_switch.rs:+5:5: +10:6
++         switchInt(move _8) -> [0: bb6, 1: bb4, otherwise: bb5]; // scope 0 at $DIR/separate_const_switch.rs:+5:5: +10:6
       }
   
 -     bb5: {
diff --git a/tests/mir-opt/simple_option_map_e2e.ezmap.PreCodegen.after.mir b/tests/mir-opt/simple_option_map_e2e.ezmap.PreCodegen.after.mir
new file mode 100644
index 000000000..916f99049
--- /dev/null
+++ b/tests/mir-opt/simple_option_map_e2e.ezmap.PreCodegen.after.mir
@@ -0,0 +1,52 @@
+// MIR for `ezmap` after PreCodegen
+
+fn ezmap(_1: Option<i32>) -> Option<i32> {
+    debug x => _1;                       // in scope 0 at $DIR/simple_option_map_e2e.rs:+0:14: +0:15
+    let mut _0: std::option::Option<i32>; // return place in scope 0 at $DIR/simple_option_map_e2e.rs:+0:33: +0:44
+    let mut _2: [closure@$DIR/simple_option_map_e2e.rs:14:12: 14:15]; // in scope 0 at $DIR/simple_option_map_e2e.rs:+1:12: +1:21
+    scope 1 (inlined map::<i32, i32, [closure@$DIR/simple_option_map_e2e.rs:14:12: 14:15]>) { // at $DIR/simple_option_map_e2e.rs:14:5: 14:22
+        debug slf => _1;                 // in scope 1 at $DIR/simple_option_map_e2e.rs:2:17: 2:20
+        debug f => _2;                   // in scope 1 at $DIR/simple_option_map_e2e.rs:2:33: 2:34
+        let mut _3: isize;               // in scope 1 at $DIR/simple_option_map_e2e.rs:7:9: 7:16
+        let mut _4: i32;                 // in scope 1 at $DIR/simple_option_map_e2e.rs:7:25: 7:29
+        let mut _5: i32;                 // in scope 1 at $DIR/simple_option_map_e2e.rs:7:25: 7:29
+        scope 2 {
+            debug x => _5;               // in scope 2 at $DIR/simple_option_map_e2e.rs:7:14: 7:15
+            scope 3 (inlined ezmap::{closure#0}) { // at $DIR/simple_option_map_e2e.rs:7:25: 7:29
+                debug n => _5;           // in scope 3 at $DIR/simple_option_map_e2e.rs:+1:13: +1:14
+            }
+        }
+    }
+
+    bb0: {
+        StorageLive(_2);                 // scope 0 at $DIR/simple_option_map_e2e.rs:+1:12: +1:21
+        _3 = discriminant(_1);           // scope 1 at $DIR/simple_option_map_e2e.rs:6:11: 6:14
+        switchInt(move _3) -> [0: bb1, 1: bb3, otherwise: bb2]; // scope 1 at $DIR/simple_option_map_e2e.rs:6:5: 6:14
+    }
+
+    bb1: {
+        Deinit(_0);                      // scope 1 at $DIR/simple_option_map_e2e.rs:8:17: 8:21
+        discriminant(_0) = 0;            // scope 1 at $DIR/simple_option_map_e2e.rs:8:17: 8:21
+        goto -> bb4;                     // scope 1 at $DIR/simple_option_map_e2e.rs:8:17: 8:21
+    }
+
+    bb2: {
+        unreachable;                     // scope 1 at $DIR/simple_option_map_e2e.rs:6:11: 6:14
+    }
+
+    bb3: {
+        _5 = move ((_1 as Some).0: i32); // scope 1 at $DIR/simple_option_map_e2e.rs:7:14: 7:15
+        StorageLive(_4);                 // scope 2 at $DIR/simple_option_map_e2e.rs:7:25: 7:29
+        _4 = Add(move _5, const 1_i32);  // scope 3 at $DIR/simple_option_map_e2e.rs:+1:16: +1:21
+        Deinit(_0);                      // scope 2 at $DIR/simple_option_map_e2e.rs:7:20: 7:30
+        ((_0 as Some).0: i32) = move _4; // scope 2 at $DIR/simple_option_map_e2e.rs:7:20: 7:30
+        discriminant(_0) = 1;            // scope 2 at $DIR/simple_option_map_e2e.rs:7:20: 7:30
+        StorageDead(_4);                 // scope 2 at $DIR/simple_option_map_e2e.rs:7:29: 7:30
+        goto -> bb4;                     // scope 1 at $DIR/simple_option_map_e2e.rs:10:1: 10:2
+    }
+
+    bb4: {
+        StorageDead(_2);                 // scope 0 at $DIR/simple_option_map_e2e.rs:+1:21: +1:22
+        return;                          // scope 0 at $DIR/simple_option_map_e2e.rs:+2:2: +2:2
+    }
+}
diff --git a/tests/mir-opt/simple_option_map_e2e.rs b/tests/mir-opt/simple_option_map_e2e.rs
new file mode 100644
index 000000000..2acd2a227
--- /dev/null
+++ b/tests/mir-opt/simple_option_map_e2e.rs
@@ -0,0 +1,19 @@
+#[inline(always)]
+fn map<T, U, F>(slf: Option<T>, f: F) -> Option<U>
+where
+    F: FnOnce(T) -> U,
+{
+    match slf {
+        Some(x) => Some(f(x)),
+        None => None,
+    }
+}
+
+// EMIT_MIR simple_option_map_e2e.ezmap.PreCodegen.after.mir
+pub fn ezmap(x: Option<i32>) -> Option<i32> {
+    map(x, |n| n + 1)
+}
+
+fn main() {
+    assert_eq!(None, ezmap(None));
+}
diff --git a/src/test/mir-opt/simplify_arm.id_try.SimplifyArmIdentity.diff b/tests/mir-opt/simplify_arm.id_try.SimplifyArmIdentity.diff
index cff9afc38..cff9afc38 100644
--- a/src/test/mir-opt/simplify_arm.id_try.SimplifyArmIdentity.diff
+++ b/tests/mir-opt/simplify_arm.id_try.SimplifyArmIdentity.diff
diff --git a/src/test/mir-opt/simplify_arm.id_try.SimplifyBranchSame.diff b/tests/mir-opt/simplify_arm.id_try.SimplifyBranchSame.diff
index 9d38b9350..9d38b9350 100644
--- a/src/test/mir-opt/simplify_arm.id_try.SimplifyBranchSame.diff
+++ b/tests/mir-opt/simplify_arm.id_try.SimplifyBranchSame.diff
diff --git a/src/test/mir-opt/simplify_arm.rs b/tests/mir-opt/simplify_arm.rs
index c247872e2..c247872e2 100644
--- a/src/test/mir-opt/simplify_arm.rs
+++ b/tests/mir-opt/simplify_arm.rs
diff --git a/src/test/mir-opt/simplify_arm_identity.rs b/tests/mir-opt/simplify_arm_identity.rs
index cf6ff57aa..cf6ff57aa 100644
--- a/src/test/mir-opt/simplify_arm_identity.rs
+++ b/tests/mir-opt/simplify_arm_identity.rs
diff --git a/src/test/mir-opt/simplify_cfg.main.SimplifyCfg-early-opt.diff b/tests/mir-opt/simplify_cfg.main.SimplifyCfg-early-opt.diff
index e068b81bc..8eb1aa1f3 100644
--- a/src/test/mir-opt/simplify_cfg.main.SimplifyCfg-early-opt.diff
+++ b/tests/mir-opt/simplify_cfg.main.SimplifyCfg-early-opt.diff
@@ -25,9 +25,9 @@
       }
   
 -     bb3: {
--         switchInt(move _2) -> [false: bb5, otherwise: bb4]; // scope 0 at $DIR/simplify_cfg.rs:+2:12: +2:17
+-         switchInt(move _2) -> [0: bb5, otherwise: bb4]; // scope 0 at $DIR/simplify_cfg.rs:+2:12: +2:17
 +     bb2: {
-+         switchInt(move _2) -> [false: bb4, otherwise: bb3]; // scope 0 at $DIR/simplify_cfg.rs:+2:12: +2:17
++         switchInt(move _2) -> [0: bb4, otherwise: bb3]; // scope 0 at $DIR/simplify_cfg.rs:+2:12: +2:17
       }
   
 -     bb4: {
diff --git a/src/test/mir-opt/simplify_cfg.main.SimplifyCfg-initial.diff b/tests/mir-opt/simplify_cfg.main.SimplifyCfg-initial.diff
index f693798eb..1e66b1f70 100644
--- a/src/test/mir-opt/simplify_cfg.main.SimplifyCfg-initial.diff
+++ b/tests/mir-opt/simplify_cfg.main.SimplifyCfg-initial.diff
@@ -26,7 +26,7 @@
       }
   
       bb3: {
-          switchInt(move _2) -> [false: bb5, otherwise: bb4]; // scope 0 at $DIR/simplify_cfg.rs:+2:12: +2:17
+          switchInt(move _2) -> [0: bb5, otherwise: bb4]; // scope 0 at $DIR/simplify_cfg.rs:+2:12: +2:17
       }
   
       bb4: {
diff --git a/src/test/mir-opt/simplify_cfg.rs b/tests/mir-opt/simplify_cfg.rs
index cf7eac440..cf7eac440 100644
--- a/src/test/mir-opt/simplify_cfg.rs
+++ b/tests/mir-opt/simplify_cfg.rs
diff --git a/src/test/mir-opt/simplify_if.main.SimplifyConstCondition-after-const-prop.diff b/tests/mir-opt/simplify_if.main.SimplifyConstCondition-after-const-prop.diff
index 9b1bea270..f9e22866b 100644
--- a/src/test/mir-opt/simplify_if.main.SimplifyConstCondition-after-const-prop.diff
+++ b/tests/mir-opt/simplify_if.main.SimplifyConstCondition-after-const-prop.diff
@@ -9,7 +9,7 @@
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/simplify_if.rs:+1:8: +1:13
           _1 = const false;                // scope 0 at $DIR/simplify_if.rs:+1:8: +1:13
--         switchInt(const false) -> [false: bb3, otherwise: bb1]; // scope 0 at $DIR/simplify_if.rs:+1:8: +1:13
+-         switchInt(const false) -> [0: bb3, otherwise: bb1]; // scope 0 at $DIR/simplify_if.rs:+1:8: +1:13
 +         goto -> bb3;                     // scope 0 at $DIR/simplify_if.rs:+1:8: +1:13
       }
   
@@ -23,12 +23,10 @@
   
       bb2: {
           StorageDead(_2);                 // scope 0 at $DIR/simplify_if.rs:+2:15: +2:16
-          nop;                             // scope 0 at $DIR/simplify_if.rs:+1:14: +3:6
           goto -> bb4;                     // scope 0 at $DIR/simplify_if.rs:+1:5: +3:6
       }
   
       bb3: {
-          nop;                             // scope 0 at $DIR/simplify_if.rs:+3:6: +3:6
           goto -> bb4;                     // scope 0 at $DIR/simplify_if.rs:+1:5: +3:6
       }
   
diff --git a/src/test/mir-opt/simplify_if.rs b/tests/mir-opt/simplify_if.rs
index 2d093d926..2d093d926 100644
--- a/src/test/mir-opt/simplify_if.rs
+++ b/tests/mir-opt/simplify_if.rs
diff --git a/tests/mir-opt/simplify_locals.c.SimplifyLocals-before-const-prop.diff b/tests/mir-opt/simplify_locals.c.SimplifyLocals-before-const-prop.diff
new file mode 100644
index 000000000..1be27e963
--- /dev/null
+++ b/tests/mir-opt/simplify_locals.c.SimplifyLocals-before-const-prop.diff
@@ -0,0 +1,33 @@
+- // MIR for `c` before SimplifyLocals-before-const-prop
++ // MIR for `c` after SimplifyLocals-before-const-prop
+  
+  fn c() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_locals.rs:+0:8: +0:8
+      let _1: [u8; 10];                    // in scope 0 at $DIR/simplify_locals.rs:+1:9: +1:14
+-     let mut _2: &[u8];                   // in scope 0 at $DIR/simplify_locals.rs:+3:20: +3:26
+-     let mut _3: &[u8; 10];               // in scope 0 at $DIR/simplify_locals.rs:+3:20: +3:26
+-     let _4: &[u8; 10];                   // in scope 0 at $DIR/simplify_locals.rs:+3:20: +3:26
+      scope 1 {
+          debug bytes => _1;               // in scope 1 at $DIR/simplify_locals.rs:+1:9: +1:14
+          scope 2 {
+          }
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/simplify_locals.rs:+1:9: +1:14
+          _1 = [const 0_u8; 10];           // scope 0 at $DIR/simplify_locals.rs:+1:17: +1:26
+-         StorageLive(_2);                 // scope 1 at $DIR/simplify_locals.rs:+3:20: +3:26
+-         StorageLive(_3);                 // scope 1 at $DIR/simplify_locals.rs:+3:20: +3:26
+-         StorageLive(_4);                 // scope 1 at $DIR/simplify_locals.rs:+3:20: +3:26
+-         _4 = &_1;                        // scope 1 at $DIR/simplify_locals.rs:+3:20: +3:26
+-         _3 = &(*_4);                     // scope 1 at $DIR/simplify_locals.rs:+3:20: +3:26
+-         _2 = move _3 as &[u8] (Pointer(Unsize)); // scope 1 at $DIR/simplify_locals.rs:+3:20: +3:26
+-         StorageDead(_3);                 // scope 1 at $DIR/simplify_locals.rs:+3:25: +3:26
+-         StorageDead(_4);                 // scope 1 at $DIR/simplify_locals.rs:+3:26: +3:27
+-         StorageDead(_2);                 // scope 1 at $DIR/simplify_locals.rs:+3:26: +3:27
+          _0 = const ();                   // scope 0 at $DIR/simplify_locals.rs:+0:8: +4:2
+          StorageDead(_1);                 // scope 0 at $DIR/simplify_locals.rs:+4:1: +4:2
+          return;                          // scope 0 at $DIR/simplify_locals.rs:+4:2: +4:2
+      }
+  }
+  
diff --git a/tests/mir-opt/simplify_locals.d1.SimplifyLocals-before-const-prop.diff b/tests/mir-opt/simplify_locals.d1.SimplifyLocals-before-const-prop.diff
new file mode 100644
index 000000000..981738030
--- /dev/null
+++ b/tests/mir-opt/simplify_locals.d1.SimplifyLocals-before-const-prop.diff
@@ -0,0 +1,19 @@
+- // MIR for `d1` before SimplifyLocals-before-const-prop
++ // MIR for `d1` after SimplifyLocals-before-const-prop
+  
+  fn d1() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_locals.rs:+0:9: +0:9
+-     let mut _1: E;                       // in scope 0 at $DIR/simplify_locals.rs:+2:13: +2:17
+      scope 1 {
+      }
+  
+      bb0: {
+-         StorageLive(_1);                 // scope 0 at $DIR/simplify_locals.rs:+2:13: +2:17
+-         Deinit(_1);                      // scope 0 at $DIR/simplify_locals.rs:+2:13: +2:17
+-         discriminant(_1) = 0;            // scope 0 at $DIR/simplify_locals.rs:+2:13: +2:17
+-         StorageDead(_1);                 // scope 0 at $DIR/simplify_locals.rs:+2:17: +2:18
+          _0 = const ();                   // scope 0 at $DIR/simplify_locals.rs:+0:9: +3:2
+          return;                          // scope 0 at $DIR/simplify_locals.rs:+3:2: +3:2
+      }
+  }
+  
diff --git a/tests/mir-opt/simplify_locals.d2.SimplifyLocals-before-const-prop.diff b/tests/mir-opt/simplify_locals.d2.SimplifyLocals-before-const-prop.diff
new file mode 100644
index 000000000..b152dc8cc
--- /dev/null
+++ b/tests/mir-opt/simplify_locals.d2.SimplifyLocals-before-const-prop.diff
@@ -0,0 +1,29 @@
+- // MIR for `d2` before SimplifyLocals-before-const-prop
++ // MIR for `d2` after SimplifyLocals-before-const-prop
+  
+  fn d2() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_locals.rs:+0:9: +0:9
+-     let mut _1: E;                       // in scope 0 at $DIR/simplify_locals.rs:+2:22: +2:26
+-     let mut _2: (i32, E);                // in scope 0 at $DIR/simplify_locals.rs:+2:5: +2:17
+-     let mut _3: E;                       // in scope 0 at $DIR/simplify_locals.rs:+2:11: +2:15
+  
+      bb0: {
+-         StorageLive(_1);                 // scope 0 at $DIR/simplify_locals.rs:+2:22: +2:26
+-         Deinit(_1);                      // scope 0 at $DIR/simplify_locals.rs:+2:22: +2:26
+-         discriminant(_1) = 1;            // scope 0 at $DIR/simplify_locals.rs:+2:22: +2:26
+-         StorageLive(_2);                 // scope 0 at $DIR/simplify_locals.rs:+2:5: +2:17
+-         StorageLive(_3);                 // scope 0 at $DIR/simplify_locals.rs:+2:11: +2:15
+-         Deinit(_3);                      // scope 0 at $DIR/simplify_locals.rs:+2:11: +2:15
+-         discriminant(_3) = 0;            // scope 0 at $DIR/simplify_locals.rs:+2:11: +2:15
+-         Deinit(_2);                      // scope 0 at $DIR/simplify_locals.rs:+2:6: +2:16
+-         (_2.0: i32) = const 10_i32;      // scope 0 at $DIR/simplify_locals.rs:+2:6: +2:16
+-         (_2.1: E) = move _3;             // scope 0 at $DIR/simplify_locals.rs:+2:6: +2:16
+-         StorageDead(_3);                 // scope 0 at $DIR/simplify_locals.rs:+2:15: +2:16
+-         (_2.1: E) = move _1;             // scope 0 at $DIR/simplify_locals.rs:+2:5: +2:26
+-         StorageDead(_1);                 // scope 0 at $DIR/simplify_locals.rs:+2:25: +2:26
+-         StorageDead(_2);                 // scope 0 at $DIR/simplify_locals.rs:+2:26: +2:27
+          _0 = const ();                   // scope 0 at $DIR/simplify_locals.rs:+0:9: +3:2
+          return;                          // scope 0 at $DIR/simplify_locals.rs:+3:2: +3:2
+      }
+  }
+  
diff --git a/tests/mir-opt/simplify_locals.expose_addr.SimplifyLocals-before-const-prop.diff b/tests/mir-opt/simplify_locals.expose_addr.SimplifyLocals-before-const-prop.diff
new file mode 100644
index 000000000..9ca1dbbd0
--- /dev/null
+++ b/tests/mir-opt/simplify_locals.expose_addr.SimplifyLocals-before-const-prop.diff
@@ -0,0 +1,21 @@
+- // MIR for `expose_addr` before SimplifyLocals-before-const-prop
++ // MIR for `expose_addr` after SimplifyLocals-before-const-prop
+  
+  fn expose_addr(_1: *const usize) -> () {
+      debug p => _1;                       // in scope 0 at $DIR/simplify_locals.rs:+0:16: +0:17
+      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_locals.rs:+0:33: +0:33
+      let _2: usize;                       // in scope 0 at $DIR/simplify_locals.rs:+2:5: +2:15
+      let mut _3: *const usize;            // in scope 0 at $DIR/simplify_locals.rs:+2:5: +2:6
+  
+      bb0: {
+          StorageLive(_2);                 // scope 0 at $DIR/simplify_locals.rs:+2:5: +2:15
+          StorageLive(_3);                 // scope 0 at $DIR/simplify_locals.rs:+2:5: +2:6
+          _3 = _1;                         // scope 0 at $DIR/simplify_locals.rs:+2:5: +2:6
+          _2 = move _3 as usize (PointerExposeAddress); // scope 0 at $DIR/simplify_locals.rs:+2:5: +2:15
+          StorageDead(_3);                 // scope 0 at $DIR/simplify_locals.rs:+2:14: +2:15
+          StorageDead(_2);                 // scope 0 at $DIR/simplify_locals.rs:+2:15: +2:16
+          _0 = const ();                   // scope 0 at $DIR/simplify_locals.rs:+0:33: +3:2
+          return;                          // scope 0 at $DIR/simplify_locals.rs:+3:2: +3:2
+      }
+  }
+  
diff --git a/tests/mir-opt/simplify_locals.r.SimplifyLocals-before-const-prop.diff b/tests/mir-opt/simplify_locals.r.SimplifyLocals-before-const-prop.diff
new file mode 100644
index 000000000..19dacb427
--- /dev/null
+++ b/tests/mir-opt/simplify_locals.r.SimplifyLocals-before-const-prop.diff
@@ -0,0 +1,31 @@
+- // MIR for `r` before SimplifyLocals-before-const-prop
++ // MIR for `r` after SimplifyLocals-before-const-prop
+  
+  fn r() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_locals.rs:+0:8: +0:8
+      let mut _1: i32;                     // in scope 0 at $DIR/simplify_locals.rs:+1:9: +1:14
+-     let mut _2: &i32;                    // in scope 0 at $DIR/simplify_locals.rs:+3:13: +3:15
+-     let mut _3: &mut i32;                // in scope 0 at $DIR/simplify_locals.rs:+4:13: +4:19
+      scope 1 {
+          debug a => _1;                   // in scope 1 at $DIR/simplify_locals.rs:+1:9: +1:14
+          scope 2 {
+              scope 3 {
+              }
+          }
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/simplify_locals.rs:+1:9: +1:14
+          _1 = const 1_i32;                // scope 0 at $DIR/simplify_locals.rs:+1:17: +1:18
+-         StorageLive(_2);                 // scope 1 at $DIR/simplify_locals.rs:+3:13: +3:15
+-         _2 = &_1;                        // scope 1 at $DIR/simplify_locals.rs:+3:13: +3:15
+-         StorageDead(_2);                 // scope 1 at $DIR/simplify_locals.rs:+3:15: +3:16
+-         StorageLive(_3);                 // scope 2 at $DIR/simplify_locals.rs:+4:13: +4:19
+-         _3 = &mut _1;                    // scope 2 at $DIR/simplify_locals.rs:+4:13: +4:19
+-         StorageDead(_3);                 // scope 2 at $DIR/simplify_locals.rs:+4:19: +4:20
+          _0 = const ();                   // scope 0 at $DIR/simplify_locals.rs:+0:8: +5:2
+          StorageDead(_1);                 // scope 0 at $DIR/simplify_locals.rs:+5:1: +5:2
+          return;                          // scope 0 at $DIR/simplify_locals.rs:+5:2: +5:2
+      }
+  }
+  
diff --git a/tests/mir-opt/simplify_locals.rs b/tests/mir-opt/simplify_locals.rs
new file mode 100644
index 000000000..7bbc0481c
--- /dev/null
+++ b/tests/mir-opt/simplify_locals.rs
@@ -0,0 +1,81 @@
+// unit-test: SimplifyLocals-before-const-prop
+
+
+#![feature(thread_local)]
+
+#[derive(Copy, Clone)]
+enum E {
+     A,
+     B,
+}
+
+// EMIT_MIR simplify_locals.c.SimplifyLocals-before-const-prop.diff
+fn c() {
+    let bytes = [0u8; 10];
+    // Unused cast
+    let _: &[u8] = &bytes;
+}
+
+// EMIT_MIR simplify_locals.d1.SimplifyLocals-before-const-prop.diff
+fn d1() {
+    // Unused set discriminant
+    let _ = E::A;
+}
+
+// EMIT_MIR simplify_locals.d2.SimplifyLocals-before-const-prop.diff
+fn d2() {
+    // Unused set discriminant
+    {(10, E::A)}.1 = E::B;
+}
+
+// EMIT_MIR simplify_locals.r.SimplifyLocals-before-const-prop.diff
+fn r() {
+    let mut a = 1;
+    // Unused references
+    let _ = &a;
+    let _ = &mut a;
+}
+
+#[thread_local] static mut X: u32 = 0;
+
+// EMIT_MIR simplify_locals.t1.SimplifyLocals-before-const-prop.diff
+fn t1() {
+    // Unused thread local
+    unsafe { X };
+}
+
+// EMIT_MIR simplify_locals.t2.SimplifyLocals-before-const-prop.diff
+fn t2() {
+    // Unused thread local
+    unsafe { &mut X };
+}
+
+// EMIT_MIR simplify_locals.t3.SimplifyLocals-before-const-prop.diff
+fn t3() {
+    // Unused thread local
+    unsafe { *&mut X };
+}
+
+// EMIT_MIR simplify_locals.t4.SimplifyLocals-before-const-prop.diff
+fn t4() -> u32 {
+    // Used thread local
+    unsafe { X + 1 }
+}
+
+// EMIT_MIR simplify_locals.expose_addr.SimplifyLocals-before-const-prop.diff
+fn expose_addr(p: *const usize) {
+    // Used pointer to address cast. Has a side effect of exposing the provenance.
+    p as usize;
+}
+
+fn main() {
+    c();
+    d1();
+    d2();
+    r();
+    t1();
+    t2();
+    t3();
+    t4();
+    expose_addr(&0);
+}
diff --git a/tests/mir-opt/simplify_locals.t1.SimplifyLocals-before-const-prop.diff b/tests/mir-opt/simplify_locals.t1.SimplifyLocals-before-const-prop.diff
new file mode 100644
index 000000000..1b2e1158e
--- /dev/null
+++ b/tests/mir-opt/simplify_locals.t1.SimplifyLocals-before-const-prop.diff
@@ -0,0 +1,22 @@
+- // MIR for `t1` before SimplifyLocals-before-const-prop
++ // MIR for `t1` after SimplifyLocals-before-const-prop
+  
+  fn t1() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_locals.rs:+0:9: +0:9
+-     let _1: u32;                         // in scope 0 at $DIR/simplify_locals.rs:+2:14: +2:15
+-     let mut _2: *mut u32;                // in scope 0 at $DIR/simplify_locals.rs:+2:14: +2:15
+      scope 1 {
+      }
+  
+      bb0: {
+-         StorageLive(_1);                 // scope 0 at $DIR/simplify_locals.rs:+2:5: +2:17
+-         StorageLive(_2);                 // scope 1 at $DIR/simplify_locals.rs:+2:14: +2:15
+-         _2 = &/*tls*/ mut X;             // scope 1 at $DIR/simplify_locals.rs:+2:14: +2:15
+-         _1 = (*_2);                      // scope 1 at $DIR/simplify_locals.rs:+2:14: +2:15
+-         StorageDead(_2);                 // scope 0 at $DIR/simplify_locals.rs:+2:17: +2:18
+-         StorageDead(_1);                 // scope 0 at $DIR/simplify_locals.rs:+2:17: +2:18
+          _0 = const ();                   // scope 0 at $DIR/simplify_locals.rs:+0:9: +3:2
+          return;                          // scope 0 at $DIR/simplify_locals.rs:+3:2: +3:2
+      }
+  }
+  
diff --git a/tests/mir-opt/simplify_locals.t2.SimplifyLocals-before-const-prop.diff b/tests/mir-opt/simplify_locals.t2.SimplifyLocals-before-const-prop.diff
new file mode 100644
index 000000000..cf019357b
--- /dev/null
+++ b/tests/mir-opt/simplify_locals.t2.SimplifyLocals-before-const-prop.diff
@@ -0,0 +1,22 @@
+- // MIR for `t2` before SimplifyLocals-before-const-prop
++ // MIR for `t2` after SimplifyLocals-before-const-prop
+  
+  fn t2() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_locals.rs:+0:9: +0:9
+-     let _1: &mut u32;                    // in scope 0 at $DIR/simplify_locals.rs:+2:14: +2:20
+-     let mut _2: *mut u32;                // in scope 0 at $DIR/simplify_locals.rs:+2:19: +2:20
+      scope 1 {
+      }
+  
+      bb0: {
+-         StorageLive(_1);                 // scope 0 at $DIR/simplify_locals.rs:+2:5: +2:22
+-         StorageLive(_2);                 // scope 1 at $DIR/simplify_locals.rs:+2:19: +2:20
+-         _2 = &/*tls*/ mut X;             // scope 1 at $DIR/simplify_locals.rs:+2:19: +2:20
+-         _1 = &mut (*_2);                 // scope 1 at $DIR/simplify_locals.rs:+2:14: +2:20
+-         StorageDead(_2);                 // scope 0 at $DIR/simplify_locals.rs:+2:22: +2:23
+-         StorageDead(_1);                 // scope 0 at $DIR/simplify_locals.rs:+2:22: +2:23
+          _0 = const ();                   // scope 0 at $DIR/simplify_locals.rs:+0:9: +3:2
+          return;                          // scope 0 at $DIR/simplify_locals.rs:+3:2: +3:2
+      }
+  }
+  
diff --git a/tests/mir-opt/simplify_locals.t3.SimplifyLocals-before-const-prop.diff b/tests/mir-opt/simplify_locals.t3.SimplifyLocals-before-const-prop.diff
new file mode 100644
index 000000000..90ee21580
--- /dev/null
+++ b/tests/mir-opt/simplify_locals.t3.SimplifyLocals-before-const-prop.diff
@@ -0,0 +1,26 @@
+- // MIR for `t3` before SimplifyLocals-before-const-prop
++ // MIR for `t3` after SimplifyLocals-before-const-prop
+  
+  fn t3() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_locals.rs:+0:9: +0:9
+-     let _1: u32;                         // in scope 0 at $DIR/simplify_locals.rs:+2:14: +2:21
+-     let mut _2: &mut u32;                // in scope 0 at $DIR/simplify_locals.rs:+2:15: +2:21
+-     let mut _3: *mut u32;                // in scope 0 at $DIR/simplify_locals.rs:+2:20: +2:21
+      scope 1 {
+      }
+  
+      bb0: {
+-         StorageLive(_1);                 // scope 0 at $DIR/simplify_locals.rs:+2:5: +2:23
+-         StorageLive(_2);                 // scope 1 at $DIR/simplify_locals.rs:+2:15: +2:21
+-         StorageLive(_3);                 // scope 1 at $DIR/simplify_locals.rs:+2:20: +2:21
+-         _3 = &/*tls*/ mut X;             // scope 1 at $DIR/simplify_locals.rs:+2:20: +2:21
+-         _2 = &mut (*_3);                 // scope 1 at $DIR/simplify_locals.rs:+2:15: +2:21
+-         _1 = (*_2);                      // scope 1 at $DIR/simplify_locals.rs:+2:14: +2:21
+-         StorageDead(_3);                 // scope 0 at $DIR/simplify_locals.rs:+2:23: +2:24
+-         StorageDead(_2);                 // scope 0 at $DIR/simplify_locals.rs:+2:23: +2:24
+-         StorageDead(_1);                 // scope 0 at $DIR/simplify_locals.rs:+2:23: +2:24
+          _0 = const ();                   // scope 0 at $DIR/simplify_locals.rs:+0:9: +3:2
+          return;                          // scope 0 at $DIR/simplify_locals.rs:+3:2: +3:2
+      }
+  }
+  
diff --git a/tests/mir-opt/simplify_locals.t4.SimplifyLocals-before-const-prop.diff b/tests/mir-opt/simplify_locals.t4.SimplifyLocals-before-const-prop.diff
new file mode 100644
index 000000000..9add9a6c5
--- /dev/null
+++ b/tests/mir-opt/simplify_locals.t4.SimplifyLocals-before-const-prop.diff
@@ -0,0 +1,22 @@
+- // MIR for `t4` before SimplifyLocals-before-const-prop
++ // MIR for `t4` after SimplifyLocals-before-const-prop
+  
+  fn t4() -> u32 {
+      let mut _0: u32;                     // return place in scope 0 at $DIR/simplify_locals.rs:+0:12: +0:15
+      let mut _1: u32;                     // in scope 0 at $DIR/simplify_locals.rs:+2:14: +2:15
+      let mut _2: *mut u32;                // in scope 0 at $DIR/simplify_locals.rs:+2:14: +2:15
+      scope 1 {
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 1 at $DIR/simplify_locals.rs:+2:14: +2:15
+          StorageLive(_2);                 // scope 1 at $DIR/simplify_locals.rs:+2:14: +2:15
+          _2 = &/*tls*/ mut X;             // scope 1 at $DIR/simplify_locals.rs:+2:14: +2:15
+          _1 = (*_2);                      // scope 1 at $DIR/simplify_locals.rs:+2:14: +2:15
+          _0 = Add(move _1, const 1_u32);  // scope 1 at $DIR/simplify_locals.rs:+2:14: +2:19
+          StorageDead(_1);                 // scope 1 at $DIR/simplify_locals.rs:+2:18: +2:19
+          StorageDead(_2);                 // scope 0 at $DIR/simplify_locals.rs:+3:1: +3:2
+          return;                          // scope 0 at $DIR/simplify_locals.rs:+3:2: +3:2
+      }
+  }
+  
diff --git a/tests/mir-opt/simplify_locals_fixedpoint.foo.SimplifyLocals-final.diff b/tests/mir-opt/simplify_locals_fixedpoint.foo.SimplifyLocals-final.diff
new file mode 100644
index 000000000..f888c622d
--- /dev/null
+++ b/tests/mir-opt/simplify_locals_fixedpoint.foo.SimplifyLocals-final.diff
@@ -0,0 +1,62 @@
+- // MIR for `foo` before SimplifyLocals-final
++ // MIR for `foo` after SimplifyLocals-final
+  
+  fn foo() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_locals_fixedpoint.rs:+0:13: +0:13
+      let mut _1: (std::option::Option<u8>, std::option::Option<T>); // in scope 0 at $DIR/simplify_locals_fixedpoint.rs:+1:30: +1:69
+      let mut _2: std::option::Option<u8>; // in scope 0 at $DIR/simplify_locals_fixedpoint.rs:+1:31: +1:49
+      let mut _3: std::option::Option<T>;  // in scope 0 at $DIR/simplify_locals_fixedpoint.rs:+1:51: +1:68
+      let mut _4: isize;                   // in scope 0 at $DIR/simplify_locals_fixedpoint.rs:+1:22: +1:26
+      let mut _5: isize;                   // in scope 0 at $DIR/simplify_locals_fixedpoint.rs:+1:13: +1:20
+-     let mut _7: bool;                    // in scope 0 at $DIR/simplify_locals_fixedpoint.rs:+2:12: +2:20
+-     let mut _8: u8;                      // in scope 0 at $DIR/simplify_locals_fixedpoint.rs:+2:12: +2:13
+      scope 1 {
+          debug a => _6;                   // in scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:18: +1:19
+          let _6: u8;                      // in scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:18: +1:19
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:30: +1:69
+          StorageLive(_2);                 // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:31: +1:49
+          Deinit(_2);                      // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:31: +1:49
+          discriminant(_2) = 0;            // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:31: +1:49
+          StorageLive(_3);                 // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:51: +1:68
+          Deinit(_3);                      // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:51: +1:68
+          discriminant(_3) = 0;            // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:51: +1:68
+          Deinit(_1);                      // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:30: +1:69
+          (_1.0: std::option::Option<u8>) = move _2; // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:30: +1:69
+          (_1.1: std::option::Option<T>) = move _3; // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:30: +1:69
+          StorageDead(_3);                 // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:68: +1:69
+          StorageDead(_2);                 // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:68: +1:69
+          _5 = discriminant((_1.0: std::option::Option<u8>)); // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:12: +1:27
+          switchInt(move _5) -> [1: bb1, otherwise: bb3]; // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:12: +1:27
+      }
+  
+      bb1: {
+          _4 = discriminant((_1.1: std::option::Option<T>)); // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:12: +1:27
+          switchInt(move _4) -> [0: bb2, otherwise: bb3]; // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:12: +1:27
+      }
+  
+      bb2: {
+          StorageLive(_6);                 // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:18: +1:19
+          _6 = (((_1.0: std::option::Option<u8>) as Some).0: u8); // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+1:18: +1:19
+-         StorageLive(_7);                 // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+2:12: +2:20
+-         StorageLive(_8);                 // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+2:12: +2:13
+-         _8 = _6;                         // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+2:12: +2:13
+-         _7 = Gt(move _8, const 42_u8);   // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+2:12: +2:20
+-         StorageDead(_8);                 // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+2:19: +2:20
+-         StorageDead(_7);                 // scope 1 at $DIR/simplify_locals_fixedpoint.rs:+4:9: +4:10
+          StorageDead(_6);                 // scope 0 at $DIR/simplify_locals_fixedpoint.rs:+5:5: +5:6
+          goto -> bb3;                     // scope 0 at $DIR/simplify_locals_fixedpoint.rs:+1:5: +5:6
+      }
+  
+      bb3: {
+          drop(_1) -> bb4;                 // scope 0 at $DIR/simplify_locals_fixedpoint.rs:+6:1: +6:2
+      }
+  
+      bb4: {
+          StorageDead(_1);                 // scope 0 at $DIR/simplify_locals_fixedpoint.rs:+6:1: +6:2
+          return;                          // scope 0 at $DIR/simplify_locals_fixedpoint.rs:+6:2: +6:2
+      }
+  }
+  
diff --git a/tests/mir-opt/simplify_locals_fixedpoint.rs b/tests/mir-opt/simplify_locals_fixedpoint.rs
new file mode 100644
index 000000000..1fdba6e99
--- /dev/null
+++ b/tests/mir-opt/simplify_locals_fixedpoint.rs
@@ -0,0 +1,15 @@
+// compile-flags: -Zmir-opt-level=1
+
+fn foo<T>() {
+    if let (Some(a), None) = (Option::<u8>::None, Option::<T>::None) {
+        if a > 42u8 {
+
+        }
+    }
+}
+
+fn main() {
+    foo::<()>();
+}
+
+// EMIT_MIR simplify_locals_fixedpoint.foo.SimplifyLocals-final.diff
diff --git a/tests/mir-opt/simplify_locals_removes_unused_consts.main.SimplifyLocals-before-const-prop.diff b/tests/mir-opt/simplify_locals_removes_unused_consts.main.SimplifyLocals-before-const-prop.diff
new file mode 100644
index 000000000..efb2b0961
--- /dev/null
+++ b/tests/mir-opt/simplify_locals_removes_unused_consts.main.SimplifyLocals-before-const-prop.diff
@@ -0,0 +1,109 @@
+- // MIR for `main` before SimplifyLocals-before-const-prop
++ // MIR for `main` after SimplifyLocals-before-const-prop
+  
+  fn main() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+0:11: +0:11
+-     let mut _1: ((), ());                // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:20: +1:28
+-     let mut _2: ();                      // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:21: +1:23
+-     let mut _3: ();                      // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:25: +1:27
+-     let _4: ();                          // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+2:5: +2:22
+-     let mut _5: ((), ());                // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+2:13: +2:21
+-     let mut _6: ();                      // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+2:14: +2:16
+-     let mut _7: ();                      // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+2:18: +2:20
+-     let _8: ();                          // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+4:5: +4:35
+-     let mut _9: u8;                      // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:34
+-     let mut _10: u8;                     // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:30
+-     let mut _11: Temp;                   // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:28
++     let _1: ();                          // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+2:5: +2:22
++     let mut _2: ((), ());                // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+2:13: +2:21
++     let mut _3: ();                      // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+2:14: +2:16
++     let mut _4: ();                      // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+2:18: +2:20
++     let _5: ();                          // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+4:5: +4:35
++     let mut _6: u8;                      // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:34
++     let mut _7: u8;                      // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:30
++     let mut _8: Temp;                    // in scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:28
+      scope 1 {
+      }
+  
+      bb0: {
+-         StorageLive(_1);                 // scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:20: +1:28
+-         StorageLive(_2);                 // scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:21: +1:23
+-         Deinit(_2);                      // scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:21: +1:23
+-         StorageLive(_3);                 // scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:25: +1:27
+-         Deinit(_3);                      // scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:25: +1:27
+-         Deinit(_1);                      // scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:20: +1:28
+-         (_1.0: ()) = move _2;            // scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:20: +1:28
+-         (_1.1: ()) = move _3;            // scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:20: +1:28
+-         StorageDead(_3);                 // scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:27: +1:28
+-         StorageDead(_2);                 // scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:27: +1:28
+-         StorageDead(_1);                 // scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+1:28: +1:29
+-         StorageLive(_4);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:5: +2:22
+-         StorageLive(_5);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:13: +2:21
+-         StorageLive(_6);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:14: +2:16
+-         Deinit(_6);                      // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:14: +2:16
+-         StorageLive(_7);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:18: +2:20
+-         Deinit(_7);                      // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:18: +2:20
+-         Deinit(_5);                      // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:13: +2:21
+-         (_5.0: ()) = move _6;            // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:13: +2:21
+-         (_5.1: ()) = move _7;            // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:13: +2:21
+-         StorageDead(_7);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:20: +2:21
+-         StorageDead(_6);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:20: +2:21
+-         _4 = use_zst(move _5) -> bb1;    // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:5: +2:22
++         StorageLive(_1);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:5: +2:22
++         StorageLive(_2);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:13: +2:21
++         StorageLive(_3);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:14: +2:16
++         Deinit(_3);                      // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:14: +2:16
++         StorageLive(_4);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:18: +2:20
++         Deinit(_4);                      // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:18: +2:20
++         Deinit(_2);                      // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:13: +2:21
++         (_2.0: ()) = move _3;            // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:13: +2:21
++         (_2.1: ()) = move _4;            // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:13: +2:21
++         StorageDead(_4);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:20: +2:21
++         StorageDead(_3);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:20: +2:21
++         _1 = use_zst(move _2) -> bb1;    // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:5: +2:22
+                                           // mir::Constant
+                                           // + span: $DIR/simplify_locals_removes_unused_consts.rs:15:5: 15:12
+                                           // + literal: Const { ty: fn(((), ())) {use_zst}, val: Value(<ZST>) }
+      }
+  
+      bb1: {
+-         StorageDead(_5);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:21: +2:22
+-         StorageDead(_4);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:22: +2:23
+-         StorageLive(_8);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:5: +4:35
+-         StorageLive(_9);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:34
+-         StorageLive(_10);                // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:30
+-         StorageLive(_11);                // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:28
+-         Deinit(_11);                     // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:28
+-         (_11.0: u8) = const 40_u8;       // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:28
+-         _10 = (_11.0: u8);               // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:30
+-         _9 = Add(move _10, const 2_u8);  // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:34
+-         StorageDead(_10);                // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:33: +4:34
+-         _8 = use_u8(move _9) -> bb2;     // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:5: +4:35
++         StorageDead(_2);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:21: +2:22
++         StorageDead(_1);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+2:22: +2:23
++         StorageLive(_5);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:5: +4:35
++         StorageLive(_6);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:34
++         StorageLive(_7);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:30
++         StorageLive(_8);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:28
++         Deinit(_8);                      // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:28
++         (_8.0: u8) = const 40_u8;        // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:28
++         _7 = (_8.0: u8);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:30
++         _6 = Add(move _7, const 2_u8);   // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:12: +4:34
++         StorageDead(_7);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:33: +4:34
++         _5 = use_u8(move _6) -> bb2;     // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:5: +4:35
+                                           // mir::Constant
+                                           // + span: $DIR/simplify_locals_removes_unused_consts.rs:17:5: 17:11
+                                           // + literal: Const { ty: fn(u8) {use_u8}, val: Value(<ZST>) }
+      }
+  
+      bb2: {
+-         StorageDead(_9);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:34: +4:35
+-         StorageDead(_11);                // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:35: +4:36
++         StorageDead(_6);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:34: +4:35
+          StorageDead(_8);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:35: +4:36
++         StorageDead(_5);                 // scope 1 at $DIR/simplify_locals_removes_unused_consts.rs:+4:35: +4:36
+          _0 = const ();                   // scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+0:11: +5:2
+          return;                          // scope 0 at $DIR/simplify_locals_removes_unused_consts.rs:+5:2: +5:2
+      }
+  }
+  
diff --git a/src/test/mir-opt/simplify_locals_removes_unused_consts.rs b/tests/mir-opt/simplify_locals_removes_unused_consts.rs
index 39b7911d4..7a03a2837 100644
--- a/src/test/mir-opt/simplify_locals_removes_unused_consts.rs
+++ b/tests/mir-opt/simplify_locals_removes_unused_consts.rs
@@ -1,4 +1,4 @@
-// unit-test: SimplifyLocals
+// unit-test: SimplifyLocals-before-const-prop
 // compile-flags: -C overflow-checks=no
 
 fn use_zst(_: ((), ())) {}
@@ -9,7 +9,7 @@ struct Temp {
 
 fn use_u8(_: u8) {}
 
-// EMIT_MIR simplify_locals_removes_unused_consts.main.SimplifyLocals.diff
+// EMIT_MIR simplify_locals_removes_unused_consts.main.SimplifyLocals-before-const-prop.diff
 fn main() {
     let ((), ()) = ((), ());
     use_zst(((), ()));
diff --git a/tests/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals-before-const-prop.diff b/tests/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals-before-const-prop.diff
new file mode 100644
index 000000000..027c983e6
--- /dev/null
+++ b/tests/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals-before-const-prop.diff
@@ -0,0 +1,52 @@
+- // MIR for `map` before SimplifyLocals-before-const-prop
++ // MIR for `map` after SimplifyLocals-before-const-prop
+  
+  fn map(_1: Option<Box<()>>) -> Option<Box<()>> {
+      debug x => _1;                       // in scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+0:8: +0:9
+      let mut _0: std::option::Option<std::boxed::Box<()>>; // return place in scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+0:31: +0:46
+      let mut _2: isize;                   // in scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+2:9: +2:13
+      let _3: std::boxed::Box<()>;         // in scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+3:14: +3:15
+      let mut _4: std::boxed::Box<()>;     // in scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+3:25: +3:26
+-     let mut _5: bool;                    // in scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+5:1: +5:2
+-     let mut _6: isize;                   // in scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+5:1: +5:2
+-     let mut _7: isize;                   // in scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+5:1: +5:2
+      scope 1 {
+          debug x => _3;                   // in scope 1 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+3:14: +3:15
+      }
+  
+      bb0: {
+-         _5 = const false;                // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+1:11: +1:12
+-         _5 = const true;                 // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+1:11: +1:12
+          _2 = discriminant(_1);           // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+1:11: +1:12
+          switchInt(move _2) -> [0: bb3, 1: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+1:5: +1:12
+      }
+  
+      bb1: {
+          StorageLive(_3);                 // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+3:14: +3:15
+          _3 = move ((_1 as Some).0: std::boxed::Box<()>); // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+3:14: +3:15
+          StorageLive(_4);                 // scope 1 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+3:25: +3:26
+          _4 = move _3;                    // scope 1 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+3:25: +3:26
+          Deinit(_0);                      // scope 1 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+3:20: +3:27
+          ((_0 as Some).0: std::boxed::Box<()>) = move _4; // scope 1 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+3:20: +3:27
+          discriminant(_0) = 1;            // scope 1 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+3:20: +3:27
+          StorageDead(_4);                 // scope 1 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+3:26: +3:27
+          StorageDead(_3);                 // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+3:26: +3:27
+          goto -> bb4;                     // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+3:26: +3:27
+      }
+  
+      bb2: {
+          unreachable;                     // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+1:11: +1:12
+      }
+  
+      bb3: {
+          Deinit(_0);                      // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+2:17: +2:21
+          discriminant(_0) = 0;            // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+2:17: +2:21
+          goto -> bb4;                     // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+2:17: +2:21
+      }
+  
+      bb4: {
+-         _6 = discriminant(_1);           // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+5:1: +5:2
+          return;                          // scope 0 at $DIR/simplify_locals_removes_unused_discriminant_reads.rs:+5:2: +5:2
+      }
+  }
+  
diff --git a/tests/mir-opt/simplify_locals_removes_unused_discriminant_reads.rs b/tests/mir-opt/simplify_locals_removes_unused_discriminant_reads.rs
new file mode 100644
index 000000000..de6585741
--- /dev/null
+++ b/tests/mir-opt/simplify_locals_removes_unused_discriminant_reads.rs
@@ -0,0 +1,14 @@
+// unit-test: SimplifyLocals-before-const-prop
+
+fn map(x: Option<Box<()>>) -> Option<Box<()>> {
+    match x {
+        None => None,
+        Some(x) => Some(x),
+    }
+}
+
+fn main() {
+    map(None);
+}
+
+// EMIT_MIR simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals-before-const-prop.diff
diff --git a/src/test/mir-opt/simplify_match.main.ConstProp.diff b/tests/mir-opt/simplify_match.main.ConstProp.diff
index e4f9a4c12..70bfbf1b3 100644
--- a/src/test/mir-opt/simplify_match.main.ConstProp.diff
+++ b/tests/mir-opt/simplify_match.main.ConstProp.diff
@@ -16,12 +16,11 @@
 -         _1 = _2;                         // scope 1 at $DIR/simplify_match.rs:+1:28: +1:29
 +         _1 = const false;                // scope 1 at $DIR/simplify_match.rs:+1:28: +1:29
           StorageDead(_2);                 // scope 0 at $DIR/simplify_match.rs:+1:30: +1:31
--         switchInt(_1) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_match.rs:+1:5: +1:31
-+         switchInt(const false) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_match.rs:+1:5: +1:31
+-         switchInt(_1) -> [0: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_match.rs:+1:5: +1:31
++         switchInt(const false) -> [0: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_match.rs:+1:5: +1:31
       }
   
       bb1: {
-          nop;                             // scope 0 at $DIR/simplify_match.rs:+3:18: +3:20
           goto -> bb3;                     // scope 0 at $DIR/simplify_match.rs:+3:18: +3:20
       }
   
diff --git a/src/test/mir-opt/simplify_match.rs b/tests/mir-opt/simplify_match.rs
index 216203f9f..216203f9f 100644
--- a/src/test/mir-opt/simplify_match.rs
+++ b/tests/mir-opt/simplify_match.rs
diff --git a/src/test/mir-opt/simplify_try_if_let.rs b/tests/mir-opt/simplify_try_if_let.rs
index fba67de40..fba67de40 100644
--- a/src/test/mir-opt/simplify_try_if_let.rs
+++ b/tests/mir-opt/simplify_try_if_let.rs
diff --git a/src/test/mir-opt/simplify_try_if_let.{impl#0}-append.SimplifyArmIdentity.diff b/tests/mir-opt/simplify_try_if_let.{impl#0}-append.SimplifyArmIdentity.diff
index 11f6b5337..11f6b5337 100644
--- a/src/test/mir-opt/simplify_try_if_let.{impl#0}-append.SimplifyArmIdentity.diff
+++ b/tests/mir-opt/simplify_try_if_let.{impl#0}-append.SimplifyArmIdentity.diff
diff --git a/src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir b/tests/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir
index 31ccf1454..391b00eff 100644
--- a/src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir
+++ b/tests/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir
@@ -37,7 +37,7 @@ fn std::ptr::drop_in_place(_1: *mut [String]) -> () {
 
     bb4 (cleanup): {
         _6 = Eq(_4, _3);                 // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
-        switchInt(move _6) -> [false: bb3, otherwise: bb2]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+        switchInt(move _6) -> [0: bb3, otherwise: bb2]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
     }
 
     bb5: {
@@ -48,7 +48,7 @@ fn std::ptr::drop_in_place(_1: *mut [String]) -> () {
 
     bb6: {
         _8 = Eq(_4, _3);                 // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
-        switchInt(move _8) -> [false: bb5, otherwise: bb1]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+        switchInt(move _8) -> [0: bb5, otherwise: bb1]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
     }
 
     bb7: {
@@ -68,7 +68,7 @@ fn std::ptr::drop_in_place(_1: *mut [String]) -> () {
 
     bb10 (cleanup): {
         _12 = Eq(_9, _10);               // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
-        switchInt(move _12) -> [false: bb9, otherwise: bb2]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+        switchInt(move _12) -> [0: bb9, otherwise: bb2]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
     }
 
     bb11: {
@@ -79,7 +79,7 @@ fn std::ptr::drop_in_place(_1: *mut [String]) -> () {
 
     bb12: {
         _14 = Eq(_9, _10);               // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
-        switchInt(move _14) -> [false: bb11, otherwise: bb1]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+        switchInt(move _14) -> [0: bb11, otherwise: bb1]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
     }
 
     bb13: {
@@ -96,6 +96,6 @@ fn std::ptr::drop_in_place(_1: *mut [String]) -> () {
     bb15: {
         _2 = SizeOf(std::string::String); // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
         _3 = Len((*_1));                 // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
-        switchInt(move _2) -> [0_usize: bb8, otherwise: bb14]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
+        switchInt(move _2) -> [0: bb8, otherwise: bb14]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
     }
 }
diff --git a/src/test/mir-opt/slice_drop_shim.rs b/tests/mir-opt/slice_drop_shim.rs
index 344c1af2c..344c1af2c 100644
--- a/src/test/mir-opt/slice_drop_shim.rs
+++ b/tests/mir-opt/slice_drop_shim.rs
diff --git a/src/test/mir-opt/spanview_block.main.built.after.html b/tests/mir-opt/spanview_block.main.built.after.html
index b962d80c5..b962d80c5 100644
--- a/src/test/mir-opt/spanview_block.main.built.after.html
+++ b/tests/mir-opt/spanview_block.main.built.after.html
diff --git a/src/test/mir-opt/spanview_block.rs b/tests/mir-opt/spanview_block.rs
index 0ecf35ad6..0ecf35ad6 100644
--- a/src/test/mir-opt/spanview_block.rs
+++ b/tests/mir-opt/spanview_block.rs
diff --git a/src/test/mir-opt/spanview_statement.main.built.after.html b/tests/mir-opt/spanview_statement.main.built.after.html
index 43bff7d09..43bff7d09 100644
--- a/src/test/mir-opt/spanview_statement.main.built.after.html
+++ b/tests/mir-opt/spanview_statement.main.built.after.html
diff --git a/src/test/mir-opt/spanview_statement.rs b/tests/mir-opt/spanview_statement.rs
index 457052617..457052617 100644
--- a/src/test/mir-opt/spanview_statement.rs
+++ b/tests/mir-opt/spanview_statement.rs
diff --git a/src/test/mir-opt/spanview_terminator.main.built.after.html b/tests/mir-opt/spanview_terminator.main.built.after.html
index aa7e44c15..aa7e44c15 100644
--- a/src/test/mir-opt/spanview_terminator.main.built.after.html
+++ b/tests/mir-opt/spanview_terminator.main.built.after.html
diff --git a/src/test/mir-opt/spanview_terminator.rs b/tests/mir-opt/spanview_terminator.rs
index 76fced188..76fced188 100644
--- a/src/test/mir-opt/spanview_terminator.rs
+++ b/tests/mir-opt/spanview_terminator.rs
diff --git a/src/test/mir-opt/sroa.dropping.ScalarReplacementOfAggregates.diff b/tests/mir-opt/sroa.dropping.ScalarReplacementOfAggregates.diff
index eb8830446..eb8830446 100644
--- a/src/test/mir-opt/sroa.dropping.ScalarReplacementOfAggregates.diff
+++ b/tests/mir-opt/sroa.dropping.ScalarReplacementOfAggregates.diff
diff --git a/src/test/mir-opt/sroa.enums.ScalarReplacementOfAggregates.diff b/tests/mir-opt/sroa.enums.ScalarReplacementOfAggregates.diff
index 7c7e87c32..a5488c1ec 100644
--- a/src/test/mir-opt/sroa.enums.ScalarReplacementOfAggregates.diff
+++ b/tests/mir-opt/sroa.enums.ScalarReplacementOfAggregates.diff
@@ -21,7 +21,7 @@
           discriminant(_2) = 1;            // scope 1 at $DIR/sroa.rs:+1:22: +1:29
           StorageDead(_3);                 // scope 1 at $DIR/sroa.rs:+1:28: +1:29
           _4 = discriminant(_2);           // scope 1 at $DIR/sroa.rs:+1:12: +1:19
-          switchInt(move _4) -> [1_isize: bb1, otherwise: bb2]; // scope 1 at $DIR/sroa.rs:+1:12: +1:19
+          switchInt(move _4) -> [1: bb1, otherwise: bb2]; // scope 1 at $DIR/sroa.rs:+1:12: +1:19
       }
   
       bb1: {
diff --git a/src/test/mir-opt/sroa.escaping.ScalarReplacementOfAggregates.diff b/tests/mir-opt/sroa.escaping.ScalarReplacementOfAggregates.diff
index 64559b58f..64559b58f 100644
--- a/src/test/mir-opt/sroa.escaping.ScalarReplacementOfAggregates.diff
+++ b/tests/mir-opt/sroa.escaping.ScalarReplacementOfAggregates.diff
diff --git a/src/test/mir-opt/sroa.flat.ScalarReplacementOfAggregates.diff b/tests/mir-opt/sroa.flat.ScalarReplacementOfAggregates.diff
index d4c04d5e6..d4c04d5e6 100644
--- a/src/test/mir-opt/sroa.flat.ScalarReplacementOfAggregates.diff
+++ b/tests/mir-opt/sroa.flat.ScalarReplacementOfAggregates.diff
diff --git a/src/test/mir-opt/sroa.rs b/tests/mir-opt/sroa.rs
index ff8deb40d..ff8deb40d 100644
--- a/src/test/mir-opt/sroa.rs
+++ b/tests/mir-opt/sroa.rs
diff --git a/src/test/mir-opt/sroa.structs.ScalarReplacementOfAggregates.diff b/tests/mir-opt/sroa.structs.ScalarReplacementOfAggregates.diff
index 69d74c351..69d74c351 100644
--- a/src/test/mir-opt/sroa.structs.ScalarReplacementOfAggregates.diff
+++ b/tests/mir-opt/sroa.structs.ScalarReplacementOfAggregates.diff
diff --git a/src/test/mir-opt/sroa.unions.ScalarReplacementOfAggregates.diff b/tests/mir-opt/sroa.unions.ScalarReplacementOfAggregates.diff
index 03ca976df..03ca976df 100644
--- a/src/test/mir-opt/sroa.unions.ScalarReplacementOfAggregates.diff
+++ b/tests/mir-opt/sroa.unions.ScalarReplacementOfAggregates.diff
diff --git a/src/test/mir-opt/storage_ranges.main.nll.0.mir b/tests/mir-opt/storage_ranges.main.nll.0.mir
index 8e10e70f1..8e10e70f1 100644
--- a/src/test/mir-opt/storage_ranges.main.nll.0.mir
+++ b/tests/mir-opt/storage_ranges.main.nll.0.mir
diff --git a/src/test/mir-opt/storage_ranges.rs b/tests/mir-opt/storage_ranges.rs
index 996051a29..996051a29 100644
--- a/src/test/mir-opt/storage_ranges.rs
+++ b/tests/mir-opt/storage_ranges.rs
diff --git a/src/test/mir-opt/tls_access.main.PreCodegen.after.mir b/tests/mir-opt/tls_access.main.PreCodegen.after.mir
index 09453b8ba..09453b8ba 100644
--- a/src/test/mir-opt/tls_access.main.PreCodegen.after.mir
+++ b/tests/mir-opt/tls_access.main.PreCodegen.after.mir
diff --git a/src/test/mir-opt/tls_access.rs b/tests/mir-opt/tls_access.rs
index 19344c868..19344c868 100644
--- a/src/test/mir-opt/tls_access.rs
+++ b/tests/mir-opt/tls_access.rs
diff --git a/src/test/mir-opt/try_identity_e2e.new.PreCodegen.after.mir b/tests/mir-opt/try_identity_e2e.new.PreCodegen.after.mir
index 30185f3ff..b254bfeb7 100644
--- a/src/test/mir-opt/try_identity_e2e.new.PreCodegen.after.mir
+++ b/tests/mir-opt/try_identity_e2e.new.PreCodegen.after.mir
@@ -26,7 +26,7 @@ fn new(_1: Result<T, E>) -> Result<T, E> {
     bb0: {
         StorageLive(_2);                 // scope 0 at $DIR/try_identity_e2e.rs:+2:15: +7:10
         _3 = discriminant(_1);           // scope 0 at $DIR/try_identity_e2e.rs:+3:19: +3:20
-        switchInt(move _3) -> [0_isize: bb2, 1_isize: bb1, otherwise: bb4]; // scope 0 at $DIR/try_identity_e2e.rs:+3:13: +3:20
+        switchInt(move _3) -> [0: bb2, 1: bb1, otherwise: bb4]; // scope 0 at $DIR/try_identity_e2e.rs:+3:13: +3:20
     }
 
     bb1: {
@@ -35,7 +35,7 @@ fn new(_1: Result<T, E>) -> Result<T, E> {
         ((_2 as Break).0: E) = move _5;  // scope 2 at $DIR/try_identity_e2e.rs:+5:27: +5:48
         discriminant(_2) = 1;            // scope 2 at $DIR/try_identity_e2e.rs:+5:27: +5:48
         _6 = discriminant(_2);           // scope 0 at $DIR/try_identity_e2e.rs:+2:15: +7:10
-        switchInt(move _6) -> [0_isize: bb5, 1_isize: bb3, otherwise: bb4]; // scope 0 at $DIR/try_identity_e2e.rs:+2:9: +7:10
+        switchInt(move _6) -> [0: bb5, 1: bb3, otherwise: bb4]; // scope 0 at $DIR/try_identity_e2e.rs:+2:9: +7:10
     }
 
     bb2: {
@@ -44,7 +44,7 @@ fn new(_1: Result<T, E>) -> Result<T, E> {
         ((_2 as Continue).0: T) = move _4; // scope 1 at $DIR/try_identity_e2e.rs:+4:26: +4:50
         discriminant(_2) = 0;            // scope 1 at $DIR/try_identity_e2e.rs:+4:26: +4:50
         _6 = discriminant(_2);           // scope 0 at $DIR/try_identity_e2e.rs:+2:15: +7:10
-        switchInt(move _6) -> [0_isize: bb5, 1_isize: bb3, otherwise: bb4]; // scope 0 at $DIR/try_identity_e2e.rs:+2:9: +7:10
+        switchInt(move _6) -> [0: bb5, 1: bb3, otherwise: bb4]; // scope 0 at $DIR/try_identity_e2e.rs:+2:9: +7:10
     }
 
     bb3: {
diff --git a/src/test/mir-opt/try_identity_e2e.old.PreCodegen.after.mir b/tests/mir-opt/try_identity_e2e.old.PreCodegen.after.mir
index 2a9c7408c..cdbc0681c 100644
--- a/src/test/mir-opt/try_identity_e2e.old.PreCodegen.after.mir
+++ b/tests/mir-opt/try_identity_e2e.old.PreCodegen.after.mir
@@ -15,7 +15,7 @@ fn old(_1: Result<T, E>) -> Result<T, E> {
 
     bb0: {
         _2 = discriminant(_1);           // scope 0 at $DIR/try_identity_e2e.rs:+2:15: +2:16
-        switchInt(move _2) -> [0_isize: bb3, 1_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/try_identity_e2e.rs:+2:9: +2:16
+        switchInt(move _2) -> [0: bb3, 1: bb1, otherwise: bb2]; // scope 0 at $DIR/try_identity_e2e.rs:+2:9: +2:16
     }
 
     bb1: {
diff --git a/src/test/mir-opt/try_identity_e2e.rs b/tests/mir-opt/try_identity_e2e.rs
index 00cb80f50..00cb80f50 100644
--- a/src/test/mir-opt/try_identity_e2e.rs
+++ b/tests/mir-opt/try_identity_e2e.rs
diff --git a/tests/mir-opt/uninhabited_enum.process_never.SimplifyLocals-final.after.mir b/tests/mir-opt/uninhabited_enum.process_never.SimplifyLocals-final.after.mir
new file mode 100644
index 000000000..b4fb330f3
--- /dev/null
+++ b/tests/mir-opt/uninhabited_enum.process_never.SimplifyLocals-final.after.mir
@@ -0,0 +1,16 @@
+// MIR for `process_never` after SimplifyLocals-final
+
+fn process_never(_1: *const !) -> () {
+    debug input => _1;                   // in scope 0 at $DIR/uninhabited_enum.rs:+0:22: +0:27
+    let mut _0: ();                      // return place in scope 0 at $DIR/uninhabited_enum.rs:+0:39: +0:39
+    let _2: &!;                          // in scope 0 at $DIR/uninhabited_enum.rs:+1:8: +1:14
+    scope 1 {
+        debug _input => _2;              // in scope 1 at $DIR/uninhabited_enum.rs:+1:8: +1:14
+    }
+    scope 2 {
+    }
+
+    bb0: {
+        unreachable;                     // scope 0 at $DIR/uninhabited_enum.rs:+0:39: +2:2
+    }
+}
diff --git a/tests/mir-opt/uninhabited_enum.process_void.SimplifyLocals-final.after.mir b/tests/mir-opt/uninhabited_enum.process_void.SimplifyLocals-final.after.mir
new file mode 100644
index 000000000..2af864998
--- /dev/null
+++ b/tests/mir-opt/uninhabited_enum.process_void.SimplifyLocals-final.after.mir
@@ -0,0 +1,18 @@
+// MIR for `process_void` after SimplifyLocals-final
+
+fn process_void(_1: *const Void) -> () {
+    debug input => _1;                   // in scope 0 at $DIR/uninhabited_enum.rs:+0:21: +0:26
+    let mut _0: ();                      // return place in scope 0 at $DIR/uninhabited_enum.rs:+0:41: +0:41
+    let _2: &Void;                       // in scope 0 at $DIR/uninhabited_enum.rs:+1:8: +1:14
+    scope 1 {
+        debug _input => _2;              // in scope 1 at $DIR/uninhabited_enum.rs:+1:8: +1:14
+    }
+    scope 2 {
+    }
+
+    bb0: {
+        StorageLive(_2);                 // scope 0 at $DIR/uninhabited_enum.rs:+1:8: +1:14
+        StorageDead(_2);                 // scope 0 at $DIR/uninhabited_enum.rs:+4:1: +4:2
+        return;                          // scope 0 at $DIR/uninhabited_enum.rs:+4:2: +4:2
+    }
+}
diff --git a/tests/mir-opt/uninhabited_enum.rs b/tests/mir-opt/uninhabited_enum.rs
new file mode 100644
index 000000000..19db54815
--- /dev/null
+++ b/tests/mir-opt/uninhabited_enum.rs
@@ -0,0 +1,19 @@
+#![feature(never_type)]
+
+pub enum Void {}
+
+// EMIT_MIR uninhabited_enum.process_never.SimplifyLocals-final.after.mir
+#[no_mangle]
+pub fn process_never(input: *const !) {
+   let _input = unsafe { &*input };
+}
+
+// EMIT_MIR uninhabited_enum.process_void.SimplifyLocals-final.after.mir
+#[no_mangle]
+pub fn process_void(input: *const Void) {
+   let _input = unsafe { &*input };
+   // In the future, this should end with `unreachable`, but we currently only do
+   // unreachability analysis for `!`.
+}
+
+fn main() {}
diff --git a/src/test/mir-opt/uninhabited_enum_branching.main.SimplifyCfg-after-uninhabited-enum-branching.after.mir b/tests/mir-opt/uninhabited_enum_branching.main.SimplifyCfg-after-uninhabited-enum-branching.after.mir
index 4aa5ba007..39ec05277 100644
--- a/src/test/mir-opt/uninhabited_enum_branching.main.SimplifyCfg-after-uninhabited-enum-branching.after.mir
+++ b/tests/mir-opt/uninhabited_enum_branching.main.SimplifyCfg-after-uninhabited-enum-branching.after.mir
@@ -18,7 +18,7 @@ fn main() -> () {
         Deinit(_2);                      // scope 0 at $DIR/uninhabited_enum_branching.rs:+1:11: +1:19
         discriminant(_2) = 2;            // scope 0 at $DIR/uninhabited_enum_branching.rs:+1:11: +1:19
         _3 = discriminant(_2);           // scope 0 at $DIR/uninhabited_enum_branching.rs:+1:11: +1:19
-        switchInt(move _3) -> [2_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/uninhabited_enum_branching.rs:+1:5: +1:19
+        switchInt(move _3) -> [2: bb1, otherwise: bb2]; // scope 0 at $DIR/uninhabited_enum_branching.rs:+1:5: +1:19
     }
 
     bb1: {
@@ -36,7 +36,7 @@ fn main() -> () {
         Deinit(_7);                      // scope 0 at $DIR/uninhabited_enum_branching.rs:+7:11: +7:19
         discriminant(_7) = 0;            // scope 0 at $DIR/uninhabited_enum_branching.rs:+7:11: +7:19
         _8 = discriminant(_7);           // scope 0 at $DIR/uninhabited_enum_branching.rs:+7:11: +7:19
-        switchInt(move _8) -> [4_isize: bb5, 5_isize: bb3, otherwise: bb4]; // scope 0 at $DIR/uninhabited_enum_branching.rs:+7:5: +7:19
+        switchInt(move _8) -> [4: bb5, 5: bb3, otherwise: bb4]; // scope 0 at $DIR/uninhabited_enum_branching.rs:+7:5: +7:19
     }
 
     bb2: {
diff --git a/src/test/mir-opt/uninhabited_enum_branching.main.UninhabitedEnumBranching.diff b/tests/mir-opt/uninhabited_enum_branching.main.UninhabitedEnumBranching.diff
index c3d356aed..598413a1d 100644
--- a/src/test/mir-opt/uninhabited_enum_branching.main.UninhabitedEnumBranching.diff
+++ b/tests/mir-opt/uninhabited_enum_branching.main.UninhabitedEnumBranching.diff
@@ -19,8 +19,8 @@
           Deinit(_2);                      // scope 0 at $DIR/uninhabited_enum_branching.rs:+1:11: +1:19
           discriminant(_2) = 2;            // scope 0 at $DIR/uninhabited_enum_branching.rs:+1:11: +1:19
           _3 = discriminant(_2);           // scope 0 at $DIR/uninhabited_enum_branching.rs:+1:11: +1:19
--         switchInt(move _3) -> [0_isize: bb3, 1_isize: bb4, 2_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/uninhabited_enum_branching.rs:+1:5: +1:19
-+         switchInt(move _3) -> [2_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/uninhabited_enum_branching.rs:+1:5: +1:19
+-         switchInt(move _3) -> [0: bb3, 1: bb4, 2: bb1, otherwise: bb2]; // scope 0 at $DIR/uninhabited_enum_branching.rs:+1:5: +1:19
++         switchInt(move _3) -> [2: bb1, otherwise: bb2]; // scope 0 at $DIR/uninhabited_enum_branching.rs:+1:5: +1:19
       }
   
       bb1: {
@@ -65,7 +65,7 @@
           Deinit(_7);                      // scope 0 at $DIR/uninhabited_enum_branching.rs:+7:11: +7:19
           discriminant(_7) = 0;            // scope 0 at $DIR/uninhabited_enum_branching.rs:+7:11: +7:19
           _8 = discriminant(_7);           // scope 0 at $DIR/uninhabited_enum_branching.rs:+7:11: +7:19
-          switchInt(move _8) -> [4_isize: bb8, 5_isize: bb6, otherwise: bb7]; // scope 0 at $DIR/uninhabited_enum_branching.rs:+7:5: +7:19
+          switchInt(move _8) -> [4: bb8, 5: bb6, otherwise: bb7]; // scope 0 at $DIR/uninhabited_enum_branching.rs:+7:5: +7:19
       }
   
       bb6: {
diff --git a/src/test/mir-opt/uninhabited_enum_branching.rs b/tests/mir-opt/uninhabited_enum_branching.rs
index 0ef604c30..0ef604c30 100644
--- a/src/test/mir-opt/uninhabited_enum_branching.rs
+++ b/tests/mir-opt/uninhabited_enum_branching.rs
diff --git a/src/test/mir-opt/uninhabited_enum_branching2.main.SimplifyCfg-after-uninhabited-enum-branching.after.mir b/tests/mir-opt/uninhabited_enum_branching2.main.SimplifyCfg-after-uninhabited-enum-branching.after.mir
index ec5612ad7..c8cd6f6c1 100644
--- a/src/test/mir-opt/uninhabited_enum_branching2.main.SimplifyCfg-after-uninhabited-enum-branching.after.mir
+++ b/tests/mir-opt/uninhabited_enum_branching2.main.SimplifyCfg-after-uninhabited-enum-branching.after.mir
@@ -32,7 +32,7 @@ fn main() -> () {
         StorageLive(_4);                 // scope 1 at $DIR/uninhabited_enum_branching2.rs:+3:11: +3:22
         _4 = &(_1.1: Test1);             // scope 1 at $DIR/uninhabited_enum_branching2.rs:+3:11: +3:22
         _5 = discriminant((*_4));        // scope 1 at $DIR/uninhabited_enum_branching2.rs:+3:11: +3:22
-        switchInt(move _5) -> [2_isize: bb3, 3_isize: bb1, otherwise: bb2]; // scope 1 at $DIR/uninhabited_enum_branching2.rs:+3:5: +3:22
+        switchInt(move _5) -> [2: bb3, 3: bb1, otherwise: bb2]; // scope 1 at $DIR/uninhabited_enum_branching2.rs:+3:5: +3:22
     }
 
     bb1: {
@@ -66,7 +66,7 @@ fn main() -> () {
         StorageDead(_3);                 // scope 1 at $DIR/uninhabited_enum_branching2.rs:+8:6: +8:7
         StorageLive(_9);                 // scope 1 at $DIR/uninhabited_enum_branching2.rs:+10:5: +15:6
         _10 = discriminant((_1.1: Test1)); // scope 1 at $DIR/uninhabited_enum_branching2.rs:+10:11: +10:21
-        switchInt(move _10) -> [2_isize: bb7, 3_isize: bb5, otherwise: bb6]; // scope 1 at $DIR/uninhabited_enum_branching2.rs:+10:5: +10:21
+        switchInt(move _10) -> [2: bb7, 3: bb5, otherwise: bb6]; // scope 1 at $DIR/uninhabited_enum_branching2.rs:+10:5: +10:21
     }
 
     bb5: {
diff --git a/src/test/mir-opt/uninhabited_enum_branching2.main.UninhabitedEnumBranching.diff b/tests/mir-opt/uninhabited_enum_branching2.main.UninhabitedEnumBranching.diff
index 77b358a48..2aee6d268 100644
--- a/src/test/mir-opt/uninhabited_enum_branching2.main.UninhabitedEnumBranching.diff
+++ b/tests/mir-opt/uninhabited_enum_branching2.main.UninhabitedEnumBranching.diff
@@ -33,8 +33,8 @@
           StorageLive(_4);                 // scope 1 at $DIR/uninhabited_enum_branching2.rs:+3:11: +3:22
           _4 = &(_1.1: Test1);             // scope 1 at $DIR/uninhabited_enum_branching2.rs:+3:11: +3:22
           _5 = discriminant((*_4));        // scope 1 at $DIR/uninhabited_enum_branching2.rs:+3:11: +3:22
--         switchInt(move _5) -> [0_isize: bb3, 1_isize: bb4, 2_isize: bb5, 3_isize: bb1, otherwise: bb2]; // scope 1 at $DIR/uninhabited_enum_branching2.rs:+3:5: +3:22
-+         switchInt(move _5) -> [2_isize: bb5, 3_isize: bb1, otherwise: bb2]; // scope 1 at $DIR/uninhabited_enum_branching2.rs:+3:5: +3:22
+-         switchInt(move _5) -> [0: bb3, 1: bb4, 2: bb5, 3: bb1, otherwise: bb2]; // scope 1 at $DIR/uninhabited_enum_branching2.rs:+3:5: +3:22
++         switchInt(move _5) -> [2: bb5, 3: bb1, otherwise: bb2]; // scope 1 at $DIR/uninhabited_enum_branching2.rs:+3:5: +3:22
       }
   
       bb1: {
@@ -87,8 +87,8 @@
           StorageDead(_3);                 // scope 1 at $DIR/uninhabited_enum_branching2.rs:+8:6: +8:7
           StorageLive(_9);                 // scope 1 at $DIR/uninhabited_enum_branching2.rs:+10:5: +15:6
           _10 = discriminant((_1.1: Test1)); // scope 1 at $DIR/uninhabited_enum_branching2.rs:+10:11: +10:21
--         switchInt(move _10) -> [0_isize: bb9, 1_isize: bb10, 2_isize: bb11, 3_isize: bb7, otherwise: bb8]; // scope 1 at $DIR/uninhabited_enum_branching2.rs:+10:5: +10:21
-+         switchInt(move _10) -> [2_isize: bb11, 3_isize: bb7, otherwise: bb8]; // scope 1 at $DIR/uninhabited_enum_branching2.rs:+10:5: +10:21
+-         switchInt(move _10) -> [0: bb9, 1: bb10, 2: bb11, 3: bb7, otherwise: bb8]; // scope 1 at $DIR/uninhabited_enum_branching2.rs:+10:5: +10:21
++         switchInt(move _10) -> [2: bb11, 3: bb7, otherwise: bb8]; // scope 1 at $DIR/uninhabited_enum_branching2.rs:+10:5: +10:21
       }
   
       bb7: {
diff --git a/src/test/mir-opt/uninhabited_enum_branching2.rs b/tests/mir-opt/uninhabited_enum_branching2.rs
index e22e94314..e22e94314 100644
--- a/src/test/mir-opt/uninhabited_enum_branching2.rs
+++ b/tests/mir-opt/uninhabited_enum_branching2.rs
diff --git a/src/test/mir-opt/uninhabited_fallthrough_elimination.eliminate_fallthrough.UninhabitedEnumBranching.diff b/tests/mir-opt/uninhabited_fallthrough_elimination.eliminate_fallthrough.UninhabitedEnumBranching.diff
index 11d93fca7..58e085dd0 100644
--- a/src/test/mir-opt/uninhabited_fallthrough_elimination.eliminate_fallthrough.UninhabitedEnumBranching.diff
+++ b/tests/mir-opt/uninhabited_fallthrough_elimination.eliminate_fallthrough.UninhabitedEnumBranching.diff
@@ -8,8 +8,8 @@
   
       bb0: {
           _2 = discriminant(_1);           // scope 0 at $DIR/uninhabited_fallthrough_elimination.rs:+1:11: +1:12
--         switchInt(move _2) -> [1_isize: bb3, 2_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/uninhabited_fallthrough_elimination.rs:+1:5: +1:12
-+         switchInt(move _2) -> [1_isize: bb3, 2_isize: bb2, otherwise: bb5]; // scope 0 at $DIR/uninhabited_fallthrough_elimination.rs:+1:5: +1:12
+-         switchInt(move _2) -> [1: bb3, 2: bb2, otherwise: bb1]; // scope 0 at $DIR/uninhabited_fallthrough_elimination.rs:+1:5: +1:12
++         switchInt(move _2) -> [1: bb3, 2: bb2, otherwise: bb5]; // scope 0 at $DIR/uninhabited_fallthrough_elimination.rs:+1:5: +1:12
       }
   
       bb1: {
diff --git a/src/test/mir-opt/uninhabited_fallthrough_elimination.keep_fallthrough.UninhabitedEnumBranching.diff b/tests/mir-opt/uninhabited_fallthrough_elimination.keep_fallthrough.UninhabitedEnumBranching.diff
index a7f8321ae..e765851eb 100644
--- a/src/test/mir-opt/uninhabited_fallthrough_elimination.keep_fallthrough.UninhabitedEnumBranching.diff
+++ b/tests/mir-opt/uninhabited_fallthrough_elimination.keep_fallthrough.UninhabitedEnumBranching.diff
@@ -8,8 +8,8 @@
   
       bb0: {
           _2 = discriminant(_1);           // scope 0 at $DIR/uninhabited_fallthrough_elimination.rs:+1:11: +1:12
--         switchInt(move _2) -> [0_isize: bb2, 1_isize: bb3, otherwise: bb1]; // scope 0 at $DIR/uninhabited_fallthrough_elimination.rs:+1:5: +1:12
-+         switchInt(move _2) -> [1_isize: bb3, otherwise: bb1]; // scope 0 at $DIR/uninhabited_fallthrough_elimination.rs:+1:5: +1:12
+-         switchInt(move _2) -> [0: bb2, 1: bb3, otherwise: bb1]; // scope 0 at $DIR/uninhabited_fallthrough_elimination.rs:+1:5: +1:12
++         switchInt(move _2) -> [1: bb3, otherwise: bb1]; // scope 0 at $DIR/uninhabited_fallthrough_elimination.rs:+1:5: +1:12
       }
   
       bb1: {
diff --git a/src/test/mir-opt/uninhabited_fallthrough_elimination.rs b/tests/mir-opt/uninhabited_fallthrough_elimination.rs
index 0853883f8..0853883f8 100644
--- a/src/test/mir-opt/uninhabited_fallthrough_elimination.rs
+++ b/tests/mir-opt/uninhabited_fallthrough_elimination.rs
diff --git a/src/test/mir-opt/unreachable.main.UnreachablePropagation.diff b/tests/mir-opt/unreachable.main.UnreachablePropagation.diff
index 9cd4b8ccf..848bff1d4 100644
--- a/src/test/mir-opt/unreachable.main.UnreachablePropagation.diff
+++ b/tests/mir-opt/unreachable.main.UnreachablePropagation.diff
@@ -27,8 +27,8 @@
   
       bb1: {
           _2 = discriminant(_1);           // scope 1 at $DIR/unreachable.rs:+1:12: +1:20
--         switchInt(move _2) -> [1_isize: bb2, otherwise: bb6]; // scope 1 at $DIR/unreachable.rs:+1:12: +1:20
-+         switchInt(move _2) -> [1_isize: bb2, otherwise: bb3]; // scope 1 at $DIR/unreachable.rs:+1:12: +1:20
+-         switchInt(move _2) -> [1: bb2, otherwise: bb6]; // scope 1 at $DIR/unreachable.rs:+1:12: +1:20
++         switchInt(move _2) -> [1: bb2, otherwise: bb3]; // scope 1 at $DIR/unreachable.rs:+1:12: +1:20
       }
   
       bb2: {
@@ -38,7 +38,7 @@
 -         StorageLive(_5);                 // scope 2 at $DIR/unreachable.rs:+4:9: +8:10
 -         StorageLive(_6);                 // scope 2 at $DIR/unreachable.rs:+4:12: +4:16
 -         _6 = const true;                 // scope 2 at $DIR/unreachable.rs:+4:12: +4:16
--         switchInt(move _6) -> [false: bb4, otherwise: bb3]; // scope 2 at $DIR/unreachable.rs:+4:12: +4:16
+-         switchInt(move _6) -> [0: bb4, otherwise: bb3]; // scope 2 at $DIR/unreachable.rs:+4:12: +4:16
 +         unreachable;                     // scope 2 at $DIR/unreachable.rs:+4:12: +4:16
       }
   
diff --git a/src/test/mir-opt/unreachable.rs b/tests/mir-opt/unreachable.rs
index 6098b525b..6098b525b 100644
--- a/src/test/mir-opt/unreachable.rs
+++ b/tests/mir-opt/unreachable.rs
diff --git a/src/test/mir-opt/unreachable_diverging.main.UnreachablePropagation.diff b/tests/mir-opt/unreachable_diverging.main.UnreachablePropagation.diff
index afd6b00aa..fb778470e 100644
--- a/src/test/mir-opt/unreachable_diverging.main.UnreachablePropagation.diff
+++ b/tests/mir-opt/unreachable_diverging.main.UnreachablePropagation.diff
@@ -29,7 +29,7 @@
   
       bb1: {
           _3 = discriminant(_2);           // scope 2 at $DIR/unreachable_diverging.rs:+2:12: +2:22
-          switchInt(move _3) -> [1_isize: bb2, otherwise: bb6]; // scope 2 at $DIR/unreachable_diverging.rs:+2:12: +2:22
+          switchInt(move _3) -> [1: bb2, otherwise: bb6]; // scope 2 at $DIR/unreachable_diverging.rs:+2:12: +2:22
       }
   
       bb2: {
@@ -38,7 +38,7 @@
           StorageLive(_5);                 // scope 2 at $DIR/unreachable_diverging.rs:+3:9: +5:10
           StorageLive(_6);                 // scope 2 at $DIR/unreachable_diverging.rs:+3:12: +3:13
           _6 = _1;                         // scope 2 at $DIR/unreachable_diverging.rs:+3:12: +3:13
-          switchInt(move _6) -> [false: bb4, otherwise: bb3]; // scope 2 at $DIR/unreachable_diverging.rs:+3:12: +3:13
+          switchInt(move _6) -> [0: bb4, otherwise: bb3]; // scope 2 at $DIR/unreachable_diverging.rs:+3:12: +3:13
       }
   
       bb3: {
diff --git a/src/test/mir-opt/unreachable_diverging.rs b/tests/mir-opt/unreachable_diverging.rs
index bbf28efc7..bbf28efc7 100644
--- a/src/test/mir-opt/unreachable_diverging.rs
+++ b/tests/mir-opt/unreachable_diverging.rs
diff --git a/src/test/mir-opt/unusual_item_types.E-V-{constant#0}.built.after.mir b/tests/mir-opt/unusual_item_types.E-V-{constant#0}.built.after.mir
index 5257491f0..5257491f0 100644
--- a/src/test/mir-opt/unusual_item_types.E-V-{constant#0}.built.after.mir
+++ b/tests/mir-opt/unusual_item_types.E-V-{constant#0}.built.after.mir
diff --git a/src/test/mir-opt/unusual_item_types.Test-X-{constructor#0}.built.after.mir b/tests/mir-opt/unusual_item_types.Test-X-{constructor#0}.built.after.mir
index ee0296763..ee0296763 100644
--- a/src/test/mir-opt/unusual_item_types.Test-X-{constructor#0}.built.after.mir
+++ b/tests/mir-opt/unusual_item_types.Test-X-{constructor#0}.built.after.mir
diff --git a/src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir b/tests/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir
index ed9f3bdbd..ed9f3bdbd 100644
--- a/src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir
+++ b/tests/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir
diff --git a/src/test/mir-opt/unusual_item_types.rs b/tests/mir-opt/unusual_item_types.rs
index 6dad63641..6dad63641 100644
--- a/src/test/mir-opt/unusual_item_types.rs
+++ b/tests/mir-opt/unusual_item_types.rs
diff --git a/src/test/mir-opt/unusual_item_types.{impl#0}-ASSOCIATED_CONSTANT.built.after.mir b/tests/mir-opt/unusual_item_types.{impl#0}-ASSOCIATED_CONSTANT.built.after.mir
index 90444b481..90444b481 100644
--- a/src/test/mir-opt/unusual_item_types.{impl#0}-ASSOCIATED_CONSTANT.built.after.mir
+++ b/tests/mir-opt/unusual_item_types.{impl#0}-ASSOCIATED_CONSTANT.built.after.mir
diff --git a/tests/mir-opt/while_let_loops.change_loop_body.ConstProp.diff b/tests/mir-opt/while_let_loops.change_loop_body.ConstProp.diff
new file mode 100644
index 000000000..bb1de59d4
--- /dev/null
+++ b/tests/mir-opt/while_let_loops.change_loop_body.ConstProp.diff
@@ -0,0 +1,46 @@
+- // MIR for `change_loop_body` before ConstProp
++ // MIR for `change_loop_body` after ConstProp
+  
+  fn change_loop_body() -> () {
+      let mut _0: ();                      // return place in scope 0 at $DIR/while_let_loops.rs:+0:27: +0:27
+      let mut _1: i32;                     // in scope 0 at $DIR/while_let_loops.rs:+1:9: +1:15
+      let mut _2: std::option::Option<u32>; // in scope 0 at $DIR/while_let_loops.rs:+2:28: +2:32
+      let mut _3: isize;                   // in scope 0 at $DIR/while_let_loops.rs:+2:15: +2:25
+      scope 1 {
+          debug _x => _1;                  // in scope 1 at $DIR/while_let_loops.rs:+1:9: +1:15
+          scope 2 {
+          }
+      }
+  
+      bb0: {
+          StorageLive(_1);                 // scope 0 at $DIR/while_let_loops.rs:+1:9: +1:15
+          _1 = const 0_i32;                // scope 0 at $DIR/while_let_loops.rs:+1:18: +1:19
+          StorageLive(_2);                 // scope 2 at $DIR/while_let_loops.rs:+2:28: +2:32
+          Deinit(_2);                      // scope 2 at $DIR/while_let_loops.rs:+2:28: +2:32
+          discriminant(_2) = 0;            // scope 2 at $DIR/while_let_loops.rs:+2:28: +2:32
+-         _3 = discriminant(_2);           // scope 2 at $DIR/while_let_loops.rs:+2:15: +2:25
+-         switchInt(move _3) -> [1: bb1, otherwise: bb3]; // scope 2 at $DIR/while_let_loops.rs:+2:15: +2:25
++         _3 = const 0_isize;              // scope 2 at $DIR/while_let_loops.rs:+2:15: +2:25
++         switchInt(const 0_isize) -> [1: bb1, otherwise: bb3]; // scope 2 at $DIR/while_let_loops.rs:+2:15: +2:25
+      }
+  
+      bb1: {
+          switchInt(((_2 as Some).0: u32)) -> [0: bb2, otherwise: bb3]; // scope 2 at $DIR/while_let_loops.rs:+2:15: +2:25
+      }
+  
+      bb2: {
+          _1 = const 1_i32;                // scope 2 at $DIR/while_let_loops.rs:+3:9: +3:15
+          goto -> bb4;                     // scope 2 at $DIR/while_let_loops.rs:+4:9: +4:14
+      }
+  
+      bb3: {
+          goto -> bb4;                     // scope 1 at no-location
+      }
+  
+      bb4: {
+          StorageDead(_2);                 // scope 1 at $DIR/while_let_loops.rs:+5:5: +5:6
+          StorageDead(_1);                 // scope 0 at $DIR/while_let_loops.rs:+6:1: +6:2
+          return;                          // scope 0 at $DIR/while_let_loops.rs:+6:2: +6:2
+      }
+  }
+  
diff --git a/src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir b/tests/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir
index 15b0aece8..15b0aece8 100644
--- a/src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir
+++ b/tests/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir
diff --git a/src/test/mir-opt/while_let_loops.rs b/tests/mir-opt/while_let_loops.rs
index fc56cd698..fc56cd698 100644
--- a/src/test/mir-opt/while_let_loops.rs
+++ b/tests/mir-opt/while_let_loops.rs
diff --git a/src/test/mir-opt/while_storage.rs b/tests/mir-opt/while_storage.rs
index afd083acb..afd083acb 100644
--- a/src/test/mir-opt/while_storage.rs
+++ b/tests/mir-opt/while_storage.rs
diff --git a/src/test/mir-opt/while_storage.while_loop.PreCodegen.after.mir b/tests/mir-opt/while_storage.while_loop.PreCodegen.after.mir
index 68aa3e5db..b95d91b13 100644
--- a/src/test/mir-opt/while_storage.while_loop.PreCodegen.after.mir
+++ b/tests/mir-opt/while_storage.while_loop.PreCodegen.after.mir
@@ -24,7 +24,7 @@ fn while_loop(_1: bool) -> () {
 
     bb2: {
         StorageDead(_3);                 // scope 0 at $DIR/while_storage.rs:+1:21: +1:22
-        switchInt(move _2) -> [false: bb7, otherwise: bb3]; // scope 0 at $DIR/while_storage.rs:+1:11: +1:22
+        switchInt(move _2) -> [0: bb7, otherwise: bb3]; // scope 0 at $DIR/while_storage.rs:+1:11: +1:22
     }
 
     bb3: {
@@ -39,12 +39,12 @@ fn while_loop(_1: bool) -> () {
 
     bb4: {
         StorageDead(_5);                 // scope 0 at $DIR/while_storage.rs:+2:22: +2:23
-        switchInt(move _4) -> [false: bb6, otherwise: bb5]; // scope 0 at $DIR/while_storage.rs:+2:12: +2:23
+        switchInt(move _4) -> [0: bb6, otherwise: bb5]; // scope 0 at $DIR/while_storage.rs:+2:12: +2:23
     }
 
     bb5: {
         StorageDead(_4);                 // scope 0 at $DIR/while_storage.rs:+4:9: +4:10
-        goto -> bb8;                     // scope 0 at no-location
+        goto -> bb7;                     // scope 0 at no-location
     }
 
     bb6: {
@@ -54,10 +54,6 @@ fn while_loop(_1: bool) -> () {
     }
 
     bb7: {
-        goto -> bb8;                     // scope 0 at no-location
-    }
-
-    bb8: {
         StorageDead(_2);                 // scope 0 at $DIR/while_storage.rs:+5:5: +5:6
         return;                          // scope 0 at $DIR/while_storage.rs:+6:2: +6:2
     }
diff --git a/src/test/pretty/asm.pp b/tests/pretty/asm.pp
index 5eade2933..5eade2933 100644
--- a/src/test/pretty/asm.pp
+++ b/tests/pretty/asm.pp
diff --git a/src/test/pretty/asm.rs b/tests/pretty/asm.rs
index 1a3f972c8..1a3f972c8 100644
--- a/src/test/pretty/asm.rs
+++ b/tests/pretty/asm.rs
diff --git a/src/test/pretty/ast-stmt-expr-attr.rs b/tests/pretty/ast-stmt-expr-attr.rs
index 27c86ec22..27c86ec22 100644
--- a/src/test/pretty/ast-stmt-expr-attr.rs
+++ b/tests/pretty/ast-stmt-expr-attr.rs
diff --git a/src/test/pretty/async.rs b/tests/pretty/async.rs
index 573e79bff..573e79bff 100644
--- a/src/test/pretty/async.rs
+++ b/tests/pretty/async.rs
diff --git a/src/test/pretty/attr-derive.rs b/tests/pretty/attr-derive.rs
index 0eb403c6b..0eb403c6b 100644
--- a/src/test/pretty/attr-derive.rs
+++ b/tests/pretty/attr-derive.rs
diff --git a/src/test/pretty/attr-fn-inner.rs b/tests/pretty/attr-fn-inner.rs
index 6d9cb89f0..6d9cb89f0 100644
--- a/src/test/pretty/attr-fn-inner.rs
+++ b/tests/pretty/attr-fn-inner.rs
diff --git a/src/test/pretty/attr-literals.rs b/tests/pretty/attr-literals.rs
index d13201442..d13201442 100644
--- a/src/test/pretty/attr-literals.rs
+++ b/tests/pretty/attr-literals.rs
diff --git a/src/test/pretty/attr-tokens-raw-ident.rs b/tests/pretty/attr-tokens-raw-ident.rs
index 8486342b0..8486342b0 100644
--- a/src/test/pretty/attr-tokens-raw-ident.rs
+++ b/tests/pretty/attr-tokens-raw-ident.rs
diff --git a/src/test/pretty/auto-trait.rs b/tests/pretty/auto-trait.rs
index c3c47cff5..c3c47cff5 100644
--- a/src/test/pretty/auto-trait.rs
+++ b/tests/pretty/auto-trait.rs
diff --git a/src/test/pretty/auxiliary/derive-foo.rs b/tests/pretty/auxiliary/derive-foo.rs
index 675a93b3d..675a93b3d 100644
--- a/src/test/pretty/auxiliary/derive-foo.rs
+++ b/tests/pretty/auxiliary/derive-foo.rs
diff --git a/src/test/pretty/blank-lines.rs b/tests/pretty/blank-lines.rs
index b9153d048..b9153d048 100644
--- a/src/test/pretty/blank-lines.rs
+++ b/tests/pretty/blank-lines.rs
diff --git a/src/test/pretty/block-comment-multiple-asterisks.rs b/tests/pretty/block-comment-multiple-asterisks.rs
index bb090b746..bb090b746 100644
--- a/src/test/pretty/block-comment-multiple-asterisks.rs
+++ b/tests/pretty/block-comment-multiple-asterisks.rs
diff --git a/src/test/pretty/block-comment-trailing-whitespace.rs b/tests/pretty/block-comment-trailing-whitespace.rs
index 4d502f603..4d502f603 100644
--- a/src/test/pretty/block-comment-trailing-whitespace.rs
+++ b/tests/pretty/block-comment-trailing-whitespace.rs
diff --git a/src/test/pretty/block-comment-trailing-whitespace2.rs b/tests/pretty/block-comment-trailing-whitespace2.rs
index e53d51e34..e53d51e34 100644
--- a/src/test/pretty/block-comment-trailing-whitespace2.rs
+++ b/tests/pretty/block-comment-trailing-whitespace2.rs
diff --git a/src/test/pretty/block-comment-wchar.pp b/tests/pretty/block-comment-wchar.pp
index 8c8580b07..9d64fb415 100644
--- a/src/test/pretty/block-comment-wchar.pp
+++ b/tests/pretty/block-comment-wchar.pp
@@ -1,6 +1,6 @@
 // This is meant as a test case for Issue 3961.
 //
-// Test via: rustc -Zunpretty normal src/test/pretty/block-comment-wchar.rs
+// Test via: rustc -Zunpretty normal tests/pretty/block-comment-wchar.rs
 // ignore-tidy-cr
 // ignore-tidy-tab
 // pp-exact:block-comment-wchar.pp
diff --git a/src/test/pretty/block-comment-wchar.rs b/tests/pretty/block-comment-wchar.rs
index e0606e497..c042ea685 100644
--- a/src/test/pretty/block-comment-wchar.rs
+++ b/tests/pretty/block-comment-wchar.rs
@@ -1,6 +1,6 @@
 // This is meant as a test case for Issue 3961.
 //
-// Test via: rustc -Zunpretty normal src/test/pretty/block-comment-wchar.rs
+// Test via: rustc -Zunpretty normal tests/pretty/block-comment-wchar.rs
 // ignore-tidy-cr
 // ignore-tidy-tab
 // pp-exact:block-comment-wchar.pp
diff --git a/src/test/pretty/block-disambig.rs b/tests/pretty/block-disambig.rs
index ac9b84a5d..ac9b84a5d 100644
--- a/src/test/pretty/block-disambig.rs
+++ b/tests/pretty/block-disambig.rs
diff --git a/src/test/pretty/cast-lt.pp b/tests/pretty/cast-lt.pp
index e6c4d1956..e6c4d1956 100644
--- a/src/test/pretty/cast-lt.pp
+++ b/tests/pretty/cast-lt.pp
diff --git a/src/test/pretty/cast-lt.rs b/tests/pretty/cast-lt.rs
index e14bdd1f3..e14bdd1f3 100644
--- a/src/test/pretty/cast-lt.rs
+++ b/tests/pretty/cast-lt.rs
diff --git a/src/test/pretty/closure-reform-pretty.rs b/tests/pretty/closure-reform-pretty.rs
index 1eba1e6bd..1eba1e6bd 100644
--- a/src/test/pretty/closure-reform-pretty.rs
+++ b/tests/pretty/closure-reform-pretty.rs
diff --git a/src/test/pretty/delimited-token-groups.rs b/tests/pretty/delimited-token-groups.rs
index c7c9277fa..c7c9277fa 100644
--- a/src/test/pretty/delimited-token-groups.rs
+++ b/tests/pretty/delimited-token-groups.rs
diff --git a/src/test/pretty/disamb-stmt-expr.rs b/tests/pretty/disamb-stmt-expr.rs
index 734f9fa12..734f9fa12 100644
--- a/src/test/pretty/disamb-stmt-expr.rs
+++ b/tests/pretty/disamb-stmt-expr.rs
diff --git a/src/test/pretty/do1.rs b/tests/pretty/do1.rs
index 233ccdb00..233ccdb00 100644
--- a/src/test/pretty/do1.rs
+++ b/tests/pretty/do1.rs
diff --git a/src/test/pretty/doc-comments.rs b/tests/pretty/doc-comments.rs
index a49860daa..a49860daa 100644
--- a/src/test/pretty/doc-comments.rs
+++ b/tests/pretty/doc-comments.rs
diff --git a/src/test/pretty/dollar-crate.pp b/tests/pretty/dollar-crate.pp
index 3af37955f..3af37955f 100644
--- a/src/test/pretty/dollar-crate.pp
+++ b/tests/pretty/dollar-crate.pp
diff --git a/src/test/pretty/dollar-crate.rs b/tests/pretty/dollar-crate.rs
index e46bc7f48..e46bc7f48 100644
--- a/src/test/pretty/dollar-crate.rs
+++ b/tests/pretty/dollar-crate.rs
diff --git a/src/test/pretty/empty-impl.rs b/tests/pretty/empty-impl.rs
index d57093359..d57093359 100644
--- a/src/test/pretty/empty-impl.rs
+++ b/tests/pretty/empty-impl.rs
diff --git a/src/test/pretty/empty-lines.rs b/tests/pretty/empty-lines.rs
index 15d7625d4..15d7625d4 100644
--- a/src/test/pretty/empty-lines.rs
+++ b/tests/pretty/empty-lines.rs
diff --git a/src/test/pretty/enum-variant-vis.rs b/tests/pretty/enum-variant-vis.rs
index fc646c295..fc646c295 100644
--- a/src/test/pretty/enum-variant-vis.rs
+++ b/tests/pretty/enum-variant-vis.rs
diff --git a/src/test/pretty/example1.rs b/tests/pretty/example1.rs
index 8df74e8e1..8df74e8e1 100644
--- a/src/test/pretty/example1.rs
+++ b/tests/pretty/example1.rs
diff --git a/src/test/pretty/example2.pp b/tests/pretty/example2.pp
index 3f7129afd..3f7129afd 100644
--- a/src/test/pretty/example2.pp
+++ b/tests/pretty/example2.pp
diff --git a/src/test/pretty/example2.rs b/tests/pretty/example2.rs
index 3f7129afd..3f7129afd 100644
--- a/src/test/pretty/example2.rs
+++ b/tests/pretty/example2.rs
diff --git a/src/test/pretty/expanded-and-path-remap-80832.pp b/tests/pretty/expanded-and-path-remap-80832.pp
index 8385c5fa8..8385c5fa8 100644
--- a/src/test/pretty/expanded-and-path-remap-80832.pp
+++ b/tests/pretty/expanded-and-path-remap-80832.pp
diff --git a/src/test/pretty/expanded-and-path-remap-80832.rs b/tests/pretty/expanded-and-path-remap-80832.rs
index f48441fbc..f48441fbc 100644
--- a/src/test/pretty/expanded-and-path-remap-80832.rs
+++ b/tests/pretty/expanded-and-path-remap-80832.rs
diff --git a/src/test/pretty/fn-return.rs b/tests/pretty/fn-return.rs
index b932e83aa..b932e83aa 100644
--- a/src/test/pretty/fn-return.rs
+++ b/tests/pretty/fn-return.rs
diff --git a/src/test/pretty/fn-types.rs b/tests/pretty/fn-types.rs
index f012763c3..f012763c3 100644
--- a/src/test/pretty/fn-types.rs
+++ b/tests/pretty/fn-types.rs
diff --git a/src/test/pretty/fn-variadic.rs b/tests/pretty/fn-variadic.rs
index 59e477cfa..59e477cfa 100644
--- a/src/test/pretty/fn-variadic.rs
+++ b/tests/pretty/fn-variadic.rs
diff --git a/src/test/pretty/for-comment.rs b/tests/pretty/for-comment.rs
index 447e7f918..447e7f918 100644
--- a/src/test/pretty/for-comment.rs
+++ b/tests/pretty/for-comment.rs
diff --git a/src/test/pretty/gat-bounds.rs b/tests/pretty/gat-bounds.rs
index 0a361a383..0a361a383 100644
--- a/src/test/pretty/gat-bounds.rs
+++ b/tests/pretty/gat-bounds.rs
diff --git a/src/test/pretty/hir-pretty-loop.pp b/tests/pretty/hir-pretty-loop.pp
index a59a3002c..a59a3002c 100644
--- a/src/test/pretty/hir-pretty-loop.pp
+++ b/tests/pretty/hir-pretty-loop.pp
diff --git a/src/test/pretty/hir-pretty-loop.rs b/tests/pretty/hir-pretty-loop.rs
index 87a3ef8b8..87a3ef8b8 100644
--- a/src/test/pretty/hir-pretty-loop.rs
+++ b/tests/pretty/hir-pretty-loop.rs
diff --git a/src/test/pretty/if-attr.rs b/tests/pretty/if-attr.rs
index 7b90b0bec..7b90b0bec 100644
--- a/src/test/pretty/if-attr.rs
+++ b/tests/pretty/if-attr.rs
diff --git a/src/test/pretty/import-renames.rs b/tests/pretty/import-renames.rs
index ce6b5058b..ce6b5058b 100644
--- a/src/test/pretty/import-renames.rs
+++ b/tests/pretty/import-renames.rs
diff --git a/src/test/pretty/issue-12590-a.rs b/tests/pretty/issue-12590-a.rs
index 3c88f5cb8..3c88f5cb8 100644
--- a/src/test/pretty/issue-12590-a.rs
+++ b/tests/pretty/issue-12590-a.rs
diff --git a/src/test/pretty/issue-12590-b.rs b/tests/pretty/issue-12590-b.rs
index b14c7afa2..b14c7afa2 100644
--- a/src/test/pretty/issue-12590-b.rs
+++ b/tests/pretty/issue-12590-b.rs
diff --git a/src/test/pretty/issue-12590-c.pp b/tests/pretty/issue-12590-c.pp
index 07b3f5653..07b3f5653 100644
--- a/src/test/pretty/issue-12590-c.pp
+++ b/tests/pretty/issue-12590-c.pp
diff --git a/src/test/pretty/issue-12590-c.rs b/tests/pretty/issue-12590-c.rs
index 0ec05f9a8..0ec05f9a8 100644
--- a/src/test/pretty/issue-12590-c.rs
+++ b/tests/pretty/issue-12590-c.rs
diff --git a/src/test/pretty/issue-19077.rs b/tests/pretty/issue-19077.rs
index 0d2702804..0d2702804 100644
--- a/src/test/pretty/issue-19077.rs
+++ b/tests/pretty/issue-19077.rs
diff --git a/src/test/pretty/issue-25031.rs b/tests/pretty/issue-25031.rs
index d91494891..d91494891 100644
--- a/src/test/pretty/issue-25031.rs
+++ b/tests/pretty/issue-25031.rs
diff --git a/src/test/pretty/issue-30731.rs b/tests/pretty/issue-30731.rs
index 607cbebee..607cbebee 100644
--- a/src/test/pretty/issue-30731.rs
+++ b/tests/pretty/issue-30731.rs
diff --git a/src/test/pretty/issue-31073.pp b/tests/pretty/issue-31073.pp
index 75795f6d5..75795f6d5 100644
--- a/src/test/pretty/issue-31073.pp
+++ b/tests/pretty/issue-31073.pp
diff --git a/src/test/pretty/issue-31073.rs b/tests/pretty/issue-31073.rs
index 75795f6d5..75795f6d5 100644
--- a/src/test/pretty/issue-31073.rs
+++ b/tests/pretty/issue-31073.rs
diff --git a/src/test/pretty/issue-4264.pp b/tests/pretty/issue-4264.pp
index 18e6d75b1..18e6d75b1 100644
--- a/src/test/pretty/issue-4264.pp
+++ b/tests/pretty/issue-4264.pp
diff --git a/src/test/pretty/issue-4264.rs b/tests/pretty/issue-4264.rs
index 3dea81129..3dea81129 100644
--- a/src/test/pretty/issue-4264.rs
+++ b/tests/pretty/issue-4264.rs
diff --git a/src/test/pretty/issue-68710-field-attr-proc-mac-lost.rs b/tests/pretty/issue-68710-field-attr-proc-mac-lost.rs
index 80f739f4f..80f739f4f 100644
--- a/src/test/pretty/issue-68710-field-attr-proc-mac-lost.rs
+++ b/tests/pretty/issue-68710-field-attr-proc-mac-lost.rs
diff --git a/src/test/pretty/issue-73626.rs b/tests/pretty/issue-73626.rs
index a002f09be..a002f09be 100644
--- a/src/test/pretty/issue-73626.rs
+++ b/tests/pretty/issue-73626.rs
diff --git a/src/test/pretty/issue-74745.rs b/tests/pretty/issue-74745.rs
index e255cd6ca..e255cd6ca 100644
--- a/src/test/pretty/issue-74745.rs
+++ b/tests/pretty/issue-74745.rs
diff --git a/src/test/pretty/issue-85089.pp b/tests/pretty/issue-85089.pp
index f84e9df04..f84e9df04 100644
--- a/src/test/pretty/issue-85089.pp
+++ b/tests/pretty/issue-85089.pp
diff --git a/src/test/pretty/issue-85089.rs b/tests/pretty/issue-85089.rs
index eb45d4731..eb45d4731 100644
--- a/src/test/pretty/issue-85089.rs
+++ b/tests/pretty/issue-85089.rs
diff --git a/src/test/pretty/let.rs b/tests/pretty/let.rs
index 20ffb7578..20ffb7578 100644
--- a/src/test/pretty/let.rs
+++ b/tests/pretty/let.rs
diff --git a/src/test/pretty/lifetime.rs b/tests/pretty/lifetime.rs
index 34eae849b..34eae849b 100644
--- a/src/test/pretty/lifetime.rs
+++ b/tests/pretty/lifetime.rs
diff --git a/src/test/pretty/macro.rs b/tests/pretty/macro.rs
index b88ae7039..b88ae7039 100644
--- a/src/test/pretty/macro.rs
+++ b/tests/pretty/macro.rs
diff --git a/src/test/pretty/macro_rules.rs b/tests/pretty/macro_rules.rs
index 01adb1413..01adb1413 100644
--- a/src/test/pretty/macro_rules.rs
+++ b/tests/pretty/macro_rules.rs
diff --git a/src/test/pretty/match-block-expr.rs b/tests/pretty/match-block-expr.rs
index 10903e928..10903e928 100644
--- a/src/test/pretty/match-block-expr.rs
+++ b/tests/pretty/match-block-expr.rs
diff --git a/src/test/pretty/match-naked-expr-medium.rs b/tests/pretty/match-naked-expr-medium.rs
index 836af9900..836af9900 100644
--- a/src/test/pretty/match-naked-expr-medium.rs
+++ b/tests/pretty/match-naked-expr-medium.rs
diff --git a/src/test/pretty/match-naked-expr.rs b/tests/pretty/match-naked-expr.rs
index 7c16bbefe..7c16bbefe 100644
--- a/src/test/pretty/match-naked-expr.rs
+++ b/tests/pretty/match-naked-expr.rs
diff --git a/src/test/pretty/nested-item-vis-defaultness.rs b/tests/pretty/nested-item-vis-defaultness.rs
index b094ba577..b094ba577 100644
--- a/src/test/pretty/nested-item-vis-defaultness.rs
+++ b/tests/pretty/nested-item-vis-defaultness.rs
diff --git a/src/test/pretty/path-type-bounds.rs b/tests/pretty/path-type-bounds.rs
index f1970de6f..f1970de6f 100644
--- a/src/test/pretty/path-type-bounds.rs
+++ b/tests/pretty/path-type-bounds.rs
diff --git a/src/test/pretty/qpath-associated-type-bound.rs b/tests/pretty/qpath-associated-type-bound.rs
index 67a5d1dd8..67a5d1dd8 100644
--- a/src/test/pretty/qpath-associated-type-bound.rs
+++ b/tests/pretty/qpath-associated-type-bound.rs
diff --git a/src/test/pretty/raw-address-of.rs b/tests/pretty/raw-address-of.rs
index 6ccc434a1..6ccc434a1 100644
--- a/src/test/pretty/raw-address-of.rs
+++ b/tests/pretty/raw-address-of.rs
diff --git a/src/test/pretty/raw-str-nonexpr.rs b/tests/pretty/raw-str-nonexpr.rs
index 12440b5ae..12440b5ae 100644
--- a/src/test/pretty/raw-str-nonexpr.rs
+++ b/tests/pretty/raw-str-nonexpr.rs
diff --git a/src/test/pretty/stmt_expr_attributes.rs b/tests/pretty/stmt_expr_attributes.rs
index c01379065..c01379065 100644
--- a/src/test/pretty/stmt_expr_attributes.rs
+++ b/tests/pretty/stmt_expr_attributes.rs
diff --git a/src/test/pretty/struct-pattern.rs b/tests/pretty/struct-pattern.rs
index 6acb2e27f..6acb2e27f 100644
--- a/src/test/pretty/struct-pattern.rs
+++ b/tests/pretty/struct-pattern.rs
diff --git a/src/test/pretty/struct-tuple.rs b/tests/pretty/struct-tuple.rs
index 77e064b4f..77e064b4f 100644
--- a/src/test/pretty/struct-tuple.rs
+++ b/tests/pretty/struct-tuple.rs
diff --git a/src/test/pretty/tag-blank-lines.rs b/tests/pretty/tag-blank-lines.rs
index d53f6e4b5..d53f6e4b5 100644
--- a/src/test/pretty/tag-blank-lines.rs
+++ b/tests/pretty/tag-blank-lines.rs
diff --git a/src/test/pretty/tests-are-sorted.pp b/tests/pretty/tests-are-sorted.pp
index 15dcd4ed9..15dcd4ed9 100644
--- a/src/test/pretty/tests-are-sorted.pp
+++ b/tests/pretty/tests-are-sorted.pp
diff --git a/src/test/pretty/tests-are-sorted.rs b/tests/pretty/tests-are-sorted.rs
index 1f737d547..1f737d547 100644
--- a/src/test/pretty/tests-are-sorted.rs
+++ b/tests/pretty/tests-are-sorted.rs
diff --git a/src/test/pretty/top-level-doc-comments.rs b/tests/pretty/top-level-doc-comments.rs
index b97927124..b97927124 100644
--- a/src/test/pretty/top-level-doc-comments.rs
+++ b/tests/pretty/top-level-doc-comments.rs
diff --git a/src/test/pretty/trait-inner-attr.rs b/tests/pretty/trait-inner-attr.rs
index 6cb0e4136..6cb0e4136 100644
--- a/src/test/pretty/trait-inner-attr.rs
+++ b/tests/pretty/trait-inner-attr.rs
diff --git a/src/test/pretty/trait-polarity.rs b/tests/pretty/trait-polarity.rs
index 310506eab..310506eab 100644
--- a/src/test/pretty/trait-polarity.rs
+++ b/tests/pretty/trait-polarity.rs
diff --git a/src/test/pretty/trait-safety.rs b/tests/pretty/trait-safety.rs
index c4ae76069..c4ae76069 100644
--- a/src/test/pretty/trait-safety.rs
+++ b/tests/pretty/trait-safety.rs
diff --git a/src/test/pretty/unary-op-disambig.rs b/tests/pretty/unary-op-disambig.rs
index 0c57e0a33..0c57e0a33 100644
--- a/src/test/pretty/unary-op-disambig.rs
+++ b/tests/pretty/unary-op-disambig.rs
diff --git a/src/test/pretty/use-tree.rs b/tests/pretty/use-tree.rs
index 5da952352..5da952352 100644
--- a/src/test/pretty/use-tree.rs
+++ b/tests/pretty/use-tree.rs
diff --git a/src/test/pretty/vec-comments.pp b/tests/pretty/vec-comments.pp
index f2f807c59..f2f807c59 100644
--- a/src/test/pretty/vec-comments.pp
+++ b/tests/pretty/vec-comments.pp
diff --git a/src/test/pretty/vec-comments.rs b/tests/pretty/vec-comments.rs
index a150cf0b8..a150cf0b8 100644
--- a/src/test/pretty/vec-comments.rs
+++ b/tests/pretty/vec-comments.rs
diff --git a/src/test/pretty/where-clauses.rs b/tests/pretty/where-clauses.rs
index 418379945..418379945 100644
--- a/src/test/pretty/where-clauses.rs
+++ b/tests/pretty/where-clauses.rs
diff --git a/src/test/pretty/yeet-expr.rs b/tests/pretty/yeet-expr.rs
index c899f11b7..c899f11b7 100644
--- a/src/test/pretty/yeet-expr.rs
+++ b/tests/pretty/yeet-expr.rs
diff --git a/src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile b/tests/run-make-fulldeps/a-b-a-linker-guard/Makefile
index adc9e3d09..adc9e3d09 100644
--- a/src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile
+++ b/tests/run-make-fulldeps/a-b-a-linker-guard/Makefile
diff --git a/src/test/run-make-fulldeps/a-b-a-linker-guard/a.rs b/tests/run-make-fulldeps/a-b-a-linker-guard/a.rs
index aa07b1e71..aa07b1e71 100644
--- a/src/test/run-make-fulldeps/a-b-a-linker-guard/a.rs
+++ b/tests/run-make-fulldeps/a-b-a-linker-guard/a.rs
diff --git a/src/test/run-make-fulldeps/a-b-a-linker-guard/b.rs b/tests/run-make-fulldeps/a-b-a-linker-guard/b.rs
index f30df120a..f30df120a 100644
--- a/src/test/run-make-fulldeps/a-b-a-linker-guard/b.rs
+++ b/tests/run-make-fulldeps/a-b-a-linker-guard/b.rs
diff --git a/tests/run-make-fulldeps/alloc-no-oom-handling/Makefile b/tests/run-make-fulldeps/alloc-no-oom-handling/Makefile
new file mode 100644
index 000000000..87f74c69c
--- /dev/null
+++ b/tests/run-make-fulldeps/alloc-no-oom-handling/Makefile
@@ -0,0 +1,4 @@
+include ../tools.mk
+
+all:
+	$(RUSTC) --edition=2021 -Dwarnings --crate-type=rlib ../../../library/alloc/src/lib.rs --cfg no_global_oom_handling
diff --git a/tests/run-make-fulldeps/alloc-no-rc/Makefile b/tests/run-make-fulldeps/alloc-no-rc/Makefile
new file mode 100644
index 000000000..9824b17e6
--- /dev/null
+++ b/tests/run-make-fulldeps/alloc-no-rc/Makefile
@@ -0,0 +1,4 @@
+include ../tools.mk
+
+all:
+	$(RUSTC) --edition=2021 -Dwarnings --crate-type=rlib ../../../library/alloc/src/lib.rs --cfg no_rc
diff --git a/tests/run-make-fulldeps/alloc-no-sync/Makefile b/tests/run-make-fulldeps/alloc-no-sync/Makefile
new file mode 100644
index 000000000..04ec4c7d8
--- /dev/null
+++ b/tests/run-make-fulldeps/alloc-no-sync/Makefile
@@ -0,0 +1,4 @@
+include ../tools.mk
+
+all:
+	$(RUSTC) --edition=2021 -Dwarnings --crate-type=rlib ../../../library/alloc/src/lib.rs --cfg no_sync
diff --git a/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile b/tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile
index 60d9c7c37..60d9c7c37 100644
--- a/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile
+++ b/tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile
diff --git a/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs b/tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs
index 46e72da2d..46e72da2d 100644
--- a/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs
+++ b/tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs
diff --git a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile b/tests/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile
index 1ce8d0ec2..1ce8d0ec2 100644
--- a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile
+++ b/tests/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile
diff --git a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs b/tests/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs
index 3dcfb9dad..3dcfb9dad 100644
--- a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs
+++ b/tests/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs
diff --git a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs b/tests/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs
index 869b54354..869b54354 100644
--- a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs
+++ b/tests/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs
diff --git a/src/test/run-make-fulldeps/archive-duplicate-names/Makefile b/tests/run-make-fulldeps/archive-duplicate-names/Makefile
index bbdcd2a34..bbdcd2a34 100644
--- a/src/test/run-make-fulldeps/archive-duplicate-names/Makefile
+++ b/tests/run-make-fulldeps/archive-duplicate-names/Makefile
diff --git a/src/test/run-make-fulldeps/archive-duplicate-names/bar.c b/tests/run-make-fulldeps/archive-duplicate-names/bar.c
index e42599986..e42599986 100644
--- a/src/test/run-make-fulldeps/archive-duplicate-names/bar.c
+++ b/tests/run-make-fulldeps/archive-duplicate-names/bar.c
diff --git a/src/test/run-make-fulldeps/archive-duplicate-names/bar.rs b/tests/run-make-fulldeps/archive-duplicate-names/bar.rs
index 994a98c2c..994a98c2c 100644
--- a/src/test/run-make-fulldeps/archive-duplicate-names/bar.rs
+++ b/tests/run-make-fulldeps/archive-duplicate-names/bar.rs
diff --git a/src/test/run-make-fulldeps/archive-duplicate-names/foo.c b/tests/run-make-fulldeps/archive-duplicate-names/foo.c
index 85e6cd8c3..85e6cd8c3 100644
--- a/src/test/run-make-fulldeps/archive-duplicate-names/foo.c
+++ b/tests/run-make-fulldeps/archive-duplicate-names/foo.c
diff --git a/src/test/run-make-fulldeps/archive-duplicate-names/foo.rs b/tests/run-make-fulldeps/archive-duplicate-names/foo.rs
index 0bf13c406..0bf13c406 100644
--- a/src/test/run-make-fulldeps/archive-duplicate-names/foo.rs
+++ b/tests/run-make-fulldeps/archive-duplicate-names/foo.rs
diff --git a/src/test/run-make-fulldeps/arguments-non-c-like-enum/Makefile b/tests/run-make-fulldeps/arguments-non-c-like-enum/Makefile
index 513311c82..513311c82 100644
--- a/src/test/run-make-fulldeps/arguments-non-c-like-enum/Makefile
+++ b/tests/run-make-fulldeps/arguments-non-c-like-enum/Makefile
diff --git a/src/test/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs b/tests/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs
index 57c2c6127..57c2c6127 100644
--- a/src/test/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs
+++ b/tests/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs
diff --git a/src/test/run-make-fulldeps/arguments-non-c-like-enum/test.c b/tests/run-make-fulldeps/arguments-non-c-like-enum/test.c
index 0a1621e49..0a1621e49 100644
--- a/src/test/run-make-fulldeps/arguments-non-c-like-enum/test.c
+++ b/tests/run-make-fulldeps/arguments-non-c-like-enum/test.c
diff --git a/src/test/run-make-fulldeps/atomic-lock-free/Makefile b/tests/run-make-fulldeps/atomic-lock-free/Makefile
index 37e59624a..37e59624a 100644
--- a/src/test/run-make-fulldeps/atomic-lock-free/Makefile
+++ b/tests/run-make-fulldeps/atomic-lock-free/Makefile
diff --git a/src/test/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs b/tests/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs
index 47d90b185..47d90b185 100644
--- a/src/test/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs
+++ b/tests/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs
diff --git a/src/test/run-make-fulldeps/bare-outfile/Makefile b/tests/run-make-fulldeps/bare-outfile/Makefile
index 858466e94..858466e94 100644
--- a/src/test/run-make-fulldeps/bare-outfile/Makefile
+++ b/tests/run-make-fulldeps/bare-outfile/Makefile
diff --git a/src/test/run-make-fulldeps/bare-outfile/foo.rs b/tests/run-make-fulldeps/bare-outfile/foo.rs
index f79c691f0..f79c691f0 100644
--- a/src/test/run-make-fulldeps/bare-outfile/foo.rs
+++ b/tests/run-make-fulldeps/bare-outfile/foo.rs
diff --git a/src/test/run-make-fulldeps/c-dynamic-dylib/Makefile b/tests/run-make-fulldeps/c-dynamic-dylib/Makefile
index ac6877892..ac6877892 100644
--- a/src/test/run-make-fulldeps/c-dynamic-dylib/Makefile
+++ b/tests/run-make-fulldeps/c-dynamic-dylib/Makefile
diff --git a/src/test/run-make-fulldeps/c-dynamic-dylib/bar.rs b/tests/run-make-fulldeps/c-dynamic-dylib/bar.rs
index b8c798ffd..b8c798ffd 100644
--- a/src/test/run-make-fulldeps/c-dynamic-dylib/bar.rs
+++ b/tests/run-make-fulldeps/c-dynamic-dylib/bar.rs
diff --git a/src/test/run-make-fulldeps/c-dynamic-dylib/cfoo.c b/tests/run-make-fulldeps/c-dynamic-dylib/cfoo.c
index fea490cf9..fea490cf9 100644
--- a/src/test/run-make-fulldeps/c-dynamic-dylib/cfoo.c
+++ b/tests/run-make-fulldeps/c-dynamic-dylib/cfoo.c
diff --git a/src/test/run-make-fulldeps/c-dynamic-dylib/foo.rs b/tests/run-make-fulldeps/c-dynamic-dylib/foo.rs
index 9f7a9e221..9f7a9e221 100644
--- a/src/test/run-make-fulldeps/c-dynamic-dylib/foo.rs
+++ b/tests/run-make-fulldeps/c-dynamic-dylib/foo.rs
diff --git a/src/test/run-make-fulldeps/c-dynamic-rlib/Makefile b/tests/run-make-fulldeps/c-dynamic-rlib/Makefile
index c65d648b9..c65d648b9 100644
--- a/src/test/run-make-fulldeps/c-dynamic-rlib/Makefile
+++ b/tests/run-make-fulldeps/c-dynamic-rlib/Makefile
diff --git a/src/test/run-make-fulldeps/c-dynamic-rlib/bar.rs b/tests/run-make-fulldeps/c-dynamic-rlib/bar.rs
index b8c798ffd..b8c798ffd 100644
--- a/src/test/run-make-fulldeps/c-dynamic-rlib/bar.rs
+++ b/tests/run-make-fulldeps/c-dynamic-rlib/bar.rs
diff --git a/src/test/run-make-fulldeps/c-dynamic-rlib/cfoo.c b/tests/run-make-fulldeps/c-dynamic-rlib/cfoo.c
index fea490cf9..fea490cf9 100644
--- a/src/test/run-make-fulldeps/c-dynamic-rlib/cfoo.c
+++ b/tests/run-make-fulldeps/c-dynamic-rlib/cfoo.c
diff --git a/src/test/run-make-fulldeps/c-dynamic-rlib/foo.rs b/tests/run-make-fulldeps/c-dynamic-rlib/foo.rs
index 3dd376f1f..3dd376f1f 100644
--- a/src/test/run-make-fulldeps/c-dynamic-rlib/foo.rs
+++ b/tests/run-make-fulldeps/c-dynamic-rlib/foo.rs
diff --git a/src/test/run-make-fulldeps/c-link-to-rust-dylib/Makefile b/tests/run-make-fulldeps/c-link-to-rust-dylib/Makefile
index 2a371b545..2a371b545 100644
--- a/src/test/run-make-fulldeps/c-link-to-rust-dylib/Makefile
+++ b/tests/run-make-fulldeps/c-link-to-rust-dylib/Makefile
diff --git a/src/test/run-make-fulldeps/c-link-to-rust-dylib/bar.c b/tests/run-make-fulldeps/c-link-to-rust-dylib/bar.c
index bb4036b06..bb4036b06 100644
--- a/src/test/run-make-fulldeps/c-link-to-rust-dylib/bar.c
+++ b/tests/run-make-fulldeps/c-link-to-rust-dylib/bar.c
diff --git a/src/test/run-make-fulldeps/c-link-to-rust-dylib/foo.rs b/tests/run-make-fulldeps/c-link-to-rust-dylib/foo.rs
index f197fa513..f197fa513 100644
--- a/src/test/run-make-fulldeps/c-link-to-rust-dylib/foo.rs
+++ b/tests/run-make-fulldeps/c-link-to-rust-dylib/foo.rs
diff --git a/src/test/run-make-fulldeps/c-link-to-rust-staticlib/Makefile b/tests/run-make-fulldeps/c-link-to-rust-staticlib/Makefile
index d38bcef30..d38bcef30 100644
--- a/src/test/run-make-fulldeps/c-link-to-rust-staticlib/Makefile
+++ b/tests/run-make-fulldeps/c-link-to-rust-staticlib/Makefile
diff --git a/src/test/run-make-fulldeps/c-link-to-rust-staticlib/bar.c b/tests/run-make-fulldeps/c-link-to-rust-staticlib/bar.c
index bb4036b06..bb4036b06 100644
--- a/src/test/run-make-fulldeps/c-link-to-rust-staticlib/bar.c
+++ b/tests/run-make-fulldeps/c-link-to-rust-staticlib/bar.c
diff --git a/src/test/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs b/tests/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs
index 2e59432cd..2e59432cd 100644
--- a/src/test/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs
+++ b/tests/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs
diff --git a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile b/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
index 9ce2a34e6..9ce2a34e6 100644
--- a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
+++ b/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
diff --git a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/checkrust.rs b/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/checkrust.rs
index 5830ef033..5830ef033 100644
--- a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/checkrust.rs
+++ b/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/checkrust.rs
diff --git a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/test.c b/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/test.c
index 5bdb51680..5bdb51680 100644
--- a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/test.c
+++ b/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/test.c
diff --git a/src/test/run-make-fulldeps/c-static-dylib/Makefile b/tests/run-make-fulldeps/c-static-dylib/Makefile
index 5b78005e3..5b78005e3 100644
--- a/src/test/run-make-fulldeps/c-static-dylib/Makefile
+++ b/tests/run-make-fulldeps/c-static-dylib/Makefile
diff --git a/src/test/run-make-fulldeps/c-static-dylib/bar.rs b/tests/run-make-fulldeps/c-static-dylib/bar.rs
index b8c798ffd..b8c798ffd 100644
--- a/src/test/run-make-fulldeps/c-static-dylib/bar.rs
+++ b/tests/run-make-fulldeps/c-static-dylib/bar.rs
diff --git a/src/test/run-make-fulldeps/c-static-dylib/cfoo.c b/tests/run-make-fulldeps/c-static-dylib/cfoo.c
index 9fe07f82f..9fe07f82f 100644
--- a/src/test/run-make-fulldeps/c-static-dylib/cfoo.c
+++ b/tests/run-make-fulldeps/c-static-dylib/cfoo.c
diff --git a/src/test/run-make-fulldeps/c-static-dylib/foo.rs b/tests/run-make-fulldeps/c-static-dylib/foo.rs
index 1e8af4d44..1e8af4d44 100644
--- a/src/test/run-make-fulldeps/c-static-dylib/foo.rs
+++ b/tests/run-make-fulldeps/c-static-dylib/foo.rs
diff --git a/src/test/run-make-fulldeps/c-static-rlib/Makefile b/tests/run-make-fulldeps/c-static-rlib/Makefile
index 11a3cf194..11a3cf194 100644
--- a/src/test/run-make-fulldeps/c-static-rlib/Makefile
+++ b/tests/run-make-fulldeps/c-static-rlib/Makefile
diff --git a/src/test/run-make-fulldeps/c-static-rlib/bar.rs b/tests/run-make-fulldeps/c-static-rlib/bar.rs
index b8c798ffd..b8c798ffd 100644
--- a/src/test/run-make-fulldeps/c-static-rlib/bar.rs
+++ b/tests/run-make-fulldeps/c-static-rlib/bar.rs
diff --git a/src/test/run-make-fulldeps/c-static-rlib/cfoo.c b/tests/run-make-fulldeps/c-static-rlib/cfoo.c
index 9fe07f82f..9fe07f82f 100644
--- a/src/test/run-make-fulldeps/c-static-rlib/cfoo.c
+++ b/tests/run-make-fulldeps/c-static-rlib/cfoo.c
diff --git a/src/test/run-make-fulldeps/c-static-rlib/foo.rs b/tests/run-make-fulldeps/c-static-rlib/foo.rs
index 9c6d2080e..9c6d2080e 100644
--- a/src/test/run-make-fulldeps/c-static-rlib/foo.rs
+++ b/tests/run-make-fulldeps/c-static-rlib/foo.rs
diff --git a/src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile b/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile
index 134f000d4..134f000d4 100644
--- a/src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile
diff --git a/src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/add.c b/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/add.c
index 444359451..444359451 100644
--- a/src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/add.c
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/add.c
diff --git a/src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/main.rs b/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/main.rs
index 78a71219c..78a71219c 100644
--- a/src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/main.rs
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/main.rs
diff --git a/src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/panic.rs b/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/panic.rs
index a99a04d5c..a99a04d5c 100644
--- a/src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/panic.rs
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/panic.rs
diff --git a/src/test/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile b/tests/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile
index e93ec99da..e93ec99da 100644
--- a/src/test/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile
diff --git a/src/test/run-make-fulldeps/c-unwind-abi-catch-panic/add.c b/tests/run-make-fulldeps/c-unwind-abi-catch-panic/add.c
index 444359451..444359451 100644
--- a/src/test/run-make-fulldeps/c-unwind-abi-catch-panic/add.c
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-panic/add.c
diff --git a/src/test/run-make-fulldeps/c-unwind-abi-catch-panic/main.rs b/tests/run-make-fulldeps/c-unwind-abi-catch-panic/main.rs
index 15d38d721..15d38d721 100644
--- a/src/test/run-make-fulldeps/c-unwind-abi-catch-panic/main.rs
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-panic/main.rs
diff --git a/src/test/run-make-fulldeps/cat-and-grep-sanity-check/Makefile b/tests/run-make-fulldeps/cat-and-grep-sanity-check/Makefile
index 82351e220..82351e220 100644
--- a/src/test/run-make-fulldeps/cat-and-grep-sanity-check/Makefile
+++ b/tests/run-make-fulldeps/cat-and-grep-sanity-check/Makefile
diff --git a/src/test/run-make-fulldeps/cdylib-dylib-linkage/Makefile b/tests/run-make-fulldeps/cdylib-dylib-linkage/Makefile
index 5c9b2d1bb..5c9b2d1bb 100644
--- a/src/test/run-make-fulldeps/cdylib-dylib-linkage/Makefile
+++ b/tests/run-make-fulldeps/cdylib-dylib-linkage/Makefile
diff --git a/src/test/run-make-fulldeps/cdylib-dylib-linkage/bar.rs b/tests/run-make-fulldeps/cdylib-dylib-linkage/bar.rs
index b3a7539ab..b3a7539ab 100644
--- a/src/test/run-make-fulldeps/cdylib-dylib-linkage/bar.rs
+++ b/tests/run-make-fulldeps/cdylib-dylib-linkage/bar.rs
diff --git a/src/test/run-make-fulldeps/cdylib-dylib-linkage/foo.c b/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.c
index 154f9682e..154f9682e 100644
--- a/src/test/run-make-fulldeps/cdylib-dylib-linkage/foo.c
+++ b/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.c
diff --git a/src/test/run-make-fulldeps/cdylib-dylib-linkage/foo.rs b/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.rs
index c4069495a..c4069495a 100644
--- a/src/test/run-make-fulldeps/cdylib-dylib-linkage/foo.rs
+++ b/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.rs
diff --git a/src/test/run-make-fulldeps/cdylib-fewer-symbols/Makefile b/tests/run-make-fulldeps/cdylib-fewer-symbols/Makefile
index 324791af8..324791af8 100644
--- a/src/test/run-make-fulldeps/cdylib-fewer-symbols/Makefile
+++ b/tests/run-make-fulldeps/cdylib-fewer-symbols/Makefile
diff --git a/src/test/run-make-fulldeps/cdylib-fewer-symbols/foo.rs b/tests/run-make-fulldeps/cdylib-fewer-symbols/foo.rs
index af37bc8e9..af37bc8e9 100644
--- a/src/test/run-make-fulldeps/cdylib-fewer-symbols/foo.rs
+++ b/tests/run-make-fulldeps/cdylib-fewer-symbols/foo.rs
diff --git a/src/test/run-make-fulldeps/cdylib/Makefile b/tests/run-make-fulldeps/cdylib/Makefile
index 47ec762b3..47ec762b3 100644
--- a/src/test/run-make-fulldeps/cdylib/Makefile
+++ b/tests/run-make-fulldeps/cdylib/Makefile
diff --git a/src/test/run-make-fulldeps/cdylib/bar.rs b/tests/run-make-fulldeps/cdylib/bar.rs
index fe665abc7..fe665abc7 100644
--- a/src/test/run-make-fulldeps/cdylib/bar.rs
+++ b/tests/run-make-fulldeps/cdylib/bar.rs
diff --git a/src/test/run-make-fulldeps/cdylib/foo.c b/tests/run-make-fulldeps/cdylib/foo.c
index 154f9682e..154f9682e 100644
--- a/src/test/run-make-fulldeps/cdylib/foo.c
+++ b/tests/run-make-fulldeps/cdylib/foo.c
diff --git a/src/test/run-make-fulldeps/cdylib/foo.rs b/tests/run-make-fulldeps/cdylib/foo.rs
index c4069495a..c4069495a 100644
--- a/src/test/run-make-fulldeps/cdylib/foo.rs
+++ b/tests/run-make-fulldeps/cdylib/foo.rs
diff --git a/src/test/run-make-fulldeps/codegen-options-parsing/Makefile b/tests/run-make-fulldeps/codegen-options-parsing/Makefile
index b063593c9..b063593c9 100644
--- a/src/test/run-make-fulldeps/codegen-options-parsing/Makefile
+++ b/tests/run-make-fulldeps/codegen-options-parsing/Makefile
diff --git a/src/test/run-make-fulldeps/codegen-options-parsing/dummy.rs b/tests/run-make-fulldeps/codegen-options-parsing/dummy.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/codegen-options-parsing/dummy.rs
+++ b/tests/run-make-fulldeps/codegen-options-parsing/dummy.rs
diff --git a/src/test/run-make-fulldeps/compile-stdin/Makefile b/tests/run-make-fulldeps/compile-stdin/Makefile
index be1554869..be1554869 100644
--- a/src/test/run-make-fulldeps/compile-stdin/Makefile
+++ b/tests/run-make-fulldeps/compile-stdin/Makefile
diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths-2/Makefile b/tests/run-make-fulldeps/compiler-lookup-paths-2/Makefile
index d4ff7d8da..d4ff7d8da 100644
--- a/src/test/run-make-fulldeps/compiler-lookup-paths-2/Makefile
+++ b/tests/run-make-fulldeps/compiler-lookup-paths-2/Makefile
diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths-2/a.rs b/tests/run-make-fulldeps/compiler-lookup-paths-2/a.rs
index 83be6e807..83be6e807 100644
--- a/src/test/run-make-fulldeps/compiler-lookup-paths-2/a.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths-2/a.rs
diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths-2/b.rs b/tests/run-make-fulldeps/compiler-lookup-paths-2/b.rs
index 1be6cbc91..1be6cbc91 100644
--- a/src/test/run-make-fulldeps/compiler-lookup-paths-2/b.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths-2/b.rs
diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths-2/c.rs b/tests/run-make-fulldeps/compiler-lookup-paths-2/c.rs
index e37bc2e1d..e37bc2e1d 100644
--- a/src/test/run-make-fulldeps/compiler-lookup-paths-2/c.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths-2/c.rs
diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/Makefile b/tests/run-make-fulldeps/compiler-lookup-paths/Makefile
index c16bf7af6..c16bf7af6 100644
--- a/src/test/run-make-fulldeps/compiler-lookup-paths/Makefile
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/Makefile
diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/a.rs b/tests/run-make-fulldeps/compiler-lookup-paths/a.rs
index 83be6e807..83be6e807 100644
--- a/src/test/run-make-fulldeps/compiler-lookup-paths/a.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/a.rs
diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/b.rs b/tests/run-make-fulldeps/compiler-lookup-paths/b.rs
index 1be6cbc91..1be6cbc91 100644
--- a/src/test/run-make-fulldeps/compiler-lookup-paths/b.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/b.rs
diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/c.rs b/tests/run-make-fulldeps/compiler-lookup-paths/c.rs
index 4c7ce01b6..4c7ce01b6 100644
--- a/src/test/run-make-fulldeps/compiler-lookup-paths/c.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/c.rs
diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/d.rs b/tests/run-make-fulldeps/compiler-lookup-paths/d.rs
index 6cd9916b6..6cd9916b6 100644
--- a/src/test/run-make-fulldeps/compiler-lookup-paths/d.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/d.rs
diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/e.rs b/tests/run-make-fulldeps/compiler-lookup-paths/e.rs
index 18eb60aca..18eb60aca 100644
--- a/src/test/run-make-fulldeps/compiler-lookup-paths/e.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/e.rs
diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/e2.rs b/tests/run-make-fulldeps/compiler-lookup-paths/e2.rs
index cbf08b98e..cbf08b98e 100644
--- a/src/test/run-make-fulldeps/compiler-lookup-paths/e2.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/e2.rs
diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/f.rs b/tests/run-make-fulldeps/compiler-lookup-paths/f.rs
index 483deaaea..483deaaea 100644
--- a/src/test/run-make-fulldeps/compiler-lookup-paths/f.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/f.rs
diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/native.c b/tests/run-make-fulldeps/compiler-lookup-paths/native.c
index d11c69f81..d11c69f81 100644
--- a/src/test/run-make-fulldeps/compiler-lookup-paths/native.c
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/native.c
diff --git a/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile b/tests/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile
index 74917570a..74917570a 100644
--- a/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile
+++ b/tests/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile
diff --git a/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp b/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp
index 4c2fb9cdb..4c2fb9cdb 100644
--- a/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp
+++ b/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp
diff --git a/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs b/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs
index 7fdb81588..7fdb81588 100644
--- a/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs
+++ b/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs
diff --git a/tests/run-make-fulldeps/core-no-fp-fmt-parse/Makefile b/tests/run-make-fulldeps/core-no-fp-fmt-parse/Makefile
new file mode 100644
index 000000000..837664d92
--- /dev/null
+++ b/tests/run-make-fulldeps/core-no-fp-fmt-parse/Makefile
@@ -0,0 +1,4 @@
+include ../tools.mk
+
+all:
+	$(RUSTC) --edition=2021 -Dwarnings --crate-type=rlib ../../../library/core/src/lib.rs --cfg no_fp_fmt_parse
diff --git a/src/test/run-make-fulldeps/crate-data-smoke/Makefile b/tests/run-make-fulldeps/crate-data-smoke/Makefile
index a453f65ff..a453f65ff 100644
--- a/src/test/run-make-fulldeps/crate-data-smoke/Makefile
+++ b/tests/run-make-fulldeps/crate-data-smoke/Makefile
diff --git a/src/test/run-make-fulldeps/crate-data-smoke/crate.rs b/tests/run-make-fulldeps/crate-data-smoke/crate.rs
index a48a6f51c..a48a6f51c 100644
--- a/src/test/run-make-fulldeps/crate-data-smoke/crate.rs
+++ b/tests/run-make-fulldeps/crate-data-smoke/crate.rs
diff --git a/src/test/run-make-fulldeps/crate-data-smoke/lib.rs b/tests/run-make-fulldeps/crate-data-smoke/lib.rs
index 8002f11ec..8002f11ec 100644
--- a/src/test/run-make-fulldeps/crate-data-smoke/lib.rs
+++ b/tests/run-make-fulldeps/crate-data-smoke/lib.rs
diff --git a/src/test/run-make-fulldeps/crate-data-smoke/rlib.rs b/tests/run-make-fulldeps/crate-data-smoke/rlib.rs
index 47fcce4a7..47fcce4a7 100644
--- a/src/test/run-make-fulldeps/crate-data-smoke/rlib.rs
+++ b/tests/run-make-fulldeps/crate-data-smoke/rlib.rs
diff --git a/src/test/run-make-fulldeps/crate-hash-rustc-version/Makefile b/tests/run-make-fulldeps/crate-hash-rustc-version/Makefile
index 4f25a865e..4f25a865e 100644
--- a/src/test/run-make-fulldeps/crate-hash-rustc-version/Makefile
+++ b/tests/run-make-fulldeps/crate-hash-rustc-version/Makefile
diff --git a/src/test/run-make-fulldeps/crate-hash-rustc-version/a.rs b/tests/run-make-fulldeps/crate-hash-rustc-version/a.rs
index d65b5ce8e..d65b5ce8e 100644
--- a/src/test/run-make-fulldeps/crate-hash-rustc-version/a.rs
+++ b/tests/run-make-fulldeps/crate-hash-rustc-version/a.rs
diff --git a/src/test/run-make-fulldeps/crate-hash-rustc-version/b.rs b/tests/run-make-fulldeps/crate-hash-rustc-version/b.rs
index 316ac26e7..316ac26e7 100644
--- a/src/test/run-make-fulldeps/crate-hash-rustc-version/b.rs
+++ b/tests/run-make-fulldeps/crate-hash-rustc-version/b.rs
diff --git a/src/test/run-make-fulldeps/crate-name-priority/Makefile b/tests/run-make-fulldeps/crate-name-priority/Makefile
index 08a07c325..08a07c325 100644
--- a/src/test/run-make-fulldeps/crate-name-priority/Makefile
+++ b/tests/run-make-fulldeps/crate-name-priority/Makefile
diff --git a/src/test/run-make-fulldeps/crate-name-priority/foo.rs b/tests/run-make-fulldeps/crate-name-priority/foo.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/crate-name-priority/foo.rs
+++ b/tests/run-make-fulldeps/crate-name-priority/foo.rs
diff --git a/src/test/run-make-fulldeps/crate-name-priority/foo1.rs b/tests/run-make-fulldeps/crate-name-priority/foo1.rs
index 4ff3bd951..4ff3bd951 100644
--- a/src/test/run-make-fulldeps/crate-name-priority/foo1.rs
+++ b/tests/run-make-fulldeps/crate-name-priority/foo1.rs
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-clang/Makefile b/tests/run-make-fulldeps/cross-lang-lto-clang/Makefile
index acaebf439..acaebf439 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto-clang/Makefile
+++ b/tests/run-make-fulldeps/cross-lang-lto-clang/Makefile
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-clang/clib.c b/tests/run-make-fulldeps/cross-lang-lto-clang/clib.c
index 90f33f24d..90f33f24d 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto-clang/clib.c
+++ b/tests/run-make-fulldeps/cross-lang-lto-clang/clib.c
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-clang/cmain.c b/tests/run-make-fulldeps/cross-lang-lto-clang/cmain.c
index e62a40117..e62a40117 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto-clang/cmain.c
+++ b/tests/run-make-fulldeps/cross-lang-lto-clang/cmain.c
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-clang/main.rs b/tests/run-make-fulldeps/cross-lang-lto-clang/main.rs
index 8129dcb85..8129dcb85 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto-clang/main.rs
+++ b/tests/run-make-fulldeps/cross-lang-lto-clang/main.rs
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-clang/rustlib.rs b/tests/run-make-fulldeps/cross-lang-lto-clang/rustlib.rs
index 8a74d74a4..8a74d74a4 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto-clang/rustlib.rs
+++ b/tests/run-make-fulldeps/cross-lang-lto-clang/rustlib.rs
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/Makefile b/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/Makefile
index 70085d9bd..70085d9bd 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/Makefile
+++ b/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/Makefile
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/clib.c b/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/clib.c
index 90f33f24d..90f33f24d 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/clib.c
+++ b/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/clib.c
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/cmain.c b/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/cmain.c
index e3f24828b..e3f24828b 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/cmain.c
+++ b/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/cmain.c
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/main.rs b/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/main.rs
index 8129dcb85..8129dcb85 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/main.rs
+++ b/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/main.rs
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/rustlib.rs b/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/rustlib.rs
index 8a74d74a4..8a74d74a4 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/rustlib.rs
+++ b/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/rustlib.rs
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile b/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile
index 6f1caa31a..6f1caa31a 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile
+++ b/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/staticlib.rs b/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/staticlib.rs
index 34951dda3..34951dda3 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/staticlib.rs
+++ b/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/staticlib.rs
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/upstream.rs b/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/upstream.rs
index bd6820098..bd6820098 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/upstream.rs
+++ b/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/upstream.rs
diff --git a/src/test/run-make-fulldeps/cross-lang-lto/Makefile b/tests/run-make-fulldeps/cross-lang-lto/Makefile
index 92058f952..92058f952 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto/Makefile
+++ b/tests/run-make-fulldeps/cross-lang-lto/Makefile
diff --git a/src/test/run-make-fulldeps/cross-lang-lto/lib.rs b/tests/run-make-fulldeps/cross-lang-lto/lib.rs
index 94cfef6ad..94cfef6ad 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto/lib.rs
+++ b/tests/run-make-fulldeps/cross-lang-lto/lib.rs
diff --git a/src/test/run-make-fulldeps/cross-lang-lto/main.rs b/tests/run-make-fulldeps/cross-lang-lto/main.rs
index f6320bcb0..f6320bcb0 100644
--- a/src/test/run-make-fulldeps/cross-lang-lto/main.rs
+++ b/tests/run-make-fulldeps/cross-lang-lto/main.rs
diff --git a/src/test/run-make-fulldeps/debug-assertions/Makefile b/tests/run-make-fulldeps/debug-assertions/Makefile
index 73beb4b03..73beb4b03 100644
--- a/src/test/run-make-fulldeps/debug-assertions/Makefile
+++ b/tests/run-make-fulldeps/debug-assertions/Makefile
diff --git a/src/test/run-make-fulldeps/debug-assertions/debug.rs b/tests/run-make-fulldeps/debug-assertions/debug.rs
index 76ca60a71..76ca60a71 100644
--- a/src/test/run-make-fulldeps/debug-assertions/debug.rs
+++ b/tests/run-make-fulldeps/debug-assertions/debug.rs
diff --git a/src/test/run-make-fulldeps/dep-info-doesnt-run-much/Makefile b/tests/run-make-fulldeps/dep-info-doesnt-run-much/Makefile
index b4dc44ad2..b4dc44ad2 100644
--- a/src/test/run-make-fulldeps/dep-info-doesnt-run-much/Makefile
+++ b/tests/run-make-fulldeps/dep-info-doesnt-run-much/Makefile
diff --git a/src/test/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs b/tests/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs
index 316e68129..316e68129 100644
--- a/src/test/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs
+++ b/tests/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs
diff --git a/src/test/run-make-fulldeps/dep-info-spaces/Makefile b/tests/run-make-fulldeps/dep-info-spaces/Makefile
index 0cfe513e4..0cfe513e4 100644
--- a/src/test/run-make-fulldeps/dep-info-spaces/Makefile
+++ b/tests/run-make-fulldeps/dep-info-spaces/Makefile
diff --git a/src/test/run-make-fulldeps/dep-info-spaces/Makefile.foo b/tests/run-make-fulldeps/dep-info-spaces/Makefile.foo
index 80a5d4333..80a5d4333 100644
--- a/src/test/run-make-fulldeps/dep-info-spaces/Makefile.foo
+++ b/tests/run-make-fulldeps/dep-info-spaces/Makefile.foo
diff --git a/src/test/run-make-fulldeps/dep-info-spaces/bar.rs b/tests/run-make-fulldeps/dep-info-spaces/bar.rs
index c5c0bc606..c5c0bc606 100644
--- a/src/test/run-make-fulldeps/dep-info-spaces/bar.rs
+++ b/tests/run-make-fulldeps/dep-info-spaces/bar.rs
diff --git a/src/test/run-make-fulldeps/dep-info-spaces/foo foo.rs b/tests/run-make-fulldeps/dep-info-spaces/foo foo.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/run-make-fulldeps/dep-info-spaces/foo foo.rs
+++ b/tests/run-make-fulldeps/dep-info-spaces/foo foo.rs
diff --git a/src/test/run-make-fulldeps/dep-info-spaces/lib.rs b/tests/run-make-fulldeps/dep-info-spaces/lib.rs
index 6264e7b67..6264e7b67 100644
--- a/src/test/run-make-fulldeps/dep-info-spaces/lib.rs
+++ b/tests/run-make-fulldeps/dep-info-spaces/lib.rs
diff --git a/src/test/run-make-fulldeps/dep-info/Makefile b/tests/run-make-fulldeps/dep-info/Makefile
index c76f43a8e..c76f43a8e 100644
--- a/src/test/run-make-fulldeps/dep-info/Makefile
+++ b/tests/run-make-fulldeps/dep-info/Makefile
diff --git a/src/test/run-make-fulldeps/dep-info/Makefile.foo b/tests/run-make-fulldeps/dep-info/Makefile.foo
index e5df31f88..e5df31f88 100644
--- a/src/test/run-make-fulldeps/dep-info/Makefile.foo
+++ b/tests/run-make-fulldeps/dep-info/Makefile.foo
diff --git a/src/test/run-make-fulldeps/dep-info/bar.rs b/tests/run-make-fulldeps/dep-info/bar.rs
index c5c0bc606..c5c0bc606 100644
--- a/src/test/run-make-fulldeps/dep-info/bar.rs
+++ b/tests/run-make-fulldeps/dep-info/bar.rs
diff --git a/src/test/run-make-fulldeps/dep-info/foo.rs b/tests/run-make-fulldeps/dep-info/foo.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/run-make-fulldeps/dep-info/foo.rs
+++ b/tests/run-make-fulldeps/dep-info/foo.rs
diff --git a/src/test/run-make-fulldeps/dep-info/lib.rs b/tests/run-make-fulldeps/dep-info/lib.rs
index eb8631259..eb8631259 100644
--- a/src/test/run-make-fulldeps/dep-info/lib.rs
+++ b/tests/run-make-fulldeps/dep-info/lib.rs
diff --git a/src/test/run-make-fulldeps/dep-info/lib2.rs b/tests/run-make-fulldeps/dep-info/lib2.rs
index f4fda9c93..f4fda9c93 100644
--- a/src/test/run-make-fulldeps/dep-info/lib2.rs
+++ b/tests/run-make-fulldeps/dep-info/lib2.rs
diff --git a/src/test/run-make-fulldeps/doctests-keep-binaries/Makefile b/tests/run-make-fulldeps/doctests-keep-binaries/Makefile
index 273c8980b..273c8980b 100644
--- a/src/test/run-make-fulldeps/doctests-keep-binaries/Makefile
+++ b/tests/run-make-fulldeps/doctests-keep-binaries/Makefile
diff --git a/src/test/run-make-fulldeps/doctests-keep-binaries/t.rs b/tests/run-make-fulldeps/doctests-keep-binaries/t.rs
index c38cf0a0b..c38cf0a0b 100644
--- a/src/test/run-make-fulldeps/doctests-keep-binaries/t.rs
+++ b/tests/run-make-fulldeps/doctests-keep-binaries/t.rs
diff --git a/src/test/run-make-fulldeps/duplicate-output-flavors/Makefile b/tests/run-make-fulldeps/duplicate-output-flavors/Makefile
index e33279966..e33279966 100644
--- a/src/test/run-make-fulldeps/duplicate-output-flavors/Makefile
+++ b/tests/run-make-fulldeps/duplicate-output-flavors/Makefile
diff --git a/src/test/run-make-fulldeps/duplicate-output-flavors/foo.rs b/tests/run-make-fulldeps/duplicate-output-flavors/foo.rs
index c1bfaa6ca..c1bfaa6ca 100644
--- a/src/test/run-make-fulldeps/duplicate-output-flavors/foo.rs
+++ b/tests/run-make-fulldeps/duplicate-output-flavors/foo.rs
diff --git a/src/test/run-make-fulldeps/dylib-chain/Makefile b/tests/run-make-fulldeps/dylib-chain/Makefile
index 1139822f4..1139822f4 100644
--- a/src/test/run-make-fulldeps/dylib-chain/Makefile
+++ b/tests/run-make-fulldeps/dylib-chain/Makefile
diff --git a/src/test/run-make-fulldeps/dylib-chain/m1.rs b/tests/run-make-fulldeps/dylib-chain/m1.rs
index 08c3f3752..08c3f3752 100644
--- a/src/test/run-make-fulldeps/dylib-chain/m1.rs
+++ b/tests/run-make-fulldeps/dylib-chain/m1.rs
diff --git a/src/test/run-make-fulldeps/dylib-chain/m2.rs b/tests/run-make-fulldeps/dylib-chain/m2.rs
index 62176ddc9..62176ddc9 100644
--- a/src/test/run-make-fulldeps/dylib-chain/m2.rs
+++ b/tests/run-make-fulldeps/dylib-chain/m2.rs
diff --git a/src/test/run-make-fulldeps/dylib-chain/m3.rs b/tests/run-make-fulldeps/dylib-chain/m3.rs
index d213aeda9..d213aeda9 100644
--- a/src/test/run-make-fulldeps/dylib-chain/m3.rs
+++ b/tests/run-make-fulldeps/dylib-chain/m3.rs
diff --git a/src/test/run-make-fulldeps/dylib-chain/m4.rs b/tests/run-make-fulldeps/dylib-chain/m4.rs
index fa8ec6079..fa8ec6079 100644
--- a/src/test/run-make-fulldeps/dylib-chain/m4.rs
+++ b/tests/run-make-fulldeps/dylib-chain/m4.rs
diff --git a/src/test/run-make-fulldeps/emit-stack-sizes/Makefile b/tests/run-make-fulldeps/emit-stack-sizes/Makefile
index f636ebd28..f636ebd28 100644
--- a/src/test/run-make-fulldeps/emit-stack-sizes/Makefile
+++ b/tests/run-make-fulldeps/emit-stack-sizes/Makefile
diff --git a/src/test/run-make-fulldeps/emit-stack-sizes/foo.rs b/tests/run-make-fulldeps/emit-stack-sizes/foo.rs
index ee51ae328..ee51ae328 100644
--- a/src/test/run-make-fulldeps/emit-stack-sizes/foo.rs
+++ b/tests/run-make-fulldeps/emit-stack-sizes/foo.rs
diff --git a/src/test/run-make-fulldeps/emit/Makefile b/tests/run-make-fulldeps/emit/Makefile
index 78e68bd61..78e68bd61 100644
--- a/src/test/run-make-fulldeps/emit/Makefile
+++ b/tests/run-make-fulldeps/emit/Makefile
diff --git a/src/test/run-make-fulldeps/emit/test-24876.rs b/tests/run-make-fulldeps/emit/test-24876.rs
index 734e2ee4b..734e2ee4b 100644
--- a/src/test/run-make-fulldeps/emit/test-24876.rs
+++ b/tests/run-make-fulldeps/emit/test-24876.rs
diff --git a/src/test/run-make-fulldeps/emit/test-26235.rs b/tests/run-make-fulldeps/emit/test-26235.rs
index 07d975f33..07d975f33 100644
--- a/src/test/run-make-fulldeps/emit/test-26235.rs
+++ b/tests/run-make-fulldeps/emit/test-26235.rs
diff --git a/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile b/tests/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile
index 0eae41d72..0eae41d72 100644
--- a/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile
+++ b/tests/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile
diff --git a/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs b/tests/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs
index fe35f1f8e..fe35f1f8e 100644
--- a/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs
+++ b/tests/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs
diff --git a/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs b/tests/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs
+++ b/tests/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs
diff --git a/src/test/run-make-fulldeps/error-writing-dependencies/Makefile b/tests/run-make-fulldeps/error-writing-dependencies/Makefile
index a5d30a647..a5d30a647 100644
--- a/src/test/run-make-fulldeps/error-writing-dependencies/Makefile
+++ b/tests/run-make-fulldeps/error-writing-dependencies/Makefile
diff --git a/src/test/run-make-fulldeps/error-writing-dependencies/foo.rs b/tests/run-make-fulldeps/error-writing-dependencies/foo.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/error-writing-dependencies/foo.rs
+++ b/tests/run-make-fulldeps/error-writing-dependencies/foo.rs
diff --git a/src/test/run-make-fulldeps/exit-code/Makefile b/tests/run-make-fulldeps/exit-code/Makefile
index 3ffaafe90..3ffaafe90 100644
--- a/src/test/run-make-fulldeps/exit-code/Makefile
+++ b/tests/run-make-fulldeps/exit-code/Makefile
diff --git a/src/test/run-make-fulldeps/exit-code/compile-error.rs b/tests/run-make-fulldeps/exit-code/compile-error.rs
index a96c19760..a96c19760 100644
--- a/src/test/run-make-fulldeps/exit-code/compile-error.rs
+++ b/tests/run-make-fulldeps/exit-code/compile-error.rs
diff --git a/src/test/run-make-fulldeps/exit-code/lint-failure.rs b/tests/run-make-fulldeps/exit-code/lint-failure.rs
index df876ec23..df876ec23 100644
--- a/src/test/run-make-fulldeps/exit-code/lint-failure.rs
+++ b/tests/run-make-fulldeps/exit-code/lint-failure.rs
diff --git a/src/test/run-make-fulldeps/exit-code/success.rs b/tests/run-make-fulldeps/exit-code/success.rs
index 55b8e42b6..55b8e42b6 100644
--- a/src/test/run-make-fulldeps/exit-code/success.rs
+++ b/tests/run-make-fulldeps/exit-code/success.rs
diff --git a/src/test/run-make-fulldeps/extern-diff-internal-name/Makefile b/tests/run-make-fulldeps/extern-diff-internal-name/Makefile
index 54596c2f0..54596c2f0 100644
--- a/src/test/run-make-fulldeps/extern-diff-internal-name/Makefile
+++ b/tests/run-make-fulldeps/extern-diff-internal-name/Makefile
diff --git a/src/test/run-make-fulldeps/extern-diff-internal-name/lib.rs b/tests/run-make-fulldeps/extern-diff-internal-name/lib.rs
index ad96f7086..ad96f7086 100644
--- a/src/test/run-make-fulldeps/extern-diff-internal-name/lib.rs
+++ b/tests/run-make-fulldeps/extern-diff-internal-name/lib.rs
diff --git a/src/test/run-make-fulldeps/extern-diff-internal-name/test.rs b/tests/run-make-fulldeps/extern-diff-internal-name/test.rs
index 4c53dc28a..4c53dc28a 100644
--- a/src/test/run-make-fulldeps/extern-diff-internal-name/test.rs
+++ b/tests/run-make-fulldeps/extern-diff-internal-name/test.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-disambiguates/Makefile b/tests/run-make-fulldeps/extern-flag-disambiguates/Makefile
index a8f142a64..a8f142a64 100644
--- a/src/test/run-make-fulldeps/extern-flag-disambiguates/Makefile
+++ b/tests/run-make-fulldeps/extern-flag-disambiguates/Makefile
diff --git a/src/test/run-make-fulldeps/extern-flag-disambiguates/a.rs b/tests/run-make-fulldeps/extern-flag-disambiguates/a.rs
index 2b1a31901..2b1a31901 100644
--- a/src/test/run-make-fulldeps/extern-flag-disambiguates/a.rs
+++ b/tests/run-make-fulldeps/extern-flag-disambiguates/a.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-disambiguates/b.rs b/tests/run-make-fulldeps/extern-flag-disambiguates/b.rs
index 1d7a7339c..1d7a7339c 100644
--- a/src/test/run-make-fulldeps/extern-flag-disambiguates/b.rs
+++ b/tests/run-make-fulldeps/extern-flag-disambiguates/b.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-disambiguates/c.rs b/tests/run-make-fulldeps/extern-flag-disambiguates/c.rs
index 3f9d143ed..3f9d143ed 100644
--- a/src/test/run-make-fulldeps/extern-flag-disambiguates/c.rs
+++ b/tests/run-make-fulldeps/extern-flag-disambiguates/c.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-disambiguates/d.rs b/tests/run-make-fulldeps/extern-flag-disambiguates/d.rs
index 249c6a107..249c6a107 100644
--- a/src/test/run-make-fulldeps/extern-flag-disambiguates/d.rs
+++ b/tests/run-make-fulldeps/extern-flag-disambiguates/d.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-fun/Makefile b/tests/run-make-fulldeps/extern-flag-fun/Makefile
index a0b7c15ed..a0b7c15ed 100644
--- a/src/test/run-make-fulldeps/extern-flag-fun/Makefile
+++ b/tests/run-make-fulldeps/extern-flag-fun/Makefile
diff --git a/src/test/run-make-fulldeps/extern-flag-fun/bar-alt.rs b/tests/run-make-fulldeps/extern-flag-fun/bar-alt.rs
index cdc6c27d8..cdc6c27d8 100644
--- a/src/test/run-make-fulldeps/extern-flag-fun/bar-alt.rs
+++ b/tests/run-make-fulldeps/extern-flag-fun/bar-alt.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-fun/bar.rs b/tests/run-make-fulldeps/extern-flag-fun/bar.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/run-make-fulldeps/extern-flag-fun/bar.rs
+++ b/tests/run-make-fulldeps/extern-flag-fun/bar.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-fun/foo.rs b/tests/run-make-fulldeps/extern-flag-fun/foo.rs
index 0edda7d7b..0edda7d7b 100644
--- a/src/test/run-make-fulldeps/extern-flag-fun/foo.rs
+++ b/tests/run-make-fulldeps/extern-flag-fun/foo.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-fun/gated_unstable.rs b/tests/run-make-fulldeps/extern-flag-fun/gated_unstable.rs
index 03600c830..03600c830 100644
--- a/src/test/run-make-fulldeps/extern-flag-fun/gated_unstable.rs
+++ b/tests/run-make-fulldeps/extern-flag-fun/gated_unstable.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-fun/rustc.rs b/tests/run-make-fulldeps/extern-flag-fun/rustc.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/run-make-fulldeps/extern-flag-fun/rustc.rs
+++ b/tests/run-make-fulldeps/extern-flag-fun/rustc.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-pathless/Makefile b/tests/run-make-fulldeps/extern-flag-pathless/Makefile
index 0f23815b6..0f23815b6 100644
--- a/src/test/run-make-fulldeps/extern-flag-pathless/Makefile
+++ b/tests/run-make-fulldeps/extern-flag-pathless/Makefile
diff --git a/src/test/run-make-fulldeps/extern-flag-pathless/bar-dynamic.rs b/tests/run-make-fulldeps/extern-flag-pathless/bar-dynamic.rs
index e2d68d517..e2d68d517 100644
--- a/src/test/run-make-fulldeps/extern-flag-pathless/bar-dynamic.rs
+++ b/tests/run-make-fulldeps/extern-flag-pathless/bar-dynamic.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-pathless/bar-static.rs b/tests/run-make-fulldeps/extern-flag-pathless/bar-static.rs
index 240d8bde4..240d8bde4 100644
--- a/src/test/run-make-fulldeps/extern-flag-pathless/bar-static.rs
+++ b/tests/run-make-fulldeps/extern-flag-pathless/bar-static.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-pathless/foo.rs b/tests/run-make-fulldeps/extern-flag-pathless/foo.rs
index 1ea64da7d..1ea64da7d 100644
--- a/src/test/run-make-fulldeps/extern-flag-pathless/foo.rs
+++ b/tests/run-make-fulldeps/extern-flag-pathless/foo.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-rename-transitive/Makefile b/tests/run-make-fulldeps/extern-flag-rename-transitive/Makefile
index d16a8e208..d16a8e208 100644
--- a/src/test/run-make-fulldeps/extern-flag-rename-transitive/Makefile
+++ b/tests/run-make-fulldeps/extern-flag-rename-transitive/Makefile
diff --git a/src/test/run-make-fulldeps/extern-flag-rename-transitive/bar.rs b/tests/run-make-fulldeps/extern-flag-rename-transitive/bar.rs
index 94446a07d..94446a07d 100644
--- a/src/test/run-make-fulldeps/extern-flag-rename-transitive/bar.rs
+++ b/tests/run-make-fulldeps/extern-flag-rename-transitive/bar.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-rename-transitive/baz.rs b/tests/run-make-fulldeps/extern-flag-rename-transitive/baz.rs
index c3908db34..c3908db34 100644
--- a/src/test/run-make-fulldeps/extern-flag-rename-transitive/baz.rs
+++ b/tests/run-make-fulldeps/extern-flag-rename-transitive/baz.rs
diff --git a/src/test/run-make-fulldeps/extern-flag-rename-transitive/foo.rs b/tests/run-make-fulldeps/extern-flag-rename-transitive/foo.rs
index c1bfaa6ca..c1bfaa6ca 100644
--- a/src/test/run-make-fulldeps/extern-flag-rename-transitive/foo.rs
+++ b/tests/run-make-fulldeps/extern-flag-rename-transitive/foo.rs
diff --git a/src/test/run-make-fulldeps/extern-fn-generic/Makefile b/tests/run-make-fulldeps/extern-fn-generic/Makefile
index 71746fb10..71746fb10 100644
--- a/src/test/run-make-fulldeps/extern-fn-generic/Makefile
+++ b/tests/run-make-fulldeps/extern-fn-generic/Makefile
diff --git a/src/test/run-make-fulldeps/extern-fn-generic/test.c b/tests/run-make-fulldeps/extern-fn-generic/test.c
index a8504ff2a..a8504ff2a 100644
--- a/src/test/run-make-fulldeps/extern-fn-generic/test.c
+++ b/tests/run-make-fulldeps/extern-fn-generic/test.c
diff --git a/src/test/run-make-fulldeps/extern-fn-generic/test.rs b/tests/run-make-fulldeps/extern-fn-generic/test.rs
index c9baa4898..c9baa4898 100644
--- a/src/test/run-make-fulldeps/extern-fn-generic/test.rs
+++ b/tests/run-make-fulldeps/extern-fn-generic/test.rs
diff --git a/src/test/run-make-fulldeps/extern-fn-generic/testcrate.rs b/tests/run-make-fulldeps/extern-fn-generic/testcrate.rs
index 39f76e59c..39f76e59c 100644
--- a/src/test/run-make-fulldeps/extern-fn-generic/testcrate.rs
+++ b/tests/run-make-fulldeps/extern-fn-generic/testcrate.rs
diff --git a/src/test/run-make-fulldeps/extern-fn-mangle/Makefile b/tests/run-make-fulldeps/extern-fn-mangle/Makefile
index 4f5d026f2..4f5d026f2 100644
--- a/src/test/run-make-fulldeps/extern-fn-mangle/Makefile
+++ b/tests/run-make-fulldeps/extern-fn-mangle/Makefile
diff --git a/src/test/run-make-fulldeps/extern-fn-mangle/test.c b/tests/run-make-fulldeps/extern-fn-mangle/test.c
index e94d75083..e94d75083 100644
--- a/src/test/run-make-fulldeps/extern-fn-mangle/test.c
+++ b/tests/run-make-fulldeps/extern-fn-mangle/test.c
diff --git a/src/test/run-make-fulldeps/extern-fn-mangle/test.rs b/tests/run-make-fulldeps/extern-fn-mangle/test.rs
index 40b08f1ed..40b08f1ed 100644
--- a/src/test/run-make-fulldeps/extern-fn-mangle/test.rs
+++ b/tests/run-make-fulldeps/extern-fn-mangle/test.rs
diff --git a/src/test/run-make-fulldeps/extern-fn-reachable/Makefile b/tests/run-make-fulldeps/extern-fn-reachable/Makefile
index 05bdb8d65..05bdb8d65 100644
--- a/src/test/run-make-fulldeps/extern-fn-reachable/Makefile
+++ b/tests/run-make-fulldeps/extern-fn-reachable/Makefile
diff --git a/src/test/run-make-fulldeps/extern-fn-reachable/dylib.rs b/tests/run-make-fulldeps/extern-fn-reachable/dylib.rs
index cd0179348..cd0179348 100644
--- a/src/test/run-make-fulldeps/extern-fn-reachable/dylib.rs
+++ b/tests/run-make-fulldeps/extern-fn-reachable/dylib.rs
diff --git a/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile b/tests/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile
index 4f5d026f2..4f5d026f2 100644
--- a/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile
+++ b/tests/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile
diff --git a/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.c b/tests/run-make-fulldeps/extern-fn-struct-passing-abi/test.c
index 136b07129..136b07129 100644
--- a/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.c
+++ b/tests/run-make-fulldeps/extern-fn-struct-passing-abi/test.c
diff --git a/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs b/tests/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs
index afe0f52ef..afe0f52ef 100644
--- a/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs
+++ b/tests/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs
diff --git a/src/test/run-make-fulldeps/extern-fn-with-extern-types/Makefile b/tests/run-make-fulldeps/extern-fn-with-extern-types/Makefile
index 1fa708950..1fa708950 100644
--- a/src/test/run-make-fulldeps/extern-fn-with-extern-types/Makefile
+++ b/tests/run-make-fulldeps/extern-fn-with-extern-types/Makefile
diff --git a/src/test/run-make-fulldeps/extern-fn-with-extern-types/ctest.c b/tests/run-make-fulldeps/extern-fn-with-extern-types/ctest.c
index 3b6fb4cfc..3b6fb4cfc 100644
--- a/src/test/run-make-fulldeps/extern-fn-with-extern-types/ctest.c
+++ b/tests/run-make-fulldeps/extern-fn-with-extern-types/ctest.c
diff --git a/src/test/run-make-fulldeps/extern-fn-with-extern-types/test.rs b/tests/run-make-fulldeps/extern-fn-with-extern-types/test.rs
index 90a6ebaf1..90a6ebaf1 100644
--- a/src/test/run-make-fulldeps/extern-fn-with-extern-types/test.rs
+++ b/tests/run-make-fulldeps/extern-fn-with-extern-types/test.rs
diff --git a/src/test/run-make-fulldeps/extern-fn-with-packed-struct/Makefile b/tests/run-make-fulldeps/extern-fn-with-packed-struct/Makefile
index 4f5d026f2..4f5d026f2 100644
--- a/src/test/run-make-fulldeps/extern-fn-with-packed-struct/Makefile
+++ b/tests/run-make-fulldeps/extern-fn-with-packed-struct/Makefile
diff --git a/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.c b/tests/run-make-fulldeps/extern-fn-with-packed-struct/test.c
index c89f8272b..c89f8272b 100644
--- a/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.c
+++ b/tests/run-make-fulldeps/extern-fn-with-packed-struct/test.c
diff --git a/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.rs b/tests/run-make-fulldeps/extern-fn-with-packed-struct/test.rs
index 2f261efb5..2f261efb5 100644
--- a/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.rs
+++ b/tests/run-make-fulldeps/extern-fn-with-packed-struct/test.rs
diff --git a/src/test/run-make-fulldeps/extern-fn-with-union/Makefile b/tests/run-make-fulldeps/extern-fn-with-union/Makefile
index 40bae923e..40bae923e 100644
--- a/src/test/run-make-fulldeps/extern-fn-with-union/Makefile
+++ b/tests/run-make-fulldeps/extern-fn-with-union/Makefile
diff --git a/src/test/run-make-fulldeps/extern-fn-with-union/ctest.c b/tests/run-make-fulldeps/extern-fn-with-union/ctest.c
index 86cb64537..86cb64537 100644
--- a/src/test/run-make-fulldeps/extern-fn-with-union/ctest.c
+++ b/tests/run-make-fulldeps/extern-fn-with-union/ctest.c
diff --git a/src/test/run-make-fulldeps/extern-fn-with-union/test.rs b/tests/run-make-fulldeps/extern-fn-with-union/test.rs
index 438fbddf3..438fbddf3 100644
--- a/src/test/run-make-fulldeps/extern-fn-with-union/test.rs
+++ b/tests/run-make-fulldeps/extern-fn-with-union/test.rs
diff --git a/src/test/run-make-fulldeps/extern-fn-with-union/testcrate.rs b/tests/run-make-fulldeps/extern-fn-with-union/testcrate.rs
index 28d91ff37..28d91ff37 100644
--- a/src/test/run-make-fulldeps/extern-fn-with-union/testcrate.rs
+++ b/tests/run-make-fulldeps/extern-fn-with-union/testcrate.rs
diff --git a/src/test/run-make-fulldeps/extern-multiple-copies/Makefile b/tests/run-make-fulldeps/extern-multiple-copies/Makefile
index 00668a6bc..00668a6bc 100644
--- a/src/test/run-make-fulldeps/extern-multiple-copies/Makefile
+++ b/tests/run-make-fulldeps/extern-multiple-copies/Makefile
diff --git a/src/test/run-make-fulldeps/extern-multiple-copies/bar.rs b/tests/run-make-fulldeps/extern-multiple-copies/bar.rs
index c6b3595f6..c6b3595f6 100644
--- a/src/test/run-make-fulldeps/extern-multiple-copies/bar.rs
+++ b/tests/run-make-fulldeps/extern-multiple-copies/bar.rs
diff --git a/src/test/run-make-fulldeps/extern-multiple-copies/foo1.rs b/tests/run-make-fulldeps/extern-multiple-copies/foo1.rs
index c1bfaa6ca..c1bfaa6ca 100644
--- a/src/test/run-make-fulldeps/extern-multiple-copies/foo1.rs
+++ b/tests/run-make-fulldeps/extern-multiple-copies/foo1.rs
diff --git a/src/test/run-make-fulldeps/extern-multiple-copies/foo2.rs b/tests/run-make-fulldeps/extern-multiple-copies/foo2.rs
index c1bfaa6ca..c1bfaa6ca 100644
--- a/src/test/run-make-fulldeps/extern-multiple-copies/foo2.rs
+++ b/tests/run-make-fulldeps/extern-multiple-copies/foo2.rs
diff --git a/src/test/run-make-fulldeps/extern-multiple-copies2/Makefile b/tests/run-make-fulldeps/extern-multiple-copies2/Makefile
index 84de2ebf3..84de2ebf3 100644
--- a/src/test/run-make-fulldeps/extern-multiple-copies2/Makefile
+++ b/tests/run-make-fulldeps/extern-multiple-copies2/Makefile
diff --git a/src/test/run-make-fulldeps/extern-multiple-copies2/bar.rs b/tests/run-make-fulldeps/extern-multiple-copies2/bar.rs
index b3088152d..b3088152d 100644
--- a/src/test/run-make-fulldeps/extern-multiple-copies2/bar.rs
+++ b/tests/run-make-fulldeps/extern-multiple-copies2/bar.rs
diff --git a/src/test/run-make-fulldeps/extern-multiple-copies2/foo1.rs b/tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs
index 4c778e52f..4c778e52f 100644
--- a/src/test/run-make-fulldeps/extern-multiple-copies2/foo1.rs
+++ b/tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs
diff --git a/src/test/run-make-fulldeps/extern-multiple-copies2/foo2.rs b/tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs
index 2be103507..2be103507 100644
--- a/src/test/run-make-fulldeps/extern-multiple-copies2/foo2.rs
+++ b/tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs
diff --git a/src/test/run-make-fulldeps/extern-overrides-distribution/Makefile b/tests/run-make-fulldeps/extern-overrides-distribution/Makefile
index c57b062cd..c57b062cd 100644
--- a/src/test/run-make-fulldeps/extern-overrides-distribution/Makefile
+++ b/tests/run-make-fulldeps/extern-overrides-distribution/Makefile
diff --git a/src/test/run-make-fulldeps/extern-overrides-distribution/libc.rs b/tests/run-make-fulldeps/extern-overrides-distribution/libc.rs
index ee51ae328..ee51ae328 100644
--- a/src/test/run-make-fulldeps/extern-overrides-distribution/libc.rs
+++ b/tests/run-make-fulldeps/extern-overrides-distribution/libc.rs
diff --git a/src/test/run-make-fulldeps/extern-overrides-distribution/main.rs b/tests/run-make-fulldeps/extern-overrides-distribution/main.rs
index 1290a8c56..1290a8c56 100644
--- a/src/test/run-make-fulldeps/extern-overrides-distribution/main.rs
+++ b/tests/run-make-fulldeps/extern-overrides-distribution/main.rs
diff --git a/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile b/tests/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile
index 470448cf5..470448cf5 100644
--- a/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile
+++ b/tests/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile
diff --git a/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs b/tests/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs
+++ b/tests/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs
diff --git a/src/test/run-make-fulldeps/foreign-double-unwind/Makefile b/tests/run-make-fulldeps/foreign-double-unwind/Makefile
index ea2fe9ff8..ea2fe9ff8 100644
--- a/src/test/run-make-fulldeps/foreign-double-unwind/Makefile
+++ b/tests/run-make-fulldeps/foreign-double-unwind/Makefile
diff --git a/src/test/run-make-fulldeps/foreign-double-unwind/foo.cpp b/tests/run-make-fulldeps/foreign-double-unwind/foo.cpp
index 69a8f11c2..69a8f11c2 100644
--- a/src/test/run-make-fulldeps/foreign-double-unwind/foo.cpp
+++ b/tests/run-make-fulldeps/foreign-double-unwind/foo.cpp
diff --git a/src/test/run-make-fulldeps/foreign-double-unwind/foo.rs b/tests/run-make-fulldeps/foreign-double-unwind/foo.rs
index cae8aa940..cae8aa940 100644
--- a/src/test/run-make-fulldeps/foreign-double-unwind/foo.rs
+++ b/tests/run-make-fulldeps/foreign-double-unwind/foo.rs
diff --git a/src/test/run-make-fulldeps/foreign-exceptions/Makefile b/tests/run-make-fulldeps/foreign-exceptions/Makefile
index 38fe2773d..38fe2773d 100644
--- a/src/test/run-make-fulldeps/foreign-exceptions/Makefile
+++ b/tests/run-make-fulldeps/foreign-exceptions/Makefile
diff --git a/src/test/run-make-fulldeps/foreign-exceptions/foo.cpp b/tests/run-make-fulldeps/foreign-exceptions/foo.cpp
index 8182021a2..8182021a2 100644
--- a/src/test/run-make-fulldeps/foreign-exceptions/foo.cpp
+++ b/tests/run-make-fulldeps/foreign-exceptions/foo.cpp
diff --git a/src/test/run-make-fulldeps/foreign-exceptions/foo.rs b/tests/run-make-fulldeps/foreign-exceptions/foo.rs
index dd3b7c76f..dd3b7c76f 100644
--- a/src/test/run-make-fulldeps/foreign-exceptions/foo.rs
+++ b/tests/run-make-fulldeps/foreign-exceptions/foo.rs
diff --git a/src/test/run-make-fulldeps/foreign-rust-exceptions/Makefile b/tests/run-make-fulldeps/foreign-rust-exceptions/Makefile
index 50fca7f24..50fca7f24 100644
--- a/src/test/run-make-fulldeps/foreign-rust-exceptions/Makefile
+++ b/tests/run-make-fulldeps/foreign-rust-exceptions/Makefile
diff --git a/src/test/run-make-fulldeps/foreign-rust-exceptions/bar.rs b/tests/run-make-fulldeps/foreign-rust-exceptions/bar.rs
index 5f9efe323..5f9efe323 100644
--- a/src/test/run-make-fulldeps/foreign-rust-exceptions/bar.rs
+++ b/tests/run-make-fulldeps/foreign-rust-exceptions/bar.rs
diff --git a/src/test/run-make-fulldeps/foreign-rust-exceptions/foo.rs b/tests/run-make-fulldeps/foreign-rust-exceptions/foo.rs
index 266987c5b..266987c5b 100644
--- a/src/test/run-make-fulldeps/foreign-rust-exceptions/foo.rs
+++ b/tests/run-make-fulldeps/foreign-rust-exceptions/foo.rs
diff --git a/src/test/run-make-fulldeps/fpic/Makefile b/tests/run-make-fulldeps/fpic/Makefile
index 5986de366..5986de366 100644
--- a/src/test/run-make-fulldeps/fpic/Makefile
+++ b/tests/run-make-fulldeps/fpic/Makefile
diff --git a/src/test/run-make-fulldeps/fpic/hello.rs b/tests/run-make-fulldeps/fpic/hello.rs
index 45590d86b..45590d86b 100644
--- a/src/test/run-make-fulldeps/fpic/hello.rs
+++ b/tests/run-make-fulldeps/fpic/hello.rs
diff --git a/src/test/run-make-fulldeps/glibc-staticlib-args/Makefile b/tests/run-make-fulldeps/glibc-staticlib-args/Makefile
index 39e64bacf..39e64bacf 100644
--- a/src/test/run-make-fulldeps/glibc-staticlib-args/Makefile
+++ b/tests/run-make-fulldeps/glibc-staticlib-args/Makefile
diff --git a/src/test/run-make-fulldeps/glibc-staticlib-args/library.rs b/tests/run-make-fulldeps/glibc-staticlib-args/library.rs
index 5ab627a2a..5ab627a2a 100644
--- a/src/test/run-make-fulldeps/glibc-staticlib-args/library.rs
+++ b/tests/run-make-fulldeps/glibc-staticlib-args/library.rs
diff --git a/src/test/run-make-fulldeps/glibc-staticlib-args/program.c b/tests/run-make-fulldeps/glibc-staticlib-args/program.c
index 30f6974b7..30f6974b7 100644
--- a/src/test/run-make-fulldeps/glibc-staticlib-args/program.c
+++ b/tests/run-make-fulldeps/glibc-staticlib-args/program.c
diff --git a/src/test/run-make-fulldeps/hir-tree/Makefile b/tests/run-make-fulldeps/hir-tree/Makefile
index b0450ea4b..b0450ea4b 100644
--- a/src/test/run-make-fulldeps/hir-tree/Makefile
+++ b/tests/run-make-fulldeps/hir-tree/Makefile
diff --git a/src/test/run-make-fulldeps/hir-tree/input.rs b/tests/run-make-fulldeps/hir-tree/input.rs
index 9d1a4e9e4..9d1a4e9e4 100644
--- a/src/test/run-make-fulldeps/hir-tree/input.rs
+++ b/tests/run-make-fulldeps/hir-tree/input.rs
diff --git a/src/test/run-make-fulldeps/hotplug_codegen_backend/Makefile b/tests/run-make-fulldeps/hotplug_codegen_backend/Makefile
index 4cda243ff..4cda243ff 100644
--- a/src/test/run-make-fulldeps/hotplug_codegen_backend/Makefile
+++ b/tests/run-make-fulldeps/hotplug_codegen_backend/Makefile
diff --git a/src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs b/tests/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs
index da27b7f34..da27b7f34 100644
--- a/src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs
+++ b/tests/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs
diff --git a/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs b/tests/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs
index 3aa57d589..3aa57d589 100644
--- a/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs
+++ b/tests/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs
diff --git a/src/test/run-make-fulldeps/include_bytes_deps/Makefile b/tests/run-make-fulldeps/include_bytes_deps/Makefile
index 696dfd207..696dfd207 100644
--- a/src/test/run-make-fulldeps/include_bytes_deps/Makefile
+++ b/tests/run-make-fulldeps/include_bytes_deps/Makefile
diff --git a/src/test/run-make-fulldeps/include_bytes_deps/input.bin b/tests/run-make-fulldeps/include_bytes_deps/input.bin
index cd0875583..cd0875583 100644
--- a/src/test/run-make-fulldeps/include_bytes_deps/input.bin
+++ b/tests/run-make-fulldeps/include_bytes_deps/input.bin
diff --git a/src/test/run-make-fulldeps/include_bytes_deps/input.md b/tests/run-make-fulldeps/include_bytes_deps/input.md
index 2a19b7405..2a19b7405 100644
--- a/src/test/run-make-fulldeps/include_bytes_deps/input.md
+++ b/tests/run-make-fulldeps/include_bytes_deps/input.md
diff --git a/src/test/run-make-fulldeps/include_bytes_deps/input.txt b/tests/run-make-fulldeps/include_bytes_deps/input.txt
index cd0875583..cd0875583 100644
--- a/src/test/run-make-fulldeps/include_bytes_deps/input.txt
+++ b/tests/run-make-fulldeps/include_bytes_deps/input.txt
diff --git a/src/test/run-make-fulldeps/include_bytes_deps/main.rs b/tests/run-make-fulldeps/include_bytes_deps/main.rs
index 2fd55699d..2fd55699d 100644
--- a/src/test/run-make-fulldeps/include_bytes_deps/main.rs
+++ b/tests/run-make-fulldeps/include_bytes_deps/main.rs
diff --git a/src/test/run-make-fulldeps/incr-add-rust-src-component/Makefile b/tests/run-make-fulldeps/incr-add-rust-src-component/Makefile
index 5c1d953cc..5c1d953cc 100644
--- a/src/test/run-make-fulldeps/incr-add-rust-src-component/Makefile
+++ b/tests/run-make-fulldeps/incr-add-rust-src-component/Makefile
diff --git a/src/test/run-make-fulldeps/incr-add-rust-src-component/main.rs b/tests/run-make-fulldeps/incr-add-rust-src-component/main.rs
index f6320bcb0..f6320bcb0 100644
--- a/src/test/run-make-fulldeps/incr-add-rust-src-component/main.rs
+++ b/tests/run-make-fulldeps/incr-add-rust-src-component/main.rs
diff --git a/src/test/run-make-fulldeps/inline-always-many-cgu/Makefile b/tests/run-make-fulldeps/inline-always-many-cgu/Makefile
index 9945821db..9945821db 100644
--- a/src/test/run-make-fulldeps/inline-always-many-cgu/Makefile
+++ b/tests/run-make-fulldeps/inline-always-many-cgu/Makefile
diff --git a/src/test/run-make-fulldeps/inline-always-many-cgu/foo.rs b/tests/run-make-fulldeps/inline-always-many-cgu/foo.rs
index 65fe69c16..65fe69c16 100644
--- a/src/test/run-make-fulldeps/inline-always-many-cgu/foo.rs
+++ b/tests/run-make-fulldeps/inline-always-many-cgu/foo.rs
diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/Makefile b/tests/run-make-fulldeps/interdependent-c-libraries/Makefile
index dc5b55a99..dc5b55a99 100644
--- a/src/test/run-make-fulldeps/interdependent-c-libraries/Makefile
+++ b/tests/run-make-fulldeps/interdependent-c-libraries/Makefile
diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/bar.c b/tests/run-make-fulldeps/interdependent-c-libraries/bar.c
index 812c97535..812c97535 100644
--- a/src/test/run-make-fulldeps/interdependent-c-libraries/bar.c
+++ b/tests/run-make-fulldeps/interdependent-c-libraries/bar.c
diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/bar.rs b/tests/run-make-fulldeps/interdependent-c-libraries/bar.rs
index 3c2c3f218..3c2c3f218 100644
--- a/src/test/run-make-fulldeps/interdependent-c-libraries/bar.rs
+++ b/tests/run-make-fulldeps/interdependent-c-libraries/bar.rs
diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/foo.c b/tests/run-make-fulldeps/interdependent-c-libraries/foo.c
index 85e6cd8c3..85e6cd8c3 100644
--- a/src/test/run-make-fulldeps/interdependent-c-libraries/foo.c
+++ b/tests/run-make-fulldeps/interdependent-c-libraries/foo.c
diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/foo.rs b/tests/run-make-fulldeps/interdependent-c-libraries/foo.rs
index a69809726..a69809726 100644
--- a/src/test/run-make-fulldeps/interdependent-c-libraries/foo.rs
+++ b/tests/run-make-fulldeps/interdependent-c-libraries/foo.rs
diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/main.rs b/tests/run-make-fulldeps/interdependent-c-libraries/main.rs
index 2aba427df..2aba427df 100644
--- a/src/test/run-make-fulldeps/interdependent-c-libraries/main.rs
+++ b/tests/run-make-fulldeps/interdependent-c-libraries/main.rs
diff --git a/src/test/run-make-fulldeps/intrinsic-unreachable/Makefile b/tests/run-make-fulldeps/intrinsic-unreachable/Makefile
index ff9cc5709..ff9cc5709 100644
--- a/src/test/run-make-fulldeps/intrinsic-unreachable/Makefile
+++ b/tests/run-make-fulldeps/intrinsic-unreachable/Makefile
diff --git a/src/test/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs b/tests/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs
index e7b9694d9..e7b9694d9 100644
--- a/src/test/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs
+++ b/tests/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs
diff --git a/src/test/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs b/tests/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs
index ec85db733..ec85db733 100644
--- a/src/test/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs
+++ b/tests/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs
diff --git a/src/test/run-make-fulldeps/invalid-library/Makefile b/tests/run-make-fulldeps/invalid-library/Makefile
index 910d9af7b..910d9af7b 100644
--- a/src/test/run-make-fulldeps/invalid-library/Makefile
+++ b/tests/run-make-fulldeps/invalid-library/Makefile
diff --git a/src/test/run-make-fulldeps/invalid-library/foo.rs b/tests/run-make-fulldeps/invalid-library/foo.rs
index bb7b36c49..bb7b36c49 100644
--- a/src/test/run-make-fulldeps/invalid-library/foo.rs
+++ b/tests/run-make-fulldeps/invalid-library/foo.rs
diff --git a/src/test/run-make-fulldeps/invalid-staticlib/Makefile b/tests/run-make-fulldeps/invalid-staticlib/Makefile
index 3f0f74ce3..3f0f74ce3 100644
--- a/src/test/run-make-fulldeps/invalid-staticlib/Makefile
+++ b/tests/run-make-fulldeps/invalid-staticlib/Makefile
diff --git a/src/test/run-make-fulldeps/issue-11908/Makefile b/tests/run-make-fulldeps/issue-11908/Makefile
index 47005537e..47005537e 100644
--- a/src/test/run-make-fulldeps/issue-11908/Makefile
+++ b/tests/run-make-fulldeps/issue-11908/Makefile
diff --git a/src/test/run-make-fulldeps/issue-11908/bar.rs b/tests/run-make-fulldeps/issue-11908/bar.rs
index bb7b36c49..bb7b36c49 100644
--- a/src/test/run-make-fulldeps/issue-11908/bar.rs
+++ b/tests/run-make-fulldeps/issue-11908/bar.rs
diff --git a/src/test/run-make-fulldeps/issue-11908/foo.rs b/tests/run-make-fulldeps/issue-11908/foo.rs
index 82b2dfe9f..82b2dfe9f 100644
--- a/src/test/run-make-fulldeps/issue-11908/foo.rs
+++ b/tests/run-make-fulldeps/issue-11908/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-14500/Makefile b/tests/run-make-fulldeps/issue-14500/Makefile
index 52550e570..52550e570 100644
--- a/src/test/run-make-fulldeps/issue-14500/Makefile
+++ b/tests/run-make-fulldeps/issue-14500/Makefile
diff --git a/src/test/run-make-fulldeps/issue-14500/bar.rs b/tests/run-make-fulldeps/issue-14500/bar.rs
index 49af74e1b..49af74e1b 100644
--- a/src/test/run-make-fulldeps/issue-14500/bar.rs
+++ b/tests/run-make-fulldeps/issue-14500/bar.rs
diff --git a/src/test/run-make-fulldeps/issue-14500/foo.c b/tests/run-make-fulldeps/issue-14500/foo.c
index 2353d400d..2353d400d 100644
--- a/src/test/run-make-fulldeps/issue-14500/foo.c
+++ b/tests/run-make-fulldeps/issue-14500/foo.c
diff --git a/src/test/run-make-fulldeps/issue-14500/foo.rs b/tests/run-make-fulldeps/issue-14500/foo.rs
index 7c19c1f2c..7c19c1f2c 100644
--- a/src/test/run-make-fulldeps/issue-14500/foo.rs
+++ b/tests/run-make-fulldeps/issue-14500/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-14698/Makefile b/tests/run-make-fulldeps/issue-14698/Makefile
index a1cfb5aba..a1cfb5aba 100644
--- a/src/test/run-make-fulldeps/issue-14698/Makefile
+++ b/tests/run-make-fulldeps/issue-14698/Makefile
diff --git a/src/test/run-make-fulldeps/issue-14698/foo.rs b/tests/run-make-fulldeps/issue-14698/foo.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/issue-14698/foo.rs
+++ b/tests/run-make-fulldeps/issue-14698/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-15460/Makefile b/tests/run-make-fulldeps/issue-15460/Makefile
index 1648d0c0c..1648d0c0c 100644
--- a/src/test/run-make-fulldeps/issue-15460/Makefile
+++ b/tests/run-make-fulldeps/issue-15460/Makefile
diff --git a/src/test/run-make-fulldeps/issue-15460/bar.rs b/tests/run-make-fulldeps/issue-15460/bar.rs
index e66aeb6bd..e66aeb6bd 100644
--- a/src/test/run-make-fulldeps/issue-15460/bar.rs
+++ b/tests/run-make-fulldeps/issue-15460/bar.rs
diff --git a/src/test/run-make-fulldeps/issue-15460/foo.c b/tests/run-make-fulldeps/issue-15460/foo.c
index fdf595b57..fdf595b57 100644
--- a/src/test/run-make-fulldeps/issue-15460/foo.c
+++ b/tests/run-make-fulldeps/issue-15460/foo.c
diff --git a/src/test/run-make-fulldeps/issue-15460/foo.rs b/tests/run-make-fulldeps/issue-15460/foo.rs
index b4eaa0b31..b4eaa0b31 100644
--- a/src/test/run-make-fulldeps/issue-15460/foo.rs
+++ b/tests/run-make-fulldeps/issue-15460/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-18943/Makefile b/tests/run-make-fulldeps/issue-18943/Makefile
index fc40d756d..fc40d756d 100644
--- a/src/test/run-make-fulldeps/issue-18943/Makefile
+++ b/tests/run-make-fulldeps/issue-18943/Makefile
diff --git a/src/test/run-make-fulldeps/issue-18943/foo.rs b/tests/run-make-fulldeps/issue-18943/foo.rs
index d18400dd3..d18400dd3 100644
--- a/src/test/run-make-fulldeps/issue-18943/foo.rs
+++ b/tests/run-make-fulldeps/issue-18943/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-19371/Makefile b/tests/run-make-fulldeps/issue-19371/Makefile
index 994e50801..994e50801 100644
--- a/src/test/run-make-fulldeps/issue-19371/Makefile
+++ b/tests/run-make-fulldeps/issue-19371/Makefile
diff --git a/tests/run-make-fulldeps/issue-19371/foo.rs b/tests/run-make-fulldeps/issue-19371/foo.rs
new file mode 100644
index 000000000..5bb38fc02
--- /dev/null
+++ b/tests/run-make-fulldeps/issue-19371/foo.rs
@@ -0,0 +1,71 @@
+#![feature(rustc_private)]
+
+extern crate rustc_driver;
+extern crate rustc_interface;
+extern crate rustc_session;
+extern crate rustc_span;
+
+use rustc_interface::interface;
+use rustc_session::config::{Input, Options, OutputType, OutputTypes};
+use rustc_span::source_map::FileName;
+
+use std::path::PathBuf;
+
+fn main() {
+    let src = r#"
+    fn main() {}
+    "#;
+
+    let args: Vec<String> = std::env::args().collect();
+
+    if args.len() < 4 {
+        panic!("expected rustc path");
+    }
+
+    let tmpdir = PathBuf::from(&args[1]);
+
+    let mut sysroot = PathBuf::from(&args[3]);
+    sysroot.pop();
+    sysroot.pop();
+
+    compile(src.to_string(), tmpdir.join("out"), sysroot.clone());
+
+    compile(src.to_string(), tmpdir.join("out"), sysroot.clone());
+}
+
+fn compile(code: String, output: PathBuf, sysroot: PathBuf) {
+    let mut opts = Options::default();
+    opts.output_types = OutputTypes::new(&[(OutputType::Exe, None)]);
+    opts.maybe_sysroot = Some(sysroot);
+
+    if let Ok(linker) = std::env::var("RUSTC_LINKER") {
+        opts.cg.linker = Some(linker.into());
+    }
+
+    let name = FileName::anon_source_code(&code);
+    let input = Input::Str { name, input: code };
+
+    let config = interface::Config {
+        opts,
+        crate_cfg: Default::default(),
+        crate_check_cfg: Default::default(),
+        input,
+        output_file: Some(output),
+        output_dir: None,
+        file_loader: None,
+        lint_caps: Default::default(),
+        parse_sess_created: None,
+        register_lints: None,
+        override_queries: None,
+        make_codegen_backend: None,
+        registry: rustc_driver::diagnostics_registry(),
+    };
+
+    interface::run_compiler(config, |compiler| {
+        // This runs all the passes prior to linking, too.
+        let linker = compiler.enter(|queries| queries.linker());
+        if let Ok(linker) = linker {
+            linker.link();
+        }
+    });
+}
diff --git a/src/test/run-make-fulldeps/issue-20626/Makefile b/tests/run-make-fulldeps/issue-20626/Makefile
index f76f31e79..f76f31e79 100644
--- a/src/test/run-make-fulldeps/issue-20626/Makefile
+++ b/tests/run-make-fulldeps/issue-20626/Makefile
diff --git a/src/test/run-make-fulldeps/issue-20626/foo.rs b/tests/run-make-fulldeps/issue-20626/foo.rs
index a474e234e..a474e234e 100644
--- a/src/test/run-make-fulldeps/issue-20626/foo.rs
+++ b/tests/run-make-fulldeps/issue-20626/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-22131/Makefile b/tests/run-make-fulldeps/issue-22131/Makefile
index 770f4b04e..770f4b04e 100644
--- a/src/test/run-make-fulldeps/issue-22131/Makefile
+++ b/tests/run-make-fulldeps/issue-22131/Makefile
diff --git a/src/test/run-make-fulldeps/issue-22131/foo.rs b/tests/run-make-fulldeps/issue-22131/foo.rs
index 33255d768..33255d768 100644
--- a/src/test/run-make-fulldeps/issue-22131/foo.rs
+++ b/tests/run-make-fulldeps/issue-22131/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-24445/Makefile b/tests/run-make-fulldeps/issue-24445/Makefile
index 2a12226a6..2a12226a6 100644
--- a/src/test/run-make-fulldeps/issue-24445/Makefile
+++ b/tests/run-make-fulldeps/issue-24445/Makefile
diff --git a/src/test/run-make-fulldeps/issue-24445/foo.c b/tests/run-make-fulldeps/issue-24445/foo.c
index bb4036b06..bb4036b06 100644
--- a/src/test/run-make-fulldeps/issue-24445/foo.c
+++ b/tests/run-make-fulldeps/issue-24445/foo.c
diff --git a/src/test/run-make-fulldeps/issue-24445/foo.rs b/tests/run-make-fulldeps/issue-24445/foo.rs
index b67f3847c..b67f3847c 100644
--- a/src/test/run-make-fulldeps/issue-24445/foo.rs
+++ b/tests/run-make-fulldeps/issue-24445/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-25581/Makefile b/tests/run-make-fulldeps/issue-25581/Makefile
index 4f5d026f2..4f5d026f2 100644
--- a/src/test/run-make-fulldeps/issue-25581/Makefile
+++ b/tests/run-make-fulldeps/issue-25581/Makefile
diff --git a/src/test/run-make-fulldeps/issue-25581/test.c b/tests/run-make-fulldeps/issue-25581/test.c
index 52fbf7851..52fbf7851 100644
--- a/src/test/run-make-fulldeps/issue-25581/test.c
+++ b/tests/run-make-fulldeps/issue-25581/test.c
diff --git a/src/test/run-make-fulldeps/issue-25581/test.rs b/tests/run-make-fulldeps/issue-25581/test.rs
index ba6749c97..ba6749c97 100644
--- a/src/test/run-make-fulldeps/issue-25581/test.rs
+++ b/tests/run-make-fulldeps/issue-25581/test.rs
diff --git a/src/test/run-make-fulldeps/issue-26006/Makefile b/tests/run-make-fulldeps/issue-26006/Makefile
index 0ff073020..0ff073020 100644
--- a/src/test/run-make-fulldeps/issue-26006/Makefile
+++ b/tests/run-make-fulldeps/issue-26006/Makefile
diff --git a/src/test/run-make-fulldeps/issue-26006/in/libc/lib.rs b/tests/run-make-fulldeps/issue-26006/in/libc/lib.rs
index 23f2bf518..23f2bf518 100644
--- a/src/test/run-make-fulldeps/issue-26006/in/libc/lib.rs
+++ b/tests/run-make-fulldeps/issue-26006/in/libc/lib.rs
diff --git a/src/test/run-make-fulldeps/issue-26006/in/time/lib.rs b/tests/run-make-fulldeps/issue-26006/in/time/lib.rs
index 87f2f824a..87f2f824a 100644
--- a/src/test/run-make-fulldeps/issue-26006/in/time/lib.rs
+++ b/tests/run-make-fulldeps/issue-26006/in/time/lib.rs
diff --git a/src/test/run-make-fulldeps/issue-26092/Makefile b/tests/run-make-fulldeps/issue-26092/Makefile
index 96822e769..96822e769 100644
--- a/src/test/run-make-fulldeps/issue-26092/Makefile
+++ b/tests/run-make-fulldeps/issue-26092/Makefile
diff --git a/src/test/run-make-fulldeps/issue-26092/blank.rs b/tests/run-make-fulldeps/issue-26092/blank.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/issue-26092/blank.rs
+++ b/tests/run-make-fulldeps/issue-26092/blank.rs
diff --git a/src/test/run-make-fulldeps/issue-28595/Makefile b/tests/run-make-fulldeps/issue-28595/Makefile
index 30a1d9c56..30a1d9c56 100644
--- a/src/test/run-make-fulldeps/issue-28595/Makefile
+++ b/tests/run-make-fulldeps/issue-28595/Makefile
diff --git a/src/test/run-make-fulldeps/issue-28595/a.c b/tests/run-make-fulldeps/issue-28595/a.c
index 7bfd83cca..7bfd83cca 100644
--- a/src/test/run-make-fulldeps/issue-28595/a.c
+++ b/tests/run-make-fulldeps/issue-28595/a.c
diff --git a/src/test/run-make-fulldeps/issue-28595/a.rs b/tests/run-make-fulldeps/issue-28595/a.rs
index 07863cf64..07863cf64 100644
--- a/src/test/run-make-fulldeps/issue-28595/a.rs
+++ b/tests/run-make-fulldeps/issue-28595/a.rs
diff --git a/src/test/run-make-fulldeps/issue-28595/b.c b/tests/run-make-fulldeps/issue-28595/b.c
index 6aecb5f9e..6aecb5f9e 100644
--- a/src/test/run-make-fulldeps/issue-28595/b.c
+++ b/tests/run-make-fulldeps/issue-28595/b.c
diff --git a/src/test/run-make-fulldeps/issue-28595/b.rs b/tests/run-make-fulldeps/issue-28595/b.rs
index 1f389859f..1f389859f 100644
--- a/src/test/run-make-fulldeps/issue-28595/b.rs
+++ b/tests/run-make-fulldeps/issue-28595/b.rs
diff --git a/src/test/run-make-fulldeps/issue-28766/Makefile b/tests/run-make-fulldeps/issue-28766/Makefile
index 96d0bdc2b..96d0bdc2b 100644
--- a/src/test/run-make-fulldeps/issue-28766/Makefile
+++ b/tests/run-make-fulldeps/issue-28766/Makefile
diff --git a/src/test/run-make-fulldeps/issue-28766/foo.rs b/tests/run-make-fulldeps/issue-28766/foo.rs
index 1dcabe42d..1dcabe42d 100644
--- a/src/test/run-make-fulldeps/issue-28766/foo.rs
+++ b/tests/run-make-fulldeps/issue-28766/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-28766/main.rs b/tests/run-make-fulldeps/issue-28766/main.rs
index de12b1fd9..de12b1fd9 100644
--- a/src/test/run-make-fulldeps/issue-28766/main.rs
+++ b/tests/run-make-fulldeps/issue-28766/main.rs
diff --git a/src/test/run-make-fulldeps/issue-30063/Makefile b/tests/run-make-fulldeps/issue-30063/Makefile
index e4ede598f..e4ede598f 100644
--- a/src/test/run-make-fulldeps/issue-30063/Makefile
+++ b/tests/run-make-fulldeps/issue-30063/Makefile
diff --git a/src/test/run-make-fulldeps/issue-30063/foo.rs b/tests/run-make-fulldeps/issue-30063/foo.rs
index 45590d86b..45590d86b 100644
--- a/src/test/run-make-fulldeps/issue-30063/foo.rs
+++ b/tests/run-make-fulldeps/issue-30063/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-33329/Makefile b/tests/run-make-fulldeps/issue-33329/Makefile
index 9c149440d..9c149440d 100644
--- a/src/test/run-make-fulldeps/issue-33329/Makefile
+++ b/tests/run-make-fulldeps/issue-33329/Makefile
diff --git a/src/test/run-make-fulldeps/issue-33329/main.rs b/tests/run-make-fulldeps/issue-33329/main.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/issue-33329/main.rs
+++ b/tests/run-make-fulldeps/issue-33329/main.rs
diff --git a/src/test/run-make-fulldeps/issue-35164/Makefile b/tests/run-make-fulldeps/issue-35164/Makefile
index 38aa6f126..38aa6f126 100644
--- a/src/test/run-make-fulldeps/issue-35164/Makefile
+++ b/tests/run-make-fulldeps/issue-35164/Makefile
diff --git a/src/test/run-make-fulldeps/issue-35164/main.rs b/tests/run-make-fulldeps/issue-35164/main.rs
index 1333d6322..1333d6322 100644
--- a/src/test/run-make-fulldeps/issue-35164/main.rs
+++ b/tests/run-make-fulldeps/issue-35164/main.rs
diff --git a/src/test/run-make-fulldeps/issue-35164/submodule/mod.rs b/tests/run-make-fulldeps/issue-35164/submodule/mod.rs
index a9045b242..a9045b242 100644
--- a/src/test/run-make-fulldeps/issue-35164/submodule/mod.rs
+++ b/tests/run-make-fulldeps/issue-35164/submodule/mod.rs
diff --git a/src/test/run-make-fulldeps/issue-37839/Makefile b/tests/run-make-fulldeps/issue-37839/Makefile
index de50bd713..de50bd713 100644
--- a/src/test/run-make-fulldeps/issue-37839/Makefile
+++ b/tests/run-make-fulldeps/issue-37839/Makefile
diff --git a/src/test/run-make-fulldeps/issue-37839/a.rs b/tests/run-make-fulldeps/issue-37839/a.rs
index b5dffac3f..b5dffac3f 100644
--- a/src/test/run-make-fulldeps/issue-37839/a.rs
+++ b/tests/run-make-fulldeps/issue-37839/a.rs
diff --git a/src/test/run-make-fulldeps/issue-37839/b.rs b/tests/run-make-fulldeps/issue-37839/b.rs
index 355d2b165..355d2b165 100644
--- a/src/test/run-make-fulldeps/issue-37839/b.rs
+++ b/tests/run-make-fulldeps/issue-37839/b.rs
diff --git a/src/test/run-make-fulldeps/issue-37839/c.rs b/tests/run-make-fulldeps/issue-37839/c.rs
index 4c7ce01b6..4c7ce01b6 100644
--- a/src/test/run-make-fulldeps/issue-37839/c.rs
+++ b/tests/run-make-fulldeps/issue-37839/c.rs
diff --git a/src/test/run-make-fulldeps/issue-37893/Makefile b/tests/run-make-fulldeps/issue-37893/Makefile
index 33a60830e..33a60830e 100644
--- a/src/test/run-make-fulldeps/issue-37893/Makefile
+++ b/tests/run-make-fulldeps/issue-37893/Makefile
diff --git a/src/test/run-make-fulldeps/issue-37893/a.rs b/tests/run-make-fulldeps/issue-37893/a.rs
index b5dffac3f..b5dffac3f 100644
--- a/src/test/run-make-fulldeps/issue-37893/a.rs
+++ b/tests/run-make-fulldeps/issue-37893/a.rs
diff --git a/src/test/run-make-fulldeps/issue-37893/b.rs b/tests/run-make-fulldeps/issue-37893/b.rs
index 355d2b165..355d2b165 100644
--- a/src/test/run-make-fulldeps/issue-37893/b.rs
+++ b/tests/run-make-fulldeps/issue-37893/b.rs
diff --git a/src/test/run-make-fulldeps/issue-37893/c.rs b/tests/run-make-fulldeps/issue-37893/c.rs
index b9c215572..b9c215572 100644
--- a/src/test/run-make-fulldeps/issue-37893/c.rs
+++ b/tests/run-make-fulldeps/issue-37893/c.rs
diff --git a/src/test/run-make-fulldeps/issue-38237/Makefile b/tests/run-make-fulldeps/issue-38237/Makefile
index 75121d040..75121d040 100644
--- a/src/test/run-make-fulldeps/issue-38237/Makefile
+++ b/tests/run-make-fulldeps/issue-38237/Makefile
diff --git a/src/test/run-make-fulldeps/issue-38237/bar.rs b/tests/run-make-fulldeps/issue-38237/bar.rs
index 2b839f3a3..2b839f3a3 100644
--- a/src/test/run-make-fulldeps/issue-38237/bar.rs
+++ b/tests/run-make-fulldeps/issue-38237/bar.rs
diff --git a/src/test/run-make-fulldeps/issue-38237/baz.rs b/tests/run-make-fulldeps/issue-38237/baz.rs
index cd2425f9b..cd2425f9b 100644
--- a/src/test/run-make-fulldeps/issue-38237/baz.rs
+++ b/tests/run-make-fulldeps/issue-38237/baz.rs
diff --git a/src/test/run-make-fulldeps/issue-38237/foo.rs b/tests/run-make-fulldeps/issue-38237/foo.rs
index a106e4fde..a106e4fde 100644
--- a/src/test/run-make-fulldeps/issue-38237/foo.rs
+++ b/tests/run-make-fulldeps/issue-38237/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-40535/Makefile b/tests/run-make-fulldeps/issue-40535/Makefile
index 155c88252..155c88252 100644
--- a/src/test/run-make-fulldeps/issue-40535/Makefile
+++ b/tests/run-make-fulldeps/issue-40535/Makefile
diff --git a/src/test/run-make-fulldeps/issue-40535/bar.rs b/tests/run-make-fulldeps/issue-40535/bar.rs
index b02b28f59..b02b28f59 100644
--- a/src/test/run-make-fulldeps/issue-40535/bar.rs
+++ b/tests/run-make-fulldeps/issue-40535/bar.rs
diff --git a/src/test/run-make-fulldeps/issue-40535/baz.rs b/tests/run-make-fulldeps/issue-40535/baz.rs
index 83be6e807..83be6e807 100644
--- a/src/test/run-make-fulldeps/issue-40535/baz.rs
+++ b/tests/run-make-fulldeps/issue-40535/baz.rs
diff --git a/src/test/run-make-fulldeps/issue-40535/foo.rs b/tests/run-make-fulldeps/issue-40535/foo.rs
index 270202664..270202664 100644
--- a/src/test/run-make-fulldeps/issue-40535/foo.rs
+++ b/tests/run-make-fulldeps/issue-40535/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-46239/Makefile b/tests/run-make-fulldeps/issue-46239/Makefile
index a93ef3212..a93ef3212 100644
--- a/src/test/run-make-fulldeps/issue-46239/Makefile
+++ b/tests/run-make-fulldeps/issue-46239/Makefile
diff --git a/src/test/run-make-fulldeps/issue-46239/main.rs b/tests/run-make-fulldeps/issue-46239/main.rs
index b7df5cf4d..b7df5cf4d 100644
--- a/src/test/run-make-fulldeps/issue-46239/main.rs
+++ b/tests/run-make-fulldeps/issue-46239/main.rs
diff --git a/src/test/run-make-fulldeps/issue-47551/Makefile b/tests/run-make-fulldeps/issue-47551/Makefile
index 5a6ac7257..5a6ac7257 100644
--- a/src/test/run-make-fulldeps/issue-47551/Makefile
+++ b/tests/run-make-fulldeps/issue-47551/Makefile
diff --git a/src/test/run-make-fulldeps/issue-47551/eh_frame-terminator.rs b/tests/run-make-fulldeps/issue-47551/eh_frame-terminator.rs
index a2c7a31b7..a2c7a31b7 100644
--- a/src/test/run-make-fulldeps/issue-47551/eh_frame-terminator.rs
+++ b/tests/run-make-fulldeps/issue-47551/eh_frame-terminator.rs
diff --git a/src/test/run-make-fulldeps/issue-51671/Makefile b/tests/run-make-fulldeps/issue-51671/Makefile
index c93645369..c93645369 100644
--- a/src/test/run-make-fulldeps/issue-51671/Makefile
+++ b/tests/run-make-fulldeps/issue-51671/Makefile
diff --git a/src/test/run-make-fulldeps/issue-51671/app.rs b/tests/run-make-fulldeps/issue-51671/app.rs
index e9dc1e974..e9dc1e974 100644
--- a/src/test/run-make-fulldeps/issue-51671/app.rs
+++ b/tests/run-make-fulldeps/issue-51671/app.rs
diff --git a/src/test/run-make-fulldeps/issue-53964/Makefile b/tests/run-make-fulldeps/issue-53964/Makefile
index 6bd830213..6bd830213 100644
--- a/src/test/run-make-fulldeps/issue-53964/Makefile
+++ b/tests/run-make-fulldeps/issue-53964/Makefile
diff --git a/src/test/run-make-fulldeps/issue-53964/app.rs b/tests/run-make-fulldeps/issue-53964/app.rs
index 8127b9578..8127b9578 100644
--- a/src/test/run-make-fulldeps/issue-53964/app.rs
+++ b/tests/run-make-fulldeps/issue-53964/app.rs
diff --git a/src/test/run-make-fulldeps/issue-53964/panic.rs b/tests/run-make-fulldeps/issue-53964/panic.rs
index a87812050..a87812050 100644
--- a/src/test/run-make-fulldeps/issue-53964/panic.rs
+++ b/tests/run-make-fulldeps/issue-53964/panic.rs
diff --git a/src/test/run-make-fulldeps/issue-64153/Makefile b/tests/run-make-fulldeps/issue-64153/Makefile
index f42ea620f..f42ea620f 100644
--- a/src/test/run-make-fulldeps/issue-64153/Makefile
+++ b/tests/run-make-fulldeps/issue-64153/Makefile
diff --git a/src/test/run-make-fulldeps/issue-64153/downstream.rs b/tests/run-make-fulldeps/issue-64153/downstream.rs
index e03704665..e03704665 100644
--- a/src/test/run-make-fulldeps/issue-64153/downstream.rs
+++ b/tests/run-make-fulldeps/issue-64153/downstream.rs
diff --git a/src/test/run-make-fulldeps/issue-64153/upstream.rs b/tests/run-make-fulldeps/issue-64153/upstream.rs
index 861a00298..861a00298 100644
--- a/src/test/run-make-fulldeps/issue-64153/upstream.rs
+++ b/tests/run-make-fulldeps/issue-64153/upstream.rs
diff --git a/src/test/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/Makefile b/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/Makefile
index 13983f4ff..13983f4ff 100644
--- a/src/test/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/Makefile
+++ b/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/Makefile
diff --git a/src/test/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/bar.c b/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/bar.c
index bb4036b06..bb4036b06 100644
--- a/src/test/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/bar.c
+++ b/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/bar.c
diff --git a/src/test/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/foo.rs b/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/foo.rs
index a3e865b63..a3e865b63 100644
--- a/src/test/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/foo.rs
+++ b/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-69368/Makefile b/tests/run-make-fulldeps/issue-69368/Makefile
index 41770475d..41770475d 100644
--- a/src/test/run-make-fulldeps/issue-69368/Makefile
+++ b/tests/run-make-fulldeps/issue-69368/Makefile
diff --git a/src/test/run-make-fulldeps/issue-69368/a.rs b/tests/run-make-fulldeps/issue-69368/a.rs
index a54f42955..a54f42955 100644
--- a/src/test/run-make-fulldeps/issue-69368/a.rs
+++ b/tests/run-make-fulldeps/issue-69368/a.rs
diff --git a/src/test/run-make-fulldeps/issue-69368/b.rs b/tests/run-make-fulldeps/issue-69368/b.rs
index 4d6af0266..4d6af0266 100644
--- a/src/test/run-make-fulldeps/issue-69368/b.rs
+++ b/tests/run-make-fulldeps/issue-69368/b.rs
diff --git a/src/test/run-make-fulldeps/issue-69368/c.rs b/tests/run-make-fulldeps/issue-69368/c.rs
index 729c4249a..729c4249a 100644
--- a/src/test/run-make-fulldeps/issue-69368/c.rs
+++ b/tests/run-make-fulldeps/issue-69368/c.rs
diff --git a/src/test/run-make-fulldeps/issue-7349/Makefile b/tests/run-make-fulldeps/issue-7349/Makefile
index dc073b77f..dc073b77f 100644
--- a/src/test/run-make-fulldeps/issue-7349/Makefile
+++ b/tests/run-make-fulldeps/issue-7349/Makefile
diff --git a/src/test/run-make-fulldeps/issue-7349/foo.rs b/tests/run-make-fulldeps/issue-7349/foo.rs
index 246a12595..246a12595 100644
--- a/src/test/run-make-fulldeps/issue-7349/foo.rs
+++ b/tests/run-make-fulldeps/issue-7349/foo.rs
diff --git a/src/test/run-make-fulldeps/issue-83045/Makefile b/tests/run-make-fulldeps/issue-83045/Makefile
index 34853cb1d..34853cb1d 100644
--- a/src/test/run-make-fulldeps/issue-83045/Makefile
+++ b/tests/run-make-fulldeps/issue-83045/Makefile
diff --git a/src/test/run-make-fulldeps/issue-83045/a.rs b/tests/run-make-fulldeps/issue-83045/a.rs
index 66d9f758e..66d9f758e 100644
--- a/src/test/run-make-fulldeps/issue-83045/a.rs
+++ b/tests/run-make-fulldeps/issue-83045/a.rs
diff --git a/src/test/run-make-fulldeps/issue-83045/b.rs b/tests/run-make-fulldeps/issue-83045/b.rs
index f4876cfa4..f4876cfa4 100644
--- a/src/test/run-make-fulldeps/issue-83045/b.rs
+++ b/tests/run-make-fulldeps/issue-83045/b.rs
diff --git a/src/test/run-make-fulldeps/issue-83045/c.rs b/tests/run-make-fulldeps/issue-83045/c.rs
index e0c452549..e0c452549 100644
--- a/src/test/run-make-fulldeps/issue-83045/c.rs
+++ b/tests/run-make-fulldeps/issue-83045/c.rs
diff --git a/src/test/run-make-fulldeps/issue-84395-lto-embed-bitcode/Makefile b/tests/run-make-fulldeps/issue-84395-lto-embed-bitcode/Makefile
index 879ce1743..879ce1743 100644
--- a/src/test/run-make-fulldeps/issue-84395-lto-embed-bitcode/Makefile
+++ b/tests/run-make-fulldeps/issue-84395-lto-embed-bitcode/Makefile
diff --git a/src/test/run-make-fulldeps/issue-84395-lto-embed-bitcode/test.rs b/tests/run-make-fulldeps/issue-84395-lto-embed-bitcode/test.rs
index 47ad8c634..47ad8c634 100644
--- a/src/test/run-make-fulldeps/issue-84395-lto-embed-bitcode/test.rs
+++ b/tests/run-make-fulldeps/issue-84395-lto-embed-bitcode/test.rs
diff --git a/src/test/run-make-fulldeps/issue-97463-abi-param-passing/Makefile b/tests/run-make-fulldeps/issue-97463-abi-param-passing/Makefile
index db1b53e15..db1b53e15 100644
--- a/src/test/run-make-fulldeps/issue-97463-abi-param-passing/Makefile
+++ b/tests/run-make-fulldeps/issue-97463-abi-param-passing/Makefile
diff --git a/src/test/run-make-fulldeps/issue-97463-abi-param-passing/bad.c b/tests/run-make-fulldeps/issue-97463-abi-param-passing/bad.c
index 013314ab2..013314ab2 100644
--- a/src/test/run-make-fulldeps/issue-97463-abi-param-passing/bad.c
+++ b/tests/run-make-fulldeps/issue-97463-abi-param-passing/bad.c
diff --git a/src/test/run-make-fulldeps/issue-97463-abi-param-passing/param_passing.rs b/tests/run-make-fulldeps/issue-97463-abi-param-passing/param_passing.rs
index c11f3cc72..c11f3cc72 100644
--- a/src/test/run-make-fulldeps/issue-97463-abi-param-passing/param_passing.rs
+++ b/tests/run-make-fulldeps/issue-97463-abi-param-passing/param_passing.rs
diff --git a/src/test/run-make-fulldeps/issue64319/Makefile b/tests/run-make-fulldeps/issue64319/Makefile
index ee0d177ab..ee0d177ab 100644
--- a/src/test/run-make-fulldeps/issue64319/Makefile
+++ b/tests/run-make-fulldeps/issue64319/Makefile
diff --git a/src/test/run-make-fulldeps/issue64319/bar.rs b/tests/run-make-fulldeps/issue64319/bar.rs
index 3895c0b6c..3895c0b6c 100644
--- a/src/test/run-make-fulldeps/issue64319/bar.rs
+++ b/tests/run-make-fulldeps/issue64319/bar.rs
diff --git a/src/test/run-make-fulldeps/issue64319/foo.rs b/tests/run-make-fulldeps/issue64319/foo.rs
index c54a238e9..c54a238e9 100644
--- a/src/test/run-make-fulldeps/issue64319/foo.rs
+++ b/tests/run-make-fulldeps/issue64319/foo.rs
diff --git a/src/test/run-make-fulldeps/issues-41478-43796/Makefile b/tests/run-make-fulldeps/issues-41478-43796/Makefile
index e451cb031..e451cb031 100644
--- a/src/test/run-make-fulldeps/issues-41478-43796/Makefile
+++ b/tests/run-make-fulldeps/issues-41478-43796/Makefile
diff --git a/src/test/run-make-fulldeps/issues-41478-43796/a.rs b/tests/run-make-fulldeps/issues-41478-43796/a.rs
index b072235b5..b072235b5 100644
--- a/src/test/run-make-fulldeps/issues-41478-43796/a.rs
+++ b/tests/run-make-fulldeps/issues-41478-43796/a.rs
diff --git a/src/test/run-make-fulldeps/libs-through-symlinks/Makefile b/tests/run-make-fulldeps/libs-through-symlinks/Makefile
index 45deaecb8..45deaecb8 100644
--- a/src/test/run-make-fulldeps/libs-through-symlinks/Makefile
+++ b/tests/run-make-fulldeps/libs-through-symlinks/Makefile
diff --git a/src/test/run-make-fulldeps/libs-through-symlinks/bar.rs b/tests/run-make-fulldeps/libs-through-symlinks/bar.rs
index bb7b36c49..bb7b36c49 100644
--- a/src/test/run-make-fulldeps/libs-through-symlinks/bar.rs
+++ b/tests/run-make-fulldeps/libs-through-symlinks/bar.rs
diff --git a/src/test/run-make-fulldeps/libs-through-symlinks/foo.rs b/tests/run-make-fulldeps/libs-through-symlinks/foo.rs
index 8e3df2c6d..8e3df2c6d 100644
--- a/src/test/run-make-fulldeps/libs-through-symlinks/foo.rs
+++ b/tests/run-make-fulldeps/libs-through-symlinks/foo.rs
diff --git a/src/test/run-make-fulldeps/libtest-json/Makefile b/tests/run-make-fulldeps/libtest-json/Makefile
index 37b6cb9e2..37b6cb9e2 100644
--- a/src/test/run-make-fulldeps/libtest-json/Makefile
+++ b/tests/run-make-fulldeps/libtest-json/Makefile
diff --git a/src/test/run-make-fulldeps/libtest-json/f.rs b/tests/run-make-fulldeps/libtest-json/f.rs
index edfe25086..edfe25086 100644
--- a/src/test/run-make-fulldeps/libtest-json/f.rs
+++ b/tests/run-make-fulldeps/libtest-json/f.rs
diff --git a/src/test/run-make-fulldeps/libtest-json/output-default.json b/tests/run-make-fulldeps/libtest-json/output-default.json
index ad22b66ed..ad22b66ed 100644
--- a/src/test/run-make-fulldeps/libtest-json/output-default.json
+++ b/tests/run-make-fulldeps/libtest-json/output-default.json
diff --git a/src/test/run-make-fulldeps/libtest-json/output-stdout-success.json b/tests/run-make-fulldeps/libtest-json/output-stdout-success.json
index ec98172eb..ec98172eb 100644
--- a/src/test/run-make-fulldeps/libtest-json/output-stdout-success.json
+++ b/tests/run-make-fulldeps/libtest-json/output-stdout-success.json
diff --git a/src/test/run-make-fulldeps/libtest-json/validate_json.py b/tests/run-make-fulldeps/libtest-json/validate_json.py
index 657f732f2..657f732f2 100755
--- a/src/test/run-make-fulldeps/libtest-json/validate_json.py
+++ b/tests/run-make-fulldeps/libtest-json/validate_json.py
diff --git a/src/test/run-make-fulldeps/link-arg/Makefile b/tests/run-make-fulldeps/link-arg/Makefile
index 103527c3e..103527c3e 100644
--- a/src/test/run-make-fulldeps/link-arg/Makefile
+++ b/tests/run-make-fulldeps/link-arg/Makefile
diff --git a/src/test/run-make-fulldeps/link-arg/empty.rs b/tests/run-make-fulldeps/link-arg/empty.rs
index 45590d86b..45590d86b 100644
--- a/src/test/run-make-fulldeps/link-arg/empty.rs
+++ b/tests/run-make-fulldeps/link-arg/empty.rs
diff --git a/src/test/run-make-fulldeps/link-args-order/Makefile b/tests/run-make-fulldeps/link-args-order/Makefile
index c562cc1b3..c562cc1b3 100644
--- a/src/test/run-make-fulldeps/link-args-order/Makefile
+++ b/tests/run-make-fulldeps/link-args-order/Makefile
diff --git a/src/test/run-make-fulldeps/link-args-order/empty.rs b/tests/run-make-fulldeps/link-args-order/empty.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/link-args-order/empty.rs
+++ b/tests/run-make-fulldeps/link-args-order/empty.rs
diff --git a/src/test/run-make-fulldeps/link-cfg/Makefile b/tests/run-make-fulldeps/link-cfg/Makefile
index 0b25ccded..0b25ccded 100644
--- a/src/test/run-make-fulldeps/link-cfg/Makefile
+++ b/tests/run-make-fulldeps/link-cfg/Makefile
diff --git a/src/test/run-make-fulldeps/link-cfg/dep-with-staticlib.rs b/tests/run-make-fulldeps/link-cfg/dep-with-staticlib.rs
index 5ad66475d..5ad66475d 100644
--- a/src/test/run-make-fulldeps/link-cfg/dep-with-staticlib.rs
+++ b/tests/run-make-fulldeps/link-cfg/dep-with-staticlib.rs
diff --git a/src/test/run-make-fulldeps/link-cfg/dep.rs b/tests/run-make-fulldeps/link-cfg/dep.rs
index 40de77f05..40de77f05 100644
--- a/src/test/run-make-fulldeps/link-cfg/dep.rs
+++ b/tests/run-make-fulldeps/link-cfg/dep.rs
diff --git a/src/test/run-make-fulldeps/link-cfg/no-deps.rs b/tests/run-make-fulldeps/link-cfg/no-deps.rs
index ba5a8711a..ba5a8711a 100644
--- a/src/test/run-make-fulldeps/link-cfg/no-deps.rs
+++ b/tests/run-make-fulldeps/link-cfg/no-deps.rs
diff --git a/src/test/run-make-fulldeps/link-cfg/return1.c b/tests/run-make-fulldeps/link-cfg/return1.c
index 41c2809ad..41c2809ad 100644
--- a/src/test/run-make-fulldeps/link-cfg/return1.c
+++ b/tests/run-make-fulldeps/link-cfg/return1.c
diff --git a/src/test/run-make-fulldeps/link-cfg/return2.c b/tests/run-make-fulldeps/link-cfg/return2.c
index 622aeaa29..622aeaa29 100644
--- a/src/test/run-make-fulldeps/link-cfg/return2.c
+++ b/tests/run-make-fulldeps/link-cfg/return2.c
diff --git a/src/test/run-make-fulldeps/link-cfg/return3.c b/tests/run-make-fulldeps/link-cfg/return3.c
index f29dc60d5..f29dc60d5 100644
--- a/src/test/run-make-fulldeps/link-cfg/return3.c
+++ b/tests/run-make-fulldeps/link-cfg/return3.c
diff --git a/src/test/run-make-fulldeps/link-cfg/with-deps.rs b/tests/run-make-fulldeps/link-cfg/with-deps.rs
index 48b782815..48b782815 100644
--- a/src/test/run-make-fulldeps/link-cfg/with-deps.rs
+++ b/tests/run-make-fulldeps/link-cfg/with-deps.rs
diff --git a/src/test/run-make-fulldeps/link-cfg/with-staticlib-deps.rs b/tests/run-make-fulldeps/link-cfg/with-staticlib-deps.rs
index 23e5926a7..23e5926a7 100644
--- a/src/test/run-make-fulldeps/link-cfg/with-staticlib-deps.rs
+++ b/tests/run-make-fulldeps/link-cfg/with-staticlib-deps.rs
diff --git a/src/test/run-make-fulldeps/link-dedup/Makefile b/tests/run-make-fulldeps/link-dedup/Makefile
index eff18ab48..eff18ab48 100644
--- a/src/test/run-make-fulldeps/link-dedup/Makefile
+++ b/tests/run-make-fulldeps/link-dedup/Makefile
diff --git a/src/test/run-make-fulldeps/link-dedup/depa.rs b/tests/run-make-fulldeps/link-dedup/depa.rs
index 19178c5bd..19178c5bd 100644
--- a/src/test/run-make-fulldeps/link-dedup/depa.rs
+++ b/tests/run-make-fulldeps/link-dedup/depa.rs
diff --git a/src/test/run-make-fulldeps/link-dedup/depb.rs b/tests/run-make-fulldeps/link-dedup/depb.rs
index b1be21fe0..b1be21fe0 100644
--- a/src/test/run-make-fulldeps/link-dedup/depb.rs
+++ b/tests/run-make-fulldeps/link-dedup/depb.rs
diff --git a/src/test/run-make-fulldeps/link-dedup/depc.rs b/tests/run-make-fulldeps/link-dedup/depc.rs
index 8dcb3dee5..8dcb3dee5 100644
--- a/src/test/run-make-fulldeps/link-dedup/depc.rs
+++ b/tests/run-make-fulldeps/link-dedup/depc.rs
diff --git a/src/test/run-make-fulldeps/link-dedup/empty.rs b/tests/run-make-fulldeps/link-dedup/empty.rs
index e00ae18f4..e00ae18f4 100644
--- a/src/test/run-make-fulldeps/link-dedup/empty.rs
+++ b/tests/run-make-fulldeps/link-dedup/empty.rs
diff --git a/src/test/run-make-fulldeps/link-path-order/Makefile b/tests/run-make-fulldeps/link-path-order/Makefile
index ed7c299e6..ed7c299e6 100644
--- a/src/test/run-make-fulldeps/link-path-order/Makefile
+++ b/tests/run-make-fulldeps/link-path-order/Makefile
diff --git a/src/test/run-make-fulldeps/link-path-order/correct.c b/tests/run-make-fulldeps/link-path-order/correct.c
index 3064af952..3064af952 100644
--- a/src/test/run-make-fulldeps/link-path-order/correct.c
+++ b/tests/run-make-fulldeps/link-path-order/correct.c
diff --git a/src/test/run-make-fulldeps/link-path-order/main.rs b/tests/run-make-fulldeps/link-path-order/main.rs
index 8024e343d..8024e343d 100644
--- a/src/test/run-make-fulldeps/link-path-order/main.rs
+++ b/tests/run-make-fulldeps/link-path-order/main.rs
diff --git a/src/test/run-make-fulldeps/link-path-order/wrong.c b/tests/run-make-fulldeps/link-path-order/wrong.c
index 64275b3ad..64275b3ad 100644
--- a/src/test/run-make-fulldeps/link-path-order/wrong.c
+++ b/tests/run-make-fulldeps/link-path-order/wrong.c
diff --git a/src/test/run-make-fulldeps/linkage-attr-on-static/Makefile b/tests/run-make-fulldeps/linkage-attr-on-static/Makefile
index 7cc54e40a..7cc54e40a 100644
--- a/src/test/run-make-fulldeps/linkage-attr-on-static/Makefile
+++ b/tests/run-make-fulldeps/linkage-attr-on-static/Makefile
diff --git a/src/test/run-make-fulldeps/linkage-attr-on-static/bar.rs b/tests/run-make-fulldeps/linkage-attr-on-static/bar.rs
index 68607cbb6..68607cbb6 100644
--- a/src/test/run-make-fulldeps/linkage-attr-on-static/bar.rs
+++ b/tests/run-make-fulldeps/linkage-attr-on-static/bar.rs
diff --git a/src/test/run-make-fulldeps/linkage-attr-on-static/foo.c b/tests/run-make-fulldeps/linkage-attr-on-static/foo.c
index 78a6934f5..78a6934f5 100644
--- a/src/test/run-make-fulldeps/linkage-attr-on-static/foo.c
+++ b/tests/run-make-fulldeps/linkage-attr-on-static/foo.c
diff --git a/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile b/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile
index a38f4fe5d..a38f4fe5d 100644
--- a/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile
+++ b/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile
diff --git a/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.bat b/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.bat
index a9350f12b..a9350f12b 100644
--- a/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.bat
+++ b/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.bat
diff --git a/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs b/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs
index 74d7b9b07..74d7b9b07 100644
--- a/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs
+++ b/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs
diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile b/tests/run-make-fulldeps/long-linker-command-lines/Makefile
index 00199ca97..00199ca97 100644
--- a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
+++ b/tests/run-make-fulldeps/long-linker-command-lines/Makefile
diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/foo.rs b/tests/run-make-fulldeps/long-linker-command-lines/foo.rs
index db238c0cf..db238c0cf 100644
--- a/src/test/run-make-fulldeps/long-linker-command-lines/foo.rs
+++ b/tests/run-make-fulldeps/long-linker-command-lines/foo.rs
diff --git a/src/test/run-make-fulldeps/longjmp-across-rust/Makefile b/tests/run-make-fulldeps/longjmp-across-rust/Makefile
index 848638d82..848638d82 100644
--- a/src/test/run-make-fulldeps/longjmp-across-rust/Makefile
+++ b/tests/run-make-fulldeps/longjmp-across-rust/Makefile
diff --git a/src/test/run-make-fulldeps/longjmp-across-rust/foo.c b/tests/run-make-fulldeps/longjmp-across-rust/foo.c
index bd71cc4d7..bd71cc4d7 100644
--- a/src/test/run-make-fulldeps/longjmp-across-rust/foo.c
+++ b/tests/run-make-fulldeps/longjmp-across-rust/foo.c
diff --git a/src/test/run-make-fulldeps/longjmp-across-rust/main.rs b/tests/run-make-fulldeps/longjmp-across-rust/main.rs
index cc1d5b126..cc1d5b126 100644
--- a/src/test/run-make-fulldeps/longjmp-across-rust/main.rs
+++ b/tests/run-make-fulldeps/longjmp-across-rust/main.rs
diff --git a/src/test/run-make-fulldeps/ls-metadata/Makefile b/tests/run-make-fulldeps/ls-metadata/Makefile
index e0f916a24..e0f916a24 100644
--- a/src/test/run-make-fulldeps/ls-metadata/Makefile
+++ b/tests/run-make-fulldeps/ls-metadata/Makefile
diff --git a/src/test/run-make-fulldeps/ls-metadata/foo.rs b/tests/run-make-fulldeps/ls-metadata/foo.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/ls-metadata/foo.rs
+++ b/tests/run-make-fulldeps/ls-metadata/foo.rs
diff --git a/src/test/run-make-fulldeps/lto-dylib-dep/Makefile b/tests/run-make-fulldeps/lto-dylib-dep/Makefile
index 41487b23c..41487b23c 100644
--- a/src/test/run-make-fulldeps/lto-dylib-dep/Makefile
+++ b/tests/run-make-fulldeps/lto-dylib-dep/Makefile
diff --git a/src/test/run-make-fulldeps/lto-dylib-dep/a_dylib.rs b/tests/run-make-fulldeps/lto-dylib-dep/a_dylib.rs
index e63457e6e..e63457e6e 100644
--- a/src/test/run-make-fulldeps/lto-dylib-dep/a_dylib.rs
+++ b/tests/run-make-fulldeps/lto-dylib-dep/a_dylib.rs
diff --git a/src/test/run-make-fulldeps/lto-dylib-dep/main.rs b/tests/run-make-fulldeps/lto-dylib-dep/main.rs
index 4fb3c4730..4fb3c4730 100644
--- a/src/test/run-make-fulldeps/lto-dylib-dep/main.rs
+++ b/tests/run-make-fulldeps/lto-dylib-dep/main.rs
diff --git a/src/test/run-make-fulldeps/lto-empty/Makefile b/tests/run-make-fulldeps/lto-empty/Makefile
index b4345ba18..b4345ba18 100644
--- a/src/test/run-make-fulldeps/lto-empty/Makefile
+++ b/tests/run-make-fulldeps/lto-empty/Makefile
diff --git a/src/test/run-make-fulldeps/lto-empty/lib.rs b/tests/run-make-fulldeps/lto-empty/lib.rs
index e3663c790..e3663c790 100644
--- a/src/test/run-make-fulldeps/lto-empty/lib.rs
+++ b/tests/run-make-fulldeps/lto-empty/lib.rs
diff --git a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/Makefile b/tests/run-make-fulldeps/lto-no-link-whole-rlib/Makefile
index e576ee37c..e576ee37c 100644
--- a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/Makefile
+++ b/tests/run-make-fulldeps/lto-no-link-whole-rlib/Makefile
diff --git a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/bar.c b/tests/run-make-fulldeps/lto-no-link-whole-rlib/bar.c
index b25011930..b25011930 100644
--- a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/bar.c
+++ b/tests/run-make-fulldeps/lto-no-link-whole-rlib/bar.c
diff --git a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/foo.c b/tests/run-make-fulldeps/lto-no-link-whole-rlib/foo.c
index 75010458e..75010458e 100644
--- a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/foo.c
+++ b/tests/run-make-fulldeps/lto-no-link-whole-rlib/foo.c
diff --git a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs b/tests/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs
index f70bb3382..f70bb3382 100644
--- a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs
+++ b/tests/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs
diff --git a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs b/tests/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs
index 2dec2a271..2dec2a271 100644
--- a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs
+++ b/tests/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs
diff --git a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/main.rs b/tests/run-make-fulldeps/lto-no-link-whole-rlib/main.rs
index 0c658808e..0c658808e 100644
--- a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/main.rs
+++ b/tests/run-make-fulldeps/lto-no-link-whole-rlib/main.rs
diff --git a/src/test/run-make-fulldeps/lto-readonly-lib/Makefile b/tests/run-make-fulldeps/lto-readonly-lib/Makefile
index a20ecea88..a20ecea88 100644
--- a/src/test/run-make-fulldeps/lto-readonly-lib/Makefile
+++ b/tests/run-make-fulldeps/lto-readonly-lib/Makefile
diff --git a/src/test/run-make-fulldeps/lto-readonly-lib/lib.rs b/tests/run-make-fulldeps/lto-readonly-lib/lib.rs
index c1bfaa6ca..c1bfaa6ca 100644
--- a/src/test/run-make-fulldeps/lto-readonly-lib/lib.rs
+++ b/tests/run-make-fulldeps/lto-readonly-lib/lib.rs
diff --git a/src/test/run-make-fulldeps/lto-readonly-lib/main.rs b/tests/run-make-fulldeps/lto-readonly-lib/main.rs
index 69da798b3..69da798b3 100644
--- a/src/test/run-make-fulldeps/lto-readonly-lib/main.rs
+++ b/tests/run-make-fulldeps/lto-readonly-lib/main.rs
diff --git a/src/test/run-make-fulldeps/lto-smoke-c/Makefile b/tests/run-make-fulldeps/lto-smoke-c/Makefile
index 7c6ee3be8..7c6ee3be8 100644
--- a/src/test/run-make-fulldeps/lto-smoke-c/Makefile
+++ b/tests/run-make-fulldeps/lto-smoke-c/Makefile
diff --git a/src/test/run-make-fulldeps/lto-smoke-c/bar.c b/tests/run-make-fulldeps/lto-smoke-c/bar.c
index bb4036b06..bb4036b06 100644
--- a/src/test/run-make-fulldeps/lto-smoke-c/bar.c
+++ b/tests/run-make-fulldeps/lto-smoke-c/bar.c
diff --git a/src/test/run-make-fulldeps/lto-smoke-c/foo.rs b/tests/run-make-fulldeps/lto-smoke-c/foo.rs
index 2e59432cd..2e59432cd 100644
--- a/src/test/run-make-fulldeps/lto-smoke-c/foo.rs
+++ b/tests/run-make-fulldeps/lto-smoke-c/foo.rs
diff --git a/src/test/run-make-fulldeps/lto-smoke/Makefile b/tests/run-make-fulldeps/lto-smoke/Makefile
index 8bce708b4..8bce708b4 100644
--- a/src/test/run-make-fulldeps/lto-smoke/Makefile
+++ b/tests/run-make-fulldeps/lto-smoke/Makefile
diff --git a/src/test/run-make-fulldeps/lto-smoke/lib.rs b/tests/run-make-fulldeps/lto-smoke/lib.rs
index c1bfaa6ca..c1bfaa6ca 100644
--- a/src/test/run-make-fulldeps/lto-smoke/lib.rs
+++ b/tests/run-make-fulldeps/lto-smoke/lib.rs
diff --git a/src/test/run-make-fulldeps/lto-smoke/main.rs b/tests/run-make-fulldeps/lto-smoke/main.rs
index 69da798b3..69da798b3 100644
--- a/src/test/run-make-fulldeps/lto-smoke/main.rs
+++ b/tests/run-make-fulldeps/lto-smoke/main.rs
diff --git a/src/test/run-make-fulldeps/manual-crate-name/Makefile b/tests/run-make-fulldeps/manual-crate-name/Makefile
index c00e20c7c..c00e20c7c 100644
--- a/src/test/run-make-fulldeps/manual-crate-name/Makefile
+++ b/tests/run-make-fulldeps/manual-crate-name/Makefile
diff --git a/src/test/run-make-fulldeps/manual-crate-name/bar.rs b/tests/run-make-fulldeps/manual-crate-name/bar.rs
index c1bfaa6ca..c1bfaa6ca 100644
--- a/src/test/run-make-fulldeps/manual-crate-name/bar.rs
+++ b/tests/run-make-fulldeps/manual-crate-name/bar.rs
diff --git a/src/test/run-make-fulldeps/manual-link/Makefile b/tests/run-make-fulldeps/manual-link/Makefile
index 401f6eb44..401f6eb44 100644
--- a/src/test/run-make-fulldeps/manual-link/Makefile
+++ b/tests/run-make-fulldeps/manual-link/Makefile
diff --git a/src/test/run-make-fulldeps/manual-link/bar.c b/tests/run-make-fulldeps/manual-link/bar.c
index e42599986..e42599986 100644
--- a/src/test/run-make-fulldeps/manual-link/bar.c
+++ b/tests/run-make-fulldeps/manual-link/bar.c
diff --git a/src/test/run-make-fulldeps/manual-link/foo.c b/tests/run-make-fulldeps/manual-link/foo.c
index e42599986..e42599986 100644
--- a/src/test/run-make-fulldeps/manual-link/foo.c
+++ b/tests/run-make-fulldeps/manual-link/foo.c
diff --git a/src/test/run-make-fulldeps/manual-link/foo.rs b/tests/run-make-fulldeps/manual-link/foo.rs
index c1f28236f..c1f28236f 100644
--- a/src/test/run-make-fulldeps/manual-link/foo.rs
+++ b/tests/run-make-fulldeps/manual-link/foo.rs
diff --git a/src/test/run-make-fulldeps/manual-link/main.rs b/tests/run-make-fulldeps/manual-link/main.rs
index fe35f1f8e..fe35f1f8e 100644
--- a/src/test/run-make-fulldeps/manual-link/main.rs
+++ b/tests/run-make-fulldeps/manual-link/main.rs
diff --git a/src/test/run-make-fulldeps/many-crates-but-no-match/Makefile b/tests/run-make-fulldeps/many-crates-but-no-match/Makefile
index ca0ab8e9e..ca0ab8e9e 100644
--- a/src/test/run-make-fulldeps/many-crates-but-no-match/Makefile
+++ b/tests/run-make-fulldeps/many-crates-but-no-match/Makefile
diff --git a/src/test/run-make-fulldeps/many-crates-but-no-match/crateA1.rs b/tests/run-make-fulldeps/many-crates-but-no-match/crateA1.rs
index 3fed5a38e..3fed5a38e 100644
--- a/src/test/run-make-fulldeps/many-crates-but-no-match/crateA1.rs
+++ b/tests/run-make-fulldeps/many-crates-but-no-match/crateA1.rs
diff --git a/src/test/run-make-fulldeps/many-crates-but-no-match/crateA2.rs b/tests/run-make-fulldeps/many-crates-but-no-match/crateA2.rs
index 8db07a015..8db07a015 100644
--- a/src/test/run-make-fulldeps/many-crates-but-no-match/crateA2.rs
+++ b/tests/run-make-fulldeps/many-crates-but-no-match/crateA2.rs
diff --git a/src/test/run-make-fulldeps/many-crates-but-no-match/crateA3.rs b/tests/run-make-fulldeps/many-crates-but-no-match/crateA3.rs
index a1e8e40a3..a1e8e40a3 100644
--- a/src/test/run-make-fulldeps/many-crates-but-no-match/crateA3.rs
+++ b/tests/run-make-fulldeps/many-crates-but-no-match/crateA3.rs
diff --git a/src/test/run-make-fulldeps/many-crates-but-no-match/crateB.rs b/tests/run-make-fulldeps/many-crates-but-no-match/crateB.rs
index 4ccd65d65..4ccd65d65 100644
--- a/src/test/run-make-fulldeps/many-crates-but-no-match/crateB.rs
+++ b/tests/run-make-fulldeps/many-crates-but-no-match/crateB.rs
diff --git a/src/test/run-make-fulldeps/many-crates-but-no-match/crateC.rs b/tests/run-make-fulldeps/many-crates-but-no-match/crateC.rs
index a8b817ec6..a8b817ec6 100644
--- a/src/test/run-make-fulldeps/many-crates-but-no-match/crateC.rs
+++ b/tests/run-make-fulldeps/many-crates-but-no-match/crateC.rs
diff --git a/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile b/tests/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile
index dc6b10f4e..dc6b10f4e 100644
--- a/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile
+++ b/tests/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile
diff --git a/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs b/tests/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs
index 1e6957a36..1e6957a36 100644
--- a/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs
+++ b/tests/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs
diff --git a/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs b/tests/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs
index 696aed2fa..696aed2fa 100644
--- a/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs
+++ b/tests/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs
diff --git a/src/test/run-make-fulldeps/min-global-align/Makefile b/tests/run-make-fulldeps/min-global-align/Makefile
index 82f38749e..82f38749e 100644
--- a/src/test/run-make-fulldeps/min-global-align/Makefile
+++ b/tests/run-make-fulldeps/min-global-align/Makefile
diff --git a/src/test/run-make-fulldeps/min-global-align/min_global_align.rs b/tests/run-make-fulldeps/min-global-align/min_global_align.rs
index 135792e93..135792e93 100644
--- a/src/test/run-make-fulldeps/min-global-align/min_global_align.rs
+++ b/tests/run-make-fulldeps/min-global-align/min_global_align.rs
diff --git a/src/test/run-make-fulldeps/mingw-export-call-convention/Makefile b/tests/run-make-fulldeps/mingw-export-call-convention/Makefile
index 4a60059cc..4a60059cc 100644
--- a/src/test/run-make-fulldeps/mingw-export-call-convention/Makefile
+++ b/tests/run-make-fulldeps/mingw-export-call-convention/Makefile
diff --git a/src/test/run-make-fulldeps/mingw-export-call-convention/foo.rs b/tests/run-make-fulldeps/mingw-export-call-convention/foo.rs
index 1fec00311..1fec00311 100644
--- a/src/test/run-make-fulldeps/mingw-export-call-convention/foo.rs
+++ b/tests/run-make-fulldeps/mingw-export-call-convention/foo.rs
diff --git a/src/test/run-make-fulldeps/mismatching-target-triples/Makefile b/tests/run-make-fulldeps/mismatching-target-triples/Makefile
index 409388e04..409388e04 100644
--- a/src/test/run-make-fulldeps/mismatching-target-triples/Makefile
+++ b/tests/run-make-fulldeps/mismatching-target-triples/Makefile
diff --git a/src/test/run-make-fulldeps/mismatching-target-triples/bar.rs b/tests/run-make-fulldeps/mismatching-target-triples/bar.rs
index b2c2fc1c4..b2c2fc1c4 100644
--- a/src/test/run-make-fulldeps/mismatching-target-triples/bar.rs
+++ b/tests/run-make-fulldeps/mismatching-target-triples/bar.rs
diff --git a/src/test/run-make-fulldeps/mismatching-target-triples/foo.rs b/tests/run-make-fulldeps/mismatching-target-triples/foo.rs
index 6fa054914..6fa054914 100644
--- a/src/test/run-make-fulldeps/mismatching-target-triples/foo.rs
+++ b/tests/run-make-fulldeps/mismatching-target-triples/foo.rs
diff --git a/src/test/run-make-fulldeps/missing-crate-dependency/Makefile b/tests/run-make-fulldeps/missing-crate-dependency/Makefile
index 7c271ab8a..7c271ab8a 100644
--- a/src/test/run-make-fulldeps/missing-crate-dependency/Makefile
+++ b/tests/run-make-fulldeps/missing-crate-dependency/Makefile
diff --git a/src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs b/tests/run-make-fulldeps/missing-crate-dependency/crateA.rs
index 31433cb60..31433cb60 100644
--- a/src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs
+++ b/tests/run-make-fulldeps/missing-crate-dependency/crateA.rs
diff --git a/src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs b/tests/run-make-fulldeps/missing-crate-dependency/crateB.rs
index 4ccd65d65..4ccd65d65 100644
--- a/src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs
+++ b/tests/run-make-fulldeps/missing-crate-dependency/crateB.rs
diff --git a/src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs b/tests/run-make-fulldeps/missing-crate-dependency/crateC.rs
index a8b817ec6..a8b817ec6 100644
--- a/src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs
+++ b/tests/run-make-fulldeps/missing-crate-dependency/crateC.rs
diff --git a/src/test/run-make-fulldeps/mixing-deps/Makefile b/tests/run-make-fulldeps/mixing-deps/Makefile
index 956e704ee..956e704ee 100644
--- a/src/test/run-make-fulldeps/mixing-deps/Makefile
+++ b/tests/run-make-fulldeps/mixing-deps/Makefile
diff --git a/src/test/run-make-fulldeps/mixing-deps/both.rs b/tests/run-make-fulldeps/mixing-deps/both.rs
index 6a5818763..6a5818763 100644
--- a/src/test/run-make-fulldeps/mixing-deps/both.rs
+++ b/tests/run-make-fulldeps/mixing-deps/both.rs
diff --git a/src/test/run-make-fulldeps/mixing-deps/dylib.rs b/tests/run-make-fulldeps/mixing-deps/dylib.rs
index 88976d5b6..88976d5b6 100644
--- a/src/test/run-make-fulldeps/mixing-deps/dylib.rs
+++ b/tests/run-make-fulldeps/mixing-deps/dylib.rs
diff --git a/src/test/run-make-fulldeps/mixing-deps/prog.rs b/tests/run-make-fulldeps/mixing-deps/prog.rs
index 188981dc1..188981dc1 100644
--- a/src/test/run-make-fulldeps/mixing-deps/prog.rs
+++ b/tests/run-make-fulldeps/mixing-deps/prog.rs
diff --git a/src/test/run-make-fulldeps/mixing-formats/Makefile b/tests/run-make-fulldeps/mixing-formats/Makefile
index b27e54257..b27e54257 100644
--- a/src/test/run-make-fulldeps/mixing-formats/Makefile
+++ b/tests/run-make-fulldeps/mixing-formats/Makefile
diff --git a/src/test/run-make-fulldeps/mixing-formats/bar1.rs b/tests/run-make-fulldeps/mixing-formats/bar1.rs
index 49af74e1b..49af74e1b 100644
--- a/src/test/run-make-fulldeps/mixing-formats/bar1.rs
+++ b/tests/run-make-fulldeps/mixing-formats/bar1.rs
diff --git a/src/test/run-make-fulldeps/mixing-formats/bar2.rs b/tests/run-make-fulldeps/mixing-formats/bar2.rs
index 49af74e1b..49af74e1b 100644
--- a/src/test/run-make-fulldeps/mixing-formats/bar2.rs
+++ b/tests/run-make-fulldeps/mixing-formats/bar2.rs
diff --git a/src/test/run-make-fulldeps/mixing-formats/baz.rs b/tests/run-make-fulldeps/mixing-formats/baz.rs
index 99a73159e..99a73159e 100644
--- a/src/test/run-make-fulldeps/mixing-formats/baz.rs
+++ b/tests/run-make-fulldeps/mixing-formats/baz.rs
diff --git a/src/test/run-make-fulldeps/mixing-formats/baz2.rs b/tests/run-make-fulldeps/mixing-formats/baz2.rs
index d0fab1e4c..d0fab1e4c 100644
--- a/src/test/run-make-fulldeps/mixing-formats/baz2.rs
+++ b/tests/run-make-fulldeps/mixing-formats/baz2.rs
diff --git a/src/test/run-make-fulldeps/mixing-formats/foo.rs b/tests/run-make-fulldeps/mixing-formats/foo.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/run-make-fulldeps/mixing-formats/foo.rs
+++ b/tests/run-make-fulldeps/mixing-formats/foo.rs
diff --git a/src/test/run-make-fulldeps/mixing-libs/Makefile b/tests/run-make-fulldeps/mixing-libs/Makefile
index 39cc0708c..39cc0708c 100644
--- a/src/test/run-make-fulldeps/mixing-libs/Makefile
+++ b/tests/run-make-fulldeps/mixing-libs/Makefile
diff --git a/src/test/run-make-fulldeps/mixing-libs/dylib.rs b/tests/run-make-fulldeps/mixing-libs/dylib.rs
index 685688750..685688750 100644
--- a/src/test/run-make-fulldeps/mixing-libs/dylib.rs
+++ b/tests/run-make-fulldeps/mixing-libs/dylib.rs
diff --git a/src/test/run-make-fulldeps/mixing-libs/prog.rs b/tests/run-make-fulldeps/mixing-libs/prog.rs
index 14ce5c951..14ce5c951 100644
--- a/src/test/run-make-fulldeps/mixing-libs/prog.rs
+++ b/tests/run-make-fulldeps/mixing-libs/prog.rs
diff --git a/src/test/run-make-fulldeps/mixing-libs/rlib.rs b/tests/run-make-fulldeps/mixing-libs/rlib.rs
index 96dcd16bb..96dcd16bb 100644
--- a/src/test/run-make-fulldeps/mixing-libs/rlib.rs
+++ b/tests/run-make-fulldeps/mixing-libs/rlib.rs
diff --git a/src/test/run-make-fulldeps/msvc-opt-minsize/Makefile b/tests/run-make-fulldeps/msvc-opt-minsize/Makefile
index a5f019f24..a5f019f24 100644
--- a/src/test/run-make-fulldeps/msvc-opt-minsize/Makefile
+++ b/tests/run-make-fulldeps/msvc-opt-minsize/Makefile
diff --git a/src/test/run-make-fulldeps/msvc-opt-minsize/foo.rs b/tests/run-make-fulldeps/msvc-opt-minsize/foo.rs
index 3f5496c08..3f5496c08 100644
--- a/src/test/run-make-fulldeps/msvc-opt-minsize/foo.rs
+++ b/tests/run-make-fulldeps/msvc-opt-minsize/foo.rs
diff --git a/src/test/run-make-fulldeps/multiple-emits/Makefile b/tests/run-make-fulldeps/multiple-emits/Makefile
index d1f297644..d1f297644 100644
--- a/src/test/run-make-fulldeps/multiple-emits/Makefile
+++ b/tests/run-make-fulldeps/multiple-emits/Makefile
diff --git a/src/test/run-make-fulldeps/multiple-emits/foo.rs b/tests/run-make-fulldeps/multiple-emits/foo.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/multiple-emits/foo.rs
+++ b/tests/run-make-fulldeps/multiple-emits/foo.rs
diff --git a/src/test/run-make-fulldeps/no-builtins-lto/Makefile b/tests/run-make-fulldeps/no-builtins-lto/Makefile
index c8f05d991..c8f05d991 100644
--- a/src/test/run-make-fulldeps/no-builtins-lto/Makefile
+++ b/tests/run-make-fulldeps/no-builtins-lto/Makefile
diff --git a/src/test/run-make-fulldeps/no-builtins-lto/main.rs b/tests/run-make-fulldeps/no-builtins-lto/main.rs
index 890c999c8..890c999c8 100644
--- a/src/test/run-make-fulldeps/no-builtins-lto/main.rs
+++ b/tests/run-make-fulldeps/no-builtins-lto/main.rs
diff --git a/src/test/run-make-fulldeps/no-builtins-lto/no_builtins.rs b/tests/run-make-fulldeps/no-builtins-lto/no_builtins.rs
index 5d001031a..5d001031a 100644
--- a/src/test/run-make-fulldeps/no-builtins-lto/no_builtins.rs
+++ b/tests/run-make-fulldeps/no-builtins-lto/no_builtins.rs
diff --git a/src/test/run-make-fulldeps/no-duplicate-libs/Makefile b/tests/run-make-fulldeps/no-duplicate-libs/Makefile
index b05aff782..b05aff782 100644
--- a/src/test/run-make-fulldeps/no-duplicate-libs/Makefile
+++ b/tests/run-make-fulldeps/no-duplicate-libs/Makefile
diff --git a/src/test/run-make-fulldeps/no-duplicate-libs/bar.c b/tests/run-make-fulldeps/no-duplicate-libs/bar.c
index e36952657..e36952657 100644
--- a/src/test/run-make-fulldeps/no-duplicate-libs/bar.c
+++ b/tests/run-make-fulldeps/no-duplicate-libs/bar.c
diff --git a/src/test/run-make-fulldeps/no-duplicate-libs/foo.c b/tests/run-make-fulldeps/no-duplicate-libs/foo.c
index 85e6cd8c3..85e6cd8c3 100644
--- a/src/test/run-make-fulldeps/no-duplicate-libs/foo.c
+++ b/tests/run-make-fulldeps/no-duplicate-libs/foo.c
diff --git a/src/test/run-make-fulldeps/no-duplicate-libs/main.rs b/tests/run-make-fulldeps/no-duplicate-libs/main.rs
index b25ef35ad..b25ef35ad 100644
--- a/src/test/run-make-fulldeps/no-duplicate-libs/main.rs
+++ b/tests/run-make-fulldeps/no-duplicate-libs/main.rs
diff --git a/src/test/run-make-fulldeps/no-intermediate-extras/Makefile b/tests/run-make-fulldeps/no-intermediate-extras/Makefile
index 4116aac1b..4116aac1b 100644
--- a/src/test/run-make-fulldeps/no-intermediate-extras/Makefile
+++ b/tests/run-make-fulldeps/no-intermediate-extras/Makefile
diff --git a/src/test/run-make-fulldeps/no-intermediate-extras/foo.rs b/tests/run-make-fulldeps/no-intermediate-extras/foo.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/run-make-fulldeps/no-intermediate-extras/foo.rs
+++ b/tests/run-make-fulldeps/no-intermediate-extras/foo.rs
diff --git a/src/test/run-make-fulldeps/obey-crate-type-flag/Makefile b/tests/run-make-fulldeps/obey-crate-type-flag/Makefile
index effcfc94c..effcfc94c 100644
--- a/src/test/run-make-fulldeps/obey-crate-type-flag/Makefile
+++ b/tests/run-make-fulldeps/obey-crate-type-flag/Makefile
diff --git a/src/test/run-make-fulldeps/obey-crate-type-flag/test.rs b/tests/run-make-fulldeps/obey-crate-type-flag/test.rs
index 8a768f9de..8a768f9de 100644
--- a/src/test/run-make-fulldeps/obey-crate-type-flag/test.rs
+++ b/tests/run-make-fulldeps/obey-crate-type-flag/test.rs
diff --git a/tests/run-make-fulldeps/obtain-borrowck/Makefile b/tests/run-make-fulldeps/obtain-borrowck/Makefile
new file mode 100644
index 000000000..212d0f67d
--- /dev/null
+++ b/tests/run-make-fulldeps/obtain-borrowck/Makefile
@@ -0,0 +1,26 @@
+include ../tools.mk
+
+# This example shows how to implement a rustc driver that retrieves MIR bodies
+# together with the borrow checker information.
+
+# How to run this
+# $ ./x.py test tests/run-make-fulldeps/obtain-borrowck
+
+DRIVER_BINARY := "$(TMPDIR)"/driver
+SYSROOT := $(shell $(RUSTC) --print sysroot)
+
+ifdef IS_WINDOWS
+LIBSTD := -L "$(SYSROOT)\\lib\\rustlib\\$(TARGET)\\lib"
+else
+LIBSTD :=
+endif
+
+all:
+	$(RUSTC) driver.rs -o "$(DRIVER_BINARY)"
+	$(TARGET_RPATH_ENV) "$(DRIVER_BINARY)" --sysroot $(SYSROOT) $(LIBSTD) test.rs -o "$(TMPDIR)/driver_test" > "$(TMPDIR)"/output.stdout
+
+ifdef RUSTC_BLESS_TEST
+	cp "$(TMPDIR)"/output.stdout output.stdout
+else
+	$(DIFF) output.stdout "$(TMPDIR)"/output.stdout
+endif
diff --git a/src/test/run-make-fulldeps/obtain-borrowck/driver.rs b/tests/run-make-fulldeps/obtain-borrowck/driver.rs
index a6c60df83..9cd504f00 100644
--- a/src/test/run-make-fulldeps/obtain-borrowck/driver.rs
+++ b/tests/run-make-fulldeps/obtain-borrowck/driver.rs
@@ -62,7 +62,7 @@ impl rustc_driver::Callbacks for CompilerCalls {
         queries: &'tcx Queries<'tcx>,
     ) -> Compilation {
         compiler.session().abort_if_errors();
-        queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
+        queries.global_ctxt().unwrap().enter(|tcx| {
             // Collect definition ids of MIR bodies.
             let hir = tcx.hir();
             let mut bodies = Vec::new();
diff --git a/src/test/run-make-fulldeps/obtain-borrowck/output.stdout b/tests/run-make-fulldeps/obtain-borrowck/output.stdout
index e011622e6..e011622e6 100644
--- a/src/test/run-make-fulldeps/obtain-borrowck/output.stdout
+++ b/tests/run-make-fulldeps/obtain-borrowck/output.stdout
diff --git a/src/test/run-make-fulldeps/obtain-borrowck/test.rs b/tests/run-make-fulldeps/obtain-borrowck/test.rs
index f7b4b41fe..f7b4b41fe 100644
--- a/src/test/run-make-fulldeps/obtain-borrowck/test.rs
+++ b/tests/run-make-fulldeps/obtain-borrowck/test.rs
diff --git a/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile b/tests/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile
index 45221356c..45221356c 100644
--- a/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile
+++ b/tests/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile
diff --git a/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs b/tests/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs
+++ b/tests/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs
diff --git a/src/test/run-make-fulldeps/output-filename-overwrites-input/Makefile b/tests/run-make-fulldeps/output-filename-overwrites-input/Makefile
index 33069c06f..33069c06f 100644
--- a/src/test/run-make-fulldeps/output-filename-overwrites-input/Makefile
+++ b/tests/run-make-fulldeps/output-filename-overwrites-input/Makefile
diff --git a/src/test/run-make-fulldeps/output-filename-overwrites-input/bar.rs b/tests/run-make-fulldeps/output-filename-overwrites-input/bar.rs
index 83be6e807..83be6e807 100644
--- a/src/test/run-make-fulldeps/output-filename-overwrites-input/bar.rs
+++ b/tests/run-make-fulldeps/output-filename-overwrites-input/bar.rs
diff --git a/src/test/run-make-fulldeps/output-filename-overwrites-input/foo.rs b/tests/run-make-fulldeps/output-filename-overwrites-input/foo.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/output-filename-overwrites-input/foo.rs
+++ b/tests/run-make-fulldeps/output-filename-overwrites-input/foo.rs
diff --git a/src/test/run-make-fulldeps/output-type-permutations/Makefile b/tests/run-make-fulldeps/output-type-permutations/Makefile
index 791606c64..791606c64 100644
--- a/src/test/run-make-fulldeps/output-type-permutations/Makefile
+++ b/tests/run-make-fulldeps/output-type-permutations/Makefile
diff --git a/src/test/run-make-fulldeps/output-type-permutations/foo.rs b/tests/run-make-fulldeps/output-type-permutations/foo.rs
index f0a2cc6ad..f0a2cc6ad 100644
--- a/src/test/run-make-fulldeps/output-type-permutations/foo.rs
+++ b/tests/run-make-fulldeps/output-type-permutations/foo.rs
diff --git a/src/test/run-make-fulldeps/output-with-hyphens/Makefile b/tests/run-make-fulldeps/output-with-hyphens/Makefile
index 365fb6e59..365fb6e59 100644
--- a/src/test/run-make-fulldeps/output-with-hyphens/Makefile
+++ b/tests/run-make-fulldeps/output-with-hyphens/Makefile
diff --git a/src/test/run-make-fulldeps/output-with-hyphens/foo-bar.rs b/tests/run-make-fulldeps/output-with-hyphens/foo-bar.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/output-with-hyphens/foo-bar.rs
+++ b/tests/run-make-fulldeps/output-with-hyphens/foo-bar.rs
diff --git a/src/test/run-make-fulldeps/override-aliased-flags/Makefile b/tests/run-make-fulldeps/override-aliased-flags/Makefile
index 186b8c7c8..186b8c7c8 100644
--- a/src/test/run-make-fulldeps/override-aliased-flags/Makefile
+++ b/tests/run-make-fulldeps/override-aliased-flags/Makefile
diff --git a/src/test/run-make-fulldeps/override-aliased-flags/main.rs b/tests/run-make-fulldeps/override-aliased-flags/main.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/override-aliased-flags/main.rs
+++ b/tests/run-make-fulldeps/override-aliased-flags/main.rs
diff --git a/src/test/run-make-fulldeps/panic-impl-transitive/Makefile b/tests/run-make-fulldeps/panic-impl-transitive/Makefile
index c3192efcb..c3192efcb 100644
--- a/src/test/run-make-fulldeps/panic-impl-transitive/Makefile
+++ b/tests/run-make-fulldeps/panic-impl-transitive/Makefile
diff --git a/src/test/run-make-fulldeps/panic-impl-transitive/panic-impl-consumer.rs b/tests/run-make-fulldeps/panic-impl-transitive/panic-impl-consumer.rs
index 82a98b12d..82a98b12d 100644
--- a/src/test/run-make-fulldeps/panic-impl-transitive/panic-impl-consumer.rs
+++ b/tests/run-make-fulldeps/panic-impl-transitive/panic-impl-consumer.rs
diff --git a/src/test/run-make-fulldeps/panic-impl-transitive/panic-impl-provider.rs b/tests/run-make-fulldeps/panic-impl-transitive/panic-impl-provider.rs
index f1b9873c8..f1b9873c8 100644
--- a/src/test/run-make-fulldeps/panic-impl-transitive/panic-impl-provider.rs
+++ b/tests/run-make-fulldeps/panic-impl-transitive/panic-impl-provider.rs
diff --git a/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile b/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile
index 42d3c977f..42d3c977f 100644
--- a/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile
+++ b/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile
diff --git a/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs b/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs
index 517286a86..517286a86 100644
--- a/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs
+++ b/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs
diff --git a/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/test.c b/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/test.c
index 99511b253..99511b253 100644
--- a/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/test.c
+++ b/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/test.c
diff --git a/src/test/run-make-fulldeps/pgo-branch-weights/Makefile b/tests/run-make-fulldeps/pgo-branch-weights/Makefile
index c60206a1f..c60206a1f 100644
--- a/src/test/run-make-fulldeps/pgo-branch-weights/Makefile
+++ b/tests/run-make-fulldeps/pgo-branch-weights/Makefile
diff --git a/src/test/run-make-fulldeps/pgo-branch-weights/filecheck-patterns.txt b/tests/run-make-fulldeps/pgo-branch-weights/filecheck-patterns.txt
index 70d5a645c..70d5a645c 100644
--- a/src/test/run-make-fulldeps/pgo-branch-weights/filecheck-patterns.txt
+++ b/tests/run-make-fulldeps/pgo-branch-weights/filecheck-patterns.txt
diff --git a/src/test/run-make-fulldeps/pgo-branch-weights/interesting.rs b/tests/run-make-fulldeps/pgo-branch-weights/interesting.rs
index a26d6fd69..a26d6fd69 100644
--- a/src/test/run-make-fulldeps/pgo-branch-weights/interesting.rs
+++ b/tests/run-make-fulldeps/pgo-branch-weights/interesting.rs
diff --git a/src/test/run-make-fulldeps/pgo-branch-weights/main.rs b/tests/run-make-fulldeps/pgo-branch-weights/main.rs
index 619cf9c69..619cf9c69 100644
--- a/src/test/run-make-fulldeps/pgo-branch-weights/main.rs
+++ b/tests/run-make-fulldeps/pgo-branch-weights/main.rs
diff --git a/src/test/run-make-fulldeps/pgo-branch-weights/opaque.rs b/tests/run-make-fulldeps/pgo-branch-weights/opaque.rs
index 72f93c9fe..72f93c9fe 100644
--- a/src/test/run-make-fulldeps/pgo-branch-weights/opaque.rs
+++ b/tests/run-make-fulldeps/pgo-branch-weights/opaque.rs
diff --git a/src/test/run-make-fulldeps/pgo-gen-lto/Makefile b/tests/run-make-fulldeps/pgo-gen-lto/Makefile
index 3f2f6a838..3f2f6a838 100644
--- a/src/test/run-make-fulldeps/pgo-gen-lto/Makefile
+++ b/tests/run-make-fulldeps/pgo-gen-lto/Makefile
diff --git a/src/test/run-make-fulldeps/pgo-gen-lto/test.rs b/tests/run-make-fulldeps/pgo-gen-lto/test.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/pgo-gen-lto/test.rs
+++ b/tests/run-make-fulldeps/pgo-gen-lto/test.rs
diff --git a/src/test/run-make-fulldeps/pgo-gen-no-imp-symbols/Makefile b/tests/run-make-fulldeps/pgo-gen-no-imp-symbols/Makefile
index 7f72b11b6..7f72b11b6 100644
--- a/src/test/run-make-fulldeps/pgo-gen-no-imp-symbols/Makefile
+++ b/tests/run-make-fulldeps/pgo-gen-no-imp-symbols/Makefile
diff --git a/src/test/run-make-fulldeps/pgo-gen-no-imp-symbols/test.rs b/tests/run-make-fulldeps/pgo-gen-no-imp-symbols/test.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/pgo-gen-no-imp-symbols/test.rs
+++ b/tests/run-make-fulldeps/pgo-gen-no-imp-symbols/test.rs
diff --git a/src/test/run-make-fulldeps/pgo-gen/Makefile b/tests/run-make-fulldeps/pgo-gen/Makefile
index 4623a7495..4623a7495 100644
--- a/src/test/run-make-fulldeps/pgo-gen/Makefile
+++ b/tests/run-make-fulldeps/pgo-gen/Makefile
diff --git a/src/test/run-make-fulldeps/pgo-gen/test.rs b/tests/run-make-fulldeps/pgo-gen/test.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/pgo-gen/test.rs
+++ b/tests/run-make-fulldeps/pgo-gen/test.rs
diff --git a/src/test/run-make-fulldeps/pgo-indirect-call-promotion/Makefile b/tests/run-make-fulldeps/pgo-indirect-call-promotion/Makefile
index 45302215c..45302215c 100644
--- a/src/test/run-make-fulldeps/pgo-indirect-call-promotion/Makefile
+++ b/tests/run-make-fulldeps/pgo-indirect-call-promotion/Makefile
diff --git a/src/test/run-make-fulldeps/pgo-indirect-call-promotion/filecheck-patterns.txt b/tests/run-make-fulldeps/pgo-indirect-call-promotion/filecheck-patterns.txt
index e19c78350..e19c78350 100644
--- a/src/test/run-make-fulldeps/pgo-indirect-call-promotion/filecheck-patterns.txt
+++ b/tests/run-make-fulldeps/pgo-indirect-call-promotion/filecheck-patterns.txt
diff --git a/src/test/run-make-fulldeps/pgo-indirect-call-promotion/interesting.rs b/tests/run-make-fulldeps/pgo-indirect-call-promotion/interesting.rs
index 4fd096d62..4fd096d62 100644
--- a/src/test/run-make-fulldeps/pgo-indirect-call-promotion/interesting.rs
+++ b/tests/run-make-fulldeps/pgo-indirect-call-promotion/interesting.rs
diff --git a/src/test/run-make-fulldeps/pgo-indirect-call-promotion/main.rs b/tests/run-make-fulldeps/pgo-indirect-call-promotion/main.rs
index 27181f307..27181f307 100644
--- a/src/test/run-make-fulldeps/pgo-indirect-call-promotion/main.rs
+++ b/tests/run-make-fulldeps/pgo-indirect-call-promotion/main.rs
diff --git a/src/test/run-make-fulldeps/pgo-indirect-call-promotion/opaque.rs b/tests/run-make-fulldeps/pgo-indirect-call-promotion/opaque.rs
index 9628d711c..9628d711c 100644
--- a/src/test/run-make-fulldeps/pgo-indirect-call-promotion/opaque.rs
+++ b/tests/run-make-fulldeps/pgo-indirect-call-promotion/opaque.rs
diff --git a/src/test/run-make-fulldeps/pgo-use/Makefile b/tests/run-make-fulldeps/pgo-use/Makefile
index 3bac9b77a..3bac9b77a 100644
--- a/src/test/run-make-fulldeps/pgo-use/Makefile
+++ b/tests/run-make-fulldeps/pgo-use/Makefile
diff --git a/src/test/run-make-fulldeps/pgo-use/filecheck-patterns.txt b/tests/run-make-fulldeps/pgo-use/filecheck-patterns.txt
index 6da34f88f..6da34f88f 100644
--- a/src/test/run-make-fulldeps/pgo-use/filecheck-patterns.txt
+++ b/tests/run-make-fulldeps/pgo-use/filecheck-patterns.txt
diff --git a/src/test/run-make-fulldeps/pgo-use/main.rs b/tests/run-make-fulldeps/pgo-use/main.rs
index eb9192c87..eb9192c87 100644
--- a/src/test/run-make-fulldeps/pgo-use/main.rs
+++ b/tests/run-make-fulldeps/pgo-use/main.rs
diff --git a/src/test/run-make-fulldeps/pointer-auth-link-with-c/Makefile b/tests/run-make-fulldeps/pointer-auth-link-with-c/Makefile
index 7acea0380..7acea0380 100644
--- a/src/test/run-make-fulldeps/pointer-auth-link-with-c/Makefile
+++ b/tests/run-make-fulldeps/pointer-auth-link-with-c/Makefile
diff --git a/src/test/run-make-fulldeps/pointer-auth-link-with-c/test.c b/tests/run-make-fulldeps/pointer-auth-link-with-c/test.c
index 9fe07f82f..9fe07f82f 100644
--- a/src/test/run-make-fulldeps/pointer-auth-link-with-c/test.c
+++ b/tests/run-make-fulldeps/pointer-auth-link-with-c/test.c
diff --git a/src/test/run-make-fulldeps/pointer-auth-link-with-c/test.rs b/tests/run-make-fulldeps/pointer-auth-link-with-c/test.rs
index 615ad0aeb..615ad0aeb 100644
--- a/src/test/run-make-fulldeps/pointer-auth-link-with-c/test.rs
+++ b/tests/run-make-fulldeps/pointer-auth-link-with-c/test.rs
diff --git a/src/test/run-make-fulldeps/prefer-dylib/Makefile b/tests/run-make-fulldeps/prefer-dylib/Makefile
index 3817ca195..3817ca195 100644
--- a/src/test/run-make-fulldeps/prefer-dylib/Makefile
+++ b/tests/run-make-fulldeps/prefer-dylib/Makefile
diff --git a/src/test/run-make-fulldeps/prefer-dylib/bar.rs b/tests/run-make-fulldeps/prefer-dylib/bar.rs
index c5c0bc606..c5c0bc606 100644
--- a/src/test/run-make-fulldeps/prefer-dylib/bar.rs
+++ b/tests/run-make-fulldeps/prefer-dylib/bar.rs
diff --git a/src/test/run-make-fulldeps/prefer-dylib/foo.rs b/tests/run-make-fulldeps/prefer-dylib/foo.rs
index 8d68535e3..8d68535e3 100644
--- a/src/test/run-make-fulldeps/prefer-dylib/foo.rs
+++ b/tests/run-make-fulldeps/prefer-dylib/foo.rs
diff --git a/src/test/run-make-fulldeps/prefer-rlib/Makefile b/tests/run-make-fulldeps/prefer-rlib/Makefile
index adc345d76..adc345d76 100644
--- a/src/test/run-make-fulldeps/prefer-rlib/Makefile
+++ b/tests/run-make-fulldeps/prefer-rlib/Makefile
diff --git a/src/test/run-make-fulldeps/prefer-rlib/bar.rs b/tests/run-make-fulldeps/prefer-rlib/bar.rs
index c5c0bc606..c5c0bc606 100644
--- a/src/test/run-make-fulldeps/prefer-rlib/bar.rs
+++ b/tests/run-make-fulldeps/prefer-rlib/bar.rs
diff --git a/src/test/run-make-fulldeps/prefer-rlib/foo.rs b/tests/run-make-fulldeps/prefer-rlib/foo.rs
index 8d68535e3..8d68535e3 100644
--- a/src/test/run-make-fulldeps/prefer-rlib/foo.rs
+++ b/tests/run-make-fulldeps/prefer-rlib/foo.rs
diff --git a/src/test/run-make-fulldeps/pretty-expanded/Makefile b/tests/run-make-fulldeps/pretty-expanded/Makefile
index 5a0097a83..5a0097a83 100644
--- a/src/test/run-make-fulldeps/pretty-expanded/Makefile
+++ b/tests/run-make-fulldeps/pretty-expanded/Makefile
diff --git a/src/test/run-make-fulldeps/pretty-expanded/input.rs b/tests/run-make-fulldeps/pretty-expanded/input.rs
index af3d75b3b..af3d75b3b 100644
--- a/src/test/run-make-fulldeps/pretty-expanded/input.rs
+++ b/tests/run-make-fulldeps/pretty-expanded/input.rs
diff --git a/src/test/run-make-fulldeps/pretty-print-to-file/Makefile b/tests/run-make-fulldeps/pretty-print-to-file/Makefile
index ca11b8c47..ca11b8c47 100644
--- a/src/test/run-make-fulldeps/pretty-print-to-file/Makefile
+++ b/tests/run-make-fulldeps/pretty-print-to-file/Makefile
diff --git a/src/test/run-make-fulldeps/pretty-print-to-file/input.pp b/tests/run-make-fulldeps/pretty-print-to-file/input.pp
index e3f03242a..e3f03242a 100644
--- a/src/test/run-make-fulldeps/pretty-print-to-file/input.pp
+++ b/tests/run-make-fulldeps/pretty-print-to-file/input.pp
diff --git a/src/test/run-make-fulldeps/pretty-print-to-file/input.rs b/tests/run-make-fulldeps/pretty-print-to-file/input.rs
index aa828155b..aa828155b 100644
--- a/src/test/run-make-fulldeps/pretty-print-to-file/input.rs
+++ b/tests/run-make-fulldeps/pretty-print-to-file/input.rs
diff --git a/src/test/run-make-fulldeps/print-calling-conventions/Makefile b/tests/run-make-fulldeps/print-calling-conventions/Makefile
index d3fd06392..d3fd06392 100644
--- a/src/test/run-make-fulldeps/print-calling-conventions/Makefile
+++ b/tests/run-make-fulldeps/print-calling-conventions/Makefile
diff --git a/src/test/run-make-fulldeps/print-cfg/Makefile b/tests/run-make-fulldeps/print-cfg/Makefile
index 126f5768c..126f5768c 100644
--- a/src/test/run-make-fulldeps/print-cfg/Makefile
+++ b/tests/run-make-fulldeps/print-cfg/Makefile
diff --git a/src/test/run-make-fulldeps/print-target-list/Makefile b/tests/run-make-fulldeps/print-target-list/Makefile
index f23c40d42..f23c40d42 100644
--- a/src/test/run-make-fulldeps/print-target-list/Makefile
+++ b/tests/run-make-fulldeps/print-target-list/Makefile
diff --git a/src/test/run-make-fulldeps/profile/Makefile b/tests/run-make-fulldeps/profile/Makefile
index fffc051ad..fffc051ad 100644
--- a/src/test/run-make-fulldeps/profile/Makefile
+++ b/tests/run-make-fulldeps/profile/Makefile
diff --git a/src/test/run-make-fulldeps/profile/test.rs b/tests/run-make-fulldeps/profile/test.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/profile/test.rs
+++ b/tests/run-make-fulldeps/profile/test.rs
diff --git a/src/test/run-make-fulldeps/prune-link-args/Makefile b/tests/run-make-fulldeps/prune-link-args/Makefile
index a359dc5ae..a359dc5ae 100644
--- a/src/test/run-make-fulldeps/prune-link-args/Makefile
+++ b/tests/run-make-fulldeps/prune-link-args/Makefile
diff --git a/src/test/run-make-fulldeps/prune-link-args/empty.rs b/tests/run-make-fulldeps/prune-link-args/empty.rs
index 45590d86b..45590d86b 100644
--- a/src/test/run-make-fulldeps/prune-link-args/empty.rs
+++ b/tests/run-make-fulldeps/prune-link-args/empty.rs
diff --git a/src/test/run-make-fulldeps/redundant-libs/Makefile b/tests/run-make-fulldeps/redundant-libs/Makefile
index b2dff05d1..b2dff05d1 100644
--- a/src/test/run-make-fulldeps/redundant-libs/Makefile
+++ b/tests/run-make-fulldeps/redundant-libs/Makefile
diff --git a/src/test/run-make-fulldeps/redundant-libs/bar.c b/tests/run-make-fulldeps/redundant-libs/bar.c
index e42599986..e42599986 100644
--- a/src/test/run-make-fulldeps/redundant-libs/bar.c
+++ b/tests/run-make-fulldeps/redundant-libs/bar.c
diff --git a/src/test/run-make-fulldeps/redundant-libs/baz.c b/tests/run-make-fulldeps/redundant-libs/baz.c
index a4e2c2b71..a4e2c2b71 100644
--- a/src/test/run-make-fulldeps/redundant-libs/baz.c
+++ b/tests/run-make-fulldeps/redundant-libs/baz.c
diff --git a/src/test/run-make-fulldeps/redundant-libs/foo.c b/tests/run-make-fulldeps/redundant-libs/foo.c
index 339ee86c9..339ee86c9 100644
--- a/src/test/run-make-fulldeps/redundant-libs/foo.c
+++ b/tests/run-make-fulldeps/redundant-libs/foo.c
diff --git a/src/test/run-make-fulldeps/redundant-libs/main.rs b/tests/run-make-fulldeps/redundant-libs/main.rs
index 90d185ff5..90d185ff5 100644
--- a/src/test/run-make-fulldeps/redundant-libs/main.rs
+++ b/tests/run-make-fulldeps/redundant-libs/main.rs
diff --git a/src/test/run-make-fulldeps/relocation-model/Makefile b/tests/run-make-fulldeps/relocation-model/Makefile
index a31dbfd91..a31dbfd91 100644
--- a/src/test/run-make-fulldeps/relocation-model/Makefile
+++ b/tests/run-make-fulldeps/relocation-model/Makefile
diff --git a/src/test/run-make-fulldeps/relocation-model/foo.rs b/tests/run-make-fulldeps/relocation-model/foo.rs
index da0f5d925..da0f5d925 100644
--- a/src/test/run-make-fulldeps/relocation-model/foo.rs
+++ b/tests/run-make-fulldeps/relocation-model/foo.rs
diff --git a/src/test/run-make-fulldeps/relro-levels/Makefile b/tests/run-make-fulldeps/relro-levels/Makefile
index 6176fc1a5..6176fc1a5 100644
--- a/src/test/run-make-fulldeps/relro-levels/Makefile
+++ b/tests/run-make-fulldeps/relro-levels/Makefile
diff --git a/src/test/run-make-fulldeps/relro-levels/hello.rs b/tests/run-make-fulldeps/relro-levels/hello.rs
index e7a11a969..e7a11a969 100644
--- a/src/test/run-make-fulldeps/relro-levels/hello.rs
+++ b/tests/run-make-fulldeps/relro-levels/hello.rs
diff --git a/src/test/run-make-fulldeps/remap-path-prefix/Makefile b/tests/run-make-fulldeps/remap-path-prefix/Makefile
index 2a7378fdf..2a7378fdf 100644
--- a/src/test/run-make-fulldeps/remap-path-prefix/Makefile
+++ b/tests/run-make-fulldeps/remap-path-prefix/Makefile
diff --git a/src/test/run-make-fulldeps/remap-path-prefix/auxiliary/lib.rs b/tests/run-make-fulldeps/remap-path-prefix/auxiliary/lib.rs
index 019c786a9..019c786a9 100644
--- a/src/test/run-make-fulldeps/remap-path-prefix/auxiliary/lib.rs
+++ b/tests/run-make-fulldeps/remap-path-prefix/auxiliary/lib.rs
diff --git a/src/test/run-make-fulldeps/reproducible-build-2/Makefile b/tests/run-make-fulldeps/reproducible-build-2/Makefile
index 1df5e102c..1df5e102c 100644
--- a/src/test/run-make-fulldeps/reproducible-build-2/Makefile
+++ b/tests/run-make-fulldeps/reproducible-build-2/Makefile
diff --git a/src/test/run-make-fulldeps/reproducible-build-2/linker.rs b/tests/run-make-fulldeps/reproducible-build-2/linker.rs
index 998d1f328..998d1f328 100644
--- a/src/test/run-make-fulldeps/reproducible-build-2/linker.rs
+++ b/tests/run-make-fulldeps/reproducible-build-2/linker.rs
diff --git a/src/test/run-make-fulldeps/reproducible-build-2/reproducible-build-aux.rs b/tests/run-make-fulldeps/reproducible-build-2/reproducible-build-aux.rs
index 8105b3d2b..8105b3d2b 100644
--- a/src/test/run-make-fulldeps/reproducible-build-2/reproducible-build-aux.rs
+++ b/tests/run-make-fulldeps/reproducible-build-2/reproducible-build-aux.rs
diff --git a/src/test/run-make-fulldeps/reproducible-build-2/reproducible-build.rs b/tests/run-make-fulldeps/reproducible-build-2/reproducible-build.rs
index a6c04774c..a6c04774c 100644
--- a/src/test/run-make-fulldeps/reproducible-build-2/reproducible-build.rs
+++ b/tests/run-make-fulldeps/reproducible-build-2/reproducible-build.rs
diff --git a/src/test/run-make-fulldeps/reproducible-build/Makefile b/tests/run-make-fulldeps/reproducible-build/Makefile
index 642a48081..642a48081 100644
--- a/src/test/run-make-fulldeps/reproducible-build/Makefile
+++ b/tests/run-make-fulldeps/reproducible-build/Makefile
diff --git a/src/test/run-make-fulldeps/reproducible-build/linker.rs b/tests/run-make-fulldeps/reproducible-build/linker.rs
index 3dda6f190..3dda6f190 100644
--- a/src/test/run-make-fulldeps/reproducible-build/linker.rs
+++ b/tests/run-make-fulldeps/reproducible-build/linker.rs
diff --git a/src/test/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs b/tests/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs
index 8105b3d2b..8105b3d2b 100644
--- a/src/test/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs
+++ b/tests/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs
diff --git a/src/test/run-make-fulldeps/reproducible-build/reproducible-build.rs b/tests/run-make-fulldeps/reproducible-build/reproducible-build.rs
index a6c04774c..a6c04774c 100644
--- a/src/test/run-make-fulldeps/reproducible-build/reproducible-build.rs
+++ b/tests/run-make-fulldeps/reproducible-build/reproducible-build.rs
diff --git a/src/test/run-make-fulldeps/resolve-rename/Makefile b/tests/run-make-fulldeps/resolve-rename/Makefile
index 00f83a5d6..00f83a5d6 100644
--- a/src/test/run-make-fulldeps/resolve-rename/Makefile
+++ b/tests/run-make-fulldeps/resolve-rename/Makefile
diff --git a/src/test/run-make-fulldeps/resolve-rename/bar.rs b/tests/run-make-fulldeps/resolve-rename/bar.rs
index 4a09ce355..4a09ce355 100644
--- a/src/test/run-make-fulldeps/resolve-rename/bar.rs
+++ b/tests/run-make-fulldeps/resolve-rename/bar.rs
diff --git a/src/test/run-make-fulldeps/resolve-rename/baz.rs b/tests/run-make-fulldeps/resolve-rename/baz.rs
index 9176073ef..9176073ef 100644
--- a/src/test/run-make-fulldeps/resolve-rename/baz.rs
+++ b/tests/run-make-fulldeps/resolve-rename/baz.rs
diff --git a/src/test/run-make-fulldeps/resolve-rename/foo.rs b/tests/run-make-fulldeps/resolve-rename/foo.rs
index bd6820098..bd6820098 100644
--- a/src/test/run-make-fulldeps/resolve-rename/foo.rs
+++ b/tests/run-make-fulldeps/resolve-rename/foo.rs
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile b/tests/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile
index 42d3c977f..42d3c977f 100644
--- a/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile
+++ b/tests/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs b/tests/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs
index ea22a2a56..ea22a2a56 100644
--- a/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs
+++ b/tests/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/test.c b/tests/run-make-fulldeps/return-non-c-like-enum-from-c/test.c
index 3ad135bab..3ad135bab 100644
--- a/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/test.c
+++ b/tests/run-make-fulldeps/return-non-c-like-enum-from-c/test.c
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum/Makefile b/tests/run-make-fulldeps/return-non-c-like-enum/Makefile
index 513311c82..513311c82 100644
--- a/src/test/run-make-fulldeps/return-non-c-like-enum/Makefile
+++ b/tests/run-make-fulldeps/return-non-c-like-enum/Makefile
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum/nonclike.rs b/tests/run-make-fulldeps/return-non-c-like-enum/nonclike.rs
index de529cf64..de529cf64 100644
--- a/src/test/run-make-fulldeps/return-non-c-like-enum/nonclike.rs
+++ b/tests/run-make-fulldeps/return-non-c-like-enum/nonclike.rs
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum/test.c b/tests/run-make-fulldeps/return-non-c-like-enum/test.c
index afadd3c10..afadd3c10 100644
--- a/src/test/run-make-fulldeps/return-non-c-like-enum/test.c
+++ b/tests/run-make-fulldeps/return-non-c-like-enum/test.c
diff --git a/src/test/run-make-fulldeps/rlib-chain/Makefile b/tests/run-make-fulldeps/rlib-chain/Makefile
index 236943a2a..236943a2a 100644
--- a/src/test/run-make-fulldeps/rlib-chain/Makefile
+++ b/tests/run-make-fulldeps/rlib-chain/Makefile
diff --git a/src/test/run-make-fulldeps/rlib-chain/m1.rs b/tests/run-make-fulldeps/rlib-chain/m1.rs
index 665b206cc..665b206cc 100644
--- a/src/test/run-make-fulldeps/rlib-chain/m1.rs
+++ b/tests/run-make-fulldeps/rlib-chain/m1.rs
diff --git a/src/test/run-make-fulldeps/rlib-chain/m2.rs b/tests/run-make-fulldeps/rlib-chain/m2.rs
index eba12fe12..eba12fe12 100644
--- a/src/test/run-make-fulldeps/rlib-chain/m2.rs
+++ b/tests/run-make-fulldeps/rlib-chain/m2.rs
diff --git a/src/test/run-make-fulldeps/rlib-chain/m3.rs b/tests/run-make-fulldeps/rlib-chain/m3.rs
index ade191db4..ade191db4 100644
--- a/src/test/run-make-fulldeps/rlib-chain/m3.rs
+++ b/tests/run-make-fulldeps/rlib-chain/m3.rs
diff --git a/src/test/run-make-fulldeps/rlib-chain/m4.rs b/tests/run-make-fulldeps/rlib-chain/m4.rs
index fa8ec6079..fa8ec6079 100644
--- a/src/test/run-make-fulldeps/rlib-chain/m4.rs
+++ b/tests/run-make-fulldeps/rlib-chain/m4.rs
diff --git a/src/test/run-make-fulldeps/rustdoc-determinism/Makefile b/tests/run-make-fulldeps/rustdoc-determinism/Makefile
index a3ef16906..a3ef16906 100644
--- a/src/test/run-make-fulldeps/rustdoc-determinism/Makefile
+++ b/tests/run-make-fulldeps/rustdoc-determinism/Makefile
diff --git a/src/test/run-make-fulldeps/rustdoc-determinism/bar.rs b/tests/run-make-fulldeps/rustdoc-determinism/bar.rs
index ca05a6a90..ca05a6a90 100644
--- a/src/test/run-make-fulldeps/rustdoc-determinism/bar.rs
+++ b/tests/run-make-fulldeps/rustdoc-determinism/bar.rs
diff --git a/src/test/run-make-fulldeps/rustdoc-determinism/foo.rs b/tests/run-make-fulldeps/rustdoc-determinism/foo.rs
index 4a835673a..4a835673a 100644
--- a/src/test/run-make-fulldeps/rustdoc-determinism/foo.rs
+++ b/tests/run-make-fulldeps/rustdoc-determinism/foo.rs
diff --git a/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile b/tests/run-make-fulldeps/rustdoc-error-lines/Makefile
index 2dc30f56b..2dc30f56b 100644
--- a/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile
+++ b/tests/run-make-fulldeps/rustdoc-error-lines/Makefile
diff --git a/src/test/run-make-fulldeps/rustdoc-error-lines/input.rs b/tests/run-make-fulldeps/rustdoc-error-lines/input.rs
index b4db182e8..b4db182e8 100644
--- a/src/test/run-make-fulldeps/rustdoc-error-lines/input.rs
+++ b/tests/run-make-fulldeps/rustdoc-error-lines/input.rs
diff --git a/src/test/run-make-fulldeps/rustdoc-io-error/Makefile b/tests/run-make-fulldeps/rustdoc-io-error/Makefile
index 27f5ecf94..27f5ecf94 100644
--- a/src/test/run-make-fulldeps/rustdoc-io-error/Makefile
+++ b/tests/run-make-fulldeps/rustdoc-io-error/Makefile
diff --git a/src/test/run-make-fulldeps/rustdoc-io-error/foo.rs b/tests/run-make-fulldeps/rustdoc-io-error/foo.rs
index 4a835673a..4a835673a 100644
--- a/src/test/run-make-fulldeps/rustdoc-io-error/foo.rs
+++ b/tests/run-make-fulldeps/rustdoc-io-error/foo.rs
diff --git a/src/test/run-make-fulldeps/rustdoc-map-file/Makefile b/tests/run-make-fulldeps/rustdoc-map-file/Makefile
index 5cbf7747a..5cbf7747a 100644
--- a/src/test/run-make-fulldeps/rustdoc-map-file/Makefile
+++ b/tests/run-make-fulldeps/rustdoc-map-file/Makefile
diff --git a/src/test/run-make-fulldeps/rustdoc-map-file/expected.json b/tests/run-make-fulldeps/rustdoc-map-file/expected.json
index 6b1ccbeac..6b1ccbeac 100644
--- a/src/test/run-make-fulldeps/rustdoc-map-file/expected.json
+++ b/tests/run-make-fulldeps/rustdoc-map-file/expected.json
diff --git a/src/test/run-make-fulldeps/rustdoc-map-file/foo.rs b/tests/run-make-fulldeps/rustdoc-map-file/foo.rs
index e12b9d229..e12b9d229 100644
--- a/src/test/run-make-fulldeps/rustdoc-map-file/foo.rs
+++ b/tests/run-make-fulldeps/rustdoc-map-file/foo.rs
diff --git a/src/test/run-make-fulldeps/rustdoc-map-file/validate_json.py b/tests/run-make-fulldeps/rustdoc-map-file/validate_json.py
index 5c14c90b7..5c14c90b7 100755
--- a/src/test/run-make-fulldeps/rustdoc-map-file/validate_json.py
+++ b/tests/run-make-fulldeps/rustdoc-map-file/validate_json.py
diff --git a/src/test/run-make-fulldeps/rustdoc-output-path/Makefile b/tests/run-make-fulldeps/rustdoc-output-path/Makefile
index 8f5cda9e5..8f5cda9e5 100644
--- a/src/test/run-make-fulldeps/rustdoc-output-path/Makefile
+++ b/tests/run-make-fulldeps/rustdoc-output-path/Makefile
diff --git a/src/test/run-make-fulldeps/rustdoc-output-path/foo.rs b/tests/run-make-fulldeps/rustdoc-output-path/foo.rs
index 4a835673a..4a835673a 100644
--- a/src/test/run-make-fulldeps/rustdoc-output-path/foo.rs
+++ b/tests/run-make-fulldeps/rustdoc-output-path/foo.rs
diff --git a/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile b/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile
index c857aa4b9..c857aa4b9 100644
--- a/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile
+++ b/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile
diff --git a/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/examples/ex.rs b/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/examples/ex.rs
index 4d8c8b30e..4d8c8b30e 100644
--- a/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/examples/ex.rs
+++ b/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/examples/ex.rs
diff --git a/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/src/lib.rs b/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/src/lib.rs
index d8658a0f2..d8658a0f2 100644
--- a/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/src/lib.rs
+++ b/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/src/lib.rs
diff --git a/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/src/proc.rs b/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/src/proc.rs
index 46e518fdf..46e518fdf 100644
--- a/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/src/proc.rs
+++ b/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/src/proc.rs
diff --git a/src/test/run-make-fulldeps/rustdoc-target-spec-json-path/Makefile b/tests/run-make-fulldeps/rustdoc-target-spec-json-path/Makefile
index 6d0bc4186..6d0bc4186 100644
--- a/src/test/run-make-fulldeps/rustdoc-target-spec-json-path/Makefile
+++ b/tests/run-make-fulldeps/rustdoc-target-spec-json-path/Makefile
diff --git a/src/test/run-make-fulldeps/rustdoc-target-spec-json-path/dummy_core.rs b/tests/run-make-fulldeps/rustdoc-target-spec-json-path/dummy_core.rs
index da27b7f34..da27b7f34 100644
--- a/src/test/run-make-fulldeps/rustdoc-target-spec-json-path/dummy_core.rs
+++ b/tests/run-make-fulldeps/rustdoc-target-spec-json-path/dummy_core.rs
diff --git a/src/test/run-make-fulldeps/rustdoc-target-spec-json-path/my_crate.rs b/tests/run-make-fulldeps/rustdoc-target-spec-json-path/my_crate.rs
index 12aa08220..12aa08220 100644
--- a/src/test/run-make-fulldeps/rustdoc-target-spec-json-path/my_crate.rs
+++ b/tests/run-make-fulldeps/rustdoc-target-spec-json-path/my_crate.rs
diff --git a/src/test/run-make-fulldeps/rustdoc-target-spec-json-path/target.json b/tests/run-make-fulldeps/rustdoc-target-spec-json-path/target.json
index 34357182c..34357182c 100644
--- a/src/test/run-make-fulldeps/rustdoc-target-spec-json-path/target.json
+++ b/tests/run-make-fulldeps/rustdoc-target-spec-json-path/target.json
diff --git a/src/test/run-make-fulldeps/rustdoc-themes/Makefile b/tests/run-make-fulldeps/rustdoc-themes/Makefile
index a6d9a43ad..a6d9a43ad 100644
--- a/src/test/run-make-fulldeps/rustdoc-themes/Makefile
+++ b/tests/run-make-fulldeps/rustdoc-themes/Makefile
diff --git a/src/test/run-make-fulldeps/rustdoc-themes/foo.rs b/tests/run-make-fulldeps/rustdoc-themes/foo.rs
index 58efaf7d5..58efaf7d5 100644
--- a/src/test/run-make-fulldeps/rustdoc-themes/foo.rs
+++ b/tests/run-make-fulldeps/rustdoc-themes/foo.rs
diff --git a/src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile b/tests/run-make-fulldeps/sanitizer-cdylib-link/Makefile
index 691585268..691585268 100644
--- a/src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile
+++ b/tests/run-make-fulldeps/sanitizer-cdylib-link/Makefile
diff --git a/src/test/run-make-fulldeps/sanitizer-cdylib-link/library.rs b/tests/run-make-fulldeps/sanitizer-cdylib-link/library.rs
index f2a52cb5c..f2a52cb5c 100644
--- a/src/test/run-make-fulldeps/sanitizer-cdylib-link/library.rs
+++ b/tests/run-make-fulldeps/sanitizer-cdylib-link/library.rs
diff --git a/src/test/run-make-fulldeps/sanitizer-cdylib-link/program.rs b/tests/run-make-fulldeps/sanitizer-cdylib-link/program.rs
index ef053aa2e..ef053aa2e 100644
--- a/src/test/run-make-fulldeps/sanitizer-cdylib-link/program.rs
+++ b/tests/run-make-fulldeps/sanitizer-cdylib-link/program.rs
diff --git a/src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile b/tests/run-make-fulldeps/sanitizer-dylib-link/Makefile
index b0a91e5b1..b0a91e5b1 100644
--- a/src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile
+++ b/tests/run-make-fulldeps/sanitizer-dylib-link/Makefile
diff --git a/src/test/run-make-fulldeps/sanitizer-dylib-link/library.rs b/tests/run-make-fulldeps/sanitizer-dylib-link/library.rs
index f2a52cb5c..f2a52cb5c 100644
--- a/src/test/run-make-fulldeps/sanitizer-dylib-link/library.rs
+++ b/tests/run-make-fulldeps/sanitizer-dylib-link/library.rs
diff --git a/src/test/run-make-fulldeps/sanitizer-dylib-link/program.rs b/tests/run-make-fulldeps/sanitizer-dylib-link/program.rs
index ef053aa2e..ef053aa2e 100644
--- a/src/test/run-make-fulldeps/sanitizer-dylib-link/program.rs
+++ b/tests/run-make-fulldeps/sanitizer-dylib-link/program.rs
diff --git a/src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile b/tests/run-make-fulldeps/sanitizer-staticlib-link/Makefile
index 7b1a286ed..7b1a286ed 100644
--- a/src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile
+++ b/tests/run-make-fulldeps/sanitizer-staticlib-link/Makefile
diff --git a/src/test/run-make-fulldeps/sanitizer-staticlib-link/library.rs b/tests/run-make-fulldeps/sanitizer-staticlib-link/library.rs
index f2a52cb5c..f2a52cb5c 100644
--- a/src/test/run-make-fulldeps/sanitizer-staticlib-link/library.rs
+++ b/tests/run-make-fulldeps/sanitizer-staticlib-link/library.rs
diff --git a/src/test/run-make-fulldeps/sanitizer-staticlib-link/program.c b/tests/run-make-fulldeps/sanitizer-staticlib-link/program.c
index 735e2b147..735e2b147 100644
--- a/src/test/run-make-fulldeps/sanitizer-staticlib-link/program.c
+++ b/tests/run-make-fulldeps/sanitizer-staticlib-link/program.c
diff --git a/src/test/run-make-fulldeps/sanitizer-staticlib-link/program.rs b/tests/run-make-fulldeps/sanitizer-staticlib-link/program.rs
index ec59bdb11..ec59bdb11 100644
--- a/src/test/run-make-fulldeps/sanitizer-staticlib-link/program.rs
+++ b/tests/run-make-fulldeps/sanitizer-staticlib-link/program.rs
diff --git a/src/test/run-make-fulldeps/save-analysis-fail/Makefile b/tests/run-make-fulldeps/save-analysis-fail/Makefile
index 69a2b2746..69a2b2746 100644
--- a/src/test/run-make-fulldeps/save-analysis-fail/Makefile
+++ b/tests/run-make-fulldeps/save-analysis-fail/Makefile
diff --git a/src/test/run-make-fulldeps/save-analysis-fail/SameDir.rs b/tests/run-make-fulldeps/save-analysis-fail/SameDir.rs
index 2c690d5f7..2c690d5f7 100644
--- a/src/test/run-make-fulldeps/save-analysis-fail/SameDir.rs
+++ b/tests/run-make-fulldeps/save-analysis-fail/SameDir.rs
diff --git a/src/test/run-make-fulldeps/save-analysis-fail/SameDir3.rs b/tests/run-make-fulldeps/save-analysis-fail/SameDir3.rs
index fab03ee2e..fab03ee2e 100644
--- a/src/test/run-make-fulldeps/save-analysis-fail/SameDir3.rs
+++ b/tests/run-make-fulldeps/save-analysis-fail/SameDir3.rs
diff --git a/src/test/run-make-fulldeps/save-analysis-fail/SubDir/mod.rs b/tests/run-make-fulldeps/save-analysis-fail/SubDir/mod.rs
index 511721d92..511721d92 100644
--- a/src/test/run-make-fulldeps/save-analysis-fail/SubDir/mod.rs
+++ b/tests/run-make-fulldeps/save-analysis-fail/SubDir/mod.rs
diff --git a/src/test/run-make-fulldeps/save-analysis-fail/foo.rs b/tests/run-make-fulldeps/save-analysis-fail/foo.rs
index c5a70605e..c5a70605e 100644
--- a/src/test/run-make-fulldeps/save-analysis-fail/foo.rs
+++ b/tests/run-make-fulldeps/save-analysis-fail/foo.rs
diff --git a/src/test/run-make-fulldeps/save-analysis-fail/krate2.rs b/tests/run-make-fulldeps/save-analysis-fail/krate2.rs
index 7d787e0c9..7d787e0c9 100644
--- a/src/test/run-make-fulldeps/save-analysis-fail/krate2.rs
+++ b/tests/run-make-fulldeps/save-analysis-fail/krate2.rs
diff --git a/src/test/run-make-fulldeps/save-analysis-rfc2126/Makefile b/tests/run-make-fulldeps/save-analysis-rfc2126/Makefile
index 30f57034b..30f57034b 100644
--- a/src/test/run-make-fulldeps/save-analysis-rfc2126/Makefile
+++ b/tests/run-make-fulldeps/save-analysis-rfc2126/Makefile
diff --git a/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_absolute_paths.rs b/tests/run-make-fulldeps/save-analysis-rfc2126/extern_absolute_paths.rs
index 7a8e3fff0..7a8e3fff0 100644
--- a/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_absolute_paths.rs
+++ b/tests/run-make-fulldeps/save-analysis-rfc2126/extern_absolute_paths.rs
diff --git a/src/test/run-make-fulldeps/save-analysis-rfc2126/krate2.rs b/tests/run-make-fulldeps/save-analysis-rfc2126/krate2.rs
index d24c68862..d24c68862 100644
--- a/src/test/run-make-fulldeps/save-analysis-rfc2126/krate2.rs
+++ b/tests/run-make-fulldeps/save-analysis-rfc2126/krate2.rs
diff --git a/src/test/run-make-fulldeps/save-analysis-rfc2126/validate_json.py b/tests/run-make-fulldeps/save-analysis-rfc2126/validate_json.py
index 882d29a8b..882d29a8b 100644
--- a/src/test/run-make-fulldeps/save-analysis-rfc2126/validate_json.py
+++ b/tests/run-make-fulldeps/save-analysis-rfc2126/validate_json.py
diff --git a/src/test/run-make-fulldeps/save-analysis/Makefile b/tests/run-make-fulldeps/save-analysis/Makefile
index b8b6be13d..b8b6be13d 100644
--- a/src/test/run-make-fulldeps/save-analysis/Makefile
+++ b/tests/run-make-fulldeps/save-analysis/Makefile
diff --git a/src/test/run-make-fulldeps/save-analysis/SameDir.rs b/tests/run-make-fulldeps/save-analysis/SameDir.rs
index 2c690d5f7..2c690d5f7 100644
--- a/src/test/run-make-fulldeps/save-analysis/SameDir.rs
+++ b/tests/run-make-fulldeps/save-analysis/SameDir.rs
diff --git a/src/test/run-make-fulldeps/save-analysis/SameDir3.rs b/tests/run-make-fulldeps/save-analysis/SameDir3.rs
index fab03ee2e..fab03ee2e 100644
--- a/src/test/run-make-fulldeps/save-analysis/SameDir3.rs
+++ b/tests/run-make-fulldeps/save-analysis/SameDir3.rs
diff --git a/src/test/run-make-fulldeps/save-analysis/SubDir/mod.rs b/tests/run-make-fulldeps/save-analysis/SubDir/mod.rs
index 511721d92..511721d92 100644
--- a/src/test/run-make-fulldeps/save-analysis/SubDir/mod.rs
+++ b/tests/run-make-fulldeps/save-analysis/SubDir/mod.rs
diff --git a/src/test/run-make-fulldeps/save-analysis/extra-docs.md b/tests/run-make-fulldeps/save-analysis/extra-docs.md
index 0605ca517..0605ca517 100644
--- a/src/test/run-make-fulldeps/save-analysis/extra-docs.md
+++ b/tests/run-make-fulldeps/save-analysis/extra-docs.md
diff --git a/tests/run-make-fulldeps/save-analysis/foo.rs b/tests/run-make-fulldeps/save-analysis/foo.rs
new file mode 100644
index 000000000..384589de3
--- /dev/null
+++ b/tests/run-make-fulldeps/save-analysis/foo.rs
@@ -0,0 +1,465 @@
+#![crate_name = "test"]
+#![feature(rustc_private)]
+#![feature(associated_type_defaults)]
+
+extern crate rustc_graphviz;
+// A simple rust project
+
+// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
+// files.
+#[allow(unused_extern_crates)]
+extern crate rustc_driver;
+
+extern crate krate2;
+extern crate krate2 as krate3;
+
+use rustc_graphviz::RenderOption;
+use std::cell::RefCell;
+use std::collections::{HashMap, HashSet};
+use std::io::Write;
+
+use sub::sub2 as msalias;
+use sub::sub2;
+use sub::sub2::nested_struct as sub_struct;
+
+use std::mem::size_of;
+
+use std::char::from_u32;
+
+static uni: &'static str = "Les Miséééééééérables";
+static yy: usize = 25;
+
+static bob: Option<rustc_graphviz::RenderOption> = None;
+
+// buglink test - see issue #1337.
+
+fn test_alias<I: Iterator>(i: Option<<I as Iterator>::Item>) {
+    let s = sub_struct { field2: 45u32 };
+
+    // import tests
+    fn foo(x: &Write) {}
+    let _: Option<_> = from_u32(45);
+
+    let x = 42usize;
+
+    krate2::hello();
+    krate3::hello();
+
+    let x = (3isize, 4usize);
+    let y = x.1;
+}
+
+// Issue #37700
+const LUT_BITS: usize = 3;
+pub struct HuffmanTable {
+    ac_lut: Option<[(i16, u8); 1 << LUT_BITS]>,
+}
+
+struct TupStruct(isize, isize, Box<str>);
+
+fn test_tup_struct(x: TupStruct) -> isize {
+    x.1
+}
+
+fn println(s: &str) {
+    std::io::stdout().write_all(s.as_bytes());
+}
+
+mod sub {
+    pub mod sub2 {
+        use std::io::Write;
+        pub mod sub3 {
+            use std::io::Write;
+            pub fn hello() {
+                ::println("hello from module 3");
+            }
+        }
+        pub fn hello() {
+            ::println("hello from a module");
+        }
+
+        pub struct nested_struct {
+            pub field2: u32,
+        }
+
+        pub enum nested_enum {
+            Nest2 = 2,
+            Nest3 = 3,
+        }
+    }
+}
+
+pub mod SameDir;
+pub mod SubDir;
+
+#[path = "SameDir3.rs"]
+pub mod SameDir2;
+
+struct nofields;
+
+#[derive(Clone)]
+struct some_fields {
+    field1: u32,
+}
+
+type SF = some_fields;
+
+trait SuperTrait {
+    fn qux(&self) {
+        panic!();
+    }
+}
+
+trait SomeTrait: SuperTrait {
+    fn Method(&self, x: u32) -> u32;
+
+    fn prov(&self, x: u32) -> u32 {
+        println(&x.to_string());
+        42
+    }
+    fn provided_method(&self) -> u32 {
+        42
+    }
+}
+
+trait SubTrait: SomeTrait {
+    fn stat2(x: &Self) -> u32 {
+        32
+    }
+}
+
+impl SomeTrait for some_fields {
+    fn Method(&self, x: u32) -> u32 {
+        println(&x.to_string());
+        self.field1
+    }
+}
+
+impl SuperTrait for some_fields {}
+
+impl SubTrait for some_fields {}
+
+impl some_fields {
+    fn stat(x: u32) -> u32 {
+        println(&x.to_string());
+        42
+    }
+    fn stat2(x: &some_fields) -> u32 {
+        42
+    }
+
+    fn align_to<T>(&mut self) {}
+
+    fn test(&mut self) {
+        self.align_to::<bool>();
+    }
+}
+
+impl SuperTrait for nofields {}
+impl SomeTrait for nofields {
+    fn Method(&self, x: u32) -> u32 {
+        self.Method(x);
+        43
+    }
+
+    fn provided_method(&self) -> u32 {
+        21
+    }
+}
+
+impl SubTrait for nofields {}
+
+impl SuperTrait for (Box<nofields>, Box<some_fields>) {}
+
+fn f_with_params<T: SomeTrait>(x: &T) {
+    x.Method(41);
+}
+
+type MyType = Box<some_fields>;
+
+enum SomeEnum<'a> {
+    Ints(isize, isize),
+    Floats(f64, f64),
+    Strings(&'a str, &'a str, &'a str),
+    MyTypes(MyType, MyType),
+}
+
+#[derive(Copy, Clone)]
+enum SomeOtherEnum {
+    SomeConst1,
+    SomeConst2,
+    SomeConst3,
+}
+
+enum SomeStructEnum {
+    EnumStruct { a: isize, b: isize },
+    EnumStruct2 { f1: MyType, f2: MyType },
+    EnumStruct3 { f1: MyType, f2: MyType, f3: SomeEnum<'static> },
+}
+
+fn matchSomeEnum(val: SomeEnum) {
+    match val {
+        SomeEnum::Ints(int1, int2) => {
+            println(&(int1 + int2).to_string());
+        }
+        SomeEnum::Floats(float1, float2) => {
+            println(&(float2 * float1).to_string());
+        }
+        SomeEnum::Strings(.., s3) => {
+            println(s3);
+        }
+        SomeEnum::MyTypes(mt1, mt2) => {
+            println(&(mt1.field1 - mt2.field1).to_string());
+        }
+    }
+}
+
+fn matchSomeStructEnum(se: SomeStructEnum) {
+    match se {
+        SomeStructEnum::EnumStruct { a: a, .. } => println(&a.to_string()),
+        SomeStructEnum::EnumStruct2 { f1: f1, f2: f_2 } => println(&f_2.field1.to_string()),
+        SomeStructEnum::EnumStruct3 { f1, .. } => println(&f1.field1.to_string()),
+    }
+}
+
+fn matchSomeStructEnum2(se: SomeStructEnum) {
+    use SomeStructEnum::*;
+    match se {
+        EnumStruct { a: ref aaa, .. } => println(&aaa.to_string()),
+        EnumStruct2 { f1, f2: f2 } => println(&f1.field1.to_string()),
+        EnumStruct3 { f1, f3: SomeEnum::Ints(..), f2 } => println(&f1.field1.to_string()),
+        _ => {}
+    }
+}
+
+fn matchSomeOtherEnum(val: SomeOtherEnum) {
+    use SomeOtherEnum::{SomeConst2, SomeConst3};
+    match val {
+        SomeOtherEnum::SomeConst1 => {
+            println("I'm const1.");
+        }
+        SomeConst2 | SomeConst3 => {
+            println("I'm const2 or const3.");
+        }
+    }
+}
+
+fn hello<X: SomeTrait>((z, a): (u32, String), ex: X) {
+    SameDir2::hello(43);
+
+    println(&yy.to_string());
+    let (x, y): (u32, u32) = (5, 3);
+    println(&x.to_string());
+    println(&z.to_string());
+    let x: u32 = x;
+    println(&x.to_string());
+    let x = "hello";
+    println(x);
+
+    let x = 32.0f32;
+    let _ = (x + ((x * x) + 1.0).sqrt()).ln();
+
+    let s: Box<SomeTrait> = Box::new(some_fields { field1: 43 });
+    let s2: Box<some_fields> = Box::new(some_fields { field1: 43 });
+    let s3 = Box::new(nofields);
+
+    s.Method(43);
+    s3.Method(43);
+    s2.Method(43);
+
+    ex.prov(43);
+
+    let y: u32 = 56;
+    // static method on struct
+    let r = some_fields::stat(y);
+    // trait static method, calls default
+    let r = SubTrait::stat2(&*s3);
+
+    let s4 = s3 as Box<SomeTrait>;
+    s4.Method(43);
+
+    s4.provided_method();
+    s2.prov(45);
+
+    let closure = |x: u32, s: &SomeTrait| {
+        s.Method(23);
+        return x + y;
+    };
+
+    let z = closure(10, &*s);
+}
+
+pub struct blah {
+    used_link_args: RefCell<[&'static str; 0]>,
+}
+
+#[macro_use]
+mod macro_use_test {
+    macro_rules! test_rec {
+        (q, $src: expr) => {{
+            print!("{}", $src);
+            test_rec!($src);
+        }};
+        ($src: expr) => {
+            print!("{}", $src);
+        };
+    }
+
+    macro_rules! internal_vars {
+        ($src: ident) => {{
+            let mut x = $src;
+            x += 100;
+        }};
+    }
+}
+
+fn main() {
+    // foo
+    let s = Box::new(some_fields { field1: 43 });
+    hello((43, "a".to_string()), *s);
+    sub::sub2::hello();
+    sub2::sub3::hello();
+
+    let h = sub2::sub3::hello;
+    h();
+
+    // utf8 chars
+    let ut = "Les Miséééééééérables";
+
+    // For some reason, this pattern of macro_rules foiled our generated code
+    // avoiding strategy.
+    macro_rules! variable_str(($name:expr) => (
+        some_fields {
+            field1: $name,
+        }
+    ));
+    let vs = variable_str!(32);
+
+    let mut candidates: RefCell<HashMap<&'static str, &'static str>> = RefCell::new(HashMap::new());
+    let _ = blah { used_link_args: RefCell::new([]) };
+    let s1 = nofields;
+    let s2 = SF { field1: 55 };
+    let s3: some_fields = some_fields { field1: 55 };
+    let s4: msalias::nested_struct = sub::sub2::nested_struct { field2: 55 };
+    let s4: msalias::nested_struct = sub2::nested_struct { field2: 55 };
+    println(&s2.field1.to_string());
+    let s5: MyType = Box::new(some_fields { field1: 55 });
+    let s = SameDir::SameStruct { name: "Bob".to_string() };
+    let s = SubDir::SubStruct { name: "Bob".to_string() };
+    let s6: SomeEnum = SomeEnum::MyTypes(Box::new(s2.clone()), s5);
+    let s7: SomeEnum = SomeEnum::Strings("one", "two", "three");
+    matchSomeEnum(s6);
+    matchSomeEnum(s7);
+    let s8: SomeOtherEnum = SomeOtherEnum::SomeConst2;
+    matchSomeOtherEnum(s8);
+    let s9: SomeStructEnum =
+        SomeStructEnum::EnumStruct2 { f1: Box::new(some_fields { field1: 10 }), f2: Box::new(s2) };
+    matchSomeStructEnum(s9);
+
+    for x in &vec![1, 2, 3] {
+        let _y = x;
+    }
+
+    let s7: SomeEnum = SomeEnum::Strings("one", "two", "three");
+    if let SomeEnum::Strings(..) = s7 {
+        println!("hello!");
+    }
+
+    for i in 0..5 {
+        foo_foo(i);
+    }
+
+    if let Some(x) = None {
+        foo_foo(x);
+    }
+
+    if false {
+    } else if let Some(y) = None {
+        foo_foo(y);
+    }
+
+    while let Some(z) = None {
+        foo_foo(z);
+    }
+
+    let mut x = 4;
+    test_rec!(q, "Hello");
+    assert_eq!(x, 4);
+    internal_vars!(x);
+}
+
+fn foo_foo(_: i32) {}
+
+impl Iterator for nofields {
+    type Item = (usize, usize);
+
+    fn next(&mut self) -> Option<(usize, usize)> {
+        panic!()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        panic!()
+    }
+}
+
+trait Pattern<'a> {
+    type Searcher;
+}
+
+struct CharEqPattern;
+
+impl<'a> Pattern<'a> for CharEqPattern {
+    type Searcher = CharEqPattern;
+}
+
+struct CharSearcher<'a>(<CharEqPattern as Pattern<'a>>::Searcher);
+
+pub trait Error {}
+
+impl Error + 'static {
+    pub fn is<T: Error + 'static>(&self) -> bool {
+        panic!()
+    }
+}
+
+impl Error + 'static + Send {
+    pub fn is<T: Error + 'static>(&self) -> bool {
+        <Error + 'static>::is::<T>(self)
+    }
+}
+extern crate rustc_serialize;
+#[derive(Clone, Copy, Hash, PartialEq, Eq, PartialOrd, Ord, Debug, Default)]
+struct AllDerives(i32);
+
+fn test_format_args() {
+    let x = 1;
+    let y = 2;
+    let name = "Joe Blogg";
+    println!("Hello {}", name);
+    print!("Hello {0}", name);
+    print!("{0} + {} = {}", x, y);
+    print!("x is {}, y is {1}, name is {n}", x, y, n = name);
+}
+
+union TestUnion {
+    f1: u32,
+}
+
+struct FrameBuffer;
+
+struct SilenceGenerator;
+
+impl Iterator for SilenceGenerator {
+    type Item = FrameBuffer;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        panic!();
+    }
+}
+
+#[doc = include_str!("extra-docs.md")]
+struct StructWithDocs;
+
+trait Foo {
+    type Bar = FrameBuffer;
+}
diff --git a/src/test/run-make-fulldeps/save-analysis/krate2.rs b/tests/run-make-fulldeps/save-analysis/krate2.rs
index 7d787e0c9..7d787e0c9 100644
--- a/src/test/run-make-fulldeps/save-analysis/krate2.rs
+++ b/tests/run-make-fulldeps/save-analysis/krate2.rs
diff --git a/src/test/run-make-fulldeps/separate-link-fail/Makefile b/tests/run-make-fulldeps/separate-link-fail/Makefile
index bfd18fbf9..bfd18fbf9 100644
--- a/src/test/run-make-fulldeps/separate-link-fail/Makefile
+++ b/tests/run-make-fulldeps/separate-link-fail/Makefile
diff --git a/src/test/run-make-fulldeps/separate-link/Makefile b/tests/run-make-fulldeps/separate-link/Makefile
index 3ccdb6275..3ccdb6275 100644
--- a/src/test/run-make-fulldeps/separate-link/Makefile
+++ b/tests/run-make-fulldeps/separate-link/Makefile
diff --git a/src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile b/tests/run-make-fulldeps/sepcomp-cci-copies/Makefile
index df289d0b0..df289d0b0 100644
--- a/src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile
+++ b/tests/run-make-fulldeps/sepcomp-cci-copies/Makefile
diff --git a/src/test/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs b/tests/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs
index 869d4a6cd..869d4a6cd 100644
--- a/src/test/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs
+++ b/tests/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs
diff --git a/src/test/run-make-fulldeps/sepcomp-cci-copies/foo.rs b/tests/run-make-fulldeps/sepcomp-cci-copies/foo.rs
index ba251fcb0..ba251fcb0 100644
--- a/src/test/run-make-fulldeps/sepcomp-cci-copies/foo.rs
+++ b/tests/run-make-fulldeps/sepcomp-cci-copies/foo.rs
diff --git a/src/test/run-make-fulldeps/sepcomp-inlining/Makefile b/tests/run-make-fulldeps/sepcomp-inlining/Makefile
index 327aeb75e..327aeb75e 100644
--- a/src/test/run-make-fulldeps/sepcomp-inlining/Makefile
+++ b/tests/run-make-fulldeps/sepcomp-inlining/Makefile
diff --git a/src/test/run-make-fulldeps/sepcomp-inlining/foo.rs b/tests/run-make-fulldeps/sepcomp-inlining/foo.rs
index 2fe5f9cb7..2fe5f9cb7 100644
--- a/src/test/run-make-fulldeps/sepcomp-inlining/foo.rs
+++ b/tests/run-make-fulldeps/sepcomp-inlining/foo.rs
diff --git a/src/test/run-make-fulldeps/sepcomp-separate/Makefile b/tests/run-make-fulldeps/sepcomp-separate/Makefile
index 62cf54a88..62cf54a88 100644
--- a/src/test/run-make-fulldeps/sepcomp-separate/Makefile
+++ b/tests/run-make-fulldeps/sepcomp-separate/Makefile
diff --git a/src/test/run-make-fulldeps/sepcomp-separate/foo.rs b/tests/run-make-fulldeps/sepcomp-separate/foo.rs
index 169bafa9b..169bafa9b 100644
--- a/src/test/run-make-fulldeps/sepcomp-separate/foo.rs
+++ b/tests/run-make-fulldeps/sepcomp-separate/foo.rs
diff --git a/src/test/run-make-fulldeps/share-generics-dylib/Makefile b/tests/run-make-fulldeps/share-generics-dylib/Makefile
index 065fb574c..065fb574c 100644
--- a/src/test/run-make-fulldeps/share-generics-dylib/Makefile
+++ b/tests/run-make-fulldeps/share-generics-dylib/Makefile
diff --git a/src/test/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs b/tests/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs
index b4e125ac0..b4e125ac0 100644
--- a/src/test/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs
+++ b/tests/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs
diff --git a/src/test/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs b/tests/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs
index f613db873..f613db873 100644
--- a/src/test/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs
+++ b/tests/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs
diff --git a/src/test/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs b/tests/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs
index c8e6ab95c..c8e6ab95c 100644
--- a/src/test/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs
+++ b/tests/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs
diff --git a/src/test/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs b/tests/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs
index 7c34af6d0..7c34af6d0 100644
--- a/src/test/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs
+++ b/tests/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs
diff --git a/src/test/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs b/tests/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs
index 7c8368eec..7c8368eec 100644
--- a/src/test/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs
+++ b/tests/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs
diff --git a/src/test/run-make-fulldeps/share-generics-dylib/linked_leaf.rs b/tests/run-make-fulldeps/share-generics-dylib/linked_leaf.rs
index e510dad69..e510dad69 100644
--- a/src/test/run-make-fulldeps/share-generics-dylib/linked_leaf.rs
+++ b/tests/run-make-fulldeps/share-generics-dylib/linked_leaf.rs
diff --git a/src/test/run-make-fulldeps/simd-ffi/Makefile b/tests/run-make-fulldeps/simd-ffi/Makefile
index 297353470..297353470 100644
--- a/src/test/run-make-fulldeps/simd-ffi/Makefile
+++ b/tests/run-make-fulldeps/simd-ffi/Makefile
diff --git a/src/test/run-make-fulldeps/simd-ffi/simd.rs b/tests/run-make-fulldeps/simd-ffi/simd.rs
index d11cfd77c..d11cfd77c 100644
--- a/src/test/run-make-fulldeps/simd-ffi/simd.rs
+++ b/tests/run-make-fulldeps/simd-ffi/simd.rs
diff --git a/src/test/run-make-fulldeps/simple-dylib/Makefile b/tests/run-make-fulldeps/simple-dylib/Makefile
index 5dda5d66d..5dda5d66d 100644
--- a/src/test/run-make-fulldeps/simple-dylib/Makefile
+++ b/tests/run-make-fulldeps/simple-dylib/Makefile
diff --git a/src/test/run-make-fulldeps/simple-dylib/bar.rs b/tests/run-make-fulldeps/simple-dylib/bar.rs
index c5c0bc606..c5c0bc606 100644
--- a/src/test/run-make-fulldeps/simple-dylib/bar.rs
+++ b/tests/run-make-fulldeps/simple-dylib/bar.rs
diff --git a/src/test/run-make-fulldeps/simple-dylib/foo.rs b/tests/run-make-fulldeps/simple-dylib/foo.rs
index 8d68535e3..8d68535e3 100644
--- a/src/test/run-make-fulldeps/simple-dylib/foo.rs
+++ b/tests/run-make-fulldeps/simple-dylib/foo.rs
diff --git a/src/test/run-make-fulldeps/simple-rlib/Makefile b/tests/run-make-fulldeps/simple-rlib/Makefile
index d912b8a7b..d912b8a7b 100644
--- a/src/test/run-make-fulldeps/simple-rlib/Makefile
+++ b/tests/run-make-fulldeps/simple-rlib/Makefile
diff --git a/src/test/run-make-fulldeps/simple-rlib/bar.rs b/tests/run-make-fulldeps/simple-rlib/bar.rs
index c5c0bc606..c5c0bc606 100644
--- a/src/test/run-make-fulldeps/simple-rlib/bar.rs
+++ b/tests/run-make-fulldeps/simple-rlib/bar.rs
diff --git a/src/test/run-make-fulldeps/simple-rlib/foo.rs b/tests/run-make-fulldeps/simple-rlib/foo.rs
index 8d68535e3..8d68535e3 100644
--- a/src/test/run-make-fulldeps/simple-rlib/foo.rs
+++ b/tests/run-make-fulldeps/simple-rlib/foo.rs
diff --git a/src/test/run-make-fulldeps/split-debuginfo/Makefile b/tests/run-make-fulldeps/split-debuginfo/Makefile
index 1831ab38f..1831ab38f 100644
--- a/src/test/run-make-fulldeps/split-debuginfo/Makefile
+++ b/tests/run-make-fulldeps/split-debuginfo/Makefile
diff --git a/src/test/run-make-fulldeps/split-debuginfo/bar.rs b/tests/run-make-fulldeps/split-debuginfo/bar.rs
index 07dd07152..07dd07152 100644
--- a/src/test/run-make-fulldeps/split-debuginfo/bar.rs
+++ b/tests/run-make-fulldeps/split-debuginfo/bar.rs
diff --git a/src/test/run-make-fulldeps/split-debuginfo/baz.rs b/tests/run-make-fulldeps/split-debuginfo/baz.rs
index 8b1a39374..8b1a39374 100644
--- a/src/test/run-make-fulldeps/split-debuginfo/baz.rs
+++ b/tests/run-make-fulldeps/split-debuginfo/baz.rs
diff --git a/src/test/run-make-fulldeps/split-debuginfo/foo.rs b/tests/run-make-fulldeps/split-debuginfo/foo.rs
index b058e5408..b058e5408 100644
--- a/src/test/run-make-fulldeps/split-debuginfo/foo.rs
+++ b/tests/run-make-fulldeps/split-debuginfo/foo.rs
diff --git a/src/test/run-make-fulldeps/split-debuginfo/main.rs b/tests/run-make-fulldeps/split-debuginfo/main.rs
index 21fa16e40..21fa16e40 100644
--- a/src/test/run-make-fulldeps/split-debuginfo/main.rs
+++ b/tests/run-make-fulldeps/split-debuginfo/main.rs
diff --git a/src/test/run-make-fulldeps/stable-symbol-names/Makefile b/tests/run-make-fulldeps/stable-symbol-names/Makefile
index bbfb8e388..bbfb8e388 100644
--- a/src/test/run-make-fulldeps/stable-symbol-names/Makefile
+++ b/tests/run-make-fulldeps/stable-symbol-names/Makefile
diff --git a/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs b/tests/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs
index b85a42827..b85a42827 100644
--- a/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs
+++ b/tests/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs
diff --git a/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs b/tests/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs
index 33df9d6c6..33df9d6c6 100644
--- a/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs
+++ b/tests/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs
diff --git a/src/test/run-make-fulldeps/static-dylib-by-default/Makefile b/tests/run-make-fulldeps/static-dylib-by-default/Makefile
index eedd0b320..eedd0b320 100644
--- a/src/test/run-make-fulldeps/static-dylib-by-default/Makefile
+++ b/tests/run-make-fulldeps/static-dylib-by-default/Makefile
diff --git a/src/test/run-make-fulldeps/static-dylib-by-default/bar.rs b/tests/run-make-fulldeps/static-dylib-by-default/bar.rs
index 14421165e..14421165e 100644
--- a/src/test/run-make-fulldeps/static-dylib-by-default/bar.rs
+++ b/tests/run-make-fulldeps/static-dylib-by-default/bar.rs
diff --git a/src/test/run-make-fulldeps/static-dylib-by-default/foo.rs b/tests/run-make-fulldeps/static-dylib-by-default/foo.rs
index 7ebec8720..7ebec8720 100644
--- a/src/test/run-make-fulldeps/static-dylib-by-default/foo.rs
+++ b/tests/run-make-fulldeps/static-dylib-by-default/foo.rs
diff --git a/src/test/run-make-fulldeps/static-dylib-by-default/main.c b/tests/run-make-fulldeps/static-dylib-by-default/main.c
index 5f7f2c27c..5f7f2c27c 100644
--- a/src/test/run-make-fulldeps/static-dylib-by-default/main.c
+++ b/tests/run-make-fulldeps/static-dylib-by-default/main.c
diff --git a/src/test/run-make-fulldeps/static-extern-type/Makefile b/tests/run-make-fulldeps/static-extern-type/Makefile
index e9aa95e63..e9aa95e63 100644
--- a/src/test/run-make-fulldeps/static-extern-type/Makefile
+++ b/tests/run-make-fulldeps/static-extern-type/Makefile
diff --git a/src/test/run-make-fulldeps/static-extern-type/define-foo.c b/tests/run-make-fulldeps/static-extern-type/define-foo.c
index 39be5acfa..39be5acfa 100644
--- a/src/test/run-make-fulldeps/static-extern-type/define-foo.c
+++ b/tests/run-make-fulldeps/static-extern-type/define-foo.c
diff --git a/src/test/run-make-fulldeps/static-extern-type/use-foo.rs b/tests/run-make-fulldeps/static-extern-type/use-foo.rs
index 932b5b594..932b5b594 100644
--- a/src/test/run-make-fulldeps/static-extern-type/use-foo.rs
+++ b/tests/run-make-fulldeps/static-extern-type/use-foo.rs
diff --git a/src/test/run-make-fulldeps/static-unwinding/Makefile b/tests/run-make-fulldeps/static-unwinding/Makefile
index 9c755d4ab..9c755d4ab 100644
--- a/src/test/run-make-fulldeps/static-unwinding/Makefile
+++ b/tests/run-make-fulldeps/static-unwinding/Makefile
diff --git a/src/test/run-make-fulldeps/static-unwinding/lib.rs b/tests/run-make-fulldeps/static-unwinding/lib.rs
index 3fb1117a1..3fb1117a1 100644
--- a/src/test/run-make-fulldeps/static-unwinding/lib.rs
+++ b/tests/run-make-fulldeps/static-unwinding/lib.rs
diff --git a/src/test/run-make-fulldeps/static-unwinding/main.rs b/tests/run-make-fulldeps/static-unwinding/main.rs
index 0c66ea1aa..0c66ea1aa 100644
--- a/src/test/run-make-fulldeps/static-unwinding/main.rs
+++ b/tests/run-make-fulldeps/static-unwinding/main.rs
diff --git a/src/test/run-make-fulldeps/staticlib-blank-lib/Makefile b/tests/run-make-fulldeps/staticlib-blank-lib/Makefile
index fcbf87758..fcbf87758 100644
--- a/src/test/run-make-fulldeps/staticlib-blank-lib/Makefile
+++ b/tests/run-make-fulldeps/staticlib-blank-lib/Makefile
diff --git a/src/test/run-make-fulldeps/staticlib-blank-lib/foo.rs b/tests/run-make-fulldeps/staticlib-blank-lib/foo.rs
index bf48d069d..bf48d069d 100644
--- a/src/test/run-make-fulldeps/staticlib-blank-lib/foo.rs
+++ b/tests/run-make-fulldeps/staticlib-blank-lib/foo.rs
diff --git a/src/test/run-make-fulldeps/std-core-cycle/Makefile b/tests/run-make-fulldeps/std-core-cycle/Makefile
index 4f2528637..4f2528637 100644
--- a/src/test/run-make-fulldeps/std-core-cycle/Makefile
+++ b/tests/run-make-fulldeps/std-core-cycle/Makefile
diff --git a/src/test/run-make-fulldeps/std-core-cycle/bar.rs b/tests/run-make-fulldeps/std-core-cycle/bar.rs
index 9f5e7c29b..9f5e7c29b 100644
--- a/src/test/run-make-fulldeps/std-core-cycle/bar.rs
+++ b/tests/run-make-fulldeps/std-core-cycle/bar.rs
diff --git a/src/test/run-make-fulldeps/std-core-cycle/foo.rs b/tests/run-make-fulldeps/std-core-cycle/foo.rs
index 6aa6e1ac3..6aa6e1ac3 100644
--- a/src/test/run-make-fulldeps/std-core-cycle/foo.rs
+++ b/tests/run-make-fulldeps/std-core-cycle/foo.rs
diff --git a/src/test/run-make-fulldeps/stdin-non-utf8/Makefile b/tests/run-make-fulldeps/stdin-non-utf8/Makefile
index 709d4cf14..709d4cf14 100644
--- a/src/test/run-make-fulldeps/stdin-non-utf8/Makefile
+++ b/tests/run-make-fulldeps/stdin-non-utf8/Makefile
diff --git a/src/test/run-make-fulldeps/stdin-non-utf8/non-utf8 b/tests/run-make-fulldeps/stdin-non-utf8/non-utf8
index bc87051a8..bc87051a8 100644
--- a/src/test/run-make-fulldeps/stdin-non-utf8/non-utf8
+++ b/tests/run-make-fulldeps/stdin-non-utf8/non-utf8
diff --git a/src/test/run-make-fulldeps/suspicious-library/Makefile b/tests/run-make-fulldeps/suspicious-library/Makefile
index 2af9e85c2..2af9e85c2 100644
--- a/src/test/run-make-fulldeps/suspicious-library/Makefile
+++ b/tests/run-make-fulldeps/suspicious-library/Makefile
diff --git a/src/test/run-make-fulldeps/suspicious-library/bar.rs b/tests/run-make-fulldeps/suspicious-library/bar.rs
index 550c94cd0..550c94cd0 100644
--- a/src/test/run-make-fulldeps/suspicious-library/bar.rs
+++ b/tests/run-make-fulldeps/suspicious-library/bar.rs
diff --git a/src/test/run-make-fulldeps/suspicious-library/foo.rs b/tests/run-make-fulldeps/suspicious-library/foo.rs
index a382d8f2c..a382d8f2c 100644
--- a/src/test/run-make-fulldeps/suspicious-library/foo.rs
+++ b/tests/run-make-fulldeps/suspicious-library/foo.rs
diff --git a/src/test/run-make-fulldeps/symbol-visibility/Makefile b/tests/run-make-fulldeps/symbol-visibility/Makefile
index 17052ef4e..17052ef4e 100644
--- a/src/test/run-make-fulldeps/symbol-visibility/Makefile
+++ b/tests/run-make-fulldeps/symbol-visibility/Makefile
diff --git a/src/test/run-make-fulldeps/symbol-visibility/a_cdylib.rs b/tests/run-make-fulldeps/symbol-visibility/a_cdylib.rs
index d4fbff85b..d4fbff85b 100644
--- a/src/test/run-make-fulldeps/symbol-visibility/a_cdylib.rs
+++ b/tests/run-make-fulldeps/symbol-visibility/a_cdylib.rs
diff --git a/src/test/run-make-fulldeps/symbol-visibility/a_proc_macro.rs b/tests/run-make-fulldeps/symbol-visibility/a_proc_macro.rs
index 9fd1a8a67..9fd1a8a67 100644
--- a/src/test/run-make-fulldeps/symbol-visibility/a_proc_macro.rs
+++ b/tests/run-make-fulldeps/symbol-visibility/a_proc_macro.rs
diff --git a/src/test/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs b/tests/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs
index a47df0ab7..a47df0ab7 100644
--- a/src/test/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs
+++ b/tests/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs
diff --git a/src/test/run-make-fulldeps/symbol-visibility/an_executable.rs b/tests/run-make-fulldeps/symbol-visibility/an_executable.rs
index 3f5e125ad..3f5e125ad 100644
--- a/src/test/run-make-fulldeps/symbol-visibility/an_executable.rs
+++ b/tests/run-make-fulldeps/symbol-visibility/an_executable.rs
diff --git a/src/test/run-make-fulldeps/symbol-visibility/an_rlib.rs b/tests/run-make-fulldeps/symbol-visibility/an_rlib.rs
index 3696422b1..3696422b1 100644
--- a/src/test/run-make-fulldeps/symbol-visibility/an_rlib.rs
+++ b/tests/run-make-fulldeps/symbol-visibility/an_rlib.rs
diff --git a/src/test/run-make-fulldeps/symbols-include-type-name/Makefile b/tests/run-make-fulldeps/symbols-include-type-name/Makefile
index ac26a852e..ac26a852e 100644
--- a/src/test/run-make-fulldeps/symbols-include-type-name/Makefile
+++ b/tests/run-make-fulldeps/symbols-include-type-name/Makefile
diff --git a/src/test/run-make-fulldeps/symbols-include-type-name/lib.rs b/tests/run-make-fulldeps/symbols-include-type-name/lib.rs
index 37d445917..37d445917 100644
--- a/src/test/run-make-fulldeps/symbols-include-type-name/lib.rs
+++ b/tests/run-make-fulldeps/symbols-include-type-name/lib.rs
diff --git a/src/test/run-make-fulldeps/symlinked-extern/Makefile b/tests/run-make-fulldeps/symlinked-extern/Makefile
index 058f43e85..058f43e85 100644
--- a/src/test/run-make-fulldeps/symlinked-extern/Makefile
+++ b/tests/run-make-fulldeps/symlinked-extern/Makefile
diff --git a/src/test/run-make-fulldeps/symlinked-extern/bar.rs b/tests/run-make-fulldeps/symlinked-extern/bar.rs
index cd9c959d5..cd9c959d5 100644
--- a/src/test/run-make-fulldeps/symlinked-extern/bar.rs
+++ b/tests/run-make-fulldeps/symlinked-extern/bar.rs
diff --git a/src/test/run-make-fulldeps/symlinked-extern/baz.rs b/tests/run-make-fulldeps/symlinked-extern/baz.rs
index cd433a3ac..cd433a3ac 100644
--- a/src/test/run-make-fulldeps/symlinked-extern/baz.rs
+++ b/tests/run-make-fulldeps/symlinked-extern/baz.rs
diff --git a/src/test/run-make-fulldeps/symlinked-extern/foo.rs b/tests/run-make-fulldeps/symlinked-extern/foo.rs
index c00700b8c..c00700b8c 100644
--- a/src/test/run-make-fulldeps/symlinked-extern/foo.rs
+++ b/tests/run-make-fulldeps/symlinked-extern/foo.rs
diff --git a/src/test/run-make-fulldeps/symlinked-libraries/Makefile b/tests/run-make-fulldeps/symlinked-libraries/Makefile
index 576bf7e54..576bf7e54 100644
--- a/src/test/run-make-fulldeps/symlinked-libraries/Makefile
+++ b/tests/run-make-fulldeps/symlinked-libraries/Makefile
diff --git a/src/test/run-make-fulldeps/symlinked-libraries/bar.rs b/tests/run-make-fulldeps/symlinked-libraries/bar.rs
index fde0d7466..fde0d7466 100644
--- a/src/test/run-make-fulldeps/symlinked-libraries/bar.rs
+++ b/tests/run-make-fulldeps/symlinked-libraries/bar.rs
diff --git a/src/test/run-make-fulldeps/symlinked-libraries/foo.rs b/tests/run-make-fulldeps/symlinked-libraries/foo.rs
index cde9e291b..cde9e291b 100644
--- a/src/test/run-make-fulldeps/symlinked-libraries/foo.rs
+++ b/tests/run-make-fulldeps/symlinked-libraries/foo.rs
diff --git a/src/test/run-make-fulldeps/symlinked-rlib/Makefile b/tests/run-make-fulldeps/symlinked-rlib/Makefile
index 49d3f220a..49d3f220a 100644
--- a/src/test/run-make-fulldeps/symlinked-rlib/Makefile
+++ b/tests/run-make-fulldeps/symlinked-rlib/Makefile
diff --git a/src/test/run-make-fulldeps/symlinked-rlib/bar.rs b/tests/run-make-fulldeps/symlinked-rlib/bar.rs
index fde0d7466..fde0d7466 100644
--- a/src/test/run-make-fulldeps/symlinked-rlib/bar.rs
+++ b/tests/run-make-fulldeps/symlinked-rlib/bar.rs
diff --git a/src/test/run-make-fulldeps/symlinked-rlib/foo.rs b/tests/run-make-fulldeps/symlinked-rlib/foo.rs
index c5c0bc606..c5c0bc606 100644
--- a/src/test/run-make-fulldeps/symlinked-rlib/foo.rs
+++ b/tests/run-make-fulldeps/symlinked-rlib/foo.rs
diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
index 1e267fb95..1e267fb95 100644
--- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
+++ b/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/test.py b/tests/run-make-fulldeps/sysroot-crates-are-unstable/test.py
index cb77eb34f..cb77eb34f 100644
--- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/test.py
+++ b/tests/run-make-fulldeps/sysroot-crates-are-unstable/test.py
diff --git a/src/test/run-make-fulldeps/target-cpu-native/Makefile b/tests/run-make-fulldeps/target-cpu-native/Makefile
index eb3ca1e13..eb3ca1e13 100644
--- a/src/test/run-make-fulldeps/target-cpu-native/Makefile
+++ b/tests/run-make-fulldeps/target-cpu-native/Makefile
diff --git a/src/test/run-make-fulldeps/target-cpu-native/foo.rs b/tests/run-make-fulldeps/target-cpu-native/foo.rs
index f79c691f0..f79c691f0 100644
--- a/src/test/run-make-fulldeps/target-cpu-native/foo.rs
+++ b/tests/run-make-fulldeps/target-cpu-native/foo.rs
diff --git a/src/test/run-make-fulldeps/target-specs/Makefile b/tests/run-make-fulldeps/target-specs/Makefile
index a33f5368e..a33f5368e 100644
--- a/src/test/run-make-fulldeps/target-specs/Makefile
+++ b/tests/run-make-fulldeps/target-specs/Makefile
diff --git a/src/test/run-make-fulldeps/target-specs/definitely-not-builtin-target.json b/tests/run-make-fulldeps/target-specs/definitely-not-builtin-target.json
index b36fa993d..b36fa993d 100644
--- a/src/test/run-make-fulldeps/target-specs/definitely-not-builtin-target.json
+++ b/tests/run-make-fulldeps/target-specs/definitely-not-builtin-target.json
diff --git a/tests/run-make-fulldeps/target-specs/foo.rs b/tests/run-make-fulldeps/target-specs/foo.rs
new file mode 100644
index 000000000..22939e879
--- /dev/null
+++ b/tests/run-make-fulldeps/target-specs/foo.rs
@@ -0,0 +1,24 @@
+#![feature(lang_items, no_core, auto_traits)]
+#![no_core]
+
+#[lang = "copy"]
+trait Copy {}
+
+#[lang = "sized"]
+trait Sized {}
+
+#[lang = "freeze"]
+auto trait Freeze {}
+
+#[lang = "start"]
+fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8, _sigpipe: u8) -> isize {
+    0
+}
+
+extern "C" {
+    fn _foo() -> [u8; 16];
+}
+
+fn _main() {
+    let _a = unsafe { _foo() };
+}
diff --git a/src/test/run-make-fulldeps/target-specs/mismatching-data-layout.json b/tests/run-make-fulldeps/target-specs/mismatching-data-layout.json
index d12caaad1..d12caaad1 100644
--- a/src/test/run-make-fulldeps/target-specs/mismatching-data-layout.json
+++ b/tests/run-make-fulldeps/target-specs/mismatching-data-layout.json
diff --git a/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json b/tests/run-make-fulldeps/target-specs/my-awesome-platform.json
index 00de3de05..00de3de05 100644
--- a/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json
+++ b/tests/run-make-fulldeps/target-specs/my-awesome-platform.json
diff --git a/src/test/run-make-fulldeps/target-specs/my-incomplete-platform.json b/tests/run-make-fulldeps/target-specs/my-incomplete-platform.json
index ceaa25cdf..ceaa25cdf 100644
--- a/src/test/run-make-fulldeps/target-specs/my-incomplete-platform.json
+++ b/tests/run-make-fulldeps/target-specs/my-incomplete-platform.json
diff --git a/src/test/run-make-fulldeps/target-specs/my-invalid-platform.json b/tests/run-make-fulldeps/target-specs/my-invalid-platform.json
index 3feac45b7..3feac45b7 100644
--- a/src/test/run-make-fulldeps/target-specs/my-invalid-platform.json
+++ b/tests/run-make-fulldeps/target-specs/my-invalid-platform.json
diff --git a/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json b/tests/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
index 6d5e964ed..6d5e964ed 100644
--- a/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
+++ b/tests/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
diff --git a/src/test/run-make-fulldeps/target-without-atomic-cas/Makefile b/tests/run-make-fulldeps/target-without-atomic-cas/Makefile
index 451f03d66..451f03d66 100644
--- a/src/test/run-make-fulldeps/target-without-atomic-cas/Makefile
+++ b/tests/run-make-fulldeps/target-without-atomic-cas/Makefile
diff --git a/src/test/run-make-fulldeps/test-harness/Makefile b/tests/run-make-fulldeps/test-harness/Makefile
index 1fe059b07..1fe059b07 100644
--- a/src/test/run-make-fulldeps/test-harness/Makefile
+++ b/tests/run-make-fulldeps/test-harness/Makefile
diff --git a/src/test/run-make-fulldeps/test-harness/test-ignore-cfg.rs b/tests/run-make-fulldeps/test-harness/test-ignore-cfg.rs
index 31ef131f2..31ef131f2 100644
--- a/src/test/run-make-fulldeps/test-harness/test-ignore-cfg.rs
+++ b/tests/run-make-fulldeps/test-harness/test-ignore-cfg.rs
diff --git a/src/test/run-make-fulldeps/tools.mk b/tests/run-make-fulldeps/tools.mk
index 0f5425daa..0f5425daa 100644
--- a/src/test/run-make-fulldeps/tools.mk
+++ b/tests/run-make-fulldeps/tools.mk
diff --git a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/Makefile b/tests/run-make-fulldeps/type-mismatch-same-crate-name/Makefile
index 9f4be7126..9f4be7126 100644
--- a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/Makefile
+++ b/tests/run-make-fulldeps/type-mismatch-same-crate-name/Makefile
diff --git a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs b/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs
index 4871c8c2e..4871c8c2e 100644
--- a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs
+++ b/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs
diff --git a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs b/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs
index 24fcc7cad..24fcc7cad 100644
--- a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs
+++ b/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs
diff --git a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs b/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs
index 71b38a9f8..71b38a9f8 100644
--- a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs
+++ b/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs
diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile b/tests/run-make-fulldeps/use-extern-for-plugins/Makefile
index 6ae53afad..6ae53afad 100644
--- a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile
+++ b/tests/run-make-fulldeps/use-extern-for-plugins/Makefile
diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/bar.rs b/tests/run-make-fulldeps/use-extern-for-plugins/bar.rs
index 704d21203..704d21203 100644
--- a/src/test/run-make-fulldeps/use-extern-for-plugins/bar.rs
+++ b/tests/run-make-fulldeps/use-extern-for-plugins/bar.rs
diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/baz.rs b/tests/run-make-fulldeps/use-extern-for-plugins/baz.rs
index 49a96a0c8..49a96a0c8 100644
--- a/src/test/run-make-fulldeps/use-extern-for-plugins/baz.rs
+++ b/tests/run-make-fulldeps/use-extern-for-plugins/baz.rs
diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/foo.rs b/tests/run-make-fulldeps/use-extern-for-plugins/foo.rs
index dffdc0798..dffdc0798 100644
--- a/src/test/run-make-fulldeps/use-extern-for-plugins/foo.rs
+++ b/tests/run-make-fulldeps/use-extern-for-plugins/foo.rs
diff --git a/src/test/run-make-fulldeps/use-suggestions-rust-2018/Makefile b/tests/run-make-fulldeps/use-suggestions-rust-2018/Makefile
index 37cd6283c..37cd6283c 100644
--- a/src/test/run-make-fulldeps/use-suggestions-rust-2018/Makefile
+++ b/tests/run-make-fulldeps/use-suggestions-rust-2018/Makefile
diff --git a/src/test/run-make-fulldeps/use-suggestions-rust-2018/ep-nested-lib.rs b/tests/run-make-fulldeps/use-suggestions-rust-2018/ep-nested-lib.rs
index 62a0a9d8f..62a0a9d8f 100644
--- a/src/test/run-make-fulldeps/use-suggestions-rust-2018/ep-nested-lib.rs
+++ b/tests/run-make-fulldeps/use-suggestions-rust-2018/ep-nested-lib.rs
diff --git a/src/test/run-make-fulldeps/use-suggestions-rust-2018/use-suggestions.rs b/tests/run-make-fulldeps/use-suggestions-rust-2018/use-suggestions.rs
index d262d6f98..d262d6f98 100644
--- a/src/test/run-make-fulldeps/use-suggestions-rust-2018/use-suggestions.rs
+++ b/tests/run-make-fulldeps/use-suggestions-rust-2018/use-suggestions.rs
diff --git a/src/test/run-make-fulldeps/used-cdylib-macos/Makefile b/tests/run-make-fulldeps/used-cdylib-macos/Makefile
index 38a4c31c7..38a4c31c7 100644
--- a/src/test/run-make-fulldeps/used-cdylib-macos/Makefile
+++ b/tests/run-make-fulldeps/used-cdylib-macos/Makefile
diff --git a/src/test/run-make-fulldeps/used-cdylib-macos/dylib_used.rs b/tests/run-make-fulldeps/used-cdylib-macos/dylib_used.rs
index 85f0ff92f..85f0ff92f 100644
--- a/src/test/run-make-fulldeps/used-cdylib-macos/dylib_used.rs
+++ b/tests/run-make-fulldeps/used-cdylib-macos/dylib_used.rs
diff --git a/src/test/run-make-fulldeps/used/Makefile b/tests/run-make-fulldeps/used/Makefile
index e80eb9e40..e80eb9e40 100644
--- a/src/test/run-make-fulldeps/used/Makefile
+++ b/tests/run-make-fulldeps/used/Makefile
diff --git a/src/test/run-make-fulldeps/used/used.rs b/tests/run-make-fulldeps/used/used.rs
index dca0a5e11..dca0a5e11 100644
--- a/src/test/run-make-fulldeps/used/used.rs
+++ b/tests/run-make-fulldeps/used/used.rs
diff --git a/src/test/run-make-fulldeps/version/Makefile b/tests/run-make-fulldeps/version/Makefile
index 3a130545d..3a130545d 100644
--- a/src/test/run-make-fulldeps/version/Makefile
+++ b/tests/run-make-fulldeps/version/Makefile
diff --git a/src/test/run-make-fulldeps/volatile-intrinsics/Makefile b/tests/run-make-fulldeps/volatile-intrinsics/Makefile
index 2a78c7b9c..2a78c7b9c 100644
--- a/src/test/run-make-fulldeps/volatile-intrinsics/Makefile
+++ b/tests/run-make-fulldeps/volatile-intrinsics/Makefile
diff --git a/src/test/run-make-fulldeps/volatile-intrinsics/main.rs b/tests/run-make-fulldeps/volatile-intrinsics/main.rs
index 4295d95f3..4295d95f3 100644
--- a/src/test/run-make-fulldeps/volatile-intrinsics/main.rs
+++ b/tests/run-make-fulldeps/volatile-intrinsics/main.rs
diff --git a/src/test/run-make-fulldeps/weird-output-filenames/Makefile b/tests/run-make-fulldeps/weird-output-filenames/Makefile
index d3a34e3b4..d3a34e3b4 100644
--- a/src/test/run-make-fulldeps/weird-output-filenames/Makefile
+++ b/tests/run-make-fulldeps/weird-output-filenames/Makefile
diff --git a/src/test/run-make-fulldeps/weird-output-filenames/foo.rs b/tests/run-make-fulldeps/weird-output-filenames/foo.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make-fulldeps/weird-output-filenames/foo.rs
+++ b/tests/run-make-fulldeps/weird-output-filenames/foo.rs
diff --git a/src/test/run-make-fulldeps/windows-binary-no-external-deps/Makefile b/tests/run-make-fulldeps/windows-binary-no-external-deps/Makefile
index 8960020fe..8960020fe 100644
--- a/src/test/run-make-fulldeps/windows-binary-no-external-deps/Makefile
+++ b/tests/run-make-fulldeps/windows-binary-no-external-deps/Makefile
diff --git a/src/test/run-make-fulldeps/windows-binary-no-external-deps/hello.rs b/tests/run-make-fulldeps/windows-binary-no-external-deps/hello.rs
index 47ad8c634..47ad8c634 100644
--- a/src/test/run-make-fulldeps/windows-binary-no-external-deps/hello.rs
+++ b/tests/run-make-fulldeps/windows-binary-no-external-deps/hello.rs
diff --git a/src/test/run-make-fulldeps/windows-spawn/Makefile b/tests/run-make-fulldeps/windows-spawn/Makefile
index b6cdb169b..b6cdb169b 100644
--- a/src/test/run-make-fulldeps/windows-spawn/Makefile
+++ b/tests/run-make-fulldeps/windows-spawn/Makefile
diff --git a/src/test/run-make-fulldeps/windows-spawn/hello.rs b/tests/run-make-fulldeps/windows-spawn/hello.rs
index 47ad8c634..47ad8c634 100644
--- a/src/test/run-make-fulldeps/windows-spawn/hello.rs
+++ b/tests/run-make-fulldeps/windows-spawn/hello.rs
diff --git a/src/test/run-make-fulldeps/windows-spawn/spawn.rs b/tests/run-make-fulldeps/windows-spawn/spawn.rs
index c34da3d5f..c34da3d5f 100644
--- a/src/test/run-make-fulldeps/windows-spawn/spawn.rs
+++ b/tests/run-make-fulldeps/windows-spawn/spawn.rs
diff --git a/src/test/run-make-fulldeps/windows-subsystem/Makefile b/tests/run-make-fulldeps/windows-subsystem/Makefile
index 78c4e2ac1..78c4e2ac1 100644
--- a/src/test/run-make-fulldeps/windows-subsystem/Makefile
+++ b/tests/run-make-fulldeps/windows-subsystem/Makefile
diff --git a/src/test/run-make-fulldeps/windows-subsystem/console.rs b/tests/run-make-fulldeps/windows-subsystem/console.rs
index 61a92eb6a..61a92eb6a 100644
--- a/src/test/run-make-fulldeps/windows-subsystem/console.rs
+++ b/tests/run-make-fulldeps/windows-subsystem/console.rs
diff --git a/src/test/run-make-fulldeps/windows-subsystem/windows.rs b/tests/run-make-fulldeps/windows-subsystem/windows.rs
index 1138248f0..1138248f0 100644
--- a/src/test/run-make-fulldeps/windows-subsystem/windows.rs
+++ b/tests/run-make-fulldeps/windows-subsystem/windows.rs
diff --git a/src/test/run-make/const_fn_mir/Makefile b/tests/run-make/const_fn_mir/Makefile
index ad5695093..ad5695093 100644
--- a/src/test/run-make/const_fn_mir/Makefile
+++ b/tests/run-make/const_fn_mir/Makefile
diff --git a/src/test/run-make/const_fn_mir/dump.mir b/tests/run-make/const_fn_mir/dump.mir
index ab4084c95..ab4084c95 100644
--- a/src/test/run-make/const_fn_mir/dump.mir
+++ b/tests/run-make/const_fn_mir/dump.mir
diff --git a/src/test/run-make/const_fn_mir/main.rs b/tests/run-make/const_fn_mir/main.rs
index e8552bd28..e8552bd28 100644
--- a/src/test/run-make/const_fn_mir/main.rs
+++ b/tests/run-make/const_fn_mir/main.rs
diff --git a/src/test/run-make/coverage-llvmir/Makefile b/tests/run-make/coverage-llvmir/Makefile
index 7be655053..7be655053 100644
--- a/src/test/run-make/coverage-llvmir/Makefile
+++ b/tests/run-make/coverage-llvmir/Makefile
diff --git a/src/test/run-make/coverage-llvmir/filecheck.testprog.txt b/tests/run-make/coverage-llvmir/filecheck.testprog.txt
index c943261d7..c943261d7 100644
--- a/src/test/run-make/coverage-llvmir/filecheck.testprog.txt
+++ b/tests/run-make/coverage-llvmir/filecheck.testprog.txt
diff --git a/src/test/run-make/coverage-llvmir/testprog.rs b/tests/run-make/coverage-llvmir/testprog.rs
index 358c25677..358c25677 100644
--- a/src/test/run-make/coverage-llvmir/testprog.rs
+++ b/tests/run-make/coverage-llvmir/testprog.rs
diff --git a/src/test/run-make/coverage-reports/Makefile b/tests/run-make/coverage-reports/Makefile
index d06cd9c6a..d06cd9c6a 100644
--- a/src/test/run-make/coverage-reports/Makefile
+++ b/tests/run-make/coverage-reports/Makefile
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.abort.txt b/tests/run-make/coverage-reports/expected_show_coverage.abort.txt
index 00f46f42a..00f46f42a 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.abort.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.abort.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.assert.txt b/tests/run-make/coverage-reports/expected_show_coverage.assert.txt
index 405688806..405688806 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.assert.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.assert.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.async.txt b/tests/run-make/coverage-reports/expected_show_coverage.async.txt
index 87ccb6c43..87ccb6c43 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.async.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.async.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.async2.txt b/tests/run-make/coverage-reports/expected_show_coverage.async2.txt
index 500dde1f2..500dde1f2 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.async2.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.async2.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.closure.txt b/tests/run-make/coverage-reports/expected_show_coverage.closure.txt
index e463099a5..e463099a5 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.closure.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.closure.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.closure_macro.txt b/tests/run-make/coverage-reports/expected_show_coverage.closure_macro.txt
index 87f701476..87f701476 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.closure_macro.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.closure_macro.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.closure_macro_async.txt b/tests/run-make/coverage-reports/expected_show_coverage.closure_macro_async.txt
index 2b5418132..2b5418132 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.closure_macro_async.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.closure_macro_async.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.conditions.txt b/tests/run-make/coverage-reports/expected_show_coverage.conditions.txt
index 2d8a98a5d..2d8a98a5d 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.conditions.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.conditions.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.continue.txt b/tests/run-make/coverage-reports/expected_show_coverage.continue.txt
index 1c64ead9f..1c64ead9f 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.continue.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.continue.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.dead_code.txt b/tests/run-make/coverage-reports/expected_show_coverage.dead_code.txt
index 09ff14c6f..09ff14c6f 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.dead_code.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.dead_code.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.doctest.txt b/tests/run-make/coverage-reports/expected_show_coverage.doctest.txt
index 732de6526..732de6526 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.doctest.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.doctest.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.drop_trait.txt b/tests/run-make/coverage-reports/expected_show_coverage.drop_trait.txt
index fe6a9e93c..fe6a9e93c 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.drop_trait.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.drop_trait.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.generator.txt b/tests/run-make/coverage-reports/expected_show_coverage.generator.txt
index 0fb3808ff..0fb3808ff 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.generator.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.generator.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.generics.txt b/tests/run-make/coverage-reports/expected_show_coverage.generics.txt
index 48983ba43..48983ba43 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.generics.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.generics.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.if.txt b/tests/run-make/coverage-reports/expected_show_coverage.if.txt
index 0c9eff227..0c9eff227 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.if.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.if.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.if_else.txt b/tests/run-make/coverage-reports/expected_show_coverage.if_else.txt
index 4285d3186..4285d3186 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.if_else.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.if_else.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.inline-dead.txt b/tests/run-make/coverage-reports/expected_show_coverage.inline-dead.txt
index a59fe1146..a59fe1146 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.inline-dead.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.inline-dead.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.inline.txt b/tests/run-make/coverage-reports/expected_show_coverage.inline.txt
index 6f5d1544f..6f5d1544f 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.inline.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.inline.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.inner_items.txt b/tests/run-make/coverage-reports/expected_show_coverage.inner_items.txt
index 883254a09..883254a09 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.inner_items.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.inner_items.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.issue-83601.txt b/tests/run-make/coverage-reports/expected_show_coverage.issue-83601.txt
index 25c74ab2e..25c74ab2e 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.issue-83601.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.issue-83601.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.issue-84561.txt b/tests/run-make/coverage-reports/expected_show_coverage.issue-84561.txt
index 4a60432c1..4a60432c1 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.issue-84561.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.issue-84561.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.issue-85461.txt b/tests/run-make/coverage-reports/expected_show_coverage.issue-85461.txt
index 1aa4a22c3..1aa4a22c3 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.issue-85461.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.issue-85461.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.issue-93054.txt b/tests/run-make/coverage-reports/expected_show_coverage.issue-93054.txt
index a1655aded..a1655aded 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.issue-93054.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.issue-93054.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.lazy_boolean.txt b/tests/run-make/coverage-reports/expected_show_coverage.lazy_boolean.txt
index bd349df2f..bd349df2f 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.lazy_boolean.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.lazy_boolean.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.loop_break_value.txt b/tests/run-make/coverage-reports/expected_show_coverage.loop_break_value.txt
index 022fe4c59..022fe4c59 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.loop_break_value.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.loop_break_value.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.loops_branches.txt b/tests/run-make/coverage-reports/expected_show_coverage.loops_branches.txt
index b7ad79a24..b7ad79a24 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.loops_branches.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.loops_branches.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.match_or_pattern.txt b/tests/run-make/coverage-reports/expected_show_coverage.match_or_pattern.txt
index a0fccb24f..a0fccb24f 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.match_or_pattern.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.match_or_pattern.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.nested_loops.txt b/tests/run-make/coverage-reports/expected_show_coverage.nested_loops.txt
index 0dbd6bcf3..0dbd6bcf3 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.nested_loops.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.nested_loops.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.no_cov_crate.txt b/tests/run-make/coverage-reports/expected_show_coverage.no_cov_crate.txt
index 83a920413..83a920413 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.no_cov_crate.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.no_cov_crate.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.overflow.txt b/tests/run-make/coverage-reports/expected_show_coverage.overflow.txt
index 25e822bff..25e822bff 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.overflow.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.overflow.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.panic_unwind.txt b/tests/run-make/coverage-reports/expected_show_coverage.panic_unwind.txt
index 114507dc9..114507dc9 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.panic_unwind.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.panic_unwind.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.partial_eq.txt b/tests/run-make/coverage-reports/expected_show_coverage.partial_eq.txt
index a77175af6..a77175af6 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.partial_eq.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.partial_eq.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.simple_loop.txt b/tests/run-make/coverage-reports/expected_show_coverage.simple_loop.txt
index feb83bad6..feb83bad6 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.simple_loop.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.simple_loop.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.simple_match.txt b/tests/run-make/coverage-reports/expected_show_coverage.simple_match.txt
index b92982131..b92982131 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.simple_match.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.simple_match.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.tight_inf_loop.txt b/tests/run-make/coverage-reports/expected_show_coverage.tight_inf_loop.txt
index 2d4c57f45..2d4c57f45 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.tight_inf_loop.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.tight_inf_loop.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.try_error_result.txt b/tests/run-make/coverage-reports/expected_show_coverage.try_error_result.txt
index 0ad0180b7..0ad0180b7 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.try_error_result.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.try_error_result.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.unused.txt b/tests/run-make/coverage-reports/expected_show_coverage.unused.txt
index 15fcf21c0..15fcf21c0 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.unused.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.unused.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.unused_mod.txt b/tests/run-make/coverage-reports/expected_show_coverage.unused_mod.txt
index 82d6fccc2..82d6fccc2 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.unused_mod.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.unused_mod.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.uses_crate.txt b/tests/run-make/coverage-reports/expected_show_coverage.uses_crate.txt
index 65eb1008d..65eb1008d 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.uses_crate.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.uses_crate.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.uses_inline_crate.txt b/tests/run-make/coverage-reports/expected_show_coverage.uses_inline_crate.txt
index 748343885..748343885 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.uses_inline_crate.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.uses_inline_crate.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.while.txt b/tests/run-make/coverage-reports/expected_show_coverage.while.txt
index efa7d083f..efa7d083f 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.while.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.while.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.while_early_ret.txt b/tests/run-make/coverage-reports/expected_show_coverage.while_early_ret.txt
index d19afc0de..d19afc0de 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.while_early_ret.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.while_early_ret.txt
diff --git a/src/test/run-make/coverage-reports/expected_show_coverage.yield.txt b/tests/run-make/coverage-reports/expected_show_coverage.yield.txt
index 6e2f23ee7..6e2f23ee7 100644
--- a/src/test/run-make/coverage-reports/expected_show_coverage.yield.txt
+++ b/tests/run-make/coverage-reports/expected_show_coverage.yield.txt
diff --git a/src/test/run-make/coverage-reports/normalize_paths.py b/tests/run-make/coverage-reports/normalize_paths.py
index e5777ad25..e5777ad25 100755
--- a/src/test/run-make/coverage-reports/normalize_paths.py
+++ b/tests/run-make/coverage-reports/normalize_paths.py
diff --git a/src/test/run-make/coverage/WARNING_KEEP_NAMES_SHORT.txt b/tests/run-make/coverage/WARNING_KEEP_NAMES_SHORT.txt
index 6a1403b8a..6a1403b8a 100644
--- a/src/test/run-make/coverage/WARNING_KEEP_NAMES_SHORT.txt
+++ b/tests/run-make/coverage/WARNING_KEEP_NAMES_SHORT.txt
diff --git a/src/test/run-make/coverage/abort.rs b/tests/run-make/coverage/abort.rs
index 3dac43df8..3dac43df8 100644
--- a/src/test/run-make/coverage/abort.rs
+++ b/tests/run-make/coverage/abort.rs
diff --git a/src/test/run-make/coverage/assert.rs b/tests/run-make/coverage/assert.rs
index c85f2748e..c85f2748e 100644
--- a/src/test/run-make/coverage/assert.rs
+++ b/tests/run-make/coverage/assert.rs
diff --git a/src/test/run-make/coverage/async.rs b/tests/run-make/coverage/async.rs
index efd9e62d6..efd9e62d6 100644
--- a/src/test/run-make/coverage/async.rs
+++ b/tests/run-make/coverage/async.rs
diff --git a/src/test/run-make/coverage/async2.rs b/tests/run-make/coverage/async2.rs
index 959d48ce9..959d48ce9 100644
--- a/src/test/run-make/coverage/async2.rs
+++ b/tests/run-make/coverage/async2.rs
diff --git a/src/test/run-make/coverage/closure.rs b/tests/run-make/coverage/closure.rs
index 32ec0bcdf..32ec0bcdf 100644
--- a/src/test/run-make/coverage/closure.rs
+++ b/tests/run-make/coverage/closure.rs
diff --git a/src/test/run-make/coverage/closure_macro.rs b/tests/run-make/coverage/closure_macro.rs
index 5e3b00d1e..5e3b00d1e 100644
--- a/src/test/run-make/coverage/closure_macro.rs
+++ b/tests/run-make/coverage/closure_macro.rs
diff --git a/src/test/run-make/coverage/closure_macro_async.rs b/tests/run-make/coverage/closure_macro_async.rs
index e3e89e9c8..e3e89e9c8 100644
--- a/src/test/run-make/coverage/closure_macro_async.rs
+++ b/tests/run-make/coverage/closure_macro_async.rs
diff --git a/tests/run-make/coverage/compiletest-ignore-dir b/tests/run-make/coverage/compiletest-ignore-dir
new file mode 100644
index 000000000..470ff9960
--- /dev/null
+++ b/tests/run-make/coverage/compiletest-ignore-dir
@@ -0,0 +1,3 @@
+# Directory "coverage" supports the tests at prefix ../coverage-*
+
+# Use ./x.py [options] test tests/run-make/coverage to run all related tests.
diff --git a/src/test/run-make/coverage/conditions.rs b/tests/run-make/coverage/conditions.rs
index 057599d1b..057599d1b 100644
--- a/src/test/run-make/coverage/conditions.rs
+++ b/tests/run-make/coverage/conditions.rs
diff --git a/src/test/run-make/coverage/continue.rs b/tests/run-make/coverage/continue.rs
index 624aa9834..624aa9834 100644
--- a/src/test/run-make/coverage/continue.rs
+++ b/tests/run-make/coverage/continue.rs
diff --git a/src/test/run-make/coverage/coverage_tools.mk b/tests/run-make/coverage/coverage_tools.mk
index 0b6bbc331..0b6bbc331 100644
--- a/src/test/run-make/coverage/coverage_tools.mk
+++ b/tests/run-make/coverage/coverage_tools.mk
diff --git a/src/test/run-make/coverage/dead_code.rs b/tests/run-make/coverage/dead_code.rs
index a1285df0e..a1285df0e 100644
--- a/src/test/run-make/coverage/dead_code.rs
+++ b/tests/run-make/coverage/dead_code.rs
diff --git a/src/test/run-make/coverage/doctest.rs b/tests/run-make/coverage/doctest.rs
index ec04ea570..ec04ea570 100644
--- a/src/test/run-make/coverage/doctest.rs
+++ b/tests/run-make/coverage/doctest.rs
diff --git a/src/test/run-make/coverage/drop_trait.rs b/tests/run-make/coverage/drop_trait.rs
index d15bfc0f8..d15bfc0f8 100644
--- a/src/test/run-make/coverage/drop_trait.rs
+++ b/tests/run-make/coverage/drop_trait.rs
diff --git a/src/test/run-make/coverage/generator.rs b/tests/run-make/coverage/generator.rs
index 431999102..431999102 100644
--- a/src/test/run-make/coverage/generator.rs
+++ b/tests/run-make/coverage/generator.rs
diff --git a/src/test/run-make/coverage/generics.rs b/tests/run-make/coverage/generics.rs
index 18b388684..18b388684 100644
--- a/src/test/run-make/coverage/generics.rs
+++ b/tests/run-make/coverage/generics.rs
diff --git a/src/test/run-make/coverage/if.rs b/tests/run-make/coverage/if.rs
index 8ad5042ff..8ad5042ff 100644
--- a/src/test/run-make/coverage/if.rs
+++ b/tests/run-make/coverage/if.rs
diff --git a/src/test/run-make/coverage/if_else.rs b/tests/run-make/coverage/if_else.rs
index 3244e1e3a..3244e1e3a 100644
--- a/src/test/run-make/coverage/if_else.rs
+++ b/tests/run-make/coverage/if_else.rs
diff --git a/src/test/run-make/coverage/inline-dead.rs b/tests/run-make/coverage/inline-dead.rs
index 854fa0629..854fa0629 100644
--- a/src/test/run-make/coverage/inline-dead.rs
+++ b/tests/run-make/coverage/inline-dead.rs
diff --git a/src/test/run-make/coverage/inline.rs b/tests/run-make/coverage/inline.rs
index 9cfab9ddb..9cfab9ddb 100644
--- a/src/test/run-make/coverage/inline.rs
+++ b/tests/run-make/coverage/inline.rs
diff --git a/src/test/run-make/coverage/inner_items.rs b/tests/run-make/coverage/inner_items.rs
index bcb62b303..bcb62b303 100644
--- a/src/test/run-make/coverage/inner_items.rs
+++ b/tests/run-make/coverage/inner_items.rs
diff --git a/src/test/run-make/coverage/issue-83601.rs b/tests/run-make/coverage/issue-83601.rs
index 0b72a8194..0b72a8194 100644
--- a/src/test/run-make/coverage/issue-83601.rs
+++ b/tests/run-make/coverage/issue-83601.rs
diff --git a/src/test/run-make/coverage/issue-84561.rs b/tests/run-make/coverage/issue-84561.rs
index b39a289c4..b39a289c4 100644
--- a/src/test/run-make/coverage/issue-84561.rs
+++ b/tests/run-make/coverage/issue-84561.rs
diff --git a/src/test/run-make/coverage/issue-85461.rs b/tests/run-make/coverage/issue-85461.rs
index a1b9ebb1e..a1b9ebb1e 100644
--- a/src/test/run-make/coverage/issue-85461.rs
+++ b/tests/run-make/coverage/issue-85461.rs
diff --git a/src/test/run-make/coverage/issue-93054.rs b/tests/run-make/coverage/issue-93054.rs
index c160b3db0..c160b3db0 100644
--- a/src/test/run-make/coverage/issue-93054.rs
+++ b/tests/run-make/coverage/issue-93054.rs
diff --git a/src/test/run-make/coverage/lazy_boolean.rs b/tests/run-make/coverage/lazy_boolean.rs
index bb6219e85..bb6219e85 100644
--- a/src/test/run-make/coverage/lazy_boolean.rs
+++ b/tests/run-make/coverage/lazy_boolean.rs
diff --git a/src/test/run-make/coverage/lib/doctest_crate.rs b/tests/run-make/coverage/lib/doctest_crate.rs
index c3210146d..c3210146d 100644
--- a/src/test/run-make/coverage/lib/doctest_crate.rs
+++ b/tests/run-make/coverage/lib/doctest_crate.rs
diff --git a/src/test/run-make/coverage/lib/inline_always_with_dead_code.rs b/tests/run-make/coverage/lib/inline_always_with_dead_code.rs
index 2b21dee6c..2b21dee6c 100644
--- a/src/test/run-make/coverage/lib/inline_always_with_dead_code.rs
+++ b/tests/run-make/coverage/lib/inline_always_with_dead_code.rs
diff --git a/src/test/run-make/coverage/lib/unused_mod_helper.rs b/tests/run-make/coverage/lib/unused_mod_helper.rs
index ae1cc1531..ae1cc1531 100644
--- a/src/test/run-make/coverage/lib/unused_mod_helper.rs
+++ b/tests/run-make/coverage/lib/unused_mod_helper.rs
diff --git a/src/test/run-make/coverage/lib/used_crate.rs b/tests/run-make/coverage/lib/used_crate.rs
index 8b8b1f7f3..8b8b1f7f3 100644
--- a/src/test/run-make/coverage/lib/used_crate.rs
+++ b/tests/run-make/coverage/lib/used_crate.rs
diff --git a/src/test/run-make/coverage/lib/used_inline_crate.rs b/tests/run-make/coverage/lib/used_inline_crate.rs
index 4a052756d..4a052756d 100644
--- a/src/test/run-make/coverage/lib/used_inline_crate.rs
+++ b/tests/run-make/coverage/lib/used_inline_crate.rs
diff --git a/src/test/run-make/coverage/loop_break_value.rs b/tests/run-make/coverage/loop_break_value.rs
index dbc4fad7a..dbc4fad7a 100644
--- a/src/test/run-make/coverage/loop_break_value.rs
+++ b/tests/run-make/coverage/loop_break_value.rs
diff --git a/src/test/run-make/coverage/loops_branches.rs b/tests/run-make/coverage/loops_branches.rs
index 7116ce47f..7116ce47f 100644
--- a/src/test/run-make/coverage/loops_branches.rs
+++ b/tests/run-make/coverage/loops_branches.rs
diff --git a/src/test/run-make/coverage/match_or_pattern.rs b/tests/run-make/coverage/match_or_pattern.rs
index 4c6a8a9b7..4c6a8a9b7 100644
--- a/src/test/run-make/coverage/match_or_pattern.rs
+++ b/tests/run-make/coverage/match_or_pattern.rs
diff --git a/src/test/run-make/coverage/nested_loops.rs b/tests/run-make/coverage/nested_loops.rs
index 4c7c78427..4c7c78427 100644
--- a/src/test/run-make/coverage/nested_loops.rs
+++ b/tests/run-make/coverage/nested_loops.rs
diff --git a/src/test/run-make/coverage/no_cov_crate.rs b/tests/run-make/coverage/no_cov_crate.rs
index 0bfbdda2c..0bfbdda2c 100644
--- a/src/test/run-make/coverage/no_cov_crate.rs
+++ b/tests/run-make/coverage/no_cov_crate.rs
diff --git a/src/test/run-make/coverage/overflow.rs b/tests/run-make/coverage/overflow.rs
index e537b0e95..e537b0e95 100644
--- a/src/test/run-make/coverage/overflow.rs
+++ b/tests/run-make/coverage/overflow.rs
diff --git a/src/test/run-make/coverage/panic_unwind.rs b/tests/run-make/coverage/panic_unwind.rs
index 03128c2cc..03128c2cc 100644
--- a/src/test/run-make/coverage/panic_unwind.rs
+++ b/tests/run-make/coverage/panic_unwind.rs
diff --git a/src/test/run-make/coverage/partial_eq.rs b/tests/run-make/coverage/partial_eq.rs
index 4ceaba9b1..4ceaba9b1 100644
--- a/src/test/run-make/coverage/partial_eq.rs
+++ b/tests/run-make/coverage/partial_eq.rs
diff --git a/src/test/run-make/coverage/simple_loop.rs b/tests/run-make/coverage/simple_loop.rs
index 6f7f23475..6f7f23475 100644
--- a/src/test/run-make/coverage/simple_loop.rs
+++ b/tests/run-make/coverage/simple_loop.rs
diff --git a/src/test/run-make/coverage/simple_match.rs b/tests/run-make/coverage/simple_match.rs
index be99e59a8..be99e59a8 100644
--- a/src/test/run-make/coverage/simple_match.rs
+++ b/tests/run-make/coverage/simple_match.rs
diff --git a/src/test/run-make/coverage/tight_inf_loop.rs b/tests/run-make/coverage/tight_inf_loop.rs
index cef99027a..cef99027a 100644
--- a/src/test/run-make/coverage/tight_inf_loop.rs
+++ b/tests/run-make/coverage/tight_inf_loop.rs
diff --git a/src/test/run-make/coverage/try_error_result.rs b/tests/run-make/coverage/try_error_result.rs
index cd0acf723..cd0acf723 100644
--- a/src/test/run-make/coverage/try_error_result.rs
+++ b/tests/run-make/coverage/try_error_result.rs
diff --git a/src/test/run-make/coverage/unused.rs b/tests/run-make/coverage/unused.rs
index fb6113eb0..fb6113eb0 100644
--- a/src/test/run-make/coverage/unused.rs
+++ b/tests/run-make/coverage/unused.rs
diff --git a/src/test/run-make/coverage/unused_mod.rs b/tests/run-make/coverage/unused_mod.rs
index 679b4e531..679b4e531 100644
--- a/src/test/run-make/coverage/unused_mod.rs
+++ b/tests/run-make/coverage/unused_mod.rs
diff --git a/src/test/run-make/coverage/uses_crate.rs b/tests/run-make/coverage/uses_crate.rs
index 20cb05fe5..20cb05fe5 100644
--- a/src/test/run-make/coverage/uses_crate.rs
+++ b/tests/run-make/coverage/uses_crate.rs
diff --git a/src/test/run-make/coverage/uses_inline_crate.rs b/tests/run-make/coverage/uses_inline_crate.rs
index a7fe8532b..a7fe8532b 100644
--- a/src/test/run-make/coverage/uses_inline_crate.rs
+++ b/tests/run-make/coverage/uses_inline_crate.rs
diff --git a/src/test/run-make/coverage/while.rs b/tests/run-make/coverage/while.rs
index 781b90b35..781b90b35 100644
--- a/src/test/run-make/coverage/while.rs
+++ b/tests/run-make/coverage/while.rs
diff --git a/src/test/run-make/coverage/while_early_ret.rs b/tests/run-make/coverage/while_early_ret.rs
index 1fcea9c85..1fcea9c85 100644
--- a/src/test/run-make/coverage/while_early_ret.rs
+++ b/tests/run-make/coverage/while_early_ret.rs
diff --git a/src/test/run-make/coverage/yield.rs b/tests/run-make/coverage/yield.rs
index ff7616656..ff7616656 100644
--- a/src/test/run-make/coverage/yield.rs
+++ b/tests/run-make/coverage/yield.rs
diff --git a/src/test/run-make/dep-graph/Makefile b/tests/run-make/dep-graph/Makefile
index ae97b1672..ae97b1672 100644
--- a/src/test/run-make/dep-graph/Makefile
+++ b/tests/run-make/dep-graph/Makefile
diff --git a/src/test/run-make/dep-graph/foo.rs b/tests/run-make/dep-graph/foo.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make/dep-graph/foo.rs
+++ b/tests/run-make/dep-graph/foo.rs
diff --git a/tests/run-make/dump-mono-stats/Makefile b/tests/run-make/dump-mono-stats/Makefile
new file mode 100644
index 000000000..fe1112fb0
--- /dev/null
+++ b/tests/run-make/dump-mono-stats/Makefile
@@ -0,0 +1,5 @@
+include ../../run-make-fulldeps/tools.mk
+
+all:
+	$(RUSTC) --crate-type lib foo.rs -Z dump-mono-stats=$(TMPDIR) -Zdump-mono-stats-format=json
+	cat $(TMPDIR)/foo.mono_items.json | $(CGREP) '"name":"bar"'
diff --git a/src/test/rustdoc/auxiliary/no_html_root.rs b/tests/run-make/dump-mono-stats/foo.rs
index c5c0bc606..c5c0bc606 100644
--- a/src/test/rustdoc/auxiliary/no_html_root.rs
+++ b/tests/run-make/dump-mono-stats/foo.rs
diff --git a/src/test/run-make/emit-named-files/Makefile b/tests/run-make/emit-named-files/Makefile
index e081fa479..e081fa479 100644
--- a/src/test/run-make/emit-named-files/Makefile
+++ b/tests/run-make/emit-named-files/Makefile
diff --git a/src/test/run-make/emit-named-files/foo.rs b/tests/run-make/emit-named-files/foo.rs
index c1bfaa6ca..c1bfaa6ca 100644
--- a/src/test/run-make/emit-named-files/foo.rs
+++ b/tests/run-make/emit-named-files/foo.rs
diff --git a/src/test/run-make/emit-path-unhashed/Makefile b/tests/run-make/emit-path-unhashed/Makefile
index c144d4aa9..c144d4aa9 100644
--- a/src/test/run-make/emit-path-unhashed/Makefile
+++ b/tests/run-make/emit-path-unhashed/Makefile
diff --git a/src/test/run-make/emit-path-unhashed/foo.rs b/tests/run-make/emit-path-unhashed/foo.rs
index c1bfaa6ca..c1bfaa6ca 100644
--- a/src/test/run-make/emit-path-unhashed/foo.rs
+++ b/tests/run-make/emit-path-unhashed/foo.rs
diff --git a/src/test/run-make/emit-shared-files/Makefile b/tests/run-make/emit-shared-files/Makefile
index cad0c9e5b..cad0c9e5b 100644
--- a/src/test/run-make/emit-shared-files/Makefile
+++ b/tests/run-make/emit-shared-files/Makefile
diff --git a/src/test/run-make/emit-shared-files/x.rs b/tests/run-make/emit-shared-files/x.rs
index 5df757613..5df757613 100644
--- a/src/test/run-make/emit-shared-files/x.rs
+++ b/tests/run-make/emit-shared-files/x.rs
diff --git a/src/test/run-make/emit-shared-files/y.css b/tests/run-make/emit-shared-files/y.css
index e69de29bb..e69de29bb 100644
--- a/src/test/run-make/emit-shared-files/y.css
+++ b/tests/run-make/emit-shared-files/y.css
diff --git a/src/test/run-make/emit-shared-files/z.css b/tests/run-make/emit-shared-files/z.css
index e69de29bb..e69de29bb 100644
--- a/src/test/run-make/emit-shared-files/z.css
+++ b/tests/run-make/emit-shared-files/z.css
diff --git a/src/test/run-make/env-dep-info/Makefile b/tests/run-make/env-dep-info/Makefile
index 1675a61b1..1675a61b1 100644
--- a/src/test/run-make/env-dep-info/Makefile
+++ b/tests/run-make/env-dep-info/Makefile
diff --git a/src/test/run-make/env-dep-info/macro_def.rs b/tests/run-make/env-dep-info/macro_def.rs
index e328eae48..e328eae48 100644
--- a/src/test/run-make/env-dep-info/macro_def.rs
+++ b/tests/run-make/env-dep-info/macro_def.rs
diff --git a/src/test/run-make/env-dep-info/macro_use.rs b/tests/run-make/env-dep-info/macro_use.rs
index 2f5267471..2f5267471 100644
--- a/src/test/run-make/env-dep-info/macro_use.rs
+++ b/tests/run-make/env-dep-info/macro_use.rs
diff --git a/src/test/run-make/env-dep-info/main.rs b/tests/run-make/env-dep-info/main.rs
index a25246bac..a25246bac 100644
--- a/src/test/run-make/env-dep-info/main.rs
+++ b/tests/run-make/env-dep-info/main.rs
diff --git a/src/test/run-make/export-executable-symbols/Makefile b/tests/run-make/export-executable-symbols/Makefile
index daa77c99d..daa77c99d 100644
--- a/src/test/run-make/export-executable-symbols/Makefile
+++ b/tests/run-make/export-executable-symbols/Makefile
diff --git a/src/test/run-make/export-executable-symbols/main.rs b/tests/run-make/export-executable-symbols/main.rs
index c498381a3..c498381a3 100644
--- a/src/test/run-make/export-executable-symbols/main.rs
+++ b/tests/run-make/export-executable-symbols/main.rs
diff --git a/src/test/run-make/fmt-write-bloat/Makefile b/tests/run-make/fmt-write-bloat/Makefile
index 07e6e025e..07e6e025e 100644
--- a/src/test/run-make/fmt-write-bloat/Makefile
+++ b/tests/run-make/fmt-write-bloat/Makefile
diff --git a/src/test/run-make/fmt-write-bloat/main.rs b/tests/run-make/fmt-write-bloat/main.rs
index e86c48014..e86c48014 100644
--- a/src/test/run-make/fmt-write-bloat/main.rs
+++ b/tests/run-make/fmt-write-bloat/main.rs
diff --git a/src/test/run-make/git_clone_sha1.sh b/tests/run-make/git_clone_sha1.sh
index 626e4e427..626e4e427 100644
--- a/src/test/run-make/git_clone_sha1.sh
+++ b/tests/run-make/git_clone_sha1.sh
diff --git a/src/test/run-make/incr-foreign-head-span/Makefile b/tests/run-make/incr-foreign-head-span/Makefile
index 712965eaa..712965eaa 100644
--- a/src/test/run-make/incr-foreign-head-span/Makefile
+++ b/tests/run-make/incr-foreign-head-span/Makefile
diff --git a/src/test/run-make/incr-foreign-head-span/first_crate.rs b/tests/run-make/incr-foreign-head-span/first_crate.rs
index 69dd103bf..69dd103bf 100644
--- a/src/test/run-make/incr-foreign-head-span/first_crate.rs
+++ b/tests/run-make/incr-foreign-head-span/first_crate.rs
diff --git a/src/test/run-make/incr-foreign-head-span/second_crate.rs b/tests/run-make/incr-foreign-head-span/second_crate.rs
index 102f6b26c..102f6b26c 100644
--- a/src/test/run-make/incr-foreign-head-span/second_crate.rs
+++ b/tests/run-make/incr-foreign-head-span/second_crate.rs
diff --git a/src/test/run-make/incr-prev-body-beyond-eof/Makefile b/tests/run-make/incr-prev-body-beyond-eof/Makefile
index 24eea3aca..24eea3aca 100644
--- a/src/test/run-make/incr-prev-body-beyond-eof/Makefile
+++ b/tests/run-make/incr-prev-body-beyond-eof/Makefile
diff --git a/src/test/run-make/incr-prev-body-beyond-eof/a.rs b/tests/run-make/incr-prev-body-beyond-eof/a.rs
index ca70fb563..ca70fb563 100644
--- a/src/test/run-make/incr-prev-body-beyond-eof/a.rs
+++ b/tests/run-make/incr-prev-body-beyond-eof/a.rs
diff --git a/src/test/run-make/incr-prev-body-beyond-eof/b.rs b/tests/run-make/incr-prev-body-beyond-eof/b.rs
index a272e44a6..a272e44a6 100644
--- a/src/test/run-make/incr-prev-body-beyond-eof/b.rs
+++ b/tests/run-make/incr-prev-body-beyond-eof/b.rs
diff --git a/src/test/run-make/incremental-session-fail/Makefile b/tests/run-make/incremental-session-fail/Makefile
index 0461bb926..0461bb926 100644
--- a/src/test/run-make/incremental-session-fail/Makefile
+++ b/tests/run-make/incremental-session-fail/Makefile
diff --git a/src/test/run-make/incremental-session-fail/foo.rs b/tests/run-make/incremental-session-fail/foo.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/run-make/incremental-session-fail/foo.rs
+++ b/tests/run-make/incremental-session-fail/foo.rs
diff --git a/src/test/run-make/invalid-so/Makefile b/tests/run-make/invalid-so/Makefile
index 5b82ecd20..5b82ecd20 100644
--- a/src/test/run-make/invalid-so/Makefile
+++ b/tests/run-make/invalid-so/Makefile
diff --git a/src/test/run-make/invalid-so/bar.rs b/tests/run-make/invalid-so/bar.rs
index 49af74e1b..49af74e1b 100644
--- a/src/test/run-make/invalid-so/bar.rs
+++ b/tests/run-make/invalid-so/bar.rs
diff --git a/src/test/run-make/issue-10971-temps-dir/Makefile b/tests/run-make/issue-10971-temps-dir/Makefile
index e589bbffe..e589bbffe 100644
--- a/src/test/run-make/issue-10971-temps-dir/Makefile
+++ b/tests/run-make/issue-10971-temps-dir/Makefile
diff --git a/src/test/run-make/issue-36710/Makefile b/tests/run-make/issue-36710/Makefile
index d6145c071..d6145c071 100644
--- a/src/test/run-make/issue-36710/Makefile
+++ b/tests/run-make/issue-36710/Makefile
diff --git a/src/test/run-make/issue-36710/foo.cpp b/tests/run-make/issue-36710/foo.cpp
index 8f878c2c2..8f878c2c2 100644
--- a/src/test/run-make/issue-36710/foo.cpp
+++ b/tests/run-make/issue-36710/foo.cpp
diff --git a/src/test/run-make/issue-36710/foo.rs b/tests/run-make/issue-36710/foo.rs
index f30a35e27..f30a35e27 100644
--- a/src/test/run-make/issue-36710/foo.rs
+++ b/tests/run-make/issue-36710/foo.rs
diff --git a/src/test/run-make/issue-47384/Makefile b/tests/run-make/issue-47384/Makefile
index 0aadf6c88..0aadf6c88 100644
--- a/src/test/run-make/issue-47384/Makefile
+++ b/tests/run-make/issue-47384/Makefile
diff --git a/src/test/run-make/issue-47384/lib.rs b/tests/run-make/issue-47384/lib.rs
index 99508bcda..99508bcda 100644
--- a/src/test/run-make/issue-47384/lib.rs
+++ b/tests/run-make/issue-47384/lib.rs
diff --git a/src/test/run-make/issue-47384/linker.ld b/tests/run-make/issue-47384/linker.ld
index 2e70acab3..2e70acab3 100644
--- a/src/test/run-make/issue-47384/linker.ld
+++ b/tests/run-make/issue-47384/linker.ld
diff --git a/src/test/run-make/issue-47384/main.rs b/tests/run-make/issue-47384/main.rs
index 025726325..025726325 100644
--- a/src/test/run-make/issue-47384/main.rs
+++ b/tests/run-make/issue-47384/main.rs
diff --git a/tests/run-make/issue-71519/Makefile b/tests/run-make/issue-71519/Makefile
new file mode 100644
index 000000000..57497f520
--- /dev/null
+++ b/tests/run-make/issue-71519/Makefile
@@ -0,0 +1,8 @@
+include ../../run-make-fulldeps/tools.mk
+
+# ignore-msvc
+# needs-rust-lld
+# ignore-s390x lld does not yet support s390x as target
+all:
+	RUSTC_LOG=rustc_codegen_ssa::back::link=info $(RUSTC) -Z gcc-ld=lld -C link-args=-Wl,-v main.rs 2> $(TMPDIR)/output.txt
+	$(CGREP) -e "^LLD [0-9]+\.[0-9]+\.[0-9]+" < $(TMPDIR)/output.txt
diff --git a/src/test/run-make/issue-71519/main.rs b/tests/run-make/issue-71519/main.rs
index f8d09e897..f8d09e897 100644
--- a/src/test/run-make/issue-71519/main.rs
+++ b/tests/run-make/issue-71519/main.rs
diff --git a/src/test/run-make/issue-83112-incr-test-moved-file/Makefile b/tests/run-make/issue-83112-incr-test-moved-file/Makefile
index 2f796e5b2..2f796e5b2 100644
--- a/src/test/run-make/issue-83112-incr-test-moved-file/Makefile
+++ b/tests/run-make/issue-83112-incr-test-moved-file/Makefile
diff --git a/src/test/run-make/issue-83112-incr-test-moved-file/main.rs b/tests/run-make/issue-83112-incr-test-moved-file/main.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make/issue-83112-incr-test-moved-file/main.rs
+++ b/tests/run-make/issue-83112-incr-test-moved-file/main.rs
diff --git a/src/test/run-make/issue-85019-moved-src-dir/Makefile b/tests/run-make/issue-85019-moved-src-dir/Makefile
index 3606d4fdf..3606d4fdf 100644
--- a/src/test/run-make/issue-85019-moved-src-dir/Makefile
+++ b/tests/run-make/issue-85019-moved-src-dir/Makefile
diff --git a/src/test/run-make/issue-85019-moved-src-dir/main.rs b/tests/run-make/issue-85019-moved-src-dir/main.rs
index 543559a5c..543559a5c 100644
--- a/src/test/run-make/issue-85019-moved-src-dir/main.rs
+++ b/tests/run-make/issue-85019-moved-src-dir/main.rs
diff --git a/src/test/run-make/issue-85019-moved-src-dir/my_lib.rs b/tests/run-make/issue-85019-moved-src-dir/my_lib.rs
index 432875739..432875739 100644
--- a/src/test/run-make/issue-85019-moved-src-dir/my_lib.rs
+++ b/tests/run-make/issue-85019-moved-src-dir/my_lib.rs
diff --git a/src/test/run-make/issue-85401-static-mir/Makefile b/tests/run-make/issue-85401-static-mir/Makefile
index 99590166b..99590166b 100644
--- a/src/test/run-make/issue-85401-static-mir/Makefile
+++ b/tests/run-make/issue-85401-static-mir/Makefile
diff --git a/src/test/run-make/issue-85401-static-mir/bar.rs b/tests/run-make/issue-85401-static-mir/bar.rs
index 15b12ecf3..15b12ecf3 100644
--- a/src/test/run-make/issue-85401-static-mir/bar.rs
+++ b/tests/run-make/issue-85401-static-mir/bar.rs
diff --git a/src/test/run-make/issue-85401-static-mir/baz.rs b/tests/run-make/issue-85401-static-mir/baz.rs
index 2ff4c51e5..2ff4c51e5 100644
--- a/src/test/run-make/issue-85401-static-mir/baz.rs
+++ b/tests/run-make/issue-85401-static-mir/baz.rs
diff --git a/src/test/run-make/issue-85401-static-mir/foo.rs b/tests/run-make/issue-85401-static-mir/foo.rs
index d064c4546..d064c4546 100644
--- a/src/test/run-make/issue-85401-static-mir/foo.rs
+++ b/tests/run-make/issue-85401-static-mir/foo.rs
diff --git a/src/test/run-make/issue-85441/Makefile b/tests/run-make/issue-85441/Makefile
index f04b07d51..f04b07d51 100644
--- a/src/test/run-make/issue-85441/Makefile
+++ b/tests/run-make/issue-85441/Makefile
diff --git a/src/test/run-make/issue-85441/empty.rs b/tests/run-make/issue-85441/empty.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make/issue-85441/empty.rs
+++ b/tests/run-make/issue-85441/empty.rs
diff --git a/src/test/run-make/issue-88756-default-output/Makefile b/tests/run-make/issue-88756-default-output/Makefile
index 275c35c26..275c35c26 100644
--- a/src/test/run-make/issue-88756-default-output/Makefile
+++ b/tests/run-make/issue-88756-default-output/Makefile
diff --git a/src/test/run-make/issue-88756-default-output/README.md b/tests/run-make/issue-88756-default-output/README.md
index 8cbfac4f7..8cbfac4f7 100644
--- a/src/test/run-make/issue-88756-default-output/README.md
+++ b/tests/run-make/issue-88756-default-output/README.md
diff --git a/src/test/run-make/issue-88756-default-output/output-default.stdout b/tests/run-make/issue-88756-default-output/output-default.stdout
index b28069823..b28069823 100644
--- a/src/test/run-make/issue-88756-default-output/output-default.stdout
+++ b/tests/run-make/issue-88756-default-output/output-default.stdout
diff --git a/src/test/run-make/issue-88756-default-output/x.rs b/tests/run-make/issue-88756-default-output/x.rs
index 5df757613..5df757613 100644
--- a/src/test/run-make/issue-88756-default-output/x.rs
+++ b/tests/run-make/issue-88756-default-output/x.rs
diff --git a/src/test/run-make/issue-96498/Makefile b/tests/run-make/issue-96498/Makefile
index ce2b1b1ff..ce2b1b1ff 100644
--- a/src/test/run-make/issue-96498/Makefile
+++ b/tests/run-make/issue-96498/Makefile
diff --git a/src/test/run-make/issue-96498/foo.rs b/tests/run-make/issue-96498/foo.rs
index 93ac3641b..93ac3641b 100644
--- a/src/test/run-make/issue-96498/foo.rs
+++ b/tests/run-make/issue-96498/foo.rs
diff --git a/src/test/run-make/libtest-thread-limit/Makefile b/tests/run-make/libtest-thread-limit/Makefile
index d43a89e60..d43a89e60 100644
--- a/src/test/run-make/libtest-thread-limit/Makefile
+++ b/tests/run-make/libtest-thread-limit/Makefile
diff --git a/src/test/run-make/libtest-thread-limit/test.rs b/tests/run-make/libtest-thread-limit/test.rs
index 26bc29216..26bc29216 100644
--- a/src/test/run-make/libtest-thread-limit/test.rs
+++ b/tests/run-make/libtest-thread-limit/test.rs
diff --git a/src/test/run-make/llvm-outputs/Makefile b/tests/run-make/llvm-outputs/Makefile
index a3f25eba0..a3f25eba0 100644
--- a/src/test/run-make/llvm-outputs/Makefile
+++ b/tests/run-make/llvm-outputs/Makefile
diff --git a/src/test/run-make/macos-deployment-target/Makefile b/tests/run-make/macos-deployment-target/Makefile
index 70fca0436..70fca0436 100644
--- a/src/test/run-make/macos-deployment-target/Makefile
+++ b/tests/run-make/macos-deployment-target/Makefile
diff --git a/src/test/run-make/macos-deployment-target/with_deployment_target.rs b/tests/run-make/macos-deployment-target/with_deployment_target.rs
index 342fe0ecb..342fe0ecb 100644
--- a/src/test/run-make/macos-deployment-target/with_deployment_target.rs
+++ b/tests/run-make/macos-deployment-target/with_deployment_target.rs
diff --git a/src/test/run-make/macos-fat-archive/Makefile b/tests/run-make/macos-fat-archive/Makefile
index cc99375db..cc99375db 100644
--- a/src/test/run-make/macos-fat-archive/Makefile
+++ b/tests/run-make/macos-fat-archive/Makefile
diff --git a/src/test/run-make/macos-fat-archive/lib.rs b/tests/run-make/macos-fat-archive/lib.rs
index 9943a266c..9943a266c 100644
--- a/src/test/run-make/macos-fat-archive/lib.rs
+++ b/tests/run-make/macos-fat-archive/lib.rs
diff --git a/src/test/run-make/macos-fat-archive/native-library.c b/tests/run-make/macos-fat-archive/native-library.c
index d300fdf1c..d300fdf1c 100644
--- a/src/test/run-make/macos-fat-archive/native-library.c
+++ b/tests/run-make/macos-fat-archive/native-library.c
diff --git a/src/test/run-make/native-link-modifier-bundle/Makefile b/tests/run-make/native-link-modifier-bundle/Makefile
index 7c78d7783..7c78d7783 100644
--- a/src/test/run-make/native-link-modifier-bundle/Makefile
+++ b/tests/run-make/native-link-modifier-bundle/Makefile
diff --git a/src/test/run-make/native-link-modifier-bundle/bundled.rs b/tests/run-make/native-link-modifier-bundle/bundled.rs
index 0bbae8752..0bbae8752 100644
--- a/src/test/run-make/native-link-modifier-bundle/bundled.rs
+++ b/tests/run-make/native-link-modifier-bundle/bundled.rs
diff --git a/src/test/run-make/native-link-modifier-bundle/cdylib-bundled.rs b/tests/run-make/native-link-modifier-bundle/cdylib-bundled.rs
index 729130916..729130916 100644
--- a/src/test/run-make/native-link-modifier-bundle/cdylib-bundled.rs
+++ b/tests/run-make/native-link-modifier-bundle/cdylib-bundled.rs
diff --git a/src/test/run-make/native-link-modifier-bundle/cdylib-non-bundled.rs b/tests/run-make/native-link-modifier-bundle/cdylib-non-bundled.rs
index 1df81fd10..1df81fd10 100644
--- a/src/test/run-make/native-link-modifier-bundle/cdylib-non-bundled.rs
+++ b/tests/run-make/native-link-modifier-bundle/cdylib-non-bundled.rs
diff --git a/src/test/run-make/native-link-modifier-bundle/native-staticlib.c b/tests/run-make/native-link-modifier-bundle/native-staticlib.c
index d300fdf1c..d300fdf1c 100644
--- a/src/test/run-make/native-link-modifier-bundle/native-staticlib.c
+++ b/tests/run-make/native-link-modifier-bundle/native-staticlib.c
diff --git a/src/test/run-make/native-link-modifier-bundle/non-bundled.rs b/tests/run-make/native-link-modifier-bundle/non-bundled.rs
index 8181e6387..8181e6387 100644
--- a/src/test/run-make/native-link-modifier-bundle/non-bundled.rs
+++ b/tests/run-make/native-link-modifier-bundle/non-bundled.rs
diff --git a/src/test/run-make/native-link-modifier-verbatim-linker/Makefile b/tests/run-make/native-link-modifier-verbatim-linker/Makefile
index 666e4084c..666e4084c 100644
--- a/src/test/run-make/native-link-modifier-verbatim-linker/Makefile
+++ b/tests/run-make/native-link-modifier-verbatim-linker/Makefile
diff --git a/src/test/run-make/native-link-modifier-verbatim-linker/local_native_dep.rs b/tests/run-make/native-link-modifier-verbatim-linker/local_native_dep.rs
index 59b6c92d2..59b6c92d2 100644
--- a/src/test/run-make/native-link-modifier-verbatim-linker/local_native_dep.rs
+++ b/tests/run-make/native-link-modifier-verbatim-linker/local_native_dep.rs
diff --git a/src/test/run-make/native-link-modifier-verbatim-linker/main.rs b/tests/run-make/native-link-modifier-verbatim-linker/main.rs
index 71b73a489..71b73a489 100644
--- a/src/test/run-make/native-link-modifier-verbatim-linker/main.rs
+++ b/tests/run-make/native-link-modifier-verbatim-linker/main.rs
diff --git a/src/test/run-make/native-link-modifier-verbatim-rustc/Makefile b/tests/run-make/native-link-modifier-verbatim-rustc/Makefile
index 6f01f3780..6f01f3780 100644
--- a/src/test/run-make/native-link-modifier-verbatim-rustc/Makefile
+++ b/tests/run-make/native-link-modifier-verbatim-rustc/Makefile
diff --git a/src/test/run-make/native-link-modifier-verbatim-rustc/rust_dep.rs b/tests/run-make/native-link-modifier-verbatim-rustc/rust_dep.rs
index e9517218e..e9517218e 100644
--- a/src/test/run-make/native-link-modifier-verbatim-rustc/rust_dep.rs
+++ b/tests/run-make/native-link-modifier-verbatim-rustc/rust_dep.rs
diff --git a/src/test/run-make/native-link-modifier-verbatim-rustc/upstream_native_dep.rs b/tests/run-make/native-link-modifier-verbatim-rustc/upstream_native_dep.rs
index 839686233..839686233 100644
--- a/src/test/run-make/native-link-modifier-verbatim-rustc/upstream_native_dep.rs
+++ b/tests/run-make/native-link-modifier-verbatim-rustc/upstream_native_dep.rs
diff --git a/src/test/run-make/native-link-modifier-whole-archive/Makefile b/tests/run-make/native-link-modifier-whole-archive/Makefile
index f26bd864c..f26bd864c 100644
--- a/src/test/run-make/native-link-modifier-whole-archive/Makefile
+++ b/tests/run-make/native-link-modifier-whole-archive/Makefile
diff --git a/src/test/run-make/native-link-modifier-whole-archive/c_static_lib_with_constructor.cpp b/tests/run-make/native-link-modifier-whole-archive/c_static_lib_with_constructor.cpp
index c687eb0f0..c687eb0f0 100644
--- a/src/test/run-make/native-link-modifier-whole-archive/c_static_lib_with_constructor.cpp
+++ b/tests/run-make/native-link-modifier-whole-archive/c_static_lib_with_constructor.cpp
diff --git a/src/test/run-make/native-link-modifier-whole-archive/directly_linked.rs b/tests/run-make/native-link-modifier-whole-archive/directly_linked.rs
index 17518e8b2..17518e8b2 100644
--- a/src/test/run-make/native-link-modifier-whole-archive/directly_linked.rs
+++ b/tests/run-make/native-link-modifier-whole-archive/directly_linked.rs
diff --git a/src/test/run-make/native-link-modifier-whole-archive/directly_linked_test_minus_whole_archive.rs b/tests/run-make/native-link-modifier-whole-archive/directly_linked_test_minus_whole_archive.rs
index 20ed8d9d4..20ed8d9d4 100644
--- a/src/test/run-make/native-link-modifier-whole-archive/directly_linked_test_minus_whole_archive.rs
+++ b/tests/run-make/native-link-modifier-whole-archive/directly_linked_test_minus_whole_archive.rs
diff --git a/src/test/run-make/native-link-modifier-whole-archive/directly_linked_test_plus_whole_archive.rs b/tests/run-make/native-link-modifier-whole-archive/directly_linked_test_plus_whole_archive.rs
index 20ed8d9d4..20ed8d9d4 100644
--- a/src/test/run-make/native-link-modifier-whole-archive/directly_linked_test_plus_whole_archive.rs
+++ b/tests/run-make/native-link-modifier-whole-archive/directly_linked_test_plus_whole_archive.rs
diff --git a/src/test/run-make/native-link-modifier-whole-archive/indirectly_linked.rs b/tests/run-make/native-link-modifier-whole-archive/indirectly_linked.rs
index c8b83fcfe..c8b83fcfe 100644
--- a/src/test/run-make/native-link-modifier-whole-archive/indirectly_linked.rs
+++ b/tests/run-make/native-link-modifier-whole-archive/indirectly_linked.rs
diff --git a/src/test/run-make/native-link-modifier-whole-archive/indirectly_linked_via_attr.rs b/tests/run-make/native-link-modifier-whole-archive/indirectly_linked_via_attr.rs
index b9e347609..b9e347609 100644
--- a/src/test/run-make/native-link-modifier-whole-archive/indirectly_linked_via_attr.rs
+++ b/tests/run-make/native-link-modifier-whole-archive/indirectly_linked_via_attr.rs
diff --git a/src/test/run-make/native-link-modifier-whole-archive/native_lib_in_src.rs b/tests/run-make/native-link-modifier-whole-archive/native_lib_in_src.rs
index 971f3be7a..971f3be7a 100644
--- a/src/test/run-make/native-link-modifier-whole-archive/native_lib_in_src.rs
+++ b/tests/run-make/native-link-modifier-whole-archive/native_lib_in_src.rs
diff --git a/src/test/run-make/native-link-modifier-whole-archive/rlib_with_cmdline_native_lib.rs b/tests/run-make/native-link-modifier-whole-archive/rlib_with_cmdline_native_lib.rs
index ef2b702dd..ef2b702dd 100644
--- a/src/test/run-make/native-link-modifier-whole-archive/rlib_with_cmdline_native_lib.rs
+++ b/tests/run-make/native-link-modifier-whole-archive/rlib_with_cmdline_native_lib.rs
diff --git a/src/test/run-make/pass-linker-flags-from-dep/Makefile b/tests/run-make/pass-linker-flags-from-dep/Makefile
index b9426326a..b9426326a 100644
--- a/src/test/run-make/pass-linker-flags-from-dep/Makefile
+++ b/tests/run-make/pass-linker-flags-from-dep/Makefile
diff --git a/src/test/run-make/pass-linker-flags-from-dep/main.rs b/tests/run-make/pass-linker-flags-from-dep/main.rs
index 40952fb22..40952fb22 100644
--- a/src/test/run-make/pass-linker-flags-from-dep/main.rs
+++ b/tests/run-make/pass-linker-flags-from-dep/main.rs
diff --git a/src/test/run-make/pass-linker-flags-from-dep/native_dep_1.rs b/tests/run-make/pass-linker-flags-from-dep/native_dep_1.rs
index fdb2d9ca6..fdb2d9ca6 100644
--- a/src/test/run-make/pass-linker-flags-from-dep/native_dep_1.rs
+++ b/tests/run-make/pass-linker-flags-from-dep/native_dep_1.rs
diff --git a/src/test/run-make/pass-linker-flags-from-dep/native_dep_2.rs b/tests/run-make/pass-linker-flags-from-dep/native_dep_2.rs
index f788b7711..f788b7711 100644
--- a/src/test/run-make/pass-linker-flags-from-dep/native_dep_2.rs
+++ b/tests/run-make/pass-linker-flags-from-dep/native_dep_2.rs
diff --git a/src/test/run-make/pass-linker-flags-from-dep/rust_dep.rs b/tests/run-make/pass-linker-flags-from-dep/rust_dep.rs
index 7f5df1139..7f5df1139 100644
--- a/src/test/run-make/pass-linker-flags-from-dep/rust_dep.rs
+++ b/tests/run-make/pass-linker-flags-from-dep/rust_dep.rs
diff --git a/src/test/run-make/pass-linker-flags/Makefile b/tests/run-make/pass-linker-flags/Makefile
index a3efb8df6..a3efb8df6 100644
--- a/src/test/run-make/pass-linker-flags/Makefile
+++ b/tests/run-make/pass-linker-flags/Makefile
diff --git a/src/test/run-make/pass-linker-flags/rs.rs b/tests/run-make/pass-linker-flags/rs.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make/pass-linker-flags/rs.rs
+++ b/tests/run-make/pass-linker-flags/rs.rs
diff --git a/src/test/run-make/raw-dylib-alt-calling-convention/Makefile b/tests/run-make/raw-dylib-alt-calling-convention/Makefile
index 03f8778d2..03f8778d2 100644
--- a/src/test/run-make/raw-dylib-alt-calling-convention/Makefile
+++ b/tests/run-make/raw-dylib-alt-calling-convention/Makefile
diff --git a/src/test/run-make/raw-dylib-alt-calling-convention/driver.rs b/tests/run-make/raw-dylib-alt-calling-convention/driver.rs
index b7f372c6b..b7f372c6b 100644
--- a/src/test/run-make/raw-dylib-alt-calling-convention/driver.rs
+++ b/tests/run-make/raw-dylib-alt-calling-convention/driver.rs
diff --git a/src/test/run-make/raw-dylib-alt-calling-convention/extern.c b/tests/run-make/raw-dylib-alt-calling-convention/extern.c
index 344d4a6bf..344d4a6bf 100644
--- a/src/test/run-make/raw-dylib-alt-calling-convention/extern.c
+++ b/tests/run-make/raw-dylib-alt-calling-convention/extern.c
diff --git a/src/test/run-make/raw-dylib-alt-calling-convention/lib.rs b/tests/run-make/raw-dylib-alt-calling-convention/lib.rs
index 22f222c12..22f222c12 100644
--- a/src/test/run-make/raw-dylib-alt-calling-convention/lib.rs
+++ b/tests/run-make/raw-dylib-alt-calling-convention/lib.rs
diff --git a/src/test/run-make/raw-dylib-alt-calling-convention/output.msvc.txt b/tests/run-make/raw-dylib-alt-calling-convention/output.msvc.txt
index a216835c4..a216835c4 100644
--- a/src/test/run-make/raw-dylib-alt-calling-convention/output.msvc.txt
+++ b/tests/run-make/raw-dylib-alt-calling-convention/output.msvc.txt
diff --git a/src/test/run-make/raw-dylib-alt-calling-convention/output.txt b/tests/run-make/raw-dylib-alt-calling-convention/output.txt
index 7622d3161..7622d3161 100644
--- a/src/test/run-make/raw-dylib-alt-calling-convention/output.txt
+++ b/tests/run-make/raw-dylib-alt-calling-convention/output.txt
diff --git a/src/test/run-make/raw-dylib-c/Makefile b/tests/run-make/raw-dylib-c/Makefile
index f47ab24f4..f47ab24f4 100644
--- a/src/test/run-make/raw-dylib-c/Makefile
+++ b/tests/run-make/raw-dylib-c/Makefile
diff --git a/src/test/run-make/raw-dylib-c/driver.rs b/tests/run-make/raw-dylib-c/driver.rs
index 4059ede11..4059ede11 100644
--- a/src/test/run-make/raw-dylib-c/driver.rs
+++ b/tests/run-make/raw-dylib-c/driver.rs
diff --git a/src/test/run-make/raw-dylib-c/extern_1.c b/tests/run-make/raw-dylib-c/extern_1.c
index 5d695547d..5d695547d 100644
--- a/src/test/run-make/raw-dylib-c/extern_1.c
+++ b/tests/run-make/raw-dylib-c/extern_1.c
diff --git a/src/test/run-make/raw-dylib-c/extern_2.c b/tests/run-make/raw-dylib-c/extern_2.c
index ae87fc3f8..ae87fc3f8 100644
--- a/src/test/run-make/raw-dylib-c/extern_2.c
+++ b/tests/run-make/raw-dylib-c/extern_2.c
diff --git a/src/test/run-make/raw-dylib-c/lib.rs b/tests/run-make/raw-dylib-c/lib.rs
index 5fb120403..5fb120403 100644
--- a/src/test/run-make/raw-dylib-c/lib.rs
+++ b/tests/run-make/raw-dylib-c/lib.rs
diff --git a/src/test/run-make/raw-dylib-c/output.txt b/tests/run-make/raw-dylib-c/output.txt
index cc970cef7..cc970cef7 100644
--- a/src/test/run-make/raw-dylib-c/output.txt
+++ b/tests/run-make/raw-dylib-c/output.txt
diff --git a/src/test/run-make/raw-dylib-import-name-type/Makefile b/tests/run-make/raw-dylib-import-name-type/Makefile
index fcc60e88e..fcc60e88e 100644
--- a/src/test/run-make/raw-dylib-import-name-type/Makefile
+++ b/tests/run-make/raw-dylib-import-name-type/Makefile
diff --git a/src/test/run-make/raw-dylib-import-name-type/driver.rs b/tests/run-make/raw-dylib-import-name-type/driver.rs
index 9a3cd9ebe..9a3cd9ebe 100644
--- a/src/test/run-make/raw-dylib-import-name-type/driver.rs
+++ b/tests/run-make/raw-dylib-import-name-type/driver.rs
diff --git a/src/test/run-make/raw-dylib-import-name-type/extern.c b/tests/run-make/raw-dylib-import-name-type/extern.c
index 23c1e489e..23c1e489e 100644
--- a/src/test/run-make/raw-dylib-import-name-type/extern.c
+++ b/tests/run-make/raw-dylib-import-name-type/extern.c
diff --git a/src/test/run-make/raw-dylib-import-name-type/extern.gnu.def b/tests/run-make/raw-dylib-import-name-type/extern.gnu.def
index 498e90e86..498e90e86 100644
--- a/src/test/run-make/raw-dylib-import-name-type/extern.gnu.def
+++ b/tests/run-make/raw-dylib-import-name-type/extern.gnu.def
diff --git a/src/test/run-make/raw-dylib-import-name-type/extern.msvc.def b/tests/run-make/raw-dylib-import-name-type/extern.msvc.def
index cddb88bb8..cddb88bb8 100644
--- a/src/test/run-make/raw-dylib-import-name-type/extern.msvc.def
+++ b/tests/run-make/raw-dylib-import-name-type/extern.msvc.def
diff --git a/src/test/run-make/raw-dylib-import-name-type/output.txt b/tests/run-make/raw-dylib-import-name-type/output.txt
index a2a2bfeec..a2a2bfeec 100644
--- a/src/test/run-make/raw-dylib-import-name-type/output.txt
+++ b/tests/run-make/raw-dylib-import-name-type/output.txt
diff --git a/src/test/run-make/raw-dylib-inline-cross-dylib/Makefile b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
index 9e603f958..9e603f958 100644
--- a/src/test/run-make/raw-dylib-inline-cross-dylib/Makefile
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
diff --git a/src/test/run-make/raw-dylib-inline-cross-dylib/driver.rs b/tests/run-make/raw-dylib-inline-cross-dylib/driver.rs
index f72ded7d9..f72ded7d9 100644
--- a/src/test/run-make/raw-dylib-inline-cross-dylib/driver.rs
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/driver.rs
diff --git a/src/test/run-make/raw-dylib-inline-cross-dylib/extern_1.c b/tests/run-make/raw-dylib-inline-cross-dylib/extern_1.c
index e5baaf5f0..e5baaf5f0 100644
--- a/src/test/run-make/raw-dylib-inline-cross-dylib/extern_1.c
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/extern_1.c
diff --git a/src/test/run-make/raw-dylib-inline-cross-dylib/extern_2.c b/tests/run-make/raw-dylib-inline-cross-dylib/extern_2.c
index 30aa46922..30aa46922 100644
--- a/src/test/run-make/raw-dylib-inline-cross-dylib/extern_2.c
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/extern_2.c
diff --git a/src/test/run-make/raw-dylib-inline-cross-dylib/lib.rs b/tests/run-make/raw-dylib-inline-cross-dylib/lib.rs
index 00c2c1c42..00c2c1c42 100644
--- a/src/test/run-make/raw-dylib-inline-cross-dylib/lib.rs
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/lib.rs
diff --git a/src/test/run-make/raw-dylib-inline-cross-dylib/lib_wrapper.rs b/tests/run-make/raw-dylib-inline-cross-dylib/lib_wrapper.rs
index 47191b8de..47191b8de 100644
--- a/src/test/run-make/raw-dylib-inline-cross-dylib/lib_wrapper.rs
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/lib_wrapper.rs
diff --git a/src/test/run-make/raw-dylib-inline-cross-dylib/output.txt b/tests/run-make/raw-dylib-inline-cross-dylib/output.txt
index e7009baa0..e7009baa0 100644
--- a/src/test/run-make/raw-dylib-inline-cross-dylib/output.txt
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/output.txt
diff --git a/src/test/run-make/raw-dylib-link-ordinal/Makefile b/tests/run-make/raw-dylib-link-ordinal/Makefile
index b55a94dbc..b55a94dbc 100644
--- a/src/test/run-make/raw-dylib-link-ordinal/Makefile
+++ b/tests/run-make/raw-dylib-link-ordinal/Makefile
diff --git a/src/test/run-make/raw-dylib-link-ordinal/driver.rs b/tests/run-make/raw-dylib-link-ordinal/driver.rs
index 4059ede11..4059ede11 100644
--- a/src/test/run-make/raw-dylib-link-ordinal/driver.rs
+++ b/tests/run-make/raw-dylib-link-ordinal/driver.rs
diff --git a/src/test/run-make/raw-dylib-link-ordinal/exporter.c b/tests/run-make/raw-dylib-link-ordinal/exporter.c
index aabf32ff1..aabf32ff1 100644
--- a/src/test/run-make/raw-dylib-link-ordinal/exporter.c
+++ b/tests/run-make/raw-dylib-link-ordinal/exporter.c
diff --git a/src/test/run-make/raw-dylib-link-ordinal/exporter.def b/tests/run-make/raw-dylib-link-ordinal/exporter.def
index 5d87c580a..5d87c580a 100644
--- a/src/test/run-make/raw-dylib-link-ordinal/exporter.def
+++ b/tests/run-make/raw-dylib-link-ordinal/exporter.def
diff --git a/src/test/run-make/raw-dylib-link-ordinal/lib.rs b/tests/run-make/raw-dylib-link-ordinal/lib.rs
index bb25ac64c..bb25ac64c 100644
--- a/src/test/run-make/raw-dylib-link-ordinal/lib.rs
+++ b/tests/run-make/raw-dylib-link-ordinal/lib.rs
diff --git a/src/test/run-make/raw-dylib-link-ordinal/output.txt b/tests/run-make/raw-dylib-link-ordinal/output.txt
index a4b2031d9..a4b2031d9 100644
--- a/src/test/run-make/raw-dylib-link-ordinal/output.txt
+++ b/tests/run-make/raw-dylib-link-ordinal/output.txt
diff --git a/src/test/run-make/raw-dylib-stdcall-ordinal/Makefile b/tests/run-make/raw-dylib-stdcall-ordinal/Makefile
index b9deb7729..b9deb7729 100644
--- a/src/test/run-make/raw-dylib-stdcall-ordinal/Makefile
+++ b/tests/run-make/raw-dylib-stdcall-ordinal/Makefile
diff --git a/src/test/run-make/raw-dylib-stdcall-ordinal/driver.rs b/tests/run-make/raw-dylib-stdcall-ordinal/driver.rs
index 4059ede11..4059ede11 100644
--- a/src/test/run-make/raw-dylib-stdcall-ordinal/driver.rs
+++ b/tests/run-make/raw-dylib-stdcall-ordinal/driver.rs
diff --git a/src/test/run-make/raw-dylib-stdcall-ordinal/expected_output.txt b/tests/run-make/raw-dylib-stdcall-ordinal/expected_output.txt
index 201577637..201577637 100644
--- a/src/test/run-make/raw-dylib-stdcall-ordinal/expected_output.txt
+++ b/tests/run-make/raw-dylib-stdcall-ordinal/expected_output.txt
diff --git a/src/test/run-make/raw-dylib-stdcall-ordinal/exporter-gnu.def b/tests/run-make/raw-dylib-stdcall-ordinal/exporter-gnu.def
index 8d28d714b..8d28d714b 100644
--- a/src/test/run-make/raw-dylib-stdcall-ordinal/exporter-gnu.def
+++ b/tests/run-make/raw-dylib-stdcall-ordinal/exporter-gnu.def
diff --git a/src/test/run-make/raw-dylib-stdcall-ordinal/exporter-msvc.def b/tests/run-make/raw-dylib-stdcall-ordinal/exporter-msvc.def
index 5a4c79a58..5a4c79a58 100644
--- a/src/test/run-make/raw-dylib-stdcall-ordinal/exporter-msvc.def
+++ b/tests/run-make/raw-dylib-stdcall-ordinal/exporter-msvc.def
diff --git a/src/test/run-make/raw-dylib-stdcall-ordinal/exporter.c b/tests/run-make/raw-dylib-stdcall-ordinal/exporter.c
index 1fb45bf01..1fb45bf01 100644
--- a/src/test/run-make/raw-dylib-stdcall-ordinal/exporter.c
+++ b/tests/run-make/raw-dylib-stdcall-ordinal/exporter.c
diff --git a/src/test/run-make/raw-dylib-stdcall-ordinal/lib.rs b/tests/run-make/raw-dylib-stdcall-ordinal/lib.rs
index b7921396a..b7921396a 100644
--- a/src/test/run-make/raw-dylib-stdcall-ordinal/lib.rs
+++ b/tests/run-make/raw-dylib-stdcall-ordinal/lib.rs
diff --git a/src/test/run-make/remap-path-prefix-dwarf/Makefile b/tests/run-make/remap-path-prefix-dwarf/Makefile
index fbaea7b68..fbaea7b68 100644
--- a/src/test/run-make/remap-path-prefix-dwarf/Makefile
+++ b/tests/run-make/remap-path-prefix-dwarf/Makefile
diff --git a/src/test/run-make/remap-path-prefix-dwarf/src/quux.rs b/tests/run-make/remap-path-prefix-dwarf/src/quux.rs
index 38d5ef619..38d5ef619 100644
--- a/src/test/run-make/remap-path-prefix-dwarf/src/quux.rs
+++ b/tests/run-make/remap-path-prefix-dwarf/src/quux.rs
diff --git a/tests/run-make/repr128-dwarf/Makefile b/tests/run-make/repr128-dwarf/Makefile
new file mode 100644
index 000000000..2b03c22c0
--- /dev/null
+++ b/tests/run-make/repr128-dwarf/Makefile
@@ -0,0 +1,16 @@
+# ignore-windows
+# This test should be replaced with one in tests/debuginfo once GDB or LLDB support 128-bit
+# enums.
+
+include ../../run-make-fulldeps/tools.mk
+
+all:
+	$(RUSTC) -Cdebuginfo=2 lib.rs -o $(TMPDIR)/repr128.rlib
+	"$(LLVM_BIN_DIR)"/llvm-dwarfdump -n U128A $(TMPDIR)/repr128.rlib | $(CGREP) "DW_AT_const_value	(<0x10> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 )"
+	"$(LLVM_BIN_DIR)"/llvm-dwarfdump -n U128B $(TMPDIR)/repr128.rlib | $(CGREP) "DW_AT_const_value	(<0x10> 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 )"
+	"$(LLVM_BIN_DIR)"/llvm-dwarfdump -n U128C $(TMPDIR)/repr128.rlib | $(CGREP) "DW_AT_const_value	(<0x10> 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 )"
+	"$(LLVM_BIN_DIR)"/llvm-dwarfdump -n U128D $(TMPDIR)/repr128.rlib | $(CGREP) "DW_AT_const_value	(<0x10> ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff )"
+	"$(LLVM_BIN_DIR)"/llvm-dwarfdump -n I128A $(TMPDIR)/repr128.rlib | $(CGREP) "DW_AT_const_value	(<0x10> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 )"
+	"$(LLVM_BIN_DIR)"/llvm-dwarfdump -n I128B $(TMPDIR)/repr128.rlib | $(CGREP) "DW_AT_const_value	(<0x10> ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff )"
+	"$(LLVM_BIN_DIR)"/llvm-dwarfdump -n I128C $(TMPDIR)/repr128.rlib | $(CGREP) "DW_AT_const_value	(<0x10> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 80 )"
+	"$(LLVM_BIN_DIR)"/llvm-dwarfdump -n I128D $(TMPDIR)/repr128.rlib | $(CGREP) "DW_AT_const_value	(<0x10> ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff 7f )"
diff --git a/src/test/run-make/repr128-dwarf/lib.rs b/tests/run-make/repr128-dwarf/lib.rs
index 63675441d..63675441d 100644
--- a/src/test/run-make/repr128-dwarf/lib.rs
+++ b/tests/run-make/repr128-dwarf/lib.rs
diff --git a/src/test/run-make/rlib-format-packed-bundled-libs-2/Makefile b/tests/run-make/rlib-format-packed-bundled-libs-2/Makefile
index 4574cf17f..4574cf17f 100644
--- a/src/test/run-make/rlib-format-packed-bundled-libs-2/Makefile
+++ b/tests/run-make/rlib-format-packed-bundled-libs-2/Makefile
diff --git a/src/test/run-make/rlib-format-packed-bundled-libs-2/main.rs b/tests/run-make/rlib-format-packed-bundled-libs-2/main.rs
index 8d2b8a285..8d2b8a285 100644
--- a/src/test/run-make/rlib-format-packed-bundled-libs-2/main.rs
+++ b/tests/run-make/rlib-format-packed-bundled-libs-2/main.rs
diff --git a/src/test/run-make/rlib-format-packed-bundled-libs-2/native_dep.rs b/tests/run-make/rlib-format-packed-bundled-libs-2/native_dep.rs
index 321a8237e..321a8237e 100644
--- a/src/test/run-make/rlib-format-packed-bundled-libs-2/native_dep.rs
+++ b/tests/run-make/rlib-format-packed-bundled-libs-2/native_dep.rs
diff --git a/src/test/run-make/rlib-format-packed-bundled-libs-2/rust_dep.rs b/tests/run-make/rlib-format-packed-bundled-libs-2/rust_dep.rs
index 77e41e237..77e41e237 100644
--- a/src/test/run-make/rlib-format-packed-bundled-libs-2/rust_dep.rs
+++ b/tests/run-make/rlib-format-packed-bundled-libs-2/rust_dep.rs
diff --git a/src/test/run-make/rlib-format-packed-bundled-libs/Makefile b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
index 0b991ac42..0b991ac42 100644
--- a/src/test/run-make/rlib-format-packed-bundled-libs/Makefile
+++ b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
diff --git a/src/test/run-make/rlib-format-packed-bundled-libs/main.rs b/tests/run-make/rlib-format-packed-bundled-libs/main.rs
index 042a4879f..042a4879f 100644
--- a/src/test/run-make/rlib-format-packed-bundled-libs/main.rs
+++ b/tests/run-make/rlib-format-packed-bundled-libs/main.rs
diff --git a/src/test/run-make/rlib-format-packed-bundled-libs/native_dep_1.c b/tests/run-make/rlib-format-packed-bundled-libs/native_dep_1.c
index 07be8562c..07be8562c 100644
--- a/src/test/run-make/rlib-format-packed-bundled-libs/native_dep_1.c
+++ b/tests/run-make/rlib-format-packed-bundled-libs/native_dep_1.c
diff --git a/src/test/run-make/rlib-format-packed-bundled-libs/native_dep_2.c b/tests/run-make/rlib-format-packed-bundled-libs/native_dep_2.c
index a1b94e40d..a1b94e40d 100644
--- a/src/test/run-make/rlib-format-packed-bundled-libs/native_dep_2.c
+++ b/tests/run-make/rlib-format-packed-bundled-libs/native_dep_2.c
diff --git a/src/test/run-make/rlib-format-packed-bundled-libs/native_dep_3.c b/tests/run-make/rlib-format-packed-bundled-libs/native_dep_3.c
index f81f397a4..f81f397a4 100644
--- a/src/test/run-make/rlib-format-packed-bundled-libs/native_dep_3.c
+++ b/tests/run-make/rlib-format-packed-bundled-libs/native_dep_3.c
diff --git a/src/test/run-make/rlib-format-packed-bundled-libs/rust_dep_local.rs b/tests/run-make/rlib-format-packed-bundled-libs/rust_dep_local.rs
index 8280c7d6c..8280c7d6c 100644
--- a/src/test/run-make/rlib-format-packed-bundled-libs/rust_dep_local.rs
+++ b/tests/run-make/rlib-format-packed-bundled-libs/rust_dep_local.rs
diff --git a/src/test/run-make/rlib-format-packed-bundled-libs/rust_dep_up.rs b/tests/run-make/rlib-format-packed-bundled-libs/rust_dep_up.rs
index edcd7c521..edcd7c521 100644
--- a/src/test/run-make/rlib-format-packed-bundled-libs/rust_dep_up.rs
+++ b/tests/run-make/rlib-format-packed-bundled-libs/rust_dep_up.rs
diff --git a/src/test/run-make/rustc-macro-dep-files/Makefile b/tests/run-make/rustc-macro-dep-files/Makefile
index 6ae659db2..6ae659db2 100644
--- a/src/test/run-make/rustc-macro-dep-files/Makefile
+++ b/tests/run-make/rustc-macro-dep-files/Makefile
diff --git a/src/test/run-make/rustc-macro-dep-files/bar.rs b/tests/run-make/rustc-macro-dep-files/bar.rs
index 4a3b3364b..4a3b3364b 100644
--- a/src/test/run-make/rustc-macro-dep-files/bar.rs
+++ b/tests/run-make/rustc-macro-dep-files/bar.rs
diff --git a/src/test/run-make/rustc-macro-dep-files/foo.rs b/tests/run-make/rustc-macro-dep-files/foo.rs
index 66db1a217..66db1a217 100644
--- a/src/test/run-make/rustc-macro-dep-files/foo.rs
+++ b/tests/run-make/rustc-macro-dep-files/foo.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-invalid-expr/Makefile b/tests/run-make/rustdoc-scrape-examples-invalid-expr/Makefile
index 7786ff762..7786ff762 100644
--- a/src/test/run-make/rustdoc-scrape-examples-invalid-expr/Makefile
+++ b/tests/run-make/rustdoc-scrape-examples-invalid-expr/Makefile
diff --git a/src/test/run-make/rustdoc-scrape-examples-invalid-expr/examples/ex.rs b/tests/run-make/rustdoc-scrape-examples-invalid-expr/examples/ex.rs
index b342b5b0a..b342b5b0a 100644
--- a/src/test/run-make/rustdoc-scrape-examples-invalid-expr/examples/ex.rs
+++ b/tests/run-make/rustdoc-scrape-examples-invalid-expr/examples/ex.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-invalid-expr/src/lib.rs b/tests/run-make/rustdoc-scrape-examples-invalid-expr/src/lib.rs
index c30c99dec..c30c99dec 100644
--- a/src/test/run-make/rustdoc-scrape-examples-invalid-expr/src/lib.rs
+++ b/tests/run-make/rustdoc-scrape-examples-invalid-expr/src/lib.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-multiple/Makefile b/tests/run-make/rustdoc-scrape-examples-multiple/Makefile
index 453a7d4bc..453a7d4bc 100644
--- a/src/test/run-make/rustdoc-scrape-examples-multiple/Makefile
+++ b/tests/run-make/rustdoc-scrape-examples-multiple/Makefile
diff --git a/src/test/run-make/rustdoc-scrape-examples-multiple/examples/ex.rs b/tests/run-make/rustdoc-scrape-examples-multiple/examples/ex.rs
index 01b730c61..01b730c61 100644
--- a/src/test/run-make/rustdoc-scrape-examples-multiple/examples/ex.rs
+++ b/tests/run-make/rustdoc-scrape-examples-multiple/examples/ex.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-multiple/examples/ex2.rs b/tests/run-make/rustdoc-scrape-examples-multiple/examples/ex2.rs
index f83cf2f27..f83cf2f27 100644
--- a/src/test/run-make/rustdoc-scrape-examples-multiple/examples/ex2.rs
+++ b/tests/run-make/rustdoc-scrape-examples-multiple/examples/ex2.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-multiple/scrape.mk b/tests/run-make/rustdoc-scrape-examples-multiple/scrape.mk
index 7a28d2145..7a28d2145 100644
--- a/src/test/run-make/rustdoc-scrape-examples-multiple/scrape.mk
+++ b/tests/run-make/rustdoc-scrape-examples-multiple/scrape.mk
diff --git a/src/test/run-make/rustdoc-scrape-examples-multiple/src/lib.rs b/tests/run-make/rustdoc-scrape-examples-multiple/src/lib.rs
index bdfeda92d..bdfeda92d 100644
--- a/src/test/run-make/rustdoc-scrape-examples-multiple/src/lib.rs
+++ b/tests/run-make/rustdoc-scrape-examples-multiple/src/lib.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-ordering/Makefile b/tests/run-make/rustdoc-scrape-examples-ordering/Makefile
index bf45b8148..bf45b8148 100644
--- a/src/test/run-make/rustdoc-scrape-examples-ordering/Makefile
+++ b/tests/run-make/rustdoc-scrape-examples-ordering/Makefile
diff --git a/src/test/run-make/rustdoc-scrape-examples-ordering/examples/ex1.rs b/tests/run-make/rustdoc-scrape-examples-ordering/examples/ex1.rs
index 05c18007b..05c18007b 100644
--- a/src/test/run-make/rustdoc-scrape-examples-ordering/examples/ex1.rs
+++ b/tests/run-make/rustdoc-scrape-examples-ordering/examples/ex1.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-ordering/examples/ex2.rs b/tests/run-make/rustdoc-scrape-examples-ordering/examples/ex2.rs
index de21d9061..de21d9061 100644
--- a/src/test/run-make/rustdoc-scrape-examples-ordering/examples/ex2.rs
+++ b/tests/run-make/rustdoc-scrape-examples-ordering/examples/ex2.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-ordering/src/lib.rs b/tests/run-make/rustdoc-scrape-examples-ordering/src/lib.rs
index c53c987a7..c53c987a7 100644
--- a/src/test/run-make/rustdoc-scrape-examples-ordering/src/lib.rs
+++ b/tests/run-make/rustdoc-scrape-examples-ordering/src/lib.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-remap/Makefile b/tests/run-make/rustdoc-scrape-examples-remap/Makefile
index 7786ff762..7786ff762 100644
--- a/src/test/run-make/rustdoc-scrape-examples-remap/Makefile
+++ b/tests/run-make/rustdoc-scrape-examples-remap/Makefile
diff --git a/src/test/run-make/rustdoc-scrape-examples-remap/examples/ex.rs b/tests/run-make/rustdoc-scrape-examples-remap/examples/ex.rs
index 1438fdba7..1438fdba7 100644
--- a/src/test/run-make/rustdoc-scrape-examples-remap/examples/ex.rs
+++ b/tests/run-make/rustdoc-scrape-examples-remap/examples/ex.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-remap/src/a.rs b/tests/run-make/rustdoc-scrape-examples-remap/src/a.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/run-make/rustdoc-scrape-examples-remap/src/a.rs
+++ b/tests/run-make/rustdoc-scrape-examples-remap/src/a.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-remap/src/lib.rs b/tests/run-make/rustdoc-scrape-examples-remap/src/lib.rs
index f525a4270..f525a4270 100644
--- a/src/test/run-make/rustdoc-scrape-examples-remap/src/lib.rs
+++ b/tests/run-make/rustdoc-scrape-examples-remap/src/lib.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-test/Makefile b/tests/run-make/rustdoc-scrape-examples-test/Makefile
index 1235ead67..1235ead67 100644
--- a/src/test/run-make/rustdoc-scrape-examples-test/Makefile
+++ b/tests/run-make/rustdoc-scrape-examples-test/Makefile
diff --git a/src/test/run-make/rustdoc-scrape-examples-test/examples/ex.rs b/tests/run-make/rustdoc-scrape-examples-test/examples/ex.rs
index d1a9a74e7..d1a9a74e7 100644
--- a/src/test/run-make/rustdoc-scrape-examples-test/examples/ex.rs
+++ b/tests/run-make/rustdoc-scrape-examples-test/examples/ex.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-test/src/lib.rs b/tests/run-make/rustdoc-scrape-examples-test/src/lib.rs
index 22be1ad41..22be1ad41 100644
--- a/src/test/run-make/rustdoc-scrape-examples-test/src/lib.rs
+++ b/tests/run-make/rustdoc-scrape-examples-test/src/lib.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-whitespace/Makefile b/tests/run-make/rustdoc-scrape-examples-whitespace/Makefile
index 7786ff762..7786ff762 100644
--- a/src/test/run-make/rustdoc-scrape-examples-whitespace/Makefile
+++ b/tests/run-make/rustdoc-scrape-examples-whitespace/Makefile
diff --git a/src/test/run-make/rustdoc-scrape-examples-whitespace/examples/ex.rs b/tests/run-make/rustdoc-scrape-examples-whitespace/examples/ex.rs
index 44ff689df..44ff689df 100644
--- a/src/test/run-make/rustdoc-scrape-examples-whitespace/examples/ex.rs
+++ b/tests/run-make/rustdoc-scrape-examples-whitespace/examples/ex.rs
diff --git a/src/test/run-make/rustdoc-scrape-examples-whitespace/src/lib.rs b/tests/run-make/rustdoc-scrape-examples-whitespace/src/lib.rs
index 28c34716c..28c34716c 100644
--- a/src/test/run-make/rustdoc-scrape-examples-whitespace/src/lib.rs
+++ b/tests/run-make/rustdoc-scrape-examples-whitespace/src/lib.rs
diff --git a/src/test/run-make/rustdoc-verify-output-files/Makefile b/tests/run-make/rustdoc-verify-output-files/Makefile
index bfabbbc65..bfabbbc65 100644
--- a/src/test/run-make/rustdoc-verify-output-files/Makefile
+++ b/tests/run-make/rustdoc-verify-output-files/Makefile
diff --git a/src/test/run-make/rustdoc-verify-output-files/src/lib.rs b/tests/run-make/rustdoc-verify-output-files/src/lib.rs
index 5df757613..5df757613 100644
--- a/src/test/run-make/rustdoc-verify-output-files/src/lib.rs
+++ b/tests/run-make/rustdoc-verify-output-files/src/lib.rs
diff --git a/src/test/run-make/rustdoc-with-out-dir-option/Makefile b/tests/run-make/rustdoc-with-out-dir-option/Makefile
index b3c3f5230..b3c3f5230 100644
--- a/src/test/run-make/rustdoc-with-out-dir-option/Makefile
+++ b/tests/run-make/rustdoc-with-out-dir-option/Makefile
diff --git a/src/test/run-make/rustdoc-with-out-dir-option/src/lib.rs b/tests/run-make/rustdoc-with-out-dir-option/src/lib.rs
index 044bb6acb..044bb6acb 100644
--- a/src/test/run-make/rustdoc-with-out-dir-option/src/lib.rs
+++ b/tests/run-make/rustdoc-with-out-dir-option/src/lib.rs
diff --git a/src/test/run-make/rustdoc-with-output-option/Makefile b/tests/run-make/rustdoc-with-output-option/Makefile
index 02093a35c..02093a35c 100644
--- a/src/test/run-make/rustdoc-with-output-option/Makefile
+++ b/tests/run-make/rustdoc-with-output-option/Makefile
diff --git a/src/test/run-make/rustdoc-with-output-option/src/lib.rs b/tests/run-make/rustdoc-with-output-option/src/lib.rs
index 044bb6acb..044bb6acb 100644
--- a/src/test/run-make/rustdoc-with-output-option/src/lib.rs
+++ b/tests/run-make/rustdoc-with-output-option/src/lib.rs
diff --git a/src/test/run-make/rustdoc-with-short-out-dir-option/Makefile b/tests/run-make/rustdoc-with-short-out-dir-option/Makefile
index dc5056a86..dc5056a86 100644
--- a/src/test/run-make/rustdoc-with-short-out-dir-option/Makefile
+++ b/tests/run-make/rustdoc-with-short-out-dir-option/Makefile
diff --git a/src/test/run-make/rustdoc-with-short-out-dir-option/src/lib.rs b/tests/run-make/rustdoc-with-short-out-dir-option/src/lib.rs
index 044bb6acb..044bb6acb 100644
--- a/src/test/run-make/rustdoc-with-short-out-dir-option/src/lib.rs
+++ b/tests/run-make/rustdoc-with-short-out-dir-option/src/lib.rs
diff --git a/tests/run-make/static-pie/Makefile b/tests/run-make/static-pie/Makefile
new file mode 100644
index 000000000..f4e6adf1b
--- /dev/null
+++ b/tests/run-make/static-pie/Makefile
@@ -0,0 +1,18 @@
+include ../../run-make-fulldeps/tools.mk
+
+# only-x86_64
+# only-linux
+# ignore-gnux32
+
+# How to manually run this
+# $ ./x.py test --target x86_64-unknown-linux-[musl,gnu] tests/run-make/static-pie
+
+all: test-clang test-gcc
+
+test-%:
+	if ./check_$*_version.sh; then\
+		${RUSTC} -Clinker=$* -Clinker-flavor=gcc --target ${TARGET} -C target-feature=+crt-static test-aslr.rs; \
+		! readelf -l $(call RUN_BINFILE,test-aslr) | $(CGREP) INTERP; \
+		readelf -l $(call RUN_BINFILE,test-aslr) | $(CGREP) DYNAMIC; \
+		$(call RUN,test-aslr) --test-aslr; \
+	fi
diff --git a/src/test/run-make/static-pie/check_clang_version.sh b/tests/run-make/static-pie/check_clang_version.sh
index b8e97c3da..b8e97c3da 100755
--- a/src/test/run-make/static-pie/check_clang_version.sh
+++ b/tests/run-make/static-pie/check_clang_version.sh
diff --git a/src/test/run-make/static-pie/check_gcc_version.sh b/tests/run-make/static-pie/check_gcc_version.sh
index d07e1d151..d07e1d151 100755
--- a/src/test/run-make/static-pie/check_gcc_version.sh
+++ b/tests/run-make/static-pie/check_gcc_version.sh
diff --git a/src/test/run-make/static-pie/test-aslr.rs b/tests/run-make/static-pie/test-aslr.rs
index 96b17af46..96b17af46 100644
--- a/src/test/run-make/static-pie/test-aslr.rs
+++ b/tests/run-make/static-pie/test-aslr.rs
diff --git a/src/test/run-make/test-benches/Makefile b/tests/run-make/test-benches/Makefile
index 8fc122515..8fc122515 100644
--- a/src/test/run-make/test-benches/Makefile
+++ b/tests/run-make/test-benches/Makefile
diff --git a/src/test/run-make/test-benches/smokebench.rs b/tests/run-make/test-benches/smokebench.rs
index ef5e5a620..ef5e5a620 100644
--- a/src/test/run-make/test-benches/smokebench.rs
+++ b/tests/run-make/test-benches/smokebench.rs
diff --git a/tests/run-make/thumb-none-cortex-m/Makefile b/tests/run-make/thumb-none-cortex-m/Makefile
new file mode 100644
index 000000000..3065141c0
--- /dev/null
+++ b/tests/run-make/thumb-none-cortex-m/Makefile
@@ -0,0 +1,38 @@
+include ../../run-make-fulldeps/tools.mk
+
+# How to run this
+# $ ./x.py clean
+# $ ./x.py test --target thumbv6m-none-eabi,thumbv7m-none-eabi tests/run-make
+
+# Supported targets:
+# - thumbv6m-none-eabi (Bare Cortex-M0, M0+, M1)
+# - thumbv7em-none-eabi (Bare Cortex-M4, M7)
+# - thumbv7em-none-eabihf (Bare Cortex-M4F, M7F, FPU, hardfloat)
+# - thumbv7m-none-eabi (Bare Cortex-M3)
+
+# only-thumb
+
+# For cargo setting
+RUSTC := $(RUSTC_ORIGINAL)
+LD_LIBRARY_PATH := $(HOST_RPATH_DIR)
+# We need to be outside of 'src' dir in order to run cargo
+WORK_DIR := $(TMPDIR)
+
+HERE := $(shell pwd)
+
+CRATE := cortex-m
+CRATE_URL := https://github.com/rust-embedded/cortex-m
+CRATE_SHA1 := a448e9156e2cb1e556e5441fd65426952ef4b927 # 0.5.0
+
+# Don't make lints fatal, but they need to at least warn or they break Cargo's target info parsing.
+export RUSTFLAGS := --cap-lints=warn
+
+all:
+	env
+	mkdir -p $(WORK_DIR)
+	-cd $(WORK_DIR) && rm -rf $(CRATE)
+	cd $(WORK_DIR) && bash -x $(HERE)/../git_clone_sha1.sh $(CRATE) $(CRATE_URL) $(CRATE_SHA1)
+	# HACK(eddyb) sets `RUSTC_BOOTSTRAP=1` so Cargo can accept nightly features.
+	# These come from the top-level Rust workspace, that this crate is not a
+	# member of, but Cargo tries to load the workspace `Cargo.toml` anyway.
+	cd $(WORK_DIR) && cd $(CRATE) && env RUSTC_BOOTSTRAP=1 $(BOOTSTRAP_CARGO) build --target $(TARGET) -v
diff --git a/tests/run-make/thumb-none-qemu/Makefile b/tests/run-make/thumb-none-qemu/Makefile
new file mode 100644
index 000000000..a1c2ba12c
--- /dev/null
+++ b/tests/run-make/thumb-none-qemu/Makefile
@@ -0,0 +1,27 @@
+include ../../run-make-fulldeps/tools.mk
+
+# only-thumb
+
+# How to run this
+# $ ./x.py clean
+# $ ./x.py test --target thumbv7m-none-eabi tests/run-make
+
+# For cargo setting
+export RUSTC := $(RUSTC_ORIGINAL)
+export LD_LIBRARY_PATH := $(HOST_RPATH_DIR)
+# We need to be outside of 'src' dir in order to run cargo
+export WORK_DIR := $(TMPDIR)
+export HERE := $(shell pwd)
+
+## clean up unused env variables which might cause harm.
+unexport RUSTC_LINKER
+unexport RUSTC_BOOTSTRAP
+unexport RUST_BUILD_STAGE
+unexport RUST_TEST_THREADS
+unexport RUST_TEST_TMPDIR
+unexport AR
+unexport CC
+unexport CXX
+
+all:
+	bash script.sh
diff --git a/src/test/run-make/thumb-none-qemu/example/.cargo/config b/tests/run-make/thumb-none-qemu/example/.cargo/config
index 8b30310e7..8b30310e7 100644
--- a/src/test/run-make/thumb-none-qemu/example/.cargo/config
+++ b/tests/run-make/thumb-none-qemu/example/.cargo/config
diff --git a/src/test/run-make/thumb-none-qemu/example/Cargo.lock b/tests/run-make/thumb-none-qemu/example/Cargo.lock
index 687b962a8..687b962a8 100644
--- a/src/test/run-make/thumb-none-qemu/example/Cargo.lock
+++ b/tests/run-make/thumb-none-qemu/example/Cargo.lock
diff --git a/src/test/run-make/thumb-none-qemu/example/Cargo.toml b/tests/run-make/thumb-none-qemu/example/Cargo.toml
index 63eb5f90a..63eb5f90a 100644
--- a/src/test/run-make/thumb-none-qemu/example/Cargo.toml
+++ b/tests/run-make/thumb-none-qemu/example/Cargo.toml
diff --git a/src/test/run-make/thumb-none-qemu/example/memory.x b/tests/run-make/thumb-none-qemu/example/memory.x
index dc7ad967a..dc7ad967a 100644
--- a/src/test/run-make/thumb-none-qemu/example/memory.x
+++ b/tests/run-make/thumb-none-qemu/example/memory.x
diff --git a/src/test/run-make/thumb-none-qemu/example/src/main.rs b/tests/run-make/thumb-none-qemu/example/src/main.rs
index 2abfde8e7..2abfde8e7 100644
--- a/src/test/run-make/thumb-none-qemu/example/src/main.rs
+++ b/tests/run-make/thumb-none-qemu/example/src/main.rs
diff --git a/src/test/run-make/thumb-none-qemu/script.sh b/tests/run-make/thumb-none-qemu/script.sh
index a8aa72af1..a8aa72af1 100644
--- a/src/test/run-make/thumb-none-qemu/script.sh
+++ b/tests/run-make/thumb-none-qemu/script.sh
diff --git a/src/test/run-make/track-path-dep-info/Makefile b/tests/run-make/track-path-dep-info/Makefile
index ee853943f..ee853943f 100644
--- a/src/test/run-make/track-path-dep-info/Makefile
+++ b/tests/run-make/track-path-dep-info/Makefile
diff --git a/src/test/run-make/track-path-dep-info/emojis.txt b/tests/run-make/track-path-dep-info/emojis.txt
index e1a728461..e1a728461 100644
--- a/src/test/run-make/track-path-dep-info/emojis.txt
+++ b/tests/run-make/track-path-dep-info/emojis.txt
diff --git a/src/test/run-make/track-path-dep-info/macro_def.rs b/tests/run-make/track-path-dep-info/macro_def.rs
index 8777ce21f..8777ce21f 100644
--- a/src/test/run-make/track-path-dep-info/macro_def.rs
+++ b/tests/run-make/track-path-dep-info/macro_def.rs
diff --git a/src/test/run-make/track-path-dep-info/macro_use.rs b/tests/run-make/track-path-dep-info/macro_use.rs
index 3c49fd05d..3c49fd05d 100644
--- a/src/test/run-make/track-path-dep-info/macro_use.rs
+++ b/tests/run-make/track-path-dep-info/macro_use.rs
diff --git a/src/test/run-make/track-pgo-dep-info/Makefile b/tests/run-make/track-pgo-dep-info/Makefile
index 60b59c04a..60b59c04a 100644
--- a/src/test/run-make/track-pgo-dep-info/Makefile
+++ b/tests/run-make/track-pgo-dep-info/Makefile
diff --git a/src/test/run-make/track-pgo-dep-info/main.rs b/tests/run-make/track-pgo-dep-info/main.rs
index f328e4d9d..f328e4d9d 100644
--- a/src/test/run-make/track-pgo-dep-info/main.rs
+++ b/tests/run-make/track-pgo-dep-info/main.rs
diff --git a/src/test/run-make/translation/Makefile b/tests/run-make/translation/Makefile
index 20e86c7f9..20e86c7f9 100644
--- a/src/test/run-make/translation/Makefile
+++ b/tests/run-make/translation/Makefile
diff --git a/src/test/run-make/translation/broken.ftl b/tests/run-make/translation/broken.ftl
index f1dd6ff0b..f1dd6ff0b 100644
--- a/src/test/run-make/translation/broken.ftl
+++ b/tests/run-make/translation/broken.ftl
diff --git a/src/test/run-make/translation/missing.ftl b/tests/run-make/translation/missing.ftl
index 6be24dc7b..6be24dc7b 100644
--- a/src/test/run-make/translation/missing.ftl
+++ b/tests/run-make/translation/missing.ftl
diff --git a/src/test/run-make/translation/test.rs b/tests/run-make/translation/test.rs
index b8f5bff31..b8f5bff31 100644
--- a/src/test/run-make/translation/test.rs
+++ b/tests/run-make/translation/test.rs
diff --git a/src/test/run-make/translation/working.ftl b/tests/run-make/translation/working.ftl
index 50d126e3f..50d126e3f 100644
--- a/src/test/run-make/translation/working.ftl
+++ b/tests/run-make/translation/working.ftl
diff --git a/src/test/run-make/unstable-flag-required/Makefile b/tests/run-make/unstable-flag-required/Makefile
index d3a734fae..d3a734fae 100644
--- a/src/test/run-make/unstable-flag-required/Makefile
+++ b/tests/run-make/unstable-flag-required/Makefile
diff --git a/src/test/run-make/unstable-flag-required/README.md b/tests/run-make/unstable-flag-required/README.md
index e5251fdf9..e5251fdf9 100644
--- a/src/test/run-make/unstable-flag-required/README.md
+++ b/tests/run-make/unstable-flag-required/README.md
diff --git a/src/test/run-make/unstable-flag-required/output-format-json.stderr b/tests/run-make/unstable-flag-required/output-format-json.stderr
index fb4079beb..fb4079beb 100644
--- a/src/test/run-make/unstable-flag-required/output-format-json.stderr
+++ b/tests/run-make/unstable-flag-required/output-format-json.stderr
diff --git a/src/test/run-make/unstable-flag-required/x.rs b/tests/run-make/unstable-flag-required/x.rs
index 5df757613..5df757613 100644
--- a/src/test/run-make/unstable-flag-required/x.rs
+++ b/tests/run-make/unstable-flag-required/x.rs
diff --git a/src/test/run-make/valid-print-requests/Makefile b/tests/run-make/valid-print-requests/Makefile
index c325e536e..c325e536e 100644
--- a/src/test/run-make/valid-print-requests/Makefile
+++ b/tests/run-make/valid-print-requests/Makefile
diff --git a/src/test/run-make/valid-print-requests/valid-print-requests.stderr b/tests/run-make/valid-print-requests/valid-print-requests.stderr
index 5191e4676..5191e4676 100644
--- a/src/test/run-make/valid-print-requests/valid-print-requests.stderr
+++ b/tests/run-make/valid-print-requests/valid-print-requests.stderr
diff --git a/src/test/run-make/wasm-abi/Makefile b/tests/run-make/wasm-abi/Makefile
index e713ca187..e713ca187 100644
--- a/src/test/run-make/wasm-abi/Makefile
+++ b/tests/run-make/wasm-abi/Makefile
diff --git a/src/test/run-make/wasm-abi/foo.js b/tests/run-make/wasm-abi/foo.js
index 9e9a65401..9e9a65401 100644
--- a/src/test/run-make/wasm-abi/foo.js
+++ b/tests/run-make/wasm-abi/foo.js
diff --git a/src/test/run-make/wasm-abi/foo.rs b/tests/run-make/wasm-abi/foo.rs
index 0678eb3ff..0678eb3ff 100644
--- a/src/test/run-make/wasm-abi/foo.rs
+++ b/tests/run-make/wasm-abi/foo.rs
diff --git a/src/test/run-make/wasm-custom-section/Makefile b/tests/run-make/wasm-custom-section/Makefile
index 92b0802e3..92b0802e3 100644
--- a/src/test/run-make/wasm-custom-section/Makefile
+++ b/tests/run-make/wasm-custom-section/Makefile
diff --git a/src/test/run-make/wasm-custom-section/bar.rs b/tests/run-make/wasm-custom-section/bar.rs
index c95f3e143..c95f3e143 100644
--- a/src/test/run-make/wasm-custom-section/bar.rs
+++ b/tests/run-make/wasm-custom-section/bar.rs
diff --git a/src/test/run-make/wasm-custom-section/foo.js b/tests/run-make/wasm-custom-section/foo.js
index 57a0f5073..57a0f5073 100644
--- a/src/test/run-make/wasm-custom-section/foo.js
+++ b/tests/run-make/wasm-custom-section/foo.js
diff --git a/src/test/run-make/wasm-custom-section/foo.rs b/tests/run-make/wasm-custom-section/foo.rs
index 61f81f024..61f81f024 100644
--- a/src/test/run-make/wasm-custom-section/foo.rs
+++ b/tests/run-make/wasm-custom-section/foo.rs
diff --git a/src/test/run-make/wasm-custom-sections-opt/Makefile b/tests/run-make/wasm-custom-sections-opt/Makefile
index e5b45d963..e5b45d963 100644
--- a/src/test/run-make/wasm-custom-sections-opt/Makefile
+++ b/tests/run-make/wasm-custom-sections-opt/Makefile
diff --git a/src/test/run-make/wasm-custom-sections-opt/foo.js b/tests/run-make/wasm-custom-sections-opt/foo.js
index 9663f377e..9663f377e 100644
--- a/src/test/run-make/wasm-custom-sections-opt/foo.js
+++ b/tests/run-make/wasm-custom-sections-opt/foo.js
diff --git a/src/test/run-make/wasm-custom-sections-opt/foo.rs b/tests/run-make/wasm-custom-sections-opt/foo.rs
index 9af7728b7..9af7728b7 100644
--- a/src/test/run-make/wasm-custom-sections-opt/foo.rs
+++ b/tests/run-make/wasm-custom-sections-opt/foo.rs
diff --git a/src/test/run-make/wasm-export-all-symbols/Makefile b/tests/run-make/wasm-export-all-symbols/Makefile
index 834f4d258..834f4d258 100644
--- a/src/test/run-make/wasm-export-all-symbols/Makefile
+++ b/tests/run-make/wasm-export-all-symbols/Makefile
diff --git a/src/test/run-make/wasm-export-all-symbols/bar.rs b/tests/run-make/wasm-export-all-symbols/bar.rs
index ac9c20a57..ac9c20a57 100644
--- a/src/test/run-make/wasm-export-all-symbols/bar.rs
+++ b/tests/run-make/wasm-export-all-symbols/bar.rs
diff --git a/src/test/run-make/wasm-export-all-symbols/foo.rs b/tests/run-make/wasm-export-all-symbols/foo.rs
index 4811b24bc..4811b24bc 100644
--- a/src/test/run-make/wasm-export-all-symbols/foo.rs
+++ b/tests/run-make/wasm-export-all-symbols/foo.rs
diff --git a/src/test/run-make/wasm-export-all-symbols/main.rs b/tests/run-make/wasm-export-all-symbols/main.rs
index 0edda7d7b..0edda7d7b 100644
--- a/src/test/run-make/wasm-export-all-symbols/main.rs
+++ b/tests/run-make/wasm-export-all-symbols/main.rs
diff --git a/src/test/run-make/wasm-export-all-symbols/verify.js b/tests/run-make/wasm-export-all-symbols/verify.js
index 72db3356f..72db3356f 100644
--- a/src/test/run-make/wasm-export-all-symbols/verify.js
+++ b/tests/run-make/wasm-export-all-symbols/verify.js
diff --git a/src/test/run-make/wasm-import-module/Makefile b/tests/run-make/wasm-import-module/Makefile
index 18cef16aa..18cef16aa 100644
--- a/src/test/run-make/wasm-import-module/Makefile
+++ b/tests/run-make/wasm-import-module/Makefile
diff --git a/src/test/run-make/wasm-import-module/bar.rs b/tests/run-make/wasm-import-module/bar.rs
index 1b988c783..1b988c783 100644
--- a/src/test/run-make/wasm-import-module/bar.rs
+++ b/tests/run-make/wasm-import-module/bar.rs
diff --git a/src/test/run-make/wasm-import-module/foo.js b/tests/run-make/wasm-import-module/foo.js
index 3ea47fcc9..3ea47fcc9 100644
--- a/src/test/run-make/wasm-import-module/foo.js
+++ b/tests/run-make/wasm-import-module/foo.js
diff --git a/src/test/run-make/wasm-import-module/foo.rs b/tests/run-make/wasm-import-module/foo.rs
index bbeaf99bc..bbeaf99bc 100644
--- a/src/test/run-make/wasm-import-module/foo.rs
+++ b/tests/run-make/wasm-import-module/foo.rs
diff --git a/src/test/run-make/wasm-panic-small/Makefile b/tests/run-make/wasm-panic-small/Makefile
index 2af9f7135..2af9f7135 100644
--- a/src/test/run-make/wasm-panic-small/Makefile
+++ b/tests/run-make/wasm-panic-small/Makefile
diff --git a/src/test/run-make/wasm-panic-small/foo.rs b/tests/run-make/wasm-panic-small/foo.rs
index 6df52affe..6df52affe 100644
--- a/src/test/run-make/wasm-panic-small/foo.rs
+++ b/tests/run-make/wasm-panic-small/foo.rs
diff --git a/src/test/run-make/wasm-spurious-import/Makefile b/tests/run-make/wasm-spurious-import/Makefile
index 6f50e6e55..6f50e6e55 100644
--- a/src/test/run-make/wasm-spurious-import/Makefile
+++ b/tests/run-make/wasm-spurious-import/Makefile
diff --git a/src/test/run-make/wasm-spurious-import/main.rs b/tests/run-make/wasm-spurious-import/main.rs
index fcbead5e2..fcbead5e2 100644
--- a/src/test/run-make/wasm-spurious-import/main.rs
+++ b/tests/run-make/wasm-spurious-import/main.rs
diff --git a/src/test/run-make/wasm-spurious-import/verify.js b/tests/run-make/wasm-spurious-import/verify.js
index d3b2101b6..d3b2101b6 100644
--- a/src/test/run-make/wasm-spurious-import/verify.js
+++ b/tests/run-make/wasm-spurious-import/verify.js
diff --git a/src/test/run-make/wasm-stringify-ints-small/Makefile b/tests/run-make/wasm-stringify-ints-small/Makefile
index 2fa2c954d..2fa2c954d 100644
--- a/src/test/run-make/wasm-stringify-ints-small/Makefile
+++ b/tests/run-make/wasm-stringify-ints-small/Makefile
diff --git a/src/test/run-make/wasm-stringify-ints-small/foo.rs b/tests/run-make/wasm-stringify-ints-small/foo.rs
index 7a947f013..7a947f013 100644
--- a/src/test/run-make/wasm-stringify-ints-small/foo.rs
+++ b/tests/run-make/wasm-stringify-ints-small/foo.rs
diff --git a/src/test/run-make/wasm-symbols-different-module/Makefile b/tests/run-make/wasm-symbols-different-module/Makefile
index 9e657222d..9e657222d 100644
--- a/src/test/run-make/wasm-symbols-different-module/Makefile
+++ b/tests/run-make/wasm-symbols-different-module/Makefile
diff --git a/src/test/run-make/wasm-symbols-different-module/bar.rs b/tests/run-make/wasm-symbols-different-module/bar.rs
index 7567060d7..7567060d7 100644
--- a/src/test/run-make/wasm-symbols-different-module/bar.rs
+++ b/tests/run-make/wasm-symbols-different-module/bar.rs
diff --git a/src/test/run-make/wasm-symbols-different-module/baz.rs b/tests/run-make/wasm-symbols-different-module/baz.rs
index fbb78619b..fbb78619b 100644
--- a/src/test/run-make/wasm-symbols-different-module/baz.rs
+++ b/tests/run-make/wasm-symbols-different-module/baz.rs
diff --git a/src/test/run-make/wasm-symbols-different-module/foo.rs b/tests/run-make/wasm-symbols-different-module/foo.rs
index a4ba7e714..a4ba7e714 100644
--- a/src/test/run-make/wasm-symbols-different-module/foo.rs
+++ b/tests/run-make/wasm-symbols-different-module/foo.rs
diff --git a/src/test/run-make/wasm-symbols-different-module/log.rs b/tests/run-make/wasm-symbols-different-module/log.rs
index ea3e0b4b2..ea3e0b4b2 100644
--- a/src/test/run-make/wasm-symbols-different-module/log.rs
+++ b/tests/run-make/wasm-symbols-different-module/log.rs
diff --git a/src/test/run-make/wasm-symbols-different-module/verify-imports.js b/tests/run-make/wasm-symbols-different-module/verify-imports.js
index 7e9f90cf8..7e9f90cf8 100644
--- a/src/test/run-make/wasm-symbols-different-module/verify-imports.js
+++ b/tests/run-make/wasm-symbols-different-module/verify-imports.js
diff --git a/src/test/run-make/wasm-symbols-not-exported/Makefile b/tests/run-make/wasm-symbols-not-exported/Makefile
index 60b0dee00..60b0dee00 100644
--- a/src/test/run-make/wasm-symbols-not-exported/Makefile
+++ b/tests/run-make/wasm-symbols-not-exported/Makefile
diff --git a/src/test/run-make/wasm-symbols-not-exported/bar.rs b/tests/run-make/wasm-symbols-not-exported/bar.rs
index 6ffbd3ec6..6ffbd3ec6 100644
--- a/src/test/run-make/wasm-symbols-not-exported/bar.rs
+++ b/tests/run-make/wasm-symbols-not-exported/bar.rs
diff --git a/src/test/run-make/wasm-symbols-not-exported/foo.rs b/tests/run-make/wasm-symbols-not-exported/foo.rs
index d46baee01..d46baee01 100644
--- a/src/test/run-make/wasm-symbols-not-exported/foo.rs
+++ b/tests/run-make/wasm-symbols-not-exported/foo.rs
diff --git a/src/test/run-make/wasm-symbols-not-exported/verify-exported-symbols.js b/tests/run-make/wasm-symbols-not-exported/verify-exported-symbols.js
index afc8a7241..afc8a7241 100644
--- a/src/test/run-make/wasm-symbols-not-exported/verify-exported-symbols.js
+++ b/tests/run-make/wasm-symbols-not-exported/verify-exported-symbols.js
diff --git a/src/test/run-make/wasm-symbols-not-imported/Makefile b/tests/run-make/wasm-symbols-not-imported/Makefile
index dc7618c19..dc7618c19 100644
--- a/src/test/run-make/wasm-symbols-not-imported/Makefile
+++ b/tests/run-make/wasm-symbols-not-imported/Makefile
diff --git a/src/test/run-make/wasm-symbols-not-imported/foo.rs b/tests/run-make/wasm-symbols-not-imported/foo.rs
index b25bdc980..b25bdc980 100644
--- a/src/test/run-make/wasm-symbols-not-imported/foo.rs
+++ b/tests/run-make/wasm-symbols-not-imported/foo.rs
diff --git a/src/test/run-make/wasm-symbols-not-imported/verify-no-imports.js b/tests/run-make/wasm-symbols-not-imported/verify-no-imports.js
index 90e3df1d9..90e3df1d9 100644
--- a/src/test/run-make/wasm-symbols-not-imported/verify-no-imports.js
+++ b/tests/run-make/wasm-symbols-not-imported/verify-no-imports.js
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile
index 84dcd2393..84dcd2393 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_asm.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_asm.checks
index e839c200b..e839c200b 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_asm.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_asm.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c.checks
index b93b33afb..b93b33afb 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c_asm.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c_asm.checks
index d1fae3d49..d1fae3d49 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c_asm.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c_asm.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx.checks
index f96f152c0..f96f152c0 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx_asm.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx_asm.checks
index e704bf417..e704bf417 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx_asm.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx_asm.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_asm.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_asm.checks
index 78b18ccbf..78b18ccbf 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_asm.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_asm.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c.checks
index f551356b2..f551356b2 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_asm.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_asm.checks
index 87c806f13..87c806f13 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_asm.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_asm.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_global_asm.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_global_asm.checks
index 4b66cc5bc..4b66cc5bc 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_global_asm.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_global_asm.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx.checks
index 0f403e020..0f403e020 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_asm.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_asm.checks
index 9cac8711e..9cac8711e 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_asm.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_asm.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_global_asm.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_global_asm.checks
index d4a3d4479..d4a3d4479 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_global_asm.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_global_asm.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/Cargo.toml b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/Cargo.toml
index 3a97c37e9..3a97c37e9 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/Cargo.toml
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/Cargo.toml
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/build.rs b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/build.rs
index 3a7aa1be8..3a7aa1be8 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/build.rs
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/build.rs
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo.c b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo.c
index dd76d4f30..dd76d4f30 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo.c
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo.c
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_asm.s b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_asm.s
index 6d56214e8..6d56214e8 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_asm.s
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_asm.s
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_cxx.cpp b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_cxx.cpp
index ac6f64ac4..ac6f64ac4 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_cxx.cpp
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_cxx.cpp
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/CMakeLists.txt b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/CMakeLists.txt
index 27cdf2ecf..27cdf2ecf 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/CMakeLists.txt
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/CMakeLists.txt
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo.c b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo.c
index c3b731a2d..c3b731a2d 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo.c
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo.c
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_asm.s b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_asm.s
index 64b6b430e..64b6b430e 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_asm.s
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_asm.s
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_cxx.cpp b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_cxx.cpp
index 824e2afeb..824e2afeb 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_cxx.cpp
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_cxx.cpp
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/src/main.rs b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/src/main.rs
index cde38aacf..cde38aacf 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/src/main.rs
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/src/main.rs
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/jumpto.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/jumpto.checks
index 15211e3ad..15211e3ad 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/jumpto.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/jumpto.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/print.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/print.checks
index 0fe88141b..0fe88141b 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/print.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/print.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/rust_plus_one_global_asm.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/rust_plus_one_global_asm.checks
index fe6777537..fe6777537 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/rust_plus_one_global_asm.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/rust_plus_one_global_asm.checks
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/script.sh b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/script.sh
index 944343df6..944343df6 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/script.sh
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/script.sh
diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/unw_getcontext.checks b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/unw_getcontext.checks
index 4b7615b11..4b7615b11 100644
--- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/unw_getcontext.checks
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/unw_getcontext.checks
diff --git a/src/test/run-pass-valgrind/cast-enum-with-dtor.rs b/tests/run-pass-valgrind/cast-enum-with-dtor.rs
index f7ef92df8..f7ef92df8 100644
--- a/src/test/run-pass-valgrind/cast-enum-with-dtor.rs
+++ b/tests/run-pass-valgrind/cast-enum-with-dtor.rs
diff --git a/src/test/run-pass-valgrind/cleanup-auto-borrow-obj.rs b/tests/run-pass-valgrind/cleanup-auto-borrow-obj.rs
index dfc094abe..dfc094abe 100644
--- a/src/test/run-pass-valgrind/cleanup-auto-borrow-obj.rs
+++ b/tests/run-pass-valgrind/cleanup-auto-borrow-obj.rs
diff --git a/src/test/run-pass-valgrind/cleanup-stdin.rs b/tests/run-pass-valgrind/cleanup-stdin.rs
index cf8f81cf5..cf8f81cf5 100644
--- a/src/test/run-pass-valgrind/cleanup-stdin.rs
+++ b/tests/run-pass-valgrind/cleanup-stdin.rs
diff --git a/src/test/run-pass-valgrind/coerce-match-calls.rs b/tests/run-pass-valgrind/coerce-match-calls.rs
index 60943aad8..60943aad8 100644
--- a/src/test/run-pass-valgrind/coerce-match-calls.rs
+++ b/tests/run-pass-valgrind/coerce-match-calls.rs
diff --git a/src/test/run-pass-valgrind/coerce-match.rs b/tests/run-pass-valgrind/coerce-match.rs
index 5b78f1ec7..5b78f1ec7 100644
--- a/src/test/run-pass-valgrind/coerce-match.rs
+++ b/tests/run-pass-valgrind/coerce-match.rs
diff --git a/src/test/run-pass-valgrind/down-with-thread-dtors.rs b/tests/run-pass-valgrind/down-with-thread-dtors.rs
index 8531b8d83..8531b8d83 100644
--- a/src/test/run-pass-valgrind/down-with-thread-dtors.rs
+++ b/tests/run-pass-valgrind/down-with-thread-dtors.rs
diff --git a/src/test/run-pass-valgrind/dst-dtor-1.rs b/tests/run-pass-valgrind/dst-dtor-1.rs
index 5b8433f61..5b8433f61 100644
--- a/src/test/run-pass-valgrind/dst-dtor-1.rs
+++ b/tests/run-pass-valgrind/dst-dtor-1.rs
diff --git a/src/test/run-pass-valgrind/dst-dtor-2.rs b/tests/run-pass-valgrind/dst-dtor-2.rs
index 991fe0095..991fe0095 100644
--- a/src/test/run-pass-valgrind/dst-dtor-2.rs
+++ b/tests/run-pass-valgrind/dst-dtor-2.rs
diff --git a/src/test/run-pass-valgrind/dst-dtor-3.rs b/tests/run-pass-valgrind/dst-dtor-3.rs
index f0c2dda5a..f0c2dda5a 100644
--- a/src/test/run-pass-valgrind/dst-dtor-3.rs
+++ b/tests/run-pass-valgrind/dst-dtor-3.rs
diff --git a/src/test/run-pass-valgrind/dst-dtor-4.rs b/tests/run-pass-valgrind/dst-dtor-4.rs
index ad6d46f7c..ad6d46f7c 100644
--- a/src/test/run-pass-valgrind/dst-dtor-4.rs
+++ b/tests/run-pass-valgrind/dst-dtor-4.rs
diff --git a/src/test/run-pass-valgrind/exit-flushes.rs b/tests/run-pass-valgrind/exit-flushes.rs
index 9daf487d3..9daf487d3 100644
--- a/src/test/run-pass-valgrind/exit-flushes.rs
+++ b/tests/run-pass-valgrind/exit-flushes.rs
diff --git a/src/test/run-pass-valgrind/issue-44800.rs b/tests/run-pass-valgrind/issue-44800.rs
index f76657ca7..f76657ca7 100644
--- a/src/test/run-pass-valgrind/issue-44800.rs
+++ b/tests/run-pass-valgrind/issue-44800.rs
diff --git a/src/test/run-pass-valgrind/osx-frameworks.rs b/tests/run-pass-valgrind/osx-frameworks.rs
index 571621c1d..571621c1d 100644
--- a/src/test/run-pass-valgrind/osx-frameworks.rs
+++ b/tests/run-pass-valgrind/osx-frameworks.rs
diff --git a/src/test/run-pass-valgrind/unsized-locals/by-value-trait-objects-rust-call.rs b/tests/run-pass-valgrind/unsized-locals/by-value-trait-objects-rust-call.rs
index ece4dea9a..ece4dea9a 100644
--- a/src/test/run-pass-valgrind/unsized-locals/by-value-trait-objects-rust-call.rs
+++ b/tests/run-pass-valgrind/unsized-locals/by-value-trait-objects-rust-call.rs
diff --git a/src/test/run-pass-valgrind/unsized-locals/by-value-trait-objects-rust-call2.rs b/tests/run-pass-valgrind/unsized-locals/by-value-trait-objects-rust-call2.rs
index 94df2b0b8..94df2b0b8 100644
--- a/src/test/run-pass-valgrind/unsized-locals/by-value-trait-objects-rust-call2.rs
+++ b/tests/run-pass-valgrind/unsized-locals/by-value-trait-objects-rust-call2.rs
diff --git a/src/test/run-pass-valgrind/unsized-locals/by-value-trait-objects.rs b/tests/run-pass-valgrind/unsized-locals/by-value-trait-objects.rs
index 3d67101e7..3d67101e7 100644
--- a/src/test/run-pass-valgrind/unsized-locals/by-value-trait-objects.rs
+++ b/tests/run-pass-valgrind/unsized-locals/by-value-trait-objects.rs
diff --git a/src/test/run-pass-valgrind/unsized-locals/long-live-the-unsized-temporary.rs b/tests/run-pass-valgrind/unsized-locals/long-live-the-unsized-temporary.rs
index a7b905261..a7b905261 100644
--- a/src/test/run-pass-valgrind/unsized-locals/long-live-the-unsized-temporary.rs
+++ b/tests/run-pass-valgrind/unsized-locals/long-live-the-unsized-temporary.rs
diff --git a/tests/rustdoc-gui/README.md b/tests/rustdoc-gui/README.md
new file mode 100644
index 000000000..1126a72ab
--- /dev/null
+++ b/tests/rustdoc-gui/README.md
@@ -0,0 +1,34 @@
+The tests present here are used to test the generated HTML from rustdoc. The
+goal is to prevent unsound/unexpected GUI changes.
+
+This is using the [browser-ui-test] framework to do so. It works as follows:
+
+It wraps [puppeteer] to send commands to a web browser in order to navigate and
+test what's being currently displayed in the web page.
+
+You can find more information and its documentation in its [repository][browser-ui-test].
+
+If you need to have more information on the tests run, you can use `--test-args`:
+
+```bash
+$ ./x.py test tests/rustdoc-gui --stage 1 --test-args --debug
+```
+
+If you don't want to run in headless mode (helpful to debug sometimes), you can use
+`--no-headless`:
+
+```bash
+$ ./x.py test tests/rustdoc-gui --stage 1 --test-args --no-headless
+```
+
+To see the supported options, use `--help`.
+
+Important to be noted: if the chromium instance crashes when you run it, you might need to
+use `--no-sandbox` to make it work:
+
+```bash
+$ ./x.py test tests/rustdoc-gui --stage 1 --test-args --no-sandbox
+```
+
+[browser-ui-test]: https://github.com/GuillaumeGomez/browser-UI-test/
+[puppeteer]: https://pptr.dev/
diff --git a/src/test/rustdoc-gui/anchor-navigable.goml b/tests/rustdoc-gui/anchor-navigable.goml
index 9d5c55a1e..9d5c55a1e 100644
--- a/src/test/rustdoc-gui/anchor-navigable.goml
+++ b/tests/rustdoc-gui/anchor-navigable.goml
diff --git a/tests/rustdoc-gui/anchors.goml b/tests/rustdoc-gui/anchors.goml
new file mode 100644
index 000000000..85cb72274
--- /dev/null
+++ b/tests/rustdoc-gui/anchors.goml
@@ -0,0 +1,109 @@
+// This test is to ensure that the anchors (`§`) have the expected color and position.
+
+define-function: (
+    "check-colors",
+    (theme, main_color, title_color, main_heading_color, main_heading_type_color, src_link_color, sidebar_link_color),
+    block {
+        goto: "file://" + |DOC_PATH| + "/staged_api/struct.Foo.html"
+        // This is needed to ensure that the text color is computed.
+        show-text: true
+
+        // Setting the theme.
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        // We reload the page so the local storage settings are being used.
+        reload:
+
+        assert-css: ("#toggle-all-docs", {"color": |main_color|})
+        assert-css: (".main-heading h1 a:nth-of-type(1)", {"color": |main_heading_color|})
+        assert-css: (".main-heading a:nth-of-type(2)", {"color": |main_heading_type_color|})
+        assert-css: (
+             ".rightside .srclink",
+             {"color": |src_link_color|, "text-decoration": "none solid " + |src_link_color|},
+             ALL,
+        )
+        compare-elements-css: (
+            ".rightside .srclink",
+            ".rightside.srclink",
+            ["color", "text-decoration"],
+        )
+        compare-elements-css: (
+            ".main-heading .srclink",
+            ".rightside.srclink",
+            ["color", "text-decoration"],
+        )
+
+        move-cursor-to: ".main-heading .srclink"
+        assert-css: (
+             ".main-heading .srclink",
+             {"color": |src_link_color|, "text-decoration": "underline solid " + |src_link_color|},
+        )
+        move-cursor-to: ".impl-items .rightside .srclink"
+        assert-css: (
+             ".impl-items .rightside .srclink",
+             {"color": |src_link_color|, "text-decoration": "none solid " + |src_link_color|},
+        )
+        move-cursor-to: ".impl-items .rightside.srclink"
+        assert-css: (
+             ".impl-items .rightside.srclink",
+             {"color": |src_link_color|, "text-decoration": "none solid " + |src_link_color|},
+        )
+
+        goto: "file://" + |DOC_PATH| + "/test_docs/struct.HeavilyDocumentedStruct.html"
+        // Since we changed page, we need to set the theme again.
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        // We reload the page so the local storage settings are being used.
+        reload:
+
+        assert-css: ("#top-doc-prose-title", {"color": |title_color|})
+
+        assert-css: (".sidebar a", {"color": |sidebar_link_color|})
+        assert-css: (".main-heading h1 a", {"color": |title_color|})
+
+        // We move the cursor over the "Implementations" title so the anchor is displayed.
+        move-cursor-to: "h2#implementations"
+        assert-css: ("h2#implementations a.anchor", {"color": |main_color|})
+
+        // Same thing with the impl block title.
+        move-cursor-to: "#impl-HeavilyDocumentedStruct"
+        assert-css: ("#impl-HeavilyDocumentedStruct a.anchor", {"color": |main_color|})
+
+        assert-css: ("#title-for-struct-impl-item-doc", {"margin-left": "0px"})
+    },
+)
+
+call-function: (
+    "check-colors",
+    {
+        "theme": "ayu",
+        "main_color": "rgb(197, 197, 197)",
+        "title_color": "rgb(255, 255, 255)",
+        "main_heading_color": "rgb(255, 255, 255)",
+        "main_heading_type_color": "rgb(255, 160, 165)",
+        "src_link_color": "rgb(57, 175, 215)",
+        "sidebar_link_color": "rgb(83, 177, 219)",
+    },
+)
+call-function: (
+    "check-colors",
+    {
+        "theme": "dark",
+        "main_color": "rgb(221, 221, 221)",
+        "title_color": "rgb(221, 221, 221)",
+        "main_heading_color": "rgb(221, 221, 221)",
+        "main_heading_type_color": "rgb(45, 191, 184)",
+        "src_link_color": "rgb(210, 153, 29)",
+        "sidebar_link_color": "rgb(253, 191, 53)",
+    },
+)
+call-function: (
+    "check-colors",
+    {
+        "theme": "light",
+        "main_color": "rgb(0, 0, 0)",
+        "title_color": "rgb(0, 0, 0)",
+        "main_heading_color": "rgb(0, 0, 0)",
+        "main_heading_type_color": "rgb(173, 55, 138)",
+        "src_link_color": "rgb(56, 115, 173)",
+        "sidebar_link_color": "rgb(53, 109, 164)",
+    },
+)
diff --git a/src/test/rustdoc-gui/auto-hide-trait-implementations.goml b/tests/rustdoc-gui/auto-hide-trait-implementations.goml
index 0a619c352..0a619c352 100644
--- a/src/test/rustdoc-gui/auto-hide-trait-implementations.goml
+++ b/tests/rustdoc-gui/auto-hide-trait-implementations.goml
diff --git a/tests/rustdoc-gui/basic-code.goml b/tests/rustdoc-gui/basic-code.goml
new file mode 100644
index 000000000..971c2f948
--- /dev/null
+++ b/tests/rustdoc-gui/basic-code.goml
@@ -0,0 +1,6 @@
+// Small test to ensure the "src-line-numbers" element is only present once on
+// the page.
+goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+click: ".srclink"
+wait-for: ".src-line-numbers"
+assert-count: (".src-line-numbers", 1)
diff --git a/src/test/rustdoc-gui/check-code-blocks-margin.goml b/tests/rustdoc-gui/check-code-blocks-margin.goml
index c2cec0020..c2cec0020 100644
--- a/src/test/rustdoc-gui/check-code-blocks-margin.goml
+++ b/tests/rustdoc-gui/check-code-blocks-margin.goml
diff --git a/src/test/rustdoc-gui/check-stab-in-docblock.goml b/tests/rustdoc-gui/check-stab-in-docblock.goml
index 266fa9997..266fa9997 100644
--- a/src/test/rustdoc-gui/check-stab-in-docblock.goml
+++ b/tests/rustdoc-gui/check-stab-in-docblock.goml
diff --git a/src/test/rustdoc-gui/check_info_sign_position.goml b/tests/rustdoc-gui/check_info_sign_position.goml
index f36e73fc5..f36e73fc5 100644
--- a/src/test/rustdoc-gui/check_info_sign_position.goml
+++ b/tests/rustdoc-gui/check_info_sign_position.goml
diff --git a/src/test/rustdoc-gui/code-blocks-overflow.goml b/tests/rustdoc-gui/code-blocks-overflow.goml
index fbf0e890b..fbf0e890b 100644
--- a/src/test/rustdoc-gui/code-blocks-overflow.goml
+++ b/tests/rustdoc-gui/code-blocks-overflow.goml
diff --git a/tests/rustdoc-gui/code-color.goml b/tests/rustdoc-gui/code-color.goml
new file mode 100644
index 000000000..cb550a457
--- /dev/null
+++ b/tests/rustdoc-gui/code-color.goml
@@ -0,0 +1,24 @@
+// The ayu theme has a different color for the "<code>" tags in the doc blocks. We need to
+// check that the rule isn't applied on other "<code>" elements.
+//
+// While we're at it, we also check it for the other themes.
+goto: "file://" + |DOC_PATH| + "/test_docs/fn.foo.html"
+// If the text isn't displayed, the browser doesn't compute color style correctly...
+show-text: true
+
+define-function: (
+    "check-colors",
+    (theme, doc_code_color, doc_inline_code_color),
+    block {
+        // Set the theme.
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        // We reload the page so the local storage settings are being used.
+        reload:
+        assert-css: (".docblock pre > code", {"color": |doc_code_color|}, ALL)
+        assert-css: (".docblock > p > code", {"color": |doc_inline_code_color|}, ALL)
+    },
+)
+
+call-function: ("check-colors", ("ayu", "rgb(230, 225, 207)", "rgb(255, 180, 84)"))
+call-function: ("check-colors", ("dark", "rgb(221, 221, 221)", "rgb(221, 221, 221)"))
+call-function: ("check-colors", ("light", "rgb(0, 0, 0)", "rgb(0, 0, 0)"))
diff --git a/src/test/rustdoc-gui/code-sidebar-toggle.goml b/tests/rustdoc-gui/code-sidebar-toggle.goml
index 00a0ea1e1..df665bd46 100644
--- a/src/test/rustdoc-gui/code-sidebar-toggle.goml
+++ b/tests/rustdoc-gui/code-sidebar-toggle.goml
@@ -1,7 +1,7 @@
 // This test checks that the source code pages sidebar toggle is working as expected.
 goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
 click: ".srclink"
-wait-for: "#sidebar-toggle"
-click: "#sidebar-toggle"
+wait-for: "#src-sidebar-toggle"
+click: "#src-sidebar-toggle"
 fail: true
 assert-css: ("#source-sidebar", { "left": "-300px" })
diff --git a/src/test/rustdoc-gui/code-tags.goml b/tests/rustdoc-gui/code-tags.goml
index 94c1a6525..8561f537f 100644
--- a/src/test/rustdoc-gui/code-tags.goml
+++ b/tests/rustdoc-gui/code-tags.goml
@@ -9,16 +9,16 @@ size: (1080, 600)
 // Check that their content is inside <pre><code>
 assert-count: (".example-wrap pre > code", 4)
 // Check that function signature is inside <pre><code>
-assert: "pre.rust.fn > code"
+assert: ".item-decl pre.rust > code"
 
 goto: "file://" + |DOC_PATH| + "/test_docs/struct.Foo.html"
-assert: "pre.rust.struct > code"
+assert: ".item-decl pre.rust > code"
 
 goto: "file://" + |DOC_PATH| + "/test_docs/enum.AnEnum.html"
-assert: "pre.rust.enum > code"
+assert: ".item-decl pre.rust > code"
 
 goto: "file://" + |DOC_PATH| + "/test_docs/trait.AnotherOne.html"
-assert: "pre.rust.trait > code"
+assert: ".item-decl pre.rust > code"
 
 goto: "file://" + |DOC_PATH| + "/test_docs/type.SomeType.html"
-assert: "pre.rust.typedef > code"
+assert: ".item-decl pre.rust > code"
diff --git a/tests/rustdoc-gui/codeblock-sub.goml b/tests/rustdoc-gui/codeblock-sub.goml
new file mode 100644
index 000000000..cbd314d27
--- /dev/null
+++ b/tests/rustdoc-gui/codeblock-sub.goml
@@ -0,0 +1,5 @@
+// Test that code blocks nested within <sub> do not have a line height of 0.
+goto: "file://" + |DOC_PATH| + "/test_docs/codeblock_sub/index.html"
+
+store-property: (codeblock_sub_1, "#codeblock-sub-1", "offsetHeight")
+assert-property-false: ("#codeblock-sub-3", { "offsetHeight": |codeblock_sub_1| })
diff --git a/src/test/rustdoc-gui/codeblock-tooltip.goml b/tests/rustdoc-gui/codeblock-tooltip.goml
index 4d923be3e..a3ef4e77b 100644
--- a/src/test/rustdoc-gui/codeblock-tooltip.goml
+++ b/tests/rustdoc-gui/codeblock-tooltip.goml
@@ -5,131 +5,128 @@ show-text: true
 define-function: (
     "check-colors",
     (theme, background, color, border),
-    [
+    block {
         // Setting the theme.
-        ("local-storage", {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}),
-        ("reload"),
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
 
         // compile_fail block
-        ("assert-css", (
+        assert-css: (
             ".docblock .example-wrap.compile_fail .tooltip",
             {"color": "rgba(255, 0, 0, 0.5)"},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".docblock .example-wrap.compile_fail",
             {"border-left": "2px solid rgba(255, 0, 0, 0.5)"},
-        )),
+        )
 
-        ("move-cursor-to", ".docblock .example-wrap.compile_fail"),
+        move-cursor-to: ".docblock .example-wrap.compile_fail .tooltip"
 
-        ("assert-css", (
+        assert-css: (
             ".docblock .example-wrap.compile_fail .tooltip",
             {"color": "rgb(255, 0, 0)"},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".docblock .example-wrap.compile_fail",
             {"border-left": "2px solid rgb(255, 0, 0)"},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".docblock .example-wrap.compile_fail .tooltip::after",
             {
                 "content": '"This example deliberately fails to compile"',
-                "text-align": "center",
                 "padding": "5px 3px 3px",
                 "background-color": |background|,
                 "color": |color|,
                 "border": "1px solid " + |border|,
             },
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".docblock .example-wrap.compile_fail .tooltip::before",
             {
                 "border-width": "5px",
                 "border-style": "solid",
                 "border-color": "rgba(0, 0, 0, 0) " + |background| + " rgba(0, 0, 0, 0) rgba(0, 0, 0, 0)",
             },
-        )),
+        )
 
         // should_panic block
-        ("assert-css", (
+        assert-css: (
             ".docblock .example-wrap.should_panic .tooltip",
             {"color": "rgba(255, 0, 0, 0.5)"},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".docblock .example-wrap.should_panic",
             {"border-left": "2px solid rgba(255, 0, 0, 0.5)"},
-        )),
+        )
 
-        ("move-cursor-to", ".docblock .example-wrap.should_panic"),
+        move-cursor-to: ".docblock .example-wrap.should_panic .tooltip"
 
-        ("assert-css", (
+        assert-css: (
             ".docblock .example-wrap.should_panic .tooltip",
             {"color": "rgb(255, 0, 0)"},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".docblock .example-wrap.should_panic",
             {"border-left": "2px solid rgb(255, 0, 0)"},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".docblock .example-wrap.should_panic .tooltip::after",
             {
                 "content": '"This example panics"',
-                "text-align": "center",
                 "padding": "5px 3px 3px",
                 "background-color": |background|,
                 "color": |color|,
                 "border": "1px solid " + |border|,
             },
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".docblock .example-wrap.should_panic .tooltip::before",
             {
                 "border-width": "5px",
                 "border-style": "solid",
                 "border-color": "rgba(0, 0, 0, 0) " + |background| + " rgba(0, 0, 0, 0) rgba(0, 0, 0, 0)",
             },
-        )),
+        )
 
         // ignore block
-        ("assert-css", (
+        assert-css: (
             ".docblock .example-wrap.ignore .tooltip",
             {"color": "rgba(255, 142, 0, 0.6)"},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".docblock .example-wrap.ignore",
             {"border-left": "2px solid rgba(255, 142, 0, 0.6)"},
-        )),
+        )
 
-        ("move-cursor-to", ".docblock .example-wrap.ignore"),
+        move-cursor-to: ".docblock .example-wrap.ignore .tooltip"
 
-        ("assert-css", (
+        assert-css: (
             ".docblock .example-wrap.ignore .tooltip",
             {"color": "rgb(255, 142, 0)"},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".docblock .example-wrap.ignore",
             {"border-left": "2px solid rgb(255, 142, 0)"},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".docblock .example-wrap.ignore .tooltip::after",
             {
                 "content": '"This example is not tested"',
-                "text-align": "center",
                 "padding": "5px 3px 3px",
                 "background-color": |background|,
                 "color": |color|,
                 "border": "1px solid " + |border|,
             },
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".docblock .example-wrap.ignore .tooltip::before",
             {
                 "border-width": "5px",
                 "border-style": "solid",
                 "border-color": "rgba(0, 0, 0, 0) " + |background| + " rgba(0, 0, 0, 0) rgba(0, 0, 0, 0)",
             },
-        )),
-    ],
+        )
+    },
 )
 
 call-function: ("check-colors", {
diff --git a/src/test/rustdoc-gui/cursor.goml b/tests/rustdoc-gui/cursor.goml
index b2e91cb81..59b139797 100644
--- a/src/test/rustdoc-gui/cursor.goml
+++ b/tests/rustdoc-gui/cursor.goml
@@ -12,8 +12,8 @@ write: (".search-input", "Foo")
 // To be SURE that the search will be run.
 press-key: 'Enter'
 // Waiting for the search results to appear...
-wait-for: "#titles"
-assert-css: ("#titles > button", {"cursor": "pointer"})
+wait-for: "#search-tabs"
+assert-css: ("#search-tabs > button", {"cursor": "pointer"})
 
 // mobile sidebar toggle button
 size: (500, 700)
@@ -21,4 +21,4 @@ assert-css: (".sidebar-menu-toggle", {"cursor": "pointer"})
 
 // the sidebar toggle button on the source code pages
 goto: "file://" + |DOC_PATH| + "/src/lib2/lib.rs.html"
-assert-css: ("#sidebar-toggle > button", {"cursor": "pointer"})
+assert-css: ("#src-sidebar-toggle > button", {"cursor": "pointer"})
diff --git a/src/test/rustdoc-gui/default-settings.goml b/tests/rustdoc-gui/default-settings.goml
index ab27b001e..ab27b001e 100644
--- a/src/test/rustdoc-gui/default-settings.goml
+++ b/tests/rustdoc-gui/default-settings.goml
diff --git a/tests/rustdoc-gui/docblock-big-code-mobile.goml b/tests/rustdoc-gui/docblock-big-code-mobile.goml
new file mode 100644
index 000000000..3ce921c2c
--- /dev/null
+++ b/tests/rustdoc-gui/docblock-big-code-mobile.goml
@@ -0,0 +1,13 @@
+// If we have a long `<code>`, we need to ensure that it'll be fully displayed on mobile, meaning
+// that it'll be on two lines.
+emulate: "iPhone 8" // it has the following size: (375, 667)
+goto: "file://" + |DOC_PATH| + "/test_docs/long_code_block/index.html"
+// We now check that the block is on two lines:
+show-text: true // We need to enable text draw to be able to have the "real" size
+// Little explanations for this test: if the text wasn't displayed on two lines, it would take
+// around 20px (which is the font size).
+assert-property: (".docblock p > code", {"offsetHeight": "44"})
+
+// Same check, but where the long code block is also a link
+goto: "file://" + |DOC_PATH| + "/test_docs/long_code_block_link/index.html"
+assert-property: (".docblock p > a > code", {"offsetHeight": "44"})
diff --git a/tests/rustdoc-gui/docblock-code-block-line-number.goml b/tests/rustdoc-gui/docblock-code-block-line-number.goml
new file mode 100644
index 000000000..69bcf5339
--- /dev/null
+++ b/tests/rustdoc-gui/docblock-code-block-line-number.goml
@@ -0,0 +1,71 @@
+// Checks that the setting "line numbers" is working as expected.
+goto: "file://" + |DOC_PATH| + "/test_docs/fn.foo.html"
+
+// Otherwise, we can't check text color
+show-text: true
+
+// We check that without this setting, there is no line number displayed.
+assert-false: "pre.example-line-numbers"
+
+// Let's now check some CSS properties...
+define-function: (
+    "check-colors",
+    (theme, color),
+    block {
+        // We now set the setting to show the line numbers on code examples.
+        local-storage: {
+            "rustdoc-theme": |theme|,
+            "rustdoc-use-system-theme": "false",
+            "rustdoc-line-numbers": "true"
+        }
+        // We reload to make the line numbers appear and change theme.
+        reload:
+        // We wait for them to be added into the DOM by the JS...
+        wait-for: "pre.example-line-numbers"
+        // If the test didn't fail, it means that it was found!
+        assert-css: (
+            "pre.example-line-numbers",
+            {
+                "color": |color|,
+                "margin": "0px",
+                "padding": "14px 8px",
+                "text-align": "right",
+            },
+            ALL,
+        )
+    },
+)
+call-function: ("check-colors", {
+    "theme": "ayu",
+    "color": "rgb(92, 103, 115)",
+})
+call-function: ("check-colors", {
+    "theme": "dark",
+    "color": "rgb(59, 145, 226)",
+})
+call-function: ("check-colors", {
+    "theme": "light",
+    "color": "rgb(198, 126, 45)",
+})
+
+// The first code block has two lines so let's check its `<pre>` elements lists both of them.
+assert-text: ("pre.example-line-numbers", "1\n2")
+
+// Now, try changing the setting dynamically. We'll turn it off, using the settings menu,
+// and make sure it goes away.
+
+// First, open the settings menu.
+click: "#settings-menu"
+wait-for: "#settings"
+assert-css: ("#settings", {"display": "block"})
+
+// Then, click the toggle button.
+click: "input#line-numbers"
+wait-for: 100 // wait-for-false does not exist
+assert-false: "pre.example-line-numbers"
+assert-local-storage: {"rustdoc-line-numbers": "false" }
+
+// Finally, turn it on again.
+click: "input#line-numbers"
+wait-for: "pre.example-line-numbers"
+assert-local-storage: {"rustdoc-line-numbers": "true" }
diff --git a/src/test/rustdoc-gui/docblock-details.goml b/tests/rustdoc-gui/docblock-details.goml
index 9ae571efb..9ae571efb 100644
--- a/src/test/rustdoc-gui/docblock-details.goml
+++ b/tests/rustdoc-gui/docblock-details.goml
diff --git a/src/test/rustdoc-gui/docblock-table-overflow.goml b/tests/rustdoc-gui/docblock-table-overflow.goml
index d8670089a..d8670089a 100644
--- a/src/test/rustdoc-gui/docblock-table-overflow.goml
+++ b/tests/rustdoc-gui/docblock-table-overflow.goml
diff --git a/tests/rustdoc-gui/docblock-table.goml b/tests/rustdoc-gui/docblock-table.goml
new file mode 100644
index 000000000..3dcb8abd4
--- /dev/null
+++ b/tests/rustdoc-gui/docblock-table.goml
@@ -0,0 +1,52 @@
+// This test checks the appearance of the tables in the doc comments.
+goto: "file://" + |DOC_PATH| + "/test_docs/doc_block_table/struct.DocBlockTable.html#method.func"
+
+compare-elements-css: (".impl-items .docblock table th", ".top-doc .docblock table th", ["border"])
+compare-elements-css: (".impl-items .docblock table td", ".top-doc .docblock table td", ["border"])
+
+define-function: (
+    "check-colors",
+    (theme, border_color, zebra_stripe_color),
+    block {
+        local-storage: {"rustdoc-use-system-theme": "false", "rustdoc-theme": |theme|}
+        reload:
+        assert-css: (".top-doc .docblock table tbody tr:nth-child(1)", {
+            "background-color": "rgba(0, 0, 0, 0)",
+        })
+        assert-css: (".top-doc .docblock table tbody tr:nth-child(2)", {
+            "background-color": |zebra_stripe_color|,
+        })
+        assert-css: (".top-doc .docblock table tbody tr:nth-child(3)", {
+            "background-color": "rgba(0, 0, 0, 0)",
+        })
+        assert-css: (".top-doc .docblock table tbody tr:nth-child(4)", {
+            "background-color": |zebra_stripe_color|,
+        })
+        assert-css: (".top-doc .docblock table td", {
+            "border-style": "solid",
+            "border-width": "1px",
+            "border-color": |border_color|,
+        })
+        assert-css: (".top-doc .docblock table th", {
+            "border-style": "solid",
+            "border-width": "1px",
+            "border-color": |border_color|,
+        })
+    }
+)
+
+call-function: ("check-colors", {
+    "theme": "dark",
+    "border_color": "rgb(224, 224, 224)",
+    "zebra_stripe_color": "rgb(42, 42, 42)",
+})
+call-function: ("check-colors", {
+    "theme": "ayu",
+    "border_color": "rgb(92, 103, 115)",
+    "zebra_stripe_color": "rgb(25, 31, 38)",
+})
+call-function: ("check-colors", {
+    "theme": "light",
+    "border_color": "rgb(224, 224, 224)",
+    "zebra_stripe_color": "rgb(245, 245, 245)",
+})
diff --git a/src/test/rustdoc-gui/duplicate-macro-reexport.goml b/tests/rustdoc-gui/duplicate-macro-reexport.goml
index 496203c12..496203c12 100644
--- a/src/test/rustdoc-gui/duplicate-macro-reexport.goml
+++ b/tests/rustdoc-gui/duplicate-macro-reexport.goml
diff --git a/src/test/rustdoc-gui/enum-variants.goml b/tests/rustdoc-gui/enum-variants.goml
index 8dfc49285..8dfc49285 100644
--- a/src/test/rustdoc-gui/enum-variants.goml
+++ b/tests/rustdoc-gui/enum-variants.goml
diff --git a/src/test/rustdoc-gui/escape-key.goml b/tests/rustdoc-gui/escape-key.goml
index 78e9f2309..5d80d2496 100644
--- a/src/test/rustdoc-gui/escape-key.goml
+++ b/tests/rustdoc-gui/escape-key.goml
@@ -5,7 +5,7 @@ goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
 write: (".search-input", "test")
 // To be SURE that the search will be run.
 press-key: 'Enter'
-wait-for: "#search h1" // The search element is empty before the first search 
+wait-for: "#search h1" // The search element is empty before the first search
 // Check that the currently displayed element is search.
 wait-for: "#alternative-display #search"
 assert-attribute: ("#main-content", {"class": "content hidden"})
diff --git a/src/test/rustdoc-gui/font-weight.goml b/tests/rustdoc-gui/font-weight.goml
index 8ba005b0c..fafb15631 100644
--- a/src/test/rustdoc-gui/font-weight.goml
+++ b/tests/rustdoc-gui/font-weight.goml
@@ -20,7 +20,7 @@ goto: "file://" + |DOC_PATH| + "/lib2/trait.Trait.html"
 // This is a complex selector, so here's how it works:
 //
 // * //*[@class='item-decl'] — selects element of any tag with classes docblock and item-decl
-// * /pre[@class='rust trait'] — selects immediate child with tag pre and classes rust and trait
+// * /pre[@class='rust'] — selects immediate child with tag pre and class rust
 // * /code — selects immediate child with tag code
 // * /a[@class='constant'] — selects immediate child with tag a and class constant
 // * //text() — selects child that is text node
@@ -29,11 +29,11 @@ goto: "file://" + |DOC_PATH| + "/lib2/trait.Trait.html"
 // This uses '/parent::*' as a proxy for the style of the text node.
 // We can't just select the '<a>' because intermediate tags could be added.
 assert-count: (
-    "//*[@class='item-decl']/pre[@class='rust trait']/code/a[@class='constant']//text()/parent::*",
+    "//*[@class='item-decl']/pre[@class='rust']/code/a[@class='constant']//text()/parent::*",
     1,
 )
 assert-css: (
-    "//*[@class='item-decl']/pre[@class='rust trait']/code/a[@class='constant']//text()/parent::*",
+    "//*[@class='item-decl']/pre[@class='rust']/code/a[@class='constant']//text()/parent::*",
     {"font-weight": "400"},
 )
 
diff --git a/src/test/rustdoc-gui/hash-item-expansion.goml b/tests/rustdoc-gui/hash-item-expansion.goml
index 3cf94f624..3cf94f624 100644
--- a/src/test/rustdoc-gui/hash-item-expansion.goml
+++ b/tests/rustdoc-gui/hash-item-expansion.goml
diff --git a/tests/rustdoc-gui/headers-color.goml b/tests/rustdoc-gui/headers-color.goml
new file mode 100644
index 000000000..92cf050a5
--- /dev/null
+++ b/tests/rustdoc-gui/headers-color.goml
@@ -0,0 +1,70 @@
+// This test check for headers text and background colors for the different themes.
+
+define-function: (
+    "check-colors",
+    (theme, color, code_header_color, focus_background_color, headings_color),
+    block {
+        goto: "file://" + |DOC_PATH| + "/test_docs/struct.Foo.html"
+        // This is needed so that the text color is computed.
+        show-text: true
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        assert-css: (
+            ".impl",
+            {"color": |color|, "background-color": "rgba(0, 0, 0, 0)"},
+            ALL,
+        )
+        assert-css: (
+            ".impl .code-header",
+            {"color": |code_header_color|, "background-color": "rgba(0, 0, 0, 0)"},
+            ALL,
+        )
+        goto: "file://" + |DOC_PATH| + "/test_docs/struct.Foo.html#impl-Foo"
+        assert-css: (
+            "#impl-Foo",
+            {"color": |color|, "background-color": |focus_background_color|},
+        )
+        goto: "file://" + |DOC_PATH| + "/test_docs/struct.Foo.html#method.must_use"
+        assert-css: (
+            "#method\.must_use",
+            {"color": |color|, "background-color": |focus_background_color|},
+            ALL,
+        )
+        goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+        assert-css: (".small-section-header a", {"color": |color|}, ALL)
+        goto: "file://" + |DOC_PATH| + "/test_docs/struct.HeavilyDocumentedStruct.html"
+        // We select headings (h2, h3, h...).
+        assert-css: (".docblock > :not(p) > a", {"color": |headings_color|}, ALL)
+    },
+)
+
+call-function: (
+    "check-colors",
+    {
+        "theme": "ayu",
+        "color": "rgb(197, 197, 197)",
+        "code_header_color": "rgb(230, 225, 207)",
+        "focus_background_color": "rgba(255, 236, 164, 0.06)",
+        "headings_color": "rgb(57, 175, 215)",
+    },
+)
+call-function: (
+    "check-colors",
+    {
+        "theme": "dark",
+        "color": "rgb(221, 221, 221)",
+        "code_header_color": "rgb(221, 221, 221)",
+        "focus_background_color": "rgb(73, 74, 61)",
+        "headings_color": "rgb(210, 153, 29)",
+    },
+)
+call-function: (
+    "check-colors",
+    {
+        "theme": "light",
+        "color": "rgb(0, 0, 0)",
+        "code_header_color": "rgb(0, 0, 0)",
+        "focus_background_color": "rgb(253, 255, 211)",
+        "headings_color": "rgb(56, 115, 173)",
+    },
+)
diff --git a/src/test/rustdoc-gui/headings.goml b/tests/rustdoc-gui/headings.goml
index 85e17ca95..e4ba5f124 100644
--- a/src/test/rustdoc-gui/headings.goml
+++ b/tests/rustdoc-gui/headings.goml
@@ -13,7 +13,7 @@
 // 14px  0.875rem
 goto: "file://" + |DOC_PATH| + "/test_docs/struct.HeavilyDocumentedStruct.html"
 
-assert-css: ("h1.fqn", {"font-size": "24px"})
+assert-css: (".main-heading h1", {"font-size": "24px"})
 
 assert-css: ("h2#top-doc-prose-title", {"font-size": "22px"})
 assert-css: ("h2#top-doc-prose-title", {"border-bottom-width": "1px"})
@@ -52,7 +52,7 @@ assert-css: ("h6#sub-sub-heading-for-struct-impl-item-doc", {"font-size": "14px"
 
 goto: "file://" + |DOC_PATH| + "/test_docs/enum.HeavilyDocumentedEnum.html"
 
-assert-css: ("h1.fqn", {"font-size": "24px"})
+assert-css: (".main-heading h1", {"font-size": "24px"})
 
 assert-css: ("h2#top-doc-prose-title", {"font-size": "22px"})
 assert-css: ("h2#top-doc-prose-title", {"border-bottom-width": "1px"})
@@ -111,7 +111,7 @@ assert-css: ("//ul[@class='block mod']/preceding-sibling::h3", {"border-bottom-w
 
 goto: "file://" + |DOC_PATH| + "/test_docs/union.HeavilyDocumentedUnion.html"
 
-assert-css: ("h1.fqn", {"font-size": "24px"})
+assert-css: (".main-heading h1", {"font-size": "24px"})
 
 assert-css: ("h2#top-doc-prose-title", {"font-size": "22px"})
 assert-css: ("h2#top-doc-prose-title", {"border-bottom-width": "1px"})
@@ -143,7 +143,7 @@ assert-css: ("h6#sub-heading-for-union-impl-item-doc", {"border-bottom-width": "
 
 goto: "file://" + |DOC_PATH| + "/test_docs/macro.heavily_documented_macro.html"
 
-assert-css: ("h1.fqn", {"font-size": "24px"})
+assert-css: (".main-heading h1", {"font-size": "24px"})
 
 assert-css: ("h2#top-doc-prose-title", {"font-size": "22px"})
 assert-css: ("h2#top-doc-prose-title", {"border-bottom-width": "1px"})
@@ -157,38 +157,38 @@ goto: "file://" + |DOC_PATH| + "/test_docs/struct.HeavilyDocumentedStruct.html"
 define-function: (
     "check-colors",
     (theme, heading_color, small_heading_color, heading_border_color),
-    [
-        ("local-storage", {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}),
-        ("reload"),
-        ("assert-css", (
+    block {
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        assert-css: (
             ".top-doc .docblock h2",
             {"color": |heading_color|, "border-bottom": "1px solid " + |heading_border_color|},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".top-doc .docblock h3",
             {"color": |heading_color|, "border-bottom": "1px solid " + |heading_border_color|},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".top-doc .docblock h4",
             {"color": |heading_color|, "border-bottom": "1px solid " + |heading_border_color|},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             ".top-doc .docblock h5",
             {"color": |small_heading_color|, "border-bottom-width": "0px"},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             "#implementations-list .docblock h4",
             {"color": |heading_color|, "border-bottom-width": "0px"},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             "#implementations-list .docblock h5",
             {"color": |small_heading_color|, "border-bottom-width": "0px"},
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
             "#implementations-list .docblock h6",
             {"color": |small_heading_color|, "border-bottom-width": "0px"},
-        )),
-    ],
+        )
+    },
 )
 call-function: (
     "check-colors",
@@ -221,11 +221,11 @@ call-function: (
 define-function: (
     "check-since-color",
     (theme),
-    [
-        ("local-storage", {"rustdoc-theme": |theme|}),
-        ("reload"),
-        ("assert-css", (".since", {"color": "rgb(128, 128, 128)"}, ALL)),
-    ],
+    block {
+        local-storage: {"rustdoc-theme": |theme|}
+        reload:
+        assert-css: (".since", {"color": "rgb(128, 128, 128)"}, ALL)
+    },
 )
 
 goto: "file://" + |DOC_PATH| + "/staged_api/struct.Foo.html"
diff --git a/src/test/rustdoc-gui/help-page.goml b/tests/rustdoc-gui/help-page.goml
index 799ba851c..5f4c1ba2f 100644
--- a/src/test/rustdoc-gui/help-page.goml
+++ b/tests/rustdoc-gui/help-page.goml
@@ -18,18 +18,17 @@ show-text: true
 define-function: (
     "check-colors",
     (theme, color, background, box_shadow),
-    [
+    block {
         // Setting the theme.
-        ("local-storage", {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}),
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
         // We reload the page so the local storage settings are being used.
-        ("reload"),
-        ("assert-css", ("#help kbd", {
+        reload:
+        assert-css: ("#help kbd", {
             "color": |color|,
             "background-color": |background|,
             "box-shadow": |box_shadow| + " 0px -1px 0px 0px inset",
-            "cursor": "default",
-        }, ALL)),
-    ],
+        }, ALL)
+    },
 )
 
 call-function: ("check-colors", {
@@ -40,7 +39,7 @@ call-function: ("check-colors", {
 })
 call-function: ("check-colors", {
     "theme": "dark",
-    "color": "rgb(221, 221, 221)",
+    "color": "rgb(0, 0, 0)",
     "background": "rgb(250, 251, 252)",
     "box_shadow": "rgb(198, 203, 209)",
 })
@@ -62,3 +61,12 @@ click: "#help-button > a"
 assert-css: ("#help", {"display": "none"})
 compare-elements-property-false: (".sub", "#help", ["offsetWidth"])
 compare-elements-position-false: (".sub", "#help", ("x"))
+
+// This test ensures that the "the rustdoc book" anchor link within the help popover works.
+goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+size: (1000, 1000) // Popover only appears when the screen width is >700px.
+assert-false: "#help"
+click: "#help-button > a"
+click: ".popover a[href='https://doc.rust-lang.org/rustdoc/']"
+wait-for: 2000
+assert-document-property: {"URL": "https://doc.rust-lang.org/rustdoc/"}
diff --git a/tests/rustdoc-gui/highlight-colors.goml b/tests/rustdoc-gui/highlight-colors.goml
new file mode 100644
index 000000000..b182150a5
--- /dev/null
+++ b/tests/rustdoc-gui/highlight-colors.goml
@@ -0,0 +1,94 @@
+// This test checks the highlight colors in the source code pages.
+goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html"
+show-text: true
+
+define-function: (
+    "check-colors",
+    (
+        theme,
+        kw,
+        kw2,
+        prelude_ty,
+        prelude_val,
+        lifetime,
+        number,
+        string,
+        bool_val,
+        self,
+        attr,
+        macro,
+        question_mark,
+        comment,
+        doc_comment,
+    ),
+    block {
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        assert-css: ("pre.rust .kw", {"color": |kw|}, ALL)
+        assert-css: ("pre.rust .kw-2", {"color": |kw2|}, ALL)
+        assert-css: ("pre.rust .prelude-ty", {"color": |prelude_ty|}, ALL)
+        assert-css: ("pre.rust .prelude-val", {"color": |prelude_val|}, ALL)
+        assert-css: ("pre.rust .lifetime", {"color": |lifetime|}, ALL)
+        assert-css: ("pre.rust .number", {"color": |number|}, ALL)
+        assert-css: ("pre.rust .string", {"color": |string|}, ALL)
+        assert-css: ("pre.rust .bool-val", {"color": |bool_val|}, ALL)
+        assert-css: ("pre.rust .self", {"color": |self|}, ALL)
+        assert-css: ("pre.rust .attr", {"color": |attr|}, ALL)
+        assert-css: ("pre.rust .macro", {"color": |macro|}, ALL)
+        assert-css: ("pre.rust .question-mark", {"color": |question_mark|}, ALL)
+        assert-css: ("pre.rust .comment", {"color": |comment|}, ALL)
+        assert-css: ("pre.rust .doccomment", {"color": |doc_comment|}, ALL)
+    },
+)
+
+call-function: ("check-colors", {
+    "theme": "ayu",
+    "kw": "rgb(255, 119, 51)",
+    "kw2": "rgb(255, 119, 51)",
+    "prelude_ty": "rgb(105, 242, 223)",
+    "prelude_val": "rgb(255, 119, 51)",
+    "lifetime": "rgb(255, 119, 51)",
+    "number": "rgb(184, 204, 82)",
+    "string": "rgb(184, 204, 82)",
+    "bool_val": "rgb(255, 119, 51)",
+    "self": "rgb(54, 163, 217)",
+    "attr": "rgb(230, 225, 207)",
+    "macro": "rgb(163, 122, 204)",
+    "question_mark": "rgb(255, 144, 17)",
+    "comment": "rgb(120, 135, 151)",
+    "doc_comment": "rgb(161, 172, 136)",
+})
+call-function: ("check-colors", {
+    "theme": "dark",
+    "kw": "rgb(171, 138, 193)",
+    "kw2": "rgb(118, 154, 203)",
+    "prelude_ty": "rgb(118, 154, 203)",
+    "prelude_val": "rgb(238, 104, 104)",
+    "lifetime": "rgb(217, 127, 38)",
+    "number": "rgb(131, 163, 0)",
+    "string": "rgb(131, 163, 0)",
+    "bool_val": "rgb(238, 104, 104)",
+    "self": "rgb(238, 104, 104)",
+    "attr": "rgb(238, 104, 104)",
+    "macro": "rgb(62, 153, 159)",
+    "question_mark": "rgb(255, 144, 17)",
+    "comment": "rgb(141, 141, 139)",
+    "doc_comment": "rgb(140, 163, 117)",
+})
+call-function: ("check-colors", {
+    "theme": "light",
+    "kw": "rgb(137, 89, 168)",
+    "kw2": "rgb(66, 113, 174)",
+    "prelude_ty": "rgb(66, 113, 174)",
+    "prelude_val": "rgb(200, 40, 41)",
+    "lifetime": "rgb(183, 101, 20)",
+    "number": "rgb(113, 140, 0)",
+    "string": "rgb(113, 140, 0)",
+    "bool_val": "rgb(200, 40, 41)",
+    "self": "rgb(200, 40, 41)",
+    "attr": "rgb(200, 40, 41)",
+    "macro": "rgb(62, 153, 159)",
+    "question_mark": "rgb(255, 144, 17)",
+    "comment": "rgb(142, 144, 140)",
+    "doc_comment": "rgb(77, 77, 76)",
+})
diff --git a/src/test/rustdoc-gui/huge-collection-of-constants.goml b/tests/rustdoc-gui/huge-collection-of-constants.goml
index 3ccd33f1c..3ccd33f1c 100644
--- a/src/test/rustdoc-gui/huge-collection-of-constants.goml
+++ b/tests/rustdoc-gui/huge-collection-of-constants.goml
diff --git a/src/test/rustdoc-gui/huge-logo.goml b/tests/rustdoc-gui/huge-logo.goml
index 01f06771c..01f06771c 100644
--- a/src/test/rustdoc-gui/huge-logo.goml
+++ b/tests/rustdoc-gui/huge-logo.goml
diff --git a/src/test/rustdoc-gui/impl-default-expansion.goml b/tests/rustdoc-gui/impl-default-expansion.goml
index c3f9240cc..c3f9240cc 100644
--- a/src/test/rustdoc-gui/impl-default-expansion.goml
+++ b/tests/rustdoc-gui/impl-default-expansion.goml
diff --git a/tests/rustdoc-gui/impl-doc.goml b/tests/rustdoc-gui/impl-doc.goml
new file mode 100644
index 000000000..6caffb9c3
--- /dev/null
+++ b/tests/rustdoc-gui/impl-doc.goml
@@ -0,0 +1,9 @@
+// A docblock on an impl must have a margin to separate it from the contents.
+goto: "file://" + |DOC_PATH| + "/test_docs/struct.TypeWithImplDoc.html"
+
+// The text is about 24px tall, so if there's a margin, then their position will be >24px apart
+compare-elements-position-near-false: (
+    "#implementations-list > .implementors-toggle > .docblock > p",
+    "#implementations-list > .implementors-toggle > .impl-items",
+    {"y": 24}
+)
diff --git a/src/test/rustdoc-gui/implementors.goml b/tests/rustdoc-gui/implementors.goml
index 4999283dc..997c0ed8f 100644
--- a/src/test/rustdoc-gui/implementors.goml
+++ b/tests/rustdoc-gui/implementors.goml
@@ -33,3 +33,9 @@ goto: "file://" + |DOC_PATH| + "/lib2/trait.TraitToReexport.html"
 assert-count: ("#implementors-list .impl", 1)
 goto: "file://" + |DOC_PATH| + "/implementors/trait.TraitToReexport.html"
 assert-count: ("#implementors-list .impl", 1)
+
+// Now check that the link is properly rewritten for a crate called `http`.
+// An older version of rustdoc had a buggy check for absolute links.
+goto: "file://" + |DOC_PATH| + "/http/trait.HttpTrait.html"
+assert-count: ("#implementors-list .impl", 1)
+assert-attribute: ("#implementors-list .impl a.trait", {"href": "../http/trait.HttpTrait.html"})
diff --git a/tests/rustdoc-gui/item-decl-colors.goml b/tests/rustdoc-gui/item-decl-colors.goml
new file mode 100644
index 000000000..c58e3eb7c
--- /dev/null
+++ b/tests/rustdoc-gui/item-decl-colors.goml
@@ -0,0 +1,80 @@
+// This test ensures that the color of the items in the type decl are working as expected.
+
+// We need to disable this check because `implementors/test_docs/trait.TraitWithoutGenerics.js`
+// doesn't exist.
+fail-on-request-error: false
+
+define-function: (
+    "check-colors",
+    (
+        theme,
+        attr_color,
+        trait_color,
+        struct_color,
+        enum_color,
+        primitive_color,
+        constant_color,
+        fn_color,
+        assoc_type_color,
+    ),
+    block {
+        goto: "file://" + |DOC_PATH| + "/test_docs/struct.WithGenerics.html"
+        show-text: true
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        assert-css: (".item-decl .code-attribute", {"color": |attr_color|}, ALL)
+        assert-css: (".item-decl .trait", {"color": |trait_color|}, ALL)
+        // We need to add `code` here because otherwise it would select the parent too.
+        assert-css: (".item-decl code .struct", {"color": |struct_color|}, ALL)
+        assert-css: (".item-decl .enum", {"color": |enum_color|}, ALL)
+        assert-css: (".item-decl .primitive", {"color": |primitive_color|}, ALL)
+
+        goto: "file://" + |DOC_PATH| + "/test_docs/trait.TraitWithoutGenerics.html"
+        assert-css: (".item-decl .constant", {"color": |constant_color|}, ALL)
+        assert-css: (".item-decl .fn", {"color": |fn_color|}, ALL)
+        assert-css: (".item-decl .associatedtype", {"color": |assoc_type_color|}, ALL)
+    },
+)
+
+call-function: (
+    "check-colors",
+    {
+        "theme": "ayu",
+        "attr_color": "rgb(153, 153, 153)",
+        "trait_color": "rgb(57, 175, 215)",
+        "struct_color": "rgb(255, 160, 165)",
+        "enum_color": "rgb(255, 160, 165)",
+        "primitive_color": "rgb(255, 160, 165)",
+        "constant_color": "rgb(57, 175, 215)",
+        "fn_color": "rgb(253, 214, 135)",
+        "assoc_type_color": "rgb(57, 175, 215)",
+    },
+)
+call-function: (
+    "check-colors",
+    {
+        "theme": "dark",
+        "attr_color": "rgb(153, 153, 153)",
+        "trait_color": "rgb(183, 140, 242)",
+        "struct_color": "rgb(45, 191, 184)",
+        "enum_color": "rgb(45, 191, 184)",
+        "primitive_color": "rgb(45, 191, 184)",
+        "constant_color": "rgb(210, 153, 29)",
+        "fn_color": "rgb(43, 171, 99)",
+        "assoc_type_color": "rgb(210, 153, 29)",
+    },
+)
+call-function: (
+    "check-colors",
+    {
+        "theme": "light",
+        "attr_color": "rgb(153, 153, 153)",
+        "trait_color": "rgb(110, 79, 201)",
+        "struct_color": "rgb(173, 55, 138)",
+        "enum_color": "rgb(173, 55, 138)",
+        "primitive_color": "rgb(173, 55, 138)",
+        "constant_color": "rgb(56, 115, 173)",
+        "fn_color": "rgb(173, 124, 55)",
+        "assoc_type_color": "rgb(56, 115, 173)",
+    },
+)
diff --git a/src/test/rustdoc-gui/item-info-alignment.goml b/tests/rustdoc-gui/item-info-alignment.goml
index 94b52f005..94b52f005 100644
--- a/src/test/rustdoc-gui/item-info-alignment.goml
+++ b/tests/rustdoc-gui/item-info-alignment.goml
diff --git a/src/test/rustdoc-gui/item-info-overflow.goml b/tests/rustdoc-gui/item-info-overflow.goml
index 8ea14621c..8ea14621c 100644
--- a/src/test/rustdoc-gui/item-info-overflow.goml
+++ b/tests/rustdoc-gui/item-info-overflow.goml
diff --git a/src/test/rustdoc-gui/item-info.goml b/tests/rustdoc-gui/item-info.goml
index 6780dfca6..6780dfca6 100644
--- a/src/test/rustdoc-gui/item-info.goml
+++ b/tests/rustdoc-gui/item-info.goml
diff --git a/src/test/rustdoc-gui/item-summary-table.goml b/tests/rustdoc-gui/item-summary-table.goml
index 2a92e9da5..2a92e9da5 100644
--- a/src/test/rustdoc-gui/item-summary-table.goml
+++ b/tests/rustdoc-gui/item-summary-table.goml
diff --git a/src/test/rustdoc-gui/javascript-disabled.goml b/tests/rustdoc-gui/javascript-disabled.goml
index edf179d0d..edf179d0d 100644
--- a/src/test/rustdoc-gui/javascript-disabled.goml
+++ b/tests/rustdoc-gui/javascript-disabled.goml
diff --git a/src/test/rustdoc-gui/jump-to-def-background.goml b/tests/rustdoc-gui/jump-to-def-background.goml
index b65faf13d..8ee3ccf4a 100644
--- a/src/test/rustdoc-gui/jump-to-def-background.goml
+++ b/tests/rustdoc-gui/jump-to-def-background.goml
@@ -4,17 +4,17 @@ goto: "file://" + |DOC_PATH| + "/src/link_to_definition/lib.rs.html"
 define-function: (
     "check-background-color",
     (theme, background_color),
-    [
+    block {
         // Set the theme.
-        ("local-storage", { "rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false" }),
+        local-storage: { "rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false" }
         // We reload the page so the local storage settings are being used.
-        ("reload"),
-        ("assert-css", (
+        reload:
+        assert-css: (
             "body.source .example-wrap pre.rust a",
             {"background-color": |background_color|},
             ALL,
-        )),
-    ],
+        )
+    },
 )
 
 call-function: ("check-background-color", ("ayu", "rgb(51, 51, 51)"))
diff --git a/src/test/rustdoc-gui/label-next-to-symbol.goml b/tests/rustdoc-gui/label-next-to-symbol.goml
index 05f8ddc71..05f8ddc71 100644
--- a/src/test/rustdoc-gui/label-next-to-symbol.goml
+++ b/tests/rustdoc-gui/label-next-to-symbol.goml
diff --git a/tests/rustdoc-gui/links-color.goml b/tests/rustdoc-gui/links-color.goml
new file mode 100644
index 000000000..14f7d9935
--- /dev/null
+++ b/tests/rustdoc-gui/links-color.goml
@@ -0,0 +1,98 @@
+// This test checks links colors.
+goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+
+// This is needed so that the text color is computed.
+show-text: true
+
+define-function: (
+    "check-colors",
+    (theme, mod, macro, struct, enum, trait, fn, type, union, keyword,
+     sidebar, sidebar_current, sidebar_current_background),
+    block {
+        local-storage: {
+            "rustdoc-theme": |theme|,
+            "rustdoc-use-system-theme": "false",
+        }
+        reload:
+        // Checking results colors.
+        assert-css: (".item-table .mod", {"color": |mod|}, ALL)
+        assert-css: (".item-table .macro", {"color": |macro|}, ALL)
+        assert-css: (".item-table .struct", {"color": |struct|}, ALL)
+        assert-css: (".item-table .enum", {"color": |enum|}, ALL)
+        assert-css: (".item-table .trait", {"color": |trait|}, ALL)
+        assert-css: (".item-table .fn", {"color": |fn|}, ALL)
+        assert-css: (".item-table .type", {"color": |type|}, ALL)
+        assert-css: (".item-table .union", {"color": |union|}, ALL)
+        assert-css: (".item-table .keyword", {"color": |keyword|}, ALL)
+        // Checking sidebar elements.
+        assert-css: (
+            ".sidebar-elems a:not(.current)",
+            {"color": |sidebar|, "background-color": "rgba(0, 0, 0, 0)", "font-weight": "400"},
+            ALL,
+        )
+        assert-css: (
+            ".sidebar-elems a.current",
+            {
+                "color": |sidebar_current|,
+                "background-color": |sidebar_current_background|,
+                "font-weight": "500",
+            },
+            ALL,
+        )
+    },
+)
+
+call-function: (
+    "check-colors",
+    {
+        "theme": "ayu",
+        "mod": "rgb(57, 175, 215)",
+        "macro": "rgb(163, 122, 204)",
+        "struct": "rgb(255, 160, 165)",
+        "enum": "rgb(255, 160, 165)",
+        "trait": "rgb(57, 175, 215)",
+        "fn": "rgb(253, 214, 135)",
+        "type": "rgb(255, 160, 165)",
+        "union": "rgb(255, 160, 165)",
+        "keyword": "rgb(57, 175, 215)",
+        "sidebar": "rgb(83, 177, 219)",
+        "sidebar_current": "rgb(255, 180, 76)",
+        "sidebar_current_background": "rgba(0, 0, 0, 0)",
+    },
+)
+call-function: (
+    "check-colors",
+    {
+        "theme": "dark",
+        "mod": "rgb(210, 153, 29)",
+        "macro": "rgb(9, 189, 0)",
+        "struct": "rgb(45, 191, 184)",
+        "enum": "rgb(45, 191, 184)",
+        "trait": "rgb(183, 140, 242)",
+        "fn": "rgb(43, 171, 99)",
+        "type": "rgb(45, 191, 184)",
+        "union": "rgb(45, 191, 184)",
+        "keyword": "rgb(210, 153, 29)",
+        "sidebar": "rgb(253, 191, 53)",
+        "sidebar_current": "rgb(253, 191, 53)",
+        "sidebar_current_background": "rgb(68, 68, 68)",
+    },
+)
+call-function: (
+    "check-colors",
+    {
+        "theme": "light",
+        "mod": "rgb(56, 115, 173)",
+        "macro": "rgb(6, 128, 0)",
+        "struct": "rgb(173, 55, 138)",
+        "enum": "rgb(173, 55, 138)",
+        "trait": "rgb(110, 79, 201)",
+        "fn": "rgb(173, 124, 55)",
+        "type": "rgb(173, 55, 138)",
+        "union": "rgb(173, 55, 138)",
+        "keyword": "rgb(56, 115, 173)",
+        "sidebar": "rgb(53, 109, 164)",
+        "sidebar_current": "rgb(53, 109, 164)",
+        "sidebar_current_background": "rgb(255, 255, 255)",
+    },
+)
diff --git a/src/test/rustdoc-gui/list_code_block.goml b/tests/rustdoc-gui/list_code_block.goml
index 3423a449d..c527cfbfc 100644
--- a/src/test/rustdoc-gui/list_code_block.goml
+++ b/tests/rustdoc-gui/list_code_block.goml
@@ -1,4 +1,4 @@
 // This test checks that code blocks in list are supported.
 goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
 goto: "./fn.check_list_code_block.html"
-assert: ("pre.rust.fn")
+assert: (".item-decl pre.rust")
diff --git a/tests/rustdoc-gui/method-margins.goml b/tests/rustdoc-gui/method-margins.goml
new file mode 100644
index 000000000..720268a9e
--- /dev/null
+++ b/tests/rustdoc-gui/method-margins.goml
@@ -0,0 +1,18 @@
+// This test ensures that the margins on methods are coherent inside an impl block.
+goto: "file://" + |DOC_PATH| + "/test_docs/trait_members/struct.HasTrait.html#impl-TraitMembers-for-HasTrait"
+
+assert-count: ("#trait-implementations-list > .toggle", 1)
+
+compare-elements-css: (
+    // compare margin on type with margin on method
+    "#trait-implementations-list .impl-items > .toggle:nth-child(1) > summary",
+    "#trait-implementations-list .impl-items > .toggle:nth-child(2) > summary",
+    ["margin"]
+)
+
+compare-elements-css: (
+    // compare margin on type with margin on method
+    "#trait-implementations-list .impl-items > .toggle:nth-child(1)",
+    "#trait-implementations-list .impl-items > .toggle:nth-child(2)",
+    ["margin"]
+)
diff --git a/src/test/rustdoc-gui/mobile.goml b/tests/rustdoc-gui/mobile.goml
index 704542a39..895864d89 100644
--- a/src/test/rustdoc-gui/mobile.goml
+++ b/tests/rustdoc-gui/mobile.goml
@@ -27,4 +27,8 @@ assert-css-false: (".content .out-of-band .since::before", { "content": "\"Since
 goto: "file://" + |DOC_PATH| + "/settings.html"
 size: (400, 600)
 // Ignored for now https://github.com/rust-lang/rust/issues/93784.
-// compare-elements-position-near-false: ("#preferred-light-theme .setting-name", "#preferred-light-theme .choice", {"y": 16})
+// compare-elements-position-near-false: (
+//     "#preferred-light-theme .setting-name",
+//     "#preferred-light-theme .choice",
+//     {"y": 16},
+// )
diff --git a/src/test/rustdoc-gui/module-items-font.goml b/tests/rustdoc-gui/module-items-font.goml
index cd3676a98..cd3676a98 100644
--- a/src/test/rustdoc-gui/module-items-font.goml
+++ b/tests/rustdoc-gui/module-items-font.goml
diff --git a/src/test/rustdoc-gui/no-docblock.goml b/tests/rustdoc-gui/no-docblock.goml
index 17a955064..17a955064 100644
--- a/src/test/rustdoc-gui/no-docblock.goml
+++ b/tests/rustdoc-gui/no-docblock.goml
diff --git a/src/test/rustdoc-gui/notable-trait.goml b/tests/rustdoc-gui/notable-trait.goml
index 7d4bd27d4..b4fa7d0db 100644
--- a/src/test/rustdoc-gui/notable-trait.goml
+++ b/tests/rustdoc-gui/notable-trait.goml
@@ -123,40 +123,40 @@ assert-count: ("//*[@class='notable popover']", 0)
 define-function: (
     "check-colors",
     (theme, header_color, content_color, type_color, trait_color),
-    [
-        ("goto", "file://" + |DOC_PATH| + "/test_docs/struct.NotableStructWithLongName.html"),
+    block {
+        goto: "file://" + |DOC_PATH| + "/test_docs/struct.NotableStructWithLongName.html"
         // This is needed to ensure that the text color is computed.
-        ("show-text", true),
+        show-text: true
 
         // Setting the theme.
-        ("local-storage", {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}),
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
         // We reload the page so the local storage settings are being used.
-        ("reload"),
+        reload:
 
-        ("move-cursor-to", "//*[@id='method.create_an_iterator_from_read']//*[@class='notable-traits']"),
-        ("assert-count", (".notable.popover", 1)),
+        move-cursor-to: "//*[@id='method.create_an_iterator_from_read']//*[@class='notable-traits']"
+        assert-count: (".notable.popover", 1)
 
-        ("assert-css", (
+        assert-css: (
              ".notable.popover h3",
              {"color": |header_color|},
              ALL,
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
              ".notable.popover pre",
              {"color": |content_color|},
              ALL,
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
              ".notable.popover pre a.struct",
              {"color": |type_color|},
              ALL,
-        )),
-        ("assert-css", (
+        )
+        assert-css: (
              ".notable.popover pre a.trait",
              {"color": |trait_color|},
              ALL,
-        )),
-    ]
+        )
+    },
 )
 
 call-function: (
diff --git a/src/test/rustdoc-gui/overflow-tooltip-information.goml b/tests/rustdoc-gui/overflow-tooltip-information.goml
index 09ad6cdd7..09ad6cdd7 100644
--- a/src/test/rustdoc-gui/overflow-tooltip-information.goml
+++ b/tests/rustdoc-gui/overflow-tooltip-information.goml
diff --git a/src/test/rustdoc-gui/pocket-menu.goml b/tests/rustdoc-gui/pocket-menu.goml
index c3649dc7b..c3649dc7b 100644
--- a/src/test/rustdoc-gui/pocket-menu.goml
+++ b/tests/rustdoc-gui/pocket-menu.goml
diff --git a/src/test/rustdoc-gui/run-on-hover.goml b/tests/rustdoc-gui/run-on-hover.goml
index 57d63049f..8dcb62c10 100644
--- a/src/test/rustdoc-gui/run-on-hover.goml
+++ b/tests/rustdoc-gui/run-on-hover.goml
@@ -8,27 +8,27 @@ show-text: true
 define-function: (
     "check-run-button",
     (theme, color, background, hover_color, hover_background),
-    [
-        ("local-storage", {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}),
-        ("reload"),
-        ("assert-css", (".test-arrow", {"visibility": "hidden"})),
-        ("move-cursor-to", ".example-wrap"),
-        ("assert-css", (".test-arrow", {
+    block {
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        assert-css: (".test-arrow", {"visibility": "hidden"})
+        move-cursor-to: ".example-wrap"
+        assert-css: (".test-arrow", {
             "visibility": "visible",
             "color": |color|,
             "background-color": |background|,
             "font-size": "22px",
             "border-radius": "5px",
-        })),
-        ("move-cursor-to", ".test-arrow"),
-        ("assert-css", (".test-arrow:hover", {
+        })
+        move-cursor-to: ".test-arrow"
+        assert-css: (".test-arrow:hover", {
             "visibility": "visible",
             "color": |hover_color|,
             "background-color": |hover_background|,
             "font-size": "22px",
             "border-radius": "5px",
-        })),
-    ],
+        })
+    },
 )
 
 call-function: ("check-run-button", {
diff --git a/tests/rustdoc-gui/rust-logo.goml b/tests/rustdoc-gui/rust-logo.goml
new file mode 100644
index 000000000..2d15e8b96
--- /dev/null
+++ b/tests/rustdoc-gui/rust-logo.goml
@@ -0,0 +1,58 @@
+// This test ensures that the correct style is applied to the rust logo in the sidebar.
+goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+
+define-function: (
+    "check-logo",
+    (theme, filter),
+    block {
+        // Going to the doc page.
+        goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+        // Changing theme.
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        assert-css: (".rust-logo", {"filter": |filter|})
+        // Going to the source code page.
+        goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html"
+        // Changing theme (since it's local files, the local storage works by folder).
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        assert-css: (".rust-logo", {"filter": |filter|})
+        // Now we check that the non-rust logos don't have a CSS filter set.
+        goto: "file://" + |DOC_PATH| + "/huge_logo/index.html"
+        // Changing theme on the new page (again...).
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        // Check there is no rust logo
+        assert-false: ".rust-logo"
+        // Check there is no filter.
+        assert-css: (".sidebar .logo-container img", {"filter": "none"})
+    },
+)
+
+call-function: (
+    "check-logo",
+    {
+        "theme": "ayu",
+        "filter": "drop-shadow(rgb(255, 255, 255) 1px 0px 0px) " +
+            "drop-shadow(rgb(255, 255, 255) 0px 1px 0px) " +
+            "drop-shadow(rgb(255, 255, 255) -1px 0px 0px) " +
+            "drop-shadow(rgb(255, 255, 255) 0px -1px 0px)",
+    },
+)
+call-function: (
+    "check-logo",
+    {
+        "theme": "dark",
+        "filter": "drop-shadow(rgb(255, 255, 255) 1px 0px 0px) " +
+            "drop-shadow(rgb(255, 255, 255) 0px 1px 0px) " +
+            "drop-shadow(rgb(255, 255, 255) -1px 0px 0px) " +
+            "drop-shadow(rgb(255, 255, 255) 0px -1px 0px)",
+    },
+)
+call-function: (
+    "check-logo",
+    {
+        "theme": "light",
+        "filter": "none",
+    },
+)
diff --git a/src/test/rustdoc-gui/scrape-examples-button-focus.goml b/tests/rustdoc-gui/scrape-examples-button-focus.goml
index bba518db0..1b5c3a0d2 100644
--- a/src/test/rustdoc-gui/scrape-examples-button-focus.goml
+++ b/tests/rustdoc-gui/scrape-examples-button-focus.goml
@@ -1,3 +1,5 @@
+// This test ensures that the scraped examples buttons are working as expecting
+// when 'Enter' key is pressed when they're focused.
 goto: "file://" + |DOC_PATH| + "/scrape_examples/fn.test.html"
 
 // The next/prev buttons vertically scroll the code viewport between examples
@@ -5,25 +7,25 @@ store-property: (initialScrollTop, ".scraped-example-list > .scraped-example pre
 focus: ".scraped-example-list > .scraped-example .next"
 press-key: "Enter"
 assert-property-false: (".scraped-example-list > .scraped-example pre", {
-	"scrollTop": |initialScrollTop|
+    "scrollTop": |initialScrollTop|
 })
 focus: ".scraped-example-list > .scraped-example .prev"
 press-key: "Enter"
 assert-property: (".scraped-example-list > .scraped-example pre", {
-	"scrollTop": |initialScrollTop|
+    "scrollTop": |initialScrollTop|
 })
 
 // The expand button increases the scrollHeight of the minimized code viewport
 store-property: (smallOffsetHeight, ".scraped-example-list > .scraped-example pre", "offsetHeight")
 assert-property-false: (".scraped-example-list > .scraped-example pre", {
-	"scrollHeight": |smallOffsetHeight|
+    "scrollHeight": |smallOffsetHeight|
 })
 focus: ".scraped-example-list > .scraped-example .expand"
 press-key: "Enter"
 assert-property-false: (".scraped-example-list > .scraped-example pre", {
-	"offsetHeight": |smallOffsetHeight|
+    "offsetHeight": |smallOffsetHeight|
 })
 store-property: (fullOffsetHeight, ".scraped-example-list > .scraped-example pre", "offsetHeight")
 assert-property: (".scraped-example-list > .scraped-example pre", {
-	"scrollHeight": |fullOffsetHeight|
+    "scrollHeight": |fullOffsetHeight|
 })
diff --git a/tests/rustdoc-gui/scrape-examples-color.goml b/tests/rustdoc-gui/scrape-examples-color.goml
new file mode 100644
index 000000000..40f31b277
--- /dev/null
+++ b/tests/rustdoc-gui/scrape-examples-color.goml
@@ -0,0 +1,60 @@
+// Check that scrape example code blocks have the expected colors.
+goto: "file://" + |DOC_PATH| + "/scrape_examples/fn.test_many.html"
+show-text: true
+
+define-function: (
+    "check-colors",
+    (theme, highlight, highlight_focus, help_border, help_color, help_hover_border,
+     help_hover_color),
+    block {
+        local-storage: { "rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false", }
+        reload:
+        wait-for: ".more-examples-toggle"
+        assert-css: (".scraped-example .example-wrap .rust span.highlight:not(.focus)", {
+            "background-color": |highlight|,
+        }, ALL)
+        assert-css: (".scraped-example .example-wrap .rust span.highlight.focus", {
+            "background-color": |highlight_focus|,
+        }, ALL)
+
+        assert-css: (".scraped-example-list .scrape-help", {
+            "border-color": |help_border|,
+            "color": |help_color|,
+        })
+        move-cursor-to: ".scraped-example-list .scrape-help"
+        assert-css: (".scraped-example-list .scrape-help:hover", {
+            "border-color": |help_hover_border|,
+            "color": |help_hover_color|,
+        })
+        // Moving the cursor to another item to not break next runs.
+        move-cursor-to: ".search-input"
+    }
+)
+
+call-function: ("check-colors", {
+    "theme": "ayu",
+    "highlight": "rgb(91, 59, 1)",
+    "highlight_focus": "rgb(124, 75, 15)",
+    "help_border": "rgb(170, 170, 170)",
+    "help_color": "rgb(238, 238, 238)",
+    "help_hover_border": "rgb(255, 255, 255)",
+    "help_hover_color": "rgb(255, 255, 255)",
+})
+call-function: ("check-colors", {
+    "theme": "dark",
+    "highlight": "rgb(91, 59, 1)",
+    "highlight_focus": "rgb(124, 75, 15)",
+    "help_border": "rgb(170, 170, 170)",
+    "help_color": "rgb(238, 238, 238)",
+    "help_hover_border": "rgb(255, 255, 255)",
+    "help_hover_color": "rgb(255, 255, 255)",
+})
+call-function: ("check-colors", {
+    "theme": "light",
+    "highlight": "rgb(252, 255, 214)",
+    "highlight_focus": "rgb(246, 253, 176)",
+    "help_border": "rgb(85, 85, 85)",
+    "help_color": "rgb(51, 51, 51)",
+    "help_hover_border": "rgb(0, 0, 0)",
+    "help_hover_color": "rgb(0, 0, 0)",
+})
diff --git a/src/test/rustdoc-gui/scrape-examples-fonts.goml b/tests/rustdoc-gui/scrape-examples-fonts.goml
index b7d7f4ccb..142f337cb 100644
--- a/src/test/rustdoc-gui/scrape-examples-fonts.goml
+++ b/tests/rustdoc-gui/scrape-examples-fonts.goml
@@ -1,3 +1,4 @@
+// This test ensures that the correct font is used in scraped examples.
 goto: "file://" + |DOC_PATH| + "/scrape_examples/fn.test_many.html"
 
 store-value: (font, '"Fira Sans", Arial, NanumBarunGothic, sans-serif')
diff --git a/tests/rustdoc-gui/scrape-examples-layout.goml b/tests/rustdoc-gui/scrape-examples-layout.goml
new file mode 100644
index 000000000..95102528e
--- /dev/null
+++ b/tests/rustdoc-gui/scrape-examples-layout.goml
@@ -0,0 +1,49 @@
+// Check that the line number column has the correct layout.
+goto: "file://" + |DOC_PATH| + "/scrape_examples/fn.test_many.html"
+
+// Check that it's not zero.
+assert-property-false: (
+    ".more-scraped-examples .scraped-example .code-wrapper .src-line-numbers",
+    {"clientWidth": "0"}
+)
+
+// Check that examples with very long lines have the same width as ones that don't.
+store-property: (
+    clientWidth,
+    ".more-scraped-examples .scraped-example:nth-child(2) .code-wrapper .src-line-numbers",
+    "clientWidth"
+)
+
+assert-property: (
+    ".more-scraped-examples .scraped-example:nth-child(3) .code-wrapper .src-line-numbers",
+    {"clientWidth": |clientWidth|}
+)
+
+assert-property: (
+    ".more-scraped-examples .scraped-example:nth-child(4) .code-wrapper .src-line-numbers",
+    {"clientWidth": |clientWidth|}
+)
+
+assert-property: (
+    ".more-scraped-examples .scraped-example:nth-child(5) .code-wrapper .src-line-numbers",
+    {"clientWidth": |clientWidth|}
+)
+
+assert-property: (
+    ".more-scraped-examples .scraped-example:nth-child(6) .code-wrapper .src-line-numbers",
+    {"clientWidth": |clientWidth|}
+)
+
+// Check that for both mobile and desktop sizes, the buttons in scraped examples are displayed
+// correctly.
+
+store-value: (offset_y, 4)
+
+// First with desktop
+assert-position: (".scraped-example .code-wrapper", {"y": 255})
+assert-position: (".scraped-example .code-wrapper .prev", {"y": 255 + |offset_y|})
+
+// Then with mobile
+size: (600, 600)
+assert-position: (".scraped-example .code-wrapper", {"y": 314})
+assert-position: (".scraped-example .code-wrapper .prev", {"y": 314 + |offset_y|})
diff --git a/tests/rustdoc-gui/scrape-examples-toggle.goml b/tests/rustdoc-gui/scrape-examples-toggle.goml
new file mode 100644
index 000000000..2d5df6a5d
--- /dev/null
+++ b/tests/rustdoc-gui/scrape-examples-toggle.goml
@@ -0,0 +1,51 @@
+// This tests checks that the "scraped examples" toggle is working as expected.
+goto: "file://" + |DOC_PATH| + "/scrape_examples/fn.test_many.html"
+
+// Checking the color of the toggle line.
+show-text: true
+define-function: (
+    "check-color",
+    (theme, toggle_line_color, toggle_line_hover_color),
+    block {
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+
+        // Clicking "More examples..." will open additional examples
+        assert-attribute-false: (".more-examples-toggle", {"open": ""})
+        click: ".more-examples-toggle"
+        assert-attribute: (".more-examples-toggle", {"open": ""})
+
+        assert-css: (".toggle-line-inner", {"background-color": |toggle_line_color|}, ALL)
+        move-cursor-to: ".toggle-line"
+        assert-css: (
+            ".toggle-line:hover .toggle-line-inner",
+            {"background-color": |toggle_line_hover_color|},
+        )
+        // Moving cursor away from the toggle line to prevent disrupting next test.
+        move-cursor-to: ".search-input"
+    },
+)
+
+call-function: ("check-color", {
+    "theme": "ayu",
+    "toggle_line_color": "rgb(153, 153, 153)",
+    "toggle_line_hover_color": "rgb(197, 197, 197)",
+})
+call-function: ("check-color", {
+    "theme": "dark",
+    "toggle_line_color": "rgb(153, 153, 153)",
+    "toggle_line_hover_color": "rgb(197, 197, 197)",
+})
+call-function: ("check-color", {
+    "theme": "light",
+    "toggle_line_color": "rgb(204, 204, 204)",
+    "toggle_line_hover_color": "rgb(153, 153, 153)",
+})
+
+// Toggling all docs will close additional examples
+click: "#toggle-all-docs"
+assert-attribute-false: (".more-examples-toggle", {"open": ""})
+
+// After re-opening the docs, the additional examples should stay closed
+click: "#toggle-all-docs"
+assert-attribute-false: (".more-examples-toggle", {"open": ""})
diff --git a/src/test/rustdoc-gui/search-filter.goml b/tests/rustdoc-gui/search-filter.goml
index e0228694e..5bc6e87d6 100644
--- a/src/test/rustdoc-gui/search-filter.goml
+++ b/tests/rustdoc-gui/search-filter.goml
@@ -5,7 +5,7 @@ write: (".search-input", "test")
 // To be SURE that the search will be run.
 press-key: 'Enter'
 // Waiting for the search results to appear...
-wait-for: "#titles"
+wait-for: "#search-tabs"
 assert-text: ("#results .externcrate", "test_docs")
 
 wait-for: "#crate-search"
@@ -15,9 +15,10 @@ click: "#crate-search"
 press-key: "ArrowDown"
 press-key: "ArrowDown"
 press-key: "ArrowDown"
+press-key: "ArrowDown"
 press-key: "Enter"
 // Waiting for the search results to appear...
-wait-for: "#titles"
+wait-for: "#search-tabs"
 assert-document-property: ({"URL": "&filter-crate="}, CONTAINS)
 // We check that there is no more "test_docs" appearing.
 assert-false: "#results .externcrate"
@@ -39,9 +40,10 @@ click: "#crate-search"
 press-key: "ArrowUp"
 press-key: "ArrowUp"
 press-key: "ArrowUp"
+press-key: "ArrowUp"
 press-key: "Enter"
 // Waiting for the search results to appear...
-wait-for: "#titles"
+wait-for: "#search-tabs"
 assert-property: ("#crate-search", {"value": "all crates"})
 
 // Checking that the URL parameter is taken into account for crate filtering.
diff --git a/src/test/rustdoc-gui/search-form-elements.goml b/tests/rustdoc-gui/search-form-elements.goml
index 542db348c..542db348c 100644
--- a/src/test/rustdoc-gui/search-form-elements.goml
+++ b/tests/rustdoc-gui/search-form-elements.goml
diff --git a/src/test/rustdoc-gui/search-input-mobile.goml b/tests/rustdoc-gui/search-input-mobile.goml
index ce0cef77c..ce0cef77c 100644
--- a/src/test/rustdoc-gui/search-input-mobile.goml
+++ b/tests/rustdoc-gui/search-input-mobile.goml
diff --git a/src/test/rustdoc-gui/search-keyboard.goml b/tests/rustdoc-gui/search-keyboard.goml
index be642fc49..ed975664c 100644
--- a/src/test/rustdoc-gui/search-keyboard.goml
+++ b/tests/rustdoc-gui/search-keyboard.goml
@@ -5,7 +5,7 @@ write: (".search-input", "Foo")
 // To be SURE that the search will be run.
 press-key: 'Enter'
 // Waiting for the search results to appear...
-wait-for: "#titles"
+wait-for: "#search-tabs"
 
 // Now use the keyboard commands to switch to the third result.
 press-key: "ArrowDown"
diff --git a/tests/rustdoc-gui/search-no-result.goml b/tests/rustdoc-gui/search-no-result.goml
new file mode 100644
index 000000000..b76a44fa9
--- /dev/null
+++ b/tests/rustdoc-gui/search-no-result.goml
@@ -0,0 +1,36 @@
+// The goal of this test is to check the color of the "no result" links.
+goto: "file://" + |DOC_PATH| + "/lib2/index.html?search=sdkfskjfsdks"
+show-text: true
+
+define-function: (
+    "check-no-result",
+    (theme, link, link_hover),
+    block {
+        // Changing theme.
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        wait-for: "#results"
+        assert: ".search-failed.active"
+        assert-css: ("#results a", {"color": |link|}, ALL)
+        move-cursor-to: "#results a"
+        assert-css: ("#results a:hover", {"color": |link_hover|})
+        // Moving the cursor to some other place to not create issues with next function run.
+        move-cursor-to: ".search-input"
+    },
+)
+
+call-function: ("check-no-result", {
+    "theme": "ayu",
+    "link": "rgb(57, 175, 215)",
+    "link_hover": "rgb(57, 175, 215)",
+})
+call-function: ("check-no-result", {
+    "theme": "dark",
+    "link": "rgb(210, 153, 29)",
+    "link_hover": "rgb(210, 153, 29)",
+})
+call-function: ("check-no-result", {
+    "theme": "light",
+    "link": "rgb(56, 115, 173)",
+    "link_hover": "rgb(56, 115, 173)",
+})
diff --git a/src/test/rustdoc-gui/search-reexport.goml b/tests/rustdoc-gui/search-reexport.goml
index dd19f03bd..dd19f03bd 100644
--- a/src/test/rustdoc-gui/search-reexport.goml
+++ b/tests/rustdoc-gui/search-reexport.goml
diff --git a/src/test/rustdoc-gui/search-result-color.goml b/tests/rustdoc-gui/search-result-color.goml
index dde43b1c9..d6d54ec4b 100644
--- a/src/test/rustdoc-gui/search-result-color.goml
+++ b/tests/rustdoc-gui/search-result-color.goml
@@ -3,53 +3,32 @@
 define-function: (
     "check-result-color",
     (result_kind, color, hover_color),
-    [
-        (
-            "assert-css",
-            (".result-" + |result_kind| + " ." + |result_kind|, {"color": |color|}, ALL),
-        ),
-        (
-            "assert-css",
-            (
-                ".result-" + |result_kind|,
-                {"color": |entry_color|, "background-color": |background_color|},
-            ),
-        ),
-        (
-            "move-cursor-to",
+    block {
+        assert-css: (".result-" + |result_kind| + " ." + |result_kind|, {"color": |color|}, ALL)
+        assert-css: (
             ".result-" + |result_kind|,
-        ),
-        (
-            "assert-css",
-            (
-                ".result-" + |result_kind| + ":hover",
-                {"color": |hover_entry_color|, "background-color": |hover_background_color|},
-            ),
-        ),
-        (
-            "assert-css",
-            (".result-" + |result_kind| + ":hover ." + |result_kind|, {"color": |hover_color|}),
-        ),
-        (
-            "move-cursor-to",
-            ".search-input",
-        ),
-        (
-            "focus",
-            ".result-" + |result_kind|,
-        ),
-        (
-            "assert-css",
-            (
-                ".result-" + |result_kind| + ":focus",
-                {"color": |hover_entry_color|, "background-color": |hover_background_color|},
-            ),
-        ),
-        (
-            "assert-css",
-            (".result-" + |result_kind| + ":focus ." + |result_kind|, {"color": |hover_color|}),
-        ),
-    ],
+            {"color": |entry_color|, "background-color": |background_color|},
+        )
+        move-cursor-to: ".result-" + |result_kind|
+        assert-css: (
+            ".result-" + |result_kind| + ":hover",
+            {"color": |hover_entry_color|, "background-color": |hover_background_color|},
+        )
+        assert-css: (
+            ".result-" + |result_kind| + ":hover ." + |result_kind|,
+            {"color": |hover_color|},
+        )
+        move-cursor-to: ".search-input"
+        focus: ".result-" + |result_kind|
+        assert-css: (
+            ".result-" + |result_kind| + ":focus",
+            {"color": |hover_entry_color|, "background-color": |hover_background_color|},
+        )
+        assert-css: (
+            ".result-" + |result_kind| + ":focus ." + |result_kind|,
+            {"color": |hover_color|},
+        )
+    },
 )
 
 goto: "file://" + |DOC_PATH| + "/test_docs/index.html?search=coo"
@@ -65,7 +44,12 @@ local-storage: {
 reload:
 
 // Waiting for the search results to appear...
-wait-for: "#titles"
+wait-for: "#search-tabs"
+assert-css: (
+    "#search-tabs > button > .count",
+    {"color": "rgb(136, 136, 136)"},
+    ALL,
+)
 assert-css: (
     "//*[@class='desc'][text()='Just a normal struct.']",
     {"color": "rgb(197, 197, 197)"},
@@ -177,7 +161,12 @@ local-storage: {
 reload:
 
 // Waiting for the search results to appear...
-wait-for: "#titles"
+wait-for: "#search-tabs"
+assert-css: (
+    "#search-tabs > button > .count",
+    {"color": "rgb(136, 136, 136)"},
+    ALL,
+)
 assert-css: (
     "//*[@class='desc'][text()='Just a normal struct.']",
     {"color": "rgb(221, 221, 221)"},
@@ -274,7 +263,12 @@ local-storage: {"rustdoc-theme": "light", "rustdoc-use-system-theme": "false"}
 reload:
 
 // Waiting for the search results to appear...
-wait-for: "#titles"
+wait-for: "#search-tabs"
+assert-css: (
+    "#search-tabs > button > .count",
+    {"color": "rgb(136, 136, 136)"},
+    ALL,
+)
 assert-css: (
     "//*[@class='desc'][text()='Just a normal struct.']",
     {"color": "rgb(0, 0, 0)"},
@@ -374,20 +368,20 @@ show-text: true
 define-function: (
     "check-alias",
     (theme, alias, grey),
-    [
-        ("local-storage", {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}),
-        ("reload"),
-        ("write", (".search-input", "thisisanalias")),
+    block {
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        write: (".search-input", "thisisanalias")
         // To be SURE that the search will be run.
-        ("press-key", 'Enter'),
+        press-key: 'Enter'
         // Waiting for the search results to appear...
-        ("wait-for", "#titles"),
+        wait-for: "#search-tabs"
         // Checking that the colors for the alias element are the ones expected.
-        ("assert-css", (".result-name > .alias", {"color": |alias|})),
-        ("assert-css", (".result-name > .alias > .grey", {"color": |grey|})),
+        assert-css: (".result-name > .alias", {"color": |alias|})
+        assert-css: (".result-name > .alias > .grey", {"color": |grey|})
         // Leave the search results to prevent reloading with an already filled search input.
-        ("press-key", "Escape"),
-    ],
+        press-key: "Escape"
+    },
 )
 
 call-function: ("check-alias", {
diff --git a/src/test/rustdoc-gui/search-result-description.goml b/tests/rustdoc-gui/search-result-description.goml
index 53a335b63..9fa210804 100644
--- a/src/test/rustdoc-gui/search-result-description.goml
+++ b/tests/rustdoc-gui/search-result-description.goml
@@ -1,5 +1,5 @@
 // This test is to ensure that the codeblocks are correctly rendered in the search results.
 goto: "file://" + |DOC_PATH| + "/test_docs/index.html?search=some_more_function"
 // Waiting for the search results to appear...
-wait-for: "#titles"
+wait-for: "#search-tabs"
 assert-text: (".search-results .desc code", "format!")
diff --git a/src/test/rustdoc-gui/search-result-display.goml b/tests/rustdoc-gui/search-result-display.goml
index 13a5e4c71..43e608228 100644
--- a/src/test/rustdoc-gui/search-result-display.goml
+++ b/tests/rustdoc-gui/search-result-display.goml
@@ -42,17 +42,17 @@ show-text: true
 define-function: (
     "check-filter",
     (theme, border, filter, hover_border, hover_filter),
-    [
-        ("local-storage", {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}),
-        ("reload"),
-        ("wait-for", "#crate-search"),
-        ("assert-css", ("#crate-search", {"border": "1px solid " + |border|})),
-        ("assert-css", ("#crate-search-div::after", {"filter": |filter|})),
-        ("move-cursor-to", "#crate-search"),
-        ("assert-css", ("#crate-search", {"border": "1px solid " + |hover_border|})),
-        ("assert-css", ("#crate-search-div::after", {"filter": |hover_filter|})),
-        ("move-cursor-to", ".search-input"),
-    ],
+    block {
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        wait-for: "#crate-search"
+        assert-css: ("#crate-search", {"border": "1px solid " + |border|})
+        assert-css: ("#crate-search-div::after", {"filter": |filter|})
+        move-cursor-to: "#crate-search"
+        assert-css: ("#crate-search", {"border": "1px solid " + |hover_border|})
+        assert-css: ("#crate-search-div::after", {"filter": |hover_filter|})
+        move-cursor-to: ".search-input"
+    },
 )
 
 call-function: ("check-filter", {
diff --git a/src/test/rustdoc-gui/search-result-go-to-first.goml b/tests/rustdoc-gui/search-result-go-to-first.goml
index eeddf5ef6..f444baa6c 100644
--- a/src/test/rustdoc-gui/search-result-go-to-first.goml
+++ b/tests/rustdoc-gui/search-result-go-to-first.goml
@@ -3,17 +3,17 @@
 // First, we check that the first page doesn't have the string we're looking for to ensure
 // that the feature is changing page as expected.
 goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
-assert-text-false: (".fqn", "Struct test_docs::Foo")
+assert-text-false: (".main-heading h1", "Struct test_docs::Foo")
 
 // We now check that we land on the search result page if "go_to_first" isn't set.
 goto: "file://" + |DOC_PATH| + "/test_docs/index.html?search=struct%3AFoo"
 // Waiting for the search results to appear...
-wait-for: "#titles"
-assert-text-false: (".fqn", "Struct test_docs::Foo")
+wait-for: "#search-tabs"
+assert-text-false: (".main-heading h1", "Struct test_docs::Foo")
 // Ensure that the search results are displayed, not the "normal" content.
 assert-css: ("#main-content", {"display": "none"})
 
 // Now we can check that the feature is working as expected!
 goto: "file://" + |DOC_PATH| + "/test_docs/index.html?search=struct%3AFoo&go_to_first=true"
 // Waiting for the page to load...
-wait-for-text: (".fqn", "Struct test_docs::Foo")
+wait-for-text: (".main-heading h1", "Struct test_docs::Foo")
diff --git a/src/test/rustdoc-gui/search-result-keyword.goml b/tests/rustdoc-gui/search-result-keyword.goml
index 66e63155a..8c3577d9f 100644
--- a/src/test/rustdoc-gui/search-result-keyword.goml
+++ b/tests/rustdoc-gui/search-result-keyword.goml
@@ -4,7 +4,7 @@ write: (".search-input", "CookieMonster")
 // To be SURE that the search will be run.
 press-key: 'Enter'
 // Waiting for the search results to appear...
-wait-for: "#titles"
+wait-for: "#search-tabs"
 // Note: The two next assert commands could be merged as one but readability would be
 // less good.
 //
diff --git a/tests/rustdoc-gui/search-tab-change-title-fn-sig.goml b/tests/rustdoc-gui/search-tab-change-title-fn-sig.goml
new file mode 100644
index 000000000..1433dc4d7
--- /dev/null
+++ b/tests/rustdoc-gui/search-tab-change-title-fn-sig.goml
@@ -0,0 +1,74 @@
+// Checks that the search tab results work correctly with function signature syntax
+// First, try a search-by-name
+goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+write: (".search-input", "Foo")
+// To be SURE that the search will be run.
+press-key: 'Enter'
+// Waiting for the search results to appear...
+wait-for: "#search-tabs"
+assert-attribute: ("#search-tabs > button:nth-of-type(1)", {"class": "selected"})
+assert-text: ("#search-tabs > button:nth-of-type(1)", "In Names", STARTS_WITH)
+assert: "input.search-input:focus"
+// Use left-right keys
+press-key: "ArrowDown"
+assert: "#results > .search-results.active > a:nth-of-type(1):focus"
+press-key: "ArrowRight"
+wait-for-attribute: ("#search-tabs > button:nth-of-type(2)", {"class": "selected"})
+press-key: "ArrowRight"
+wait-for-attribute: ("#search-tabs > button:nth-of-type(3)", {"class": "selected"})
+press-key: "ArrowRight"
+wait-for-attribute: ("#search-tabs > button:nth-of-type(1)", {"class": "selected"})
+press-key: "ArrowLeft"
+wait-for-attribute: ("#search-tabs > button:nth-of-type(3)", {"class": "selected"})
+
+// Now try search-by-return
+goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+write: (".search-input", "-> String")
+// To be SURE that the search will be run.
+press-key: 'Enter'
+// Waiting for the search results to appear...
+wait-for: "#search-tabs"
+assert-attribute: ("#search-tabs > button:nth-of-type(1)", {"class": "selected"})
+assert-text: ("#search-tabs > button:nth-of-type(1)", "In Function Return Types", STARTS_WITH)
+assert: "input.search-input:focus"
+// Use left-right keys
+press-key: "ArrowDown"
+assert: "#results > .search-results.active > a:nth-of-type(1):focus"
+press-key: "ArrowRight"
+wait-for-attribute: ("#search-tabs > button:nth-of-type(1)", {"class": "selected"})
+press-key: "ArrowRight"
+wait-for-attribute: ("#search-tabs > button:nth-of-type(1)", {"class": "selected"})
+press-key: "ArrowRight"
+wait-for-attribute: ("#search-tabs > button:nth-of-type(1)", {"class": "selected"})
+press-key: "ArrowLeft"
+wait-for-attribute: ("#search-tabs > button:nth-of-type(1)", {"class": "selected"})
+
+// Try with a search-by-return with no results
+goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+write: (".search-input", "-> Something")
+// To be SURE that the search will be run.
+press-key: 'Enter'
+// Waiting for the search results to appear...
+wait-for: "#search-tabs"
+assert-attribute: ("#search-tabs > button:nth-of-type(1)", {"class": "selected"})
+assert-text: ("#search-tabs > button:nth-of-type(1)", "In Function Return Types", STARTS_WITH)
+
+// Try with a search-by-parameter
+goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+write: (".search-input", "usize pattern")
+// To be SURE that the search will be run.
+press-key: 'Enter'
+// Waiting for the search results to appear...
+wait-for: "#search-tabs"
+assert-attribute: ("#search-tabs > button:nth-of-type(1)", {"class": "selected"})
+assert-text: ("#search-tabs > button:nth-of-type(1)", "In Function Parameters", STARTS_WITH)
+
+// Try with a search-by-parameter-and-return
+goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+write: (".search-input", "pattern -> str")
+// To be SURE that the search will be run.
+press-key: 'Enter'
+// Waiting for the search results to appear...
+wait-for: "#search-tabs"
+assert-attribute: ("#search-tabs > button:nth-of-type(1)", {"class": "selected"})
+assert-text: ("#search-tabs > button:nth-of-type(1)", "In Function Signatures", STARTS_WITH)
diff --git a/tests/rustdoc-gui/search-tab.goml b/tests/rustdoc-gui/search-tab.goml
new file mode 100644
index 000000000..36958f700
--- /dev/null
+++ b/tests/rustdoc-gui/search-tab.goml
@@ -0,0 +1,76 @@
+// Checking the colors of the search tab headers.
+goto: "file://" + |DOC_PATH| + "/test_docs/fn.foo.html?search=something"
+show-text: true
+
+define-function: (
+    "check-colors",
+    (theme, background, background_selected, background_hover, border_bottom,
+     border_bottom_selected, border_bottom_hover, border_top, border_top_selected,
+     border_top_hover),
+    block {
+        // Setting the theme.
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+
+        // These two commands are used to be sure the search will be run.
+        focus: ".search-input"
+        press-key: "Enter"
+
+        wait-for: "#search-tabs"
+        assert-css: ("#search-tabs > button:not(.selected)", {
+            "background-color": |background|,
+            "border-bottom": |border_bottom|,
+            "border-top": |border_top|,
+        })
+        assert-css: ("#search-tabs > button.selected", {
+            "background-color": |background_selected|,
+            "border-bottom": |border_bottom_selected|,
+            "border-top": |border_top_selected|,
+        })
+        move-cursor-to: "#search-tabs > button:not(.selected)"
+        assert-css: ("#search-tabs > button:not(.selected):hover", {
+            "background-color": |background_hover|,
+            "border-bottom": |border_bottom_hover|,
+            "border-top": |border_top_hover|,
+        })
+        // To prevent disrupting next run of this function.
+        move-cursor-to: ".search-input"
+    },
+)
+
+call-function: ("check-colors", {
+    "theme": "ayu",
+    "background": "rgba(0, 0, 0, 0)",
+    "background_selected": "rgb(20, 25, 32)",
+    "background_hover": "rgba(0, 0, 0, 0)",
+    "border_bottom": "0px none rgb(197, 197, 197)",
+    "border_bottom_selected": "1px solid rgb(255, 180, 76)",
+    "border_bottom_hover": "1px solid rgba(242, 151, 24, 0.3)",
+    "border_top": "0px none rgb(197, 197, 197)",
+    "border_top_selected": "0px none rgb(197, 197, 197)",
+    "border_top_hover": "0px none rgb(197, 197, 197)",
+})
+call-function: ("check-colors", {
+    "theme": "dark",
+    "background": "rgb(37, 37, 37)",
+    "background_selected": "rgb(53, 53, 53)",
+    "background_hover": "rgb(53, 53, 53)",
+    "border_bottom": "0px none rgb(221, 221, 221)",
+    "border_bottom_selected": "0px none rgb(221, 221, 221)",
+    "border_bottom_hover": "0px none rgb(221, 221, 221)",
+    "border_top": "2px solid rgb(37, 37, 37)",
+    "border_top_selected": "2px solid rgb(0, 137, 255)",
+    "border_top_hover": "2px solid rgb(0, 137, 255)",
+})
+call-function: ("check-colors", {
+    "theme": "light",
+    "background": "rgb(230, 230, 230)",
+    "background_selected": "rgb(255, 255, 255)",
+    "background_hover": "rgb(255, 255, 255)",
+    "border_bottom": "0px none rgb(0, 0, 0)",
+    "border_bottom_selected": "0px none rgb(0, 0, 0)",
+    "border_bottom_hover": "0px none rgb(0, 0, 0)",
+    "border_top": "2px solid rgb(230, 230, 230)",
+    "border_top_selected": "2px solid rgb(0, 137, 255)",
+    "border_top_hover": "2px solid rgb(0, 137, 255)",
+})
diff --git a/src/test/rustdoc-gui/settings.goml b/tests/rustdoc-gui/settings.goml
index fc3beaa53..419cc5eba 100644
--- a/src/test/rustdoc-gui/settings.goml
+++ b/tests/rustdoc-gui/settings.goml
@@ -8,6 +8,10 @@ assert-false: "#settings"
 click: "#settings-menu"
 wait-for: "#settings"
 assert-css: ("#settings", {"display": "block"})
+
+// Store the line margin to compare with the settings.html later.
+store-css: (setting_line_margin, ".setting-line", "margin")
+
 // Let's close it by clicking on the same button.
 click: "#settings-menu"
 wait-for-css: ("#settings", {"display": "none"})
@@ -105,6 +109,33 @@ assert-css: (
         "box-shadow": "rgb(33, 150, 243) 0px 0px 1px 1px",
     },
 )
+// Now we check the setting-name for radio buttons is on a different line than the label.
+compare-elements-position-near: (
+    "#theme .setting-name",
+    "#theme .choices",
+    {"x": 1}
+)
+compare-elements-position-near-false: (
+    "#theme .setting-name",
+    "#theme .choices",
+    {"y": 1}
+)
+// Now we check that the label positions are all on the same line.
+compare-elements-position-near: (
+    "#theme .choices #theme-light",
+    "#theme .choices #theme-dark",
+    {"y": 1}
+)
+compare-elements-position-near: (
+    "#theme .choices #theme-dark",
+    "#theme .choices #theme-ayu",
+    {"y": 1}
+)
+compare-elements-position-near: (
+    "#theme .choices #theme-ayu",
+    "#theme .choices #theme-system-preference",
+    {"y": 1}
+)
 
 // First we check the "default" display for toggles.
 assert-css: (
@@ -159,7 +190,7 @@ assert-text: ("#preferred-light-theme .setting-name", "Preferred light theme")
 // We now check that clicking on the toggles' text is like clicking on the checkbox.
 // To test it, we use the "Disable keyboard shortcuts".
 local-storage: {"rustdoc-disable-shortcuts": "false"}
-click: ".setting-line:last-child .toggle .label"
+click: ".setting-line:last-child .settings-toggle .label"
 assert-local-storage: {"rustdoc-disable-shortcuts": "true"}
 
 // Make sure that "Disable keyboard shortcuts" actually took effect.
@@ -169,13 +200,32 @@ assert-false: "#help-button .popover"
 wait-for-css: ("#settings-menu .popover", {"display": "block"})
 
 // Now turn keyboard shortcuts back on, and see if they work.
-click: ".setting-line:last-child .toggle .label"
+click: ".setting-line:last-child .settings-toggle .label"
 assert-local-storage: {"rustdoc-disable-shortcuts": "false"}
 press-key: "Escape"
 press-key: "?"
 wait-for-css: ("#help-button .popover", {"display": "block"})
 assert-css: ("#settings-menu .popover", {"display": "none"})
 
+// Now switch back to the settings popover, and make sure the keyboard
+// shortcut works when a check box is selected.
+click: "#settings-menu > a"
+wait-for-css: ("#settings-menu .popover", {"display": "block"})
+focus: "#auto-hide-large-items"
+press-key: "?"
+wait-for-css: ("#settings-menu .popover", {"display": "none"})
+wait-for-css: ("#help-button .popover", {"display": "block"})
+
+// Now switch back to the settings popover, and make sure the keyboard
+// shortcut works when a check box is selected.
+click: "#settings-menu > a"
+wait-for-css: ("#settings-menu .popover", {"display": "block"})
+wait-for-css: ("#help-button .popover", {"display": "none"})
+focus: "#theme-system-preference"
+press-key: "?"
+wait-for-css: ("#settings-menu .popover", {"display": "none"})
+wait-for-css: ("#help-button .popover", {"display": "block"})
+
 // Now we go to the settings page to check that the CSS is loaded as expected.
 goto: "file://" + |DOC_PATH| + "/settings.html"
 wait-for: "#settings"
@@ -184,6 +234,9 @@ assert-css: (".setting-line", {"position": "relative"})
 assert-attribute-false: ("#settings", {"class": "popover"}, CONTAINS)
 compare-elements-position: (".sub form", "#settings", ("x"))
 
+// Check that setting-line has the same margin in this mode as in the popover.
+assert-css: (".setting-line", {"margin": |setting_line_margin|})
+
 // We now check the display with JS disabled.
 assert-false: "noscript section"
 javascript: false
diff --git a/src/test/rustdoc-gui/shortcuts.goml b/tests/rustdoc-gui/shortcuts.goml
index 9068680d6..9068680d6 100644
--- a/src/test/rustdoc-gui/shortcuts.goml
+++ b/tests/rustdoc-gui/shortcuts.goml
diff --git a/src/test/rustdoc-gui/sidebar-links-color.goml b/tests/rustdoc-gui/sidebar-links-color.goml
index 7ef7ec90c..1d5fdb7a4 100644
--- a/src/test/rustdoc-gui/sidebar-links-color.goml
+++ b/tests/rustdoc-gui/sidebar-links-color.goml
@@ -12,80 +12,80 @@ define-function: (
         trait_hover_background, fn, fn_hover, fn_hover_background, type, type_hover,
         type_hover_background, keyword, keyword_hover, keyword_hover_background,
     ),
-    [
-        ("local-storage", { "rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false" }),
-        ("reload"),
+    block {
+        local-storage: { "rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false" }
+        reload:
         // Struct
-        ("assert-css", (
+        assert-css: (
             ".sidebar .block.struct a:not(.current)",
             {"color": |struct|, "background-color": "rgba(0, 0, 0, 0)"},
-        )),
-        ("move-cursor-to", ".sidebar .block.struct a:not(.current)"),
-        ("assert-css", (
+        )
+        move-cursor-to: ".sidebar .block.struct a:not(.current)"
+        assert-css: (
             ".sidebar .block.struct a:hover",
             {"color": |struct_hover|, "background-color": |struct_hover_background|},
-        )),
+        )
         // Enum
-        ("assert-css", (
+        assert-css: (
             ".sidebar .block.enum a",
             {"color": |enum|, "background-color": "rgba(0, 0, 0, 0)"},
-        )),
-        ("move-cursor-to", ".sidebar .block.enum a"),
-        ("assert-css", (
+        )
+        move-cursor-to: ".sidebar .block.enum a"
+        assert-css: (
             ".sidebar .block.enum a:hover",
             {"color": |enum_hover|, "background-color": |enum_hover_background|},
-        )),
+        )
         // Union
-        ("assert-css", (
+        assert-css: (
             ".sidebar .block.union a",
             {"color": |union|, "background-color": "rgba(0, 0, 0, 0)"},
-        )),
-        ("move-cursor-to", ".sidebar .block.union a"),
-        ("assert-css", (
+        )
+        move-cursor-to: ".sidebar .block.union a"
+        assert-css: (
             ".sidebar .block.union a:hover",
             {"color": |union_hover|, "background-color": |union_hover_background|},
-        )),
+        )
         // Trait
-        ("assert-css", (
+        assert-css: (
             ".sidebar .block.trait a",
             {"color": |trait|, "background-color": "rgba(0, 0, 0, 0)"},
-        )),
-        ("move-cursor-to", ".sidebar .block.trait a"),
-        ("assert-css", (
+        )
+        move-cursor-to: ".sidebar .block.trait a"
+        assert-css: (
             ".sidebar .block.trait a:hover",
             {"color": |trait_hover|, "background-color": |trait_hover_background|},
-        )),
+        )
         // Function
-        ("assert-css", (
+        assert-css: (
             ".sidebar .block.fn a",
             {"color": |fn|, "background-color": "rgba(0, 0, 0, 0)"},
-        )),
-        ("move-cursor-to", ".sidebar .block.fn a"),
-        ("assert-css", (
+        )
+        move-cursor-to: ".sidebar .block.fn a"
+        assert-css: (
             ".sidebar .block.fn a:hover",
             {"color": |fn_hover|, "background-color": |fn_hover_background|},
-        )),
+        )
         // Type definition
-        ("assert-css", (
+        assert-css: (
             ".sidebar .block.type a",
             {"color": |type|, "background-color": "rgba(0, 0, 0, 0)"},
-        )),
-        ("move-cursor-to", ".sidebar .block.type a"),
-        ("assert-css", (
+        )
+        move-cursor-to: ".sidebar .block.type a"
+        assert-css: (
             ".sidebar .block.type a:hover",
             {"color": |type_hover|, "background-color": |type_hover_background|},
-        )),
+        )
         // Keyword
-        ("assert-css", (
+        assert-css: (
             ".sidebar .block.keyword a",
             {"color": |keyword|, "background-color": "rgba(0, 0, 0, 0)"},
-        )),
-        ("move-cursor-to", ".sidebar .block.keyword a"),
-        ("assert-css", (
+        )
+        move-cursor-to: ".sidebar .block.keyword a"
+        assert-css: (
             ".sidebar .block.keyword a:hover",
             {"color": |keyword_hover|, "background-color": |keyword_hover_background|},
-        )),
-    ]
+        )
+    }
 )
 
 call-function: (
diff --git a/src/test/rustdoc-gui/sidebar-macro-reexport.goml b/tests/rustdoc-gui/sidebar-macro-reexport.goml
index b5c1b6a43..b5c1b6a43 100644
--- a/src/test/rustdoc-gui/sidebar-macro-reexport.goml
+++ b/tests/rustdoc-gui/sidebar-macro-reexport.goml
diff --git a/src/test/rustdoc-gui/sidebar-mobile-scroll.goml b/tests/rustdoc-gui/sidebar-mobile-scroll.goml
index 2449269b1..2449269b1 100644
--- a/src/test/rustdoc-gui/sidebar-mobile-scroll.goml
+++ b/tests/rustdoc-gui/sidebar-mobile-scroll.goml
diff --git a/src/test/rustdoc-gui/sidebar-mobile.goml b/tests/rustdoc-gui/sidebar-mobile.goml
index 38d01f7f6..d5f4b6196 100644
--- a/src/test/rustdoc-gui/sidebar-mobile.goml
+++ b/tests/rustdoc-gui/sidebar-mobile.goml
@@ -58,17 +58,17 @@ show-text: true
 define-function: (
     "check-colors",
     (theme, color, background),
-    [
-        ("local-storage", {"rustdoc-use-system-theme": "false", "rustdoc-theme": |theme|}),
-        ("reload"),
+    block {
+        local-storage: {"rustdoc-use-system-theme": "false", "rustdoc-theme": |theme|}
+        reload:
 
         // Open the sidebar menu.
-        ("click", ".sidebar-menu-toggle"),
-        ("assert-css", (".sidebar", {
+        click: ".sidebar-menu-toggle"
+        assert-css: (".sidebar", {
             "background-color": |background|,
             "color": |color|,
-        })),
-    ],
+        })
+    },
 )
 
 call-function: ("check-colors", {
diff --git a/tests/rustdoc-gui/sidebar-source-code-display.goml b/tests/rustdoc-gui/sidebar-source-code-display.goml
new file mode 100644
index 000000000..f3eb8ff76
--- /dev/null
+++ b/tests/rustdoc-gui/sidebar-source-code-display.goml
@@ -0,0 +1,215 @@
+// This test ensures that the elements in the sidebar are displayed correctly.
+javascript: false
+goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html"
+// Since the javascript is disabled, there shouldn't be a toggle.
+assert-false: "#src-sidebar-toggle"
+wait-for-css: (".sidebar", {"display": "none"})
+
+// Let's retry with javascript enabled.
+javascript: true
+reload:
+wait-for: "#src-sidebar-toggle"
+assert-css: ("#src-sidebar-toggle", {"visibility": "visible"})
+assert-css: (".sidebar > *:not(#src-sidebar-toggle)", {"visibility": "hidden"})
+// Let's expand the sidebar now.
+click: "#src-sidebar-toggle"
+wait-for-css: ("#src-sidebar-toggle", {"visibility": "visible"})
+
+// We now check that opening the sidebar and clicking a link will leave it open.
+// The behavior here on desktop is different than the behavior on mobile,
+// but since the sidebar doesn't fill the entire screen here, it makes sense to have the
+// sidebar stay resident.
+wait-for-css: (".sidebar", {"width": "300px"})
+assert-local-storage: {"rustdoc-source-sidebar-show": "true"}
+click: ".sidebar a.selected"
+goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html"
+wait-for-css: (".sidebar", {"width": "300px"})
+assert-local-storage: {"rustdoc-source-sidebar-show": "true"}
+
+// Now we check the display of the sidebar items.
+show-text: true
+
+define-function: (
+    "check-colors",
+    (
+        theme, color, color_hover, background, background_hover, background_toggle,
+        background_toggle_hover,
+    ),
+    block {
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        wait-for-css: ("#src-sidebar-toggle", {"visibility": "visible"})
+        assert-css: (
+            "#source-sidebar details[open] > .files a.selected",
+            {"color": |color_hover|, "background-color": |background|},
+        )
+
+        // Without hover or focus.
+        assert-css: ("#src-sidebar-toggle > button", {"background-color": |background_toggle|})
+        // With focus.
+        focus: "#src-sidebar-toggle > button"
+        assert-css: (
+            "#src-sidebar-toggle > button:focus",
+            {"background-color": |background_toggle_hover|},
+        )
+        focus: ".search-input"
+        // With hover.
+        move-cursor-to: "#src-sidebar-toggle > button"
+        assert-css: (
+            "#src-sidebar-toggle > button:hover",
+            {"background-color": |background_toggle_hover|},
+        )
+
+        // Without hover or focus.
+        assert-css: (
+            "#source-sidebar details[open] > .files a:not(.selected)",
+            {"color": |color|, "background-color": |background_toggle|},
+        )
+        // With focus.
+        focus: "#source-sidebar details[open] > .files a:not(.selected)"
+        wait-for-css: (
+            "#source-sidebar details[open] > .files a:not(.selected):focus",
+            {"color": |color_hover|, "background-color": |background_hover|},
+        )
+        focus: ".search-input"
+        // With hover.
+        move-cursor-to: "#source-sidebar details[open] > .files a:not(.selected)"
+        assert-css: (
+            "#source-sidebar details[open] > .files a:not(.selected):hover",
+            {"color": |color_hover|, "background-color": |background_hover|},
+        )
+
+        // Without hover or focus.
+        assert-css: (
+            "#source-sidebar .dir-entry summary",
+            {"color": |color|, "background-color": |background_toggle|},
+        )
+        // With focus.
+        focus: "#source-sidebar .dir-entry summary"
+        wait-for-css: (
+            "#source-sidebar .dir-entry summary:focus",
+            {"color": |color_hover|, "background-color": |background_hover|},
+        )
+        focus: ".search-input"
+        // With hover.
+        move-cursor-to: "#source-sidebar .dir-entry summary"
+        assert-css: (
+            "#source-sidebar .dir-entry summary:hover",
+            {"color": |color_hover|, "background-color": |background_hover|},
+        )
+
+        // Without hover or focus.
+        assert-css: (
+            "#source-sidebar details[open] > .folders > details > summary",
+            {"color": |color|, "background-color": |background_toggle|},
+        )
+        // With focus.
+        focus: "#source-sidebar details[open] > .folders > details > summary"
+        wait-for-css: (
+            "#source-sidebar details[open] > .folders > details > summary:focus",
+            {"color": |color_hover|, "background-color": |background_hover|},
+        )
+        focus: ".search-input"
+        // With hover.
+        move-cursor-to: "#source-sidebar details[open] > .folders > details > summary"
+        assert-css: (
+            "#source-sidebar details[open] > .folders > details > summary:hover",
+            {"color": |color_hover|, "background-color": |background_hover|},
+        )
+    },
+)
+
+call-function: ("check-colors", {
+    "theme": "light",
+    "color": "rgb(0, 0, 0)",
+    "color_hover": "rgb(0, 0, 0)",
+    "background": "rgb(255, 255, 255)",
+    "background_hover": "rgb(224, 224, 224)",
+    "background_toggle": "rgba(0, 0, 0, 0)",
+    "background_toggle_hover": "rgb(224, 224, 224)",
+})
+call-function: ("check-colors", {
+    "theme": "dark",
+    "color": "rgb(221, 221, 221)",
+    "color_hover": "rgb(221, 221, 221)",
+    "background": "rgb(51, 51, 51)",
+    "background_hover": "rgb(68, 68, 68)",
+    "background_toggle": "rgba(0, 0, 0, 0)",
+    "background_toggle_hover": "rgb(103, 103, 103)",
+})
+call-function: ("check-colors", {
+    "theme": "ayu",
+    "color": "rgb(197, 197, 197)",
+    "color_hover": "rgb(255, 180, 76)",
+    "background": "rgb(20, 25, 31)",
+    "background_hover": "rgb(20, 25, 31)",
+    "background_toggle": "rgba(0, 0, 0, 0)",
+    "background_toggle_hover": "rgba(70, 70, 70, 0.33)",
+})
+
+// Now checking on mobile devices.
+size: (500, 700)
+reload:
+// Waiting for the sidebar to be displayed...
+wait-for-css: ("#src-sidebar-toggle", {"visibility": "visible"})
+
+// We now check it takes the full size of the display.
+assert-property: ("body", {"clientWidth": "500", "clientHeight": "700"})
+assert-property: (".sidebar", {"clientWidth": "500", "clientHeight": "700"})
+
+// We now check the display of the toggle once the sidebar is expanded.
+assert-property: ("#src-sidebar-toggle", {"clientWidth": "500", "clientHeight": "39"})
+assert-css: (
+    "#src-sidebar-toggle",
+    {
+        "border-top-width": "0px",
+        "border-right-width": "0px",
+        "border-left-width": "0px",
+        "border-bottom-width": "1px",
+    },
+)
+
+// We now check that the scroll position is kept when opening the sidebar.
+click: "#src-sidebar-toggle"
+wait-for-css: (".sidebar", {"left": "-1000px"})
+// We scroll to line 117 to change the scroll position.
+scroll-to: '//*[@id="117"]'
+assert-window-property: {"pageYOffset": "2542"}
+// Expanding the sidebar...
+click: "#src-sidebar-toggle"
+wait-for-css: (".sidebar", {"left": "0px"})
+click: "#src-sidebar-toggle"
+wait-for-css: (".sidebar", {"left": "-1000px"})
+// The "scrollTop" property should be the same.
+assert-window-property: {"pageYOffset": "2542"}
+
+// We now check that the scroll position is restored if the window is resized.
+size: (500, 700)
+click: "#src-sidebar-toggle"
+wait-for-css: ("#source-sidebar", {"visibility": "visible"})
+assert-window-property: {"pageYOffset": "0"}
+size: (900, 900)
+assert-window-property: {"pageYOffset": "2542"}
+size: (500, 700)
+click: "#src-sidebar-toggle"
+wait-for-css: ("#source-sidebar", {"visibility": "hidden"})
+
+// We now check that opening the sidebar and clicking a link will close it.
+// The behavior here on mobile is different than the behavior on desktop,
+// but common sense dictates that if you have a list of files that fills the entire screen, and
+// you click one of them, you probably want to actually see the file's contents, and not just
+// make it the current selection.
+click: "#src-sidebar-toggle"
+wait-for-css: ("#source-sidebar", {"visibility": "visible"})
+assert-local-storage: {"rustdoc-source-sidebar-show": "true"}
+click: ".sidebar a.selected"
+goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html"
+wait-for-css: ("#source-sidebar", {"visibility": "hidden"})
+assert-local-storage: {"rustdoc-source-sidebar-show": "false"}
+// Resize back to desktop size, to check that the sidebar doesn't spontaneously open.
+size: (1000, 1000)
+wait-for-css: ("#source-sidebar", {"visibility": "hidden"})
+assert-local-storage: {"rustdoc-source-sidebar-show": "false"}
+click: "#src-sidebar-toggle"
+wait-for-css: ("#source-sidebar", {"visibility": "visible"})
+assert-local-storage: {"rustdoc-source-sidebar-show": "true"}
diff --git a/tests/rustdoc-gui/sidebar-source-code.goml b/tests/rustdoc-gui/sidebar-source-code.goml
new file mode 100644
index 000000000..c8a29b58d
--- /dev/null
+++ b/tests/rustdoc-gui/sidebar-source-code.goml
@@ -0,0 +1,90 @@
+// The goal of this test is to ensure that the sidebar is working as expected in the source
+// code pages.
+goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html"
+show-text: true
+
+// First, check the sidebar colors.
+define-function: (
+    "check-colors",
+    (theme, color, background_color),
+    block {
+        local-storage: {
+            "rustdoc-theme": |theme|,
+            "rustdoc-use-system-theme": "false",
+        }
+        reload:
+        // Checking results colors.
+        assert-css: (".source .sidebar", {
+            "color": |color|,
+            "background-color": |background_color|
+        }, ALL)
+    },
+)
+
+call-function: (
+    "check-colors",
+    {
+        "theme": "ayu",
+        "color": "rgb(197, 197, 197)",
+        "background_color": "rgb(20, 25, 31)",
+    }
+)
+call-function: (
+    "check-colors",
+    {
+        "theme": "dark",
+        "color": "rgb(221, 221, 221)",
+        "background_color": "rgb(80, 80, 80)",
+    }
+)
+call-function: (
+    "check-colors",
+    {
+        "theme": "light",
+        "color": "rgb(0, 0, 0)",
+        "background_color": "rgb(245, 245, 245)",
+    }
+)
+
+// Next, desktop mode layout.
+size: (1100, 800)
+// We check that the sidebar isn't expanded and has the expected width.
+assert-css: ("nav.sidebar", {"width": "50px"})
+// We now click on the button to expand the sidebar.
+click: (10, 10)
+// We wait for the sidebar to be expanded.
+wait-for-css: (".source-sidebar-expanded nav.sidebar", {"width": "300px"})
+assert-css: (".source-sidebar-expanded nav.sidebar a", {"font-size": "14px"})
+// We collapse the sidebar.
+click: (10, 10)
+// We ensure that the class has been removed.
+wait-for: "html:not(.expanded)"
+assert: "nav.sidebar"
+
+// Checking that only the path to the current file is "open".
+goto: "file://" + |DOC_PATH| + "/src/lib2/another_folder/sub_mod/mod.rs.html"
+// First we expand the sidebar again.
+click: (10, 10)
+// We wait for the sidebar to be expanded.
+wait-for-css: (".source-sidebar-expanded nav.sidebar", {"width": "300px"})
+assert: "//*[@class='dir-entry' and @open]/*[text()='lib2']"
+assert: "//*[@class='dir-entry' and @open]/*[text()='another_folder']"
+assert: "//*[@class='dir-entry' and @open]/*[text()='sub_mod']"
+// Only "another_folder" should be "open" in "lib2".
+assert: "//*[@class='dir-entry' and not(@open)]/*[text()='another_mod']"
+// All other trees should be collapsed.
+assert-count: ("//*[@id='source-sidebar']/details[not(text()='lib2') and not(@open)]", 8)
+
+// We now switch to mobile mode.
+size: (600, 600)
+wait-for-css: (".source-sidebar-expanded nav.sidebar", {"left": "0px"})
+// We collapse the sidebar.
+click: (10, 10)
+// We check that the sidebar has been moved off-screen.
+assert-css: ("nav.sidebar", {"left": "-1000px"})
+// We ensure that the class has been removed.
+assert-false: ".source-sidebar-expanded"
+assert: "nav.sidebar"
+
+// Check that the topbar is not visible
+assert-false: ".mobile-topbar"
diff --git a/src/test/rustdoc-gui/sidebar.goml b/tests/rustdoc-gui/sidebar.goml
index 5058630f4..9c742be05 100644
--- a/src/test/rustdoc-gui/sidebar.goml
+++ b/tests/rustdoc-gui/sidebar.goml
@@ -2,6 +2,50 @@
 goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
 assert-property: (".sidebar", {"clientWidth": "200"})
 show-text: true
+
+// First, check the sidebar colors.
+define-function: (
+    "check-colors",
+    (theme, color, background_color),
+    block {
+        local-storage: {
+            "rustdoc-theme": |theme|,
+            "rustdoc-use-system-theme": "false",
+        }
+        reload:
+        // Checking results colors.
+        assert-css: (".sidebar", {
+            "color": |color|,
+            "background-color": |background_color|
+        }, ALL)
+    },
+)
+
+call-function: (
+    "check-colors",
+    {
+        "theme": "ayu",
+        "color": "rgb(197, 197, 197)",
+        "background_color": "rgb(20, 25, 31)",
+    }
+)
+call-function: (
+    "check-colors",
+    {
+        "theme": "dark",
+        "color": "rgb(221, 221, 221)",
+        "background_color": "rgb(80, 80, 80)",
+    }
+)
+call-function: (
+    "check-colors",
+    {
+        "theme": "light",
+        "color": "rgb(0, 0, 0)",
+        "background_color": "rgb(245, 245, 245)",
+    }
+)
+
 local-storage: {"rustdoc-theme": "light"}
 // We reload the page so the local storage settings are being used.
 reload:
@@ -104,4 +148,4 @@ assert-text: ("#toggle-all-docs", "[+]")
 assert-property: (".sidebar", {"clientWidth": "200"})
 click: "#toggle-all-docs"
 assert-text: ("#toggle-all-docs", "[−]")
-assert-property: (".sidebar", {"clientWidth": "200"})
\ No newline at end of file
+assert-property: (".sidebar", {"clientWidth": "200"})
diff --git a/src/test/rustdoc-gui/source-anchor-scroll.goml b/tests/rustdoc-gui/source-anchor-scroll.goml
index ddfe0c3d1..ddfe0c3d1 100644
--- a/src/test/rustdoc-gui/source-anchor-scroll.goml
+++ b/tests/rustdoc-gui/source-anchor-scroll.goml
diff --git a/tests/rustdoc-gui/source-code-page.goml b/tests/rustdoc-gui/source-code-page.goml
new file mode 100644
index 000000000..7c35119e6
--- /dev/null
+++ b/tests/rustdoc-gui/source-code-page.goml
@@ -0,0 +1,218 @@
+// Checks that the interactions with the source code pages are working as expected.
+goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html"
+show-text: true
+// Check that we can click on the line number.
+click: ".src-line-numbers > a:nth-child(4)" // This is the anchor for line 4.
+// Ensure that the page URL was updated.
+assert-document-property: ({"URL": "lib.rs.html#4"}, ENDS_WITH)
+assert-attribute: ("//*[@id='4']", {"class": "line-highlighted"})
+// Ensure that the default style, with the right border, isn't used.
+assert-css: ("//*[@id='4']", {"border-right-width": "0px"})
+reload:
+assert-attribute: ("//*[@id='4']", {"class": "line-highlighted"})
+assert-css: ("//*[@id='4']", {"border-right-width": "0px"})
+// We now check that the good anchors are highlighted
+goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html#4-6"
+assert-attribute-false: (".src-line-numbers > a:nth-child(3)", {"class": "line-highlighted"})
+assert-attribute: (".src-line-numbers > a:nth-child(4)", {"class": "line-highlighted"})
+assert-attribute: (".src-line-numbers > a:nth-child(5)", {"class": "line-highlighted"})
+assert-attribute: (".src-line-numbers > a:nth-child(6)", {"class": "line-highlighted"})
+assert-attribute-false: (".src-line-numbers > a:nth-child(7)", {"class": "line-highlighted"})
+
+define-function: (
+    "check-colors",
+    (theme, color, background_color, highlight_color, highlight_background_color),
+    block {
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        assert-css: (
+            ".src-line-numbers > a:not(.line-highlighted)",
+            {"color": |color|, "background-color": |background_color|},
+            ALL,
+        )
+        assert-css: (
+            ".src-line-numbers > a.line-highlighted",
+            {"color": |highlight_color|, "background-color": |highlight_background_color|},
+            ALL,
+        )
+    },
+)
+
+call-function: ("check-colors", {
+    "theme": "ayu",
+    "color": "rgb(92, 103, 115)",
+    "background_color": "rgba(0, 0, 0, 0)",
+    "highlight_color": "rgb(112, 128, 144)",
+    "highlight_background_color": "rgba(255, 236, 164, 0.06)",
+})
+call-function: ("check-colors", {
+    "theme": "dark",
+    "color": "rgb(59, 145, 226)",
+    "background_color": "rgba(0, 0, 0, 0)",
+    "highlight_color": "rgb(59, 145, 226)",
+    "highlight_background_color": "rgb(10, 4, 47)",
+})
+call-function: ("check-colors", {
+    "theme": "light",
+    "color": "rgb(198, 126, 45)",
+    "background_color": "rgba(0, 0, 0, 0)",
+    "highlight_color": "rgb(198, 126, 45)",
+    "highlight_background_color": "rgb(253, 255, 211)",
+})
+
+// This is to ensure that the content is correctly align with the line numbers.
+compare-elements-position: ("//*[@id='1']", ".rust > code > span", ("y"))
+// Check the `href` property so that users can treat anchors as links.
+assert-property: (".src-line-numbers > a:nth-child(1)", {
+    "href": "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html#1"
+})
+assert-property: (".src-line-numbers > a:nth-child(2)", {
+    "href": "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html#2"
+})
+assert-property: (".src-line-numbers > a:nth-child(3)", {
+    "href": "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html#3"
+})
+assert-property: (".src-line-numbers > a:nth-child(4)", {
+    "href": "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html#4"
+})
+assert-property: (".src-line-numbers > a:nth-child(5)", {
+    "href": "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html#5"
+})
+assert-property: (".src-line-numbers > a:nth-child(6)", {
+    "href": "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html#6"
+})
+
+// Assert that the line numbers text is aligned to the right.
+assert-css: (".src-line-numbers", {"text-align": "right"})
+
+// Now let's check that clicking on something else than the line number doesn't
+// do anything (and certainly not add a `#NaN` to the URL!).
+goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html"
+// We use this assert-position to know where we will click.
+assert-position: ("//*[@id='1']", {"x": 88, "y": 112})
+// We click on the left of the "1" anchor but still in the "src-line-number" `<pre>`.
+click: (87, 103)
+assert-document-property: ({"URL": "/lib.rs.html"}, ENDS_WITH)
+
+// Checking the source code sidebar.
+
+// First we "open" it.
+click: "#src-sidebar-toggle"
+assert: ".source-sidebar-expanded"
+
+// We check that the first entry of the sidebar is collapsed
+assert-property: ("#source-sidebar details:first-of-type", {"open": "false"})
+assert-text: ("#source-sidebar details:first-of-type > summary", "http")
+// We now click on it.
+click: "#source-sidebar details:first-of-type > summary"
+assert-property: ("#source-sidebar details:first-of-type", {"open": "true"})
+
+// And now we collapse it again.
+click: "#source-sidebar details:first-of-type > summary"
+assert-property: ("#source-sidebar details:first-of-type", {"open": "false"})
+
+// And open it again, since it'll be the reference we use to check positions.
+click: "#source-sidebar details:first-of-type > summary"
+assert-property: ("#source-sidebar details:first-of-type", {"open": "true"})
+
+// Check the sidebar directory entries have a marker and spacing (desktop).
+store-property: (
+    link_height,
+    "#source-sidebar > details:first-of-type.dir-entry[open] > .files > a",
+    "offsetHeight"
+)
+define-function: (
+    "check-sidebar-dir-entry",
+    (x, y),
+    block {
+        assert: "details:first-of-type.dir-entry[open] > summary::marker"
+        assert-css: ("#source-sidebar > details:first-of-type.dir-entry", {"padding-left": "4px"})
+        // This check ensures that the summary is only one line.
+        assert-property: (
+            "#source-sidebar > details:first-of-type.dir-entry[open] > summary",
+            {"offsetHeight": |link_height|}
+        )
+        assert-position: (
+            "#source-sidebar > details:first-of-type.dir-entry[open] > summary",
+            {"x": |x|, "y": |y|}
+        )
+        assert-property: (
+            "#source-sidebar > details:first-of-type.dir-entry[open] > .files > a",
+            {"offsetHeight": |link_height|}
+        )
+        assert-position: (
+            "#source-sidebar > details:first-of-type.dir-entry[open] > .files > a",
+            // left margin
+            {"x": |x| + 27, "y": |y| + |link_height|}
+        )
+    }
+)
+store-property: (
+    source_sidebar_title_height,
+    "#source-sidebar > .title",
+    "offsetHeight"
+)
+store-property: (
+    source_sidebar_title_y,
+    "#source-sidebar > .title",
+    "offsetTop"
+)
+call-function: ("check-sidebar-dir-entry", {
+    "x": 0,
+    // border + margin = 6
+    "y": |source_sidebar_title_y| + |source_sidebar_title_height| + 6,
+})
+
+// Check the search form
+assert-css: ("nav.sub", {"flex-direction": "row"})
+// The goal of this test is to ensure the search input is perfectly centered
+// between the top of the page and the top of the gray code block.
+// To check this, we maintain the invariant:
+//
+// offsetTop[nav.sub form] = offsetTop[#main-content] - offsetHeight[nav.sub form] - offsetTop[nav.sub form]
+assert-property: ("nav.sub form", {"offsetTop": 28, "offsetHeight": 34})
+assert-property: ("#main-content", {"offsetTop": 90})
+// 28 = 90 - 34 - 28
+
+// Now do the same check on moderately-sized, tablet mobile.
+size: (700, 700)
+assert-css: ("nav.sub", {"flex-direction": "row"})
+assert-property: ("nav.sub form", {"offsetTop": 21, "offsetHeight": 34})
+assert-property: ("#main-content", {"offsetTop": 76})
+// 21 = 76 - 34 - 21
+
+// Check the sidebar directory entries have a marker and spacing (tablet).
+store-property: (
+    source_sidebar_title_height,
+    "#source-sidebar > .title",
+    "offsetHeight"
+)
+store-property: (
+    source_sidebar_title_y,
+    "#source-sidebar > .title",
+    "offsetTop"
+)
+call-function: ("check-sidebar-dir-entry", {
+    "x": 0,
+    "y": |source_sidebar_title_y| + |source_sidebar_title_height| + 6,
+})
+
+// Tiny, phone mobile gets a different display where the logo is stacked on top.
+size: (450, 700)
+assert-css: ("nav.sub", {"flex-direction": "column"})
+
+// Check the sidebar directory entries have a marker and spacing (phone).
+store-property: (
+    source_sidebar_title_height,
+    "#source-sidebar > .title",
+    "offsetHeight"
+)
+store-property: (
+    source_sidebar_title_y,
+    "#source-sidebar > .title",
+    "offsetTop"
+)
+call-function: ("check-sidebar-dir-entry", {
+    "x": 0,
+    "y": |source_sidebar_title_y| + |source_sidebar_title_height| + 6,
+})
diff --git a/src/test/rustdoc-gui/src-font-size.goml b/tests/rustdoc-gui/src-font-size.goml
index 9233f3744..9233f3744 100644
--- a/src/test/rustdoc-gui/src-font-size.goml
+++ b/tests/rustdoc-gui/src-font-size.goml
diff --git a/src/test/rustdoc-gui/src/huge_logo/Cargo.lock b/tests/rustdoc-gui/src/huge_logo/Cargo.lock
index 142805750..142805750 100644
--- a/src/test/rustdoc-gui/src/huge_logo/Cargo.lock
+++ b/tests/rustdoc-gui/src/huge_logo/Cargo.lock
diff --git a/src/test/rustdoc-gui/src/huge_logo/Cargo.toml b/tests/rustdoc-gui/src/huge_logo/Cargo.toml
index 3f10d09c8..3f10d09c8 100644
--- a/src/test/rustdoc-gui/src/huge_logo/Cargo.toml
+++ b/tests/rustdoc-gui/src/huge_logo/Cargo.toml
diff --git a/src/test/rustdoc-gui/src/huge_logo/src/lib.rs b/tests/rustdoc-gui/src/huge_logo/src/lib.rs
index ec137fb9a..ec137fb9a 100644
--- a/src/test/rustdoc-gui/src/huge_logo/src/lib.rs
+++ b/tests/rustdoc-gui/src/huge_logo/src/lib.rs
diff --git a/tests/rustdoc-gui/src/lib2/Cargo.lock b/tests/rustdoc-gui/src/lib2/Cargo.lock
new file mode 100644
index 000000000..425a3ae7e
--- /dev/null
+++ b/tests/rustdoc-gui/src/lib2/Cargo.lock
@@ -0,0 +1,22 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "http"
+version = "0.1.0"
+
+[[package]]
+name = "implementors"
+version = "0.1.0"
+dependencies = [
+ "http",
+]
+
+[[package]]
+name = "lib2"
+version = "0.1.0"
+dependencies = [
+ "http",
+ "implementors",
+]
diff --git a/tests/rustdoc-gui/src/lib2/Cargo.toml b/tests/rustdoc-gui/src/lib2/Cargo.toml
new file mode 100644
index 000000000..8bca77ff8
--- /dev/null
+++ b/tests/rustdoc-gui/src/lib2/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "lib2"
+version = "0.1.0"
+edition = "2018"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+implementors = { path = "./implementors" }
+http = { path = "./http" }
diff --git a/src/test/rustdoc-gui/src/lib2/another_folder/mod.rs b/tests/rustdoc-gui/src/lib2/another_folder/mod.rs
index ec9a20859..ec9a20859 100644
--- a/src/test/rustdoc-gui/src/lib2/another_folder/mod.rs
+++ b/tests/rustdoc-gui/src/lib2/another_folder/mod.rs
diff --git a/src/test/rustdoc-gui/src/lib2/another_folder/sub_mod/mod.rs b/tests/rustdoc-gui/src/lib2/another_folder/sub_mod/mod.rs
index f16722cf3..f16722cf3 100644
--- a/src/test/rustdoc-gui/src/lib2/another_folder/sub_mod/mod.rs
+++ b/tests/rustdoc-gui/src/lib2/another_folder/sub_mod/mod.rs
diff --git a/src/test/rustdoc-gui/src/lib2/another_mod/mod.rs b/tests/rustdoc-gui/src/lib2/another_mod/mod.rs
index 9a4f007a2..9a4f007a2 100644
--- a/src/test/rustdoc-gui/src/lib2/another_mod/mod.rs
+++ b/tests/rustdoc-gui/src/lib2/another_mod/mod.rs
diff --git a/tests/rustdoc-gui/src/lib2/http/Cargo.toml b/tests/rustdoc-gui/src/lib2/http/Cargo.toml
new file mode 100644
index 000000000..fa719efa5
--- /dev/null
+++ b/tests/rustdoc-gui/src/lib2/http/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "http"
+version = "0.1.0"
+edition = "2018"
+
+[lib]
+path = "lib.rs"
diff --git a/tests/rustdoc-gui/src/lib2/http/lib.rs b/tests/rustdoc-gui/src/lib2/http/lib.rs
new file mode 100644
index 000000000..204e07494
--- /dev/null
+++ b/tests/rustdoc-gui/src/lib2/http/lib.rs
@@ -0,0 +1 @@
+pub trait HttpTrait {}
diff --git a/src/test/rustdoc-gui/src/lib2/implementors/Cargo.lock b/tests/rustdoc-gui/src/lib2/implementors/Cargo.lock
index cad99a991..cad99a991 100644
--- a/src/test/rustdoc-gui/src/lib2/implementors/Cargo.lock
+++ b/tests/rustdoc-gui/src/lib2/implementors/Cargo.lock
diff --git a/tests/rustdoc-gui/src/lib2/implementors/Cargo.toml b/tests/rustdoc-gui/src/lib2/implementors/Cargo.toml
new file mode 100644
index 000000000..9dafc43df
--- /dev/null
+++ b/tests/rustdoc-gui/src/lib2/implementors/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "implementors"
+version = "0.1.0"
+edition = "2018"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+http = { path = "../http/" }
diff --git a/tests/rustdoc-gui/src/lib2/implementors/lib.rs b/tests/rustdoc-gui/src/lib2/implementors/lib.rs
new file mode 100644
index 000000000..2842ac50d
--- /dev/null
+++ b/tests/rustdoc-gui/src/lib2/implementors/lib.rs
@@ -0,0 +1,22 @@
+pub trait Whatever {
+    type Foo;
+
+    fn method() {}
+}
+
+pub struct Struct;
+
+impl Whatever for Struct {
+    type Foo = u8;
+}
+
+impl http::HttpTrait for Struct {}
+
+mod traits {
+    pub trait TraitToReexport {
+        fn method() {}
+    }
+}
+
+#[doc(inline)]
+pub use traits::TraitToReexport;
diff --git a/tests/rustdoc-gui/src/lib2/lib.rs b/tests/rustdoc-gui/src/lib2/lib.rs
new file mode 100644
index 000000000..34e67d9d2
--- /dev/null
+++ b/tests/rustdoc-gui/src/lib2/lib.rs
@@ -0,0 +1,343 @@
+// ignore-tidy-linelength
+
+#![feature(doc_cfg)]
+
+pub mod another_folder;
+pub mod another_mod;
+
+pub mod module {
+    pub mod sub_module {
+        pub mod sub_sub_module {
+            pub fn foo() {}
+        }
+        pub fn bar() {}
+    }
+    pub fn whatever() {}
+}
+
+pub fn foobar() {}
+
+pub type Alias = u32;
+
+#[doc(cfg(feature = "foo-method"))]
+pub struct Foo {
+    pub x: Alias,
+}
+
+impl Foo {
+    /// Some documentation
+    /// # A Heading
+    pub fn a_method(&self) {}
+}
+
+#[doc(cfg(feature = "foo-method"))]
+#[deprecated = "Whatever [`Foo::a_method`](#method.a_method)"]
+pub trait Trait {
+    type X;
+    const Y: u32;
+
+    #[deprecated = "Whatever [`Foo`](#tadam)"]
+    fn foo() {}
+    fn fooo();
+}
+
+impl Trait for Foo {
+    type X = u32;
+    const Y: u32 = 0;
+
+    fn fooo() {}
+}
+
+impl implementors::Whatever for Foo {
+    type Foo = u32;
+}
+
+#[doc(inline)]
+pub use implementors::TraitToReexport;
+
+pub struct StructToImplOnReexport;
+
+impl TraitToReexport for StructToImplOnReexport {}
+
+pub mod sub_mod {
+    /// ```txt
+    /// aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+    /// ```
+    ///
+    /// ```
+    /// aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+    /// ```
+    pub struct Foo;
+}
+
+pub mod long_trait {
+    use std::ops::DerefMut;
+
+    pub trait ALongNameBecauseItHelpsTestingTheCurrentProblem:
+        DerefMut<Target = u32> + From<u128> + Send + Sync + AsRef<str> + 'static
+    {
+    }
+}
+
+pub mod long_table {
+    /// | This::is::a::kinda::very::long::header::number::one | This::is::a::kinda::very::long::header::number::two | This::is::a::kinda::very::long::header::number::one | This::is::a::kinda::very::long::header::number::two |
+    /// | ----------- | ----------- | ----------- | ----------- |
+    /// | This::is::a::kinda::long::content::number::one | This::is::a::kinda::very::long::content::number::two | This::is::a::kinda::long::content::number::one | This::is::a::kinda::very::long::content::number::two |
+    ///
+    /// I wanna sqdkfnqds f dsqf qds f dsqf dsq f dsq f qds f qds f qds f dsqq f dsf sqdf dsq fds f dsq f dq f ds fq sd fqds f dsq f sqd fsq df sd fdsqfqsd fdsq f dsq f dsqfd s dfq
+    pub struct Foo;
+
+    /// | This::is::a::kinda::very::long::header::number::one | This::is::a::kinda::very::long::header::number::two | This::is::a::kinda::very::long::header::number::one | This::is::a::kinda::very::long::header::number::two |
+    /// | ----------- | ----------- | ----------- | ----------- |
+    /// | This::is::a::kinda::long::content::number::one | This::is::a::kinda::very::long::content::number::two | This::is::a::kinda::long::content::number::one | This::is::a::kinda::very::long::content::number::two |
+    ///
+    /// I wanna sqdkfnqds f dsqf qds f dsqf dsq f dsq f qds f qds f qds f dsqq f dsf sqdf dsq fds f dsq f dq f ds fq sd fqds f dsq f sqd fsq df sd fdsqfqsd fdsq f dsq f dsqfd s dfq
+    impl Foo {
+        pub fn foo(&self) {}
+    }
+}
+
+pub mod summary_table {
+    /// | header 1 | header 2 |
+    /// | -------- | -------- |
+    /// | content | content |
+    pub struct Foo;
+}
+
+pub mod too_long {
+    pub type ReallyLongTypeNameLongLongLong =
+        Option<unsafe extern "C" fn(a: *const u8, b: *const u8) -> *const u8>;
+
+    pub const ReallyLongTypeNameLongLongLongConstBecauseWhyNotAConstRightGigaGigaSupraLong: u32 = 0;
+
+    /// This also has a really long doccomment. Lorem ipsum dolor sit amet,
+    /// consectetur adipiscing elit. Suspendisse id nibh malesuada, hendrerit
+    /// massa vel, tincidunt est. Nulla interdum, sem ac efficitur ornare, arcu
+    /// nunc dignissim nibh, at rutrum diam augue ac mauris. Fusce tincidunt et
+    /// ligula sed viverra. Aenean sed facilisis dui, non volutpat felis. In
+    /// vitae est dui. Donec felis nibh, blandit at nibh eu, tempor suscipit
+    /// nisl. Vestibulum ornare porta libero, eu faucibus purus iaculis ut. Ut
+    /// quis tincidunt nunc, in mollis purus. Nulla sed interdum quam. Nunc
+    /// vitae cursus ex.
+    pub struct SuperIncrediblyLongLongLongLongLongLongLongGigaGigaGigaMegaLongLongLongStructName {
+        pub a: u32,
+    }
+
+    impl SuperIncrediblyLongLongLongLongLongLongLongGigaGigaGigaMegaLongLongLongStructName {
+        /// ```
+        /// let x = SuperIncrediblyLongLongLongLongLongLongLongGigaGigaGigaMegaLongLongLongStructName { a: 0 };
+        /// ```
+        pub fn foo(&self) {}
+    }
+}
+
+pub struct HasALongTraitWithParams {}
+
+pub trait LongTraitWithParamsBananaBananaBanana<T> {}
+
+impl LongTraitWithParamsBananaBananaBanana<usize> for HasALongTraitWithParams {}
+
+#[doc(cfg(any(target_os = "android", target_os = "linux", target_os = "emscripten", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd")))]
+pub struct LongItemInfo;
+
+pub trait SimpleTrait {}
+pub struct LongItemInfo2;
+
+/// Some docs.
+#[doc(cfg(any(target_os = "android", target_os = "linux", target_os = "emscripten", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd")))]
+impl SimpleTrait for LongItemInfo2 {}
+
+pub struct WhereWhitespace<T>;
+
+impl<T> WhereWhitespace<T> {
+    pub fn new<F>(f: F) -> Self
+    where
+        F: FnMut() -> i32,
+    {}
+}
+
+impl<K, T> Whitespace<&K> for WhereWhitespace<T>
+where
+    K: std::fmt::Debug,
+{
+    type Output = WhereWhitespace<T>;
+    fn index(&self, _key: &K) -> &Self::Output {
+        self
+    }
+}
+
+pub trait Whitespace<Idx>
+where
+    Idx: ?Sized,
+{
+    type Output;
+    fn index(&self, index: Idx) -> &Self::Output;
+}
+
+pub struct ItemInfoAlignmentTest;
+
+impl ItemInfoAlignmentTest {
+    /// This method has docs
+    #[deprecated]
+    pub fn foo() {}
+    #[deprecated]
+    pub fn bar() {}
+}
+
+pub mod scroll_traits {
+    use std::iter::*;
+
+    /// Shamelessly (partially) copied from `std::iter::Iterator`.
+    /// It allows us to check that the scroll is working as expected on "hidden" items.
+    pub trait Iterator {
+        type Item;
+
+        fn next(&mut self) -> Option<Self::Item>;
+        fn size_hint(&self) -> (usize, Option<usize>);
+        fn count(self) -> usize
+        where
+            Self: Sized;
+        fn last(self) -> Option<Self::Item>
+        where
+            Self: Sized;
+        fn advance_by(&mut self, n: usize) -> Result<(), usize>;
+        fn nth(&mut self, n: usize) -> Option<Self::Item>;
+        fn step_by(self, step: usize) -> StepBy<Self>
+        where
+            Self: Sized;
+        fn chain<U>(self, other: U) -> Chain<Self, U::IntoIter>
+        where
+            Self: Sized,
+            U: IntoIterator<Item = Self::Item>;
+        fn zip<U>(self, other: U) -> Zip<Self, U::IntoIter>
+        where
+            Self: Sized,
+            U: IntoIterator;
+        fn intersperse(self, separator: Self::Item) -> Intersperse<Self>
+        where
+            Self: Sized,
+            Self::Item: Clone;
+        fn intersperse_with<G>(self, separator: G) -> IntersperseWith<Self, G>
+        where
+            Self: Sized,
+            G: FnMut() -> Self::Item;
+        fn map<B, F>(self, f: F) -> Map<Self, F>
+        where
+            Self: Sized,
+            F: FnMut(Self::Item) -> B;
+        fn for_each<F>(self, f: F)
+        where
+            Self: Sized,
+            F: FnMut(Self::Item);
+        fn filter<P>(self, predicate: P) -> Filter<Self, P>
+        where
+            Self: Sized,
+            P: FnMut(&Self::Item) -> bool;
+        fn filter_map<B, F>(self, f: F) -> FilterMap<Self, F>
+        where
+            Self: Sized,
+            F: FnMut(Self::Item) -> Option<B>;
+        fn enumerate(self) -> Enumerate<Self>
+        where
+            Self: Sized;
+        fn peekable(self) -> Peekable<Self>
+        where
+            Self: Sized;
+        fn skip_while<P>(self, predicate: P) -> SkipWhile<Self, P>
+        where
+            Self: Sized,
+            P: FnMut(&Self::Item) -> bool;
+        fn take_while<P>(self, predicate: P) -> TakeWhile<Self, P>
+        where
+            Self: Sized,
+            P: FnMut(&Self::Item) -> bool;
+        fn map_while<B, P>(self, predicate: P) -> MapWhile<Self, P>
+        where
+            Self: Sized,
+            P: FnMut(Self::Item) -> Option<B>;
+        fn skip(self, n: usize) -> Skip<Self>
+        where
+            Self: Sized;
+        fn take(self, n: usize) -> Take<Self>
+        where
+            Self: Sized;
+        fn scan<St, B, F>(self, initial_state: St, f: F) -> Scan<Self, St, F>
+        where
+            Self: Sized,
+            F: FnMut(&mut St, Self::Item) -> Option<B>;
+        fn flat_map<U, F>(self, f: F) -> FlatMap<Self, U, F>
+        where
+            Self: Sized,
+            U: IntoIterator,
+            F: FnMut(Self::Item) -> U;
+        fn flatten(self) -> Flatten<Self>
+        where
+            Self: Sized,
+            Self::Item: IntoIterator;
+        fn fuse(self) -> Fuse<Self>
+        where
+            Self: Sized;
+        fn inspect<F>(self, f: F) -> Inspect<Self, F>
+        where
+            Self: Sized,
+            F: FnMut(&Self::Item);
+        fn by_ref(&mut self) -> &mut Self
+        where
+            Self: Sized;
+        fn collect<B: FromIterator<Self::Item>>(self) -> B
+        where
+            Self: Sized;
+        fn collect_into<E: Extend<Self::Item>>(self, collection: &mut E) -> &mut E
+        where
+            Self: Sized;
+        fn partition<B, F>(self, f: F) -> (B, B)
+        where
+            Self: Sized,
+            B: Default + Extend<Self::Item>,
+            F: FnMut(&Self::Item) -> bool;
+        fn partition_in_place<'a, T: 'a, P>(mut self, predicate: P) -> usize
+        where
+            Self: Sized + DoubleEndedIterator<Item = &'a mut T>,
+            P: FnMut(&T) -> bool;
+        fn is_partitioned<P>(mut self, mut predicate: P) -> bool
+        where
+            Self: Sized,
+            P: FnMut(Self::Item) -> bool;
+        fn fold<B, F>(mut self, init: B, mut f: F) -> B
+        where
+            Self: Sized,
+            F: FnMut(B, Self::Item) -> B;
+        fn reduce<F>(mut self, f: F) -> Option<Self::Item>
+        where
+            Self: Sized,
+            F: FnMut(Self::Item, Self::Item) -> Self::Item;
+        fn all<F>(&mut self, f: F) -> bool
+        where
+            Self: Sized,
+            F: FnMut(Self::Item) -> bool;
+        fn any<F>(&mut self, f: F) -> bool
+        where
+            Self: Sized,
+            F: FnMut(Self::Item) -> bool;
+        fn find<P>(&mut self, predicate: P) -> Option<Self::Item>
+        where
+            Self: Sized,
+            P: FnMut(&Self::Item) -> bool;
+        fn find_map<B, F>(&mut self, f: F) -> Option<B>
+        where
+            Self: Sized,
+            F: FnMut(Self::Item) -> Option<B>;
+        fn position<P>(&mut self, predicate: P) -> Option<usize>
+        where
+            Self: Sized,
+            P: FnMut(Self::Item) -> bool;
+        /// We will scroll to "string" to ensure it scrolls as expected.
+        fn this_is_a_method_with_a_long_name_returning_something() -> String;
+    }
+
+    /// This one doesn't have hidden items (because there are too many) so we can also confirm that it
+    /// scrolls as expected.
+    pub trait TraitWithLongItemsName {
+        fn this_is_a_method_with_a_long_name_returning_something() -> String;
+    }
+}
diff --git a/src/test/rustdoc-gui/src/link_to_definition/Cargo.lock b/tests/rustdoc-gui/src/link_to_definition/Cargo.lock
index e4b4e52d0..e4b4e52d0 100644
--- a/src/test/rustdoc-gui/src/link_to_definition/Cargo.lock
+++ b/tests/rustdoc-gui/src/link_to_definition/Cargo.lock
diff --git a/src/test/rustdoc-gui/src/link_to_definition/Cargo.toml b/tests/rustdoc-gui/src/link_to_definition/Cargo.toml
index cdd294d74..cdd294d74 100644
--- a/src/test/rustdoc-gui/src/link_to_definition/Cargo.toml
+++ b/tests/rustdoc-gui/src/link_to_definition/Cargo.toml
diff --git a/src/test/rustdoc-gui/src/link_to_definition/lib.rs b/tests/rustdoc-gui/src/link_to_definition/lib.rs
index 419a9ccee..419a9ccee 100644
--- a/src/test/rustdoc-gui/src/link_to_definition/lib.rs
+++ b/tests/rustdoc-gui/src/link_to_definition/lib.rs
diff --git a/src/test/rustdoc-gui/src/scrape_examples/Cargo.lock b/tests/rustdoc-gui/src/scrape_examples/Cargo.lock
index 7cd6d0844..7cd6d0844 100644
--- a/src/test/rustdoc-gui/src/scrape_examples/Cargo.lock
+++ b/tests/rustdoc-gui/src/scrape_examples/Cargo.lock
diff --git a/src/test/rustdoc-gui/src/scrape_examples/Cargo.toml b/tests/rustdoc-gui/src/scrape_examples/Cargo.toml
index aea9b657d..aea9b657d 100644
--- a/src/test/rustdoc-gui/src/scrape_examples/Cargo.toml
+++ b/tests/rustdoc-gui/src/scrape_examples/Cargo.toml
diff --git a/tests/rustdoc-gui/src/scrape_examples/examples/check-many-1.rs b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-1.rs
new file mode 100644
index 000000000..81a48ac50
--- /dev/null
+++ b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-1.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // all examples have same line count
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+}
diff --git a/tests/rustdoc-gui/src/scrape_examples/examples/check-many-2.rs b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-2.rs
new file mode 100644
index 000000000..c9fdf68d3
--- /dev/null
+++ b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-2.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // ignore-tidy-linelength
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+}
diff --git a/tests/rustdoc-gui/src/scrape_examples/examples/check-many-3.rs b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-3.rs
new file mode 100644
index 000000000..c9fdf68d3
--- /dev/null
+++ b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-3.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // ignore-tidy-linelength
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+    scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
+}
diff --git a/tests/rustdoc-gui/src/scrape_examples/examples/check-many-4.rs b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-4.rs
new file mode 100644
index 000000000..81a48ac50
--- /dev/null
+++ b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-4.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // all examples have same line count
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+}
diff --git a/tests/rustdoc-gui/src/scrape_examples/examples/check-many-5.rs b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-5.rs
new file mode 100644
index 000000000..81a48ac50
--- /dev/null
+++ b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-5.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // all examples have same line count
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+}
diff --git a/tests/rustdoc-gui/src/scrape_examples/examples/check-many-6.rs b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-6.rs
new file mode 100644
index 000000000..81a48ac50
--- /dev/null
+++ b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-6.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // all examples have same line count
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+}
diff --git a/tests/rustdoc-gui/src/scrape_examples/examples/check-many-7.rs b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-7.rs
new file mode 100644
index 000000000..81a48ac50
--- /dev/null
+++ b/tests/rustdoc-gui/src/scrape_examples/examples/check-many-7.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // all examples have same line count
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+    scrape_examples::test_many();
+}
diff --git a/src/test/rustdoc-gui/src/scrape_examples/examples/check.rs b/tests/rustdoc-gui/src/scrape_examples/examples/check.rs
index b3f682fe4..b3f682fe4 100644
--- a/src/test/rustdoc-gui/src/scrape_examples/examples/check.rs
+++ b/tests/rustdoc-gui/src/scrape_examples/examples/check.rs
diff --git a/src/test/rustdoc-gui/src/scrape_examples/src/lib.rs b/tests/rustdoc-gui/src/scrape_examples/src/lib.rs
index 88b03cf26..88b03cf26 100644
--- a/src/test/rustdoc-gui/src/scrape_examples/src/lib.rs
+++ b/tests/rustdoc-gui/src/scrape_examples/src/lib.rs
diff --git a/src/test/rustdoc-gui/src/settings/.cargo/config.toml b/tests/rustdoc-gui/src/settings/.cargo/config.toml
index bbb8d11a2..bbb8d11a2 100644
--- a/src/test/rustdoc-gui/src/settings/.cargo/config.toml
+++ b/tests/rustdoc-gui/src/settings/.cargo/config.toml
diff --git a/src/test/rustdoc-gui/src/settings/Cargo.lock b/tests/rustdoc-gui/src/settings/Cargo.lock
index 6f0de1ac1..6f0de1ac1 100644
--- a/src/test/rustdoc-gui/src/settings/Cargo.lock
+++ b/tests/rustdoc-gui/src/settings/Cargo.lock
diff --git a/src/test/rustdoc-gui/src/settings/Cargo.toml b/tests/rustdoc-gui/src/settings/Cargo.toml
index c8a211a47..c8a211a47 100644
--- a/src/test/rustdoc-gui/src/settings/Cargo.toml
+++ b/tests/rustdoc-gui/src/settings/Cargo.toml
diff --git a/src/test/rustdoc-gui/src/settings/lib.rs b/tests/rustdoc-gui/src/settings/lib.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/rustdoc-gui/src/settings/lib.rs
+++ b/tests/rustdoc-gui/src/settings/lib.rs
diff --git a/src/test/rustdoc-gui/src/staged_api/Cargo.lock b/tests/rustdoc-gui/src/staged_api/Cargo.lock
index 6e8eba56c..6e8eba56c 100644
--- a/src/test/rustdoc-gui/src/staged_api/Cargo.lock
+++ b/tests/rustdoc-gui/src/staged_api/Cargo.lock
diff --git a/src/test/rustdoc-gui/src/staged_api/Cargo.toml b/tests/rustdoc-gui/src/staged_api/Cargo.toml
index b231be6ee..b231be6ee 100644
--- a/src/test/rustdoc-gui/src/staged_api/Cargo.toml
+++ b/tests/rustdoc-gui/src/staged_api/Cargo.toml
diff --git a/src/test/rustdoc-gui/src/staged_api/lib.rs b/tests/rustdoc-gui/src/staged_api/lib.rs
index 5934593a8..5934593a8 100644
--- a/src/test/rustdoc-gui/src/staged_api/lib.rs
+++ b/tests/rustdoc-gui/src/staged_api/lib.rs
diff --git a/src/test/rustdoc-gui/src/test_docs/Cargo.lock b/tests/rustdoc-gui/src/test_docs/Cargo.lock
index 6b80f6e88..6b80f6e88 100644
--- a/src/test/rustdoc-gui/src/test_docs/Cargo.lock
+++ b/tests/rustdoc-gui/src/test_docs/Cargo.lock
diff --git a/src/test/rustdoc-gui/src/test_docs/Cargo.toml b/tests/rustdoc-gui/src/test_docs/Cargo.toml
index 8be819b76..8be819b76 100644
--- a/src/test/rustdoc-gui/src/test_docs/Cargo.toml
+++ b/tests/rustdoc-gui/src/test_docs/Cargo.toml
diff --git a/src/test/rustdoc-gui/src/test_docs/build.rs b/tests/rustdoc-gui/src/test_docs/build.rs
index 16c96ded9..16c96ded9 100644
--- a/src/test/rustdoc-gui/src/test_docs/build.rs
+++ b/tests/rustdoc-gui/src/test_docs/build.rs
diff --git a/tests/rustdoc-gui/src/test_docs/lib.rs b/tests/rustdoc-gui/src/test_docs/lib.rs
new file mode 100644
index 000000000..512504396
--- /dev/null
+++ b/tests/rustdoc-gui/src/test_docs/lib.rs
@@ -0,0 +1,476 @@
+//! The point of this crate is to be able to have enough different "kinds" of
+//! documentation generated so we can test each different features.
+#![doc(html_playground_url="https://play.rust-lang.org/")]
+
+#![crate_name = "test_docs"]
+#![feature(rustdoc_internals)]
+#![feature(doc_cfg)]
+#![feature(associated_type_defaults)]
+
+/*!
+Enable the feature <span class="stab portability"><code>some-feature</code></span> to enjoy
+this crate even more!
+Enable the feature <span class="stab portability"><code>some-feature</code></span> to enjoy
+this crate even more!
+Enable the feature <span class="stab portability"><code>some-feature</code></span> to enjoy
+this crate even more!
+
+Also, stop using `bar` as it's <span class="stab deprecated" title="">deprecated</span>.
+Also, stop using `bar` as it's <span class="stab deprecated" title="">deprecated</span>.
+Also, stop using `bar` as it's <span class="stab deprecated" title="">deprecated</span>.
+
+Finally, you can use `quz` only on <span class="stab portability"><code>Unix or x86-64</code>
+</span>.
+Finally, you can use `quz` only on <span class="stab portability"><code>Unix or x86-64</code>
+</span>.
+*/
+
+use std::convert::AsRef;
+use std::fmt;
+
+/// Basic function with some code examples:
+///
+/// ```
+/// println!("nothing fancy");
+/// println!("but with two lines!");
+/// ```
+///
+/// A failing to compile one:
+///
+/// ```compile_fail
+/// println!("where did my argument {} go? :'(");
+/// ```
+///
+/// An ignored one:
+///
+/// ```ignore (it's a test)
+/// Let's say I'm just some text will ya?
+/// ```
+///
+/// A failing to run one:
+///
+/// ```should_panic
+/// panic!("tadam");
+/// ```
+///
+/// An inlined `code`!
+pub fn foo() {}
+
+/// Just a normal struct.
+pub struct Foo;
+
+impl Foo {
+    #[must_use]
+    pub fn must_use(&self) -> bool {
+        true
+    }
+}
+
+impl AsRef<str> for Foo {
+    fn as_ref(&self) -> &str {
+        "hello"
+    }
+}
+
+/// Just a normal enum.
+///
+/// # title!
+#[doc(alias = "ThisIsAnAlias")]
+#[non_exhaustive]
+pub enum WhoLetTheDogOut {
+    /// Woof!
+    Woof,
+    /// Meoooooooow...
+    Meow,
+}
+
+/// Who doesn't love to wrap a `format!` call?
+pub fn some_more_function<T: fmt::Debug>(t: &T) -> String {
+    format!("{:?}", t)
+}
+
+/// Woohoo! A trait!
+pub trait AnotherOne {
+    /// Some func 3.
+    fn func3();
+
+    /// Some func 1.
+    fn func1();
+
+    fn another();
+    fn why_not();
+
+    /// Some func 2.
+    fn func2();
+
+    fn hello();
+}
+
+/// ```compile_fail
+/// whatever
+/// ```
+///
+/// Check for "i" signs in lists!
+///
+/// 1. elem 1
+/// 2. test 1
+///    ```compile_fail
+///    fn foo() {}
+///    ```
+/// 3. elem 3
+/// 4. ```ignore (it's a test)
+///    fn foo() {}
+///    ```
+/// 5. elem 5
+///
+/// Final one:
+///
+/// ```ignore (still a test)
+/// let x = 12;
+/// ```
+pub fn check_list_code_block() {}
+
+/// a thing with a label
+#[deprecated(since = "1.0.0", note = "text why this deprecated")]
+#[doc(cfg(unix))]
+pub fn replaced_function() {}
+
+/// Some doc with `code`!
+pub enum AnEnum {
+    WithVariants { and: usize, sub: usize, variants: usize },
+}
+
+#[doc(keyword = "CookieMonster")]
+/// Some keyword.
+pub mod keyword {}
+
+/// Just some type alias.
+pub type SomeType = u32;
+
+pub mod huge_amount_of_consts {
+    include!(concat!(env!("OUT_DIR"), "/huge_amount_of_consts.rs"));
+}
+
+/// Very long code text `hereIgoWithLongTextBecauseWhyNotAndWhyWouldntI`.
+pub mod long_code_block {}
+
+/// Very long code text [`hereIgoWithLongTextBecauseWhyNotAndWhyWouldntI`][lnk].
+///
+/// [lnk]: crate::long_code_block_link
+pub mod long_code_block_link {}
+
+#[macro_export]
+macro_rules! repro {
+    () => {};
+}
+
+pub use crate::repro as repro2;
+
+/// # Top-doc Prose title
+///
+/// Text below title.
+///
+/// ## Top-doc Prose sub-heading
+///
+/// Text below sub-heading.
+///
+/// ### Top-doc Prose sub-sub-heading
+///
+/// Text below sub-sub-heading
+///
+/// #### You know the drill.
+///
+/// More text.
+pub struct HeavilyDocumentedStruct {
+    /// # Title for field
+    /// ## Sub-heading for field
+    pub nothing: (),
+}
+
+/// # Title for struct impl doc
+///
+/// Text below heading.
+///
+/// ## Sub-heading for struct impl doc
+///
+/// Text below sub-heading.
+///
+/// ### Sub-sub-heading for struct impl doc
+///
+/// Text below sub-sub-heading.
+///
+impl HeavilyDocumentedStruct {
+    /// # Title for struct impl-item doc
+    /// Text below title.
+    /// ## Sub-heading for struct impl-item doc
+    /// Text below sub-heading.
+    /// ### Sub-sub-heading for struct impl-item doc
+    /// Text below sub-sub-heading.
+    pub fn do_nothing() {}
+}
+
+/// # Top-doc Prose title
+///
+/// Text below title.
+///
+/// ## Top-doc Prose sub-heading
+///
+/// Text below sub-heading.
+///
+/// ### Top-doc Prose sub-sub-heading
+///
+/// Text below sub-sub-heading
+pub enum HeavilyDocumentedEnum {
+    /// # None prose title
+    /// ## None prose sub-heading
+    None,
+    /// # Wrapped prose title
+    /// ## Wrapped prose sub-heading
+    Wrapped(
+        /// # Wrapped.0 prose title
+        /// ## Wrapped.0 prose sub-heading
+        String,
+        String,
+    ),
+    Structy {
+        /// # Structy prose title
+        /// ## Structy prose sub-heading
+        alpha: String,
+        beta: String,
+    },
+}
+
+/// # Title for enum impl doc
+///
+/// Text below heading.
+///
+/// ## Sub-heading for enum impl doc
+///
+/// Text below sub-heading.
+///
+/// ### Sub-sub-heading for enum impl doc
+///
+/// Text below sub-sub-heading.
+///
+impl HeavilyDocumentedEnum {
+    /// # Title for enum impl-item doc
+    /// Text below title.
+    /// ## Sub-heading for enum impl-item doc
+    /// Text below sub-heading.
+    /// ### Sub-sub-heading for enum impl-item doc
+    /// Text below sub-sub-heading.
+    pub fn do_nothing() {}
+}
+
+/// # Top-doc prose title
+///
+/// Text below heading.
+///
+/// ## Top-doc prose sub-heading
+///
+/// Text below heading.
+pub union HeavilyDocumentedUnion {
+    /// # Title for union variant
+    /// ## Sub-heading for union variant
+    pub nothing: (),
+    pub something: f32,
+}
+
+/// # Title for union impl doc
+/// ## Sub-heading for union impl doc
+impl HeavilyDocumentedUnion {
+    /// # Title for union impl-item doc
+    /// ## Sub-heading for union impl-item doc
+    pub fn do_nothing() {}
+}
+
+/// # Top-doc prose title
+///
+/// Text below heading.
+///
+/// ## Top-doc prose sub-heading
+///
+/// Text below heading.
+#[macro_export]
+macro_rules! heavily_documented_macro {
+    () => {};
+}
+
+pub trait EmptyTrait1 {}
+pub trait EmptyTrait2 {}
+pub trait EmptyTrait3 {}
+
+pub struct HasEmptyTraits{}
+
+impl EmptyTrait1 for HasEmptyTraits {}
+impl EmptyTrait2 for HasEmptyTraits {}
+#[doc(cfg(feature = "some-feature"))]
+impl EmptyTrait3 for HasEmptyTraits {}
+
+mod macros;
+pub use macros::*;
+
+#[doc(alias = "AliasForTheStdReexport")]
+pub use ::std as TheStdReexport;
+
+pub mod details {
+    /// We check the appearance of the `<details>`/`<summary>` in here.
+    ///
+    /// ## Hello
+    ///
+    /// <details>
+    /// <summary><h4>I'm a summary</h4></summary>
+    /// <div>I'm the content of the details!</div>
+    /// </details>
+    pub struct Details;
+
+    impl Details {
+        /// We check the appearance of the `<details>`/`<summary>` in here.
+        ///
+        /// ## Hello
+        ///
+        /// <details>
+        /// <summary><h4>I'm a summary</h4></summary>
+        /// <div>I'm the content of the details!</div>
+        /// </details>
+        pub fn method() {}
+    }
+}
+
+pub mod doc_block_table {
+
+    pub trait DocBlockTableTrait {
+        fn func();
+    }
+
+    /// Struct doc.
+    ///
+    /// | header1                  | header2                  |
+    /// |--------------------------|--------------------------|
+    /// | Lorem Ipsum, Lorem Ipsum | Lorem Ipsum, Lorem Ipsum |
+    /// | Lorem Ipsum, Lorem Ipsum | Lorem Ipsum, Lorem Ipsum |
+    /// | Lorem Ipsum, Lorem Ipsum | Lorem Ipsum, Lorem Ipsum |
+    /// | Lorem Ipsum, Lorem Ipsum | Lorem Ipsum, Lorem Ipsum |
+    pub struct DocBlockTable {}
+
+    impl DocBlockTableTrait for DocBlockTable {
+        /// Trait impl func doc for struct.
+        ///
+        /// | header1                  | header2                  |
+        /// |--------------------------|--------------------------|
+        /// | Lorem Ipsum, Lorem Ipsum | Lorem Ipsum, Lorem Ipsum |
+        fn func() {
+            println!();
+        }
+    }
+
+}
+
+pub struct NotableStructWithLongName<R>(R);
+
+impl<R: std::io::Read> NotableStructWithLongName<R> {
+    pub fn create_an_iterator_from_read(r: R) -> NotableStructWithLongName<R> { Self(r) }
+}
+
+impl<R: std::io::Read> std::iter::Iterator for NotableStructWithLongName<R> {
+    type Item = ();
+
+    fn next(&mut self) -> Option<Self::Item> { () }
+}
+
+pub trait TraitWithNoDocblocks {
+    fn first_fn(&self);
+    fn second_fn(&self);
+}
+
+pub struct TypeWithNoDocblocks;
+
+impl TypeWithNoDocblocks {
+    fn x() -> Option<Self> {
+        Some(Self)
+    }
+    fn y() -> Option<u32> {
+        // code comment
+        let t = Self::x()?;
+        Some(0)
+    }
+}
+
+impl TypeWithNoDocblocks {
+    pub fn first_fn(&self) {}
+    pub fn second_fn<'a>(&'a self) {
+        let x = 12;
+        let y = "a";
+        let z = false;
+    }
+}
+
+pub unsafe fn unsafe_fn() {}
+
+pub fn safe_fn() {}
+
+#[repr(C)]
+pub struct WithGenerics<T: TraitWithNoDocblocks, S = String, E = WhoLetTheDogOut, P = i8> {
+    s: S,
+    t: T,
+    e: E,
+    p: P,
+}
+
+pub struct StructWithPublicUndocumentedFields {
+    pub first: u32,
+    pub second: u32,
+}
+
+pub const CONST: u8 = 0;
+
+pub trait TraitWithoutGenerics {
+    const C: u8 = CONST;
+    type T = SomeType;
+
+    fn foo();
+}
+
+pub mod trait_members {
+    pub trait TraitMembers {
+        /// Some type
+        type Type;
+        /// Some function
+        fn function();
+        /// Some other function
+        fn function2();
+    }
+    pub struct HasTrait;
+    impl TraitMembers for HasTrait {
+        type Type = u8;
+        fn function() {}
+        fn function2() {}
+    }
+}
+
+pub struct TypeWithImplDoc;
+
+/// impl doc
+impl TypeWithImplDoc {
+    /// fn doc
+    pub fn test_fn() {}
+}
+
+/// <sub id="codeblock-sub-1">
+///
+/// ```
+/// one
+/// ```
+///
+/// </sub>
+///
+/// <sub id="codeblock-sub-3">
+///
+/// ```
+/// one
+/// two
+/// three
+/// ```
+///
+/// </sub>
+pub mod codeblock_sub {}
diff --git a/src/test/rustdoc-gui/src/test_docs/macros.rs b/tests/rustdoc-gui/src/test_docs/macros.rs
index 07b2b9792..07b2b9792 100644
--- a/src/test/rustdoc-gui/src/test_docs/macros.rs
+++ b/tests/rustdoc-gui/src/test_docs/macros.rs
diff --git a/tests/rustdoc-gui/stab-badge.goml b/tests/rustdoc-gui/stab-badge.goml
new file mode 100644
index 000000000..50ba1ba62
--- /dev/null
+++ b/tests/rustdoc-gui/stab-badge.goml
@@ -0,0 +1,41 @@
+// All stability badges should have rounded corners and colored backgrounds.
+goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+show-text: true
+define-function: (
+    "check-badge",
+    (theme, background, color),
+    block {
+        local-storage: {"rustdoc-use-system-theme": "false", "rustdoc-theme": |theme|}
+        goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+        assert: ".docblock .stab"
+        assert: ".item-table .stab"
+        assert-css: (".stab", {
+            "border-radius": "3px",
+            "color": |color|,
+            "background-color": |background|,
+        })
+        goto: "file://" + |DOC_PATH| + "/test_docs/fn.replaced_function.html"
+        assert: (".item-info .stab")
+        assert-css: (".stab", {
+            "border-radius": "3px",
+            "color": |color|,
+            "background-color": |background|,
+        })
+    },
+)
+
+call-function: ("check-badge", {
+    "theme": "ayu",
+    "color": "rgb(197, 197, 197)",
+    "background": "rgb(49, 69, 89)",
+})
+call-function: ("check-badge", {
+    "theme": "dark",
+    "color": "rgb(221, 221, 221)",
+    "background": "rgb(49, 69, 89)",
+})
+call-function: ("check-badge", {
+    "theme": "light",
+    "color": "rgb(0, 0, 0)",
+    "background": "rgb(255, 245, 214)",
+})
diff --git a/tests/rustdoc-gui/struct-fields.goml b/tests/rustdoc-gui/struct-fields.goml
new file mode 100644
index 000000000..fa3e16cb8
--- /dev/null
+++ b/tests/rustdoc-gui/struct-fields.goml
@@ -0,0 +1,5 @@
+// This test ensures that each field is on its own line (In other words, they have display: block).
+goto: "file://" + |DOC_PATH| + "/test_docs/struct.StructWithPublicUndocumentedFields.html"
+
+store-property: (first_top, "//*[@id='structfield.first']", "offsetTop")
+assert-property-false: ("//*[@id='structfield.second']", { "offsetTop": |first_top| })
diff --git a/src/test/rustdoc-gui/target.goml b/tests/rustdoc-gui/target.goml
index 3e5c30dc7..ca393ee58 100644
--- a/src/test/rustdoc-gui/target.goml
+++ b/tests/rustdoc-gui/target.goml
@@ -8,14 +8,14 @@ assert: "#method\.a_method:target"
 define-function: (
     "check-style",
     (theme, background, border),
-    [
-        ("local-storage", {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}),
-        ("reload"),
-        ("assert-css", ("#method\.a_method:target", {
+    block {
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        reload:
+        assert-css: ("#method\.a_method:target", {
             "background-color": |background|,
             "border-right": "3px solid " + |border|,
-        })),
-    ],
+        })
+    },
 )
 
 call-function: ("check-style", {
diff --git a/src/test/rustdoc-gui/theme-change.goml b/tests/rustdoc-gui/theme-change.goml
index cc47f1f45..cc47f1f45 100644
--- a/src/test/rustdoc-gui/theme-change.goml
+++ b/tests/rustdoc-gui/theme-change.goml
diff --git a/src/test/rustdoc-gui/theme-in-history.goml b/tests/rustdoc-gui/theme-in-history.goml
index 10508e86a..10508e86a 100644
--- a/src/test/rustdoc-gui/theme-in-history.goml
+++ b/tests/rustdoc-gui/theme-in-history.goml
diff --git a/tests/rustdoc-gui/toggle-click-deadspace.goml b/tests/rustdoc-gui/toggle-click-deadspace.goml
new file mode 100644
index 000000000..ac346f25b
--- /dev/null
+++ b/tests/rustdoc-gui/toggle-click-deadspace.goml
@@ -0,0 +1,15 @@
+// This test ensures that clicking on a method summary, but not on the "[-]",
+// doesn't toggle the <details>.
+goto: "file://" + |DOC_PATH| + "/lib2/struct.Foo.html"
+assert-attribute: (".impl-items .toggle", {"open": ""})
+click: "h4.code-header" // This is the position of "pub" in "pub fn a_method"
+assert-attribute: (".impl-items .toggle", {"open": ""})
+click-with-offset: (
+    ".impl-items .toggle summary",
+    {"x": -24, "y": 8}, // This is the position of "[-]" next to that pub fn.
+)
+assert-attribute-false: (".impl-items .toggle", {"open": ""})
+
+// Click the "Trait" part of "impl Trait" and verify it navigates.
+click: "#impl-Trait-for-Foo h3 a:first-of-type"
+assert-text: (".main-heading h1", "Trait lib2::Trait")
diff --git a/src/test/rustdoc-gui/toggle-docs-mobile.goml b/tests/rustdoc-gui/toggle-docs-mobile.goml
index 6ce24a81b..6ce24a81b 100644
--- a/src/test/rustdoc-gui/toggle-docs-mobile.goml
+++ b/tests/rustdoc-gui/toggle-docs-mobile.goml
diff --git a/tests/rustdoc-gui/toggle-docs.goml b/tests/rustdoc-gui/toggle-docs.goml
new file mode 100644
index 000000000..c9d236e9b
--- /dev/null
+++ b/tests/rustdoc-gui/toggle-docs.goml
@@ -0,0 +1,75 @@
+// Checks that the documentation toggles have the correct position, style and work as expected.
+goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
+assert-attribute: ("#main-content > details.top-doc", {"open": ""})
+assert-text: ("#toggle-all-docs", "[−]")
+click: "#toggle-all-docs"
+wait-for: 50
+// This is now collapsed so there shouldn't be the "open" attribute on details.
+assert-attribute-false: ("#main-content > details.top-doc", {"open": ""})
+assert-text: ("#toggle-all-docs", "[+]")
+assert-css: (
+    "#main-content > details.top-doc > summary",
+    {"font-family": '"Fira Sans", Arial, NanumBarunGothic, sans-serif'},
+)
+click: "#toggle-all-docs"
+// Not collapsed anymore so the "open" attribute should be back.
+wait-for-attribute: ("#main-content > details.top-doc", {"open": ""})
+assert-text: ("#toggle-all-docs", "[−]")
+
+// Check that it works on non-module pages as well.
+goto: "file://" + |DOC_PATH| + "/test_docs/struct.Foo.html"
+// We first check that everything is visible.
+assert-text: ("#toggle-all-docs", "[−]")
+assert-attribute: ("#implementations-list details.toggle", {"open": ""}, ALL)
+assert-attribute: ("#trait-implementations-list details.toggle", {"open": ""}, ALL)
+assert-attribute-false: (
+    "#blanket-implementations-list > details.toggle",
+    {"open": ""},
+    ALL,
+)
+
+// We collapse them all.
+click: "#toggle-all-docs"
+wait-for-text: ("#toggle-all-docs", "[+]")
+// We check that all <details> are collapsed (except for the impl block ones).
+assert-attribute-false: ("details.toggle:not(.implementors-toggle)", {"open": ""}, ALL)
+assert-attribute: ("#implementations-list > details.implementors-toggle", {"open": ""})
+// We now check that the other impl blocks are collapsed.
+assert-attribute-false: (
+    "#blanket-implementations-list > details.toggle.implementors-toggle",
+    {"open": ""},
+    ALL,
+)
+// We open them all again.
+click: "#toggle-all-docs"
+wait-for-text: ("#toggle-all-docs", "[−]")
+assert-attribute: ("details.toggle", {"open": ""}, ALL)
+
+// Checking the toggles style.
+show-text: true
+define-function: (
+    "check-color",
+    (theme, filter),
+    block {
+        // Setting the theme.
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
+        // We reload the page so the local storage settings are being used.
+        reload:
+
+        assert-css: ("details.toggle > summary::before", {
+            "opacity": "0.5",
+            "filter": |filter|,
+        }, ALL)
+        move-cursor-to: "details.toggle summary"
+        assert-css: ("details.toggle > summary:hover::before", {
+            "opacity": "1",
+            "filter": |filter|,
+        })
+        // moving the cursor somewhere else to not mess with next function calls.
+        move-cursor-to: ".search-input"
+    },
+)
+
+call-function: ("check-color", {"theme": "ayu", "filter": "invert(1)"})
+call-function: ("check-color", {"theme": "dark", "filter": "invert(1)"})
+call-function: ("check-color", {"theme": "light", "filter": "none"})
diff --git a/src/test/rustdoc-gui/toggle-implementors.goml b/tests/rustdoc-gui/toggle-implementors.goml
index 8ff5b91af..8ff5b91af 100644
--- a/src/test/rustdoc-gui/toggle-implementors.goml
+++ b/tests/rustdoc-gui/toggle-implementors.goml
diff --git a/src/test/rustdoc-gui/toggled-open-implementations.goml b/tests/rustdoc-gui/toggled-open-implementations.goml
index e4d59b5d7..000293b55 100644
--- a/src/test/rustdoc-gui/toggled-open-implementations.goml
+++ b/tests/rustdoc-gui/toggled-open-implementations.goml
@@ -2,4 +2,4 @@
 // has all the implementations toggled open by default, so users can
 // find method names in those implementations with Ctrl-F.
 goto: "file://" + |DOC_PATH| + "/test_docs/struct.Foo.html"
-assert-attribute: (".rustdoc-toggle.implementors-toggle", {"open": ""})
+assert-attribute: (".toggle.implementors-toggle", {"open": ""})
diff --git a/src/test/rustdoc-gui/trait-sidebar-item-order.goml b/tests/rustdoc-gui/trait-sidebar-item-order.goml
index e5d023544..e5d023544 100644
--- a/src/test/rustdoc-gui/trait-sidebar-item-order.goml
+++ b/tests/rustdoc-gui/trait-sidebar-item-order.goml
diff --git a/src/test/rustdoc-gui/type-declation-overflow.goml b/tests/rustdoc-gui/type-declation-overflow.goml
index c014eb52e..644429c01 100644
--- a/src/test/rustdoc-gui/type-declation-overflow.goml
+++ b/tests/rustdoc-gui/type-declation-overflow.goml
@@ -1,3 +1,4 @@
+// ignore-tidy-linelength
 // This test ensures that the items declaration content overflow is handled inside the <pre> directly.
 
 // We need to disable this check because
@@ -58,3 +59,18 @@ goto: "file://" + |DOC_PATH| + "/lib2/too_long/struct.SuperIncrediblyLongLongLon
 compare-elements-position-false: (".main-heading h1", ".main-heading .out-of-band", ("y"))
 goto: "file://" + |DOC_PATH| + "/lib2/index.html"
 compare-elements-position-false: (".main-heading h1", ".main-heading .out-of-band", ("y"))
+
+// Now we will check that the scrolling is working.
+// First on an item with "hidden methods".
+goto: "file://" + |DOC_PATH| + "/lib2/scroll_traits/trait.Iterator.html"
+
+click: ".item-decl .type-contents-toggle"
+assert-property: (".item-decl > pre", {"scrollLeft": 0})
+scroll-to: "//*[@class='item-decl']//details/a[text()='String']"
+assert-property-false: (".item-decl > pre", {"scrollLeft": 0})
+
+// Then on an item without "hidden methods".
+goto: "file://" + |DOC_PATH| + "/lib2/scroll_traits/trait.TraitWithLongItemsName.html"
+assert-property: (".item-decl > pre", {"scrollLeft": 0})
+scroll-to: "//*[@class='item-decl']//code/a[text()='String']"
+assert-property-false: (".item-decl > pre", {"scrollLeft": 0})
diff --git a/src/test/rustdoc-gui/unsafe-fn.goml b/tests/rustdoc-gui/unsafe-fn.goml
index 5e43b85fc..d3a672ddd 100644
--- a/src/test/rustdoc-gui/unsafe-fn.goml
+++ b/tests/rustdoc-gui/unsafe-fn.goml
@@ -14,13 +14,13 @@ define-function: (
     // `theme` is the theme being tested.
     // `color` is the expected color of the `<sup>` element.
     (theme, color),
-    [
+    block {
         // Set the theme.
-        ("local-storage", {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}),
+        local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
         // We reload the page so the local storage settings are being used.
-        ("reload"),
-        ("assert-css", (".item-left sup", {"color": |color|})),
-    ],
+        reload:
+        assert-css: (".item-left sup", {"color": |color|})
+    },
 )
 
 call-function: ("sup-check", ("dark", "rgb(221, 221, 221)"))
diff --git a/src/test/rustdoc-gui/where-whitespace.goml b/tests/rustdoc-gui/where-whitespace.goml
index 41596a9bc..41596a9bc 100644
--- a/src/test/rustdoc-gui/where-whitespace.goml
+++ b/tests/rustdoc-gui/where-whitespace.goml
diff --git a/src/test/rustdoc-js-std/alias-1.js b/tests/rustdoc-js-std/alias-1.js
index 7c6327fcd..7c6327fcd 100644
--- a/src/test/rustdoc-js-std/alias-1.js
+++ b/tests/rustdoc-js-std/alias-1.js
diff --git a/src/test/rustdoc-js-std/alias-2.js b/tests/rustdoc-js-std/alias-2.js
index 798fa29ef..798fa29ef 100644
--- a/src/test/rustdoc-js-std/alias-2.js
+++ b/tests/rustdoc-js-std/alias-2.js
diff --git a/src/test/rustdoc-js-std/alias-3.js b/tests/rustdoc-js-std/alias-3.js
index 392b1e818..392b1e818 100644
--- a/src/test/rustdoc-js-std/alias-3.js
+++ b/tests/rustdoc-js-std/alias-3.js
diff --git a/src/test/rustdoc-js-std/alias-4.js b/tests/rustdoc-js-std/alias-4.js
index bf2bb4d29..bf2bb4d29 100644
--- a/src/test/rustdoc-js-std/alias-4.js
+++ b/tests/rustdoc-js-std/alias-4.js
diff --git a/src/test/rustdoc-js-std/alias.js b/tests/rustdoc-js-std/alias.js
index 2b709c991..2b709c991 100644
--- a/src/test/rustdoc-js-std/alias.js
+++ b/tests/rustdoc-js-std/alias.js
diff --git a/src/test/rustdoc-js-std/asrawfd.js b/tests/rustdoc-js-std/asrawfd.js
index 369a34f9c..369a34f9c 100644
--- a/src/test/rustdoc-js-std/asrawfd.js
+++ b/tests/rustdoc-js-std/asrawfd.js
diff --git a/src/test/rustdoc-js-std/basic.js b/tests/rustdoc-js-std/basic.js
index 824cac710..824cac710 100644
--- a/src/test/rustdoc-js-std/basic.js
+++ b/tests/rustdoc-js-std/basic.js
diff --git a/src/test/rustdoc-js-std/deduplication.js b/tests/rustdoc-js-std/deduplication.js
index f02f6cf55..f02f6cf55 100644
--- a/src/test/rustdoc-js-std/deduplication.js
+++ b/tests/rustdoc-js-std/deduplication.js
diff --git a/src/test/rustdoc-js-std/enum-option.js b/tests/rustdoc-js-std/enum-option.js
index 902e09069..902e09069 100644
--- a/src/test/rustdoc-js-std/enum-option.js
+++ b/tests/rustdoc-js-std/enum-option.js
diff --git a/src/test/rustdoc-js-std/filter-crate.js b/tests/rustdoc-js-std/filter-crate.js
index b47a1fefa..b47a1fefa 100644
--- a/src/test/rustdoc-js-std/filter-crate.js
+++ b/tests/rustdoc-js-std/filter-crate.js
diff --git a/src/test/rustdoc-js-std/fn-forget.js b/tests/rustdoc-js-std/fn-forget.js
index 66a5fcaa7..66a5fcaa7 100644
--- a/src/test/rustdoc-js-std/fn-forget.js
+++ b/tests/rustdoc-js-std/fn-forget.js
diff --git a/src/test/rustdoc-js-std/from_u.js b/tests/rustdoc-js-std/from_u.js
index e3f3cd436..e3f3cd436 100644
--- a/src/test/rustdoc-js-std/from_u.js
+++ b/tests/rustdoc-js-std/from_u.js
diff --git a/src/test/rustdoc-js-std/keyword.js b/tests/rustdoc-js-std/keyword.js
index 868ddd7b6..868ddd7b6 100644
--- a/src/test/rustdoc-js-std/keyword.js
+++ b/tests/rustdoc-js-std/keyword.js
diff --git a/src/test/rustdoc-js-std/macro-check.js b/tests/rustdoc-js-std/macro-check.js
index 242e0cbf5..242e0cbf5 100644
--- a/src/test/rustdoc-js-std/macro-check.js
+++ b/tests/rustdoc-js-std/macro-check.js
diff --git a/src/test/rustdoc-js-std/macro-print.js b/tests/rustdoc-js-std/macro-print.js
index 858046e72..1b4c7b405 100644
--- a/src/test/rustdoc-js-std/macro-print.js
+++ b/tests/rustdoc-js-std/macro-print.js
@@ -3,8 +3,8 @@ const QUERY = 'macro:print';
 const EXPECTED = {
     'others': [
         { 'path': 'std', 'name': 'print' },
-        { 'path': 'std', 'name': 'eprint' },
         { 'path': 'std', 'name': 'println' },
+        { 'path': 'std', 'name': 'eprint' },
         { 'path': 'std', 'name': 'eprintln' },
     ],
 };
diff --git a/src/test/rustdoc-js-std/never.js b/tests/rustdoc-js-std/never.js
index 392b1e818..392b1e818 100644
--- a/src/test/rustdoc-js-std/never.js
+++ b/tests/rustdoc-js-std/never.js
diff --git a/src/test/rustdoc-js-std/parser-errors.js b/tests/rustdoc-js-std/parser-errors.js
index dc42031e0..dc42031e0 100644
--- a/src/test/rustdoc-js-std/parser-errors.js
+++ b/tests/rustdoc-js-std/parser-errors.js
diff --git a/src/test/rustdoc-js-std/parser-filter.js b/tests/rustdoc-js-std/parser-filter.js
index e5a87a415..e5a87a415 100644
--- a/src/test/rustdoc-js-std/parser-filter.js
+++ b/tests/rustdoc-js-std/parser-filter.js
diff --git a/src/test/rustdoc-js-std/parser-generics.js b/tests/rustdoc-js-std/parser-generics.js
index 0cf7f5019..0cf7f5019 100644
--- a/src/test/rustdoc-js-std/parser-generics.js
+++ b/tests/rustdoc-js-std/parser-generics.js
diff --git a/src/test/rustdoc-js-std/parser-ident.js b/tests/rustdoc-js-std/parser-ident.js
index 4b5ab01ac..4b5ab01ac 100644
--- a/src/test/rustdoc-js-std/parser-ident.js
+++ b/tests/rustdoc-js-std/parser-ident.js
diff --git a/src/test/rustdoc-js-std/parser-literal.js b/tests/rustdoc-js-std/parser-literal.js
index 87b3baff1..87b3baff1 100644
--- a/src/test/rustdoc-js-std/parser-literal.js
+++ b/tests/rustdoc-js-std/parser-literal.js
diff --git a/src/test/rustdoc-js-std/parser-paths.js b/tests/rustdoc-js-std/parser-paths.js
index 9f823f933..9f823f933 100644
--- a/src/test/rustdoc-js-std/parser-paths.js
+++ b/tests/rustdoc-js-std/parser-paths.js
diff --git a/src/test/rustdoc-js-std/parser-quote.js b/tests/rustdoc-js-std/parser-quote.js
index 1e16c90de..1e16c90de 100644
--- a/src/test/rustdoc-js-std/parser-quote.js
+++ b/tests/rustdoc-js-std/parser-quote.js
diff --git a/src/test/rustdoc-js-std/parser-returned.js b/tests/rustdoc-js-std/parser-returned.js
index 6fce17dca..6fce17dca 100644
--- a/src/test/rustdoc-js-std/parser-returned.js
+++ b/tests/rustdoc-js-std/parser-returned.js
diff --git a/src/test/rustdoc-js-std/parser-separators.js b/tests/rustdoc-js-std/parser-separators.js
index 5b7abdfa8..5b7abdfa8 100644
--- a/src/test/rustdoc-js-std/parser-separators.js
+++ b/tests/rustdoc-js-std/parser-separators.js
diff --git a/src/test/rustdoc-js-std/parser-weird-queries.js b/tests/rustdoc-js-std/parser-weird-queries.js
index a3d85aeca..a3d85aeca 100644
--- a/src/test/rustdoc-js-std/parser-weird-queries.js
+++ b/tests/rustdoc-js-std/parser-weird-queries.js
diff --git a/src/test/rustdoc-js-std/path-ordering.js b/tests/rustdoc-js-std/path-ordering.js
index 7dcdd4023..7dcdd4023 100644
--- a/src/test/rustdoc-js-std/path-ordering.js
+++ b/tests/rustdoc-js-std/path-ordering.js
diff --git a/src/test/rustdoc-js-std/primitive.js b/tests/rustdoc-js-std/primitive.js
index e5690383e..e5690383e 100644
--- a/src/test/rustdoc-js-std/primitive.js
+++ b/tests/rustdoc-js-std/primitive.js
diff --git a/src/test/rustdoc-js-std/quoted.js b/tests/rustdoc-js-std/quoted.js
index aec8484a4..aec8484a4 100644
--- a/src/test/rustdoc-js-std/quoted.js
+++ b/tests/rustdoc-js-std/quoted.js
diff --git a/src/test/rustdoc-js-std/return-specific-literal.js b/tests/rustdoc-js-std/return-specific-literal.js
index c7c347240..c7c347240 100644
--- a/src/test/rustdoc-js-std/return-specific-literal.js
+++ b/tests/rustdoc-js-std/return-specific-literal.js
diff --git a/src/test/rustdoc-js-std/return-specific.js b/tests/rustdoc-js-std/return-specific.js
index d9a910553..d9a910553 100644
--- a/src/test/rustdoc-js-std/return-specific.js
+++ b/tests/rustdoc-js-std/return-specific.js
diff --git a/src/test/rustdoc-js-std/should-fail.js b/tests/rustdoc-js-std/should-fail.js
index b85a47dc0..b85a47dc0 100644
--- a/src/test/rustdoc-js-std/should-fail.js
+++ b/tests/rustdoc-js-std/should-fail.js
diff --git a/src/test/rustdoc-js-std/string-from_ut.js b/tests/rustdoc-js-std/string-from_ut.js
index f9edf4408..f9edf4408 100644
--- a/src/test/rustdoc-js-std/string-from_ut.js
+++ b/tests/rustdoc-js-std/string-from_ut.js
diff --git a/src/test/rustdoc-js-std/struct-vec.js b/tests/rustdoc-js-std/struct-vec.js
index 29609904b..29609904b 100644
--- a/src/test/rustdoc-js-std/struct-vec.js
+++ b/tests/rustdoc-js-std/struct-vec.js
diff --git a/src/test/rustdoc-js-std/typed-query.js b/tests/rustdoc-js-std/typed-query.js
index 25efbad26..fd5c5489d 100644
--- a/src/test/rustdoc-js-std/typed-query.js
+++ b/tests/rustdoc-js-std/typed-query.js
@@ -6,8 +6,8 @@ const FILTER_CRATE = 'std';
 const EXPECTED = {
     'others': [
         { 'path': 'std', 'name': 'print' },
-        { 'path': 'std', 'name': 'eprint' },
         { 'path': 'std', 'name': 'println' },
+        { 'path': 'std', 'name': 'eprint' },
         { 'path': 'std', 'name': 'eprintln' },
         { 'path': 'std::pin', 'name': 'pin' },
         { 'path': 'std::future', 'name': 'join' },
diff --git a/tests/rustdoc-js-std/vec-new.js b/tests/rustdoc-js-std/vec-new.js
new file mode 100644
index 000000000..fc44a566a
--- /dev/null
+++ b/tests/rustdoc-js-std/vec-new.js
@@ -0,0 +1,10 @@
+const QUERY = 'Vec::new';
+
+const EXPECTED = {
+    'others': [
+        { 'path': 'std::vec::Vec', 'name': 'new' },
+        { 'path': 'alloc::vec::Vec', 'name': 'new' },
+        { 'path': 'std::vec::Vec', 'name': 'new_in' },
+        { 'path': 'alloc::vec::Vec', 'name': 'new_in' },
+    ],
+};
diff --git a/src/test/rustdoc-js/basic.js b/tests/rustdoc-js/basic.js
index d99b23468..d99b23468 100644
--- a/src/test/rustdoc-js/basic.js
+++ b/tests/rustdoc-js/basic.js
diff --git a/src/test/rustdoc-js/basic.rs b/tests/rustdoc-js/basic.rs
index da946a58b..da946a58b 100644
--- a/src/test/rustdoc-js/basic.rs
+++ b/tests/rustdoc-js/basic.rs
diff --git a/src/test/rustdoc-js/doc-alias-filter-out.js b/tests/rustdoc-js/doc-alias-filter-out.js
index 46a089d06..46a089d06 100644
--- a/src/test/rustdoc-js/doc-alias-filter-out.js
+++ b/tests/rustdoc-js/doc-alias-filter-out.js
diff --git a/src/test/rustdoc-js/doc-alias-filter-out.rs b/tests/rustdoc-js/doc-alias-filter-out.rs
index 3f0c09479..3f0c09479 100644
--- a/src/test/rustdoc-js/doc-alias-filter-out.rs
+++ b/tests/rustdoc-js/doc-alias-filter-out.rs
diff --git a/src/test/rustdoc-js/doc-alias-filter.js b/tests/rustdoc-js/doc-alias-filter.js
index e06047ba7..e06047ba7 100644
--- a/src/test/rustdoc-js/doc-alias-filter.js
+++ b/tests/rustdoc-js/doc-alias-filter.js
diff --git a/src/test/rustdoc-js/doc-alias-filter.rs b/tests/rustdoc-js/doc-alias-filter.rs
index d5227814c..d5227814c 100644
--- a/src/test/rustdoc-js/doc-alias-filter.rs
+++ b/tests/rustdoc-js/doc-alias-filter.rs
diff --git a/src/test/rustdoc-js/doc-alias-whitespace.js b/tests/rustdoc-js/doc-alias-whitespace.js
index c9fc0c431..c9fc0c431 100644
--- a/src/test/rustdoc-js/doc-alias-whitespace.js
+++ b/tests/rustdoc-js/doc-alias-whitespace.js
diff --git a/src/test/rustdoc-js/doc-alias-whitespace.rs b/tests/rustdoc-js/doc-alias-whitespace.rs
index 16c022c74..16c022c74 100644
--- a/src/test/rustdoc-js/doc-alias-whitespace.rs
+++ b/tests/rustdoc-js/doc-alias-whitespace.rs
diff --git a/src/test/rustdoc-js/doc-alias.js b/tests/rustdoc-js/doc-alias.js
index 7bb0cbe38..7bb0cbe38 100644
--- a/src/test/rustdoc-js/doc-alias.js
+++ b/tests/rustdoc-js/doc-alias.js
diff --git a/src/test/rustdoc-js/doc-alias.rs b/tests/rustdoc-js/doc-alias.rs
index 750b7b757..750b7b757 100644
--- a/src/test/rustdoc-js/doc-alias.rs
+++ b/tests/rustdoc-js/doc-alias.rs
diff --git a/src/test/rustdoc-js/exact-match.js b/tests/rustdoc-js/exact-match.js
index b0a411bee..b0a411bee 100644
--- a/src/test/rustdoc-js/exact-match.js
+++ b/tests/rustdoc-js/exact-match.js
diff --git a/src/test/rustdoc-js/exact-match.rs b/tests/rustdoc-js/exact-match.rs
index 2eacc0a35..2eacc0a35 100644
--- a/src/test/rustdoc-js/exact-match.rs
+++ b/tests/rustdoc-js/exact-match.rs
diff --git a/src/test/rustdoc-js/foreign-type-path.js b/tests/rustdoc-js/foreign-type-path.js
index 334761bad..334761bad 100644
--- a/src/test/rustdoc-js/foreign-type-path.js
+++ b/tests/rustdoc-js/foreign-type-path.js
diff --git a/src/test/rustdoc-js/foreign-type-path.rs b/tests/rustdoc-js/foreign-type-path.rs
index 83400104e..83400104e 100644
--- a/src/test/rustdoc-js/foreign-type-path.rs
+++ b/tests/rustdoc-js/foreign-type-path.rs
diff --git a/src/test/rustdoc-js/generics-impl.js b/tests/rustdoc-js/generics-impl.js
index bb6e0041d..bb6e0041d 100644
--- a/src/test/rustdoc-js/generics-impl.js
+++ b/tests/rustdoc-js/generics-impl.js
diff --git a/src/test/rustdoc-js/generics-impl.rs b/tests/rustdoc-js/generics-impl.rs
index 696218021..696218021 100644
--- a/src/test/rustdoc-js/generics-impl.rs
+++ b/tests/rustdoc-js/generics-impl.rs
diff --git a/src/test/rustdoc-js/generics-multi-trait.js b/tests/rustdoc-js/generics-multi-trait.js
index e7fcea876..e7fcea876 100644
--- a/src/test/rustdoc-js/generics-multi-trait.js
+++ b/tests/rustdoc-js/generics-multi-trait.js
diff --git a/src/test/rustdoc-js/generics-multi-trait.rs b/tests/rustdoc-js/generics-multi-trait.rs
index e6fd06d25..e6fd06d25 100644
--- a/src/test/rustdoc-js/generics-multi-trait.rs
+++ b/tests/rustdoc-js/generics-multi-trait.rs
diff --git a/src/test/rustdoc-js/generics-trait.js b/tests/rustdoc-js/generics-trait.js
index 787662243..787662243 100644
--- a/src/test/rustdoc-js/generics-trait.js
+++ b/tests/rustdoc-js/generics-trait.js
diff --git a/src/test/rustdoc-js/generics-trait.rs b/tests/rustdoc-js/generics-trait.rs
index 20db117cc..20db117cc 100644
--- a/src/test/rustdoc-js/generics-trait.rs
+++ b/tests/rustdoc-js/generics-trait.rs
diff --git a/src/test/rustdoc-js/generics.js b/tests/rustdoc-js/generics.js
index 5e5ba7cd9..5e5ba7cd9 100644
--- a/src/test/rustdoc-js/generics.js
+++ b/tests/rustdoc-js/generics.js
diff --git a/src/test/rustdoc-js/generics.rs b/tests/rustdoc-js/generics.rs
index 055c51c7e..055c51c7e 100644
--- a/src/test/rustdoc-js/generics.rs
+++ b/tests/rustdoc-js/generics.rs
diff --git a/src/test/rustdoc-js/impl-trait.js b/tests/rustdoc-js/impl-trait.js
index 8d594bf8a..8d594bf8a 100644
--- a/src/test/rustdoc-js/impl-trait.js
+++ b/tests/rustdoc-js/impl-trait.js
diff --git a/src/test/rustdoc-js/impl-trait.rs b/tests/rustdoc-js/impl-trait.rs
index fb8869b46..fb8869b46 100644
--- a/src/test/rustdoc-js/impl-trait.rs
+++ b/tests/rustdoc-js/impl-trait.rs
diff --git a/src/test/rustdoc-js/module-substring.js b/tests/rustdoc-js/module-substring.js
index a446c39eb..a446c39eb 100644
--- a/src/test/rustdoc-js/module-substring.js
+++ b/tests/rustdoc-js/module-substring.js
diff --git a/src/test/rustdoc-js/module-substring.rs b/tests/rustdoc-js/module-substring.rs
index 2eacc0a35..2eacc0a35 100644
--- a/src/test/rustdoc-js/module-substring.rs
+++ b/tests/rustdoc-js/module-substring.rs
diff --git a/src/test/rustdoc-js/path-ordering.js b/tests/rustdoc-js/path-ordering.js
index 4aee569b0..4aee569b0 100644
--- a/src/test/rustdoc-js/path-ordering.js
+++ b/tests/rustdoc-js/path-ordering.js
diff --git a/src/test/rustdoc-js/path-ordering.rs b/tests/rustdoc-js/path-ordering.rs
index 7843cf7f9..7843cf7f9 100644
--- a/src/test/rustdoc-js/path-ordering.rs
+++ b/tests/rustdoc-js/path-ordering.rs
diff --git a/src/test/rustdoc-js/primitive.js b/tests/rustdoc-js/primitive.js
index 918f70999..918f70999 100644
--- a/src/test/rustdoc-js/primitive.js
+++ b/tests/rustdoc-js/primitive.js
diff --git a/src/test/rustdoc-js/primitive.rs b/tests/rustdoc-js/primitive.rs
index 2b30ccf15..2b30ccf15 100644
--- a/src/test/rustdoc-js/primitive.rs
+++ b/tests/rustdoc-js/primitive.rs
diff --git a/src/test/rustdoc-js/prototype.js b/tests/rustdoc-js/prototype.js
index 2f1d841c3..2f1d841c3 100644
--- a/src/test/rustdoc-js/prototype.js
+++ b/tests/rustdoc-js/prototype.js
diff --git a/src/test/rustdoc-js/prototype.rs b/tests/rustdoc-js/prototype.rs
index 5f6d73cc1..5f6d73cc1 100644
--- a/src/test/rustdoc-js/prototype.rs
+++ b/tests/rustdoc-js/prototype.rs
diff --git a/src/test/rustdoc-js/raw-pointer.js b/tests/rustdoc-js/raw-pointer.js
index 140b955ea..140b955ea 100644
--- a/src/test/rustdoc-js/raw-pointer.js
+++ b/tests/rustdoc-js/raw-pointer.js
diff --git a/src/test/rustdoc-js/raw-pointer.rs b/tests/rustdoc-js/raw-pointer.rs
index b8ace2e0b..b8ace2e0b 100644
--- a/src/test/rustdoc-js/raw-pointer.rs
+++ b/tests/rustdoc-js/raw-pointer.rs
diff --git a/src/test/rustdoc-js/reexport.js b/tests/rustdoc-js/reexport.js
index 871e75d9b..871e75d9b 100644
--- a/src/test/rustdoc-js/reexport.js
+++ b/tests/rustdoc-js/reexport.js
diff --git a/src/test/rustdoc-js/reexport.rs b/tests/rustdoc-js/reexport.rs
index d69b2901e..d69b2901e 100644
--- a/src/test/rustdoc-js/reexport.rs
+++ b/tests/rustdoc-js/reexport.rs
diff --git a/tests/rustdoc-js/search-short-types.js b/tests/rustdoc-js/search-short-types.js
new file mode 100644
index 000000000..3b2f15a40
--- /dev/null
+++ b/tests/rustdoc-js/search-short-types.js
@@ -0,0 +1,9 @@
+const QUERY = 'P';
+
+const EXPECTED = {
+    'others': [
+        { 'path': 'search_short_types', 'name': 'P' },
+        { 'path': 'search_short_types::VeryLongTypeName', 'name': 'p' },
+        { 'path': 'search_short_types', 'name': 'Pa' },
+    ],
+};
diff --git a/src/test/rustdoc-js/search-short-types.rs b/tests/rustdoc-js/search-short-types.rs
index a4083f9a7..a4083f9a7 100644
--- a/src/test/rustdoc-js/search-short-types.rs
+++ b/tests/rustdoc-js/search-short-types.rs
diff --git a/src/test/rustdoc-js/struct-like-variant.js b/tests/rustdoc-js/struct-like-variant.js
index f6deea51e..f6deea51e 100644
--- a/src/test/rustdoc-js/struct-like-variant.js
+++ b/tests/rustdoc-js/struct-like-variant.js
diff --git a/src/test/rustdoc-js/struct-like-variant.rs b/tests/rustdoc-js/struct-like-variant.rs
index 2f52a319a..2f52a319a 100644
--- a/src/test/rustdoc-js/struct-like-variant.rs
+++ b/tests/rustdoc-js/struct-like-variant.rs
diff --git a/src/test/rustdoc-js/substring.js b/tests/rustdoc-js/substring.js
index af05cd1ad..af05cd1ad 100644
--- a/src/test/rustdoc-js/substring.js
+++ b/tests/rustdoc-js/substring.js
diff --git a/src/test/rustdoc-js/substring.rs b/tests/rustdoc-js/substring.rs
index e729c722c..e729c722c 100644
--- a/src/test/rustdoc-js/substring.rs
+++ b/tests/rustdoc-js/substring.rs
diff --git a/src/test/rustdoc-js/summaries.js b/tests/rustdoc-js/summaries.js
index dfb11e804..dfb11e804 100644
--- a/src/test/rustdoc-js/summaries.js
+++ b/tests/rustdoc-js/summaries.js
diff --git a/src/test/rustdoc-js/summaries.rs b/tests/rustdoc-js/summaries.rs
index 1ee1c34aa..1ee1c34aa 100644
--- a/src/test/rustdoc-js/summaries.rs
+++ b/tests/rustdoc-js/summaries.rs
diff --git a/src/test/rustdoc-json/assoc_items.rs b/tests/rustdoc-json/assoc_items.rs
index 6d7f6bb96..6d7f6bb96 100644
--- a/src/test/rustdoc-json/assoc_items.rs
+++ b/tests/rustdoc-json/assoc_items.rs
diff --git a/src/test/rustdoc-json/assoc_type.rs b/tests/rustdoc-json/assoc_type.rs
index edc1f73c8..edc1f73c8 100644
--- a/src/test/rustdoc-json/assoc_type.rs
+++ b/tests/rustdoc-json/assoc_type.rs
diff --git a/src/test/rustdoc-json/blanket_impls.rs b/tests/rustdoc-json/blanket_impls.rs
index c5cc87ca1..c5cc87ca1 100644
--- a/src/test/rustdoc-json/blanket_impls.rs
+++ b/tests/rustdoc-json/blanket_impls.rs
diff --git a/src/test/rustdoc-json/doc_hidden_failure.rs b/tests/rustdoc-json/doc_hidden_failure.rs
index 6573166c4..0d2c6b220 100644
--- a/src/test/rustdoc-json/doc_hidden_failure.rs
+++ b/tests/rustdoc-json/doc_hidden_failure.rs
@@ -14,7 +14,8 @@ mod auto {
     }
 }
 
-// @count "$.index[*][?(@.name=='builders')]" 2
+// @count "$.index[*][?(@.name=='builders')]" 1
+// @has "$.index[*][?(@.name == 'ActionRowBuilder')"]
 pub use auto::*;
 
 pub mod builders {
diff --git a/src/test/rustdoc-json/enums/auxiliary/color.rs b/tests/rustdoc-json/enums/auxiliary/color.rs
index 7188f7938..7188f7938 100644
--- a/src/test/rustdoc-json/enums/auxiliary/color.rs
+++ b/tests/rustdoc-json/enums/auxiliary/color.rs
diff --git a/tests/rustdoc-json/enums/discriminant/basic.rs b/tests/rustdoc-json/enums/discriminant/basic.rs
new file mode 100644
index 000000000..06906df3b
--- /dev/null
+++ b/tests/rustdoc-json/enums/discriminant/basic.rs
@@ -0,0 +1,12 @@
+#[repr(i8)]
+pub enum Ordering {
+    // @is "$.index[*][?(@.name=='Less')].inner.discriminant.expr" '"-1"'
+    // @is "$.index[*][?(@.name=='Less')].inner.discriminant.value" '"-1"'
+    Less = -1,
+    // @is "$.index[*][?(@.name=='Equal')].inner.discriminant.expr" '"0"'
+    // @is "$.index[*][?(@.name=='Equal')].inner.discriminant.value" '"0"'
+    Equal = 0,
+    // @is "$.index[*][?(@.name=='Greater')].inner.discriminant.expr" '"1"'
+    // @is "$.index[*][?(@.name=='Greater')].inner.discriminant.value" '"1"'
+    Greater = 1,
+}
diff --git a/tests/rustdoc-json/enums/discriminant/expr.rs b/tests/rustdoc-json/enums/discriminant/expr.rs
new file mode 100644
index 000000000..e639965e7
--- /dev/null
+++ b/tests/rustdoc-json/enums/discriminant/expr.rs
@@ -0,0 +1,39 @@
+pub enum Foo {
+    // @is "$.index[*][?(@.name=='Addition')].inner.discriminant.value" '"0"'
+    // @is "$.index[*][?(@.name=='Addition')].inner.discriminant.expr" '"{ _ }"'
+    Addition = 0 + 0,
+    // @is "$.index[*][?(@.name=='Bin')].inner.discriminant.value" '"1"'
+    // @is "$.index[*][?(@.name=='Bin')].inner.discriminant.expr" '"0b1"'
+    Bin = 0b1,
+    // @is "$.index[*][?(@.name=='Oct')].inner.discriminant.value" '"2"'
+    // @is "$.index[*][?(@.name=='Oct')].inner.discriminant.expr" '"0o2"'
+    Oct = 0o2,
+    // @is "$.index[*][?(@.name=='PubConst')].inner.discriminant.value" '"3"'
+    // @is "$.index[*][?(@.name=='PubConst')].inner.discriminant.expr" '"THREE"'
+    PubConst = THREE,
+    // @is "$.index[*][?(@.name=='Hex')].inner.discriminant.value" '"4"'
+    // @is "$.index[*][?(@.name=='Hex')].inner.discriminant.expr" '"0x4"'
+    Hex = 0x4,
+    // @is "$.index[*][?(@.name=='Cast')].inner.discriminant.value" '"5"'
+    // @is "$.index[*][?(@.name=='Cast')].inner.discriminant.expr" '"{ _ }"'
+    Cast = 5 as isize,
+    // @is "$.index[*][?(@.name=='PubCall')].inner.discriminant.value" '"6"'
+    // @is "$.index[*][?(@.name=='PubCall')].inner.discriminant.expr" '"{ _ }"'
+    PubCall = six(),
+    // @is "$.index[*][?(@.name=='PrivCall')].inner.discriminant.value" '"7"'
+    // @is "$.index[*][?(@.name=='PrivCall')].inner.discriminant.expr" '"{ _ }"'
+    PrivCall = seven(),
+    // @is "$.index[*][?(@.name=='PrivConst')].inner.discriminant.value" '"8"'
+    // @is "$.index[*][?(@.name=='PrivConst')].inner.discriminant.expr" '"EIGHT"'
+    PrivConst = EIGHT,
+}
+
+pub const THREE: isize = 3;
+const EIGHT: isize = 8;
+
+pub const fn six() -> isize {
+    6
+}
+const fn seven() -> isize {
+    7
+}
diff --git a/tests/rustdoc-json/enums/discriminant/limits.rs b/tests/rustdoc-json/enums/discriminant/limits.rs
new file mode 100644
index 000000000..e56d5594f
--- /dev/null
+++ b/tests/rustdoc-json/enums/discriminant/limits.rs
@@ -0,0 +1,43 @@
+// ignore-tidy-linelength
+#![feature(repr128)]
+#![allow(incomplete_features)]
+
+#[repr(u64)]
+pub enum U64 {
+    // @is "$.index[*][?(@.name=='U64Min')].inner.discriminant.value" '"0"'
+    // @is "$.index[*][?(@.name=='U64Min')].inner.discriminant.expr" '"u64::MIN"'
+    U64Min = u64::MIN,
+    // @is "$.index[*][?(@.name=='U64Max')].inner.discriminant.value" '"18446744073709551615"'
+    // @is "$.index[*][?(@.name=='U64Max')].inner.discriminant.expr" '"u64::MAX"'
+    U64Max = u64::MAX,
+}
+
+#[repr(i64)]
+pub enum I64 {
+    // @is "$.index[*][?(@.name=='I64Min')].inner.discriminant.value" '"-9223372036854775808"'
+    // @is "$.index[*][?(@.name=='I64Min')].inner.discriminant.expr" '"i64::MIN"'
+    I64Min = i64::MIN,
+    // @is "$.index[*][?(@.name=='I64Max')].inner.discriminant.value" '"9223372036854775807"'
+    // @is "$.index[*][?(@.name=='I64Max')].inner.discriminant.expr" '"i64::MAX"'
+    I64Max = i64::MAX,
+}
+
+#[repr(u128)]
+pub enum U128 {
+    // @is "$.index[*][?(@.name=='U128Min')].inner.discriminant.value" '"0"'
+    // @is "$.index[*][?(@.name=='U128Min')].inner.discriminant.expr" '"u128::MIN"'
+    U128Min = u128::MIN,
+    // @is "$.index[*][?(@.name=='U128Max')].inner.discriminant.value" '"340282366920938463463374607431768211455"'
+    // @is "$.index[*][?(@.name=='U128Max')].inner.discriminant.expr" '"u128::MAX"'
+    U128Max = u128::MAX,
+}
+
+#[repr(i128)]
+pub enum I128 {
+    // @is "$.index[*][?(@.name=='I128Min')].inner.discriminant.value" '"-170141183460469231731687303715884105728"'
+    // @is "$.index[*][?(@.name=='I128Min')].inner.discriminant.expr" '"i128::MIN"'
+    I128Min = i128::MIN,
+    // @is "$.index[*][?(@.name=='I128Max')].inner.discriminant.value" '"170141183460469231731687303715884105727"'
+    // @is "$.index[*][?(@.name=='I128Max')].inner.discriminant.expr" '"i128::MAX"'
+    I128Max = i128::MAX,
+}
diff --git a/tests/rustdoc-json/enums/discriminant/num_underscore_and_suffix.rs b/tests/rustdoc-json/enums/discriminant/num_underscore_and_suffix.rs
new file mode 100644
index 000000000..6889b305f
--- /dev/null
+++ b/tests/rustdoc-json/enums/discriminant/num_underscore_and_suffix.rs
@@ -0,0 +1,15 @@
+#[repr(u32)]
+pub enum Foo {
+    // @is "$.index[*][?(@.name=='Basic')].inner.discriminant.value" '"0"'
+    // @is "$.index[*][?(@.name=='Basic')].inner.discriminant.expr" '"0"'
+    Basic = 0,
+    // @is "$.index[*][?(@.name=='Suffix')].inner.discriminant.value" '"10"'
+    // @is "$.index[*][?(@.name=='Suffix')].inner.discriminant.expr" '"10u32"'
+    Suffix = 10u32,
+    // @is "$.index[*][?(@.name=='Underscore')].inner.discriminant.value" '"100"'
+    // @is "$.index[*][?(@.name=='Underscore')].inner.discriminant.expr" '"1_0_0"'
+    Underscore = 1_0_0,
+    // @is "$.index[*][?(@.name=='SuffixUnderscore')].inner.discriminant.value" '"1000"'
+    // @is "$.index[*][?(@.name=='SuffixUnderscore')].inner.discriminant.expr" '"1_0_0_0u32"'
+    SuffixUnderscore = 1_0_0_0u32,
+}
diff --git a/tests/rustdoc-json/enums/discriminant/only_some_have_discriminant.rs b/tests/rustdoc-json/enums/discriminant/only_some_have_discriminant.rs
new file mode 100644
index 000000000..6a4f54de6
--- /dev/null
+++ b/tests/rustdoc-json/enums/discriminant/only_some_have_discriminant.rs
@@ -0,0 +1,10 @@
+pub enum Foo {
+    // @is "$.index[*][?(@.name=='Has')].inner.discriminant" '{"expr":"0", "value":"0"}'
+    Has = 0,
+    // @is "$.index[*][?(@.name=='Doesnt')].inner.discriminant" null
+    Doesnt,
+    // @is "$.index[*][?(@.name=='AlsoDoesnt')].inner.discriminant" null
+    AlsoDoesnt,
+    // @is "$.index[*][?(@.name=='AlsoHas')].inner.discriminant" '{"expr":"44", "value":"44"}'
+    AlsoHas = 44,
+}
diff --git a/tests/rustdoc-json/enums/discriminant/struct.rs b/tests/rustdoc-json/enums/discriminant/struct.rs
new file mode 100644
index 000000000..e91a632a3
--- /dev/null
+++ b/tests/rustdoc-json/enums/discriminant/struct.rs
@@ -0,0 +1,15 @@
+// ignore-tidy-linelength
+
+#[repr(i32)]
+// @is "$.index[*][?(@.name=='Foo')].attrs" '["#[repr(i32)]"]'
+pub enum Foo {
+    // @is    "$.index[*][?(@.name=='Struct')].inner.discriminant" null
+    // @count "$.index[*][?(@.name=='Struct')].inner.kind.struct.fields[*]" 0
+    Struct {},
+    // @is    "$.index[*][?(@.name=='StructWithDiscr')].inner.discriminant" '{"expr": "42", "value": "42"}'
+    // @count "$.index[*][?(@.name=='StructWithDiscr')].inner.kind.struct.fields[*]" 1
+    StructWithDiscr { x: i32 } = 42,
+    // @is    "$.index[*][?(@.name=='StructWithHexDiscr')].inner.discriminant"  '{"expr": "0x42", "value": "66"}'
+    // @count "$.index[*][?(@.name=='StructWithHexDiscr')].inner.kind.struct.fields[*]" 2
+    StructWithHexDiscr { x: i32, y: bool } = 0x42,
+}
diff --git a/tests/rustdoc-json/enums/discriminant/tuple.rs b/tests/rustdoc-json/enums/discriminant/tuple.rs
new file mode 100644
index 000000000..b94d5739e
--- /dev/null
+++ b/tests/rustdoc-json/enums/discriminant/tuple.rs
@@ -0,0 +1,15 @@
+// ignore-tidy-linelength
+
+#[repr(u32)]
+// @is "$.index[*][?(@.name=='Foo')].attrs" '["#[repr(u32)]"]'
+pub enum Foo {
+    // @is    "$.index[*][?(@.name=='Tuple')].inner.discriminant" null
+    // @count "$.index[*][?(@.name=='Tuple')].inner.kind.tuple[*]" 0
+    Tuple(),
+    // @is    "$.index[*][?(@.name=='TupleWithDiscr')].inner.discriminant" '{"expr": "1", "value": "1"}'
+    // @count "$.index[*][?(@.name=='TupleWithDiscr')].inner.kind.tuple[*]" 1
+    TupleWithDiscr(i32) = 1,
+    // @is    "$.index[*][?(@.name=='TupleWithBinDiscr')].inner.discriminant" '{"expr": "0b10", "value": "2"}'
+    // @count "$.index[*][?(@.name=='TupleWithBinDiscr')].inner.kind.tuple[*]" 2
+    TupleWithBinDiscr(i32, i32) = 0b10,
+}
diff --git a/src/test/rustdoc-json/enums/doc_link_to_foreign_variant.rs b/tests/rustdoc-json/enums/doc_link_to_foreign_variant.rs
index 470b195a2..470b195a2 100644
--- a/src/test/rustdoc-json/enums/doc_link_to_foreign_variant.rs
+++ b/tests/rustdoc-json/enums/doc_link_to_foreign_variant.rs
diff --git a/tests/rustdoc-json/enums/field_hidden.rs b/tests/rustdoc-json/enums/field_hidden.rs
new file mode 100644
index 000000000..78a054314
--- /dev/null
+++ b/tests/rustdoc-json/enums/field_hidden.rs
@@ -0,0 +1,13 @@
+// Regression test for <https://github.com/rust-lang/rust/issues/100529>.
+
+#![no_core]
+#![feature(no_core)]
+
+// @has "$.index[*][?(@.name=='ParseError')]"
+// @has "$.index[*][?(@.name=='UnexpectedEndTag')]"
+// @is "$.index[*][?(@.name=='UnexpectedEndTag')].inner.kind.tuple" [null]
+// @is "$.index[*][?(@.name=='UnexpectedEndTag')].inner.discriminant" null
+
+pub enum ParseError {
+    UnexpectedEndTag(#[doc(hidden)] u32),
+}
diff --git a/tests/rustdoc-json/enums/kind.rs b/tests/rustdoc-json/enums/kind.rs
new file mode 100644
index 000000000..1787a859c
--- /dev/null
+++ b/tests/rustdoc-json/enums/kind.rs
@@ -0,0 +1,32 @@
+// ignore-tidy-linelength
+
+#![feature(no_core)]
+#![no_core]
+
+pub enum Foo {
+    // @set Unit = "$.index[*][?(@.name=='Unit')].id"
+    // @is "$.index[*][?(@.name=='Unit')].inner.kind" '"plain"'
+    Unit,
+    // @set Named = "$.index[*][?(@.name=='Named')].id"
+    // @is "$.index[*][?(@.name=='Named')].inner.kind.struct" '{"fields": [], "fields_stripped": false}'
+    Named {},
+    // @set Tuple = "$.index[*][?(@.name=='Tuple')].id"
+    // @is "$.index[*][?(@.name=='Tuple')].inner.kind.tuple" []
+    Tuple(),
+    // @set NamedField = "$.index[*][?(@.name=='NamedField')].id"
+    // @set x = "$.index[*][?(@.name=='x' && @.kind=='struct_field')].id"
+    // @is "$.index[*][?(@.name=='NamedField')].inner.kind.struct.fields[*]" $x
+    // @is "$.index[*][?(@.name=='NamedField')].inner.kind.struct.fields_stripped" false
+    NamedField { x: i32 },
+    // @set TupleField = "$.index[*][?(@.name=='TupleField')].id"
+    // @set tup_field = "$.index[*][?(@.name=='0' && @.kind=='struct_field')].id"
+    // @is "$.index[*][?(@.name=='TupleField')].inner.kind.tuple[*]" $tup_field
+    TupleField(i32),
+}
+
+// @is    "$.index[*][?(@.name=='Foo')].inner.variants[0]" $Unit
+// @is    "$.index[*][?(@.name=='Foo')].inner.variants[1]" $Named
+// @is    "$.index[*][?(@.name=='Foo')].inner.variants[2]" $Tuple
+// @is    "$.index[*][?(@.name=='Foo')].inner.variants[3]" $NamedField
+// @is    "$.index[*][?(@.name=='Foo')].inner.variants[4]" $TupleField
+// @count "$.index[*][?(@.name=='Foo')].inner.variants[*]" 5
diff --git a/tests/rustdoc-json/enums/struct_field_hidden.rs b/tests/rustdoc-json/enums/struct_field_hidden.rs
new file mode 100644
index 000000000..de939cde2
--- /dev/null
+++ b/tests/rustdoc-json/enums/struct_field_hidden.rs
@@ -0,0 +1,16 @@
+pub enum Foo {
+    Variant {
+        #[doc(hidden)]
+        a: i32,
+        // @set b = "$.index[*][?(@.name=='b')].id"
+        b: i32,
+        #[doc(hidden)]
+        x: i32,
+        // @set y = "$.index[*][?(@.name=='y')].id"
+        y: i32,
+    },
+    // @is "$.index[*][?(@.name=='Variant')].inner.kind.struct.fields_stripped" true
+    // @is "$.index[*][?(@.name=='Variant')].inner.kind.struct.fields[0]" $b
+    // @is "$.index[*][?(@.name=='Variant')].inner.kind.struct.fields[1]" $y
+    // @count "$.index[*][?(@.name=='Variant')].inner.kind.struct.fields[*]" 2
+}
diff --git a/tests/rustdoc-json/enums/tuple_fields_hidden.rs b/tests/rustdoc-json/enums/tuple_fields_hidden.rs
new file mode 100644
index 000000000..70bfbb818
--- /dev/null
+++ b/tests/rustdoc-json/enums/tuple_fields_hidden.rs
@@ -0,0 +1,83 @@
+#![feature(no_core)]
+#![no_core]
+
+// @set 1.1.0 = "$.index[*][?(@.docs=='1.1.0')].id"
+// @set 2.1.0 = "$.index[*][?(@.docs=='2.1.0')].id"
+// @set 2.1.1 = "$.index[*][?(@.docs=='2.1.1')].id"
+// @set 2.2.1 = "$.index[*][?(@.docs=='2.2.1')].id"
+// @set 2.3.0 = "$.index[*][?(@.docs=='2.3.0')].id"
+// @set 3.1.1 = "$.index[*][?(@.docs=='3.1.1')].id"
+// @set 3.1.2 = "$.index[*][?(@.docs=='3.1.2')].id"
+// @set 3.2.0 = "$.index[*][?(@.docs=='3.2.0')].id"
+// @set 3.2.2 = "$.index[*][?(@.docs=='3.2.2')].id"
+// @set 3.3.0 = "$.index[*][?(@.docs=='3.3.0')].id"
+// @set 3.3.1 = "$.index[*][?(@.docs=='3.3.1')].id"
+
+pub enum EnumWithStrippedTupleVariants {
+    // @count "$.index[*][?(@.name=='None')].inner.kind.tuple[*]" 0
+    None(),
+
+    // @count "$.index[*][?(@.name=='One')].inner.kind.tuple[*]" 1
+    // @is    "$.index[*][?(@.name=='One')].inner.kind.tuple[0]" $1.1.0
+    One(/** 1.1.0*/ bool),
+    // @count "$.index[*][?(@.name=='OneHidden')].inner.kind.tuple[*]" 1
+    // @is    "$.index[*][?(@.name=='OneHidden')].inner.kind.tuple[0]" null
+    OneHidden(#[doc(hidden)] bool),
+
+    // @count "$.index[*][?(@.name=='Two')].inner.kind.tuple[*]" 2
+    // @is    "$.index[*][?(@.name=='Two')].inner.kind.tuple[0]" $2.1.0
+    // @is    "$.index[*][?(@.name=='Two')].inner.kind.tuple[1]" $2.1.1
+    Two(/** 2.1.0*/ bool, /** 2.1.1*/ bool),
+    // @count "$.index[*][?(@.name=='TwoLeftHidden')].inner.kind.tuple[*]" 2
+    // @is    "$.index[*][?(@.name=='TwoLeftHidden')].inner.kind.tuple[0]" null
+    // @is    "$.index[*][?(@.name=='TwoLeftHidden')].inner.kind.tuple[1]" $2.2.1
+    TwoLeftHidden(#[doc(hidden)] bool, /** 2.2.1*/ bool),
+    // @count "$.index[*][?(@.name=='TwoRightHidden')].inner.kind.tuple[*]" 2
+    // @is    "$.index[*][?(@.name=='TwoRightHidden')].inner.kind.tuple[0]" $2.3.0
+    // @is    "$.index[*][?(@.name=='TwoRightHidden')].inner.kind.tuple[1]" null
+    TwoRightHidden(/** 2.3.0*/ bool, #[doc(hidden)] bool),
+    // @count "$.index[*][?(@.name=='TwoBothHidden')].inner.kind.tuple[*]" 2
+    // @is    "$.index[*][?(@.name=='TwoBothHidden')].inner.kind.tuple[0]" null
+    // @is    "$.index[*][?(@.name=='TwoBothHidden')].inner.kind.tuple[1]" null
+    TwoBothHidden(#[doc(hidden)] bool, #[doc(hidden)] bool),
+
+    // @count "$.index[*][?(@.name=='Three1')].inner.kind.tuple[*]" 3
+    // @is    "$.index[*][?(@.name=='Three1')].inner.kind.tuple[0]" null
+    // @is    "$.index[*][?(@.name=='Three1')].inner.kind.tuple[1]" $3.1.1
+    // @is    "$.index[*][?(@.name=='Three1')].inner.kind.tuple[2]" $3.1.2
+    Three1(#[doc(hidden)] bool, /** 3.1.1*/ bool, /** 3.1.2*/ bool),
+    // @count "$.index[*][?(@.name=='Three2')].inner.kind.tuple[*]" 3
+    // @is    "$.index[*][?(@.name=='Three2')].inner.kind.tuple[0]" $3.2.0
+    // @is    "$.index[*][?(@.name=='Three2')].inner.kind.tuple[1]" null
+    // @is    "$.index[*][?(@.name=='Three2')].inner.kind.tuple[2]" $3.2.2
+    Three2(/** 3.2.0*/ bool, #[doc(hidden)] bool, /** 3.2.2*/ bool),
+    // @count "$.index[*][?(@.name=='Three3')].inner.kind.tuple[*]" 3
+    // @is    "$.index[*][?(@.name=='Three3')].inner.kind.tuple[0]" $3.3.0
+    // @is    "$.index[*][?(@.name=='Three3')].inner.kind.tuple[1]" $3.3.1
+    // @is    "$.index[*][?(@.name=='Three3')].inner.kind.tuple[2]" null
+    Three3(/** 3.3.0*/ bool, /** 3.3.1*/ bool, #[doc(hidden)] bool),
+}
+
+// @is "$.index[*][?(@.docs=='1.1.0')].name" '"0"'
+// @is "$.index[*][?(@.docs=='2.1.0')].name" '"0"'
+// @is "$.index[*][?(@.docs=='2.1.1')].name" '"1"'
+// @is "$.index[*][?(@.docs=='2.2.1')].name" '"1"'
+// @is "$.index[*][?(@.docs=='2.3.0')].name" '"0"'
+// @is "$.index[*][?(@.docs=='3.1.1')].name" '"1"'
+// @is "$.index[*][?(@.docs=='3.1.2')].name" '"2"'
+// @is "$.index[*][?(@.docs=='3.2.0')].name" '"0"'
+// @is "$.index[*][?(@.docs=='3.2.2')].name" '"2"'
+// @is "$.index[*][?(@.docs=='3.3.0')].name" '"0"'
+// @is "$.index[*][?(@.docs=='3.3.1')].name" '"1"'
+
+// @is "$.index[*][?(@.docs=='1.1.0')].inner" '{"kind": "primitive", "inner": "bool"}'
+// @is "$.index[*][?(@.docs=='2.1.0')].inner" '{"kind": "primitive", "inner": "bool"}'
+// @is "$.index[*][?(@.docs=='2.1.1')].inner" '{"kind": "primitive", "inner": "bool"}'
+// @is "$.index[*][?(@.docs=='2.2.1')].inner" '{"kind": "primitive", "inner": "bool"}'
+// @is "$.index[*][?(@.docs=='2.3.0')].inner" '{"kind": "primitive", "inner": "bool"}'
+// @is "$.index[*][?(@.docs=='3.1.1')].inner" '{"kind": "primitive", "inner": "bool"}'
+// @is "$.index[*][?(@.docs=='3.1.2')].inner" '{"kind": "primitive", "inner": "bool"}'
+// @is "$.index[*][?(@.docs=='3.2.0')].inner" '{"kind": "primitive", "inner": "bool"}'
+// @is "$.index[*][?(@.docs=='3.2.2')].inner" '{"kind": "primitive", "inner": "bool"}'
+// @is "$.index[*][?(@.docs=='3.3.0')].inner" '{"kind": "primitive", "inner": "bool"}'
+// @is "$.index[*][?(@.docs=='3.3.1')].inner" '{"kind": "primitive", "inner": "bool"}'
diff --git a/src/test/rustdoc-json/enums/use_glob.rs b/tests/rustdoc-json/enums/use_glob.rs
index 62b8b832a..62b8b832a 100644
--- a/src/test/rustdoc-json/enums/use_glob.rs
+++ b/tests/rustdoc-json/enums/use_glob.rs
diff --git a/src/test/rustdoc-json/enums/use_variant.rs b/tests/rustdoc-json/enums/use_variant.rs
index 5f0d2b9b1..5f0d2b9b1 100644
--- a/src/test/rustdoc-json/enums/use_variant.rs
+++ b/tests/rustdoc-json/enums/use_variant.rs
diff --git a/src/test/rustdoc-json/enums/use_variant_foreign.rs b/tests/rustdoc-json/enums/use_variant_foreign.rs
index 11bb6ce1f..11bb6ce1f 100644
--- a/src/test/rustdoc-json/enums/use_variant_foreign.rs
+++ b/tests/rustdoc-json/enums/use_variant_foreign.rs
diff --git a/tests/rustdoc-json/enums/variant_struct.rs b/tests/rustdoc-json/enums/variant_struct.rs
new file mode 100644
index 000000000..bc870c502
--- /dev/null
+++ b/tests/rustdoc-json/enums/variant_struct.rs
@@ -0,0 +1,10 @@
+// @is "$.index[*][?(@.name=='EnumStruct')].visibility" \"public\"
+// @is "$.index[*][?(@.name=='EnumStruct')].kind" \"enum\"
+pub enum EnumStruct {
+    // @is "$.index[*][?(@.name=='x')].kind" \"struct_field\"
+    // @set x = "$.index[*][?(@.name=='x')].id"
+    // @is "$.index[*][?(@.name=='y')].kind" \"struct_field\"
+    // @set y = "$.index[*][?(@.name=='y')].id"
+    // @ismany "$.index[*][?(@.name=='VariantS')].inner.kind.struct.fields[*]" $x $y
+    VariantS { x: u32, y: String },
+}
diff --git a/tests/rustdoc-json/enums/variant_tuple_struct.rs b/tests/rustdoc-json/enums/variant_tuple_struct.rs
new file mode 100644
index 000000000..d1207bbfb
--- /dev/null
+++ b/tests/rustdoc-json/enums/variant_tuple_struct.rs
@@ -0,0 +1,10 @@
+// @is "$.index[*][?(@.name=='EnumTupleStruct')].visibility" \"public\"
+// @is "$.index[*][?(@.name=='EnumTupleStruct')].kind" \"enum\"
+pub enum EnumTupleStruct {
+    // @is "$.index[*][?(@.name=='0')].kind" \"struct_field\"
+    // @set f0 = "$.index[*][?(@.name=='0')].id"
+    // @is "$.index[*][?(@.name=='1')].kind" \"struct_field\"
+    // @set f1 = "$.index[*][?(@.name=='1')].id"
+    // @ismany "$.index[*][?(@.name=='VariantA')].inner.kind.tuple[*]" $f0 $f1
+    VariantA(u32, String),
+}
diff --git a/src/test/rustdoc-json/fn_pointer/abi.rs b/tests/rustdoc-json/fn_pointer/abi.rs
index 3c1a453d1..3c1a453d1 100644
--- a/src/test/rustdoc-json/fn_pointer/abi.rs
+++ b/tests/rustdoc-json/fn_pointer/abi.rs
diff --git a/src/test/rustdoc-json/fn_pointer/generics.rs b/tests/rustdoc-json/fn_pointer/generics.rs
index a93b01ac2..a93b01ac2 100644
--- a/src/test/rustdoc-json/fn_pointer/generics.rs
+++ b/tests/rustdoc-json/fn_pointer/generics.rs
diff --git a/src/test/rustdoc-json/fn_pointer/qualifiers.rs b/tests/rustdoc-json/fn_pointer/qualifiers.rs
index bd65bb3ee..bd65bb3ee 100644
--- a/src/test/rustdoc-json/fn_pointer/qualifiers.rs
+++ b/tests/rustdoc-json/fn_pointer/qualifiers.rs
diff --git a/src/test/rustdoc-json/fns/abi.rs b/tests/rustdoc-json/fns/abi.rs
index 0e8b78bc0..0e8b78bc0 100644
--- a/src/test/rustdoc-json/fns/abi.rs
+++ b/tests/rustdoc-json/fns/abi.rs
diff --git a/src/test/rustdoc-json/fns/async_return.rs b/tests/rustdoc-json/fns/async_return.rs
index b89781ca9..b89781ca9 100644
--- a/src/test/rustdoc-json/fns/async_return.rs
+++ b/tests/rustdoc-json/fns/async_return.rs
diff --git a/src/test/rustdoc-json/fns/generic_args.rs b/tests/rustdoc-json/fns/generic_args.rs
index eec295efe..eec295efe 100644
--- a/src/test/rustdoc-json/fns/generic_args.rs
+++ b/tests/rustdoc-json/fns/generic_args.rs
diff --git a/src/test/rustdoc-json/fns/generic_returns.rs b/tests/rustdoc-json/fns/generic_returns.rs
index a9bc2d5d7..a9bc2d5d7 100644
--- a/src/test/rustdoc-json/fns/generic_returns.rs
+++ b/tests/rustdoc-json/fns/generic_returns.rs
diff --git a/src/test/rustdoc-json/fns/generics.rs b/tests/rustdoc-json/fns/generics.rs
index 7b70ff1df..7b70ff1df 100644
--- a/src/test/rustdoc-json/fns/generics.rs
+++ b/tests/rustdoc-json/fns/generics.rs
diff --git a/src/test/rustdoc-json/fns/pattern_arg.rs b/tests/rustdoc-json/fns/pattern_arg.rs
index 32b7da0fa..32b7da0fa 100644
--- a/src/test/rustdoc-json/fns/pattern_arg.rs
+++ b/tests/rustdoc-json/fns/pattern_arg.rs
diff --git a/src/test/rustdoc-json/fns/qualifiers.rs b/tests/rustdoc-json/fns/qualifiers.rs
index 7ff542900..7ff542900 100644
--- a/src/test/rustdoc-json/fns/qualifiers.rs
+++ b/tests/rustdoc-json/fns/qualifiers.rs
diff --git a/src/test/rustdoc-json/fns/return_type_alias.rs b/tests/rustdoc-json/fns/return_type_alias.rs
index 2578bb49a..2578bb49a 100644
--- a/src/test/rustdoc-json/fns/return_type_alias.rs
+++ b/tests/rustdoc-json/fns/return_type_alias.rs
diff --git a/src/test/rustdoc-json/generic-associated-types/gats.rs b/tests/rustdoc-json/generic-associated-types/gats.rs
index e5809783a..e5809783a 100644
--- a/src/test/rustdoc-json/generic-associated-types/gats.rs
+++ b/tests/rustdoc-json/generic-associated-types/gats.rs
diff --git a/src/test/rustdoc-json/generic_impl.rs b/tests/rustdoc-json/generic_impl.rs
index 31f41d0f3..31f41d0f3 100644
--- a/src/test/rustdoc-json/generic_impl.rs
+++ b/tests/rustdoc-json/generic_impl.rs
diff --git a/src/test/rustdoc-json/glob_import.rs b/tests/rustdoc-json/glob_import.rs
index 00051b121..00051b121 100644
--- a/src/test/rustdoc-json/glob_import.rs
+++ b/tests/rustdoc-json/glob_import.rs
diff --git a/src/test/rustdoc-json/impls/auto.rs b/tests/rustdoc-json/impls/auto.rs
index 50d852414..50d852414 100644
--- a/src/test/rustdoc-json/impls/auto.rs
+++ b/tests/rustdoc-json/impls/auto.rs
diff --git a/src/test/rustdoc-json/impls/auxiliary/foreign_struct.rs b/tests/rustdoc-json/impls/auxiliary/foreign_struct.rs
index 832d0fce5..832d0fce5 100644
--- a/src/test/rustdoc-json/impls/auxiliary/foreign_struct.rs
+++ b/tests/rustdoc-json/impls/auxiliary/foreign_struct.rs
diff --git a/src/test/rustdoc-json/impls/auxiliary/foreign_trait.rs b/tests/rustdoc-json/impls/auxiliary/foreign_trait.rs
index 2c81bee61..2c81bee61 100644
--- a/src/test/rustdoc-json/impls/auxiliary/foreign_trait.rs
+++ b/tests/rustdoc-json/impls/auxiliary/foreign_trait.rs
diff --git a/src/test/rustdoc-json/impls/blanket_with_local.rs b/tests/rustdoc-json/impls/blanket_with_local.rs
index 2fb4a84b9..2fb4a84b9 100644
--- a/src/test/rustdoc-json/impls/blanket_with_local.rs
+++ b/tests/rustdoc-json/impls/blanket_with_local.rs
diff --git a/src/test/rustdoc-json/impls/foreign_for_local.rs b/tests/rustdoc-json/impls/foreign_for_local.rs
index 290c2d571..290c2d571 100644
--- a/src/test/rustdoc-json/impls/foreign_for_local.rs
+++ b/tests/rustdoc-json/impls/foreign_for_local.rs
diff --git a/src/test/rustdoc-json/impls/import_from_private.rs b/tests/rustdoc-json/impls/import_from_private.rs
index fa88b6113..fa88b6113 100644
--- a/src/test/rustdoc-json/impls/import_from_private.rs
+++ b/tests/rustdoc-json/impls/import_from_private.rs
diff --git a/src/test/rustdoc-json/impls/local_for_foreign.rs b/tests/rustdoc-json/impls/local_for_foreign.rs
index 74f2f08b5..74f2f08b5 100644
--- a/src/test/rustdoc-json/impls/local_for_foreign.rs
+++ b/tests/rustdoc-json/impls/local_for_foreign.rs
diff --git a/src/test/rustdoc-json/impls/local_for_local.rs b/tests/rustdoc-json/impls/local_for_local.rs
index 93dedb7ec..93dedb7ec 100644
--- a/src/test/rustdoc-json/impls/local_for_local.rs
+++ b/tests/rustdoc-json/impls/local_for_local.rs
diff --git a/src/test/rustdoc-json/impls/local_for_local_primitive.rs b/tests/rustdoc-json/impls/local_for_local_primitive.rs
index 38e7e2658..38e7e2658 100644
--- a/src/test/rustdoc-json/impls/local_for_local_primitive.rs
+++ b/tests/rustdoc-json/impls/local_for_local_primitive.rs
diff --git a/src/test/rustdoc-json/impls/local_for_primitive.rs b/tests/rustdoc-json/impls/local_for_primitive.rs
index 7702a526f..7702a526f 100644
--- a/src/test/rustdoc-json/impls/local_for_primitive.rs
+++ b/tests/rustdoc-json/impls/local_for_primitive.rs
diff --git a/src/test/rustdoc-json/intra-doc-links/auxiliary/enum_variant_in_trait_method.rs b/tests/rustdoc-json/intra-doc-links/auxiliary/enum_variant_in_trait_method.rs
index bfe85f59e..bfe85f59e 100644
--- a/src/test/rustdoc-json/intra-doc-links/auxiliary/enum_variant_in_trait_method.rs
+++ b/tests/rustdoc-json/intra-doc-links/auxiliary/enum_variant_in_trait_method.rs
diff --git a/src/test/rustdoc-json/intra-doc-links/foreign_variant.rs b/tests/rustdoc-json/intra-doc-links/foreign_variant.rs
index e29682313..e29682313 100644
--- a/src/test/rustdoc-json/intra-doc-links/foreign_variant.rs
+++ b/tests/rustdoc-json/intra-doc-links/foreign_variant.rs
diff --git a/src/test/rustdoc-json/intra-doc-links/non_page.rs b/tests/rustdoc-json/intra-doc-links/non_page.rs
index 73c5334bb..73c5334bb 100644
--- a/src/test/rustdoc-json/intra-doc-links/non_page.rs
+++ b/tests/rustdoc-json/intra-doc-links/non_page.rs
diff --git a/src/test/rustdoc-json/intra-doc-links/user_written.rs b/tests/rustdoc-json/intra-doc-links/user_written.rs
index 6871dfea4..6871dfea4 100644
--- a/src/test/rustdoc-json/intra-doc-links/user_written.rs
+++ b/tests/rustdoc-json/intra-doc-links/user_written.rs
diff --git a/src/test/rustdoc-json/keyword.rs b/tests/rustdoc-json/keyword.rs
index 3446b212c..3446b212c 100644
--- a/src/test/rustdoc-json/keyword.rs
+++ b/tests/rustdoc-json/keyword.rs
diff --git a/src/test/rustdoc-json/lifetime/longest.rs b/tests/rustdoc-json/lifetime/longest.rs
index 326dab8e5..326dab8e5 100644
--- a/src/test/rustdoc-json/lifetime/longest.rs
+++ b/tests/rustdoc-json/lifetime/longest.rs
diff --git a/src/test/rustdoc-json/lifetime/outlives.rs b/tests/rustdoc-json/lifetime/outlives.rs
index e15a533ef..e15a533ef 100644
--- a/src/test/rustdoc-json/lifetime/outlives.rs
+++ b/tests/rustdoc-json/lifetime/outlives.rs
diff --git a/src/test/rustdoc-json/methods/abi.rs b/tests/rustdoc-json/methods/abi.rs
index 4c97d97ce..4c97d97ce 100644
--- a/src/test/rustdoc-json/methods/abi.rs
+++ b/tests/rustdoc-json/methods/abi.rs
diff --git a/src/test/rustdoc-json/methods/qualifiers.rs b/tests/rustdoc-json/methods/qualifiers.rs
index b9a5e5601..b9a5e5601 100644
--- a/src/test/rustdoc-json/methods/qualifiers.rs
+++ b/tests/rustdoc-json/methods/qualifiers.rs
diff --git a/src/test/rustdoc-json/nested.rs b/tests/rustdoc-json/nested.rs
index ee2d2efa9..ee2d2efa9 100644
--- a/src/test/rustdoc-json/nested.rs
+++ b/tests/rustdoc-json/nested.rs
diff --git a/src/test/rustdoc-json/output_generics.rs b/tests/rustdoc-json/output_generics.rs
index 04b1a358f..04b1a358f 100644
--- a/src/test/rustdoc-json/output_generics.rs
+++ b/tests/rustdoc-json/output_generics.rs
diff --git a/tests/rustdoc-json/primitives/local_primitive.rs b/tests/rustdoc-json/primitives/local_primitive.rs
new file mode 100644
index 000000000..f27e6a2ad
--- /dev/null
+++ b/tests/rustdoc-json/primitives/local_primitive.rs
@@ -0,0 +1,21 @@
+// Regression test for <https://github.com/rust-lang/rust/issues/104064>.
+
+#![feature(no_core)]
+#![feature(rustc_attrs)]
+#![feature(rustdoc_internals)]
+#![no_core]
+#![rustc_coherence_is_core]
+
+//! Link to [i32][prim@i32] [i64][prim@i64]
+
+#[doc(primitive = "i32")]
+mod prim_i32 {}
+
+// @set local_i32 = "$.index[*][?(@.name=='i32')].id"
+
+// @has "$.index[*][?(@.name=='local_primitive')]"
+// @ismany "$.index[*][?(@.name=='local_primitive')].inner.items[*]" $local_i32
+// @is "$.index[*][?(@.name=='local_primitive')].links['prim@i32']" $local_i32
+
+// Let's ensure the `prim_i32` module isn't present in the output JSON:
+// @!has "$.index[*][?(@.name=='prim_i32')]"
diff --git a/src/test/rustdoc-json/primitives/primitive_impls.rs b/tests/rustdoc-json/primitives/primitive_impls.rs
index 1fc937406..1fc937406 100644
--- a/src/test/rustdoc-json/primitives/primitive_impls.rs
+++ b/tests/rustdoc-json/primitives/primitive_impls.rs
diff --git a/src/test/rustdoc-json/primitives/primitive_overloading.rs b/tests/rustdoc-json/primitives/primitive_overloading.rs
index 56b35cd14..56b35cd14 100644
--- a/src/test/rustdoc-json/primitives/primitive_overloading.rs
+++ b/tests/rustdoc-json/primitives/primitive_overloading.rs
diff --git a/src/test/rustdoc-json/primitives/primitive_type.rs b/tests/rustdoc-json/primitives/primitive_type.rs
index 8024044bc..8024044bc 100644
--- a/src/test/rustdoc-json/primitives/primitive_type.rs
+++ b/tests/rustdoc-json/primitives/primitive_type.rs
diff --git a/src/test/rustdoc-json/primitives/use_primitive.rs b/tests/rustdoc-json/primitives/use_primitive.rs
index e22927374..e22927374 100644
--- a/src/test/rustdoc-json/primitives/use_primitive.rs
+++ b/tests/rustdoc-json/primitives/use_primitive.rs
diff --git a/src/test/rustdoc-json/reexport/auxiliary/pub-struct.rs b/tests/rustdoc-json/reexport/auxiliary/pub-struct.rs
index 4a835673a..4a835673a 100644
--- a/src/test/rustdoc-json/reexport/auxiliary/pub-struct.rs
+++ b/tests/rustdoc-json/reexport/auxiliary/pub-struct.rs
diff --git a/src/test/rustdoc-json/reexport/auxiliary/trait_with_docs.rs b/tests/rustdoc-json/reexport/auxiliary/trait_with_docs.rs
index 1e87966b2..1e87966b2 100644
--- a/src/test/rustdoc-json/reexport/auxiliary/trait_with_docs.rs
+++ b/tests/rustdoc-json/reexport/auxiliary/trait_with_docs.rs
diff --git a/src/test/rustdoc-json/reexport/export_extern_crate_as_self.rs b/tests/rustdoc-json/reexport/export_extern_crate_as_self.rs
index f076feb71..f076feb71 100644
--- a/src/test/rustdoc-json/reexport/export_extern_crate_as_self.rs
+++ b/tests/rustdoc-json/reexport/export_extern_crate_as_self.rs
diff --git a/src/test/rustdoc-json/reexport/glob_collision.rs b/tests/rustdoc-json/reexport/glob_collision.rs
index f91144dbf..f91144dbf 100644
--- a/src/test/rustdoc-json/reexport/glob_collision.rs
+++ b/tests/rustdoc-json/reexport/glob_collision.rs
diff --git a/src/test/rustdoc-json/reexport/glob_empty_mod.rs b/tests/rustdoc-json/reexport/glob_empty_mod.rs
index da6822835..da6822835 100644
--- a/src/test/rustdoc-json/reexport/glob_empty_mod.rs
+++ b/tests/rustdoc-json/reexport/glob_empty_mod.rs
diff --git a/src/test/rustdoc-json/reexport/glob_extern.rs b/tests/rustdoc-json/reexport/glob_extern.rs
index 7a1e8c11f..7a1e8c11f 100644
--- a/src/test/rustdoc-json/reexport/glob_extern.rs
+++ b/tests/rustdoc-json/reexport/glob_extern.rs
diff --git a/src/test/rustdoc-json/reexport/glob_private.rs b/tests/rustdoc-json/reexport/glob_private.rs
index 3a83a2081..3a83a2081 100644
--- a/src/test/rustdoc-json/reexport/glob_private.rs
+++ b/tests/rustdoc-json/reexport/glob_private.rs
diff --git a/src/test/rustdoc-json/reexport/in_root_and_mod.rs b/tests/rustdoc-json/reexport/in_root_and_mod.rs
index 7b97ebf21..7b97ebf21 100644
--- a/src/test/rustdoc-json/reexport/in_root_and_mod.rs
+++ b/tests/rustdoc-json/reexport/in_root_and_mod.rs
diff --git a/src/test/rustdoc-json/reexport/in_root_and_mod_pub.rs b/tests/rustdoc-json/reexport/in_root_and_mod_pub.rs
index f6d932d92..f6d932d92 100644
--- a/src/test/rustdoc-json/reexport/in_root_and_mod_pub.rs
+++ b/tests/rustdoc-json/reexport/in_root_and_mod_pub.rs
diff --git a/src/test/rustdoc-json/reexport/macro.rs b/tests/rustdoc-json/reexport/macro.rs
index b4882100f..b4882100f 100644
--- a/src/test/rustdoc-json/reexport/macro.rs
+++ b/tests/rustdoc-json/reexport/macro.rs
diff --git a/src/test/rustdoc-json/reexport/mod_not_included.rs b/tests/rustdoc-json/reexport/mod_not_included.rs
index 7b7600ef2..7b7600ef2 100644
--- a/src/test/rustdoc-json/reexport/mod_not_included.rs
+++ b/tests/rustdoc-json/reexport/mod_not_included.rs
diff --git a/src/test/rustdoc-json/reexport/private_twice_one_inline.rs b/tests/rustdoc-json/reexport/private_twice_one_inline.rs
index 687a3b2ac..687a3b2ac 100644
--- a/src/test/rustdoc-json/reexport/private_twice_one_inline.rs
+++ b/tests/rustdoc-json/reexport/private_twice_one_inline.rs
diff --git a/src/test/rustdoc-json/reexport/private_two_names.rs b/tests/rustdoc-json/reexport/private_two_names.rs
index 9858538a9..9858538a9 100644
--- a/src/test/rustdoc-json/reexport/private_two_names.rs
+++ b/tests/rustdoc-json/reexport/private_two_names.rs
diff --git a/tests/rustdoc-json/reexport/pub_use_doc_hidden.rs b/tests/rustdoc-json/reexport/pub_use_doc_hidden.rs
new file mode 100644
index 000000000..a2a25d084
--- /dev/null
+++ b/tests/rustdoc-json/reexport/pub_use_doc_hidden.rs
@@ -0,0 +1,15 @@
+// Regression test for <https://github.com/rust-lang/rust/issues/106379>
+
+#![feature(no_core)]
+#![no_core]
+
+mod repeat_n {
+    #[doc(hidden)]
+    pub struct RepeatN {}
+}
+
+pub use repeat_n::RepeatN;
+
+// @count "$.index[*][?(@.name=='pub_use_doc_hidden')].inner.items[*]" 0
+// @!has "$.index[*][?(@.kind=='struct')]"
+// @!has "$.index[*][?(@.kind=='import')]"
diff --git a/src/test/rustdoc-json/reexport/reexport_method_from_private_module.rs b/tests/rustdoc-json/reexport/reexport_method_from_private_module.rs
index 239b1a23b..239b1a23b 100644
--- a/src/test/rustdoc-json/reexport/reexport_method_from_private_module.rs
+++ b/tests/rustdoc-json/reexport/reexport_method_from_private_module.rs
diff --git a/src/test/rustdoc-json/reexport/rename_private.rs b/tests/rustdoc-json/reexport/rename_private.rs
index 8fd850f9b..8fd850f9b 100644
--- a/src/test/rustdoc-json/reexport/rename_private.rs
+++ b/tests/rustdoc-json/reexport/rename_private.rs
diff --git a/src/test/rustdoc-json/reexport/rename_public.rs b/tests/rustdoc-json/reexport/rename_public.rs
index e30907fe2..e30907fe2 100644
--- a/src/test/rustdoc-json/reexport/rename_public.rs
+++ b/tests/rustdoc-json/reexport/rename_public.rs
diff --git a/src/test/rustdoc-json/reexport/same_type_reexported_more_than_once.rs b/tests/rustdoc-json/reexport/same_type_reexported_more_than_once.rs
index 880dbdc44..880dbdc44 100644
--- a/src/test/rustdoc-json/reexport/same_type_reexported_more_than_once.rs
+++ b/tests/rustdoc-json/reexport/same_type_reexported_more_than_once.rs
diff --git a/src/test/rustdoc-json/reexport/simple_private.rs b/tests/rustdoc-json/reexport/simple_private.rs
index d058ce059..d058ce059 100644
--- a/src/test/rustdoc-json/reexport/simple_private.rs
+++ b/tests/rustdoc-json/reexport/simple_private.rs
diff --git a/src/test/rustdoc-json/reexport/simple_public.rs b/tests/rustdoc-json/reexport/simple_public.rs
index e64a0dcb7..e64a0dcb7 100644
--- a/src/test/rustdoc-json/reexport/simple_public.rs
+++ b/tests/rustdoc-json/reexport/simple_public.rs
diff --git a/src/test/rustdoc-json/reexport/synthesize_trait_with_docs.rs b/tests/rustdoc-json/reexport/synthesize_trait_with_docs.rs
index 25a7c08d6..25a7c08d6 100644
--- a/src/test/rustdoc-json/reexport/synthesize_trait_with_docs.rs
+++ b/tests/rustdoc-json/reexport/synthesize_trait_with_docs.rs
diff --git a/src/test/rustdoc-json/return_private.rs b/tests/rustdoc-json/return_private.rs
index a8d1fae30..a8d1fae30 100644
--- a/src/test/rustdoc-json/return_private.rs
+++ b/tests/rustdoc-json/return_private.rs
diff --git a/src/test/rustdoc-json/stripped_modules.rs b/tests/rustdoc-json/stripped_modules.rs
index d2664b49e..d2664b49e 100644
--- a/src/test/rustdoc-json/stripped_modules.rs
+++ b/tests/rustdoc-json/stripped_modules.rs
diff --git a/src/test/rustdoc-json/structs/plain_all_pub.rs b/tests/rustdoc-json/structs/plain_all_pub.rs
index b86ab93c2..b86ab93c2 100644
--- a/src/test/rustdoc-json/structs/plain_all_pub.rs
+++ b/tests/rustdoc-json/structs/plain_all_pub.rs
diff --git a/src/test/rustdoc-json/structs/plain_doc_hidden.rs b/tests/rustdoc-json/structs/plain_doc_hidden.rs
index 7800b55a4..7800b55a4 100644
--- a/src/test/rustdoc-json/structs/plain_doc_hidden.rs
+++ b/tests/rustdoc-json/structs/plain_doc_hidden.rs
diff --git a/src/test/rustdoc-json/structs/plain_empty.rs b/tests/rustdoc-json/structs/plain_empty.rs
index 1d01b8bc1..1d01b8bc1 100644
--- a/src/test/rustdoc-json/structs/plain_empty.rs
+++ b/tests/rustdoc-json/structs/plain_empty.rs
diff --git a/src/test/rustdoc-json/structs/plain_pub_priv.rs b/tests/rustdoc-json/structs/plain_pub_priv.rs
index 9b771224d..9b771224d 100644
--- a/src/test/rustdoc-json/structs/plain_pub_priv.rs
+++ b/tests/rustdoc-json/structs/plain_pub_priv.rs
diff --git a/src/test/rustdoc-json/structs/tuple.rs b/tests/rustdoc-json/structs/tuple.rs
index 6bdb753ee..6bdb753ee 100644
--- a/src/test/rustdoc-json/structs/tuple.rs
+++ b/tests/rustdoc-json/structs/tuple.rs
diff --git a/src/test/rustdoc-json/structs/tuple_empty.rs b/tests/rustdoc-json/structs/tuple_empty.rs
index 0ad6a8954..0ad6a8954 100644
--- a/src/test/rustdoc-json/structs/tuple_empty.rs
+++ b/tests/rustdoc-json/structs/tuple_empty.rs
diff --git a/src/test/rustdoc-json/structs/tuple_pub_priv.rs b/tests/rustdoc-json/structs/tuple_pub_priv.rs
index 9d5a1d1c8..9d5a1d1c8 100644
--- a/src/test/rustdoc-json/structs/tuple_pub_priv.rs
+++ b/tests/rustdoc-json/structs/tuple_pub_priv.rs
diff --git a/src/test/rustdoc-json/structs/unit.rs b/tests/rustdoc-json/structs/unit.rs
index 265709717..265709717 100644
--- a/src/test/rustdoc-json/structs/unit.rs
+++ b/tests/rustdoc-json/structs/unit.rs
diff --git a/src/test/rustdoc-json/structs/with_generics.rs b/tests/rustdoc-json/structs/with_generics.rs
index 00474800a..00474800a 100644
--- a/src/test/rustdoc-json/structs/with_generics.rs
+++ b/tests/rustdoc-json/structs/with_generics.rs
diff --git a/src/test/rustdoc-json/structs/with_primitives.rs b/tests/rustdoc-json/structs/with_primitives.rs
index 9c5a37f39..9c5a37f39 100644
--- a/src/test/rustdoc-json/structs/with_primitives.rs
+++ b/tests/rustdoc-json/structs/with_primitives.rs
diff --git a/src/test/rustdoc-json/traits/has_body.rs b/tests/rustdoc-json/traits/has_body.rs
index a57cb97d4..a57cb97d4 100644
--- a/src/test/rustdoc-json/traits/has_body.rs
+++ b/tests/rustdoc-json/traits/has_body.rs
diff --git a/src/test/rustdoc-json/traits/implementors.rs b/tests/rustdoc-json/traits/implementors.rs
index db3fe5df7..db3fe5df7 100644
--- a/src/test/rustdoc-json/traits/implementors.rs
+++ b/tests/rustdoc-json/traits/implementors.rs
diff --git a/src/test/rustdoc-json/traits/supertrait.rs b/tests/rustdoc-json/traits/supertrait.rs
index 4048fdd74..4048fdd74 100644
--- a/src/test/rustdoc-json/traits/supertrait.rs
+++ b/tests/rustdoc-json/traits/supertrait.rs
diff --git a/src/test/rustdoc-json/traits/trait_alias.rs b/tests/rustdoc-json/traits/trait_alias.rs
index 35db9296c..35db9296c 100644
--- a/src/test/rustdoc-json/traits/trait_alias.rs
+++ b/tests/rustdoc-json/traits/trait_alias.rs
diff --git a/src/test/rustdoc-json/traits/uses_extern_trait.rs b/tests/rustdoc-json/traits/uses_extern_trait.rs
index 55a51f739..55a51f739 100644
--- a/src/test/rustdoc-json/traits/uses_extern_trait.rs
+++ b/tests/rustdoc-json/traits/uses_extern_trait.rs
diff --git a/src/test/rustdoc-json/type/dyn.rs b/tests/rustdoc-json/type/dyn.rs
index eaf249252..eaf249252 100644
--- a/src/test/rustdoc-json/type/dyn.rs
+++ b/tests/rustdoc-json/type/dyn.rs
diff --git a/src/test/rustdoc-json/type/extern.rs b/tests/rustdoc-json/type/extern.rs
index d287d5ebe..d287d5ebe 100644
--- a/src/test/rustdoc-json/type/extern.rs
+++ b/tests/rustdoc-json/type/extern.rs
diff --git a/src/test/rustdoc-json/type/fn_lifetime.rs b/tests/rustdoc-json/type/fn_lifetime.rs
index d7216ec76..d7216ec76 100644
--- a/src/test/rustdoc-json/type/fn_lifetime.rs
+++ b/tests/rustdoc-json/type/fn_lifetime.rs
diff --git a/src/test/rustdoc-json/type/generic_default.rs b/tests/rustdoc-json/type/generic_default.rs
index 9c6d4540b..9c6d4540b 100644
--- a/src/test/rustdoc-json/type/generic_default.rs
+++ b/tests/rustdoc-json/type/generic_default.rs
diff --git a/src/test/rustdoc-json/type/hrtb.rs b/tests/rustdoc-json/type/hrtb.rs
index 2c4ee00d4..2c4ee00d4 100644
--- a/src/test/rustdoc-json/type/hrtb.rs
+++ b/tests/rustdoc-json/type/hrtb.rs
diff --git a/src/test/rustdoc-json/unions/impl.rs b/tests/rustdoc-json/unions/impl.rs
index 4454a69ec..4454a69ec 100644
--- a/src/test/rustdoc-json/unions/impl.rs
+++ b/tests/rustdoc-json/unions/impl.rs
diff --git a/src/test/rustdoc-json/unions/union.rs b/tests/rustdoc-json/unions/union.rs
index c9df2b81c..c9df2b81c 100644
--- a/src/test/rustdoc-json/unions/union.rs
+++ b/tests/rustdoc-json/unions/union.rs
diff --git a/src/test/rustdoc-ui/ambiguous-inherent-assoc-ty.rs b/tests/rustdoc-ui/ambiguous-inherent-assoc-ty.rs
index 94ea0e93b..94ea0e93b 100644
--- a/src/test/rustdoc-ui/ambiguous-inherent-assoc-ty.rs
+++ b/tests/rustdoc-ui/ambiguous-inherent-assoc-ty.rs
diff --git a/src/test/rustdoc-ui/assoc-item-not-in-scope.rs b/tests/rustdoc-ui/assoc-item-not-in-scope.rs
index 0976515f4..0976515f4 100644
--- a/src/test/rustdoc-ui/assoc-item-not-in-scope.rs
+++ b/tests/rustdoc-ui/assoc-item-not-in-scope.rs
diff --git a/src/test/rustdoc-ui/assoc-item-not-in-scope.stderr b/tests/rustdoc-ui/assoc-item-not-in-scope.stderr
index 04594ad41..04594ad41 100644
--- a/src/test/rustdoc-ui/assoc-item-not-in-scope.stderr
+++ b/tests/rustdoc-ui/assoc-item-not-in-scope.stderr
diff --git a/src/test/rustdoc-ui/auxiliary/empty-fn.rs b/tests/rustdoc-ui/auxiliary/empty-fn.rs
index 877810f15..877810f15 100644
--- a/src/test/rustdoc-ui/auxiliary/empty-fn.rs
+++ b/tests/rustdoc-ui/auxiliary/empty-fn.rs
diff --git a/src/test/rustdoc-ui/auxiliary/extern_macros.rs b/tests/rustdoc-ui/auxiliary/extern_macros.rs
index ee1fec4c5..ee1fec4c5 100644
--- a/src/test/rustdoc-ui/auxiliary/extern_macros.rs
+++ b/tests/rustdoc-ui/auxiliary/extern_macros.rs
diff --git a/src/test/rustdoc-ui/auxiliary/issue-61592.rs b/tests/rustdoc-ui/auxiliary/issue-61592.rs
index 57a365b3f..57a365b3f 100644
--- a/src/test/rustdoc-ui/auxiliary/issue-61592.rs
+++ b/tests/rustdoc-ui/auxiliary/issue-61592.rs
diff --git a/src/test/rustdoc-ui/auxiliary/module_macro_doc.rs b/tests/rustdoc-ui/auxiliary/module_macro_doc.rs
index 9d6b52b95..9d6b52b95 100644
--- a/src/test/rustdoc-ui/auxiliary/module_macro_doc.rs
+++ b/tests/rustdoc-ui/auxiliary/module_macro_doc.rs
diff --git a/src/test/rustdoc-ui/auxiliary/overflow.rs b/tests/rustdoc-ui/auxiliary/overflow.rs
index ff65936be..ff65936be 100644
--- a/src/test/rustdoc-ui/auxiliary/overflow.rs
+++ b/tests/rustdoc-ui/auxiliary/overflow.rs
diff --git a/src/test/rustdoc-ui/auxiliary/panic-item.rs b/tests/rustdoc-ui/auxiliary/panic-item.rs
index 17b26850d..17b26850d 100644
--- a/src/test/rustdoc-ui/auxiliary/panic-item.rs
+++ b/tests/rustdoc-ui/auxiliary/panic-item.rs
diff --git a/src/test/rustdoc-ui/bare-urls.fixed b/tests/rustdoc-ui/bare-urls.fixed
index 23aa5c44c..23aa5c44c 100644
--- a/src/test/rustdoc-ui/bare-urls.fixed
+++ b/tests/rustdoc-ui/bare-urls.fixed
diff --git a/src/test/rustdoc-ui/bare-urls.rs b/tests/rustdoc-ui/bare-urls.rs
index 592f57343..592f57343 100644
--- a/src/test/rustdoc-ui/bare-urls.rs
+++ b/tests/rustdoc-ui/bare-urls.rs
diff --git a/src/test/rustdoc-ui/bare-urls.stderr b/tests/rustdoc-ui/bare-urls.stderr
index ccf52cd0b..ccf52cd0b 100644
--- a/src/test/rustdoc-ui/bare-urls.stderr
+++ b/tests/rustdoc-ui/bare-urls.stderr
diff --git a/src/test/rustdoc-ui/block-doc-comment.rs b/tests/rustdoc-ui/block-doc-comment.rs
index ce529916e..ce529916e 100644
--- a/src/test/rustdoc-ui/block-doc-comment.rs
+++ b/tests/rustdoc-ui/block-doc-comment.rs
diff --git a/src/test/rustdoc-ui/block-doc-comment.stdout b/tests/rustdoc-ui/block-doc-comment.stdout
index 7326c0a25..7326c0a25 100644
--- a/src/test/rustdoc-ui/block-doc-comment.stdout
+++ b/tests/rustdoc-ui/block-doc-comment.stdout
diff --git a/src/test/rustdoc-ui/bounded-hr-lifetime.rs b/tests/rustdoc-ui/bounded-hr-lifetime.rs
index b2e000b97..b2e000b97 100644
--- a/src/test/rustdoc-ui/bounded-hr-lifetime.rs
+++ b/tests/rustdoc-ui/bounded-hr-lifetime.rs
diff --git a/src/test/rustdoc-ui/bounded-hr-lifetime.stderr b/tests/rustdoc-ui/bounded-hr-lifetime.stderr
index d8fcd6cb4..d8fcd6cb4 100644
--- a/src/test/rustdoc-ui/bounded-hr-lifetime.stderr
+++ b/tests/rustdoc-ui/bounded-hr-lifetime.stderr
diff --git a/src/test/rustdoc-ui/c-help.rs b/tests/rustdoc-ui/c-help.rs
index e166edf8b..e166edf8b 100644
--- a/src/test/rustdoc-ui/c-help.rs
+++ b/tests/rustdoc-ui/c-help.rs
diff --git a/src/test/rustdoc-ui/c-help.stdout b/tests/rustdoc-ui/c-help.stdout
index 75b2e2a2a..75b2e2a2a 100644
--- a/src/test/rustdoc-ui/c-help.stdout
+++ b/tests/rustdoc-ui/c-help.stdout
diff --git a/src/test/rustdoc-ui/cfg-test.rs b/tests/rustdoc-ui/cfg-test.rs
index d4ca92585..d40b92837 100644
--- a/src/test/rustdoc-ui/cfg-test.rs
+++ b/tests/rustdoc-ui/cfg-test.rs
@@ -1,6 +1,6 @@
 // check-pass
 // compile-flags:--test --test-args --test-threads=1
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 // Crates like core have doctests gated on `cfg(not(test))` so we need to make
diff --git a/src/test/rustdoc-ui/cfg-test.stdout b/tests/rustdoc-ui/cfg-test.stdout
index 2960ff8d3..2960ff8d3 100644
--- a/src/test/rustdoc-ui/cfg-test.stdout
+++ b/tests/rustdoc-ui/cfg-test.stdout
diff --git a/src/test/rustdoc-ui/check-attr-test.rs b/tests/rustdoc-ui/check-attr-test.rs
index e95547014..e95547014 100644
--- a/src/test/rustdoc-ui/check-attr-test.rs
+++ b/tests/rustdoc-ui/check-attr-test.rs
diff --git a/src/test/rustdoc-ui/check-attr-test.stderr b/tests/rustdoc-ui/check-attr-test.stderr
index 01beba1ff..01beba1ff 100644
--- a/src/test/rustdoc-ui/check-attr-test.stderr
+++ b/tests/rustdoc-ui/check-attr-test.stderr
diff --git a/src/test/rustdoc-ui/check-attr.rs b/tests/rustdoc-ui/check-attr.rs
index 0b3f7bedd..0b3f7bedd 100644
--- a/src/test/rustdoc-ui/check-attr.rs
+++ b/tests/rustdoc-ui/check-attr.rs
diff --git a/src/test/rustdoc-ui/check-attr.stderr b/tests/rustdoc-ui/check-attr.stderr
index f66e63ab7..f66e63ab7 100644
--- a/src/test/rustdoc-ui/check-attr.stderr
+++ b/tests/rustdoc-ui/check-attr.stderr
diff --git a/tests/rustdoc-ui/check-cfg-test.rs b/tests/rustdoc-ui/check-cfg-test.rs
new file mode 100644
index 000000000..920432276
--- /dev/null
+++ b/tests/rustdoc-ui/check-cfg-test.rs
@@ -0,0 +1,12 @@
+// check-pass
+// compile-flags: --test --nocapture --check-cfg=values(feature,"test") -Z unstable-options
+// normalize-stderr-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
+
+/// The doctest will produce a warning because feature invalid is unexpected
+/// ```
+/// #[cfg(feature = "invalid")]
+/// assert!(false);
+/// ```
+pub struct Foo;
diff --git a/src/test/rustdoc-ui/check-cfg-test.stderr b/tests/rustdoc-ui/check-cfg-test.stderr
index 9770be2f1..9770be2f1 100644
--- a/src/test/rustdoc-ui/check-cfg-test.stderr
+++ b/tests/rustdoc-ui/check-cfg-test.stderr
diff --git a/src/test/rustdoc-ui/check-cfg-test.stdout b/tests/rustdoc-ui/check-cfg-test.stdout
index b7db49bcf..b7db49bcf 100644
--- a/src/test/rustdoc-ui/check-cfg-test.stdout
+++ b/tests/rustdoc-ui/check-cfg-test.stdout
diff --git a/src/test/rustdoc-ui/check-cfg-unstable.rs b/tests/rustdoc-ui/check-cfg-unstable.rs
index 5c500ce6c..5c500ce6c 100644
--- a/src/test/rustdoc-ui/check-cfg-unstable.rs
+++ b/tests/rustdoc-ui/check-cfg-unstable.rs
diff --git a/src/test/rustdoc-ui/check-cfg-unstable.stderr b/tests/rustdoc-ui/check-cfg-unstable.stderr
index 9b27c2bc0..9b27c2bc0 100644
--- a/src/test/rustdoc-ui/check-cfg-unstable.stderr
+++ b/tests/rustdoc-ui/check-cfg-unstable.stderr
diff --git a/src/test/rustdoc-ui/check-cfg.rs b/tests/rustdoc-ui/check-cfg.rs
index fa8789ad3..fa8789ad3 100644
--- a/src/test/rustdoc-ui/check-cfg.rs
+++ b/tests/rustdoc-ui/check-cfg.rs
diff --git a/src/test/rustdoc-ui/check-cfg.stderr b/tests/rustdoc-ui/check-cfg.stderr
index 1db8e1d91..1db8e1d91 100644
--- a/src/test/rustdoc-ui/check-cfg.stderr
+++ b/tests/rustdoc-ui/check-cfg.stderr
diff --git a/src/test/rustdoc-ui/check-doc-alias-attr-location.rs b/tests/rustdoc-ui/check-doc-alias-attr-location.rs
index 6de1960e2..6de1960e2 100644
--- a/src/test/rustdoc-ui/check-doc-alias-attr-location.rs
+++ b/tests/rustdoc-ui/check-doc-alias-attr-location.rs
diff --git a/src/test/rustdoc-ui/check-doc-alias-attr-location.stderr b/tests/rustdoc-ui/check-doc-alias-attr-location.stderr
index 85c951623..85c951623 100644
--- a/src/test/rustdoc-ui/check-doc-alias-attr-location.stderr
+++ b/tests/rustdoc-ui/check-doc-alias-attr-location.stderr
diff --git a/src/test/rustdoc-ui/check-doc-alias-attr.rs b/tests/rustdoc-ui/check-doc-alias-attr.rs
index 719b98604..719b98604 100644
--- a/src/test/rustdoc-ui/check-doc-alias-attr.rs
+++ b/tests/rustdoc-ui/check-doc-alias-attr.rs
diff --git a/src/test/rustdoc-ui/check-doc-alias-attr.stderr b/tests/rustdoc-ui/check-doc-alias-attr.stderr
index 250568be3..250568be3 100644
--- a/src/test/rustdoc-ui/check-doc-alias-attr.stderr
+++ b/tests/rustdoc-ui/check-doc-alias-attr.stderr
diff --git a/src/test/rustdoc-ui/check-fail.rs b/tests/rustdoc-ui/check-fail.rs
index c5e1759ee..c5e1759ee 100644
--- a/src/test/rustdoc-ui/check-fail.rs
+++ b/tests/rustdoc-ui/check-fail.rs
diff --git a/src/test/rustdoc-ui/check-fail.stderr b/tests/rustdoc-ui/check-fail.stderr
index d8aeccbfc..d8aeccbfc 100644
--- a/src/test/rustdoc-ui/check-fail.stderr
+++ b/tests/rustdoc-ui/check-fail.stderr
diff --git a/src/test/rustdoc-ui/check.rs b/tests/rustdoc-ui/check.rs
index f70b03361..f70b03361 100644
--- a/src/test/rustdoc-ui/check.rs
+++ b/tests/rustdoc-ui/check.rs
diff --git a/src/test/rustdoc-ui/check.stderr b/tests/rustdoc-ui/check.stderr
index d379f33f2..d379f33f2 100644
--- a/src/test/rustdoc-ui/check.stderr
+++ b/tests/rustdoc-ui/check.stderr
diff --git a/src/test/rustdoc-ui/commandline-argfile-badutf8.args b/tests/rustdoc-ui/commandline-argfile-badutf8.args
index c070b0c24..c070b0c24 100644
--- a/src/test/rustdoc-ui/commandline-argfile-badutf8.args
+++ b/tests/rustdoc-ui/commandline-argfile-badutf8.args
diff --git a/src/test/rustdoc-ui/commandline-argfile-badutf8.rs b/tests/rustdoc-ui/commandline-argfile-badutf8.rs
index e2984e3ca..e2984e3ca 100644
--- a/src/test/rustdoc-ui/commandline-argfile-badutf8.rs
+++ b/tests/rustdoc-ui/commandline-argfile-badutf8.rs
diff --git a/src/test/rustdoc-ui/commandline-argfile-badutf8.stderr b/tests/rustdoc-ui/commandline-argfile-badutf8.stderr
index 9af6fc0a5..9af6fc0a5 100644
--- a/src/test/rustdoc-ui/commandline-argfile-badutf8.stderr
+++ b/tests/rustdoc-ui/commandline-argfile-badutf8.stderr
diff --git a/src/test/rustdoc-ui/commandline-argfile-missing.rs b/tests/rustdoc-ui/commandline-argfile-missing.rs
index 5a6465bd0..5a6465bd0 100644
--- a/src/test/rustdoc-ui/commandline-argfile-missing.rs
+++ b/tests/rustdoc-ui/commandline-argfile-missing.rs
diff --git a/src/test/rustdoc-ui/commandline-argfile-missing.stderr b/tests/rustdoc-ui/commandline-argfile-missing.stderr
index 179ad8310..179ad8310 100644
--- a/src/test/rustdoc-ui/commandline-argfile-missing.stderr
+++ b/tests/rustdoc-ui/commandline-argfile-missing.stderr
diff --git a/src/test/rustdoc-ui/commandline-argfile.args b/tests/rustdoc-ui/commandline-argfile.args
index 972938bf6..972938bf6 100644
--- a/src/test/rustdoc-ui/commandline-argfile.args
+++ b/tests/rustdoc-ui/commandline-argfile.args
diff --git a/src/test/rustdoc-ui/commandline-argfile.rs b/tests/rustdoc-ui/commandline-argfile.rs
index cc8c8722c..cc8c8722c 100644
--- a/src/test/rustdoc-ui/commandline-argfile.rs
+++ b/tests/rustdoc-ui/commandline-argfile.rs
diff --git a/src/test/rustdoc-ui/const-evalutation-ice.rs b/tests/rustdoc-ui/const-evalutation-ice.rs
index 0dd3bcaa2..0dd3bcaa2 100644
--- a/src/test/rustdoc-ui/const-evalutation-ice.rs
+++ b/tests/rustdoc-ui/const-evalutation-ice.rs
diff --git a/src/test/rustdoc-ui/const-evalutation-ice.stderr b/tests/rustdoc-ui/const-evalutation-ice.stderr
index 5d9c16c07..5d9c16c07 100644
--- a/src/test/rustdoc-ui/const-evalutation-ice.stderr
+++ b/tests/rustdoc-ui/const-evalutation-ice.stderr
diff --git a/src/test/rustdoc-ui/coverage/allow_missing_docs.rs b/tests/rustdoc-ui/coverage/allow_missing_docs.rs
index c771c09da..c771c09da 100644
--- a/src/test/rustdoc-ui/coverage/allow_missing_docs.rs
+++ b/tests/rustdoc-ui/coverage/allow_missing_docs.rs
diff --git a/src/test/rustdoc-ui/coverage/allow_missing_docs.stderr b/tests/rustdoc-ui/coverage/allow_missing_docs.stderr
index 3d5b512d1..3d5b512d1 100644
--- a/src/test/rustdoc-ui/coverage/allow_missing_docs.stderr
+++ b/tests/rustdoc-ui/coverage/allow_missing_docs.stderr
diff --git a/src/test/rustdoc-ui/coverage/allow_missing_docs.stdout b/tests/rustdoc-ui/coverage/allow_missing_docs.stdout
index 17e8ee9e2..17e8ee9e2 100644
--- a/src/test/rustdoc-ui/coverage/allow_missing_docs.stdout
+++ b/tests/rustdoc-ui/coverage/allow_missing_docs.stdout
diff --git a/src/test/rustdoc-ui/coverage/basic.rs b/tests/rustdoc-ui/coverage/basic.rs
index 6c26b751c..6c26b751c 100644
--- a/src/test/rustdoc-ui/coverage/basic.rs
+++ b/tests/rustdoc-ui/coverage/basic.rs
diff --git a/src/test/rustdoc-ui/coverage/basic.stdout b/tests/rustdoc-ui/coverage/basic.stdout
index 3c602b3da..545662f0f 100644
--- a/src/test/rustdoc-ui/coverage/basic.stdout
+++ b/tests/rustdoc-ui/coverage/basic.stdout
@@ -1,7 +1,7 @@
 +-------------------------------------+------------+------------+------------+------------+
 | File                                | Documented | Percentage |   Examples | Percentage |
 +-------------------------------------+------------+------------+------------+------------+
-| ...est/rustdoc-ui/coverage/basic.rs |          7 |      50.0% |          0 |       0.0% |
+| ...sts/rustdoc-ui/coverage/basic.rs |          7 |      50.0% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
 | Total                               |          7 |      50.0% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
diff --git a/src/test/rustdoc-ui/coverage/doc-examples-json.rs b/tests/rustdoc-ui/coverage/doc-examples-json.rs
index 1da181379..1da181379 100644
--- a/src/test/rustdoc-ui/coverage/doc-examples-json.rs
+++ b/tests/rustdoc-ui/coverage/doc-examples-json.rs
diff --git a/src/test/rustdoc-ui/coverage/doc-examples-json.stdout b/tests/rustdoc-ui/coverage/doc-examples-json.stdout
index 92f585569..92f585569 100644
--- a/src/test/rustdoc-ui/coverage/doc-examples-json.stdout
+++ b/tests/rustdoc-ui/coverage/doc-examples-json.stdout
diff --git a/src/test/rustdoc-ui/coverage/doc-examples.rs b/tests/rustdoc-ui/coverage/doc-examples.rs
index cd718f8a3..cd718f8a3 100644
--- a/src/test/rustdoc-ui/coverage/doc-examples.rs
+++ b/tests/rustdoc-ui/coverage/doc-examples.rs
diff --git a/src/test/rustdoc-ui/coverage/doc-examples.stdout b/tests/rustdoc-ui/coverage/doc-examples.stdout
index 8188740f8..8188740f8 100644
--- a/src/test/rustdoc-ui/coverage/doc-examples.stdout
+++ b/tests/rustdoc-ui/coverage/doc-examples.stdout
diff --git a/src/test/rustdoc-ui/coverage/empty.rs b/tests/rustdoc-ui/coverage/empty.rs
index 55a87e9d9..55a87e9d9 100644
--- a/src/test/rustdoc-ui/coverage/empty.rs
+++ b/tests/rustdoc-ui/coverage/empty.rs
diff --git a/src/test/rustdoc-ui/coverage/empty.stdout b/tests/rustdoc-ui/coverage/empty.stdout
index 890a7d56e..d48682528 100644
--- a/src/test/rustdoc-ui/coverage/empty.stdout
+++ b/tests/rustdoc-ui/coverage/empty.stdout
@@ -1,7 +1,7 @@
 +-------------------------------------+------------+------------+------------+------------+
 | File                                | Documented | Percentage |   Examples | Percentage |
 +-------------------------------------+------------+------------+------------+------------+
-| ...est/rustdoc-ui/coverage/empty.rs |          0 |       0.0% |          0 |       0.0% |
+| ...sts/rustdoc-ui/coverage/empty.rs |          0 |       0.0% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
 | Total                               |          0 |       0.0% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
diff --git a/src/test/rustdoc-ui/coverage/enum-tuple-documented.rs b/tests/rustdoc-ui/coverage/enum-tuple-documented.rs
index e9c165b19..e9c165b19 100644
--- a/src/test/rustdoc-ui/coverage/enum-tuple-documented.rs
+++ b/tests/rustdoc-ui/coverage/enum-tuple-documented.rs
diff --git a/src/test/rustdoc-ui/coverage/enum-tuple-documented.stdout b/tests/rustdoc-ui/coverage/enum-tuple-documented.stdout
index 82c98f43f..82c98f43f 100644
--- a/src/test/rustdoc-ui/coverage/enum-tuple-documented.stdout
+++ b/tests/rustdoc-ui/coverage/enum-tuple-documented.stdout
diff --git a/src/test/rustdoc-ui/coverage/enum-tuple.rs b/tests/rustdoc-ui/coverage/enum-tuple.rs
index 5fb205450..5fb205450 100644
--- a/src/test/rustdoc-ui/coverage/enum-tuple.rs
+++ b/tests/rustdoc-ui/coverage/enum-tuple.rs
diff --git a/src/test/rustdoc-ui/coverage/enum-tuple.stdout b/tests/rustdoc-ui/coverage/enum-tuple.stdout
index a3377d59c..a3377d59c 100644
--- a/src/test/rustdoc-ui/coverage/enum-tuple.stdout
+++ b/tests/rustdoc-ui/coverage/enum-tuple.stdout
diff --git a/src/test/rustdoc-ui/coverage/enums.rs b/tests/rustdoc-ui/coverage/enums.rs
index a4ae36d68..a4ae36d68 100644
--- a/src/test/rustdoc-ui/coverage/enums.rs
+++ b/tests/rustdoc-ui/coverage/enums.rs
diff --git a/src/test/rustdoc-ui/coverage/enums.stdout b/tests/rustdoc-ui/coverage/enums.stdout
index 64c012c1f..bb224aac8 100644
--- a/src/test/rustdoc-ui/coverage/enums.stdout
+++ b/tests/rustdoc-ui/coverage/enums.stdout
@@ -1,7 +1,7 @@
 +-------------------------------------+------------+------------+------------+------------+
 | File                                | Documented | Percentage |   Examples | Percentage |
 +-------------------------------------+------------+------------+------------+------------+
-| ...est/rustdoc-ui/coverage/enums.rs |          6 |      75.0% |          0 |       0.0% |
+| ...sts/rustdoc-ui/coverage/enums.rs |          6 |      75.0% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
 | Total                               |          6 |      75.0% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
diff --git a/src/test/rustdoc-ui/coverage/exotic.rs b/tests/rustdoc-ui/coverage/exotic.rs
index 72b70d698..72b70d698 100644
--- a/src/test/rustdoc-ui/coverage/exotic.rs
+++ b/tests/rustdoc-ui/coverage/exotic.rs
diff --git a/src/test/rustdoc-ui/coverage/exotic.stdout b/tests/rustdoc-ui/coverage/exotic.stdout
index 27798b813..bd894898c 100644
--- a/src/test/rustdoc-ui/coverage/exotic.stdout
+++ b/tests/rustdoc-ui/coverage/exotic.stdout
@@ -1,7 +1,7 @@
 +-------------------------------------+------------+------------+------------+------------+
 | File                                | Documented | Percentage |   Examples | Percentage |
 +-------------------------------------+------------+------------+------------+------------+
-| ...st/rustdoc-ui/coverage/exotic.rs |          3 |     100.0% |          0 |       0.0% |
+| ...ts/rustdoc-ui/coverage/exotic.rs |          3 |     100.0% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
 | Total                               |          3 |     100.0% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
diff --git a/src/test/rustdoc-ui/coverage/html.rs b/tests/rustdoc-ui/coverage/html.rs
index 181cb4c50..181cb4c50 100644
--- a/src/test/rustdoc-ui/coverage/html.rs
+++ b/tests/rustdoc-ui/coverage/html.rs
diff --git a/src/test/rustdoc-ui/coverage/html.stderr b/tests/rustdoc-ui/coverage/html.stderr
index adca375d4..adca375d4 100644
--- a/src/test/rustdoc-ui/coverage/html.stderr
+++ b/tests/rustdoc-ui/coverage/html.stderr
diff --git a/src/test/rustdoc-ui/coverage/json.rs b/tests/rustdoc-ui/coverage/json.rs
index a591cd5db..a591cd5db 100644
--- a/src/test/rustdoc-ui/coverage/json.rs
+++ b/tests/rustdoc-ui/coverage/json.rs
diff --git a/src/test/rustdoc-ui/coverage/json.stdout b/tests/rustdoc-ui/coverage/json.stdout
index c2be73ce3..c2be73ce3 100644
--- a/src/test/rustdoc-ui/coverage/json.stdout
+++ b/tests/rustdoc-ui/coverage/json.stdout
diff --git a/src/test/rustdoc-ui/coverage/private.rs b/tests/rustdoc-ui/coverage/private.rs
index 2a0271727..2a0271727 100644
--- a/src/test/rustdoc-ui/coverage/private.rs
+++ b/tests/rustdoc-ui/coverage/private.rs
diff --git a/src/test/rustdoc-ui/coverage/private.stdout b/tests/rustdoc-ui/coverage/private.stdout
index 37a0f5187..b9981c7c5 100644
--- a/src/test/rustdoc-ui/coverage/private.stdout
+++ b/tests/rustdoc-ui/coverage/private.stdout
@@ -1,7 +1,7 @@
 +-------------------------------------+------------+------------+------------+------------+
 | File                                | Documented | Percentage |   Examples | Percentage |
 +-------------------------------------+------------+------------+------------+------------+
-| ...t/rustdoc-ui/coverage/private.rs |          4 |      57.1% |          0 |       0.0% |
+| ...s/rustdoc-ui/coverage/private.rs |          4 |      57.1% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
 | Total                               |          4 |      57.1% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
diff --git a/src/test/rustdoc-ui/coverage/statics-consts.rs b/tests/rustdoc-ui/coverage/statics-consts.rs
index 5a35260fa..5a35260fa 100644
--- a/src/test/rustdoc-ui/coverage/statics-consts.rs
+++ b/tests/rustdoc-ui/coverage/statics-consts.rs
diff --git a/src/test/rustdoc-ui/coverage/statics-consts.stdout b/tests/rustdoc-ui/coverage/statics-consts.stdout
index dbea3a3ea..dbea3a3ea 100644
--- a/src/test/rustdoc-ui/coverage/statics-consts.stdout
+++ b/tests/rustdoc-ui/coverage/statics-consts.stdout
diff --git a/src/test/rustdoc-ui/coverage/traits.rs b/tests/rustdoc-ui/coverage/traits.rs
index daa08ec25..daa08ec25 100644
--- a/src/test/rustdoc-ui/coverage/traits.rs
+++ b/tests/rustdoc-ui/coverage/traits.rs
diff --git a/src/test/rustdoc-ui/coverage/traits.stdout b/tests/rustdoc-ui/coverage/traits.stdout
index 5053d0209..0c7857cf2 100644
--- a/src/test/rustdoc-ui/coverage/traits.stdout
+++ b/tests/rustdoc-ui/coverage/traits.stdout
@@ -1,7 +1,7 @@
 +-------------------------------------+------------+------------+------------+------------+
 | File                                | Documented | Percentage |   Examples | Percentage |
 +-------------------------------------+------------+------------+------------+------------+
-| ...st/rustdoc-ui/coverage/traits.rs |          8 |      88.9% |          0 |       0.0% |
+| ...ts/rustdoc-ui/coverage/traits.rs |          8 |      88.9% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
 | Total                               |          8 |      88.9% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
diff --git a/src/test/rustdoc-ui/deny-intra-link-resolution-failure.rs b/tests/rustdoc-ui/deny-intra-link-resolution-failure.rs
index 09da124b1..09da124b1 100644
--- a/src/test/rustdoc-ui/deny-intra-link-resolution-failure.rs
+++ b/tests/rustdoc-ui/deny-intra-link-resolution-failure.rs
diff --git a/src/test/rustdoc-ui/deny-intra-link-resolution-failure.stderr b/tests/rustdoc-ui/deny-intra-link-resolution-failure.stderr
index 3e08354a6..3e08354a6 100644
--- a/src/test/rustdoc-ui/deny-intra-link-resolution-failure.stderr
+++ b/tests/rustdoc-ui/deny-intra-link-resolution-failure.stderr
diff --git a/src/test/rustdoc-ui/deny-missing-docs-crate.rs b/tests/rustdoc-ui/deny-missing-docs-crate.rs
index b74eba3f6..b74eba3f6 100644
--- a/src/test/rustdoc-ui/deny-missing-docs-crate.rs
+++ b/tests/rustdoc-ui/deny-missing-docs-crate.rs
diff --git a/src/test/rustdoc-ui/deny-missing-docs-crate.stderr b/tests/rustdoc-ui/deny-missing-docs-crate.stderr
index 5025b0b0c..5025b0b0c 100644
--- a/src/test/rustdoc-ui/deny-missing-docs-crate.stderr
+++ b/tests/rustdoc-ui/deny-missing-docs-crate.stderr
diff --git a/src/test/rustdoc-ui/deny-missing-docs-macro.rs b/tests/rustdoc-ui/deny-missing-docs-macro.rs
index b1c125317..b1c125317 100644
--- a/src/test/rustdoc-ui/deny-missing-docs-macro.rs
+++ b/tests/rustdoc-ui/deny-missing-docs-macro.rs
diff --git a/src/test/rustdoc-ui/deny-missing-docs-macro.stderr b/tests/rustdoc-ui/deny-missing-docs-macro.stderr
index 0867b0818..0867b0818 100644
--- a/src/test/rustdoc-ui/deny-missing-docs-macro.stderr
+++ b/tests/rustdoc-ui/deny-missing-docs-macro.stderr
diff --git a/src/test/rustdoc-ui/deprecated-attrs.rs b/tests/rustdoc-ui/deprecated-attrs.rs
index 4f6a14fc2..4f6a14fc2 100644
--- a/src/test/rustdoc-ui/deprecated-attrs.rs
+++ b/tests/rustdoc-ui/deprecated-attrs.rs
diff --git a/src/test/rustdoc-ui/deprecated-attrs.stderr b/tests/rustdoc-ui/deprecated-attrs.stderr
index 45b20ce70..45b20ce70 100644
--- a/src/test/rustdoc-ui/deprecated-attrs.stderr
+++ b/tests/rustdoc-ui/deprecated-attrs.stderr
diff --git a/src/test/rustdoc-ui/deref-generic.rs b/tests/rustdoc-ui/deref-generic.rs
index bc64beb1b..bc64beb1b 100644
--- a/src/test/rustdoc-ui/deref-generic.rs
+++ b/tests/rustdoc-ui/deref-generic.rs
diff --git a/src/test/rustdoc-ui/diagnostic-width.rs b/tests/rustdoc-ui/diagnostic-width.rs
index 290d9db77..290d9db77 100644
--- a/src/test/rustdoc-ui/diagnostic-width.rs
+++ b/tests/rustdoc-ui/diagnostic-width.rs
diff --git a/src/test/rustdoc-ui/diagnostic-width.stderr b/tests/rustdoc-ui/diagnostic-width.stderr
index 1a00d10d3..1a00d10d3 100644
--- a/src/test/rustdoc-ui/diagnostic-width.stderr
+++ b/tests/rustdoc-ui/diagnostic-width.stderr
diff --git a/src/test/rustdoc-ui/display-output.rs b/tests/rustdoc-ui/display-output.rs
index ec27a9f6b..23bc54e3c 100644
--- a/src/test/rustdoc-ui/display-output.rs
+++ b/tests/rustdoc-ui/display-output.rs
@@ -3,7 +3,7 @@
 // check-pass
 // edition:2018
 // compile-flags:--test --test-args=--show-output
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 /// ```
diff --git a/src/test/rustdoc-ui/display-output.stdout b/tests/rustdoc-ui/display-output.stdout
index ad25d1ce5..ad25d1ce5 100644
--- a/src/test/rustdoc-ui/display-output.stdout
+++ b/tests/rustdoc-ui/display-output.stdout
diff --git a/src/test/rustdoc-ui/doc-alias-assoc-const.rs b/tests/rustdoc-ui/doc-alias-assoc-const.rs
index d95324734..d95324734 100644
--- a/src/test/rustdoc-ui/doc-alias-assoc-const.rs
+++ b/tests/rustdoc-ui/doc-alias-assoc-const.rs
diff --git a/src/test/rustdoc-ui/doc-alias-assoc-const.stderr b/tests/rustdoc-ui/doc-alias-assoc-const.stderr
index cbca40e13..cbca40e13 100644
--- a/src/test/rustdoc-ui/doc-alias-assoc-const.stderr
+++ b/tests/rustdoc-ui/doc-alias-assoc-const.stderr
diff --git a/src/test/rustdoc-ui/doc-alias-crate-level.rs b/tests/rustdoc-ui/doc-alias-crate-level.rs
index 70618ac01..70618ac01 100644
--- a/src/test/rustdoc-ui/doc-alias-crate-level.rs
+++ b/tests/rustdoc-ui/doc-alias-crate-level.rs
diff --git a/src/test/rustdoc-ui/doc-alias-crate-level.stderr b/tests/rustdoc-ui/doc-alias-crate-level.stderr
index fc8095e03..fc8095e03 100644
--- a/src/test/rustdoc-ui/doc-alias-crate-level.stderr
+++ b/tests/rustdoc-ui/doc-alias-crate-level.stderr
diff --git a/src/test/rustdoc-ui/doc-alias-same-name.rs b/tests/rustdoc-ui/doc-alias-same-name.rs
index da97c2676..da97c2676 100644
--- a/src/test/rustdoc-ui/doc-alias-same-name.rs
+++ b/tests/rustdoc-ui/doc-alias-same-name.rs
diff --git a/src/test/rustdoc-ui/doc-alias-same-name.stderr b/tests/rustdoc-ui/doc-alias-same-name.stderr
index 5ba09a2ea..5ba09a2ea 100644
--- a/src/test/rustdoc-ui/doc-alias-same-name.stderr
+++ b/tests/rustdoc-ui/doc-alias-same-name.stderr
diff --git a/src/test/rustdoc-ui/doc-attr.rs b/tests/rustdoc-ui/doc-attr.rs
index 980d1c0e2..980d1c0e2 100644
--- a/src/test/rustdoc-ui/doc-attr.rs
+++ b/tests/rustdoc-ui/doc-attr.rs
diff --git a/src/test/rustdoc-ui/doc-attr.stderr b/tests/rustdoc-ui/doc-attr.stderr
index 68df2771f..68df2771f 100644
--- a/src/test/rustdoc-ui/doc-attr.stderr
+++ b/tests/rustdoc-ui/doc-attr.stderr
diff --git a/src/test/rustdoc-ui/doc-cfg.rs b/tests/rustdoc-ui/doc-cfg.rs
index 354d76bc3..354d76bc3 100644
--- a/src/test/rustdoc-ui/doc-cfg.rs
+++ b/tests/rustdoc-ui/doc-cfg.rs
diff --git a/src/test/rustdoc-ui/doc-cfg.stderr b/tests/rustdoc-ui/doc-cfg.stderr
index b379f6feb..14b7b17e0 100644
--- a/src/test/rustdoc-ui/doc-cfg.stderr
+++ b/tests/rustdoc-ui/doc-cfg.stderr
@@ -2,7 +2,7 @@ error: `cfg` predicate is not specified
   --> $DIR/doc-cfg.rs:3:7
    |
 LL | #[doc(cfg(), cfg(foo, bar))]
-   |       ^^^^^
+   |       ^^^^^ help: expected syntax is: `cfg(/* predicate */)`
 
 error: multiple `cfg` predicates are specified
   --> $DIR/doc-cfg.rs:3:23
@@ -14,7 +14,7 @@ error: `cfg` predicate is not specified
   --> $DIR/doc-cfg.rs:7:7
    |
 LL | #[doc(cfg())]
-   |       ^^^^^
+   |       ^^^^^ help: expected syntax is: `cfg(/* predicate */)`
 
 error: multiple `cfg` predicates are specified
   --> $DIR/doc-cfg.rs:8:16
diff --git a/src/test/rustdoc-ui/doc-comment-multi-line-attr.rs b/tests/rustdoc-ui/doc-comment-multi-line-attr.rs
index 97259f782..db674e229 100644
--- a/src/test/rustdoc-ui/doc-comment-multi-line-attr.rs
+++ b/tests/rustdoc-ui/doc-comment-multi-line-attr.rs
@@ -1,6 +1,6 @@
 // Regression test for #97440: Multiline inner attribute triggers ICE during doctest
 // compile-flags:--test
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // check-pass
 
diff --git a/src/test/rustdoc-ui/doc-comment-multi-line-attr.stdout b/tests/rustdoc-ui/doc-comment-multi-line-attr.stdout
index e47edbd2a..e47edbd2a 100644
--- a/src/test/rustdoc-ui/doc-comment-multi-line-attr.stdout
+++ b/tests/rustdoc-ui/doc-comment-multi-line-attr.stdout
diff --git a/src/test/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs b/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs
index b2a8133c9..6ce3cb9fc 100644
--- a/src/test/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs
+++ b/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs
@@ -1,5 +1,5 @@
 // compile-flags:--test
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // check-pass
 
diff --git a/src/test/rustdoc-ui/doc-comment-multi-line-cfg-attr.stdout b/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.stdout
index bf3521e4f..bf3521e4f 100644
--- a/src/test/rustdoc-ui/doc-comment-multi-line-cfg-attr.stdout
+++ b/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.stdout
diff --git a/src/test/rustdoc-ui/doc-include-suggestion.rs b/tests/rustdoc-ui/doc-include-suggestion.rs
index 0c0100735..0c0100735 100644
--- a/src/test/rustdoc-ui/doc-include-suggestion.rs
+++ b/tests/rustdoc-ui/doc-include-suggestion.rs
diff --git a/src/test/rustdoc-ui/doc-include-suggestion.stderr b/tests/rustdoc-ui/doc-include-suggestion.stderr
index fcc93d053..fcc93d053 100644
--- a/src/test/rustdoc-ui/doc-include-suggestion.stderr
+++ b/tests/rustdoc-ui/doc-include-suggestion.stderr
diff --git a/src/test/rustdoc-ui/doc-spotlight.fixed b/tests/rustdoc-ui/doc-spotlight.fixed
index 4b58778ea..4b58778ea 100644
--- a/src/test/rustdoc-ui/doc-spotlight.fixed
+++ b/tests/rustdoc-ui/doc-spotlight.fixed
diff --git a/src/test/rustdoc-ui/doc-spotlight.rs b/tests/rustdoc-ui/doc-spotlight.rs
index 16e387245..16e387245 100644
--- a/src/test/rustdoc-ui/doc-spotlight.rs
+++ b/tests/rustdoc-ui/doc-spotlight.rs
diff --git a/src/test/rustdoc-ui/doc-spotlight.stderr b/tests/rustdoc-ui/doc-spotlight.stderr
index 58612327f..58612327f 100644
--- a/src/test/rustdoc-ui/doc-spotlight.stderr
+++ b/tests/rustdoc-ui/doc-spotlight.stderr
diff --git a/src/test/rustdoc-ui/doc-test-attr-pass.rs b/tests/rustdoc-ui/doc-test-attr-pass.rs
index 12608f244..12608f244 100644
--- a/src/test/rustdoc-ui/doc-test-attr-pass.rs
+++ b/tests/rustdoc-ui/doc-test-attr-pass.rs
diff --git a/src/test/rustdoc-ui/doc-test-attr.rs b/tests/rustdoc-ui/doc-test-attr.rs
index 46178ad86..46178ad86 100644
--- a/src/test/rustdoc-ui/doc-test-attr.rs
+++ b/tests/rustdoc-ui/doc-test-attr.rs
diff --git a/src/test/rustdoc-ui/doc-test-attr.stderr b/tests/rustdoc-ui/doc-test-attr.stderr
index 5e6014954..5e6014954 100644
--- a/src/test/rustdoc-ui/doc-test-attr.stderr
+++ b/tests/rustdoc-ui/doc-test-attr.stderr
diff --git a/src/test/rustdoc-ui/doc-test-doctest-feature.rs b/tests/rustdoc-ui/doc-test-doctest-feature.rs
index 0b79aaece..88cf44e64 100644
--- a/src/test/rustdoc-ui/doc-test-doctest-feature.rs
+++ b/tests/rustdoc-ui/doc-test-doctest-feature.rs
@@ -1,6 +1,6 @@
 // check-pass
 // compile-flags:--test
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 // Make sure `cfg(doctest)` is set when finding doctests but not inside
diff --git a/src/test/rustdoc-ui/doc-test-doctest-feature.stdout b/tests/rustdoc-ui/doc-test-doctest-feature.stdout
index d7de1f105..d7de1f105 100644
--- a/src/test/rustdoc-ui/doc-test-doctest-feature.stdout
+++ b/tests/rustdoc-ui/doc-test-doctest-feature.stdout
diff --git a/src/test/rustdoc-ui/doc-test-rustdoc-feature.rs b/tests/rustdoc-ui/doc-test-rustdoc-feature.rs
index bf334c67e..dc72a4857 100644
--- a/src/test/rustdoc-ui/doc-test-rustdoc-feature.rs
+++ b/tests/rustdoc-ui/doc-test-rustdoc-feature.rs
@@ -1,6 +1,6 @@
 // check-pass
 // compile-flags:--test
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 #![feature(doc_cfg)]
diff --git a/src/test/rustdoc-ui/doc-test-rustdoc-feature.stdout b/tests/rustdoc-ui/doc-test-rustdoc-feature.stdout
index 5b07fc4c8..5b07fc4c8 100644
--- a/src/test/rustdoc-ui/doc-test-rustdoc-feature.stdout
+++ b/tests/rustdoc-ui/doc-test-rustdoc-feature.stdout
diff --git a/src/test/rustdoc-ui/doc-without-codeblock.rs b/tests/rustdoc-ui/doc-without-codeblock.rs
index 86d7c83d3..86d7c83d3 100644
--- a/src/test/rustdoc-ui/doc-without-codeblock.rs
+++ b/tests/rustdoc-ui/doc-without-codeblock.rs
diff --git a/src/test/rustdoc-ui/doc-without-codeblock.stderr b/tests/rustdoc-ui/doc-without-codeblock.stderr
index ebf2a2d54..ebf2a2d54 100644
--- a/src/test/rustdoc-ui/doc-without-codeblock.stderr
+++ b/tests/rustdoc-ui/doc-without-codeblock.stderr
diff --git a/src/test/rustdoc-ui/doc_cfg_hide.rs b/tests/rustdoc-ui/doc_cfg_hide.rs
index 5d8791748..5d8791748 100644
--- a/src/test/rustdoc-ui/doc_cfg_hide.rs
+++ b/tests/rustdoc-ui/doc_cfg_hide.rs
diff --git a/src/test/rustdoc-ui/doc_cfg_hide.stderr b/tests/rustdoc-ui/doc_cfg_hide.stderr
index 03623368c..03623368c 100644
--- a/src/test/rustdoc-ui/doc_cfg_hide.stderr
+++ b/tests/rustdoc-ui/doc_cfg_hide.stderr
diff --git a/src/test/rustdoc-ui/doctest-edition.rs b/tests/rustdoc-ui/doctest-edition.rs
index b0787be97..b0787be97 100644
--- a/src/test/rustdoc-ui/doctest-edition.rs
+++ b/tests/rustdoc-ui/doctest-edition.rs
diff --git a/src/test/rustdoc-ui/doctest-edition.stderr b/tests/rustdoc-ui/doctest-edition.stderr
index 8a3329aa3..8a3329aa3 100644
--- a/src/test/rustdoc-ui/doctest-edition.stderr
+++ b/tests/rustdoc-ui/doctest-edition.stderr
diff --git a/src/test/rustdoc-ui/doctest-multiline-crate-attribute.rs b/tests/rustdoc-ui/doctest-multiline-crate-attribute.rs
index a30472ac5..260f5a7a6 100644
--- a/src/test/rustdoc-ui/doctest-multiline-crate-attribute.rs
+++ b/tests/rustdoc-ui/doctest-multiline-crate-attribute.rs
@@ -1,5 +1,5 @@
 // compile-flags:--test --test-args=--test-threads=1
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // check-pass
 
diff --git a/src/test/rustdoc-ui/doctest-multiline-crate-attribute.stdout b/tests/rustdoc-ui/doctest-multiline-crate-attribute.stdout
index 07a4f657d..07a4f657d 100644
--- a/src/test/rustdoc-ui/doctest-multiline-crate-attribute.stdout
+++ b/tests/rustdoc-ui/doctest-multiline-crate-attribute.stdout
diff --git a/src/test/rustdoc-ui/doctest-output.rs b/tests/rustdoc-ui/doctest-output.rs
index 2670fa572..303f76896 100644
--- a/src/test/rustdoc-ui/doctest-output.rs
+++ b/tests/rustdoc-ui/doctest-output.rs
@@ -1,7 +1,7 @@
 // edition:2018
 // aux-build:extern_macros.rs
 // compile-flags:--test --test-args=--test-threads=1
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // check-pass
 
diff --git a/src/test/rustdoc-ui/doctest-output.stdout b/tests/rustdoc-ui/doctest-output.stdout
index 35b0e366f..35b0e366f 100644
--- a/src/test/rustdoc-ui/doctest-output.stdout
+++ b/tests/rustdoc-ui/doctest-output.stdout
diff --git a/src/test/rustdoc-ui/error-in-impl-trait/README.md b/tests/rustdoc-ui/error-in-impl-trait/README.md
index 1176a4a8c..1176a4a8c 100644
--- a/src/test/rustdoc-ui/error-in-impl-trait/README.md
+++ b/tests/rustdoc-ui/error-in-impl-trait/README.md
diff --git a/src/test/rustdoc-ui/error-in-impl-trait/async.rs b/tests/rustdoc-ui/error-in-impl-trait/async.rs
index cda53bff0..cda53bff0 100644
--- a/src/test/rustdoc-ui/error-in-impl-trait/async.rs
+++ b/tests/rustdoc-ui/error-in-impl-trait/async.rs
diff --git a/src/test/rustdoc-ui/error-in-impl-trait/closure.rs b/tests/rustdoc-ui/error-in-impl-trait/closure.rs
index f1fd85bb2..f1fd85bb2 100644
--- a/src/test/rustdoc-ui/error-in-impl-trait/closure.rs
+++ b/tests/rustdoc-ui/error-in-impl-trait/closure.rs
diff --git a/src/test/rustdoc-ui/error-in-impl-trait/const-generics.rs b/tests/rustdoc-ui/error-in-impl-trait/const-generics.rs
index ed62f0208..ed62f0208 100644
--- a/src/test/rustdoc-ui/error-in-impl-trait/const-generics.rs
+++ b/tests/rustdoc-ui/error-in-impl-trait/const-generics.rs
diff --git a/src/test/rustdoc-ui/error-in-impl-trait/generic-argument.rs b/tests/rustdoc-ui/error-in-impl-trait/generic-argument.rs
index dcec379d4..dcec379d4 100644
--- a/src/test/rustdoc-ui/error-in-impl-trait/generic-argument.rs
+++ b/tests/rustdoc-ui/error-in-impl-trait/generic-argument.rs
diff --git a/src/test/rustdoc-ui/error-in-impl-trait/impl-keyword-closure.rs b/tests/rustdoc-ui/error-in-impl-trait/impl-keyword-closure.rs
index b935b0832..b935b0832 100644
--- a/src/test/rustdoc-ui/error-in-impl-trait/impl-keyword-closure.rs
+++ b/tests/rustdoc-ui/error-in-impl-trait/impl-keyword-closure.rs
diff --git a/src/test/rustdoc-ui/error-in-impl-trait/impl-keyword.rs b/tests/rustdoc-ui/error-in-impl-trait/impl-keyword.rs
index 701126f87..701126f87 100644
--- a/src/test/rustdoc-ui/error-in-impl-trait/impl-keyword.rs
+++ b/tests/rustdoc-ui/error-in-impl-trait/impl-keyword.rs
diff --git a/src/test/rustdoc-ui/error-in-impl-trait/realistic-async.rs b/tests/rustdoc-ui/error-in-impl-trait/realistic-async.rs
index 248575d35..248575d35 100644
--- a/src/test/rustdoc-ui/error-in-impl-trait/realistic-async.rs
+++ b/tests/rustdoc-ui/error-in-impl-trait/realistic-async.rs
diff --git a/src/test/rustdoc-ui/error-in-impl-trait/trait-alias-closure.rs b/tests/rustdoc-ui/error-in-impl-trait/trait-alias-closure.rs
index 31dd786cb..31dd786cb 100644
--- a/src/test/rustdoc-ui/error-in-impl-trait/trait-alias-closure.rs
+++ b/tests/rustdoc-ui/error-in-impl-trait/trait-alias-closure.rs
diff --git a/src/test/rustdoc-ui/error-in-impl-trait/trait-alias.rs b/tests/rustdoc-ui/error-in-impl-trait/trait-alias.rs
index c18a024af..c18a024af 100644
--- a/src/test/rustdoc-ui/error-in-impl-trait/trait-alias.rs
+++ b/tests/rustdoc-ui/error-in-impl-trait/trait-alias.rs
diff --git a/src/test/rustdoc-ui/expect-tool-lint-rfc-2383.rs b/tests/rustdoc-ui/expect-tool-lint-rfc-2383.rs
index 0901ac364..0901ac364 100644
--- a/src/test/rustdoc-ui/expect-tool-lint-rfc-2383.rs
+++ b/tests/rustdoc-ui/expect-tool-lint-rfc-2383.rs
diff --git a/src/test/rustdoc-ui/expect-tool-lint-rfc-2383.stderr b/tests/rustdoc-ui/expect-tool-lint-rfc-2383.stderr
index efc5f349f..efc5f349f 100644
--- a/src/test/rustdoc-ui/expect-tool-lint-rfc-2383.stderr
+++ b/tests/rustdoc-ui/expect-tool-lint-rfc-2383.stderr
diff --git a/src/test/rustdoc-ui/failed-doctest-compile-fail.rs b/tests/rustdoc-ui/failed-doctest-compile-fail.rs
index 6f2ff5d70..4dfca600f 100644
--- a/src/test/rustdoc-ui/failed-doctest-compile-fail.rs
+++ b/tests/rustdoc-ui/failed-doctest-compile-fail.rs
@@ -2,7 +2,7 @@
 // adapted to use that, and that normalize line can go away
 
 // compile-flags:--test
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 
diff --git a/src/test/rustdoc-ui/failed-doctest-compile-fail.stdout b/tests/rustdoc-ui/failed-doctest-compile-fail.stdout
index af3a90a74..af3a90a74 100644
--- a/src/test/rustdoc-ui/failed-doctest-compile-fail.stdout
+++ b/tests/rustdoc-ui/failed-doctest-compile-fail.stdout
diff --git a/src/test/rustdoc-ui/failed-doctest-extra-semicolon-on-item.rs b/tests/rustdoc-ui/failed-doctest-extra-semicolon-on-item.rs
index 16d737106..03a5b9d5d 100644
--- a/src/test/rustdoc-ui/failed-doctest-extra-semicolon-on-item.rs
+++ b/tests/rustdoc-ui/failed-doctest-extra-semicolon-on-item.rs
@@ -2,7 +2,7 @@
 // adapted to use that, and that normalize line can go away
 
 // compile-flags:--test
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 
diff --git a/src/test/rustdoc-ui/failed-doctest-extra-semicolon-on-item.stdout b/tests/rustdoc-ui/failed-doctest-extra-semicolon-on-item.stdout
index 61468b6c7..61468b6c7 100644
--- a/src/test/rustdoc-ui/failed-doctest-extra-semicolon-on-item.stdout
+++ b/tests/rustdoc-ui/failed-doctest-extra-semicolon-on-item.stdout
diff --git a/src/test/rustdoc-ui/failed-doctest-missing-codes.rs b/tests/rustdoc-ui/failed-doctest-missing-codes.rs
index 57b70b478..66a229a0c 100644
--- a/src/test/rustdoc-ui/failed-doctest-missing-codes.rs
+++ b/tests/rustdoc-ui/failed-doctest-missing-codes.rs
@@ -2,7 +2,7 @@
 // adapted to use that, and that normalize line can go away
 
 // compile-flags:--test
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 
diff --git a/src/test/rustdoc-ui/failed-doctest-missing-codes.stdout b/tests/rustdoc-ui/failed-doctest-missing-codes.stdout
index bacbb47b5..bacbb47b5 100644
--- a/src/test/rustdoc-ui/failed-doctest-missing-codes.stdout
+++ b/tests/rustdoc-ui/failed-doctest-missing-codes.stdout
diff --git a/src/test/rustdoc-ui/failed-doctest-output-windows.rs b/tests/rustdoc-ui/failed-doctest-output-windows.rs
index 4cd9993d8..456a9e68f 100644
--- a/src/test/rustdoc-ui/failed-doctest-output-windows.rs
+++ b/tests/rustdoc-ui/failed-doctest-output-windows.rs
@@ -7,7 +7,7 @@
 
 // compile-flags:--test --test-args --test-threads=1
 // rustc-env:RUST_BACKTRACE=0
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 
diff --git a/src/test/rustdoc-ui/failed-doctest-output-windows.stdout b/tests/rustdoc-ui/failed-doctest-output-windows.stdout
index 6c147054d..6c147054d 100644
--- a/src/test/rustdoc-ui/failed-doctest-output-windows.stdout
+++ b/tests/rustdoc-ui/failed-doctest-output-windows.stdout
diff --git a/src/test/rustdoc-ui/failed-doctest-output.rs b/tests/rustdoc-ui/failed-doctest-output.rs
index 42de954d0..77647f8ec 100644
--- a/src/test/rustdoc-ui/failed-doctest-output.rs
+++ b/tests/rustdoc-ui/failed-doctest-output.rs
@@ -7,7 +7,7 @@
 
 // compile-flags:--test --test-args --test-threads=1
 // rustc-env:RUST_BACKTRACE=0
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 
diff --git a/src/test/rustdoc-ui/failed-doctest-output.stdout b/tests/rustdoc-ui/failed-doctest-output.stdout
index 630198a56..630198a56 100644
--- a/src/test/rustdoc-ui/failed-doctest-output.stdout
+++ b/tests/rustdoc-ui/failed-doctest-output.stdout
diff --git a/src/test/rustdoc-ui/failed-doctest-should-panic.rs b/tests/rustdoc-ui/failed-doctest-should-panic.rs
index 2b8bb3168..c134f8006 100644
--- a/src/test/rustdoc-ui/failed-doctest-should-panic.rs
+++ b/tests/rustdoc-ui/failed-doctest-should-panic.rs
@@ -2,7 +2,7 @@
 // adapted to use that, and that normalize line can go away
 
 // compile-flags:--test
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 
diff --git a/src/test/rustdoc-ui/failed-doctest-should-panic.stdout b/tests/rustdoc-ui/failed-doctest-should-panic.stdout
index 57a20092a..57a20092a 100644
--- a/src/test/rustdoc-ui/failed-doctest-should-panic.stdout
+++ b/tests/rustdoc-ui/failed-doctest-should-panic.stdout
diff --git a/src/test/rustdoc-ui/feature-gate-doc_cfg_hide.rs b/tests/rustdoc-ui/feature-gate-doc_cfg_hide.rs
index 17812018b..17812018b 100644
--- a/src/test/rustdoc-ui/feature-gate-doc_cfg_hide.rs
+++ b/tests/rustdoc-ui/feature-gate-doc_cfg_hide.rs
diff --git a/src/test/rustdoc-ui/feature-gate-doc_cfg_hide.stderr b/tests/rustdoc-ui/feature-gate-doc_cfg_hide.stderr
index ba42c7bbb..ba42c7bbb 100644
--- a/src/test/rustdoc-ui/feature-gate-doc_cfg_hide.stderr
+++ b/tests/rustdoc-ui/feature-gate-doc_cfg_hide.stderr
diff --git a/src/test/rustdoc-ui/feature-gate-rustdoc_missing_doc_code_examples.rs b/tests/rustdoc-ui/feature-gate-rustdoc_missing_doc_code_examples.rs
index daba69868..daba69868 100644
--- a/src/test/rustdoc-ui/feature-gate-rustdoc_missing_doc_code_examples.rs
+++ b/tests/rustdoc-ui/feature-gate-rustdoc_missing_doc_code_examples.rs
diff --git a/src/test/rustdoc-ui/feature-gate-rustdoc_missing_doc_code_examples.stderr b/tests/rustdoc-ui/feature-gate-rustdoc_missing_doc_code_examples.stderr
index cbe9a3d14..cbe9a3d14 100644
--- a/src/test/rustdoc-ui/feature-gate-rustdoc_missing_doc_code_examples.stderr
+++ b/tests/rustdoc-ui/feature-gate-rustdoc_missing_doc_code_examples.stderr
diff --git a/src/test/rustdoc-ui/generate-link-to-definition-opt-unstable.rs b/tests/rustdoc-ui/generate-link-to-definition-opt-unstable.rs
index 87620d74e..87620d74e 100644
--- a/src/test/rustdoc-ui/generate-link-to-definition-opt-unstable.rs
+++ b/tests/rustdoc-ui/generate-link-to-definition-opt-unstable.rs
diff --git a/src/test/rustdoc-ui/generate-link-to-definition-opt-unstable.stderr b/tests/rustdoc-ui/generate-link-to-definition-opt-unstable.stderr
index a8ddf91bc..a8ddf91bc 100644
--- a/src/test/rustdoc-ui/generate-link-to-definition-opt-unstable.stderr
+++ b/tests/rustdoc-ui/generate-link-to-definition-opt-unstable.stderr
diff --git a/src/test/rustdoc-ui/generate-link-to-definition-opt.rs b/tests/rustdoc-ui/generate-link-to-definition-opt.rs
index 8f4f561b4..8f4f561b4 100644
--- a/src/test/rustdoc-ui/generate-link-to-definition-opt.rs
+++ b/tests/rustdoc-ui/generate-link-to-definition-opt.rs
diff --git a/src/test/rustdoc-ui/generate-link-to-definition-opt.stderr b/tests/rustdoc-ui/generate-link-to-definition-opt.stderr
index 4c8c607e7..4c8c607e7 100644
--- a/src/test/rustdoc-ui/generate-link-to-definition-opt.stderr
+++ b/tests/rustdoc-ui/generate-link-to-definition-opt.stderr
diff --git a/src/test/rustdoc-ui/generate-link-to-definition-opt2.rs b/tests/rustdoc-ui/generate-link-to-definition-opt2.rs
index da5142087..da5142087 100644
--- a/src/test/rustdoc-ui/generate-link-to-definition-opt2.rs
+++ b/tests/rustdoc-ui/generate-link-to-definition-opt2.rs
diff --git a/src/test/rustdoc-ui/generate-link-to-definition-opt2.stderr b/tests/rustdoc-ui/generate-link-to-definition-opt2.stderr
index 4c8c607e7..4c8c607e7 100644
--- a/src/test/rustdoc-ui/generate-link-to-definition-opt2.stderr
+++ b/tests/rustdoc-ui/generate-link-to-definition-opt2.stderr
diff --git a/src/test/rustdoc-ui/ignore-block-help.rs b/tests/rustdoc-ui/ignore-block-help.rs
index 86f6a2868..86f6a2868 100644
--- a/src/test/rustdoc-ui/ignore-block-help.rs
+++ b/tests/rustdoc-ui/ignore-block-help.rs
diff --git a/src/test/rustdoc-ui/ignore-block-help.stderr b/tests/rustdoc-ui/ignore-block-help.stderr
index a30ea51dd..a30ea51dd 100644
--- a/src/test/rustdoc-ui/ignore-block-help.stderr
+++ b/tests/rustdoc-ui/ignore-block-help.stderr
diff --git a/src/test/rustdoc-ui/impl-fn-nesting.rs b/tests/rustdoc-ui/impl-fn-nesting.rs
index a927f6bd7..a927f6bd7 100644
--- a/src/test/rustdoc-ui/impl-fn-nesting.rs
+++ b/tests/rustdoc-ui/impl-fn-nesting.rs
diff --git a/src/test/rustdoc-ui/impl-fn-nesting.stderr b/tests/rustdoc-ui/impl-fn-nesting.stderr
index 608749af8..608749af8 100644
--- a/src/test/rustdoc-ui/impl-fn-nesting.stderr
+++ b/tests/rustdoc-ui/impl-fn-nesting.stderr
diff --git a/src/test/rustdoc-ui/infinite-recursive-type-impl-trait-return.rs b/tests/rustdoc-ui/infinite-recursive-type-impl-trait-return.rs
index 4b1e04234..4b1e04234 100644
--- a/src/test/rustdoc-ui/infinite-recursive-type-impl-trait-return.rs
+++ b/tests/rustdoc-ui/infinite-recursive-type-impl-trait-return.rs
diff --git a/src/test/rustdoc-ui/infinite-recursive-type-impl-trait.rs b/tests/rustdoc-ui/infinite-recursive-type-impl-trait.rs
index ac79582fb..ac79582fb 100644
--- a/src/test/rustdoc-ui/infinite-recursive-type-impl-trait.rs
+++ b/tests/rustdoc-ui/infinite-recursive-type-impl-trait.rs
diff --git a/src/test/rustdoc-ui/infinite-recursive-type.rs b/tests/rustdoc-ui/infinite-recursive-type.rs
index 32793fc4f..32793fc4f 100644
--- a/src/test/rustdoc-ui/infinite-recursive-type.rs
+++ b/tests/rustdoc-ui/infinite-recursive-type.rs
diff --git a/src/test/rustdoc-ui/infinite-recursive-type.stderr b/tests/rustdoc-ui/infinite-recursive-type.stderr
index 9e2c3ff16..9e2c3ff16 100644
--- a/src/test/rustdoc-ui/infinite-recursive-type.stderr
+++ b/tests/rustdoc-ui/infinite-recursive-type.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/alias-ice.rs b/tests/rustdoc-ui/intra-doc/alias-ice.rs
index 51922caeb..51922caeb 100644
--- a/src/test/rustdoc-ui/intra-doc/alias-ice.rs
+++ b/tests/rustdoc-ui/intra-doc/alias-ice.rs
diff --git a/src/test/rustdoc-ui/intra-doc/alias-ice.stderr b/tests/rustdoc-ui/intra-doc/alias-ice.stderr
index 5e7ffeeb8..5e7ffeeb8 100644
--- a/src/test/rustdoc-ui/intra-doc/alias-ice.stderr
+++ b/tests/rustdoc-ui/intra-doc/alias-ice.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/ambiguity.rs b/tests/rustdoc-ui/intra-doc/ambiguity.rs
index 1f3dc722e..1f3dc722e 100644
--- a/src/test/rustdoc-ui/intra-doc/ambiguity.rs
+++ b/tests/rustdoc-ui/intra-doc/ambiguity.rs
diff --git a/src/test/rustdoc-ui/intra-doc/ambiguity.stderr b/tests/rustdoc-ui/intra-doc/ambiguity.stderr
index 7974796e4..7974796e4 100644
--- a/src/test/rustdoc-ui/intra-doc/ambiguity.stderr
+++ b/tests/rustdoc-ui/intra-doc/ambiguity.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/anchors.rs b/tests/rustdoc-ui/intra-doc/anchors.rs
index 34e11c7c7..34e11c7c7 100644
--- a/src/test/rustdoc-ui/intra-doc/anchors.rs
+++ b/tests/rustdoc-ui/intra-doc/anchors.rs
diff --git a/src/test/rustdoc-ui/intra-doc/anchors.stderr b/tests/rustdoc-ui/intra-doc/anchors.stderr
index 0d226b277..0d226b277 100644
--- a/src/test/rustdoc-ui/intra-doc/anchors.stderr
+++ b/tests/rustdoc-ui/intra-doc/anchors.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/assoc-field.rs b/tests/rustdoc-ui/intra-doc/assoc-field.rs
index e18404e44..e18404e44 100644
--- a/src/test/rustdoc-ui/intra-doc/assoc-field.rs
+++ b/tests/rustdoc-ui/intra-doc/assoc-field.rs
diff --git a/src/test/rustdoc-ui/intra-doc/assoc-mod-inner-outer.rs b/tests/rustdoc-ui/intra-doc/assoc-mod-inner-outer.rs
index b4ce3443c..b4ce3443c 100644
--- a/src/test/rustdoc-ui/intra-doc/assoc-mod-inner-outer.rs
+++ b/tests/rustdoc-ui/intra-doc/assoc-mod-inner-outer.rs
diff --git a/src/test/rustdoc-ui/intra-doc/auxiliary/assoc-field-dep.rs b/tests/rustdoc-ui/intra-doc/auxiliary/assoc-field-dep.rs
index cfb24fc2c..cfb24fc2c 100644
--- a/src/test/rustdoc-ui/intra-doc/auxiliary/assoc-field-dep.rs
+++ b/tests/rustdoc-ui/intra-doc/auxiliary/assoc-field-dep.rs
diff --git a/src/test/rustdoc-ui/intra-doc/auxiliary/assoc-mod-inner-outer-dep.rs b/tests/rustdoc-ui/intra-doc/auxiliary/assoc-mod-inner-outer-dep.rs
index 7a11a1657..7a11a1657 100644
--- a/src/test/rustdoc-ui/intra-doc/auxiliary/assoc-mod-inner-outer-dep.rs
+++ b/tests/rustdoc-ui/intra-doc/auxiliary/assoc-mod-inner-outer-dep.rs
diff --git a/src/test/rustdoc-ui/intra-doc/auxiliary/dep1.rs b/tests/rustdoc-ui/intra-doc/auxiliary/dep1.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/rustdoc-ui/intra-doc/auxiliary/dep1.rs
+++ b/tests/rustdoc-ui/intra-doc/auxiliary/dep1.rs
diff --git a/src/test/rustdoc-ui/intra-doc/auxiliary/dep2.rs b/tests/rustdoc-ui/intra-doc/auxiliary/dep2.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/rustdoc-ui/intra-doc/auxiliary/dep2.rs
+++ b/tests/rustdoc-ui/intra-doc/auxiliary/dep2.rs
diff --git a/src/test/rustdoc-ui/intra-doc/auxiliary/dep3.rs b/tests/rustdoc-ui/intra-doc/auxiliary/dep3.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/rustdoc-ui/intra-doc/auxiliary/dep3.rs
+++ b/tests/rustdoc-ui/intra-doc/auxiliary/dep3.rs
diff --git a/src/test/rustdoc-ui/intra-doc/auxiliary/dep4.rs b/tests/rustdoc-ui/intra-doc/auxiliary/dep4.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/rustdoc-ui/intra-doc/auxiliary/dep4.rs
+++ b/tests/rustdoc-ui/intra-doc/auxiliary/dep4.rs
diff --git a/src/test/rustdoc-ui/intra-doc/auxiliary/intra-doc-broken.rs b/tests/rustdoc-ui/intra-doc/auxiliary/intra-doc-broken.rs
index 31a8310d4..31a8310d4 100644
--- a/src/test/rustdoc-ui/intra-doc/auxiliary/intra-doc-broken.rs
+++ b/tests/rustdoc-ui/intra-doc/auxiliary/intra-doc-broken.rs
diff --git a/src/test/rustdoc-ui/intra-doc/auxiliary/pointer-reexports-allowed.rs b/tests/rustdoc-ui/intra-doc/auxiliary/pointer-reexports-allowed.rs
index 0a3dc57f1..0a3dc57f1 100644
--- a/src/test/rustdoc-ui/intra-doc/auxiliary/pointer-reexports-allowed.rs
+++ b/tests/rustdoc-ui/intra-doc/auxiliary/pointer-reexports-allowed.rs
diff --git a/src/test/rustdoc-ui/intra-doc/auxiliary/through-proc-macro-aux.rs b/tests/rustdoc-ui/intra-doc/auxiliary/through-proc-macro-aux.rs
index 5c4a01ee3..5c4a01ee3 100644
--- a/src/test/rustdoc-ui/intra-doc/auxiliary/through-proc-macro-aux.rs
+++ b/tests/rustdoc-ui/intra-doc/auxiliary/through-proc-macro-aux.rs
diff --git a/src/test/rustdoc-ui/intra-doc/broken-reexport.rs b/tests/rustdoc-ui/intra-doc/broken-reexport.rs
index 862faa50b..862faa50b 100644
--- a/src/test/rustdoc-ui/intra-doc/broken-reexport.rs
+++ b/tests/rustdoc-ui/intra-doc/broken-reexport.rs
diff --git a/src/test/rustdoc-ui/intra-doc/crate-nonexistent.rs b/tests/rustdoc-ui/intra-doc/crate-nonexistent.rs
index ceecfa681..ceecfa681 100644
--- a/src/test/rustdoc-ui/intra-doc/crate-nonexistent.rs
+++ b/tests/rustdoc-ui/intra-doc/crate-nonexistent.rs
diff --git a/src/test/rustdoc-ui/intra-doc/crate-nonexistent.stderr b/tests/rustdoc-ui/intra-doc/crate-nonexistent.stderr
index a69b1c52a..a69b1c52a 100644
--- a/src/test/rustdoc-ui/intra-doc/crate-nonexistent.stderr
+++ b/tests/rustdoc-ui/intra-doc/crate-nonexistent.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/disambiguator-mismatch.rs b/tests/rustdoc-ui/intra-doc/disambiguator-mismatch.rs
index 2d6656611..2d6656611 100644
--- a/src/test/rustdoc-ui/intra-doc/disambiguator-mismatch.rs
+++ b/tests/rustdoc-ui/intra-doc/disambiguator-mismatch.rs
diff --git a/src/test/rustdoc-ui/intra-doc/disambiguator-mismatch.stderr b/tests/rustdoc-ui/intra-doc/disambiguator-mismatch.stderr
index ee35749ce..ee35749ce 100644
--- a/src/test/rustdoc-ui/intra-doc/disambiguator-mismatch.stderr
+++ b/tests/rustdoc-ui/intra-doc/disambiguator-mismatch.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/double-anchor.rs b/tests/rustdoc-ui/intra-doc/double-anchor.rs
index a01211c4f..a01211c4f 100644
--- a/src/test/rustdoc-ui/intra-doc/double-anchor.rs
+++ b/tests/rustdoc-ui/intra-doc/double-anchor.rs
diff --git a/src/test/rustdoc-ui/intra-doc/double-anchor.stderr b/tests/rustdoc-ui/intra-doc/double-anchor.stderr
index 6addb010e..6addb010e 100644
--- a/src/test/rustdoc-ui/intra-doc/double-anchor.stderr
+++ b/tests/rustdoc-ui/intra-doc/double-anchor.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/email-address-localhost.rs b/tests/rustdoc-ui/intra-doc/email-address-localhost.rs
index 7a5156e81..7a5156e81 100644
--- a/src/test/rustdoc-ui/intra-doc/email-address-localhost.rs
+++ b/tests/rustdoc-ui/intra-doc/email-address-localhost.rs
diff --git a/src/test/rustdoc-ui/intra-doc/errors.rs b/tests/rustdoc-ui/intra-doc/errors.rs
index b29f7c29b..b29f7c29b 100644
--- a/src/test/rustdoc-ui/intra-doc/errors.rs
+++ b/tests/rustdoc-ui/intra-doc/errors.rs
diff --git a/src/test/rustdoc-ui/intra-doc/errors.stderr b/tests/rustdoc-ui/intra-doc/errors.stderr
index 9a1896fb0..9a1896fb0 100644
--- a/src/test/rustdoc-ui/intra-doc/errors.stderr
+++ b/tests/rustdoc-ui/intra-doc/errors.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/extern-crate-load.rs b/tests/rustdoc-ui/intra-doc/extern-crate-load.rs
index 438c56aa5..438c56aa5 100644
--- a/src/test/rustdoc-ui/intra-doc/extern-crate-load.rs
+++ b/tests/rustdoc-ui/intra-doc/extern-crate-load.rs
diff --git a/src/test/rustdoc-ui/intra-doc/feature-gate-intra-doc-pointers.rs b/tests/rustdoc-ui/intra-doc/feature-gate-intra-doc-pointers.rs
index 3cfac942c..3cfac942c 100644
--- a/src/test/rustdoc-ui/intra-doc/feature-gate-intra-doc-pointers.rs
+++ b/tests/rustdoc-ui/intra-doc/feature-gate-intra-doc-pointers.rs
diff --git a/src/test/rustdoc-ui/intra-doc/feature-gate-intra-doc-pointers.stderr b/tests/rustdoc-ui/intra-doc/feature-gate-intra-doc-pointers.stderr
index 2c946ed48..2c946ed48 100644
--- a/src/test/rustdoc-ui/intra-doc/feature-gate-intra-doc-pointers.stderr
+++ b/tests/rustdoc-ui/intra-doc/feature-gate-intra-doc-pointers.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/field-ice.rs b/tests/rustdoc-ui/intra-doc/field-ice.rs
index c5d501e38..c5d501e38 100644
--- a/src/test/rustdoc-ui/intra-doc/field-ice.rs
+++ b/tests/rustdoc-ui/intra-doc/field-ice.rs
diff --git a/src/test/rustdoc-ui/intra-doc/field-ice.stderr b/tests/rustdoc-ui/intra-doc/field-ice.stderr
index f45a3ca61..f45a3ca61 100644
--- a/src/test/rustdoc-ui/intra-doc/field-ice.stderr
+++ b/tests/rustdoc-ui/intra-doc/field-ice.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/global-path.rs b/tests/rustdoc-ui/intra-doc/global-path.rs
index cc7a5fa1c..cc7a5fa1c 100644
--- a/src/test/rustdoc-ui/intra-doc/global-path.rs
+++ b/tests/rustdoc-ui/intra-doc/global-path.rs
diff --git a/src/test/rustdoc-ui/intra-doc/global-path.stderr b/tests/rustdoc-ui/intra-doc/global-path.stderr
index 02379cd6c..02379cd6c 100644
--- a/src/test/rustdoc-ui/intra-doc/global-path.stderr
+++ b/tests/rustdoc-ui/intra-doc/global-path.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/html-as-generics-intra-doc.rs b/tests/rustdoc-ui/intra-doc/html-as-generics-intra-doc.rs
index b5470c859..b5470c859 100644
--- a/src/test/rustdoc-ui/intra-doc/html-as-generics-intra-doc.rs
+++ b/tests/rustdoc-ui/intra-doc/html-as-generics-intra-doc.rs
diff --git a/src/test/rustdoc-ui/intra-doc/html-as-generics-intra-doc.stderr b/tests/rustdoc-ui/intra-doc/html-as-generics-intra-doc.stderr
index 7c81044db..7c81044db 100644
--- a/src/test/rustdoc-ui/intra-doc/html-as-generics-intra-doc.stderr
+++ b/tests/rustdoc-ui/intra-doc/html-as-generics-intra-doc.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/incompatible-primitive-disambiguator.rs b/tests/rustdoc-ui/intra-doc/incompatible-primitive-disambiguator.rs
index 3088bcd46..3088bcd46 100644
--- a/src/test/rustdoc-ui/intra-doc/incompatible-primitive-disambiguator.rs
+++ b/tests/rustdoc-ui/intra-doc/incompatible-primitive-disambiguator.rs
diff --git a/src/test/rustdoc-ui/intra-doc/incompatible-primitive-disambiguator.stderr b/tests/rustdoc-ui/intra-doc/incompatible-primitive-disambiguator.stderr
index c43cda3eb..c43cda3eb 100644
--- a/src/test/rustdoc-ui/intra-doc/incompatible-primitive-disambiguator.stderr
+++ b/tests/rustdoc-ui/intra-doc/incompatible-primitive-disambiguator.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/macro-rules-error.rs b/tests/rustdoc-ui/intra-doc/macro-rules-error.rs
index 8490584c1..8490584c1 100644
--- a/src/test/rustdoc-ui/intra-doc/macro-rules-error.rs
+++ b/tests/rustdoc-ui/intra-doc/macro-rules-error.rs
diff --git a/src/test/rustdoc-ui/intra-doc/macro-rules-error.stderr b/tests/rustdoc-ui/intra-doc/macro-rules-error.stderr
index 6ad8084b0..6ad8084b0 100644
--- a/src/test/rustdoc-ui/intra-doc/macro-rules-error.stderr
+++ b/tests/rustdoc-ui/intra-doc/macro-rules-error.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/macro-rules.rs b/tests/rustdoc-ui/intra-doc/macro-rules.rs
index 3aeb370ef..3aeb370ef 100644
--- a/src/test/rustdoc-ui/intra-doc/macro-rules.rs
+++ b/tests/rustdoc-ui/intra-doc/macro-rules.rs
diff --git a/src/test/rustdoc-ui/intra-doc/malformed-generics.rs b/tests/rustdoc-ui/intra-doc/malformed-generics.rs
index 161625ed2..161625ed2 100644
--- a/src/test/rustdoc-ui/intra-doc/malformed-generics.rs
+++ b/tests/rustdoc-ui/intra-doc/malformed-generics.rs
diff --git a/src/test/rustdoc-ui/intra-doc/malformed-generics.stderr b/tests/rustdoc-ui/intra-doc/malformed-generics.stderr
index 08349fef8..08349fef8 100644
--- a/src/test/rustdoc-ui/intra-doc/malformed-generics.stderr
+++ b/tests/rustdoc-ui/intra-doc/malformed-generics.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/non-path-primitives.rs b/tests/rustdoc-ui/intra-doc/non-path-primitives.rs
index 587cbad68..587cbad68 100644
--- a/src/test/rustdoc-ui/intra-doc/non-path-primitives.rs
+++ b/tests/rustdoc-ui/intra-doc/non-path-primitives.rs
diff --git a/src/test/rustdoc-ui/intra-doc/non-path-primitives.stderr b/tests/rustdoc-ui/intra-doc/non-path-primitives.stderr
index 8ec894d10..8ec894d10 100644
--- a/src/test/rustdoc-ui/intra-doc/non-path-primitives.stderr
+++ b/tests/rustdoc-ui/intra-doc/non-path-primitives.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/pointer-reexports-allowed.rs b/tests/rustdoc-ui/intra-doc/pointer-reexports-allowed.rs
index 8654a8e1b..8654a8e1b 100644
--- a/src/test/rustdoc-ui/intra-doc/pointer-reexports-allowed.rs
+++ b/tests/rustdoc-ui/intra-doc/pointer-reexports-allowed.rs
diff --git a/src/test/rustdoc-ui/intra-doc/prim-conflict.rs b/tests/rustdoc-ui/intra-doc/prim-conflict.rs
index 2c1a8b535..2c1a8b535 100644
--- a/src/test/rustdoc-ui/intra-doc/prim-conflict.rs
+++ b/tests/rustdoc-ui/intra-doc/prim-conflict.rs
diff --git a/src/test/rustdoc-ui/intra-doc/prim-conflict.stderr b/tests/rustdoc-ui/intra-doc/prim-conflict.stderr
index 6ef3b7eab..6ef3b7eab 100644
--- a/src/test/rustdoc-ui/intra-doc/prim-conflict.stderr
+++ b/tests/rustdoc-ui/intra-doc/prim-conflict.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/private-from-crate-level.rs b/tests/rustdoc-ui/intra-doc/private-from-crate-level.rs
index e429e75b2..e429e75b2 100644
--- a/src/test/rustdoc-ui/intra-doc/private-from-crate-level.rs
+++ b/tests/rustdoc-ui/intra-doc/private-from-crate-level.rs
diff --git a/src/test/rustdoc-ui/intra-doc/private-from-crate-level.stderr b/tests/rustdoc-ui/intra-doc/private-from-crate-level.stderr
index 4d5bd70bf..4d5bd70bf 100644
--- a/src/test/rustdoc-ui/intra-doc/private-from-crate-level.stderr
+++ b/tests/rustdoc-ui/intra-doc/private-from-crate-level.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/private.private.stderr b/tests/rustdoc-ui/intra-doc/private.private.stderr
index 6661e9021..6661e9021 100644
--- a/src/test/rustdoc-ui/intra-doc/private.private.stderr
+++ b/tests/rustdoc-ui/intra-doc/private.private.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/private.public.stderr b/tests/rustdoc-ui/intra-doc/private.public.stderr
index 45b51e12e..45b51e12e 100644
--- a/src/test/rustdoc-ui/intra-doc/private.public.stderr
+++ b/tests/rustdoc-ui/intra-doc/private.public.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/private.rs b/tests/rustdoc-ui/intra-doc/private.rs
index 525332dda..525332dda 100644
--- a/src/test/rustdoc-ui/intra-doc/private.rs
+++ b/tests/rustdoc-ui/intra-doc/private.rs
diff --git a/src/test/rustdoc-ui/intra-doc/span-ice-55723.rs b/tests/rustdoc-ui/intra-doc/span-ice-55723.rs
index 041ec2932..041ec2932 100644
--- a/src/test/rustdoc-ui/intra-doc/span-ice-55723.rs
+++ b/tests/rustdoc-ui/intra-doc/span-ice-55723.rs
diff --git a/src/test/rustdoc-ui/intra-doc/span-ice-55723.stderr b/tests/rustdoc-ui/intra-doc/span-ice-55723.stderr
index e8ee40ad4..e8ee40ad4 100644
--- a/src/test/rustdoc-ui/intra-doc/span-ice-55723.stderr
+++ b/tests/rustdoc-ui/intra-doc/span-ice-55723.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/through-proc-macro.rs b/tests/rustdoc-ui/intra-doc/through-proc-macro.rs
index 7628c3928..7628c3928 100644
--- a/src/test/rustdoc-ui/intra-doc/through-proc-macro.rs
+++ b/tests/rustdoc-ui/intra-doc/through-proc-macro.rs
diff --git a/src/test/rustdoc-ui/intra-doc/through-proc-macro.stderr b/tests/rustdoc-ui/intra-doc/through-proc-macro.stderr
index 508d0683d..508d0683d 100644
--- a/src/test/rustdoc-ui/intra-doc/through-proc-macro.stderr
+++ b/tests/rustdoc-ui/intra-doc/through-proc-macro.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/unknown-disambiguator.rs b/tests/rustdoc-ui/intra-doc/unknown-disambiguator.rs
index 0aa1e5a41..0aa1e5a41 100644
--- a/src/test/rustdoc-ui/intra-doc/unknown-disambiguator.rs
+++ b/tests/rustdoc-ui/intra-doc/unknown-disambiguator.rs
diff --git a/src/test/rustdoc-ui/intra-doc/unknown-disambiguator.stderr b/tests/rustdoc-ui/intra-doc/unknown-disambiguator.stderr
index 19e541736..19e541736 100644
--- a/src/test/rustdoc-ui/intra-doc/unknown-disambiguator.stderr
+++ b/tests/rustdoc-ui/intra-doc/unknown-disambiguator.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/unresolved-import-recovery.rs b/tests/rustdoc-ui/intra-doc/unresolved-import-recovery.rs
index c71e5bee1..c71e5bee1 100644
--- a/src/test/rustdoc-ui/intra-doc/unresolved-import-recovery.rs
+++ b/tests/rustdoc-ui/intra-doc/unresolved-import-recovery.rs
diff --git a/src/test/rustdoc-ui/intra-doc/unresolved-import-recovery.stderr b/tests/rustdoc-ui/intra-doc/unresolved-import-recovery.stderr
index b54f82006..b54f82006 100644
--- a/src/test/rustdoc-ui/intra-doc/unresolved-import-recovery.stderr
+++ b/tests/rustdoc-ui/intra-doc/unresolved-import-recovery.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/unused-extern-crate.rs b/tests/rustdoc-ui/intra-doc/unused-extern-crate.rs
index 956583093..956583093 100644
--- a/src/test/rustdoc-ui/intra-doc/unused-extern-crate.rs
+++ b/tests/rustdoc-ui/intra-doc/unused-extern-crate.rs
diff --git a/src/test/rustdoc-ui/intra-doc/unused-extern-crate.stderr b/tests/rustdoc-ui/intra-doc/unused-extern-crate.stderr
index 815324563..815324563 100644
--- a/src/test/rustdoc-ui/intra-doc/unused-extern-crate.stderr
+++ b/tests/rustdoc-ui/intra-doc/unused-extern-crate.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/warning-crlf.rs b/tests/rustdoc-ui/intra-doc/warning-crlf.rs
index ceb62f6d1..ceb62f6d1 100644
--- a/src/test/rustdoc-ui/intra-doc/warning-crlf.rs
+++ b/tests/rustdoc-ui/intra-doc/warning-crlf.rs
diff --git a/src/test/rustdoc-ui/intra-doc/warning-crlf.stderr b/tests/rustdoc-ui/intra-doc/warning-crlf.stderr
index c309a55f4..c309a55f4 100644
--- a/src/test/rustdoc-ui/intra-doc/warning-crlf.stderr
+++ b/tests/rustdoc-ui/intra-doc/warning-crlf.stderr
diff --git a/src/test/rustdoc-ui/intra-doc/warning.rs b/tests/rustdoc-ui/intra-doc/warning.rs
index eab1f0348..eab1f0348 100644
--- a/src/test/rustdoc-ui/intra-doc/warning.rs
+++ b/tests/rustdoc-ui/intra-doc/warning.rs
diff --git a/src/test/rustdoc-ui/intra-doc/warning.stderr b/tests/rustdoc-ui/intra-doc/warning.stderr
index 19399a0df..19399a0df 100644
--- a/src/test/rustdoc-ui/intra-doc/warning.stderr
+++ b/tests/rustdoc-ui/intra-doc/warning.stderr
diff --git a/src/test/rustdoc-ui/invalid-cfg.rs b/tests/rustdoc-ui/invalid-cfg.rs
index d237b8605..d237b8605 100644
--- a/src/test/rustdoc-ui/invalid-cfg.rs
+++ b/tests/rustdoc-ui/invalid-cfg.rs
diff --git a/src/test/rustdoc-ui/invalid-cfg.stderr b/tests/rustdoc-ui/invalid-cfg.stderr
index dae238b05..dae238b05 100644
--- a/src/test/rustdoc-ui/invalid-cfg.stderr
+++ b/tests/rustdoc-ui/invalid-cfg.stderr
diff --git a/src/test/rustdoc-ui/invalid-doc-attr.rs b/tests/rustdoc-ui/invalid-doc-attr.rs
index de004b41e..de004b41e 100644
--- a/src/test/rustdoc-ui/invalid-doc-attr.rs
+++ b/tests/rustdoc-ui/invalid-doc-attr.rs
diff --git a/src/test/rustdoc-ui/invalid-doc-attr.stderr b/tests/rustdoc-ui/invalid-doc-attr.stderr
index 3c66e587b..3c66e587b 100644
--- a/src/test/rustdoc-ui/invalid-doc-attr.stderr
+++ b/tests/rustdoc-ui/invalid-doc-attr.stderr
diff --git a/src/test/rustdoc-ui/invalid-html-self-closing-tag.rs b/tests/rustdoc-ui/invalid-html-self-closing-tag.rs
index d973a53cb..d973a53cb 100644
--- a/src/test/rustdoc-ui/invalid-html-self-closing-tag.rs
+++ b/tests/rustdoc-ui/invalid-html-self-closing-tag.rs
diff --git a/src/test/rustdoc-ui/invalid-html-self-closing-tag.stderr b/tests/rustdoc-ui/invalid-html-self-closing-tag.stderr
index e45edfb43..e45edfb43 100644
--- a/src/test/rustdoc-ui/invalid-html-self-closing-tag.stderr
+++ b/tests/rustdoc-ui/invalid-html-self-closing-tag.stderr
diff --git a/src/test/rustdoc-ui/invalid-html-tags.rs b/tests/rustdoc-ui/invalid-html-tags.rs
index 317f1fd1d..317f1fd1d 100644
--- a/src/test/rustdoc-ui/invalid-html-tags.rs
+++ b/tests/rustdoc-ui/invalid-html-tags.rs
diff --git a/src/test/rustdoc-ui/invalid-html-tags.stderr b/tests/rustdoc-ui/invalid-html-tags.stderr
index 9c2bfcf2c..9c2bfcf2c 100644
--- a/src/test/rustdoc-ui/invalid-html-tags.stderr
+++ b/tests/rustdoc-ui/invalid-html-tags.stderr
diff --git a/src/test/rustdoc-ui/invalid-keyword.rs b/tests/rustdoc-ui/invalid-keyword.rs
index 2d70471c8..2d70471c8 100644
--- a/src/test/rustdoc-ui/invalid-keyword.rs
+++ b/tests/rustdoc-ui/invalid-keyword.rs
diff --git a/src/test/rustdoc-ui/invalid-keyword.stderr b/tests/rustdoc-ui/invalid-keyword.stderr
index 8658e3825..8658e3825 100644
--- a/src/test/rustdoc-ui/invalid-keyword.stderr
+++ b/tests/rustdoc-ui/invalid-keyword.stderr
diff --git a/src/test/rustdoc-ui/invalid-syntax.rs b/tests/rustdoc-ui/invalid-syntax.rs
index acb2a6f08..acb2a6f08 100644
--- a/src/test/rustdoc-ui/invalid-syntax.rs
+++ b/tests/rustdoc-ui/invalid-syntax.rs
diff --git a/src/test/rustdoc-ui/invalid-syntax.stderr b/tests/rustdoc-ui/invalid-syntax.stderr
index 597d19e74..6140a06c5 100644
--- a/src/test/rustdoc-ui/invalid-syntax.stderr
+++ b/tests/rustdoc-ui/invalid-syntax.stderr
@@ -77,8 +77,6 @@ LL | ///     ```
    |         ^^^
    |
    = note: error from rustc: unknown start of token: `
-   = note: error from rustc: unknown start of token: `
-   = note: error from rustc: unknown start of token: `
 
 warning: could not parse code block as Rust code
   --> $DIR/invalid-syntax.rs:64:5
diff --git a/src/test/rustdoc-ui/invalid-theme-name.rs b/tests/rustdoc-ui/invalid-theme-name.rs
index c22ebf027..c22ebf027 100644
--- a/src/test/rustdoc-ui/invalid-theme-name.rs
+++ b/tests/rustdoc-ui/invalid-theme-name.rs
diff --git a/src/test/rustdoc-ui/invalid-theme-name.stderr b/tests/rustdoc-ui/invalid-theme-name.stderr
index 80204442d..80204442d 100644
--- a/src/test/rustdoc-ui/invalid-theme-name.stderr
+++ b/tests/rustdoc-ui/invalid-theme-name.stderr
diff --git a/src/test/rustdoc-ui/issue-101076.rs b/tests/rustdoc-ui/issue-101076.rs
index 648f99029..648f99029 100644
--- a/src/test/rustdoc-ui/issue-101076.rs
+++ b/tests/rustdoc-ui/issue-101076.rs
diff --git a/src/test/rustdoc-ui/issue-102986.rs b/tests/rustdoc-ui/issue-102986.rs
index 001784ac2..001784ac2 100644
--- a/src/test/rustdoc-ui/issue-102986.rs
+++ b/tests/rustdoc-ui/issue-102986.rs
diff --git a/src/test/rustdoc-ui/issue-102986.stderr b/tests/rustdoc-ui/issue-102986.stderr
index 3a573726c..3a573726c 100644
--- a/src/test/rustdoc-ui/issue-102986.stderr
+++ b/tests/rustdoc-ui/issue-102986.stderr
diff --git a/src/test/rustdoc-ui/issue-103997.rs b/tests/rustdoc-ui/issue-103997.rs
index 36f42fb15..36f42fb15 100644
--- a/src/test/rustdoc-ui/issue-103997.rs
+++ b/tests/rustdoc-ui/issue-103997.rs
diff --git a/src/test/rustdoc-ui/issue-103997.stderr b/tests/rustdoc-ui/issue-103997.stderr
index c06db9149..c06db9149 100644
--- a/src/test/rustdoc-ui/issue-103997.stderr
+++ b/tests/rustdoc-ui/issue-103997.stderr
diff --git a/tests/rustdoc-ui/issue-105334.rs b/tests/rustdoc-ui/issue-105334.rs
new file mode 100644
index 000000000..ee1adc6a0
--- /dev/null
+++ b/tests/rustdoc-ui/issue-105334.rs
@@ -0,0 +1,2 @@
+impl Vec< br##"*.."## > {}
+//~^ ERROR
diff --git a/tests/rustdoc-ui/issue-105334.stderr b/tests/rustdoc-ui/issue-105334.stderr
new file mode 100644
index 000000000..e163bb4db
--- /dev/null
+++ b/tests/rustdoc-ui/issue-105334.stderr
@@ -0,0 +1,9 @@
+error[E0747]: constant provided when a type was expected
+  --> $DIR/issue-105334.rs:1:11
+   |
+LL | impl Vec< br##"*.."## > {}
+   |           ^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0747`.
diff --git a/tests/rustdoc-ui/issue-105737.rs b/tests/rustdoc-ui/issue-105737.rs
new file mode 100644
index 000000000..154f069d8
--- /dev/null
+++ b/tests/rustdoc-ui/issue-105737.rs
@@ -0,0 +1,4 @@
+impl Vec<lol> {}
+//~^ ERROR
+
+pub fn lol() {}
diff --git a/tests/rustdoc-ui/issue-105737.stderr b/tests/rustdoc-ui/issue-105737.stderr
new file mode 100644
index 000000000..2dd9beb17
--- /dev/null
+++ b/tests/rustdoc-ui/issue-105737.stderr
@@ -0,0 +1,12 @@
+error[E0747]: constant provided when a type was expected
+  --> $DIR/issue-105737.rs:1:10
+   |
+LL | impl Vec<lol> {}
+   |          ^^^
+   |
+   = help: `lol` is a function item, not a type
+   = help: function item types cannot be named directly
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0747`.
diff --git a/tests/rustdoc-ui/issue-105742.rs b/tests/rustdoc-ui/issue-105742.rs
new file mode 100644
index 000000000..cb1de7433
--- /dev/null
+++ b/tests/rustdoc-ui/issue-105742.rs
@@ -0,0 +1,40 @@
+// compile-flags: -Znormalize-docs
+
+use std::ops::Index;
+
+pub fn next<'a, T>(s: &'a mut dyn SVec<Item = T, Output = T>) {
+//~^ ERROR
+//~^^ ERROR
+//~^^^ ERROR
+    let _ = s;
+}
+
+pub trait SVec: Index<
+    <Self as SVec>::Item,
+//~^ ERROR
+//~^^ ERROR
+//~^^^ ERROR
+//~^^^^ ERROR
+    Output = <Index<<Self as SVec>::Item,
+//~^ ERROR
+//~^^ ERROR
+//~^^^ ERROR
+//~^^^^ ERROR
+    Output = <Self as SVec>::Item> as SVec>::Item,
+//~^ ERROR
+//~^^ ERROR
+//~^^^ ERROR
+//~^^^^ ERROR
+//~^^^^^ ERROR
+//~^^^^^^ ERROR
+//~^^^^^^^ ERROR
+//~^^^^^^^^ ERROR
+> {
+    type Item<'a, T>;
+
+    fn len(&self) -> <Self as SVec>::Item;
+    //~^ ERROR
+    //~^^ ERROR
+    //~^^^ ERROR
+    //~^^^^ ERROR
+}
diff --git a/tests/rustdoc-ui/issue-105742.stderr b/tests/rustdoc-ui/issue-105742.stderr
new file mode 100644
index 000000000..ffb602cf8
--- /dev/null
+++ b/tests/rustdoc-ui/issue-105742.stderr
@@ -0,0 +1,385 @@
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:13:21
+   |
+LL |     <Self as SVec>::Item,
+   |                     ^^^^ expected 1 lifetime argument
+   |
+note: associated type defined here, with 1 lifetime parameter: `'a`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^ --
+help: add missing lifetime argument
+   |
+LL |     <Self as SVec>::Item<'a>,
+   |                         ++++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:13:21
+   |
+LL |     <Self as SVec>::Item,
+   |                     ^^^^ expected 1 generic argument
+   |
+note: associated type defined here, with 1 generic parameter: `T`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^     -
+help: add missing generic argument
+   |
+LL |     <Self as SVec>::Item<T>,
+   |                         +++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:18:37
+   |
+LL |     Output = <Index<<Self as SVec>::Item,
+   |                                     ^^^^ expected 1 lifetime argument
+   |
+note: associated type defined here, with 1 lifetime parameter: `'a`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^ --
+help: add missing lifetime argument
+   |
+LL |     Output = <Index<<Self as SVec>::Item<'a>,
+   |                                         ++++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:18:37
+   |
+LL |     Output = <Index<<Self as SVec>::Item,
+   |                                     ^^^^ expected 1 generic argument
+   |
+note: associated type defined here, with 1 generic parameter: `T`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^     -
+help: add missing generic argument
+   |
+LL |     Output = <Index<<Self as SVec>::Item<T>,
+   |                                         +++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:23:30
+   |
+LL |     Output = <Self as SVec>::Item> as SVec>::Item,
+   |                              ^^^^ expected 1 lifetime argument
+   |
+note: associated type defined here, with 1 lifetime parameter: `'a`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^ --
+help: add missing lifetime argument
+   |
+LL |     Output = <Self as SVec>::Item<'a>> as SVec>::Item,
+   |                                  ++++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:23:30
+   |
+LL |     Output = <Self as SVec>::Item> as SVec>::Item,
+   |                              ^^^^ expected 1 generic argument
+   |
+note: associated type defined here, with 1 generic parameter: `T`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^     -
+help: add missing generic argument
+   |
+LL |     Output = <Self as SVec>::Item<T>> as SVec>::Item,
+   |                                  +++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:23:46
+   |
+LL |     Output = <Self as SVec>::Item> as SVec>::Item,
+   |                                              ^^^^ expected 1 lifetime argument
+   |
+note: associated type defined here, with 1 lifetime parameter: `'a`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^ --
+help: add missing lifetime argument
+   |
+LL |     Output = <Self as SVec>::Item> as SVec>::Item<'a>,
+   |                                                  ++++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:23:46
+   |
+LL |     Output = <Self as SVec>::Item> as SVec>::Item,
+   |                                              ^^^^ expected 1 generic argument
+   |
+note: associated type defined here, with 1 generic parameter: `T`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^     -
+help: add missing generic argument
+   |
+LL |     Output = <Self as SVec>::Item> as SVec>::Item<T>,
+   |                                                  +++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:5:40
+   |
+LL | pub fn next<'a, T>(s: &'a mut dyn SVec<Item = T, Output = T>) {
+   |                                        ^^^^ expected 1 lifetime argument
+   |
+note: associated type defined here, with 1 lifetime parameter: `'a`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^ --
+help: add missing lifetime argument
+   |
+LL | pub fn next<'a, T>(s: &'a mut dyn SVec<Item<'_> = T, Output = T>) {
+   |                                            ++++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:5:40
+   |
+LL | pub fn next<'a, T>(s: &'a mut dyn SVec<Item = T, Output = T>) {
+   |                                        ^^^^ expected 1 generic argument
+   |
+note: associated type defined here, with 1 generic parameter: `T`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^     -
+help: add missing generic argument
+   |
+LL | pub fn next<'a, T>(s: &'a mut dyn SVec<Item<T> = T, Output = T>) {
+   |                                            +++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:13:21
+   |
+LL |     <Self as SVec>::Item,
+   |                     ^^^^ expected 1 lifetime argument
+   |
+note: associated type defined here, with 1 lifetime parameter: `'a`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^ --
+help: add missing lifetime argument
+   |
+LL |     <Self as SVec>::Item<'a>,
+   |                         ++++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:13:21
+   |
+LL |     <Self as SVec>::Item,
+   |                     ^^^^ expected 1 generic argument
+   |
+note: associated type defined here, with 1 generic parameter: `T`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^     -
+help: add missing generic argument
+   |
+LL |     <Self as SVec>::Item<T>,
+   |                         +++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:18:37
+   |
+LL |     Output = <Index<<Self as SVec>::Item,
+   |                                     ^^^^ expected 1 lifetime argument
+   |
+note: associated type defined here, with 1 lifetime parameter: `'a`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^ --
+help: add missing lifetime argument
+   |
+LL |     Output = <Index<<Self as SVec>::Item<'a>,
+   |                                         ++++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:18:37
+   |
+LL |     Output = <Index<<Self as SVec>::Item,
+   |                                     ^^^^ expected 1 generic argument
+   |
+note: associated type defined here, with 1 generic parameter: `T`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^     -
+help: add missing generic argument
+   |
+LL |     Output = <Index<<Self as SVec>::Item<T>,
+   |                                         +++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:23:30
+   |
+LL |     Output = <Self as SVec>::Item> as SVec>::Item,
+   |                              ^^^^ expected 1 lifetime argument
+   |
+note: associated type defined here, with 1 lifetime parameter: `'a`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^ --
+help: add missing lifetime argument
+   |
+LL |     Output = <Self as SVec>::Item<'a>> as SVec>::Item,
+   |                                  ++++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:23:30
+   |
+LL |     Output = <Self as SVec>::Item> as SVec>::Item,
+   |                              ^^^^ expected 1 generic argument
+   |
+note: associated type defined here, with 1 generic parameter: `T`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^     -
+help: add missing generic argument
+   |
+LL |     Output = <Self as SVec>::Item<T>> as SVec>::Item,
+   |                                  +++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:23:46
+   |
+LL |     Output = <Self as SVec>::Item> as SVec>::Item,
+   |                                              ^^^^ expected 1 lifetime argument
+   |
+note: associated type defined here, with 1 lifetime parameter: `'a`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^ --
+help: add missing lifetime argument
+   |
+LL |     Output = <Self as SVec>::Item> as SVec>::Item<'a>,
+   |                                                  ++++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:23:46
+   |
+LL |     Output = <Self as SVec>::Item> as SVec>::Item,
+   |                                              ^^^^ expected 1 generic argument
+   |
+note: associated type defined here, with 1 generic parameter: `T`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^     -
+help: add missing generic argument
+   |
+LL |     Output = <Self as SVec>::Item> as SVec>::Item<T>,
+   |                                                  +++
+
+error[E0038]: the trait `SVec` cannot be made into an object
+  --> $DIR/issue-105742.rs:5:31
+   |
+LL | pub fn next<'a, T>(s: &'a mut dyn SVec<Item = T, Output = T>) {
+   |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `SVec` cannot be made into an object
+   |
+note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
+  --> $DIR/issue-105742.rs:12:17
+   |
+LL |    pub trait SVec: Index<
+   |  ____________----__^
+   | |            |
+   | |            this trait cannot be made into an object...
+LL | |      <Self as SVec>::Item,
+LL | |
+LL | |
+...  |
+LL | |/     Output = <Index<<Self as SVec>::Item,
+LL | ||
+LL | ||
+LL | ||
+LL | ||
+LL | ||     Output = <Self as SVec>::Item> as SVec>::Item,
+   | ||_________________________________________________^ ...because it uses `Self` as a type parameter
+...  |
+LL | |
+LL | |  > {
+   | |__^ ...because it uses `Self` as a type parameter
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:35:38
+   |
+LL |     fn len(&self) -> <Self as SVec>::Item;
+   |                                      ^^^^ expected 1 lifetime argument
+   |
+note: associated type defined here, with 1 lifetime parameter: `'a`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^ --
+help: add missing lifetime argument
+   |
+LL |     fn len(&self) -> <Self as SVec>::Item<'_>;
+   |                                          ++++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:35:38
+   |
+LL |     fn len(&self) -> <Self as SVec>::Item;
+   |                                      ^^^^ expected 1 generic argument
+   |
+note: associated type defined here, with 1 generic parameter: `T`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^     -
+help: add missing generic argument
+   |
+LL |     fn len(&self) -> <Self as SVec>::Item<T>;
+   |                                          +++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:35:38
+   |
+LL |     fn len(&self) -> <Self as SVec>::Item;
+   |                                      ^^^^ expected 1 lifetime argument
+   |
+note: associated type defined here, with 1 lifetime parameter: `'a`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^ --
+help: add missing lifetime argument
+   |
+LL |     fn len(&self) -> <Self as SVec>::Item<'_>;
+   |                                          ++++
+
+error[E0107]: missing generics for associated type `SVec::Item`
+  --> $DIR/issue-105742.rs:35:38
+   |
+LL |     fn len(&self) -> <Self as SVec>::Item;
+   |                                      ^^^^ expected 1 generic argument
+   |
+note: associated type defined here, with 1 generic parameter: `T`
+  --> $DIR/issue-105742.rs:33:10
+   |
+LL |     type Item<'a, T>;
+   |          ^^^^     -
+help: add missing generic argument
+   |
+LL |     fn len(&self) -> <Self as SVec>::Item<T>;
+   |                                          +++
+
+error: aborting due to 23 previous errors
+
+Some errors have detailed explanations: E0038, E0107.
+For more information about an error, try `rustc --explain E0038`.
diff --git a/tests/rustdoc-ui/issue-106213.rs b/tests/rustdoc-ui/issue-106213.rs
new file mode 100644
index 000000000..6d51846b7
--- /dev/null
+++ b/tests/rustdoc-ui/issue-106213.rs
@@ -0,0 +1,7 @@
+// compile-flags: --document-private-items
+// edition:2021
+
+fn use_avx() -> dyn  {
+    //~^ ERROR at least one trait is required for an object type
+    !( ident_error )
+}
diff --git a/tests/rustdoc-ui/issue-106213.stderr b/tests/rustdoc-ui/issue-106213.stderr
new file mode 100644
index 000000000..0a4ff69ba
--- /dev/null
+++ b/tests/rustdoc-ui/issue-106213.stderr
@@ -0,0 +1,9 @@
+error[E0224]: at least one trait is required for an object type
+  --> $DIR/issue-106213.rs:4:17
+   |
+LL | fn use_avx() -> dyn  {
+   |                 ^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0224`.
diff --git a/tests/rustdoc-ui/issue-106226.rs b/tests/rustdoc-ui/issue-106226.rs
new file mode 100644
index 000000000..71b497a9a
--- /dev/null
+++ b/tests/rustdoc-ui/issue-106226.rs
@@ -0,0 +1,3 @@
+// This is a regression test for <https://github.com/rust-lang/rust/issues/106226>.
+type F = [_; ()];
+//~^ ERROR
diff --git a/tests/rustdoc-ui/issue-106226.stderr b/tests/rustdoc-ui/issue-106226.stderr
new file mode 100644
index 000000000..2beffbc12
--- /dev/null
+++ b/tests/rustdoc-ui/issue-106226.stderr
@@ -0,0 +1,9 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-106226.rs:2:14
+   |
+LL | type F = [_; ()];
+   |              ^^ expected `usize`, found `()`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/rustdoc-ui/issue-58473-2.rs b/tests/rustdoc-ui/issue-58473-2.rs
index 000b6a329..000b6a329 100644
--- a/src/test/rustdoc-ui/issue-58473-2.rs
+++ b/tests/rustdoc-ui/issue-58473-2.rs
diff --git a/src/test/rustdoc-ui/issue-58473.rs b/tests/rustdoc-ui/issue-58473.rs
index 44e1f58d0..44e1f58d0 100644
--- a/src/test/rustdoc-ui/issue-58473.rs
+++ b/tests/rustdoc-ui/issue-58473.rs
diff --git a/src/test/rustdoc-ui/issue-61592-2.rs b/tests/rustdoc-ui/issue-61592-2.rs
index 5b4fc5ee7..5b4fc5ee7 100644
--- a/src/test/rustdoc-ui/issue-61592-2.rs
+++ b/tests/rustdoc-ui/issue-61592-2.rs
diff --git a/src/test/rustdoc-ui/issue-61592-2.stderr b/tests/rustdoc-ui/issue-61592-2.stderr
index 1b7f8bb55..1b7f8bb55 100644
--- a/src/test/rustdoc-ui/issue-61592-2.stderr
+++ b/tests/rustdoc-ui/issue-61592-2.stderr
diff --git a/src/test/rustdoc-ui/issue-61592.rs b/tests/rustdoc-ui/issue-61592.rs
index 66772557f..66772557f 100644
--- a/src/test/rustdoc-ui/issue-61592.rs
+++ b/tests/rustdoc-ui/issue-61592.rs
diff --git a/src/test/rustdoc-ui/issue-61592.stderr b/tests/rustdoc-ui/issue-61592.stderr
index 9c9c9106f..9c9c9106f 100644
--- a/src/test/rustdoc-ui/issue-61592.stderr
+++ b/tests/rustdoc-ui/issue-61592.stderr
diff --git a/src/test/rustdoc-ui/issue-61732.rs b/tests/rustdoc-ui/issue-61732.rs
index 4bd8efeaa..4bd8efeaa 100644
--- a/src/test/rustdoc-ui/issue-61732.rs
+++ b/tests/rustdoc-ui/issue-61732.rs
diff --git a/src/test/rustdoc-ui/issue-61732.stderr b/tests/rustdoc-ui/issue-61732.stderr
index 38fadaa44..38fadaa44 100644
--- a/src/test/rustdoc-ui/issue-61732.stderr
+++ b/tests/rustdoc-ui/issue-61732.stderr
diff --git a/src/test/rustdoc-ui/issue-74134.private.stderr b/tests/rustdoc-ui/issue-74134.private.stderr
index 44c88b618..44c88b618 100644
--- a/src/test/rustdoc-ui/issue-74134.private.stderr
+++ b/tests/rustdoc-ui/issue-74134.private.stderr
diff --git a/src/test/rustdoc-ui/issue-74134.public.stderr b/tests/rustdoc-ui/issue-74134.public.stderr
index 5b1887b83..5b1887b83 100644
--- a/src/test/rustdoc-ui/issue-74134.public.stderr
+++ b/tests/rustdoc-ui/issue-74134.public.stderr
diff --git a/src/test/rustdoc-ui/issue-74134.rs b/tests/rustdoc-ui/issue-74134.rs
index b1be9123a..b1be9123a 100644
--- a/src/test/rustdoc-ui/issue-74134.rs
+++ b/tests/rustdoc-ui/issue-74134.rs
diff --git a/src/test/rustdoc-ui/issue-79465.rs b/tests/rustdoc-ui/issue-79465.rs
index f1a77982f..f1a77982f 100644
--- a/src/test/rustdoc-ui/issue-79465.rs
+++ b/tests/rustdoc-ui/issue-79465.rs
diff --git a/src/test/rustdoc-ui/issue-79465.stderr b/tests/rustdoc-ui/issue-79465.stderr
index 489cc1442..489cc1442 100644
--- a/src/test/rustdoc-ui/issue-79465.stderr
+++ b/tests/rustdoc-ui/issue-79465.stderr
diff --git a/src/test/rustdoc-ui/issue-79467.rs b/tests/rustdoc-ui/issue-79467.rs
index eb0b9b380..eb0b9b380 100644
--- a/src/test/rustdoc-ui/issue-79467.rs
+++ b/tests/rustdoc-ui/issue-79467.rs
diff --git a/src/test/rustdoc-ui/issue-79467.stderr b/tests/rustdoc-ui/issue-79467.stderr
index 561513a43..561513a43 100644
--- a/src/test/rustdoc-ui/issue-79467.stderr
+++ b/tests/rustdoc-ui/issue-79467.stderr
diff --git a/src/test/rustdoc-ui/issue-79494.rs b/tests/rustdoc-ui/issue-79494.rs
index fc39424b7..fc39424b7 100644
--- a/src/test/rustdoc-ui/issue-79494.rs
+++ b/tests/rustdoc-ui/issue-79494.rs
diff --git a/src/test/rustdoc-ui/issue-79494.stderr b/tests/rustdoc-ui/issue-79494.stderr
index 7ed5ed382..7ed5ed382 100644
--- a/src/test/rustdoc-ui/issue-79494.stderr
+++ b/tests/rustdoc-ui/issue-79494.stderr
diff --git a/src/test/rustdoc-ui/issue-80992.rs b/tests/rustdoc-ui/issue-80992.rs
index 8983439bb..80ff225b8 100644
--- a/src/test/rustdoc-ui/issue-80992.rs
+++ b/tests/rustdoc-ui/issue-80992.rs
@@ -1,6 +1,6 @@
 // check-pass
 // compile-flags:--test
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 pub fn test() -> Result<(), ()> {
diff --git a/src/test/rustdoc-ui/issue-80992.stdout b/tests/rustdoc-ui/issue-80992.stdout
index d2b1cd1d5..d2b1cd1d5 100644
--- a/src/test/rustdoc-ui/issue-80992.stdout
+++ b/tests/rustdoc-ui/issue-80992.stdout
diff --git a/src/test/rustdoc-ui/issue-81662-shortness.rs b/tests/rustdoc-ui/issue-81662-shortness.rs
index 27a21a313..8a90813b3 100644
--- a/src/test/rustdoc-ui/issue-81662-shortness.rs
+++ b/tests/rustdoc-ui/issue-81662-shortness.rs
@@ -1,5 +1,5 @@
 // compile-flags:--test --error-format=short
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 
diff --git a/src/test/rustdoc-ui/issue-81662-shortness.stdout b/tests/rustdoc-ui/issue-81662-shortness.stdout
index 748113be3..748113be3 100644
--- a/src/test/rustdoc-ui/issue-81662-shortness.stdout
+++ b/tests/rustdoc-ui/issue-81662-shortness.stdout
diff --git a/src/test/rustdoc-ui/issue-83883-describe-lints.rs b/tests/rustdoc-ui/issue-83883-describe-lints.rs
index 0474d6c14..0474d6c14 100644
--- a/src/test/rustdoc-ui/issue-83883-describe-lints.rs
+++ b/tests/rustdoc-ui/issue-83883-describe-lints.rs
diff --git a/src/test/rustdoc-ui/issue-83883-describe-lints.stdout b/tests/rustdoc-ui/issue-83883-describe-lints.stdout
index bbf66a315..bbf66a315 100644
--- a/src/test/rustdoc-ui/issue-83883-describe-lints.stdout
+++ b/tests/rustdoc-ui/issue-83883-describe-lints.stdout
diff --git a/src/test/rustdoc-ui/issue-91134.rs b/tests/rustdoc-ui/issue-91134.rs
index d2ff3a252..42703ee4d 100644
--- a/src/test/rustdoc-ui/issue-91134.rs
+++ b/tests/rustdoc-ui/issue-91134.rs
@@ -1,7 +1,7 @@
 // compile-flags: --test --crate-name=empty_fn --extern=empty_fn --test-args=--test-threads=1
 // aux-build:empty-fn.rs
 // check-pass
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // edition:2021
 
diff --git a/src/test/rustdoc-ui/issue-91134.stdout b/tests/rustdoc-ui/issue-91134.stdout
index 084062743..084062743 100644
--- a/src/test/rustdoc-ui/issue-91134.stdout
+++ b/tests/rustdoc-ui/issue-91134.stdout
diff --git a/src/test/rustdoc-ui/issue-91713.rs b/tests/rustdoc-ui/issue-91713.rs
index 610bbf11d..610bbf11d 100644
--- a/src/test/rustdoc-ui/issue-91713.rs
+++ b/tests/rustdoc-ui/issue-91713.rs
diff --git a/src/test/rustdoc-ui/issue-91713.stderr b/tests/rustdoc-ui/issue-91713.stderr
index 44ead7a1d..44ead7a1d 100644
--- a/src/test/rustdoc-ui/issue-91713.stderr
+++ b/tests/rustdoc-ui/issue-91713.stderr
diff --git a/src/test/rustdoc-ui/issue-91713.stdout b/tests/rustdoc-ui/issue-91713.stdout
index 167835243..167835243 100644
--- a/src/test/rustdoc-ui/issue-91713.stdout
+++ b/tests/rustdoc-ui/issue-91713.stdout
diff --git a/tests/rustdoc-ui/issue-96287.rs b/tests/rustdoc-ui/issue-96287.rs
new file mode 100644
index 000000000..8d8b4456e
--- /dev/null
+++ b/tests/rustdoc-ui/issue-96287.rs
@@ -0,0 +1,17 @@
+#![feature(type_alias_impl_trait)]
+
+pub trait TraitWithAssoc {
+    type Assoc;
+}
+
+pub type Foo<V> = impl Trait<V::Assoc>;
+//~^ ERROR
+//~^^ ERROR
+
+pub trait Trait<U> {}
+
+impl<W> Trait<W> for () {}
+
+pub fn foo_desugared<T: TraitWithAssoc>(_: T) -> Foo<T> {
+    ()
+}
diff --git a/tests/rustdoc-ui/issue-96287.stderr b/tests/rustdoc-ui/issue-96287.stderr
new file mode 100644
index 000000000..0236b9fe6
--- /dev/null
+++ b/tests/rustdoc-ui/issue-96287.stderr
@@ -0,0 +1,15 @@
+error[E0220]: associated type `Assoc` not found for `V`
+  --> $DIR/issue-96287.rs:7:33
+   |
+LL | pub type Foo<V> = impl Trait<V::Assoc>;
+   |                                 ^^^^^ there is a similarly named associated type `Assoc` in the trait `TraitWithAssoc`
+
+error[E0220]: associated type `Assoc` not found for `V`
+  --> $DIR/issue-96287.rs:7:33
+   |
+LL | pub type Foo<V> = impl Trait<V::Assoc>;
+   |                                 ^^^^^ there is a similarly named associated type `Assoc` in the trait `TraitWithAssoc`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0220`.
diff --git a/src/test/rustdoc-ui/issue-98690.rs b/tests/rustdoc-ui/issue-98690.rs
index fe9bd87ab..fe9bd87ab 100644
--- a/src/test/rustdoc-ui/issue-98690.rs
+++ b/tests/rustdoc-ui/issue-98690.rs
diff --git a/src/test/rustdoc-ui/issue-98690.stderr b/tests/rustdoc-ui/issue-98690.stderr
index 47d94f99a..47d94f99a 100644
--- a/src/test/rustdoc-ui/issue-98690.stderr
+++ b/tests/rustdoc-ui/issue-98690.stderr
diff --git a/src/test/rustdoc-ui/lint-group.rs b/tests/rustdoc-ui/lint-group.rs
index 09aca6d2b..09aca6d2b 100644
--- a/src/test/rustdoc-ui/lint-group.rs
+++ b/tests/rustdoc-ui/lint-group.rs
diff --git a/src/test/rustdoc-ui/lint-group.stderr b/tests/rustdoc-ui/lint-group.stderr
index 4f2c96588..4f2c96588 100644
--- a/src/test/rustdoc-ui/lint-group.stderr
+++ b/tests/rustdoc-ui/lint-group.stderr
diff --git a/src/test/rustdoc-ui/lint-missing-doc-code-example.rs b/tests/rustdoc-ui/lint-missing-doc-code-example.rs
index 40f35728d..40f35728d 100644
--- a/src/test/rustdoc-ui/lint-missing-doc-code-example.rs
+++ b/tests/rustdoc-ui/lint-missing-doc-code-example.rs
diff --git a/src/test/rustdoc-ui/lint-missing-doc-code-example.stderr b/tests/rustdoc-ui/lint-missing-doc-code-example.stderr
index f93312501..f93312501 100644
--- a/src/test/rustdoc-ui/lint-missing-doc-code-example.stderr
+++ b/tests/rustdoc-ui/lint-missing-doc-code-example.stderr
diff --git a/src/test/rustdoc-ui/macro-docs.rs b/tests/rustdoc-ui/macro-docs.rs
index 0e8472eb2..0e8472eb2 100644
--- a/src/test/rustdoc-ui/macro-docs.rs
+++ b/tests/rustdoc-ui/macro-docs.rs
diff --git a/src/test/rustdoc-ui/macro-docs.stderr b/tests/rustdoc-ui/macro-docs.stderr
index 2b136f5be..2b136f5be 100644
--- a/src/test/rustdoc-ui/macro-docs.stderr
+++ b/tests/rustdoc-ui/macro-docs.stderr
diff --git a/src/test/rustdoc-ui/macro-docs.stdout b/tests/rustdoc-ui/macro-docs.stdout
index e69de29bb..e69de29bb 100644
--- a/src/test/rustdoc-ui/macro-docs.stdout
+++ b/tests/rustdoc-ui/macro-docs.stdout
diff --git a/src/test/rustdoc-ui/no-crate-level-doc-lint.rs b/tests/rustdoc-ui/no-crate-level-doc-lint.rs
index a186410ac..a186410ac 100644
--- a/src/test/rustdoc-ui/no-crate-level-doc-lint.rs
+++ b/tests/rustdoc-ui/no-crate-level-doc-lint.rs
diff --git a/src/test/rustdoc-ui/no-crate-level-doc-lint.stderr b/tests/rustdoc-ui/no-crate-level-doc-lint.stderr
index fb3a5e415..fb3a5e415 100644
--- a/src/test/rustdoc-ui/no-crate-level-doc-lint.stderr
+++ b/tests/rustdoc-ui/no-crate-level-doc-lint.stderr
diff --git a/src/test/rustdoc-ui/no-run-flag-error.rs b/tests/rustdoc-ui/no-run-flag-error.rs
index 4ead62148..4ead62148 100644
--- a/src/test/rustdoc-ui/no-run-flag-error.rs
+++ b/tests/rustdoc-ui/no-run-flag-error.rs
diff --git a/src/test/rustdoc-ui/no-run-flag-error.stderr b/tests/rustdoc-ui/no-run-flag-error.stderr
index d032646c3..d032646c3 100644
--- a/src/test/rustdoc-ui/no-run-flag-error.stderr
+++ b/tests/rustdoc-ui/no-run-flag-error.stderr
diff --git a/src/test/rustdoc-ui/no-run-flag.rs b/tests/rustdoc-ui/no-run-flag.rs
index da1672c4a..181730eb4 100644
--- a/src/test/rustdoc-ui/no-run-flag.rs
+++ b/tests/rustdoc-ui/no-run-flag.rs
@@ -2,7 +2,7 @@
 
 // check-pass
 // compile-flags:-Z unstable-options --test --no-run --test-args=--test-threads=1
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 /// ```
diff --git a/src/test/rustdoc-ui/no-run-flag.stdout b/tests/rustdoc-ui/no-run-flag.stdout
index 02f28aaf6..02f28aaf6 100644
--- a/src/test/rustdoc-ui/no-run-flag.stdout
+++ b/tests/rustdoc-ui/no-run-flag.stdout
diff --git a/tests/rustdoc-ui/nocapture-fail.rs b/tests/rustdoc-ui/nocapture-fail.rs
new file mode 100644
index 000000000..9a3fb592c
--- /dev/null
+++ b/tests/rustdoc-ui/nocapture-fail.rs
@@ -0,0 +1,12 @@
+// check-pass
+// compile-flags:--test -Zunstable-options --nocapture
+// normalize-stderr-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
+
+/// ```compile_fail
+/// fn foo() {
+///     Input: 123
+/// }
+/// ```
+pub struct Foo;
diff --git a/src/test/rustdoc-ui/nocapture-fail.stderr b/tests/rustdoc-ui/nocapture-fail.stderr
index b65b622c1..b65b622c1 100644
--- a/src/test/rustdoc-ui/nocapture-fail.stderr
+++ b/tests/rustdoc-ui/nocapture-fail.stderr
diff --git a/src/test/rustdoc-ui/nocapture-fail.stdout b/tests/rustdoc-ui/nocapture-fail.stdout
index 754f77db5..754f77db5 100644
--- a/src/test/rustdoc-ui/nocapture-fail.stdout
+++ b/tests/rustdoc-ui/nocapture-fail.stdout
diff --git a/src/test/rustdoc-ui/nocapture.rs b/tests/rustdoc-ui/nocapture.rs
index 321f5ca08..3eb38f2fb 100644
--- a/src/test/rustdoc-ui/nocapture.rs
+++ b/tests/rustdoc-ui/nocapture.rs
@@ -1,6 +1,6 @@
 // check-pass
 // compile-flags:--test -Zunstable-options --nocapture
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 /// ```
diff --git a/src/test/rustdoc-ui/nocapture.stderr b/tests/rustdoc-ui/nocapture.stderr
index af6415db3..af6415db3 100644
--- a/src/test/rustdoc-ui/nocapture.stderr
+++ b/tests/rustdoc-ui/nocapture.stderr
diff --git a/src/test/rustdoc-ui/nocapture.stdout b/tests/rustdoc-ui/nocapture.stdout
index 4880e75da..4880e75da 100644
--- a/src/test/rustdoc-ui/nocapture.stdout
+++ b/tests/rustdoc-ui/nocapture.stdout
diff --git a/src/test/rustdoc-ui/normalize-cycle.rs b/tests/rustdoc-ui/normalize-cycle.rs
index 1ed9ac6bc..1ed9ac6bc 100644
--- a/src/test/rustdoc-ui/normalize-cycle.rs
+++ b/tests/rustdoc-ui/normalize-cycle.rs
diff --git a/src/test/rustdoc-ui/normalize-overflow.rs b/tests/rustdoc-ui/normalize-overflow.rs
index 3698fe70e..3698fe70e 100644
--- a/src/test/rustdoc-ui/normalize-overflow.rs
+++ b/tests/rustdoc-ui/normalize-overflow.rs
diff --git a/src/test/rustdoc-ui/output-format-html-stable.rs b/tests/rustdoc-ui/output-format-html-stable.rs
index fa0362640..fa0362640 100644
--- a/src/test/rustdoc-ui/output-format-html-stable.rs
+++ b/tests/rustdoc-ui/output-format-html-stable.rs
diff --git a/src/test/rustdoc-ui/private-doc-test.rs b/tests/rustdoc-ui/private-doc-test.rs
index a1f9f8dca..a1f9f8dca 100644
--- a/src/test/rustdoc-ui/private-doc-test.rs
+++ b/tests/rustdoc-ui/private-doc-test.rs
diff --git a/src/test/rustdoc-ui/private-item-doc-test.rs b/tests/rustdoc-ui/private-item-doc-test.rs
index 1a3d6cc63..1a3d6cc63 100644
--- a/src/test/rustdoc-ui/private-item-doc-test.rs
+++ b/tests/rustdoc-ui/private-item-doc-test.rs
diff --git a/src/test/rustdoc-ui/private-item-doc-test.stderr b/tests/rustdoc-ui/private-item-doc-test.stderr
index 5df613298..5df613298 100644
--- a/src/test/rustdoc-ui/private-item-doc-test.stderr
+++ b/tests/rustdoc-ui/private-item-doc-test.stderr
diff --git a/src/test/rustdoc-ui/private-public-item-doc-test.rs b/tests/rustdoc-ui/private-public-item-doc-test.rs
index 7cc62b38c..7cc62b38c 100644
--- a/src/test/rustdoc-ui/private-public-item-doc-test.rs
+++ b/tests/rustdoc-ui/private-public-item-doc-test.rs
diff --git a/src/test/rustdoc-ui/private-public-item-doc-test.stderr b/tests/rustdoc-ui/private-public-item-doc-test.stderr
index f50dbd184..f50dbd184 100644
--- a/src/test/rustdoc-ui/private-public-item-doc-test.stderr
+++ b/tests/rustdoc-ui/private-public-item-doc-test.stderr
diff --git a/src/test/rustdoc-ui/pub-export-lint.rs b/tests/rustdoc-ui/pub-export-lint.rs
index f2e66b77b..f2e66b77b 100644
--- a/src/test/rustdoc-ui/pub-export-lint.rs
+++ b/tests/rustdoc-ui/pub-export-lint.rs
diff --git a/src/test/rustdoc-ui/pub-export-lint.stderr b/tests/rustdoc-ui/pub-export-lint.stderr
index 81ef79961..81ef79961 100644
--- a/src/test/rustdoc-ui/pub-export-lint.stderr
+++ b/tests/rustdoc-ui/pub-export-lint.stderr
diff --git a/src/test/rustdoc-ui/public-reexported-item-doc-test.rs b/tests/rustdoc-ui/public-reexported-item-doc-test.rs
index b86a53305..b86a53305 100644
--- a/src/test/rustdoc-ui/public-reexported-item-doc-test.rs
+++ b/tests/rustdoc-ui/public-reexported-item-doc-test.rs
diff --git a/src/test/rustdoc-ui/range-pattern.rs b/tests/rustdoc-ui/range-pattern.rs
index fd255d02f..fd255d02f 100644
--- a/src/test/rustdoc-ui/range-pattern.rs
+++ b/tests/rustdoc-ui/range-pattern.rs
diff --git a/src/test/rustdoc-ui/recursive-deref-ice.rs b/tests/rustdoc-ui/recursive-deref-ice.rs
index c44fd27f4..c44fd27f4 100644
--- a/src/test/rustdoc-ui/recursive-deref-ice.rs
+++ b/tests/rustdoc-ui/recursive-deref-ice.rs
diff --git a/src/test/rustdoc-ui/reference-link-reports-error-once.rs b/tests/rustdoc-ui/reference-link-reports-error-once.rs
index 71bd2c522..71bd2c522 100644
--- a/src/test/rustdoc-ui/reference-link-reports-error-once.rs
+++ b/tests/rustdoc-ui/reference-link-reports-error-once.rs
diff --git a/src/test/rustdoc-ui/reference-link-reports-error-once.stderr b/tests/rustdoc-ui/reference-link-reports-error-once.stderr
index 2ab67090f..2ab67090f 100644
--- a/src/test/rustdoc-ui/reference-link-reports-error-once.stderr
+++ b/tests/rustdoc-ui/reference-link-reports-error-once.stderr
diff --git a/src/test/rustdoc-ui/reference-links.rs b/tests/rustdoc-ui/reference-links.rs
index e81e03446..e81e03446 100644
--- a/src/test/rustdoc-ui/reference-links.rs
+++ b/tests/rustdoc-ui/reference-links.rs
diff --git a/src/test/rustdoc-ui/reference-links.stderr b/tests/rustdoc-ui/reference-links.stderr
index c98a2fd7c..c98a2fd7c 100644
--- a/src/test/rustdoc-ui/reference-links.stderr
+++ b/tests/rustdoc-ui/reference-links.stderr
diff --git a/src/test/rustdoc-ui/renamed-lint-still-applies.rs b/tests/rustdoc-ui/renamed-lint-still-applies.rs
index a4d3a4b49..a4d3a4b49 100644
--- a/src/test/rustdoc-ui/renamed-lint-still-applies.rs
+++ b/tests/rustdoc-ui/renamed-lint-still-applies.rs
diff --git a/src/test/rustdoc-ui/renamed-lint-still-applies.stderr b/tests/rustdoc-ui/renamed-lint-still-applies.stderr
index ee9b67cb9..ee9b67cb9 100644
--- a/src/test/rustdoc-ui/renamed-lint-still-applies.stderr
+++ b/tests/rustdoc-ui/renamed-lint-still-applies.stderr
diff --git a/src/test/rustdoc-ui/run-directory.correct.stdout b/tests/rustdoc-ui/run-directory.correct.stdout
index e9b275479..e9b275479 100644
--- a/src/test/rustdoc-ui/run-directory.correct.stdout
+++ b/tests/rustdoc-ui/run-directory.correct.stdout
diff --git a/src/test/rustdoc-ui/run-directory.incorrect.stdout b/tests/rustdoc-ui/run-directory.incorrect.stdout
index 97a5dbc5c..97a5dbc5c 100644
--- a/src/test/rustdoc-ui/run-directory.incorrect.stdout
+++ b/tests/rustdoc-ui/run-directory.incorrect.stdout
diff --git a/src/test/rustdoc-ui/run-directory.rs b/tests/rustdoc-ui/run-directory.rs
index 0d432c1e6..bbceaaf82 100644
--- a/src/test/rustdoc-ui/run-directory.rs
+++ b/tests/rustdoc-ui/run-directory.rs
@@ -4,7 +4,7 @@
 // check-pass
 // [correct]compile-flags:--test --test-run-directory={{src-base}} -Zunstable-options
 // [incorrect]compile-flags:--test --test-run-directory={{src-base}}/coverage -Zunstable-options
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 /// ```
diff --git a/src/test/rustdoc-ui/rustc-check-passes.rs b/tests/rustdoc-ui/rustc-check-passes.rs
index 56d59164d..56d59164d 100644
--- a/src/test/rustdoc-ui/rustc-check-passes.rs
+++ b/tests/rustdoc-ui/rustc-check-passes.rs
diff --git a/src/test/rustdoc-ui/rustc-check-passes.stderr b/tests/rustdoc-ui/rustc-check-passes.stderr
index 83f4e87c6..83f4e87c6 100644
--- a/src/test/rustdoc-ui/rustc-check-passes.stderr
+++ b/tests/rustdoc-ui/rustc-check-passes.stderr
diff --git a/src/test/rustdoc-ui/scrape-examples-fail-if-type-error.rs b/tests/rustdoc-ui/scrape-examples-fail-if-type-error.rs
index 8f4fde96d..8f4fde96d 100644
--- a/src/test/rustdoc-ui/scrape-examples-fail-if-type-error.rs
+++ b/tests/rustdoc-ui/scrape-examples-fail-if-type-error.rs
diff --git a/src/test/rustdoc-ui/scrape-examples-fail-if-type-error.stderr b/tests/rustdoc-ui/scrape-examples-fail-if-type-error.stderr
index 750aa3207..750aa3207 100644
--- a/src/test/rustdoc-ui/scrape-examples-fail-if-type-error.stderr
+++ b/tests/rustdoc-ui/scrape-examples-fail-if-type-error.stderr
diff --git a/src/test/rustdoc-ui/scrape-examples-ice.rs b/tests/rustdoc-ui/scrape-examples-ice.rs
index d629b62a7..d629b62a7 100644
--- a/src/test/rustdoc-ui/scrape-examples-ice.rs
+++ b/tests/rustdoc-ui/scrape-examples-ice.rs
diff --git a/src/test/rustdoc-ui/scrape-examples-wrong-options-1.rs b/tests/rustdoc-ui/scrape-examples-wrong-options-1.rs
index a1f005c32..a1f005c32 100644
--- a/src/test/rustdoc-ui/scrape-examples-wrong-options-1.rs
+++ b/tests/rustdoc-ui/scrape-examples-wrong-options-1.rs
diff --git a/src/test/rustdoc-ui/scrape-examples-wrong-options-1.stderr b/tests/rustdoc-ui/scrape-examples-wrong-options-1.stderr
index eb8e9f799..eb8e9f799 100644
--- a/src/test/rustdoc-ui/scrape-examples-wrong-options-1.stderr
+++ b/tests/rustdoc-ui/scrape-examples-wrong-options-1.stderr
diff --git a/src/test/rustdoc-ui/scrape-examples-wrong-options-2.rs b/tests/rustdoc-ui/scrape-examples-wrong-options-2.rs
index 4aacec7f0..4aacec7f0 100644
--- a/src/test/rustdoc-ui/scrape-examples-wrong-options-2.rs
+++ b/tests/rustdoc-ui/scrape-examples-wrong-options-2.rs
diff --git a/src/test/rustdoc-ui/scrape-examples-wrong-options-2.stderr b/tests/rustdoc-ui/scrape-examples-wrong-options-2.stderr
index eb8e9f799..eb8e9f799 100644
--- a/src/test/rustdoc-ui/scrape-examples-wrong-options-2.stderr
+++ b/tests/rustdoc-ui/scrape-examples-wrong-options-2.stderr
diff --git a/src/test/rustdoc-ui/search-index-generics-recursion-bug-issue-59502.rs b/tests/rustdoc-ui/search-index-generics-recursion-bug-issue-59502.rs
index ce51556dd..ce51556dd 100644
--- a/src/test/rustdoc-ui/search-index-generics-recursion-bug-issue-59502.rs
+++ b/tests/rustdoc-ui/search-index-generics-recursion-bug-issue-59502.rs
diff --git a/src/test/rustdoc-ui/suggestions/html-as-generics-no-suggestions.rs b/tests/rustdoc-ui/suggestions/html-as-generics-no-suggestions.rs
index 476e3b2d4..476e3b2d4 100644
--- a/src/test/rustdoc-ui/suggestions/html-as-generics-no-suggestions.rs
+++ b/tests/rustdoc-ui/suggestions/html-as-generics-no-suggestions.rs
diff --git a/src/test/rustdoc-ui/suggestions/html-as-generics-no-suggestions.stderr b/tests/rustdoc-ui/suggestions/html-as-generics-no-suggestions.stderr
index 3856a2513..3856a2513 100644
--- a/src/test/rustdoc-ui/suggestions/html-as-generics-no-suggestions.stderr
+++ b/tests/rustdoc-ui/suggestions/html-as-generics-no-suggestions.stderr
diff --git a/src/test/rustdoc-ui/suggestions/html-as-generics.fixed b/tests/rustdoc-ui/suggestions/html-as-generics.fixed
index 003542d38..003542d38 100644
--- a/src/test/rustdoc-ui/suggestions/html-as-generics.fixed
+++ b/tests/rustdoc-ui/suggestions/html-as-generics.fixed
diff --git a/src/test/rustdoc-ui/suggestions/html-as-generics.rs b/tests/rustdoc-ui/suggestions/html-as-generics.rs
index 4254a660b..4254a660b 100644
--- a/src/test/rustdoc-ui/suggestions/html-as-generics.rs
+++ b/tests/rustdoc-ui/suggestions/html-as-generics.rs
diff --git a/src/test/rustdoc-ui/suggestions/html-as-generics.stderr b/tests/rustdoc-ui/suggestions/html-as-generics.stderr
index 481278bda..481278bda 100644
--- a/src/test/rustdoc-ui/suggestions/html-as-generics.stderr
+++ b/tests/rustdoc-ui/suggestions/html-as-generics.stderr
diff --git a/src/test/rustdoc-ui/test-compile-fail1.rs b/tests/rustdoc-ui/test-compile-fail1.rs
index a05390238..a05390238 100644
--- a/src/test/rustdoc-ui/test-compile-fail1.rs
+++ b/tests/rustdoc-ui/test-compile-fail1.rs
diff --git a/src/test/rustdoc-ui/test-compile-fail1.stderr b/tests/rustdoc-ui/test-compile-fail1.stderr
index 72915e46b..72915e46b 100644
--- a/src/test/rustdoc-ui/test-compile-fail1.stderr
+++ b/tests/rustdoc-ui/test-compile-fail1.stderr
diff --git a/src/test/rustdoc-ui/test-compile-fail2.rs b/tests/rustdoc-ui/test-compile-fail2.rs
index 651ded0a0..651ded0a0 100644
--- a/src/test/rustdoc-ui/test-compile-fail2.rs
+++ b/tests/rustdoc-ui/test-compile-fail2.rs
diff --git a/src/test/rustdoc-ui/test-compile-fail2.stderr b/tests/rustdoc-ui/test-compile-fail2.stderr
index cee5b63cf..cee5b63cf 100644
--- a/src/test/rustdoc-ui/test-compile-fail2.stderr
+++ b/tests/rustdoc-ui/test-compile-fail2.stderr
diff --git a/src/test/rustdoc-ui/test-compile-fail3.rs b/tests/rustdoc-ui/test-compile-fail3.rs
index faa30ad83..faa30ad83 100644
--- a/src/test/rustdoc-ui/test-compile-fail3.rs
+++ b/tests/rustdoc-ui/test-compile-fail3.rs
diff --git a/src/test/rustdoc-ui/test-compile-fail3.stderr b/tests/rustdoc-ui/test-compile-fail3.stderr
index fab801b3b..fab801b3b 100644
--- a/src/test/rustdoc-ui/test-compile-fail3.stderr
+++ b/tests/rustdoc-ui/test-compile-fail3.stderr
diff --git a/src/test/rustdoc-ui/test-no_std.rs b/tests/rustdoc-ui/test-no_std.rs
index ee919985e..51abf1c72 100644
--- a/src/test/rustdoc-ui/test-no_std.rs
+++ b/tests/rustdoc-ui/test-no_std.rs
@@ -1,5 +1,5 @@
 // compile-flags:--test
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // check-pass
 
diff --git a/src/test/rustdoc-ui/test-no_std.stdout b/tests/rustdoc-ui/test-no_std.stdout
index 8d5a30804..8d5a30804 100644
--- a/src/test/rustdoc-ui/test-no_std.stdout
+++ b/tests/rustdoc-ui/test-no_std.stdout
diff --git a/src/test/rustdoc-ui/test-type.rs b/tests/rustdoc-ui/test-type.rs
index 882da5c25..7f5a8f3fc 100644
--- a/src/test/rustdoc-ui/test-type.rs
+++ b/tests/rustdoc-ui/test-type.rs
@@ -1,6 +1,6 @@
 // compile-flags: --test --test-args=--test-threads=1
 // check-pass
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 /// ```
diff --git a/src/test/rustdoc-ui/test-type.stdout b/tests/rustdoc-ui/test-type.stdout
index a66fd240d..a66fd240d 100644
--- a/src/test/rustdoc-ui/test-type.stdout
+++ b/tests/rustdoc-ui/test-type.stdout
diff --git a/src/test/rustdoc-ui/track-diagnostics.rs b/tests/rustdoc-ui/track-diagnostics.rs
index fcc50a7ab..fcc50a7ab 100644
--- a/src/test/rustdoc-ui/track-diagnostics.rs
+++ b/tests/rustdoc-ui/track-diagnostics.rs
diff --git a/src/test/rustdoc-ui/track-diagnostics.stderr b/tests/rustdoc-ui/track-diagnostics.stderr
index ec3031862..ec3031862 100644
--- a/src/test/rustdoc-ui/track-diagnostics.stderr
+++ b/tests/rustdoc-ui/track-diagnostics.stderr
diff --git a/src/test/rustdoc-ui/tuple-variadic-check.rs b/tests/rustdoc-ui/tuple-variadic-check.rs
index 505de5348..505de5348 100644
--- a/src/test/rustdoc-ui/tuple-variadic-check.rs
+++ b/tests/rustdoc-ui/tuple-variadic-check.rs
diff --git a/src/test/rustdoc-ui/tuple-variadic-check.stderr b/tests/rustdoc-ui/tuple-variadic-check.stderr
index d127fb858..d127fb858 100644
--- a/src/test/rustdoc-ui/tuple-variadic-check.stderr
+++ b/tests/rustdoc-ui/tuple-variadic-check.stderr
diff --git a/tests/rustdoc-ui/unable-fulfill-trait.rs b/tests/rustdoc-ui/unable-fulfill-trait.rs
new file mode 100644
index 000000000..703570822
--- /dev/null
+++ b/tests/rustdoc-ui/unable-fulfill-trait.rs
@@ -0,0 +1,13 @@
+// This test ensures that it's not crashing rustdoc.
+
+pub struct Foo<'a, 'b, T> {
+    field1: dyn Bar<'a, 'b,>,
+    //~^ ERROR
+    //~^^ ERROR
+}
+
+pub trait Bar<'x, 's, U>
+    where U: 'x,
+    Self:'x,
+    Self:'s
+{}
diff --git a/tests/rustdoc-ui/unable-fulfill-trait.stderr b/tests/rustdoc-ui/unable-fulfill-trait.stderr
new file mode 100644
index 000000000..a16b5b6eb
--- /dev/null
+++ b/tests/rustdoc-ui/unable-fulfill-trait.stderr
@@ -0,0 +1,26 @@
+error[E0107]: this trait takes 1 generic argument but 0 generic arguments were supplied
+  --> $DIR/unable-fulfill-trait.rs:4:17
+   |
+LL |     field1: dyn Bar<'a, 'b,>,
+   |                 ^^^ expected 1 generic argument
+   |
+note: trait defined here, with 1 generic parameter: `U`
+  --> $DIR/unable-fulfill-trait.rs:9:11
+   |
+LL | pub trait Bar<'x, 's, U>
+   |           ^^^         -
+help: add missing generic argument
+   |
+LL |     field1: dyn Bar<'a, 'b, U,>,
+   |                           +++
+
+error[E0227]: ambiguous lifetime bound, explicit lifetime bound required
+  --> $DIR/unable-fulfill-trait.rs:4:13
+   |
+LL |     field1: dyn Bar<'a, 'b,>,
+   |             ^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0107, E0227.
+For more information about an error, try `rustc --explain E0107`.
diff --git a/src/test/rustdoc-ui/unknown-renamed-lints.rs b/tests/rustdoc-ui/unknown-renamed-lints.rs
index ddf03dd07..ddf03dd07 100644
--- a/src/test/rustdoc-ui/unknown-renamed-lints.rs
+++ b/tests/rustdoc-ui/unknown-renamed-lints.rs
diff --git a/src/test/rustdoc-ui/unknown-renamed-lints.stderr b/tests/rustdoc-ui/unknown-renamed-lints.stderr
index b105f47d7..b105f47d7 100644
--- a/src/test/rustdoc-ui/unknown-renamed-lints.stderr
+++ b/tests/rustdoc-ui/unknown-renamed-lints.stderr
diff --git a/src/test/rustdoc-ui/unparseable-doc-test.rs b/tests/rustdoc-ui/unparseable-doc-test.rs
index 0cff8cd9a..f0a56a91b 100644
--- a/src/test/rustdoc-ui/unparseable-doc-test.rs
+++ b/tests/rustdoc-ui/unparseable-doc-test.rs
@@ -1,5 +1,5 @@
 // compile-flags: --test
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 // rustc-env: RUST_BACKTRACE=0
diff --git a/src/test/rustdoc-ui/unparseable-doc-test.stdout b/tests/rustdoc-ui/unparseable-doc-test.stdout
index 2641c66f2..2641c66f2 100644
--- a/src/test/rustdoc-ui/unparseable-doc-test.stdout
+++ b/tests/rustdoc-ui/unparseable-doc-test.stdout
diff --git a/src/test/rustdoc-ui/unused-braces-lint.rs b/tests/rustdoc-ui/unused-braces-lint.rs
index be0e31e4b..be0e31e4b 100644
--- a/src/test/rustdoc-ui/unused-braces-lint.rs
+++ b/tests/rustdoc-ui/unused-braces-lint.rs
diff --git a/src/test/rustdoc-ui/unused-extern-crate.rs b/tests/rustdoc-ui/unused-extern-crate.rs
index f703a1837..f703a1837 100644
--- a/src/test/rustdoc-ui/unused-extern-crate.rs
+++ b/tests/rustdoc-ui/unused-extern-crate.rs
diff --git a/src/test/rustdoc-ui/unused.rs b/tests/rustdoc-ui/unused.rs
index 702b24c36..702b24c36 100644
--- a/src/test/rustdoc-ui/unused.rs
+++ b/tests/rustdoc-ui/unused.rs
diff --git a/src/test/rustdoc-ui/use_both_out_dir_and_output_options.rs b/tests/rustdoc-ui/use_both_out_dir_and_output_options.rs
index 5037043f1..5037043f1 100644
--- a/src/test/rustdoc-ui/use_both_out_dir_and_output_options.rs
+++ b/tests/rustdoc-ui/use_both_out_dir_and_output_options.rs
diff --git a/src/test/rustdoc-ui/use_both_out_dir_and_output_options.stderr b/tests/rustdoc-ui/use_both_out_dir_and_output_options.stderr
index 96d2295ac..96d2295ac 100644
--- a/src/test/rustdoc-ui/use_both_out_dir_and_output_options.stderr
+++ b/tests/rustdoc-ui/use_both_out_dir_and_output_options.stderr
diff --git a/src/test/rustdoc-ui/wasm-safe.rs b/tests/rustdoc-ui/wasm-safe.rs
index ba971342b..ba971342b 100644
--- a/src/test/rustdoc-ui/wasm-safe.rs
+++ b/tests/rustdoc-ui/wasm-safe.rs
diff --git a/src/test/rustdoc-ui/z-help.rs b/tests/rustdoc-ui/z-help.rs
index c7cf841b9..c7cf841b9 100644
--- a/src/test/rustdoc-ui/z-help.rs
+++ b/tests/rustdoc-ui/z-help.rs
diff --git a/src/test/rustdoc-ui/z-help.stdout b/tests/rustdoc-ui/z-help.stdout
index 94cf7b942..4bdecdc1b 100644
--- a/src/test/rustdoc-ui/z-help.stdout
+++ b/tests/rustdoc-ui/z-help.stdout
@@ -1,4 +1,4 @@
-    -Z                          allow-features=val -- only allow the listed language features to be enabled in code (space separated)
+    -Z                          allow-features=val -- only allow the listed language features to be enabled in code (comma separated)
     -Z                       always-encode-mir=val -- encode MIR of all functions into the crate metadata (default: no)
     -Z                            asm-comments=val -- generate comments into the assembly (may change behavior) (default: no)
     -Z                       assert-incr-state=val -- assert that the incremental cache is in given state: either `loaded` or `not-loaded`.
@@ -8,7 +8,6 @@
     -Z                       branch-protection=val -- set options for branch target identification and pointer authentication on AArch64
     -Z                           cf-protection=val -- instrument control-flow architecture protection
     -Z               cgu-partitioning-strategy=val -- the codegen unit partitioning strategy to use
-    -Z                                   chalk=val -- enable the experimental Chalk-based trait solving engine
     -Z                         codegen-backend=val -- the backend to use
     -Z                             combine-cgu=val -- combine CGUs into a single one
     -Z                              crate-attr=val -- inject the given attribute in the crate
@@ -35,6 +34,8 @@
     -Z            dump-mir-exclude-pass-number=val -- exclude the pass number when dumping MIR (used in tests) (default: no)
     -Z                       dump-mir-graphviz=val -- in addition to `.mir` files, create graphviz `.dot` files (and with `-Z instrument-coverage`, also create a `.dot` file for the MIR-derived coverage graph) (default: no)
     -Z                       dump-mir-spanview=val -- in addition to `.mir` files, create `.html` files to view spans for all `statement`s (including terminators), only `terminator` spans, or computed `block` spans (one span encompassing a block's terminator and all statements). If `-Z instrument-coverage` is also enabled, create an additional `.html` file showing the computed coverage spans.
+    -Z                         dump-mono-stats=val -- output statistics about monomorphization collection
+    -Z                  dump-mono-stats-format=val -- the format to use for -Z dump-mono-stats (`markdown` (default) or `json`)
     -Z                           dwarf-version=val -- version of DWARF debug information to emit (default: 2 or 4, depending on platform)
     -Z                               dylib-lto=val -- enables LTO for dylib crate type
     -Z                        emit-stack-sizes=val -- emit a section containing stack size metadata (default: no)
@@ -75,6 +76,7 @@
     -Z                            llvm-plugins=val -- a list LLVM plugins to enable (space separated)
     -Z                         llvm-time-trace=val -- generate JSON tracing data file from LLVM data (default: no)
     -Z                         location-detail=val -- what location details should be tracked when using caller_location, either `none`, or a comma separated list of location details, for which valid options are `file`, `line`, and `column` (default: `file,line,column`)
+    -Z                           log-backtrace=val -- add a backtrace along with logging
     -Z                                      ls=val -- list the symbols defined by a library crate (default: no)
     -Z                         macro-backtrace=val -- show macro backtraces (default: no)
     -Z             maximal-hir-to-mir-coverage=val -- save as much information as possible about the correspondence between MIR and HIR as source scopes (default: no)
@@ -91,6 +93,7 @@
     -Z                             no-analysis=val -- parse and expand the source, but run no analysis
     -Z                              no-codegen=val -- run all passes except codegen; no output
     -Z              no-generate-arange-section=val -- omit DWARF address ranges that give faster lookups
+    -Z                          no-jump-tables=val -- disable the jump tables and lookup tables that can be generated from a switch case lowering
     -Z                           no-leak-check=val -- disable the 'leak check' for subtyping; unsound, but useful for tests
     -Z                                 no-link=val -- compile without linking
     -Z                        no-parallel-llvm=val -- run LLVM in non-parallel mode (while keeping codegen-units and ThinLTO)
@@ -172,6 +175,7 @@
     -Z                               tls-model=val -- choose the TLS model to use (`rustc --print tls-models` for details)
     -Z                            trace-macros=val -- for every macro invocation, print its name and arguments (default: no)
     -Z                       track-diagnostics=val -- tracks where in rustc a diagnostic was emitted
+    -Z                            trait-solver=val -- specify the trait solver mode used by rustc (default: classic)
     -Z                translate-additional-ftl=val -- additional fluent translation to preferentially use (for testing translation)
     -Z        translate-directionality-markers=val -- emit directionality isolation markers in translated diagnostics
     -Z                          translate-lang=val -- language identifier for diagnostic output
diff --git a/src/test/rustdoc/all.rs b/tests/rustdoc/all.rs
index 4c8d02310..4c8d02310 100644
--- a/src/test/rustdoc/all.rs
+++ b/tests/rustdoc/all.rs
diff --git a/src/test/rustdoc/anchors.no_const_anchor.html b/tests/rustdoc/anchors.no_const_anchor.html
index 75e67330a..75e67330a 100644
--- a/src/test/rustdoc/anchors.no_const_anchor.html
+++ b/tests/rustdoc/anchors.no_const_anchor.html
diff --git a/src/test/rustdoc/anchors.no_const_anchor2.html b/tests/rustdoc/anchors.no_const_anchor2.html
index c00251976..c00251976 100644
--- a/src/test/rustdoc/anchors.no_const_anchor2.html
+++ b/tests/rustdoc/anchors.no_const_anchor2.html
diff --git a/src/test/rustdoc/anchors.no_method_anchor.html b/tests/rustdoc/anchors.no_method_anchor.html
index b9ec8bf4c..b9ec8bf4c 100644
--- a/src/test/rustdoc/anchors.no_method_anchor.html
+++ b/tests/rustdoc/anchors.no_method_anchor.html
diff --git a/src/test/rustdoc/anchors.no_trait_method_anchor.html b/tests/rustdoc/anchors.no_trait_method_anchor.html
index 4308ddad4..4308ddad4 100644
--- a/src/test/rustdoc/anchors.no_trait_method_anchor.html
+++ b/tests/rustdoc/anchors.no_trait_method_anchor.html
diff --git a/src/test/rustdoc/anchors.no_tymethod_anchor.html b/tests/rustdoc/anchors.no_tymethod_anchor.html
index 91eed8a37..91eed8a37 100644
--- a/src/test/rustdoc/anchors.no_tymethod_anchor.html
+++ b/tests/rustdoc/anchors.no_tymethod_anchor.html
diff --git a/src/test/rustdoc/anchors.no_type_anchor.html b/tests/rustdoc/anchors.no_type_anchor.html
index 2c66d5aa3..2c66d5aa3 100644
--- a/src/test/rustdoc/anchors.no_type_anchor.html
+++ b/tests/rustdoc/anchors.no_type_anchor.html
diff --git a/src/test/rustdoc/anchors.no_type_anchor2.html b/tests/rustdoc/anchors.no_type_anchor2.html
index 72a1186bf..72a1186bf 100644
--- a/src/test/rustdoc/anchors.no_type_anchor2.html
+++ b/tests/rustdoc/anchors.no_type_anchor2.html
diff --git a/src/test/rustdoc/anchors.rs b/tests/rustdoc/anchors.rs
index 034cf8eaf..034cf8eaf 100644
--- a/src/test/rustdoc/anchors.rs
+++ b/tests/rustdoc/anchors.rs
diff --git a/src/test/rustdoc/anonymous-lifetime.rs b/tests/rustdoc/anonymous-lifetime.rs
index 390ed5a1f..390ed5a1f 100644
--- a/src/test/rustdoc/anonymous-lifetime.rs
+++ b/tests/rustdoc/anonymous-lifetime.rs
diff --git a/src/test/rustdoc/anonymous-reexport.rs b/tests/rustdoc/anonymous-reexport.rs
index 6b884ff14..6b884ff14 100644
--- a/src/test/rustdoc/anonymous-reexport.rs
+++ b/tests/rustdoc/anonymous-reexport.rs
diff --git a/src/test/rustdoc/array-links.link_box_generic.html b/tests/rustdoc/array-links.link_box_generic.html
index 3481bb6a0..3481bb6a0 100644
--- a/src/test/rustdoc/array-links.link_box_generic.html
+++ b/tests/rustdoc/array-links.link_box_generic.html
diff --git a/src/test/rustdoc/array-links.link_box_u32.html b/tests/rustdoc/array-links.link_box_u32.html
index e864ae55c..e864ae55c 100644
--- a/src/test/rustdoc/array-links.link_box_u32.html
+++ b/tests/rustdoc/array-links.link_box_u32.html
diff --git a/src/test/rustdoc/array-links.link_slice_generic.html b/tests/rustdoc/array-links.link_slice_generic.html
index f1ca2f59b..f1ca2f59b 100644
--- a/src/test/rustdoc/array-links.link_slice_generic.html
+++ b/tests/rustdoc/array-links.link_slice_generic.html
diff --git a/src/test/rustdoc/array-links.link_slice_u32.html b/tests/rustdoc/array-links.link_slice_u32.html
index c3943e8d3..c3943e8d3 100644
--- a/src/test/rustdoc/array-links.link_slice_u32.html
+++ b/tests/rustdoc/array-links.link_slice_u32.html
diff --git a/tests/rustdoc/array-links.rs b/tests/rustdoc/array-links.rs
new file mode 100644
index 000000000..e7c0ee2de
--- /dev/null
+++ b/tests/rustdoc/array-links.rs
@@ -0,0 +1,28 @@
+#![crate_name = "foo"]
+#![no_std]
+
+pub struct MyBox<T: ?Sized>(*const T);
+
+// @has 'foo/fn.alpha.html'
+// @snapshot link_slice_u32 - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn alpha() -> &'static [u32; 1] {
+    loop {}
+}
+
+// @has 'foo/fn.beta.html'
+// @snapshot link_slice_generic - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn beta<T>() -> &'static [T; 1] {
+    loop {}
+}
+
+// @has 'foo/fn.gamma.html'
+// @snapshot link_box_u32 - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn gamma() -> MyBox<[u32; 1]> {
+    loop {}
+}
+
+// @has 'foo/fn.delta.html'
+// @snapshot link_box_generic - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn delta<T>() -> MyBox<[T; 1]> {
+    loop {}
+}
diff --git a/src/test/rustdoc/asm-foreign.rs b/tests/rustdoc/asm-foreign.rs
index d7550ca5a..d7550ca5a 100644
--- a/src/test/rustdoc/asm-foreign.rs
+++ b/tests/rustdoc/asm-foreign.rs
diff --git a/src/test/rustdoc/asm-foreign2.rs b/tests/rustdoc/asm-foreign2.rs
index 87306901e..87306901e 100644
--- a/src/test/rustdoc/asm-foreign2.rs
+++ b/tests/rustdoc/asm-foreign2.rs
diff --git a/src/test/rustdoc/assoc-consts-version.rs b/tests/rustdoc/assoc-consts-version.rs
index 6060bc0a6..6060bc0a6 100644
--- a/src/test/rustdoc/assoc-consts-version.rs
+++ b/tests/rustdoc/assoc-consts-version.rs
diff --git a/src/test/rustdoc/assoc-consts.rs b/tests/rustdoc/assoc-consts.rs
index 3da19a13e..77b139b64 100644
--- a/src/test/rustdoc/assoc-consts.rs
+++ b/tests/rustdoc/assoc-consts.rs
@@ -1,5 +1,5 @@
 pub trait Foo {
-    // @has assoc_consts/trait.Foo.html '//*[@class="rust trait"]' \
+    // @has assoc_consts/trait.Foo.html '//div[@class="item-decl"]/pre[@class="rust"]' \
     //      'const FOO: usize = 13usize;'
     // @has - '//*[@id="associatedconstant.FOO"]' 'const FOO: usize'
     const FOO: usize = 12 + 1;
diff --git a/tests/rustdoc/assoc-item-cast.rs b/tests/rustdoc/assoc-item-cast.rs
new file mode 100644
index 000000000..ab9702a24
--- /dev/null
+++ b/tests/rustdoc/assoc-item-cast.rs
@@ -0,0 +1,14 @@
+#![crate_name = "foo"]
+
+pub trait Expression {
+    type SqlType;
+}
+
+pub trait AsExpression<T> {
+    type Expression: Expression<SqlType = T>;
+    fn as_expression(self) -> Self::Expression;
+}
+
+// @has foo/type.AsExprOf.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'type AsExprOf<Item, Type> = <Item as AsExpression<Type>>::Expression;'
+pub type AsExprOf<Item, Type> = <Item as AsExpression<Type>>::Expression;
diff --git a/tests/rustdoc/assoc-types.rs b/tests/rustdoc/assoc-types.rs
new file mode 100644
index 000000000..de36c8ffe
--- /dev/null
+++ b/tests/rustdoc/assoc-types.rs
@@ -0,0 +1,37 @@
+#![crate_type="lib"]
+
+// @has assoc_types/trait.Index.html
+pub trait Index<I: ?Sized> {
+    // @has - '//*[@id="associatedtype.Output"]//h4[@class="code-header"]' 'type Output: ?Sized'
+    type Output: ?Sized;
+    // @has - '//*[@id="tymethod.index"]//h4[@class="code-header"]' \
+    //      "fn index<'a>(&'a self, index: I) -> &'a Self::Output"
+    // @has - '//*[@id="tymethod.index"]//h4[@class="code-header"]//a[@href="trait.Index.html#associatedtype.Output"]' \
+    //      "Output"
+    fn index<'a>(&'a self, index: I) -> &'a Self::Output;
+}
+
+// @has assoc_types/fn.use_output.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' '-> &T::Output'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]//a[@href="trait.Index.html#associatedtype.Output"]' 'Output'
+pub fn use_output<T: Index<usize>>(obj: &T, index: usize) -> &T::Output {
+    obj.index(index)
+}
+
+pub trait Feed {
+    type Input;
+}
+
+// @has assoc_types/fn.use_input.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'T::Input'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]//a[@href="trait.Feed.html#associatedtype.Input"]' 'Input'
+pub fn use_input<T: Feed>(_feed: &T, _element: T::Input) { }
+
+// @has assoc_types/fn.cmp_input.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'where T::Input: PartialEq<U::Input>'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]//a[@href="trait.Feed.html#associatedtype.Input"]' 'Input'
+pub fn cmp_input<T: Feed, U: Feed>(a: &T::Input, b: &U::Input) -> bool
+    where T::Input: PartialEq<U::Input>
+{
+    a == b
+}
diff --git a/src/test/rustdoc/associated-consts.rs b/tests/rustdoc/associated-consts.rs
index adb155bb5..adb155bb5 100644
--- a/src/test/rustdoc/associated-consts.rs
+++ b/tests/rustdoc/associated-consts.rs
diff --git a/tests/rustdoc/async-fn.rs b/tests/rustdoc/async-fn.rs
new file mode 100644
index 000000000..fb7ebb5f8
--- /dev/null
+++ b/tests/rustdoc/async-fn.rs
@@ -0,0 +1,95 @@
+// edition:2018
+// @has async_fn/fn.foo.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn foo() -> Option<Foo>'
+pub async fn foo() -> Option<Foo> {
+    None
+}
+
+// @has async_fn/fn.bar.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn bar(a: i32, b: i32) -> i32'
+pub async fn bar(a: i32, b: i32) -> i32 {
+    0
+}
+
+// @has async_fn/fn.baz.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn baz<T>(a: T) -> T'
+pub async fn baz<T>(a: T) -> T {
+    a
+}
+
+// @has async_fn/fn.qux.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async unsafe fn qux() -> char'
+pub async unsafe fn qux() -> char {
+    '⚠'
+}
+
+// @has async_fn/fn.mut_args.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn mut_args(a: usize)'
+pub async fn mut_args(mut a: usize) {}
+
+// @has async_fn/fn.mut_ref.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn mut_ref(x: i32)'
+pub async fn mut_ref(ref mut x: i32) {}
+
+trait Bar {}
+
+impl Bar for () {}
+
+// @has async_fn/fn.quux.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn quux() -> impl Bar'
+pub async fn quux() -> impl Bar {
+    ()
+}
+
+// @has async_fn/struct.Foo.html
+// @matches - '//h4[@class="code-header"]' 'pub async fn f\(\)$'
+// @matches - '//h4[@class="code-header"]' 'pub async unsafe fn g\(\)$'
+// @matches - '//h4[@class="code-header"]' 'pub async fn mut_self\(self, first: usize\)$'
+pub struct Foo;
+
+impl Foo {
+    pub async fn f() {}
+    pub async unsafe fn g() {}
+    pub async fn mut_self(mut self, mut first: usize) {}
+}
+
+pub trait Pattern<'a> {}
+
+pub trait Trait<const N: usize> {}
+// @has async_fn/fn.const_generics.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn const_generics<const N: usize>(_: impl Trait<N>)'
+pub async fn const_generics<const N: usize>(_: impl Trait<N>) {}
+
+// test that elided lifetimes are properly elided and not displayed as `'_`
+// regression test for #63037
+// @has async_fn/fn.elided.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn elided(foo: &str) -> &str'
+pub async fn elided(foo: &str) -> &str {}
+// This should really be shown as written, but for implementation reasons it's difficult.
+// See `impl Clean for TyKind::Ref`.
+// @has async_fn/fn.user_elided.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn user_elided(foo: &str) -> &str'
+pub async fn user_elided(foo: &'_ str) -> &str {}
+// @has async_fn/fn.static_trait.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub async fn static_trait(foo: &str) -> Box<dyn Bar>'
+pub async fn static_trait(foo: &str) -> Box<dyn Bar> {}
+// @has async_fn/fn.lifetime_for_trait.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "pub async fn lifetime_for_trait(foo: &str) -> Box<dyn Bar + '_>"
+pub async fn lifetime_for_trait(foo: &str) -> Box<dyn Bar + '_> {}
+// @has async_fn/fn.elided_in_input_trait.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "pub async fn elided_in_input_trait(t: impl Pattern<'_>)"
+pub async fn elided_in_input_trait(t: impl Pattern<'_>) {}
+
+struct AsyncFdReadyGuard<'a, T> { x: &'a T }
+
+impl Foo {
+    // @has async_fn/struct.Foo.html
+    // @has - '//*[@class="method has-srclink"]' 'pub async fn complicated_lifetimes( &self, context: &impl Bar) -> impl Iterator<Item = &usize>'
+    pub async fn complicated_lifetimes(&self, context: &impl Bar) -> impl Iterator<Item = &usize> {}
+    // taken from `tokio` as an example of a method that was particularly bad before
+    // @has - '//*[@class="method has-srclink"]' "pub async fn readable<T>(&self) -> Result<AsyncFdReadyGuard<'_, T>, ()>"
+    pub async fn readable<T>(&self) -> Result<AsyncFdReadyGuard<'_, T>, ()> {}
+    // @has - '//*[@class="method has-srclink"]' "pub async fn mut_self(&mut self)"
+    pub async fn mut_self(&mut self) {}
+}
+
+// test named lifetimes, just in case
+// @has async_fn/fn.named.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "pub async fn named<'a, 'b>(foo: &'a str) -> &'b str"
+pub async fn named<'a, 'b>(foo: &'a str) -> &'b str {}
+// @has async_fn/fn.named_trait.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "pub async fn named_trait<'a, 'b>(foo: impl Pattern<'a>) -> impl Pattern<'b>"
+pub async fn named_trait<'a, 'b>(foo: impl Pattern<'a>) -> impl Pattern<'b> {}
diff --git a/src/test/rustdoc/async-move-doctest.rs b/tests/rustdoc/async-move-doctest.rs
index 2ba61388c..2ba61388c 100644
--- a/src/test/rustdoc/async-move-doctest.rs
+++ b/tests/rustdoc/async-move-doctest.rs
diff --git a/src/test/rustdoc/async-trait-sig.rs b/tests/rustdoc/async-trait-sig.rs
index 2578bc8f7..2578bc8f7 100644
--- a/src/test/rustdoc/async-trait-sig.rs
+++ b/tests/rustdoc/async-trait-sig.rs
diff --git a/src/test/rustdoc/async-trait.rs b/tests/rustdoc/async-trait.rs
index a473e4674..a473e4674 100644
--- a/src/test/rustdoc/async-trait.rs
+++ b/tests/rustdoc/async-trait.rs
diff --git a/src/test/rustdoc/attribute-rendering.rs b/tests/rustdoc/attribute-rendering.rs
index 36e10923c..36e10923c 100644
--- a/src/test/rustdoc/attribute-rendering.rs
+++ b/tests/rustdoc/attribute-rendering.rs
diff --git a/tests/rustdoc/attributes.rs b/tests/rustdoc/attributes.rs
new file mode 100644
index 000000000..70e2e5c29
--- /dev/null
+++ b/tests/rustdoc/attributes.rs
@@ -0,0 +1,13 @@
+#![crate_name = "foo"]
+
+// @has foo/fn.f.html '//div[@class="item-decl"]/pre[@class="rust"]' '#[no_mangle]'
+#[no_mangle]
+pub extern "C" fn f() {}
+
+// @has foo/fn.g.html '//div[@class="item-decl"]/pre[@class="rust"]' '#[export_name = "bar"]'
+#[export_name = "bar"]
+pub extern "C" fn g() {}
+
+// @has foo/struct.Repr.html '//div[@class="item-decl"]' '#[repr(C, align(8))]'
+#[repr(C, align(8))]
+pub struct Repr;
diff --git a/src/test/rustdoc/auto-impl-for-trait.rs b/tests/rustdoc/auto-impl-for-trait.rs
index bc658fbfc..bc658fbfc 100644
--- a/src/test/rustdoc/auto-impl-for-trait.rs
+++ b/tests/rustdoc/auto-impl-for-trait.rs
diff --git a/src/test/rustdoc/auto-impl-primitive.rs b/tests/rustdoc/auto-impl-primitive.rs
index 172333d44..172333d44 100644
--- a/src/test/rustdoc/auto-impl-primitive.rs
+++ b/tests/rustdoc/auto-impl-primitive.rs
diff --git a/src/test/rustdoc/auto-trait-not-send.rs b/tests/rustdoc/auto-trait-not-send.rs
index 661d905ab..661d905ab 100644
--- a/src/test/rustdoc/auto-trait-not-send.rs
+++ b/tests/rustdoc/auto-trait-not-send.rs
diff --git a/src/test/rustdoc/auto-traits.rs b/tests/rustdoc/auto-traits.rs
index 93d4bf2f6..93d4bf2f6 100644
--- a/src/test/rustdoc/auto-traits.rs
+++ b/tests/rustdoc/auto-traits.rs
diff --git a/src/test/rustdoc/auto_aliases.rs b/tests/rustdoc/auto_aliases.rs
index a047c76b6..a047c76b6 100644
--- a/src/test/rustdoc/auto_aliases.rs
+++ b/tests/rustdoc/auto_aliases.rs
diff --git a/src/test/rustdoc/auxiliary/all-item-types.rs b/tests/rustdoc/auxiliary/all-item-types.rs
index f94bd9987..f94bd9987 100644
--- a/src/test/rustdoc/auxiliary/all-item-types.rs
+++ b/tests/rustdoc/auxiliary/all-item-types.rs
diff --git a/src/test/rustdoc/auxiliary/async-trait-dep.rs b/tests/rustdoc/auxiliary/async-trait-dep.rs
index 10a55dd02..10a55dd02 100644
--- a/src/test/rustdoc/auxiliary/async-trait-dep.rs
+++ b/tests/rustdoc/auxiliary/async-trait-dep.rs
diff --git a/src/test/rustdoc/auxiliary/auto-traits.rs b/tests/rustdoc/auxiliary/auto-traits.rs
index 84976c73b..84976c73b 100644
--- a/src/test/rustdoc/auxiliary/auto-traits.rs
+++ b/tests/rustdoc/auxiliary/auto-traits.rs
diff --git a/src/test/rustdoc/auxiliary/cross-crate-hidden-assoc-trait-items.rs b/tests/rustdoc/auxiliary/cross-crate-hidden-assoc-trait-items.rs
index 3baf8a6c0..3baf8a6c0 100644
--- a/src/test/rustdoc/auxiliary/cross-crate-hidden-assoc-trait-items.rs
+++ b/tests/rustdoc/auxiliary/cross-crate-hidden-assoc-trait-items.rs
diff --git a/src/test/rustdoc/auxiliary/cross-crate-hidden-impl-parameter.rs b/tests/rustdoc/auxiliary/cross-crate-hidden-impl-parameter.rs
index 159531222..159531222 100644
--- a/src/test/rustdoc/auxiliary/cross-crate-hidden-impl-parameter.rs
+++ b/tests/rustdoc/auxiliary/cross-crate-hidden-impl-parameter.rs
diff --git a/src/test/rustdoc/auxiliary/elided-lifetime.rs b/tests/rustdoc/auxiliary/elided-lifetime.rs
index 4f2c93379..4f2c93379 100644
--- a/src/test/rustdoc/auxiliary/elided-lifetime.rs
+++ b/tests/rustdoc/auxiliary/elided-lifetime.rs
diff --git a/src/test/rustdoc/auxiliary/empty.rs b/tests/rustdoc/auxiliary/empty.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/rustdoc/auxiliary/empty.rs
+++ b/tests/rustdoc/auxiliary/empty.rs
diff --git a/src/test/rustdoc/auxiliary/enum-primitive.rs b/tests/rustdoc/auxiliary/enum-primitive.rs
index ed1da253a..ed1da253a 100644
--- a/src/test/rustdoc/auxiliary/enum-primitive.rs
+++ b/tests/rustdoc/auxiliary/enum-primitive.rs
diff --git a/src/test/rustdoc/auxiliary/extern-impl-trait.rs b/tests/rustdoc/auxiliary/extern-impl-trait.rs
index dbd543930..dbd543930 100644
--- a/src/test/rustdoc/auxiliary/extern-impl-trait.rs
+++ b/tests/rustdoc/auxiliary/extern-impl-trait.rs
diff --git a/src/test/rustdoc/auxiliary/extern-links.rs b/tests/rustdoc/auxiliary/extern-links.rs
index 4a835673a..4a835673a 100644
--- a/src/test/rustdoc/auxiliary/extern-links.rs
+++ b/tests/rustdoc/auxiliary/extern-links.rs
diff --git a/src/test/rustdoc/auxiliary/external-cross-doc.md b/tests/rustdoc/auxiliary/external-cross-doc.md
index d3c853265..d3c853265 100644
--- a/src/test/rustdoc/auxiliary/external-cross-doc.md
+++ b/tests/rustdoc/auxiliary/external-cross-doc.md
diff --git a/src/test/rustdoc/auxiliary/external-cross.rs b/tests/rustdoc/auxiliary/external-cross.rs
index 5de63cdab..5de63cdab 100644
--- a/src/test/rustdoc/auxiliary/external-cross.rs
+++ b/tests/rustdoc/auxiliary/external-cross.rs
diff --git a/src/test/rustdoc/auxiliary/external-doc.md b/tests/rustdoc/auxiliary/external-doc.md
index babde0a05..babde0a05 100644
--- a/src/test/rustdoc/auxiliary/external-doc.md
+++ b/tests/rustdoc/auxiliary/external-doc.md
diff --git a/src/test/rustdoc/auxiliary/external-macro-src.rs b/tests/rustdoc/auxiliary/external-macro-src.rs
index ce20ca5c9..ce20ca5c9 100644
--- a/src/test/rustdoc/auxiliary/external-macro-src.rs
+++ b/tests/rustdoc/auxiliary/external-macro-src.rs
diff --git a/src/test/rustdoc/auxiliary/html_root.rs b/tests/rustdoc/auxiliary/html_root.rs
index 4eb0b700f..4eb0b700f 100644
--- a/src/test/rustdoc/auxiliary/html_root.rs
+++ b/tests/rustdoc/auxiliary/html_root.rs
diff --git a/src/test/rustdoc/auxiliary/incoherent-impl-types.rs b/tests/rustdoc/auxiliary/incoherent-impl-types.rs
index fc51e42e5..fc51e42e5 100644
--- a/src/test/rustdoc/auxiliary/incoherent-impl-types.rs
+++ b/tests/rustdoc/auxiliary/incoherent-impl-types.rs
diff --git a/src/test/rustdoc/auxiliary/inline-default-methods.rs b/tests/rustdoc/auxiliary/inline-default-methods.rs
index 8a636f449..8a636f449 100644
--- a/src/test/rustdoc/auxiliary/inline-default-methods.rs
+++ b/tests/rustdoc/auxiliary/inline-default-methods.rs
diff --git a/src/test/rustdoc/auxiliary/issue-100204-aux.rs b/tests/rustdoc/auxiliary/issue-100204-aux.rs
index df1b59069..df1b59069 100644
--- a/src/test/rustdoc/auxiliary/issue-100204-aux.rs
+++ b/tests/rustdoc/auxiliary/issue-100204-aux.rs
diff --git a/src/test/rustdoc/auxiliary/issue-13698.rs b/tests/rustdoc/auxiliary/issue-13698.rs
index a65ebfe36..a65ebfe36 100644
--- a/src/test/rustdoc/auxiliary/issue-13698.rs
+++ b/tests/rustdoc/auxiliary/issue-13698.rs
diff --git a/src/test/rustdoc/auxiliary/issue-15318.rs b/tests/rustdoc/auxiliary/issue-15318.rs
index 695fa58ef..695fa58ef 100644
--- a/src/test/rustdoc/auxiliary/issue-15318.rs
+++ b/tests/rustdoc/auxiliary/issue-15318.rs
diff --git a/src/test/rustdoc/auxiliary/issue-17476.rs b/tests/rustdoc/auxiliary/issue-17476.rs
index 80c915eb7..80c915eb7 100644
--- a/src/test/rustdoc/auxiliary/issue-17476.rs
+++ b/tests/rustdoc/auxiliary/issue-17476.rs
diff --git a/src/test/rustdoc/auxiliary/issue-19190-3.rs b/tests/rustdoc/auxiliary/issue-19190-3.rs
index 8c526a89a..8c526a89a 100644
--- a/src/test/rustdoc/auxiliary/issue-19190-3.rs
+++ b/tests/rustdoc/auxiliary/issue-19190-3.rs
diff --git a/src/test/rustdoc/auxiliary/issue-20646.rs b/tests/rustdoc/auxiliary/issue-20646.rs
index 8e16f2de0..8e16f2de0 100644
--- a/src/test/rustdoc/auxiliary/issue-20646.rs
+++ b/tests/rustdoc/auxiliary/issue-20646.rs
diff --git a/src/test/rustdoc/auxiliary/issue-20727.rs b/tests/rustdoc/auxiliary/issue-20727.rs
index 7ffc1985b..7ffc1985b 100644
--- a/src/test/rustdoc/auxiliary/issue-20727.rs
+++ b/tests/rustdoc/auxiliary/issue-20727.rs
diff --git a/src/test/rustdoc/auxiliary/issue-21092.rs b/tests/rustdoc/auxiliary/issue-21092.rs
index 51ab7de1c..51ab7de1c 100644
--- a/src/test/rustdoc/auxiliary/issue-21092.rs
+++ b/tests/rustdoc/auxiliary/issue-21092.rs
diff --git a/src/test/rustdoc/auxiliary/issue-21801.rs b/tests/rustdoc/auxiliary/issue-21801.rs
index 732612ff0..732612ff0 100644
--- a/src/test/rustdoc/auxiliary/issue-21801.rs
+++ b/tests/rustdoc/auxiliary/issue-21801.rs
diff --git a/src/test/rustdoc/auxiliary/issue-22025.rs b/tests/rustdoc/auxiliary/issue-22025.rs
index 5346c0e92..5346c0e92 100644
--- a/src/test/rustdoc/auxiliary/issue-22025.rs
+++ b/tests/rustdoc/auxiliary/issue-22025.rs
diff --git a/src/test/rustdoc/auxiliary/issue-23207-1.rs b/tests/rustdoc/auxiliary/issue-23207-1.rs
index 8531d5f1a..8531d5f1a 100644
--- a/src/test/rustdoc/auxiliary/issue-23207-1.rs
+++ b/tests/rustdoc/auxiliary/issue-23207-1.rs
diff --git a/src/test/rustdoc/auxiliary/issue-23207-2.rs b/tests/rustdoc/auxiliary/issue-23207-2.rs
index b92b16653..b92b16653 100644
--- a/src/test/rustdoc/auxiliary/issue-23207-2.rs
+++ b/tests/rustdoc/auxiliary/issue-23207-2.rs
diff --git a/src/test/rustdoc/auxiliary/issue-26606-macro.rs b/tests/rustdoc/auxiliary/issue-26606-macro.rs
index d60d32526..d60d32526 100644
--- a/src/test/rustdoc/auxiliary/issue-26606-macro.rs
+++ b/tests/rustdoc/auxiliary/issue-26606-macro.rs
diff --git a/src/test/rustdoc/auxiliary/issue-27362-aux.rs b/tests/rustdoc/auxiliary/issue-27362-aux.rs
index 077bdc33e..077bdc33e 100644
--- a/src/test/rustdoc/auxiliary/issue-27362-aux.rs
+++ b/tests/rustdoc/auxiliary/issue-27362-aux.rs
diff --git a/src/test/rustdoc/auxiliary/issue-28927-1.rs b/tests/rustdoc/auxiliary/issue-28927-1.rs
index 688c73428..688c73428 100644
--- a/src/test/rustdoc/auxiliary/issue-28927-1.rs
+++ b/tests/rustdoc/auxiliary/issue-28927-1.rs
diff --git a/src/test/rustdoc/auxiliary/issue-28927-2.rs b/tests/rustdoc/auxiliary/issue-28927-2.rs
index 7c0937fce..7c0937fce 100644
--- a/src/test/rustdoc/auxiliary/issue-28927-2.rs
+++ b/tests/rustdoc/auxiliary/issue-28927-2.rs
diff --git a/src/test/rustdoc/auxiliary/issue-29584.rs b/tests/rustdoc/auxiliary/issue-29584.rs
index a9b8796c0..a9b8796c0 100644
--- a/src/test/rustdoc/auxiliary/issue-29584.rs
+++ b/tests/rustdoc/auxiliary/issue-29584.rs
diff --git a/src/test/rustdoc/auxiliary/issue-30109-1.rs b/tests/rustdoc/auxiliary/issue-30109-1.rs
index ca05a6a90..ca05a6a90 100644
--- a/src/test/rustdoc/auxiliary/issue-30109-1.rs
+++ b/tests/rustdoc/auxiliary/issue-30109-1.rs
diff --git a/src/test/rustdoc/auxiliary/issue-34274.rs b/tests/rustdoc/auxiliary/issue-34274.rs
index c46660579..c46660579 100644
--- a/src/test/rustdoc/auxiliary/issue-34274.rs
+++ b/tests/rustdoc/auxiliary/issue-34274.rs
diff --git a/src/test/rustdoc/auxiliary/issue-36031.rs b/tests/rustdoc/auxiliary/issue-36031.rs
index da688139e..da688139e 100644
--- a/src/test/rustdoc/auxiliary/issue-36031.rs
+++ b/tests/rustdoc/auxiliary/issue-36031.rs
diff --git a/src/test/rustdoc/auxiliary/issue-40936.rs b/tests/rustdoc/auxiliary/issue-40936.rs
index b921e5201..b921e5201 100644
--- a/src/test/rustdoc/auxiliary/issue-40936.rs
+++ b/tests/rustdoc/auxiliary/issue-40936.rs
diff --git a/src/test/rustdoc/auxiliary/issue-46727.rs b/tests/rustdoc/auxiliary/issue-46727.rs
index 30dccfa77..30dccfa77 100644
--- a/src/test/rustdoc/auxiliary/issue-46727.rs
+++ b/tests/rustdoc/auxiliary/issue-46727.rs
diff --git a/src/test/rustdoc/auxiliary/issue-48414.rs b/tests/rustdoc/auxiliary/issue-48414.rs
index f442ac722..f442ac722 100644
--- a/src/test/rustdoc/auxiliary/issue-48414.rs
+++ b/tests/rustdoc/auxiliary/issue-48414.rs
diff --git a/src/test/rustdoc/auxiliary/issue-53689.rs b/tests/rustdoc/auxiliary/issue-53689.rs
index 5003c2c00..5003c2c00 100644
--- a/src/test/rustdoc/auxiliary/issue-53689.rs
+++ b/tests/rustdoc/auxiliary/issue-53689.rs
diff --git a/src/test/rustdoc/auxiliary/issue-57180.rs b/tests/rustdoc/auxiliary/issue-57180.rs
index 4e2f4b87c..4e2f4b87c 100644
--- a/src/test/rustdoc/auxiliary/issue-57180.rs
+++ b/tests/rustdoc/auxiliary/issue-57180.rs
diff --git a/src/test/rustdoc/auxiliary/issue-61592.rs b/tests/rustdoc/auxiliary/issue-61592.rs
index 6e16a4caf..6e16a4caf 100644
--- a/src/test/rustdoc/auxiliary/issue-61592.rs
+++ b/tests/rustdoc/auxiliary/issue-61592.rs
diff --git a/src/test/rustdoc/auxiliary/issue-73061.rs b/tests/rustdoc/auxiliary/issue-73061.rs
index e05a3bc6d..e05a3bc6d 100644
--- a/src/test/rustdoc/auxiliary/issue-73061.rs
+++ b/tests/rustdoc/auxiliary/issue-73061.rs
diff --git a/tests/rustdoc/auxiliary/issue-85454.rs b/tests/rustdoc/auxiliary/issue-85454.rs
new file mode 100644
index 000000000..5143968bb
--- /dev/null
+++ b/tests/rustdoc/auxiliary/issue-85454.rs
@@ -0,0 +1,17 @@
+// @has issue_85454/trait.FromResidual.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub trait FromResidual<R = <Self as Try>::Residual> { fn from_residual(residual: R) -> Self; }'
+pub trait FromResidual<R = <Self as Try>::Residual> {
+    fn from_residual(residual: R) -> Self;
+}
+
+pub trait Try: FromResidual {
+    type Output;
+    type Residual;
+    fn from_output(output: Self::Output) -> Self;
+    fn branch(self) -> ControlFlow<Self::Residual, Self::Output>;
+}
+
+pub enum ControlFlow<B, C = ()> {
+    Continue(C),
+    Break(B),
+}
diff --git a/src/test/rustdoc/auxiliary/issue-86620-1.rs b/tests/rustdoc/auxiliary/issue-86620-1.rs
index f6debf6fb..f6debf6fb 100644
--- a/src/test/rustdoc/auxiliary/issue-86620-1.rs
+++ b/tests/rustdoc/auxiliary/issue-86620-1.rs
diff --git a/src/test/rustdoc/auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs b/tests/rustdoc/auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs
index 4e55e7ed5..4e55e7ed5 100644
--- a/src/test/rustdoc/auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs
+++ b/tests/rustdoc/auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs
diff --git a/src/test/rustdoc/auxiliary/issue-99221-aux.rs b/tests/rustdoc/auxiliary/issue-99221-aux.rs
index e061e42b2..e061e42b2 100644
--- a/src/test/rustdoc/auxiliary/issue-99221-aux.rs
+++ b/tests/rustdoc/auxiliary/issue-99221-aux.rs
diff --git a/src/test/rustdoc/auxiliary/issue-99734-aux.rs b/tests/rustdoc/auxiliary/issue-99734-aux.rs
index 234d55efb..234d55efb 100644
--- a/src/test/rustdoc/auxiliary/issue-99734-aux.rs
+++ b/tests/rustdoc/auxiliary/issue-99734-aux.rs
diff --git a/src/test/rustdoc/auxiliary/macro_pub_in_module.rs b/tests/rustdoc/auxiliary/macro_pub_in_module.rs
index 137b12386..137b12386 100644
--- a/src/test/rustdoc/auxiliary/macro_pub_in_module.rs
+++ b/tests/rustdoc/auxiliary/macro_pub_in_module.rs
diff --git a/src/test/rustdoc/auxiliary/masked.rs b/tests/rustdoc/auxiliary/masked.rs
index 3d722d5e0..3d722d5e0 100644
--- a/src/test/rustdoc/auxiliary/masked.rs
+++ b/tests/rustdoc/auxiliary/masked.rs
diff --git a/src/test/rustdoc/auxiliary/mod-stackoverflow.rs b/tests/rustdoc/auxiliary/mod-stackoverflow.rs
index e0b90f180..e0b90f180 100644
--- a/src/test/rustdoc/auxiliary/mod-stackoverflow.rs
+++ b/tests/rustdoc/auxiliary/mod-stackoverflow.rs
diff --git a/src/test/ui/extern/auxiliary/m2.rs b/tests/rustdoc/auxiliary/no_html_root.rs
index c5c0bc606..c5c0bc606 100644
--- a/src/test/ui/extern/auxiliary/m2.rs
+++ b/tests/rustdoc/auxiliary/no_html_root.rs
diff --git a/src/test/rustdoc/auxiliary/normalize-assoc-item.rs b/tests/rustdoc/auxiliary/normalize-assoc-item.rs
index fbd111c30..fbd111c30 100644
--- a/src/test/rustdoc/auxiliary/normalize-assoc-item.rs
+++ b/tests/rustdoc/auxiliary/normalize-assoc-item.rs
diff --git a/src/test/rustdoc/auxiliary/primitive-doc.rs b/tests/rustdoc/auxiliary/primitive-doc.rs
index e8da852a5..e8da852a5 100644
--- a/src/test/rustdoc/auxiliary/primitive-doc.rs
+++ b/tests/rustdoc/auxiliary/primitive-doc.rs
diff --git a/src/test/rustdoc/auxiliary/primitive-reexport.rs b/tests/rustdoc/auxiliary/primitive-reexport.rs
index b2e9fa43b..b2e9fa43b 100644
--- a/src/test/rustdoc/auxiliary/primitive-reexport.rs
+++ b/tests/rustdoc/auxiliary/primitive-reexport.rs
diff --git a/src/test/rustdoc/auxiliary/pub-extern-crate.rs b/tests/rustdoc/auxiliary/pub-extern-crate.rs
index 8c89c8d6c..8c89c8d6c 100644
--- a/src/test/rustdoc/auxiliary/pub-extern-crate.rs
+++ b/tests/rustdoc/auxiliary/pub-extern-crate.rs
diff --git a/src/test/rustdoc/auxiliary/pub-use-extern-macros.rs b/tests/rustdoc/auxiliary/pub-use-extern-macros.rs
index 7934e0733..7934e0733 100644
--- a/src/test/rustdoc/auxiliary/pub-use-extern-macros.rs
+++ b/tests/rustdoc/auxiliary/pub-use-extern-macros.rs
diff --git a/src/test/rustdoc/auxiliary/real_gimli.rs b/tests/rustdoc/auxiliary/real_gimli.rs
index 80d5c4ba8..80d5c4ba8 100644
--- a/src/test/rustdoc/auxiliary/real_gimli.rs
+++ b/tests/rustdoc/auxiliary/real_gimli.rs
diff --git a/src/test/rustdoc/auxiliary/realcore.rs b/tests/rustdoc/auxiliary/realcore.rs
index e0a906df0..e0a906df0 100644
--- a/src/test/rustdoc/auxiliary/realcore.rs
+++ b/tests/rustdoc/auxiliary/realcore.rs
diff --git a/src/test/rustdoc/auxiliary/reexp-stripped.rs b/tests/rustdoc/auxiliary/reexp-stripped.rs
index ccc3dc11f..ccc3dc11f 100644
--- a/src/test/rustdoc/auxiliary/reexp-stripped.rs
+++ b/tests/rustdoc/auxiliary/reexp-stripped.rs
diff --git a/src/test/rustdoc/auxiliary/reexport-check.rs b/tests/rustdoc/auxiliary/reexport-check.rs
index 672ccb1cf..672ccb1cf 100644
--- a/src/test/rustdoc/auxiliary/reexport-check.rs
+++ b/tests/rustdoc/auxiliary/reexport-check.rs
diff --git a/src/test/rustdoc/auxiliary/reexport-doc-aux.rs b/tests/rustdoc/auxiliary/reexport-doc-aux.rs
index 3400717eb..3400717eb 100644
--- a/src/test/rustdoc/auxiliary/reexport-doc-aux.rs
+++ b/tests/rustdoc/auxiliary/reexport-doc-aux.rs
diff --git a/src/test/rustdoc/auxiliary/reexports.rs b/tests/rustdoc/auxiliary/reexports.rs
index 4336993a3..4336993a3 100644
--- a/src/test/rustdoc/auxiliary/reexports.rs
+++ b/tests/rustdoc/auxiliary/reexports.rs
diff --git a/src/test/rustdoc/auxiliary/rustdoc-default-impl.rs b/tests/rustdoc/auxiliary/rustdoc-default-impl.rs
index 032db3b25..032db3b25 100644
--- a/src/test/rustdoc/auxiliary/rustdoc-default-impl.rs
+++ b/tests/rustdoc/auxiliary/rustdoc-default-impl.rs
diff --git a/src/test/rustdoc/auxiliary/rustdoc-extern-default-method.rs b/tests/rustdoc/auxiliary/rustdoc-extern-default-method.rs
index 12934238a..12934238a 100644
--- a/src/test/rustdoc/auxiliary/rustdoc-extern-default-method.rs
+++ b/tests/rustdoc/auxiliary/rustdoc-extern-default-method.rs
diff --git a/src/test/rustdoc/auxiliary/rustdoc-extern-method.rs b/tests/rustdoc/auxiliary/rustdoc-extern-method.rs
index e493048d9..e493048d9 100644
--- a/src/test/rustdoc/auxiliary/rustdoc-extern-method.rs
+++ b/tests/rustdoc/auxiliary/rustdoc-extern-method.rs
diff --git a/src/test/rustdoc/auxiliary/rustdoc-ffi.rs b/tests/rustdoc/auxiliary/rustdoc-ffi.rs
index b74d190b5..b74d190b5 100644
--- a/src/test/rustdoc/auxiliary/rustdoc-ffi.rs
+++ b/tests/rustdoc/auxiliary/rustdoc-ffi.rs
diff --git a/src/test/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs b/tests/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs
index 135987fc0..135987fc0 100644
--- a/src/test/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs
+++ b/tests/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs
diff --git a/src/test/rustdoc/auxiliary/source-code-bar.rs b/tests/rustdoc/auxiliary/source-code-bar.rs
index 8700d688e..8700d688e 100644
--- a/src/test/rustdoc/auxiliary/source-code-bar.rs
+++ b/tests/rustdoc/auxiliary/source-code-bar.rs
diff --git a/src/test/rustdoc/auxiliary/source_code.rs b/tests/rustdoc/auxiliary/source_code.rs
index 72a5c1a0a..72a5c1a0a 100644
--- a/src/test/rustdoc/auxiliary/source_code.rs
+++ b/tests/rustdoc/auxiliary/source_code.rs
diff --git a/src/test/rustdoc/auxiliary/src-links-external.rs b/tests/rustdoc/auxiliary/src-links-external.rs
index 4a835673a..4a835673a 100644
--- a/src/test/rustdoc/auxiliary/src-links-external.rs
+++ b/tests/rustdoc/auxiliary/src-links-external.rs
diff --git a/src/test/rustdoc/auxiliary/trait-alias-mention.rs b/tests/rustdoc/auxiliary/trait-alias-mention.rs
index 6df06c87a..6df06c87a 100644
--- a/src/test/rustdoc/auxiliary/trait-alias-mention.rs
+++ b/tests/rustdoc/auxiliary/trait-alias-mention.rs
diff --git a/src/test/rustdoc/auxiliary/trait-visibility.rs b/tests/rustdoc/auxiliary/trait-visibility.rs
index 1e8d0b8e0..1e8d0b8e0 100644
--- a/src/test/rustdoc/auxiliary/trait-visibility.rs
+++ b/tests/rustdoc/auxiliary/trait-visibility.rs
diff --git a/src/test/rustdoc/auxiliary/unit-return.rs b/tests/rustdoc/auxiliary/unit-return.rs
index 7b9986162..7b9986162 100644
--- a/src/test/rustdoc/auxiliary/unit-return.rs
+++ b/tests/rustdoc/auxiliary/unit-return.rs
diff --git a/src/test/rustdoc/auxiliary/unstable-trait.rs b/tests/rustdoc/auxiliary/unstable-trait.rs
index 6f06a6e26..6f06a6e26 100644
--- a/src/test/rustdoc/auxiliary/unstable-trait.rs
+++ b/tests/rustdoc/auxiliary/unstable-trait.rs
diff --git a/src/test/rustdoc/auxiliary/variant-struct.rs b/tests/rustdoc/auxiliary/variant-struct.rs
index 0f3d2e5f1..0f3d2e5f1 100644
--- a/src/test/rustdoc/auxiliary/variant-struct.rs
+++ b/tests/rustdoc/auxiliary/variant-struct.rs
diff --git a/src/test/rustdoc/bad-codeblock-syntax.rs b/tests/rustdoc/bad-codeblock-syntax.rs
index 9ec089fd7..9ec089fd7 100644
--- a/src/test/rustdoc/bad-codeblock-syntax.rs
+++ b/tests/rustdoc/bad-codeblock-syntax.rs
diff --git a/src/test/rustdoc/blanket-reexport-item.rs b/tests/rustdoc/blanket-reexport-item.rs
index 437f0001f..437f0001f 100644
--- a/src/test/rustdoc/blanket-reexport-item.rs
+++ b/tests/rustdoc/blanket-reexport-item.rs
diff --git a/src/test/rustdoc/bounds-in-multiple-parts.rs b/tests/rustdoc/bounds-in-multiple-parts.rs
index 279e3c148..279e3c148 100644
--- a/src/test/rustdoc/bounds-in-multiple-parts.rs
+++ b/tests/rustdoc/bounds-in-multiple-parts.rs
diff --git a/src/test/rustdoc/cap-lints.rs b/tests/rustdoc/cap-lints.rs
index 08a353396..08a353396 100644
--- a/src/test/rustdoc/cap-lints.rs
+++ b/tests/rustdoc/cap-lints.rs
diff --git a/src/test/rustdoc/cfg-doctest.rs b/tests/rustdoc/cfg-doctest.rs
index 6a9d26a4b..6a9d26a4b 100644
--- a/src/test/rustdoc/cfg-doctest.rs
+++ b/tests/rustdoc/cfg-doctest.rs
diff --git a/src/test/rustdoc/cfg_doc_reexport.rs b/tests/rustdoc/cfg_doc_reexport.rs
index addb6709d..addb6709d 100644
--- a/src/test/rustdoc/cfg_doc_reexport.rs
+++ b/tests/rustdoc/cfg_doc_reexport.rs
diff --git a/src/test/rustdoc/check-source-code-urls-to-def-std.rs b/tests/rustdoc/check-source-code-urls-to-def-std.rs
index e12d8445f..e12d8445f 100644
--- a/src/test/rustdoc/check-source-code-urls-to-def-std.rs
+++ b/tests/rustdoc/check-source-code-urls-to-def-std.rs
diff --git a/src/test/rustdoc/check-source-code-urls-to-def.rs b/tests/rustdoc/check-source-code-urls-to-def.rs
index 5959f9c7c..5959f9c7c 100644
--- a/src/test/rustdoc/check-source-code-urls-to-def.rs
+++ b/tests/rustdoc/check-source-code-urls-to-def.rs
diff --git a/src/test/rustdoc/check-styled-link.rs b/tests/rustdoc/check-styled-link.rs
index ed4a5ea21..ed4a5ea21 100644
--- a/src/test/rustdoc/check-styled-link.rs
+++ b/tests/rustdoc/check-styled-link.rs
diff --git a/src/test/rustdoc/check.rs b/tests/rustdoc/check.rs
index 1fb4b35dd..1fb4b35dd 100644
--- a/src/test/rustdoc/check.rs
+++ b/tests/rustdoc/check.rs
diff --git a/src/test/rustdoc/codeblock-title.rs b/tests/rustdoc/codeblock-title.rs
index b9b0b0d1a..b9b0b0d1a 100644
--- a/src/test/rustdoc/codeblock-title.rs
+++ b/tests/rustdoc/codeblock-title.rs
diff --git a/src/test/rustdoc/comment-in-doctest.rs b/tests/rustdoc/comment-in-doctest.rs
index 5691d1735..5691d1735 100644
--- a/src/test/rustdoc/comment-in-doctest.rs
+++ b/tests/rustdoc/comment-in-doctest.rs
diff --git a/src/test/rustdoc/const-display.rs b/tests/rustdoc/const-display.rs
index 594501b22..594501b22 100644
--- a/src/test/rustdoc/const-display.rs
+++ b/tests/rustdoc/const-display.rs
diff --git a/src/test/rustdoc/const-doc.rs b/tests/rustdoc/const-doc.rs
index 74ab4af61..74ab4af61 100644
--- a/src/test/rustdoc/const-doc.rs
+++ b/tests/rustdoc/const-doc.rs
diff --git a/src/test/rustdoc/const-fn.rs b/tests/rustdoc/const-fn.rs
index 28eba849a..4366ad4d0 100644
--- a/src/test/rustdoc/const-fn.rs
+++ b/tests/rustdoc/const-fn.rs
@@ -1,7 +1,7 @@
 #![crate_name = "foo"]
 
 // @has foo/fn.bar.html
-// @has - '//*[@class="rust fn"]' 'pub const fn bar() -> '
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub const fn bar() -> '
 /// foo
 pub const fn bar() -> usize {
     2
diff --git a/src/test/rustdoc/const-generics/add-impl.rs b/tests/rustdoc/const-generics/add-impl.rs
index 6cbae9abe..b5226ad3f 100644
--- a/src/test/rustdoc/const-generics/add-impl.rs
+++ b/tests/rustdoc/const-generics/add-impl.rs
@@ -2,7 +2,7 @@
 
 use std::ops::Add;
 
-// @has foo/struct.Simd.html '//pre[@class="rust struct"]' 'pub struct Simd<T, const WIDTH: usize>'
+// @has foo/struct.Simd.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub struct Simd<T, const WIDTH: usize>'
 pub struct Simd<T, const WIDTH: usize> {
     inner: T,
 }
diff --git a/src/test/rustdoc/const-generics/auxiliary/extern_crate.rs b/tests/rustdoc/const-generics/auxiliary/extern_crate.rs
index 55b632a48..55b632a48 100644
--- a/src/test/rustdoc/const-generics/auxiliary/extern_crate.rs
+++ b/tests/rustdoc/const-generics/auxiliary/extern_crate.rs
diff --git a/tests/rustdoc/const-generics/const-generic-defaults.rs b/tests/rustdoc/const-generics/const-generic-defaults.rs
new file mode 100644
index 000000000..acc3b853e
--- /dev/null
+++ b/tests/rustdoc/const-generics/const-generic-defaults.rs
@@ -0,0 +1,5 @@
+#![crate_name = "foo"]
+
+// @has foo/struct.Foo.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub struct Foo<const M: usize = 10, const N: usize = M, T = i32>(_);'
+pub struct Foo<const M: usize = 10, const N: usize = M, T = i32>(T);
diff --git a/src/test/rustdoc/const-generics/const-generic-slice.rs b/tests/rustdoc/const-generics/const-generic-slice.rs
index 4279de91f..4279de91f 100644
--- a/src/test/rustdoc/const-generics/const-generic-slice.rs
+++ b/tests/rustdoc/const-generics/const-generic-slice.rs
diff --git a/tests/rustdoc/const-generics/const-generics-docs.rs b/tests/rustdoc/const-generics/const-generics-docs.rs
new file mode 100644
index 000000000..543332d2c
--- /dev/null
+++ b/tests/rustdoc/const-generics/const-generics-docs.rs
@@ -0,0 +1,128 @@
+// edition:2018
+// aux-build: extern_crate.rs
+#![crate_name = "foo"]
+
+extern crate extern_crate;
+// @has foo/fn.extern_fn.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub fn extern_fn<const N: usize>() -> impl Iterator<Item = [u8; N]>'
+pub use extern_crate::extern_fn;
+// @has foo/struct.ExternTy.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub struct ExternTy<const N: usize> {'
+pub use extern_crate::ExternTy;
+// @has foo/type.TyAlias.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'type TyAlias<const N: usize> = ExternTy<N>;'
+pub use extern_crate::TyAlias;
+// @has foo/trait.WTrait.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub trait WTrait<const N: usize, const M: usize>'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'fn hey<const P: usize>() -> usize'
+pub use extern_crate::WTrait;
+
+// @has foo/trait.Trait.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub trait Trait<const N: usize>'
+// @has - '//*[@id="impl-Trait%3C1%3E-for-u8"]//h3[@class="code-header"]' 'impl Trait<1> for u8'
+// @has - '//*[@id="impl-Trait%3C2%3E-for-u8"]//h3[@class="code-header"]' 'impl Trait<2> for u8'
+// @has - '//*[@id="impl-Trait%3C{1%20+%202}%3E-for-u8"]//h3[@class="code-header"]' 'impl Trait<{1 + 2}> for u8'
+// @has - '//*[@id="impl-Trait%3CN%3E-for-%5Bu8%3B%20N%5D"]//h3[@class="code-header"]' \
+//      'impl<const N: usize> Trait<N> for [u8; N]'
+pub trait Trait<const N: usize> {}
+impl Trait<1> for u8 {}
+impl Trait<2> for u8 {}
+impl Trait<{1 + 2}> for u8 {}
+impl<const N: usize> Trait<N> for [u8; N] {}
+
+// @has foo/struct.Foo.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub struct Foo<const N: usize>where u8: Trait<N>'
+pub struct Foo<const N: usize> where u8: Trait<N>;
+// @has foo/struct.Bar.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub struct Bar<T, const N: usize>(_)'
+pub struct Bar<T, const N: usize>([T; N]);
+
+// @has foo/struct.Foo.html '//*[@id="impl-Foo%3CM%3E"]/h3[@class="code-header"]' 'impl<const M: usize> Foo<M>where u8: Trait<M>'
+impl<const M: usize> Foo<M> where u8: Trait<M> {
+    // @has - '//*[@id="associatedconstant.FOO_ASSOC"]' 'pub const FOO_ASSOC: usize'
+    pub const FOO_ASSOC: usize = M + 13;
+
+    // @has - '//*[@id="method.hey"]' 'pub fn hey<const N: usize>(&self) -> Bar<u8, N>'
+    pub fn hey<const N: usize>(&self) -> Bar<u8, N> {
+        Bar([0; N])
+    }
+}
+
+// @has foo/struct.Bar.html '//*[@id="impl-Bar%3Cu8%2C%20M%3E"]/h3[@class="code-header"]' 'impl<const M: usize> Bar<u8, M>'
+impl<const M: usize> Bar<u8, M> {
+    // @has - '//*[@id="method.hey"]' \
+    //      'pub fn hey<const N: usize>(&self) -> Foo<N>where u8: Trait<N>'
+    pub fn hey<const N: usize>(&self) -> Foo<N> where u8: Trait<N> {
+        Foo
+    }
+}
+
+// @has foo/fn.test.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub fn test<const N: usize>() -> impl Trait<N>where u8: Trait<N>'
+pub fn test<const N: usize>() -> impl Trait<N> where u8: Trait<N> {
+    2u8
+}
+
+// @has foo/fn.a_sink.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub async fn a_sink<const N: usize>(v: [u8; N]) -> impl Trait<N>'
+pub async fn a_sink<const N: usize>(v: [u8; N]) -> impl Trait<N> {
+    v
+}
+
+// @has foo/fn.b_sink.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub async fn b_sink<const N: usize>(_: impl Trait<N>)'
+pub async fn b_sink<const N: usize>(_: impl Trait<N>) {}
+
+// @has foo/fn.concrete.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub fn concrete() -> [u8; 22]'
+pub fn concrete() -> [u8; 3 + std::mem::size_of::<u64>() << 1] {
+    Default::default()
+}
+
+// @has foo/type.Faz.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'type Faz<const N: usize> = [u8; N];'
+pub type Faz<const N: usize> = [u8; N];
+// @has foo/type.Fiz.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'type Fiz<const N: usize> = [[u8; N]; 48];'
+pub type Fiz<const N: usize> = [[u8; N]; 3 << 4];
+
+macro_rules! define_me {
+    ($t:tt<$q:tt>) => {
+        pub struct $t<const $q: usize>([u8; $q]);
+    }
+}
+
+// @has foo/struct.Foz.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub struct Foz<const N: usize>(_);'
+define_me!(Foz<N>);
+
+trait Q {
+    const ASSOC: usize;
+}
+
+impl<const N: usize> Q for [u8; N] {
+    const ASSOC: usize = N;
+}
+
+// @has foo/fn.q_user.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub fn q_user() -> [u8; 13]'
+pub fn q_user() -> [u8; <[u8; 13] as Q>::ASSOC] {
+    [0; <[u8; 13] as Q>::ASSOC]
+}
+
+// @has foo/union.Union.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub union Union<const N: usize>'
+pub union Union<const N: usize> {
+    // @has - //pre "pub arr: [u8; N]"
+    pub arr: [u8; N],
+    // @has - //pre "pub another_arr: [(); N]"
+    pub another_arr: [(); N],
+}
+
+// @has foo/enum.Enum.html '//div[@class="item-decl"]/pre[@class="rust"]' \
+//      'pub enum Enum<const N: usize>'
+pub enum Enum<const N: usize> {
+    // @has - //pre "Variant([u8; N])"
+    Variant([u8; N]),
+    // @has - //pre "EmptyVariant"
+    EmptyVariant,
+}
diff --git a/src/test/rustdoc/const-generics/const-impl.rs b/tests/rustdoc/const-generics/const-impl.rs
index 75ee84279..726fb8f0c 100644
--- a/src/test/rustdoc/const-generics/const-impl.rs
+++ b/tests/rustdoc/const-generics/const-impl.rs
@@ -8,7 +8,7 @@ pub enum Order {
     Unsorted,
 }
 
-// @has foo/struct.VSet.html '//pre[@class="rust struct"]' 'pub struct VSet<T, const ORDER: Order>'
+// @has foo/struct.VSet.html '//div[@class="item-decl"]/pre[@class="rust"]' 'pub struct VSet<T, const ORDER: Order>'
 // @has foo/struct.VSet.html '//*[@id="impl-Send-for-VSet%3CT%2C%20ORDER%3E"]/h3[@class="code-header"]' 'impl<T, const ORDER: Order> Send for VSet<T, ORDER>'
 // @has foo/struct.VSet.html '//*[@id="impl-Sync-for-VSet%3CT%2C%20ORDER%3E"]/h3[@class="code-header"]' 'impl<T, const ORDER: Order> Sync for VSet<T, ORDER>'
 pub struct VSet<T, const ORDER: Order> {
diff --git a/src/test/rustdoc/const-generics/generic_const_exprs.rs b/tests/rustdoc/const-generics/generic_const_exprs.rs
index 215ee228e..c53cf6dcd 100644
--- a/src/test/rustdoc/const-generics/generic_const_exprs.rs
+++ b/tests/rustdoc/const-generics/generic_const_exprs.rs
@@ -2,6 +2,6 @@
 #![feature(generic_const_exprs)]
 #![allow(incomplete_features)]
 // make sure that `ConstEvaluatable` predicates dont cause rustdoc to ICE #77647
-// @has foo/struct.Ice.html '//pre[@class="rust struct"]' \
+// @has foo/struct.Ice.html '//div[@class="item-decl"]/pre[@class="rust"]' \
 //      'pub struct Ice<const N: usize>;'
 pub struct Ice<const N: usize> where [(); N + 1]:;
diff --git a/src/test/rustdoc/const-generics/lazy_normalization_consts/const-equate-pred.rs b/tests/rustdoc/const-generics/lazy_normalization_consts/const-equate-pred.rs
index 310e89a35..310e89a35 100644
--- a/src/test/rustdoc/const-generics/lazy_normalization_consts/const-equate-pred.rs
+++ b/tests/rustdoc/const-generics/lazy_normalization_consts/const-equate-pred.rs
diff --git a/tests/rustdoc/const-generics/type-alias.rs b/tests/rustdoc/const-generics/type-alias.rs
new file mode 100644
index 000000000..72473a112
--- /dev/null
+++ b/tests/rustdoc/const-generics/type-alias.rs
@@ -0,0 +1,4 @@
+#![crate_name = "foo"]
+
+// @has foo/type.CellIndex.html '//div[@class="item-decl"]/pre[@class="rust"]' 'type CellIndex<const D: usize> = [i64; D];'
+pub type CellIndex<const D: usize> = [i64; D];
diff --git a/tests/rustdoc/const-intrinsic.rs b/tests/rustdoc/const-intrinsic.rs
new file mode 100644
index 000000000..42f6ac792
--- /dev/null
+++ b/tests/rustdoc/const-intrinsic.rs
@@ -0,0 +1,25 @@
+#![feature(intrinsics)]
+#![feature(staged_api)]
+
+#![crate_name = "foo"]
+#![stable(since="1.0.0", feature="rust1")]
+
+extern "rust-intrinsic" {
+    // @has 'foo/fn.transmute.html'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub const unsafe extern "rust-intrinsic" fn transmute<T, U>(_: T) -> U'
+    #[stable(since="1.0.0", feature="rust1")]
+    #[rustc_const_stable(feature = "const_transmute", since = "1.56.0")]
+    pub fn transmute<T, U>(_: T) -> U;
+
+    // @has 'foo/fn.unreachable.html'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub unsafe extern "rust-intrinsic" fn unreachable() -> !'
+    #[stable(since="1.0.0", feature="rust1")]
+    pub fn unreachable() -> !;
+}
+
+extern "C" {
+    // @has 'foo/fn.needs_drop.html'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub unsafe extern "C" fn needs_drop() -> !'
+    #[stable(since="1.0.0", feature="rust1")]
+    pub fn needs_drop() -> !;
+}
diff --git a/src/test/rustdoc/const-underscore.rs b/tests/rustdoc/const-underscore.rs
index 0d4809409..0d4809409 100644
--- a/src/test/rustdoc/const-underscore.rs
+++ b/tests/rustdoc/const-underscore.rs
diff --git a/src/test/rustdoc/const-value-display.rs b/tests/rustdoc/const-value-display.rs
index 8d95f0de9..8d95f0de9 100644
--- a/src/test/rustdoc/const-value-display.rs
+++ b/tests/rustdoc/const-value-display.rs
diff --git a/src/test/rustdoc/const.rs b/tests/rustdoc/const.rs
index 587ad4db4..587ad4db4 100644
--- a/src/test/rustdoc/const.rs
+++ b/tests/rustdoc/const.rs
diff --git a/src/test/rustdoc/constructor-imports.rs b/tests/rustdoc/constructor-imports.rs
index 26795c274..26795c274 100644
--- a/src/test/rustdoc/constructor-imports.rs
+++ b/tests/rustdoc/constructor-imports.rs
diff --git a/src/test/rustdoc/crate-version-escape.rs b/tests/rustdoc/crate-version-escape.rs
index 8413709f1..8413709f1 100644
--- a/src/test/rustdoc/crate-version-escape.rs
+++ b/tests/rustdoc/crate-version-escape.rs
diff --git a/src/test/rustdoc/crate-version.rs b/tests/rustdoc/crate-version.rs
index 2592c9853..2592c9853 100644
--- a/src/test/rustdoc/crate-version.rs
+++ b/tests/rustdoc/crate-version.rs
diff --git a/src/test/rustdoc/cross-crate-hidden-assoc-trait-items.rs b/tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs
index d02bc4fe7..d02bc4fe7 100644
--- a/src/test/rustdoc/cross-crate-hidden-assoc-trait-items.rs
+++ b/tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs
diff --git a/src/test/rustdoc/cross-crate-hidden-impl-parameter.rs b/tests/rustdoc/cross-crate-hidden-impl-parameter.rs
index eb2ced2f7..eb2ced2f7 100644
--- a/src/test/rustdoc/cross-crate-hidden-impl-parameter.rs
+++ b/tests/rustdoc/cross-crate-hidden-impl-parameter.rs
diff --git a/src/test/rustdoc/cross-crate-links.rs b/tests/rustdoc/cross-crate-links.rs
index 7c736a4cc..7c736a4cc 100644
--- a/src/test/rustdoc/cross-crate-links.rs
+++ b/tests/rustdoc/cross-crate-links.rs
diff --git a/src/test/rustdoc/cross-crate-primitive-doc.rs b/tests/rustdoc/cross-crate-primitive-doc.rs
index 4ba296ee0..4ba296ee0 100644
--- a/src/test/rustdoc/cross-crate-primitive-doc.rs
+++ b/tests/rustdoc/cross-crate-primitive-doc.rs
diff --git a/src/test/rustdoc/decl-trailing-whitespace.declaration.html b/tests/rustdoc/decl-trailing-whitespace.declaration.html
index 02b51b344..02b51b344 100644
--- a/src/test/rustdoc/decl-trailing-whitespace.declaration.html
+++ b/tests/rustdoc/decl-trailing-whitespace.declaration.html
diff --git a/src/test/rustdoc/decl-trailing-whitespace.rs b/tests/rustdoc/decl-trailing-whitespace.rs
index e47edc132..e47edc132 100644
--- a/src/test/rustdoc/decl-trailing-whitespace.rs
+++ b/tests/rustdoc/decl-trailing-whitespace.rs
diff --git a/src/test/rustdoc/decl_macro.rs b/tests/rustdoc/decl_macro.rs
index 94ade31b5..94ade31b5 100644
--- a/src/test/rustdoc/decl_macro.rs
+++ b/tests/rustdoc/decl_macro.rs
diff --git a/src/test/rustdoc/decl_macro_priv.rs b/tests/rustdoc/decl_macro_priv.rs
index 4e1279e34..4e1279e34 100644
--- a/src/test/rustdoc/decl_macro_priv.rs
+++ b/tests/rustdoc/decl_macro_priv.rs
diff --git a/src/test/rustdoc/deep-structures.rs b/tests/rustdoc/deep-structures.rs
index cd3b0d3ec..cd3b0d3ec 100644
--- a/src/test/rustdoc/deep-structures.rs
+++ b/tests/rustdoc/deep-structures.rs
diff --git a/src/test/rustdoc/default-impl.rs b/tests/rustdoc/default-impl.rs
index f11b3b29b..f11b3b29b 100644
--- a/src/test/rustdoc/default-impl.rs
+++ b/tests/rustdoc/default-impl.rs
diff --git a/src/test/rustdoc/default-theme.rs b/tests/rustdoc/default-theme.rs
index ecb8f0b3b..ecb8f0b3b 100644
--- a/src/test/rustdoc/default-theme.rs
+++ b/tests/rustdoc/default-theme.rs
diff --git a/src/test/rustdoc/default-trait-method-link.rs b/tests/rustdoc/default-trait-method-link.rs
index 7bcd2a3c1..7bcd2a3c1 100644
--- a/src/test/rustdoc/default-trait-method-link.rs
+++ b/tests/rustdoc/default-trait-method-link.rs
diff --git a/src/test/rustdoc/default-trait-method.rs b/tests/rustdoc/default-trait-method.rs
index 6d0e339c4..6d0e339c4 100644
--- a/src/test/rustdoc/default-trait-method.rs
+++ b/tests/rustdoc/default-trait-method.rs
diff --git a/src/test/rustdoc/deprecated-future-staged-api.rs b/tests/rustdoc/deprecated-future-staged-api.rs
index 2670e7f5d..2670e7f5d 100644
--- a/src/test/rustdoc/deprecated-future-staged-api.rs
+++ b/tests/rustdoc/deprecated-future-staged-api.rs
diff --git a/src/test/rustdoc/deprecated-future.rs b/tests/rustdoc/deprecated-future.rs
index 7db8cc602..7db8cc602 100644
--- a/src/test/rustdoc/deprecated-future.rs
+++ b/tests/rustdoc/deprecated-future.rs
diff --git a/src/test/rustdoc/deprecated-impls.rs b/tests/rustdoc/deprecated-impls.rs
index e419d2631..e419d2631 100644
--- a/src/test/rustdoc/deprecated-impls.rs
+++ b/tests/rustdoc/deprecated-impls.rs
diff --git a/src/test/rustdoc/deprecated.rs b/tests/rustdoc/deprecated.rs
index b3178da98..b3178da98 100644
--- a/src/test/rustdoc/deprecated.rs
+++ b/tests/rustdoc/deprecated.rs
diff --git a/src/test/rustdoc/deref-const-fn.rs b/tests/rustdoc/deref-const-fn.rs
index 8ecca6d12..8ecca6d12 100644
--- a/src/test/rustdoc/deref-const-fn.rs
+++ b/tests/rustdoc/deref-const-fn.rs
diff --git a/src/test/rustdoc/deref-mut-methods.rs b/tests/rustdoc/deref-mut-methods.rs
index fdf843422..fdf843422 100644
--- a/src/test/rustdoc/deref-mut-methods.rs
+++ b/tests/rustdoc/deref-mut-methods.rs
diff --git a/src/test/rustdoc/deref-recursive-pathbuf.rs b/tests/rustdoc/deref-recursive-pathbuf.rs
index be2b42b5a..be2b42b5a 100644
--- a/src/test/rustdoc/deref-recursive-pathbuf.rs
+++ b/tests/rustdoc/deref-recursive-pathbuf.rs
diff --git a/src/test/rustdoc/deref-recursive.rs b/tests/rustdoc/deref-recursive.rs
index 0436f2f86..0436f2f86 100644
--- a/src/test/rustdoc/deref-recursive.rs
+++ b/tests/rustdoc/deref-recursive.rs
diff --git a/src/test/rustdoc/deref-slice-core.rs b/tests/rustdoc/deref-slice-core.rs
index cccf273a8..cccf273a8 100644
--- a/src/test/rustdoc/deref-slice-core.rs
+++ b/tests/rustdoc/deref-slice-core.rs
diff --git a/src/test/rustdoc/deref-to-primitive.rs b/tests/rustdoc/deref-to-primitive.rs
index 527de780d..527de780d 100644
--- a/src/test/rustdoc/deref-to-primitive.rs
+++ b/tests/rustdoc/deref-to-primitive.rs
diff --git a/src/test/rustdoc/deref-typedef.rs b/tests/rustdoc/deref-typedef.rs
index 32424d13e..32424d13e 100644
--- a/src/test/rustdoc/deref-typedef.rs
+++ b/tests/rustdoc/deref-typedef.rs
diff --git a/src/test/rustdoc/description.rs b/tests/rustdoc/description.rs
index 05ec42822..05ec42822 100644
--- a/src/test/rustdoc/description.rs
+++ b/tests/rustdoc/description.rs
diff --git a/src/test/rustdoc/description_default.rs b/tests/rustdoc/description_default.rs
index 21d8e04d3..21d8e04d3 100644
--- a/src/test/rustdoc/description_default.rs
+++ b/tests/rustdoc/description_default.rs
diff --git a/src/test/rustdoc/doc-assoc-item.rs b/tests/rustdoc/doc-assoc-item.rs
index 4f1541865..4f1541865 100644
--- a/src/test/rustdoc/doc-assoc-item.rs
+++ b/tests/rustdoc/doc-assoc-item.rs
diff --git a/src/test/rustdoc/doc-auto-cfg.rs b/tests/rustdoc/doc-auto-cfg.rs
index 7842ee69c..7842ee69c 100644
--- a/src/test/rustdoc/doc-auto-cfg.rs
+++ b/tests/rustdoc/doc-auto-cfg.rs
diff --git a/src/test/rustdoc/doc-cfg-hide.rs b/tests/rustdoc/doc-cfg-hide.rs
index 636957fe9..636957fe9 100644
--- a/src/test/rustdoc/doc-cfg-hide.rs
+++ b/tests/rustdoc/doc-cfg-hide.rs
diff --git a/src/test/rustdoc/doc-cfg-implicit-gate.rs b/tests/rustdoc/doc-cfg-implicit-gate.rs
index 92804d372..92804d372 100644
--- a/src/test/rustdoc/doc-cfg-implicit-gate.rs
+++ b/tests/rustdoc/doc-cfg-implicit-gate.rs
diff --git a/src/test/rustdoc/doc-cfg-implicit.rs b/tests/rustdoc/doc-cfg-implicit.rs
index 5d17a4ede..5d17a4ede 100644
--- a/src/test/rustdoc/doc-cfg-implicit.rs
+++ b/tests/rustdoc/doc-cfg-implicit.rs
diff --git a/src/test/rustdoc/doc-cfg-simplification.rs b/tests/rustdoc/doc-cfg-simplification.rs
index 633df661b..633df661b 100644
--- a/src/test/rustdoc/doc-cfg-simplification.rs
+++ b/tests/rustdoc/doc-cfg-simplification.rs
diff --git a/src/test/rustdoc/doc-cfg-target-feature.rs b/tests/rustdoc/doc-cfg-target-feature.rs
index f1b000dc8..f1b000dc8 100644
--- a/src/test/rustdoc/doc-cfg-target-feature.rs
+++ b/tests/rustdoc/doc-cfg-target-feature.rs
diff --git a/src/test/rustdoc/doc-cfg-traits.rs b/tests/rustdoc/doc-cfg-traits.rs
index 13407b2c7..13407b2c7 100644
--- a/src/test/rustdoc/doc-cfg-traits.rs
+++ b/tests/rustdoc/doc-cfg-traits.rs
diff --git a/src/test/rustdoc/doc-cfg.rs b/tests/rustdoc/doc-cfg.rs
index 4cddb0b76..4cddb0b76 100644
--- a/src/test/rustdoc/doc-cfg.rs
+++ b/tests/rustdoc/doc-cfg.rs
diff --git a/src/test/rustdoc/doc-notable_trait-mut_t_is_not_an_iterator.rs b/tests/rustdoc/doc-notable_trait-mut_t_is_not_an_iterator.rs
index bfce46cf4..bfce46cf4 100644
--- a/src/test/rustdoc/doc-notable_trait-mut_t_is_not_an_iterator.rs
+++ b/tests/rustdoc/doc-notable_trait-mut_t_is_not_an_iterator.rs
diff --git a/src/test/rustdoc/doc-notable_trait-mut_t_is_not_ref_t.rs b/tests/rustdoc/doc-notable_trait-mut_t_is_not_ref_t.rs
index b359dcea0..b359dcea0 100644
--- a/src/test/rustdoc/doc-notable_trait-mut_t_is_not_ref_t.rs
+++ b/tests/rustdoc/doc-notable_trait-mut_t_is_not_ref_t.rs
diff --git a/tests/rustdoc/doc-notable_trait-slice.bare_fn_matches.html b/tests/rustdoc/doc-notable_trait-slice.bare_fn_matches.html
new file mode 100644
index 000000000..46be00a08
--- /dev/null
+++ b/tests/rustdoc/doc-notable_trait-slice.bare_fn_matches.html
@@ -0,0 +1 @@
+<script type="text/json" id="notable-traits-data">{"&amp;'static [SomeStruct]":"&lt;h3&gt;Notable traits for &lt;code&gt;&amp;amp;[&lt;a class=\"struct\" href=\"struct.SomeStruct.html\" title=\"struct doc_notable_trait_slice::SomeStruct\"&gt;SomeStruct&lt;/a&gt;]&lt;/code&gt;&lt;/h3&gt;&lt;pre&gt;&lt;code&gt;&lt;span class=\"where fmt-newline\"&gt;impl &lt;a class=\"trait\" href=\"trait.SomeTrait.html\" title=\"trait doc_notable_trait_slice::SomeTrait\"&gt;SomeTrait&lt;/a&gt; for &amp;amp;[&lt;a class=\"struct\" href=\"struct.SomeStruct.html\" title=\"struct doc_notable_trait_slice::SomeStruct\"&gt;SomeStruct&lt;/a&gt;]&lt;/span&gt;"}</script>
\ No newline at end of file
diff --git a/src/test/rustdoc/doc-notable_trait-slice.rs b/tests/rustdoc/doc-notable_trait-slice.rs
index 2411da8cd..2411da8cd 100644
--- a/src/test/rustdoc/doc-notable_trait-slice.rs
+++ b/tests/rustdoc/doc-notable_trait-slice.rs
diff --git a/tests/rustdoc/doc-notable_trait.bare-fn.html b/tests/rustdoc/doc-notable_trait.bare-fn.html
new file mode 100644
index 000000000..f592e3b37
--- /dev/null
+++ b/tests/rustdoc/doc-notable_trait.bare-fn.html
@@ -0,0 +1 @@
+<script type="text/json" id="notable-traits-data">{"SomeStruct":"&lt;h3&gt;Notable traits for &lt;code&gt;&lt;a class=\"struct\" href=\"struct.SomeStruct.html\" title=\"struct doc_notable_trait::SomeStruct\"&gt;SomeStruct&lt;/a&gt;&lt;/code&gt;&lt;/h3&gt;&lt;pre&gt;&lt;code&gt;&lt;span class=\"where fmt-newline\"&gt;impl &lt;a class=\"trait\" href=\"trait.SomeTrait.html\" title=\"trait doc_notable_trait::SomeTrait\"&gt;SomeTrait&lt;/a&gt; for &lt;a class=\"struct\" href=\"struct.SomeStruct.html\" title=\"struct doc_notable_trait::SomeStruct\"&gt;SomeStruct&lt;/a&gt;&lt;/span&gt;"}</script>
\ No newline at end of file
diff --git a/src/test/rustdoc/doc-notable_trait.rs b/tests/rustdoc/doc-notable_trait.rs
index 279faf554..279faf554 100644
--- a/src/test/rustdoc/doc-notable_trait.rs
+++ b/tests/rustdoc/doc-notable_trait.rs
diff --git a/tests/rustdoc/doc-notable_trait.some-struct-new.html b/tests/rustdoc/doc-notable_trait.some-struct-new.html
new file mode 100644
index 000000000..384be6689
--- /dev/null
+++ b/tests/rustdoc/doc-notable_trait.some-struct-new.html
@@ -0,0 +1 @@
+<script type="text/json" id="notable-traits-data">{"SomeStruct":"&lt;h3&gt;Notable traits for &lt;code&gt;&lt;a class=\"struct\" href=\"struct.SomeStruct.html\" title=\"struct doc_notable_trait::SomeStruct\"&gt;SomeStruct&lt;/a&gt;&lt;/code&gt;&lt;/h3&gt;&lt;pre&gt;&lt;code&gt;&lt;span class=\"where fmt-newline\"&gt;impl &lt;a class=\"trait\" href=\"trait.SomeTrait.html\" title=\"trait doc_notable_trait::SomeTrait\"&gt;SomeTrait&lt;/a&gt; for &lt;a class=\"struct\" href=\"struct.SomeStruct.html\" title=\"struct doc_notable_trait::SomeStruct\"&gt;SomeStruct&lt;/a&gt;&lt;/span&gt;","Wrapper&lt;Self&gt;":"&lt;h3&gt;Notable traits for &lt;code&gt;&lt;a class=\"struct\" href=\"struct.Wrapper.html\" title=\"struct doc_notable_trait::Wrapper\"&gt;Wrapper&lt;/a&gt;&amp;lt;T&amp;gt;&lt;/code&gt;&lt;/h3&gt;&lt;pre&gt;&lt;code&gt;&lt;span class=\"where fmt-newline\"&gt;impl&amp;lt;T:&amp;nbsp;&lt;a class=\"trait\" href=\"trait.SomeTrait.html\" title=\"trait doc_notable_trait::SomeTrait\"&gt;SomeTrait&lt;/a&gt;&amp;gt; &lt;a class=\"trait\" href=\"trait.SomeTrait.html\" title=\"trait doc_notable_trait::SomeTrait\"&gt;SomeTrait&lt;/a&gt; for &lt;a class=\"struct\" href=\"struct.Wrapper.html\" title=\"struct doc_notable_trait::Wrapper\"&gt;Wrapper&lt;/a&gt;&amp;lt;T&amp;gt;&lt;/span&gt;"}</script>
\ No newline at end of file
diff --git a/tests/rustdoc/doc-notable_trait.wrap-me.html b/tests/rustdoc/doc-notable_trait.wrap-me.html
new file mode 100644
index 000000000..0cc1ee10f
--- /dev/null
+++ b/tests/rustdoc/doc-notable_trait.wrap-me.html
@@ -0,0 +1 @@
+<script type="text/json" id="notable-traits-data">{"Wrapper&lt;Self&gt;":"&lt;h3&gt;Notable traits for &lt;code&gt;&lt;a class=\"struct\" href=\"struct.Wrapper.html\" title=\"struct doc_notable_trait::Wrapper\"&gt;Wrapper&lt;/a&gt;&amp;lt;T&amp;gt;&lt;/code&gt;&lt;/h3&gt;&lt;pre&gt;&lt;code&gt;&lt;span class=\"where fmt-newline\"&gt;impl&amp;lt;T:&amp;nbsp;&lt;a class=\"trait\" href=\"trait.SomeTrait.html\" title=\"trait doc_notable_trait::SomeTrait\"&gt;SomeTrait&lt;/a&gt;&amp;gt; &lt;a class=\"trait\" href=\"trait.SomeTrait.html\" title=\"trait doc_notable_trait::SomeTrait\"&gt;SomeTrait&lt;/a&gt; for &lt;a class=\"struct\" href=\"struct.Wrapper.html\" title=\"struct doc_notable_trait::Wrapper\"&gt;Wrapper&lt;/a&gt;&amp;lt;T&amp;gt;&lt;/span&gt;"}</script>
\ No newline at end of file
diff --git a/src/test/rustdoc/doc-notable_trait_box_is_not_an_iterator.rs b/tests/rustdoc/doc-notable_trait_box_is_not_an_iterator.rs
index 3fb00c7db..3fb00c7db 100644
--- a/src/test/rustdoc/doc-notable_trait_box_is_not_an_iterator.rs
+++ b/tests/rustdoc/doc-notable_trait_box_is_not_an_iterator.rs
diff --git a/src/test/rustdoc/doc-proc-macro.rs b/tests/rustdoc/doc-proc-macro.rs
index 19172ffa4..19172ffa4 100644
--- a/src/test/rustdoc/doc-proc-macro.rs
+++ b/tests/rustdoc/doc-proc-macro.rs
diff --git a/src/test/rustdoc/doc_auto_cfg_nested_impl.rs b/tests/rustdoc/doc_auto_cfg_nested_impl.rs
index 4d73e0d82..4d73e0d82 100644
--- a/src/test/rustdoc/doc_auto_cfg_nested_impl.rs
+++ b/tests/rustdoc/doc_auto_cfg_nested_impl.rs
diff --git a/src/test/rustdoc/doctest-manual-crate-name.rs b/tests/rustdoc/doctest-manual-crate-name.rs
index 3a5e3734e..3a5e3734e 100644
--- a/src/test/rustdoc/doctest-manual-crate-name.rs
+++ b/tests/rustdoc/doctest-manual-crate-name.rs
diff --git a/src/test/rustdoc/double-quote-escape.rs b/tests/rustdoc/double-quote-escape.rs
index 350c89741..350c89741 100644
--- a/src/test/rustdoc/double-quote-escape.rs
+++ b/tests/rustdoc/double-quote-escape.rs
diff --git a/src/test/rustdoc/duplicate-cfg.rs b/tests/rustdoc/duplicate-cfg.rs
index 18f3900b2..18f3900b2 100644
--- a/src/test/rustdoc/duplicate-cfg.rs
+++ b/tests/rustdoc/duplicate-cfg.rs
diff --git a/src/test/rustdoc/duplicate-flags.rs b/tests/rustdoc/duplicate-flags.rs
index dde36df2c..dde36df2c 100644
--- a/src/test/rustdoc/duplicate-flags.rs
+++ b/tests/rustdoc/duplicate-flags.rs
diff --git a/src/test/rustdoc/duplicate_impls/impls.rs b/tests/rustdoc/duplicate_impls/impls.rs
index 6875ad272..6875ad272 100644
--- a/src/test/rustdoc/duplicate_impls/impls.rs
+++ b/tests/rustdoc/duplicate_impls/impls.rs
diff --git a/src/test/rustdoc/duplicate_impls/issue-33054.rs b/tests/rustdoc/duplicate_impls/issue-33054.rs
index c1f95ac91..c1f95ac91 100644
--- a/src/test/rustdoc/duplicate_impls/issue-33054.rs
+++ b/tests/rustdoc/duplicate_impls/issue-33054.rs
diff --git a/src/test/rustdoc/duplicated_impl.rs b/tests/rustdoc/duplicated_impl.rs
index 4e901b31c..4e901b31c 100644
--- a/src/test/rustdoc/duplicated_impl.rs
+++ b/tests/rustdoc/duplicated_impl.rs
diff --git a/src/test/rustdoc/early-unindent.rs b/tests/rustdoc/early-unindent.rs
index 791a452c9..791a452c9 100644
--- a/src/test/rustdoc/early-unindent.rs
+++ b/tests/rustdoc/early-unindent.rs
diff --git a/src/test/rustdoc/edition-doctest.rs b/tests/rustdoc/edition-doctest.rs
index 6de25996b..6de25996b 100644
--- a/src/test/rustdoc/edition-doctest.rs
+++ b/tests/rustdoc/edition-doctest.rs
diff --git a/src/test/rustdoc/edition-flag.rs b/tests/rustdoc/edition-flag.rs
index e54c7d296..e54c7d296 100644
--- a/src/test/rustdoc/edition-flag.rs
+++ b/tests/rustdoc/edition-flag.rs
diff --git a/src/test/rustdoc/elided-lifetime.rs b/tests/rustdoc/elided-lifetime.rs
index 006132ef8..006132ef8 100644
--- a/src/test/rustdoc/elided-lifetime.rs
+++ b/tests/rustdoc/elided-lifetime.rs
diff --git a/src/test/rustdoc/empty-doc-comment.rs b/tests/rustdoc/empty-doc-comment.rs
index b1dae930e..b1dae930e 100644
--- a/src/test/rustdoc/empty-doc-comment.rs
+++ b/tests/rustdoc/empty-doc-comment.rs
diff --git a/src/test/rustdoc/empty-impl-block-private-with-doc.rs b/tests/rustdoc/empty-impl-block-private-with-doc.rs
index 439719961..439719961 100644
--- a/src/test/rustdoc/empty-impl-block-private-with-doc.rs
+++ b/tests/rustdoc/empty-impl-block-private-with-doc.rs
diff --git a/src/test/rustdoc/empty-impl-block-private.rs b/tests/rustdoc/empty-impl-block-private.rs
index 5caf02065..5caf02065 100644
--- a/src/test/rustdoc/empty-impl-block-private.rs
+++ b/tests/rustdoc/empty-impl-block-private.rs
diff --git a/src/test/rustdoc/empty-impl-block.rs b/tests/rustdoc/empty-impl-block.rs
index 95d4db06b..95d4db06b 100644
--- a/src/test/rustdoc/empty-impl-block.rs
+++ b/tests/rustdoc/empty-impl-block.rs
diff --git a/src/test/rustdoc/empty-impls.rs b/tests/rustdoc/empty-impls.rs
index 83902d6f7..83902d6f7 100644
--- a/src/test/rustdoc/empty-impls.rs
+++ b/tests/rustdoc/empty-impls.rs
diff --git a/src/test/rustdoc/empty-mod-private.rs b/tests/rustdoc/empty-mod-private.rs
index 147e11e58..147e11e58 100644
--- a/src/test/rustdoc/empty-mod-private.rs
+++ b/tests/rustdoc/empty-mod-private.rs
diff --git a/src/test/rustdoc/empty-mod-public.rs b/tests/rustdoc/empty-mod-public.rs
index c0bac4021..c0bac4021 100644
--- a/src/test/rustdoc/empty-mod-public.rs
+++ b/tests/rustdoc/empty-mod-public.rs
diff --git a/src/test/rustdoc/empty-section.rs b/tests/rustdoc/empty-section.rs
index d8241ab96..d8241ab96 100644
--- a/src/test/rustdoc/empty-section.rs
+++ b/tests/rustdoc/empty-section.rs
diff --git a/src/test/rustdoc/ensure-src-link.rs b/tests/rustdoc/ensure-src-link.rs
index c65387080..c65387080 100644
--- a/src/test/rustdoc/ensure-src-link.rs
+++ b/tests/rustdoc/ensure-src-link.rs
diff --git a/src/test/rustdoc/enum-headings.rs b/tests/rustdoc/enum-headings.rs
index 2e5c34391..2e5c34391 100644
--- a/src/test/rustdoc/enum-headings.rs
+++ b/tests/rustdoc/enum-headings.rs
diff --git a/src/test/rustdoc/escape-deref-methods.rs b/tests/rustdoc/escape-deref-methods.rs
index 66919d73e..66919d73e 100644
--- a/src/test/rustdoc/escape-deref-methods.rs
+++ b/tests/rustdoc/escape-deref-methods.rs
diff --git a/src/test/rustdoc/extern-default-method.no_href_on_anchor.html b/tests/rustdoc/extern-default-method.no_href_on_anchor.html
index ef14836cc..ef14836cc 100644
--- a/src/test/rustdoc/extern-default-method.no_href_on_anchor.html
+++ b/tests/rustdoc/extern-default-method.no_href_on_anchor.html
diff --git a/src/test/rustdoc/extern-default-method.rs b/tests/rustdoc/extern-default-method.rs
index fc28b230a..fc28b230a 100644
--- a/src/test/rustdoc/extern-default-method.rs
+++ b/tests/rustdoc/extern-default-method.rs
diff --git a/src/test/rustdoc/extern-html-root-url-precedence.rs b/tests/rustdoc/extern-html-root-url-precedence.rs
index def6767ea..def6767ea 100644
--- a/src/test/rustdoc/extern-html-root-url-precedence.rs
+++ b/tests/rustdoc/extern-html-root-url-precedence.rs
diff --git a/src/test/rustdoc/extern-html-root-url.rs b/tests/rustdoc/extern-html-root-url.rs
index 17eedcf2a..17eedcf2a 100644
--- a/src/test/rustdoc/extern-html-root-url.rs
+++ b/tests/rustdoc/extern-html-root-url.rs
diff --git a/src/test/rustdoc/extern-impl-trait.rs b/tests/rustdoc/extern-impl-trait.rs
index 8ab026afd..8ab026afd 100644
--- a/src/test/rustdoc/extern-impl-trait.rs
+++ b/tests/rustdoc/extern-impl-trait.rs
diff --git a/src/test/rustdoc/extern-impl.rs b/tests/rustdoc/extern-impl.rs
index fd1bc2140..fd1bc2140 100644
--- a/src/test/rustdoc/extern-impl.rs
+++ b/tests/rustdoc/extern-impl.rs
diff --git a/src/test/rustdoc/extern-links.rs b/tests/rustdoc/extern-links.rs
index 0383ccf7d..0383ccf7d 100644
--- a/src/test/rustdoc/extern-links.rs
+++ b/tests/rustdoc/extern-links.rs
diff --git a/src/test/rustdoc/extern-method.rs b/tests/rustdoc/extern-method.rs
index 9cf5fc190..9cf5fc190 100644
--- a/src/test/rustdoc/extern-method.rs
+++ b/tests/rustdoc/extern-method.rs
diff --git a/src/test/rustdoc/external-cross.rs b/tests/rustdoc/external-cross.rs
index 3f8e16882..3f8e16882 100644
--- a/src/test/rustdoc/external-cross.rs
+++ b/tests/rustdoc/external-cross.rs
diff --git a/src/test/rustdoc/external-doc.rs b/tests/rustdoc/external-doc.rs
index bd322d67a..bd322d67a 100644
--- a/src/test/rustdoc/external-doc.rs
+++ b/tests/rustdoc/external-doc.rs
diff --git a/src/test/rustdoc/external-macro-src.rs b/tests/rustdoc/external-macro-src.rs
index 359551ab7..359551ab7 100644
--- a/src/test/rustdoc/external-macro-src.rs
+++ b/tests/rustdoc/external-macro-src.rs
diff --git a/src/test/rustdoc/feature-gate-doc_auto_cfg.rs b/tests/rustdoc/feature-gate-doc_auto_cfg.rs
index da76381e4..da76381e4 100644
--- a/src/test/rustdoc/feature-gate-doc_auto_cfg.rs
+++ b/tests/rustdoc/feature-gate-doc_auto_cfg.rs
diff --git a/src/test/rustdoc/ffi.rs b/tests/rustdoc/ffi.rs
index 8140dfc72..8140dfc72 100644
--- a/src/test/rustdoc/ffi.rs
+++ b/tests/rustdoc/ffi.rs
diff --git a/src/test/rustdoc/fn-bound.rs b/tests/rustdoc/fn-bound.rs
index 9e060ff20..9e060ff20 100644
--- a/src/test/rustdoc/fn-bound.rs
+++ b/tests/rustdoc/fn-bound.rs
diff --git a/tests/rustdoc/fn-pointer-arg-name.rs b/tests/rustdoc/fn-pointer-arg-name.rs
new file mode 100644
index 000000000..96c64ac4e
--- /dev/null
+++ b/tests/rustdoc/fn-pointer-arg-name.rs
@@ -0,0 +1,5 @@
+#![crate_name = "foo"]
+
+// @has foo/fn.f.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub fn f(callback: fn(len: usize, foo: u32))'
+pub fn f(callback: fn(len: usize, foo: u32)) {}
diff --git a/src/test/rustdoc/fn-sidebar.rs b/tests/rustdoc/fn-sidebar.rs
index 2fe8ebec1..2fe8ebec1 100644
--- a/src/test/rustdoc/fn-sidebar.rs
+++ b/tests/rustdoc/fn-sidebar.rs
diff --git a/src/test/rustdoc/fn-type.rs b/tests/rustdoc/fn-type.rs
index 3959aeb6c..3959aeb6c 100644
--- a/src/test/rustdoc/fn-type.rs
+++ b/tests/rustdoc/fn-type.rs
diff --git a/src/test/rustdoc/force-target-feature.rs b/tests/rustdoc/force-target-feature.rs
index b6c10e834..b6c10e834 100644
--- a/src/test/rustdoc/force-target-feature.rs
+++ b/tests/rustdoc/force-target-feature.rs
diff --git a/src/test/rustdoc/foreigntype-reexport.rs b/tests/rustdoc/foreigntype-reexport.rs
index 1dec0ef3e..1dec0ef3e 100644
--- a/src/test/rustdoc/foreigntype-reexport.rs
+++ b/tests/rustdoc/foreigntype-reexport.rs
diff --git a/src/test/rustdoc/foreigntype.rs b/tests/rustdoc/foreigntype.rs
index 29f9c2926..29f9c2926 100644
--- a/src/test/rustdoc/foreigntype.rs
+++ b/tests/rustdoc/foreigntype.rs
diff --git a/src/test/rustdoc/generic-associated-types/gats.rs b/tests/rustdoc/generic-associated-types/gats.rs
index bcead3115..bcead3115 100644
--- a/src/test/rustdoc/generic-associated-types/gats.rs
+++ b/tests/rustdoc/generic-associated-types/gats.rs
diff --git a/src/test/rustdoc/generic-associated-types/issue-94683.rs b/tests/rustdoc/generic-associated-types/issue-94683.rs
index 985c7e983..985c7e983 100644
--- a/src/test/rustdoc/generic-associated-types/issue-94683.rs
+++ b/tests/rustdoc/generic-associated-types/issue-94683.rs
diff --git a/src/test/rustdoc/generic-impl.rs b/tests/rustdoc/generic-impl.rs
index 6f68b1574..6f68b1574 100644
--- a/src/test/rustdoc/generic-impl.rs
+++ b/tests/rustdoc/generic-impl.rs
diff --git a/src/test/rustdoc/generic_const_exprs.rs b/tests/rustdoc/generic_const_exprs.rs
index 6ff591639..6ff591639 100644
--- a/src/test/rustdoc/generic_const_exprs.rs
+++ b/tests/rustdoc/generic_const_exprs.rs
diff --git a/src/test/rustdoc/glob-shadowing-const.rs b/tests/rustdoc/glob-shadowing-const.rs
index 5b786cf53..5b786cf53 100644
--- a/src/test/rustdoc/glob-shadowing-const.rs
+++ b/tests/rustdoc/glob-shadowing-const.rs
diff --git a/src/test/rustdoc/glob-shadowing.rs b/tests/rustdoc/glob-shadowing.rs
index 66a31c42b..66a31c42b 100644
--- a/src/test/rustdoc/glob-shadowing.rs
+++ b/tests/rustdoc/glob-shadowing.rs
diff --git a/src/test/rustdoc/hidden-impls.rs b/tests/rustdoc/hidden-impls.rs
index 26e2e0e06..26e2e0e06 100644
--- a/src/test/rustdoc/hidden-impls.rs
+++ b/tests/rustdoc/hidden-impls.rs
diff --git a/src/test/rustdoc/hidden-line.rs b/tests/rustdoc/hidden-line.rs
index 00a05a7c2..00a05a7c2 100644
--- a/src/test/rustdoc/hidden-line.rs
+++ b/tests/rustdoc/hidden-line.rs
diff --git a/src/test/rustdoc/hidden-methods.rs b/tests/rustdoc/hidden-methods.rs
index 543d8f768..543d8f768 100644
--- a/src/test/rustdoc/hidden-methods.rs
+++ b/tests/rustdoc/hidden-methods.rs
diff --git a/src/test/rustdoc/hidden-trait-methods-with-document-hidden-items.rs b/tests/rustdoc/hidden-trait-methods-with-document-hidden-items.rs
index 95b3e9b65..95b3e9b65 100644
--- a/src/test/rustdoc/hidden-trait-methods-with-document-hidden-items.rs
+++ b/tests/rustdoc/hidden-trait-methods-with-document-hidden-items.rs
diff --git a/src/test/rustdoc/hidden-trait-methods.rs b/tests/rustdoc/hidden-trait-methods.rs
index e924ba7d0..e924ba7d0 100644
--- a/src/test/rustdoc/hidden-trait-methods.rs
+++ b/tests/rustdoc/hidden-trait-methods.rs
diff --git a/src/test/rustdoc/hidden-trait-struct-impls.rs b/tests/rustdoc/hidden-trait-struct-impls.rs
index cc3f63377..cc3f63377 100644
--- a/src/test/rustdoc/hidden-trait-struct-impls.rs
+++ b/tests/rustdoc/hidden-trait-struct-impls.rs
diff --git a/src/test/rustdoc/hide-complex-unevaluated-const-arguments.rs b/tests/rustdoc/hide-complex-unevaluated-const-arguments.rs
index 644a6e1cf..406157ce2 100644
--- a/src/test/rustdoc/hide-complex-unevaluated-const-arguments.rs
+++ b/tests/rustdoc/hide-complex-unevaluated-const-arguments.rs
@@ -63,7 +63,7 @@ impl<const S: Struct, St: Stage + ?Sized> Helper<S> for St {
 // this test as long as one can ensure that private fields are not leaked!
 //
 // @has hide_complex_unevaluated_const_arguments/trait.Sub.html \
-//      '//*[@class="rust trait"]' \
+//      '//div[@class="item-decl"]/pre[@class="rust"]' \
 //      'pub trait Sub: Sup<{ _ }, { _ }> { }'
 pub trait Sub: Sup<{ 90 * 20 * 4 }, { Struct { private: () } }> {}
 
diff --git a/src/test/rustdoc/hide-complex-unevaluated-consts.rs b/tests/rustdoc/hide-complex-unevaluated-consts.rs
index ba623246a..ba623246a 100644
--- a/src/test/rustdoc/hide-complex-unevaluated-consts.rs
+++ b/tests/rustdoc/hide-complex-unevaluated-consts.rs
diff --git a/src/test/rustdoc/hide-unstable-trait.rs b/tests/rustdoc/hide-unstable-trait.rs
index 0bf7cabc4..0bf7cabc4 100644
--- a/src/test/rustdoc/hide-unstable-trait.rs
+++ b/tests/rustdoc/hide-unstable-trait.rs
diff --git a/src/test/rustdoc/higher-ranked-trait-bounds.rs b/tests/rustdoc/higher-ranked-trait-bounds.rs
index 3493ae6d2..3493ae6d2 100644
--- a/src/test/rustdoc/higher-ranked-trait-bounds.rs
+++ b/tests/rustdoc/higher-ranked-trait-bounds.rs
diff --git a/src/test/rustdoc/impl-box.rs b/tests/rustdoc/impl-box.rs
index 592b6c985..592b6c985 100644
--- a/src/test/rustdoc/impl-box.rs
+++ b/tests/rustdoc/impl-box.rs
diff --git a/src/test/rustdoc/impl-disambiguation.rs b/tests/rustdoc/impl-disambiguation.rs
index 9e74ede8f..9e74ede8f 100644
--- a/src/test/rustdoc/impl-disambiguation.rs
+++ b/tests/rustdoc/impl-disambiguation.rs
diff --git a/src/test/rustdoc/impl-everywhere.rs b/tests/rustdoc/impl-everywhere.rs
index 44885d430..44885d430 100644
--- a/src/test/rustdoc/impl-everywhere.rs
+++ b/tests/rustdoc/impl-everywhere.rs
diff --git a/src/test/rustdoc/impl-parts-crosscrate.rs b/tests/rustdoc/impl-parts-crosscrate.rs
index 34733f1f8..34733f1f8 100644
--- a/src/test/rustdoc/impl-parts-crosscrate.rs
+++ b/tests/rustdoc/impl-parts-crosscrate.rs
diff --git a/src/test/rustdoc/impl-parts.rs b/tests/rustdoc/impl-parts.rs
index 90cbb77cb..90cbb77cb 100644
--- a/src/test/rustdoc/impl-parts.rs
+++ b/tests/rustdoc/impl-parts.rs
diff --git a/src/test/rustdoc/impl-trait-alias.rs b/tests/rustdoc/impl-trait-alias.rs
index 4f681c78e..4f681c78e 100644
--- a/src/test/rustdoc/impl-trait-alias.rs
+++ b/tests/rustdoc/impl-trait-alias.rs
diff --git a/src/test/rustdoc/implementor-stable-version.rs b/tests/rustdoc/implementor-stable-version.rs
index a1f3fd5a8..a1f3fd5a8 100644
--- a/src/test/rustdoc/implementor-stable-version.rs
+++ b/tests/rustdoc/implementor-stable-version.rs
diff --git a/src/test/rustdoc/impossible-default.rs b/tests/rustdoc/impossible-default.rs
index 24d6e3bda..24d6e3bda 100644
--- a/src/test/rustdoc/impossible-default.rs
+++ b/tests/rustdoc/impossible-default.rs
diff --git a/src/test/rustdoc/include_str_cut.rs b/tests/rustdoc/include_str_cut.rs
index cbc1ba8db..cbc1ba8db 100644
--- a/src/test/rustdoc/include_str_cut.rs
+++ b/tests/rustdoc/include_str_cut.rs
diff --git a/src/test/rustdoc/index-page.rs b/tests/rustdoc/index-page.rs
index 0c947ea2e..fc755afda 100644
--- a/src/test/rustdoc/index-page.rs
+++ b/tests/rustdoc/index-page.rs
@@ -5,7 +5,7 @@
 #![crate_name = "foo"]
 
 // @has foo/../index.html
-// @has - '//h1[@class="fqn"]' 'List of all crates'
+// @has - '//h1' 'List of all crates'
 // @has - '//ul[@class="all-items"]//a[@href="foo/index.html"]' 'foo'
 // @has - '//ul[@class="all-items"]//a[@href="all_item_types/index.html"]' 'all_item_types'
 pub struct Foo;
diff --git a/src/test/rustdoc/infinite-redirection.rs b/tests/rustdoc/infinite-redirection.rs
index f037a8e1a..f037a8e1a 100644
--- a/src/test/rustdoc/infinite-redirection.rs
+++ b/tests/rustdoc/infinite-redirection.rs
diff --git a/tests/rustdoc/inline-default-methods.rs b/tests/rustdoc/inline-default-methods.rs
new file mode 100644
index 000000000..a4ca928f3
--- /dev/null
+++ b/tests/rustdoc/inline-default-methods.rs
@@ -0,0 +1,9 @@
+// aux-build:inline-default-methods.rs
+// ignore-cross-compile
+
+extern crate inline_default_methods;
+
+// @has inline_default_methods/trait.Foo.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'fn bar(&self);'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'fn foo(&mut self) { ... }'
+pub use inline_default_methods::Foo;
diff --git a/src/test/rustdoc/inline_cross/add-docs.rs b/tests/rustdoc/inline_cross/add-docs.rs
index a1124d209..a1124d209 100644
--- a/src/test/rustdoc/inline_cross/add-docs.rs
+++ b/tests/rustdoc/inline_cross/add-docs.rs
diff --git a/src/test/rustdoc/inline_cross/assoc-items.rs b/tests/rustdoc/inline_cross/assoc-items.rs
index 811827a17..811827a17 100644
--- a/src/test/rustdoc/inline_cross/assoc-items.rs
+++ b/tests/rustdoc/inline_cross/assoc-items.rs
diff --git a/src/test/rustdoc/inline_cross/assoc_item_trait_bounds.out0.html b/tests/rustdoc/inline_cross/assoc_item_trait_bounds.out0.html
index 8934bc1ee..8934bc1ee 100644
--- a/src/test/rustdoc/inline_cross/assoc_item_trait_bounds.out0.html
+++ b/tests/rustdoc/inline_cross/assoc_item_trait_bounds.out0.html
diff --git a/src/test/rustdoc/inline_cross/assoc_item_trait_bounds.out2.html b/tests/rustdoc/inline_cross/assoc_item_trait_bounds.out2.html
index bf330670e..bf330670e 100644
--- a/src/test/rustdoc/inline_cross/assoc_item_trait_bounds.out2.html
+++ b/tests/rustdoc/inline_cross/assoc_item_trait_bounds.out2.html
diff --git a/src/test/rustdoc/inline_cross/assoc_item_trait_bounds.out9.html b/tests/rustdoc/inline_cross/assoc_item_trait_bounds.out9.html
index 69d84e1b2..69d84e1b2 100644
--- a/src/test/rustdoc/inline_cross/assoc_item_trait_bounds.out9.html
+++ b/tests/rustdoc/inline_cross/assoc_item_trait_bounds.out9.html
diff --git a/src/test/rustdoc/inline_cross/assoc_item_trait_bounds.rs b/tests/rustdoc/inline_cross/assoc_item_trait_bounds.rs
index db2491b87..db2491b87 100644
--- a/src/test/rustdoc/inline_cross/assoc_item_trait_bounds.rs
+++ b/tests/rustdoc/inline_cross/assoc_item_trait_bounds.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/add-docs.rs b/tests/rustdoc/inline_cross/auxiliary/add-docs.rs
index 85efa508f..85efa508f 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/add-docs.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/add-docs.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/assoc-items.rs b/tests/rustdoc/inline_cross/auxiliary/assoc-items.rs
index 5fa299914..5fa299914 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/assoc-items.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/assoc-items.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/assoc_item_trait_bounds.rs b/tests/rustdoc/inline_cross/auxiliary/assoc_item_trait_bounds.rs
index 6644c8e41..6644c8e41 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/assoc_item_trait_bounds.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/assoc_item_trait_bounds.rs
diff --git a/tests/rustdoc/inline_cross/auxiliary/cross-glob.rs b/tests/rustdoc/inline_cross/auxiliary/cross-glob.rs
new file mode 100644
index 000000000..48672590a
--- /dev/null
+++ b/tests/rustdoc/inline_cross/auxiliary/cross-glob.rs
@@ -0,0 +1,7 @@
+#![crate_name = "inner"]
+
+pub struct SomeStruct;
+
+pub fn some_fn() {}
+
+pub enum Shadowed {}
diff --git a/src/test/rustdoc/inline_cross/auxiliary/default-trait-method.rs b/tests/rustdoc/inline_cross/auxiliary/default-trait-method.rs
index ce60bbfb4..ce60bbfb4 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/default-trait-method.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/default-trait-method.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/dyn_trait.rs b/tests/rustdoc/inline_cross/auxiliary/dyn_trait.rs
index 9ac2e3d96..9ac2e3d96 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/dyn_trait.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/dyn_trait.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/impl-inline-without-trait.rs b/tests/rustdoc/inline_cross/auxiliary/impl-inline-without-trait.rs
index 401a6a44a..401a6a44a 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/impl-inline-without-trait.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/impl-inline-without-trait.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/impl_trait_aux.rs b/tests/rustdoc/inline_cross/auxiliary/impl_trait_aux.rs
index 19433c968..19433c968 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/impl_trait_aux.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/impl_trait_aux.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/implementors_inline.rs b/tests/rustdoc/inline_cross/auxiliary/implementors_inline.rs
index b003fb357..b003fb357 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/implementors_inline.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/implementors_inline.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/issue-24183.rs b/tests/rustdoc/inline_cross/auxiliary/issue-24183.rs
index e7a13acc6..e7a13acc6 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/issue-24183.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/issue-24183.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/issue-33113.rs b/tests/rustdoc/inline_cross/auxiliary/issue-33113.rs
index 4e1f1918e..4e1f1918e 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/issue-33113.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/issue-33113.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/macro-vis.rs b/tests/rustdoc/inline_cross/auxiliary/macro-vis.rs
index 5615a4fdd..5615a4fdd 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/macro-vis.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/macro-vis.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/macros.rs b/tests/rustdoc/inline_cross/auxiliary/macros.rs
index 651ae2f1a..651ae2f1a 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/macros.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/macros.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs b/tests/rustdoc/inline_cross/auxiliary/proc_macro.rs
index d8e5746f3..d8e5746f3 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/proc_macro.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/renamed-via-module.rs b/tests/rustdoc/inline_cross/auxiliary/renamed-via-module.rs
index 2e5290782..2e5290782 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/renamed-via-module.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/renamed-via-module.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs b/tests/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs
index 6357b76df..6357b76df 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs b/tests/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs
index 0c75b3127..0c75b3127 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs b/tests/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs
index 4e461d3bc..4e461d3bc 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs b/tests/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs
index 11d8733c4..11d8733c4 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/trait-vis.rs b/tests/rustdoc/inline_cross/auxiliary/trait-vis.rs
index e5bc7969b..e5bc7969b 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/trait-vis.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/trait-vis.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/use_crate.rs b/tests/rustdoc/inline_cross/auxiliary/use_crate.rs
index 75efbe0db..75efbe0db 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/use_crate.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/use_crate.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/use_crate_2.rs b/tests/rustdoc/inline_cross/auxiliary/use_crate_2.rs
index 25b4c202e..25b4c202e 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/use_crate_2.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/use_crate_2.rs
diff --git a/tests/rustdoc/inline_cross/cross-glob.rs b/tests/rustdoc/inline_cross/cross-glob.rs
new file mode 100644
index 000000000..7a519d2d2
--- /dev/null
+++ b/tests/rustdoc/inline_cross/cross-glob.rs
@@ -0,0 +1,16 @@
+// aux-build:cross-glob.rs
+// build-aux-docs
+// ignore-cross-compile
+
+extern crate inner;
+
+// @has cross_glob/struct.SomeStruct.html
+// @has cross_glob/fn.some_fn.html
+// @!has cross_glob/enum.Shadowed.html
+// @!has cross_glob/index.html '//code' 'pub use inner::*;'
+#[doc(inline)]
+pub use inner::*;
+
+// This type shadows the glob-imported enum `Shadowed`.
+// @has cross_glob/type.Shadowed.html
+pub type Shadowed = u8;
diff --git a/src/test/rustdoc/inline_cross/default-trait-method.rs b/tests/rustdoc/inline_cross/default-trait-method.rs
index a4ec73a12..a4ec73a12 100644
--- a/src/test/rustdoc/inline_cross/default-trait-method.rs
+++ b/tests/rustdoc/inline_cross/default-trait-method.rs
diff --git a/src/test/rustdoc/inline_cross/dyn_trait.rs b/tests/rustdoc/inline_cross/dyn_trait.rs
index fa760540e..0da8bfc3a 100644
--- a/src/test/rustdoc/inline_cross/dyn_trait.rs
+++ b/tests/rustdoc/inline_cross/dyn_trait.rs
@@ -22,10 +22,10 @@ pub use dyn_trait::Ty2;
 pub use dyn_trait::Ty3;
 
 // @has user/fn.func0.html
-// @has - '//pre[@class="rust fn"]' "func0(_: &dyn Fn())"
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "func0(_: &dyn Fn())"
 // FIXME(fmease): Show placeholder-lifetime bound, render "func0(_: &(dyn Fn() + '_))"
 pub use dyn_trait::func0;
 
 // @has user/fn.func1.html
-// @has - '//pre[@class="rust fn"]' "func1<'func>(_: &(dyn Fn() + 'func))"
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "func1<'func>(_: &(dyn Fn() + 'func))"
 pub use dyn_trait::func1;
diff --git a/src/test/rustdoc/inline_cross/hidden-use.rs b/tests/rustdoc/inline_cross/hidden-use.rs
index 28a4f4bac..28a4f4bac 100644
--- a/src/test/rustdoc/inline_cross/hidden-use.rs
+++ b/tests/rustdoc/inline_cross/hidden-use.rs
diff --git a/src/test/rustdoc/inline_cross/impl-inline-without-trait.rs b/tests/rustdoc/inline_cross/impl-inline-without-trait.rs
index 9b67022fd..9b67022fd 100644
--- a/src/test/rustdoc/inline_cross/impl-inline-without-trait.rs
+++ b/tests/rustdoc/inline_cross/impl-inline-without-trait.rs
diff --git a/tests/rustdoc/inline_cross/impl_trait.rs b/tests/rustdoc/inline_cross/impl_trait.rs
new file mode 100644
index 000000000..e8587209b
--- /dev/null
+++ b/tests/rustdoc/inline_cross/impl_trait.rs
@@ -0,0 +1,47 @@
+// aux-build:impl_trait_aux.rs
+// edition:2018
+
+extern crate impl_trait_aux;
+
+// @has impl_trait/fn.func.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "pub fn func<'a>(_x: impl Clone + Into<Vec<u8, Global>> + 'a)"
+// @!has - '//div[@class="item-decl"]/pre[@class="rust"]' 'where'
+pub use impl_trait_aux::func;
+
+// @has impl_trait/fn.func2.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "func2<T>("
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "_x: impl Deref<Target = Option<T>> + Iterator<Item = T>,"
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "_y: impl Iterator<Item = u8>)"
+// @!has - '//div[@class="item-decl"]/pre[@class="rust"]' 'where'
+pub use impl_trait_aux::func2;
+
+// @has impl_trait/fn.func3.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "func3("
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "_x: impl Iterator<Item = impl Iterator<Item = u8>> + Clone)"
+// @!has - '//div[@class="item-decl"]/pre[@class="rust"]' 'where'
+pub use impl_trait_aux::func3;
+
+// @has impl_trait/fn.func4.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "func4<T>("
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "T: Iterator<Item = impl Clone>,"
+pub use impl_trait_aux::func4;
+
+// @has impl_trait/fn.func5.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "func5("
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "_f: impl for<'any> Fn(&'any str, &'any str) -> bool + for<'r> Other<T<'r> = ()>,"
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "_a: impl for<'alpha, 'beta> Auxiliary<'alpha, Item<'beta> = fn(_: &'beta ())>"
+// @!has - '//div[@class="item-decl"]/pre[@class="rust"]' 'where'
+pub use impl_trait_aux::func5;
+
+// @has impl_trait/fn.async_fn.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "pub async fn async_fn()"
+pub use impl_trait_aux::async_fn;
+
+// @has impl_trait/struct.Foo.html
+// @has - '//*[@id="method.method"]//h4[@class="code-header"]' "pub fn method<'a>(_x: impl Clone + Into<Vec<u8, Global>> + 'a)"
+// @!has - '//*[@id="method.method"]//h4[@class="code-header"]' 'where'
+pub use impl_trait_aux::Foo;
+
+// @has impl_trait/struct.Bar.html
+// @has - '//*[@id="method.async_foo"]' "pub async fn async_foo("
+pub use impl_trait_aux::Bar;
diff --git a/src/test/rustdoc/inline_cross/implementors-js.rs b/tests/rustdoc/inline_cross/implementors-js.rs
index c79f05d8d..c79f05d8d 100644
--- a/src/test/rustdoc/inline_cross/implementors-js.rs
+++ b/tests/rustdoc/inline_cross/implementors-js.rs
diff --git a/src/test/rustdoc/inline_cross/inline_hidden.rs b/tests/rustdoc/inline_cross/inline_hidden.rs
index dcceaadb9..dcceaadb9 100644
--- a/src/test/rustdoc/inline_cross/inline_hidden.rs
+++ b/tests/rustdoc/inline_cross/inline_hidden.rs
diff --git a/src/test/rustdoc/inline_cross/issue-24183.method_no_where_self_sized.html b/tests/rustdoc/inline_cross/issue-24183.method_no_where_self_sized.html
index f3c1c0452..f3c1c0452 100644
--- a/src/test/rustdoc/inline_cross/issue-24183.method_no_where_self_sized.html
+++ b/tests/rustdoc/inline_cross/issue-24183.method_no_where_self_sized.html
diff --git a/src/test/rustdoc/inline_cross/issue-24183.rs b/tests/rustdoc/inline_cross/issue-24183.rs
index d11b6955f..d11b6955f 100644
--- a/src/test/rustdoc/inline_cross/issue-24183.rs
+++ b/tests/rustdoc/inline_cross/issue-24183.rs
diff --git a/src/test/rustdoc/inline_cross/issue-28480.rs b/tests/rustdoc/inline_cross/issue-28480.rs
index 99f5b9007..99f5b9007 100644
--- a/src/test/rustdoc/inline_cross/issue-28480.rs
+++ b/tests/rustdoc/inline_cross/issue-28480.rs
diff --git a/src/test/rustdoc/inline_cross/issue-31948-1.rs b/tests/rustdoc/inline_cross/issue-31948-1.rs
index 6e89167b3..6e89167b3 100644
--- a/src/test/rustdoc/inline_cross/issue-31948-1.rs
+++ b/tests/rustdoc/inline_cross/issue-31948-1.rs
diff --git a/src/test/rustdoc/inline_cross/issue-31948-2.rs b/tests/rustdoc/inline_cross/issue-31948-2.rs
index 141e07656..141e07656 100644
--- a/src/test/rustdoc/inline_cross/issue-31948-2.rs
+++ b/tests/rustdoc/inline_cross/issue-31948-2.rs
diff --git a/src/test/rustdoc/inline_cross/issue-31948.rs b/tests/rustdoc/inline_cross/issue-31948.rs
index 96fc6ca47..96fc6ca47 100644
--- a/src/test/rustdoc/inline_cross/issue-31948.rs
+++ b/tests/rustdoc/inline_cross/issue-31948.rs
diff --git a/src/test/rustdoc/inline_cross/issue-32881.rs b/tests/rustdoc/inline_cross/issue-32881.rs
index 183fd15ab..183fd15ab 100644
--- a/src/test/rustdoc/inline_cross/issue-32881.rs
+++ b/tests/rustdoc/inline_cross/issue-32881.rs
diff --git a/src/test/rustdoc/inline_cross/issue-33113.rs b/tests/rustdoc/inline_cross/issue-33113.rs
index d954707fa..d954707fa 100644
--- a/src/test/rustdoc/inline_cross/issue-33113.rs
+++ b/tests/rustdoc/inline_cross/issue-33113.rs
diff --git a/src/test/rustdoc/inline_cross/macro-vis.rs b/tests/rustdoc/inline_cross/macro-vis.rs
index 9fefd38ad..9fefd38ad 100644
--- a/src/test/rustdoc/inline_cross/macro-vis.rs
+++ b/tests/rustdoc/inline_cross/macro-vis.rs
diff --git a/src/test/rustdoc/inline_cross/macros.rs b/tests/rustdoc/inline_cross/macros.rs
index 5daa0d4ba..5daa0d4ba 100644
--- a/src/test/rustdoc/inline_cross/macros.rs
+++ b/tests/rustdoc/inline_cross/macros.rs
diff --git a/src/test/rustdoc/inline_cross/proc_macro.rs b/tests/rustdoc/inline_cross/proc_macro.rs
index a46550865..a46550865 100644
--- a/src/test/rustdoc/inline_cross/proc_macro.rs
+++ b/tests/rustdoc/inline_cross/proc_macro.rs
diff --git a/src/test/rustdoc/inline_cross/renamed-via-module.rs b/tests/rustdoc/inline_cross/renamed-via-module.rs
index cdedbf070..cdedbf070 100644
--- a/src/test/rustdoc/inline_cross/renamed-via-module.rs
+++ b/tests/rustdoc/inline_cross/renamed-via-module.rs
diff --git a/src/test/rustdoc/inline_cross/trait-vis.rs b/tests/rustdoc/inline_cross/trait-vis.rs
index b646babac..b646babac 100644
--- a/src/test/rustdoc/inline_cross/trait-vis.rs
+++ b/tests/rustdoc/inline_cross/trait-vis.rs
diff --git a/src/test/rustdoc/inline_cross/use_crate.rs b/tests/rustdoc/inline_cross/use_crate.rs
index 00e0f041c..00e0f041c 100644
--- a/src/test/rustdoc/inline_cross/use_crate.rs
+++ b/tests/rustdoc/inline_cross/use_crate.rs
diff --git a/src/test/rustdoc/inline_local/glob-extern-document-private-items.rs b/tests/rustdoc/inline_local/glob-extern-document-private-items.rs
index 8e1089d60..8e1089d60 100644
--- a/src/test/rustdoc/inline_local/glob-extern-document-private-items.rs
+++ b/tests/rustdoc/inline_local/glob-extern-document-private-items.rs
diff --git a/src/test/rustdoc/inline_local/glob-extern.rs b/tests/rustdoc/inline_local/glob-extern.rs
index c592a4db1..c592a4db1 100644
--- a/src/test/rustdoc/inline_local/glob-extern.rs
+++ b/tests/rustdoc/inline_local/glob-extern.rs
diff --git a/src/test/rustdoc/inline_local/glob-private-document-private-items.rs b/tests/rustdoc/inline_local/glob-private-document-private-items.rs
index d8cbd4234..d8cbd4234 100644
--- a/src/test/rustdoc/inline_local/glob-private-document-private-items.rs
+++ b/tests/rustdoc/inline_local/glob-private-document-private-items.rs
diff --git a/src/test/rustdoc/inline_local/glob-private.rs b/tests/rustdoc/inline_local/glob-private.rs
index 303f1d610..303f1d610 100644
--- a/src/test/rustdoc/inline_local/glob-private.rs
+++ b/tests/rustdoc/inline_local/glob-private.rs
diff --git a/src/test/rustdoc/inline_local/hidden-use.rs b/tests/rustdoc/inline_local/hidden-use.rs
index de512fb26..de512fb26 100644
--- a/src/test/rustdoc/inline_local/hidden-use.rs
+++ b/tests/rustdoc/inline_local/hidden-use.rs
diff --git a/src/test/rustdoc/inline_local/issue-28537.rs b/tests/rustdoc/inline_local/issue-28537.rs
index da9cc4c94..da9cc4c94 100644
--- a/src/test/rustdoc/inline_local/issue-28537.rs
+++ b/tests/rustdoc/inline_local/issue-28537.rs
diff --git a/src/test/rustdoc/inline_local/issue-32343.rs b/tests/rustdoc/inline_local/issue-32343.rs
index 5620ae0dc..5620ae0dc 100644
--- a/src/test/rustdoc/inline_local/issue-32343.rs
+++ b/tests/rustdoc/inline_local/issue-32343.rs
diff --git a/src/test/rustdoc/inline_local/macro_by_example.rs b/tests/rustdoc/inline_local/macro_by_example.rs
index 5c33c0037..5c33c0037 100644
--- a/src/test/rustdoc/inline_local/macro_by_example.rs
+++ b/tests/rustdoc/inline_local/macro_by_example.rs
diff --git a/src/test/rustdoc/inline_local/please_inline.rs b/tests/rustdoc/inline_local/please_inline.rs
index e4429ef33..e4429ef33 100644
--- a/src/test/rustdoc/inline_local/please_inline.rs
+++ b/tests/rustdoc/inline_local/please_inline.rs
diff --git a/src/test/rustdoc/inline_local/trait-vis.rs b/tests/rustdoc/inline_local/trait-vis.rs
index 19b69da15..19b69da15 100644
--- a/src/test/rustdoc/inline_local/trait-vis.rs
+++ b/tests/rustdoc/inline_local/trait-vis.rs
diff --git a/src/test/rustdoc/internal.rs b/tests/rustdoc/internal.rs
index caad43a08..caad43a08 100644
--- a/src/test/rustdoc/internal.rs
+++ b/tests/rustdoc/internal.rs
diff --git a/src/test/rustdoc/intra-doc-crate/auxiliary/self.rs b/tests/rustdoc/intra-doc-crate/auxiliary/self.rs
index 54902f12e..54902f12e 100644
--- a/src/test/rustdoc/intra-doc-crate/auxiliary/self.rs
+++ b/tests/rustdoc/intra-doc-crate/auxiliary/self.rs
diff --git a/src/test/rustdoc/intra-doc-crate/self.rs b/tests/rustdoc/intra-doc-crate/self.rs
index 8c36a7fa0..8c36a7fa0 100644
--- a/src/test/rustdoc/intra-doc-crate/self.rs
+++ b/tests/rustdoc/intra-doc-crate/self.rs
diff --git a/src/test/rustdoc/intra-doc/anchors.rs b/tests/rustdoc/intra-doc/anchors.rs
index 3d4c46496..3d4c46496 100644
--- a/src/test/rustdoc/intra-doc/anchors.rs
+++ b/tests/rustdoc/intra-doc/anchors.rs
diff --git a/src/test/rustdoc/intra-doc/assoc-reexport-super.rs b/tests/rustdoc/intra-doc/assoc-reexport-super.rs
index a7bc1c6a2..a7bc1c6a2 100644
--- a/src/test/rustdoc/intra-doc/assoc-reexport-super.rs
+++ b/tests/rustdoc/intra-doc/assoc-reexport-super.rs
diff --git a/src/test/rustdoc/intra-doc/associated-defaults.rs b/tests/rustdoc/intra-doc/associated-defaults.rs
index c7e66c826..c7e66c826 100644
--- a/src/test/rustdoc/intra-doc/associated-defaults.rs
+++ b/tests/rustdoc/intra-doc/associated-defaults.rs
diff --git a/src/test/rustdoc/intra-doc/associated-items.rs b/tests/rustdoc/intra-doc/associated-items.rs
index 0b958eb8e..0b958eb8e 100644
--- a/src/test/rustdoc/intra-doc/associated-items.rs
+++ b/tests/rustdoc/intra-doc/associated-items.rs
diff --git a/src/test/rustdoc/intra-doc/auxiliary/empty.rs b/tests/rustdoc/intra-doc/auxiliary/empty.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/rustdoc/intra-doc/auxiliary/empty.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/empty.rs
diff --git a/src/test/rustdoc/intra-doc/auxiliary/empty2.rs b/tests/rustdoc/intra-doc/auxiliary/empty2.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/rustdoc/intra-doc/auxiliary/empty2.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/empty2.rs
diff --git a/src/test/rustdoc/intra-doc/auxiliary/extern-builtin-type-impl-dep.rs b/tests/rustdoc/intra-doc/auxiliary/extern-builtin-type-impl-dep.rs
index d9a08cb41..d9a08cb41 100644
--- a/src/test/rustdoc/intra-doc/auxiliary/extern-builtin-type-impl-dep.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/extern-builtin-type-impl-dep.rs
diff --git a/src/test/rustdoc/intra-doc/auxiliary/extern-inherent-impl-dep.rs b/tests/rustdoc/intra-doc/auxiliary/extern-inherent-impl-dep.rs
index ee4138b68..ee4138b68 100644
--- a/src/test/rustdoc/intra-doc/auxiliary/extern-inherent-impl-dep.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/extern-inherent-impl-dep.rs
diff --git a/src/test/rustdoc/intra-doc/auxiliary/intra-link-extern-crate.rs b/tests/rustdoc/intra-doc/auxiliary/intra-link-extern-crate.rs
index db3bb38ad..db3bb38ad 100644
--- a/src/test/rustdoc/intra-doc/auxiliary/intra-link-extern-crate.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/intra-link-extern-crate.rs
diff --git a/src/test/rustdoc/intra-doc/auxiliary/intra-link-pub-use.rs b/tests/rustdoc/intra-doc/auxiliary/intra-link-pub-use.rs
index a4db2ffc4..a4db2ffc4 100644
--- a/src/test/rustdoc/intra-doc/auxiliary/intra-link-pub-use.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/intra-link-pub-use.rs
diff --git a/src/test/rustdoc/intra-doc/auxiliary/intra-link-reexport-additional-docs.rs b/tests/rustdoc/intra-doc/auxiliary/intra-link-reexport-additional-docs.rs
index fc51995a9..fc51995a9 100644
--- a/src/test/rustdoc/intra-doc/auxiliary/intra-link-reexport-additional-docs.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/intra-link-reexport-additional-docs.rs
diff --git a/src/test/rustdoc/intra-doc/auxiliary/intra-links-external-traits.rs b/tests/rustdoc/intra-doc/auxiliary/intra-links-external-traits.rs
index 6142dcda9..6142dcda9 100644
--- a/src/test/rustdoc/intra-doc/auxiliary/intra-links-external-traits.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/intra-links-external-traits.rs
diff --git a/src/test/rustdoc/intra-doc/auxiliary/issue-103463-aux.rs b/tests/rustdoc/intra-doc/auxiliary/issue-103463-aux.rs
index 2b8fdec1f..2b8fdec1f 100644
--- a/src/test/rustdoc/intra-doc/auxiliary/issue-103463-aux.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/issue-103463-aux.rs
diff --git a/src/test/rustdoc/intra-doc/auxiliary/issue-66159-1.rs b/tests/rustdoc/intra-doc/auxiliary/issue-66159-1.rs
index 2f3d069bd..2f3d069bd 100644
--- a/src/test/rustdoc/intra-doc/auxiliary/issue-66159-1.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/issue-66159-1.rs
diff --git a/src/test/rustdoc/intra-doc/auxiliary/my-core.rs b/tests/rustdoc/intra-doc/auxiliary/my-core.rs
index e22feb03a..e22feb03a 100644
--- a/src/test/rustdoc/intra-doc/auxiliary/my-core.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/my-core.rs
diff --git a/src/test/rustdoc/intra-doc/auxiliary/proc-macro-macro.rs b/tests/rustdoc/intra-doc/auxiliary/proc-macro-macro.rs
index 5ba132f25..5ba132f25 100644
--- a/src/test/rustdoc/intra-doc/auxiliary/proc-macro-macro.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/proc-macro-macro.rs
diff --git a/src/test/rustdoc/intra-doc/auxiliary/pub-struct.rs b/tests/rustdoc/intra-doc/auxiliary/pub-struct.rs
index 75d428932..75d428932 100644
--- a/src/test/rustdoc/intra-doc/auxiliary/pub-struct.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/pub-struct.rs
diff --git a/src/test/rustdoc/intra-doc/basic.rs b/tests/rustdoc/intra-doc/basic.rs
index 39f5c298b..39f5c298b 100644
--- a/src/test/rustdoc/intra-doc/basic.rs
+++ b/tests/rustdoc/intra-doc/basic.rs
diff --git a/src/test/rustdoc/intra-doc/builtin-macros.rs b/tests/rustdoc/intra-doc/builtin-macros.rs
index bbdbe246b..bbdbe246b 100644
--- a/src/test/rustdoc/intra-doc/builtin-macros.rs
+++ b/tests/rustdoc/intra-doc/builtin-macros.rs
diff --git a/src/test/rustdoc/intra-doc/crate-relative-assoc.rs b/tests/rustdoc/intra-doc/crate-relative-assoc.rs
index d4a0ecc35..d4a0ecc35 100644
--- a/src/test/rustdoc/intra-doc/crate-relative-assoc.rs
+++ b/tests/rustdoc/intra-doc/crate-relative-assoc.rs
diff --git a/src/test/rustdoc/intra-doc/crate-relative.rs b/tests/rustdoc/intra-doc/crate-relative.rs
index bacbcabfc..bacbcabfc 100644
--- a/src/test/rustdoc/intra-doc/crate-relative.rs
+++ b/tests/rustdoc/intra-doc/crate-relative.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/additional_doc.rs b/tests/rustdoc/intra-doc/cross-crate/additional_doc.rs
index e52fb9b1c..e52fb9b1c 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/additional_doc.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/additional_doc.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/additional_doc.rs b/tests/rustdoc/intra-doc/cross-crate/auxiliary/additional_doc.rs
index 684fdd449..684fdd449 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/additional_doc.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/auxiliary/additional_doc.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/hidden.rs b/tests/rustdoc/intra-doc/cross-crate/auxiliary/hidden.rs
index 34f4e9f63..34f4e9f63 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/hidden.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/auxiliary/hidden.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/intra-doc-basic.rs b/tests/rustdoc/intra-doc/cross-crate/auxiliary/intra-doc-basic.rs
index d6a829966..d6a829966 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/intra-doc-basic.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/auxiliary/intra-doc-basic.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/intra-link-cross-crate-crate.rs b/tests/rustdoc/intra-doc/cross-crate/auxiliary/intra-link-cross-crate-crate.rs
index a37848e23..a37848e23 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/intra-link-cross-crate-crate.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/auxiliary/intra-link-cross-crate-crate.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/macro_inner.rs b/tests/rustdoc/intra-doc/cross-crate/auxiliary/macro_inner.rs
index cb7a8afb6..cb7a8afb6 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/macro_inner.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/auxiliary/macro_inner.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/module.rs b/tests/rustdoc/intra-doc/cross-crate/auxiliary/module.rs
index 018fdedd9..018fdedd9 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/module.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/auxiliary/module.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/proc_macro.rs b/tests/rustdoc/intra-doc/cross-crate/auxiliary/proc_macro.rs
index 0d5a95407..0d5a95407 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/proc_macro.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/auxiliary/proc_macro.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/submodule-inner.rs b/tests/rustdoc/intra-doc/cross-crate/auxiliary/submodule-inner.rs
index 0612f53d6..0612f53d6 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/submodule-inner.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/auxiliary/submodule-inner.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/submodule-outer.rs b/tests/rustdoc/intra-doc/cross-crate/auxiliary/submodule-outer.rs
index 105eb8e11..105eb8e11 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/submodule-outer.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/auxiliary/submodule-outer.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/traits.rs b/tests/rustdoc/intra-doc/cross-crate/auxiliary/traits.rs
index c16e39d56..c16e39d56 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/auxiliary/traits.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/auxiliary/traits.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/basic.rs b/tests/rustdoc/intra-doc/cross-crate/basic.rs
index ad7454918..ad7454918 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/basic.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/basic.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/crate.rs b/tests/rustdoc/intra-doc/cross-crate/crate.rs
index edf544708..edf544708 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/crate.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/crate.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/hidden.rs b/tests/rustdoc/intra-doc/cross-crate/hidden.rs
index 4f7d075ba..4f7d075ba 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/hidden.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/hidden.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/macro.rs b/tests/rustdoc/intra-doc/cross-crate/macro.rs
index 32f0a55d3..32f0a55d3 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/macro.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/macro.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/module.rs b/tests/rustdoc/intra-doc/cross-crate/module.rs
index fde932265..fde932265 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/module.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/module.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/submodule-inner.rs b/tests/rustdoc/intra-doc/cross-crate/submodule-inner.rs
index 577fe78a5..577fe78a5 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/submodule-inner.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/submodule-inner.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/submodule-outer.rs b/tests/rustdoc/intra-doc/cross-crate/submodule-outer.rs
index d0c0b7e85..d0c0b7e85 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/submodule-outer.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/submodule-outer.rs
diff --git a/src/test/rustdoc/intra-doc/cross-crate/traits.rs b/tests/rustdoc/intra-doc/cross-crate/traits.rs
index 7b9554bfd..7b9554bfd 100644
--- a/src/test/rustdoc/intra-doc/cross-crate/traits.rs
+++ b/tests/rustdoc/intra-doc/cross-crate/traits.rs
diff --git a/src/test/rustdoc/intra-doc/disambiguators-removed.rs b/tests/rustdoc/intra-doc/disambiguators-removed.rs
index 331a31413..331a31413 100644
--- a/src/test/rustdoc/intra-doc/disambiguators-removed.rs
+++ b/tests/rustdoc/intra-doc/disambiguators-removed.rs
diff --git a/src/test/rustdoc/intra-doc/email-address.rs b/tests/rustdoc/intra-doc/email-address.rs
index 24161c3bb..24161c3bb 100644
--- a/src/test/rustdoc/intra-doc/email-address.rs
+++ b/tests/rustdoc/intra-doc/email-address.rs
diff --git a/src/test/rustdoc/intra-doc/enum-struct-field.rs b/tests/rustdoc/intra-doc/enum-struct-field.rs
index 2270a1faf..2270a1faf 100644
--- a/src/test/rustdoc/intra-doc/enum-struct-field.rs
+++ b/tests/rustdoc/intra-doc/enum-struct-field.rs
diff --git a/src/test/rustdoc/intra-doc/extern-builtin-type-impl.rs b/tests/rustdoc/intra-doc/extern-builtin-type-impl.rs
index 7bb1ded3f..7bb1ded3f 100644
--- a/src/test/rustdoc/intra-doc/extern-builtin-type-impl.rs
+++ b/tests/rustdoc/intra-doc/extern-builtin-type-impl.rs
diff --git a/src/test/rustdoc/intra-doc/extern-crate-only-used-in-link.rs b/tests/rustdoc/intra-doc/extern-crate-only-used-in-link.rs
index ad50887e9..ad50887e9 100644
--- a/src/test/rustdoc/intra-doc/extern-crate-only-used-in-link.rs
+++ b/tests/rustdoc/intra-doc/extern-crate-only-used-in-link.rs
diff --git a/src/test/rustdoc/intra-doc/extern-crate.rs b/tests/rustdoc/intra-doc/extern-crate.rs
index 4e4438dea..4e4438dea 100644
--- a/src/test/rustdoc/intra-doc/extern-crate.rs
+++ b/tests/rustdoc/intra-doc/extern-crate.rs
diff --git a/src/test/rustdoc/intra-doc/extern-inherent-impl.rs b/tests/rustdoc/intra-doc/extern-inherent-impl.rs
index 2e41c2214..2e41c2214 100644
--- a/src/test/rustdoc/intra-doc/extern-inherent-impl.rs
+++ b/tests/rustdoc/intra-doc/extern-inherent-impl.rs
diff --git a/src/test/rustdoc/intra-doc/extern-reference-link.rs b/tests/rustdoc/intra-doc/extern-reference-link.rs
index bad6ec755..bad6ec755 100644
--- a/src/test/rustdoc/intra-doc/extern-reference-link.rs
+++ b/tests/rustdoc/intra-doc/extern-reference-link.rs
diff --git a/src/test/rustdoc/intra-doc/extern-type.rs b/tests/rustdoc/intra-doc/extern-type.rs
index 5440f582d..5440f582d 100644
--- a/src/test/rustdoc/intra-doc/extern-type.rs
+++ b/tests/rustdoc/intra-doc/extern-type.rs
diff --git a/src/test/rustdoc/intra-doc/external-traits.rs b/tests/rustdoc/intra-doc/external-traits.rs
index a0a66f242..a0a66f242 100644
--- a/src/test/rustdoc/intra-doc/external-traits.rs
+++ b/tests/rustdoc/intra-doc/external-traits.rs
diff --git a/src/test/rustdoc/intra-doc/field.rs b/tests/rustdoc/intra-doc/field.rs
index 001143489..001143489 100644
--- a/src/test/rustdoc/intra-doc/field.rs
+++ b/tests/rustdoc/intra-doc/field.rs
diff --git a/src/test/rustdoc/intra-doc/generic-params.rs b/tests/rustdoc/intra-doc/generic-params.rs
index fbc9fc6a9..fbc9fc6a9 100644
--- a/src/test/rustdoc/intra-doc/generic-params.rs
+++ b/tests/rustdoc/intra-doc/generic-params.rs
diff --git a/src/test/rustdoc/intra-doc/generic-trait-impl.rs b/tests/rustdoc/intra-doc/generic-trait-impl.rs
index ba8595abf..ba8595abf 100644
--- a/src/test/rustdoc/intra-doc/generic-trait-impl.rs
+++ b/tests/rustdoc/intra-doc/generic-trait-impl.rs
diff --git a/src/test/rustdoc/intra-doc/in-bodies.rs b/tests/rustdoc/intra-doc/in-bodies.rs
index 55169e5d3..55169e5d3 100644
--- a/src/test/rustdoc/intra-doc/in-bodies.rs
+++ b/tests/rustdoc/intra-doc/in-bodies.rs
diff --git a/src/test/rustdoc/intra-doc/issue-103463.rs b/tests/rustdoc/intra-doc/issue-103463.rs
index 4adf8a9a8..4adf8a9a8 100644
--- a/src/test/rustdoc/intra-doc/issue-103463.rs
+++ b/tests/rustdoc/intra-doc/issue-103463.rs
diff --git a/src/test/rustdoc/intra-doc/issue-104145.rs b/tests/rustdoc/intra-doc/issue-104145.rs
index 9ce36740d..9ce36740d 100644
--- a/src/test/rustdoc/intra-doc/issue-104145.rs
+++ b/tests/rustdoc/intra-doc/issue-104145.rs
diff --git a/src/test/rustdoc/intra-doc/issue-66159.rs b/tests/rustdoc/intra-doc/issue-66159.rs
index 56742b397..56742b397 100644
--- a/src/test/rustdoc/intra-doc/issue-66159.rs
+++ b/tests/rustdoc/intra-doc/issue-66159.rs
diff --git a/src/test/rustdoc/intra-doc/issue-82209.rs b/tests/rustdoc/intra-doc/issue-82209.rs
index a5fe855cb..a5fe855cb 100644
--- a/src/test/rustdoc/intra-doc/issue-82209.rs
+++ b/tests/rustdoc/intra-doc/issue-82209.rs
diff --git a/src/test/rustdoc/intra-doc/libstd-re-export.rs b/tests/rustdoc/intra-doc/libstd-re-export.rs
index 6c41eb2b5..6c41eb2b5 100644
--- a/src/test/rustdoc/intra-doc/libstd-re-export.rs
+++ b/tests/rustdoc/intra-doc/libstd-re-export.rs
diff --git a/src/test/rustdoc/intra-doc/macros-disambiguators.rs b/tests/rustdoc/intra-doc/macros-disambiguators.rs
index cd4caa6a8..cd4caa6a8 100644
--- a/src/test/rustdoc/intra-doc/macros-disambiguators.rs
+++ b/tests/rustdoc/intra-doc/macros-disambiguators.rs
diff --git a/src/test/rustdoc/intra-doc/mod-ambiguity.rs b/tests/rustdoc/intra-doc/mod-ambiguity.rs
index 0c7acbaf0..0c7acbaf0 100644
--- a/src/test/rustdoc/intra-doc/mod-ambiguity.rs
+++ b/tests/rustdoc/intra-doc/mod-ambiguity.rs
diff --git a/src/test/rustdoc/intra-doc/mod-relative.rs b/tests/rustdoc/intra-doc/mod-relative.rs
index 49d3399b9..49d3399b9 100644
--- a/src/test/rustdoc/intra-doc/mod-relative.rs
+++ b/tests/rustdoc/intra-doc/mod-relative.rs
diff --git a/src/test/rustdoc/intra-doc/no-doc-primitive.rs b/tests/rustdoc/intra-doc/no-doc-primitive.rs
index e5eba1d8d..e5eba1d8d 100644
--- a/src/test/rustdoc/intra-doc/no-doc-primitive.rs
+++ b/tests/rustdoc/intra-doc/no-doc-primitive.rs
diff --git a/src/test/rustdoc/intra-doc/non-path-primitives.rs b/tests/rustdoc/intra-doc/non-path-primitives.rs
index be4b44b31..be4b44b31 100644
--- a/src/test/rustdoc/intra-doc/non-path-primitives.rs
+++ b/tests/rustdoc/intra-doc/non-path-primitives.rs
diff --git a/src/test/rustdoc/intra-doc/prim-assoc.rs b/tests/rustdoc/intra-doc/prim-assoc.rs
index dfa7db8a5..dfa7db8a5 100644
--- a/src/test/rustdoc/intra-doc/prim-assoc.rs
+++ b/tests/rustdoc/intra-doc/prim-assoc.rs
diff --git a/src/test/rustdoc/intra-doc/prim-associated-traits.rs b/tests/rustdoc/intra-doc/prim-associated-traits.rs
index 8639a24f7..8639a24f7 100644
--- a/src/test/rustdoc/intra-doc/prim-associated-traits.rs
+++ b/tests/rustdoc/intra-doc/prim-associated-traits.rs
diff --git a/src/test/rustdoc/intra-doc/prim-methods-external-core.rs b/tests/rustdoc/intra-doc/prim-methods-external-core.rs
index c3340af33..c3340af33 100644
--- a/src/test/rustdoc/intra-doc/prim-methods-external-core.rs
+++ b/tests/rustdoc/intra-doc/prim-methods-external-core.rs
diff --git a/src/test/rustdoc/intra-doc/prim-methods-local.rs b/tests/rustdoc/intra-doc/prim-methods-local.rs
index 79d8df045..79d8df045 100644
--- a/src/test/rustdoc/intra-doc/prim-methods-local.rs
+++ b/tests/rustdoc/intra-doc/prim-methods-local.rs
diff --git a/src/test/rustdoc/intra-doc/prim-methods.rs b/tests/rustdoc/intra-doc/prim-methods.rs
index a412a23fd..a412a23fd 100644
--- a/src/test/rustdoc/intra-doc/prim-methods.rs
+++ b/tests/rustdoc/intra-doc/prim-methods.rs
diff --git a/src/test/rustdoc/intra-doc/prim-precedence.rs b/tests/rustdoc/intra-doc/prim-precedence.rs
index 25625b952..25625b952 100644
--- a/src/test/rustdoc/intra-doc/prim-precedence.rs
+++ b/tests/rustdoc/intra-doc/prim-precedence.rs
diff --git a/src/test/rustdoc/intra-doc/prim-self.rs b/tests/rustdoc/intra-doc/prim-self.rs
index c7ce71b15..c7ce71b15 100644
--- a/src/test/rustdoc/intra-doc/prim-self.rs
+++ b/tests/rustdoc/intra-doc/prim-self.rs
diff --git a/src/test/rustdoc/intra-doc/primitive-disambiguators.rs b/tests/rustdoc/intra-doc/primitive-disambiguators.rs
index adcab767d..adcab767d 100644
--- a/src/test/rustdoc/intra-doc/primitive-disambiguators.rs
+++ b/tests/rustdoc/intra-doc/primitive-disambiguators.rs
diff --git a/src/test/rustdoc/intra-doc/primitive-non-default-impl.rs b/tests/rustdoc/intra-doc/primitive-non-default-impl.rs
index 474bf3477..474bf3477 100644
--- a/src/test/rustdoc/intra-doc/primitive-non-default-impl.rs
+++ b/tests/rustdoc/intra-doc/primitive-non-default-impl.rs
diff --git a/src/test/rustdoc/intra-doc/private-failures-ignored.rs b/tests/rustdoc/intra-doc/private-failures-ignored.rs
index b272bfb5a..b272bfb5a 100644
--- a/src/test/rustdoc/intra-doc/private-failures-ignored.rs
+++ b/tests/rustdoc/intra-doc/private-failures-ignored.rs
diff --git a/src/test/rustdoc/intra-doc/private.rs b/tests/rustdoc/intra-doc/private.rs
index 349091e93..349091e93 100644
--- a/src/test/rustdoc/intra-doc/private.rs
+++ b/tests/rustdoc/intra-doc/private.rs
diff --git a/src/test/rustdoc/intra-doc/proc-macro.rs b/tests/rustdoc/intra-doc/proc-macro.rs
index 78379a902..78379a902 100644
--- a/src/test/rustdoc/intra-doc/proc-macro.rs
+++ b/tests/rustdoc/intra-doc/proc-macro.rs
diff --git a/src/test/rustdoc/intra-doc/pub-use.rs b/tests/rustdoc/intra-doc/pub-use.rs
index 8a998496c..8a998496c 100644
--- a/src/test/rustdoc/intra-doc/pub-use.rs
+++ b/tests/rustdoc/intra-doc/pub-use.rs
diff --git a/src/test/rustdoc/intra-doc/raw-ident-self.rs b/tests/rustdoc/intra-doc/raw-ident-self.rs
index 1ed33db93..1ed33db93 100644
--- a/src/test/rustdoc/intra-doc/raw-ident-self.rs
+++ b/tests/rustdoc/intra-doc/raw-ident-self.rs
diff --git a/src/test/rustdoc/intra-doc/reexport-additional-docs.rs b/tests/rustdoc/intra-doc/reexport-additional-docs.rs
index 64683bacd..64683bacd 100644
--- a/src/test/rustdoc/intra-doc/reexport-additional-docs.rs
+++ b/tests/rustdoc/intra-doc/reexport-additional-docs.rs
diff --git a/src/test/rustdoc/intra-doc/self-cache.rs b/tests/rustdoc/intra-doc/self-cache.rs
index 63bf7fa57..63bf7fa57 100644
--- a/src/test/rustdoc/intra-doc/self-cache.rs
+++ b/tests/rustdoc/intra-doc/self-cache.rs
diff --git a/src/test/rustdoc/intra-doc/self.rs b/tests/rustdoc/intra-doc/self.rs
index 0ba7df8a7..0ba7df8a7 100644
--- a/src/test/rustdoc/intra-doc/self.rs
+++ b/tests/rustdoc/intra-doc/self.rs
diff --git a/src/test/rustdoc/intra-doc/trait-impl.rs b/tests/rustdoc/intra-doc/trait-impl.rs
index cf60dc1db..cf60dc1db 100644
--- a/src/test/rustdoc/intra-doc/trait-impl.rs
+++ b/tests/rustdoc/intra-doc/trait-impl.rs
diff --git a/src/test/rustdoc/intra-doc/trait-item.rs b/tests/rustdoc/intra-doc/trait-item.rs
index e95dba33b..e95dba33b 100644
--- a/src/test/rustdoc/intra-doc/trait-item.rs
+++ b/tests/rustdoc/intra-doc/trait-item.rs
diff --git a/src/test/rustdoc/intra-doc/true-false.rs b/tests/rustdoc/intra-doc/true-false.rs
index e02be9cab..e02be9cab 100644
--- a/src/test/rustdoc/intra-doc/true-false.rs
+++ b/tests/rustdoc/intra-doc/true-false.rs
diff --git a/src/test/rustdoc/intra-doc/type-alias.rs b/tests/rustdoc/intra-doc/type-alias.rs
index 6c52082a2..6c52082a2 100644
--- a/src/test/rustdoc/intra-doc/type-alias.rs
+++ b/tests/rustdoc/intra-doc/type-alias.rs
diff --git a/src/test/rustdoc/invalid.crate.name.rs b/tests/rustdoc/invalid.crate.name.rs
index c19713b56..c19713b56 100644
--- a/src/test/rustdoc/invalid.crate.name.rs
+++ b/tests/rustdoc/invalid.crate.name.rs
diff --git a/src/test/rustdoc/issue-100204-inline-impl-through-glob-import.rs b/tests/rustdoc/issue-100204-inline-impl-through-glob-import.rs
index 3e20c5c07..3e20c5c07 100644
--- a/src/test/rustdoc/issue-100204-inline-impl-through-glob-import.rs
+++ b/tests/rustdoc/issue-100204-inline-impl-through-glob-import.rs
diff --git a/src/test/rustdoc/issue-100241.rs b/tests/rustdoc/issue-100241.rs
index 9e9cba13a..9e9cba13a 100644
--- a/src/test/rustdoc/issue-100241.rs
+++ b/tests/rustdoc/issue-100241.rs
diff --git a/src/test/rustdoc/issue-100620.rs b/tests/rustdoc/issue-100620.rs
index 097666eb5..097666eb5 100644
--- a/src/test/rustdoc/issue-100620.rs
+++ b/tests/rustdoc/issue-100620.rs
diff --git a/src/test/rustdoc/issue-100679-sidebar-links-deref.rs b/tests/rustdoc/issue-100679-sidebar-links-deref.rs
index f09d23206..f09d23206 100644
--- a/src/test/rustdoc/issue-100679-sidebar-links-deref.rs
+++ b/tests/rustdoc/issue-100679-sidebar-links-deref.rs
diff --git a/src/test/rustdoc/issue-101743-bold-tag.rs b/tests/rustdoc/issue-101743-bold-tag.rs
index 631181fec..631181fec 100644
--- a/src/test/rustdoc/issue-101743-bold-tag.rs
+++ b/tests/rustdoc/issue-101743-bold-tag.rs
diff --git a/src/test/rustdoc/issue-102154.rs b/tests/rustdoc/issue-102154.rs
index b36f27080..b36f27080 100644
--- a/src/test/rustdoc/issue-102154.rs
+++ b/tests/rustdoc/issue-102154.rs
diff --git a/tests/rustdoc/issue-105952.rs b/tests/rustdoc/issue-105952.rs
new file mode 100644
index 000000000..e3f1df006
--- /dev/null
+++ b/tests/rustdoc/issue-105952.rs
@@ -0,0 +1,14 @@
+#![crate_name = "foo"]
+
+#![feature(associated_const_equality)]
+pub enum ParseMode {
+    Raw,
+}
+pub trait Parse {
+    const PARSE_MODE: ParseMode;
+}
+pub trait RenderRaw {}
+
+// @hasraw foo/trait.RenderRaw.html 'impl'
+// @hasraw foo/trait.RenderRaw.html 'ParseMode::Raw'
+impl<T: Parse<PARSE_MODE = { ParseMode::Raw }>> RenderRaw for T {}
diff --git a/tests/rustdoc/issue-107350.rs b/tests/rustdoc/issue-107350.rs
new file mode 100644
index 000000000..75f378ed2
--- /dev/null
+++ b/tests/rustdoc/issue-107350.rs
@@ -0,0 +1,18 @@
+// This is a regression test for <https://github.com/rust-lang/rust/issues/107350>.
+// It shouldn't loop indefinitely.
+
+#![crate_name = "foo"]
+
+// @has 'foo/oops/enum.OhNo.html'
+
+pub mod oops {
+    pub use crate::oops::OhNo;
+
+    mod inner {
+        pub enum OhNo {
+            Item = 1,
+        }
+    }
+
+    pub use self::inner::*;
+}
diff --git a/src/test/rustdoc/issue-12834.rs b/tests/rustdoc/issue-12834.rs
index 9605a1e78..9605a1e78 100644
--- a/src/test/rustdoc/issue-12834.rs
+++ b/tests/rustdoc/issue-12834.rs
diff --git a/src/test/rustdoc/issue-13698.rs b/tests/rustdoc/issue-13698.rs
index 3046a8a28..3046a8a28 100644
--- a/src/test/rustdoc/issue-13698.rs
+++ b/tests/rustdoc/issue-13698.rs
diff --git a/src/test/rustdoc/issue-15169.rs b/tests/rustdoc/issue-15169.rs
index e525d85e2..e525d85e2 100644
--- a/src/test/rustdoc/issue-15169.rs
+++ b/tests/rustdoc/issue-15169.rs
diff --git a/src/test/rustdoc/issue-15318-2.rs b/tests/rustdoc/issue-15318-2.rs
index f7f5052a3..f7f5052a3 100644
--- a/src/test/rustdoc/issue-15318-2.rs
+++ b/tests/rustdoc/issue-15318-2.rs
diff --git a/src/test/rustdoc/issue-15318-3.rs b/tests/rustdoc/issue-15318-3.rs
index 2fadc26b0..2fadc26b0 100644
--- a/src/test/rustdoc/issue-15318-3.rs
+++ b/tests/rustdoc/issue-15318-3.rs
diff --git a/src/test/rustdoc/issue-15318.rs b/tests/rustdoc/issue-15318.rs
index 0349fe285..0349fe285 100644
--- a/src/test/rustdoc/issue-15318.rs
+++ b/tests/rustdoc/issue-15318.rs
diff --git a/src/test/rustdoc/issue-15347.rs b/tests/rustdoc/issue-15347.rs
index e93d74011..e93d74011 100644
--- a/src/test/rustdoc/issue-15347.rs
+++ b/tests/rustdoc/issue-15347.rs
diff --git a/src/test/rustdoc/issue-16019.rs b/tests/rustdoc/issue-16019.rs
index 239d92378..239d92378 100644
--- a/src/test/rustdoc/issue-16019.rs
+++ b/tests/rustdoc/issue-16019.rs
diff --git a/src/test/rustdoc/issue-16265-1.rs b/tests/rustdoc/issue-16265-1.rs
index 2fda637a6..2fda637a6 100644
--- a/src/test/rustdoc/issue-16265-1.rs
+++ b/tests/rustdoc/issue-16265-1.rs
diff --git a/src/test/rustdoc/issue-16265-2.rs b/tests/rustdoc/issue-16265-2.rs
index c3eb35617..c3eb35617 100644
--- a/src/test/rustdoc/issue-16265-2.rs
+++ b/tests/rustdoc/issue-16265-2.rs
diff --git a/src/test/rustdoc/issue-17476.rs b/tests/rustdoc/issue-17476.rs
index a5b484c98..a5b484c98 100644
--- a/src/test/rustdoc/issue-17476.rs
+++ b/tests/rustdoc/issue-17476.rs
diff --git a/src/test/rustdoc/issue-18199.rs b/tests/rustdoc/issue-18199.rs
index bc0c4a565..bc0c4a565 100644
--- a/src/test/rustdoc/issue-18199.rs
+++ b/tests/rustdoc/issue-18199.rs
diff --git a/src/test/rustdoc/issue-19181.rs b/tests/rustdoc/issue-19181.rs
index 3dea152fc..3dea152fc 100644
--- a/src/test/rustdoc/issue-19181.rs
+++ b/tests/rustdoc/issue-19181.rs
diff --git a/src/test/rustdoc/issue-19190-2.rs b/tests/rustdoc/issue-19190-2.rs
index b6416e2e5..b6416e2e5 100644
--- a/src/test/rustdoc/issue-19190-2.rs
+++ b/tests/rustdoc/issue-19190-2.rs
diff --git a/src/test/rustdoc/issue-19190-3.rs b/tests/rustdoc/issue-19190-3.rs
index 4d34ce650..4d34ce650 100644
--- a/src/test/rustdoc/issue-19190-3.rs
+++ b/tests/rustdoc/issue-19190-3.rs
diff --git a/src/test/rustdoc/issue-19190.rs b/tests/rustdoc/issue-19190.rs
index 2046273e2..2046273e2 100644
--- a/src/test/rustdoc/issue-19190.rs
+++ b/tests/rustdoc/issue-19190.rs
diff --git a/src/test/rustdoc/issue-20175.rs b/tests/rustdoc/issue-20175.rs
index 6a42e2afb..6a42e2afb 100644
--- a/src/test/rustdoc/issue-20175.rs
+++ b/tests/rustdoc/issue-20175.rs
diff --git a/src/test/rustdoc/issue-20646.rs b/tests/rustdoc/issue-20646.rs
index 2589e27f2..a774b0ca7 100644
--- a/src/test/rustdoc/issue-20646.rs
+++ b/tests/rustdoc/issue-20646.rs
@@ -13,7 +13,7 @@ pub trait Trait {
 }
 
 // @has issue_20646/fn.fun.html \
-//      '//*[@class="rust fn"]' 'where T: Trait<Output = i32>'
+//      '//div[@class="item-decl"]/pre[@class="rust"]' 'where T: Trait<Output = i32>'
 pub fn fun<T>(_: T) where T: Trait<Output=i32> {}
 
 pub mod reexport {
@@ -21,6 +21,6 @@ pub mod reexport {
     //      '//*[@id="associatedtype.Output"]' \
     //      'type Output'
     // @has issue_20646/reexport/fn.fun.html \
-    //      '//*[@class="rust fn"]' 'where T: Trait<Output = i32>'
+    //      '//div[@class="item-decl"]/pre[@class="rust"]' 'where T: Trait<Output = i32>'
     pub use issue_20646::{Trait, fun};
 }
diff --git a/tests/rustdoc/issue-20727-2.rs b/tests/rustdoc/issue-20727-2.rs
new file mode 100644
index 000000000..026b4f5ac
--- /dev/null
+++ b/tests/rustdoc/issue-20727-2.rs
@@ -0,0 +1,22 @@
+// aux-build:issue-20727.rs
+// ignore-cross-compile
+
+extern crate issue_20727;
+
+// @has issue_20727_2/trait.Add.html
+pub trait Add<RHS = Self> {
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'trait Add<RHS = Self> {'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'type Output;'
+    type Output;
+
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'fn add(self, rhs: RHS) -> Self::Output;'
+    fn add(self, rhs: RHS) -> Self::Output;
+}
+
+// @has issue_20727_2/reexport/trait.Add.html
+pub mod reexport {
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'trait Add<RHS = Self> {'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'type Output;'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'fn add(self, rhs: RHS) -> Self::Output;'
+    pub use issue_20727::Add;
+}
diff --git a/tests/rustdoc/issue-20727-3.rs b/tests/rustdoc/issue-20727-3.rs
new file mode 100644
index 000000000..741ce8023
--- /dev/null
+++ b/tests/rustdoc/issue-20727-3.rs
@@ -0,0 +1,24 @@
+// aux-build:issue-20727.rs
+// ignore-cross-compile
+
+extern crate issue_20727;
+
+pub trait Bar {}
+
+// @has issue_20727_3/trait.Deref2.html
+pub trait Deref2 {
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'trait Deref2 {'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'type Target: Bar;'
+    type Target: Bar;
+
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'fn deref(&self) -> Self::Target;'
+    fn deref(&self) -> Self::Target;
+}
+
+// @has issue_20727_3/reexport/trait.Deref2.html
+pub mod reexport {
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'trait Deref2 {'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'type Target: Bar;'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'fn deref(&self) -> Self::Target;'
+    pub use issue_20727::Deref2;
+}
diff --git a/tests/rustdoc/issue-20727-4.rs b/tests/rustdoc/issue-20727-4.rs
new file mode 100644
index 000000000..b8fac4da6
--- /dev/null
+++ b/tests/rustdoc/issue-20727-4.rs
@@ -0,0 +1,40 @@
+// aux-build:issue-20727.rs
+// ignore-cross-compile
+
+extern crate issue_20727;
+
+// @has issue_20727_4/trait.Index.html
+pub trait Index<Idx: ?Sized> {
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'trait Index<Idx: ?Sized> {'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'type Output: ?Sized'
+    type Output: ?Sized;
+
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' \
+    //        'fn index(&self, index: Idx) -> &Self::Output'
+    fn index(&self, index: Idx) -> &Self::Output;
+}
+
+// @has issue_20727_4/trait.IndexMut.html
+pub trait IndexMut<Idx: ?Sized>: Index<Idx> {
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' \
+    //        'trait IndexMut<Idx: ?Sized>: Index<Idx> {'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' \
+    //        'fn index_mut(&mut self, index: Idx) -> &mut Self::Output;'
+    fn index_mut(&mut self, index: Idx) -> &mut Self::Output;
+}
+
+pub mod reexport {
+    // @has issue_20727_4/reexport/trait.Index.html
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'trait Index<Idx>where Idx: ?Sized,{'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'type Output: ?Sized'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' \
+    //        'fn index(&self, index: Idx) -> &Self::Output'
+    pub use issue_20727::Index;
+
+    // @has issue_20727_4/reexport/trait.IndexMut.html
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' \
+    //        'trait IndexMut<Idx>: Index<Idx>where Idx: ?Sized,{'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' \
+    //        'fn index_mut(&mut self, index: Idx) -> &mut Self::Output;'
+    pub use issue_20727::IndexMut;
+}
diff --git a/tests/rustdoc/issue-20727.rs b/tests/rustdoc/issue-20727.rs
new file mode 100644
index 000000000..df334821c
--- /dev/null
+++ b/tests/rustdoc/issue-20727.rs
@@ -0,0 +1,24 @@
+// aux-build:issue-20727.rs
+// ignore-cross-compile
+
+extern crate issue_20727;
+
+// @has issue_20727/trait.Deref.html
+pub trait Deref {
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'trait Deref {'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'type Target: ?Sized;'
+    type Target: ?Sized;
+
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' \
+    //        "fn deref<'a>(&'a self) -> &'a Self::Target;"
+    fn deref<'a>(&'a self) -> &'a Self::Target;
+}
+
+// @has issue_20727/reexport/trait.Deref.html
+pub mod reexport {
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'trait Deref {'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'type Target: ?Sized;'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' \
+    //      "fn deref<'a>(&'a self) -> &'a Self::Target;"
+    pub use issue_20727::Deref;
+}
diff --git a/src/test/rustdoc/issue-21092.rs b/tests/rustdoc/issue-21092.rs
index b054145a4..b054145a4 100644
--- a/src/test/rustdoc/issue-21092.rs
+++ b/tests/rustdoc/issue-21092.rs
diff --git a/src/test/rustdoc/issue-21474.rs b/tests/rustdoc/issue-21474.rs
index 43ce13fd9..43ce13fd9 100644
--- a/src/test/rustdoc/issue-21474.rs
+++ b/tests/rustdoc/issue-21474.rs
diff --git a/src/test/rustdoc/issue-21801.rs b/tests/rustdoc/issue-21801.rs
index 29d2ec64c..29d2ec64c 100644
--- a/src/test/rustdoc/issue-21801.rs
+++ b/tests/rustdoc/issue-21801.rs
diff --git a/src/test/rustdoc/issue-22025.rs b/tests/rustdoc/issue-22025.rs
index a721a15f4..a721a15f4 100644
--- a/src/test/rustdoc/issue-22025.rs
+++ b/tests/rustdoc/issue-22025.rs
diff --git a/tests/rustdoc/issue-22038.rs b/tests/rustdoc/issue-22038.rs
new file mode 100644
index 000000000..19e626ba1
--- /dev/null
+++ b/tests/rustdoc/issue-22038.rs
@@ -0,0 +1,19 @@
+extern "C" {
+    // @has issue_22038/fn.foo1.html \
+    //      '//div[@class="item-decl"]/pre[@class="rust"]' 'pub unsafe extern "C" fn foo1()'
+    pub fn foo1();
+}
+
+extern "system" {
+    // @has issue_22038/fn.foo2.html \
+    //      '//div[@class="item-decl"]/pre[@class="rust"]' 'pub unsafe extern "system" fn foo2()'
+    pub fn foo2();
+}
+
+// @has issue_22038/fn.bar.html \
+//      '//div[@class="item-decl"]/pre[@class="rust"]' 'pub extern "C" fn bar()'
+pub extern "C" fn bar() {}
+
+// @has issue_22038/fn.baz.html \
+//      '//div[@class="item-decl"]/pre[@class="rust"]' 'pub extern "system" fn baz()'
+pub extern "system" fn baz() {}
diff --git a/src/test/rustdoc/issue-23106.rs b/tests/rustdoc/issue-23106.rs
index 8cda2fc33..8cda2fc33 100644
--- a/src/test/rustdoc/issue-23106.rs
+++ b/tests/rustdoc/issue-23106.rs
diff --git a/src/test/rustdoc/issue-23207.rs b/tests/rustdoc/issue-23207.rs
index 1a4b849ee..1a4b849ee 100644
--- a/src/test/rustdoc/issue-23207.rs
+++ b/tests/rustdoc/issue-23207.rs
diff --git a/src/test/rustdoc/issue-23511.rs b/tests/rustdoc/issue-23511.rs
index 7576ebb03..7576ebb03 100644
--- a/src/test/rustdoc/issue-23511.rs
+++ b/tests/rustdoc/issue-23511.rs
diff --git a/src/test/rustdoc/issue-23744.rs b/tests/rustdoc/issue-23744.rs
index 642817396..642817396 100644
--- a/src/test/rustdoc/issue-23744.rs
+++ b/tests/rustdoc/issue-23744.rs
diff --git a/src/test/rustdoc/issue-23812.rs b/tests/rustdoc/issue-23812.rs
index 08fd1833b..08fd1833b 100644
--- a/src/test/rustdoc/issue-23812.rs
+++ b/tests/rustdoc/issue-23812.rs
diff --git a/src/test/rustdoc/issue-25001.rs b/tests/rustdoc/issue-25001.rs
index c97b35ada..c97b35ada 100644
--- a/src/test/rustdoc/issue-25001.rs
+++ b/tests/rustdoc/issue-25001.rs
diff --git a/src/test/rustdoc/issue-25944.rs b/tests/rustdoc/issue-25944.rs
index 49625294b..49625294b 100644
--- a/src/test/rustdoc/issue-25944.rs
+++ b/tests/rustdoc/issue-25944.rs
diff --git a/src/test/rustdoc/issue-26606.rs b/tests/rustdoc/issue-26606.rs
index d5cb2c710..d5cb2c710 100644
--- a/src/test/rustdoc/issue-26606.rs
+++ b/tests/rustdoc/issue-26606.rs
diff --git a/src/test/rustdoc/issue-26995.rs b/tests/rustdoc/issue-26995.rs
index fedc9f517..fedc9f517 100644
--- a/src/test/rustdoc/issue-26995.rs
+++ b/tests/rustdoc/issue-26995.rs
diff --git a/src/test/rustdoc/issue-27104.rs b/tests/rustdoc/issue-27104.rs
index 9f2fd9071..9f2fd9071 100644
--- a/src/test/rustdoc/issue-27104.rs
+++ b/tests/rustdoc/issue-27104.rs
diff --git a/src/test/rustdoc/issue-27362.rs b/tests/rustdoc/issue-27362.rs
index 097e4e3b0..097e4e3b0 100644
--- a/src/test/rustdoc/issue-27362.rs
+++ b/tests/rustdoc/issue-27362.rs
diff --git a/src/test/rustdoc/issue-27759.rs b/tests/rustdoc/issue-27759.rs
index 65e0f7cb8..65e0f7cb8 100644
--- a/src/test/rustdoc/issue-27759.rs
+++ b/tests/rustdoc/issue-27759.rs
diff --git a/src/test/rustdoc/issue-27862.rs b/tests/rustdoc/issue-27862.rs
index 77522f1be..77522f1be 100644
--- a/src/test/rustdoc/issue-27862.rs
+++ b/tests/rustdoc/issue-27862.rs
diff --git a/src/test/rustdoc/issue-28478.rs b/tests/rustdoc/issue-28478.rs
index 497276e68..497276e68 100644
--- a/src/test/rustdoc/issue-28478.rs
+++ b/tests/rustdoc/issue-28478.rs
diff --git a/src/test/rustdoc/issue-28927.rs b/tests/rustdoc/issue-28927.rs
index 38a520850..38a520850 100644
--- a/src/test/rustdoc/issue-28927.rs
+++ b/tests/rustdoc/issue-28927.rs
diff --git a/src/test/rustdoc/issue-29449.rs b/tests/rustdoc/issue-29449.rs
index 0d829cf6f..0d829cf6f 100644
--- a/src/test/rustdoc/issue-29449.rs
+++ b/tests/rustdoc/issue-29449.rs
diff --git a/src/test/rustdoc/issue-29503.rs b/tests/rustdoc/issue-29503.rs
index 01ae44385..01ae44385 100644
--- a/src/test/rustdoc/issue-29503.rs
+++ b/tests/rustdoc/issue-29503.rs
diff --git a/src/test/rustdoc/issue-29584.rs b/tests/rustdoc/issue-29584.rs
index 4364a9649..4364a9649 100644
--- a/src/test/rustdoc/issue-29584.rs
+++ b/tests/rustdoc/issue-29584.rs
diff --git a/src/test/rustdoc/issue-30109.rs b/tests/rustdoc/issue-30109.rs
index e9447538a..e9447538a 100644
--- a/src/test/rustdoc/issue-30109.rs
+++ b/tests/rustdoc/issue-30109.rs
diff --git a/src/test/rustdoc/issue-30252.rs b/tests/rustdoc/issue-30252.rs
index c3777362a..c3777362a 100644
--- a/src/test/rustdoc/issue-30252.rs
+++ b/tests/rustdoc/issue-30252.rs
diff --git a/src/test/rustdoc/issue-30366.rs b/tests/rustdoc/issue-30366.rs
index c6274a058..c6274a058 100644
--- a/src/test/rustdoc/issue-30366.rs
+++ b/tests/rustdoc/issue-30366.rs
diff --git a/src/test/rustdoc/issue-31808.rs b/tests/rustdoc/issue-31808.rs
index e55c5bd4f..e55c5bd4f 100644
--- a/src/test/rustdoc/issue-31808.rs
+++ b/tests/rustdoc/issue-31808.rs
diff --git a/src/test/rustdoc/issue-31899.rs b/tests/rustdoc/issue-31899.rs
index 3eee37446..3eee37446 100644
--- a/src/test/rustdoc/issue-31899.rs
+++ b/tests/rustdoc/issue-31899.rs
diff --git a/src/test/rustdoc/issue-32374.rs b/tests/rustdoc/issue-32374.rs
index 8d2c27cf3..8d2c27cf3 100644
--- a/src/test/rustdoc/issue-32374.rs
+++ b/tests/rustdoc/issue-32374.rs
diff --git a/src/test/rustdoc/issue-32395.rs b/tests/rustdoc/issue-32395.rs
index 5552300f9..5552300f9 100644
--- a/src/test/rustdoc/issue-32395.rs
+++ b/tests/rustdoc/issue-32395.rs
diff --git a/src/test/rustdoc/issue-32556.rs b/tests/rustdoc/issue-32556.rs
index e1cf11509..e1cf11509 100644
--- a/src/test/rustdoc/issue-32556.rs
+++ b/tests/rustdoc/issue-32556.rs
diff --git a/src/test/rustdoc/issue-32890.rs b/tests/rustdoc/issue-32890.rs
index 970954433..970954433 100644
--- a/src/test/rustdoc/issue-32890.rs
+++ b/tests/rustdoc/issue-32890.rs
diff --git a/src/test/rustdoc/issue-33069.rs b/tests/rustdoc/issue-33069.rs
index 0213a53ca..0213a53ca 100644
--- a/src/test/rustdoc/issue-33069.rs
+++ b/tests/rustdoc/issue-33069.rs
diff --git a/src/test/rustdoc/issue-33178-1.rs b/tests/rustdoc/issue-33178-1.rs
index 4dc425346..4dc425346 100644
--- a/src/test/rustdoc/issue-33178-1.rs
+++ b/tests/rustdoc/issue-33178-1.rs
diff --git a/src/test/rustdoc/issue-33178.rs b/tests/rustdoc/issue-33178.rs
index 1f45fe723..1f45fe723 100644
--- a/src/test/rustdoc/issue-33178.rs
+++ b/tests/rustdoc/issue-33178.rs
diff --git a/src/test/rustdoc/issue-33302.rs b/tests/rustdoc/issue-33302.rs
index 1e4791e01..b4c52e2f1 100644
--- a/src/test/rustdoc/issue-33302.rs
+++ b/tests/rustdoc/issue-33302.rs
@@ -6,17 +6,17 @@ macro_rules! make {
         pub struct S;
 
         // @has issue_33302/constant.CST.html \
-        //        '//pre[@class="rust const"]' 'pub const CST: i32'
+        //        '//div[@class="item-decl"]/pre[@class="rust"]' 'pub const CST: i32'
         pub const CST: i32 = ($n * $n);
         // @has issue_33302/static.ST.html \
-        //        '//pre[@class="rust static"]' 'pub static ST: i32'
+        //        '//div[@class="item-decl"]/pre[@class="rust"]' 'pub static ST: i32'
         pub static ST: i32 = ($n * $n);
 
         pub trait T<X> {
             fn ignore(_: &X) {}
             const C: X;
             // @has issue_33302/trait.T.html \
-            //        '//*[@class="rust trait"]' 'const D: i32'
+            //        '//div[@class="item-decl"]/pre[@class="rust"]' 'const D: i32'
             // @has - '//*[@id="associatedconstant.D"]' 'const D: i32'
             const D: i32 = ($n * $n);
         }
diff --git a/src/test/rustdoc/issue-33592.rs b/tests/rustdoc/issue-33592.rs
index 7a128f0b8..7a128f0b8 100644
--- a/src/test/rustdoc/issue-33592.rs
+++ b/tests/rustdoc/issue-33592.rs
diff --git a/src/test/rustdoc/issue-34025.rs b/tests/rustdoc/issue-34025.rs
index 9b9f21cb3..9b9f21cb3 100644
--- a/src/test/rustdoc/issue-34025.rs
+++ b/tests/rustdoc/issue-34025.rs
diff --git a/src/test/rustdoc/issue-34274.rs b/tests/rustdoc/issue-34274.rs
index ce5be84a5..ce5be84a5 100644
--- a/src/test/rustdoc/issue-34274.rs
+++ b/tests/rustdoc/issue-34274.rs
diff --git a/src/test/rustdoc/issue-34423.rs b/tests/rustdoc/issue-34423.rs
index b429bf8c9..b429bf8c9 100644
--- a/src/test/rustdoc/issue-34423.rs
+++ b/tests/rustdoc/issue-34423.rs
diff --git a/src/test/rustdoc/issue-34473.rs b/tests/rustdoc/issue-34473.rs
index 37da3dd19..37da3dd19 100644
--- a/src/test/rustdoc/issue-34473.rs
+++ b/tests/rustdoc/issue-34473.rs
diff --git a/src/test/rustdoc/issue-34928.rs b/tests/rustdoc/issue-34928.rs
index 91b677574..91b677574 100644
--- a/src/test/rustdoc/issue-34928.rs
+++ b/tests/rustdoc/issue-34928.rs
diff --git a/src/test/rustdoc/issue-35169-2.rs b/tests/rustdoc/issue-35169-2.rs
index f08466baf..f08466baf 100644
--- a/src/test/rustdoc/issue-35169-2.rs
+++ b/tests/rustdoc/issue-35169-2.rs
diff --git a/src/test/rustdoc/issue-35169.rs b/tests/rustdoc/issue-35169.rs
index 70a2265c8..70a2265c8 100644
--- a/src/test/rustdoc/issue-35169.rs
+++ b/tests/rustdoc/issue-35169.rs
diff --git a/src/test/rustdoc/issue-35488.rs b/tests/rustdoc/issue-35488.rs
index c1bf9ceea..c1bf9ceea 100644
--- a/src/test/rustdoc/issue-35488.rs
+++ b/tests/rustdoc/issue-35488.rs
diff --git a/src/test/rustdoc/issue-36031.rs b/tests/rustdoc/issue-36031.rs
index af1b32fd2..af1b32fd2 100644
--- a/src/test/rustdoc/issue-36031.rs
+++ b/tests/rustdoc/issue-36031.rs
diff --git a/src/test/rustdoc/issue-38129.rs b/tests/rustdoc/issue-38129.rs
index 156d50fa5..156d50fa5 100644
--- a/src/test/rustdoc/issue-38129.rs
+++ b/tests/rustdoc/issue-38129.rs
diff --git a/src/test/rustdoc/issue-38219.rs b/tests/rustdoc/issue-38219.rs
index fa57c58c7..fa57c58c7 100644
--- a/src/test/rustdoc/issue-38219.rs
+++ b/tests/rustdoc/issue-38219.rs
diff --git a/src/test/rustdoc/issue-40936.rs b/tests/rustdoc/issue-40936.rs
index 4d2e4c17b..4d2e4c17b 100644
--- a/src/test/rustdoc/issue-40936.rs
+++ b/tests/rustdoc/issue-40936.rs
diff --git a/src/test/rustdoc/issue-41783.codeblock.html b/tests/rustdoc/issue-41783.codeblock.html
index 3bca4536c..3bca4536c 100644
--- a/src/test/rustdoc/issue-41783.codeblock.html
+++ b/tests/rustdoc/issue-41783.codeblock.html
diff --git a/src/test/rustdoc/issue-41783.rs b/tests/rustdoc/issue-41783.rs
index 769f984a2..7578d49da 100644
--- a/src/test/rustdoc/issue-41783.rs
+++ b/tests/rustdoc/issue-41783.rs
@@ -5,7 +5,7 @@
 // @!hasraw - '<span class="attr">#[outer]</span>'
 // @hasraw - '#![inner]</span>'
 // @!hasraw - '<span class="attr">#![inner]</span>'
-// @snapshot 'codeblock' - '//*[@class="rustdoc-toggle top-doc"]/*[@class="docblock"]//pre/code'
+// @snapshot 'codeblock' - '//*[@class="toggle top-doc"]/*[@class="docblock"]//pre/code'
 
 /// ```no_run
 /// # # space
diff --git a/src/test/rustdoc/issue-42760.rs b/tests/rustdoc/issue-42760.rs
index a5394c7d9..a5394c7d9 100644
--- a/src/test/rustdoc/issue-42760.rs
+++ b/tests/rustdoc/issue-42760.rs
diff --git a/src/test/rustdoc/issue-43153.rs b/tests/rustdoc/issue-43153.rs
index 0fe680f10..0fe680f10 100644
--- a/src/test/rustdoc/issue-43153.rs
+++ b/tests/rustdoc/issue-43153.rs
diff --git a/src/test/rustdoc/issue-43701.rs b/tests/rustdoc/issue-43701.rs
index 44335e961..44335e961 100644
--- a/src/test/rustdoc/issue-43701.rs
+++ b/tests/rustdoc/issue-43701.rs
diff --git a/src/test/rustdoc/issue-43869.rs b/tests/rustdoc/issue-43869.rs
index 767d09d85..767d09d85 100644
--- a/src/test/rustdoc/issue-43869.rs
+++ b/tests/rustdoc/issue-43869.rs
diff --git a/src/test/rustdoc/issue-43893.rs b/tests/rustdoc/issue-43893.rs
index 95d551934..95d551934 100644
--- a/src/test/rustdoc/issue-43893.rs
+++ b/tests/rustdoc/issue-43893.rs
diff --git a/src/test/rustdoc/issue-45584.rs b/tests/rustdoc/issue-45584.rs
index 86479e6fb..86479e6fb 100644
--- a/src/test/rustdoc/issue-45584.rs
+++ b/tests/rustdoc/issue-45584.rs
diff --git a/src/test/rustdoc/issue-46271.rs b/tests/rustdoc/issue-46271.rs
index b38ef20c5..b38ef20c5 100644
--- a/src/test/rustdoc/issue-46271.rs
+++ b/tests/rustdoc/issue-46271.rs
diff --git a/src/test/rustdoc/issue-46377.rs b/tests/rustdoc/issue-46377.rs
index 4489f038c..4489f038c 100644
--- a/src/test/rustdoc/issue-46377.rs
+++ b/tests/rustdoc/issue-46377.rs
diff --git a/src/test/rustdoc/issue-46380-2.rs b/tests/rustdoc/issue-46380-2.rs
index 7004d18dc..7004d18dc 100644
--- a/src/test/rustdoc/issue-46380-2.rs
+++ b/tests/rustdoc/issue-46380-2.rs
diff --git a/src/test/rustdoc/issue-46727.rs b/tests/rustdoc/issue-46727.rs
index 8cfc4827a..8cfc4827a 100644
--- a/src/test/rustdoc/issue-46727.rs
+++ b/tests/rustdoc/issue-46727.rs
diff --git a/src/test/rustdoc/issue-46766.rs b/tests/rustdoc/issue-46766.rs
index 36ab73956..36ab73956 100644
--- a/src/test/rustdoc/issue-46766.rs
+++ b/tests/rustdoc/issue-46766.rs
diff --git a/src/test/rustdoc/issue-46767.rs b/tests/rustdoc/issue-46767.rs
index ef6ed104b..ef6ed104b 100644
--- a/src/test/rustdoc/issue-46767.rs
+++ b/tests/rustdoc/issue-46767.rs
diff --git a/src/test/rustdoc/issue-46976.rs b/tests/rustdoc/issue-46976.rs
index c59f8c72e..c59f8c72e 100644
--- a/src/test/rustdoc/issue-46976.rs
+++ b/tests/rustdoc/issue-46976.rs
diff --git a/src/test/rustdoc/issue-47038.rs b/tests/rustdoc/issue-47038.rs
index 810ddca3e..810ddca3e 100644
--- a/src/test/rustdoc/issue-47038.rs
+++ b/tests/rustdoc/issue-47038.rs
diff --git a/src/test/rustdoc/issue-47197-blank-line-in-doc-block.rs b/tests/rustdoc/issue-47197-blank-line-in-doc-block.rs
index 19994475d..19994475d 100644
--- a/src/test/rustdoc/issue-47197-blank-line-in-doc-block.rs
+++ b/tests/rustdoc/issue-47197-blank-line-in-doc-block.rs
diff --git a/src/test/rustdoc/issue-47639.rs b/tests/rustdoc/issue-47639.rs
index 4b3456b86..4b3456b86 100644
--- a/src/test/rustdoc/issue-47639.rs
+++ b/tests/rustdoc/issue-47639.rs
diff --git a/src/test/rustdoc/issue-48377.rs b/tests/rustdoc/issue-48377.rs
index c32bcf380..c32bcf380 100644
--- a/src/test/rustdoc/issue-48377.rs
+++ b/tests/rustdoc/issue-48377.rs
diff --git a/src/test/rustdoc/issue-48414.rs b/tests/rustdoc/issue-48414.rs
index b35743d88..b35743d88 100644
--- a/src/test/rustdoc/issue-48414.rs
+++ b/tests/rustdoc/issue-48414.rs
diff --git a/src/test/rustdoc/issue-50159.rs b/tests/rustdoc/issue-50159.rs
index 04bc4f304..04bc4f304 100644
--- a/src/test/rustdoc/issue-50159.rs
+++ b/tests/rustdoc/issue-50159.rs
diff --git a/src/test/rustdoc/issue-51236.rs b/tests/rustdoc/issue-51236.rs
index 1c7aa9c7e..1c7aa9c7e 100644
--- a/src/test/rustdoc/issue-51236.rs
+++ b/tests/rustdoc/issue-51236.rs
diff --git a/src/test/rustdoc/issue-52873.rs b/tests/rustdoc/issue-52873.rs
index 8000ce73b..8000ce73b 100644
--- a/src/test/rustdoc/issue-52873.rs
+++ b/tests/rustdoc/issue-52873.rs
diff --git a/src/test/rustdoc/issue-53689.rs b/tests/rustdoc/issue-53689.rs
index 832140e06..832140e06 100644
--- a/src/test/rustdoc/issue-53689.rs
+++ b/tests/rustdoc/issue-53689.rs
diff --git a/src/test/rustdoc/issue-53812.rs b/tests/rustdoc/issue-53812.rs
index c68ffd521..c68ffd521 100644
--- a/src/test/rustdoc/issue-53812.rs
+++ b/tests/rustdoc/issue-53812.rs
diff --git a/src/test/rustdoc/issue-54478-demo-allocator.rs b/tests/rustdoc/issue-54478-demo-allocator.rs
index 4811f363b..4811f363b 100644
--- a/src/test/rustdoc/issue-54478-demo-allocator.rs
+++ b/tests/rustdoc/issue-54478-demo-allocator.rs
diff --git a/src/test/rustdoc/issue-54705.rs b/tests/rustdoc/issue-54705.rs
index 7b7290ab4..7b7290ab4 100644
--- a/src/test/rustdoc/issue-54705.rs
+++ b/tests/rustdoc/issue-54705.rs
diff --git a/src/test/rustdoc/issue-55001.rs b/tests/rustdoc/issue-55001.rs
index f6c7f9a3d..f6c7f9a3d 100644
--- a/src/test/rustdoc/issue-55001.rs
+++ b/tests/rustdoc/issue-55001.rs
diff --git a/src/test/rustdoc/issue-55321.rs b/tests/rustdoc/issue-55321.rs
index 22a18ef90..22a18ef90 100644
--- a/src/test/rustdoc/issue-55321.rs
+++ b/tests/rustdoc/issue-55321.rs
diff --git a/src/test/rustdoc/issue-55364.rs b/tests/rustdoc/issue-55364.rs
index 14a6f5041..14a6f5041 100644
--- a/src/test/rustdoc/issue-55364.rs
+++ b/tests/rustdoc/issue-55364.rs
diff --git a/src/test/rustdoc/issue-56701.rs b/tests/rustdoc/issue-56701.rs
index ba00743fc..ba00743fc 100644
--- a/src/test/rustdoc/issue-56701.rs
+++ b/tests/rustdoc/issue-56701.rs
diff --git a/src/test/rustdoc/issue-56822.rs b/tests/rustdoc/issue-56822.rs
index b4eef344b..b4eef344b 100644
--- a/src/test/rustdoc/issue-56822.rs
+++ b/tests/rustdoc/issue-56822.rs
diff --git a/src/test/rustdoc/issue-57180.rs b/tests/rustdoc/issue-57180.rs
index 14bd2b0fe..14bd2b0fe 100644
--- a/src/test/rustdoc/issue-57180.rs
+++ b/tests/rustdoc/issue-57180.rs
diff --git a/src/test/rustdoc/issue-60482.rs b/tests/rustdoc/issue-60482.rs
index 0fd1daa74..0fd1daa74 100644
--- a/src/test/rustdoc/issue-60482.rs
+++ b/tests/rustdoc/issue-60482.rs
diff --git a/src/test/rustdoc/issue-60726.rs b/tests/rustdoc/issue-60726.rs
index fbb0f82ae..fbb0f82ae 100644
--- a/src/test/rustdoc/issue-60726.rs
+++ b/tests/rustdoc/issue-60726.rs
diff --git a/src/test/rustdoc/issue-61592.rs b/tests/rustdoc/issue-61592.rs
index 4b6c37b94..4b6c37b94 100644
--- a/src/test/rustdoc/issue-61592.rs
+++ b/tests/rustdoc/issue-61592.rs
diff --git a/src/test/rustdoc/issue-67851-both.rs b/tests/rustdoc/issue-67851-both.rs
index d69b94317..d69b94317 100644
--- a/src/test/rustdoc/issue-67851-both.rs
+++ b/tests/rustdoc/issue-67851-both.rs
diff --git a/src/test/rustdoc/issue-67851-hidden.rs b/tests/rustdoc/issue-67851-hidden.rs
index 8a3cafe4c..8a3cafe4c 100644
--- a/src/test/rustdoc/issue-67851-hidden.rs
+++ b/tests/rustdoc/issue-67851-hidden.rs
diff --git a/src/test/rustdoc/issue-67851-neither.rs b/tests/rustdoc/issue-67851-neither.rs
index 4e3cd8328..4e3cd8328 100644
--- a/src/test/rustdoc/issue-67851-neither.rs
+++ b/tests/rustdoc/issue-67851-neither.rs
diff --git a/src/test/rustdoc/issue-67851-private.rs b/tests/rustdoc/issue-67851-private.rs
index 8addc7f3e..8addc7f3e 100644
--- a/src/test/rustdoc/issue-67851-private.rs
+++ b/tests/rustdoc/issue-67851-private.rs
diff --git a/src/test/rustdoc/issue-72340.rs b/tests/rustdoc/issue-72340.rs
index 64044cfe9..64044cfe9 100644
--- a/src/test/rustdoc/issue-72340.rs
+++ b/tests/rustdoc/issue-72340.rs
diff --git a/src/test/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs b/tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs
index 2700f2370..2700f2370 100644
--- a/src/test/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs
+++ b/tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs
diff --git a/src/test/rustdoc/issue-74083.rs b/tests/rustdoc/issue-74083.rs
index c7f5d7eaa..c7f5d7eaa 100644
--- a/src/test/rustdoc/issue-74083.rs
+++ b/tests/rustdoc/issue-74083.rs
diff --git a/src/test/rustdoc/issue-75588.rs b/tests/rustdoc/issue-75588.rs
index 3b11059a7..3b11059a7 100644
--- a/src/test/rustdoc/issue-75588.rs
+++ b/tests/rustdoc/issue-75588.rs
diff --git a/src/test/rustdoc/issue-76501.rs b/tests/rustdoc/issue-76501.rs
index a90e0fea0..a90e0fea0 100644
--- a/src/test/rustdoc/issue-76501.rs
+++ b/tests/rustdoc/issue-76501.rs
diff --git a/src/test/rustdoc/issue-78673.rs b/tests/rustdoc/issue-78673.rs
index 2e4bec254..2e4bec254 100644
--- a/src/test/rustdoc/issue-78673.rs
+++ b/tests/rustdoc/issue-78673.rs
diff --git a/src/test/rustdoc/issue-78701.rs b/tests/rustdoc/issue-78701.rs
index e3e46468f..e3e46468f 100644
--- a/src/test/rustdoc/issue-78701.rs
+++ b/tests/rustdoc/issue-78701.rs
diff --git a/src/test/rustdoc/issue-79201.rs b/tests/rustdoc/issue-79201.rs
index f95d79cd4..f95d79cd4 100644
--- a/src/test/rustdoc/issue-79201.rs
+++ b/tests/rustdoc/issue-79201.rs
diff --git a/src/test/rustdoc/issue-80233-normalize-auto-trait.rs b/tests/rustdoc/issue-80233-normalize-auto-trait.rs
index 62fbc2444..62fbc2444 100644
--- a/src/test/rustdoc/issue-80233-normalize-auto-trait.rs
+++ b/tests/rustdoc/issue-80233-normalize-auto-trait.rs
diff --git a/src/test/rustdoc/issue-82465-asref-for-and-of-local.rs b/tests/rustdoc/issue-82465-asref-for-and-of-local.rs
index adf4d111a..adf4d111a 100644
--- a/src/test/rustdoc/issue-82465-asref-for-and-of-local.rs
+++ b/tests/rustdoc/issue-82465-asref-for-and-of-local.rs
diff --git a/src/test/rustdoc/issue-83375-multiple-mods-w-same-name-doc-inline-last-item.rs b/tests/rustdoc/issue-83375-multiple-mods-w-same-name-doc-inline-last-item.rs
index d3a7a870b..d3a7a870b 100644
--- a/src/test/rustdoc/issue-83375-multiple-mods-w-same-name-doc-inline-last-item.rs
+++ b/tests/rustdoc/issue-83375-multiple-mods-w-same-name-doc-inline-last-item.rs
diff --git a/src/test/rustdoc/issue-83375-multiple-mods-w-same-name-doc-inline.rs b/tests/rustdoc/issue-83375-multiple-mods-w-same-name-doc-inline.rs
index b83692509..b83692509 100644
--- a/src/test/rustdoc/issue-83375-multiple-mods-w-same-name-doc-inline.rs
+++ b/tests/rustdoc/issue-83375-multiple-mods-w-same-name-doc-inline.rs
diff --git a/tests/rustdoc/issue-85454.rs b/tests/rustdoc/issue-85454.rs
new file mode 100644
index 000000000..74fc22b31
--- /dev/null
+++ b/tests/rustdoc/issue-85454.rs
@@ -0,0 +1,29 @@
+// aux-build:issue-85454.rs
+// build-aux-docs
+#![crate_name = "foo"]
+
+extern crate issue_85454;
+
+// @has foo/trait.FromResidual.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub trait FromResidual<R = <Self as Try>::Residual> { fn from_residual(residual: R) -> Self; }'
+pub trait FromResidual<R = <Self as Try>::Residual> {
+    fn from_residual(residual: R) -> Self;
+}
+
+pub trait Try: FromResidual {
+    type Output;
+    type Residual;
+    fn from_output(output: Self::Output) -> Self;
+    fn branch(self) -> ControlFlow<Self::Residual, Self::Output>;
+}
+
+pub enum ControlFlow<B, C = ()> {
+    Continue(C),
+    Break(B),
+}
+
+pub mod reexport {
+    // @has foo/reexport/trait.FromResidual.html
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub trait FromResidual<R = <Self as Try>::Residual> { fn from_residual(residual: R) -> Self; }'
+    pub use issue_85454::*;
+}
diff --git a/src/test/rustdoc/issue-86620.rs b/tests/rustdoc/issue-86620.rs
index ef15946ec..ef15946ec 100644
--- a/src/test/rustdoc/issue-86620.rs
+++ b/tests/rustdoc/issue-86620.rs
diff --git a/src/test/rustdoc/issue-88600.rs b/tests/rustdoc/issue-88600.rs
index db0d102b7..db0d102b7 100644
--- a/src/test/rustdoc/issue-88600.rs
+++ b/tests/rustdoc/issue-88600.rs
diff --git a/src/test/rustdoc/issue-89309-heading-levels.rs b/tests/rustdoc/issue-89309-heading-levels.rs
index bb706c28f..bb706c28f 100644
--- a/src/test/rustdoc/issue-89309-heading-levels.rs
+++ b/tests/rustdoc/issue-89309-heading-levels.rs
diff --git a/src/test/rustdoc/issue-89852.rs b/tests/rustdoc/issue-89852.rs
index 4f2da5e07..4f2da5e07 100644
--- a/src/test/rustdoc/issue-89852.rs
+++ b/tests/rustdoc/issue-89852.rs
diff --git a/src/test/rustdoc/issue-95633.rs b/tests/rustdoc/issue-95633.rs
index a71d0a037..a71d0a037 100644
--- a/src/test/rustdoc/issue-95633.rs
+++ b/tests/rustdoc/issue-95633.rs
diff --git a/src/test/rustdoc/issue-95873.rs b/tests/rustdoc/issue-95873.rs
index ff33fb63a..ff33fb63a 100644
--- a/src/test/rustdoc/issue-95873.rs
+++ b/tests/rustdoc/issue-95873.rs
diff --git a/src/test/rustdoc/issue-96381.rs b/tests/rustdoc/issue-96381.rs
index f0f123f85..f0f123f85 100644
--- a/src/test/rustdoc/issue-96381.rs
+++ b/tests/rustdoc/issue-96381.rs
diff --git a/src/test/rustdoc/issue-98697.rs b/tests/rustdoc/issue-98697.rs
index d50268509..884b63ac9 100644
--- a/src/test/rustdoc/issue-98697.rs
+++ b/tests/rustdoc/issue-98697.rs
@@ -8,8 +8,8 @@
 
 extern crate issue_98697_reexport_with_anonymous_lifetime;
 
-// @has issue_98697/fn.repro.html '//pre[@class="rust fn"]/code' 'fn repro<F>()where F: Fn(&str)'
-// @!has issue_98697/fn.repro.html '//pre[@class="rust fn"]/code' 'for<'
+// @has issue_98697/fn.repro.html '//div[@class="item-decl"]/pre[@class="rust"]/code' 'fn repro<F>()where F: Fn(&str)'
+// @!has issue_98697/fn.repro.html '//div[@class="item-decl"]/pre[@class="rust"]/code' 'for<'
 pub use issue_98697_reexport_with_anonymous_lifetime::repro;
 
 // @has issue_98697/struct.Extra.html '//div[@id="trait-implementations-list"]//h3[@class="code-header"]' 'impl MyTrait<&Extra> for Extra'
diff --git a/src/test/rustdoc/issue-99221-multiple-macro-rules-w-same-name-submodule.rs b/tests/rustdoc/issue-99221-multiple-macro-rules-w-same-name-submodule.rs
index e74881d38..e74881d38 100644
--- a/src/test/rustdoc/issue-99221-multiple-macro-rules-w-same-name-submodule.rs
+++ b/tests/rustdoc/issue-99221-multiple-macro-rules-w-same-name-submodule.rs
diff --git a/src/test/rustdoc/issue-99221-multiple-macro-rules-w-same-name.rs b/tests/rustdoc/issue-99221-multiple-macro-rules-w-same-name.rs
index 46d59654b..46d59654b 100644
--- a/src/test/rustdoc/issue-99221-multiple-macro-rules-w-same-name.rs
+++ b/tests/rustdoc/issue-99221-multiple-macro-rules-w-same-name.rs
diff --git a/src/test/rustdoc/issue-99221-multiple-structs-w-same-name.rs b/tests/rustdoc/issue-99221-multiple-structs-w-same-name.rs
index 41e64726a..41e64726a 100644
--- a/src/test/rustdoc/issue-99221-multiple-structs-w-same-name.rs
+++ b/tests/rustdoc/issue-99221-multiple-structs-w-same-name.rs
diff --git a/src/test/rustdoc/issue-99734-multiple-foreigns-w-same-name.rs b/tests/rustdoc/issue-99734-multiple-foreigns-w-same-name.rs
index 3208fea05..3208fea05 100644
--- a/src/test/rustdoc/issue-99734-multiple-foreigns-w-same-name.rs
+++ b/tests/rustdoc/issue-99734-multiple-foreigns-w-same-name.rs
diff --git a/src/test/rustdoc/issue-99734-multiple-mods-w-same-name.rs b/tests/rustdoc/issue-99734-multiple-mods-w-same-name.rs
index b2f9b8b46..b2f9b8b46 100644
--- a/src/test/rustdoc/issue-99734-multiple-mods-w-same-name.rs
+++ b/tests/rustdoc/issue-99734-multiple-mods-w-same-name.rs
diff --git a/src/test/rustdoc/keyword.rs b/tests/rustdoc/keyword.rs
index ea1273850..4d047af32 100644
--- a/src/test/rustdoc/keyword.rs
+++ b/tests/rustdoc/keyword.rs
@@ -7,7 +7,7 @@
 // @has foo/index.html '//div[@class="sidebar-elems"]//li/a' 'Keywords'
 // @has foo/index.html '//div[@class="sidebar-elems"]//li/a/@href' '#keywords'
 // @has foo/keyword.match.html '//a[@class="keyword"]' 'match'
-// @has foo/keyword.match.html '//h1[@class="fqn"]' 'Keyword match'
+// @has foo/keyword.match.html '//h1' 'Keyword match'
 // @has foo/keyword.match.html '//section[@id="main-content"]//div[@class="docblock"]//p' 'this is a test!'
 // @has foo/index.html '//a/@href' '../foo/index.html'
 // @!has foo/foo/index.html
diff --git a/tests/rustdoc/legacy-const-generic.rs b/tests/rustdoc/legacy-const-generic.rs
new file mode 100644
index 000000000..14533624e
--- /dev/null
+++ b/tests/rustdoc/legacy-const-generic.rs
@@ -0,0 +1,16 @@
+#![crate_name = "foo"]
+#![feature(rustc_attrs)]
+
+// @has 'foo/fn.foo.html'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'fn foo(x: usize, const Y: usize, z: usize) -> [usize; 3]'
+#[rustc_legacy_const_generics(1)]
+pub fn foo<const Y: usize>(x: usize, z: usize) -> [usize; 3] {
+    [x, Y, z]
+}
+
+// @has 'foo/fn.bar.html'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'fn bar(x: usize, const Y: usize, const Z: usize) -> [usize; 3]'
+#[rustc_legacy_const_generics(1, 2)]
+pub fn bar<const Y: usize, const Z: usize>(x: usize) -> [usize; 3] {
+    [x, Y, z]
+}
diff --git a/tests/rustdoc/lifetime-name.rs b/tests/rustdoc/lifetime-name.rs
new file mode 100644
index 000000000..0fb660591
--- /dev/null
+++ b/tests/rustdoc/lifetime-name.rs
@@ -0,0 +1,5 @@
+#![crate_name = "foo"]
+
+// @has 'foo/type.Resolutions.html'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "pub type Resolutions<'tcx> = &'tcx u8;"
+pub type Resolutions<'tcx> = &'tcx u8;
diff --git a/src/test/rustdoc/line-breaks.rs b/tests/rustdoc/line-breaks.rs
index 29c16fcd4..29c16fcd4 100644
--- a/src/test/rustdoc/line-breaks.rs
+++ b/tests/rustdoc/line-breaks.rs
diff --git a/src/test/rustdoc/link-assoc-const.rs b/tests/rustdoc/link-assoc-const.rs
index 75a2531a3..75a2531a3 100644
--- a/src/test/rustdoc/link-assoc-const.rs
+++ b/tests/rustdoc/link-assoc-const.rs
diff --git a/src/test/rustdoc/link-title-escape.rs b/tests/rustdoc/link-title-escape.rs
index 7a322ea6d..7a322ea6d 100644
--- a/src/test/rustdoc/link-title-escape.rs
+++ b/tests/rustdoc/link-title-escape.rs
diff --git a/src/test/rustdoc/local-reexport-doc.rs b/tests/rustdoc/local-reexport-doc.rs
index 1c8468008..5dc857773 100644
--- a/src/test/rustdoc/local-reexport-doc.rs
+++ b/tests/rustdoc/local-reexport-doc.rs
@@ -4,7 +4,7 @@
 #![crate_name = "foo"]
 
 // @has 'foo/fn.g.html'
-// @has - '//*[@class="rustdoc-toggle top-doc"]/*[@class="docblock"]' \
+// @has - '//*[@class="toggle top-doc"]/*[@class="docblock"]' \
 // 'outer module inner module'
 
 mod inner_mod {
diff --git a/src/test/rustdoc/logo-class-default.rs b/tests/rustdoc/logo-class-default.rs
index d2d439199..d2d439199 100644
--- a/src/test/rustdoc/logo-class-default.rs
+++ b/tests/rustdoc/logo-class-default.rs
diff --git a/src/test/rustdoc/logo-class.rs b/tests/rustdoc/logo-class.rs
index d3aa446da..d3aa446da 100644
--- a/src/test/rustdoc/logo-class.rs
+++ b/tests/rustdoc/logo-class.rs
diff --git a/src/test/rustdoc/macro-document-private-duplicate.rs b/tests/rustdoc/macro-document-private-duplicate.rs
index d3cf7e140..d3cf7e140 100644
--- a/src/test/rustdoc/macro-document-private-duplicate.rs
+++ b/tests/rustdoc/macro-document-private-duplicate.rs
diff --git a/src/test/rustdoc/macro-document-private.rs b/tests/rustdoc/macro-document-private.rs
index d2496913f..d2496913f 100644
--- a/src/test/rustdoc/macro-document-private.rs
+++ b/tests/rustdoc/macro-document-private.rs
diff --git a/src/test/rustdoc/macro-generated-macro.macro_linebreak_pre.html b/tests/rustdoc/macro-generated-macro.macro_linebreak_pre.html
index ce5d3a846..ce5d3a846 100644
--- a/src/test/rustdoc/macro-generated-macro.macro_linebreak_pre.html
+++ b/tests/rustdoc/macro-generated-macro.macro_linebreak_pre.html
diff --git a/src/test/rustdoc/macro-generated-macro.macro_morestuff_pre.html b/tests/rustdoc/macro-generated-macro.macro_morestuff_pre.html
index 28f15522a..28f15522a 100644
--- a/src/test/rustdoc/macro-generated-macro.macro_morestuff_pre.html
+++ b/tests/rustdoc/macro-generated-macro.macro_morestuff_pre.html
diff --git a/src/test/rustdoc/macro-generated-macro.rs b/tests/rustdoc/macro-generated-macro.rs
index 1a423cac1..1a423cac1 100644
--- a/src/test/rustdoc/macro-generated-macro.rs
+++ b/tests/rustdoc/macro-generated-macro.rs
diff --git a/src/test/rustdoc/macro-higher-kinded-function.rs b/tests/rustdoc/macro-higher-kinded-function.rs
index b8c52b7b7..b8c52b7b7 100644
--- a/src/test/rustdoc/macro-higher-kinded-function.rs
+++ b/tests/rustdoc/macro-higher-kinded-function.rs
diff --git a/src/test/rustdoc/macro-in-async-block.rs b/tests/rustdoc/macro-in-async-block.rs
index b4aaacf7b..b4aaacf7b 100644
--- a/src/test/rustdoc/macro-in-async-block.rs
+++ b/tests/rustdoc/macro-in-async-block.rs
diff --git a/src/test/rustdoc/macro-in-closure.rs b/tests/rustdoc/macro-in-closure.rs
index b4411d927..b4411d927 100644
--- a/src/test/rustdoc/macro-in-closure.rs
+++ b/tests/rustdoc/macro-in-closure.rs
diff --git a/src/test/rustdoc/macro-indirect-use.rs b/tests/rustdoc/macro-indirect-use.rs
index b2d9336cf..b2d9336cf 100644
--- a/src/test/rustdoc/macro-indirect-use.rs
+++ b/tests/rustdoc/macro-indirect-use.rs
diff --git a/src/test/rustdoc/macro-private-not-documented.rs b/tests/rustdoc/macro-private-not-documented.rs
index f135a3a9c..f135a3a9c 100644
--- a/src/test/rustdoc/macro-private-not-documented.rs
+++ b/tests/rustdoc/macro-private-not-documented.rs
diff --git a/src/test/rustdoc/macro_pub_in_module.rs b/tests/rustdoc/macro_pub_in_module.rs
index 4fd85d689..4fd85d689 100644
--- a/src/test/rustdoc/macro_pub_in_module.rs
+++ b/tests/rustdoc/macro_pub_in_module.rs
diff --git a/src/test/rustdoc/macro_rules-matchers.rs b/tests/rustdoc/macro_rules-matchers.rs
index 96f4126c7..96f4126c7 100644
--- a/src/test/rustdoc/macro_rules-matchers.rs
+++ b/tests/rustdoc/macro_rules-matchers.rs
diff --git a/src/test/rustdoc/macros.rs b/tests/rustdoc/macros.rs
index ae0cf7a14..ae0cf7a14 100644
--- a/src/test/rustdoc/macros.rs
+++ b/tests/rustdoc/macros.rs
diff --git a/src/test/rustdoc/manual_impl.rs b/tests/rustdoc/manual_impl.rs
index b2ee077bc..b2ee077bc 100644
--- a/src/test/rustdoc/manual_impl.rs
+++ b/tests/rustdoc/manual_impl.rs
diff --git a/src/test/rustdoc/markdown-summaries.rs b/tests/rustdoc/markdown-summaries.rs
index 31e7072b5..31e7072b5 100644
--- a/src/test/rustdoc/markdown-summaries.rs
+++ b/tests/rustdoc/markdown-summaries.rs
diff --git a/src/test/rustdoc/masked.rs b/tests/rustdoc/masked.rs
index 875c026fd..875c026fd 100644
--- a/src/test/rustdoc/masked.rs
+++ b/tests/rustdoc/masked.rs
diff --git a/src/test/rustdoc/method-list.rs b/tests/rustdoc/method-list.rs
index 50f4af3aa..50f4af3aa 100644
--- a/src/test/rustdoc/method-list.rs
+++ b/tests/rustdoc/method-list.rs
diff --git a/src/test/rustdoc/mixing-doc-comments-and-attrs.S1_top-doc.html b/tests/rustdoc/mixing-doc-comments-and-attrs.S1_top-doc.html
index 8ff114b99..8ff114b99 100644
--- a/src/test/rustdoc/mixing-doc-comments-and-attrs.S1_top-doc.html
+++ b/tests/rustdoc/mixing-doc-comments-and-attrs.S1_top-doc.html
diff --git a/src/test/rustdoc/mixing-doc-comments-and-attrs.S2_top-doc.html b/tests/rustdoc/mixing-doc-comments-and-attrs.S2_top-doc.html
index 8ff114b99..8ff114b99 100644
--- a/src/test/rustdoc/mixing-doc-comments-and-attrs.S2_top-doc.html
+++ b/tests/rustdoc/mixing-doc-comments-and-attrs.S2_top-doc.html
diff --git a/src/test/rustdoc/mixing-doc-comments-and-attrs.S3_top-doc.html b/tests/rustdoc/mixing-doc-comments-and-attrs.S3_top-doc.html
index a4ee4b141..a4ee4b141 100644
--- a/src/test/rustdoc/mixing-doc-comments-and-attrs.S3_top-doc.html
+++ b/tests/rustdoc/mixing-doc-comments-and-attrs.S3_top-doc.html
diff --git a/tests/rustdoc/mixing-doc-comments-and-attrs.rs b/tests/rustdoc/mixing-doc-comments-and-attrs.rs
new file mode 100644
index 000000000..010058361
--- /dev/null
+++ b/tests/rustdoc/mixing-doc-comments-and-attrs.rs
@@ -0,0 +1,25 @@
+#![crate_name = "foo"]
+
+// @has 'foo/struct.S1.html'
+// @snapshot S1_top-doc - '//details[@class="toggle top-doc"]/div[@class="docblock"]'
+
+#[doc = "Hello world!\n\n"]
+/// Goodbye!
+#[doc = "  Hello again!\n"]
+pub struct S1;
+
+// @has 'foo/struct.S2.html'
+// @snapshot S2_top-doc - '//details[@class="toggle top-doc"]/div[@class="docblock"]'
+
+/// Hello world!
+///
+#[doc = "Goodbye!"]
+/// Hello again!
+pub struct S2;
+
+// @has 'foo/struct.S3.html'
+// @snapshot S3_top-doc - '//details[@class="toggle top-doc"]/div[@class="docblock"]'
+/** Par 1
+*/ ///
+/// Par 2
+pub struct S3;
diff --git a/src/test/rustdoc/mod-stackoverflow.rs b/tests/rustdoc/mod-stackoverflow.rs
index 45b1de216..45b1de216 100644
--- a/src/test/rustdoc/mod-stackoverflow.rs
+++ b/tests/rustdoc/mod-stackoverflow.rs
diff --git a/src/test/rustdoc/module-impls.rs b/tests/rustdoc/module-impls.rs
index 852f444e9..852f444e9 100644
--- a/src/test/rustdoc/module-impls.rs
+++ b/tests/rustdoc/module-impls.rs
diff --git a/tests/rustdoc/multiple-import-levels.rs b/tests/rustdoc/multiple-import-levels.rs
new file mode 100644
index 000000000..29b67c6b2
--- /dev/null
+++ b/tests/rustdoc/multiple-import-levels.rs
@@ -0,0 +1,34 @@
+// The goal of this test is to ensure that the attributes of all imports are taken into
+// account.
+
+#![crate_name = "foo"]
+
+mod a {
+    /// 1
+    pub struct Type;
+}
+
+mod b {
+    /// 2
+    pub use crate::a::Type;
+}
+
+mod c {
+    /// 3
+    pub use crate::b::Type;
+    /// 4
+    pub use crate::b::Type as Woof;
+}
+
+// @has 'foo/struct.Type.html'
+// @has - '//*[@class="toggle top-doc"]/*[@class="docblock"]' 'foo 2 1'
+/// foo
+pub use b::Type;
+// @has 'foo/struct.Whatever.html'
+// @has - '//*[@class="toggle top-doc"]/*[@class="docblock"]' 'whatever 3 2 1'
+/// whatever
+pub use c::Type as Whatever;
+// @has 'foo/struct.Woof.html'
+// @has - '//*[@class="toggle top-doc"]/*[@class="docblock"]' 'a dog 4 2 1'
+/// a dog
+pub use c::Woof;
diff --git a/src/test/rustdoc/must_implement_one_of.rs b/tests/rustdoc/must_implement_one_of.rs
index 1f1dd5d57..1f1dd5d57 100644
--- a/src/test/rustdoc/must_implement_one_of.rs
+++ b/tests/rustdoc/must_implement_one_of.rs
diff --git a/src/test/rustdoc/mut-params.rs b/tests/rustdoc/mut-params.rs
index f3ea69958..3b862e651 100644
--- a/src/test/rustdoc/mut-params.rs
+++ b/tests/rustdoc/mut-params.rs
@@ -13,6 +13,6 @@ impl Foo {
     pub fn bar(mut bar: ()) {}
 }
 
-// @count foo/fn.baz.html '//*[@class="rust fn"]' 1
-// @!has - '//*[@class="rust fn"]' 'mut'
+// @count foo/fn.baz.html '//div[@class="item-decl"]/pre[@class="rust"]' 1
+// @!has - '//div[@class="item-decl"]/pre[@class="rust"]' 'mut'
 pub fn baz(mut foo: Foo) {}
diff --git a/src/test/rustdoc/namespaces.rs b/tests/rustdoc/namespaces.rs
index ad828e5ee..ad828e5ee 100644
--- a/src/test/rustdoc/namespaces.rs
+++ b/tests/rustdoc/namespaces.rs
diff --git a/src/test/rustdoc/negative-impl-sidebar.rs b/tests/rustdoc/negative-impl-sidebar.rs
index 4af6d0084..4af6d0084 100644
--- a/src/test/rustdoc/negative-impl-sidebar.rs
+++ b/tests/rustdoc/negative-impl-sidebar.rs
diff --git a/src/test/rustdoc/negative-impl.rs b/tests/rustdoc/negative-impl.rs
index af19c784d..af19c784d 100644
--- a/src/test/rustdoc/negative-impl.rs
+++ b/tests/rustdoc/negative-impl.rs
diff --git a/src/test/rustdoc/nested-modules.rs b/tests/rustdoc/nested-modules.rs
index 12234d2cf..12234d2cf 100644
--- a/src/test/rustdoc/nested-modules.rs
+++ b/tests/rustdoc/nested-modules.rs
diff --git a/src/test/rustdoc/no-compiler-reexport.rs b/tests/rustdoc/no-compiler-reexport.rs
index d28fdf87b..d28fdf87b 100644
--- a/src/test/rustdoc/no-compiler-reexport.rs
+++ b/tests/rustdoc/no-compiler-reexport.rs
diff --git a/src/test/rustdoc/no-crate-filter.rs b/tests/rustdoc/no-crate-filter.rs
index b2f899064..b2f899064 100644
--- a/src/test/rustdoc/no-crate-filter.rs
+++ b/tests/rustdoc/no-crate-filter.rs
diff --git a/src/test/rustdoc/no-run-still-checks-lints.rs b/tests/rustdoc/no-run-still-checks-lints.rs
index 9f7d1c884..9f7d1c884 100644
--- a/src/test/rustdoc/no-run-still-checks-lints.rs
+++ b/tests/rustdoc/no-run-still-checks-lints.rs
diff --git a/src/test/rustdoc/no-stack-overflow-25295.rs b/tests/rustdoc/no-stack-overflow-25295.rs
index dd79f1e4b..dd79f1e4b 100644
--- a/src/test/rustdoc/no-stack-overflow-25295.rs
+++ b/tests/rustdoc/no-stack-overflow-25295.rs
diff --git a/src/test/rustdoc/no-unit-struct-field.rs b/tests/rustdoc/no-unit-struct-field.rs
index d301954b6..d301954b6 100644
--- a/src/test/rustdoc/no-unit-struct-field.rs
+++ b/tests/rustdoc/no-unit-struct-field.rs
diff --git a/src/test/rustdoc/no_std-primitive.rs b/tests/rustdoc/no_std-primitive.rs
index 22fd392dd..22fd392dd 100644
--- a/src/test/rustdoc/no_std-primitive.rs
+++ b/tests/rustdoc/no_std-primitive.rs
diff --git a/tests/rustdoc/normalize-assoc-item.rs b/tests/rustdoc/normalize-assoc-item.rs
new file mode 100644
index 000000000..659480479
--- /dev/null
+++ b/tests/rustdoc/normalize-assoc-item.rs
@@ -0,0 +1,82 @@
+// ignore-tidy-linelength
+// aux-build:normalize-assoc-item.rs
+// build-aux-docs
+// compile-flags:-Znormalize-docs
+
+pub trait Trait {
+    type X;
+}
+
+impl Trait for usize {
+    type X = isize;
+}
+
+impl Trait for () {
+    type X = fn() -> i32;
+}
+
+impl Trait for isize {
+    type X = <() as Trait>::X;
+}
+
+// @has 'normalize_assoc_item/fn.f.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub fn f() -> isize'
+pub fn f() -> <usize as Trait>::X {
+    0
+}
+
+// @has 'normalize_assoc_item/fn.f2.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub fn f2() -> fn() -> i32'
+pub fn f2() -> <isize as Trait>::X {
+    todo!()
+}
+
+pub struct S {
+    // @has 'normalize_assoc_item/struct.S.html' '//span[@id="structfield.box_me_up"]' 'box_me_up: Box<S, Global>'
+    pub box_me_up: <S as Trait>::X,
+    // @has 'normalize_assoc_item/struct.S.html' '//span[@id="structfield.generic"]' 'generic: (usize, isize)'
+    pub generic: <Generic<usize> as Trait>::X,
+}
+
+impl Trait for S {
+    type X = Box<S>;
+}
+
+pub struct Generic<Inner>(Inner);
+
+impl<Inner: Trait> Trait for Generic<Inner> {
+    type X = (Inner, Inner::X);
+}
+
+// These can't be normalized because they depend on a generic parameter.
+// However the user can choose whether the text should be displayed as `Inner::X` or `<Inner as Trait>::X`.
+
+// @has 'normalize_assoc_item/struct.Unknown.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub struct Unknown<Inner: Trait>(pub <Inner as Trait>::X);'
+pub struct Unknown<Inner: Trait>(pub <Inner as Trait>::X);
+
+// @has 'normalize_assoc_item/struct.Unknown2.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub struct Unknown2<Inner: Trait>(pub Inner::X);'
+pub struct Unknown2<Inner: Trait>(pub Inner::X);
+
+trait Lifetimes<'a> {
+    type Y;
+}
+
+impl<'a> Lifetimes<'a> for usize {
+    type Y = &'a isize;
+}
+
+// @has 'normalize_assoc_item/fn.g.html' '//div[@class="item-decl"]/pre[@class="rust"]' "pub fn g() -> &isize"
+pub fn g() -> <usize as Lifetimes<'static>>::Y {
+    &0
+}
+
+// @has 'normalize_assoc_item/constant.A.html' '//div[@class="item-decl"]/pre[@class="rust"]' "pub const A: &isize"
+pub const A: <usize as Lifetimes<'static>>::Y = &0;
+
+// test cross-crate re-exports
+extern crate inner;
+// @has 'normalize_assoc_item/fn.foo.html' '//div[@class="item-decl"]/pre[@class="rust"]' "pub fn foo() -> i32"
+pub use inner::foo;
+
+// @has 'normalize_assoc_item/fn.h.html' '//div[@class="item-decl"]/pre[@class="rust"]' "pub fn h<T>() -> IntoIter<T, Global>"
+pub fn h<T>() -> <Vec<T> as IntoIterator>::IntoIter {
+    vec![].into_iter()
+}
diff --git a/src/test/rustdoc/not-wf-ambiguous-normalization.rs b/tests/rustdoc/not-wf-ambiguous-normalization.rs
index 1e9f925f8..1e9f925f8 100644
--- a/src/test/rustdoc/not-wf-ambiguous-normalization.rs
+++ b/tests/rustdoc/not-wf-ambiguous-normalization.rs
diff --git a/src/test/rustdoc/nul-error.rs b/tests/rustdoc/nul-error.rs
index 3d30f5f6b..3d30f5f6b 100644
--- a/src/test/rustdoc/nul-error.rs
+++ b/tests/rustdoc/nul-error.rs
diff --git a/src/test/rustdoc/playground-arg.rs b/tests/rustdoc/playground-arg.rs
index 69c896265..69c896265 100644
--- a/src/test/rustdoc/playground-arg.rs
+++ b/tests/rustdoc/playground-arg.rs
diff --git a/src/test/rustdoc/playground-empty.rs b/tests/rustdoc/playground-empty.rs
index 7d8bd3ffe..7d8bd3ffe 100644
--- a/src/test/rustdoc/playground-empty.rs
+++ b/tests/rustdoc/playground-empty.rs
diff --git a/src/test/rustdoc/playground-none.rs b/tests/rustdoc/playground-none.rs
index ff51c68d8..ff51c68d8 100644
--- a/src/test/rustdoc/playground-none.rs
+++ b/tests/rustdoc/playground-none.rs
diff --git a/src/test/rustdoc/playground-syntax-error.rs b/tests/rustdoc/playground-syntax-error.rs
index 8918ae874..8918ae874 100644
--- a/src/test/rustdoc/playground-syntax-error.rs
+++ b/tests/rustdoc/playground-syntax-error.rs
diff --git a/src/test/rustdoc/playground.rs b/tests/rustdoc/playground.rs
index 877ea1cfb..877ea1cfb 100644
--- a/src/test/rustdoc/playground.rs
+++ b/tests/rustdoc/playground.rs
diff --git a/src/test/rustdoc/primitive-link.rs b/tests/rustdoc/primitive-link.rs
index 125e0c849..125e0c849 100644
--- a/src/test/rustdoc/primitive-link.rs
+++ b/tests/rustdoc/primitive-link.rs
diff --git a/src/test/rustdoc/primitive-reexport.rs b/tests/rustdoc/primitive-reexport.rs
index 10a8a47db..10a8a47db 100644
--- a/src/test/rustdoc/primitive-reexport.rs
+++ b/tests/rustdoc/primitive-reexport.rs
diff --git a/src/test/rustdoc/primitive-reference.rs b/tests/rustdoc/primitive-reference.rs
index ea8d2d166..c3a5eb6d3 100644
--- a/src/test/rustdoc/primitive-reference.rs
+++ b/tests/rustdoc/primitive-reference.rs
@@ -9,7 +9,7 @@
 // @has - '//div[@class="sidebar-elems"]//li/a/@href' '#primitives'
 // @has foo/primitive.reference.html
 // @has - '//a[@class="primitive"]' 'reference'
-// @has - '//h1[@class="fqn"]' 'Primitive Type reference'
+// @has - '//h1' 'Primitive Type reference'
 // @has - '//section[@id="main-content"]//div[@class="docblock"]//p' 'this is a test!'
 
 // There should be only one implementation listed.
diff --git a/src/test/rustdoc/primitive-slice-auto-trait.rs b/tests/rustdoc/primitive-slice-auto-trait.rs
index cdddd6b65..779224146 100644
--- a/src/test/rustdoc/primitive-slice-auto-trait.rs
+++ b/tests/rustdoc/primitive-slice-auto-trait.rs
@@ -4,7 +4,7 @@
 #![feature(rustdoc_internals)]
 
 // @has foo/primitive.slice.html '//a[@class="primitive"]' 'slice'
-// @has - '//h1[@class="fqn"]' 'Primitive Type slice'
+// @has - '//h1' 'Primitive Type slice'
 // @has - '//section[@id="main-content"]//div[@class="docblock"]//p' 'this is a test!'
 // @has - '//h2[@id="synthetic-implementations"]' 'Auto Trait Implementations'
 // @has - '//div[@id="synthetic-implementations-list"]//h3' 'impl<T> Send for [T]where T: Send'
diff --git a/src/test/rustdoc/primitive-tuple-auto-trait.rs b/tests/rustdoc/primitive-tuple-auto-trait.rs
index df681457f..4344d24f9 100644
--- a/src/test/rustdoc/primitive-tuple-auto-trait.rs
+++ b/tests/rustdoc/primitive-tuple-auto-trait.rs
@@ -4,7 +4,7 @@
 #![feature(rustdoc_internals)]
 
 // @has foo/primitive.tuple.html '//a[@class="primitive"]' 'tuple'
-// @has - '//h1[@class="fqn"]' 'Primitive Type tuple'
+// @has - '//h1' 'Primitive Type tuple'
 // @has - '//section[@id="main-content"]//div[@class="docblock"]//p' 'this is a test!'
 // @has - '//h2[@id="synthetic-implementations"]' 'Auto Trait Implementations'
 // @has - '//div[@id="synthetic-implementations-list"]//h3' 'Send'
diff --git a/src/test/rustdoc/primitive-tuple-variadic.rs b/tests/rustdoc/primitive-tuple-variadic.rs
index db7cfd60c..db7cfd60c 100644
--- a/src/test/rustdoc/primitive-tuple-variadic.rs
+++ b/tests/rustdoc/primitive-tuple-variadic.rs
diff --git a/src/test/rustdoc/primitive-unit-auto-trait.rs b/tests/rustdoc/primitive-unit-auto-trait.rs
index 391e33bea..61850e246 100644
--- a/src/test/rustdoc/primitive-unit-auto-trait.rs
+++ b/tests/rustdoc/primitive-unit-auto-trait.rs
@@ -4,7 +4,7 @@
 #![feature(rustdoc_internals)]
 
 // @has foo/primitive.unit.html '//a[@class="primitive"]' 'unit'
-// @has - '//h1[@class="fqn"]' 'Primitive Type unit'
+// @has - '//h1' 'Primitive Type unit'
 // @has - '//section[@id="main-content"]//div[@class="docblock"]//p' 'this is a test!'
 // @has - '//h2[@id="synthetic-implementations"]' 'Auto Trait Implementations'
 // @has - '//div[@id="synthetic-implementations-list"]//h3' 'impl Send for ()'
diff --git a/src/test/rustdoc/primitive.rs b/tests/rustdoc/primitive.rs
index 6347fdac3..516c7c0c6 100644
--- a/src/test/rustdoc/primitive.rs
+++ b/tests/rustdoc/primitive.rs
@@ -7,7 +7,7 @@
 // @has foo/index.html '//div[@class="sidebar-elems"]//li/a' 'Primitive Types'
 // @has foo/index.html '//div[@class="sidebar-elems"]//li/a/@href' '#primitives'
 // @has foo/primitive.i32.html '//a[@class="primitive"]' 'i32'
-// @has foo/primitive.i32.html '//h1[@class="fqn"]' 'Primitive Type i32'
+// @has foo/primitive.i32.html '//h1' 'Primitive Type i32'
 // @has foo/primitive.i32.html '//section[@id="main-content"]//div[@class="docblock"]//p' 'this is a test!'
 // @has foo/index.html '//a/@href' '../foo/index.html'
 // @!has foo/index.html '//span' '🔒'
diff --git a/src/test/rustdoc/primitive/no_std.rs b/tests/rustdoc/primitive/no_std.rs
index f0f70cb6c..f0f70cb6c 100644
--- a/src/test/rustdoc/primitive/no_std.rs
+++ b/tests/rustdoc/primitive/no_std.rs
diff --git a/src/test/rustdoc/primitive/primitive-generic-impl.rs b/tests/rustdoc/primitive/primitive-generic-impl.rs
index 7b336b398..7b336b398 100644
--- a/src/test/rustdoc/primitive/primitive-generic-impl.rs
+++ b/tests/rustdoc/primitive/primitive-generic-impl.rs
diff --git a/src/test/rustdoc/private-type-alias.rs b/tests/rustdoc/private-type-alias.rs
index ec7385404..ec7385404 100644
--- a/src/test/rustdoc/private-type-alias.rs
+++ b/tests/rustdoc/private-type-alias.rs
diff --git a/src/test/rustdoc/proc-macro.rs b/tests/rustdoc/proc-macro.rs
index 10acb7ac4..10acb7ac4 100644
--- a/src/test/rustdoc/proc-macro.rs
+++ b/tests/rustdoc/proc-macro.rs
diff --git a/src/test/rustdoc/process-termination.rs b/tests/rustdoc/process-termination.rs
index 32258792b..32258792b 100644
--- a/src/test/rustdoc/process-termination.rs
+++ b/tests/rustdoc/process-termination.rs
diff --git a/src/test/rustdoc/pub-extern-crate.rs b/tests/rustdoc/pub-extern-crate.rs
index 26747a4d1..26747a4d1 100644
--- a/src/test/rustdoc/pub-extern-crate.rs
+++ b/tests/rustdoc/pub-extern-crate.rs
diff --git a/src/test/rustdoc/pub-method.rs b/tests/rustdoc/pub-method.rs
index fa7de0aff..0dca3f672 100644
--- a/src/test/rustdoc/pub-method.rs
+++ b/tests/rustdoc/pub-method.rs
@@ -3,7 +3,7 @@
 #![crate_name = "foo"]
 
 // @has foo/fn.bar.html
-// @has - '//*[@class="rust fn"]' 'pub fn bar() -> '
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub fn bar() -> '
 /// foo
 pub fn bar() -> usize {
     2
diff --git a/src/test/rustdoc/pub-use-extern-macros.rs b/tests/rustdoc/pub-use-extern-macros.rs
index eefe6b4b0..eefe6b4b0 100644
--- a/src/test/rustdoc/pub-use-extern-macros.rs
+++ b/tests/rustdoc/pub-use-extern-macros.rs
diff --git a/tests/rustdoc/range-arg-pattern.rs b/tests/rustdoc/range-arg-pattern.rs
new file mode 100644
index 000000000..bdbcc47c9
--- /dev/null
+++ b/tests/rustdoc/range-arg-pattern.rs
@@ -0,0 +1,5 @@
+#![crate_name = "foo"]
+
+// @has foo/fn.f.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub fn f(_: u8)'
+pub fn f(0u8..=255: u8) {}
diff --git a/src/test/rustdoc/raw-ident-eliminate-r-hashtag.rs b/tests/rustdoc/raw-ident-eliminate-r-hashtag.rs
index 7dbe63854..7dbe63854 100644
--- a/src/test/rustdoc/raw-ident-eliminate-r-hashtag.rs
+++ b/tests/rustdoc/raw-ident-eliminate-r-hashtag.rs
diff --git a/tests/rustdoc/read-more-unneeded.rs b/tests/rustdoc/read-more-unneeded.rs
new file mode 100644
index 000000000..0303e4442
--- /dev/null
+++ b/tests/rustdoc/read-more-unneeded.rs
@@ -0,0 +1,34 @@
+// Regression test for https://github.com/rust-lang/rust/issues/105677.
+// This test ensures that the "Read more" link is only generated when
+// there is actually more documentation to read after the short summary.
+
+#![crate_name = "foo"]
+
+pub trait MyFrom {
+    /// # Hello
+    /// ## Yolo
+    /// more!
+    fn try_from1();
+    /// a
+    /// b
+    /// c
+    fn try_from2();
+    /// a
+    ///
+    /// b
+    ///
+    /// c
+    fn try_from3();
+}
+
+pub struct NonZero;
+
+// @has 'foo/struct.NonZero.html'
+impl MyFrom for NonZero {
+    // @matches - '//*[@class="docblock"]' '^Hello Read more$'
+    fn try_from1() {}
+    // @matches - '//*[@class="docblock"]' '^a\sb\sc$'
+    fn try_from2() {}
+    // @matches - '//*[@class="docblock"]' '^a Read more$'
+    fn try_from3() {}
+}
diff --git a/src/test/rustdoc/recursion1.rs b/tests/rustdoc/recursion1.rs
index edf7e440f..edf7e440f 100644
--- a/src/test/rustdoc/recursion1.rs
+++ b/tests/rustdoc/recursion1.rs
diff --git a/src/test/rustdoc/recursion2.rs b/tests/rustdoc/recursion2.rs
index edf7e440f..edf7e440f 100644
--- a/src/test/rustdoc/recursion2.rs
+++ b/tests/rustdoc/recursion2.rs
diff --git a/src/test/rustdoc/recursion3.rs b/tests/rustdoc/recursion3.rs
index e69b43016..e69b43016 100644
--- a/src/test/rustdoc/recursion3.rs
+++ b/tests/rustdoc/recursion3.rs
diff --git a/src/test/rustdoc/recursive-deref-sidebar.rs b/tests/rustdoc/recursive-deref-sidebar.rs
index 619f40eff..619f40eff 100644
--- a/src/test/rustdoc/recursive-deref-sidebar.rs
+++ b/tests/rustdoc/recursive-deref-sidebar.rs
diff --git a/src/test/rustdoc/recursive-deref.rs b/tests/rustdoc/recursive-deref.rs
index aa38485c4..aa38485c4 100644
--- a/src/test/rustdoc/recursive-deref.rs
+++ b/tests/rustdoc/recursive-deref.rs
diff --git a/src/test/rustdoc/redirect-const.rs b/tests/rustdoc/redirect-const.rs
index 453da8387..453da8387 100644
--- a/src/test/rustdoc/redirect-const.rs
+++ b/tests/rustdoc/redirect-const.rs
diff --git a/src/test/rustdoc/redirect-map-empty.rs b/tests/rustdoc/redirect-map-empty.rs
index e9d021e0f..e9d021e0f 100644
--- a/src/test/rustdoc/redirect-map-empty.rs
+++ b/tests/rustdoc/redirect-map-empty.rs
diff --git a/src/test/rustdoc/redirect-map.rs b/tests/rustdoc/redirect-map.rs
index b7f16b64e..b7f16b64e 100644
--- a/src/test/rustdoc/redirect-map.rs
+++ b/tests/rustdoc/redirect-map.rs
diff --git a/src/test/rustdoc/redirect-rename.rs b/tests/rustdoc/redirect-rename.rs
index 504c0687c..504c0687c 100644
--- a/src/test/rustdoc/redirect-rename.rs
+++ b/tests/rustdoc/redirect-rename.rs
diff --git a/src/test/rustdoc/redirect.rs b/tests/rustdoc/redirect.rs
index e3a14c7a7..e3a14c7a7 100644
--- a/src/test/rustdoc/redirect.rs
+++ b/tests/rustdoc/redirect.rs
diff --git a/src/test/rustdoc/reexport-check.rs b/tests/rustdoc/reexport-check.rs
index db1f90c69..db1f90c69 100644
--- a/src/test/rustdoc/reexport-check.rs
+++ b/tests/rustdoc/reexport-check.rs
diff --git a/src/test/rustdoc/reexport-dep-foreign-fn.rs b/tests/rustdoc/reexport-dep-foreign-fn.rs
index 6694c91d1..6694c91d1 100644
--- a/src/test/rustdoc/reexport-dep-foreign-fn.rs
+++ b/tests/rustdoc/reexport-dep-foreign-fn.rs
diff --git a/tests/rustdoc/reexport-doc-hidden.rs b/tests/rustdoc/reexport-doc-hidden.rs
new file mode 100644
index 000000000..3ea5fde72
--- /dev/null
+++ b/tests/rustdoc/reexport-doc-hidden.rs
@@ -0,0 +1,26 @@
+// Part of <https://github.com/rust-lang/rust/issues/59368>.
+// This test ensures that reexporting a `doc(hidden)` item will
+// still show the reexport.
+
+#![crate_name = "foo"]
+
+#[doc(hidden)]
+pub type Type = u32;
+
+// @has 'foo/index.html'
+// @has - '//*[@id="reexport.Type2"]/code' 'pub use crate::Type as Type2;'
+pub use crate::Type as Type2;
+
+// @count - '//*[@id="reexport.Type3"]' 0
+#[doc(hidden)]
+pub use crate::Type as Type3;
+
+#[macro_export]
+#[doc(hidden)]
+macro_rules! foo {
+    () => {};
+}
+
+// This is a bug: https://github.com/rust-lang/rust/issues/59368
+// @!has - '//*[@id="reexport.Macro"]/code' 'pub use crate::foo as Macro;'
+pub use crate::foo as Macro;
diff --git a/src/test/rustdoc/reexport-doc.rs b/tests/rustdoc/reexport-doc.rs
index df2c889b4..df2c889b4 100644
--- a/src/test/rustdoc/reexport-doc.rs
+++ b/tests/rustdoc/reexport-doc.rs
diff --git a/src/test/rustdoc/reexport-stability-tags-deprecated-and-portability.rs b/tests/rustdoc/reexport-stability-tags-deprecated-and-portability.rs
index a79d05904..a79d05904 100644
--- a/src/test/rustdoc/reexport-stability-tags-deprecated-and-portability.rs
+++ b/tests/rustdoc/reexport-stability-tags-deprecated-and-portability.rs
diff --git a/src/test/rustdoc/reexport-stability-tags-unstable-and-portability.rs b/tests/rustdoc/reexport-stability-tags-unstable-and-portability.rs
index ff8a910f5..ff8a910f5 100644
--- a/src/test/rustdoc/reexport-stability-tags-unstable-and-portability.rs
+++ b/tests/rustdoc/reexport-stability-tags-unstable-and-portability.rs
diff --git a/src/test/rustdoc/reexports-priv.rs b/tests/rustdoc/reexports-priv.rs
index 11364e7f7..35c90ba5d 100644
--- a/src/test/rustdoc/reexports-priv.rs
+++ b/tests/rustdoc/reexports-priv.rs
@@ -32,7 +32,7 @@ pub(self) use reexports::BarSelf;
 // @!has 'foo/enum.BarLocal.html'
 use reexports::BarLocal;
 
-// @has 'foo/fn.foo.html' '//*[@class="rust fn"]' 'pub fn foo()'
+// @has 'foo/fn.foo.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub fn foo()'
 pub use reexports::foo;
 // @!has 'foo/fn.foo_crate.html'
 pub(crate) use reexports::foo_crate;
@@ -41,7 +41,7 @@ pub(self) use reexports::foo_self;
 // @!has 'foo/fn.foo_local.html'
 use reexports::foo_local;
 
-// @has 'foo/type.Type.html' '//*[@class="rust typedef"]' 'pub type Type ='
+// @has 'foo/type.Type.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub type Type ='
 pub use reexports::Type;
 // @!has 'foo/type.TypeCrate.html'
 pub(crate) use reexports::TypeCrate;
@@ -94,22 +94,22 @@ pub mod outer {
         // @!has 'foo/outer/inner/enum.BarLocal.html'
         use reexports::BarLocal;
 
-        // @has 'foo/outer/inner/fn.foo.html' '//*[@class="rust fn"]' 'pub fn foo()'
+        // @has 'foo/outer/inner/fn.foo.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub fn foo()'
         pub use reexports::foo;
-        // @has 'foo/outer/inner/fn.foo_crate.html' '//*[@class="rust fn"]' 'pub(crate) fn foo_crate()'
+        // @has 'foo/outer/inner/fn.foo_crate.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub(crate) fn foo_crate()'
         pub(crate) use reexports::foo_crate;
-        // @has 'foo/outer/inner/fn.foo_super.html' '//*[@class="rust fn"]' 'pub(in outer) fn foo_super()'
+        // @has 'foo/outer/inner/fn.foo_super.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub(in outer) fn foo_super()'
         pub(super) use::reexports::foo_super;
         // @!has 'foo/outer/inner/fn.foo_self.html'
         pub(self) use reexports::foo_self;
         // @!has 'foo/outer/inner/fn.foo_local.html'
         use reexports::foo_local;
 
-        // @has 'foo/outer/inner/type.Type.html' '//*[@class="rust typedef"]' 'pub type Type ='
+        // @has 'foo/outer/inner/type.Type.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub type Type ='
         pub use reexports::Type;
-        // @has 'foo/outer/inner/type.TypeCrate.html' '//*[@class="rust typedef"]' 'pub(crate) type TypeCrate ='
+        // @has 'foo/outer/inner/type.TypeCrate.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub(crate) type TypeCrate ='
         pub(crate) use reexports::TypeCrate;
-        // @has 'foo/outer/inner/type.TypeSuper.html' '//*[@class="rust typedef"]' 'pub(in outer) type TypeSuper ='
+        // @has 'foo/outer/inner/type.TypeSuper.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub(in outer) type TypeSuper ='
         pub(super) use reexports::TypeSuper;
         // @!has 'foo/outer/inner/type.TypeSelf.html'
         pub(self) use reexports::TypeSelf;
diff --git a/src/test/rustdoc/reexports.rs b/tests/rustdoc/reexports.rs
index 9aa6d7224..65d305c6d 100644
--- a/src/test/rustdoc/reexports.rs
+++ b/tests/rustdoc/reexports.rs
@@ -31,7 +31,7 @@ pub(self) use reexports::BarSelf;
 // @!has 'foo/enum.BarLocal.html'
 use reexports::BarLocal;
 
-// @has 'foo/fn.foo.html' '//*[@class="rust fn"]' 'pub fn foo()'
+// @has 'foo/fn.foo.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub fn foo()'
 pub use reexports::foo;
 // @!has 'foo/fn.foo_crate.html'
 pub(crate) use reexports::foo_crate;
@@ -40,7 +40,7 @@ pub(self) use reexports::foo_self;
 // @!has 'foo/fn.foo_local.html'
 use reexports::foo_local;
 
-// @has 'foo/type.Type.html' '//*[@class="rust typedef"]' 'pub type Type ='
+// @has 'foo/type.Type.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub type Type ='
 pub use reexports::Type;
 // @!has 'foo/type.TypeCrate.html'
 pub(crate) use reexports::TypeCrate;
@@ -93,7 +93,7 @@ pub mod outer {
         // @!has 'foo/outer/inner/enum.BarLocal.html'
         use reexports::BarLocal;
 
-        // @has 'foo/outer/inner/fn.foo.html' '//*[@class="rust fn"]' 'pub fn foo()'
+        // @has 'foo/outer/inner/fn.foo.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub fn foo()'
         pub use reexports::foo;
         // @!has 'foo/outer/inner/fn.foo_crate.html'
         pub(crate) use reexports::foo_crate;
@@ -104,7 +104,7 @@ pub mod outer {
         // @!has 'foo/outer/inner/fn.foo_local.html'
         use reexports::foo_local;
 
-        // @has 'foo/outer/inner/type.Type.html' '//*[@class="rust typedef"]' 'pub type Type ='
+        // @has 'foo/outer/inner/type.Type.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub type Type ='
         pub use reexports::Type;
         // @!has 'foo/outer/inner/type.TypeCrate.html'
         pub(crate) use reexports::TypeCrate;
diff --git a/src/test/rustdoc/remove-duplicates.rs b/tests/rustdoc/remove-duplicates.rs
index 759bf84db..759bf84db 100644
--- a/src/test/rustdoc/remove-duplicates.rs
+++ b/tests/rustdoc/remove-duplicates.rs
diff --git a/src/test/rustdoc/remove-url-from-headings.rs b/tests/rustdoc/remove-url-from-headings.rs
index 599c429a6..599c429a6 100644
--- a/src/test/rustdoc/remove-url-from-headings.rs
+++ b/tests/rustdoc/remove-url-from-headings.rs
diff --git a/src/test/rustdoc/return-impl-trait.rs b/tests/rustdoc/return-impl-trait.rs
index 1ccf5ac46..1ccf5ac46 100644
--- a/src/test/rustdoc/return-impl-trait.rs
+++ b/tests/rustdoc/return-impl-trait.rs
diff --git a/src/test/rustdoc/rfc-2632-const-trait-impl.rs b/tests/rustdoc/rfc-2632-const-trait-impl.rs
index 7ed9d6729..a229a4e29 100644
--- a/src/test/rustdoc/rfc-2632-const-trait-impl.rs
+++ b/tests/rustdoc/rfc-2632-const-trait-impl.rs
@@ -12,10 +12,10 @@ use std::marker::Destruct;
 
 pub struct S<T>(T);
 
-// @!has foo/trait.Tr.html '//pre[@class="rust trait"]/code/a[@class="trait"]' '~const'
-// @has - '//pre[@class="rust trait"]/code/a[@class="trait"]' 'Clone'
-// @!has - '//pre[@class="rust trait"]/code/span[@class="where"]' '~const'
-// @has - '//pre[@class="rust trait"]/code/span[@class="where"]' ': Clone'
+// @!has foo/trait.Tr.html '//div[@class="item-decl"]/pre[@class="rust"]/code/a[@class="trait"]' '~const'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]/code/a[@class="trait"]' 'Clone'
+// @!has - '//div[@class="item-decl"]/pre[@class="rust"]/code/span[@class="where"]' '~const'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]/code/span[@class="where"]' ': Clone'
 #[const_trait]
 pub trait Tr<T> {
     // @!has - '//section[@id="method.a"]/h4[@class="code-header"]' '~const'
@@ -45,10 +45,10 @@ where
     }
 }
 
-// @!has foo/fn.foo.html '//pre[@class="rust fn"]/code/a[@class="trait"]' '~const'
-// @has - '//pre[@class="rust fn"]/code/a[@class="trait"]' 'Clone'
-// @!has - '//pre[@class="rust fn"]/code/span[@class="where fmt-newline"]' '~const'
-// @has - '//pre[@class="rust fn"]/code/span[@class="where fmt-newline"]' ': Clone'
+// @!has foo/fn.foo.html '//div[@class="item-decl"]/pre[@class="rust"]/code/a[@class="trait"]' '~const'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]/code/a[@class="trait"]' 'Clone'
+// @!has - '//div[@class="item-decl"]/pre[@class="rust"]/code/span[@class="where fmt-newline"]' '~const'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]/code/span[@class="where fmt-newline"]' ': Clone'
 pub const fn foo<F: ~const Clone + ~const Destruct>()
 where
     Option<F>: ~const Clone + ~const Destruct,
diff --git a/src/test/rustdoc/rustc-incoherent-impls.rs b/tests/rustdoc/rustc-incoherent-impls.rs
index 3fdefbecc..3fdefbecc 100644
--- a/src/test/rustdoc/rustc-incoherent-impls.rs
+++ b/tests/rustdoc/rustc-incoherent-impls.rs
diff --git a/src/test/rustdoc/rustc-macro-crate.rs b/tests/rustdoc/rustc-macro-crate.rs
index dd5edc984..dd5edc984 100644
--- a/src/test/rustdoc/rustc-macro-crate.rs
+++ b/tests/rustdoc/rustc-macro-crate.rs
diff --git a/tests/rustdoc/safe-intrinsic.rs b/tests/rustdoc/safe-intrinsic.rs
new file mode 100644
index 000000000..0b65bf1df
--- /dev/null
+++ b/tests/rustdoc/safe-intrinsic.rs
@@ -0,0 +1,22 @@
+#![feature(intrinsics)]
+#![feature(no_core)]
+#![feature(rustc_attrs)]
+
+#![no_core]
+#![crate_name = "foo"]
+
+extern "rust-intrinsic" {
+    // @has 'foo/fn.abort.html'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub extern "rust-intrinsic" fn abort() -> !'
+    #[rustc_safe_intrinsic]
+    pub fn abort() -> !;
+    // @has 'foo/fn.unreachable.html'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub unsafe extern "rust-intrinsic" fn unreachable() -> !'
+    pub fn unreachable() -> !;
+}
+
+extern "C" {
+    // @has 'foo/fn.needs_drop.html'
+    // @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub unsafe extern "C" fn needs_drop() -> !'
+    pub fn needs_drop() -> !;
+}
diff --git a/src/test/rustdoc/same-crate-hidden-impl-parameter.rs b/tests/rustdoc/same-crate-hidden-impl-parameter.rs
index d55393af8..d55393af8 100644
--- a/src/test/rustdoc/same-crate-hidden-impl-parameter.rs
+++ b/tests/rustdoc/same-crate-hidden-impl-parameter.rs
diff --git a/src/test/rustdoc/sanitizer-option.rs b/tests/rustdoc/sanitizer-option.rs
index 1abba468f..1abba468f 100644
--- a/src/test/rustdoc/sanitizer-option.rs
+++ b/tests/rustdoc/sanitizer-option.rs
diff --git a/src/test/rustdoc/search-index-summaries.rs b/tests/rustdoc/search-index-summaries.rs
index efd366405..efd366405 100644
--- a/src/test/rustdoc/search-index-summaries.rs
+++ b/tests/rustdoc/search-index-summaries.rs
diff --git a/src/test/rustdoc/search-index.rs b/tests/rustdoc/search-index.rs
index d1d05eb88..d1d05eb88 100644
--- a/src/test/rustdoc/search-index.rs
+++ b/tests/rustdoc/search-index.rs
diff --git a/src/test/rustdoc/short-docblock-codeblock.rs b/tests/rustdoc/short-docblock-codeblock.rs
index 3c5fa7b36..3c5fa7b36 100644
--- a/src/test/rustdoc/short-docblock-codeblock.rs
+++ b/tests/rustdoc/short-docblock-codeblock.rs
diff --git a/src/test/rustdoc/short-docblock.rs b/tests/rustdoc/short-docblock.rs
index 1a8a689be..1a8a689be 100644
--- a/src/test/rustdoc/short-docblock.rs
+++ b/tests/rustdoc/short-docblock.rs
diff --git a/src/test/rustdoc/short-line.md b/tests/rustdoc/short-line.md
index eff713baa..eff713baa 100644
--- a/src/test/rustdoc/short-line.md
+++ b/tests/rustdoc/short-line.md
diff --git a/src/test/rustdoc/show-const-contents.rs b/tests/rustdoc/show-const-contents.rs
index 69e742ee7..69e742ee7 100644
--- a/src/test/rustdoc/show-const-contents.rs
+++ b/tests/rustdoc/show-const-contents.rs
diff --git a/src/test/rustdoc/sidebar-all-page.rs b/tests/rustdoc/sidebar-all-page.rs
index e74b981de..e74b981de 100644
--- a/src/test/rustdoc/sidebar-all-page.rs
+++ b/tests/rustdoc/sidebar-all-page.rs
diff --git a/src/test/rustdoc/sidebar-items.rs b/tests/rustdoc/sidebar-items.rs
index 6f7afa59b..6f7afa59b 100644
--- a/src/test/rustdoc/sidebar-items.rs
+++ b/tests/rustdoc/sidebar-items.rs
diff --git a/src/test/rustdoc/sidebar-link-generation.rs b/tests/rustdoc/sidebar-link-generation.rs
index 7858f35a2..7858f35a2 100644
--- a/src/test/rustdoc/sidebar-link-generation.rs
+++ b/tests/rustdoc/sidebar-link-generation.rs
diff --git a/src/test/rustdoc/sidebar-links-to-foreign-impl.rs b/tests/rustdoc/sidebar-links-to-foreign-impl.rs
index 11e946948..11e946948 100644
--- a/src/test/rustdoc/sidebar-links-to-foreign-impl.rs
+++ b/tests/rustdoc/sidebar-links-to-foreign-impl.rs
diff --git a/src/test/rustdoc/sized_trait.rs b/tests/rustdoc/sized_trait.rs
index feef4de8d..feef4de8d 100644
--- a/src/test/rustdoc/sized_trait.rs
+++ b/tests/rustdoc/sized_trait.rs
diff --git a/src/test/rustdoc/slice-links.link_box_generic.html b/tests/rustdoc/slice-links.link_box_generic.html
index 38aaf2080..38aaf2080 100644
--- a/src/test/rustdoc/slice-links.link_box_generic.html
+++ b/tests/rustdoc/slice-links.link_box_generic.html
diff --git a/src/test/rustdoc/slice-links.link_box_u32.html b/tests/rustdoc/slice-links.link_box_u32.html
index 7bec7582d..7bec7582d 100644
--- a/src/test/rustdoc/slice-links.link_box_u32.html
+++ b/tests/rustdoc/slice-links.link_box_u32.html
diff --git a/src/test/rustdoc/slice-links.link_slice_generic.html b/tests/rustdoc/slice-links.link_slice_generic.html
index 1d0f2bf75..1d0f2bf75 100644
--- a/src/test/rustdoc/slice-links.link_slice_generic.html
+++ b/tests/rustdoc/slice-links.link_slice_generic.html
diff --git a/src/test/rustdoc/slice-links.link_slice_u32.html b/tests/rustdoc/slice-links.link_slice_u32.html
index c86d38304..c86d38304 100644
--- a/src/test/rustdoc/slice-links.link_slice_u32.html
+++ b/tests/rustdoc/slice-links.link_slice_u32.html
diff --git a/tests/rustdoc/slice-links.rs b/tests/rustdoc/slice-links.rs
new file mode 100644
index 000000000..67137fdca
--- /dev/null
+++ b/tests/rustdoc/slice-links.rs
@@ -0,0 +1,28 @@
+#![crate_name = "foo"]
+#![no_std]
+
+pub struct MyBox<T: ?Sized>(*const T);
+
+// @has 'foo/fn.alpha.html'
+// @snapshot link_slice_u32 - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn alpha() -> &'static [u32] {
+    loop {}
+}
+
+// @has 'foo/fn.beta.html'
+// @snapshot link_slice_generic - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn beta<T>() -> &'static [T] {
+    loop {}
+}
+
+// @has 'foo/fn.gamma.html'
+// @snapshot link_box_u32 - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn gamma() -> MyBox<[u32]> {
+    loop {}
+}
+
+// @has 'foo/fn.delta.html'
+// @snapshot link_box_generic - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn delta<T>() -> MyBox<[T]> {
+    loop {}
+}
diff --git a/src/test/rustdoc/smart-punct.rs b/tests/rustdoc/smart-punct.rs
index 7ae5bd699..7ae5bd699 100644
--- a/src/test/rustdoc/smart-punct.rs
+++ b/tests/rustdoc/smart-punct.rs
diff --git a/src/test/rustdoc/smoke.rs b/tests/rustdoc/smoke.rs
index c1ed3a0c9..c1ed3a0c9 100644
--- a/src/test/rustdoc/smoke.rs
+++ b/tests/rustdoc/smoke.rs
diff --git a/src/test/rustdoc/sort-modules-by-appearance.rs b/tests/rustdoc/sort-modules-by-appearance.rs
index b5cc8bc83..b5cc8bc83 100644
--- a/src/test/rustdoc/sort-modules-by-appearance.rs
+++ b/tests/rustdoc/sort-modules-by-appearance.rs
diff --git a/src/test/rustdoc/source-file.rs b/tests/rustdoc/source-file.rs
index 4e1664790..4e1664790 100644
--- a/src/test/rustdoc/source-file.rs
+++ b/tests/rustdoc/source-file.rs
diff --git a/src/test/rustdoc/source-version-separator.rs b/tests/rustdoc/source-version-separator.rs
index 14580373b..14580373b 100644
--- a/src/test/rustdoc/source-version-separator.rs
+++ b/tests/rustdoc/source-version-separator.rs
diff --git a/tests/rustdoc/spotlight-from-dependency.odd.html b/tests/rustdoc/spotlight-from-dependency.odd.html
new file mode 100644
index 000000000..5f54b7522
--- /dev/null
+++ b/tests/rustdoc/spotlight-from-dependency.odd.html
@@ -0,0 +1 @@
+<script type="text/json" id="notable-traits-data">{"Odd":"&lt;h3&gt;Notable traits for &lt;code&gt;&lt;a class=\"struct\" href=\"struct.Odd.html\" title=\"struct foo::Odd\"&gt;Odd&lt;/a&gt;&lt;/code&gt;&lt;/h3&gt;&lt;pre&gt;&lt;code&gt;&lt;span class=\"where fmt-newline\"&gt;impl &lt;a class=\"trait\" href=\"{{channel}}/core/iter/traits/iterator/trait.Iterator.html\" title=\"trait core::iter::traits::iterator::Iterator\"&gt;Iterator&lt;/a&gt; for &lt;a class=\"struct\" href=\"struct.Odd.html\" title=\"struct foo::Odd\"&gt;Odd&lt;/a&gt;&lt;/span&gt;&lt;span class=\"where fmt-newline\"&gt;    type &lt;a href=\"{{channel}}/core/iter/traits/iterator/trait.Iterator.html#associatedtype.Item\" class=\"associatedtype\"&gt;Item&lt;/a&gt; = &lt;a class=\"primitive\" href=\"{{channel}}/std/primitive.usize.html\"&gt;usize&lt;/a&gt;;&lt;/span&gt;"}</script>
\ No newline at end of file
diff --git a/src/test/rustdoc/spotlight-from-dependency.rs b/tests/rustdoc/spotlight-from-dependency.rs
index 090ad187d..090ad187d 100644
--- a/src/test/rustdoc/spotlight-from-dependency.rs
+++ b/tests/rustdoc/spotlight-from-dependency.rs
diff --git a/src/test/rustdoc/src-links-auto-impls.rs b/tests/rustdoc/src-links-auto-impls.rs
index 953563833..953563833 100644
--- a/src/test/rustdoc/src-links-auto-impls.rs
+++ b/tests/rustdoc/src-links-auto-impls.rs
diff --git a/src/test/rustdoc/src-links-external.rs b/tests/rustdoc/src-links-external.rs
index 8012e4422..8012e4422 100644
--- a/src/test/rustdoc/src-links-external.rs
+++ b/tests/rustdoc/src-links-external.rs
diff --git a/src/test/rustdoc/src-links.rs b/tests/rustdoc/src-links.rs
index 353ce1024..7a6c733d4 100644
--- a/src/test/rustdoc/src-links.rs
+++ b/tests/rustdoc/src-links.rs
@@ -7,6 +7,11 @@
 #[path = "src-links/mod.rs"]
 pub mod qux;
 
+// @has src/foo/src-links.rs.html
+// @has foo/fizz/index.html '//a/@href' '../src/foo/src-links/fizz.rs.html'
+#[path = "src-links/../src-links/fizz.rs"]
+pub mod fizz;
+
 // @has foo/bar/index.html '//a/@href' '../../src/foo/src-links.rs.html'
 pub mod bar {
 
diff --git a/src/test/rustdoc/src-links/compiletest-ignore-dir b/tests/rustdoc/src-links/compiletest-ignore-dir
index e69de29bb..e69de29bb 100644
--- a/src/test/rustdoc/src-links/compiletest-ignore-dir
+++ b/tests/rustdoc/src-links/compiletest-ignore-dir
diff --git a/tests/rustdoc/src-links/fizz.rs b/tests/rustdoc/src-links/fizz.rs
new file mode 100644
index 000000000..d2b76b1ce
--- /dev/null
+++ b/tests/rustdoc/src-links/fizz.rs
@@ -0,0 +1 @@
+pub struct Buzz;
diff --git a/src/test/rustdoc/src-links/mod.rs b/tests/rustdoc/src-links/mod.rs
index 27b239681..27b239681 100644
--- a/src/test/rustdoc/src-links/mod.rs
+++ b/tests/rustdoc/src-links/mod.rs
diff --git a/src/test/rustdoc/stability.rs b/tests/rustdoc/stability.rs
index 90be2050d..90be2050d 100644
--- a/src/test/rustdoc/stability.rs
+++ b/tests/rustdoc/stability.rs
diff --git a/src/test/rustdoc/static-root-path.rs b/tests/rustdoc/static-root-path.rs
index 86928b0fb..86928b0fb 100644
--- a/src/test/rustdoc/static-root-path.rs
+++ b/tests/rustdoc/static-root-path.rs
diff --git a/src/test/rustdoc/static.rs b/tests/rustdoc/static.rs
index 90dafd8b3..90dafd8b3 100644
--- a/src/test/rustdoc/static.rs
+++ b/tests/rustdoc/static.rs
diff --git a/src/test/rustdoc/strip-block-doc-comments-stars.docblock.html b/tests/rustdoc/strip-block-doc-comments-stars.docblock.html
index 22b0b5dc4..22b0b5dc4 100644
--- a/src/test/rustdoc/strip-block-doc-comments-stars.docblock.html
+++ b/tests/rustdoc/strip-block-doc-comments-stars.docblock.html
diff --git a/tests/rustdoc/strip-block-doc-comments-stars.rs b/tests/rustdoc/strip-block-doc-comments-stars.rs
new file mode 100644
index 000000000..ca4c93f92
--- /dev/null
+++ b/tests/rustdoc/strip-block-doc-comments-stars.rs
@@ -0,0 +1,11 @@
+#![crate_name = "foo"]
+
+// The goal of this test is to ensure that it won't be generated as a list because
+// block doc comments can have their lines starting with a star.
+
+// @has foo/fn.foo.html
+// @snapshot docblock - '//*[@class="toggle top-doc"]//*[@class="docblock"]'
+/**
+ *     a
+ */
+pub fn foo() {}
diff --git a/src/test/rustdoc/strip-enum-variant.no-not-shown.html b/tests/rustdoc/strip-enum-variant.no-not-shown.html
index 782198956..782198956 100644
--- a/src/test/rustdoc/strip-enum-variant.no-not-shown.html
+++ b/tests/rustdoc/strip-enum-variant.no-not-shown.html
diff --git a/src/test/rustdoc/strip-enum-variant.rs b/tests/rustdoc/strip-enum-variant.rs
index 8753a7dc6..8753a7dc6 100644
--- a/src/test/rustdoc/strip-enum-variant.rs
+++ b/tests/rustdoc/strip-enum-variant.rs
diff --git a/tests/rustdoc/struct-arg-pattern.rs b/tests/rustdoc/struct-arg-pattern.rs
new file mode 100644
index 000000000..3bfb43a0b
--- /dev/null
+++ b/tests/rustdoc/struct-arg-pattern.rs
@@ -0,0 +1,10 @@
+#![crate_name = "foo"]
+
+struct BodyId {
+    hir_id: usize,
+}
+
+// @has 'foo/fn.body_owner.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub fn body_owner(_: BodyId)'
+pub fn body_owner(BodyId { hir_id }: BodyId) {
+    // ...
+}
diff --git a/src/test/rustdoc/struct-field.rs b/tests/rustdoc/struct-field.rs
index 998683bdd..998683bdd 100644
--- a/src/test/rustdoc/struct-field.rs
+++ b/tests/rustdoc/struct-field.rs
diff --git a/src/test/rustdoc/struct-implementations-title.rs b/tests/rustdoc/struct-implementations-title.rs
index 5468796f6..5468796f6 100644
--- a/src/test/rustdoc/struct-implementations-title.rs
+++ b/tests/rustdoc/struct-implementations-title.rs
diff --git a/src/test/rustdoc/structfields.rs b/tests/rustdoc/structfields.rs
index 7e1cada4b..7e1cada4b 100644
--- a/src/test/rustdoc/structfields.rs
+++ b/tests/rustdoc/structfields.rs
diff --git a/src/test/rustdoc/synthetic_auto/basic.rs b/tests/rustdoc/synthetic_auto/basic.rs
index 7c6a38865..7c6a38865 100644
--- a/src/test/rustdoc/synthetic_auto/basic.rs
+++ b/tests/rustdoc/synthetic_auto/basic.rs
diff --git a/src/test/rustdoc/synthetic_auto/complex.rs b/tests/rustdoc/synthetic_auto/complex.rs
index 43393c21f..43393c21f 100644
--- a/src/test/rustdoc/synthetic_auto/complex.rs
+++ b/tests/rustdoc/synthetic_auto/complex.rs
diff --git a/src/test/rustdoc/synthetic_auto/crate-local.rs b/tests/rustdoc/synthetic_auto/crate-local.rs
index ed01f63f9..ed01f63f9 100644
--- a/src/test/rustdoc/synthetic_auto/crate-local.rs
+++ b/tests/rustdoc/synthetic_auto/crate-local.rs
diff --git a/src/test/rustdoc/synthetic_auto/issue-72213-projection-lifetime.rs b/tests/rustdoc/synthetic_auto/issue-72213-projection-lifetime.rs
index 6f66b8e55..6f66b8e55 100644
--- a/src/test/rustdoc/synthetic_auto/issue-72213-projection-lifetime.rs
+++ b/tests/rustdoc/synthetic_auto/issue-72213-projection-lifetime.rs
diff --git a/src/test/rustdoc/synthetic_auto/lifetimes.rs b/tests/rustdoc/synthetic_auto/lifetimes.rs
index 33170a844..33170a844 100644
--- a/src/test/rustdoc/synthetic_auto/lifetimes.rs
+++ b/tests/rustdoc/synthetic_auto/lifetimes.rs
diff --git a/src/test/rustdoc/synthetic_auto/manual.rs b/tests/rustdoc/synthetic_auto/manual.rs
index 77c04ad2a..77c04ad2a 100644
--- a/src/test/rustdoc/synthetic_auto/manual.rs
+++ b/tests/rustdoc/synthetic_auto/manual.rs
diff --git a/src/test/rustdoc/synthetic_auto/negative.rs b/tests/rustdoc/synthetic_auto/negative.rs
index 2c2c848a5..2c2c848a5 100644
--- a/src/test/rustdoc/synthetic_auto/negative.rs
+++ b/tests/rustdoc/synthetic_auto/negative.rs
diff --git a/src/test/rustdoc/synthetic_auto/nested.rs b/tests/rustdoc/synthetic_auto/nested.rs
index 423bf115a..423bf115a 100644
--- a/src/test/rustdoc/synthetic_auto/nested.rs
+++ b/tests/rustdoc/synthetic_auto/nested.rs
diff --git a/src/test/rustdoc/synthetic_auto/no-redundancy.rs b/tests/rustdoc/synthetic_auto/no-redundancy.rs
index 59f336233..59f336233 100644
--- a/src/test/rustdoc/synthetic_auto/no-redundancy.rs
+++ b/tests/rustdoc/synthetic_auto/no-redundancy.rs
diff --git a/src/test/rustdoc/synthetic_auto/overflow.rs b/tests/rustdoc/synthetic_auto/overflow.rs
index 35a487c76..35a487c76 100644
--- a/src/test/rustdoc/synthetic_auto/overflow.rs
+++ b/tests/rustdoc/synthetic_auto/overflow.rs
diff --git a/src/test/rustdoc/synthetic_auto/project.rs b/tests/rustdoc/synthetic_auto/project.rs
index 558ff2add..558ff2add 100644
--- a/src/test/rustdoc/synthetic_auto/project.rs
+++ b/tests/rustdoc/synthetic_auto/project.rs
diff --git a/src/test/rustdoc/synthetic_auto/self-referential.rs b/tests/rustdoc/synthetic_auto/self-referential.rs
index c6ae96de7..c6ae96de7 100644
--- a/src/test/rustdoc/synthetic_auto/self-referential.rs
+++ b/tests/rustdoc/synthetic_auto/self-referential.rs
diff --git a/src/test/rustdoc/synthetic_auto/static-region.rs b/tests/rustdoc/synthetic_auto/static-region.rs
index 1a76cb919..1a76cb919 100644
--- a/src/test/rustdoc/synthetic_auto/static-region.rs
+++ b/tests/rustdoc/synthetic_auto/static-region.rs
diff --git a/src/test/rustdoc/tab_title.rs b/tests/rustdoc/tab_title.rs
index 0cc4f147e..0cc4f147e 100644
--- a/src/test/rustdoc/tab_title.rs
+++ b/tests/rustdoc/tab_title.rs
diff --git a/src/test/rustdoc/table-in-docblock.rs b/tests/rustdoc/table-in-docblock.rs
index 194f49f16..194f49f16 100644
--- a/src/test/rustdoc/table-in-docblock.rs
+++ b/tests/rustdoc/table-in-docblock.rs
diff --git a/src/test/rustdoc/task-lists.rs b/tests/rustdoc/task-lists.rs
index c2e7dd60f..c2e7dd60f 100644
--- a/src/test/rustdoc/task-lists.rs
+++ b/tests/rustdoc/task-lists.rs
diff --git a/src/test/rustdoc/test-lists.rs b/tests/rustdoc/test-lists.rs
index 6a510b9ac..6a510b9ac 100644
--- a/src/test/rustdoc/test-lists.rs
+++ b/tests/rustdoc/test-lists.rs
diff --git a/tests/rustdoc/test-parens.rs b/tests/rustdoc/test-parens.rs
new file mode 100644
index 000000000..f5fdb1f52
--- /dev/null
+++ b/tests/rustdoc/test-parens.rs
@@ -0,0 +1,5 @@
+#![crate_name = "foo"]
+
+// @has foo/fn.foo.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' "_: &(dyn ToString + 'static)"
+pub fn foo(_: &(ToString + 'static)) {}
diff --git a/src/test/rustdoc/test-strikethrough.rs b/tests/rustdoc/test-strikethrough.rs
index c7855729a..c7855729a 100644
--- a/src/test/rustdoc/test-strikethrough.rs
+++ b/tests/rustdoc/test-strikethrough.rs
diff --git a/src/test/rustdoc/test_option_check/bar.rs b/tests/rustdoc/test_option_check/bar.rs
index 50a182cf7..50a182cf7 100644
--- a/src/test/rustdoc/test_option_check/bar.rs
+++ b/tests/rustdoc/test_option_check/bar.rs
diff --git a/src/test/rustdoc/test_option_check/test.rs b/tests/rustdoc/test_option_check/test.rs
index 964e8e37e..964e8e37e 100644
--- a/src/test/rustdoc/test_option_check/test.rs
+++ b/tests/rustdoc/test_option_check/test.rs
diff --git a/src/test/rustdoc/thread-local-src.rs b/tests/rustdoc/thread-local-src.rs
index 6de35e323..6de35e323 100644
--- a/src/test/rustdoc/thread-local-src.rs
+++ b/tests/rustdoc/thread-local-src.rs
diff --git a/src/test/rustdoc/titles.rs b/tests/rustdoc/titles.rs
index 69e8b856b..69e8b856b 100644
--- a/src/test/rustdoc/titles.rs
+++ b/tests/rustdoc/titles.rs
diff --git a/tests/rustdoc/toggle-item-contents.rs b/tests/rustdoc/toggle-item-contents.rs
new file mode 100644
index 000000000..5d34ec09b
--- /dev/null
+++ b/tests/rustdoc/toggle-item-contents.rs
@@ -0,0 +1,185 @@
+#![allow(unused)]
+
+// @has 'toggle_item_contents/struct.PubStruct.html'
+// @count - '//details[@class="toggle type-contents-toggle"]' 0
+pub struct PubStruct {
+    pub a: usize,
+    pub b: usize,
+}
+
+// @has 'toggle_item_contents/struct.BigPubStruct.html'
+// @count - '//details[@class="toggle type-contents-toggle"]' 1
+// @has - '//details[@class="toggle type-contents-toggle"]' 'Show 13 fields'
+pub struct BigPubStruct {
+    pub a: usize,
+    pub b: usize,
+    pub c: usize,
+    pub d: usize,
+    pub e: usize,
+    pub f: usize,
+    pub g: usize,
+    pub h: usize,
+    pub i: usize,
+    pub j: usize,
+    pub k: usize,
+    pub l: usize,
+    pub m: usize,
+}
+
+// @has 'toggle_item_contents/union.BigUnion.html'
+// @count - '//details[@class="toggle type-contents-toggle"]' 1
+// @has - '//details[@class="toggle type-contents-toggle"]' 'Show 13 fields'
+pub union BigUnion {
+    pub a: usize,
+    pub b: usize,
+    pub c: usize,
+    pub d: usize,
+    pub e: usize,
+    pub f: usize,
+    pub g: usize,
+    pub h: usize,
+    pub i: usize,
+    pub j: usize,
+    pub k: usize,
+    pub l: usize,
+    pub m: usize,
+}
+
+// @has 'toggle_item_contents/union.Union.html'
+// @count - '//details[@class="toggle type-contents-toggle"]' 0
+pub union Union {
+    pub a: usize,
+    pub b: usize,
+    pub c: usize,
+}
+
+// @has 'toggle_item_contents/struct.PrivStruct.html'
+// @count - '//details[@class="toggle type-contents-toggle"]' 0
+// @has - '//div[@class="item-decl"]' '/* private fields */'
+pub struct PrivStruct {
+    a: usize,
+    b: usize,
+}
+
+// @has 'toggle_item_contents/enum.Enum.html'
+// @!has - '//details[@class="toggle type-contents-toggle"]' ''
+pub enum Enum {
+    A, B, C,
+    D {
+        a: u8,
+        b: u8
+    }
+}
+
+// @has 'toggle_item_contents/enum.EnumStructVariant.html'
+// @!has - '//details[@class="toggle type-contents-toggle"]' ''
+pub enum EnumStructVariant {
+    A, B, C,
+    D {
+        a: u8,
+    }
+}
+
+// @has 'toggle_item_contents/enum.LargeEnum.html'
+// @count - '//div[@class="item-decl"]/pre//details[@class="toggle type-contents-toggle"]' 1
+// @has - '//div[@class="item-decl"]/pre//details[@class="toggle type-contents-toggle"]' 'Show 13 variants'
+pub enum LargeEnum {
+    A, B, C, D, E, F(u8), G, H, I, J, K, L, M
+}
+
+// @has 'toggle_item_contents/trait.Trait.html'
+// @count - '//details[@class="toggle type-contents-toggle"]' 0
+pub trait Trait {
+    type A;
+    #[must_use]
+    fn foo();
+    fn bar();
+}
+
+// @has 'toggle_item_contents/trait.GinormousTrait.html'
+// @count - '//details[@class="toggle type-contents-toggle"]' 1
+// @has - '//details[@class="toggle type-contents-toggle"]' 'Show 16 associated items'
+pub trait GinormousTrait {
+    type A;
+    type B;
+    type C;
+    type D;
+    type E;
+    type F;
+    type G;
+    type H;
+    type I;
+    type J;
+    type K;
+    type L;
+    type M;
+    const N: usize = 1;
+    #[must_use]
+    fn foo();
+    fn bar();
+}
+
+// @has 'toggle_item_contents/trait.HugeTrait.html'
+// @count - '//details[@class="toggle type-contents-toggle"]' 1
+// @has - '//details[@class="toggle type-contents-toggle"]' 'Show 12 associated constants and 2 methods'
+pub trait HugeTrait {
+    type A;
+    const M: usize = 1;
+    const N: usize = 1;
+    const O: usize = 1;
+    const P: usize = 1;
+    const Q: usize = 1;
+    const R: usize = 1;
+    const S: usize = 1;
+    const T: usize = 1;
+    const U: usize = 1;
+    const V: usize = 1;
+    const W: usize = 1;
+    const X: usize = 1;
+    #[must_use]
+    fn foo();
+    fn bar();
+}
+
+// @has 'toggle_item_contents/trait.GiganticTrait.html'
+// @count - '//details[@class="toggle type-contents-toggle"]' 1
+// @has - '//details[@class="toggle type-contents-toggle"]' 'Show 1 associated constant and 1 method'
+pub trait GiganticTrait {
+    type A;
+    type B;
+    type C;
+    type D;
+    type E;
+    type F;
+    type G;
+    type H;
+    type I;
+    type J;
+    type K;
+    type L;
+    const M: usize = 1;
+    #[must_use]
+    fn foo();
+}
+
+// @has 'toggle_item_contents/trait.BigTrait.html'
+// @count - '//details[@class="toggle type-contents-toggle"]' 1
+// @has - '//details[@class="toggle type-contents-toggle"]' 'Show 14 methods'
+pub trait BigTrait {
+    type A;
+    #[must_use]
+    fn foo();
+    fn bar();
+    fn baz();
+    fn quux();
+    fn frob();
+    fn greeble();
+    fn blap();
+    fn whoop();
+    fn pow();
+    fn bang();
+    fn oomph();
+    fn argh();
+    fn wap();
+    fn ouch();
+}
diff --git a/tests/rustdoc/toggle-method.rs b/tests/rustdoc/toggle-method.rs
new file mode 100644
index 000000000..ebc316ca8
--- /dev/null
+++ b/tests/rustdoc/toggle-method.rs
@@ -0,0 +1,18 @@
+#![crate_name = "foo"]
+
+// Struct methods with documentation should be wrapped in a <details> toggle with an appropriate
+// summary. Struct methods with no documentation should not be wrapped.
+//
+// @has foo/struct.Foo.html
+// @has - '//details[@class="toggle method-toggle"]//summary//h4[@class="code-header"]' 'is_documented()'
+// @has - '//details[@class="toggle method-toggle"]//*[@class="docblock"]' 'is_documented is documented'
+// @!has - '//details[@class="toggle method-toggle"]//summary//h4[@class="code-header"]' 'not_documented()'
+pub struct Foo {
+}
+
+impl Foo {
+    pub fn not_documented() {}
+
+    /// is_documented is documented
+    pub fn is_documented() {}
+}
diff --git a/tests/rustdoc/toggle-trait-fn.rs b/tests/rustdoc/toggle-trait-fn.rs
new file mode 100644
index 000000000..686a174fc
--- /dev/null
+++ b/tests/rustdoc/toggle-trait-fn.rs
@@ -0,0 +1,30 @@
+#![crate_name = "foo"]
+
+// Trait methods with documentation should be wrapped in a <details> toggle with an appropriate
+// summary. Trait methods with no documentation should not be wrapped.
+//
+// @has foo/trait.Foo.html
+// @has - '//details[@class="toggle"]//summary//h4[@class="code-header"]' 'type Item'
+// @!has - '//details[@class="toggle"]//summary//h4[@class="code-header"]' 'type Item2'
+// @has -  '//details[@class="toggle method-toggle"]//summary//h4[@class="code-header"]' 'is_documented()'
+// @!has - '//details[@class="toggle method-toggle"]//summary//h4[@class="code-header"]' 'not_documented()'
+// @has -  '//details[@class="toggle method-toggle"]//*[@class="docblock"]' 'is_documented is documented'
+// @has -  '//details[@class="toggle method-toggle"]//summary//h4[@class="code-header"]' 'is_documented_optional()'
+// @!has - '//details[@class="toggle method-toggle"]//summary//h4[@class="code-header"]' 'not_documented_optional()'
+// @has -  '//details[@class="toggle method-toggle"]//*[@class="docblock"]' 'is_documented_optional is documented'
+pub trait Foo {
+    /// is documented
+    type Item;
+
+    type Item2;
+
+    fn not_documented();
+
+    /// is_documented is documented
+    fn is_documented();
+
+    fn not_documented_optional() {}
+
+    /// is_documented_optional is documented
+    fn is_documented_optional() {}
+}
diff --git a/src/test/rustdoc/trait-alias-mention.rs b/tests/rustdoc/trait-alias-mention.rs
index 6da0dc687..6da0dc687 100644
--- a/src/test/rustdoc/trait-alias-mention.rs
+++ b/tests/rustdoc/trait-alias-mention.rs
diff --git a/src/test/rustdoc/trait-impl-items-links-and-anchors.rs b/tests/rustdoc/trait-impl-items-links-and-anchors.rs
index a125fa036..a125fa036 100644
--- a/src/test/rustdoc/trait-impl-items-links-and-anchors.rs
+++ b/tests/rustdoc/trait-impl-items-links-and-anchors.rs
diff --git a/src/test/rustdoc/trait-impl.rs b/tests/rustdoc/trait-impl.rs
index 195cdf009..9cf3226f7 100644
--- a/src/test/rustdoc/trait-impl.rs
+++ b/tests/rustdoc/trait-impl.rs
@@ -30,8 +30,6 @@ impl Trait for Struct {
     // @has - '//*[@id="method.b"]/../../div[@class="docblock"]' 'These docs contain'
     // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/a' 'reference link'
     // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/a/@href' 'https://example.com'
-    // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/a' 'Read more'
-    // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/a/@href' 'trait.Trait.html#tymethod.b'
     fn b() {}
 
     // @!has - '//*[@id="method.c"]/../../div[@class="docblock"]' 'code block'
diff --git a/src/test/rustdoc/trait-self-link.rs b/tests/rustdoc/trait-self-link.rs
index e311dadff..e311dadff 100644
--- a/src/test/rustdoc/trait-self-link.rs
+++ b/tests/rustdoc/trait-self-link.rs
diff --git a/src/test/rustdoc/trait-src-link.rs b/tests/rustdoc/trait-src-link.rs
index a6367efba..a6367efba 100644
--- a/src/test/rustdoc/trait-src-link.rs
+++ b/tests/rustdoc/trait-src-link.rs
diff --git a/src/test/rustdoc/trait-visibility.rs b/tests/rustdoc/trait-visibility.rs
index 8ba3ee03a..8ba3ee03a 100644
--- a/src/test/rustdoc/trait-visibility.rs
+++ b/tests/rustdoc/trait-visibility.rs
diff --git a/src/test/rustdoc/trait_alias.rs b/tests/rustdoc/trait_alias.rs
index 791c099cc..791c099cc 100644
--- a/src/test/rustdoc/trait_alias.rs
+++ b/tests/rustdoc/trait_alias.rs
diff --git a/src/test/rustdoc/traits-in-bodies-private.rs b/tests/rustdoc/traits-in-bodies-private.rs
index 96b7c4f9d..96b7c4f9d 100644
--- a/src/test/rustdoc/traits-in-bodies-private.rs
+++ b/tests/rustdoc/traits-in-bodies-private.rs
diff --git a/src/test/rustdoc/traits-in-bodies.rs b/tests/rustdoc/traits-in-bodies.rs
index a65dd7a54..a65dd7a54 100644
--- a/src/test/rustdoc/traits-in-bodies.rs
+++ b/tests/rustdoc/traits-in-bodies.rs
diff --git a/src/test/rustdoc/tuple-struct-fields-doc.rs b/tests/rustdoc/tuple-struct-fields-doc.rs
index 8ab1143d1..d72c10f2b 100644
--- a/src/test/rustdoc/tuple-struct-fields-doc.rs
+++ b/tests/rustdoc/tuple-struct-fields-doc.rs
@@ -19,7 +19,7 @@ pub struct Foo(
 );
 
 // @has foo/enum.Bar.html
-// @has - '//pre[@class="rust enum"]' 'BarVariant(String),'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'BarVariant(String),'
 // @matches - '//*[@id="variant.BarVariant.fields"]/h4' '^Tuple Fields$'
 // @has - '//*[@id="variant.BarVariant.field.0"]' '0: String'
 // @has - '//*[@id="variant.BarVariant.fields"]//*[@class="docblock"]' 'Hello docs'
diff --git a/src/test/rustdoc/tuples.link1_i32.html b/tests/rustdoc/tuples.link1_i32.html
index 4efde28ed..4efde28ed 100644
--- a/src/test/rustdoc/tuples.link1_i32.html
+++ b/tests/rustdoc/tuples.link1_i32.html
diff --git a/src/test/rustdoc/tuples.link1_t.html b/tests/rustdoc/tuples.link1_t.html
index 1cbaec057..1cbaec057 100644
--- a/src/test/rustdoc/tuples.link1_t.html
+++ b/tests/rustdoc/tuples.link1_t.html
diff --git a/src/test/rustdoc/tuples.link2_i32.html b/tests/rustdoc/tuples.link2_i32.html
index 77c8d81b8..77c8d81b8 100644
--- a/src/test/rustdoc/tuples.link2_i32.html
+++ b/tests/rustdoc/tuples.link2_i32.html
diff --git a/src/test/rustdoc/tuples.link2_t.html b/tests/rustdoc/tuples.link2_t.html
index 2477aa6be..2477aa6be 100644
--- a/src/test/rustdoc/tuples.link2_t.html
+++ b/tests/rustdoc/tuples.link2_t.html
diff --git a/src/test/rustdoc/tuples.link2_tu.html b/tests/rustdoc/tuples.link2_tu.html
index b02f8dd8d..b02f8dd8d 100644
--- a/src/test/rustdoc/tuples.link2_tu.html
+++ b/tests/rustdoc/tuples.link2_tu.html
diff --git a/src/test/rustdoc/tuples.link_unit.html b/tests/rustdoc/tuples.link_unit.html
index 839990e15..839990e15 100644
--- a/src/test/rustdoc/tuples.link_unit.html
+++ b/tests/rustdoc/tuples.link_unit.html
diff --git a/tests/rustdoc/tuples.rs b/tests/rustdoc/tuples.rs
new file mode 100644
index 000000000..e716de8b5
--- /dev/null
+++ b/tests/rustdoc/tuples.rs
@@ -0,0 +1,20 @@
+#![crate_name = "foo"]
+
+// @has foo/fn.tuple0.html //pre 'pub fn tuple0(x: ())'
+// @snapshot link_unit - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn tuple0(x: ()) -> () { x }
+// @has foo/fn.tuple1.html //pre 'pub fn tuple1(x: (i32,)) -> (i32,)'
+// @snapshot link1_i32 - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn tuple1(x: (i32,)) -> (i32,) { x }
+// @has foo/fn.tuple2.html //pre 'pub fn tuple2(x: (i32, i32)) -> (i32, i32)'
+// @snapshot link2_i32 - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn tuple2(x: (i32, i32)) -> (i32, i32) { x }
+// @has foo/fn.tuple1_t.html //pre 'pub fn tuple1_t<T>(x: (T,)) -> (T,)'
+// @snapshot link1_t - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn tuple1_t<T>(x: (T,)) -> (T,) { x }
+// @has foo/fn.tuple2_t.html //pre 'pub fn tuple2_t<T>(x: (T, T)) -> (T, T)'
+// @snapshot link2_t - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn tuple2_t<T>(x: (T, T)) -> (T, T) { x }
+// @has foo/fn.tuple2_tu.html //pre 'pub fn tuple2_tu<T, U>(x: (T, U)) -> (T, U)'
+// @snapshot link2_tu - '//div[@class="item-decl"]/pre[@class="rust"]/code'
+pub fn tuple2_tu<T, U>(x: (T, U)) -> (T, U) { x }
diff --git a/src/test/rustdoc/type-layout-flag-required.rs b/tests/rustdoc/type-layout-flag-required.rs
index 6bb5e10f8..6bb5e10f8 100644
--- a/src/test/rustdoc/type-layout-flag-required.rs
+++ b/tests/rustdoc/type-layout-flag-required.rs
diff --git a/src/test/rustdoc/type-layout.rs b/tests/rustdoc/type-layout.rs
index 5e0a0411a..5e0a0411a 100644
--- a/src/test/rustdoc/type-layout.rs
+++ b/tests/rustdoc/type-layout.rs
diff --git a/src/test/rustdoc/typedef.rs b/tests/rustdoc/typedef.rs
index d5dfa9484..d5dfa9484 100644
--- a/src/test/rustdoc/typedef.rs
+++ b/tests/rustdoc/typedef.rs
diff --git a/src/test/rustdoc/unindent.md b/tests/rustdoc/unindent.md
index 8e4e7a25a..8e4e7a25a 100644
--- a/src/test/rustdoc/unindent.md
+++ b/tests/rustdoc/unindent.md
diff --git a/src/test/rustdoc/unindent.rs b/tests/rustdoc/unindent.rs
index 372af5f46..372af5f46 100644
--- a/src/test/rustdoc/unindent.rs
+++ b/tests/rustdoc/unindent.rs
diff --git a/src/test/rustdoc/union.rs b/tests/rustdoc/union.rs
index 5a788eb1b..5a788eb1b 100644
--- a/src/test/rustdoc/union.rs
+++ b/tests/rustdoc/union.rs
diff --git a/tests/rustdoc/unit-return.rs b/tests/rustdoc/unit-return.rs
new file mode 100644
index 000000000..353cd1c47
--- /dev/null
+++ b/tests/rustdoc/unit-return.rs
@@ -0,0 +1,17 @@
+// aux-build:unit-return.rs
+
+#![crate_name = "foo"]
+
+extern crate unit_return;
+
+// @has 'foo/fn.f0.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'F: FnMut(u8) + Clone'
+pub fn f0<F: FnMut(u8) + Clone>(f: F) {}
+
+// @has 'foo/fn.f1.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'F: FnMut(u16) + Clone'
+pub fn f1<F: FnMut(u16) -> () + Clone>(f: F) {}
+
+// @has 'foo/fn.f2.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'F: FnMut(u32) + Clone'
+pub use unit_return::f2;
+
+// @has 'foo/fn.f3.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'F: FnMut(u64) + Clone'
+pub use unit_return::f3;
diff --git a/src/test/rustdoc/universal-impl-trait.rs b/tests/rustdoc/universal-impl-trait.rs
index f5eabda59..f5eabda59 100644
--- a/src/test/rustdoc/universal-impl-trait.rs
+++ b/tests/rustdoc/universal-impl-trait.rs
diff --git a/src/test/rustdoc/unneeded-trait-implementations-title.rs b/tests/rustdoc/unneeded-trait-implementations-title.rs
index e1bcfd3b9..e1bcfd3b9 100644
--- a/src/test/rustdoc/unneeded-trait-implementations-title.rs
+++ b/tests/rustdoc/unneeded-trait-implementations-title.rs
diff --git a/src/test/rustdoc/use-attr.rs b/tests/rustdoc/use-attr.rs
index 996b7bba6..996b7bba6 100644
--- a/src/test/rustdoc/use-attr.rs
+++ b/tests/rustdoc/use-attr.rs
diff --git a/src/test/rustdoc/useless_lifetime_bound.rs b/tests/rustdoc/useless_lifetime_bound.rs
index f530d8a65..f530d8a65 100644
--- a/src/test/rustdoc/useless_lifetime_bound.rs
+++ b/tests/rustdoc/useless_lifetime_bound.rs
diff --git a/src/test/rustdoc/variadic.rs b/tests/rustdoc/variadic.rs
index bd8f1775b..bd8f1775b 100644
--- a/src/test/rustdoc/variadic.rs
+++ b/tests/rustdoc/variadic.rs
diff --git a/src/test/rustdoc/version-separator-without-source.rs b/tests/rustdoc/version-separator-without-source.rs
index 04ea46a7f..04ea46a7f 100644
--- a/src/test/rustdoc/version-separator-without-source.rs
+++ b/tests/rustdoc/version-separator-without-source.rs
diff --git a/src/test/rustdoc/viewpath-rename.rs b/tests/rustdoc/viewpath-rename.rs
index 546127637..546127637 100644
--- a/src/test/rustdoc/viewpath-rename.rs
+++ b/tests/rustdoc/viewpath-rename.rs
diff --git a/src/test/rustdoc/viewpath-self.rs b/tests/rustdoc/viewpath-self.rs
index a6b659295..a6b659295 100644
--- a/src/test/rustdoc/viewpath-self.rs
+++ b/tests/rustdoc/viewpath-self.rs
diff --git a/src/test/rustdoc/visibility.rs b/tests/rustdoc/visibility.rs
index 4099b54f0..4099b54f0 100644
--- a/src/test/rustdoc/visibility.rs
+++ b/tests/rustdoc/visibility.rs
diff --git a/src/test/rustdoc/where-clause-order.rs b/tests/rustdoc/where-clause-order.rs
index b8502e10a..b8502e10a 100644
--- a/src/test/rustdoc/where-clause-order.rs
+++ b/tests/rustdoc/where-clause-order.rs
diff --git a/tests/rustdoc/where-sized.rs b/tests/rustdoc/where-sized.rs
new file mode 100644
index 000000000..c0c085e6a
--- /dev/null
+++ b/tests/rustdoc/where-sized.rs
@@ -0,0 +1,6 @@
+#![crate_name = "foo"]
+
+// @has foo/fn.foo.html
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'pub fn foo<X, Y: ?Sized>(_: &X)'
+// @has - '//div[@class="item-decl"]/pre[@class="rust"]' 'where X: ?Sized,'
+pub fn foo<X, Y: ?Sized>(_: &X) where X: ?Sized {}
diff --git a/tests/rustdoc/where.SWhere_Simd_item-decl.html b/tests/rustdoc/where.SWhere_Simd_item-decl.html
new file mode 100644
index 000000000..f84cb3753
--- /dev/null
+++ b/tests/rustdoc/where.SWhere_Simd_item-decl.html
@@ -0,0 +1 @@
+<div class="item-decl"><pre class="rust"><code>pub struct Simd&lt;T&gt;(_)<br /><span class="where">where<br />&#160;&#160;&#160;&#160;T: <a class="trait" href="trait.MyTrait.html" title="trait foo::MyTrait">MyTrait</a></span>;</code></pre></div>
\ No newline at end of file
diff --git a/src/test/rustdoc/where.SWhere_TraitWhere_item-decl.html b/tests/rustdoc/where.SWhere_TraitWhere_item-decl.html
index d5d6c556d..85b626674 100644
--- a/src/test/rustdoc/where.SWhere_TraitWhere_item-decl.html
+++ b/tests/rustdoc/where.SWhere_TraitWhere_item-decl.html
@@ -1,4 +1,4 @@
-<div class="item-decl"><pre class="rust trait"><code>pub trait TraitWhere {
+<div class="item-decl"><pre class="rust"><code>pub trait TraitWhere {
     type <a href="#associatedtype.Item" class="associatedtype">Item</a>&lt;'a&gt;<br />&#160;&#160;&#160;&#160;<span class="where">where<br />&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;Self: 'a</span>;
 
     fn <a href="#method.func" class="fn">func</a>(self)<br />&#160;&#160;&#160;&#160;<span class="where">where<br />&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;Self: <a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a></span>,
diff --git a/src/test/rustdoc/where.rs b/tests/rustdoc/where.rs
index 8b5bce28f..3ac0c6872 100644
--- a/src/test/rustdoc/where.rs
+++ b/tests/rustdoc/where.rs
@@ -57,6 +57,6 @@ pub enum Foxtrot<F> { Foxtrot1(F) }
 //          "impl<F> MyTrait for Foxtrot<F>where F: MyTrait"
 impl<F> MyTrait for Foxtrot<F>where F: MyTrait {}
 
-// @has foo/type.Golf.html '//pre[@class="rust typedef"]' \
+// @has foo/type.Golf.html '//div[@class="item-decl"]/pre[@class="rust"]' \
 //          "type Golf<T>where T: Clone, = (T, T)"
 pub type Golf<T> where T: Clone = (T, T);
diff --git a/tests/rustdoc/whitespace-after-where-clause.enum.html b/tests/rustdoc/whitespace-after-where-clause.enum.html
new file mode 100644
index 000000000..20bde549a
--- /dev/null
+++ b/tests/rustdoc/whitespace-after-where-clause.enum.html
@@ -0,0 +1,4 @@
+<div class="item-decl"><pre class="rust"><code>pub enum Cow&lt;'a, B&gt;<span class="where fmt-newline">where<br />&#160;&#160;&#160;&#160;B: <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;dyn <a class="trait" href="{{channel}}/core/clone/trait.Clone.html" title="trait core::clone::Clone">Clone</a>&gt; + ?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a> + 'a,</span>{
+    Borrowed(<a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a </a>B),
+    Whatever(<a class="primitive" href="{{channel}}/std/primitive.u32.html">u32</a>),
+}</code></pre></div>
\ No newline at end of file
diff --git a/tests/rustdoc/whitespace-after-where-clause.enum2.html b/tests/rustdoc/whitespace-after-where-clause.enum2.html
new file mode 100644
index 000000000..d9fc0c223
--- /dev/null
+++ b/tests/rustdoc/whitespace-after-where-clause.enum2.html
@@ -0,0 +1,4 @@
+<div class="item-decl"><pre class="rust"><code>pub enum Cow2&lt;'a, B:&#160;?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a> + <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;dyn <a class="trait" href="{{channel}}/core/clone/trait.Clone.html" title="trait core::clone::Clone">Clone</a>&gt; + 'a&gt; {
+    Borrowed(<a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a </a>B),
+    Whatever(<a class="primitive" href="{{channel}}/std/primitive.u32.html">u32</a>),
+}</code></pre></div>
\ No newline at end of file
diff --git a/src/test/rustdoc/whitespace-after-where-clause.rs b/tests/rustdoc/whitespace-after-where-clause.rs
index 4b740b970..4b740b970 100644
--- a/src/test/rustdoc/whitespace-after-where-clause.rs
+++ b/tests/rustdoc/whitespace-after-where-clause.rs
diff --git a/tests/rustdoc/whitespace-after-where-clause.struct.html b/tests/rustdoc/whitespace-after-where-clause.struct.html
new file mode 100644
index 000000000..f375265d7
--- /dev/null
+++ b/tests/rustdoc/whitespace-after-where-clause.struct.html
@@ -0,0 +1,4 @@
+<div class="item-decl"><pre class="rust"><code>pub struct Struct&lt;'a, B&gt;<span class="where fmt-newline">where<br />&#160;&#160;&#160;&#160;B: <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;dyn <a class="trait" href="{{channel}}/core/clone/trait.Clone.html" title="trait core::clone::Clone">Clone</a>&gt; + ?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a> + 'a,</span>{
+    pub a: <a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a </a>B,
+    pub b: <a class="primitive" href="{{channel}}/std/primitive.u32.html">u32</a>,
+}</code></pre></div>
\ No newline at end of file
diff --git a/tests/rustdoc/whitespace-after-where-clause.struct2.html b/tests/rustdoc/whitespace-after-where-clause.struct2.html
new file mode 100644
index 000000000..1c59962eb
--- /dev/null
+++ b/tests/rustdoc/whitespace-after-where-clause.struct2.html
@@ -0,0 +1,4 @@
+<div class="item-decl"><pre class="rust"><code>pub struct Struct2&lt;'a, B:&#160;?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a> + <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;dyn <a class="trait" href="{{channel}}/core/clone/trait.Clone.html" title="trait core::clone::Clone">Clone</a>&gt; + 'a&gt; {
+    pub a: <a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a </a>B,
+    pub b: <a class="primitive" href="{{channel}}/std/primitive.u32.html">u32</a>,
+}</code></pre></div>
\ No newline at end of file
diff --git a/tests/rustdoc/whitespace-after-where-clause.trait.html b/tests/rustdoc/whitespace-after-where-clause.trait.html
new file mode 100644
index 000000000..a2df06e77
--- /dev/null
+++ b/tests/rustdoc/whitespace-after-where-clause.trait.html
@@ -0,0 +1,6 @@
+<div class="item-decl"><pre class="rust"><code>pub trait ToOwned&lt;T&gt;<span class="where fmt-newline">where<br />&#160;&#160;&#160;&#160;T: <a class="trait" href="{{channel}}/core/clone/trait.Clone.html" title="trait core::clone::Clone">Clone</a>,</span>{
+    type <a href="#associatedtype.Owned" class="associatedtype">Owned</a>;
+
+    fn <a href="#tymethod.to_owned" class="fn">to_owned</a>(&amp;self) -&gt; Self::<a class="associatedtype" href="trait.ToOwned.html#associatedtype.Owned" title="type foo::ToOwned::Owned">Owned</a>;
+<span class="item-spacer" />    fn <a href="#tymethod.whatever" class="fn">whatever</a>(&amp;self) -&gt; T;
+}</code></pre></div>
\ No newline at end of file
diff --git a/tests/rustdoc/whitespace-after-where-clause.trait2.html b/tests/rustdoc/whitespace-after-where-clause.trait2.html
new file mode 100644
index 000000000..2bfd6f768
--- /dev/null
+++ b/tests/rustdoc/whitespace-after-where-clause.trait2.html
@@ -0,0 +1,6 @@
+<div class="item-decl"><pre class="rust"><code>pub trait ToOwned2&lt;T:&#160;<a class="trait" href="{{channel}}/core/clone/trait.Clone.html" title="trait core::clone::Clone">Clone</a>&gt; {
+    type <a href="#associatedtype.Owned" class="associatedtype">Owned</a>;
+
+    fn <a href="#tymethod.to_owned" class="fn">to_owned</a>(&amp;self) -&gt; Self::<a class="associatedtype" href="trait.ToOwned2.html#associatedtype.Owned" title="type foo::ToOwned2::Owned">Owned</a>;
+<span class="item-spacer" />    fn <a href="#tymethod.whatever" class="fn">whatever</a>(&amp;self) -&gt; T;
+}</code></pre></div>
\ No newline at end of file
diff --git a/tests/rustdoc/whitespace-after-where-clause.union.html b/tests/rustdoc/whitespace-after-where-clause.union.html
new file mode 100644
index 000000000..066f8f87b
--- /dev/null
+++ b/tests/rustdoc/whitespace-after-where-clause.union.html
@@ -0,0 +1,3 @@
+<div class="item-decl"><pre class="rust"><code>pub union Union&lt;'a, B&gt;<span class="where fmt-newline">where<br />&#160;&#160;&#160;&#160;B: <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;dyn <a class="trait" href="{{channel}}/core/clone/trait.Clone.html" title="trait core::clone::Clone">Clone</a>&gt; + ?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a> + 'a,</span>{
+    /* private fields */
+}</code></pre></div>
\ No newline at end of file
diff --git a/tests/rustdoc/whitespace-after-where-clause.union2.html b/tests/rustdoc/whitespace-after-where-clause.union2.html
new file mode 100644
index 000000000..6b48c5dbd
--- /dev/null
+++ b/tests/rustdoc/whitespace-after-where-clause.union2.html
@@ -0,0 +1,3 @@
+<div class="item-decl"><pre class="rust"><code>pub union Union2&lt;'a, B:&#160;?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a> + <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;dyn <a class="trait" href="{{channel}}/core/clone/trait.Clone.html" title="trait core::clone::Clone">Clone</a>&gt; + 'a&gt; {
+    /* private fields */
+}</code></pre></div>
\ No newline at end of file
diff --git a/src/test/rustdoc/without-redirect.rs b/tests/rustdoc/without-redirect.rs
index a076f8a3c..a076f8a3c 100644
--- a/src/test/rustdoc/without-redirect.rs
+++ b/tests/rustdoc/without-redirect.rs
diff --git a/tests/rustdoc/wrapping.rs b/tests/rustdoc/wrapping.rs
new file mode 100644
index 000000000..178b8adc3
--- /dev/null
+++ b/tests/rustdoc/wrapping.rs
@@ -0,0 +1,5 @@
+use std::fmt::Debug;
+
+// @has 'wrapping/fn.foo.html' '//div[@class="item-decl"]/pre[@class="rust"]' 'pub fn foo() -> impl Debug'
+// @count - '//div[@class="item-decl"]/pre[@class="rust"]/br' 0
+pub fn foo() -> impl Debug {}
diff --git a/src/test/ui-fulldeps/auxiliary/empty-plugin.rs b/tests/ui-fulldeps/auxiliary/empty-plugin.rs
index c24cdc97a..c24cdc97a 100644
--- a/src/test/ui-fulldeps/auxiliary/empty-plugin.rs
+++ b/tests/ui-fulldeps/auxiliary/empty-plugin.rs
diff --git a/src/test/ui-fulldeps/auxiliary/issue-13560-1.rs b/tests/ui-fulldeps/auxiliary/issue-13560-1.rs
index c3a2ae679..c3a2ae679 100644
--- a/src/test/ui-fulldeps/auxiliary/issue-13560-1.rs
+++ b/tests/ui-fulldeps/auxiliary/issue-13560-1.rs
diff --git a/src/test/ui-fulldeps/auxiliary/issue-13560-2.rs b/tests/ui-fulldeps/auxiliary/issue-13560-2.rs
index 39c261e11..39c261e11 100644
--- a/src/test/ui-fulldeps/auxiliary/issue-13560-2.rs
+++ b/tests/ui-fulldeps/auxiliary/issue-13560-2.rs
diff --git a/src/test/ui-fulldeps/auxiliary/issue-13560-3.rs b/tests/ui-fulldeps/auxiliary/issue-13560-3.rs
index e991bcc1a..e991bcc1a 100644
--- a/src/test/ui-fulldeps/auxiliary/issue-13560-3.rs
+++ b/tests/ui-fulldeps/auxiliary/issue-13560-3.rs
diff --git a/src/test/ui-fulldeps/auxiliary/issue-16822.rs b/tests/ui-fulldeps/auxiliary/issue-16822.rs
index 9042dd391..9042dd391 100644
--- a/src/test/ui-fulldeps/auxiliary/issue-16822.rs
+++ b/tests/ui-fulldeps/auxiliary/issue-16822.rs
diff --git a/src/test/ui-fulldeps/auxiliary/issue-18502.rs b/tests/ui-fulldeps/auxiliary/issue-18502.rs
index 4d4230607..4d4230607 100644
--- a/src/test/ui-fulldeps/auxiliary/issue-18502.rs
+++ b/tests/ui-fulldeps/auxiliary/issue-18502.rs
diff --git a/src/test/ui-fulldeps/auxiliary/issue-24106.rs b/tests/ui-fulldeps/auxiliary/issue-24106.rs
index 2c6a60348..2c6a60348 100644
--- a/src/test/ui-fulldeps/auxiliary/issue-24106.rs
+++ b/tests/ui-fulldeps/auxiliary/issue-24106.rs
diff --git a/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs b/tests/ui-fulldeps/auxiliary/issue-40001-plugin.rs
index c05443488..c05443488 100644
--- a/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs
+++ b/tests/ui-fulldeps/auxiliary/issue-40001-plugin.rs
diff --git a/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs b/tests/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
index a3b570ad8..a3b570ad8 100644
--- a/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
+++ b/tests/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
diff --git a/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs b/tests/ui-fulldeps/auxiliary/lint-for-crate.rs
index 073da688c..073da688c 100644
--- a/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs
+++ b/tests/ui-fulldeps/auxiliary/lint-for-crate.rs
diff --git a/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs b/tests/ui-fulldeps/auxiliary/lint-group-plugin-test.rs
index 4a41e7fbb..4a41e7fbb 100644
--- a/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs
+++ b/tests/ui-fulldeps/auxiliary/lint-group-plugin-test.rs
diff --git a/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs b/tests/ui-fulldeps/auxiliary/lint-plugin-test.rs
index 30956deb7..30956deb7 100644
--- a/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs
+++ b/tests/ui-fulldeps/auxiliary/lint-plugin-test.rs
diff --git a/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs b/tests/ui-fulldeps/auxiliary/lint-tool-test.rs
index c2c024865..c2c024865 100644
--- a/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs
+++ b/tests/ui-fulldeps/auxiliary/lint-tool-test.rs
diff --git a/src/test/ui-fulldeps/auxiliary/lto-syntax-extension-lib.rs b/tests/ui-fulldeps/auxiliary/lto-syntax-extension-lib.rs
index 954a1e554..954a1e554 100644
--- a/src/test/ui-fulldeps/auxiliary/lto-syntax-extension-lib.rs
+++ b/tests/ui-fulldeps/auxiliary/lto-syntax-extension-lib.rs
diff --git a/src/test/ui-fulldeps/auxiliary/lto-syntax-extension-plugin.rs b/tests/ui-fulldeps/auxiliary/lto-syntax-extension-plugin.rs
index 9b075c1a5..9b075c1a5 100644
--- a/src/test/ui-fulldeps/auxiliary/lto-syntax-extension-plugin.rs
+++ b/tests/ui-fulldeps/auxiliary/lto-syntax-extension-plugin.rs
diff --git a/src/test/ui-fulldeps/auxiliary/multiple-plugins-1.rs b/tests/ui-fulldeps/auxiliary/multiple-plugins-1.rs
index fd6e9e20f..fd6e9e20f 100644
--- a/src/test/ui-fulldeps/auxiliary/multiple-plugins-1.rs
+++ b/tests/ui-fulldeps/auxiliary/multiple-plugins-1.rs
diff --git a/src/test/ui-fulldeps/auxiliary/multiple-plugins-2.rs b/tests/ui-fulldeps/auxiliary/multiple-plugins-2.rs
index fd6e9e20f..fd6e9e20f 100644
--- a/src/test/ui-fulldeps/auxiliary/multiple-plugins-2.rs
+++ b/tests/ui-fulldeps/auxiliary/multiple-plugins-2.rs
diff --git a/src/test/ui-fulldeps/auxiliary/outlive-expansion-phase.rs b/tests/ui-fulldeps/auxiliary/outlive-expansion-phase.rs
index e83dfe804..e83dfe804 100644
--- a/src/test/ui-fulldeps/auxiliary/outlive-expansion-phase.rs
+++ b/tests/ui-fulldeps/auxiliary/outlive-expansion-phase.rs
diff --git a/src/test/ui-fulldeps/auxiliary/rlib-crate-test.rs b/tests/ui-fulldeps/auxiliary/rlib-crate-test.rs
index 3ba73538e..3ba73538e 100644
--- a/src/test/ui-fulldeps/auxiliary/rlib-crate-test.rs
+++ b/tests/ui-fulldeps/auxiliary/rlib-crate-test.rs
diff --git a/src/test/ui-fulldeps/auxiliary/syntax-extension-with-dll-deps-1.rs b/tests/ui-fulldeps/auxiliary/syntax-extension-with-dll-deps-1.rs
index 8b00fb81c..8b00fb81c 100644
--- a/src/test/ui-fulldeps/auxiliary/syntax-extension-with-dll-deps-1.rs
+++ b/tests/ui-fulldeps/auxiliary/syntax-extension-with-dll-deps-1.rs
diff --git a/src/test/ui-fulldeps/compiler-calls.rs b/tests/ui-fulldeps/compiler-calls.rs
index a9520b592..a9520b592 100644
--- a/src/test/ui-fulldeps/compiler-calls.rs
+++ b/tests/ui-fulldeps/compiler-calls.rs
diff --git a/src/test/ui-fulldeps/create-dir-all-bare.rs b/tests/ui-fulldeps/create-dir-all-bare.rs
index 4554680ec..4554680ec 100644
--- a/src/test/ui-fulldeps/create-dir-all-bare.rs
+++ b/tests/ui-fulldeps/create-dir-all-bare.rs
diff --git a/src/test/ui-fulldeps/deriving-encodable-decodable-box.rs b/tests/ui-fulldeps/deriving-encodable-decodable-box.rs
index a4b911878..1c376f59e 100644
--- a/src/test/ui-fulldeps/deriving-encodable-decodable-box.rs
+++ b/tests/ui-fulldeps/deriving-encodable-decodable-box.rs
@@ -6,6 +6,11 @@
 extern crate rustc_macros;
 extern crate rustc_serialize;
 
+// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
+// files.
+#[allow(unused_extern_crates)]
+extern crate rustc_driver;
+
 use rustc_macros::{Decodable, Encodable};
 use rustc_serialize::opaque::{MemDecoder, MemEncoder};
 use rustc_serialize::{Decodable, Encodable, Encoder};
diff --git a/src/test/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs b/tests/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs
index 580c85f9b..844d40f2e 100644
--- a/src/test/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs
+++ b/tests/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs
@@ -8,6 +8,11 @@
 extern crate rustc_macros;
 extern crate rustc_serialize;
 
+// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
+// files.
+#[allow(unused_extern_crates)]
+extern crate rustc_driver;
+
 use rustc_macros::{Decodable, Encodable};
 use rustc_serialize::opaque::{MemDecoder, MemEncoder};
 use rustc_serialize::{Decodable, Encodable, Encoder};
diff --git a/src/test/ui-fulldeps/deriving-global.rs b/tests/ui-fulldeps/deriving-global.rs
index 921767af9..214bb4368 100644
--- a/src/test/ui-fulldeps/deriving-global.rs
+++ b/tests/ui-fulldeps/deriving-global.rs
@@ -5,6 +5,11 @@
 extern crate rustc_macros;
 extern crate rustc_serialize;
 
+// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
+// files.
+#[allow(unused_extern_crates)]
+extern crate rustc_driver;
+
 mod submod {
     use rustc_macros::{Decodable, Encodable};
 
diff --git a/tests/ui-fulldeps/deriving-hygiene.rs b/tests/ui-fulldeps/deriving-hygiene.rs
new file mode 100644
index 000000000..e1084a08f
--- /dev/null
+++ b/tests/ui-fulldeps/deriving-hygiene.rs
@@ -0,0 +1,25 @@
+// run-pass
+
+#![allow(non_upper_case_globals)]
+#![feature(rustc_private)]
+extern crate rustc_macros;
+extern crate rustc_serialize;
+
+use rustc_macros::{Decodable, Encodable};
+
+// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
+// files.
+#[allow(unused_extern_crates)]
+extern crate rustc_driver;
+
+pub const other: u8 = 1;
+pub const f: u8 = 1;
+pub const d: u8 = 1;
+pub const s: u8 = 1;
+pub const state: u8 = 1;
+pub const cmp: u8 = 1;
+
+#[derive(Ord, Eq, PartialOrd, PartialEq, Debug, Decodable, Encodable, Hash)]
+struct Foo {}
+
+fn main() {}
diff --git a/src/test/ui-fulldeps/dropck-tarena-cycle-checked.rs b/tests/ui-fulldeps/dropck-tarena-cycle-checked.rs
index cc97971a0..cc97971a0 100644
--- a/src/test/ui-fulldeps/dropck-tarena-cycle-checked.rs
+++ b/tests/ui-fulldeps/dropck-tarena-cycle-checked.rs
diff --git a/src/test/ui-fulldeps/dropck-tarena-cycle-checked.stderr b/tests/ui-fulldeps/dropck-tarena-cycle-checked.stderr
index 429968822..429968822 100644
--- a/src/test/ui-fulldeps/dropck-tarena-cycle-checked.stderr
+++ b/tests/ui-fulldeps/dropck-tarena-cycle-checked.stderr
diff --git a/src/test/ui-fulldeps/dropck-tarena-unsound-drop.rs b/tests/ui-fulldeps/dropck-tarena-unsound-drop.rs
index 86485a988..86485a988 100644
--- a/src/test/ui-fulldeps/dropck-tarena-unsound-drop.rs
+++ b/tests/ui-fulldeps/dropck-tarena-unsound-drop.rs
diff --git a/src/test/ui-fulldeps/dropck-tarena-unsound-drop.stderr b/tests/ui-fulldeps/dropck-tarena-unsound-drop.stderr
index ccffee9cd..ccffee9cd 100644
--- a/src/test/ui-fulldeps/dropck-tarena-unsound-drop.stderr
+++ b/tests/ui-fulldeps/dropck-tarena-unsound-drop.stderr
diff --git a/src/test/ui-fulldeps/dropck_tarena_sound_drop.rs b/tests/ui-fulldeps/dropck_tarena_sound_drop.rs
index 187f9a24a..ffad80171 100644
--- a/src/test/ui-fulldeps/dropck_tarena_sound_drop.rs
+++ b/tests/ui-fulldeps/dropck_tarena_sound_drop.rs
@@ -14,6 +14,11 @@
 
 extern crate rustc_arena;
 
+// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
+// files.
+#[allow(unused_extern_crates)]
+extern crate rustc_driver;
+
 use rustc_arena::TypedArena;
 
 trait HasId { fn count(&self) -> usize; }
diff --git a/src/test/ui-fulldeps/empty-struct-braces-derive.rs b/tests/ui-fulldeps/empty-struct-braces-derive.rs
index 6e5eb5462..10e8beaa7 100644
--- a/src/test/ui-fulldeps/empty-struct-braces-derive.rs
+++ b/tests/ui-fulldeps/empty-struct-braces-derive.rs
@@ -6,6 +6,11 @@
 extern crate rustc_macros;
 extern crate rustc_serialize;
 
+// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
+// files.
+#[allow(unused_extern_crates)]
+extern crate rustc_driver;
+
 use rustc_macros::{Decodable, Encodable};
 
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Debug, Encodable, Decodable)]
diff --git a/src/test/ui-fulldeps/extern-mod-syntax.rs b/tests/ui-fulldeps/extern-mod-syntax.rs
index 230194c53..230194c53 100644
--- a/src/test/ui-fulldeps/extern-mod-syntax.rs
+++ b/tests/ui-fulldeps/extern-mod-syntax.rs
diff --git a/src/test/ui-fulldeps/feature-gate-plugin.rs b/tests/ui-fulldeps/feature-gate-plugin.rs
index 85eaf5336..85eaf5336 100644
--- a/src/test/ui-fulldeps/feature-gate-plugin.rs
+++ b/tests/ui-fulldeps/feature-gate-plugin.rs
diff --git a/src/test/ui-fulldeps/feature-gate-plugin.stderr b/tests/ui-fulldeps/feature-gate-plugin.stderr
index 5e40561c7..5e40561c7 100644
--- a/src/test/ui-fulldeps/feature-gate-plugin.stderr
+++ b/tests/ui-fulldeps/feature-gate-plugin.stderr
diff --git a/src/test/ui-fulldeps/fluent-messages/duplicate-a-b.ftl b/tests/ui-fulldeps/fluent-messages/duplicate-a-b.ftl
index 9407c5170..9407c5170 100644
--- a/src/test/ui-fulldeps/fluent-messages/duplicate-a-b.ftl
+++ b/tests/ui-fulldeps/fluent-messages/duplicate-a-b.ftl
diff --git a/src/test/ui-fulldeps/fluent-messages/duplicate-a.ftl b/tests/ui-fulldeps/fluent-messages/duplicate-a.ftl
index 9407c5170..9407c5170 100644
--- a/src/test/ui-fulldeps/fluent-messages/duplicate-a.ftl
+++ b/tests/ui-fulldeps/fluent-messages/duplicate-a.ftl
diff --git a/src/test/ui-fulldeps/fluent-messages/label-with-hyphens.ftl b/tests/ui-fulldeps/fluent-messages/label-with-hyphens.ftl
index 016cbeef6..016cbeef6 100644
--- a/src/test/ui-fulldeps/fluent-messages/label-with-hyphens.ftl
+++ b/tests/ui-fulldeps/fluent-messages/label-with-hyphens.ftl
diff --git a/src/test/ui-fulldeps/fluent-messages/missing-crate-name.ftl b/tests/ui-fulldeps/fluent-messages/missing-crate-name.ftl
index 9bd035c1b..9bd035c1b 100644
--- a/src/test/ui-fulldeps/fluent-messages/missing-crate-name.ftl
+++ b/tests/ui-fulldeps/fluent-messages/missing-crate-name.ftl
diff --git a/src/test/ui-fulldeps/fluent-messages/missing-message.ftl b/tests/ui-fulldeps/fluent-messages/missing-message.ftl
index 74b2aa1d4..74b2aa1d4 100644
--- a/src/test/ui-fulldeps/fluent-messages/missing-message.ftl
+++ b/tests/ui-fulldeps/fluent-messages/missing-message.ftl
diff --git a/src/test/ui-fulldeps/fluent-messages/slug-with-hyphens.ftl b/tests/ui-fulldeps/fluent-messages/slug-with-hyphens.ftl
index 86ba9a268..86ba9a268 100644
--- a/src/test/ui-fulldeps/fluent-messages/slug-with-hyphens.ftl
+++ b/tests/ui-fulldeps/fluent-messages/slug-with-hyphens.ftl
diff --git a/src/test/ui-fulldeps/fluent-messages/test.rs b/tests/ui-fulldeps/fluent-messages/test.rs
index 4e8147e2b..4e8147e2b 100644
--- a/src/test/ui-fulldeps/fluent-messages/test.rs
+++ b/tests/ui-fulldeps/fluent-messages/test.rs
diff --git a/src/test/ui-fulldeps/fluent-messages/test.stderr b/tests/ui-fulldeps/fluent-messages/test.stderr
index d1cd4fe26..d1cd4fe26 100644
--- a/src/test/ui-fulldeps/fluent-messages/test.stderr
+++ b/tests/ui-fulldeps/fluent-messages/test.stderr
diff --git a/src/test/ui-fulldeps/fluent-messages/valid.ftl b/tests/ui-fulldeps/fluent-messages/valid.ftl
index 549274306..549274306 100644
--- a/src/test/ui-fulldeps/fluent-messages/valid.ftl
+++ b/tests/ui-fulldeps/fluent-messages/valid.ftl
diff --git a/src/test/ui-fulldeps/gated-plugin.rs b/tests/ui-fulldeps/gated-plugin.rs
index 85eaf5336..85eaf5336 100644
--- a/src/test/ui-fulldeps/gated-plugin.rs
+++ b/tests/ui-fulldeps/gated-plugin.rs
diff --git a/src/test/ui-fulldeps/gated-plugin.stderr b/tests/ui-fulldeps/gated-plugin.stderr
index f48f1eab6..f48f1eab6 100644
--- a/src/test/ui-fulldeps/gated-plugin.stderr
+++ b/tests/ui-fulldeps/gated-plugin.stderr
diff --git a/src/test/ui-fulldeps/hash-stable-is-unstable.rs b/tests/ui-fulldeps/hash-stable-is-unstable.rs
index 11fe688f3..11fe688f3 100644
--- a/src/test/ui-fulldeps/hash-stable-is-unstable.rs
+++ b/tests/ui-fulldeps/hash-stable-is-unstable.rs
diff --git a/src/test/ui-fulldeps/hash-stable-is-unstable.stderr b/tests/ui-fulldeps/hash-stable-is-unstable.stderr
index d25657691..d25657691 100644
--- a/src/test/ui-fulldeps/hash-stable-is-unstable.stderr
+++ b/tests/ui-fulldeps/hash-stable-is-unstable.stderr
diff --git a/src/test/ui-fulldeps/internal-lints/bad_opt_access.rs b/tests/ui-fulldeps/internal-lints/bad_opt_access.rs
index d6bd6945e..d6bd6945e 100644
--- a/src/test/ui-fulldeps/internal-lints/bad_opt_access.rs
+++ b/tests/ui-fulldeps/internal-lints/bad_opt_access.rs
diff --git a/src/test/ui-fulldeps/internal-lints/bad_opt_access.stderr b/tests/ui-fulldeps/internal-lints/bad_opt_access.stderr
index e4145bff8..e4145bff8 100644
--- a/src/test/ui-fulldeps/internal-lints/bad_opt_access.stderr
+++ b/tests/ui-fulldeps/internal-lints/bad_opt_access.stderr
diff --git a/src/test/ui-fulldeps/internal-lints/default_hash_types.rs b/tests/ui-fulldeps/internal-lints/default_hash_types.rs
index 795c7d2dc..795c7d2dc 100644
--- a/src/test/ui-fulldeps/internal-lints/default_hash_types.rs
+++ b/tests/ui-fulldeps/internal-lints/default_hash_types.rs
diff --git a/src/test/ui-fulldeps/internal-lints/default_hash_types.stderr b/tests/ui-fulldeps/internal-lints/default_hash_types.stderr
index 3cb13082f..3cb13082f 100644
--- a/src/test/ui-fulldeps/internal-lints/default_hash_types.stderr
+++ b/tests/ui-fulldeps/internal-lints/default_hash_types.stderr
diff --git a/src/test/ui-fulldeps/internal-lints/diagnostics.rs b/tests/ui-fulldeps/internal-lints/diagnostics.rs
index 643e81d99..643e81d99 100644
--- a/src/test/ui-fulldeps/internal-lints/diagnostics.rs
+++ b/tests/ui-fulldeps/internal-lints/diagnostics.rs
diff --git a/src/test/ui-fulldeps/internal-lints/diagnostics.stderr b/tests/ui-fulldeps/internal-lints/diagnostics.stderr
index 510d6a171..510d6a171 100644
--- a/src/test/ui-fulldeps/internal-lints/diagnostics.stderr
+++ b/tests/ui-fulldeps/internal-lints/diagnostics.stderr
diff --git a/src/test/ui-fulldeps/internal-lints/diagnostics_incorrect.rs b/tests/ui-fulldeps/internal-lints/diagnostics_incorrect.rs
index 99f99ffcd..99f99ffcd 100644
--- a/src/test/ui-fulldeps/internal-lints/diagnostics_incorrect.rs
+++ b/tests/ui-fulldeps/internal-lints/diagnostics_incorrect.rs
diff --git a/src/test/ui-fulldeps/internal-lints/diagnostics_incorrect.stderr b/tests/ui-fulldeps/internal-lints/diagnostics_incorrect.stderr
index e849ca282..e849ca282 100644
--- a/src/test/ui-fulldeps/internal-lints/diagnostics_incorrect.stderr
+++ b/tests/ui-fulldeps/internal-lints/diagnostics_incorrect.stderr
diff --git a/src/test/ui-fulldeps/internal-lints/existing_doc_keyword.rs b/tests/ui-fulldeps/internal-lints/existing_doc_keyword.rs
index 7783dc40f..7783dc40f 100644
--- a/src/test/ui-fulldeps/internal-lints/existing_doc_keyword.rs
+++ b/tests/ui-fulldeps/internal-lints/existing_doc_keyword.rs
diff --git a/src/test/ui-fulldeps/internal-lints/existing_doc_keyword.stderr b/tests/ui-fulldeps/internal-lints/existing_doc_keyword.stderr
index 4e296fff6..4e296fff6 100644
--- a/src/test/ui-fulldeps/internal-lints/existing_doc_keyword.stderr
+++ b/tests/ui-fulldeps/internal-lints/existing_doc_keyword.stderr
diff --git a/src/test/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs b/tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs
index f6f0c0385..f6f0c0385 100644
--- a/src/test/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs
+++ b/tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs
diff --git a/src/test/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.stderr b/tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.stderr
index ad6e93334..ad6e93334 100644
--- a/src/test/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.stderr
+++ b/tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.stderr
diff --git a/src/test/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs b/tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs
index 32b987338..32b987338 100644
--- a/src/test/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs
+++ b/tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs
diff --git a/src/test/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.stderr b/tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.stderr
index a1056cf85..a1056cf85 100644
--- a/src/test/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.stderr
+++ b/tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.stderr
diff --git a/src/test/ui-fulldeps/internal-lints/query_stability.rs b/tests/ui-fulldeps/internal-lints/query_stability.rs
index 560675b44..560675b44 100644
--- a/src/test/ui-fulldeps/internal-lints/query_stability.rs
+++ b/tests/ui-fulldeps/internal-lints/query_stability.rs
diff --git a/src/test/ui-fulldeps/internal-lints/query_stability.stderr b/tests/ui-fulldeps/internal-lints/query_stability.stderr
index ee4ef9982..ee4ef9982 100644
--- a/src/test/ui-fulldeps/internal-lints/query_stability.stderr
+++ b/tests/ui-fulldeps/internal-lints/query_stability.stderr
diff --git a/src/test/ui-fulldeps/internal-lints/query_stability_incorrect.rs b/tests/ui-fulldeps/internal-lints/query_stability_incorrect.rs
index f478b7332..f478b7332 100644
--- a/src/test/ui-fulldeps/internal-lints/query_stability_incorrect.rs
+++ b/tests/ui-fulldeps/internal-lints/query_stability_incorrect.rs
diff --git a/src/test/ui-fulldeps/internal-lints/query_stability_incorrect.stderr b/tests/ui-fulldeps/internal-lints/query_stability_incorrect.stderr
index 3f78b39ed..3f78b39ed 100644
--- a/src/test/ui-fulldeps/internal-lints/query_stability_incorrect.stderr
+++ b/tests/ui-fulldeps/internal-lints/query_stability_incorrect.stderr
diff --git a/src/test/ui-fulldeps/internal-lints/rustc_pass_by_value.rs b/tests/ui-fulldeps/internal-lints/rustc_pass_by_value.rs
index 10bab2d88..10bab2d88 100644
--- a/src/test/ui-fulldeps/internal-lints/rustc_pass_by_value.rs
+++ b/tests/ui-fulldeps/internal-lints/rustc_pass_by_value.rs
diff --git a/src/test/ui-fulldeps/internal-lints/rustc_pass_by_value.stderr b/tests/ui-fulldeps/internal-lints/rustc_pass_by_value.stderr
index 69cf20656..69cf20656 100644
--- a/src/test/ui-fulldeps/internal-lints/rustc_pass_by_value.stderr
+++ b/tests/ui-fulldeps/internal-lints/rustc_pass_by_value.stderr
diff --git a/src/test/ui-fulldeps/internal-lints/rustc_pass_by_value_self.rs b/tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.rs
index 6ce67dcaf..6ce67dcaf 100644
--- a/src/test/ui-fulldeps/internal-lints/rustc_pass_by_value_self.rs
+++ b/tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.rs
diff --git a/src/test/ui-fulldeps/internal-lints/rustc_pass_by_value_self.stderr b/tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.stderr
index fb39ed60b..fb39ed60b 100644
--- a/src/test/ui-fulldeps/internal-lints/rustc_pass_by_value_self.stderr
+++ b/tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.stderr
diff --git a/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.rs b/tests/ui-fulldeps/internal-lints/ty_tykind_usage.rs
index 2cb1ed6fc..3f7429a5f 100644
--- a/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.rs
+++ b/tests/ui-fulldeps/internal-lints/ty_tykind_usage.rs
@@ -33,8 +33,7 @@ fn main() {
         TyKind::GeneratorWitness(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
         TyKind::Never => (),                //~ ERROR usage of `ty::TyKind::<kind>`
         TyKind::Tuple(..) => (),            //~ ERROR usage of `ty::TyKind::<kind>`
-        TyKind::Projection(..) => (),       //~ ERROR usage of `ty::TyKind::<kind>`
-        TyKind::Opaque(..) => (),           //~ ERROR usage of `ty::TyKind::<kind>`
+        TyKind::Alias(..) => (),            //~ ERROR usage of `ty::TyKind::<kind>`
         TyKind::Param(..) => (),            //~ ERROR usage of `ty::TyKind::<kind>`
         TyKind::Bound(..) => (),            //~ ERROR usage of `ty::TyKind::<kind>`
         TyKind::Placeholder(..) => (),      //~ ERROR usage of `ty::TyKind::<kind>`
diff --git a/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.stderr b/tests/ui-fulldeps/internal-lints/ty_tykind_usage.stderr
index 171f49087..1f49d6b64 100644
--- a/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.stderr
+++ b/tests/ui-fulldeps/internal-lints/ty_tykind_usage.stderr
@@ -133,53 +133,47 @@ LL |         TyKind::Tuple(..) => (),
 error: usage of `ty::TyKind::<kind>`
   --> $DIR/ty_tykind_usage.rs:36:9
    |
-LL |         TyKind::Projection(..) => (),
+LL |         TyKind::Alias(..) => (),
    |         ^^^^^^ help: try using `ty::<kind>` directly: `ty`
 
 error: usage of `ty::TyKind::<kind>`
   --> $DIR/ty_tykind_usage.rs:37:9
    |
-LL |         TyKind::Opaque(..) => (),
-   |         ^^^^^^ help: try using `ty::<kind>` directly: `ty`
-
-error: usage of `ty::TyKind::<kind>`
-  --> $DIR/ty_tykind_usage.rs:38:9
-   |
 LL |         TyKind::Param(..) => (),
    |         ^^^^^^ help: try using `ty::<kind>` directly: `ty`
 
 error: usage of `ty::TyKind::<kind>`
-  --> $DIR/ty_tykind_usage.rs:39:9
+  --> $DIR/ty_tykind_usage.rs:38:9
    |
 LL |         TyKind::Bound(..) => (),
    |         ^^^^^^ help: try using `ty::<kind>` directly: `ty`
 
 error: usage of `ty::TyKind::<kind>`
-  --> $DIR/ty_tykind_usage.rs:40:9
+  --> $DIR/ty_tykind_usage.rs:39:9
    |
 LL |         TyKind::Placeholder(..) => (),
    |         ^^^^^^ help: try using `ty::<kind>` directly: `ty`
 
 error: usage of `ty::TyKind::<kind>`
-  --> $DIR/ty_tykind_usage.rs:41:9
+  --> $DIR/ty_tykind_usage.rs:40:9
    |
 LL |         TyKind::Infer(..) => (),
    |         ^^^^^^ help: try using `ty::<kind>` directly: `ty`
 
 error: usage of `ty::TyKind::<kind>`
-  --> $DIR/ty_tykind_usage.rs:42:9
+  --> $DIR/ty_tykind_usage.rs:41:9
    |
 LL |         TyKind::Error(_) => (),
    |         ^^^^^^ help: try using `ty::<kind>` directly: `ty`
 
 error: usage of `ty::TyKind::<kind>`
-  --> $DIR/ty_tykind_usage.rs:47:12
+  --> $DIR/ty_tykind_usage.rs:46:12
    |
 LL |     if let TyKind::Int(int_ty) = kind {}
    |            ^^^^^^ help: try using `ty::<kind>` directly: `ty`
 
 error: usage of `ty::TyKind`
-  --> $DIR/ty_tykind_usage.rs:49:24
+  --> $DIR/ty_tykind_usage.rs:48:24
    |
 LL |     fn ty_kind(ty_bad: TyKind<'_>, ty_good: Ty<'_>) {}
    |                        ^^^^^^^^^^
@@ -187,7 +181,7 @@ LL |     fn ty_kind(ty_bad: TyKind<'_>, ty_good: Ty<'_>) {}
    = help: try using `Ty` instead
 
 error: usage of `ty::TyKind`
-  --> $DIR/ty_tykind_usage.rs:51:37
+  --> $DIR/ty_tykind_usage.rs:50:37
    |
 LL |     fn ir_ty_kind<I: Interner>(bad: IrTyKind<I>) -> IrTyKind<I> {
    |                                     ^^^^^^^^^^^
@@ -195,7 +189,7 @@ LL |     fn ir_ty_kind<I: Interner>(bad: IrTyKind<I>) -> IrTyKind<I> {
    = help: try using `Ty` instead
 
 error: usage of `ty::TyKind`
-  --> $DIR/ty_tykind_usage.rs:51:53
+  --> $DIR/ty_tykind_usage.rs:50:53
    |
 LL |     fn ir_ty_kind<I: Interner>(bad: IrTyKind<I>) -> IrTyKind<I> {
    |                                                     ^^^^^^^^^^^
@@ -203,12 +197,12 @@ LL |     fn ir_ty_kind<I: Interner>(bad: IrTyKind<I>) -> IrTyKind<I> {
    = help: try using `Ty` instead
 
 error: usage of `ty::TyKind::<kind>`
-  --> $DIR/ty_tykind_usage.rs:54:9
+  --> $DIR/ty_tykind_usage.rs:53:9
    |
 LL |         IrTyKind::Bool
    |         --------^^^^^^
    |         |
    |         help: try using `ty::<kind>` directly: `ty`
 
-error: aborting due to 33 previous errors
+error: aborting due to 32 previous errors
 
diff --git a/src/test/ui-fulldeps/issue-11881.rs b/tests/ui-fulldeps/issue-11881.rs
index f6360db9b..f6360db9b 100644
--- a/src/test/ui-fulldeps/issue-11881.rs
+++ b/tests/ui-fulldeps/issue-11881.rs
diff --git a/src/test/ui-fulldeps/issue-13560.rs b/tests/ui-fulldeps/issue-13560.rs
index 5f7d647e2..5f7d647e2 100644
--- a/src/test/ui-fulldeps/issue-13560.rs
+++ b/tests/ui-fulldeps/issue-13560.rs
diff --git a/src/test/ui-fulldeps/issue-14021.rs b/tests/ui-fulldeps/issue-14021.rs
index 215dfaed7..309b5c4a0 100644
--- a/src/test/ui-fulldeps/issue-14021.rs
+++ b/tests/ui-fulldeps/issue-14021.rs
@@ -7,6 +7,11 @@
 extern crate rustc_macros;
 extern crate rustc_serialize;
 
+// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
+// files.
+#[allow(unused_extern_crates)]
+extern crate rustc_driver;
+
 use rustc_macros::{Decodable, Encodable};
 use rustc_serialize::opaque::{MemDecoder, MemEncoder};
 use rustc_serialize::{Decodable, Encodable, Encoder};
diff --git a/src/test/ui-fulldeps/issue-15149.rs b/tests/ui-fulldeps/issue-15149.rs
index 064472f57..064472f57 100644
--- a/src/test/ui-fulldeps/issue-15149.rs
+++ b/tests/ui-fulldeps/issue-15149.rs
diff --git a/src/test/ui-fulldeps/issue-15778-fail.rs b/tests/ui-fulldeps/issue-15778-fail.rs
index beecaadf9..beecaadf9 100644
--- a/src/test/ui-fulldeps/issue-15778-fail.rs
+++ b/tests/ui-fulldeps/issue-15778-fail.rs
diff --git a/src/test/ui-fulldeps/issue-15778-fail.stderr b/tests/ui-fulldeps/issue-15778-fail.stderr
index a37893e12..a37893e12 100644
--- a/src/test/ui-fulldeps/issue-15778-fail.stderr
+++ b/tests/ui-fulldeps/issue-15778-fail.stderr
diff --git a/src/test/ui-fulldeps/issue-15924.rs b/tests/ui-fulldeps/issue-15924.rs
index d8b3914d0..d8b3914d0 100644
--- a/src/test/ui-fulldeps/issue-15924.rs
+++ b/tests/ui-fulldeps/issue-15924.rs
diff --git a/src/test/ui-fulldeps/issue-16822.rs b/tests/ui-fulldeps/issue-16822.rs
index c611c33af..c611c33af 100644
--- a/src/test/ui-fulldeps/issue-16822.rs
+++ b/tests/ui-fulldeps/issue-16822.rs
diff --git a/src/test/ui-fulldeps/issue-18502.rs b/tests/ui-fulldeps/issue-18502.rs
index 2082ae7a9..2082ae7a9 100644
--- a/src/test/ui-fulldeps/issue-18502.rs
+++ b/tests/ui-fulldeps/issue-18502.rs
diff --git a/src/test/ui-fulldeps/issue-24106.rs b/tests/ui-fulldeps/issue-24106.rs
index 45f0bd5b6..45f0bd5b6 100644
--- a/src/test/ui-fulldeps/issue-24106.rs
+++ b/tests/ui-fulldeps/issue-24106.rs
diff --git a/src/test/ui-fulldeps/issue-2804.rs b/tests/ui-fulldeps/issue-2804.rs
index 571028c5e..571028c5e 100644
--- a/src/test/ui-fulldeps/issue-2804.rs
+++ b/tests/ui-fulldeps/issue-2804.rs
diff --git a/src/test/ui-fulldeps/issue-40001.rs b/tests/ui-fulldeps/issue-40001.rs
index e14338fdb..e14338fdb 100644
--- a/src/test/ui-fulldeps/issue-40001.rs
+++ b/tests/ui-fulldeps/issue-40001.rs
diff --git a/src/test/ui-fulldeps/issue-40001.stderr b/tests/ui-fulldeps/issue-40001.stderr
index 73ec06924..73ec06924 100644
--- a/src/test/ui-fulldeps/issue-40001.stderr
+++ b/tests/ui-fulldeps/issue-40001.stderr
diff --git a/src/test/ui-fulldeps/issue-81357-unsound-file-methods.rs b/tests/ui-fulldeps/issue-81357-unsound-file-methods.rs
index fdf1150f8..fdf1150f8 100644
--- a/src/test/ui-fulldeps/issue-81357-unsound-file-methods.rs
+++ b/tests/ui-fulldeps/issue-81357-unsound-file-methods.rs
diff --git a/src/test/ui-fulldeps/lint-group-denied-lint-allowed.rs b/tests/ui-fulldeps/lint-group-denied-lint-allowed.rs
index 7498745f2..7498745f2 100644
--- a/src/test/ui-fulldeps/lint-group-denied-lint-allowed.rs
+++ b/tests/ui-fulldeps/lint-group-denied-lint-allowed.rs
diff --git a/src/test/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs b/tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs
index fc19bc039..fc19bc039 100644
--- a/src/test/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs
+++ b/tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs
diff --git a/src/test/ui-fulldeps/lint-group-forbid-always-trumps-cli.stderr b/tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.stderr
index 6bab367b0..6bab367b0 100644
--- a/src/test/ui-fulldeps/lint-group-forbid-always-trumps-cli.stderr
+++ b/tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.stderr
diff --git a/src/test/ui-fulldeps/lint-group-plugin-deny-cmdline.rs b/tests/ui-fulldeps/lint-group-plugin-deny-cmdline.rs
index 9f8a87960..9f8a87960 100644
--- a/src/test/ui-fulldeps/lint-group-plugin-deny-cmdline.rs
+++ b/tests/ui-fulldeps/lint-group-plugin-deny-cmdline.rs
diff --git a/src/test/ui-fulldeps/lint-group-plugin-deny-cmdline.stderr b/tests/ui-fulldeps/lint-group-plugin-deny-cmdline.stderr
index 20486d596..20486d596 100644
--- a/src/test/ui-fulldeps/lint-group-plugin-deny-cmdline.stderr
+++ b/tests/ui-fulldeps/lint-group-plugin-deny-cmdline.stderr
diff --git a/src/test/ui-fulldeps/lint-group-plugin.rs b/tests/ui-fulldeps/lint-group-plugin.rs
index 7b74be7a9..7b74be7a9 100644
--- a/src/test/ui-fulldeps/lint-group-plugin.rs
+++ b/tests/ui-fulldeps/lint-group-plugin.rs
diff --git a/src/test/ui-fulldeps/lint-group-plugin.stderr b/tests/ui-fulldeps/lint-group-plugin.stderr
index 6f429dad0..6f429dad0 100644
--- a/src/test/ui-fulldeps/lint-group-plugin.stderr
+++ b/tests/ui-fulldeps/lint-group-plugin.stderr
diff --git a/src/test/ui-fulldeps/lint-pass-macros.rs b/tests/ui-fulldeps/lint-pass-macros.rs
index b3c2a5427..b3c2a5427 100644
--- a/src/test/ui-fulldeps/lint-pass-macros.rs
+++ b/tests/ui-fulldeps/lint-pass-macros.rs
diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.rs b/tests/ui-fulldeps/lint-plugin-cmdline-allow.rs
index 1cc16e2fd..1cc16e2fd 100644
--- a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.rs
+++ b/tests/ui-fulldeps/lint-plugin-cmdline-allow.rs
diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr b/tests/ui-fulldeps/lint-plugin-cmdline-allow.stderr
index f06703a27..f06703a27 100644
--- a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr
+++ b/tests/ui-fulldeps/lint-plugin-cmdline-allow.stderr
diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-load.rs b/tests/ui-fulldeps/lint-plugin-cmdline-load.rs
index 0bd95dfbd..0bd95dfbd 100644
--- a/src/test/ui-fulldeps/lint-plugin-cmdline-load.rs
+++ b/tests/ui-fulldeps/lint-plugin-cmdline-load.rs
diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr b/tests/ui-fulldeps/lint-plugin-cmdline-load.stderr
index 82679c9e1..82679c9e1 100644
--- a/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr
+++ b/tests/ui-fulldeps/lint-plugin-cmdline-load.stderr
diff --git a/src/test/ui-fulldeps/lint-plugin-deny-attr.rs b/tests/ui-fulldeps/lint-plugin-deny-attr.rs
index 04230a8e8..04230a8e8 100644
--- a/src/test/ui-fulldeps/lint-plugin-deny-attr.rs
+++ b/tests/ui-fulldeps/lint-plugin-deny-attr.rs
diff --git a/src/test/ui-fulldeps/lint-plugin-deny-attr.stderr b/tests/ui-fulldeps/lint-plugin-deny-attr.stderr
index 5e8891bf1..5e8891bf1 100644
--- a/src/test/ui-fulldeps/lint-plugin-deny-attr.stderr
+++ b/tests/ui-fulldeps/lint-plugin-deny-attr.stderr
diff --git a/src/test/ui-fulldeps/lint-plugin-deny-cmdline.rs b/tests/ui-fulldeps/lint-plugin-deny-cmdline.rs
index c460cfd5f..c460cfd5f 100644
--- a/src/test/ui-fulldeps/lint-plugin-deny-cmdline.rs
+++ b/tests/ui-fulldeps/lint-plugin-deny-cmdline.rs
diff --git a/src/test/ui-fulldeps/lint-plugin-deny-cmdline.stderr b/tests/ui-fulldeps/lint-plugin-deny-cmdline.stderr
index d5d6b5352..d5d6b5352 100644
--- a/src/test/ui-fulldeps/lint-plugin-deny-cmdline.stderr
+++ b/tests/ui-fulldeps/lint-plugin-deny-cmdline.stderr
diff --git a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.rs b/tests/ui-fulldeps/lint-plugin-forbid-attrs.rs
index cf31b3ec1..cf31b3ec1 100644
--- a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.rs
+++ b/tests/ui-fulldeps/lint-plugin-forbid-attrs.rs
diff --git a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr b/tests/ui-fulldeps/lint-plugin-forbid-attrs.stderr
index ae34b25cc..ae34b25cc 100644
--- a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr
+++ b/tests/ui-fulldeps/lint-plugin-forbid-attrs.stderr
diff --git a/src/test/ui-fulldeps/lint-plugin-forbid-cmdline.rs b/tests/ui-fulldeps/lint-plugin-forbid-cmdline.rs
index b9d1aa85a..b9d1aa85a 100644
--- a/src/test/ui-fulldeps/lint-plugin-forbid-cmdline.rs
+++ b/tests/ui-fulldeps/lint-plugin-forbid-cmdline.rs
diff --git a/src/test/ui-fulldeps/lint-plugin-forbid-cmdline.stderr b/tests/ui-fulldeps/lint-plugin-forbid-cmdline.stderr
index 491c4d206..491c4d206 100644
--- a/src/test/ui-fulldeps/lint-plugin-forbid-cmdline.stderr
+++ b/tests/ui-fulldeps/lint-plugin-forbid-cmdline.stderr
diff --git a/src/test/ui-fulldeps/lint-plugin.rs b/tests/ui-fulldeps/lint-plugin.rs
index 66057eea6..66057eea6 100644
--- a/src/test/ui-fulldeps/lint-plugin.rs
+++ b/tests/ui-fulldeps/lint-plugin.rs
diff --git a/src/test/ui-fulldeps/lint-plugin.stderr b/tests/ui-fulldeps/lint-plugin.stderr
index dd5d3d72e..dd5d3d72e 100644
--- a/src/test/ui-fulldeps/lint-plugin.stderr
+++ b/tests/ui-fulldeps/lint-plugin.stderr
diff --git a/src/test/ui-fulldeps/lint-tool-cmdline-allow.rs b/tests/ui-fulldeps/lint-tool-cmdline-allow.rs
index 83a8b3e1a..83a8b3e1a 100644
--- a/src/test/ui-fulldeps/lint-tool-cmdline-allow.rs
+++ b/tests/ui-fulldeps/lint-tool-cmdline-allow.rs
diff --git a/src/test/ui-fulldeps/lint-tool-cmdline-allow.stderr b/tests/ui-fulldeps/lint-tool-cmdline-allow.stderr
index b060e3a3e..b060e3a3e 100644
--- a/src/test/ui-fulldeps/lint-tool-cmdline-allow.stderr
+++ b/tests/ui-fulldeps/lint-tool-cmdline-allow.stderr
diff --git a/src/test/ui-fulldeps/lint-tool-test.rs b/tests/ui-fulldeps/lint-tool-test.rs
index f92bcd213..f92bcd213 100644
--- a/src/test/ui-fulldeps/lint-tool-test.rs
+++ b/tests/ui-fulldeps/lint-tool-test.rs
diff --git a/src/test/ui-fulldeps/lint-tool-test.stderr b/tests/ui-fulldeps/lint-tool-test.stderr
index 027cf8f80..027cf8f80 100644
--- a/src/test/ui-fulldeps/lint-tool-test.stderr
+++ b/tests/ui-fulldeps/lint-tool-test.stderr
diff --git a/src/test/ui-fulldeps/lto-syntax-extension.rs b/tests/ui-fulldeps/lto-syntax-extension.rs
index 5964e70f1..5964e70f1 100644
--- a/src/test/ui-fulldeps/lto-syntax-extension.rs
+++ b/tests/ui-fulldeps/lto-syntax-extension.rs
diff --git a/src/test/ui-fulldeps/lto-syntax-extension.stderr b/tests/ui-fulldeps/lto-syntax-extension.stderr
index 555493f32..555493f32 100644
--- a/src/test/ui-fulldeps/lto-syntax-extension.stderr
+++ b/tests/ui-fulldeps/lto-syntax-extension.stderr
diff --git a/src/test/ui-fulldeps/macro-crate-rlib.rs b/tests/ui-fulldeps/macro-crate-rlib.rs
index 1fd514c61..1fd514c61 100644
--- a/src/test/ui-fulldeps/macro-crate-rlib.rs
+++ b/tests/ui-fulldeps/macro-crate-rlib.rs
diff --git a/src/test/ui-fulldeps/macro-crate-rlib.stderr b/tests/ui-fulldeps/macro-crate-rlib.stderr
index 7b31f28a2..9c2b992b7 100644
--- a/src/test/ui-fulldeps/macro-crate-rlib.stderr
+++ b/tests/ui-fulldeps/macro-crate-rlib.stderr
@@ -6,3 +6,4 @@ LL | #![plugin(rlib_crate_test)]
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0457`.
diff --git a/tests/ui-fulldeps/missing-rustc-driver-error.rs b/tests/ui-fulldeps/missing-rustc-driver-error.rs
new file mode 100644
index 000000000..654cd6f6d
--- /dev/null
+++ b/tests/ui-fulldeps/missing-rustc-driver-error.rs
@@ -0,0 +1,11 @@
+// Test that we get the following hint when trying to use a compiler crate without rustc_driver.
+// error-pattern: try adding `extern crate rustc_driver;` at the top level of this crate
+// compile-flags: --emit link
+// The exactly list of required crates depends on the target. as such only test Unix targets.
+// only-unix
+
+#![feature(rustc_private)]
+
+extern crate rustc_serialize;
+
+fn main() {}
diff --git a/tests/ui-fulldeps/missing-rustc-driver-error.stderr b/tests/ui-fulldeps/missing-rustc-driver-error.stderr
new file mode 100644
index 000000000..ad03ba010
--- /dev/null
+++ b/tests/ui-fulldeps/missing-rustc-driver-error.stderr
@@ -0,0 +1,24 @@
+error: crate `rustc_serialize` required to be available in rlib format, but was not found in this form
+   |
+   = help: try adding `extern crate rustc_driver;` at the top level of this crate
+
+error: crate `smallvec` required to be available in rlib format, but was not found in this form
+
+error: crate `thin_vec` required to be available in rlib format, but was not found in this form
+
+error: crate `indexmap` required to be available in rlib format, but was not found in this form
+
+error: crate `hashbrown` required to be available in rlib format, but was not found in this form
+
+error: crate `ahash` required to be available in rlib format, but was not found in this form
+
+error: crate `once_cell` required to be available in rlib format, but was not found in this form
+
+error: crate `getrandom` required to be available in rlib format, but was not found in this form
+
+error: crate `cfg_if` required to be available in rlib format, but was not found in this form
+
+error: crate `libc` required to be available in rlib format, but was not found in this form
+
+error: aborting due to 10 previous errors
+
diff --git a/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs b/tests/ui-fulldeps/mod_dir_path_canonicalized.rs
index bb246de0e..bdfd9628c 100644
--- a/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
+++ b/tests/ui-fulldeps/mod_dir_path_canonicalized.rs
@@ -2,6 +2,7 @@
 // Testing that a librustc_ast can parse modules with canonicalized base path
 // ignore-cross-compile
 // ignore-remote
+// no-remap-src-base: Reading `file!()` (expectedly) fails when enabled.
 
 #![feature(rustc_private)]
 
@@ -10,6 +11,11 @@ extern crate rustc_parse;
 extern crate rustc_session;
 extern crate rustc_span;
 
+// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
+// files.
+#[allow(unused_extern_crates)]
+extern crate rustc_driver;
+
 use rustc_parse::new_parser_from_file;
 use rustc_session::parse::ParseSess;
 use rustc_span::source_map::FilePathMapping;
diff --git a/src/test/ui-fulldeps/mod_dir_simple/compiletest-ignore-dir b/tests/ui-fulldeps/mod_dir_simple/compiletest-ignore-dir
index e69de29bb..e69de29bb 100644
--- a/src/test/ui-fulldeps/mod_dir_simple/compiletest-ignore-dir
+++ b/tests/ui-fulldeps/mod_dir_simple/compiletest-ignore-dir
diff --git a/src/test/ui-fulldeps/mod_dir_simple/test.rs b/tests/ui-fulldeps/mod_dir_simple/test.rs
index 35e26093a..35e26093a 100644
--- a/src/test/ui-fulldeps/mod_dir_simple/test.rs
+++ b/tests/ui-fulldeps/mod_dir_simple/test.rs
diff --git a/src/test/ui-fulldeps/multiple-plugins.rs b/tests/ui-fulldeps/multiple-plugins.rs
index 9af3ebd57..9af3ebd57 100644
--- a/src/test/ui-fulldeps/multiple-plugins.rs
+++ b/tests/ui-fulldeps/multiple-plugins.rs
diff --git a/src/test/ui-fulldeps/multiple-plugins.stderr b/tests/ui-fulldeps/multiple-plugins.stderr
index 878ffabfc..878ffabfc 100644
--- a/src/test/ui-fulldeps/multiple-plugins.stderr
+++ b/tests/ui-fulldeps/multiple-plugins.stderr
diff --git a/src/test/ui-fulldeps/myriad-closures.rs b/tests/ui-fulldeps/myriad-closures.rs
index 310351f50..310351f50 100644
--- a/src/test/ui-fulldeps/myriad-closures.rs
+++ b/tests/ui-fulldeps/myriad-closures.rs
diff --git a/src/test/ui-fulldeps/outlive-expansion-phase.rs b/tests/ui-fulldeps/outlive-expansion-phase.rs
index fb22888d9..fb22888d9 100644
--- a/src/test/ui-fulldeps/outlive-expansion-phase.rs
+++ b/tests/ui-fulldeps/outlive-expansion-phase.rs
diff --git a/src/test/ui-fulldeps/outlive-expansion-phase.stderr b/tests/ui-fulldeps/outlive-expansion-phase.stderr
index e40a08ae7..e40a08ae7 100644
--- a/src/test/ui-fulldeps/outlive-expansion-phase.stderr
+++ b/tests/ui-fulldeps/outlive-expansion-phase.stderr
diff --git a/src/test/ui-fulldeps/pathless-extern-unstable.rs b/tests/ui-fulldeps/pathless-extern-unstable.rs
index 524b0c2f7..524b0c2f7 100644
--- a/src/test/ui-fulldeps/pathless-extern-unstable.rs
+++ b/tests/ui-fulldeps/pathless-extern-unstable.rs
diff --git a/src/test/ui-fulldeps/pathless-extern-unstable.stderr b/tests/ui-fulldeps/pathless-extern-unstable.stderr
index dcc3cddd3..dcc3cddd3 100644
--- a/src/test/ui-fulldeps/pathless-extern-unstable.stderr
+++ b/tests/ui-fulldeps/pathless-extern-unstable.stderr
diff --git a/src/test/ui-fulldeps/plugin-args.rs b/tests/ui-fulldeps/plugin-args.rs
index 488f2b775..488f2b775 100644
--- a/src/test/ui-fulldeps/plugin-args.rs
+++ b/tests/ui-fulldeps/plugin-args.rs
diff --git a/src/test/ui-fulldeps/plugin-args.stderr b/tests/ui-fulldeps/plugin-args.stderr
index 177f33005..177f33005 100644
--- a/src/test/ui-fulldeps/plugin-args.stderr
+++ b/tests/ui-fulldeps/plugin-args.stderr
diff --git a/src/test/ui-fulldeps/plugin-as-extern-crate.rs b/tests/ui-fulldeps/plugin-as-extern-crate.rs
index 4d26e08d8..4d26e08d8 100644
--- a/src/test/ui-fulldeps/plugin-as-extern-crate.rs
+++ b/tests/ui-fulldeps/plugin-as-extern-crate.rs
diff --git a/src/test/ui-fulldeps/pprust-expr-roundtrip.rs b/tests/ui-fulldeps/pprust-expr-roundtrip.rs
index a93ba8747..7a91dcf0d 100644
--- a/src/test/ui-fulldeps/pprust-expr-roundtrip.rs
+++ b/tests/ui-fulldeps/pprust-expr-roundtrip.rs
@@ -27,6 +27,11 @@ extern crate rustc_session;
 extern crate rustc_span;
 extern crate thin_vec;
 
+// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
+// files.
+#[allow(unused_extern_crates)]
+extern crate rustc_driver;
+
 use rustc_ast::mut_visit::{self, visit_clobber, MutVisitor};
 use rustc_ast::ptr::P;
 use rustc_ast::*;
@@ -121,6 +126,7 @@ fn iter_exprs(depth: usize, f: &mut dyn FnMut(P<Expr>)) {
                     g(ExprKind::Closure(Box::new(Closure {
                         binder: ClosureBinder::NotPresent,
                         capture_clause: CaptureBy::Value,
+                        constness: Const::No,
                         asyncness: Async::No,
                         movability: Movability::Movable,
                         fn_decl: decl.clone(),
diff --git a/src/test/ui-fulldeps/regions-mock-tcx.rs b/tests/ui-fulldeps/regions-mock-tcx.rs
index 30e627232..63975ef62 100644
--- a/src/test/ui-fulldeps/regions-mock-tcx.rs
+++ b/tests/ui-fulldeps/regions-mock-tcx.rs
@@ -14,6 +14,11 @@
 extern crate rustc_arena;
 extern crate libc;
 
+// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
+// files.
+#[allow(unused_extern_crates)]
+extern crate rustc_driver;
+
 use TypeStructure::{TypeInt, TypeFunction};
 use AstKind::{ExprInt, ExprVar, ExprLambda};
 use rustc_arena::TypedArena;
diff --git a/src/test/ui-fulldeps/rename-directory.rs b/tests/ui-fulldeps/rename-directory.rs
index 8fc340cb9..8fc340cb9 100644
--- a/src/test/ui-fulldeps/rename-directory.rs
+++ b/tests/ui-fulldeps/rename-directory.rs
diff --git a/tests/ui-fulldeps/rustc_encodable_hygiene.rs b/tests/ui-fulldeps/rustc_encodable_hygiene.rs
new file mode 100644
index 000000000..509a6b1d2
--- /dev/null
+++ b/tests/ui-fulldeps/rustc_encodable_hygiene.rs
@@ -0,0 +1,31 @@
+// run-pass
+
+#![feature(rustc_private)]
+
+extern crate rustc_macros;
+#[allow(dead_code)]
+extern crate rustc_serialize;
+
+// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
+// files.
+#[allow(unused_extern_crates)]
+extern crate rustc_driver;
+
+use rustc_macros::{Decodable, Encodable};
+
+#[derive(Decodable, Encodable, Debug)]
+struct A {
+    a: String,
+}
+
+trait Trait {
+    fn encode(&self);
+}
+
+impl<T> Trait for T {
+    fn encode(&self) {
+        unimplemented!()
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui-fulldeps/session-diagnostic/diagnostic-derive.rs b/tests/ui-fulldeps/session-diagnostic/diagnostic-derive.rs
index cb4cd4665..65d9601e7 100644
--- a/src/test/ui-fulldeps/session-diagnostic/diagnostic-derive.rs
+++ b/tests/ui-fulldeps/session-diagnostic/diagnostic-derive.rs
@@ -683,7 +683,7 @@ struct RawIdentDiagnosticArg {
 #[diag(compiletest_example)]
 struct SubdiagnosticBad {
     #[subdiagnostic(bad)]
-    //~^ ERROR `#[subdiagnostic(bad)]` is not a valid attribute
+    //~^ ERROR `#[subdiagnostic(...)]` is not a valid attribute
     note: Note,
 }
 
@@ -707,7 +707,7 @@ struct SubdiagnosticBadTwice {
 #[diag(compiletest_example)]
 struct SubdiagnosticBadLitStr {
     #[subdiagnostic("bad")]
-    //~^ ERROR `#[subdiagnostic("...")]` is not a valid attribute
+    //~^ ERROR `#[subdiagnostic(...)]` is not a valid attribute
     note: Note,
 }
 
diff --git a/src/test/ui-fulldeps/session-diagnostic/diagnostic-derive.stderr b/tests/ui-fulldeps/session-diagnostic/diagnostic-derive.stderr
index b4c211db4..13e806a43 100644
--- a/src/test/ui-fulldeps/session-diagnostic/diagnostic-derive.stderr
+++ b/tests/ui-fulldeps/session-diagnostic/diagnostic-derive.stderr
@@ -533,11 +533,11 @@ LL | #[label]
    |
    = help: `#[label]` and `#[suggestion]` can only be applied to fields
 
-error: `#[subdiagnostic(bad)]` is not a valid attribute
-  --> $DIR/diagnostic-derive.rs:685:21
+error: `#[subdiagnostic(...)]` is not a valid attribute
+  --> $DIR/diagnostic-derive.rs:685:5
    |
 LL |     #[subdiagnostic(bad)]
-   |                     ^^^
+   |     ^^^^^^^^^^^^^^^^^^^^^
    |
    = help: `eager` is the only supported nested attribute for `subdiagnostic`
 
@@ -546,8 +546,6 @@ error: `#[subdiagnostic = ...]` is not a valid attribute
    |
 LL |     #[subdiagnostic = "bad"]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = help: `eager` is the only supported nested attribute for `subdiagnostic`
 
 error: `#[subdiagnostic(...)]` is not a valid attribute
   --> $DIR/diagnostic-derive.rs:701:5
@@ -557,11 +555,11 @@ LL |     #[subdiagnostic(bad, bad)]
    |
    = help: `eager` is the only supported nested attribute for `subdiagnostic`
 
-error: `#[subdiagnostic("...")]` is not a valid attribute
-  --> $DIR/diagnostic-derive.rs:709:21
+error: `#[subdiagnostic(...)]` is not a valid attribute
+  --> $DIR/diagnostic-derive.rs:709:5
    |
 LL |     #[subdiagnostic("bad")]
-   |                     ^^^^^
+   |     ^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: `eager` is the only supported nested attribute for `subdiagnostic`
 
@@ -660,10 +658,7 @@ LL | #[derive(Diagnostic)]
    = help: normalized in stderr
 note: required by a bound in `DiagnosticBuilder::<'a, G>::set_arg`
   --> $COMPILER_DIR/rustc_errors/src/diagnostic_builder.rs:LL:CC
-   |
-LL |         arg: impl IntoDiagnosticArg,
-   |                   ^^^^^^^^^^^^^^^^^ required by this bound in `DiagnosticBuilder::<'a, G>::set_arg`
-   = note: this error originates in the derive macro `Diagnostic` (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `Diagnostic` which comes from the expansion of the macro `forward` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 83 previous errors
 
diff --git a/src/test/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs b/tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs
index a0a8114e0..a0a8114e0 100644
--- a/src/test/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs
+++ b/tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs
diff --git a/src/test/ui-fulldeps/session-diagnostic/enforce_slug_naming.stderr b/tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.stderr
index dcf4af5df..dcf4af5df 100644
--- a/src/test/ui-fulldeps/session-diagnostic/enforce_slug_naming.stderr
+++ b/tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.stderr
diff --git a/src/test/ui-fulldeps/session-diagnostic/subdiagnostic-derive.rs b/tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive.rs
index 61ac456a6..61ac456a6 100644
--- a/src/test/ui-fulldeps/session-diagnostic/subdiagnostic-derive.rs
+++ b/tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive.rs
diff --git a/src/test/ui-fulldeps/session-diagnostic/subdiagnostic-derive.stderr b/tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive.stderr
index b594fa6cd..b594fa6cd 100644
--- a/src/test/ui-fulldeps/session-diagnostic/subdiagnostic-derive.stderr
+++ b/tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive.stderr
diff --git a/src/test/ui-fulldeps/stdio-from.rs b/tests/ui-fulldeps/stdio-from.rs
index fef9f27fc..fef9f27fc 100644
--- a/src/test/ui-fulldeps/stdio-from.rs
+++ b/tests/ui-fulldeps/stdio-from.rs
diff --git a/src/test/ui-fulldeps/switch-stdout.rs b/tests/ui-fulldeps/switch-stdout.rs
index e9501a809..e9501a809 100644
--- a/src/test/ui-fulldeps/switch-stdout.rs
+++ b/tests/ui-fulldeps/switch-stdout.rs
diff --git a/tests/ui-toml/array_size_threshold/array_size_threshold.rs b/tests/ui-toml/array_size_threshold/array_size_threshold.rs
new file mode 100644
index 000000000..7f623c7a9
--- /dev/null
+++ b/tests/ui-toml/array_size_threshold/array_size_threshold.rs
@@ -0,0 +1,10 @@
+#![allow(unused)]
+#![warn(clippy::large_const_arrays, clippy::large_stack_arrays)]
+
+const ABOVE: [u8; 11] = [0; 11];
+const BELOW: [u8; 10] = [0; 10];
+
+fn main() {
+    let above = [0u8; 11];
+    let below = [0u8; 10];
+}
diff --git a/tests/ui-toml/array_size_threshold/array_size_threshold.stderr b/tests/ui-toml/array_size_threshold/array_size_threshold.stderr
new file mode 100644
index 000000000..ac017b209
--- /dev/null
+++ b/tests/ui-toml/array_size_threshold/array_size_threshold.stderr
@@ -0,0 +1,29 @@
+error: large array defined as const
+  --> $DIR/array_size_threshold.rs:4:1
+   |
+LL | const ABOVE: [u8; 11] = [0; 11];
+   | -----^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | |
+   | help: make this a static item: `static`
+   |
+   = note: `-D clippy::large-const-arrays` implied by `-D warnings`
+
+error: allocating a local array larger than 10 bytes
+  --> $DIR/array_size_threshold.rs:4:25
+   |
+LL | const ABOVE: [u8; 11] = [0; 11];
+   |                         ^^^^^^^
+   |
+   = help: consider allocating on the heap with `vec![0; 11].into_boxed_slice()`
+   = note: `-D clippy::large-stack-arrays` implied by `-D warnings`
+
+error: allocating a local array larger than 10 bytes
+  --> $DIR/array_size_threshold.rs:8:17
+   |
+LL |     let above = [0u8; 11];
+   |                 ^^^^^^^^^
+   |
+   = help: consider allocating on the heap with `vec![0u8; 11].into_boxed_slice()`
+
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui-toml/array_size_threshold/clippy.toml b/tests/ui-toml/array_size_threshold/clippy.toml
new file mode 100644
index 000000000..3f1fe9a12
--- /dev/null
+++ b/tests/ui-toml/array_size_threshold/clippy.toml
@@ -0,0 +1 @@
+array-size-threshold = 10
diff --git a/src/test/ui/abi/abi-sysv64-arg-passing.rs b/tests/ui/abi/abi-sysv64-arg-passing.rs
index c87353b93..c87353b93 100644
--- a/src/test/ui/abi/abi-sysv64-arg-passing.rs
+++ b/tests/ui/abi/abi-sysv64-arg-passing.rs
diff --git a/src/test/ui/abi/abi-sysv64-register-usage.rs b/tests/ui/abi/abi-sysv64-register-usage.rs
index 393306936..393306936 100644
--- a/src/test/ui/abi/abi-sysv64-register-usage.rs
+++ b/tests/ui/abi/abi-sysv64-register-usage.rs
diff --git a/src/test/ui/abi/abi-typo-unstable.rs b/tests/ui/abi/abi-typo-unstable.rs
index 94991a5eb..94991a5eb 100644
--- a/src/test/ui/abi/abi-typo-unstable.rs
+++ b/tests/ui/abi/abi-typo-unstable.rs
diff --git a/src/test/ui/abi/abi-typo-unstable.stderr b/tests/ui/abi/abi-typo-unstable.stderr
index 3b346e002..3b346e002 100644
--- a/src/test/ui/abi/abi-typo-unstable.stderr
+++ b/tests/ui/abi/abi-typo-unstable.stderr
diff --git a/src/test/ui/abi/anon-extern-mod.rs b/tests/ui/abi/anon-extern-mod.rs
index 6c7d60d4c..6c7d60d4c 100644
--- a/src/test/ui/abi/anon-extern-mod.rs
+++ b/tests/ui/abi/anon-extern-mod.rs
diff --git a/src/test/ui/abi/c-stack-as-value.rs b/tests/ui/abi/c-stack-as-value.rs
index 5bece0ba2..5bece0ba2 100644
--- a/src/test/ui/abi/c-stack-as-value.rs
+++ b/tests/ui/abi/c-stack-as-value.rs
diff --git a/src/test/ui/abi/c-stack-returning-int64.rs b/tests/ui/abi/c-stack-returning-int64.rs
index fb3cb2083..fb3cb2083 100644
--- a/src/test/ui/abi/c-stack-returning-int64.rs
+++ b/tests/ui/abi/c-stack-returning-int64.rs
diff --git a/src/test/ui/abi/cabi-int-widening.rs b/tests/ui/abi/cabi-int-widening.rs
index 1dbab2752..1dbab2752 100644
--- a/src/test/ui/abi/cabi-int-widening.rs
+++ b/tests/ui/abi/cabi-int-widening.rs
diff --git a/src/test/ui/abi/cross-crate/anon-extern-mod-cross-crate-2.rs b/tests/ui/abi/cross-crate/anon-extern-mod-cross-crate-2.rs
index 77168be53..77168be53 100644
--- a/src/test/ui/abi/cross-crate/anon-extern-mod-cross-crate-2.rs
+++ b/tests/ui/abi/cross-crate/anon-extern-mod-cross-crate-2.rs
diff --git a/src/test/ui/abi/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs b/tests/ui/abi/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs
index 5cbf8093c..5cbf8093c 100644
--- a/src/test/ui/abi/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs
+++ b/tests/ui/abi/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs
diff --git a/src/test/ui/abi/cross-crate/duplicated-external-mods.rs b/tests/ui/abi/cross-crate/duplicated-external-mods.rs
index 05a279a30..05a279a30 100644
--- a/src/test/ui/abi/cross-crate/duplicated-external-mods.rs
+++ b/tests/ui/abi/cross-crate/duplicated-external-mods.rs
diff --git a/src/test/ui/abi/extern/auxiliary/extern-crosscrate-source.rs b/tests/ui/abi/extern/auxiliary/extern-crosscrate-source.rs
index 9c61518b9..9c61518b9 100644
--- a/src/test/ui/abi/extern/auxiliary/extern-crosscrate-source.rs
+++ b/tests/ui/abi/extern/auxiliary/extern-crosscrate-source.rs
diff --git a/src/test/ui/abi/extern/extern-call-deep.rs b/tests/ui/abi/extern/extern-call-deep.rs
index db5f2ca65..db5f2ca65 100644
--- a/src/test/ui/abi/extern/extern-call-deep.rs
+++ b/tests/ui/abi/extern/extern-call-deep.rs
diff --git a/src/test/ui/abi/extern/extern-call-deep2.rs b/tests/ui/abi/extern/extern-call-deep2.rs
index 60e8db159..60e8db159 100644
--- a/src/test/ui/abi/extern/extern-call-deep2.rs
+++ b/tests/ui/abi/extern/extern-call-deep2.rs
diff --git a/src/test/ui/abi/extern/extern-call-direct.rs b/tests/ui/abi/extern/extern-call-direct.rs
index 19b901d49..19b901d49 100644
--- a/src/test/ui/abi/extern/extern-call-direct.rs
+++ b/tests/ui/abi/extern/extern-call-direct.rs
diff --git a/src/test/ui/abi/extern/extern-call-indirect.rs b/tests/ui/abi/extern/extern-call-indirect.rs
index 886e8f6be..886e8f6be 100644
--- a/src/test/ui/abi/extern/extern-call-indirect.rs
+++ b/tests/ui/abi/extern/extern-call-indirect.rs
diff --git a/src/test/ui/abi/extern/extern-call-scrub.rs b/tests/ui/abi/extern/extern-call-scrub.rs
index ff33cf31a..ff33cf31a 100644
--- a/src/test/ui/abi/extern/extern-call-scrub.rs
+++ b/tests/ui/abi/extern/extern-call-scrub.rs
diff --git a/src/test/ui/abi/extern/extern-crosscrate.rs b/tests/ui/abi/extern/extern-crosscrate.rs
index 123ce20ca..123ce20ca 100644
--- a/src/test/ui/abi/extern/extern-crosscrate.rs
+++ b/tests/ui/abi/extern/extern-crosscrate.rs
diff --git a/src/test/ui/abi/extern/extern-pass-TwoU16s.rs b/tests/ui/abi/extern/extern-pass-TwoU16s.rs
index cff25511c..cff25511c 100644
--- a/src/test/ui/abi/extern/extern-pass-TwoU16s.rs
+++ b/tests/ui/abi/extern/extern-pass-TwoU16s.rs
diff --git a/src/test/ui/abi/extern/extern-pass-TwoU32s.rs b/tests/ui/abi/extern/extern-pass-TwoU32s.rs
index 03a8ecf24..03a8ecf24 100644
--- a/src/test/ui/abi/extern/extern-pass-TwoU32s.rs
+++ b/tests/ui/abi/extern/extern-pass-TwoU32s.rs
diff --git a/src/test/ui/abi/extern/extern-pass-TwoU64s.rs b/tests/ui/abi/extern/extern-pass-TwoU64s.rs
index 8bbc987c8..8bbc987c8 100644
--- a/src/test/ui/abi/extern/extern-pass-TwoU64s.rs
+++ b/tests/ui/abi/extern/extern-pass-TwoU64s.rs
diff --git a/src/test/ui/abi/extern/extern-pass-TwoU8s.rs b/tests/ui/abi/extern/extern-pass-TwoU8s.rs
index 55a53c250..55a53c250 100644
--- a/src/test/ui/abi/extern/extern-pass-TwoU8s.rs
+++ b/tests/ui/abi/extern/extern-pass-TwoU8s.rs
diff --git a/src/test/ui/abi/extern/extern-pass-char.rs b/tests/ui/abi/extern/extern-pass-char.rs
index 2b10d26d1..2b10d26d1 100644
--- a/src/test/ui/abi/extern/extern-pass-char.rs
+++ b/tests/ui/abi/extern/extern-pass-char.rs
diff --git a/src/test/ui/abi/extern/extern-pass-double.rs b/tests/ui/abi/extern/extern-pass-double.rs
index 0b556c99e..0b556c99e 100644
--- a/src/test/ui/abi/extern/extern-pass-double.rs
+++ b/tests/ui/abi/extern/extern-pass-double.rs
diff --git a/src/test/ui/abi/extern/extern-pass-empty.rs b/tests/ui/abi/extern/extern-pass-empty.rs
index ee974f6db..ee974f6db 100644
--- a/src/test/ui/abi/extern/extern-pass-empty.rs
+++ b/tests/ui/abi/extern/extern-pass-empty.rs
diff --git a/src/test/ui/abi/extern/extern-pass-u32.rs b/tests/ui/abi/extern/extern-pass-u32.rs
index c9b8d52cf..c9b8d52cf 100644
--- a/src/test/ui/abi/extern/extern-pass-u32.rs
+++ b/tests/ui/abi/extern/extern-pass-u32.rs
diff --git a/src/test/ui/abi/extern/extern-pass-u64.rs b/tests/ui/abi/extern/extern-pass-u64.rs
index 5103129ab..5103129ab 100644
--- a/src/test/ui/abi/extern/extern-pass-u64.rs
+++ b/tests/ui/abi/extern/extern-pass-u64.rs
diff --git a/src/test/ui/abi/extern/extern-return-TwoU16s.rs b/tests/ui/abi/extern/extern-return-TwoU16s.rs
index 2551c93a7..2551c93a7 100644
--- a/src/test/ui/abi/extern/extern-return-TwoU16s.rs
+++ b/tests/ui/abi/extern/extern-return-TwoU16s.rs
diff --git a/src/test/ui/abi/extern/extern-return-TwoU32s.rs b/tests/ui/abi/extern/extern-return-TwoU32s.rs
index 70a42895d..70a42895d 100644
--- a/src/test/ui/abi/extern/extern-return-TwoU32s.rs
+++ b/tests/ui/abi/extern/extern-return-TwoU32s.rs
diff --git a/src/test/ui/abi/extern/extern-return-TwoU64s.rs b/tests/ui/abi/extern/extern-return-TwoU64s.rs
index dd264fb9c..dd264fb9c 100644
--- a/src/test/ui/abi/extern/extern-return-TwoU64s.rs
+++ b/tests/ui/abi/extern/extern-return-TwoU64s.rs
diff --git a/src/test/ui/abi/extern/extern-return-TwoU8s.rs b/tests/ui/abi/extern/extern-return-TwoU8s.rs
index b60387aed..b60387aed 100644
--- a/src/test/ui/abi/extern/extern-return-TwoU8s.rs
+++ b/tests/ui/abi/extern/extern-return-TwoU8s.rs
diff --git a/src/test/ui/abi/foreign/auxiliary/foreign_lib.rs b/tests/ui/abi/foreign/auxiliary/foreign_lib.rs
index 3c649b778..3c649b778 100644
--- a/src/test/ui/abi/foreign/auxiliary/foreign_lib.rs
+++ b/tests/ui/abi/foreign/auxiliary/foreign_lib.rs
diff --git a/src/test/ui/abi/foreign/foreign-call-no-runtime.rs b/tests/ui/abi/foreign/foreign-call-no-runtime.rs
index d5b90a359..d5b90a359 100644
--- a/src/test/ui/abi/foreign/foreign-call-no-runtime.rs
+++ b/tests/ui/abi/foreign/foreign-call-no-runtime.rs
diff --git a/src/test/ui/abi/foreign/foreign-dupe.rs b/tests/ui/abi/foreign/foreign-dupe.rs
index 3c9f0f583..3c9f0f583 100644
--- a/src/test/ui/abi/foreign/foreign-dupe.rs
+++ b/tests/ui/abi/foreign/foreign-dupe.rs
diff --git a/src/test/ui/abi/foreign/foreign-fn-with-byval.rs b/tests/ui/abi/foreign/foreign-fn-with-byval.rs
index f366b6ee1..f366b6ee1 100644
--- a/src/test/ui/abi/foreign/foreign-fn-with-byval.rs
+++ b/tests/ui/abi/foreign/foreign-fn-with-byval.rs
diff --git a/src/test/ui/abi/foreign/foreign-no-abi.rs b/tests/ui/abi/foreign/foreign-no-abi.rs
index 3f4f70c99..3f4f70c99 100644
--- a/src/test/ui/abi/foreign/foreign-no-abi.rs
+++ b/tests/ui/abi/foreign/foreign-no-abi.rs
diff --git a/src/test/ui/abi/foreign/invoke-external-foreign.rs b/tests/ui/abi/foreign/invoke-external-foreign.rs
index dbd2b4ad8..dbd2b4ad8 100644
--- a/src/test/ui/abi/foreign/invoke-external-foreign.rs
+++ b/tests/ui/abi/foreign/invoke-external-foreign.rs
diff --git a/src/test/ui/abi/homogenous-floats-target-feature-mixup.rs b/tests/ui/abi/homogenous-floats-target-feature-mixup.rs
index d7f5e1921..4600bd090 100644
--- a/src/test/ui/abi/homogenous-floats-target-feature-mixup.rs
+++ b/tests/ui/abi/homogenous-floats-target-feature-mixup.rs
@@ -1,7 +1,7 @@
 // This test check that even if we mixup target feature of function with homogenous floats,
 // the abi is sound and still produce the right answer.
 //
-// This is basically the same test as src/test/ui/simd/target-feature-mixup.rs but for floats and
+// This is basically the same test as tests/ui/simd/target-feature-mixup.rs but for floats and
 // without #[repr(simd)]
 
 // run-pass
diff --git a/src/test/ui/abi/issue-28676.rs b/tests/ui/abi/issue-28676.rs
index 347a84029..347a84029 100644
--- a/src/test/ui/abi/issue-28676.rs
+++ b/tests/ui/abi/issue-28676.rs
diff --git a/src/test/ui/abi/issues/issue-22565-rust-call.rs b/tests/ui/abi/issues/issue-22565-rust-call.rs
index a572666c8..a572666c8 100644
--- a/src/test/ui/abi/issues/issue-22565-rust-call.rs
+++ b/tests/ui/abi/issues/issue-22565-rust-call.rs
diff --git a/src/test/ui/abi/issues/issue-22565-rust-call.stderr b/tests/ui/abi/issues/issue-22565-rust-call.stderr
index 9d205b444..9d205b444 100644
--- a/src/test/ui/abi/issues/issue-22565-rust-call.stderr
+++ b/tests/ui/abi/issues/issue-22565-rust-call.stderr
diff --git a/src/test/ui/abi/issues/issue-62350-sysv-neg-reg-counts.rs b/tests/ui/abi/issues/issue-62350-sysv-neg-reg-counts.rs
index 29b240518..29b240518 100644
--- a/src/test/ui/abi/issues/issue-62350-sysv-neg-reg-counts.rs
+++ b/tests/ui/abi/issues/issue-62350-sysv-neg-reg-counts.rs
diff --git a/src/test/ui/abi/issues/issue-97463-broken-abi-leaked-uninit-data.rs b/tests/ui/abi/issues/issue-97463-broken-abi-leaked-uninit-data.rs
index fba880d4f..fba880d4f 100644
--- a/src/test/ui/abi/issues/issue-97463-broken-abi-leaked-uninit-data.rs
+++ b/tests/ui/abi/issues/issue-97463-broken-abi-leaked-uninit-data.rs
diff --git a/src/test/ui/abi/lib-defaults.rs b/tests/ui/abi/lib-defaults.rs
index cd0b0bb23..cd0b0bb23 100644
--- a/src/test/ui/abi/lib-defaults.rs
+++ b/tests/ui/abi/lib-defaults.rs
diff --git a/src/test/ui/abi/mir/mir_codegen_calls_variadic.rs b/tests/ui/abi/mir/mir_codegen_calls_variadic.rs
index b3392b9c6..b3392b9c6 100644
--- a/src/test/ui/abi/mir/mir_codegen_calls_variadic.rs
+++ b/tests/ui/abi/mir/mir_codegen_calls_variadic.rs
diff --git a/src/test/ui/abi/nullable-pointer-ffi-compat.rs b/tests/ui/abi/nullable-pointer-ffi-compat.rs
index 0647a18c3..0647a18c3 100644
--- a/src/test/ui/abi/nullable-pointer-ffi-compat.rs
+++ b/tests/ui/abi/nullable-pointer-ffi-compat.rs
diff --git a/src/test/ui/abi/numbers-arithmetic/i128-ffi.rs b/tests/ui/abi/numbers-arithmetic/i128-ffi.rs
index 19edf9779..19edf9779 100644
--- a/src/test/ui/abi/numbers-arithmetic/i128-ffi.rs
+++ b/tests/ui/abi/numbers-arithmetic/i128-ffi.rs
diff --git a/src/test/ui/abi/rustcall-generic.rs b/tests/ui/abi/rustcall-generic.rs
index 6eaccc436..6eaccc436 100644
--- a/src/test/ui/abi/rustcall-generic.rs
+++ b/tests/ui/abi/rustcall-generic.rs
diff --git a/src/test/ui/abi/segfault-no-out-of-stack.rs b/tests/ui/abi/segfault-no-out-of-stack.rs
index ab2b30894..ab2b30894 100644
--- a/src/test/ui/abi/segfault-no-out-of-stack.rs
+++ b/tests/ui/abi/segfault-no-out-of-stack.rs
diff --git a/src/test/ui/abi/stack-probes-lto.rs b/tests/ui/abi/stack-probes-lto.rs
index 6d934538f..6d934538f 100644
--- a/src/test/ui/abi/stack-probes-lto.rs
+++ b/tests/ui/abi/stack-probes-lto.rs
diff --git a/src/test/ui/abi/stack-probes.rs b/tests/ui/abi/stack-probes.rs
index e7b91644b..e7b91644b 100644
--- a/src/test/ui/abi/stack-probes.rs
+++ b/tests/ui/abi/stack-probes.rs
diff --git a/src/test/ui/abi/stack-protector.rs b/tests/ui/abi/stack-protector.rs
index 24bd2e219..24bd2e219 100644
--- a/src/test/ui/abi/stack-protector.rs
+++ b/tests/ui/abi/stack-protector.rs
diff --git a/src/test/ui/abi/statics/static-mut-foreign.rs b/tests/ui/abi/statics/static-mut-foreign.rs
index ecd8ee94a..ecd8ee94a 100644
--- a/src/test/ui/abi/statics/static-mut-foreign.rs
+++ b/tests/ui/abi/statics/static-mut-foreign.rs
diff --git a/src/test/ui/abi/struct-enums/struct-return.rs b/tests/ui/abi/struct-enums/struct-return.rs
index 1a7984ea5..1a7984ea5 100644
--- a/src/test/ui/abi/struct-enums/struct-return.rs
+++ b/tests/ui/abi/struct-enums/struct-return.rs
diff --git a/src/test/ui/abi/union/union-c-interop.rs b/tests/ui/abi/union/union-c-interop.rs
index 00f04d5b7..00f04d5b7 100644
--- a/src/test/ui/abi/union/union-c-interop.rs
+++ b/tests/ui/abi/union/union-c-interop.rs
diff --git a/src/test/ui/abi/unsupported.aarch64.stderr b/tests/ui/abi/unsupported.aarch64.stderr
index e86a73ea6..e86a73ea6 100644
--- a/src/test/ui/abi/unsupported.aarch64.stderr
+++ b/tests/ui/abi/unsupported.aarch64.stderr
diff --git a/src/test/ui/abi/unsupported.arm.stderr b/tests/ui/abi/unsupported.arm.stderr
index f7569c8cd..f7569c8cd 100644
--- a/src/test/ui/abi/unsupported.arm.stderr
+++ b/tests/ui/abi/unsupported.arm.stderr
diff --git a/src/test/ui/abi/unsupported.i686.stderr b/tests/ui/abi/unsupported.i686.stderr
index 7ca93516d..7ca93516d 100644
--- a/src/test/ui/abi/unsupported.i686.stderr
+++ b/tests/ui/abi/unsupported.i686.stderr
diff --git a/src/test/ui/abi/unsupported.rs b/tests/ui/abi/unsupported.rs
index 6427a5695..6427a5695 100644
--- a/src/test/ui/abi/unsupported.rs
+++ b/tests/ui/abi/unsupported.rs
diff --git a/src/test/ui/abi/unsupported.x64.stderr b/tests/ui/abi/unsupported.x64.stderr
index 26023a458..26023a458 100644
--- a/src/test/ui/abi/unsupported.x64.stderr
+++ b/tests/ui/abi/unsupported.x64.stderr
diff --git a/src/test/ui/abi/variadic-ffi.rs b/tests/ui/abi/variadic-ffi.rs
index a952ea077..a952ea077 100644
--- a/src/test/ui/abi/variadic-ffi.rs
+++ b/tests/ui/abi/variadic-ffi.rs
diff --git a/src/test/ui/abi/x86stdcall.rs b/tests/ui/abi/x86stdcall.rs
index d1cf1319f..d1cf1319f 100644
--- a/src/test/ui/abi/x86stdcall.rs
+++ b/tests/ui/abi/x86stdcall.rs
diff --git a/src/test/ui/abi/x86stdcall2.rs b/tests/ui/abi/x86stdcall2.rs
index 4d508ecb2..4d508ecb2 100644
--- a/src/test/ui/abi/x86stdcall2.rs
+++ b/tests/ui/abi/x86stdcall2.rs
diff --git a/src/test/ui/alias-uninit-value.rs b/tests/ui/alias-uninit-value.rs
index 932c93245..932c93245 100644
--- a/src/test/ui/alias-uninit-value.rs
+++ b/tests/ui/alias-uninit-value.rs
diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs b/tests/ui/alloc-error/alloc-error-handler-bad-signature-1.rs
index cd06423e3..cd06423e3 100644
--- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs
+++ b/tests/ui/alloc-error/alloc-error-handler-bad-signature-1.rs
diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr b/tests/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr
index dd3665f22..59192a1ec 100644
--- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr
+++ b/tests/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr
@@ -3,10 +3,7 @@ error[E0308]: mismatched types
    |
 LL |    #[alloc_error_handler]
    |    ---------------------- in this procedural macro expansion
-LL |    fn oom(
-   |  __^
-   | | _|
-   | ||
+LL | // fn oom(
 LL | ||     info: &Layout,
 LL | || ) -> ()
    | ||_______- arguments to this function are incorrect
@@ -29,10 +26,7 @@ error[E0308]: mismatched types
    |
 LL |    #[alloc_error_handler]
    |    ---------------------- in this procedural macro expansion
-LL |    fn oom(
-   |  __^
-   | | _|
-   | ||
+LL | // fn oom(
 LL | ||     info: &Layout,
 LL | || ) -> ()
    | ||_______^ expected `!`, found `()`
diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs b/tests/ui/alloc-error/alloc-error-handler-bad-signature-2.rs
index 4f76257fc..4f76257fc 100644
--- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs
+++ b/tests/ui/alloc-error/alloc-error-handler-bad-signature-2.rs
diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr b/tests/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr
index adb652fe6..7d23c2fc0 100644
--- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr
+++ b/tests/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr
@@ -3,10 +3,7 @@ error[E0308]: mismatched types
    |
 LL |    #[alloc_error_handler]
    |    ---------------------- in this procedural macro expansion
-LL |    fn oom(
-   |  __^
-   | | _|
-   | ||
+LL | // fn oom(
 LL | ||     info: Layout,
 LL | || ) {
    | ||_- arguments to this function are incorrect
@@ -17,9 +14,6 @@ LL | |  }
    = note: struct `core::alloc::Layout` and struct `Layout` have similar names, but are actually distinct types
 note: struct `core::alloc::Layout` is defined in crate `core`
   --> $SRC_DIR/core/src/alloc/layout.rs:LL:COL
-   |
-LL | pub struct Layout {
-   | ^^^^^^^^^^^^^^^^^
 note: struct `Layout` is defined in the current crate
   --> $DIR/alloc-error-handler-bad-signature-2.rs:7:1
    |
@@ -39,10 +33,7 @@ error[E0308]: mismatched types
    |
 LL |    #[alloc_error_handler]
    |    ---------------------- in this procedural macro expansion
-LL |    fn oom(
-   |  __^
-   | | _|
-   | ||
+LL | // fn oom(
 LL | ||     info: Layout,
 LL | || ) {
    | ||_^ expected `!`, found `()`
diff --git a/tests/ui/alloc-error/alloc-error-handler-bad-signature-3.rs b/tests/ui/alloc-error/alloc-error-handler-bad-signature-3.rs
new file mode 100644
index 000000000..ea9ad39a7
--- /dev/null
+++ b/tests/ui/alloc-error/alloc-error-handler-bad-signature-3.rs
@@ -0,0 +1,15 @@
+// compile-flags:-C panic=abort
+
+#![feature(alloc_error_handler)]
+#![no_std]
+#![no_main]
+
+struct Layout;
+
+#[alloc_error_handler]
+fn oom() -> ! { //~ ERROR function takes 0 arguments but 1 argument was supplied
+    loop {}
+}
+
+#[panic_handler]
+fn panic(_: &core::panic::PanicInfo) -> ! { loop {} }
diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr b/tests/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr
index 77ea8ef05..77ea8ef05 100644
--- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr
+++ b/tests/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr
diff --git a/src/test/ui/alloc-error/default-alloc-error-hook.rs b/tests/ui/alloc-error/default-alloc-error-hook.rs
index 8be09500f..8be09500f 100644
--- a/src/test/ui/alloc-error/default-alloc-error-hook.rs
+++ b/tests/ui/alloc-error/default-alloc-error-hook.rs
diff --git a/src/test/ui/allocator/allocator-args.rs b/tests/ui/allocator/allocator-args.rs
index 1033f947c..1033f947c 100644
--- a/src/test/ui/allocator/allocator-args.rs
+++ b/tests/ui/allocator/allocator-args.rs
diff --git a/src/test/ui/allocator/allocator-args.stderr b/tests/ui/allocator/allocator-args.stderr
index dfff2a7e7..dfff2a7e7 100644
--- a/src/test/ui/allocator/allocator-args.stderr
+++ b/tests/ui/allocator/allocator-args.stderr
diff --git a/src/test/ui/allocator/auxiliary/custom-as-global.rs b/tests/ui/allocator/auxiliary/custom-as-global.rs
index a5e96e775..a5e96e775 100644
--- a/src/test/ui/allocator/auxiliary/custom-as-global.rs
+++ b/tests/ui/allocator/auxiliary/custom-as-global.rs
diff --git a/src/test/ui/allocator/auxiliary/custom.rs b/tests/ui/allocator/auxiliary/custom.rs
index b0ec9ab09..b0ec9ab09 100644
--- a/src/test/ui/allocator/auxiliary/custom.rs
+++ b/tests/ui/allocator/auxiliary/custom.rs
diff --git a/src/test/ui/allocator/auxiliary/helper.rs b/tests/ui/allocator/auxiliary/helper.rs
index 008fb3501..008fb3501 100644
--- a/src/test/ui/allocator/auxiliary/helper.rs
+++ b/tests/ui/allocator/auxiliary/helper.rs
diff --git a/src/test/ui/allocator/auxiliary/system-allocator.rs b/tests/ui/allocator/auxiliary/system-allocator.rs
index 97b86bbc9..97b86bbc9 100644
--- a/src/test/ui/allocator/auxiliary/system-allocator.rs
+++ b/tests/ui/allocator/auxiliary/system-allocator.rs
diff --git a/src/test/ui/allocator/auxiliary/system-allocator2.rs b/tests/ui/allocator/auxiliary/system-allocator2.rs
index 97b86bbc9..97b86bbc9 100644
--- a/src/test/ui/allocator/auxiliary/system-allocator2.rs
+++ b/tests/ui/allocator/auxiliary/system-allocator2.rs
diff --git a/src/test/ui/allocator/custom-in-block.rs b/tests/ui/allocator/custom-in-block.rs
index 12813a1fc..12813a1fc 100644
--- a/src/test/ui/allocator/custom-in-block.rs
+++ b/tests/ui/allocator/custom-in-block.rs
diff --git a/src/test/ui/allocator/custom-in-submodule.rs b/tests/ui/allocator/custom-in-submodule.rs
index ea341b1ac..ea341b1ac 100644
--- a/src/test/ui/allocator/custom-in-submodule.rs
+++ b/tests/ui/allocator/custom-in-submodule.rs
diff --git a/src/test/ui/allocator/custom.rs b/tests/ui/allocator/custom.rs
index 10cbc23c4..10cbc23c4 100644
--- a/src/test/ui/allocator/custom.rs
+++ b/tests/ui/allocator/custom.rs
diff --git a/src/test/ui/allocator/function-allocator.rs b/tests/ui/allocator/function-allocator.rs
index d53f6e9b7..d53f6e9b7 100644
--- a/src/test/ui/allocator/function-allocator.rs
+++ b/tests/ui/allocator/function-allocator.rs
diff --git a/src/test/ui/allocator/function-allocator.stderr b/tests/ui/allocator/function-allocator.stderr
index 5e47b0f0c..5e47b0f0c 100644
--- a/src/test/ui/allocator/function-allocator.stderr
+++ b/tests/ui/allocator/function-allocator.stderr
diff --git a/src/test/ui/allocator/hygiene.rs b/tests/ui/allocator/hygiene.rs
index 9bd8406a2..9bd8406a2 100644
--- a/src/test/ui/allocator/hygiene.rs
+++ b/tests/ui/allocator/hygiene.rs
diff --git a/tests/ui/allocator/no_std-alloc-error-handler-custom.rs b/tests/ui/allocator/no_std-alloc-error-handler-custom.rs
new file mode 100644
index 000000000..289262433
--- /dev/null
+++ b/tests/ui/allocator/no_std-alloc-error-handler-custom.rs
@@ -0,0 +1,84 @@
+// run-pass
+// ignore-android no libc
+// ignore-emscripten no libc
+// ignore-sgx no libc
+// ignore-wasm32 no libc
+// only-linux
+// compile-flags:-C panic=abort
+// aux-build:helper.rs
+
+#![feature(rustc_private, lang_items)]
+#![feature(alloc_error_handler)]
+#![no_std]
+#![no_main]
+
+extern crate alloc;
+extern crate libc;
+
+// ARM targets need these symbols
+#[no_mangle]
+pub fn __aeabi_unwind_cpp_pr0() {}
+
+#[no_mangle]
+pub fn __aeabi_unwind_cpp_pr1() {}
+
+use alloc::boxed::Box;
+use alloc::string::ToString;
+use core::alloc::{GlobalAlloc, Layout};
+use core::ptr::null_mut;
+
+extern crate helper;
+
+struct MyAllocator;
+
+#[alloc_error_handler]
+fn my_oom(layout: Layout) -> ! {
+    use alloc::fmt::write;
+    unsafe {
+        let size = layout.size();
+        let mut s = alloc::string::String::new();
+        write(&mut s, format_args!("My OOM: failed to allocate {} bytes!\n", size)).unwrap();
+        libc::write(libc::STDERR_FILENO, s.as_ptr() as *const _, s.len());
+        libc::exit(0)
+    }
+}
+
+unsafe impl GlobalAlloc for MyAllocator {
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+        if layout.size() < 4096 { libc::malloc(layout.size()) as _ } else { null_mut() }
+    }
+    unsafe fn dealloc(&self, _ptr: *mut u8, _layout: Layout) {}
+}
+
+#[global_allocator]
+static A: MyAllocator = MyAllocator;
+
+#[panic_handler]
+fn panic(panic_info: &core::panic::PanicInfo) -> ! {
+    unsafe {
+        let s = panic_info.to_string();
+        const PSTR: &str = "panic occurred: ";
+        const CR: &str = "\n";
+        libc::write(libc::STDERR_FILENO, PSTR.as_ptr() as *const _, PSTR.len());
+        libc::write(libc::STDERR_FILENO, s.as_ptr() as *const _, s.len());
+        libc::write(libc::STDERR_FILENO, CR.as_ptr() as *const _, CR.len());
+        libc::exit(1)
+    }
+}
+
+// Because we are compiling this code with `-C panic=abort`, this wouldn't normally be needed.
+// However, `core` and `alloc` are both compiled with `-C panic=unwind`, which means that functions
+// in these libraries will refer to `rust_eh_personality` if LLVM can not *prove* the contents won't
+// unwind. So, for this test case we will define the symbol.
+#[lang = "eh_personality"]
+extern "C" fn rust_eh_personality() {}
+
+#[derive(Default, Debug)]
+struct Page(#[allow(unused_tuple_struct_fields)] [[u64; 32]; 16]);
+
+#[no_mangle]
+fn main(_argc: i32, _argv: *const *const u8) -> isize {
+    let zero = Box::<Page>::new(Default::default());
+    helper::work_with(&zero);
+    1
+}
diff --git a/tests/ui/allocator/no_std-alloc-error-handler-default.rs b/tests/ui/allocator/no_std-alloc-error-handler-default.rs
new file mode 100644
index 000000000..56409e713
--- /dev/null
+++ b/tests/ui/allocator/no_std-alloc-error-handler-default.rs
@@ -0,0 +1,71 @@
+// run-pass
+// ignore-android no libc
+// ignore-emscripten no libc
+// ignore-sgx no libc
+// ignore-wasm32 no libc
+// only-linux
+// compile-flags:-C panic=abort
+// aux-build:helper.rs
+
+#![feature(rustc_private, lang_items)]
+#![no_std]
+#![no_main]
+
+extern crate alloc;
+extern crate libc;
+
+// ARM targets need these symbols
+#[no_mangle]
+pub fn __aeabi_unwind_cpp_pr0() {}
+
+#[no_mangle]
+pub fn __aeabi_unwind_cpp_pr1() {}
+
+use alloc::boxed::Box;
+use alloc::string::ToString;
+use core::alloc::{GlobalAlloc, Layout};
+use core::ptr::null_mut;
+
+extern crate helper;
+
+struct MyAllocator;
+
+unsafe impl GlobalAlloc for MyAllocator {
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+        if layout.size() < 4096 { libc::malloc(layout.size()) as _ } else { null_mut() }
+    }
+    unsafe fn dealloc(&self, _ptr: *mut u8, _layout: Layout) {}
+}
+
+#[global_allocator]
+static A: MyAllocator = MyAllocator;
+
+#[panic_handler]
+fn panic(panic_info: &core::panic::PanicInfo) -> ! {
+    unsafe {
+        let s = panic_info.to_string();
+        const PSTR: &str = "panic occurred: ";
+        const CR: &str = "\n";
+        libc::write(libc::STDERR_FILENO, PSTR.as_ptr() as *const _, PSTR.len());
+        libc::write(libc::STDERR_FILENO, s.as_ptr() as *const _, s.len());
+        libc::write(libc::STDERR_FILENO, CR.as_ptr() as *const _, CR.len());
+        libc::exit(0)
+    }
+}
+
+// Because we are compiling this code with `-C panic=abort`, this wouldn't normally be needed.
+// However, `core` and `alloc` are both compiled with `-C panic=unwind`, which means that functions
+// in these libraries will refer to `rust_eh_personality` if LLVM can not *prove* the contents won't
+// unwind. So, for this test case we will define the symbol.
+#[lang = "eh_personality"]
+extern "C" fn rust_eh_personality() {}
+
+#[derive(Default, Debug)]
+struct Page(#[allow(unused_tuple_struct_fields)] [[u64; 32]; 16]);
+
+#[no_mangle]
+fn main(_argc: i32, _argv: *const *const u8) -> isize {
+    let zero = Box::<Page>::new(Default::default());
+    helper::work_with(&zero);
+    1
+}
diff --git a/src/test/ui/allocator/not-an-allocator.rs b/tests/ui/allocator/not-an-allocator.rs
index 4a538d4d0..4a538d4d0 100644
--- a/src/test/ui/allocator/not-an-allocator.rs
+++ b/tests/ui/allocator/not-an-allocator.rs
diff --git a/src/test/ui/allocator/not-an-allocator.stderr b/tests/ui/allocator/not-an-allocator.stderr
index 62bb0679f..62bb0679f 100644
--- a/src/test/ui/allocator/not-an-allocator.stderr
+++ b/tests/ui/allocator/not-an-allocator.stderr
diff --git a/src/test/ui/allocator/object-safe.rs b/tests/ui/allocator/object-safe.rs
index fae7ab7fe..fae7ab7fe 100644
--- a/src/test/ui/allocator/object-safe.rs
+++ b/tests/ui/allocator/object-safe.rs
diff --git a/src/test/ui/allocator/two-allocators.rs b/tests/ui/allocator/two-allocators.rs
index aa1291e77..aa1291e77 100644
--- a/src/test/ui/allocator/two-allocators.rs
+++ b/tests/ui/allocator/two-allocators.rs
diff --git a/src/test/ui/allocator/two-allocators.stderr b/tests/ui/allocator/two-allocators.stderr
index 7a914c2a3..7a914c2a3 100644
--- a/src/test/ui/allocator/two-allocators.stderr
+++ b/tests/ui/allocator/two-allocators.stderr
diff --git a/src/test/ui/allocator/two-allocators2.rs b/tests/ui/allocator/two-allocators2.rs
index 6dfefe19c..6dfefe19c 100644
--- a/src/test/ui/allocator/two-allocators2.rs
+++ b/tests/ui/allocator/two-allocators2.rs
diff --git a/src/test/ui/allocator/two-allocators2.stderr b/tests/ui/allocator/two-allocators2.stderr
index b1fb4421e..b1fb4421e 100644
--- a/src/test/ui/allocator/two-allocators2.stderr
+++ b/tests/ui/allocator/two-allocators2.stderr
diff --git a/src/test/ui/allocator/two-allocators3.rs b/tests/ui/allocator/two-allocators3.rs
index 31dea2d44..31dea2d44 100644
--- a/src/test/ui/allocator/two-allocators3.rs
+++ b/tests/ui/allocator/two-allocators3.rs
diff --git a/src/test/ui/allocator/two-allocators3.stderr b/tests/ui/allocator/two-allocators3.stderr
index a3079113d..a3079113d 100644
--- a/src/test/ui/allocator/two-allocators3.stderr
+++ b/tests/ui/allocator/two-allocators3.stderr
diff --git a/src/test/ui/allocator/xcrate-use.rs b/tests/ui/allocator/xcrate-use.rs
index edd4df75e..edd4df75e 100644
--- a/src/test/ui/allocator/xcrate-use.rs
+++ b/tests/ui/allocator/xcrate-use.rs
diff --git a/src/test/ui/allocator/xcrate-use2.rs b/tests/ui/allocator/xcrate-use2.rs
index d8478fb5e..d8478fb5e 100644
--- a/src/test/ui/allocator/xcrate-use2.rs
+++ b/tests/ui/allocator/xcrate-use2.rs
diff --git a/src/test/ui/annotate-snippet/auxiliary/multispan.rs b/tests/ui/annotate-snippet/auxiliary/multispan.rs
index c05d15643..c05d15643 100644
--- a/src/test/ui/annotate-snippet/auxiliary/multispan.rs
+++ b/tests/ui/annotate-snippet/auxiliary/multispan.rs
diff --git a/src/test/ui/annotate-snippet/missing-type.rs b/tests/ui/annotate-snippet/missing-type.rs
index b0d8b5fba..b0d8b5fba 100644
--- a/src/test/ui/annotate-snippet/missing-type.rs
+++ b/tests/ui/annotate-snippet/missing-type.rs
diff --git a/src/test/ui/annotate-snippet/missing-type.stderr b/tests/ui/annotate-snippet/missing-type.stderr
index c16f022a7..c16f022a7 100644
--- a/src/test/ui/annotate-snippet/missing-type.stderr
+++ b/tests/ui/annotate-snippet/missing-type.stderr
diff --git a/src/test/ui/annotate-snippet/multispan.rs b/tests/ui/annotate-snippet/multispan.rs
index 69d7e1a9d..69d7e1a9d 100644
--- a/src/test/ui/annotate-snippet/multispan.rs
+++ b/tests/ui/annotate-snippet/multispan.rs
diff --git a/src/test/ui/annotate-snippet/multispan.stderr b/tests/ui/annotate-snippet/multispan.stderr
index baed54c59..baed54c59 100644
--- a/src/test/ui/annotate-snippet/multispan.stderr
+++ b/tests/ui/annotate-snippet/multispan.stderr
diff --git a/src/test/ui/anon-params/anon-params-denied-2018.rs b/tests/ui/anon-params/anon-params-denied-2018.rs
index 95533cf3d..95533cf3d 100644
--- a/src/test/ui/anon-params/anon-params-denied-2018.rs
+++ b/tests/ui/anon-params/anon-params-denied-2018.rs
diff --git a/src/test/ui/anon-params/anon-params-denied-2018.stderr b/tests/ui/anon-params/anon-params-denied-2018.stderr
index bb60c898e..bb60c898e 100644
--- a/src/test/ui/anon-params/anon-params-denied-2018.stderr
+++ b/tests/ui/anon-params/anon-params-denied-2018.stderr
diff --git a/src/test/ui/anon-params/anon-params-deprecated.fixed b/tests/ui/anon-params/anon-params-deprecated.fixed
index c09e20770..c09e20770 100644
--- a/src/test/ui/anon-params/anon-params-deprecated.fixed
+++ b/tests/ui/anon-params/anon-params-deprecated.fixed
diff --git a/src/test/ui/anon-params/anon-params-deprecated.rs b/tests/ui/anon-params/anon-params-deprecated.rs
index 6f7385da0..6f7385da0 100644
--- a/src/test/ui/anon-params/anon-params-deprecated.rs
+++ b/tests/ui/anon-params/anon-params-deprecated.rs
diff --git a/src/test/ui/anon-params/anon-params-deprecated.stderr b/tests/ui/anon-params/anon-params-deprecated.stderr
index 691e2c795..691e2c795 100644
--- a/src/test/ui/anon-params/anon-params-deprecated.stderr
+++ b/tests/ui/anon-params/anon-params-deprecated.stderr
diff --git a/src/test/ui/anon-params/anon-params-edition-hygiene.rs b/tests/ui/anon-params/anon-params-edition-hygiene.rs
index 6936205f8..6936205f8 100644
--- a/src/test/ui/anon-params/anon-params-edition-hygiene.rs
+++ b/tests/ui/anon-params/anon-params-edition-hygiene.rs
diff --git a/src/test/ui/anon-params/auxiliary/anon-params-edition-hygiene.rs b/tests/ui/anon-params/auxiliary/anon-params-edition-hygiene.rs
index aa4221bec..aa4221bec 100644
--- a/src/test/ui/anon-params/auxiliary/anon-params-edition-hygiene.rs
+++ b/tests/ui/anon-params/auxiliary/anon-params-edition-hygiene.rs
diff --git a/src/test/ui/anonymous-higher-ranked-lifetime.rs b/tests/ui/anonymous-higher-ranked-lifetime.rs
index 898fe22fa..898fe22fa 100644
--- a/src/test/ui/anonymous-higher-ranked-lifetime.rs
+++ b/tests/ui/anonymous-higher-ranked-lifetime.rs
diff --git a/src/test/ui/anonymous-higher-ranked-lifetime.stderr b/tests/ui/anonymous-higher-ranked-lifetime.stderr
index bf5f642ca..c023d1b15 100644
--- a/src/test/ui/anonymous-higher-ranked-lifetime.stderr
+++ b/tests/ui/anonymous-higher-ranked-lifetime.stderr
@@ -13,6 +13,10 @@ note: required by a bound in `f1`
    |
 LL | fn f1<F>(_: F) where F: Fn(&(), &()) {}
    |                         ^^^^^^^^^^^^ required by this bound in `f1`
+help: consider borrowing the argument
+   |
+LL |     f1(|_: &(), _: &()| {});
+   |            +       +
 
 error[E0631]: type mismatch in closure arguments
   --> $DIR/anonymous-higher-ranked-lifetime.rs:3:5
@@ -29,6 +33,10 @@ note: required by a bound in `f2`
    |
 LL | fn f2<F>(_: F) where F: for<'a> Fn(&'a (), &()) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `f2`
+help: consider borrowing the argument
+   |
+LL |     f2(|_: &(), _: &()| {});
+   |            +       +
 
 error[E0631]: type mismatch in closure arguments
   --> $DIR/anonymous-higher-ranked-lifetime.rs:4:5
@@ -45,6 +53,10 @@ note: required by a bound in `f3`
    |
 LL | fn f3<'a, F>(_: F) where F: Fn(&'a (), &()) {}
    |                             ^^^^^^^^^^^^^^^ required by this bound in `f3`
+help: consider borrowing the argument
+   |
+LL |     f3(|_: &(), _: &()| {});
+   |            +       +
 
 error[E0631]: type mismatch in closure arguments
   --> $DIR/anonymous-higher-ranked-lifetime.rs:5:5
@@ -61,6 +73,10 @@ note: required by a bound in `f4`
    |
 LL | fn f4<F>(_: F) where F: for<'r> Fn(&(), &'r ()) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `f4`
+help: consider borrowing the argument
+   |
+LL |     f4(|_: &(), _: &()| {});
+   |            +       +
 
 error[E0631]: type mismatch in closure arguments
   --> $DIR/anonymous-higher-ranked-lifetime.rs:6:5
@@ -77,6 +93,10 @@ note: required by a bound in `f5`
    |
 LL | fn f5<F>(_: F) where F: for<'r> Fn(&'r (), &'r ()) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `f5`
+help: consider borrowing the argument
+   |
+LL |     f5(|_: &(), _: &()| {});
+   |            +       +
 
 error[E0631]: type mismatch in closure arguments
   --> $DIR/anonymous-higher-ranked-lifetime.rs:7:5
@@ -93,6 +113,10 @@ note: required by a bound in `g1`
    |
 LL | fn g1<F>(_: F) where F: Fn(&(), Box<dyn Fn(&())>) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `g1`
+help: consider borrowing the argument
+   |
+LL |     g1(|_: &(), _: ()| {});
+   |            +
 
 error[E0631]: type mismatch in closure arguments
   --> $DIR/anonymous-higher-ranked-lifetime.rs:8:5
@@ -109,6 +133,10 @@ note: required by a bound in `g2`
    |
 LL | fn g2<F>(_: F) where F: Fn(&(), fn(&())) {}
    |                         ^^^^^^^^^^^^^^^^ required by this bound in `g2`
+help: consider borrowing the argument
+   |
+LL |     g2(|_: &(), _: ()| {});
+   |            +
 
 error[E0631]: type mismatch in closure arguments
   --> $DIR/anonymous-higher-ranked-lifetime.rs:9:5
@@ -125,6 +153,10 @@ note: required by a bound in `g3`
    |
 LL | fn g3<F>(_: F) where F: for<'s> Fn(&'s (), Box<dyn Fn(&())>) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `g3`
+help: consider borrowing the argument
+   |
+LL |     g3(|_: &(), _: ()| {});
+   |            +
 
 error[E0631]: type mismatch in closure arguments
   --> $DIR/anonymous-higher-ranked-lifetime.rs:10:5
@@ -141,6 +173,10 @@ note: required by a bound in `g4`
    |
 LL | fn g4<F>(_: F) where F: Fn(&(), for<'r> fn(&'r ())) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `g4`
+help: consider borrowing the argument
+   |
+LL |     g4(|_: &(), _: ()| {});
+   |            +
 
 error[E0631]: type mismatch in closure arguments
   --> $DIR/anonymous-higher-ranked-lifetime.rs:11:5
@@ -157,6 +193,10 @@ note: required by a bound in `h1`
    |
 LL | fn h1<F>(_: F) where F: Fn(&(), Box<dyn Fn(&())>, &(), fn(&(), &())) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `h1`
+help: consider borrowing the argument
+   |
+LL |     h1(|_: &(), _: (), _: &(), _: ()| {});
+   |            +              +
 
 error[E0631]: type mismatch in closure arguments
   --> $DIR/anonymous-higher-ranked-lifetime.rs:12:5
@@ -173,6 +213,10 @@ note: required by a bound in `h2`
    |
 LL | fn h2<F>(_: F) where F: for<'t0> Fn(&(), Box<dyn Fn(&())>, &'t0 (), fn(&(), &())) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `h2`
+help: consider borrowing the argument
+   |
+LL |     h2(|_: &(), _: (), _: &(), _: ()| {});
+   |            +              +
 
 error: aborting due to 11 previous errors
 
diff --git a/tests/ui/argument-suggestions/basic.rs b/tests/ui/argument-suggestions/basic.rs
new file mode 100644
index 000000000..961e7a50e
--- /dev/null
+++ b/tests/ui/argument-suggestions/basic.rs
@@ -0,0 +1,28 @@
+// Some basic "obvious" cases for the heuristic error messages added for #65853
+// One for each of the detected cases
+
+enum E { X, Y }
+enum F { X2, Y2 }
+struct G {}
+struct H {}
+struct X {}
+struct Y {}
+struct Z {}
+
+
+fn invalid(_i: u32) {}
+fn extra() {}
+fn missing(_i: u32) {}
+fn swapped(_i: u32, _s: &str) {}
+fn permuted(_x: X, _y: Y, _z: Z) {}
+
+fn main() {
+    invalid(1.0); //~ ERROR mismatched types
+    extra(""); //~ ERROR function takes
+    missing(); //~ ERROR function takes
+    swapped("", 1); //~ ERROR arguments to this function are incorrect
+    permuted(Y {}, Z {}, X {}); //~ ERROR arguments to this function are incorrect
+
+    let closure = |x| x;
+    closure(); //~ ERROR function takes
+}
diff --git a/src/test/ui/argument-suggestions/basic.stderr b/tests/ui/argument-suggestions/basic.stderr
index b118ce1bd..062b37688 100644
--- a/src/test/ui/argument-suggestions/basic.stderr
+++ b/tests/ui/argument-suggestions/basic.stderr
@@ -94,8 +94,8 @@ LL |     let closure = |x| x;
    |                   ^^^
 help: provide the argument
    |
-LL |     closure(/* value */);
-   |            ~~~~~~~~~~~~~
+LL |     closure(/* x */);
+   |            ~~~~~~~~~
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/argument-suggestions/complex.rs b/tests/ui/argument-suggestions/complex.rs
index 384cdca7e..384cdca7e 100644
--- a/src/test/ui/argument-suggestions/complex.rs
+++ b/tests/ui/argument-suggestions/complex.rs
diff --git a/src/test/ui/argument-suggestions/complex.stderr b/tests/ui/argument-suggestions/complex.stderr
index 205a85298..205a85298 100644
--- a/src/test/ui/argument-suggestions/complex.stderr
+++ b/tests/ui/argument-suggestions/complex.stderr
diff --git a/tests/ui/argument-suggestions/display-is-suggestable.rs b/tests/ui/argument-suggestions/display-is-suggestable.rs
new file mode 100644
index 000000000..acb61f543
--- /dev/null
+++ b/tests/ui/argument-suggestions/display-is-suggestable.rs
@@ -0,0 +1,8 @@
+use std::fmt::Display;
+
+fn foo(x: &(dyn Display + Send)) {}
+
+fn main() {
+    foo();
+    //~^ ERROR function takes 1 argument but 0 arguments were supplied
+}
diff --git a/tests/ui/argument-suggestions/display-is-suggestable.stderr b/tests/ui/argument-suggestions/display-is-suggestable.stderr
new file mode 100644
index 000000000..edd72b53e
--- /dev/null
+++ b/tests/ui/argument-suggestions/display-is-suggestable.stderr
@@ -0,0 +1,19 @@
+error[E0061]: this function takes 1 argument but 0 arguments were supplied
+  --> $DIR/display-is-suggestable.rs:6:5
+   |
+LL |     foo();
+   |     ^^^-- an argument of type `&dyn std::fmt::Display + Send` is missing
+   |
+note: function defined here
+  --> $DIR/display-is-suggestable.rs:3:4
+   |
+LL | fn foo(x: &(dyn Display + Send)) {}
+   |    ^^^ ------------------------
+help: provide the argument
+   |
+LL |     foo(/* &dyn std::fmt::Display + Send */);
+   |        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0061`.
diff --git a/tests/ui/argument-suggestions/exotic-calls.rs b/tests/ui/argument-suggestions/exotic-calls.rs
new file mode 100644
index 000000000..569a39a2b
--- /dev/null
+++ b/tests/ui/argument-suggestions/exotic-calls.rs
@@ -0,0 +1,26 @@
+fn foo<T: Fn()>(t: T) {
+    t(1i32);
+    //~^ ERROR function takes 0 arguments but 1 argument was supplied
+}
+
+fn bar(t: impl Fn()) {
+    t(1i32);
+    //~^ ERROR function takes 0 arguments but 1 argument was supplied
+}
+
+fn baz() -> impl Fn() {
+    || {}
+}
+
+fn baz2() {
+    baz()(1i32)
+    //~^ ERROR function takes 0 arguments but 1 argument was supplied
+}
+
+fn qux() {
+    let x = || {};
+    x(1i32);
+    //~^ ERROR function takes 0 arguments but 1 argument was supplied
+}
+
+fn main() {}
diff --git a/src/test/ui/argument-suggestions/exotic-calls.stderr b/tests/ui/argument-suggestions/exotic-calls.stderr
index 0580e53c5..0580e53c5 100644
--- a/src/test/ui/argument-suggestions/exotic-calls.stderr
+++ b/tests/ui/argument-suggestions/exotic-calls.stderr
diff --git a/tests/ui/argument-suggestions/extern-fn-arg-names.rs b/tests/ui/argument-suggestions/extern-fn-arg-names.rs
new file mode 100644
index 000000000..df2fd6624
--- /dev/null
+++ b/tests/ui/argument-suggestions/extern-fn-arg-names.rs
@@ -0,0 +1,9 @@
+extern "Rust" {
+    fn dstfn(src: i32, dst: err);
+    //~^ ERROR cannot find type `err` in this scope
+}
+
+fn main() {
+    dstfn(1);
+    //~^ ERROR function takes 2 arguments but 1 argument was supplied
+}
diff --git a/tests/ui/argument-suggestions/extern-fn-arg-names.stderr b/tests/ui/argument-suggestions/extern-fn-arg-names.stderr
new file mode 100644
index 000000000..f6bc84c12
--- /dev/null
+++ b/tests/ui/argument-suggestions/extern-fn-arg-names.stderr
@@ -0,0 +1,26 @@
+error[E0412]: cannot find type `err` in this scope
+  --> $DIR/extern-fn-arg-names.rs:2:29
+   |
+LL |     fn dstfn(src: i32, dst: err);
+   |                             ^^^ not found in this scope
+
+error[E0061]: this function takes 2 arguments but 1 argument was supplied
+  --> $DIR/extern-fn-arg-names.rs:7:5
+   |
+LL |     dstfn(1);
+   |     ^^^^^--- an argument is missing
+   |
+note: function defined here
+  --> $DIR/extern-fn-arg-names.rs:2:8
+   |
+LL |     fn dstfn(src: i32, dst: err);
+   |        ^^^^^
+help: provide the argument
+   |
+LL |     dstfn(1, /* dst */);
+   |          ~~~~~~~~~~~~~~
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0061, E0412.
+For more information about an error, try `rustc --explain E0061`.
diff --git a/tests/ui/argument-suggestions/extra_arguments.rs b/tests/ui/argument-suggestions/extra_arguments.rs
new file mode 100644
index 000000000..3f83de95e
--- /dev/null
+++ b/tests/ui/argument-suggestions/extra_arguments.rs
@@ -0,0 +1,35 @@
+fn empty() {}
+fn one_arg(_a: i32) {}
+fn two_arg_same(_a: i32, _b: i32) {}
+fn two_arg_diff(_a: i32, _b: &str) {}
+
+fn main() {
+  empty(""); //~ ERROR function takes
+
+  one_arg(1, 1); //~ ERROR function takes
+  one_arg(1, ""); //~ ERROR function takes
+  one_arg(1, "", 1.0); //~ ERROR function takes
+
+  two_arg_same(1, 1, 1); //~ ERROR function takes
+  two_arg_same(1, 1, 1.0); //~ ERROR function takes
+
+  two_arg_diff(1, 1, ""); //~ ERROR function takes
+  two_arg_diff(1, "", ""); //~ ERROR function takes
+  two_arg_diff(1, 1, "", ""); //~ ERROR function takes
+  two_arg_diff(1, "", 1, ""); //~ ERROR function takes
+
+  // Check with weird spacing and newlines
+  two_arg_same(1, 1,     ""); //~ ERROR function takes
+  two_arg_diff(1, 1,     ""); //~ ERROR function takes
+  two_arg_same( //~ ERROR function takes
+    1,
+    1,
+    ""
+  );
+
+  two_arg_diff( //~ ERROR function takes
+    1,
+    1,
+    ""
+  );
+}
diff --git a/src/test/ui/argument-suggestions/extra_arguments.stderr b/tests/ui/argument-suggestions/extra_arguments.stderr
index 48787b0c3..48787b0c3 100644
--- a/src/test/ui/argument-suggestions/extra_arguments.stderr
+++ b/tests/ui/argument-suggestions/extra_arguments.stderr
diff --git a/src/test/ui/argument-suggestions/formal-and-expected-differ.rs b/tests/ui/argument-suggestions/formal-and-expected-differ.rs
index 5e3b55ca5..5e3b55ca5 100644
--- a/src/test/ui/argument-suggestions/formal-and-expected-differ.rs
+++ b/tests/ui/argument-suggestions/formal-and-expected-differ.rs
diff --git a/src/test/ui/argument-suggestions/formal-and-expected-differ.stderr b/tests/ui/argument-suggestions/formal-and-expected-differ.stderr
index 905875b52..905875b52 100644
--- a/src/test/ui/argument-suggestions/formal-and-expected-differ.stderr
+++ b/tests/ui/argument-suggestions/formal-and-expected-differ.stderr
diff --git a/src/test/ui/argument-suggestions/invalid_arguments.rs b/tests/ui/argument-suggestions/invalid_arguments.rs
index 53fbdd4b5..53fbdd4b5 100644
--- a/src/test/ui/argument-suggestions/invalid_arguments.rs
+++ b/tests/ui/argument-suggestions/invalid_arguments.rs
diff --git a/src/test/ui/argument-suggestions/invalid_arguments.stderr b/tests/ui/argument-suggestions/invalid_arguments.stderr
index 303f08695..303f08695 100644
--- a/src/test/ui/argument-suggestions/invalid_arguments.stderr
+++ b/tests/ui/argument-suggestions/invalid_arguments.stderr
diff --git a/tests/ui/argument-suggestions/issue-100154.rs b/tests/ui/argument-suggestions/issue-100154.rs
new file mode 100644
index 000000000..fb0af05e9
--- /dev/null
+++ b/tests/ui/argument-suggestions/issue-100154.rs
@@ -0,0 +1,7 @@
+fn foo(i: impl std::fmt::Display) {}
+
+fn main() {
+    foo::<()>(());
+    //~^ ERROR function takes 0 generic arguments but 1 generic argument was supplied
+    //~| ERROR `()` doesn't implement `std::fmt::Display`
+}
diff --git a/src/test/ui/argument-suggestions/issue-100154.stderr b/tests/ui/argument-suggestions/issue-100154.stderr
index 1499229c3..1499229c3 100644
--- a/src/test/ui/argument-suggestions/issue-100154.stderr
+++ b/tests/ui/argument-suggestions/issue-100154.stderr
diff --git a/src/test/ui/argument-suggestions/issue-100478.rs b/tests/ui/argument-suggestions/issue-100478.rs
index 6bef6ad10..fb50fa115 100644
--- a/src/test/ui/argument-suggestions/issue-100478.rs
+++ b/tests/ui/argument-suggestions/issue-100478.rs
@@ -31,7 +31,7 @@ fn three_diff(_a: T1, _b: T2, _c: T3) {}
 fn four_shuffle(_a: T1, _b: T2, _c: T3, _d: T4) {}
 
 fn main() {
-    three_diff(T2::new(0)); //~ ERROR this function takes
+    three_diff(T2::new(0)); //~ ERROR function takes
     four_shuffle(T3::default(), T4::default(), T1::default(), T2::default()); //~ ERROR 35:5: 35:17: arguments to this function are incorrect [E0308]
     four_shuffle(T3::default(), T2::default(), T1::default(), T3::default()); //~ ERROR 36:5: 36:17: arguments to this function are incorrect [E0308]
 
diff --git a/src/test/ui/argument-suggestions/issue-100478.stderr b/tests/ui/argument-suggestions/issue-100478.stderr
index df02a312c..df02a312c 100644
--- a/src/test/ui/argument-suggestions/issue-100478.stderr
+++ b/tests/ui/argument-suggestions/issue-100478.stderr
diff --git a/src/test/ui/argument-suggestions/issue-101097.rs b/tests/ui/argument-suggestions/issue-101097.rs
index 7994d3cd9..25f7f5837 100644
--- a/src/test/ui/argument-suggestions/issue-101097.rs
+++ b/tests/ui/argument-suggestions/issue-101097.rs
@@ -13,7 +13,7 @@ fn f(
 ) {}
 
 fn main() {
-    f(C, A, A, A, B, B, C); //~ ERROR this function takes 6 arguments but 7 arguments were supplied [E0061]
+    f(C, A, A, A, B, B, C); //~ ERROR function takes 6 arguments but 7 arguments were supplied [E0061]
     f(C, C, A, A, B, B);  //~ ERROR arguments to this function are incorrect [E0308]
     f(A, A, D, D, B, B);  //~ arguments to this function are incorrect [E0308]
     f(C, C, B, B, A, A);  //~ arguments to this function are incorrect [E0308]
diff --git a/src/test/ui/argument-suggestions/issue-101097.stderr b/tests/ui/argument-suggestions/issue-101097.stderr
index 096f8c226..096f8c226 100644
--- a/src/test/ui/argument-suggestions/issue-101097.stderr
+++ b/tests/ui/argument-suggestions/issue-101097.stderr
diff --git a/tests/ui/argument-suggestions/issue-96638.rs b/tests/ui/argument-suggestions/issue-96638.rs
new file mode 100644
index 000000000..5e720f174
--- /dev/null
+++ b/tests/ui/argument-suggestions/issue-96638.rs
@@ -0,0 +1,9 @@
+fn f(_: usize, _: &usize, _: usize) {}
+
+fn arg<T>() -> T { todo!() }
+
+fn main() {
+    let x = arg(); // `x` must be inferred
+    // The reference on `&x` is important to reproduce the ICE
+    f(&x, ""); //~ ERROR function takes 3 arguments but 2 arguments were supplied
+}
diff --git a/src/test/ui/argument-suggestions/issue-96638.stderr b/tests/ui/argument-suggestions/issue-96638.stderr
index 4d18b97c9..4d18b97c9 100644
--- a/src/test/ui/argument-suggestions/issue-96638.stderr
+++ b/tests/ui/argument-suggestions/issue-96638.stderr
diff --git a/tests/ui/argument-suggestions/issue-97197.rs b/tests/ui/argument-suggestions/issue-97197.rs
new file mode 100644
index 000000000..4c22608ae
--- /dev/null
+++ b/tests/ui/argument-suggestions/issue-97197.rs
@@ -0,0 +1,6 @@
+fn main() {
+    g((), ());
+    //~^ ERROR function takes 6 arguments but 2 arguments were supplied
+}
+
+pub fn g(a1: (), a2: bool, a3: bool, a4: bool, a5: bool, a6: ()) -> () {}
diff --git a/src/test/ui/argument-suggestions/issue-97197.stderr b/tests/ui/argument-suggestions/issue-97197.stderr
index de221ba1f..de221ba1f 100644
--- a/src/test/ui/argument-suggestions/issue-97197.stderr
+++ b/tests/ui/argument-suggestions/issue-97197.stderr
diff --git a/tests/ui/argument-suggestions/issue-97484.rs b/tests/ui/argument-suggestions/issue-97484.rs
new file mode 100644
index 000000000..9e537b0c3
--- /dev/null
+++ b/tests/ui/argument-suggestions/issue-97484.rs
@@ -0,0 +1,14 @@
+struct A;
+struct B;
+struct C;
+struct D;
+struct E;
+struct F;
+struct G;
+
+fn foo(a: &A, d: D, e: &E, g: G) {}
+
+fn main() {
+    foo(&&A, B, C, D, E, F, G);
+    //~^ ERROR function takes 4 arguments but 7 arguments were supplied
+}
diff --git a/src/test/ui/argument-suggestions/issue-97484.stderr b/tests/ui/argument-suggestions/issue-97484.stderr
index caa50f14b..caa50f14b 100644
--- a/src/test/ui/argument-suggestions/issue-97484.stderr
+++ b/tests/ui/argument-suggestions/issue-97484.stderr
diff --git a/tests/ui/argument-suggestions/issue-98894.rs b/tests/ui/argument-suggestions/issue-98894.rs
new file mode 100644
index 000000000..e421eba97
--- /dev/null
+++ b/tests/ui/argument-suggestions/issue-98894.rs
@@ -0,0 +1,4 @@
+fn main() {
+    (|_, ()| ())(if true {} else {return;});
+    //~^ ERROR function takes 2 arguments but 1 argument was supplied
+}
diff --git a/src/test/ui/argument-suggestions/issue-98894.stderr b/tests/ui/argument-suggestions/issue-98894.stderr
index f64a83ab7..f64a83ab7 100644
--- a/src/test/ui/argument-suggestions/issue-98894.stderr
+++ b/tests/ui/argument-suggestions/issue-98894.stderr
diff --git a/tests/ui/argument-suggestions/issue-98897.rs b/tests/ui/argument-suggestions/issue-98897.rs
new file mode 100644
index 000000000..27734f74d
--- /dev/null
+++ b/tests/ui/argument-suggestions/issue-98897.rs
@@ -0,0 +1,4 @@
+fn main() {
+    (|_, ()| ())([return, ()]);
+    //~^ ERROR function takes 2 arguments but 1 argument was supplied
+}
diff --git a/src/test/ui/argument-suggestions/issue-98897.stderr b/tests/ui/argument-suggestions/issue-98897.stderr
index f2c47d353..f2c47d353 100644
--- a/src/test/ui/argument-suggestions/issue-98897.stderr
+++ b/tests/ui/argument-suggestions/issue-98897.stderr
diff --git a/tests/ui/argument-suggestions/issue-99482.rs b/tests/ui/argument-suggestions/issue-99482.rs
new file mode 100644
index 000000000..7bbb39f8d
--- /dev/null
+++ b/tests/ui/argument-suggestions/issue-99482.rs
@@ -0,0 +1,5 @@
+fn main() {
+    let f = |_: (), f: fn()| f;
+    let _f = f(main);
+    //~^ ERROR function takes 2 arguments but 1 argument was supplied
+}
diff --git a/src/test/ui/argument-suggestions/issue-99482.stderr b/tests/ui/argument-suggestions/issue-99482.stderr
index bcf36e37c..bcf36e37c 100644
--- a/src/test/ui/argument-suggestions/issue-99482.stderr
+++ b/tests/ui/argument-suggestions/issue-99482.stderr
diff --git a/tests/ui/argument-suggestions/missing_arguments.rs b/tests/ui/argument-suggestions/missing_arguments.rs
new file mode 100644
index 000000000..c26564641
--- /dev/null
+++ b/tests/ui/argument-suggestions/missing_arguments.rs
@@ -0,0 +1,40 @@
+fn one_arg(_a: i32) {}
+fn two_same(_a: i32, _b: i32) {}
+fn two_diff(_a: i32, _b: f32) {}
+fn three_same(_a: i32, _b: i32, _c: i32) {}
+fn three_diff(_a: i32, _b: f32, _c: &str) {}
+fn four_repeated(_a: i32, _b: f32, _c: f32, _d: &str) {}
+fn complex(_a: i32, _b: f32, _c: i32, _d: f32, _e: &str) {}
+
+fn main() {
+  one_arg(); //~ ERROR function takes
+  // The headers here show the types expected,
+  // with formatting to emphasize which arguments are missing
+  /*         i32     f32    */
+  two_same(               ); //~ ERROR function takes
+  two_same(   1           ); //~ ERROR function takes
+  two_diff(               ); //~ ERROR function takes
+  two_diff(   1           ); //~ ERROR function takes
+  two_diff(          1.0  ); //~ ERROR function takes
+
+  /*           i32     i32     i32    */
+  three_same(                       ); //~ ERROR function takes
+  three_same(   1                   ); //~ ERROR function takes
+  three_same(   1,      1           ); //~ ERROR function takes
+
+  /*           i32     f32     &str   */
+  three_diff(          1.0,     ""  ); //~ ERROR function takes
+  three_diff(   1,              ""  ); //~ ERROR function takes
+  three_diff(   1,     1.0          ); //~ ERROR function takes
+  three_diff(                   ""  ); //~ ERROR function takes
+  three_diff(          1.0          ); //~ ERROR function takes
+  three_diff(   1                   ); //~ ERROR function takes
+
+  /*              i32     f32     f32     &str   */
+  four_repeated(                               ); //~ ERROR function takes
+  four_repeated(   1,                     ""   ); //~ ERROR function takes
+
+  /*        i32   f32   i32   f32   &str   */
+  complex(                               ); //~ ERROR function takes
+  complex(   1,                     ""   ); //~ ERROR function takes
+}
diff --git a/src/test/ui/argument-suggestions/missing_arguments.stderr b/tests/ui/argument-suggestions/missing_arguments.stderr
index ba9ece040..ba9ece040 100644
--- a/src/test/ui/argument-suggestions/missing_arguments.stderr
+++ b/tests/ui/argument-suggestions/missing_arguments.stderr
diff --git a/tests/ui/argument-suggestions/mixed_cases.rs b/tests/ui/argument-suggestions/mixed_cases.rs
new file mode 100644
index 000000000..86e94a438
--- /dev/null
+++ b/tests/ui/argument-suggestions/mixed_cases.rs
@@ -0,0 +1,24 @@
+// Cases where multiple argument suggestions are mixed
+
+struct X {}
+
+fn two_args(_a: i32, _b: f32) {}
+fn three_args(_a: i32, _b: f32, _c: &str) {}
+
+fn main() {
+  // Extra + Invalid
+  two_args(1, "", X {}); //~ ERROR function takes
+  three_args(1, "", X {}, ""); //~ ERROR function takes
+
+  // Missing and Invalid
+  three_args(1, X {}); //~ ERROR function takes
+
+  // Missing and Extra
+  three_args(1, "", X {}); //~ ERROR arguments to this function are incorrect
+
+  // Swapped and Invalid
+  three_args("", X {}, 1); //~ ERROR arguments to this function are incorrect
+
+  // Swapped and missing
+  three_args("", 1); //~ ERROR function takes
+}
diff --git a/src/test/ui/argument-suggestions/mixed_cases.stderr b/tests/ui/argument-suggestions/mixed_cases.stderr
index 8c525db1a..8c525db1a 100644
--- a/src/test/ui/argument-suggestions/mixed_cases.stderr
+++ b/tests/ui/argument-suggestions/mixed_cases.stderr
diff --git a/src/test/ui/argument-suggestions/permuted_arguments.rs b/tests/ui/argument-suggestions/permuted_arguments.rs
index f512fde65..f512fde65 100644
--- a/src/test/ui/argument-suggestions/permuted_arguments.rs
+++ b/tests/ui/argument-suggestions/permuted_arguments.rs
diff --git a/src/test/ui/argument-suggestions/permuted_arguments.stderr b/tests/ui/argument-suggestions/permuted_arguments.stderr
index 655807a7f..655807a7f 100644
--- a/src/test/ui/argument-suggestions/permuted_arguments.stderr
+++ b/tests/ui/argument-suggestions/permuted_arguments.stderr
diff --git a/src/test/ui/argument-suggestions/swapped_arguments.rs b/tests/ui/argument-suggestions/swapped_arguments.rs
index a21de610c..a21de610c 100644
--- a/src/test/ui/argument-suggestions/swapped_arguments.rs
+++ b/tests/ui/argument-suggestions/swapped_arguments.rs
diff --git a/src/test/ui/argument-suggestions/swapped_arguments.stderr b/tests/ui/argument-suggestions/swapped_arguments.stderr
index dabf5e952..dabf5e952 100644
--- a/src/test/ui/argument-suggestions/swapped_arguments.stderr
+++ b/tests/ui/argument-suggestions/swapped_arguments.stderr
diff --git a/src/test/ui/argument-suggestions/too-long.rs b/tests/ui/argument-suggestions/too-long.rs
index 7ec56afae..7ec56afae 100644
--- a/src/test/ui/argument-suggestions/too-long.rs
+++ b/tests/ui/argument-suggestions/too-long.rs
diff --git a/src/test/ui/argument-suggestions/too-long.stderr b/tests/ui/argument-suggestions/too-long.stderr
index bd430194c..492894329 100644
--- a/src/test/ui/argument-suggestions/too-long.stderr
+++ b/tests/ui/argument-suggestions/too-long.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 LL |     qux.foo(a, b, c, d, e, f, g, h, i, j, k, l);
    |         ---                ^ expected `i32`, found `&i32`
    |         |
-   |         arguments to this function are incorrect
+   |         arguments to this method are incorrect
    |
 note: associated function defined here
   --> $DIR/too-long.rs:4:8
diff --git a/src/test/ui/argument-suggestions/two-mismatch-notes.rs b/tests/ui/argument-suggestions/two-mismatch-notes.rs
index 1309041ab..1309041ab 100644
--- a/src/test/ui/argument-suggestions/two-mismatch-notes.rs
+++ b/tests/ui/argument-suggestions/two-mismatch-notes.rs
diff --git a/src/test/ui/argument-suggestions/two-mismatch-notes.stderr b/tests/ui/argument-suggestions/two-mismatch-notes.stderr
index 7873cf964..7873cf964 100644
--- a/src/test/ui/argument-suggestions/two-mismatch-notes.stderr
+++ b/tests/ui/argument-suggestions/two-mismatch-notes.stderr
diff --git a/src/test/ui/array-slice-vec/array-break-length.rs b/tests/ui/array-slice-vec/array-break-length.rs
index 60589f7c2..60589f7c2 100644
--- a/src/test/ui/array-slice-vec/array-break-length.rs
+++ b/tests/ui/array-slice-vec/array-break-length.rs
diff --git a/src/test/ui/array-slice-vec/array-break-length.stderr b/tests/ui/array-slice-vec/array-break-length.stderr
index 2df7b6d7f..2df7b6d7f 100644
--- a/src/test/ui/array-slice-vec/array-break-length.stderr
+++ b/tests/ui/array-slice-vec/array-break-length.stderr
diff --git a/src/test/ui/array-slice-vec/array-not-vector.rs b/tests/ui/array-slice-vec/array-not-vector.rs
index 5e46f015b..5e46f015b 100644
--- a/src/test/ui/array-slice-vec/array-not-vector.rs
+++ b/tests/ui/array-slice-vec/array-not-vector.rs
diff --git a/src/test/ui/array-slice-vec/array-not-vector.stderr b/tests/ui/array-slice-vec/array-not-vector.stderr
index 0e187d907..0e187d907 100644
--- a/src/test/ui/array-slice-vec/array-not-vector.stderr
+++ b/tests/ui/array-slice-vec/array-not-vector.stderr
diff --git a/src/test/ui/array-slice-vec/array_const_index-0.rs b/tests/ui/array-slice-vec/array_const_index-0.rs
index 96755802e..96755802e 100644
--- a/src/test/ui/array-slice-vec/array_const_index-0.rs
+++ b/tests/ui/array-slice-vec/array_const_index-0.rs
diff --git a/src/test/ui/array-slice-vec/array_const_index-0.stderr b/tests/ui/array-slice-vec/array_const_index-0.stderr
index 3b92cc766..3b92cc766 100644
--- a/src/test/ui/array-slice-vec/array_const_index-0.stderr
+++ b/tests/ui/array-slice-vec/array_const_index-0.stderr
diff --git a/src/test/ui/array-slice-vec/array_const_index-1.rs b/tests/ui/array-slice-vec/array_const_index-1.rs
index 625bf06a7..625bf06a7 100644
--- a/src/test/ui/array-slice-vec/array_const_index-1.rs
+++ b/tests/ui/array-slice-vec/array_const_index-1.rs
diff --git a/src/test/ui/array-slice-vec/array_const_index-1.stderr b/tests/ui/array-slice-vec/array_const_index-1.stderr
index 591db268a..591db268a 100644
--- a/src/test/ui/array-slice-vec/array_const_index-1.stderr
+++ b/tests/ui/array-slice-vec/array_const_index-1.stderr
diff --git a/src/test/ui/array-slice-vec/array_const_index-2.rs b/tests/ui/array-slice-vec/array_const_index-2.rs
index 8ee225f5c..8ee225f5c 100644
--- a/src/test/ui/array-slice-vec/array_const_index-2.rs
+++ b/tests/ui/array-slice-vec/array_const_index-2.rs
diff --git a/src/test/ui/array-slice-vec/bounds-check-no-overflow.rs b/tests/ui/array-slice-vec/bounds-check-no-overflow.rs
index 577853a4e..577853a4e 100644
--- a/src/test/ui/array-slice-vec/bounds-check-no-overflow.rs
+++ b/tests/ui/array-slice-vec/bounds-check-no-overflow.rs
diff --git a/src/test/ui/array-slice-vec/box-of-array-of-drop-1.rs b/tests/ui/array-slice-vec/box-of-array-of-drop-1.rs
index 2b3ece67b..2b3ece67b 100644
--- a/src/test/ui/array-slice-vec/box-of-array-of-drop-1.rs
+++ b/tests/ui/array-slice-vec/box-of-array-of-drop-1.rs
diff --git a/src/test/ui/array-slice-vec/box-of-array-of-drop-2.rs b/tests/ui/array-slice-vec/box-of-array-of-drop-2.rs
index c0ca45875..c0ca45875 100644
--- a/src/test/ui/array-slice-vec/box-of-array-of-drop-2.rs
+++ b/tests/ui/array-slice-vec/box-of-array-of-drop-2.rs
diff --git a/src/test/ui/array-slice-vec/byte-literals.rs b/tests/ui/array-slice-vec/byte-literals.rs
index 2649c2eac..2649c2eac 100644
--- a/src/test/ui/array-slice-vec/byte-literals.rs
+++ b/tests/ui/array-slice-vec/byte-literals.rs
diff --git a/src/test/ui/array-slice-vec/cast-in-array-size.rs b/tests/ui/array-slice-vec/cast-in-array-size.rs
index b112dcaef..b112dcaef 100644
--- a/src/test/ui/array-slice-vec/cast-in-array-size.rs
+++ b/tests/ui/array-slice-vec/cast-in-array-size.rs
diff --git a/src/test/ui/array-slice-vec/check-static-mut-slices.rs b/tests/ui/array-slice-vec/check-static-mut-slices.rs
index b89c63403..b89c63403 100644
--- a/src/test/ui/array-slice-vec/check-static-mut-slices.rs
+++ b/tests/ui/array-slice-vec/check-static-mut-slices.rs
diff --git a/src/test/ui/array-slice-vec/check-static-slice.rs b/tests/ui/array-slice-vec/check-static-slice.rs
index 1c607d134..1c607d134 100644
--- a/src/test/ui/array-slice-vec/check-static-slice.rs
+++ b/tests/ui/array-slice-vec/check-static-slice.rs
diff --git a/src/test/ui/array-slice-vec/copy-out-of-array-1.rs b/tests/ui/array-slice-vec/copy-out-of-array-1.rs
index c6d311148..c6d311148 100644
--- a/src/test/ui/array-slice-vec/copy-out-of-array-1.rs
+++ b/tests/ui/array-slice-vec/copy-out-of-array-1.rs
diff --git a/src/test/ui/array-slice-vec/destructure-array-1.rs b/tests/ui/array-slice-vec/destructure-array-1.rs
index 74d893ee5..74d893ee5 100644
--- a/src/test/ui/array-slice-vec/destructure-array-1.rs
+++ b/tests/ui/array-slice-vec/destructure-array-1.rs
diff --git a/src/test/ui/array-slice-vec/dst-raw-slice.rs b/tests/ui/array-slice-vec/dst-raw-slice.rs
index 371d16f09..371d16f09 100644
--- a/src/test/ui/array-slice-vec/dst-raw-slice.rs
+++ b/tests/ui/array-slice-vec/dst-raw-slice.rs
diff --git a/src/test/ui/array-slice-vec/empty-mutable-vec.rs b/tests/ui/array-slice-vec/empty-mutable-vec.rs
index 91ab280b9..91ab280b9 100644
--- a/src/test/ui/array-slice-vec/empty-mutable-vec.rs
+++ b/tests/ui/array-slice-vec/empty-mutable-vec.rs
diff --git a/src/test/ui/array-slice-vec/estr-slice.rs b/tests/ui/array-slice-vec/estr-slice.rs
index cd2c17220..cd2c17220 100644
--- a/src/test/ui/array-slice-vec/estr-slice.rs
+++ b/tests/ui/array-slice-vec/estr-slice.rs
diff --git a/src/test/ui/array-slice-vec/evec-slice.rs b/tests/ui/array-slice-vec/evec-slice.rs
index 4bdf2dbdd..4bdf2dbdd 100644
--- a/src/test/ui/array-slice-vec/evec-slice.rs
+++ b/tests/ui/array-slice-vec/evec-slice.rs
diff --git a/src/test/ui/array-slice-vec/fixed_length_copy.rs b/tests/ui/array-slice-vec/fixed_length_copy.rs
index f73173e84..f73173e84 100644
--- a/src/test/ui/array-slice-vec/fixed_length_copy.rs
+++ b/tests/ui/array-slice-vec/fixed_length_copy.rs
diff --git a/src/test/ui/array-slice-vec/huge-largest-array.rs b/tests/ui/array-slice-vec/huge-largest-array.rs
index 9e78162c8..9e78162c8 100644
--- a/src/test/ui/array-slice-vec/huge-largest-array.rs
+++ b/tests/ui/array-slice-vec/huge-largest-array.rs
diff --git a/src/test/ui/array-slice-vec/infer_array_len.rs b/tests/ui/array-slice-vec/infer_array_len.rs
index 22fe7cb88..22fe7cb88 100644
--- a/src/test/ui/array-slice-vec/infer_array_len.rs
+++ b/tests/ui/array-slice-vec/infer_array_len.rs
diff --git a/src/test/ui/array-slice-vec/infer_array_len.stderr b/tests/ui/array-slice-vec/infer_array_len.stderr
index 919550cac..c2a509a19 100644
--- a/src/test/ui/array-slice-vec/infer_array_len.stderr
+++ b/tests/ui/array-slice-vec/infer_array_len.stderr
@@ -6,8 +6,8 @@ LL |     let [_, _] = a.into();
    |
 help: consider giving this pattern a type
    |
-LL |     let [_, _]: _ = a.into();
-   |               +++
+LL |     let [_, _]: /* Type */ = a.into();
+   |               ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/array-slice-vec/issue-15730.rs b/tests/ui/array-slice-vec/issue-15730.rs
index dacffd154..dacffd154 100644
--- a/src/test/ui/array-slice-vec/issue-15730.rs
+++ b/tests/ui/array-slice-vec/issue-15730.rs
diff --git a/src/test/ui/array-slice-vec/issue-18425.rs b/tests/ui/array-slice-vec/issue-18425.rs
index 354c14a75..354c14a75 100644
--- a/src/test/ui/array-slice-vec/issue-18425.rs
+++ b/tests/ui/array-slice-vec/issue-18425.rs
diff --git a/src/test/ui/array-slice-vec/issue-69103-extra-binding-subslice.rs b/tests/ui/array-slice-vec/issue-69103-extra-binding-subslice.rs
index 061b0d675..061b0d675 100644
--- a/src/test/ui/array-slice-vec/issue-69103-extra-binding-subslice.rs
+++ b/tests/ui/array-slice-vec/issue-69103-extra-binding-subslice.rs
diff --git a/src/test/ui/array-slice-vec/issue-69103-extra-binding-subslice.stderr b/tests/ui/array-slice-vec/issue-69103-extra-binding-subslice.stderr
index 9432e2f0c..9432e2f0c 100644
--- a/src/test/ui/array-slice-vec/issue-69103-extra-binding-subslice.stderr
+++ b/tests/ui/array-slice-vec/issue-69103-extra-binding-subslice.stderr
diff --git a/src/test/ui/array-slice-vec/ivec-pass-by-value.rs b/tests/ui/array-slice-vec/ivec-pass-by-value.rs
index e22aef963..e22aef963 100644
--- a/src/test/ui/array-slice-vec/ivec-pass-by-value.rs
+++ b/tests/ui/array-slice-vec/ivec-pass-by-value.rs
diff --git a/src/test/ui/array-slice-vec/match_arr_unknown_len.rs b/tests/ui/array-slice-vec/match_arr_unknown_len.rs
index d190d7054..d190d7054 100644
--- a/src/test/ui/array-slice-vec/match_arr_unknown_len.rs
+++ b/tests/ui/array-slice-vec/match_arr_unknown_len.rs
diff --git a/src/test/ui/array-slice-vec/match_arr_unknown_len.stderr b/tests/ui/array-slice-vec/match_arr_unknown_len.stderr
index 5e531a993..5e531a993 100644
--- a/src/test/ui/array-slice-vec/match_arr_unknown_len.stderr
+++ b/tests/ui/array-slice-vec/match_arr_unknown_len.stderr
diff --git a/src/test/ui/array-slice-vec/mut-vstore-expr.rs b/tests/ui/array-slice-vec/mut-vstore-expr.rs
index 75b309a48..75b309a48 100644
--- a/src/test/ui/array-slice-vec/mut-vstore-expr.rs
+++ b/tests/ui/array-slice-vec/mut-vstore-expr.rs
diff --git a/src/test/ui/array-slice-vec/mutability-inherits-through-fixed-length-vec.rs b/tests/ui/array-slice-vec/mutability-inherits-through-fixed-length-vec.rs
index 7afb9d846..7afb9d846 100644
--- a/src/test/ui/array-slice-vec/mutability-inherits-through-fixed-length-vec.rs
+++ b/tests/ui/array-slice-vec/mutability-inherits-through-fixed-length-vec.rs
diff --git a/src/test/ui/array-slice-vec/mutable-alias-vec.rs b/tests/ui/array-slice-vec/mutable-alias-vec.rs
index 98dd46824..98dd46824 100644
--- a/src/test/ui/array-slice-vec/mutable-alias-vec.rs
+++ b/tests/ui/array-slice-vec/mutable-alias-vec.rs
diff --git a/src/test/ui/array-slice-vec/nested-vec-1.rs b/tests/ui/array-slice-vec/nested-vec-1.rs
index 02a3ccf46..02a3ccf46 100644
--- a/src/test/ui/array-slice-vec/nested-vec-1.rs
+++ b/tests/ui/array-slice-vec/nested-vec-1.rs
diff --git a/src/test/ui/array-slice-vec/nested-vec-2.rs b/tests/ui/array-slice-vec/nested-vec-2.rs
index d4a704d76..d4a704d76 100644
--- a/src/test/ui/array-slice-vec/nested-vec-2.rs
+++ b/tests/ui/array-slice-vec/nested-vec-2.rs
diff --git a/src/test/ui/array-slice-vec/nested-vec-3.rs b/tests/ui/array-slice-vec/nested-vec-3.rs
index b3ae683a8..b3ae683a8 100644
--- a/src/test/ui/array-slice-vec/nested-vec-3.rs
+++ b/tests/ui/array-slice-vec/nested-vec-3.rs
diff --git a/src/test/ui/array-slice-vec/new-style-fixed-length-vec.rs b/tests/ui/array-slice-vec/new-style-fixed-length-vec.rs
index 454f94be8..454f94be8 100644
--- a/src/test/ui/array-slice-vec/new-style-fixed-length-vec.rs
+++ b/tests/ui/array-slice-vec/new-style-fixed-length-vec.rs
diff --git a/src/test/ui/array-slice-vec/rcvr-borrowed-to-slice.rs b/tests/ui/array-slice-vec/rcvr-borrowed-to-slice.rs
index 17cf7e335..17cf7e335 100644
--- a/src/test/ui/array-slice-vec/rcvr-borrowed-to-slice.rs
+++ b/tests/ui/array-slice-vec/rcvr-borrowed-to-slice.rs
diff --git a/src/test/ui/array-slice-vec/repeat_empty_ok.rs b/tests/ui/array-slice-vec/repeat_empty_ok.rs
index 25463ea5e..25463ea5e 100644
--- a/src/test/ui/array-slice-vec/repeat_empty_ok.rs
+++ b/tests/ui/array-slice-vec/repeat_empty_ok.rs
diff --git a/src/test/ui/array-slice-vec/repeat_empty_ok.stderr b/tests/ui/array-slice-vec/repeat_empty_ok.stderr
index 724bdcd92..724bdcd92 100644
--- a/src/test/ui/array-slice-vec/repeat_empty_ok.stderr
+++ b/tests/ui/array-slice-vec/repeat_empty_ok.stderr
diff --git a/src/test/ui/array-slice-vec/repeated-vector-syntax.rs b/tests/ui/array-slice-vec/repeated-vector-syntax.rs
index 4458eb06d..4458eb06d 100644
--- a/src/test/ui/array-slice-vec/repeated-vector-syntax.rs
+++ b/tests/ui/array-slice-vec/repeated-vector-syntax.rs
diff --git a/src/test/ui/array-slice-vec/show-boxed-slice.rs b/tests/ui/array-slice-vec/show-boxed-slice.rs
index c10f779b1..c10f779b1 100644
--- a/src/test/ui/array-slice-vec/show-boxed-slice.rs
+++ b/tests/ui/array-slice-vec/show-boxed-slice.rs
diff --git a/src/test/ui/array-slice-vec/slice-2.rs b/tests/ui/array-slice-vec/slice-2.rs
index 5423e295a..5423e295a 100644
--- a/src/test/ui/array-slice-vec/slice-2.rs
+++ b/tests/ui/array-slice-vec/slice-2.rs
diff --git a/src/test/ui/array-slice-vec/slice-2.stderr b/tests/ui/array-slice-vec/slice-2.stderr
index 561feb90f..561feb90f 100644
--- a/src/test/ui/array-slice-vec/slice-2.stderr
+++ b/tests/ui/array-slice-vec/slice-2.stderr
diff --git a/src/test/ui/array-slice-vec/slice-mut-2.rs b/tests/ui/array-slice-vec/slice-mut-2.rs
index 216edbb78..216edbb78 100644
--- a/src/test/ui/array-slice-vec/slice-mut-2.rs
+++ b/tests/ui/array-slice-vec/slice-mut-2.rs
diff --git a/tests/ui/array-slice-vec/slice-mut-2.stderr b/tests/ui/array-slice-vec/slice-mut-2.stderr
new file mode 100644
index 000000000..5b040d3e4
--- /dev/null
+++ b/tests/ui/array-slice-vec/slice-mut-2.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/slice-mut-2.rs:7:18
+   |
+LL |     let _ = &mut x[2..4];
+   |                  ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let x: &[isize] = &mut [1, 2, 3, 4, 5];
+   |                       ~~~~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/array-slice-vec/slice-mut.rs b/tests/ui/array-slice-vec/slice-mut.rs
index e9989f0f4..e9989f0f4 100644
--- a/src/test/ui/array-slice-vec/slice-mut.rs
+++ b/tests/ui/array-slice-vec/slice-mut.rs
diff --git a/src/test/ui/array-slice-vec/slice-mut.stderr b/tests/ui/array-slice-vec/slice-mut.stderr
index 7d34defc1..7d34defc1 100644
--- a/src/test/ui/array-slice-vec/slice-mut.stderr
+++ b/tests/ui/array-slice-vec/slice-mut.stderr
diff --git a/src/test/ui/array-slice-vec/slice-of-zero-size-elements.rs b/tests/ui/array-slice-vec/slice-of-zero-size-elements.rs
index 83b08a3db..83b08a3db 100644
--- a/src/test/ui/array-slice-vec/slice-of-zero-size-elements.rs
+++ b/tests/ui/array-slice-vec/slice-of-zero-size-elements.rs
diff --git a/src/test/ui/array-slice-vec/slice-panic-1.rs b/tests/ui/array-slice-vec/slice-panic-1.rs
index 3829078ab..3829078ab 100644
--- a/src/test/ui/array-slice-vec/slice-panic-1.rs
+++ b/tests/ui/array-slice-vec/slice-panic-1.rs
diff --git a/src/test/ui/array-slice-vec/slice-panic-2.rs b/tests/ui/array-slice-vec/slice-panic-2.rs
index d83c611d3..d83c611d3 100644
--- a/src/test/ui/array-slice-vec/slice-panic-2.rs
+++ b/tests/ui/array-slice-vec/slice-panic-2.rs
diff --git a/src/test/ui/array-slice-vec/slice-pat-type-mismatches.rs b/tests/ui/array-slice-vec/slice-pat-type-mismatches.rs
index 521b898e7..521b898e7 100644
--- a/src/test/ui/array-slice-vec/slice-pat-type-mismatches.rs
+++ b/tests/ui/array-slice-vec/slice-pat-type-mismatches.rs
diff --git a/src/test/ui/array-slice-vec/slice-pat-type-mismatches.stderr b/tests/ui/array-slice-vec/slice-pat-type-mismatches.stderr
index 70a4cbebe..70a4cbebe 100644
--- a/src/test/ui/array-slice-vec/slice-pat-type-mismatches.stderr
+++ b/tests/ui/array-slice-vec/slice-pat-type-mismatches.stderr
diff --git a/src/test/ui/array-slice-vec/slice-to-vec-comparison.rs b/tests/ui/array-slice-vec/slice-to-vec-comparison.rs
index 7026a4900..7026a4900 100644
--- a/src/test/ui/array-slice-vec/slice-to-vec-comparison.rs
+++ b/tests/ui/array-slice-vec/slice-to-vec-comparison.rs
diff --git a/src/test/ui/array-slice-vec/slice-to-vec-comparison.stderr b/tests/ui/array-slice-vec/slice-to-vec-comparison.stderr
index e3b3b040f..e3b3b040f 100644
--- a/src/test/ui/array-slice-vec/slice-to-vec-comparison.stderr
+++ b/tests/ui/array-slice-vec/slice-to-vec-comparison.stderr
diff --git a/src/test/ui/array-slice-vec/slice.rs b/tests/ui/array-slice-vec/slice.rs
index a514e2027..a514e2027 100644
--- a/src/test/ui/array-slice-vec/slice.rs
+++ b/tests/ui/array-slice-vec/slice.rs
diff --git a/src/test/ui/array-slice-vec/slice_binary_search.rs b/tests/ui/array-slice-vec/slice_binary_search.rs
index 4d8022ecb..4d8022ecb 100644
--- a/src/test/ui/array-slice-vec/slice_binary_search.rs
+++ b/tests/ui/array-slice-vec/slice_binary_search.rs
diff --git a/src/test/ui/array-slice-vec/slice_is_sorted_by_borrow.rs b/tests/ui/array-slice-vec/slice_is_sorted_by_borrow.rs
index 073280d0f..073280d0f 100644
--- a/src/test/ui/array-slice-vec/slice_is_sorted_by_borrow.rs
+++ b/tests/ui/array-slice-vec/slice_is_sorted_by_borrow.rs
diff --git a/src/test/ui/array-slice-vec/subslice-only-once-semantic-restriction.rs b/tests/ui/array-slice-vec/subslice-only-once-semantic-restriction.rs
index 97e33624b..97e33624b 100644
--- a/src/test/ui/array-slice-vec/subslice-only-once-semantic-restriction.rs
+++ b/tests/ui/array-slice-vec/subslice-only-once-semantic-restriction.rs
diff --git a/src/test/ui/array-slice-vec/subslice-only-once-semantic-restriction.stderr b/tests/ui/array-slice-vec/subslice-only-once-semantic-restriction.stderr
index 4d6078788..4d6078788 100644
--- a/src/test/ui/array-slice-vec/subslice-only-once-semantic-restriction.stderr
+++ b/tests/ui/array-slice-vec/subslice-only-once-semantic-restriction.stderr
diff --git a/src/test/ui/array-slice-vec/subslice-patterns-const-eval-match.rs b/tests/ui/array-slice-vec/subslice-patterns-const-eval-match.rs
index 5a6283e9f..5a6283e9f 100644
--- a/src/test/ui/array-slice-vec/subslice-patterns-const-eval-match.rs
+++ b/tests/ui/array-slice-vec/subslice-patterns-const-eval-match.rs
diff --git a/src/test/ui/array-slice-vec/subslice-patterns-const-eval.rs b/tests/ui/array-slice-vec/subslice-patterns-const-eval.rs
index 0b793fa01..0b793fa01 100644
--- a/src/test/ui/array-slice-vec/subslice-patterns-const-eval.rs
+++ b/tests/ui/array-slice-vec/subslice-patterns-const-eval.rs
diff --git a/src/test/ui/array-slice-vec/suggest-array-length.fixed b/tests/ui/array-slice-vec/suggest-array-length.fixed
index 867c18a7d..867c18a7d 100644
--- a/src/test/ui/array-slice-vec/suggest-array-length.fixed
+++ b/tests/ui/array-slice-vec/suggest-array-length.fixed
diff --git a/src/test/ui/array-slice-vec/suggest-array-length.rs b/tests/ui/array-slice-vec/suggest-array-length.rs
index f66b3d4a8..f66b3d4a8 100644
--- a/src/test/ui/array-slice-vec/suggest-array-length.rs
+++ b/tests/ui/array-slice-vec/suggest-array-length.rs
diff --git a/src/test/ui/array-slice-vec/suggest-array-length.stderr b/tests/ui/array-slice-vec/suggest-array-length.stderr
index 16c90a047..16c90a047 100644
--- a/src/test/ui/array-slice-vec/suggest-array-length.stderr
+++ b/tests/ui/array-slice-vec/suggest-array-length.stderr
diff --git a/src/test/ui/array-slice-vec/variance-vec-covariant.rs b/tests/ui/array-slice-vec/variance-vec-covariant.rs
index d7e64132f..d7e64132f 100644
--- a/src/test/ui/array-slice-vec/variance-vec-covariant.rs
+++ b/tests/ui/array-slice-vec/variance-vec-covariant.rs
diff --git a/src/test/ui/array-slice-vec/vec-dst.rs b/tests/ui/array-slice-vec/vec-dst.rs
index c58ddbc42..c58ddbc42 100644
--- a/src/test/ui/array-slice-vec/vec-dst.rs
+++ b/tests/ui/array-slice-vec/vec-dst.rs
diff --git a/src/test/ui/array-slice-vec/vec-fixed-length.rs b/tests/ui/array-slice-vec/vec-fixed-length.rs
index 908c39c79..908c39c79 100644
--- a/src/test/ui/array-slice-vec/vec-fixed-length.rs
+++ b/tests/ui/array-slice-vec/vec-fixed-length.rs
diff --git a/src/test/ui/array-slice-vec/vec-late-init.rs b/tests/ui/array-slice-vec/vec-late-init.rs
index 5dee36082..5dee36082 100644
--- a/src/test/ui/array-slice-vec/vec-late-init.rs
+++ b/tests/ui/array-slice-vec/vec-late-init.rs
diff --git a/src/test/ui/array-slice-vec/vec-macro-no-std.rs b/tests/ui/array-slice-vec/vec-macro-no-std.rs
index 443895f7c..443895f7c 100644
--- a/src/test/ui/array-slice-vec/vec-macro-no-std.rs
+++ b/tests/ui/array-slice-vec/vec-macro-no-std.rs
diff --git a/src/test/ui/array-slice-vec/vec-macro-rvalue-scope.rs b/tests/ui/array-slice-vec/vec-macro-rvalue-scope.rs
index bde010371..bde010371 100644
--- a/src/test/ui/array-slice-vec/vec-macro-rvalue-scope.rs
+++ b/tests/ui/array-slice-vec/vec-macro-rvalue-scope.rs
diff --git a/src/test/ui/array-slice-vec/vec-macro-with-brackets.rs b/tests/ui/array-slice-vec/vec-macro-with-brackets.rs
index 6c95bd500..6c95bd500 100644
--- a/src/test/ui/array-slice-vec/vec-macro-with-brackets.rs
+++ b/tests/ui/array-slice-vec/vec-macro-with-brackets.rs
diff --git a/src/test/ui/array-slice-vec/vec-macro-with-comma-only.rs b/tests/ui/array-slice-vec/vec-macro-with-comma-only.rs
index 574a53c58..574a53c58 100644
--- a/src/test/ui/array-slice-vec/vec-macro-with-comma-only.rs
+++ b/tests/ui/array-slice-vec/vec-macro-with-comma-only.rs
diff --git a/src/test/ui/array-slice-vec/vec-macro-with-comma-only.stderr b/tests/ui/array-slice-vec/vec-macro-with-comma-only.stderr
index ec4a001f4..ec4a001f4 100644
--- a/src/test/ui/array-slice-vec/vec-macro-with-comma-only.stderr
+++ b/tests/ui/array-slice-vec/vec-macro-with-comma-only.stderr
diff --git a/src/test/ui/array-slice-vec/vec-macro-with-trailing-comma.rs b/tests/ui/array-slice-vec/vec-macro-with-trailing-comma.rs
index f7a51f9c4..f7a51f9c4 100644
--- a/src/test/ui/array-slice-vec/vec-macro-with-trailing-comma.rs
+++ b/tests/ui/array-slice-vec/vec-macro-with-trailing-comma.rs
diff --git a/src/test/ui/array-slice-vec/vec-matching-autoslice.rs b/tests/ui/array-slice-vec/vec-matching-autoslice.rs
index 8179edf42..8179edf42 100644
--- a/src/test/ui/array-slice-vec/vec-matching-autoslice.rs
+++ b/tests/ui/array-slice-vec/vec-matching-autoslice.rs
diff --git a/src/test/ui/array-slice-vec/vec-matching-fixed.rs b/tests/ui/array-slice-vec/vec-matching-fixed.rs
index fdeb7e4fd..fdeb7e4fd 100644
--- a/src/test/ui/array-slice-vec/vec-matching-fixed.rs
+++ b/tests/ui/array-slice-vec/vec-matching-fixed.rs
diff --git a/src/test/ui/array-slice-vec/vec-matching-fold.rs b/tests/ui/array-slice-vec/vec-matching-fold.rs
index 998899271..998899271 100644
--- a/src/test/ui/array-slice-vec/vec-matching-fold.rs
+++ b/tests/ui/array-slice-vec/vec-matching-fold.rs
diff --git a/src/test/ui/array-slice-vec/vec-matching-legal-tail-element-borrow.rs b/tests/ui/array-slice-vec/vec-matching-legal-tail-element-borrow.rs
index ed34f074a..ed34f074a 100644
--- a/src/test/ui/array-slice-vec/vec-matching-legal-tail-element-borrow.rs
+++ b/tests/ui/array-slice-vec/vec-matching-legal-tail-element-borrow.rs
diff --git a/src/test/ui/array-slice-vec/vec-matching.rs b/tests/ui/array-slice-vec/vec-matching.rs
index 7009244aa..7009244aa 100644
--- a/src/test/ui/array-slice-vec/vec-matching.rs
+++ b/tests/ui/array-slice-vec/vec-matching.rs
diff --git a/src/test/ui/array-slice-vec/vec-mut-iter-borrow.rs b/tests/ui/array-slice-vec/vec-mut-iter-borrow.rs
index 4aa737446..4aa737446 100644
--- a/src/test/ui/array-slice-vec/vec-mut-iter-borrow.rs
+++ b/tests/ui/array-slice-vec/vec-mut-iter-borrow.rs
diff --git a/src/test/ui/array-slice-vec/vec-mut-iter-borrow.stderr b/tests/ui/array-slice-vec/vec-mut-iter-borrow.stderr
index 0ec263c85..0ec263c85 100644
--- a/src/test/ui/array-slice-vec/vec-mut-iter-borrow.stderr
+++ b/tests/ui/array-slice-vec/vec-mut-iter-borrow.stderr
diff --git a/src/test/ui/array-slice-vec/vec-overrun.rs b/tests/ui/array-slice-vec/vec-overrun.rs
index bdc7d507d..bdc7d507d 100644
--- a/src/test/ui/array-slice-vec/vec-overrun.rs
+++ b/tests/ui/array-slice-vec/vec-overrun.rs
diff --git a/src/test/ui/array-slice-vec/vec-repeat-with-cast.rs b/tests/ui/array-slice-vec/vec-repeat-with-cast.rs
index 3e0e18873..3e0e18873 100644
--- a/src/test/ui/array-slice-vec/vec-repeat-with-cast.rs
+++ b/tests/ui/array-slice-vec/vec-repeat-with-cast.rs
diff --git a/src/test/ui/array-slice-vec/vec-res-add.rs b/tests/ui/array-slice-vec/vec-res-add.rs
index 57b552ee5..57b552ee5 100644
--- a/src/test/ui/array-slice-vec/vec-res-add.rs
+++ b/tests/ui/array-slice-vec/vec-res-add.rs
diff --git a/src/test/ui/array-slice-vec/vec-res-add.stderr b/tests/ui/array-slice-vec/vec-res-add.stderr
index 751127136..751127136 100644
--- a/src/test/ui/array-slice-vec/vec-res-add.stderr
+++ b/tests/ui/array-slice-vec/vec-res-add.stderr
diff --git a/src/test/ui/array-slice-vec/vec-tail-matching.rs b/tests/ui/array-slice-vec/vec-tail-matching.rs
index 5f1699227..5f1699227 100644
--- a/src/test/ui/array-slice-vec/vec-tail-matching.rs
+++ b/tests/ui/array-slice-vec/vec-tail-matching.rs
diff --git a/src/test/ui/array-slice-vec/vector-cast-weirdness.rs b/tests/ui/array-slice-vec/vector-cast-weirdness.rs
index e8f2c7147..e8f2c7147 100644
--- a/src/test/ui/array-slice-vec/vector-cast-weirdness.rs
+++ b/tests/ui/array-slice-vec/vector-cast-weirdness.rs
diff --git a/src/test/ui/array-slice-vec/vector-cast-weirdness.stderr b/tests/ui/array-slice-vec/vector-cast-weirdness.stderr
index 6fdb1ac9e..6fdb1ac9e 100644
--- a/src/test/ui/array-slice-vec/vector-cast-weirdness.stderr
+++ b/tests/ui/array-slice-vec/vector-cast-weirdness.stderr
diff --git a/src/test/ui/array-slice-vec/vector-no-ann-2.rs b/tests/ui/array-slice-vec/vector-no-ann-2.rs
index e2055f551..e2055f551 100644
--- a/src/test/ui/array-slice-vec/vector-no-ann-2.rs
+++ b/tests/ui/array-slice-vec/vector-no-ann-2.rs
diff --git a/src/test/ui/array-slice-vec/vector-no-ann.rs b/tests/ui/array-slice-vec/vector-no-ann.rs
index 1f11d9c8d..1f11d9c8d 100644
--- a/src/test/ui/array-slice-vec/vector-no-ann.rs
+++ b/tests/ui/array-slice-vec/vector-no-ann.rs
diff --git a/src/test/ui/array-slice-vec/vector-no-ann.stderr b/tests/ui/array-slice-vec/vector-no-ann.stderr
index d2ea08aa4..d2ea08aa4 100644
--- a/src/test/ui/array-slice-vec/vector-no-ann.stderr
+++ b/tests/ui/array-slice-vec/vector-no-ann.stderr
diff --git a/src/test/ui/artificial-block.rs b/tests/ui/artificial-block.rs
index 2e383e1a7..2e383e1a7 100644
--- a/src/test/ui/artificial-block.rs
+++ b/tests/ui/artificial-block.rs
diff --git a/src/test/ui/as-precedence.rs b/tests/ui/as-precedence.rs
index feb0cb30c..feb0cb30c 100644
--- a/src/test/ui/as-precedence.rs
+++ b/tests/ui/as-precedence.rs
diff --git a/src/test/ui/asm/aarch64/bad-options.rs b/tests/ui/asm/aarch64/bad-options.rs
index 6172027a2..6172027a2 100644
--- a/src/test/ui/asm/aarch64/bad-options.rs
+++ b/tests/ui/asm/aarch64/bad-options.rs
diff --git a/src/test/ui/asm/aarch64/bad-options.stderr b/tests/ui/asm/aarch64/bad-options.stderr
index 21bcc4a9c..21bcc4a9c 100644
--- a/src/test/ui/asm/aarch64/bad-options.stderr
+++ b/tests/ui/asm/aarch64/bad-options.stderr
diff --git a/src/test/ui/asm/aarch64/bad-reg.rs b/tests/ui/asm/aarch64/bad-reg.rs
index 9ccb8ed67..9ccb8ed67 100644
--- a/src/test/ui/asm/aarch64/bad-reg.rs
+++ b/tests/ui/asm/aarch64/bad-reg.rs
diff --git a/src/test/ui/asm/aarch64/bad-reg.stderr b/tests/ui/asm/aarch64/bad-reg.stderr
index 0ba627dac..0ba627dac 100644
--- a/src/test/ui/asm/aarch64/bad-reg.stderr
+++ b/tests/ui/asm/aarch64/bad-reg.stderr
diff --git a/src/test/ui/asm/aarch64/const.rs b/tests/ui/asm/aarch64/const.rs
index de299bfdb..de299bfdb 100644
--- a/src/test/ui/asm/aarch64/const.rs
+++ b/tests/ui/asm/aarch64/const.rs
diff --git a/src/test/ui/asm/aarch64/duplicate-options.fixed b/tests/ui/asm/aarch64/duplicate-options.fixed
index fa1dd4aef..fa1dd4aef 100644
--- a/src/test/ui/asm/aarch64/duplicate-options.fixed
+++ b/tests/ui/asm/aarch64/duplicate-options.fixed
diff --git a/src/test/ui/asm/aarch64/duplicate-options.rs b/tests/ui/asm/aarch64/duplicate-options.rs
index b2d3fe7d9..b2d3fe7d9 100644
--- a/src/test/ui/asm/aarch64/duplicate-options.rs
+++ b/tests/ui/asm/aarch64/duplicate-options.rs
diff --git a/src/test/ui/asm/aarch64/duplicate-options.stderr b/tests/ui/asm/aarch64/duplicate-options.stderr
index feb3838f4..feb3838f4 100644
--- a/src/test/ui/asm/aarch64/duplicate-options.stderr
+++ b/tests/ui/asm/aarch64/duplicate-options.stderr
diff --git a/src/test/ui/asm/aarch64/interpolated-idents.rs b/tests/ui/asm/aarch64/interpolated-idents.rs
index e87a88434..e87a88434 100644
--- a/src/test/ui/asm/aarch64/interpolated-idents.rs
+++ b/tests/ui/asm/aarch64/interpolated-idents.rs
diff --git a/tests/ui/asm/aarch64/interpolated-idents.stderr b/tests/ui/asm/aarch64/interpolated-idents.stderr
new file mode 100644
index 000000000..f6c50c2e1
--- /dev/null
+++ b/tests/ui/asm/aarch64/interpolated-idents.stderr
@@ -0,0 +1,46 @@
+error: the `nomem` and `readonly` options are mutually exclusive
+  --> $DIR/interpolated-idents.rs:13:13
+   |
+LL |               $options($pure, $nomem, $readonly, $preserves_flags, $noreturn, $nostack));
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+...
+LL | /     m!(in out lateout inout inlateout const sym
+LL | |        pure nomem readonly preserves_flags
+LL | |        noreturn nostack options);
+   | |________________________________- in this macro invocation
+   |
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: the `pure` and `noreturn` options are mutually exclusive
+  --> $DIR/interpolated-idents.rs:13:13
+   |
+LL |               $options($pure, $nomem, $readonly, $preserves_flags, $noreturn, $nostack));
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+...
+LL | /     m!(in out lateout inout inlateout const sym
+LL | |        pure nomem readonly preserves_flags
+LL | |        noreturn nostack options);
+   | |________________________________- in this macro invocation
+   |
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: asm outputs are not allowed with the `noreturn` option
+  --> $DIR/interpolated-idents.rs:10:32
+   |
+LL |               asm!("", $in(x) x, $out(x) x, $lateout(x) x, $inout(x) x, $inlateout(x) x,
+   |                                  ^^^^^^^^^  ^^^^^^^^^^^^^  ^^^^^^^^^^^  ^^^^^^^^^^^^^^^
+...
+LL | /     m!(in out lateout inout inlateout const sym
+LL | |        pure nomem readonly preserves_flags
+LL | |        noreturn nostack options);
+   | |                                -
+   | |________________________________|
+   | |________________________________in this macro invocation
+   | |________________________________in this macro invocation
+   | |________________________________in this macro invocation
+   |                                  in this macro invocation
+   |
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/asm/aarch64/llvm-58384.rs b/tests/ui/asm/aarch64/llvm-58384.rs
index 308f78908..308f78908 100644
--- a/src/test/ui/asm/aarch64/llvm-58384.rs
+++ b/tests/ui/asm/aarch64/llvm-58384.rs
diff --git a/src/test/ui/asm/aarch64/may_unwind.rs b/tests/ui/asm/aarch64/may_unwind.rs
index 6af8728bb..6af8728bb 100644
--- a/src/test/ui/asm/aarch64/may_unwind.rs
+++ b/tests/ui/asm/aarch64/may_unwind.rs
diff --git a/src/test/ui/asm/aarch64/parse-error.rs b/tests/ui/asm/aarch64/parse-error.rs
index cbc93cd3f..cbc93cd3f 100644
--- a/src/test/ui/asm/aarch64/parse-error.rs
+++ b/tests/ui/asm/aarch64/parse-error.rs
diff --git a/src/test/ui/asm/aarch64/parse-error.stderr b/tests/ui/asm/aarch64/parse-error.stderr
index 804966b06..804966b06 100644
--- a/src/test/ui/asm/aarch64/parse-error.stderr
+++ b/tests/ui/asm/aarch64/parse-error.stderr
diff --git a/src/test/ui/asm/aarch64/srcloc.rs b/tests/ui/asm/aarch64/srcloc.rs
index dbb6cbb94..dbb6cbb94 100644
--- a/src/test/ui/asm/aarch64/srcloc.rs
+++ b/tests/ui/asm/aarch64/srcloc.rs
diff --git a/src/test/ui/asm/aarch64/srcloc.stderr b/tests/ui/asm/aarch64/srcloc.stderr
index 2e17b60b9..2e17b60b9 100644
--- a/src/test/ui/asm/aarch64/srcloc.stderr
+++ b/tests/ui/asm/aarch64/srcloc.stderr
diff --git a/src/test/ui/asm/aarch64/sym.rs b/tests/ui/asm/aarch64/sym.rs
index 6a6cdb00d..6a6cdb00d 100644
--- a/src/test/ui/asm/aarch64/sym.rs
+++ b/tests/ui/asm/aarch64/sym.rs
diff --git a/src/test/ui/asm/aarch64/type-check-2-2.rs b/tests/ui/asm/aarch64/type-check-2-2.rs
index 0ce1f1d8f..89f2b3bb7 100644
--- a/src/test/ui/asm/aarch64/type-check-2-2.rs
+++ b/tests/ui/asm/aarch64/type-check-2-2.rs
@@ -25,12 +25,10 @@ fn main() {
 
         // Outputs require mutable places
 
-        let v: Vec<u64> = vec![0, 1, 2];
+        let v: Vec<u64> = vec![0, 1, 2]; //~ ERROR cannot borrow `v` as mutable
         asm!("{}", in(reg) v[0]);
         asm!("{}", out(reg) v[0]);
-        //~^ ERROR cannot borrow `v` as mutable, as it is not declared as mutable
         asm!("{}", inout(reg) v[0]);
-        //~^ ERROR cannot borrow `v` as mutable, as it is not declared as mutable
 
         // Sym operands must point to a function or static
     }
diff --git a/tests/ui/asm/aarch64/type-check-2-2.stderr b/tests/ui/asm/aarch64/type-check-2-2.stderr
new file mode 100644
index 000000000..41f7c01dc
--- /dev/null
+++ b/tests/ui/asm/aarch64/type-check-2-2.stderr
@@ -0,0 +1,46 @@
+error[E0381]: used binding `x` isn't initialized
+  --> $DIR/type-check-2-2.rs:19:28
+   |
+LL |         let x: u64;
+   |             - binding declared here but left uninitialized
+LL |         asm!("{}", in(reg) x);
+   |                            ^ `x` used here but it isn't initialized
+   |
+help: consider assigning a value
+   |
+LL |         let x: u64 = 0;
+   |                    +++
+
+error[E0381]: used binding `y` isn't initialized
+  --> $DIR/type-check-2-2.rs:22:9
+   |
+LL |         let mut y: u64;
+   |             ----- binding declared here but left uninitialized
+LL |         asm!("{}", inout(reg) y);
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^ `y` used here but it isn't initialized
+   |
+help: consider assigning a value
+   |
+LL |         let mut y: u64 = 0;
+   |                        +++
+
+error[E0596]: cannot borrow `v` as mutable, as it is not declared as mutable
+  --> $DIR/type-check-2-2.rs:28:13
+   |
+LL |         let v: Vec<u64> = vec![0, 1, 2];
+   |             ^ not mutable
+LL |         asm!("{}", in(reg) v[0]);
+LL |         asm!("{}", out(reg) v[0]);
+   |                             - cannot borrow as mutable
+LL |         asm!("{}", inout(reg) v[0]);
+   |                               - cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |         let mut v: Vec<u64> = vec![0, 1, 2];
+   |             +++
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0381, E0596.
+For more information about an error, try `rustc --explain E0381`.
diff --git a/src/test/ui/asm/aarch64/type-check-2.rs b/tests/ui/asm/aarch64/type-check-2.rs
index 1c71c1185..1c71c1185 100644
--- a/src/test/ui/asm/aarch64/type-check-2.rs
+++ b/tests/ui/asm/aarch64/type-check-2.rs
diff --git a/src/test/ui/asm/aarch64/type-check-2.stderr b/tests/ui/asm/aarch64/type-check-2.stderr
index 875df44ff..875df44ff 100644
--- a/src/test/ui/asm/aarch64/type-check-2.stderr
+++ b/tests/ui/asm/aarch64/type-check-2.stderr
diff --git a/src/test/ui/asm/aarch64/type-check-3.rs b/tests/ui/asm/aarch64/type-check-3.rs
index 623f6593d..623f6593d 100644
--- a/src/test/ui/asm/aarch64/type-check-3.rs
+++ b/tests/ui/asm/aarch64/type-check-3.rs
diff --git a/src/test/ui/asm/aarch64/type-check-3.stderr b/tests/ui/asm/aarch64/type-check-3.stderr
index f710df2dc..f710df2dc 100644
--- a/src/test/ui/asm/aarch64/type-check-3.stderr
+++ b/tests/ui/asm/aarch64/type-check-3.stderr
diff --git a/src/test/ui/asm/aarch64/type-check-4.rs b/tests/ui/asm/aarch64/type-check-4.rs
index bd23755c0..bd23755c0 100644
--- a/src/test/ui/asm/aarch64/type-check-4.rs
+++ b/tests/ui/asm/aarch64/type-check-4.rs
diff --git a/src/test/ui/asm/aarch64/type-check-4.stderr b/tests/ui/asm/aarch64/type-check-4.stderr
index 4837e647b..4837e647b 100644
--- a/src/test/ui/asm/aarch64/type-check-4.stderr
+++ b/tests/ui/asm/aarch64/type-check-4.stderr
diff --git a/src/test/ui/asm/bad-arch.mirunsafeck.stderr b/tests/ui/asm/bad-arch.mirunsafeck.stderr
index 4aa271807..d7af29615 100644
--- a/src/test/ui/asm/bad-arch.mirunsafeck.stderr
+++ b/tests/ui/asm/bad-arch.mirunsafeck.stderr
@@ -14,3 +14,4 @@ LL | global_asm!("");
 
 error: aborting due to 2 previous errors
 
+For more information about this error, try `rustc --explain E0472`.
diff --git a/src/test/ui/asm/bad-arch.rs b/tests/ui/asm/bad-arch.rs
index 93309899b..93309899b 100644
--- a/src/test/ui/asm/bad-arch.rs
+++ b/tests/ui/asm/bad-arch.rs
diff --git a/src/test/ui/asm/bad-arch.thirunsafeck.stderr b/tests/ui/asm/bad-arch.thirunsafeck.stderr
index 4aa271807..d7af29615 100644
--- a/src/test/ui/asm/bad-arch.thirunsafeck.stderr
+++ b/tests/ui/asm/bad-arch.thirunsafeck.stderr
@@ -14,3 +14,4 @@ LL | global_asm!("");
 
 error: aborting due to 2 previous errors
 
+For more information about this error, try `rustc --explain E0472`.
diff --git a/src/test/ui/asm/bad-template.aarch64_mirunsafeck.stderr b/tests/ui/asm/bad-template.aarch64_mirunsafeck.stderr
index bb6a222b2..bb6a222b2 100644
--- a/src/test/ui/asm/bad-template.aarch64_mirunsafeck.stderr
+++ b/tests/ui/asm/bad-template.aarch64_mirunsafeck.stderr
diff --git a/src/test/ui/asm/bad-template.aarch64_thirunsafeck.stderr b/tests/ui/asm/bad-template.aarch64_thirunsafeck.stderr
index bb6a222b2..bb6a222b2 100644
--- a/src/test/ui/asm/bad-template.aarch64_thirunsafeck.stderr
+++ b/tests/ui/asm/bad-template.aarch64_thirunsafeck.stderr
diff --git a/src/test/ui/asm/bad-template.rs b/tests/ui/asm/bad-template.rs
index 556371747..556371747 100644
--- a/src/test/ui/asm/bad-template.rs
+++ b/tests/ui/asm/bad-template.rs
diff --git a/src/test/ui/asm/bad-template.x86_64_mirunsafeck.stderr b/tests/ui/asm/bad-template.x86_64_mirunsafeck.stderr
index 903b5e959..903b5e959 100644
--- a/src/test/ui/asm/bad-template.x86_64_mirunsafeck.stderr
+++ b/tests/ui/asm/bad-template.x86_64_mirunsafeck.stderr
diff --git a/src/test/ui/asm/bad-template.x86_64_thirunsafeck.stderr b/tests/ui/asm/bad-template.x86_64_thirunsafeck.stderr
index 903b5e959..903b5e959 100644
--- a/src/test/ui/asm/bad-template.x86_64_thirunsafeck.stderr
+++ b/tests/ui/asm/bad-template.x86_64_thirunsafeck.stderr
diff --git a/src/test/ui/asm/generic-const.rs b/tests/ui/asm/generic-const.rs
index caa9b7dbc..caa9b7dbc 100644
--- a/src/test/ui/asm/generic-const.rs
+++ b/tests/ui/asm/generic-const.rs
diff --git a/src/test/ui/asm/inline-syntax.arm.stderr b/tests/ui/asm/inline-syntax.arm.stderr
index 1352fb377..1352fb377 100644
--- a/src/test/ui/asm/inline-syntax.arm.stderr
+++ b/tests/ui/asm/inline-syntax.arm.stderr
diff --git a/src/test/ui/asm/inline-syntax.rs b/tests/ui/asm/inline-syntax.rs
index d06796e33..d06796e33 100644
--- a/src/test/ui/asm/inline-syntax.rs
+++ b/tests/ui/asm/inline-syntax.rs
diff --git a/src/test/ui/asm/inline-syntax.x86_64.stderr b/tests/ui/asm/inline-syntax.x86_64.stderr
index 840b250f8..840b250f8 100644
--- a/src/test/ui/asm/inline-syntax.x86_64.stderr
+++ b/tests/ui/asm/inline-syntax.x86_64.stderr
diff --git a/src/test/ui/asm/issue-72570.rs b/tests/ui/asm/issue-72570.rs
index bb1381634..bb1381634 100644
--- a/src/test/ui/asm/issue-72570.rs
+++ b/tests/ui/asm/issue-72570.rs
diff --git a/src/test/ui/asm/issue-72570.stderr b/tests/ui/asm/issue-72570.stderr
index fa5792688..fa5792688 100644
--- a/src/test/ui/asm/issue-72570.stderr
+++ b/tests/ui/asm/issue-72570.stderr
diff --git a/src/test/ui/asm/issue-85247.rs b/tests/ui/asm/issue-85247.rs
index e64f5e8af..e64f5e8af 100644
--- a/src/test/ui/asm/issue-85247.rs
+++ b/tests/ui/asm/issue-85247.rs
diff --git a/src/test/ui/asm/issue-85247.rwpi.stderr b/tests/ui/asm/issue-85247.rwpi.stderr
index 996b0933a..996b0933a 100644
--- a/src/test/ui/asm/issue-85247.rwpi.stderr
+++ b/tests/ui/asm/issue-85247.rwpi.stderr
diff --git a/src/test/ui/asm/issue-87802.rs b/tests/ui/asm/issue-87802.rs
index 5b2e636c2..5b2e636c2 100644
--- a/src/test/ui/asm/issue-87802.rs
+++ b/tests/ui/asm/issue-87802.rs
diff --git a/src/test/ui/asm/issue-87802.stderr b/tests/ui/asm/issue-87802.stderr
index de3e28fdd..de3e28fdd 100644
--- a/src/test/ui/asm/issue-87802.stderr
+++ b/tests/ui/asm/issue-87802.stderr
diff --git a/src/test/ui/asm/issue-89305.rs b/tests/ui/asm/issue-89305.rs
index 05677912d..05677912d 100644
--- a/src/test/ui/asm/issue-89305.rs
+++ b/tests/ui/asm/issue-89305.rs
diff --git a/src/test/ui/asm/issue-89305.stderr b/tests/ui/asm/issue-89305.stderr
index 7efc51020..7efc51020 100644
--- a/src/test/ui/asm/issue-89305.stderr
+++ b/tests/ui/asm/issue-89305.stderr
diff --git a/src/test/ui/asm/issue-92378.rs b/tests/ui/asm/issue-92378.rs
index 809b0d155..809b0d155 100644
--- a/src/test/ui/asm/issue-92378.rs
+++ b/tests/ui/asm/issue-92378.rs
diff --git a/src/test/ui/asm/issue-97490.rs b/tests/ui/asm/issue-97490.rs
index 37862cf34..37862cf34 100644
--- a/src/test/ui/asm/issue-97490.rs
+++ b/tests/ui/asm/issue-97490.rs
diff --git a/src/test/ui/asm/issue-99071.rs b/tests/ui/asm/issue-99071.rs
index bb6201861..bb6201861 100644
--- a/src/test/ui/asm/issue-99071.rs
+++ b/tests/ui/asm/issue-99071.rs
diff --git a/src/test/ui/asm/issue-99071.stderr b/tests/ui/asm/issue-99071.stderr
index 47386ffa4..47386ffa4 100644
--- a/src/test/ui/asm/issue-99071.stderr
+++ b/tests/ui/asm/issue-99071.stderr
diff --git a/src/test/ui/asm/issue-99122-2.rs b/tests/ui/asm/issue-99122-2.rs
index cfb9fd90a..cfb9fd90a 100644
--- a/src/test/ui/asm/issue-99122-2.rs
+++ b/tests/ui/asm/issue-99122-2.rs
diff --git a/src/test/ui/asm/issue-99122.rs b/tests/ui/asm/issue-99122.rs
index 744a563d3..744a563d3 100644
--- a/src/test/ui/asm/issue-99122.rs
+++ b/tests/ui/asm/issue-99122.rs
diff --git a/src/test/ui/asm/issue-99122.stderr b/tests/ui/asm/issue-99122.stderr
index 2758a4ac4..2758a4ac4 100644
--- a/src/test/ui/asm/issue-99122.stderr
+++ b/tests/ui/asm/issue-99122.stderr
diff --git a/src/test/ui/asm/may_unwind.rs b/tests/ui/asm/may_unwind.rs
index b9479c44b..b9479c44b 100644
--- a/src/test/ui/asm/may_unwind.rs
+++ b/tests/ui/asm/may_unwind.rs
diff --git a/src/test/ui/asm/naked-functions-ffi.rs b/tests/ui/asm/naked-functions-ffi.rs
index c8bee504d..c8bee504d 100644
--- a/src/test/ui/asm/naked-functions-ffi.rs
+++ b/tests/ui/asm/naked-functions-ffi.rs
diff --git a/src/test/ui/asm/naked-functions-ffi.stderr b/tests/ui/asm/naked-functions-ffi.stderr
index 908881b19..908881b19 100644
--- a/src/test/ui/asm/naked-functions-ffi.stderr
+++ b/tests/ui/asm/naked-functions-ffi.stderr
diff --git a/src/test/ui/asm/naked-functions-unused.aarch64.stderr b/tests/ui/asm/naked-functions-unused.aarch64.stderr
index 8d3c300e0..8d3c300e0 100644
--- a/src/test/ui/asm/naked-functions-unused.aarch64.stderr
+++ b/tests/ui/asm/naked-functions-unused.aarch64.stderr
diff --git a/src/test/ui/asm/naked-functions-unused.rs b/tests/ui/asm/naked-functions-unused.rs
index 044a0e5b9..044a0e5b9 100644
--- a/src/test/ui/asm/naked-functions-unused.rs
+++ b/tests/ui/asm/naked-functions-unused.rs
diff --git a/src/test/ui/asm/naked-functions-unused.x86_64.stderr b/tests/ui/asm/naked-functions-unused.x86_64.stderr
index 8d3c300e0..8d3c300e0 100644
--- a/src/test/ui/asm/naked-functions-unused.x86_64.stderr
+++ b/tests/ui/asm/naked-functions-unused.x86_64.stderr
diff --git a/src/test/ui/asm/naked-functions.rs b/tests/ui/asm/naked-functions.rs
index 2f3716ca7..2f3716ca7 100644
--- a/src/test/ui/asm/naked-functions.rs
+++ b/tests/ui/asm/naked-functions.rs
diff --git a/src/test/ui/asm/naked-functions.stderr b/tests/ui/asm/naked-functions.stderr
index f90967fbe..f90967fbe 100644
--- a/src/test/ui/asm/naked-functions.stderr
+++ b/tests/ui/asm/naked-functions.stderr
diff --git a/src/test/ui/asm/naked-invalid-attr.rs b/tests/ui/asm/naked-invalid-attr.rs
index ea8f560ff..ea8f560ff 100644
--- a/src/test/ui/asm/naked-invalid-attr.rs
+++ b/tests/ui/asm/naked-invalid-attr.rs
diff --git a/src/test/ui/asm/naked-invalid-attr.stderr b/tests/ui/asm/naked-invalid-attr.stderr
index e8ddccc85..e8ddccc85 100644
--- a/src/test/ui/asm/naked-invalid-attr.stderr
+++ b/tests/ui/asm/naked-invalid-attr.stderr
diff --git a/src/test/ui/asm/named-asm-labels.rs b/tests/ui/asm/named-asm-labels.rs
index 160dbf617..160dbf617 100644
--- a/src/test/ui/asm/named-asm-labels.rs
+++ b/tests/ui/asm/named-asm-labels.rs
diff --git a/src/test/ui/asm/named-asm-labels.s b/tests/ui/asm/named-asm-labels.s
index 071356d75..071356d75 100644
--- a/src/test/ui/asm/named-asm-labels.s
+++ b/tests/ui/asm/named-asm-labels.s
diff --git a/src/test/ui/asm/named-asm-labels.stderr b/tests/ui/asm/named-asm-labels.stderr
index c8380629e..c8380629e 100644
--- a/src/test/ui/asm/named-asm-labels.stderr
+++ b/tests/ui/asm/named-asm-labels.stderr
diff --git a/src/test/ui/asm/noreturn.rs b/tests/ui/asm/noreturn.rs
index 03fa087ae..03fa087ae 100644
--- a/src/test/ui/asm/noreturn.rs
+++ b/tests/ui/asm/noreturn.rs
diff --git a/src/test/ui/asm/reg-conflict.rs b/tests/ui/asm/reg-conflict.rs
index 983788a93..983788a93 100644
--- a/src/test/ui/asm/reg-conflict.rs
+++ b/tests/ui/asm/reg-conflict.rs
diff --git a/src/test/ui/asm/reg-conflict.stderr b/tests/ui/asm/reg-conflict.stderr
index 2395566de..2395566de 100644
--- a/src/test/ui/asm/reg-conflict.stderr
+++ b/tests/ui/asm/reg-conflict.stderr
diff --git a/src/test/ui/asm/type-check-1.rs b/tests/ui/asm/type-check-1.rs
index 59f7b36af..59f7b36af 100644
--- a/src/test/ui/asm/type-check-1.rs
+++ b/tests/ui/asm/type-check-1.rs
diff --git a/src/test/ui/asm/type-check-1.stderr b/tests/ui/asm/type-check-1.stderr
index 184513965..184513965 100644
--- a/src/test/ui/asm/type-check-1.stderr
+++ b/tests/ui/asm/type-check-1.stderr
diff --git a/src/test/ui/asm/type-check-4.rs b/tests/ui/asm/type-check-4.rs
index 666d2c677..666d2c677 100644
--- a/src/test/ui/asm/type-check-4.rs
+++ b/tests/ui/asm/type-check-4.rs
diff --git a/src/test/ui/asm/type-check-4.stderr b/tests/ui/asm/type-check-4.stderr
index c97cd171b..c97cd171b 100644
--- a/src/test/ui/asm/type-check-4.stderr
+++ b/tests/ui/asm/type-check-4.stderr
diff --git a/src/test/ui/asm/unpretty-expanded.rs b/tests/ui/asm/unpretty-expanded.rs
index 25cf1c3d7..25cf1c3d7 100644
--- a/src/test/ui/asm/unpretty-expanded.rs
+++ b/tests/ui/asm/unpretty-expanded.rs
diff --git a/src/test/ui/asm/unpretty-expanded.stdout b/tests/ui/asm/unpretty-expanded.stdout
index ab1b5f45e..ab1b5f45e 100644
--- a/src/test/ui/asm/unpretty-expanded.stdout
+++ b/tests/ui/asm/unpretty-expanded.stdout
diff --git a/src/test/ui/asm/x86_64/bad-clobber-abi.rs b/tests/ui/asm/x86_64/bad-clobber-abi.rs
index ddcd2065b..ddcd2065b 100644
--- a/src/test/ui/asm/x86_64/bad-clobber-abi.rs
+++ b/tests/ui/asm/x86_64/bad-clobber-abi.rs
diff --git a/src/test/ui/asm/x86_64/bad-clobber-abi.stderr b/tests/ui/asm/x86_64/bad-clobber-abi.stderr
index 46e91a395..46e91a395 100644
--- a/src/test/ui/asm/x86_64/bad-clobber-abi.stderr
+++ b/tests/ui/asm/x86_64/bad-clobber-abi.stderr
diff --git a/src/test/ui/asm/x86_64/bad-options.rs b/tests/ui/asm/x86_64/bad-options.rs
index f7c2cd6c5..f7c2cd6c5 100644
--- a/src/test/ui/asm/x86_64/bad-options.rs
+++ b/tests/ui/asm/x86_64/bad-options.rs
diff --git a/src/test/ui/asm/x86_64/bad-options.stderr b/tests/ui/asm/x86_64/bad-options.stderr
index e2351840e..e2351840e 100644
--- a/src/test/ui/asm/x86_64/bad-options.stderr
+++ b/tests/ui/asm/x86_64/bad-options.stderr
diff --git a/src/test/ui/asm/x86_64/bad-reg.rs b/tests/ui/asm/x86_64/bad-reg.rs
index f5728079a..f5728079a 100644
--- a/src/test/ui/asm/x86_64/bad-reg.rs
+++ b/tests/ui/asm/x86_64/bad-reg.rs
diff --git a/src/test/ui/asm/x86_64/bad-reg.stderr b/tests/ui/asm/x86_64/bad-reg.stderr
index 82b7ebd0f..82b7ebd0f 100644
--- a/src/test/ui/asm/x86_64/bad-reg.stderr
+++ b/tests/ui/asm/x86_64/bad-reg.stderr
diff --git a/src/test/ui/asm/x86_64/const.rs b/tests/ui/asm/x86_64/const.rs
index d523ae021..d523ae021 100644
--- a/src/test/ui/asm/x86_64/const.rs
+++ b/tests/ui/asm/x86_64/const.rs
diff --git a/src/test/ui/asm/x86_64/duplicate-options.fixed b/tests/ui/asm/x86_64/duplicate-options.fixed
index c5f14f5f7..c5f14f5f7 100644
--- a/src/test/ui/asm/x86_64/duplicate-options.fixed
+++ b/tests/ui/asm/x86_64/duplicate-options.fixed
diff --git a/src/test/ui/asm/x86_64/duplicate-options.rs b/tests/ui/asm/x86_64/duplicate-options.rs
index a8dce1f8d..a8dce1f8d 100644
--- a/src/test/ui/asm/x86_64/duplicate-options.rs
+++ b/tests/ui/asm/x86_64/duplicate-options.rs
diff --git a/src/test/ui/asm/x86_64/duplicate-options.stderr b/tests/ui/asm/x86_64/duplicate-options.stderr
index 53edf8fb9..53edf8fb9 100644
--- a/src/test/ui/asm/x86_64/duplicate-options.stderr
+++ b/tests/ui/asm/x86_64/duplicate-options.stderr
diff --git a/src/test/ui/asm/x86_64/interpolated-idents.rs b/tests/ui/asm/x86_64/interpolated-idents.rs
index c05633ae8..c05633ae8 100644
--- a/src/test/ui/asm/x86_64/interpolated-idents.rs
+++ b/tests/ui/asm/x86_64/interpolated-idents.rs
diff --git a/tests/ui/asm/x86_64/interpolated-idents.stderr b/tests/ui/asm/x86_64/interpolated-idents.stderr
new file mode 100644
index 000000000..80a8c8c77
--- /dev/null
+++ b/tests/ui/asm/x86_64/interpolated-idents.stderr
@@ -0,0 +1,46 @@
+error: the `nomem` and `readonly` options are mutually exclusive
+  --> $DIR/interpolated-idents.rs:13:13
+   |
+LL |               $options($pure, $nomem, $readonly, $preserves_flags, $noreturn, $nostack, $att_syntax));
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+...
+LL | /     m!(in out lateout inout inlateout const sym
+LL | |        pure nomem readonly preserves_flags
+LL | |        noreturn nostack att_syntax options);
+   | |___________________________________________- in this macro invocation
+   |
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: the `pure` and `noreturn` options are mutually exclusive
+  --> $DIR/interpolated-idents.rs:13:13
+   |
+LL |               $options($pure, $nomem, $readonly, $preserves_flags, $noreturn, $nostack, $att_syntax));
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+...
+LL | /     m!(in out lateout inout inlateout const sym
+LL | |        pure nomem readonly preserves_flags
+LL | |        noreturn nostack att_syntax options);
+   | |___________________________________________- in this macro invocation
+   |
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: asm outputs are not allowed with the `noreturn` option
+  --> $DIR/interpolated-idents.rs:10:32
+   |
+LL |               asm!("", $in(x) x, $out(x) x, $lateout(x) x, $inout(x) x, $inlateout(x) x,
+   |                                  ^^^^^^^^^  ^^^^^^^^^^^^^  ^^^^^^^^^^^  ^^^^^^^^^^^^^^^
+...
+LL | /     m!(in out lateout inout inlateout const sym
+LL | |        pure nomem readonly preserves_flags
+LL | |        noreturn nostack att_syntax options);
+   | |                                           -
+   | |___________________________________________|
+   | |___________________________________________in this macro invocation
+   | |___________________________________________in this macro invocation
+   | |___________________________________________in this macro invocation
+   |                                             in this macro invocation
+   |
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/asm/x86_64/issue-82869.rs b/tests/ui/asm/x86_64/issue-82869.rs
index 67933666e..67933666e 100644
--- a/src/test/ui/asm/x86_64/issue-82869.rs
+++ b/tests/ui/asm/x86_64/issue-82869.rs
diff --git a/src/test/ui/asm/x86_64/issue-82869.stderr b/tests/ui/asm/x86_64/issue-82869.stderr
index 3cf9d6d1c..3cf9d6d1c 100644
--- a/src/test/ui/asm/x86_64/issue-82869.stderr
+++ b/tests/ui/asm/x86_64/issue-82869.stderr
diff --git a/src/test/ui/asm/x86_64/issue-89875.rs b/tests/ui/asm/x86_64/issue-89875.rs
index 669fd7e7e..669fd7e7e 100644
--- a/src/test/ui/asm/x86_64/issue-89875.rs
+++ b/tests/ui/asm/x86_64/issue-89875.rs
diff --git a/src/test/ui/asm/x86_64/issue-96797.rs b/tests/ui/asm/x86_64/issue-96797.rs
index 954f8c5cc..954f8c5cc 100644
--- a/src/test/ui/asm/x86_64/issue-96797.rs
+++ b/tests/ui/asm/x86_64/issue-96797.rs
diff --git a/src/test/ui/asm/x86_64/may_unwind.rs b/tests/ui/asm/x86_64/may_unwind.rs
index c11f0938d..c11f0938d 100644
--- a/src/test/ui/asm/x86_64/may_unwind.rs
+++ b/tests/ui/asm/x86_64/may_unwind.rs
diff --git a/src/test/ui/asm/x86_64/multiple-clobber-abi.rs b/tests/ui/asm/x86_64/multiple-clobber-abi.rs
index 06589431a..06589431a 100644
--- a/src/test/ui/asm/x86_64/multiple-clobber-abi.rs
+++ b/tests/ui/asm/x86_64/multiple-clobber-abi.rs
diff --git a/src/test/ui/asm/x86_64/parse-error.rs b/tests/ui/asm/x86_64/parse-error.rs
index 9aeb6b285..9aeb6b285 100644
--- a/src/test/ui/asm/x86_64/parse-error.rs
+++ b/tests/ui/asm/x86_64/parse-error.rs
diff --git a/src/test/ui/asm/x86_64/parse-error.stderr b/tests/ui/asm/x86_64/parse-error.stderr
index 57702c37b..57702c37b 100644
--- a/src/test/ui/asm/x86_64/parse-error.stderr
+++ b/tests/ui/asm/x86_64/parse-error.stderr
diff --git a/src/test/ui/asm/x86_64/srcloc.rs b/tests/ui/asm/x86_64/srcloc.rs
index 1135ad2e1..1135ad2e1 100644
--- a/src/test/ui/asm/x86_64/srcloc.rs
+++ b/tests/ui/asm/x86_64/srcloc.rs
diff --git a/src/test/ui/asm/x86_64/srcloc.stderr b/tests/ui/asm/x86_64/srcloc.stderr
index 8899c1b91..8899c1b91 100644
--- a/src/test/ui/asm/x86_64/srcloc.stderr
+++ b/tests/ui/asm/x86_64/srcloc.stderr
diff --git a/src/test/ui/asm/x86_64/sym.rs b/tests/ui/asm/x86_64/sym.rs
index 93ef4f090..93ef4f090 100644
--- a/src/test/ui/asm/x86_64/sym.rs
+++ b/tests/ui/asm/x86_64/sym.rs
diff --git a/src/test/ui/asm/x86_64/target-feature-attr.rs b/tests/ui/asm/x86_64/target-feature-attr.rs
index 14490c3e0..14490c3e0 100644
--- a/src/test/ui/asm/x86_64/target-feature-attr.rs
+++ b/tests/ui/asm/x86_64/target-feature-attr.rs
diff --git a/src/test/ui/asm/x86_64/target-feature-attr.stderr b/tests/ui/asm/x86_64/target-feature-attr.stderr
index c852726ee..c852726ee 100644
--- a/src/test/ui/asm/x86_64/target-feature-attr.stderr
+++ b/tests/ui/asm/x86_64/target-feature-attr.stderr
diff --git a/src/test/ui/asm/x86_64/type-check-2.rs b/tests/ui/asm/x86_64/type-check-2.rs
index 80b29ec87..80b29ec87 100644
--- a/src/test/ui/asm/x86_64/type-check-2.rs
+++ b/tests/ui/asm/x86_64/type-check-2.rs
diff --git a/src/test/ui/asm/x86_64/type-check-2.stderr b/tests/ui/asm/x86_64/type-check-2.stderr
index d9ca25519..d9ca25519 100644
--- a/src/test/ui/asm/x86_64/type-check-2.stderr
+++ b/tests/ui/asm/x86_64/type-check-2.stderr
diff --git a/src/test/ui/asm/x86_64/type-check-3.rs b/tests/ui/asm/x86_64/type-check-3.rs
index 89c849c75..89c849c75 100644
--- a/src/test/ui/asm/x86_64/type-check-3.rs
+++ b/tests/ui/asm/x86_64/type-check-3.rs
diff --git a/src/test/ui/asm/x86_64/type-check-3.stderr b/tests/ui/asm/x86_64/type-check-3.stderr
index 1baf50ff6..1baf50ff6 100644
--- a/src/test/ui/asm/x86_64/type-check-3.stderr
+++ b/tests/ui/asm/x86_64/type-check-3.stderr
diff --git a/src/test/ui/asm/x86_64/type-check-4.rs b/tests/ui/asm/x86_64/type-check-4.rs
index 3d5d3807c..3d5d3807c 100644
--- a/src/test/ui/asm/x86_64/type-check-4.rs
+++ b/tests/ui/asm/x86_64/type-check-4.rs
diff --git a/src/test/ui/asm/x86_64/type-check-4.stderr b/tests/ui/asm/x86_64/type-check-4.stderr
index 3875bcc21..3875bcc21 100644
--- a/src/test/ui/asm/x86_64/type-check-4.stderr
+++ b/tests/ui/asm/x86_64/type-check-4.stderr
diff --git a/src/test/ui/asm/x86_64/type-check-5.rs b/tests/ui/asm/x86_64/type-check-5.rs
index 8198df910..1d579ccc9 100644
--- a/src/test/ui/asm/x86_64/type-check-5.rs
+++ b/tests/ui/asm/x86_64/type-check-5.rs
@@ -22,11 +22,10 @@ fn main() {
         // Outputs require mutable places
 
         let v: Vec<u64> = vec![0, 1, 2];
+        //~^ ERROR cannot borrow `v` as mutable, as it is not declared as mutable
         asm!("{}", in(reg) v[0]);
         asm!("{}", out(reg) v[0]);
-        //~^ ERROR cannot borrow `v` as mutable, as it is not declared as mutable
         asm!("{}", inout(reg) v[0]);
-        //~^ ERROR cannot borrow `v` as mutable, as it is not declared as mutable
 
         // Sym operands must point to a function or static
 
diff --git a/tests/ui/asm/x86_64/type-check-5.stderr b/tests/ui/asm/x86_64/type-check-5.stderr
new file mode 100644
index 000000000..7970e76d6
--- /dev/null
+++ b/tests/ui/asm/x86_64/type-check-5.stderr
@@ -0,0 +1,46 @@
+error[E0381]: used binding `x` isn't initialized
+  --> $DIR/type-check-5.rs:15:28
+   |
+LL |         let x: u64;
+   |             - binding declared here but left uninitialized
+LL |         asm!("{}", in(reg) x);
+   |                            ^ `x` used here but it isn't initialized
+   |
+help: consider assigning a value
+   |
+LL |         let x: u64 = 0;
+   |                    +++
+
+error[E0381]: used binding `y` isn't initialized
+  --> $DIR/type-check-5.rs:18:9
+   |
+LL |         let mut y: u64;
+   |             ----- binding declared here but left uninitialized
+LL |         asm!("{}", inout(reg) y);
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^ `y` used here but it isn't initialized
+   |
+help: consider assigning a value
+   |
+LL |         let mut y: u64 = 0;
+   |                        +++
+
+error[E0596]: cannot borrow `v` as mutable, as it is not declared as mutable
+  --> $DIR/type-check-5.rs:24:13
+   |
+LL |         let v: Vec<u64> = vec![0, 1, 2];
+   |             ^ not mutable
+...
+LL |         asm!("{}", out(reg) v[0]);
+   |                             - cannot borrow as mutable
+LL |         asm!("{}", inout(reg) v[0]);
+   |                               - cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |         let mut v: Vec<u64> = vec![0, 1, 2];
+   |             +++
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0381, E0596.
+For more information about an error, try `rustc --explain E0381`.
diff --git a/src/test/ui/assign-assign.rs b/tests/ui/assign-assign.rs
index bcf506b39..bcf506b39 100644
--- a/src/test/ui/assign-assign.rs
+++ b/tests/ui/assign-assign.rs
diff --git a/src/test/ui/assign-imm-local-twice.rs b/tests/ui/assign-imm-local-twice.rs
index b50f6ab5d..b50f6ab5d 100644
--- a/src/test/ui/assign-imm-local-twice.rs
+++ b/tests/ui/assign-imm-local-twice.rs
diff --git a/src/test/ui/assign-imm-local-twice.stderr b/tests/ui/assign-imm-local-twice.stderr
index bba5d8dff..bba5d8dff 100644
--- a/src/test/ui/assign-imm-local-twice.stderr
+++ b/tests/ui/assign-imm-local-twice.stderr
diff --git a/src/test/ui/assoc-lang-items.rs b/tests/ui/assoc-lang-items.rs
index 23453d201..23453d201 100644
--- a/src/test/ui/assoc-lang-items.rs
+++ b/tests/ui/assoc-lang-items.rs
diff --git a/src/test/ui/assoc-lang-items.stderr b/tests/ui/assoc-lang-items.stderr
index 040792fb1..040792fb1 100644
--- a/src/test/ui/assoc-lang-items.stderr
+++ b/tests/ui/assoc-lang-items.stderr
diff --git a/src/test/ui/assoc-oddities-3.rs b/tests/ui/assoc-oddities-3.rs
index cd025dc8b..cd025dc8b 100644
--- a/src/test/ui/assoc-oddities-3.rs
+++ b/tests/ui/assoc-oddities-3.rs
diff --git a/src/test/ui/associated-consts/assoc-const-eq-missing.rs b/tests/ui/associated-consts/assoc-const-eq-missing.rs
index 5e029a12d..5e029a12d 100644
--- a/src/test/ui/associated-consts/assoc-const-eq-missing.rs
+++ b/tests/ui/associated-consts/assoc-const-eq-missing.rs
diff --git a/src/test/ui/associated-consts/assoc-const-eq-missing.stderr b/tests/ui/associated-consts/assoc-const-eq-missing.stderr
index b4bd6456c..b4bd6456c 100644
--- a/src/test/ui/associated-consts/assoc-const-eq-missing.stderr
+++ b/tests/ui/associated-consts/assoc-const-eq-missing.stderr
diff --git a/src/test/ui/associated-consts/assoc-const-ty-mismatch.rs b/tests/ui/associated-consts/assoc-const-ty-mismatch.rs
index c5d78469e..c5d78469e 100644
--- a/src/test/ui/associated-consts/assoc-const-ty-mismatch.rs
+++ b/tests/ui/associated-consts/assoc-const-ty-mismatch.rs
diff --git a/src/test/ui/associated-consts/assoc-const-ty-mismatch.stderr b/tests/ui/associated-consts/assoc-const-ty-mismatch.stderr
index 11198729e..11198729e 100644
--- a/src/test/ui/associated-consts/assoc-const-ty-mismatch.stderr
+++ b/tests/ui/associated-consts/assoc-const-ty-mismatch.stderr
diff --git a/src/test/ui/associated-consts/assoc-const.rs b/tests/ui/associated-consts/assoc-const.rs
index 9c7884c80..9c7884c80 100644
--- a/src/test/ui/associated-consts/assoc-const.rs
+++ b/tests/ui/associated-consts/assoc-const.rs
diff --git a/src/test/ui/associated-consts/associated-const-ambiguity-report.rs b/tests/ui/associated-consts/associated-const-ambiguity-report.rs
index 927d2c69e..927d2c69e 100644
--- a/src/test/ui/associated-consts/associated-const-ambiguity-report.rs
+++ b/tests/ui/associated-consts/associated-const-ambiguity-report.rs
diff --git a/src/test/ui/associated-consts/associated-const-ambiguity-report.stderr b/tests/ui/associated-consts/associated-const-ambiguity-report.stderr
index 5435f2232..5435f2232 100644
--- a/src/test/ui/associated-consts/associated-const-ambiguity-report.stderr
+++ b/tests/ui/associated-consts/associated-const-ambiguity-report.stderr
diff --git a/src/test/ui/associated-consts/associated-const-array-len.rs b/tests/ui/associated-consts/associated-const-array-len.rs
index 17d782427..17d782427 100644
--- a/src/test/ui/associated-consts/associated-const-array-len.rs
+++ b/tests/ui/associated-consts/associated-const-array-len.rs
diff --git a/src/test/ui/associated-consts/associated-const-array-len.stderr b/tests/ui/associated-consts/associated-const-array-len.stderr
index 86c62e7b7..86c62e7b7 100644
--- a/src/test/ui/associated-consts/associated-const-array-len.stderr
+++ b/tests/ui/associated-consts/associated-const-array-len.stderr
diff --git a/src/test/ui/associated-consts/associated-const-const-eval.rs b/tests/ui/associated-consts/associated-const-const-eval.rs
index 5a34bb97c..5a34bb97c 100644
--- a/src/test/ui/associated-consts/associated-const-const-eval.rs
+++ b/tests/ui/associated-consts/associated-const-const-eval.rs
diff --git a/src/test/ui/associated-consts/associated-const-cross-crate-const-eval.rs b/tests/ui/associated-consts/associated-const-cross-crate-const-eval.rs
index 611639b84..611639b84 100644
--- a/src/test/ui/associated-consts/associated-const-cross-crate-const-eval.rs
+++ b/tests/ui/associated-consts/associated-const-cross-crate-const-eval.rs
diff --git a/src/test/ui/associated-consts/associated-const-cross-crate-defaults.rs b/tests/ui/associated-consts/associated-const-cross-crate-defaults.rs
index 92d9cffec..92d9cffec 100644
--- a/src/test/ui/associated-consts/associated-const-cross-crate-defaults.rs
+++ b/tests/ui/associated-consts/associated-const-cross-crate-defaults.rs
diff --git a/src/test/ui/associated-consts/associated-const-cross-crate.rs b/tests/ui/associated-consts/associated-const-cross-crate.rs
index ecdc112e0..ecdc112e0 100644
--- a/src/test/ui/associated-consts/associated-const-cross-crate.rs
+++ b/tests/ui/associated-consts/associated-const-cross-crate.rs
diff --git a/src/test/ui/associated-consts/associated-const-dead-code.rs b/tests/ui/associated-consts/associated-const-dead-code.rs
index f7b676418..f7b676418 100644
--- a/src/test/ui/associated-consts/associated-const-dead-code.rs
+++ b/tests/ui/associated-consts/associated-const-dead-code.rs
diff --git a/src/test/ui/associated-consts/associated-const-dead-code.stderr b/tests/ui/associated-consts/associated-const-dead-code.stderr
index cc701cc4b..cc701cc4b 100644
--- a/src/test/ui/associated-consts/associated-const-dead-code.stderr
+++ b/tests/ui/associated-consts/associated-const-dead-code.stderr
diff --git a/src/test/ui/associated-consts/associated-const-generic-obligations.rs b/tests/ui/associated-consts/associated-const-generic-obligations.rs
index 498e315b5..498e315b5 100644
--- a/src/test/ui/associated-consts/associated-const-generic-obligations.rs
+++ b/tests/ui/associated-consts/associated-const-generic-obligations.rs
diff --git a/src/test/ui/associated-consts/associated-const-generic-obligations.stderr b/tests/ui/associated-consts/associated-const-generic-obligations.stderr
index f45fa0ad5..f45fa0ad5 100644
--- a/src/test/ui/associated-consts/associated-const-generic-obligations.stderr
+++ b/tests/ui/associated-consts/associated-const-generic-obligations.stderr
diff --git a/src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.rs b/tests/ui/associated-consts/associated-const-impl-wrong-lifetime.rs
index 63bac9613..63bac9613 100644
--- a/src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.rs
+++ b/tests/ui/associated-consts/associated-const-impl-wrong-lifetime.rs
diff --git a/src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.stderr b/tests/ui/associated-consts/associated-const-impl-wrong-lifetime.stderr
index 742b81535..742b81535 100644
--- a/src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.stderr
+++ b/tests/ui/associated-consts/associated-const-impl-wrong-lifetime.stderr
diff --git a/src/test/ui/associated-consts/associated-const-impl-wrong-type.rs b/tests/ui/associated-consts/associated-const-impl-wrong-type.rs
index 1aad749c1..1aad749c1 100644
--- a/src/test/ui/associated-consts/associated-const-impl-wrong-type.rs
+++ b/tests/ui/associated-consts/associated-const-impl-wrong-type.rs
diff --git a/src/test/ui/associated-consts/associated-const-impl-wrong-type.stderr b/tests/ui/associated-consts/associated-const-impl-wrong-type.stderr
index f3616035f..f3616035f 100644
--- a/src/test/ui/associated-consts/associated-const-impl-wrong-type.stderr
+++ b/tests/ui/associated-consts/associated-const-impl-wrong-type.stderr
diff --git a/src/test/ui/associated-consts/associated-const-in-global-const.rs b/tests/ui/associated-consts/associated-const-in-global-const.rs
index 18d7a1215..18d7a1215 100644
--- a/src/test/ui/associated-consts/associated-const-in-global-const.rs
+++ b/tests/ui/associated-consts/associated-const-in-global-const.rs
diff --git a/src/test/ui/associated-consts/associated-const-in-trait.rs b/tests/ui/associated-consts/associated-const-in-trait.rs
index cf5d5d859..cf5d5d859 100644
--- a/src/test/ui/associated-consts/associated-const-in-trait.rs
+++ b/tests/ui/associated-consts/associated-const-in-trait.rs
diff --git a/src/test/ui/associated-consts/associated-const-in-trait.stderr b/tests/ui/associated-consts/associated-const-in-trait.stderr
index 60bbe385c..60bbe385c 100644
--- a/src/test/ui/associated-consts/associated-const-in-trait.stderr
+++ b/tests/ui/associated-consts/associated-const-in-trait.stderr
diff --git a/src/test/ui/associated-consts/associated-const-inherent-impl.rs b/tests/ui/associated-consts/associated-const-inherent-impl.rs
index c6d956dff..c6d956dff 100644
--- a/src/test/ui/associated-consts/associated-const-inherent-impl.rs
+++ b/tests/ui/associated-consts/associated-const-inherent-impl.rs
diff --git a/src/test/ui/associated-consts/associated-const-marks-live-code.rs b/tests/ui/associated-consts/associated-const-marks-live-code.rs
index 68eb4e25d..68eb4e25d 100644
--- a/src/test/ui/associated-consts/associated-const-marks-live-code.rs
+++ b/tests/ui/associated-consts/associated-const-marks-live-code.rs
diff --git a/src/test/ui/associated-consts/associated-const-match-patterns.rs b/tests/ui/associated-consts/associated-const-match-patterns.rs
index 62c1cb983..62c1cb983 100644
--- a/src/test/ui/associated-consts/associated-const-match-patterns.rs
+++ b/tests/ui/associated-consts/associated-const-match-patterns.rs
diff --git a/src/test/ui/associated-consts/associated-const-no-item.rs b/tests/ui/associated-consts/associated-const-no-item.rs
index 024d14e21..024d14e21 100644
--- a/src/test/ui/associated-consts/associated-const-no-item.rs
+++ b/tests/ui/associated-consts/associated-const-no-item.rs
diff --git a/src/test/ui/associated-consts/associated-const-no-item.stderr b/tests/ui/associated-consts/associated-const-no-item.stderr
index fe27da5ac..fe27da5ac 100644
--- a/src/test/ui/associated-consts/associated-const-no-item.stderr
+++ b/tests/ui/associated-consts/associated-const-no-item.stderr
diff --git a/src/test/ui/associated-consts/associated-const-outer-ty-refs.rs b/tests/ui/associated-consts/associated-const-outer-ty-refs.rs
index f32ca0ccc..f32ca0ccc 100644
--- a/src/test/ui/associated-consts/associated-const-outer-ty-refs.rs
+++ b/tests/ui/associated-consts/associated-const-outer-ty-refs.rs
diff --git a/src/test/ui/associated-consts/associated-const-overwrite-default.rs b/tests/ui/associated-consts/associated-const-overwrite-default.rs
index 445135aef..445135aef 100644
--- a/src/test/ui/associated-consts/associated-const-overwrite-default.rs
+++ b/tests/ui/associated-consts/associated-const-overwrite-default.rs
diff --git a/src/test/ui/associated-consts/associated-const-private-impl.rs b/tests/ui/associated-consts/associated-const-private-impl.rs
index 3ee3134ac..3ee3134ac 100644
--- a/src/test/ui/associated-consts/associated-const-private-impl.rs
+++ b/tests/ui/associated-consts/associated-const-private-impl.rs
diff --git a/src/test/ui/associated-consts/associated-const-private-impl.stderr b/tests/ui/associated-consts/associated-const-private-impl.stderr
index a3fa3002e..a3fa3002e 100644
--- a/src/test/ui/associated-consts/associated-const-private-impl.stderr
+++ b/tests/ui/associated-consts/associated-const-private-impl.stderr
diff --git a/src/test/ui/associated-consts/associated-const-public-impl.rs b/tests/ui/associated-consts/associated-const-public-impl.rs
index 787bee0ff..787bee0ff 100644
--- a/src/test/ui/associated-consts/associated-const-public-impl.rs
+++ b/tests/ui/associated-consts/associated-const-public-impl.rs
diff --git a/src/test/ui/associated-consts/associated-const-range-match-patterns.rs b/tests/ui/associated-consts/associated-const-range-match-patterns.rs
index 5276869a7..5276869a7 100644
--- a/src/test/ui/associated-consts/associated-const-range-match-patterns.rs
+++ b/tests/ui/associated-consts/associated-const-range-match-patterns.rs
diff --git a/src/test/ui/associated-consts/associated-const-resolution-order.rs b/tests/ui/associated-consts/associated-const-resolution-order.rs
index d2ccd30a6..d2ccd30a6 100644
--- a/src/test/ui/associated-consts/associated-const-resolution-order.rs
+++ b/tests/ui/associated-consts/associated-const-resolution-order.rs
diff --git a/src/test/ui/associated-consts/associated-const-self-type.rs b/tests/ui/associated-consts/associated-const-self-type.rs
index 36e1e4ecc..36e1e4ecc 100644
--- a/src/test/ui/associated-consts/associated-const-self-type.rs
+++ b/tests/ui/associated-consts/associated-const-self-type.rs
diff --git a/src/test/ui/associated-consts/associated-const-trait-bound.rs b/tests/ui/associated-consts/associated-const-trait-bound.rs
index 403cdbd7f..403cdbd7f 100644
--- a/src/test/ui/associated-consts/associated-const-trait-bound.rs
+++ b/tests/ui/associated-consts/associated-const-trait-bound.rs
diff --git a/src/test/ui/associated-consts/associated-const-type-parameter-arms.rs b/tests/ui/associated-consts/associated-const-type-parameter-arms.rs
index 3f260d84e..3f260d84e 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameter-arms.rs
+++ b/tests/ui/associated-consts/associated-const-type-parameter-arms.rs
diff --git a/src/test/ui/associated-consts/associated-const-type-parameter-arms.stderr b/tests/ui/associated-consts/associated-const-type-parameter-arms.stderr
index 1ccf9febd..1ccf9febd 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameter-arms.stderr
+++ b/tests/ui/associated-consts/associated-const-type-parameter-arms.stderr
diff --git a/src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.rs b/tests/ui/associated-consts/associated-const-type-parameter-arrays-2.rs
index 8fe79b97d..8fe79b97d 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.rs
+++ b/tests/ui/associated-consts/associated-const-type-parameter-arrays-2.rs
diff --git a/src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.stderr b/tests/ui/associated-consts/associated-const-type-parameter-arrays-2.stderr
index 0bc019b2d..0bc019b2d 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.stderr
+++ b/tests/ui/associated-consts/associated-const-type-parameter-arrays-2.stderr
diff --git a/src/test/ui/associated-consts/associated-const-type-parameter-arrays.rs b/tests/ui/associated-consts/associated-const-type-parameter-arrays.rs
index 5152d7840..5152d7840 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameter-arrays.rs
+++ b/tests/ui/associated-consts/associated-const-type-parameter-arrays.rs
diff --git a/src/test/ui/associated-consts/associated-const-type-parameter-arrays.stderr b/tests/ui/associated-consts/associated-const-type-parameter-arrays.stderr
index 46a54a12d..46a54a12d 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameter-arrays.stderr
+++ b/tests/ui/associated-consts/associated-const-type-parameter-arrays.stderr
diff --git a/src/test/ui/associated-consts/associated-const-type-parameters.rs b/tests/ui/associated-consts/associated-const-type-parameters.rs
index e7ead1045..e7ead1045 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameters.rs
+++ b/tests/ui/associated-consts/associated-const-type-parameters.rs
diff --git a/src/test/ui/associated-consts/associated-const-ufcs-infer-trait.rs b/tests/ui/associated-consts/associated-const-ufcs-infer-trait.rs
index ca44c9f45..ca44c9f45 100644
--- a/src/test/ui/associated-consts/associated-const-ufcs-infer-trait.rs
+++ b/tests/ui/associated-consts/associated-const-ufcs-infer-trait.rs
diff --git a/src/test/ui/associated-consts/associated-const-use-default.rs b/tests/ui/associated-consts/associated-const-use-default.rs
index adf36b1ff..adf36b1ff 100644
--- a/src/test/ui/associated-consts/associated-const-use-default.rs
+++ b/tests/ui/associated-consts/associated-const-use-default.rs
diff --git a/src/test/ui/associated-consts/associated-const-use-impl-of-same-trait.rs b/tests/ui/associated-consts/associated-const-use-impl-of-same-trait.rs
index 8f01bae4f..8f01bae4f 100644
--- a/src/test/ui/associated-consts/associated-const-use-impl-of-same-trait.rs
+++ b/tests/ui/associated-consts/associated-const-use-impl-of-same-trait.rs
diff --git a/src/test/ui/associated-consts/associated-const.rs b/tests/ui/associated-consts/associated-const.rs
index e4b1c29f3..e4b1c29f3 100644
--- a/src/test/ui/associated-consts/associated-const.rs
+++ b/tests/ui/associated-consts/associated-const.rs
diff --git a/src/test/ui/associated-consts/auxiliary/associated-const-cc-lib.rs b/tests/ui/associated-consts/auxiliary/associated-const-cc-lib.rs
index 4fcefe32c..4fcefe32c 100644
--- a/src/test/ui/associated-consts/auxiliary/associated-const-cc-lib.rs
+++ b/tests/ui/associated-consts/auxiliary/associated-const-cc-lib.rs
diff --git a/src/test/ui/associated-consts/auxiliary/empty-struct.rs b/tests/ui/associated-consts/auxiliary/empty-struct.rs
index 93275e714..93275e714 100644
--- a/src/test/ui/associated-consts/auxiliary/empty-struct.rs
+++ b/tests/ui/associated-consts/auxiliary/empty-struct.rs
diff --git a/src/test/ui/associated-consts/defaults-cyclic-fail.rs b/tests/ui/associated-consts/defaults-cyclic-fail.rs
index a1c6840a0..a1c6840a0 100644
--- a/src/test/ui/associated-consts/defaults-cyclic-fail.rs
+++ b/tests/ui/associated-consts/defaults-cyclic-fail.rs
diff --git a/src/test/ui/associated-consts/defaults-cyclic-fail.stderr b/tests/ui/associated-consts/defaults-cyclic-fail.stderr
index a1483911b..a1483911b 100644
--- a/src/test/ui/associated-consts/defaults-cyclic-fail.stderr
+++ b/tests/ui/associated-consts/defaults-cyclic-fail.stderr
diff --git a/src/test/ui/associated-consts/defaults-cyclic-pass.rs b/tests/ui/associated-consts/defaults-cyclic-pass.rs
index 82105f25f..82105f25f 100644
--- a/src/test/ui/associated-consts/defaults-cyclic-pass.rs
+++ b/tests/ui/associated-consts/defaults-cyclic-pass.rs
diff --git a/src/test/ui/associated-consts/defaults-not-assumed-fail.rs b/tests/ui/associated-consts/defaults-not-assumed-fail.rs
index 495dfb338..495dfb338 100644
--- a/src/test/ui/associated-consts/defaults-not-assumed-fail.rs
+++ b/tests/ui/associated-consts/defaults-not-assumed-fail.rs
diff --git a/src/test/ui/associated-consts/defaults-not-assumed-fail.stderr b/tests/ui/associated-consts/defaults-not-assumed-fail.stderr
index fb7159e40..fb7159e40 100644
--- a/src/test/ui/associated-consts/defaults-not-assumed-fail.stderr
+++ b/tests/ui/associated-consts/defaults-not-assumed-fail.stderr
diff --git a/src/test/ui/associated-consts/defaults-not-assumed-pass.rs b/tests/ui/associated-consts/defaults-not-assumed-pass.rs
index c08e05c8a..c08e05c8a 100644
--- a/src/test/ui/associated-consts/defaults-not-assumed-pass.rs
+++ b/tests/ui/associated-consts/defaults-not-assumed-pass.rs
diff --git a/src/test/ui/associated-consts/issue-102335-const.rs b/tests/ui/associated-consts/issue-102335-const.rs
index f60cb92da..f60cb92da 100644
--- a/src/test/ui/associated-consts/issue-102335-const.rs
+++ b/tests/ui/associated-consts/issue-102335-const.rs
diff --git a/src/test/ui/associated-consts/issue-102335-const.stderr b/tests/ui/associated-consts/issue-102335-const.stderr
index 531d15c59..531d15c59 100644
--- a/src/test/ui/associated-consts/issue-102335-const.stderr
+++ b/tests/ui/associated-consts/issue-102335-const.stderr
diff --git a/src/test/ui/issues/issue-105330.rs b/tests/ui/associated-consts/issue-105330.rs
index 86e45f10b..86e45f10b 100644
--- a/src/test/ui/issues/issue-105330.rs
+++ b/tests/ui/associated-consts/issue-105330.rs
diff --git a/src/test/ui/issues/issue-105330.stderr b/tests/ui/associated-consts/issue-105330.stderr
index 92f2ccb65..30c380152 100644
--- a/src/test/ui/issues/issue-105330.stderr
+++ b/tests/ui/associated-consts/issue-105330.stderr
@@ -55,8 +55,10 @@ error[E0271]: type mismatch resolving `<Demo as TraitWAssocConst>::A == 32`
   --> $DIR/issue-105330.rs:12:11
    |
 LL |     foo::<Demo>()();
-   |           ^^^^ types differ
+   |           ^^^^ expected `32`, found `<Demo as TraitWAssocConst>::A`
    |
+   = note: expected constant `32`
+              found constant `<Demo as TraitWAssocConst>::A`
 note: required by a bound in `foo`
   --> $DIR/issue-105330.rs:11:28
    |
@@ -89,8 +91,10 @@ error[E0271]: type mismatch resolving `<Demo as TraitWAssocConst>::A == 32`
   --> $DIR/issue-105330.rs:19:11
    |
 LL |     foo::<Demo>();
-   |           ^^^^ types differ
+   |           ^^^^ expected `32`, found `<Demo as TraitWAssocConst>::A`
    |
+   = note: expected constant `32`
+              found constant `<Demo as TraitWAssocConst>::A`
 note: required by a bound in `foo`
   --> $DIR/issue-105330.rs:11:28
    |
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.rs b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.rs
index 0315938a7..0315938a7 100644
--- a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.rs
+++ b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.rs
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.stderr b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.stderr
index be5781761..be5781761 100644
--- a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.stderr
+++ b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.stderr
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.rs b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.rs
index 4e89f6862..4e89f6862 100644
--- a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.rs
+++ b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.rs
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.stderr b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.stderr
index 8347b260b..8347b260b 100644
--- a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.stderr
+++ b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.stderr
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.rs b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.rs
index 68b653ff3..68b653ff3 100644
--- a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.rs
+++ b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.rs
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr
index 3955a3120..3955a3120 100644
--- a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr
+++ b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr
diff --git a/src/test/ui/associated-consts/issue-47814.rs b/tests/ui/associated-consts/issue-47814.rs
index a28b1c001..a28b1c001 100644
--- a/src/test/ui/associated-consts/issue-47814.rs
+++ b/tests/ui/associated-consts/issue-47814.rs
diff --git a/src/test/ui/associated-consts/issue-47814.stderr b/tests/ui/associated-consts/issue-47814.stderr
index 2e4ddb811..2e4ddb811 100644
--- a/src/test/ui/associated-consts/issue-47814.stderr
+++ b/tests/ui/associated-consts/issue-47814.stderr
diff --git a/src/test/ui/associated-consts/issue-58022.rs b/tests/ui/associated-consts/issue-58022.rs
index 2a8a1eaa6..2a8a1eaa6 100644
--- a/src/test/ui/associated-consts/issue-58022.rs
+++ b/tests/ui/associated-consts/issue-58022.rs
diff --git a/src/test/ui/associated-consts/issue-58022.stderr b/tests/ui/associated-consts/issue-58022.stderr
index 56d85c066..56d85c066 100644
--- a/src/test/ui/associated-consts/issue-58022.stderr
+++ b/tests/ui/associated-consts/issue-58022.stderr
diff --git a/src/test/ui/associated-consts/issue-63496.rs b/tests/ui/associated-consts/issue-63496.rs
index 67ef4e74c..67ef4e74c 100644
--- a/src/test/ui/associated-consts/issue-63496.rs
+++ b/tests/ui/associated-consts/issue-63496.rs
diff --git a/src/test/ui/associated-consts/issue-63496.stderr b/tests/ui/associated-consts/issue-63496.stderr
index f2a4e01ad..f2a4e01ad 100644
--- a/src/test/ui/associated-consts/issue-63496.stderr
+++ b/tests/ui/associated-consts/issue-63496.stderr
diff --git a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.noopt.stderr b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.noopt.stderr
index 0c3581900..0c3581900 100644
--- a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.noopt.stderr
+++ b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.noopt.stderr
diff --git a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt.stderr b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt.stderr
index 0c3581900..0c3581900 100644
--- a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt.stderr
+++ b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt.stderr
diff --git a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr
index 0c3581900..0c3581900 100644
--- a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr
+++ b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr
diff --git a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs
index d4af6e864..d4af6e864 100644
--- a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs
+++ b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs
diff --git a/src/test/ui/associated-consts/issue-88599-ref-self.rs b/tests/ui/associated-consts/issue-88599-ref-self.rs
index f1144db44..f1144db44 100644
--- a/src/test/ui/associated-consts/issue-88599-ref-self.rs
+++ b/tests/ui/associated-consts/issue-88599-ref-self.rs
diff --git a/src/test/ui/associated-consts/issue-93775.rs b/tests/ui/associated-consts/issue-93775.rs
index 7a007b732..7a007b732 100644
--- a/src/test/ui/associated-consts/issue-93775.rs
+++ b/tests/ui/associated-consts/issue-93775.rs
diff --git a/src/test/ui/associated-consts/issue-93835.rs b/tests/ui/associated-consts/issue-93835.rs
index b2a437fcb..b2a437fcb 100644
--- a/src/test/ui/associated-consts/issue-93835.rs
+++ b/tests/ui/associated-consts/issue-93835.rs
diff --git a/src/test/ui/associated-consts/issue-93835.stderr b/tests/ui/associated-consts/issue-93835.stderr
index be0573a13..be0573a13 100644
--- a/src/test/ui/associated-consts/issue-93835.stderr
+++ b/tests/ui/associated-consts/issue-93835.stderr
diff --git a/src/test/ui/associated-consts/mismatched_impl_ty_1.rs b/tests/ui/associated-consts/mismatched_impl_ty_1.rs
index 4dc6c2e47..4dc6c2e47 100644
--- a/src/test/ui/associated-consts/mismatched_impl_ty_1.rs
+++ b/tests/ui/associated-consts/mismatched_impl_ty_1.rs
diff --git a/src/test/ui/associated-consts/mismatched_impl_ty_2.rs b/tests/ui/associated-consts/mismatched_impl_ty_2.rs
index 539becfdc..539becfdc 100644
--- a/src/test/ui/associated-consts/mismatched_impl_ty_2.rs
+++ b/tests/ui/associated-consts/mismatched_impl_ty_2.rs
diff --git a/src/test/ui/associated-consts/mismatched_impl_ty_3.rs b/tests/ui/associated-consts/mismatched_impl_ty_3.rs
index 17bcc8fe5..17bcc8fe5 100644
--- a/src/test/ui/associated-consts/mismatched_impl_ty_3.rs
+++ b/tests/ui/associated-consts/mismatched_impl_ty_3.rs
diff --git a/src/test/ui/associated-consts/shadowed-const.rs b/tests/ui/associated-consts/shadowed-const.rs
index cfdb391d3..cfdb391d3 100644
--- a/src/test/ui/associated-consts/shadowed-const.rs
+++ b/tests/ui/associated-consts/shadowed-const.rs
diff --git a/src/test/ui/associated-consts/shadowed-const.stderr b/tests/ui/associated-consts/shadowed-const.stderr
index fe21d2aec..fe21d2aec 100644
--- a/src/test/ui/associated-consts/shadowed-const.stderr
+++ b/tests/ui/associated-consts/shadowed-const.stderr
diff --git a/src/test/ui/associated-inherent-types/assoc-inherent-no-body.rs b/tests/ui/associated-inherent-types/assoc-inherent-no-body.rs
index 71f65b92e..71f65b92e 100644
--- a/src/test/ui/associated-inherent-types/assoc-inherent-no-body.rs
+++ b/tests/ui/associated-inherent-types/assoc-inherent-no-body.rs
diff --git a/src/test/ui/associated-inherent-types/assoc-inherent-no-body.stderr b/tests/ui/associated-inherent-types/assoc-inherent-no-body.stderr
index 387a5658d..387a5658d 100644
--- a/src/test/ui/associated-inherent-types/assoc-inherent-no-body.stderr
+++ b/tests/ui/associated-inherent-types/assoc-inherent-no-body.stderr
diff --git a/src/test/ui/associated-inherent-types/assoc-inherent-private.rs b/tests/ui/associated-inherent-types/assoc-inherent-private.rs
index 531581954..531581954 100644
--- a/src/test/ui/associated-inherent-types/assoc-inherent-private.rs
+++ b/tests/ui/associated-inherent-types/assoc-inherent-private.rs
diff --git a/src/test/ui/associated-inherent-types/assoc-inherent-private.stderr b/tests/ui/associated-inherent-types/assoc-inherent-private.stderr
index d67b45dae..d67b45dae 100644
--- a/src/test/ui/associated-inherent-types/assoc-inherent-private.stderr
+++ b/tests/ui/associated-inherent-types/assoc-inherent-private.stderr
diff --git a/src/test/ui/associated-inherent-types/assoc-inherent-unstable.rs b/tests/ui/associated-inherent-types/assoc-inherent-unstable.rs
index 34b4e47bf..34b4e47bf 100644
--- a/src/test/ui/associated-inherent-types/assoc-inherent-unstable.rs
+++ b/tests/ui/associated-inherent-types/assoc-inherent-unstable.rs
diff --git a/src/test/ui/associated-inherent-types/assoc-inherent-unstable.stderr b/tests/ui/associated-inherent-types/assoc-inherent-unstable.stderr
index c0be8bfd7..c0be8bfd7 100644
--- a/src/test/ui/associated-inherent-types/assoc-inherent-unstable.stderr
+++ b/tests/ui/associated-inherent-types/assoc-inherent-unstable.stderr
diff --git a/src/test/ui/associated-inherent-types/assoc-inherent-use.rs b/tests/ui/associated-inherent-types/assoc-inherent-use.rs
index 7ae425e2a..7ae425e2a 100644
--- a/src/test/ui/associated-inherent-types/assoc-inherent-use.rs
+++ b/tests/ui/associated-inherent-types/assoc-inherent-use.rs
diff --git a/src/test/ui/associated-inherent-types/auxiliary/assoc-inherent-unstable.rs b/tests/ui/associated-inherent-types/auxiliary/assoc-inherent-unstable.rs
index 6b71ffc97..6b71ffc97 100644
--- a/src/test/ui/associated-inherent-types/auxiliary/assoc-inherent-unstable.rs
+++ b/tests/ui/associated-inherent-types/auxiliary/assoc-inherent-unstable.rs
diff --git a/src/test/ui/associated-inherent-types/issue-104260.rs b/tests/ui/associated-inherent-types/issue-104260.rs
index a73cd1775..a73cd1775 100644
--- a/src/test/ui/associated-inherent-types/issue-104260.rs
+++ b/tests/ui/associated-inherent-types/issue-104260.rs
diff --git a/src/test/ui/associated-inherent-types/normalize-projection-0.rs b/tests/ui/associated-inherent-types/normalize-projection-0.rs
index 50763ecdd..50763ecdd 100644
--- a/src/test/ui/associated-inherent-types/normalize-projection-0.rs
+++ b/tests/ui/associated-inherent-types/normalize-projection-0.rs
diff --git a/src/test/ui/associated-inherent-types/normalize-projection-1.rs b/tests/ui/associated-inherent-types/normalize-projection-1.rs
index 2f7b2551a..2f7b2551a 100644
--- a/src/test/ui/associated-inherent-types/normalize-projection-1.rs
+++ b/tests/ui/associated-inherent-types/normalize-projection-1.rs
diff --git a/src/test/ui/associated-inherent-types/struct-generics.rs b/tests/ui/associated-inherent-types/struct-generics.rs
index 8952b3791..8952b3791 100644
--- a/src/test/ui/associated-inherent-types/struct-generics.rs
+++ b/tests/ui/associated-inherent-types/struct-generics.rs
diff --git a/tests/ui/associated-inherent-types/style.rs b/tests/ui/associated-inherent-types/style.rs
new file mode 100644
index 000000000..8775bd19e
--- /dev/null
+++ b/tests/ui/associated-inherent-types/style.rs
@@ -0,0 +1,12 @@
+#![feature(inherent_associated_types)]
+#![allow(incomplete_features, dead_code)]
+#![deny(non_camel_case_types)]
+
+struct S;
+
+impl S {
+    type typ = ();
+    //~^ ERROR associated type `typ` should have an upper camel case name
+}
+
+fn main() {}
diff --git a/tests/ui/associated-inherent-types/style.stderr b/tests/ui/associated-inherent-types/style.stderr
new file mode 100644
index 000000000..f83061f8c
--- /dev/null
+++ b/tests/ui/associated-inherent-types/style.stderr
@@ -0,0 +1,14 @@
+error: associated type `typ` should have an upper camel case name
+  --> $DIR/style.rs:8:10
+   |
+LL |     type typ = ();
+   |          ^^^ help: convert the identifier to upper camel case: `Typ`
+   |
+note: the lint level is defined here
+  --> $DIR/style.rs:3:9
+   |
+LL | #![deny(non_camel_case_types)]
+   |         ^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/tests/ui/associated-item/ambiguous-associated-type-with-generics.fixed b/tests/ui/associated-item/ambiguous-associated-type-with-generics.fixed
new file mode 100644
index 000000000..23f715200
--- /dev/null
+++ b/tests/ui/associated-item/ambiguous-associated-type-with-generics.fixed
@@ -0,0 +1,14 @@
+// run-rustfix
+trait Trait<A> {}
+
+trait Assoc {
+    type Ty;
+}
+
+impl<A> Assoc for dyn Trait<A> {
+    type Ty = i32;
+}
+
+fn main() {
+    let _x: <dyn Trait<i32> as Assoc>::Ty; //~ ERROR ambiguous associated type
+}
diff --git a/tests/ui/associated-item/ambiguous-associated-type-with-generics.rs b/tests/ui/associated-item/ambiguous-associated-type-with-generics.rs
new file mode 100644
index 000000000..9c26e339a
--- /dev/null
+++ b/tests/ui/associated-item/ambiguous-associated-type-with-generics.rs
@@ -0,0 +1,14 @@
+// run-rustfix
+trait Trait<A> {}
+
+trait Assoc {
+    type Ty;
+}
+
+impl<A> Assoc for dyn Trait<A> {
+    type Ty = i32;
+}
+
+fn main() {
+    let _x: <dyn Trait<i32>>::Ty; //~ ERROR ambiguous associated type
+}
diff --git a/tests/ui/associated-item/ambiguous-associated-type-with-generics.stderr b/tests/ui/associated-item/ambiguous-associated-type-with-generics.stderr
new file mode 100644
index 000000000..97088b79f
--- /dev/null
+++ b/tests/ui/associated-item/ambiguous-associated-type-with-generics.stderr
@@ -0,0 +1,9 @@
+error[E0223]: ambiguous associated type
+  --> $DIR/ambiguous-associated-type-with-generics.rs:13:13
+   |
+LL |     let _x: <dyn Trait<i32>>::Ty;
+   |             ^^^^^^^^^^^^^^^^^^^^ help: use the fully-qualified path: `<dyn Trait<i32> as Assoc>::Ty`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/associated-item/associated-item-duplicate-bounds.rs b/tests/ui/associated-item/associated-item-duplicate-bounds.rs
index 242a02353..242a02353 100644
--- a/src/test/ui/associated-item/associated-item-duplicate-bounds.rs
+++ b/tests/ui/associated-item/associated-item-duplicate-bounds.rs
diff --git a/src/test/ui/associated-item/associated-item-duplicate-bounds.stderr b/tests/ui/associated-item/associated-item-duplicate-bounds.stderr
index f2e4ca524..f2e4ca524 100644
--- a/src/test/ui/associated-item/associated-item-duplicate-bounds.stderr
+++ b/tests/ui/associated-item/associated-item-duplicate-bounds.stderr
diff --git a/src/test/ui/associated-item/associated-item-duplicate-names-2.rs b/tests/ui/associated-item/associated-item-duplicate-names-2.rs
index 550c7ae39..550c7ae39 100644
--- a/src/test/ui/associated-item/associated-item-duplicate-names-2.rs
+++ b/tests/ui/associated-item/associated-item-duplicate-names-2.rs
diff --git a/src/test/ui/associated-item/associated-item-duplicate-names-2.stderr b/tests/ui/associated-item/associated-item-duplicate-names-2.stderr
index 0b96a6bd7..0b96a6bd7 100644
--- a/src/test/ui/associated-item/associated-item-duplicate-names-2.stderr
+++ b/tests/ui/associated-item/associated-item-duplicate-names-2.stderr
diff --git a/src/test/ui/associated-item/associated-item-duplicate-names-3.rs b/tests/ui/associated-item/associated-item-duplicate-names-3.rs
index 3a70a2f94..3a70a2f94 100644
--- a/src/test/ui/associated-item/associated-item-duplicate-names-3.rs
+++ b/tests/ui/associated-item/associated-item-duplicate-names-3.rs
diff --git a/src/test/ui/associated-item/associated-item-duplicate-names-3.stderr b/tests/ui/associated-item/associated-item-duplicate-names-3.stderr
index bf4bd634c..d0c170620 100644
--- a/src/test/ui/associated-item/associated-item-duplicate-names-3.stderr
+++ b/tests/ui/associated-item/associated-item-duplicate-names-3.stderr
@@ -13,7 +13,7 @@ error[E0223]: ambiguous associated type
   --> $DIR/associated-item-duplicate-names-3.rs:18:12
    |
 LL |     let x: Baz::Bar = 5;
-   |            ^^^^^^^^ help: use fully-qualified syntax: `<Baz as Trait>::Bar`
+   |            ^^^^^^^^ help: use the fully-qualified path: `<Baz as Foo>::Bar`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/associated-item/associated-item-duplicate-names.rs b/tests/ui/associated-item/associated-item-duplicate-names.rs
index 6677fad68..6677fad68 100644
--- a/src/test/ui/associated-item/associated-item-duplicate-names.rs
+++ b/tests/ui/associated-item/associated-item-duplicate-names.rs
diff --git a/src/test/ui/associated-item/associated-item-duplicate-names.stderr b/tests/ui/associated-item/associated-item-duplicate-names.stderr
index f89ea6e57..f89ea6e57 100644
--- a/src/test/ui/associated-item/associated-item-duplicate-names.stderr
+++ b/tests/ui/associated-item/associated-item-duplicate-names.stderr
diff --git a/src/test/ui/associated-item/associated-item-enum.rs b/tests/ui/associated-item/associated-item-enum.rs
index 30ba25815..30ba25815 100644
--- a/src/test/ui/associated-item/associated-item-enum.rs
+++ b/tests/ui/associated-item/associated-item-enum.rs
diff --git a/src/test/ui/associated-item/associated-item-enum.stderr b/tests/ui/associated-item/associated-item-enum.stderr
index ebf3c5499..ebf3c5499 100644
--- a/src/test/ui/associated-item/associated-item-enum.stderr
+++ b/tests/ui/associated-item/associated-item-enum.stderr
diff --git a/src/test/ui/associated-item/associated-item-two-bounds.rs b/tests/ui/associated-item/associated-item-two-bounds.rs
index 25b0d5a56..25b0d5a56 100644
--- a/src/test/ui/associated-item/associated-item-two-bounds.rs
+++ b/tests/ui/associated-item/associated-item-two-bounds.rs
diff --git a/src/test/ui/associated-item/impl-duplicate-methods.rs b/tests/ui/associated-item/impl-duplicate-methods.rs
index 328d54d5a..328d54d5a 100644
--- a/src/test/ui/associated-item/impl-duplicate-methods.rs
+++ b/tests/ui/associated-item/impl-duplicate-methods.rs
diff --git a/src/test/ui/associated-item/impl-duplicate-methods.stderr b/tests/ui/associated-item/impl-duplicate-methods.stderr
index 6f753845a..6f753845a 100644
--- a/src/test/ui/associated-item/impl-duplicate-methods.stderr
+++ b/tests/ui/associated-item/impl-duplicate-methods.stderr
diff --git a/tests/ui/associated-item/issue-105449.rs b/tests/ui/associated-item/issue-105449.rs
new file mode 100644
index 000000000..dd14e05fd
--- /dev/null
+++ b/tests/ui/associated-item/issue-105449.rs
@@ -0,0 +1,59 @@
+// check-pass
+// compile-flags: -C debug_assertions=yes -Zunstable-options
+
+#[allow(dead_code)]
+fn problematic_function<Space>()
+where
+    DefaultAlloc: FinAllok<R1, Space>,
+{
+    let e = Edge2dElement;
+    let _ = Into::<Point>::into(e.map_reference_coords());
+}
+impl<N> Allocator<N, R0> for DefaultAlloc {
+    type Buffer = MStorage;
+}
+impl<N> Allocator<N, R1> for DefaultAlloc {
+    type Buffer = MStorage;
+}
+impl<N, D> From<VectorN<N, D>> for Point
+where
+    DefaultAlloc: Allocator<N, D>,
+{
+    fn from(_: VectorN<N, D>) -> Self {
+        unimplemented!()
+    }
+}
+impl<GeometryDim, NodalDim> FinAllok<GeometryDim, NodalDim> for DefaultAlloc
+where
+    DefaultAlloc: Allocator<Ure, GeometryDim>,
+    DefaultAlloc: Allocator<Ure, NodalDim>
+{
+}
+impl FiniteElement<R1> for Edge2dElement {
+    fn map_reference_coords(&self) -> VectorN<Ure, R1> {
+        unimplemented!()
+    }
+}
+type VectorN<N, R> = (N, R, <DefaultAlloc as Allocator<N, R>>::Buffer);
+struct DefaultAlloc;
+struct R0;
+struct R1;
+struct MStorage;
+struct Point;
+struct Edge2dElement;
+struct Ure;
+trait Allocator<N, R> {
+    type Buffer;
+}
+trait FinAllok<GeometryDim, NodalDim>:
+    Allocator<Ure, GeometryDim> +
+    Allocator<Ure, NodalDim> +
+{
+}
+trait FiniteElement<Rau>
+where
+    DefaultAlloc: FinAllok<Rau, Rau>,
+{
+    fn map_reference_coords(&self) -> VectorN<Ure, Rau>;
+}
+fn main() {}
diff --git a/src/test/ui/associated-item/issue-48027.rs b/tests/ui/associated-item/issue-48027.rs
index d2b51184c..d2b51184c 100644
--- a/src/test/ui/associated-item/issue-48027.rs
+++ b/tests/ui/associated-item/issue-48027.rs
diff --git a/src/test/ui/associated-item/issue-48027.stderr b/tests/ui/associated-item/issue-48027.stderr
index 45ea41933..45ea41933 100644
--- a/src/test/ui/associated-item/issue-48027.stderr
+++ b/tests/ui/associated-item/issue-48027.stderr
diff --git a/src/test/ui/associated-item/issue-87638.fixed b/tests/ui/associated-item/issue-87638.fixed
index b68977768..b68977768 100644
--- a/src/test/ui/associated-item/issue-87638.fixed
+++ b/tests/ui/associated-item/issue-87638.fixed
diff --git a/src/test/ui/associated-item/issue-87638.rs b/tests/ui/associated-item/issue-87638.rs
index 5a60b20fd..5a60b20fd 100644
--- a/src/test/ui/associated-item/issue-87638.rs
+++ b/tests/ui/associated-item/issue-87638.rs
diff --git a/src/test/ui/associated-item/issue-87638.stderr b/tests/ui/associated-item/issue-87638.stderr
index cf6083444..cf6083444 100644
--- a/src/test/ui/associated-item/issue-87638.stderr
+++ b/tests/ui/associated-item/issue-87638.stderr
diff --git a/src/test/ui/associated-path-shl.rs b/tests/ui/associated-path-shl.rs
index 20a6fd83f..20a6fd83f 100644
--- a/src/test/ui/associated-path-shl.rs
+++ b/tests/ui/associated-path-shl.rs
diff --git a/src/test/ui/associated-path-shl.stderr b/tests/ui/associated-path-shl.stderr
index 71ee93f48..71ee93f48 100644
--- a/src/test/ui/associated-path-shl.stderr
+++ b/tests/ui/associated-path-shl.stderr
diff --git a/src/test/ui/associated-type-bounds/ambiguous-associated-type.rs b/tests/ui/associated-type-bounds/ambiguous-associated-type.rs
index 9c47a003d..9c47a003d 100644
--- a/src/test/ui/associated-type-bounds/ambiguous-associated-type.rs
+++ b/tests/ui/associated-type-bounds/ambiguous-associated-type.rs
diff --git a/src/test/ui/associated-type-bounds/ambiguous-associated-type2.rs b/tests/ui/associated-type-bounds/ambiguous-associated-type2.rs
index 48de59334..48de59334 100644
--- a/src/test/ui/associated-type-bounds/ambiguous-associated-type2.rs
+++ b/tests/ui/associated-type-bounds/ambiguous-associated-type2.rs
diff --git a/src/test/ui/associated-type-bounds/ambiguous-associated-type2.stderr b/tests/ui/associated-type-bounds/ambiguous-associated-type2.stderr
index 4162cdaa8..4162cdaa8 100644
--- a/src/test/ui/associated-type-bounds/ambiguous-associated-type2.stderr
+++ b/tests/ui/associated-type-bounds/ambiguous-associated-type2.stderr
diff --git a/src/test/ui/associated-type-bounds/assoc-type-bound-through-where-clause.rs b/tests/ui/associated-type-bounds/assoc-type-bound-through-where-clause.rs
index 49f111407..49f111407 100644
--- a/src/test/ui/associated-type-bounds/assoc-type-bound-through-where-clause.rs
+++ b/tests/ui/associated-type-bounds/assoc-type-bound-through-where-clause.rs
diff --git a/src/test/ui/associated-type-bounds/assoc-type-eq-with-dyn-atb-fail.rs b/tests/ui/associated-type-bounds/assoc-type-eq-with-dyn-atb-fail.rs
index 4c36289f4..4c36289f4 100644
--- a/src/test/ui/associated-type-bounds/assoc-type-eq-with-dyn-atb-fail.rs
+++ b/tests/ui/associated-type-bounds/assoc-type-eq-with-dyn-atb-fail.rs
diff --git a/src/test/ui/associated-type-bounds/assoc-type-eq-with-dyn-atb-fail.stderr b/tests/ui/associated-type-bounds/assoc-type-eq-with-dyn-atb-fail.stderr
index a32ab4531..a32ab4531 100644
--- a/src/test/ui/associated-type-bounds/assoc-type-eq-with-dyn-atb-fail.stderr
+++ b/tests/ui/associated-type-bounds/assoc-type-eq-with-dyn-atb-fail.stderr
diff --git a/src/test/ui/associated-type-bounds/associated-item-through-where-clause.rs b/tests/ui/associated-type-bounds/associated-item-through-where-clause.rs
index 3eb50ab55..3eb50ab55 100644
--- a/src/test/ui/associated-type-bounds/associated-item-through-where-clause.rs
+++ b/tests/ui/associated-type-bounds/associated-item-through-where-clause.rs
diff --git a/src/test/ui/associated-type-bounds/auxiliary/fn-aux.rs b/tests/ui/associated-type-bounds/auxiliary/fn-aux.rs
index 0ea23ad1d..0ea23ad1d 100644
--- a/src/test/ui/associated-type-bounds/auxiliary/fn-aux.rs
+++ b/tests/ui/associated-type-bounds/auxiliary/fn-aux.rs
diff --git a/src/test/ui/associated-type-bounds/auxiliary/fn-dyn-aux.rs b/tests/ui/associated-type-bounds/auxiliary/fn-dyn-aux.rs
index 85d6c5aaf..85d6c5aaf 100644
--- a/src/test/ui/associated-type-bounds/auxiliary/fn-dyn-aux.rs
+++ b/tests/ui/associated-type-bounds/auxiliary/fn-dyn-aux.rs
diff --git a/src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.rs b/tests/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.rs
index d180de9be..d180de9be 100644
--- a/src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.rs
+++ b/tests/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.rs
diff --git a/src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.stderr b/tests/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.stderr
index c23e54594..c23e54594 100644
--- a/src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.stderr
+++ b/tests/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.stderr
diff --git a/src/test/ui/associated-type-bounds/binder-on-bound.rs b/tests/ui/associated-type-bounds/binder-on-bound.rs
index 6cba45129..6cba45129 100644
--- a/src/test/ui/associated-type-bounds/binder-on-bound.rs
+++ b/tests/ui/associated-type-bounds/binder-on-bound.rs
diff --git a/src/test/ui/associated-type-bounds/binder-on-bound.stderr b/tests/ui/associated-type-bounds/binder-on-bound.stderr
index f71f72bfb..f71f72bfb 100644
--- a/src/test/ui/associated-type-bounds/binder-on-bound.stderr
+++ b/tests/ui/associated-type-bounds/binder-on-bound.stderr
diff --git a/src/test/ui/associated-type-bounds/bounds-on-assoc-in-trait.rs b/tests/ui/associated-type-bounds/bounds-on-assoc-in-trait.rs
index 23be73501..23be73501 100644
--- a/src/test/ui/associated-type-bounds/bounds-on-assoc-in-trait.rs
+++ b/tests/ui/associated-type-bounds/bounds-on-assoc-in-trait.rs
diff --git a/src/test/ui/associated-type-bounds/bounds-on-assoc-in-trait.stderr b/tests/ui/associated-type-bounds/bounds-on-assoc-in-trait.stderr
index 4e2313bd4..4e2313bd4 100644
--- a/src/test/ui/associated-type-bounds/bounds-on-assoc-in-trait.stderr
+++ b/tests/ui/associated-type-bounds/bounds-on-assoc-in-trait.stderr
diff --git a/tests/ui/associated-type-bounds/const-projection-err.gce.stderr b/tests/ui/associated-type-bounds/const-projection-err.gce.stderr
new file mode 100644
index 000000000..0f1ec9ad0
--- /dev/null
+++ b/tests/ui/associated-type-bounds/const-projection-err.gce.stderr
@@ -0,0 +1,24 @@
+warning: the feature `generic_const_exprs` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/const-projection-err.rs:4:26
+   |
+LL | #![cfg_attr(gce, feature(generic_const_exprs))]
+   |                          ^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #76560 <https://github.com/rust-lang/rust/issues/76560> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+error[E0271]: type mismatch resolving `<T as TraitWAssocConst>::A == 1`
+  --> $DIR/const-projection-err.rs:14:11
+   |
+LL |     foo::<T>();
+   |           ^ expected `0`, found `1`
+   |
+note: required by a bound in `foo`
+  --> $DIR/const-projection-err.rs:11:28
+   |
+LL | fn foo<T: TraitWAssocConst<A = 1>>() {}
+   |                            ^^^^^ required by this bound in `foo`
+
+error: aborting due to previous error; 1 warning emitted
+
+For more information about this error, try `rustc --explain E0271`.
diff --git a/tests/ui/associated-type-bounds/const-projection-err.rs b/tests/ui/associated-type-bounds/const-projection-err.rs
new file mode 100644
index 000000000..bead85630
--- /dev/null
+++ b/tests/ui/associated-type-bounds/const-projection-err.rs
@@ -0,0 +1,18 @@
+// revisions: stock gce
+
+#![feature(associated_const_equality)]
+#![cfg_attr(gce, feature(generic_const_exprs))]
+//[gce]~^ WARN the feature `generic_const_exprs` is incomplete
+
+trait TraitWAssocConst {
+    const A: usize;
+}
+
+fn foo<T: TraitWAssocConst<A = 1>>() {}
+
+fn bar<T: TraitWAssocConst<A = 0>>() {
+    foo::<T>();
+    //~^ ERROR type mismatch resolving `<T as TraitWAssocConst>::A == 1`
+}
+
+fn main() {}
diff --git a/tests/ui/associated-type-bounds/const-projection-err.stock.stderr b/tests/ui/associated-type-bounds/const-projection-err.stock.stderr
new file mode 100644
index 000000000..bf0824259
--- /dev/null
+++ b/tests/ui/associated-type-bounds/const-projection-err.stock.stderr
@@ -0,0 +1,17 @@
+error[E0271]: type mismatch resolving `<T as TraitWAssocConst>::A == 1`
+  --> $DIR/const-projection-err.rs:14:11
+   |
+LL |     foo::<T>();
+   |           ^ expected `1`, found `<T as TraitWAssocConst>::A`
+   |
+   = note: expected constant `1`
+              found constant `<T as TraitWAssocConst>::A`
+note: required by a bound in `foo`
+  --> $DIR/const-projection-err.rs:11:28
+   |
+LL | fn foo<T: TraitWAssocConst<A = 1>>() {}
+   |                            ^^^^^ required by this bound in `foo`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0271`.
diff --git a/src/test/ui/associated-type-bounds/duplicate.rs b/tests/ui/associated-type-bounds/duplicate.rs
index f67410986..f67410986 100644
--- a/src/test/ui/associated-type-bounds/duplicate.rs
+++ b/tests/ui/associated-type-bounds/duplicate.rs
diff --git a/src/test/ui/associated-type-bounds/duplicate.stderr b/tests/ui/associated-type-bounds/duplicate.stderr
index c3061327f..c3061327f 100644
--- a/src/test/ui/associated-type-bounds/duplicate.stderr
+++ b/tests/ui/associated-type-bounds/duplicate.stderr
diff --git a/src/test/ui/associated-type-bounds/dyn-impl-trait-type.rs b/tests/ui/associated-type-bounds/dyn-impl-trait-type.rs
index a8d00803a..a8d00803a 100644
--- a/src/test/ui/associated-type-bounds/dyn-impl-trait-type.rs
+++ b/tests/ui/associated-type-bounds/dyn-impl-trait-type.rs
diff --git a/src/test/ui/associated-type-bounds/dyn-rpit-and-let.rs b/tests/ui/associated-type-bounds/dyn-rpit-and-let.rs
index 08f965452..08f965452 100644
--- a/src/test/ui/associated-type-bounds/dyn-rpit-and-let.rs
+++ b/tests/ui/associated-type-bounds/dyn-rpit-and-let.rs
diff --git a/src/test/ui/associated-type-bounds/elision.rs b/tests/ui/associated-type-bounds/elision.rs
index d00def571..d00def571 100644
--- a/src/test/ui/associated-type-bounds/elision.rs
+++ b/tests/ui/associated-type-bounds/elision.rs
diff --git a/src/test/ui/associated-type-bounds/elision.stderr b/tests/ui/associated-type-bounds/elision.stderr
index ea3024627..ea3024627 100644
--- a/src/test/ui/associated-type-bounds/elision.stderr
+++ b/tests/ui/associated-type-bounds/elision.stderr
diff --git a/src/test/ui/associated-type-bounds/entails-sized-object-safety.rs b/tests/ui/associated-type-bounds/entails-sized-object-safety.rs
index f5a9bac6e..f5a9bac6e 100644
--- a/src/test/ui/associated-type-bounds/entails-sized-object-safety.rs
+++ b/tests/ui/associated-type-bounds/entails-sized-object-safety.rs
diff --git a/src/test/ui/associated-type-bounds/enum-bounds.rs b/tests/ui/associated-type-bounds/enum-bounds.rs
index 193f2efe1..193f2efe1 100644
--- a/src/test/ui/associated-type-bounds/enum-bounds.rs
+++ b/tests/ui/associated-type-bounds/enum-bounds.rs
diff --git a/src/test/ui/associated-type-bounds/fn-apit.rs b/tests/ui/associated-type-bounds/fn-apit.rs
index 3c9f51133..3c9f51133 100644
--- a/src/test/ui/associated-type-bounds/fn-apit.rs
+++ b/tests/ui/associated-type-bounds/fn-apit.rs
diff --git a/src/test/ui/associated-type-bounds/fn-aux.rs b/tests/ui/associated-type-bounds/fn-aux.rs
index 434bdbe99..434bdbe99 100644
--- a/src/test/ui/associated-type-bounds/fn-aux.rs
+++ b/tests/ui/associated-type-bounds/fn-aux.rs
diff --git a/src/test/ui/associated-type-bounds/fn-dyn-apit.rs b/tests/ui/associated-type-bounds/fn-dyn-apit.rs
index c4e8092c2..c4e8092c2 100644
--- a/src/test/ui/associated-type-bounds/fn-dyn-apit.rs
+++ b/tests/ui/associated-type-bounds/fn-dyn-apit.rs
diff --git a/src/test/ui/associated-type-bounds/fn-inline.rs b/tests/ui/associated-type-bounds/fn-inline.rs
index 8fa7212d6..8fa7212d6 100644
--- a/src/test/ui/associated-type-bounds/fn-inline.rs
+++ b/tests/ui/associated-type-bounds/fn-inline.rs
diff --git a/src/test/ui/associated-type-bounds/fn-where.rs b/tests/ui/associated-type-bounds/fn-where.rs
index 9c4f82ac9..9c4f82ac9 100644
--- a/src/test/ui/associated-type-bounds/fn-where.rs
+++ b/tests/ui/associated-type-bounds/fn-where.rs
diff --git a/src/test/ui/associated-type-bounds/fn-wrap-apit.rs b/tests/ui/associated-type-bounds/fn-wrap-apit.rs
index 96df13e37..96df13e37 100644
--- a/src/test/ui/associated-type-bounds/fn-wrap-apit.rs
+++ b/tests/ui/associated-type-bounds/fn-wrap-apit.rs
diff --git a/src/test/ui/associated-type-bounds/handle-predicates-that-can-define-assoc-type.rs b/tests/ui/associated-type-bounds/handle-predicates-that-can-define-assoc-type.rs
index b1e54ec04..b1e54ec04 100644
--- a/src/test/ui/associated-type-bounds/handle-predicates-that-can-define-assoc-type.rs
+++ b/tests/ui/associated-type-bounds/handle-predicates-that-can-define-assoc-type.rs
diff --git a/src/test/ui/associated-type-bounds/hrtb.rs b/tests/ui/associated-type-bounds/hrtb.rs
index 7ab383649..7ab383649 100644
--- a/src/test/ui/associated-type-bounds/hrtb.rs
+++ b/tests/ui/associated-type-bounds/hrtb.rs
diff --git a/src/test/ui/associated-type-bounds/implied-region-constraints.rs b/tests/ui/associated-type-bounds/implied-region-constraints.rs
index 38219da61..38219da61 100644
--- a/src/test/ui/associated-type-bounds/implied-region-constraints.rs
+++ b/tests/ui/associated-type-bounds/implied-region-constraints.rs
diff --git a/src/test/ui/associated-type-bounds/implied-region-constraints.stderr b/tests/ui/associated-type-bounds/implied-region-constraints.stderr
index cddce8777..cddce8777 100644
--- a/src/test/ui/associated-type-bounds/implied-region-constraints.stderr
+++ b/tests/ui/associated-type-bounds/implied-region-constraints.stderr
diff --git a/src/test/ui/associated-type-bounds/inside-adt.rs b/tests/ui/associated-type-bounds/inside-adt.rs
index 8eb8c44bb..8eb8c44bb 100644
--- a/src/test/ui/associated-type-bounds/inside-adt.rs
+++ b/tests/ui/associated-type-bounds/inside-adt.rs
diff --git a/src/test/ui/associated-type-bounds/inside-adt.stderr b/tests/ui/associated-type-bounds/inside-adt.stderr
index dbfcfa580..dbfcfa580 100644
--- a/src/test/ui/associated-type-bounds/inside-adt.stderr
+++ b/tests/ui/associated-type-bounds/inside-adt.stderr
diff --git a/src/test/ui/associated-type-bounds/issue-102335-ty.rs b/tests/ui/associated-type-bounds/issue-102335-ty.rs
index 363df73c1..363df73c1 100644
--- a/src/test/ui/associated-type-bounds/issue-102335-ty.rs
+++ b/tests/ui/associated-type-bounds/issue-102335-ty.rs
diff --git a/src/test/ui/associated-type-bounds/issue-102335-ty.stderr b/tests/ui/associated-type-bounds/issue-102335-ty.stderr
index 8777b2965..8777b2965 100644
--- a/src/test/ui/associated-type-bounds/issue-102335-ty.stderr
+++ b/tests/ui/associated-type-bounds/issue-102335-ty.stderr
diff --git a/src/test/ui/associated-type-bounds/issue-61752.rs b/tests/ui/associated-type-bounds/issue-61752.rs
index f38ec640e..f38ec640e 100644
--- a/src/test/ui/associated-type-bounds/issue-61752.rs
+++ b/tests/ui/associated-type-bounds/issue-61752.rs
diff --git a/src/test/ui/associated-type-bounds/issue-70292.rs b/tests/ui/associated-type-bounds/issue-70292.rs
index 945d7688c..945d7688c 100644
--- a/src/test/ui/associated-type-bounds/issue-70292.rs
+++ b/tests/ui/associated-type-bounds/issue-70292.rs
diff --git a/src/test/ui/associated-type-bounds/issue-71443-1.rs b/tests/ui/associated-type-bounds/issue-71443-1.rs
index 5d2a3e6cb..5d2a3e6cb 100644
--- a/src/test/ui/associated-type-bounds/issue-71443-1.rs
+++ b/tests/ui/associated-type-bounds/issue-71443-1.rs
diff --git a/src/test/ui/associated-type-bounds/issue-71443-1.stderr b/tests/ui/associated-type-bounds/issue-71443-1.stderr
index a9459ee74..a9459ee74 100644
--- a/src/test/ui/associated-type-bounds/issue-71443-1.stderr
+++ b/tests/ui/associated-type-bounds/issue-71443-1.stderr
diff --git a/src/test/ui/associated-type-bounds/issue-71443-2.rs b/tests/ui/associated-type-bounds/issue-71443-2.rs
index 813dcd60a..813dcd60a 100644
--- a/src/test/ui/associated-type-bounds/issue-71443-2.rs
+++ b/tests/ui/associated-type-bounds/issue-71443-2.rs
diff --git a/src/test/ui/associated-type-bounds/issue-73818.rs b/tests/ui/associated-type-bounds/issue-73818.rs
index bb890f72a..bb890f72a 100644
--- a/src/test/ui/associated-type-bounds/issue-73818.rs
+++ b/tests/ui/associated-type-bounds/issue-73818.rs
diff --git a/src/test/ui/associated-type-bounds/issue-79949.rs b/tests/ui/associated-type-bounds/issue-79949.rs
index 9dd37f981..9dd37f981 100644
--- a/src/test/ui/associated-type-bounds/issue-79949.rs
+++ b/tests/ui/associated-type-bounds/issue-79949.rs
diff --git a/src/test/ui/associated-type-bounds/issue-81193.rs b/tests/ui/associated-type-bounds/issue-81193.rs
index d2aa54ab9..d2aa54ab9 100644
--- a/src/test/ui/associated-type-bounds/issue-81193.rs
+++ b/tests/ui/associated-type-bounds/issue-81193.rs
diff --git a/src/test/ui/associated-type-bounds/issue-83017.rs b/tests/ui/associated-type-bounds/issue-83017.rs
index a02208661..a02208661 100644
--- a/src/test/ui/associated-type-bounds/issue-83017.rs
+++ b/tests/ui/associated-type-bounds/issue-83017.rs
diff --git a/src/test/ui/associated-type-bounds/issue-99828.rs b/tests/ui/associated-type-bounds/issue-99828.rs
index 7b711283f..7b711283f 100644
--- a/src/test/ui/associated-type-bounds/issue-99828.rs
+++ b/tests/ui/associated-type-bounds/issue-99828.rs
diff --git a/src/test/ui/associated-type-bounds/issue-99828.stderr b/tests/ui/associated-type-bounds/issue-99828.stderr
index 1c20ead05..dc93c47da 100644
--- a/src/test/ui/associated-type-bounds/issue-99828.stderr
+++ b/tests/ui/associated-type-bounds/issue-99828.stderr
@@ -15,9 +15,6 @@ LL | fn get_iter(vec: &[i32]) -> impl Iterator<Item = {}> + '_ {
    |
 note: associated type defined here
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-   |
-LL |     type Item;
-   |     ^^^^^^^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/associated-type-bounds/missing-trait-bound-for-assoc-fails.rs b/tests/ui/associated-type-bounds/missing-trait-bound-for-assoc-fails.rs
index 07d0f8f87..07d0f8f87 100644
--- a/src/test/ui/associated-type-bounds/missing-trait-bound-for-assoc-fails.rs
+++ b/tests/ui/associated-type-bounds/missing-trait-bound-for-assoc-fails.rs
diff --git a/src/test/ui/associated-type-bounds/missing-trait-bound-for-assoc-fails.stderr b/tests/ui/associated-type-bounds/missing-trait-bound-for-assoc-fails.stderr
index bc2807b03..bc2807b03 100644
--- a/src/test/ui/associated-type-bounds/missing-trait-bound-for-assoc-fails.stderr
+++ b/tests/ui/associated-type-bounds/missing-trait-bound-for-assoc-fails.stderr
diff --git a/src/test/ui/associated-type-bounds/order-dependent-bounds-issue-54121.rs b/tests/ui/associated-type-bounds/order-dependent-bounds-issue-54121.rs
index 77e4bd4d6..77e4bd4d6 100644
--- a/src/test/ui/associated-type-bounds/order-dependent-bounds-issue-54121.rs
+++ b/tests/ui/associated-type-bounds/order-dependent-bounds-issue-54121.rs
diff --git a/src/test/ui/associated-type-bounds/rpit.rs b/tests/ui/associated-type-bounds/rpit.rs
index 47cadf331..47cadf331 100644
--- a/src/test/ui/associated-type-bounds/rpit.rs
+++ b/tests/ui/associated-type-bounds/rpit.rs
diff --git a/src/test/ui/associated-type-bounds/struct-bounds.rs b/tests/ui/associated-type-bounds/struct-bounds.rs
index 2c1ce1c37..2c1ce1c37 100644
--- a/src/test/ui/associated-type-bounds/struct-bounds.rs
+++ b/tests/ui/associated-type-bounds/struct-bounds.rs
diff --git a/src/test/ui/associated-type-bounds/supertrait-referencing-self.rs b/tests/ui/associated-type-bounds/supertrait-referencing-self.rs
index c82ec01f4..c82ec01f4 100644
--- a/src/test/ui/associated-type-bounds/supertrait-referencing-self.rs
+++ b/tests/ui/associated-type-bounds/supertrait-referencing-self.rs
diff --git a/src/test/ui/associated-type-bounds/supertrait-referencing.rs b/tests/ui/associated-type-bounds/supertrait-referencing.rs
index 2e9753515..2e9753515 100644
--- a/src/test/ui/associated-type-bounds/supertrait-referencing.rs
+++ b/tests/ui/associated-type-bounds/supertrait-referencing.rs
diff --git a/src/test/ui/associated-type-bounds/supertrait-where-referencing-self.rs b/tests/ui/associated-type-bounds/supertrait-where-referencing-self.rs
index 72a6be9ff..72a6be9ff 100644
--- a/src/test/ui/associated-type-bounds/supertrait-where-referencing-self.rs
+++ b/tests/ui/associated-type-bounds/supertrait-where-referencing-self.rs
diff --git a/src/test/ui/associated-type-bounds/trait-alias-impl-trait.rs b/tests/ui/associated-type-bounds/trait-alias-impl-trait.rs
index e223a8957..e223a8957 100644
--- a/src/test/ui/associated-type-bounds/trait-alias-impl-trait.rs
+++ b/tests/ui/associated-type-bounds/trait-alias-impl-trait.rs
diff --git a/src/test/ui/associated-type-bounds/trait-params.rs b/tests/ui/associated-type-bounds/trait-params.rs
index b0703a4ee..b0703a4ee 100644
--- a/src/test/ui/associated-type-bounds/trait-params.rs
+++ b/tests/ui/associated-type-bounds/trait-params.rs
diff --git a/src/test/ui/associated-type-bounds/traits-assoc-anonymized.rs b/tests/ui/associated-type-bounds/traits-assoc-anonymized.rs
index a9d6eed81..a9d6eed81 100644
--- a/src/test/ui/associated-type-bounds/traits-assoc-anonymized.rs
+++ b/tests/ui/associated-type-bounds/traits-assoc-anonymized.rs
diff --git a/src/test/ui/associated-type-bounds/traits-assoc-type-macros.rs b/tests/ui/associated-type-bounds/traits-assoc-type-macros.rs
index d854dce38..d854dce38 100644
--- a/src/test/ui/associated-type-bounds/traits-assoc-type-macros.rs
+++ b/tests/ui/associated-type-bounds/traits-assoc-type-macros.rs
diff --git a/src/test/ui/associated-type-bounds/type-alias.rs b/tests/ui/associated-type-bounds/type-alias.rs
index f74c5ff1e..f74c5ff1e 100644
--- a/src/test/ui/associated-type-bounds/type-alias.rs
+++ b/tests/ui/associated-type-bounds/type-alias.rs
diff --git a/src/test/ui/associated-type-bounds/type-alias.stderr b/tests/ui/associated-type-bounds/type-alias.stderr
index c22b80b88..c22b80b88 100644
--- a/src/test/ui/associated-type-bounds/type-alias.stderr
+++ b/tests/ui/associated-type-bounds/type-alias.stderr
diff --git a/src/test/ui/associated-type-bounds/union-bounds.rs b/tests/ui/associated-type-bounds/union-bounds.rs
index 46e5aef04..46e5aef04 100644
--- a/src/test/ui/associated-type-bounds/union-bounds.rs
+++ b/tests/ui/associated-type-bounds/union-bounds.rs
diff --git a/src/test/ui/associated-types/associate-type-bound-normalization.rs b/tests/ui/associated-types/associate-type-bound-normalization.rs
index db092970f..db092970f 100644
--- a/src/test/ui/associated-types/associate-type-bound-normalization.rs
+++ b/tests/ui/associated-types/associate-type-bound-normalization.rs
diff --git a/src/test/ui/associated-types/associated-item-long-paths.rs b/tests/ui/associated-types/associated-item-long-paths.rs
index aad8c487c..aad8c487c 100644
--- a/src/test/ui/associated-types/associated-item-long-paths.rs
+++ b/tests/ui/associated-types/associated-item-long-paths.rs
diff --git a/src/test/ui/associated-types/associated-type-destructuring-assignment.rs b/tests/ui/associated-types/associated-type-destructuring-assignment.rs
index f038c9ce7..f038c9ce7 100644
--- a/src/test/ui/associated-types/associated-type-destructuring-assignment.rs
+++ b/tests/ui/associated-types/associated-type-destructuring-assignment.rs
diff --git a/src/test/ui/associated-types/associated-type-macro.rs b/tests/ui/associated-types/associated-type-macro.rs
index 22b5bca40..22b5bca40 100644
--- a/src/test/ui/associated-types/associated-type-macro.rs
+++ b/tests/ui/associated-types/associated-type-macro.rs
diff --git a/src/test/ui/associated-types/associated-type-macro.stderr b/tests/ui/associated-types/associated-type-macro.stderr
index 6a4cf99c4..6a4cf99c4 100644
--- a/src/test/ui/associated-types/associated-type-macro.stderr
+++ b/tests/ui/associated-types/associated-type-macro.stderr
diff --git a/src/test/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.rs b/tests/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.rs
index c85d41c7f..c85d41c7f 100644
--- a/src/test/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.rs
+++ b/tests/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.rs
diff --git a/src/test/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.stderr b/tests/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.stderr
index 236552baf..236552baf 100644
--- a/src/test/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.stderr
+++ b/tests/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.stderr
diff --git a/src/test/ui/associated-types/associated-type-projection-from-multiple-supertraits.rs b/tests/ui/associated-types/associated-type-projection-from-multiple-supertraits.rs
index df19332b6..df19332b6 100644
--- a/src/test/ui/associated-types/associated-type-projection-from-multiple-supertraits.rs
+++ b/tests/ui/associated-types/associated-type-projection-from-multiple-supertraits.rs
diff --git a/src/test/ui/associated-types/associated-type-projection-from-multiple-supertraits.stderr b/tests/ui/associated-types/associated-type-projection-from-multiple-supertraits.stderr
index e765f9323..e765f9323 100644
--- a/src/test/ui/associated-types/associated-type-projection-from-multiple-supertraits.stderr
+++ b/tests/ui/associated-types/associated-type-projection-from-multiple-supertraits.stderr
diff --git a/src/test/ui/associated-types/associated-type-projection-from-supertrait.rs b/tests/ui/associated-types/associated-type-projection-from-supertrait.rs
index 7e05bcd30..7e05bcd30 100644
--- a/src/test/ui/associated-types/associated-type-projection-from-supertrait.rs
+++ b/tests/ui/associated-types/associated-type-projection-from-supertrait.rs
diff --git a/src/test/ui/associated-types/associated-type-projection-from-supertrait.stderr b/tests/ui/associated-types/associated-type-projection-from-supertrait.stderr
index e761c6c62..d6b18d4ed 100644
--- a/src/test/ui/associated-types/associated-type-projection-from-supertrait.stderr
+++ b/tests/ui/associated-types/associated-type-projection-from-supertrait.stderr
@@ -32,7 +32,7 @@ error[E0308]: mismatched types
 LL | fn f() { ModelT.chip_paint(Blue); }
    |                 ---------- ^^^^ expected struct `Black`, found struct `Blue`
    |                 |
-   |                 arguments to this function are incorrect
+   |                 arguments to this method are incorrect
    |
 note: associated function defined here
   --> $DIR/associated-type-projection-from-supertrait.rs:12:8
@@ -46,7 +46,7 @@ error[E0308]: mismatched types
 LL | fn g() { ModelU.chip_paint(Black); }
    |                 ---------- ^^^^^ expected struct `Blue`, found struct `Black`
    |                 |
-   |                 arguments to this function are incorrect
+   |                 arguments to this method are incorrect
    |
 note: associated function defined here
   --> $DIR/associated-type-projection-from-supertrait.rs:12:8
diff --git a/src/test/ui/associated-types/associated-type-struct-construction.rs b/tests/ui/associated-types/associated-type-struct-construction.rs
index f8f8048fb..f8f8048fb 100644
--- a/src/test/ui/associated-types/associated-type-struct-construction.rs
+++ b/tests/ui/associated-types/associated-type-struct-construction.rs
diff --git a/src/test/ui/associated-types/associated-type-tuple-struct-construction.rs b/tests/ui/associated-types/associated-type-tuple-struct-construction.rs
index d5809ecd5..d5809ecd5 100644
--- a/src/test/ui/associated-types/associated-type-tuple-struct-construction.rs
+++ b/tests/ui/associated-types/associated-type-tuple-struct-construction.rs
diff --git a/src/test/ui/associated-types/associated-type-tuple-struct-construction.stderr b/tests/ui/associated-types/associated-type-tuple-struct-construction.stderr
index bca7deeb5..bca7deeb5 100644
--- a/src/test/ui/associated-types/associated-type-tuple-struct-construction.stderr
+++ b/tests/ui/associated-types/associated-type-tuple-struct-construction.stderr
diff --git a/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs b/tests/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs
index 707bcac78..707bcac78 100644
--- a/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs
+++ b/tests/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs
diff --git a/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.stderr b/tests/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.stderr
index 8c3463a28..8c3463a28 100644
--- a/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.stderr
+++ b/tests/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.stderr
diff --git a/src/test/ui/associated-types/associated-types-basic.rs b/tests/ui/associated-types/associated-types-basic.rs
index b7f6721ec..b7f6721ec 100644
--- a/src/test/ui/associated-types/associated-types-basic.rs
+++ b/tests/ui/associated-types/associated-types-basic.rs
diff --git a/src/test/ui/associated-types/associated-types-binding-in-trait.rs b/tests/ui/associated-types/associated-types-binding-in-trait.rs
index 2e42b3a2a..2e42b3a2a 100644
--- a/src/test/ui/associated-types/associated-types-binding-in-trait.rs
+++ b/tests/ui/associated-types/associated-types-binding-in-trait.rs
diff --git a/src/test/ui/associated-types/associated-types-binding-in-where-clause.rs b/tests/ui/associated-types/associated-types-binding-in-where-clause.rs
index c54bc3cd6..c54bc3cd6 100644
--- a/src/test/ui/associated-types/associated-types-binding-in-where-clause.rs
+++ b/tests/ui/associated-types/associated-types-binding-in-where-clause.rs
diff --git a/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.rs b/tests/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.rs
index 6b2bbbe2e..6b2bbbe2e 100644
--- a/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.rs
+++ b/tests/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.rs
diff --git a/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.stderr b/tests/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.stderr
index a777e064f..a777e064f 100644
--- a/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.stderr
+++ b/tests/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.stderr
diff --git a/src/test/ui/associated-types/associated-types-bound-ambiguity.rs b/tests/ui/associated-types/associated-types-bound-ambiguity.rs
index 9f179b645..9f179b645 100644
--- a/src/test/ui/associated-types/associated-types-bound-ambiguity.rs
+++ b/tests/ui/associated-types/associated-types-bound-ambiguity.rs
diff --git a/src/test/ui/associated-types/associated-types-bound-failure.fixed b/tests/ui/associated-types/associated-types-bound-failure.fixed
index 68ee38d16..68ee38d16 100644
--- a/src/test/ui/associated-types/associated-types-bound-failure.fixed
+++ b/tests/ui/associated-types/associated-types-bound-failure.fixed
diff --git a/src/test/ui/associated-types/associated-types-bound-failure.rs b/tests/ui/associated-types/associated-types-bound-failure.rs
index 31e073cc7..31e073cc7 100644
--- a/src/test/ui/associated-types/associated-types-bound-failure.rs
+++ b/tests/ui/associated-types/associated-types-bound-failure.rs
diff --git a/src/test/ui/associated-types/associated-types-bound-failure.stderr b/tests/ui/associated-types/associated-types-bound-failure.stderr
index 3eda22796..3eda22796 100644
--- a/src/test/ui/associated-types/associated-types-bound-failure.stderr
+++ b/tests/ui/associated-types/associated-types-bound-failure.stderr
diff --git a/src/test/ui/associated-types/associated-types-bound.rs b/tests/ui/associated-types/associated-types-bound.rs
index 0e9a229a5..0e9a229a5 100644
--- a/src/test/ui/associated-types/associated-types-bound.rs
+++ b/tests/ui/associated-types/associated-types-bound.rs
diff --git a/src/test/ui/associated-types/associated-types-cc.rs b/tests/ui/associated-types/associated-types-cc.rs
index 13f1d2720..13f1d2720 100644
--- a/src/test/ui/associated-types/associated-types-cc.rs
+++ b/tests/ui/associated-types/associated-types-cc.rs
diff --git a/src/test/ui/associated-types/associated-types-coherence-failure.rs b/tests/ui/associated-types/associated-types-coherence-failure.rs
index c33f2ac96..c33f2ac96 100644
--- a/src/test/ui/associated-types/associated-types-coherence-failure.rs
+++ b/tests/ui/associated-types/associated-types-coherence-failure.rs
diff --git a/src/test/ui/associated-types/associated-types-coherence-failure.stderr b/tests/ui/associated-types/associated-types-coherence-failure.stderr
index 40c02dca3..40c02dca3 100644
--- a/src/test/ui/associated-types/associated-types-coherence-failure.stderr
+++ b/tests/ui/associated-types/associated-types-coherence-failure.stderr
diff --git a/src/test/ui/associated-types/associated-types-conditional-dispatch.rs b/tests/ui/associated-types/associated-types-conditional-dispatch.rs
index 70ee60517..70ee60517 100644
--- a/src/test/ui/associated-types/associated-types-conditional-dispatch.rs
+++ b/tests/ui/associated-types/associated-types-conditional-dispatch.rs
diff --git a/src/test/ui/associated-types/associated-types-constant-type.rs b/tests/ui/associated-types/associated-types-constant-type.rs
index 1e4c113a5..1e4c113a5 100644
--- a/src/test/ui/associated-types/associated-types-constant-type.rs
+++ b/tests/ui/associated-types/associated-types-constant-type.rs
diff --git a/src/test/ui/associated-types/associated-types-doubleendediterator-object.rs b/tests/ui/associated-types/associated-types-doubleendediterator-object.rs
index 05498ba63..05498ba63 100644
--- a/src/test/ui/associated-types/associated-types-doubleendediterator-object.rs
+++ b/tests/ui/associated-types/associated-types-doubleendediterator-object.rs
diff --git a/src/test/ui/associated-types/associated-types-duplicate-binding-in-env-hrtb.rs b/tests/ui/associated-types/associated-types-duplicate-binding-in-env-hrtb.rs
index 12ca10043..12ca10043 100644
--- a/src/test/ui/associated-types/associated-types-duplicate-binding-in-env-hrtb.rs
+++ b/tests/ui/associated-types/associated-types-duplicate-binding-in-env-hrtb.rs
diff --git a/src/test/ui/associated-types/associated-types-duplicate-binding-in-env.rs b/tests/ui/associated-types/associated-types-duplicate-binding-in-env.rs
index 9ffccd3d8..9ffccd3d8 100644
--- a/src/test/ui/associated-types/associated-types-duplicate-binding-in-env.rs
+++ b/tests/ui/associated-types/associated-types-duplicate-binding-in-env.rs
diff --git a/src/test/ui/associated-types/associated-types-enum-field-named.rs b/tests/ui/associated-types/associated-types-enum-field-named.rs
index 896d67213..896d67213 100644
--- a/src/test/ui/associated-types/associated-types-enum-field-named.rs
+++ b/tests/ui/associated-types/associated-types-enum-field-named.rs
diff --git a/src/test/ui/associated-types/associated-types-enum-field-numbered.rs b/tests/ui/associated-types/associated-types-enum-field-numbered.rs
index 77ced3c07..77ced3c07 100644
--- a/src/test/ui/associated-types/associated-types-enum-field-numbered.rs
+++ b/tests/ui/associated-types/associated-types-enum-field-numbered.rs
diff --git a/src/test/ui/associated-types/associated-types-eq-1.rs b/tests/ui/associated-types/associated-types-eq-1.rs
index c371138ff..c371138ff 100644
--- a/src/test/ui/associated-types/associated-types-eq-1.rs
+++ b/tests/ui/associated-types/associated-types-eq-1.rs
diff --git a/src/test/ui/associated-types/associated-types-eq-1.stderr b/tests/ui/associated-types/associated-types-eq-1.stderr
index e9ace7d25..e9ace7d25 100644
--- a/src/test/ui/associated-types/associated-types-eq-1.stderr
+++ b/tests/ui/associated-types/associated-types-eq-1.stderr
diff --git a/src/test/ui/associated-types/associated-types-eq-2.rs b/tests/ui/associated-types/associated-types-eq-2.rs
index 18e38d446..18e38d446 100644
--- a/src/test/ui/associated-types/associated-types-eq-2.rs
+++ b/tests/ui/associated-types/associated-types-eq-2.rs
diff --git a/src/test/ui/associated-types/associated-types-eq-2.stderr b/tests/ui/associated-types/associated-types-eq-2.stderr
index 23ee8cd23..23ee8cd23 100644
--- a/src/test/ui/associated-types/associated-types-eq-2.stderr
+++ b/tests/ui/associated-types/associated-types-eq-2.stderr
diff --git a/src/test/ui/associated-types/associated-types-eq-3.rs b/tests/ui/associated-types/associated-types-eq-3.rs
index f6988dcf6..f6988dcf6 100644
--- a/src/test/ui/associated-types/associated-types-eq-3.rs
+++ b/tests/ui/associated-types/associated-types-eq-3.rs
diff --git a/src/test/ui/associated-types/associated-types-eq-3.stderr b/tests/ui/associated-types/associated-types-eq-3.stderr
index fbe1a1ee8..fbe1a1ee8 100644
--- a/src/test/ui/associated-types/associated-types-eq-3.stderr
+++ b/tests/ui/associated-types/associated-types-eq-3.stderr
diff --git a/src/test/ui/associated-types/associated-types-eq-expr-path.rs b/tests/ui/associated-types/associated-types-eq-expr-path.rs
index 143992f29..143992f29 100644
--- a/src/test/ui/associated-types/associated-types-eq-expr-path.rs
+++ b/tests/ui/associated-types/associated-types-eq-expr-path.rs
diff --git a/src/test/ui/associated-types/associated-types-eq-expr-path.stderr b/tests/ui/associated-types/associated-types-eq-expr-path.stderr
index bd354cf3e..bd354cf3e 100644
--- a/src/test/ui/associated-types/associated-types-eq-expr-path.stderr
+++ b/tests/ui/associated-types/associated-types-eq-expr-path.stderr
diff --git a/src/test/ui/associated-types/associated-types-eq-hr.rs b/tests/ui/associated-types/associated-types-eq-hr.rs
index dc653f7f2..dc653f7f2 100644
--- a/src/test/ui/associated-types/associated-types-eq-hr.rs
+++ b/tests/ui/associated-types/associated-types-eq-hr.rs
diff --git a/src/test/ui/associated-types/associated-types-eq-hr.stderr b/tests/ui/associated-types/associated-types-eq-hr.stderr
index 6cff403b3..6cff403b3 100644
--- a/src/test/ui/associated-types/associated-types-eq-hr.stderr
+++ b/tests/ui/associated-types/associated-types-eq-hr.stderr
diff --git a/src/test/ui/associated-types/associated-types-eq-obj.rs b/tests/ui/associated-types/associated-types-eq-obj.rs
index c202c376c..c202c376c 100644
--- a/src/test/ui/associated-types/associated-types-eq-obj.rs
+++ b/tests/ui/associated-types/associated-types-eq-obj.rs
diff --git a/src/test/ui/associated-types/associated-types-for-unimpl-trait.fixed b/tests/ui/associated-types/associated-types-for-unimpl-trait.fixed
index 80bbef174..80bbef174 100644
--- a/src/test/ui/associated-types/associated-types-for-unimpl-trait.fixed
+++ b/tests/ui/associated-types/associated-types-for-unimpl-trait.fixed
diff --git a/src/test/ui/associated-types/associated-types-for-unimpl-trait.rs b/tests/ui/associated-types/associated-types-for-unimpl-trait.rs
index 0f6cea8e6..0f6cea8e6 100644
--- a/src/test/ui/associated-types/associated-types-for-unimpl-trait.rs
+++ b/tests/ui/associated-types/associated-types-for-unimpl-trait.rs
diff --git a/tests/ui/associated-types/associated-types-for-unimpl-trait.stderr b/tests/ui/associated-types/associated-types-for-unimpl-trait.stderr
new file mode 100644
index 000000000..6552c8be7
--- /dev/null
+++ b/tests/ui/associated-types/associated-types-for-unimpl-trait.stderr
@@ -0,0 +1,14 @@
+error[E0277]: the trait bound `Self: Get` is not satisfied
+  --> $DIR/associated-types-for-unimpl-trait.rs:10:40
+   |
+LL |     fn uhoh<U:Get>(&self, foo: U, bar: <Self as Get>::Value) {}
+   |                                        ^^^^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `Self`
+   |
+help: consider further restricting `Self`
+   |
+LL |     fn uhoh<U:Get>(&self, foo: U, bar: <Self as Get>::Value) where Self: Get {}
+   |                                                              +++++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/associated-types/associated-types-from-supertrait.rs b/tests/ui/associated-types/associated-types-from-supertrait.rs
index 8f40b94c0..8f40b94c0 100644
--- a/src/test/ui/associated-types/associated-types-from-supertrait.rs
+++ b/tests/ui/associated-types/associated-types-from-supertrait.rs
diff --git a/src/test/ui/associated-types/associated-types-impl-redirect.rs b/tests/ui/associated-types/associated-types-impl-redirect.rs
index 8fa20cdf4..8fa20cdf4 100644
--- a/src/test/ui/associated-types/associated-types-impl-redirect.rs
+++ b/tests/ui/associated-types/associated-types-impl-redirect.rs
diff --git a/src/test/ui/associated-types/associated-types-in-ambiguous-context.rs b/tests/ui/associated-types/associated-types-in-ambiguous-context.rs
index 51b53908f..51b53908f 100644
--- a/src/test/ui/associated-types/associated-types-in-ambiguous-context.rs
+++ b/tests/ui/associated-types/associated-types-in-ambiguous-context.rs
diff --git a/tests/ui/associated-types/associated-types-in-ambiguous-context.stderr b/tests/ui/associated-types/associated-types-in-ambiguous-context.stderr
new file mode 100644
index 000000000..00856b55d
--- /dev/null
+++ b/tests/ui/associated-types/associated-types-in-ambiguous-context.stderr
@@ -0,0 +1,48 @@
+error[E0223]: ambiguous associated type
+  --> $DIR/associated-types-in-ambiguous-context.rs:6:36
+   |
+LL | fn get<T:Get,U:Get>(x: T, y: U) -> Get::Value {}
+   |                                    ^^^^^^^^^^
+   |
+help: if there were a type named `Example` that implemented `Get`, you could use the fully-qualified path
+   |
+LL | fn get<T:Get,U:Get>(x: T, y: U) -> <Example as Get>::Value {}
+   |                                    ~~~~~~~~~~~~~~~~~~~~~~~
+
+error[E0223]: ambiguous associated type
+  --> $DIR/associated-types-in-ambiguous-context.rs:20:17
+   |
+LL | trait Foo where Foo::Assoc: Bar {
+   |                 ^^^^^^^^^^ help: use the fully-qualified path: `<Self as Foo>::Assoc`
+
+error[E0223]: ambiguous associated type
+  --> $DIR/associated-types-in-ambiguous-context.rs:25:10
+   |
+LL | type X = std::ops::Deref::Target;
+   |          ^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: if there were a type named `Example` that implemented `Deref`, you could use the fully-qualified path
+   |
+LL | type X = <Example as Deref>::Target;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+error[E0223]: ambiguous associated type
+  --> $DIR/associated-types-in-ambiguous-context.rs:11:23
+   |
+LL |     fn grab(&self) -> Grab::Value;
+   |                       ^^^^^^^^^^^ help: use the fully-qualified path: `<Self as Grab>::Value`
+
+error[E0223]: ambiguous associated type
+  --> $DIR/associated-types-in-ambiguous-context.rs:14:22
+   |
+LL |     fn get(&self) -> Get::Value;
+   |                      ^^^^^^^^^^
+   |
+help: if there were a type named `Example` that implemented `Get`, you could use the fully-qualified path
+   |
+LL |     fn get(&self) -> <Example as Get>::Value;
+   |                      ~~~~~~~~~~~~~~~~~~~~~~~
+
+error: aborting due to 5 previous errors
+
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/associated-types/associated-types-in-bound-type-arg.rs b/tests/ui/associated-types/associated-types-in-bound-type-arg.rs
index 88bb5fe0a..88bb5fe0a 100644
--- a/src/test/ui/associated-types/associated-types-in-bound-type-arg.rs
+++ b/tests/ui/associated-types/associated-types-in-bound-type-arg.rs
diff --git a/src/test/ui/associated-types/associated-types-in-default-method.rs b/tests/ui/associated-types/associated-types-in-default-method.rs
index 80ffbf585..80ffbf585 100644
--- a/src/test/ui/associated-types/associated-types-in-default-method.rs
+++ b/tests/ui/associated-types/associated-types-in-default-method.rs
diff --git a/src/test/ui/associated-types/associated-types-in-fn.rs b/tests/ui/associated-types/associated-types-in-fn.rs
index 9c588a528..9c588a528 100644
--- a/src/test/ui/associated-types/associated-types-in-fn.rs
+++ b/tests/ui/associated-types/associated-types-in-fn.rs
diff --git a/src/test/ui/associated-types/associated-types-in-impl-generics.rs b/tests/ui/associated-types/associated-types-in-impl-generics.rs
index 0ddd99cbf..0ddd99cbf 100644
--- a/src/test/ui/associated-types/associated-types-in-impl-generics.rs
+++ b/tests/ui/associated-types/associated-types-in-impl-generics.rs
diff --git a/src/test/ui/associated-types/associated-types-in-inherent-method.rs b/tests/ui/associated-types/associated-types-in-inherent-method.rs
index 1f29e9668..1f29e9668 100644
--- a/src/test/ui/associated-types/associated-types-in-inherent-method.rs
+++ b/tests/ui/associated-types/associated-types-in-inherent-method.rs
diff --git a/src/test/ui/associated-types/associated-types-incomplete-object.rs b/tests/ui/associated-types/associated-types-incomplete-object.rs
index 4627dfd2b..4627dfd2b 100644
--- a/src/test/ui/associated-types/associated-types-incomplete-object.rs
+++ b/tests/ui/associated-types/associated-types-incomplete-object.rs
diff --git a/src/test/ui/associated-types/associated-types-incomplete-object.stderr b/tests/ui/associated-types/associated-types-incomplete-object.stderr
index 32866c714..32866c714 100644
--- a/src/test/ui/associated-types/associated-types-incomplete-object.stderr
+++ b/tests/ui/associated-types/associated-types-incomplete-object.stderr
diff --git a/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.rs b/tests/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.rs
index 3bd3f3a75..3bd3f3a75 100644
--- a/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.rs
+++ b/tests/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.rs
diff --git a/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr b/tests/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr
index 8fecfdf7b..8fecfdf7b 100644
--- a/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr
+++ b/tests/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr
diff --git a/src/test/ui/associated-types/associated-types-issue-17359.rs b/tests/ui/associated-types/associated-types-issue-17359.rs
index 88a8a6490..88a8a6490 100644
--- a/src/test/ui/associated-types/associated-types-issue-17359.rs
+++ b/tests/ui/associated-types/associated-types-issue-17359.rs
diff --git a/src/test/ui/associated-types/associated-types-issue-17359.stderr b/tests/ui/associated-types/associated-types-issue-17359.stderr
index 9e40d8095..9e40d8095 100644
--- a/src/test/ui/associated-types/associated-types-issue-17359.stderr
+++ b/tests/ui/associated-types/associated-types-issue-17359.stderr
diff --git a/src/test/ui/associated-types/associated-types-issue-20220.rs b/tests/ui/associated-types/associated-types-issue-20220.rs
index 19fa7a608..19fa7a608 100644
--- a/src/test/ui/associated-types/associated-types-issue-20220.rs
+++ b/tests/ui/associated-types/associated-types-issue-20220.rs
diff --git a/src/test/ui/associated-types/associated-types-issue-20346.rs b/tests/ui/associated-types/associated-types-issue-20346.rs
index 0cce847e1..0cce847e1 100644
--- a/src/test/ui/associated-types/associated-types-issue-20346.rs
+++ b/tests/ui/associated-types/associated-types-issue-20346.rs
diff --git a/src/test/ui/associated-types/associated-types-issue-20346.stderr b/tests/ui/associated-types/associated-types-issue-20346.stderr
index b1708b96e..b1708b96e 100644
--- a/src/test/ui/associated-types/associated-types-issue-20346.stderr
+++ b/tests/ui/associated-types/associated-types-issue-20346.stderr
diff --git a/src/test/ui/associated-types/associated-types-issue-20371.rs b/tests/ui/associated-types/associated-types-issue-20371.rs
index ae8a8767d..ae8a8767d 100644
--- a/src/test/ui/associated-types/associated-types-issue-20371.rs
+++ b/tests/ui/associated-types/associated-types-issue-20371.rs
diff --git a/src/test/ui/associated-types/associated-types-issue-21212.rs b/tests/ui/associated-types/associated-types-issue-21212.rs
index ce27eac4d..ce27eac4d 100644
--- a/src/test/ui/associated-types/associated-types-issue-21212.rs
+++ b/tests/ui/associated-types/associated-types-issue-21212.rs
diff --git a/src/test/ui/associated-types/associated-types-iterator-binding.rs b/tests/ui/associated-types/associated-types-iterator-binding.rs
index 7c5528c98..7c5528c98 100644
--- a/src/test/ui/associated-types/associated-types-iterator-binding.rs
+++ b/tests/ui/associated-types/associated-types-iterator-binding.rs
diff --git a/src/test/ui/associated-types/associated-types-method.rs b/tests/ui/associated-types/associated-types-method.rs
index 45df3ac20..45df3ac20 100644
--- a/src/test/ui/associated-types/associated-types-method.rs
+++ b/tests/ui/associated-types/associated-types-method.rs
diff --git a/src/test/ui/associated-types/associated-types-multiple-types-one-trait.rs b/tests/ui/associated-types/associated-types-multiple-types-one-trait.rs
index daeaf9011..daeaf9011 100644
--- a/src/test/ui/associated-types/associated-types-multiple-types-one-trait.rs
+++ b/tests/ui/associated-types/associated-types-multiple-types-one-trait.rs
diff --git a/src/test/ui/associated-types/associated-types-multiple-types-one-trait.stderr b/tests/ui/associated-types/associated-types-multiple-types-one-trait.stderr
index 89cdba524..89cdba524 100644
--- a/src/test/ui/associated-types/associated-types-multiple-types-one-trait.stderr
+++ b/tests/ui/associated-types/associated-types-multiple-types-one-trait.stderr
diff --git a/src/test/ui/associated-types/associated-types-nested-projections.rs b/tests/ui/associated-types/associated-types-nested-projections.rs
index 76ba74962..76ba74962 100644
--- a/src/test/ui/associated-types/associated-types-nested-projections.rs
+++ b/tests/ui/associated-types/associated-types-nested-projections.rs
diff --git a/src/test/ui/associated-types/associated-types-no-suitable-bound.rs b/tests/ui/associated-types/associated-types-no-suitable-bound.rs
index d42460a4c..d42460a4c 100644
--- a/src/test/ui/associated-types/associated-types-no-suitable-bound.rs
+++ b/tests/ui/associated-types/associated-types-no-suitable-bound.rs
diff --git a/tests/ui/associated-types/associated-types-no-suitable-bound.stderr b/tests/ui/associated-types/associated-types-no-suitable-bound.stderr
new file mode 100644
index 000000000..b2ee1b5e6
--- /dev/null
+++ b/tests/ui/associated-types/associated-types-no-suitable-bound.stderr
@@ -0,0 +1,14 @@
+error[E0277]: the trait bound `T: Get` is not satisfied
+  --> $DIR/associated-types-no-suitable-bound.rs:11:21
+   |
+LL |     fn uhoh<T>(foo: <T as Get>::Value) {}
+   |                     ^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `T`
+   |
+help: consider restricting type parameter `T`
+   |
+LL |     fn uhoh<T: Get>(foo: <T as Get>::Value) {}
+   |              +++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.rs b/tests/ui/associated-types/associated-types-no-suitable-supertrait-2.rs
index 17dfa1773..17dfa1773 100644
--- a/src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.rs
+++ b/tests/ui/associated-types/associated-types-no-suitable-supertrait-2.rs
diff --git a/tests/ui/associated-types/associated-types-no-suitable-supertrait-2.stderr b/tests/ui/associated-types/associated-types-no-suitable-supertrait-2.stderr
new file mode 100644
index 000000000..2e40dbd06
--- /dev/null
+++ b/tests/ui/associated-types/associated-types-no-suitable-supertrait-2.stderr
@@ -0,0 +1,14 @@
+error[E0277]: the trait bound `Self: Get` is not satisfied
+  --> $DIR/associated-types-no-suitable-supertrait-2.rs:17:40
+   |
+LL |     fn uhoh<U:Get>(&self, foo: U, bar: <Self as Get>::Value) {}
+   |                                        ^^^^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `Self`
+   |
+help: consider further restricting `Self`
+   |
+LL |     fn uhoh<U:Get>(&self, foo: U, bar: <Self as Get>::Value) where Self: Get {}
+   |                                                              +++++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/associated-types/associated-types-no-suitable-supertrait.rs b/tests/ui/associated-types/associated-types-no-suitable-supertrait.rs
index c373c5855..c373c5855 100644
--- a/src/test/ui/associated-types/associated-types-no-suitable-supertrait.rs
+++ b/tests/ui/associated-types/associated-types-no-suitable-supertrait.rs
diff --git a/tests/ui/associated-types/associated-types-no-suitable-supertrait.stderr b/tests/ui/associated-types/associated-types-no-suitable-supertrait.stderr
new file mode 100644
index 000000000..bd3ee2abd
--- /dev/null
+++ b/tests/ui/associated-types/associated-types-no-suitable-supertrait.stderr
@@ -0,0 +1,20 @@
+error[E0277]: the trait bound `(T, U): Get` is not satisfied
+  --> $DIR/associated-types-no-suitable-supertrait.rs:22:40
+   |
+LL |     fn uhoh<U:Get>(&self, foo: U, bar: <(T, U) as Get>::Value) {}
+   |                                        ^^^^^^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `(T, U)`
+
+error[E0277]: the trait bound `Self: Get` is not satisfied
+  --> $DIR/associated-types-no-suitable-supertrait.rs:17:40
+   |
+LL |     fn uhoh<U:Get>(&self, foo: U, bar: <Self as Get>::Value) {}
+   |                                        ^^^^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `Self`
+   |
+help: consider further restricting `Self`
+   |
+LL |     fn uhoh<U:Get>(&self, foo: U, bar: <Self as Get>::Value) where Self: Get {}
+   |                                                              +++++++++++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/associated-types/associated-types-normalize-in-bounds-binding.rs b/tests/ui/associated-types/associated-types-normalize-in-bounds-binding.rs
index 7c54efb83..7c54efb83 100644
--- a/src/test/ui/associated-types/associated-types-normalize-in-bounds-binding.rs
+++ b/tests/ui/associated-types/associated-types-normalize-in-bounds-binding.rs
diff --git a/src/test/ui/associated-types/associated-types-normalize-in-bounds-ufcs.rs b/tests/ui/associated-types/associated-types-normalize-in-bounds-ufcs.rs
index e09aa3663..e09aa3663 100644
--- a/src/test/ui/associated-types/associated-types-normalize-in-bounds-ufcs.rs
+++ b/tests/ui/associated-types/associated-types-normalize-in-bounds-ufcs.rs
diff --git a/src/test/ui/associated-types/associated-types-normalize-in-bounds.rs b/tests/ui/associated-types/associated-types-normalize-in-bounds.rs
index dcfae0f37..dcfae0f37 100644
--- a/src/test/ui/associated-types/associated-types-normalize-in-bounds.rs
+++ b/tests/ui/associated-types/associated-types-normalize-in-bounds.rs
diff --git a/src/test/ui/associated-types/associated-types-normalize-unifield-struct.rs b/tests/ui/associated-types/associated-types-normalize-unifield-struct.rs
index a04525dcd..a04525dcd 100644
--- a/src/test/ui/associated-types/associated-types-normalize-unifield-struct.rs
+++ b/tests/ui/associated-types/associated-types-normalize-unifield-struct.rs
diff --git a/src/test/ui/associated-types/associated-types-outlives.rs b/tests/ui/associated-types/associated-types-outlives.rs
index 55c276280..55c276280 100644
--- a/src/test/ui/associated-types/associated-types-outlives.rs
+++ b/tests/ui/associated-types/associated-types-outlives.rs
diff --git a/src/test/ui/associated-types/associated-types-outlives.stderr b/tests/ui/associated-types/associated-types-outlives.stderr
index 840e33b4b..840e33b4b 100644
--- a/src/test/ui/associated-types/associated-types-outlives.stderr
+++ b/tests/ui/associated-types/associated-types-outlives.stderr
diff --git a/tests/ui/associated-types/associated-types-overridden-binding-2.rs b/tests/ui/associated-types/associated-types-overridden-binding-2.rs
new file mode 100644
index 000000000..fed60ccf0
--- /dev/null
+++ b/tests/ui/associated-types/associated-types-overridden-binding-2.rs
@@ -0,0 +1,8 @@
+#![feature(trait_alias)]
+
+trait I32Iterator = Iterator<Item = i32>;
+
+fn main() {
+    let _: &dyn I32Iterator<Item = u32> = &vec![42].into_iter();
+    //~^ ERROR expected `IntoIter<u32>` to be an iterator that yields `i32`, but it yields `u32`
+}
diff --git a/src/test/ui/associated-types/associated-types-overridden-binding-2.stderr b/tests/ui/associated-types/associated-types-overridden-binding-2.stderr
index 2d25f68de..a28a0b74e 100644
--- a/src/test/ui/associated-types/associated-types-overridden-binding-2.stderr
+++ b/tests/ui/associated-types/associated-types-overridden-binding-2.stderr
@@ -1,4 +1,4 @@
-error[E0271]: expected `std::vec::IntoIter<u32>` to be an iterator that yields `i32`, but it yields `u32`
+error[E0271]: expected `IntoIter<u32>` to be an iterator that yields `i32`, but it yields `u32`
   --> $DIR/associated-types-overridden-binding-2.rs:6:43
    |
 LL |     let _: &dyn I32Iterator<Item = u32> = &vec![42].into_iter();
diff --git a/src/test/ui/associated-types/associated-types-overridden-binding.rs b/tests/ui/associated-types/associated-types-overridden-binding.rs
index 9a64a06c3..9a64a06c3 100644
--- a/src/test/ui/associated-types/associated-types-overridden-binding.rs
+++ b/tests/ui/associated-types/associated-types-overridden-binding.rs
diff --git a/src/test/ui/associated-types/associated-types-overridden-binding.stderr b/tests/ui/associated-types/associated-types-overridden-binding.stderr
index dc087e418..dc087e418 100644
--- a/src/test/ui/associated-types/associated-types-overridden-binding.stderr
+++ b/tests/ui/associated-types/associated-types-overridden-binding.stderr
diff --git a/src/test/ui/associated-types/associated-types-overridden-default.rs b/tests/ui/associated-types/associated-types-overridden-default.rs
index 3e12c9228..3e12c9228 100644
--- a/src/test/ui/associated-types/associated-types-overridden-default.rs
+++ b/tests/ui/associated-types/associated-types-overridden-default.rs
diff --git a/src/test/ui/associated-types/associated-types-path-1.rs b/tests/ui/associated-types/associated-types-path-1.rs
index 46a5c9e7c..46a5c9e7c 100644
--- a/src/test/ui/associated-types/associated-types-path-1.rs
+++ b/tests/ui/associated-types/associated-types-path-1.rs
diff --git a/src/test/ui/associated-types/associated-types-path-1.stderr b/tests/ui/associated-types/associated-types-path-1.stderr
index a67f77e37..a67f77e37 100644
--- a/src/test/ui/associated-types/associated-types-path-1.stderr
+++ b/tests/ui/associated-types/associated-types-path-1.stderr
diff --git a/src/test/ui/associated-types/associated-types-path-2.rs b/tests/ui/associated-types/associated-types-path-2.rs
index 00066efcc..00066efcc 100644
--- a/src/test/ui/associated-types/associated-types-path-2.rs
+++ b/tests/ui/associated-types/associated-types-path-2.rs
diff --git a/src/test/ui/associated-types/associated-types-path-2.stderr b/tests/ui/associated-types/associated-types-path-2.stderr
index 206f49024..206f49024 100644
--- a/src/test/ui/associated-types/associated-types-path-2.stderr
+++ b/tests/ui/associated-types/associated-types-path-2.stderr
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.rs b/tests/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.rs
index 069bf5600..069bf5600 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.rs
+++ b/tests/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.rs
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.stderr b/tests/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.stderr
index e12d42e5e..e12d42e5e 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.stderr
+++ b/tests/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.stderr
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.fixed b/tests/ui/associated-types/associated-types-project-from-hrtb-in-fn.fixed
index bca69a976..bca69a976 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.fixed
+++ b/tests/ui/associated-types/associated-types-project-from-hrtb-in-fn.fixed
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.rs b/tests/ui/associated-types/associated-types-project-from-hrtb-in-fn.rs
index 1e23dd889..1e23dd889 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.rs
+++ b/tests/ui/associated-types/associated-types-project-from-hrtb-in-fn.rs
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr b/tests/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr
index c508006c3..c508006c3 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr
+++ b/tests/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.rs b/tests/ui/associated-types/associated-types-project-from-hrtb-in-struct.rs
index ed30d86cb..ed30d86cb 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.rs
+++ b/tests/ui/associated-types/associated-types-project-from-hrtb-in-struct.rs
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr b/tests/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr
index 62a619723..62a619723 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr
+++ b/tests/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.fixed b/tests/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.fixed
index 66d8613f1..66d8613f1 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.fixed
+++ b/tests/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.fixed
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.rs b/tests/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.rs
index 0a1b29de1..0a1b29de1 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.rs
+++ b/tests/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.rs
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr b/tests/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr
index 48433b152..48433b152 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr
+++ b/tests/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr
diff --git a/src/test/ui/associated-types/associated-types-project-from-type-param-via-bound-in-where.rs b/tests/ui/associated-types/associated-types-project-from-type-param-via-bound-in-where.rs
index fc1dba97d..fc1dba97d 100644
--- a/src/test/ui/associated-types/associated-types-project-from-type-param-via-bound-in-where.rs
+++ b/tests/ui/associated-types/associated-types-project-from-type-param-via-bound-in-where.rs
diff --git a/src/test/ui/associated-types/associated-types-projection-bound-ambiguity.rs b/tests/ui/associated-types/associated-types-projection-bound-ambiguity.rs
index 353f82e7c..353f82e7c 100644
--- a/src/test/ui/associated-types/associated-types-projection-bound-ambiguity.rs
+++ b/tests/ui/associated-types/associated-types-projection-bound-ambiguity.rs
diff --git a/src/test/ui/associated-types/associated-types-projection-bound-in-supertraits.rs b/tests/ui/associated-types/associated-types-projection-bound-in-supertraits.rs
index 107e6b4ce..107e6b4ce 100644
--- a/src/test/ui/associated-types/associated-types-projection-bound-in-supertraits.rs
+++ b/tests/ui/associated-types/associated-types-projection-bound-in-supertraits.rs
diff --git a/src/test/ui/associated-types/associated-types-projection-from-known-type-in-impl.rs b/tests/ui/associated-types/associated-types-projection-from-known-type-in-impl.rs
index a59c327be..a59c327be 100644
--- a/src/test/ui/associated-types/associated-types-projection-from-known-type-in-impl.rs
+++ b/tests/ui/associated-types/associated-types-projection-from-known-type-in-impl.rs
diff --git a/src/test/ui/associated-types/associated-types-projection-in-object-type.rs b/tests/ui/associated-types/associated-types-projection-in-object-type.rs
index eec95a141..eec95a141 100644
--- a/src/test/ui/associated-types/associated-types-projection-in-object-type.rs
+++ b/tests/ui/associated-types/associated-types-projection-in-object-type.rs
diff --git a/src/test/ui/associated-types/associated-types-projection-in-supertrait.rs b/tests/ui/associated-types/associated-types-projection-in-supertrait.rs
index ead405fcf..ead405fcf 100644
--- a/src/test/ui/associated-types/associated-types-projection-in-supertrait.rs
+++ b/tests/ui/associated-types/associated-types-projection-in-supertrait.rs
diff --git a/src/test/ui/associated-types/associated-types-projection-in-where-clause.rs b/tests/ui/associated-types/associated-types-projection-in-where-clause.rs
index e9a26e53c..e9a26e53c 100644
--- a/src/test/ui/associated-types/associated-types-projection-in-where-clause.rs
+++ b/tests/ui/associated-types/associated-types-projection-in-where-clause.rs
diff --git a/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.fixed b/tests/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.fixed
index 9bc308465..9bc308465 100644
--- a/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.fixed
+++ b/tests/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.fixed
diff --git a/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.rs b/tests/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.rs
index 549fc8fc6..549fc8fc6 100644
--- a/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.rs
+++ b/tests/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.rs
diff --git a/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.stderr b/tests/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.stderr
index 66d59bccd..2e67c2194 100644
--- a/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.stderr
+++ b/tests/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the trait bound `Self: Get` is not satisfied
-  --> $DIR/associated-types-projection-to-unrelated-trait-in-method-without-default.rs:10:5
+  --> $DIR/associated-types-projection-to-unrelated-trait-in-method-without-default.rs:10:40
    |
 LL |     fn okay<U:Get>(&self, foo: U, bar: <Self as Get>::Value);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `Self`
+   |                                        ^^^^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `Self`
    |
 help: consider further restricting `Self`
    |
diff --git a/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait.rs b/tests/ui/associated-types/associated-types-projection-to-unrelated-trait.rs
index 3b8c8c019..3b8c8c019 100644
--- a/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait.rs
+++ b/tests/ui/associated-types/associated-types-projection-to-unrelated-trait.rs
diff --git a/src/test/ui/associated-types/associated-types-qualified-path-with-trait-with-type-parameters.rs b/tests/ui/associated-types/associated-types-qualified-path-with-trait-with-type-parameters.rs
index 3c830d370..3c830d370 100644
--- a/src/test/ui/associated-types/associated-types-qualified-path-with-trait-with-type-parameters.rs
+++ b/tests/ui/associated-types/associated-types-qualified-path-with-trait-with-type-parameters.rs
diff --git a/src/test/ui/associated-types/associated-types-ref-from-struct.rs b/tests/ui/associated-types/associated-types-ref-from-struct.rs
index c89f6046e..c89f6046e 100644
--- a/src/test/ui/associated-types/associated-types-ref-from-struct.rs
+++ b/tests/ui/associated-types/associated-types-ref-from-struct.rs
diff --git a/src/test/ui/associated-types/associated-types-ref-in-struct-literal.rs b/tests/ui/associated-types/associated-types-ref-in-struct-literal.rs
index 4a490ed03..4a490ed03 100644
--- a/src/test/ui/associated-types/associated-types-ref-in-struct-literal.rs
+++ b/tests/ui/associated-types/associated-types-ref-in-struct-literal.rs
diff --git a/src/test/ui/associated-types/associated-types-region-erasure-issue-20582.rs b/tests/ui/associated-types/associated-types-region-erasure-issue-20582.rs
index b722506db..b722506db 100644
--- a/src/test/ui/associated-types/associated-types-region-erasure-issue-20582.rs
+++ b/tests/ui/associated-types/associated-types-region-erasure-issue-20582.rs
diff --git a/src/test/ui/associated-types/associated-types-resolve-lifetime.rs b/tests/ui/associated-types/associated-types-resolve-lifetime.rs
index 52f2324d7..52f2324d7 100644
--- a/src/test/ui/associated-types/associated-types-resolve-lifetime.rs
+++ b/tests/ui/associated-types/associated-types-resolve-lifetime.rs
diff --git a/src/test/ui/associated-types/associated-types-return.rs b/tests/ui/associated-types/associated-types-return.rs
index 997a48b03..997a48b03 100644
--- a/src/test/ui/associated-types/associated-types-return.rs
+++ b/tests/ui/associated-types/associated-types-return.rs
diff --git a/src/test/ui/associated-types/associated-types-simple.rs b/tests/ui/associated-types/associated-types-simple.rs
index 2e2dfd807..2e2dfd807 100644
--- a/src/test/ui/associated-types/associated-types-simple.rs
+++ b/tests/ui/associated-types/associated-types-simple.rs
diff --git a/src/test/ui/associated-types/associated-types-stream.rs b/tests/ui/associated-types/associated-types-stream.rs
index c9b302b96..c9b302b96 100644
--- a/src/test/ui/associated-types/associated-types-stream.rs
+++ b/tests/ui/associated-types/associated-types-stream.rs
diff --git a/src/test/ui/associated-types/associated-types-struct-field-named.rs b/tests/ui/associated-types/associated-types-struct-field-named.rs
index c400bf943..c400bf943 100644
--- a/src/test/ui/associated-types/associated-types-struct-field-named.rs
+++ b/tests/ui/associated-types/associated-types-struct-field-named.rs
diff --git a/src/test/ui/associated-types/associated-types-struct-field-numbered.rs b/tests/ui/associated-types/associated-types-struct-field-numbered.rs
index 8612911d8..8612911d8 100644
--- a/src/test/ui/associated-types/associated-types-struct-field-numbered.rs
+++ b/tests/ui/associated-types/associated-types-struct-field-numbered.rs
diff --git a/src/test/ui/associated-types/associated-types-subtyping-1.rs b/tests/ui/associated-types/associated-types-subtyping-1.rs
index c4758f255..c4758f255 100644
--- a/src/test/ui/associated-types/associated-types-subtyping-1.rs
+++ b/tests/ui/associated-types/associated-types-subtyping-1.rs
diff --git a/src/test/ui/associated-types/associated-types-subtyping-1.stderr b/tests/ui/associated-types/associated-types-subtyping-1.stderr
index 414bc048a..414bc048a 100644
--- a/src/test/ui/associated-types/associated-types-subtyping-1.stderr
+++ b/tests/ui/associated-types/associated-types-subtyping-1.stderr
diff --git a/src/test/ui/associated-types/associated-types-sugar-path.rs b/tests/ui/associated-types/associated-types-sugar-path.rs
index 66f7672aa..66f7672aa 100644
--- a/src/test/ui/associated-types/associated-types-sugar-path.rs
+++ b/tests/ui/associated-types/associated-types-sugar-path.rs
diff --git a/src/test/ui/associated-types/associated-types-unconstrained.rs b/tests/ui/associated-types/associated-types-unconstrained.rs
index 2fb27bf3c..2fb27bf3c 100644
--- a/src/test/ui/associated-types/associated-types-unconstrained.rs
+++ b/tests/ui/associated-types/associated-types-unconstrained.rs
diff --git a/tests/ui/associated-types/associated-types-unconstrained.stderr b/tests/ui/associated-types/associated-types-unconstrained.stderr
new file mode 100644
index 000000000..ef9b7cae0
--- /dev/null
+++ b/tests/ui/associated-types/associated-types-unconstrained.stderr
@@ -0,0 +1,17 @@
+error[E0790]: cannot call associated function on trait without specifying the corresponding `impl` type
+  --> $DIR/associated-types-unconstrained.rs:14:20
+   |
+LL |     fn bar() -> isize;
+   |     ------------------ `Foo::bar` defined here
+...
+LL |     let x: isize = Foo::bar();
+   |                    ^^^^^^^^ cannot call associated function of trait
+   |
+help: use the fully-qualified path to the only available implementation
+   |
+LL |     let x: isize = <isize as Foo>::bar();
+   |                    +++++++++    +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0790`.
diff --git a/src/test/ui/associated-types/associated-types-unsized.fixed b/tests/ui/associated-types/associated-types-unsized.fixed
index 328c8f944..328c8f944 100644
--- a/src/test/ui/associated-types/associated-types-unsized.fixed
+++ b/tests/ui/associated-types/associated-types-unsized.fixed
diff --git a/src/test/ui/associated-types/associated-types-unsized.rs b/tests/ui/associated-types/associated-types-unsized.rs
index bdba4c7ff..bdba4c7ff 100644
--- a/src/test/ui/associated-types/associated-types-unsized.rs
+++ b/tests/ui/associated-types/associated-types-unsized.rs
diff --git a/src/test/ui/associated-types/associated-types-unsized.stderr b/tests/ui/associated-types/associated-types-unsized.stderr
index bec9b1500..bec9b1500 100644
--- a/src/test/ui/associated-types/associated-types-unsized.stderr
+++ b/tests/ui/associated-types/associated-types-unsized.stderr
diff --git a/src/test/ui/associated-types/associated-types-where-clause-impl-ambiguity.rs b/tests/ui/associated-types/associated-types-where-clause-impl-ambiguity.rs
index f2a4c6e42..f2a4c6e42 100644
--- a/src/test/ui/associated-types/associated-types-where-clause-impl-ambiguity.rs
+++ b/tests/ui/associated-types/associated-types-where-clause-impl-ambiguity.rs
diff --git a/src/test/ui/associated-types/auxiliary/associated-types-cc-lib.rs b/tests/ui/associated-types/auxiliary/associated-types-cc-lib.rs
index b67853587..b67853587 100644
--- a/src/test/ui/associated-types/auxiliary/associated-types-cc-lib.rs
+++ b/tests/ui/associated-types/auxiliary/associated-types-cc-lib.rs
diff --git a/src/test/ui/associated-types/bound-lifetime-constrained.clause.stderr b/tests/ui/associated-types/bound-lifetime-constrained.clause.stderr
index f089f27f0..f089f27f0 100644
--- a/src/test/ui/associated-types/bound-lifetime-constrained.clause.stderr
+++ b/tests/ui/associated-types/bound-lifetime-constrained.clause.stderr
diff --git a/src/test/ui/associated-types/bound-lifetime-constrained.func.stderr b/tests/ui/associated-types/bound-lifetime-constrained.func.stderr
index 88d15a171..88d15a171 100644
--- a/src/test/ui/associated-types/bound-lifetime-constrained.func.stderr
+++ b/tests/ui/associated-types/bound-lifetime-constrained.func.stderr
diff --git a/src/test/ui/associated-types/bound-lifetime-constrained.object.stderr b/tests/ui/associated-types/bound-lifetime-constrained.object.stderr
index 36fa06cce..36fa06cce 100644
--- a/src/test/ui/associated-types/bound-lifetime-constrained.object.stderr
+++ b/tests/ui/associated-types/bound-lifetime-constrained.object.stderr
diff --git a/src/test/ui/associated-types/bound-lifetime-constrained.rs b/tests/ui/associated-types/bound-lifetime-constrained.rs
index 4e6754c86..4e6754c86 100644
--- a/src/test/ui/associated-types/bound-lifetime-constrained.rs
+++ b/tests/ui/associated-types/bound-lifetime-constrained.rs
diff --git a/src/test/ui/associated-types/bound-lifetime-in-binding-only.angle.stderr b/tests/ui/associated-types/bound-lifetime-in-binding-only.angle.stderr
index 54f4bb907..54f4bb907 100644
--- a/src/test/ui/associated-types/bound-lifetime-in-binding-only.angle.stderr
+++ b/tests/ui/associated-types/bound-lifetime-in-binding-only.angle.stderr
diff --git a/src/test/ui/associated-types/bound-lifetime-in-binding-only.elision.stderr b/tests/ui/associated-types/bound-lifetime-in-binding-only.elision.stderr
index 4de4afb6e..4de4afb6e 100644
--- a/src/test/ui/associated-types/bound-lifetime-in-binding-only.elision.stderr
+++ b/tests/ui/associated-types/bound-lifetime-in-binding-only.elision.stderr
diff --git a/src/test/ui/associated-types/bound-lifetime-in-binding-only.ok.stderr b/tests/ui/associated-types/bound-lifetime-in-binding-only.ok.stderr
index b709fae5a..b709fae5a 100644
--- a/src/test/ui/associated-types/bound-lifetime-in-binding-only.ok.stderr
+++ b/tests/ui/associated-types/bound-lifetime-in-binding-only.ok.stderr
diff --git a/src/test/ui/associated-types/bound-lifetime-in-binding-only.paren.stderr b/tests/ui/associated-types/bound-lifetime-in-binding-only.paren.stderr
index 74bc84c22..74bc84c22 100644
--- a/src/test/ui/associated-types/bound-lifetime-in-binding-only.paren.stderr
+++ b/tests/ui/associated-types/bound-lifetime-in-binding-only.paren.stderr
diff --git a/src/test/ui/associated-types/bound-lifetime-in-binding-only.rs b/tests/ui/associated-types/bound-lifetime-in-binding-only.rs
index e714457ef..e714457ef 100644
--- a/src/test/ui/associated-types/bound-lifetime-in-binding-only.rs
+++ b/tests/ui/associated-types/bound-lifetime-in-binding-only.rs
diff --git a/src/test/ui/associated-types/bound-lifetime-in-return-only.elision.stderr b/tests/ui/associated-types/bound-lifetime-in-return-only.elision.stderr
index 7753d1865..7753d1865 100644
--- a/src/test/ui/associated-types/bound-lifetime-in-return-only.elision.stderr
+++ b/tests/ui/associated-types/bound-lifetime-in-return-only.elision.stderr
diff --git a/src/test/ui/associated-types/bound-lifetime-in-return-only.local.stderr b/tests/ui/associated-types/bound-lifetime-in-return-only.local.stderr
index 788cf667c..788cf667c 100644
--- a/src/test/ui/associated-types/bound-lifetime-in-return-only.local.stderr
+++ b/tests/ui/associated-types/bound-lifetime-in-return-only.local.stderr
diff --git a/src/test/ui/associated-types/bound-lifetime-in-return-only.ok.stderr b/tests/ui/associated-types/bound-lifetime-in-return-only.ok.stderr
index 1c0d3ac10..1c0d3ac10 100644
--- a/src/test/ui/associated-types/bound-lifetime-in-return-only.ok.stderr
+++ b/tests/ui/associated-types/bound-lifetime-in-return-only.ok.stderr
diff --git a/src/test/ui/associated-types/bound-lifetime-in-return-only.rs b/tests/ui/associated-types/bound-lifetime-in-return-only.rs
index a60ccb6c4..a60ccb6c4 100644
--- a/src/test/ui/associated-types/bound-lifetime-in-return-only.rs
+++ b/tests/ui/associated-types/bound-lifetime-in-return-only.rs
diff --git a/src/test/ui/associated-types/bound-lifetime-in-return-only.sig.stderr b/tests/ui/associated-types/bound-lifetime-in-return-only.sig.stderr
index 64dad4619..64dad4619 100644
--- a/src/test/ui/associated-types/bound-lifetime-in-return-only.sig.stderr
+++ b/tests/ui/associated-types/bound-lifetime-in-return-only.sig.stderr
diff --git a/src/test/ui/associated-types/bound-lifetime-in-return-only.structure.stderr b/tests/ui/associated-types/bound-lifetime-in-return-only.structure.stderr
index f7833500d..f7833500d 100644
--- a/src/test/ui/associated-types/bound-lifetime-in-return-only.structure.stderr
+++ b/tests/ui/associated-types/bound-lifetime-in-return-only.structure.stderr
diff --git a/src/test/ui/associated-types/cache/chrono-scan.rs b/tests/ui/associated-types/cache/chrono-scan.rs
index 964ddc9b6..964ddc9b6 100644
--- a/src/test/ui/associated-types/cache/chrono-scan.rs
+++ b/tests/ui/associated-types/cache/chrono-scan.rs
diff --git a/src/test/ui/associated-types/cache/elision.rs b/tests/ui/associated-types/cache/elision.rs
index b3e1ec8ad..b3e1ec8ad 100644
--- a/src/test/ui/associated-types/cache/elision.rs
+++ b/tests/ui/associated-types/cache/elision.rs
diff --git a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.stderr b/tests/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.stderr
index 2ecee1341..2ecee1341 100644
--- a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.stderr
+++ b/tests/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.stderr
diff --git a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.rs b/tests/ui/associated-types/cache/project-fn-ret-contravariant.rs
index f1ea6627a..f1ea6627a 100644
--- a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.rs
+++ b/tests/ui/associated-types/cache/project-fn-ret-contravariant.rs
diff --git a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.stderr b/tests/ui/associated-types/cache/project-fn-ret-contravariant.transmute.stderr
index 6d8ab2c3f..6d8ab2c3f 100644
--- a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.stderr
+++ b/tests/ui/associated-types/cache/project-fn-ret-contravariant.transmute.stderr
diff --git a/src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.stderr b/tests/ui/associated-types/cache/project-fn-ret-invariant.krisskross.stderr
index ada12c7ee..ada12c7ee 100644
--- a/src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.stderr
+++ b/tests/ui/associated-types/cache/project-fn-ret-invariant.krisskross.stderr
diff --git a/src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.stderr b/tests/ui/associated-types/cache/project-fn-ret-invariant.oneuse.stderr
index 77841780f..77841780f 100644
--- a/src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.stderr
+++ b/tests/ui/associated-types/cache/project-fn-ret-invariant.oneuse.stderr
diff --git a/src/test/ui/associated-types/cache/project-fn-ret-invariant.rs b/tests/ui/associated-types/cache/project-fn-ret-invariant.rs
index e04337913..e04337913 100644
--- a/src/test/ui/associated-types/cache/project-fn-ret-invariant.rs
+++ b/tests/ui/associated-types/cache/project-fn-ret-invariant.rs
diff --git a/src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.stderr b/tests/ui/associated-types/cache/project-fn-ret-invariant.transmute.stderr
index b64cb2c3d..b64cb2c3d 100644
--- a/src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.stderr
+++ b/tests/ui/associated-types/cache/project-fn-ret-invariant.transmute.stderr
diff --git a/src/test/ui/associated-types/default-associated-types.rs b/tests/ui/associated-types/default-associated-types.rs
index aae70bffa..aae70bffa 100644
--- a/src/test/ui/associated-types/default-associated-types.rs
+++ b/tests/ui/associated-types/default-associated-types.rs
diff --git a/src/test/ui/associated-types/defaults-cyclic-fail-1.rs b/tests/ui/associated-types/defaults-cyclic-fail-1.rs
index 61ef01323..61ef01323 100644
--- a/src/test/ui/associated-types/defaults-cyclic-fail-1.rs
+++ b/tests/ui/associated-types/defaults-cyclic-fail-1.rs
diff --git a/src/test/ui/associated-types/defaults-cyclic-fail-1.stderr b/tests/ui/associated-types/defaults-cyclic-fail-1.stderr
index 008eddcb2..008eddcb2 100644
--- a/src/test/ui/associated-types/defaults-cyclic-fail-1.stderr
+++ b/tests/ui/associated-types/defaults-cyclic-fail-1.stderr
diff --git a/src/test/ui/associated-types/defaults-cyclic-fail-2.rs b/tests/ui/associated-types/defaults-cyclic-fail-2.rs
index e91c9f2d2..e91c9f2d2 100644
--- a/src/test/ui/associated-types/defaults-cyclic-fail-2.rs
+++ b/tests/ui/associated-types/defaults-cyclic-fail-2.rs
diff --git a/src/test/ui/associated-types/defaults-cyclic-fail-2.stderr b/tests/ui/associated-types/defaults-cyclic-fail-2.stderr
index d0fbab077..d0fbab077 100644
--- a/src/test/ui/associated-types/defaults-cyclic-fail-2.stderr
+++ b/tests/ui/associated-types/defaults-cyclic-fail-2.stderr
diff --git a/src/test/ui/associated-types/defaults-cyclic-pass-1.rs b/tests/ui/associated-types/defaults-cyclic-pass-1.rs
index 97c6e5bad..97c6e5bad 100644
--- a/src/test/ui/associated-types/defaults-cyclic-pass-1.rs
+++ b/tests/ui/associated-types/defaults-cyclic-pass-1.rs
diff --git a/src/test/ui/associated-types/defaults-cyclic-pass-2.rs b/tests/ui/associated-types/defaults-cyclic-pass-2.rs
index 69315a022..69315a022 100644
--- a/src/test/ui/associated-types/defaults-cyclic-pass-2.rs
+++ b/tests/ui/associated-types/defaults-cyclic-pass-2.rs
diff --git a/src/test/ui/associated-types/defaults-in-other-trait-items-pass.rs b/tests/ui/associated-types/defaults-in-other-trait-items-pass.rs
index a3bfcd8ef..a3bfcd8ef 100644
--- a/src/test/ui/associated-types/defaults-in-other-trait-items-pass.rs
+++ b/tests/ui/associated-types/defaults-in-other-trait-items-pass.rs
diff --git a/src/test/ui/associated-types/defaults-in-other-trait-items.rs b/tests/ui/associated-types/defaults-in-other-trait-items.rs
index 505751969..505751969 100644
--- a/src/test/ui/associated-types/defaults-in-other-trait-items.rs
+++ b/tests/ui/associated-types/defaults-in-other-trait-items.rs
diff --git a/src/test/ui/associated-types/defaults-in-other-trait-items.stderr b/tests/ui/associated-types/defaults-in-other-trait-items.stderr
index 71d421926..71d421926 100644
--- a/src/test/ui/associated-types/defaults-in-other-trait-items.stderr
+++ b/tests/ui/associated-types/defaults-in-other-trait-items.stderr
diff --git a/src/test/ui/associated-types/defaults-mixed.rs b/tests/ui/associated-types/defaults-mixed.rs
index c91b8de39..c91b8de39 100644
--- a/src/test/ui/associated-types/defaults-mixed.rs
+++ b/tests/ui/associated-types/defaults-mixed.rs
diff --git a/src/test/ui/associated-types/defaults-mixed.stderr b/tests/ui/associated-types/defaults-mixed.stderr
index 0f4a6968c..0f4a6968c 100644
--- a/src/test/ui/associated-types/defaults-mixed.stderr
+++ b/tests/ui/associated-types/defaults-mixed.stderr
diff --git a/src/test/ui/associated-types/defaults-specialization.rs b/tests/ui/associated-types/defaults-specialization.rs
index 553705b2a..553705b2a 100644
--- a/src/test/ui/associated-types/defaults-specialization.rs
+++ b/tests/ui/associated-types/defaults-specialization.rs
diff --git a/src/test/ui/associated-types/defaults-specialization.stderr b/tests/ui/associated-types/defaults-specialization.stderr
index 8df326351..7e21f7fc3 100644
--- a/src/test/ui/associated-types/defaults-specialization.stderr
+++ b/tests/ui/associated-types/defaults-specialization.stderr
@@ -22,8 +22,8 @@ note: type in trait
    |
 LL |     fn make() -> Self::Ty {
    |                  ^^^^^^^^
-   = note: expected fn pointer `fn() -> <A<T> as Tr>::Ty`
-              found fn pointer `fn() -> u8`
+   = note: expected signature `fn() -> <A<T> as Tr>::Ty`
+              found signature `fn() -> u8`
 
 error[E0053]: method `make` has an incompatible type for trait
   --> $DIR/defaults-specialization.rs:35:18
@@ -42,8 +42,8 @@ note: type in trait
    |
 LL |     fn make() -> Self::Ty {
    |                  ^^^^^^^^
-   = note: expected fn pointer `fn() -> <B<T> as Tr>::Ty`
-              found fn pointer `fn() -> bool`
+   = note: expected signature `fn() -> <B<T> as Tr>::Ty`
+              found signature `fn() -> bool`
 
 error[E0308]: mismatched types
   --> $DIR/defaults-specialization.rs:10:9
diff --git a/src/test/ui/associated-types/defaults-suitability.rs b/tests/ui/associated-types/defaults-suitability.rs
index 504c957d9..504c957d9 100644
--- a/src/test/ui/associated-types/defaults-suitability.rs
+++ b/tests/ui/associated-types/defaults-suitability.rs
diff --git a/src/test/ui/associated-types/defaults-suitability.stderr b/tests/ui/associated-types/defaults-suitability.stderr
index eadad4cd5..eadad4cd5 100644
--- a/src/test/ui/associated-types/defaults-suitability.stderr
+++ b/tests/ui/associated-types/defaults-suitability.stderr
diff --git a/src/test/ui/associated-types/defaults-unsound-62211-1.rs b/tests/ui/associated-types/defaults-unsound-62211-1.rs
index fa6a208b4..fa6a208b4 100644
--- a/src/test/ui/associated-types/defaults-unsound-62211-1.rs
+++ b/tests/ui/associated-types/defaults-unsound-62211-1.rs
diff --git a/src/test/ui/associated-types/defaults-unsound-62211-1.stderr b/tests/ui/associated-types/defaults-unsound-62211-1.stderr
index 5cd1cb4a1..5cd1cb4a1 100644
--- a/src/test/ui/associated-types/defaults-unsound-62211-1.stderr
+++ b/tests/ui/associated-types/defaults-unsound-62211-1.stderr
diff --git a/src/test/ui/associated-types/defaults-unsound-62211-2.rs b/tests/ui/associated-types/defaults-unsound-62211-2.rs
index c13ec776a..c13ec776a 100644
--- a/src/test/ui/associated-types/defaults-unsound-62211-2.rs
+++ b/tests/ui/associated-types/defaults-unsound-62211-2.rs
diff --git a/src/test/ui/associated-types/defaults-unsound-62211-2.stderr b/tests/ui/associated-types/defaults-unsound-62211-2.stderr
index 89319bb75..89319bb75 100644
--- a/src/test/ui/associated-types/defaults-unsound-62211-2.stderr
+++ b/tests/ui/associated-types/defaults-unsound-62211-2.stderr
diff --git a/src/test/ui/associated-types/defaults-wf.rs b/tests/ui/associated-types/defaults-wf.rs
index 99b512503..99b512503 100644
--- a/src/test/ui/associated-types/defaults-wf.rs
+++ b/tests/ui/associated-types/defaults-wf.rs
diff --git a/tests/ui/associated-types/defaults-wf.stderr b/tests/ui/associated-types/defaults-wf.stderr
new file mode 100644
index 000000000..fc830b8d6
--- /dev/null
+++ b/tests/ui/associated-types/defaults-wf.stderr
@@ -0,0 +1,13 @@
+error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
+  --> $DIR/defaults-wf.rs:7:15
+   |
+LL |     type Ty = Vec<[u8]>;
+   |               ^^^^^^^^^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `[u8]`
+note: required by a bound in `Vec`
+  --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/associated-types/higher-ranked-projection.bad.stderr b/tests/ui/associated-types/higher-ranked-projection.bad.stderr
index 239f45539..239f45539 100644
--- a/src/test/ui/associated-types/higher-ranked-projection.bad.stderr
+++ b/tests/ui/associated-types/higher-ranked-projection.bad.stderr
diff --git a/src/test/ui/associated-types/higher-ranked-projection.rs b/tests/ui/associated-types/higher-ranked-projection.rs
index 7e6c509a2..7e6c509a2 100644
--- a/src/test/ui/associated-types/higher-ranked-projection.rs
+++ b/tests/ui/associated-types/higher-ranked-projection.rs
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-1.rs b/tests/ui/associated-types/hr-associated-type-bound-1.rs
index db414164e..db414164e 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-1.rs
+++ b/tests/ui/associated-types/hr-associated-type-bound-1.rs
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-1.stderr b/tests/ui/associated-types/hr-associated-type-bound-1.stderr
index 73b5e1053..73b5e1053 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-1.stderr
+++ b/tests/ui/associated-types/hr-associated-type-bound-1.stderr
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-2.rs b/tests/ui/associated-types/hr-associated-type-bound-2.rs
index a89f61a81..a89f61a81 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-2.rs
+++ b/tests/ui/associated-types/hr-associated-type-bound-2.rs
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-2.stderr b/tests/ui/associated-types/hr-associated-type-bound-2.stderr
index a85edd7a0..749986f09 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-2.stderr
+++ b/tests/ui/associated-types/hr-associated-type-bound-2.stderr
@@ -10,6 +10,9 @@ note: required for `u32` to implement `for<'b> X<'b>`
    |
 LL | impl X<'_> for u32
    |      ^^^^^     ^^^
+LL | where
+LL |     for<'b> <Self as X<'b>>::U: Clone,
+   |                                 ----- unsatisfied trait bound introduced here
    = note: 128 redundant requirements hidden
    = note: required for `u32` to implement `for<'b> X<'b>`
 
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-object.rs b/tests/ui/associated-types/hr-associated-type-bound-object.rs
index e19c918c3..e19c918c3 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-object.rs
+++ b/tests/ui/associated-types/hr-associated-type-bound-object.rs
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-object.stderr b/tests/ui/associated-types/hr-associated-type-bound-object.stderr
index 6d19186bd..6d19186bd 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-object.stderr
+++ b/tests/ui/associated-types/hr-associated-type-bound-object.stderr
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-param-1.rs b/tests/ui/associated-types/hr-associated-type-bound-param-1.rs
index bbeeb145d..bbeeb145d 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-param-1.rs
+++ b/tests/ui/associated-types/hr-associated-type-bound-param-1.rs
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-param-1.stderr b/tests/ui/associated-types/hr-associated-type-bound-param-1.stderr
index af2e61689..af2e61689 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-param-1.stderr
+++ b/tests/ui/associated-types/hr-associated-type-bound-param-1.stderr
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-param-2.rs b/tests/ui/associated-types/hr-associated-type-bound-param-2.rs
index f74c5a859..f74c5a859 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-param-2.rs
+++ b/tests/ui/associated-types/hr-associated-type-bound-param-2.rs
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-param-2.stderr b/tests/ui/associated-types/hr-associated-type-bound-param-2.stderr
index 52294f8c9..52294f8c9 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-param-2.stderr
+++ b/tests/ui/associated-types/hr-associated-type-bound-param-2.stderr
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-param-3.rs b/tests/ui/associated-types/hr-associated-type-bound-param-3.rs
index fda7d8111..fda7d8111 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-param-3.rs
+++ b/tests/ui/associated-types/hr-associated-type-bound-param-3.rs
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-param-3.stderr b/tests/ui/associated-types/hr-associated-type-bound-param-3.stderr
index 84d5e0494..84d5e0494 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-param-3.stderr
+++ b/tests/ui/associated-types/hr-associated-type-bound-param-3.stderr
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-param-4.rs b/tests/ui/associated-types/hr-associated-type-bound-param-4.rs
index 20c8157ed..20c8157ed 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-param-4.rs
+++ b/tests/ui/associated-types/hr-associated-type-bound-param-4.rs
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-param-4.stderr b/tests/ui/associated-types/hr-associated-type-bound-param-4.stderr
index ee1d5d324..ee1d5d324 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-param-4.stderr
+++ b/tests/ui/associated-types/hr-associated-type-bound-param-4.stderr
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-param-5.rs b/tests/ui/associated-types/hr-associated-type-bound-param-5.rs
index d7f3151a5..d7f3151a5 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-param-5.rs
+++ b/tests/ui/associated-types/hr-associated-type-bound-param-5.rs
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-param-5.stderr b/tests/ui/associated-types/hr-associated-type-bound-param-5.stderr
index ece3151ba..ece3151ba 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-param-5.stderr
+++ b/tests/ui/associated-types/hr-associated-type-bound-param-5.stderr
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-param-6.rs b/tests/ui/associated-types/hr-associated-type-bound-param-6.rs
index 482047b09..482047b09 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-param-6.rs
+++ b/tests/ui/associated-types/hr-associated-type-bound-param-6.rs
diff --git a/src/test/ui/associated-types/hr-associated-type-bound-param-6.stderr b/tests/ui/associated-types/hr-associated-type-bound-param-6.stderr
index bd6e627a3..bd6e627a3 100644
--- a/src/test/ui/associated-types/hr-associated-type-bound-param-6.stderr
+++ b/tests/ui/associated-types/hr-associated-type-bound-param-6.stderr
diff --git a/src/test/ui/associated-types/hr-associated-type-projection-1.rs b/tests/ui/associated-types/hr-associated-type-projection-1.rs
index 951dd9e97..951dd9e97 100644
--- a/src/test/ui/associated-types/hr-associated-type-projection-1.rs
+++ b/tests/ui/associated-types/hr-associated-type-projection-1.rs
diff --git a/src/test/ui/associated-types/hr-associated-type-projection-1.stderr b/tests/ui/associated-types/hr-associated-type-projection-1.stderr
index a65f84ae5..a65f84ae5 100644
--- a/src/test/ui/associated-types/hr-associated-type-projection-1.stderr
+++ b/tests/ui/associated-types/hr-associated-type-projection-1.stderr
diff --git a/src/test/ui/associated-types/impl-trait-return-missing-constraint.rs b/tests/ui/associated-types/impl-trait-return-missing-constraint.rs
index 1de1ddbe3..1de1ddbe3 100644
--- a/src/test/ui/associated-types/impl-trait-return-missing-constraint.rs
+++ b/tests/ui/associated-types/impl-trait-return-missing-constraint.rs
diff --git a/src/test/ui/associated-types/impl-trait-return-missing-constraint.stderr b/tests/ui/associated-types/impl-trait-return-missing-constraint.stderr
index fbd76a64c..fbd76a64c 100644
--- a/src/test/ui/associated-types/impl-trait-return-missing-constraint.stderr
+++ b/tests/ui/associated-types/impl-trait-return-missing-constraint.stderr
diff --git a/src/test/ui/associated-types/impl-wf-cycle-1.rs b/tests/ui/associated-types/impl-wf-cycle-1.rs
index 365eddaed..365eddaed 100644
--- a/src/test/ui/associated-types/impl-wf-cycle-1.rs
+++ b/tests/ui/associated-types/impl-wf-cycle-1.rs
diff --git a/src/test/ui/associated-types/impl-wf-cycle-1.stderr b/tests/ui/associated-types/impl-wf-cycle-1.stderr
index 6661347e4..206060f19 100644
--- a/src/test/ui/associated-types/impl-wf-cycle-1.stderr
+++ b/tests/ui/associated-types/impl-wf-cycle-1.stderr
@@ -9,6 +9,9 @@ note: required for `(T,)` to implement `Grault`
    |
 LL | impl<T: Grault> Grault for (T,)
    |                 ^^^^^^     ^^^^
+...
+LL |     Self::A: Baz,
+   |              --- unsatisfied trait bound introduced here
    = note: 1 redundant requirement hidden
    = note: required for `(T,)` to implement `Grault`
 
diff --git a/src/test/ui/associated-types/impl-wf-cycle-2.rs b/tests/ui/associated-types/impl-wf-cycle-2.rs
index f2f3072e3..f2f3072e3 100644
--- a/src/test/ui/associated-types/impl-wf-cycle-2.rs
+++ b/tests/ui/associated-types/impl-wf-cycle-2.rs
diff --git a/src/test/ui/associated-types/impl-wf-cycle-2.stderr b/tests/ui/associated-types/impl-wf-cycle-2.stderr
index ec4ffe27c..771ba751e 100644
--- a/src/test/ui/associated-types/impl-wf-cycle-2.stderr
+++ b/tests/ui/associated-types/impl-wf-cycle-2.stderr
@@ -9,6 +9,9 @@ note: required for `(T,)` to implement `Grault`
    |
 LL | impl<T: Grault> Grault for (T,)
    |                 ^^^^^^     ^^^^
+...
+LL |     Self::A: Copy,
+   |              ---- unsatisfied trait bound introduced here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/associated-types/issue-18655.rs b/tests/ui/associated-types/issue-18655.rs
index 3d18542ac..3d18542ac 100644
--- a/src/test/ui/associated-types/issue-18655.rs
+++ b/tests/ui/associated-types/issue-18655.rs
diff --git a/src/test/ui/associated-types/issue-19081.rs b/tests/ui/associated-types/issue-19081.rs
index fbfe4c6f8..fbfe4c6f8 100644
--- a/src/test/ui/associated-types/issue-19081.rs
+++ b/tests/ui/associated-types/issue-19081.rs
diff --git a/src/test/ui/associated-types/issue-19883.rs b/tests/ui/associated-types/issue-19883.rs
index 5cf422043..5cf422043 100644
--- a/src/test/ui/associated-types/issue-19883.rs
+++ b/tests/ui/associated-types/issue-19883.rs
diff --git a/src/test/ui/associated-types/issue-19883.stderr b/tests/ui/associated-types/issue-19883.stderr
index bd6a86b74..bd6a86b74 100644
--- a/src/test/ui/associated-types/issue-19883.stderr
+++ b/tests/ui/associated-types/issue-19883.stderr
diff --git a/src/test/ui/associated-types/issue-20005.rs b/tests/ui/associated-types/issue-20005.rs
index 36350bff1..36350bff1 100644
--- a/src/test/ui/associated-types/issue-20005.rs
+++ b/tests/ui/associated-types/issue-20005.rs
diff --git a/src/test/ui/associated-types/issue-20005.stderr b/tests/ui/associated-types/issue-20005.stderr
index c8e57df0d..c8e57df0d 100644
--- a/src/test/ui/associated-types/issue-20005.stderr
+++ b/tests/ui/associated-types/issue-20005.stderr
diff --git a/src/test/ui/associated-types/issue-20825-2.rs b/tests/ui/associated-types/issue-20825-2.rs
index b79a29730..b79a29730 100644
--- a/src/test/ui/associated-types/issue-20825-2.rs
+++ b/tests/ui/associated-types/issue-20825-2.rs
diff --git a/src/test/ui/associated-types/issue-20825.rs b/tests/ui/associated-types/issue-20825.rs
index 516c304d8..516c304d8 100644
--- a/src/test/ui/associated-types/issue-20825.rs
+++ b/tests/ui/associated-types/issue-20825.rs
diff --git a/src/test/ui/associated-types/issue-20825.stderr b/tests/ui/associated-types/issue-20825.stderr
index be2bbd448..be2bbd448 100644
--- a/src/test/ui/associated-types/issue-20825.stderr
+++ b/tests/ui/associated-types/issue-20825.stderr
diff --git a/src/test/ui/associated-types/issue-21363.rs b/tests/ui/associated-types/issue-21363.rs
index acc28cb43..acc28cb43 100644
--- a/src/test/ui/associated-types/issue-21363.rs
+++ b/tests/ui/associated-types/issue-21363.rs
diff --git a/src/test/ui/associated-types/issue-21726.rs b/tests/ui/associated-types/issue-21726.rs
index b98cf2166..b98cf2166 100644
--- a/src/test/ui/associated-types/issue-21726.rs
+++ b/tests/ui/associated-types/issue-21726.rs
diff --git a/src/test/ui/associated-types/issue-22037.rs b/tests/ui/associated-types/issue-22037.rs
index b9eb41b6e..b9eb41b6e 100644
--- a/src/test/ui/associated-types/issue-22037.rs
+++ b/tests/ui/associated-types/issue-22037.rs
diff --git a/src/test/ui/associated-types/issue-22037.stderr b/tests/ui/associated-types/issue-22037.stderr
index 0e019f10f..0e019f10f 100644
--- a/src/test/ui/associated-types/issue-22037.stderr
+++ b/tests/ui/associated-types/issue-22037.stderr
diff --git a/src/test/ui/associated-types/issue-22066.rs b/tests/ui/associated-types/issue-22066.rs
index 8e8ba5dc4..8e8ba5dc4 100644
--- a/src/test/ui/associated-types/issue-22066.rs
+++ b/tests/ui/associated-types/issue-22066.rs
diff --git a/src/test/ui/associated-types/issue-22560.rs b/tests/ui/associated-types/issue-22560.rs
index 44be8817b..44be8817b 100644
--- a/src/test/ui/associated-types/issue-22560.rs
+++ b/tests/ui/associated-types/issue-22560.rs
diff --git a/src/test/ui/associated-types/issue-22560.stderr b/tests/ui/associated-types/issue-22560.stderr
index 2b88cf0b4..2b88cf0b4 100644
--- a/src/test/ui/associated-types/issue-22560.stderr
+++ b/tests/ui/associated-types/issue-22560.stderr
diff --git a/src/test/ui/associated-types/issue-22828.rs b/tests/ui/associated-types/issue-22828.rs
index adf4dd6ce..adf4dd6ce 100644
--- a/src/test/ui/associated-types/issue-22828.rs
+++ b/tests/ui/associated-types/issue-22828.rs
diff --git a/src/test/ui/associated-types/issue-23208.rs b/tests/ui/associated-types/issue-23208.rs
index fd4ffe5d6..fd4ffe5d6 100644
--- a/src/test/ui/associated-types/issue-23208.rs
+++ b/tests/ui/associated-types/issue-23208.rs
diff --git a/src/test/ui/associated-types/issue-23595-1.rs b/tests/ui/associated-types/issue-23595-1.rs
index 483c205f4..483c205f4 100644
--- a/src/test/ui/associated-types/issue-23595-1.rs
+++ b/tests/ui/associated-types/issue-23595-1.rs
diff --git a/src/test/ui/associated-types/issue-23595-1.stderr b/tests/ui/associated-types/issue-23595-1.stderr
index 4307477a5..4307477a5 100644
--- a/src/test/ui/associated-types/issue-23595-1.stderr
+++ b/tests/ui/associated-types/issue-23595-1.stderr
diff --git a/src/test/ui/associated-types/issue-23595-2.rs b/tests/ui/associated-types/issue-23595-2.rs
index 2bfee7a35..2bfee7a35 100644
--- a/src/test/ui/associated-types/issue-23595-2.rs
+++ b/tests/ui/associated-types/issue-23595-2.rs
diff --git a/src/test/ui/associated-types/issue-23595-2.stderr b/tests/ui/associated-types/issue-23595-2.stderr
index dded673f6..dded673f6 100644
--- a/src/test/ui/associated-types/issue-23595-2.stderr
+++ b/tests/ui/associated-types/issue-23595-2.stderr
diff --git a/src/test/ui/associated-types/issue-24159.rs b/tests/ui/associated-types/issue-24159.rs
index 49753e7bf..49753e7bf 100644
--- a/src/test/ui/associated-types/issue-24159.rs
+++ b/tests/ui/associated-types/issue-24159.rs
diff --git a/src/test/ui/associated-types/issue-24204.rs b/tests/ui/associated-types/issue-24204.rs
index 5a7b34595..5a7b34595 100644
--- a/src/test/ui/associated-types/issue-24204.rs
+++ b/tests/ui/associated-types/issue-24204.rs
diff --git a/src/test/ui/associated-types/issue-24338.rs b/tests/ui/associated-types/issue-24338.rs
index 3a2c790f8..3a2c790f8 100644
--- a/src/test/ui/associated-types/issue-24338.rs
+++ b/tests/ui/associated-types/issue-24338.rs
diff --git a/src/test/ui/associated-types/issue-25339.rs b/tests/ui/associated-types/issue-25339.rs
index 6f8ec7009..6f8ec7009 100644
--- a/src/test/ui/associated-types/issue-25339.rs
+++ b/tests/ui/associated-types/issue-25339.rs
diff --git a/src/test/ui/issues/issue-25700-1.rs b/tests/ui/associated-types/issue-25700-1.rs
index 5e71a52ba..5e71a52ba 100644
--- a/src/test/ui/issues/issue-25700-1.rs
+++ b/tests/ui/associated-types/issue-25700-1.rs
diff --git a/src/test/ui/issues/issue-25700-2.rs b/tests/ui/associated-types/issue-25700-2.rs
index 89b1db496..89b1db496 100644
--- a/src/test/ui/issues/issue-25700-2.rs
+++ b/tests/ui/associated-types/issue-25700-2.rs
diff --git a/src/test/ui/issues/issue-25700.rs b/tests/ui/associated-types/issue-25700.rs
index e5b9a9752..e5b9a9752 100644
--- a/src/test/ui/issues/issue-25700.rs
+++ b/tests/ui/associated-types/issue-25700.rs
diff --git a/src/test/ui/issues/issue-25700.stderr b/tests/ui/associated-types/issue-25700.stderr
index fa309a55c..fa309a55c 100644
--- a/src/test/ui/issues/issue-25700.stderr
+++ b/tests/ui/associated-types/issue-25700.stderr
diff --git a/src/test/ui/associated-types/issue-26681.rs b/tests/ui/associated-types/issue-26681.rs
index a0a8c86d9..a0a8c86d9 100644
--- a/src/test/ui/associated-types/issue-26681.rs
+++ b/tests/ui/associated-types/issue-26681.rs
diff --git a/src/test/ui/associated-types/issue-26681.stderr b/tests/ui/associated-types/issue-26681.stderr
index 74411008c..74411008c 100644
--- a/src/test/ui/associated-types/issue-26681.stderr
+++ b/tests/ui/associated-types/issue-26681.stderr
diff --git a/src/test/ui/associated-types/issue-27675-unchecked-bounds.rs b/tests/ui/associated-types/issue-27675-unchecked-bounds.rs
index 1cfc23045..1cfc23045 100644
--- a/src/test/ui/associated-types/issue-27675-unchecked-bounds.rs
+++ b/tests/ui/associated-types/issue-27675-unchecked-bounds.rs
diff --git a/src/test/ui/associated-types/issue-27675-unchecked-bounds.stderr b/tests/ui/associated-types/issue-27675-unchecked-bounds.stderr
index a14a273b3..a14a273b3 100644
--- a/src/test/ui/associated-types/issue-27675-unchecked-bounds.stderr
+++ b/tests/ui/associated-types/issue-27675-unchecked-bounds.stderr
diff --git a/src/test/ui/associated-types/issue-28871.rs b/tests/ui/associated-types/issue-28871.rs
index 210c783de..210c783de 100644
--- a/src/test/ui/associated-types/issue-28871.rs
+++ b/tests/ui/associated-types/issue-28871.rs
diff --git a/src/test/ui/associated-types/issue-31597.rs b/tests/ui/associated-types/issue-31597.rs
index 2872be6d6..2872be6d6 100644
--- a/src/test/ui/associated-types/issue-31597.rs
+++ b/tests/ui/associated-types/issue-31597.rs
diff --git a/src/test/ui/associated-types/issue-32350.rs b/tests/ui/associated-types/issue-32350.rs
index bda21eb0e..bda21eb0e 100644
--- a/src/test/ui/associated-types/issue-32350.rs
+++ b/tests/ui/associated-types/issue-32350.rs
diff --git a/src/test/ui/associated-types/issue-36499.rs b/tests/ui/associated-types/issue-36499.rs
index 7f8f13ef8..7f8f13ef8 100644
--- a/src/test/ui/associated-types/issue-36499.rs
+++ b/tests/ui/associated-types/issue-36499.rs
diff --git a/src/test/ui/associated-types/issue-36499.stderr b/tests/ui/associated-types/issue-36499.stderr
index 80e42b61d..80e42b61d 100644
--- a/src/test/ui/associated-types/issue-36499.stderr
+++ b/tests/ui/associated-types/issue-36499.stderr
diff --git a/src/test/ui/associated-types/issue-37808.rs b/tests/ui/associated-types/issue-37808.rs
index 3701c37d0..3701c37d0 100644
--- a/src/test/ui/associated-types/issue-37808.rs
+++ b/tests/ui/associated-types/issue-37808.rs
diff --git a/src/test/ui/associated-types/issue-37883.rs b/tests/ui/associated-types/issue-37883.rs
index d854f6af3..d854f6af3 100644
--- a/src/test/ui/associated-types/issue-37883.rs
+++ b/tests/ui/associated-types/issue-37883.rs
diff --git a/src/test/ui/associated-types/issue-38917.rs b/tests/ui/associated-types/issue-38917.rs
index 7e898851a..7e898851a 100644
--- a/src/test/ui/associated-types/issue-38917.rs
+++ b/tests/ui/associated-types/issue-38917.rs
diff --git a/src/test/ui/associated-types/issue-39532.rs b/tests/ui/associated-types/issue-39532.rs
index 52652cede..52652cede 100644
--- a/src/test/ui/associated-types/issue-39532.rs
+++ b/tests/ui/associated-types/issue-39532.rs
diff --git a/src/test/ui/associated-types/issue-40093.rs b/tests/ui/associated-types/issue-40093.rs
index fd325ae10..fd325ae10 100644
--- a/src/test/ui/associated-types/issue-40093.rs
+++ b/tests/ui/associated-types/issue-40093.rs
diff --git a/src/test/ui/associated-types/issue-41868.rs b/tests/ui/associated-types/issue-41868.rs
index 52bbd1f5d..52bbd1f5d 100644
--- a/src/test/ui/associated-types/issue-41868.rs
+++ b/tests/ui/associated-types/issue-41868.rs
diff --git a/src/test/ui/associated-types/issue-43475.rs b/tests/ui/associated-types/issue-43475.rs
index 5f177333c..5f177333c 100644
--- a/src/test/ui/associated-types/issue-43475.rs
+++ b/tests/ui/associated-types/issue-43475.rs
diff --git a/src/test/ui/associated-types/issue-43784-associated-type.rs b/tests/ui/associated-types/issue-43784-associated-type.rs
index 78815d8d3..78815d8d3 100644
--- a/src/test/ui/associated-types/issue-43784-associated-type.rs
+++ b/tests/ui/associated-types/issue-43784-associated-type.rs
diff --git a/src/test/ui/associated-types/issue-43784-associated-type.stderr b/tests/ui/associated-types/issue-43784-associated-type.stderr
index f1677b822..50fa7d1ac 100644
--- a/src/test/ui/associated-types/issue-43784-associated-type.stderr
+++ b/tests/ui/associated-types/issue-43784-associated-type.stderr
@@ -4,6 +4,11 @@ error[E0277]: the trait bound `T: Copy` is not satisfied
 LL |     type Assoc = T;
    |                  ^ the trait `Copy` is not implemented for `T`
    |
+note: required for `<T as Complete>::Assoc` to implement `Partial<T>`
+  --> $DIR/issue-43784-associated-type.rs:1:11
+   |
+LL | pub trait Partial<X: ?Sized>: Copy {
+   |           ^^^^^^^
 note: required by a bound in `Complete::Assoc`
   --> $DIR/issue-43784-associated-type.rs:5:17
    |
diff --git a/src/test/ui/associated-types/issue-43924.rs b/tests/ui/associated-types/issue-43924.rs
index 6a63b3e09..6a63b3e09 100644
--- a/src/test/ui/associated-types/issue-43924.rs
+++ b/tests/ui/associated-types/issue-43924.rs
diff --git a/src/test/ui/associated-types/issue-43924.stderr b/tests/ui/associated-types/issue-43924.stderr
index 526f425b2..526f425b2 100644
--- a/src/test/ui/associated-types/issue-43924.stderr
+++ b/tests/ui/associated-types/issue-43924.stderr
diff --git a/src/test/ui/associated-types/issue-44153.rs b/tests/ui/associated-types/issue-44153.rs
index 2101cb61a..2101cb61a 100644
--- a/src/test/ui/associated-types/issue-44153.rs
+++ b/tests/ui/associated-types/issue-44153.rs
diff --git a/src/test/ui/associated-types/issue-44153.stderr b/tests/ui/associated-types/issue-44153.stderr
index 9c92f19d8..8bddcd955 100644
--- a/src/test/ui/associated-types/issue-44153.stderr
+++ b/tests/ui/associated-types/issue-44153.stderr
@@ -14,6 +14,8 @@ note: required for `()` to implement `Visit`
    |
 LL | impl<'a> Visit for () where
    |          ^^^^^     ^^
+LL |     (): Array<Element=&'a ()>,
+   |               -------------- unsatisfied trait bound introduced here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/associated-types/issue-47139-1.rs b/tests/ui/associated-types/issue-47139-1.rs
index c55fc3434..c55fc3434 100644
--- a/src/test/ui/associated-types/issue-47139-1.rs
+++ b/tests/ui/associated-types/issue-47139-1.rs
diff --git a/src/test/ui/associated-types/issue-47139-2.rs b/tests/ui/associated-types/issue-47139-2.rs
index d2ef89425..d2ef89425 100644
--- a/src/test/ui/associated-types/issue-47139-2.rs
+++ b/tests/ui/associated-types/issue-47139-2.rs
diff --git a/src/test/ui/associated-types/issue-47385.rs b/tests/ui/associated-types/issue-47385.rs
index d43d674e9..d43d674e9 100644
--- a/src/test/ui/associated-types/issue-47385.rs
+++ b/tests/ui/associated-types/issue-47385.rs
diff --git a/src/test/ui/associated-types/issue-47814.rs b/tests/ui/associated-types/issue-47814.rs
index 90e8a3bc2..90e8a3bc2 100644
--- a/src/test/ui/associated-types/issue-47814.rs
+++ b/tests/ui/associated-types/issue-47814.rs
diff --git a/src/test/ui/associated-types/issue-47814.stderr b/tests/ui/associated-types/issue-47814.stderr
index 2e4ddb811..2e4ddb811 100644
--- a/src/test/ui/associated-types/issue-47814.stderr
+++ b/tests/ui/associated-types/issue-47814.stderr
diff --git a/src/test/ui/associated-types/issue-48010.rs b/tests/ui/associated-types/issue-48010.rs
index 70e30c132..70e30c132 100644
--- a/src/test/ui/associated-types/issue-48010.rs
+++ b/tests/ui/associated-types/issue-48010.rs
diff --git a/src/test/ui/associated-types/issue-48551.rs b/tests/ui/associated-types/issue-48551.rs
index b95a4832b..b95a4832b 100644
--- a/src/test/ui/associated-types/issue-48551.rs
+++ b/tests/ui/associated-types/issue-48551.rs
diff --git a/src/test/ui/associated-types/issue-50301.rs b/tests/ui/associated-types/issue-50301.rs
index 47ee3e7ad..47ee3e7ad 100644
--- a/src/test/ui/associated-types/issue-50301.rs
+++ b/tests/ui/associated-types/issue-50301.rs
diff --git a/src/test/ui/associated-types/issue-54108.rs b/tests/ui/associated-types/issue-54108.rs
index 87f67ce4b..87f67ce4b 100644
--- a/src/test/ui/associated-types/issue-54108.rs
+++ b/tests/ui/associated-types/issue-54108.rs
diff --git a/src/test/ui/associated-types/issue-54108.stderr b/tests/ui/associated-types/issue-54108.stderr
index 6ff5e4542..6ff5e4542 100644
--- a/src/test/ui/associated-types/issue-54108.stderr
+++ b/tests/ui/associated-types/issue-54108.stderr
diff --git a/src/test/ui/associated-types/issue-54182-1.rs b/tests/ui/associated-types/issue-54182-1.rs
index 1a1e98cba..1a1e98cba 100644
--- a/src/test/ui/associated-types/issue-54182-1.rs
+++ b/tests/ui/associated-types/issue-54182-1.rs
diff --git a/src/test/ui/associated-types/issue-54182-2.rs b/tests/ui/associated-types/issue-54182-2.rs
index c88c76631..c88c76631 100644
--- a/src/test/ui/associated-types/issue-54182-2.rs
+++ b/tests/ui/associated-types/issue-54182-2.rs
diff --git a/src/test/ui/associated-types/issue-54467.rs b/tests/ui/associated-types/issue-54467.rs
index 734bf2768..734bf2768 100644
--- a/src/test/ui/associated-types/issue-54467.rs
+++ b/tests/ui/associated-types/issue-54467.rs
diff --git a/src/test/ui/associated-types/issue-55846.rs b/tests/ui/associated-types/issue-55846.rs
index bd7667523..bd7667523 100644
--- a/src/test/ui/associated-types/issue-55846.rs
+++ b/tests/ui/associated-types/issue-55846.rs
diff --git a/src/test/ui/associated-types/issue-59324.rs b/tests/ui/associated-types/issue-59324.rs
index 9e68e9e77..551f13ee1 100644
--- a/src/test/ui/associated-types/issue-59324.rs
+++ b/tests/ui/associated-types/issue-59324.rs
@@ -15,9 +15,9 @@ pub trait ThriftService<Bug: NotFoo>:
 {
     fn get_service(
     //~^ ERROR the trait bound `Bug: Foo` is not satisfied
-    //~| ERROR the trait bound `Bug: Foo` is not satisfied
         &self,
     ) -> Self::AssocType;
+    //~^ ERROR the trait bound `Bug: Foo` is not satisfied
 }
 
 fn with_factory<H>(factory: dyn ThriftService<()>) {}
diff --git a/src/test/ui/associated-types/issue-59324.stderr b/tests/ui/associated-types/issue-59324.stderr
index 62cf1f37a..a84b599b5 100644
--- a/src/test/ui/associated-types/issue-59324.stderr
+++ b/tests/ui/associated-types/issue-59324.stderr
@@ -20,7 +20,7 @@ LL | |
 LL | |
 LL | |     Service<AssocType = <Bug as Foo>::OnlyFoo>
 ...  |
-LL | |     ) -> Self::AssocType;
+LL | |
 LL | | }
    | |_^ the trait `Foo` is not implemented for `Bug`
    |
@@ -34,7 +34,6 @@ error[E0277]: the trait bound `Bug: Foo` is not satisfied
    |
 LL | /     fn get_service(
 LL | |
-LL | |
 LL | |         &self,
 LL | |     ) -> Self::AssocType;
    | |_________________________^ the trait `Foo` is not implemented for `Bug`
@@ -45,20 +44,16 @@ LL | pub trait ThriftService<Bug: NotFoo + Foo>:
    |                                     +++++
 
 error[E0277]: the trait bound `(): Foo` is not satisfied
-  --> $DIR/issue-59324.rs:23:1
+  --> $DIR/issue-59324.rs:23:29
    |
 LL | fn with_factory<H>(factory: dyn ThriftService<()>) {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `()`
+   |                             ^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `()`
 
 error[E0277]: the trait bound `Bug: Foo` is not satisfied
-  --> $DIR/issue-59324.rs:16:5
+  --> $DIR/issue-59324.rs:19:10
    |
-LL | /     fn get_service(
-LL | |
-LL | |
-LL | |         &self,
-LL | |     ) -> Self::AssocType;
-   | |_________________________^ the trait `Foo` is not implemented for `Bug`
+LL |     ) -> Self::AssocType;
+   |          ^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `Bug`
    |
 help: consider further restricting this bound
    |
diff --git a/src/test/ui/associated-types/issue-62200.rs b/tests/ui/associated-types/issue-62200.rs
index 499bbd6b6..499bbd6b6 100644
--- a/src/test/ui/associated-types/issue-62200.rs
+++ b/tests/ui/associated-types/issue-62200.rs
diff --git a/src/test/ui/associated-types/issue-62200.stderr b/tests/ui/associated-types/issue-62200.stderr
index 04f0728f5..04f0728f5 100644
--- a/src/test/ui/associated-types/issue-62200.stderr
+++ b/tests/ui/associated-types/issue-62200.stderr
diff --git a/src/test/ui/associated-types/issue-63591.rs b/tests/ui/associated-types/issue-63591.rs
index 4d2e39f4d..4d2e39f4d 100644
--- a/src/test/ui/associated-types/issue-63591.rs
+++ b/tests/ui/associated-types/issue-63591.rs
diff --git a/src/test/ui/associated-types/issue-63593.rs b/tests/ui/associated-types/issue-63593.rs
index 8dbc24c06..8dbc24c06 100644
--- a/src/test/ui/associated-types/issue-63593.rs
+++ b/tests/ui/associated-types/issue-63593.rs
diff --git a/src/test/ui/associated-types/issue-63593.stderr b/tests/ui/associated-types/issue-63593.stderr
index f643ec3ff..f643ec3ff 100644
--- a/src/test/ui/associated-types/issue-63593.stderr
+++ b/tests/ui/associated-types/issue-63593.stderr
diff --git a/src/test/ui/associated-types/issue-64848.rs b/tests/ui/associated-types/issue-64848.rs
index 77712168a..77712168a 100644
--- a/src/test/ui/associated-types/issue-64848.rs
+++ b/tests/ui/associated-types/issue-64848.rs
diff --git a/src/test/ui/associated-types/issue-64855-2.rs b/tests/ui/associated-types/issue-64855-2.rs
index 1d53bd570..1d53bd570 100644
--- a/src/test/ui/associated-types/issue-64855-2.rs
+++ b/tests/ui/associated-types/issue-64855-2.rs
diff --git a/src/test/ui/associated-types/issue-64855.rs b/tests/ui/associated-types/issue-64855.rs
index 81cf3ae6e..81cf3ae6e 100644
--- a/src/test/ui/associated-types/issue-64855.rs
+++ b/tests/ui/associated-types/issue-64855.rs
diff --git a/src/test/ui/associated-types/issue-64855.stderr b/tests/ui/associated-types/issue-64855.stderr
index 6ad795c11..6ad795c11 100644
--- a/src/test/ui/associated-types/issue-64855.stderr
+++ b/tests/ui/associated-types/issue-64855.stderr
diff --git a/src/test/ui/associated-types/issue-65774-1.rs b/tests/ui/associated-types/issue-65774-1.rs
index 934514055..934514055 100644
--- a/src/test/ui/associated-types/issue-65774-1.rs
+++ b/tests/ui/associated-types/issue-65774-1.rs
diff --git a/src/test/ui/associated-types/issue-65774-1.stderr b/tests/ui/associated-types/issue-65774-1.stderr
index 3b294d65d..91b557555 100644
--- a/src/test/ui/associated-types/issue-65774-1.stderr
+++ b/tests/ui/associated-types/issue-65774-1.stderr
@@ -22,7 +22,9 @@ note: required for `&mut T` to implement `MyDisplay`
   --> $DIR/issue-65774-1.rs:5:24
    |
 LL | impl<'a, T: MyDisplay> MyDisplay for &'a mut T { }
-   |                        ^^^^^^^^^     ^^^^^^^^^
+   |             ---------  ^^^^^^^^^     ^^^^^^^^^
+   |             |
+   |             unsatisfied trait bound introduced here
    = note: required for the cast from `&mut T` to the object type `dyn MyDisplay`
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/associated-types/issue-65774-2.rs b/tests/ui/associated-types/issue-65774-2.rs
index 171e0893b..171e0893b 100644
--- a/src/test/ui/associated-types/issue-65774-2.rs
+++ b/tests/ui/associated-types/issue-65774-2.rs
diff --git a/src/test/ui/associated-types/issue-65774-2.stderr b/tests/ui/associated-types/issue-65774-2.stderr
index c22302cdc..c22302cdc 100644
--- a/src/test/ui/associated-types/issue-65774-2.stderr
+++ b/tests/ui/associated-types/issue-65774-2.stderr
diff --git a/src/test/ui/associated-types/issue-65934.rs b/tests/ui/associated-types/issue-65934.rs
index e17b11c5e..e17b11c5e 100644
--- a/src/test/ui/associated-types/issue-65934.rs
+++ b/tests/ui/associated-types/issue-65934.rs
diff --git a/src/test/ui/associated-types/issue-67684.rs b/tests/ui/associated-types/issue-67684.rs
index 49efe8a1b..49efe8a1b 100644
--- a/src/test/ui/associated-types/issue-67684.rs
+++ b/tests/ui/associated-types/issue-67684.rs
diff --git a/src/test/ui/associated-types/issue-69398.rs b/tests/ui/associated-types/issue-69398.rs
index ca3d66b1c..ca3d66b1c 100644
--- a/src/test/ui/associated-types/issue-69398.rs
+++ b/tests/ui/associated-types/issue-69398.rs
diff --git a/src/test/ui/associated-types/issue-71113.rs b/tests/ui/associated-types/issue-71113.rs
index 48de89127..48de89127 100644
--- a/src/test/ui/associated-types/issue-71113.rs
+++ b/tests/ui/associated-types/issue-71113.rs
diff --git a/src/test/ui/associated-types/issue-72806.rs b/tests/ui/associated-types/issue-72806.rs
index 947582503..947582503 100644
--- a/src/test/ui/associated-types/issue-72806.rs
+++ b/tests/ui/associated-types/issue-72806.rs
diff --git a/src/test/ui/associated-types/issue-72806.stderr b/tests/ui/associated-types/issue-72806.stderr
index e95943f34..e95943f34 100644
--- a/src/test/ui/associated-types/issue-72806.stderr
+++ b/tests/ui/associated-types/issue-72806.stderr
diff --git a/src/test/ui/associated-types/issue-76179.rs b/tests/ui/associated-types/issue-76179.rs
index 0e086968b..0e086968b 100644
--- a/src/test/ui/associated-types/issue-76179.rs
+++ b/tests/ui/associated-types/issue-76179.rs
diff --git a/src/test/ui/associated-types/issue-82079.rs b/tests/ui/associated-types/issue-82079.rs
index 8b3bad707..8b3bad707 100644
--- a/src/test/ui/associated-types/issue-82079.rs
+++ b/tests/ui/associated-types/issue-82079.rs
diff --git a/src/test/ui/associated-types/issue-85103.rs b/tests/ui/associated-types/issue-85103.rs
index 9c6a419e9..9c6a419e9 100644
--- a/src/test/ui/associated-types/issue-85103.rs
+++ b/tests/ui/associated-types/issue-85103.rs
diff --git a/src/test/ui/associated-types/issue-85103.stderr b/tests/ui/associated-types/issue-85103.stderr
index 17f714807..17f714807 100644
--- a/src/test/ui/associated-types/issue-85103.stderr
+++ b/tests/ui/associated-types/issue-85103.stderr
diff --git a/src/test/ui/associated-types/issue-87261.rs b/tests/ui/associated-types/issue-87261.rs
index e8548d402..e8548d402 100644
--- a/src/test/ui/associated-types/issue-87261.rs
+++ b/tests/ui/associated-types/issue-87261.rs
diff --git a/src/test/ui/associated-types/issue-87261.stderr b/tests/ui/associated-types/issue-87261.stderr
index 2cce6b947..2cce6b947 100644
--- a/src/test/ui/associated-types/issue-87261.stderr
+++ b/tests/ui/associated-types/issue-87261.stderr
diff --git a/src/test/ui/associated-types/issue-88856.rs b/tests/ui/associated-types/issue-88856.rs
index 7cae7c71c..7cae7c71c 100644
--- a/src/test/ui/associated-types/issue-88856.rs
+++ b/tests/ui/associated-types/issue-88856.rs
diff --git a/src/test/ui/associated-types/issue-91069.rs b/tests/ui/associated-types/issue-91069.rs
index 109c2eed2..109c2eed2 100644
--- a/src/test/ui/associated-types/issue-91069.rs
+++ b/tests/ui/associated-types/issue-91069.rs
diff --git a/src/test/ui/associated-types/issue-91231.rs b/tests/ui/associated-types/issue-91231.rs
index 3c1cb81f0..3c1cb81f0 100644
--- a/src/test/ui/associated-types/issue-91231.rs
+++ b/tests/ui/associated-types/issue-91231.rs
diff --git a/src/test/ui/associated-types/issue-91234.rs b/tests/ui/associated-types/issue-91234.rs
index 2f6c2d3ae..2f6c2d3ae 100644
--- a/src/test/ui/associated-types/issue-91234.rs
+++ b/tests/ui/associated-types/issue-91234.rs
diff --git a/src/test/ui/associated-types/missing-associated-types.rs b/tests/ui/associated-types/missing-associated-types.rs
index 3c8410e39..3c8410e39 100644
--- a/src/test/ui/associated-types/missing-associated-types.rs
+++ b/tests/ui/associated-types/missing-associated-types.rs
diff --git a/src/test/ui/associated-types/missing-associated-types.stderr b/tests/ui/associated-types/missing-associated-types.stderr
index f617df984..f617df984 100644
--- a/src/test/ui/associated-types/missing-associated-types.stderr
+++ b/tests/ui/associated-types/missing-associated-types.stderr
diff --git a/src/test/ui/associated-types/normalization-debruijn-1.rs b/tests/ui/associated-types/normalization-debruijn-1.rs
index a5abf1ba9..a5abf1ba9 100644
--- a/src/test/ui/associated-types/normalization-debruijn-1.rs
+++ b/tests/ui/associated-types/normalization-debruijn-1.rs
diff --git a/src/test/ui/associated-types/normalization-debruijn-2.rs b/tests/ui/associated-types/normalization-debruijn-2.rs
index abe248e16..abe248e16 100644
--- a/src/test/ui/associated-types/normalization-debruijn-2.rs
+++ b/tests/ui/associated-types/normalization-debruijn-2.rs
diff --git a/src/test/ui/associated-types/normalization-debruijn-3.rs b/tests/ui/associated-types/normalization-debruijn-3.rs
index 2bea78cf7..2bea78cf7 100644
--- a/src/test/ui/associated-types/normalization-debruijn-3.rs
+++ b/tests/ui/associated-types/normalization-debruijn-3.rs
diff --git a/src/test/ui/associated-types/normalization-generality-2.rs b/tests/ui/associated-types/normalization-generality-2.rs
index d8790bb2d..d8790bb2d 100644
--- a/src/test/ui/associated-types/normalization-generality-2.rs
+++ b/tests/ui/associated-types/normalization-generality-2.rs
diff --git a/src/test/ui/associated-types/normalization-generality.rs b/tests/ui/associated-types/normalization-generality.rs
index f8e3f5b58..f8e3f5b58 100644
--- a/src/test/ui/associated-types/normalization-generality.rs
+++ b/tests/ui/associated-types/normalization-generality.rs
diff --git a/src/test/ui/associated-types/normalization-probe-cycle.rs b/tests/ui/associated-types/normalization-probe-cycle.rs
index 9c1a488e9..9c1a488e9 100644
--- a/src/test/ui/associated-types/normalization-probe-cycle.rs
+++ b/tests/ui/associated-types/normalization-probe-cycle.rs
diff --git a/src/test/ui/associated-types/normalize-cycle-in-eval-no-region.rs b/tests/ui/associated-types/normalize-cycle-in-eval-no-region.rs
index 0fd2c7079..0fd2c7079 100644
--- a/src/test/ui/associated-types/normalize-cycle-in-eval-no-region.rs
+++ b/tests/ui/associated-types/normalize-cycle-in-eval-no-region.rs
diff --git a/src/test/ui/associated-types/normalize-cycle-in-eval.rs b/tests/ui/associated-types/normalize-cycle-in-eval.rs
index dff4c9051..dff4c9051 100644
--- a/src/test/ui/associated-types/normalize-cycle-in-eval.rs
+++ b/tests/ui/associated-types/normalize-cycle-in-eval.rs
diff --git a/src/test/ui/associated-types/object-method-numbering.rs b/tests/ui/associated-types/object-method-numbering.rs
index bf80a80f4..bf80a80f4 100644
--- a/src/test/ui/associated-types/object-method-numbering.rs
+++ b/tests/ui/associated-types/object-method-numbering.rs
diff --git a/src/test/ui/associated-types/object-normalization.rs b/tests/ui/associated-types/object-normalization.rs
index 1f93248e1..1f93248e1 100644
--- a/src/test/ui/associated-types/object-normalization.rs
+++ b/tests/ui/associated-types/object-normalization.rs
diff --git a/src/test/ui/associated-types/param-env-normalize-cycle.rs b/tests/ui/associated-types/param-env-normalize-cycle.rs
index 12db595ed..12db595ed 100644
--- a/src/test/ui/associated-types/param-env-normalize-cycle.rs
+++ b/tests/ui/associated-types/param-env-normalize-cycle.rs
diff --git a/src/test/ui/associated-types/point-at-type-on-obligation-failure-2.rs b/tests/ui/associated-types/point-at-type-on-obligation-failure-2.rs
index 4b3d6e9d6..4b3d6e9d6 100644
--- a/src/test/ui/associated-types/point-at-type-on-obligation-failure-2.rs
+++ b/tests/ui/associated-types/point-at-type-on-obligation-failure-2.rs
diff --git a/src/test/ui/associated-types/point-at-type-on-obligation-failure-2.stderr b/tests/ui/associated-types/point-at-type-on-obligation-failure-2.stderr
index 2e7a1dd2a..2e7a1dd2a 100644
--- a/src/test/ui/associated-types/point-at-type-on-obligation-failure-2.stderr
+++ b/tests/ui/associated-types/point-at-type-on-obligation-failure-2.stderr
diff --git a/src/test/ui/associated-types/point-at-type-on-obligation-failure.rs b/tests/ui/associated-types/point-at-type-on-obligation-failure.rs
index 666660068..666660068 100644
--- a/src/test/ui/associated-types/point-at-type-on-obligation-failure.rs
+++ b/tests/ui/associated-types/point-at-type-on-obligation-failure.rs
diff --git a/src/test/ui/associated-types/point-at-type-on-obligation-failure.stderr b/tests/ui/associated-types/point-at-type-on-obligation-failure.stderr
index 9afbe82c3..9afbe82c3 100644
--- a/src/test/ui/associated-types/point-at-type-on-obligation-failure.stderr
+++ b/tests/ui/associated-types/point-at-type-on-obligation-failure.stderr
diff --git a/src/test/ui/associated-types/project-defer-unification.rs b/tests/ui/associated-types/project-defer-unification.rs
index 547ff45c2..547ff45c2 100644
--- a/src/test/ui/associated-types/project-defer-unification.rs
+++ b/tests/ui/associated-types/project-defer-unification.rs
diff --git a/src/test/ui/associated-types/project-recursion-limit-non-fatal.rs b/tests/ui/associated-types/project-recursion-limit-non-fatal.rs
index 3e68b1401..3e68b1401 100644
--- a/src/test/ui/associated-types/project-recursion-limit-non-fatal.rs
+++ b/tests/ui/associated-types/project-recursion-limit-non-fatal.rs
diff --git a/src/test/ui/associated-types/substs-ppaux.normal.stderr b/tests/ui/associated-types/substs-ppaux.normal.stderr
index 3f180cf4f..acdc3be8c 100644
--- a/src/test/ui/associated-types/substs-ppaux.normal.stderr
+++ b/tests/ui/associated-types/substs-ppaux.normal.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/substs-ppaux.rs:16:17
    |
 LL |     fn bar<'a, T>() where T: 'a {}
-   |     --------------------------- fn() {<i8 as Foo<'static, 'static, u8>>::bar::<'static, char>} defined here
+   |     --------------------------- associated function `bar` defined here
 ...
 LL |     let x: () = <i8 as Foo<'static, 'static,  u8>>::bar::<'static, char>;
    |            --   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found fn item
@@ -20,7 +20,7 @@ error[E0308]: mismatched types
   --> $DIR/substs-ppaux.rs:25:17
    |
 LL |     fn bar<'a, T>() where T: 'a {}
-   |     --------------------------- fn() {<i8 as Foo<'static, 'static>>::bar::<'static, char>} defined here
+   |     --------------------------- associated function `bar` defined here
 ...
 LL |     let x: () = <i8 as Foo<'static, 'static,  u32>>::bar::<'static, char>;
    |            --   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found fn item
@@ -38,7 +38,7 @@ error[E0308]: mismatched types
   --> $DIR/substs-ppaux.rs:33:17
    |
 LL |     fn baz() {}
-   |     -------- fn() {<i8 as Foo<'static, 'static, u8>>::baz} defined here
+   |     -------- associated function `baz` defined here
 ...
 LL |     let x: () = <i8 as Foo<'static, 'static,  u8>>::baz;
    |            --   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found fn item
@@ -56,7 +56,7 @@ error[E0308]: mismatched types
   --> $DIR/substs-ppaux.rs:41:17
    |
 LL | fn foo<'z>() where &'z (): Sized {
-   | -------------------------------- fn() {foo::<'static>} defined here
+   | -------------------------------- function `foo` defined here
 ...
 LL |     let x: () = foo::<'static>;
    |            --   ^^^^^^^^^^^^^^ expected `()`, found fn item
@@ -81,7 +81,9 @@ note: required for `str` to implement `Foo<'_, '_, u8>`
   --> $DIR/substs-ppaux.rs:11:17
    |
 LL | impl<'a,'b,T,S> Foo<'a, 'b, S> for T {}
-   |                 ^^^^^^^^^^^^^^     ^
+   |            -    ^^^^^^^^^^^^^^     ^
+   |            |
+   |            unsatisfied trait bound introduced here
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/associated-types/substs-ppaux.rs b/tests/ui/associated-types/substs-ppaux.rs
index 66cd94d7a..66cd94d7a 100644
--- a/src/test/ui/associated-types/substs-ppaux.rs
+++ b/tests/ui/associated-types/substs-ppaux.rs
diff --git a/src/test/ui/associated-types/substs-ppaux.verbose.stderr b/tests/ui/associated-types/substs-ppaux.verbose.stderr
index 16dd29de2..e4f6ba573 100644
--- a/src/test/ui/associated-types/substs-ppaux.verbose.stderr
+++ b/tests/ui/associated-types/substs-ppaux.verbose.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/substs-ppaux.rs:16:17
    |
 LL |     fn bar<'a, T>() where T: 'a {}
-   |     --------------------------- fn() {<i8 as Foo<ReStatic, ReStatic, u8>>::bar::<ReStatic, char>} defined here
+   |     --------------------------- associated function `bar` defined here
 ...
 LL |     let x: () = <i8 as Foo<'static, 'static,  u8>>::bar::<'static, char>;
    |            --   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found fn item
@@ -20,7 +20,7 @@ error[E0308]: mismatched types
   --> $DIR/substs-ppaux.rs:25:17
    |
 LL |     fn bar<'a, T>() where T: 'a {}
-   |     --------------------------- fn() {<i8 as Foo<ReStatic, ReStatic>>::bar::<ReStatic, char>} defined here
+   |     --------------------------- associated function `bar` defined here
 ...
 LL |     let x: () = <i8 as Foo<'static, 'static,  u32>>::bar::<'static, char>;
    |            --   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found fn item
@@ -38,7 +38,7 @@ error[E0308]: mismatched types
   --> $DIR/substs-ppaux.rs:33:17
    |
 LL |     fn baz() {}
-   |     -------- fn() {<i8 as Foo<ReStatic, ReStatic, u8>>::baz} defined here
+   |     -------- associated function `baz` defined here
 ...
 LL |     let x: () = <i8 as Foo<'static, 'static,  u8>>::baz;
    |            --   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found fn item
@@ -56,7 +56,7 @@ error[E0308]: mismatched types
   --> $DIR/substs-ppaux.rs:41:17
    |
 LL | fn foo<'z>() where &'z (): Sized {
-   | -------------------------------- fn() {foo::<ReStatic>} defined here
+   | -------------------------------- function `foo` defined here
 ...
 LL |     let x: () = foo::<'static>;
    |            --   ^^^^^^^^^^^^^^ expected `()`, found fn item
@@ -81,7 +81,9 @@ note: required for `str` to implement `Foo<'_#0r, '_#1r, u8>`
   --> $DIR/substs-ppaux.rs:11:17
    |
 LL | impl<'a,'b,T,S> Foo<'a, 'b, S> for T {}
-   |                 ^^^^^^^^^^^^^^     ^
+   |            -    ^^^^^^^^^^^^^^     ^
+   |            |
+   |            unsatisfied trait bound introduced here
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/associated-types/trait-with-supertraits-needing-sized-self.rs b/tests/ui/associated-types/trait-with-supertraits-needing-sized-self.rs
index 0474bf0a3..0474bf0a3 100644
--- a/src/test/ui/associated-types/trait-with-supertraits-needing-sized-self.rs
+++ b/tests/ui/associated-types/trait-with-supertraits-needing-sized-self.rs
diff --git a/src/test/ui/associated-types/trait-with-supertraits-needing-sized-self.stderr b/tests/ui/associated-types/trait-with-supertraits-needing-sized-self.stderr
index 0edc9a556..8e7cf86c4 100644
--- a/src/test/ui/associated-types/trait-with-supertraits-needing-sized-self.stderr
+++ b/tests/ui/associated-types/trait-with-supertraits-needing-sized-self.stderr
@@ -6,9 +6,6 @@ LL | trait ArithmeticOps: Add<Output=Self> + Sub<Output=Self> + Mul<Output=Self>
    |
 note: required by a bound in `Add`
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Add<Rhs = Self> {
-   |               ^^^^^^^^^^ required by this bound in `Add`
 help: consider further restricting `Self`
    |
 LL | trait ArithmeticOps: Add<Output=Self> + Sub<Output=Self> + Mul<Output=Self> + Div<Output=Self> + Sized {}
diff --git a/src/test/ui/associated-types/wf-cycle-2.rs b/tests/ui/associated-types/wf-cycle-2.rs
index d7467ac22..d7467ac22 100644
--- a/src/test/ui/associated-types/wf-cycle-2.rs
+++ b/tests/ui/associated-types/wf-cycle-2.rs
diff --git a/src/test/ui/associated-types/wf-cycle.rs b/tests/ui/associated-types/wf-cycle.rs
index cf6508551..cf6508551 100644
--- a/src/test/ui/associated-types/wf-cycle.rs
+++ b/tests/ui/associated-types/wf-cycle.rs
diff --git a/src/test/ui/async-await/argument-patterns.rs b/tests/ui/async-await/argument-patterns.rs
index b9fc1a88c..b9fc1a88c 100644
--- a/src/test/ui/async-await/argument-patterns.rs
+++ b/tests/ui/async-await/argument-patterns.rs
diff --git a/src/test/ui/async-await/async-assoc-fn-anon-lifetimes.rs b/tests/ui/async-await/async-assoc-fn-anon-lifetimes.rs
index 8e08b82b9..8e08b82b9 100644
--- a/src/test/ui/async-await/async-assoc-fn-anon-lifetimes.rs
+++ b/tests/ui/async-await/async-assoc-fn-anon-lifetimes.rs
diff --git a/src/test/ui/async-await/async-await-let-else.drop-tracking.stderr b/tests/ui/async-await/async-await-let-else.drop-tracking.stderr
index 3be7f370d..fb83ca90a 100644
--- a/src/test/ui/async-await/async-await-let-else.drop-tracking.stderr
+++ b/tests/ui/async-await/async-await-let-else.drop-tracking.stderr
@@ -68,14 +68,10 @@ note: future is not `Send` as this value is used across an await
   --> $DIR/async-await-let-else.rs:33:28
    |
 LL |         (Rc::new(()), bar().await);
-   |          -----------       ^^^^^^ await occurs here, with `Rc::new(())` maybe used later
-   |          |
+   |          -----------       ^^^^^^ - `Rc::new(())` is later dropped here
+   |          |                 |
+   |          |                 await occurs here, with `Rc::new(())` maybe used later
    |          has type `Rc<()>` which is not `Send`
-note: `Rc::new(())` is later dropped here
-  --> $DIR/async-await-let-else.rs:33:35
-   |
-LL |         (Rc::new(()), bar().await);
-   |                                   ^
 note: required by a bound in `is_send`
   --> $DIR/async-await-let-else.rs:19:15
    |
diff --git a/src/test/ui/async-await/async-await-let-else.no-drop-tracking.stderr b/tests/ui/async-await/async-await-let-else.no-drop-tracking.stderr
index 7f93563e2..d3c5e80a3 100644
--- a/src/test/ui/async-await/async-await-let-else.no-drop-tracking.stderr
+++ b/tests/ui/async-await/async-await-let-else.no-drop-tracking.stderr
@@ -53,14 +53,10 @@ note: future is not `Send` as this value is used across an await
   --> $DIR/async-await-let-else.rs:33:28
    |
 LL |         (Rc::new(()), bar().await);
-   |          -----------       ^^^^^^ await occurs here, with `Rc::new(())` maybe used later
-   |          |
+   |          -----------       ^^^^^^ - `Rc::new(())` is later dropped here
+   |          |                 |
+   |          |                 await occurs here, with `Rc::new(())` maybe used later
    |          has type `Rc<()>` which is not `Send`
-note: `Rc::new(())` is later dropped here
-  --> $DIR/async-await-let-else.rs:33:35
-   |
-LL |         (Rc::new(()), bar().await);
-   |                                   ^
 note: required by a bound in `is_send`
   --> $DIR/async-await-let-else.rs:19:15
    |
diff --git a/src/test/ui/async-await/async-await-let-else.rs b/tests/ui/async-await/async-await-let-else.rs
index 3fb2142b9..3fb2142b9 100644
--- a/src/test/ui/async-await/async-await-let-else.rs
+++ b/tests/ui/async-await/async-await-let-else.rs
diff --git a/src/test/ui/async-await/async-await.rs b/tests/ui/async-await/async-await.rs
index 9cabf16f8..9cabf16f8 100644
--- a/src/test/ui/async-await/async-await.rs
+++ b/tests/ui/async-await/async-await.rs
diff --git a/src/test/ui/async-await/async-block-control-flow-static-semantics.rs b/tests/ui/async-await/async-block-control-flow-static-semantics.rs
index bc9d12793..bc9d12793 100644
--- a/src/test/ui/async-await/async-block-control-flow-static-semantics.rs
+++ b/tests/ui/async-await/async-block-control-flow-static-semantics.rs
diff --git a/src/test/ui/async-await/async-block-control-flow-static-semantics.stderr b/tests/ui/async-await/async-block-control-flow-static-semantics.stderr
index c4487eb84..c4487eb84 100644
--- a/src/test/ui/async-await/async-block-control-flow-static-semantics.stderr
+++ b/tests/ui/async-await/async-block-control-flow-static-semantics.stderr
diff --git a/src/test/ui/async-await/async-borrowck-escaping-block-error.fixed b/tests/ui/async-await/async-borrowck-escaping-block-error.fixed
index 605cfdfe7..605cfdfe7 100644
--- a/src/test/ui/async-await/async-borrowck-escaping-block-error.fixed
+++ b/tests/ui/async-await/async-borrowck-escaping-block-error.fixed
diff --git a/src/test/ui/async-await/async-borrowck-escaping-block-error.rs b/tests/ui/async-await/async-borrowck-escaping-block-error.rs
index ec752c15f..ec752c15f 100644
--- a/src/test/ui/async-await/async-borrowck-escaping-block-error.rs
+++ b/tests/ui/async-await/async-borrowck-escaping-block-error.rs
diff --git a/src/test/ui/async-await/async-borrowck-escaping-block-error.stderr b/tests/ui/async-await/async-borrowck-escaping-block-error.stderr
index 190c59e32..190c59e32 100644
--- a/src/test/ui/async-await/async-borrowck-escaping-block-error.stderr
+++ b/tests/ui/async-await/async-borrowck-escaping-block-error.stderr
diff --git a/src/test/ui/async-await/async-borrowck-escaping-closure-error.rs b/tests/ui/async-await/async-borrowck-escaping-closure-error.rs
index e667b72ae..e667b72ae 100644
--- a/src/test/ui/async-await/async-borrowck-escaping-closure-error.rs
+++ b/tests/ui/async-await/async-borrowck-escaping-closure-error.rs
diff --git a/src/test/ui/async-await/async-borrowck-escaping-closure-error.stderr b/tests/ui/async-await/async-borrowck-escaping-closure-error.stderr
index 10691aad0..10691aad0 100644
--- a/src/test/ui/async-await/async-borrowck-escaping-closure-error.stderr
+++ b/tests/ui/async-await/async-borrowck-escaping-closure-error.stderr
diff --git a/src/test/ui/async-await/async-closure-matches-expr.rs b/tests/ui/async-await/async-closure-matches-expr.rs
index d82fbcdc5..d82fbcdc5 100644
--- a/src/test/ui/async-await/async-closure-matches-expr.rs
+++ b/tests/ui/async-await/async-closure-matches-expr.rs
diff --git a/src/test/ui/async-await/async-closure.rs b/tests/ui/async-await/async-closure.rs
index 12d66b19e..12d66b19e 100644
--- a/src/test/ui/async-await/async-closure.rs
+++ b/tests/ui/async-await/async-closure.rs
diff --git a/src/test/ui/async-await/async-error-span.rs b/tests/ui/async-await/async-error-span.rs
index 86d459bf0..86d459bf0 100644
--- a/src/test/ui/async-await/async-error-span.rs
+++ b/tests/ui/async-await/async-error-span.rs
diff --git a/src/test/ui/async-await/async-error-span.stderr b/tests/ui/async-await/async-error-span.stderr
index 7d4447b6d..7d4447b6d 100644
--- a/src/test/ui/async-await/async-error-span.stderr
+++ b/tests/ui/async-await/async-error-span.stderr
diff --git a/src/test/ui/async-await/async-fn-elided-impl-lifetime-parameter.rs b/tests/ui/async-await/async-fn-elided-impl-lifetime-parameter.rs
index 1c369fd74..1c369fd74 100644
--- a/src/test/ui/async-await/async-fn-elided-impl-lifetime-parameter.rs
+++ b/tests/ui/async-await/async-fn-elided-impl-lifetime-parameter.rs
diff --git a/src/test/ui/async-await/async-fn-nonsend.rs b/tests/ui/async-await/async-fn-nonsend.rs
index d7f8d7ac5..d7f8d7ac5 100644
--- a/src/test/ui/async-await/async-fn-nonsend.rs
+++ b/tests/ui/async-await/async-fn-nonsend.rs
diff --git a/src/test/ui/async-await/async-fn-nonsend.stderr b/tests/ui/async-await/async-fn-nonsend.stderr
index a7b872fe4..a7b872fe4 100644
--- a/src/test/ui/async-await/async-fn-nonsend.stderr
+++ b/tests/ui/async-await/async-fn-nonsend.stderr
diff --git a/src/test/ui/async-await/async-fn-path-elision.rs b/tests/ui/async-await/async-fn-path-elision.rs
index 3f1f51c20..3f1f51c20 100644
--- a/src/test/ui/async-await/async-fn-path-elision.rs
+++ b/tests/ui/async-await/async-fn-path-elision.rs
diff --git a/src/test/ui/async-await/async-fn-path-elision.stderr b/tests/ui/async-await/async-fn-path-elision.stderr
index 5e0c8c299..5e0c8c299 100644
--- a/src/test/ui/async-await/async-fn-path-elision.stderr
+++ b/tests/ui/async-await/async-fn-path-elision.stderr
diff --git a/src/test/ui/async-await/async-fn-send-uses-nonsend.rs b/tests/ui/async-await/async-fn-send-uses-nonsend.rs
index 35d9cb155..35d9cb155 100644
--- a/src/test/ui/async-await/async-fn-send-uses-nonsend.rs
+++ b/tests/ui/async-await/async-fn-send-uses-nonsend.rs
diff --git a/src/test/ui/async-await/async-fn-size-moved-locals.rs b/tests/ui/async-await/async-fn-size-moved-locals.rs
index 79b7239f3..79b7239f3 100644
--- a/src/test/ui/async-await/async-fn-size-moved-locals.rs
+++ b/tests/ui/async-await/async-fn-size-moved-locals.rs
diff --git a/src/test/ui/async-await/async-fn-size-uninit-locals.rs b/tests/ui/async-await/async-fn-size-uninit-locals.rs
index 546172693..546172693 100644
--- a/src/test/ui/async-await/async-fn-size-uninit-locals.rs
+++ b/tests/ui/async-await/async-fn-size-uninit-locals.rs
diff --git a/src/test/ui/async-await/async-fn-size.rs b/tests/ui/async-await/async-fn-size.rs
index 0c1f36364..0c1f36364 100644
--- a/src/test/ui/async-await/async-fn-size.rs
+++ b/tests/ui/async-await/async-fn-size.rs
diff --git a/tests/ui/async-await/async-is-unwindsafe.rs b/tests/ui/async-await/async-is-unwindsafe.rs
new file mode 100644
index 000000000..56ed28472
--- /dev/null
+++ b/tests/ui/async-await/async-is-unwindsafe.rs
@@ -0,0 +1,30 @@
+// edition:2018
+
+fn is_unwindsafe(_: impl std::panic::UnwindSafe) {}
+
+fn main() {
+    // A normal future created by an async block takes a `&mut Context<'_>` argument.
+    // That should not leak through to the whole async block.
+    is_unwindsafe(async {
+        async {}.await; // this needs an inner await point
+    });
+
+    is_unwindsafe(async {
+        //~^ ERROR the type `&mut Context<'_>` may not be safely transferred across an unwind boundary
+        use std::ptr::null;
+        use std::task::{Context, RawWaker, RawWakerVTable, Waker};
+        let waker = unsafe {
+            Waker::from_raw(RawWaker::new(
+                null(),
+                &RawWakerVTable::new(|_| todo!(), |_| todo!(), |_| todo!(), |_| todo!()),
+            ))
+        };
+        let mut cx = Context::from_waker(&waker);
+        let cx_ref = &mut cx;
+
+        async {}.await; // this needs an inner await point
+
+        // in this case, `&mut Context<'_>` is *truly* alive across an await point
+        drop(cx_ref);
+    });
+}
diff --git a/tests/ui/async-await/async-is-unwindsafe.stderr b/tests/ui/async-await/async-is-unwindsafe.stderr
new file mode 100644
index 000000000..d6404b30e
--- /dev/null
+++ b/tests/ui/async-await/async-is-unwindsafe.stderr
@@ -0,0 +1,38 @@
+error[E0277]: the type `&mut Context<'_>` may not be safely transferred across an unwind boundary
+  --> $DIR/async-is-unwindsafe.rs:12:19
+   |
+LL |       is_unwindsafe(async {
+   |  ___________________^
+LL | |
+LL | |         use std::ptr::null;
+LL | |         use std::task::{Context, RawWaker, RawWakerVTable, Waker};
+...  |
+LL | |         drop(cx_ref);
+LL | |     });
+   | |     ^
+   | |     |
+   | |_____`&mut Context<'_>` may not be safely transferred across an unwind boundary
+   |       within this `[async block@$DIR/async-is-unwindsafe.rs:12:19: 29:6]`
+   |
+   = help: within `[async block@$DIR/async-is-unwindsafe.rs:12:19: 29:6]`, the trait `UnwindSafe` is not implemented for `&mut Context<'_>`
+   = note: `UnwindSafe` is implemented for `&std::task::Context<'_>`, but not for `&mut std::task::Context<'_>`
+note: future does not implement `UnwindSafe` as this value is used across an await
+  --> $DIR/async-is-unwindsafe.rs:25:17
+   |
+LL |         let cx_ref = &mut cx;
+   |             ------ has type `&mut Context<'_>` which does not implement `UnwindSafe`
+LL |
+LL |         async {}.await; // this needs an inner await point
+   |                 ^^^^^^ await occurs here, with `cx_ref` maybe used later
+...
+LL |     });
+   |     - `cx_ref` is later dropped here
+note: required by a bound in `is_unwindsafe`
+  --> $DIR/async-is-unwindsafe.rs:3:26
+   |
+LL | fn is_unwindsafe(_: impl std::panic::UnwindSafe) {}
+   |                          ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `is_unwindsafe`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/async-await/async-matches-expr.rs b/tests/ui/async-await/async-matches-expr.rs
index 299faa058..299faa058 100644
--- a/src/test/ui/async-await/async-matches-expr.rs
+++ b/tests/ui/async-await/async-matches-expr.rs
diff --git a/src/test/ui/async-await/async-trait-fn.rs b/tests/ui/async-await/async-trait-fn.rs
index e2062e827..e2062e827 100644
--- a/src/test/ui/async-await/async-trait-fn.rs
+++ b/tests/ui/async-await/async-trait-fn.rs
diff --git a/src/test/ui/async-await/async-trait-fn.stderr b/tests/ui/async-await/async-trait-fn.stderr
index afbe25cf7..afbe25cf7 100644
--- a/src/test/ui/async-await/async-trait-fn.stderr
+++ b/tests/ui/async-await/async-trait-fn.stderr
diff --git a/src/test/ui/async-await/async-unsafe-fn-call-in-safe.mir.stderr b/tests/ui/async-await/async-unsafe-fn-call-in-safe.mir.stderr
index 2114fb59b..2114fb59b 100644
--- a/src/test/ui/async-await/async-unsafe-fn-call-in-safe.mir.stderr
+++ b/tests/ui/async-await/async-unsafe-fn-call-in-safe.mir.stderr
diff --git a/src/test/ui/async-await/async-unsafe-fn-call-in-safe.rs b/tests/ui/async-await/async-unsafe-fn-call-in-safe.rs
index c941dc27a..c941dc27a 100644
--- a/src/test/ui/async-await/async-unsafe-fn-call-in-safe.rs
+++ b/tests/ui/async-await/async-unsafe-fn-call-in-safe.rs
diff --git a/src/test/ui/async-await/async-unsafe-fn-call-in-safe.thir.stderr b/tests/ui/async-await/async-unsafe-fn-call-in-safe.thir.stderr
index 68d97d3fd..68d97d3fd 100644
--- a/src/test/ui/async-await/async-unsafe-fn-call-in-safe.thir.stderr
+++ b/tests/ui/async-await/async-unsafe-fn-call-in-safe.thir.stderr
diff --git a/src/test/ui/async-await/async-with-closure.rs b/tests/ui/async-await/async-with-closure.rs
index 0b2255266..0b2255266 100644
--- a/src/test/ui/async-await/async-with-closure.rs
+++ b/tests/ui/async-await/async-with-closure.rs
diff --git a/src/test/ui/async-await/auxiliary/arc_wake.rs b/tests/ui/async-await/auxiliary/arc_wake.rs
index c21886f26..c21886f26 100644
--- a/src/test/ui/async-await/auxiliary/arc_wake.rs
+++ b/tests/ui/async-await/auxiliary/arc_wake.rs
diff --git a/src/test/ui/async-await/auxiliary/issue-107036.rs b/tests/ui/async-await/auxiliary/issue-107036.rs
index c3f6141b2..c3f6141b2 100644
--- a/src/test/ui/async-await/auxiliary/issue-107036.rs
+++ b/tests/ui/async-await/auxiliary/issue-107036.rs
diff --git a/src/test/ui/async-await/auxiliary/issue-72470-lib.rs b/tests/ui/async-await/auxiliary/issue-72470-lib.rs
index 8383eba89..8383eba89 100644
--- a/src/test/ui/async-await/auxiliary/issue-72470-lib.rs
+++ b/tests/ui/async-await/auxiliary/issue-72470-lib.rs
diff --git a/src/test/ui/async-await/await-into-future.rs b/tests/ui/async-await/await-into-future.rs
index 8bf1385b3..8bf1385b3 100644
--- a/src/test/ui/async-await/await-into-future.rs
+++ b/tests/ui/async-await/await-into-future.rs
diff --git a/src/test/ui/async-await/await-keyword/2015-edition-error-various-positions.rs b/tests/ui/async-await/await-keyword/2015-edition-error-various-positions.rs
index 50c163999..50c163999 100644
--- a/src/test/ui/async-await/await-keyword/2015-edition-error-various-positions.rs
+++ b/tests/ui/async-await/await-keyword/2015-edition-error-various-positions.rs
diff --git a/src/test/ui/async-await/await-keyword/2015-edition-error-various-positions.stderr b/tests/ui/async-await/await-keyword/2015-edition-error-various-positions.stderr
index d99967eb2..d99967eb2 100644
--- a/src/test/ui/async-await/await-keyword/2015-edition-error-various-positions.stderr
+++ b/tests/ui/async-await/await-keyword/2015-edition-error-various-positions.stderr
diff --git a/src/test/ui/async-await/await-keyword/2015-edition-warning.fixed b/tests/ui/async-await/await-keyword/2015-edition-warning.fixed
index 117495e13..117495e13 100644
--- a/src/test/ui/async-await/await-keyword/2015-edition-warning.fixed
+++ b/tests/ui/async-await/await-keyword/2015-edition-warning.fixed
diff --git a/src/test/ui/async-await/await-keyword/2015-edition-warning.rs b/tests/ui/async-await/await-keyword/2015-edition-warning.rs
index b3c64895c..b3c64895c 100644
--- a/src/test/ui/async-await/await-keyword/2015-edition-warning.rs
+++ b/tests/ui/async-await/await-keyword/2015-edition-warning.rs
diff --git a/src/test/ui/async-await/await-keyword/2015-edition-warning.stderr b/tests/ui/async-await/await-keyword/2015-edition-warning.stderr
index bf5c4d8d6..bf5c4d8d6 100644
--- a/src/test/ui/async-await/await-keyword/2015-edition-warning.stderr
+++ b/tests/ui/async-await/await-keyword/2015-edition-warning.stderr
diff --git a/src/test/ui/async-await/await-keyword/2018-edition-error-in-non-macro-position.rs b/tests/ui/async-await/await-keyword/2018-edition-error-in-non-macro-position.rs
index 9e78f7c51..9e78f7c51 100644
--- a/src/test/ui/async-await/await-keyword/2018-edition-error-in-non-macro-position.rs
+++ b/tests/ui/async-await/await-keyword/2018-edition-error-in-non-macro-position.rs
diff --git a/src/test/ui/async-await/await-keyword/2018-edition-error-in-non-macro-position.stderr b/tests/ui/async-await/await-keyword/2018-edition-error-in-non-macro-position.stderr
index 6bd8f671d..6bd8f671d 100644
--- a/src/test/ui/async-await/await-keyword/2018-edition-error-in-non-macro-position.stderr
+++ b/tests/ui/async-await/await-keyword/2018-edition-error-in-non-macro-position.stderr
diff --git a/src/test/ui/async-await/await-keyword/2018-edition-error.rs b/tests/ui/async-await/await-keyword/2018-edition-error.rs
index 7ce52259a..7ce52259a 100644
--- a/src/test/ui/async-await/await-keyword/2018-edition-error.rs
+++ b/tests/ui/async-await/await-keyword/2018-edition-error.rs
diff --git a/src/test/ui/async-await/await-keyword/2018-edition-error.stderr b/tests/ui/async-await/await-keyword/2018-edition-error.stderr
index 34bfdfc71..34bfdfc71 100644
--- a/src/test/ui/async-await/await-keyword/2018-edition-error.stderr
+++ b/tests/ui/async-await/await-keyword/2018-edition-error.stderr
diff --git a/src/test/ui/async-await/await-keyword/incorrect-syntax-suggestions.rs b/tests/ui/async-await/await-keyword/incorrect-syntax-suggestions.rs
index 554ac673d..554ac673d 100644
--- a/src/test/ui/async-await/await-keyword/incorrect-syntax-suggestions.rs
+++ b/tests/ui/async-await/await-keyword/incorrect-syntax-suggestions.rs
diff --git a/src/test/ui/async-await/await-keyword/incorrect-syntax-suggestions.stderr b/tests/ui/async-await/await-keyword/incorrect-syntax-suggestions.stderr
index b30f28837..b30f28837 100644
--- a/src/test/ui/async-await/await-keyword/incorrect-syntax-suggestions.stderr
+++ b/tests/ui/async-await/await-keyword/incorrect-syntax-suggestions.stderr
diff --git a/src/test/ui/async-await/await-keyword/post_expansion_error.rs b/tests/ui/async-await/await-keyword/post_expansion_error.rs
index b4c899b0d..b4c899b0d 100644
--- a/src/test/ui/async-await/await-keyword/post_expansion_error.rs
+++ b/tests/ui/async-await/await-keyword/post_expansion_error.rs
diff --git a/src/test/ui/async-await/await-keyword/post_expansion_error.stderr b/tests/ui/async-await/await-keyword/post_expansion_error.stderr
index 0996c38b3..0996c38b3 100644
--- a/src/test/ui/async-await/await-keyword/post_expansion_error.stderr
+++ b/tests/ui/async-await/await-keyword/post_expansion_error.stderr
diff --git a/tests/ui/async-await/await-sequence.rs b/tests/ui/async-await/await-sequence.rs
new file mode 100644
index 000000000..726c4284e
--- /dev/null
+++ b/tests/ui/async-await/await-sequence.rs
@@ -0,0 +1,21 @@
+// edition:2021
+// compile-flags: -Z drop-tracking
+// build-pass
+
+use std::collections::HashMap;
+
+fn main() {
+    let _ = real_main();
+}
+
+async fn nop() {}
+
+async fn real_main() {
+    nop().await;
+    nop().await;
+    nop().await;
+    nop().await;
+
+    let mut map: HashMap<(), ()> = HashMap::new();
+    map.insert((), nop().await);
+}
diff --git a/src/test/ui/async-await/await-unsize.rs b/tests/ui/async-await/await-unsize.rs
index aa09d4bdf..aa09d4bdf 100644
--- a/src/test/ui/async-await/await-unsize.rs
+++ b/tests/ui/async-await/await-unsize.rs
diff --git a/src/test/ui/async-await/bound-normalization.rs b/tests/ui/async-await/bound-normalization.rs
index 5d260682f..5d260682f 100644
--- a/src/test/ui/async-await/bound-normalization.rs
+++ b/tests/ui/async-await/bound-normalization.rs
diff --git a/src/test/ui/async-await/conditional-and-guaranteed-initialization.rs b/tests/ui/async-await/conditional-and-guaranteed-initialization.rs
index 56f4cbbd1..56f4cbbd1 100644
--- a/src/test/ui/async-await/conditional-and-guaranteed-initialization.rs
+++ b/tests/ui/async-await/conditional-and-guaranteed-initialization.rs
diff --git a/src/test/ui/async-await/default-struct-update.rs b/tests/ui/async-await/default-struct-update.rs
index 64fb6280d..64fb6280d 100644
--- a/src/test/ui/async-await/default-struct-update.rs
+++ b/tests/ui/async-await/default-struct-update.rs
diff --git a/src/test/ui/async-await/dont-print-desugared-async.rs b/tests/ui/async-await/dont-print-desugared-async.rs
index 68341a24c..68341a24c 100644
--- a/src/test/ui/async-await/dont-print-desugared-async.rs
+++ b/tests/ui/async-await/dont-print-desugared-async.rs
diff --git a/src/test/ui/async-await/dont-print-desugared-async.stderr b/tests/ui/async-await/dont-print-desugared-async.stderr
index d80467c7f..d80467c7f 100644
--- a/src/test/ui/async-await/dont-print-desugared-async.stderr
+++ b/tests/ui/async-await/dont-print-desugared-async.stderr
diff --git a/tests/ui/async-await/dont-suggest-await-on-method-return-mismatch.rs b/tests/ui/async-await/dont-suggest-await-on-method-return-mismatch.rs
new file mode 100644
index 000000000..f2f87a908
--- /dev/null
+++ b/tests/ui/async-await/dont-suggest-await-on-method-return-mismatch.rs
@@ -0,0 +1,24 @@
+// edition:2021
+
+// Test that we do not suggest `.await` when it doesn't make sense.
+
+struct A;
+
+impl A {
+    fn test(&self) -> i32 {
+        1
+    }
+}
+
+async fn foo() -> A {
+    A
+}
+
+async fn async_main() {
+    let x: u32 = foo().test();
+    //~^ ERROR no method named `test` found for opaque type `impl Future<Output = A>` in the current scope
+}
+
+fn main() {
+    let _ = async_main();
+}
diff --git a/tests/ui/async-await/dont-suggest-await-on-method-return-mismatch.stderr b/tests/ui/async-await/dont-suggest-await-on-method-return-mismatch.stderr
new file mode 100644
index 000000000..e65d9d0e5
--- /dev/null
+++ b/tests/ui/async-await/dont-suggest-await-on-method-return-mismatch.stderr
@@ -0,0 +1,9 @@
+error[E0599]: no method named `test` found for opaque type `impl Future<Output = A>` in the current scope
+  --> $DIR/dont-suggest-await-on-method-return-mismatch.rs:18:24
+   |
+LL |     let x: u32 = foo().test();
+   |                        ^^^^ method not found in `impl Future<Output = A>`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/async-await/dont-suggest-missing-await.rs b/tests/ui/async-await/dont-suggest-missing-await.rs
index a8e5b38ec..a8e5b38ec 100644
--- a/src/test/ui/async-await/dont-suggest-missing-await.rs
+++ b/tests/ui/async-await/dont-suggest-missing-await.rs
diff --git a/src/test/ui/async-await/dont-suggest-missing-await.stderr b/tests/ui/async-await/dont-suggest-missing-await.stderr
index 627bf05bb..627bf05bb 100644
--- a/src/test/ui/async-await/dont-suggest-missing-await.stderr
+++ b/tests/ui/async-await/dont-suggest-missing-await.stderr
diff --git a/src/test/ui/async-await/drop-and-assign.rs b/tests/ui/async-await/drop-and-assign.rs
index fa3f33036..fa3f33036 100644
--- a/src/test/ui/async-await/drop-and-assign.rs
+++ b/tests/ui/async-await/drop-and-assign.rs
diff --git a/src/test/ui/async-await/drop-order/auxiliary/arc_wake.rs b/tests/ui/async-await/drop-order/auxiliary/arc_wake.rs
index c21886f26..c21886f26 100644
--- a/src/test/ui/async-await/drop-order/auxiliary/arc_wake.rs
+++ b/tests/ui/async-await/drop-order/auxiliary/arc_wake.rs
diff --git a/src/test/ui/async-await/drop-order/drop-order-for-async-fn-parameters-by-ref-binding.rs b/tests/ui/async-await/drop-order/drop-order-for-async-fn-parameters-by-ref-binding.rs
index 9817d377a..9817d377a 100644
--- a/src/test/ui/async-await/drop-order/drop-order-for-async-fn-parameters-by-ref-binding.rs
+++ b/tests/ui/async-await/drop-order/drop-order-for-async-fn-parameters-by-ref-binding.rs
diff --git a/src/test/ui/async-await/drop-order/drop-order-for-async-fn-parameters.rs b/tests/ui/async-await/drop-order/drop-order-for-async-fn-parameters.rs
index 6c10ead36..6c10ead36 100644
--- a/src/test/ui/async-await/drop-order/drop-order-for-async-fn-parameters.rs
+++ b/tests/ui/async-await/drop-order/drop-order-for-async-fn-parameters.rs
diff --git a/src/test/ui/async-await/drop-order/drop-order-for-locals-when-cancelled.rs b/tests/ui/async-await/drop-order/drop-order-for-locals-when-cancelled.rs
index 15cc9fbc8..15cc9fbc8 100644
--- a/src/test/ui/async-await/drop-order/drop-order-for-locals-when-cancelled.rs
+++ b/tests/ui/async-await/drop-order/drop-order-for-locals-when-cancelled.rs
diff --git a/src/test/ui/async-await/drop-order/drop-order-for-temporary-in-tail-return-expr.rs b/tests/ui/async-await/drop-order/drop-order-for-temporary-in-tail-return-expr.rs
index edfecb910..edfecb910 100644
--- a/src/test/ui/async-await/drop-order/drop-order-for-temporary-in-tail-return-expr.rs
+++ b/tests/ui/async-await/drop-order/drop-order-for-temporary-in-tail-return-expr.rs
diff --git a/src/test/ui/async-await/drop-order/drop-order-locals-are-hidden.rs b/tests/ui/async-await/drop-order/drop-order-locals-are-hidden.rs
index 79dedb1ba..79dedb1ba 100644
--- a/src/test/ui/async-await/drop-order/drop-order-locals-are-hidden.rs
+++ b/tests/ui/async-await/drop-order/drop-order-locals-are-hidden.rs
diff --git a/src/test/ui/async-await/drop-order/drop-order-locals-are-hidden.stderr b/tests/ui/async-await/drop-order/drop-order-locals-are-hidden.stderr
index aa04a613f..aa04a613f 100644
--- a/src/test/ui/async-await/drop-order/drop-order-locals-are-hidden.stderr
+++ b/tests/ui/async-await/drop-order/drop-order-locals-are-hidden.stderr
diff --git a/src/test/ui/async-await/drop-order/drop-order-when-cancelled.rs b/tests/ui/async-await/drop-order/drop-order-when-cancelled.rs
index cfd68bc0d..cfd68bc0d 100644
--- a/src/test/ui/async-await/drop-order/drop-order-when-cancelled.rs
+++ b/tests/ui/async-await/drop-order/drop-order-when-cancelled.rs
diff --git a/src/test/ui/async-await/drop-track-bad-field-in-fru.rs b/tests/ui/async-await/drop-track-bad-field-in-fru.rs
index 28ad77675..28ad77675 100644
--- a/src/test/ui/async-await/drop-track-bad-field-in-fru.rs
+++ b/tests/ui/async-await/drop-track-bad-field-in-fru.rs
diff --git a/src/test/ui/async-await/drop-track-bad-field-in-fru.stderr b/tests/ui/async-await/drop-track-bad-field-in-fru.stderr
index 819b64ad7..819b64ad7 100644
--- a/src/test/ui/async-await/drop-track-bad-field-in-fru.stderr
+++ b/tests/ui/async-await/drop-track-bad-field-in-fru.stderr
diff --git a/src/test/ui/async-await/drop-track-field-assign-nonsend.rs b/tests/ui/async-await/drop-track-field-assign-nonsend.rs
index b6c0fda15..b6c0fda15 100644
--- a/src/test/ui/async-await/drop-track-field-assign-nonsend.rs
+++ b/tests/ui/async-await/drop-track-field-assign-nonsend.rs
diff --git a/src/test/ui/async-await/drop-track-field-assign-nonsend.stderr b/tests/ui/async-await/drop-track-field-assign-nonsend.stderr
index d95483c81..d95483c81 100644
--- a/src/test/ui/async-await/drop-track-field-assign-nonsend.stderr
+++ b/tests/ui/async-await/drop-track-field-assign-nonsend.stderr
diff --git a/src/test/ui/async-await/drop-track-field-assign.rs b/tests/ui/async-await/drop-track-field-assign.rs
index 3a393cd16..3a393cd16 100644
--- a/src/test/ui/async-await/drop-track-field-assign.rs
+++ b/tests/ui/async-await/drop-track-field-assign.rs
diff --git a/src/test/ui/async-await/drop-tracking-unresolved-typeck-results.rs b/tests/ui/async-await/drop-tracking-unresolved-typeck-results.rs
index 7f7294295..7f7294295 100644
--- a/src/test/ui/async-await/drop-tracking-unresolved-typeck-results.rs
+++ b/tests/ui/async-await/drop-tracking-unresolved-typeck-results.rs
diff --git a/src/test/ui/async-await/drop-tracking-unresolved-typeck-results.stderr b/tests/ui/async-await/drop-tracking-unresolved-typeck-results.stderr
index aa9a22e9e..aa9a22e9e 100644
--- a/src/test/ui/async-await/drop-tracking-unresolved-typeck-results.stderr
+++ b/tests/ui/async-await/drop-tracking-unresolved-typeck-results.stderr
diff --git a/src/test/ui/async-await/edition-deny-async-fns-2015.rs b/tests/ui/async-await/edition-deny-async-fns-2015.rs
index 6bd6d879a..6bd6d879a 100644
--- a/src/test/ui/async-await/edition-deny-async-fns-2015.rs
+++ b/tests/ui/async-await/edition-deny-async-fns-2015.rs
diff --git a/src/test/ui/async-await/edition-deny-async-fns-2015.stderr b/tests/ui/async-await/edition-deny-async-fns-2015.stderr
index ba918eb28..ba918eb28 100644
--- a/src/test/ui/async-await/edition-deny-async-fns-2015.stderr
+++ b/tests/ui/async-await/edition-deny-async-fns-2015.stderr
diff --git a/src/test/ui/async-await/expansion-in-attrs.rs b/tests/ui/async-await/expansion-in-attrs.rs
index af77c3463..af77c3463 100644
--- a/src/test/ui/async-await/expansion-in-attrs.rs
+++ b/tests/ui/async-await/expansion-in-attrs.rs
diff --git a/src/test/ui/async-await/feature-async-closure.rs b/tests/ui/async-await/feature-async-closure.rs
index d07116b13..d07116b13 100644
--- a/src/test/ui/async-await/feature-async-closure.rs
+++ b/tests/ui/async-await/feature-async-closure.rs
diff --git a/src/test/ui/async-await/feature-async-closure.stderr b/tests/ui/async-await/feature-async-closure.stderr
index 485a838b6..485a838b6 100644
--- a/src/test/ui/async-await/feature-async-closure.stderr
+++ b/tests/ui/async-await/feature-async-closure.stderr
diff --git a/src/test/ui/async-await/feature-gate-async_fn_in_trait.rs b/tests/ui/async-await/feature-gate-async_fn_in_trait.rs
index 792f378cb..792f378cb 100644
--- a/src/test/ui/async-await/feature-gate-async_fn_in_trait.rs
+++ b/tests/ui/async-await/feature-gate-async_fn_in_trait.rs
diff --git a/src/test/ui/async-await/feature-gate-async_fn_in_trait.stderr b/tests/ui/async-await/feature-gate-async_fn_in_trait.stderr
index 2a5fbd1ec..2a5fbd1ec 100644
--- a/src/test/ui/async-await/feature-gate-async_fn_in_trait.stderr
+++ b/tests/ui/async-await/feature-gate-async_fn_in_trait.stderr
diff --git a/src/test/ui/async-await/feature-self-return-type.rs b/tests/ui/async-await/feature-self-return-type.rs
index 41f887430..41f887430 100644
--- a/src/test/ui/async-await/feature-self-return-type.rs
+++ b/tests/ui/async-await/feature-self-return-type.rs
diff --git a/src/test/ui/async-await/feature-self-return-type.stderr b/tests/ui/async-await/feature-self-return-type.stderr
index 892468368..892468368 100644
--- a/src/test/ui/async-await/feature-self-return-type.stderr
+++ b/tests/ui/async-await/feature-self-return-type.stderr
diff --git a/src/test/ui/async-await/futures-api.rs b/tests/ui/async-await/futures-api.rs
index a7da058de..a7da058de 100644
--- a/src/test/ui/async-await/futures-api.rs
+++ b/tests/ui/async-await/futures-api.rs
diff --git a/src/test/ui/async-await/generator-desc.rs b/tests/ui/async-await/generator-desc.rs
index 500812016..500812016 100644
--- a/src/test/ui/async-await/generator-desc.rs
+++ b/tests/ui/async-await/generator-desc.rs
diff --git a/src/test/ui/async-await/generator-desc.stderr b/tests/ui/async-await/generator-desc.stderr
index 1686153ac..963c6ba57 100644
--- a/src/test/ui/async-await/generator-desc.stderr
+++ b/tests/ui/async-await/generator-desc.stderr
@@ -12,9 +12,6 @@ LL |     fun(async {}, async {});
               found `async` block `[async block@$DIR/generator-desc.rs:10:19: 10:27]`
 note: function defined here
   --> $SRC_DIR/core/src/future/mod.rs:LL:COL
-   |
-LL | pub const fn identity_future<O, Fut: Future<Output = O>>(f: Fut) -> Fut {
-   |              ^^^^^^^^^^^^^^^
 
 error[E0308]: mismatched types
   --> $DIR/generator-desc.rs:12:16
diff --git a/src/test/ui/async-await/generator-not-future.rs b/tests/ui/async-await/generator-not-future.rs
index 37d7cfa6f..37d7cfa6f 100644
--- a/src/test/ui/async-await/generator-not-future.rs
+++ b/tests/ui/async-await/generator-not-future.rs
diff --git a/src/test/ui/async-await/generator-not-future.stderr b/tests/ui/async-await/generator-not-future.stderr
index 1b81b461f..1b81b461f 100644
--- a/src/test/ui/async-await/generator-not-future.stderr
+++ b/tests/ui/async-await/generator-not-future.stderr
diff --git a/src/test/ui/async-await/generics-and-bounds.rs b/tests/ui/async-await/generics-and-bounds.rs
index 963b19b34..963b19b34 100644
--- a/src/test/ui/async-await/generics-and-bounds.rs
+++ b/tests/ui/async-await/generics-and-bounds.rs
diff --git a/src/test/ui/async-await/in-trait/async-associated-types.rs b/tests/ui/async-await/in-trait/async-associated-types.rs
index 974f5aaff..974f5aaff 100644
--- a/src/test/ui/async-await/in-trait/async-associated-types.rs
+++ b/tests/ui/async-await/in-trait/async-associated-types.rs
diff --git a/src/test/ui/async-await/in-trait/async-associated-types2.rs b/tests/ui/async-await/in-trait/async-associated-types2.rs
index e546a0579..e546a0579 100644
--- a/src/test/ui/async-await/in-trait/async-associated-types2.rs
+++ b/tests/ui/async-await/in-trait/async-associated-types2.rs
diff --git a/src/test/ui/async-await/in-trait/async-example-desugared-boxed-in-trait.rs b/tests/ui/async-await/in-trait/async-example-desugared-boxed-in-trait.rs
index 38ba29718..38ba29718 100644
--- a/src/test/ui/async-await/in-trait/async-example-desugared-boxed-in-trait.rs
+++ b/tests/ui/async-await/in-trait/async-example-desugared-boxed-in-trait.rs
diff --git a/src/test/ui/async-await/in-trait/async-example-desugared-boxed-in-trait.stderr b/tests/ui/async-await/in-trait/async-example-desugared-boxed-in-trait.stderr
index 22d2928f2..13e722255 100644
--- a/src/test/ui/async-await/in-trait/async-example-desugared-boxed-in-trait.stderr
+++ b/tests/ui/async-await/in-trait/async-example-desugared-boxed-in-trait.stderr
@@ -9,8 +9,8 @@ note: type in trait
    |
 LL |     fn foo(&self) -> Pin<Box<dyn Future<Output = i32> + '_>>;
    |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   = note: expected fn pointer `fn(&i32) -> Pin<Box<dyn Future<Output = i32>>>`
-              found fn pointer `fn(&i32) -> impl Future<Output = i32>`
+   = note: expected signature `fn(&i32) -> Pin<Box<dyn Future<Output = i32>>>`
+              found signature `fn(&i32) -> impl Future<Output = i32>`
 
 error: aborting due to previous error
 
diff --git a/tests/ui/async-await/in-trait/async-example-desugared-boxed.rs b/tests/ui/async-await/in-trait/async-example-desugared-boxed.rs
new file mode 100644
index 000000000..1b1b3cffd
--- /dev/null
+++ b/tests/ui/async-await/in-trait/async-example-desugared-boxed.rs
@@ -0,0 +1,21 @@
+// edition: 2021
+
+#![feature(async_fn_in_trait)]
+#![feature(return_position_impl_trait_in_trait)]
+#![allow(incomplete_features)]
+
+use std::future::Future;
+use std::pin::Pin;
+
+trait MyTrait {
+    async fn foo(&self) -> i32;
+}
+
+impl MyTrait for i32 {
+    fn foo(&self) -> Pin<Box<dyn Future<Output = i32> + '_>> {
+        //~^ ERROR method `foo` should be async
+        Box::pin(async { *self })
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/async-await/in-trait/async-example-desugared-boxed.stderr b/tests/ui/async-await/in-trait/async-example-desugared-boxed.stderr
new file mode 100644
index 000000000..60fa534a6
--- /dev/null
+++ b/tests/ui/async-await/in-trait/async-example-desugared-boxed.stderr
@@ -0,0 +1,11 @@
+error: method `foo` should be async because the method from the trait is async
+  --> $DIR/async-example-desugared-boxed.rs:15:5
+   |
+LL |     async fn foo(&self) -> i32;
+   |     --------------------------- required because the trait method is async
+...
+LL |     fn foo(&self) -> Pin<Box<dyn Future<Output = i32> + '_>> {
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/tests/ui/async-await/in-trait/async-example-desugared-extra.rs b/tests/ui/async-await/in-trait/async-example-desugared-extra.rs
new file mode 100644
index 000000000..81e1e59a3
--- /dev/null
+++ b/tests/ui/async-await/in-trait/async-example-desugared-extra.rs
@@ -0,0 +1,37 @@
+// check-pass
+// edition: 2021
+
+#![feature(async_fn_in_trait)]
+#![feature(return_position_impl_trait_in_trait)]
+#![allow(incomplete_features)]
+
+use std::future::Future;
+use std::pin::Pin;
+use std::task::Poll;
+
+trait MyTrait {
+    async fn foo(&self) -> i32;
+}
+
+#[derive(Clone)]
+struct MyFuture(i32);
+
+impl Future for MyFuture {
+    type Output = i32;
+    fn poll(
+        self: Pin<&mut Self>,
+        _: &mut std::task::Context<'_>,
+    ) -> Poll<<Self as Future>::Output> {
+        Poll::Ready(self.0)
+    }
+}
+
+impl MyTrait for i32 {
+    // FIXME: this should eventually require `#[refine]` to compile, because it also provides
+    // `Clone`.
+    fn foo(&self) -> impl Future<Output = i32> + Clone {
+        MyFuture(*self)
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/async-await/in-trait/async-example-desugared-in-trait.rs b/tests/ui/async-await/in-trait/async-example-desugared-in-trait.rs
index feeda719e..feeda719e 100644
--- a/src/test/ui/async-await/in-trait/async-example-desugared-in-trait.rs
+++ b/tests/ui/async-await/in-trait/async-example-desugared-in-trait.rs
diff --git a/tests/ui/async-await/in-trait/async-example-desugared-manual.rs b/tests/ui/async-await/in-trait/async-example-desugared-manual.rs
new file mode 100644
index 000000000..71473e745
--- /dev/null
+++ b/tests/ui/async-await/in-trait/async-example-desugared-manual.rs
@@ -0,0 +1,29 @@
+// edition: 2021
+
+#![feature(async_fn_in_trait)]
+#![feature(return_position_impl_trait_in_trait)]
+#![allow(incomplete_features)]
+
+use std::future::Future;
+use std::task::Poll;
+
+trait MyTrait {
+    async fn foo(&self) -> i32;
+}
+
+struct MyFuture;
+impl Future for MyFuture {
+    type Output = i32;
+    fn poll(self: std::pin::Pin<&mut Self>, _: &mut std::task::Context<'_>) -> Poll<Self::Output> {
+        Poll::Ready(0)
+    }
+}
+
+impl MyTrait for u32 {
+    fn foo(&self) -> MyFuture {
+        //~^ ERROR method `foo` should be async
+        MyFuture
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/async-await/in-trait/async-example-desugared-manual.stderr b/tests/ui/async-await/in-trait/async-example-desugared-manual.stderr
new file mode 100644
index 000000000..567a36a86
--- /dev/null
+++ b/tests/ui/async-await/in-trait/async-example-desugared-manual.stderr
@@ -0,0 +1,11 @@
+error: method `foo` should be async because the method from the trait is async
+  --> $DIR/async-example-desugared-manual.rs:23:5
+   |
+LL |     async fn foo(&self) -> i32;
+   |     --------------------------- required because the trait method is async
+...
+LL |     fn foo(&self) -> MyFuture {
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/tests/ui/async-await/in-trait/async-example-desugared.rs b/tests/ui/async-await/in-trait/async-example-desugared.rs
new file mode 100644
index 000000000..fb92ec786
--- /dev/null
+++ b/tests/ui/async-await/in-trait/async-example-desugared.rs
@@ -0,0 +1,20 @@
+// check-pass
+// edition: 2021
+
+#![feature(async_fn_in_trait)]
+#![feature(return_position_impl_trait_in_trait)]
+#![allow(incomplete_features)]
+
+use std::future::Future;
+
+trait MyTrait {
+    async fn foo(&self) -> i32;
+}
+
+impl MyTrait for i32 {
+    fn foo(&self) -> impl Future<Output = i32> + '_ {
+        async { *self }
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/async-await/in-trait/async-example.rs b/tests/ui/async-await/in-trait/async-example.rs
index abf94ef74..abf94ef74 100644
--- a/src/test/ui/async-await/in-trait/async-example.rs
+++ b/tests/ui/async-await/in-trait/async-example.rs
diff --git a/src/test/ui/async-await/in-trait/async-generics-and-bounds.rs b/tests/ui/async-await/in-trait/async-generics-and-bounds.rs
index a73d55adf..a73d55adf 100644
--- a/src/test/ui/async-await/in-trait/async-generics-and-bounds.rs
+++ b/tests/ui/async-await/in-trait/async-generics-and-bounds.rs
diff --git a/src/test/ui/async-await/in-trait/async-generics-and-bounds.stderr b/tests/ui/async-await/in-trait/async-generics-and-bounds.stderr
index f1f0d7e59..f1f0d7e59 100644
--- a/src/test/ui/async-await/in-trait/async-generics-and-bounds.stderr
+++ b/tests/ui/async-await/in-trait/async-generics-and-bounds.stderr
diff --git a/src/test/ui/async-await/in-trait/async-generics.rs b/tests/ui/async-await/in-trait/async-generics.rs
index 67000e577..67000e577 100644
--- a/src/test/ui/async-await/in-trait/async-generics.rs
+++ b/tests/ui/async-await/in-trait/async-generics.rs
diff --git a/src/test/ui/async-await/in-trait/async-generics.stderr b/tests/ui/async-await/in-trait/async-generics.stderr
index 2f0556456..2f0556456 100644
--- a/src/test/ui/async-await/in-trait/async-generics.stderr
+++ b/tests/ui/async-await/in-trait/async-generics.stderr
diff --git a/src/test/ui/async-await/in-trait/async-lifetimes-and-bounds.rs b/tests/ui/async-await/in-trait/async-lifetimes-and-bounds.rs
index d5481d277..d5481d277 100644
--- a/src/test/ui/async-await/in-trait/async-lifetimes-and-bounds.rs
+++ b/tests/ui/async-await/in-trait/async-lifetimes-and-bounds.rs
diff --git a/src/test/ui/async-await/in-trait/async-lifetimes.rs b/tests/ui/async-await/in-trait/async-lifetimes.rs
index f298e45d2..f298e45d2 100644
--- a/src/test/ui/async-await/in-trait/async-lifetimes.rs
+++ b/tests/ui/async-await/in-trait/async-lifetimes.rs
diff --git a/src/test/ui/async-await/in-trait/async-recursive-generic.rs b/tests/ui/async-await/in-trait/async-recursive-generic.rs
index 6839abd38..6839abd38 100644
--- a/src/test/ui/async-await/in-trait/async-recursive-generic.rs
+++ b/tests/ui/async-await/in-trait/async-recursive-generic.rs
diff --git a/src/test/ui/async-await/in-trait/async-recursive-generic.stderr b/tests/ui/async-await/in-trait/async-recursive-generic.stderr
index cab173bdd..cab173bdd 100644
--- a/src/test/ui/async-await/in-trait/async-recursive-generic.stderr
+++ b/tests/ui/async-await/in-trait/async-recursive-generic.stderr
diff --git a/src/test/ui/async-await/in-trait/async-recursive.rs b/tests/ui/async-await/in-trait/async-recursive.rs
index 61119f809..61119f809 100644
--- a/src/test/ui/async-await/in-trait/async-recursive.rs
+++ b/tests/ui/async-await/in-trait/async-recursive.rs
diff --git a/src/test/ui/async-await/in-trait/async-recursive.stderr b/tests/ui/async-await/in-trait/async-recursive.stderr
index 9feff37b3..9feff37b3 100644
--- a/src/test/ui/async-await/in-trait/async-recursive.stderr
+++ b/tests/ui/async-await/in-trait/async-recursive.stderr
diff --git a/tests/ui/async-await/in-trait/bad-signatures.rs b/tests/ui/async-await/in-trait/bad-signatures.rs
new file mode 100644
index 000000000..b86f1d1c1
--- /dev/null
+++ b/tests/ui/async-await/in-trait/bad-signatures.rs
@@ -0,0 +1,16 @@
+// edition:2021
+
+#![feature(async_fn_in_trait)]
+//~^ WARN the feature `async_fn_in_trait` is incomplete
+
+trait MyTrait {
+    async fn bar(&abc self);
+    //~^ ERROR expected identifier, found keyword `self`
+    //~| ERROR expected one of `:`, `@`, or `|`, found keyword `self`
+}
+
+impl MyTrait for () {
+    async fn bar(&self) {}
+}
+
+fn main() {}
diff --git a/tests/ui/async-await/in-trait/bad-signatures.stderr b/tests/ui/async-await/in-trait/bad-signatures.stderr
new file mode 100644
index 000000000..e0ba7b53e
--- /dev/null
+++ b/tests/ui/async-await/in-trait/bad-signatures.stderr
@@ -0,0 +1,26 @@
+error: expected identifier, found keyword `self`
+  --> $DIR/bad-signatures.rs:7:23
+   |
+LL |     async fn bar(&abc self);
+   |                       ^^^^ expected identifier, found keyword
+
+error: expected one of `:`, `@`, or `|`, found keyword `self`
+  --> $DIR/bad-signatures.rs:7:23
+   |
+LL |     async fn bar(&abc self);
+   |                  -----^^^^
+   |                  |    |
+   |                  |    expected one of `:`, `@`, or `|`
+   |                  help: declare the type after the parameter binding: `<identifier>: <type>`
+
+warning: the feature `async_fn_in_trait` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/bad-signatures.rs:3:12
+   |
+LL | #![feature(async_fn_in_trait)]
+   |            ^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+error: aborting due to 2 previous errors; 1 warning emitted
+
diff --git a/src/test/ui/async-await/in-trait/early-bound-1.rs b/tests/ui/async-await/in-trait/early-bound-1.rs
index 6b3b14201..6b3b14201 100644
--- a/src/test/ui/async-await/in-trait/early-bound-1.rs
+++ b/tests/ui/async-await/in-trait/early-bound-1.rs
diff --git a/src/test/ui/async-await/in-trait/early-bound-2.rs b/tests/ui/async-await/in-trait/early-bound-2.rs
index 270443229..270443229 100644
--- a/src/test/ui/async-await/in-trait/early-bound-2.rs
+++ b/tests/ui/async-await/in-trait/early-bound-2.rs
diff --git a/src/test/ui/async-await/in-trait/fn-not-async-err.rs b/tests/ui/async-await/in-trait/fn-not-async-err.rs
index f94d32145..9598d53bc 100644
--- a/src/test/ui/async-await/in-trait/fn-not-async-err.rs
+++ b/tests/ui/async-await/in-trait/fn-not-async-err.rs
@@ -9,7 +9,7 @@ trait MyTrait {
 
 impl MyTrait for i32 {
     fn foo(&self) -> i32 {
-        //~^ ERROR: `i32` is not a future [E0277]
+        //~^ ERROR: method `foo` should be async
         *self
     }
 }
diff --git a/tests/ui/async-await/in-trait/fn-not-async-err.stderr b/tests/ui/async-await/in-trait/fn-not-async-err.stderr
new file mode 100644
index 000000000..579801d0f
--- /dev/null
+++ b/tests/ui/async-await/in-trait/fn-not-async-err.stderr
@@ -0,0 +1,11 @@
+error: method `foo` should be async because the method from the trait is async
+  --> $DIR/fn-not-async-err.rs:11:5
+   |
+LL |     async fn foo(&self) -> i32;
+   |     --------------------------- required because the trait method is async
+...
+LL |     fn foo(&self) -> i32 {
+   |     ^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/async-await/in-trait/fn-not-async-err2.rs b/tests/ui/async-await/in-trait/fn-not-async-err2.rs
index 594baa91a..2c4ed5535 100644
--- a/src/test/ui/async-await/in-trait/fn-not-async-err2.rs
+++ b/tests/ui/async-await/in-trait/fn-not-async-err2.rs
@@ -12,9 +12,7 @@ trait MyTrait {
 impl MyTrait for i32 {
     fn foo(&self) -> impl Future<Output = i32> {
         //~^ ERROR `impl Trait` only allowed in function and inherent method return types, not in `impl` method return [E0562]
-        async {
-            *self
-        }
+        async { *self }
     }
 }
 
diff --git a/src/test/ui/async-await/in-trait/fn-not-async-err2.stderr b/tests/ui/async-await/in-trait/fn-not-async-err2.stderr
index f591f1847..f591f1847 100644
--- a/src/test/ui/async-await/in-trait/fn-not-async-err2.stderr
+++ b/tests/ui/async-await/in-trait/fn-not-async-err2.stderr
diff --git a/src/test/ui/async-await/in-trait/implied-bounds.rs b/tests/ui/async-await/in-trait/implied-bounds.rs
index 52bceb3cc..52bceb3cc 100644
--- a/src/test/ui/async-await/in-trait/implied-bounds.rs
+++ b/tests/ui/async-await/in-trait/implied-bounds.rs
diff --git a/src/test/ui/async-await/in-trait/issue-102138.rs b/tests/ui/async-await/in-trait/issue-102138.rs
index f61b34ed9..f61b34ed9 100644
--- a/src/test/ui/async-await/in-trait/issue-102138.rs
+++ b/tests/ui/async-await/in-trait/issue-102138.rs
diff --git a/src/test/ui/async-await/in-trait/issue-102219.rs b/tests/ui/async-await/in-trait/issue-102219.rs
index 9a35f6515..9a35f6515 100644
--- a/src/test/ui/async-await/in-trait/issue-102219.rs
+++ b/tests/ui/async-await/in-trait/issue-102219.rs
diff --git a/src/test/ui/async-await/in-trait/issue-102310.rs b/tests/ui/async-await/in-trait/issue-102310.rs
index 49c3e9fee..49c3e9fee 100644
--- a/src/test/ui/async-await/in-trait/issue-102310.rs
+++ b/tests/ui/async-await/in-trait/issue-102310.rs
diff --git a/tests/ui/async-await/in-trait/issue-104678.rs b/tests/ui/async-await/in-trait/issue-104678.rs
new file mode 100644
index 000000000..e396df4e5
--- /dev/null
+++ b/tests/ui/async-await/in-trait/issue-104678.rs
@@ -0,0 +1,31 @@
+// edition:2021
+// check-pass
+
+#![feature(async_fn_in_trait)]
+#![allow(incomplete_features)]
+
+use std::future::Future;
+pub trait Pool {
+    type Conn;
+
+    async fn async_callback<'a, F: FnOnce(&'a Self::Conn) -> Fut, Fut: Future<Output = ()>>(
+        &'a self,
+        callback: F,
+    ) -> ();
+}
+
+pub struct PoolImpl;
+pub struct ConnImpl;
+
+impl Pool for PoolImpl {
+    type Conn = ConnImpl;
+
+    async fn async_callback<'a, F: FnOnce(&'a Self::Conn) -> Fut, Fut: Future<Output = ()>>(
+        &'a self,
+        _callback: F,
+    ) -> () {
+        todo!()
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/async-await/in-trait/lifetime-mismatch.rs b/tests/ui/async-await/in-trait/lifetime-mismatch.rs
index 45ede193c..45ede193c 100644
--- a/src/test/ui/async-await/in-trait/lifetime-mismatch.rs
+++ b/tests/ui/async-await/in-trait/lifetime-mismatch.rs
diff --git a/src/test/ui/async-await/in-trait/lifetime-mismatch.stderr b/tests/ui/async-await/in-trait/lifetime-mismatch.stderr
index d87adcc78..d87adcc78 100644
--- a/src/test/ui/async-await/in-trait/lifetime-mismatch.stderr
+++ b/tests/ui/async-await/in-trait/lifetime-mismatch.stderr
diff --git a/tests/ui/async-await/in-trait/missing-send-bound.rs b/tests/ui/async-await/in-trait/missing-send-bound.rs
new file mode 100644
index 000000000..78922b59b
--- /dev/null
+++ b/tests/ui/async-await/in-trait/missing-send-bound.rs
@@ -0,0 +1,21 @@
+// edition:2021
+
+#![feature(async_fn_in_trait)]
+//~^ WARN the feature `async_fn_in_trait` is incomplete and may not be safe to use and/or cause compiler crashes
+
+trait Foo {
+    async fn bar();
+}
+
+async fn test<T: Foo>() {
+    T::bar().await;
+}
+
+fn test2<T: Foo>() {
+    assert_is_send(test::<T>());
+    //~^ ERROR future cannot be sent between threads safely
+}
+
+fn assert_is_send(_: impl Send) {}
+
+fn main() {}
diff --git a/tests/ui/async-await/in-trait/missing-send-bound.stderr b/tests/ui/async-await/in-trait/missing-send-bound.stderr
new file mode 100644
index 000000000..5cedf3ddb
--- /dev/null
+++ b/tests/ui/async-await/in-trait/missing-send-bound.stderr
@@ -0,0 +1,29 @@
+warning: the feature `async_fn_in_trait` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/missing-send-bound.rs:3:12
+   |
+LL | #![feature(async_fn_in_trait)]
+   |            ^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+error: future cannot be sent between threads safely
+  --> $DIR/missing-send-bound.rs:15:20
+   |
+LL |     assert_is_send(test::<T>());
+   |                    ^^^^^^^^^^^ future returned by `test` is not `Send`
+   |
+   = help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `impl Future<Output = ()>`
+note: future is not `Send` as it awaits another future which is not `Send`
+  --> $DIR/missing-send-bound.rs:11:5
+   |
+LL |     T::bar().await;
+   |     ^^^^^^^^ await occurs here on type `impl Future<Output = ()>`, which is not `Send`
+note: required by a bound in `assert_is_send`
+  --> $DIR/missing-send-bound.rs:19:27
+   |
+LL | fn assert_is_send(_: impl Send) {}
+   |                           ^^^^ required by this bound in `assert_is_send`
+
+error: aborting due to previous error; 1 warning emitted
+
diff --git a/src/test/ui/async-await/in-trait/nested-rpit.rs b/tests/ui/async-await/in-trait/nested-rpit.rs
index 41d72ebb4..41d72ebb4 100644
--- a/src/test/ui/async-await/in-trait/nested-rpit.rs
+++ b/tests/ui/async-await/in-trait/nested-rpit.rs
diff --git a/src/test/ui/async-await/in-trait/object-safety.rs b/tests/ui/async-await/in-trait/object-safety.rs
index a8bc35f7e..a8bc35f7e 100644
--- a/src/test/ui/async-await/in-trait/object-safety.rs
+++ b/tests/ui/async-await/in-trait/object-safety.rs
diff --git a/src/test/ui/async-await/in-trait/object-safety.stderr b/tests/ui/async-await/in-trait/object-safety.stderr
index 0b318f71f..0b318f71f 100644
--- a/src/test/ui/async-await/in-trait/object-safety.stderr
+++ b/tests/ui/async-await/in-trait/object-safety.stderr
diff --git a/src/test/ui/async-await/in-trait/return-type-suggestion.rs b/tests/ui/async-await/in-trait/return-type-suggestion.rs
index 3446761d1..3446761d1 100644
--- a/src/test/ui/async-await/in-trait/return-type-suggestion.rs
+++ b/tests/ui/async-await/in-trait/return-type-suggestion.rs
diff --git a/src/test/ui/async-await/in-trait/return-type-suggestion.stderr b/tests/ui/async-await/in-trait/return-type-suggestion.stderr
index 5a9b15e54..5a9b15e54 100644
--- a/src/test/ui/async-await/in-trait/return-type-suggestion.stderr
+++ b/tests/ui/async-await/in-trait/return-type-suggestion.stderr
diff --git a/src/test/ui/async-await/incorrect-move-async-order-issue-79694.fixed b/tests/ui/async-await/incorrect-move-async-order-issue-79694.fixed
index 055800d23..055800d23 100644
--- a/src/test/ui/async-await/incorrect-move-async-order-issue-79694.fixed
+++ b/tests/ui/async-await/incorrect-move-async-order-issue-79694.fixed
diff --git a/src/test/ui/async-await/incorrect-move-async-order-issue-79694.rs b/tests/ui/async-await/incorrect-move-async-order-issue-79694.rs
index e8be16516..e8be16516 100644
--- a/src/test/ui/async-await/incorrect-move-async-order-issue-79694.rs
+++ b/tests/ui/async-await/incorrect-move-async-order-issue-79694.rs
diff --git a/src/test/ui/async-await/incorrect-move-async-order-issue-79694.stderr b/tests/ui/async-await/incorrect-move-async-order-issue-79694.stderr
index 5367b986d..5367b986d 100644
--- a/src/test/ui/async-await/incorrect-move-async-order-issue-79694.stderr
+++ b/tests/ui/async-await/incorrect-move-async-order-issue-79694.stderr
diff --git a/src/test/ui/async-await/interior-with-const-generic-expr.rs b/tests/ui/async-await/interior-with-const-generic-expr.rs
index 86ba7582d..86ba7582d 100644
--- a/src/test/ui/async-await/interior-with-const-generic-expr.rs
+++ b/tests/ui/async-await/interior-with-const-generic-expr.rs
diff --git a/src/test/ui/async-await/issue-101715.rs b/tests/ui/async-await/issue-101715.rs
index 1be5d0248..1be5d0248 100644
--- a/src/test/ui/async-await/issue-101715.rs
+++ b/tests/ui/async-await/issue-101715.rs
diff --git a/src/test/ui/async-await/issue-101715.stderr b/tests/ui/async-await/issue-101715.stderr
index a0e8d2a89..a0e8d2a89 100644
--- a/src/test/ui/async-await/issue-101715.stderr
+++ b/tests/ui/async-await/issue-101715.stderr
diff --git a/tests/ui/async-await/issue-105501.rs b/tests/ui/async-await/issue-105501.rs
new file mode 100644
index 000000000..f30d2a9d8
--- /dev/null
+++ b/tests/ui/async-await/issue-105501.rs
@@ -0,0 +1,165 @@
+// check-pass
+// edition:2018
+
+// This is a regression test for https://github.com/rust-lang/rust/issues/105501.
+// It was minified from the published `msf-ice:0.2.1` crate which failed in a crater run.
+// A faulty compiler was triggering a `higher-ranked lifetime error`:
+//
+// > could not prove `[async block@...]: Send`
+
+use mini_futures::Stream;
+
+fn is_send(_: impl Send) {}
+
+pub fn main() {
+    let fut = async {
+        let mut stream = mini_futures::iter([()])
+            .then(|_| async {})
+            .map(|_| async { None })
+            .buffered()
+            .filter_map(std::future::ready);
+
+        stream.next().await
+    };
+
+    is_send(async move {
+        let _: Option<()> = fut.await;
+    });
+}
+
+// this is a simplified subset of `futures::StreamExt` and related types
+mod mini_futures {
+    use std::future::Future;
+    use std::pin::Pin;
+    use std::task::{Context, Poll};
+
+    pub fn iter<I>(_: I) -> Iter<I::IntoIter>
+    where
+        I: IntoIterator,
+    {
+        todo!()
+    }
+
+    pub trait Stream {
+        type Item;
+
+        fn then<Fut, F>(self, _: F) -> Then<Self, Fut, F>
+        where
+            F: FnMut(Self::Item) -> Fut,
+            Fut: Future,
+            Self: Sized,
+        {
+            todo!()
+        }
+
+        fn map<T, F>(self, _: F) -> Map<Self, F>
+        where
+            F: FnMut(Self::Item) -> T,
+            Self: Sized,
+        {
+            todo!()
+        }
+
+        fn buffered(self) -> Buffered<Self>
+        where
+            Self::Item: Future,
+            Self: Sized,
+        {
+            todo!()
+        }
+
+        fn filter_map<Fut, T, F>(self, _: F) -> FilterMap<Self, Fut, F>
+        where
+            F: FnMut(Self::Item) -> Fut,
+            Fut: Future<Output = Option<T>>,
+            Self: Sized,
+        {
+            todo!()
+        }
+
+        fn next(&mut self) -> Next<'_, Self> {
+            todo!()
+        }
+    }
+
+    pub struct Iter<I> {
+        __: I,
+    }
+    impl<I> Stream for Iter<I>
+    where
+        I: Iterator,
+    {
+        type Item = I::Item;
+    }
+
+    pub struct Then<St, Fut, F> {
+        __: (St, Fut, F),
+    }
+    impl<St, Fut, F> Stream for Then<St, Fut, F>
+    where
+        St: Stream,
+        F: FnMut(St::Item) -> Fut,
+        Fut: Future,
+    {
+        type Item = Fut::Output;
+    }
+
+    pub struct Map<St, F> {
+        __: (St, F),
+    }
+    impl<St, F> Stream for Map<St, F>
+    where
+        St: Stream,
+        F: FnMut1<St::Item>,
+    {
+        type Item = F::Output;
+    }
+
+    pub trait FnMut1<A> {
+        type Output;
+    }
+    impl<T, A, R> FnMut1<A> for T
+    where
+        T: FnMut(A) -> R,
+    {
+        type Output = R;
+    }
+
+    pub struct Buffered<St>
+    where
+        St: Stream,
+        St::Item: Future,
+    {
+        __: (St, St::Item),
+    }
+    impl<St> Stream for Buffered<St>
+    where
+        St: Stream,
+        St::Item: Future,
+    {
+        type Item = <St::Item as Future>::Output;
+    }
+
+    pub struct FilterMap<St, Fut, F> {
+        __: (St, Fut, F),
+    }
+    impl<St, Fut, F, T> Stream for FilterMap<St, Fut, F>
+    where
+        St: Stream,
+        F: FnMut1<St::Item, Output = Fut>,
+        Fut: Future<Output = Option<T>>,
+    {
+        type Item = T;
+    }
+
+    pub struct Next<'a, St: ?Sized> {
+        __: &'a mut St,
+    }
+    impl<St: ?Sized + Stream> Future for Next<'_, St> {
+        type Output = Option<St::Item>;
+
+        fn poll(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Self::Output> {
+            todo!()
+        }
+    }
+}
diff --git a/src/test/ui/async-await/issue-107036.rs b/tests/ui/async-await/issue-107036.rs
index 6a22de2c9..6a22de2c9 100644
--- a/src/test/ui/async-await/issue-107036.rs
+++ b/tests/ui/async-await/issue-107036.rs
diff --git a/src/test/ui/async-await/issue-54239-private-type-triggers-lint.rs b/tests/ui/async-await/issue-54239-private-type-triggers-lint.rs
index 16cf7ad52..16cf7ad52 100644
--- a/src/test/ui/async-await/issue-54239-private-type-triggers-lint.rs
+++ b/tests/ui/async-await/issue-54239-private-type-triggers-lint.rs
diff --git a/src/test/ui/async-await/issue-60709.rs b/tests/ui/async-await/issue-60709.rs
index 61f6ed1b7..61f6ed1b7 100644
--- a/src/test/ui/async-await/issue-60709.rs
+++ b/tests/ui/async-await/issue-60709.rs
diff --git a/src/test/ui/async-await/issue-61076.rs b/tests/ui/async-await/issue-61076.rs
index 750fad839..750fad839 100644
--- a/src/test/ui/async-await/issue-61076.rs
+++ b/tests/ui/async-await/issue-61076.rs
diff --git a/src/test/ui/async-await/issue-61076.stderr b/tests/ui/async-await/issue-61076.stderr
index 33839ea59..33839ea59 100644
--- a/src/test/ui/async-await/issue-61076.stderr
+++ b/tests/ui/async-await/issue-61076.stderr
diff --git a/src/test/ui/async-await/issue-61452.rs b/tests/ui/async-await/issue-61452.rs
index 9381251ad..9381251ad 100644
--- a/src/test/ui/async-await/issue-61452.rs
+++ b/tests/ui/async-await/issue-61452.rs
diff --git a/src/test/ui/async-await/issue-61452.stderr b/tests/ui/async-await/issue-61452.stderr
index 2d3bb48e0..bf5044328 100644
--- a/src/test/ui/async-await/issue-61452.stderr
+++ b/tests/ui/async-await/issue-61452.stderr
@@ -1,10 +1,13 @@
 error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
   --> $DIR/issue-61452.rs:4:5
    |
-LL | pub async fn f(x: Option<usize>) {
-   |                - help: consider changing this to be mutable: `mut x`
 LL |     x.take();
    |     ^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | pub async fn f(mut x: Option<usize>) {
+   |                +++
 
 error[E0384]: cannot assign twice to immutable variable `x`
   --> $DIR/issue-61452.rs:9:5
diff --git a/src/test/ui/async-await/issue-61793.rs b/tests/ui/async-await/issue-61793.rs
index 9180e1d81..9180e1d81 100644
--- a/src/test/ui/async-await/issue-61793.rs
+++ b/tests/ui/async-await/issue-61793.rs
diff --git a/src/test/ui/async-await/issue-61949-self-return-type.rs b/tests/ui/async-await/issue-61949-self-return-type.rs
index d73dbc6e8..d73dbc6e8 100644
--- a/src/test/ui/async-await/issue-61949-self-return-type.rs
+++ b/tests/ui/async-await/issue-61949-self-return-type.rs
diff --git a/src/test/ui/async-await/issue-61949-self-return-type.stderr b/tests/ui/async-await/issue-61949-self-return-type.stderr
index 638b197bc..638b197bc 100644
--- a/src/test/ui/async-await/issue-61949-self-return-type.stderr
+++ b/tests/ui/async-await/issue-61949-self-return-type.stderr
diff --git a/src/test/ui/async-await/issue-62658.rs b/tests/ui/async-await/issue-62658.rs
index d0af01e0c..d0af01e0c 100644
--- a/src/test/ui/async-await/issue-62658.rs
+++ b/tests/ui/async-await/issue-62658.rs
diff --git a/src/test/ui/async-await/issue-63832-await-short-temporary-lifetime-1.rs b/tests/ui/async-await/issue-63832-await-short-temporary-lifetime-1.rs
index 54059b29f..54059b29f 100644
--- a/src/test/ui/async-await/issue-63832-await-short-temporary-lifetime-1.rs
+++ b/tests/ui/async-await/issue-63832-await-short-temporary-lifetime-1.rs
diff --git a/src/test/ui/async-await/issue-63832-await-short-temporary-lifetime.rs b/tests/ui/async-await/issue-63832-await-short-temporary-lifetime.rs
index c5ea2b821..c5ea2b821 100644
--- a/src/test/ui/async-await/issue-63832-await-short-temporary-lifetime.rs
+++ b/tests/ui/async-await/issue-63832-await-short-temporary-lifetime.rs
diff --git a/src/test/ui/async-await/issue-64130-1-sync.rs b/tests/ui/async-await/issue-64130-1-sync.rs
index 1714cec52..1714cec52 100644
--- a/src/test/ui/async-await/issue-64130-1-sync.rs
+++ b/tests/ui/async-await/issue-64130-1-sync.rs
diff --git a/src/test/ui/async-await/issue-64130-1-sync.stderr b/tests/ui/async-await/issue-64130-1-sync.stderr
index e205de473..e205de473 100644
--- a/src/test/ui/async-await/issue-64130-1-sync.stderr
+++ b/tests/ui/async-await/issue-64130-1-sync.stderr
diff --git a/src/test/ui/async-await/issue-64130-2-send.rs b/tests/ui/async-await/issue-64130-2-send.rs
index 7a6e5952c..7a6e5952c 100644
--- a/src/test/ui/async-await/issue-64130-2-send.rs
+++ b/tests/ui/async-await/issue-64130-2-send.rs
diff --git a/src/test/ui/async-await/issue-64130-2-send.stderr b/tests/ui/async-await/issue-64130-2-send.stderr
index 2225000e2..2225000e2 100644
--- a/src/test/ui/async-await/issue-64130-2-send.stderr
+++ b/tests/ui/async-await/issue-64130-2-send.stderr
diff --git a/src/test/ui/async-await/issue-64130-3-other.rs b/tests/ui/async-await/issue-64130-3-other.rs
index 630fb2c41..630fb2c41 100644
--- a/src/test/ui/async-await/issue-64130-3-other.rs
+++ b/tests/ui/async-await/issue-64130-3-other.rs
diff --git a/src/test/ui/async-await/issue-64130-3-other.stderr b/tests/ui/async-await/issue-64130-3-other.stderr
index 17867a6a3..17867a6a3 100644
--- a/src/test/ui/async-await/issue-64130-3-other.stderr
+++ b/tests/ui/async-await/issue-64130-3-other.stderr
diff --git a/src/test/ui/async-await/issue-64130-4-async-move.drop-tracking.stderr b/tests/ui/async-await/issue-64130-4-async-move.drop-tracking.stderr
index f609e3636..f609e3636 100644
--- a/src/test/ui/async-await/issue-64130-4-async-move.drop-tracking.stderr
+++ b/tests/ui/async-await/issue-64130-4-async-move.drop-tracking.stderr
diff --git a/src/test/ui/async-await/issue-64130-4-async-move.no_drop_tracking.stderr b/tests/ui/async-await/issue-64130-4-async-move.no_drop_tracking.stderr
index f609e3636..f609e3636 100644
--- a/src/test/ui/async-await/issue-64130-4-async-move.no_drop_tracking.stderr
+++ b/tests/ui/async-await/issue-64130-4-async-move.no_drop_tracking.stderr
diff --git a/src/test/ui/async-await/issue-64130-4-async-move.rs b/tests/ui/async-await/issue-64130-4-async-move.rs
index a38428fc0..a38428fc0 100644
--- a/src/test/ui/async-await/issue-64130-4-async-move.rs
+++ b/tests/ui/async-await/issue-64130-4-async-move.rs
diff --git a/src/test/ui/async-await/issue-64130-non-send-future-diags.rs b/tests/ui/async-await/issue-64130-non-send-future-diags.rs
index b652d2391..b652d2391 100644
--- a/src/test/ui/async-await/issue-64130-non-send-future-diags.rs
+++ b/tests/ui/async-await/issue-64130-non-send-future-diags.rs
diff --git a/src/test/ui/async-await/issue-64130-non-send-future-diags.stderr b/tests/ui/async-await/issue-64130-non-send-future-diags.stderr
index 1da80d98b..1da80d98b 100644
--- a/src/test/ui/async-await/issue-64130-non-send-future-diags.stderr
+++ b/tests/ui/async-await/issue-64130-non-send-future-diags.stderr
diff --git a/src/test/ui/async-await/issue-64391.rs b/tests/ui/async-await/issue-64391.rs
index c6faad3aa..c6faad3aa 100644
--- a/src/test/ui/async-await/issue-64391.rs
+++ b/tests/ui/async-await/issue-64391.rs
diff --git a/src/test/ui/async-await/issue-66312.rs b/tests/ui/async-await/issue-66312.rs
index 9224971ec..9224971ec 100644
--- a/src/test/ui/async-await/issue-66312.rs
+++ b/tests/ui/async-await/issue-66312.rs
diff --git a/src/test/ui/async-await/issue-66312.stderr b/tests/ui/async-await/issue-66312.stderr
index 80d294a10..80d294a10 100644
--- a/src/test/ui/async-await/issue-66312.stderr
+++ b/tests/ui/async-await/issue-66312.stderr
diff --git a/src/test/ui/async-await/issue-66387-if-without-else.rs b/tests/ui/async-await/issue-66387-if-without-else.rs
index 3ab8220b4..3ab8220b4 100644
--- a/src/test/ui/async-await/issue-66387-if-without-else.rs
+++ b/tests/ui/async-await/issue-66387-if-without-else.rs
diff --git a/src/test/ui/async-await/issue-66387-if-without-else.stderr b/tests/ui/async-await/issue-66387-if-without-else.stderr
index 8155fcb56..8155fcb56 100644
--- a/src/test/ui/async-await/issue-66387-if-without-else.stderr
+++ b/tests/ui/async-await/issue-66387-if-without-else.stderr
diff --git a/src/test/ui/async-await/issue-67252-unnamed-future.rs b/tests/ui/async-await/issue-67252-unnamed-future.rs
index 1a7ff6133..1a7ff6133 100644
--- a/src/test/ui/async-await/issue-67252-unnamed-future.rs
+++ b/tests/ui/async-await/issue-67252-unnamed-future.rs
diff --git a/src/test/ui/async-await/issue-67252-unnamed-future.stderr b/tests/ui/async-await/issue-67252-unnamed-future.stderr
index fcba4410b..fcba4410b 100644
--- a/src/test/ui/async-await/issue-67252-unnamed-future.stderr
+++ b/tests/ui/async-await/issue-67252-unnamed-future.stderr
diff --git a/src/test/ui/async-await/issue-67651.rs b/tests/ui/async-await/issue-67651.rs
index bd96a3b70..bd96a3b70 100644
--- a/src/test/ui/async-await/issue-67651.rs
+++ b/tests/ui/async-await/issue-67651.rs
diff --git a/src/test/ui/async-await/issue-67651.stderr b/tests/ui/async-await/issue-67651.stderr
index 89017f6cc..89017f6cc 100644
--- a/src/test/ui/async-await/issue-67651.stderr
+++ b/tests/ui/async-await/issue-67651.stderr
diff --git a/src/test/ui/async-await/issue-67765-async-diagnostic.rs b/tests/ui/async-await/issue-67765-async-diagnostic.rs
index 5093916e7..5093916e7 100644
--- a/src/test/ui/async-await/issue-67765-async-diagnostic.rs
+++ b/tests/ui/async-await/issue-67765-async-diagnostic.rs
diff --git a/src/test/ui/async-await/issue-67765-async-diagnostic.stderr b/tests/ui/async-await/issue-67765-async-diagnostic.stderr
index 492e06fbb..492e06fbb 100644
--- a/src/test/ui/async-await/issue-67765-async-diagnostic.stderr
+++ b/tests/ui/async-await/issue-67765-async-diagnostic.stderr
diff --git a/src/test/ui/async-await/issue-68112.drop_tracking.stderr b/tests/ui/async-await/issue-68112.drop_tracking.stderr
index f2802698f..f2802698f 100644
--- a/src/test/ui/async-await/issue-68112.drop_tracking.stderr
+++ b/tests/ui/async-await/issue-68112.drop_tracking.stderr
diff --git a/src/test/ui/async-await/issue-68112.no_drop_tracking.stderr b/tests/ui/async-await/issue-68112.no_drop_tracking.stderr
index 38eb85b30..38eb85b30 100644
--- a/src/test/ui/async-await/issue-68112.no_drop_tracking.stderr
+++ b/tests/ui/async-await/issue-68112.no_drop_tracking.stderr
diff --git a/src/test/ui/async-await/issue-68112.rs b/tests/ui/async-await/issue-68112.rs
index 9c705137a..9c705137a 100644
--- a/src/test/ui/async-await/issue-68112.rs
+++ b/tests/ui/async-await/issue-68112.rs
diff --git a/src/test/ui/async-await/issue-68523-start.rs b/tests/ui/async-await/issue-68523-start.rs
index 2ced88a16..2ced88a16 100644
--- a/src/test/ui/async-await/issue-68523-start.rs
+++ b/tests/ui/async-await/issue-68523-start.rs
diff --git a/src/test/ui/async-await/issue-68523-start.stderr b/tests/ui/async-await/issue-68523-start.stderr
index 3a0a3b5de..3a0a3b5de 100644
--- a/src/test/ui/async-await/issue-68523-start.stderr
+++ b/tests/ui/async-await/issue-68523-start.stderr
diff --git a/src/test/ui/async-await/issue-68523.rs b/tests/ui/async-await/issue-68523.rs
index 7a67661a0..7a67661a0 100644
--- a/src/test/ui/async-await/issue-68523.rs
+++ b/tests/ui/async-await/issue-68523.rs
diff --git a/src/test/ui/async-await/issue-68523.stderr b/tests/ui/async-await/issue-68523.stderr
index dfdf078e3..dfdf078e3 100644
--- a/src/test/ui/async-await/issue-68523.stderr
+++ b/tests/ui/async-await/issue-68523.stderr
diff --git a/src/test/ui/async-await/issue-69446-fnmut-capture.rs b/tests/ui/async-await/issue-69446-fnmut-capture.rs
index 842115538..842115538 100644
--- a/src/test/ui/async-await/issue-69446-fnmut-capture.rs
+++ b/tests/ui/async-await/issue-69446-fnmut-capture.rs
diff --git a/src/test/ui/async-await/issue-69446-fnmut-capture.stderr b/tests/ui/async-await/issue-69446-fnmut-capture.stderr
index 3d2b0402b..3d2b0402b 100644
--- a/src/test/ui/async-await/issue-69446-fnmut-capture.stderr
+++ b/tests/ui/async-await/issue-69446-fnmut-capture.stderr
diff --git a/src/test/ui/async-await/issue-70594.rs b/tests/ui/async-await/issue-70594.rs
index 9e7c5847b..9e7c5847b 100644
--- a/src/test/ui/async-await/issue-70594.rs
+++ b/tests/ui/async-await/issue-70594.rs
diff --git a/src/test/ui/async-await/issue-70594.stderr b/tests/ui/async-await/issue-70594.stderr
index d3cf57d3b..d3cf57d3b 100644
--- a/src/test/ui/async-await/issue-70594.stderr
+++ b/tests/ui/async-await/issue-70594.stderr
diff --git a/src/test/ui/async-await/issue-70818.rs b/tests/ui/async-await/issue-70818.rs
index 019c56eb2..019c56eb2 100644
--- a/src/test/ui/async-await/issue-70818.rs
+++ b/tests/ui/async-await/issue-70818.rs
diff --git a/src/test/ui/async-await/issue-70818.stderr b/tests/ui/async-await/issue-70818.stderr
index 20109d4d1..20109d4d1 100644
--- a/src/test/ui/async-await/issue-70818.stderr
+++ b/tests/ui/async-await/issue-70818.stderr
diff --git a/src/test/ui/async-await/issue-70935-complex-spans.drop_tracking.stderr b/tests/ui/async-await/issue-70935-complex-spans.drop_tracking.stderr
index 721234aa4..721234aa4 100644
--- a/src/test/ui/async-await/issue-70935-complex-spans.drop_tracking.stderr
+++ b/tests/ui/async-await/issue-70935-complex-spans.drop_tracking.stderr
diff --git a/src/test/ui/async-await/issue-70935-complex-spans.no_drop_tracking.stderr b/tests/ui/async-await/issue-70935-complex-spans.no_drop_tracking.stderr
index 34b31198e..8036d82da 100644
--- a/src/test/ui/async-await/issue-70935-complex-spans.no_drop_tracking.stderr
+++ b/tests/ui/async-await/issue-70935-complex-spans.no_drop_tracking.stderr
@@ -12,14 +12,10 @@ LL |           baz(|| async{
    |  _____________-
 LL | |             foo(tx.clone());
 LL | |         }).await;
-   | |         - ^^^^^^ await occurs here, with the value maybe used later
-   | |_________|
+   | |         - ^^^^^^- the value is later dropped here
+   | |         | |
+   | |_________| await occurs here, with the value maybe used later
    |           has type `[closure@$DIR/issue-70935-complex-spans.rs:17:13: 17:15]` which is not `Send`
-note: the value is later dropped here
-  --> $DIR/issue-70935-complex-spans.rs:19:17
-   |
-LL |         }).await;
-   |                 ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/async-await/issue-70935-complex-spans.rs b/tests/ui/async-await/issue-70935-complex-spans.rs
index b6d17f93a..b6d17f93a 100644
--- a/src/test/ui/async-await/issue-70935-complex-spans.rs
+++ b/tests/ui/async-await/issue-70935-complex-spans.rs
diff --git a/src/test/ui/async-await/issue-71137.rs b/tests/ui/async-await/issue-71137.rs
index 7695e0325..7695e0325 100644
--- a/src/test/ui/async-await/issue-71137.rs
+++ b/tests/ui/async-await/issue-71137.rs
diff --git a/src/test/ui/async-await/issue-71137.stderr b/tests/ui/async-await/issue-71137.stderr
index eade6aa2d..eade6aa2d 100644
--- a/src/test/ui/async-await/issue-71137.stderr
+++ b/tests/ui/async-await/issue-71137.stderr
diff --git a/src/test/ui/async-await/issue-72442.rs b/tests/ui/async-await/issue-72442.rs
index 2280154c7..2280154c7 100644
--- a/src/test/ui/async-await/issue-72442.rs
+++ b/tests/ui/async-await/issue-72442.rs
diff --git a/src/test/ui/async-await/issue-72442.stderr b/tests/ui/async-await/issue-72442.stderr
index 919abf646..4a1705715 100644
--- a/src/test/ui/async-await/issue-72442.stderr
+++ b/tests/ui/async-await/issue-72442.stderr
@@ -8,9 +8,6 @@ LL |             let mut f = File::open(path.to_str())?;
    |
 note: required by a bound in `File::open`
   --> $SRC_DIR/std/src/fs.rs:LL:COL
-   |
-LL |     pub fn open<P: AsRef<Path>>(path: P) -> io::Result<File> {
-   |                    ^^^^^^^^^^^ required by this bound in `File::open`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/async-await/issue-72470-llvm-dominate.rs b/tests/ui/async-await/issue-72470-llvm-dominate.rs
index 5bb69a073..5bb69a073 100644
--- a/src/test/ui/async-await/issue-72470-llvm-dominate.rs
+++ b/tests/ui/async-await/issue-72470-llvm-dominate.rs
diff --git a/src/test/ui/async-await/issue-72590-type-error-sized.rs b/tests/ui/async-await/issue-72590-type-error-sized.rs
index 00e098d43..00e098d43 100644
--- a/src/test/ui/async-await/issue-72590-type-error-sized.rs
+++ b/tests/ui/async-await/issue-72590-type-error-sized.rs
diff --git a/src/test/ui/async-await/issue-72590-type-error-sized.stderr b/tests/ui/async-await/issue-72590-type-error-sized.stderr
index 778423578..778423578 100644
--- a/src/test/ui/async-await/issue-72590-type-error-sized.stderr
+++ b/tests/ui/async-await/issue-72590-type-error-sized.stderr
diff --git a/src/test/ui/async-await/issue-73050.rs b/tests/ui/async-await/issue-73050.rs
index 790f24a23..790f24a23 100644
--- a/src/test/ui/async-await/issue-73050.rs
+++ b/tests/ui/async-await/issue-73050.rs
diff --git a/src/test/ui/async-await/issue-73137.rs b/tests/ui/async-await/issue-73137.rs
index dcbe7765a..dcbe7765a 100644
--- a/src/test/ui/async-await/issue-73137.rs
+++ b/tests/ui/async-await/issue-73137.rs
diff --git a/src/test/ui/async-await/issue-73541-1.rs b/tests/ui/async-await/issue-73541-1.rs
index 7fb0d6c39..7fb0d6c39 100644
--- a/src/test/ui/async-await/issue-73541-1.rs
+++ b/tests/ui/async-await/issue-73541-1.rs
diff --git a/src/test/ui/async-await/issue-73541-1.stderr b/tests/ui/async-await/issue-73541-1.stderr
index 80c1fdf00..80c1fdf00 100644
--- a/src/test/ui/async-await/issue-73541-1.stderr
+++ b/tests/ui/async-await/issue-73541-1.stderr
diff --git a/src/test/ui/async-await/issue-73541-2.rs b/tests/ui/async-await/issue-73541-2.rs
index 70b4ab253..70b4ab253 100644
--- a/src/test/ui/async-await/issue-73541-2.rs
+++ b/tests/ui/async-await/issue-73541-2.rs
diff --git a/src/test/ui/async-await/issue-73541-2.stderr b/tests/ui/async-await/issue-73541-2.stderr
index 4c9741f6f..4c9741f6f 100644
--- a/src/test/ui/async-await/issue-73541-2.stderr
+++ b/tests/ui/async-await/issue-73541-2.stderr
diff --git a/src/test/ui/async-await/issue-73541-3.rs b/tests/ui/async-await/issue-73541-3.rs
index 02ca02da8..02ca02da8 100644
--- a/src/test/ui/async-await/issue-73541-3.rs
+++ b/tests/ui/async-await/issue-73541-3.rs
diff --git a/src/test/ui/async-await/issue-73541-3.stderr b/tests/ui/async-await/issue-73541-3.stderr
index 53487aaca..53487aaca 100644
--- a/src/test/ui/async-await/issue-73541-3.stderr
+++ b/tests/ui/async-await/issue-73541-3.stderr
diff --git a/src/test/ui/async-await/issue-73541.rs b/tests/ui/async-await/issue-73541.rs
index 399a07cd3..399a07cd3 100644
--- a/src/test/ui/async-await/issue-73541.rs
+++ b/tests/ui/async-await/issue-73541.rs
diff --git a/src/test/ui/async-await/issue-73541.stderr b/tests/ui/async-await/issue-73541.stderr
index 4bb466ff1..4bb466ff1 100644
--- a/src/test/ui/async-await/issue-73541.stderr
+++ b/tests/ui/async-await/issue-73541.stderr
diff --git a/src/test/ui/async-await/issue-73741-type-err-drop-tracking.rs b/tests/ui/async-await/issue-73741-type-err-drop-tracking.rs
index c3423ad62..c3423ad62 100644
--- a/src/test/ui/async-await/issue-73741-type-err-drop-tracking.rs
+++ b/tests/ui/async-await/issue-73741-type-err-drop-tracking.rs
diff --git a/src/test/ui/async-await/issue-73741-type-err-drop-tracking.stderr b/tests/ui/async-await/issue-73741-type-err-drop-tracking.stderr
index d4e3b6c3b..d4e3b6c3b 100644
--- a/src/test/ui/async-await/issue-73741-type-err-drop-tracking.stderr
+++ b/tests/ui/async-await/issue-73741-type-err-drop-tracking.stderr
diff --git a/src/test/ui/async-await/issue-73741-type-err.rs b/tests/ui/async-await/issue-73741-type-err.rs
index c5b9e34ed..c5b9e34ed 100644
--- a/src/test/ui/async-await/issue-73741-type-err.rs
+++ b/tests/ui/async-await/issue-73741-type-err.rs
diff --git a/src/test/ui/async-await/issue-73741-type-err.stderr b/tests/ui/async-await/issue-73741-type-err.stderr
index 0b5343a98..0b5343a98 100644
--- a/src/test/ui/async-await/issue-73741-type-err.stderr
+++ b/tests/ui/async-await/issue-73741-type-err.stderr
diff --git a/src/test/ui/async-await/issue-74047.rs b/tests/ui/async-await/issue-74047.rs
index 2e4f3e675..2e4f3e675 100644
--- a/src/test/ui/async-await/issue-74047.rs
+++ b/tests/ui/async-await/issue-74047.rs
diff --git a/src/test/ui/async-await/issue-74047.stderr b/tests/ui/async-await/issue-74047.stderr
index 28174825d..28174825d 100644
--- a/src/test/ui/async-await/issue-74047.stderr
+++ b/tests/ui/async-await/issue-74047.stderr
diff --git a/src/test/ui/async-await/issue-74072-lifetime-name-annotations.rs b/tests/ui/async-await/issue-74072-lifetime-name-annotations.rs
index 95683241a..95683241a 100644
--- a/src/test/ui/async-await/issue-74072-lifetime-name-annotations.rs
+++ b/tests/ui/async-await/issue-74072-lifetime-name-annotations.rs
diff --git a/src/test/ui/async-await/issue-74072-lifetime-name-annotations.stderr b/tests/ui/async-await/issue-74072-lifetime-name-annotations.stderr
index b96cab9f0..b96cab9f0 100644
--- a/src/test/ui/async-await/issue-74072-lifetime-name-annotations.stderr
+++ b/tests/ui/async-await/issue-74072-lifetime-name-annotations.stderr
diff --git a/src/test/ui/async-await/issue-74497-lifetime-in-opaque.rs b/tests/ui/async-await/issue-74497-lifetime-in-opaque.rs
index 2d765eb41..2d765eb41 100644
--- a/src/test/ui/async-await/issue-74497-lifetime-in-opaque.rs
+++ b/tests/ui/async-await/issue-74497-lifetime-in-opaque.rs
diff --git a/src/test/ui/async-await/issue-74497-lifetime-in-opaque.stderr b/tests/ui/async-await/issue-74497-lifetime-in-opaque.stderr
index 4427014ae..4427014ae 100644
--- a/src/test/ui/async-await/issue-74497-lifetime-in-opaque.stderr
+++ b/tests/ui/async-await/issue-74497-lifetime-in-opaque.stderr
diff --git a/src/test/ui/async-await/issue-75785-confusing-named-region.rs b/tests/ui/async-await/issue-75785-confusing-named-region.rs
index 452614087..452614087 100644
--- a/src/test/ui/async-await/issue-75785-confusing-named-region.rs
+++ b/tests/ui/async-await/issue-75785-confusing-named-region.rs
diff --git a/src/test/ui/async-await/issue-75785-confusing-named-region.stderr b/tests/ui/async-await/issue-75785-confusing-named-region.stderr
index 3b731d9c6..3b731d9c6 100644
--- a/src/test/ui/async-await/issue-75785-confusing-named-region.stderr
+++ b/tests/ui/async-await/issue-75785-confusing-named-region.stderr
diff --git a/src/test/ui/async-await/issue-76547.rs b/tests/ui/async-await/issue-76547.rs
index 587feb624..587feb624 100644
--- a/src/test/ui/async-await/issue-76547.rs
+++ b/tests/ui/async-await/issue-76547.rs
diff --git a/src/test/ui/async-await/issue-76547.stderr b/tests/ui/async-await/issue-76547.stderr
index 4d96cce82..4d96cce82 100644
--- a/src/test/ui/async-await/issue-76547.stderr
+++ b/tests/ui/async-await/issue-76547.stderr
diff --git a/src/test/ui/async-await/issue-77993-2.rs b/tests/ui/async-await/issue-77993-2.rs
index 4d554a0a1..4d554a0a1 100644
--- a/src/test/ui/async-await/issue-77993-2.rs
+++ b/tests/ui/async-await/issue-77993-2.rs
diff --git a/src/test/ui/async-await/issue-77993-2.stderr b/tests/ui/async-await/issue-77993-2.stderr
index 64b378f83..64b378f83 100644
--- a/src/test/ui/async-await/issue-77993-2.stderr
+++ b/tests/ui/async-await/issue-77993-2.stderr
diff --git a/src/test/ui/async-await/issue-84841.rs b/tests/ui/async-await/issue-84841.rs
index ba3a1617b..ba3a1617b 100644
--- a/src/test/ui/async-await/issue-84841.rs
+++ b/tests/ui/async-await/issue-84841.rs
diff --git a/src/test/ui/async-await/issue-84841.stderr b/tests/ui/async-await/issue-84841.stderr
index 1e22373ba..1e22373ba 100644
--- a/src/test/ui/async-await/issue-84841.stderr
+++ b/tests/ui/async-await/issue-84841.stderr
diff --git a/src/test/ui/async-await/issue-86507.rs b/tests/ui/async-await/issue-86507.rs
index 317f03176..317f03176 100644
--- a/src/test/ui/async-await/issue-86507.rs
+++ b/tests/ui/async-await/issue-86507.rs
diff --git a/src/test/ui/async-await/issue-86507.stderr b/tests/ui/async-await/issue-86507.stderr
index 8c2c06da2..8c2c06da2 100644
--- a/src/test/ui/async-await/issue-86507.stderr
+++ b/tests/ui/async-await/issue-86507.stderr
diff --git a/src/test/ui/async-await/issue-93197.rs b/tests/ui/async-await/issue-93197.rs
index c627fe17a..c627fe17a 100644
--- a/src/test/ui/async-await/issue-93197.rs
+++ b/tests/ui/async-await/issue-93197.rs
diff --git a/src/test/ui/async-await/issue-93648.rs b/tests/ui/async-await/issue-93648.rs
index 4ce3ac1e8..4ce3ac1e8 100644
--- a/src/test/ui/async-await/issue-93648.rs
+++ b/tests/ui/async-await/issue-93648.rs
diff --git a/src/test/ui/async-await/issue-98634.rs b/tests/ui/async-await/issue-98634.rs
index b0d38687f..b0d38687f 100644
--- a/src/test/ui/async-await/issue-98634.rs
+++ b/tests/ui/async-await/issue-98634.rs
diff --git a/src/test/ui/async-await/issue-98634.stderr b/tests/ui/async-await/issue-98634.stderr
index 5160e48d8..5160e48d8 100644
--- a/src/test/ui/async-await/issue-98634.stderr
+++ b/tests/ui/async-await/issue-98634.stderr
diff --git a/src/test/ui/async-await/issues/auxiliary/issue-60674.rs b/tests/ui/async-await/issues/auxiliary/issue-60674.rs
index 680c6e55e..680c6e55e 100644
--- a/src/test/ui/async-await/issues/auxiliary/issue-60674.rs
+++ b/tests/ui/async-await/issues/auxiliary/issue-60674.rs
diff --git a/src/test/ui/async-await/issues/auxiliary/issue_67893.rs b/tests/ui/async-await/issues/auxiliary/issue_67893.rs
index 387966a50..387966a50 100644
--- a/src/test/ui/async-await/issues/auxiliary/issue_67893.rs
+++ b/tests/ui/async-await/issues/auxiliary/issue_67893.rs
diff --git a/tests/ui/async-await/issues/issue-102206.rs b/tests/ui/async-await/issues/issue-102206.rs
new file mode 100644
index 000000000..a3a2ebc58
--- /dev/null
+++ b/tests/ui/async-await/issues/issue-102206.rs
@@ -0,0 +1,8 @@
+// edition:2021
+
+async fn foo() {}
+
+fn main() {
+    std::mem::size_of_val(foo());
+    //~^ ERROR: mismatched types
+}
diff --git a/tests/ui/async-await/issues/issue-102206.stderr b/tests/ui/async-await/issues/issue-102206.stderr
new file mode 100644
index 000000000..2ab790ac7
--- /dev/null
+++ b/tests/ui/async-await/issues/issue-102206.stderr
@@ -0,0 +1,23 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-102206.rs:6:27
+   |
+LL |     std::mem::size_of_val(foo());
+   |     --------------------- ^^^^^
+   |     |                     |
+   |     |                     expected reference, found opaque type
+   |     |                     help: consider borrowing here: `&foo()`
+   |     arguments to this function are incorrect
+   |
+note: while checking the return type of the `async fn`
+  --> $DIR/issue-102206.rs:3:16
+   |
+LL | async fn foo() {}
+   |                ^ checked the `Output` of this `async fn`, found opaque type
+   = note: expected reference `&_`
+            found opaque type `impl Future<Output = ()>`
+note: function defined here
+  --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/async-await/issues/issue-51719.rs b/tests/ui/async-await/issues/issue-51719.rs
index 09241f982..09241f982 100644
--- a/src/test/ui/async-await/issues/issue-51719.rs
+++ b/tests/ui/async-await/issues/issue-51719.rs
diff --git a/src/test/ui/async-await/issues/issue-51719.stderr b/tests/ui/async-await/issues/issue-51719.stderr
index f3ce5d1c8..f3ce5d1c8 100644
--- a/src/test/ui/async-await/issues/issue-51719.stderr
+++ b/tests/ui/async-await/issues/issue-51719.stderr
diff --git a/src/test/ui/async-await/issues/issue-51751.rs b/tests/ui/async-await/issues/issue-51751.rs
index bc85a96ce..bc85a96ce 100644
--- a/src/test/ui/async-await/issues/issue-51751.rs
+++ b/tests/ui/async-await/issues/issue-51751.rs
diff --git a/src/test/ui/async-await/issues/issue-51751.stderr b/tests/ui/async-await/issues/issue-51751.stderr
index 8696a5b79..8696a5b79 100644
--- a/src/test/ui/async-await/issues/issue-51751.stderr
+++ b/tests/ui/async-await/issues/issue-51751.stderr
diff --git a/src/test/ui/async-await/issues/issue-53249.rs b/tests/ui/async-await/issues/issue-53249.rs
index 3a33af2d2..3a33af2d2 100644
--- a/src/test/ui/async-await/issues/issue-53249.rs
+++ b/tests/ui/async-await/issues/issue-53249.rs
diff --git a/src/test/ui/async-await/issues/issue-54752-async-block.rs b/tests/ui/async-await/issues/issue-54752-async-block.rs
index a8165ae6c..a8165ae6c 100644
--- a/src/test/ui/async-await/issues/issue-54752-async-block.rs
+++ b/tests/ui/async-await/issues/issue-54752-async-block.rs
diff --git a/src/test/ui/async-await/issues/issue-54752-async-block.stderr b/tests/ui/async-await/issues/issue-54752-async-block.stderr
index 8cc849dd9..8cc849dd9 100644
--- a/src/test/ui/async-await/issues/issue-54752-async-block.stderr
+++ b/tests/ui/async-await/issues/issue-54752-async-block.stderr
diff --git a/src/test/ui/async-await/issues/issue-54974.rs b/tests/ui/async-await/issues/issue-54974.rs
index b602ef153..b602ef153 100644
--- a/src/test/ui/async-await/issues/issue-54974.rs
+++ b/tests/ui/async-await/issues/issue-54974.rs
diff --git a/src/test/ui/async-await/issues/issue-55324.rs b/tests/ui/async-await/issues/issue-55324.rs
index 9ecb3b129..9ecb3b129 100644
--- a/src/test/ui/async-await/issues/issue-55324.rs
+++ b/tests/ui/async-await/issues/issue-55324.rs
diff --git a/src/test/ui/async-await/issues/issue-55809.rs b/tests/ui/async-await/issues/issue-55809.rs
index 3b271775a..3b271775a 100644
--- a/src/test/ui/async-await/issues/issue-55809.rs
+++ b/tests/ui/async-await/issues/issue-55809.rs
diff --git a/src/test/ui/async-await/issues/issue-58885.rs b/tests/ui/async-await/issues/issue-58885.rs
index 11920b072..11920b072 100644
--- a/src/test/ui/async-await/issues/issue-58885.rs
+++ b/tests/ui/async-await/issues/issue-58885.rs
diff --git a/src/test/ui/async-await/issues/issue-59001.rs b/tests/ui/async-await/issues/issue-59001.rs
index 4ddebcf20..4ddebcf20 100644
--- a/src/test/ui/async-await/issues/issue-59001.rs
+++ b/tests/ui/async-await/issues/issue-59001.rs
diff --git a/src/test/ui/async-await/issues/issue-59972.rs b/tests/ui/async-await/issues/issue-59972.rs
index c2e24a96b..c2e24a96b 100644
--- a/src/test/ui/async-await/issues/issue-59972.rs
+++ b/tests/ui/async-await/issues/issue-59972.rs
diff --git a/src/test/ui/async-await/issues/issue-60518.rs b/tests/ui/async-await/issues/issue-60518.rs
index 69bbdd0e8..69bbdd0e8 100644
--- a/src/test/ui/async-await/issues/issue-60518.rs
+++ b/tests/ui/async-await/issues/issue-60518.rs
diff --git a/src/test/ui/async-await/issues/issue-60655-latebound-regions.rs b/tests/ui/async-await/issues/issue-60655-latebound-regions.rs
index 66a3b07c3..66a3b07c3 100644
--- a/src/test/ui/async-await/issues/issue-60655-latebound-regions.rs
+++ b/tests/ui/async-await/issues/issue-60655-latebound-regions.rs
diff --git a/src/test/ui/async-await/issues/issue-60674.rs b/tests/ui/async-await/issues/issue-60674.rs
index c0e34a8df..c0e34a8df 100644
--- a/src/test/ui/async-await/issues/issue-60674.rs
+++ b/tests/ui/async-await/issues/issue-60674.rs
diff --git a/src/test/ui/async-await/issues/issue-60674.stdout b/tests/ui/async-await/issues/issue-60674.stdout
index 6f980e606..6f980e606 100644
--- a/src/test/ui/async-await/issues/issue-60674.stdout
+++ b/tests/ui/async-await/issues/issue-60674.stdout
diff --git a/src/test/ui/async-await/issues/issue-61187.rs b/tests/ui/async-await/issues/issue-61187.rs
index 8585a4251..8585a4251 100644
--- a/src/test/ui/async-await/issues/issue-61187.rs
+++ b/tests/ui/async-await/issues/issue-61187.rs
diff --git a/tests/ui/async-await/issues/issue-61187.stderr b/tests/ui/async-await/issues/issue-61187.stderr
new file mode 100644
index 000000000..e58f74546
--- /dev/null
+++ b/tests/ui/async-await/issues/issue-61187.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `data` as mutable, as it is not declared as mutable
+  --> $DIR/issue-61187.rs:6:5
+   |
+LL |     data.reverse();
+   |     ^^^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | async fn response(mut data: Vec<u8>) {
+   |                   +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/async-await/issues/issue-61986.rs b/tests/ui/async-await/issues/issue-61986.rs
index 879bc6912..879bc6912 100644
--- a/src/test/ui/async-await/issues/issue-61986.rs
+++ b/tests/ui/async-await/issues/issue-61986.rs
diff --git a/src/test/ui/async-await/issues/issue-62009-1.rs b/tests/ui/async-await/issues/issue-62009-1.rs
index 40ccf2571..40ccf2571 100644
--- a/src/test/ui/async-await/issues/issue-62009-1.rs
+++ b/tests/ui/async-await/issues/issue-62009-1.rs
diff --git a/src/test/ui/async-await/issues/issue-62009-1.stderr b/tests/ui/async-await/issues/issue-62009-1.stderr
index 222afb2c7..222afb2c7 100644
--- a/src/test/ui/async-await/issues/issue-62009-1.stderr
+++ b/tests/ui/async-await/issues/issue-62009-1.stderr
diff --git a/src/test/ui/async-await/issues/issue-62009-2.rs b/tests/ui/async-await/issues/issue-62009-2.rs
index cb7336e61..cb7336e61 100644
--- a/src/test/ui/async-await/issues/issue-62009-2.rs
+++ b/tests/ui/async-await/issues/issue-62009-2.rs
diff --git a/src/test/ui/async-await/issues/issue-62009-2.stderr b/tests/ui/async-await/issues/issue-62009-2.stderr
index 92e9a8a69..92e9a8a69 100644
--- a/src/test/ui/async-await/issues/issue-62009-2.stderr
+++ b/tests/ui/async-await/issues/issue-62009-2.stderr
diff --git a/src/test/ui/async-await/issues/issue-62097.rs b/tests/ui/async-await/issues/issue-62097.rs
index a24c84cff..a24c84cff 100644
--- a/src/test/ui/async-await/issues/issue-62097.rs
+++ b/tests/ui/async-await/issues/issue-62097.rs
diff --git a/src/test/ui/async-await/issues/issue-62097.stderr b/tests/ui/async-await/issues/issue-62097.stderr
index 786f62132..786f62132 100644
--- a/src/test/ui/async-await/issues/issue-62097.stderr
+++ b/tests/ui/async-await/issues/issue-62097.stderr
diff --git a/src/test/ui/async-await/issues/issue-62517-1.rs b/tests/ui/async-await/issues/issue-62517-1.rs
index 4689ce36a..4689ce36a 100644
--- a/src/test/ui/async-await/issues/issue-62517-1.rs
+++ b/tests/ui/async-await/issues/issue-62517-1.rs
diff --git a/src/test/ui/async-await/issues/issue-62517-2.rs b/tests/ui/async-await/issues/issue-62517-2.rs
index aaf28d6c1..aaf28d6c1 100644
--- a/src/test/ui/async-await/issues/issue-62517-2.rs
+++ b/tests/ui/async-await/issues/issue-62517-2.rs
diff --git a/src/test/ui/async-await/issues/issue-63388-1.rs b/tests/ui/async-await/issues/issue-63388-1.rs
index 32bcbb111..32bcbb111 100644
--- a/src/test/ui/async-await/issues/issue-63388-1.rs
+++ b/tests/ui/async-await/issues/issue-63388-1.rs
diff --git a/src/test/ui/async-await/issues/issue-63388-1.stderr b/tests/ui/async-await/issues/issue-63388-1.stderr
index 88542315e..88542315e 100644
--- a/src/test/ui/async-await/issues/issue-63388-1.stderr
+++ b/tests/ui/async-await/issues/issue-63388-1.stderr
diff --git a/src/test/ui/async-await/issues/issue-63388-2.rs b/tests/ui/async-await/issues/issue-63388-2.rs
index 90b59f96e..90b59f96e 100644
--- a/src/test/ui/async-await/issues/issue-63388-2.rs
+++ b/tests/ui/async-await/issues/issue-63388-2.rs
diff --git a/src/test/ui/async-await/issues/issue-63388-2.stderr b/tests/ui/async-await/issues/issue-63388-2.stderr
index e515f227c..e515f227c 100644
--- a/src/test/ui/async-await/issues/issue-63388-2.stderr
+++ b/tests/ui/async-await/issues/issue-63388-2.stderr
diff --git a/src/test/ui/async-await/issues/issue-63388-3.rs b/tests/ui/async-await/issues/issue-63388-3.rs
index 1a9822e02..1a9822e02 100644
--- a/src/test/ui/async-await/issues/issue-63388-3.rs
+++ b/tests/ui/async-await/issues/issue-63388-3.rs
diff --git a/src/test/ui/async-await/issues/issue-63388-4.rs b/tests/ui/async-await/issues/issue-63388-4.rs
index 58f9dacb3..58f9dacb3 100644
--- a/src/test/ui/async-await/issues/issue-63388-4.rs
+++ b/tests/ui/async-await/issues/issue-63388-4.rs
diff --git a/src/test/ui/async-await/issues/issue-64391-2.rs b/tests/ui/async-await/issues/issue-64391-2.rs
index eef2c1fb2..eef2c1fb2 100644
--- a/src/test/ui/async-await/issues/issue-64391-2.rs
+++ b/tests/ui/async-await/issues/issue-64391-2.rs
diff --git a/src/test/ui/async-await/issues/issue-64433.rs b/tests/ui/async-await/issues/issue-64433.rs
index d900f8ed9..d900f8ed9 100644
--- a/src/test/ui/async-await/issues/issue-64433.rs
+++ b/tests/ui/async-await/issues/issue-64433.rs
diff --git a/src/test/ui/async-await/issues/issue-64477-2.rs b/tests/ui/async-await/issues/issue-64477-2.rs
index 2360b57cc..2360b57cc 100644
--- a/src/test/ui/async-await/issues/issue-64477-2.rs
+++ b/tests/ui/async-await/issues/issue-64477-2.rs
diff --git a/src/test/ui/async-await/issues/issue-64477.rs b/tests/ui/async-await/issues/issue-64477.rs
index 5bd52d44a..5bd52d44a 100644
--- a/src/test/ui/async-await/issues/issue-64477.rs
+++ b/tests/ui/async-await/issues/issue-64477.rs
diff --git a/src/test/ui/async-await/issues/issue-64964.rs b/tests/ui/async-await/issues/issue-64964.rs
index 6d6eff486..6d6eff486 100644
--- a/src/test/ui/async-await/issues/issue-64964.rs
+++ b/tests/ui/async-await/issues/issue-64964.rs
diff --git a/src/test/ui/async-await/issues/issue-65159.rs b/tests/ui/async-await/issues/issue-65159.rs
index df2ca0257..df2ca0257 100644
--- a/src/test/ui/async-await/issues/issue-65159.rs
+++ b/tests/ui/async-await/issues/issue-65159.rs
diff --git a/src/test/ui/async-await/issues/issue-65159.stderr b/tests/ui/async-await/issues/issue-65159.stderr
index 45f5ec40c..40c0e72b2 100644
--- a/src/test/ui/async-await/issues/issue-65159.stderr
+++ b/tests/ui/async-await/issues/issue-65159.stderr
@@ -6,11 +6,6 @@ LL | async fn copy() -> Result<()>
    |                    |
    |                    expected 2 generic arguments
    |
-note: enum defined here, with 2 generic parameters: `T`, `E`
-  --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   |          ^^^^^^ -  -
 help: add missing generic argument
    |
 LL | async fn copy() -> Result<(), E>
diff --git a/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs b/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs
index ade386a60..ade386a60 100644
--- a/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs
+++ b/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs
diff --git a/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs b/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs
index b4ea4c9f6..b4ea4c9f6 100644
--- a/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs
+++ b/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs
diff --git a/src/test/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs b/tests/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs
index 9fc5667d6..9fc5667d6 100644
--- a/src/test/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs
+++ b/tests/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs
diff --git a/src/test/ui/async-await/issues/issue-65436-raw-ptr-not-send.no_drop_tracking.stderr b/tests/ui/async-await/issues/issue-65436-raw-ptr-not-send.no_drop_tracking.stderr
index ab196dca2..1033fa6cc 100644
--- a/src/test/ui/async-await/issues/issue-65436-raw-ptr-not-send.no_drop_tracking.stderr
+++ b/tests/ui/async-await/issues/issue-65436-raw-ptr-not-send.no_drop_tracking.stderr
@@ -13,14 +13,10 @@ note: future is not `Send` as this value is used across an await
   --> $DIR/issue-65436-raw-ptr-not-send.rs:18:35
    |
 LL |         bar(Foo(std::ptr::null())).await;
-   |                 ----------------  ^^^^^^ await occurs here, with `std::ptr::null()` maybe used later
-   |                 |
+   |                 ----------------  ^^^^^^- `std::ptr::null()` is later dropped here
+   |                 |                 |
+   |                 |                 await occurs here, with `std::ptr::null()` maybe used later
    |                 has type `*const u8` which is not `Send`
-note: `std::ptr::null()` is later dropped here
-  --> $DIR/issue-65436-raw-ptr-not-send.rs:18:41
-   |
-LL |         bar(Foo(std::ptr::null())).await;
-   |                                         ^
 help: consider moving this into a `let` binding to create a shorter lived borrow
   --> $DIR/issue-65436-raw-ptr-not-send.rs:18:13
    |
diff --git a/src/test/ui/async-await/issues/issue-65436-raw-ptr-not-send.rs b/tests/ui/async-await/issues/issue-65436-raw-ptr-not-send.rs
index 91edbc10d..91edbc10d 100644
--- a/src/test/ui/async-await/issues/issue-65436-raw-ptr-not-send.rs
+++ b/tests/ui/async-await/issues/issue-65436-raw-ptr-not-send.rs
diff --git a/src/test/ui/async-await/issues/issue-66695-static-refs.rs b/tests/ui/async-await/issues/issue-66695-static-refs.rs
index f0609713b..f0609713b 100644
--- a/src/test/ui/async-await/issues/issue-66695-static-refs.rs
+++ b/tests/ui/async-await/issues/issue-66695-static-refs.rs
diff --git a/src/test/ui/async-await/issues/issue-66958-non-copy-infered-type-arg.rs b/tests/ui/async-await/issues/issue-66958-non-copy-infered-type-arg.rs
index b7a976a0a..b7a976a0a 100644
--- a/src/test/ui/async-await/issues/issue-66958-non-copy-infered-type-arg.rs
+++ b/tests/ui/async-await/issues/issue-66958-non-copy-infered-type-arg.rs
diff --git a/src/test/ui/async-await/issues/issue-66958-non-copy-infered-type-arg.stderr b/tests/ui/async-await/issues/issue-66958-non-copy-infered-type-arg.stderr
index e2a735398..e2a735398 100644
--- a/src/test/ui/async-await/issues/issue-66958-non-copy-infered-type-arg.stderr
+++ b/tests/ui/async-await/issues/issue-66958-non-copy-infered-type-arg.stderr
diff --git a/src/test/ui/async-await/issues/issue-67611-static-mut-refs.rs b/tests/ui/async-await/issues/issue-67611-static-mut-refs.rs
index dda4a151d..dda4a151d 100644
--- a/src/test/ui/async-await/issues/issue-67611-static-mut-refs.rs
+++ b/tests/ui/async-await/issues/issue-67611-static-mut-refs.rs
diff --git a/src/test/ui/async-await/issues/issue-67893.rs b/tests/ui/async-await/issues/issue-67893.rs
index d73772e5f..d73772e5f 100644
--- a/src/test/ui/async-await/issues/issue-67893.rs
+++ b/tests/ui/async-await/issues/issue-67893.rs
diff --git a/tests/ui/async-await/issues/issue-67893.stderr b/tests/ui/async-await/issues/issue-67893.stderr
new file mode 100644
index 000000000..2ce68a782
--- /dev/null
+++ b/tests/ui/async-await/issues/issue-67893.stderr
@@ -0,0 +1,23 @@
+error: future cannot be sent between threads safely
+  --> $DIR/issue-67893.rs:9:7
+   |
+LL |     g(issue_67893::run())
+   |       ^^^^^^^^^^^^^^^^^^ future is not `Send`
+   |
+   = help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `MutexGuard<'_, ()>`
+note: future is not `Send` as this value is used across an await
+  --> $DIR/auxiliary/issue_67893.rs:9:26
+   |
+LL |     f(*x.lock().unwrap()).await;
+   |        ----------------- ^^^^^^- `x.lock().unwrap()` is later dropped here
+   |        |                 |
+   |        |                 await occurs here, with `x.lock().unwrap()` maybe used later
+   |        has type `MutexGuard<'_, ()>` which is not `Send`
+note: required by a bound in `g`
+  --> $DIR/issue-67893.rs:6:14
+   |
+LL | fn g(_: impl Send) {}
+   |              ^^^^ required by this bound in `g`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/async-await/issues/issue-69307-nested.rs b/tests/ui/async-await/issues/issue-69307-nested.rs
index b7cdf3987..b7cdf3987 100644
--- a/src/test/ui/async-await/issues/issue-69307-nested.rs
+++ b/tests/ui/async-await/issues/issue-69307-nested.rs
diff --git a/src/test/ui/async-await/issues/issue-69307.rs b/tests/ui/async-await/issues/issue-69307.rs
index 59309a7f2..59309a7f2 100644
--- a/src/test/ui/async-await/issues/issue-69307.rs
+++ b/tests/ui/async-await/issues/issue-69307.rs
diff --git a/src/test/ui/async-await/issues/issue-72312.rs b/tests/ui/async-await/issues/issue-72312.rs
index 74122cf00..74122cf00 100644
--- a/src/test/ui/async-await/issues/issue-72312.rs
+++ b/tests/ui/async-await/issues/issue-72312.rs
diff --git a/src/test/ui/async-await/issues/issue-72312.stderr b/tests/ui/async-await/issues/issue-72312.stderr
index aa947b690..aa947b690 100644
--- a/src/test/ui/async-await/issues/issue-72312.stderr
+++ b/tests/ui/async-await/issues/issue-72312.stderr
diff --git a/src/test/ui/async-await/issues/issue-78600.rs b/tests/ui/async-await/issues/issue-78600.rs
index 8aaeaecf3..8aaeaecf3 100644
--- a/src/test/ui/async-await/issues/issue-78600.rs
+++ b/tests/ui/async-await/issues/issue-78600.rs
diff --git a/src/test/ui/async-await/issues/issue-78600.stderr b/tests/ui/async-await/issues/issue-78600.stderr
index 37eafa996..37eafa996 100644
--- a/src/test/ui/async-await/issues/issue-78600.stderr
+++ b/tests/ui/async-await/issues/issue-78600.stderr
diff --git a/src/test/ui/async-await/issues/issue-78654.full.stderr b/tests/ui/async-await/issues/issue-78654.full.stderr
index 0d12a948c..0d12a948c 100644
--- a/src/test/ui/async-await/issues/issue-78654.full.stderr
+++ b/tests/ui/async-await/issues/issue-78654.full.stderr
diff --git a/src/test/ui/async-await/issues/issue-78654.min.stderr b/tests/ui/async-await/issues/issue-78654.min.stderr
index 0d12a948c..0d12a948c 100644
--- a/src/test/ui/async-await/issues/issue-78654.min.stderr
+++ b/tests/ui/async-await/issues/issue-78654.min.stderr
diff --git a/src/test/ui/async-await/issues/issue-78654.rs b/tests/ui/async-await/issues/issue-78654.rs
index cc6dc3834..cc6dc3834 100644
--- a/src/test/ui/async-await/issues/issue-78654.rs
+++ b/tests/ui/async-await/issues/issue-78654.rs
diff --git a/src/test/ui/async-await/issues/issue-78938-async-block.rs b/tests/ui/async-await/issues/issue-78938-async-block.rs
index 36f716019..36f716019 100644
--- a/src/test/ui/async-await/issues/issue-78938-async-block.rs
+++ b/tests/ui/async-await/issues/issue-78938-async-block.rs
diff --git a/src/test/ui/async-await/issues/issue-78938-async-block.stderr b/tests/ui/async-await/issues/issue-78938-async-block.stderr
index c1a4b467f..c1a4b467f 100644
--- a/src/test/ui/async-await/issues/issue-78938-async-block.stderr
+++ b/tests/ui/async-await/issues/issue-78938-async-block.stderr
diff --git a/src/test/ui/async-await/issues/issue-95307.rs b/tests/ui/async-await/issues/issue-95307.rs
index f7e48070c..f7e48070c 100644
--- a/src/test/ui/async-await/issues/issue-95307.rs
+++ b/tests/ui/async-await/issues/issue-95307.rs
diff --git a/src/test/ui/async-await/issues/issue-95307.stderr b/tests/ui/async-await/issues/issue-95307.stderr
index a497cebe3..a497cebe3 100644
--- a/src/test/ui/async-await/issues/issue-95307.stderr
+++ b/tests/ui/async-await/issues/issue-95307.stderr
diff --git a/src/test/ui/async-await/issues/non-async-enclosing-span.rs b/tests/ui/async-await/issues/non-async-enclosing-span.rs
index d47c21377..d47c21377 100644
--- a/src/test/ui/async-await/issues/non-async-enclosing-span.rs
+++ b/tests/ui/async-await/issues/non-async-enclosing-span.rs
diff --git a/src/test/ui/async-await/issues/non-async-enclosing-span.stderr b/tests/ui/async-await/issues/non-async-enclosing-span.stderr
index 20b827479..20b827479 100644
--- a/src/test/ui/async-await/issues/non-async-enclosing-span.stderr
+++ b/tests/ui/async-await/issues/non-async-enclosing-span.stderr
diff --git a/src/test/ui/async-await/large_moves.attribute.stderr b/tests/ui/async-await/large_moves.attribute.stderr
index 0c5452475..0c5452475 100644
--- a/src/test/ui/async-await/large_moves.attribute.stderr
+++ b/tests/ui/async-await/large_moves.attribute.stderr
diff --git a/src/test/ui/async-await/large_moves.option.stderr b/tests/ui/async-await/large_moves.option.stderr
index 0c5452475..0c5452475 100644
--- a/src/test/ui/async-await/large_moves.option.stderr
+++ b/tests/ui/async-await/large_moves.option.stderr
diff --git a/src/test/ui/async-await/large_moves.rs b/tests/ui/async-await/large_moves.rs
index d43d0eec0..d43d0eec0 100644
--- a/src/test/ui/async-await/large_moves.rs
+++ b/tests/ui/async-await/large_moves.rs
diff --git a/src/test/ui/async-await/move-part-await-return-rest-struct.rs b/tests/ui/async-await/move-part-await-return-rest-struct.rs
index 39ea2aae5..39ea2aae5 100644
--- a/src/test/ui/async-await/move-part-await-return-rest-struct.rs
+++ b/tests/ui/async-await/move-part-await-return-rest-struct.rs
diff --git a/src/test/ui/async-await/move-part-await-return-rest-tuple.rs b/tests/ui/async-await/move-part-await-return-rest-tuple.rs
index 7b958b98b..7b958b98b 100644
--- a/src/test/ui/async-await/move-part-await-return-rest-tuple.rs
+++ b/tests/ui/async-await/move-part-await-return-rest-tuple.rs
diff --git a/src/test/ui/async-await/multiple-lifetimes/elided.rs b/tests/ui/async-await/multiple-lifetimes/elided.rs
index 8258e2eff..8258e2eff 100644
--- a/src/test/ui/async-await/multiple-lifetimes/elided.rs
+++ b/tests/ui/async-await/multiple-lifetimes/elided.rs
diff --git a/src/test/ui/async-await/multiple-lifetimes/fn-ptr.rs b/tests/ui/async-await/multiple-lifetimes/fn-ptr.rs
index 3912b8547..3912b8547 100644
--- a/src/test/ui/async-await/multiple-lifetimes/fn-ptr.rs
+++ b/tests/ui/async-await/multiple-lifetimes/fn-ptr.rs
diff --git a/src/test/ui/async-await/multiple-lifetimes/hrtb.rs b/tests/ui/async-await/multiple-lifetimes/hrtb.rs
index e788ca5ff..e788ca5ff 100644
--- a/src/test/ui/async-await/multiple-lifetimes/hrtb.rs
+++ b/tests/ui/async-await/multiple-lifetimes/hrtb.rs
diff --git a/src/test/ui/async-await/multiple-lifetimes/named.rs b/tests/ui/async-await/multiple-lifetimes/named.rs
index e8eb98102..e8eb98102 100644
--- a/src/test/ui/async-await/multiple-lifetimes/named.rs
+++ b/tests/ui/async-await/multiple-lifetimes/named.rs
diff --git a/src/test/ui/async-await/multiple-lifetimes/partial-relation.rs b/tests/ui/async-await/multiple-lifetimes/partial-relation.rs
index 02b105999..02b105999 100644
--- a/src/test/ui/async-await/multiple-lifetimes/partial-relation.rs
+++ b/tests/ui/async-await/multiple-lifetimes/partial-relation.rs
diff --git a/src/test/ui/async-await/multiple-lifetimes/ret-impl-trait-fg.rs b/tests/ui/async-await/multiple-lifetimes/ret-impl-trait-fg.rs
index f1002947f..f1002947f 100644
--- a/src/test/ui/async-await/multiple-lifetimes/ret-impl-trait-fg.rs
+++ b/tests/ui/async-await/multiple-lifetimes/ret-impl-trait-fg.rs
diff --git a/src/test/ui/async-await/multiple-lifetimes/ret-impl-trait-one.rs b/tests/ui/async-await/multiple-lifetimes/ret-impl-trait-one.rs
index aebc77d26..aebc77d26 100644
--- a/src/test/ui/async-await/multiple-lifetimes/ret-impl-trait-one.rs
+++ b/tests/ui/async-await/multiple-lifetimes/ret-impl-trait-one.rs
diff --git a/src/test/ui/async-await/multiple-lifetimes/ret-impl-trait-one.stderr b/tests/ui/async-await/multiple-lifetimes/ret-impl-trait-one.stderr
index ae4d0d585..ae4d0d585 100644
--- a/src/test/ui/async-await/multiple-lifetimes/ret-impl-trait-one.stderr
+++ b/tests/ui/async-await/multiple-lifetimes/ret-impl-trait-one.stderr
diff --git a/src/test/ui/async-await/multiple-lifetimes/ret-ref.rs b/tests/ui/async-await/multiple-lifetimes/ret-ref.rs
index 149c020f9..149c020f9 100644
--- a/src/test/ui/async-await/multiple-lifetimes/ret-ref.rs
+++ b/tests/ui/async-await/multiple-lifetimes/ret-ref.rs
diff --git a/src/test/ui/async-await/multiple-lifetimes/ret-ref.stderr b/tests/ui/async-await/multiple-lifetimes/ret-ref.stderr
index d86e84033..d86e84033 100644
--- a/src/test/ui/async-await/multiple-lifetimes/ret-ref.stderr
+++ b/tests/ui/async-await/multiple-lifetimes/ret-ref.stderr
diff --git a/src/test/ui/async-await/multiple-lifetimes/variance.rs b/tests/ui/async-await/multiple-lifetimes/variance.rs
index 6ed8bef95..6ed8bef95 100644
--- a/src/test/ui/async-await/multiple-lifetimes/variance.rs
+++ b/tests/ui/async-await/multiple-lifetimes/variance.rs
diff --git a/src/test/ui/async-await/mutually-recursive-async-impl-trait-type.rs b/tests/ui/async-await/mutually-recursive-async-impl-trait-type.rs
index bb2a61f03..bb2a61f03 100644
--- a/src/test/ui/async-await/mutually-recursive-async-impl-trait-type.rs
+++ b/tests/ui/async-await/mutually-recursive-async-impl-trait-type.rs
diff --git a/src/test/ui/async-await/mutually-recursive-async-impl-trait-type.stderr b/tests/ui/async-await/mutually-recursive-async-impl-trait-type.stderr
index f789ad2a0..f789ad2a0 100644
--- a/src/test/ui/async-await/mutually-recursive-async-impl-trait-type.stderr
+++ b/tests/ui/async-await/mutually-recursive-async-impl-trait-type.stderr
diff --git a/src/test/ui/async-await/nested-in-impl.rs b/tests/ui/async-await/nested-in-impl.rs
index 76ed827d5..76ed827d5 100644
--- a/src/test/ui/async-await/nested-in-impl.rs
+++ b/tests/ui/async-await/nested-in-impl.rs
diff --git a/src/test/ui/async-await/no-async-const.rs b/tests/ui/async-await/no-async-const.rs
index 963460c11..963460c11 100644
--- a/src/test/ui/async-await/no-async-const.rs
+++ b/tests/ui/async-await/no-async-const.rs
diff --git a/src/test/ui/async-await/no-async-const.stderr b/tests/ui/async-await/no-async-const.stderr
index a51dc88a4..a51dc88a4 100644
--- a/src/test/ui/async-await/no-async-const.stderr
+++ b/tests/ui/async-await/no-async-const.stderr
diff --git a/src/test/ui/async-await/no-const-async.rs b/tests/ui/async-await/no-const-async.rs
index cfb0ef1b3..cfb0ef1b3 100644
--- a/src/test/ui/async-await/no-const-async.rs
+++ b/tests/ui/async-await/no-const-async.rs
diff --git a/src/test/ui/async-await/no-const-async.stderr b/tests/ui/async-await/no-const-async.stderr
index c5bd520aa..c5bd520aa 100644
--- a/src/test/ui/async-await/no-const-async.stderr
+++ b/tests/ui/async-await/no-const-async.stderr
diff --git a/src/test/ui/async-await/no-move-across-await-struct.rs b/tests/ui/async-await/no-move-across-await-struct.rs
index 51c9a42b3..51c9a42b3 100644
--- a/src/test/ui/async-await/no-move-across-await-struct.rs
+++ b/tests/ui/async-await/no-move-across-await-struct.rs
diff --git a/src/test/ui/async-await/no-move-across-await-struct.stderr b/tests/ui/async-await/no-move-across-await-struct.stderr
index 4eaed1cf1..4eaed1cf1 100644
--- a/src/test/ui/async-await/no-move-across-await-struct.stderr
+++ b/tests/ui/async-await/no-move-across-await-struct.stderr
diff --git a/src/test/ui/async-await/no-move-across-await-tuple.rs b/tests/ui/async-await/no-move-across-await-tuple.rs
index a65633269..a65633269 100644
--- a/src/test/ui/async-await/no-move-across-await-tuple.rs
+++ b/tests/ui/async-await/no-move-across-await-tuple.rs
diff --git a/src/test/ui/async-await/no-move-across-await-tuple.stderr b/tests/ui/async-await/no-move-across-await-tuple.stderr
index d750df991..d750df991 100644
--- a/src/test/ui/async-await/no-move-across-await-tuple.stderr
+++ b/tests/ui/async-await/no-move-across-await-tuple.stderr
diff --git a/src/test/ui/async-await/no-non-guaranteed-initialization.rs b/tests/ui/async-await/no-non-guaranteed-initialization.rs
index c4d81bf83..c4d81bf83 100644
--- a/src/test/ui/async-await/no-non-guaranteed-initialization.rs
+++ b/tests/ui/async-await/no-non-guaranteed-initialization.rs
diff --git a/src/test/ui/async-await/no-non-guaranteed-initialization.stderr b/tests/ui/async-await/no-non-guaranteed-initialization.stderr
index 12c15bf56..12c15bf56 100644
--- a/src/test/ui/async-await/no-non-guaranteed-initialization.stderr
+++ b/tests/ui/async-await/no-non-guaranteed-initialization.stderr
diff --git a/src/test/ui/async-await/no-params-non-move-async-closure.rs b/tests/ui/async-await/no-params-non-move-async-closure.rs
index 3b15f35c2..3b15f35c2 100644
--- a/src/test/ui/async-await/no-params-non-move-async-closure.rs
+++ b/tests/ui/async-await/no-params-non-move-async-closure.rs
diff --git a/src/test/ui/async-await/no-params-non-move-async-closure.stderr b/tests/ui/async-await/no-params-non-move-async-closure.stderr
index 1f589c516..1f589c516 100644
--- a/src/test/ui/async-await/no-params-non-move-async-closure.stderr
+++ b/tests/ui/async-await/no-params-non-move-async-closure.stderr
diff --git a/src/test/ui/async-await/no-std.rs b/tests/ui/async-await/no-std.rs
index 63e93cdff..63e93cdff 100644
--- a/src/test/ui/async-await/no-std.rs
+++ b/tests/ui/async-await/no-std.rs
diff --git a/src/test/ui/async-await/no-unsafe-async.rs b/tests/ui/async-await/no-unsafe-async.rs
index f40154e16..f40154e16 100644
--- a/src/test/ui/async-await/no-unsafe-async.rs
+++ b/tests/ui/async-await/no-unsafe-async.rs
diff --git a/src/test/ui/async-await/no-unsafe-async.stderr b/tests/ui/async-await/no-unsafe-async.stderr
index f23d17d6b..f23d17d6b 100644
--- a/src/test/ui/async-await/no-unsafe-async.stderr
+++ b/tests/ui/async-await/no-unsafe-async.stderr
diff --git a/src/test/ui/async-await/non-trivial-drop.rs b/tests/ui/async-await/non-trivial-drop.rs
index a3167215d..a3167215d 100644
--- a/src/test/ui/async-await/non-trivial-drop.rs
+++ b/tests/ui/async-await/non-trivial-drop.rs
diff --git a/src/test/ui/async-await/partial-drop-partial-reinit.drop_tracking.stderr b/tests/ui/async-await/partial-drop-partial-reinit.drop_tracking.stderr
index 17b4ef7bd..17b4ef7bd 100644
--- a/src/test/ui/async-await/partial-drop-partial-reinit.drop_tracking.stderr
+++ b/tests/ui/async-await/partial-drop-partial-reinit.drop_tracking.stderr
diff --git a/src/test/ui/async-await/partial-drop-partial-reinit.no_drop_tracking.stderr b/tests/ui/async-await/partial-drop-partial-reinit.no_drop_tracking.stderr
index 34d8a159f..34d8a159f 100644
--- a/src/test/ui/async-await/partial-drop-partial-reinit.no_drop_tracking.stderr
+++ b/tests/ui/async-await/partial-drop-partial-reinit.no_drop_tracking.stderr
diff --git a/src/test/ui/async-await/partial-drop-partial-reinit.rs b/tests/ui/async-await/partial-drop-partial-reinit.rs
index 7d097e72f..7d097e72f 100644
--- a/src/test/ui/async-await/partial-drop-partial-reinit.rs
+++ b/tests/ui/async-await/partial-drop-partial-reinit.rs
diff --git a/src/test/ui/async-await/partial-initialization-across-await.rs b/tests/ui/async-await/partial-initialization-across-await.rs
index 7577aee3f..7577aee3f 100644
--- a/src/test/ui/async-await/partial-initialization-across-await.rs
+++ b/tests/ui/async-await/partial-initialization-across-await.rs
diff --git a/src/test/ui/async-await/partial-initialization-across-await.stderr b/tests/ui/async-await/partial-initialization-across-await.stderr
index 6a0eeffb9..6a0eeffb9 100644
--- a/src/test/ui/async-await/partial-initialization-across-await.stderr
+++ b/tests/ui/async-await/partial-initialization-across-await.stderr
diff --git a/src/test/ui/async-await/pin-needed-to-poll-2.rs b/tests/ui/async-await/pin-needed-to-poll-2.rs
index 6ce70336d..6ce70336d 100644
--- a/src/test/ui/async-await/pin-needed-to-poll-2.rs
+++ b/tests/ui/async-await/pin-needed-to-poll-2.rs
diff --git a/src/test/ui/async-await/pin-needed-to-poll-2.stderr b/tests/ui/async-await/pin-needed-to-poll-2.stderr
index 83d1a02c8..0a6f705e2 100644
--- a/src/test/ui/async-await/pin-needed-to-poll-2.stderr
+++ b/tests/ui/async-await/pin-needed-to-poll-2.stderr
@@ -14,9 +14,6 @@ LL | struct Sleep(std::marker::PhantomPinned);
    |        ^^^^^
 note: required by a bound in `Pin::<P>::new`
   --> $SRC_DIR/core/src/pin.rs:LL:COL
-   |
-LL | impl<P: Deref<Target: Unpin>> Pin<P> {
-   |                       ^^^^^ required by this bound in `Pin::<P>::new`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/async-await/pin-needed-to-poll.rs b/tests/ui/async-await/pin-needed-to-poll.rs
index 0d1fe684f..0d1fe684f 100644
--- a/src/test/ui/async-await/pin-needed-to-poll.rs
+++ b/tests/ui/async-await/pin-needed-to-poll.rs
diff --git a/tests/ui/async-await/pin-needed-to-poll.stderr b/tests/ui/async-await/pin-needed-to-poll.stderr
new file mode 100644
index 000000000..b1f4a73aa
--- /dev/null
+++ b/tests/ui/async-await/pin-needed-to-poll.stderr
@@ -0,0 +1,20 @@
+error[E0599]: no method named `poll` found for struct `Sleep` in the current scope
+  --> $DIR/pin-needed-to-poll.rs:42:20
+   |
+LL | struct Sleep;
+   | ------------ method `poll` not found for this struct
+...
+LL |         self.sleep.poll(cx)
+   |                    ^^^^ method not found in `Sleep`
+  --> $SRC_DIR/core/src/future/future.rs:LL:COL
+   |
+   = note: the method is available for `Pin<&mut Sleep>` here
+   |
+help: consider wrapping the receiver expression with the appropriate type
+   |
+LL |         Pin::new(&mut self.sleep).poll(cx)
+   |         +++++++++++++           +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/async-await/proper-span-for-type-error.fixed b/tests/ui/async-await/proper-span-for-type-error.fixed
index 7d43b575d..7d43b575d 100644
--- a/src/test/ui/async-await/proper-span-for-type-error.fixed
+++ b/tests/ui/async-await/proper-span-for-type-error.fixed
diff --git a/src/test/ui/async-await/proper-span-for-type-error.rs b/tests/ui/async-await/proper-span-for-type-error.rs
index 00ccde1bf..00ccde1bf 100644
--- a/src/test/ui/async-await/proper-span-for-type-error.rs
+++ b/tests/ui/async-await/proper-span-for-type-error.rs
diff --git a/src/test/ui/async-await/proper-span-for-type-error.stderr b/tests/ui/async-await/proper-span-for-type-error.stderr
index 25f05156c..25f05156c 100644
--- a/src/test/ui/async-await/proper-span-for-type-error.stderr
+++ b/tests/ui/async-await/proper-span-for-type-error.stderr
diff --git a/src/test/ui/async-await/recursive-async-impl-trait-type.rs b/tests/ui/async-await/recursive-async-impl-trait-type.rs
index edc4cb8ac..edc4cb8ac 100644
--- a/src/test/ui/async-await/recursive-async-impl-trait-type.rs
+++ b/tests/ui/async-await/recursive-async-impl-trait-type.rs
diff --git a/src/test/ui/async-await/recursive-async-impl-trait-type.stderr b/tests/ui/async-await/recursive-async-impl-trait-type.stderr
index 63f64f445..63f64f445 100644
--- a/src/test/ui/async-await/recursive-async-impl-trait-type.stderr
+++ b/tests/ui/async-await/recursive-async-impl-trait-type.stderr
diff --git a/src/test/ui/async-await/repeat_count_const_in_async_fn.rs b/tests/ui/async-await/repeat_count_const_in_async_fn.rs
index ebabc3fbf..ebabc3fbf 100644
--- a/src/test/ui/async-await/repeat_count_const_in_async_fn.rs
+++ b/tests/ui/async-await/repeat_count_const_in_async_fn.rs
diff --git a/src/test/ui/async-await/return-ty-raw-ptr-coercion.rs b/tests/ui/async-await/return-ty-raw-ptr-coercion.rs
index 9fe0869ca..9fe0869ca 100644
--- a/src/test/ui/async-await/return-ty-raw-ptr-coercion.rs
+++ b/tests/ui/async-await/return-ty-raw-ptr-coercion.rs
diff --git a/src/test/ui/async-await/return-ty-unsize-coercion.rs b/tests/ui/async-await/return-ty-unsize-coercion.rs
index 93832ef7e..93832ef7e 100644
--- a/src/test/ui/async-await/return-ty-unsize-coercion.rs
+++ b/tests/ui/async-await/return-ty-unsize-coercion.rs
diff --git a/src/test/ui/async-await/suggest-missing-await-closure.fixed b/tests/ui/async-await/suggest-missing-await-closure.fixed
index febcd0218..febcd0218 100644
--- a/src/test/ui/async-await/suggest-missing-await-closure.fixed
+++ b/tests/ui/async-await/suggest-missing-await-closure.fixed
diff --git a/src/test/ui/async-await/suggest-missing-await-closure.rs b/tests/ui/async-await/suggest-missing-await-closure.rs
index faabf6ee3..faabf6ee3 100644
--- a/src/test/ui/async-await/suggest-missing-await-closure.rs
+++ b/tests/ui/async-await/suggest-missing-await-closure.rs
diff --git a/src/test/ui/async-await/suggest-missing-await-closure.stderr b/tests/ui/async-await/suggest-missing-await-closure.stderr
index a5958baff..a5958baff 100644
--- a/src/test/ui/async-await/suggest-missing-await-closure.stderr
+++ b/tests/ui/async-await/suggest-missing-await-closure.stderr
diff --git a/src/test/ui/async-await/suggest-missing-await.rs b/tests/ui/async-await/suggest-missing-await.rs
index 796f82e77..796f82e77 100644
--- a/src/test/ui/async-await/suggest-missing-await.rs
+++ b/tests/ui/async-await/suggest-missing-await.rs
diff --git a/src/test/ui/async-await/suggest-missing-await.stderr b/tests/ui/async-await/suggest-missing-await.stderr
index 1196601ac..1196601ac 100644
--- a/src/test/ui/async-await/suggest-missing-await.stderr
+++ b/tests/ui/async-await/suggest-missing-await.stderr
diff --git a/src/test/ui/async-await/suggest-switching-edition-on-await-cargo.rs b/tests/ui/async-await/suggest-switching-edition-on-await-cargo.rs
index 4919e0a05..4919e0a05 100644
--- a/src/test/ui/async-await/suggest-switching-edition-on-await-cargo.rs
+++ b/tests/ui/async-await/suggest-switching-edition-on-await-cargo.rs
diff --git a/src/test/ui/async-await/suggest-switching-edition-on-await-cargo.stderr b/tests/ui/async-await/suggest-switching-edition-on-await-cargo.stderr
index 409eb179e..409eb179e 100644
--- a/src/test/ui/async-await/suggest-switching-edition-on-await-cargo.stderr
+++ b/tests/ui/async-await/suggest-switching-edition-on-await-cargo.stderr
diff --git a/src/test/ui/async-await/suggest-switching-edition-on-await.rs b/tests/ui/async-await/suggest-switching-edition-on-await.rs
index 9852e8fc9..9852e8fc9 100644
--- a/src/test/ui/async-await/suggest-switching-edition-on-await.rs
+++ b/tests/ui/async-await/suggest-switching-edition-on-await.rs
diff --git a/src/test/ui/async-await/suggest-switching-edition-on-await.stderr b/tests/ui/async-await/suggest-switching-edition-on-await.stderr
index ef3334381..ef3334381 100644
--- a/src/test/ui/async-await/suggest-switching-edition-on-await.stderr
+++ b/tests/ui/async-await/suggest-switching-edition-on-await.stderr
diff --git a/tests/ui/async-await/track-caller/async-block.rs b/tests/ui/async-await/track-caller/async-block.rs
new file mode 100644
index 000000000..8e81387c3
--- /dev/null
+++ b/tests/ui/async-await/track-caller/async-block.rs
@@ -0,0 +1,9 @@
+// edition:2021
+
+#![feature(closure_track_caller, stmt_expr_attributes)]
+
+fn main() {
+    let _ = #[track_caller] async {
+        //~^ ERROR attribute should be applied to a function definition [E0739]
+    };
+}
diff --git a/tests/ui/async-await/track-caller/async-block.stderr b/tests/ui/async-await/track-caller/async-block.stderr
new file mode 100644
index 000000000..407439921
--- /dev/null
+++ b/tests/ui/async-await/track-caller/async-block.stderr
@@ -0,0 +1,12 @@
+error[E0739]: attribute should be applied to a function definition
+  --> $DIR/async-block.rs:6:13
+   |
+LL |       let _ = #[track_caller] async {
+   |  _____________^^^^^^^^^^^^^^^_-
+LL | |
+LL | |     };
+   | |_____- not a function definition
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0739`.
diff --git a/src/test/ui/async-await/track-caller/async-closure-gate.rs b/tests/ui/async-await/track-caller/async-closure-gate.rs
index d9d556855..d9d556855 100644
--- a/src/test/ui/async-await/track-caller/async-closure-gate.rs
+++ b/tests/ui/async-await/track-caller/async-closure-gate.rs
diff --git a/src/test/ui/async-await/track-caller/async-closure-gate.stderr b/tests/ui/async-await/track-caller/async-closure-gate.stderr
index 498f1b43b..498f1b43b 100644
--- a/src/test/ui/async-await/track-caller/async-closure-gate.stderr
+++ b/tests/ui/async-await/track-caller/async-closure-gate.stderr
diff --git a/src/test/ui/async-await/track-caller/issue-105134.rs b/tests/ui/async-await/track-caller/issue-105134.rs
index 4e52b8e25..4e52b8e25 100644
--- a/src/test/ui/async-await/track-caller/issue-105134.rs
+++ b/tests/ui/async-await/track-caller/issue-105134.rs
diff --git a/src/test/ui/async-await/track-caller/panic-track-caller.nofeat.stderr b/tests/ui/async-await/track-caller/panic-track-caller.nofeat.stderr
index 51ea225f4..51ea225f4 100644
--- a/src/test/ui/async-await/track-caller/panic-track-caller.nofeat.stderr
+++ b/tests/ui/async-await/track-caller/panic-track-caller.nofeat.stderr
diff --git a/src/test/ui/async-await/track-caller/panic-track-caller.rs b/tests/ui/async-await/track-caller/panic-track-caller.rs
index 118361d6c..f45243b0e 100644
--- a/src/test/ui/async-await/track-caller/panic-track-caller.rs
+++ b/tests/ui/async-await/track-caller/panic-track-caller.rs
@@ -69,6 +69,16 @@ async fn foo_assoc() {
     Foo::bar_assoc().await
 }
 
+// Since compilation is expected to fail for this fn when using
+// `nofeat`, we test that separately in `async-closure-gate.rs`
+#[cfg(feat)]
+async fn foo_closure() {
+    let c = #[track_caller] async || {
+        panic!();
+    };
+    c().await
+}
+
 fn panicked_at(f: impl FnOnce() + panic::UnwindSafe) -> u32 {
     let loc = Arc::new(Mutex::new(None));
 
@@ -97,4 +107,7 @@ fn main() {
     assert_eq!(panicked_at(|| block_on(foo_assoc())), 69);
     #[cfg(nofeat)]
     assert_eq!(panicked_at(|| block_on(foo_assoc())), 64);
+
+    #[cfg(feat)]
+    assert_eq!(panicked_at(|| block_on(foo_closure())), 79);
 }
diff --git a/src/test/ui/async-await/try-on-option-in-async.rs b/tests/ui/async-await/try-on-option-in-async.rs
index afaaed2ef..afaaed2ef 100644
--- a/src/test/ui/async-await/try-on-option-in-async.rs
+++ b/tests/ui/async-await/try-on-option-in-async.rs
diff --git a/src/test/ui/async-await/try-on-option-in-async.stderr b/tests/ui/async-await/try-on-option-in-async.stderr
index 4c7b4fa41..4c7b4fa41 100644
--- a/src/test/ui/async-await/try-on-option-in-async.stderr
+++ b/tests/ui/async-await/try-on-option-in-async.stderr
diff --git a/src/test/ui/async-await/type-parameter-send.rs b/tests/ui/async-await/type-parameter-send.rs
index ab2b62aa5..ab2b62aa5 100644
--- a/src/test/ui/async-await/type-parameter-send.rs
+++ b/tests/ui/async-await/type-parameter-send.rs
diff --git a/src/test/ui/async-await/unnecessary-await.rs b/tests/ui/async-await/unnecessary-await.rs
index 24673777b..24673777b 100644
--- a/src/test/ui/async-await/unnecessary-await.rs
+++ b/tests/ui/async-await/unnecessary-await.rs
diff --git a/src/test/ui/async-await/unnecessary-await.stderr b/tests/ui/async-await/unnecessary-await.stderr
index dc3089336..dc3089336 100644
--- a/src/test/ui/async-await/unnecessary-await.stderr
+++ b/tests/ui/async-await/unnecessary-await.stderr
diff --git a/src/test/ui/async-await/unreachable-lint-1.rs b/tests/ui/async-await/unreachable-lint-1.rs
index d63d643c4..d63d643c4 100644
--- a/src/test/ui/async-await/unreachable-lint-1.rs
+++ b/tests/ui/async-await/unreachable-lint-1.rs
diff --git a/src/test/ui/async-await/unreachable-lint-1.stderr b/tests/ui/async-await/unreachable-lint-1.stderr
index e93257889..e93257889 100644
--- a/src/test/ui/async-await/unreachable-lint-1.stderr
+++ b/tests/ui/async-await/unreachable-lint-1.stderr
diff --git a/src/test/ui/async-await/unreachable-lint.rs b/tests/ui/async-await/unreachable-lint.rs
index ca18cfde4..ca18cfde4 100644
--- a/src/test/ui/async-await/unreachable-lint.rs
+++ b/tests/ui/async-await/unreachable-lint.rs
diff --git a/src/test/ui/async-await/unresolved_type_param.rs b/tests/ui/async-await/unresolved_type_param.rs
index 6d6d80614..6d6d80614 100644
--- a/src/test/ui/async-await/unresolved_type_param.rs
+++ b/tests/ui/async-await/unresolved_type_param.rs
diff --git a/src/test/ui/async-await/unresolved_type_param.stderr b/tests/ui/async-await/unresolved_type_param.stderr
index 7236c681f..7236c681f 100644
--- a/src/test/ui/async-await/unresolved_type_param.stderr
+++ b/tests/ui/async-await/unresolved_type_param.stderr
diff --git a/src/test/ui/async-await/unused-lifetime.rs b/tests/ui/async-await/unused-lifetime.rs
index 6cfd36ba9..6cfd36ba9 100644
--- a/src/test/ui/async-await/unused-lifetime.rs
+++ b/tests/ui/async-await/unused-lifetime.rs
diff --git a/src/test/ui/async-await/unused-lifetime.stderr b/tests/ui/async-await/unused-lifetime.stderr
index 5c00501a6..5c00501a6 100644
--- a/src/test/ui/async-await/unused-lifetime.stderr
+++ b/tests/ui/async-await/unused-lifetime.stderr
diff --git a/src/test/ui/atomic-from-mut-not-available.rs b/tests/ui/atomic-from-mut-not-available.rs
index bf9461600..bf9461600 100644
--- a/src/test/ui/atomic-from-mut-not-available.rs
+++ b/tests/ui/atomic-from-mut-not-available.rs
diff --git a/src/test/ui/atomic-from-mut-not-available.stderr b/tests/ui/atomic-from-mut-not-available.stderr
index d1ebca8a2..d1ebca8a2 100644
--- a/src/test/ui/atomic-from-mut-not-available.stderr
+++ b/tests/ui/atomic-from-mut-not-available.stderr
diff --git a/src/test/ui/attempted-access-non-fatal.rs b/tests/ui/attempted-access-non-fatal.rs
index 15deb9e2f..15deb9e2f 100644
--- a/src/test/ui/attempted-access-non-fatal.rs
+++ b/tests/ui/attempted-access-non-fatal.rs
diff --git a/src/test/ui/attempted-access-non-fatal.stderr b/tests/ui/attempted-access-non-fatal.stderr
index bff669727..bff669727 100644
--- a/src/test/ui/attempted-access-non-fatal.stderr
+++ b/tests/ui/attempted-access-non-fatal.stderr
diff --git a/src/test/ui/attr-bad-crate-attr.rc b/tests/ui/attr-bad-crate-attr.rc
index 89ba26dfd..89ba26dfd 100644
--- a/src/test/ui/attr-bad-crate-attr.rc
+++ b/tests/ui/attr-bad-crate-attr.rc
diff --git a/src/test/ui/attr-shebang.rs b/tests/ui/attr-shebang.rs
index 3b0dc096f..3b0dc096f 100644
--- a/src/test/ui/attr-shebang.rs
+++ b/tests/ui/attr-shebang.rs
diff --git a/src/test/ui/attr-start.rs b/tests/ui/attr-start.rs
index 677763148..677763148 100644
--- a/src/test/ui/attr-start.rs
+++ b/tests/ui/attr-start.rs
diff --git a/src/test/ui/attr-usage-inline.rs b/tests/ui/attr-usage-inline.rs
index 674c12454..674c12454 100644
--- a/src/test/ui/attr-usage-inline.rs
+++ b/tests/ui/attr-usage-inline.rs
diff --git a/src/test/ui/attr-usage-inline.stderr b/tests/ui/attr-usage-inline.stderr
index 22a0bf47e..22a0bf47e 100644
--- a/src/test/ui/attr-usage-inline.stderr
+++ b/tests/ui/attr-usage-inline.stderr
diff --git a/src/test/ui/attributes/attr-before-view-item.rs b/tests/ui/attributes/attr-before-view-item.rs
index e1588aada..e1588aada 100644
--- a/src/test/ui/attributes/attr-before-view-item.rs
+++ b/tests/ui/attributes/attr-before-view-item.rs
diff --git a/src/test/ui/attributes/attr-before-view-item2.rs b/tests/ui/attributes/attr-before-view-item2.rs
index c1f667372..c1f667372 100644
--- a/src/test/ui/attributes/attr-before-view-item2.rs
+++ b/tests/ui/attributes/attr-before-view-item2.rs
diff --git a/src/test/ui/attributes/attr-eq-token-tree.rs b/tests/ui/attributes/attr-eq-token-tree.rs
index 330b11977..330b11977 100644
--- a/src/test/ui/attributes/attr-eq-token-tree.rs
+++ b/tests/ui/attributes/attr-eq-token-tree.rs
diff --git a/src/test/ui/attributes/attr-eq-token-tree.stderr b/tests/ui/attributes/attr-eq-token-tree.stderr
index 1846444b6..1846444b6 100644
--- a/src/test/ui/attributes/attr-eq-token-tree.stderr
+++ b/tests/ui/attributes/attr-eq-token-tree.stderr
diff --git a/src/test/ui/attributes/attr-mix-new.rs b/tests/ui/attributes/attr-mix-new.rs
index 8119df0c4..8119df0c4 100644
--- a/src/test/ui/attributes/attr-mix-new.rs
+++ b/tests/ui/attributes/attr-mix-new.rs
diff --git a/src/test/ui/attributes/attrs-on-params.rs b/tests/ui/attributes/attrs-on-params.rs
index 158a4500b..158a4500b 100644
--- a/src/test/ui/attributes/attrs-on-params.rs
+++ b/tests/ui/attributes/attrs-on-params.rs
diff --git a/src/test/ui/attributes/attrs-on-params.stderr b/tests/ui/attributes/attrs-on-params.stderr
index 306e862cb..306e862cb 100644
--- a/src/test/ui/attributes/attrs-on-params.stderr
+++ b/tests/ui/attributes/attrs-on-params.stderr
diff --git a/src/test/ui/attributes/attrs-with-no-formal-in-generics-1.rs b/tests/ui/attributes/attrs-with-no-formal-in-generics-1.rs
index df9c8d894..df9c8d894 100644
--- a/src/test/ui/attributes/attrs-with-no-formal-in-generics-1.rs
+++ b/tests/ui/attributes/attrs-with-no-formal-in-generics-1.rs
diff --git a/src/test/ui/attributes/attrs-with-no-formal-in-generics-1.stderr b/tests/ui/attributes/attrs-with-no-formal-in-generics-1.stderr
index 5b4f5222a..5b4f5222a 100644
--- a/src/test/ui/attributes/attrs-with-no-formal-in-generics-1.stderr
+++ b/tests/ui/attributes/attrs-with-no-formal-in-generics-1.stderr
diff --git a/src/test/ui/attributes/attrs-with-no-formal-in-generics-2.rs b/tests/ui/attributes/attrs-with-no-formal-in-generics-2.rs
index d1d044035..d1d044035 100644
--- a/src/test/ui/attributes/attrs-with-no-formal-in-generics-2.rs
+++ b/tests/ui/attributes/attrs-with-no-formal-in-generics-2.rs
diff --git a/src/test/ui/attributes/attrs-with-no-formal-in-generics-2.stderr b/tests/ui/attributes/attrs-with-no-formal-in-generics-2.stderr
index fce3ff7de..fce3ff7de 100644
--- a/src/test/ui/attributes/attrs-with-no-formal-in-generics-2.stderr
+++ b/tests/ui/attributes/attrs-with-no-formal-in-generics-2.stderr
diff --git a/src/test/ui/attributes/attrs-with-no-formal-in-generics-3.rs b/tests/ui/attributes/attrs-with-no-formal-in-generics-3.rs
index 3cfc70b41..3cfc70b41 100644
--- a/src/test/ui/attributes/attrs-with-no-formal-in-generics-3.rs
+++ b/tests/ui/attributes/attrs-with-no-formal-in-generics-3.rs
diff --git a/src/test/ui/attributes/attrs-with-no-formal-in-generics-3.stderr b/tests/ui/attributes/attrs-with-no-formal-in-generics-3.stderr
index b9ca00974..b9ca00974 100644
--- a/src/test/ui/attributes/attrs-with-no-formal-in-generics-3.stderr
+++ b/tests/ui/attributes/attrs-with-no-formal-in-generics-3.stderr
diff --git a/src/test/ui/attributes/auxiliary/key-value-expansion.rs b/tests/ui/attributes/auxiliary/key-value-expansion.rs
index b4eb80bb5..b4eb80bb5 100644
--- a/src/test/ui/attributes/auxiliary/key-value-expansion.rs
+++ b/tests/ui/attributes/auxiliary/key-value-expansion.rs
diff --git a/src/test/ui/attributes/class-attributes-1.rs b/tests/ui/attributes/class-attributes-1.rs
index 027b701e5..027b701e5 100644
--- a/src/test/ui/attributes/class-attributes-1.rs
+++ b/tests/ui/attributes/class-attributes-1.rs
diff --git a/src/test/ui/attributes/class-attributes-2.rs b/tests/ui/attributes/class-attributes-2.rs
index 6aba6b894..6aba6b894 100644
--- a/src/test/ui/attributes/class-attributes-2.rs
+++ b/tests/ui/attributes/class-attributes-2.rs
diff --git a/src/test/ui/attributes/collapse-debuginfo-invalid.rs b/tests/ui/attributes/collapse-debuginfo-invalid.rs
index 42d8982c1..42d8982c1 100644
--- a/src/test/ui/attributes/collapse-debuginfo-invalid.rs
+++ b/tests/ui/attributes/collapse-debuginfo-invalid.rs
diff --git a/src/test/ui/attributes/collapse-debuginfo-invalid.stderr b/tests/ui/attributes/collapse-debuginfo-invalid.stderr
index 01c476091..01c476091 100644
--- a/src/test/ui/attributes/collapse-debuginfo-invalid.stderr
+++ b/tests/ui/attributes/collapse-debuginfo-invalid.stderr
diff --git a/src/test/ui/attributes/const-stability-on-macro.rs b/tests/ui/attributes/const-stability-on-macro.rs
index 412af195d..412af195d 100644
--- a/src/test/ui/attributes/const-stability-on-macro.rs
+++ b/tests/ui/attributes/const-stability-on-macro.rs
diff --git a/src/test/ui/attributes/const-stability-on-macro.stderr b/tests/ui/attributes/const-stability-on-macro.stderr
index c3da02c79..c3da02c79 100644
--- a/src/test/ui/attributes/const-stability-on-macro.stderr
+++ b/tests/ui/attributes/const-stability-on-macro.stderr
diff --git a/src/test/ui/attributes/doc-attr.rs b/tests/ui/attributes/doc-attr.rs
index 980d1c0e2..980d1c0e2 100644
--- a/src/test/ui/attributes/doc-attr.rs
+++ b/tests/ui/attributes/doc-attr.rs
diff --git a/src/test/ui/attributes/doc-attr.stderr b/tests/ui/attributes/doc-attr.stderr
index 68df2771f..68df2771f 100644
--- a/src/test/ui/attributes/doc-attr.stderr
+++ b/tests/ui/attributes/doc-attr.stderr
diff --git a/src/test/ui/attributes/duplicated-attributes.rs b/tests/ui/attributes/duplicated-attributes.rs
index 84a5abcf8..84a5abcf8 100644
--- a/src/test/ui/attributes/duplicated-attributes.rs
+++ b/tests/ui/attributes/duplicated-attributes.rs
diff --git a/src/test/ui/attributes/duplicated-attributes.stderr b/tests/ui/attributes/duplicated-attributes.stderr
index 735d950b2..735d950b2 100644
--- a/src/test/ui/attributes/duplicated-attributes.stderr
+++ b/tests/ui/attributes/duplicated-attributes.stderr
diff --git a/src/test/ui/attributes/extented-attribute-macro-error.rs b/tests/ui/attributes/extented-attribute-macro-error.rs
index 492f84f56..492f84f56 100644
--- a/src/test/ui/attributes/extented-attribute-macro-error.rs
+++ b/tests/ui/attributes/extented-attribute-macro-error.rs
diff --git a/src/test/ui/attributes/extented-attribute-macro-error.stderr b/tests/ui/attributes/extented-attribute-macro-error.stderr
index 0fcde9b7c..0fcde9b7c 100644
--- a/src/test/ui/attributes/extented-attribute-macro-error.stderr
+++ b/tests/ui/attributes/extented-attribute-macro-error.stderr
diff --git a/src/test/ui/attributes/field-attributes-vis-unresolved.rs b/tests/ui/attributes/field-attributes-vis-unresolved.rs
index d1bd2a1e7..d1bd2a1e7 100644
--- a/src/test/ui/attributes/field-attributes-vis-unresolved.rs
+++ b/tests/ui/attributes/field-attributes-vis-unresolved.rs
diff --git a/src/test/ui/attributes/field-attributes-vis-unresolved.stderr b/tests/ui/attributes/field-attributes-vis-unresolved.stderr
index 439762546..439762546 100644
--- a/src/test/ui/attributes/field-attributes-vis-unresolved.stderr
+++ b/tests/ui/attributes/field-attributes-vis-unresolved.stderr
diff --git a/src/test/ui/attributes/invalid-doc-attr.rs b/tests/ui/attributes/invalid-doc-attr.rs
index de004b41e..de004b41e 100644
--- a/src/test/ui/attributes/invalid-doc-attr.rs
+++ b/tests/ui/attributes/invalid-doc-attr.rs
diff --git a/src/test/ui/attributes/invalid-doc-attr.stderr b/tests/ui/attributes/invalid-doc-attr.stderr
index 3c66e587b..3c66e587b 100644
--- a/src/test/ui/attributes/invalid-doc-attr.stderr
+++ b/tests/ui/attributes/invalid-doc-attr.stderr
diff --git a/src/test/ui/attributes/issue-100631.rs b/tests/ui/attributes/issue-100631.rs
index 0fefcf83f..0fefcf83f 100644
--- a/src/test/ui/attributes/issue-100631.rs
+++ b/tests/ui/attributes/issue-100631.rs
diff --git a/src/test/ui/attributes/issue-100631.stderr b/tests/ui/attributes/issue-100631.stderr
index caa5351dd..caa5351dd 100644
--- a/src/test/ui/attributes/issue-100631.stderr
+++ b/tests/ui/attributes/issue-100631.stderr
diff --git a/tests/ui/attributes/issue-105594-invalid-attr-validation.rs b/tests/ui/attributes/issue-105594-invalid-attr-validation.rs
new file mode 100644
index 000000000..6c68e6b04
--- /dev/null
+++ b/tests/ui/attributes/issue-105594-invalid-attr-validation.rs
@@ -0,0 +1,13 @@
+// This checks that the attribute validation ICE in issue #105594 doesn't
+// recur.
+//
+// ignore-thumbv8m.base
+#![feature(cmse_nonsecure_entry)]
+
+fn main() {}
+
+#[track_caller] //~ ERROR attribute should be applied to a function
+static _A: () = ();
+
+#[cmse_nonsecure_entry] //~ ERROR attribute should be applied to a function
+static _B: () = (); //~| ERROR #[cmse_nonsecure_entry]` is only valid for targets
diff --git a/tests/ui/attributes/issue-105594-invalid-attr-validation.stderr b/tests/ui/attributes/issue-105594-invalid-attr-validation.stderr
new file mode 100644
index 000000000..c6b2d6e78
--- /dev/null
+++ b/tests/ui/attributes/issue-105594-invalid-attr-validation.stderr
@@ -0,0 +1,26 @@
+error[E0739]: attribute should be applied to a function definition
+  --> $DIR/issue-105594-invalid-attr-validation.rs:9:1
+   |
+LL | #[track_caller]
+   | ^^^^^^^^^^^^^^^
+LL | static _A: () = ();
+   | ------------------- not a function definition
+
+error: attribute should be applied to a function definition
+  --> $DIR/issue-105594-invalid-attr-validation.rs:12:1
+   |
+LL | #[cmse_nonsecure_entry]
+   | ^^^^^^^^^^^^^^^^^^^^^^^
+LL | static _B: () = ();
+   | ------------------- not a function definition
+
+error[E0775]: `#[cmse_nonsecure_entry]` is only valid for targets with the TrustZone-M extension
+  --> $DIR/issue-105594-invalid-attr-validation.rs:12:1
+   |
+LL | #[cmse_nonsecure_entry]
+   | ^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0739, E0775.
+For more information about an error, try `rustc --explain E0739`.
diff --git a/src/test/ui/attributes/issue-40962.rs b/tests/ui/attributes/issue-40962.rs
index 7b91c0681..7b91c0681 100644
--- a/src/test/ui/attributes/issue-40962.rs
+++ b/tests/ui/attributes/issue-40962.rs
diff --git a/src/test/ui/attributes/issue-90873.rs b/tests/ui/attributes/issue-90873.rs
index 1411f6174..1411f6174 100644
--- a/src/test/ui/attributes/issue-90873.rs
+++ b/tests/ui/attributes/issue-90873.rs
diff --git a/src/test/ui/attributes/issue-90873.stderr b/tests/ui/attributes/issue-90873.stderr
index 894ec8341..894ec8341 100644
--- a/src/test/ui/attributes/issue-90873.stderr
+++ b/tests/ui/attributes/issue-90873.stderr
diff --git a/src/test/ui/attributes/item-attributes.rs b/tests/ui/attributes/item-attributes.rs
index c6bf6c656..c6bf6c656 100644
--- a/src/test/ui/attributes/item-attributes.rs
+++ b/tests/ui/attributes/item-attributes.rs
diff --git a/src/test/ui/attributes/key-value-expansion-on-mac.rs b/tests/ui/attributes/key-value-expansion-on-mac.rs
index c1d68d8cd..c1d68d8cd 100644
--- a/src/test/ui/attributes/key-value-expansion-on-mac.rs
+++ b/tests/ui/attributes/key-value-expansion-on-mac.rs
diff --git a/src/test/ui/attributes/key-value-expansion-on-mac.stderr b/tests/ui/attributes/key-value-expansion-on-mac.stderr
index 64ab892d9..64ab892d9 100644
--- a/src/test/ui/attributes/key-value-expansion-on-mac.stderr
+++ b/tests/ui/attributes/key-value-expansion-on-mac.stderr
diff --git a/src/test/ui/attributes/key-value-expansion.rs b/tests/ui/attributes/key-value-expansion.rs
index 83d601e5e..83d601e5e 100644
--- a/src/test/ui/attributes/key-value-expansion.rs
+++ b/tests/ui/attributes/key-value-expansion.rs
diff --git a/src/test/ui/attributes/key-value-expansion.stderr b/tests/ui/attributes/key-value-expansion.stderr
index 1b776322a..1b776322a 100644
--- a/src/test/ui/attributes/key-value-expansion.stderr
+++ b/tests/ui/attributes/key-value-expansion.stderr
diff --git a/src/test/ui/attributes/key-value-non-ascii.rs b/tests/ui/attributes/key-value-non-ascii.rs
index e14e2fc05..e14e2fc05 100644
--- a/src/test/ui/attributes/key-value-non-ascii.rs
+++ b/tests/ui/attributes/key-value-non-ascii.rs
diff --git a/src/test/ui/attributes/key-value-non-ascii.stderr b/tests/ui/attributes/key-value-non-ascii.stderr
index 23d482de6..23d482de6 100644
--- a/src/test/ui/attributes/key-value-non-ascii.stderr
+++ b/tests/ui/attributes/key-value-non-ascii.stderr
diff --git a/tests/ui/attributes/log-backtrace.rs b/tests/ui/attributes/log-backtrace.rs
new file mode 100644
index 000000000..3979d2001
--- /dev/null
+++ b/tests/ui/attributes/log-backtrace.rs
@@ -0,0 +1,9 @@
+// run-pass
+//
+// This test makes sure that log-backtrace option doesn't give a compilation error.
+//
+// dont-check-compiler-stdout
+// dont-check-compiler-stderr
+// rustc-env:RUSTC_LOG=info
+// compile-flags: -Zlog-backtrace=rustc_metadata::creader
+fn main() {}
diff --git a/src/test/ui/attributes/main-removed-1.rs b/tests/ui/attributes/main-removed-1.rs
index 0e887469d..0e887469d 100644
--- a/src/test/ui/attributes/main-removed-1.rs
+++ b/tests/ui/attributes/main-removed-1.rs
diff --git a/src/test/ui/attributes/main-removed-1.stderr b/tests/ui/attributes/main-removed-1.stderr
index 2422c5c3b..2422c5c3b 100644
--- a/src/test/ui/attributes/main-removed-1.stderr
+++ b/tests/ui/attributes/main-removed-1.stderr
diff --git a/src/test/ui/attributes/main-removed-2/auxiliary/tokyo.rs b/tests/ui/attributes/main-removed-2/auxiliary/tokyo.rs
index 196b5be2d..196b5be2d 100644
--- a/src/test/ui/attributes/main-removed-2/auxiliary/tokyo.rs
+++ b/tests/ui/attributes/main-removed-2/auxiliary/tokyo.rs
diff --git a/src/test/ui/attributes/main-removed-2/main.rs b/tests/ui/attributes/main-removed-2/main.rs
index e8fecf825..e8fecf825 100644
--- a/src/test/ui/attributes/main-removed-2/main.rs
+++ b/tests/ui/attributes/main-removed-2/main.rs
diff --git a/src/test/ui/attributes/method-attributes.rs b/tests/ui/attributes/method-attributes.rs
index 67439718b..67439718b 100644
--- a/src/test/ui/attributes/method-attributes.rs
+++ b/tests/ui/attributes/method-attributes.rs
diff --git a/src/test/ui/attributes/multiple-invalid.rs b/tests/ui/attributes/multiple-invalid.rs
index ae044eb84..ae044eb84 100644
--- a/src/test/ui/attributes/multiple-invalid.rs
+++ b/tests/ui/attributes/multiple-invalid.rs
diff --git a/src/test/ui/attributes/multiple-invalid.stderr b/tests/ui/attributes/multiple-invalid.stderr
index a8dba0ba3..a8dba0ba3 100644
--- a/src/test/ui/attributes/multiple-invalid.stderr
+++ b/tests/ui/attributes/multiple-invalid.stderr
diff --git a/src/test/ui/attributes/nonterminal-expansion.rs b/tests/ui/attributes/nonterminal-expansion.rs
index 97bf225f0..97bf225f0 100644
--- a/src/test/ui/attributes/nonterminal-expansion.rs
+++ b/tests/ui/attributes/nonterminal-expansion.rs
diff --git a/src/test/ui/attributes/nonterminal-expansion.stderr b/tests/ui/attributes/nonterminal-expansion.stderr
index 52376ac19..52376ac19 100644
--- a/src/test/ui/attributes/nonterminal-expansion.stderr
+++ b/tests/ui/attributes/nonterminal-expansion.stderr
diff --git a/src/test/ui/attributes/obsolete-attr.rs b/tests/ui/attributes/obsolete-attr.rs
index 7019abcaf..7019abcaf 100644
--- a/src/test/ui/attributes/obsolete-attr.rs
+++ b/tests/ui/attributes/obsolete-attr.rs
diff --git a/src/test/ui/attributes/obsolete-attr.stderr b/tests/ui/attributes/obsolete-attr.stderr
index 37c1cd0c9..37c1cd0c9 100644
--- a/src/test/ui/attributes/obsolete-attr.stderr
+++ b/tests/ui/attributes/obsolete-attr.stderr
diff --git a/src/test/ui/attributes/suffixed-literal-meta.rs b/tests/ui/attributes/suffixed-literal-meta.rs
index a6531490c..a6531490c 100644
--- a/src/test/ui/attributes/suffixed-literal-meta.rs
+++ b/tests/ui/attributes/suffixed-literal-meta.rs
diff --git a/src/test/ui/attributes/suffixed-literal-meta.stderr b/tests/ui/attributes/suffixed-literal-meta.stderr
index 5245ffead..5245ffead 100644
--- a/src/test/ui/attributes/suffixed-literal-meta.stderr
+++ b/tests/ui/attributes/suffixed-literal-meta.stderr
diff --git a/src/test/ui/attributes/tool_attributes.rs b/tests/ui/attributes/tool_attributes.rs
index be4a10c0e..be4a10c0e 100644
--- a/src/test/ui/attributes/tool_attributes.rs
+++ b/tests/ui/attributes/tool_attributes.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/auxiliary/sigpipe-utils.rs b/tests/ui/attributes/unix_sigpipe/auxiliary/sigpipe-utils.rs
index 74fbae035..74fbae035 100644
--- a/src/test/ui/attributes/unix_sigpipe/auxiliary/sigpipe-utils.rs
+++ b/tests/ui/attributes/unix_sigpipe/auxiliary/sigpipe-utils.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-crate.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-crate.rs
index d6d020c52..d6d020c52 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-crate.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-crate.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-crate.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-crate.stderr
index a1fb4d678..a1fb4d678 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-crate.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-crate.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.rs
index 294cb3852..294cb3852 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.stderr
index 2362c17a0..2362c17a0 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-error.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-error.rs
index 0a42a5b5e..0a42a5b5e 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-error.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-error.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs
index 4f8648077..4f8648077 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-list.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-list.rs
index b5ebc07a0..b5ebc07a0 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-list.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-list.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-list.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-list.stderr
index 59a87e139..59a87e139 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-list.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-list.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.rs
index cde6719fc..cde6719fc 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.stderr
index c4b81118c..c4b81118c 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.rs
index 16f727639..16f727639 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.stderr
index a04f605ed..a04f605ed 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-not-used.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-not-used.rs
index 100b4ce9f..100b4ce9f 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-not-used.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-not-used.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-only-feature.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-only-feature.rs
index b5adc2e55..b5adc2e55 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-only-feature.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-only-feature.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-rustc_main.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-rustc_main.rs
index 6befb9e95..6befb9e95 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-rustc_main.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-rustc_main.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-sig_dfl.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-sig_dfl.rs
index 238c0d57a..238c0d57a 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-sig_dfl.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-sig_dfl.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-start.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-start.rs
index 64fd5ec4f..64fd5ec4f 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-start.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-start.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-start.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-start.stderr
index 2c9ce479b..2c9ce479b 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-start.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-start.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-struct.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-struct.rs
index a5e47cfeb..a5e47cfeb 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-struct.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-struct.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-struct.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-struct.stderr
index c56ee60bb..c56ee60bb 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-struct.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-struct.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.rs
index 4ec25de00..4ec25de00 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.stderr
index a66e45aa2..a66e45aa2 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe.rs
index 7bf1c7350..7bf1c7350 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe.stderr
index 1b1eda825..1b1eda825 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe.stderr
diff --git a/src/test/ui/attributes/unknown-attr.rs b/tests/ui/attributes/unknown-attr.rs
index 70fef04e9..70fef04e9 100644
--- a/src/test/ui/attributes/unknown-attr.rs
+++ b/tests/ui/attributes/unknown-attr.rs
diff --git a/src/test/ui/attributes/unknown-attr.stderr b/tests/ui/attributes/unknown-attr.stderr
index 85c227dc8..85c227dc8 100644
--- a/src/test/ui/attributes/unknown-attr.stderr
+++ b/tests/ui/attributes/unknown-attr.stderr
diff --git a/src/test/ui/attributes/unnamed-field-attributes-dup.rs b/tests/ui/attributes/unnamed-field-attributes-dup.rs
index 7edfd0337..7edfd0337 100644
--- a/src/test/ui/attributes/unnamed-field-attributes-dup.rs
+++ b/tests/ui/attributes/unnamed-field-attributes-dup.rs
diff --git a/src/test/ui/attributes/unnamed-field-attributes-vis.rs b/tests/ui/attributes/unnamed-field-attributes-vis.rs
index d12155f6d..d12155f6d 100644
--- a/src/test/ui/attributes/unnamed-field-attributes-vis.rs
+++ b/tests/ui/attributes/unnamed-field-attributes-vis.rs
diff --git a/src/test/ui/attributes/unnamed-field-attributes.rs b/tests/ui/attributes/unnamed-field-attributes.rs
index 93f364047..93f364047 100644
--- a/src/test/ui/attributes/unnamed-field-attributes.rs
+++ b/tests/ui/attributes/unnamed-field-attributes.rs
diff --git a/src/test/ui/attributes/unrestricted-attribute-tokens.rs b/tests/ui/attributes/unrestricted-attribute-tokens.rs
index e31bc91a0..e31bc91a0 100644
--- a/src/test/ui/attributes/unrestricted-attribute-tokens.rs
+++ b/tests/ui/attributes/unrestricted-attribute-tokens.rs
diff --git a/src/test/ui/attributes/unused-item-in-attr.rs b/tests/ui/attributes/unused-item-in-attr.rs
index 70dcd5413..70dcd5413 100644
--- a/src/test/ui/attributes/unused-item-in-attr.rs
+++ b/tests/ui/attributes/unused-item-in-attr.rs
diff --git a/src/test/ui/attributes/unused-item-in-attr.stderr b/tests/ui/attributes/unused-item-in-attr.stderr
index 92a8f5858..92a8f5858 100644
--- a/src/test/ui/attributes/unused-item-in-attr.stderr
+++ b/tests/ui/attributes/unused-item-in-attr.stderr
diff --git a/src/test/ui/attributes/used_with_arg.rs b/tests/ui/attributes/used_with_arg.rs
index ad80ff53f..ad80ff53f 100644
--- a/src/test/ui/attributes/used_with_arg.rs
+++ b/tests/ui/attributes/used_with_arg.rs
diff --git a/src/test/ui/attributes/used_with_arg.stderr b/tests/ui/attributes/used_with_arg.stderr
index 440e5c4a5..440e5c4a5 100644
--- a/src/test/ui/attributes/used_with_arg.stderr
+++ b/tests/ui/attributes/used_with_arg.stderr
diff --git a/src/test/ui/attributes/used_with_arg_no_mangle.rs b/tests/ui/attributes/used_with_arg_no_mangle.rs
index d0bbe76ef..d0bbe76ef 100644
--- a/src/test/ui/attributes/used_with_arg_no_mangle.rs
+++ b/tests/ui/attributes/used_with_arg_no_mangle.rs
diff --git a/src/test/ui/attributes/used_with_multi_args.rs b/tests/ui/attributes/used_with_multi_args.rs
index 2e17fcfd7..2e17fcfd7 100644
--- a/src/test/ui/attributes/used_with_multi_args.rs
+++ b/tests/ui/attributes/used_with_multi_args.rs
diff --git a/src/test/ui/attributes/used_with_multi_args.stderr b/tests/ui/attributes/used_with_multi_args.stderr
index c93aafcfc..c93aafcfc 100644
--- a/src/test/ui/attributes/used_with_multi_args.stderr
+++ b/tests/ui/attributes/used_with_multi_args.stderr
diff --git a/src/test/ui/attributes/variant-attributes.rs b/tests/ui/attributes/variant-attributes.rs
index ffcdeb52a..ffcdeb52a 100644
--- a/src/test/ui/attributes/variant-attributes.rs
+++ b/tests/ui/attributes/variant-attributes.rs
diff --git a/src/test/ui/z-crate-attr.rs b/tests/ui/attributes/z-crate-attr.rs
index 1021774fc..1021774fc 100644
--- a/src/test/ui/z-crate-attr.rs
+++ b/tests/ui/attributes/z-crate-attr.rs
diff --git a/src/test/ui/attrs-resolution-errors.rs b/tests/ui/attrs-resolution-errors.rs
index 8770fb1de..8770fb1de 100644
--- a/src/test/ui/attrs-resolution-errors.rs
+++ b/tests/ui/attrs-resolution-errors.rs
diff --git a/src/test/ui/attrs-resolution-errors.stderr b/tests/ui/attrs-resolution-errors.stderr
index 883f96e5c..883f96e5c 100644
--- a/src/test/ui/attrs-resolution-errors.stderr
+++ b/tests/ui/attrs-resolution-errors.stderr
diff --git a/src/test/ui/attrs-resolution.rs b/tests/ui/attrs-resolution.rs
index 680977323..680977323 100644
--- a/src/test/ui/attrs-resolution.rs
+++ b/tests/ui/attrs-resolution.rs
diff --git a/src/test/ui/augmented-assignments-feature-gate-cross.rs b/tests/ui/augmented-assignments-feature-gate-cross.rs
index 84988feb6..84988feb6 100644
--- a/src/test/ui/augmented-assignments-feature-gate-cross.rs
+++ b/tests/ui/augmented-assignments-feature-gate-cross.rs
diff --git a/src/test/ui/augmented-assignments-rpass.rs b/tests/ui/augmented-assignments-rpass.rs
index fb383cc57..fb383cc57 100644
--- a/src/test/ui/augmented-assignments-rpass.rs
+++ b/tests/ui/augmented-assignments-rpass.rs
diff --git a/src/test/ui/augmented-assignments.rs b/tests/ui/augmented-assignments.rs
index 1b4ac6edc..20c7fb3a9 100644
--- a/src/test/ui/augmented-assignments.rs
+++ b/tests/ui/augmented-assignments.rs
@@ -19,7 +19,7 @@ fn main() {
 
     let y = Int(2);
     //~^ HELP consider changing this to be mutable
-    //~| SUGGESTION mut y
+    //~| SUGGESTION mut
     y   //~ ERROR cannot borrow `y` as mutable, as it is not declared as mutable
         //~| cannot borrow as mutable
     +=
diff --git a/src/test/ui/augmented-assignments.stderr b/tests/ui/augmented-assignments.stderr
index ce555da89..2910c910d 100644
--- a/src/test/ui/augmented-assignments.stderr
+++ b/tests/ui/augmented-assignments.stderr
@@ -10,11 +10,13 @@ LL |     x;
 error[E0596]: cannot borrow `y` as mutable, as it is not declared as mutable
   --> $DIR/augmented-assignments.rs:23:5
    |
-LL |     let y = Int(2);
-   |         - help: consider changing this to be mutable: `mut y`
-...
 LL |     y
    |     ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut y = Int(2);
+   |         +++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/auto-instantiate.rs b/tests/ui/auto-instantiate.rs
index a58b17828..a58b17828 100644
--- a/src/test/ui/auto-instantiate.rs
+++ b/tests/ui/auto-instantiate.rs
diff --git a/src/test/ui/auto-ref-slice-plus-ref.rs b/tests/ui/auto-ref-slice-plus-ref.rs
index 00b279d32..00b279d32 100644
--- a/src/test/ui/auto-ref-slice-plus-ref.rs
+++ b/tests/ui/auto-ref-slice-plus-ref.rs
diff --git a/src/test/ui/auto-ref-slice-plus-ref.stderr b/tests/ui/auto-ref-slice-plus-ref.stderr
index e28830507..e28830507 100644
--- a/src/test/ui/auto-ref-slice-plus-ref.stderr
+++ b/tests/ui/auto-ref-slice-plus-ref.stderr
diff --git a/src/test/ui/auto-traits/auto-is-contextual.rs b/tests/ui/auto-traits/auto-is-contextual.rs
index a2ddd5374..a2ddd5374 100644
--- a/src/test/ui/auto-traits/auto-is-contextual.rs
+++ b/tests/ui/auto-traits/auto-is-contextual.rs
diff --git a/src/test/ui/auto-traits/auto-trait-projection-recursion.rs b/tests/ui/auto-traits/auto-trait-projection-recursion.rs
index a36f26f02..a36f26f02 100644
--- a/src/test/ui/auto-traits/auto-trait-projection-recursion.rs
+++ b/tests/ui/auto-traits/auto-trait-projection-recursion.rs
diff --git a/src/test/ui/auto-traits/auto-trait-validation.fixed b/tests/ui/auto-traits/auto-trait-validation.fixed
index da878ac62..da878ac62 100644
--- a/src/test/ui/auto-traits/auto-trait-validation.fixed
+++ b/tests/ui/auto-traits/auto-trait-validation.fixed
diff --git a/src/test/ui/auto-traits/auto-trait-validation.rs b/tests/ui/auto-traits/auto-trait-validation.rs
index d43055e27..d43055e27 100644
--- a/src/test/ui/auto-traits/auto-trait-validation.rs
+++ b/tests/ui/auto-traits/auto-trait-validation.rs
diff --git a/src/test/ui/auto-traits/auto-trait-validation.stderr b/tests/ui/auto-traits/auto-trait-validation.stderr
index 2c380e5b0..2c380e5b0 100644
--- a/src/test/ui/auto-traits/auto-trait-validation.stderr
+++ b/tests/ui/auto-traits/auto-trait-validation.stderr
diff --git a/src/test/ui/auto-traits/auto-traits.rs b/tests/ui/auto-traits/auto-traits.rs
index 7b52d9c17..7b52d9c17 100644
--- a/src/test/ui/auto-traits/auto-traits.rs
+++ b/tests/ui/auto-traits/auto-traits.rs
diff --git a/src/test/ui/auto-traits/bad-generics-on-dyn.rs b/tests/ui/auto-traits/bad-generics-on-dyn.rs
index 3f8ac14c7..3f8ac14c7 100644
--- a/src/test/ui/auto-traits/bad-generics-on-dyn.rs
+++ b/tests/ui/auto-traits/bad-generics-on-dyn.rs
diff --git a/src/test/ui/auto-traits/bad-generics-on-dyn.stderr b/tests/ui/auto-traits/bad-generics-on-dyn.stderr
index ade69ced6..ade69ced6 100644
--- a/src/test/ui/auto-traits/bad-generics-on-dyn.stderr
+++ b/tests/ui/auto-traits/bad-generics-on-dyn.stderr
diff --git a/src/test/ui/auto-traits/issue-23080-2.rs b/tests/ui/auto-traits/issue-23080-2.rs
index cb4cf6de1..cb4cf6de1 100644
--- a/src/test/ui/auto-traits/issue-23080-2.rs
+++ b/tests/ui/auto-traits/issue-23080-2.rs
diff --git a/src/test/ui/auto-traits/issue-23080-2.stderr b/tests/ui/auto-traits/issue-23080-2.stderr
index 267a712f6..267a712f6 100644
--- a/src/test/ui/auto-traits/issue-23080-2.stderr
+++ b/tests/ui/auto-traits/issue-23080-2.stderr
diff --git a/src/test/ui/auto-traits/issue-23080.rs b/tests/ui/auto-traits/issue-23080.rs
index 84e2ce66f..84e2ce66f 100644
--- a/src/test/ui/auto-traits/issue-23080.rs
+++ b/tests/ui/auto-traits/issue-23080.rs
diff --git a/src/test/ui/auto-traits/issue-23080.stderr b/tests/ui/auto-traits/issue-23080.stderr
index c1b16b2f4..c1b16b2f4 100644
--- a/src/test/ui/auto-traits/issue-23080.stderr
+++ b/tests/ui/auto-traits/issue-23080.stderr
diff --git a/src/test/ui/auto-traits/issue-84075.rs b/tests/ui/auto-traits/issue-84075.rs
index a6afe24ea..a6afe24ea 100644
--- a/src/test/ui/auto-traits/issue-84075.rs
+++ b/tests/ui/auto-traits/issue-84075.rs
diff --git a/src/test/ui/auto-traits/issue-84075.stderr b/tests/ui/auto-traits/issue-84075.stderr
index 02dca598e..02dca598e 100644
--- a/src/test/ui/auto-traits/issue-84075.stderr
+++ b/tests/ui/auto-traits/issue-84075.stderr
diff --git a/src/test/ui/auto-traits/suspicious-impls-lint.rs b/tests/ui/auto-traits/suspicious-impls-lint.rs
index 7712e84f4..7712e84f4 100644
--- a/src/test/ui/auto-traits/suspicious-impls-lint.rs
+++ b/tests/ui/auto-traits/suspicious-impls-lint.rs
diff --git a/src/test/ui/auto-traits/suspicious-impls-lint.stderr b/tests/ui/auto-traits/suspicious-impls-lint.stderr
index 9cd4e79f8..9cd4e79f8 100644
--- a/src/test/ui/auto-traits/suspicious-impls-lint.stderr
+++ b/tests/ui/auto-traits/suspicious-impls-lint.stderr
diff --git a/src/test/ui/auto-traits/typeck-auto-trait-no-supertraits-2.rs b/tests/ui/auto-traits/typeck-auto-trait-no-supertraits-2.rs
index 98359ef51..98359ef51 100644
--- a/src/test/ui/auto-traits/typeck-auto-trait-no-supertraits-2.rs
+++ b/tests/ui/auto-traits/typeck-auto-trait-no-supertraits-2.rs
diff --git a/src/test/ui/auto-traits/typeck-auto-trait-no-supertraits-2.stderr b/tests/ui/auto-traits/typeck-auto-trait-no-supertraits-2.stderr
index 4827916fa..4827916fa 100644
--- a/src/test/ui/auto-traits/typeck-auto-trait-no-supertraits-2.stderr
+++ b/tests/ui/auto-traits/typeck-auto-trait-no-supertraits-2.stderr
diff --git a/src/test/ui/auto-traits/typeck-auto-trait-no-supertraits.rs b/tests/ui/auto-traits/typeck-auto-trait-no-supertraits.rs
index 2a76893fe..2a76893fe 100644
--- a/src/test/ui/auto-traits/typeck-auto-trait-no-supertraits.rs
+++ b/tests/ui/auto-traits/typeck-auto-trait-no-supertraits.rs
diff --git a/src/test/ui/auto-traits/typeck-auto-trait-no-supertraits.stderr b/tests/ui/auto-traits/typeck-auto-trait-no-supertraits.stderr
index d7716f4b6..d7716f4b6 100644
--- a/src/test/ui/auto-traits/typeck-auto-trait-no-supertraits.stderr
+++ b/tests/ui/auto-traits/typeck-auto-trait-no-supertraits.stderr
diff --git a/src/test/ui/auto-traits/typeck-default-trait-impl-constituent-types-2.rs b/tests/ui/auto-traits/typeck-default-trait-impl-constituent-types-2.rs
index f2fb67f11..f2fb67f11 100644
--- a/src/test/ui/auto-traits/typeck-default-trait-impl-constituent-types-2.rs
+++ b/tests/ui/auto-traits/typeck-default-trait-impl-constituent-types-2.rs
diff --git a/src/test/ui/auto-traits/typeck-default-trait-impl-constituent-types-2.stderr b/tests/ui/auto-traits/typeck-default-trait-impl-constituent-types-2.stderr
index 0c4970a72..0c4970a72 100644
--- a/src/test/ui/auto-traits/typeck-default-trait-impl-constituent-types-2.stderr
+++ b/tests/ui/auto-traits/typeck-default-trait-impl-constituent-types-2.stderr
diff --git a/src/test/ui/auto-traits/typeck-default-trait-impl-constituent-types.rs b/tests/ui/auto-traits/typeck-default-trait-impl-constituent-types.rs
index 73ff46d05..73ff46d05 100644
--- a/src/test/ui/auto-traits/typeck-default-trait-impl-constituent-types.rs
+++ b/tests/ui/auto-traits/typeck-default-trait-impl-constituent-types.rs
diff --git a/src/test/ui/auto-traits/typeck-default-trait-impl-constituent-types.stderr b/tests/ui/auto-traits/typeck-default-trait-impl-constituent-types.stderr
index c575c485a..c575c485a 100644
--- a/src/test/ui/auto-traits/typeck-default-trait-impl-constituent-types.stderr
+++ b/tests/ui/auto-traits/typeck-default-trait-impl-constituent-types.stderr
diff --git a/src/test/ui/auto-traits/typeck-default-trait-impl-negation.rs b/tests/ui/auto-traits/typeck-default-trait-impl-negation.rs
index f7f56f97f..f7f56f97f 100644
--- a/src/test/ui/auto-traits/typeck-default-trait-impl-negation.rs
+++ b/tests/ui/auto-traits/typeck-default-trait-impl-negation.rs
diff --git a/src/test/ui/auto-traits/typeck-default-trait-impl-negation.stderr b/tests/ui/auto-traits/typeck-default-trait-impl-negation.stderr
index fa8dd41da..fa8dd41da 100644
--- a/src/test/ui/auto-traits/typeck-default-trait-impl-negation.stderr
+++ b/tests/ui/auto-traits/typeck-default-trait-impl-negation.stderr
diff --git a/src/test/ui/auto-traits/typeck-default-trait-impl-precedence.rs b/tests/ui/auto-traits/typeck-default-trait-impl-precedence.rs
index 2bbe82270..2bbe82270 100644
--- a/src/test/ui/auto-traits/typeck-default-trait-impl-precedence.rs
+++ b/tests/ui/auto-traits/typeck-default-trait-impl-precedence.rs
diff --git a/src/test/ui/auto-traits/typeck-default-trait-impl-precedence.stderr b/tests/ui/auto-traits/typeck-default-trait-impl-precedence.stderr
index ce7095664..bd7aaf6fb 100644
--- a/src/test/ui/auto-traits/typeck-default-trait-impl-precedence.stderr
+++ b/tests/ui/auto-traits/typeck-default-trait-impl-precedence.stderr
@@ -4,17 +4,23 @@ error[E0277]: the trait bound `u32: Signed` is not satisfied
 LL |     is_defaulted::<&'static u32>();
    |                    ^^^^^^^^^^^^ the trait `Signed` is not implemented for `u32`
    |
-   = help: the trait `Signed` is implemented for `i32`
 note: required for `&'static u32` to implement `Defaulted`
   --> $DIR/typeck-default-trait-impl-precedence.rs:10:19
    |
 LL | impl<'a,T:Signed> Defaulted for &'a T { }
-   |                   ^^^^^^^^^     ^^^^^
+   |           ------  ^^^^^^^^^     ^^^^^
+   |           |
+   |           unsatisfied trait bound introduced here
 note: required by a bound in `is_defaulted`
   --> $DIR/typeck-default-trait-impl-precedence.rs:12:19
    |
 LL | fn is_defaulted<T:Defaulted>() { }
    |                   ^^^^^^^^^ required by this bound in `is_defaulted`
+help: consider removing the leading `&`-reference
+   |
+LL -     is_defaulted::<&'static u32>();
+LL +     is_defaulted::<u32>();
+   |
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/autoderef-full-lval.rs b/tests/ui/autoderef-full-lval.rs
index 0fadc5c98..0fadc5c98 100644
--- a/src/test/ui/autoderef-full-lval.rs
+++ b/tests/ui/autoderef-full-lval.rs
diff --git a/src/test/ui/autoderef-full-lval.stderr b/tests/ui/autoderef-full-lval.stderr
index 9921ce7c1..9921ce7c1 100644
--- a/src/test/ui/autoderef-full-lval.stderr
+++ b/tests/ui/autoderef-full-lval.stderr
diff --git a/src/test/ui/autoref-autoderef/auto-ref-bounded-ty-param.rs b/tests/ui/autoref-autoderef/auto-ref-bounded-ty-param.rs
index 2482e1878..2482e1878 100644
--- a/src/test/ui/autoref-autoderef/auto-ref-bounded-ty-param.rs
+++ b/tests/ui/autoref-autoderef/auto-ref-bounded-ty-param.rs
diff --git a/src/test/ui/autoref-autoderef/auto-ref-sliceable.rs b/tests/ui/autoref-autoderef/auto-ref-sliceable.rs
index e5f79d780..e5f79d780 100644
--- a/src/test/ui/autoref-autoderef/auto-ref-sliceable.rs
+++ b/tests/ui/autoref-autoderef/auto-ref-sliceable.rs
diff --git a/src/test/ui/autoref-autoderef/auto-ref.rs b/tests/ui/autoref-autoderef/auto-ref.rs
index b77f9c342..b77f9c342 100644
--- a/src/test/ui/autoref-autoderef/auto-ref.rs
+++ b/tests/ui/autoref-autoderef/auto-ref.rs
diff --git a/src/test/ui/autoref-autoderef/autoderef-and-borrow-method-receiver.rs b/tests/ui/autoref-autoderef/autoderef-and-borrow-method-receiver.rs
index 874f42282..874f42282 100644
--- a/src/test/ui/autoref-autoderef/autoderef-and-borrow-method-receiver.rs
+++ b/tests/ui/autoref-autoderef/autoderef-and-borrow-method-receiver.rs
diff --git a/src/test/ui/autoref-autoderef/autoderef-method-on-trait.rs b/tests/ui/autoref-autoderef/autoderef-method-on-trait.rs
index af747cc76..af747cc76 100644
--- a/src/test/ui/autoref-autoderef/autoderef-method-on-trait.rs
+++ b/tests/ui/autoref-autoderef/autoderef-method-on-trait.rs
diff --git a/src/test/ui/autoref-autoderef/autoderef-method-priority.rs b/tests/ui/autoref-autoderef/autoderef-method-priority.rs
index 88a5140dc..88a5140dc 100644
--- a/src/test/ui/autoref-autoderef/autoderef-method-priority.rs
+++ b/tests/ui/autoref-autoderef/autoderef-method-priority.rs
diff --git a/src/test/ui/autoref-autoderef/autoderef-method-twice-but-not-thrice.rs b/tests/ui/autoref-autoderef/autoderef-method-twice-but-not-thrice.rs
index 3657e61d4..3657e61d4 100644
--- a/src/test/ui/autoref-autoderef/autoderef-method-twice-but-not-thrice.rs
+++ b/tests/ui/autoref-autoderef/autoderef-method-twice-but-not-thrice.rs
diff --git a/src/test/ui/autoref-autoderef/autoderef-method-twice.rs b/tests/ui/autoref-autoderef/autoderef-method-twice.rs
index ed86b31b8..ed86b31b8 100644
--- a/src/test/ui/autoref-autoderef/autoderef-method-twice.rs
+++ b/tests/ui/autoref-autoderef/autoderef-method-twice.rs
diff --git a/src/test/ui/autoref-autoderef/autoderef-method.rs b/tests/ui/autoref-autoderef/autoderef-method.rs
index 5b7965e95..5b7965e95 100644
--- a/src/test/ui/autoref-autoderef/autoderef-method.rs
+++ b/tests/ui/autoref-autoderef/autoderef-method.rs
diff --git a/src/test/ui/autoref-autoderef/autoderef-privacy.rs b/tests/ui/autoref-autoderef/autoderef-privacy.rs
index 841be930b..841be930b 100644
--- a/src/test/ui/autoref-autoderef/autoderef-privacy.rs
+++ b/tests/ui/autoref-autoderef/autoderef-privacy.rs
diff --git a/src/test/ui/autoref-autoderef/autoref-intermediate-types-issue-3585.rs b/tests/ui/autoref-autoderef/autoref-intermediate-types-issue-3585.rs
index 3bdc248ff..3bdc248ff 100644
--- a/src/test/ui/autoref-autoderef/autoref-intermediate-types-issue-3585.rs
+++ b/tests/ui/autoref-autoderef/autoref-intermediate-types-issue-3585.rs
diff --git a/src/test/ui/autoref-autoderef/deref-into-array.rs b/tests/ui/autoref-autoderef/deref-into-array.rs
index 855a82d2f..855a82d2f 100644
--- a/src/test/ui/autoref-autoderef/deref-into-array.rs
+++ b/tests/ui/autoref-autoderef/deref-into-array.rs
diff --git a/src/test/ui/autoref-autoderef/issue-38940.rs b/tests/ui/autoref-autoderef/issue-38940.rs
index d2f1c6e32..d2f1c6e32 100644
--- a/src/test/ui/autoref-autoderef/issue-38940.rs
+++ b/tests/ui/autoref-autoderef/issue-38940.rs
diff --git a/src/test/ui/autoref-autoderef/issue-38940.stderr b/tests/ui/autoref-autoderef/issue-38940.stderr
index f0b840577..f0b840577 100644
--- a/src/test/ui/autoref-autoderef/issue-38940.stderr
+++ b/tests/ui/autoref-autoderef/issue-38940.stderr
diff --git a/src/test/ui/auxiliary/augmented_assignments.rs b/tests/ui/auxiliary/augmented_assignments.rs
index d0d3f5745..d0d3f5745 100644
--- a/src/test/ui/auxiliary/augmented_assignments.rs
+++ b/tests/ui/auxiliary/augmented_assignments.rs
diff --git a/src/test/ui/auxiliary/check_static_recursion_foreign_helper.rs b/tests/ui/auxiliary/check_static_recursion_foreign_helper.rs
index 5330b7a92..5330b7a92 100644
--- a/src/test/ui/auxiliary/check_static_recursion_foreign_helper.rs
+++ b/tests/ui/auxiliary/check_static_recursion_foreign_helper.rs
diff --git a/src/test/ui/auxiliary/crate-method-reexport-grrrrrrr2.rs b/tests/ui/auxiliary/crate-method-reexport-grrrrrrr2.rs
index d08504005..d08504005 100644
--- a/src/test/ui/auxiliary/crate-method-reexport-grrrrrrr2.rs
+++ b/tests/ui/auxiliary/crate-method-reexport-grrrrrrr2.rs
diff --git a/src/test/ui/auxiliary/default-ty-param-cross-crate-crate.rs b/tests/ui/auxiliary/default-ty-param-cross-crate-crate.rs
index d722b7876..d722b7876 100644
--- a/src/test/ui/auxiliary/default-ty-param-cross-crate-crate.rs
+++ b/tests/ui/auxiliary/default-ty-param-cross-crate-crate.rs
diff --git a/src/test/ui/auxiliary/edition-kw-macro-2015.rs b/tests/ui/auxiliary/edition-kw-macro-2015.rs
index 553ba6930..553ba6930 100644
--- a/src/test/ui/auxiliary/edition-kw-macro-2015.rs
+++ b/tests/ui/auxiliary/edition-kw-macro-2015.rs
diff --git a/src/test/ui/auxiliary/edition-kw-macro-2018.rs b/tests/ui/auxiliary/edition-kw-macro-2018.rs
index f1f4ee280..f1f4ee280 100644
--- a/src/test/ui/auxiliary/edition-kw-macro-2018.rs
+++ b/tests/ui/auxiliary/edition-kw-macro-2018.rs
diff --git a/src/test/ui/auxiliary/fancy-panic.rs b/tests/ui/auxiliary/fancy-panic.rs
index 35be93b05..35be93b05 100644
--- a/src/test/ui/auxiliary/fancy-panic.rs
+++ b/tests/ui/auxiliary/fancy-panic.rs
diff --git a/src/test/ui/auxiliary/hello_macro.rs b/tests/ui/auxiliary/hello_macro.rs
index a05b8d54d..a05b8d54d 100644
--- a/src/test/ui/auxiliary/hello_macro.rs
+++ b/tests/ui/auxiliary/hello_macro.rs
diff --git a/src/test/ui/auxiliary/impl_privacy_xc_1.rs b/tests/ui/auxiliary/impl_privacy_xc_1.rs
index 367b8ec8b..367b8ec8b 100644
--- a/src/test/ui/auxiliary/impl_privacy_xc_1.rs
+++ b/tests/ui/auxiliary/impl_privacy_xc_1.rs
diff --git a/src/test/ui/auxiliary/inner_static.rs b/tests/ui/auxiliary/inner_static.rs
index 42dcd379d..42dcd379d 100644
--- a/src/test/ui/auxiliary/inner_static.rs
+++ b/tests/ui/auxiliary/inner_static.rs
diff --git a/src/test/ui/auxiliary/issue-76387.rs b/tests/ui/auxiliary/issue-76387.rs
index 873d2bedd..873d2bedd 100644
--- a/src/test/ui/auxiliary/issue-76387.rs
+++ b/tests/ui/auxiliary/issue-76387.rs
diff --git a/src/test/ui/auxiliary/kinds_in_metadata.rs b/tests/ui/auxiliary/kinds_in_metadata.rs
index 2a2106ff7..2a2106ff7 100644
--- a/src/test/ui/auxiliary/kinds_in_metadata.rs
+++ b/tests/ui/auxiliary/kinds_in_metadata.rs
diff --git a/src/test/ui/auxiliary/msvc-data-only-lib.rs b/tests/ui/auxiliary/msvc-data-only-lib.rs
index ccaa6d8ed..ccaa6d8ed 100644
--- a/src/test/ui/auxiliary/msvc-data-only-lib.rs
+++ b/tests/ui/auxiliary/msvc-data-only-lib.rs
diff --git a/src/test/ui/auxiliary/noexporttypelib.rs b/tests/ui/auxiliary/noexporttypelib.rs
index 67889cc5f..67889cc5f 100644
--- a/src/test/ui/auxiliary/noexporttypelib.rs
+++ b/tests/ui/auxiliary/noexporttypelib.rs
diff --git a/src/test/ui/auxiliary/orphan-check-diagnostics.rs b/tests/ui/auxiliary/orphan-check-diagnostics.rs
index 6b2c42b69..6b2c42b69 100644
--- a/src/test/ui/auxiliary/orphan-check-diagnostics.rs
+++ b/tests/ui/auxiliary/orphan-check-diagnostics.rs
diff --git a/src/test/ui/auxiliary/pub-and-stability.rs b/tests/ui/auxiliary/pub-and-stability.rs
index ee05a07db..ee05a07db 100644
--- a/src/test/ui/auxiliary/pub-and-stability.rs
+++ b/tests/ui/auxiliary/pub-and-stability.rs
diff --git a/src/test/ui/auxiliary/removing-extern-crate.rs b/tests/ui/auxiliary/removing-extern-crate.rs
index 65e2cc340..65e2cc340 100644
--- a/src/test/ui/auxiliary/removing-extern-crate.rs
+++ b/tests/ui/auxiliary/removing-extern-crate.rs
diff --git a/src/test/ui/auxiliary/rustc-rust-log-aux.rs b/tests/ui/auxiliary/rustc-rust-log-aux.rs
index daa8e9f49..daa8e9f49 100644
--- a/src/test/ui/auxiliary/rustc-rust-log-aux.rs
+++ b/tests/ui/auxiliary/rustc-rust-log-aux.rs
diff --git a/src/test/ui/auxiliary/svh-a-base.rs b/tests/ui/auxiliary/svh-a-base.rs
index 36b41fc81..36b41fc81 100644
--- a/src/test/ui/auxiliary/svh-a-base.rs
+++ b/tests/ui/auxiliary/svh-a-base.rs
diff --git a/src/test/ui/auxiliary/svh-b.rs b/tests/ui/auxiliary/svh-b.rs
index 57029f708..57029f708 100644
--- a/src/test/ui/auxiliary/svh-b.rs
+++ b/tests/ui/auxiliary/svh-b.rs
diff --git a/src/test/ui/auxiliary/typeid-intrinsic-aux1.rs b/tests/ui/auxiliary/typeid-intrinsic-aux1.rs
index 281c07968..281c07968 100644
--- a/src/test/ui/auxiliary/typeid-intrinsic-aux1.rs
+++ b/tests/ui/auxiliary/typeid-intrinsic-aux1.rs
diff --git a/src/test/ui/auxiliary/typeid-intrinsic-aux2.rs b/tests/ui/auxiliary/typeid-intrinsic-aux2.rs
index 281c07968..281c07968 100644
--- a/src/test/ui/auxiliary/typeid-intrinsic-aux2.rs
+++ b/tests/ui/auxiliary/typeid-intrinsic-aux2.rs
diff --git a/src/test/ui/auxiliary/using-target-feature-unstable.rs b/tests/ui/auxiliary/using-target-feature-unstable.rs
index 268202893..268202893 100644
--- a/src/test/ui/auxiliary/using-target-feature-unstable.rs
+++ b/tests/ui/auxiliary/using-target-feature-unstable.rs
diff --git a/src/test/ui/auxiliary/xc-private-method-lib.rs b/tests/ui/auxiliary/xc-private-method-lib.rs
index 4d5ec6de3..4d5ec6de3 100644
--- a/src/test/ui/auxiliary/xc-private-method-lib.rs
+++ b/tests/ui/auxiliary/xc-private-method-lib.rs
diff --git a/src/test/ui/backtrace-apple-no-dsymutil.rs b/tests/ui/backtrace-apple-no-dsymutil.rs
index 3844ebcfd..3844ebcfd 100644
--- a/src/test/ui/backtrace-apple-no-dsymutil.rs
+++ b/tests/ui/backtrace-apple-no-dsymutil.rs
diff --git a/src/test/ui/backtrace.rs b/tests/ui/backtrace.rs
index dd73dd988..dd73dd988 100644
--- a/src/test/ui/backtrace.rs
+++ b/tests/ui/backtrace.rs
diff --git a/src/test/ui/bare-fn-implements-fn-mut.rs b/tests/ui/bare-fn-implements-fn-mut.rs
index dfead4889..dfead4889 100644
--- a/src/test/ui/bare-fn-implements-fn-mut.rs
+++ b/tests/ui/bare-fn-implements-fn-mut.rs
diff --git a/src/test/ui/bare-static-string.rs b/tests/ui/bare-static-string.rs
index d336dc7c6..d336dc7c6 100644
--- a/src/test/ui/bare-static-string.rs
+++ b/tests/ui/bare-static-string.rs
diff --git a/src/test/ui/bench/issue-32062.rs b/tests/ui/bench/issue-32062.rs
index 7eb52196e..7eb52196e 100644
--- a/src/test/ui/bench/issue-32062.rs
+++ b/tests/ui/bench/issue-32062.rs
diff --git a/src/test/ui/big-literals.rs b/tests/ui/big-literals.rs
index 96ea115c8..96ea115c8 100644
--- a/src/test/ui/big-literals.rs
+++ b/tests/ui/big-literals.rs
diff --git a/src/test/ui/bind-by-move.rs b/tests/ui/bind-by-move.rs
index f0a9ebdd0..f0a9ebdd0 100644
--- a/src/test/ui/bind-by-move.rs
+++ b/tests/ui/bind-by-move.rs
diff --git a/src/test/ui/binding/ambiguity-item.rs b/tests/ui/binding/ambiguity-item.rs
index 0f48340c2..0f48340c2 100644
--- a/src/test/ui/binding/ambiguity-item.rs
+++ b/tests/ui/binding/ambiguity-item.rs
diff --git a/src/test/ui/binding/ambiguity-item.stderr b/tests/ui/binding/ambiguity-item.stderr
index f36201396..f36201396 100644
--- a/src/test/ui/binding/ambiguity-item.stderr
+++ b/tests/ui/binding/ambiguity-item.stderr
diff --git a/src/test/ui/binding/bind-field-short-with-modifiers.rs b/tests/ui/binding/bind-field-short-with-modifiers.rs
index b271f84e9..b271f84e9 100644
--- a/src/test/ui/binding/bind-field-short-with-modifiers.rs
+++ b/tests/ui/binding/bind-field-short-with-modifiers.rs
diff --git a/src/test/ui/binding/borrowed-ptr-pattern-2.rs b/tests/ui/binding/borrowed-ptr-pattern-2.rs
index 40df85b14..40df85b14 100644
--- a/src/test/ui/binding/borrowed-ptr-pattern-2.rs
+++ b/tests/ui/binding/borrowed-ptr-pattern-2.rs
diff --git a/src/test/ui/binding/borrowed-ptr-pattern-3.rs b/tests/ui/binding/borrowed-ptr-pattern-3.rs
index f2607eee8..f2607eee8 100644
--- a/src/test/ui/binding/borrowed-ptr-pattern-3.rs
+++ b/tests/ui/binding/borrowed-ptr-pattern-3.rs
diff --git a/src/test/ui/binding/borrowed-ptr-pattern-infallible.rs b/tests/ui/binding/borrowed-ptr-pattern-infallible.rs
index 1bbc03e19..1bbc03e19 100644
--- a/src/test/ui/binding/borrowed-ptr-pattern-infallible.rs
+++ b/tests/ui/binding/borrowed-ptr-pattern-infallible.rs
diff --git a/src/test/ui/binding/borrowed-ptr-pattern-option.rs b/tests/ui/binding/borrowed-ptr-pattern-option.rs
index 319b8631e..319b8631e 100644
--- a/src/test/ui/binding/borrowed-ptr-pattern-option.rs
+++ b/tests/ui/binding/borrowed-ptr-pattern-option.rs
diff --git a/src/test/ui/binding/borrowed-ptr-pattern.rs b/tests/ui/binding/borrowed-ptr-pattern.rs
index d5f94ab54..d5f94ab54 100644
--- a/src/test/ui/binding/borrowed-ptr-pattern.rs
+++ b/tests/ui/binding/borrowed-ptr-pattern.rs
diff --git a/src/test/ui/binding/const-param.rs b/tests/ui/binding/const-param.rs
index 2d051808f..2d051808f 100644
--- a/src/test/ui/binding/const-param.rs
+++ b/tests/ui/binding/const-param.rs
diff --git a/src/test/ui/binding/const-param.stderr b/tests/ui/binding/const-param.stderr
index adda80810..adda80810 100644
--- a/src/test/ui/binding/const-param.stderr
+++ b/tests/ui/binding/const-param.stderr
diff --git a/src/test/ui/binding/empty-types-in-patterns.rs b/tests/ui/binding/empty-types-in-patterns.rs
index 0d0dbcaf4..0d0dbcaf4 100644
--- a/src/test/ui/binding/empty-types-in-patterns.rs
+++ b/tests/ui/binding/empty-types-in-patterns.rs
diff --git a/src/test/ui/binding/exhaustive-bool-match-sanity.rs b/tests/ui/binding/exhaustive-bool-match-sanity.rs
index f83def210..f83def210 100644
--- a/src/test/ui/binding/exhaustive-bool-match-sanity.rs
+++ b/tests/ui/binding/exhaustive-bool-match-sanity.rs
diff --git a/src/test/ui/binding/expr-match-generic-unique1.rs b/tests/ui/binding/expr-match-generic-unique1.rs
index c5f38d815..c5f38d815 100644
--- a/src/test/ui/binding/expr-match-generic-unique1.rs
+++ b/tests/ui/binding/expr-match-generic-unique1.rs
diff --git a/src/test/ui/binding/expr-match-generic-unique2.rs b/tests/ui/binding/expr-match-generic-unique2.rs
index 8977ca68e..8977ca68e 100644
--- a/src/test/ui/binding/expr-match-generic-unique2.rs
+++ b/tests/ui/binding/expr-match-generic-unique2.rs
diff --git a/src/test/ui/binding/expr-match-generic.rs b/tests/ui/binding/expr-match-generic.rs
index 530fc676f..530fc676f 100644
--- a/src/test/ui/binding/expr-match-generic.rs
+++ b/tests/ui/binding/expr-match-generic.rs
diff --git a/src/test/ui/binding/expr-match-panic-all.rs b/tests/ui/binding/expr-match-panic-all.rs
index ac31b49a1..ac31b49a1 100644
--- a/src/test/ui/binding/expr-match-panic-all.rs
+++ b/tests/ui/binding/expr-match-panic-all.rs
diff --git a/src/test/ui/binding/expr-match-panic.rs b/tests/ui/binding/expr-match-panic.rs
index 4b6b6e072..4b6b6e072 100644
--- a/src/test/ui/binding/expr-match-panic.rs
+++ b/tests/ui/binding/expr-match-panic.rs
diff --git a/src/test/ui/binding/expr-match-unique.rs b/tests/ui/binding/expr-match-unique.rs
index eec9e1f8b..eec9e1f8b 100644
--- a/src/test/ui/binding/expr-match-unique.rs
+++ b/tests/ui/binding/expr-match-unique.rs
diff --git a/src/test/ui/binding/expr-match.rs b/tests/ui/binding/expr-match.rs
index 575b38fbc..575b38fbc 100644
--- a/src/test/ui/binding/expr-match.rs
+++ b/tests/ui/binding/expr-match.rs
diff --git a/src/test/ui/binding/fat-arrow-match.rs b/tests/ui/binding/fat-arrow-match.rs
index aaf5be8cf..aaf5be8cf 100644
--- a/src/test/ui/binding/fat-arrow-match.rs
+++ b/tests/ui/binding/fat-arrow-match.rs
diff --git a/src/test/ui/binding/fn-arg-incomplete-pattern-drop-order.rs b/tests/ui/binding/fn-arg-incomplete-pattern-drop-order.rs
index 0450fe8ab..0450fe8ab 100644
--- a/src/test/ui/binding/fn-arg-incomplete-pattern-drop-order.rs
+++ b/tests/ui/binding/fn-arg-incomplete-pattern-drop-order.rs
diff --git a/src/test/ui/binding/fn-pattern-expected-type-2.rs b/tests/ui/binding/fn-pattern-expected-type-2.rs
index 130ff3d44..130ff3d44 100644
--- a/src/test/ui/binding/fn-pattern-expected-type-2.rs
+++ b/tests/ui/binding/fn-pattern-expected-type-2.rs
diff --git a/src/test/ui/binding/fn-pattern-expected-type.rs b/tests/ui/binding/fn-pattern-expected-type.rs
index faeb76496..faeb76496 100644
--- a/src/test/ui/binding/fn-pattern-expected-type.rs
+++ b/tests/ui/binding/fn-pattern-expected-type.rs
diff --git a/src/test/ui/binding/func-arg-incomplete-pattern.rs b/tests/ui/binding/func-arg-incomplete-pattern.rs
index eb94ee48f..eb94ee48f 100644
--- a/src/test/ui/binding/func-arg-incomplete-pattern.rs
+++ b/tests/ui/binding/func-arg-incomplete-pattern.rs
diff --git a/src/test/ui/binding/func-arg-ref-pattern.rs b/tests/ui/binding/func-arg-ref-pattern.rs
index 2d75c1214..2d75c1214 100644
--- a/src/test/ui/binding/func-arg-ref-pattern.rs
+++ b/tests/ui/binding/func-arg-ref-pattern.rs
diff --git a/src/test/ui/binding/func-arg-wild-pattern.rs b/tests/ui/binding/func-arg-wild-pattern.rs
index bcd82c679..bcd82c679 100644
--- a/src/test/ui/binding/func-arg-wild-pattern.rs
+++ b/tests/ui/binding/func-arg-wild-pattern.rs
diff --git a/src/test/ui/binding/if-let.rs b/tests/ui/binding/if-let.rs
index 28d57e92c..28d57e92c 100644
--- a/src/test/ui/binding/if-let.rs
+++ b/tests/ui/binding/if-let.rs
diff --git a/src/test/ui/binding/inconsistent-lifetime-mismatch.rs b/tests/ui/binding/inconsistent-lifetime-mismatch.rs
index 87768c28c..87768c28c 100644
--- a/src/test/ui/binding/inconsistent-lifetime-mismatch.rs
+++ b/tests/ui/binding/inconsistent-lifetime-mismatch.rs
diff --git a/src/test/ui/binding/inferred-suffix-in-pattern-range.rs b/tests/ui/binding/inferred-suffix-in-pattern-range.rs
index 079cc0a16..079cc0a16 100644
--- a/src/test/ui/binding/inferred-suffix-in-pattern-range.rs
+++ b/tests/ui/binding/inferred-suffix-in-pattern-range.rs
diff --git a/src/test/ui/binding/irrefutable-slice-patterns.rs b/tests/ui/binding/irrefutable-slice-patterns.rs
index 048e1e5e9..048e1e5e9 100644
--- a/src/test/ui/binding/irrefutable-slice-patterns.rs
+++ b/tests/ui/binding/irrefutable-slice-patterns.rs
diff --git a/src/test/ui/binding/issue-53114-borrow-checks.rs b/tests/ui/binding/issue-53114-borrow-checks.rs
index 7646472f4..7646472f4 100644
--- a/src/test/ui/binding/issue-53114-borrow-checks.rs
+++ b/tests/ui/binding/issue-53114-borrow-checks.rs
diff --git a/src/test/ui/binding/issue-53114-borrow-checks.stderr b/tests/ui/binding/issue-53114-borrow-checks.stderr
index 0ec2ae883..0ec2ae883 100644
--- a/src/test/ui/binding/issue-53114-borrow-checks.stderr
+++ b/tests/ui/binding/issue-53114-borrow-checks.stderr
diff --git a/src/test/ui/binding/issue-53114-safety-checks.rs b/tests/ui/binding/issue-53114-safety-checks.rs
index d0eb28c57..d0eb28c57 100644
--- a/src/test/ui/binding/issue-53114-safety-checks.rs
+++ b/tests/ui/binding/issue-53114-safety-checks.rs
diff --git a/src/test/ui/binding/issue-53114-safety-checks.stderr b/tests/ui/binding/issue-53114-safety-checks.stderr
index 57a065d6d..57a065d6d 100644
--- a/src/test/ui/binding/issue-53114-safety-checks.stderr
+++ b/tests/ui/binding/issue-53114-safety-checks.stderr
diff --git a/src/test/ui/binding/let-assignability.rs b/tests/ui/binding/let-assignability.rs
index b85f4a96a..b85f4a96a 100644
--- a/src/test/ui/binding/let-assignability.rs
+++ b/tests/ui/binding/let-assignability.rs
diff --git a/src/test/ui/binding/let-destruct-ref.rs b/tests/ui/binding/let-destruct-ref.rs
index 28d7294eb..28d7294eb 100644
--- a/src/test/ui/binding/let-destruct-ref.rs
+++ b/tests/ui/binding/let-destruct-ref.rs
diff --git a/src/test/ui/binding/let-var-hygiene.rs b/tests/ui/binding/let-var-hygiene.rs
index 571207bd7..571207bd7 100644
--- a/src/test/ui/binding/let-var-hygiene.rs
+++ b/tests/ui/binding/let-var-hygiene.rs
diff --git a/src/test/ui/binding/match-arm-statics.rs b/tests/ui/binding/match-arm-statics.rs
index e6d17def1..e6d17def1 100644
--- a/src/test/ui/binding/match-arm-statics.rs
+++ b/tests/ui/binding/match-arm-statics.rs
diff --git a/src/test/ui/binding/match-beginning-vert.rs b/tests/ui/binding/match-beginning-vert.rs
index 79267400b..79267400b 100644
--- a/src/test/ui/binding/match-beginning-vert.rs
+++ b/tests/ui/binding/match-beginning-vert.rs
diff --git a/src/test/ui/binding/match-borrowed_str.rs b/tests/ui/binding/match-borrowed_str.rs
index 22782032e..22782032e 100644
--- a/src/test/ui/binding/match-borrowed_str.rs
+++ b/tests/ui/binding/match-borrowed_str.rs
diff --git a/src/test/ui/binding/match-bot-2.rs b/tests/ui/binding/match-bot-2.rs
index 95b3406f0..95b3406f0 100644
--- a/src/test/ui/binding/match-bot-2.rs
+++ b/tests/ui/binding/match-bot-2.rs
diff --git a/src/test/ui/binding/match-bot.rs b/tests/ui/binding/match-bot.rs
index 5c4472c7a..5c4472c7a 100644
--- a/src/test/ui/binding/match-bot.rs
+++ b/tests/ui/binding/match-bot.rs
diff --git a/src/test/ui/binding/match-byte-array-patterns.rs b/tests/ui/binding/match-byte-array-patterns.rs
index f0c988c01..f0c988c01 100644
--- a/src/test/ui/binding/match-byte-array-patterns.rs
+++ b/tests/ui/binding/match-byte-array-patterns.rs
diff --git a/src/test/ui/binding/match-enum-struct-0.rs b/tests/ui/binding/match-enum-struct-0.rs
index e2623ece8..e2623ece8 100644
--- a/src/test/ui/binding/match-enum-struct-0.rs
+++ b/tests/ui/binding/match-enum-struct-0.rs
diff --git a/src/test/ui/binding/match-enum-struct-1.rs b/tests/ui/binding/match-enum-struct-1.rs
index f035432ec..f035432ec 100644
--- a/src/test/ui/binding/match-enum-struct-1.rs
+++ b/tests/ui/binding/match-enum-struct-1.rs
diff --git a/src/test/ui/binding/match-implicit-copy-unique.rs b/tests/ui/binding/match-implicit-copy-unique.rs
index 74ffe2ecd..74ffe2ecd 100644
--- a/src/test/ui/binding/match-implicit-copy-unique.rs
+++ b/tests/ui/binding/match-implicit-copy-unique.rs
diff --git a/src/test/ui/binding/match-in-macro.rs b/tests/ui/binding/match-in-macro.rs
index 0840cc440..0840cc440 100644
--- a/src/test/ui/binding/match-in-macro.rs
+++ b/tests/ui/binding/match-in-macro.rs
diff --git a/src/test/ui/binding/match-join.rs b/tests/ui/binding/match-join.rs
index 60f2a4584..60f2a4584 100644
--- a/src/test/ui/binding/match-join.rs
+++ b/tests/ui/binding/match-join.rs
diff --git a/src/test/ui/binding/match-larger-const.rs b/tests/ui/binding/match-larger-const.rs
index 6f9a35320..6f9a35320 100644
--- a/src/test/ui/binding/match-larger-const.rs
+++ b/tests/ui/binding/match-larger-const.rs
diff --git a/src/test/ui/binding/match-naked-record-expr.rs b/tests/ui/binding/match-naked-record-expr.rs
index c23ff8c94..c23ff8c94 100644
--- a/src/test/ui/binding/match-naked-record-expr.rs
+++ b/tests/ui/binding/match-naked-record-expr.rs
diff --git a/src/test/ui/binding/match-naked-record.rs b/tests/ui/binding/match-naked-record.rs
index f7479152e..f7479152e 100644
--- a/src/test/ui/binding/match-naked-record.rs
+++ b/tests/ui/binding/match-naked-record.rs
diff --git a/src/test/ui/binding/match-path.rs b/tests/ui/binding/match-path.rs
index 286214eb8..286214eb8 100644
--- a/src/test/ui/binding/match-path.rs
+++ b/tests/ui/binding/match-path.rs
diff --git a/src/test/ui/binding/match-pattern-bindings.rs b/tests/ui/binding/match-pattern-bindings.rs
index 4ec533677..4ec533677 100644
--- a/src/test/ui/binding/match-pattern-bindings.rs
+++ b/tests/ui/binding/match-pattern-bindings.rs
diff --git a/src/test/ui/binding/match-pattern-lit.rs b/tests/ui/binding/match-pattern-lit.rs
index c9c6135e2..c9c6135e2 100644
--- a/src/test/ui/binding/match-pattern-lit.rs
+++ b/tests/ui/binding/match-pattern-lit.rs
diff --git a/src/test/ui/binding/match-pattern-no-type-params.rs b/tests/ui/binding/match-pattern-no-type-params.rs
index 1fc7ddda0..1fc7ddda0 100644
--- a/src/test/ui/binding/match-pattern-no-type-params.rs
+++ b/tests/ui/binding/match-pattern-no-type-params.rs
diff --git a/src/test/ui/binding/match-pattern-simple.rs b/tests/ui/binding/match-pattern-simple.rs
index 3f56cd479..3f56cd479 100644
--- a/src/test/ui/binding/match-pattern-simple.rs
+++ b/tests/ui/binding/match-pattern-simple.rs
diff --git a/src/test/ui/binding/match-phi.rs b/tests/ui/binding/match-phi.rs
index 92a3f6e0f..92a3f6e0f 100644
--- a/src/test/ui/binding/match-phi.rs
+++ b/tests/ui/binding/match-phi.rs
diff --git a/src/test/ui/binding/match-pipe-binding.rs b/tests/ui/binding/match-pipe-binding.rs
index 7d4a7c708..7d4a7c708 100644
--- a/src/test/ui/binding/match-pipe-binding.rs
+++ b/tests/ui/binding/match-pipe-binding.rs
diff --git a/src/test/ui/binding/match-range-infer.rs b/tests/ui/binding/match-range-infer.rs
index 19d1cb89d..19d1cb89d 100644
--- a/src/test/ui/binding/match-range-infer.rs
+++ b/tests/ui/binding/match-range-infer.rs
diff --git a/src/test/ui/binding/match-range-static.rs b/tests/ui/binding/match-range-static.rs
index f01a3505e..f01a3505e 100644
--- a/src/test/ui/binding/match-range-static.rs
+++ b/tests/ui/binding/match-range-static.rs
diff --git a/src/test/ui/binding/match-range.rs b/tests/ui/binding/match-range.rs
index 1dca84dfd..1dca84dfd 100644
--- a/src/test/ui/binding/match-range.rs
+++ b/tests/ui/binding/match-range.rs
diff --git a/src/test/ui/binding/match-reassign.rs b/tests/ui/binding/match-reassign.rs
index 19b48579c..19b48579c 100644
--- a/src/test/ui/binding/match-reassign.rs
+++ b/tests/ui/binding/match-reassign.rs
diff --git a/src/test/ui/binding/match-ref-binding-in-guard-3256.rs b/tests/ui/binding/match-ref-binding-in-guard-3256.rs
index 9075a34d4..9075a34d4 100644
--- a/src/test/ui/binding/match-ref-binding-in-guard-3256.rs
+++ b/tests/ui/binding/match-ref-binding-in-guard-3256.rs
diff --git a/src/test/ui/binding/match-ref-binding-mut-option.rs b/tests/ui/binding/match-ref-binding-mut-option.rs
index c25639b72..c25639b72 100644
--- a/src/test/ui/binding/match-ref-binding-mut-option.rs
+++ b/tests/ui/binding/match-ref-binding-mut-option.rs
diff --git a/src/test/ui/binding/match-ref-binding-mut.rs b/tests/ui/binding/match-ref-binding-mut.rs
index d7afd61bc..d7afd61bc 100644
--- a/src/test/ui/binding/match-ref-binding-mut.rs
+++ b/tests/ui/binding/match-ref-binding-mut.rs
diff --git a/src/test/ui/binding/match-ref-binding.rs b/tests/ui/binding/match-ref-binding.rs
index ac6a07eab..ac6a07eab 100644
--- a/src/test/ui/binding/match-ref-binding.rs
+++ b/tests/ui/binding/match-ref-binding.rs
diff --git a/src/test/ui/binding/match-ref-unsized.rs b/tests/ui/binding/match-ref-unsized.rs
index 53784ebb9..53784ebb9 100644
--- a/src/test/ui/binding/match-ref-unsized.rs
+++ b/tests/ui/binding/match-ref-unsized.rs
diff --git a/src/test/ui/binding/match-str.rs b/tests/ui/binding/match-str.rs
index 0ee18ea18..0ee18ea18 100644
--- a/src/test/ui/binding/match-str.rs
+++ b/tests/ui/binding/match-str.rs
diff --git a/src/test/ui/binding/match-struct-0.rs b/tests/ui/binding/match-struct-0.rs
index c49f3ed61..c49f3ed61 100644
--- a/src/test/ui/binding/match-struct-0.rs
+++ b/tests/ui/binding/match-struct-0.rs
diff --git a/src/test/ui/binding/match-tag.rs b/tests/ui/binding/match-tag.rs
index 407716aa2..407716aa2 100644
--- a/src/test/ui/binding/match-tag.rs
+++ b/tests/ui/binding/match-tag.rs
diff --git a/src/test/ui/binding/match-unique-bind.rs b/tests/ui/binding/match-unique-bind.rs
index 507478983..507478983 100644
--- a/src/test/ui/binding/match-unique-bind.rs
+++ b/tests/ui/binding/match-unique-bind.rs
diff --git a/src/test/ui/binding/match-unsized.rs b/tests/ui/binding/match-unsized.rs
index 41937a557..41937a557 100644
--- a/src/test/ui/binding/match-unsized.rs
+++ b/tests/ui/binding/match-unsized.rs
diff --git a/src/test/ui/binding/match-value-binding-in-guard-3291.rs b/tests/ui/binding/match-value-binding-in-guard-3291.rs
index 0d750da79..0d750da79 100644
--- a/src/test/ui/binding/match-value-binding-in-guard-3291.rs
+++ b/tests/ui/binding/match-value-binding-in-guard-3291.rs
diff --git a/src/test/ui/binding/match-var-hygiene.rs b/tests/ui/binding/match-var-hygiene.rs
index 43740bbcf..43740bbcf 100644
--- a/src/test/ui/binding/match-var-hygiene.rs
+++ b/tests/ui/binding/match-var-hygiene.rs
diff --git a/src/test/ui/binding/match-vec-alternatives.rs b/tests/ui/binding/match-vec-alternatives.rs
index af95eb95d..af95eb95d 100644
--- a/src/test/ui/binding/match-vec-alternatives.rs
+++ b/tests/ui/binding/match-vec-alternatives.rs
diff --git a/src/test/ui/binding/match-vec-rvalue.rs b/tests/ui/binding/match-vec-rvalue.rs
index fead2254c..fead2254c 100644
--- a/src/test/ui/binding/match-vec-rvalue.rs
+++ b/tests/ui/binding/match-vec-rvalue.rs
diff --git a/src/test/ui/binding/match-with-ret-arm.rs b/tests/ui/binding/match-with-ret-arm.rs
index 58a909641..58a909641 100644
--- a/src/test/ui/binding/match-with-ret-arm.rs
+++ b/tests/ui/binding/match-with-ret-arm.rs
diff --git a/src/test/ui/binding/multi-let.rs b/tests/ui/binding/multi-let.rs
index 064d32a70..064d32a70 100644
--- a/src/test/ui/binding/multi-let.rs
+++ b/tests/ui/binding/multi-let.rs
diff --git a/src/test/ui/binding/mut-in-ident-patterns.rs b/tests/ui/binding/mut-in-ident-patterns.rs
index 1d1dd660e..1d1dd660e 100644
--- a/src/test/ui/binding/mut-in-ident-patterns.rs
+++ b/tests/ui/binding/mut-in-ident-patterns.rs
diff --git a/src/test/ui/binding/nested-matchs.rs b/tests/ui/binding/nested-matchs.rs
index 29490fd48..29490fd48 100644
--- a/src/test/ui/binding/nested-matchs.rs
+++ b/tests/ui/binding/nested-matchs.rs
diff --git a/src/test/ui/binding/nested-pattern.rs b/tests/ui/binding/nested-pattern.rs
index 7d14c9ad9..7d14c9ad9 100644
--- a/src/test/ui/binding/nested-pattern.rs
+++ b/tests/ui/binding/nested-pattern.rs
diff --git a/src/test/ui/binding/nil-pattern.rs b/tests/ui/binding/nil-pattern.rs
index 268af351d..268af351d 100644
--- a/src/test/ui/binding/nil-pattern.rs
+++ b/tests/ui/binding/nil-pattern.rs
diff --git a/src/test/ui/binding/nullary-or-pattern.rs b/tests/ui/binding/nullary-or-pattern.rs
index 7a3d9d60e..7a3d9d60e 100644
--- a/src/test/ui/binding/nullary-or-pattern.rs
+++ b/tests/ui/binding/nullary-or-pattern.rs
diff --git a/src/test/ui/binding/optional_comma_in_match_arm.rs b/tests/ui/binding/optional_comma_in_match_arm.rs
index fc268bf2a..fc268bf2a 100644
--- a/src/test/ui/binding/optional_comma_in_match_arm.rs
+++ b/tests/ui/binding/optional_comma_in_match_arm.rs
diff --git a/src/test/ui/binding/or-pattern.rs b/tests/ui/binding/or-pattern.rs
index 47623a3d7..47623a3d7 100644
--- a/src/test/ui/binding/or-pattern.rs
+++ b/tests/ui/binding/or-pattern.rs
diff --git a/src/test/ui/binding/order-drop-with-match.rs b/tests/ui/binding/order-drop-with-match.rs
index f50632ede..f50632ede 100644
--- a/src/test/ui/binding/order-drop-with-match.rs
+++ b/tests/ui/binding/order-drop-with-match.rs
diff --git a/src/test/ui/binding/pat-ranges.rs b/tests/ui/binding/pat-ranges.rs
index 19b304578..19b304578 100644
--- a/src/test/ui/binding/pat-ranges.rs
+++ b/tests/ui/binding/pat-ranges.rs
diff --git a/src/test/ui/binding/pat-tuple-1.rs b/tests/ui/binding/pat-tuple-1.rs
index b09d4a22d..b09d4a22d 100644
--- a/src/test/ui/binding/pat-tuple-1.rs
+++ b/tests/ui/binding/pat-tuple-1.rs
diff --git a/src/test/ui/binding/pat-tuple-2.rs b/tests/ui/binding/pat-tuple-2.rs
index 810fd2641..810fd2641 100644
--- a/src/test/ui/binding/pat-tuple-2.rs
+++ b/tests/ui/binding/pat-tuple-2.rs
diff --git a/src/test/ui/binding/pat-tuple-3.rs b/tests/ui/binding/pat-tuple-3.rs
index 9bec89861..9bec89861 100644
--- a/src/test/ui/binding/pat-tuple-3.rs
+++ b/tests/ui/binding/pat-tuple-3.rs
diff --git a/src/test/ui/binding/pat-tuple-4.rs b/tests/ui/binding/pat-tuple-4.rs
index 71a548502..71a548502 100644
--- a/src/test/ui/binding/pat-tuple-4.rs
+++ b/tests/ui/binding/pat-tuple-4.rs
diff --git a/src/test/ui/binding/pat-tuple-5.rs b/tests/ui/binding/pat-tuple-5.rs
index c8cdd37dd..c8cdd37dd 100644
--- a/src/test/ui/binding/pat-tuple-5.rs
+++ b/tests/ui/binding/pat-tuple-5.rs
diff --git a/src/test/ui/binding/pat-tuple-6.rs b/tests/ui/binding/pat-tuple-6.rs
index 877f0e414..877f0e414 100644
--- a/src/test/ui/binding/pat-tuple-6.rs
+++ b/tests/ui/binding/pat-tuple-6.rs
diff --git a/src/test/ui/binding/pat-tuple-7.rs b/tests/ui/binding/pat-tuple-7.rs
index 7835e2c35..7835e2c35 100644
--- a/src/test/ui/binding/pat-tuple-7.rs
+++ b/tests/ui/binding/pat-tuple-7.rs
diff --git a/src/test/ui/binding/pattern-bound-var-in-for-each.rs b/tests/ui/binding/pattern-bound-var-in-for-each.rs
index 3f725cddc..3f725cddc 100644
--- a/src/test/ui/binding/pattern-bound-var-in-for-each.rs
+++ b/tests/ui/binding/pattern-bound-var-in-for-each.rs
diff --git a/src/test/ui/binding/pattern-in-closure.rs b/tests/ui/binding/pattern-in-closure.rs
index 3ac8d5768..3ac8d5768 100644
--- a/src/test/ui/binding/pattern-in-closure.rs
+++ b/tests/ui/binding/pattern-in-closure.rs
diff --git a/src/test/ui/binding/range-inclusive-pattern-precedence.rs b/tests/ui/binding/range-inclusive-pattern-precedence.rs
index 858239bb1..858239bb1 100644
--- a/src/test/ui/binding/range-inclusive-pattern-precedence.rs
+++ b/tests/ui/binding/range-inclusive-pattern-precedence.rs
diff --git a/src/test/ui/binding/shadow.rs b/tests/ui/binding/shadow.rs
index 2495c8f47..2495c8f47 100644
--- a/src/test/ui/binding/shadow.rs
+++ b/tests/ui/binding/shadow.rs
diff --git a/src/test/ui/binding/simple-generic-match.rs b/tests/ui/binding/simple-generic-match.rs
index 2cf050d01..2cf050d01 100644
--- a/src/test/ui/binding/simple-generic-match.rs
+++ b/tests/ui/binding/simple-generic-match.rs
diff --git a/src/test/ui/binding/use-uninit-match.rs b/tests/ui/binding/use-uninit-match.rs
index 9250dbf0c..9250dbf0c 100644
--- a/src/test/ui/binding/use-uninit-match.rs
+++ b/tests/ui/binding/use-uninit-match.rs
diff --git a/src/test/ui/binding/use-uninit-match2.rs b/tests/ui/binding/use-uninit-match2.rs
index 910273062..910273062 100644
--- a/src/test/ui/binding/use-uninit-match2.rs
+++ b/tests/ui/binding/use-uninit-match2.rs
diff --git a/src/test/ui/binding/zero_sized_subslice_match.rs b/tests/ui/binding/zero_sized_subslice_match.rs
index 187c29836..187c29836 100644
--- a/src/test/ui/binding/zero_sized_subslice_match.rs
+++ b/tests/ui/binding/zero_sized_subslice_match.rs
diff --git a/src/test/ui/binop/binary-minus-without-space.rs b/tests/ui/binop/binary-minus-without-space.rs
index 2fbd5300d..2fbd5300d 100644
--- a/src/test/ui/binop/binary-minus-without-space.rs
+++ b/tests/ui/binop/binary-minus-without-space.rs
diff --git a/src/test/ui/binop/binary-op-on-double-ref.fixed b/tests/ui/binop/binary-op-on-double-ref.fixed
index de9dc19af..de9dc19af 100644
--- a/src/test/ui/binop/binary-op-on-double-ref.fixed
+++ b/tests/ui/binop/binary-op-on-double-ref.fixed
diff --git a/src/test/ui/binop/binary-op-on-double-ref.rs b/tests/ui/binop/binary-op-on-double-ref.rs
index 2616c560c..2616c560c 100644
--- a/src/test/ui/binop/binary-op-on-double-ref.rs
+++ b/tests/ui/binop/binary-op-on-double-ref.rs
diff --git a/src/test/ui/binop/binary-op-on-double-ref.stderr b/tests/ui/binop/binary-op-on-double-ref.stderr
index 34826d2f4..34826d2f4 100644
--- a/src/test/ui/binop/binary-op-on-double-ref.stderr
+++ b/tests/ui/binop/binary-op-on-double-ref.stderr
diff --git a/src/test/ui/binop/binary-op-on-fn-ptr-eq.rs b/tests/ui/binop/binary-op-on-fn-ptr-eq.rs
index 8e20640b5..8e20640b5 100644
--- a/src/test/ui/binop/binary-op-on-fn-ptr-eq.rs
+++ b/tests/ui/binop/binary-op-on-fn-ptr-eq.rs
diff --git a/src/test/ui/binop/binop-bitxor-str.rs b/tests/ui/binop/binop-bitxor-str.rs
index 3085cce3f..3085cce3f 100644
--- a/src/test/ui/binop/binop-bitxor-str.rs
+++ b/tests/ui/binop/binop-bitxor-str.rs
diff --git a/src/test/ui/binop/binop-bitxor-str.stderr b/tests/ui/binop/binop-bitxor-str.stderr
index f236cd61e..f236cd61e 100644
--- a/src/test/ui/binop/binop-bitxor-str.stderr
+++ b/tests/ui/binop/binop-bitxor-str.stderr
diff --git a/src/test/ui/binop/binop-consume-args.rs b/tests/ui/binop/binop-consume-args.rs
index 8d6c725d7..8d6c725d7 100644
--- a/src/test/ui/binop/binop-consume-args.rs
+++ b/tests/ui/binop/binop-consume-args.rs
diff --git a/src/test/ui/binop/binop-consume-args.stderr b/tests/ui/binop/binop-consume-args.stderr
index c734f8c1e..6fbbb5543 100644
--- a/src/test/ui/binop/binop-consume-args.stderr
+++ b/tests/ui/binop/binop-consume-args.stderr
@@ -10,9 +10,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn add(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn add<A: Add<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -46,9 +43,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn sub(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn sub<A: Sub<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -82,9 +76,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn mul(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn mul<A: Mul<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -118,9 +109,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn div(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn div<A: Div<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -154,9 +142,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn rem(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn rem<A: Rem<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -190,9 +175,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL |     fn bitand(self, rhs: Rhs) -> Self::Output;
-   |               ^^^^
 help: consider further restricting this bound
    |
 LL | fn bitand<A: BitAnd<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -226,9 +208,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL |     fn bitor(self, rhs: Rhs) -> Self::Output;
-   |              ^^^^
 help: consider further restricting this bound
    |
 LL | fn bitor<A: BitOr<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -262,9 +241,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL |     fn bitxor(self, rhs: Rhs) -> Self::Output;
-   |               ^^^^
 help: consider further restricting this bound
    |
 LL | fn bitxor<A: BitXor<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -298,9 +274,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL |     fn shl(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn shl<A: Shl<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -334,9 +307,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL |     fn shr(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn shr<A: Shr<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
diff --git a/src/test/ui/binop/binop-fail-3.rs b/tests/ui/binop/binop-fail-3.rs
index 49f635e0c..49f635e0c 100644
--- a/src/test/ui/binop/binop-fail-3.rs
+++ b/tests/ui/binop/binop-fail-3.rs
diff --git a/src/test/ui/binop/binop-logic-float.rs b/tests/ui/binop/binop-logic-float.rs
index 1750d97ba..1750d97ba 100644
--- a/src/test/ui/binop/binop-logic-float.rs
+++ b/tests/ui/binop/binop-logic-float.rs
diff --git a/src/test/ui/binop/binop-logic-float.stderr b/tests/ui/binop/binop-logic-float.stderr
index 3615622ae..3615622ae 100644
--- a/src/test/ui/binop/binop-logic-float.stderr
+++ b/tests/ui/binop/binop-logic-float.stderr
diff --git a/src/test/ui/binop/binop-logic-int.rs b/tests/ui/binop/binop-logic-int.rs
index e71daa2dd..e71daa2dd 100644
--- a/src/test/ui/binop/binop-logic-int.rs
+++ b/tests/ui/binop/binop-logic-int.rs
diff --git a/src/test/ui/binop/binop-logic-int.stderr b/tests/ui/binop/binop-logic-int.stderr
index 50d857cd9..50d857cd9 100644
--- a/src/test/ui/binop/binop-logic-int.stderr
+++ b/tests/ui/binop/binop-logic-int.stderr
diff --git a/src/test/ui/binop/binop-move-semantics.rs b/tests/ui/binop/binop-move-semantics.rs
index b5133ea7c..b5133ea7c 100644
--- a/src/test/ui/binop/binop-move-semantics.rs
+++ b/tests/ui/binop/binop-move-semantics.rs
diff --git a/src/test/ui/binop/binop-move-semantics.stderr b/tests/ui/binop/binop-move-semantics.stderr
index 994eaf9d8..dae267da0 100644
--- a/src/test/ui/binop/binop-move-semantics.stderr
+++ b/tests/ui/binop/binop-move-semantics.stderr
@@ -13,9 +13,6 @@ LL | |     x;
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn add(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn double_move<T: Add<Output=()> + Copy>(x: T) {
@@ -78,9 +75,6 @@ LL | |     *n;
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn add(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 
 error[E0507]: cannot move out of `*n` which is behind a shared reference
   --> $DIR/binop-move-semantics.rs:32:5
diff --git a/src/test/ui/binop/binop-mul-bool.rs b/tests/ui/binop/binop-mul-bool.rs
index 41494c7a0..41494c7a0 100644
--- a/src/test/ui/binop/binop-mul-bool.rs
+++ b/tests/ui/binop/binop-mul-bool.rs
diff --git a/src/test/ui/binop/binop-mul-bool.stderr b/tests/ui/binop/binop-mul-bool.stderr
index 8b5cde63c..8b5cde63c 100644
--- a/src/test/ui/binop/binop-mul-bool.stderr
+++ b/tests/ui/binop/binop-mul-bool.stderr
diff --git a/src/test/ui/binop/binop-mul-i32-f32.rs b/tests/ui/binop/binop-mul-i32-f32.rs
index d18be51a4..d18be51a4 100644
--- a/src/test/ui/binop/binop-mul-i32-f32.rs
+++ b/tests/ui/binop/binop-mul-i32-f32.rs
diff --git a/src/test/ui/binop/binop-mul-i32-f32.stderr b/tests/ui/binop/binop-mul-i32-f32.stderr
index c986bc3fd..c986bc3fd 100644
--- a/src/test/ui/binop/binop-mul-i32-f32.stderr
+++ b/tests/ui/binop/binop-mul-i32-f32.stderr
diff --git a/src/test/ui/binop/binop-panic.rs b/tests/ui/binop/binop-panic.rs
index 44cdfffee..44cdfffee 100644
--- a/src/test/ui/binop/binop-panic.rs
+++ b/tests/ui/binop/binop-panic.rs
diff --git a/src/test/ui/binop/binop-typeck.rs b/tests/ui/binop/binop-typeck.rs
index 812fe95db..812fe95db 100644
--- a/src/test/ui/binop/binop-typeck.rs
+++ b/tests/ui/binop/binop-typeck.rs
diff --git a/src/test/ui/binop/binop-typeck.stderr b/tests/ui/binop/binop-typeck.stderr
index 42d910819..42d910819 100644
--- a/src/test/ui/binop/binop-typeck.stderr
+++ b/tests/ui/binop/binop-typeck.stderr
diff --git a/src/test/ui/binop/binops-issue-22743.rs b/tests/ui/binop/binops-issue-22743.rs
index 393ba0a56..393ba0a56 100644
--- a/src/test/ui/binop/binops-issue-22743.rs
+++ b/tests/ui/binop/binops-issue-22743.rs
diff --git a/src/test/ui/binop/binops.rs b/tests/ui/binop/binops.rs
index a7abf6087..a7abf6087 100644
--- a/src/test/ui/binop/binops.rs
+++ b/tests/ui/binop/binops.rs
diff --git a/src/test/ui/binop/issue-25916.rs b/tests/ui/binop/issue-25916.rs
index 0b4159479..0b4159479 100644
--- a/src/test/ui/binop/issue-25916.rs
+++ b/tests/ui/binop/issue-25916.rs
diff --git a/src/test/ui/binop/issue-28837.rs b/tests/ui/binop/issue-28837.rs
index 9719c3afa..9719c3afa 100644
--- a/src/test/ui/binop/issue-28837.rs
+++ b/tests/ui/binop/issue-28837.rs
diff --git a/src/test/ui/binop/issue-28837.stderr b/tests/ui/binop/issue-28837.stderr
index b9c7e1bea..6e236ca52 100644
--- a/src/test/ui/binop/issue-28837.stderr
+++ b/tests/ui/binop/issue-28837.stderr
@@ -11,11 +11,8 @@ note: an implementation of `Add<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Add<_>`
-note: the following trait must be implemented
+note: the trait `Add` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Add<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: cannot subtract `A` from `A`
   --> $DIR/issue-28837.rs:8:7
@@ -30,11 +27,8 @@ note: an implementation of `Sub<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Sub<_>`
-note: the following trait must be implemented
+note: the trait `Sub` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Sub<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: cannot multiply `A` by `A`
   --> $DIR/issue-28837.rs:10:7
@@ -49,11 +43,8 @@ note: an implementation of `Mul<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Mul<_>`
-note: the following trait must be implemented
+note: the trait `Mul` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Mul<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: cannot divide `A` by `A`
   --> $DIR/issue-28837.rs:12:7
@@ -68,11 +59,8 @@ note: an implementation of `Div<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Div<_>`
-note: the following trait must be implemented
+note: the trait `Div` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Div<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: cannot mod `A` by `A`
   --> $DIR/issue-28837.rs:14:7
@@ -87,11 +75,8 @@ note: an implementation of `Rem<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Rem<_>`
-note: the following trait must be implemented
+note: the trait `Rem` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Rem<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: no implementation for `A & A`
   --> $DIR/issue-28837.rs:16:7
@@ -106,11 +91,8 @@ note: an implementation of `BitAnd<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `BitAnd<_>`
-note: the following trait must be implemented
+note: the trait `BitAnd` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL | pub trait BitAnd<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: no implementation for `A | A`
   --> $DIR/issue-28837.rs:18:7
@@ -125,11 +107,8 @@ note: an implementation of `BitOr<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `BitOr<_>`
-note: the following trait must be implemented
+note: the trait `BitOr` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL | pub trait BitOr<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: no implementation for `A << A`
   --> $DIR/issue-28837.rs:20:7
@@ -144,11 +123,8 @@ note: an implementation of `Shl<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Shl<_>`
-note: the following trait must be implemented
+note: the trait `Shl` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL | pub trait Shl<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: no implementation for `A >> A`
   --> $DIR/issue-28837.rs:22:7
@@ -163,11 +139,8 @@ note: an implementation of `Shr<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Shr<_>`
-note: the following trait must be implemented
+note: the trait `Shr` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL | pub trait Shr<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: binary operation `==` cannot be applied to type `A`
   --> $DIR/issue-28837.rs:24:7
diff --git a/src/test/ui/binop/issue-3820.rs b/tests/ui/binop/issue-3820.rs
index b987a90b2..b987a90b2 100644
--- a/src/test/ui/binop/issue-3820.rs
+++ b/tests/ui/binop/issue-3820.rs
diff --git a/src/test/ui/binop/issue-3820.stderr b/tests/ui/binop/issue-3820.stderr
index f21f89069..c313ed603 100644
--- a/src/test/ui/binop/issue-3820.stderr
+++ b/tests/ui/binop/issue-3820.stderr
@@ -11,11 +11,8 @@ note: an implementation of `Mul<_>` might be missing for `Thing`
    |
 LL | struct Thing {
    | ^^^^^^^^^^^^ must implement `Mul<_>`
-note: the following trait must be implemented
+note: the trait `Mul` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Mul<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/binop/issue-77910-1.rs b/tests/ui/binop/issue-77910-1.rs
index 95bbd6a60..95bbd6a60 100644
--- a/src/test/ui/binop/issue-77910-1.rs
+++ b/tests/ui/binop/issue-77910-1.rs
diff --git a/src/test/ui/binop/issue-77910-1.stderr b/tests/ui/binop/issue-77910-1.stderr
index 263a35d98..263a35d98 100644
--- a/src/test/ui/binop/issue-77910-1.stderr
+++ b/tests/ui/binop/issue-77910-1.stderr
diff --git a/src/test/ui/binop/issue-77910-2.rs b/tests/ui/binop/issue-77910-2.rs
index 2bb48d365..2bb48d365 100644
--- a/src/test/ui/binop/issue-77910-2.rs
+++ b/tests/ui/binop/issue-77910-2.rs
diff --git a/src/test/ui/binop/issue-77910-2.stderr b/tests/ui/binop/issue-77910-2.stderr
index b3856b6ae..b3856b6ae 100644
--- a/src/test/ui/binop/issue-77910-2.stderr
+++ b/tests/ui/binop/issue-77910-2.stderr
diff --git a/src/test/ui/binop/issue-93927.rs b/tests/ui/binop/issue-93927.rs
index de27c9785..de27c9785 100644
--- a/src/test/ui/binop/issue-93927.rs
+++ b/tests/ui/binop/issue-93927.rs
diff --git a/src/test/ui/binop/issue-93927.stderr b/tests/ui/binop/issue-93927.stderr
index 75558b502..75558b502 100644
--- a/src/test/ui/binop/issue-93927.stderr
+++ b/tests/ui/binop/issue-93927.stderr
diff --git a/src/test/ui/binop/operator-multidispatch.rs b/tests/ui/binop/operator-multidispatch.rs
index 0d1dcfd8b..0d1dcfd8b 100644
--- a/src/test/ui/binop/operator-multidispatch.rs
+++ b/tests/ui/binop/operator-multidispatch.rs
diff --git a/src/test/ui/binop/operator-overloading.rs b/tests/ui/binop/operator-overloading.rs
index 6b3abcbc7..6b3abcbc7 100644
--- a/src/test/ui/binop/operator-overloading.rs
+++ b/tests/ui/binop/operator-overloading.rs
diff --git a/src/test/ui/binop/placement-syntax.rs b/tests/ui/binop/placement-syntax.rs
index 4df96dedb..4df96dedb 100644
--- a/src/test/ui/binop/placement-syntax.rs
+++ b/tests/ui/binop/placement-syntax.rs
diff --git a/src/test/ui/binop/placement-syntax.stderr b/tests/ui/binop/placement-syntax.stderr
index 3fdaf4cd0..3fdaf4cd0 100644
--- a/src/test/ui/binop/placement-syntax.stderr
+++ b/tests/ui/binop/placement-syntax.stderr
diff --git a/src/test/ui/binop/shift-various-bad-types.rs b/tests/ui/binop/shift-various-bad-types.rs
index 31224bbca..31224bbca 100644
--- a/src/test/ui/binop/shift-various-bad-types.rs
+++ b/tests/ui/binop/shift-various-bad-types.rs
diff --git a/src/test/ui/binop/shift-various-bad-types.stderr b/tests/ui/binop/shift-various-bad-types.stderr
index 38db66f86..38db66f86 100644
--- a/src/test/ui/binop/shift-various-bad-types.stderr
+++ b/tests/ui/binop/shift-various-bad-types.stderr
diff --git a/src/test/ui/binop/structured-compare.rs b/tests/ui/binop/structured-compare.rs
index 63d30c4da..63d30c4da 100644
--- a/src/test/ui/binop/structured-compare.rs
+++ b/tests/ui/binop/structured-compare.rs
diff --git a/src/test/ui/bitwise.rs b/tests/ui/bitwise.rs
index f79ff3c6e..f79ff3c6e 100644
--- a/src/test/ui/bitwise.rs
+++ b/tests/ui/bitwise.rs
diff --git a/src/test/ui/blind/blind-item-block-item-shadow.rs b/tests/ui/blind/blind-item-block-item-shadow.rs
index d90ef77e2..d90ef77e2 100644
--- a/src/test/ui/blind/blind-item-block-item-shadow.rs
+++ b/tests/ui/blind/blind-item-block-item-shadow.rs
diff --git a/src/test/ui/blind/blind-item-block-item-shadow.stderr b/tests/ui/blind/blind-item-block-item-shadow.stderr
index 68b3f4c1a..68b3f4c1a 100644
--- a/src/test/ui/blind/blind-item-block-item-shadow.stderr
+++ b/tests/ui/blind/blind-item-block-item-shadow.stderr
diff --git a/src/test/ui/blind/blind-item-block-middle.rs b/tests/ui/blind/blind-item-block-middle.rs
index 6cd3f3bd4..6cd3f3bd4 100644
--- a/src/test/ui/blind/blind-item-block-middle.rs
+++ b/tests/ui/blind/blind-item-block-middle.rs
diff --git a/src/test/ui/blind/blind-item-block-middle.stderr b/tests/ui/blind/blind-item-block-middle.stderr
index eb64fea94..eb64fea94 100644
--- a/src/test/ui/blind/blind-item-block-middle.stderr
+++ b/tests/ui/blind/blind-item-block-middle.stderr
diff --git a/src/test/ui/blind/blind-item-item-shadow.rs b/tests/ui/blind/blind-item-item-shadow.rs
index 82d07ea70..82d07ea70 100644
--- a/src/test/ui/blind/blind-item-item-shadow.rs
+++ b/tests/ui/blind/blind-item-item-shadow.rs
diff --git a/src/test/ui/blind/blind-item-item-shadow.stderr b/tests/ui/blind/blind-item-item-shadow.stderr
index 7f9e80089..7f9e80089 100644
--- a/src/test/ui/blind/blind-item-item-shadow.stderr
+++ b/tests/ui/blind/blind-item-item-shadow.stderr
diff --git a/src/test/ui/block-result/block-must-not-have-result-do.rs b/tests/ui/block-result/block-must-not-have-result-do.rs
index 4fdb69778..4fdb69778 100644
--- a/src/test/ui/block-result/block-must-not-have-result-do.rs
+++ b/tests/ui/block-result/block-must-not-have-result-do.rs
diff --git a/src/test/ui/block-result/block-must-not-have-result-do.stderr b/tests/ui/block-result/block-must-not-have-result-do.stderr
index 914886f81..914886f81 100644
--- a/src/test/ui/block-result/block-must-not-have-result-do.stderr
+++ b/tests/ui/block-result/block-must-not-have-result-do.stderr
diff --git a/src/test/ui/block-result/block-must-not-have-result-res.rs b/tests/ui/block-result/block-must-not-have-result-res.rs
index 7e86274a1..7e86274a1 100644
--- a/src/test/ui/block-result/block-must-not-have-result-res.rs
+++ b/tests/ui/block-result/block-must-not-have-result-res.rs
diff --git a/src/test/ui/block-result/block-must-not-have-result-res.stderr b/tests/ui/block-result/block-must-not-have-result-res.stderr
index 0080d06dd..0080d06dd 100644
--- a/src/test/ui/block-result/block-must-not-have-result-res.stderr
+++ b/tests/ui/block-result/block-must-not-have-result-res.stderr
diff --git a/src/test/ui/block-result/block-must-not-have-result-while.rs b/tests/ui/block-result/block-must-not-have-result-while.rs
index 418059bf2..418059bf2 100644
--- a/src/test/ui/block-result/block-must-not-have-result-while.rs
+++ b/tests/ui/block-result/block-must-not-have-result-while.rs
diff --git a/src/test/ui/block-result/block-must-not-have-result-while.stderr b/tests/ui/block-result/block-must-not-have-result-while.stderr
index 7f96aa289..7f96aa289 100644
--- a/src/test/ui/block-result/block-must-not-have-result-while.stderr
+++ b/tests/ui/block-result/block-must-not-have-result-while.stderr
diff --git a/src/test/ui/block-result/consider-removing-last-semi.fixed b/tests/ui/block-result/consider-removing-last-semi.fixed
index 36a769fe5..36a769fe5 100644
--- a/src/test/ui/block-result/consider-removing-last-semi.fixed
+++ b/tests/ui/block-result/consider-removing-last-semi.fixed
diff --git a/src/test/ui/block-result/consider-removing-last-semi.rs b/tests/ui/block-result/consider-removing-last-semi.rs
index b9a731489..b9a731489 100644
--- a/src/test/ui/block-result/consider-removing-last-semi.rs
+++ b/tests/ui/block-result/consider-removing-last-semi.rs
diff --git a/src/test/ui/block-result/consider-removing-last-semi.stderr b/tests/ui/block-result/consider-removing-last-semi.stderr
index 9be0367ae..9be0367ae 100644
--- a/src/test/ui/block-result/consider-removing-last-semi.stderr
+++ b/tests/ui/block-result/consider-removing-last-semi.stderr
diff --git a/src/test/ui/block-result/issue-11714.rs b/tests/ui/block-result/issue-11714.rs
index 3dda7e801..3dda7e801 100644
--- a/src/test/ui/block-result/issue-11714.rs
+++ b/tests/ui/block-result/issue-11714.rs
diff --git a/src/test/ui/block-result/issue-11714.stderr b/tests/ui/block-result/issue-11714.stderr
index 42fb3d3d4..42fb3d3d4 100644
--- a/src/test/ui/block-result/issue-11714.stderr
+++ b/tests/ui/block-result/issue-11714.stderr
diff --git a/src/test/ui/block-result/issue-13428.rs b/tests/ui/block-result/issue-13428.rs
index ac8596435..ac8596435 100644
--- a/src/test/ui/block-result/issue-13428.rs
+++ b/tests/ui/block-result/issue-13428.rs
diff --git a/src/test/ui/block-result/issue-13428.stderr b/tests/ui/block-result/issue-13428.stderr
index 2b386d10c..2b386d10c 100644
--- a/src/test/ui/block-result/issue-13428.stderr
+++ b/tests/ui/block-result/issue-13428.stderr
diff --git a/src/test/ui/block-result/issue-13624.rs b/tests/ui/block-result/issue-13624.rs
index 4d2844cc5..4d2844cc5 100644
--- a/src/test/ui/block-result/issue-13624.rs
+++ b/tests/ui/block-result/issue-13624.rs
diff --git a/src/test/ui/block-result/issue-13624.stderr b/tests/ui/block-result/issue-13624.stderr
index 13070b4e8..13070b4e8 100644
--- a/src/test/ui/block-result/issue-13624.stderr
+++ b/tests/ui/block-result/issue-13624.stderr
diff --git a/src/test/ui/block-result/issue-20862.rs b/tests/ui/block-result/issue-20862.rs
index e435fd7ae..e435fd7ae 100644
--- a/src/test/ui/block-result/issue-20862.rs
+++ b/tests/ui/block-result/issue-20862.rs
diff --git a/src/test/ui/block-result/issue-20862.stderr b/tests/ui/block-result/issue-20862.stderr
index 37bad64c5..37bad64c5 100644
--- a/src/test/ui/block-result/issue-20862.stderr
+++ b/tests/ui/block-result/issue-20862.stderr
diff --git a/src/test/ui/block-result/issue-22645.rs b/tests/ui/block-result/issue-22645.rs
index 5f7fb8dd3..5f7fb8dd3 100644
--- a/src/test/ui/block-result/issue-22645.rs
+++ b/tests/ui/block-result/issue-22645.rs
diff --git a/src/test/ui/block-result/issue-22645.stderr b/tests/ui/block-result/issue-22645.stderr
index 28debd60a..24341c0f5 100644
--- a/src/test/ui/block-result/issue-22645.stderr
+++ b/tests/ui/block-result/issue-22645.stderr
@@ -9,7 +9,9 @@ note: required for `Bob` to implement `Add<{integer}>`
   --> $DIR/issue-22645.rs:8:19
    |
 LL | impl<RHS: Scalar> Add <RHS> for Bob {
-   |                   ^^^^^^^^^     ^^^
+   |           ------  ^^^^^^^^^     ^^^
+   |           |
+   |           unsatisfied trait bound introduced here
 
 error[E0308]: mismatched types
   --> $DIR/issue-22645.rs:15:3
diff --git a/src/test/ui/block-result/issue-3563.rs b/tests/ui/block-result/issue-3563.rs
index 0b652a1f5..0b652a1f5 100644
--- a/src/test/ui/block-result/issue-3563.rs
+++ b/tests/ui/block-result/issue-3563.rs
diff --git a/src/test/ui/block-result/issue-3563.stderr b/tests/ui/block-result/issue-3563.stderr
index be551f6e8..be551f6e8 100644
--- a/src/test/ui/block-result/issue-3563.stderr
+++ b/tests/ui/block-result/issue-3563.stderr
diff --git a/src/test/ui/block-result/issue-5500.rs b/tests/ui/block-result/issue-5500.rs
index 577987a45..577987a45 100644
--- a/src/test/ui/block-result/issue-5500.rs
+++ b/tests/ui/block-result/issue-5500.rs
diff --git a/src/test/ui/block-result/issue-5500.stderr b/tests/ui/block-result/issue-5500.stderr
index 211a60528..211a60528 100644
--- a/src/test/ui/block-result/issue-5500.stderr
+++ b/tests/ui/block-result/issue-5500.stderr
diff --git a/src/test/ui/block-result/unexpected-return-on-unit.rs b/tests/ui/block-result/unexpected-return-on-unit.rs
index 2fcbfe8c0..2fcbfe8c0 100644
--- a/src/test/ui/block-result/unexpected-return-on-unit.rs
+++ b/tests/ui/block-result/unexpected-return-on-unit.rs
diff --git a/src/test/ui/block-result/unexpected-return-on-unit.stderr b/tests/ui/block-result/unexpected-return-on-unit.stderr
index 4acb955a8..4acb955a8 100644
--- a/src/test/ui/block-result/unexpected-return-on-unit.stderr
+++ b/tests/ui/block-result/unexpected-return-on-unit.stderr
diff --git a/src/test/ui/bogus-tag.rs b/tests/ui/bogus-tag.rs
index c594385ee..c594385ee 100644
--- a/src/test/ui/bogus-tag.rs
+++ b/tests/ui/bogus-tag.rs
diff --git a/src/test/ui/bogus-tag.stderr b/tests/ui/bogus-tag.stderr
index 899ff4261..899ff4261 100644
--- a/src/test/ui/bogus-tag.stderr
+++ b/tests/ui/bogus-tag.stderr
diff --git a/src/test/ui/borrow-by-val-method-receiver.rs b/tests/ui/borrow-by-val-method-receiver.rs
index 465bef161..465bef161 100644
--- a/src/test/ui/borrow-by-val-method-receiver.rs
+++ b/tests/ui/borrow-by-val-method-receiver.rs
diff --git a/src/test/ui/borrowck/access-mode-in-closures.rs b/tests/ui/borrowck/access-mode-in-closures.rs
index 9bd90e70a..9bd90e70a 100644
--- a/src/test/ui/borrowck/access-mode-in-closures.rs
+++ b/tests/ui/borrowck/access-mode-in-closures.rs
diff --git a/tests/ui/borrowck/access-mode-in-closures.stderr b/tests/ui/borrowck/access-mode-in-closures.stderr
new file mode 100644
index 000000000..abee72ba8
--- /dev/null
+++ b/tests/ui/borrowck/access-mode-in-closures.stderr
@@ -0,0 +1,18 @@
+error[E0507]: cannot move out of `s` which is behind a shared reference
+  --> $DIR/access-mode-in-closures.rs:8:15
+   |
+LL |         match *s { S(v) => v }
+   |               ^^     -
+   |                      |
+   |                      data moved here
+   |                      move occurs because `v` has type `Vec<isize>`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -         match *s { S(v) => v }
+LL +         match s { S(v) => v }
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/anonymous-region-in-apit.rs b/tests/ui/borrowck/anonymous-region-in-apit.rs
index 7799a7cb1..7799a7cb1 100644
--- a/src/test/ui/borrowck/anonymous-region-in-apit.rs
+++ b/tests/ui/borrowck/anonymous-region-in-apit.rs
diff --git a/src/test/ui/borrowck/anonymous-region-in-apit.stderr b/tests/ui/borrowck/anonymous-region-in-apit.stderr
index 9e100f8ac..9e100f8ac 100644
--- a/src/test/ui/borrowck/anonymous-region-in-apit.stderr
+++ b/tests/ui/borrowck/anonymous-region-in-apit.stderr
diff --git a/src/test/ui/borrowck/assign-never-type.rs b/tests/ui/borrowck/assign-never-type.rs
index 4f30ea146..4f30ea146 100644
--- a/src/test/ui/borrowck/assign-never-type.rs
+++ b/tests/ui/borrowck/assign-never-type.rs
diff --git a/src/test/ui/borrowck/assign_mutable_fields.rs b/tests/ui/borrowck/assign_mutable_fields.rs
index b60726d0c..b60726d0c 100644
--- a/src/test/ui/borrowck/assign_mutable_fields.rs
+++ b/tests/ui/borrowck/assign_mutable_fields.rs
diff --git a/src/test/ui/borrowck/assign_mutable_fields.stderr b/tests/ui/borrowck/assign_mutable_fields.stderr
index 1ed92865d..1ed92865d 100644
--- a/src/test/ui/borrowck/assign_mutable_fields.stderr
+++ b/tests/ui/borrowck/assign_mutable_fields.stderr
diff --git a/src/test/ui/borrowck/async-reference-generality.rs b/tests/ui/borrowck/async-reference-generality.rs
index 487d1ac81..487d1ac81 100644
--- a/src/test/ui/borrowck/async-reference-generality.rs
+++ b/tests/ui/borrowck/async-reference-generality.rs
diff --git a/src/test/ui/borrowck/async-reference-generality.stderr b/tests/ui/borrowck/async-reference-generality.stderr
index af720ad29..af720ad29 100644
--- a/src/test/ui/borrowck/async-reference-generality.stderr
+++ b/tests/ui/borrowck/async-reference-generality.stderr
diff --git a/src/test/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs b/tests/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs
index baf31bd89..baf31bd89 100644
--- a/src/test/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs
+++ b/tests/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs
diff --git a/src/test/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.stderr b/tests/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.stderr
index 50eee1049..50eee1049 100644
--- a/src/test/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.stderr
+++ b/tests/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.stderr
diff --git a/src/test/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.rs b/tests/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.rs
index 57198cb95..57198cb95 100644
--- a/src/test/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.rs
+++ b/tests/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.rs
diff --git a/src/test/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.stderr b/tests/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.stderr
index 6235e0db0..6235e0db0 100644
--- a/src/test/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.stderr
+++ b/tests/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.stderr
diff --git a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.rs b/tests/ui/borrowck/borrow-immutable-upvar-mutation.rs
index a3350024e..a3350024e 100644
--- a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.rs
+++ b/tests/ui/borrowck/borrow-immutable-upvar-mutation.rs
diff --git a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.stderr b/tests/ui/borrowck/borrow-immutable-upvar-mutation.stderr
index a0eaf1f16..a0eaf1f16 100644
--- a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.stderr
+++ b/tests/ui/borrowck/borrow-immutable-upvar-mutation.stderr
diff --git a/src/test/ui/borrowck/borrow-raw-address-of-borrowed.rs b/tests/ui/borrowck/borrow-raw-address-of-borrowed.rs
index f25fd7f66..f25fd7f66 100644
--- a/src/test/ui/borrowck/borrow-raw-address-of-borrowed.rs
+++ b/tests/ui/borrowck/borrow-raw-address-of-borrowed.rs
diff --git a/src/test/ui/borrowck/borrow-raw-address-of-borrowed.stderr b/tests/ui/borrowck/borrow-raw-address-of-borrowed.stderr
index 6f7b7e080..6f7b7e080 100644
--- a/src/test/ui/borrowck/borrow-raw-address-of-borrowed.stderr
+++ b/tests/ui/borrowck/borrow-raw-address-of-borrowed.stderr
diff --git a/src/test/ui/borrowck/borrow-raw-address-of-deref-mutability-ok.rs b/tests/ui/borrowck/borrow-raw-address-of-deref-mutability-ok.rs
index e381384fe..e381384fe 100644
--- a/src/test/ui/borrowck/borrow-raw-address-of-deref-mutability-ok.rs
+++ b/tests/ui/borrowck/borrow-raw-address-of-deref-mutability-ok.rs
diff --git a/src/test/ui/borrowck/borrow-raw-address-of-deref-mutability.rs b/tests/ui/borrowck/borrow-raw-address-of-deref-mutability.rs
index 712873528..712873528 100644
--- a/src/test/ui/borrowck/borrow-raw-address-of-deref-mutability.rs
+++ b/tests/ui/borrowck/borrow-raw-address-of-deref-mutability.rs
diff --git a/tests/ui/borrowck/borrow-raw-address-of-deref-mutability.stderr b/tests/ui/borrowck/borrow-raw-address-of-deref-mutability.stderr
new file mode 100644
index 000000000..4cc1d821d
--- /dev/null
+++ b/tests/ui/borrowck/borrow-raw-address-of-deref-mutability.stderr
@@ -0,0 +1,25 @@
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrow-raw-address-of-deref-mutability.rs:8:13
+   |
+LL |     let q = &raw mut *x;
+   |             ^^^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let x = &mut 0;
+   |             ~~~~~~
+
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `*const` pointer
+  --> $DIR/borrow-raw-address-of-deref-mutability.rs:14:13
+   |
+LL |     let q = &raw mut *x;
+   |             ^^^^^^^^^^^ `x` is a `*const` pointer, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable pointer
+   |
+LL |     let x = &mut 0 as *const i32;
+   |             ~~~~~~
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/borrowck/borrow-raw-address-of-mutability-ok.rs b/tests/ui/borrowck/borrow-raw-address-of-mutability-ok.rs
index e1cf2dc53..e1cf2dc53 100644
--- a/src/test/ui/borrowck/borrow-raw-address-of-mutability-ok.rs
+++ b/tests/ui/borrowck/borrow-raw-address-of-mutability-ok.rs
diff --git a/src/test/ui/borrowck/borrow-raw-address-of-mutability.rs b/tests/ui/borrowck/borrow-raw-address-of-mutability.rs
index 320c54b80..320c54b80 100644
--- a/src/test/ui/borrowck/borrow-raw-address-of-mutability.rs
+++ b/tests/ui/borrowck/borrow-raw-address-of-mutability.rs
diff --git a/src/test/ui/borrowck/borrow-raw-address-of-mutability.stderr b/tests/ui/borrowck/borrow-raw-address-of-mutability.stderr
index 869375cb2..a77482091 100644
--- a/src/test/ui/borrowck/borrow-raw-address-of-mutability.stderr
+++ b/tests/ui/borrowck/borrow-raw-address-of-mutability.stderr
@@ -1,10 +1,13 @@
 error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
   --> $DIR/borrow-raw-address-of-mutability.rs:5:13
    |
-LL |     let x = 0;
-   |         - help: consider changing this to be mutable: `mut x`
 LL |     let y = &raw mut x;
    |             ^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut x = 0;
+   |         +++
 
 error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
   --> $DIR/borrow-raw-address-of-mutability.rs:11:17
@@ -18,13 +21,16 @@ LL |         let y = &raw mut x;
 error[E0596]: cannot borrow `f` as mutable, as it is not declared as mutable
   --> $DIR/borrow-raw-address-of-mutability.rs:21:5
    |
-LL |     let f = || {
-   |         - help: consider changing this to be mutable: `mut f`
 LL |         let y = &raw mut x;
    |                          - calling `f` requires mutable binding due to mutable borrow of `x`
 LL |     };
 LL |     f();
    |     ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut f = || {
+   |         +++
 
 error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/borrow-raw-address-of-mutability.rs:29:17
diff --git a/src/test/ui/borrowck/borrow-tuple-fields.rs b/tests/ui/borrowck/borrow-tuple-fields.rs
index c628fa49e..c628fa49e 100644
--- a/src/test/ui/borrowck/borrow-tuple-fields.rs
+++ b/tests/ui/borrowck/borrow-tuple-fields.rs
diff --git a/src/test/ui/borrowck/borrow-tuple-fields.stderr b/tests/ui/borrowck/borrow-tuple-fields.stderr
index befa751a6..befa751a6 100644
--- a/src/test/ui/borrowck/borrow-tuple-fields.stderr
+++ b/tests/ui/borrowck/borrow-tuple-fields.stderr
diff --git a/src/test/ui/borrowck/borrowck-access-permissions.rs b/tests/ui/borrowck/borrowck-access-permissions.rs
index 469ad508b..469ad508b 100644
--- a/src/test/ui/borrowck/borrowck-access-permissions.rs
+++ b/tests/ui/borrowck/borrowck-access-permissions.rs
diff --git a/tests/ui/borrowck/borrowck-access-permissions.stderr b/tests/ui/borrowck/borrowck-access-permissions.stderr
new file mode 100644
index 000000000..26f3e2bbd
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-access-permissions.stderr
@@ -0,0 +1,64 @@
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-access-permissions.rs:9:19
+   |
+LL |         let _y1 = &mut x;
+   |                   ^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut x = 1;
+   |         +++
+
+error[E0596]: cannot borrow immutable static item `static_x` as mutable
+  --> $DIR/borrowck-access-permissions.rs:14:19
+   |
+LL |         let _y1 = &mut static_x;
+   |                   ^^^^^^^^^^^^^ cannot borrow as mutable
+
+error[E0596]: cannot borrow `*box_x` as mutable, as `box_x` is not declared as mutable
+  --> $DIR/borrowck-access-permissions.rs:22:19
+   |
+LL |         let _y1 = &mut *box_x;
+   |                   ^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |         let mut box_x = Box::new(1);
+   |             +++
+
+error[E0596]: cannot borrow `*ref_x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-access-permissions.rs:30:19
+   |
+LL |         let _y1 = &mut *ref_x;
+   |                   ^^^^^^^^^^^ `ref_x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |         let ref_x = &mut x;
+   |                     ~~~~~~
+
+error[E0596]: cannot borrow `*ptr_x` as mutable, as it is behind a `*const` pointer
+  --> $DIR/borrowck-access-permissions.rs:39:23
+   |
+LL |             let _y1 = &mut *ptr_x;
+   |                       ^^^^^^^^^^^ `ptr_x` is a `*const` pointer, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable pointer
+   |
+LL |         let ptr_x : *const _ = &mut x;
+   |                                ~~~~~~
+
+error[E0596]: cannot borrow `*foo_ref.f` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-access-permissions.rs:48:18
+   |
+LL |         let _y = &mut *foo_ref.f;
+   |                  ^^^^^^^^^^^^^^^ `foo_ref` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |         let foo_ref = &mut foo;
+   |                       ~~~~~~~~
+
+error: aborting due to 6 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/borrowck/borrowck-and-init.rs b/tests/ui/borrowck/borrowck-and-init.rs
index eeb4f05d6..eeb4f05d6 100644
--- a/src/test/ui/borrowck/borrowck-and-init.rs
+++ b/tests/ui/borrowck/borrowck-and-init.rs
diff --git a/src/test/ui/borrowck/borrowck-and-init.stderr b/tests/ui/borrowck/borrowck-and-init.stderr
index 5abf07a31..5abf07a31 100644
--- a/src/test/ui/borrowck/borrowck-and-init.stderr
+++ b/tests/ui/borrowck/borrowck-and-init.stderr
diff --git a/src/test/ui/borrowck/borrowck-anon-fields-struct.rs b/tests/ui/borrowck/borrowck-anon-fields-struct.rs
index a05dfe62b..a05dfe62b 100644
--- a/src/test/ui/borrowck/borrowck-anon-fields-struct.rs
+++ b/tests/ui/borrowck/borrowck-anon-fields-struct.rs
diff --git a/src/test/ui/borrowck/borrowck-anon-fields-struct.stderr b/tests/ui/borrowck/borrowck-anon-fields-struct.stderr
index 7a959fb6e..7a959fb6e 100644
--- a/src/test/ui/borrowck/borrowck-anon-fields-struct.stderr
+++ b/tests/ui/borrowck/borrowck-anon-fields-struct.stderr
diff --git a/src/test/ui/borrowck/borrowck-anon-fields-tuple.rs b/tests/ui/borrowck/borrowck-anon-fields-tuple.rs
index de2a8d832..de2a8d832 100644
--- a/src/test/ui/borrowck/borrowck-anon-fields-tuple.rs
+++ b/tests/ui/borrowck/borrowck-anon-fields-tuple.rs
diff --git a/src/test/ui/borrowck/borrowck-anon-fields-tuple.stderr b/tests/ui/borrowck/borrowck-anon-fields-tuple.stderr
index 88a8867f5..88a8867f5 100644
--- a/src/test/ui/borrowck/borrowck-anon-fields-tuple.stderr
+++ b/tests/ui/borrowck/borrowck-anon-fields-tuple.stderr
diff --git a/src/test/ui/borrowck/borrowck-anon-fields-variant.rs b/tests/ui/borrowck/borrowck-anon-fields-variant.rs
index 6e63de913..6e63de913 100644
--- a/src/test/ui/borrowck/borrowck-anon-fields-variant.rs
+++ b/tests/ui/borrowck/borrowck-anon-fields-variant.rs
diff --git a/src/test/ui/borrowck/borrowck-anon-fields-variant.stderr b/tests/ui/borrowck/borrowck-anon-fields-variant.stderr
index 98f6f00a7..98f6f00a7 100644
--- a/src/test/ui/borrowck/borrowck-anon-fields-variant.stderr
+++ b/tests/ui/borrowck/borrowck-anon-fields-variant.stderr
diff --git a/src/test/ui/borrowck/borrowck-argument.rs b/tests/ui/borrowck/borrowck-argument.rs
index 5d776d4fc..5d776d4fc 100644
--- a/src/test/ui/borrowck/borrowck-argument.rs
+++ b/tests/ui/borrowck/borrowck-argument.rs
diff --git a/tests/ui/borrowck/borrowck-argument.stderr b/tests/ui/borrowck/borrowck-argument.stderr
new file mode 100644
index 000000000..1c992dfcc
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-argument.stderr
@@ -0,0 +1,47 @@
+error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-argument.rs:10:5
+   |
+LL |     arg.mutate();
+   |     ^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn func(mut arg: S) {
+   |         +++
+
+error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-argument.rs:15:9
+   |
+LL |         arg.mutate();
+   |         ^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     fn method(&self, mut arg: S) {
+   |                      +++
+
+error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-argument.rs:21:9
+   |
+LL |         arg.mutate();
+   |         ^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     fn default(&self, mut arg: S) {
+   |                       +++
+
+error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-argument.rs:32:17
+   |
+LL |     (|arg: S| { arg.mutate() })(s);
+   |                 ^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     (|mut arg: S| { arg.mutate() })(s);
+   |       +++
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/borrowck/borrowck-assign-comp-idx.rs b/tests/ui/borrowck/borrowck-assign-comp-idx.rs
index f4dffeb8c..f4dffeb8c 100644
--- a/src/test/ui/borrowck/borrowck-assign-comp-idx.rs
+++ b/tests/ui/borrowck/borrowck-assign-comp-idx.rs
diff --git a/src/test/ui/borrowck/borrowck-assign-comp-idx.stderr b/tests/ui/borrowck/borrowck-assign-comp-idx.stderr
index b80174ae6..b80174ae6 100644
--- a/src/test/ui/borrowck/borrowck-assign-comp-idx.stderr
+++ b/tests/ui/borrowck/borrowck-assign-comp-idx.stderr
diff --git a/src/test/ui/borrowck/borrowck-assign-comp.rs b/tests/ui/borrowck/borrowck-assign-comp.rs
index 98bb2d85a..98bb2d85a 100644
--- a/src/test/ui/borrowck/borrowck-assign-comp.rs
+++ b/tests/ui/borrowck/borrowck-assign-comp.rs
diff --git a/src/test/ui/borrowck/borrowck-assign-comp.stderr b/tests/ui/borrowck/borrowck-assign-comp.stderr
index 2b7cef7b3..2b7cef7b3 100644
--- a/src/test/ui/borrowck/borrowck-assign-comp.stderr
+++ b/tests/ui/borrowck/borrowck-assign-comp.stderr
diff --git a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs b/tests/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs
index 879c03791..879c03791 100644
--- a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs
+++ b/tests/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs
diff --git a/tests/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.stderr b/tests/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.stderr
new file mode 100644
index 000000000..cbacc87a0
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.stderr
@@ -0,0 +1,25 @@
+error[E0594]: cannot assign to `*s.pointer`, which is behind a `&` reference
+  --> $DIR/borrowck-assign-to-andmut-in-aliasable-loc.rs:9:5
+   |
+LL |     *s.pointer += 1;
+   |     ^^^^^^^^^^^^^^^ `s` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn a(s: &mut S<'_>) {
+   |         ~~~~~~~~~~
+
+error[E0594]: cannot assign to `*s.pointer`, which is behind a `&` reference
+  --> $DIR/borrowck-assign-to-andmut-in-aliasable-loc.rs:17:5
+   |
+LL |     *s.pointer += 1;
+   |     ^^^^^^^^^^^^^^^ `s` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn c(s: &mut &mut S<'_>) {
+   |         ~~~~~~~~~~~~~~~
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs b/tests/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs
index f7aee2b8a..f7aee2b8a 100644
--- a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs
+++ b/tests/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs
diff --git a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.stderr b/tests/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.stderr
index 0b21d113f..0b21d113f 100644
--- a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.stderr
+++ b/tests/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.stderr
diff --git a/src/test/ui/borrowck/borrowck-assign-to-constants.rs b/tests/ui/borrowck/borrowck-assign-to-constants.rs
index 5881dccf6..5881dccf6 100644
--- a/src/test/ui/borrowck/borrowck-assign-to-constants.rs
+++ b/tests/ui/borrowck/borrowck-assign-to-constants.rs
diff --git a/src/test/ui/borrowck/borrowck-assign-to-constants.stderr b/tests/ui/borrowck/borrowck-assign-to-constants.stderr
index 864d933da..864d933da 100644
--- a/src/test/ui/borrowck/borrowck-assign-to-constants.stderr
+++ b/tests/ui/borrowck/borrowck-assign-to-constants.stderr
diff --git a/src/test/ui/borrowck/borrowck-assign-to-subfield.rs b/tests/ui/borrowck/borrowck-assign-to-subfield.rs
index 050d702b6..050d702b6 100644
--- a/src/test/ui/borrowck/borrowck-assign-to-subfield.rs
+++ b/tests/ui/borrowck/borrowck-assign-to-subfield.rs
diff --git a/src/test/ui/borrowck/borrowck-assignment-to-static-mut.rs b/tests/ui/borrowck/borrowck-assignment-to-static-mut.rs
index 72bf43da9..72bf43da9 100644
--- a/src/test/ui/borrowck/borrowck-assignment-to-static-mut.rs
+++ b/tests/ui/borrowck/borrowck-assignment-to-static-mut.rs
diff --git a/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.rs b/tests/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.rs
index 247e3da18..247e3da18 100644
--- a/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.rs
+++ b/tests/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.rs
diff --git a/tests/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr b/tests/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr
new file mode 100644
index 000000000..19ef0301a
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-auto-mut-ref-to-immut-var.rs:15:5
+   |
+LL |     x.printme();
+   |     ^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut x = Foo { x: 3 };
+   |         +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/borrowck/borrowck-autoref-3261.rs b/tests/ui/borrowck/borrowck-autoref-3261.rs
index 2ff3d5bd3..2ff3d5bd3 100644
--- a/src/test/ui/borrowck/borrowck-autoref-3261.rs
+++ b/tests/ui/borrowck/borrowck-autoref-3261.rs
diff --git a/src/test/ui/borrowck/borrowck-autoref-3261.stderr b/tests/ui/borrowck/borrowck-autoref-3261.stderr
index c2dfb687e..c2dfb687e 100644
--- a/src/test/ui/borrowck/borrowck-autoref-3261.stderr
+++ b/tests/ui/borrowck/borrowck-autoref-3261.stderr
diff --git a/src/test/ui/borrowck/borrowck-bad-nested-calls-free.rs b/tests/ui/borrowck/borrowck-bad-nested-calls-free.rs
index b0bb9a035..b0bb9a035 100644
--- a/src/test/ui/borrowck/borrowck-bad-nested-calls-free.rs
+++ b/tests/ui/borrowck/borrowck-bad-nested-calls-free.rs
diff --git a/src/test/ui/borrowck/borrowck-bad-nested-calls-free.stderr b/tests/ui/borrowck/borrowck-bad-nested-calls-free.stderr
index e273a778f..e273a778f 100644
--- a/src/test/ui/borrowck/borrowck-bad-nested-calls-free.stderr
+++ b/tests/ui/borrowck/borrowck-bad-nested-calls-free.stderr
diff --git a/src/test/ui/borrowck/borrowck-bad-nested-calls-move.rs b/tests/ui/borrowck/borrowck-bad-nested-calls-move.rs
index b2afb6391..b2afb6391 100644
--- a/src/test/ui/borrowck/borrowck-bad-nested-calls-move.rs
+++ b/tests/ui/borrowck/borrowck-bad-nested-calls-move.rs
diff --git a/src/test/ui/borrowck/borrowck-bad-nested-calls-move.stderr b/tests/ui/borrowck/borrowck-bad-nested-calls-move.stderr
index 371bcf2b6..371bcf2b6 100644
--- a/src/test/ui/borrowck/borrowck-bad-nested-calls-move.stderr
+++ b/tests/ui/borrowck/borrowck-bad-nested-calls-move.stderr
diff --git a/src/test/ui/borrowck/borrowck-binding-mutbl.rs b/tests/ui/borrowck/borrowck-binding-mutbl.rs
index c2d2e02ec..c2d2e02ec 100644
--- a/src/test/ui/borrowck/borrowck-binding-mutbl.rs
+++ b/tests/ui/borrowck/borrowck-binding-mutbl.rs
diff --git a/src/test/ui/borrowck/borrowck-block-unint.rs b/tests/ui/borrowck/borrowck-block-unint.rs
index 8d13b25a3..8d13b25a3 100644
--- a/src/test/ui/borrowck/borrowck-block-unint.rs
+++ b/tests/ui/borrowck/borrowck-block-unint.rs
diff --git a/src/test/ui/borrowck/borrowck-block-unint.stderr b/tests/ui/borrowck/borrowck-block-unint.stderr
index f47921a97..f47921a97 100644
--- a/src/test/ui/borrowck/borrowck-block-unint.stderr
+++ b/tests/ui/borrowck/borrowck-block-unint.stderr
diff --git a/src/test/ui/borrowck/borrowck-borrow-from-expr-block.rs b/tests/ui/borrowck/borrowck-borrow-from-expr-block.rs
index 24efadc30..24efadc30 100644
--- a/src/test/ui/borrowck/borrowck-borrow-from-expr-block.rs
+++ b/tests/ui/borrowck/borrowck-borrow-from-expr-block.rs
diff --git a/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.rs b/tests/ui/borrowck/borrowck-borrow-from-owned-ptr.rs
index 353e4e9f7..353e4e9f7 100644
--- a/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.rs
+++ b/tests/ui/borrowck/borrowck-borrow-from-owned-ptr.rs
diff --git a/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.stderr b/tests/ui/borrowck/borrowck-borrow-from-owned-ptr.stderr
index e00d69f89..c2351aacd 100644
--- a/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.stderr
+++ b/tests/ui/borrowck/borrowck-borrow-from-owned-ptr.stderr
@@ -105,10 +105,13 @@ LL |     *bar1;
 error[E0596]: cannot borrow `foo.bar1` as mutable, as `foo` is not declared as mutable
   --> $DIR/borrowck-borrow-from-owned-ptr.rs:122:16
    |
-LL |     let foo = make_foo();
-   |         --- help: consider changing this to be mutable: `mut foo`
 LL |     let bar1 = &mut foo.bar1;
    |                ^^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut foo = make_foo();
+   |         +++
 
 error: aborting due to 11 previous errors
 
diff --git a/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.rs b/tests/ui/borrowck/borrowck-borrow-from-stack-variable.rs
index 231f6beab..231f6beab 100644
--- a/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.rs
+++ b/tests/ui/borrowck/borrowck-borrow-from-stack-variable.rs
diff --git a/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.stderr b/tests/ui/borrowck/borrowck-borrow-from-stack-variable.stderr
index ce5ce56de..8fcaaa883 100644
--- a/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.stderr
+++ b/tests/ui/borrowck/borrowck-borrow-from-stack-variable.stderr
@@ -105,10 +105,13 @@ LL |     *bar1;
 error[E0596]: cannot borrow `foo.bar1` as mutable, as `foo` is not declared as mutable
   --> $DIR/borrowck-borrow-from-stack-variable.rs:120:16
    |
-LL |     let foo = make_foo();
-   |         --- help: consider changing this to be mutable: `mut foo`
 LL |     let bar1 = &mut foo.bar1;
    |                ^^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut foo = make_foo();
+   |         +++
 
 error: aborting due to 11 previous errors
 
diff --git a/src/test/ui/borrowck/borrowck-borrow-from-temporary.rs b/tests/ui/borrowck/borrowck-borrow-from-temporary.rs
index 92f3ffd57..92f3ffd57 100644
--- a/src/test/ui/borrowck/borrowck-borrow-from-temporary.rs
+++ b/tests/ui/borrowck/borrowck-borrow-from-temporary.rs
diff --git a/src/test/ui/borrowck/borrowck-borrow-from-temporary.stderr b/tests/ui/borrowck/borrowck-borrow-from-temporary.stderr
index 71bf052c9..71bf052c9 100644
--- a/src/test/ui/borrowck/borrowck-borrow-from-temporary.stderr
+++ b/tests/ui/borrowck/borrowck-borrow-from-temporary.stderr
diff --git a/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.rs b/tests/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.rs
index 6b5544a8a..6b5544a8a 100644
--- a/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.rs
+++ b/tests/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.rs
diff --git a/tests/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr b/tests/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr
new file mode 100644
index 000000000..3c28ff56e
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `*a` as mutable, as `a` is not declared as mutable
+  --> $DIR/borrowck-borrow-immut-deref-of-box-as-mut.rs:12:5
+   |
+LL |     a.foo();
+   |     ^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut a: Box<_> = Box::new(A);
+   |         +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs b/tests/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs
index 7a88c3df2..7a88c3df2 100644
--- a/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs
+++ b/tests/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs
diff --git a/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr b/tests/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr
index c99c0f779..ce9f7aa05 100644
--- a/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr
+++ b/tests/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr
@@ -20,10 +20,13 @@ LL |     **t1 = 22;
 error[E0596]: cannot borrow `**t0` as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:19:26
    |
-LL | fn foo4(t0: & &mut isize) {
-   |             ------------ help: consider changing this to be a mutable reference: `&mut &mut isize`
 LL |     let x:  &mut isize = &mut **t0;
    |                          ^^^^^^^^^ `t0` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn foo4(t0: &mut &mut isize) {
+   |             ~~~~~~~~~~~~~~~
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.rs b/tests/ui/borrowck/borrowck-borrow-mut-object-twice.rs
index b4d85b60c..b4d85b60c 100644
--- a/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.rs
+++ b/tests/ui/borrowck/borrowck-borrow-mut-object-twice.rs
diff --git a/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.stderr b/tests/ui/borrowck/borrowck-borrow-mut-object-twice.stderr
index 42b6c34cd..42b6c34cd 100644
--- a/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.stderr
+++ b/tests/ui/borrowck/borrowck-borrow-mut-object-twice.stderr
diff --git a/src/test/ui/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs b/tests/ui/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs
index 5ef282c0c..5ef282c0c 100644
--- a/src/test/ui/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs
+++ b/tests/ui/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs
diff --git a/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.rs b/tests/ui/borrowck/borrowck-borrow-overloaded-auto-deref.rs
index 83eab7fde..83eab7fde 100644
--- a/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.rs
+++ b/tests/ui/borrowck/borrowck-borrow-overloaded-auto-deref.rs
diff --git a/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr b/tests/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr
index fdf6568d8..fdf6568d8 100644
--- a/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr
+++ b/tests/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr
diff --git a/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.rs b/tests/ui/borrowck/borrowck-borrow-overloaded-deref.rs
index 2b98a7b94..2b98a7b94 100644
--- a/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.rs
+++ b/tests/ui/borrowck/borrowck-borrow-overloaded-deref.rs
diff --git a/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.stderr b/tests/ui/borrowck/borrowck-borrow-overloaded-deref.stderr
index 9ed9d2924..9ed9d2924 100644
--- a/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.stderr
+++ b/tests/ui/borrowck/borrowck-borrow-overloaded-deref.stderr
diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.rs b/tests/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.rs
index e384aacb7..e384aacb7 100644
--- a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.rs
+++ b/tests/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.rs
diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr b/tests/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr
index 4eeec09b9..4eeec09b9 100644
--- a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr
+++ b/tests/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr
diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.fixed b/tests/ui/borrowck/borrowck-borrowed-uniq-rvalue.fixed
index 8bf6a2f6d..8bf6a2f6d 100644
--- a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.fixed
+++ b/tests/ui/borrowck/borrowck-borrowed-uniq-rvalue.fixed
diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.rs b/tests/ui/borrowck/borrowck-borrowed-uniq-rvalue.rs
index 85481336a..85481336a 100644
--- a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.rs
+++ b/tests/ui/borrowck/borrowck-borrowed-uniq-rvalue.rs
diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr b/tests/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr
index c62d5f903..c62d5f903 100644
--- a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr
+++ b/tests/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr
diff --git a/src/test/ui/borrowck/borrowck-box-sensitivity.rs b/tests/ui/borrowck/borrowck-box-sensitivity.rs
index e880f876f..e880f876f 100644
--- a/src/test/ui/borrowck/borrowck-box-sensitivity.rs
+++ b/tests/ui/borrowck/borrowck-box-sensitivity.rs
diff --git a/src/test/ui/borrowck/borrowck-break-uninit-2.rs b/tests/ui/borrowck/borrowck-break-uninit-2.rs
index 3abca33a8..3abca33a8 100644
--- a/src/test/ui/borrowck/borrowck-break-uninit-2.rs
+++ b/tests/ui/borrowck/borrowck-break-uninit-2.rs
diff --git a/src/test/ui/borrowck/borrowck-break-uninit-2.stderr b/tests/ui/borrowck/borrowck-break-uninit-2.stderr
index ea93a8f40..ea93a8f40 100644
--- a/src/test/ui/borrowck/borrowck-break-uninit-2.stderr
+++ b/tests/ui/borrowck/borrowck-break-uninit-2.stderr
diff --git a/src/test/ui/borrowck/borrowck-break-uninit.rs b/tests/ui/borrowck/borrowck-break-uninit.rs
index 824f91dbc..824f91dbc 100644
--- a/src/test/ui/borrowck/borrowck-break-uninit.rs
+++ b/tests/ui/borrowck/borrowck-break-uninit.rs
diff --git a/src/test/ui/borrowck/borrowck-break-uninit.stderr b/tests/ui/borrowck/borrowck-break-uninit.stderr
index a7a8fc2ff..a7a8fc2ff 100644
--- a/src/test/ui/borrowck/borrowck-break-uninit.stderr
+++ b/tests/ui/borrowck/borrowck-break-uninit.stderr
diff --git a/src/test/ui/borrowck/borrowck-closures-mut-and-imm.rs b/tests/ui/borrowck/borrowck-closures-mut-and-imm.rs
index a8225f2fa..a8225f2fa 100644
--- a/src/test/ui/borrowck/borrowck-closures-mut-and-imm.rs
+++ b/tests/ui/borrowck/borrowck-closures-mut-and-imm.rs
diff --git a/src/test/ui/borrowck/borrowck-closures-mut-and-imm.stderr b/tests/ui/borrowck/borrowck-closures-mut-and-imm.stderr
index fadcd11a5..fadcd11a5 100644
--- a/src/test/ui/borrowck/borrowck-closures-mut-and-imm.stderr
+++ b/tests/ui/borrowck/borrowck-closures-mut-and-imm.stderr
diff --git a/src/test/ui/borrowck/borrowck-closures-mut-of-imm.rs b/tests/ui/borrowck/borrowck-closures-mut-of-imm.rs
index d7e187a2b..d7e187a2b 100644
--- a/src/test/ui/borrowck/borrowck-closures-mut-of-imm.rs
+++ b/tests/ui/borrowck/borrowck-closures-mut-of-imm.rs
diff --git a/src/test/ui/borrowck/borrowck-closures-mut-of-imm.stderr b/tests/ui/borrowck/borrowck-closures-mut-of-imm.stderr
index 537ec9895..537ec9895 100644
--- a/src/test/ui/borrowck/borrowck-closures-mut-of-imm.stderr
+++ b/tests/ui/borrowck/borrowck-closures-mut-of-imm.stderr
diff --git a/src/test/ui/borrowck/borrowck-closures-mut-of-mut.rs b/tests/ui/borrowck/borrowck-closures-mut-of-mut.rs
index 50c6f2c58..50c6f2c58 100644
--- a/src/test/ui/borrowck/borrowck-closures-mut-of-mut.rs
+++ b/tests/ui/borrowck/borrowck-closures-mut-of-mut.rs
diff --git a/src/test/ui/borrowck/borrowck-closures-mut-of-mut.stderr b/tests/ui/borrowck/borrowck-closures-mut-of-mut.stderr
index e5ee5a401..e5ee5a401 100644
--- a/src/test/ui/borrowck/borrowck-closures-mut-of-mut.stderr
+++ b/tests/ui/borrowck/borrowck-closures-mut-of-mut.stderr
diff --git a/src/test/ui/borrowck/borrowck-closures-slice-patterns-ok.rs b/tests/ui/borrowck/borrowck-closures-slice-patterns-ok.rs
index 0229ca37a..0229ca37a 100644
--- a/src/test/ui/borrowck/borrowck-closures-slice-patterns-ok.rs
+++ b/tests/ui/borrowck/borrowck-closures-slice-patterns-ok.rs
diff --git a/src/test/ui/borrowck/borrowck-closures-slice-patterns.rs b/tests/ui/borrowck/borrowck-closures-slice-patterns.rs
index 32057d5c1..32057d5c1 100644
--- a/src/test/ui/borrowck/borrowck-closures-slice-patterns.rs
+++ b/tests/ui/borrowck/borrowck-closures-slice-patterns.rs
diff --git a/src/test/ui/borrowck/borrowck-closures-slice-patterns.stderr b/tests/ui/borrowck/borrowck-closures-slice-patterns.stderr
index 411d85b8e..411d85b8e 100644
--- a/src/test/ui/borrowck/borrowck-closures-slice-patterns.stderr
+++ b/tests/ui/borrowck/borrowck-closures-slice-patterns.stderr
diff --git a/src/test/ui/borrowck/borrowck-closures-two-imm.rs b/tests/ui/borrowck/borrowck-closures-two-imm.rs
index ab135194a..ab135194a 100644
--- a/src/test/ui/borrowck/borrowck-closures-two-imm.rs
+++ b/tests/ui/borrowck/borrowck-closures-two-imm.rs
diff --git a/src/test/ui/borrowck/borrowck-closures-two-mut-fail.rs b/tests/ui/borrowck/borrowck-closures-two-mut-fail.rs
index 63a75cdff..63a75cdff 100644
--- a/src/test/ui/borrowck/borrowck-closures-two-mut-fail.rs
+++ b/tests/ui/borrowck/borrowck-closures-two-mut-fail.rs
diff --git a/src/test/ui/borrowck/borrowck-closures-two-mut-fail.stderr b/tests/ui/borrowck/borrowck-closures-two-mut-fail.stderr
index fe8e7a29e..fe8e7a29e 100644
--- a/src/test/ui/borrowck/borrowck-closures-two-mut-fail.stderr
+++ b/tests/ui/borrowck/borrowck-closures-two-mut-fail.stderr
diff --git a/src/test/ui/borrowck/borrowck-closures-two-mut.rs b/tests/ui/borrowck/borrowck-closures-two-mut.rs
index cdff8f9e8..cdff8f9e8 100644
--- a/src/test/ui/borrowck/borrowck-closures-two-mut.rs
+++ b/tests/ui/borrowck/borrowck-closures-two-mut.rs
diff --git a/src/test/ui/borrowck/borrowck-closures-two-mut.stderr b/tests/ui/borrowck/borrowck-closures-two-mut.stderr
index 21e329f43..21e329f43 100644
--- a/src/test/ui/borrowck/borrowck-closures-two-mut.stderr
+++ b/tests/ui/borrowck/borrowck-closures-two-mut.stderr
diff --git a/src/test/ui/borrowck/borrowck-closures-unique-imm.rs b/tests/ui/borrowck/borrowck-closures-unique-imm.rs
index 0dd004769..0dd004769 100644
--- a/src/test/ui/borrowck/borrowck-closures-unique-imm.rs
+++ b/tests/ui/borrowck/borrowck-closures-unique-imm.rs
diff --git a/src/test/ui/borrowck/borrowck-closures-unique-imm.stderr b/tests/ui/borrowck/borrowck-closures-unique-imm.stderr
index 0c5fd39b7..0c5fd39b7 100644
--- a/src/test/ui/borrowck/borrowck-closures-unique-imm.stderr
+++ b/tests/ui/borrowck/borrowck-closures-unique-imm.stderr
diff --git a/src/test/ui/borrowck/borrowck-closures-unique.rs b/tests/ui/borrowck/borrowck-closures-unique.rs
index 67f91dfa8..67f91dfa8 100644
--- a/src/test/ui/borrowck/borrowck-closures-unique.rs
+++ b/tests/ui/borrowck/borrowck-closures-unique.rs
diff --git a/src/test/ui/borrowck/borrowck-closures-unique.stderr b/tests/ui/borrowck/borrowck-closures-unique.stderr
index 23d3cc0e7..23d3cc0e7 100644
--- a/src/test/ui/borrowck/borrowck-closures-unique.stderr
+++ b/tests/ui/borrowck/borrowck-closures-unique.stderr
diff --git a/src/test/ui/borrowck/borrowck-closures-use-after-free.rs b/tests/ui/borrowck/borrowck-closures-use-after-free.rs
index be5f1f873..be5f1f873 100644
--- a/src/test/ui/borrowck/borrowck-closures-use-after-free.rs
+++ b/tests/ui/borrowck/borrowck-closures-use-after-free.rs
diff --git a/src/test/ui/borrowck/borrowck-closures-use-after-free.stderr b/tests/ui/borrowck/borrowck-closures-use-after-free.stderr
index 30900a3b6..30900a3b6 100644
--- a/src/test/ui/borrowck/borrowck-closures-use-after-free.stderr
+++ b/tests/ui/borrowck/borrowck-closures-use-after-free.stderr
diff --git a/src/test/ui/borrowck/borrowck-consume-unsize-vec.rs b/tests/ui/borrowck/borrowck-consume-unsize-vec.rs
index 347f0212c..347f0212c 100644
--- a/src/test/ui/borrowck/borrowck-consume-unsize-vec.rs
+++ b/tests/ui/borrowck/borrowck-consume-unsize-vec.rs
diff --git a/src/test/ui/borrowck/borrowck-consume-unsize-vec.stderr b/tests/ui/borrowck/borrowck-consume-unsize-vec.stderr
index d2e9497d0..d2e9497d0 100644
--- a/src/test/ui/borrowck/borrowck-consume-unsize-vec.stderr
+++ b/tests/ui/borrowck/borrowck-consume-unsize-vec.stderr
diff --git a/src/test/ui/borrowck/borrowck-consume-upcast-box.rs b/tests/ui/borrowck/borrowck-consume-upcast-box.rs
index 6b32d185b..6b32d185b 100644
--- a/src/test/ui/borrowck/borrowck-consume-upcast-box.rs
+++ b/tests/ui/borrowck/borrowck-consume-upcast-box.rs
diff --git a/src/test/ui/borrowck/borrowck-consume-upcast-box.stderr b/tests/ui/borrowck/borrowck-consume-upcast-box.stderr
index ed7e883ca..ed7e883ca 100644
--- a/src/test/ui/borrowck/borrowck-consume-upcast-box.stderr
+++ b/tests/ui/borrowck/borrowck-consume-upcast-box.stderr
diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.rs b/tests/ui/borrowck/borrowck-describe-lvalue.rs
index cdcff69d6..cdcff69d6 100644
--- a/src/test/ui/borrowck/borrowck-describe-lvalue.rs
+++ b/tests/ui/borrowck/borrowck-describe-lvalue.rs
diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.stderr b/tests/ui/borrowck/borrowck-describe-lvalue.stderr
index 2c1b9c10d..2c1b9c10d 100644
--- a/src/test/ui/borrowck/borrowck-describe-lvalue.stderr
+++ b/tests/ui/borrowck/borrowck-describe-lvalue.stderr
diff --git a/tests/ui/borrowck/borrowck-drop-from-guard.rs b/tests/ui/borrowck/borrowck-drop-from-guard.rs
new file mode 100644
index 000000000..0f320af26
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-drop-from-guard.rs
@@ -0,0 +1,20 @@
+#![feature(if_let_guard)]
+
+fn foo(_:String) {}
+
+fn main()
+{
+    let my_str = "hello".to_owned();
+    match Some(42) {
+        Some(_) if { drop(my_str); false } => {}
+        Some(_) => {}
+        None => { foo(my_str); } //~ ERROR [E0382]
+    }
+
+    let my_str = "hello".to_owned();
+    match Some(42) {
+        Some(_) if let Some(()) = { drop(my_str); None } => {}
+        Some(_) => {}
+        None => { foo(my_str); } //~ ERROR [E0382]
+    }
+}
diff --git a/tests/ui/borrowck/borrowck-drop-from-guard.stderr b/tests/ui/borrowck/borrowck-drop-from-guard.stderr
new file mode 100644
index 000000000..9fa28efd8
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-drop-from-guard.stderr
@@ -0,0 +1,37 @@
+error[E0382]: use of moved value: `my_str`
+  --> $DIR/borrowck-drop-from-guard.rs:11:23
+   |
+LL |     let my_str = "hello".to_owned();
+   |         ------ move occurs because `my_str` has type `String`, which does not implement the `Copy` trait
+LL |     match Some(42) {
+LL |         Some(_) if { drop(my_str); false } => {}
+   |                           ------ value moved here
+LL |         Some(_) => {}
+LL |         None => { foo(my_str); }
+   |                       ^^^^^^ value used here after move
+   |
+help: consider cloning the value if the performance cost is acceptable
+   |
+LL |         Some(_) if { drop(my_str.clone()); false } => {}
+   |                                 ++++++++
+
+error[E0382]: use of moved value: `my_str`
+  --> $DIR/borrowck-drop-from-guard.rs:18:23
+   |
+LL |     let my_str = "hello".to_owned();
+   |         ------ move occurs because `my_str` has type `String`, which does not implement the `Copy` trait
+LL |     match Some(42) {
+LL |         Some(_) if let Some(()) = { drop(my_str); None } => {}
+   |                                          ------ value moved here
+LL |         Some(_) => {}
+LL |         None => { foo(my_str); }
+   |                       ^^^^^^ value used here after move
+   |
+help: consider cloning the value if the performance cost is acceptable
+   |
+LL |         Some(_) if let Some(()) = { drop(my_str.clone()); None } => {}
+   |                                                ++++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.rs b/tests/ui/borrowck/borrowck-escaping-closure-error-1.rs
index 11c0610aa..11c0610aa 100644
--- a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.rs
+++ b/tests/ui/borrowck/borrowck-escaping-closure-error-1.rs
diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr b/tests/ui/borrowck/borrowck-escaping-closure-error-1.stderr
index acf6b37b7..acf6b37b7 100644
--- a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr
+++ b/tests/ui/borrowck/borrowck-escaping-closure-error-1.stderr
diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.rs b/tests/ui/borrowck/borrowck-escaping-closure-error-2.rs
index b50d45563..b50d45563 100644
--- a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.rs
+++ b/tests/ui/borrowck/borrowck-escaping-closure-error-2.rs
diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr b/tests/ui/borrowck/borrowck-escaping-closure-error-2.stderr
index 814042539..814042539 100644
--- a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr
+++ b/tests/ui/borrowck/borrowck-escaping-closure-error-2.stderr
diff --git a/src/test/ui/borrowck/borrowck-field-sensitivity-rpass.rs b/tests/ui/borrowck/borrowck-field-sensitivity-rpass.rs
index dd6708582..dd6708582 100644
--- a/src/test/ui/borrowck/borrowck-field-sensitivity-rpass.rs
+++ b/tests/ui/borrowck/borrowck-field-sensitivity-rpass.rs
diff --git a/src/test/ui/borrowck/borrowck-field-sensitivity.rs b/tests/ui/borrowck/borrowck-field-sensitivity.rs
index 03edf445e..03edf445e 100644
--- a/src/test/ui/borrowck/borrowck-field-sensitivity.rs
+++ b/tests/ui/borrowck/borrowck-field-sensitivity.rs
diff --git a/src/test/ui/borrowck/borrowck-field-sensitivity.stderr b/tests/ui/borrowck/borrowck-field-sensitivity.stderr
index e009f5913..e009f5913 100644
--- a/src/test/ui/borrowck/borrowck-field-sensitivity.stderr
+++ b/tests/ui/borrowck/borrowck-field-sensitivity.stderr
diff --git a/src/test/ui/borrowck/borrowck-fixed-length-vecs.rs b/tests/ui/borrowck/borrowck-fixed-length-vecs.rs
index 126323d8d..126323d8d 100644
--- a/src/test/ui/borrowck/borrowck-fixed-length-vecs.rs
+++ b/tests/ui/borrowck/borrowck-fixed-length-vecs.rs
diff --git a/src/test/ui/borrowck/borrowck-fn-in-const-a.rs b/tests/ui/borrowck/borrowck-fn-in-const-a.rs
index d4ceae296..d4ceae296 100644
--- a/src/test/ui/borrowck/borrowck-fn-in-const-a.rs
+++ b/tests/ui/borrowck/borrowck-fn-in-const-a.rs
diff --git a/src/test/ui/borrowck/borrowck-fn-in-const-a.stderr b/tests/ui/borrowck/borrowck-fn-in-const-a.stderr
index e7491afda..e7491afda 100644
--- a/src/test/ui/borrowck/borrowck-fn-in-const-a.stderr
+++ b/tests/ui/borrowck/borrowck-fn-in-const-a.stderr
diff --git a/src/test/ui/borrowck/borrowck-fn-in-const-c.rs b/tests/ui/borrowck/borrowck-fn-in-const-c.rs
index c638cd08b..c638cd08b 100644
--- a/src/test/ui/borrowck/borrowck-fn-in-const-c.rs
+++ b/tests/ui/borrowck/borrowck-fn-in-const-c.rs
diff --git a/src/test/ui/borrowck/borrowck-fn-in-const-c.stderr b/tests/ui/borrowck/borrowck-fn-in-const-c.stderr
index d48866dce..d48866dce 100644
--- a/src/test/ui/borrowck/borrowck-fn-in-const-c.stderr
+++ b/tests/ui/borrowck/borrowck-fn-in-const-c.stderr
diff --git a/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.rs b/tests/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.rs
index 389b8a43c..389b8a43c 100644
--- a/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.rs
+++ b/tests/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.rs
diff --git a/tests/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.stderr b/tests/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.stderr
new file mode 100644
index 000000000..f9ced03e0
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.stderr
@@ -0,0 +1,48 @@
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:12:15
+   |
+LL |     for &a in x.iter() {
+   |          -    ^^^^^^^^
+   |          |
+   |          data moved here
+   |          move occurs because `a` has type `&mut i32`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     for &a in x.iter() {
+LL +     for a in x.iter() {
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:18:15
+   |
+LL |     for &a in &f.a {
+   |          -    ^^^^
+   |          |
+   |          data moved here
+   |          move occurs because `a` has type `Box<isize>`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     for &a in &f.a {
+LL +     for a in &f.a {
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:22:15
+   |
+LL |     for &a in x.iter() {
+   |          -    ^^^^^^^^
+   |          |
+   |          data moved here
+   |          move occurs because `a` has type `Box<i32>`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     for &a in x.iter() {
+LL +     for a in x.iter() {
+   |
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/borrowck-for-loop-head-linkage.rs b/tests/ui/borrowck/borrowck-for-loop-head-linkage.rs
index a84b695aa..a84b695aa 100644
--- a/src/test/ui/borrowck/borrowck-for-loop-head-linkage.rs
+++ b/tests/ui/borrowck/borrowck-for-loop-head-linkage.rs
diff --git a/src/test/ui/borrowck/borrowck-for-loop-head-linkage.stderr b/tests/ui/borrowck/borrowck-for-loop-head-linkage.stderr
index f47dce453..f47dce453 100644
--- a/src/test/ui/borrowck/borrowck-for-loop-head-linkage.stderr
+++ b/tests/ui/borrowck/borrowck-for-loop-head-linkage.stderr
diff --git a/src/test/ui/borrowck/borrowck-for-loop-uninitialized-binding.rs b/tests/ui/borrowck/borrowck-for-loop-uninitialized-binding.rs
index f619c045b..f619c045b 100644
--- a/src/test/ui/borrowck/borrowck-for-loop-uninitialized-binding.rs
+++ b/tests/ui/borrowck/borrowck-for-loop-uninitialized-binding.rs
diff --git a/src/test/ui/borrowck/borrowck-for-loop-uninitialized-binding.stderr b/tests/ui/borrowck/borrowck-for-loop-uninitialized-binding.stderr
index fc1a44c3c..fc1a44c3c 100644
--- a/src/test/ui/borrowck/borrowck-for-loop-uninitialized-binding.stderr
+++ b/tests/ui/borrowck/borrowck-for-loop-uninitialized-binding.stderr
diff --git a/src/test/ui/borrowck/borrowck-freeze-frozen-mut.rs b/tests/ui/borrowck/borrowck-freeze-frozen-mut.rs
index 199931d6d..199931d6d 100644
--- a/src/test/ui/borrowck/borrowck-freeze-frozen-mut.rs
+++ b/tests/ui/borrowck/borrowck-freeze-frozen-mut.rs
diff --git a/src/test/ui/borrowck/borrowck-if-no-else.rs b/tests/ui/borrowck/borrowck-if-no-else.rs
index 534d771be..534d771be 100644
--- a/src/test/ui/borrowck/borrowck-if-no-else.rs
+++ b/tests/ui/borrowck/borrowck-if-no-else.rs
diff --git a/src/test/ui/borrowck/borrowck-if-no-else.stderr b/tests/ui/borrowck/borrowck-if-no-else.stderr
index 9eafc2c2a..9eafc2c2a 100644
--- a/src/test/ui/borrowck/borrowck-if-no-else.stderr
+++ b/tests/ui/borrowck/borrowck-if-no-else.stderr
diff --git a/src/test/ui/borrowck/borrowck-if-with-else.rs b/tests/ui/borrowck/borrowck-if-with-else.rs
index 69d450c59..69d450c59 100644
--- a/src/test/ui/borrowck/borrowck-if-with-else.rs
+++ b/tests/ui/borrowck/borrowck-if-with-else.rs
diff --git a/src/test/ui/borrowck/borrowck-if-with-else.stderr b/tests/ui/borrowck/borrowck-if-with-else.stderr
index 3f0fe291c..3f0fe291c 100644
--- a/src/test/ui/borrowck/borrowck-if-with-else.stderr
+++ b/tests/ui/borrowck/borrowck-if-with-else.stderr
diff --git a/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs b/tests/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs
index 97107c2e3..97107c2e3 100644
--- a/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs
+++ b/tests/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs
diff --git a/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.stderr b/tests/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.stderr
index a66db05cc..a66db05cc 100644
--- a/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.stderr
+++ b/tests/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.stderr
diff --git a/src/test/ui/borrowck/borrowck-in-static.rs b/tests/ui/borrowck/borrowck-in-static.rs
index a45f7b18e..a45f7b18e 100644
--- a/src/test/ui/borrowck/borrowck-in-static.rs
+++ b/tests/ui/borrowck/borrowck-in-static.rs
diff --git a/src/test/ui/borrowck/borrowck-in-static.stderr b/tests/ui/borrowck/borrowck-in-static.stderr
index 2033e4a57..2033e4a57 100644
--- a/src/test/ui/borrowck/borrowck-in-static.stderr
+++ b/tests/ui/borrowck/borrowck-in-static.stderr
diff --git a/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.rs b/tests/ui/borrowck/borrowck-init-in-called-fn-expr.rs
index e6476b9c1..e6476b9c1 100644
--- a/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.rs
+++ b/tests/ui/borrowck/borrowck-init-in-called-fn-expr.rs
diff --git a/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.stderr b/tests/ui/borrowck/borrowck-init-in-called-fn-expr.stderr
index 1a22b5f09..1a22b5f09 100644
--- a/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.stderr
+++ b/tests/ui/borrowck/borrowck-init-in-called-fn-expr.stderr
diff --git a/src/test/ui/borrowck/borrowck-init-in-fn-expr.rs b/tests/ui/borrowck/borrowck-init-in-fn-expr.rs
index 7eb204a0d..7eb204a0d 100644
--- a/src/test/ui/borrowck/borrowck-init-in-fn-expr.rs
+++ b/tests/ui/borrowck/borrowck-init-in-fn-expr.rs
diff --git a/src/test/ui/borrowck/borrowck-init-in-fn-expr.stderr b/tests/ui/borrowck/borrowck-init-in-fn-expr.stderr
index f1b9b9aa7..f1b9b9aa7 100644
--- a/src/test/ui/borrowck/borrowck-init-in-fn-expr.stderr
+++ b/tests/ui/borrowck/borrowck-init-in-fn-expr.stderr
diff --git a/src/test/ui/borrowck/borrowck-init-in-fru.rs b/tests/ui/borrowck/borrowck-init-in-fru.rs
index c07957ab1..c07957ab1 100644
--- a/src/test/ui/borrowck/borrowck-init-in-fru.rs
+++ b/tests/ui/borrowck/borrowck-init-in-fru.rs
diff --git a/src/test/ui/borrowck/borrowck-init-in-fru.stderr b/tests/ui/borrowck/borrowck-init-in-fru.stderr
index 39b28811a..39b28811a 100644
--- a/src/test/ui/borrowck/borrowck-init-in-fru.stderr
+++ b/tests/ui/borrowck/borrowck-init-in-fru.stderr
diff --git a/src/test/ui/borrowck/borrowck-init-op-equal.rs b/tests/ui/borrowck/borrowck-init-op-equal.rs
index 3d08c1b81..3d08c1b81 100644
--- a/src/test/ui/borrowck/borrowck-init-op-equal.rs
+++ b/tests/ui/borrowck/borrowck-init-op-equal.rs
diff --git a/src/test/ui/borrowck/borrowck-init-op-equal.stderr b/tests/ui/borrowck/borrowck-init-op-equal.stderr
index ef0fa6df4..ef0fa6df4 100644
--- a/src/test/ui/borrowck/borrowck-init-op-equal.stderr
+++ b/tests/ui/borrowck/borrowck-init-op-equal.stderr
diff --git a/src/test/ui/borrowck/borrowck-init-plus-equal.rs b/tests/ui/borrowck/borrowck-init-plus-equal.rs
index 2a52a3f4e..2a52a3f4e 100644
--- a/src/test/ui/borrowck/borrowck-init-plus-equal.rs
+++ b/tests/ui/borrowck/borrowck-init-plus-equal.rs
diff --git a/src/test/ui/borrowck/borrowck-init-plus-equal.stderr b/tests/ui/borrowck/borrowck-init-plus-equal.stderr
index cec053318..cec053318 100644
--- a/src/test/ui/borrowck/borrowck-init-plus-equal.stderr
+++ b/tests/ui/borrowck/borrowck-init-plus-equal.stderr
diff --git a/src/test/ui/borrowck/borrowck-insert-during-each.rs b/tests/ui/borrowck/borrowck-insert-during-each.rs
index df967e611..df967e611 100644
--- a/src/test/ui/borrowck/borrowck-insert-during-each.rs
+++ b/tests/ui/borrowck/borrowck-insert-during-each.rs
diff --git a/src/test/ui/borrowck/borrowck-insert-during-each.stderr b/tests/ui/borrowck/borrowck-insert-during-each.stderr
index 99d08e905..99d08e905 100644
--- a/src/test/ui/borrowck/borrowck-insert-during-each.stderr
+++ b/tests/ui/borrowck/borrowck-insert-during-each.stderr
diff --git a/src/test/ui/borrowck/borrowck-issue-14498.rs b/tests/ui/borrowck/borrowck-issue-14498.rs
index 003533a51..003533a51 100644
--- a/src/test/ui/borrowck/borrowck-issue-14498.rs
+++ b/tests/ui/borrowck/borrowck-issue-14498.rs
diff --git a/src/test/ui/borrowck/borrowck-issue-14498.stderr b/tests/ui/borrowck/borrowck-issue-14498.stderr
index 4c0e46d45..42a55b7a8 100644
--- a/src/test/ui/borrowck/borrowck-issue-14498.stderr
+++ b/tests/ui/borrowck/borrowck-issue-14498.stderr
@@ -1,10 +1,13 @@
 error[E0594]: cannot assign to `***p`, which is behind a `&` reference
   --> $DIR/borrowck-issue-14498.rs:16:5
    |
-LL |     let p = &y;
-   |             -- help: consider changing this to be a mutable reference: `&mut y`
 LL |     ***p = 2;
    |     ^^^^^^^^ `p` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let p = &mut y;
+   |             ~~~~~~
 
 error[E0506]: cannot assign to `**y` because it is borrowed
   --> $DIR/borrowck-issue-14498.rs:25:5
diff --git a/src/test/ui/borrowck/borrowck-issue-2657-1.rs b/tests/ui/borrowck/borrowck-issue-2657-1.rs
index 0fb2267b9..0fb2267b9 100644
--- a/src/test/ui/borrowck/borrowck-issue-2657-1.rs
+++ b/tests/ui/borrowck/borrowck-issue-2657-1.rs
diff --git a/src/test/ui/borrowck/borrowck-issue-2657-1.stderr b/tests/ui/borrowck/borrowck-issue-2657-1.stderr
index 390bb9384..390bb9384 100644
--- a/src/test/ui/borrowck/borrowck-issue-2657-1.stderr
+++ b/tests/ui/borrowck/borrowck-issue-2657-1.stderr
diff --git a/tests/ui/borrowck/borrowck-issue-2657-2.fixed b/tests/ui/borrowck/borrowck-issue-2657-2.fixed
new file mode 100644
index 000000000..625e7c3ca
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-issue-2657-2.fixed
@@ -0,0 +1,12 @@
+// run-rustfix
+fn main() {
+
+    let x: Option<Box<_>> = Some(Box::new(1));
+
+    match x {
+      Some(ref y) => {
+        let _b = y; //~ ERROR cannot move out
+      }
+      _ => {}
+    }
+}
diff --git a/src/test/ui/borrowck/borrowck-issue-2657-2.rs b/tests/ui/borrowck/borrowck-issue-2657-2.rs
index 7dbac0215..f79a846e7 100644
--- a/src/test/ui/borrowck/borrowck-issue-2657-2.rs
+++ b/tests/ui/borrowck/borrowck-issue-2657-2.rs
@@ -1,3 +1,4 @@
+// run-rustfix
 fn main() {
 
     let x: Option<Box<_>> = Some(Box::new(1));
diff --git a/tests/ui/borrowck/borrowck-issue-2657-2.stderr b/tests/ui/borrowck/borrowck-issue-2657-2.stderr
new file mode 100644
index 000000000..850bb9ae3
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-issue-2657-2.stderr
@@ -0,0 +1,15 @@
+error[E0507]: cannot move out of `*y` which is behind a shared reference
+  --> $DIR/borrowck-issue-2657-2.rs:8:18
+   |
+LL |         let _b = *y;
+   |                  ^^ move occurs because `*y` has type `Box<i32>`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -         let _b = *y;
+LL +         let _b = y;
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/borrowck-issue-48962.rs b/tests/ui/borrowck/borrowck-issue-48962.rs
index 86061c8cd..86061c8cd 100644
--- a/src/test/ui/borrowck/borrowck-issue-48962.rs
+++ b/tests/ui/borrowck/borrowck-issue-48962.rs
diff --git a/src/test/ui/borrowck/borrowck-issue-48962.stderr b/tests/ui/borrowck/borrowck-issue-48962.stderr
index ee174f673..ee174f673 100644
--- a/src/test/ui/borrowck/borrowck-issue-48962.stderr
+++ b/tests/ui/borrowck/borrowck-issue-48962.stderr
diff --git a/src/test/ui/borrowck/borrowck-lend-args.rs b/tests/ui/borrowck/borrowck-lend-args.rs
index d0ef2dcdd..d0ef2dcdd 100644
--- a/src/test/ui/borrowck/borrowck-lend-args.rs
+++ b/tests/ui/borrowck/borrowck-lend-args.rs
diff --git a/src/test/ui/borrowck/borrowck-lend-flow-if.rs b/tests/ui/borrowck/borrowck-lend-flow-if.rs
index 19a0dd0c6..19a0dd0c6 100644
--- a/src/test/ui/borrowck/borrowck-lend-flow-if.rs
+++ b/tests/ui/borrowck/borrowck-lend-flow-if.rs
diff --git a/src/test/ui/borrowck/borrowck-lend-flow-if.stderr b/tests/ui/borrowck/borrowck-lend-flow-if.stderr
index e47efc0e0..e47efc0e0 100644
--- a/src/test/ui/borrowck/borrowck-lend-flow-if.stderr
+++ b/tests/ui/borrowck/borrowck-lend-flow-if.stderr
diff --git a/src/test/ui/borrowck/borrowck-lend-flow-loop.rs b/tests/ui/borrowck/borrowck-lend-flow-loop.rs
index 548ffbd51..548ffbd51 100644
--- a/src/test/ui/borrowck/borrowck-lend-flow-loop.rs
+++ b/tests/ui/borrowck/borrowck-lend-flow-loop.rs
diff --git a/src/test/ui/borrowck/borrowck-lend-flow-loop.stderr b/tests/ui/borrowck/borrowck-lend-flow-loop.stderr
index df7c86b85..df7c86b85 100644
--- a/src/test/ui/borrowck/borrowck-lend-flow-loop.stderr
+++ b/tests/ui/borrowck/borrowck-lend-flow-loop.stderr
diff --git a/src/test/ui/borrowck/borrowck-lend-flow-match.rs b/tests/ui/borrowck/borrowck-lend-flow-match.rs
index 9737bc769..9737bc769 100644
--- a/src/test/ui/borrowck/borrowck-lend-flow-match.rs
+++ b/tests/ui/borrowck/borrowck-lend-flow-match.rs
diff --git a/src/test/ui/borrowck/borrowck-lend-flow-match.stderr b/tests/ui/borrowck/borrowck-lend-flow-match.stderr
index 66f1cd9bd..66f1cd9bd 100644
--- a/src/test/ui/borrowck/borrowck-lend-flow-match.stderr
+++ b/tests/ui/borrowck/borrowck-lend-flow-match.stderr
diff --git a/src/test/ui/borrowck/borrowck-lend-flow.rs b/tests/ui/borrowck/borrowck-lend-flow.rs
index 564c57044..564c57044 100644
--- a/src/test/ui/borrowck/borrowck-lend-flow.rs
+++ b/tests/ui/borrowck/borrowck-lend-flow.rs
diff --git a/src/test/ui/borrowck/borrowck-lend-flow.stderr b/tests/ui/borrowck/borrowck-lend-flow.stderr
index 40c14f54c..40c14f54c 100644
--- a/src/test/ui/borrowck/borrowck-lend-flow.stderr
+++ b/tests/ui/borrowck/borrowck-lend-flow.stderr
diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.rs b/tests/ui/borrowck/borrowck-loan-blocks-move-cc.rs
index e536d4040..e536d4040 100644
--- a/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.rs
+++ b/tests/ui/borrowck/borrowck-loan-blocks-move-cc.rs
diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.stderr b/tests/ui/borrowck/borrowck-loan-blocks-move-cc.stderr
index 3548da35b..3548da35b 100644
--- a/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.stderr
+++ b/tests/ui/borrowck/borrowck-loan-blocks-move-cc.stderr
diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-move.rs b/tests/ui/borrowck/borrowck-loan-blocks-move.rs
index f3f443721..f3f443721 100644
--- a/src/test/ui/borrowck/borrowck-loan-blocks-move.rs
+++ b/tests/ui/borrowck/borrowck-loan-blocks-move.rs
diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-move.stderr b/tests/ui/borrowck/borrowck-loan-blocks-move.stderr
index b5c6b101f..b5c6b101f 100644
--- a/src/test/ui/borrowck/borrowck-loan-blocks-move.stderr
+++ b/tests/ui/borrowck/borrowck-loan-blocks-move.stderr
diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.rs b/tests/ui/borrowck/borrowck-loan-blocks-mut-uniq.rs
index 33d6af303..33d6af303 100644
--- a/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.rs
+++ b/tests/ui/borrowck/borrowck-loan-blocks-mut-uniq.rs
diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.stderr b/tests/ui/borrowck/borrowck-loan-blocks-mut-uniq.stderr
index fa5308c29..fa5308c29 100644
--- a/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.stderr
+++ b/tests/ui/borrowck/borrowck-loan-blocks-mut-uniq.stderr
diff --git a/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.rs b/tests/ui/borrowck/borrowck-loan-in-overloaded-op.rs
index b8f1650fc..b8f1650fc 100644
--- a/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.rs
+++ b/tests/ui/borrowck/borrowck-loan-in-overloaded-op.rs
diff --git a/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.stderr b/tests/ui/borrowck/borrowck-loan-in-overloaded-op.stderr
index e1b991620..e1b991620 100644
--- a/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.stderr
+++ b/tests/ui/borrowck/borrowck-loan-in-overloaded-op.stderr
diff --git a/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.rs b/tests/ui/borrowck/borrowck-loan-of-static-data-issue-27616.rs
index cb801ef1b..cb801ef1b 100644
--- a/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.rs
+++ b/tests/ui/borrowck/borrowck-loan-of-static-data-issue-27616.rs
diff --git a/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.stderr b/tests/ui/borrowck/borrowck-loan-of-static-data-issue-27616.stderr
index 6994c837d..6994c837d 100644
--- a/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.stderr
+++ b/tests/ui/borrowck/borrowck-loan-of-static-data-issue-27616.stderr
diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.rs b/tests/ui/borrowck/borrowck-loan-rcvr-overloaded-op.rs
index 4da10fd44..4da10fd44 100644
--- a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.rs
+++ b/tests/ui/borrowck/borrowck-loan-rcvr-overloaded-op.rs
diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr b/tests/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr
index 24cc4933e..24cc4933e 100644
--- a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr
+++ b/tests/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr
diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr.rs b/tests/ui/borrowck/borrowck-loan-rcvr.rs
index d2234e17a..d2234e17a 100644
--- a/src/test/ui/borrowck/borrowck-loan-rcvr.rs
+++ b/tests/ui/borrowck/borrowck-loan-rcvr.rs
diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr.stderr b/tests/ui/borrowck/borrowck-loan-rcvr.stderr
index 1d6bd4e2e..1d6bd4e2e 100644
--- a/src/test/ui/borrowck/borrowck-loan-rcvr.stderr
+++ b/tests/ui/borrowck/borrowck-loan-rcvr.stderr
diff --git a/src/test/ui/borrowck/borrowck-loan-vec-content.rs b/tests/ui/borrowck/borrowck-loan-vec-content.rs
index 300ec88c5..300ec88c5 100644
--- a/src/test/ui/borrowck/borrowck-loan-vec-content.rs
+++ b/tests/ui/borrowck/borrowck-loan-vec-content.rs
diff --git a/src/test/ui/borrowck/borrowck-loan-vec-content.stderr b/tests/ui/borrowck/borrowck-loan-vec-content.stderr
index 6691a2396..6691a2396 100644
--- a/src/test/ui/borrowck/borrowck-loan-vec-content.stderr
+++ b/tests/ui/borrowck/borrowck-loan-vec-content.stderr
diff --git a/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.rs b/tests/ui/borrowck/borrowck-local-borrow-outlives-fn.rs
index b6eebd4e3..b6eebd4e3 100644
--- a/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.rs
+++ b/tests/ui/borrowck/borrowck-local-borrow-outlives-fn.rs
diff --git a/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.stderr b/tests/ui/borrowck/borrowck-local-borrow-outlives-fn.stderr
index 9d19de211..9d19de211 100644
--- a/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.stderr
+++ b/tests/ui/borrowck/borrowck-local-borrow-outlives-fn.stderr
diff --git a/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.rs b/tests/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.rs
index ffb2da280..ffb2da280 100644
--- a/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.rs
+++ b/tests/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.rs
diff --git a/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.stderr b/tests/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.stderr
index 6ea6951ad..6ea6951ad 100644
--- a/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.stderr
+++ b/tests/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.stderr
diff --git a/src/test/ui/borrowck/borrowck-local-borrow.rs b/tests/ui/borrowck/borrowck-local-borrow.rs
index 0aaa4e4c6..0aaa4e4c6 100644
--- a/src/test/ui/borrowck/borrowck-local-borrow.rs
+++ b/tests/ui/borrowck/borrowck-local-borrow.rs
diff --git a/src/test/ui/borrowck/borrowck-macro-interaction-issue-6304.rs b/tests/ui/borrowck/borrowck-macro-interaction-issue-6304.rs
index 4e969f6ed..4e969f6ed 100644
--- a/src/test/ui/borrowck/borrowck-macro-interaction-issue-6304.rs
+++ b/tests/ui/borrowck/borrowck-macro-interaction-issue-6304.rs
diff --git a/src/test/ui/borrowck/borrowck-match-already-borrowed.rs b/tests/ui/borrowck/borrowck-match-already-borrowed.rs
index a925cbbf5..a925cbbf5 100644
--- a/src/test/ui/borrowck/borrowck-match-already-borrowed.rs
+++ b/tests/ui/borrowck/borrowck-match-already-borrowed.rs
diff --git a/src/test/ui/borrowck/borrowck-match-already-borrowed.stderr b/tests/ui/borrowck/borrowck-match-already-borrowed.stderr
index 39047be9d..39047be9d 100644
--- a/src/test/ui/borrowck/borrowck-match-already-borrowed.stderr
+++ b/tests/ui/borrowck/borrowck-match-already-borrowed.stderr
diff --git a/src/test/ui/borrowck/borrowck-match-binding-is-assignment.rs b/tests/ui/borrowck/borrowck-match-binding-is-assignment.rs
index 064bf69ae..064bf69ae 100644
--- a/src/test/ui/borrowck/borrowck-match-binding-is-assignment.rs
+++ b/tests/ui/borrowck/borrowck-match-binding-is-assignment.rs
diff --git a/src/test/ui/borrowck/borrowck-match-binding-is-assignment.stderr b/tests/ui/borrowck/borrowck-match-binding-is-assignment.stderr
index dd22d7e2e..dd22d7e2e 100644
--- a/src/test/ui/borrowck/borrowck-match-binding-is-assignment.stderr
+++ b/tests/ui/borrowck/borrowck-match-binding-is-assignment.stderr
diff --git a/src/test/ui/borrowck/borrowck-move-by-capture-ok.rs b/tests/ui/borrowck/borrowck-move-by-capture-ok.rs
index e7a48ebf6..e7a48ebf6 100644
--- a/src/test/ui/borrowck/borrowck-move-by-capture-ok.rs
+++ b/tests/ui/borrowck/borrowck-move-by-capture-ok.rs
diff --git a/src/test/ui/borrowck/borrowck-move-by-capture.rs b/tests/ui/borrowck/borrowck-move-by-capture.rs
index 6f0eb1870..6f0eb1870 100644
--- a/src/test/ui/borrowck/borrowck-move-by-capture.rs
+++ b/tests/ui/borrowck/borrowck-move-by-capture.rs
diff --git a/src/test/ui/borrowck/borrowck-move-by-capture.stderr b/tests/ui/borrowck/borrowck-move-by-capture.stderr
index 8ddc48b2a..8ddc48b2a 100644
--- a/src/test/ui/borrowck/borrowck-move-by-capture.stderr
+++ b/tests/ui/borrowck/borrowck-move-by-capture.stderr
diff --git a/tests/ui/borrowck/borrowck-move-error-with-note.fixed b/tests/ui/borrowck/borrowck-move-error-with-note.fixed
new file mode 100644
index 000000000..cf6c382a6
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-move-error-with-note.fixed
@@ -0,0 +1,56 @@
+// run-rustfix
+#![allow(unused)]
+enum Foo {
+    Foo1(Box<u32>, Box<u32>),
+    Foo2(Box<u32>),
+    Foo3,
+}
+
+
+
+fn blah() {
+    let f = &Foo::Foo1(Box::new(1), Box::new(2));
+    match f { //~ ERROR cannot move out of
+        Foo::Foo1(num1,
+                  num2) => (),
+        Foo::Foo2(num) => (),
+        Foo::Foo3 => ()
+    }
+}
+
+struct S {
+    f: String,
+    g: String
+}
+impl Drop for S {
+    fn drop(&mut self) { println!("{}", self.f); }
+}
+
+fn move_in_match() {
+    match (S {f: "foo".to_string(), g: "bar".to_string()}) {
+        //~^ ERROR cannot move out of type `S`, which implements the `Drop` trait
+        S {
+            f: ref _s,
+            g: ref _t
+        } => {}
+    }
+}
+
+// from issue-8064
+struct A {
+    a: Box<isize>,
+}
+
+fn free<T>(_: T) {}
+
+fn blah2() {
+    let a = &A { a: Box::new(1) };
+    match &a.a { //~ ERROR cannot move out of
+        n => {
+            free(n)
+        }
+    }
+    free(a)
+}
+
+fn main() {}
diff --git a/src/test/ui/borrowck/borrowck-move-error-with-note.rs b/tests/ui/borrowck/borrowck-move-error-with-note.rs
index ef38cbb63..f336ac4f9 100644
--- a/src/test/ui/borrowck/borrowck-move-error-with-note.rs
+++ b/tests/ui/borrowck/borrowck-move-error-with-note.rs
@@ -1,3 +1,5 @@
+// run-rustfix
+#![allow(unused)]
 enum Foo {
     Foo1(Box<u32>, Box<u32>),
     Foo2(Box<u32>),
diff --git a/tests/ui/borrowck/borrowck-move-error-with-note.stderr b/tests/ui/borrowck/borrowck-move-error-with-note.stderr
new file mode 100644
index 000000000..722c2c144
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-move-error-with-note.stderr
@@ -0,0 +1,60 @@
+error[E0507]: cannot move out of `f` as enum variant `Foo1` which is behind a shared reference
+  --> $DIR/borrowck-move-error-with-note.rs:13:11
+   |
+LL |     match *f {
+   |           ^^
+LL |         Foo::Foo1(num1,
+   |                   ---- data moved here
+LL |                   num2) => (),
+   |                   ---- ...and here
+LL |         Foo::Foo2(num) => (),
+   |                   --- ...and here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the dereference here
+   |
+LL -     match *f {
+LL +     match f {
+   |
+
+error[E0509]: cannot move out of type `S`, which implements the `Drop` trait
+  --> $DIR/borrowck-move-error-with-note.rs:30:11
+   |
+LL |     match (S {f: "foo".to_string(), g: "bar".to_string()}) {
+   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of here
+...
+LL |             f: _s,
+   |                -- data moved here
+LL |             g: _t
+   |                -- ...and here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider borrowing the pattern binding
+   |
+LL |             f: ref _s,
+   |                +++
+help: consider borrowing the pattern binding
+   |
+LL |             g: ref _t
+   |                +++
+
+error[E0507]: cannot move out of `a.a` which is behind a shared reference
+  --> $DIR/borrowck-move-error-with-note.rs:48:11
+   |
+LL |     match a.a {
+   |           ^^^
+LL |         n => {
+   |         -
+   |         |
+   |         data moved here
+   |         move occurs because `n` has type `Box<isize>`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     match &a.a {
+   |           +
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0507, E0509.
+For more information about an error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs b/tests/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs
index 71405f7a7..71405f7a7 100644
--- a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs
+++ b/tests/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs
diff --git a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr b/tests/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr
index f833abcc0..f833abcc0 100644
--- a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr
+++ b/tests/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr
diff --git a/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.rs b/tests/ui/borrowck/borrowck-move-from-unsafe-ptr.rs
index 824da5ceb..824da5ceb 100644
--- a/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.rs
+++ b/tests/ui/borrowck/borrowck-move-from-unsafe-ptr.rs
diff --git a/tests/ui/borrowck/borrowck-move-from-unsafe-ptr.stderr b/tests/ui/borrowck/borrowck-move-from-unsafe-ptr.stderr
new file mode 100644
index 000000000..43fc102bd
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-move-from-unsafe-ptr.stderr
@@ -0,0 +1,15 @@
+error[E0507]: cannot move out of `*x` which is behind a raw pointer
+  --> $DIR/borrowck-move-from-unsafe-ptr.rs:2:13
+   |
+LL |     let y = *x;
+   |             ^^ move occurs because `*x` has type `Box<isize>`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let y = *x;
+LL +     let y = x;
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.rs b/tests/ui/borrowck/borrowck-move-in-irrefut-pat.rs
index f4f402dd9..f4f402dd9 100644
--- a/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.rs
+++ b/tests/ui/borrowck/borrowck-move-in-irrefut-pat.rs
diff --git a/tests/ui/borrowck/borrowck-move-in-irrefut-pat.stderr b/tests/ui/borrowck/borrowck-move-in-irrefut-pat.stderr
new file mode 100644
index 000000000..21bd07332
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-move-in-irrefut-pat.stderr
@@ -0,0 +1,48 @@
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/borrowck-move-in-irrefut-pat.rs:3:13
+   |
+LL | fn arg_item(&_x: &String) {}
+   |             ^--
+   |              |
+   |              data moved here
+   |              move occurs because `_x` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL - fn arg_item(&_x: &String) {}
+LL + fn arg_item(_x: &String) {}
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/borrowck-move-in-irrefut-pat.rs:7:11
+   |
+LL |     with(|&_x| ())
+   |           ^--
+   |            |
+   |            data moved here
+   |            move occurs because `_x` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     with(|&_x| ())
+LL +     with(|_x| ())
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/borrowck-move-in-irrefut-pat.rs:12:15
+   |
+LL |     let &_x = &"hi".to_string();
+   |          --   ^^^^^^^^^^^^^^^^^
+   |          |
+   |          data moved here
+   |          move occurs because `_x` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     let &_x = &"hi".to_string();
+LL +     let _x = &"hi".to_string();
+   |
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.rs b/tests/ui/borrowck/borrowck-move-moved-value-into-closure.rs
index 72e7b5a71..72e7b5a71 100644
--- a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.rs
+++ b/tests/ui/borrowck/borrowck-move-moved-value-into-closure.rs
diff --git a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.stderr b/tests/ui/borrowck/borrowck-move-moved-value-into-closure.stderr
index 9509ebb7c..9509ebb7c 100644
--- a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.stderr
+++ b/tests/ui/borrowck/borrowck-move-moved-value-into-closure.stderr
diff --git a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.rs b/tests/ui/borrowck/borrowck-move-mut-base-ptr.rs
index fa2d5531b..fa2d5531b 100644
--- a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.rs
+++ b/tests/ui/borrowck/borrowck-move-mut-base-ptr.rs
diff --git a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.stderr b/tests/ui/borrowck/borrowck-move-mut-base-ptr.stderr
index d5ff0c501..d5ff0c501 100644
--- a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.stderr
+++ b/tests/ui/borrowck/borrowck-move-mut-base-ptr.stderr
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array-match.rs b/tests/ui/borrowck/borrowck-move-out-from-array-match.rs
index ced4d002b..ced4d002b 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array-match.rs
+++ b/tests/ui/borrowck/borrowck-move-out-from-array-match.rs
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array-match.stderr b/tests/ui/borrowck/borrowck-move-out-from-array-match.stderr
index 67b00c1dd..67b00c1dd 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array-match.stderr
+++ b/tests/ui/borrowck/borrowck-move-out-from-array-match.stderr
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array-no-overlap-match.rs b/tests/ui/borrowck/borrowck-move-out-from-array-no-overlap-match.rs
index 97db70f34..97db70f34 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array-no-overlap-match.rs
+++ b/tests/ui/borrowck/borrowck-move-out-from-array-no-overlap-match.rs
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array-no-overlap-match.stderr b/tests/ui/borrowck/borrowck-move-out-from-array-no-overlap-match.stderr
index 47429ea3e..47429ea3e 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array-no-overlap-match.stderr
+++ b/tests/ui/borrowck/borrowck-move-out-from-array-no-overlap-match.stderr
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array-no-overlap.rs b/tests/ui/borrowck/borrowck-move-out-from-array-no-overlap.rs
index c91b4286b..c91b4286b 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array-no-overlap.rs
+++ b/tests/ui/borrowck/borrowck-move-out-from-array-no-overlap.rs
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array-use-match.rs b/tests/ui/borrowck/borrowck-move-out-from-array-use-match.rs
index 604a25cdc..604a25cdc 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array-use-match.rs
+++ b/tests/ui/borrowck/borrowck-move-out-from-array-use-match.rs
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array-use-match.stderr b/tests/ui/borrowck/borrowck-move-out-from-array-use-match.stderr
index bfab13d42..bfab13d42 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array-use-match.stderr
+++ b/tests/ui/borrowck/borrowck-move-out-from-array-use-match.stderr
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array-use-no-overlap-match.rs b/tests/ui/borrowck/borrowck-move-out-from-array-use-no-overlap-match.rs
index 017ca90b8..017ca90b8 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array-use-no-overlap-match.rs
+++ b/tests/ui/borrowck/borrowck-move-out-from-array-use-no-overlap-match.rs
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array-use-no-overlap-match.stderr b/tests/ui/borrowck/borrowck-move-out-from-array-use-no-overlap-match.stderr
index 8412c24fe..8412c24fe 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array-use-no-overlap-match.stderr
+++ b/tests/ui/borrowck/borrowck-move-out-from-array-use-no-overlap-match.stderr
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array-use-no-overlap.rs b/tests/ui/borrowck/borrowck-move-out-from-array-use-no-overlap.rs
index e3498cef3..e3498cef3 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array-use-no-overlap.rs
+++ b/tests/ui/borrowck/borrowck-move-out-from-array-use-no-overlap.rs
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array-use.rs b/tests/ui/borrowck/borrowck-move-out-from-array-use.rs
index ad08367a3..ad08367a3 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array-use.rs
+++ b/tests/ui/borrowck/borrowck-move-out-from-array-use.rs
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array-use.stderr b/tests/ui/borrowck/borrowck-move-out-from-array-use.stderr
index e2aeaafc6..e2aeaafc6 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array-use.stderr
+++ b/tests/ui/borrowck/borrowck-move-out-from-array-use.stderr
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array.rs b/tests/ui/borrowck/borrowck-move-out-from-array.rs
index 83755812f..83755812f 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array.rs
+++ b/tests/ui/borrowck/borrowck-move-out-from-array.rs
diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array.stderr b/tests/ui/borrowck/borrowck-move-out-from-array.stderr
index dd456681f..dd456681f 100644
--- a/src/test/ui/borrowck/borrowck-move-out-from-array.stderr
+++ b/tests/ui/borrowck/borrowck-move-out-from-array.stderr
diff --git a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.rs b/tests/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.rs
index 0b9e7102c..0b9e7102c 100644
--- a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.rs
+++ b/tests/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.rs
diff --git a/tests/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.stderr b/tests/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.stderr
new file mode 100644
index 000000000..87135f0bb
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.stderr
@@ -0,0 +1,19 @@
+error[E0507]: cannot move out of an `Rc`
+  --> $DIR/borrowck-move-out-of-overloaded-auto-deref.rs:4:14
+   |
+LL |     let _x = Rc::new(vec![1, 2]).into_iter();
+   |              ^^^^^^^^^^^^^^^^^^^^-----------
+   |              |                   |
+   |              |                   value moved due to this method call
+   |              move occurs because value has type `Vec<i32>`, which does not implement the `Copy` trait
+   |
+note: `into_iter` takes ownership of the receiver `self`, which moves value
+  --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
+help: you can `clone` the value and consume it, but this might not be your desired behavior
+   |
+LL |     let _x = Rc::new(vec![1, 2]).clone().into_iter();
+   |                                  ++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.rs b/tests/ui/borrowck/borrowck-move-out-of-overloaded-deref.rs
index ecb135f68..ecb135f68 100644
--- a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.rs
+++ b/tests/ui/borrowck/borrowck-move-out-of-overloaded-deref.rs
diff --git a/tests/ui/borrowck/borrowck-move-out-of-overloaded-deref.stderr b/tests/ui/borrowck/borrowck-move-out-of-overloaded-deref.stderr
new file mode 100644
index 000000000..599fa1e88
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-move-out-of-overloaded-deref.stderr
@@ -0,0 +1,15 @@
+error[E0507]: cannot move out of an `Rc`
+  --> $DIR/borrowck-move-out-of-overloaded-deref.rs:4:14
+   |
+LL |     let _x = *Rc::new("hi".to_string());
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^ move occurs because value has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let _x = *Rc::new("hi".to_string());
+LL +     let _x = Rc::new("hi".to_string());
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/borrowck-move-out-of-static-item.rs b/tests/ui/borrowck/borrowck-move-out-of-static-item.rs
index d01fb2618..d01fb2618 100644
--- a/src/test/ui/borrowck/borrowck-move-out-of-static-item.rs
+++ b/tests/ui/borrowck/borrowck-move-out-of-static-item.rs
diff --git a/src/test/ui/borrowck/borrowck-move-out-of-static-item.stderr b/tests/ui/borrowck/borrowck-move-out-of-static-item.stderr
index edf8c954f..edf8c954f 100644
--- a/src/test/ui/borrowck/borrowck-move-out-of-static-item.stderr
+++ b/tests/ui/borrowck/borrowck-move-out-of-static-item.stderr
diff --git a/tests/ui/borrowck/borrowck-move-out-of-struct-with-dtor.fixed b/tests/ui/borrowck/borrowck-move-out-of-struct-with-dtor.fixed
new file mode 100644
index 000000000..c463c6559
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-move-out-of-struct-with-dtor.fixed
@@ -0,0 +1,24 @@
+// run-rustfix
+#![allow(unused)]
+struct S {f:String}
+impl Drop for S {
+    fn drop(&mut self) { println!("{}", self.f); }
+}
+
+fn move_in_match() {
+    match (S {f:"foo".to_string()}) {
+        //~^ ERROR [E0509]
+        S {f:ref _s} => {}
+    }
+}
+
+fn move_in_let() {
+    let S {f:ref _s} = S {f:"foo".to_string()};
+    //~^ ERROR [E0509]
+}
+
+fn move_in_fn_arg(S {f:ref _s}: S) {
+    //~^ ERROR [E0509]
+}
+
+fn main() {}
diff --git a/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.rs b/tests/ui/borrowck/borrowck-move-out-of-struct-with-dtor.rs
index a429f4bc3..93183062d 100644
--- a/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.rs
+++ b/tests/ui/borrowck/borrowck-move-out-of-struct-with-dtor.rs
@@ -1,3 +1,5 @@
+// run-rustfix
+#![allow(unused)]
 struct S {f:String}
 impl Drop for S {
     fn drop(&mut self) { println!("{}", self.f); }
diff --git a/tests/ui/borrowck/borrowck-move-out-of-struct-with-dtor.stderr b/tests/ui/borrowck/borrowck-move-out-of-struct-with-dtor.stderr
new file mode 100644
index 000000000..58f706c65
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-move-out-of-struct-with-dtor.stderr
@@ -0,0 +1,49 @@
+error[E0509]: cannot move out of type `S`, which implements the `Drop` trait
+  --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:9:11
+   |
+LL |     match (S {f:"foo".to_string()}) {
+   |           ^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of here
+LL |
+LL |         S {f:_s} => {}
+   |              --
+   |              |
+   |              data moved here
+   |              move occurs because `_s` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |         S {f:ref _s} => {}
+   |              +++
+
+error[E0509]: cannot move out of type `S`, which implements the `Drop` trait
+  --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:16:20
+   |
+LL |     let S {f:_s} = S {f:"foo".to_string()};
+   |              --    ^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of here
+   |              |
+   |              data moved here
+   |              move occurs because `_s` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     let S {f:ref _s} = S {f:"foo".to_string()};
+   |              +++
+
+error[E0509]: cannot move out of type `S`, which implements the `Drop` trait
+  --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:20:19
+   |
+LL | fn move_in_fn_arg(S {f:_s}: S) {
+   |                   ^^^^^--^
+   |                   |    |
+   |                   |    data moved here
+   |                   |    move occurs because `_s` has type `String`, which does not implement the `Copy` trait
+   |                   cannot move out of here
+   |
+help: consider borrowing the pattern binding
+   |
+LL | fn move_in_fn_arg(S {f:ref _s}: S) {
+   |                        +++
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0509`.
diff --git a/tests/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.fixed b/tests/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.fixed
new file mode 100644
index 000000000..bc2ddf85f
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.fixed
@@ -0,0 +1,24 @@
+// run-rustfix
+#![allow(unused)]
+struct S(String);
+impl Drop for S {
+    fn drop(&mut self) { }
+}
+
+fn move_in_match() {
+    match S("foo".to_string()) {
+        //~^ ERROR cannot move out of type `S`, which implements the `Drop` trait
+        S(ref _s) => {}
+    }
+}
+
+fn move_in_let() {
+    let S(ref _s) = S("foo".to_string());
+    //~^ ERROR cannot move out of type `S`, which implements the `Drop` trait
+}
+
+fn move_in_fn_arg(S(ref _s): S) {
+    //~^ ERROR cannot move out of type `S`, which implements the `Drop` trait
+}
+
+fn main() {}
diff --git a/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.rs b/tests/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.rs
index 5bd32f82e..f050bce87 100644
--- a/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.rs
+++ b/tests/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.rs
@@ -1,3 +1,5 @@
+// run-rustfix
+#![allow(unused)]
 struct S(String);
 impl Drop for S {
     fn drop(&mut self) { }
diff --git a/tests/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.stderr b/tests/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.stderr
new file mode 100644
index 000000000..160a1f99f
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.stderr
@@ -0,0 +1,49 @@
+error[E0509]: cannot move out of type `S`, which implements the `Drop` trait
+  --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:9:11
+   |
+LL |     match S("foo".to_string()) {
+   |           ^^^^^^^^^^^^^^^^^^^^ cannot move out of here
+LL |
+LL |         S(_s) => {}
+   |           --
+   |           |
+   |           data moved here
+   |           move occurs because `_s` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |         S(ref _s) => {}
+   |           +++
+
+error[E0509]: cannot move out of type `S`, which implements the `Drop` trait
+  --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:16:17
+   |
+LL |     let S(_s) = S("foo".to_string());
+   |           --    ^^^^^^^^^^^^^^^^^^^^ cannot move out of here
+   |           |
+   |           data moved here
+   |           move occurs because `_s` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     let S(ref _s) = S("foo".to_string());
+   |           +++
+
+error[E0509]: cannot move out of type `S`, which implements the `Drop` trait
+  --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:20:19
+   |
+LL | fn move_in_fn_arg(S(_s): S) {
+   |                   ^^--^
+   |                   | |
+   |                   | data moved here
+   |                   | move occurs because `_s` has type `String`, which does not implement the `Copy` trait
+   |                   cannot move out of here
+   |
+help: consider borrowing the pattern binding
+   |
+LL | fn move_in_fn_arg(S(ref _s): S) {
+   |                     +++
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0509`.
diff --git a/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.rs b/tests/ui/borrowck/borrowck-move-out-of-vec-tail.rs
index 8ece81a3c..8ece81a3c 100644
--- a/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.rs
+++ b/tests/ui/borrowck/borrowck-move-out-of-vec-tail.rs
diff --git a/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.stderr b/tests/ui/borrowck/borrowck-move-out-of-vec-tail.stderr
index a865812cb..9ff20a1f4 100644
--- a/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.stderr
+++ b/tests/ui/borrowck/borrowck-move-out-of-vec-tail.stderr
@@ -10,10 +10,10 @@ LL |                   Foo { string: b }] => {
    |                                 - ...and here
    |
    = note: move occurs because these variables have types that don't implement the `Copy` trait
-help: consider removing the `&`
+help: consider removing the borrow
    |
-LL ~                 [Foo { string: a },
-LL ~                   Foo { string: b }] => {
+LL -                 &[Foo { string: a },
+LL +                 [Foo { string: a },
    |
 
 error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-move-subcomponent.rs b/tests/ui/borrowck/borrowck-move-subcomponent.rs
index 38abd1932..38abd1932 100644
--- a/src/test/ui/borrowck/borrowck-move-subcomponent.rs
+++ b/tests/ui/borrowck/borrowck-move-subcomponent.rs
diff --git a/src/test/ui/borrowck/borrowck-move-subcomponent.stderr b/tests/ui/borrowck/borrowck-move-subcomponent.stderr
index 8c9083fcf..8c9083fcf 100644
--- a/src/test/ui/borrowck/borrowck-move-subcomponent.stderr
+++ b/tests/ui/borrowck/borrowck-move-subcomponent.stderr
diff --git a/src/test/ui/borrowck/borrowck-multiple-borrows-interior-boxes.rs b/tests/ui/borrowck/borrowck-multiple-borrows-interior-boxes.rs
index 96d266350..96d266350 100644
--- a/src/test/ui/borrowck/borrowck-multiple-borrows-interior-boxes.rs
+++ b/tests/ui/borrowck/borrowck-multiple-borrows-interior-boxes.rs
diff --git a/src/test/ui/borrowck/borrowck-multiple-captures.rs b/tests/ui/borrowck/borrowck-multiple-captures.rs
index 57b3819ac..57b3819ac 100644
--- a/src/test/ui/borrowck/borrowck-multiple-captures.rs
+++ b/tests/ui/borrowck/borrowck-multiple-captures.rs
diff --git a/src/test/ui/borrowck/borrowck-multiple-captures.stderr b/tests/ui/borrowck/borrowck-multiple-captures.stderr
index f94cbc30d..f94cbc30d 100644
--- a/src/test/ui/borrowck/borrowck-multiple-captures.stderr
+++ b/tests/ui/borrowck/borrowck-multiple-captures.stderr
diff --git a/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.rs b/tests/ui/borrowck/borrowck-mut-addr-of-imm-var.rs
index a79a239cb..a79a239cb 100644
--- a/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.rs
+++ b/tests/ui/borrowck/borrowck-mut-addr-of-imm-var.rs
diff --git a/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.stderr b/tests/ui/borrowck/borrowck-mut-addr-of-imm-var.stderr
index d58548f22..20528e3f0 100644
--- a/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.stderr
+++ b/tests/ui/borrowck/borrowck-mut-addr-of-imm-var.stderr
@@ -1,10 +1,13 @@
 error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
   --> $DIR/borrowck-mut-addr-of-imm-var.rs:3:25
    |
-LL |     let x: isize = 3;
-   |         - help: consider changing this to be mutable: `mut x`
 LL |     let y: &mut isize = &mut x;
    |                         ^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut x: isize = 3;
+   |         +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.rs b/tests/ui/borrowck/borrowck-mut-borrow-linear-errors.rs
index e3d76398b..e3d76398b 100644
--- a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.rs
+++ b/tests/ui/borrowck/borrowck-mut-borrow-linear-errors.rs
diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.stderr b/tests/ui/borrowck/borrowck-mut-borrow-linear-errors.stderr
index d2b845619..d2b845619 100644
--- a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.stderr
+++ b/tests/ui/borrowck/borrowck-mut-borrow-linear-errors.stderr
diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs b/tests/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs
index 6174893ba..6174893ba 100644
--- a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs
+++ b/tests/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs
diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr b/tests/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr
index ef811b849..ef811b849 100644
--- a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr
+++ b/tests/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr
diff --git a/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.rs b/tests/ui/borrowck/borrowck-mut-slice-of-imm-vec.rs
index 8e23571ce..8e23571ce 100644
--- a/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.rs
+++ b/tests/ui/borrowck/borrowck-mut-slice-of-imm-vec.rs
diff --git a/tests/ui/borrowck/borrowck-mut-slice-of-imm-vec.stderr b/tests/ui/borrowck/borrowck-mut-slice-of-imm-vec.stderr
new file mode 100644
index 000000000..8ab472e64
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-mut-slice-of-imm-vec.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `v` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-mut-slice-of-imm-vec.rs:7:11
+   |
+LL |     write(&mut v);
+   |           ^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut v = vec![1, 2, 3];
+   |         +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/borrowck/borrowck-mut-uniq.rs b/tests/ui/borrowck/borrowck-mut-uniq.rs
index 255b4995b..255b4995b 100644
--- a/src/test/ui/borrowck/borrowck-mut-uniq.rs
+++ b/tests/ui/borrowck/borrowck-mut-uniq.rs
diff --git a/src/test/ui/borrowck/borrowck-mut-vec-as-imm-slice.rs b/tests/ui/borrowck/borrowck-mut-vec-as-imm-slice.rs
index d2b0c0154..d2b0c0154 100644
--- a/src/test/ui/borrowck/borrowck-mut-vec-as-imm-slice.rs
+++ b/tests/ui/borrowck/borrowck-mut-vec-as-imm-slice.rs
diff --git a/tests/ui/borrowck/borrowck-mutate-in-guard.rs b/tests/ui/borrowck/borrowck-mutate-in-guard.rs
new file mode 100644
index 000000000..d80a9e815
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-mutate-in-guard.rs
@@ -0,0 +1,34 @@
+#![feature(if_let_guard)]
+
+enum Enum<'a> {
+    A(&'a isize),
+    B(bool),
+}
+
+fn if_guard() -> isize {
+    let mut n = 42;
+    let mut x = Enum::A(&mut n);
+    match x {
+        Enum::A(_) if { x = Enum::B(false); false } => 1,
+        //~^ ERROR cannot assign `x` in match guard
+        Enum::A(_) if { let y = &mut x; *y = Enum::B(false); false } => 1,
+        //~^ ERROR cannot mutably borrow `x` in match guard
+        Enum::A(p) => *p,
+        Enum::B(_) => 2,
+    }
+}
+
+fn if_let_guard() -> isize {
+    let mut n = 42;
+    let mut x = Enum::A(&mut n);
+    match x {
+        Enum::A(_) if let Some(()) = { x = Enum::B(false); None } => 1,
+        //~^ ERROR cannot assign `x` in match guard
+        Enum::A(_) if let Some(()) = { let y = &mut x; *y = Enum::B(false); None } => 1,
+        //~^ ERROR cannot mutably borrow `x` in match guard
+        Enum::A(p) => *p,
+        Enum::B(_) => 2,
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/borrowck/borrowck-mutate-in-guard.stderr b/tests/ui/borrowck/borrowck-mutate-in-guard.stderr
new file mode 100644
index 000000000..dbb3272fd
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-mutate-in-guard.stderr
@@ -0,0 +1,37 @@
+error[E0510]: cannot assign `x` in match guard
+  --> $DIR/borrowck-mutate-in-guard.rs:12:25
+   |
+LL |     match x {
+   |           - value is immutable in match guard
+LL |         Enum::A(_) if { x = Enum::B(false); false } => 1,
+   |                         ^^^^^^^^^^^^^^^^^^ cannot assign
+
+error[E0510]: cannot mutably borrow `x` in match guard
+  --> $DIR/borrowck-mutate-in-guard.rs:14:33
+   |
+LL |     match x {
+   |           - value is immutable in match guard
+...
+LL |         Enum::A(_) if { let y = &mut x; *y = Enum::B(false); false } => 1,
+   |                                 ^^^^^^ cannot mutably borrow
+
+error[E0510]: cannot assign `x` in match guard
+  --> $DIR/borrowck-mutate-in-guard.rs:25:40
+   |
+LL |     match x {
+   |           - value is immutable in match guard
+LL |         Enum::A(_) if let Some(()) = { x = Enum::B(false); None } => 1,
+   |                                        ^^^^^^^^^^^^^^^^^^ cannot assign
+
+error[E0510]: cannot mutably borrow `x` in match guard
+  --> $DIR/borrowck-mutate-in-guard.rs:27:48
+   |
+LL |     match x {
+   |           - value is immutable in match guard
+...
+LL |         Enum::A(_) if let Some(()) = { let y = &mut x; *y = Enum::B(false); None } => 1,
+   |                                                ^^^^^^ cannot mutably borrow
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0510`.
diff --git a/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.rs b/tests/ui/borrowck/borrowck-no-cycle-in-exchange-heap.rs
index f035049d8..f035049d8 100644
--- a/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.rs
+++ b/tests/ui/borrowck/borrowck-no-cycle-in-exchange-heap.rs
diff --git a/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.stderr b/tests/ui/borrowck/borrowck-no-cycle-in-exchange-heap.stderr
index 3462b7610..3462b7610 100644
--- a/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.stderr
+++ b/tests/ui/borrowck/borrowck-no-cycle-in-exchange-heap.stderr
diff --git a/src/test/ui/borrowck/borrowck-object-lifetime.rs b/tests/ui/borrowck/borrowck-object-lifetime.rs
index 137a9adbc..137a9adbc 100644
--- a/src/test/ui/borrowck/borrowck-object-lifetime.rs
+++ b/tests/ui/borrowck/borrowck-object-lifetime.rs
diff --git a/src/test/ui/borrowck/borrowck-object-lifetime.stderr b/tests/ui/borrowck/borrowck-object-lifetime.stderr
index 215ed760a..215ed760a 100644
--- a/src/test/ui/borrowck/borrowck-object-lifetime.stderr
+++ b/tests/ui/borrowck/borrowck-object-lifetime.stderr
diff --git a/src/test/ui/borrowck/borrowck-or-init.rs b/tests/ui/borrowck/borrowck-or-init.rs
index 079cf899e..079cf899e 100644
--- a/src/test/ui/borrowck/borrowck-or-init.rs
+++ b/tests/ui/borrowck/borrowck-or-init.rs
diff --git a/src/test/ui/borrowck/borrowck-or-init.stderr b/tests/ui/borrowck/borrowck-or-init.stderr
index 16d66bf40..16d66bf40 100644
--- a/src/test/ui/borrowck/borrowck-or-init.stderr
+++ b/tests/ui/borrowck/borrowck-or-init.stderr
diff --git a/src/test/ui/borrowck/borrowck-overloaded-call.rs b/tests/ui/borrowck/borrowck-overloaded-call.rs
index 7b16bf666..7b16bf666 100644
--- a/src/test/ui/borrowck/borrowck-overloaded-call.rs
+++ b/tests/ui/borrowck/borrowck-overloaded-call.rs
diff --git a/src/test/ui/borrowck/borrowck-overloaded-call.stderr b/tests/ui/borrowck/borrowck-overloaded-call.stderr
index ddb63b5ec..723b19f41 100644
--- a/src/test/ui/borrowck/borrowck-overloaded-call.stderr
+++ b/tests/ui/borrowck/borrowck-overloaded-call.stderr
@@ -11,11 +11,13 @@ LL |     use_mut(sp);
 error[E0596]: cannot borrow `s` as mutable, as it is not declared as mutable
   --> $DIR/borrowck-overloaded-call.rs:67:5
    |
-LL |     let s = SFnMut {
-   |         - help: consider changing this to be mutable: `mut s`
-...
 LL |     s(3);
    |     ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut s = SFnMut {
+   |         +++
 
 error[E0382]: use of moved value: `s`
   --> $DIR/borrowck-overloaded-call.rs:75:5
diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs b/tests/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs
index 0e3e01a93..0e3e01a93 100644
--- a/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs
+++ b/tests/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs
diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.stderr b/tests/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.stderr
index 5d52e4919..5d52e4919 100644
--- a/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.stderr
+++ b/tests/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.stderr
diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.rs b/tests/ui/borrowck/borrowck-overloaded-index-autoderef.rs
index 3d3a3afd3..3d3a3afd3 100644
--- a/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.rs
+++ b/tests/ui/borrowck/borrowck-overloaded-index-autoderef.rs
diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.stderr b/tests/ui/borrowck/borrowck-overloaded-index-autoderef.stderr
index 087f2ac79..087f2ac79 100644
--- a/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.stderr
+++ b/tests/ui/borrowck/borrowck-overloaded-index-autoderef.stderr
diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.rs b/tests/ui/borrowck/borrowck-overloaded-index-move-from-vec.rs
index 344d75cc5..344d75cc5 100644
--- a/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.rs
+++ b/tests/ui/borrowck/borrowck-overloaded-index-move-from-vec.rs
diff --git a/tests/ui/borrowck/borrowck-overloaded-index-move-from-vec.stderr b/tests/ui/borrowck/borrowck-overloaded-index-move-from-vec.stderr
new file mode 100644
index 000000000..f5f4817e9
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-overloaded-index-move-from-vec.stderr
@@ -0,0 +1,14 @@
+error[E0507]: cannot move out of index of `MyVec<Box<i32>>`
+  --> $DIR/borrowck-overloaded-index-move-from-vec.rs:20:15
+   |
+LL |     let bad = v[0];
+   |               ^^^^ move occurs because value has type `Box<i32>`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let bad = &v[0];
+   |               +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-move-index.rs b/tests/ui/borrowck/borrowck-overloaded-index-move-index.rs
index 00f448314..00f448314 100644
--- a/src/test/ui/borrowck/borrowck-overloaded-index-move-index.rs
+++ b/tests/ui/borrowck/borrowck-overloaded-index-move-index.rs
diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-move-index.stderr b/tests/ui/borrowck/borrowck-overloaded-index-move-index.stderr
index fb0e274c2..fb0e274c2 100644
--- a/src/test/ui/borrowck/borrowck-overloaded-index-move-index.stderr
+++ b/tests/ui/borrowck/borrowck-overloaded-index-move-index.stderr
diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.rs b/tests/ui/borrowck/borrowck-overloaded-index-ref-index.rs
index 8adafaa8e..8adafaa8e 100644
--- a/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.rs
+++ b/tests/ui/borrowck/borrowck-overloaded-index-ref-index.rs
diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.stderr b/tests/ui/borrowck/borrowck-overloaded-index-ref-index.stderr
index 2f92c1ebe..2f92c1ebe 100644
--- a/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.stderr
+++ b/tests/ui/borrowck/borrowck-overloaded-index-ref-index.stderr
diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-1.rs b/tests/ui/borrowck/borrowck-partial-reinit-1.rs
index 4e6951581..4e6951581 100644
--- a/src/test/ui/borrowck/borrowck-partial-reinit-1.rs
+++ b/tests/ui/borrowck/borrowck-partial-reinit-1.rs
diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-1.stderr b/tests/ui/borrowck/borrowck-partial-reinit-1.stderr
index 65f2bd6cf..65f2bd6cf 100644
--- a/src/test/ui/borrowck/borrowck-partial-reinit-1.stderr
+++ b/tests/ui/borrowck/borrowck-partial-reinit-1.stderr
diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-2.rs b/tests/ui/borrowck/borrowck-partial-reinit-2.rs
index 06cd322e7..06cd322e7 100644
--- a/src/test/ui/borrowck/borrowck-partial-reinit-2.rs
+++ b/tests/ui/borrowck/borrowck-partial-reinit-2.rs
diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-2.stderr b/tests/ui/borrowck/borrowck-partial-reinit-2.stderr
index 36a871fbb..36a871fbb 100644
--- a/src/test/ui/borrowck/borrowck-partial-reinit-2.stderr
+++ b/tests/ui/borrowck/borrowck-partial-reinit-2.stderr
diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-3.rs b/tests/ui/borrowck/borrowck-partial-reinit-3.rs
index ca484315b..ca484315b 100644
--- a/src/test/ui/borrowck/borrowck-partial-reinit-3.rs
+++ b/tests/ui/borrowck/borrowck-partial-reinit-3.rs
diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-3.stderr b/tests/ui/borrowck/borrowck-partial-reinit-3.stderr
index 05f5411ee..05f5411ee 100644
--- a/src/test/ui/borrowck/borrowck-partial-reinit-3.stderr
+++ b/tests/ui/borrowck/borrowck-partial-reinit-3.stderr
diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-4.rs b/tests/ui/borrowck/borrowck-partial-reinit-4.rs
index a43a19366..a43a19366 100644
--- a/src/test/ui/borrowck/borrowck-partial-reinit-4.rs
+++ b/tests/ui/borrowck/borrowck-partial-reinit-4.rs
diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-4.stderr b/tests/ui/borrowck/borrowck-partial-reinit-4.stderr
index d12a482cb..d12a482cb 100644
--- a/src/test/ui/borrowck/borrowck-partial-reinit-4.stderr
+++ b/tests/ui/borrowck/borrowck-partial-reinit-4.stderr
diff --git a/src/test/ui/borrowck/borrowck-pat-enum.rs b/tests/ui/borrowck/borrowck-pat-enum.rs
index 7f9c5544d..7f9c5544d 100644
--- a/src/test/ui/borrowck/borrowck-pat-enum.rs
+++ b/tests/ui/borrowck/borrowck-pat-enum.rs
diff --git a/src/test/ui/borrowck/borrowck-pat-reassign-binding.rs b/tests/ui/borrowck/borrowck-pat-reassign-binding.rs
index f02c46fb8..f02c46fb8 100644
--- a/src/test/ui/borrowck/borrowck-pat-reassign-binding.rs
+++ b/tests/ui/borrowck/borrowck-pat-reassign-binding.rs
diff --git a/src/test/ui/borrowck/borrowck-pat-reassign-binding.stderr b/tests/ui/borrowck/borrowck-pat-reassign-binding.stderr
index 9e65ccf5a..9e65ccf5a 100644
--- a/src/test/ui/borrowck/borrowck-pat-reassign-binding.stderr
+++ b/tests/ui/borrowck/borrowck-pat-reassign-binding.stderr
diff --git a/src/test/ui/borrowck/borrowck-pat-reassign-no-binding.rs b/tests/ui/borrowck/borrowck-pat-reassign-no-binding.rs
index 1362fd8ce..1362fd8ce 100644
--- a/src/test/ui/borrowck/borrowck-pat-reassign-no-binding.rs
+++ b/tests/ui/borrowck/borrowck-pat-reassign-no-binding.rs
diff --git a/src/test/ui/borrowck/borrowck-reborrow-from-mut.rs b/tests/ui/borrowck/borrowck-reborrow-from-mut.rs
index eef83c5ac..eef83c5ac 100644
--- a/src/test/ui/borrowck/borrowck-reborrow-from-mut.rs
+++ b/tests/ui/borrowck/borrowck-reborrow-from-mut.rs
diff --git a/src/test/ui/borrowck/borrowck-reborrow-from-mut.stderr b/tests/ui/borrowck/borrowck-reborrow-from-mut.stderr
index 284cab296..d9590e446 100644
--- a/src/test/ui/borrowck/borrowck-reborrow-from-mut.stderr
+++ b/tests/ui/borrowck/borrowck-reborrow-from-mut.stderr
@@ -105,10 +105,13 @@ LL |     use_imm(_bar1);
 error[E0596]: cannot borrow `foo.bar1` as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-reborrow-from-mut.rs:88:17
    |
-LL | fn borrow_mut_from_imm(foo: &Foo) {
-   |                             ---- help: consider changing this to be a mutable reference: `&mut Foo`
 LL |     let _bar1 = &mut foo.bar1;
    |                 ^^^^^^^^^^^^^ `foo` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn borrow_mut_from_imm(foo: &mut Foo) {
+   |                             ~~~~~~~~
 
 error: aborting due to 11 previous errors
 
diff --git a/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.rs b/tests/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.rs
index 779cb3bbe..779cb3bbe 100644
--- a/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.rs
+++ b/tests/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.rs
diff --git a/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.stderr b/tests/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.stderr
index f28c42ce2..f28c42ce2 100644
--- a/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.stderr
+++ b/tests/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.stderr
diff --git a/src/test/ui/borrowck/borrowck-ref-mut-of-imm.rs b/tests/ui/borrowck/borrowck-ref-mut-of-imm.rs
index ae5bb8591..ae5bb8591 100644
--- a/src/test/ui/borrowck/borrowck-ref-mut-of-imm.rs
+++ b/tests/ui/borrowck/borrowck-ref-mut-of-imm.rs
diff --git a/tests/ui/borrowck/borrowck-ref-mut-of-imm.stderr b/tests/ui/borrowck/borrowck-ref-mut-of-imm.stderr
new file mode 100644
index 000000000..5cfd81bd0
--- /dev/null
+++ b/tests/ui/borrowck/borrowck-ref-mut-of-imm.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `x.0` as mutable, as `x` is not declared as mutable
+  --> $DIR/borrowck-ref-mut-of-imm.rs:4:12
+   |
+LL |       Some(ref mut v) => *v
+   |            ^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn destructure(mut x: Option<isize>) -> isize {
+   |                +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/borrowck/borrowck-reinit.rs b/tests/ui/borrowck/borrowck-reinit.rs
index 866b3a2a8..866b3a2a8 100644
--- a/src/test/ui/borrowck/borrowck-reinit.rs
+++ b/tests/ui/borrowck/borrowck-reinit.rs
diff --git a/src/test/ui/borrowck/borrowck-reinit.stderr b/tests/ui/borrowck/borrowck-reinit.stderr
index f785900d5..f785900d5 100644
--- a/src/test/ui/borrowck/borrowck-reinit.stderr
+++ b/tests/ui/borrowck/borrowck-reinit.stderr
diff --git a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.rs b/tests/ui/borrowck/borrowck-report-with-custom-diagnostic.rs
index 6f323d912..6f323d912 100644
--- a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.rs
+++ b/tests/ui/borrowck/borrowck-report-with-custom-diagnostic.rs
diff --git a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr b/tests/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr
index d05996413..d05996413 100644
--- a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr
+++ b/tests/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr
diff --git a/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.rs b/tests/ui/borrowck/borrowck-return-variable-on-stack-via-clone.rs
index 75e5e7fd4..75e5e7fd4 100644
--- a/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.rs
+++ b/tests/ui/borrowck/borrowck-return-variable-on-stack-via-clone.rs
diff --git a/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.stderr b/tests/ui/borrowck/borrowck-return-variable-on-stack-via-clone.stderr
index d54449ac4..d54449ac4 100644
--- a/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.stderr
+++ b/tests/ui/borrowck/borrowck-return-variable-on-stack-via-clone.stderr
diff --git a/src/test/ui/borrowck/borrowck-return.rs b/tests/ui/borrowck/borrowck-return.rs
index a63ffcff7..a63ffcff7 100644
--- a/src/test/ui/borrowck/borrowck-return.rs
+++ b/tests/ui/borrowck/borrowck-return.rs
diff --git a/src/test/ui/borrowck/borrowck-return.stderr b/tests/ui/borrowck/borrowck-return.stderr
index 9799357c9..9799357c9 100644
--- a/src/test/ui/borrowck/borrowck-return.stderr
+++ b/tests/ui/borrowck/borrowck-return.stderr
diff --git a/src/test/ui/borrowck/borrowck-rvalues-mutable.rs b/tests/ui/borrowck/borrowck-rvalues-mutable.rs
index c4695c942..c4695c942 100644
--- a/src/test/ui/borrowck/borrowck-rvalues-mutable.rs
+++ b/tests/ui/borrowck/borrowck-rvalues-mutable.rs
diff --git a/src/test/ui/borrowck/borrowck-scope-of-deref-issue-4666.rs b/tests/ui/borrowck/borrowck-scope-of-deref-issue-4666.rs
index e89332ae3..e89332ae3 100644
--- a/src/test/ui/borrowck/borrowck-scope-of-deref-issue-4666.rs
+++ b/tests/ui/borrowck/borrowck-scope-of-deref-issue-4666.rs
diff --git a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-array-no-overlap.rs b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-array-no-overlap.rs
index a8e56f648..a8e56f648 100644
--- a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-array-no-overlap.rs
+++ b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-array-no-overlap.rs
diff --git a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-array.rs b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-array.rs
index 6b210d732..6b210d732 100644
--- a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-array.rs
+++ b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-array.rs
diff --git a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-array.stderr b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-array.stderr
index f4324110c..f4324110c 100644
--- a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-array.stderr
+++ b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-array.stderr
diff --git a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-rpass.rs b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-rpass.rs
index 4367596c6..4367596c6 100644
--- a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-rpass.rs
+++ b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-rpass.rs
diff --git a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-slice-no-overlap.rs b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-slice-no-overlap.rs
index 6390dc3a9..6390dc3a9 100644
--- a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-slice-no-overlap.rs
+++ b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-slice-no-overlap.rs
diff --git a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-slice.rs b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-slice.rs
index 0e1c90a1c..0e1c90a1c 100644
--- a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-slice.rs
+++ b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-slice.rs
diff --git a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-slice.stderr b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-slice.stderr
index f9a63bd49..f9a63bd49 100644
--- a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-slice.stderr
+++ b/tests/ui/borrowck/borrowck-slice-pattern-element-loan-slice.stderr
diff --git a/src/test/ui/borrowck/borrowck-static-item-in-fn.rs b/tests/ui/borrowck/borrowck-static-item-in-fn.rs
index 5f4379325..5f4379325 100644
--- a/src/test/ui/borrowck/borrowck-static-item-in-fn.rs
+++ b/tests/ui/borrowck/borrowck-static-item-in-fn.rs
diff --git a/src/test/ui/borrowck/borrowck-storage-dead.rs b/tests/ui/borrowck/borrowck-storage-dead.rs
index fe9844610..fe9844610 100644
--- a/src/test/ui/borrowck/borrowck-storage-dead.rs
+++ b/tests/ui/borrowck/borrowck-storage-dead.rs
diff --git a/src/test/ui/borrowck/borrowck-storage-dead.stderr b/tests/ui/borrowck/borrowck-storage-dead.stderr
index 3a413153a..3a413153a 100644
--- a/src/test/ui/borrowck/borrowck-storage-dead.stderr
+++ b/tests/ui/borrowck/borrowck-storage-dead.stderr
diff --git a/src/test/ui/borrowck/borrowck-struct-update-with-dtor.rs b/tests/ui/borrowck/borrowck-struct-update-with-dtor.rs
index 1f6ed6d46..1f6ed6d46 100644
--- a/src/test/ui/borrowck/borrowck-struct-update-with-dtor.rs
+++ b/tests/ui/borrowck/borrowck-struct-update-with-dtor.rs
diff --git a/src/test/ui/borrowck/borrowck-struct-update-with-dtor.stderr b/tests/ui/borrowck/borrowck-struct-update-with-dtor.stderr
index af32f2791..af32f2791 100644
--- a/src/test/ui/borrowck/borrowck-struct-update-with-dtor.stderr
+++ b/tests/ui/borrowck/borrowck-struct-update-with-dtor.stderr
diff --git a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.rs b/tests/ui/borrowck/borrowck-swap-mut-base-ptr.rs
index 8170323ef..8170323ef 100644
--- a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.rs
+++ b/tests/ui/borrowck/borrowck-swap-mut-base-ptr.rs
diff --git a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.stderr b/tests/ui/borrowck/borrowck-swap-mut-base-ptr.stderr
index b39215b9a..b39215b9a 100644
--- a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.stderr
+++ b/tests/ui/borrowck/borrowck-swap-mut-base-ptr.stderr
diff --git a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs b/tests/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs
index 1cf8d187c..1cf8d187c 100644
--- a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs
+++ b/tests/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs
diff --git a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.stderr b/tests/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.stderr
index 26453b42f..26453b42f 100644
--- a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.stderr
+++ b/tests/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.stderr
diff --git a/src/test/ui/borrowck/borrowck-trait-lifetime.rs b/tests/ui/borrowck/borrowck-trait-lifetime.rs
index 8a6dfe76d..8a6dfe76d 100644
--- a/src/test/ui/borrowck/borrowck-trait-lifetime.rs
+++ b/tests/ui/borrowck/borrowck-trait-lifetime.rs
diff --git a/src/test/ui/borrowck/borrowck-unary-move.rs b/tests/ui/borrowck/borrowck-unary-move.rs
index 3b4c0731f..3b4c0731f 100644
--- a/src/test/ui/borrowck/borrowck-unary-move.rs
+++ b/tests/ui/borrowck/borrowck-unary-move.rs
diff --git a/src/test/ui/borrowck/borrowck-unary-move.stderr b/tests/ui/borrowck/borrowck-unary-move.stderr
index aab225ed4..aab225ed4 100644
--- a/src/test/ui/borrowck/borrowck-unary-move.stderr
+++ b/tests/ui/borrowck/borrowck-unary-move.stderr
diff --git a/src/test/ui/borrowck/borrowck-unboxed-closures.rs b/tests/ui/borrowck/borrowck-unboxed-closures.rs
index f0048dd7d..f0048dd7d 100644
--- a/src/test/ui/borrowck/borrowck-unboxed-closures.rs
+++ b/tests/ui/borrowck/borrowck-unboxed-closures.rs
diff --git a/src/test/ui/borrowck/borrowck-unboxed-closures.stderr b/tests/ui/borrowck/borrowck-unboxed-closures.stderr
index d46ef126d..363467646 100644
--- a/src/test/ui/borrowck/borrowck-unboxed-closures.stderr
+++ b/tests/ui/borrowck/borrowck-unboxed-closures.stderr
@@ -11,10 +11,13 @@ LL |     use_mut(g);
 error[E0596]: cannot borrow `f` as mutable, as it is not declared as mutable
   --> $DIR/borrowck-unboxed-closures.rs:7:5
    |
-LL | fn b<F:FnMut(isize, isize) -> isize>(f: F) {
-   |                                      - help: consider changing this to be mutable: `mut f`
 LL |     f(1, 2);
    |     ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn b<F:FnMut(isize, isize) -> isize>(mut f: F) {
+   |                                      +++
 
 error[E0382]: use of moved value: `f`
   --> $DIR/borrowck-unboxed-closures.rs:12:5
diff --git a/src/test/ui/borrowck/borrowck-uninit-after-item.rs b/tests/ui/borrowck/borrowck-uninit-after-item.rs
index e97ce6aa4..e97ce6aa4 100644
--- a/src/test/ui/borrowck/borrowck-uninit-after-item.rs
+++ b/tests/ui/borrowck/borrowck-uninit-after-item.rs
diff --git a/src/test/ui/borrowck/borrowck-uninit-after-item.stderr b/tests/ui/borrowck/borrowck-uninit-after-item.stderr
index 071598b42..071598b42 100644
--- a/src/test/ui/borrowck/borrowck-uninit-after-item.stderr
+++ b/tests/ui/borrowck/borrowck-uninit-after-item.stderr
diff --git a/src/test/ui/borrowck/borrowck-uninit-field-access.rs b/tests/ui/borrowck/borrowck-uninit-field-access.rs
index bc931eef9..bc931eef9 100644
--- a/src/test/ui/borrowck/borrowck-uninit-field-access.rs
+++ b/tests/ui/borrowck/borrowck-uninit-field-access.rs
diff --git a/src/test/ui/borrowck/borrowck-uninit-field-access.stderr b/tests/ui/borrowck/borrowck-uninit-field-access.stderr
index f0f4ad704..f0f4ad704 100644
--- a/src/test/ui/borrowck/borrowck-uninit-field-access.stderr
+++ b/tests/ui/borrowck/borrowck-uninit-field-access.stderr
diff --git a/src/test/ui/borrowck/borrowck-uninit-in-assignop.rs b/tests/ui/borrowck/borrowck-uninit-in-assignop.rs
index 92c3692bd..92c3692bd 100644
--- a/src/test/ui/borrowck/borrowck-uninit-in-assignop.rs
+++ b/tests/ui/borrowck/borrowck-uninit-in-assignop.rs
diff --git a/src/test/ui/borrowck/borrowck-uninit-in-assignop.stderr b/tests/ui/borrowck/borrowck-uninit-in-assignop.stderr
index fdbb451bd..fdbb451bd 100644
--- a/src/test/ui/borrowck/borrowck-uninit-in-assignop.stderr
+++ b/tests/ui/borrowck/borrowck-uninit-in-assignop.stderr
diff --git a/src/test/ui/borrowck/borrowck-uninit-ref-chain.rs b/tests/ui/borrowck/borrowck-uninit-ref-chain.rs
index c36b9707d..c36b9707d 100644
--- a/src/test/ui/borrowck/borrowck-uninit-ref-chain.rs
+++ b/tests/ui/borrowck/borrowck-uninit-ref-chain.rs
diff --git a/src/test/ui/borrowck/borrowck-uninit-ref-chain.stderr b/tests/ui/borrowck/borrowck-uninit-ref-chain.stderr
index 73fded754..73fded754 100644
--- a/src/test/ui/borrowck/borrowck-uninit-ref-chain.stderr
+++ b/tests/ui/borrowck/borrowck-uninit-ref-chain.stderr
diff --git a/src/test/ui/borrowck/borrowck-uninit.rs b/tests/ui/borrowck/borrowck-uninit.rs
index 5d0ebabb0..5d0ebabb0 100644
--- a/src/test/ui/borrowck/borrowck-uninit.rs
+++ b/tests/ui/borrowck/borrowck-uninit.rs
diff --git a/src/test/ui/borrowck/borrowck-uninit.stderr b/tests/ui/borrowck/borrowck-uninit.stderr
index eeafc4ce1..eeafc4ce1 100644
--- a/src/test/ui/borrowck/borrowck-uninit.stderr
+++ b/tests/ui/borrowck/borrowck-uninit.stderr
diff --git a/src/test/ui/borrowck/borrowck-union-borrow-nested.rs b/tests/ui/borrowck/borrowck-union-borrow-nested.rs
index b3a6670fa..b3a6670fa 100644
--- a/src/test/ui/borrowck/borrowck-union-borrow-nested.rs
+++ b/tests/ui/borrowck/borrowck-union-borrow-nested.rs
diff --git a/src/test/ui/borrowck/borrowck-union-borrow-nested.stderr b/tests/ui/borrowck/borrowck-union-borrow-nested.stderr
index 4bd7d54cf..4bd7d54cf 100644
--- a/src/test/ui/borrowck/borrowck-union-borrow-nested.stderr
+++ b/tests/ui/borrowck/borrowck-union-borrow-nested.stderr
diff --git a/src/test/ui/borrowck/borrowck-union-borrow.rs b/tests/ui/borrowck/borrowck-union-borrow.rs
index f01915398..f01915398 100644
--- a/src/test/ui/borrowck/borrowck-union-borrow.rs
+++ b/tests/ui/borrowck/borrowck-union-borrow.rs
diff --git a/src/test/ui/borrowck/borrowck-union-borrow.stderr b/tests/ui/borrowck/borrowck-union-borrow.stderr
index 090c7b6b5..090c7b6b5 100644
--- a/src/test/ui/borrowck/borrowck-union-borrow.stderr
+++ b/tests/ui/borrowck/borrowck-union-borrow.stderr
diff --git a/src/test/ui/borrowck/borrowck-union-move-assign.rs b/tests/ui/borrowck/borrowck-union-move-assign.rs
index 4c96ccdb2..4c96ccdb2 100644
--- a/src/test/ui/borrowck/borrowck-union-move-assign.rs
+++ b/tests/ui/borrowck/borrowck-union-move-assign.rs
diff --git a/src/test/ui/borrowck/borrowck-union-move-assign.stderr b/tests/ui/borrowck/borrowck-union-move-assign.stderr
index af6f6fac4..af6f6fac4 100644
--- a/src/test/ui/borrowck/borrowck-union-move-assign.stderr
+++ b/tests/ui/borrowck/borrowck-union-move-assign.stderr
diff --git a/src/test/ui/borrowck/borrowck-union-move.rs b/tests/ui/borrowck/borrowck-union-move.rs
index 510547ad5..510547ad5 100644
--- a/src/test/ui/borrowck/borrowck-union-move.rs
+++ b/tests/ui/borrowck/borrowck-union-move.rs
diff --git a/src/test/ui/borrowck/borrowck-union-move.stderr b/tests/ui/borrowck/borrowck-union-move.stderr
index 731607fbd..731607fbd 100644
--- a/src/test/ui/borrowck/borrowck-union-move.stderr
+++ b/tests/ui/borrowck/borrowck-union-move.stderr
diff --git a/src/test/ui/borrowck/borrowck-union-uninitialized.rs b/tests/ui/borrowck/borrowck-union-uninitialized.rs
index bbe9f22aa..bbe9f22aa 100644
--- a/src/test/ui/borrowck/borrowck-union-uninitialized.rs
+++ b/tests/ui/borrowck/borrowck-union-uninitialized.rs
diff --git a/src/test/ui/borrowck/borrowck-union-uninitialized.stderr b/tests/ui/borrowck/borrowck-union-uninitialized.stderr
index b7ff5f395..b7ff5f395 100644
--- a/src/test/ui/borrowck/borrowck-union-uninitialized.stderr
+++ b/tests/ui/borrowck/borrowck-union-uninitialized.stderr
diff --git a/src/test/ui/borrowck/borrowck-uniq-via-lend.rs b/tests/ui/borrowck/borrowck-uniq-via-lend.rs
index 25d3e0b54..25d3e0b54 100644
--- a/src/test/ui/borrowck/borrowck-uniq-via-lend.rs
+++ b/tests/ui/borrowck/borrowck-uniq-via-lend.rs
diff --git a/src/test/ui/borrowck/borrowck-uniq-via-lend.stderr b/tests/ui/borrowck/borrowck-uniq-via-lend.stderr
index 6dbe4c74b..6dbe4c74b 100644
--- a/src/test/ui/borrowck/borrowck-uniq-via-lend.stderr
+++ b/tests/ui/borrowck/borrowck-uniq-via-lend.stderr
diff --git a/src/test/ui/borrowck/borrowck-uniq-via-ref.rs b/tests/ui/borrowck/borrowck-uniq-via-ref.rs
index bdf7cc57a..bdf7cc57a 100644
--- a/src/test/ui/borrowck/borrowck-uniq-via-ref.rs
+++ b/tests/ui/borrowck/borrowck-uniq-via-ref.rs
diff --git a/src/test/ui/borrowck/borrowck-univariant-enum.rs b/tests/ui/borrowck/borrowck-univariant-enum.rs
index c78e94752..c78e94752 100644
--- a/src/test/ui/borrowck/borrowck-univariant-enum.rs
+++ b/tests/ui/borrowck/borrowck-univariant-enum.rs
diff --git a/src/test/ui/borrowck/borrowck-unsafe-static-mutable-borrows.rs b/tests/ui/borrowck/borrowck-unsafe-static-mutable-borrows.rs
index adc7dfd54..adc7dfd54 100644
--- a/src/test/ui/borrowck/borrowck-unsafe-static-mutable-borrows.rs
+++ b/tests/ui/borrowck/borrowck-unsafe-static-mutable-borrows.rs
diff --git a/src/test/ui/borrowck/borrowck-unused-mut-locals.rs b/tests/ui/borrowck/borrowck-unused-mut-locals.rs
index 23ef975cb..23ef975cb 100644
--- a/src/test/ui/borrowck/borrowck-unused-mut-locals.rs
+++ b/tests/ui/borrowck/borrowck-unused-mut-locals.rs
diff --git a/src/test/ui/borrowck/borrowck-use-in-index-lvalue.rs b/tests/ui/borrowck/borrowck-use-in-index-lvalue.rs
index d30b1de5c..d30b1de5c 100644
--- a/src/test/ui/borrowck/borrowck-use-in-index-lvalue.rs
+++ b/tests/ui/borrowck/borrowck-use-in-index-lvalue.rs
diff --git a/src/test/ui/borrowck/borrowck-use-in-index-lvalue.stderr b/tests/ui/borrowck/borrowck-use-in-index-lvalue.stderr
index 18e808f10..18e808f10 100644
--- a/src/test/ui/borrowck/borrowck-use-in-index-lvalue.stderr
+++ b/tests/ui/borrowck/borrowck-use-in-index-lvalue.stderr
diff --git a/src/test/ui/borrowck/borrowck-use-mut-borrow-rpass.rs b/tests/ui/borrowck/borrowck-use-mut-borrow-rpass.rs
index 1cf763f66..1cf763f66 100644
--- a/src/test/ui/borrowck/borrowck-use-mut-borrow-rpass.rs
+++ b/tests/ui/borrowck/borrowck-use-mut-borrow-rpass.rs
diff --git a/src/test/ui/borrowck/borrowck-use-mut-borrow.rs b/tests/ui/borrowck/borrowck-use-mut-borrow.rs
index 94f88395f..94f88395f 100644
--- a/src/test/ui/borrowck/borrowck-use-mut-borrow.rs
+++ b/tests/ui/borrowck/borrowck-use-mut-borrow.rs
diff --git a/src/test/ui/borrowck/borrowck-use-mut-borrow.stderr b/tests/ui/borrowck/borrowck-use-mut-borrow.stderr
index 91d69c51e..91d69c51e 100644
--- a/src/test/ui/borrowck/borrowck-use-mut-borrow.stderr
+++ b/tests/ui/borrowck/borrowck-use-mut-borrow.stderr
diff --git a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.rs b/tests/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.rs
index 3ce721618..3ce721618 100644
--- a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.rs
+++ b/tests/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.rs
diff --git a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.stderr b/tests/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.stderr
index 55f3ff553..55f3ff553 100644
--- a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.stderr
+++ b/tests/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.stderr
diff --git a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.rs b/tests/ui/borrowck/borrowck-use-uninitialized-in-cast.rs
index a355a546d..a355a546d 100644
--- a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.rs
+++ b/tests/ui/borrowck/borrowck-use-uninitialized-in-cast.rs
diff --git a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.stderr b/tests/ui/borrowck/borrowck-use-uninitialized-in-cast.stderr
index ea3d0d3ef..ea3d0d3ef 100644
--- a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.stderr
+++ b/tests/ui/borrowck/borrowck-use-uninitialized-in-cast.stderr
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.rs b/tests/ui/borrowck/borrowck-vec-pattern-element-loan.rs
index cd853b833..cd853b833 100644
--- a/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.rs
+++ b/tests/ui/borrowck/borrowck-vec-pattern-element-loan.rs
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.stderr b/tests/ui/borrowck/borrowck-vec-pattern-element-loan.stderr
index 170982b16..170982b16 100644
--- a/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.stderr
+++ b/tests/ui/borrowck/borrowck-vec-pattern-element-loan.stderr
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.rs b/tests/ui/borrowck/borrowck-vec-pattern-loan-from-mut.rs
index 05859c95d..05859c95d 100644
--- a/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.rs
+++ b/tests/ui/borrowck/borrowck-vec-pattern-loan-from-mut.rs
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr b/tests/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr
index eb0f24b9b..eb0f24b9b 100644
--- a/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr
+++ b/tests/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.rs b/tests/ui/borrowck/borrowck-vec-pattern-move-tail.rs
index 9b8ba2ea8..9b8ba2ea8 100644
--- a/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.rs
+++ b/tests/ui/borrowck/borrowck-vec-pattern-move-tail.rs
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.stderr b/tests/ui/borrowck/borrowck-vec-pattern-move-tail.stderr
index 0ac7df944..0ac7df944 100644
--- a/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.stderr
+++ b/tests/ui/borrowck/borrowck-vec-pattern-move-tail.stderr
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.rs b/tests/ui/borrowck/borrowck-vec-pattern-nesting.rs
index 8a9296c59..0e9284a2c 100644
--- a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.rs
+++ b/tests/ui/borrowck/borrowck-vec-pattern-nesting.rs
@@ -37,7 +37,7 @@ fn c() {
         &mut [_a,
         //~^ NOTE data moved here
         //~| NOTE move occurs because `_a` has type
-        //~| HELP consider removing the `&mut`
+        //~| HELP consider removing the mutable borrow
             ..
         ] => {
         }
@@ -56,7 +56,7 @@ fn d() {
         //~^ ERROR cannot move out
         //~| NOTE cannot move out
         &mut [
-        //~^ HELP consider removing the `&mut`
+        //~^ HELP consider removing the mutable borrow
          _b] => {}
         //~^ NOTE data moved here
         //~| NOTE move occurs because `_b` has type
@@ -79,7 +79,7 @@ fn e() {
         //~^ NOTE data moved here
         //~| NOTE and here
         //~| NOTE and here
-        //~| HELP consider removing the `&mut`
+        //~| HELP consider removing the mutable borrow
         _ => {}
     }
     let a = vec[0]; //~ ERROR cannot move out
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr b/tests/ui/borrowck/borrowck-vec-pattern-nesting.stderr
index c3bcb7de6..0dc5e64e4 100644
--- a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr
+++ b/tests/ui/borrowck/borrowck-vec-pattern-nesting.stderr
@@ -34,14 +34,10 @@ LL |         &mut [_a,
    |               data moved here
    |               move occurs because `_a` has type `Box<isize>`, which does not implement the `Copy` trait
    |
-help: consider removing the `&mut`
+help: consider removing the mutable borrow
    |
-LL ~         [_a,
-LL +
-LL +
-LL +
-LL +             ..
-LL ~         ] => {
+LL -         &mut [_a,
+LL +         [_a,
    |
 
 error[E0508]: cannot move out of type `[Box<isize>]`, a non-copy slice
@@ -52,7 +48,11 @@ LL |     let a = vec[0];
    |             |
    |             cannot move out of here
    |             move occurs because `vec[_]` has type `Box<isize>`, which does not implement the `Copy` trait
-   |             help: consider borrowing here: `&vec[0]`
+   |
+help: consider borrowing here
+   |
+LL |     let a = &vec[0];
+   |             +
 
 error[E0508]: cannot move out of type `[Box<isize>]`, a non-copy slice
   --> $DIR/borrowck-vec-pattern-nesting.rs:55:11
@@ -66,11 +66,10 @@ LL |          _b] => {}
    |          data moved here
    |          move occurs because `_b` has type `Box<isize>`, which does not implement the `Copy` trait
    |
-help: consider removing the `&mut`
+help: consider removing the mutable borrow
    |
-LL ~         [
-LL +
-LL ~          _b] => {}
+LL -         &mut [
+LL +         [
    |
 
 error[E0508]: cannot move out of type `[Box<isize>]`, a non-copy slice
@@ -81,7 +80,11 @@ LL |     let a = vec[0];
    |             |
    |             cannot move out of here
    |             move occurs because `vec[_]` has type `Box<isize>`, which does not implement the `Copy` trait
-   |             help: consider borrowing here: `&vec[0]`
+   |
+help: consider borrowing here
+   |
+LL |     let a = &vec[0];
+   |             +
 
 error[E0508]: cannot move out of type `[Box<isize>]`, a non-copy slice
   --> $DIR/borrowck-vec-pattern-nesting.rs:74:11
@@ -90,14 +93,17 @@ LL |     match vec {
    |           ^^^ cannot move out of here
 ...
 LL |         &mut [_a, _b, _c] => {}
-   |         -----------------
-   |         |     |   |   |
-   |         |     |   |   ...and here
-   |         |     |   ...and here
-   |         |     data moved here
-   |         help: consider removing the `&mut`: `[_a, _b, _c]`
+   |               --  --  -- ...and here
+   |               |   |
+   |               |   ...and here
+   |               data moved here
    |
    = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the mutable borrow
+   |
+LL -         &mut [_a, _b, _c] => {}
+LL +         [_a, _b, _c] => {}
+   |
 
 error[E0508]: cannot move out of type `[Box<isize>]`, a non-copy slice
   --> $DIR/borrowck-vec-pattern-nesting.rs:85:13
@@ -107,7 +113,11 @@ LL |     let a = vec[0];
    |             |
    |             cannot move out of here
    |             move occurs because `vec[_]` has type `Box<isize>`, which does not implement the `Copy` trait
-   |             help: consider borrowing here: `&vec[0]`
+   |
+help: consider borrowing here
+   |
+LL |     let a = &vec[0];
+   |             +
 
 error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.rs b/tests/ui/borrowck/borrowck-vec-pattern-tail-element-loan.rs
index 39872825c..39872825c 100644
--- a/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.rs
+++ b/tests/ui/borrowck/borrowck-vec-pattern-tail-element-loan.rs
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.stderr b/tests/ui/borrowck/borrowck-vec-pattern-tail-element-loan.stderr
index 7e21c55f2..7e21c55f2 100644
--- a/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.stderr
+++ b/tests/ui/borrowck/borrowck-vec-pattern-tail-element-loan.stderr
diff --git a/src/test/ui/borrowck/borrowck-while-break.rs b/tests/ui/borrowck/borrowck-while-break.rs
index 7100b7130..7100b7130 100644
--- a/src/test/ui/borrowck/borrowck-while-break.rs
+++ b/tests/ui/borrowck/borrowck-while-break.rs
diff --git a/src/test/ui/borrowck/borrowck-while-break.stderr b/tests/ui/borrowck/borrowck-while-break.stderr
index 13143d436..13143d436 100644
--- a/src/test/ui/borrowck/borrowck-while-break.stderr
+++ b/tests/ui/borrowck/borrowck-while-break.stderr
diff --git a/src/test/ui/borrowck/borrowck-while-cond.rs b/tests/ui/borrowck/borrowck-while-cond.rs
index 62a9bdd20..62a9bdd20 100644
--- a/src/test/ui/borrowck/borrowck-while-cond.rs
+++ b/tests/ui/borrowck/borrowck-while-cond.rs
diff --git a/src/test/ui/borrowck/borrowck-while-cond.stderr b/tests/ui/borrowck/borrowck-while-cond.stderr
index 5d0194989..5d0194989 100644
--- a/src/test/ui/borrowck/borrowck-while-cond.stderr
+++ b/tests/ui/borrowck/borrowck-while-cond.stderr
diff --git a/src/test/ui/borrowck/borrowck-while.rs b/tests/ui/borrowck/borrowck-while.rs
index f49a778eb..f49a778eb 100644
--- a/src/test/ui/borrowck/borrowck-while.rs
+++ b/tests/ui/borrowck/borrowck-while.rs
diff --git a/src/test/ui/borrowck/borrowck-while.stderr b/tests/ui/borrowck/borrowck-while.stderr
index c45235990..c45235990 100644
--- a/src/test/ui/borrowck/borrowck-while.stderr
+++ b/tests/ui/borrowck/borrowck-while.stderr
diff --git a/src/test/ui/borrowck/copy-suggestion-region-vid.rs b/tests/ui/borrowck/copy-suggestion-region-vid.rs
index dff952834..dff952834 100644
--- a/src/test/ui/borrowck/copy-suggestion-region-vid.rs
+++ b/tests/ui/borrowck/copy-suggestion-region-vid.rs
diff --git a/src/test/ui/borrowck/copy-suggestion-region-vid.stderr b/tests/ui/borrowck/copy-suggestion-region-vid.stderr
index 1685acf87..1685acf87 100644
--- a/src/test/ui/borrowck/copy-suggestion-region-vid.stderr
+++ b/tests/ui/borrowck/copy-suggestion-region-vid.stderr
diff --git a/src/test/ui/borrowck/disallow-possibly-uninitialized.rs b/tests/ui/borrowck/disallow-possibly-uninitialized.rs
index 17de40d5b..17de40d5b 100644
--- a/src/test/ui/borrowck/disallow-possibly-uninitialized.rs
+++ b/tests/ui/borrowck/disallow-possibly-uninitialized.rs
diff --git a/src/test/ui/borrowck/disallow-possibly-uninitialized.stderr b/tests/ui/borrowck/disallow-possibly-uninitialized.stderr
index 9a84c6fef..9a84c6fef 100644
--- a/src/test/ui/borrowck/disallow-possibly-uninitialized.stderr
+++ b/tests/ui/borrowck/disallow-possibly-uninitialized.stderr
diff --git a/src/test/ui/borrowck/do-not-suggest-adding-move-when-closure-is-already-marked-as-move.rs b/tests/ui/borrowck/do-not-suggest-adding-move-when-closure-is-already-marked-as-move.rs
index 524459291..524459291 100644
--- a/src/test/ui/borrowck/do-not-suggest-adding-move-when-closure-is-already-marked-as-move.rs
+++ b/tests/ui/borrowck/do-not-suggest-adding-move-when-closure-is-already-marked-as-move.rs
diff --git a/src/test/ui/borrowck/do-not-suggest-adding-move-when-closure-is-already-marked-as-move.stderr b/tests/ui/borrowck/do-not-suggest-adding-move-when-closure-is-already-marked-as-move.stderr
index 78ca090fe..78ca090fe 100644
--- a/src/test/ui/borrowck/do-not-suggest-adding-move-when-closure-is-already-marked-as-move.stderr
+++ b/tests/ui/borrowck/do-not-suggest-adding-move-when-closure-is-already-marked-as-move.stderr
diff --git a/src/test/ui/borrowck/fsu-moves-and-copies.rs b/tests/ui/borrowck/fsu-moves-and-copies.rs
index 85e0a840a..85e0a840a 100644
--- a/src/test/ui/borrowck/fsu-moves-and-copies.rs
+++ b/tests/ui/borrowck/fsu-moves-and-copies.rs
diff --git a/src/test/ui/borrowck/immut-function-arguments.rs b/tests/ui/borrowck/immut-function-arguments.rs
index 242a33e82..242a33e82 100644
--- a/src/test/ui/borrowck/immut-function-arguments.rs
+++ b/tests/ui/borrowck/immut-function-arguments.rs
diff --git a/tests/ui/borrowck/immut-function-arguments.stderr b/tests/ui/borrowck/immut-function-arguments.stderr
new file mode 100644
index 000000000..d5392e7d6
--- /dev/null
+++ b/tests/ui/borrowck/immut-function-arguments.stderr
@@ -0,0 +1,25 @@
+error[E0594]: cannot assign to `*y`, as `y` is not declared as mutable
+  --> $DIR/immut-function-arguments.rs:2:5
+   |
+LL |     *y = 5;
+   |     ^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL | fn f(mut y: Box<isize>) {
+   |      +++
+
+error[E0594]: cannot assign to `*q`, as `q` is not declared as mutable
+  --> $DIR/immut-function-arguments.rs:6:35
+   |
+LL |     let _frob = |q: Box<isize>| { *q = 2; };
+   |                                   ^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL |     let _frob = |mut q: Box<isize>| { *q = 2; };
+   |                  +++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/borrowck/immutable-arg.rs b/tests/ui/borrowck/immutable-arg.rs
index 2352d1bbe..2352d1bbe 100644
--- a/src/test/ui/borrowck/immutable-arg.rs
+++ b/tests/ui/borrowck/immutable-arg.rs
diff --git a/src/test/ui/borrowck/immutable-arg.stderr b/tests/ui/borrowck/immutable-arg.stderr
index bddb0633a..bddb0633a 100644
--- a/src/test/ui/borrowck/immutable-arg.stderr
+++ b/tests/ui/borrowck/immutable-arg.stderr
diff --git a/src/test/ui/borrowck/index-mut-help-with-impl.rs b/tests/ui/borrowck/index-mut-help-with-impl.rs
index 44b57c4a0..44b57c4a0 100644
--- a/src/test/ui/borrowck/index-mut-help-with-impl.rs
+++ b/tests/ui/borrowck/index-mut-help-with-impl.rs
diff --git a/src/test/ui/borrowck/index-mut-help-with-impl.stderr b/tests/ui/borrowck/index-mut-help-with-impl.stderr
index 69dca7e7b..69dca7e7b 100644
--- a/src/test/ui/borrowck/index-mut-help-with-impl.stderr
+++ b/tests/ui/borrowck/index-mut-help-with-impl.stderr
diff --git a/src/test/ui/borrowck/index-mut-help.rs b/tests/ui/borrowck/index-mut-help.rs
index 35266e113..35266e113 100644
--- a/src/test/ui/borrowck/index-mut-help.rs
+++ b/tests/ui/borrowck/index-mut-help.rs
diff --git a/src/test/ui/borrowck/index-mut-help.stderr b/tests/ui/borrowck/index-mut-help.stderr
index f42d7e015..f42d7e015 100644
--- a/src/test/ui/borrowck/index-mut-help.stderr
+++ b/tests/ui/borrowck/index-mut-help.stderr
diff --git a/src/test/ui/borrowck/issue-101119.rs b/tests/ui/borrowck/issue-101119.rs
index 64e52eaac..64e52eaac 100644
--- a/src/test/ui/borrowck/issue-101119.rs
+++ b/tests/ui/borrowck/issue-101119.rs
diff --git a/src/test/ui/borrowck/issue-101119.stderr b/tests/ui/borrowck/issue-101119.stderr
index a22afdc67..a22afdc67 100644
--- a/src/test/ui/borrowck/issue-101119.stderr
+++ b/tests/ui/borrowck/issue-101119.stderr
diff --git a/src/test/ui/borrowck/issue-102209.rs b/tests/ui/borrowck/issue-102209.rs
index 37628bff7..37628bff7 100644
--- a/src/test/ui/borrowck/issue-102209.rs
+++ b/tests/ui/borrowck/issue-102209.rs
diff --git a/src/test/ui/borrowck/issue-102209.stderr b/tests/ui/borrowck/issue-102209.stderr
index 351de8217..351de8217 100644
--- a/src/test/ui/borrowck/issue-102209.stderr
+++ b/tests/ui/borrowck/issue-102209.stderr
diff --git a/tests/ui/borrowck/issue-103095.rs b/tests/ui/borrowck/issue-103095.rs
new file mode 100644
index 000000000..0340f3924
--- /dev/null
+++ b/tests/ui/borrowck/issue-103095.rs
@@ -0,0 +1,30 @@
+// check-pass
+
+trait FnOnceForGenericRef<T>: FnOnce(&T) -> Self::FnOutput {
+    type FnOutput;
+}
+
+impl<T, R, F: FnOnce(&T) -> R> FnOnceForGenericRef<T> for F {
+    type FnOutput = R;
+}
+
+struct Data<T, D: FnOnceForGenericRef<T>> {
+    value: Option<T>,
+    output: Option<D::FnOutput>,
+}
+
+impl<T, D: FnOnceForGenericRef<T>> Data<T, D> {
+    fn new(value: T, f: D) -> Self {
+        let output = f(&value);
+        Self {
+            value: Some(value),
+            output: Some(output),
+        }
+    }
+}
+
+fn test() {
+    Data::new(String::new(), |_| {});
+}
+
+fn main() {}
diff --git a/src/test/ui/borrowck/issue-103250.rs b/tests/ui/borrowck/issue-103250.rs
index 46565f61c..46565f61c 100644
--- a/src/test/ui/borrowck/issue-103250.rs
+++ b/tests/ui/borrowck/issue-103250.rs
diff --git a/src/test/ui/borrowck/issue-103250.stderr b/tests/ui/borrowck/issue-103250.stderr
index 4a2378352..4a2378352 100644
--- a/src/test/ui/borrowck/issue-103250.stderr
+++ b/tests/ui/borrowck/issue-103250.stderr
diff --git a/src/test/ui/borrowck/issue-103624.rs b/tests/ui/borrowck/issue-103624.rs
index f1fa95f92..f1fa95f92 100644
--- a/src/test/ui/borrowck/issue-103624.rs
+++ b/tests/ui/borrowck/issue-103624.rs
diff --git a/src/test/ui/borrowck/issue-103624.stderr b/tests/ui/borrowck/issue-103624.stderr
index e6a35dd88..e6a35dd88 100644
--- a/src/test/ui/borrowck/issue-103624.stderr
+++ b/tests/ui/borrowck/issue-103624.stderr
diff --git a/tests/ui/borrowck/issue-104639-lifetime-order.rs b/tests/ui/borrowck/issue-104639-lifetime-order.rs
new file mode 100644
index 000000000..db1f8f8d5
--- /dev/null
+++ b/tests/ui/borrowck/issue-104639-lifetime-order.rs
@@ -0,0 +1,10 @@
+// edition:2018
+// check-pass
+
+#![allow(dead_code)]
+async fn fail<'a, 'b, 'c>(_: &'static str) where 'a: 'c, 'b: 'c, {}
+async fn pass<'a, 'c, 'b>(_: &'static str) where 'a: 'c, 'b: 'c, {}
+async fn pass2<'a, 'b, 'c>(_: &'static str) where 'a: 'c, 'b: 'c, 'c: 'a, {}
+async fn pass3<'a, 'b, 'c>(_: &'static str) where 'a: 'b, 'b: 'c, 'c: 'a, {}
+
+fn main() { }
diff --git a/src/test/ui/borrowck/issue-10876.rs b/tests/ui/borrowck/issue-10876.rs
index 22eaa119f..22eaa119f 100644
--- a/src/test/ui/borrowck/issue-10876.rs
+++ b/tests/ui/borrowck/issue-10876.rs
diff --git a/src/test/ui/borrowck/issue-11493.fixed b/tests/ui/borrowck/issue-11493.fixed
index 139bd9a07..139bd9a07 100644
--- a/src/test/ui/borrowck/issue-11493.fixed
+++ b/tests/ui/borrowck/issue-11493.fixed
diff --git a/src/test/ui/borrowck/issue-11493.rs b/tests/ui/borrowck/issue-11493.rs
index cb77f89fb..cb77f89fb 100644
--- a/src/test/ui/borrowck/issue-11493.rs
+++ b/tests/ui/borrowck/issue-11493.rs
diff --git a/src/test/ui/borrowck/issue-11493.stderr b/tests/ui/borrowck/issue-11493.stderr
index 2720b09b0..2720b09b0 100644
--- a/src/test/ui/borrowck/issue-11493.stderr
+++ b/tests/ui/borrowck/issue-11493.stderr
diff --git a/src/test/ui/borrowck/issue-17263.rs b/tests/ui/borrowck/issue-17263.rs
index 4f560b065..4f560b065 100644
--- a/src/test/ui/borrowck/issue-17263.rs
+++ b/tests/ui/borrowck/issue-17263.rs
diff --git a/src/test/ui/borrowck/issue-17545.rs b/tests/ui/borrowck/issue-17545.rs
index ced6fff31..ced6fff31 100644
--- a/src/test/ui/borrowck/issue-17545.rs
+++ b/tests/ui/borrowck/issue-17545.rs
diff --git a/src/test/ui/borrowck/issue-17545.stderr b/tests/ui/borrowck/issue-17545.stderr
index 3ae7e64d2..3ae7e64d2 100644
--- a/src/test/ui/borrowck/issue-17545.stderr
+++ b/tests/ui/borrowck/issue-17545.stderr
diff --git a/src/test/ui/borrowck/issue-17718-static-move.rs b/tests/ui/borrowck/issue-17718-static-move.rs
index 015487a06..015487a06 100644
--- a/src/test/ui/borrowck/issue-17718-static-move.rs
+++ b/tests/ui/borrowck/issue-17718-static-move.rs
diff --git a/tests/ui/borrowck/issue-17718-static-move.stderr b/tests/ui/borrowck/issue-17718-static-move.stderr
new file mode 100644
index 000000000..65aea5b18
--- /dev/null
+++ b/tests/ui/borrowck/issue-17718-static-move.stderr
@@ -0,0 +1,14 @@
+error[E0507]: cannot move out of static item `FOO`
+  --> $DIR/issue-17718-static-move.rs:6:14
+   |
+LL |     let _a = FOO;
+   |              ^^^ move occurs because `FOO` has type `Foo`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let _a = &FOO;
+   |              +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/issue-20801.rs b/tests/ui/borrowck/issue-20801.rs
index c3f136f28..c3f136f28 100644
--- a/src/test/ui/borrowck/issue-20801.rs
+++ b/tests/ui/borrowck/issue-20801.rs
diff --git a/tests/ui/borrowck/issue-20801.stderr b/tests/ui/borrowck/issue-20801.stderr
new file mode 100644
index 000000000..215bf0100
--- /dev/null
+++ b/tests/ui/borrowck/issue-20801.stderr
@@ -0,0 +1,51 @@
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/issue-20801.rs:26:22
+   |
+LL |     let a = unsafe { *mut_ref() };
+   |                      ^^^^^^^^^^ move occurs because value has type `T`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let a = unsafe { *mut_ref() };
+LL +     let a = unsafe { mut_ref() };
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/issue-20801.rs:29:22
+   |
+LL |     let b = unsafe { *imm_ref() };
+   |                      ^^^^^^^^^^ move occurs because value has type `T`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let b = unsafe { *imm_ref() };
+LL +     let b = unsafe { imm_ref() };
+   |
+
+error[E0507]: cannot move out of a raw pointer
+  --> $DIR/issue-20801.rs:32:22
+   |
+LL |     let c = unsafe { *mut_ptr() };
+   |                      ^^^^^^^^^^ move occurs because value has type `T`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let c = unsafe { *mut_ptr() };
+LL +     let c = unsafe { mut_ptr() };
+   |
+
+error[E0507]: cannot move out of a raw pointer
+  --> $DIR/issue-20801.rs:35:22
+   |
+LL |     let d = unsafe { *const_ptr() };
+   |                      ^^^^^^^^^^^^ move occurs because value has type `T`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let d = unsafe { *const_ptr() };
+LL +     let d = unsafe { const_ptr() };
+   |
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/issue-23338-params-outlive-temps-of-body.rs b/tests/ui/borrowck/issue-23338-params-outlive-temps-of-body.rs
index d45aaa843..d45aaa843 100644
--- a/src/test/ui/borrowck/issue-23338-params-outlive-temps-of-body.rs
+++ b/tests/ui/borrowck/issue-23338-params-outlive-temps-of-body.rs
diff --git a/src/test/ui/borrowck/issue-24267-flow-exit.rs b/tests/ui/borrowck/issue-24267-flow-exit.rs
index c419c5840..c419c5840 100644
--- a/src/test/ui/borrowck/issue-24267-flow-exit.rs
+++ b/tests/ui/borrowck/issue-24267-flow-exit.rs
diff --git a/src/test/ui/borrowck/issue-24267-flow-exit.stderr b/tests/ui/borrowck/issue-24267-flow-exit.stderr
index 58d1c8c0f..58d1c8c0f 100644
--- a/src/test/ui/borrowck/issue-24267-flow-exit.stderr
+++ b/tests/ui/borrowck/issue-24267-flow-exit.stderr
diff --git a/src/test/ui/borrowck/issue-25793.rs b/tests/ui/borrowck/issue-25793.rs
index 6c8dacc22..6c8dacc22 100644
--- a/src/test/ui/borrowck/issue-25793.rs
+++ b/tests/ui/borrowck/issue-25793.rs
diff --git a/src/test/ui/borrowck/issue-25793.stderr b/tests/ui/borrowck/issue-25793.stderr
index da3412f11..da3412f11 100644
--- a/src/test/ui/borrowck/issue-25793.stderr
+++ b/tests/ui/borrowck/issue-25793.stderr
diff --git a/src/test/ui/borrowck/issue-28934.rs b/tests/ui/borrowck/issue-28934.rs
index 1e48878f6..1e48878f6 100644
--- a/src/test/ui/borrowck/issue-28934.rs
+++ b/tests/ui/borrowck/issue-28934.rs
diff --git a/src/test/ui/issues/issue-29166.rs b/tests/ui/borrowck/issue-29166.rs
index ca819ba39..ca819ba39 100644
--- a/src/test/ui/issues/issue-29166.rs
+++ b/tests/ui/borrowck/issue-29166.rs
diff --git a/tests/ui/borrowck/issue-31287-drop-in-guard.rs b/tests/ui/borrowck/issue-31287-drop-in-guard.rs
new file mode 100644
index 000000000..5b824adc6
--- /dev/null
+++ b/tests/ui/borrowck/issue-31287-drop-in-guard.rs
@@ -0,0 +1,15 @@
+#![feature(if_let_guard)]
+
+fn main() {
+    let a = Some("...".to_owned());
+    let b = match a {
+        Some(_) if { drop(a); false } => None,
+        x => x, //~ ERROR use of moved value: `a`
+    };
+
+    let a = Some("...".to_owned());
+    let b = match a {
+        Some(_) if let Some(()) = { drop(a); None } => None,
+        x => x, //~ ERROR use of moved value: `a`
+    };
+}
diff --git a/tests/ui/borrowck/issue-31287-drop-in-guard.stderr b/tests/ui/borrowck/issue-31287-drop-in-guard.stderr
new file mode 100644
index 000000000..18f371c20
--- /dev/null
+++ b/tests/ui/borrowck/issue-31287-drop-in-guard.stderr
@@ -0,0 +1,35 @@
+error[E0382]: use of moved value: `a`
+  --> $DIR/issue-31287-drop-in-guard.rs:7:9
+   |
+LL |     let a = Some("...".to_owned());
+   |         - move occurs because `a` has type `Option<String>`, which does not implement the `Copy` trait
+LL |     let b = match a {
+LL |         Some(_) if { drop(a); false } => None,
+   |                           - value moved here
+LL |         x => x,
+   |         ^ value used here after move
+   |
+help: consider cloning the value if the performance cost is acceptable
+   |
+LL |         Some(_) if { drop(a.clone()); false } => None,
+   |                            ++++++++
+
+error[E0382]: use of moved value: `a`
+  --> $DIR/issue-31287-drop-in-guard.rs:13:9
+   |
+LL |     let a = Some("...".to_owned());
+   |         - move occurs because `a` has type `Option<String>`, which does not implement the `Copy` trait
+LL |     let b = match a {
+LL |         Some(_) if let Some(()) = { drop(a); None } => None,
+   |                                          - value moved here
+LL |         x => x,
+   |         ^ value used here after move
+   |
+help: consider cloning the value if the performance cost is acceptable
+   |
+LL |         Some(_) if let Some(()) = { drop(a.clone()); None } => None,
+   |                                           ++++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/borrowck/issue-33819.rs b/tests/ui/borrowck/issue-33819.rs
index fff5015cd..fff5015cd 100644
--- a/src/test/ui/borrowck/issue-33819.rs
+++ b/tests/ui/borrowck/issue-33819.rs
diff --git a/src/test/ui/borrowck/issue-33819.stderr b/tests/ui/borrowck/issue-33819.stderr
index f77fdbf2b..f77fdbf2b 100644
--- a/src/test/ui/borrowck/issue-33819.stderr
+++ b/tests/ui/borrowck/issue-33819.stderr
diff --git a/src/test/ui/borrowck/issue-36082.fixed b/tests/ui/borrowck/issue-36082.fixed
index 8fc963a85..8fc963a85 100644
--- a/src/test/ui/borrowck/issue-36082.fixed
+++ b/tests/ui/borrowck/issue-36082.fixed
diff --git a/src/test/ui/borrowck/issue-36082.rs b/tests/ui/borrowck/issue-36082.rs
index 20f66b4d4..20f66b4d4 100644
--- a/src/test/ui/borrowck/issue-36082.rs
+++ b/tests/ui/borrowck/issue-36082.rs
diff --git a/src/test/ui/borrowck/issue-36082.stderr b/tests/ui/borrowck/issue-36082.stderr
index a6357f818..a6357f818 100644
--- a/src/test/ui/borrowck/issue-36082.stderr
+++ b/tests/ui/borrowck/issue-36082.stderr
diff --git a/src/test/ui/borrowck/issue-41962.rs b/tests/ui/borrowck/issue-41962.rs
index 38a01b138..38a01b138 100644
--- a/src/test/ui/borrowck/issue-41962.rs
+++ b/tests/ui/borrowck/issue-41962.rs
diff --git a/src/test/ui/borrowck/issue-41962.stderr b/tests/ui/borrowck/issue-41962.stderr
index 716cc9d0c..716cc9d0c 100644
--- a/src/test/ui/borrowck/issue-41962.stderr
+++ b/tests/ui/borrowck/issue-41962.stderr
diff --git a/src/test/ui/borrowck/issue-42344.rs b/tests/ui/borrowck/issue-42344.rs
index a7636edf2..a7636edf2 100644
--- a/src/test/ui/borrowck/issue-42344.rs
+++ b/tests/ui/borrowck/issue-42344.rs
diff --git a/src/test/ui/borrowck/issue-42344.stderr b/tests/ui/borrowck/issue-42344.stderr
index 29b4c8c38..29b4c8c38 100644
--- a/src/test/ui/borrowck/issue-42344.stderr
+++ b/tests/ui/borrowck/issue-42344.stderr
diff --git a/src/test/ui/borrowck/issue-45199.rs b/tests/ui/borrowck/issue-45199.rs
index ded46e56e..ded46e56e 100644
--- a/src/test/ui/borrowck/issue-45199.rs
+++ b/tests/ui/borrowck/issue-45199.rs
diff --git a/src/test/ui/borrowck/issue-45199.stderr b/tests/ui/borrowck/issue-45199.stderr
index 47aa30908..47aa30908 100644
--- a/src/test/ui/borrowck/issue-45199.stderr
+++ b/tests/ui/borrowck/issue-45199.stderr
diff --git a/src/test/ui/borrowck/issue-45983.rs b/tests/ui/borrowck/issue-45983.rs
index 6784f6f86..6784f6f86 100644
--- a/src/test/ui/borrowck/issue-45983.rs
+++ b/tests/ui/borrowck/issue-45983.rs
diff --git a/src/test/ui/borrowck/issue-45983.stderr b/tests/ui/borrowck/issue-45983.stderr
index feb098c59..feb098c59 100644
--- a/src/test/ui/borrowck/issue-45983.stderr
+++ b/tests/ui/borrowck/issue-45983.stderr
diff --git a/src/test/ui/borrowck/issue-46095.rs b/tests/ui/borrowck/issue-46095.rs
index 59ddb60c9..59ddb60c9 100644
--- a/src/test/ui/borrowck/issue-46095.rs
+++ b/tests/ui/borrowck/issue-46095.rs
diff --git a/src/test/ui/borrowck/issue-46471.rs b/tests/ui/borrowck/issue-46471.rs
index 8922005d2..8922005d2 100644
--- a/src/test/ui/borrowck/issue-46471.rs
+++ b/tests/ui/borrowck/issue-46471.rs
diff --git a/src/test/ui/borrowck/issue-46471.stderr b/tests/ui/borrowck/issue-46471.stderr
index 935414c1f..935414c1f 100644
--- a/src/test/ui/borrowck/issue-46471.stderr
+++ b/tests/ui/borrowck/issue-46471.stderr
diff --git a/src/test/ui/borrowck/issue-47215-ice-from-drop-elab.rs b/tests/ui/borrowck/issue-47215-ice-from-drop-elab.rs
index e95a6b7c8..e95a6b7c8 100644
--- a/src/test/ui/borrowck/issue-47215-ice-from-drop-elab.rs
+++ b/tests/ui/borrowck/issue-47215-ice-from-drop-elab.rs
diff --git a/tests/ui/borrowck/issue-47215-ice-from-drop-elab.stderr b/tests/ui/borrowck/issue-47215-ice-from-drop-elab.stderr
new file mode 100644
index 000000000..8d4918867
--- /dev/null
+++ b/tests/ui/borrowck/issue-47215-ice-from-drop-elab.stderr
@@ -0,0 +1,14 @@
+error[E0507]: cannot move out of static item `X`
+  --> $DIR/issue-47215-ice-from-drop-elab.rs:17:21
+   |
+LL |         let mut x = X;
+   |                     ^ move occurs because `X` has type `AtomicUsize`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         let mut x = &X;
+   |                     +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/issue-51117.rs b/tests/ui/borrowck/issue-51117.rs
index e4664e4f3..e4664e4f3 100644
--- a/src/test/ui/borrowck/issue-51117.rs
+++ b/tests/ui/borrowck/issue-51117.rs
diff --git a/src/test/ui/borrowck/issue-51117.stderr b/tests/ui/borrowck/issue-51117.stderr
index ef1a16ea9..ef1a16ea9 100644
--- a/src/test/ui/borrowck/issue-51117.stderr
+++ b/tests/ui/borrowck/issue-51117.stderr
diff --git a/src/test/ui/issues/issue-51301.rs b/tests/ui/borrowck/issue-51301.rs
index 7e0a5190f..7e0a5190f 100644
--- a/src/test/ui/issues/issue-51301.rs
+++ b/tests/ui/borrowck/issue-51301.rs
diff --git a/src/test/ui/issues/issue-51301.stderr b/tests/ui/borrowck/issue-51301.stderr
index f3decf7a9..6ec920cb8 100644
--- a/src/test/ui/issues/issue-51301.stderr
+++ b/tests/ui/borrowck/issue-51301.stderr
@@ -6,6 +6,11 @@ LL |             .find(|(&event_type, _)| event == event_type)
    |                      |
    |                      data moved here
    |                      move occurs because `event_type` has type `EventType`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |             .find(|(&ref event_type, _)| event == event_type)
+   |                      +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/borrowck/issue-51348-multi-ref-mut-in-guard.rs b/tests/ui/borrowck/issue-51348-multi-ref-mut-in-guard.rs
index 7d5acb957..7d5acb957 100644
--- a/src/test/ui/borrowck/issue-51348-multi-ref-mut-in-guard.rs
+++ b/tests/ui/borrowck/issue-51348-multi-ref-mut-in-guard.rs
diff --git a/tests/ui/borrowck/issue-51415.fixed b/tests/ui/borrowck/issue-51415.fixed
new file mode 100644
index 000000000..92943f6c9
--- /dev/null
+++ b/tests/ui/borrowck/issue-51415.fixed
@@ -0,0 +1,12 @@
+// run-rustfix
+// Regression test for #51415: match default bindings were failing to
+// see the "move out" implied by `&s` below.
+
+fn main() {
+    let a = vec![String::from("a")];
+    let opt = a.iter().enumerate().find(|(_, &ref s)| {
+        //~^ ERROR cannot move out
+        *s == String::from("d")
+    }).map(|(i, _)| i);
+    println!("{:?}", opt);
+}
diff --git a/src/test/ui/borrowck/issue-51415.rs b/tests/ui/borrowck/issue-51415.rs
index f031308fb..56ed57a61 100644
--- a/src/test/ui/borrowck/issue-51415.rs
+++ b/tests/ui/borrowck/issue-51415.rs
@@ -1,3 +1,4 @@
+// run-rustfix
 // Regression test for #51415: match default bindings were failing to
 // see the "move out" implied by `&s` below.
 
diff --git a/tests/ui/borrowck/issue-51415.stderr b/tests/ui/borrowck/issue-51415.stderr
new file mode 100644
index 000000000..0d486b455
--- /dev/null
+++ b/tests/ui/borrowck/issue-51415.stderr
@@ -0,0 +1,17 @@
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/issue-51415.rs:7:42
+   |
+LL |     let opt = a.iter().enumerate().find(|(_, &s)| {
+   |                                          ^^^^^-^
+   |                                               |
+   |                                               data moved here
+   |                                               move occurs because `s` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     let opt = a.iter().enumerate().find(|(_, &ref s)| {
+   |                                               +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/issue-52713-bug.rs b/tests/ui/borrowck/issue-52713-bug.rs
index 671e83dfa..671e83dfa 100644
--- a/src/test/ui/borrowck/issue-52713-bug.rs
+++ b/tests/ui/borrowck/issue-52713-bug.rs
diff --git a/src/test/ui/borrowck/issue-52713-bug.stderr b/tests/ui/borrowck/issue-52713-bug.stderr
index 4abb6fb2c..4abb6fb2c 100644
--- a/src/test/ui/borrowck/issue-52713-bug.stderr
+++ b/tests/ui/borrowck/issue-52713-bug.stderr
diff --git a/src/test/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs b/tests/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs
index fc8a07554..fc8a07554 100644
--- a/src/test/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs
+++ b/tests/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs
diff --git a/src/test/ui/borrowck/issue-53432-nested-closure-outlives-borrowed-value.rs b/tests/ui/borrowck/issue-53432-nested-closure-outlives-borrowed-value.rs
index f1fd1b507..f1fd1b507 100644
--- a/src/test/ui/borrowck/issue-53432-nested-closure-outlives-borrowed-value.rs
+++ b/tests/ui/borrowck/issue-53432-nested-closure-outlives-borrowed-value.rs
diff --git a/src/test/ui/borrowck/issue-53432-nested-closure-outlives-borrowed-value.stderr b/tests/ui/borrowck/issue-53432-nested-closure-outlives-borrowed-value.stderr
index f0b574846..f0b574846 100644
--- a/src/test/ui/borrowck/issue-53432-nested-closure-outlives-borrowed-value.stderr
+++ b/tests/ui/borrowck/issue-53432-nested-closure-outlives-borrowed-value.stderr
diff --git a/src/test/ui/borrowck/issue-54499-field-mutation-marks-mut-as-used.rs b/tests/ui/borrowck/issue-54499-field-mutation-marks-mut-as-used.rs
index 205ea10c9..205ea10c9 100644
--- a/src/test/ui/borrowck/issue-54499-field-mutation-marks-mut-as-used.rs
+++ b/tests/ui/borrowck/issue-54499-field-mutation-marks-mut-as-used.rs
diff --git a/src/test/ui/borrowck/issue-54499-field-mutation-marks-mut-as-used.stderr b/tests/ui/borrowck/issue-54499-field-mutation-marks-mut-as-used.stderr
index 2a0eba396..2a0eba396 100644
--- a/src/test/ui/borrowck/issue-54499-field-mutation-marks-mut-as-used.stderr
+++ b/tests/ui/borrowck/issue-54499-field-mutation-marks-mut-as-used.stderr
diff --git a/src/test/ui/borrowck/issue-54499-field-mutation-of-moved-out-with-mut.rs b/tests/ui/borrowck/issue-54499-field-mutation-of-moved-out-with-mut.rs
index f7fb2fd4d..f7fb2fd4d 100644
--- a/src/test/ui/borrowck/issue-54499-field-mutation-of-moved-out-with-mut.rs
+++ b/tests/ui/borrowck/issue-54499-field-mutation-of-moved-out-with-mut.rs
diff --git a/src/test/ui/borrowck/issue-54499-field-mutation-of-moved-out-with-mut.stderr b/tests/ui/borrowck/issue-54499-field-mutation-of-moved-out-with-mut.stderr
index b188766e2..b188766e2 100644
--- a/src/test/ui/borrowck/issue-54499-field-mutation-of-moved-out-with-mut.stderr
+++ b/tests/ui/borrowck/issue-54499-field-mutation-of-moved-out-with-mut.stderr
diff --git a/src/test/ui/borrowck/issue-54499-field-mutation-of-moved-out.rs b/tests/ui/borrowck/issue-54499-field-mutation-of-moved-out.rs
index 498ca01e9..498ca01e9 100644
--- a/src/test/ui/borrowck/issue-54499-field-mutation-of-moved-out.rs
+++ b/tests/ui/borrowck/issue-54499-field-mutation-of-moved-out.rs
diff --git a/src/test/ui/borrowck/issue-54499-field-mutation-of-moved-out.stderr b/tests/ui/borrowck/issue-54499-field-mutation-of-moved-out.stderr
index b7623a540..774b6cf0e 100644
--- a/src/test/ui/borrowck/issue-54499-field-mutation-of-moved-out.stderr
+++ b/tests/ui/borrowck/issue-54499-field-mutation-of-moved-out.stderr
@@ -1,11 +1,13 @@
 error[E0594]: cannot assign to `t.0`, as `t` is not declared as mutable
   --> $DIR/issue-54499-field-mutation-of-moved-out.rs:13:9
    |
-LL |         let t: Tuple = (S(0), 0);
-   |             - help: consider changing this to be mutable: `mut t`
-LL |         drop(t);
 LL |         t.0 = S(1);
    |         ^^^^^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL |         let mut t: Tuple = (S(0), 0);
+   |             +++
 
 error[E0382]: assign to part of moved value: `t`
   --> $DIR/issue-54499-field-mutation-of-moved-out.rs:13:9
@@ -20,20 +22,24 @@ LL |         t.0 = S(1);
 error[E0594]: cannot assign to `t.1`, as `t` is not declared as mutable
   --> $DIR/issue-54499-field-mutation-of-moved-out.rs:16:9
    |
-LL |         let t: Tuple = (S(0), 0);
-   |             - help: consider changing this to be mutable: `mut t`
-...
 LL |         t.1 = 2;
    |         ^^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL |         let mut t: Tuple = (S(0), 0);
+   |             +++
 
 error[E0594]: cannot assign to `u.0`, as `u` is not declared as mutable
   --> $DIR/issue-54499-field-mutation-of-moved-out.rs:24:9
    |
-LL |         let u: Tpair = Tpair(S(0), 0);
-   |             - help: consider changing this to be mutable: `mut u`
-LL |         drop(u);
 LL |         u.0 = S(1);
    |         ^^^^^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL |         let mut u: Tpair = Tpair(S(0), 0);
+   |             +++
 
 error[E0382]: assign to part of moved value: `u`
   --> $DIR/issue-54499-field-mutation-of-moved-out.rs:24:9
@@ -48,20 +54,24 @@ LL |         u.0 = S(1);
 error[E0594]: cannot assign to `u.1`, as `u` is not declared as mutable
   --> $DIR/issue-54499-field-mutation-of-moved-out.rs:27:9
    |
-LL |         let u: Tpair = Tpair(S(0), 0);
-   |             - help: consider changing this to be mutable: `mut u`
-...
 LL |         u.1 = 2;
    |         ^^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL |         let mut u: Tpair = Tpair(S(0), 0);
+   |             +++
 
 error[E0594]: cannot assign to `v.x`, as `v` is not declared as mutable
   --> $DIR/issue-54499-field-mutation-of-moved-out.rs:35:9
    |
-LL |         let v: Spair = Spair { x: S(0), y: 0 };
-   |             - help: consider changing this to be mutable: `mut v`
-LL |         drop(v);
 LL |         v.x = S(1);
    |         ^^^^^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL |         let mut v: Spair = Spair { x: S(0), y: 0 };
+   |             +++
 
 error[E0382]: assign to part of moved value: `v`
   --> $DIR/issue-54499-field-mutation-of-moved-out.rs:35:9
@@ -76,11 +86,13 @@ LL |         v.x = S(1);
 error[E0594]: cannot assign to `v.y`, as `v` is not declared as mutable
   --> $DIR/issue-54499-field-mutation-of-moved-out.rs:38:9
    |
-LL |         let v: Spair = Spair { x: S(0), y: 0 };
-   |             - help: consider changing this to be mutable: `mut v`
-...
 LL |         v.y = 2;
    |         ^^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL |         let mut v: Spair = Spair { x: S(0), y: 0 };
+   |             +++
 
 error: aborting due to 9 previous errors
 
diff --git a/src/test/ui/borrowck/issue-54499-field-mutation-of-never-init.rs b/tests/ui/borrowck/issue-54499-field-mutation-of-never-init.rs
index 50d0c40fd..50d0c40fd 100644
--- a/src/test/ui/borrowck/issue-54499-field-mutation-of-never-init.rs
+++ b/tests/ui/borrowck/issue-54499-field-mutation-of-never-init.rs
diff --git a/src/test/ui/borrowck/issue-54499-field-mutation-of-never-init.stderr b/tests/ui/borrowck/issue-54499-field-mutation-of-never-init.stderr
index 67a625830..67a625830 100644
--- a/src/test/ui/borrowck/issue-54499-field-mutation-of-never-init.stderr
+++ b/tests/ui/borrowck/issue-54499-field-mutation-of-never-init.stderr
diff --git a/src/test/ui/borrowck/issue-54597-reject-move-out-of-borrow-via-pat.rs b/tests/ui/borrowck/issue-54597-reject-move-out-of-borrow-via-pat.rs
index 3e46ee6f0..3e46ee6f0 100644
--- a/src/test/ui/borrowck/issue-54597-reject-move-out-of-borrow-via-pat.rs
+++ b/tests/ui/borrowck/issue-54597-reject-move-out-of-borrow-via-pat.rs
diff --git a/tests/ui/borrowck/issue-54597-reject-move-out-of-borrow-via-pat.stderr b/tests/ui/borrowck/issue-54597-reject-move-out-of-borrow-via-pat.stderr
new file mode 100644
index 000000000..99c63e4db
--- /dev/null
+++ b/tests/ui/borrowck/issue-54597-reject-move-out-of-borrow-via-pat.stderr
@@ -0,0 +1,15 @@
+error[E0507]: cannot move out of `*array` which is behind a shared reference
+  --> $DIR/issue-54597-reject-move-out-of-borrow-via-pat.rs:14:13
+   |
+LL |             *array
+   |             ^^^^^^ move occurs because `*array` has type `Vec<Value>`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -             *array
+LL +             array
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/issue-55492-borrowck-migrate-scans-parents.rs b/tests/ui/borrowck/issue-55492-borrowck-migrate-scans-parents.rs
index b3cce1b3a..b3cce1b3a 100644
--- a/src/test/ui/borrowck/issue-55492-borrowck-migrate-scans-parents.rs
+++ b/tests/ui/borrowck/issue-55492-borrowck-migrate-scans-parents.rs
diff --git a/src/test/ui/borrowck/issue-55492-borrowck-migrate-scans-parents.stderr b/tests/ui/borrowck/issue-55492-borrowck-migrate-scans-parents.stderr
index 4c299cdc4..4c299cdc4 100644
--- a/src/test/ui/borrowck/issue-55492-borrowck-migrate-scans-parents.stderr
+++ b/tests/ui/borrowck/issue-55492-borrowck-migrate-scans-parents.stderr
diff --git a/src/test/ui/borrowck/issue-55552-ascribe-wildcard-to-structured-pattern.rs b/tests/ui/borrowck/issue-55552-ascribe-wildcard-to-structured-pattern.rs
index b87ef3baa..b87ef3baa 100644
--- a/src/test/ui/borrowck/issue-55552-ascribe-wildcard-to-structured-pattern.rs
+++ b/tests/ui/borrowck/issue-55552-ascribe-wildcard-to-structured-pattern.rs
diff --git a/src/test/ui/borrowck/issue-58776-borrowck-scans-children.rs b/tests/ui/borrowck/issue-58776-borrowck-scans-children.rs
index efa313a9d..efa313a9d 100644
--- a/src/test/ui/borrowck/issue-58776-borrowck-scans-children.rs
+++ b/tests/ui/borrowck/issue-58776-borrowck-scans-children.rs
diff --git a/src/test/ui/borrowck/issue-58776-borrowck-scans-children.stderr b/tests/ui/borrowck/issue-58776-borrowck-scans-children.stderr
index 57803247b..57803247b 100644
--- a/src/test/ui/borrowck/issue-58776-borrowck-scans-children.stderr
+++ b/tests/ui/borrowck/issue-58776-borrowck-scans-children.stderr
diff --git a/src/test/ui/borrowck/issue-62007-assign-box.rs b/tests/ui/borrowck/issue-62007-assign-box.rs
index f6fbea821..f6fbea821 100644
--- a/src/test/ui/borrowck/issue-62007-assign-box.rs
+++ b/tests/ui/borrowck/issue-62007-assign-box.rs
diff --git a/src/test/ui/borrowck/issue-62007-assign-field.rs b/tests/ui/borrowck/issue-62007-assign-field.rs
index 5b21c0838..5b21c0838 100644
--- a/src/test/ui/borrowck/issue-62007-assign-field.rs
+++ b/tests/ui/borrowck/issue-62007-assign-field.rs
diff --git a/src/test/ui/borrowck/issue-62107-match-arm-scopes.rs b/tests/ui/borrowck/issue-62107-match-arm-scopes.rs
index 93ce34d2f..93ce34d2f 100644
--- a/src/test/ui/borrowck/issue-62107-match-arm-scopes.rs
+++ b/tests/ui/borrowck/issue-62107-match-arm-scopes.rs
diff --git a/src/test/ui/borrowck/issue-62107-match-arm-scopes.stderr b/tests/ui/borrowck/issue-62107-match-arm-scopes.stderr
index 9683da919..9683da919 100644
--- a/src/test/ui/borrowck/issue-62107-match-arm-scopes.stderr
+++ b/tests/ui/borrowck/issue-62107-match-arm-scopes.stderr
diff --git a/src/test/ui/borrowck/issue-64453.rs b/tests/ui/borrowck/issue-64453.rs
index 33d55be58..33d55be58 100644
--- a/src/test/ui/borrowck/issue-64453.rs
+++ b/tests/ui/borrowck/issue-64453.rs
diff --git a/src/test/ui/borrowck/issue-64453.stderr b/tests/ui/borrowck/issue-64453.stderr
index 245c3a40e..245c3a40e 100644
--- a/src/test/ui/borrowck/issue-64453.stderr
+++ b/tests/ui/borrowck/issue-64453.stderr
diff --git a/src/test/ui/borrowck/issue-69789-iterator-mut-suggestion.rs b/tests/ui/borrowck/issue-69789-iterator-mut-suggestion.rs
index f6d0e9e04..f6d0e9e04 100644
--- a/src/test/ui/borrowck/issue-69789-iterator-mut-suggestion.rs
+++ b/tests/ui/borrowck/issue-69789-iterator-mut-suggestion.rs
diff --git a/src/test/ui/borrowck/issue-69789-iterator-mut-suggestion.stderr b/tests/ui/borrowck/issue-69789-iterator-mut-suggestion.stderr
index 369a8c61d..369a8c61d 100644
--- a/src/test/ui/borrowck/issue-69789-iterator-mut-suggestion.stderr
+++ b/tests/ui/borrowck/issue-69789-iterator-mut-suggestion.stderr
diff --git a/src/test/ui/borrowck/issue-71546.rs b/tests/ui/borrowck/issue-71546.rs
index 42100edea..42100edea 100644
--- a/src/test/ui/borrowck/issue-71546.rs
+++ b/tests/ui/borrowck/issue-71546.rs
diff --git a/src/test/ui/borrowck/issue-7573.rs b/tests/ui/borrowck/issue-7573.rs
index 7c0741153..7c0741153 100644
--- a/src/test/ui/borrowck/issue-7573.rs
+++ b/tests/ui/borrowck/issue-7573.rs
diff --git a/src/test/ui/borrowck/issue-7573.stderr b/tests/ui/borrowck/issue-7573.stderr
index 9d86286b8..9d86286b8 100644
--- a/src/test/ui/borrowck/issue-7573.stderr
+++ b/tests/ui/borrowck/issue-7573.stderr
diff --git a/src/test/ui/borrowck/issue-80772.rs b/tests/ui/borrowck/issue-80772.rs
index 1b8caa3f8..1b8caa3f8 100644
--- a/src/test/ui/borrowck/issue-80772.rs
+++ b/tests/ui/borrowck/issue-80772.rs
diff --git a/src/test/ui/borrowck/issue-81365-1.rs b/tests/ui/borrowck/issue-81365-1.rs
index 8e212a770..8e212a770 100644
--- a/src/test/ui/borrowck/issue-81365-1.rs
+++ b/tests/ui/borrowck/issue-81365-1.rs
diff --git a/src/test/ui/borrowck/issue-81365-1.stderr b/tests/ui/borrowck/issue-81365-1.stderr
index d79394834..d79394834 100644
--- a/src/test/ui/borrowck/issue-81365-1.stderr
+++ b/tests/ui/borrowck/issue-81365-1.stderr
diff --git a/src/test/ui/borrowck/issue-81365-10.rs b/tests/ui/borrowck/issue-81365-10.rs
index 7602e184a..7602e184a 100644
--- a/src/test/ui/borrowck/issue-81365-10.rs
+++ b/tests/ui/borrowck/issue-81365-10.rs
diff --git a/src/test/ui/borrowck/issue-81365-10.stderr b/tests/ui/borrowck/issue-81365-10.stderr
index 27123ef2b..27123ef2b 100644
--- a/src/test/ui/borrowck/issue-81365-10.stderr
+++ b/tests/ui/borrowck/issue-81365-10.stderr
diff --git a/src/test/ui/borrowck/issue-81365-11.rs b/tests/ui/borrowck/issue-81365-11.rs
index 6b558c65d..6b558c65d 100644
--- a/src/test/ui/borrowck/issue-81365-11.rs
+++ b/tests/ui/borrowck/issue-81365-11.rs
diff --git a/src/test/ui/borrowck/issue-81365-11.stderr b/tests/ui/borrowck/issue-81365-11.stderr
index 0770c1366..0770c1366 100644
--- a/src/test/ui/borrowck/issue-81365-11.stderr
+++ b/tests/ui/borrowck/issue-81365-11.stderr
diff --git a/src/test/ui/borrowck/issue-81365-2.rs b/tests/ui/borrowck/issue-81365-2.rs
index fbbdd93b9..fbbdd93b9 100644
--- a/src/test/ui/borrowck/issue-81365-2.rs
+++ b/tests/ui/borrowck/issue-81365-2.rs
diff --git a/src/test/ui/borrowck/issue-81365-2.stderr b/tests/ui/borrowck/issue-81365-2.stderr
index 764eaaa7c..764eaaa7c 100644
--- a/src/test/ui/borrowck/issue-81365-2.stderr
+++ b/tests/ui/borrowck/issue-81365-2.stderr
diff --git a/src/test/ui/borrowck/issue-81365-3.rs b/tests/ui/borrowck/issue-81365-3.rs
index 9a9e3a313..9a9e3a313 100644
--- a/src/test/ui/borrowck/issue-81365-3.rs
+++ b/tests/ui/borrowck/issue-81365-3.rs
diff --git a/src/test/ui/borrowck/issue-81365-3.stderr b/tests/ui/borrowck/issue-81365-3.stderr
index 9447174fd..9447174fd 100644
--- a/src/test/ui/borrowck/issue-81365-3.stderr
+++ b/tests/ui/borrowck/issue-81365-3.stderr
diff --git a/src/test/ui/borrowck/issue-81365-4.rs b/tests/ui/borrowck/issue-81365-4.rs
index b2643eb33..b2643eb33 100644
--- a/src/test/ui/borrowck/issue-81365-4.rs
+++ b/tests/ui/borrowck/issue-81365-4.rs
diff --git a/src/test/ui/borrowck/issue-81365-4.stderr b/tests/ui/borrowck/issue-81365-4.stderr
index 0ab3fa927..0ab3fa927 100644
--- a/src/test/ui/borrowck/issue-81365-4.stderr
+++ b/tests/ui/borrowck/issue-81365-4.stderr
diff --git a/src/test/ui/borrowck/issue-81365-5.rs b/tests/ui/borrowck/issue-81365-5.rs
index d36b79615..d36b79615 100644
--- a/src/test/ui/borrowck/issue-81365-5.rs
+++ b/tests/ui/borrowck/issue-81365-5.rs
diff --git a/src/test/ui/borrowck/issue-81365-5.stderr b/tests/ui/borrowck/issue-81365-5.stderr
index 20ff229ff..20ff229ff 100644
--- a/src/test/ui/borrowck/issue-81365-5.stderr
+++ b/tests/ui/borrowck/issue-81365-5.stderr
diff --git a/src/test/ui/borrowck/issue-81365-6.rs b/tests/ui/borrowck/issue-81365-6.rs
index 85ea77756..85ea77756 100644
--- a/src/test/ui/borrowck/issue-81365-6.rs
+++ b/tests/ui/borrowck/issue-81365-6.rs
diff --git a/src/test/ui/borrowck/issue-81365-6.stderr b/tests/ui/borrowck/issue-81365-6.stderr
index 575aed73b..575aed73b 100644
--- a/src/test/ui/borrowck/issue-81365-6.stderr
+++ b/tests/ui/borrowck/issue-81365-6.stderr
diff --git a/src/test/ui/borrowck/issue-81365-7.rs b/tests/ui/borrowck/issue-81365-7.rs
index cbf70f11a..cbf70f11a 100644
--- a/src/test/ui/borrowck/issue-81365-7.rs
+++ b/tests/ui/borrowck/issue-81365-7.rs
diff --git a/src/test/ui/borrowck/issue-81365-7.stderr b/tests/ui/borrowck/issue-81365-7.stderr
index 52d2d9e75..52d2d9e75 100644
--- a/src/test/ui/borrowck/issue-81365-7.stderr
+++ b/tests/ui/borrowck/issue-81365-7.stderr
diff --git a/src/test/ui/borrowck/issue-81365-8.rs b/tests/ui/borrowck/issue-81365-8.rs
index 0bb1033fb..0bb1033fb 100644
--- a/src/test/ui/borrowck/issue-81365-8.rs
+++ b/tests/ui/borrowck/issue-81365-8.rs
diff --git a/src/test/ui/borrowck/issue-81365-8.stderr b/tests/ui/borrowck/issue-81365-8.stderr
index fd83e10a2..fd83e10a2 100644
--- a/src/test/ui/borrowck/issue-81365-8.stderr
+++ b/tests/ui/borrowck/issue-81365-8.stderr
diff --git a/src/test/ui/borrowck/issue-81365-9.rs b/tests/ui/borrowck/issue-81365-9.rs
index cd57afa28..cd57afa28 100644
--- a/src/test/ui/borrowck/issue-81365-9.rs
+++ b/tests/ui/borrowck/issue-81365-9.rs
diff --git a/src/test/ui/borrowck/issue-81365-9.stderr b/tests/ui/borrowck/issue-81365-9.stderr
index c7d48214f..c7d48214f 100644
--- a/src/test/ui/borrowck/issue-81365-9.stderr
+++ b/tests/ui/borrowck/issue-81365-9.stderr
diff --git a/src/test/ui/borrowck/issue-81899.rs b/tests/ui/borrowck/issue-81899.rs
index 1f1af5c7e..1f1af5c7e 100644
--- a/src/test/ui/borrowck/issue-81899.rs
+++ b/tests/ui/borrowck/issue-81899.rs
diff --git a/src/test/ui/borrowck/issue-81899.stderr b/tests/ui/borrowck/issue-81899.stderr
index 1b03bc3af..1b03bc3af 100644
--- a/src/test/ui/borrowck/issue-81899.stderr
+++ b/tests/ui/borrowck/issue-81899.stderr
diff --git a/src/test/ui/borrowck/issue-82032.rs b/tests/ui/borrowck/issue-82032.rs
index 4a01b60c1..4a01b60c1 100644
--- a/src/test/ui/borrowck/issue-82032.rs
+++ b/tests/ui/borrowck/issue-82032.rs
diff --git a/src/test/ui/borrowck/issue-82032.stderr b/tests/ui/borrowck/issue-82032.stderr
index 25f343117..25f343117 100644
--- a/src/test/ui/borrowck/issue-82032.stderr
+++ b/tests/ui/borrowck/issue-82032.stderr
diff --git a/src/test/ui/borrowck/issue-82126-mismatched-subst-and-hir.rs b/tests/ui/borrowck/issue-82126-mismatched-subst-and-hir.rs
index dd0320bc5..dd0320bc5 100644
--- a/src/test/ui/borrowck/issue-82126-mismatched-subst-and-hir.rs
+++ b/tests/ui/borrowck/issue-82126-mismatched-subst-and-hir.rs
diff --git a/src/test/ui/borrowck/issue-82126-mismatched-subst-and-hir.stderr b/tests/ui/borrowck/issue-82126-mismatched-subst-and-hir.stderr
index d2b927fb6..d2b927fb6 100644
--- a/src/test/ui/borrowck/issue-82126-mismatched-subst-and-hir.stderr
+++ b/tests/ui/borrowck/issue-82126-mismatched-subst-and-hir.stderr
diff --git a/src/test/ui/borrowck/issue-82462.rs b/tests/ui/borrowck/issue-82462.rs
index 5a3c64255..5a3c64255 100644
--- a/src/test/ui/borrowck/issue-82462.rs
+++ b/tests/ui/borrowck/issue-82462.rs
diff --git a/src/test/ui/borrowck/issue-82462.stderr b/tests/ui/borrowck/issue-82462.stderr
index a2c291f77..a2c291f77 100644
--- a/src/test/ui/borrowck/issue-82462.stderr
+++ b/tests/ui/borrowck/issue-82462.stderr
diff --git a/src/test/ui/borrowck/issue-83309-ice-immut-in-for-loop.rs b/tests/ui/borrowck/issue-83309-ice-immut-in-for-loop.rs
index d301e7b35..d301e7b35 100644
--- a/src/test/ui/borrowck/issue-83309-ice-immut-in-for-loop.rs
+++ b/tests/ui/borrowck/issue-83309-ice-immut-in-for-loop.rs
diff --git a/src/test/ui/borrowck/issue-83309-ice-immut-in-for-loop.stderr b/tests/ui/borrowck/issue-83309-ice-immut-in-for-loop.stderr
index 26ce007dd..26ce007dd 100644
--- a/src/test/ui/borrowck/issue-83309-ice-immut-in-for-loop.stderr
+++ b/tests/ui/borrowck/issue-83309-ice-immut-in-for-loop.stderr
diff --git a/src/test/ui/borrowck/issue-83760.rs b/tests/ui/borrowck/issue-83760.rs
index e25b4f727..e25b4f727 100644
--- a/src/test/ui/borrowck/issue-83760.rs
+++ b/tests/ui/borrowck/issue-83760.rs
diff --git a/src/test/ui/borrowck/issue-83760.stderr b/tests/ui/borrowck/issue-83760.stderr
index 2552fff86..a585bff0c 100644
--- a/src/test/ui/borrowck/issue-83760.stderr
+++ b/tests/ui/borrowck/issue-83760.stderr
@@ -27,11 +27,8 @@ LL |         foo = Some(Struct);
 LL |     let _y = foo;
    |              ^^^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `foo`
+note: `Option::<T>::unwrap` takes ownership of the receiver `self`, which moves `foo`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL |     pub const fn unwrap(self) -> T {
-   |                         ^^^^
 
 error[E0382]: use of moved value: `foo`
   --> $DIR/issue-83760.rs:37:14
@@ -55,11 +52,8 @@ LL |         foo = Some(Struct);
 LL |     } else if true {
 LL |         foo = Some(Struct);
    |         ^^^^^^^^^^^^^^^^^^
-note: this function takes ownership of the receiver `self`, which moves `foo`
+note: `Option::<T>::unwrap` takes ownership of the receiver `self`, which moves `foo`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL |     pub const fn unwrap(self) -> T {
-   |                         ^^^^
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/borrowck/issue-85581.rs b/tests/ui/borrowck/issue-85581.rs
index ccc120c54..ccc120c54 100644
--- a/src/test/ui/borrowck/issue-85581.rs
+++ b/tests/ui/borrowck/issue-85581.rs
diff --git a/src/test/ui/borrowck/issue-85581.stderr b/tests/ui/borrowck/issue-85581.stderr
index 59ca4867f..59ca4867f 100644
--- a/src/test/ui/borrowck/issue-85581.stderr
+++ b/tests/ui/borrowck/issue-85581.stderr
diff --git a/src/test/ui/borrowck/issue-85765.rs b/tests/ui/borrowck/issue-85765.rs
index 1598cd5d3..1598cd5d3 100644
--- a/src/test/ui/borrowck/issue-85765.rs
+++ b/tests/ui/borrowck/issue-85765.rs
diff --git a/src/test/ui/borrowck/issue-85765.stderr b/tests/ui/borrowck/issue-85765.stderr
index 130339621..7da7dba68 100644
--- a/src/test/ui/borrowck/issue-85765.stderr
+++ b/tests/ui/borrowck/issue-85765.stderr
@@ -10,11 +10,13 @@ LL |     rofl.push(Vec::new());
 error[E0594]: cannot assign to `*r`, which is behind a `&` reference
   --> $DIR/issue-85765.rs:12:5
    |
-LL |     let r = &mutvar;
-   |             ------- help: consider changing this to be a mutable reference: `&mut mutvar`
-LL |
 LL |     *r = 0;
    |     ^^^^^^ `r` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let r = &mut mutvar;
+   |             ~~~~~~~~~~~
 
 error[E0594]: cannot assign to `*x`, which is behind a `&` reference
   --> $DIR/issue-85765.rs:19:5
diff --git a/src/test/ui/borrowck/issue-87456-point-to-closure.rs b/tests/ui/borrowck/issue-87456-point-to-closure.rs
index 9fc12ba74..9fc12ba74 100644
--- a/src/test/ui/borrowck/issue-87456-point-to-closure.rs
+++ b/tests/ui/borrowck/issue-87456-point-to-closure.rs
diff --git a/tests/ui/borrowck/issue-87456-point-to-closure.stderr b/tests/ui/borrowck/issue-87456-point-to-closure.stderr
new file mode 100644
index 000000000..afd141125
--- /dev/null
+++ b/tests/ui/borrowck/issue-87456-point-to-closure.stderr
@@ -0,0 +1,20 @@
+error[E0507]: cannot move out of `val`, a captured variable in an `FnMut` closure
+  --> $DIR/issue-87456-point-to-closure.rs:10:28
+   |
+LL |     let val = String::new();
+   |         --- captured outer variable
+LL |
+LL |     take_mut(|| {
+   |              -- captured by this `FnMut` closure
+LL |
+LL |         let _foo: String = val;
+   |                            ^^^ move occurs because `val` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         let _foo: String = &val;
+   |                            +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/issue-88434-minimal-example.rs b/tests/ui/borrowck/issue-88434-minimal-example.rs
index b75abcb73..b75abcb73 100644
--- a/src/test/ui/borrowck/issue-88434-minimal-example.rs
+++ b/tests/ui/borrowck/issue-88434-minimal-example.rs
diff --git a/src/test/ui/borrowck/issue-88434-minimal-example.stderr b/tests/ui/borrowck/issue-88434-minimal-example.stderr
index a5a571c6d..a5a571c6d 100644
--- a/src/test/ui/borrowck/issue-88434-minimal-example.stderr
+++ b/tests/ui/borrowck/issue-88434-minimal-example.stderr
diff --git a/src/test/ui/borrowck/issue-88434-removal-index-should-be-less.rs b/tests/ui/borrowck/issue-88434-removal-index-should-be-less.rs
index f9134e669..f9134e669 100644
--- a/src/test/ui/borrowck/issue-88434-removal-index-should-be-less.rs
+++ b/tests/ui/borrowck/issue-88434-removal-index-should-be-less.rs
diff --git a/src/test/ui/borrowck/issue-88434-removal-index-should-be-less.stderr b/tests/ui/borrowck/issue-88434-removal-index-should-be-less.stderr
index 00023c459..00023c459 100644
--- a/src/test/ui/borrowck/issue-88434-removal-index-should-be-less.stderr
+++ b/tests/ui/borrowck/issue-88434-removal-index-should-be-less.stderr
diff --git a/src/test/ui/borrowck/issue-91206.rs b/tests/ui/borrowck/issue-91206.rs
index 67407c1ea..67407c1ea 100644
--- a/src/test/ui/borrowck/issue-91206.rs
+++ b/tests/ui/borrowck/issue-91206.rs
diff --git a/src/test/ui/borrowck/issue-91206.stderr b/tests/ui/borrowck/issue-91206.stderr
index 12d8d27c5..12d8d27c5 100644
--- a/src/test/ui/borrowck/issue-91206.stderr
+++ b/tests/ui/borrowck/issue-91206.stderr
diff --git a/src/test/ui/borrowck/issue-92015.rs b/tests/ui/borrowck/issue-92015.rs
index 16d651717..16d651717 100644
--- a/src/test/ui/borrowck/issue-92015.rs
+++ b/tests/ui/borrowck/issue-92015.rs
diff --git a/src/test/ui/borrowck/issue-92015.stderr b/tests/ui/borrowck/issue-92015.stderr
index 62b1183e7..62b1183e7 100644
--- a/src/test/ui/borrowck/issue-92015.stderr
+++ b/tests/ui/borrowck/issue-92015.stderr
diff --git a/tests/ui/borrowck/issue-92157.rs b/tests/ui/borrowck/issue-92157.rs
new file mode 100644
index 000000000..6ee2320a6
--- /dev/null
+++ b/tests/ui/borrowck/issue-92157.rs
@@ -0,0 +1,40 @@
+#![feature(no_core)]
+#![feature(lang_items)]
+
+#![no_core]
+
+#[cfg(target_os = "linux")]
+#[link(name = "c")]
+extern {}
+
+#[lang = "start"]
+fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8) -> isize {
+    //~^ ERROR: incorrect number of parameters for the `start` lang item
+    40+2
+}
+
+#[lang = "sized"]
+pub trait Sized {}
+#[lang = "copy"]
+pub trait Copy {}
+
+#[lang = "drop_in_place"]
+#[allow(unconditional_recursion)]
+pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
+    drop_in_place(to_drop)
+}
+
+#[lang = "add"]
+trait Add<RHS> {
+    type Output;
+    fn add(self, other: RHS) -> Self::Output;
+}
+
+impl Add<isize> for isize {
+    type Output = isize;
+    fn add(self, other: isize) -> isize {
+        self + other
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/borrowck/issue-92157.stderr b/tests/ui/borrowck/issue-92157.stderr
new file mode 100644
index 000000000..a4010d73d
--- /dev/null
+++ b/tests/ui/borrowck/issue-92157.stderr
@@ -0,0 +1,11 @@
+error: incorrect number of parameters for the `start` lang item
+  --> $DIR/issue-92157.rs:11:1
+   |
+LL | fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8) -> isize {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: the `start` lang item should have four parameters, but found 3
+   = note: the `start` lang item should have the signature `fn(fn() -> T, isize, *const *const u8, u8) -> isize`
+
+error: aborting due to previous error
+
diff --git a/tests/ui/borrowck/issue-93078.rs b/tests/ui/borrowck/issue-93078.rs
new file mode 100644
index 000000000..2e608c5db
--- /dev/null
+++ b/tests/ui/borrowck/issue-93078.rs
@@ -0,0 +1,15 @@
+trait Modify {
+    fn modify(&mut self) ;
+}
+
+impl<T> Modify for T  {
+    fn modify(&mut self)  {}
+}
+
+trait Foo {
+    fn mute(&mut self) {
+        self.modify(); //~ ERROR cannot borrow `self` as mutable
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/borrowck/issue-93078.stderr b/tests/ui/borrowck/issue-93078.stderr
new file mode 100644
index 000000000..771a652a1
--- /dev/null
+++ b/tests/ui/borrowck/issue-93078.stderr
@@ -0,0 +1,12 @@
+error[E0596]: cannot borrow `self` as mutable, as it is not declared as mutable
+  --> $DIR/issue-93078.rs:11:9
+   |
+LL |         self.modify();
+   |         ^^^^^^^^^^^^^ cannot borrow as mutable
+   |
+   = note: as `Self` may be unsized, this call attempts to take `&mut &mut self`
+   = note: however, `&mut self` expands to `self: &mut Self`, therefore `self` cannot be borrowed mutably
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/borrowck/issue-93093.rs b/tests/ui/borrowck/issue-93093.rs
index f4db5ecaf..f4db5ecaf 100644
--- a/src/test/ui/borrowck/issue-93093.rs
+++ b/tests/ui/borrowck/issue-93093.rs
diff --git a/tests/ui/borrowck/issue-93093.stderr b/tests/ui/borrowck/issue-93093.stderr
new file mode 100644
index 000000000..afa76594f
--- /dev/null
+++ b/tests/ui/borrowck/issue-93093.stderr
@@ -0,0 +1,14 @@
+error[E0594]: cannot assign to `self.foo`, which is behind a `&` reference
+  --> $DIR/issue-93093.rs:8:9
+   |
+LL |         self.foo += 1;
+   |         ^^^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     async fn bar(&mut self) {
+   |                  ~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/borrowck/issue-95079-missing-move-in-nested-closure.rs b/tests/ui/borrowck/issue-95079-missing-move-in-nested-closure.rs
index 95847d8d3..95847d8d3 100644
--- a/src/test/ui/borrowck/issue-95079-missing-move-in-nested-closure.rs
+++ b/tests/ui/borrowck/issue-95079-missing-move-in-nested-closure.rs
diff --git a/src/test/ui/borrowck/issue-95079-missing-move-in-nested-closure.stderr b/tests/ui/borrowck/issue-95079-missing-move-in-nested-closure.stderr
index 2eae614a2..2eae614a2 100644
--- a/src/test/ui/borrowck/issue-95079-missing-move-in-nested-closure.stderr
+++ b/tests/ui/borrowck/issue-95079-missing-move-in-nested-closure.stderr
diff --git a/src/test/ui/borrowck/kindck-implicit-close-over-mut-var.rs b/tests/ui/borrowck/kindck-implicit-close-over-mut-var.rs
index 5b5d86eec..5b5d86eec 100644
--- a/src/test/ui/borrowck/kindck-implicit-close-over-mut-var.rs
+++ b/tests/ui/borrowck/kindck-implicit-close-over-mut-var.rs
diff --git a/src/test/ui/borrowck/lazy-init.rs b/tests/ui/borrowck/lazy-init.rs
index a4b5d18bb..a4b5d18bb 100644
--- a/src/test/ui/borrowck/lazy-init.rs
+++ b/tests/ui/borrowck/lazy-init.rs
diff --git a/tests/ui/borrowck/many-mutable-borrows.rs b/tests/ui/borrowck/many-mutable-borrows.rs
new file mode 100644
index 000000000..3e6ea9d25
--- /dev/null
+++ b/tests/ui/borrowck/many-mutable-borrows.rs
@@ -0,0 +1,18 @@
+fn main() {
+    let v = Vec::new(); //~ ERROR cannot borrow `v` as mutable, as it is not declared as mutable
+    v.push(0);
+    v.push(0);
+    v.push(0);
+    v.push(0);
+    v.push(0);
+    v.push(0);
+    v.push(0);
+    v.push(0);
+    v.push(0);
+    v.push(0);
+    v.push(0);
+    v.push(0);
+    v.push(0);
+    v.push(0);
+    v.push(0);
+}
diff --git a/tests/ui/borrowck/many-mutable-borrows.stderr b/tests/ui/borrowck/many-mutable-borrows.stderr
new file mode 100644
index 000000000..aa0cbcffd
--- /dev/null
+++ b/tests/ui/borrowck/many-mutable-borrows.stderr
@@ -0,0 +1,33 @@
+error[E0596]: cannot borrow `v` as mutable, as it is not declared as mutable
+  --> $DIR/many-mutable-borrows.rs:2:9
+   |
+LL |     let v = Vec::new();
+   |         ^ not mutable
+LL |     v.push(0);
+   |     --------- cannot borrow as mutable
+LL |     v.push(0);
+   |     --------- cannot borrow as mutable
+LL |     v.push(0);
+   |     --------- cannot borrow as mutable
+LL |     v.push(0);
+   |     --------- cannot borrow as mutable
+LL |     v.push(0);
+   |     --------- cannot borrow as mutable
+LL |     v.push(0);
+   |     --------- cannot borrow as mutable
+LL |     v.push(0);
+   |     --------- cannot borrow as mutable
+LL |     v.push(0);
+   |     --------- cannot borrow as mutable
+LL |     v.push(0);
+   |     --------- cannot borrow as mutable
+   |
+   = note: ...and 5 other attempted mutable borrows
+help: consider changing this to be mutable
+   |
+LL |     let mut v = Vec::new();
+   |         +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/borrowck/move-error-in-promoted-2.rs b/tests/ui/borrowck/move-error-in-promoted-2.rs
index 13da34f39..13da34f39 100644
--- a/src/test/ui/borrowck/move-error-in-promoted-2.rs
+++ b/tests/ui/borrowck/move-error-in-promoted-2.rs
diff --git a/src/test/ui/borrowck/move-error-in-promoted-2.stderr b/tests/ui/borrowck/move-error-in-promoted-2.stderr
index 38dba94bd..38dba94bd 100644
--- a/src/test/ui/borrowck/move-error-in-promoted-2.stderr
+++ b/tests/ui/borrowck/move-error-in-promoted-2.stderr
diff --git a/src/test/ui/borrowck/move-error-in-promoted.rs b/tests/ui/borrowck/move-error-in-promoted.rs
index b94db6451..b94db6451 100644
--- a/src/test/ui/borrowck/move-error-in-promoted.rs
+++ b/tests/ui/borrowck/move-error-in-promoted.rs
diff --git a/src/test/ui/borrowck/move-error-in-promoted.stderr b/tests/ui/borrowck/move-error-in-promoted.stderr
index a4432e38d..a4432e38d 100644
--- a/src/test/ui/borrowck/move-error-in-promoted.stderr
+++ b/tests/ui/borrowck/move-error-in-promoted.stderr
diff --git a/src/test/ui/borrowck/move-error-snippets-ext.rs b/tests/ui/borrowck/move-error-snippets-ext.rs
index c77f6c827..c77f6c827 100644
--- a/src/test/ui/borrowck/move-error-snippets-ext.rs
+++ b/tests/ui/borrowck/move-error-snippets-ext.rs
diff --git a/src/test/ui/borrowck/move-error-snippets.rs b/tests/ui/borrowck/move-error-snippets.rs
index 64f956538..64f956538 100644
--- a/src/test/ui/borrowck/move-error-snippets.rs
+++ b/tests/ui/borrowck/move-error-snippets.rs
diff --git a/tests/ui/borrowck/move-error-snippets.stderr b/tests/ui/borrowck/move-error-snippets.stderr
new file mode 100644
index 000000000..8ac711e9e
--- /dev/null
+++ b/tests/ui/borrowck/move-error-snippets.stderr
@@ -0,0 +1,20 @@
+error[E0507]: cannot move out of static item `D`
+  --> $DIR/move-error-snippets-ext.rs:5:17
+   |
+LL |         let a = $c;
+   |                 ^^ move occurs because `D` has type `A`, which does not implement the `Copy` trait
+   |
+  ::: $DIR/move-error-snippets.rs:21:1
+   |
+LL | sss!();
+   | ------ in this macro invocation
+   |
+   = note: this error originates in the macro `aaa` which comes from the expansion of the macro `sss` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider borrowing here
+   |
+LL |         let a = &$c;
+   |                 +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/move-from-union-field-issue-66500.rs b/tests/ui/borrowck/move-from-union-field-issue-66500.rs
index 0bd2147f4..0bd2147f4 100644
--- a/src/test/ui/borrowck/move-from-union-field-issue-66500.rs
+++ b/tests/ui/borrowck/move-from-union-field-issue-66500.rs
diff --git a/src/test/ui/borrowck/move-from-union-field-issue-66500.stderr b/tests/ui/borrowck/move-from-union-field-issue-66500.stderr
index 700785827..700785827 100644
--- a/src/test/ui/borrowck/move-from-union-field-issue-66500.stderr
+++ b/tests/ui/borrowck/move-from-union-field-issue-66500.stderr
diff --git a/src/test/ui/borrowck/move-in-pattern-mut-in-loop.rs b/tests/ui/borrowck/move-in-pattern-mut-in-loop.rs
index 4b42f9d4c..4b42f9d4c 100644
--- a/src/test/ui/borrowck/move-in-pattern-mut-in-loop.rs
+++ b/tests/ui/borrowck/move-in-pattern-mut-in-loop.rs
diff --git a/src/test/ui/borrowck/move-in-pattern-mut-in-loop.stderr b/tests/ui/borrowck/move-in-pattern-mut-in-loop.stderr
index 55948afca..55948afca 100644
--- a/src/test/ui/borrowck/move-in-pattern-mut-in-loop.stderr
+++ b/tests/ui/borrowck/move-in-pattern-mut-in-loop.stderr
diff --git a/src/test/ui/borrowck/move-in-pattern-mut.rs b/tests/ui/borrowck/move-in-pattern-mut.rs
index b5c275bf2..b5c275bf2 100644
--- a/src/test/ui/borrowck/move-in-pattern-mut.rs
+++ b/tests/ui/borrowck/move-in-pattern-mut.rs
diff --git a/src/test/ui/borrowck/move-in-pattern-mut.stderr b/tests/ui/borrowck/move-in-pattern-mut.stderr
index dd3471e2c..dd3471e2c 100644
--- a/src/test/ui/borrowck/move-in-pattern-mut.stderr
+++ b/tests/ui/borrowck/move-in-pattern-mut.stderr
diff --git a/src/test/ui/borrowck/move-in-pattern.fixed b/tests/ui/borrowck/move-in-pattern.fixed
index 145893d33..145893d33 100644
--- a/src/test/ui/borrowck/move-in-pattern.fixed
+++ b/tests/ui/borrowck/move-in-pattern.fixed
diff --git a/src/test/ui/borrowck/move-in-pattern.rs b/tests/ui/borrowck/move-in-pattern.rs
index 14851d0f6..14851d0f6 100644
--- a/src/test/ui/borrowck/move-in-pattern.rs
+++ b/tests/ui/borrowck/move-in-pattern.rs
diff --git a/src/test/ui/borrowck/move-in-pattern.stderr b/tests/ui/borrowck/move-in-pattern.stderr
index 250acbe59..250acbe59 100644
--- a/src/test/ui/borrowck/move-in-pattern.stderr
+++ b/tests/ui/borrowck/move-in-pattern.stderr
diff --git a/src/test/ui/borrowck/move-in-static-initializer-issue-38520.rs b/tests/ui/borrowck/move-in-static-initializer-issue-38520.rs
index c2a59a105..c2a59a105 100644
--- a/src/test/ui/borrowck/move-in-static-initializer-issue-38520.rs
+++ b/tests/ui/borrowck/move-in-static-initializer-issue-38520.rs
diff --git a/src/test/ui/borrowck/move-in-static-initializer-issue-38520.stderr b/tests/ui/borrowck/move-in-static-initializer-issue-38520.stderr
index 6619fb42c..6619fb42c 100644
--- a/src/test/ui/borrowck/move-in-static-initializer-issue-38520.stderr
+++ b/tests/ui/borrowck/move-in-static-initializer-issue-38520.stderr
diff --git a/src/test/ui/borrowck/mut-borrow-in-loop-2.fixed b/tests/ui/borrowck/mut-borrow-in-loop-2.fixed
index ceeba30a9..ceeba30a9 100644
--- a/src/test/ui/borrowck/mut-borrow-in-loop-2.fixed
+++ b/tests/ui/borrowck/mut-borrow-in-loop-2.fixed
diff --git a/src/test/ui/borrowck/mut-borrow-in-loop-2.rs b/tests/ui/borrowck/mut-borrow-in-loop-2.rs
index d13fb7e56..d13fb7e56 100644
--- a/src/test/ui/borrowck/mut-borrow-in-loop-2.rs
+++ b/tests/ui/borrowck/mut-borrow-in-loop-2.rs
diff --git a/src/test/ui/borrowck/mut-borrow-in-loop-2.stderr b/tests/ui/borrowck/mut-borrow-in-loop-2.stderr
index 74e7067c9..74e7067c9 100644
--- a/src/test/ui/borrowck/mut-borrow-in-loop-2.stderr
+++ b/tests/ui/borrowck/mut-borrow-in-loop-2.stderr
diff --git a/src/test/ui/borrowck/mut-borrow-in-loop.rs b/tests/ui/borrowck/mut-borrow-in-loop.rs
index 22667906e..22667906e 100644
--- a/src/test/ui/borrowck/mut-borrow-in-loop.rs
+++ b/tests/ui/borrowck/mut-borrow-in-loop.rs
diff --git a/src/test/ui/borrowck/mut-borrow-in-loop.stderr b/tests/ui/borrowck/mut-borrow-in-loop.stderr
index b621694a5..b621694a5 100644
--- a/src/test/ui/borrowck/mut-borrow-in-loop.stderr
+++ b/tests/ui/borrowck/mut-borrow-in-loop.stderr
diff --git a/src/test/ui/borrowck/mut-borrow-of-mut-ref.rs b/tests/ui/borrowck/mut-borrow-of-mut-ref.rs
index 7cdb16b28..477a2aa48 100644
--- a/src/test/ui/borrowck/mut-borrow-of-mut-ref.rs
+++ b/tests/ui/borrowck/mut-borrow-of-mut-ref.rs
@@ -2,15 +2,14 @@
 #![crate_type = "rlib"]
 
 pub fn f(b: &mut i32) {
-    //~^ NOTE the binding is already a mutable borrow
+    //~^ ERROR cannot borrow
+    //~| NOTE not mutable
     //~| NOTE the binding is already a mutable borrow
     h(&mut b);
-    //~^ ERROR cannot borrow
-    //~| NOTE cannot borrow as mutable
+    //~^ NOTE cannot borrow as mutable
     //~| HELP try removing `&mut` here
     g(&mut &mut b);
-    //~^ ERROR cannot borrow
-    //~| NOTE cannot borrow as mutable
+    //~^ NOTE cannot borrow as mutable
     //~| HELP try removing `&mut` here
 }
 
diff --git a/tests/ui/borrowck/mut-borrow-of-mut-ref.stderr b/tests/ui/borrowck/mut-borrow-of-mut-ref.stderr
new file mode 100644
index 000000000..c6f75b1c0
--- /dev/null
+++ b/tests/ui/borrowck/mut-borrow-of-mut-ref.stderr
@@ -0,0 +1,59 @@
+error[E0596]: cannot borrow `b` as mutable, as it is not declared as mutable
+  --> $DIR/mut-borrow-of-mut-ref.rs:4:10
+   |
+LL | pub fn f(b: &mut i32) {
+   |          ^ not mutable
+...
+LL |     h(&mut b);
+   |       ------ cannot borrow as mutable
+...
+LL |     g(&mut &mut b);
+   |            ------ cannot borrow as mutable
+   |
+note: the binding is already a mutable borrow
+  --> $DIR/mut-borrow-of-mut-ref.rs:4:13
+   |
+LL | pub fn f(b: &mut i32) {
+   |             ^^^^^^^^
+help: try removing `&mut` here
+   |
+LL -     h(&mut b);
+LL +     h(b);
+   |
+help: try removing `&mut` here
+   |
+LL -     g(&mut &mut b);
+LL +     g(&mut b);
+   |
+
+error[E0596]: cannot borrow `b` as mutable, as it is not declared as mutable
+  --> $DIR/mut-borrow-of-mut-ref.rs:17:12
+   |
+LL |     h(&mut &mut b);
+   |            ^^^^^^ cannot borrow as mutable
+   |
+note: the binding is already a mutable borrow
+  --> $DIR/mut-borrow-of-mut-ref.rs:16:13
+   |
+LL | pub fn g(b: &mut i32) {
+   |             ^^^^^^^^
+help: try removing `&mut` here
+   |
+LL -     h(&mut &mut b);
+LL +     h(&mut b);
+   |
+
+error[E0596]: cannot borrow `f` as mutable, as it is not declared as mutable
+  --> $DIR/mut-borrow-of-mut-ref.rs:34:5
+   |
+LL |     f.bar();
+   |     ^^^^^^^ cannot borrow as mutable
+   |
+help: consider making the binding mutable
+   |
+LL | pub fn baz(mut f: &mut String) {
+   |            +++
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/borrowck/mut-borrow-outside-loop.rs b/tests/ui/borrowck/mut-borrow-outside-loop.rs
index c02bfbf87..c02bfbf87 100644
--- a/src/test/ui/borrowck/mut-borrow-outside-loop.rs
+++ b/tests/ui/borrowck/mut-borrow-outside-loop.rs
diff --git a/src/test/ui/borrowck/mut-borrow-outside-loop.stderr b/tests/ui/borrowck/mut-borrow-outside-loop.stderr
index e6895b27f..e6895b27f 100644
--- a/src/test/ui/borrowck/mut-borrow-outside-loop.stderr
+++ b/tests/ui/borrowck/mut-borrow-outside-loop.stderr
diff --git a/src/test/ui/borrowck/mutability-errors.rs b/tests/ui/borrowck/mutability-errors.rs
index 5be0df137..82116425f 100644
--- a/src/test/ui/borrowck/mutability-errors.rs
+++ b/tests/ui/borrowck/mutability-errors.rs
@@ -50,9 +50,9 @@ fn ref_closure(mut x: (i32,)) {
     });
 }
 
-fn imm_local(x: (i32,)) {
-    &mut x; //~ ERROR
-    &mut x.0; //~ ERROR
+fn imm_local(x: (i32,)) { //~ ERROR
+    &mut x;
+    &mut x.0;
 }
 
 fn imm_capture(x: (i32,)) {
diff --git a/src/test/ui/borrowck/mutability-errors.stderr b/tests/ui/borrowck/mutability-errors.stderr
index dd29ae492..d7c602718 100644
--- a/src/test/ui/borrowck/mutability-errors.stderr
+++ b/tests/ui/borrowck/mutability-errors.stderr
@@ -1,37 +1,46 @@
 error[E0594]: cannot assign to `*x`, which is behind a `&` reference
   --> $DIR/mutability-errors.rs:9:5
    |
-LL | fn named_ref(x: &(i32,)) {
-   |                 ------- help: consider changing this to be a mutable reference: `&mut (i32,)`
 LL |     *x = (1,);
    |     ^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn named_ref(x: &mut (i32,)) {
+   |                 ~~~~~~~~~~~
 
 error[E0594]: cannot assign to `x.0`, which is behind a `&` reference
   --> $DIR/mutability-errors.rs:10:5
    |
-LL | fn named_ref(x: &(i32,)) {
-   |                 ------- help: consider changing this to be a mutable reference: `&mut (i32,)`
-LL |     *x = (1,);
 LL |     x.0 = 1;
    |     ^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn named_ref(x: &mut (i32,)) {
+   |                 ~~~~~~~~~~~
 
 error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
   --> $DIR/mutability-errors.rs:11:5
    |
-LL | fn named_ref(x: &(i32,)) {
-   |                 ------- help: consider changing this to be a mutable reference: `&mut (i32,)`
-...
 LL |     &mut *x;
    |     ^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn named_ref(x: &mut (i32,)) {
+   |                 ~~~~~~~~~~~
 
 error[E0596]: cannot borrow `x.0` as mutable, as it is behind a `&` reference
   --> $DIR/mutability-errors.rs:12:5
    |
-LL | fn named_ref(x: &(i32,)) {
-   |                 ------- help: consider changing this to be a mutable reference: `&mut (i32,)`
-...
 LL |     &mut x.0;
    |     ^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn named_ref(x: &mut (i32,)) {
+   |                 ~~~~~~~~~~~
 
 error[E0594]: cannot assign to data in a `&` reference
   --> $DIR/mutability-errors.rs:16:5
@@ -60,37 +69,46 @@ LL |     &mut f().0;
 error[E0594]: cannot assign to `*x`, which is behind a `*const` pointer
   --> $DIR/mutability-errors.rs:23:5
    |
-LL | unsafe fn named_ptr(x: *const (i32,)) {
-   |                        ------------- help: consider changing this to be a mutable pointer: `*mut (i32,)`
 LL |     *x = (1,);
    |     ^^^^^^^^^ `x` is a `*const` pointer, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable pointer
+   |
+LL | unsafe fn named_ptr(x: *mut (i32,)) {
+   |                        ~~~~~~~~~~~
 
 error[E0594]: cannot assign to `x.0`, which is behind a `*const` pointer
   --> $DIR/mutability-errors.rs:24:5
    |
-LL | unsafe fn named_ptr(x: *const (i32,)) {
-   |                        ------------- help: consider changing this to be a mutable pointer: `*mut (i32,)`
-LL |     *x = (1,);
 LL |     (*x).0 = 1;
    |     ^^^^^^^^^^ `x` is a `*const` pointer, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable pointer
+   |
+LL | unsafe fn named_ptr(x: *mut (i32,)) {
+   |                        ~~~~~~~~~~~
 
 error[E0596]: cannot borrow `*x` as mutable, as it is behind a `*const` pointer
   --> $DIR/mutability-errors.rs:25:5
    |
-LL | unsafe fn named_ptr(x: *const (i32,)) {
-   |                        ------------- help: consider changing this to be a mutable pointer: `*mut (i32,)`
-...
 LL |     &mut *x;
    |     ^^^^^^^ `x` is a `*const` pointer, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable pointer
+   |
+LL | unsafe fn named_ptr(x: *mut (i32,)) {
+   |                        ~~~~~~~~~~~
 
 error[E0596]: cannot borrow `x.0` as mutable, as it is behind a `*const` pointer
   --> $DIR/mutability-errors.rs:26:5
    |
-LL | unsafe fn named_ptr(x: *const (i32,)) {
-   |                        ------------- help: consider changing this to be a mutable pointer: `*mut (i32,)`
-...
 LL |     &mut (*x).0;
    |     ^^^^^^^^^^^ `x` is a `*const` pointer, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable pointer
+   |
+LL | unsafe fn named_ptr(x: *mut (i32,)) {
+   |                        ~~~~~~~~~~~
 
 error[E0594]: cannot assign to data in a `*const` pointer
   --> $DIR/mutability-errors.rs:30:5
@@ -227,21 +245,19 @@ LL |         &mut x.0;
    |         ^^^^^^^^ cannot borrow as mutable
 
 error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
-  --> $DIR/mutability-errors.rs:54:5
+  --> $DIR/mutability-errors.rs:53:14
    |
 LL | fn imm_local(x: (i32,)) {
-   |              - help: consider changing this to be mutable: `mut x`
-LL |     &mut x;
-   |     ^^^^^^ cannot borrow as mutable
-
-error[E0596]: cannot borrow `x.0` as mutable, as `x` is not declared as mutable
-  --> $DIR/mutability-errors.rs:55:5
-   |
-LL | fn imm_local(x: (i32,)) {
-   |              - help: consider changing this to be mutable: `mut x`
+   |              ^ not mutable
 LL |     &mut x;
+   |     ------ cannot borrow as mutable
 LL |     &mut x.0;
-   |     ^^^^^^^^ cannot borrow as mutable
+   |     -------- cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn imm_local(mut x: (i32,)) {
+   |              +++
 
 error[E0594]: cannot assign to `x`, as it is not declared as mutable
   --> $DIR/mutability-errors.rs:60:9
@@ -339,7 +355,7 @@ error[E0596]: cannot borrow `X.0` as mutable, as `X` is an immutable static item
 LL |     &mut X.0;
    |     ^^^^^^^^ cannot borrow as mutable
 
-error: aborting due to 38 previous errors
+error: aborting due to 37 previous errors
 
 Some errors have detailed explanations: E0594, E0596.
 For more information about an error, try `rustc --explain E0594`.
diff --git a/src/test/ui/borrowck/or-patterns.rs b/tests/ui/borrowck/or-patterns.rs
index aeab3b92e..aeab3b92e 100644
--- a/src/test/ui/borrowck/or-patterns.rs
+++ b/tests/ui/borrowck/or-patterns.rs
diff --git a/src/test/ui/borrowck/or-patterns.stderr b/tests/ui/borrowck/or-patterns.stderr
index 9501798bb..9501798bb 100644
--- a/src/test/ui/borrowck/or-patterns.stderr
+++ b/tests/ui/borrowck/or-patterns.stderr
diff --git a/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.rs b/tests/ui/borrowck/promote-ref-mut-in-let-issue-46557.rs
index 3576734de..3576734de 100644
--- a/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.rs
+++ b/tests/ui/borrowck/promote-ref-mut-in-let-issue-46557.rs
diff --git a/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.stderr b/tests/ui/borrowck/promote-ref-mut-in-let-issue-46557.stderr
index 60af41237..60af41237 100644
--- a/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.stderr
+++ b/tests/ui/borrowck/promote-ref-mut-in-let-issue-46557.stderr
diff --git a/src/test/ui/borrowck/reassignment_immutable_fields.rs b/tests/ui/borrowck/reassignment_immutable_fields.rs
index fd2ab62a4..fd2ab62a4 100644
--- a/src/test/ui/borrowck/reassignment_immutable_fields.rs
+++ b/tests/ui/borrowck/reassignment_immutable_fields.rs
diff --git a/src/test/ui/borrowck/reassignment_immutable_fields.stderr b/tests/ui/borrowck/reassignment_immutable_fields.stderr
index e6b25573e..e6b25573e 100644
--- a/src/test/ui/borrowck/reassignment_immutable_fields.stderr
+++ b/tests/ui/borrowck/reassignment_immutable_fields.stderr
diff --git a/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.rs b/tests/ui/borrowck/reassignment_immutable_fields_overlapping.rs
index d7aad6c01..d7aad6c01 100644
--- a/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.rs
+++ b/tests/ui/borrowck/reassignment_immutable_fields_overlapping.rs
diff --git a/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.stderr b/tests/ui/borrowck/reassignment_immutable_fields_overlapping.stderr
index a3885b5f5..81e5bc45d 100644
--- a/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.stderr
+++ b/tests/ui/borrowck/reassignment_immutable_fields_overlapping.stderr
@@ -11,11 +11,13 @@ LL |     x.a = 1;
 error[E0594]: cannot assign to `x.b`, as `x` is not declared as mutable
   --> $DIR/reassignment_immutable_fields_overlapping.rs:13:5
    |
-LL |     let x: Foo;
-   |         - help: consider changing this to be mutable: `mut x`
-LL |     x.a = 1;
 LL |     x.b = 22;
    |     ^^^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut x: Foo;
+   |         +++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/borrowck/reassignment_immutable_fields_twice.rs b/tests/ui/borrowck/reassignment_immutable_fields_twice.rs
index 2775a54c8..2775a54c8 100644
--- a/src/test/ui/borrowck/reassignment_immutable_fields_twice.rs
+++ b/tests/ui/borrowck/reassignment_immutable_fields_twice.rs
diff --git a/src/test/ui/borrowck/reassignment_immutable_fields_twice.stderr b/tests/ui/borrowck/reassignment_immutable_fields_twice.stderr
index 49c81adad..ba0457809 100644
--- a/src/test/ui/borrowck/reassignment_immutable_fields_twice.stderr
+++ b/tests/ui/borrowck/reassignment_immutable_fields_twice.stderr
@@ -1,11 +1,13 @@
 error[E0594]: cannot assign to `x.0`, as `x` is not declared as mutable
   --> $DIR/reassignment_immutable_fields_twice.rs:7:5
    |
-LL |     let x: (u32, u32);
-   |         - help: consider changing this to be mutable: `mut x`
-LL |     x = (22, 44);
 LL |     x.0 = 1;
    |     ^^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut x: (u32, u32);
+   |         +++
 
 error[E0381]: partially assigned binding `x` isn't fully initialized
   --> $DIR/reassignment_immutable_fields_twice.rs:12:5
diff --git a/src/test/ui/borrowck/reborrow-sugg-move-then-borrow.rs b/tests/ui/borrowck/reborrow-sugg-move-then-borrow.rs
index 31eba0740..31eba0740 100644
--- a/src/test/ui/borrowck/reborrow-sugg-move-then-borrow.rs
+++ b/tests/ui/borrowck/reborrow-sugg-move-then-borrow.rs
diff --git a/src/test/ui/borrowck/reborrow-sugg-move-then-borrow.stderr b/tests/ui/borrowck/reborrow-sugg-move-then-borrow.stderr
index 13a2005e2..ecd916a59 100644
--- a/src/test/ui/borrowck/reborrow-sugg-move-then-borrow.stderr
+++ b/tests/ui/borrowck/reborrow-sugg-move-then-borrow.stderr
@@ -9,11 +9,8 @@ LL |
 LL |     fill_segment(state);
    |                  ^^^^^ value borrowed here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `state`
+note: `into_iter` takes ownership of the receiver `self`, which moves `state`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
 help: consider creating a fresh reborrow of `state` here
    |
 LL |     for _ in &mut *state {}
diff --git a/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.rs b/tests/ui/borrowck/regions-bound-missing-bound-in-impl.rs
index 141ad5bd2..141ad5bd2 100644
--- a/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.rs
+++ b/tests/ui/borrowck/regions-bound-missing-bound-in-impl.rs
diff --git a/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.stderr b/tests/ui/borrowck/regions-bound-missing-bound-in-impl.stderr
index 1e3b071ef..930fea915 100644
--- a/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.stderr
+++ b/tests/ui/borrowck/regions-bound-missing-bound-in-impl.stderr
@@ -22,8 +22,8 @@ error[E0308]: method not compatible with trait
 LL |     fn wrong_bound1<'b,'c,'d:'a+'c>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>) {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
-   = note: expected fn pointer `fn(&'a isize, Inv<'c>, Inv<'c>, Inv<'_>)`
-              found fn pointer `fn(&'a isize, Inv<'_>, Inv<'c>, Inv<'_>)`
+   = note: expected signature `fn(&'a isize, Inv<'c>, Inv<'c>, Inv<'_>)`
+              found signature `fn(&'a isize, Inv<'_>, Inv<'c>, Inv<'_>)`
 note: the lifetime `'c` as defined here...
   --> $DIR/regions-bound-missing-bound-in-impl.rs:27:24
    |
@@ -41,8 +41,8 @@ error[E0308]: method not compatible with trait
 LL |     fn wrong_bound1<'b,'c,'d:'a+'c>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>) {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
-   = note: expected fn pointer `fn(&'a isize, Inv<'c>, Inv<'c>, Inv<'_>)`
-              found fn pointer `fn(&'a isize, Inv<'_>, Inv<'c>, Inv<'_>)`
+   = note: expected signature `fn(&'a isize, Inv<'c>, Inv<'c>, Inv<'_>)`
+              found signature `fn(&'a isize, Inv<'_>, Inv<'c>, Inv<'_>)`
 note: the lifetime `'c` as defined here...
   --> $DIR/regions-bound-missing-bound-in-impl.rs:27:24
    |
diff --git a/src/test/ui/borrowck/regions-escape-bound-fn-2.rs b/tests/ui/borrowck/regions-escape-bound-fn-2.rs
index 0e98d98cf..0e98d98cf 100644
--- a/src/test/ui/borrowck/regions-escape-bound-fn-2.rs
+++ b/tests/ui/borrowck/regions-escape-bound-fn-2.rs
diff --git a/src/test/ui/borrowck/regions-escape-bound-fn-2.stderr b/tests/ui/borrowck/regions-escape-bound-fn-2.stderr
index 14393bc8e..14393bc8e 100644
--- a/src/test/ui/borrowck/regions-escape-bound-fn-2.stderr
+++ b/tests/ui/borrowck/regions-escape-bound-fn-2.stderr
diff --git a/src/test/ui/borrowck/regions-escape-bound-fn.rs b/tests/ui/borrowck/regions-escape-bound-fn.rs
index f896ae7bd..f896ae7bd 100644
--- a/src/test/ui/borrowck/regions-escape-bound-fn.rs
+++ b/tests/ui/borrowck/regions-escape-bound-fn.rs
diff --git a/src/test/ui/borrowck/regions-escape-bound-fn.stderr b/tests/ui/borrowck/regions-escape-bound-fn.stderr
index a23fdacde..a23fdacde 100644
--- a/src/test/ui/borrowck/regions-escape-bound-fn.stderr
+++ b/tests/ui/borrowck/regions-escape-bound-fn.stderr
diff --git a/src/test/ui/borrowck/regions-escape-unboxed-closure.rs b/tests/ui/borrowck/regions-escape-unboxed-closure.rs
index f01e47122..f01e47122 100644
--- a/src/test/ui/borrowck/regions-escape-unboxed-closure.rs
+++ b/tests/ui/borrowck/regions-escape-unboxed-closure.rs
diff --git a/src/test/ui/borrowck/regions-escape-unboxed-closure.stderr b/tests/ui/borrowck/regions-escape-unboxed-closure.stderr
index 153f77c89..153f77c89 100644
--- a/src/test/ui/borrowck/regions-escape-unboxed-closure.stderr
+++ b/tests/ui/borrowck/regions-escape-unboxed-closure.stderr
diff --git a/src/test/ui/borrowck/return-local-binding-from-desugaring.rs b/tests/ui/borrowck/return-local-binding-from-desugaring.rs
index c6643edf5..c6643edf5 100644
--- a/src/test/ui/borrowck/return-local-binding-from-desugaring.rs
+++ b/tests/ui/borrowck/return-local-binding-from-desugaring.rs
diff --git a/src/test/ui/borrowck/return-local-binding-from-desugaring.stderr b/tests/ui/borrowck/return-local-binding-from-desugaring.stderr
index 9f952542e..9f952542e 100644
--- a/src/test/ui/borrowck/return-local-binding-from-desugaring.stderr
+++ b/tests/ui/borrowck/return-local-binding-from-desugaring.stderr
diff --git a/src/test/ui/borrowck/slice-index-bounds-check-invalidation.rs b/tests/ui/borrowck/slice-index-bounds-check-invalidation.rs
index 0e0e3cda6..0e0e3cda6 100644
--- a/src/test/ui/borrowck/slice-index-bounds-check-invalidation.rs
+++ b/tests/ui/borrowck/slice-index-bounds-check-invalidation.rs
diff --git a/src/test/ui/borrowck/slice-index-bounds-check-invalidation.stderr b/tests/ui/borrowck/slice-index-bounds-check-invalidation.stderr
index f9ed16f19..f9ed16f19 100644
--- a/src/test/ui/borrowck/slice-index-bounds-check-invalidation.stderr
+++ b/tests/ui/borrowck/slice-index-bounds-check-invalidation.stderr
diff --git a/src/test/ui/borrowck/suggest-as-ref-on-mut-closure.rs b/tests/ui/borrowck/suggest-as-ref-on-mut-closure.rs
index 1dcf04618..1dcf04618 100644
--- a/src/test/ui/borrowck/suggest-as-ref-on-mut-closure.rs
+++ b/tests/ui/borrowck/suggest-as-ref-on-mut-closure.rs
diff --git a/src/test/ui/borrowck/suggest-as-ref-on-mut-closure.stderr b/tests/ui/borrowck/suggest-as-ref-on-mut-closure.stderr
index b1af090ae..4621d8793 100644
--- a/src/test/ui/borrowck/suggest-as-ref-on-mut-closure.stderr
+++ b/tests/ui/borrowck/suggest-as-ref-on-mut-closure.stderr
@@ -8,11 +8,8 @@ LL |     cb.map(|cb| cb());
    |     help: consider calling `.as_ref()` or `.as_mut()` to borrow the type's contents
    |     move occurs because `*cb` has type `Option<&mut dyn FnMut()>`, which does not implement the `Copy` trait
    |
-note: this function takes ownership of the receiver `self`, which moves `*cb`
+note: `Option::<T>::map` takes ownership of the receiver `self`, which moves `*cb`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL |     pub const fn map<U, F>(self, f: F) -> Option<U>
-   |                            ^^^^
 
 error[E0596]: cannot borrow `*cb` as mutable, as it is behind a `&` reference
   --> $DIR/suggest-as-ref-on-mut-closure.rs:12:26
diff --git a/src/test/ui/borrowck/suggest-assign-rvalue.rs b/tests/ui/borrowck/suggest-assign-rvalue.rs
index aaca9d47f..aaca9d47f 100644
--- a/src/test/ui/borrowck/suggest-assign-rvalue.rs
+++ b/tests/ui/borrowck/suggest-assign-rvalue.rs
diff --git a/src/test/ui/borrowck/suggest-assign-rvalue.stderr b/tests/ui/borrowck/suggest-assign-rvalue.stderr
index 92acba640..92acba640 100644
--- a/src/test/ui/borrowck/suggest-assign-rvalue.stderr
+++ b/tests/ui/borrowck/suggest-assign-rvalue.stderr
diff --git a/src/test/ui/borrowck/suggest-local-var-double-mut.rs b/tests/ui/borrowck/suggest-local-var-double-mut.rs
index d5996ba68..d5996ba68 100644
--- a/src/test/ui/borrowck/suggest-local-var-double-mut.rs
+++ b/tests/ui/borrowck/suggest-local-var-double-mut.rs
diff --git a/src/test/ui/borrowck/suggest-local-var-double-mut.stderr b/tests/ui/borrowck/suggest-local-var-double-mut.stderr
index 3a43c18a7..3a43c18a7 100644
--- a/src/test/ui/borrowck/suggest-local-var-double-mut.stderr
+++ b/tests/ui/borrowck/suggest-local-var-double-mut.stderr
diff --git a/src/test/ui/borrowck/suggest-local-var-for-vector.rs b/tests/ui/borrowck/suggest-local-var-for-vector.rs
index 40f013f6a..40f013f6a 100644
--- a/src/test/ui/borrowck/suggest-local-var-for-vector.rs
+++ b/tests/ui/borrowck/suggest-local-var-for-vector.rs
diff --git a/src/test/ui/borrowck/suggest-local-var-for-vector.stderr b/tests/ui/borrowck/suggest-local-var-for-vector.stderr
index 615fffcd5..615fffcd5 100644
--- a/src/test/ui/borrowck/suggest-local-var-for-vector.stderr
+++ b/tests/ui/borrowck/suggest-local-var-for-vector.stderr
diff --git a/src/test/ui/borrowck/suggest-local-var-imm-and-mut.rs b/tests/ui/borrowck/suggest-local-var-imm-and-mut.rs
index bf167ba79..bf167ba79 100644
--- a/src/test/ui/borrowck/suggest-local-var-imm-and-mut.rs
+++ b/tests/ui/borrowck/suggest-local-var-imm-and-mut.rs
diff --git a/src/test/ui/borrowck/suggest-local-var-imm-and-mut.stderr b/tests/ui/borrowck/suggest-local-var-imm-and-mut.stderr
index eb934e7b7..eb934e7b7 100644
--- a/src/test/ui/borrowck/suggest-local-var-imm-and-mut.stderr
+++ b/tests/ui/borrowck/suggest-local-var-imm-and-mut.stderr
diff --git a/src/test/ui/borrowck/suggest-storing-local-var-for-vector.rs b/tests/ui/borrowck/suggest-storing-local-var-for-vector.rs
index 40f013f6a..40f013f6a 100644
--- a/src/test/ui/borrowck/suggest-storing-local-var-for-vector.rs
+++ b/tests/ui/borrowck/suggest-storing-local-var-for-vector.rs
diff --git a/src/test/ui/borrowck/suggest-storing-local-var-for-vector.stderr b/tests/ui/borrowck/suggest-storing-local-var-for-vector.stderr
index e3a16eddf..e3a16eddf 100644
--- a/src/test/ui/borrowck/suggest-storing-local-var-for-vector.stderr
+++ b/tests/ui/borrowck/suggest-storing-local-var-for-vector.stderr
diff --git a/src/test/ui/borrowck/two-phase-across-loop.rs b/tests/ui/borrowck/two-phase-across-loop.rs
index 3fcea7d17..3fcea7d17 100644
--- a/src/test/ui/borrowck/two-phase-across-loop.rs
+++ b/tests/ui/borrowck/two-phase-across-loop.rs
diff --git a/src/test/ui/borrowck/two-phase-across-loop.stderr b/tests/ui/borrowck/two-phase-across-loop.stderr
index 22f9b39df..22f9b39df 100644
--- a/src/test/ui/borrowck/two-phase-across-loop.stderr
+++ b/tests/ui/borrowck/two-phase-across-loop.stderr
diff --git a/src/test/ui/borrowck/two-phase-activation-sharing-interference.nll_target.stderr b/tests/ui/borrowck/two-phase-activation-sharing-interference.nll_target.stderr
index aacf17893..aacf17893 100644
--- a/src/test/ui/borrowck/two-phase-activation-sharing-interference.nll_target.stderr
+++ b/tests/ui/borrowck/two-phase-activation-sharing-interference.nll_target.stderr
diff --git a/src/test/ui/borrowck/two-phase-activation-sharing-interference.rs b/tests/ui/borrowck/two-phase-activation-sharing-interference.rs
index 8b880ff64..8b880ff64 100644
--- a/src/test/ui/borrowck/two-phase-activation-sharing-interference.rs
+++ b/tests/ui/borrowck/two-phase-activation-sharing-interference.rs
diff --git a/src/test/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr b/tests/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr
index a57ceb847..a57ceb847 100644
--- a/src/test/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr
+++ b/tests/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr
diff --git a/src/test/ui/borrowck/two-phase-allow-access-during-reservation.rs b/tests/ui/borrowck/two-phase-allow-access-during-reservation.rs
index 67d084207..67d084207 100644
--- a/src/test/ui/borrowck/two-phase-allow-access-during-reservation.rs
+++ b/tests/ui/borrowck/two-phase-allow-access-during-reservation.rs
diff --git a/src/test/ui/borrowck/two-phase-baseline.rs b/tests/ui/borrowck/two-phase-baseline.rs
index 994dc823d..994dc823d 100644
--- a/src/test/ui/borrowck/two-phase-baseline.rs
+++ b/tests/ui/borrowck/two-phase-baseline.rs
diff --git a/src/test/ui/borrowck/two-phase-bin-ops.rs b/tests/ui/borrowck/two-phase-bin-ops.rs
index 1242ae307..1242ae307 100644
--- a/src/test/ui/borrowck/two-phase-bin-ops.rs
+++ b/tests/ui/borrowck/two-phase-bin-ops.rs
diff --git a/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.rs b/tests/ui/borrowck/two-phase-cannot-nest-mut-self-calls.rs
index dd2ef4e27..dd2ef4e27 100644
--- a/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.rs
+++ b/tests/ui/borrowck/two-phase-cannot-nest-mut-self-calls.rs
diff --git a/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr b/tests/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr
index 21b0eddb9..21b0eddb9 100644
--- a/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr
+++ b/tests/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr
diff --git a/src/test/ui/borrowck/two-phase-control-flow-split-before-activation.rs b/tests/ui/borrowck/two-phase-control-flow-split-before-activation.rs
index 0b20e1945..0b20e1945 100644
--- a/src/test/ui/borrowck/two-phase-control-flow-split-before-activation.rs
+++ b/tests/ui/borrowck/two-phase-control-flow-split-before-activation.rs
diff --git a/src/test/ui/borrowck/two-phase-method-receivers.rs b/tests/ui/borrowck/two-phase-method-receivers.rs
index 6b879af5a..6b879af5a 100644
--- a/src/test/ui/borrowck/two-phase-method-receivers.rs
+++ b/tests/ui/borrowck/two-phase-method-receivers.rs
diff --git a/src/test/ui/borrowck/two-phase-multi-mut.rs b/tests/ui/borrowck/two-phase-multi-mut.rs
index bb646d7ca..bb646d7ca 100644
--- a/src/test/ui/borrowck/two-phase-multi-mut.rs
+++ b/tests/ui/borrowck/two-phase-multi-mut.rs
diff --git a/src/test/ui/borrowck/two-phase-multi-mut.stderr b/tests/ui/borrowck/two-phase-multi-mut.stderr
index 2e53e17a3..2e53e17a3 100644
--- a/src/test/ui/borrowck/two-phase-multi-mut.stderr
+++ b/tests/ui/borrowck/two-phase-multi-mut.stderr
diff --git a/src/test/ui/borrowck/two-phase-multiple-activations.rs b/tests/ui/borrowck/two-phase-multiple-activations.rs
index 53fb71ebe..53fb71ebe 100644
--- a/src/test/ui/borrowck/two-phase-multiple-activations.rs
+++ b/tests/ui/borrowck/two-phase-multiple-activations.rs
diff --git a/src/test/ui/borrowck/two-phase-nonrecv-autoref.base.stderr b/tests/ui/borrowck/two-phase-nonrecv-autoref.base.stderr
index efd63a08a..efd63a08a 100644
--- a/src/test/ui/borrowck/two-phase-nonrecv-autoref.base.stderr
+++ b/tests/ui/borrowck/two-phase-nonrecv-autoref.base.stderr
diff --git a/src/test/ui/borrowck/two-phase-nonrecv-autoref.rs b/tests/ui/borrowck/two-phase-nonrecv-autoref.rs
index da238205b..da238205b 100644
--- a/src/test/ui/borrowck/two-phase-nonrecv-autoref.rs
+++ b/tests/ui/borrowck/two-phase-nonrecv-autoref.rs
diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.rs b/tests/ui/borrowck/two-phase-reservation-sharing-interference-2.rs
index 27e599c6c..27e599c6c 100644
--- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.rs
+++ b/tests/ui/borrowck/two-phase-reservation-sharing-interference-2.rs
diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr b/tests/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr
index 9e0f68b65..9e0f68b65 100644
--- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr
+++ b/tests/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr
diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference.nll_target.stderr b/tests/ui/borrowck/two-phase-reservation-sharing-interference.nll_target.stderr
index e3e4057d6..e3e4057d6 100644
--- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference.nll_target.stderr
+++ b/tests/ui/borrowck/two-phase-reservation-sharing-interference.nll_target.stderr
diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference.rs b/tests/ui/borrowck/two-phase-reservation-sharing-interference.rs
index 0463e22b3..0463e22b3 100644
--- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference.rs
+++ b/tests/ui/borrowck/two-phase-reservation-sharing-interference.rs
diff --git a/src/test/ui/borrowck/two-phase-sneaky.rs b/tests/ui/borrowck/two-phase-sneaky.rs
index bf06366de..bf06366de 100644
--- a/src/test/ui/borrowck/two-phase-sneaky.rs
+++ b/tests/ui/borrowck/two-phase-sneaky.rs
diff --git a/src/test/ui/borrowck/two-phase-sneaky.stderr b/tests/ui/borrowck/two-phase-sneaky.stderr
index 117d7ceae..117d7ceae 100644
--- a/src/test/ui/borrowck/two-phase-sneaky.stderr
+++ b/tests/ui/borrowck/two-phase-sneaky.stderr
diff --git a/src/test/ui/borrowck/two-phase-surprise-no-conflict.rs b/tests/ui/borrowck/two-phase-surprise-no-conflict.rs
index 6d37d1ded..6d37d1ded 100644
--- a/src/test/ui/borrowck/two-phase-surprise-no-conflict.rs
+++ b/tests/ui/borrowck/two-phase-surprise-no-conflict.rs
diff --git a/src/test/ui/borrowck/two-phase-surprise-no-conflict.stderr b/tests/ui/borrowck/two-phase-surprise-no-conflict.stderr
index 5a240d900..5a240d900 100644
--- a/src/test/ui/borrowck/two-phase-surprise-no-conflict.stderr
+++ b/tests/ui/borrowck/two-phase-surprise-no-conflict.stderr
diff --git a/tests/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.fixed b/tests/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.fixed
new file mode 100644
index 000000000..b0c537610
--- /dev/null
+++ b/tests/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.fixed
@@ -0,0 +1,15 @@
+// run-rustfix
+// Test that a by-ref `FnMut` closure gets an error when it tries to
+// consume a value.
+
+fn call<F>(f: F) where F : Fn() {
+    f();
+}
+
+fn main() {
+    let y = vec![format!("World")];
+    call(|| {
+        y.clone().into_iter();
+        //~^ ERROR cannot move out of `y`, a captured variable in an `Fn` closure
+    });
+}
diff --git a/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.rs b/tests/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.rs
index d54b09c5d..4666b8a33 100644
--- a/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.rs
+++ b/tests/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.rs
@@ -1,3 +1,4 @@
+// run-rustfix
 // Test that a by-ref `FnMut` closure gets an error when it tries to
 // consume a value.
 
diff --git a/tests/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr b/tests/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr
new file mode 100644
index 000000000..f033d53bf
--- /dev/null
+++ b/tests/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr
@@ -0,0 +1,22 @@
+error[E0507]: cannot move out of `y`, a captured variable in an `Fn` closure
+  --> $DIR/unboxed-closures-move-upvar-from-non-once-ref-closure.rs:12:9
+   |
+LL |     let y = vec![format!("World")];
+   |         - captured outer variable
+LL |     call(|| {
+   |          -- captured by this `Fn` closure
+LL |         y.into_iter();
+   |         ^ ----------- `y` moved due to this method call
+   |         |
+   |         move occurs because `y` has type `Vec<String>`, which does not implement the `Copy` trait
+   |
+note: `into_iter` takes ownership of the receiver `self`, which moves `y`
+  --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
+help: you can `clone` the value and consume it, but this might not be your desired behavior
+   |
+LL |         y.clone().into_iter();
+   |           ++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/bounds-lifetime.rs b/tests/ui/bounds-lifetime.rs
index 31aa4011b..31aa4011b 100644
--- a/src/test/ui/bounds-lifetime.rs
+++ b/tests/ui/bounds-lifetime.rs
diff --git a/src/test/ui/bounds-lifetime.stderr b/tests/ui/bounds-lifetime.stderr
index a0395ed49..a0395ed49 100644
--- a/src/test/ui/bounds-lifetime.stderr
+++ b/tests/ui/bounds-lifetime.stderr
diff --git a/src/test/ui/box/alloc-unstable-fail.rs b/tests/ui/box/alloc-unstable-fail.rs
index 942757164..942757164 100644
--- a/src/test/ui/box/alloc-unstable-fail.rs
+++ b/tests/ui/box/alloc-unstable-fail.rs
diff --git a/src/test/ui/box/alloc-unstable-fail.stderr b/tests/ui/box/alloc-unstable-fail.stderr
index 03ae36e88..03ae36e88 100644
--- a/src/test/ui/box/alloc-unstable-fail.stderr
+++ b/tests/ui/box/alloc-unstable-fail.stderr
diff --git a/src/test/ui/box/alloc-unstable.rs b/tests/ui/box/alloc-unstable.rs
index 66388d0d5..66388d0d5 100644
--- a/src/test/ui/box/alloc-unstable.rs
+++ b/tests/ui/box/alloc-unstable.rs
diff --git a/src/test/ui/box/into-boxed-slice-fail.rs b/tests/ui/box/into-boxed-slice-fail.rs
index 49dbb170f..49dbb170f 100644
--- a/src/test/ui/box/into-boxed-slice-fail.rs
+++ b/tests/ui/box/into-boxed-slice-fail.rs
diff --git a/src/test/ui/box/into-boxed-slice-fail.stderr b/tests/ui/box/into-boxed-slice-fail.stderr
index de654fdc1..f102f666d 100644
--- a/src/test/ui/box/into-boxed-slice-fail.stderr
+++ b/tests/ui/box/into-boxed-slice-fail.stderr
@@ -9,9 +9,6 @@ LL |     let _ = Box::into_boxed_slice(boxed_slice);
    = help: the trait `Sized` is not implemented for `[u8]`
 note: required by a bound in `Box::<T, A>::into_boxed_slice`
   --> $SRC_DIR/alloc/src/boxed.rs:LL:COL
-   |
-LL | impl<T, A: Allocator> Box<T, A> {
-   |      ^ required by this bound in `Box::<T, A>::into_boxed_slice`
 
 error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
   --> $DIR/into-boxed-slice-fail.rs:7:13
@@ -33,9 +30,6 @@ LL |     let _ = Box::into_boxed_slice(boxed_trait);
    = help: the trait `Sized` is not implemented for `dyn Debug`
 note: required by a bound in `Box::<T, A>::into_boxed_slice`
   --> $SRC_DIR/alloc/src/boxed.rs:LL:COL
-   |
-LL | impl<T, A: Allocator> Box<T, A> {
-   |      ^ required by this bound in `Box::<T, A>::into_boxed_slice`
 
 error[E0277]: the size for values of type `dyn Debug` cannot be known at compilation time
   --> $DIR/into-boxed-slice-fail.rs:11:13
diff --git a/src/test/ui/box/into-boxed-slice.rs b/tests/ui/box/into-boxed-slice.rs
index 61b3d9152..61b3d9152 100644
--- a/src/test/ui/box/into-boxed-slice.rs
+++ b/tests/ui/box/into-boxed-slice.rs
diff --git a/src/test/ui/box/issue-82446.rs b/tests/ui/box/issue-82446.rs
index 2960f7fbc..2960f7fbc 100644
--- a/src/test/ui/box/issue-82446.rs
+++ b/tests/ui/box/issue-82446.rs
diff --git a/src/test/ui/box/issue-82446.stderr b/tests/ui/box/issue-82446.stderr
index 037473795..037473795 100644
--- a/src/test/ui/box/issue-82446.stderr
+++ b/tests/ui/box/issue-82446.stderr
diff --git a/src/test/ui/box/issue-95036.rs b/tests/ui/box/issue-95036.rs
index 0611fabc1..0611fabc1 100644
--- a/src/test/ui/box/issue-95036.rs
+++ b/tests/ui/box/issue-95036.rs
diff --git a/src/test/ui/box/large-allocator-ice.rs b/tests/ui/box/large-allocator-ice.rs
index b3a882ff0..b3a882ff0 100644
--- a/src/test/ui/box/large-allocator-ice.rs
+++ b/tests/ui/box/large-allocator-ice.rs
diff --git a/src/test/ui/box/leak-alloc.rs b/tests/ui/box/leak-alloc.rs
index 3f0f39f44..3f0f39f44 100644
--- a/src/test/ui/box/leak-alloc.rs
+++ b/tests/ui/box/leak-alloc.rs
diff --git a/src/test/ui/box/leak-alloc.stderr b/tests/ui/box/leak-alloc.stderr
index e8a6ad099..e8a6ad099 100644
--- a/src/test/ui/box/leak-alloc.stderr
+++ b/tests/ui/box/leak-alloc.stderr
diff --git a/src/test/ui/box/new-box-syntax.rs b/tests/ui/box/new-box-syntax.rs
index c56e1dd46..c56e1dd46 100644
--- a/src/test/ui/box/new-box-syntax.rs
+++ b/tests/ui/box/new-box-syntax.rs
diff --git a/src/test/ui/box/new-box.rs b/tests/ui/box/new-box.rs
index 96a3b197f..96a3b197f 100644
--- a/src/test/ui/box/new-box.rs
+++ b/tests/ui/box/new-box.rs
diff --git a/src/test/ui/box/new.rs b/tests/ui/box/new.rs
index be1a40cf7..be1a40cf7 100644
--- a/src/test/ui/box/new.rs
+++ b/tests/ui/box/new.rs
diff --git a/src/test/ui/box/thin_align.rs b/tests/ui/box/thin_align.rs
index 3c61d0090..3c61d0090 100644
--- a/src/test/ui/box/thin_align.rs
+++ b/tests/ui/box/thin_align.rs
diff --git a/src/test/ui/box/thin_drop.rs b/tests/ui/box/thin_drop.rs
index 965613c11..965613c11 100644
--- a/src/test/ui/box/thin_drop.rs
+++ b/tests/ui/box/thin_drop.rs
diff --git a/src/test/ui/box/thin_new.rs b/tests/ui/box/thin_new.rs
index 53f46478b..53f46478b 100644
--- a/src/test/ui/box/thin_new.rs
+++ b/tests/ui/box/thin_new.rs
diff --git a/src/test/ui/box/thin_zst.rs b/tests/ui/box/thin_zst.rs
index 77c400d17..77c400d17 100644
--- a/src/test/ui/box/thin_zst.rs
+++ b/tests/ui/box/thin_zst.rs
diff --git a/src/test/ui/break-diverging-value.rs b/tests/ui/break-diverging-value.rs
index d070fddaf..d070fddaf 100644
--- a/src/test/ui/break-diverging-value.rs
+++ b/tests/ui/break-diverging-value.rs
diff --git a/src/test/ui/break-diverging-value.stderr b/tests/ui/break-diverging-value.stderr
index 69edcd240..69edcd240 100644
--- a/src/test/ui/break-diverging-value.stderr
+++ b/tests/ui/break-diverging-value.stderr
diff --git a/src/test/ui/btreemap/btreemap-index-mut.rs b/tests/ui/btreemap/btreemap-index-mut.rs
index 62972acab..62972acab 100644
--- a/src/test/ui/btreemap/btreemap-index-mut.rs
+++ b/tests/ui/btreemap/btreemap-index-mut.rs
diff --git a/src/test/ui/btreemap/btreemap-index-mut.stderr b/tests/ui/btreemap/btreemap-index-mut.stderr
index 26f2a4c4b..26f2a4c4b 100644
--- a/src/test/ui/btreemap/btreemap-index-mut.stderr
+++ b/tests/ui/btreemap/btreemap-index-mut.stderr
diff --git a/src/test/ui/btreemap/btreemap_dropck.rs b/tests/ui/btreemap/btreemap_dropck.rs
index c58727df3..c58727df3 100644
--- a/src/test/ui/btreemap/btreemap_dropck.rs
+++ b/tests/ui/btreemap/btreemap_dropck.rs
diff --git a/src/test/ui/btreemap/btreemap_dropck.stderr b/tests/ui/btreemap/btreemap_dropck.stderr
index e953e7ae8..e953e7ae8 100644
--- a/src/test/ui/btreemap/btreemap_dropck.stderr
+++ b/tests/ui/btreemap/btreemap_dropck.stderr
diff --git a/src/test/ui/btreemap/btreemap_into_iterator_lifetime.rs b/tests/ui/btreemap/btreemap_into_iterator_lifetime.rs
index fda825bc6..fda825bc6 100644
--- a/src/test/ui/btreemap/btreemap_into_iterator_lifetime.rs
+++ b/tests/ui/btreemap/btreemap_into_iterator_lifetime.rs
diff --git a/src/test/ui/builtin-clone-unwind.rs b/tests/ui/builtin-clone-unwind.rs
index 16add6ff2..16add6ff2 100644
--- a/src/test/ui/builtin-clone-unwind.rs
+++ b/tests/ui/builtin-clone-unwind.rs
diff --git a/src/test/ui/builtin-superkinds/auxiliary/trait_superkinds_in_metadata.rs b/tests/ui/builtin-superkinds/auxiliary/trait_superkinds_in_metadata.rs
index acfd1e13e..acfd1e13e 100644
--- a/src/test/ui/builtin-superkinds/auxiliary/trait_superkinds_in_metadata.rs
+++ b/tests/ui/builtin-superkinds/auxiliary/trait_superkinds_in_metadata.rs
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities-transitive.rs b/tests/ui/builtin-superkinds/builtin-superkinds-capabilities-transitive.rs
index 1f997d371..1f997d371 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities-transitive.rs
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-capabilities-transitive.rs
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities-xc.rs b/tests/ui/builtin-superkinds/builtin-superkinds-capabilities-xc.rs
index 8416bb3a3..8416bb3a3 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities-xc.rs
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-capabilities-xc.rs
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities.rs b/tests/ui/builtin-superkinds/builtin-superkinds-capabilities.rs
index e936f921a..e936f921a 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities.rs
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-capabilities.rs
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.rs b/tests/ui/builtin-superkinds/builtin-superkinds-double-superkind.rs
index e716489c2..e716489c2 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.rs
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-double-superkind.rs
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr b/tests/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr
index 492316f00..592aa4369 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr
@@ -1,8 +1,8 @@
 error[E0277]: `T` cannot be sent between threads safely
-  --> $DIR/builtin-superkinds-double-superkind.rs:6:24
+  --> $DIR/builtin-superkinds-double-superkind.rs:6:32
    |
 LL | impl <T: Sync+'static> Foo for (T,) { }
-   |                        ^^^ `T` cannot be sent between threads safely
+   |                                ^^^^ `T` cannot be sent between threads safely
    |
    = note: required because it appears within the type `(T,)`
 note: required by a bound in `Foo`
@@ -16,10 +16,10 @@ LL | impl <T: Sync+'static + std::marker::Send> Foo for (T,) { }
    |                       +++++++++++++++++++
 
 error[E0277]: `T` cannot be shared between threads safely
-  --> $DIR/builtin-superkinds-double-superkind.rs:9:16
+  --> $DIR/builtin-superkinds-double-superkind.rs:9:24
    |
 LL | impl <T: Send> Foo for (T,T) { }
-   |                ^^^ `T` cannot be shared between threads safely
+   |                        ^^^^^ `T` cannot be shared between threads safely
    |
    = note: required because it appears within the type `(T, T)`
 note: required by a bound in `Foo`
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.rs b/tests/ui/builtin-superkinds/builtin-superkinds-in-metadata.rs
index b4555a180..b4555a180 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.rs
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-in-metadata.rs
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr b/tests/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr
index a46e4b233..f9d548bb8 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr
@@ -1,8 +1,8 @@
 error[E0277]: `T` cannot be sent between threads safely
-  --> $DIR/builtin-superkinds-in-metadata.rs:13:23
+  --> $DIR/builtin-superkinds-in-metadata.rs:13:56
    |
 LL | impl <T:Sync+'static> RequiresRequiresShareAndSend for X<T> { }
-   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `T` cannot be sent between threads safely
+   |                                                        ^^^^ `T` cannot be sent between threads safely
    |
 note: required because it appears within the type `X<T>`
   --> $DIR/builtin-superkinds-in-metadata.rs:9:8
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata2.rs b/tests/ui/builtin-superkinds/builtin-superkinds-in-metadata2.rs
index cdde48871..cdde48871 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata2.rs
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-in-metadata2.rs
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-phantom-typaram.rs b/tests/ui/builtin-superkinds/builtin-superkinds-phantom-typaram.rs
index 9b80664b0..9b80664b0 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-phantom-typaram.rs
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-phantom-typaram.rs
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.rs b/tests/ui/builtin-superkinds/builtin-superkinds-self-type.rs
index 6fba87b31..6fba87b31 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.rs
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-self-type.rs
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.stderr b/tests/ui/builtin-superkinds/builtin-superkinds-self-type.stderr
index e2b177b95..e2b177b95 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.stderr
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-self-type.stderr
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-simple.rs b/tests/ui/builtin-superkinds/builtin-superkinds-simple.rs
index 1620f8d5c..1620f8d5c 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-simple.rs
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-simple.rs
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-simple.stderr b/tests/ui/builtin-superkinds/builtin-superkinds-simple.stderr
index 9db9cbfdb..8b19170b0 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-simple.stderr
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-simple.stderr
@@ -1,8 +1,8 @@
 error[E0277]: `Rc<i8>` cannot be sent between threads safely
-  --> $DIR/builtin-superkinds-simple.rs:6:6
+  --> $DIR/builtin-superkinds-simple.rs:6:14
    |
 LL | impl Foo for std::rc::Rc<i8> { }
-   |      ^^^ `Rc<i8>` cannot be sent between threads safely
+   |              ^^^^^^^^^^^^^^^ `Rc<i8>` cannot be sent between threads safely
    |
    = help: the trait `Send` is not implemented for `Rc<i8>`
 note: required by a bound in `Foo`
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-simple2.rs b/tests/ui/builtin-superkinds/builtin-superkinds-simple2.rs
index 8d2477157..8d2477157 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-simple2.rs
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-simple2.rs
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.rs b/tests/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.rs
index 74ae62711..74ae62711 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.rs
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.rs
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr b/tests/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr
index 3ec0b907d..0cfea72d5 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr
@@ -1,8 +1,8 @@
 error[E0277]: `T` cannot be sent between threads safely
-  --> $DIR/builtin-superkinds-typaram-not-send.rs:5:24
+  --> $DIR/builtin-superkinds-typaram-not-send.rs:5:32
    |
 LL | impl <T: Sync+'static> Foo for T { }
-   |                        ^^^ `T` cannot be sent between threads safely
+   |                                ^ `T` cannot be sent between threads safely
    |
 note: required by a bound in `Foo`
   --> $DIR/builtin-superkinds-typaram-not-send.rs:3:13
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-typaram.rs b/tests/ui/builtin-superkinds/builtin-superkinds-typaram.rs
index f999dfff7..f999dfff7 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-typaram.rs
+++ b/tests/ui/builtin-superkinds/builtin-superkinds-typaram.rs
diff --git a/tests/ui/by-move-pattern-binding.rs b/tests/ui/by-move-pattern-binding.rs
new file mode 100644
index 000000000..f68d18129
--- /dev/null
+++ b/tests/ui/by-move-pattern-binding.rs
@@ -0,0 +1,29 @@
+enum E {
+    Foo,
+    Bar(String)
+}
+
+struct S {
+    x: E
+}
+
+fn f(x: String) {}
+
+fn main() {
+    let s = S { x: E::Bar("hello".to_string()) };
+    match &s.x { //~ ERROR cannot move
+        &E::Foo => {}
+        &E::Bar(identifier) => f(identifier.clone())
+    };
+    match &s.x {
+        &E::Foo => {}
+        &E::Bar(ref identifier) => println!("{}", *identifier)
+    };
+    if let &E::Bar(identifier) = &s.x { //~ ERROR cannot move
+        f(identifier.clone());
+    };
+    let &E::Bar(identifier) = &s.x else { //~ ERROR cannot move
+        return;
+    };
+    f(identifier.clone());
+}
diff --git a/tests/ui/by-move-pattern-binding.stderr b/tests/ui/by-move-pattern-binding.stderr
new file mode 100644
index 000000000..203e37dc3
--- /dev/null
+++ b/tests/ui/by-move-pattern-binding.stderr
@@ -0,0 +1,51 @@
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/by-move-pattern-binding.rs:14:11
+   |
+LL |     match &s.x {
+   |           ^^^^
+LL |         &E::Foo => {}
+LL |         &E::Bar(identifier) => f(identifier.clone())
+   |                 ----------
+   |                 |
+   |                 data moved here
+   |                 move occurs because `identifier` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -         &E::Bar(identifier) => f(identifier.clone())
+LL +         E::Bar(identifier) => f(identifier.clone())
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/by-move-pattern-binding.rs:22:34
+   |
+LL |     if let &E::Bar(identifier) = &s.x {
+   |                    ----------    ^^^^
+   |                    |
+   |                    data moved here
+   |                    move occurs because `identifier` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     if let &E::Bar(identifier) = &s.x {
+LL +     if let E::Bar(identifier) = &s.x {
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/by-move-pattern-binding.rs:25:31
+   |
+LL |     let &E::Bar(identifier) = &s.x else {
+   |                 ----------    ^^^^
+   |                 |
+   |                 data moved here
+   |                 move occurs because `identifier` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     let &E::Bar(identifier) = &s.x else {
+LL +     let E::Bar(identifier) = &s.x else {
+   |
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/c-variadic/feature-gate-extended_varargs_abi_support.rs b/tests/ui/c-variadic/feature-gate-extended_varargs_abi_support.rs
index 087743e50..fce6210b2 100644
--- a/src/test/ui/c-variadic/feature-gate-extended_varargs_abi_support.rs
+++ b/tests/ui/c-variadic/feature-gate-extended_varargs_abi_support.rs
@@ -1,5 +1,3 @@
-#![feature(abi_efiapi)]
-
 fn efiapi(f: extern "efiapi" fn(usize, ...)) {
     //~^ ERROR: C-variadic function must have a compatible calling convention, like `C` or `cdecl`
     //~^^ ERROR: using calling conventions other than `C` or `cdecl` for varargs functions is unstable
diff --git a/src/test/ui/c-variadic/feature-gate-extended_varargs_abi_support.stderr b/tests/ui/c-variadic/feature-gate-extended_varargs_abi_support.stderr
index 007d7d795..5b97b396f 100644
--- a/src/test/ui/c-variadic/feature-gate-extended_varargs_abi_support.stderr
+++ b/tests/ui/c-variadic/feature-gate-extended_varargs_abi_support.stderr
@@ -1,5 +1,5 @@
 error[E0658]: using calling conventions other than `C` or `cdecl` for varargs functions is unstable
-  --> $DIR/feature-gate-extended_varargs_abi_support.rs:3:14
+  --> $DIR/feature-gate-extended_varargs_abi_support.rs:1:14
    |
 LL | fn efiapi(f: extern "efiapi" fn(usize, ...)) {
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -8,13 +8,13 @@ LL | fn efiapi(f: extern "efiapi" fn(usize, ...)) {
    = help: add `#![feature(extended_varargs_abi_support)]` to the crate attributes to enable
 
 error[E0045]: C-variadic function must have a compatible calling convention, like `C` or `cdecl`
-  --> $DIR/feature-gate-extended_varargs_abi_support.rs:3:14
+  --> $DIR/feature-gate-extended_varargs_abi_support.rs:1:14
    |
 LL | fn efiapi(f: extern "efiapi" fn(usize, ...)) {
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ C-variadic function must have a compatible calling convention
 
 error[E0658]: using calling conventions other than `C` or `cdecl` for varargs functions is unstable
-  --> $DIR/feature-gate-extended_varargs_abi_support.rs:8:12
+  --> $DIR/feature-gate-extended_varargs_abi_support.rs:6:12
    |
 LL | fn sysv(f: extern "sysv64" fn(usize, ...)) {
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -23,13 +23,13 @@ LL | fn sysv(f: extern "sysv64" fn(usize, ...)) {
    = help: add `#![feature(extended_varargs_abi_support)]` to the crate attributes to enable
 
 error[E0045]: C-variadic function must have a compatible calling convention, like `C` or `cdecl`
-  --> $DIR/feature-gate-extended_varargs_abi_support.rs:8:12
+  --> $DIR/feature-gate-extended_varargs_abi_support.rs:6:12
    |
 LL | fn sysv(f: extern "sysv64" fn(usize, ...)) {
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ C-variadic function must have a compatible calling convention
 
 error[E0658]: using calling conventions other than `C` or `cdecl` for varargs functions is unstable
-  --> $DIR/feature-gate-extended_varargs_abi_support.rs:13:11
+  --> $DIR/feature-gate-extended_varargs_abi_support.rs:11:11
    |
 LL | fn win(f: extern "win64" fn(usize, ...)) {
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -38,7 +38,7 @@ LL | fn win(f: extern "win64" fn(usize, ...)) {
    = help: add `#![feature(extended_varargs_abi_support)]` to the crate attributes to enable
 
 error[E0045]: C-variadic function must have a compatible calling convention, like `C` or `cdecl`
-  --> $DIR/feature-gate-extended_varargs_abi_support.rs:13:11
+  --> $DIR/feature-gate-extended_varargs_abi_support.rs:11:11
    |
 LL | fn win(f: extern "win64" fn(usize, ...)) {
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ C-variadic function must have a compatible calling convention
diff --git a/src/test/ui/c-variadic/issue-32201.rs b/tests/ui/c-variadic/issue-32201.rs
index f27bb1c2e..f27bb1c2e 100644
--- a/src/test/ui/c-variadic/issue-32201.rs
+++ b/tests/ui/c-variadic/issue-32201.rs
diff --git a/src/test/ui/c-variadic/issue-32201.stderr b/tests/ui/c-variadic/issue-32201.stderr
index cedb58784..cedb58784 100644
--- a/src/test/ui/c-variadic/issue-32201.stderr
+++ b/tests/ui/c-variadic/issue-32201.stderr
diff --git a/src/test/ui/c-variadic/issue-86053-1.rs b/tests/ui/c-variadic/issue-86053-1.rs
index b30548e19..49d5c0390 100644
--- a/src/test/ui/c-variadic/issue-86053-1.rs
+++ b/tests/ui/c-variadic/issue-86053-1.rs
@@ -2,7 +2,7 @@
 // error-pattern:unexpected `self` parameter in function
 // error-pattern:`...` must be the last argument of a C-variadic function
 // error-pattern:cannot find type `F` in this scope
-// error-pattern:in type `&'a &'b usize`, reference has a longer lifetime than the data it references
+
 
 #![feature(c_variadic)]
 #![crate_type="lib"]
diff --git a/tests/ui/c-variadic/issue-86053-1.stderr b/tests/ui/c-variadic/issue-86053-1.stderr
new file mode 100644
index 000000000..5a02f4aa9
--- /dev/null
+++ b/tests/ui/c-variadic/issue-86053-1.stderr
@@ -0,0 +1,81 @@
+error: expected type, found `,`
+  --> $DIR/issue-86053-1.rs:10:47
+   |
+LL | fn ordering4 < 'a , 'b     > ( a :            ,   self , self ,   self ,
+   |                                               ^ expected type
+
+error: unexpected `self` parameter in function
+  --> $DIR/issue-86053-1.rs:10:51
+   |
+LL | fn ordering4 < 'a , 'b     > ( a :            ,   self , self ,   self ,
+   |                                                   ^^^^ must be the first parameter of an associated function
+
+error: unexpected `self` parameter in function
+  --> $DIR/issue-86053-1.rs:10:58
+   |
+LL | fn ordering4 < 'a , 'b     > ( a :            ,   self , self ,   self ,
+   |                                                          ^^^^ must be the first parameter of an associated function
+
+error: unexpected `self` parameter in function
+  --> $DIR/issue-86053-1.rs:10:67
+   |
+LL | fn ordering4 < 'a , 'b     > ( a :            ,   self , self ,   self ,
+   |                                                                   ^^^^ must be the first parameter of an associated function
+
+error: unexpected `self` parameter in function
+  --> $DIR/issue-86053-1.rs:11:5
+   |
+LL |     self , ... ,   self ,   self , ... ) where F : FnOnce ( & 'a & 'b usize ) {
+   |     ^^^^ must be the first parameter of an associated function
+
+error: unexpected `self` parameter in function
+  --> $DIR/issue-86053-1.rs:11:20
+   |
+LL |     self , ... ,   self ,   self , ... ) where F : FnOnce ( & 'a & 'b usize ) {
+   |                    ^^^^ must be the first parameter of an associated function
+
+error: unexpected `self` parameter in function
+  --> $DIR/issue-86053-1.rs:11:29
+   |
+LL |     self , ... ,   self ,   self , ... ) where F : FnOnce ( & 'a & 'b usize ) {
+   |                             ^^^^ must be the first parameter of an associated function
+
+error: `...` must be the last argument of a C-variadic function
+  --> $DIR/issue-86053-1.rs:11:12
+   |
+LL |     self , ... ,   self ,   self , ... ) where F : FnOnce ( & 'a & 'b usize ) {
+   |            ^^^
+
+error: only foreign or `unsafe extern "C"` functions may be C-variadic
+  --> $DIR/issue-86053-1.rs:11:12
+   |
+LL |     self , ... ,   self ,   self , ... ) where F : FnOnce ( & 'a & 'b usize ) {
+   |            ^^^
+
+error: only foreign or `unsafe extern "C"` functions may be C-variadic
+  --> $DIR/issue-86053-1.rs:11:36
+   |
+LL |     self , ... ,   self ,   self , ... ) where F : FnOnce ( & 'a & 'b usize ) {
+   |                                    ^^^
+
+error[E0412]: cannot find type `F` in this scope
+  --> $DIR/issue-86053-1.rs:11:48
+   |
+LL |     self , ... ,   self ,   self , ... ) where F : FnOnce ( & 'a & 'b usize ) {
+   |                                                ^
+  --> $SRC_DIR/core/src/ops/function.rs:LL:COL
+   |
+   = note: similarly named trait `Fn` defined here
+   |
+help: a trait with a similar name exists
+   |
+LL |     self , ... ,   self ,   self , ... ) where Fn : FnOnce ( & 'a & 'b usize ) {
+   |                                                ~~
+help: you might be missing a type parameter
+   |
+LL | fn ordering4 < 'a , 'b, F     > ( a :            ,   self , self ,   self ,
+   |                       +++
+
+error: aborting due to 11 previous errors
+
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/c-variadic/issue-86053-2.rs b/tests/ui/c-variadic/issue-86053-2.rs
index c545831f7..c545831f7 100644
--- a/src/test/ui/c-variadic/issue-86053-2.rs
+++ b/tests/ui/c-variadic/issue-86053-2.rs
diff --git a/src/test/ui/c-variadic/issue-86053-2.stderr b/tests/ui/c-variadic/issue-86053-2.stderr
index 815b06e77..815b06e77 100644
--- a/src/test/ui/c-variadic/issue-86053-2.stderr
+++ b/tests/ui/c-variadic/issue-86053-2.stderr
diff --git a/src/test/ui/c-variadic/variadic-ffi-1.rs b/tests/ui/c-variadic/variadic-ffi-1.rs
index 24407a71c..acd8a25dc 100644
--- a/src/test/ui/c-variadic/variadic-ffi-1.rs
+++ b/tests/ui/c-variadic/variadic-ffi-1.rs
@@ -19,8 +19,8 @@ extern "C" fn bar(f: isize, x: u8) {}
 
 fn main() {
     unsafe {
-        foo(); //~ ERROR this function takes at least 2 arguments but 0 arguments were supplied
-        foo(1); //~ ERROR this function takes at least 2 arguments but 1 argument was supplied
+        foo(); //~ ERROR function takes at least 2 arguments but 0 arguments were supplied
+        foo(1); //~ ERROR function takes at least 2 arguments but 1 argument was supplied
 
         let x: unsafe extern "C" fn(f: isize, x: u8) = foo; //~ ERROR mismatched types
         let y: extern "C" fn(f: isize, x: u8, ...) = bar; //~ ERROR mismatched types
diff --git a/src/test/ui/c-variadic/variadic-ffi-1.stderr b/tests/ui/c-variadic/variadic-ffi-1.stderr
index 4beea83d8..4beea83d8 100644
--- a/src/test/ui/c-variadic/variadic-ffi-1.stderr
+++ b/tests/ui/c-variadic/variadic-ffi-1.stderr
diff --git a/src/test/ui/c-variadic/variadic-ffi-2.rs b/tests/ui/c-variadic/variadic-ffi-2.rs
index 96cea8754..c34b7e55f 100644
--- a/src/test/ui/c-variadic/variadic-ffi-2.rs
+++ b/tests/ui/c-variadic/variadic-ffi-2.rs
@@ -1,6 +1,5 @@
 // ignore-arm stdcall isn't supported
 #![feature(extended_varargs_abi_support)]
-#![feature(abi_efiapi)]
 
 fn baz(f: extern "stdcall" fn(usize, ...)) {
     //~^ ERROR: C-variadic function must have a compatible calling convention,
diff --git a/src/test/ui/c-variadic/variadic-ffi-2.stderr b/tests/ui/c-variadic/variadic-ffi-2.stderr
index 4e74c9d92..e21001eca 100644
--- a/src/test/ui/c-variadic/variadic-ffi-2.stderr
+++ b/tests/ui/c-variadic/variadic-ffi-2.stderr
@@ -1,5 +1,5 @@
 error[E0045]: C-variadic function must have a compatible calling convention, like `C`, `cdecl`, `win64`, `sysv64` or `efiapi`
-  --> $DIR/variadic-ffi-2.rs:5:11
+  --> $DIR/variadic-ffi-2.rs:4:11
    |
 LL | fn baz(f: extern "stdcall" fn(usize, ...)) {
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ C-variadic function must have a compatible calling convention
diff --git a/src/test/ui/c-variadic/variadic-ffi-4.rs b/tests/ui/c-variadic/variadic-ffi-4.rs
index 806403794..806403794 100644
--- a/src/test/ui/c-variadic/variadic-ffi-4.rs
+++ b/tests/ui/c-variadic/variadic-ffi-4.rs
diff --git a/src/test/ui/c-variadic/variadic-ffi-4.stderr b/tests/ui/c-variadic/variadic-ffi-4.stderr
index 6f8e53298..6f8e53298 100644
--- a/src/test/ui/c-variadic/variadic-ffi-4.stderr
+++ b/tests/ui/c-variadic/variadic-ffi-4.stderr
diff --git a/src/test/ui/c-variadic/variadic-ffi-6.rs b/tests/ui/c-variadic/variadic-ffi-6.rs
index 4dd8a2d45..4dd8a2d45 100644
--- a/src/test/ui/c-variadic/variadic-ffi-6.rs
+++ b/tests/ui/c-variadic/variadic-ffi-6.rs
diff --git a/src/test/ui/c-variadic/variadic-ffi-6.stderr b/tests/ui/c-variadic/variadic-ffi-6.stderr
index 4c7792d96..4c7792d96 100644
--- a/src/test/ui/c-variadic/variadic-ffi-6.stderr
+++ b/tests/ui/c-variadic/variadic-ffi-6.stderr
diff --git a/src/test/ui/c-variadic/variadic-ffi-no-fixed-args.rs b/tests/ui/c-variadic/variadic-ffi-no-fixed-args.rs
index 588c15a18..588c15a18 100644
--- a/src/test/ui/c-variadic/variadic-ffi-no-fixed-args.rs
+++ b/tests/ui/c-variadic/variadic-ffi-no-fixed-args.rs
diff --git a/src/test/ui/c-variadic/variadic-ffi-no-fixed-args.stderr b/tests/ui/c-variadic/variadic-ffi-no-fixed-args.stderr
index e11ba43ca..e11ba43ca 100644
--- a/src/test/ui/c-variadic/variadic-ffi-no-fixed-args.stderr
+++ b/tests/ui/c-variadic/variadic-ffi-no-fixed-args.stderr
diff --git a/src/test/ui/c-variadic/variadic-unreachable-arg-error.rs b/tests/ui/c-variadic/variadic-unreachable-arg-error.rs
index f60f6f3e8..f60f6f3e8 100644
--- a/src/test/ui/c-variadic/variadic-unreachable-arg-error.rs
+++ b/tests/ui/c-variadic/variadic-unreachable-arg-error.rs
diff --git a/src/test/ui/can-copy-pod.rs b/tests/ui/can-copy-pod.rs
index e6c57ca3f..e6c57ca3f 100644
--- a/src/test/ui/can-copy-pod.rs
+++ b/tests/ui/can-copy-pod.rs
diff --git a/src/test/ui/cancel-clean-via-immediate-rvalue-ref.rs b/tests/ui/cancel-clean-via-immediate-rvalue-ref.rs
index a0a561ab2..a0a561ab2 100644
--- a/src/test/ui/cancel-clean-via-immediate-rvalue-ref.rs
+++ b/tests/ui/cancel-clean-via-immediate-rvalue-ref.rs
diff --git a/src/test/ui/cannot-mutate-captured-non-mut-var.rs b/tests/ui/cannot-mutate-captured-non-mut-var.rs
index 952dab25b..952dab25b 100644
--- a/src/test/ui/cannot-mutate-captured-non-mut-var.rs
+++ b/tests/ui/cannot-mutate-captured-non-mut-var.rs
diff --git a/src/test/ui/cannot-mutate-captured-non-mut-var.stderr b/tests/ui/cannot-mutate-captured-non-mut-var.stderr
index 06b5ca407..06b5ca407 100644
--- a/src/test/ui/cannot-mutate-captured-non-mut-var.stderr
+++ b/tests/ui/cannot-mutate-captured-non-mut-var.stderr
diff --git a/src/test/ui/capture1.rs b/tests/ui/capture1.rs
index 2938c0845..2938c0845 100644
--- a/src/test/ui/capture1.rs
+++ b/tests/ui/capture1.rs
diff --git a/src/test/ui/capture1.stderr b/tests/ui/capture1.stderr
index ad8434709..ad8434709 100644
--- a/src/test/ui/capture1.stderr
+++ b/tests/ui/capture1.stderr
diff --git a/tests/ui/cast/cast-as-bool.rs b/tests/ui/cast/cast-as-bool.rs
new file mode 100644
index 000000000..fbebc80d9
--- /dev/null
+++ b/tests/ui/cast/cast-as-bool.rs
@@ -0,0 +1,13 @@
+fn main() {
+    let u = 5 as bool; //~ ERROR cannot cast as `bool`
+                       //~| HELP compare with zero instead
+                       //~| SUGGESTION 5 != 0
+
+    let t = (1 + 2) as bool; //~ ERROR cannot cast as `bool`
+                             //~| HELP compare with zero instead
+                             //~| SUGGESTION (1 + 2) != 0
+
+    let v = "hello" as bool;
+    //~^ ERROR casting `&'static str` as `bool` is invalid
+    //~| HELP consider using the `is_empty` method on `&'static str` to determine if it contains anything
+}
diff --git a/tests/ui/cast/cast-as-bool.stderr b/tests/ui/cast/cast-as-bool.stderr
new file mode 100644
index 000000000..19ac8f10f
--- /dev/null
+++ b/tests/ui/cast/cast-as-bool.stderr
@@ -0,0 +1,27 @@
+error[E0054]: cannot cast as `bool`
+  --> $DIR/cast-as-bool.rs:2:13
+   |
+LL |     let u = 5 as bool;
+   |             ^^^^^^^^^ help: compare with zero instead: `5 != 0`
+
+error[E0054]: cannot cast as `bool`
+  --> $DIR/cast-as-bool.rs:6:13
+   |
+LL |     let t = (1 + 2) as bool;
+   |             ^^^^^^^^^^^^^^^ help: compare with zero instead: `(1 + 2) != 0`
+
+error[E0606]: casting `&'static str` as `bool` is invalid
+  --> $DIR/cast-as-bool.rs:10:13
+   |
+LL |     let v = "hello" as bool;
+   |             ^^^^^^^^^^^^^^^
+   |
+help: consider using the `is_empty` method on `&'static str` to determine if it contains anything
+   |
+LL |     let v = !"hello".is_empty();
+   |             +       ~~~~~~~~~~~
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0054, E0606.
+For more information about an error, try `rustc --explain E0054`.
diff --git a/src/test/ui/cast/cast-char.rs b/tests/ui/cast/cast-char.rs
index 9634ed56f..9634ed56f 100644
--- a/src/test/ui/cast/cast-char.rs
+++ b/tests/ui/cast/cast-char.rs
diff --git a/src/test/ui/cast/cast-char.stderr b/tests/ui/cast/cast-char.stderr
index 211937c9d..211937c9d 100644
--- a/src/test/ui/cast/cast-char.stderr
+++ b/tests/ui/cast/cast-char.stderr
diff --git a/src/test/ui/cast/cast-does-fallback.rs b/tests/ui/cast/cast-does-fallback.rs
index 770f7a31c..770f7a31c 100644
--- a/src/test/ui/cast/cast-does-fallback.rs
+++ b/tests/ui/cast/cast-does-fallback.rs
diff --git a/src/test/ui/cast/cast-errors-issue-43825.rs b/tests/ui/cast/cast-errors-issue-43825.rs
index 00e0da44b..00e0da44b 100644
--- a/src/test/ui/cast/cast-errors-issue-43825.rs
+++ b/tests/ui/cast/cast-errors-issue-43825.rs
diff --git a/src/test/ui/cast/cast-errors-issue-43825.stderr b/tests/ui/cast/cast-errors-issue-43825.stderr
index 1e77f5dbd..1e77f5dbd 100644
--- a/src/test/ui/cast/cast-errors-issue-43825.stderr
+++ b/tests/ui/cast/cast-errors-issue-43825.stderr
diff --git a/src/test/ui/cast/cast-from-nil.rs b/tests/ui/cast/cast-from-nil.rs
index b5ceef76a..b5ceef76a 100644
--- a/src/test/ui/cast/cast-from-nil.rs
+++ b/tests/ui/cast/cast-from-nil.rs
diff --git a/src/test/ui/cast/cast-from-nil.stderr b/tests/ui/cast/cast-from-nil.stderr
index dab133cfb..dab133cfb 100644
--- a/src/test/ui/cast/cast-from-nil.stderr
+++ b/tests/ui/cast/cast-from-nil.stderr
diff --git a/src/test/ui/cast/cast-int-to-char.rs b/tests/ui/cast/cast-int-to-char.rs
index 379956968..379956968 100644
--- a/src/test/ui/cast/cast-int-to-char.rs
+++ b/tests/ui/cast/cast-int-to-char.rs
diff --git a/src/test/ui/cast/cast-int-to-char.stderr b/tests/ui/cast/cast-int-to-char.stderr
index ef606b6ae..ef606b6ae 100644
--- a/src/test/ui/cast/cast-int-to-char.stderr
+++ b/tests/ui/cast/cast-int-to-char.stderr
diff --git a/src/test/ui/cast/cast-macro-lhs.rs b/tests/ui/cast/cast-macro-lhs.rs
index b509b3239..b509b3239 100644
--- a/src/test/ui/cast/cast-macro-lhs.rs
+++ b/tests/ui/cast/cast-macro-lhs.rs
diff --git a/src/test/ui/cast/cast-macro-lhs.stderr b/tests/ui/cast/cast-macro-lhs.stderr
index db7ce57e1..db7ce57e1 100644
--- a/src/test/ui/cast/cast-macro-lhs.stderr
+++ b/tests/ui/cast/cast-macro-lhs.stderr
diff --git a/src/test/ui/cast/cast-pointee-projection.rs b/tests/ui/cast/cast-pointee-projection.rs
index f51c5f20f..f51c5f20f 100644
--- a/src/test/ui/cast/cast-pointee-projection.rs
+++ b/tests/ui/cast/cast-pointee-projection.rs
diff --git a/src/test/ui/cast/cast-region-to-uint.rs b/tests/ui/cast/cast-region-to-uint.rs
index 33ec2d276..33ec2d276 100644
--- a/src/test/ui/cast/cast-region-to-uint.rs
+++ b/tests/ui/cast/cast-region-to-uint.rs
diff --git a/src/test/ui/cast/cast-rfc0401-2.rs b/tests/ui/cast/cast-rfc0401-2.rs
index 7709aa341..7709aa341 100644
--- a/src/test/ui/cast/cast-rfc0401-2.rs
+++ b/tests/ui/cast/cast-rfc0401-2.rs
diff --git a/src/test/ui/cast/cast-rfc0401-2.stderr b/tests/ui/cast/cast-rfc0401-2.stderr
index 52f6af78a..52f6af78a 100644
--- a/src/test/ui/cast/cast-rfc0401-2.stderr
+++ b/tests/ui/cast/cast-rfc0401-2.stderr
diff --git a/src/test/ui/cast/cast-rfc0401-vtable-kinds.rs b/tests/ui/cast/cast-rfc0401-vtable-kinds.rs
index 249481467..249481467 100644
--- a/src/test/ui/cast/cast-rfc0401-vtable-kinds.rs
+++ b/tests/ui/cast/cast-rfc0401-vtable-kinds.rs
diff --git a/src/test/ui/cast/cast-rfc0401.rs b/tests/ui/cast/cast-rfc0401.rs
index 9a9875416..9a9875416 100644
--- a/src/test/ui/cast/cast-rfc0401.rs
+++ b/tests/ui/cast/cast-rfc0401.rs
diff --git a/src/test/ui/cast/cast-to-bare-fn.rs b/tests/ui/cast/cast-to-bare-fn.rs
index 1992f2637..1992f2637 100644
--- a/src/test/ui/cast/cast-to-bare-fn.rs
+++ b/tests/ui/cast/cast-to-bare-fn.rs
diff --git a/src/test/ui/cast/cast-to-bare-fn.stderr b/tests/ui/cast/cast-to-bare-fn.stderr
index d97b0c5f8..d97b0c5f8 100644
--- a/src/test/ui/cast/cast-to-bare-fn.stderr
+++ b/tests/ui/cast/cast-to-bare-fn.stderr
diff --git a/src/test/ui/cast/cast-to-infer-ty.rs b/tests/ui/cast/cast-to-infer-ty.rs
index 053ebb621..053ebb621 100644
--- a/src/test/ui/cast/cast-to-infer-ty.rs
+++ b/tests/ui/cast/cast-to-infer-ty.rs
diff --git a/src/test/ui/cast/cast-to-nil.rs b/tests/ui/cast/cast-to-nil.rs
index 085bb09e6..085bb09e6 100644
--- a/src/test/ui/cast/cast-to-nil.rs
+++ b/tests/ui/cast/cast-to-nil.rs
diff --git a/src/test/ui/cast/cast-to-nil.stderr b/tests/ui/cast/cast-to-nil.stderr
index 29a9baffd..29a9baffd 100644
--- a/src/test/ui/cast/cast-to-nil.stderr
+++ b/tests/ui/cast/cast-to-nil.stderr
diff --git a/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.rs b/tests/ui/cast/cast-to-unsized-trait-object-suggestion.rs
index 5342b595c..5342b595c 100644
--- a/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.rs
+++ b/tests/ui/cast/cast-to-unsized-trait-object-suggestion.rs
diff --git a/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.stderr b/tests/ui/cast/cast-to-unsized-trait-object-suggestion.stderr
index 3b5b8ea69..3b5b8ea69 100644
--- a/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.stderr
+++ b/tests/ui/cast/cast-to-unsized-trait-object-suggestion.stderr
diff --git a/src/test/ui/cast/cast.rs b/tests/ui/cast/cast.rs
index 218275c4d..218275c4d 100644
--- a/src/test/ui/cast/cast.rs
+++ b/tests/ui/cast/cast.rs
diff --git a/src/test/ui/cast/casts-differing-anon.rs b/tests/ui/cast/casts-differing-anon.rs
index d4a0f9613..d4a0f9613 100644
--- a/src/test/ui/cast/casts-differing-anon.rs
+++ b/tests/ui/cast/casts-differing-anon.rs
diff --git a/src/test/ui/cast/casts-differing-anon.stderr b/tests/ui/cast/casts-differing-anon.stderr
index f9abfb522..f9abfb522 100644
--- a/src/test/ui/cast/casts-differing-anon.stderr
+++ b/tests/ui/cast/casts-differing-anon.stderr
diff --git a/src/test/ui/cast/casts-issue-46365.rs b/tests/ui/cast/casts-issue-46365.rs
index 50aa1a856..50aa1a856 100644
--- a/src/test/ui/cast/casts-issue-46365.rs
+++ b/tests/ui/cast/casts-issue-46365.rs
diff --git a/src/test/ui/cast/casts-issue-46365.stderr b/tests/ui/cast/casts-issue-46365.stderr
index 841754736..841754736 100644
--- a/src/test/ui/cast/casts-issue-46365.stderr
+++ b/tests/ui/cast/casts-issue-46365.stderr
diff --git a/src/test/ui/cast/codegen-object-shim.rs b/tests/ui/cast/codegen-object-shim.rs
index 9a85a50eb..9a85a50eb 100644
--- a/src/test/ui/cast/codegen-object-shim.rs
+++ b/tests/ui/cast/codegen-object-shim.rs
diff --git a/src/test/ui/cast/fat-ptr-cast-rpass.rs b/tests/ui/cast/fat-ptr-cast-rpass.rs
index f5747eb8b..f5747eb8b 100644
--- a/src/test/ui/cast/fat-ptr-cast-rpass.rs
+++ b/tests/ui/cast/fat-ptr-cast-rpass.rs
diff --git a/src/test/ui/cast/fat-ptr-cast.rs b/tests/ui/cast/fat-ptr-cast.rs
index b5276dc61..b5276dc61 100644
--- a/src/test/ui/cast/fat-ptr-cast.rs
+++ b/tests/ui/cast/fat-ptr-cast.rs
diff --git a/src/test/ui/cast/fat-ptr-cast.stderr b/tests/ui/cast/fat-ptr-cast.stderr
index 18e7b68ff..18e7b68ff 100644
--- a/src/test/ui/cast/fat-ptr-cast.stderr
+++ b/tests/ui/cast/fat-ptr-cast.stderr
diff --git a/tests/ui/cast/issue-106883-is-empty.rs b/tests/ui/cast/issue-106883-is-empty.rs
new file mode 100644
index 000000000..27e0816dd
--- /dev/null
+++ b/tests/ui/cast/issue-106883-is-empty.rs
@@ -0,0 +1,27 @@
+use std::ops::Deref;
+
+struct Foo;
+
+impl Deref for Foo {
+    type Target = [u8];
+
+    fn deref(&self) -> &Self::Target {
+        &[]
+    }
+}
+
+fn main() {
+    let _ = "foo" as bool;
+    //~^ ERROR casting `&'static str` as `bool` is invalid [E0606]
+
+    let _ = String::from("foo") as bool;
+    //~^ ERROR non-primitive cast: `String` as `bool` [E0605]
+
+    let _ = Foo as bool;
+    //~^ ERROR non-primitive cast: `Foo` as `bool` [E0605]
+}
+
+fn _slice(bar: &[i32]) -> bool {
+    bar as bool
+    //~^ ERROR casting `&[i32]` as `bool` is invalid [E0606]
+}
diff --git a/tests/ui/cast/issue-106883-is-empty.stderr b/tests/ui/cast/issue-106883-is-empty.stderr
new file mode 100644
index 000000000..7115c7704
--- /dev/null
+++ b/tests/ui/cast/issue-106883-is-empty.stderr
@@ -0,0 +1,58 @@
+error[E0606]: casting `&'static str` as `bool` is invalid
+  --> $DIR/issue-106883-is-empty.rs:14:13
+   |
+LL |     let _ = "foo" as bool;
+   |             ^^^^^^^^^^^^^
+   |
+help: consider using the `is_empty` method on `&'static str` to determine if it contains anything
+   |
+LL |     let _ = !"foo".is_empty();
+   |             +     ~~~~~~~~~~~
+
+error[E0605]: non-primitive cast: `String` as `bool`
+  --> $DIR/issue-106883-is-empty.rs:17:13
+   |
+LL |     let _ = String::from("foo") as bool;
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ an `as` expression can only be used to convert between primitive types or to coerce to a specific trait object
+   |
+note: this expression `Deref`s to `str` which implements `is_empty`
+  --> $DIR/issue-106883-is-empty.rs:17:13
+   |
+LL |     let _ = String::from("foo") as bool;
+   |             ^^^^^^^^^^^^^^^^^^^
+help: consider using the `is_empty` method on `String` to determine if it contains anything
+   |
+LL |     let _ = !String::from("foo").is_empty();
+   |             +                   ~~~~~~~~~~~
+
+error[E0605]: non-primitive cast: `Foo` as `bool`
+  --> $DIR/issue-106883-is-empty.rs:20:13
+   |
+LL |     let _ = Foo as bool;
+   |             ^^^^^^^^^^^ an `as` expression can only be used to convert between primitive types or to coerce to a specific trait object
+   |
+note: this expression `Deref`s to `[u8]` which implements `is_empty`
+  --> $DIR/issue-106883-is-empty.rs:20:13
+   |
+LL |     let _ = Foo as bool;
+   |             ^^^
+help: consider using the `is_empty` method on `Foo` to determine if it contains anything
+   |
+LL |     let _ = !Foo.is_empty();
+   |             +   ~~~~~~~~~~~
+
+error[E0606]: casting `&[i32]` as `bool` is invalid
+  --> $DIR/issue-106883-is-empty.rs:25:5
+   |
+LL |     bar as bool
+   |     ^^^^^^^^^^^
+   |
+help: consider using the `is_empty` method on `&[i32]` to determine if it contains anything
+   |
+LL |     !bar.is_empty()
+   |     +   ~~~~~~~~~~~
+
+error: aborting due to 4 previous errors
+
+Some errors have detailed explanations: E0605, E0606.
+For more information about an error, try `rustc --explain E0605`.
diff --git a/src/test/ui/cast/issue-10991.rs b/tests/ui/cast/issue-10991.rs
index c36829fdf..c36829fdf 100644
--- a/src/test/ui/cast/issue-10991.rs
+++ b/tests/ui/cast/issue-10991.rs
diff --git a/src/test/ui/cast/issue-10991.stderr b/tests/ui/cast/issue-10991.stderr
index 5b8a18233..5b8a18233 100644
--- a/src/test/ui/cast/issue-10991.stderr
+++ b/tests/ui/cast/issue-10991.stderr
diff --git a/src/test/ui/cast/issue-17444.rs b/tests/ui/cast/issue-17444.rs
index 906b443c9..906b443c9 100644
--- a/src/test/ui/cast/issue-17444.rs
+++ b/tests/ui/cast/issue-17444.rs
diff --git a/src/test/ui/cast/issue-17444.stderr b/tests/ui/cast/issue-17444.stderr
index 1097079df..1097079df 100644
--- a/src/test/ui/cast/issue-17444.stderr
+++ b/tests/ui/cast/issue-17444.stderr
diff --git a/src/test/ui/cast/issue-84213.fixed b/tests/ui/cast/issue-84213.fixed
index b5c4a7752..b5c4a7752 100644
--- a/src/test/ui/cast/issue-84213.fixed
+++ b/tests/ui/cast/issue-84213.fixed
diff --git a/src/test/ui/cast/issue-84213.rs b/tests/ui/cast/issue-84213.rs
index 6eb81291a..6eb81291a 100644
--- a/src/test/ui/cast/issue-84213.rs
+++ b/tests/ui/cast/issue-84213.rs
diff --git a/src/test/ui/cast/issue-84213.stderr b/tests/ui/cast/issue-84213.stderr
index 025970e54..025970e54 100644
--- a/src/test/ui/cast/issue-84213.stderr
+++ b/tests/ui/cast/issue-84213.stderr
diff --git a/src/test/ui/cast/issue-85586.rs b/tests/ui/cast/issue-85586.rs
index 78816582b..78816582b 100644
--- a/src/test/ui/cast/issue-85586.rs
+++ b/tests/ui/cast/issue-85586.rs
diff --git a/src/test/ui/cast/issue-85586.stderr b/tests/ui/cast/issue-85586.stderr
index ed8a6fc62..ed8a6fc62 100644
--- a/src/test/ui/cast/issue-85586.stderr
+++ b/tests/ui/cast/issue-85586.stderr
diff --git a/src/test/ui/cast/issue-88621.rs b/tests/ui/cast/issue-88621.rs
index 1679793ee..1679793ee 100644
--- a/src/test/ui/cast/issue-88621.rs
+++ b/tests/ui/cast/issue-88621.rs
diff --git a/src/test/ui/cast/issue-88621.stderr b/tests/ui/cast/issue-88621.stderr
index 886145c1b..886145c1b 100644
--- a/src/test/ui/cast/issue-88621.stderr
+++ b/tests/ui/cast/issue-88621.stderr
diff --git a/src/test/ui/cast/issue-89497.fixed b/tests/ui/cast/issue-89497.fixed
index 04c10a5f7..04c10a5f7 100644
--- a/src/test/ui/cast/issue-89497.fixed
+++ b/tests/ui/cast/issue-89497.fixed
diff --git a/src/test/ui/cast/issue-89497.rs b/tests/ui/cast/issue-89497.rs
index 76301b704..76301b704 100644
--- a/src/test/ui/cast/issue-89497.rs
+++ b/tests/ui/cast/issue-89497.rs
diff --git a/src/test/ui/cast/issue-89497.stderr b/tests/ui/cast/issue-89497.stderr
index bf3c3537f..bf3c3537f 100644
--- a/src/test/ui/cast/issue-89497.stderr
+++ b/tests/ui/cast/issue-89497.stderr
diff --git a/src/test/ui/cast/supported-cast.rs b/tests/ui/cast/supported-cast.rs
index ff41ce6c7..ff41ce6c7 100644
--- a/src/test/ui/cast/supported-cast.rs
+++ b/tests/ui/cast/supported-cast.rs
diff --git a/src/test/ui/cast/unsupported-cast.rs b/tests/ui/cast/unsupported-cast.rs
index 1384ecc6e..1384ecc6e 100644
--- a/src/test/ui/cast/unsupported-cast.rs
+++ b/tests/ui/cast/unsupported-cast.rs
diff --git a/src/test/ui/cast/unsupported-cast.stderr b/tests/ui/cast/unsupported-cast.stderr
index 56a375a1d..56a375a1d 100644
--- a/src/test/ui/cast/unsupported-cast.stderr
+++ b/tests/ui/cast/unsupported-cast.stderr
diff --git a/src/test/ui/catch-unwind-bang.rs b/tests/ui/catch-unwind-bang.rs
index fb3503937..fb3503937 100644
--- a/src/test/ui/catch-unwind-bang.rs
+++ b/tests/ui/catch-unwind-bang.rs
diff --git a/src/test/ui/cenum_impl_drop_cast.rs b/tests/ui/cenum_impl_drop_cast.rs
index 96e3d967e..96e3d967e 100644
--- a/src/test/ui/cenum_impl_drop_cast.rs
+++ b/tests/ui/cenum_impl_drop_cast.rs
diff --git a/src/test/ui/cenum_impl_drop_cast.stderr b/tests/ui/cenum_impl_drop_cast.stderr
index b3f921c14..b3f921c14 100644
--- a/src/test/ui/cenum_impl_drop_cast.stderr
+++ b/tests/ui/cenum_impl_drop_cast.stderr
diff --git a/src/test/ui/cfg/assume-incomplete-release/assume-incomplete.rs b/tests/ui/cfg/assume-incomplete-release/assume-incomplete.rs
index 24d2dc645..24d2dc645 100644
--- a/src/test/ui/cfg/assume-incomplete-release/assume-incomplete.rs
+++ b/tests/ui/cfg/assume-incomplete-release/assume-incomplete.rs
diff --git a/src/test/ui/cfg/assume-incomplete-release/auxiliary/ver-cfg-rel.rs b/tests/ui/cfg/assume-incomplete-release/auxiliary/ver-cfg-rel.rs
index 678752702..067c620f5 100644
--- a/src/test/ui/cfg/assume-incomplete-release/auxiliary/ver-cfg-rel.rs
+++ b/tests/ui/cfg/assume-incomplete-release/auxiliary/ver-cfg-rel.rs
@@ -8,7 +8,7 @@ use proc_macro::{TokenStream, TokenTree as Tt};
 use std::str::FromStr;
 
 // String containing the current version number of the tip, i.e. "1.41.2"
-static VERSION_NUMBER: &str = include_str!("../../../../../version");
+static VERSION_NUMBER: &str = include_str!("../../../../../src/version");
 
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 struct Version {
diff --git a/src/test/ui/cfg/auxiliary/cfg_inner_static.rs b/tests/ui/cfg/auxiliary/cfg_inner_static.rs
index 6a619a4e7..6a619a4e7 100644
--- a/src/test/ui/cfg/auxiliary/cfg_inner_static.rs
+++ b/tests/ui/cfg/auxiliary/cfg_inner_static.rs
diff --git a/src/test/ui/cfg/cfg-attr-cfg.rs b/tests/ui/cfg/cfg-attr-cfg.rs
index 61794e0bf..61794e0bf 100644
--- a/src/test/ui/cfg/cfg-attr-cfg.rs
+++ b/tests/ui/cfg/cfg-attr-cfg.rs
diff --git a/src/test/ui/cfg/cfg-attr-crate.rs b/tests/ui/cfg/cfg-attr-crate.rs
index 1d70f2f84..1d70f2f84 100644
--- a/src/test/ui/cfg/cfg-attr-crate.rs
+++ b/tests/ui/cfg/cfg-attr-crate.rs
diff --git a/src/test/ui/cfg/cfg-family.rs b/tests/ui/cfg/cfg-family.rs
index c7d196a2a..c7d196a2a 100644
--- a/src/test/ui/cfg/cfg-family.rs
+++ b/tests/ui/cfg/cfg-family.rs
diff --git a/src/test/ui/cfg/cfg-in-crate-1.rs b/tests/ui/cfg/cfg-in-crate-1.rs
index e84300aa3..e84300aa3 100644
--- a/src/test/ui/cfg/cfg-in-crate-1.rs
+++ b/tests/ui/cfg/cfg-in-crate-1.rs
diff --git a/src/test/ui/cfg/cfg-macros-foo.rs b/tests/ui/cfg/cfg-macros-foo.rs
index 8b112c796..8b112c796 100644
--- a/src/test/ui/cfg/cfg-macros-foo.rs
+++ b/tests/ui/cfg/cfg-macros-foo.rs
diff --git a/src/test/ui/cfg/cfg-macros-notfoo.rs b/tests/ui/cfg/cfg-macros-notfoo.rs
index 292d97821..292d97821 100644
--- a/src/test/ui/cfg/cfg-macros-notfoo.rs
+++ b/tests/ui/cfg/cfg-macros-notfoo.rs
diff --git a/src/test/ui/cfg/cfg-match-arm.rs b/tests/ui/cfg/cfg-match-arm.rs
index 071008f9e..071008f9e 100644
--- a/src/test/ui/cfg/cfg-match-arm.rs
+++ b/tests/ui/cfg/cfg-match-arm.rs
diff --git a/src/test/ui/cfg/cfg-method-receiver-ok.rs b/tests/ui/cfg/cfg-method-receiver-ok.rs
index 61ad3b8c1..61ad3b8c1 100644
--- a/src/test/ui/cfg/cfg-method-receiver-ok.rs
+++ b/tests/ui/cfg/cfg-method-receiver-ok.rs
diff --git a/src/test/ui/cfg/cfg-method-receiver.rs b/tests/ui/cfg/cfg-method-receiver.rs
index 71134ff17..71134ff17 100644
--- a/src/test/ui/cfg/cfg-method-receiver.rs
+++ b/tests/ui/cfg/cfg-method-receiver.rs
diff --git a/src/test/ui/cfg/cfg-method-receiver.stderr b/tests/ui/cfg/cfg-method-receiver.stderr
index 5767a7c1b..5767a7c1b 100644
--- a/src/test/ui/cfg/cfg-method-receiver.stderr
+++ b/tests/ui/cfg/cfg-method-receiver.stderr
diff --git a/src/test/ui/cfg/cfg-panic-abort.rs b/tests/ui/cfg/cfg-panic-abort.rs
index 3853b598a..3853b598a 100644
--- a/src/test/ui/cfg/cfg-panic-abort.rs
+++ b/tests/ui/cfg/cfg-panic-abort.rs
diff --git a/src/test/ui/cfg/cfg-panic.rs b/tests/ui/cfg/cfg-panic.rs
index 2de72d54a..2de72d54a 100644
--- a/src/test/ui/cfg/cfg-panic.rs
+++ b/tests/ui/cfg/cfg-panic.rs
diff --git a/src/test/ui/cfg/cfg-path-error.rs b/tests/ui/cfg/cfg-path-error.rs
index 5bf80bd74..5bf80bd74 100644
--- a/src/test/ui/cfg/cfg-path-error.rs
+++ b/tests/ui/cfg/cfg-path-error.rs
diff --git a/src/test/ui/cfg/cfg-path-error.stderr b/tests/ui/cfg/cfg-path-error.stderr
index 84b44b2b0..84b44b2b0 100644
--- a/src/test/ui/cfg/cfg-path-error.stderr
+++ b/tests/ui/cfg/cfg-path-error.stderr
diff --git a/src/test/ui/cfg/cfg-target-abi.rs b/tests/ui/cfg/cfg-target-abi.rs
index acc570fc8..acc570fc8 100644
--- a/src/test/ui/cfg/cfg-target-abi.rs
+++ b/tests/ui/cfg/cfg-target-abi.rs
diff --git a/src/test/ui/cfg/cfg-target-compact-errors.rs b/tests/ui/cfg/cfg-target-compact-errors.rs
index bca2275b1..bca2275b1 100644
--- a/src/test/ui/cfg/cfg-target-compact-errors.rs
+++ b/tests/ui/cfg/cfg-target-compact-errors.rs
diff --git a/src/test/ui/cfg/cfg-target-compact-errors.stderr b/tests/ui/cfg/cfg-target-compact-errors.stderr
index bb858301e..bb858301e 100644
--- a/src/test/ui/cfg/cfg-target-compact-errors.stderr
+++ b/tests/ui/cfg/cfg-target-compact-errors.stderr
diff --git a/src/test/ui/cfg/cfg-target-compact.rs b/tests/ui/cfg/cfg-target-compact.rs
index dc95a8091..dc95a8091 100644
--- a/src/test/ui/cfg/cfg-target-compact.rs
+++ b/tests/ui/cfg/cfg-target-compact.rs
diff --git a/src/test/ui/cfg/cfg-target-family.rs b/tests/ui/cfg/cfg-target-family.rs
index 5182cdc89..5182cdc89 100644
--- a/src/test/ui/cfg/cfg-target-family.rs
+++ b/tests/ui/cfg/cfg-target-family.rs
diff --git a/src/test/ui/cfg/cfg-target-vendor.rs b/tests/ui/cfg/cfg-target-vendor.rs
index 782458516..782458516 100644
--- a/src/test/ui/cfg/cfg-target-vendor.rs
+++ b/tests/ui/cfg/cfg-target-vendor.rs
diff --git a/src/test/ui/cfg/cfg_attr.rs b/tests/ui/cfg/cfg_attr.rs
index c959e68ac..c959e68ac 100644
--- a/src/test/ui/cfg/cfg_attr.rs
+++ b/tests/ui/cfg/cfg_attr.rs
diff --git a/src/test/ui/cfg/cfg_inner_static.rs b/tests/ui/cfg/cfg_inner_static.rs
index 45dbbcc10..45dbbcc10 100644
--- a/src/test/ui/cfg/cfg_inner_static.rs
+++ b/tests/ui/cfg/cfg_inner_static.rs
diff --git a/src/test/ui/cfg/cfg_stmt_expr.rs b/tests/ui/cfg/cfg_stmt_expr.rs
index 6381bb2d5..6381bb2d5 100644
--- a/src/test/ui/cfg/cfg_stmt_expr.rs
+++ b/tests/ui/cfg/cfg_stmt_expr.rs
diff --git a/src/test/ui/cfg/cfgs-on-items.rs b/tests/ui/cfg/cfgs-on-items.rs
index 9f2fc4942..9f2fc4942 100644
--- a/src/test/ui/cfg/cfgs-on-items.rs
+++ b/tests/ui/cfg/cfgs-on-items.rs
diff --git a/src/test/ui/cfg/conditional-compile-arch.rs b/tests/ui/cfg/conditional-compile-arch.rs
index 7de561df1..7de561df1 100644
--- a/src/test/ui/cfg/conditional-compile-arch.rs
+++ b/tests/ui/cfg/conditional-compile-arch.rs
diff --git a/src/test/ui/cfg/conditional-compile.rs b/tests/ui/cfg/conditional-compile.rs
index 69f4de431..69f4de431 100644
--- a/src/test/ui/cfg/conditional-compile.rs
+++ b/tests/ui/cfg/conditional-compile.rs
diff --git a/src/test/ui/cfg/crt-static-off-works.rs b/tests/ui/cfg/crt-static-off-works.rs
index 911467ee5..911467ee5 100644
--- a/src/test/ui/cfg/crt-static-off-works.rs
+++ b/tests/ui/cfg/crt-static-off-works.rs
diff --git a/src/test/ui/cfg/crt-static-on-works.rs b/tests/ui/cfg/crt-static-on-works.rs
index f89d1edd6..f89d1edd6 100644
--- a/src/test/ui/cfg/crt-static-on-works.rs
+++ b/tests/ui/cfg/crt-static-on-works.rs
diff --git a/src/test/ui/cfg/expanded-cfg.rs b/tests/ui/cfg/expanded-cfg.rs
index baa161af7..baa161af7 100644
--- a/src/test/ui/cfg/expanded-cfg.rs
+++ b/tests/ui/cfg/expanded-cfg.rs
diff --git a/src/test/ui/cfg/future-compat-crate-attributes-using-cfg_attr.rs b/tests/ui/cfg/future-compat-crate-attributes-using-cfg_attr.rs
index 1f23dadc4..1f23dadc4 100644
--- a/src/test/ui/cfg/future-compat-crate-attributes-using-cfg_attr.rs
+++ b/tests/ui/cfg/future-compat-crate-attributes-using-cfg_attr.rs
diff --git a/src/test/ui/cfg/future-compat-crate-attributes-using-cfg_attr.stderr b/tests/ui/cfg/future-compat-crate-attributes-using-cfg_attr.stderr
index 9ce4710d6..9ce4710d6 100644
--- a/src/test/ui/cfg/future-compat-crate-attributes-using-cfg_attr.stderr
+++ b/tests/ui/cfg/future-compat-crate-attributes-using-cfg_attr.stderr
diff --git a/src/test/ui/cfguard-run.rs b/tests/ui/cfguard-run.rs
index 3c4f9a1f5..3c4f9a1f5 100644
--- a/src/test/ui/cfguard-run.rs
+++ b/tests/ui/cfguard-run.rs
diff --git a/src/test/ui/chalkify/arithmetic.rs b/tests/ui/chalkify/arithmetic.rs
index a20acce4c..6c78a71b0 100644
--- a/src/test/ui/chalkify/arithmetic.rs
+++ b/tests/ui/chalkify/arithmetic.rs
@@ -1,5 +1,5 @@
 // check-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 fn main() {
     1 + 2;
diff --git a/tests/ui/chalkify/assert.rs b/tests/ui/chalkify/assert.rs
new file mode 100644
index 000000000..834c8935e
--- /dev/null
+++ b/tests/ui/chalkify/assert.rs
@@ -0,0 +1,6 @@
+// run-pass
+// compile-flags: -Z trait-solver=chalk
+
+fn main() {
+    assert_eq!(1, 1);
+}
diff --git a/tests/ui/chalkify/basic.rs b/tests/ui/chalkify/basic.rs
new file mode 100644
index 000000000..4a7cd9396
--- /dev/null
+++ b/tests/ui/chalkify/basic.rs
@@ -0,0 +1,12 @@
+// check-pass
+// compile-flags: -Z trait-solver=chalk
+
+trait Foo {}
+
+struct Bar {}
+
+impl Foo for Bar {}
+
+fn main() -> () {
+    let _ = Bar {};
+}
diff --git a/tests/ui/chalkify/bugs/async.rs b/tests/ui/chalkify/bugs/async.rs
new file mode 100644
index 000000000..3169e4781
--- /dev/null
+++ b/tests/ui/chalkify/bugs/async.rs
@@ -0,0 +1,25 @@
+// edition:2021
+// known-bug: unknown
+// unset-rustc-env:RUST_BACKTRACE
+// compile-flags:-Z trait-solver=chalk
+// error-pattern:internal compiler error
+// failure-status:101
+// normalize-stderr-test "DefId([^)]*)" -> "..."
+// normalize-stderr-test "\nerror: internal compiler error.*\n\n" -> ""
+// normalize-stderr-test "note:.*unexpectedly panicked.*\n\n" -> ""
+// normalize-stderr-test "note: we would appreciate a bug report.*\n\n" -> ""
+// normalize-stderr-test "note: compiler flags.*\n\n" -> ""
+// normalize-stderr-test "note: rustc.*running on.*\n\n" -> ""
+// normalize-stderr-test "thread.*panicked.*\n" -> ""
+// normalize-stderr-test "stack backtrace:\n" -> ""
+// normalize-stderr-test "\s\d{1,}: .*\n" -> ""
+// normalize-stderr-test "\s at .*\n" -> ""
+// normalize-stderr-test ".*note: Some details.*\n" -> ""
+// normalize-stderr-test "\n\n[ ]*\n" -> ""
+// normalize-stderr-test "compiler/.*: projection" -> "projection"
+
+fn main() -> () {}
+
+async fn foo(x: u32) -> u32 {
+    x
+}
diff --git a/tests/ui/chalkify/bugs/async.stderr b/tests/ui/chalkify/bugs/async.stderr
new file mode 100644
index 000000000..8043f1e5a
--- /dev/null
+++ b/tests/ui/chalkify/bugs/async.stderr
@@ -0,0 +1,58 @@
+error[E0277]: `[async fn body@$DIR/async.rs:23:29: 25:2]` is not a future
+  --> $DIR/async.rs:23:29
+   |
+LL |   async fn foo(x: u32) -> u32 {
+   |  _____________________________-
+LL | |     x
+LL | | }
+   | | ^
+   | | |
+   | |_`[async fn body@$DIR/async.rs:23:29: 25:2]` is not a future
+   |   required by a bound introduced by this call
+   |
+   = help: the trait `Future` is not implemented for `[async fn body@$DIR/async.rs:23:29: 25:2]`
+   = note: [async fn body@$DIR/async.rs:23:29: 25:2] must be a future or must implement `IntoFuture` to be awaited
+note: required by a bound in `identity_future`
+  --> $SRC_DIR/core/src/future/mod.rs:LL:COL
+
+error[E0277]: the size for values of type `<[async fn body@$DIR/async.rs:23:29: 25:2] as Future>::Output` cannot be known at compilation time
+  --> $DIR/async.rs:23:29
+   |
+LL |   async fn foo(x: u32) -> u32 {
+   |  _____________________________^
+LL | |     x
+LL | | }
+   | |_^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `<[async fn body@$DIR/async.rs:23:29: 25:2] as Future>::Output`
+note: required by a bound in `identity_future`
+  --> $SRC_DIR/core/src/future/mod.rs:LL:COL
+
+error[E0277]: `[async fn body@$DIR/async.rs:23:29: 25:2]` is not a future
+  --> $DIR/async.rs:23:25
+   |
+LL | async fn foo(x: u32) -> u32 {
+   |                         ^^^ `[async fn body@$DIR/async.rs:23:29: 25:2]` is not a future
+   |
+   = help: the trait `Future` is not implemented for `[async fn body@$DIR/async.rs:23:29: 25:2]`
+   = note: [async fn body@$DIR/async.rs:23:29: 25:2] must be a future or must implement `IntoFuture` to be awaited
+
+error: internal compiler error: projection clauses should be implied from elsewhere. obligation: `Obligation(predicate=Binder(ProjectionPredicate(AliasTy { substs: [[async fn body@$DIR/async.rs:23:29: 25:2]], def_id: ...) }, Term::Ty(u32)), []), depth=0)`
+  --> $DIR/async.rs:23:25
+   |
+LL | async fn foo(x: u32) -> u32 {
+   |                         ^^^query stack during panic:
+#0 [typeck] type-checking `foo`
+#1 [thir_body] building THIR for `foo`
+#2 [mir_built] building MIR for `foo`
+#3 [unsafety_check_result] unsafety-checking `foo`
+#4 [mir_const] preparing `foo` for borrow checking
+#5 [mir_promoted] processing MIR for `foo`
+#6 [mir_borrowck] borrow-checking `foo`
+#7 [type_of] computing type of `foo::{opaque#0}`
+#8 [check_mod_item_types] checking item types in top-level module
+#9 [analysis] running analysis passes on this crate
+end of query stack
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/chalkify/builtin-copy-clone.rs b/tests/ui/chalkify/builtin-copy-clone.rs
index 7712e9465..a478c006e 100644
--- a/src/test/ui/chalkify/builtin-copy-clone.rs
+++ b/tests/ui/chalkify/builtin-copy-clone.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 // Test that `Clone` is correctly implemented for builtin types.
 
diff --git a/src/test/ui/chalkify/chalk_initial_program.rs b/tests/ui/chalkify/chalk_initial_program.rs
index df25bad62..21de72b6f 100644
--- a/src/test/ui/chalkify/chalk_initial_program.rs
+++ b/tests/ui/chalkify/chalk_initial_program.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 trait Foo { }
 
diff --git a/src/test/ui/chalkify/chalk_initial_program.stderr b/tests/ui/chalkify/chalk_initial_program.stderr
index 343c0a318..343c0a318 100644
--- a/src/test/ui/chalkify/chalk_initial_program.stderr
+++ b/tests/ui/chalkify/chalk_initial_program.stderr
diff --git a/src/test/ui/chalkify/closure.rs b/tests/ui/chalkify/closure.rs
index 568e2e30c..a908a1e97 100644
--- a/src/test/ui/chalkify/closure.rs
+++ b/tests/ui/chalkify/closure.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 fn main() -> () {
     let t = || {};
diff --git a/src/test/ui/chalkify/closure.stderr b/tests/ui/chalkify/closure.stderr
index a33c0ba0d..a33c0ba0d 100644
--- a/src/test/ui/chalkify/closure.stderr
+++ b/tests/ui/chalkify/closure.stderr
diff --git a/src/test/ui/chalkify/generic_impls.rs b/tests/ui/chalkify/generic_impls.rs
index d70c6f805..7d33e12d8 100644
--- a/src/test/ui/chalkify/generic_impls.rs
+++ b/tests/ui/chalkify/generic_impls.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 trait Foo { }
 
diff --git a/src/test/ui/chalkify/generic_impls.stderr b/tests/ui/chalkify/generic_impls.stderr
index d4a8354d3..d4a8354d3 100644
--- a/src/test/ui/chalkify/generic_impls.stderr
+++ b/tests/ui/chalkify/generic_impls.stderr
diff --git a/src/test/ui/chalkify/impl_wf.rs b/tests/ui/chalkify/impl_wf.rs
index 66f57c2d1..c8dfd4c3a 100644
--- a/src/test/ui/chalkify/impl_wf.rs
+++ b/tests/ui/chalkify/impl_wf.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 trait Foo: Sized { }
 
diff --git a/src/test/ui/chalkify/impl_wf.stderr b/tests/ui/chalkify/impl_wf.stderr
index a142459bc..84c32fa37 100644
--- a/src/test/ui/chalkify/impl_wf.stderr
+++ b/tests/ui/chalkify/impl_wf.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the size for values of type `str` cannot be known at compilation time
-  --> $DIR/impl_wf.rs:11:6
+  --> $DIR/impl_wf.rs:11:14
    |
 LL | impl Foo for str { }
-   |      ^^^ doesn't have a size known at compile-time
+   |              ^^^ doesn't have a size known at compile-time
    |
    = help: the trait `Sized` is not implemented for `str`
 note: required by a bound in `Foo`
@@ -12,10 +12,10 @@ LL | trait Foo: Sized { }
    |            ^^^^^ required by this bound in `Foo`
 
 error[E0277]: the trait bound `f32: Foo` is not satisfied
-  --> $DIR/impl_wf.rs:22:6
+  --> $DIR/impl_wf.rs:22:19
    |
 LL | impl Baz<f32> for f32 { }
-   |      ^^^^^^^^ the trait `Foo` is not implemented for `f32`
+   |                   ^^^ the trait `Foo` is not implemented for `f32`
    |
    = help: the trait `Foo` is implemented for `i32`
 note: required by a bound in `Baz`
diff --git a/src/test/ui/chalkify/impl_wf_2.rs b/tests/ui/chalkify/impl_wf_2.rs
index 758a7185e..325044ad6 100644
--- a/src/test/ui/chalkify/impl_wf_2.rs
+++ b/tests/ui/chalkify/impl_wf_2.rs
@@ -1,6 +1,6 @@
 // Split out of impl_wf.rs to work around rust aborting compilation early
 
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 trait Foo: Sized { }
 
diff --git a/src/test/ui/chalkify/impl_wf_2.stderr b/tests/ui/chalkify/impl_wf_2.stderr
index 1c1df644b..1c1df644b 100644
--- a/src/test/ui/chalkify/impl_wf_2.stderr
+++ b/tests/ui/chalkify/impl_wf_2.stderr
diff --git a/src/test/ui/chalkify/inherent_impl.rs b/tests/ui/chalkify/inherent_impl.rs
index a2730219f..f0f24d485 100644
--- a/src/test/ui/chalkify/inherent_impl.rs
+++ b/tests/ui/chalkify/inherent_impl.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 trait Foo { }
 
diff --git a/src/test/ui/chalkify/inherent_impl_min.rs b/tests/ui/chalkify/inherent_impl_min.rs
index 774c46e40..3eda7102d 100644
--- a/src/test/ui/chalkify/inherent_impl_min.rs
+++ b/tests/ui/chalkify/inherent_impl_min.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 trait Foo { }
 
diff --git a/src/test/ui/chalkify/lower_env1.rs b/tests/ui/chalkify/lower_env1.rs
index e3c756959..c8762001e 100644
--- a/src/test/ui/chalkify/lower_env1.rs
+++ b/tests/ui/chalkify/lower_env1.rs
@@ -1,5 +1,5 @@
 // check-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 #![allow(dead_code)]
 
diff --git a/src/test/ui/chalkify/lower_env2.rs b/tests/ui/chalkify/lower_env2.rs
index b5432ce0e..7d4f81f12 100644
--- a/src/test/ui/chalkify/lower_env2.rs
+++ b/tests/ui/chalkify/lower_env2.rs
@@ -1,5 +1,5 @@
 // check-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 #![allow(dead_code)]
 
diff --git a/src/test/ui/chalkify/lower_env3.rs b/tests/ui/chalkify/lower_env3.rs
index 673f08d78..5b70c4abb 100644
--- a/src/test/ui/chalkify/lower_env3.rs
+++ b/tests/ui/chalkify/lower_env3.rs
@@ -1,5 +1,5 @@
 // check-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 #![allow(dead_code)]
 
diff --git a/src/test/ui/chalkify/lower_impl.rs b/tests/ui/chalkify/lower_impl.rs
index f586cf083..6f79b3ba3 100644
--- a/src/test/ui/chalkify/lower_impl.rs
+++ b/tests/ui/chalkify/lower_impl.rs
@@ -1,5 +1,5 @@
 // check-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 trait Foo { }
 
diff --git a/tests/ui/chalkify/lower_struct.rs b/tests/ui/chalkify/lower_struct.rs
new file mode 100644
index 000000000..6be0d4dd5
--- /dev/null
+++ b/tests/ui/chalkify/lower_struct.rs
@@ -0,0 +1,8 @@
+// check-pass
+// compile-flags: -Z trait-solver=chalk
+
+struct Foo<'a, T> where Box<T>: Clone {
+    _x: std::marker::PhantomData<&'a T>,
+}
+
+fn main() { }
diff --git a/tests/ui/chalkify/lower_trait.rs b/tests/ui/chalkify/lower_trait.rs
new file mode 100644
index 000000000..8f5b35822
--- /dev/null
+++ b/tests/ui/chalkify/lower_trait.rs
@@ -0,0 +1,11 @@
+// check-pass
+// compile-flags: -Z trait-solver=chalk
+
+trait Bar { }
+
+trait Foo<S, T: ?Sized> {
+    type Assoc: Bar + ?Sized;
+}
+
+fn main() {
+}
diff --git a/tests/ui/chalkify/lower_trait_higher_rank.rs b/tests/ui/chalkify/lower_trait_higher_rank.rs
new file mode 100644
index 000000000..f04a1deea
--- /dev/null
+++ b/tests/ui/chalkify/lower_trait_higher_rank.rs
@@ -0,0 +1,9 @@
+// check-pass
+// compile-flags: -Z trait-solver=chalk
+
+trait Foo<F: ?Sized> where for<'a> F: Fn(&'a (u8, u16)) -> &'a u8
+{
+}
+
+fn main() {
+}
diff --git a/src/test/ui/chalkify/lower_trait_where_clause.rs b/tests/ui/chalkify/lower_trait_where_clause.rs
index 19cff8db7..a21d2f319 100644
--- a/src/test/ui/chalkify/lower_trait_where_clause.rs
+++ b/tests/ui/chalkify/lower_trait_where_clause.rs
@@ -1,5 +1,5 @@
 // check-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 use std::borrow::Borrow;
 
diff --git a/tests/ui/chalkify/println.rs b/tests/ui/chalkify/println.rs
new file mode 100644
index 000000000..edddc3821
--- /dev/null
+++ b/tests/ui/chalkify/println.rs
@@ -0,0 +1,6 @@
+// check-pass
+// compile-flags: -Z trait-solver=chalk
+
+fn main() {
+    println!("hello");
+}
diff --git a/src/test/ui/chalkify/projection.rs b/tests/ui/chalkify/projection.rs
index d6a8dd7a4..19bb2ae14 100644
--- a/src/test/ui/chalkify/projection.rs
+++ b/tests/ui/chalkify/projection.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 trait Foo { }
 
diff --git a/tests/ui/chalkify/recursive_where_clause_on_type.rs b/tests/ui/chalkify/recursive_where_clause_on_type.rs
new file mode 100644
index 000000000..c2c8aa6aa
--- /dev/null
+++ b/tests/ui/chalkify/recursive_where_clause_on_type.rs
@@ -0,0 +1,30 @@
+// FIXME(chalk): should fail, see comments
+// check-fail
+// compile-flags: -Z trait-solver=chalk
+
+#![feature(trivial_bounds)]
+
+trait Bar {
+    fn foo();
+}
+trait Foo: Bar { }
+
+struct S where S: Foo;
+
+impl Foo for S {
+}
+
+fn bar<T: Bar>() {
+    T::foo();
+}
+
+fn foo<T: Foo>() {
+    bar::<T>()
+}
+
+fn main() {
+    // For some reason, the error is duplicated...
+
+    foo::<S>() //~ ERROR the type `S` is not well-formed
+    //~^ ERROR the type `S` is not well-formed
+}
diff --git a/tests/ui/chalkify/recursive_where_clause_on_type.stderr b/tests/ui/chalkify/recursive_where_clause_on_type.stderr
new file mode 100644
index 000000000..cead5adea
--- /dev/null
+++ b/tests/ui/chalkify/recursive_where_clause_on_type.stderr
@@ -0,0 +1,14 @@
+error: the type `S` is not well-formed
+  --> $DIR/recursive_where_clause_on_type.rs:28:11
+   |
+LL |     foo::<S>()
+   |           ^
+
+error: the type `S` is not well-formed
+  --> $DIR/recursive_where_clause_on_type.rs:28:5
+   |
+LL |     foo::<S>()
+   |     ^^^^^^^^
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/chalkify/super_trait.rs b/tests/ui/chalkify/super_trait.rs
index eeff9fd9b..540ae51e5 100644
--- a/src/test/ui/chalkify/super_trait.rs
+++ b/tests/ui/chalkify/super_trait.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 trait Foo { }
 trait Bar: Foo { }
diff --git a/src/test/ui/chalkify/trait-objects.rs b/tests/ui/chalkify/trait-objects.rs
index d56abc42b..144d9788b 100644
--- a/src/test/ui/chalkify/trait-objects.rs
+++ b/tests/ui/chalkify/trait-objects.rs
@@ -1,5 +1,5 @@
 // check-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 use std::fmt::Display;
 
diff --git a/src/test/ui/chalkify/trait_implied_bound.rs b/tests/ui/chalkify/trait_implied_bound.rs
index 8a2e1cf59..f97dbf6b7 100644
--- a/src/test/ui/chalkify/trait_implied_bound.rs
+++ b/tests/ui/chalkify/trait_implied_bound.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 trait Foo { }
 trait Bar<U> where U: Foo { }
diff --git a/src/test/ui/chalkify/type_implied_bound.rs b/tests/ui/chalkify/type_implied_bound.rs
index 8673f5319..70f1b4265 100644
--- a/src/test/ui/chalkify/type_implied_bound.rs
+++ b/tests/ui/chalkify/type_implied_bound.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 trait Eq { }
 trait Hash: Eq { }
diff --git a/src/test/ui/chalkify/type_inference.rs b/tests/ui/chalkify/type_inference.rs
index 369777a79..d7167d0dc 100644
--- a/src/test/ui/chalkify/type_inference.rs
+++ b/tests/ui/chalkify/type_inference.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 trait Foo { }
 impl Foo for i32 { }
diff --git a/src/test/ui/chalkify/type_inference.stderr b/tests/ui/chalkify/type_inference.stderr
index 508a6dd13..508a6dd13 100644
--- a/src/test/ui/chalkify/type_inference.stderr
+++ b/tests/ui/chalkify/type_inference.stderr
diff --git a/src/test/ui/chalkify/type_wf.rs b/tests/ui/chalkify/type_wf.rs
index eeeefcfb7..37d2f5ca8 100644
--- a/src/test/ui/chalkify/type_wf.rs
+++ b/tests/ui/chalkify/type_wf.rs
@@ -1,5 +1,5 @@
 // check-fail
-// compile-flags: -Z chalk
+// compile-flags: -Z trait-solver=chalk
 
 trait Foo { }
 
diff --git a/src/test/ui/chalkify/type_wf.stderr b/tests/ui/chalkify/type_wf.stderr
index 6e8daf635..6e8daf635 100644
--- a/src/test/ui/chalkify/type_wf.stderr
+++ b/tests/ui/chalkify/type_wf.stderr
diff --git a/src/test/ui/char.rs b/tests/ui/char.rs
index cfb7a37af..cfb7a37af 100644
--- a/src/test/ui/char.rs
+++ b/tests/ui/char.rs
diff --git a/src/test/ui/check-cfg/allow-at-crate-level.rs b/tests/ui/check-cfg/allow-at-crate-level.rs
index ce3383a29..ce3383a29 100644
--- a/src/test/ui/check-cfg/allow-at-crate-level.rs
+++ b/tests/ui/check-cfg/allow-at-crate-level.rs
diff --git a/src/test/ui/check-cfg/allow-macro-cfg.rs b/tests/ui/check-cfg/allow-macro-cfg.rs
index 8016a4d19..8016a4d19 100644
--- a/src/test/ui/check-cfg/allow-macro-cfg.rs
+++ b/tests/ui/check-cfg/allow-macro-cfg.rs
diff --git a/src/test/ui/check-cfg/allow-same-level.rs b/tests/ui/check-cfg/allow-same-level.rs
index 6c869dc42..6c869dc42 100644
--- a/src/test/ui/check-cfg/allow-same-level.rs
+++ b/tests/ui/check-cfg/allow-same-level.rs
diff --git a/src/test/ui/check-cfg/allow-same-level.stderr b/tests/ui/check-cfg/allow-same-level.stderr
index 7797de584..7797de584 100644
--- a/src/test/ui/check-cfg/allow-same-level.stderr
+++ b/tests/ui/check-cfg/allow-same-level.stderr
diff --git a/src/test/ui/check-cfg/allow-top-level.rs b/tests/ui/check-cfg/allow-top-level.rs
index d14b0eae5..d14b0eae5 100644
--- a/src/test/ui/check-cfg/allow-top-level.rs
+++ b/tests/ui/check-cfg/allow-top-level.rs
diff --git a/src/test/ui/check-cfg/allow-upper-level.rs b/tests/ui/check-cfg/allow-upper-level.rs
index 04340694d..04340694d 100644
--- a/src/test/ui/check-cfg/allow-upper-level.rs
+++ b/tests/ui/check-cfg/allow-upper-level.rs
diff --git a/src/test/ui/check-cfg/compact-names.rs b/tests/ui/check-cfg/compact-names.rs
index bff807400..bff807400 100644
--- a/src/test/ui/check-cfg/compact-names.rs
+++ b/tests/ui/check-cfg/compact-names.rs
diff --git a/src/test/ui/check-cfg/compact-names.stderr b/tests/ui/check-cfg/compact-names.stderr
index f1fc4285a..f1fc4285a 100644
--- a/src/test/ui/check-cfg/compact-names.stderr
+++ b/tests/ui/check-cfg/compact-names.stderr
diff --git a/src/test/ui/check-cfg/compact-values.rs b/tests/ui/check-cfg/compact-values.rs
index 1f1705784..1f1705784 100644
--- a/src/test/ui/check-cfg/compact-values.rs
+++ b/tests/ui/check-cfg/compact-values.rs
diff --git a/src/test/ui/check-cfg/compact-values.stderr b/tests/ui/check-cfg/compact-values.stderr
index 9864aa385..9864aa385 100644
--- a/src/test/ui/check-cfg/compact-values.stderr
+++ b/tests/ui/check-cfg/compact-values.stderr
diff --git a/src/test/ui/check-cfg/empty-names.rs b/tests/ui/check-cfg/empty-names.rs
index 046ff0364..046ff0364 100644
--- a/src/test/ui/check-cfg/empty-names.rs
+++ b/tests/ui/check-cfg/empty-names.rs
diff --git a/src/test/ui/check-cfg/empty-names.stderr b/tests/ui/check-cfg/empty-names.stderr
index f926d1133..f926d1133 100644
--- a/src/test/ui/check-cfg/empty-names.stderr
+++ b/tests/ui/check-cfg/empty-names.stderr
diff --git a/src/test/ui/check-cfg/empty-values.rs b/tests/ui/check-cfg/empty-values.rs
index 9bda42e5d..9bda42e5d 100644
--- a/src/test/ui/check-cfg/empty-values.rs
+++ b/tests/ui/check-cfg/empty-values.rs
diff --git a/src/test/ui/check-cfg/empty-values.stderr b/tests/ui/check-cfg/empty-values.stderr
index a0168b2ca..a0168b2ca 100644
--- a/src/test/ui/check-cfg/empty-values.stderr
+++ b/tests/ui/check-cfg/empty-values.stderr
diff --git a/src/test/ui/check-cfg/invalid-arguments.anything_else.stderr b/tests/ui/check-cfg/invalid-arguments.anything_else.stderr
index 850924d99..850924d99 100644
--- a/src/test/ui/check-cfg/invalid-arguments.anything_else.stderr
+++ b/tests/ui/check-cfg/invalid-arguments.anything_else.stderr
diff --git a/src/test/ui/check-cfg/invalid-arguments.names_simple_ident.stderr b/tests/ui/check-cfg/invalid-arguments.names_simple_ident.stderr
index 8fadcc1f9..8fadcc1f9 100644
--- a/src/test/ui/check-cfg/invalid-arguments.names_simple_ident.stderr
+++ b/tests/ui/check-cfg/invalid-arguments.names_simple_ident.stderr
diff --git a/src/test/ui/check-cfg/invalid-arguments.rs b/tests/ui/check-cfg/invalid-arguments.rs
index 5090ce3e8..5090ce3e8 100644
--- a/src/test/ui/check-cfg/invalid-arguments.rs
+++ b/tests/ui/check-cfg/invalid-arguments.rs
diff --git a/src/test/ui/check-cfg/invalid-arguments.values_simple_ident.stderr b/tests/ui/check-cfg/invalid-arguments.values_simple_ident.stderr
index 061d3f0e9..061d3f0e9 100644
--- a/src/test/ui/check-cfg/invalid-arguments.values_simple_ident.stderr
+++ b/tests/ui/check-cfg/invalid-arguments.values_simple_ident.stderr
diff --git a/src/test/ui/check-cfg/invalid-arguments.values_string_literals.stderr b/tests/ui/check-cfg/invalid-arguments.values_string_literals.stderr
index 5853b4741..5853b4741 100644
--- a/src/test/ui/check-cfg/invalid-arguments.values_string_literals.stderr
+++ b/tests/ui/check-cfg/invalid-arguments.values_string_literals.stderr
diff --git a/src/test/ui/check-cfg/invalid-cfg-name.rs b/tests/ui/check-cfg/invalid-cfg-name.rs
index 8499d3d44..8499d3d44 100644
--- a/src/test/ui/check-cfg/invalid-cfg-name.rs
+++ b/tests/ui/check-cfg/invalid-cfg-name.rs
diff --git a/src/test/ui/check-cfg/invalid-cfg-name.stderr b/tests/ui/check-cfg/invalid-cfg-name.stderr
index 2bd1821c9..2bd1821c9 100644
--- a/src/test/ui/check-cfg/invalid-cfg-name.stderr
+++ b/tests/ui/check-cfg/invalid-cfg-name.stderr
diff --git a/src/test/ui/check-cfg/invalid-cfg-value.rs b/tests/ui/check-cfg/invalid-cfg-value.rs
index 9e428d367..9e428d367 100644
--- a/src/test/ui/check-cfg/invalid-cfg-value.rs
+++ b/tests/ui/check-cfg/invalid-cfg-value.rs
diff --git a/src/test/ui/check-cfg/invalid-cfg-value.stderr b/tests/ui/check-cfg/invalid-cfg-value.stderr
index 60abcb188..60abcb188 100644
--- a/src/test/ui/check-cfg/invalid-cfg-value.stderr
+++ b/tests/ui/check-cfg/invalid-cfg-value.stderr
diff --git a/src/test/ui/check-cfg/mix.rs b/tests/ui/check-cfg/mix.rs
index 4e488fc03..4e488fc03 100644
--- a/src/test/ui/check-cfg/mix.rs
+++ b/tests/ui/check-cfg/mix.rs
diff --git a/src/test/ui/check-cfg/mix.stderr b/tests/ui/check-cfg/mix.stderr
index 9cf887ec7..9cf887ec7 100644
--- a/src/test/ui/check-cfg/mix.stderr
+++ b/tests/ui/check-cfg/mix.stderr
diff --git a/src/test/ui/check-cfg/no-values.rs b/tests/ui/check-cfg/no-values.rs
index 8c80f56cb..8c80f56cb 100644
--- a/src/test/ui/check-cfg/no-values.rs
+++ b/tests/ui/check-cfg/no-values.rs
diff --git a/src/test/ui/check-cfg/no-values.stderr b/tests/ui/check-cfg/no-values.stderr
index 8c926d187..8c926d187 100644
--- a/src/test/ui/check-cfg/no-values.stderr
+++ b/tests/ui/check-cfg/no-values.stderr
diff --git a/src/test/ui/check-cfg/stmt-no-ice.rs b/tests/ui/check-cfg/stmt-no-ice.rs
index cf76487ed..cf76487ed 100644
--- a/src/test/ui/check-cfg/stmt-no-ice.rs
+++ b/tests/ui/check-cfg/stmt-no-ice.rs
diff --git a/src/test/ui/check-cfg/stmt-no-ice.stderr b/tests/ui/check-cfg/stmt-no-ice.stderr
index da65b5969..da65b5969 100644
--- a/src/test/ui/check-cfg/stmt-no-ice.stderr
+++ b/tests/ui/check-cfg/stmt-no-ice.stderr
diff --git a/src/test/ui/check-cfg/well-known-names.rs b/tests/ui/check-cfg/well-known-names.rs
index e57fb69a1..e57fb69a1 100644
--- a/src/test/ui/check-cfg/well-known-names.rs
+++ b/tests/ui/check-cfg/well-known-names.rs
diff --git a/src/test/ui/check-cfg/well-known-names.stderr b/tests/ui/check-cfg/well-known-names.stderr
index bdbe4d29d..bdbe4d29d 100644
--- a/src/test/ui/check-cfg/well-known-names.stderr
+++ b/tests/ui/check-cfg/well-known-names.stderr
diff --git a/src/test/ui/check-cfg/well-known-values.rs b/tests/ui/check-cfg/well-known-values.rs
index 96375dc8d..96375dc8d 100644
--- a/src/test/ui/check-cfg/well-known-values.rs
+++ b/tests/ui/check-cfg/well-known-values.rs
diff --git a/src/test/ui/check-cfg/well-known-values.stderr b/tests/ui/check-cfg/well-known-values.stderr
index 29ececea5..69d799783 100644
--- a/src/test/ui/check-cfg/well-known-values.stderr
+++ b/tests/ui/check-cfg/well-known-values.stderr
@@ -6,7 +6,7 @@ LL | #[cfg(target_os = "linuz")]
    |                   |
    |                   help: did you mean: `"linux"`
    |
-   = note: expected values for `target_os` are: aix, android, cuda, dragonfly, emscripten, espidf, freebsd, fuchsia, haiku, hermit, horizon, illumos, ios, l4re, linux, macos, netbsd, none, nto, openbsd, psp, redox, solaris, solid_asp3, tvos, uefi, unknown, vxworks, wasi, watchos, windows, xous
+   = note: expected values for `target_os` are: aix, android, cuda, dragonfly, emscripten, espidf, freebsd, fuchsia, haiku, hermit, horizon, illumos, ios, l4re, linux, macos, netbsd, none, nto, openbsd, psp, redox, solaris, solid_asp3, tvos, uefi, unknown, vita, vxworks, wasi, watchos, windows, xous
    = note: `#[warn(unexpected_cfgs)]` on by default
 
 warning: unexpected `cfg` condition value
diff --git a/src/test/ui/check-static-immutable-mut-slices.rs b/tests/ui/check-static-immutable-mut-slices.rs
index 8f9680778..8f9680778 100644
--- a/src/test/ui/check-static-immutable-mut-slices.rs
+++ b/tests/ui/check-static-immutable-mut-slices.rs
diff --git a/src/test/ui/check-static-immutable-mut-slices.stderr b/tests/ui/check-static-immutable-mut-slices.stderr
index a32a94c13..a32a94c13 100644
--- a/src/test/ui/check-static-immutable-mut-slices.stderr
+++ b/tests/ui/check-static-immutable-mut-slices.stderr
diff --git a/src/test/ui/check-static-recursion-foreign.rs b/tests/ui/check-static-recursion-foreign.rs
index 3072deb6c..3072deb6c 100644
--- a/src/test/ui/check-static-recursion-foreign.rs
+++ b/tests/ui/check-static-recursion-foreign.rs
diff --git a/src/test/ui/check-static-values-constraints.rs b/tests/ui/check-static-values-constraints.rs
index f6a577d0d..f6a577d0d 100644
--- a/src/test/ui/check-static-values-constraints.rs
+++ b/tests/ui/check-static-values-constraints.rs
diff --git a/src/test/ui/check-static-values-constraints.stderr b/tests/ui/check-static-values-constraints.stderr
index 31939f7f6..490566784 100644
--- a/src/test/ui/check-static-values-constraints.stderr
+++ b/tests/ui/check-static-values-constraints.stderr
@@ -22,6 +22,7 @@ LL |     field2: SafeEnum::Variant4("str".to_string())
    |                                      ^^^^^^^^^^^
    |
    = note: calls in statics are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
    = note: consider wrapping this expression in `Lazy::new(|| ...)` from the `once_cell` crate: https://crates.io/crates/once_cell
 
 error[E0010]: allocations are not allowed in statics
@@ -58,10 +59,12 @@ error[E0507]: cannot move out of static item `x`
   --> $DIR/check-static-values-constraints.rs:110:45
    |
 LL |     let y = { static x: Box<isize> = box 3; x };
-   |                                             ^
-   |                                             |
-   |                                             move occurs because `x` has type `Box<isize>`, which does not implement the `Copy` trait
-   |                                             help: consider borrowing here: `&x`
+   |                                             ^ move occurs because `x` has type `Box<isize>`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let y = { static x: Box<isize> = box 3; &x };
+   |                                             +
 
 error[E0010]: allocations are not allowed in statics
   --> $DIR/check-static-values-constraints.rs:110:38
diff --git a/src/test/ui/class-cast-to-trait.rs b/tests/ui/class-cast-to-trait.rs
index 345d6efd2..345d6efd2 100644
--- a/src/test/ui/class-cast-to-trait.rs
+++ b/tests/ui/class-cast-to-trait.rs
diff --git a/src/test/ui/class-cast-to-trait.stderr b/tests/ui/class-cast-to-trait.stderr
index 56d10d88d..56d10d88d 100644
--- a/src/test/ui/class-cast-to-trait.stderr
+++ b/tests/ui/class-cast-to-trait.stderr
diff --git a/src/test/ui/class-method-missing.rs b/tests/ui/class-method-missing.rs
index 5dc18328f..5dc18328f 100644
--- a/src/test/ui/class-method-missing.rs
+++ b/tests/ui/class-method-missing.rs
diff --git a/src/test/ui/class-method-missing.stderr b/tests/ui/class-method-missing.stderr
index 3b4ac3a9a..3b4ac3a9a 100644
--- a/src/test/ui/class-method-missing.stderr
+++ b/tests/ui/class-method-missing.stderr
diff --git a/src/test/ui/cleanup-rvalue-for-scope.rs b/tests/ui/cleanup-rvalue-for-scope.rs
index b6582c01f..b6582c01f 100644
--- a/src/test/ui/cleanup-rvalue-for-scope.rs
+++ b/tests/ui/cleanup-rvalue-for-scope.rs
diff --git a/src/test/ui/cleanup-rvalue-scopes-cf.rs b/tests/ui/cleanup-rvalue-scopes-cf.rs
index e3cecb1bf..e3cecb1bf 100644
--- a/src/test/ui/cleanup-rvalue-scopes-cf.rs
+++ b/tests/ui/cleanup-rvalue-scopes-cf.rs
diff --git a/src/test/ui/cleanup-rvalue-scopes-cf.stderr b/tests/ui/cleanup-rvalue-scopes-cf.stderr
index 425cd7514..425cd7514 100644
--- a/src/test/ui/cleanup-rvalue-scopes-cf.stderr
+++ b/tests/ui/cleanup-rvalue-scopes-cf.stderr
diff --git a/src/test/ui/cleanup-rvalue-scopes.rs b/tests/ui/cleanup-rvalue-scopes.rs
index b80f95b79..b80f95b79 100644
--- a/src/test/ui/cleanup-rvalue-scopes.rs
+++ b/tests/ui/cleanup-rvalue-scopes.rs
diff --git a/src/test/ui/cleanup-rvalue-temp-during-incomplete-alloc.rs b/tests/ui/cleanup-rvalue-temp-during-incomplete-alloc.rs
index 6cd3781b7..6cd3781b7 100644
--- a/src/test/ui/cleanup-rvalue-temp-during-incomplete-alloc.rs
+++ b/tests/ui/cleanup-rvalue-temp-during-incomplete-alloc.rs
diff --git a/src/test/ui/cleanup-shortcircuit.rs b/tests/ui/cleanup-shortcircuit.rs
index fe867ce1f..fe867ce1f 100644
--- a/src/test/ui/cleanup-shortcircuit.rs
+++ b/tests/ui/cleanup-shortcircuit.rs
diff --git a/src/test/ui/close-over-big-then-small-data.rs b/tests/ui/close-over-big-then-small-data.rs
index 429b21e8b..429b21e8b 100644
--- a/src/test/ui/close-over-big-then-small-data.rs
+++ b/tests/ui/close-over-big-then-small-data.rs
diff --git a/src/test/ui/closure-expected-type/expect-fn-supply-fn-multiple.rs b/tests/ui/closure-expected-type/expect-fn-supply-fn-multiple.rs
index 5f02e642d..5f02e642d 100644
--- a/src/test/ui/closure-expected-type/expect-fn-supply-fn-multiple.rs
+++ b/tests/ui/closure-expected-type/expect-fn-supply-fn-multiple.rs
diff --git a/src/test/ui/closure-expected-type/expect-fn-supply-fn.rs b/tests/ui/closure-expected-type/expect-fn-supply-fn.rs
index 7f1c14027..7f1c14027 100644
--- a/src/test/ui/closure-expected-type/expect-fn-supply-fn.rs
+++ b/tests/ui/closure-expected-type/expect-fn-supply-fn.rs
diff --git a/src/test/ui/closure-expected-type/expect-fn-supply-fn.stderr b/tests/ui/closure-expected-type/expect-fn-supply-fn.stderr
index e6ddc6068..e6ddc6068 100644
--- a/src/test/ui/closure-expected-type/expect-fn-supply-fn.stderr
+++ b/tests/ui/closure-expected-type/expect-fn-supply-fn.stderr
diff --git a/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.rs b/tests/ui/closure-expected-type/expect-infer-var-appearing-twice.rs
index e5ec6b271..e5ec6b271 100644
--- a/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.rs
+++ b/tests/ui/closure-expected-type/expect-infer-var-appearing-twice.rs
diff --git a/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.stderr b/tests/ui/closure-expected-type/expect-infer-var-appearing-twice.stderr
index 8dccf929b..8dccf929b 100644
--- a/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.stderr
+++ b/tests/ui/closure-expected-type/expect-infer-var-appearing-twice.stderr
diff --git a/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-bound-region.rs b/tests/ui/closure-expected-type/expect-infer-var-supply-ty-with-bound-region.rs
index 0ee738c2c..0ee738c2c 100644
--- a/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-bound-region.rs
+++ b/tests/ui/closure-expected-type/expect-infer-var-supply-ty-with-bound-region.rs
diff --git a/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-free-region.rs b/tests/ui/closure-expected-type/expect-infer-var-supply-ty-with-free-region.rs
index 15711da4b..15711da4b 100644
--- a/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-free-region.rs
+++ b/tests/ui/closure-expected-type/expect-infer-var-supply-ty-with-free-region.rs
diff --git a/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.rs b/tests/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.rs
index 97d7a51a7..97d7a51a7 100644
--- a/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.rs
+++ b/tests/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.rs
diff --git a/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr b/tests/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr
index d5432755c..7a04ed738 100644
--- a/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr
+++ b/tests/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr
@@ -6,8 +6,8 @@ LL |     with_closure(|x: u32, y| {});
    |
 help: consider giving this closure parameter an explicit type
    |
-LL |     with_closure(|x: u32, y: _| {});
-   |                            +++
+LL |     with_closure(|x: u32, y: /* Type */| {});
+   |                            ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closure-expected-type/issue-24421.rs b/tests/ui/closure-expected-type/issue-24421.rs
index 2e104b599..2e104b599 100644
--- a/src/test/ui/closure-expected-type/issue-24421.rs
+++ b/tests/ui/closure-expected-type/issue-24421.rs
diff --git a/src/test/ui/closure_context/issue-26046-fn-mut.rs b/tests/ui/closure_context/issue-26046-fn-mut.rs
index 0a015ea14..0a015ea14 100644
--- a/src/test/ui/closure_context/issue-26046-fn-mut.rs
+++ b/tests/ui/closure_context/issue-26046-fn-mut.rs
diff --git a/src/test/ui/closure_context/issue-26046-fn-mut.stderr b/tests/ui/closure_context/issue-26046-fn-mut.stderr
index f744b71c2..f744b71c2 100644
--- a/src/test/ui/closure_context/issue-26046-fn-mut.stderr
+++ b/tests/ui/closure_context/issue-26046-fn-mut.stderr
diff --git a/src/test/ui/closure_context/issue-26046-fn-once.rs b/tests/ui/closure_context/issue-26046-fn-once.rs
index 511690e9d..511690e9d 100644
--- a/src/test/ui/closure_context/issue-26046-fn-once.rs
+++ b/tests/ui/closure_context/issue-26046-fn-once.rs
diff --git a/src/test/ui/closure_context/issue-26046-fn-once.stderr b/tests/ui/closure_context/issue-26046-fn-once.stderr
index 34f94f9dc..34f94f9dc 100644
--- a/src/test/ui/closure_context/issue-26046-fn-once.stderr
+++ b/tests/ui/closure_context/issue-26046-fn-once.stderr
diff --git a/src/test/ui/closure_context/issue-42065.rs b/tests/ui/closure_context/issue-42065.rs
index c506600f4..c506600f4 100644
--- a/src/test/ui/closure_context/issue-42065.rs
+++ b/tests/ui/closure_context/issue-42065.rs
diff --git a/src/test/ui/closure_context/issue-42065.stderr b/tests/ui/closure_context/issue-42065.stderr
index 896bb6dc6..896bb6dc6 100644
--- a/src/test/ui/closure_context/issue-42065.stderr
+++ b/tests/ui/closure_context/issue-42065.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/arrays-completely-captured.rs b/tests/ui/closures/2229_closure_analysis/arrays-completely-captured.rs
index 2bcbd792e..2bcbd792e 100644
--- a/src/test/ui/closures/2229_closure_analysis/arrays-completely-captured.rs
+++ b/tests/ui/closures/2229_closure_analysis/arrays-completely-captured.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/arrays-completely-captured.stderr b/tests/ui/closures/2229_closure_analysis/arrays-completely-captured.stderr
index 129b26456..129b26456 100644
--- a/src/test/ui/closures/2229_closure_analysis/arrays-completely-captured.stderr
+++ b/tests/ui/closures/2229_closure_analysis/arrays-completely-captured.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/by_value.rs b/tests/ui/closures/2229_closure_analysis/by_value.rs
index d8d3bbee2..d8d3bbee2 100644
--- a/src/test/ui/closures/2229_closure_analysis/by_value.rs
+++ b/tests/ui/closures/2229_closure_analysis/by_value.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/by_value.stderr b/tests/ui/closures/2229_closure_analysis/by_value.stderr
index 097462253..097462253 100644
--- a/src/test/ui/closures/2229_closure_analysis/by_value.stderr
+++ b/tests/ui/closures/2229_closure_analysis/by_value.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-analysis-1.rs b/tests/ui/closures/2229_closure_analysis/capture-analysis-1.rs
index dc53b3176..dc53b3176 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-analysis-1.rs
+++ b/tests/ui/closures/2229_closure_analysis/capture-analysis-1.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-analysis-1.stderr b/tests/ui/closures/2229_closure_analysis/capture-analysis-1.stderr
index fceafb9c8..fceafb9c8 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-analysis-1.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-analysis-1.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-analysis-2.rs b/tests/ui/closures/2229_closure_analysis/capture-analysis-2.rs
index 99d12f8d8..99d12f8d8 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-analysis-2.rs
+++ b/tests/ui/closures/2229_closure_analysis/capture-analysis-2.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-analysis-2.stderr b/tests/ui/closures/2229_closure_analysis/capture-analysis-2.stderr
index cb44ca266..cb44ca266 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-analysis-2.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-analysis-2.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-analysis-3.rs b/tests/ui/closures/2229_closure_analysis/capture-analysis-3.rs
index 3f337097d..3f337097d 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-analysis-3.rs
+++ b/tests/ui/closures/2229_closure_analysis/capture-analysis-3.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-analysis-3.stderr b/tests/ui/closures/2229_closure_analysis/capture-analysis-3.stderr
index 71e7bdc35..71e7bdc35 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-analysis-3.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-analysis-3.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-analysis-4.rs b/tests/ui/closures/2229_closure_analysis/capture-analysis-4.rs
index bc46ec997..bc46ec997 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-analysis-4.rs
+++ b/tests/ui/closures/2229_closure_analysis/capture-analysis-4.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-analysis-4.stderr b/tests/ui/closures/2229_closure_analysis/capture-analysis-4.stderr
index 7e6e625bc..7e6e625bc 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-analysis-4.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-analysis-4.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-disjoint-field-struct.rs b/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-struct.rs
index 6fd151553..6fd151553 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-disjoint-field-struct.rs
+++ b/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-struct.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-disjoint-field-struct.stderr b/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-struct.stderr
index 0f64ecf3a..0f64ecf3a 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-disjoint-field-struct.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-struct.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-disjoint-field-tuple.rs b/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-tuple.rs
index 8d3bb3262..8d3bb3262 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-disjoint-field-tuple.rs
+++ b/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-tuple.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-disjoint-field-tuple.stderr b/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-tuple.stderr
index a8ca9622a..a8ca9622a 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-disjoint-field-tuple.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-tuple.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-enum-field.rs b/tests/ui/closures/2229_closure_analysis/capture-enum-field.rs
index bbe3aa31a..bbe3aa31a 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-enum-field.rs
+++ b/tests/ui/closures/2229_closure_analysis/capture-enum-field.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-enums.rs b/tests/ui/closures/2229_closure_analysis/capture-enums.rs
index 322ae99b8..322ae99b8 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-enums.rs
+++ b/tests/ui/closures/2229_closure_analysis/capture-enums.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/capture-enums.stderr b/tests/ui/closures/2229_closure_analysis/capture-enums.stderr
index 8a6ba8444..8a6ba8444 100644
--- a/src/test/ui/closures/2229_closure_analysis/capture-enums.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-enums.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/deep-multilevel-struct.rs b/tests/ui/closures/2229_closure_analysis/deep-multilevel-struct.rs
index 3341166e2..3341166e2 100644
--- a/src/test/ui/closures/2229_closure_analysis/deep-multilevel-struct.rs
+++ b/tests/ui/closures/2229_closure_analysis/deep-multilevel-struct.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/deep-multilevel-struct.stderr b/tests/ui/closures/2229_closure_analysis/deep-multilevel-struct.stderr
index 29e1af043..29e1af043 100644
--- a/src/test/ui/closures/2229_closure_analysis/deep-multilevel-struct.stderr
+++ b/tests/ui/closures/2229_closure_analysis/deep-multilevel-struct.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/deep-multilevel-tuple.rs b/tests/ui/closures/2229_closure_analysis/deep-multilevel-tuple.rs
index 34b0132f3..34b0132f3 100644
--- a/src/test/ui/closures/2229_closure_analysis/deep-multilevel-tuple.rs
+++ b/tests/ui/closures/2229_closure_analysis/deep-multilevel-tuple.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/deep-multilevel-tuple.stderr b/tests/ui/closures/2229_closure_analysis/deep-multilevel-tuple.stderr
index e91751676..e91751676 100644
--- a/src/test/ui/closures/2229_closure_analysis/deep-multilevel-tuple.stderr
+++ b/tests/ui/closures/2229_closure_analysis/deep-multilevel-tuple.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/destructure_patterns.rs b/tests/ui/closures/2229_closure_analysis/destructure_patterns.rs
index 6c65a7bf8..6c65a7bf8 100644
--- a/src/test/ui/closures/2229_closure_analysis/destructure_patterns.rs
+++ b/tests/ui/closures/2229_closure_analysis/destructure_patterns.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/destructure_patterns.stderr b/tests/ui/closures/2229_closure_analysis/destructure_patterns.stderr
index 44fbe6d81..44fbe6d81 100644
--- a/src/test/ui/closures/2229_closure_analysis/destructure_patterns.stderr
+++ b/tests/ui/closures/2229_closure_analysis/destructure_patterns.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/arrays.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/arrays.rs
index f97e60daf..f97e60daf 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/arrays.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/arrays.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/arrays.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/arrays.stderr
index 4f41060dc..4f41060dc 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/arrays.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/arrays.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-1.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-1.rs
index 3664d76c2..3664d76c2 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-1.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-1.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-1.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-1.stderr
index 341d2bc65..341d2bc65 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-1.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-1.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-2.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-2.rs
index ae416bab6..ae416bab6 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-2.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-2.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-2.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-2.stderr
index 584bb862b..584bb862b 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-2.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-2.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-3.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-3.rs
index bdd6cb79b..00f50c33e 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-3.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-3.rs
@@ -8,10 +8,9 @@ struct Point {
 fn main() {
     let mut c = {
         let mut p = Point {x: "1".to_string(), y: "2".to_string() };
-        || {
+        || { //~ ERROR closure may outlive the current block, but it borrows `p`
            let x = &mut p.x;
            println!("{:?}", p);
-            //~^ ERROR `p` does not live long enough
         }
     };
     c();
diff --git a/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-3.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-3.stderr
new file mode 100644
index 000000000..ee9238047
--- /dev/null
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-3.stderr
@@ -0,0 +1,22 @@
+error[E0373]: closure may outlive the current block, but it borrows `p`, which is owned by the current block
+  --> $DIR/borrowck-3.rs:11:9
+   |
+LL |         || {
+   |         ^^ may outlive borrowed value `p`
+LL |            let x = &mut p.x;
+LL |            println!("{:?}", p);
+   |                             - `p` is borrowed here
+   |
+note: block requires argument type to outlive `'1`
+  --> $DIR/borrowck-3.rs:9:9
+   |
+LL |     let mut c = {
+   |         ^^^^^
+help: to force the closure to take ownership of `p` (and any other referenced variables), use the `move` keyword
+   |
+LL |         move || {
+   |         ++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0373`.
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-4.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-4.rs
index a2290d850..a2290d850 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-4.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-4.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-4.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-4.stderr
index 46379a381..46379a381 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-4.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-4.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-closures-mut-and-imm.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-closures-mut-and-imm.rs
index 5ff7b1242..5ff7b1242 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-closures-mut-and-imm.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-closures-mut-and-imm.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-closures-mut-and-imm.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-closures-mut-and-imm.stderr
index 5f1dae297..5f1dae297 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-closures-mut-and-imm.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-closures-mut-and-imm.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/box.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/box.rs
index a110fa4e2..a110fa4e2 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/box.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/box.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/box.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/box.stderr
index f8b178752..f8b178752 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/box.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/box.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm-borrow.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm-borrow.rs
index 77effcb00..77effcb00 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm-borrow.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm-borrow.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm-borrow.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm-borrow.stderr
index 38c530b80..38c530b80 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm-borrow.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm-borrow.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm.rs
index 25ee9a149..25ee9a149 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm.stderr
index 98414fa8a..98414fa8a 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/cant-mutate-imm.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-array-diagnostics.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-array-diagnostics.rs
index f3be542e4..f3be542e4 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-array-diagnostics.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-array-diagnostics.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-array-diagnostics.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-array-diagnostics.stderr
index 309c63e52..309c63e52 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-array-diagnostics.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-array-diagnostics.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-multi-variant-diagnostics.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-multi-variant-diagnostics.rs
index aa85b55b1..aa85b55b1 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-multi-variant-diagnostics.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-multi-variant-diagnostics.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-multi-variant-diagnostics.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-multi-variant-diagnostics.stderr
index 83d282aad..83d282aad 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-multi-variant-diagnostics.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-multi-variant-diagnostics.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-single-variant-diagnostics.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-single-variant-diagnostics.rs
index bedb103cc..bedb103cc 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-single-variant-diagnostics.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-single-variant-diagnostics.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-single-variant-diagnostics.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-single-variant-diagnostics.stderr
index 46323b752..46323b752 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-single-variant-diagnostics.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-single-variant-diagnostics.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-struct-diagnostics.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-struct-diagnostics.rs
index 3277a83c4..3277a83c4 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-struct-diagnostics.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-struct-diagnostics.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-struct-diagnostics.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-struct-diagnostics.stderr
index 25029cc7b..25029cc7b 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-struct-diagnostics.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-struct-diagnostics.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics-1.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics-1.rs
index dc3a57ae7..dc3a57ae7 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics-1.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics-1.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics-1.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics-1.stderr
index 06ef7baf9..06ef7baf9 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics-1.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics-1.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics.rs
index fa1328013..fa1328013 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics.stderr
index 3e77635f9..3e77635f9 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/closure-origin-tuple-diagnostics.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/liveness.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/liveness.rs
index 3399bc001..3399bc001 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/liveness.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/liveness.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/liveness.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/liveness.stderr
index cf414adc0..cf414adc0 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/liveness.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/liveness.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/liveness_unintentional_copy.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/liveness_unintentional_copy.rs
index 465c9476b..465c9476b 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/liveness_unintentional_copy.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/liveness_unintentional_copy.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/liveness_unintentional_copy.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/liveness_unintentional_copy.stderr
index 0410de4c7..0410de4c7 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/liveness_unintentional_copy.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/liveness_unintentional_copy.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/multilevel-path.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/multilevel-path.rs
index fa73ff23f..fa73ff23f 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/multilevel-path.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/multilevel-path.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/multilevel-path.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/multilevel-path.stderr
index ac4c9c937..ac4c9c937 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/multilevel-path.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/multilevel-path.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/mut_ref.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/mut_ref.rs
index 3d5a31e8b..3d5a31e8b 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/mut_ref.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/mut_ref.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/mut_ref.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/mut_ref.stderr
index 481d7e585..95f36fc04 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/mut_ref.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/mut_ref.stderr
@@ -1,14 +1,16 @@
 error[E0596]: cannot borrow `**ref_mref_x` as mutable, as it is behind a `&` reference
   --> $DIR/mut_ref.rs:12:13
    |
-LL |     let ref_mref_x = &mref_x;
-   |                      ------- help: consider changing this to be a mutable reference: `&mut mref_x`
-LL |
 LL |     let c = || {
    |             ^^ `ref_mref_x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
 LL |
 LL |         **ref_mref_x = y;
    |         ------------ mutable borrow occurs due to use of `**ref_mref_x` in closure
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let ref_mref_x = &mut mref_x;
+   |                      ~~~~~~~~~~~
 
 error[E0596]: cannot borrow `**mref_ref_x` as mutable, as it is behind a `&` reference
   --> $DIR/mut_ref.rs:26:13
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/repr_packed.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/repr_packed.rs
index 1488f3296..1488f3296 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/repr_packed.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/repr_packed.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/repr_packed.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/repr_packed.stderr
index 508c4b911..508c4b911 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/repr_packed.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/repr_packed.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/simple-struct-min-capture.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/simple-struct-min-capture.rs
index ed2d9a3de..ed2d9a3de 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/simple-struct-min-capture.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/simple-struct-min-capture.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/simple-struct-min-capture.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/simple-struct-min-capture.stderr
index 06157b2af..06157b2af 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/simple-struct-min-capture.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/simple-struct-min-capture.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/union.rs b/tests/ui/closures/2229_closure_analysis/diagnostics/union.rs
index 46b54846e..46b54846e 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/union.rs
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/union.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/union.stderr b/tests/ui/closures/2229_closure_analysis/diagnostics/union.stderr
index 7c34e2336..7c34e2336 100644
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/union.stderr
+++ b/tests/ui/closures/2229_closure_analysis/diagnostics/union.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/feature-gate-capture_disjoint_fields.rs b/tests/ui/closures/2229_closure_analysis/feature-gate-capture_disjoint_fields.rs
index 269cf76e6..269cf76e6 100644
--- a/src/test/ui/closures/2229_closure_analysis/feature-gate-capture_disjoint_fields.rs
+++ b/tests/ui/closures/2229_closure_analysis/feature-gate-capture_disjoint_fields.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/feature-gate-capture_disjoint_fields.stderr b/tests/ui/closures/2229_closure_analysis/feature-gate-capture_disjoint_fields.stderr
index b936c5ee3..b936c5ee3 100644
--- a/src/test/ui/closures/2229_closure_analysis/feature-gate-capture_disjoint_fields.stderr
+++ b/tests/ui/closures/2229_closure_analysis/feature-gate-capture_disjoint_fields.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/filter-on-struct-member.rs b/tests/ui/closures/2229_closure_analysis/filter-on-struct-member.rs
index bfa3ebcd6..bfa3ebcd6 100644
--- a/src/test/ui/closures/2229_closure_analysis/filter-on-struct-member.rs
+++ b/tests/ui/closures/2229_closure_analysis/filter-on-struct-member.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/filter-on-struct-member.stderr b/tests/ui/closures/2229_closure_analysis/filter-on-struct-member.stderr
index 10e0d076b..10e0d076b 100644
--- a/src/test/ui/closures/2229_closure_analysis/filter-on-struct-member.stderr
+++ b/tests/ui/closures/2229_closure_analysis/filter-on-struct-member.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/issue-87378.rs b/tests/ui/closures/2229_closure_analysis/issue-87378.rs
index 75901a571..75901a571 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue-87378.rs
+++ b/tests/ui/closures/2229_closure_analysis/issue-87378.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/issue-87378.stderr b/tests/ui/closures/2229_closure_analysis/issue-87378.stderr
index 16c3f7c97..16c3f7c97 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue-87378.stderr
+++ b/tests/ui/closures/2229_closure_analysis/issue-87378.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/issue-87987.rs b/tests/ui/closures/2229_closure_analysis/issue-87987.rs
index d26343c33..d26343c33 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue-87987.rs
+++ b/tests/ui/closures/2229_closure_analysis/issue-87987.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/issue-87987.stderr b/tests/ui/closures/2229_closure_analysis/issue-87987.stderr
index 5696a010c..5696a010c 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue-87987.stderr
+++ b/tests/ui/closures/2229_closure_analysis/issue-87987.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/issue-88118-2.rs b/tests/ui/closures/2229_closure_analysis/issue-88118-2.rs
index 0cfb1a55b..0cfb1a55b 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue-88118-2.rs
+++ b/tests/ui/closures/2229_closure_analysis/issue-88118-2.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/issue-88118-2.stderr b/tests/ui/closures/2229_closure_analysis/issue-88118-2.stderr
index b3cb558f9..b3cb558f9 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue-88118-2.stderr
+++ b/tests/ui/closures/2229_closure_analysis/issue-88118-2.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/issue-88476.rs b/tests/ui/closures/2229_closure_analysis/issue-88476.rs
index f5906d306..f5906d306 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue-88476.rs
+++ b/tests/ui/closures/2229_closure_analysis/issue-88476.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/issue-88476.stderr b/tests/ui/closures/2229_closure_analysis/issue-88476.stderr
index c7c9ecbbb..c7c9ecbbb 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue-88476.stderr
+++ b/tests/ui/closures/2229_closure_analysis/issue-88476.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/issue-89606.rs b/tests/ui/closures/2229_closure_analysis/issue-89606.rs
index 1bb6aa40f..1bb6aa40f 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue-89606.rs
+++ b/tests/ui/closures/2229_closure_analysis/issue-89606.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/issue-90465.fixed b/tests/ui/closures/2229_closure_analysis/issue-90465.fixed
index 4e0b18e72..4e0b18e72 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue-90465.fixed
+++ b/tests/ui/closures/2229_closure_analysis/issue-90465.fixed
diff --git a/src/test/ui/closures/2229_closure_analysis/issue-90465.rs b/tests/ui/closures/2229_closure_analysis/issue-90465.rs
index 466e6dbab..466e6dbab 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue-90465.rs
+++ b/tests/ui/closures/2229_closure_analysis/issue-90465.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/issue-90465.stderr b/tests/ui/closures/2229_closure_analysis/issue-90465.stderr
index c1679c6b6..c1679c6b6 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue-90465.stderr
+++ b/tests/ui/closures/2229_closure_analysis/issue-90465.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/issue-92724-needsdrop-query-cycle.rs b/tests/ui/closures/2229_closure_analysis/issue-92724-needsdrop-query-cycle.rs
index a3b17755f..a3b17755f 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue-92724-needsdrop-query-cycle.rs
+++ b/tests/ui/closures/2229_closure_analysis/issue-92724-needsdrop-query-cycle.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/issue_88118.rs b/tests/ui/closures/2229_closure_analysis/issue_88118.rs
index 453b7e04a..453b7e04a 100644
--- a/src/test/ui/closures/2229_closure_analysis/issue_88118.rs
+++ b/tests/ui/closures/2229_closure_analysis/issue_88118.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/match/auxiliary/match_non_exhaustive_lib.rs b/tests/ui/closures/2229_closure_analysis/match/auxiliary/match_non_exhaustive_lib.rs
index 4060c4093..4060c4093 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/auxiliary/match_non_exhaustive_lib.rs
+++ b/tests/ui/closures/2229_closure_analysis/match/auxiliary/match_non_exhaustive_lib.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/match/issue-87097.rs b/tests/ui/closures/2229_closure_analysis/match/issue-87097.rs
index 815fc0a71..815fc0a71 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/issue-87097.rs
+++ b/tests/ui/closures/2229_closure_analysis/match/issue-87097.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/match/issue-87097.stderr b/tests/ui/closures/2229_closure_analysis/match/issue-87097.stderr
index 39ec71ba2..39ec71ba2 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/issue-87097.stderr
+++ b/tests/ui/closures/2229_closure_analysis/match/issue-87097.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/match/issue-87426.rs b/tests/ui/closures/2229_closure_analysis/match/issue-87426.rs
index 74506979a..74506979a 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/issue-87426.rs
+++ b/tests/ui/closures/2229_closure_analysis/match/issue-87426.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/match/issue-87988.rs b/tests/ui/closures/2229_closure_analysis/match/issue-87988.rs
index 27e7fabf1..27e7fabf1 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/issue-87988.rs
+++ b/tests/ui/closures/2229_closure_analysis/match/issue-87988.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/match/issue-88331.rs b/tests/ui/closures/2229_closure_analysis/match/issue-88331.rs
index 0a6d71c68..0a6d71c68 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/issue-88331.rs
+++ b/tests/ui/closures/2229_closure_analysis/match/issue-88331.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/match/issue-88331.stderr b/tests/ui/closures/2229_closure_analysis/match/issue-88331.stderr
index 7e22defa9..7e22defa9 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/issue-88331.stderr
+++ b/tests/ui/closures/2229_closure_analysis/match/issue-88331.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/match/match-edge-cases_1.rs b/tests/ui/closures/2229_closure_analysis/match/match-edge-cases_1.rs
index 914ebbe26..914ebbe26 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/match-edge-cases_1.rs
+++ b/tests/ui/closures/2229_closure_analysis/match/match-edge-cases_1.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/match/match-edge-cases_2.rs b/tests/ui/closures/2229_closure_analysis/match/match-edge-cases_2.rs
index ae724f9c3..ae724f9c3 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/match-edge-cases_2.rs
+++ b/tests/ui/closures/2229_closure_analysis/match/match-edge-cases_2.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/match/match-edge-cases_2.stderr b/tests/ui/closures/2229_closure_analysis/match/match-edge-cases_2.stderr
index 1e42d73c6..1e42d73c6 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/match-edge-cases_2.stderr
+++ b/tests/ui/closures/2229_closure_analysis/match/match-edge-cases_2.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/match/non-exhaustive-match.rs b/tests/ui/closures/2229_closure_analysis/match/non-exhaustive-match.rs
index 972c24c23..972c24c23 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/non-exhaustive-match.rs
+++ b/tests/ui/closures/2229_closure_analysis/match/non-exhaustive-match.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/match/non-exhaustive-match.stderr b/tests/ui/closures/2229_closure_analysis/match/non-exhaustive-match.stderr
index 3a5fad154..3a5fad154 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/non-exhaustive-match.stderr
+++ b/tests/ui/closures/2229_closure_analysis/match/non-exhaustive-match.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/match/pattern-matching-should-fail.rs b/tests/ui/closures/2229_closure_analysis/match/pattern-matching-should-fail.rs
index 69cf920de..69cf920de 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/pattern-matching-should-fail.rs
+++ b/tests/ui/closures/2229_closure_analysis/match/pattern-matching-should-fail.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/match/pattern-matching-should-fail.stderr b/tests/ui/closures/2229_closure_analysis/match/pattern-matching-should-fail.stderr
index ad061d93c..ad061d93c 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/pattern-matching-should-fail.stderr
+++ b/tests/ui/closures/2229_closure_analysis/match/pattern-matching-should-fail.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/match/patterns-capture-analysis.rs b/tests/ui/closures/2229_closure_analysis/match/patterns-capture-analysis.rs
index 56f5ac44d..56f5ac44d 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/patterns-capture-analysis.rs
+++ b/tests/ui/closures/2229_closure_analysis/match/patterns-capture-analysis.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/match/patterns-capture-analysis.stderr b/tests/ui/closures/2229_closure_analysis/match/patterns-capture-analysis.stderr
index 460813333..460813333 100644
--- a/src/test/ui/closures/2229_closure_analysis/match/patterns-capture-analysis.stderr
+++ b/tests/ui/closures/2229_closure_analysis/match/patterns-capture-analysis.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/auto_traits.fixed b/tests/ui/closures/2229_closure_analysis/migrations/auto_traits.fixed
index 26703fbf8..26703fbf8 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/auto_traits.fixed
+++ b/tests/ui/closures/2229_closure_analysis/migrations/auto_traits.fixed
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/auto_traits.rs b/tests/ui/closures/2229_closure_analysis/migrations/auto_traits.rs
index 932db51d4..932db51d4 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/auto_traits.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/auto_traits.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/auto_traits.stderr b/tests/ui/closures/2229_closure_analysis/migrations/auto_traits.stderr
index 3a42cc8b8..3a42cc8b8 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/auto_traits.stderr
+++ b/tests/ui/closures/2229_closure_analysis/migrations/auto_traits.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/closure-body-macro-fragment.fixed b/tests/ui/closures/2229_closure_analysis/migrations/closure-body-macro-fragment.fixed
index 9a6db588c..9a6db588c 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/closure-body-macro-fragment.fixed
+++ b/tests/ui/closures/2229_closure_analysis/migrations/closure-body-macro-fragment.fixed
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/closure-body-macro-fragment.rs b/tests/ui/closures/2229_closure_analysis/migrations/closure-body-macro-fragment.rs
index 08cc24b4b..08cc24b4b 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/closure-body-macro-fragment.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/closure-body-macro-fragment.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/closure-body-macro-fragment.stderr b/tests/ui/closures/2229_closure_analysis/migrations/closure-body-macro-fragment.stderr
index bb17e3a34..bb17e3a34 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/closure-body-macro-fragment.stderr
+++ b/tests/ui/closures/2229_closure_analysis/migrations/closure-body-macro-fragment.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop.fixed b/tests/ui/closures/2229_closure_analysis/migrations/insignificant_drop.fixed
index 2652bf598..2652bf598 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop.fixed
+++ b/tests/ui/closures/2229_closure_analysis/migrations/insignificant_drop.fixed
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop.rs b/tests/ui/closures/2229_closure_analysis/migrations/insignificant_drop.rs
index 2652bf598..2652bf598 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/insignificant_drop.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.fixed b/tests/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.fixed
index d985e3bb9..d985e3bb9 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.fixed
+++ b/tests/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.fixed
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.rs b/tests/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.rs
index f95d34eeb..f95d34eeb 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.stderr b/tests/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.stderr
index a0795c129..a0795c129 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.stderr
+++ b/tests/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_no_migrations.rs b/tests/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_no_migrations.rs
index 3f184a67f..3f184a67f 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_no_migrations.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_no_migrations.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/issue-78720.rs b/tests/ui/closures/2229_closure_analysis/migrations/issue-78720.rs
index ff5d28461..ff5d28461 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/issue-78720.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/issue-78720.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/issue-78720.stderr b/tests/ui/closures/2229_closure_analysis/migrations/issue-78720.stderr
index 36a80e694..36a80e694 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/issue-78720.stderr
+++ b/tests/ui/closures/2229_closure_analysis/migrations/issue-78720.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/issue-86753.rs b/tests/ui/closures/2229_closure_analysis/migrations/issue-86753.rs
index fce9cac62..fce9cac62 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/issue-86753.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/issue-86753.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/issue-90024-adt-correct-subst.rs b/tests/ui/closures/2229_closure_analysis/migrations/issue-90024-adt-correct-subst.rs
index ed8cb042b..ed8cb042b 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/issue-90024-adt-correct-subst.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/issue-90024-adt-correct-subst.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/macro.fixed b/tests/ui/closures/2229_closure_analysis/migrations/macro.fixed
index 31fe494dc..31fe494dc 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/macro.fixed
+++ b/tests/ui/closures/2229_closure_analysis/migrations/macro.fixed
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/macro.rs b/tests/ui/closures/2229_closure_analysis/migrations/macro.rs
index 0f0c49749..0f0c49749 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/macro.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/macro.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/macro.stderr b/tests/ui/closures/2229_closure_analysis/migrations/macro.stderr
index c17edce72..c17edce72 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/macro.stderr
+++ b/tests/ui/closures/2229_closure_analysis/migrations/macro.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.fixed b/tests/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.fixed
index ce8b60725..ce8b60725 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.fixed
+++ b/tests/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.fixed
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.rs b/tests/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.rs
index 2237bebd7..2237bebd7 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.stderr b/tests/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.stderr
index 94526487e..94526487e 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.stderr
+++ b/tests/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.fixed b/tests/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.fixed
index ff2244a8e..ff2244a8e 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.fixed
+++ b/tests/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.fixed
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.rs b/tests/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.rs
index 52e96d013..52e96d013 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.stderr b/tests/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.stderr
index e10898f98..e10898f98 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.stderr
+++ b/tests/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.fixed b/tests/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.fixed
index 173dd2e2c..173dd2e2c 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.fixed
+++ b/tests/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.fixed
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.rs b/tests/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.rs
index cfc4555ca..cfc4555ca 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.stderr b/tests/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.stderr
index efb264447..efb264447 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.stderr
+++ b/tests/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/no_migrations.rs b/tests/ui/closures/2229_closure_analysis/migrations/no_migrations.rs
index 8b75e226a..8b75e226a 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/no_migrations.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/no_migrations.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/old_name.rs b/tests/ui/closures/2229_closure_analysis/migrations/old_name.rs
index 16e3cca7b..16e3cca7b 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/old_name.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/old_name.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/old_name.stderr b/tests/ui/closures/2229_closure_analysis/migrations/old_name.stderr
index 47cb689fa..47cb689fa 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/old_name.stderr
+++ b/tests/ui/closures/2229_closure_analysis/migrations/old_name.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/precise.fixed b/tests/ui/closures/2229_closure_analysis/migrations/precise.fixed
index 7892a72c7..7892a72c7 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/precise.fixed
+++ b/tests/ui/closures/2229_closure_analysis/migrations/precise.fixed
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/precise.rs b/tests/ui/closures/2229_closure_analysis/migrations/precise.rs
index f5e99002b..f5e99002b 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/precise.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/precise.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/precise.stderr b/tests/ui/closures/2229_closure_analysis/migrations/precise.stderr
index eff26a4d6..eff26a4d6 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/precise.stderr
+++ b/tests/ui/closures/2229_closure_analysis/migrations/precise.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/precise_no_migrations.rs b/tests/ui/closures/2229_closure_analysis/migrations/precise_no_migrations.rs
index 587d71c40..587d71c40 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/precise_no_migrations.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/precise_no_migrations.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/significant_drop.fixed b/tests/ui/closures/2229_closure_analysis/migrations/significant_drop.fixed
index e99dbb5ab..e99dbb5ab 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/significant_drop.fixed
+++ b/tests/ui/closures/2229_closure_analysis/migrations/significant_drop.fixed
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/significant_drop.rs b/tests/ui/closures/2229_closure_analysis/migrations/significant_drop.rs
index 62a984c9e..62a984c9e 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/significant_drop.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/significant_drop.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/significant_drop.stderr b/tests/ui/closures/2229_closure_analysis/migrations/significant_drop.stderr
index 54ad20f89..54ad20f89 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/significant_drop.stderr
+++ b/tests/ui/closures/2229_closure_analysis/migrations/significant_drop.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/unpin_no_migration.rs b/tests/ui/closures/2229_closure_analysis/migrations/unpin_no_migration.rs
index 39cf82053..39cf82053 100644
--- a/src/test/ui/closures/2229_closure_analysis/migrations/unpin_no_migration.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/unpin_no_migration.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/move_closure.rs b/tests/ui/closures/2229_closure_analysis/move_closure.rs
index b542fa243..b542fa243 100644
--- a/src/test/ui/closures/2229_closure_analysis/move_closure.rs
+++ b/tests/ui/closures/2229_closure_analysis/move_closure.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/move_closure.stderr b/tests/ui/closures/2229_closure_analysis/move_closure.stderr
index fd80e05c6..fd80e05c6 100644
--- a/src/test/ui/closures/2229_closure_analysis/move_closure.stderr
+++ b/tests/ui/closures/2229_closure_analysis/move_closure.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/multilevel-path-1.rs b/tests/ui/closures/2229_closure_analysis/multilevel-path-1.rs
index a8a2acfa7..a8a2acfa7 100644
--- a/src/test/ui/closures/2229_closure_analysis/multilevel-path-1.rs
+++ b/tests/ui/closures/2229_closure_analysis/multilevel-path-1.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/multilevel-path-1.stderr b/tests/ui/closures/2229_closure_analysis/multilevel-path-1.stderr
index 29ad1c591..29ad1c591 100644
--- a/src/test/ui/closures/2229_closure_analysis/multilevel-path-1.stderr
+++ b/tests/ui/closures/2229_closure_analysis/multilevel-path-1.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/multilevel-path-2.rs b/tests/ui/closures/2229_closure_analysis/multilevel-path-2.rs
index e21fe318c..e21fe318c 100644
--- a/src/test/ui/closures/2229_closure_analysis/multilevel-path-2.rs
+++ b/tests/ui/closures/2229_closure_analysis/multilevel-path-2.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/multilevel-path-2.stderr b/tests/ui/closures/2229_closure_analysis/multilevel-path-2.stderr
index 929cba113..929cba113 100644
--- a/src/test/ui/closures/2229_closure_analysis/multilevel-path-2.stderr
+++ b/tests/ui/closures/2229_closure_analysis/multilevel-path-2.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/nested-closure.rs b/tests/ui/closures/2229_closure_analysis/nested-closure.rs
index 22eae744b..22eae744b 100644
--- a/src/test/ui/closures/2229_closure_analysis/nested-closure.rs
+++ b/tests/ui/closures/2229_closure_analysis/nested-closure.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/nested-closure.stderr b/tests/ui/closures/2229_closure_analysis/nested-closure.stderr
index a50d0c6a1..a50d0c6a1 100644
--- a/src/test/ui/closures/2229_closure_analysis/nested-closure.stderr
+++ b/tests/ui/closures/2229_closure_analysis/nested-closure.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case.rs b/tests/ui/closures/2229_closure_analysis/optimization/edge_case.rs
index e7edc0bbc..e7edc0bbc 100644
--- a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case.rs
+++ b/tests/ui/closures/2229_closure_analysis/optimization/edge_case.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case.stderr b/tests/ui/closures/2229_closure_analysis/optimization/edge_case.stderr
index 87d5d5bee..87d5d5bee 100644
--- a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case.stderr
+++ b/tests/ui/closures/2229_closure_analysis/optimization/edge_case.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case_run_pass.rs b/tests/ui/closures/2229_closure_analysis/optimization/edge_case_run_pass.rs
index 033fd6f17..033fd6f17 100644
--- a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case_run_pass.rs
+++ b/tests/ui/closures/2229_closure_analysis/optimization/edge_case_run_pass.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/path-with-array-access.rs b/tests/ui/closures/2229_closure_analysis/path-with-array-access.rs
index 0c1031931..0c1031931 100644
--- a/src/test/ui/closures/2229_closure_analysis/path-with-array-access.rs
+++ b/tests/ui/closures/2229_closure_analysis/path-with-array-access.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/path-with-array-access.stderr b/tests/ui/closures/2229_closure_analysis/path-with-array-access.stderr
index 124b7bf6f..124b7bf6f 100644
--- a/src/test/ui/closures/2229_closure_analysis/path-with-array-access.stderr
+++ b/tests/ui/closures/2229_closure_analysis/path-with-array-access.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/preserve_field_drop_order.rs b/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order.rs
index 2f8cddc06..2f8cddc06 100644
--- a/src/test/ui/closures/2229_closure_analysis/preserve_field_drop_order.rs
+++ b/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/preserve_field_drop_order.stderr b/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order.stderr
index 2d1dc8727..2d1dc8727 100644
--- a/src/test/ui/closures/2229_closure_analysis/preserve_field_drop_order.stderr
+++ b/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/preserve_field_drop_order2.rs b/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order2.rs
index 1cae776dd..1cae776dd 100644
--- a/src/test/ui/closures/2229_closure_analysis/preserve_field_drop_order2.rs
+++ b/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order2.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/preserve_field_drop_order2.twenty_eighteen.run.stdout b/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order2.twenty_eighteen.run.stdout
index 557d047c1..557d047c1 100644
--- a/src/test/ui/closures/2229_closure_analysis/preserve_field_drop_order2.twenty_eighteen.run.stdout
+++ b/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order2.twenty_eighteen.run.stdout
diff --git a/src/test/ui/closures/2229_closure_analysis/preserve_field_drop_order2.twenty_twentyone.run.stdout b/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order2.twenty_twentyone.run.stdout
index 557d047c1..557d047c1 100644
--- a/src/test/ui/closures/2229_closure_analysis/preserve_field_drop_order2.twenty_twentyone.run.stdout
+++ b/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order2.twenty_twentyone.run.stdout
diff --git a/src/test/ui/closures/2229_closure_analysis/repr_packed.rs b/tests/ui/closures/2229_closure_analysis/repr_packed.rs
index f23670f63..f23670f63 100644
--- a/src/test/ui/closures/2229_closure_analysis/repr_packed.rs
+++ b/tests/ui/closures/2229_closure_analysis/repr_packed.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/repr_packed.stderr b/tests/ui/closures/2229_closure_analysis/repr_packed.stderr
index 580061ebc..580061ebc 100644
--- a/src/test/ui/closures/2229_closure_analysis/repr_packed.stderr
+++ b/tests/ui/closures/2229_closure_analysis/repr_packed.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/box.rs b/tests/ui/closures/2229_closure_analysis/run_pass/box.rs
index 73aca288f..73aca288f 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/box.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/box.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/by_value.rs b/tests/ui/closures/2229_closure_analysis/run_pass/by_value.rs
index f8752fe1c..f8752fe1c 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/by_value.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/by_value.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/capture-disjoint-field-struct.rs b/tests/ui/closures/2229_closure_analysis/run_pass/capture-disjoint-field-struct.rs
index 3cb1eb329..3cb1eb329 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/capture-disjoint-field-struct.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/capture-disjoint-field-struct.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/capture-disjoint-field-tuple-mut.rs b/tests/ui/closures/2229_closure_analysis/run_pass/capture-disjoint-field-tuple-mut.rs
index 0f79b7ae7..0f79b7ae7 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/capture-disjoint-field-tuple-mut.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/capture-disjoint-field-tuple-mut.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/capture-disjoint-field-tuple.rs b/tests/ui/closures/2229_closure_analysis/run_pass/capture-disjoint-field-tuple.rs
index 81f0328b9..81f0328b9 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/capture-disjoint-field-tuple.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/capture-disjoint-field-tuple.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/capture_with_wildcard_match.rs b/tests/ui/closures/2229_closure_analysis/run_pass/capture_with_wildcard_match.rs
index cea02fbe1..cea02fbe1 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/capture_with_wildcard_match.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/capture_with_wildcard_match.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/destructure-pattern-closure-within-closure.rs b/tests/ui/closures/2229_closure_analysis/run_pass/destructure-pattern-closure-within-closure.rs
index 5c278bff9..5c278bff9 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/destructure-pattern-closure-within-closure.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/destructure-pattern-closure-within-closure.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/destructure-pattern-closure-within-closure.stderr b/tests/ui/closures/2229_closure_analysis/run_pass/destructure-pattern-closure-within-closure.stderr
index cf8bd7a0a..cf8bd7a0a 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/destructure-pattern-closure-within-closure.stderr
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/destructure-pattern-closure-within-closure.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/destructure_patterns.rs b/tests/ui/closures/2229_closure_analysis/run_pass/destructure_patterns.rs
index dacc2c616..dacc2c616 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/destructure_patterns.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/destructure_patterns.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/destructure_patterns.stderr b/tests/ui/closures/2229_closure_analysis/run_pass/destructure_patterns.stderr
index 7706f68ba..7706f68ba 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/destructure_patterns.stderr
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/destructure_patterns.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/disjoint-capture-in-same-closure.rs b/tests/ui/closures/2229_closure_analysis/run_pass/disjoint-capture-in-same-closure.rs
index 03400e0ee..03400e0ee 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/disjoint-capture-in-same-closure.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/disjoint-capture-in-same-closure.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/drop_then_use_fake_reads.rs b/tests/ui/closures/2229_closure_analysis/run_pass/drop_then_use_fake_reads.rs
index 477fdd613..477fdd613 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/drop_then_use_fake_reads.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/drop_then_use_fake_reads.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/edition.rs b/tests/ui/closures/2229_closure_analysis/run_pass/edition.rs
index 20bbe1d89..20bbe1d89 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/edition.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/edition.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/filter-on-struct-member.rs b/tests/ui/closures/2229_closure_analysis/run_pass/filter-on-struct-member.rs
index e19f5ff1b..e19f5ff1b 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/filter-on-struct-member.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/filter-on-struct-member.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/fru_syntax.rs b/tests/ui/closures/2229_closure_analysis/run_pass/fru_syntax.rs
index 1286613cb..1286613cb 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/fru_syntax.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/fru_syntax.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/issue-87378.rs b/tests/ui/closures/2229_closure_analysis/run_pass/issue-87378.rs
index c64475fda..c64475fda 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/issue-87378.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/issue-87378.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/issue-88372.rs b/tests/ui/closures/2229_closure_analysis/run_pass/issue-88372.rs
index 25fbb6cb9..25fbb6cb9 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/issue-88372.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/issue-88372.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/issue-88431.rs b/tests/ui/closures/2229_closure_analysis/run_pass/issue-88431.rs
index 999620530..999620530 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/issue-88431.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/issue-88431.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/issue-88476.rs b/tests/ui/closures/2229_closure_analysis/run_pass/issue-88476.rs
index f44c2af80..f44c2af80 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/issue-88476.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/issue-88476.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/lit-pattern-matching-with-methods.rs b/tests/ui/closures/2229_closure_analysis/run_pass/lit-pattern-matching-with-methods.rs
index d2375aa69..d2375aa69 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/lit-pattern-matching-with-methods.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/lit-pattern-matching-with-methods.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/move_closure.rs b/tests/ui/closures/2229_closure_analysis/run_pass/move_closure.rs
index f76965bdd..f76965bdd 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/move_closure.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/move_closure.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/multilevel-path-1.rs b/tests/ui/closures/2229_closure_analysis/run_pass/multilevel-path-1.rs
index 624e0ff22..624e0ff22 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/multilevel-path-1.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/multilevel-path-1.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/multilevel-path-2.rs b/tests/ui/closures/2229_closure_analysis/run_pass/multilevel-path-2.rs
index bd8addd37..bd8addd37 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/multilevel-path-2.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/multilevel-path-2.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/multilevel-path-3.rs b/tests/ui/closures/2229_closure_analysis/run_pass/multilevel-path-3.rs
index 8fc0efb60..8fc0efb60 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/multilevel-path-3.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/multilevel-path-3.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/mut_ref.rs b/tests/ui/closures/2229_closure_analysis/run_pass/mut_ref.rs
index 9f0c4d96a..9f0c4d96a 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/mut_ref.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/mut_ref.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/mut_ref_struct_mem.rs b/tests/ui/closures/2229_closure_analysis/run_pass/mut_ref_struct_mem.rs
index a85335438..a85335438 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/mut_ref_struct_mem.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/mut_ref_struct_mem.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/nested-closure.rs b/tests/ui/closures/2229_closure_analysis/run_pass/nested-closure.rs
index a80b40bb4..a80b40bb4 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/nested-closure.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/nested-closure.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/struct-pattern-matching-with-methods.rs b/tests/ui/closures/2229_closure_analysis/run_pass/struct-pattern-matching-with-methods.rs
index ed222b314..ed222b314 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/struct-pattern-matching-with-methods.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/struct-pattern-matching-with-methods.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/tuple-struct-pattern-matching-with-methods.rs b/tests/ui/closures/2229_closure_analysis/run_pass/tuple-struct-pattern-matching-with-methods.rs
index f3f44433c..f3f44433c 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/tuple-struct-pattern-matching-with-methods.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/tuple-struct-pattern-matching-with-methods.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/unsafe_ptr.rs b/tests/ui/closures/2229_closure_analysis/run_pass/unsafe_ptr.rs
index 3f7ddf93f..3f7ddf93f 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/unsafe_ptr.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/unsafe_ptr.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/use_of_mutable_borrow_and_fake_reads.rs b/tests/ui/closures/2229_closure_analysis/run_pass/use_of_mutable_borrow_and_fake_reads.rs
index 0206927cc..0206927cc 100644
--- a/src/test/ui/closures/2229_closure_analysis/run_pass/use_of_mutable_borrow_and_fake_reads.rs
+++ b/tests/ui/closures/2229_closure_analysis/run_pass/use_of_mutable_borrow_and_fake_reads.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/simple-struct-min-capture.rs b/tests/ui/closures/2229_closure_analysis/simple-struct-min-capture.rs
index 563095d44..563095d44 100644
--- a/src/test/ui/closures/2229_closure_analysis/simple-struct-min-capture.rs
+++ b/tests/ui/closures/2229_closure_analysis/simple-struct-min-capture.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/simple-struct-min-capture.stderr b/tests/ui/closures/2229_closure_analysis/simple-struct-min-capture.stderr
index 05d79797a..05d79797a 100644
--- a/src/test/ui/closures/2229_closure_analysis/simple-struct-min-capture.stderr
+++ b/tests/ui/closures/2229_closure_analysis/simple-struct-min-capture.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/unsafe_ptr.rs b/tests/ui/closures/2229_closure_analysis/unsafe_ptr.rs
index eab9f9d08..eab9f9d08 100644
--- a/src/test/ui/closures/2229_closure_analysis/unsafe_ptr.rs
+++ b/tests/ui/closures/2229_closure_analysis/unsafe_ptr.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/unsafe_ptr.stderr b/tests/ui/closures/2229_closure_analysis/unsafe_ptr.stderr
index e740a4d2d..e740a4d2d 100644
--- a/src/test/ui/closures/2229_closure_analysis/unsafe_ptr.stderr
+++ b/tests/ui/closures/2229_closure_analysis/unsafe_ptr.stderr
diff --git a/src/test/ui/closures/2229_closure_analysis/wild_patterns.rs b/tests/ui/closures/2229_closure_analysis/wild_patterns.rs
index a795088a1..a795088a1 100644
--- a/src/test/ui/closures/2229_closure_analysis/wild_patterns.rs
+++ b/tests/ui/closures/2229_closure_analysis/wild_patterns.rs
diff --git a/src/test/ui/closures/2229_closure_analysis/wild_patterns.stderr b/tests/ui/closures/2229_closure_analysis/wild_patterns.stderr
index c64378091..c64378091 100644
--- a/src/test/ui/closures/2229_closure_analysis/wild_patterns.stderr
+++ b/tests/ui/closures/2229_closure_analysis/wild_patterns.stderr
diff --git a/src/test/ui/closures/add_semicolon_non_block_closure.rs b/tests/ui/closures/add_semicolon_non_block_closure.rs
index 3ae91be60..3ae91be60 100644
--- a/src/test/ui/closures/add_semicolon_non_block_closure.rs
+++ b/tests/ui/closures/add_semicolon_non_block_closure.rs
diff --git a/src/test/ui/closures/add_semicolon_non_block_closure.stderr b/tests/ui/closures/add_semicolon_non_block_closure.stderr
index ed829fc98..ed829fc98 100644
--- a/src/test/ui/closures/add_semicolon_non_block_closure.stderr
+++ b/tests/ui/closures/add_semicolon_non_block_closure.stderr
diff --git a/src/test/ui/closures/binder/async-closure-with-binder.rs b/tests/ui/closures/binder/async-closure-with-binder.rs
index 4fa599d37..4fa599d37 100644
--- a/src/test/ui/closures/binder/async-closure-with-binder.rs
+++ b/tests/ui/closures/binder/async-closure-with-binder.rs
diff --git a/src/test/ui/closures/binder/async-closure-with-binder.stderr b/tests/ui/closures/binder/async-closure-with-binder.stderr
index 1d4628b1a..1d4628b1a 100644
--- a/src/test/ui/closures/binder/async-closure-with-binder.stderr
+++ b/tests/ui/closures/binder/async-closure-with-binder.stderr
diff --git a/src/test/ui/closures/binder/disallow-const.rs b/tests/ui/closures/binder/disallow-const.rs
index 72ad6185d..72ad6185d 100644
--- a/src/test/ui/closures/binder/disallow-const.rs
+++ b/tests/ui/closures/binder/disallow-const.rs
diff --git a/src/test/ui/closures/binder/disallow-const.stderr b/tests/ui/closures/binder/disallow-const.stderr
index 3c3b43d8c..3c3b43d8c 100644
--- a/src/test/ui/closures/binder/disallow-const.stderr
+++ b/tests/ui/closures/binder/disallow-const.stderr
diff --git a/src/test/ui/closures/binder/disallow-ty.rs b/tests/ui/closures/binder/disallow-ty.rs
index bbe3d8488..bbe3d8488 100644
--- a/src/test/ui/closures/binder/disallow-ty.rs
+++ b/tests/ui/closures/binder/disallow-ty.rs
diff --git a/src/test/ui/closures/binder/disallow-ty.stderr b/tests/ui/closures/binder/disallow-ty.stderr
index 51b6773ed..51b6773ed 100644
--- a/src/test/ui/closures/binder/disallow-ty.stderr
+++ b/tests/ui/closures/binder/disallow-ty.stderr
diff --git a/src/test/ui/closures/binder/implicit-return.rs b/tests/ui/closures/binder/implicit-return.rs
index d34e5721d..d34e5721d 100644
--- a/src/test/ui/closures/binder/implicit-return.rs
+++ b/tests/ui/closures/binder/implicit-return.rs
diff --git a/src/test/ui/closures/binder/implicit-return.stderr b/tests/ui/closures/binder/implicit-return.stderr
index 5bfb97113..5bfb97113 100644
--- a/src/test/ui/closures/binder/implicit-return.stderr
+++ b/tests/ui/closures/binder/implicit-return.stderr
diff --git a/src/test/ui/closures/binder/implicit-stuff.rs b/tests/ui/closures/binder/implicit-stuff.rs
index 09e4c747a..09e4c747a 100644
--- a/src/test/ui/closures/binder/implicit-stuff.rs
+++ b/tests/ui/closures/binder/implicit-stuff.rs
diff --git a/src/test/ui/closures/binder/implicit-stuff.stderr b/tests/ui/closures/binder/implicit-stuff.stderr
index 779a08a44..779a08a44 100644
--- a/src/test/ui/closures/binder/implicit-stuff.stderr
+++ b/tests/ui/closures/binder/implicit-stuff.stderr
diff --git a/src/test/ui/closures/binder/late-bound-in-body.rs b/tests/ui/closures/binder/late-bound-in-body.rs
index bb5c7552f..bb5c7552f 100644
--- a/src/test/ui/closures/binder/late-bound-in-body.rs
+++ b/tests/ui/closures/binder/late-bound-in-body.rs
diff --git a/src/test/ui/closures/binder/nested-closures-regions.rs b/tests/ui/closures/binder/nested-closures-regions.rs
index 6bfc6c80b..6bfc6c80b 100644
--- a/src/test/ui/closures/binder/nested-closures-regions.rs
+++ b/tests/ui/closures/binder/nested-closures-regions.rs
diff --git a/src/test/ui/closures/binder/nested-closures-regions.stderr b/tests/ui/closures/binder/nested-closures-regions.stderr
index b385e0ed6..b385e0ed6 100644
--- a/src/test/ui/closures/binder/nested-closures-regions.stderr
+++ b/tests/ui/closures/binder/nested-closures-regions.stderr
diff --git a/src/test/ui/closures/binder/nested-closures.rs b/tests/ui/closures/binder/nested-closures.rs
index b3c36e7ee..b3c36e7ee 100644
--- a/src/test/ui/closures/binder/nested-closures.rs
+++ b/tests/ui/closures/binder/nested-closures.rs
diff --git a/src/test/ui/closures/binder/suggestion-for-introducing-lifetime-into-binder.rs b/tests/ui/closures/binder/suggestion-for-introducing-lifetime-into-binder.rs
index b476dd50c..b476dd50c 100644
--- a/src/test/ui/closures/binder/suggestion-for-introducing-lifetime-into-binder.rs
+++ b/tests/ui/closures/binder/suggestion-for-introducing-lifetime-into-binder.rs
diff --git a/src/test/ui/closures/binder/suggestion-for-introducing-lifetime-into-binder.stderr b/tests/ui/closures/binder/suggestion-for-introducing-lifetime-into-binder.stderr
index 1381acc15..1381acc15 100644
--- a/src/test/ui/closures/binder/suggestion-for-introducing-lifetime-into-binder.stderr
+++ b/tests/ui/closures/binder/suggestion-for-introducing-lifetime-into-binder.stderr
diff --git a/src/test/ui/closures/closure-array-break-length.rs b/tests/ui/closures/closure-array-break-length.rs
index fda590fda..fda590fda 100644
--- a/src/test/ui/closures/closure-array-break-length.rs
+++ b/tests/ui/closures/closure-array-break-length.rs
diff --git a/src/test/ui/closures/closure-array-break-length.stderr b/tests/ui/closures/closure-array-break-length.stderr
index 7e0b0027a..7e0b0027a 100644
--- a/src/test/ui/closures/closure-array-break-length.stderr
+++ b/tests/ui/closures/closure-array-break-length.stderr
diff --git a/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.rs b/tests/ui/closures/closure-bounds-cant-promote-superkind-in-struct.rs
index 039cf3e04..039cf3e04 100644
--- a/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.rs
+++ b/tests/ui/closures/closure-bounds-cant-promote-superkind-in-struct.rs
diff --git a/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr b/tests/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr
index bf6ec5c36..bf6ec5c36 100644
--- a/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr
+++ b/tests/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr
diff --git a/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.rs b/tests/ui/closures/closure-bounds-static-cant-capture-borrowed.rs
index 7327d8256..7327d8256 100644
--- a/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.rs
+++ b/tests/ui/closures/closure-bounds-static-cant-capture-borrowed.rs
diff --git a/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.stderr b/tests/ui/closures/closure-bounds-static-cant-capture-borrowed.stderr
index 85df5c1e5..85df5c1e5 100644
--- a/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.stderr
+++ b/tests/ui/closures/closure-bounds-static-cant-capture-borrowed.stderr
diff --git a/src/test/ui/closures/closure-bounds-subtype.rs b/tests/ui/closures/closure-bounds-subtype.rs
index 4888cbfcc..4888cbfcc 100644
--- a/src/test/ui/closures/closure-bounds-subtype.rs
+++ b/tests/ui/closures/closure-bounds-subtype.rs
diff --git a/src/test/ui/closures/closure-bounds-subtype.stderr b/tests/ui/closures/closure-bounds-subtype.stderr
index 8ad8273fc..8ad8273fc 100644
--- a/src/test/ui/closures/closure-bounds-subtype.stderr
+++ b/tests/ui/closures/closure-bounds-subtype.stderr
diff --git a/src/test/ui/closures/closure-expected-type/expect-region-supply-region-2.polonius.stderr b/tests/ui/closures/closure-expected-type/expect-region-supply-region-2.polonius.stderr
index 8846ccef3..8846ccef3 100644
--- a/src/test/ui/closures/closure-expected-type/expect-region-supply-region-2.polonius.stderr
+++ b/tests/ui/closures/closure-expected-type/expect-region-supply-region-2.polonius.stderr
diff --git a/src/test/ui/closures/closure-expected-type/expect-region-supply-region-2.rs b/tests/ui/closures/closure-expected-type/expect-region-supply-region-2.rs
index 9b51bbd58..9b51bbd58 100644
--- a/src/test/ui/closures/closure-expected-type/expect-region-supply-region-2.rs
+++ b/tests/ui/closures/closure-expected-type/expect-region-supply-region-2.rs
diff --git a/src/test/ui/closures/closure-expected-type/expect-region-supply-region-2.stderr b/tests/ui/closures/closure-expected-type/expect-region-supply-region-2.stderr
index 9aab51c98..9aab51c98 100644
--- a/src/test/ui/closures/closure-expected-type/expect-region-supply-region-2.stderr
+++ b/tests/ui/closures/closure-expected-type/expect-region-supply-region-2.stderr
diff --git a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.rs b/tests/ui/closures/closure-expected-type/expect-region-supply-region.rs
index 55c6aa795..55c6aa795 100644
--- a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.rs
+++ b/tests/ui/closures/closure-expected-type/expect-region-supply-region.rs
diff --git a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.stderr b/tests/ui/closures/closure-expected-type/expect-region-supply-region.stderr
index 0d97fa7e2..0d97fa7e2 100644
--- a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.stderr
+++ b/tests/ui/closures/closure-expected-type/expect-region-supply-region.stderr
diff --git a/src/test/ui/closures/closure-expected.rs b/tests/ui/closures/closure-expected.rs
index 68cac3dd8..68cac3dd8 100644
--- a/src/test/ui/closures/closure-expected.rs
+++ b/tests/ui/closures/closure-expected.rs
diff --git a/src/test/ui/closures/closure-expected.stderr b/tests/ui/closures/closure-expected.stderr
index 7ffe3c1ef..87a5d67a4 100644
--- a/src/test/ui/closures/closure-expected.stderr
+++ b/tests/ui/closures/closure-expected.stderr
@@ -10,9 +10,6 @@ LL |     let y = x.or_else(4);
    = note: wrap the `{integer}` in a closure with no arguments: `|| { /* code */ }`
 note: required by a bound in `Option::<T>::or_else`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL |         F: ~const FnOnce() -> Option<T>,
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Option::<T>::or_else`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closures/closure-immutable-outer-variable.fixed b/tests/ui/closures/closure-immutable-outer-variable.fixed
index 1b0feede3..1b0feede3 100644
--- a/src/test/ui/closures/closure-immutable-outer-variable.fixed
+++ b/tests/ui/closures/closure-immutable-outer-variable.fixed
diff --git a/src/test/ui/closures/closure-immutable-outer-variable.rs b/tests/ui/closures/closure-immutable-outer-variable.rs
index 50ec1c614..50ec1c614 100644
--- a/src/test/ui/closures/closure-immutable-outer-variable.rs
+++ b/tests/ui/closures/closure-immutable-outer-variable.rs
diff --git a/src/test/ui/closures/closure-immutable-outer-variable.rs.fixed b/tests/ui/closures/closure-immutable-outer-variable.rs.fixed
index 5c6358beb..5c6358beb 100644
--- a/src/test/ui/closures/closure-immutable-outer-variable.rs.fixed
+++ b/tests/ui/closures/closure-immutable-outer-variable.rs.fixed
diff --git a/src/test/ui/closures/closure-immutable-outer-variable.stderr b/tests/ui/closures/closure-immutable-outer-variable.stderr
index 799097889..799097889 100644
--- a/src/test/ui/closures/closure-immutable-outer-variable.stderr
+++ b/tests/ui/closures/closure-immutable-outer-variable.stderr
diff --git a/src/test/ui/closures/closure-move-sync.rs b/tests/ui/closures/closure-move-sync.rs
index ea2d1434c..ea2d1434c 100644
--- a/src/test/ui/closures/closure-move-sync.rs
+++ b/tests/ui/closures/closure-move-sync.rs
diff --git a/src/test/ui/closures/closure-move-sync.stderr b/tests/ui/closures/closure-move-sync.stderr
index a2ca06b4e..64e3b51ea 100644
--- a/src/test/ui/closures/closure-move-sync.stderr
+++ b/tests/ui/closures/closure-move-sync.stderr
@@ -19,9 +19,6 @@ LL |     let t = thread::spawn(|| {
    |                           ^^
 note: required by a bound in `spawn`
   --> $SRC_DIR/std/src/thread/mod.rs:LL:COL
-   |
-LL |     F: Send + 'static,
-   |        ^^^^ required by this bound in `spawn`
 
 error[E0277]: `Sender<()>` cannot be shared between threads safely
   --> $DIR/closure-move-sync.rs:18:19
@@ -40,9 +37,6 @@ LL |     thread::spawn(|| tx.send(()).unwrap());
    |                   ^^
 note: required by a bound in `spawn`
   --> $SRC_DIR/std/src/thread/mod.rs:LL:COL
-   |
-LL |     F: Send + 'static,
-   |        ^^^^ required by this bound in `spawn`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/closures/closure-no-fn-1.rs b/tests/ui/closures/closure-no-fn-1.rs
index 48c3e4725..48c3e4725 100644
--- a/src/test/ui/closures/closure-no-fn-1.rs
+++ b/tests/ui/closures/closure-no-fn-1.rs
diff --git a/src/test/ui/closures/closure-no-fn-1.stderr b/tests/ui/closures/closure-no-fn-1.stderr
index eab7482e6..eab7482e6 100644
--- a/src/test/ui/closures/closure-no-fn-1.stderr
+++ b/tests/ui/closures/closure-no-fn-1.stderr
diff --git a/src/test/ui/closures/closure-no-fn-2.rs b/tests/ui/closures/closure-no-fn-2.rs
index f3066f7a3..f3066f7a3 100644
--- a/src/test/ui/closures/closure-no-fn-2.rs
+++ b/tests/ui/closures/closure-no-fn-2.rs
diff --git a/src/test/ui/closures/closure-no-fn-2.stderr b/tests/ui/closures/closure-no-fn-2.stderr
index e1f0143ab..e1f0143ab 100644
--- a/src/test/ui/closures/closure-no-fn-2.stderr
+++ b/tests/ui/closures/closure-no-fn-2.stderr
diff --git a/src/test/ui/closures/closure-no-fn-3.rs b/tests/ui/closures/closure-no-fn-3.rs
index 53217c2f1..53217c2f1 100644
--- a/src/test/ui/closures/closure-no-fn-3.rs
+++ b/tests/ui/closures/closure-no-fn-3.rs
diff --git a/src/test/ui/closures/closure-no-fn-3.stderr b/tests/ui/closures/closure-no-fn-3.stderr
index 6009389b1..6009389b1 100644
--- a/src/test/ui/closures/closure-no-fn-3.stderr
+++ b/tests/ui/closures/closure-no-fn-3.stderr
diff --git a/src/test/ui/closures/closure-no-fn-4.rs b/tests/ui/closures/closure-no-fn-4.rs
index 275bff645..275bff645 100644
--- a/src/test/ui/closures/closure-no-fn-4.rs
+++ b/tests/ui/closures/closure-no-fn-4.rs
diff --git a/src/test/ui/closures/closure-no-fn-4.stderr b/tests/ui/closures/closure-no-fn-4.stderr
index d1b704884..d1b704884 100644
--- a/src/test/ui/closures/closure-no-fn-4.stderr
+++ b/tests/ui/closures/closure-no-fn-4.stderr
diff --git a/src/test/ui/closures/closure-no-fn-5.rs b/tests/ui/closures/closure-no-fn-5.rs
index 43e3e977e..43e3e977e 100644
--- a/src/test/ui/closures/closure-no-fn-5.rs
+++ b/tests/ui/closures/closure-no-fn-5.rs
diff --git a/src/test/ui/closures/closure-no-fn-5.stderr b/tests/ui/closures/closure-no-fn-5.stderr
index a33b847ea..a33b847ea 100644
--- a/src/test/ui/closures/closure-no-fn-5.stderr
+++ b/tests/ui/closures/closure-no-fn-5.stderr
diff --git a/src/test/ui/closures/closure-referencing-itself-issue-25954.rs b/tests/ui/closures/closure-referencing-itself-issue-25954.rs
index 7dd0e5179..7dd0e5179 100644
--- a/src/test/ui/closures/closure-referencing-itself-issue-25954.rs
+++ b/tests/ui/closures/closure-referencing-itself-issue-25954.rs
diff --git a/src/test/ui/closures/closure-referencing-itself-issue-25954.stderr b/tests/ui/closures/closure-referencing-itself-issue-25954.stderr
index 8ca43cd1c..8ca43cd1c 100644
--- a/src/test/ui/closures/closure-referencing-itself-issue-25954.stderr
+++ b/tests/ui/closures/closure-referencing-itself-issue-25954.stderr
diff --git a/src/test/ui/closures/closure-reform-bad.rs b/tests/ui/closures/closure-reform-bad.rs
index 0ba48ab51..0ba48ab51 100644
--- a/src/test/ui/closures/closure-reform-bad.rs
+++ b/tests/ui/closures/closure-reform-bad.rs
diff --git a/src/test/ui/closures/closure-reform-bad.stderr b/tests/ui/closures/closure-reform-bad.stderr
index 4c40f70b9..4c40f70b9 100644
--- a/src/test/ui/closures/closure-reform-bad.stderr
+++ b/tests/ui/closures/closure-reform-bad.stderr
diff --git a/src/test/ui/closures/closure-return-type-mismatch.rs b/tests/ui/closures/closure-return-type-mismatch.rs
index 1631bb303..1631bb303 100644
--- a/src/test/ui/closures/closure-return-type-mismatch.rs
+++ b/tests/ui/closures/closure-return-type-mismatch.rs
diff --git a/src/test/ui/closures/closure-return-type-mismatch.stderr b/tests/ui/closures/closure-return-type-mismatch.stderr
index 3a89d30a0..3a89d30a0 100644
--- a/src/test/ui/closures/closure-return-type-mismatch.stderr
+++ b/tests/ui/closures/closure-return-type-mismatch.stderr
diff --git a/src/test/ui/closures/closure-return-type-must-be-sized.rs b/tests/ui/closures/closure-return-type-must-be-sized.rs
index 8cfa02912..8cfa02912 100644
--- a/src/test/ui/closures/closure-return-type-must-be-sized.rs
+++ b/tests/ui/closures/closure-return-type-must-be-sized.rs
diff --git a/src/test/ui/closures/closure-return-type-must-be-sized.stderr b/tests/ui/closures/closure-return-type-must-be-sized.stderr
index b07425bd8..d4fc723fa 100644
--- a/src/test/ui/closures/closure-return-type-must-be-sized.stderr
+++ b/tests/ui/closures/closure-return-type-must-be-sized.stderr
@@ -19,7 +19,7 @@ note: required by a bound in `a::bar`
   --> $DIR/closure-return-type-must-be-sized.rs:14:19
    |
 LL |     pub fn bar<F: FnOnce() -> R, R: ?Sized>() {}
-   |                   ^^^^^^^^^^^^^ required by this bound in `a::bar`
+   |                   ^^^^^^^^^^^^^ required by this bound in `bar`
 
 error[E0277]: the size for values of type `dyn A` cannot be known at compilation time
   --> $DIR/closure-return-type-must-be-sized.rs:56:5
@@ -51,7 +51,7 @@ note: required by a bound in `b::bar`
   --> $DIR/closure-return-type-must-be-sized.rs:28:19
    |
 LL |     pub fn bar<F: Fn() -> R, R: ?Sized>() {}
-   |                   ^^^^^^^^^ required by this bound in `b::bar`
+   |                   ^^^^^^^^^ required by this bound in `bar`
 
 error[E0277]: the size for values of type `dyn A` cannot be known at compilation time
   --> $DIR/closure-return-type-must-be-sized.rs:63:5
@@ -83,7 +83,7 @@ note: required by a bound in `c::bar`
   --> $DIR/closure-return-type-must-be-sized.rs:42:19
    |
 LL |     pub fn bar<F: FnMut() -> R, R: ?Sized>() {}
-   |                   ^^^^^^^^^^^^ required by this bound in `c::bar`
+   |                   ^^^^^^^^^^^^ required by this bound in `bar`
 
 error[E0277]: the size for values of type `dyn A` cannot be known at compilation time
   --> $DIR/closure-return-type-must-be-sized.rs:70:5
diff --git a/src/test/ui/closures/closure-wrong-kind.rs b/tests/ui/closures/closure-wrong-kind.rs
index 9bf38bfb6..9bf38bfb6 100644
--- a/src/test/ui/closures/closure-wrong-kind.rs
+++ b/tests/ui/closures/closure-wrong-kind.rs
diff --git a/src/test/ui/closures/closure-wrong-kind.stderr b/tests/ui/closures/closure-wrong-kind.stderr
index 9ea55d764..9ea55d764 100644
--- a/src/test/ui/closures/closure-wrong-kind.stderr
+++ b/tests/ui/closures/closure-wrong-kind.stderr
diff --git a/src/test/ui/closures/closure_cap_coerce_many_fail.rs b/tests/ui/closures/closure_cap_coerce_many_fail.rs
index 9133a2921..9133a2921 100644
--- a/src/test/ui/closures/closure_cap_coerce_many_fail.rs
+++ b/tests/ui/closures/closure_cap_coerce_many_fail.rs
diff --git a/src/test/ui/closures/closure_cap_coerce_many_fail.stderr b/tests/ui/closures/closure_cap_coerce_many_fail.stderr
index ca8a43328..ca8a43328 100644
--- a/src/test/ui/closures/closure_cap_coerce_many_fail.stderr
+++ b/tests/ui/closures/closure_cap_coerce_many_fail.stderr
diff --git a/src/test/ui/closures/closure_no_cap_coerce_many_check_pass.rs b/tests/ui/closures/closure_no_cap_coerce_many_check_pass.rs
index ce461810e..ce461810e 100644
--- a/src/test/ui/closures/closure_no_cap_coerce_many_check_pass.rs
+++ b/tests/ui/closures/closure_no_cap_coerce_many_check_pass.rs
diff --git a/src/test/ui/closures/closure_no_cap_coerce_many_run_pass.rs b/tests/ui/closures/closure_no_cap_coerce_many_run_pass.rs
index 3c5fe8a55..3c5fe8a55 100644
--- a/src/test/ui/closures/closure_no_cap_coerce_many_run_pass.rs
+++ b/tests/ui/closures/closure_no_cap_coerce_many_run_pass.rs
diff --git a/src/test/ui/closures/closure_no_cap_coerce_many_unsafe_0.mir.stderr b/tests/ui/closures/closure_no_cap_coerce_many_unsafe_0.mir.stderr
index 2f9c7973b..2f9c7973b 100644
--- a/src/test/ui/closures/closure_no_cap_coerce_many_unsafe_0.mir.stderr
+++ b/tests/ui/closures/closure_no_cap_coerce_many_unsafe_0.mir.stderr
diff --git a/src/test/ui/closures/closure_no_cap_coerce_many_unsafe_0.rs b/tests/ui/closures/closure_no_cap_coerce_many_unsafe_0.rs
index bdb3eb23c..bdb3eb23c 100644
--- a/src/test/ui/closures/closure_no_cap_coerce_many_unsafe_0.rs
+++ b/tests/ui/closures/closure_no_cap_coerce_many_unsafe_0.rs
diff --git a/src/test/ui/closures/closure_no_cap_coerce_many_unsafe_0.thir.stderr b/tests/ui/closures/closure_no_cap_coerce_many_unsafe_0.thir.stderr
index 2f9c7973b..2f9c7973b 100644
--- a/src/test/ui/closures/closure_no_cap_coerce_many_unsafe_0.thir.stderr
+++ b/tests/ui/closures/closure_no_cap_coerce_many_unsafe_0.thir.stderr
diff --git a/src/test/ui/closures/closure_no_cap_coerce_many_unsafe_1.rs b/tests/ui/closures/closure_no_cap_coerce_many_unsafe_1.rs
index a6d6125a1..a6d6125a1 100644
--- a/src/test/ui/closures/closure_no_cap_coerce_many_unsafe_1.rs
+++ b/tests/ui/closures/closure_no_cap_coerce_many_unsafe_1.rs
diff --git a/src/test/ui/closures/closure_promotion.rs b/tests/ui/closures/closure_promotion.rs
index 47a8fc090..47a8fc090 100644
--- a/src/test/ui/closures/closure_promotion.rs
+++ b/tests/ui/closures/closure_promotion.rs
diff --git a/src/test/ui/closures/coerce-unsafe-closure-to-unsafe-fn-ptr.mir.stderr b/tests/ui/closures/coerce-unsafe-closure-to-unsafe-fn-ptr.mir.stderr
index a60100dda..a60100dda 100644
--- a/src/test/ui/closures/coerce-unsafe-closure-to-unsafe-fn-ptr.mir.stderr
+++ b/tests/ui/closures/coerce-unsafe-closure-to-unsafe-fn-ptr.mir.stderr
diff --git a/src/test/ui/closures/coerce-unsafe-closure-to-unsafe-fn-ptr.rs b/tests/ui/closures/coerce-unsafe-closure-to-unsafe-fn-ptr.rs
index 57358fbdd..57358fbdd 100644
--- a/src/test/ui/closures/coerce-unsafe-closure-to-unsafe-fn-ptr.rs
+++ b/tests/ui/closures/coerce-unsafe-closure-to-unsafe-fn-ptr.rs
diff --git a/src/test/ui/closures/coerce-unsafe-closure-to-unsafe-fn-ptr.thir.stderr b/tests/ui/closures/coerce-unsafe-closure-to-unsafe-fn-ptr.thir.stderr
index 8c516e890..8c516e890 100644
--- a/src/test/ui/closures/coerce-unsafe-closure-to-unsafe-fn-ptr.thir.stderr
+++ b/tests/ui/closures/coerce-unsafe-closure-to-unsafe-fn-ptr.thir.stderr
diff --git a/src/test/ui/closures/coerce-unsafe-to-closure.rs b/tests/ui/closures/coerce-unsafe-to-closure.rs
index 78bdd36f9..78bdd36f9 100644
--- a/src/test/ui/closures/coerce-unsafe-to-closure.rs
+++ b/tests/ui/closures/coerce-unsafe-to-closure.rs
diff --git a/src/test/ui/closures/coerce-unsafe-to-closure.stderr b/tests/ui/closures/coerce-unsafe-to-closure.stderr
index 6ce63e829..449cd0b31 100644
--- a/src/test/ui/closures/coerce-unsafe-to-closure.stderr
+++ b/tests/ui/closures/coerce-unsafe-to-closure.stderr
@@ -10,9 +10,6 @@ LL |     let x: Option<&[u8]> = Some("foo").map(std::mem::transmute);
    = note: unsafe function cannot be called generically without an unsafe block
 note: required by a bound in `Option::<T>::map`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL |         F: ~const FnOnce(T) -> U,
-   |            ^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Option::<T>::map`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closures/deeply-nested_closures.rs b/tests/ui/closures/deeply-nested_closures.rs
index a02684ee1..a02684ee1 100644
--- a/src/test/ui/closures/deeply-nested_closures.rs
+++ b/tests/ui/closures/deeply-nested_closures.rs
diff --git a/src/test/ui/closures/diverging-closure.rs b/tests/ui/closures/diverging-closure.rs
index 1213a883e..1213a883e 100644
--- a/src/test/ui/closures/diverging-closure.rs
+++ b/tests/ui/closures/diverging-closure.rs
diff --git a/src/test/ui/closures/issue-101696.rs b/tests/ui/closures/issue-101696.rs
index 0a358bd16..0a358bd16 100644
--- a/src/test/ui/closures/issue-101696.rs
+++ b/tests/ui/closures/issue-101696.rs
diff --git a/src/test/ui/closures/issue-102089-multiple-opaque-cast.rs b/tests/ui/closures/issue-102089-multiple-opaque-cast.rs
index 043bf06a1..043bf06a1 100644
--- a/src/test/ui/closures/issue-102089-multiple-opaque-cast.rs
+++ b/tests/ui/closures/issue-102089-multiple-opaque-cast.rs
diff --git a/src/test/ui/closures/issue-10398.rs b/tests/ui/closures/issue-10398.rs
index f76d09cd0..f76d09cd0 100644
--- a/src/test/ui/closures/issue-10398.rs
+++ b/tests/ui/closures/issue-10398.rs
diff --git a/src/test/ui/closures/issue-10398.stderr b/tests/ui/closures/issue-10398.stderr
index 423b79daf..423b79daf 100644
--- a/src/test/ui/closures/issue-10398.stderr
+++ b/tests/ui/closures/issue-10398.stderr
diff --git a/src/test/ui/closures/issue-23012-supertrait-signature-inference.rs b/tests/ui/closures/issue-23012-supertrait-signature-inference.rs
index 5899b703e..5899b703e 100644
--- a/src/test/ui/closures/issue-23012-supertrait-signature-inference.rs
+++ b/tests/ui/closures/issue-23012-supertrait-signature-inference.rs
diff --git a/src/test/ui/closures/issue-41366.rs b/tests/ui/closures/issue-41366.rs
index acc1c6ae1..acc1c6ae1 100644
--- a/src/test/ui/closures/issue-41366.rs
+++ b/tests/ui/closures/issue-41366.rs
diff --git a/src/test/ui/closures/issue-42463.rs b/tests/ui/closures/issue-42463.rs
index 51d6ea3f7..51d6ea3f7 100644
--- a/src/test/ui/closures/issue-42463.rs
+++ b/tests/ui/closures/issue-42463.rs
diff --git a/src/test/ui/closures/issue-46742.rs b/tests/ui/closures/issue-46742.rs
index cd8dc4869..cd8dc4869 100644
--- a/src/test/ui/closures/issue-46742.rs
+++ b/tests/ui/closures/issue-46742.rs
diff --git a/src/test/ui/closures/issue-48109.rs b/tests/ui/closures/issue-48109.rs
index ce1f2a036..ce1f2a036 100644
--- a/src/test/ui/closures/issue-48109.rs
+++ b/tests/ui/closures/issue-48109.rs
diff --git a/src/test/ui/closures/issue-52437.rs b/tests/ui/closures/issue-52437.rs
index 6ac5380a5..6ac5380a5 100644
--- a/src/test/ui/closures/issue-52437.rs
+++ b/tests/ui/closures/issue-52437.rs
diff --git a/src/test/ui/closures/issue-52437.stderr b/tests/ui/closures/issue-52437.stderr
index 4c24a54bb..9ba24c7a8 100644
--- a/src/test/ui/closures/issue-52437.stderr
+++ b/tests/ui/closures/issue-52437.stderr
@@ -12,8 +12,8 @@ LL |     [(); &(&'static: loop { |x| {}; }) as *const _ as usize]
    |
 help: consider giving this closure parameter an explicit type
    |
-LL |     [(); &(&'static: loop { |x: _| {}; }) as *const _ as usize]
-   |                               +++
+LL |     [(); &(&'static: loop { |x: /* Type */| {}; }) as *const _ as usize]
+   |                               ++++++++++++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/closures/issue-67123.rs b/tests/ui/closures/issue-67123.rs
index 014c530e6..014c530e6 100644
--- a/src/test/ui/closures/issue-67123.rs
+++ b/tests/ui/closures/issue-67123.rs
diff --git a/src/test/ui/closures/issue-67123.stderr b/tests/ui/closures/issue-67123.stderr
index 7877c7334..7877c7334 100644
--- a/src/test/ui/closures/issue-67123.stderr
+++ b/tests/ui/closures/issue-67123.stderr
diff --git a/src/test/ui/closures/issue-6801.rs b/tests/ui/closures/issue-6801.rs
index cecb08f00..cecb08f00 100644
--- a/src/test/ui/closures/issue-6801.rs
+++ b/tests/ui/closures/issue-6801.rs
diff --git a/src/test/ui/closures/issue-6801.stderr b/tests/ui/closures/issue-6801.stderr
index 6a40db0d5..6a40db0d5 100644
--- a/src/test/ui/closures/issue-6801.stderr
+++ b/tests/ui/closures/issue-6801.stderr
diff --git a/src/test/ui/closures/issue-68025.rs b/tests/ui/closures/issue-68025.rs
index 261bfd60a..261bfd60a 100644
--- a/src/test/ui/closures/issue-68025.rs
+++ b/tests/ui/closures/issue-68025.rs
diff --git a/src/test/ui/closures/issue-72408-nested-closures-exponential.rs b/tests/ui/closures/issue-72408-nested-closures-exponential.rs
index 2d6ba9365..2d6ba9365 100644
--- a/src/test/ui/closures/issue-72408-nested-closures-exponential.rs
+++ b/tests/ui/closures/issue-72408-nested-closures-exponential.rs
diff --git a/src/test/ui/closures/issue-78720.rs b/tests/ui/closures/issue-78720.rs
index 4cdb9f491..4cdb9f491 100644
--- a/src/test/ui/closures/issue-78720.rs
+++ b/tests/ui/closures/issue-78720.rs
diff --git a/src/test/ui/closures/issue-78720.stderr b/tests/ui/closures/issue-78720.stderr
index da3f539a0..1e860d32b 100644
--- a/src/test/ui/closures/issue-78720.stderr
+++ b/tests/ui/closures/issue-78720.stderr
@@ -9,11 +9,9 @@ error[E0412]: cannot find type `F` in this scope
    |
 LL |     _func: F,
    |            ^
+  --> $SRC_DIR/core/src/ops/function.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/ops/function.rs:LL:COL
-   |
-LL | pub trait Fn<Args: Tuple>: FnMut<Args> {
-   | -------------------------------------- similarly named trait `Fn` defined here
+   = note: similarly named trait `Fn` defined here
    |
 help: a trait with a similar name exists
    |
diff --git a/src/test/ui/closures/issue-80313-mutable-borrow-in-closure.rs b/tests/ui/closures/issue-80313-mutable-borrow-in-closure.rs
index ff210ae06..ff210ae06 100644
--- a/src/test/ui/closures/issue-80313-mutable-borrow-in-closure.rs
+++ b/tests/ui/closures/issue-80313-mutable-borrow-in-closure.rs
diff --git a/src/test/ui/closures/issue-80313-mutable-borrow-in-closure.stderr b/tests/ui/closures/issue-80313-mutable-borrow-in-closure.stderr
index bf9e1febd..239f071ca 100644
--- a/src/test/ui/closures/issue-80313-mutable-borrow-in-closure.stderr
+++ b/tests/ui/closures/issue-80313-mutable-borrow-in-closure.stderr
@@ -1,13 +1,16 @@
 error[E0596]: cannot borrow `callback` as mutable, as it is not declared as mutable
   --> $DIR/issue-80313-mutable-borrow-in-closure.rs:6:5
    |
-LL |     let callback = || {
-   |         -------- help: consider changing this to be mutable: `mut callback`
 LL |         &mut my_var;
    |              ------ calling `callback` requires mutable binding due to mutable borrow of `my_var`
 LL |     };
 LL |     callback();
    |     ^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut callback = || {
+   |         +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closures/issue-80313-mutable-borrow-in-move-closure.rs b/tests/ui/closures/issue-80313-mutable-borrow-in-move-closure.rs
index 8f2d8a676..8f2d8a676 100644
--- a/src/test/ui/closures/issue-80313-mutable-borrow-in-move-closure.rs
+++ b/tests/ui/closures/issue-80313-mutable-borrow-in-move-closure.rs
diff --git a/src/test/ui/closures/issue-80313-mutable-borrow-in-move-closure.stderr b/tests/ui/closures/issue-80313-mutable-borrow-in-move-closure.stderr
index b67cec6a6..1ec279f03 100644
--- a/src/test/ui/closures/issue-80313-mutable-borrow-in-move-closure.stderr
+++ b/tests/ui/closures/issue-80313-mutable-borrow-in-move-closure.stderr
@@ -1,13 +1,16 @@
 error[E0596]: cannot borrow `callback` as mutable, as it is not declared as mutable
   --> $DIR/issue-80313-mutable-borrow-in-move-closure.rs:6:5
    |
-LL |     let callback = move || {
-   |         -------- help: consider changing this to be mutable: `mut callback`
 LL |         &mut my_var;
    |              ------ calling `callback` requires mutable binding due to possible mutation of `my_var`
 LL |     };
 LL |     callback();
    |     ^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut callback = move || {
+   |         +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closures/issue-80313-mutation-in-closure.rs b/tests/ui/closures/issue-80313-mutation-in-closure.rs
index e082ea562..e082ea562 100644
--- a/src/test/ui/closures/issue-80313-mutation-in-closure.rs
+++ b/tests/ui/closures/issue-80313-mutation-in-closure.rs
diff --git a/src/test/ui/closures/issue-80313-mutation-in-closure.stderr b/tests/ui/closures/issue-80313-mutation-in-closure.stderr
index 6e98549f6..22a62ce73 100644
--- a/src/test/ui/closures/issue-80313-mutation-in-closure.stderr
+++ b/tests/ui/closures/issue-80313-mutation-in-closure.stderr
@@ -1,13 +1,16 @@
 error[E0596]: cannot borrow `callback` as mutable, as it is not declared as mutable
   --> $DIR/issue-80313-mutation-in-closure.rs:6:5
    |
-LL |     let callback = || {
-   |         -------- help: consider changing this to be mutable: `mut callback`
 LL |         my_var = true;
    |         ------ calling `callback` requires mutable binding due to mutable borrow of `my_var`
 LL |     };
 LL |     callback();
    |     ^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut callback = || {
+   |         +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closures/issue-80313-mutation-in-move-closure.rs b/tests/ui/closures/issue-80313-mutation-in-move-closure.rs
index f66bf4e06..f66bf4e06 100644
--- a/src/test/ui/closures/issue-80313-mutation-in-move-closure.rs
+++ b/tests/ui/closures/issue-80313-mutation-in-move-closure.rs
diff --git a/src/test/ui/closures/issue-80313-mutation-in-move-closure.stderr b/tests/ui/closures/issue-80313-mutation-in-move-closure.stderr
index edd55422a..a2222f8cc 100644
--- a/src/test/ui/closures/issue-80313-mutation-in-move-closure.stderr
+++ b/tests/ui/closures/issue-80313-mutation-in-move-closure.stderr
@@ -1,13 +1,16 @@
 error[E0596]: cannot borrow `callback` as mutable, as it is not declared as mutable
   --> $DIR/issue-80313-mutation-in-move-closure.rs:6:5
    |
-LL |     let callback = move || {
-   |         -------- help: consider changing this to be mutable: `mut callback`
 LL |         my_var = true;
    |         ------ calling `callback` requires mutable binding due to possible mutation of `my_var`
 LL |     };
 LL |     callback();
    |     ^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut callback = move || {
+   |         +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closures/issue-81700-mut-borrow.rs b/tests/ui/closures/issue-81700-mut-borrow.rs
index a27a61601..a27a61601 100644
--- a/src/test/ui/closures/issue-81700-mut-borrow.rs
+++ b/tests/ui/closures/issue-81700-mut-borrow.rs
diff --git a/tests/ui/closures/issue-81700-mut-borrow.stderr b/tests/ui/closures/issue-81700-mut-borrow.stderr
new file mode 100644
index 000000000..03b18c3f7
--- /dev/null
+++ b/tests/ui/closures/issue-81700-mut-borrow.stderr
@@ -0,0 +1,16 @@
+error[E0596]: cannot borrow `bar` as mutable, as it is not declared as mutable
+  --> $DIR/issue-81700-mut-borrow.rs:3:5
+   |
+LL |     let bar = || { foo(x); };
+   |                        - calling `bar` requires mutable binding due to mutable borrow of `x`
+LL |     bar();
+   |     ^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut bar = || { foo(x); };
+   |         +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/closures/issue-82438-mut-without-upvar.rs b/tests/ui/closures/issue-82438-mut-without-upvar.rs
index 5d88e1e77..5d88e1e77 100644
--- a/src/test/ui/closures/issue-82438-mut-without-upvar.rs
+++ b/tests/ui/closures/issue-82438-mut-without-upvar.rs
diff --git a/src/test/ui/closures/issue-82438-mut-without-upvar.stderr b/tests/ui/closures/issue-82438-mut-without-upvar.stderr
index 802284b26..f0951b7d1 100644
--- a/src/test/ui/closures/issue-82438-mut-without-upvar.stderr
+++ b/tests/ui/closures/issue-82438-mut-without-upvar.stderr
@@ -1,11 +1,13 @@
 error[E0596]: cannot borrow `c` as mutable, as it is not declared as mutable
   --> $DIR/issue-82438-mut-without-upvar.rs:27:27
    |
-LL |     let c = |a, b, c, d| {};
-   |         - help: consider changing this to be mutable: `mut c`
-LL |
 LL |     A.f(participant_name, &mut c);
    |                           ^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut c = |a, b, c, d| {};
+   |         +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closures/issue-84044-drop-non-mut.rs b/tests/ui/closures/issue-84044-drop-non-mut.rs
index aed7750f1..aed7750f1 100644
--- a/src/test/ui/closures/issue-84044-drop-non-mut.rs
+++ b/tests/ui/closures/issue-84044-drop-non-mut.rs
diff --git a/src/test/ui/closures/issue-84044-drop-non-mut.stderr b/tests/ui/closures/issue-84044-drop-non-mut.stderr
index c0bfad263..5335a056c 100644
--- a/src/test/ui/closures/issue-84044-drop-non-mut.stderr
+++ b/tests/ui/closures/issue-84044-drop-non-mut.stderr
@@ -1,10 +1,13 @@
 error[E0596]: cannot borrow `f` as mutable, as it is not declared as mutable
   --> $DIR/issue-84044-drop-non-mut.rs:5:10
    |
-LL |     let f = || {};
-   |         - help: consider changing this to be mutable: `mut f`
 LL |     drop(&mut f);
    |          ^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut f = || {};
+   |         +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closures/issue-84128.rs b/tests/ui/closures/issue-84128.rs
index 30733871b..30733871b 100644
--- a/src/test/ui/closures/issue-84128.rs
+++ b/tests/ui/closures/issue-84128.rs
diff --git a/tests/ui/closures/issue-84128.stderr b/tests/ui/closures/issue-84128.stderr
new file mode 100644
index 000000000..1cd8949b8
--- /dev/null
+++ b/tests/ui/closures/issue-84128.stderr
@@ -0,0 +1,24 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-84128.rs:13:13
+   |
+LL |         Foo(())
+   |         --- ^^ expected integer, found `()`
+   |         |
+   |         arguments to this struct are incorrect
+   |
+help: the type constructed contains `()` due to the type of the argument passed
+  --> $DIR/issue-84128.rs:13:9
+   |
+LL |         Foo(())
+   |         ^^^^--^
+   |             |
+   |             this argument influences the type of `Foo`
+note: tuple struct defined here
+  --> $DIR/issue-84128.rs:5:8
+   |
+LL | struct Foo<T>(T);
+   |        ^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/closures/issue-87461.rs b/tests/ui/closures/issue-87461.rs
index 0151080ee..0151080ee 100644
--- a/src/test/ui/closures/issue-87461.rs
+++ b/tests/ui/closures/issue-87461.rs
diff --git a/tests/ui/closures/issue-87461.stderr b/tests/ui/closures/issue-87461.stderr
new file mode 100644
index 000000000..b492251c0
--- /dev/null
+++ b/tests/ui/closures/issue-87461.stderr
@@ -0,0 +1,57 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-87461.rs:10:8
+   |
+LL |     Ok(())
+   |     -- ^^ expected `u16`, found `()`
+   |     |
+   |     arguments to this enum variant are incorrect
+   |
+help: the type constructed contains `()` due to the type of the argument passed
+  --> $DIR/issue-87461.rs:10:5
+   |
+LL |     Ok(())
+   |     ^^^--^
+   |        |
+   |        this argument influences the type of `Ok`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+
+error[E0308]: mismatched types
+  --> $DIR/issue-87461.rs:17:8
+   |
+LL |     Ok(())
+   |     -- ^^ expected `u16`, found `()`
+   |     |
+   |     arguments to this enum variant are incorrect
+   |
+help: the type constructed contains `()` due to the type of the argument passed
+  --> $DIR/issue-87461.rs:17:5
+   |
+LL |     Ok(())
+   |     ^^^--^
+   |        |
+   |        this argument influences the type of `Ok`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+
+error[E0308]: mismatched types
+  --> $DIR/issue-87461.rs:26:12
+   |
+LL |         Ok(())
+   |         -- ^^ expected `u16`, found `()`
+   |         |
+   |         arguments to this enum variant are incorrect
+   |
+help: the type constructed contains `()` due to the type of the argument passed
+  --> $DIR/issue-87461.rs:26:9
+   |
+LL |         Ok(())
+   |         ^^^--^
+   |            |
+   |            this argument influences the type of `Ok`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/closures/issue-87814-1.rs b/tests/ui/closures/issue-87814-1.rs
index 5cf01ddf5..5cf01ddf5 100644
--- a/src/test/ui/closures/issue-87814-1.rs
+++ b/tests/ui/closures/issue-87814-1.rs
diff --git a/src/test/ui/closures/issue-87814-2.rs b/tests/ui/closures/issue-87814-2.rs
index efe77f90f..efe77f90f 100644
--- a/src/test/ui/closures/issue-87814-2.rs
+++ b/tests/ui/closures/issue-87814-2.rs
diff --git a/src/test/ui/closures/issue-90871.rs b/tests/ui/closures/issue-90871.rs
index 7ce061cd3..7ce061cd3 100644
--- a/src/test/ui/closures/issue-90871.rs
+++ b/tests/ui/closures/issue-90871.rs
diff --git a/src/test/ui/closures/issue-90871.stderr b/tests/ui/closures/issue-90871.stderr
index a482750fb..4a578b4d7 100644
--- a/src/test/ui/closures/issue-90871.stderr
+++ b/tests/ui/closures/issue-90871.stderr
@@ -3,11 +3,9 @@ error[E0412]: cannot find type `n` in this scope
    |
 LL |     type_ascribe!(2, n([u8; || 1]))
    |                      ^ help: a trait with a similar name exists: `Fn`
+  --> $SRC_DIR/core/src/ops/function.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/ops/function.rs:LL:COL
-   |
-LL | pub trait Fn<Args: Tuple>: FnMut<Args> {
-   | -------------------------------------- similarly named trait `Fn` defined here
+   = note: similarly named trait `Fn` defined here
 
 error[E0308]: mismatched types
   --> $DIR/issue-90871.rs:4:29
diff --git a/src/test/ui/closures/issue-97607.rs b/tests/ui/closures/issue-97607.rs
index 74c910ad0..74c910ad0 100644
--- a/src/test/ui/closures/issue-97607.rs
+++ b/tests/ui/closures/issue-97607.rs
diff --git a/src/test/ui/closures/issue-99565.rs b/tests/ui/closures/issue-99565.rs
index 3a30d2ee0..3a30d2ee0 100644
--- a/src/test/ui/closures/issue-99565.rs
+++ b/tests/ui/closures/issue-99565.rs
diff --git a/src/test/ui/closures/issue-99565.stderr b/tests/ui/closures/issue-99565.stderr
index 0d940aa9a..0d940aa9a 100644
--- a/src/test/ui/closures/issue-99565.stderr
+++ b/tests/ui/closures/issue-99565.stderr
diff --git a/src/test/ui/closures/local-type-mix.rs b/tests/ui/closures/local-type-mix.rs
index 006e6f490..006e6f490 100644
--- a/src/test/ui/closures/local-type-mix.rs
+++ b/tests/ui/closures/local-type-mix.rs
diff --git a/src/test/ui/closures/local-type-mix.stderr b/tests/ui/closures/local-type-mix.stderr
index 68c320a06..68c320a06 100644
--- a/src/test/ui/closures/local-type-mix.stderr
+++ b/tests/ui/closures/local-type-mix.stderr
diff --git a/src/test/ui/closures/multiple-fn-bounds.rs b/tests/ui/closures/multiple-fn-bounds.rs
index 6bb4098e2..6bb4098e2 100644
--- a/src/test/ui/closures/multiple-fn-bounds.rs
+++ b/tests/ui/closures/multiple-fn-bounds.rs
diff --git a/src/test/ui/closures/multiple-fn-bounds.stderr b/tests/ui/closures/multiple-fn-bounds.stderr
index eefc123fe..32a1edb00 100644
--- a/src/test/ui/closures/multiple-fn-bounds.stderr
+++ b/tests/ui/closures/multiple-fn-bounds.stderr
@@ -18,6 +18,10 @@ note: required by a bound in `foo`
    |
 LL | fn foo<F: Fn(&char) -> bool + Fn(char) -> bool>(f: F) {
    |                               ^^^^^^^^^^^^^^^^ required by this bound in `foo`
+help: do not borrow the argument
+   |
+LL |     foo(move |char| v);
+   |               ~~~~
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closures/old-closure-arg-call-as.rs b/tests/ui/closures/old-closure-arg-call-as.rs
index 87cf3a487..87cf3a487 100644
--- a/src/test/ui/closures/old-closure-arg-call-as.rs
+++ b/tests/ui/closures/old-closure-arg-call-as.rs
diff --git a/src/test/ui/closures/old-closure-arg.rs b/tests/ui/closures/old-closure-arg.rs
index bd1385e5c..bd1385e5c 100644
--- a/src/test/ui/closures/old-closure-arg.rs
+++ b/tests/ui/closures/old-closure-arg.rs
diff --git a/src/test/ui/closures/old-closure-explicit-types.rs b/tests/ui/closures/old-closure-explicit-types.rs
index 860fcc8df..860fcc8df 100644
--- a/src/test/ui/closures/old-closure-explicit-types.rs
+++ b/tests/ui/closures/old-closure-explicit-types.rs
diff --git a/src/test/ui/closures/old-closure-expr-precedence.rs b/tests/ui/closures/old-closure-expr-precedence.rs
index 13b2fe9c3..13b2fe9c3 100644
--- a/src/test/ui/closures/old-closure-expr-precedence.rs
+++ b/tests/ui/closures/old-closure-expr-precedence.rs
diff --git a/src/test/ui/closures/old-closure-expr-precedence.stderr b/tests/ui/closures/old-closure-expr-precedence.stderr
index fabece1ad..fabece1ad 100644
--- a/src/test/ui/closures/old-closure-expr-precedence.stderr
+++ b/tests/ui/closures/old-closure-expr-precedence.stderr
diff --git a/src/test/ui/closures/old-closure-expression-remove-semicolon.fixed b/tests/ui/closures/old-closure-expression-remove-semicolon.fixed
index 8aa9e952b..8aa9e952b 100644
--- a/src/test/ui/closures/old-closure-expression-remove-semicolon.fixed
+++ b/tests/ui/closures/old-closure-expression-remove-semicolon.fixed
diff --git a/src/test/ui/closures/old-closure-expression-remove-semicolon.rs b/tests/ui/closures/old-closure-expression-remove-semicolon.rs
index 912c7a331..912c7a331 100644
--- a/src/test/ui/closures/old-closure-expression-remove-semicolon.rs
+++ b/tests/ui/closures/old-closure-expression-remove-semicolon.rs
diff --git a/src/test/ui/closures/old-closure-expression-remove-semicolon.stderr b/tests/ui/closures/old-closure-expression-remove-semicolon.stderr
index bc54ab4d5..bc54ab4d5 100644
--- a/src/test/ui/closures/old-closure-expression-remove-semicolon.stderr
+++ b/tests/ui/closures/old-closure-expression-remove-semicolon.stderr
diff --git a/src/test/ui/closures/old-closure-fn-coerce.rs b/tests/ui/closures/old-closure-fn-coerce.rs
index d993ad994..d993ad994 100644
--- a/src/test/ui/closures/old-closure-fn-coerce.rs
+++ b/tests/ui/closures/old-closure-fn-coerce.rs
diff --git a/src/test/ui/closures/old-closure-iter-1.rs b/tests/ui/closures/old-closure-iter-1.rs
index caf0266cf..caf0266cf 100644
--- a/src/test/ui/closures/old-closure-iter-1.rs
+++ b/tests/ui/closures/old-closure-iter-1.rs
diff --git a/src/test/ui/closures/old-closure-iter-2.rs b/tests/ui/closures/old-closure-iter-2.rs
index e90c1ee81..e90c1ee81 100644
--- a/src/test/ui/closures/old-closure-iter-2.rs
+++ b/tests/ui/closures/old-closure-iter-2.rs
diff --git a/src/test/ui/closures/once-move-out-on-heap.rs b/tests/ui/closures/once-move-out-on-heap.rs
index 4e2e400ce..4e2e400ce 100644
--- a/src/test/ui/closures/once-move-out-on-heap.rs
+++ b/tests/ui/closures/once-move-out-on-heap.rs
diff --git a/src/test/ui/closures/print/closure-print-generic-1.rs b/tests/ui/closures/print/closure-print-generic-1.rs
index 504b4adbe..504b4adbe 100644
--- a/src/test/ui/closures/print/closure-print-generic-1.rs
+++ b/tests/ui/closures/print/closure-print-generic-1.rs
diff --git a/src/test/ui/closures/print/closure-print-generic-1.stderr b/tests/ui/closures/print/closure-print-generic-1.stderr
index b21734f02..b21734f02 100644
--- a/src/test/ui/closures/print/closure-print-generic-1.stderr
+++ b/tests/ui/closures/print/closure-print-generic-1.stderr
diff --git a/src/test/ui/closures/print/closure-print-generic-2.rs b/tests/ui/closures/print/closure-print-generic-2.rs
index 3f77fd26b..3f77fd26b 100644
--- a/src/test/ui/closures/print/closure-print-generic-2.rs
+++ b/tests/ui/closures/print/closure-print-generic-2.rs
diff --git a/src/test/ui/closures/print/closure-print-generic-2.stderr b/tests/ui/closures/print/closure-print-generic-2.stderr
index e53277a93..e53277a93 100644
--- a/src/test/ui/closures/print/closure-print-generic-2.stderr
+++ b/tests/ui/closures/print/closure-print-generic-2.stderr
diff --git a/src/test/ui/closures/print/closure-print-generic-trim-off-verbose-2.rs b/tests/ui/closures/print/closure-print-generic-trim-off-verbose-2.rs
index 07bf8fe4c..07bf8fe4c 100644
--- a/src/test/ui/closures/print/closure-print-generic-trim-off-verbose-2.rs
+++ b/tests/ui/closures/print/closure-print-generic-trim-off-verbose-2.rs
diff --git a/src/test/ui/closures/print/closure-print-generic-trim-off-verbose-2.stderr b/tests/ui/closures/print/closure-print-generic-trim-off-verbose-2.stderr
index ff89dd340..ff89dd340 100644
--- a/src/test/ui/closures/print/closure-print-generic-trim-off-verbose-2.stderr
+++ b/tests/ui/closures/print/closure-print-generic-trim-off-verbose-2.stderr
diff --git a/src/test/ui/closures/print/closure-print-generic-verbose-1.rs b/tests/ui/closures/print/closure-print-generic-verbose-1.rs
index 67d37f1c5..67d37f1c5 100644
--- a/src/test/ui/closures/print/closure-print-generic-verbose-1.rs
+++ b/tests/ui/closures/print/closure-print-generic-verbose-1.rs
diff --git a/src/test/ui/closures/print/closure-print-generic-verbose-1.stderr b/tests/ui/closures/print/closure-print-generic-verbose-1.stderr
index 3ab7c66d1..3ab7c66d1 100644
--- a/src/test/ui/closures/print/closure-print-generic-verbose-1.stderr
+++ b/tests/ui/closures/print/closure-print-generic-verbose-1.stderr
diff --git a/src/test/ui/closures/print/closure-print-generic-verbose-2.rs b/tests/ui/closures/print/closure-print-generic-verbose-2.rs
index f460fedff..f460fedff 100644
--- a/src/test/ui/closures/print/closure-print-generic-verbose-2.rs
+++ b/tests/ui/closures/print/closure-print-generic-verbose-2.rs
diff --git a/src/test/ui/closures/print/closure-print-generic-verbose-2.stderr b/tests/ui/closures/print/closure-print-generic-verbose-2.stderr
index 5bbf84f96..5bbf84f96 100644
--- a/src/test/ui/closures/print/closure-print-generic-verbose-2.stderr
+++ b/tests/ui/closures/print/closure-print-generic-verbose-2.stderr
diff --git a/src/test/ui/closures/print/closure-print-verbose.rs b/tests/ui/closures/print/closure-print-verbose.rs
index 4b0438a91..4b0438a91 100644
--- a/src/test/ui/closures/print/closure-print-verbose.rs
+++ b/tests/ui/closures/print/closure-print-verbose.rs
diff --git a/src/test/ui/closures/print/closure-print-verbose.stderr b/tests/ui/closures/print/closure-print-verbose.stderr
index 083717b33..083717b33 100644
--- a/src/test/ui/closures/print/closure-print-verbose.stderr
+++ b/tests/ui/closures/print/closure-print-verbose.stderr
diff --git a/src/test/ui/closures/semistatement-in-lambda.rs b/tests/ui/closures/semistatement-in-lambda.rs
index ebd55e0ba..ebd55e0ba 100644
--- a/src/test/ui/closures/semistatement-in-lambda.rs
+++ b/tests/ui/closures/semistatement-in-lambda.rs
diff --git a/tests/ui/closures/supertrait-hint-cycle-2.rs b/tests/ui/closures/supertrait-hint-cycle-2.rs
new file mode 100644
index 000000000..fda81b18d
--- /dev/null
+++ b/tests/ui/closures/supertrait-hint-cycle-2.rs
@@ -0,0 +1,18 @@
+// check-pass
+
+trait Foo<'a> {
+    type Input;
+}
+
+impl<F: Fn(u32)> Foo<'_> for F {
+    type Input = u32;
+}
+
+trait SuperFn: for<'a> Foo<'a> + for<'a> Fn(<Self as Foo<'a>>::Input) {}
+impl<T> SuperFn for T where T: for<'a> Fn(<Self as Foo<'a>>::Input) + for<'a> Foo<'a> {}
+
+fn needs_super(_: impl SuperFn) {}
+
+fn main() {
+    needs_super(|_: u32| {});
+}
diff --git a/tests/ui/closures/supertrait-hint-cycle-3.rs b/tests/ui/closures/supertrait-hint-cycle-3.rs
new file mode 100644
index 000000000..8149474df
--- /dev/null
+++ b/tests/ui/closures/supertrait-hint-cycle-3.rs
@@ -0,0 +1,16 @@
+// check-pass
+
+
+trait Foo<'a> {
+    type Input;
+}
+
+impl<F: Fn(u32)> Foo<'_> for F {
+    type Input = u32;
+}
+
+fn needs_super<F: for<'a> Fn(<F as Foo<'a>>::Input) + for<'a> Foo<'a>>(_: F) {}
+
+fn main() {
+    needs_super(|_: u32| {});
+}
diff --git a/tests/ui/closures/supertrait-hint-cycle.rs b/tests/ui/closures/supertrait-hint-cycle.rs
new file mode 100644
index 000000000..dbb06b2ef
--- /dev/null
+++ b/tests/ui/closures/supertrait-hint-cycle.rs
@@ -0,0 +1,65 @@
+// edition:2021
+// check-pass
+
+#![feature(type_alias_impl_trait)]
+#![feature(closure_lifetime_binder)]
+
+use std::future::Future;
+
+trait AsyncFn<I, R>: FnMut(I) -> Self::Fut {
+    type Fut: Future<Output = R>;
+}
+
+impl<F, I, R, Fut> AsyncFn<I, R> for F
+where
+    Fut: Future<Output = R>,
+    F: FnMut(I) -> Fut,
+{
+    type Fut = Fut;
+}
+
+async fn call<C, R, F>(mut ctx: C, mut f: F) -> Result<R, ()>
+where
+    F: for<'a> AsyncFn<&'a mut C, Result<R, ()>>,
+{
+    loop {
+        match f(&mut ctx).await {
+            Ok(val) => return Ok(val),
+            Err(_) => continue,
+        }
+    }
+}
+
+trait Cap<'a> {}
+impl<T> Cap<'_> for T {}
+
+fn works(ctx: &mut usize) {
+    let mut inner = 0;
+
+    type Ret<'a, 'b: 'a> = impl Future<Output = Result<usize, ()>> + 'a + Cap<'b>;
+
+    let callback = for<'a, 'b> |c: &'a mut &'b mut usize| -> Ret<'a, 'b> {
+        inner += 1;
+        async move {
+            let _c = c;
+            Ok(1usize)
+        }
+    };
+    call(ctx, callback);
+}
+
+fn doesnt_work_but_should(ctx: &mut usize) {
+    let mut inner = 0;
+
+    type Ret<'a, 'b: 'a> = impl Future<Output = Result<usize, ()>> + 'a + Cap<'b>;
+
+    call(ctx, for<'a, 'b> |c: &'a mut &'b mut usize| -> Ret<'a, 'b> {
+        inner += 1;
+        async move {
+            let _c = c;
+            Ok(1usize)
+        }
+    });
+}
+
+fn main() {}
diff --git a/src/test/ui/closures/supertrait-hint-references-assoc-ty.rs b/tests/ui/closures/supertrait-hint-references-assoc-ty.rs
index 270bf14c3..270bf14c3 100644
--- a/src/test/ui/closures/supertrait-hint-references-assoc-ty.rs
+++ b/tests/ui/closures/supertrait-hint-references-assoc-ty.rs
diff --git a/src/test/ui/closures/thir-unsafeck-issue-85871.rs b/tests/ui/closures/thir-unsafeck-issue-85871.rs
index aea539b74..aea539b74 100644
--- a/src/test/ui/closures/thir-unsafeck-issue-85871.rs
+++ b/tests/ui/closures/thir-unsafeck-issue-85871.rs
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/gate_test.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/gate_test.rs
index e05dbf3bb..e05dbf3bb 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/gate_test.rs
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/gate_test.rs
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/gate_test.stderr b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/gate_test.stderr
index ed8e16899..ed8e16899 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/gate_test.stderr
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/gate_test.stderr
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-registers.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-registers.rs
index bbc039bdf..bbc039bdf 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-registers.rs
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-registers.rs
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.rs
index b8112b20a..b8112b20a 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.rs
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.rs
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.stderr b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.stderr
index 372300787..372300787 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.stderr
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.stderr
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.rs
index f32b37090..f32b37090 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.rs
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.rs
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.stderr b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.stderr
index 08b763b26..08b763b26 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.stderr
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.stderr
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.rs
index 6f8bb24aa..6f8bb24aa 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.rs
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.rs
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.stderr b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.stderr
index 3ade9891e..3ade9891e 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.stderr
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.stderr
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/gate_test.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/gate_test.rs
index 02d5f20fe..02d5f20fe 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/gate_test.rs
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/gate_test.rs
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/gate_test.stderr b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/gate_test.stderr
index 75a29b317..75a29b317 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/gate_test.stderr
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/gate_test.stderr
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/issue-83475.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/issue-83475.rs
index a839406cd..a839406cd 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/issue-83475.rs
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/issue-83475.rs
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/issue-83475.stderr b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/issue-83475.stderr
index 426d82d8d..426d82d8d 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/issue-83475.stderr
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/issue-83475.stderr
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-registers.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-registers.rs
index 5591a8a58..5591a8a58 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-registers.rs
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-registers.rs
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-stack.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-stack.rs
index 39b41dac4..39b41dac4 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-stack.rs
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-stack.rs
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-stack.stderr b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-stack.stderr
index 1054c2665..1054c2665 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-stack.stderr
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-stack.stderr
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.rs
index 3783e2794..3783e2794 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.rs
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.rs
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.stderr b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.stderr
index 7e8862f9a..7e8862f9a 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.stderr
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.stderr
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.rs
index 6320d2963..6320d2963 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.rs
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.rs
diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.stderr b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.stderr
index 36d76c967..36d76c967 100644
--- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.stderr
+++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.stderr
diff --git a/src/test/ui/codegen/auxiliary/issue-97708-aux.rs b/tests/ui/codegen/auxiliary/issue-97708-aux.rs
index e296bd391..e296bd391 100644
--- a/src/test/ui/codegen/auxiliary/issue-97708-aux.rs
+++ b/tests/ui/codegen/auxiliary/issue-97708-aux.rs
diff --git a/src/test/ui/codegen/auxiliary/llvm_pr32379.rs b/tests/ui/codegen/auxiliary/llvm_pr32379.rs
index 8e4297670..8e4297670 100644
--- a/src/test/ui/codegen/auxiliary/llvm_pr32379.rs
+++ b/tests/ui/codegen/auxiliary/llvm_pr32379.rs
diff --git a/src/test/ui/codegen/init-large-type.rs b/tests/ui/codegen/init-large-type.rs
index ce905572f..ce905572f 100644
--- a/src/test/ui/codegen/init-large-type.rs
+++ b/tests/ui/codegen/init-large-type.rs
diff --git a/src/test/ui/codegen/issue-101585-128bit-repeat.rs b/tests/ui/codegen/issue-101585-128bit-repeat.rs
index c6a686597..c6a686597 100644
--- a/src/test/ui/codegen/issue-101585-128bit-repeat.rs
+++ b/tests/ui/codegen/issue-101585-128bit-repeat.rs
diff --git a/src/test/ui/codegen/issue-16602-1.rs b/tests/ui/codegen/issue-16602-1.rs
index dd64ee75b..dd64ee75b 100644
--- a/src/test/ui/codegen/issue-16602-1.rs
+++ b/tests/ui/codegen/issue-16602-1.rs
diff --git a/src/test/ui/codegen/issue-16602-2.rs b/tests/ui/codegen/issue-16602-2.rs
index 6364630ff..6364630ff 100644
--- a/src/test/ui/codegen/issue-16602-2.rs
+++ b/tests/ui/codegen/issue-16602-2.rs
diff --git a/src/test/ui/codegen/issue-16602-3.rs b/tests/ui/codegen/issue-16602-3.rs
index ca1ab3cc7..ca1ab3cc7 100644
--- a/src/test/ui/codegen/issue-16602-3.rs
+++ b/tests/ui/codegen/issue-16602-3.rs
diff --git a/src/test/ui/codegen/issue-28950.rs b/tests/ui/codegen/issue-28950.rs
index 8b55f42f3..8b55f42f3 100644
--- a/src/test/ui/codegen/issue-28950.rs
+++ b/tests/ui/codegen/issue-28950.rs
diff --git a/tests/ui/codegen/issue-55976.rs b/tests/ui/codegen/issue-55976.rs
new file mode 100644
index 000000000..3142704b7
--- /dev/null
+++ b/tests/ui/codegen/issue-55976.rs
@@ -0,0 +1,13 @@
+// run-pass
+// ^-- The above is needed as this issue is related to LLVM/codegen.
+// min-llvm-version:15.0.0
+// ^-- The above is needed as this issue is fixed by the opaque pointers.
+
+fn main() {
+    type_error(|x| &x);
+}
+
+fn type_error<T>(
+    _selector: for<'a> fn(&'a Vec<Box<dyn for<'b> Fn(&'b u8)>>) -> &'a Vec<Box<dyn Fn(T)>>,
+) {
+}
diff --git a/src/test/ui/codegen/issue-63787.rs b/tests/ui/codegen/issue-63787.rs
index cba079b23..cba079b23 100644
--- a/src/test/ui/codegen/issue-63787.rs
+++ b/tests/ui/codegen/issue-63787.rs
diff --git a/src/test/ui/codegen/issue-64401.rs b/tests/ui/codegen/issue-64401.rs
index 53f85c63b..53f85c63b 100644
--- a/src/test/ui/codegen/issue-64401.rs
+++ b/tests/ui/codegen/issue-64401.rs
diff --git a/src/test/ui/issues/issue-82859-slice-miscompile.rs b/tests/ui/codegen/issue-82859-slice-miscompile.rs
index b64eb4990..b64eb4990 100644
--- a/src/test/ui/issues/issue-82859-slice-miscompile.rs
+++ b/tests/ui/codegen/issue-82859-slice-miscompile.rs
diff --git a/src/test/ui/codegen/issue-88043-bb-does-not-have-terminator.rs b/tests/ui/codegen/issue-88043-bb-does-not-have-terminator.rs
index 38dfca347..38dfca347 100644
--- a/src/test/ui/codegen/issue-88043-bb-does-not-have-terminator.rs
+++ b/tests/ui/codegen/issue-88043-bb-does-not-have-terminator.rs
diff --git a/src/test/ui/codegen/issue-97708.rs b/tests/ui/codegen/issue-97708.rs
index 8cb28e9f1..8cb28e9f1 100644
--- a/src/test/ui/codegen/issue-97708.rs
+++ b/tests/ui/codegen/issue-97708.rs
diff --git a/src/test/ui/codegen/issue-99551.rs b/tests/ui/codegen/issue-99551.rs
index b223aff4e..b223aff4e 100644
--- a/src/test/ui/codegen/issue-99551.rs
+++ b/tests/ui/codegen/issue-99551.rs
diff --git a/src/test/ui/codegen/llvm-pr32379.rs b/tests/ui/codegen/llvm-pr32379.rs
index 8a1f03241..8a1f03241 100644
--- a/src/test/ui/codegen/llvm-pr32379.rs
+++ b/tests/ui/codegen/llvm-pr32379.rs
diff --git a/src/test/ui/codemap_tests/bad-format-args.rs b/tests/ui/codemap_tests/bad-format-args.rs
index e89a45a84..e89a45a84 100644
--- a/src/test/ui/codemap_tests/bad-format-args.rs
+++ b/tests/ui/codemap_tests/bad-format-args.rs
diff --git a/src/test/ui/codemap_tests/bad-format-args.stderr b/tests/ui/codemap_tests/bad-format-args.stderr
index 8f79beaa9..8f79beaa9 100644
--- a/src/test/ui/codemap_tests/bad-format-args.stderr
+++ b/tests/ui/codemap_tests/bad-format-args.stderr
diff --git a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs b/tests/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
index 414acfd84..414acfd84 100644
--- a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
+++ b/tests/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
diff --git a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr b/tests/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
index 2c1c3c2dc..2c1c3c2dc 100644
--- a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
+++ b/tests/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
diff --git a/src/test/ui/codemap_tests/empty_span.rs b/tests/ui/codemap_tests/empty_span.rs
index 7753e2ece..7753e2ece 100644
--- a/src/test/ui/codemap_tests/empty_span.rs
+++ b/tests/ui/codemap_tests/empty_span.rs
diff --git a/src/test/ui/codemap_tests/empty_span.stderr b/tests/ui/codemap_tests/empty_span.stderr
index e36f59ee5..e36f59ee5 100644
--- a/src/test/ui/codemap_tests/empty_span.stderr
+++ b/tests/ui/codemap_tests/empty_span.stderr
diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.rs b/tests/ui/codemap_tests/huge_multispan_highlight.rs
index 623c59081..623c59081 100644
--- a/src/test/ui/codemap_tests/huge_multispan_highlight.rs
+++ b/tests/ui/codemap_tests/huge_multispan_highlight.rs
diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr b/tests/ui/codemap_tests/huge_multispan_highlight.stderr
index a60f1c77a..9f8ce3b61 100644
--- a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
+++ b/tests/ui/codemap_tests/huge_multispan_highlight.stderr
@@ -1,11 +1,13 @@
 error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
   --> $DIR/huge_multispan_highlight.rs:90:13
    |
-LL |     let x = "foo";
-   |         - help: consider changing this to be mutable: `mut x`
-...
 LL |     let y = &mut x;
    |             ^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut x = "foo";
+   |         +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/codemap_tests/issue-11715.rs b/tests/ui/codemap_tests/issue-11715.rs
index 617d57ff7..617d57ff7 100644
--- a/src/test/ui/codemap_tests/issue-11715.rs
+++ b/tests/ui/codemap_tests/issue-11715.rs
diff --git a/src/test/ui/codemap_tests/issue-11715.stderr b/tests/ui/codemap_tests/issue-11715.stderr
index a6b2b2e50..a6b2b2e50 100644
--- a/src/test/ui/codemap_tests/issue-11715.stderr
+++ b/tests/ui/codemap_tests/issue-11715.stderr
diff --git a/src/test/ui/codemap_tests/issue-28308.rs b/tests/ui/codemap_tests/issue-28308.rs
index 81493f8c4..81493f8c4 100644
--- a/src/test/ui/codemap_tests/issue-28308.rs
+++ b/tests/ui/codemap_tests/issue-28308.rs
diff --git a/src/test/ui/codemap_tests/issue-28308.stderr b/tests/ui/codemap_tests/issue-28308.stderr
index 7daa0510c..7daa0510c 100644
--- a/src/test/ui/codemap_tests/issue-28308.stderr
+++ b/tests/ui/codemap_tests/issue-28308.stderr
diff --git a/src/test/ui/codemap_tests/one_line.rs b/tests/ui/codemap_tests/one_line.rs
index bb36813db..bb36813db 100644
--- a/src/test/ui/codemap_tests/one_line.rs
+++ b/tests/ui/codemap_tests/one_line.rs
diff --git a/src/test/ui/codemap_tests/one_line.stderr b/tests/ui/codemap_tests/one_line.stderr
index 6fe6e2613..6fe6e2613 100644
--- a/src/test/ui/codemap_tests/one_line.stderr
+++ b/tests/ui/codemap_tests/one_line.stderr
diff --git a/src/test/ui/codemap_tests/overlapping_inherent_impls.rs b/tests/ui/codemap_tests/overlapping_inherent_impls.rs
index 66af21226..66af21226 100644
--- a/src/test/ui/codemap_tests/overlapping_inherent_impls.rs
+++ b/tests/ui/codemap_tests/overlapping_inherent_impls.rs
diff --git a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr b/tests/ui/codemap_tests/overlapping_inherent_impls.stderr
index 6fca12e18..6fca12e18 100644
--- a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
+++ b/tests/ui/codemap_tests/overlapping_inherent_impls.stderr
diff --git a/src/test/ui/codemap_tests/tab.rs b/tests/ui/codemap_tests/tab.rs
index 64569f2e7..64569f2e7 100644
--- a/src/test/ui/codemap_tests/tab.rs
+++ b/tests/ui/codemap_tests/tab.rs
diff --git a/src/test/ui/codemap_tests/tab.stderr b/tests/ui/codemap_tests/tab.stderr
index c3f19d20d..c3f19d20d 100644
--- a/src/test/ui/codemap_tests/tab.stderr
+++ b/tests/ui/codemap_tests/tab.stderr
diff --git a/src/test/ui/codemap_tests/tab_2.rs b/tests/ui/codemap_tests/tab_2.rs
index 644697c32..644697c32 100644
--- a/src/test/ui/codemap_tests/tab_2.rs
+++ b/tests/ui/codemap_tests/tab_2.rs
diff --git a/src/test/ui/codemap_tests/tab_2.stderr b/tests/ui/codemap_tests/tab_2.stderr
index 0bfdc3ac2..0bfdc3ac2 100644
--- a/src/test/ui/codemap_tests/tab_2.stderr
+++ b/tests/ui/codemap_tests/tab_2.stderr
diff --git a/src/test/ui/codemap_tests/tab_3.rs b/tests/ui/codemap_tests/tab_3.rs
index 58b034d0f..58b034d0f 100644
--- a/src/test/ui/codemap_tests/tab_3.rs
+++ b/tests/ui/codemap_tests/tab_3.rs
diff --git a/src/test/ui/codemap_tests/tab_3.stderr b/tests/ui/codemap_tests/tab_3.stderr
index 080f6c394..17bea2f36 100644
--- a/src/test/ui/codemap_tests/tab_3.stderr
+++ b/tests/ui/codemap_tests/tab_3.stderr
@@ -9,16 +9,13 @@ LL |     {
 LL |         println!("{:?}", some_vec);
    |                          ^^^^^^^^ value borrowed here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `some_vec`
+note: `into_iter` takes ownership of the receiver `self`, which moves `some_vec`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
    = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
-help: consider cloning the value if the performance cost is acceptable
+help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     some_vec.clone().into_iter();
-   |             ++++++++
+   |              ++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/codemap_tests/two_files.rs b/tests/ui/codemap_tests/two_files.rs
index 71d97d3c2..71d97d3c2 100644
--- a/src/test/ui/codemap_tests/two_files.rs
+++ b/tests/ui/codemap_tests/two_files.rs
diff --git a/src/test/ui/codemap_tests/two_files.stderr b/tests/ui/codemap_tests/two_files.stderr
index 2eb3fd567..2eb3fd567 100644
--- a/src/test/ui/codemap_tests/two_files.stderr
+++ b/tests/ui/codemap_tests/two_files.stderr
diff --git a/src/test/ui/codemap_tests/two_files_data.rs b/tests/ui/codemap_tests/two_files_data.rs
index b4d2f5d3c..b4d2f5d3c 100644
--- a/src/test/ui/codemap_tests/two_files_data.rs
+++ b/tests/ui/codemap_tests/two_files_data.rs
diff --git a/src/test/ui/codemap_tests/unicode.expanded.stdout b/tests/ui/codemap_tests/unicode.expanded.stdout
index d14bb42b2..d14bb42b2 100644
--- a/src/test/ui/codemap_tests/unicode.expanded.stdout
+++ b/tests/ui/codemap_tests/unicode.expanded.stdout
diff --git a/src/test/ui/codemap_tests/unicode.normal.stderr b/tests/ui/codemap_tests/unicode.normal.stderr
index 05ceb6910..05ceb6910 100644
--- a/src/test/ui/codemap_tests/unicode.normal.stderr
+++ b/tests/ui/codemap_tests/unicode.normal.stderr
diff --git a/src/test/ui/codemap_tests/unicode.rs b/tests/ui/codemap_tests/unicode.rs
index 4df9a5270..4df9a5270 100644
--- a/src/test/ui/codemap_tests/unicode.rs
+++ b/tests/ui/codemap_tests/unicode.rs
diff --git a/src/test/ui/codemap_tests/unicode_2.rs b/tests/ui/codemap_tests/unicode_2.rs
index 3301e7a18..3301e7a18 100644
--- a/src/test/ui/codemap_tests/unicode_2.rs
+++ b/tests/ui/codemap_tests/unicode_2.rs
diff --git a/src/test/ui/codemap_tests/unicode_2.stderr b/tests/ui/codemap_tests/unicode_2.stderr
index 19aae1d3c..19aae1d3c 100644
--- a/src/test/ui/codemap_tests/unicode_2.stderr
+++ b/tests/ui/codemap_tests/unicode_2.stderr
diff --git a/src/test/ui/codemap_tests/unicode_3.rs b/tests/ui/codemap_tests/unicode_3.rs
index 34582de45..34582de45 100644
--- a/src/test/ui/codemap_tests/unicode_3.rs
+++ b/tests/ui/codemap_tests/unicode_3.rs
diff --git a/src/test/ui/codemap_tests/unicode_3.stderr b/tests/ui/codemap_tests/unicode_3.stderr
index a35ed99d8..a35ed99d8 100644
--- a/src/test/ui/codemap_tests/unicode_3.stderr
+++ b/tests/ui/codemap_tests/unicode_3.stderr
diff --git a/src/test/ui/coercion/auxiliary/issue-39823.rs b/tests/ui/coercion/auxiliary/issue-39823.rs
index 3af9c68f2..3af9c68f2 100644
--- a/src/test/ui/coercion/auxiliary/issue-39823.rs
+++ b/tests/ui/coercion/auxiliary/issue-39823.rs
diff --git a/src/test/ui/coercion/coerce-block-tail-26978.rs b/tests/ui/coercion/coerce-block-tail-26978.rs
index 01c8ab5a8..01c8ab5a8 100644
--- a/src/test/ui/coercion/coerce-block-tail-26978.rs
+++ b/tests/ui/coercion/coerce-block-tail-26978.rs
diff --git a/src/test/ui/coercion/coerce-block-tail-26978.stderr b/tests/ui/coercion/coerce-block-tail-26978.stderr
index 384debd48..384debd48 100644
--- a/src/test/ui/coercion/coerce-block-tail-26978.stderr
+++ b/tests/ui/coercion/coerce-block-tail-26978.stderr
diff --git a/src/test/ui/coercion/coerce-block-tail-57749.rs b/tests/ui/coercion/coerce-block-tail-57749.rs
index 79b5b3323..79b5b3323 100644
--- a/src/test/ui/coercion/coerce-block-tail-57749.rs
+++ b/tests/ui/coercion/coerce-block-tail-57749.rs
diff --git a/src/test/ui/coercion/coerce-block-tail-57749.stderr b/tests/ui/coercion/coerce-block-tail-57749.stderr
index d5660c81d..d5660c81d 100644
--- a/src/test/ui/coercion/coerce-block-tail-57749.stderr
+++ b/tests/ui/coercion/coerce-block-tail-57749.stderr
diff --git a/src/test/ui/coercion/coerce-block-tail-83783.rs b/tests/ui/coercion/coerce-block-tail-83783.rs
index 18c8ae3bb..18c8ae3bb 100644
--- a/src/test/ui/coercion/coerce-block-tail-83783.rs
+++ b/tests/ui/coercion/coerce-block-tail-83783.rs
diff --git a/src/test/ui/coercion/coerce-block-tail-83783.stderr b/tests/ui/coercion/coerce-block-tail-83783.stderr
index 5f53606ce..5f53606ce 100644
--- a/src/test/ui/coercion/coerce-block-tail-83783.stderr
+++ b/tests/ui/coercion/coerce-block-tail-83783.stderr
diff --git a/src/test/ui/coercion/coerce-block-tail-83850.rs b/tests/ui/coercion/coerce-block-tail-83850.rs
index 77fdf9998..77fdf9998 100644
--- a/src/test/ui/coercion/coerce-block-tail-83850.rs
+++ b/tests/ui/coercion/coerce-block-tail-83850.rs
diff --git a/src/test/ui/coercion/coerce-block-tail-83850.stderr b/tests/ui/coercion/coerce-block-tail-83850.stderr
index bbf607543..bbf607543 100644
--- a/src/test/ui/coercion/coerce-block-tail-83850.stderr
+++ b/tests/ui/coercion/coerce-block-tail-83850.stderr
diff --git a/src/test/ui/coercion/coerce-block-tail.rs b/tests/ui/coercion/coerce-block-tail.rs
index dcbcd3762..dcbcd3762 100644
--- a/src/test/ui/coercion/coerce-block-tail.rs
+++ b/tests/ui/coercion/coerce-block-tail.rs
diff --git a/src/test/ui/coercion/coerce-block-tail.stderr b/tests/ui/coercion/coerce-block-tail.stderr
index 318cf7586..318cf7586 100644
--- a/src/test/ui/coercion/coerce-block-tail.stderr
+++ b/tests/ui/coercion/coerce-block-tail.stderr
diff --git a/src/test/ui/coercion/coerce-expect-unsized-ascribed.rs b/tests/ui/coercion/coerce-expect-unsized-ascribed.rs
index d7b11317a..d7b11317a 100644
--- a/src/test/ui/coercion/coerce-expect-unsized-ascribed.rs
+++ b/tests/ui/coercion/coerce-expect-unsized-ascribed.rs
diff --git a/src/test/ui/coercion/coerce-expect-unsized-ascribed.stderr b/tests/ui/coercion/coerce-expect-unsized-ascribed.stderr
index 44968244c..44968244c 100644
--- a/src/test/ui/coercion/coerce-expect-unsized-ascribed.stderr
+++ b/tests/ui/coercion/coerce-expect-unsized-ascribed.stderr
diff --git a/src/test/ui/coercion/coerce-expect-unsized.rs b/tests/ui/coercion/coerce-expect-unsized.rs
index eeb8fe823..eeb8fe823 100644
--- a/src/test/ui/coercion/coerce-expect-unsized.rs
+++ b/tests/ui/coercion/coerce-expect-unsized.rs
diff --git a/src/test/ui/coercion/coerce-issue-49593-box-never-windows.nofallback.stderr b/tests/ui/coercion/coerce-issue-49593-box-never-windows.nofallback.stderr
index 980da5360..980da5360 100644
--- a/src/test/ui/coercion/coerce-issue-49593-box-never-windows.nofallback.stderr
+++ b/tests/ui/coercion/coerce-issue-49593-box-never-windows.nofallback.stderr
diff --git a/src/test/ui/coercion/coerce-issue-49593-box-never-windows.rs b/tests/ui/coercion/coerce-issue-49593-box-never-windows.rs
index 95d3935ca..95d3935ca 100644
--- a/src/test/ui/coercion/coerce-issue-49593-box-never-windows.rs
+++ b/tests/ui/coercion/coerce-issue-49593-box-never-windows.rs
diff --git a/src/test/ui/coercion/coerce-issue-49593-box-never.nofallback.stderr b/tests/ui/coercion/coerce-issue-49593-box-never.nofallback.stderr
index 322681b97..322681b97 100644
--- a/src/test/ui/coercion/coerce-issue-49593-box-never.nofallback.stderr
+++ b/tests/ui/coercion/coerce-issue-49593-box-never.nofallback.stderr
diff --git a/src/test/ui/coercion/coerce-issue-49593-box-never.rs b/tests/ui/coercion/coerce-issue-49593-box-never.rs
index 16efb65ac..16efb65ac 100644
--- a/src/test/ui/coercion/coerce-issue-49593-box-never.rs
+++ b/tests/ui/coercion/coerce-issue-49593-box-never.rs
diff --git a/src/test/ui/coercion/coerce-mut.rs b/tests/ui/coercion/coerce-mut.rs
index 43f0b5585..43f0b5585 100644
--- a/src/test/ui/coercion/coerce-mut.rs
+++ b/tests/ui/coercion/coerce-mut.rs
diff --git a/src/test/ui/coercion/coerce-mut.stderr b/tests/ui/coercion/coerce-mut.stderr
index 11a4f3101..11a4f3101 100644
--- a/src/test/ui/coercion/coerce-mut.stderr
+++ b/tests/ui/coercion/coerce-mut.stderr
diff --git a/src/test/ui/coercion/coerce-overloaded-autoderef-fail.rs b/tests/ui/coercion/coerce-overloaded-autoderef-fail.rs
index 01d9c1e48..01d9c1e48 100644
--- a/src/test/ui/coercion/coerce-overloaded-autoderef-fail.rs
+++ b/tests/ui/coercion/coerce-overloaded-autoderef-fail.rs
diff --git a/src/test/ui/coercion/coerce-overloaded-autoderef-fail.stderr b/tests/ui/coercion/coerce-overloaded-autoderef-fail.stderr
index d067c3b3a..d067c3b3a 100644
--- a/src/test/ui/coercion/coerce-overloaded-autoderef-fail.stderr
+++ b/tests/ui/coercion/coerce-overloaded-autoderef-fail.stderr
diff --git a/src/test/ui/coercion/coerce-overloaded-autoderef.rs b/tests/ui/coercion/coerce-overloaded-autoderef.rs
index d5484607c..d5484607c 100644
--- a/src/test/ui/coercion/coerce-overloaded-autoderef.rs
+++ b/tests/ui/coercion/coerce-overloaded-autoderef.rs
diff --git a/src/test/ui/coercion/coerce-reborrow-imm-ptr-arg.rs b/tests/ui/coercion/coerce-reborrow-imm-ptr-arg.rs
index f033e1b5d..f033e1b5d 100644
--- a/src/test/ui/coercion/coerce-reborrow-imm-ptr-arg.rs
+++ b/tests/ui/coercion/coerce-reborrow-imm-ptr-arg.rs
diff --git a/src/test/ui/coercion/coerce-reborrow-imm-ptr-rcvr.rs b/tests/ui/coercion/coerce-reborrow-imm-ptr-rcvr.rs
index 64a365229..64a365229 100644
--- a/src/test/ui/coercion/coerce-reborrow-imm-ptr-rcvr.rs
+++ b/tests/ui/coercion/coerce-reborrow-imm-ptr-rcvr.rs
diff --git a/src/test/ui/coercion/coerce-reborrow-imm-vec-arg.rs b/tests/ui/coercion/coerce-reborrow-imm-vec-arg.rs
index c2aaae1c7..c2aaae1c7 100644
--- a/src/test/ui/coercion/coerce-reborrow-imm-vec-arg.rs
+++ b/tests/ui/coercion/coerce-reborrow-imm-vec-arg.rs
diff --git a/src/test/ui/coercion/coerce-reborrow-imm-vec-rcvr.rs b/tests/ui/coercion/coerce-reborrow-imm-vec-rcvr.rs
index 9a5652acf..9a5652acf 100644
--- a/src/test/ui/coercion/coerce-reborrow-imm-vec-rcvr.rs
+++ b/tests/ui/coercion/coerce-reborrow-imm-vec-rcvr.rs
diff --git a/src/test/ui/coercion/coerce-reborrow-multi-arg-fail.rs b/tests/ui/coercion/coerce-reborrow-multi-arg-fail.rs
index 48be2d314..48be2d314 100644
--- a/src/test/ui/coercion/coerce-reborrow-multi-arg-fail.rs
+++ b/tests/ui/coercion/coerce-reborrow-multi-arg-fail.rs
diff --git a/src/test/ui/coercion/coerce-reborrow-multi-arg-fail.stderr b/tests/ui/coercion/coerce-reborrow-multi-arg-fail.stderr
index 5cbdef218..5cbdef218 100644
--- a/src/test/ui/coercion/coerce-reborrow-multi-arg-fail.stderr
+++ b/tests/ui/coercion/coerce-reborrow-multi-arg-fail.stderr
diff --git a/src/test/ui/coercion/coerce-reborrow-multi-arg.rs b/tests/ui/coercion/coerce-reborrow-multi-arg.rs
index 93cd0bb3e..93cd0bb3e 100644
--- a/src/test/ui/coercion/coerce-reborrow-multi-arg.rs
+++ b/tests/ui/coercion/coerce-reborrow-multi-arg.rs
diff --git a/src/test/ui/coercion/coerce-reborrow-mut-ptr-arg.rs b/tests/ui/coercion/coerce-reborrow-mut-ptr-arg.rs
index 76cd6793b..76cd6793b 100644
--- a/src/test/ui/coercion/coerce-reborrow-mut-ptr-arg.rs
+++ b/tests/ui/coercion/coerce-reborrow-mut-ptr-arg.rs
diff --git a/src/test/ui/coercion/coerce-reborrow-mut-ptr-rcvr.rs b/tests/ui/coercion/coerce-reborrow-mut-ptr-rcvr.rs
index e6e7c3a51..e6e7c3a51 100644
--- a/src/test/ui/coercion/coerce-reborrow-mut-ptr-rcvr.rs
+++ b/tests/ui/coercion/coerce-reborrow-mut-ptr-rcvr.rs
diff --git a/src/test/ui/coercion/coerce-reborrow-mut-vec-arg.rs b/tests/ui/coercion/coerce-reborrow-mut-vec-arg.rs
index 2635754f1..2635754f1 100644
--- a/src/test/ui/coercion/coerce-reborrow-mut-vec-arg.rs
+++ b/tests/ui/coercion/coerce-reborrow-mut-vec-arg.rs
diff --git a/src/test/ui/coercion/coerce-reborrow-mut-vec-rcvr.rs b/tests/ui/coercion/coerce-reborrow-mut-vec-rcvr.rs
index c03336ea3..c03336ea3 100644
--- a/src/test/ui/coercion/coerce-reborrow-mut-vec-rcvr.rs
+++ b/tests/ui/coercion/coerce-reborrow-mut-vec-rcvr.rs
diff --git a/src/test/ui/coercion/coerce-to-bang-cast.rs b/tests/ui/coercion/coerce-to-bang-cast.rs
index 85598a42e..85598a42e 100644
--- a/src/test/ui/coercion/coerce-to-bang-cast.rs
+++ b/tests/ui/coercion/coerce-to-bang-cast.rs
diff --git a/src/test/ui/coercion/coerce-to-bang-cast.stderr b/tests/ui/coercion/coerce-to-bang-cast.stderr
index 50e009aa2..50e009aa2 100644
--- a/src/test/ui/coercion/coerce-to-bang-cast.stderr
+++ b/tests/ui/coercion/coerce-to-bang-cast.stderr
diff --git a/src/test/ui/coercion/coerce-to-bang.rs b/tests/ui/coercion/coerce-to-bang.rs
index 1e06934d0..1e06934d0 100644
--- a/src/test/ui/coercion/coerce-to-bang.rs
+++ b/tests/ui/coercion/coerce-to-bang.rs
diff --git a/src/test/ui/coercion/coerce-to-bang.stderr b/tests/ui/coercion/coerce-to-bang.stderr
index 1207dc7e7..1207dc7e7 100644
--- a/src/test/ui/coercion/coerce-to-bang.stderr
+++ b/tests/ui/coercion/coerce-to-bang.stderr
diff --git a/src/test/ui/coercion/coerce-unify-return.rs b/tests/ui/coercion/coerce-unify-return.rs
index 95a7ee8fe..95a7ee8fe 100644
--- a/src/test/ui/coercion/coerce-unify-return.rs
+++ b/tests/ui/coercion/coerce-unify-return.rs
diff --git a/src/test/ui/coercion/coerce-unify.rs b/tests/ui/coercion/coerce-unify.rs
index f1818f9bb..f1818f9bb 100644
--- a/src/test/ui/coercion/coerce-unify.rs
+++ b/tests/ui/coercion/coerce-unify.rs
diff --git a/src/test/ui/coercion/coerce-unsize-subtype.rs b/tests/ui/coercion/coerce-unsize-subtype.rs
index 45b53300c..45b53300c 100644
--- a/src/test/ui/coercion/coerce-unsize-subtype.rs
+++ b/tests/ui/coercion/coerce-unsize-subtype.rs
diff --git a/src/test/ui/coercion/coercion-missing-tail-expected-type.fixed b/tests/ui/coercion/coercion-missing-tail-expected-type.fixed
index 713e04774..713e04774 100644
--- a/src/test/ui/coercion/coercion-missing-tail-expected-type.fixed
+++ b/tests/ui/coercion/coercion-missing-tail-expected-type.fixed
diff --git a/src/test/ui/coercion/coercion-missing-tail-expected-type.rs b/tests/ui/coercion/coercion-missing-tail-expected-type.rs
index e14d79d8a..e14d79d8a 100644
--- a/src/test/ui/coercion/coercion-missing-tail-expected-type.rs
+++ b/tests/ui/coercion/coercion-missing-tail-expected-type.rs
diff --git a/src/test/ui/coercion/coercion-missing-tail-expected-type.stderr b/tests/ui/coercion/coercion-missing-tail-expected-type.stderr
index 4c04bb113..4c04bb113 100644
--- a/src/test/ui/coercion/coercion-missing-tail-expected-type.stderr
+++ b/tests/ui/coercion/coercion-missing-tail-expected-type.stderr
diff --git a/src/test/ui/coercion/coercion-slice.rs b/tests/ui/coercion/coercion-slice.rs
index b756c8f82..b756c8f82 100644
--- a/src/test/ui/coercion/coercion-slice.rs
+++ b/tests/ui/coercion/coercion-slice.rs
diff --git a/src/test/ui/coercion/coercion-slice.stderr b/tests/ui/coercion/coercion-slice.stderr
index 42dc954ff..42dc954ff 100644
--- a/src/test/ui/coercion/coercion-slice.stderr
+++ b/tests/ui/coercion/coercion-slice.stderr
diff --git a/src/test/ui/coercion/issue-101066.rs b/tests/ui/coercion/issue-101066.rs
index b658ed1e9..b658ed1e9 100644
--- a/src/test/ui/coercion/issue-101066.rs
+++ b/tests/ui/coercion/issue-101066.rs
diff --git a/src/test/ui/coercion/issue-14589.rs b/tests/ui/coercion/issue-14589.rs
index d35ee5c73..d35ee5c73 100644
--- a/src/test/ui/coercion/issue-14589.rs
+++ b/tests/ui/coercion/issue-14589.rs
diff --git a/src/test/ui/coercion/issue-36007.rs b/tests/ui/coercion/issue-36007.rs
index 78812df87..78812df87 100644
--- a/src/test/ui/coercion/issue-36007.rs
+++ b/tests/ui/coercion/issue-36007.rs
diff --git a/src/test/ui/coercion/issue-37655.rs b/tests/ui/coercion/issue-37655.rs
index 416854d66..416854d66 100644
--- a/src/test/ui/coercion/issue-37655.rs
+++ b/tests/ui/coercion/issue-37655.rs
diff --git a/src/test/ui/coercion/issue-39823.rs b/tests/ui/coercion/issue-39823.rs
index 148cf527e..148cf527e 100644
--- a/src/test/ui/coercion/issue-39823.rs
+++ b/tests/ui/coercion/issue-39823.rs
diff --git a/src/test/ui/coercion/issue-53475.rs b/tests/ui/coercion/issue-53475.rs
index 3770c024f..3770c024f 100644
--- a/src/test/ui/coercion/issue-53475.rs
+++ b/tests/ui/coercion/issue-53475.rs
diff --git a/src/test/ui/coercion/issue-53475.stderr b/tests/ui/coercion/issue-53475.stderr
index 522c50dca..522c50dca 100644
--- a/src/test/ui/coercion/issue-53475.stderr
+++ b/tests/ui/coercion/issue-53475.stderr
diff --git a/src/test/ui/coercion/issue-73886.rs b/tests/ui/coercion/issue-73886.rs
index 9c0c87a5c..9c0c87a5c 100644
--- a/src/test/ui/coercion/issue-73886.rs
+++ b/tests/ui/coercion/issue-73886.rs
diff --git a/src/test/ui/coercion/issue-73886.stderr b/tests/ui/coercion/issue-73886.stderr
index a6f8ba65a..a6f8ba65a 100644
--- a/src/test/ui/coercion/issue-73886.stderr
+++ b/tests/ui/coercion/issue-73886.stderr
diff --git a/src/test/ui/coercion/issue-88097.rs b/tests/ui/coercion/issue-88097.rs
index e543e1bae..e543e1bae 100644
--- a/src/test/ui/coercion/issue-88097.rs
+++ b/tests/ui/coercion/issue-88097.rs
diff --git a/src/test/ui/coercion/retslot-cast.rs b/tests/ui/coercion/retslot-cast.rs
index ae500cb15..ae500cb15 100644
--- a/src/test/ui/coercion/retslot-cast.rs
+++ b/tests/ui/coercion/retslot-cast.rs
diff --git a/src/test/ui/coercion/retslot-cast.stderr b/tests/ui/coercion/retslot-cast.stderr
index 798ce1199..798ce1199 100644
--- a/src/test/ui/coercion/retslot-cast.stderr
+++ b/tests/ui/coercion/retslot-cast.stderr
diff --git a/src/test/ui/coercion/unsafe-coercion.rs b/tests/ui/coercion/unsafe-coercion.rs
index 2478deeab..2478deeab 100644
--- a/src/test/ui/coercion/unsafe-coercion.rs
+++ b/tests/ui/coercion/unsafe-coercion.rs
diff --git a/src/test/ui/coherence/auxiliary/coherence_copy_like_lib.rs b/tests/ui/coherence/auxiliary/coherence_copy_like_lib.rs
index b5b4802c1..b5b4802c1 100644
--- a/src/test/ui/coherence/auxiliary/coherence_copy_like_lib.rs
+++ b/tests/ui/coherence/auxiliary/coherence_copy_like_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/coherence_fundamental_trait_lib.rs b/tests/ui/coherence/auxiliary/coherence_fundamental_trait_lib.rs
index 21aaea479..21aaea479 100644
--- a/src/test/ui/coherence/auxiliary/coherence_fundamental_trait_lib.rs
+++ b/tests/ui/coherence/auxiliary/coherence_fundamental_trait_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs b/tests/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs
index 08d22fbed..08d22fbed 100644
--- a/src/test/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs
+++ b/tests/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/coherence_lib.rs b/tests/ui/coherence/auxiliary/coherence_lib.rs
index c22819831..c22819831 100644
--- a/src/test/ui/coherence/auxiliary/coherence_lib.rs
+++ b/tests/ui/coherence/auxiliary/coherence_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/coherence_orphan_lib.rs b/tests/ui/coherence/auxiliary/coherence_orphan_lib.rs
index 2664ef550..2664ef550 100644
--- a/src/test/ui/coherence/auxiliary/coherence_orphan_lib.rs
+++ b/tests/ui/coherence/auxiliary/coherence_orphan_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/error_lib.rs b/tests/ui/coherence/auxiliary/error_lib.rs
index 19ff9ae62..19ff9ae62 100644
--- a/src/test/ui/coherence/auxiliary/error_lib.rs
+++ b/tests/ui/coherence/auxiliary/error_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/go_trait.rs b/tests/ui/coherence/auxiliary/go_trait.rs
index aa0ec2289..aa0ec2289 100644
--- a/src/test/ui/coherence/auxiliary/go_trait.rs
+++ b/tests/ui/coherence/auxiliary/go_trait.rs
diff --git a/src/test/ui/coherence/auxiliary/option_future.rs b/tests/ui/coherence/auxiliary/option_future.rs
index 067de1cd8..067de1cd8 100644
--- a/src/test/ui/coherence/auxiliary/option_future.rs
+++ b/tests/ui/coherence/auxiliary/option_future.rs
diff --git a/src/test/ui/coherence/auxiliary/re_rebalance_coherence_lib-rpass.rs b/tests/ui/coherence/auxiliary/re_rebalance_coherence_lib-rpass.rs
index 9a191bad8..9a191bad8 100644
--- a/src/test/ui/coherence/auxiliary/re_rebalance_coherence_lib-rpass.rs
+++ b/tests/ui/coherence/auxiliary/re_rebalance_coherence_lib-rpass.rs
diff --git a/src/test/ui/coherence/auxiliary/re_rebalance_coherence_lib.rs b/tests/ui/coherence/auxiliary/re_rebalance_coherence_lib.rs
index 41b9d64d5..41b9d64d5 100644
--- a/src/test/ui/coherence/auxiliary/re_rebalance_coherence_lib.rs
+++ b/tests/ui/coherence/auxiliary/re_rebalance_coherence_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/trait-with-const-param.rs b/tests/ui/coherence/auxiliary/trait-with-const-param.rs
index a44eb14f8..a44eb14f8 100644
--- a/src/test/ui/coherence/auxiliary/trait-with-const-param.rs
+++ b/tests/ui/coherence/auxiliary/trait-with-const-param.rs
diff --git a/src/test/ui/coherence/auxiliary/trait_impl_conflict.rs b/tests/ui/coherence/auxiliary/trait_impl_conflict.rs
index 5e5f017ed..5e5f017ed 100644
--- a/src/test/ui/coherence/auxiliary/trait_impl_conflict.rs
+++ b/tests/ui/coherence/auxiliary/trait_impl_conflict.rs
diff --git a/src/test/ui/coherence/coherence-all-remote.rs b/tests/ui/coherence/coherence-all-remote.rs
index 5c3bfee82..5c3bfee82 100644
--- a/src/test/ui/coherence/coherence-all-remote.rs
+++ b/tests/ui/coherence/coherence-all-remote.rs
diff --git a/src/test/ui/coherence/coherence-all-remote.stderr b/tests/ui/coherence/coherence-all-remote.stderr
index 7eca41753..7eca41753 100644
--- a/src/test/ui/coherence/coherence-all-remote.stderr
+++ b/tests/ui/coherence/coherence-all-remote.stderr
diff --git a/src/test/ui/coherence/coherence-bigint-int.rs b/tests/ui/coherence/coherence-bigint-int.rs
index 02945e9da..02945e9da 100644
--- a/src/test/ui/coherence/coherence-bigint-int.rs
+++ b/tests/ui/coherence/coherence-bigint-int.rs
diff --git a/src/test/ui/coherence/coherence-bigint-param.rs b/tests/ui/coherence/coherence-bigint-param.rs
index c6543aaf6..c6543aaf6 100644
--- a/src/test/ui/coherence/coherence-bigint-param.rs
+++ b/tests/ui/coherence/coherence-bigint-param.rs
diff --git a/src/test/ui/coherence/coherence-bigint-param.stderr b/tests/ui/coherence/coherence-bigint-param.stderr
index e8d74c917..e8d74c917 100644
--- a/src/test/ui/coherence/coherence-bigint-param.stderr
+++ b/tests/ui/coherence/coherence-bigint-param.stderr
diff --git a/src/test/ui/coherence/coherence-bigint-vecint.rs b/tests/ui/coherence/coherence-bigint-vecint.rs
index a5dba90be..a5dba90be 100644
--- a/src/test/ui/coherence/coherence-bigint-vecint.rs
+++ b/tests/ui/coherence/coherence-bigint-vecint.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs
index 93a4bc5fe..93a4bc5fe 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr
index 9156972a1..9156972a1 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs
index 950a08ff2..950a08ff2 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr
index 8400968e1..8400968e1 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs
index bccbac2ff..bccbac2ff 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr
index 4d7872598..4d7872598 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs
index 6a9db2173..6a9db2173 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr
index c2a925213..c2a925213 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs
index 02f9217da..02f9217da 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr
index e1a5dffeb..e1a5dffeb 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.rs b/tests/ui/coherence/coherence-blanket-conflicts-with-specific.rs
index 5a562ff6a..5a562ff6a 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.rs
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.stderr b/tests/ui/coherence/coherence-blanket-conflicts-with-specific.stderr
index ba60a2ea9..ba60a2ea9 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.stderr
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific.stderr
diff --git a/src/test/ui/coherence/coherence-blanket.rs b/tests/ui/coherence/coherence-blanket.rs
index 55fa89d75..55fa89d75 100644
--- a/src/test/ui/coherence/coherence-blanket.rs
+++ b/tests/ui/coherence/coherence-blanket.rs
diff --git a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs b/tests/ui/coherence/coherence-conflicting-negative-trait-impl.rs
index 24b878927..24b878927 100644
--- a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs
+++ b/tests/ui/coherence/coherence-conflicting-negative-trait-impl.rs
diff --git a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr b/tests/ui/coherence/coherence-conflicting-negative-trait-impl.stderr
index 2463f38a9..2463f38a9 100644
--- a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr
+++ b/tests/ui/coherence/coherence-conflicting-negative-trait-impl.stderr
diff --git a/src/test/ui/coherence/coherence-covered-type-parameter.rs b/tests/ui/coherence/coherence-covered-type-parameter.rs
index bb95c59d1..bb95c59d1 100644
--- a/src/test/ui/coherence/coherence-covered-type-parameter.rs
+++ b/tests/ui/coherence/coherence-covered-type-parameter.rs
diff --git a/src/test/ui/coherence/coherence-cow.re_a.stderr b/tests/ui/coherence/coherence-cow.re_a.stderr
index fe4b5b410..fe4b5b410 100644
--- a/src/test/ui/coherence/coherence-cow.re_a.stderr
+++ b/tests/ui/coherence/coherence-cow.re_a.stderr
diff --git a/src/test/ui/coherence/coherence-cow.re_b.stderr b/tests/ui/coherence/coherence-cow.re_b.stderr
index da4ede325..da4ede325 100644
--- a/src/test/ui/coherence/coherence-cow.re_b.stderr
+++ b/tests/ui/coherence/coherence-cow.re_b.stderr
diff --git a/src/test/ui/coherence/coherence-cow.re_c.stderr b/tests/ui/coherence/coherence-cow.re_c.stderr
index d1a20c0ca..d1a20c0ca 100644
--- a/src/test/ui/coherence/coherence-cow.re_c.stderr
+++ b/tests/ui/coherence/coherence-cow.re_c.stderr
diff --git a/src/test/ui/coherence/coherence-cow.rs b/tests/ui/coherence/coherence-cow.rs
index 86a8d0963..86a8d0963 100644
--- a/src/test/ui/coherence/coherence-cow.rs
+++ b/tests/ui/coherence/coherence-cow.rs
diff --git a/src/test/ui/coherence/coherence-cross-crate-conflict.rs b/tests/ui/coherence/coherence-cross-crate-conflict.rs
index 588630957..588630957 100644
--- a/src/test/ui/coherence/coherence-cross-crate-conflict.rs
+++ b/tests/ui/coherence/coherence-cross-crate-conflict.rs
diff --git a/src/test/ui/coherence/coherence-cross-crate-conflict.stderr b/tests/ui/coherence/coherence-cross-crate-conflict.stderr
index 3d253d56a..3d253d56a 100644
--- a/src/test/ui/coherence/coherence-cross-crate-conflict.stderr
+++ b/tests/ui/coherence/coherence-cross-crate-conflict.stderr
diff --git a/src/test/ui/coherence/coherence-default-trait-impl.rs b/tests/ui/coherence/coherence-default-trait-impl.rs
index d57fb4777..d57fb4777 100644
--- a/src/test/ui/coherence/coherence-default-trait-impl.rs
+++ b/tests/ui/coherence/coherence-default-trait-impl.rs
diff --git a/src/test/ui/coherence/coherence-default-trait-impl.stderr b/tests/ui/coherence/coherence-default-trait-impl.stderr
index 632018782..7be5b92a7 100644
--- a/src/test/ui/coherence/coherence-default-trait-impl.stderr
+++ b/tests/ui/coherence/coherence-default-trait-impl.stderr
@@ -2,7 +2,7 @@ error[E0199]: implementing the trait `MySafeTrait` is not unsafe
   --> $DIR/coherence-default-trait-impl.rs:8:1
    |
 LL | unsafe impl MySafeTrait for Foo {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: remove `unsafe` from this trait implementation
    |
@@ -14,7 +14,7 @@ error[E0200]: the trait `MyUnsafeTrait` requires an `unsafe impl` declaration
   --> $DIR/coherence-default-trait-impl.rs:13:1
    |
 LL | impl MyUnsafeTrait for Foo {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the trait `MyUnsafeTrait` enforces invariants that the compiler can't check. Review the trait documentation and make sure this implementation upholds those invariants before adding the `unsafe` keyword
 help: add `unsafe` to this trait implementation
diff --git a/src/test/ui/coherence/coherence-error-suppression.rs b/tests/ui/coherence/coherence-error-suppression.rs
index 909214c1b..909214c1b 100644
--- a/src/test/ui/coherence/coherence-error-suppression.rs
+++ b/tests/ui/coherence/coherence-error-suppression.rs
diff --git a/src/test/ui/coherence/coherence-error-suppression.stderr b/tests/ui/coherence/coherence-error-suppression.stderr
index aadc80cb1..aadc80cb1 100644
--- a/src/test/ui/coherence/coherence-error-suppression.stderr
+++ b/tests/ui/coherence/coherence-error-suppression.stderr
diff --git a/src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.rs b/tests/ui/coherence/coherence-fn-covariant-bound-vs-static.rs
index 99f805f7f..99f805f7f 100644
--- a/src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.rs
+++ b/tests/ui/coherence/coherence-fn-covariant-bound-vs-static.rs
diff --git a/src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr b/tests/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr
index 7dabd97b9..7dabd97b9 100644
--- a/src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr
+++ b/tests/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr
diff --git a/src/test/ui/coherence/coherence-fn-implied-bounds.rs b/tests/ui/coherence/coherence-fn-implied-bounds.rs
index 4539af9a3..4539af9a3 100644
--- a/src/test/ui/coherence/coherence-fn-implied-bounds.rs
+++ b/tests/ui/coherence/coherence-fn-implied-bounds.rs
diff --git a/src/test/ui/coherence/coherence-fn-implied-bounds.stderr b/tests/ui/coherence/coherence-fn-implied-bounds.stderr
index 201871204..201871204 100644
--- a/src/test/ui/coherence/coherence-fn-implied-bounds.stderr
+++ b/tests/ui/coherence/coherence-fn-implied-bounds.stderr
diff --git a/src/test/ui/coherence/coherence-fn-inputs.rs b/tests/ui/coherence/coherence-fn-inputs.rs
index 3afec5c54..3afec5c54 100644
--- a/src/test/ui/coherence/coherence-fn-inputs.rs
+++ b/tests/ui/coherence/coherence-fn-inputs.rs
diff --git a/src/test/ui/coherence/coherence-fn-inputs.stderr b/tests/ui/coherence/coherence-fn-inputs.stderr
index 82bd8a35f..82bd8a35f 100644
--- a/src/test/ui/coherence/coherence-fn-inputs.stderr
+++ b/tests/ui/coherence/coherence-fn-inputs.stderr
diff --git a/src/test/ui/coherence/coherence-free-vs-bound-region.rs b/tests/ui/coherence/coherence-free-vs-bound-region.rs
index 2f5c49d29..2f5c49d29 100644
--- a/src/test/ui/coherence/coherence-free-vs-bound-region.rs
+++ b/tests/ui/coherence/coherence-free-vs-bound-region.rs
diff --git a/src/test/ui/coherence/coherence-free-vs-bound-region.stderr b/tests/ui/coherence/coherence-free-vs-bound-region.stderr
index e2d84b833..e2d84b833 100644
--- a/src/test/ui/coherence/coherence-free-vs-bound-region.stderr
+++ b/tests/ui/coherence/coherence-free-vs-bound-region.stderr
diff --git a/src/test/ui/coherence/coherence-fundamental-trait-objects.rs b/tests/ui/coherence/coherence-fundamental-trait-objects.rs
index dd127bf7f..dd127bf7f 100644
--- a/src/test/ui/coherence/coherence-fundamental-trait-objects.rs
+++ b/tests/ui/coherence/coherence-fundamental-trait-objects.rs
diff --git a/src/test/ui/coherence/coherence-fundamental-trait-objects.stderr b/tests/ui/coherence/coherence-fundamental-trait-objects.stderr
index a35a95ef4..a35a95ef4 100644
--- a/src/test/ui/coherence/coherence-fundamental-trait-objects.stderr
+++ b/tests/ui/coherence/coherence-fundamental-trait-objects.stderr
diff --git a/src/test/ui/coherence/coherence-impl-in-fn.rs b/tests/ui/coherence/coherence-impl-in-fn.rs
index b97197317..b97197317 100644
--- a/src/test/ui/coherence/coherence-impl-in-fn.rs
+++ b/tests/ui/coherence/coherence-impl-in-fn.rs
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-negative.rs b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-negative.rs
index 50d9a480a..50d9a480a 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-negative.rs
+++ b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-negative.rs
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr
index c364c707f..c364c707f 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr
+++ b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-positive.rs b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-positive.rs
index faac6d983..faac6d983 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-positive.rs
+++ b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-positive.rs
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-positive.stderr b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-positive.stderr
index b80429794..b80429794 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-positive.stderr
+++ b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-positive.stderr
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs b/tests/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs
index 20ff87549..20ff87549 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs
+++ b/tests/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr b/tests/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr
index e9090c1b6..e9090c1b6 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr
+++ b/tests/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait.rs b/tests/ui/coherence/coherence-impl-trait-for-trait.rs
index 195a37f15..195a37f15 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-trait.rs
+++ b/tests/ui/coherence/coherence-impl-trait-for-trait.rs
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait.stderr b/tests/ui/coherence/coherence-impl-trait-for-trait.stderr
index cf0b38c5b..cf0b38c5b 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-trait.stderr
+++ b/tests/ui/coherence/coherence-impl-trait-for-trait.stderr
diff --git a/src/test/ui/coherence/coherence-impls-copy.rs b/tests/ui/coherence/coherence-impls-copy.rs
index 4204fecc3..4204fecc3 100644
--- a/src/test/ui/coherence/coherence-impls-copy.rs
+++ b/tests/ui/coherence/coherence-impls-copy.rs
diff --git a/src/test/ui/coherence/coherence-impls-copy.stderr b/tests/ui/coherence/coherence-impls-copy.stderr
index d40ffc48a..d40ffc48a 100644
--- a/src/test/ui/coherence/coherence-impls-copy.stderr
+++ b/tests/ui/coherence/coherence-impls-copy.stderr
diff --git a/src/test/ui/coherence/coherence-impls-send.rs b/tests/ui/coherence/coherence-impls-send.rs
index b7b57c602..b7b57c602 100644
--- a/src/test/ui/coherence/coherence-impls-send.rs
+++ b/tests/ui/coherence/coherence-impls-send.rs
diff --git a/src/test/ui/coherence/coherence-impls-send.stderr b/tests/ui/coherence/coherence-impls-send.stderr
index e1071846e..e1071846e 100644
--- a/src/test/ui/coherence/coherence-impls-send.stderr
+++ b/tests/ui/coherence/coherence-impls-send.stderr
diff --git a/src/test/ui/coherence/coherence-impls-sized.rs b/tests/ui/coherence/coherence-impls-sized.rs
index 231b96ad4..231b96ad4 100644
--- a/src/test/ui/coherence/coherence-impls-sized.rs
+++ b/tests/ui/coherence/coherence-impls-sized.rs
diff --git a/src/test/ui/coherence/coherence-impls-sized.stderr b/tests/ui/coherence/coherence-impls-sized.stderr
index 17a754452..17a754452 100644
--- a/src/test/ui/coherence/coherence-impls-sized.stderr
+++ b/tests/ui/coherence/coherence-impls-sized.stderr
diff --git a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs b/tests/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs
index d74d3a2a5..d74d3a2a5 100644
--- a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs
+++ b/tests/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs
diff --git a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr b/tests/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr
index 7bd50649d..7bd50649d 100644
--- a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr
+++ b/tests/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr
diff --git a/src/test/ui/coherence/coherence-inherited-subtyping.old.stderr b/tests/ui/coherence/coherence-inherited-subtyping.old.stderr
index 4701bc0b1..4701bc0b1 100644
--- a/src/test/ui/coherence/coherence-inherited-subtyping.old.stderr
+++ b/tests/ui/coherence/coherence-inherited-subtyping.old.stderr
diff --git a/src/test/ui/coherence/coherence-inherited-subtyping.re.stderr b/tests/ui/coherence/coherence-inherited-subtyping.re.stderr
index 4701bc0b1..4701bc0b1 100644
--- a/src/test/ui/coherence/coherence-inherited-subtyping.re.stderr
+++ b/tests/ui/coherence/coherence-inherited-subtyping.re.stderr
diff --git a/src/test/ui/coherence/coherence-inherited-subtyping.rs b/tests/ui/coherence/coherence-inherited-subtyping.rs
index 8587eb779..8587eb779 100644
--- a/src/test/ui/coherence/coherence-inherited-subtyping.rs
+++ b/tests/ui/coherence/coherence-inherited-subtyping.rs
diff --git a/src/test/ui/coherence/coherence-iterator-vec-any-elem.rs b/tests/ui/coherence/coherence-iterator-vec-any-elem.rs
index 43a0a5c42..43a0a5c42 100644
--- a/src/test/ui/coherence/coherence-iterator-vec-any-elem.rs
+++ b/tests/ui/coherence/coherence-iterator-vec-any-elem.rs
diff --git a/src/test/ui/coherence/coherence-iterator-vec.rs b/tests/ui/coherence/coherence-iterator-vec.rs
index 386fe40ac..386fe40ac 100644
--- a/src/test/ui/coherence/coherence-iterator-vec.rs
+++ b/tests/ui/coherence/coherence-iterator-vec.rs
diff --git a/src/test/ui/coherence/coherence-lone-type-parameter.rs b/tests/ui/coherence/coherence-lone-type-parameter.rs
index 5368fef76..5368fef76 100644
--- a/src/test/ui/coherence/coherence-lone-type-parameter.rs
+++ b/tests/ui/coherence/coherence-lone-type-parameter.rs
diff --git a/src/test/ui/coherence/coherence-lone-type-parameter.stderr b/tests/ui/coherence/coherence-lone-type-parameter.stderr
index ef5b08836..ef5b08836 100644
--- a/src/test/ui/coherence/coherence-lone-type-parameter.stderr
+++ b/tests/ui/coherence/coherence-lone-type-parameter.stderr
diff --git a/src/test/ui/coherence/coherence-multidispatch-tuple.rs b/tests/ui/coherence/coherence-multidispatch-tuple.rs
index fa1d4bbb4..fa1d4bbb4 100644
--- a/src/test/ui/coherence/coherence-multidispatch-tuple.rs
+++ b/tests/ui/coherence/coherence-multidispatch-tuple.rs
diff --git a/src/test/ui/coherence/coherence-negative-impls-copy-bad.rs b/tests/ui/coherence/coherence-negative-impls-copy-bad.rs
index 563f28e22..563f28e22 100644
--- a/src/test/ui/coherence/coherence-negative-impls-copy-bad.rs
+++ b/tests/ui/coherence/coherence-negative-impls-copy-bad.rs
diff --git a/src/test/ui/coherence/coherence-negative-impls-copy-bad.stderr b/tests/ui/coherence/coherence-negative-impls-copy-bad.stderr
index 2295d6315..2295d6315 100644
--- a/src/test/ui/coherence/coherence-negative-impls-copy-bad.stderr
+++ b/tests/ui/coherence/coherence-negative-impls-copy-bad.stderr
diff --git a/src/test/ui/coherence/coherence-negative-impls-copy.rs b/tests/ui/coherence/coherence-negative-impls-copy.rs
index 7b29aade4..7b29aade4 100644
--- a/src/test/ui/coherence/coherence-negative-impls-copy.rs
+++ b/tests/ui/coherence/coherence-negative-impls-copy.rs
diff --git a/src/test/ui/coherence/coherence-negative-impls-safe-rpass.rs b/tests/ui/coherence/coherence-negative-impls-safe-rpass.rs
index b87e162ac..b87e162ac 100644
--- a/src/test/ui/coherence/coherence-negative-impls-safe-rpass.rs
+++ b/tests/ui/coherence/coherence-negative-impls-safe-rpass.rs
diff --git a/src/test/ui/coherence/coherence-negative-impls-safe.rs b/tests/ui/coherence/coherence-negative-impls-safe.rs
index 4821aa6b5..4821aa6b5 100644
--- a/src/test/ui/coherence/coherence-negative-impls-safe.rs
+++ b/tests/ui/coherence/coherence-negative-impls-safe.rs
diff --git a/src/test/ui/coherence/coherence-negative-impls-safe.stderr b/tests/ui/coherence/coherence-negative-impls-safe.stderr
index 1bd37f395..1bd37f395 100644
--- a/src/test/ui/coherence/coherence-negative-impls-safe.stderr
+++ b/tests/ui/coherence/coherence-negative-impls-safe.stderr
diff --git a/src/test/ui/coherence/coherence-negative-inherent-where-bounds.rs b/tests/ui/coherence/coherence-negative-inherent-where-bounds.rs
index 39ccaa6ac..39ccaa6ac 100644
--- a/src/test/ui/coherence/coherence-negative-inherent-where-bounds.rs
+++ b/tests/ui/coherence/coherence-negative-inherent-where-bounds.rs
diff --git a/src/test/ui/coherence/coherence-negative-inherent.rs b/tests/ui/coherence/coherence-negative-inherent.rs
index a9e1acc80..a9e1acc80 100644
--- a/src/test/ui/coherence/coherence-negative-inherent.rs
+++ b/tests/ui/coherence/coherence-negative-inherent.rs
diff --git a/src/test/ui/coherence/coherence-negative-outlives-lifetimes.rs b/tests/ui/coherence/coherence-negative-outlives-lifetimes.rs
index 3acf0d8d3..3acf0d8d3 100644
--- a/src/test/ui/coherence/coherence-negative-outlives-lifetimes.rs
+++ b/tests/ui/coherence/coherence-negative-outlives-lifetimes.rs
diff --git a/src/test/ui/coherence/coherence-negative-outlives-lifetimes.stock.stderr b/tests/ui/coherence/coherence-negative-outlives-lifetimes.stock.stderr
index 097cc4e0f..097cc4e0f 100644
--- a/src/test/ui/coherence/coherence-negative-outlives-lifetimes.stock.stderr
+++ b/tests/ui/coherence/coherence-negative-outlives-lifetimes.stock.stderr
diff --git a/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.rs b/tests/ui/coherence/coherence-no-direct-lifetime-dispatch.rs
index d466dcac1..d466dcac1 100644
--- a/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.rs
+++ b/tests/ui/coherence/coherence-no-direct-lifetime-dispatch.rs
diff --git a/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr b/tests/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr
index 8a43ad7b7..8a43ad7b7 100644
--- a/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr
+++ b/tests/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr
diff --git a/src/test/ui/coherence/coherence-orphan.rs b/tests/ui/coherence/coherence-orphan.rs
index 3beac04c7..3beac04c7 100644
--- a/src/test/ui/coherence/coherence-orphan.rs
+++ b/tests/ui/coherence/coherence-orphan.rs
diff --git a/src/test/ui/coherence/coherence-orphan.stderr b/tests/ui/coherence/coherence-orphan.stderr
index 01f166a21..01f166a21 100644
--- a/src/test/ui/coherence/coherence-orphan.stderr
+++ b/tests/ui/coherence/coherence-orphan.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.rs b/tests/ui/coherence/coherence-overlap-all-t-and-tuple.rs
index 574a16a19..574a16a19 100644
--- a/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.rs
+++ b/tests/ui/coherence/coherence-overlap-all-t-and-tuple.rs
diff --git a/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.stderr b/tests/ui/coherence/coherence-overlap-all-t-and-tuple.stderr
index 6a0880334..6a0880334 100644
--- a/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.stderr
+++ b/tests/ui/coherence/coherence-overlap-all-t-and-tuple.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-double-negative.rs b/tests/ui/coherence/coherence-overlap-double-negative.rs
index 1ea0ddc74..1ea0ddc74 100644
--- a/src/test/ui/coherence/coherence-overlap-double-negative.rs
+++ b/tests/ui/coherence/coherence-overlap-double-negative.rs
diff --git a/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs b/tests/ui/coherence/coherence-overlap-downstream-inherent.rs
index 5dea33e33..5dea33e33 100644
--- a/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs
+++ b/tests/ui/coherence/coherence-overlap-downstream-inherent.rs
diff --git a/src/test/ui/coherence/coherence-overlap-downstream-inherent.stderr b/tests/ui/coherence/coherence-overlap-downstream-inherent.stderr
index bbce4b530..bbce4b530 100644
--- a/src/test/ui/coherence/coherence-overlap-downstream-inherent.stderr
+++ b/tests/ui/coherence/coherence-overlap-downstream-inherent.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-downstream.rs b/tests/ui/coherence/coherence-overlap-downstream.rs
index 738ec0e3d..738ec0e3d 100644
--- a/src/test/ui/coherence/coherence-overlap-downstream.rs
+++ b/tests/ui/coherence/coherence-overlap-downstream.rs
diff --git a/src/test/ui/coherence/coherence-overlap-downstream.stderr b/tests/ui/coherence/coherence-overlap-downstream.stderr
index 7f373e595..7f373e595 100644
--- a/src/test/ui/coherence/coherence-overlap-downstream.stderr
+++ b/tests/ui/coherence/coherence-overlap-downstream.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.rs b/tests/ui/coherence/coherence-overlap-issue-23516-inherent.rs
index a272e620f..a272e620f 100644
--- a/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.rs
+++ b/tests/ui/coherence/coherence-overlap-issue-23516-inherent.rs
diff --git a/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.stderr b/tests/ui/coherence/coherence-overlap-issue-23516-inherent.stderr
index 3ad818cbc..3ad818cbc 100644
--- a/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.stderr
+++ b/tests/ui/coherence/coherence-overlap-issue-23516-inherent.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-issue-23516.rs b/tests/ui/coherence/coherence-overlap-issue-23516.rs
index 63e42e8f4..63e42e8f4 100644
--- a/src/test/ui/coherence/coherence-overlap-issue-23516.rs
+++ b/tests/ui/coherence/coherence-overlap-issue-23516.rs
diff --git a/src/test/ui/coherence/coherence-overlap-issue-23516.stderr b/tests/ui/coherence/coherence-overlap-issue-23516.stderr
index cd3984267..cd3984267 100644
--- a/src/test/ui/coherence/coherence-overlap-issue-23516.stderr
+++ b/tests/ui/coherence/coherence-overlap-issue-23516.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-messages.rs b/tests/ui/coherence/coherence-overlap-messages.rs
index 1258a2371..1258a2371 100644
--- a/src/test/ui/coherence/coherence-overlap-messages.rs
+++ b/tests/ui/coherence/coherence-overlap-messages.rs
diff --git a/src/test/ui/coherence/coherence-overlap-messages.stderr b/tests/ui/coherence/coherence-overlap-messages.stderr
index 5a97296ee..5a97296ee 100644
--- a/src/test/ui/coherence/coherence-overlap-messages.stderr
+++ b/tests/ui/coherence/coherence-overlap-messages.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-negate-alias-strict.rs b/tests/ui/coherence/coherence-overlap-negate-alias-strict.rs
index 48dffc921..48dffc921 100644
--- a/src/test/ui/coherence/coherence-overlap-negate-alias-strict.rs
+++ b/tests/ui/coherence/coherence-overlap-negate-alias-strict.rs
diff --git a/src/test/ui/coherence/coherence-overlap-negate-not-use-feature-gate.rs b/tests/ui/coherence/coherence-overlap-negate-not-use-feature-gate.rs
index a067736f6..a067736f6 100644
--- a/src/test/ui/coherence/coherence-overlap-negate-not-use-feature-gate.rs
+++ b/tests/ui/coherence/coherence-overlap-negate-not-use-feature-gate.rs
diff --git a/src/test/ui/coherence/coherence-overlap-negate-not-use-feature-gate.stderr b/tests/ui/coherence/coherence-overlap-negate-not-use-feature-gate.stderr
index 4b55001ec..4b55001ec 100644
--- a/src/test/ui/coherence/coherence-overlap-negate-not-use-feature-gate.stderr
+++ b/tests/ui/coherence/coherence-overlap-negate-not-use-feature-gate.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-negate-strict.rs b/tests/ui/coherence/coherence-overlap-negate-strict.rs
index 1021d87ca..1021d87ca 100644
--- a/src/test/ui/coherence/coherence-overlap-negate-strict.rs
+++ b/tests/ui/coherence/coherence-overlap-negate-strict.rs
diff --git a/src/test/ui/coherence/coherence-overlap-negate-use-feature-gate.rs b/tests/ui/coherence/coherence-overlap-negate-use-feature-gate.rs
index a0dd881d1..a0dd881d1 100644
--- a/src/test/ui/coherence/coherence-overlap-negate-use-feature-gate.rs
+++ b/tests/ui/coherence/coherence-overlap-negate-use-feature-gate.rs
diff --git a/src/test/ui/coherence/coherence-overlap-negative-trait.rs b/tests/ui/coherence/coherence-overlap-negative-trait.rs
index 8059d23ff..8059d23ff 100644
--- a/src/test/ui/coherence/coherence-overlap-negative-trait.rs
+++ b/tests/ui/coherence/coherence-overlap-negative-trait.rs
diff --git a/src/test/ui/coherence/coherence-overlap-negative-trait2.rs b/tests/ui/coherence/coherence-overlap-negative-trait2.rs
index cc8c463b8..cc8c463b8 100644
--- a/src/test/ui/coherence/coherence-overlap-negative-trait2.rs
+++ b/tests/ui/coherence/coherence-overlap-negative-trait2.rs
diff --git a/src/test/ui/coherence/coherence-overlap-super-negative.rs b/tests/ui/coherence/coherence-overlap-super-negative.rs
index d296a094a..d296a094a 100644
--- a/src/test/ui/coherence/coherence-overlap-super-negative.rs
+++ b/tests/ui/coherence/coherence-overlap-super-negative.rs
diff --git a/src/test/ui/coherence/coherence-overlap-trait-alias.rs b/tests/ui/coherence/coherence-overlap-trait-alias.rs
index 9d9c76af9..9d9c76af9 100644
--- a/src/test/ui/coherence/coherence-overlap-trait-alias.rs
+++ b/tests/ui/coherence/coherence-overlap-trait-alias.rs
diff --git a/src/test/ui/coherence/coherence-overlap-trait-alias.stderr b/tests/ui/coherence/coherence-overlap-trait-alias.stderr
index e324c1e79..668b8319b 100644
--- a/src/test/ui/coherence/coherence-overlap-trait-alias.stderr
+++ b/tests/ui/coherence/coherence-overlap-trait-alias.stderr
@@ -1,8 +1,8 @@
 error[E0283]: type annotations needed: cannot satisfy `u32: C`
-  --> $DIR/coherence-overlap-trait-alias.rs:15:6
+  --> $DIR/coherence-overlap-trait-alias.rs:15:12
    |
 LL | impl C for u32 {}
-   |      ^
+   |            ^^^
    |
 note: multiple `impl`s satisfying `u32: C` found
   --> $DIR/coherence-overlap-trait-alias.rs:14:1
diff --git a/src/test/ui/coherence/coherence-overlap-upstream-inherent.rs b/tests/ui/coherence/coherence-overlap-upstream-inherent.rs
index 082d753de..082d753de 100644
--- a/src/test/ui/coherence/coherence-overlap-upstream-inherent.rs
+++ b/tests/ui/coherence/coherence-overlap-upstream-inherent.rs
diff --git a/src/test/ui/coherence/coherence-overlap-upstream-inherent.stderr b/tests/ui/coherence/coherence-overlap-upstream-inherent.stderr
index f355c6e85..f355c6e85 100644
--- a/src/test/ui/coherence/coherence-overlap-upstream-inherent.stderr
+++ b/tests/ui/coherence/coherence-overlap-upstream-inherent.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-upstream.rs b/tests/ui/coherence/coherence-overlap-upstream.rs
index 8f1e6558b..8f1e6558b 100644
--- a/src/test/ui/coherence/coherence-overlap-upstream.rs
+++ b/tests/ui/coherence/coherence-overlap-upstream.rs
diff --git a/src/test/ui/coherence/coherence-overlap-upstream.stderr b/tests/ui/coherence/coherence-overlap-upstream.stderr
index f6145c188..f6145c188 100644
--- a/src/test/ui/coherence/coherence-overlap-upstream.stderr
+++ b/tests/ui/coherence/coherence-overlap-upstream.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-with-regions.rs b/tests/ui/coherence/coherence-overlap-with-regions.rs
index 32f01f418..32f01f418 100644
--- a/src/test/ui/coherence/coherence-overlap-with-regions.rs
+++ b/tests/ui/coherence/coherence-overlap-with-regions.rs
diff --git a/src/test/ui/coherence/coherence-overlapping-pairs.rs b/tests/ui/coherence/coherence-overlapping-pairs.rs
index d5d18217b..d5d18217b 100644
--- a/src/test/ui/coherence/coherence-overlapping-pairs.rs
+++ b/tests/ui/coherence/coherence-overlapping-pairs.rs
diff --git a/src/test/ui/coherence/coherence-overlapping-pairs.stderr b/tests/ui/coherence/coherence-overlapping-pairs.stderr
index 15c92dfeb..15c92dfeb 100644
--- a/src/test/ui/coherence/coherence-overlapping-pairs.stderr
+++ b/tests/ui/coherence/coherence-overlapping-pairs.stderr
diff --git a/src/test/ui/coherence/coherence-pair-covered-uncovered-1.rs b/tests/ui/coherence/coherence-pair-covered-uncovered-1.rs
index 15868ca86..15868ca86 100644
--- a/src/test/ui/coherence/coherence-pair-covered-uncovered-1.rs
+++ b/tests/ui/coherence/coherence-pair-covered-uncovered-1.rs
diff --git a/src/test/ui/coherence/coherence-pair-covered-uncovered-1.stderr b/tests/ui/coherence/coherence-pair-covered-uncovered-1.stderr
index 03d787123..03d787123 100644
--- a/src/test/ui/coherence/coherence-pair-covered-uncovered-1.stderr
+++ b/tests/ui/coherence/coherence-pair-covered-uncovered-1.stderr
diff --git a/src/test/ui/coherence/coherence-pair-covered-uncovered.rs b/tests/ui/coherence/coherence-pair-covered-uncovered.rs
index da970572f..da970572f 100644
--- a/src/test/ui/coherence/coherence-pair-covered-uncovered.rs
+++ b/tests/ui/coherence/coherence-pair-covered-uncovered.rs
diff --git a/src/test/ui/coherence/coherence-pair-covered-uncovered.stderr b/tests/ui/coherence/coherence-pair-covered-uncovered.stderr
index 73dfe2f57..73dfe2f57 100644
--- a/src/test/ui/coherence/coherence-pair-covered-uncovered.stderr
+++ b/tests/ui/coherence/coherence-pair-covered-uncovered.stderr
diff --git a/src/test/ui/coherence/coherence-projection-conflict-orphan.rs b/tests/ui/coherence/coherence-projection-conflict-orphan.rs
index 637dd2506..637dd2506 100644
--- a/src/test/ui/coherence/coherence-projection-conflict-orphan.rs
+++ b/tests/ui/coherence/coherence-projection-conflict-orphan.rs
diff --git a/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr b/tests/ui/coherence/coherence-projection-conflict-orphan.stderr
index b1ee0795b..b1ee0795b 100644
--- a/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr
+++ b/tests/ui/coherence/coherence-projection-conflict-orphan.stderr
diff --git a/src/test/ui/coherence/coherence-projection-conflict-ty-param.rs b/tests/ui/coherence/coherence-projection-conflict-ty-param.rs
index 3e4141fa8..3e4141fa8 100644
--- a/src/test/ui/coherence/coherence-projection-conflict-ty-param.rs
+++ b/tests/ui/coherence/coherence-projection-conflict-ty-param.rs
diff --git a/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr b/tests/ui/coherence/coherence-projection-conflict-ty-param.stderr
index 94d242eaa..94d242eaa 100644
--- a/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr
+++ b/tests/ui/coherence/coherence-projection-conflict-ty-param.stderr
diff --git a/src/test/ui/coherence/coherence-projection-conflict.rs b/tests/ui/coherence/coherence-projection-conflict.rs
index daab2a2f8..daab2a2f8 100644
--- a/src/test/ui/coherence/coherence-projection-conflict.rs
+++ b/tests/ui/coherence/coherence-projection-conflict.rs
diff --git a/src/test/ui/coherence/coherence-projection-conflict.stderr b/tests/ui/coherence/coherence-projection-conflict.stderr
index 7d2c584c3..7d2c584c3 100644
--- a/src/test/ui/coherence/coherence-projection-conflict.stderr
+++ b/tests/ui/coherence/coherence-projection-conflict.stderr
diff --git a/src/test/ui/coherence/coherence-projection-ok-orphan.rs b/tests/ui/coherence/coherence-projection-ok-orphan.rs
index 42b4b1912..42b4b1912 100644
--- a/src/test/ui/coherence/coherence-projection-ok-orphan.rs
+++ b/tests/ui/coherence/coherence-projection-ok-orphan.rs
diff --git a/src/test/ui/coherence/coherence-projection-ok.rs b/tests/ui/coherence/coherence-projection-ok.rs
index 44fc02a5c..44fc02a5c 100644
--- a/src/test/ui/coherence/coherence-projection-ok.rs
+++ b/tests/ui/coherence/coherence-projection-ok.rs
diff --git a/src/test/ui/coherence/coherence-rfc447-constrained.rs b/tests/ui/coherence/coherence-rfc447-constrained.rs
index 9d1d86883..9d1d86883 100644
--- a/src/test/ui/coherence/coherence-rfc447-constrained.rs
+++ b/tests/ui/coherence/coherence-rfc447-constrained.rs
diff --git a/src/test/ui/coherence/coherence-subtyping.rs b/tests/ui/coherence/coherence-subtyping.rs
index b3ed728a8..b3ed728a8 100644
--- a/src/test/ui/coherence/coherence-subtyping.rs
+++ b/tests/ui/coherence/coherence-subtyping.rs
diff --git a/src/test/ui/coherence/coherence-subtyping.stderr b/tests/ui/coherence/coherence-subtyping.stderr
index 9d90019a5..9d90019a5 100644
--- a/src/test/ui/coherence/coherence-subtyping.stderr
+++ b/tests/ui/coherence/coherence-subtyping.stderr
diff --git a/src/test/ui/coherence/coherence-tuple-conflict.rs b/tests/ui/coherence/coherence-tuple-conflict.rs
index 8cc829726..8cc829726 100644
--- a/src/test/ui/coherence/coherence-tuple-conflict.rs
+++ b/tests/ui/coherence/coherence-tuple-conflict.rs
diff --git a/src/test/ui/coherence/coherence-tuple-conflict.stderr b/tests/ui/coherence/coherence-tuple-conflict.stderr
index 09ad5e5b2..09ad5e5b2 100644
--- a/src/test/ui/coherence/coherence-tuple-conflict.stderr
+++ b/tests/ui/coherence/coherence-tuple-conflict.stderr
diff --git a/src/test/ui/coherence/coherence-unsafe-trait-object-impl.rs b/tests/ui/coherence/coherence-unsafe-trait-object-impl.rs
index 9859a226e..9859a226e 100644
--- a/src/test/ui/coherence/coherence-unsafe-trait-object-impl.rs
+++ b/tests/ui/coherence/coherence-unsafe-trait-object-impl.rs
diff --git a/src/test/ui/coherence/coherence-unsafe-trait-object-impl.stderr b/tests/ui/coherence/coherence-unsafe-trait-object-impl.stderr
index 2e2dac288..2e2dac288 100644
--- a/src/test/ui/coherence/coherence-unsafe-trait-object-impl.stderr
+++ b/tests/ui/coherence/coherence-unsafe-trait-object-impl.stderr
diff --git a/src/test/ui/coherence/coherence-vec-local-2.rs b/tests/ui/coherence/coherence-vec-local-2.rs
index 47df06bac..47df06bac 100644
--- a/src/test/ui/coherence/coherence-vec-local-2.rs
+++ b/tests/ui/coherence/coherence-vec-local-2.rs
diff --git a/src/test/ui/coherence/coherence-vec-local-2.stderr b/tests/ui/coherence/coherence-vec-local-2.stderr
index 95fdf172e..95fdf172e 100644
--- a/src/test/ui/coherence/coherence-vec-local-2.stderr
+++ b/tests/ui/coherence/coherence-vec-local-2.stderr
diff --git a/src/test/ui/coherence/coherence-vec-local.rs b/tests/ui/coherence/coherence-vec-local.rs
index 130cc39d0..130cc39d0 100644
--- a/src/test/ui/coherence/coherence-vec-local.rs
+++ b/tests/ui/coherence/coherence-vec-local.rs
diff --git a/src/test/ui/coherence/coherence-vec-local.stderr b/tests/ui/coherence/coherence-vec-local.stderr
index 4835e771a..4835e771a 100644
--- a/src/test/ui/coherence/coherence-vec-local.stderr
+++ b/tests/ui/coherence/coherence-vec-local.stderr
diff --git a/src/test/ui/coherence/coherence-wasm-bindgen.rs b/tests/ui/coherence/coherence-wasm-bindgen.rs
index ee09a7244..ee09a7244 100644
--- a/src/test/ui/coherence/coherence-wasm-bindgen.rs
+++ b/tests/ui/coherence/coherence-wasm-bindgen.rs
diff --git a/src/test/ui/coherence/coherence-wasm-bindgen.stderr b/tests/ui/coherence/coherence-wasm-bindgen.stderr
index 89615f0fb..89615f0fb 100644
--- a/src/test/ui/coherence/coherence-wasm-bindgen.stderr
+++ b/tests/ui/coherence/coherence-wasm-bindgen.stderr
diff --git a/src/test/ui/coherence/coherence-where-clause.rs b/tests/ui/coherence/coherence-where-clause.rs
index 5c40def86..5c40def86 100644
--- a/src/test/ui/coherence/coherence-where-clause.rs
+++ b/tests/ui/coherence/coherence-where-clause.rs
diff --git a/src/test/ui/coherence/coherence-with-closure.rs b/tests/ui/coherence/coherence-with-closure.rs
index 5b6a62b24..5b6a62b24 100644
--- a/src/test/ui/coherence/coherence-with-closure.rs
+++ b/tests/ui/coherence/coherence-with-closure.rs
diff --git a/src/test/ui/coherence/coherence-with-closure.stderr b/tests/ui/coherence/coherence-with-closure.stderr
index 431108e14..431108e14 100644
--- a/src/test/ui/coherence/coherence-with-closure.stderr
+++ b/tests/ui/coherence/coherence-with-closure.stderr
diff --git a/tests/ui/coherence/coherence-with-generator.rs b/tests/ui/coherence/coherence-with-generator.rs
new file mode 100644
index 000000000..5eb8dc2a4
--- /dev/null
+++ b/tests/ui/coherence/coherence-with-generator.rs
@@ -0,0 +1,24 @@
+// Test that encountering closures during coherence does not cause issues.
+#![feature(type_alias_impl_trait, generators)]
+#![cfg_attr(specialized, feature(specialization))]
+#![allow(incomplete_features)]
+
+// revisions: stock specialized
+// [specialized]check-pass
+
+type OpaqueGenerator = impl Sized;
+fn defining_use() -> OpaqueGenerator {
+    || {
+        for i in 0..10 {
+            yield i;
+        }
+    }
+}
+
+struct Wrapper<T>(T);
+trait Trait {}
+impl Trait for Wrapper<OpaqueGenerator> {}
+impl<T: Sync> Trait for Wrapper<T> {}
+//[stock]~^ ERROR conflicting implementations of trait `Trait` for type `Wrapper<OpaqueGenerator>`
+
+fn main() {}
diff --git a/tests/ui/coherence/coherence-with-generator.stock.stderr b/tests/ui/coherence/coherence-with-generator.stock.stderr
new file mode 100644
index 000000000..478ac4912
--- /dev/null
+++ b/tests/ui/coherence/coherence-with-generator.stock.stderr
@@ -0,0 +1,11 @@
+error[E0119]: conflicting implementations of trait `Trait` for type `Wrapper<OpaqueGenerator>`
+  --> $DIR/coherence-with-generator.rs:21:1
+   |
+LL | impl Trait for Wrapper<OpaqueGenerator> {}
+   | --------------------------------------- first implementation here
+LL | impl<T: Sync> Trait for Wrapper<T> {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Wrapper<OpaqueGenerator>`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/coherence/coherence_copy_like.rs b/tests/ui/coherence/coherence_copy_like.rs
index 92af341cc..92af341cc 100644
--- a/src/test/ui/coherence/coherence_copy_like.rs
+++ b/tests/ui/coherence/coherence_copy_like.rs
diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.rs b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct.rs
index edee6cd7b..edee6cd7b 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.rs
+++ b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct.rs
diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs
index 599c804d2..599c804d2 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs
+++ b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs
diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs
index 7d851b528..7d851b528 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs
+++ b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs
diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr
index 93486fa5f..93486fa5f 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr
+++ b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr
diff --git a/src/test/ui/coherence/coherence_copy_like_err_struct.rs b/tests/ui/coherence/coherence_copy_like_err_struct.rs
index fe39370c9..fe39370c9 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_struct.rs
+++ b/tests/ui/coherence/coherence_copy_like_err_struct.rs
diff --git a/src/test/ui/coherence/coherence_copy_like_err_struct.stderr b/tests/ui/coherence/coherence_copy_like_err_struct.stderr
index 7432733b9..7432733b9 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_struct.stderr
+++ b/tests/ui/coherence/coherence_copy_like_err_struct.stderr
diff --git a/src/test/ui/coherence/coherence_copy_like_err_tuple.rs b/tests/ui/coherence/coherence_copy_like_err_tuple.rs
index f63e205c9..f63e205c9 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_tuple.rs
+++ b/tests/ui/coherence/coherence_copy_like_err_tuple.rs
diff --git a/src/test/ui/coherence/coherence_copy_like_err_tuple.stderr b/tests/ui/coherence/coherence_copy_like_err_tuple.stderr
index 090497ec1..090497ec1 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_tuple.stderr
+++ b/tests/ui/coherence/coherence_copy_like_err_tuple.stderr
diff --git a/src/test/ui/coherence/coherence_inherent.rs b/tests/ui/coherence/coherence_inherent.rs
index f3ebf0003..f3ebf0003 100644
--- a/src/test/ui/coherence/coherence_inherent.rs
+++ b/tests/ui/coherence/coherence_inherent.rs
diff --git a/src/test/ui/coherence/coherence_inherent.stderr b/tests/ui/coherence/coherence_inherent.stderr
index 46b128c08..46b128c08 100644
--- a/src/test/ui/coherence/coherence_inherent.stderr
+++ b/tests/ui/coherence/coherence_inherent.stderr
diff --git a/src/test/ui/coherence/coherence_inherent_cc.rs b/tests/ui/coherence/coherence_inherent_cc.rs
index 759ada248..759ada248 100644
--- a/src/test/ui/coherence/coherence_inherent_cc.rs
+++ b/tests/ui/coherence/coherence_inherent_cc.rs
diff --git a/src/test/ui/coherence/coherence_inherent_cc.stderr b/tests/ui/coherence/coherence_inherent_cc.stderr
index af0ef3b69..af0ef3b69 100644
--- a/src/test/ui/coherence/coherence_inherent_cc.stderr
+++ b/tests/ui/coherence/coherence_inherent_cc.stderr
diff --git a/src/test/ui/coherence/coherence_local.rs b/tests/ui/coherence/coherence_local.rs
index ea724ada7..ea724ada7 100644
--- a/src/test/ui/coherence/coherence_local.rs
+++ b/tests/ui/coherence/coherence_local.rs
diff --git a/src/test/ui/coherence/coherence_local_err_struct.rs b/tests/ui/coherence/coherence_local_err_struct.rs
index a24038eb2..a24038eb2 100644
--- a/src/test/ui/coherence/coherence_local_err_struct.rs
+++ b/tests/ui/coherence/coherence_local_err_struct.rs
diff --git a/src/test/ui/coherence/coherence_local_err_struct.stderr b/tests/ui/coherence/coherence_local_err_struct.stderr
index afc6fc45d..afc6fc45d 100644
--- a/src/test/ui/coherence/coherence_local_err_struct.stderr
+++ b/tests/ui/coherence/coherence_local_err_struct.stderr
diff --git a/src/test/ui/coherence/coherence_local_err_tuple.rs b/tests/ui/coherence/coherence_local_err_tuple.rs
index f4033862a..f4033862a 100644
--- a/src/test/ui/coherence/coherence_local_err_tuple.rs
+++ b/tests/ui/coherence/coherence_local_err_tuple.rs
diff --git a/src/test/ui/coherence/coherence_local_err_tuple.stderr b/tests/ui/coherence/coherence_local_err_tuple.stderr
index a4953859f..a4953859f 100644
--- a/src/test/ui/coherence/coherence_local_err_tuple.stderr
+++ b/tests/ui/coherence/coherence_local_err_tuple.stderr
diff --git a/src/test/ui/coherence/coherence_local_ref.rs b/tests/ui/coherence/coherence_local_ref.rs
index 2e28839c8..2e28839c8 100644
--- a/src/test/ui/coherence/coherence_local_ref.rs
+++ b/tests/ui/coherence/coherence_local_ref.rs
diff --git a/src/test/ui/coherence/conflicting-impl-with-err.rs b/tests/ui/coherence/conflicting-impl-with-err.rs
index 3e0234b87..3e0234b87 100644
--- a/src/test/ui/coherence/conflicting-impl-with-err.rs
+++ b/tests/ui/coherence/conflicting-impl-with-err.rs
diff --git a/src/test/ui/coherence/conflicting-impl-with-err.stderr b/tests/ui/coherence/conflicting-impl-with-err.stderr
index 3009b452d..3009b452d 100644
--- a/src/test/ui/coherence/conflicting-impl-with-err.stderr
+++ b/tests/ui/coherence/conflicting-impl-with-err.stderr
diff --git a/src/test/ui/coherence/const-generics-orphan-check-ok.rs b/tests/ui/coherence/const-generics-orphan-check-ok.rs
index 217e8aed2..217e8aed2 100644
--- a/src/test/ui/coherence/const-generics-orphan-check-ok.rs
+++ b/tests/ui/coherence/const-generics-orphan-check-ok.rs
diff --git a/src/test/ui/coherence/deep-bad-copy-reason.rs b/tests/ui/coherence/deep-bad-copy-reason.rs
index 80bbe387a..80bbe387a 100644
--- a/src/test/ui/coherence/deep-bad-copy-reason.rs
+++ b/tests/ui/coherence/deep-bad-copy-reason.rs
diff --git a/src/test/ui/coherence/deep-bad-copy-reason.stderr b/tests/ui/coherence/deep-bad-copy-reason.stderr
index 168ee5726..168ee5726 100644
--- a/src/test/ui/coherence/deep-bad-copy-reason.stderr
+++ b/tests/ui/coherence/deep-bad-copy-reason.stderr
diff --git a/src/test/ui/coherence/impl-foreign-for-foreign.rs b/tests/ui/coherence/impl-foreign-for-foreign.rs
index 4c0d46045..4c0d46045 100644
--- a/src/test/ui/coherence/impl-foreign-for-foreign.rs
+++ b/tests/ui/coherence/impl-foreign-for-foreign.rs
diff --git a/src/test/ui/coherence/impl-foreign-for-foreign.stderr b/tests/ui/coherence/impl-foreign-for-foreign.stderr
index 93f7a6fdc..93f7a6fdc 100644
--- a/src/test/ui/coherence/impl-foreign-for-foreign.stderr
+++ b/tests/ui/coherence/impl-foreign-for-foreign.stderr
diff --git a/src/test/ui/coherence/impl-foreign-for-foreign[foreign].rs b/tests/ui/coherence/impl-foreign-for-foreign[foreign].rs
index e79f66c0e..e79f66c0e 100644
--- a/src/test/ui/coherence/impl-foreign-for-foreign[foreign].rs
+++ b/tests/ui/coherence/impl-foreign-for-foreign[foreign].rs
diff --git a/src/test/ui/coherence/impl-foreign-for-foreign[foreign].stderr b/tests/ui/coherence/impl-foreign-for-foreign[foreign].stderr
index e24537bce..e24537bce 100644
--- a/src/test/ui/coherence/impl-foreign-for-foreign[foreign].stderr
+++ b/tests/ui/coherence/impl-foreign-for-foreign[foreign].stderr
diff --git a/src/test/ui/coherence/impl-foreign-for-foreign[local].rs b/tests/ui/coherence/impl-foreign-for-foreign[local].rs
index 0b1413edf..0b1413edf 100644
--- a/src/test/ui/coherence/impl-foreign-for-foreign[local].rs
+++ b/tests/ui/coherence/impl-foreign-for-foreign[local].rs
diff --git a/src/test/ui/coherence/impl-foreign-for-fundamental[foreign].rs b/tests/ui/coherence/impl-foreign-for-fundamental[foreign].rs
index 10bdf2db8..10bdf2db8 100644
--- a/src/test/ui/coherence/impl-foreign-for-fundamental[foreign].rs
+++ b/tests/ui/coherence/impl-foreign-for-fundamental[foreign].rs
diff --git a/src/test/ui/coherence/impl-foreign-for-fundamental[foreign].stderr b/tests/ui/coherence/impl-foreign-for-fundamental[foreign].stderr
index 55ea4409e..55ea4409e 100644
--- a/src/test/ui/coherence/impl-foreign-for-fundamental[foreign].stderr
+++ b/tests/ui/coherence/impl-foreign-for-fundamental[foreign].stderr
diff --git a/src/test/ui/coherence/impl-foreign-for-fundamental[local].rs b/tests/ui/coherence/impl-foreign-for-fundamental[local].rs
index c3fc0e6b8..c3fc0e6b8 100644
--- a/src/test/ui/coherence/impl-foreign-for-fundamental[local].rs
+++ b/tests/ui/coherence/impl-foreign-for-fundamental[local].rs
diff --git a/src/test/ui/coherence/impl-foreign-for-local.rs b/tests/ui/coherence/impl-foreign-for-local.rs
index 04405bc46..04405bc46 100644
--- a/src/test/ui/coherence/impl-foreign-for-local.rs
+++ b/tests/ui/coherence/impl-foreign-for-local.rs
diff --git a/src/test/ui/coherence/impl-foreign-for-locally-defined-fundamental.rs b/tests/ui/coherence/impl-foreign-for-locally-defined-fundamental.rs
index bc1e18b65..bc1e18b65 100644
--- a/src/test/ui/coherence/impl-foreign-for-locally-defined-fundamental.rs
+++ b/tests/ui/coherence/impl-foreign-for-locally-defined-fundamental.rs
diff --git a/src/test/ui/coherence/impl-foreign-for-locally-defined-fundamental[foreign].rs b/tests/ui/coherence/impl-foreign-for-locally-defined-fundamental[foreign].rs
index 1e11789ef..1e11789ef 100644
--- a/src/test/ui/coherence/impl-foreign-for-locally-defined-fundamental[foreign].rs
+++ b/tests/ui/coherence/impl-foreign-for-locally-defined-fundamental[foreign].rs
diff --git a/src/test/ui/coherence/impl-foreign[foreign]-for-foreign.rs b/tests/ui/coherence/impl-foreign[foreign]-for-foreign.rs
index 99a399ddc..99a399ddc 100644
--- a/src/test/ui/coherence/impl-foreign[foreign]-for-foreign.rs
+++ b/tests/ui/coherence/impl-foreign[foreign]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl-foreign[foreign]-for-foreign.stderr b/tests/ui/coherence/impl-foreign[foreign]-for-foreign.stderr
index 65b3aa394..65b3aa394 100644
--- a/src/test/ui/coherence/impl-foreign[foreign]-for-foreign.stderr
+++ b/tests/ui/coherence/impl-foreign[foreign]-for-foreign.stderr
diff --git a/src/test/ui/coherence/impl-foreign[foreign]-for-local.rs b/tests/ui/coherence/impl-foreign[foreign]-for-local.rs
index bc6595bb3..bc6595bb3 100644
--- a/src/test/ui/coherence/impl-foreign[foreign]-for-local.rs
+++ b/tests/ui/coherence/impl-foreign[foreign]-for-local.rs
diff --git a/src/test/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.rs b/tests/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.rs
index 0476cdaff..0476cdaff 100644
--- a/src/test/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.rs
+++ b/tests/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.stderr b/tests/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.stderr
index 8e77c13e1..8e77c13e1 100644
--- a/src/test/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.stderr
+++ b/tests/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.stderr
diff --git a/src/test/ui/coherence/impl-foreign[fundemental[local]]-for-foreign.rs b/tests/ui/coherence/impl-foreign[fundemental[local]]-for-foreign.rs
index 7b83b0485..7b83b0485 100644
--- a/src/test/ui/coherence/impl-foreign[fundemental[local]]-for-foreign.rs
+++ b/tests/ui/coherence/impl-foreign[fundemental[local]]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign-for-foreign[t].rs b/tests/ui/coherence/impl[t]-foreign-for-foreign[t].rs
index 5282de4b2..5282de4b2 100644
--- a/src/test/ui/coherence/impl[t]-foreign-for-foreign[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign-for-foreign[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign-for-foreign[t].stderr b/tests/ui/coherence/impl[t]-foreign-for-foreign[t].stderr
index 92346c291..92346c291 100644
--- a/src/test/ui/coherence/impl[t]-foreign-for-foreign[t].stderr
+++ b/tests/ui/coherence/impl[t]-foreign-for-foreign[t].stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign-for-fundamental[t].rs b/tests/ui/coherence/impl[t]-foreign-for-fundamental[t].rs
index 6f5605a21..6f5605a21 100644
--- a/src/test/ui/coherence/impl[t]-foreign-for-fundamental[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign-for-fundamental[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign-for-fundamental[t].stderr b/tests/ui/coherence/impl[t]-foreign-for-fundamental[t].stderr
index 249a5c44c..249a5c44c 100644
--- a/src/test/ui/coherence/impl[t]-foreign-for-fundamental[t].stderr
+++ b/tests/ui/coherence/impl[t]-foreign-for-fundamental[t].stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[foreign[t]_local]-for-foreign.rs b/tests/ui/coherence/impl[t]-foreign[foreign[t]_local]-for-foreign.rs
index 99f3ce447..99f3ce447 100644
--- a/src/test/ui/coherence/impl[t]-foreign[foreign[t]_local]-for-foreign.rs
+++ b/tests/ui/coherence/impl[t]-foreign[foreign[t]_local]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].rs b/tests/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].rs
index 81044cd05..81044cd05 100644
--- a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].stderr b/tests/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].stderr
index 95a20cc5b..95a20cc5b 100644
--- a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].stderr
+++ b/tests/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-t.rs b/tests/ui/coherence/impl[t]-foreign[foreign]-for-t.rs
index 680ba9f22..680ba9f22 100644
--- a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-t.rs
+++ b/tests/ui/coherence/impl[t]-foreign[foreign]-for-t.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-t.stderr b/tests/ui/coherence/impl[t]-foreign[foreign]-for-t.stderr
index aed184767..aed184767 100644
--- a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-t.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[foreign]-for-t.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.rs b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.rs
index fc7649085..fc7649085 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.rs
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.stderr b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.stderr
index 73b1e2c6e..73b1e2c6e 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].rs b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].rs
index 703f25dd6..703f25dd6 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].stderr b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].stderr
index 5f89a7aa4..5f89a7aa4 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].stderr
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-local.rs b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-local.rs
index ec21fdd4e..ec21fdd4e 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-local.rs
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-local.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.rs b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.rs
index 5bdab87bf..5bdab87bf 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.rs
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.stderr b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.stderr
index 45559d8b6..45559d8b6 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs b/tests/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs
index c9e3594cd..c9e3594cd 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.stderr b/tests/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.stderr
index f94f04c8d..f94f04c8d 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundemental[local]]-for-foreign[t].rs b/tests/ui/coherence/impl[t]-foreign[fundemental[local]]-for-foreign[t].rs
index 62e69357e..62e69357e 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundemental[local]]-for-foreign[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign[fundemental[local]]-for-foreign[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-foreign.rs b/tests/ui/coherence/impl[t]-foreign[local]-for-foreign.rs
index 1fec19bba..1fec19bba 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-foreign.rs
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-foreign[t].rs b/tests/ui/coherence/impl[t]-foreign[local]-for-foreign[t].rs
index c8ed28be6..c8ed28be6 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-foreign[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-foreign[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[foreign[t]].rs b/tests/ui/coherence/impl[t]-foreign[local]-for-fundamental[foreign[t]].rs
index f9b88c645..f9b88c645 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[foreign[t]].rs
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-fundamental[foreign[t]].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].rs b/tests/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].rs
index 7709bd9c8..7709bd9c8 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].stderr b/tests/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].stderr
index e68f2fe58..e68f2fe58 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].stderr
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-local.rs b/tests/ui/coherence/impl[t]-foreign[local]-for-local.rs
index 9c14eea1b..9c14eea1b 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-local.rs
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-local.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-t.rs b/tests/ui/coherence/impl[t]-foreign[local]-for-t.rs
index eed3a4b5c..eed3a4b5c 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-t.rs
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-t.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-t.stderr b/tests/ui/coherence/impl[t]-foreign[local]-for-t.stderr
index d97e85dcb..d97e85dcb 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-t.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-t.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[local_fundamental[t]]-for-foreign.rs b/tests/ui/coherence/impl[t]-foreign[local_fundamental[t]]-for-foreign.rs
index 63c342b76..63c342b76 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local_fundamental[t]]-for-foreign.rs
+++ b/tests/ui/coherence/impl[t]-foreign[local_fundamental[t]]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-foreign.rs b/tests/ui/coherence/impl[t]-foreign[t]-for-foreign.rs
index 9bb37c2ba..9bb37c2ba 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-foreign.rs
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-foreign.stderr b/tests/ui/coherence/impl[t]-foreign[t]-for-foreign.stderr
index 44e3b7eed..44e3b7eed 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-foreign.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-foreign.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-fundamental.rs b/tests/ui/coherence/impl[t]-foreign[t]-for-fundamental.rs
index 79b5aa3fc..79b5aa3fc 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-fundamental.rs
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-fundamental.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-fundamental.stderr b/tests/ui/coherence/impl[t]-foreign[t]-for-fundamental.stderr
index 80fb5dbec..80fb5dbec 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-fundamental.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-fundamental.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-local.rs b/tests/ui/coherence/impl[t]-foreign[t]-for-local.rs
index bc59721c0..bc59721c0 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-local.rs
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-local.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-t.rs b/tests/ui/coherence/impl[t]-foreign[t]-for-t.rs
index bcd6b269a..bcd6b269a 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-t.rs
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-t.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-t.stderr b/tests/ui/coherence/impl[t]-foreign[t]-for-t.stderr
index ff72969dc..ff72969dc 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-t.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-t.stderr
diff --git a/src/test/ui/coherence/inter-crate-ambiguity-causes-notes.rs b/tests/ui/coherence/inter-crate-ambiguity-causes-notes.rs
index 5b11c78ab..5b11c78ab 100644
--- a/src/test/ui/coherence/inter-crate-ambiguity-causes-notes.rs
+++ b/tests/ui/coherence/inter-crate-ambiguity-causes-notes.rs
diff --git a/src/test/ui/coherence/inter-crate-ambiguity-causes-notes.stderr b/tests/ui/coherence/inter-crate-ambiguity-causes-notes.stderr
index 4ddd712b2..4ddd712b2 100644
--- a/src/test/ui/coherence/inter-crate-ambiguity-causes-notes.stderr
+++ b/tests/ui/coherence/inter-crate-ambiguity-causes-notes.stderr
diff --git a/src/test/ui/coherence/issue-85026.rs b/tests/ui/coherence/issue-85026.rs
index 8b116545a..8b116545a 100644
--- a/src/test/ui/coherence/issue-85026.rs
+++ b/tests/ui/coherence/issue-85026.rs
diff --git a/src/test/ui/coherence/issue-85026.stderr b/tests/ui/coherence/issue-85026.stderr
index a5da19bbf..a5da19bbf 100644
--- a/src/test/ui/coherence/issue-85026.stderr
+++ b/tests/ui/coherence/issue-85026.stderr
diff --git a/src/test/ui/coherence/issue-99663-2.rs b/tests/ui/coherence/issue-99663-2.rs
index 10a0a5688..10a0a5688 100644
--- a/src/test/ui/coherence/issue-99663-2.rs
+++ b/tests/ui/coherence/issue-99663-2.rs
diff --git a/src/test/ui/coherence/issue-99663.rs b/tests/ui/coherence/issue-99663.rs
index a2d4d398c..a2d4d398c 100644
--- a/src/test/ui/coherence/issue-99663.rs
+++ b/tests/ui/coherence/issue-99663.rs
diff --git a/src/test/ui/coherence/re-rebalance-coherence-default-generic-associated-type.rs b/tests/ui/coherence/re-rebalance-coherence-default-generic-associated-type.rs
index d18e3f453..d18e3f453 100644
--- a/src/test/ui/coherence/re-rebalance-coherence-default-generic-associated-type.rs
+++ b/tests/ui/coherence/re-rebalance-coherence-default-generic-associated-type.rs
diff --git a/src/test/ui/coherence/re-rebalance-coherence.rs b/tests/ui/coherence/re-rebalance-coherence.rs
index 38d096b08..38d096b08 100644
--- a/src/test/ui/coherence/re-rebalance-coherence.rs
+++ b/tests/ui/coherence/re-rebalance-coherence.rs
diff --git a/src/test/ui/coherence/strict-coherence-needs-negative-coherence.rs b/tests/ui/coherence/strict-coherence-needs-negative-coherence.rs
index 221683dd5..221683dd5 100644
--- a/src/test/ui/coherence/strict-coherence-needs-negative-coherence.rs
+++ b/tests/ui/coherence/strict-coherence-needs-negative-coherence.rs
diff --git a/src/test/ui/coherence/strict-coherence-needs-negative-coherence.stderr b/tests/ui/coherence/strict-coherence-needs-negative-coherence.stderr
index b54729287..b54729287 100644
--- a/src/test/ui/coherence/strict-coherence-needs-negative-coherence.stderr
+++ b/tests/ui/coherence/strict-coherence-needs-negative-coherence.stderr
diff --git a/src/test/ui/command-line-diagnostics.rs b/tests/ui/command-line-diagnostics.rs
index 248fb83a3..248fb83a3 100644
--- a/src/test/ui/command-line-diagnostics.rs
+++ b/tests/ui/command-line-diagnostics.rs
diff --git a/src/test/ui/command-line-diagnostics.stderr b/tests/ui/command-line-diagnostics.stderr
index 6223ad880..6223ad880 100644
--- a/src/test/ui/command-line-diagnostics.stderr
+++ b/tests/ui/command-line-diagnostics.stderr
diff --git a/src/test/ui/command/command-argv0.rs b/tests/ui/command/command-argv0.rs
index b782a4fd3..b782a4fd3 100644
--- a/src/test/ui/command/command-argv0.rs
+++ b/tests/ui/command/command-argv0.rs
diff --git a/src/test/ui/command/command-create-pidfd.rs b/tests/ui/command/command-create-pidfd.rs
index 4df443c66..4df443c66 100644
--- a/src/test/ui/command/command-create-pidfd.rs
+++ b/tests/ui/command/command-create-pidfd.rs
diff --git a/src/test/ui/command/command-current-dir.rs b/tests/ui/command/command-current-dir.rs
index 5d06fcdeb..5d06fcdeb 100644
--- a/src/test/ui/command/command-current-dir.rs
+++ b/tests/ui/command/command-current-dir.rs
diff --git a/src/test/ui/command/command-exec.rs b/tests/ui/command/command-exec.rs
index 032dad184..032dad184 100644
--- a/src/test/ui/command/command-exec.rs
+++ b/tests/ui/command/command-exec.rs
diff --git a/src/test/ui/command/command-pre-exec.rs b/tests/ui/command/command-pre-exec.rs
index d366c5ffb..d366c5ffb 100644
--- a/src/test/ui/command/command-pre-exec.rs
+++ b/tests/ui/command/command-pre-exec.rs
diff --git a/src/test/ui/command/command-setgroups.rs b/tests/ui/command/command-setgroups.rs
index aff67f91b..aff67f91b 100644
--- a/src/test/ui/command/command-setgroups.rs
+++ b/tests/ui/command/command-setgroups.rs
diff --git a/src/test/ui/command/command-uid-gid.rs b/tests/ui/command/command-uid-gid.rs
index aa4e2f5b8..aa4e2f5b8 100644
--- a/src/test/ui/command/command-uid-gid.rs
+++ b/tests/ui/command/command-uid-gid.rs
diff --git a/src/test/ui/issues/issue-10626.rs b/tests/ui/command/issue-10626.rs
index 696a2dd16..696a2dd16 100644
--- a/src/test/ui/issues/issue-10626.rs
+++ b/tests/ui/command/issue-10626.rs
diff --git a/src/test/ui/commandline-argfile-badutf8.args b/tests/ui/commandline-argfile-badutf8.args
index c070b0c24..c070b0c24 100644
--- a/src/test/ui/commandline-argfile-badutf8.args
+++ b/tests/ui/commandline-argfile-badutf8.args
diff --git a/src/test/ui/commandline-argfile-badutf8.rs b/tests/ui/commandline-argfile-badutf8.rs
index e2984e3ca..e2984e3ca 100644
--- a/src/test/ui/commandline-argfile-badutf8.rs
+++ b/tests/ui/commandline-argfile-badutf8.rs
diff --git a/src/test/ui/commandline-argfile-badutf8.stderr b/tests/ui/commandline-argfile-badutf8.stderr
index 9af6fc0a5..9af6fc0a5 100644
--- a/src/test/ui/commandline-argfile-badutf8.stderr
+++ b/tests/ui/commandline-argfile-badutf8.stderr
diff --git a/src/test/ui/commandline-argfile-missing.rs b/tests/ui/commandline-argfile-missing.rs
index 5a6465bd0..5a6465bd0 100644
--- a/src/test/ui/commandline-argfile-missing.rs
+++ b/tests/ui/commandline-argfile-missing.rs
diff --git a/src/test/ui/commandline-argfile-missing.stderr b/tests/ui/commandline-argfile-missing.stderr
index 179ad8310..179ad8310 100644
--- a/src/test/ui/commandline-argfile-missing.stderr
+++ b/tests/ui/commandline-argfile-missing.stderr
diff --git a/src/test/ui/commandline-argfile.args b/tests/ui/commandline-argfile.args
index 972938bf6..972938bf6 100644
--- a/src/test/ui/commandline-argfile.args
+++ b/tests/ui/commandline-argfile.args
diff --git a/src/test/ui/commandline-argfile.rs b/tests/ui/commandline-argfile.rs
index fc1ba0c8d..fc1ba0c8d 100644
--- a/src/test/ui/commandline-argfile.rs
+++ b/tests/ui/commandline-argfile.rs
diff --git a/src/test/ui/compare-method/bad-self-type.rs b/tests/ui/compare-method/bad-self-type.rs
index f42a9e49a..f42a9e49a 100644
--- a/src/test/ui/compare-method/bad-self-type.rs
+++ b/tests/ui/compare-method/bad-self-type.rs
diff --git a/src/test/ui/compare-method/bad-self-type.stderr b/tests/ui/compare-method/bad-self-type.stderr
index 90e907157..cad942e64 100644
--- a/src/test/ui/compare-method/bad-self-type.stderr
+++ b/tests/ui/compare-method/bad-self-type.stderr
@@ -7,8 +7,8 @@ LL |     fn poll(self, _: &mut Context<'_>) -> Poll<()> {
    |             expected struct `Pin`, found struct `MyFuture`
    |             help: change the self-receiver type to match the trait: `self: Pin<&mut MyFuture>`
    |
-   = note: expected fn pointer `fn(Pin<&mut MyFuture>, &mut Context<'_>) -> Poll<_>`
-              found fn pointer `fn(MyFuture, &mut Context<'_>) -> Poll<_>`
+   = note: expected signature `fn(Pin<&mut MyFuture>, &mut Context<'_>) -> Poll<_>`
+              found signature `fn(MyFuture, &mut Context<'_>) -> Poll<_>`
 
 error[E0053]: method `foo` has an incompatible type for trait
   --> $DIR/bad-self-type.rs:22:18
@@ -24,8 +24,8 @@ note: type in trait
    |
 LL |     fn foo(self);
    |            ^^^^
-   = note: expected fn pointer `fn(MyFuture)`
-              found fn pointer `fn(Box<MyFuture>)`
+   = note: expected signature `fn(MyFuture)`
+              found signature `fn(Box<MyFuture>)`
 
 error[E0053]: method `bar` has an incompatible type for trait
   --> $DIR/bad-self-type.rs:24:18
@@ -38,8 +38,8 @@ note: type in trait
    |
 LL |     fn bar(self) -> Option<()>;
    |                     ^^^^^^^^^^
-   = note: expected fn pointer `fn(MyFuture) -> Option<()>`
-              found fn pointer `fn(MyFuture)`
+   = note: expected signature `fn(MyFuture) -> Option<()>`
+              found signature `fn(MyFuture)`
 help: change the output type to match the trait
    |
 LL |     fn bar(self) -> Option<()> {}
diff --git a/src/test/ui/compare-method/issue-90444.rs b/tests/ui/compare-method/issue-90444.rs
index 6c287d9a7..6c287d9a7 100644
--- a/src/test/ui/compare-method/issue-90444.rs
+++ b/tests/ui/compare-method/issue-90444.rs
diff --git a/src/test/ui/compare-method/issue-90444.stderr b/tests/ui/compare-method/issue-90444.stderr
index ee63f34b7..52e23d03b 100644
--- a/src/test/ui/compare-method/issue-90444.stderr
+++ b/tests/ui/compare-method/issue-90444.stderr
@@ -7,8 +7,8 @@ LL |     fn from(_: fn((), (), &mut ())) -> Self {
    |                types differ in mutability
    |                help: change the parameter type to match the trait: `for<'a> fn((), (), &'a ())`
    |
-   = note: expected fn pointer `fn(for<'a> fn((), (), &'a ())) -> A`
-              found fn pointer `fn(for<'a> fn((), (), &'a mut ())) -> A`
+   = note: expected signature `fn(for<'a> fn((), (), &'a ())) -> A`
+              found signature `fn(for<'a> fn((), (), &'a mut ())) -> A`
 
 error[E0053]: method `from` has an incompatible type for trait
   --> $DIR/issue-90444.rs:11:16
@@ -19,8 +19,8 @@ LL |     fn from(_: fn((), (), u64)) -> Self {
    |                expected `u32`, found `u64`
    |                help: change the parameter type to match the trait: `fn((), (), u32)`
    |
-   = note: expected fn pointer `fn(fn((), (), u32)) -> B`
-              found fn pointer `fn(fn((), (), u64)) -> B`
+   = note: expected signature `fn(fn((), (), u32)) -> B`
+              found signature `fn(fn((), (), u64)) -> B`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/compare-method/proj-outlives-region.rs b/tests/ui/compare-method/proj-outlives-region.rs
index 969bc566d..969bc566d 100644
--- a/src/test/ui/compare-method/proj-outlives-region.rs
+++ b/tests/ui/compare-method/proj-outlives-region.rs
diff --git a/src/test/ui/compare-method/proj-outlives-region.stderr b/tests/ui/compare-method/proj-outlives-region.stderr
index 797a81679..797a81679 100644
--- a/src/test/ui/compare-method/proj-outlives-region.stderr
+++ b/tests/ui/compare-method/proj-outlives-region.stderr
diff --git a/src/test/ui/compare-method/region-extra-2.rs b/tests/ui/compare-method/region-extra-2.rs
index 3d57b544e..3d57b544e 100644
--- a/src/test/ui/compare-method/region-extra-2.rs
+++ b/tests/ui/compare-method/region-extra-2.rs
diff --git a/tests/ui/compare-method/region-extra-2.stderr b/tests/ui/compare-method/region-extra-2.stderr
new file mode 100644
index 000000000..eb19d57ab
--- /dev/null
+++ b/tests/ui/compare-method/region-extra-2.stderr
@@ -0,0 +1,17 @@
+error[E0276]: impl has stricter requirements than trait
+  --> $DIR/region-extra-2.rs:9:53
+   |
+LL |     fn renew<'b: 'a>(self) -> &'b mut [T];
+   |     -------------------------------------- definition of `renew` from trait
+...
+LL |     fn renew<'b: 'a>(self) -> &'b mut [T] where 'a: 'b {
+   |                                                     ^^ impl has extra requirement `'a: 'b`
+   |
+help: copy the `where` clause predicates from the trait
+   |
+LL |     fn renew<'b: 'a>(self) -> &'b mut [T] where 'b: 'a {
+   |                                           ~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0276`.
diff --git a/src/test/ui/compare-method/region-extra.rs b/tests/ui/compare-method/region-extra.rs
index 1070cb845..1070cb845 100644
--- a/src/test/ui/compare-method/region-extra.rs
+++ b/tests/ui/compare-method/region-extra.rs
diff --git a/src/test/ui/compare-method/region-extra.stderr b/tests/ui/compare-method/region-extra.stderr
index 4a3af65e9..1a471e18d 100644
--- a/src/test/ui/compare-method/region-extra.stderr
+++ b/tests/ui/compare-method/region-extra.stderr
@@ -6,6 +6,12 @@ LL |     fn foo();
 ...
 LL |     fn foo() where 'a: 'b { }
    |                        ^^ impl has extra requirement `'a: 'b`
+   |
+help: remove the `where` clause
+   |
+LL -     fn foo() where 'a: 'b { }
+LL +     fn foo()  { }
+   |
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/compare-method/region-unrelated.rs b/tests/ui/compare-method/region-unrelated.rs
index 9730c9dfe..9730c9dfe 100644
--- a/src/test/ui/compare-method/region-unrelated.rs
+++ b/tests/ui/compare-method/region-unrelated.rs
diff --git a/src/test/ui/compare-method/region-unrelated.stderr b/tests/ui/compare-method/region-unrelated.stderr
index f7ae6f944..f7ae6f944 100644
--- a/src/test/ui/compare-method/region-unrelated.stderr
+++ b/tests/ui/compare-method/region-unrelated.stderr
diff --git a/src/test/ui/compare-method/reordered-type-param.rs b/tests/ui/compare-method/reordered-type-param.rs
index a858b66d7..a858b66d7 100644
--- a/src/test/ui/compare-method/reordered-type-param.rs
+++ b/tests/ui/compare-method/reordered-type-param.rs
diff --git a/src/test/ui/compare-method/reordered-type-param.stderr b/tests/ui/compare-method/reordered-type-param.stderr
index 49b5b1b92..1552d542d 100644
--- a/src/test/ui/compare-method/reordered-type-param.stderr
+++ b/tests/ui/compare-method/reordered-type-param.stderr
@@ -14,8 +14,8 @@ note: type in trait
    |
 LL |   fn b<C:Clone,D>(&self, x: C) -> C;
    |                             ^
-   = note: expected fn pointer `fn(&E, F) -> F`
-              found fn pointer `fn(&E, G) -> G`
+   = note: expected signature `fn(&E, F) -> F`
+              found signature `fn(&E, G) -> G`
    = note: a type parameter was expected, but a different one was found; you might be missing a type parameter or trait bound
    = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
 
diff --git a/src/test/ui/compare-method/trait-bound-on-type-parameter.rs b/tests/ui/compare-method/trait-bound-on-type-parameter.rs
index 5359001ea..5359001ea 100644
--- a/src/test/ui/compare-method/trait-bound-on-type-parameter.rs
+++ b/tests/ui/compare-method/trait-bound-on-type-parameter.rs
diff --git a/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr b/tests/ui/compare-method/trait-bound-on-type-parameter.stderr
index ce6885c15..ce6885c15 100644
--- a/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr
+++ b/tests/ui/compare-method/trait-bound-on-type-parameter.stderr
diff --git a/src/test/ui/compare-method/traits-misc-mismatch-1.rs b/tests/ui/compare-method/traits-misc-mismatch-1.rs
index 0da4aba30..0da4aba30 100644
--- a/src/test/ui/compare-method/traits-misc-mismatch-1.rs
+++ b/tests/ui/compare-method/traits-misc-mismatch-1.rs
diff --git a/src/test/ui/compare-method/traits-misc-mismatch-1.stderr b/tests/ui/compare-method/traits-misc-mismatch-1.stderr
index 805c04536..805c04536 100644
--- a/src/test/ui/compare-method/traits-misc-mismatch-1.stderr
+++ b/tests/ui/compare-method/traits-misc-mismatch-1.stderr
diff --git a/src/test/ui/compare-method/traits-misc-mismatch-2.rs b/tests/ui/compare-method/traits-misc-mismatch-2.rs
index d7f31c1d9..d7f31c1d9 100644
--- a/src/test/ui/compare-method/traits-misc-mismatch-2.rs
+++ b/tests/ui/compare-method/traits-misc-mismatch-2.rs
diff --git a/src/test/ui/compare-method/traits-misc-mismatch-2.stderr b/tests/ui/compare-method/traits-misc-mismatch-2.stderr
index 36bb764d4..36bb764d4 100644
--- a/src/test/ui/compare-method/traits-misc-mismatch-2.stderr
+++ b/tests/ui/compare-method/traits-misc-mismatch-2.stderr
diff --git a/src/test/ui/compile_error_macro.rs b/tests/ui/compile_error_macro.rs
index 3f7b57cd0..3f7b57cd0 100644
--- a/src/test/ui/compile_error_macro.rs
+++ b/tests/ui/compile_error_macro.rs
diff --git a/src/test/ui/compile_error_macro.stderr b/tests/ui/compile_error_macro.stderr
index 91ebcaa6e..91ebcaa6e 100644
--- a/src/test/ui/compile_error_macro.stderr
+++ b/tests/ui/compile_error_macro.stderr
diff --git a/src/test/ui/compiletest-self-test/compile-flags-last.rs b/tests/ui/compiletest-self-test/compile-flags-last.rs
index 232df10f1..232df10f1 100644
--- a/src/test/ui/compiletest-self-test/compile-flags-last.rs
+++ b/tests/ui/compiletest-self-test/compile-flags-last.rs
diff --git a/src/test/ui/compiletest-self-test/compile-flags-last.stderr b/tests/ui/compiletest-self-test/compile-flags-last.stderr
index d8d40a7d9..d8d40a7d9 100644
--- a/src/test/ui/compiletest-self-test/compile-flags-last.stderr
+++ b/tests/ui/compiletest-self-test/compile-flags-last.stderr
diff --git a/src/test/ui/compiletest-self-test/ui-testing-optout.rs b/tests/ui/compiletest-self-test/ui-testing-optout.rs
index 88e811583..88e811583 100644
--- a/src/test/ui/compiletest-self-test/ui-testing-optout.rs
+++ b/tests/ui/compiletest-self-test/ui-testing-optout.rs
diff --git a/src/test/ui/compiletest-self-test/ui-testing-optout.stderr b/tests/ui/compiletest-self-test/ui-testing-optout.stderr
index 652c472c0..652c472c0 100644
--- a/src/test/ui/compiletest-self-test/ui-testing-optout.stderr
+++ b/tests/ui/compiletest-self-test/ui-testing-optout.stderr
diff --git a/src/test/ui/complex.rs b/tests/ui/complex.rs
index 9b11ca67e..9b11ca67e 100644
--- a/src/test/ui/complex.rs
+++ b/tests/ui/complex.rs
diff --git a/src/test/ui/conditional-compilation/auxiliary/namespaced_enums.rs b/tests/ui/conditional-compilation/auxiliary/namespaced_enums.rs
index d3548c76c..d3548c76c 100644
--- a/src/test/ui/conditional-compilation/auxiliary/namespaced_enums.rs
+++ b/tests/ui/conditional-compilation/auxiliary/namespaced_enums.rs
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-1.rs b/tests/ui/conditional-compilation/cfg-arg-invalid-1.rs
index d20e79b9d..d20e79b9d 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-1.rs
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-1.rs
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-1.stderr b/tests/ui/conditional-compilation/cfg-arg-invalid-1.stderr
index 3a12e9786..3a12e9786 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-1.stderr
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-1.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-2.rs b/tests/ui/conditional-compilation/cfg-arg-invalid-2.rs
index 48d656a4a..48d656a4a 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-2.rs
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-2.rs
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-2.stderr b/tests/ui/conditional-compilation/cfg-arg-invalid-2.stderr
index b92e1fd3d..b92e1fd3d 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-2.stderr
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-2.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-3.rs b/tests/ui/conditional-compilation/cfg-arg-invalid-3.rs
index 96ac7828c..96ac7828c 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-3.rs
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-3.rs
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-3.stderr b/tests/ui/conditional-compilation/cfg-arg-invalid-3.stderr
index 5412f7ffd..5412f7ffd 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-3.stderr
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-3.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-4.rs b/tests/ui/conditional-compilation/cfg-arg-invalid-4.rs
index e7dfa17b4..e7dfa17b4 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-4.rs
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-4.rs
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-4.stderr b/tests/ui/conditional-compilation/cfg-arg-invalid-4.stderr
index 6853a69b9..6853a69b9 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-4.stderr
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-4.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-5.rs b/tests/ui/conditional-compilation/cfg-arg-invalid-5.rs
index a939f4510..a939f4510 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-5.rs
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-5.rs
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-5.stderr b/tests/ui/conditional-compilation/cfg-arg-invalid-5.stderr
index aafc4e898..aafc4e898 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-5.stderr
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-5.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-6.rs b/tests/ui/conditional-compilation/cfg-arg-invalid-6.rs
index 9fa726f93..9fa726f93 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-6.rs
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-6.rs
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-6.stderr b/tests/ui/conditional-compilation/cfg-arg-invalid-6.stderr
index 7d2087b4b..7d2087b4b 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-6.stderr
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-6.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-7.rs b/tests/ui/conditional-compilation/cfg-arg-invalid-7.rs
index 149142f63..149142f63 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-7.rs
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-7.rs
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-7.stderr b/tests/ui/conditional-compilation/cfg-arg-invalid-7.stderr
index 919709c84..919709c84 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-7.stderr
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-7.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-8.rs b/tests/ui/conditional-compilation/cfg-arg-invalid-8.rs
index 1d7fa7885..1d7fa7885 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-8.rs
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-8.rs
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-8.stderr b/tests/ui/conditional-compilation/cfg-arg-invalid-8.stderr
index 7bb181412..7bb181412 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-8.stderr
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-8.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-9.rs b/tests/ui/conditional-compilation/cfg-arg-invalid-9.rs
index 628b335c8..628b335c8 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-9.rs
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-9.rs
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-9.stderr b/tests/ui/conditional-compilation/cfg-arg-invalid-9.stderr
index 985b52522..985b52522 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-9.stderr
+++ b/tests/ui/conditional-compilation/cfg-arg-invalid-9.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-attr-cfg-2.rs b/tests/ui/conditional-compilation/cfg-attr-cfg-2.rs
index 898c5bac8..898c5bac8 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-cfg-2.rs
+++ b/tests/ui/conditional-compilation/cfg-attr-cfg-2.rs
diff --git a/src/test/ui/conditional-compilation/cfg-attr-cfg-2.stderr b/tests/ui/conditional-compilation/cfg-attr-cfg-2.stderr
index d61872c48..d61872c48 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-cfg-2.stderr
+++ b/tests/ui/conditional-compilation/cfg-attr-cfg-2.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-attr-crate-2.rs b/tests/ui/conditional-compilation/cfg-attr-crate-2.rs
index 7dbeba53a..7dbeba53a 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-crate-2.rs
+++ b/tests/ui/conditional-compilation/cfg-attr-crate-2.rs
diff --git a/src/test/ui/conditional-compilation/cfg-attr-crate-2.stderr b/tests/ui/conditional-compilation/cfg-attr-crate-2.stderr
index 4997ca4db..4997ca4db 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-crate-2.stderr
+++ b/tests/ui/conditional-compilation/cfg-attr-crate-2.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-attr-empty-is-unused.rs b/tests/ui/conditional-compilation/cfg-attr-empty-is-unused.rs
index 2600ec7c4..2600ec7c4 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-empty-is-unused.rs
+++ b/tests/ui/conditional-compilation/cfg-attr-empty-is-unused.rs
diff --git a/src/test/ui/conditional-compilation/cfg-attr-empty-is-unused.stderr b/tests/ui/conditional-compilation/cfg-attr-empty-is-unused.stderr
index 87b698813..87b698813 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-empty-is-unused.stderr
+++ b/tests/ui/conditional-compilation/cfg-attr-empty-is-unused.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-attr-invalid-predicate.rs b/tests/ui/conditional-compilation/cfg-attr-invalid-predicate.rs
index 496d196c9..496d196c9 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-invalid-predicate.rs
+++ b/tests/ui/conditional-compilation/cfg-attr-invalid-predicate.rs
diff --git a/src/test/ui/conditional-compilation/cfg-attr-invalid-predicate.stderr b/tests/ui/conditional-compilation/cfg-attr-invalid-predicate.stderr
index 96c571ebe..96c571ebe 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-invalid-predicate.stderr
+++ b/tests/ui/conditional-compilation/cfg-attr-invalid-predicate.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-false.rs b/tests/ui/conditional-compilation/cfg-attr-multi-false.rs
index 0c7e7cad0..0c7e7cad0 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-false.rs
+++ b/tests/ui/conditional-compilation/cfg-attr-multi-false.rs
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.rs b/tests/ui/conditional-compilation/cfg-attr-multi-invalid-1.rs
index 42ffb71e3..42ffb71e3 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.rs
+++ b/tests/ui/conditional-compilation/cfg-attr-multi-invalid-1.rs
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.stderr b/tests/ui/conditional-compilation/cfg-attr-multi-invalid-1.stderr
index c8762d15d..c8762d15d 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.stderr
+++ b/tests/ui/conditional-compilation/cfg-attr-multi-invalid-1.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.rs b/tests/ui/conditional-compilation/cfg-attr-multi-invalid-2.rs
index 29690e284..29690e284 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.rs
+++ b/tests/ui/conditional-compilation/cfg-attr-multi-invalid-2.rs
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.stderr b/tests/ui/conditional-compilation/cfg-attr-multi-invalid-2.stderr
index e75b1c5b4..e75b1c5b4 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.stderr
+++ b/tests/ui/conditional-compilation/cfg-attr-multi-invalid-2.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-true.rs b/tests/ui/conditional-compilation/cfg-attr-multi-true.rs
index 876d8b079..876d8b079 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-true.rs
+++ b/tests/ui/conditional-compilation/cfg-attr-multi-true.rs
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr b/tests/ui/conditional-compilation/cfg-attr-multi-true.stderr
index fbfcd4565..fbfcd4565 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
+++ b/tests/ui/conditional-compilation/cfg-attr-multi-true.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-attr-parse.rs b/tests/ui/conditional-compilation/cfg-attr-parse.rs
index 8ca31c118..8ca31c118 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-parse.rs
+++ b/tests/ui/conditional-compilation/cfg-attr-parse.rs
diff --git a/src/test/ui/conditional-compilation/cfg-attr-parse.stderr b/tests/ui/conditional-compilation/cfg-attr-parse.stderr
index 8084a6220..8084a6220 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-parse.stderr
+++ b/tests/ui/conditional-compilation/cfg-attr-parse.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-attr-syntax-validation.rs b/tests/ui/conditional-compilation/cfg-attr-syntax-validation.rs
index 408eaffcc..408eaffcc 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-syntax-validation.rs
+++ b/tests/ui/conditional-compilation/cfg-attr-syntax-validation.rs
diff --git a/src/test/ui/conditional-compilation/cfg-attr-syntax-validation.stderr b/tests/ui/conditional-compilation/cfg-attr-syntax-validation.stderr
index d4bd673b8..d5b4349c0 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-syntax-validation.stderr
+++ b/tests/ui/conditional-compilation/cfg-attr-syntax-validation.stderr
@@ -14,7 +14,7 @@ error: `cfg` predicate is not specified
   --> $DIR/cfg-attr-syntax-validation.rs:7:1
    |
 LL | #[cfg()]
-   | ^^^^^^^^
+   | ^^^^^^^^ help: expected syntax is: `cfg(/* predicate */)`
 
 error: multiple `cfg` predicates are specified
   --> $DIR/cfg-attr-syntax-validation.rs:10:10
diff --git a/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.rs b/tests/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.rs
index 45b757e92..45b757e92 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.rs
+++ b/tests/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.rs
diff --git a/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr b/tests/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr
index fc8df6552..fc8df6552 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr
+++ b/tests/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-empty-codemap.rs b/tests/ui/conditional-compilation/cfg-empty-codemap.rs
index 9e34cacf7..9e34cacf7 100644
--- a/src/test/ui/conditional-compilation/cfg-empty-codemap.rs
+++ b/tests/ui/conditional-compilation/cfg-empty-codemap.rs
diff --git a/src/test/ui/conditional-compilation/cfg-empty-codemap.stderr b/tests/ui/conditional-compilation/cfg-empty-codemap.stderr
index 128e3cd73..128e3cd73 100644
--- a/src/test/ui/conditional-compilation/cfg-empty-codemap.stderr
+++ b/tests/ui/conditional-compilation/cfg-empty-codemap.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-generic-params.rs b/tests/ui/conditional-compilation/cfg-generic-params.rs
index 53aa35563..53aa35563 100644
--- a/src/test/ui/conditional-compilation/cfg-generic-params.rs
+++ b/tests/ui/conditional-compilation/cfg-generic-params.rs
diff --git a/src/test/ui/conditional-compilation/cfg-generic-params.stderr b/tests/ui/conditional-compilation/cfg-generic-params.stderr
index 4d6560e96..4d6560e96 100644
--- a/src/test/ui/conditional-compilation/cfg-generic-params.stderr
+++ b/tests/ui/conditional-compilation/cfg-generic-params.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-in-crate-1.rs b/tests/ui/conditional-compilation/cfg-in-crate-1.rs
index 8561cd830..8561cd830 100644
--- a/src/test/ui/conditional-compilation/cfg-in-crate-1.rs
+++ b/tests/ui/conditional-compilation/cfg-in-crate-1.rs
diff --git a/src/test/ui/conditional-compilation/cfg-in-crate-1.stderr b/tests/ui/conditional-compilation/cfg-in-crate-1.stderr
index ff72c43ef..ff72c43ef 100644
--- a/src/test/ui/conditional-compilation/cfg-in-crate-1.stderr
+++ b/tests/ui/conditional-compilation/cfg-in-crate-1.stderr
diff --git a/src/test/ui/conditional-compilation/cfg-non-opt-expr.rs b/tests/ui/conditional-compilation/cfg-non-opt-expr.rs
index 0ddbd8a15..0ddbd8a15 100644
--- a/src/test/ui/conditional-compilation/cfg-non-opt-expr.rs
+++ b/tests/ui/conditional-compilation/cfg-non-opt-expr.rs
diff --git a/src/test/ui/conditional-compilation/cfg-non-opt-expr.stderr b/tests/ui/conditional-compilation/cfg-non-opt-expr.stderr
index 933b7dc18..933b7dc18 100644
--- a/src/test/ui/conditional-compilation/cfg-non-opt-expr.stderr
+++ b/tests/ui/conditional-compilation/cfg-non-opt-expr.stderr
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-bugs.rs b/tests/ui/conditional-compilation/cfg_accessible-bugs.rs
index ae18bc55c..ae18bc55c 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible-bugs.rs
+++ b/tests/ui/conditional-compilation/cfg_accessible-bugs.rs
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-bugs.stderr b/tests/ui/conditional-compilation/cfg_accessible-bugs.stderr
index 81f023878..81f023878 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible-bugs.stderr
+++ b/tests/ui/conditional-compilation/cfg_accessible-bugs.stderr
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-input-validation.rs b/tests/ui/conditional-compilation/cfg_accessible-input-validation.rs
index c51c908a4..c51c908a4 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible-input-validation.rs
+++ b/tests/ui/conditional-compilation/cfg_accessible-input-validation.rs
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-input-validation.stderr b/tests/ui/conditional-compilation/cfg_accessible-input-validation.stderr
index 86706c766..86706c766 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible-input-validation.stderr
+++ b/tests/ui/conditional-compilation/cfg_accessible-input-validation.stderr
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-not_sure.edition2015.stderr b/tests/ui/conditional-compilation/cfg_accessible-not_sure.edition2015.stderr
index 7d5dd5890..7d5dd5890 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible-not_sure.edition2015.stderr
+++ b/tests/ui/conditional-compilation/cfg_accessible-not_sure.edition2015.stderr
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-not_sure.edition2021.stderr b/tests/ui/conditional-compilation/cfg_accessible-not_sure.edition2021.stderr
index 7d5dd5890..7d5dd5890 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible-not_sure.edition2021.stderr
+++ b/tests/ui/conditional-compilation/cfg_accessible-not_sure.edition2021.stderr
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-not_sure.rs b/tests/ui/conditional-compilation/cfg_accessible-not_sure.rs
index 99a7949db..99a7949db 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible-not_sure.rs
+++ b/tests/ui/conditional-compilation/cfg_accessible-not_sure.rs
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-private.rs b/tests/ui/conditional-compilation/cfg_accessible-private.rs
index 5b095675c..5b095675c 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible-private.rs
+++ b/tests/ui/conditional-compilation/cfg_accessible-private.rs
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-stuck.rs b/tests/ui/conditional-compilation/cfg_accessible-stuck.rs
index 50504a44c..50504a44c 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible-stuck.rs
+++ b/tests/ui/conditional-compilation/cfg_accessible-stuck.rs
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-stuck.stderr b/tests/ui/conditional-compilation/cfg_accessible-stuck.stderr
index 33af7d625..33af7d625 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible-stuck.stderr
+++ b/tests/ui/conditional-compilation/cfg_accessible-stuck.stderr
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-unstable.rs b/tests/ui/conditional-compilation/cfg_accessible-unstable.rs
index e9247e67a..e9247e67a 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible-unstable.rs
+++ b/tests/ui/conditional-compilation/cfg_accessible-unstable.rs
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-unstable.stderr b/tests/ui/conditional-compilation/cfg_accessible-unstable.stderr
index 2f55b9559..2f55b9559 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible-unstable.stderr
+++ b/tests/ui/conditional-compilation/cfg_accessible-unstable.stderr
diff --git a/src/test/ui/conditional-compilation/cfg_accessible.rs b/tests/ui/conditional-compilation/cfg_accessible.rs
index df380d0d1..df380d0d1 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible.rs
+++ b/tests/ui/conditional-compilation/cfg_accessible.rs
diff --git a/src/test/ui/conditional-compilation/cfg_accessible.stderr b/tests/ui/conditional-compilation/cfg_accessible.stderr
index e3731a1ad..e3731a1ad 100644
--- a/src/test/ui/conditional-compilation/cfg_accessible.stderr
+++ b/tests/ui/conditional-compilation/cfg_accessible.stderr
diff --git a/src/test/ui/conditional-compilation/cfg_attr_path.rs b/tests/ui/conditional-compilation/cfg_attr_path.rs
index efb718b78..efb718b78 100644
--- a/src/test/ui/conditional-compilation/cfg_attr_path.rs
+++ b/tests/ui/conditional-compilation/cfg_attr_path.rs
diff --git a/src/test/ui/conditional-compilation/inner-cfg-non-inline-mod.rs b/tests/ui/conditional-compilation/inner-cfg-non-inline-mod.rs
index af5a6462e..af5a6462e 100644
--- a/src/test/ui/conditional-compilation/inner-cfg-non-inline-mod.rs
+++ b/tests/ui/conditional-compilation/inner-cfg-non-inline-mod.rs
diff --git a/src/test/ui/conditional-compilation/issue-34028.rs b/tests/ui/conditional-compilation/issue-34028.rs
index d761c0c82..d761c0c82 100644
--- a/src/test/ui/conditional-compilation/issue-34028.rs
+++ b/tests/ui/conditional-compilation/issue-34028.rs
diff --git a/src/test/ui/conditional-compilation/module_with_cfg.rs b/tests/ui/conditional-compilation/module_with_cfg.rs
index 56c4baadf..56c4baadf 100644
--- a/src/test/ui/conditional-compilation/module_with_cfg.rs
+++ b/tests/ui/conditional-compilation/module_with_cfg.rs
diff --git a/src/test/ui/conditional-compilation/test-cfg.rs b/tests/ui/conditional-compilation/test-cfg.rs
index 8750bae00..8750bae00 100644
--- a/src/test/ui/conditional-compilation/test-cfg.rs
+++ b/tests/ui/conditional-compilation/test-cfg.rs
diff --git a/src/test/ui/conditional-compilation/test-cfg.stderr b/tests/ui/conditional-compilation/test-cfg.stderr
index c35fe2f94..c35fe2f94 100644
--- a/src/test/ui/conditional-compilation/test-cfg.stderr
+++ b/tests/ui/conditional-compilation/test-cfg.stderr
diff --git a/src/test/ui/conflicting-repr-hints.rs b/tests/ui/conflicting-repr-hints.rs
index ed82b6a74..ed82b6a74 100644
--- a/src/test/ui/conflicting-repr-hints.rs
+++ b/tests/ui/conflicting-repr-hints.rs
diff --git a/src/test/ui/conflicting-repr-hints.stderr b/tests/ui/conflicting-repr-hints.stderr
index 4dcd8f4fc..4dcd8f4fc 100644
--- a/src/test/ui/conflicting-repr-hints.stderr
+++ b/tests/ui/conflicting-repr-hints.stderr
diff --git a/src/test/ui/confuse-field-and-method/issue-18343.rs b/tests/ui/confuse-field-and-method/issue-18343.rs
index bc2d73fae..bc2d73fae 100644
--- a/src/test/ui/confuse-field-and-method/issue-18343.rs
+++ b/tests/ui/confuse-field-and-method/issue-18343.rs
diff --git a/src/test/ui/confuse-field-and-method/issue-18343.stderr b/tests/ui/confuse-field-and-method/issue-18343.stderr
index 1c9a6847c..1c9a6847c 100644
--- a/src/test/ui/confuse-field-and-method/issue-18343.stderr
+++ b/tests/ui/confuse-field-and-method/issue-18343.stderr
diff --git a/src/test/ui/confuse-field-and-method/issue-2392.rs b/tests/ui/confuse-field-and-method/issue-2392.rs
index 8aef091fe..8aef091fe 100644
--- a/src/test/ui/confuse-field-and-method/issue-2392.rs
+++ b/tests/ui/confuse-field-and-method/issue-2392.rs
diff --git a/src/test/ui/confuse-field-and-method/issue-2392.stderr b/tests/ui/confuse-field-and-method/issue-2392.stderr
index 440fbb27c..440fbb27c 100644
--- a/src/test/ui/confuse-field-and-method/issue-2392.stderr
+++ b/tests/ui/confuse-field-and-method/issue-2392.stderr
diff --git a/src/test/ui/confuse-field-and-method/issue-32128.rs b/tests/ui/confuse-field-and-method/issue-32128.rs
index 5a024aa4b..5a024aa4b 100644
--- a/src/test/ui/confuse-field-and-method/issue-32128.rs
+++ b/tests/ui/confuse-field-and-method/issue-32128.rs
diff --git a/src/test/ui/confuse-field-and-method/issue-32128.stderr b/tests/ui/confuse-field-and-method/issue-32128.stderr
index 4b96bce8d..4b96bce8d 100644
--- a/src/test/ui/confuse-field-and-method/issue-32128.stderr
+++ b/tests/ui/confuse-field-and-method/issue-32128.stderr
diff --git a/src/test/ui/confuse-field-and-method/issue-33784.rs b/tests/ui/confuse-field-and-method/issue-33784.rs
index e9bb1f9fb..e9bb1f9fb 100644
--- a/src/test/ui/confuse-field-and-method/issue-33784.rs
+++ b/tests/ui/confuse-field-and-method/issue-33784.rs
diff --git a/src/test/ui/confuse-field-and-method/issue-33784.stderr b/tests/ui/confuse-field-and-method/issue-33784.stderr
index 34debb683..3906d64c9 100644
--- a/src/test/ui/confuse-field-and-method/issue-33784.stderr
+++ b/tests/ui/confuse-field-and-method/issue-33784.stderr
@@ -1,4 +1,4 @@
-error[E0599]: no method named `closure` found for reference `&Obj<[closure@$DIR/issue-33784.rs:25:43: 25:45]>` in the current scope
+error[E0599]: no method named `closure` found for reference `&Obj<[closure@issue-33784.rs:25:43]>` in the current scope
   --> $DIR/issue-33784.rs:27:7
    |
 LL |     p.closure();
@@ -9,7 +9,7 @@ help: to call the function stored in `closure`, surround the field access with p
 LL |     (p.closure)();
    |     +         +
 
-error[E0599]: no method named `fn_ptr` found for reference `&&Obj<[closure@$DIR/issue-33784.rs:25:43: 25:45]>` in the current scope
+error[E0599]: no method named `fn_ptr` found for reference `&&Obj<[closure@issue-33784.rs:25:43]>` in the current scope
   --> $DIR/issue-33784.rs:29:7
    |
 LL |     q.fn_ptr();
diff --git a/src/test/ui/confuse-field-and-method/private-field.rs b/tests/ui/confuse-field-and-method/private-field.rs
index 28b8935ac..28b8935ac 100644
--- a/src/test/ui/confuse-field-and-method/private-field.rs
+++ b/tests/ui/confuse-field-and-method/private-field.rs
diff --git a/src/test/ui/confuse-field-and-method/private-field.stderr b/tests/ui/confuse-field-and-method/private-field.stderr
index 783378f8d..783378f8d 100644
--- a/src/test/ui/confuse-field-and-method/private-field.stderr
+++ b/tests/ui/confuse-field-and-method/private-field.stderr
diff --git a/src/test/ui/conservative_impl_trait.rs b/tests/ui/conservative_impl_trait.rs
index b7f795ead..b7f795ead 100644
--- a/src/test/ui/conservative_impl_trait.rs
+++ b/tests/ui/conservative_impl_trait.rs
diff --git a/src/test/ui/conservative_impl_trait.stderr b/tests/ui/conservative_impl_trait.stderr
index 63a4df242..63a4df242 100644
--- a/src/test/ui/conservative_impl_trait.stderr
+++ b/tests/ui/conservative_impl_trait.stderr
diff --git a/src/test/ui/const-generics/apit-with-const-param.rs b/tests/ui/const-generics/apit-with-const-param.rs
index 2a04dc313..2a04dc313 100644
--- a/src/test/ui/const-generics/apit-with-const-param.rs
+++ b/tests/ui/const-generics/apit-with-const-param.rs
diff --git a/src/test/ui/const-generics/arg-in-pat-1.rs b/tests/ui/const-generics/arg-in-pat-1.rs
index 82555084e..82555084e 100644
--- a/src/test/ui/const-generics/arg-in-pat-1.rs
+++ b/tests/ui/const-generics/arg-in-pat-1.rs
diff --git a/src/test/ui/const-generics/arg-in-pat-2.rs b/tests/ui/const-generics/arg-in-pat-2.rs
index dc9e722ed..dc9e722ed 100644
--- a/src/test/ui/const-generics/arg-in-pat-2.rs
+++ b/tests/ui/const-generics/arg-in-pat-2.rs
diff --git a/src/test/ui/const-generics/arg-in-pat-3.rs b/tests/ui/const-generics/arg-in-pat-3.rs
index 24626a3b6..24626a3b6 100644
--- a/src/test/ui/const-generics/arg-in-pat-3.rs
+++ b/tests/ui/const-generics/arg-in-pat-3.rs
diff --git a/src/test/ui/const-generics/argument_order.rs b/tests/ui/const-generics/argument_order.rs
index 196d9b8a1..196d9b8a1 100644
--- a/src/test/ui/const-generics/argument_order.rs
+++ b/tests/ui/const-generics/argument_order.rs
diff --git a/src/test/ui/const-generics/argument_order.stderr b/tests/ui/const-generics/argument_order.stderr
index 99122c6f5..99122c6f5 100644
--- a/src/test/ui/const-generics/argument_order.stderr
+++ b/tests/ui/const-generics/argument_order.stderr
diff --git a/src/test/ui/const-generics/array-impls/alloc-traits-impls-length-32.rs b/tests/ui/const-generics/array-impls/alloc-traits-impls-length-32.rs
index b4a083636..b4a083636 100644
--- a/src/test/ui/const-generics/array-impls/alloc-traits-impls-length-32.rs
+++ b/tests/ui/const-generics/array-impls/alloc-traits-impls-length-32.rs
diff --git a/src/test/ui/const-generics/array-impls/alloc-traits-impls-length-33.rs b/tests/ui/const-generics/array-impls/alloc-traits-impls-length-33.rs
index 35df3278a..35df3278a 100644
--- a/src/test/ui/const-generics/array-impls/alloc-traits-impls-length-33.rs
+++ b/tests/ui/const-generics/array-impls/alloc-traits-impls-length-33.rs
diff --git a/src/test/ui/const-generics/array-impls/alloc-types-impls-length-33.rs b/tests/ui/const-generics/array-impls/alloc-types-impls-length-33.rs
index 294b405e0..294b405e0 100644
--- a/src/test/ui/const-generics/array-impls/alloc-types-impls-length-33.rs
+++ b/tests/ui/const-generics/array-impls/alloc-types-impls-length-33.rs
diff --git a/src/test/ui/const-generics/array-impls/core-traits-impls-length-32.rs b/tests/ui/const-generics/array-impls/core-traits-impls-length-32.rs
index 9998bb84c..9998bb84c 100644
--- a/src/test/ui/const-generics/array-impls/core-traits-impls-length-32.rs
+++ b/tests/ui/const-generics/array-impls/core-traits-impls-length-32.rs
diff --git a/src/test/ui/const-generics/array-impls/core-traits-impls-length-33.rs b/tests/ui/const-generics/array-impls/core-traits-impls-length-33.rs
index c609a7c6f..c609a7c6f 100644
--- a/src/test/ui/const-generics/array-impls/core-traits-impls-length-33.rs
+++ b/tests/ui/const-generics/array-impls/core-traits-impls-length-33.rs
diff --git a/src/test/ui/const-generics/array-impls/into-iter-impls-length-32.rs b/tests/ui/const-generics/array-impls/into-iter-impls-length-32.rs
index 457e5ae60..457e5ae60 100644
--- a/src/test/ui/const-generics/array-impls/into-iter-impls-length-32.rs
+++ b/tests/ui/const-generics/array-impls/into-iter-impls-length-32.rs
diff --git a/src/test/ui/const-generics/array-impls/into-iter-impls-length-33.rs b/tests/ui/const-generics/array-impls/into-iter-impls-length-33.rs
index 4f343f3f9..4f343f3f9 100644
--- a/src/test/ui/const-generics/array-impls/into-iter-impls-length-33.rs
+++ b/tests/ui/const-generics/array-impls/into-iter-impls-length-33.rs
diff --git a/src/test/ui/const-generics/array-wrapper-struct-ctor.rs b/tests/ui/const-generics/array-wrapper-struct-ctor.rs
index a712f691d..a712f691d 100644
--- a/src/test/ui/const-generics/array-wrapper-struct-ctor.rs
+++ b/tests/ui/const-generics/array-wrapper-struct-ctor.rs
diff --git a/tests/ui/const-generics/assoc_const_eq_diagnostic.rs b/tests/ui/const-generics/assoc_const_eq_diagnostic.rs
new file mode 100644
index 000000000..4d0aaf88e
--- /dev/null
+++ b/tests/ui/const-generics/assoc_const_eq_diagnostic.rs
@@ -0,0 +1,18 @@
+#![feature(associated_const_equality)]
+
+pub enum Mode {
+    Cool,
+}
+
+pub trait Parse {
+    const MODE: Mode;
+}
+
+pub trait CoolStuff: Parse<MODE = Mode::Cool> {}
+//~^ ERROR expected associated constant bound
+//~| ERROR expected type
+
+fn no_help() -> Mode::Cool {}
+//~^ ERROR expected type, found variant
+
+fn main() {}
diff --git a/tests/ui/const-generics/assoc_const_eq_diagnostic.stderr b/tests/ui/const-generics/assoc_const_eq_diagnostic.stderr
new file mode 100644
index 000000000..ba727ee0e
--- /dev/null
+++ b/tests/ui/const-generics/assoc_const_eq_diagnostic.stderr
@@ -0,0 +1,33 @@
+error[E0573]: expected type, found variant `Mode::Cool`
+  --> $DIR/assoc_const_eq_diagnostic.rs:11:35
+   |
+LL | pub trait CoolStuff: Parse<MODE = Mode::Cool> {}
+   |                                   ^^^^^^^^^^
+   |                                   |
+   |                                   not a type
+   |                                   help: try using the variant's enum: `Mode`
+
+error[E0573]: expected type, found variant `Mode::Cool`
+  --> $DIR/assoc_const_eq_diagnostic.rs:15:17
+   |
+LL | fn no_help() -> Mode::Cool {}
+   |                 ^^^^^^^^^^
+   |                 |
+   |                 not a type
+   |                 help: try using the variant's enum: `Mode`
+
+error: expected associated constant bound, found type
+  --> $DIR/assoc_const_eq_diagnostic.rs:11:28
+   |
+LL | pub trait CoolStuff: Parse<MODE = Mode::Cool> {}
+   |                            ^^^^^^^^^^^^^^^^^ help: if equating a const, try wrapping with braces: `MODE = { const }`
+   |
+note: associated constant defined here
+  --> $DIR/assoc_const_eq_diagnostic.rs:8:5
+   |
+LL |     const MODE: Mode;
+   |     ^^^^^^^^^^^^^^^^
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0573`.
diff --git a/src/test/ui/const-generics/associated-type-bound-fail.rs b/tests/ui/const-generics/associated-type-bound-fail.rs
index 937b8bcb6..937b8bcb6 100644
--- a/src/test/ui/const-generics/associated-type-bound-fail.rs
+++ b/tests/ui/const-generics/associated-type-bound-fail.rs
diff --git a/src/test/ui/const-generics/associated-type-bound-fail.stderr b/tests/ui/const-generics/associated-type-bound-fail.stderr
index e5e7ee26e..e5e7ee26e 100644
--- a/src/test/ui/const-generics/associated-type-bound-fail.stderr
+++ b/tests/ui/const-generics/associated-type-bound-fail.stderr
diff --git a/src/test/ui/const-generics/associated-type-bound.rs b/tests/ui/const-generics/associated-type-bound.rs
index 3044736b4..3044736b4 100644
--- a/src/test/ui/const-generics/associated-type-bound.rs
+++ b/tests/ui/const-generics/associated-type-bound.rs
diff --git a/src/test/ui/const-generics/auxiliary/const_generic_lib.rs b/tests/ui/const-generics/auxiliary/const_generic_lib.rs
index 922f92d9f..922f92d9f 100644
--- a/src/test/ui/const-generics/auxiliary/const_generic_lib.rs
+++ b/tests/ui/const-generics/auxiliary/const_generic_lib.rs
diff --git a/src/test/ui/const-generics/auxiliary/crayte.rs b/tests/ui/const-generics/auxiliary/crayte.rs
index 19a8bb0f4..19a8bb0f4 100644
--- a/src/test/ui/const-generics/auxiliary/crayte.rs
+++ b/tests/ui/const-generics/auxiliary/crayte.rs
diff --git a/src/test/ui/const-generics/auxiliary/generics_of_parent.rs b/tests/ui/const-generics/auxiliary/generics_of_parent.rs
index 5c2b1f4bd..5c2b1f4bd 100644
--- a/src/test/ui/const-generics/auxiliary/generics_of_parent.rs
+++ b/tests/ui/const-generics/auxiliary/generics_of_parent.rs
diff --git a/src/test/ui/const-generics/auxiliary/generics_of_parent_impl_trait.rs b/tests/ui/const-generics/auxiliary/generics_of_parent_impl_trait.rs
index cd5b8161d..cd5b8161d 100644
--- a/src/test/ui/const-generics/auxiliary/generics_of_parent_impl_trait.rs
+++ b/tests/ui/const-generics/auxiliary/generics_of_parent_impl_trait.rs
diff --git a/src/test/ui/const-generics/auxiliary/legacy-const-generics.rs b/tests/ui/const-generics/auxiliary/legacy-const-generics.rs
index 67352a2fb..67352a2fb 100644
--- a/src/test/ui/const-generics/auxiliary/legacy-const-generics.rs
+++ b/tests/ui/const-generics/auxiliary/legacy-const-generics.rs
diff --git a/src/test/ui/const-generics/backcompat/trait-resolution-breakage.rs b/tests/ui/const-generics/backcompat/trait-resolution-breakage.rs
index df1c99e86..df1c99e86 100644
--- a/src/test/ui/const-generics/backcompat/trait-resolution-breakage.rs
+++ b/tests/ui/const-generics/backcompat/trait-resolution-breakage.rs
diff --git a/src/test/ui/const-generics/backcompat/unevaluated-consts.rs b/tests/ui/const-generics/backcompat/unevaluated-consts.rs
index 3f90d22ae..3f90d22ae 100644
--- a/src/test/ui/const-generics/backcompat/unevaluated-consts.rs
+++ b/tests/ui/const-generics/backcompat/unevaluated-consts.rs
diff --git a/src/test/ui/const-generics/bad-const-generic-exprs.rs b/tests/ui/const-generics/bad-const-generic-exprs.rs
index ca91643ed..ca91643ed 100644
--- a/src/test/ui/const-generics/bad-const-generic-exprs.rs
+++ b/tests/ui/const-generics/bad-const-generic-exprs.rs
diff --git a/src/test/ui/const-generics/bad-const-generic-exprs.stderr b/tests/ui/const-generics/bad-const-generic-exprs.stderr
index 24668b08b..24668b08b 100644
--- a/src/test/ui/const-generics/bad-const-generic-exprs.stderr
+++ b/tests/ui/const-generics/bad-const-generic-exprs.stderr
diff --git a/src/test/ui/const-generics/broken-mir-1.rs b/tests/ui/const-generics/broken-mir-1.rs
index 6b6140e3a..6b6140e3a 100644
--- a/src/test/ui/const-generics/broken-mir-1.rs
+++ b/tests/ui/const-generics/broken-mir-1.rs
diff --git a/src/test/ui/const-generics/broken-mir-2.rs b/tests/ui/const-generics/broken-mir-2.rs
index 9d6228117..9d6228117 100644
--- a/src/test/ui/const-generics/broken-mir-2.rs
+++ b/tests/ui/const-generics/broken-mir-2.rs
diff --git a/src/test/ui/const-generics/cannot-infer-type-for-const-param.rs b/tests/ui/const-generics/cannot-infer-type-for-const-param.rs
index a6e767489..a6e767489 100644
--- a/src/test/ui/const-generics/cannot-infer-type-for-const-param.rs
+++ b/tests/ui/const-generics/cannot-infer-type-for-const-param.rs
diff --git a/src/test/ui/const-generics/coerce_unsized_array.rs b/tests/ui/const-generics/coerce_unsized_array.rs
index ffd5eb9d4..ffd5eb9d4 100644
--- a/src/test/ui/const-generics/coerce_unsized_array.rs
+++ b/tests/ui/const-generics/coerce_unsized_array.rs
diff --git a/src/test/ui/const-generics/concrete-const-as-fn-arg.rs b/tests/ui/const-generics/concrete-const-as-fn-arg.rs
index 372f0433e..372f0433e 100644
--- a/src/test/ui/const-generics/concrete-const-as-fn-arg.rs
+++ b/tests/ui/const-generics/concrete-const-as-fn-arg.rs
diff --git a/src/test/ui/const-generics/concrete-const-impl-method.rs b/tests/ui/const-generics/concrete-const-impl-method.rs
index 53c9c0ead..53c9c0ead 100644
--- a/src/test/ui/const-generics/concrete-const-impl-method.rs
+++ b/tests/ui/const-generics/concrete-const-impl-method.rs
diff --git a/src/test/ui/const-generics/condition-in-trait-const-arg.rs b/tests/ui/const-generics/condition-in-trait-const-arg.rs
index 6f85237cf..6f85237cf 100644
--- a/src/test/ui/const-generics/condition-in-trait-const-arg.rs
+++ b/tests/ui/const-generics/condition-in-trait-const-arg.rs
diff --git a/src/test/ui/const-generics/const-arg-in-const-arg.full.stderr b/tests/ui/const-generics/const-arg-in-const-arg.full.stderr
index 8672e79b3..8672e79b3 100644
--- a/src/test/ui/const-generics/const-arg-in-const-arg.full.stderr
+++ b/tests/ui/const-generics/const-arg-in-const-arg.full.stderr
diff --git a/src/test/ui/const-generics/const-arg-in-const-arg.min.stderr b/tests/ui/const-generics/const-arg-in-const-arg.min.stderr
index f1353aa99..f1353aa99 100644
--- a/src/test/ui/const-generics/const-arg-in-const-arg.min.stderr
+++ b/tests/ui/const-generics/const-arg-in-const-arg.min.stderr
diff --git a/src/test/ui/const-generics/const-arg-in-const-arg.rs b/tests/ui/const-generics/const-arg-in-const-arg.rs
index 44a4f560a..44a4f560a 100644
--- a/src/test/ui/const-generics/const-arg-in-const-arg.rs
+++ b/tests/ui/const-generics/const-arg-in-const-arg.rs
diff --git a/src/test/ui/const-generics/const-arg-in-fn.rs b/tests/ui/const-generics/const-arg-in-fn.rs
index 9b225b18d..9b225b18d 100644
--- a/src/test/ui/const-generics/const-arg-in-fn.rs
+++ b/tests/ui/const-generics/const-arg-in-fn.rs
diff --git a/src/test/ui/const-generics/const-arg-type-arg-misordered.rs b/tests/ui/const-generics/const-arg-type-arg-misordered.rs
index 8ee17e637..8ee17e637 100644
--- a/src/test/ui/const-generics/const-arg-type-arg-misordered.rs
+++ b/tests/ui/const-generics/const-arg-type-arg-misordered.rs
diff --git a/src/test/ui/const-generics/const-arg-type-arg-misordered.stderr b/tests/ui/const-generics/const-arg-type-arg-misordered.stderr
index 4e12f7a8c..4e12f7a8c 100644
--- a/src/test/ui/const-generics/const-arg-type-arg-misordered.stderr
+++ b/tests/ui/const-generics/const-arg-type-arg-misordered.stderr
diff --git a/src/test/ui/const-generics/const-argument-cross-crate-mismatch.rs b/tests/ui/const-generics/const-argument-cross-crate-mismatch.rs
index d863d097d..d863d097d 100644
--- a/src/test/ui/const-generics/const-argument-cross-crate-mismatch.rs
+++ b/tests/ui/const-generics/const-argument-cross-crate-mismatch.rs
diff --git a/src/test/ui/const-generics/const-argument-cross-crate-mismatch.stderr b/tests/ui/const-generics/const-argument-cross-crate-mismatch.stderr
index d5eefd357..d5eefd357 100644
--- a/src/test/ui/const-generics/const-argument-cross-crate-mismatch.stderr
+++ b/tests/ui/const-generics/const-argument-cross-crate-mismatch.stderr
diff --git a/src/test/ui/const-generics/const-argument-cross-crate.rs b/tests/ui/const-generics/const-argument-cross-crate.rs
index 5693409e9..5693409e9 100644
--- a/src/test/ui/const-generics/const-argument-cross-crate.rs
+++ b/tests/ui/const-generics/const-argument-cross-crate.rs
diff --git a/src/test/ui/const-generics/const-argument-if-length.full.stderr b/tests/ui/const-generics/const-argument-if-length.full.stderr
index 2ceba59cf..2ceba59cf 100644
--- a/src/test/ui/const-generics/const-argument-if-length.full.stderr
+++ b/tests/ui/const-generics/const-argument-if-length.full.stderr
diff --git a/src/test/ui/const-generics/const-argument-if-length.min.stderr b/tests/ui/const-generics/const-argument-if-length.min.stderr
index f85e60f63..f85e60f63 100644
--- a/src/test/ui/const-generics/const-argument-if-length.min.stderr
+++ b/tests/ui/const-generics/const-argument-if-length.min.stderr
diff --git a/src/test/ui/const-generics/const-argument-if-length.rs b/tests/ui/const-generics/const-argument-if-length.rs
index db1eafca2..db1eafca2 100644
--- a/src/test/ui/const-generics/const-argument-if-length.rs
+++ b/tests/ui/const-generics/const-argument-if-length.rs
diff --git a/src/test/ui/const-generics/const-argument-non-static-lifetime.min.stderr b/tests/ui/const-generics/const-argument-non-static-lifetime.min.stderr
index f1f3a9c3d..f1f3a9c3d 100644
--- a/src/test/ui/const-generics/const-argument-non-static-lifetime.min.stderr
+++ b/tests/ui/const-generics/const-argument-non-static-lifetime.min.stderr
diff --git a/src/test/ui/const-generics/const-argument-non-static-lifetime.rs b/tests/ui/const-generics/const-argument-non-static-lifetime.rs
index 36a569784..36a569784 100644
--- a/src/test/ui/const-generics/const-argument-non-static-lifetime.rs
+++ b/tests/ui/const-generics/const-argument-non-static-lifetime.rs
diff --git a/src/test/ui/const-generics/const-fn-with-const-param.rs b/tests/ui/const-generics/const-fn-with-const-param.rs
index 161bfaab4..161bfaab4 100644
--- a/src/test/ui/const-generics/const-fn-with-const-param.rs
+++ b/tests/ui/const-generics/const-fn-with-const-param.rs
diff --git a/src/test/ui/const-generics/const-generic-default-wont-borrowck.rs b/tests/ui/const-generics/const-generic-default-wont-borrowck.rs
index e64adacac..e64adacac 100644
--- a/src/test/ui/const-generics/const-generic-default-wont-borrowck.rs
+++ b/tests/ui/const-generics/const-generic-default-wont-borrowck.rs
diff --git a/src/test/ui/const-generics/const-generic-default-wont-borrowck.stderr b/tests/ui/const-generics/const-generic-default-wont-borrowck.stderr
index 0ed370b83..0ed370b83 100644
--- a/src/test/ui/const-generics/const-generic-default-wont-borrowck.stderr
+++ b/tests/ui/const-generics/const-generic-default-wont-borrowck.stderr
diff --git a/src/test/ui/const-generics/const-generic-function.rs b/tests/ui/const-generics/const-generic-function.rs
index c8d2683e5..c8d2683e5 100644
--- a/src/test/ui/const-generics/const-generic-function.rs
+++ b/tests/ui/const-generics/const-generic-function.rs
diff --git a/src/test/ui/const-generics/const-generic-function.stderr b/tests/ui/const-generics/const-generic-function.stderr
index 5ad3f1006..5ad3f1006 100644
--- a/src/test/ui/const-generics/const-generic-function.stderr
+++ b/tests/ui/const-generics/const-generic-function.stderr
diff --git a/src/test/ui/const-generics/const-generic-type_name.rs b/tests/ui/const-generics/const-generic-type_name.rs
index bb16be9c5..bb16be9c5 100644
--- a/src/test/ui/const-generics/const-generic-type_name.rs
+++ b/tests/ui/const-generics/const-generic-type_name.rs
diff --git a/src/test/ui/const-generics/const-param-after-const-literal-arg.rs b/tests/ui/const-generics/const-param-after-const-literal-arg.rs
index d8a0e076e..d8a0e076e 100644
--- a/src/test/ui/const-generics/const-param-after-const-literal-arg.rs
+++ b/tests/ui/const-generics/const-param-after-const-literal-arg.rs
diff --git a/src/test/ui/const-generics/const-param-before-other-params.rs b/tests/ui/const-generics/const-param-before-other-params.rs
index cb1cebe1f..cb1cebe1f 100644
--- a/src/test/ui/const-generics/const-param-before-other-params.rs
+++ b/tests/ui/const-generics/const-param-before-other-params.rs
diff --git a/src/test/ui/const-generics/const-param-before-other-params.stderr b/tests/ui/const-generics/const-param-before-other-params.stderr
index 2c7a47bbc..2c7a47bbc 100644
--- a/src/test/ui/const-generics/const-param-before-other-params.stderr
+++ b/tests/ui/const-generics/const-param-before-other-params.stderr
diff --git a/src/test/ui/const-generics/const-param-elided-lifetime.full.stderr b/tests/ui/const-generics/const-param-elided-lifetime.full.stderr
index d6753a74f..d6753a74f 100644
--- a/src/test/ui/const-generics/const-param-elided-lifetime.full.stderr
+++ b/tests/ui/const-generics/const-param-elided-lifetime.full.stderr
diff --git a/src/test/ui/const-generics/const-param-elided-lifetime.min.stderr b/tests/ui/const-generics/const-param-elided-lifetime.min.stderr
index 4bba42c77..4bba42c77 100644
--- a/src/test/ui/const-generics/const-param-elided-lifetime.min.stderr
+++ b/tests/ui/const-generics/const-param-elided-lifetime.min.stderr
diff --git a/src/test/ui/const-generics/const-param-elided-lifetime.rs b/tests/ui/const-generics/const-param-elided-lifetime.rs
index 487b82dbf..487b82dbf 100644
--- a/src/test/ui/const-generics/const-param-elided-lifetime.rs
+++ b/tests/ui/const-generics/const-param-elided-lifetime.rs
diff --git a/src/test/ui/const-generics/const-param-in-async.rs b/tests/ui/const-generics/const-param-in-async.rs
index f823431e6..f823431e6 100644
--- a/src/test/ui/const-generics/const-param-in-async.rs
+++ b/tests/ui/const-generics/const-param-in-async.rs
diff --git a/src/test/ui/const-generics/const-param-type-depends-on-const-param.full.stderr b/tests/ui/const-generics/const-param-type-depends-on-const-param.full.stderr
index f639e276f..f639e276f 100644
--- a/src/test/ui/const-generics/const-param-type-depends-on-const-param.full.stderr
+++ b/tests/ui/const-generics/const-param-type-depends-on-const-param.full.stderr
diff --git a/src/test/ui/const-generics/const-param-type-depends-on-const-param.min.stderr b/tests/ui/const-generics/const-param-type-depends-on-const-param.min.stderr
index a7b78b80c..24aa40521 100644
--- a/src/test/ui/const-generics/const-param-type-depends-on-const-param.min.stderr
+++ b/tests/ui/const-generics/const-param-type-depends-on-const-param.min.stderr
@@ -10,7 +10,7 @@ error[E0770]: the type of const parameters must not depend on other generic para
 LL | pub struct SelfDependent<const N: [u8; N]>;
    |                                        ^ the type must not depend on the parameter `N`
 
-error: `[u8; _]` is forbidden as the type of a const generic parameter
+error: `[u8; N]` is forbidden as the type of a const generic parameter
   --> $DIR/const-param-type-depends-on-const-param.rs:11:47
    |
 LL | pub struct Dependent<const N: usize, const X: [u8; N]>([(); N]);
@@ -19,7 +19,7 @@ LL | pub struct Dependent<const N: usize, const X: [u8; N]>([(); N]);
    = note: the only supported types are integers, `bool` and `char`
    = help: more complex types are supported with `#![feature(adt_const_params)]`
 
-error: `[u8; _]` is forbidden as the type of a const generic parameter
+error: `[u8; N]` is forbidden as the type of a const generic parameter
   --> $DIR/const-param-type-depends-on-const-param.rs:15:35
    |
 LL | pub struct SelfDependent<const N: [u8; N]>;
diff --git a/src/test/ui/const-generics/const-param-type-depends-on-const-param.rs b/tests/ui/const-generics/const-param-type-depends-on-const-param.rs
index 9d50f9a47..64b2acb03 100644
--- a/src/test/ui/const-generics/const-param-type-depends-on-const-param.rs
+++ b/tests/ui/const-generics/const-param-type-depends-on-const-param.rs
@@ -10,10 +10,10 @@
 
 pub struct Dependent<const N: usize, const X: [u8; N]>([(); N]);
 //~^ ERROR: the type of const parameters must not depend on other generic parameters
-//[min]~^^ ERROR `[u8; _]` is forbidden
+//[min]~^^ ERROR `[u8; N]` is forbidden
 
 pub struct SelfDependent<const N: [u8; N]>;
 //~^ ERROR: the type of const parameters must not depend on other generic parameters
-//[min]~^^ ERROR `[u8; _]` is forbidden
+//[min]~^^ ERROR `[u8; N]` is forbidden
 
 fn main() {}
diff --git a/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.rs b/tests/ui/const-generics/const-param-type-depends-on-type-param-ungated.rs
index 781f50e61..781f50e61 100644
--- a/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.rs
+++ b/tests/ui/const-generics/const-param-type-depends-on-type-param-ungated.rs
diff --git a/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr b/tests/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr
index 8e14defd6..8e14defd6 100644
--- a/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr
+++ b/tests/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr
diff --git a/src/test/ui/const-generics/const-param-type-depends-on-type-param.full.stderr b/tests/ui/const-generics/const-param-type-depends-on-type-param.full.stderr
index 32f7dea82..32f7dea82 100644
--- a/src/test/ui/const-generics/const-param-type-depends-on-type-param.full.stderr
+++ b/tests/ui/const-generics/const-param-type-depends-on-type-param.full.stderr
diff --git a/src/test/ui/const-generics/const-param-type-depends-on-type-param.min.stderr b/tests/ui/const-generics/const-param-type-depends-on-type-param.min.stderr
index 32f7dea82..32f7dea82 100644
--- a/src/test/ui/const-generics/const-param-type-depends-on-type-param.min.stderr
+++ b/tests/ui/const-generics/const-param-type-depends-on-type-param.min.stderr
diff --git a/src/test/ui/const-generics/const-param-type-depends-on-type-param.rs b/tests/ui/const-generics/const-param-type-depends-on-type-param.rs
index 71d91fd7e..71d91fd7e 100644
--- a/src/test/ui/const-generics/const-param-type-depends-on-type-param.rs
+++ b/tests/ui/const-generics/const-param-type-depends-on-type-param.rs
diff --git a/src/test/ui/const-generics/const-parameter-uppercase-lint.rs b/tests/ui/const-generics/const-parameter-uppercase-lint.rs
index b08d62ccc..b08d62ccc 100644
--- a/src/test/ui/const-generics/const-parameter-uppercase-lint.rs
+++ b/tests/ui/const-generics/const-parameter-uppercase-lint.rs
diff --git a/src/test/ui/const-generics/const-parameter-uppercase-lint.stderr b/tests/ui/const-generics/const-parameter-uppercase-lint.stderr
index efaa18285..efaa18285 100644
--- a/src/test/ui/const-generics/const-parameter-uppercase-lint.stderr
+++ b/tests/ui/const-generics/const-parameter-uppercase-lint.stderr
diff --git a/src/test/ui/const-generics/const_trait_fn-issue-88433.rs b/tests/ui/const-generics/const_trait_fn-issue-88433.rs
index 6e04cfaec..6e04cfaec 100644
--- a/src/test/ui/const-generics/const_trait_fn-issue-88433.rs
+++ b/tests/ui/const-generics/const_trait_fn-issue-88433.rs
diff --git a/src/test/ui/const-generics/core-types.rs b/tests/ui/const-generics/core-types.rs
index 91410c4af..91410c4af 100644
--- a/src/test/ui/const-generics/core-types.rs
+++ b/tests/ui/const-generics/core-types.rs
diff --git a/src/test/ui/const-generics/cross_crate_complex.rs b/tests/ui/const-generics/cross_crate_complex.rs
index ebde155f7..ebde155f7 100644
--- a/src/test/ui/const-generics/cross_crate_complex.rs
+++ b/tests/ui/const-generics/cross_crate_complex.rs
diff --git a/src/test/ui/const-generics/defaults/auxiliary/const_defaulty.rs b/tests/ui/const-generics/defaults/auxiliary/const_defaulty.rs
index eed982534..eed982534 100644
--- a/src/test/ui/const-generics/defaults/auxiliary/const_defaulty.rs
+++ b/tests/ui/const-generics/defaults/auxiliary/const_defaulty.rs
diff --git a/src/test/ui/const-generics/defaults/auxiliary/trait_object_lt_defaults_lib.rs b/tests/ui/const-generics/defaults/auxiliary/trait_object_lt_defaults_lib.rs
index 26a2c47ff..26a2c47ff 100644
--- a/src/test/ui/const-generics/defaults/auxiliary/trait_object_lt_defaults_lib.rs
+++ b/tests/ui/const-generics/defaults/auxiliary/trait_object_lt_defaults_lib.rs
diff --git a/src/test/ui/const-generics/defaults/complex-generic-default-expr.min.stderr b/tests/ui/const-generics/defaults/complex-generic-default-expr.min.stderr
index b836cfeae..b836cfeae 100644
--- a/src/test/ui/const-generics/defaults/complex-generic-default-expr.min.stderr
+++ b/tests/ui/const-generics/defaults/complex-generic-default-expr.min.stderr
diff --git a/src/test/ui/const-generics/defaults/complex-generic-default-expr.rs b/tests/ui/const-generics/defaults/complex-generic-default-expr.rs
index 7f50d4c9f..7f50d4c9f 100644
--- a/src/test/ui/const-generics/defaults/complex-generic-default-expr.rs
+++ b/tests/ui/const-generics/defaults/complex-generic-default-expr.rs
diff --git a/src/test/ui/const-generics/defaults/complex-unord-param.rs b/tests/ui/const-generics/defaults/complex-unord-param.rs
index aebc5975a..aebc5975a 100644
--- a/src/test/ui/const-generics/defaults/complex-unord-param.rs
+++ b/tests/ui/const-generics/defaults/complex-unord-param.rs
diff --git a/src/test/ui/const-generics/defaults/const-default.rs b/tests/ui/const-generics/defaults/const-default.rs
index 65cb0eb14..65cb0eb14 100644
--- a/src/test/ui/const-generics/defaults/const-default.rs
+++ b/tests/ui/const-generics/defaults/const-default.rs
diff --git a/src/test/ui/const-generics/defaults/const-param-as-default-value.rs b/tests/ui/const-generics/defaults/const-param-as-default-value.rs
index c1c955d87..c1c955d87 100644
--- a/src/test/ui/const-generics/defaults/const-param-as-default-value.rs
+++ b/tests/ui/const-generics/defaults/const-param-as-default-value.rs
diff --git a/src/test/ui/const-generics/defaults/const-param-in-ty-defaults.rs b/tests/ui/const-generics/defaults/const-param-in-ty-defaults.rs
index 5f0cafe2e..5f0cafe2e 100644
--- a/src/test/ui/const-generics/defaults/const-param-in-ty-defaults.rs
+++ b/tests/ui/const-generics/defaults/const-param-in-ty-defaults.rs
diff --git a/src/test/ui/const-generics/defaults/default-annotation.rs b/tests/ui/const-generics/defaults/default-annotation.rs
index 7a9f5732f..7a9f5732f 100644
--- a/src/test/ui/const-generics/defaults/default-annotation.rs
+++ b/tests/ui/const-generics/defaults/default-annotation.rs
diff --git a/src/test/ui/const-generics/defaults/default-const-param-cannot-reference-self.rs b/tests/ui/const-generics/defaults/default-const-param-cannot-reference-self.rs
index 45275e609..45275e609 100644
--- a/src/test/ui/const-generics/defaults/default-const-param-cannot-reference-self.rs
+++ b/tests/ui/const-generics/defaults/default-const-param-cannot-reference-self.rs
diff --git a/src/test/ui/const-generics/defaults/default-const-param-cannot-reference-self.stderr b/tests/ui/const-generics/defaults/default-const-param-cannot-reference-self.stderr
index 72d7001fd..72d7001fd 100644
--- a/src/test/ui/const-generics/defaults/default-const-param-cannot-reference-self.stderr
+++ b/tests/ui/const-generics/defaults/default-const-param-cannot-reference-self.stderr
diff --git a/src/test/ui/const-generics/defaults/default-on-impl.rs b/tests/ui/const-generics/defaults/default-on-impl.rs
index 9ce46aa09..9ce46aa09 100644
--- a/src/test/ui/const-generics/defaults/default-on-impl.rs
+++ b/tests/ui/const-generics/defaults/default-on-impl.rs
diff --git a/src/test/ui/const-generics/defaults/default-on-impl.stderr b/tests/ui/const-generics/defaults/default-on-impl.stderr
index 4b2b05742..4b2b05742 100644
--- a/src/test/ui/const-generics/defaults/default-on-impl.stderr
+++ b/tests/ui/const-generics/defaults/default-on-impl.stderr
diff --git a/src/test/ui/const-generics/defaults/default-param-wf-concrete.rs b/tests/ui/const-generics/defaults/default-param-wf-concrete.rs
index 41a52c7eb..41a52c7eb 100644
--- a/src/test/ui/const-generics/defaults/default-param-wf-concrete.rs
+++ b/tests/ui/const-generics/defaults/default-param-wf-concrete.rs
diff --git a/src/test/ui/const-generics/defaults/default-param-wf-concrete.stderr b/tests/ui/const-generics/defaults/default-param-wf-concrete.stderr
index e8ebddade..e8ebddade 100644
--- a/src/test/ui/const-generics/defaults/default-param-wf-concrete.stderr
+++ b/tests/ui/const-generics/defaults/default-param-wf-concrete.stderr
diff --git a/src/test/ui/const-generics/defaults/doesnt_infer.rs b/tests/ui/const-generics/defaults/doesnt_infer.rs
index 9c59e672d..9c59e672d 100644
--- a/src/test/ui/const-generics/defaults/doesnt_infer.rs
+++ b/tests/ui/const-generics/defaults/doesnt_infer.rs
diff --git a/src/test/ui/const-generics/defaults/doesnt_infer.stderr b/tests/ui/const-generics/defaults/doesnt_infer.stderr
index 227b2f402..227b2f402 100644
--- a/src/test/ui/const-generics/defaults/doesnt_infer.stderr
+++ b/tests/ui/const-generics/defaults/doesnt_infer.stderr
diff --git a/src/test/ui/const-generics/defaults/external.rs b/tests/ui/const-generics/defaults/external.rs
index 25ec523cb..25ec523cb 100644
--- a/src/test/ui/const-generics/defaults/external.rs
+++ b/tests/ui/const-generics/defaults/external.rs
diff --git a/src/test/ui/const-generics/defaults/forward-declared.rs b/tests/ui/const-generics/defaults/forward-declared.rs
index ede3d873b..ede3d873b 100644
--- a/src/test/ui/const-generics/defaults/forward-declared.rs
+++ b/tests/ui/const-generics/defaults/forward-declared.rs
diff --git a/src/test/ui/const-generics/defaults/forward-declared.stderr b/tests/ui/const-generics/defaults/forward-declared.stderr
index 4856c7a1f..4856c7a1f 100644
--- a/src/test/ui/const-generics/defaults/forward-declared.stderr
+++ b/tests/ui/const-generics/defaults/forward-declared.stderr
diff --git a/src/test/ui/const-generics/defaults/generic-expr-default-concrete.rs b/tests/ui/const-generics/defaults/generic-expr-default-concrete.rs
index f082bd8d2..f082bd8d2 100644
--- a/src/test/ui/const-generics/defaults/generic-expr-default-concrete.rs
+++ b/tests/ui/const-generics/defaults/generic-expr-default-concrete.rs
diff --git a/src/test/ui/const-generics/defaults/generic-expr-default-concrete.stderr b/tests/ui/const-generics/defaults/generic-expr-default-concrete.stderr
index 61b355118..61b355118 100644
--- a/src/test/ui/const-generics/defaults/generic-expr-default-concrete.stderr
+++ b/tests/ui/const-generics/defaults/generic-expr-default-concrete.stderr
diff --git a/src/test/ui/const-generics/defaults/generic-expr-default-mismatched-types.rs b/tests/ui/const-generics/defaults/generic-expr-default-mismatched-types.rs
index 777865d1c..777865d1c 100644
--- a/src/test/ui/const-generics/defaults/generic-expr-default-mismatched-types.rs
+++ b/tests/ui/const-generics/defaults/generic-expr-default-mismatched-types.rs
diff --git a/src/test/ui/const-generics/defaults/generic-expr-default-mismatched-types.stderr b/tests/ui/const-generics/defaults/generic-expr-default-mismatched-types.stderr
index e83f89a60..e83f89a60 100644
--- a/src/test/ui/const-generics/defaults/generic-expr-default-mismatched-types.stderr
+++ b/tests/ui/const-generics/defaults/generic-expr-default-mismatched-types.stderr
diff --git a/src/test/ui/const-generics/defaults/generic-expr-default.rs b/tests/ui/const-generics/defaults/generic-expr-default.rs
index 8fe43feb7..8fe43feb7 100644
--- a/src/test/ui/const-generics/defaults/generic-expr-default.rs
+++ b/tests/ui/const-generics/defaults/generic-expr-default.rs
diff --git a/src/test/ui/const-generics/defaults/generic-expr-default.stderr b/tests/ui/const-generics/defaults/generic-expr-default.stderr
index ada1498d1..ada1498d1 100644
--- a/src/test/ui/const-generics/defaults/generic-expr-default.stderr
+++ b/tests/ui/const-generics/defaults/generic-expr-default.stderr
diff --git a/src/test/ui/const-generics/defaults/intermixed-lifetime.rs b/tests/ui/const-generics/defaults/intermixed-lifetime.rs
index beaf7fc60..beaf7fc60 100644
--- a/src/test/ui/const-generics/defaults/intermixed-lifetime.rs
+++ b/tests/ui/const-generics/defaults/intermixed-lifetime.rs
diff --git a/src/test/ui/const-generics/defaults/intermixed-lifetime.stderr b/tests/ui/const-generics/defaults/intermixed-lifetime.stderr
index 5cff61dd9..5cff61dd9 100644
--- a/src/test/ui/const-generics/defaults/intermixed-lifetime.stderr
+++ b/tests/ui/const-generics/defaults/intermixed-lifetime.stderr
diff --git a/src/test/ui/const-generics/defaults/mismatch.rs b/tests/ui/const-generics/defaults/mismatch.rs
index ec131505e..ec131505e 100644
--- a/src/test/ui/const-generics/defaults/mismatch.rs
+++ b/tests/ui/const-generics/defaults/mismatch.rs
diff --git a/src/test/ui/const-generics/defaults/mismatch.stderr b/tests/ui/const-generics/defaults/mismatch.stderr
index 52c54aace..52c54aace 100644
--- a/src/test/ui/const-generics/defaults/mismatch.stderr
+++ b/tests/ui/const-generics/defaults/mismatch.stderr
diff --git a/src/test/ui/const-generics/defaults/mismatched_ty_const_in_trait_impl.rs b/tests/ui/const-generics/defaults/mismatched_ty_const_in_trait_impl.rs
index 5c9323261..5c9323261 100644
--- a/src/test/ui/const-generics/defaults/mismatched_ty_const_in_trait_impl.rs
+++ b/tests/ui/const-generics/defaults/mismatched_ty_const_in_trait_impl.rs
diff --git a/src/test/ui/const-generics/defaults/mismatched_ty_const_in_trait_impl.stderr b/tests/ui/const-generics/defaults/mismatched_ty_const_in_trait_impl.stderr
index 3455f2c8e..3455f2c8e 100644
--- a/src/test/ui/const-generics/defaults/mismatched_ty_const_in_trait_impl.stderr
+++ b/tests/ui/const-generics/defaults/mismatched_ty_const_in_trait_impl.stderr
diff --git a/src/test/ui/const-generics/defaults/param-order-err-pretty-prints-default.rs b/tests/ui/const-generics/defaults/param-order-err-pretty-prints-default.rs
index f928fc9e7..f928fc9e7 100644
--- a/src/test/ui/const-generics/defaults/param-order-err-pretty-prints-default.rs
+++ b/tests/ui/const-generics/defaults/param-order-err-pretty-prints-default.rs
diff --git a/src/test/ui/const-generics/defaults/param-order-err-pretty-prints-default.stderr b/tests/ui/const-generics/defaults/param-order-err-pretty-prints-default.stderr
index ba08b4646..ba08b4646 100644
--- a/src/test/ui/const-generics/defaults/param-order-err-pretty-prints-default.stderr
+++ b/tests/ui/const-generics/defaults/param-order-err-pretty-prints-default.stderr
diff --git a/src/test/ui/const-generics/defaults/pretty-printing-ast.rs b/tests/ui/const-generics/defaults/pretty-printing-ast.rs
index e202d4e86..e202d4e86 100644
--- a/src/test/ui/const-generics/defaults/pretty-printing-ast.rs
+++ b/tests/ui/const-generics/defaults/pretty-printing-ast.rs
diff --git a/src/test/ui/const-generics/defaults/pretty-printing-ast.stdout b/tests/ui/const-generics/defaults/pretty-printing-ast.stdout
index 121138605..121138605 100644
--- a/src/test/ui/const-generics/defaults/pretty-printing-ast.stdout
+++ b/tests/ui/const-generics/defaults/pretty-printing-ast.stdout
diff --git a/src/test/ui/const-generics/defaults/repr-c-issue-82792.rs b/tests/ui/const-generics/defaults/repr-c-issue-82792.rs
index 118da2723..118da2723 100644
--- a/src/test/ui/const-generics/defaults/repr-c-issue-82792.rs
+++ b/tests/ui/const-generics/defaults/repr-c-issue-82792.rs
diff --git a/src/test/ui/const-generics/defaults/rp_impl_trait.rs b/tests/ui/const-generics/defaults/rp_impl_trait.rs
index dde8eea45..dde8eea45 100644
--- a/src/test/ui/const-generics/defaults/rp_impl_trait.rs
+++ b/tests/ui/const-generics/defaults/rp_impl_trait.rs
diff --git a/src/test/ui/const-generics/defaults/rp_impl_trait_fail.rs b/tests/ui/const-generics/defaults/rp_impl_trait_fail.rs
index 80013e7b4..80013e7b4 100644
--- a/src/test/ui/const-generics/defaults/rp_impl_trait_fail.rs
+++ b/tests/ui/const-generics/defaults/rp_impl_trait_fail.rs
diff --git a/src/test/ui/const-generics/defaults/rp_impl_trait_fail.stderr b/tests/ui/const-generics/defaults/rp_impl_trait_fail.stderr
index a46bd5352..a46bd5352 100644
--- a/src/test/ui/const-generics/defaults/rp_impl_trait_fail.stderr
+++ b/tests/ui/const-generics/defaults/rp_impl_trait_fail.stderr
diff --git a/src/test/ui/const-generics/defaults/self-referential.rs b/tests/ui/const-generics/defaults/self-referential.rs
index 14a870dc3..14a870dc3 100644
--- a/src/test/ui/const-generics/defaults/self-referential.rs
+++ b/tests/ui/const-generics/defaults/self-referential.rs
diff --git a/src/test/ui/const-generics/defaults/self-referential.stderr b/tests/ui/const-generics/defaults/self-referential.stderr
index 170c1f7f7..170c1f7f7 100644
--- a/src/test/ui/const-generics/defaults/self-referential.stderr
+++ b/tests/ui/const-generics/defaults/self-referential.stderr
diff --git a/src/test/ui/const-generics/defaults/simple-defaults.rs b/tests/ui/const-generics/defaults/simple-defaults.rs
index 6a782d223..6a782d223 100644
--- a/src/test/ui/const-generics/defaults/simple-defaults.rs
+++ b/tests/ui/const-generics/defaults/simple-defaults.rs
diff --git a/src/test/ui/const-generics/defaults/trait_object_lt_defaults.rs b/tests/ui/const-generics/defaults/trait_object_lt_defaults.rs
index a1828727e..a1828727e 100644
--- a/src/test/ui/const-generics/defaults/trait_object_lt_defaults.rs
+++ b/tests/ui/const-generics/defaults/trait_object_lt_defaults.rs
diff --git a/src/test/ui/const-generics/defaults/trait_objects.rs b/tests/ui/const-generics/defaults/trait_objects.rs
index 750e40313..750e40313 100644
--- a/src/test/ui/const-generics/defaults/trait_objects.rs
+++ b/tests/ui/const-generics/defaults/trait_objects.rs
diff --git a/src/test/ui/const-generics/defaults/trait_objects_fail.rs b/tests/ui/const-generics/defaults/trait_objects_fail.rs
index 6ab803f99..6ab803f99 100644
--- a/src/test/ui/const-generics/defaults/trait_objects_fail.rs
+++ b/tests/ui/const-generics/defaults/trait_objects_fail.rs
diff --git a/src/test/ui/const-generics/defaults/trait_objects_fail.stderr b/tests/ui/const-generics/defaults/trait_objects_fail.stderr
index 0e8334d03..0e8334d03 100644
--- a/src/test/ui/const-generics/defaults/trait_objects_fail.stderr
+++ b/tests/ui/const-generics/defaults/trait_objects_fail.stderr
diff --git a/src/test/ui/const-generics/defaults/type-default-const-param-name.rs b/tests/ui/const-generics/defaults/type-default-const-param-name.rs
index 405664ded..405664ded 100644
--- a/src/test/ui/const-generics/defaults/type-default-const-param-name.rs
+++ b/tests/ui/const-generics/defaults/type-default-const-param-name.rs
diff --git a/src/test/ui/const-generics/defaults/wfness.rs b/tests/ui/const-generics/defaults/wfness.rs
index a93f67081..a93f67081 100644
--- a/src/test/ui/const-generics/defaults/wfness.rs
+++ b/tests/ui/const-generics/defaults/wfness.rs
diff --git a/src/test/ui/const-generics/defaults/wfness.stderr b/tests/ui/const-generics/defaults/wfness.stderr
index 25038f830..25038f830 100644
--- a/src/test/ui/const-generics/defaults/wfness.stderr
+++ b/tests/ui/const-generics/defaults/wfness.stderr
diff --git a/src/test/ui/const-generics/defaults/wrong-order.rs b/tests/ui/const-generics/defaults/wrong-order.rs
index d53d56f41..d53d56f41 100644
--- a/src/test/ui/const-generics/defaults/wrong-order.rs
+++ b/tests/ui/const-generics/defaults/wrong-order.rs
diff --git a/src/test/ui/const-generics/defaults/wrong-order.stderr b/tests/ui/const-generics/defaults/wrong-order.stderr
index 4d2628d03..4d2628d03 100644
--- a/src/test/ui/const-generics/defaults/wrong-order.stderr
+++ b/tests/ui/const-generics/defaults/wrong-order.stderr
diff --git a/src/test/ui/const-generics/deref-into-array-generic.rs b/tests/ui/const-generics/deref-into-array-generic.rs
index 7d75af12b..7d75af12b 100644
--- a/src/test/ui/const-generics/deref-into-array-generic.rs
+++ b/tests/ui/const-generics/deref-into-array-generic.rs
diff --git a/src/test/ui/const-generics/different_generic_args.full.stderr b/tests/ui/const-generics/different_generic_args.full.stderr
index eba1768f7..eba1768f7 100644
--- a/src/test/ui/const-generics/different_generic_args.full.stderr
+++ b/tests/ui/const-generics/different_generic_args.full.stderr
diff --git a/src/test/ui/const-generics/different_generic_args.min.stderr b/tests/ui/const-generics/different_generic_args.min.stderr
index eba1768f7..eba1768f7 100644
--- a/src/test/ui/const-generics/different_generic_args.min.stderr
+++ b/tests/ui/const-generics/different_generic_args.min.stderr
diff --git a/src/test/ui/const-generics/different_generic_args.rs b/tests/ui/const-generics/different_generic_args.rs
index 9ee0e0747..9ee0e0747 100644
--- a/src/test/ui/const-generics/different_generic_args.rs
+++ b/tests/ui/const-generics/different_generic_args.rs
diff --git a/src/test/ui/const-generics/different_generic_args_array.rs b/tests/ui/const-generics/different_generic_args_array.rs
index 4d225dfdd..4d225dfdd 100644
--- a/src/test/ui/const-generics/different_generic_args_array.rs
+++ b/tests/ui/const-generics/different_generic_args_array.rs
diff --git a/src/test/ui/const-generics/different_generic_args_array.stderr b/tests/ui/const-generics/different_generic_args_array.stderr
index 4c5b5ada4..4c5b5ada4 100644
--- a/src/test/ui/const-generics/different_generic_args_array.stderr
+++ b/tests/ui/const-generics/different_generic_args_array.stderr
diff --git a/src/test/ui/const-generics/dont-evaluate-array-len-on-err-1.rs b/tests/ui/const-generics/dont-evaluate-array-len-on-err-1.rs
index 6c4ee1af2..6c4ee1af2 100644
--- a/src/test/ui/const-generics/dont-evaluate-array-len-on-err-1.rs
+++ b/tests/ui/const-generics/dont-evaluate-array-len-on-err-1.rs
diff --git a/tests/ui/const-generics/dont-evaluate-array-len-on-err-1.stderr b/tests/ui/const-generics/dont-evaluate-array-len-on-err-1.stderr
new file mode 100644
index 000000000..d8eebeb0d
--- /dev/null
+++ b/tests/ui/const-generics/dont-evaluate-array-len-on-err-1.stderr
@@ -0,0 +1,9 @@
+error[E0277]: the trait bound `[Adt; std::mem::size_of::<Self::Assoc>()]: Foo` is not satisfied
+  --> $DIR/dont-evaluate-array-len-on-err-1.rs:15:9
+   |
+LL |         <[Adt; std::mem::size_of::<Self::Assoc>()] as Foo>::bar()
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `[Adt; std::mem::size_of::<Self::Assoc>()]`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/const-generics/dyn-supertraits.rs b/tests/ui/const-generics/dyn-supertraits.rs
index 3dee326a1..3dee326a1 100644
--- a/src/test/ui/const-generics/dyn-supertraits.rs
+++ b/tests/ui/const-generics/dyn-supertraits.rs
diff --git a/src/test/ui/const-generics/early/closing-args-token.rs b/tests/ui/const-generics/early/closing-args-token.rs
index cb4d6299e..cb4d6299e 100644
--- a/src/test/ui/const-generics/early/closing-args-token.rs
+++ b/tests/ui/const-generics/early/closing-args-token.rs
diff --git a/src/test/ui/const-generics/early/closing-args-token.stderr b/tests/ui/const-generics/early/closing-args-token.stderr
index 58fff3a85..58fff3a85 100644
--- a/src/test/ui/const-generics/early/closing-args-token.stderr
+++ b/tests/ui/const-generics/early/closing-args-token.stderr
diff --git a/src/test/ui/const-generics/early/const-expression-parameter.rs b/tests/ui/const-generics/early/const-expression-parameter.rs
index 4cf7ba869..4cf7ba869 100644
--- a/src/test/ui/const-generics/early/const-expression-parameter.rs
+++ b/tests/ui/const-generics/early/const-expression-parameter.rs
diff --git a/src/test/ui/const-generics/early/const-expression-parameter.stderr b/tests/ui/const-generics/early/const-expression-parameter.stderr
index 4ce1be25e..4ce1be25e 100644
--- a/src/test/ui/const-generics/early/const-expression-parameter.stderr
+++ b/tests/ui/const-generics/early/const-expression-parameter.stderr
diff --git a/src/test/ui/const-generics/early/const-param-from-outer-fn.rs b/tests/ui/const-generics/early/const-param-from-outer-fn.rs
index c3b418ee3..c3b418ee3 100644
--- a/src/test/ui/const-generics/early/const-param-from-outer-fn.rs
+++ b/tests/ui/const-generics/early/const-param-from-outer-fn.rs
diff --git a/src/test/ui/const-generics/early/const-param-from-outer-fn.stderr b/tests/ui/const-generics/early/const-param-from-outer-fn.stderr
index e3bf38b70..e3bf38b70 100644
--- a/src/test/ui/const-generics/early/const-param-from-outer-fn.stderr
+++ b/tests/ui/const-generics/early/const-param-from-outer-fn.stderr
diff --git a/src/test/ui/const-generics/early/const-param-hygiene.rs b/tests/ui/const-generics/early/const-param-hygiene.rs
index fd4e5b409..fd4e5b409 100644
--- a/src/test/ui/const-generics/early/const-param-hygiene.rs
+++ b/tests/ui/const-generics/early/const-param-hygiene.rs
diff --git a/src/test/ui/const-generics/early/const-param-shadowing.rs b/tests/ui/const-generics/early/const-param-shadowing.rs
index ddd15dbc4..ddd15dbc4 100644
--- a/src/test/ui/const-generics/early/const-param-shadowing.rs
+++ b/tests/ui/const-generics/early/const-param-shadowing.rs
diff --git a/src/test/ui/const-generics/early/const-param-shadowing.stderr b/tests/ui/const-generics/early/const-param-shadowing.stderr
index 625338bd9..625338bd9 100644
--- a/src/test/ui/const-generics/early/const-param-shadowing.stderr
+++ b/tests/ui/const-generics/early/const-param-shadowing.stderr
diff --git a/src/test/ui/const-generics/early/invalid-const-arguments.rs b/tests/ui/const-generics/early/invalid-const-arguments.rs
index 6619c9758..6619c9758 100644
--- a/src/test/ui/const-generics/early/invalid-const-arguments.rs
+++ b/tests/ui/const-generics/early/invalid-const-arguments.rs
diff --git a/src/test/ui/const-generics/early/invalid-const-arguments.stderr b/tests/ui/const-generics/early/invalid-const-arguments.stderr
index b46e7e24f..b46e7e24f 100644
--- a/src/test/ui/const-generics/early/invalid-const-arguments.stderr
+++ b/tests/ui/const-generics/early/invalid-const-arguments.stderr
diff --git a/src/test/ui/const-generics/early/macro_rules-braces.rs b/tests/ui/const-generics/early/macro_rules-braces.rs
index 0ae914635..0ae914635 100644
--- a/src/test/ui/const-generics/early/macro_rules-braces.rs
+++ b/tests/ui/const-generics/early/macro_rules-braces.rs
diff --git a/src/test/ui/const-generics/early/macro_rules-braces.stderr b/tests/ui/const-generics/early/macro_rules-braces.stderr
index 49382dbf0..49382dbf0 100644
--- a/src/test/ui/const-generics/early/macro_rules-braces.stderr
+++ b/tests/ui/const-generics/early/macro_rules-braces.stderr
diff --git a/tests/ui/const-generics/ensure_is_evaluatable.rs b/tests/ui/const-generics/ensure_is_evaluatable.rs
new file mode 100644
index 000000000..1e8d8c3d3
--- /dev/null
+++ b/tests/ui/const-generics/ensure_is_evaluatable.rs
@@ -0,0 +1,20 @@
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+
+fn foo<const N: usize, const M: usize>() -> [(); N+2]
+where
+    [(); N + 1]:,
+    [(); M + 1]:,
+{
+    bar()
+    //~^ ERROR: unconstrained
+}
+
+fn bar<const N: usize>() -> [(); N]
+where
+    [(); N + 1]:,
+{
+    [(); N]
+}
+
+fn main() {}
diff --git a/tests/ui/const-generics/ensure_is_evaluatable.stderr b/tests/ui/const-generics/ensure_is_evaluatable.stderr
new file mode 100644
index 000000000..bf6c35ad8
--- /dev/null
+++ b/tests/ui/const-generics/ensure_is_evaluatable.stderr
@@ -0,0 +1,18 @@
+error: unconstrained generic constant
+  --> $DIR/ensure_is_evaluatable.rs:9:5
+   |
+LL |     bar()
+   |     ^^^
+   |
+   = help: try adding a `where` bound using this expression: `where [(); N + 1]:`
+note: required by a bound in `bar`
+  --> $DIR/ensure_is_evaluatable.rs:15:10
+   |
+LL | fn bar<const N: usize>() -> [(); N]
+   |    --- required by a bound in this
+LL | where
+LL |     [(); N + 1]:,
+   |          ^^^^^ required by this bound in `bar`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/const-generics/enum-variants.rs b/tests/ui/const-generics/enum-variants.rs
index 5c6c4a8ef..5c6c4a8ef 100644
--- a/src/test/ui/const-generics/enum-variants.rs
+++ b/tests/ui/const-generics/enum-variants.rs
diff --git a/src/test/ui/const-generics/exhaustive-value.rs b/tests/ui/const-generics/exhaustive-value.rs
index 778d49834..778d49834 100644
--- a/src/test/ui/const-generics/exhaustive-value.rs
+++ b/tests/ui/const-generics/exhaustive-value.rs
diff --git a/src/test/ui/const-generics/exhaustive-value.stderr b/tests/ui/const-generics/exhaustive-value.stderr
index 76a83ba67..76a83ba67 100644
--- a/src/test/ui/const-generics/exhaustive-value.stderr
+++ b/tests/ui/const-generics/exhaustive-value.stderr
diff --git a/src/test/ui/const-generics/expose-default-substs-param-env.rs b/tests/ui/const-generics/expose-default-substs-param-env.rs
index e40c93116..e40c93116 100644
--- a/src/test/ui/const-generics/expose-default-substs-param-env.rs
+++ b/tests/ui/const-generics/expose-default-substs-param-env.rs
diff --git a/src/test/ui/const-generics/float-generic.adt_const_params.stderr b/tests/ui/const-generics/float-generic.adt_const_params.stderr
index fef5ef0d1..fef5ef0d1 100644
--- a/src/test/ui/const-generics/float-generic.adt_const_params.stderr
+++ b/tests/ui/const-generics/float-generic.adt_const_params.stderr
diff --git a/src/test/ui/const-generics/float-generic.rs b/tests/ui/const-generics/float-generic.rs
index b72059b5b..b72059b5b 100644
--- a/src/test/ui/const-generics/float-generic.rs
+++ b/tests/ui/const-generics/float-generic.rs
diff --git a/src/test/ui/const-generics/float-generic.simple.stderr b/tests/ui/const-generics/float-generic.simple.stderr
index 89ca36b0f..89ca36b0f 100644
--- a/src/test/ui/const-generics/float-generic.simple.stderr
+++ b/tests/ui/const-generics/float-generic.simple.stderr
diff --git a/src/test/ui/const-generics/fn-const-param-call.full.stderr b/tests/ui/const-generics/fn-const-param-call.full.stderr
index b55c24498..b55c24498 100644
--- a/src/test/ui/const-generics/fn-const-param-call.full.stderr
+++ b/tests/ui/const-generics/fn-const-param-call.full.stderr
diff --git a/src/test/ui/const-generics/fn-const-param-call.min.stderr b/tests/ui/const-generics/fn-const-param-call.min.stderr
index d984449e6..d984449e6 100644
--- a/src/test/ui/const-generics/fn-const-param-call.min.stderr
+++ b/tests/ui/const-generics/fn-const-param-call.min.stderr
diff --git a/src/test/ui/const-generics/fn-const-param-call.rs b/tests/ui/const-generics/fn-const-param-call.rs
index dc516fb71..dc516fb71 100644
--- a/src/test/ui/const-generics/fn-const-param-call.rs
+++ b/tests/ui/const-generics/fn-const-param-call.rs
diff --git a/src/test/ui/const-generics/fn-const-param-infer.full.stderr b/tests/ui/const-generics/fn-const-param-infer.full.stderr
index 2d66a1923..2d66a1923 100644
--- a/src/test/ui/const-generics/fn-const-param-infer.full.stderr
+++ b/tests/ui/const-generics/fn-const-param-infer.full.stderr
diff --git a/src/test/ui/const-generics/fn-const-param-infer.min.stderr b/tests/ui/const-generics/fn-const-param-infer.min.stderr
index f0767a109..f0767a109 100644
--- a/src/test/ui/const-generics/fn-const-param-infer.min.stderr
+++ b/tests/ui/const-generics/fn-const-param-infer.min.stderr
diff --git a/src/test/ui/const-generics/fn-const-param-infer.rs b/tests/ui/const-generics/fn-const-param-infer.rs
index 22f5f529c..22f5f529c 100644
--- a/src/test/ui/const-generics/fn-const-param-infer.rs
+++ b/tests/ui/const-generics/fn-const-param-infer.rs
diff --git a/tests/ui/const-generics/fn_with_two_const_inputs.rs b/tests/ui/const-generics/fn_with_two_const_inputs.rs
new file mode 100644
index 000000000..0d6246a9f
--- /dev/null
+++ b/tests/ui/const-generics/fn_with_two_const_inputs.rs
@@ -0,0 +1,23 @@
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+
+const fn both(_: usize, b: usize) -> usize {
+    b
+}
+
+fn foo<const N: usize, const M: usize>() -> [(); N + 2]
+where
+    [(); both(N + 1, M + 1)]:,
+{
+    bar()
+    //~^ ERROR: unconstrained generic constant
+}
+
+fn bar<const N: usize>() -> [(); N]
+where
+    [(); N + 1]:,
+{
+    [(); N]
+}
+
+fn main() {}
diff --git a/tests/ui/const-generics/fn_with_two_const_inputs.stderr b/tests/ui/const-generics/fn_with_two_const_inputs.stderr
new file mode 100644
index 000000000..614e7e0d2
--- /dev/null
+++ b/tests/ui/const-generics/fn_with_two_const_inputs.stderr
@@ -0,0 +1,18 @@
+error: unconstrained generic constant
+  --> $DIR/fn_with_two_const_inputs.rs:12:5
+   |
+LL |     bar()
+   |     ^^^
+   |
+   = help: try adding a `where` bound using this expression: `where [(); N + 1]:`
+note: required by a bound in `bar`
+  --> $DIR/fn_with_two_const_inputs.rs:18:10
+   |
+LL | fn bar<const N: usize>() -> [(); N]
+   |    --- required by a bound in this
+LL | where
+LL |     [(); N + 1]:,
+   |          ^^^^^ required by this bound in `bar`
+
+error: aborting due to previous error
+
diff --git a/tests/ui/const-generics/fn_with_two_same_const_inputs.rs b/tests/ui/const-generics/fn_with_two_same_const_inputs.rs
new file mode 100644
index 000000000..f0ce093e0
--- /dev/null
+++ b/tests/ui/const-generics/fn_with_two_same_const_inputs.rs
@@ -0,0 +1,22 @@
+// check-pass
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+
+const fn both(_: usize, b: usize) -> usize {
+    b
+}
+
+fn foo<const N: usize>()
+where
+    [(); both(N + 1, N + 1)]:,
+{
+    bar::<N>();
+}
+
+fn bar<const N: usize>()
+where
+    [(); N + 1]:,
+{
+}
+
+fn main() {}
diff --git a/src/test/ui/const-generics/forbid-non-structural_match-types.rs b/tests/ui/const-generics/forbid-non-structural_match-types.rs
index 6ae9d5cfb..6ae9d5cfb 100644
--- a/src/test/ui/const-generics/forbid-non-structural_match-types.rs
+++ b/tests/ui/const-generics/forbid-non-structural_match-types.rs
diff --git a/src/test/ui/const-generics/forbid-non-structural_match-types.stderr b/tests/ui/const-generics/forbid-non-structural_match-types.stderr
index 81b9bdfbd..81b9bdfbd 100644
--- a/src/test/ui/const-generics/forbid-non-structural_match-types.stderr
+++ b/tests/ui/const-generics/forbid-non-structural_match-types.stderr
diff --git a/src/test/ui/const-generics/foreign-item-const-parameter.rs b/tests/ui/const-generics/foreign-item-const-parameter.rs
index 4fe377b59..4fe377b59 100644
--- a/src/test/ui/const-generics/foreign-item-const-parameter.rs
+++ b/tests/ui/const-generics/foreign-item-const-parameter.rs
diff --git a/src/test/ui/const-generics/foreign-item-const-parameter.stderr b/tests/ui/const-generics/foreign-item-const-parameter.stderr
index b02db8700..b02db8700 100644
--- a/src/test/ui/const-generics/foreign-item-const-parameter.stderr
+++ b/tests/ui/const-generics/foreign-item-const-parameter.stderr
diff --git a/src/test/ui/const-generics/generic-param-mismatch.rs b/tests/ui/const-generics/generic-param-mismatch.rs
index 2e201e50a..2e201e50a 100644
--- a/src/test/ui/const-generics/generic-param-mismatch.rs
+++ b/tests/ui/const-generics/generic-param-mismatch.rs
diff --git a/src/test/ui/const-generics/generic-param-mismatch.stderr b/tests/ui/const-generics/generic-param-mismatch.stderr
index d0776d49d..d0776d49d 100644
--- a/src/test/ui/const-generics/generic-param-mismatch.stderr
+++ b/tests/ui/const-generics/generic-param-mismatch.stderr
diff --git a/src/test/ui/const-generics/generic_arg_infer/array-repeat-expr.rs b/tests/ui/const-generics/generic_arg_infer/array-repeat-expr.rs
index d3e53d7a8..d3e53d7a8 100644
--- a/src/test/ui/const-generics/generic_arg_infer/array-repeat-expr.rs
+++ b/tests/ui/const-generics/generic_arg_infer/array-repeat-expr.rs
diff --git a/src/test/ui/const-generics/generic_arg_infer/dont-use-defaults.rs b/tests/ui/const-generics/generic_arg_infer/dont-use-defaults.rs
index 251160a0f..251160a0f 100644
--- a/src/test/ui/const-generics/generic_arg_infer/dont-use-defaults.rs
+++ b/tests/ui/const-generics/generic_arg_infer/dont-use-defaults.rs
diff --git a/src/test/ui/const-generics/generic_arg_infer/in-signature.rs b/tests/ui/const-generics/generic_arg_infer/in-signature.rs
index 1f60b2242..1f60b2242 100644
--- a/src/test/ui/const-generics/generic_arg_infer/in-signature.rs
+++ b/tests/ui/const-generics/generic_arg_infer/in-signature.rs
diff --git a/src/test/ui/const-generics/generic_arg_infer/in-signature.stderr b/tests/ui/const-generics/generic_arg_infer/in-signature.stderr
index 52d1b29f9..52d1b29f9 100644
--- a/src/test/ui/const-generics/generic_arg_infer/in-signature.stderr
+++ b/tests/ui/const-generics/generic_arg_infer/in-signature.stderr
diff --git a/src/test/ui/const-generics/generic_arg_infer/infer-arg-test.rs b/tests/ui/const-generics/generic_arg_infer/infer-arg-test.rs
index 29aa0f59d..29aa0f59d 100644
--- a/src/test/ui/const-generics/generic_arg_infer/infer-arg-test.rs
+++ b/tests/ui/const-generics/generic_arg_infer/infer-arg-test.rs
diff --git a/src/test/ui/const-generics/generic_arg_infer/infer-arg-test.stderr b/tests/ui/const-generics/generic_arg_infer/infer-arg-test.stderr
index e6d0c743d..e6d0c743d 100644
--- a/src/test/ui/const-generics/generic_arg_infer/infer-arg-test.stderr
+++ b/tests/ui/const-generics/generic_arg_infer/infer-arg-test.stderr
diff --git a/src/test/ui/const-generics/generic_arg_infer/infer_arg_and_const_arg.rs b/tests/ui/const-generics/generic_arg_infer/infer_arg_and_const_arg.rs
index 23c8d7537..23c8d7537 100644
--- a/src/test/ui/const-generics/generic_arg_infer/infer_arg_and_const_arg.rs
+++ b/tests/ui/const-generics/generic_arg_infer/infer_arg_and_const_arg.rs
diff --git a/src/test/ui/const-generics/generic_arg_infer/issue-91614.rs b/tests/ui/const-generics/generic_arg_infer/issue-91614.rs
index b45e2cbc7..b45e2cbc7 100644
--- a/src/test/ui/const-generics/generic_arg_infer/issue-91614.rs
+++ b/tests/ui/const-generics/generic_arg_infer/issue-91614.rs
diff --git a/src/test/ui/const-generics/generic_arg_infer/issue-91614.stderr b/tests/ui/const-generics/generic_arg_infer/issue-91614.stderr
index 688db695f..13ea4a295 100644
--- a/src/test/ui/const-generics/generic_arg_infer/issue-91614.stderr
+++ b/tests/ui/const-generics/generic_arg_infer/issue-91614.stderr
@@ -5,11 +5,14 @@ LL |     let y = Mask::<_, _>::splat(false);
    |         ^   ------------------- type must be known at this point
    |
    = note: cannot satisfy `_: MaskElement`
+   = help: the following types implement trait `MaskElement`:
+             i16
+             i32
+             i64
+             i8
+             isize
 note: required by a bound in `Mask::<T, LANES>::splat`
   --> $SRC_DIR/core/src/../../portable-simd/crates/core_simd/src/masks.rs:LL:COL
-   |
-LL |     T: MaskElement,
-   |        ^^^^^^^^^^^ required by this bound in `Mask::<T, LANES>::splat`
 help: consider giving `y` an explicit type, where the type for type parameter `T` is specified
    |
 LL |     let y: Mask<_, LANES> = Mask::<_, _>::splat(false);
diff --git a/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-1.rs b/tests/ui/const-generics/generic_const_exprs/abstract-const-as-cast-1.rs
index 06f00de13..06f00de13 100644
--- a/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-1.rs
+++ b/tests/ui/const-generics/generic_const_exprs/abstract-const-as-cast-1.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-2.rs b/tests/ui/const-generics/generic_const_exprs/abstract-const-as-cast-2.rs
index 3b5b87b2b..3b5b87b2b 100644
--- a/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-2.rs
+++ b/tests/ui/const-generics/generic_const_exprs/abstract-const-as-cast-2.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-2.stderr b/tests/ui/const-generics/generic_const_exprs/abstract-const-as-cast-2.stderr
index 5ca04d25e..5ca04d25e 100644
--- a/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-2.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/abstract-const-as-cast-2.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs b/tests/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs
index 7561ae2fe..7561ae2fe 100644
--- a/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs
+++ b/tests/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.stderr b/tests/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.stderr
index ada1050d3..cdf97bd88 100644
--- a/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.stderr
@@ -14,7 +14,7 @@ note: required by a bound in `use_trait_impl::assert_impl`
   --> $DIR/abstract-const-as-cast-3.rs:14:23
    |
 LL |     fn assert_impl<T: Trait>() {}
-   |                       ^^^^^ required by this bound in `use_trait_impl::assert_impl`
+   |                       ^^^^^ required by this bound in `assert_impl`
 
 error[E0308]: mismatched types
   --> $DIR/abstract-const-as-cast-3.rs:17:5
@@ -28,7 +28,7 @@ note: required by a bound in `use_trait_impl::assert_impl`
   --> $DIR/abstract-const-as-cast-3.rs:14:23
    |
 LL |     fn assert_impl<T: Trait>() {}
-   |                       ^^^^^ required by this bound in `use_trait_impl::assert_impl`
+   |                       ^^^^^ required by this bound in `assert_impl`
 
 error: unconstrained generic constant
   --> $DIR/abstract-const-as-cast-3.rs:20:19
@@ -46,7 +46,7 @@ note: required by a bound in `use_trait_impl::assert_impl`
   --> $DIR/abstract-const-as-cast-3.rs:14:23
    |
 LL |     fn assert_impl<T: Trait>() {}
-   |                       ^^^^^ required by this bound in `use_trait_impl::assert_impl`
+   |                       ^^^^^ required by this bound in `assert_impl`
 
 error[E0308]: mismatched types
   --> $DIR/abstract-const-as-cast-3.rs:20:5
@@ -60,7 +60,7 @@ note: required by a bound in `use_trait_impl::assert_impl`
   --> $DIR/abstract-const-as-cast-3.rs:14:23
    |
 LL |     fn assert_impl<T: Trait>() {}
-   |                       ^^^^^ required by this bound in `use_trait_impl::assert_impl`
+   |                       ^^^^^ required by this bound in `assert_impl`
 
 error[E0308]: mismatched types
   --> $DIR/abstract-const-as-cast-3.rs:23:5
@@ -74,7 +74,7 @@ note: required by a bound in `use_trait_impl::assert_impl`
   --> $DIR/abstract-const-as-cast-3.rs:14:23
    |
 LL |     fn assert_impl<T: Trait>() {}
-   |                       ^^^^^ required by this bound in `use_trait_impl::assert_impl`
+   |                       ^^^^^ required by this bound in `assert_impl`
 
 error[E0308]: mismatched types
   --> $DIR/abstract-const-as-cast-3.rs:25:5
@@ -88,7 +88,7 @@ note: required by a bound in `use_trait_impl::assert_impl`
   --> $DIR/abstract-const-as-cast-3.rs:14:23
    |
 LL |     fn assert_impl<T: Trait>() {}
-   |                       ^^^^^ required by this bound in `use_trait_impl::assert_impl`
+   |                       ^^^^^ required by this bound in `assert_impl`
 
 error: unconstrained generic constant
   --> $DIR/abstract-const-as-cast-3.rs:35:19
@@ -106,7 +106,7 @@ note: required by a bound in `use_trait_impl_2::assert_impl`
   --> $DIR/abstract-const-as-cast-3.rs:32:23
    |
 LL |     fn assert_impl<T: Trait>() {}
-   |                       ^^^^^ required by this bound in `use_trait_impl_2::assert_impl`
+   |                       ^^^^^ required by this bound in `assert_impl`
 
 error[E0308]: mismatched types
   --> $DIR/abstract-const-as-cast-3.rs:35:5
@@ -120,7 +120,7 @@ note: required by a bound in `use_trait_impl_2::assert_impl`
   --> $DIR/abstract-const-as-cast-3.rs:32:23
    |
 LL |     fn assert_impl<T: Trait>() {}
-   |                       ^^^^^ required by this bound in `use_trait_impl_2::assert_impl`
+   |                       ^^^^^ required by this bound in `assert_impl`
 
 error: unconstrained generic constant
   --> $DIR/abstract-const-as-cast-3.rs:38:19
@@ -138,7 +138,7 @@ note: required by a bound in `use_trait_impl_2::assert_impl`
   --> $DIR/abstract-const-as-cast-3.rs:32:23
    |
 LL |     fn assert_impl<T: Trait>() {}
-   |                       ^^^^^ required by this bound in `use_trait_impl_2::assert_impl`
+   |                       ^^^^^ required by this bound in `assert_impl`
 
 error[E0308]: mismatched types
   --> $DIR/abstract-const-as-cast-3.rs:38:5
@@ -152,7 +152,7 @@ note: required by a bound in `use_trait_impl_2::assert_impl`
   --> $DIR/abstract-const-as-cast-3.rs:32:23
    |
 LL |     fn assert_impl<T: Trait>() {}
-   |                       ^^^^^ required by this bound in `use_trait_impl_2::assert_impl`
+   |                       ^^^^^ required by this bound in `assert_impl`
 
 error[E0308]: mismatched types
   --> $DIR/abstract-const-as-cast-3.rs:41:5
@@ -166,7 +166,7 @@ note: required by a bound in `use_trait_impl_2::assert_impl`
   --> $DIR/abstract-const-as-cast-3.rs:32:23
    |
 LL |     fn assert_impl<T: Trait>() {}
-   |                       ^^^^^ required by this bound in `use_trait_impl_2::assert_impl`
+   |                       ^^^^^ required by this bound in `assert_impl`
 
 error[E0308]: mismatched types
   --> $DIR/abstract-const-as-cast-3.rs:43:5
@@ -180,7 +180,7 @@ note: required by a bound in `use_trait_impl_2::assert_impl`
   --> $DIR/abstract-const-as-cast-3.rs:32:23
    |
 LL |     fn assert_impl<T: Trait>() {}
-   |                       ^^^^^ required by this bound in `use_trait_impl_2::assert_impl`
+   |                       ^^^^^ required by this bound in `assert_impl`
 
 error: aborting due to 12 previous errors
 
diff --git a/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-4.rs b/tests/ui/const-generics/generic_const_exprs/abstract-const-as-cast-4.rs
index 184263f89..184263f89 100644
--- a/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-4.rs
+++ b/tests/ui/const-generics/generic_const_exprs/abstract-const-as-cast-4.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/abstract-consts-as-cast-5.rs b/tests/ui/const-generics/generic_const_exprs/abstract-consts-as-cast-5.rs
index 916d60c0e..916d60c0e 100644
--- a/src/test/ui/const-generics/generic_const_exprs/abstract-consts-as-cast-5.rs
+++ b/tests/ui/const-generics/generic_const_exprs/abstract-consts-as-cast-5.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/abstract-consts-as-cast-5.stderr b/tests/ui/const-generics/generic_const_exprs/abstract-consts-as-cast-5.stderr
index d48b639db..d48b639db 100644
--- a/src/test/ui/const-generics/generic_const_exprs/abstract-consts-as-cast-5.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/abstract-consts-as-cast-5.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.full.stderr b/tests/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.full.stderr
index 041232e86..1d10dfdf1 100644
--- a/src/test/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.full.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.full.stderr
@@ -10,7 +10,7 @@ error: overly complex generic constant
   --> $DIR/array-size-in-generic-struct-param.rs:19:15
    |
 LL |     arr: [u8; CFG.arr_size],
-   |               ^^^^^^^^^^^^ field access is not supported in generic constant
+   |               ^^^^^^^^^^^^ field access is not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/src/test/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.min.stderr b/tests/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.min.stderr
index 18e9135d0..18e9135d0 100644
--- a/src/test/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.min.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.min.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.rs b/tests/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.rs
index 7d3fe413c..7d3fe413c 100644
--- a/src/test/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.rs
+++ b/tests/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/assoc_const_unification/const_equate_assoc_consts.rs b/tests/ui/const-generics/generic_const_exprs/assoc_const_unification/const_equate_assoc_consts.rs
index e8f89cb1a..e8f89cb1a 100644
--- a/src/test/ui/const-generics/generic_const_exprs/assoc_const_unification/const_equate_assoc_consts.rs
+++ b/tests/ui/const-generics/generic_const_exprs/assoc_const_unification/const_equate_assoc_consts.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/assoc_const_unification/doesnt_unify_evaluatable.rs b/tests/ui/const-generics/generic_const_exprs/assoc_const_unification/doesnt_unify_evaluatable.rs
index c8f7553da..c8f7553da 100644
--- a/src/test/ui/const-generics/generic_const_exprs/assoc_const_unification/doesnt_unify_evaluatable.rs
+++ b/tests/ui/const-generics/generic_const_exprs/assoc_const_unification/doesnt_unify_evaluatable.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/assoc_const_unification/doesnt_unify_evaluatable.stderr b/tests/ui/const-generics/generic_const_exprs/assoc_const_unification/doesnt_unify_evaluatable.stderr
index e4a0cabe5..e4a0cabe5 100644
--- a/src/test/ui/const-generics/generic_const_exprs/assoc_const_unification/doesnt_unify_evaluatable.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/assoc_const_unification/doesnt_unify_evaluatable.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/assoc_const_unification/dropck_unifies_assoc_consts.rs b/tests/ui/const-generics/generic_const_exprs/assoc_const_unification/dropck_unifies_assoc_consts.rs
index 274caa1e9..274caa1e9 100644
--- a/src/test/ui/const-generics/generic_const_exprs/assoc_const_unification/dropck_unifies_assoc_consts.rs
+++ b/tests/ui/const-generics/generic_const_exprs/assoc_const_unification/dropck_unifies_assoc_consts.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/assoc_const_unification/unifies_evaluatable.rs b/tests/ui/const-generics/generic_const_exprs/assoc_const_unification/unifies_evaluatable.rs
index 6597b9f2b..6597b9f2b 100644
--- a/src/test/ui/const-generics/generic_const_exprs/assoc_const_unification/unifies_evaluatable.rs
+++ b/tests/ui/const-generics/generic_const_exprs/assoc_const_unification/unifies_evaluatable.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/associated-const.rs b/tests/ui/const-generics/generic_const_exprs/associated-const.rs
index a67776322..a67776322 100644
--- a/src/test/ui/const-generics/generic_const_exprs/associated-const.rs
+++ b/tests/ui/const-generics/generic_const_exprs/associated-const.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/associated-consts.rs b/tests/ui/const-generics/generic_const_exprs/associated-consts.rs
index b839008d4..b839008d4 100644
--- a/src/test/ui/const-generics/generic_const_exprs/associated-consts.rs
+++ b/tests/ui/const-generics/generic_const_exprs/associated-consts.rs
diff --git a/tests/ui/const-generics/generic_const_exprs/auxiliary/anon_const_non_local.rs b/tests/ui/const-generics/generic_const_exprs/auxiliary/anon_const_non_local.rs
new file mode 100644
index 000000000..97be07493
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/auxiliary/anon_const_non_local.rs
@@ -0,0 +1,8 @@
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+
+pub struct Foo<const N: usize>;
+
+pub fn foo<const N: usize>() -> Foo<{ N + 1 }> {
+    Foo
+}
diff --git a/src/test/ui/const-generics/generic_const_exprs/auxiliary/const_evaluatable_lib.rs b/tests/ui/const-generics/generic_const_exprs/auxiliary/const_evaluatable_lib.rs
index 15d618cae..15d618cae 100644
--- a/src/test/ui/const-generics/generic_const_exprs/auxiliary/const_evaluatable_lib.rs
+++ b/tests/ui/const-generics/generic_const_exprs/auxiliary/const_evaluatable_lib.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/auxiliary/issue-94287-aux.rs b/tests/ui/const-generics/generic_const_exprs/auxiliary/issue-94287-aux.rs
index df454dae7..df454dae7 100644
--- a/src/test/ui/const-generics/generic_const_exprs/auxiliary/issue-94287-aux.rs
+++ b/tests/ui/const-generics/generic_const_exprs/auxiliary/issue-94287-aux.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/closures.rs b/tests/ui/const-generics/generic_const_exprs/closures.rs
index 1ea310d06..1ea310d06 100644
--- a/src/test/ui/const-generics/generic_const_exprs/closures.rs
+++ b/tests/ui/const-generics/generic_const_exprs/closures.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/closures.stderr b/tests/ui/const-generics/generic_const_exprs/closures.stderr
index a7d891d77..a7d891d77 100644
--- a/src/test/ui/const-generics/generic_const_exprs/closures.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/closures.stderr
diff --git a/tests/ui/const-generics/generic_const_exprs/const-block-is-poly.rs b/tests/ui/const-generics/generic_const_exprs/const-block-is-poly.rs
new file mode 100644
index 000000000..7332a8f03
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/const-block-is-poly.rs
@@ -0,0 +1,11 @@
+#![feature(inline_const, generic_const_exprs)]
+//~^ WARN the feature `generic_const_exprs` is incomplete
+
+fn foo<T>() {
+    let _ = [0u8; const { std::mem::size_of::<T>() }];
+    //~^ ERROR: overly complex generic constant
+}
+
+fn main() {
+    foo::<i32>();
+}
diff --git a/tests/ui/const-generics/generic_const_exprs/const-block-is-poly.stderr b/tests/ui/const-generics/generic_const_exprs/const-block-is-poly.stderr
new file mode 100644
index 000000000..f26259908
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/const-block-is-poly.stderr
@@ -0,0 +1,20 @@
+warning: the feature `generic_const_exprs` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/const-block-is-poly.rs:1:26
+   |
+LL | #![feature(inline_const, generic_const_exprs)]
+   |                          ^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #76560 <https://github.com/rust-lang/rust/issues/76560> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+error: overly complex generic constant
+  --> $DIR/const-block-is-poly.rs:5:19
+   |
+LL |     let _ = [0u8; const { std::mem::size_of::<T>() }];
+   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ const blocks are not supported in generic constants
+   |
+   = help: consider moving this anonymous constant into a `const` function
+   = note: this operation may be supported in the future
+
+error: aborting due to previous error; 1 warning emitted
+
diff --git a/src/test/ui/const-generics/generic_const_exprs/const_eval_resolve_canonical.rs b/tests/ui/const-generics/generic_const_exprs/const_eval_resolve_canonical.rs
index 5874625ad..5874625ad 100644
--- a/src/test/ui/const-generics/generic_const_exprs/const_eval_resolve_canonical.rs
+++ b/tests/ui/const-generics/generic_const_exprs/const_eval_resolve_canonical.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/const_kind_expr/wf_obligation.rs b/tests/ui/const-generics/generic_const_exprs/const_kind_expr/wf_obligation.rs
index 6093fc70b..6093fc70b 100644
--- a/src/test/ui/const-generics/generic_const_exprs/const_kind_expr/wf_obligation.rs
+++ b/tests/ui/const-generics/generic_const_exprs/const_kind_expr/wf_obligation.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/const_kind_expr/wf_obligation.stderr b/tests/ui/const-generics/generic_const_exprs/const_kind_expr/wf_obligation.stderr
index da5194696..da5194696 100644
--- a/src/test/ui/const-generics/generic_const_exprs/const_kind_expr/wf_obligation.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/const_kind_expr/wf_obligation.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/cross_crate.rs b/tests/ui/const-generics/generic_const_exprs/cross_crate.rs
index dfc69e0b0..dfc69e0b0 100644
--- a/src/test/ui/const-generics/generic_const_exprs/cross_crate.rs
+++ b/tests/ui/const-generics/generic_const_exprs/cross_crate.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/cross_crate_predicate.rs b/tests/ui/const-generics/generic_const_exprs/cross_crate_predicate.rs
index b08fffd69..b08fffd69 100644
--- a/src/test/ui/const-generics/generic_const_exprs/cross_crate_predicate.rs
+++ b/tests/ui/const-generics/generic_const_exprs/cross_crate_predicate.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/cross_crate_predicate.stderr b/tests/ui/const-generics/generic_const_exprs/cross_crate_predicate.stderr
index 7b4d46b82..7b4d46b82 100644
--- a/src/test/ui/const-generics/generic_const_exprs/cross_crate_predicate.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/cross_crate_predicate.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/dependence_lint.full.stderr b/tests/ui/const-generics/generic_const_exprs/dependence_lint.full.stderr
index d674e3acd..d674e3acd 100644
--- a/src/test/ui/const-generics/generic_const_exprs/dependence_lint.full.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/dependence_lint.full.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/dependence_lint.gce.stderr b/tests/ui/const-generics/generic_const_exprs/dependence_lint.gce.stderr
index 74111ef1d..74111ef1d 100644
--- a/src/test/ui/const-generics/generic_const_exprs/dependence_lint.gce.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/dependence_lint.gce.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/dependence_lint.rs b/tests/ui/const-generics/generic_const_exprs/dependence_lint.rs
index b715e07f8..b715e07f8 100644
--- a/src/test/ui/const-generics/generic_const_exprs/dependence_lint.rs
+++ b/tests/ui/const-generics/generic_const_exprs/dependence_lint.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/different-fn.rs b/tests/ui/const-generics/generic_const_exprs/different-fn.rs
index e8bc703bd..e8bc703bd 100644
--- a/src/test/ui/const-generics/generic_const_exprs/different-fn.rs
+++ b/tests/ui/const-generics/generic_const_exprs/different-fn.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/different-fn.stderr b/tests/ui/const-generics/generic_const_exprs/different-fn.stderr
index 83a2f3740..83a2f3740 100644
--- a/src/test/ui/const-generics/generic_const_exprs/different-fn.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/different-fn.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/division.rs b/tests/ui/const-generics/generic_const_exprs/division.rs
index 098fa9e04..098fa9e04 100644
--- a/src/test/ui/const-generics/generic_const_exprs/division.rs
+++ b/tests/ui/const-generics/generic_const_exprs/division.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/dont-eagerly-error-in-is-const-evaluatable.rs b/tests/ui/const-generics/generic_const_exprs/dont-eagerly-error-in-is-const-evaluatable.rs
index 3543960c3..3543960c3 100644
--- a/src/test/ui/const-generics/generic_const_exprs/dont-eagerly-error-in-is-const-evaluatable.rs
+++ b/tests/ui/const-generics/generic_const_exprs/dont-eagerly-error-in-is-const-evaluatable.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/drop_impl.rs b/tests/ui/const-generics/generic_const_exprs/drop_impl.rs
index 077f77aa0..077f77aa0 100644
--- a/src/test/ui/const-generics/generic_const_exprs/drop_impl.rs
+++ b/tests/ui/const-generics/generic_const_exprs/drop_impl.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/elaborate-trait-pred.rs b/tests/ui/const-generics/generic_const_exprs/elaborate-trait-pred.rs
index e4111157e..e4111157e 100644
--- a/src/test/ui/const-generics/generic_const_exprs/elaborate-trait-pred.rs
+++ b/tests/ui/const-generics/generic_const_exprs/elaborate-trait-pred.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/eval-privacy.rs b/tests/ui/const-generics/generic_const_exprs/eval-privacy.rs
index 8023b998a..8023b998a 100644
--- a/src/test/ui/const-generics/generic_const_exprs/eval-privacy.rs
+++ b/tests/ui/const-generics/generic_const_exprs/eval-privacy.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/eval-privacy.stderr b/tests/ui/const-generics/generic_const_exprs/eval-privacy.stderr
index 2d9de8805..2d9de8805 100644
--- a/src/test/ui/const-generics/generic_const_exprs/eval-privacy.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/eval-privacy.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/eval-try-unify.rs b/tests/ui/const-generics/generic_const_exprs/eval-try-unify.rs
index c59d62e57..c59d62e57 100644
--- a/src/test/ui/const-generics/generic_const_exprs/eval-try-unify.rs
+++ b/tests/ui/const-generics/generic_const_exprs/eval-try-unify.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/eval-try-unify.stderr b/tests/ui/const-generics/generic_const_exprs/eval-try-unify.stderr
index 8eb1fccc5..8eb1fccc5 100644
--- a/src/test/ui/const-generics/generic_const_exprs/eval-try-unify.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/eval-try-unify.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/evaluated-to-ambig.rs b/tests/ui/const-generics/generic_const_exprs/evaluated-to-ambig.rs
index 340e35e1c..340e35e1c 100644
--- a/src/test/ui/const-generics/generic_const_exprs/evaluated-to-ambig.rs
+++ b/tests/ui/const-generics/generic_const_exprs/evaluated-to-ambig.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/feature-gate-generic_const_exprs.rs b/tests/ui/const-generics/generic_const_exprs/feature-gate-generic_const_exprs.rs
index 10ab2fd86..10ab2fd86 100644
--- a/src/test/ui/const-generics/generic_const_exprs/feature-gate-generic_const_exprs.rs
+++ b/tests/ui/const-generics/generic_const_exprs/feature-gate-generic_const_exprs.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/feature-gate-generic_const_exprs.stderr b/tests/ui/const-generics/generic_const_exprs/feature-gate-generic_const_exprs.stderr
index 2d60ebaa8..2d60ebaa8 100644
--- a/src/test/ui/const-generics/generic_const_exprs/feature-gate-generic_const_exprs.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/feature-gate-generic_const_exprs.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/fn_call.rs b/tests/ui/const-generics/generic_const_exprs/fn_call.rs
index cbe4277df..cbe4277df 100644
--- a/src/test/ui/const-generics/generic_const_exprs/fn_call.rs
+++ b/tests/ui/const-generics/generic_const_exprs/fn_call.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/from-sig-fail.rs b/tests/ui/const-generics/generic_const_exprs/from-sig-fail.rs
index b8f9827ec..b8f9827ec 100644
--- a/src/test/ui/const-generics/generic_const_exprs/from-sig-fail.rs
+++ b/tests/ui/const-generics/generic_const_exprs/from-sig-fail.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/from-sig-fail.stderr b/tests/ui/const-generics/generic_const_exprs/from-sig-fail.stderr
index bd71b49ee..bd71b49ee 100644
--- a/src/test/ui/const-generics/generic_const_exprs/from-sig-fail.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/from-sig-fail.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/from-sig.rs b/tests/ui/const-generics/generic_const_exprs/from-sig.rs
index 28de4f864..28de4f864 100644
--- a/src/test/ui/const-generics/generic_const_exprs/from-sig.rs
+++ b/tests/ui/const-generics/generic_const_exprs/from-sig.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/function-call.rs b/tests/ui/const-generics/generic_const_exprs/function-call.rs
index 3c866333d..3c866333d 100644
--- a/src/test/ui/const-generics/generic_const_exprs/function-call.rs
+++ b/tests/ui/const-generics/generic_const_exprs/function-call.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/function-call.stderr b/tests/ui/const-generics/generic_const_exprs/function-call.stderr
index 84abfe578..84abfe578 100644
--- a/src/test/ui/const-generics/generic_const_exprs/function-call.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/function-call.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/impl-bounds.rs b/tests/ui/const-generics/generic_const_exprs/impl-bounds.rs
index 7120d6ee2..7120d6ee2 100644
--- a/src/test/ui/const-generics/generic_const_exprs/impl-bounds.rs
+++ b/tests/ui/const-generics/generic_const_exprs/impl-bounds.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/infer-too-generic.rs b/tests/ui/const-generics/generic_const_exprs/infer-too-generic.rs
index b8058c252..b8058c252 100644
--- a/src/test/ui/const-generics/generic_const_exprs/infer-too-generic.rs
+++ b/tests/ui/const-generics/generic_const_exprs/infer-too-generic.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-100217.rs b/tests/ui/const-generics/generic_const_exprs/issue-100217.rs
index acdc348a3..acdc348a3 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-100217.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-100217.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-100360.rs b/tests/ui/const-generics/generic_const_exprs/issue-100360.rs
index 5572f1f88..5572f1f88 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-100360.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-100360.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-102074.rs b/tests/ui/const-generics/generic_const_exprs/issue-102074.rs
index 66d15cf12..66d15cf12 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-102074.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-102074.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-102768.rs b/tests/ui/const-generics/generic_const_exprs/issue-102768.rs
index 7aea0d30d..7aea0d30d 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-102768.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-102768.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-102768.stderr b/tests/ui/const-generics/generic_const_exprs/issue-102768.stderr
index 8278edabe..8278edabe 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-102768.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/issue-102768.stderr
diff --git a/tests/ui/const-generics/generic_const_exprs/issue-105257.rs b/tests/ui/const-generics/generic_const_exprs/issue-105257.rs
new file mode 100644
index 000000000..d8b23bc01
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/issue-105257.rs
@@ -0,0 +1,9 @@
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+
+trait Trait<T> {
+    fn fnc<const N: usize = "">(&self) {} //~ERROR defaults for const parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions
+    fn foo<const N: usize = { std::mem::size_of::<T>() }>(&self) {} //~ERROR defaults for const parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions
+}
+
+fn main() {}
diff --git a/tests/ui/const-generics/generic_const_exprs/issue-105257.stderr b/tests/ui/const-generics/generic_const_exprs/issue-105257.stderr
new file mode 100644
index 000000000..ed7a8cb19
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/issue-105257.stderr
@@ -0,0 +1,14 @@
+error: defaults for const parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions
+  --> $DIR/issue-105257.rs:5:12
+   |
+LL |     fn fnc<const N: usize = "">(&self) {}
+   |            ^^^^^^^^^^^^^^^^^^^
+
+error: defaults for const parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions
+  --> $DIR/issue-105257.rs:6:12
+   |
+LL |     fn foo<const N: usize = { std::mem::size_of::<T>() }>(&self) {}
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/const-generics/generic_const_exprs/issue-105608.rs b/tests/ui/const-generics/generic_const_exprs/issue-105608.rs
new file mode 100644
index 000000000..e28ba3b1a
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/issue-105608.rs
@@ -0,0 +1,15 @@
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+
+struct Combination<const STRATEGIES: usize>;
+
+impl<const STRATEGIES: usize> Combination<STRATEGIES> {
+    fn and<M>(self) -> Combination<{ STRATEGIES + 1 }> {
+        Combination
+    }
+}
+
+pub fn main() {
+    Combination::<0>.and::<_>().and::<_>();
+    //~^ ERROR: type annotations needed
+}
diff --git a/tests/ui/const-generics/generic_const_exprs/issue-105608.stderr b/tests/ui/const-generics/generic_const_exprs/issue-105608.stderr
new file mode 100644
index 000000000..0be4c43da
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/issue-105608.stderr
@@ -0,0 +1,14 @@
+error[E0282]: type annotations needed
+  --> $DIR/issue-105608.rs:13:22
+   |
+LL |     Combination::<0>.and::<_>().and::<_>();
+   |                      ^^^ cannot infer type of the type parameter `M` declared on the associated function `and`
+   |
+help: consider specifying the generic argument
+   |
+LL |     Combination::<0>.and::<_>().and::<_>();
+   |                         ~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-62504.full.stderr b/tests/ui/const-generics/generic_const_exprs/issue-62504.full.stderr
index 0742db398..0742db398 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-62504.full.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/issue-62504.full.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-62504.min.stderr b/tests/ui/const-generics/generic_const_exprs/issue-62504.min.stderr
index 9bea4105d..65822856e 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-62504.min.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/issue-62504.min.stderr
@@ -15,7 +15,7 @@ LL |         ArrayHolder([0; Self::SIZE])
    |         arguments to this struct are incorrect
    |
    = note: expected array `[u32; X]`
-              found array `[u32; _]`
+              found array `[u32; Self::SIZE]`
 note: tuple struct defined here
   --> $DIR/issue-62504.rs:14:8
    |
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-62504.rs b/tests/ui/const-generics/generic_const_exprs/issue-62504.rs
index a97f4b8ff..a97f4b8ff 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-62504.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-62504.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-69654.rs b/tests/ui/const-generics/generic_const_exprs/issue-69654.rs
index 9b36699bb..9b36699bb 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-69654.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-69654.rs
diff --git a/tests/ui/const-generics/generic_const_exprs/issue-69654.stderr b/tests/ui/const-generics/generic_const_exprs/issue-69654.stderr
new file mode 100644
index 000000000..eb4ff8305
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/issue-69654.stderr
@@ -0,0 +1,30 @@
+error[E0423]: expected value, found type parameter `T`
+  --> $DIR/issue-69654.rs:5:25
+   |
+LL | impl<T> Bar<T> for [u8; T] {}
+   |      -                  ^ not a value
+   |      |
+   |      found this type parameter
+
+error[E0599]: the function or associated item `foo` exists for struct `Foo<_>`, but its trait bounds were not satisfied
+  --> $DIR/issue-69654.rs:17:10
+   |
+LL | struct Foo<const N: usize> {}
+   | -------------------------- function or associated item `foo` not found for this struct
+...
+LL |     Foo::foo();
+   |          ^^^ function or associated item cannot be called on `Foo<_>` due to unsatisfied trait bounds
+   |
+note: trait bound `[u8; _]: Bar<[(); _]>` was not satisfied
+  --> $DIR/issue-69654.rs:11:14
+   |
+LL | impl<const N: usize> Foo<N>
+   |                      ------
+LL | where
+LL |     [u8; N]: Bar<[(); N]>,
+   |              ^^^^^^^^^^^^ unsatisfied trait bound introduced here
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0423, E0599.
+For more information about an error, try `rustc --explain E0423`.
diff --git a/tests/ui/const-generics/generic_const_exprs/issue-72787.min.stderr b/tests/ui/const-generics/generic_const_exprs/issue-72787.min.stderr
new file mode 100644
index 000000000..ea6f5f692
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/issue-72787.min.stderr
@@ -0,0 +1,38 @@
+error: generic parameters may not be used in const operations
+  --> $DIR/issue-72787.rs:11:17
+   |
+LL |     Condition<{ LHS <= RHS }>: True
+   |                 ^^^ cannot perform const operation using `LHS`
+   |
+   = help: const parameters may only be used as standalone arguments, i.e. `LHS`
+   = help: use `#![feature(generic_const_exprs)]` to allow generic const expressions
+
+error: generic parameters may not be used in const operations
+  --> $DIR/issue-72787.rs:11:24
+   |
+LL |     Condition<{ LHS <= RHS }>: True
+   |                        ^^^ cannot perform const operation using `RHS`
+   |
+   = help: const parameters may only be used as standalone arguments, i.e. `RHS`
+   = help: use `#![feature(generic_const_exprs)]` to allow generic const expressions
+
+error: generic parameters may not be used in const operations
+  --> $DIR/issue-72787.rs:23:25
+   |
+LL |     IsLessOrEqual<{ 8 - I }, { 8 - J }>: True,
+   |                         ^ cannot perform const operation using `I`
+   |
+   = help: const parameters may only be used as standalone arguments, i.e. `I`
+   = help: use `#![feature(generic_const_exprs)]` to allow generic const expressions
+
+error: generic parameters may not be used in const operations
+  --> $DIR/issue-72787.rs:23:36
+   |
+LL |     IsLessOrEqual<{ 8 - I }, { 8 - J }>: True,
+   |                                    ^ cannot perform const operation using `J`
+   |
+   = help: const parameters may only be used as standalone arguments, i.e. `J`
+   = help: use `#![feature(generic_const_exprs)]` to allow generic const expressions
+
+error: aborting due to 4 previous errors
+
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-72787.rs b/tests/ui/const-generics/generic_const_exprs/issue-72787.rs
index c651bf1c8..657fec2e9 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-72787.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-72787.rs
@@ -19,8 +19,6 @@ struct S<const I: u32, const J: u32>;
 impl<const I: u32, const J: u32> S<I, J>
 where
     IsLessOrEqual<I, 8>: True,
-//[min]~^ Error type annotations needed
-//[min]~| Error type annotations needed
     IsLessOrEqual<J, 8>: True,
     IsLessOrEqual<{ 8 - I }, { 8 - J }>: True,
 //[min]~^ Error generic parameters may not be used in const operations
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.full.stderr b/tests/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.full.stderr
index f2fddfbfb..f2fddfbfb 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.full.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.full.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.min.stderr b/tests/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.min.stderr
index 42671412f..42671412f 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.min.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.min.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.rs b/tests/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.rs
index 7a5aa9e47..7a5aa9e47 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-73298.rs b/tests/ui/const-generics/generic_const_exprs/issue-73298.rs
index 3c59e1b79..3c59e1b79 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-73298.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-73298.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-73899.rs b/tests/ui/const-generics/generic_const_exprs/issue-73899.rs
index d1ab1be04..d1ab1be04 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-73899.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-73899.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-74634.rs b/tests/ui/const-generics/generic_const_exprs/issue-74634.rs
index cd1f7a9da..cd1f7a9da 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-74634.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-74634.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-74713.rs b/tests/ui/const-generics/generic_const_exprs/issue-74713.rs
index 0bcb997d9..0bcb997d9 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-74713.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-74713.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-74713.stderr b/tests/ui/const-generics/generic_const_exprs/issue-74713.stderr
index e7673df0a..e7673df0a 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-74713.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/issue-74713.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-76595.rs b/tests/ui/const-generics/generic_const_exprs/issue-76595.rs
index faa8b3d10..10247ce6b 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-76595.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-76595.rs
@@ -13,5 +13,5 @@ fn test<T, const P: usize>() where Bool<{core::mem::size_of::<T>() > 4}>: True {
 
 fn main() {
     test::<2>();
-    //~^ ERROR this function takes 2 generic arguments
+    //~^ ERROR function takes 2 generic arguments
 }
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-76595.stderr b/tests/ui/const-generics/generic_const_exprs/issue-76595.stderr
index c587a7e15..c587a7e15 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-76595.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/issue-76595.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-79518-default_trait_method_normalization.rs b/tests/ui/const-generics/generic_const_exprs/issue-79518-default_trait_method_normalization.rs
index 2fa9a71fb..2fa9a71fb 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-79518-default_trait_method_normalization.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-79518-default_trait_method_normalization.rs
diff --git a/tests/ui/const-generics/generic_const_exprs/issue-79518-default_trait_method_normalization.stderr b/tests/ui/const-generics/generic_const_exprs/issue-79518-default_trait_method_normalization.stderr
new file mode 100644
index 000000000..9baf9790e
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/issue-79518-default_trait_method_normalization.stderr
@@ -0,0 +1,16 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-79518-default_trait_method_normalization.rs:16:32
+   |
+LL |         Self::AssocInstance == [(); std::mem::size_of::<Self::Assoc>()];
+   |         -------------------    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected associated type, found array `[(); std::mem::size_of::<Self::Assoc>()]`
+   |         |
+   |         expected because this is `<Self as Foo>::Assoc`
+   |
+   = note: expected associated type `<Self as Foo>::Assoc`
+                        found array `[(); std::mem::size_of::<Self::Assoc>()]`
+   = help: consider constraining the associated type `<Self as Foo>::Assoc` to `[(); std::mem::size_of::<Self::Assoc>()]` or calling a method that returns `<Self as Foo>::Assoc`
+   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-80561-incorrect-param-env.rs b/tests/ui/const-generics/generic_const_exprs/issue-80561-incorrect-param-env.rs
index 77d3c98da..77d3c98da 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-80561-incorrect-param-env.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-80561-incorrect-param-env.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-80742.rs b/tests/ui/const-generics/generic_const_exprs/issue-80742.rs
index 275f69953..275f69953 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-80742.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-80742.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-80742.stderr b/tests/ui/const-generics/generic_const_exprs/issue-80742.stderr
index bf1b411ee..6aa8ee13b 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-80742.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/issue-80742.stderr
@@ -1,14 +1,10 @@
 error[E0080]: evaluation of `Inline::<dyn std::fmt::Debug>::{constant#0}` failed
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
    |
-LL |     intrinsics::size_of::<T>()
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ size_of called on unsized type `dyn Debug`
+   = note: size_of called on unsized type `dyn Debug`
    |
 note: inside `std::mem::size_of::<dyn Debug>`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL |     intrinsics::size_of::<T>()
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `Inline::<dyn Debug>::{constant#0}`
   --> $DIR/issue-80742.rs:22:10
    |
@@ -23,26 +19,29 @@ LL | struct Inline<T>
 ...
 LL |     let dst = Inline::<dyn Debug>::new(0);
    |                                    ^^^ function or associated item cannot be called on `Inline<dyn Debug>` due to unsatisfied trait bounds
+  --> $SRC_DIR/core/src/fmt/mod.rs:LL:COL
+   |
+   = note: doesn't satisfy `dyn Debug: Sized`
    |
-  ::: $SRC_DIR/core/src/fmt/mod.rs:LL:COL
+note: trait bound `dyn Debug: Sized` was not satisfied
+  --> $DIR/issue-80742.rs:20:6
    |
-LL | pub trait Debug {
-   | --------------- doesn't satisfy `dyn Debug: Sized`
+LL | impl<T> Inline<T>
+   |      ^  ---------
+   |      |
+   |      unsatisfied trait bound introduced here
+help: consider relaxing the type parameter's implicit `Sized` bound
    |
-   = note: the following trait bounds were not satisfied:
-           `dyn Debug: Sized`
+LL | impl<T: ?Sized> Inline<T>
+   |       ++++++++
 
 error[E0080]: evaluation of `Inline::<dyn std::fmt::Debug>::{constant#0}` failed
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
    |
-LL |     intrinsics::size_of::<T>()
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ size_of called on unsized type `dyn Debug`
+   = note: size_of called on unsized type `dyn Debug`
    |
 note: inside `std::mem::size_of::<dyn Debug>`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL |     intrinsics::size_of::<T>()
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `Inline::<dyn Debug>::{constant#0}`
   --> $DIR/issue-80742.rs:14:10
    |
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-82268.rs b/tests/ui/const-generics/generic_const_exprs/issue-82268.rs
index d08fc5beb..d08fc5beb 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-82268.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-82268.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-83765.rs b/tests/ui/const-generics/generic_const_exprs/issue-83765.rs
index fac811d13..fac811d13 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-83765.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-83765.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-83765.stderr b/tests/ui/const-generics/generic_const_exprs/issue-83765.stderr
index b693023f1..b693023f1 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-83765.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/issue-83765.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-83972.rs b/tests/ui/const-generics/generic_const_exprs/issue-83972.rs
index 0063719b8..0063719b8 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-83972.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-83972.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-84408.rs b/tests/ui/const-generics/generic_const_exprs/issue-84408.rs
index fb2e5590d..fb2e5590d 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-84408.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-84408.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-84669.rs b/tests/ui/const-generics/generic_const_exprs/issue-84669.rs
index 3933ff20a..3933ff20a 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-84669.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-84669.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-85848.rs b/tests/ui/const-generics/generic_const_exprs/issue-85848.rs
index 3a7f4c618..3a7f4c618 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-85848.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-85848.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-85848.stderr b/tests/ui/const-generics/generic_const_exprs/issue-85848.stderr
index 09bcb0860..e50ac671e 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-85848.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/issue-85848.stderr
@@ -11,12 +11,12 @@ note: required for `&C` to implement `Contains<(), true>`
   --> $DIR/issue-85848.rs:21:12
    |
 LL | impl<T, U> Contains<T, { contains::<T, U>() }> for U where T: _Contains<U> {}
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^          ------------ unsatisfied trait bound introduced here
 note: required for `&C` to implement `Delegates<()>`
   --> $DIR/issue-85848.rs:12:12
    |
 LL | impl<T, U> Delegates<U> for T where T: Contains<U, true> {}
-   |            ^^^^^^^^^^^^     ^
+   |            ^^^^^^^^^^^^     ^          ----------------- unsatisfied trait bound introduced here
 note: required by a bound in `writes_to_specific_path`
   --> $DIR/issue-85848.rs:30:31
    |
@@ -36,12 +36,14 @@ note: required for `&C` to implement `Contains<(), true>`
   --> $DIR/issue-85848.rs:21:12
    |
 LL | impl<T, U> Contains<T, { contains::<T, U>() }> for U where T: _Contains<U> {}
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^
+   |            ^^^^^^^^^^^^----------------------^     ^
+   |                        |
+   |                        unsatisfied trait bound introduced here
 note: required for `&C` to implement `Delegates<()>`
   --> $DIR/issue-85848.rs:12:12
    |
 LL | impl<T, U> Delegates<U> for T where T: Contains<U, true> {}
-   |            ^^^^^^^^^^^^     ^
+   |            ^^^^^^^^^^^^     ^          ----------------- unsatisfied trait bound introduced here
 note: required by a bound in `writes_to_specific_path`
   --> $DIR/issue-85848.rs:30:31
    |
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-86710.rs b/tests/ui/const-generics/generic_const_exprs/issue-86710.rs
index bdd8a21b3..bdd8a21b3 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-86710.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-86710.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-89851.rs b/tests/ui/const-generics/generic_const_exprs/issue-89851.rs
index cde849d90..cde849d90 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-89851.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-89851.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-90847.rs b/tests/ui/const-generics/generic_const_exprs/issue-90847.rs
index ebc6fe141..ebc6fe141 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-90847.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-90847.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-94287.rs b/tests/ui/const-generics/generic_const_exprs/issue-94287.rs
index 643126a46..643126a46 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-94287.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-94287.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-94287.stderr b/tests/ui/const-generics/generic_const_exprs/issue-94287.stderr
index 7390a0077..7390a0077 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-94287.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/issue-94287.stderr
diff --git a/tests/ui/const-generics/generic_const_exprs/issue-94293.rs b/tests/ui/const-generics/generic_const_exprs/issue-94293.rs
new file mode 100644
index 000000000..713c5d89a
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/issue-94293.rs
@@ -0,0 +1,31 @@
+// check-pass
+
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+#![deny(const_evaluatable_unchecked)]
+
+pub struct If<const CONDITION: bool>;
+pub trait True {}
+impl True for If<true> {}
+
+pub struct FixedI8<const FRAC: u32> {
+    pub bits: i8,
+}
+
+impl<const FRAC_LHS: u32, const FRAC_RHS: u32> PartialEq<FixedI8<FRAC_RHS>> for FixedI8<FRAC_LHS>
+where
+    If<{ FRAC_RHS <= 8 }>: True,
+{
+    fn eq(&self, _rhs: &FixedI8<FRAC_RHS>) -> bool {
+        unimplemented!()
+    }
+}
+
+impl<const FRAC: u32> PartialEq<i8> for FixedI8<FRAC> {
+    fn eq(&self, rhs: &i8) -> bool {
+        let rhs_as_fixed = FixedI8::<0> { bits: *rhs };
+        PartialEq::eq(self, &rhs_as_fixed)
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-97047-ice-1.rs b/tests/ui/const-generics/generic_const_exprs/issue-97047-ice-1.rs
index 67e30232e..67e30232e 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-97047-ice-1.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-97047-ice-1.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-97047-ice-1.stderr b/tests/ui/const-generics/generic_const_exprs/issue-97047-ice-1.stderr
index 1cceaece7..1cceaece7 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-97047-ice-1.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/issue-97047-ice-1.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-97047-ice-2.rs b/tests/ui/const-generics/generic_const_exprs/issue-97047-ice-2.rs
index 00568a089..00568a089 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-97047-ice-2.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-97047-ice-2.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-97047-ice-2.stderr b/tests/ui/const-generics/generic_const_exprs/issue-97047-ice-2.stderr
index 774e842bc..774e842bc 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-97047-ice-2.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/issue-97047-ice-2.stderr
diff --git a/tests/ui/const-generics/generic_const_exprs/issue-99647.rs b/tests/ui/const-generics/generic_const_exprs/issue-99647.rs
new file mode 100644
index 000000000..f797beda8
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/issue-99647.rs
@@ -0,0 +1,15 @@
+// edition:2018
+// run-pass
+
+#![allow(incomplete_features)]
+#![feature(generic_const_exprs)]
+
+#[allow(unused)]
+async fn foo<'a>() {
+    let _data = &mut [0u8; { 1 + 4 }];
+    bar().await
+}
+
+async fn bar() {}
+
+fn main() {}
diff --git a/src/test/ui/const-generics/generic_const_exprs/issue-99705.rs b/tests/ui/const-generics/generic_const_exprs/issue-99705.rs
index 75b57b621..75b57b621 100644
--- a/src/test/ui/const-generics/generic_const_exprs/issue-99705.rs
+++ b/tests/ui/const-generics/generic_const_exprs/issue-99705.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/less_than.rs b/tests/ui/const-generics/generic_const_exprs/less_than.rs
index 2e9af1bf4..2e9af1bf4 100644
--- a/src/test/ui/const-generics/generic_const_exprs/less_than.rs
+++ b/tests/ui/const-generics/generic_const_exprs/less_than.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/let-bindings.rs b/tests/ui/const-generics/generic_const_exprs/let-bindings.rs
index cd5d76dd9..cd5d76dd9 100644
--- a/src/test/ui/const-generics/generic_const_exprs/let-bindings.rs
+++ b/tests/ui/const-generics/generic_const_exprs/let-bindings.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/let-bindings.stderr b/tests/ui/const-generics/generic_const_exprs/let-bindings.stderr
index 5ebb4c399..823a4f8a1 100644
--- a/src/test/ui/const-generics/generic_const_exprs/let-bindings.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/let-bindings.stderr
@@ -2,7 +2,7 @@ error: overly complex generic constant
   --> $DIR/let-bindings.rs:6:68
    |
 LL | fn test<const N: usize>() -> [u8; { let x = N; N + 1 }] where [u8; { let x = N; N + 1 }]: Default {
-   |                                                                    ^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constant
+   |                                                                    ^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
@@ -11,7 +11,7 @@ error: overly complex generic constant
   --> $DIR/let-bindings.rs:6:35
    |
 LL | fn test<const N: usize>() -> [u8; { let x = N; N + 1 }] where [u8; { let x = N; N + 1 }]: Default {
-   |                                   ^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constant
+   |                                   ^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/src/test/ui/const-generics/generic_const_exprs/needs_where_clause.rs b/tests/ui/const-generics/generic_const_exprs/needs_where_clause.rs
index 2bd3c801f..2bd3c801f 100644
--- a/src/test/ui/const-generics/generic_const_exprs/needs_where_clause.rs
+++ b/tests/ui/const-generics/generic_const_exprs/needs_where_clause.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/needs_where_clause.stderr b/tests/ui/const-generics/generic_const_exprs/needs_where_clause.stderr
index 7b41e39b7..7b41e39b7 100644
--- a/src/test/ui/const-generics/generic_const_exprs/needs_where_clause.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/needs_where_clause.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/nested-abstract-consts-1.rs b/tests/ui/const-generics/generic_const_exprs/nested-abstract-consts-1.rs
index 7e5022817..7e5022817 100644
--- a/src/test/ui/const-generics/generic_const_exprs/nested-abstract-consts-1.rs
+++ b/tests/ui/const-generics/generic_const_exprs/nested-abstract-consts-1.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/nested-abstract-consts-2.rs b/tests/ui/const-generics/generic_const_exprs/nested-abstract-consts-2.rs
index 769e3ae68..769e3ae68 100644
--- a/src/test/ui/const-generics/generic_const_exprs/nested-abstract-consts-2.rs
+++ b/tests/ui/const-generics/generic_const_exprs/nested-abstract-consts-2.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/nested_uneval_unification-1.rs b/tests/ui/const-generics/generic_const_exprs/nested_uneval_unification-1.rs
index 316887e5e..316887e5e 100644
--- a/src/test/ui/const-generics/generic_const_exprs/nested_uneval_unification-1.rs
+++ b/tests/ui/const-generics/generic_const_exprs/nested_uneval_unification-1.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/nested_uneval_unification-2.rs b/tests/ui/const-generics/generic_const_exprs/nested_uneval_unification-2.rs
index d45a6465b..d45a6465b 100644
--- a/src/test/ui/const-generics/generic_const_exprs/nested_uneval_unification-2.rs
+++ b/tests/ui/const-generics/generic_const_exprs/nested_uneval_unification-2.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/no_dependence.rs b/tests/ui/const-generics/generic_const_exprs/no_dependence.rs
index db8dc6ed4..db8dc6ed4 100644
--- a/src/test/ui/const-generics/generic_const_exprs/no_dependence.rs
+++ b/tests/ui/const-generics/generic_const_exprs/no_dependence.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/no_where_clause.rs b/tests/ui/const-generics/generic_const_exprs/no_where_clause.rs
index 9c5de0317..9c5de0317 100644
--- a/src/test/ui/const-generics/generic_const_exprs/no_where_clause.rs
+++ b/tests/ui/const-generics/generic_const_exprs/no_where_clause.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/no_where_clause.stderr b/tests/ui/const-generics/generic_const_exprs/no_where_clause.stderr
index 3e5c2f5ca..3e5c2f5ca 100644
--- a/src/test/ui/const-generics/generic_const_exprs/no_where_clause.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/no_where_clause.stderr
diff --git a/tests/ui/const-generics/generic_const_exprs/non_local_anon_const_diagnostics.rs b/tests/ui/const-generics/generic_const_exprs/non_local_anon_const_diagnostics.rs
new file mode 100644
index 000000000..1254b4435
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/non_local_anon_const_diagnostics.rs
@@ -0,0 +1,16 @@
+// aux-build:anon_const_non_local.rs
+
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+
+extern crate anon_const_non_local;
+
+fn bar<const M: usize>()
+where
+    [(); M + 1]:,
+{
+    let _: anon_const_non_local::Foo<2> = anon_const_non_local::foo::<M>();
+    //~^ ERROR: mismatched types
+}
+
+fn main() {}
diff --git a/tests/ui/const-generics/generic_const_exprs/non_local_anon_const_diagnostics.stderr b/tests/ui/const-generics/generic_const_exprs/non_local_anon_const_diagnostics.stderr
new file mode 100644
index 000000000..3926c830a
--- /dev/null
+++ b/tests/ui/const-generics/generic_const_exprs/non_local_anon_const_diagnostics.stderr
@@ -0,0 +1,12 @@
+error[E0308]: mismatched types
+  --> $DIR/non_local_anon_const_diagnostics.rs:12:43
+   |
+LL |     let _: anon_const_non_local::Foo<2> = anon_const_non_local::foo::<M>();
+   |                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `2`, found `anon_const_non_local::::foo::{constant#0}`
+   |
+   = note: expected constant `2`
+              found constant `anon_const_non_local::::foo::{constant#0}`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/const-generics/generic_const_exprs/normed_to_param_is_evaluatable.rs b/tests/ui/const-generics/generic_const_exprs/normed_to_param_is_evaluatable.rs
index b37b354ae..b37b354ae 100644
--- a/src/test/ui/const-generics/generic_const_exprs/normed_to_param_is_evaluatable.rs
+++ b/tests/ui/const-generics/generic_const_exprs/normed_to_param_is_evaluatable.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/object-safety-err-ret.rs b/tests/ui/const-generics/generic_const_exprs/object-safety-err-ret.rs
index 24d333aba..24d333aba 100644
--- a/src/test/ui/const-generics/generic_const_exprs/object-safety-err-ret.rs
+++ b/tests/ui/const-generics/generic_const_exprs/object-safety-err-ret.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/object-safety-err-ret.stderr b/tests/ui/const-generics/generic_const_exprs/object-safety-err-ret.stderr
index 4e1d71f15..4e1d71f15 100644
--- a/src/test/ui/const-generics/generic_const_exprs/object-safety-err-ret.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/object-safety-err-ret.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/object-safety-err-where-bounds.rs b/tests/ui/const-generics/generic_const_exprs/object-safety-err-where-bounds.rs
index 42c1cc507..42c1cc507 100644
--- a/src/test/ui/const-generics/generic_const_exprs/object-safety-err-where-bounds.rs
+++ b/tests/ui/const-generics/generic_const_exprs/object-safety-err-where-bounds.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/object-safety-err-where-bounds.stderr b/tests/ui/const-generics/generic_const_exprs/object-safety-err-where-bounds.stderr
index 440cf457e..440cf457e 100644
--- a/src/test/ui/const-generics/generic_const_exprs/object-safety-err-where-bounds.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/object-safety-err-where-bounds.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/object-safety-ok-infer-err.rs b/tests/ui/const-generics/generic_const_exprs/object-safety-ok-infer-err.rs
index 79e9834b5..79e9834b5 100644
--- a/src/test/ui/const-generics/generic_const_exprs/object-safety-ok-infer-err.rs
+++ b/tests/ui/const-generics/generic_const_exprs/object-safety-ok-infer-err.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/object-safety-ok-infer-err.stderr b/tests/ui/const-generics/generic_const_exprs/object-safety-ok-infer-err.stderr
index 59e9fee1e..59e9fee1e 100644
--- a/src/test/ui/const-generics/generic_const_exprs/object-safety-ok-infer-err.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/object-safety-ok-infer-err.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/object-safety-ok.rs b/tests/ui/const-generics/generic_const_exprs/object-safety-ok.rs
index f4c89f623..f4c89f623 100644
--- a/src/test/ui/const-generics/generic_const_exprs/object-safety-ok.rs
+++ b/tests/ui/const-generics/generic_const_exprs/object-safety-ok.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/obligation-cause.rs b/tests/ui/const-generics/generic_const_exprs/obligation-cause.rs
index e7c8e4f66..e7c8e4f66 100644
--- a/src/test/ui/const-generics/generic_const_exprs/obligation-cause.rs
+++ b/tests/ui/const-generics/generic_const_exprs/obligation-cause.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/obligation-cause.stderr b/tests/ui/const-generics/generic_const_exprs/obligation-cause.stderr
index a253ec676..a253ec676 100644
--- a/src/test/ui/const-generics/generic_const_exprs/obligation-cause.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/obligation-cause.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/simple_fail.rs b/tests/ui/const-generics/generic_const_exprs/simple_fail.rs
index cae54df4c..cae54df4c 100644
--- a/src/test/ui/const-generics/generic_const_exprs/simple_fail.rs
+++ b/tests/ui/const-generics/generic_const_exprs/simple_fail.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/simple_fail.stderr b/tests/ui/const-generics/generic_const_exprs/simple_fail.stderr
index a25fa56b7..a25fa56b7 100644
--- a/src/test/ui/const-generics/generic_const_exprs/simple_fail.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/simple_fail.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/subexprs_are_const_evalutable.rs b/tests/ui/const-generics/generic_const_exprs/subexprs_are_const_evalutable.rs
index d6574a3aa..d6574a3aa 100644
--- a/src/test/ui/const-generics/generic_const_exprs/subexprs_are_const_evalutable.rs
+++ b/tests/ui/const-generics/generic_const_exprs/subexprs_are_const_evalutable.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/ty-alias-substitution.rs b/tests/ui/const-generics/generic_const_exprs/ty-alias-substitution.rs
index d058b3638..d058b3638 100644
--- a/src/test/ui/const-generics/generic_const_exprs/ty-alias-substitution.rs
+++ b/tests/ui/const-generics/generic_const_exprs/ty-alias-substitution.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/unify-op-with-fn-call.rs b/tests/ui/const-generics/generic_const_exprs/unify-op-with-fn-call.rs
index c0404d35b..c0404d35b 100644
--- a/src/test/ui/const-generics/generic_const_exprs/unify-op-with-fn-call.rs
+++ b/tests/ui/const-generics/generic_const_exprs/unify-op-with-fn-call.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/unify-op-with-fn-call.stderr b/tests/ui/const-generics/generic_const_exprs/unify-op-with-fn-call.stderr
index d18c7916f..d18c7916f 100644
--- a/src/test/ui/const-generics/generic_const_exprs/unify-op-with-fn-call.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/unify-op-with-fn-call.stderr
diff --git a/src/test/ui/const-generics/generic_const_exprs/unop.rs b/tests/ui/const-generics/generic_const_exprs/unop.rs
index c12fef083..c12fef083 100644
--- a/src/test/ui/const-generics/generic_const_exprs/unop.rs
+++ b/tests/ui/const-generics/generic_const_exprs/unop.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/unused-complex-default-expr.rs b/tests/ui/const-generics/generic_const_exprs/unused-complex-default-expr.rs
index 9580f8a7f..9580f8a7f 100644
--- a/src/test/ui/const-generics/generic_const_exprs/unused-complex-default-expr.rs
+++ b/tests/ui/const-generics/generic_const_exprs/unused-complex-default-expr.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/unused_expr.rs b/tests/ui/const-generics/generic_const_exprs/unused_expr.rs
index c1bf19e0f..c1bf19e0f 100644
--- a/src/test/ui/const-generics/generic_const_exprs/unused_expr.rs
+++ b/tests/ui/const-generics/generic_const_exprs/unused_expr.rs
diff --git a/src/test/ui/const-generics/generic_const_exprs/unused_expr.stderr b/tests/ui/const-generics/generic_const_exprs/unused_expr.stderr
index df73acf53..265a3b9d2 100644
--- a/src/test/ui/const-generics/generic_const_exprs/unused_expr.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/unused_expr.stderr
@@ -2,7 +2,7 @@ error: overly complex generic constant
   --> $DIR/unused_expr.rs:4:34
    |
 LL | fn add<const N: usize>() -> [u8; { N + 1; 5 }] {
-   |                                  ^^^^^^^^^^^^ blocks are not supported in generic constant
+   |                                  ^^^^^^^^^^^^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
@@ -11,7 +11,7 @@ error: overly complex generic constant
   --> $DIR/unused_expr.rs:9:34
    |
 LL | fn div<const N: usize>() -> [u8; { N / 1; 5 }] {
-   |                                  ^^^^^^^^^^^^ blocks are not supported in generic constant
+   |                                  ^^^^^^^^^^^^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
@@ -20,7 +20,7 @@ error: overly complex generic constant
   --> $DIR/unused_expr.rs:16:38
    |
 LL | fn fn_call<const N: usize>() -> [u8; { foo(N); 5 }] {
-   |                                      ^^^^^^^^^^^^^ blocks are not supported in generic constant
+   |                                      ^^^^^^^^^^^^^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/src/test/ui/const-generics/ice-68875.rs b/tests/ui/const-generics/ice-68875.rs
index 2ef7cfdbe..2ef7cfdbe 100644
--- a/src/test/ui/const-generics/ice-68875.rs
+++ b/tests/ui/const-generics/ice-68875.rs
diff --git a/src/test/ui/const-generics/ice-68875.stderr b/tests/ui/const-generics/ice-68875.stderr
index 1db62c57f..1db62c57f 100644
--- a/src/test/ui/const-generics/ice-68875.stderr
+++ b/tests/ui/const-generics/ice-68875.stderr
diff --git a/src/test/ui/const-generics/ice-const-generic-function-return-ty.rs b/tests/ui/const-generics/ice-const-generic-function-return-ty.rs
index 2bf628af8..2bf628af8 100644
--- a/src/test/ui/const-generics/ice-const-generic-function-return-ty.rs
+++ b/tests/ui/const-generics/ice-const-generic-function-return-ty.rs
diff --git a/src/test/ui/const-generics/ice-const-generic-function-return-ty.stderr b/tests/ui/const-generics/ice-const-generic-function-return-ty.stderr
index a72f5800a..a72f5800a 100644
--- a/src/test/ui/const-generics/ice-const-generic-function-return-ty.stderr
+++ b/tests/ui/const-generics/ice-const-generic-function-return-ty.stderr
diff --git a/src/test/ui/const-generics/impl-const-generic-struct.rs b/tests/ui/const-generics/impl-const-generic-struct.rs
index 7eb2c6a51..7eb2c6a51 100644
--- a/src/test/ui/const-generics/impl-const-generic-struct.rs
+++ b/tests/ui/const-generics/impl-const-generic-struct.rs
diff --git a/tests/ui/const-generics/incorrect-number-of-const-args.rs b/tests/ui/const-generics/incorrect-number-of-const-args.rs
new file mode 100644
index 000000000..8660cb2fb
--- /dev/null
+++ b/tests/ui/const-generics/incorrect-number-of-const-args.rs
@@ -0,0 +1,11 @@
+fn foo<const X: usize, const Y: usize>() -> usize {
+    0
+}
+
+fn main() {
+    foo::<0>();
+    //~^ ERROR function takes 2
+
+    foo::<0, 0, 0>();
+    //~^ ERROR function takes 2
+}
diff --git a/src/test/ui/const-generics/incorrect-number-of-const-args.stderr b/tests/ui/const-generics/incorrect-number-of-const-args.stderr
index a845454f7..a845454f7 100644
--- a/src/test/ui/const-generics/incorrect-number-of-const-args.stderr
+++ b/tests/ui/const-generics/incorrect-number-of-const-args.stderr
diff --git a/src/test/ui/const-generics/infer/cannot-infer-const-args.rs b/tests/ui/const-generics/infer/cannot-infer-const-args.rs
index f85a72910..f85a72910 100644
--- a/src/test/ui/const-generics/infer/cannot-infer-const-args.rs
+++ b/tests/ui/const-generics/infer/cannot-infer-const-args.rs
diff --git a/src/test/ui/const-generics/infer/cannot-infer-const-args.stderr b/tests/ui/const-generics/infer/cannot-infer-const-args.stderr
index 93e45a88a..93e45a88a 100644
--- a/src/test/ui/const-generics/infer/cannot-infer-const-args.stderr
+++ b/tests/ui/const-generics/infer/cannot-infer-const-args.stderr
diff --git a/src/test/ui/const-generics/infer/issue-77092.rs b/tests/ui/const-generics/infer/issue-77092.rs
index fcf7d3282..fcf7d3282 100644
--- a/src/test/ui/const-generics/infer/issue-77092.rs
+++ b/tests/ui/const-generics/infer/issue-77092.rs
diff --git a/src/test/ui/const-generics/infer/issue-77092.stderr b/tests/ui/const-generics/infer/issue-77092.stderr
index 1682b26ac..1682b26ac 100644
--- a/src/test/ui/const-generics/infer/issue-77092.stderr
+++ b/tests/ui/const-generics/infer/issue-77092.stderr
diff --git a/src/test/ui/const-generics/infer/method-chain.rs b/tests/ui/const-generics/infer/method-chain.rs
index 0c5eed489..0c5eed489 100644
--- a/src/test/ui/const-generics/infer/method-chain.rs
+++ b/tests/ui/const-generics/infer/method-chain.rs
diff --git a/src/test/ui/const-generics/infer/method-chain.stderr b/tests/ui/const-generics/infer/method-chain.stderr
index ff6da535b..ff6da535b 100644
--- a/src/test/ui/const-generics/infer/method-chain.stderr
+++ b/tests/ui/const-generics/infer/method-chain.stderr
diff --git a/src/test/ui/const-generics/infer/one-param-uninferred.rs b/tests/ui/const-generics/infer/one-param-uninferred.rs
index d6018650f..d6018650f 100644
--- a/src/test/ui/const-generics/infer/one-param-uninferred.rs
+++ b/tests/ui/const-generics/infer/one-param-uninferred.rs
diff --git a/src/test/ui/const-generics/infer/one-param-uninferred.stderr b/tests/ui/const-generics/infer/one-param-uninferred.stderr
index cf70c2181..cf70c2181 100644
--- a/src/test/ui/const-generics/infer/one-param-uninferred.stderr
+++ b/tests/ui/const-generics/infer/one-param-uninferred.stderr
diff --git a/src/test/ui/const-generics/infer/uninferred-consts.rs b/tests/ui/const-generics/infer/uninferred-consts.rs
index 657f4b513..657f4b513 100644
--- a/src/test/ui/const-generics/infer/uninferred-consts.rs
+++ b/tests/ui/const-generics/infer/uninferred-consts.rs
diff --git a/src/test/ui/const-generics/infer/uninferred-consts.stderr b/tests/ui/const-generics/infer/uninferred-consts.stderr
index 3980ecea8..3980ecea8 100644
--- a/src/test/ui/const-generics/infer/uninferred-consts.stderr
+++ b/tests/ui/const-generics/infer/uninferred-consts.stderr
diff --git a/src/test/ui/const-generics/infer_arg_from_pat.rs b/tests/ui/const-generics/infer_arg_from_pat.rs
index 10317a1b9..10317a1b9 100644
--- a/src/test/ui/const-generics/infer_arg_from_pat.rs
+++ b/tests/ui/const-generics/infer_arg_from_pat.rs
diff --git a/src/test/ui/const-generics/infer_arr_len_from_pat.rs b/tests/ui/const-generics/infer_arr_len_from_pat.rs
index 40f6f5b8d..40f6f5b8d 100644
--- a/src/test/ui/const-generics/infer_arr_len_from_pat.rs
+++ b/tests/ui/const-generics/infer_arr_len_from_pat.rs
diff --git a/src/test/ui/const-generics/inhabited-assoc-ty-ice-1.rs b/tests/ui/const-generics/inhabited-assoc-ty-ice-1.rs
index b385406b0..b385406b0 100644
--- a/src/test/ui/const-generics/inhabited-assoc-ty-ice-1.rs
+++ b/tests/ui/const-generics/inhabited-assoc-ty-ice-1.rs
diff --git a/src/test/ui/const-generics/inhabited-assoc-ty-ice-2.rs b/tests/ui/const-generics/inhabited-assoc-ty-ice-2.rs
index 216d29c7c..216d29c7c 100644
--- a/src/test/ui/const-generics/inhabited-assoc-ty-ice-2.rs
+++ b/tests/ui/const-generics/inhabited-assoc-ty-ice-2.rs
diff --git a/src/test/ui/const-generics/integer-literal-generic-arg-in-where-clause.rs b/tests/ui/const-generics/integer-literal-generic-arg-in-where-clause.rs
index 2b8731ba7..2b8731ba7 100644
--- a/src/test/ui/const-generics/integer-literal-generic-arg-in-where-clause.rs
+++ b/tests/ui/const-generics/integer-literal-generic-arg-in-where-clause.rs
diff --git a/src/test/ui/const-generics/intrinsics-type_name-as-const-argument.min.stderr b/tests/ui/const-generics/intrinsics-type_name-as-const-argument.min.stderr
index b8a1027c9..b8a1027c9 100644
--- a/src/test/ui/const-generics/intrinsics-type_name-as-const-argument.min.stderr
+++ b/tests/ui/const-generics/intrinsics-type_name-as-const-argument.min.stderr
diff --git a/src/test/ui/const-generics/intrinsics-type_name-as-const-argument.rs b/tests/ui/const-generics/intrinsics-type_name-as-const-argument.rs
index 147a00cb2..147a00cb2 100644
--- a/src/test/ui/const-generics/intrinsics-type_name-as-const-argument.rs
+++ b/tests/ui/const-generics/intrinsics-type_name-as-const-argument.rs
diff --git a/src/test/ui/const-generics/invalid-const-arg-for-type-param.rs b/tests/ui/const-generics/invalid-const-arg-for-type-param.rs
index 7d4dc98f3..7d4dc98f3 100644
--- a/src/test/ui/const-generics/invalid-const-arg-for-type-param.rs
+++ b/tests/ui/const-generics/invalid-const-arg-for-type-param.rs
diff --git a/src/test/ui/const-generics/invalid-const-arg-for-type-param.stderr b/tests/ui/const-generics/invalid-const-arg-for-type-param.stderr
index d955b4f96..8c76ca690 100644
--- a/src/test/ui/const-generics/invalid-const-arg-for-type-param.stderr
+++ b/tests/ui/const-generics/invalid-const-arg-for-type-param.stderr
@@ -4,11 +4,6 @@ error[E0107]: this associated function takes 0 generic arguments but 1 generic a
 LL |     let _: u32 = 5i32.try_into::<32>().unwrap();
    |                       ^^^^^^^^ expected 0 generic arguments
    |
-note: associated function defined here, with 0 generic parameters
-  --> $SRC_DIR/core/src/convert/mod.rs:LL:COL
-   |
-LL |     fn try_into(self) -> Result<T, Self::Error>;
-   |        ^^^^^^^^
 help: consider moving this generic argument to the `TryInto` trait, which takes up to 1 argument
    |
 LL |     let _: u32 = TryInto::<32>::try_into(5i32).unwrap();
diff --git a/src/test/ui/const-generics/invalid-constant-in-args.rs b/tests/ui/const-generics/invalid-constant-in-args.rs
index 7419d4a25..7419d4a25 100644
--- a/src/test/ui/const-generics/invalid-constant-in-args.rs
+++ b/tests/ui/const-generics/invalid-constant-in-args.rs
diff --git a/tests/ui/const-generics/invalid-constant-in-args.stderr b/tests/ui/const-generics/invalid-constant-in-args.stderr
new file mode 100644
index 000000000..993b63518
--- /dev/null
+++ b/tests/ui/const-generics/invalid-constant-in-args.stderr
@@ -0,0 +1,11 @@
+error[E0107]: this struct takes 1 generic argument but 2 generic arguments were supplied
+  --> $DIR/invalid-constant-in-args.rs:4:12
+   |
+LL |     let _: Cell<&str, "a"> = Cell::new("");
+   |            ^^^^       --- help: remove this generic argument
+   |            |
+   |            expected 1 generic argument
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0107`.
diff --git a/src/test/ui/const-generics/invalid-enum.rs b/tests/ui/const-generics/invalid-enum.rs
index cb6d05349..cb6d05349 100644
--- a/src/test/ui/const-generics/invalid-enum.rs
+++ b/tests/ui/const-generics/invalid-enum.rs
diff --git a/src/test/ui/const-generics/invalid-enum.stderr b/tests/ui/const-generics/invalid-enum.stderr
index 0d3643f6f..0d3643f6f 100644
--- a/src/test/ui/const-generics/invalid-enum.stderr
+++ b/tests/ui/const-generics/invalid-enum.stderr
diff --git a/src/test/ui/const-generics/invariant.rs b/tests/ui/const-generics/invariant.rs
index 39d658be6..39d658be6 100644
--- a/src/test/ui/const-generics/invariant.rs
+++ b/tests/ui/const-generics/invariant.rs
diff --git a/src/test/ui/const-generics/invariant.stderr b/tests/ui/const-generics/invariant.stderr
index aabe4c93b..aabe4c93b 100644
--- a/src/test/ui/const-generics/invariant.stderr
+++ b/tests/ui/const-generics/invariant.stderr
diff --git a/src/test/ui/const-generics/issue-102124.rs b/tests/ui/const-generics/issue-102124.rs
index a28f198e9..a28f198e9 100644
--- a/src/test/ui/const-generics/issue-102124.rs
+++ b/tests/ui/const-generics/issue-102124.rs
diff --git a/tests/ui/const-generics/issue-105689.rs b/tests/ui/const-generics/issue-105689.rs
new file mode 100644
index 000000000..4237b3cad
--- /dev/null
+++ b/tests/ui/const-generics/issue-105689.rs
@@ -0,0 +1,14 @@
+// check-pass
+// edition:2021
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+
+#[allow(unused)]
+async fn foo<'a>() {
+    let _data = &mut [0u8; { 1 + 4 }];
+    bar().await
+}
+
+async fn bar() {}
+
+fn main() {}
diff --git a/tests/ui/const-generics/issue-106419-struct-with-multiple-const-params.rs b/tests/ui/const-generics/issue-106419-struct-with-multiple-const-params.rs
new file mode 100644
index 000000000..8363e5af4
--- /dev/null
+++ b/tests/ui/const-generics/issue-106419-struct-with-multiple-const-params.rs
@@ -0,0 +1,12 @@
+// check-pass
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+
+#[derive(Clone)]
+struct Bar<const A: usize, const B: usize>
+where
+    [(); A as usize]:,
+    [(); B as usize]:,
+{}
+
+fn main() {}
diff --git a/src/test/ui/const-generics/issue-46511.rs b/tests/ui/const-generics/issue-46511.rs
index 71c50e2f3..71c50e2f3 100644
--- a/src/test/ui/const-generics/issue-46511.rs
+++ b/tests/ui/const-generics/issue-46511.rs
diff --git a/src/test/ui/const-generics/issue-46511.stderr b/tests/ui/const-generics/issue-46511.stderr
index b21afa56d..b21afa56d 100644
--- a/src/test/ui/const-generics/issue-46511.stderr
+++ b/tests/ui/const-generics/issue-46511.stderr
diff --git a/src/test/ui/const-generics/issue-66451.rs b/tests/ui/const-generics/issue-66451.rs
index 3335f7d59..3335f7d59 100644
--- a/src/test/ui/const-generics/issue-66451.rs
+++ b/tests/ui/const-generics/issue-66451.rs
diff --git a/src/test/ui/const-generics/issue-66451.stderr b/tests/ui/const-generics/issue-66451.stderr
index e0cb0b661..e0cb0b661 100644
--- a/src/test/ui/const-generics/issue-66451.stderr
+++ b/tests/ui/const-generics/issue-66451.stderr
diff --git a/src/test/ui/const-generics/issue-70408.rs b/tests/ui/const-generics/issue-70408.rs
index f7557cb49..f7557cb49 100644
--- a/src/test/ui/const-generics/issue-70408.rs
+++ b/tests/ui/const-generics/issue-70408.rs
diff --git a/src/test/ui/const-generics/issue-80471.rs b/tests/ui/const-generics/issue-80471.rs
index d0af8a5ea..d0af8a5ea 100644
--- a/src/test/ui/const-generics/issue-80471.rs
+++ b/tests/ui/const-generics/issue-80471.rs
diff --git a/src/test/ui/const-generics/issue-80471.stderr b/tests/ui/const-generics/issue-80471.stderr
index b89706710..b89706710 100644
--- a/src/test/ui/const-generics/issue-80471.stderr
+++ b/tests/ui/const-generics/issue-80471.stderr
diff --git a/src/test/ui/const-generics/issue-93647.rs b/tests/ui/const-generics/issue-93647.rs
index 806540e17..806540e17 100644
--- a/src/test/ui/const-generics/issue-93647.rs
+++ b/tests/ui/const-generics/issue-93647.rs
diff --git a/src/test/ui/const-generics/issue-93647.stderr b/tests/ui/const-generics/issue-93647.stderr
index e2048ecd6..18370eea5 100644
--- a/src/test/ui/const-generics/issue-93647.stderr
+++ b/tests/ui/const-generics/issue-93647.stderr
@@ -6,6 +6,7 @@ LL |     (||1usize)()
    |
    = note: closures need an RFC before allowed to be called in constants
    = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/const-generics/issue-97007.rs b/tests/ui/const-generics/issue-97007.rs
index 7036834c4..7036834c4 100644
--- a/src/test/ui/const-generics/issue-97007.rs
+++ b/tests/ui/const-generics/issue-97007.rs
diff --git a/src/test/ui/const-generics/issues/auxiliary/const_generic_issues_lib.rs b/tests/ui/const-generics/issues/auxiliary/const_generic_issues_lib.rs
index 6a10ee267..6a10ee267 100644
--- a/src/test/ui/const-generics/issues/auxiliary/const_generic_issues_lib.rs
+++ b/tests/ui/const-generics/issues/auxiliary/const_generic_issues_lib.rs
diff --git a/src/test/ui/const-generics/issues/auxiliary/impl-const.rs b/tests/ui/const-generics/issues/auxiliary/impl-const.rs
index de3a40860..de3a40860 100644
--- a/src/test/ui/const-generics/issues/auxiliary/impl-const.rs
+++ b/tests/ui/const-generics/issues/auxiliary/impl-const.rs
diff --git a/src/test/ui/const-generics/issues/issue-100313.rs b/tests/ui/const-generics/issues/issue-100313.rs
index 4e9d3626a..4e9d3626a 100644
--- a/src/test/ui/const-generics/issues/issue-100313.rs
+++ b/tests/ui/const-generics/issues/issue-100313.rs
diff --git a/src/test/ui/const-generics/issues/issue-100313.stderr b/tests/ui/const-generics/issues/issue-100313.stderr
index d4b486376..d4b486376 100644
--- a/src/test/ui/const-generics/issues/issue-100313.stderr
+++ b/tests/ui/const-generics/issues/issue-100313.stderr
diff --git a/tests/ui/const-generics/issues/issue-105037.rs b/tests/ui/const-generics/issues/issue-105037.rs
new file mode 100644
index 000000000..f7d239499
--- /dev/null
+++ b/tests/ui/const-generics/issues/issue-105037.rs
@@ -0,0 +1,35 @@
+// run-pass
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+#![allow(dead_code)]
+
+trait Table<const D: usize>: Sync {
+    const COLUMNS: usize;
+}
+
+struct Table1<const D: usize>;
+impl<const D: usize> Table<D> for Table1<D> {
+    const COLUMNS: usize = 123;
+}
+
+struct Table2<const D: usize>;
+impl<const D: usize> Table<D> for Table2<D> {
+    const COLUMNS: usize = 456;
+}
+
+fn process_table<T: Table<D>, const D: usize>(_table: T)
+where
+    [(); T::COLUMNS]:,
+{
+}
+
+fn process_all_tables<const D: usize>()
+where
+    [(); Table2::<D>::COLUMNS]:,
+    [(); Table1::<D>::COLUMNS]:,
+{
+    process_table(Table1::<D>);
+    process_table(Table2::<D>);
+}
+
+fn main() {}
diff --git a/src/test/ui/const-generics/issues/issue-56445-1.full.stderr b/tests/ui/const-generics/issues/issue-56445-1.full.stderr
index 179643a75..179643a75 100644
--- a/src/test/ui/const-generics/issues/issue-56445-1.full.stderr
+++ b/tests/ui/const-generics/issues/issue-56445-1.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-56445-1.min.stderr b/tests/ui/const-generics/issues/issue-56445-1.min.stderr
index 43a5df117..43a5df117 100644
--- a/src/test/ui/const-generics/issues/issue-56445-1.min.stderr
+++ b/tests/ui/const-generics/issues/issue-56445-1.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-56445-1.rs b/tests/ui/const-generics/issues/issue-56445-1.rs
index 13eb2ea9f..13eb2ea9f 100644
--- a/src/test/ui/const-generics/issues/issue-56445-1.rs
+++ b/tests/ui/const-generics/issues/issue-56445-1.rs
diff --git a/src/test/ui/const-generics/issues/issue-56445-2.rs b/tests/ui/const-generics/issues/issue-56445-2.rs
index e078c8487..e078c8487 100644
--- a/src/test/ui/const-generics/issues/issue-56445-2.rs
+++ b/tests/ui/const-generics/issues/issue-56445-2.rs
diff --git a/src/test/ui/const-generics/issues/issue-56445-2.stderr b/tests/ui/const-generics/issues/issue-56445-2.stderr
index 770c80cbb..770c80cbb 100644
--- a/src/test/ui/const-generics/issues/issue-56445-2.stderr
+++ b/tests/ui/const-generics/issues/issue-56445-2.stderr
diff --git a/src/test/ui/const-generics/issues/issue-56445-3.rs b/tests/ui/const-generics/issues/issue-56445-3.rs
index c29df1458..c29df1458 100644
--- a/src/test/ui/const-generics/issues/issue-56445-3.rs
+++ b/tests/ui/const-generics/issues/issue-56445-3.rs
diff --git a/src/test/ui/const-generics/issues/issue-56445-3.stderr b/tests/ui/const-generics/issues/issue-56445-3.stderr
index f1c49eecf..f1c49eecf 100644
--- a/src/test/ui/const-generics/issues/issue-56445-3.stderr
+++ b/tests/ui/const-generics/issues/issue-56445-3.stderr
diff --git a/src/test/ui/const-generics/issues/issue-60818-struct-constructors.rs b/tests/ui/const-generics/issues/issue-60818-struct-constructors.rs
index 0066490df..0066490df 100644
--- a/src/test/ui/const-generics/issues/issue-60818-struct-constructors.rs
+++ b/tests/ui/const-generics/issues/issue-60818-struct-constructors.rs
diff --git a/src/test/ui/const-generics/issues/issue-61336-1.rs b/tests/ui/const-generics/issues/issue-61336-1.rs
index beb37e63b..beb37e63b 100644
--- a/src/test/ui/const-generics/issues/issue-61336-1.rs
+++ b/tests/ui/const-generics/issues/issue-61336-1.rs
diff --git a/src/test/ui/const-generics/issues/issue-61336-2.rs b/tests/ui/const-generics/issues/issue-61336-2.rs
index b7cd29f89..b7cd29f89 100644
--- a/src/test/ui/const-generics/issues/issue-61336-2.rs
+++ b/tests/ui/const-generics/issues/issue-61336-2.rs
diff --git a/src/test/ui/const-generics/issues/issue-61336-2.stderr b/tests/ui/const-generics/issues/issue-61336-2.stderr
index 5bb356696..5bb356696 100644
--- a/src/test/ui/const-generics/issues/issue-61336-2.stderr
+++ b/tests/ui/const-generics/issues/issue-61336-2.stderr
diff --git a/src/test/ui/const-generics/issues/issue-61336.rs b/tests/ui/const-generics/issues/issue-61336.rs
index 80be1d8e5..80be1d8e5 100644
--- a/src/test/ui/const-generics/issues/issue-61336.rs
+++ b/tests/ui/const-generics/issues/issue-61336.rs
diff --git a/src/test/ui/const-generics/issues/issue-61336.stderr b/tests/ui/const-generics/issues/issue-61336.stderr
index 8d9e545b4..8d9e545b4 100644
--- a/src/test/ui/const-generics/issues/issue-61336.stderr
+++ b/tests/ui/const-generics/issues/issue-61336.stderr
diff --git a/src/test/ui/const-generics/issues/issue-61422.rs b/tests/ui/const-generics/issues/issue-61422.rs
index 0b9cf40d8..0b9cf40d8 100644
--- a/src/test/ui/const-generics/issues/issue-61422.rs
+++ b/tests/ui/const-generics/issues/issue-61422.rs
diff --git a/src/test/ui/const-generics/issues/issue-61432.rs b/tests/ui/const-generics/issues/issue-61432.rs
index 6192af82a..6192af82a 100644
--- a/src/test/ui/const-generics/issues/issue-61432.rs
+++ b/tests/ui/const-generics/issues/issue-61432.rs
diff --git a/src/test/ui/const-generics/issues/issue-62187-encountered-polymorphic-const.rs b/tests/ui/const-generics/issues/issue-62187-encountered-polymorphic-const.rs
index fa76aeae9..fa76aeae9 100644
--- a/src/test/ui/const-generics/issues/issue-62187-encountered-polymorphic-const.rs
+++ b/tests/ui/const-generics/issues/issue-62187-encountered-polymorphic-const.rs
diff --git a/src/test/ui/const-generics/issues/issue-62878.full.stderr b/tests/ui/const-generics/issues/issue-62878.full.stderr
index 3a2b291d7..3a2b291d7 100644
--- a/src/test/ui/const-generics/issues/issue-62878.full.stderr
+++ b/tests/ui/const-generics/issues/issue-62878.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-62878.min.stderr b/tests/ui/const-generics/issues/issue-62878.min.stderr
index af029a651..5a721720d 100644
--- a/src/test/ui/const-generics/issues/issue-62878.min.stderr
+++ b/tests/ui/const-generics/issues/issue-62878.min.stderr
@@ -4,7 +4,7 @@ error[E0770]: the type of const parameters must not depend on other generic para
 LL | fn foo<const N: usize, const A: [u8; N]>() {}
    |                                      ^ the type must not depend on the parameter `N`
 
-error: `[u8; _]` is forbidden as the type of a const generic parameter
+error: `[u8; N]` is forbidden as the type of a const generic parameter
   --> $DIR/issue-62878.rs:5:33
    |
 LL | fn foo<const N: usize, const A: [u8; N]>() {}
diff --git a/src/test/ui/const-generics/issues/issue-62878.rs b/tests/ui/const-generics/issues/issue-62878.rs
index 578ce765b..4c08a484e 100644
--- a/src/test/ui/const-generics/issues/issue-62878.rs
+++ b/tests/ui/const-generics/issues/issue-62878.rs
@@ -4,7 +4,7 @@
 
 fn foo<const N: usize, const A: [u8; N]>() {}
 //~^ ERROR the type of const parameters must not
-//[min]~| ERROR `[u8; _]` is forbidden as the type of a const generic parameter
+//[min]~| ERROR `[u8; N]` is forbidden as the type of a const generic parameter
 
 fn main() {
     foo::<_, { [1] }>();
diff --git a/src/test/ui/const-generics/issues/issue-63322-forbid-dyn.full.stderr b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.full.stderr
index 16fabd1e8..16fabd1e8 100644
--- a/src/test/ui/const-generics/issues/issue-63322-forbid-dyn.full.stderr
+++ b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-63322-forbid-dyn.min.stderr b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.min.stderr
index 9f6c7ccf3..9f6c7ccf3 100644
--- a/src/test/ui/const-generics/issues/issue-63322-forbid-dyn.min.stderr
+++ b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-63322-forbid-dyn.rs b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.rs
index 116c3fcfb..116c3fcfb 100644
--- a/src/test/ui/const-generics/issues/issue-63322-forbid-dyn.rs
+++ b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.rs
diff --git a/src/test/ui/const-generics/issues/issue-64519.rs b/tests/ui/const-generics/issues/issue-64519.rs
index 969289b26..969289b26 100644
--- a/src/test/ui/const-generics/issues/issue-64519.rs
+++ b/tests/ui/const-generics/issues/issue-64519.rs
diff --git a/src/test/ui/const-generics/issues/issue-66596-impl-trait-for-str-const-arg.rs b/tests/ui/const-generics/issues/issue-66596-impl-trait-for-str-const-arg.rs
index 091419f0c..091419f0c 100644
--- a/src/test/ui/const-generics/issues/issue-66596-impl-trait-for-str-const-arg.rs
+++ b/tests/ui/const-generics/issues/issue-66596-impl-trait-for-str-const-arg.rs
diff --git a/src/test/ui/const-generics/issues/issue-66906.rs b/tests/ui/const-generics/issues/issue-66906.rs
index a0b3f9122..a0b3f9122 100644
--- a/src/test/ui/const-generics/issues/issue-66906.rs
+++ b/tests/ui/const-generics/issues/issue-66906.rs
diff --git a/src/test/ui/const-generics/issues/issue-67185-1.rs b/tests/ui/const-generics/issues/issue-67185-1.rs
index 69425b25e..69425b25e 100644
--- a/src/test/ui/const-generics/issues/issue-67185-1.rs
+++ b/tests/ui/const-generics/issues/issue-67185-1.rs
diff --git a/src/test/ui/const-generics/issues/issue-67185-2.rs b/tests/ui/const-generics/issues/issue-67185-2.rs
index 18bb6f6bc..18bb6f6bc 100644
--- a/src/test/ui/const-generics/issues/issue-67185-2.rs
+++ b/tests/ui/const-generics/issues/issue-67185-2.rs
diff --git a/src/test/ui/const-generics/issues/issue-67185-2.stderr b/tests/ui/const-generics/issues/issue-67185-2.stderr
index c7be8e14a..c7be8e14a 100644
--- a/src/test/ui/const-generics/issues/issue-67185-2.stderr
+++ b/tests/ui/const-generics/issues/issue-67185-2.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67375.full.stderr b/tests/ui/const-generics/issues/issue-67375.full.stderr
index 0cf69879a..0cf69879a 100644
--- a/src/test/ui/const-generics/issues/issue-67375.full.stderr
+++ b/tests/ui/const-generics/issues/issue-67375.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67375.min.stderr b/tests/ui/const-generics/issues/issue-67375.min.stderr
index 5256d96c8..5256d96c8 100644
--- a/src/test/ui/const-generics/issues/issue-67375.min.stderr
+++ b/tests/ui/const-generics/issues/issue-67375.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67375.rs b/tests/ui/const-generics/issues/issue-67375.rs
index 8b4b276ba..8b4b276ba 100644
--- a/src/test/ui/const-generics/issues/issue-67375.rs
+++ b/tests/ui/const-generics/issues/issue-67375.rs
diff --git a/src/test/ui/const-generics/issues/issue-67739.full.stderr b/tests/ui/const-generics/issues/issue-67739.full.stderr
index f1a426c3c..f1a426c3c 100644
--- a/src/test/ui/const-generics/issues/issue-67739.full.stderr
+++ b/tests/ui/const-generics/issues/issue-67739.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67739.min.stderr b/tests/ui/const-generics/issues/issue-67739.min.stderr
index dcbe5b94a..dcbe5b94a 100644
--- a/src/test/ui/const-generics/issues/issue-67739.min.stderr
+++ b/tests/ui/const-generics/issues/issue-67739.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67739.rs b/tests/ui/const-generics/issues/issue-67739.rs
index de0eb7f50..de0eb7f50 100644
--- a/src/test/ui/const-generics/issues/issue-67739.rs
+++ b/tests/ui/const-generics/issues/issue-67739.rs
diff --git a/src/test/ui/const-generics/issues/issue-67945-1.full.stderr b/tests/ui/const-generics/issues/issue-67945-1.full.stderr
index 8e18fcdff..8e18fcdff 100644
--- a/src/test/ui/const-generics/issues/issue-67945-1.full.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-1.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67945-1.min.stderr b/tests/ui/const-generics/issues/issue-67945-1.min.stderr
index eee04eb75..eee04eb75 100644
--- a/src/test/ui/const-generics/issues/issue-67945-1.min.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-1.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67945-1.rs b/tests/ui/const-generics/issues/issue-67945-1.rs
index 99f88bc8e..99f88bc8e 100644
--- a/src/test/ui/const-generics/issues/issue-67945-1.rs
+++ b/tests/ui/const-generics/issues/issue-67945-1.rs
diff --git a/src/test/ui/const-generics/issues/issue-67945-2.full.stderr b/tests/ui/const-generics/issues/issue-67945-2.full.stderr
index cce85772a..47429b761 100644
--- a/src/test/ui/const-generics/issues/issue-67945-2.full.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-2.full.stderr
@@ -8,7 +8,7 @@ LL | |         let x: Option<Box<Self>> = None;
 LL | |
 LL | |         0
 LL | |     }],
-   | |_____^ blocks are not supported in generic constant
+   | |_____^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/src/test/ui/const-generics/issues/issue-67945-2.min.stderr b/tests/ui/const-generics/issues/issue-67945-2.min.stderr
index 6e07af1e6..6e07af1e6 100644
--- a/src/test/ui/const-generics/issues/issue-67945-2.min.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-2.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67945-2.rs b/tests/ui/const-generics/issues/issue-67945-2.rs
index cbb4e14ec..cbb4e14ec 100644
--- a/src/test/ui/const-generics/issues/issue-67945-2.rs
+++ b/tests/ui/const-generics/issues/issue-67945-2.rs
diff --git a/src/test/ui/const-generics/issues/issue-67945-3.full.stderr b/tests/ui/const-generics/issues/issue-67945-3.full.stderr
index d3d9452d3..98f9f8397 100644
--- a/src/test/ui/const-generics/issues/issue-67945-3.full.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-3.full.stderr
@@ -7,7 +7,7 @@ LL | |         let x: Option<S> = None;
 LL | |
 LL | |         0
 LL | |     }],
-   | |_____^ blocks are not supported in generic constant
+   | |_____^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/src/test/ui/const-generics/issues/issue-67945-3.min.stderr b/tests/ui/const-generics/issues/issue-67945-3.min.stderr
index 8e6b4b204..8e6b4b204 100644
--- a/src/test/ui/const-generics/issues/issue-67945-3.min.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-3.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67945-3.rs b/tests/ui/const-generics/issues/issue-67945-3.rs
index fd8a393ef..fd8a393ef 100644
--- a/src/test/ui/const-generics/issues/issue-67945-3.rs
+++ b/tests/ui/const-generics/issues/issue-67945-3.rs
diff --git a/src/test/ui/const-generics/issues/issue-67945-4.full.stderr b/tests/ui/const-generics/issues/issue-67945-4.full.stderr
index 9604eb35d..c03d40a7b 100644
--- a/src/test/ui/const-generics/issues/issue-67945-4.full.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-4.full.stderr
@@ -7,7 +7,7 @@ LL | |         let x: Option<Box<S>> = None;
 LL | |
 LL | |         0
 LL | |     }],
-   | |_____^ blocks are not supported in generic constant
+   | |_____^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/src/test/ui/const-generics/issues/issue-67945-4.min.stderr b/tests/ui/const-generics/issues/issue-67945-4.min.stderr
index f9520872d..f9520872d 100644
--- a/src/test/ui/const-generics/issues/issue-67945-4.min.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-4.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67945-4.rs b/tests/ui/const-generics/issues/issue-67945-4.rs
index 9a27bf09f..9a27bf09f 100644
--- a/src/test/ui/const-generics/issues/issue-67945-4.rs
+++ b/tests/ui/const-generics/issues/issue-67945-4.rs
diff --git a/src/test/ui/const-generics/issues/issue-68104-print-stack-overflow.rs b/tests/ui/const-generics/issues/issue-68104-print-stack-overflow.rs
index ad5710baa..ad5710baa 100644
--- a/src/test/ui/const-generics/issues/issue-68104-print-stack-overflow.rs
+++ b/tests/ui/const-generics/issues/issue-68104-print-stack-overflow.rs
diff --git a/src/test/ui/const-generics/issues/issue-68366.full.stderr b/tests/ui/const-generics/issues/issue-68366.full.stderr
index ca9eb801d..ca9eb801d 100644
--- a/src/test/ui/const-generics/issues/issue-68366.full.stderr
+++ b/tests/ui/const-generics/issues/issue-68366.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-68366.min.stderr b/tests/ui/const-generics/issues/issue-68366.min.stderr
index 3740ced90..3740ced90 100644
--- a/src/test/ui/const-generics/issues/issue-68366.min.stderr
+++ b/tests/ui/const-generics/issues/issue-68366.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-68366.rs b/tests/ui/const-generics/issues/issue-68366.rs
index 4c2741ab4..4c2741ab4 100644
--- a/src/test/ui/const-generics/issues/issue-68366.rs
+++ b/tests/ui/const-generics/issues/issue-68366.rs
diff --git a/src/test/ui/const-generics/issues/issue-68596.rs b/tests/ui/const-generics/issues/issue-68596.rs
index c3c9141e4..c3c9141e4 100644
--- a/src/test/ui/const-generics/issues/issue-68596.rs
+++ b/tests/ui/const-generics/issues/issue-68596.rs
diff --git a/src/test/ui/const-generics/issues/issue-68615-adt.min.stderr b/tests/ui/const-generics/issues/issue-68615-adt.min.stderr
index df04c4896..df04c4896 100644
--- a/src/test/ui/const-generics/issues/issue-68615-adt.min.stderr
+++ b/tests/ui/const-generics/issues/issue-68615-adt.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-68615-adt.rs b/tests/ui/const-generics/issues/issue-68615-adt.rs
index 3ef1ad45e..3ef1ad45e 100644
--- a/src/test/ui/const-generics/issues/issue-68615-adt.rs
+++ b/tests/ui/const-generics/issues/issue-68615-adt.rs
diff --git a/src/test/ui/const-generics/issues/issue-68615-array.min.stderr b/tests/ui/const-generics/issues/issue-68615-array.min.stderr
index 1b4517087..1b4517087 100644
--- a/src/test/ui/const-generics/issues/issue-68615-array.min.stderr
+++ b/tests/ui/const-generics/issues/issue-68615-array.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-68615-array.rs b/tests/ui/const-generics/issues/issue-68615-array.rs
index 93477be41..93477be41 100644
--- a/src/test/ui/const-generics/issues/issue-68615-array.rs
+++ b/tests/ui/const-generics/issues/issue-68615-array.rs
diff --git a/src/test/ui/const-generics/issues/issue-69654-run-pass.rs b/tests/ui/const-generics/issues/issue-69654-run-pass.rs
index 63d7fde78..63d7fde78 100644
--- a/src/test/ui/const-generics/issues/issue-69654-run-pass.rs
+++ b/tests/ui/const-generics/issues/issue-69654-run-pass.rs
diff --git a/src/test/ui/const-generics/issues/issue-70125-1.rs b/tests/ui/const-generics/issues/issue-70125-1.rs
index 0027cd46a..0027cd46a 100644
--- a/src/test/ui/const-generics/issues/issue-70125-1.rs
+++ b/tests/ui/const-generics/issues/issue-70125-1.rs
diff --git a/src/test/ui/const-generics/issues/issue-70125-2.rs b/tests/ui/const-generics/issues/issue-70125-2.rs
index cfd5e784e..cfd5e784e 100644
--- a/src/test/ui/const-generics/issues/issue-70125-2.rs
+++ b/tests/ui/const-generics/issues/issue-70125-2.rs
diff --git a/src/test/ui/const-generics/issues/issue-70167.rs b/tests/ui/const-generics/issues/issue-70167.rs
index 3961941f8..3961941f8 100644
--- a/src/test/ui/const-generics/issues/issue-70167.rs
+++ b/tests/ui/const-generics/issues/issue-70167.rs
diff --git a/src/test/ui/const-generics/issues/issue-70180-1-stalled_on.rs b/tests/ui/const-generics/issues/issue-70180-1-stalled_on.rs
index 2ec37cc3a..2ec37cc3a 100644
--- a/src/test/ui/const-generics/issues/issue-70180-1-stalled_on.rs
+++ b/tests/ui/const-generics/issues/issue-70180-1-stalled_on.rs
diff --git a/src/test/ui/const-generics/issues/issue-70180-2-stalled_on.rs b/tests/ui/const-generics/issues/issue-70180-2-stalled_on.rs
index 95e548428..95e548428 100644
--- a/src/test/ui/const-generics/issues/issue-70180-2-stalled_on.rs
+++ b/tests/ui/const-generics/issues/issue-70180-2-stalled_on.rs
diff --git a/src/test/ui/const-generics/issues/issue-70225.rs b/tests/ui/const-generics/issues/issue-70225.rs
index d458d7b2e..d458d7b2e 100644
--- a/src/test/ui/const-generics/issues/issue-70225.rs
+++ b/tests/ui/const-generics/issues/issue-70225.rs
diff --git a/src/test/ui/const-generics/issues/issue-70273-assoc-fn.rs b/tests/ui/const-generics/issues/issue-70273-assoc-fn.rs
index a76488249..a76488249 100644
--- a/src/test/ui/const-generics/issues/issue-70273-assoc-fn.rs
+++ b/tests/ui/const-generics/issues/issue-70273-assoc-fn.rs
diff --git a/src/test/ui/const-generics/issues/issue-71169.full.stderr b/tests/ui/const-generics/issues/issue-71169.full.stderr
index 1f5880f36..1f5880f36 100644
--- a/src/test/ui/const-generics/issues/issue-71169.full.stderr
+++ b/tests/ui/const-generics/issues/issue-71169.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71169.min.stderr b/tests/ui/const-generics/issues/issue-71169.min.stderr
index 87ed2d4f8..998b16a79 100644
--- a/src/test/ui/const-generics/issues/issue-71169.min.stderr
+++ b/tests/ui/const-generics/issues/issue-71169.min.stderr
@@ -4,7 +4,7 @@ error[E0770]: the type of const parameters must not depend on other generic para
 LL | fn foo<const LEN: usize, const DATA: [u8; LEN]>() {}
    |                                           ^^^ the type must not depend on the parameter `LEN`
 
-error: `[u8; _]` is forbidden as the type of a const generic parameter
+error: `[u8; LEN]` is forbidden as the type of a const generic parameter
   --> $DIR/issue-71169.rs:5:38
    |
 LL | fn foo<const LEN: usize, const DATA: [u8; LEN]>() {}
diff --git a/src/test/ui/const-generics/issues/issue-71169.rs b/tests/ui/const-generics/issues/issue-71169.rs
index 617149a84..e4ec6b073 100644
--- a/src/test/ui/const-generics/issues/issue-71169.rs
+++ b/tests/ui/const-generics/issues/issue-71169.rs
@@ -4,7 +4,7 @@
 
 fn foo<const LEN: usize, const DATA: [u8; LEN]>() {}
 //~^ ERROR the type of const parameters must not
-//[min]~^^ ERROR `[u8; _]` is forbidden as the type of a const generic parameter
+//[min]~^^ ERROR `[u8; LEN]` is forbidden as the type of a const generic parameter
 fn main() {
     const DATA: [u8; 4] = *b"ABCD";
     foo::<4, DATA>();
diff --git a/src/test/ui/const-generics/issues/issue-71202.rs b/tests/ui/const-generics/issues/issue-71202.rs
index 57fd72b12..57fd72b12 100644
--- a/src/test/ui/const-generics/issues/issue-71202.rs
+++ b/tests/ui/const-generics/issues/issue-71202.rs
diff --git a/src/test/ui/const-generics/issues/issue-71202.stderr b/tests/ui/const-generics/issues/issue-71202.stderr
index 277540610..277540610 100644
--- a/src/test/ui/const-generics/issues/issue-71202.stderr
+++ b/tests/ui/const-generics/issues/issue-71202.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71381.full.stderr b/tests/ui/const-generics/issues/issue-71381.full.stderr
index e17cf96aa..e17cf96aa 100644
--- a/src/test/ui/const-generics/issues/issue-71381.full.stderr
+++ b/tests/ui/const-generics/issues/issue-71381.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71381.min.stderr b/tests/ui/const-generics/issues/issue-71381.min.stderr
index 3950317b3..3950317b3 100644
--- a/src/test/ui/const-generics/issues/issue-71381.min.stderr
+++ b/tests/ui/const-generics/issues/issue-71381.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71381.rs b/tests/ui/const-generics/issues/issue-71381.rs
index 66f819dbe..66f819dbe 100644
--- a/src/test/ui/const-generics/issues/issue-71381.rs
+++ b/tests/ui/const-generics/issues/issue-71381.rs
diff --git a/src/test/ui/const-generics/issues/issue-71382.full.stderr b/tests/ui/const-generics/issues/issue-71382.full.stderr
index ab2a4e64a..ab2a4e64a 100644
--- a/src/test/ui/const-generics/issues/issue-71382.full.stderr
+++ b/tests/ui/const-generics/issues/issue-71382.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71382.min.stderr b/tests/ui/const-generics/issues/issue-71382.min.stderr
index 715037bd5..715037bd5 100644
--- a/src/test/ui/const-generics/issues/issue-71382.min.stderr
+++ b/tests/ui/const-generics/issues/issue-71382.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71382.rs b/tests/ui/const-generics/issues/issue-71382.rs
index 4392d72e5..4392d72e5 100644
--- a/src/test/ui/const-generics/issues/issue-71382.rs
+++ b/tests/ui/const-generics/issues/issue-71382.rs
diff --git a/src/test/ui/const-generics/issues/issue-71547.rs b/tests/ui/const-generics/issues/issue-71547.rs
index 60776a1a9..60776a1a9 100644
--- a/src/test/ui/const-generics/issues/issue-71547.rs
+++ b/tests/ui/const-generics/issues/issue-71547.rs
diff --git a/src/test/ui/const-generics/issues/issue-71611.full.stderr b/tests/ui/const-generics/issues/issue-71611.full.stderr
index 656aa29e1..656aa29e1 100644
--- a/src/test/ui/const-generics/issues/issue-71611.full.stderr
+++ b/tests/ui/const-generics/issues/issue-71611.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71611.min.stderr b/tests/ui/const-generics/issues/issue-71611.min.stderr
index 01a85b745..01a85b745 100644
--- a/src/test/ui/const-generics/issues/issue-71611.min.stderr
+++ b/tests/ui/const-generics/issues/issue-71611.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71611.rs b/tests/ui/const-generics/issues/issue-71611.rs
index fbb91ca18..fbb91ca18 100644
--- a/src/test/ui/const-generics/issues/issue-71611.rs
+++ b/tests/ui/const-generics/issues/issue-71611.rs
diff --git a/src/test/ui/const-generics/issues/issue-71986.rs b/tests/ui/const-generics/issues/issue-71986.rs
index 6f0a98ead..6f0a98ead 100644
--- a/src/test/ui/const-generics/issues/issue-71986.rs
+++ b/tests/ui/const-generics/issues/issue-71986.rs
diff --git a/src/test/ui/const-generics/issues/issue-72352.full.stderr b/tests/ui/const-generics/issues/issue-72352.full.stderr
index 92580b336..92580b336 100644
--- a/src/test/ui/const-generics/issues/issue-72352.full.stderr
+++ b/tests/ui/const-generics/issues/issue-72352.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-72352.min.stderr b/tests/ui/const-generics/issues/issue-72352.min.stderr
index eedd73c4d..eedd73c4d 100644
--- a/src/test/ui/const-generics/issues/issue-72352.min.stderr
+++ b/tests/ui/const-generics/issues/issue-72352.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-72352.rs b/tests/ui/const-generics/issues/issue-72352.rs
index 2fa1d7a53..2fa1d7a53 100644
--- a/src/test/ui/const-generics/issues/issue-72352.rs
+++ b/tests/ui/const-generics/issues/issue-72352.rs
diff --git a/src/test/ui/const-generics/issues/issue-72845.rs b/tests/ui/const-generics/issues/issue-72845.rs
index bea5dc8ba..bea5dc8ba 100644
--- a/src/test/ui/const-generics/issues/issue-72845.rs
+++ b/tests/ui/const-generics/issues/issue-72845.rs
diff --git a/src/test/ui/const-generics/issues/issue-72845.stderr b/tests/ui/const-generics/issues/issue-72845.stderr
index 631c8605f..631c8605f 100644
--- a/src/test/ui/const-generics/issues/issue-72845.stderr
+++ b/tests/ui/const-generics/issues/issue-72845.stderr
diff --git a/src/test/ui/const-generics/issues/issue-73120.rs b/tests/ui/const-generics/issues/issue-73120.rs
index 050dc9bde..050dc9bde 100644
--- a/src/test/ui/const-generics/issues/issue-73120.rs
+++ b/tests/ui/const-generics/issues/issue-73120.rs
diff --git a/src/test/ui/const-generics/issues/issue-73260.rs b/tests/ui/const-generics/issues/issue-73260.rs
index d762f9c8b..d762f9c8b 100644
--- a/src/test/ui/const-generics/issues/issue-73260.rs
+++ b/tests/ui/const-generics/issues/issue-73260.rs
diff --git a/src/test/ui/const-generics/issues/issue-73260.stderr b/tests/ui/const-generics/issues/issue-73260.stderr
index 7670032e5..7670032e5 100644
--- a/src/test/ui/const-generics/issues/issue-73260.stderr
+++ b/tests/ui/const-generics/issues/issue-73260.stderr
diff --git a/src/test/ui/const-generics/issues/issue-73491.min.stderr b/tests/ui/const-generics/issues/issue-73491.min.stderr
index f2b58e59f..f03354fc4 100644
--- a/src/test/ui/const-generics/issues/issue-73491.min.stderr
+++ b/tests/ui/const-generics/issues/issue-73491.min.stderr
@@ -1,4 +1,4 @@
-error: `[u32; _]` is forbidden as the type of a const generic parameter
+error: `[u32; LEN]` is forbidden as the type of a const generic parameter
   --> $DIR/issue-73491.rs:8:19
    |
 LL | fn hoge<const IN: [u32; LEN]>() {}
diff --git a/tests/ui/const-generics/issues/issue-73491.rs b/tests/ui/const-generics/issues/issue-73491.rs
new file mode 100644
index 000000000..482dbb04d
--- /dev/null
+++ b/tests/ui/const-generics/issues/issue-73491.rs
@@ -0,0 +1,11 @@
+// [full] check-pass
+// revisions: full min
+#![cfg_attr(full, feature(adt_const_params))]
+#![cfg_attr(full, allow(incomplete_features))]
+
+const LEN: usize = 1024;
+
+fn hoge<const IN: [u32; LEN]>() {}
+//[min]~^ ERROR `[u32; LEN]` is forbidden as the type of a const generic parameter
+
+fn main() {}
diff --git a/src/test/ui/const-generics/issues/issue-73727-static-reference-array-const-param.min.stderr b/tests/ui/const-generics/issues/issue-73727-static-reference-array-const-param.min.stderr
index 0a7db6247..0a7db6247 100644
--- a/src/test/ui/const-generics/issues/issue-73727-static-reference-array-const-param.min.stderr
+++ b/tests/ui/const-generics/issues/issue-73727-static-reference-array-const-param.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-73727-static-reference-array-const-param.rs b/tests/ui/const-generics/issues/issue-73727-static-reference-array-const-param.rs
index f0d604835..f0d604835 100644
--- a/src/test/ui/const-generics/issues/issue-73727-static-reference-array-const-param.rs
+++ b/tests/ui/const-generics/issues/issue-73727-static-reference-array-const-param.rs
diff --git a/src/test/ui/const-generics/issues/issue-74101.min.stderr b/tests/ui/const-generics/issues/issue-74101.min.stderr
index 82ffb2332..134c24834 100644
--- a/src/test/ui/const-generics/issues/issue-74101.min.stderr
+++ b/tests/ui/const-generics/issues/issue-74101.min.stderr
@@ -1,4 +1,4 @@
-error: `[u8; _]` is forbidden as the type of a const generic parameter
+error: `[u8; 1 + 2]` is forbidden as the type of a const generic parameter
   --> $DIR/issue-74101.rs:6:18
    |
 LL | fn test<const N: [u8; 1 + 2]>() {}
@@ -7,7 +7,7 @@ LL | fn test<const N: [u8; 1 + 2]>() {}
    = note: the only supported types are integers, `bool` and `char`
    = help: more complex types are supported with `#![feature(adt_const_params)]`
 
-error: `[u8; _]` is forbidden as the type of a const generic parameter
+error: `[u8; 1 + 2]` is forbidden as the type of a const generic parameter
   --> $DIR/issue-74101.rs:9:21
    |
 LL | struct Foo<const N: [u8; 1 + 2]>;
diff --git a/tests/ui/const-generics/issues/issue-74101.rs b/tests/ui/const-generics/issues/issue-74101.rs
new file mode 100644
index 000000000..4c9b2d3c6
--- /dev/null
+++ b/tests/ui/const-generics/issues/issue-74101.rs
@@ -0,0 +1,12 @@
+// [full] check-pass
+// revisions: full min
+#![cfg_attr(full, feature(adt_const_params))]
+#![cfg_attr(full, allow(incomplete_features))]
+
+fn test<const N: [u8; 1 + 2]>() {}
+//[min]~^ ERROR `[u8; 1 + 2]` is forbidden as the type of a const generic parameter
+
+struct Foo<const N: [u8; 1 + 2]>;
+//[min]~^ ERROR `[u8; 1 + 2]` is forbidden as the type of a const generic parameter
+
+fn main() {}
diff --git a/src/test/ui/const-generics/issues/issue-74255.min.stderr b/tests/ui/const-generics/issues/issue-74255.min.stderr
index b462d8448..b462d8448 100644
--- a/src/test/ui/const-generics/issues/issue-74255.min.stderr
+++ b/tests/ui/const-generics/issues/issue-74255.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-74255.rs b/tests/ui/const-generics/issues/issue-74255.rs
index 0e523926f..0e523926f 100644
--- a/src/test/ui/const-generics/issues/issue-74255.rs
+++ b/tests/ui/const-generics/issues/issue-74255.rs
diff --git a/src/test/ui/const-generics/issues/issue-74906.rs b/tests/ui/const-generics/issues/issue-74906.rs
index cc1f2853f..cc1f2853f 100644
--- a/src/test/ui/const-generics/issues/issue-74906.rs
+++ b/tests/ui/const-generics/issues/issue-74906.rs
diff --git a/src/test/ui/const-generics/issues/issue-74950.min.stderr b/tests/ui/const-generics/issues/issue-74950.min.stderr
index 729ecc202..729ecc202 100644
--- a/src/test/ui/const-generics/issues/issue-74950.min.stderr
+++ b/tests/ui/const-generics/issues/issue-74950.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-74950.rs b/tests/ui/const-generics/issues/issue-74950.rs
index 3e1ca4735..3e1ca4735 100644
--- a/src/test/ui/const-generics/issues/issue-74950.rs
+++ b/tests/ui/const-generics/issues/issue-74950.rs
diff --git a/src/test/ui/const-generics/issues/issue-75047.min.stderr b/tests/ui/const-generics/issues/issue-75047.min.stderr
index 7798ae796..46af19ef3 100644
--- a/src/test/ui/const-generics/issues/issue-75047.min.stderr
+++ b/tests/ui/const-generics/issues/issue-75047.min.stderr
@@ -1,4 +1,4 @@
-error: `[u8; _]` is forbidden as the type of a const generic parameter
+error: `[u8; Bar::<u32>::value()]` is forbidden as the type of a const generic parameter
   --> $DIR/issue-75047.rs:14:21
    |
 LL | struct Foo<const N: [u8; Bar::<u32>::value()]>;
diff --git a/tests/ui/const-generics/issues/issue-75047.rs b/tests/ui/const-generics/issues/issue-75047.rs
new file mode 100644
index 000000000..7b6fb92bc
--- /dev/null
+++ b/tests/ui/const-generics/issues/issue-75047.rs
@@ -0,0 +1,17 @@
+// [full] check-pass
+// revisions: full min
+#![cfg_attr(full, feature(adt_const_params))]
+#![cfg_attr(full, allow(incomplete_features))]
+
+struct Bar<T>(T);
+
+impl<T> Bar<T> {
+    const fn value() -> usize {
+        42
+    }
+}
+
+struct Foo<const N: [u8; Bar::<u32>::value()]>;
+//[min]~^ ERROR `[u8; Bar::<u32>::value()]` is forbidden as the type of a const generic parameter
+
+fn main() {}
diff --git a/src/test/ui/const-generics/issues/issue-75299.rs b/tests/ui/const-generics/issues/issue-75299.rs
index 83ef09af8..83ef09af8 100644
--- a/src/test/ui/const-generics/issues/issue-75299.rs
+++ b/tests/ui/const-generics/issues/issue-75299.rs
diff --git a/src/test/ui/const-generics/issues/issue-76701-ty-param-in-const.rs b/tests/ui/const-generics/issues/issue-76701-ty-param-in-const.rs
index 2e6b02236..2e6b02236 100644
--- a/src/test/ui/const-generics/issues/issue-76701-ty-param-in-const.rs
+++ b/tests/ui/const-generics/issues/issue-76701-ty-param-in-const.rs
diff --git a/src/test/ui/const-generics/issues/issue-76701-ty-param-in-const.stderr b/tests/ui/const-generics/issues/issue-76701-ty-param-in-const.stderr
index 3b53e18e6..3b53e18e6 100644
--- a/src/test/ui/const-generics/issues/issue-76701-ty-param-in-const.stderr
+++ b/tests/ui/const-generics/issues/issue-76701-ty-param-in-const.stderr
diff --git a/src/test/ui/const-generics/issues/issue-77357.rs b/tests/ui/const-generics/issues/issue-77357.rs
index 3cb8d3846..3cb8d3846 100644
--- a/src/test/ui/const-generics/issues/issue-77357.rs
+++ b/tests/ui/const-generics/issues/issue-77357.rs
diff --git a/src/test/ui/const-generics/issues/issue-77357.stderr b/tests/ui/const-generics/issues/issue-77357.stderr
index 804c0ae51..68b35a38b 100644
--- a/src/test/ui/const-generics/issues/issue-77357.stderr
+++ b/tests/ui/const-generics/issues/issue-77357.stderr
@@ -2,7 +2,7 @@ error: overly complex generic constant
   --> $DIR/issue-77357.rs:6:46
    |
 LL | fn bug<'a, T>() -> &'static dyn MyTrait<[(); { |x: &'a u32| { x }; 4 }]> {
-   |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constant
+   |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/src/test/ui/const-generics/issues/issue-79674.rs b/tests/ui/const-generics/issues/issue-79674.rs
index ff141d328..ff141d328 100644
--- a/src/test/ui/const-generics/issues/issue-79674.rs
+++ b/tests/ui/const-generics/issues/issue-79674.rs
diff --git a/src/test/ui/const-generics/issues/issue-79674.stderr b/tests/ui/const-generics/issues/issue-79674.stderr
index 02b48b55f..02b48b55f 100644
--- a/src/test/ui/const-generics/issues/issue-79674.stderr
+++ b/tests/ui/const-generics/issues/issue-79674.stderr
diff --git a/src/test/ui/const-generics/issues/issue-80062.rs b/tests/ui/const-generics/issues/issue-80062.rs
index 56dc53298..56dc53298 100644
--- a/src/test/ui/const-generics/issues/issue-80062.rs
+++ b/tests/ui/const-generics/issues/issue-80062.rs
diff --git a/src/test/ui/const-generics/issues/issue-80062.stderr b/tests/ui/const-generics/issues/issue-80062.stderr
index 754f18d5c..754f18d5c 100644
--- a/src/test/ui/const-generics/issues/issue-80062.stderr
+++ b/tests/ui/const-generics/issues/issue-80062.stderr
diff --git a/src/test/ui/const-generics/issues/issue-80375.rs b/tests/ui/const-generics/issues/issue-80375.rs
index c906bb2c4..c906bb2c4 100644
--- a/src/test/ui/const-generics/issues/issue-80375.rs
+++ b/tests/ui/const-generics/issues/issue-80375.rs
diff --git a/src/test/ui/const-generics/issues/issue-80375.stderr b/tests/ui/const-generics/issues/issue-80375.stderr
index 5409002a9..5409002a9 100644
--- a/src/test/ui/const-generics/issues/issue-80375.stderr
+++ b/tests/ui/const-generics/issues/issue-80375.stderr
diff --git a/src/test/ui/const-generics/issues/issue-82956.rs b/tests/ui/const-generics/issues/issue-82956.rs
index 3539e9b96..3539e9b96 100644
--- a/src/test/ui/const-generics/issues/issue-82956.rs
+++ b/tests/ui/const-generics/issues/issue-82956.rs
diff --git a/src/test/ui/const-generics/issues/issue-82956.stderr b/tests/ui/const-generics/issues/issue-82956.stderr
index d2320293e..d2320293e 100644
--- a/src/test/ui/const-generics/issues/issue-82956.stderr
+++ b/tests/ui/const-generics/issues/issue-82956.stderr
diff --git a/src/test/ui/const-generics/issues/issue-83249.rs b/tests/ui/const-generics/issues/issue-83249.rs
index 65148c55e..65148c55e 100644
--- a/src/test/ui/const-generics/issues/issue-83249.rs
+++ b/tests/ui/const-generics/issues/issue-83249.rs
diff --git a/src/test/ui/const-generics/issues/issue-83249.stderr b/tests/ui/const-generics/issues/issue-83249.stderr
index 362b8554b..7491fdc8a 100644
--- a/src/test/ui/const-generics/issues/issue-83249.stderr
+++ b/tests/ui/const-generics/issues/issue-83249.stderr
@@ -6,8 +6,8 @@ LL |     let _ = foo([0; 1]);
    |
 help: consider giving this pattern a type
    |
-LL |     let _: _ = foo([0; 1]);
-   |          +++
+LL |     let _: /* Type */ = foo([0; 1]);
+   |          ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/const-generics/issues/issue-83288.rs b/tests/ui/const-generics/issues/issue-83288.rs
index a24596d24..a24596d24 100644
--- a/src/test/ui/const-generics/issues/issue-83288.rs
+++ b/tests/ui/const-generics/issues/issue-83288.rs
diff --git a/src/test/ui/const-generics/issues/issue-83466.rs b/tests/ui/const-generics/issues/issue-83466.rs
index 73c930101..73c930101 100644
--- a/src/test/ui/const-generics/issues/issue-83466.rs
+++ b/tests/ui/const-generics/issues/issue-83466.rs
diff --git a/src/test/ui/const-generics/issues/issue-83466.stderr b/tests/ui/const-generics/issues/issue-83466.stderr
index bcfd70639..bcfd70639 100644
--- a/src/test/ui/const-generics/issues/issue-83466.stderr
+++ b/tests/ui/const-generics/issues/issue-83466.stderr
diff --git a/src/test/ui/const-generics/issues/issue-83765.rs b/tests/ui/const-generics/issues/issue-83765.rs
index 71c164ab0..71c164ab0 100644
--- a/src/test/ui/const-generics/issues/issue-83765.rs
+++ b/tests/ui/const-generics/issues/issue-83765.rs
diff --git a/src/test/ui/const-generics/issues/issue-83765.stderr b/tests/ui/const-generics/issues/issue-83765.stderr
index d7b2b006c..d7b2b006c 100644
--- a/src/test/ui/const-generics/issues/issue-83765.stderr
+++ b/tests/ui/const-generics/issues/issue-83765.stderr
diff --git a/src/test/ui/const-generics/issues/issue-83993.rs b/tests/ui/const-generics/issues/issue-83993.rs
index f2f05d952..f2f05d952 100644
--- a/src/test/ui/const-generics/issues/issue-83993.rs
+++ b/tests/ui/const-generics/issues/issue-83993.rs
diff --git a/src/test/ui/const-generics/issues/issue-84659.rs b/tests/ui/const-generics/issues/issue-84659.rs
index 440ca740a..440ca740a 100644
--- a/src/test/ui/const-generics/issues/issue-84659.rs
+++ b/tests/ui/const-generics/issues/issue-84659.rs
diff --git a/src/test/ui/const-generics/issues/issue-84659.stderr b/tests/ui/const-generics/issues/issue-84659.stderr
index 2dfc48a34..2dfc48a34 100644
--- a/src/test/ui/const-generics/issues/issue-84659.stderr
+++ b/tests/ui/const-generics/issues/issue-84659.stderr
diff --git a/src/test/ui/const-generics/issues/issue-85031-2.rs b/tests/ui/const-generics/issues/issue-85031-2.rs
index 4908fb296..50dd66da6 100644
--- a/src/test/ui/const-generics/issues/issue-85031-2.rs
+++ b/tests/ui/const-generics/issues/issue-85031-2.rs
@@ -1,5 +1,5 @@
 // check-pass
-// known-bug
+// known-bug: unknown
 
 // This should not compile, as the compiler should not know
 // `A - 0` is satisfied `?x - 0` if `?x` is inferred to `A`.
@@ -10,7 +10,6 @@ pub struct Ref<'a>(&'a i32);
 
 impl<'a> Ref<'a> {
     pub fn foo<const A: usize>() -> [(); A - 0] {
-        //~^ WARN function cannot
         Self::foo()
     }
 }
diff --git a/src/test/ui/const-generics/issues/issue-85031-2.stderr b/tests/ui/const-generics/issues/issue-85031-2.stderr
index fc6905768..896e1c7ea 100644
--- a/src/test/ui/const-generics/issues/issue-85031-2.stderr
+++ b/tests/ui/const-generics/issues/issue-85031-2.stderr
@@ -3,7 +3,6 @@ warning: function cannot return without recursing
    |
 LL |     pub fn foo<const A: usize>() -> [(); A - 0] {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot return without recursing
-LL |
 LL |         Self::foo()
    |         ----------- recursive call site
    |
diff --git a/src/test/ui/const-generics/issues/issue-86033.rs b/tests/ui/const-generics/issues/issue-86033.rs
index cf08f722f..cf08f722f 100644
--- a/src/test/ui/const-generics/issues/issue-86033.rs
+++ b/tests/ui/const-generics/issues/issue-86033.rs
diff --git a/src/test/ui/const-generics/issues/issue-86530.rs b/tests/ui/const-generics/issues/issue-86530.rs
index b024decd4..b024decd4 100644
--- a/src/test/ui/const-generics/issues/issue-86530.rs
+++ b/tests/ui/const-generics/issues/issue-86530.rs
diff --git a/src/test/ui/const-generics/issues/issue-86530.stderr b/tests/ui/const-generics/issues/issue-86530.stderr
index c63857b23..c63857b23 100644
--- a/src/test/ui/const-generics/issues/issue-86530.stderr
+++ b/tests/ui/const-generics/issues/issue-86530.stderr
diff --git a/src/test/ui/const-generics/issues/issue-86535-2.rs b/tests/ui/const-generics/issues/issue-86535-2.rs
index 0b535fd66..0b535fd66 100644
--- a/src/test/ui/const-generics/issues/issue-86535-2.rs
+++ b/tests/ui/const-generics/issues/issue-86535-2.rs
diff --git a/src/test/ui/const-generics/issues/issue-86535.rs b/tests/ui/const-generics/issues/issue-86535.rs
index 5289c4e99..5289c4e99 100644
--- a/src/test/ui/const-generics/issues/issue-86535.rs
+++ b/tests/ui/const-generics/issues/issue-86535.rs
diff --git a/src/test/ui/const-generics/issues/issue-86820.rs b/tests/ui/const-generics/issues/issue-86820.rs
index ae4bd943f..ae4bd943f 100644
--- a/src/test/ui/const-generics/issues/issue-86820.rs
+++ b/tests/ui/const-generics/issues/issue-86820.rs
diff --git a/src/test/ui/const-generics/issues/issue-86820.stderr b/tests/ui/const-generics/issues/issue-86820.stderr
index 3a9cd957f..3a9cd957f 100644
--- a/src/test/ui/const-generics/issues/issue-86820.stderr
+++ b/tests/ui/const-generics/issues/issue-86820.stderr
diff --git a/src/test/ui/const-generics/issues/issue-87076.rs b/tests/ui/const-generics/issues/issue-87076.rs
index 8a567678b..8a567678b 100644
--- a/src/test/ui/const-generics/issues/issue-87076.rs
+++ b/tests/ui/const-generics/issues/issue-87076.rs
diff --git a/src/test/ui/const-generics/issues/issue-87470.rs b/tests/ui/const-generics/issues/issue-87470.rs
index d60181a41..d60181a41 100644
--- a/src/test/ui/const-generics/issues/issue-87470.rs
+++ b/tests/ui/const-generics/issues/issue-87470.rs
diff --git a/src/test/ui/const-generics/issues/issue-87493.rs b/tests/ui/const-generics/issues/issue-87493.rs
index d8599ab22..d8599ab22 100644
--- a/src/test/ui/const-generics/issues/issue-87493.rs
+++ b/tests/ui/const-generics/issues/issue-87493.rs
diff --git a/src/test/ui/const-generics/issues/issue-87493.stderr b/tests/ui/const-generics/issues/issue-87493.stderr
index 653afae21..653afae21 100644
--- a/src/test/ui/const-generics/issues/issue-87493.stderr
+++ b/tests/ui/const-generics/issues/issue-87493.stderr
diff --git a/src/test/ui/const-generics/issues/issue-87964.rs b/tests/ui/const-generics/issues/issue-87964.rs
index 116686abb..116686abb 100644
--- a/src/test/ui/const-generics/issues/issue-87964.rs
+++ b/tests/ui/const-generics/issues/issue-87964.rs
diff --git a/src/test/ui/const-generics/issues/issue-88119.rs b/tests/ui/const-generics/issues/issue-88119.rs
index 647b0eea8..647b0eea8 100644
--- a/src/test/ui/const-generics/issues/issue-88119.rs
+++ b/tests/ui/const-generics/issues/issue-88119.rs
diff --git a/src/test/ui/const-generics/issues/issue-88468.rs b/tests/ui/const-generics/issues/issue-88468.rs
index 914047236..914047236 100644
--- a/src/test/ui/const-generics/issues/issue-88468.rs
+++ b/tests/ui/const-generics/issues/issue-88468.rs
diff --git a/src/test/ui/const-generics/issues/issue-88997.rs b/tests/ui/const-generics/issues/issue-88997.rs
index 7666a5141..7666a5141 100644
--- a/src/test/ui/const-generics/issues/issue-88997.rs
+++ b/tests/ui/const-generics/issues/issue-88997.rs
diff --git a/src/test/ui/const-generics/issues/issue-88997.stderr b/tests/ui/const-generics/issues/issue-88997.stderr
index 505ba0da2..505ba0da2 100644
--- a/src/test/ui/const-generics/issues/issue-88997.stderr
+++ b/tests/ui/const-generics/issues/issue-88997.stderr
diff --git a/src/test/ui/const-generics/issues/issue-89146.rs b/tests/ui/const-generics/issues/issue-89146.rs
index e3540f46f..e3540f46f 100644
--- a/src/test/ui/const-generics/issues/issue-89146.rs
+++ b/tests/ui/const-generics/issues/issue-89146.rs
diff --git a/src/test/ui/const-generics/issues/issue-89304.rs b/tests/ui/const-generics/issues/issue-89304.rs
index d544d637c..d544d637c 100644
--- a/src/test/ui/const-generics/issues/issue-89304.rs
+++ b/tests/ui/const-generics/issues/issue-89304.rs
diff --git a/src/test/ui/const-generics/issues/issue-89320.rs b/tests/ui/const-generics/issues/issue-89320.rs
index afa5c8fab..afa5c8fab 100644
--- a/src/test/ui/const-generics/issues/issue-89320.rs
+++ b/tests/ui/const-generics/issues/issue-89320.rs
diff --git a/src/test/ui/const-generics/issues/issue-89334.rs b/tests/ui/const-generics/issues/issue-89334.rs
index b15b7428c..b15b7428c 100644
--- a/src/test/ui/const-generics/issues/issue-89334.rs
+++ b/tests/ui/const-generics/issues/issue-89334.rs
diff --git a/src/test/ui/const-generics/issues/issue-90318.rs b/tests/ui/const-generics/issues/issue-90318.rs
index d6c48e63b..909997340 100644
--- a/src/test/ui/const-generics/issues/issue-90318.rs
+++ b/tests/ui/const-generics/issues/issue-90318.rs
@@ -12,14 +12,14 @@ impl True for If<true> {}
 fn consume<T: 'static>(_val: T)
 where
     If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,
-    //~^ ERROR: can't compare
+    //~^ overly complex generic constant
 {
 }
 
 fn test<T: 'static>()
 where
     If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,
-    //~^ ERROR: can't compare
+    //~^ overly complex generic constant
 {
 }
 
diff --git a/tests/ui/const-generics/issues/issue-90318.stderr b/tests/ui/const-generics/issues/issue-90318.stderr
new file mode 100644
index 000000000..f13fd795d
--- /dev/null
+++ b/tests/ui/const-generics/issues/issue-90318.stderr
@@ -0,0 +1,24 @@
+error: overly complex generic constant
+  --> $DIR/issue-90318.rs:14:8
+   |
+LL |     If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,
+   |        ^^-----------------^^^^^^^^^^^^^^^^^^^^^^^^
+   |          |
+   |          borrowing is not supported in generic constants
+   |
+   = help: consider moving this anonymous constant into a `const` function
+   = note: this operation may be supported in the future
+
+error: overly complex generic constant
+  --> $DIR/issue-90318.rs:21:8
+   |
+LL |     If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,
+   |        ^^-----------------^^^^^^^^^^^^^^^^^^^^^^^^
+   |          |
+   |          borrowing is not supported in generic constants
+   |
+   = help: consider moving this anonymous constant into a `const` function
+   = note: this operation may be supported in the future
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/const-generics/issues/issue-90364.rs b/tests/ui/const-generics/issues/issue-90364.rs
index b11b07b50..b11b07b50 100644
--- a/src/test/ui/const-generics/issues/issue-90364.rs
+++ b/tests/ui/const-generics/issues/issue-90364.rs
diff --git a/src/test/ui/const-generics/issues/issue-90364.stderr b/tests/ui/const-generics/issues/issue-90364.stderr
index e85bd136e..e85bd136e 100644
--- a/src/test/ui/const-generics/issues/issue-90364.stderr
+++ b/tests/ui/const-generics/issues/issue-90364.stderr
diff --git a/src/test/ui/const-generics/issues/issue-90455.rs b/tests/ui/const-generics/issues/issue-90455.rs
index a580410cf..a580410cf 100644
--- a/src/test/ui/const-generics/issues/issue-90455.rs
+++ b/tests/ui/const-generics/issues/issue-90455.rs
diff --git a/src/test/ui/const-generics/issues/issue-90455.stderr b/tests/ui/const-generics/issues/issue-90455.stderr
index 724d7f42e..724d7f42e 100644
--- a/src/test/ui/const-generics/issues/issue-90455.stderr
+++ b/tests/ui/const-generics/issues/issue-90455.stderr
diff --git a/src/test/ui/const-generics/issues/issue-92186.rs b/tests/ui/const-generics/issues/issue-92186.rs
index 9ced4667d..9ced4667d 100644
--- a/src/test/ui/const-generics/issues/issue-92186.rs
+++ b/tests/ui/const-generics/issues/issue-92186.rs
diff --git a/src/test/ui/const-generics/issues/issue-96654.rs b/tests/ui/const-generics/issues/issue-96654.rs
index 8cf786dbe..8cf786dbe 100644
--- a/src/test/ui/const-generics/issues/issue-96654.rs
+++ b/tests/ui/const-generics/issues/issue-96654.rs
diff --git a/src/test/ui/const-generics/issues/issue-97278.rs b/tests/ui/const-generics/issues/issue-97278.rs
index da0a9776f..da0a9776f 100644
--- a/src/test/ui/const-generics/issues/issue-97278.rs
+++ b/tests/ui/const-generics/issues/issue-97278.rs
diff --git a/src/test/ui/const-generics/issues/issue-97278.stderr b/tests/ui/const-generics/issues/issue-97278.stderr
index ff13cb505..ff13cb505 100644
--- a/src/test/ui/const-generics/issues/issue-97278.stderr
+++ b/tests/ui/const-generics/issues/issue-97278.stderr
diff --git a/src/test/ui/const-generics/issues/issue-97634.rs b/tests/ui/const-generics/issues/issue-97634.rs
index 422e8de68..422e8de68 100644
--- a/src/test/ui/const-generics/issues/issue-97634.rs
+++ b/tests/ui/const-generics/issues/issue-97634.rs
diff --git a/src/test/ui/const-generics/issues/issue-98629.rs b/tests/ui/const-generics/issues/issue-98629.rs
index 1d2d3012a..1d2d3012a 100644
--- a/src/test/ui/const-generics/issues/issue-98629.rs
+++ b/tests/ui/const-generics/issues/issue-98629.rs
diff --git a/src/test/ui/const-generics/issues/issue-98629.stderr b/tests/ui/const-generics/issues/issue-98629.stderr
index 4a248be76..4a248be76 100644
--- a/src/test/ui/const-generics/issues/issue-98629.stderr
+++ b/tests/ui/const-generics/issues/issue-98629.stderr
diff --git a/src/test/ui/const-generics/issues/issue-99641.rs b/tests/ui/const-generics/issues/issue-99641.rs
index fae6d3fc4..fae6d3fc4 100644
--- a/src/test/ui/const-generics/issues/issue-99641.rs
+++ b/tests/ui/const-generics/issues/issue-99641.rs
diff --git a/src/test/ui/const-generics/issues/issue-99641.stderr b/tests/ui/const-generics/issues/issue-99641.stderr
index 349ebba08..349ebba08 100644
--- a/src/test/ui/const-generics/issues/issue-99641.stderr
+++ b/tests/ui/const-generics/issues/issue-99641.stderr
diff --git a/src/test/ui/const-generics/late-bound-vars/in_closure.rs b/tests/ui/const-generics/late-bound-vars/in_closure.rs
index 5294cc3b5..5294cc3b5 100644
--- a/src/test/ui/const-generics/late-bound-vars/in_closure.rs
+++ b/tests/ui/const-generics/late-bound-vars/in_closure.rs
diff --git a/src/test/ui/const-generics/late-bound-vars/simple.rs b/tests/ui/const-generics/late-bound-vars/simple.rs
index 6da5395ef..6da5395ef 100644
--- a/src/test/ui/const-generics/late-bound-vars/simple.rs
+++ b/tests/ui/const-generics/late-bound-vars/simple.rs
diff --git a/src/test/ui/const-generics/legacy-const-generics-bad.rs b/tests/ui/const-generics/legacy-const-generics-bad.rs
index 538eee337..538eee337 100644
--- a/src/test/ui/const-generics/legacy-const-generics-bad.rs
+++ b/tests/ui/const-generics/legacy-const-generics-bad.rs
diff --git a/src/test/ui/const-generics/legacy-const-generics-bad.stderr b/tests/ui/const-generics/legacy-const-generics-bad.stderr
index 3c78dd6c7..3c78dd6c7 100644
--- a/src/test/ui/const-generics/legacy-const-generics-bad.stderr
+++ b/tests/ui/const-generics/legacy-const-generics-bad.stderr
diff --git a/src/test/ui/const-generics/legacy-const-generics.rs b/tests/ui/const-generics/legacy-const-generics.rs
index 9abc72d98..9abc72d98 100644
--- a/src/test/ui/const-generics/legacy-const-generics.rs
+++ b/tests/ui/const-generics/legacy-const-generics.rs
diff --git a/src/test/ui/const-generics/min_const_generics/assoc_const.rs b/tests/ui/const-generics/min_const_generics/assoc_const.rs
index 27e971b5b..27e971b5b 100644
--- a/src/test/ui/const-generics/min_const_generics/assoc_const.rs
+++ b/tests/ui/const-generics/min_const_generics/assoc_const.rs
diff --git a/src/test/ui/const-generics/min_const_generics/complex-expression.rs b/tests/ui/const-generics/min_const_generics/complex-expression.rs
index 8e667aeba..8e667aeba 100644
--- a/src/test/ui/const-generics/min_const_generics/complex-expression.rs
+++ b/tests/ui/const-generics/min_const_generics/complex-expression.rs
diff --git a/src/test/ui/const-generics/min_const_generics/complex-expression.stderr b/tests/ui/const-generics/min_const_generics/complex-expression.stderr
index deabd05a6..deabd05a6 100644
--- a/src/test/ui/const-generics/min_const_generics/complex-expression.stderr
+++ b/tests/ui/const-generics/min_const_generics/complex-expression.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/complex-types.rs b/tests/ui/const-generics/min_const_generics/complex-types.rs
index 057bd5af8..057bd5af8 100644
--- a/src/test/ui/const-generics/min_const_generics/complex-types.rs
+++ b/tests/ui/const-generics/min_const_generics/complex-types.rs
diff --git a/src/test/ui/const-generics/min_const_generics/complex-types.stderr b/tests/ui/const-generics/min_const_generics/complex-types.stderr
index 4ddbadb54..4ddbadb54 100644
--- a/src/test/ui/const-generics/min_const_generics/complex-types.stderr
+++ b/tests/ui/const-generics/min_const_generics/complex-types.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/const-evaluatable-unchecked.rs b/tests/ui/const-generics/min_const_generics/const-evaluatable-unchecked.rs
index e9d868093..e9d868093 100644
--- a/src/test/ui/const-generics/min_const_generics/const-evaluatable-unchecked.rs
+++ b/tests/ui/const-generics/min_const_generics/const-evaluatable-unchecked.rs
diff --git a/src/test/ui/const-generics/min_const_generics/const-evaluatable-unchecked.stderr b/tests/ui/const-generics/min_const_generics/const-evaluatable-unchecked.stderr
index 8003dfa40..8003dfa40 100644
--- a/src/test/ui/const-generics/min_const_generics/const-evaluatable-unchecked.stderr
+++ b/tests/ui/const-generics/min_const_generics/const-evaluatable-unchecked.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces-without-turbofish.rs b/tests/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces-without-turbofish.rs
index fac3777cf..fac3777cf 100644
--- a/src/test/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces-without-turbofish.rs
+++ b/tests/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces-without-turbofish.rs
diff --git a/src/test/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces-without-turbofish.stderr b/tests/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces-without-turbofish.stderr
index a6825b845..a6825b845 100644
--- a/src/test/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces-without-turbofish.stderr
+++ b/tests/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces-without-turbofish.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces.rs b/tests/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces.rs
index e12e07a28..e12e07a28 100644
--- a/src/test/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces.rs
+++ b/tests/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces.rs
diff --git a/src/test/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces.stderr b/tests/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces.stderr
index d9bcc523b..d9bcc523b 100644
--- a/src/test/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces.stderr
+++ b/tests/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/const_default_first.rs b/tests/ui/const-generics/min_const_generics/const_default_first.rs
index eafafb8a2..eafafb8a2 100644
--- a/src/test/ui/const-generics/min_const_generics/const_default_first.rs
+++ b/tests/ui/const-generics/min_const_generics/const_default_first.rs
diff --git a/src/test/ui/const-generics/min_const_generics/const_default_first.stderr b/tests/ui/const-generics/min_const_generics/const_default_first.stderr
index 0d5a393cb..0d5a393cb 100644
--- a/src/test/ui/const-generics/min_const_generics/const_default_first.stderr
+++ b/tests/ui/const-generics/min_const_generics/const_default_first.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/const_fn_in_generics.rs b/tests/ui/const-generics/min_const_generics/const_fn_in_generics.rs
index 0c10af6c4..0c10af6c4 100644
--- a/src/test/ui/const-generics/min_const_generics/const_fn_in_generics.rs
+++ b/tests/ui/const-generics/min_const_generics/const_fn_in_generics.rs
diff --git a/src/test/ui/const-generics/min_const_generics/default_function_param.rs b/tests/ui/const-generics/min_const_generics/default_function_param.rs
index 92d495ef6..92d495ef6 100644
--- a/src/test/ui/const-generics/min_const_generics/default_function_param.rs
+++ b/tests/ui/const-generics/min_const_generics/default_function_param.rs
diff --git a/src/test/ui/const-generics/min_const_generics/default_function_param.stderr b/tests/ui/const-generics/min_const_generics/default_function_param.stderr
index dedad2880..dedad2880 100644
--- a/src/test/ui/const-generics/min_const_generics/default_function_param.stderr
+++ b/tests/ui/const-generics/min_const_generics/default_function_param.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/default_trait_param.rs b/tests/ui/const-generics/min_const_generics/default_trait_param.rs
index 9cd5e3279..9cd5e3279 100644
--- a/src/test/ui/const-generics/min_const_generics/default_trait_param.rs
+++ b/tests/ui/const-generics/min_const_generics/default_trait_param.rs
diff --git a/src/test/ui/const-generics/min_const_generics/forbid-non-static-lifetimes.rs b/tests/ui/const-generics/min_const_generics/forbid-non-static-lifetimes.rs
index 6215b7d93..6215b7d93 100644
--- a/src/test/ui/const-generics/min_const_generics/forbid-non-static-lifetimes.rs
+++ b/tests/ui/const-generics/min_const_generics/forbid-non-static-lifetimes.rs
diff --git a/src/test/ui/const-generics/min_const_generics/forbid-non-static-lifetimes.stderr b/tests/ui/const-generics/min_const_generics/forbid-non-static-lifetimes.stderr
index 5f641b070..5f641b070 100644
--- a/src/test/ui/const-generics/min_const_generics/forbid-non-static-lifetimes.stderr
+++ b/tests/ui/const-generics/min_const_generics/forbid-non-static-lifetimes.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/forbid-self-no-normalize.rs b/tests/ui/const-generics/min_const_generics/forbid-self-no-normalize.rs
index e1cf7b579..e1cf7b579 100644
--- a/src/test/ui/const-generics/min_const_generics/forbid-self-no-normalize.rs
+++ b/tests/ui/const-generics/min_const_generics/forbid-self-no-normalize.rs
diff --git a/src/test/ui/const-generics/min_const_generics/forbid-self-no-normalize.stderr b/tests/ui/const-generics/min_const_generics/forbid-self-no-normalize.stderr
index bda885970..bda885970 100644
--- a/src/test/ui/const-generics/min_const_generics/forbid-self-no-normalize.stderr
+++ b/tests/ui/const-generics/min_const_generics/forbid-self-no-normalize.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/inferred_const.rs b/tests/ui/const-generics/min_const_generics/inferred_const.rs
index 57d694158..57d694158 100644
--- a/src/test/ui/const-generics/min_const_generics/inferred_const.rs
+++ b/tests/ui/const-generics/min_const_generics/inferred_const.rs
diff --git a/src/test/ui/const-generics/min_const_generics/invalid-patterns.32bit.stderr b/tests/ui/const-generics/min_const_generics/invalid-patterns.32bit.stderr
index be92429e3..be92429e3 100644
--- a/src/test/ui/const-generics/min_const_generics/invalid-patterns.32bit.stderr
+++ b/tests/ui/const-generics/min_const_generics/invalid-patterns.32bit.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/invalid-patterns.64bit.stderr b/tests/ui/const-generics/min_const_generics/invalid-patterns.64bit.stderr
index be92429e3..be92429e3 100644
--- a/src/test/ui/const-generics/min_const_generics/invalid-patterns.64bit.stderr
+++ b/tests/ui/const-generics/min_const_generics/invalid-patterns.64bit.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/invalid-patterns.rs b/tests/ui/const-generics/min_const_generics/invalid-patterns.rs
index 13b2cca2f..13b2cca2f 100644
--- a/src/test/ui/const-generics/min_const_generics/invalid-patterns.rs
+++ b/tests/ui/const-generics/min_const_generics/invalid-patterns.rs
diff --git a/src/test/ui/const-generics/min_const_generics/macro-fail.rs b/tests/ui/const-generics/min_const_generics/macro-fail.rs
index 7fb69032e..7fb69032e 100644
--- a/src/test/ui/const-generics/min_const_generics/macro-fail.rs
+++ b/tests/ui/const-generics/min_const_generics/macro-fail.rs
diff --git a/src/test/ui/const-generics/min_const_generics/macro-fail.stderr b/tests/ui/const-generics/min_const_generics/macro-fail.stderr
index 9f73b91aa..9f73b91aa 100644
--- a/src/test/ui/const-generics/min_const_generics/macro-fail.stderr
+++ b/tests/ui/const-generics/min_const_generics/macro-fail.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/macro.rs b/tests/ui/const-generics/min_const_generics/macro.rs
index 9b63f7698..9b63f7698 100644
--- a/src/test/ui/const-generics/min_const_generics/macro.rs
+++ b/tests/ui/const-generics/min_const_generics/macro.rs
diff --git a/src/test/ui/const-generics/min_const_generics/self-ty-in-const-1.rs b/tests/ui/const-generics/min_const_generics/self-ty-in-const-1.rs
index 9ef619365..9ef619365 100644
--- a/src/test/ui/const-generics/min_const_generics/self-ty-in-const-1.rs
+++ b/tests/ui/const-generics/min_const_generics/self-ty-in-const-1.rs
diff --git a/src/test/ui/const-generics/min_const_generics/self-ty-in-const-1.stderr b/tests/ui/const-generics/min_const_generics/self-ty-in-const-1.stderr
index 16a7687c0..16a7687c0 100644
--- a/src/test/ui/const-generics/min_const_generics/self-ty-in-const-1.stderr
+++ b/tests/ui/const-generics/min_const_generics/self-ty-in-const-1.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/self-ty-in-const-2.rs b/tests/ui/const-generics/min_const_generics/self-ty-in-const-2.rs
index 286ec2d24..286ec2d24 100644
--- a/src/test/ui/const-generics/min_const_generics/self-ty-in-const-2.rs
+++ b/tests/ui/const-generics/min_const_generics/self-ty-in-const-2.rs
diff --git a/src/test/ui/const-generics/min_const_generics/self-ty-in-const-2.stderr b/tests/ui/const-generics/min_const_generics/self-ty-in-const-2.stderr
index 41546292c..41546292c 100644
--- a/src/test/ui/const-generics/min_const_generics/self-ty-in-const-2.stderr
+++ b/tests/ui/const-generics/min_const_generics/self-ty-in-const-2.stderr
diff --git a/src/test/ui/const-generics/min_const_generics/type_and_const_defaults.rs b/tests/ui/const-generics/min_const_generics/type_and_const_defaults.rs
index fa119c59f..fa119c59f 100644
--- a/src/test/ui/const-generics/min_const_generics/type_and_const_defaults.rs
+++ b/tests/ui/const-generics/min_const_generics/type_and_const_defaults.rs
diff --git a/src/test/ui/const-generics/nested-type.full.stderr b/tests/ui/const-generics/nested-type.full.stderr
index 6d9f44065..6d9f44065 100644
--- a/src/test/ui/const-generics/nested-type.full.stderr
+++ b/tests/ui/const-generics/nested-type.full.stderr
diff --git a/tests/ui/const-generics/nested-type.min.stderr b/tests/ui/const-generics/nested-type.min.stderr
new file mode 100644
index 000000000..cff02b0d4
--- /dev/null
+++ b/tests/ui/const-generics/nested-type.min.stderr
@@ -0,0 +1,28 @@
+error: `[u8; {
+           struct Foo<const N: usize>;
+       
+           impl<const N: usize> Foo<N> {
+               fn value() -> usize {
+                   N
+               }
+           }
+       
+           Foo::<17>::value()
+       }]` is forbidden as the type of a const generic parameter
+  --> $DIR/nested-type.rs:6:21
+   |
+LL |   struct Foo<const N: [u8; {
+   |  _____________________^
+LL | |     struct Foo<const N: usize>;
+LL | |
+LL | |     impl<const N: usize> Foo<N> {
+...  |
+LL | |
+LL | | }]>;
+   | |__^
+   |
+   = note: the only supported types are integers, `bool` and `char`
+   = help: more complex types are supported with `#![feature(adt_const_params)]`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/const-generics/nested-type.rs b/tests/ui/const-generics/nested-type.rs
index 742340f43..742340f43 100644
--- a/src/test/ui/const-generics/nested-type.rs
+++ b/tests/ui/const-generics/nested-type.rs
diff --git a/src/test/ui/const-generics/occurs-check/bind-param.rs b/tests/ui/const-generics/occurs-check/bind-param.rs
index ee4244051..ee4244051 100644
--- a/src/test/ui/const-generics/occurs-check/bind-param.rs
+++ b/tests/ui/const-generics/occurs-check/bind-param.rs
diff --git a/src/test/ui/const-generics/occurs-check/unify-fixpoint.rs b/tests/ui/const-generics/occurs-check/unify-fixpoint.rs
index e6f8e4ad3..e6f8e4ad3 100644
--- a/src/test/ui/const-generics/occurs-check/unify-fixpoint.rs
+++ b/tests/ui/const-generics/occurs-check/unify-fixpoint.rs
diff --git a/src/test/ui/const-generics/occurs-check/unify-fixpoint.stderr b/tests/ui/const-generics/occurs-check/unify-fixpoint.stderr
index fe3f24a67..fe3f24a67 100644
--- a/src/test/ui/const-generics/occurs-check/unify-fixpoint.stderr
+++ b/tests/ui/const-generics/occurs-check/unify-fixpoint.stderr
diff --git a/src/test/ui/const-generics/occurs-check/unify-n-nplusone.rs b/tests/ui/const-generics/occurs-check/unify-n-nplusone.rs
index c6324bca1..c6324bca1 100644
--- a/src/test/ui/const-generics/occurs-check/unify-n-nplusone.rs
+++ b/tests/ui/const-generics/occurs-check/unify-n-nplusone.rs
diff --git a/src/test/ui/const-generics/occurs-check/unify-n-nplusone.stderr b/tests/ui/const-generics/occurs-check/unify-n-nplusone.stderr
index 6b8e688fb..6b8e688fb 100644
--- a/src/test/ui/const-generics/occurs-check/unify-n-nplusone.stderr
+++ b/tests/ui/const-generics/occurs-check/unify-n-nplusone.stderr
diff --git a/src/test/ui/const-generics/occurs-check/unused-substs-1.rs b/tests/ui/const-generics/occurs-check/unused-substs-1.rs
index 9d12250c9..9d12250c9 100644
--- a/src/test/ui/const-generics/occurs-check/unused-substs-1.rs
+++ b/tests/ui/const-generics/occurs-check/unused-substs-1.rs
diff --git a/src/test/ui/const-generics/occurs-check/unused-substs-1.stderr b/tests/ui/const-generics/occurs-check/unused-substs-1.stderr
index a3c011d92..a3c011d92 100644
--- a/src/test/ui/const-generics/occurs-check/unused-substs-1.stderr
+++ b/tests/ui/const-generics/occurs-check/unused-substs-1.stderr
diff --git a/src/test/ui/const-generics/occurs-check/unused-substs-2.rs b/tests/ui/const-generics/occurs-check/unused-substs-2.rs
index 9b1212694..9b1212694 100644
--- a/src/test/ui/const-generics/occurs-check/unused-substs-2.rs
+++ b/tests/ui/const-generics/occurs-check/unused-substs-2.rs
diff --git a/src/test/ui/const-generics/occurs-check/unused-substs-2.stderr b/tests/ui/const-generics/occurs-check/unused-substs-2.stderr
index 9532fc21a..9532fc21a 100644
--- a/src/test/ui/const-generics/occurs-check/unused-substs-2.stderr
+++ b/tests/ui/const-generics/occurs-check/unused-substs-2.stderr
diff --git a/src/test/ui/const-generics/occurs-check/unused-substs-3.rs b/tests/ui/const-generics/occurs-check/unused-substs-3.rs
index d5aeab47e..d5aeab47e 100644
--- a/src/test/ui/const-generics/occurs-check/unused-substs-3.rs
+++ b/tests/ui/const-generics/occurs-check/unused-substs-3.rs
diff --git a/src/test/ui/const-generics/occurs-check/unused-substs-3.stderr b/tests/ui/const-generics/occurs-check/unused-substs-3.stderr
index fd8f8b269..fd8f8b269 100644
--- a/src/test/ui/const-generics/occurs-check/unused-substs-3.stderr
+++ b/tests/ui/const-generics/occurs-check/unused-substs-3.stderr
diff --git a/src/test/ui/const-generics/occurs-check/unused-substs-4.rs b/tests/ui/const-generics/occurs-check/unused-substs-4.rs
index 03c2f5486..03c2f5486 100644
--- a/src/test/ui/const-generics/occurs-check/unused-substs-4.rs
+++ b/tests/ui/const-generics/occurs-check/unused-substs-4.rs
diff --git a/src/test/ui/const-generics/occurs-check/unused-substs-4.stderr b/tests/ui/const-generics/occurs-check/unused-substs-4.stderr
index 5685eedbd..5685eedbd 100644
--- a/src/test/ui/const-generics/occurs-check/unused-substs-4.stderr
+++ b/tests/ui/const-generics/occurs-check/unused-substs-4.stderr
diff --git a/src/test/ui/const-generics/occurs-check/unused-substs-5.rs b/tests/ui/const-generics/occurs-check/unused-substs-5.rs
index 383ab4cd8..383ab4cd8 100644
--- a/src/test/ui/const-generics/occurs-check/unused-substs-5.rs
+++ b/tests/ui/const-generics/occurs-check/unused-substs-5.rs
diff --git a/src/test/ui/const-generics/occurs-check/unused-substs-5.stderr b/tests/ui/const-generics/occurs-check/unused-substs-5.stderr
index be289f44f..be289f44f 100644
--- a/src/test/ui/const-generics/occurs-check/unused-substs-5.stderr
+++ b/tests/ui/const-generics/occurs-check/unused-substs-5.stderr
diff --git a/src/test/ui/const-generics/outer-lifetime-in-const-generic-default.rs b/tests/ui/const-generics/outer-lifetime-in-const-generic-default.rs
index 3018439af..3018439af 100644
--- a/src/test/ui/const-generics/outer-lifetime-in-const-generic-default.rs
+++ b/tests/ui/const-generics/outer-lifetime-in-const-generic-default.rs
diff --git a/src/test/ui/const-generics/outer-lifetime-in-const-generic-default.stderr b/tests/ui/const-generics/outer-lifetime-in-const-generic-default.stderr
index 9d9555d3f..9d9555d3f 100644
--- a/src/test/ui/const-generics/outer-lifetime-in-const-generic-default.stderr
+++ b/tests/ui/const-generics/outer-lifetime-in-const-generic-default.stderr
diff --git a/src/test/ui/const-generics/overlapping_impls.rs b/tests/ui/const-generics/overlapping_impls.rs
index e599eadd8..e599eadd8 100644
--- a/src/test/ui/const-generics/overlapping_impls.rs
+++ b/tests/ui/const-generics/overlapping_impls.rs
diff --git a/src/test/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.full.stderr b/tests/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.full.stderr
index 9f0b2efae..9f0b2efae 100644
--- a/src/test/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.full.stderr
+++ b/tests/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.full.stderr
diff --git a/src/test/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.min.stderr b/tests/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.min.stderr
index a5e70f6b9..a5e70f6b9 100644
--- a/src/test/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.min.stderr
+++ b/tests/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.min.stderr
diff --git a/src/test/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.rs b/tests/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.rs
index b24a7afab..b24a7afab 100644
--- a/src/test/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.rs
+++ b/tests/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.rs
diff --git a/src/test/ui/const-generics/parent_generics_of_encoding.rs b/tests/ui/const-generics/parent_generics_of_encoding.rs
index b87e3960f..b87e3960f 100644
--- a/src/test/ui/const-generics/parent_generics_of_encoding.rs
+++ b/tests/ui/const-generics/parent_generics_of_encoding.rs
diff --git a/src/test/ui/const-generics/parent_generics_of_encoding_impl_trait.rs b/tests/ui/const-generics/parent_generics_of_encoding_impl_trait.rs
index 7a78e0f10..7a78e0f10 100644
--- a/src/test/ui/const-generics/parent_generics_of_encoding_impl_trait.rs
+++ b/tests/ui/const-generics/parent_generics_of_encoding_impl_trait.rs
diff --git a/src/test/ui/const-generics/parent_generics_of_encoding_impl_trait.stderr b/tests/ui/const-generics/parent_generics_of_encoding_impl_trait.stderr
index 87ff7babe..87ff7babe 100644
--- a/src/test/ui/const-generics/parent_generics_of_encoding_impl_trait.stderr
+++ b/tests/ui/const-generics/parent_generics_of_encoding_impl_trait.stderr
diff --git a/src/test/ui/const-generics/parser-error-recovery/issue-89013-no-assoc.rs b/tests/ui/const-generics/parser-error-recovery/issue-89013-no-assoc.rs
index 99d8e9dea..99d8e9dea 100644
--- a/src/test/ui/const-generics/parser-error-recovery/issue-89013-no-assoc.rs
+++ b/tests/ui/const-generics/parser-error-recovery/issue-89013-no-assoc.rs
diff --git a/src/test/ui/const-generics/parser-error-recovery/issue-89013-no-assoc.stderr b/tests/ui/const-generics/parser-error-recovery/issue-89013-no-assoc.stderr
index 1de24bff4..1de24bff4 100644
--- a/src/test/ui/const-generics/parser-error-recovery/issue-89013-no-assoc.stderr
+++ b/tests/ui/const-generics/parser-error-recovery/issue-89013-no-assoc.stderr
diff --git a/src/test/ui/const-generics/parser-error-recovery/issue-89013-no-kw.rs b/tests/ui/const-generics/parser-error-recovery/issue-89013-no-kw.rs
index b126b2485..b126b2485 100644
--- a/src/test/ui/const-generics/parser-error-recovery/issue-89013-no-kw.rs
+++ b/tests/ui/const-generics/parser-error-recovery/issue-89013-no-kw.rs
diff --git a/src/test/ui/const-generics/parser-error-recovery/issue-89013-no-kw.stderr b/tests/ui/const-generics/parser-error-recovery/issue-89013-no-kw.stderr
index acfdde8e1..acfdde8e1 100644
--- a/src/test/ui/const-generics/parser-error-recovery/issue-89013-no-kw.stderr
+++ b/tests/ui/const-generics/parser-error-recovery/issue-89013-no-kw.stderr
diff --git a/src/test/ui/const-generics/parser-error-recovery/issue-89013-type.rs b/tests/ui/const-generics/parser-error-recovery/issue-89013-type.rs
index 0ec6762b6..0ec6762b6 100644
--- a/src/test/ui/const-generics/parser-error-recovery/issue-89013-type.rs
+++ b/tests/ui/const-generics/parser-error-recovery/issue-89013-type.rs
diff --git a/src/test/ui/const-generics/parser-error-recovery/issue-89013-type.stderr b/tests/ui/const-generics/parser-error-recovery/issue-89013-type.stderr
index f0d0d90c7..f0d0d90c7 100644
--- a/src/test/ui/const-generics/parser-error-recovery/issue-89013-type.stderr
+++ b/tests/ui/const-generics/parser-error-recovery/issue-89013-type.stderr
diff --git a/src/test/ui/const-generics/parser-error-recovery/issue-89013.rs b/tests/ui/const-generics/parser-error-recovery/issue-89013.rs
index 9431779fa..9431779fa 100644
--- a/src/test/ui/const-generics/parser-error-recovery/issue-89013.rs
+++ b/tests/ui/const-generics/parser-error-recovery/issue-89013.rs
diff --git a/src/test/ui/const-generics/parser-error-recovery/issue-89013.stderr b/tests/ui/const-generics/parser-error-recovery/issue-89013.stderr
index 583749a85..583749a85 100644
--- a/src/test/ui/const-generics/parser-error-recovery/issue-89013.stderr
+++ b/tests/ui/const-generics/parser-error-recovery/issue-89013.stderr
diff --git a/src/test/ui/const-generics/projection-as-arg-const.rs b/tests/ui/const-generics/projection-as-arg-const.rs
index 903548c75..903548c75 100644
--- a/src/test/ui/const-generics/projection-as-arg-const.rs
+++ b/tests/ui/const-generics/projection-as-arg-const.rs
diff --git a/src/test/ui/const-generics/projection-as-arg-const.stderr b/tests/ui/const-generics/projection-as-arg-const.stderr
index 803ed9c95..803ed9c95 100644
--- a/src/test/ui/const-generics/projection-as-arg-const.stderr
+++ b/tests/ui/const-generics/projection-as-arg-const.stderr
diff --git a/src/test/ui/const-generics/promotion.rs b/tests/ui/const-generics/promotion.rs
index ce9a1a0fe..ce9a1a0fe 100644
--- a/src/test/ui/const-generics/promotion.rs
+++ b/tests/ui/const-generics/promotion.rs
diff --git a/src/test/ui/const-generics/raw-ptr-const-param-deref.full.stderr b/tests/ui/const-generics/raw-ptr-const-param-deref.full.stderr
index 657eee2be..657eee2be 100644
--- a/src/test/ui/const-generics/raw-ptr-const-param-deref.full.stderr
+++ b/tests/ui/const-generics/raw-ptr-const-param-deref.full.stderr
diff --git a/src/test/ui/const-generics/raw-ptr-const-param-deref.min.stderr b/tests/ui/const-generics/raw-ptr-const-param-deref.min.stderr
index 04bc46cb4..04bc46cb4 100644
--- a/src/test/ui/const-generics/raw-ptr-const-param-deref.min.stderr
+++ b/tests/ui/const-generics/raw-ptr-const-param-deref.min.stderr
diff --git a/src/test/ui/const-generics/raw-ptr-const-param-deref.rs b/tests/ui/const-generics/raw-ptr-const-param-deref.rs
index 65595f07d..65595f07d 100644
--- a/src/test/ui/const-generics/raw-ptr-const-param-deref.rs
+++ b/tests/ui/const-generics/raw-ptr-const-param-deref.rs
diff --git a/src/test/ui/const-generics/raw-ptr-const-param.full.stderr b/tests/ui/const-generics/raw-ptr-const-param.full.stderr
index 69f1aae56..69f1aae56 100644
--- a/src/test/ui/const-generics/raw-ptr-const-param.full.stderr
+++ b/tests/ui/const-generics/raw-ptr-const-param.full.stderr
diff --git a/src/test/ui/const-generics/raw-ptr-const-param.min.stderr b/tests/ui/const-generics/raw-ptr-const-param.min.stderr
index 310422aaf..310422aaf 100644
--- a/src/test/ui/const-generics/raw-ptr-const-param.min.stderr
+++ b/tests/ui/const-generics/raw-ptr-const-param.min.stderr
diff --git a/src/test/ui/const-generics/raw-ptr-const-param.rs b/tests/ui/const-generics/raw-ptr-const-param.rs
index 27ef9e7d9..27ef9e7d9 100644
--- a/src/test/ui/const-generics/raw-ptr-const-param.rs
+++ b/tests/ui/const-generics/raw-ptr-const-param.rs
diff --git a/src/test/ui/const-generics/slice-const-param-mismatch.full.stderr b/tests/ui/const-generics/slice-const-param-mismatch.full.stderr
index 80dd1be33..80dd1be33 100644
--- a/src/test/ui/const-generics/slice-const-param-mismatch.full.stderr
+++ b/tests/ui/const-generics/slice-const-param-mismatch.full.stderr
diff --git a/src/test/ui/const-generics/slice-const-param-mismatch.min.stderr b/tests/ui/const-generics/slice-const-param-mismatch.min.stderr
index fed802f6a..fed802f6a 100644
--- a/src/test/ui/const-generics/slice-const-param-mismatch.min.stderr
+++ b/tests/ui/const-generics/slice-const-param-mismatch.min.stderr
diff --git a/src/test/ui/const-generics/slice-const-param-mismatch.rs b/tests/ui/const-generics/slice-const-param-mismatch.rs
index 7127323e5..7127323e5 100644
--- a/src/test/ui/const-generics/slice-const-param-mismatch.rs
+++ b/tests/ui/const-generics/slice-const-param-mismatch.rs
diff --git a/src/test/ui/const-generics/slice-const-param.rs b/tests/ui/const-generics/slice-const-param.rs
index 05d21e08d..05d21e08d 100644
--- a/src/test/ui/const-generics/slice-const-param.rs
+++ b/tests/ui/const-generics/slice-const-param.rs
diff --git a/src/test/ui/const-generics/sneaky-array-repeat-expr.rs b/tests/ui/const-generics/sneaky-array-repeat-expr.rs
index b147c246b..b147c246b 100644
--- a/src/test/ui/const-generics/sneaky-array-repeat-expr.rs
+++ b/tests/ui/const-generics/sneaky-array-repeat-expr.rs
diff --git a/src/test/ui/const-generics/sneaky-array-repeat-expr.stderr b/tests/ui/const-generics/sneaky-array-repeat-expr.stderr
index 5c77375d3..5c77375d3 100644
--- a/src/test/ui/const-generics/sneaky-array-repeat-expr.stderr
+++ b/tests/ui/const-generics/sneaky-array-repeat-expr.stderr
diff --git a/src/test/ui/const-generics/std/const-generics-range.min.stderr b/tests/ui/const-generics/std/const-generics-range.min.stderr
index d4b2ad6fd..d4b2ad6fd 100644
--- a/src/test/ui/const-generics/std/const-generics-range.min.stderr
+++ b/tests/ui/const-generics/std/const-generics-range.min.stderr
diff --git a/src/test/ui/const-generics/std/const-generics-range.rs b/tests/ui/const-generics/std/const-generics-range.rs
index 46c06f312..46c06f312 100644
--- a/src/test/ui/const-generics/std/const-generics-range.rs
+++ b/tests/ui/const-generics/std/const-generics-range.rs
diff --git a/src/test/ui/const-generics/struct-with-invalid-const-param.rs b/tests/ui/const-generics/struct-with-invalid-const-param.rs
index be1c4b0e8..be1c4b0e8 100644
--- a/src/test/ui/const-generics/struct-with-invalid-const-param.rs
+++ b/tests/ui/const-generics/struct-with-invalid-const-param.rs
diff --git a/src/test/ui/const-generics/struct-with-invalid-const-param.stderr b/tests/ui/const-generics/struct-with-invalid-const-param.stderr
index 67f497af5..67f497af5 100644
--- a/src/test/ui/const-generics/struct-with-invalid-const-param.stderr
+++ b/tests/ui/const-generics/struct-with-invalid-const-param.stderr
diff --git a/src/test/ui/const-generics/suggest_const_for_array.rs b/tests/ui/const-generics/suggest_const_for_array.rs
index f3e5a3186..f3e5a3186 100644
--- a/src/test/ui/const-generics/suggest_const_for_array.rs
+++ b/tests/ui/const-generics/suggest_const_for_array.rs
diff --git a/src/test/ui/const-generics/suggest_const_for_array.stderr b/tests/ui/const-generics/suggest_const_for_array.stderr
index a617bf2bb..a617bf2bb 100644
--- a/src/test/ui/const-generics/suggest_const_for_array.stderr
+++ b/tests/ui/const-generics/suggest_const_for_array.stderr
diff --git a/src/test/ui/const-generics/trait-const-args.rs b/tests/ui/const-generics/trait-const-args.rs
index 2cdef3fb4..2cdef3fb4 100644
--- a/src/test/ui/const-generics/trait-const-args.rs
+++ b/tests/ui/const-generics/trait-const-args.rs
diff --git a/src/test/ui/const-generics/transmute-const-param-static-reference.min.stderr b/tests/ui/const-generics/transmute-const-param-static-reference.min.stderr
index 039c4276c..039c4276c 100644
--- a/src/test/ui/const-generics/transmute-const-param-static-reference.min.stderr
+++ b/tests/ui/const-generics/transmute-const-param-static-reference.min.stderr
diff --git a/src/test/ui/const-generics/transmute-const-param-static-reference.rs b/tests/ui/const-generics/transmute-const-param-static-reference.rs
index 6b443c8bd..6b443c8bd 100644
--- a/src/test/ui/const-generics/transmute-const-param-static-reference.rs
+++ b/tests/ui/const-generics/transmute-const-param-static-reference.rs
diff --git a/src/test/ui/const-generics/transparent-maybeunit-array-wrapper.rs b/tests/ui/const-generics/transparent-maybeunit-array-wrapper.rs
index 926e807fe..926e807fe 100644
--- a/src/test/ui/const-generics/transparent-maybeunit-array-wrapper.rs
+++ b/tests/ui/const-generics/transparent-maybeunit-array-wrapper.rs
diff --git a/src/test/ui/const-generics/try_unify_ignore_lifetimes.rs b/tests/ui/const-generics/try_unify_ignore_lifetimes.rs
index 2ae0ae70d..2ae0ae70d 100644
--- a/src/test/ui/const-generics/try_unify_ignore_lifetimes.rs
+++ b/tests/ui/const-generics/try_unify_ignore_lifetimes.rs
diff --git a/tests/ui/const-generics/two_matching_preds.rs b/tests/ui/const-generics/two_matching_preds.rs
new file mode 100644
index 000000000..de608f73e
--- /dev/null
+++ b/tests/ui/const-generics/two_matching_preds.rs
@@ -0,0 +1,19 @@
+// check-pass
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+
+fn foo<const N: usize>()
+where
+    [(); N + 1]:,
+    [(); N + 1]:,
+{
+    bar::<N>();
+}
+
+fn bar<const N: usize>()
+where
+    [(); N + 1]:,
+{
+}
+
+fn main() {}
diff --git a/src/test/ui/const-generics/type-after-const-ok.rs b/tests/ui/const-generics/type-after-const-ok.rs
index f37b0b102..f37b0b102 100644
--- a/src/test/ui/const-generics/type-after-const-ok.rs
+++ b/tests/ui/const-generics/type-after-const-ok.rs
diff --git a/src/test/ui/const-generics/type-dependent/auxiliary/type_dependent_lib.rs b/tests/ui/const-generics/type-dependent/auxiliary/type_dependent_lib.rs
index 5dfcbba0e..5dfcbba0e 100644
--- a/src/test/ui/const-generics/type-dependent/auxiliary/type_dependent_lib.rs
+++ b/tests/ui/const-generics/type-dependent/auxiliary/type_dependent_lib.rs
diff --git a/src/test/ui/const-generics/type-dependent/const-arg-in-const-arg.rs b/tests/ui/const-generics/type-dependent/const-arg-in-const-arg.rs
index e84414834..e84414834 100644
--- a/src/test/ui/const-generics/type-dependent/const-arg-in-const-arg.rs
+++ b/tests/ui/const-generics/type-dependent/const-arg-in-const-arg.rs
diff --git a/src/test/ui/const-generics/type-dependent/issue-61936.rs b/tests/ui/const-generics/type-dependent/issue-61936.rs
index 7216b25f0..7216b25f0 100644
--- a/src/test/ui/const-generics/type-dependent/issue-61936.rs
+++ b/tests/ui/const-generics/type-dependent/issue-61936.rs
diff --git a/src/test/ui/const-generics/type-dependent/issue-63695.rs b/tests/ui/const-generics/type-dependent/issue-63695.rs
index 08b6d4bf5..08b6d4bf5 100644
--- a/src/test/ui/const-generics/type-dependent/issue-63695.rs
+++ b/tests/ui/const-generics/type-dependent/issue-63695.rs
diff --git a/src/test/ui/const-generics/type-dependent/issue-67144-1.rs b/tests/ui/const-generics/type-dependent/issue-67144-1.rs
index 27dd51de2..27dd51de2 100644
--- a/src/test/ui/const-generics/type-dependent/issue-67144-1.rs
+++ b/tests/ui/const-generics/type-dependent/issue-67144-1.rs
diff --git a/src/test/ui/const-generics/type-dependent/issue-67144-2.rs b/tests/ui/const-generics/type-dependent/issue-67144-2.rs
index b26f551eb..b26f551eb 100644
--- a/src/test/ui/const-generics/type-dependent/issue-67144-2.rs
+++ b/tests/ui/const-generics/type-dependent/issue-67144-2.rs
diff --git a/src/test/ui/const-generics/type-dependent/issue-69816.rs b/tests/ui/const-generics/type-dependent/issue-69816.rs
index cbb6b398e..cbb6b398e 100644
--- a/src/test/ui/const-generics/type-dependent/issue-69816.rs
+++ b/tests/ui/const-generics/type-dependent/issue-69816.rs
diff --git a/src/test/ui/const-generics/type-dependent/issue-70217.rs b/tests/ui/const-generics/type-dependent/issue-70217.rs
index 933ca0276..933ca0276 100644
--- a/src/test/ui/const-generics/type-dependent/issue-70217.rs
+++ b/tests/ui/const-generics/type-dependent/issue-70217.rs
diff --git a/src/test/ui/const-generics/type-dependent/issue-70507.rs b/tests/ui/const-generics/type-dependent/issue-70507.rs
index c72d9fbec..c72d9fbec 100644
--- a/src/test/ui/const-generics/type-dependent/issue-70507.rs
+++ b/tests/ui/const-generics/type-dependent/issue-70507.rs
diff --git a/src/test/ui/const-generics/type-dependent/issue-70586.rs b/tests/ui/const-generics/type-dependent/issue-70586.rs
index 346ac4b72..346ac4b72 100644
--- a/src/test/ui/const-generics/type-dependent/issue-70586.rs
+++ b/tests/ui/const-generics/type-dependent/issue-70586.rs
diff --git a/src/test/ui/const-generics/type-dependent/issue-71348.min.stderr b/tests/ui/const-generics/type-dependent/issue-71348.min.stderr
index b8fbb3979..b8fbb3979 100644
--- a/src/test/ui/const-generics/type-dependent/issue-71348.min.stderr
+++ b/tests/ui/const-generics/type-dependent/issue-71348.min.stderr
diff --git a/src/test/ui/const-generics/type-dependent/issue-71348.rs b/tests/ui/const-generics/type-dependent/issue-71348.rs
index 2ef2f066a..2ef2f066a 100644
--- a/src/test/ui/const-generics/type-dependent/issue-71348.rs
+++ b/tests/ui/const-generics/type-dependent/issue-71348.rs
diff --git a/src/test/ui/const-generics/type-dependent/issue-71382.rs b/tests/ui/const-generics/type-dependent/issue-71382.rs
index 1c4073e36..1c4073e36 100644
--- a/src/test/ui/const-generics/type-dependent/issue-71382.rs
+++ b/tests/ui/const-generics/type-dependent/issue-71382.rs
diff --git a/src/test/ui/const-generics/type-dependent/issue-71382.stderr b/tests/ui/const-generics/type-dependent/issue-71382.stderr
index ad522aead..ad522aead 100644
--- a/src/test/ui/const-generics/type-dependent/issue-71382.stderr
+++ b/tests/ui/const-generics/type-dependent/issue-71382.stderr
diff --git a/src/test/ui/const-generics/type-dependent/issue-71805.rs b/tests/ui/const-generics/type-dependent/issue-71805.rs
index 060b89964..060b89964 100644
--- a/src/test/ui/const-generics/type-dependent/issue-71805.rs
+++ b/tests/ui/const-generics/type-dependent/issue-71805.rs
diff --git a/src/test/ui/const-generics/type-dependent/issue-73730.rs b/tests/ui/const-generics/type-dependent/issue-73730.rs
index 5e1b8c635..5e1b8c635 100644
--- a/src/test/ui/const-generics/type-dependent/issue-73730.rs
+++ b/tests/ui/const-generics/type-dependent/issue-73730.rs
diff --git a/src/test/ui/const-generics/type-dependent/non-local.rs b/tests/ui/const-generics/type-dependent/non-local.rs
index b755de30b..b755de30b 100644
--- a/src/test/ui/const-generics/type-dependent/non-local.rs
+++ b/tests/ui/const-generics/type-dependent/non-local.rs
diff --git a/src/test/ui/const-generics/type-dependent/qpath.rs b/tests/ui/const-generics/type-dependent/qpath.rs
index 2d678d0ac..2d678d0ac 100644
--- a/src/test/ui/const-generics/type-dependent/qpath.rs
+++ b/tests/ui/const-generics/type-dependent/qpath.rs
diff --git a/src/test/ui/const-generics/type-dependent/simple.rs b/tests/ui/const-generics/type-dependent/simple.rs
index 1b13133b5..1b13133b5 100644
--- a/src/test/ui/const-generics/type-dependent/simple.rs
+++ b/tests/ui/const-generics/type-dependent/simple.rs
diff --git a/src/test/ui/const-generics/type-dependent/type-mismatch.full.stderr b/tests/ui/const-generics/type-dependent/type-mismatch.full.stderr
index 70bc64057..70bc64057 100644
--- a/src/test/ui/const-generics/type-dependent/type-mismatch.full.stderr
+++ b/tests/ui/const-generics/type-dependent/type-mismatch.full.stderr
diff --git a/src/test/ui/const-generics/type-dependent/type-mismatch.min.stderr b/tests/ui/const-generics/type-dependent/type-mismatch.min.stderr
index 70bc64057..70bc64057 100644
--- a/src/test/ui/const-generics/type-dependent/type-mismatch.min.stderr
+++ b/tests/ui/const-generics/type-dependent/type-mismatch.min.stderr
diff --git a/src/test/ui/const-generics/type-dependent/type-mismatch.rs b/tests/ui/const-generics/type-dependent/type-mismatch.rs
index 3335ab870..3335ab870 100644
--- a/src/test/ui/const-generics/type-dependent/type-mismatch.rs
+++ b/tests/ui/const-generics/type-dependent/type-mismatch.rs
diff --git a/src/test/ui/const-generics/type_mismatch.rs b/tests/ui/const-generics/type_mismatch.rs
index 4a7534e37..4a7534e37 100644
--- a/src/test/ui/const-generics/type_mismatch.rs
+++ b/tests/ui/const-generics/type_mismatch.rs
diff --git a/src/test/ui/const-generics/type_mismatch.stderr b/tests/ui/const-generics/type_mismatch.stderr
index 8d779bee2..8d779bee2 100644
--- a/src/test/ui/const-generics/type_mismatch.stderr
+++ b/tests/ui/const-generics/type_mismatch.stderr
diff --git a/src/test/ui/const-generics/type_not_in_scope.rs b/tests/ui/const-generics/type_not_in_scope.rs
index 593370180..593370180 100644
--- a/src/test/ui/const-generics/type_not_in_scope.rs
+++ b/tests/ui/const-generics/type_not_in_scope.rs
diff --git a/src/test/ui/const-generics/type_not_in_scope.stderr b/tests/ui/const-generics/type_not_in_scope.stderr
index 16796acb3..16796acb3 100644
--- a/src/test/ui/const-generics/type_not_in_scope.stderr
+++ b/tests/ui/const-generics/type_not_in_scope.stderr
diff --git a/src/test/ui/const-generics/type_of_anon_const.rs b/tests/ui/const-generics/type_of_anon_const.rs
index fb0d688a8..fb0d688a8 100644
--- a/src/test/ui/const-generics/type_of_anon_const.rs
+++ b/tests/ui/const-generics/type_of_anon_const.rs
diff --git a/src/test/ui/const-generics/types-mismatch-const-args.full.stderr b/tests/ui/const-generics/types-mismatch-const-args.full.stderr
index b6a22df74..b6a22df74 100644
--- a/src/test/ui/const-generics/types-mismatch-const-args.full.stderr
+++ b/tests/ui/const-generics/types-mismatch-const-args.full.stderr
diff --git a/src/test/ui/const-generics/types-mismatch-const-args.min.stderr b/tests/ui/const-generics/types-mismatch-const-args.min.stderr
index 6ac93a08d..6ac93a08d 100644
--- a/src/test/ui/const-generics/types-mismatch-const-args.min.stderr
+++ b/tests/ui/const-generics/types-mismatch-const-args.min.stderr
diff --git a/src/test/ui/const-generics/types-mismatch-const-args.rs b/tests/ui/const-generics/types-mismatch-const-args.rs
index 43ef28b26..43ef28b26 100644
--- a/src/test/ui/const-generics/types-mismatch-const-args.rs
+++ b/tests/ui/const-generics/types-mismatch-const-args.rs
diff --git a/tests/ui/const-generics/unify_with_nested_expr.rs b/tests/ui/const-generics/unify_with_nested_expr.rs
new file mode 100644
index 000000000..1271e0902
--- /dev/null
+++ b/tests/ui/const-generics/unify_with_nested_expr.rs
@@ -0,0 +1,18 @@
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+
+fn foo<const N: usize>()
+where
+    [(); N + 1 + 1]:,
+{
+    bar();
+    //~^ ERROR: type annotations
+}
+
+fn bar<const N: usize>()
+where
+    [(); N + 1]:,
+{
+}
+
+fn main() {}
diff --git a/tests/ui/const-generics/unify_with_nested_expr.stderr b/tests/ui/const-generics/unify_with_nested_expr.stderr
new file mode 100644
index 000000000..8bab0dff7
--- /dev/null
+++ b/tests/ui/const-generics/unify_with_nested_expr.stderr
@@ -0,0 +1,22 @@
+error[E0284]: type annotations needed
+  --> $DIR/unify_with_nested_expr.rs:8:5
+   |
+LL |     bar();
+   |     ^^^ cannot infer the value of the const parameter `N` declared on the function `bar`
+   |
+note: required by a bound in `bar`
+  --> $DIR/unify_with_nested_expr.rs:14:10
+   |
+LL | fn bar<const N: usize>()
+   |    --- required by a bound in this
+LL | where
+LL |     [(); N + 1]:,
+   |          ^^^^^ required by this bound in `bar`
+help: consider specifying the generic argument
+   |
+LL |     bar::<N>();
+   |        +++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0284`.
diff --git a/src/test/ui/const-generics/uninferred-consts-during-codegen-1.rs b/tests/ui/const-generics/uninferred-consts-during-codegen-1.rs
index c7270e835..c7270e835 100644
--- a/src/test/ui/const-generics/uninferred-consts-during-codegen-1.rs
+++ b/tests/ui/const-generics/uninferred-consts-during-codegen-1.rs
diff --git a/src/test/ui/const-generics/uninferred-consts-during-codegen-2.rs b/tests/ui/const-generics/uninferred-consts-during-codegen-2.rs
index 191caa78f..191caa78f 100644
--- a/src/test/ui/const-generics/uninferred-consts-during-codegen-2.rs
+++ b/tests/ui/const-generics/uninferred-consts-during-codegen-2.rs
diff --git a/src/test/ui/const-generics/unknown_adt.rs b/tests/ui/const-generics/unknown_adt.rs
index 8cdd28a8c..8cdd28a8c 100644
--- a/src/test/ui/const-generics/unknown_adt.rs
+++ b/tests/ui/const-generics/unknown_adt.rs
diff --git a/src/test/ui/const-generics/unknown_adt.stderr b/tests/ui/const-generics/unknown_adt.stderr
index 0f462dd47..0f462dd47 100644
--- a/src/test/ui/const-generics/unknown_adt.stderr
+++ b/tests/ui/const-generics/unknown_adt.stderr
diff --git a/src/test/ui/const-generics/unused-const-param.rs b/tests/ui/const-generics/unused-const-param.rs
index c7f74cfac..c7f74cfac 100644
--- a/src/test/ui/const-generics/unused-const-param.rs
+++ b/tests/ui/const-generics/unused-const-param.rs
diff --git a/src/test/ui/const-generics/unused-type-param-suggestion.rs b/tests/ui/const-generics/unused-type-param-suggestion.rs
index 2251512c4..2251512c4 100644
--- a/src/test/ui/const-generics/unused-type-param-suggestion.rs
+++ b/tests/ui/const-generics/unused-type-param-suggestion.rs
diff --git a/src/test/ui/const-generics/unused-type-param-suggestion.stderr b/tests/ui/const-generics/unused-type-param-suggestion.stderr
index 807065ca1..807065ca1 100644
--- a/src/test/ui/const-generics/unused-type-param-suggestion.stderr
+++ b/tests/ui/const-generics/unused-type-param-suggestion.stderr
diff --git a/tests/ui/const-generics/unused_braces.fixed b/tests/ui/const-generics/unused_braces.fixed
new file mode 100644
index 000000000..4c1926387
--- /dev/null
+++ b/tests/ui/const-generics/unused_braces.fixed
@@ -0,0 +1,18 @@
+// check-pass
+// run-rustfix
+#![warn(unused_braces)]
+
+macro_rules! make_1 {
+    () => {
+        1
+    }
+}
+
+struct A<const N: usize>;
+
+fn main() {
+    let _: A<7>; // ok
+    let _: A<7>; //~ WARN unnecessary braces
+    let _: A<{ 3 + 5 }>; // ok
+    let _: A<{make_1!()}>; // ok
+}
diff --git a/src/test/ui/const-generics/unused_braces.full.fixed b/tests/ui/const-generics/unused_braces.full.fixed
index 46d57e0dc..46d57e0dc 100644
--- a/src/test/ui/const-generics/unused_braces.full.fixed
+++ b/tests/ui/const-generics/unused_braces.full.fixed
diff --git a/src/test/ui/const-generics/unused_braces.min.fixed b/tests/ui/const-generics/unused_braces.min.fixed
index 46d57e0dc..46d57e0dc 100644
--- a/src/test/ui/const-generics/unused_braces.min.fixed
+++ b/tests/ui/const-generics/unused_braces.min.fixed
diff --git a/tests/ui/const-generics/unused_braces.rs b/tests/ui/const-generics/unused_braces.rs
new file mode 100644
index 000000000..e9f15b401
--- /dev/null
+++ b/tests/ui/const-generics/unused_braces.rs
@@ -0,0 +1,18 @@
+// check-pass
+// run-rustfix
+#![warn(unused_braces)]
+
+macro_rules! make_1 {
+    () => {
+        1
+    }
+}
+
+struct A<const N: usize>;
+
+fn main() {
+    let _: A<7>; // ok
+    let _: A<{ 7 }>; //~ WARN unnecessary braces
+    let _: A<{ 3 + 5 }>; // ok
+    let _: A<{make_1!()}>; // ok
+}
diff --git a/tests/ui/const-generics/unused_braces.stderr b/tests/ui/const-generics/unused_braces.stderr
new file mode 100644
index 000000000..2c8031c43
--- /dev/null
+++ b/tests/ui/const-generics/unused_braces.stderr
@@ -0,0 +1,19 @@
+warning: unnecessary braces around const expression
+  --> $DIR/unused_braces.rs:15:14
+   |
+LL |     let _: A<{ 7 }>;
+   |              ^^ ^^
+   |
+note: the lint level is defined here
+  --> $DIR/unused_braces.rs:3:9
+   |
+LL | #![warn(unused_braces)]
+   |         ^^^^^^^^^^^^^
+help: remove these braces
+   |
+LL -     let _: A<{ 7 }>;
+LL +     let _: A<7>;
+   |
+
+warning: 1 warning emitted
+
diff --git a/src/test/ui/const-generics/where-clauses.rs b/tests/ui/const-generics/where-clauses.rs
index aa3ca1cf6..aa3ca1cf6 100644
--- a/src/test/ui/const-generics/where-clauses.rs
+++ b/tests/ui/const-generics/where-clauses.rs
diff --git a/src/test/ui/const-ptr/allowed_slices.rs b/tests/ui/const-ptr/allowed_slices.rs
index 3f19cd4d8..3f19cd4d8 100644
--- a/src/test/ui/const-ptr/allowed_slices.rs
+++ b/tests/ui/const-ptr/allowed_slices.rs
diff --git a/src/test/ui/const-ptr/forbidden_slices.rs b/tests/ui/const-ptr/forbidden_slices.rs
index e2184911f..192b6a46d 100644
--- a/src/test/ui/const-ptr/forbidden_slices.rs
+++ b/tests/ui/const-ptr/forbidden_slices.rs
@@ -1,6 +1,7 @@
-// stderr-per-bitwidth
-// normalize-stderr-test "alloc[0-9]+" -> "ALLOC_ID"
-// normalize-stderr-test "a[0-9]+\+0x" -> "A_ID+0x"
+// Strip out raw byte dumps to make comparison platform-independent:
+// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
+// normalize-stderr-test "alloc\d+" -> "allocN"
 // error-pattern: could not evaluate static initializer
 #![feature(
     slice_from_ptr_range,
@@ -31,7 +32,7 @@ pub static S6: &[bool] = unsafe { from_raw_parts((&D0) as *const _ as _, 4) }; /
 // Reading padding is not ok
 pub static S7: &[u16] = unsafe {
     //~^ ERROR: it is undefined behavior to use this value
-    let ptr = (&D2 as *const Struct as *const u16).byte_add(1);
+    let ptr = (&D2 as *const Struct as *const u16).add(1);
 
     from_raw_parts(ptr, 4)
 };
@@ -65,13 +66,12 @@ pub static R6: &[bool] = unsafe {
     from_ptr_range(ptr..ptr.add(4))
 };
 pub static R7: &[u16] = unsafe {
-    //~^ ERROR: it is undefined behavior to use this value
     let ptr = (&D2 as *const Struct as *const u16).byte_add(1);
-    from_ptr_range(ptr..ptr.add(4))
+    from_ptr_range(ptr..ptr.add(4)) //~ inside `R7`
 };
 pub static R8: &[u64] = unsafe {
     let ptr = (&D4 as *const [u32; 2] as *const u32).byte_add(1).cast::<u64>();
-    from_ptr_range(ptr..ptr.add(1))
+    from_ptr_range(ptr..ptr.add(1)) //~ inside `R8`
 };
 
 // This is sneaky: &D0 and &D0 point to different objects
@@ -79,7 +79,7 @@ pub static R8: &[u64] = unsafe {
 pub static R9: &[u32] = unsafe { from_ptr_range(&D0..(&D0 as *const u32).add(1)) };
 pub static R10: &[u32] = unsafe { from_ptr_range(&D0..&D0) };
 
-const D0: u32 = 0x11;
+const D0: u32 = 0x11111111; // Constant chosen for endianness-independent behavior.
 const D1: MaybeUninit<&u32> = MaybeUninit::uninit();
 const D2: Struct = Struct { a: 1, b: 2, c: 3, d: 4 };
 const D3: &u32 = &42;
diff --git a/tests/ui/const-ptr/forbidden_slices.stderr b/tests/ui/const-ptr/forbidden_slices.stderr
new file mode 100644
index 000000000..b42361872
--- /dev/null
+++ b/tests/ui/const-ptr/forbidden_slices.stderr
@@ -0,0 +1,240 @@
+error[E0080]: could not evaluate static initializer
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+   |
+   = note: dereferencing pointer failed: null pointer is a dangling pointer (it has no provenance)
+   |
+note: inside `std::slice::from_raw_parts::<'_, u32>`
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+note: inside `S0`
+  --> $DIR/forbidden_slices.rs:19:34
+   |
+LL | pub static S0: &[u32] = unsafe { from_raw_parts(ptr::null(), 0) };
+   |                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: could not evaluate static initializer
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+   |
+   = note: dereferencing pointer failed: null pointer is a dangling pointer (it has no provenance)
+   |
+note: inside `std::slice::from_raw_parts::<'_, ()>`
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+note: inside `S1`
+  --> $DIR/forbidden_slices.rs:20:33
+   |
+LL | pub static S1: &[()] = unsafe { from_raw_parts(ptr::null(), 0) };
+   |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: could not evaluate static initializer
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+   |
+   = note: dereferencing pointer failed: allocN has size 4, so pointer to 8 bytes starting at offset 0 is out-of-bounds
+   |
+note: inside `std::slice::from_raw_parts::<'_, u32>`
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+note: inside `S2`
+  --> $DIR/forbidden_slices.rs:23:34
+   |
+LL | pub static S2: &[u32] = unsafe { from_raw_parts(&D0, 2) };
+   |                                  ^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/forbidden_slices.rs:26:1
+   |
+LL | pub static S4: &[u8] = unsafe { from_raw_parts((&D1) as *const _ as _, 1) };
+   | ^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered uninitialized bytes
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/forbidden_slices.rs:28:1
+   |
+LL | pub static S5: &[u8] = unsafe { from_raw_parts((&D3) as *const _ as _, size_of::<&u32>()) };
+   | ^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/forbidden_slices.rs:30:1
+   |
+LL | pub static S6: &[bool] = unsafe { from_raw_parts((&D0) as *const _ as _, 4) };
+   | ^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered 0x11, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/forbidden_slices.rs:33:1
+   |
+LL | pub static S7: &[u16] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[1]: encountered uninitialized bytes
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: could not evaluate static initializer
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+   |
+   = note: dereferencing pointer failed: allocN has size 8, so pointer to 8 bytes starting at offset 1 is out-of-bounds
+   |
+note: inside `std::slice::from_raw_parts::<'_, u64>`
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+note: inside `S8`
+  --> $DIR/forbidden_slices.rs:44:5
+   |
+LL |     from_raw_parts(ptr, 1)
+   |     ^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: could not evaluate static initializer
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: out-of-bounds offset_from: null pointer is a dangling pointer (it has no provenance)
+   |
+note: inside `ptr::const_ptr::<impl *const u32>::sub_ptr`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `from_ptr_range::<'_, u32>`
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+note: inside `R0`
+  --> $DIR/forbidden_slices.rs:47:34
+   |
+LL | pub static R0: &[u32] = unsafe { from_ptr_range(ptr::null()..ptr::null()) };
+   |                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: could not evaluate static initializer
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: the evaluated program panicked at 'assertion failed: 0 < pointee_size && pointee_size <= isize::MAX as usize', $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+note: inside `ptr::const_ptr::<impl *const ()>::sub_ptr`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `from_ptr_range::<'_, ()>`
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+note: inside `R1`
+  --> $DIR/forbidden_slices.rs:48:33
+   |
+LL | pub static R1: &[()] = unsafe { from_ptr_range(ptr::null()..ptr::null()) };
+   |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0080]: could not evaluate static initializer
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: out-of-bounds pointer arithmetic: allocN has size 4, so pointer to 8 bytes starting at offset 0 is out-of-bounds
+   |
+note: inside `ptr::const_ptr::<impl *const u32>::offset`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `ptr::const_ptr::<impl *const u32>::add`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `R2`
+  --> $DIR/forbidden_slices.rs:51:25
+   |
+LL |     from_ptr_range(ptr..ptr.add(2))
+   |                         ^^^^^^^^^^
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/forbidden_slices.rs:53:1
+   |
+LL | pub static R4: &[u8] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered uninitialized bytes
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/forbidden_slices.rs:58:1
+   |
+LL | pub static R5: &[u8] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/forbidden_slices.rs:63:1
+   |
+LL | pub static R6: &[bool] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered 0x11, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: could not evaluate static initializer
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+   |
+   = note: accessing memory with alignment 1, but alignment 2 is required
+   |
+note: inside `std::slice::from_raw_parts::<'_, u16>`
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+note: inside `from_ptr_range::<'_, u16>`
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+note: inside `R7`
+  --> $DIR/forbidden_slices.rs:70:5
+   |
+LL |     from_ptr_range(ptr..ptr.add(4))
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: could not evaluate static initializer
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: out-of-bounds pointer arithmetic: allocN has size 8, so pointer to 8 bytes starting at offset 1 is out-of-bounds
+   |
+note: inside `ptr::const_ptr::<impl *const u64>::offset`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `ptr::const_ptr::<impl *const u64>::add`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `R8`
+  --> $DIR/forbidden_slices.rs:74:25
+   |
+LL |     from_ptr_range(ptr..ptr.add(1))
+   |                         ^^^^^^^^^^
+
+error[E0080]: could not evaluate static initializer
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: `ptr_offset_from_unsigned` called on pointers into different allocations
+   |
+note: inside `ptr::const_ptr::<impl *const u32>::sub_ptr`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `from_ptr_range::<'_, u32>`
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+note: inside `R9`
+  --> $DIR/forbidden_slices.rs:79:34
+   |
+LL | pub static R9: &[u32] = unsafe { from_ptr_range(&D0..(&D0 as *const u32).add(1)) };
+   |                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: could not evaluate static initializer
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: `ptr_offset_from_unsigned` called on pointers into different allocations
+   |
+note: inside `ptr::const_ptr::<impl *const u32>::sub_ptr`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `from_ptr_range::<'_, u32>`
+  --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
+note: inside `R10`
+  --> $DIR/forbidden_slices.rs:80:35
+   |
+LL | pub static R10: &[u32] = unsafe { from_ptr_range(&D0..&D0) };
+   |                                   ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 18 previous errors
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/const-ptr/out_of_bounds_read.rs b/tests/ui/const-ptr/out_of_bounds_read.rs
index 9dd669180..9dd669180 100644
--- a/src/test/ui/const-ptr/out_of_bounds_read.rs
+++ b/tests/ui/const-ptr/out_of_bounds_read.rs
diff --git a/tests/ui/const-ptr/out_of_bounds_read.stderr b/tests/ui/const-ptr/out_of_bounds_read.stderr
new file mode 100644
index 000000000..3e7b09a59
--- /dev/null
+++ b/tests/ui/const-ptr/out_of_bounds_read.stderr
@@ -0,0 +1,46 @@
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+   |
+   = note: memory access failed: alloc5 has size 4, so pointer to 4 bytes starting at offset 4 is out-of-bounds
+   |
+note: inside `std::ptr::read::<u32>`
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+note: inside `_READ`
+  --> $DIR/out_of_bounds_read.rs:12:33
+   |
+LL |     const _READ: u32 = unsafe { ptr::read(PAST_END_PTR) };
+   |                                 ^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+   |
+   = note: memory access failed: alloc5 has size 4, so pointer to 4 bytes starting at offset 4 is out-of-bounds
+   |
+note: inside `std::ptr::read::<u32>`
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+note: inside `ptr::const_ptr::<impl *const u32>::read`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `_CONST_READ`
+  --> $DIR/out_of_bounds_read.rs:13:39
+   |
+LL |     const _CONST_READ: u32 = unsafe { PAST_END_PTR.read() };
+   |                                       ^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+   |
+   = note: memory access failed: alloc5 has size 4, so pointer to 4 bytes starting at offset 4 is out-of-bounds
+   |
+note: inside `std::ptr::read::<u32>`
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+note: inside `ptr::mut_ptr::<impl *mut u32>::read`
+  --> $SRC_DIR/core/src/ptr/mut_ptr.rs:LL:COL
+note: inside `_MUT_READ`
+  --> $DIR/out_of_bounds_read.rs:14:37
+   |
+LL |     const _MUT_READ: u32 = unsafe { (PAST_END_PTR as *mut u32).read() };
+   |                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/const_prop/ice-assert-fail-div-by-zero.rs b/tests/ui/const_prop/ice-assert-fail-div-by-zero.rs
index 2afbf3432..2afbf3432 100644
--- a/src/test/ui/const_prop/ice-assert-fail-div-by-zero.rs
+++ b/tests/ui/const_prop/ice-assert-fail-div-by-zero.rs
diff --git a/src/test/ui/const_prop/ice-assert-fail-div-by-zero.stderr b/tests/ui/const_prop/ice-assert-fail-div-by-zero.stderr
index 865c69c3c..865c69c3c 100644
--- a/src/test/ui/const_prop/ice-assert-fail-div-by-zero.stderr
+++ b/tests/ui/const_prop/ice-assert-fail-div-by-zero.stderr
diff --git a/src/test/ui/const_prop/inline_spans.rs b/tests/ui/const_prop/inline_spans.rs
index 504f27811..504f27811 100644
--- a/src/test/ui/const_prop/inline_spans.rs
+++ b/tests/ui/const_prop/inline_spans.rs
diff --git a/src/test/ui/const_prop/inline_spans_lint_attribute.rs b/tests/ui/const_prop/inline_spans_lint_attribute.rs
index 1db53d771..1db53d771 100644
--- a/src/test/ui/const_prop/inline_spans_lint_attribute.rs
+++ b/tests/ui/const_prop/inline_spans_lint_attribute.rs
diff --git a/src/test/ui/const_prop/issue-102553.rs b/tests/ui/const_prop/issue-102553.rs
index 523a9d7ac..523a9d7ac 100644
--- a/src/test/ui/const_prop/issue-102553.rs
+++ b/tests/ui/const_prop/issue-102553.rs
diff --git a/src/test/ui/constructor-lifetime-args.rs b/tests/ui/constructor-lifetime-args.rs
index a824a44c9..a824a44c9 100644
--- a/src/test/ui/constructor-lifetime-args.rs
+++ b/tests/ui/constructor-lifetime-args.rs
diff --git a/src/test/ui/constructor-lifetime-args.stderr b/tests/ui/constructor-lifetime-args.stderr
index bc1141b16..bc1141b16 100644
--- a/src/test/ui/constructor-lifetime-args.stderr
+++ b/tests/ui/constructor-lifetime-args.stderr
diff --git a/src/test/ui/consts/array-literal-index-oob.rs b/tests/ui/consts/array-literal-index-oob.rs
index 67b49b1ba..67b49b1ba 100644
--- a/src/test/ui/consts/array-literal-index-oob.rs
+++ b/tests/ui/consts/array-literal-index-oob.rs
diff --git a/src/test/ui/consts/array-literal-index-oob.stderr b/tests/ui/consts/array-literal-index-oob.stderr
index 54bf3af81..54bf3af81 100644
--- a/src/test/ui/consts/array-literal-index-oob.stderr
+++ b/tests/ui/consts/array-literal-index-oob.stderr
diff --git a/src/test/ui/consts/array-to-slice-cast.rs b/tests/ui/consts/array-to-slice-cast.rs
index 796f9d1b7..796f9d1b7 100644
--- a/src/test/ui/consts/array-to-slice-cast.rs
+++ b/tests/ui/consts/array-to-slice-cast.rs
diff --git a/src/test/ui/consts/assert-type-intrinsics.rs b/tests/ui/consts/assert-type-intrinsics.rs
index 263d1ae6a..b4fd423be 100644
--- a/src/test/ui/consts/assert-type-intrinsics.rs
+++ b/tests/ui/consts/assert-type-intrinsics.rs
@@ -13,7 +13,7 @@ fn main() {
         //~^ERROR: evaluation of constant value failed
     };
     const _BAD2: () = {
-        intrinsics::assert_uninit_valid::<&'static i32>();
+        intrinsics::assert_mem_uninitialized_valid::<&'static i32>();
         //~^ERROR: evaluation of constant value failed
     };
     const _BAD3: () = {
diff --git a/src/test/ui/consts/assert-type-intrinsics.stderr b/tests/ui/consts/assert-type-intrinsics.stderr
index f92f9fda0..70aec91e2 100644
--- a/src/test/ui/consts/assert-type-intrinsics.stderr
+++ b/tests/ui/consts/assert-type-intrinsics.stderr
@@ -7,8 +7,8 @@ LL |         MaybeUninit::<!>::uninit().assume_init();
 error[E0080]: evaluation of constant value failed
   --> $DIR/assert-type-intrinsics.rs:16:9
    |
-LL |         intrinsics::assert_uninit_valid::<&'static i32>();
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ aborted execution: attempted to leave type `&i32` uninitialized, which is invalid
+LL |         intrinsics::assert_mem_uninitialized_valid::<&'static i32>();
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ aborted execution: attempted to leave type `&i32` uninitialized, which is invalid
 
 error[E0080]: evaluation of constant value failed
   --> $DIR/assert-type-intrinsics.rs:20:9
diff --git a/src/test/ui/consts/assoc-const.rs b/tests/ui/consts/assoc-const.rs
index f542f2dcb..f542f2dcb 100644
--- a/src/test/ui/consts/assoc-const.rs
+++ b/tests/ui/consts/assoc-const.rs
diff --git a/src/test/ui/consts/assoc_const_generic_impl.rs b/tests/ui/consts/assoc_const_generic_impl.rs
index 3475c862b..3475c862b 100644
--- a/src/test/ui/consts/assoc_const_generic_impl.rs
+++ b/tests/ui/consts/assoc_const_generic_impl.rs
diff --git a/src/test/ui/consts/assoc_const_generic_impl.stderr b/tests/ui/consts/assoc_const_generic_impl.stderr
index 854b9ce5b..854b9ce5b 100644
--- a/src/test/ui/consts/assoc_const_generic_impl.stderr
+++ b/tests/ui/consts/assoc_const_generic_impl.stderr
diff --git a/src/test/ui/consts/associated_const_generic.rs b/tests/ui/consts/associated_const_generic.rs
index dee376cc1..dee376cc1 100644
--- a/src/test/ui/consts/associated_const_generic.rs
+++ b/tests/ui/consts/associated_const_generic.rs
diff --git a/src/test/ui/consts/async-block.rs b/tests/ui/consts/async-block.rs
index 78ec8aea7..78ec8aea7 100644
--- a/src/test/ui/consts/async-block.rs
+++ b/tests/ui/consts/async-block.rs
diff --git a/src/test/ui/consts/async-block.with_feature.stderr b/tests/ui/consts/async-block.with_feature.stderr
index 8c6364aec..8c6364aec 100644
--- a/src/test/ui/consts/async-block.with_feature.stderr
+++ b/tests/ui/consts/async-block.with_feature.stderr
diff --git a/src/test/ui/consts/async-block.without_feature.stderr b/tests/ui/consts/async-block.without_feature.stderr
index 751627c52..751627c52 100644
--- a/src/test/ui/consts/async-block.without_feature.stderr
+++ b/tests/ui/consts/async-block.without_feature.stderr
diff --git a/src/test/ui/consts/auxiliary/cci_const_block.rs b/tests/ui/consts/auxiliary/cci_const_block.rs
index ad618aab8..ad618aab8 100644
--- a/src/test/ui/consts/auxiliary/cci_const_block.rs
+++ b/tests/ui/consts/auxiliary/cci_const_block.rs
diff --git a/tests/ui/consts/auxiliary/closure-in-foreign-crate.rs b/tests/ui/consts/auxiliary/closure-in-foreign-crate.rs
new file mode 100644
index 000000000..edc7fa81a
--- /dev/null
+++ b/tests/ui/consts/auxiliary/closure-in-foreign-crate.rs
@@ -0,0 +1,8 @@
+#![crate_type = "lib"]
+#![feature(const_closures, const_trait_impl)]
+#![allow(incomplete_features)]
+
+pub const fn test() {
+    let cl = const || {};
+    cl();
+}
diff --git a/src/test/ui/consts/auxiliary/const_fn_lib.rs b/tests/ui/consts/auxiliary/const_fn_lib.rs
index 88cea60e1..88cea60e1 100644
--- a/src/test/ui/consts/auxiliary/const_fn_lib.rs
+++ b/tests/ui/consts/auxiliary/const_fn_lib.rs
diff --git a/src/test/ui/consts/auxiliary/external_macro.rs b/tests/ui/consts/auxiliary/external_macro.rs
index d260634c9..d260634c9 100644
--- a/src/test/ui/consts/auxiliary/external_macro.rs
+++ b/tests/ui/consts/auxiliary/external_macro.rs
diff --git a/src/test/ui/consts/auxiliary/issue-17718-aux.rs b/tests/ui/consts/auxiliary/issue-17718-aux.rs
index 91abdbff8..91abdbff8 100644
--- a/src/test/ui/consts/auxiliary/issue-17718-aux.rs
+++ b/tests/ui/consts/auxiliary/issue-17718-aux.rs
diff --git a/src/test/ui/consts/auxiliary/issue-63226.rs b/tests/ui/consts/auxiliary/issue-63226.rs
index 2dc9539ba..2dc9539ba 100644
--- a/src/test/ui/consts/auxiliary/issue-63226.rs
+++ b/tests/ui/consts/auxiliary/issue-63226.rs
diff --git a/src/test/ui/consts/auxiliary/promotable_const_fn_lib.rs b/tests/ui/consts/auxiliary/promotable_const_fn_lib.rs
index b1d5440b4..b1d5440b4 100644
--- a/src/test/ui/consts/auxiliary/promotable_const_fn_lib.rs
+++ b/tests/ui/consts/auxiliary/promotable_const_fn_lib.rs
diff --git a/src/test/ui/consts/bswap-const.rs b/tests/ui/consts/bswap-const.rs
index 3145c21ac..3145c21ac 100644
--- a/src/test/ui/consts/bswap-const.rs
+++ b/tests/ui/consts/bswap-const.rs
diff --git a/src/test/ui/consts/cast-discriminant-zst-enum.rs b/tests/ui/consts/cast-discriminant-zst-enum.rs
index 2767f178f..2767f178f 100644
--- a/src/test/ui/consts/cast-discriminant-zst-enum.rs
+++ b/tests/ui/consts/cast-discriminant-zst-enum.rs
diff --git a/src/test/ui/consts/chained-constants-stackoverflow.rs b/tests/ui/consts/chained-constants-stackoverflow.rs
index a171567c5..a171567c5 100644
--- a/src/test/ui/consts/chained-constants-stackoverflow.rs
+++ b/tests/ui/consts/chained-constants-stackoverflow.rs
diff --git a/src/test/ui/consts/check_const-feature-gated.rs b/tests/ui/consts/check_const-feature-gated.rs
index f4faab1ab..f4faab1ab 100644
--- a/src/test/ui/consts/check_const-feature-gated.rs
+++ b/tests/ui/consts/check_const-feature-gated.rs
diff --git a/tests/ui/consts/closure-in-foreign-crate.rs b/tests/ui/consts/closure-in-foreign-crate.rs
new file mode 100644
index 000000000..fc8f480e7
--- /dev/null
+++ b/tests/ui/consts/closure-in-foreign-crate.rs
@@ -0,0 +1,8 @@
+// aux-build:closure-in-foreign-crate.rs
+// build-pass
+
+extern crate closure_in_foreign_crate;
+
+const _: () = closure_in_foreign_crate::test();
+
+fn main() {}
diff --git a/src/test/ui/consts/closure-structural-match-issue-90013.rs b/tests/ui/consts/closure-structural-match-issue-90013.rs
index 1952ddb94..1952ddb94 100644
--- a/src/test/ui/consts/closure-structural-match-issue-90013.rs
+++ b/tests/ui/consts/closure-structural-match-issue-90013.rs
diff --git a/src/test/ui/consts/const-address-of-interior-mut.rs b/tests/ui/consts/const-address-of-interior-mut.rs
index 60c7c31da..60c7c31da 100644
--- a/src/test/ui/consts/const-address-of-interior-mut.rs
+++ b/tests/ui/consts/const-address-of-interior-mut.rs
diff --git a/src/test/ui/consts/const-address-of-interior-mut.stderr b/tests/ui/consts/const-address-of-interior-mut.stderr
index 93120753b..93120753b 100644
--- a/src/test/ui/consts/const-address-of-interior-mut.stderr
+++ b/tests/ui/consts/const-address-of-interior-mut.stderr
diff --git a/src/test/ui/consts/const-address-of-mut.rs b/tests/ui/consts/const-address-of-mut.rs
index 3788088b8..3788088b8 100644
--- a/src/test/ui/consts/const-address-of-mut.rs
+++ b/tests/ui/consts/const-address-of-mut.rs
diff --git a/src/test/ui/consts/const-address-of-mut.stderr b/tests/ui/consts/const-address-of-mut.stderr
index 60cdcc7df..60cdcc7df 100644
--- a/src/test/ui/consts/const-address-of-mut.stderr
+++ b/tests/ui/consts/const-address-of-mut.stderr
diff --git a/src/test/ui/consts/const-address-of.rs b/tests/ui/consts/const-address-of.rs
index ba162f2a2..ba162f2a2 100644
--- a/src/test/ui/consts/const-address-of.rs
+++ b/tests/ui/consts/const-address-of.rs
diff --git a/src/test/ui/consts/const-adt-align-mismatch.rs b/tests/ui/consts/const-adt-align-mismatch.rs
index bd51bc9f2..bd51bc9f2 100644
--- a/src/test/ui/consts/const-adt-align-mismatch.rs
+++ b/tests/ui/consts/const-adt-align-mismatch.rs
diff --git a/src/test/ui/consts/const-array-oob-arith.rs b/tests/ui/consts/const-array-oob-arith.rs
index 9332cbbd4..9332cbbd4 100644
--- a/src/test/ui/consts/const-array-oob-arith.rs
+++ b/tests/ui/consts/const-array-oob-arith.rs
diff --git a/src/test/ui/consts/const-array-oob-arith.stderr b/tests/ui/consts/const-array-oob-arith.stderr
index f7a55d3ca..f7a55d3ca 100644
--- a/src/test/ui/consts/const-array-oob-arith.stderr
+++ b/tests/ui/consts/const-array-oob-arith.stderr
diff --git a/src/test/ui/consts/const-array-oob.rs b/tests/ui/consts/const-array-oob.rs
index c747ab50c..c747ab50c 100644
--- a/src/test/ui/consts/const-array-oob.rs
+++ b/tests/ui/consts/const-array-oob.rs
diff --git a/src/test/ui/consts/const-array-oob.stderr b/tests/ui/consts/const-array-oob.stderr
index f1c5f58af..f1c5f58af 100644
--- a/src/test/ui/consts/const-array-oob.stderr
+++ b/tests/ui/consts/const-array-oob.stderr
diff --git a/src/test/ui/consts/const-as-fn.rs b/tests/ui/consts/const-as-fn.rs
index 388f907f8..388f907f8 100644
--- a/src/test/ui/consts/const-as-fn.rs
+++ b/tests/ui/consts/const-as-fn.rs
diff --git a/src/test/ui/consts/const-as-fn.stderr b/tests/ui/consts/const-as-fn.stderr
index 6c51ed893..6c51ed893 100644
--- a/src/test/ui/consts/const-as-fn.stderr
+++ b/tests/ui/consts/const-as-fn.stderr
diff --git a/src/test/ui/consts/const-autoderef.rs b/tests/ui/consts/const-autoderef.rs
index 1c836318d..1c836318d 100644
--- a/src/test/ui/consts/const-autoderef.rs
+++ b/tests/ui/consts/const-autoderef.rs
diff --git a/src/test/ui/consts/const-big-enum.rs b/tests/ui/consts/const-big-enum.rs
index 2f21e8a6d..2f21e8a6d 100644
--- a/src/test/ui/consts/const-big-enum.rs
+++ b/tests/ui/consts/const-big-enum.rs
diff --git a/src/test/ui/consts/const-binops.rs b/tests/ui/consts/const-binops.rs
index d038dfeb4..d038dfeb4 100644
--- a/src/test/ui/consts/const-binops.rs
+++ b/tests/ui/consts/const-binops.rs
diff --git a/src/test/ui/consts/const-bitshift-rhs-inference.rs b/tests/ui/consts/const-bitshift-rhs-inference.rs
index cf21c296c..cf21c296c 100644
--- a/src/test/ui/consts/const-bitshift-rhs-inference.rs
+++ b/tests/ui/consts/const-bitshift-rhs-inference.rs
diff --git a/src/test/ui/consts/const-block-const-bound.rs b/tests/ui/consts/const-block-const-bound.rs
index 42aa0216b..42aa0216b 100644
--- a/src/test/ui/consts/const-block-const-bound.rs
+++ b/tests/ui/consts/const-block-const-bound.rs
diff --git a/src/test/ui/consts/const-block-const-bound.stderr b/tests/ui/consts/const-block-const-bound.stderr
index b9c4d8866..b9c4d8866 100644
--- a/src/test/ui/consts/const-block-const-bound.stderr
+++ b/tests/ui/consts/const-block-const-bound.stderr
diff --git a/src/test/ui/consts/const-block-cross-crate-fn.rs b/tests/ui/consts/const-block-cross-crate-fn.rs
index 0ac3830d2..0ac3830d2 100644
--- a/src/test/ui/consts/const-block-cross-crate-fn.rs
+++ b/tests/ui/consts/const-block-cross-crate-fn.rs
diff --git a/src/test/ui/consts/const-block-item-macro-codegen.rs b/tests/ui/consts/const-block-item-macro-codegen.rs
index 7ad883686..7ad883686 100644
--- a/src/test/ui/consts/const-block-item-macro-codegen.rs
+++ b/tests/ui/consts/const-block-item-macro-codegen.rs
diff --git a/src/test/ui/consts/const-block-item.rs b/tests/ui/consts/const-block-item.rs
index cf0d4441d..cf0d4441d 100644
--- a/src/test/ui/consts/const-block-item.rs
+++ b/tests/ui/consts/const-block-item.rs
diff --git a/src/test/ui/consts/const-block-non-item-statement-3.rs b/tests/ui/consts/const-block-non-item-statement-3.rs
index c513946d1..c513946d1 100644
--- a/src/test/ui/consts/const-block-non-item-statement-3.rs
+++ b/tests/ui/consts/const-block-non-item-statement-3.rs
diff --git a/src/test/ui/consts/const-block-non-item-statement-rpass.rs b/tests/ui/consts/const-block-non-item-statement-rpass.rs
index 3e52eb50e..3e52eb50e 100644
--- a/src/test/ui/consts/const-block-non-item-statement-rpass.rs
+++ b/tests/ui/consts/const-block-non-item-statement-rpass.rs
diff --git a/src/test/ui/consts/const-block-non-item-statement.rs b/tests/ui/consts/const-block-non-item-statement.rs
index 07970b457..07970b457 100644
--- a/src/test/ui/consts/const-block-non-item-statement.rs
+++ b/tests/ui/consts/const-block-non-item-statement.rs
diff --git a/src/test/ui/consts/const-block.rs b/tests/ui/consts/const-block.rs
index ec99c70f6..ec99c70f6 100644
--- a/src/test/ui/consts/const-block.rs
+++ b/tests/ui/consts/const-block.rs
diff --git a/src/test/ui/consts/const-blocks/const-repeat.rs b/tests/ui/consts/const-blocks/const-repeat.rs
index 65d02317d..65d02317d 100644
--- a/src/test/ui/consts/const-blocks/const-repeat.rs
+++ b/tests/ui/consts/const-blocks/const-repeat.rs
diff --git a/src/test/ui/consts/const-blocks/fn-call-in-const.rs b/tests/ui/consts/const-blocks/fn-call-in-const.rs
index 20496f627..20496f627 100644
--- a/src/test/ui/consts/const-blocks/fn-call-in-const.rs
+++ b/tests/ui/consts/const-blocks/fn-call-in-const.rs
diff --git a/src/test/ui/consts/const-blocks/fn-call-in-non-const.rs b/tests/ui/consts/const-blocks/fn-call-in-non-const.rs
index 18b4dc714..18b4dc714 100644
--- a/src/test/ui/consts/const-blocks/fn-call-in-non-const.rs
+++ b/tests/ui/consts/const-blocks/fn-call-in-non-const.rs
diff --git a/src/test/ui/consts/const-blocks/fn-call-in-non-const.stderr b/tests/ui/consts/const-blocks/fn-call-in-non-const.stderr
index ee352700c..ee352700c 100644
--- a/src/test/ui/consts/const-blocks/fn-call-in-non-const.stderr
+++ b/tests/ui/consts/const-blocks/fn-call-in-non-const.stderr
diff --git a/src/test/ui/consts/const-blocks/migrate-fail.rs b/tests/ui/consts/const-blocks/migrate-fail.rs
index fddbfbb9d..fddbfbb9d 100644
--- a/src/test/ui/consts/const-blocks/migrate-fail.rs
+++ b/tests/ui/consts/const-blocks/migrate-fail.rs
diff --git a/src/test/ui/consts/const-blocks/migrate-fail.stderr b/tests/ui/consts/const-blocks/migrate-fail.stderr
index 928ffd083..928ffd083 100644
--- a/src/test/ui/consts/const-blocks/migrate-fail.stderr
+++ b/tests/ui/consts/const-blocks/migrate-fail.stderr
diff --git a/src/test/ui/consts/const-blocks/migrate-pass.rs b/tests/ui/consts/const-blocks/migrate-pass.rs
index fd66f5aa6..fd66f5aa6 100644
--- a/src/test/ui/consts/const-blocks/migrate-pass.rs
+++ b/tests/ui/consts/const-blocks/migrate-pass.rs
diff --git a/src/test/ui/consts/const-blocks/nll-fail.rs b/tests/ui/consts/const-blocks/nll-fail.rs
index fddbfbb9d..fddbfbb9d 100644
--- a/src/test/ui/consts/const-blocks/nll-fail.rs
+++ b/tests/ui/consts/const-blocks/nll-fail.rs
diff --git a/src/test/ui/consts/const-blocks/nll-fail.stderr b/tests/ui/consts/const-blocks/nll-fail.stderr
index fede00845..fede00845 100644
--- a/src/test/ui/consts/const-blocks/nll-fail.stderr
+++ b/tests/ui/consts/const-blocks/nll-fail.stderr
diff --git a/src/test/ui/consts/const-blocks/nll-pass.rs b/tests/ui/consts/const-blocks/nll-pass.rs
index fd66f5aa6..fd66f5aa6 100644
--- a/src/test/ui/consts/const-blocks/nll-pass.rs
+++ b/tests/ui/consts/const-blocks/nll-pass.rs
diff --git a/src/test/ui/consts/const-blocks/run-pass.rs b/tests/ui/consts/const-blocks/run-pass.rs
index e11f69bab..e11f69bab 100644
--- a/src/test/ui/consts/const-blocks/run-pass.rs
+++ b/tests/ui/consts/const-blocks/run-pass.rs
diff --git a/src/test/ui/consts/const-blocks/trait-error.rs b/tests/ui/consts/const-blocks/trait-error.rs
index 49d1e9b94..49d1e9b94 100644
--- a/src/test/ui/consts/const-blocks/trait-error.rs
+++ b/tests/ui/consts/const-blocks/trait-error.rs
diff --git a/src/test/ui/consts/const-blocks/trait-error.stderr b/tests/ui/consts/const-blocks/trait-error.stderr
index b11dd4b80..06fa4b0b1 100644
--- a/src/test/ui/consts/const-blocks/trait-error.stderr
+++ b/tests/ui/consts/const-blocks/trait-error.stderr
@@ -8,7 +8,7 @@ note: required for `Foo<String>` to implement `Copy`
   --> $DIR/trait-error.rs:1:10
    |
 LL | #[derive(Copy, Clone)]
-   |          ^^^^
+   |          ^^^^ unsatisfied trait bound introduced in this `derive` macro
    = note: the `Copy` trait is required because this value will be copied for each element of the array
    = help: consider creating a new `const` item and initializing it with the result of the function call to be used in the repeat position, like `const VAL: Type = const_fn();` and `let x = [VAL; 42];`
    = help: create an inline `const` block, see RFC #2920 <https://github.com/rust-lang/rfcs/pull/2920> for more information
diff --git a/src/test/ui/consts/const-bound.rs b/tests/ui/consts/const-bound.rs
index 735056a0a..735056a0a 100644
--- a/src/test/ui/consts/const-bound.rs
+++ b/tests/ui/consts/const-bound.rs
diff --git a/src/test/ui/consts/const-byte-str-cast.rs b/tests/ui/consts/const-byte-str-cast.rs
index 65d626c29..65d626c29 100644
--- a/src/test/ui/consts/const-byte-str-cast.rs
+++ b/tests/ui/consts/const-byte-str-cast.rs
diff --git a/src/test/ui/consts/const-call.rs b/tests/ui/consts/const-call.rs
index 28e89559f..28e89559f 100644
--- a/src/test/ui/consts/const-call.rs
+++ b/tests/ui/consts/const-call.rs
diff --git a/src/test/ui/consts/const-call.stderr b/tests/ui/consts/const-call.stderr
index e46bcad0e..e46bcad0e 100644
--- a/src/test/ui/consts/const-call.stderr
+++ b/tests/ui/consts/const-call.stderr
diff --git a/src/test/ui/consts/const-cast-different-types.rs b/tests/ui/consts/const-cast-different-types.rs
index 5e6d7d899..5e6d7d899 100644
--- a/src/test/ui/consts/const-cast-different-types.rs
+++ b/tests/ui/consts/const-cast-different-types.rs
diff --git a/src/test/ui/consts/const-cast-different-types.stderr b/tests/ui/consts/const-cast-different-types.stderr
index 9e622de2e..9e622de2e 100644
--- a/src/test/ui/consts/const-cast-different-types.stderr
+++ b/tests/ui/consts/const-cast-different-types.stderr
diff --git a/src/test/ui/consts/const-cast-ptr-int.rs b/tests/ui/consts/const-cast-ptr-int.rs
index 987d9616e..987d9616e 100644
--- a/src/test/ui/consts/const-cast-ptr-int.rs
+++ b/tests/ui/consts/const-cast-ptr-int.rs
diff --git a/src/test/ui/consts/const-cast-wrong-type.rs b/tests/ui/consts/const-cast-wrong-type.rs
index 6e055a2bc..6e055a2bc 100644
--- a/src/test/ui/consts/const-cast-wrong-type.rs
+++ b/tests/ui/consts/const-cast-wrong-type.rs
diff --git a/src/test/ui/consts/const-cast-wrong-type.stderr b/tests/ui/consts/const-cast-wrong-type.stderr
index ee186636e..ee186636e 100644
--- a/src/test/ui/consts/const-cast-wrong-type.stderr
+++ b/tests/ui/consts/const-cast-wrong-type.stderr
diff --git a/src/test/ui/consts/const-cast.rs b/tests/ui/consts/const-cast.rs
index abeb24121..abeb24121 100644
--- a/src/test/ui/consts/const-cast.rs
+++ b/tests/ui/consts/const-cast.rs
diff --git a/src/test/ui/consts/const-const.rs b/tests/ui/consts/const-const.rs
index 85e4a72e8..85e4a72e8 100644
--- a/src/test/ui/consts/const-const.rs
+++ b/tests/ui/consts/const-const.rs
diff --git a/src/test/ui/consts/const-contents.rs b/tests/ui/consts/const-contents.rs
index 7ba3d4356..7ba3d4356 100644
--- a/src/test/ui/consts/const-contents.rs
+++ b/tests/ui/consts/const-contents.rs
diff --git a/src/test/ui/consts/const-deref-ptr.rs b/tests/ui/consts/const-deref-ptr.rs
index 4aca75e3a..4aca75e3a 100644
--- a/src/test/ui/consts/const-deref-ptr.rs
+++ b/tests/ui/consts/const-deref-ptr.rs
diff --git a/src/test/ui/consts/const-deref-ptr.stderr b/tests/ui/consts/const-deref-ptr.stderr
index 22cb6451e..22cb6451e 100644
--- a/src/test/ui/consts/const-deref-ptr.stderr
+++ b/tests/ui/consts/const-deref-ptr.stderr
diff --git a/src/test/ui/consts/const-deref.rs b/tests/ui/consts/const-deref.rs
index 6060d8e51..6060d8e51 100644
--- a/src/test/ui/consts/const-deref.rs
+++ b/tests/ui/consts/const-deref.rs
diff --git a/src/test/ui/consts/const-endianess.rs b/tests/ui/consts/const-endianess.rs
index 936f31954..936f31954 100644
--- a/src/test/ui/consts/const-endianess.rs
+++ b/tests/ui/consts/const-endianess.rs
diff --git a/src/test/ui/consts/const-enum-byref-self.rs b/tests/ui/consts/const-enum-byref-self.rs
index b7e14bfb7..b7e14bfb7 100644
--- a/src/test/ui/consts/const-enum-byref-self.rs
+++ b/tests/ui/consts/const-enum-byref-self.rs
diff --git a/src/test/ui/consts/const-enum-byref.rs b/tests/ui/consts/const-enum-byref.rs
index badf52946..badf52946 100644
--- a/src/test/ui/consts/const-enum-byref.rs
+++ b/tests/ui/consts/const-enum-byref.rs
diff --git a/src/test/ui/consts/const-enum-cast.rs b/tests/ui/consts/const-enum-cast.rs
index 399684951..399684951 100644
--- a/src/test/ui/consts/const-enum-cast.rs
+++ b/tests/ui/consts/const-enum-cast.rs
diff --git a/src/test/ui/consts/const-enum-ptr.rs b/tests/ui/consts/const-enum-ptr.rs
index 84f4eb840..84f4eb840 100644
--- a/src/test/ui/consts/const-enum-ptr.rs
+++ b/tests/ui/consts/const-enum-ptr.rs
diff --git a/src/test/ui/consts/const-enum-struct.rs b/tests/ui/consts/const-enum-struct.rs
index ee88c9361..ee88c9361 100644
--- a/src/test/ui/consts/const-enum-struct.rs
+++ b/tests/ui/consts/const-enum-struct.rs
diff --git a/src/test/ui/consts/const-enum-struct2.rs b/tests/ui/consts/const-enum-struct2.rs
index 6dfe63d5d..6dfe63d5d 100644
--- a/src/test/ui/consts/const-enum-struct2.rs
+++ b/tests/ui/consts/const-enum-struct2.rs
diff --git a/src/test/ui/consts/const-enum-structlike.rs b/tests/ui/consts/const-enum-structlike.rs
index 0ea79aebc..0ea79aebc 100644
--- a/src/test/ui/consts/const-enum-structlike.rs
+++ b/tests/ui/consts/const-enum-structlike.rs
diff --git a/src/test/ui/consts/const-enum-tuple.rs b/tests/ui/consts/const-enum-tuple.rs
index e0363166b..e0363166b 100644
--- a/src/test/ui/consts/const-enum-tuple.rs
+++ b/tests/ui/consts/const-enum-tuple.rs
diff --git a/src/test/ui/consts/const-enum-tuple2.rs b/tests/ui/consts/const-enum-tuple2.rs
index ef378b599..ef378b599 100644
--- a/src/test/ui/consts/const-enum-tuple2.rs
+++ b/tests/ui/consts/const-enum-tuple2.rs
diff --git a/src/test/ui/consts/const-enum-tuplestruct.rs b/tests/ui/consts/const-enum-tuplestruct.rs
index f93945c6a..f93945c6a 100644
--- a/src/test/ui/consts/const-enum-tuplestruct.rs
+++ b/tests/ui/consts/const-enum-tuplestruct.rs
diff --git a/src/test/ui/consts/const-enum-tuplestruct2.rs b/tests/ui/consts/const-enum-tuplestruct2.rs
index b8aa9a315..b8aa9a315 100644
--- a/src/test/ui/consts/const-enum-tuplestruct2.rs
+++ b/tests/ui/consts/const-enum-tuplestruct2.rs
diff --git a/src/test/ui/consts/const-enum-vec-index.rs b/tests/ui/consts/const-enum-vec-index.rs
index 3f155340a..3f155340a 100644
--- a/src/test/ui/consts/const-enum-vec-index.rs
+++ b/tests/ui/consts/const-enum-vec-index.rs
diff --git a/src/test/ui/consts/const-enum-vec-ptr.rs b/tests/ui/consts/const-enum-vec-ptr.rs
index 43ffe6570..43ffe6570 100644
--- a/src/test/ui/consts/const-enum-vec-ptr.rs
+++ b/tests/ui/consts/const-enum-vec-ptr.rs
diff --git a/src/test/ui/consts/const-enum-vector.rs b/tests/ui/consts/const-enum-vector.rs
index ee3739f97..ee3739f97 100644
--- a/src/test/ui/consts/const-enum-vector.rs
+++ b/tests/ui/consts/const-enum-vector.rs
diff --git a/src/test/ui/consts/const-err-early.rs b/tests/ui/consts/const-err-early.rs
index a3105b4fc..a3105b4fc 100644
--- a/src/test/ui/consts/const-err-early.rs
+++ b/tests/ui/consts/const-err-early.rs
diff --git a/src/test/ui/consts/const-err-early.stderr b/tests/ui/consts/const-err-early.stderr
index 59bf637b7..59bf637b7 100644
--- a/src/test/ui/consts/const-err-early.stderr
+++ b/tests/ui/consts/const-err-early.stderr
diff --git a/src/test/ui/consts/const-err-late.rs b/tests/ui/consts/const-err-late.rs
index d2476e493..d2476e493 100644
--- a/src/test/ui/consts/const-err-late.rs
+++ b/tests/ui/consts/const-err-late.rs
diff --git a/src/test/ui/consts/const-err-late.stderr b/tests/ui/consts/const-err-late.stderr
index c5c668189..c5c668189 100644
--- a/src/test/ui/consts/const-err-late.stderr
+++ b/tests/ui/consts/const-err-late.stderr
diff --git a/src/test/ui/consts/const-err-multi.rs b/tests/ui/consts/const-err-multi.rs
index b265bc4c4..b265bc4c4 100644
--- a/src/test/ui/consts/const-err-multi.rs
+++ b/tests/ui/consts/const-err-multi.rs
diff --git a/src/test/ui/consts/const-err-multi.stderr b/tests/ui/consts/const-err-multi.stderr
index 28af8e5eb..28af8e5eb 100644
--- a/src/test/ui/consts/const-err-multi.stderr
+++ b/tests/ui/consts/const-err-multi.stderr
diff --git a/src/test/ui/consts/const-err-rpass.rs b/tests/ui/consts/const-err-rpass.rs
index e7fa10a2a..e7fa10a2a 100644
--- a/src/test/ui/consts/const-err-rpass.rs
+++ b/tests/ui/consts/const-err-rpass.rs
diff --git a/src/test/ui/consts/const-err2.noopt.stderr b/tests/ui/consts/const-err2.noopt.stderr
index 8b1688c4a..8b1688c4a 100644
--- a/src/test/ui/consts/const-err2.noopt.stderr
+++ b/tests/ui/consts/const-err2.noopt.stderr
diff --git a/src/test/ui/consts/const-err2.opt.stderr b/tests/ui/consts/const-err2.opt.stderr
index 8b1688c4a..8b1688c4a 100644
--- a/src/test/ui/consts/const-err2.opt.stderr
+++ b/tests/ui/consts/const-err2.opt.stderr
diff --git a/src/test/ui/consts/const-err2.opt_with_overflow_checks.stderr b/tests/ui/consts/const-err2.opt_with_overflow_checks.stderr
index 8b1688c4a..8b1688c4a 100644
--- a/src/test/ui/consts/const-err2.opt_with_overflow_checks.stderr
+++ b/tests/ui/consts/const-err2.opt_with_overflow_checks.stderr
diff --git a/src/test/ui/consts/const-err2.rs b/tests/ui/consts/const-err2.rs
index db49ec25a..db49ec25a 100644
--- a/src/test/ui/consts/const-err2.rs
+++ b/tests/ui/consts/const-err2.rs
diff --git a/src/test/ui/consts/const-err4.32bit.stderr b/tests/ui/consts/const-err4.32bit.stderr
index 1cbf78173..1cbf78173 100644
--- a/src/test/ui/consts/const-err4.32bit.stderr
+++ b/tests/ui/consts/const-err4.32bit.stderr
diff --git a/src/test/ui/consts/const-err4.64bit.stderr b/tests/ui/consts/const-err4.64bit.stderr
index 1cbf78173..1cbf78173 100644
--- a/src/test/ui/consts/const-err4.64bit.stderr
+++ b/tests/ui/consts/const-err4.64bit.stderr
diff --git a/src/test/ui/consts/const-err4.rs b/tests/ui/consts/const-err4.rs
index 107dc3f82..107dc3f82 100644
--- a/src/test/ui/consts/const-err4.rs
+++ b/tests/ui/consts/const-err4.rs
diff --git a/src/test/ui/consts/const-eval/assign-to-static-within-other-static.rs b/tests/ui/consts/const-eval/assign-to-static-within-other-static.rs
index ecf97223f..ecf97223f 100644
--- a/src/test/ui/consts/const-eval/assign-to-static-within-other-static.rs
+++ b/tests/ui/consts/const-eval/assign-to-static-within-other-static.rs
diff --git a/src/test/ui/consts/const-eval/assign-to-static-within-other-static.stderr b/tests/ui/consts/const-eval/assign-to-static-within-other-static.stderr
index 4b6784acf..4b6784acf 100644
--- a/src/test/ui/consts/const-eval/assign-to-static-within-other-static.stderr
+++ b/tests/ui/consts/const-eval/assign-to-static-within-other-static.stderr
diff --git a/src/test/ui/consts/const-eval/auxiliary/post_monomorphization_error.rs b/tests/ui/consts/const-eval/auxiliary/post_monomorphization_error.rs
index bdeaa0cd3..bdeaa0cd3 100644
--- a/src/test/ui/consts/const-eval/auxiliary/post_monomorphization_error.rs
+++ b/tests/ui/consts/const-eval/auxiliary/post_monomorphization_error.rs
diff --git a/src/test/ui/consts/const-eval/auxiliary/stability.rs b/tests/ui/consts/const-eval/auxiliary/stability.rs
index e61595518..e61595518 100644
--- a/src/test/ui/consts/const-eval/auxiliary/stability.rs
+++ b/tests/ui/consts/const-eval/auxiliary/stability.rs
diff --git a/src/test/ui/consts/const-eval/conditional_array_execution.rs b/tests/ui/consts/const-eval/conditional_array_execution.rs
index 27d5383d6..27d5383d6 100644
--- a/src/test/ui/consts/const-eval/conditional_array_execution.rs
+++ b/tests/ui/consts/const-eval/conditional_array_execution.rs
diff --git a/src/test/ui/consts/const-eval/conditional_array_execution.stderr b/tests/ui/consts/const-eval/conditional_array_execution.stderr
index c3401fbae..c3401fbae 100644
--- a/src/test/ui/consts/const-eval/conditional_array_execution.stderr
+++ b/tests/ui/consts/const-eval/conditional_array_execution.stderr
diff --git a/src/test/ui/consts/const-eval/const-eval-intrinsic-promotion.rs b/tests/ui/consts/const-eval/const-eval-intrinsic-promotion.rs
index bdcf53785..bdcf53785 100644
--- a/src/test/ui/consts/const-eval/const-eval-intrinsic-promotion.rs
+++ b/tests/ui/consts/const-eval/const-eval-intrinsic-promotion.rs
diff --git a/src/test/ui/consts/const-eval/const-eval-intrinsic-promotion.stderr b/tests/ui/consts/const-eval/const-eval-intrinsic-promotion.stderr
index ed6a6ee6e..ed6a6ee6e 100644
--- a/src/test/ui/consts/const-eval/const-eval-intrinsic-promotion.stderr
+++ b/tests/ui/consts/const-eval/const-eval-intrinsic-promotion.stderr
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-2.rs b/tests/ui/consts/const-eval/const-eval-overflow-2.rs
index 535d91359..535d91359 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-2.rs
+++ b/tests/ui/consts/const-eval/const-eval-overflow-2.rs
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-2.stderr b/tests/ui/consts/const-eval/const-eval-overflow-2.stderr
index 7b1fe49d4..7b1fe49d4 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-2.stderr
+++ b/tests/ui/consts/const-eval/const-eval-overflow-2.stderr
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-3.rs b/tests/ui/consts/const-eval/const-eval-overflow-3.rs
index bcc966dc9..bcc966dc9 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-3.rs
+++ b/tests/ui/consts/const-eval/const-eval-overflow-3.rs
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-3.stderr b/tests/ui/consts/const-eval/const-eval-overflow-3.stderr
index 73f421b5b..73f421b5b 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-3.stderr
+++ b/tests/ui/consts/const-eval/const-eval-overflow-3.stderr
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs b/tests/ui/consts/const-eval/const-eval-overflow-3b.rs
index 480069e67..480069e67 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs
+++ b/tests/ui/consts/const-eval/const-eval-overflow-3b.rs
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-3b.stderr b/tests/ui/consts/const-eval/const-eval-overflow-3b.stderr
index f19917001..f19917001 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-3b.stderr
+++ b/tests/ui/consts/const-eval/const-eval-overflow-3b.stderr
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-4.rs b/tests/ui/consts/const-eval/const-eval-overflow-4.rs
index 762c7a968..762c7a968 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-4.rs
+++ b/tests/ui/consts/const-eval/const-eval-overflow-4.rs
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-4.stderr b/tests/ui/consts/const-eval/const-eval-overflow-4.stderr
index 94f419319..94f419319 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-4.stderr
+++ b/tests/ui/consts/const-eval/const-eval-overflow-4.stderr
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-4b.rs b/tests/ui/consts/const-eval/const-eval-overflow-4b.rs
index ce9c980de..ce9c980de 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-4b.rs
+++ b/tests/ui/consts/const-eval/const-eval-overflow-4b.rs
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-4b.stderr b/tests/ui/consts/const-eval/const-eval-overflow-4b.stderr
index 1f8e40231..1f8e40231 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-4b.stderr
+++ b/tests/ui/consts/const-eval/const-eval-overflow-4b.stderr
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2.rs b/tests/ui/consts/const-eval/const-eval-overflow2.rs
index 1676f7c2a..1676f7c2a 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow2.rs
+++ b/tests/ui/consts/const-eval/const-eval-overflow2.rs
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2.stderr b/tests/ui/consts/const-eval/const-eval-overflow2.stderr
index 341c15daf..341c15daf 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow2.stderr
+++ b/tests/ui/consts/const-eval/const-eval-overflow2.stderr
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2b.rs b/tests/ui/consts/const-eval/const-eval-overflow2b.rs
index 59d1df568..59d1df568 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow2b.rs
+++ b/tests/ui/consts/const-eval/const-eval-overflow2b.rs
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2b.stderr b/tests/ui/consts/const-eval/const-eval-overflow2b.stderr
index e661836b4..e661836b4 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow2b.stderr
+++ b/tests/ui/consts/const-eval/const-eval-overflow2b.stderr
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2c.rs b/tests/ui/consts/const-eval/const-eval-overflow2c.rs
index 33b892601..33b892601 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow2c.rs
+++ b/tests/ui/consts/const-eval/const-eval-overflow2c.rs
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2c.stderr b/tests/ui/consts/const-eval/const-eval-overflow2c.stderr
index 1fad15492..1fad15492 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow2c.stderr
+++ b/tests/ui/consts/const-eval/const-eval-overflow2c.stderr
diff --git a/src/test/ui/consts/const-eval/const-eval-query-stack.rs b/tests/ui/consts/const-eval/const-eval-query-stack.rs
index 8f8a8cee3..8f8a8cee3 100644
--- a/src/test/ui/consts/const-eval/const-eval-query-stack.rs
+++ b/tests/ui/consts/const-eval/const-eval-query-stack.rs
diff --git a/src/test/ui/consts/const-eval/const-eval-query-stack.stderr b/tests/ui/consts/const-eval/const-eval-query-stack.stderr
index b97975c4c..b97975c4c 100644
--- a/src/test/ui/consts/const-eval/const-eval-query-stack.stderr
+++ b/tests/ui/consts/const-eval/const-eval-query-stack.stderr
diff --git a/src/test/ui/consts/const-eval/const-eval-span.rs b/tests/ui/consts/const-eval/const-eval-span.rs
index 82f101b47..82f101b47 100644
--- a/src/test/ui/consts/const-eval/const-eval-span.rs
+++ b/tests/ui/consts/const-eval/const-eval-span.rs
diff --git a/src/test/ui/consts/const-eval/const-eval-span.stderr b/tests/ui/consts/const-eval/const-eval-span.stderr
index c5b001899..c5b001899 100644
--- a/src/test/ui/consts/const-eval/const-eval-span.stderr
+++ b/tests/ui/consts/const-eval/const-eval-span.stderr
diff --git a/src/test/ui/consts/const-eval/const-pointer-values-in-various-types.64bit.stderr b/tests/ui/consts/const-eval/const-pointer-values-in-various-types.64bit.stderr
index bf98d0394..bf98d0394 100644
--- a/src/test/ui/consts/const-eval/const-pointer-values-in-various-types.64bit.stderr
+++ b/tests/ui/consts/const-eval/const-pointer-values-in-various-types.64bit.stderr
diff --git a/src/test/ui/consts/const-eval/const-pointer-values-in-various-types.rs b/tests/ui/consts/const-eval/const-pointer-values-in-various-types.rs
index 45eed9d84..45eed9d84 100644
--- a/src/test/ui/consts/const-eval/const-pointer-values-in-various-types.rs
+++ b/tests/ui/consts/const-eval/const-pointer-values-in-various-types.rs
diff --git a/src/test/ui/consts/const-eval/const_fn_ptr.rs b/tests/ui/consts/const-eval/const_fn_ptr.rs
index b3c677c69..b3c677c69 100644
--- a/src/test/ui/consts/const-eval/const_fn_ptr.rs
+++ b/tests/ui/consts/const-eval/const_fn_ptr.rs
diff --git a/src/test/ui/consts/const-eval/const_fn_ptr.stderr b/tests/ui/consts/const-eval/const_fn_ptr.stderr
index ca1585f88..ca1585f88 100644
--- a/src/test/ui/consts/const-eval/const_fn_ptr.stderr
+++ b/tests/ui/consts/const-eval/const_fn_ptr.stderr
diff --git a/src/test/ui/consts/const-eval/const_fn_ptr_fail.rs b/tests/ui/consts/const-eval/const_fn_ptr_fail.rs
index 1896eba82..1896eba82 100644
--- a/src/test/ui/consts/const-eval/const_fn_ptr_fail.rs
+++ b/tests/ui/consts/const-eval/const_fn_ptr_fail.rs
diff --git a/src/test/ui/consts/const-eval/const_fn_ptr_fail.stderr b/tests/ui/consts/const-eval/const_fn_ptr_fail.stderr
index ec5de5759..ec5de5759 100644
--- a/src/test/ui/consts/const-eval/const_fn_ptr_fail.stderr
+++ b/tests/ui/consts/const-eval/const_fn_ptr_fail.stderr
diff --git a/src/test/ui/consts/const-eval/const_fn_ptr_fail2.rs b/tests/ui/consts/const-eval/const_fn_ptr_fail2.rs
index b873940c4..b873940c4 100644
--- a/src/test/ui/consts/const-eval/const_fn_ptr_fail2.rs
+++ b/tests/ui/consts/const-eval/const_fn_ptr_fail2.rs
diff --git a/src/test/ui/consts/const-eval/const_fn_ptr_fail2.stderr b/tests/ui/consts/const-eval/const_fn_ptr_fail2.stderr
index 0734f479f..0734f479f 100644
--- a/src/test/ui/consts/const-eval/const_fn_ptr_fail2.stderr
+++ b/tests/ui/consts/const-eval/const_fn_ptr_fail2.stderr
diff --git a/src/test/ui/consts/const-eval/const_let.rs b/tests/ui/consts/const-eval/const_let.rs
index 1e2bcc55b..1e2bcc55b 100644
--- a/src/test/ui/consts/const-eval/const_let.rs
+++ b/tests/ui/consts/const-eval/const_let.rs
diff --git a/src/test/ui/consts/const-eval/const_let.stderr b/tests/ui/consts/const-eval/const_let.stderr
index 63442f557..63442f557 100644
--- a/src/test/ui/consts/const-eval/const_let.stderr
+++ b/tests/ui/consts/const-eval/const_let.stderr
diff --git a/src/test/ui/consts/const-eval/const_panic.rs b/tests/ui/consts/const-eval/const_panic.rs
index 5b9a8f8e2..5b9a8f8e2 100644
--- a/src/test/ui/consts/const-eval/const_panic.rs
+++ b/tests/ui/consts/const-eval/const_panic.rs
diff --git a/src/test/ui/consts/const-eval/const_panic.stderr b/tests/ui/consts/const-eval/const_panic.stderr
index 0f7be4607..0f7be4607 100644
--- a/src/test/ui/consts/const-eval/const_panic.stderr
+++ b/tests/ui/consts/const-eval/const_panic.stderr
diff --git a/src/test/ui/consts/const-eval/const_panic_2021.rs b/tests/ui/consts/const-eval/const_panic_2021.rs
index 4702aa2f5..4702aa2f5 100644
--- a/src/test/ui/consts/const-eval/const_panic_2021.rs
+++ b/tests/ui/consts/const-eval/const_panic_2021.rs
diff --git a/src/test/ui/consts/const-eval/const_panic_2021.stderr b/tests/ui/consts/const-eval/const_panic_2021.stderr
index 192fa3a12..192fa3a12 100644
--- a/src/test/ui/consts/const-eval/const_panic_2021.stderr
+++ b/tests/ui/consts/const-eval/const_panic_2021.stderr
diff --git a/src/test/ui/consts/const-eval/const_panic_libcore_bin.rs b/tests/ui/consts/const-eval/const_panic_libcore_bin.rs
index d4dc1a51d..d4dc1a51d 100644
--- a/src/test/ui/consts/const-eval/const_panic_libcore_bin.rs
+++ b/tests/ui/consts/const-eval/const_panic_libcore_bin.rs
diff --git a/src/test/ui/consts/const-eval/const_panic_libcore_bin.stderr b/tests/ui/consts/const-eval/const_panic_libcore_bin.stderr
index df19ed4a8..df19ed4a8 100644
--- a/src/test/ui/consts/const-eval/const_panic_libcore_bin.stderr
+++ b/tests/ui/consts/const-eval/const_panic_libcore_bin.stderr
diff --git a/src/test/ui/consts/const-eval/const_panic_stability.e2018.stderr b/tests/ui/consts/const-eval/const_panic_stability.e2018.stderr
index 3553a18d3..3553a18d3 100644
--- a/src/test/ui/consts/const-eval/const_panic_stability.e2018.stderr
+++ b/tests/ui/consts/const-eval/const_panic_stability.e2018.stderr
diff --git a/src/test/ui/consts/const-eval/const_panic_stability.e2021.stderr b/tests/ui/consts/const-eval/const_panic_stability.e2021.stderr
index 9e8179181..9e8179181 100644
--- a/src/test/ui/consts/const-eval/const_panic_stability.e2021.stderr
+++ b/tests/ui/consts/const-eval/const_panic_stability.e2021.stderr
diff --git a/src/test/ui/consts/const-eval/const_panic_stability.rs b/tests/ui/consts/const-eval/const_panic_stability.rs
index 1aee6f27e..1aee6f27e 100644
--- a/src/test/ui/consts/const-eval/const_panic_stability.rs
+++ b/tests/ui/consts/const-eval/const_panic_stability.rs
diff --git a/src/test/ui/consts/const-eval/const_panic_track_caller.rs b/tests/ui/consts/const-eval/const_panic_track_caller.rs
index 9cf7a3ba7..9cf7a3ba7 100644
--- a/src/test/ui/consts/const-eval/const_panic_track_caller.rs
+++ b/tests/ui/consts/const-eval/const_panic_track_caller.rs
diff --git a/src/test/ui/consts/const-eval/const_panic_track_caller.stderr b/tests/ui/consts/const-eval/const_panic_track_caller.stderr
index 846458176..846458176 100644
--- a/src/test/ui/consts/const-eval/const_panic_track_caller.stderr
+++ b/tests/ui/consts/const-eval/const_panic_track_caller.stderr
diff --git a/src/test/ui/consts/const-eval/const_prop_errors.rs b/tests/ui/consts/const-eval/const_prop_errors.rs
index f9a36d379..f9a36d379 100644
--- a/src/test/ui/consts/const-eval/const_prop_errors.rs
+++ b/tests/ui/consts/const-eval/const_prop_errors.rs
diff --git a/src/test/ui/consts/const-eval/const_raw_ptr_ops.rs b/tests/ui/consts/const-eval/const_raw_ptr_ops.rs
index cd7c98007..cd7c98007 100644
--- a/src/test/ui/consts/const-eval/const_raw_ptr_ops.rs
+++ b/tests/ui/consts/const-eval/const_raw_ptr_ops.rs
diff --git a/src/test/ui/consts/const-eval/const_raw_ptr_ops.stderr b/tests/ui/consts/const-eval/const_raw_ptr_ops.stderr
index 12244450e..12244450e 100644
--- a/src/test/ui/consts/const-eval/const_raw_ptr_ops.stderr
+++ b/tests/ui/consts/const-eval/const_raw_ptr_ops.stderr
diff --git a/src/test/ui/consts/const-eval/const_raw_ptr_ops2.rs b/tests/ui/consts/const-eval/const_raw_ptr_ops2.rs
index ec5508a1e..ec5508a1e 100644
--- a/src/test/ui/consts/const-eval/const_raw_ptr_ops2.rs
+++ b/tests/ui/consts/const-eval/const_raw_ptr_ops2.rs
diff --git a/src/test/ui/consts/const-eval/const_raw_ptr_ops2.stderr b/tests/ui/consts/const-eval/const_raw_ptr_ops2.stderr
index e41dea873..e41dea873 100644
--- a/src/test/ui/consts/const-eval/const_raw_ptr_ops2.stderr
+++ b/tests/ui/consts/const-eval/const_raw_ptr_ops2.stderr
diff --git a/src/test/ui/consts/const-eval/const_signed_pat.rs b/tests/ui/consts/const-eval/const_signed_pat.rs
index c61239bb6..c61239bb6 100644
--- a/src/test/ui/consts/const-eval/const_signed_pat.rs
+++ b/tests/ui/consts/const-eval/const_signed_pat.rs
diff --git a/src/test/ui/consts/const-eval/dangling.rs b/tests/ui/consts/const-eval/dangling.rs
index 4fcf87921..4fcf87921 100644
--- a/src/test/ui/consts/const-eval/dangling.rs
+++ b/tests/ui/consts/const-eval/dangling.rs
diff --git a/src/test/ui/consts/const-eval/dangling.stderr b/tests/ui/consts/const-eval/dangling.stderr
index 92d70573d..92d70573d 100644
--- a/src/test/ui/consts/const-eval/dangling.stderr
+++ b/tests/ui/consts/const-eval/dangling.stderr
diff --git a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.rs b/tests/ui/consts/const-eval/dont_promote_unstable_const_fn.rs
index 4b3cf7073..4b3cf7073 100644
--- a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.rs
+++ b/tests/ui/consts/const-eval/dont_promote_unstable_const_fn.rs
diff --git a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.stderr b/tests/ui/consts/const-eval/dont_promote_unstable_const_fn.stderr
index 2e697b219..2e697b219 100644
--- a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.stderr
+++ b/tests/ui/consts/const-eval/dont_promote_unstable_const_fn.stderr
diff --git a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn_cross_crate.rs b/tests/ui/consts/const-eval/dont_promote_unstable_const_fn_cross_crate.rs
index ea35f4680..ea35f4680 100644
--- a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn_cross_crate.rs
+++ b/tests/ui/consts/const-eval/dont_promote_unstable_const_fn_cross_crate.rs
diff --git a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn_cross_crate.stderr b/tests/ui/consts/const-eval/dont_promote_unstable_const_fn_cross_crate.stderr
index aa742d784..aa742d784 100644
--- a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn_cross_crate.stderr
+++ b/tests/ui/consts/const-eval/dont_promote_unstable_const_fn_cross_crate.stderr
diff --git a/src/test/ui/consts/const-eval/double_check.rs b/tests/ui/consts/const-eval/double_check.rs
index 56ca0aa1f..56ca0aa1f 100644
--- a/src/test/ui/consts/const-eval/double_check.rs
+++ b/tests/ui/consts/const-eval/double_check.rs
diff --git a/src/test/ui/consts/const-eval/double_check2.rs b/tests/ui/consts/const-eval/double_check2.rs
index 81f5dde45..81f5dde45 100644
--- a/src/test/ui/consts/const-eval/double_check2.rs
+++ b/tests/ui/consts/const-eval/double_check2.rs
diff --git a/src/test/ui/consts/const-eval/duration_conversion.rs b/tests/ui/consts/const-eval/duration_conversion.rs
index 87b12937d..87b12937d 100644
--- a/src/test/ui/consts/const-eval/duration_conversion.rs
+++ b/tests/ui/consts/const-eval/duration_conversion.rs
diff --git a/src/test/ui/consts/const-eval/enum_discr.rs b/tests/ui/consts/const-eval/enum_discr.rs
index e09258f11..e09258f11 100644
--- a/src/test/ui/consts/const-eval/enum_discr.rs
+++ b/tests/ui/consts/const-eval/enum_discr.rs
diff --git a/src/test/ui/consts/const-eval/erroneous-const.rs b/tests/ui/consts/const-eval/erroneous-const.rs
index e0fd057a2..e0fd057a2 100644
--- a/src/test/ui/consts/const-eval/erroneous-const.rs
+++ b/tests/ui/consts/const-eval/erroneous-const.rs
diff --git a/src/test/ui/consts/const-eval/erroneous-const.stderr b/tests/ui/consts/const-eval/erroneous-const.stderr
index 03030392a..03030392a 100644
--- a/src/test/ui/consts/const-eval/erroneous-const.stderr
+++ b/tests/ui/consts/const-eval/erroneous-const.stderr
diff --git a/src/test/ui/consts/const-eval/erroneous-const2.rs b/tests/ui/consts/const-eval/erroneous-const2.rs
index 15c0f9107..15c0f9107 100644
--- a/src/test/ui/consts/const-eval/erroneous-const2.rs
+++ b/tests/ui/consts/const-eval/erroneous-const2.rs
diff --git a/src/test/ui/consts/const-eval/erroneous-const2.stderr b/tests/ui/consts/const-eval/erroneous-const2.stderr
index 8626f4d78..8626f4d78 100644
--- a/src/test/ui/consts/const-eval/erroneous-const2.stderr
+++ b/tests/ui/consts/const-eval/erroneous-const2.stderr
diff --git a/src/test/ui/consts/const-eval/extern_fat_pointer.rs b/tests/ui/consts/const-eval/extern_fat_pointer.rs
index d91d07827..d91d07827 100644
--- a/src/test/ui/consts/const-eval/extern_fat_pointer.rs
+++ b/tests/ui/consts/const-eval/extern_fat_pointer.rs
diff --git a/src/test/ui/consts/const-eval/format.rs b/tests/ui/consts/const-eval/format.rs
index 0d8b7c12d..0d8b7c12d 100644
--- a/src/test/ui/consts/const-eval/format.rs
+++ b/tests/ui/consts/const-eval/format.rs
diff --git a/src/test/ui/consts/const-eval/format.stderr b/tests/ui/consts/const-eval/format.stderr
index 4bf39db58..4bf39db58 100644
--- a/src/test/ui/consts/const-eval/format.stderr
+++ b/tests/ui/consts/const-eval/format.stderr
diff --git a/src/test/ui/consts/const-eval/generic-slice.rs b/tests/ui/consts/const-eval/generic-slice.rs
index 21360a1c4..21360a1c4 100644
--- a/src/test/ui/consts/const-eval/generic-slice.rs
+++ b/tests/ui/consts/const-eval/generic-slice.rs
diff --git a/src/test/ui/consts/const-eval/generic-slice.stderr b/tests/ui/consts/const-eval/generic-slice.stderr
index c38088df4..c38088df4 100644
--- a/src/test/ui/consts/const-eval/generic-slice.stderr
+++ b/tests/ui/consts/const-eval/generic-slice.stderr
diff --git a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_errors.rs b/tests/ui/consts/const-eval/heap/alloc_intrinsic_errors.rs
index ac9e8b64b..ac9e8b64b 100644
--- a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_errors.rs
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_errors.rs
diff --git a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_errors.stderr b/tests/ui/consts/const-eval/heap/alloc_intrinsic_errors.stderr
index 8f3b3d5f7..8f3b3d5f7 100644
--- a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_errors.stderr
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_errors.stderr
diff --git a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_nontransient.rs b/tests/ui/consts/const-eval/heap/alloc_intrinsic_nontransient.rs
index 0a8fc7bca..0a8fc7bca 100644
--- a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_nontransient.rs
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_nontransient.rs
diff --git a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_nontransient_fail.rs b/tests/ui/consts/const-eval/heap/alloc_intrinsic_nontransient_fail.rs
index f746f2700..f746f2700 100644
--- a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_nontransient_fail.rs
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_nontransient_fail.rs
diff --git a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_nontransient_fail.stderr b/tests/ui/consts/const-eval/heap/alloc_intrinsic_nontransient_fail.stderr
index 00ab0dfc5..00ab0dfc5 100644
--- a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_nontransient_fail.stderr
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_nontransient_fail.stderr
diff --git a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_transient.rs b/tests/ui/consts/const-eval/heap/alloc_intrinsic_transient.rs
index 92193bb33..92193bb33 100644
--- a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_transient.rs
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_transient.rs
diff --git a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_uninit.32bit.stderr b/tests/ui/consts/const-eval/heap/alloc_intrinsic_uninit.32bit.stderr
index a0f4519ea..a0f4519ea 100644
--- a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_uninit.32bit.stderr
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_uninit.32bit.stderr
diff --git a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_uninit.64bit.stderr b/tests/ui/consts/const-eval/heap/alloc_intrinsic_uninit.64bit.stderr
index d2bffa425..d2bffa425 100644
--- a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_uninit.64bit.stderr
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_uninit.64bit.stderr
diff --git a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_uninit.rs b/tests/ui/consts/const-eval/heap/alloc_intrinsic_uninit.rs
index b53c9ac7a..b53c9ac7a 100644
--- a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_uninit.rs
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_uninit.rs
diff --git a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_untyped.rs b/tests/ui/consts/const-eval/heap/alloc_intrinsic_untyped.rs
index 77871c394..77871c394 100644
--- a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_untyped.rs
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_untyped.rs
diff --git a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_untyped.stderr b/tests/ui/consts/const-eval/heap/alloc_intrinsic_untyped.stderr
index 36002b850..36002b850 100644
--- a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_untyped.stderr
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_untyped.stderr
diff --git a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_zero_sized.rs b/tests/ui/consts/const-eval/heap/alloc_intrinsic_zero_sized.rs
index 407e69d41..407e69d41 100644
--- a/src/test/ui/consts/const-eval/heap/alloc_intrinsic_zero_sized.rs
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_zero_sized.rs
diff --git a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic.rs b/tests/ui/consts/const-eval/heap/dealloc_intrinsic.rs
index aac90cd54..aac90cd54 100644
--- a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic.rs
+++ b/tests/ui/consts/const-eval/heap/dealloc_intrinsic.rs
diff --git a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_dangling.rs b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_dangling.rs
index b6d89a58d..b6d89a58d 100644
--- a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_dangling.rs
+++ b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_dangling.rs
diff --git a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_dangling.stderr b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_dangling.stderr
index 4eb1c42e1..4eb1c42e1 100644
--- a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_dangling.stderr
+++ b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_dangling.stderr
diff --git a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_duplicate.rs b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_duplicate.rs
index 4010b4769..4010b4769 100644
--- a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_duplicate.rs
+++ b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_duplicate.rs
diff --git a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_duplicate.stderr b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_duplicate.stderr
index 8177a0850..8177a0850 100644
--- a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_duplicate.stderr
+++ b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_duplicate.stderr
diff --git a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_incorrect_layout.rs b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_incorrect_layout.rs
index 031d70fdc..031d70fdc 100644
--- a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_incorrect_layout.rs
+++ b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_incorrect_layout.rs
diff --git a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_incorrect_layout.stderr b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_incorrect_layout.stderr
index 650b409b1..650b409b1 100644
--- a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_incorrect_layout.stderr
+++ b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_incorrect_layout.stderr
diff --git a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_zero_sized.rs b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_zero_sized.rs
index 84fb4d2ea..84fb4d2ea 100644
--- a/src/test/ui/consts/const-eval/heap/dealloc_intrinsic_zero_sized.rs
+++ b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_zero_sized.rs
diff --git a/src/test/ui/consts/const-eval/ice-generic-assoc-const.rs b/tests/ui/consts/const-eval/ice-generic-assoc-const.rs
index e514682af..e514682af 100644
--- a/src/test/ui/consts/const-eval/ice-generic-assoc-const.rs
+++ b/tests/ui/consts/const-eval/ice-generic-assoc-const.rs
diff --git a/src/test/ui/consts/const-eval/ice-packed.rs b/tests/ui/consts/const-eval/ice-packed.rs
index 4758a5a9d..4758a5a9d 100644
--- a/src/test/ui/consts/const-eval/ice-packed.rs
+++ b/tests/ui/consts/const-eval/ice-packed.rs
diff --git a/src/test/ui/consts/const-eval/index-out-of-bounds-never-type.rs b/tests/ui/consts/const-eval/index-out-of-bounds-never-type.rs
index bc2ea3f18..bc2ea3f18 100644
--- a/src/test/ui/consts/const-eval/index-out-of-bounds-never-type.rs
+++ b/tests/ui/consts/const-eval/index-out-of-bounds-never-type.rs
diff --git a/src/test/ui/consts/const-eval/index-out-of-bounds-never-type.stderr b/tests/ui/consts/const-eval/index-out-of-bounds-never-type.stderr
index 8bcd03005..8bcd03005 100644
--- a/src/test/ui/consts/const-eval/index-out-of-bounds-never-type.stderr
+++ b/tests/ui/consts/const-eval/index-out-of-bounds-never-type.stderr
diff --git a/src/test/ui/consts/const-eval/index_out_of_bounds.rs b/tests/ui/consts/const-eval/index_out_of_bounds.rs
index 80e0d28fe..80e0d28fe 100644
--- a/src/test/ui/consts/const-eval/index_out_of_bounds.rs
+++ b/tests/ui/consts/const-eval/index_out_of_bounds.rs
diff --git a/src/test/ui/consts/const-eval/index_out_of_bounds.stderr b/tests/ui/consts/const-eval/index_out_of_bounds.stderr
index 8bb3a0c67..8bb3a0c67 100644
--- a/src/test/ui/consts/const-eval/index_out_of_bounds.stderr
+++ b/tests/ui/consts/const-eval/index_out_of_bounds.stderr
diff --git a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.rs b/tests/ui/consts/const-eval/index_out_of_bounds_propagated.rs
index 608e6e112..608e6e112 100644
--- a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.rs
+++ b/tests/ui/consts/const-eval/index_out_of_bounds_propagated.rs
diff --git a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr b/tests/ui/consts/const-eval/index_out_of_bounds_propagated.stderr
index d247d691d..d247d691d 100644
--- a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr
+++ b/tests/ui/consts/const-eval/index_out_of_bounds_propagated.stderr
diff --git a/src/test/ui/consts/const-eval/infinite_loop.rs b/tests/ui/consts/const-eval/infinite_loop.rs
index 4babc9a28..4babc9a28 100644
--- a/src/test/ui/consts/const-eval/infinite_loop.rs
+++ b/tests/ui/consts/const-eval/infinite_loop.rs
diff --git a/src/test/ui/consts/const-eval/infinite_loop.stderr b/tests/ui/consts/const-eval/infinite_loop.stderr
index 8b58cb279..8b58cb279 100644
--- a/src/test/ui/consts/const-eval/infinite_loop.stderr
+++ b/tests/ui/consts/const-eval/infinite_loop.stderr
diff --git a/src/test/ui/consts/const-eval/issue-100878.rs b/tests/ui/consts/const-eval/issue-100878.rs
index 353ce5050..353ce5050 100644
--- a/src/test/ui/consts/const-eval/issue-100878.rs
+++ b/tests/ui/consts/const-eval/issue-100878.rs
diff --git a/src/test/ui/consts/const-eval/issue-104390.rs b/tests/ui/consts/const-eval/issue-104390.rs
index 602d81824..602d81824 100644
--- a/src/test/ui/consts/const-eval/issue-104390.rs
+++ b/tests/ui/consts/const-eval/issue-104390.rs
diff --git a/src/test/ui/consts/const-eval/issue-104390.stderr b/tests/ui/consts/const-eval/issue-104390.stderr
index 865b9996e..865b9996e 100644
--- a/src/test/ui/consts/const-eval/issue-104390.stderr
+++ b/tests/ui/consts/const-eval/issue-104390.stderr
diff --git a/src/test/ui/consts/const-eval/issue-43197.rs b/tests/ui/consts/const-eval/issue-43197.rs
index 145463f0a..145463f0a 100644
--- a/src/test/ui/consts/const-eval/issue-43197.rs
+++ b/tests/ui/consts/const-eval/issue-43197.rs
diff --git a/src/test/ui/consts/const-eval/issue-43197.stderr b/tests/ui/consts/const-eval/issue-43197.stderr
index c59f13e48..c59f13e48 100644
--- a/src/test/ui/consts/const-eval/issue-43197.stderr
+++ b/tests/ui/consts/const-eval/issue-43197.stderr
diff --git a/src/test/ui/consts/const-eval/issue-44578.rs b/tests/ui/consts/const-eval/issue-44578.rs
index e4dcc6230..e4dcc6230 100644
--- a/src/test/ui/consts/const-eval/issue-44578.rs
+++ b/tests/ui/consts/const-eval/issue-44578.rs
diff --git a/src/test/ui/consts/const-eval/issue-44578.stderr b/tests/ui/consts/const-eval/issue-44578.stderr
index 0cbf54480..0cbf54480 100644
--- a/src/test/ui/consts/const-eval/issue-44578.stderr
+++ b/tests/ui/consts/const-eval/issue-44578.stderr
diff --git a/src/test/ui/consts/const-eval/issue-47971.rs b/tests/ui/consts/const-eval/issue-47971.rs
index b98e76031..b98e76031 100644
--- a/src/test/ui/consts/const-eval/issue-47971.rs
+++ b/tests/ui/consts/const-eval/issue-47971.rs
diff --git a/src/test/ui/consts/const-eval/issue-49296.rs b/tests/ui/consts/const-eval/issue-49296.rs
index 917777a32..917777a32 100644
--- a/src/test/ui/consts/const-eval/issue-49296.rs
+++ b/tests/ui/consts/const-eval/issue-49296.rs
diff --git a/src/test/ui/consts/const-eval/issue-49296.stderr b/tests/ui/consts/const-eval/issue-49296.stderr
index cc4f1594c..cc4f1594c 100644
--- a/src/test/ui/consts/const-eval/issue-49296.stderr
+++ b/tests/ui/consts/const-eval/issue-49296.stderr
diff --git a/src/test/ui/consts/const-eval/issue-50706.rs b/tests/ui/consts/const-eval/issue-50706.rs
index a13c27f2e..a13c27f2e 100644
--- a/src/test/ui/consts/const-eval/issue-50706.rs
+++ b/tests/ui/consts/const-eval/issue-50706.rs
diff --git a/src/test/ui/consts/const-eval/issue-50814-2.rs b/tests/ui/consts/const-eval/issue-50814-2.rs
index 53eb7b149..53eb7b149 100644
--- a/src/test/ui/consts/const-eval/issue-50814-2.rs
+++ b/tests/ui/consts/const-eval/issue-50814-2.rs
diff --git a/src/test/ui/consts/const-eval/issue-50814-2.stderr b/tests/ui/consts/const-eval/issue-50814-2.stderr
index 956f7aec9..956f7aec9 100644
--- a/src/test/ui/consts/const-eval/issue-50814-2.stderr
+++ b/tests/ui/consts/const-eval/issue-50814-2.stderr
diff --git a/src/test/ui/consts/const-eval/issue-50814.rs b/tests/ui/consts/const-eval/issue-50814.rs
index 374ed1d93..374ed1d93 100644
--- a/src/test/ui/consts/const-eval/issue-50814.rs
+++ b/tests/ui/consts/const-eval/issue-50814.rs
diff --git a/src/test/ui/consts/const-eval/issue-50814.stderr b/tests/ui/consts/const-eval/issue-50814.stderr
index 05b6271f4..05b6271f4 100644
--- a/src/test/ui/consts/const-eval/issue-50814.stderr
+++ b/tests/ui/consts/const-eval/issue-50814.stderr
diff --git a/src/test/ui/consts/const-eval/issue-51300.rs b/tests/ui/consts/const-eval/issue-51300.rs
index 8e68e8c91..8e68e8c91 100644
--- a/src/test/ui/consts/const-eval/issue-51300.rs
+++ b/tests/ui/consts/const-eval/issue-51300.rs
diff --git a/src/test/ui/consts/const-eval/issue-52475.rs b/tests/ui/consts/const-eval/issue-52475.rs
index ce65407bb..ce65407bb 100644
--- a/src/test/ui/consts/const-eval/issue-52475.rs
+++ b/tests/ui/consts/const-eval/issue-52475.rs
diff --git a/src/test/ui/consts/const-eval/issue-52475.stderr b/tests/ui/consts/const-eval/issue-52475.stderr
index 8536ff02c..8536ff02c 100644
--- a/src/test/ui/consts/const-eval/issue-52475.stderr
+++ b/tests/ui/consts/const-eval/issue-52475.stderr
diff --git a/src/test/ui/consts/const-eval/issue-53157.rs b/tests/ui/consts/const-eval/issue-53157.rs
index 850338625..850338625 100644
--- a/src/test/ui/consts/const-eval/issue-53157.rs
+++ b/tests/ui/consts/const-eval/issue-53157.rs
diff --git a/src/test/ui/consts/const-eval/issue-53401.rs b/tests/ui/consts/const-eval/issue-53401.rs
index 31c946c3c..31c946c3c 100644
--- a/src/test/ui/consts/const-eval/issue-53401.rs
+++ b/tests/ui/consts/const-eval/issue-53401.rs
diff --git a/src/test/ui/consts/const-eval/issue-55541.rs b/tests/ui/consts/const-eval/issue-55541.rs
index fa5a493ab..fa5a493ab 100644
--- a/src/test/ui/consts/const-eval/issue-55541.rs
+++ b/tests/ui/consts/const-eval/issue-55541.rs
diff --git a/src/test/ui/consts/const-eval/issue-64908.rs b/tests/ui/consts/const-eval/issue-64908.rs
index d2e095072..d2e095072 100644
--- a/src/test/ui/consts/const-eval/issue-64908.rs
+++ b/tests/ui/consts/const-eval/issue-64908.rs
diff --git a/src/test/ui/consts/const-eval/issue-64970.rs b/tests/ui/consts/const-eval/issue-64970.rs
index ba530438f..ba530438f 100644
--- a/src/test/ui/consts/const-eval/issue-64970.rs
+++ b/tests/ui/consts/const-eval/issue-64970.rs
diff --git a/src/test/ui/consts/const-eval/issue-65394.rs b/tests/ui/consts/const-eval/issue-65394.rs
index e6639826c..e6639826c 100644
--- a/src/test/ui/consts/const-eval/issue-65394.rs
+++ b/tests/ui/consts/const-eval/issue-65394.rs
diff --git a/src/test/ui/consts/const-eval/issue-65394.stderr b/tests/ui/consts/const-eval/issue-65394.stderr
index ae6f0e937..ae6f0e937 100644
--- a/src/test/ui/consts/const-eval/issue-65394.stderr
+++ b/tests/ui/consts/const-eval/issue-65394.stderr
diff --git a/src/test/ui/consts/const-eval/issue-70723.rs b/tests/ui/consts/const-eval/issue-70723.rs
index 3c81afa67..3c81afa67 100644
--- a/src/test/ui/consts/const-eval/issue-70723.rs
+++ b/tests/ui/consts/const-eval/issue-70723.rs
diff --git a/src/test/ui/consts/const-eval/issue-70723.stderr b/tests/ui/consts/const-eval/issue-70723.stderr
index 09fb3e060..09fb3e060 100644
--- a/src/test/ui/consts/const-eval/issue-70723.stderr
+++ b/tests/ui/consts/const-eval/issue-70723.stderr
diff --git a/src/test/ui/consts/const-eval/issue-70804-fn-subtyping.rs b/tests/ui/consts/const-eval/issue-70804-fn-subtyping.rs
index abd1d32ab..abd1d32ab 100644
--- a/src/test/ui/consts/const-eval/issue-70804-fn-subtyping.rs
+++ b/tests/ui/consts/const-eval/issue-70804-fn-subtyping.rs
diff --git a/src/test/ui/consts/const-eval/issue-84957-const-str-as-bytes.rs b/tests/ui/consts/const-eval/issue-84957-const-str-as-bytes.rs
index 7e235c491..7e235c491 100644
--- a/src/test/ui/consts/const-eval/issue-84957-const-str-as-bytes.rs
+++ b/tests/ui/consts/const-eval/issue-84957-const-str-as-bytes.rs
diff --git a/src/test/ui/consts/const-eval/issue-85155.rs b/tests/ui/consts/const-eval/issue-85155.rs
index c3216d53d..c3216d53d 100644
--- a/src/test/ui/consts/const-eval/issue-85155.rs
+++ b/tests/ui/consts/const-eval/issue-85155.rs
diff --git a/src/test/ui/consts/const-eval/issue-85155.stderr b/tests/ui/consts/const-eval/issue-85155.stderr
index 3d2c76b7e..3d2c76b7e 100644
--- a/src/test/ui/consts/const-eval/issue-85155.stderr
+++ b/tests/ui/consts/const-eval/issue-85155.stderr
diff --git a/src/test/ui/consts/const-eval/issue-85907.rs b/tests/ui/consts/const-eval/issue-85907.rs
index 6ae40ae6d..6ae40ae6d 100644
--- a/src/test/ui/consts/const-eval/issue-85907.rs
+++ b/tests/ui/consts/const-eval/issue-85907.rs
diff --git a/src/test/ui/consts/const-eval/issue-85907.stderr b/tests/ui/consts/const-eval/issue-85907.stderr
index fd7b40572..fd7b40572 100644
--- a/src/test/ui/consts/const-eval/issue-85907.stderr
+++ b/tests/ui/consts/const-eval/issue-85907.stderr
diff --git a/src/test/ui/consts/const-eval/issue-91827-extern-types.rs b/tests/ui/consts/const-eval/issue-91827-extern-types.rs
index 43c99799f..43c99799f 100644
--- a/src/test/ui/consts/const-eval/issue-91827-extern-types.rs
+++ b/tests/ui/consts/const-eval/issue-91827-extern-types.rs
diff --git a/src/test/ui/consts/const-eval/livedrop.rs b/tests/ui/consts/const-eval/livedrop.rs
index 543f1f0ec..543f1f0ec 100644
--- a/src/test/ui/consts/const-eval/livedrop.rs
+++ b/tests/ui/consts/const-eval/livedrop.rs
diff --git a/src/test/ui/consts/const-eval/livedrop.stderr b/tests/ui/consts/const-eval/livedrop.stderr
index d04fdb70e..d04fdb70e 100644
--- a/src/test/ui/consts/const-eval/livedrop.stderr
+++ b/tests/ui/consts/const-eval/livedrop.stderr
diff --git a/src/test/ui/consts/const-eval/match-test-ptr-null.rs b/tests/ui/consts/const-eval/match-test-ptr-null.rs
index 4af97b548..4af97b548 100644
--- a/src/test/ui/consts/const-eval/match-test-ptr-null.rs
+++ b/tests/ui/consts/const-eval/match-test-ptr-null.rs
diff --git a/src/test/ui/consts/const-eval/match-test-ptr-null.stderr b/tests/ui/consts/const-eval/match-test-ptr-null.stderr
index 05c3951c1..05c3951c1 100644
--- a/src/test/ui/consts/const-eval/match-test-ptr-null.stderr
+++ b/tests/ui/consts/const-eval/match-test-ptr-null.stderr
diff --git a/src/test/ui/consts/const-eval/mod-static-with-const-fn.rs b/tests/ui/consts/const-eval/mod-static-with-const-fn.rs
index b6b74e67d..b6b74e67d 100644
--- a/src/test/ui/consts/const-eval/mod-static-with-const-fn.rs
+++ b/tests/ui/consts/const-eval/mod-static-with-const-fn.rs
diff --git a/src/test/ui/consts/const-eval/mod-static-with-const-fn.stderr b/tests/ui/consts/const-eval/mod-static-with-const-fn.stderr
index d127d1d45..d127d1d45 100644
--- a/src/test/ui/consts/const-eval/mod-static-with-const-fn.stderr
+++ b/tests/ui/consts/const-eval/mod-static-with-const-fn.stderr
diff --git a/src/test/ui/consts/const-eval/no_lint_for_statically_known_error.rs b/tests/ui/consts/const-eval/no_lint_for_statically_known_error.rs
index 910ca3c4b..910ca3c4b 100644
--- a/src/test/ui/consts/const-eval/no_lint_for_statically_known_error.rs
+++ b/tests/ui/consts/const-eval/no_lint_for_statically_known_error.rs
diff --git a/src/test/ui/consts/const-eval/nrvo.rs b/tests/ui/consts/const-eval/nrvo.rs
index 1d2c6acc0..1d2c6acc0 100644
--- a/src/test/ui/consts/const-eval/nrvo.rs
+++ b/tests/ui/consts/const-eval/nrvo.rs
diff --git a/src/test/ui/consts/const-eval/panic-assoc-never-type.rs b/tests/ui/consts/const-eval/panic-assoc-never-type.rs
index 28edf5144..28edf5144 100644
--- a/src/test/ui/consts/const-eval/panic-assoc-never-type.rs
+++ b/tests/ui/consts/const-eval/panic-assoc-never-type.rs
diff --git a/src/test/ui/consts/const-eval/panic-assoc-never-type.stderr b/tests/ui/consts/const-eval/panic-assoc-never-type.stderr
index 7c36a3a42..7c36a3a42 100644
--- a/src/test/ui/consts/const-eval/panic-assoc-never-type.stderr
+++ b/tests/ui/consts/const-eval/panic-assoc-never-type.stderr
diff --git a/src/test/ui/consts/const-eval/panic-never-type.rs b/tests/ui/consts/const-eval/panic-never-type.rs
index a9e9026d9..a9e9026d9 100644
--- a/src/test/ui/consts/const-eval/panic-never-type.rs
+++ b/tests/ui/consts/const-eval/panic-never-type.rs
diff --git a/src/test/ui/consts/const-eval/panic-never-type.stderr b/tests/ui/consts/const-eval/panic-never-type.stderr
index 6bff14a45..6bff14a45 100644
--- a/src/test/ui/consts/const-eval/panic-never-type.stderr
+++ b/tests/ui/consts/const-eval/panic-never-type.stderr
diff --git a/src/test/ui/consts/const-eval/partial_ptr_overwrite.rs b/tests/ui/consts/const-eval/partial_ptr_overwrite.rs
index d6c768868..d6c768868 100644
--- a/src/test/ui/consts/const-eval/partial_ptr_overwrite.rs
+++ b/tests/ui/consts/const-eval/partial_ptr_overwrite.rs
diff --git a/src/test/ui/consts/const-eval/partial_ptr_overwrite.stderr b/tests/ui/consts/const-eval/partial_ptr_overwrite.stderr
index 13ca4379b..13ca4379b 100644
--- a/src/test/ui/consts/const-eval/partial_ptr_overwrite.stderr
+++ b/tests/ui/consts/const-eval/partial_ptr_overwrite.stderr
diff --git a/src/test/ui/consts/const-eval/promote-static.rs b/tests/ui/consts/const-eval/promote-static.rs
index d3c663c53..d3c663c53 100644
--- a/src/test/ui/consts/const-eval/promote-static.rs
+++ b/tests/ui/consts/const-eval/promote-static.rs
diff --git a/src/test/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs b/tests/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs
index edda10e6e..edda10e6e 100644
--- a/src/test/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs
+++ b/tests/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs
diff --git a/src/test/ui/consts/const-eval/promoted_const_fn_fail.rs b/tests/ui/consts/const-eval/promoted_const_fn_fail.rs
index 656dd33e1..656dd33e1 100644
--- a/src/test/ui/consts/const-eval/promoted_const_fn_fail.rs
+++ b/tests/ui/consts/const-eval/promoted_const_fn_fail.rs
diff --git a/src/test/ui/consts/const-eval/promoted_const_fn_fail.stderr b/tests/ui/consts/const-eval/promoted_const_fn_fail.stderr
index 2d4e7c83d..2d4e7c83d 100644
--- a/src/test/ui/consts/const-eval/promoted_const_fn_fail.stderr
+++ b/tests/ui/consts/const-eval/promoted_const_fn_fail.stderr
diff --git a/src/test/ui/consts/const-eval/promoted_const_fn_fail_deny_const_err.rs b/tests/ui/consts/const-eval/promoted_const_fn_fail_deny_const_err.rs
index 5009dbcb9..5009dbcb9 100644
--- a/src/test/ui/consts/const-eval/promoted_const_fn_fail_deny_const_err.rs
+++ b/tests/ui/consts/const-eval/promoted_const_fn_fail_deny_const_err.rs
diff --git a/src/test/ui/consts/const-eval/promoted_const_fn_fail_deny_const_err.stderr b/tests/ui/consts/const-eval/promoted_const_fn_fail_deny_const_err.stderr
index 9ebae3a18..9ebae3a18 100644
--- a/src/test/ui/consts/const-eval/promoted_const_fn_fail_deny_const_err.stderr
+++ b/tests/ui/consts/const-eval/promoted_const_fn_fail_deny_const_err.stderr
diff --git a/src/test/ui/consts/const-eval/promoted_errors.noopt.stderr b/tests/ui/consts/const-eval/promoted_errors.noopt.stderr
index 2a254bfde..2a254bfde 100644
--- a/src/test/ui/consts/const-eval/promoted_errors.noopt.stderr
+++ b/tests/ui/consts/const-eval/promoted_errors.noopt.stderr
diff --git a/src/test/ui/consts/const-eval/promoted_errors.opt.stderr b/tests/ui/consts/const-eval/promoted_errors.opt.stderr
index 2a254bfde..2a254bfde 100644
--- a/src/test/ui/consts/const-eval/promoted_errors.opt.stderr
+++ b/tests/ui/consts/const-eval/promoted_errors.opt.stderr
diff --git a/src/test/ui/consts/const-eval/promoted_errors.opt_with_overflow_checks.stderr b/tests/ui/consts/const-eval/promoted_errors.opt_with_overflow_checks.stderr
index 2a254bfde..2a254bfde 100644
--- a/src/test/ui/consts/const-eval/promoted_errors.opt_with_overflow_checks.stderr
+++ b/tests/ui/consts/const-eval/promoted_errors.opt_with_overflow_checks.stderr
diff --git a/src/test/ui/consts/const-eval/promoted_errors.rs b/tests/ui/consts/const-eval/promoted_errors.rs
index 2c42d0356..2c42d0356 100644
--- a/src/test/ui/consts/const-eval/promoted_errors.rs
+++ b/tests/ui/consts/const-eval/promoted_errors.rs
diff --git a/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.rs b/tests/ui/consts/const-eval/promoted_raw_ptr_ops.rs
index 1800b0a97..1800b0a97 100644
--- a/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.rs
+++ b/tests/ui/consts/const-eval/promoted_raw_ptr_ops.rs
diff --git a/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.stderr b/tests/ui/consts/const-eval/promoted_raw_ptr_ops.stderr
index 01fcf2ec2..01fcf2ec2 100644
--- a/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.stderr
+++ b/tests/ui/consts/const-eval/promoted_raw_ptr_ops.stderr
diff --git a/tests/ui/consts/const-eval/raw-bytes.32bit.stderr b/tests/ui/consts/const-eval/raw-bytes.32bit.stderr
new file mode 100644
index 000000000..91a426580
--- /dev/null
+++ b/tests/ui/consts/const-eval/raw-bytes.32bit.stderr
@@ -0,0 +1,596 @@
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:20:1
+   |
+LL | const BAD_ENUM: Enum = unsafe { mem::transmute(1usize) };
+   | ^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-tag>: encountered 0x00000001, but expected a valid enum tag
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               01 00 00 00                                     │ ....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:28:1
+   |
+LL | const BAD_ENUM2: Enum2 = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-tag>: encountered 0x00000000, but expected a valid enum tag
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               00 00 00 00                                     │ ....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:42:1
+   |
+LL | const BAD_UNINHABITED_VARIANT1: UninhDiscriminant = unsafe { mem::transmute(1u8) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(B)>.0: encountered a value of the never type `!`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 1, align: 1) {
+               01                                              │ .
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:44:1
+   |
+LL | const BAD_UNINHABITED_VARIANT2: UninhDiscriminant = unsafe { mem::transmute(3u8) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(D)>.0: encountered a value of uninhabited type Never
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 1, align: 1) {
+               03                                              │ .
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:50:1
+   |
+LL | const BAD_OPTION_CHAR: Option<(char, char)> = Some(('x', unsafe { mem::transmute(!0u32) }));
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(Some)>.0.1: encountered 0xffffffff, but expected a valid unicode scalar value (in `0..=0x10FFFF` but not in `0xD800..=0xDFFF`)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               78 00 00 00 ff ff ff ff                         │ x.......
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:54:1
+   |
+LL | const NULL_PTR: NonNull<u8> = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0, but expected something greater or equal to 1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               00 00 00 00                                     │ ....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:57:1
+   |
+LL | const NULL_U8: NonZeroU8 = unsafe { mem::transmute(0u8) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0, but expected something greater or equal to 1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 1, align: 1) {
+               00                                              │ .
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:59:1
+   |
+LL | const NULL_USIZE: NonZeroUsize = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0, but expected something greater or equal to 1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               00 00 00 00                                     │ ....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:65:1
+   |
+LL | const BAD_RANGE1: RestrictedRange1 = unsafe { RestrictedRange1(42) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 42, but expected something in the range 10..=30
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               2a 00 00 00                                     │ *...
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:71:1
+   |
+LL | const BAD_RANGE2: RestrictedRange2 = unsafe { RestrictedRange2(20) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 20, but expected something less or equal to 10, or greater or equal to 30
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               14 00 00 00                                     │ ....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:74:1
+   |
+LL | const NULL_FAT_PTR: NonNull<dyn Send> = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0, but expected something greater or equal to 1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               00 00 00 00 ╾ALLOC_ID╼                         │ ....╾──╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:82:1
+   |
+LL | const UNALIGNED: &u16 = unsafe { mem::transmute(&[0u8; 4]) };
+   | ^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered an unaligned reference (required 2 byte alignment but found 1)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               ╾ALLOC_ID╼                                     │ ╾──╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:86:1
+   |
+LL | const UNALIGNED_BOX: Box<u16> = unsafe { mem::transmute(&[0u8; 4]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered an unaligned box (required 2 byte alignment but found 1)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               ╾ALLOC_ID╼                                     │ ╾──╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:90:1
+   |
+LL | const NULL: &u16 = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^ constructing invalid value: encountered a null reference
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               00 00 00 00                                     │ ....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:93:1
+   |
+LL | const NULL_BOX: Box<u16> = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a null box
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               00 00 00 00                                     │ ....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:96:1
+   |
+LL | const USIZE_AS_REF: &'static u8 = unsafe { mem::transmute(1337usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling reference (address 0x539 is unallocated)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               39 05 00 00                                     │ 9...
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:99:1
+   |
+LL | const USIZE_AS_BOX: Box<u8> = unsafe { mem::transmute(1337usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling box (address 0x539 is unallocated)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               39 05 00 00                                     │ 9...
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:102:1
+   |
+LL | const NULL_FN_PTR: fn() = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered null pointer, but expected a function pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               00 00 00 00                                     │ ....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:104:1
+   |
+LL | const DANGLING_FN_PTR: fn() = unsafe { mem::transmute(13usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0xd[noalloc], but expected a function pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               0d 00 00 00                                     │ ....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:106:1
+   |
+LL | const DATA_FN_PTR: fn() = unsafe { mem::transmute(&13) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered allocN, but expected a function pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               ╾ALLOC_ID╼                                     │ ╾──╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:112:1
+   |
+LL | const BAD_BAD_REF: &Bar = unsafe { mem::transmute(1usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a reference pointing to uninhabited type Bar
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               01 00 00 00                                     │ ....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:137:1
+   |
+LL | const STR_TOO_LONG: &str = unsafe { mem::transmute((&42u8, 999usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling reference (going beyond the bounds of its allocation)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ e7 03 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:139:1
+   |
+LL | const NESTED_STR_MUCH_TOO_LONG: (&str,) = (unsafe { mem::transmute((&42, usize::MAX)) },);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered invalid reference metadata: slice is bigger than largest supported object
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ ff ff ff ff                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:141:1
+   |
+LL | const MY_STR_MUCH_TOO_LONG: &MyStr = unsafe { mem::transmute((&42u8, usize::MAX)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered invalid reference metadata: slice is bigger than largest supported object
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ ff ff ff ff                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:144:1
+   |
+LL | const STR_NO_INIT: &str = unsafe { mem::transmute::<&[_], _>(&[MaybeUninit::<u8> { uninit: () }]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>: encountered uninitialized data in `str`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ 01 00 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:146:1
+   |
+LL | const MYSTR_NO_INIT: &MyStr = unsafe { mem::transmute::<&[_], _>(&[MaybeUninit::<u8> { uninit: () }]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>.0: encountered uninitialized data in `str`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ 01 00 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:148:1
+   |
+LL | const MYSTR_NO_INIT_ISSUE83182: &MyStr = unsafe { mem::transmute::<&[_], _>(&[&()]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ 01 00 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:152:1
+   |
+LL | const SLICE_TOO_LONG: &[u8] = unsafe { mem::transmute((&42u8, 999usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling reference (going beyond the bounds of its allocation)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ e7 03 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:154:1
+   |
+LL | const SLICE_TOO_LONG_OVERFLOW: &[u32] = unsafe { mem::transmute((&42u32, isize::MAX)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered invalid reference metadata: slice is bigger than largest supported object
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ ff ff ff 7f                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:157:1
+   |
+LL | const SLICE_TOO_LONG_BOX: Box<[u8]> = unsafe { mem::transmute((&42u8, 999usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling box (going beyond the bounds of its allocation)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ e7 03 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:160:1
+   |
+LL | const SLICE_CONTENT_INVALID: &[bool] = &[unsafe { mem::transmute(3u8) }];
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered 0x03, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               ╾ALLOC_ID╼                                     │ ╾──╼
+           }
+
+note: erroneous constant used
+  --> $DIR/raw-bytes.rs:160:40
+   |
+LL | const SLICE_CONTENT_INVALID: &[bool] = &[unsafe { mem::transmute(3u8) }];
+   |                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:166:1
+   |
+LL | const MYSLICE_PREFIX_BAD: &MySliceBool = &MySlice(unsafe { mem::transmute(3u8) }, [false]);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>.0: encountered 0x03, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               ╾ALLOC_ID╼                                     │ ╾──╼
+           }
+
+note: erroneous constant used
+  --> $DIR/raw-bytes.rs:166:42
+   |
+LL | const MYSLICE_PREFIX_BAD: &MySliceBool = &MySlice(unsafe { mem::transmute(3u8) }, [false]);
+   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:170:1
+   |
+LL | const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { mem::transmute(3u8) }]);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>.1[0]: encountered 0x03, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               ╾ALLOC_ID╼                                     │ ╾──╼
+           }
+
+note: erroneous constant used
+  --> $DIR/raw-bytes.rs:170:42
+   |
+LL | const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { mem::transmute(3u8) }]);
+   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:175:1
+   |
+LL | const TRAIT_OBJ_SHORT_VTABLE_1: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, &3u8))) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered allocN, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ ╾ALLOC_ID╼                         │ ╾──╼╾──╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:179:1
+   |
+LL | const TRAIT_OBJ_SHORT_VTABLE_2: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, &3u64))) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered allocN, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ ╾ALLOC_ID╼                         │ ╾──╼╾──╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:183:1
+   |
+LL | const TRAIT_OBJ_INT_VTABLE: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, 4usize))) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered 0x4[noalloc], but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ 04 00 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:186:1
+   |
+LL | const TRAIT_OBJ_BAD_DROP_FN_NOT_FN_PTR: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, &[&42u8; 8]))) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered allocN, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ ╾ALLOC_ID╼                         │ ╾──╼╾──╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:190:1
+   |
+LL | const TRAIT_OBJ_CONTENT_INVALID: &dyn Trait = unsafe { mem::transmute::<_, &bool>(&3u8) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>.<dyn-downcast>: encountered 0x03, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ ╾ALLOC_ID╼                         │ ╾──╼╾──╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:194:1
+   |
+LL | const RAW_TRAIT_OBJ_VTABLE_NULL: *const dyn Trait = unsafe { mem::transmute((&92u8, 0usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered null pointer, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ 00 00 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:196:1
+   |
+LL | const RAW_TRAIT_OBJ_VTABLE_INVALID: *const dyn Trait = unsafe { mem::transmute((&92u8, &3u64)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered allocN, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ ╾ALLOC_ID╼                         │ ╾──╼╾──╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:201:1
+   |
+LL | const LAYOUT_INVALID_ZERO: Layout = unsafe { Layout::from_size_align_unchecked(0x1000, 0x00) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .align.0.<enum-tag>: encountered 0x00000000, but expected a valid enum tag
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               00 10 00 00 00 00 00 00                         │ ........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:205:1
+   |
+LL | const LAYOUT_INVALID_THREE: Layout = unsafe { Layout::from_size_align_unchecked(9, 3) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .align.0.<enum-tag>: encountered 0x00000003, but expected a valid enum tag
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               09 00 00 00 03 00 00 00                         │ ........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:209:1
+   |
+LL | const _: &[!; 1] = unsafe { &*(1_usize as *const [!; 1]) };
+   | ^^^^^^^^^^^^^^^^ constructing invalid value: encountered a reference pointing to uninhabited type [!; 1]
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               01 00 00 00                                     │ ....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:210:1
+   |
+LL | const _: &[!] = unsafe { &*(1_usize as *const [!; 1]) };
+   | ^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered a value of the never type `!`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               01 00 00 00 01 00 00 00                         │ ........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:211:1
+   |
+LL | const _: &[!] = unsafe { &*(1_usize as *const [!; 42]) };
+   | ^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered a value of the never type `!`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               01 00 00 00 2a 00 00 00                         │ ....*...
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:215:1
+   |
+LL | pub static S4: &[u8] = unsafe { from_raw_parts((&D1) as *const _ as _, 1) };
+   | ^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered uninitialized bytes
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ 01 00 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:218:1
+   |
+LL | pub static S5: &[u8] = unsafe { from_raw_parts((&D3) as *const _ as _, mem::size_of::<&u32>()) };
+   | ^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ 04 00 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:221:1
+   |
+LL | pub static S6: &[bool] = unsafe { from_raw_parts((&D0) as *const _ as _, 4) };
+   | ^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered 0x11, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ 04 00 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:225:1
+   |
+LL | pub static S7: &[u16] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[1]: encountered uninitialized bytes
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID+0x2╼ 04 00 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:232:1
+   |
+LL | pub static R4: &[u8] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered uninitialized bytes
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ 01 00 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:237:1
+   |
+LL | pub static R5: &[u8] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ 04 00 00 00                         │ ╾──╼....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:242:1
+   |
+LL | pub static R6: &[bool] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered 0x11, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               ╾ALLOC_ID╼ 04 00 00 00                         │ ╾──╼....
+           }
+
+error: aborting due to 52 previous errors
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/tests/ui/consts/const-eval/raw-bytes.64bit.stderr b/tests/ui/consts/const-eval/raw-bytes.64bit.stderr
new file mode 100644
index 000000000..e4c5e62f6
--- /dev/null
+++ b/tests/ui/consts/const-eval/raw-bytes.64bit.stderr
@@ -0,0 +1,596 @@
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:20:1
+   |
+LL | const BAD_ENUM: Enum = unsafe { mem::transmute(1usize) };
+   | ^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-tag>: encountered 0x0000000000000001, but expected a valid enum tag
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               01 00 00 00 00 00 00 00                         │ ........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:28:1
+   |
+LL | const BAD_ENUM2: Enum2 = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-tag>: encountered 0x0000000000000000, but expected a valid enum tag
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               00 00 00 00 00 00 00 00                         │ ........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:42:1
+   |
+LL | const BAD_UNINHABITED_VARIANT1: UninhDiscriminant = unsafe { mem::transmute(1u8) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(B)>.0: encountered a value of the never type `!`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 1, align: 1) {
+               01                                              │ .
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:44:1
+   |
+LL | const BAD_UNINHABITED_VARIANT2: UninhDiscriminant = unsafe { mem::transmute(3u8) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(D)>.0: encountered a value of uninhabited type Never
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 1, align: 1) {
+               03                                              │ .
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:50:1
+   |
+LL | const BAD_OPTION_CHAR: Option<(char, char)> = Some(('x', unsafe { mem::transmute(!0u32) }));
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(Some)>.0.1: encountered 0xffffffff, but expected a valid unicode scalar value (in `0..=0x10FFFF` but not in `0xD800..=0xDFFF`)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 4) {
+               78 00 00 00 ff ff ff ff                         │ x.......
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:54:1
+   |
+LL | const NULL_PTR: NonNull<u8> = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0, but expected something greater or equal to 1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               00 00 00 00 00 00 00 00                         │ ........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:57:1
+   |
+LL | const NULL_U8: NonZeroU8 = unsafe { mem::transmute(0u8) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0, but expected something greater or equal to 1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 1, align: 1) {
+               00                                              │ .
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:59:1
+   |
+LL | const NULL_USIZE: NonZeroUsize = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0, but expected something greater or equal to 1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               00 00 00 00 00 00 00 00                         │ ........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:65:1
+   |
+LL | const BAD_RANGE1: RestrictedRange1 = unsafe { RestrictedRange1(42) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 42, but expected something in the range 10..=30
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               2a 00 00 00                                     │ *...
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:71:1
+   |
+LL | const BAD_RANGE2: RestrictedRange2 = unsafe { RestrictedRange2(20) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 20, but expected something less or equal to 10, or greater or equal to 30
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 4, align: 4) {
+               14 00 00 00                                     │ ....
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:74:1
+   |
+LL | const NULL_FAT_PTR: NonNull<dyn Send> = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0, but expected something greater or equal to 1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               00 00 00 00 00 00 00 00 ╾ALLOC_ID╼ │ ........╾──────╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:82:1
+   |
+LL | const UNALIGNED: &u16 = unsafe { mem::transmute(&[0u8; 4]) };
+   | ^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered an unaligned reference (required 2 byte alignment but found 1)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               ╾ALLOC_ID╼                         │ ╾──────╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:86:1
+   |
+LL | const UNALIGNED_BOX: Box<u16> = unsafe { mem::transmute(&[0u8; 4]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered an unaligned box (required 2 byte alignment but found 1)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               ╾ALLOC_ID╼                         │ ╾──────╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:90:1
+   |
+LL | const NULL: &u16 = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^ constructing invalid value: encountered a null reference
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               00 00 00 00 00 00 00 00                         │ ........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:93:1
+   |
+LL | const NULL_BOX: Box<u16> = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a null box
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               00 00 00 00 00 00 00 00                         │ ........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:96:1
+   |
+LL | const USIZE_AS_REF: &'static u8 = unsafe { mem::transmute(1337usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling reference (address 0x539 is unallocated)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               39 05 00 00 00 00 00 00                         │ 9.......
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:99:1
+   |
+LL | const USIZE_AS_BOX: Box<u8> = unsafe { mem::transmute(1337usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling box (address 0x539 is unallocated)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               39 05 00 00 00 00 00 00                         │ 9.......
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:102:1
+   |
+LL | const NULL_FN_PTR: fn() = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered null pointer, but expected a function pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               00 00 00 00 00 00 00 00                         │ ........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:104:1
+   |
+LL | const DANGLING_FN_PTR: fn() = unsafe { mem::transmute(13usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0xd[noalloc], but expected a function pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               0d 00 00 00 00 00 00 00                         │ ........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:106:1
+   |
+LL | const DATA_FN_PTR: fn() = unsafe { mem::transmute(&13) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered allocN, but expected a function pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               ╾ALLOC_ID╼                         │ ╾──────╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:112:1
+   |
+LL | const BAD_BAD_REF: &Bar = unsafe { mem::transmute(1usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a reference pointing to uninhabited type Bar
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               01 00 00 00 00 00 00 00                         │ ........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:137:1
+   |
+LL | const STR_TOO_LONG: &str = unsafe { mem::transmute((&42u8, 999usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling reference (going beyond the bounds of its allocation)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ e7 03 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:139:1
+   |
+LL | const NESTED_STR_MUCH_TOO_LONG: (&str,) = (unsafe { mem::transmute((&42, usize::MAX)) },);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered invalid reference metadata: slice is bigger than largest supported object
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ ff ff ff ff ff ff ff ff │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:141:1
+   |
+LL | const MY_STR_MUCH_TOO_LONG: &MyStr = unsafe { mem::transmute((&42u8, usize::MAX)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered invalid reference metadata: slice is bigger than largest supported object
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ ff ff ff ff ff ff ff ff │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:144:1
+   |
+LL | const STR_NO_INIT: &str = unsafe { mem::transmute::<&[_], _>(&[MaybeUninit::<u8> { uninit: () }]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>: encountered uninitialized data in `str`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ 01 00 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:146:1
+   |
+LL | const MYSTR_NO_INIT: &MyStr = unsafe { mem::transmute::<&[_], _>(&[MaybeUninit::<u8> { uninit: () }]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>.0: encountered uninitialized data in `str`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ 01 00 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:148:1
+   |
+LL | const MYSTR_NO_INIT_ISSUE83182: &MyStr = unsafe { mem::transmute::<&[_], _>(&[&()]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ 01 00 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:152:1
+   |
+LL | const SLICE_TOO_LONG: &[u8] = unsafe { mem::transmute((&42u8, 999usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling reference (going beyond the bounds of its allocation)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ e7 03 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:154:1
+   |
+LL | const SLICE_TOO_LONG_OVERFLOW: &[u32] = unsafe { mem::transmute((&42u32, isize::MAX)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered invalid reference metadata: slice is bigger than largest supported object
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ ff ff ff ff ff ff ff 7f │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:157:1
+   |
+LL | const SLICE_TOO_LONG_BOX: Box<[u8]> = unsafe { mem::transmute((&42u8, 999usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling box (going beyond the bounds of its allocation)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ e7 03 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:160:1
+   |
+LL | const SLICE_CONTENT_INVALID: &[bool] = &[unsafe { mem::transmute(3u8) }];
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered 0x03, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               ╾ALLOC_ID╼                         │ ╾──────╼
+           }
+
+note: erroneous constant used
+  --> $DIR/raw-bytes.rs:160:40
+   |
+LL | const SLICE_CONTENT_INVALID: &[bool] = &[unsafe { mem::transmute(3u8) }];
+   |                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:166:1
+   |
+LL | const MYSLICE_PREFIX_BAD: &MySliceBool = &MySlice(unsafe { mem::transmute(3u8) }, [false]);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>.0: encountered 0x03, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               ╾ALLOC_ID╼                         │ ╾──────╼
+           }
+
+note: erroneous constant used
+  --> $DIR/raw-bytes.rs:166:42
+   |
+LL | const MYSLICE_PREFIX_BAD: &MySliceBool = &MySlice(unsafe { mem::transmute(3u8) }, [false]);
+   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:170:1
+   |
+LL | const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { mem::transmute(3u8) }]);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>.1[0]: encountered 0x03, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               ╾ALLOC_ID╼                         │ ╾──────╼
+           }
+
+note: erroneous constant used
+  --> $DIR/raw-bytes.rs:170:42
+   |
+LL | const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { mem::transmute(3u8) }]);
+   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:175:1
+   |
+LL | const TRAIT_OBJ_SHORT_VTABLE_1: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, &3u8))) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered allocN, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ ╾ALLOC_ID╼ │ ╾──────╼╾──────╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:179:1
+   |
+LL | const TRAIT_OBJ_SHORT_VTABLE_2: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, &3u64))) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered allocN, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ ╾ALLOC_ID╼ │ ╾──────╼╾──────╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:183:1
+   |
+LL | const TRAIT_OBJ_INT_VTABLE: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, 4usize))) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered 0x4[noalloc], but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ 04 00 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:186:1
+   |
+LL | const TRAIT_OBJ_BAD_DROP_FN_NOT_FN_PTR: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, &[&42u8; 8]))) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered allocN, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ ╾ALLOC_ID╼ │ ╾──────╼╾──────╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:190:1
+   |
+LL | const TRAIT_OBJ_CONTENT_INVALID: &dyn Trait = unsafe { mem::transmute::<_, &bool>(&3u8) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>.<dyn-downcast>: encountered 0x03, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ ╾ALLOC_ID╼ │ ╾──────╼╾──────╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:194:1
+   |
+LL | const RAW_TRAIT_OBJ_VTABLE_NULL: *const dyn Trait = unsafe { mem::transmute((&92u8, 0usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered null pointer, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ 00 00 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:196:1
+   |
+LL | const RAW_TRAIT_OBJ_VTABLE_INVALID: *const dyn Trait = unsafe { mem::transmute((&92u8, &3u64)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered allocN, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ ╾ALLOC_ID╼ │ ╾──────╼╾──────╼
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:201:1
+   |
+LL | const LAYOUT_INVALID_ZERO: Layout = unsafe { Layout::from_size_align_unchecked(0x1000, 0x00) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .align.0.<enum-tag>: encountered 0x0000000000000000, but expected a valid enum tag
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               00 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:205:1
+   |
+LL | const LAYOUT_INVALID_THREE: Layout = unsafe { Layout::from_size_align_unchecked(9, 3) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .align.0.<enum-tag>: encountered 0x0000000000000003, but expected a valid enum tag
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               09 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 │ ................
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:209:1
+   |
+LL | const _: &[!; 1] = unsafe { &*(1_usize as *const [!; 1]) };
+   | ^^^^^^^^^^^^^^^^ constructing invalid value: encountered a reference pointing to uninhabited type [!; 1]
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 8, align: 8) {
+               01 00 00 00 00 00 00 00                         │ ........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:210:1
+   |
+LL | const _: &[!] = unsafe { &*(1_usize as *const [!; 1]) };
+   | ^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered a value of the never type `!`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               01 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 │ ................
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:211:1
+   |
+LL | const _: &[!] = unsafe { &*(1_usize as *const [!; 42]) };
+   | ^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered a value of the never type `!`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               01 00 00 00 00 00 00 00 2a 00 00 00 00 00 00 00 │ ........*.......
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:215:1
+   |
+LL | pub static S4: &[u8] = unsafe { from_raw_parts((&D1) as *const _ as _, 1) };
+   | ^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered uninitialized bytes
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ 01 00 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:218:1
+   |
+LL | pub static S5: &[u8] = unsafe { from_raw_parts((&D3) as *const _ as _, mem::size_of::<&u32>()) };
+   | ^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ 08 00 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:221:1
+   |
+LL | pub static S6: &[bool] = unsafe { from_raw_parts((&D0) as *const _ as _, 4) };
+   | ^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered 0x11, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ 04 00 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:225:1
+   |
+LL | pub static S7: &[u16] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[1]: encountered uninitialized bytes
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID+0x2╼ 04 00 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:232:1
+   |
+LL | pub static R4: &[u8] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered uninitialized bytes
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ 01 00 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:237:1
+   |
+LL | pub static R5: &[u8] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ 08 00 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/raw-bytes.rs:242:1
+   |
+LL | pub static R6: &[bool] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered 0x11, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: 16, align: 8) {
+               ╾ALLOC_ID╼ 04 00 00 00 00 00 00 00 │ ╾──────╼........
+           }
+
+error: aborting due to 52 previous errors
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/tests/ui/consts/const-eval/raw-bytes.rs b/tests/ui/consts/const-eval/raw-bytes.rs
new file mode 100644
index 000000000..6c1238c0a
--- /dev/null
+++ b/tests/ui/consts/const-eval/raw-bytes.rs
@@ -0,0 +1,263 @@
+// stderr-per-bitwidth
+// ignore-endian-big
+// ignore-tidy-linelength
+// normalize-stderr-test "╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼" -> "╾ALLOC_ID$2╼"
+// normalize-stderr-test "alloc\d+" -> "allocN"
+#![feature(never_type, rustc_attrs, ptr_metadata, slice_from_ptr_range, const_slice_from_ptr_range)]
+#![allow(invalid_value)]
+
+use std::mem;
+use std::alloc::Layout;
+use std::ptr::NonNull;
+use std::num::{NonZeroU8, NonZeroUsize};
+use std::slice::{from_ptr_range, from_raw_parts};
+
+#[repr(usize)]
+#[derive(Copy, Clone)]
+enum Enum {
+    A = 0,
+}
+const BAD_ENUM: Enum = unsafe { mem::transmute(1usize) };
+//~^ ERROR is undefined behavior
+
+#[repr(usize)]
+#[derive(Copy, Clone)]
+enum Enum2 {
+    A = 2,
+}
+const BAD_ENUM2: Enum2 = unsafe { mem::transmute(0usize) };
+//~^ ERROR is undefined behavior
+
+#[derive(Copy, Clone)]
+enum Never {}
+
+// An enum with 3 variants of which some are uninhabited -- so the uninhabited variants *do*
+// have a discriminant.
+enum UninhDiscriminant {
+    A,
+    B(!),
+    C,
+    D(Never),
+}
+const BAD_UNINHABITED_VARIANT1: UninhDiscriminant = unsafe { mem::transmute(1u8) };
+//~^ ERROR is undefined behavior
+const BAD_UNINHABITED_VARIANT2: UninhDiscriminant = unsafe { mem::transmute(3u8) };
+//~^ ERROR is undefined behavior
+
+// Invalid enum field content (mostly to test printing of paths for enum tuple
+// variants and tuples).
+// Need to create something which does not clash with enum layout optimizations.
+const BAD_OPTION_CHAR: Option<(char, char)> = Some(('x', unsafe { mem::transmute(!0u32) }));
+//~^ ERROR is undefined behavior
+
+
+const NULL_PTR: NonNull<u8> = unsafe { mem::transmute(0usize) };
+//~^ ERROR it is undefined behavior to use this value
+
+const NULL_U8: NonZeroU8 = unsafe { mem::transmute(0u8) };
+//~^ ERROR it is undefined behavior to use this value
+const NULL_USIZE: NonZeroUsize = unsafe { mem::transmute(0usize) };
+//~^ ERROR it is undefined behavior to use this value
+
+#[rustc_layout_scalar_valid_range_start(10)]
+#[rustc_layout_scalar_valid_range_end(30)]
+struct RestrictedRange1(u32);
+const BAD_RANGE1: RestrictedRange1 = unsafe { RestrictedRange1(42) };
+//~^ ERROR it is undefined behavior to use this value
+
+#[rustc_layout_scalar_valid_range_start(30)]
+#[rustc_layout_scalar_valid_range_end(10)]
+struct RestrictedRange2(u32);
+const BAD_RANGE2: RestrictedRange2 = unsafe { RestrictedRange2(20) };
+//~^ ERROR it is undefined behavior to use this value
+
+const NULL_FAT_PTR: NonNull<dyn Send> = unsafe {
+//~^ ERROR it is undefined behavior to use this value
+    let x: &dyn Send = &42;
+    let meta = std::ptr::metadata(x);
+    mem::transmute((0_usize, meta))
+};
+
+
+const UNALIGNED: &u16 = unsafe { mem::transmute(&[0u8; 4]) };
+//~^ ERROR it is undefined behavior to use this value
+//~| constructing invalid value: encountered an unaligned reference (required 2 byte alignment but found 1)
+
+const UNALIGNED_BOX: Box<u16> = unsafe { mem::transmute(&[0u8; 4]) };
+//~^ ERROR it is undefined behavior to use this value
+//~| constructing invalid value: encountered an unaligned box (required 2 byte alignment but found 1)
+
+const NULL: &u16 = unsafe { mem::transmute(0usize) };
+//~^ ERROR it is undefined behavior to use this value
+
+const NULL_BOX: Box<u16> = unsafe { mem::transmute(0usize) };
+//~^ ERROR it is undefined behavior to use this value
+
+const USIZE_AS_REF: &'static u8 = unsafe { mem::transmute(1337usize) };
+//~^ ERROR it is undefined behavior to use this value
+
+const USIZE_AS_BOX: Box<u8> = unsafe { mem::transmute(1337usize) };
+//~^ ERROR it is undefined behavior to use this value
+
+const NULL_FN_PTR: fn() = unsafe { mem::transmute(0usize) };
+//~^ ERROR it is undefined behavior to use this value
+const DANGLING_FN_PTR: fn() = unsafe { mem::transmute(13usize) };
+//~^ ERROR it is undefined behavior to use this value
+const DATA_FN_PTR: fn() = unsafe { mem::transmute(&13) };
+//~^ ERROR it is undefined behavior to use this value
+
+#[derive(Copy, Clone)]
+enum Bar {}
+
+const BAD_BAD_REF: &Bar = unsafe { mem::transmute(1usize) };
+//~^ ERROR it is undefined behavior to use this value
+
+
+/// A newtype wrapper to prevent MIR generation from inserting reborrows that would affect the error
+/// message.
+#[repr(transparent)]
+struct W<T>(T);
+
+#[repr(C)]
+union MaybeUninit<T: Copy> {
+    uninit: (),
+    init: T,
+}
+
+trait Trait {}
+impl Trait for bool {}
+
+// custom unsized type
+struct MyStr(str);
+
+// custom unsized type with sized fields
+struct MySlice<T: ?Sized>(bool, T);
+type MySliceBool = MySlice<[bool]>;
+
+const STR_TOO_LONG: &str = unsafe { mem::transmute((&42u8, 999usize)) };
+//~^ ERROR it is undefined behavior to use this value
+const NESTED_STR_MUCH_TOO_LONG: (&str,) = (unsafe { mem::transmute((&42, usize::MAX)) },);
+//~^ ERROR it is undefined behavior to use this value
+const MY_STR_MUCH_TOO_LONG: &MyStr = unsafe { mem::transmute((&42u8, usize::MAX)) };
+//~^ ERROR it is undefined behavior to use this value
+
+const STR_NO_INIT: &str = unsafe { mem::transmute::<&[_], _>(&[MaybeUninit::<u8> { uninit: () }]) };
+//~^ ERROR it is undefined behavior to use this value
+const MYSTR_NO_INIT: &MyStr = unsafe { mem::transmute::<&[_], _>(&[MaybeUninit::<u8> { uninit: () }]) };
+//~^ ERROR it is undefined behavior to use this value
+const MYSTR_NO_INIT_ISSUE83182: &MyStr = unsafe { mem::transmute::<&[_], _>(&[&()]) };
+//~^ ERROR: it is undefined behavior to use this value
+
+// # slice
+const SLICE_TOO_LONG: &[u8] = unsafe { mem::transmute((&42u8, 999usize)) };
+//~^ ERROR it is undefined behavior to use this value
+const SLICE_TOO_LONG_OVERFLOW: &[u32] = unsafe { mem::transmute((&42u32, isize::MAX)) };
+//~^ ERROR it is undefined behavior to use this value
+// bad slice box: length too big
+const SLICE_TOO_LONG_BOX: Box<[u8]> = unsafe { mem::transmute((&42u8, 999usize)) };
+//~^ ERROR it is undefined behavior to use this value
+// bad data *inside* the slice
+const SLICE_CONTENT_INVALID: &[bool] = &[unsafe { mem::transmute(3u8) }];
+//~^ ERROR it is undefined behavior to use this value
+//~| constant
+
+
+// bad: sized field is not okay
+const MYSLICE_PREFIX_BAD: &MySliceBool = &MySlice(unsafe { mem::transmute(3u8) }, [false]);
+//~^ ERROR it is undefined behavior to use this value
+//~| constant
+// bad: unsized part is not okay
+const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { mem::transmute(3u8) }]);
+//~^ ERROR it is undefined behavior to use this value
+//~| constant
+
+// bad trait object
+const TRAIT_OBJ_SHORT_VTABLE_1: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, &3u8))) };
+//~^ ERROR it is undefined behavior to use this value
+//~| expected a vtable
+// bad trait object
+const TRAIT_OBJ_SHORT_VTABLE_2: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, &3u64))) };
+//~^ ERROR it is undefined behavior to use this value
+//~| expected a vtable
+// bad trait object
+const TRAIT_OBJ_INT_VTABLE: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, 4usize))) };
+//~^ ERROR it is undefined behavior to use this value
+//~| expected a vtable
+const TRAIT_OBJ_BAD_DROP_FN_NOT_FN_PTR: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, &[&42u8; 8]))) };
+//~^ ERROR it is undefined behavior to use this value
+//~| expected a vtable
+// bad data *inside* the trait object
+const TRAIT_OBJ_CONTENT_INVALID: &dyn Trait = unsafe { mem::transmute::<_, &bool>(&3u8) };
+//~^ ERROR it is undefined behavior to use this value
+//~| expected a boolean
+
+const RAW_TRAIT_OBJ_VTABLE_NULL: *const dyn Trait = unsafe { mem::transmute((&92u8, 0usize)) };
+//~^ ERROR it is undefined behavior to use this value
+const RAW_TRAIT_OBJ_VTABLE_INVALID: *const dyn Trait = unsafe { mem::transmute((&92u8, &3u64)) };
+//~^ ERROR it is undefined behavior to use this value
+
+
+// not ok, since alignment needs to be non-zero.
+const LAYOUT_INVALID_ZERO: Layout = unsafe { Layout::from_size_align_unchecked(0x1000, 0x00) };
+//~^ ERROR it is undefined behavior to use this value
+
+// not ok, since alignment needs to be a power of two.
+const LAYOUT_INVALID_THREE: Layout = unsafe { Layout::from_size_align_unchecked(9, 3) };
+//~^ ERROR it is undefined behavior to use this value
+
+
+const _: &[!; 1] = unsafe { &*(1_usize as *const [!; 1]) }; //~ ERROR undefined behavior
+const _: &[!] = unsafe { &*(1_usize as *const [!; 1]) }; //~ ERROR undefined behavior
+const _: &[!] = unsafe { &*(1_usize as *const [!; 42]) }; //~ ERROR undefined behavior
+
+
+// Reading uninitialized  data
+pub static S4: &[u8] = unsafe { from_raw_parts((&D1) as *const _ as _, 1) };
+//~^ ERROR: it is undefined behavior to use this value
+// Reinterpret pointers as integers (UB in CTFE.)
+pub static S5: &[u8] = unsafe { from_raw_parts((&D3) as *const _ as _, mem::size_of::<&u32>()) };
+//~^ ERROR: it is undefined behavior to use this value
+// Layout mismatch
+pub static S6: &[bool] = unsafe { from_raw_parts((&D0) as *const _ as _, 4) };
+//~^ ERROR: it is undefined behavior to use this value
+
+// Reading padding is not ok
+pub static S7: &[u16] = unsafe {
+    //~^ ERROR: it is undefined behavior to use this value
+    let ptr = (&D2 as *const Struct as *const u16).add(1);
+
+    from_raw_parts(ptr, 4)
+};
+
+pub static R4: &[u8] = unsafe {
+    //~^ ERROR: it is undefined behavior to use this value
+    let ptr = (&D1) as *const mem::MaybeUninit<&u32> as *const u8;
+    from_ptr_range(ptr..ptr.add(1))
+};
+pub static R5: &[u8] = unsafe {
+    //~^ ERROR: it is undefined behavior to use this value
+    let ptr = &D3 as *const &u32;
+    from_ptr_range(ptr.cast()..ptr.add(1).cast())
+};
+pub static R6: &[bool] = unsafe {
+    //~^ ERROR: it is undefined behavior to use this value
+    let ptr = &D0 as *const u32 as *const bool;
+    from_ptr_range(ptr..ptr.add(4))
+};
+
+const D0: u32 = 0x11111111; // Constant chosen for endianness-independent behavior.
+const D1: mem::MaybeUninit<&u32> = mem::MaybeUninit::uninit();
+const D2: Struct = Struct { a: 1, b: 2, c: 3, d: 4 };
+const D3: &u32 = &42;
+
+#[repr(C)]
+struct Struct {
+    a: u8,
+    // _pad: [mem::MaybeUninit<u8>; 3]
+    b: u32,
+    c: u16,
+    d: u8,
+    // _pad: [mem::MaybeUninit<u8>; 1]
+}
+
+fn main() {}
diff --git a/src/test/ui/consts/const-eval/ref_to_int_match.32bit.stderr b/tests/ui/consts/const-eval/ref_to_int_match.32bit.stderr
index 032ceb246..032ceb246 100644
--- a/src/test/ui/consts/const-eval/ref_to_int_match.32bit.stderr
+++ b/tests/ui/consts/const-eval/ref_to_int_match.32bit.stderr
diff --git a/src/test/ui/consts/const-eval/ref_to_int_match.64bit.stderr b/tests/ui/consts/const-eval/ref_to_int_match.64bit.stderr
index 032ceb246..032ceb246 100644
--- a/src/test/ui/consts/const-eval/ref_to_int_match.64bit.stderr
+++ b/tests/ui/consts/const-eval/ref_to_int_match.64bit.stderr
diff --git a/src/test/ui/consts/const-eval/ref_to_int_match.rs b/tests/ui/consts/const-eval/ref_to_int_match.rs
index 70c6e7d94..70c6e7d94 100644
--- a/src/test/ui/consts/const-eval/ref_to_int_match.rs
+++ b/tests/ui/consts/const-eval/ref_to_int_match.rs
diff --git a/src/test/ui/consts/const-eval/shift_overflow.rs b/tests/ui/consts/const-eval/shift_overflow.rs
index e843584b6..e843584b6 100644
--- a/src/test/ui/consts/const-eval/shift_overflow.rs
+++ b/tests/ui/consts/const-eval/shift_overflow.rs
diff --git a/src/test/ui/consts/const-eval/shift_overflow.stderr b/tests/ui/consts/const-eval/shift_overflow.stderr
index e8d4076a6..e8d4076a6 100644
--- a/src/test/ui/consts/const-eval/shift_overflow.stderr
+++ b/tests/ui/consts/const-eval/shift_overflow.stderr
diff --git a/src/test/ui/consts/const-eval/simd/insert_extract.rs b/tests/ui/consts/const-eval/simd/insert_extract.rs
index 3472c05d1..3472c05d1 100644
--- a/src/test/ui/consts/const-eval/simd/insert_extract.rs
+++ b/tests/ui/consts/const-eval/simd/insert_extract.rs
diff --git a/src/test/ui/consts/const-eval/simple_with_undef.rs b/tests/ui/consts/const-eval/simple_with_undef.rs
index 1a416dd46..1a416dd46 100644
--- a/src/test/ui/consts/const-eval/simple_with_undef.rs
+++ b/tests/ui/consts/const-eval/simple_with_undef.rs
diff --git a/src/test/ui/consts/const-eval/size-of-t.rs b/tests/ui/consts/const-eval/size-of-t.rs
index efbdeec70..efbdeec70 100644
--- a/src/test/ui/consts/const-eval/size-of-t.rs
+++ b/tests/ui/consts/const-eval/size-of-t.rs
diff --git a/src/test/ui/consts/const-eval/size-of-t.stderr b/tests/ui/consts/const-eval/size-of-t.stderr
index abe641046..abe641046 100644
--- a/src/test/ui/consts/const-eval/size-of-t.stderr
+++ b/tests/ui/consts/const-eval/size-of-t.stderr
diff --git a/src/test/ui/consts/const-eval/strlen.rs b/tests/ui/consts/const-eval/strlen.rs
index 7b14a5235..7b14a5235 100644
--- a/src/test/ui/consts/const-eval/strlen.rs
+++ b/tests/ui/consts/const-eval/strlen.rs
diff --git a/src/test/ui/consts/const-eval/transmute-const-promotion.rs b/tests/ui/consts/const-eval/transmute-const-promotion.rs
index 1f0240d4b..1f0240d4b 100644
--- a/src/test/ui/consts/const-eval/transmute-const-promotion.rs
+++ b/tests/ui/consts/const-eval/transmute-const-promotion.rs
diff --git a/src/test/ui/consts/const-eval/transmute-const-promotion.stderr b/tests/ui/consts/const-eval/transmute-const-promotion.stderr
index 434a957f6..434a957f6 100644
--- a/src/test/ui/consts/const-eval/transmute-const-promotion.stderr
+++ b/tests/ui/consts/const-eval/transmute-const-promotion.stderr
diff --git a/src/test/ui/consts/const-eval/transmute-const.32bit.stderr b/tests/ui/consts/const-eval/transmute-const.32bit.stderr
index 09fd79986..09fd79986 100644
--- a/src/test/ui/consts/const-eval/transmute-const.32bit.stderr
+++ b/tests/ui/consts/const-eval/transmute-const.32bit.stderr
diff --git a/src/test/ui/consts/const-eval/transmute-const.64bit.stderr b/tests/ui/consts/const-eval/transmute-const.64bit.stderr
index 09fd79986..09fd79986 100644
--- a/src/test/ui/consts/const-eval/transmute-const.64bit.stderr
+++ b/tests/ui/consts/const-eval/transmute-const.64bit.stderr
diff --git a/src/test/ui/consts/const-eval/transmute-const.rs b/tests/ui/consts/const-eval/transmute-const.rs
index d9d0a3aea..d9d0a3aea 100644
--- a/src/test/ui/consts/const-eval/transmute-const.rs
+++ b/tests/ui/consts/const-eval/transmute-const.rs
diff --git a/src/test/ui/consts/const-eval/ub-enum-overwrite.rs b/tests/ui/consts/const-eval/ub-enum-overwrite.rs
index 086a1001d..086a1001d 100644
--- a/src/test/ui/consts/const-eval/ub-enum-overwrite.rs
+++ b/tests/ui/consts/const-eval/ub-enum-overwrite.rs
diff --git a/src/test/ui/consts/const-eval/ub-enum-overwrite.stderr b/tests/ui/consts/const-eval/ub-enum-overwrite.stderr
index 5750212b4..5750212b4 100644
--- a/src/test/ui/consts/const-eval/ub-enum-overwrite.stderr
+++ b/tests/ui/consts/const-eval/ub-enum-overwrite.stderr
diff --git a/src/test/ui/consts/const-eval/ub-enum.32bit.stderr b/tests/ui/consts/const-eval/ub-enum.32bit.stderr
index 93bc96e67..2d86bd88f 100644
--- a/src/test/ui/consts/const-eval/ub-enum.32bit.stderr
+++ b/tests/ui/consts/const-eval/ub-enum.32bit.stderr
@@ -1,16 +1,16 @@
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:24:1
+  --> $DIR/ub-enum.rs:27:1
    |
 LL | const BAD_ENUM: Enum = unsafe { mem::transmute(1usize) };
    | ^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-tag>: encountered 0x00000001, but expected a valid enum tag
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 4, align: 4) {
-               01 00 00 00                                     │ ....
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:27:1
+  --> $DIR/ub-enum.rs:30:1
    |
 LL | const BAD_ENUM_PTR: Enum = unsafe { mem::transmute(&1) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
@@ -19,7 +19,7 @@ LL | const BAD_ENUM_PTR: Enum = unsafe { mem::transmute(&1) };
    = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:30:1
+  --> $DIR/ub-enum.rs:33:1
    |
 LL | const BAD_ENUM_WRAPPED: Wrap<Enum> = unsafe { mem::transmute(&1) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
@@ -28,18 +28,18 @@ LL | const BAD_ENUM_WRAPPED: Wrap<Enum> = unsafe { mem::transmute(&1) };
    = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:42:1
+  --> $DIR/ub-enum.rs:45:1
    |
 LL | const BAD_ENUM2: Enum2 = unsafe { mem::transmute(0usize) };
    | ^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-tag>: encountered 0x00000000, but expected a valid enum tag
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 4, align: 4) {
-               00 00 00 00                                     │ ....
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:44:1
+  --> $DIR/ub-enum.rs:47:1
    |
 LL | const BAD_ENUM2_PTR: Enum2 = unsafe { mem::transmute(&0) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
@@ -48,7 +48,7 @@ LL | const BAD_ENUM2_PTR: Enum2 = unsafe { mem::transmute(&0) };
    = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:47:1
+  --> $DIR/ub-enum.rs:50:1
    |
 LL | const BAD_ENUM2_WRAPPED: Wrap<Enum2> = unsafe { mem::transmute(&0) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
@@ -57,13 +57,13 @@ LL | const BAD_ENUM2_WRAPPED: Wrap<Enum2> = unsafe { mem::transmute(&0) };
    = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:56:42
+  --> $DIR/ub-enum.rs:59:42
    |
 LL | const BAD_ENUM2_UNDEF : Enum2 = unsafe { MaybeUninit { uninit: () }.init };
    |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:61:1
+  --> $DIR/ub-enum.rs:64:1
    |
 LL | const BAD_ENUM2_OPTION_PTR: Option<Enum2> = unsafe { mem::transmute(&0) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
@@ -72,46 +72,46 @@ LL | const BAD_ENUM2_OPTION_PTR: Option<Enum2> = unsafe { mem::transmute(&0) };
    = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:78:1
+  --> $DIR/ub-enum.rs:81:1
    |
 LL | const BAD_UNINHABITED_VARIANT1: UninhDiscriminant = unsafe { mem::transmute(1u8) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(B)>.0: encountered a value of the never type `!`
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 1, align: 1) {
-               01                                              │ .
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:80:1
+  --> $DIR/ub-enum.rs:83:1
    |
 LL | const BAD_UNINHABITED_VARIANT2: UninhDiscriminant = unsafe { mem::transmute(3u8) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(D)>.0: encountered a value of uninhabited type Never
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 1, align: 1) {
-               03                                              │ .
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:88:1
+  --> $DIR/ub-enum.rs:91:1
    |
 LL | const BAD_OPTION_CHAR: Option<(char, char)> = Some(('x', unsafe { mem::transmute(!0u32) }));
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(Some)>.0.1: encountered 0xffffffff, but expected a valid unicode scalar value (in `0..=0x10FFFF` but not in `0xD800..=0xDFFF`)
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 8, align: 4) {
-               78 00 00 00 ff ff ff ff                         │ x.......
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:93:77
+  --> $DIR/ub-enum.rs:96:77
    |
 LL | const BAD_UNINHABITED_WITH_DATA1: Result<(i32, Never), (i32, !)> = unsafe { mem::transmute(0u64) };
    |                                                                             ^^^^^^^^^^^^^^^^^^^^ transmuting to uninhabited type
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:95:77
+  --> $DIR/ub-enum.rs:98:77
    |
 LL | const BAD_UNINHABITED_WITH_DATA2: Result<(i32, !), (i32, Never)> = unsafe { mem::transmute(0u64) };
    |                                                                             ^^^^^^^^^^^^^^^^^^^^ transmuting to uninhabited type
diff --git a/src/test/ui/consts/const-eval/ub-enum.64bit.stderr b/tests/ui/consts/const-eval/ub-enum.64bit.stderr
index 280ba25a8..a89d7ec5f 100644
--- a/src/test/ui/consts/const-eval/ub-enum.64bit.stderr
+++ b/tests/ui/consts/const-eval/ub-enum.64bit.stderr
@@ -1,16 +1,16 @@
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:24:1
+  --> $DIR/ub-enum.rs:27:1
    |
 LL | const BAD_ENUM: Enum = unsafe { mem::transmute(1usize) };
    | ^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-tag>: encountered 0x0000000000000001, but expected a valid enum tag
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 8, align: 8) {
-               01 00 00 00 00 00 00 00                         │ ........
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:27:1
+  --> $DIR/ub-enum.rs:30:1
    |
 LL | const BAD_ENUM_PTR: Enum = unsafe { mem::transmute(&1) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
@@ -19,7 +19,7 @@ LL | const BAD_ENUM_PTR: Enum = unsafe { mem::transmute(&1) };
    = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:30:1
+  --> $DIR/ub-enum.rs:33:1
    |
 LL | const BAD_ENUM_WRAPPED: Wrap<Enum> = unsafe { mem::transmute(&1) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
@@ -28,18 +28,18 @@ LL | const BAD_ENUM_WRAPPED: Wrap<Enum> = unsafe { mem::transmute(&1) };
    = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:42:1
+  --> $DIR/ub-enum.rs:45:1
    |
 LL | const BAD_ENUM2: Enum2 = unsafe { mem::transmute(0usize) };
    | ^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-tag>: encountered 0x0000000000000000, but expected a valid enum tag
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 8, align: 8) {
-               00 00 00 00 00 00 00 00                         │ ........
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:44:1
+  --> $DIR/ub-enum.rs:47:1
    |
 LL | const BAD_ENUM2_PTR: Enum2 = unsafe { mem::transmute(&0) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
@@ -48,7 +48,7 @@ LL | const BAD_ENUM2_PTR: Enum2 = unsafe { mem::transmute(&0) };
    = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:47:1
+  --> $DIR/ub-enum.rs:50:1
    |
 LL | const BAD_ENUM2_WRAPPED: Wrap<Enum2> = unsafe { mem::transmute(&0) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
@@ -57,13 +57,13 @@ LL | const BAD_ENUM2_WRAPPED: Wrap<Enum2> = unsafe { mem::transmute(&0) };
    = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:56:42
+  --> $DIR/ub-enum.rs:59:42
    |
 LL | const BAD_ENUM2_UNDEF : Enum2 = unsafe { MaybeUninit { uninit: () }.init };
    |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:61:1
+  --> $DIR/ub-enum.rs:64:1
    |
 LL | const BAD_ENUM2_OPTION_PTR: Option<Enum2> = unsafe { mem::transmute(&0) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
@@ -72,46 +72,46 @@ LL | const BAD_ENUM2_OPTION_PTR: Option<Enum2> = unsafe { mem::transmute(&0) };
    = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:78:1
+  --> $DIR/ub-enum.rs:81:1
    |
 LL | const BAD_UNINHABITED_VARIANT1: UninhDiscriminant = unsafe { mem::transmute(1u8) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(B)>.0: encountered a value of the never type `!`
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 1, align: 1) {
-               01                                              │ .
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:80:1
+  --> $DIR/ub-enum.rs:83:1
    |
 LL | const BAD_UNINHABITED_VARIANT2: UninhDiscriminant = unsafe { mem::transmute(3u8) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(D)>.0: encountered a value of uninhabited type Never
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 1, align: 1) {
-               03                                              │ .
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:88:1
+  --> $DIR/ub-enum.rs:91:1
    |
 LL | const BAD_OPTION_CHAR: Option<(char, char)> = Some(('x', unsafe { mem::transmute(!0u32) }));
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(Some)>.0.1: encountered 0xffffffff, but expected a valid unicode scalar value (in `0..=0x10FFFF` but not in `0xD800..=0xDFFF`)
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 8, align: 4) {
-               78 00 00 00 ff ff ff ff                         │ x.......
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:93:77
+  --> $DIR/ub-enum.rs:96:77
    |
 LL | const BAD_UNINHABITED_WITH_DATA1: Result<(i32, Never), (i32, !)> = unsafe { mem::transmute(0u64) };
    |                                                                             ^^^^^^^^^^^^^^^^^^^^ transmuting to uninhabited type
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/ub-enum.rs:95:77
+  --> $DIR/ub-enum.rs:98:77
    |
 LL | const BAD_UNINHABITED_WITH_DATA2: Result<(i32, !), (i32, Never)> = unsafe { mem::transmute(0u64) };
    |                                                                             ^^^^^^^^^^^^^^^^^^^^ transmuting to uninhabited type
diff --git a/src/test/ui/consts/const-eval/ub-enum.rs b/tests/ui/consts/const-eval/ub-enum.rs
index 6935be2f9..8f26d9a00 100644
--- a/src/test/ui/consts/const-eval/ub-enum.rs
+++ b/tests/ui/consts/const-eval/ub-enum.rs
@@ -1,4 +1,7 @@
 // stderr-per-bitwidth
+// Strip out raw byte dumps to make comparison platform-independent:
+// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
 #![feature(never_type)]
 #![allow(invalid_value)]
 
diff --git a/src/test/ui/consts/const-eval/ub-incorrect-vtable.32bit.stderr b/tests/ui/consts/const-eval/ub-incorrect-vtable.32bit.stderr
index 965256de2..965256de2 100644
--- a/src/test/ui/consts/const-eval/ub-incorrect-vtable.32bit.stderr
+++ b/tests/ui/consts/const-eval/ub-incorrect-vtable.32bit.stderr
diff --git a/src/test/ui/consts/const-eval/ub-incorrect-vtable.64bit.stderr b/tests/ui/consts/const-eval/ub-incorrect-vtable.64bit.stderr
index bd542a7a5..bd542a7a5 100644
--- a/src/test/ui/consts/const-eval/ub-incorrect-vtable.64bit.stderr
+++ b/tests/ui/consts/const-eval/ub-incorrect-vtable.64bit.stderr
diff --git a/src/test/ui/consts/const-eval/ub-incorrect-vtable.rs b/tests/ui/consts/const-eval/ub-incorrect-vtable.rs
index 4bb30b75b..4bb30b75b 100644
--- a/src/test/ui/consts/const-eval/ub-incorrect-vtable.rs
+++ b/tests/ui/consts/const-eval/ub-incorrect-vtable.rs
diff --git a/src/test/ui/consts/const-eval/ub-int-array.32bit.stderr b/tests/ui/consts/const-eval/ub-int-array.32bit.stderr
index edcde13b0..edcde13b0 100644
--- a/src/test/ui/consts/const-eval/ub-int-array.32bit.stderr
+++ b/tests/ui/consts/const-eval/ub-int-array.32bit.stderr
diff --git a/src/test/ui/consts/const-eval/ub-int-array.64bit.stderr b/tests/ui/consts/const-eval/ub-int-array.64bit.stderr
index edcde13b0..edcde13b0 100644
--- a/src/test/ui/consts/const-eval/ub-int-array.64bit.stderr
+++ b/tests/ui/consts/const-eval/ub-int-array.64bit.stderr
diff --git a/src/test/ui/consts/const-eval/ub-int-array.rs b/tests/ui/consts/const-eval/ub-int-array.rs
index a68d3fb17..a68d3fb17 100644
--- a/src/test/ui/consts/const-eval/ub-int-array.rs
+++ b/tests/ui/consts/const-eval/ub-int-array.rs
diff --git a/src/test/ui/consts/const-eval/ub-nonnull.chalk.64bit.stderr b/tests/ui/consts/const-eval/ub-nonnull.chalk.64bit.stderr
index 2a4b6f3b7..2a4b6f3b7 100644
--- a/src/test/ui/consts/const-eval/ub-nonnull.chalk.64bit.stderr
+++ b/tests/ui/consts/const-eval/ub-nonnull.chalk.64bit.stderr
diff --git a/src/test/ui/consts/const-eval/ub-nonnull.rs b/tests/ui/consts/const-eval/ub-nonnull.rs
index 490925822..a64b3a74c 100644
--- a/src/test/ui/consts/const-eval/ub-nonnull.rs
+++ b/tests/ui/consts/const-eval/ub-nonnull.rs
@@ -1,4 +1,6 @@
-// stderr-per-bitwidth
+// Strip out raw byte dumps to make comparison platform-independent:
+// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
 #![feature(rustc_attrs, ptr_metadata)]
 #![allow(invalid_value)] // make sure we cannot allow away the errors tested here
 
diff --git a/tests/ui/consts/const-eval/ub-nonnull.stderr b/tests/ui/consts/const-eval/ub-nonnull.stderr
new file mode 100644
index 000000000..961648708
--- /dev/null
+++ b/tests/ui/consts/const-eval/ub-nonnull.stderr
@@ -0,0 +1,81 @@
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-nonnull.rs:14:1
+   |
+LL | const NULL_PTR: NonNull<u8> = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0, but expected something greater or equal to 1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-nonnull.rs:20:30
+   |
+LL |     let out_of_bounds_ptr = &ptr[255];
+   |                              ^^^^^^^^ dereferencing pointer failed: alloc11 has size 1, so pointer to 256 bytes starting at offset 0 is out-of-bounds
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-nonnull.rs:24:1
+   |
+LL | const NULL_U8: NonZeroU8 = unsafe { mem::transmute(0u8) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0, but expected something greater or equal to 1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-nonnull.rs:26:1
+   |
+LL | const NULL_USIZE: NonZeroUsize = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0, but expected something greater or equal to 1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-nonnull.rs:34:36
+   |
+LL | const UNINIT: NonZeroU8 = unsafe { MaybeUninit { uninit: () }.init };
+   |                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-nonnull.rs:43:1
+   |
+LL | const BAD_RANGE1: RestrictedRange1 = unsafe { RestrictedRange1(42) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 42, but expected something in the range 10..=30
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-nonnull.rs:49:1
+   |
+LL | const BAD_RANGE2: RestrictedRange2 = unsafe { RestrictedRange2(20) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 20, but expected something less or equal to 10, or greater or equal to 30
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-nonnull.rs:52:1
+   |
+LL | const NULL_FAT_PTR: NonNull<dyn Send> = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0, but expected something greater or equal to 1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error: aborting due to 8 previous errors
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/const-eval/ub-ref-ptr.rs b/tests/ui/consts/const-eval/ub-ref-ptr.rs
index a1c812390..369e45194 100644
--- a/src/test/ui/consts/const-eval/ub-ref-ptr.rs
+++ b/tests/ui/consts/const-eval/ub-ref-ptr.rs
@@ -1,6 +1,9 @@
 // ignore-tidy-linelength
-// stderr-per-bitwidth
+// Strip out raw byte dumps to make comparison platform-independent:
+// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
 #![allow(invalid_value)]
+#![feature(const_ptr_read)]
 
 use std::mem;
 
@@ -57,4 +60,12 @@ const DANGLING_FN_PTR: fn() = unsafe { mem::transmute(13usize) };
 const DATA_FN_PTR: fn() = unsafe { mem::transmute(&13) };
 //~^ ERROR it is undefined behavior to use this value
 
+
+const UNALIGNED_READ: () = unsafe {
+    let x = &[0u8; 4];
+    let ptr = x.as_ptr().cast::<u32>();
+    ptr.read(); //~ inside `UNALIGNED_READ`
+};
+
+
 fn main() {}
diff --git a/tests/ui/consts/const-eval/ub-ref-ptr.stderr b/tests/ui/consts/const-eval/ub-ref-ptr.stderr
new file mode 100644
index 000000000..ce618802b
--- /dev/null
+++ b/tests/ui/consts/const-eval/ub-ref-ptr.stderr
@@ -0,0 +1,186 @@
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-ref-ptr.rs:16:1
+   |
+LL | const UNALIGNED: &u16 = unsafe { mem::transmute(&[0u8; 4]) };
+   | ^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered an unaligned reference (required 2 byte alignment but found 1)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-ref-ptr.rs:20:1
+   |
+LL | const UNALIGNED_BOX: Box<u16> = unsafe { mem::transmute(&[0u8; 4]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered an unaligned box (required 2 byte alignment but found 1)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-ref-ptr.rs:24:1
+   |
+LL | const NULL: &u16 = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^ constructing invalid value: encountered a null reference
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-ref-ptr.rs:27:1
+   |
+LL | const NULL_BOX: Box<u16> = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a null box
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-ref-ptr.rs:34:1
+   |
+LL | const REF_AS_USIZE: usize = unsafe { mem::transmute(&0) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-ref-ptr.rs:37:39
+   |
+LL | const REF_AS_USIZE_SLICE: &[usize] = &[unsafe { mem::transmute(&0) }];
+   |                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+
+note: erroneous constant used
+  --> $DIR/ub-ref-ptr.rs:37:38
+   |
+LL | const REF_AS_USIZE_SLICE: &[usize] = &[unsafe { mem::transmute(&0) }];
+   |                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-ref-ptr.rs:40:86
+   |
+LL | const REF_AS_USIZE_BOX_SLICE: Box<[usize]> = unsafe { mem::transmute::<&[usize], _>(&[mem::transmute(&0)]) };
+   |                                                                                      ^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+
+note: erroneous constant used
+  --> $DIR/ub-ref-ptr.rs:40:85
+   |
+LL | const REF_AS_USIZE_BOX_SLICE: Box<[usize]> = unsafe { mem::transmute::<&[usize], _>(&[mem::transmute(&0)]) };
+   |                                                                                     ^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-ref-ptr.rs:43:1
+   |
+LL | const USIZE_AS_REF: &'static u8 = unsafe { mem::transmute(1337usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling reference (address 0x539 is unallocated)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-ref-ptr.rs:46:1
+   |
+LL | const USIZE_AS_BOX: Box<u8> = unsafe { mem::transmute(1337usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling box (address 0x539 is unallocated)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-ref-ptr.rs:49:41
+   |
+LL | const UNINIT_PTR: *const i32 = unsafe { MaybeUninit { uninit: () }.init };
+   |                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-ref-ptr.rs:53:1
+   |
+LL | const NULL_FN_PTR: fn() = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered null pointer, but expected a function pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-ref-ptr.rs:55:38
+   |
+LL | const UNINIT_FN_PTR: fn() = unsafe { MaybeUninit { uninit: () }.init };
+   |                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-ref-ptr.rs:58:1
+   |
+LL | const DANGLING_FN_PTR: fn() = unsafe { mem::transmute(13usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0xd[noalloc], but expected a function pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-ref-ptr.rs:60:1
+   |
+LL | const DATA_FN_PTR: fn() = unsafe { mem::transmute(&13) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered alloc41, but expected a function pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error: accessing memory with alignment 1, but alignment 4 is required
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #68585 <https://github.com/rust-lang/rust/issues/104616>
+note: inside `std::ptr::read::<u32>`
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+note: inside `ptr::const_ptr::<impl *const u32>::read`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `UNALIGNED_READ`
+  --> $DIR/ub-ref-ptr.rs:67:5
+   |
+LL |     ptr.read();
+   |     ^^^^^^^^^^
+   = note: `#[deny(invalid_alignment)]` on by default
+
+error: aborting due to 15 previous errors
+
+For more information about this error, try `rustc --explain E0080`.
+Future incompatibility report: Future breakage diagnostic:
+error: accessing memory with alignment 1, but alignment 4 is required
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #68585 <https://github.com/rust-lang/rust/issues/104616>
+note: inside `std::ptr::read::<u32>`
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+note: inside `ptr::const_ptr::<impl *const u32>::read`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `UNALIGNED_READ`
+  --> $DIR/ub-ref-ptr.rs:67:5
+   |
+LL |     ptr.read();
+   |     ^^^^^^^^^^
+   = note: `#[deny(invalid_alignment)]` on by default
+
diff --git a/tests/ui/consts/const-eval/ub-uninhabit.rs b/tests/ui/consts/const-eval/ub-uninhabit.rs
new file mode 100644
index 000000000..4c4ef216d
--- /dev/null
+++ b/tests/ui/consts/const-eval/ub-uninhabit.rs
@@ -0,0 +1,25 @@
+// Strip out raw byte dumps to make comparison platform-independent:
+// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
+
+use std::mem;
+
+#[derive(Copy, Clone)]
+enum Bar {}
+
+#[repr(C)]
+union MaybeUninit<T: Copy> {
+    uninit: (),
+    init: T,
+}
+
+const BAD_BAD_BAD: Bar = unsafe { MaybeUninit { uninit: () }.init };
+//~^ ERROR it is undefined behavior to use this value
+
+const BAD_BAD_REF: &Bar = unsafe { mem::transmute(1usize) };
+//~^ ERROR it is undefined behavior to use this value
+
+const BAD_BAD_ARRAY: [Bar; 1] = unsafe { MaybeUninit { uninit: () }.init };
+//~^ ERROR it is undefined behavior to use this value
+
+fn main() {}
diff --git a/tests/ui/consts/const-eval/ub-uninhabit.stderr b/tests/ui/consts/const-eval/ub-uninhabit.stderr
new file mode 100644
index 000000000..0ae376d03
--- /dev/null
+++ b/tests/ui/consts/const-eval/ub-uninhabit.stderr
@@ -0,0 +1,32 @@
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-uninhabit.rs:16:1
+   |
+LL | const BAD_BAD_BAD: Bar = unsafe { MaybeUninit { uninit: () }.init };
+   | ^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a value of uninhabited type Bar
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {}
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-uninhabit.rs:19:1
+   |
+LL | const BAD_BAD_REF: &Bar = unsafe { mem::transmute(1usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a reference pointing to uninhabited type Bar
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-uninhabit.rs:22:1
+   |
+LL | const BAD_BAD_ARRAY: [Bar; 1] = unsafe { MaybeUninit { uninit: () }.init };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at [0]: encountered a value of uninhabited type Bar
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {}
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/const-eval/ub-upvars.32bit.stderr b/tests/ui/consts/const-eval/ub-upvars.32bit.stderr
index f7898e55e..f7898e55e 100644
--- a/src/test/ui/consts/const-eval/ub-upvars.32bit.stderr
+++ b/tests/ui/consts/const-eval/ub-upvars.32bit.stderr
diff --git a/src/test/ui/consts/const-eval/ub-upvars.64bit.stderr b/tests/ui/consts/const-eval/ub-upvars.64bit.stderr
index 60432380e..60432380e 100644
--- a/src/test/ui/consts/const-eval/ub-upvars.64bit.stderr
+++ b/tests/ui/consts/const-eval/ub-upvars.64bit.stderr
diff --git a/src/test/ui/consts/const-eval/ub-upvars.rs b/tests/ui/consts/const-eval/ub-upvars.rs
index ceac59870..ceac59870 100644
--- a/src/test/ui/consts/const-eval/ub-upvars.rs
+++ b/tests/ui/consts/const-eval/ub-upvars.rs
diff --git a/src/test/ui/consts/const-eval/ub-wide-ptr.chalk.64bit.stderr b/tests/ui/consts/const-eval/ub-wide-ptr.chalk.64bit.stderr
index 39352ca84..39352ca84 100644
--- a/src/test/ui/consts/const-eval/ub-wide-ptr.chalk.64bit.stderr
+++ b/tests/ui/consts/const-eval/ub-wide-ptr.chalk.64bit.stderr
diff --git a/src/test/ui/consts/const-eval/ub-wide-ptr.rs b/tests/ui/consts/const-eval/ub-wide-ptr.rs
index 2894ef831..a765dc712 100644
--- a/src/test/ui/consts/const-eval/ub-wide-ptr.rs
+++ b/tests/ui/consts/const-eval/ub-wide-ptr.rs
@@ -1,9 +1,11 @@
-// stderr-per-bitwidth
 // ignore-tidy-linelength
 #![allow(unused)]
 
 use std::mem;
 
+// Strip out raw byte dumps to make comparison platform-independent:
+// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
 // normalize-stderr-test "offset \d+" -> "offset N"
 // normalize-stderr-test "alloc\d+" -> "allocN"
 // normalize-stderr-test "size \d+" -> "size N"
diff --git a/tests/ui/consts/const-eval/ub-wide-ptr.stderr b/tests/ui/consts/const-eval/ub-wide-ptr.stderr
new file mode 100644
index 000000000..f38e7916b
--- /dev/null
+++ b/tests/ui/consts/const-eval/ub-wide-ptr.stderr
@@ -0,0 +1,297 @@
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:38:1
+   |
+LL | const STR_TOO_LONG: &str = unsafe { mem::transmute((&42u8, 999usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling reference (going beyond the bounds of its allocation)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:40:1
+   |
+LL | const NESTED_STR_MUCH_TOO_LONG: (&str,) = (unsafe { mem::transmute((&42, usize::MAX)) },);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered invalid reference metadata: slice is bigger than largest supported object
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-wide-ptr.rs:43:1
+   |
+LL | const STR_LENGTH_PTR: &str = unsafe { mem::transmute((&42u8, &3)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-wide-ptr.rs:46:1
+   |
+LL | const MY_STR_LENGTH_PTR: &MyStr = unsafe { mem::transmute((&42u8, &3)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:48:1
+   |
+LL | const MY_STR_MUCH_TOO_LONG: &MyStr = unsafe { mem::transmute((&42u8, usize::MAX)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered invalid reference metadata: slice is bigger than largest supported object
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:52:1
+   |
+LL | const STR_NO_INIT: &str = unsafe { mem::transmute::<&[_], _>(&[MaybeUninit::<u8> { uninit: () }]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>: encountered uninitialized data in `str`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:55:1
+   |
+LL | const MYSTR_NO_INIT: &MyStr = unsafe { mem::transmute::<&[_], _>(&[MaybeUninit::<u8> { uninit: () }]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>.0: encountered uninitialized data in `str`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-wide-ptr.rs:62:1
+   |
+LL | const SLICE_LENGTH_UNINIT: &[u8] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:69:1
+   |
+LL | const SLICE_TOO_LONG: &[u8] = unsafe { mem::transmute((&42u8, 999usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling reference (going beyond the bounds of its allocation)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:72:1
+   |
+LL | const SLICE_TOO_LONG_OVERFLOW: &[u32] = unsafe { mem::transmute((&42u32, isize::MAX)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered invalid reference metadata: slice is bigger than largest supported object
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-wide-ptr.rs:75:1
+   |
+LL | const SLICE_LENGTH_PTR: &[u8] = unsafe { mem::transmute((&42u8, &3)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:78:1
+   |
+LL | const SLICE_TOO_LONG_BOX: Box<[u8]> = unsafe { mem::transmute((&42u8, 999usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a dangling box (going beyond the bounds of its allocation)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-wide-ptr.rs:81:1
+   |
+LL | const SLICE_LENGTH_PTR_BOX: Box<[u8]> = unsafe { mem::transmute((&42u8, &3)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:85:1
+   |
+LL | const SLICE_CONTENT_INVALID: &[bool] = &[unsafe { mem::transmute(3u8) }];
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered 0x03, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+note: erroneous constant used
+  --> $DIR/ub-wide-ptr.rs:85:40
+   |
+LL | const SLICE_CONTENT_INVALID: &[bool] = &[unsafe { mem::transmute(3u8) }];
+   |                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:92:1
+   |
+LL | const MYSLICE_PREFIX_BAD: &MySliceBool = &MySlice(unsafe { mem::transmute(3u8) }, [false]);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>.0: encountered 0x03, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+note: erroneous constant used
+  --> $DIR/ub-wide-ptr.rs:92:42
+   |
+LL | const MYSLICE_PREFIX_BAD: &MySliceBool = &MySlice(unsafe { mem::transmute(3u8) }, [false]);
+   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:96:1
+   |
+LL | const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { mem::transmute(3u8) }]);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>.1[0]: encountered 0x03, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+note: erroneous constant used
+  --> $DIR/ub-wide-ptr.rs:96:42
+   |
+LL | const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { mem::transmute(3u8) }]);
+   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-wide-ptr.rs:104:1
+   |
+LL | const RAW_SLICE_LENGTH_UNINIT: *const [u8] = unsafe {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:113:1
+   |
+LL | const TRAIT_OBJ_SHORT_VTABLE_1: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, &3u8))) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered allocN, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:117:1
+   |
+LL | const TRAIT_OBJ_SHORT_VTABLE_2: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, &3u64))) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered allocN, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:121:1
+   |
+LL | const TRAIT_OBJ_INT_VTABLE: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, 4usize))) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered 0x4[noalloc], but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-wide-ptr.rs:124:57
+   |
+LL | const TRAIT_OBJ_UNALIGNED_VTABLE: &dyn Trait = unsafe { mem::transmute((&92u8, &[0u8; 128])) };
+   |                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using allocN as vtable pointer but it does not point to a vtable
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-wide-ptr.rs:127:57
+   |
+LL | const TRAIT_OBJ_BAD_DROP_FN_NULL: &dyn Trait = unsafe { mem::transmute((&92u8, &[0usize; 8])) };
+   |                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using allocN as vtable pointer but it does not point to a vtable
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/ub-wide-ptr.rs:130:56
+   |
+LL | const TRAIT_OBJ_BAD_DROP_FN_INT: &dyn Trait = unsafe { mem::transmute((&92u8, &[1usize; 8])) };
+   |                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using allocN as vtable pointer but it does not point to a vtable
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:133:1
+   |
+LL | const TRAIT_OBJ_BAD_DROP_FN_NOT_FN_PTR: W<&dyn Trait> = unsafe { mem::transmute(W((&92u8, &[&42u8; 8]))) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .0: encountered allocN, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:138:1
+   |
+LL | const TRAIT_OBJ_CONTENT_INVALID: &dyn Trait = unsafe { mem::transmute::<_, &bool>(&3u8) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<deref>.<dyn-downcast>: encountered 0x03, but expected a boolean
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:143:1
+   |
+LL | const RAW_TRAIT_OBJ_VTABLE_NULL: *const dyn Trait = unsafe { mem::transmute((&92u8, 0usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered null pointer, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:145:1
+   |
+LL | const RAW_TRAIT_OBJ_VTABLE_INVALID: *const dyn Trait = unsafe { mem::transmute((&92u8, &3u64)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered allocN, but expected a vtable pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: could not evaluate static initializer
+  --> $DIR/ub-wide-ptr.rs:151:5
+   |
+LL |     mem::transmute::<_, &dyn Trait>((&92u8, 0usize))
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ out-of-bounds pointer use: null pointer is a dangling pointer (it has no provenance)
+
+error[E0080]: could not evaluate static initializer
+  --> $DIR/ub-wide-ptr.rs:155:5
+   |
+LL |     mem::transmute::<_, &dyn Trait>((&92u8, &3u64))
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using allocN as vtable pointer but it does not point to a vtable
+
+error: aborting due to 29 previous errors
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/const-eval/union-const-eval-field.rs b/tests/ui/consts/const-eval/union-const-eval-field.rs
index a94fcbbfa..a94fcbbfa 100644
--- a/src/test/ui/consts/const-eval/union-const-eval-field.rs
+++ b/tests/ui/consts/const-eval/union-const-eval-field.rs
diff --git a/src/test/ui/consts/const-eval/union-const-eval-field.stderr b/tests/ui/consts/const-eval/union-const-eval-field.stderr
index 9899c56c0..9899c56c0 100644
--- a/src/test/ui/consts/const-eval/union-const-eval-field.stderr
+++ b/tests/ui/consts/const-eval/union-const-eval-field.stderr
diff --git a/src/test/ui/consts/const-eval/union-ice.rs b/tests/ui/consts/const-eval/union-ice.rs
index dd970a355..dd970a355 100644
--- a/src/test/ui/consts/const-eval/union-ice.rs
+++ b/tests/ui/consts/const-eval/union-ice.rs
diff --git a/src/test/ui/consts/const-eval/union-ice.stderr b/tests/ui/consts/const-eval/union-ice.stderr
index bd39a0551..bd39a0551 100644
--- a/src/test/ui/consts/const-eval/union-ice.stderr
+++ b/tests/ui/consts/const-eval/union-ice.stderr
diff --git a/src/test/ui/consts/const-eval/union-ub.32bit.stderr b/tests/ui/consts/const-eval/union-ub.32bit.stderr
index e5c8f88be..e5c8f88be 100644
--- a/src/test/ui/consts/const-eval/union-ub.32bit.stderr
+++ b/tests/ui/consts/const-eval/union-ub.32bit.stderr
diff --git a/src/test/ui/consts/const-eval/union-ub.64bit.stderr b/tests/ui/consts/const-eval/union-ub.64bit.stderr
index e5c8f88be..e5c8f88be 100644
--- a/src/test/ui/consts/const-eval/union-ub.64bit.stderr
+++ b/tests/ui/consts/const-eval/union-ub.64bit.stderr
diff --git a/src/test/ui/consts/const-eval/union-ub.rs b/tests/ui/consts/const-eval/union-ub.rs
index 043870c9c..043870c9c 100644
--- a/src/test/ui/consts/const-eval/union-ub.rs
+++ b/tests/ui/consts/const-eval/union-ub.rs
diff --git a/src/test/ui/consts/const-eval/union_promotion.rs b/tests/ui/consts/const-eval/union_promotion.rs
index 18894c45f..18894c45f 100644
--- a/src/test/ui/consts/const-eval/union_promotion.rs
+++ b/tests/ui/consts/const-eval/union_promotion.rs
diff --git a/src/test/ui/consts/const-eval/union_promotion.stderr b/tests/ui/consts/const-eval/union_promotion.stderr
index 42f17de20..42f17de20 100644
--- a/src/test/ui/consts/const-eval/union_promotion.stderr
+++ b/tests/ui/consts/const-eval/union_promotion.stderr
diff --git a/src/test/ui/consts/const-eval/unused-broken-const.rs b/tests/ui/consts/const-eval/unused-broken-const.rs
index 0d2776bc2..0d2776bc2 100644
--- a/src/test/ui/consts/const-eval/unused-broken-const.rs
+++ b/tests/ui/consts/const-eval/unused-broken-const.rs
diff --git a/src/test/ui/consts/const-eval/unused-broken-const.stderr b/tests/ui/consts/const-eval/unused-broken-const.stderr
index fbb10feb7..fbb10feb7 100644
--- a/src/test/ui/consts/const-eval/unused-broken-const.stderr
+++ b/tests/ui/consts/const-eval/unused-broken-const.stderr
diff --git a/src/test/ui/consts/const-eval/unwind-abort.rs b/tests/ui/consts/const-eval/unwind-abort.rs
index 2b0e58166..2b0e58166 100644
--- a/src/test/ui/consts/const-eval/unwind-abort.rs
+++ b/tests/ui/consts/const-eval/unwind-abort.rs
diff --git a/src/test/ui/consts/const-eval/unwind-abort.stderr b/tests/ui/consts/const-eval/unwind-abort.stderr
index 759ce15ab..759ce15ab 100644
--- a/src/test/ui/consts/const-eval/unwind-abort.stderr
+++ b/tests/ui/consts/const-eval/unwind-abort.stderr
diff --git a/src/test/ui/consts/const-eval/valid-const.rs b/tests/ui/consts/const-eval/valid-const.rs
index 5f47d1c4f..5f47d1c4f 100644
--- a/src/test/ui/consts/const-eval/valid-const.rs
+++ b/tests/ui/consts/const-eval/valid-const.rs
diff --git a/src/test/ui/consts/const-eval/validate_uninhabited_zsts.32bit.stderr b/tests/ui/consts/const-eval/validate_uninhabited_zsts.32bit.stderr
index 9710bf476..9710bf476 100644
--- a/src/test/ui/consts/const-eval/validate_uninhabited_zsts.32bit.stderr
+++ b/tests/ui/consts/const-eval/validate_uninhabited_zsts.32bit.stderr
diff --git a/src/test/ui/consts/const-eval/validate_uninhabited_zsts.64bit.stderr b/tests/ui/consts/const-eval/validate_uninhabited_zsts.64bit.stderr
index 9710bf476..9710bf476 100644
--- a/src/test/ui/consts/const-eval/validate_uninhabited_zsts.64bit.stderr
+++ b/tests/ui/consts/const-eval/validate_uninhabited_zsts.64bit.stderr
diff --git a/src/test/ui/consts/const-eval/validate_uninhabited_zsts.rs b/tests/ui/consts/const-eval/validate_uninhabited_zsts.rs
index c0b326215..c0b326215 100644
--- a/src/test/ui/consts/const-eval/validate_uninhabited_zsts.rs
+++ b/tests/ui/consts/const-eval/validate_uninhabited_zsts.rs
diff --git a/src/test/ui/consts/const-eval/write-to-uninhabited-enum-variant.rs b/tests/ui/consts/const-eval/write-to-uninhabited-enum-variant.rs
index cccb7879f..cccb7879f 100644
--- a/src/test/ui/consts/const-eval/write-to-uninhabited-enum-variant.rs
+++ b/tests/ui/consts/const-eval/write-to-uninhabited-enum-variant.rs
diff --git a/src/test/ui/consts/const-eval/zst_operand_eval.rs b/tests/ui/consts/const-eval/zst_operand_eval.rs
index 5f7ddf7f7..5f7ddf7f7 100644
--- a/src/test/ui/consts/const-eval/zst_operand_eval.rs
+++ b/tests/ui/consts/const-eval/zst_operand_eval.rs
diff --git a/src/test/ui/consts/const-expr-addr-operator.rs b/tests/ui/consts/const-expr-addr-operator.rs
index 37bf24c2f..37bf24c2f 100644
--- a/src/test/ui/consts/const-expr-addr-operator.rs
+++ b/tests/ui/consts/const-expr-addr-operator.rs
diff --git a/src/test/ui/consts/const-expr-in-fixed-length-vec.rs b/tests/ui/consts/const-expr-in-fixed-length-vec.rs
index a9960b455..a9960b455 100644
--- a/src/test/ui/consts/const-expr-in-fixed-length-vec.rs
+++ b/tests/ui/consts/const-expr-in-fixed-length-vec.rs
diff --git a/src/test/ui/consts/const-expr-in-vec-repeat.rs b/tests/ui/consts/const-expr-in-vec-repeat.rs
index 4eaef2505..4eaef2505 100644
--- a/src/test/ui/consts/const-expr-in-vec-repeat.rs
+++ b/tests/ui/consts/const-expr-in-vec-repeat.rs
diff --git a/src/test/ui/consts/const-extern-fn/const-extern-fn-call-extern-fn.rs b/tests/ui/consts/const-extern-fn/const-extern-fn-call-extern-fn.rs
index eccda49db..eccda49db 100644
--- a/src/test/ui/consts/const-extern-fn/const-extern-fn-call-extern-fn.rs
+++ b/tests/ui/consts/const-extern-fn/const-extern-fn-call-extern-fn.rs
diff --git a/src/test/ui/consts/const-extern-fn/const-extern-fn-call-extern-fn.stderr b/tests/ui/consts/const-extern-fn/const-extern-fn-call-extern-fn.stderr
index 5acf22e4b..5acf22e4b 100644
--- a/src/test/ui/consts/const-extern-fn/const-extern-fn-call-extern-fn.stderr
+++ b/tests/ui/consts/const-extern-fn/const-extern-fn-call-extern-fn.stderr
diff --git a/src/test/ui/consts/const-extern-fn/const-extern-fn-min-const-fn.rs b/tests/ui/consts/const-extern-fn/const-extern-fn-min-const-fn.rs
index c7078e46f..c7078e46f 100644
--- a/src/test/ui/consts/const-extern-fn/const-extern-fn-min-const-fn.rs
+++ b/tests/ui/consts/const-extern-fn/const-extern-fn-min-const-fn.rs
diff --git a/src/test/ui/consts/const-extern-fn/const-extern-fn-min-const-fn.stderr b/tests/ui/consts/const-extern-fn/const-extern-fn-min-const-fn.stderr
index 4bab466fb..4bab466fb 100644
--- a/src/test/ui/consts/const-extern-fn/const-extern-fn-min-const-fn.stderr
+++ b/tests/ui/consts/const-extern-fn/const-extern-fn-min-const-fn.stderr
diff --git a/src/test/ui/consts/const-extern-fn/const-extern-fn-requires-unsafe.mir.stderr b/tests/ui/consts/const-extern-fn/const-extern-fn-requires-unsafe.mir.stderr
index 34ec8aadb..34ec8aadb 100644
--- a/src/test/ui/consts/const-extern-fn/const-extern-fn-requires-unsafe.mir.stderr
+++ b/tests/ui/consts/const-extern-fn/const-extern-fn-requires-unsafe.mir.stderr
diff --git a/src/test/ui/consts/const-extern-fn/const-extern-fn-requires-unsafe.rs b/tests/ui/consts/const-extern-fn/const-extern-fn-requires-unsafe.rs
index afe645ae8..afe645ae8 100644
--- a/src/test/ui/consts/const-extern-fn/const-extern-fn-requires-unsafe.rs
+++ b/tests/ui/consts/const-extern-fn/const-extern-fn-requires-unsafe.rs
diff --git a/src/test/ui/consts/const-extern-fn/const-extern-fn-requires-unsafe.thir.stderr b/tests/ui/consts/const-extern-fn/const-extern-fn-requires-unsafe.thir.stderr
index b313f0653..b313f0653 100644
--- a/src/test/ui/consts/const-extern-fn/const-extern-fn-requires-unsafe.thir.stderr
+++ b/tests/ui/consts/const-extern-fn/const-extern-fn-requires-unsafe.thir.stderr
diff --git a/src/test/ui/consts/const-extern-fn/const-extern-fn.rs b/tests/ui/consts/const-extern-fn/const-extern-fn.rs
index 2ce2eafd5..2ce2eafd5 100644
--- a/src/test/ui/consts/const-extern-fn/const-extern-fn.rs
+++ b/tests/ui/consts/const-extern-fn/const-extern-fn.rs
diff --git a/src/test/ui/consts/const-extern-fn/feature-gate-const_extern_fn.rs b/tests/ui/consts/const-extern-fn/feature-gate-const_extern_fn.rs
index f7bed91b0..f7bed91b0 100644
--- a/src/test/ui/consts/const-extern-fn/feature-gate-const_extern_fn.rs
+++ b/tests/ui/consts/const-extern-fn/feature-gate-const_extern_fn.rs
diff --git a/src/test/ui/consts/const-extern-fn/feature-gate-const_extern_fn.stderr b/tests/ui/consts/const-extern-fn/feature-gate-const_extern_fn.stderr
index f8c3107bd..f8c3107bd 100644
--- a/src/test/ui/consts/const-extern-fn/feature-gate-const_extern_fn.stderr
+++ b/tests/ui/consts/const-extern-fn/feature-gate-const_extern_fn.stderr
diff --git a/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier-2.rs b/tests/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier-2.rs
index 7ced24808..7ced24808 100644
--- a/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier-2.rs
+++ b/tests/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier-2.rs
diff --git a/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier-2.stderr b/tests/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier-2.stderr
index 5ec9e2a91..5ec9e2a91 100644
--- a/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier-2.stderr
+++ b/tests/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier-2.stderr
diff --git a/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.rs b/tests/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.rs
index 6f575d055..6f575d055 100644
--- a/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.rs
+++ b/tests/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.rs
diff --git a/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.stderr b/tests/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.stderr
index ec415ec9d..ec415ec9d 100644
--- a/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.stderr
+++ b/tests/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.stderr
diff --git a/src/test/ui/consts/const-extern-function.rs b/tests/ui/consts/const-extern-function.rs
index 01f487a7d..01f487a7d 100644
--- a/src/test/ui/consts/const-extern-function.rs
+++ b/tests/ui/consts/const-extern-function.rs
diff --git a/src/test/ui/consts/const-external-macro-const-err.rs b/tests/ui/consts/const-external-macro-const-err.rs
index 5bd84330b..5bd84330b 100644
--- a/src/test/ui/consts/const-external-macro-const-err.rs
+++ b/tests/ui/consts/const-external-macro-const-err.rs
diff --git a/src/test/ui/consts/const-external-macro-const-err.stderr b/tests/ui/consts/const-external-macro-const-err.stderr
index 81f6c09ff..81f6c09ff 100644
--- a/src/test/ui/consts/const-external-macro-const-err.stderr
+++ b/tests/ui/consts/const-external-macro-const-err.stderr
diff --git a/src/test/ui/consts/const-fields-and-indexing.rs b/tests/ui/consts/const-fields-and-indexing.rs
index bb13bebf4..bb13bebf4 100644
--- a/src/test/ui/consts/const-fields-and-indexing.rs
+++ b/tests/ui/consts/const-fields-and-indexing.rs
diff --git a/src/test/ui/consts/const-float-bits-conv.rs b/tests/ui/consts/const-float-bits-conv.rs
index fd5e42ef1..fd5e42ef1 100644
--- a/src/test/ui/consts/const-float-bits-conv.rs
+++ b/tests/ui/consts/const-float-bits-conv.rs
diff --git a/src/test/ui/consts/const-float-bits-reject-conv.rs b/tests/ui/consts/const-float-bits-reject-conv.rs
index c77e99abb..c77e99abb 100644
--- a/src/test/ui/consts/const-float-bits-reject-conv.rs
+++ b/tests/ui/consts/const-float-bits-reject-conv.rs
diff --git a/tests/ui/consts/const-float-bits-reject-conv.stderr b/tests/ui/consts/const-float-bits-reject-conv.stderr
new file mode 100644
index 000000000..7ad022520
--- /dev/null
+++ b/tests/ui/consts/const-float-bits-reject-conv.stderr
@@ -0,0 +1,115 @@
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/num/f32.rs:LL:COL
+   |
+   = note: the evaluated program panicked at 'const-eval error: cannot use f32::to_bits on a NaN', $SRC_DIR/core/src/num/f32.rs:LL:COL
+   |
+note: inside `core::f32::<impl f32>::to_bits::ct_f32_to_u32`
+  --> $SRC_DIR/core/src/num/f32.rs:LL:COL
+note: inside `core::f32::<impl f32>::to_bits`
+  --> $SRC_DIR/core/src/num/f32.rs:LL:COL
+note: inside `f32::MASKED_NAN1`
+  --> $DIR/const-float-bits-reject-conv.rs:28:30
+   |
+LL |     const MASKED_NAN1: u32 = f32::NAN.to_bits() ^ 0x002A_AAAA;
+   |                              ^^^^^^^^^^^^^^^^^^
+   = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/num/f32.rs:LL:COL
+   |
+   = note: the evaluated program panicked at 'const-eval error: cannot use f32::to_bits on a NaN', $SRC_DIR/core/src/num/f32.rs:LL:COL
+   |
+note: inside `core::f32::<impl f32>::to_bits::ct_f32_to_u32`
+  --> $SRC_DIR/core/src/num/f32.rs:LL:COL
+note: inside `core::f32::<impl f32>::to_bits`
+  --> $SRC_DIR/core/src/num/f32.rs:LL:COL
+note: inside `f32::MASKED_NAN2`
+  --> $DIR/const-float-bits-reject-conv.rs:30:30
+   |
+LL |     const MASKED_NAN2: u32 = f32::NAN.to_bits() ^ 0x0055_5555;
+   |                              ^^^^^^^^^^^^^^^^^^
+   = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+note: erroneous constant used
+  --> $DIR/const-float-bits-reject-conv.rs:35:34
+   |
+LL |     const_assert!(f32::from_bits(MASKED_NAN1).is_nan());
+   |                                  ^^^^^^^^^^^
+
+note: erroneous constant used
+  --> $DIR/const-float-bits-reject-conv.rs:36:34
+   |
+LL |     const_assert!(f32::from_bits(MASKED_NAN1).is_nan());
+   |                                  ^^^^^^^^^^^
+
+note: erroneous constant used
+  --> $DIR/const-float-bits-reject-conv.rs:42:34
+   |
+LL |     const_assert!(f32::from_bits(MASKED_NAN1).to_bits(), MASKED_NAN1);
+   |                                  ^^^^^^^^^^^
+
+note: erroneous constant used
+  --> $DIR/const-float-bits-reject-conv.rs:43:34
+   |
+LL |     const_assert!(f32::from_bits(MASKED_NAN2).to_bits(), MASKED_NAN2);
+   |                                  ^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/num/f64.rs:LL:COL
+   |
+   = note: the evaluated program panicked at 'const-eval error: cannot use f64::to_bits on a NaN', $SRC_DIR/core/src/num/f64.rs:LL:COL
+   |
+note: inside `core::f64::<impl f64>::to_bits::ct_f64_to_u64`
+  --> $SRC_DIR/core/src/num/f64.rs:LL:COL
+note: inside `core::f64::<impl f64>::to_bits`
+  --> $SRC_DIR/core/src/num/f64.rs:LL:COL
+note: inside `f64::MASKED_NAN1`
+  --> $DIR/const-float-bits-reject-conv.rs:50:30
+   |
+LL |     const MASKED_NAN1: u64 = f64::NAN.to_bits() ^ 0x000A_AAAA_AAAA_AAAA;
+   |                              ^^^^^^^^^^^^^^^^^^
+   = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/num/f64.rs:LL:COL
+   |
+   = note: the evaluated program panicked at 'const-eval error: cannot use f64::to_bits on a NaN', $SRC_DIR/core/src/num/f64.rs:LL:COL
+   |
+note: inside `core::f64::<impl f64>::to_bits::ct_f64_to_u64`
+  --> $SRC_DIR/core/src/num/f64.rs:LL:COL
+note: inside `core::f64::<impl f64>::to_bits`
+  --> $SRC_DIR/core/src/num/f64.rs:LL:COL
+note: inside `f64::MASKED_NAN2`
+  --> $DIR/const-float-bits-reject-conv.rs:52:30
+   |
+LL |     const MASKED_NAN2: u64 = f64::NAN.to_bits() ^ 0x0005_5555_5555_5555;
+   |                              ^^^^^^^^^^^^^^^^^^
+   = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+note: erroneous constant used
+  --> $DIR/const-float-bits-reject-conv.rs:57:34
+   |
+LL |     const_assert!(f64::from_bits(MASKED_NAN1).is_nan());
+   |                                  ^^^^^^^^^^^
+
+note: erroneous constant used
+  --> $DIR/const-float-bits-reject-conv.rs:58:34
+   |
+LL |     const_assert!(f64::from_bits(MASKED_NAN1).is_nan());
+   |                                  ^^^^^^^^^^^
+
+note: erroneous constant used
+  --> $DIR/const-float-bits-reject-conv.rs:61:34
+   |
+LL |     const_assert!(f64::from_bits(MASKED_NAN1).to_bits(), MASKED_NAN1);
+   |                                  ^^^^^^^^^^^
+
+note: erroneous constant used
+  --> $DIR/const-float-bits-reject-conv.rs:62:34
+   |
+LL |     const_assert!(f64::from_bits(MASKED_NAN2).to_bits(), MASKED_NAN2);
+   |                                  ^^^^^^^^^^^
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/const-float-classify.rs b/tests/ui/consts/const-float-classify.rs
index 74238d0dd..74238d0dd 100644
--- a/src/test/ui/consts/const-float-classify.rs
+++ b/tests/ui/consts/const-float-classify.rs
diff --git a/src/test/ui/consts/const-fn-const-eval.rs b/tests/ui/consts/const-fn-const-eval.rs
index d4da99081..d4da99081 100644
--- a/src/test/ui/consts/const-fn-const-eval.rs
+++ b/tests/ui/consts/const-fn-const-eval.rs
diff --git a/src/test/ui/consts/const-fn-destructuring-arg.rs b/tests/ui/consts/const-fn-destructuring-arg.rs
index ea5c9ddc7..ea5c9ddc7 100644
--- a/src/test/ui/consts/const-fn-destructuring-arg.rs
+++ b/tests/ui/consts/const-fn-destructuring-arg.rs
diff --git a/src/test/ui/consts/const-fn-error.rs b/tests/ui/consts/const-fn-error.rs
index 50b7ce1f8..50b7ce1f8 100644
--- a/src/test/ui/consts/const-fn-error.rs
+++ b/tests/ui/consts/const-fn-error.rs
diff --git a/src/test/ui/consts/const-fn-error.stderr b/tests/ui/consts/const-fn-error.stderr
index 02960b363..f735b3d53 100644
--- a/src/test/ui/consts/const-fn-error.stderr
+++ b/tests/ui/consts/const-fn-error.stderr
@@ -21,10 +21,8 @@ LL |     for i in 0..x {
    |
 note: impl defined here, but it is not `const`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL | impl<I: Iterator> const IntoIterator for I {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error[E0658]: mutable references are not allowed in constant functions
   --> $DIR/const-fn-error.rs:5:14
@@ -42,6 +40,7 @@ LL |     for i in 0..x {
    |              ^^^^
    |
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/consts/const-fn-in-vec.rs b/tests/ui/consts/const-fn-in-vec.rs
index a40290eca..a40290eca 100644
--- a/src/test/ui/consts/const-fn-in-vec.rs
+++ b/tests/ui/consts/const-fn-in-vec.rs
diff --git a/src/test/ui/consts/const-fn-in-vec.stderr b/tests/ui/consts/const-fn-in-vec.stderr
index 9eb7524b5..9eb7524b5 100644
--- a/src/test/ui/consts/const-fn-in-vec.stderr
+++ b/tests/ui/consts/const-fn-in-vec.stderr
diff --git a/src/test/ui/consts/const-fn-method.rs b/tests/ui/consts/const-fn-method.rs
index 002646db9..002646db9 100644
--- a/src/test/ui/consts/const-fn-method.rs
+++ b/tests/ui/consts/const-fn-method.rs
diff --git a/src/test/ui/consts/const-fn-mismatch.rs b/tests/ui/consts/const-fn-mismatch.rs
index 3107b8128..3107b8128 100644
--- a/src/test/ui/consts/const-fn-mismatch.rs
+++ b/tests/ui/consts/const-fn-mismatch.rs
diff --git a/src/test/ui/consts/const-fn-mismatch.stderr b/tests/ui/consts/const-fn-mismatch.stderr
index a86a06b3e..a86a06b3e 100644
--- a/src/test/ui/consts/const-fn-mismatch.stderr
+++ b/tests/ui/consts/const-fn-mismatch.stderr
diff --git a/src/test/ui/consts/const-fn-nested.rs b/tests/ui/consts/const-fn-nested.rs
index ef5598bf9..ef5598bf9 100644
--- a/src/test/ui/consts/const-fn-nested.rs
+++ b/tests/ui/consts/const-fn-nested.rs
diff --git a/src/test/ui/consts/const-fn-not-in-trait.rs b/tests/ui/consts/const-fn-not-in-trait.rs
index 00bae3f3b..00bae3f3b 100644
--- a/src/test/ui/consts/const-fn-not-in-trait.rs
+++ b/tests/ui/consts/const-fn-not-in-trait.rs
diff --git a/src/test/ui/consts/const-fn-not-in-trait.stderr b/tests/ui/consts/const-fn-not-in-trait.stderr
index 5d364eb88..5d364eb88 100644
--- a/src/test/ui/consts/const-fn-not-in-trait.stderr
+++ b/tests/ui/consts/const-fn-not-in-trait.stderr
diff --git a/src/test/ui/consts/const-fn-not-safe-for-const.rs b/tests/ui/consts/const-fn-not-safe-for-const.rs
index b2fe73ae9..b2fe73ae9 100644
--- a/src/test/ui/consts/const-fn-not-safe-for-const.rs
+++ b/tests/ui/consts/const-fn-not-safe-for-const.rs
diff --git a/src/test/ui/consts/const-fn-not-safe-for-const.stderr b/tests/ui/consts/const-fn-not-safe-for-const.stderr
index 4c7effc0d..4c7effc0d 100644
--- a/src/test/ui/consts/const-fn-not-safe-for-const.stderr
+++ b/tests/ui/consts/const-fn-not-safe-for-const.stderr
diff --git a/src/test/ui/consts/const-fn-ptr.rs b/tests/ui/consts/const-fn-ptr.rs
index b1befdf06..b1befdf06 100644
--- a/src/test/ui/consts/const-fn-ptr.rs
+++ b/tests/ui/consts/const-fn-ptr.rs
diff --git a/src/test/ui/consts/const-fn-ptr.stderr b/tests/ui/consts/const-fn-ptr.stderr
index 84b02a25e..84b02a25e 100644
--- a/src/test/ui/consts/const-fn-ptr.stderr
+++ b/tests/ui/consts/const-fn-ptr.stderr
diff --git a/src/test/ui/consts/const-fn-stability-calls-3.rs b/tests/ui/consts/const-fn-stability-calls-3.rs
index b831dee58..b831dee58 100644
--- a/src/test/ui/consts/const-fn-stability-calls-3.rs
+++ b/tests/ui/consts/const-fn-stability-calls-3.rs
diff --git a/src/test/ui/consts/const-fn-stability-calls.rs b/tests/ui/consts/const-fn-stability-calls.rs
index 138679048..138679048 100644
--- a/src/test/ui/consts/const-fn-stability-calls.rs
+++ b/tests/ui/consts/const-fn-stability-calls.rs
diff --git a/src/test/ui/consts/const-fn-type-name-any.rs b/tests/ui/consts/const-fn-type-name-any.rs
index 448c4fc04..448c4fc04 100644
--- a/src/test/ui/consts/const-fn-type-name-any.rs
+++ b/tests/ui/consts/const-fn-type-name-any.rs
diff --git a/src/test/ui/consts/const-fn-type-name.rs b/tests/ui/consts/const-fn-type-name.rs
index fd4f60cb8..fd4f60cb8 100644
--- a/src/test/ui/consts/const-fn-type-name.rs
+++ b/tests/ui/consts/const-fn-type-name.rs
diff --git a/src/test/ui/consts/const-fn-val.rs b/tests/ui/consts/const-fn-val.rs
index e5bf4757e..e5bf4757e 100644
--- a/src/test/ui/consts/const-fn-val.rs
+++ b/tests/ui/consts/const-fn-val.rs
diff --git a/src/test/ui/consts/const-fn-zst-args.rs b/tests/ui/consts/const-fn-zst-args.rs
index 82c27b375..82c27b375 100644
--- a/src/test/ui/consts/const-fn-zst-args.rs
+++ b/tests/ui/consts/const-fn-zst-args.rs
diff --git a/src/test/ui/consts/const-fn.rs b/tests/ui/consts/const-fn.rs
index 59680e6e4..59680e6e4 100644
--- a/src/test/ui/consts/const-fn.rs
+++ b/tests/ui/consts/const-fn.rs
diff --git a/src/test/ui/consts/const-for-feature-gate.rs b/tests/ui/consts/const-for-feature-gate.rs
index bec7b8089..bec7b8089 100644
--- a/src/test/ui/consts/const-for-feature-gate.rs
+++ b/tests/ui/consts/const-for-feature-gate.rs
diff --git a/src/test/ui/consts/const-for-feature-gate.stderr b/tests/ui/consts/const-for-feature-gate.stderr
index 2ea377e09..2ea377e09 100644
--- a/src/test/ui/consts/const-for-feature-gate.stderr
+++ b/tests/ui/consts/const-for-feature-gate.stderr
diff --git a/src/test/ui/consts/const-for.rs b/tests/ui/consts/const-for.rs
index 8db248535..8db248535 100644
--- a/src/test/ui/consts/const-for.rs
+++ b/tests/ui/consts/const-for.rs
diff --git a/src/test/ui/consts/const-for.stderr b/tests/ui/consts/const-for.stderr
index 11e4ae309..3fb9787c0 100644
--- a/src/test/ui/consts/const-for.stderr
+++ b/tests/ui/consts/const-for.stderr
@@ -6,10 +6,8 @@ LL |     for _ in 0..5 {}
    |
 note: impl defined here, but it is not `const`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL | impl<I: Iterator> const IntoIterator for I {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error[E0015]: cannot call non-const fn `<std::ops::Range<i32> as Iterator>::next` in constants
   --> $DIR/const-for.rs:5:14
@@ -18,6 +16,7 @@ LL |     for _ in 0..5 {}
    |              ^^^^
    |
    = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/consts/const-index-feature-gate.rs b/tests/ui/consts/const-index-feature-gate.rs
index 3537a1790..3537a1790 100644
--- a/src/test/ui/consts/const-index-feature-gate.rs
+++ b/tests/ui/consts/const-index-feature-gate.rs
diff --git a/src/test/ui/consts/const-int-arithmetic-overflow.rs b/tests/ui/consts/const-int-arithmetic-overflow.rs
index 6446e9451..6446e9451 100644
--- a/src/test/ui/consts/const-int-arithmetic-overflow.rs
+++ b/tests/ui/consts/const-int-arithmetic-overflow.rs
diff --git a/src/test/ui/consts/const-int-arithmetic.rs b/tests/ui/consts/const-int-arithmetic.rs
index b9096648f..b9096648f 100644
--- a/src/test/ui/consts/const-int-arithmetic.rs
+++ b/tests/ui/consts/const-int-arithmetic.rs
diff --git a/src/test/ui/consts/const-int-conversion-rpass.rs b/tests/ui/consts/const-int-conversion-rpass.rs
index 4aaeeaa38..4aaeeaa38 100644
--- a/src/test/ui/consts/const-int-conversion-rpass.rs
+++ b/tests/ui/consts/const-int-conversion-rpass.rs
diff --git a/src/test/ui/consts/const-int-conversion.rs b/tests/ui/consts/const-int-conversion.rs
index 5a05a2b35..5a05a2b35 100644
--- a/src/test/ui/consts/const-int-conversion.rs
+++ b/tests/ui/consts/const-int-conversion.rs
diff --git a/src/test/ui/consts/const-int-conversion.stderr b/tests/ui/consts/const-int-conversion.stderr
index 5dd757e3f..5dd757e3f 100644
--- a/src/test/ui/consts/const-int-conversion.stderr
+++ b/tests/ui/consts/const-int-conversion.stderr
diff --git a/src/test/ui/consts/const-int-overflowing-rpass.rs b/tests/ui/consts/const-int-overflowing-rpass.rs
index 75e77fdf1..75e77fdf1 100644
--- a/src/test/ui/consts/const-int-overflowing-rpass.rs
+++ b/tests/ui/consts/const-int-overflowing-rpass.rs
diff --git a/src/test/ui/consts/const-int-overflowing.rs b/tests/ui/consts/const-int-overflowing.rs
index cd74c9990..cd74c9990 100644
--- a/src/test/ui/consts/const-int-overflowing.rs
+++ b/tests/ui/consts/const-int-overflowing.rs
diff --git a/src/test/ui/consts/const-int-overflowing.stderr b/tests/ui/consts/const-int-overflowing.stderr
index 7d3689e6e..7d3689e6e 100644
--- a/src/test/ui/consts/const-int-overflowing.stderr
+++ b/tests/ui/consts/const-int-overflowing.stderr
diff --git a/src/test/ui/consts/const-int-pow-rpass.rs b/tests/ui/consts/const-int-pow-rpass.rs
index 30bcb78bc..30bcb78bc 100644
--- a/src/test/ui/consts/const-int-pow-rpass.rs
+++ b/tests/ui/consts/const-int-pow-rpass.rs
diff --git a/src/test/ui/consts/const-int-rotate-rpass.rs b/tests/ui/consts/const-int-rotate-rpass.rs
index 14f34f76c..14f34f76c 100644
--- a/src/test/ui/consts/const-int-rotate-rpass.rs
+++ b/tests/ui/consts/const-int-rotate-rpass.rs
diff --git a/src/test/ui/consts/const-int-rotate.rs b/tests/ui/consts/const-int-rotate.rs
index 3aacf854d..3aacf854d 100644
--- a/src/test/ui/consts/const-int-rotate.rs
+++ b/tests/ui/consts/const-int-rotate.rs
diff --git a/src/test/ui/consts/const-int-rotate.stderr b/tests/ui/consts/const-int-rotate.stderr
index 039da1c31..039da1c31 100644
--- a/src/test/ui/consts/const-int-rotate.stderr
+++ b/tests/ui/consts/const-int-rotate.stderr
diff --git a/src/test/ui/consts/const-int-saturating-arith.rs b/tests/ui/consts/const-int-saturating-arith.rs
index 7edbdd4ce..7edbdd4ce 100644
--- a/src/test/ui/consts/const-int-saturating-arith.rs
+++ b/tests/ui/consts/const-int-saturating-arith.rs
diff --git a/src/test/ui/consts/const-int-sign-rpass.rs b/tests/ui/consts/const-int-sign-rpass.rs
index 63c191d42..63c191d42 100644
--- a/src/test/ui/consts/const-int-sign-rpass.rs
+++ b/tests/ui/consts/const-int-sign-rpass.rs
diff --git a/src/test/ui/consts/const-int-sign.rs b/tests/ui/consts/const-int-sign.rs
index c3111ddf5..c3111ddf5 100644
--- a/src/test/ui/consts/const-int-sign.rs
+++ b/tests/ui/consts/const-int-sign.rs
diff --git a/src/test/ui/consts/const-int-sign.stderr b/tests/ui/consts/const-int-sign.stderr
index fc23d9d2b..fc23d9d2b 100644
--- a/src/test/ui/consts/const-int-sign.stderr
+++ b/tests/ui/consts/const-int-sign.stderr
diff --git a/src/test/ui/consts/const-int-unchecked.rs b/tests/ui/consts/const-int-unchecked.rs
index 902a66848..902a66848 100644
--- a/src/test/ui/consts/const-int-unchecked.rs
+++ b/tests/ui/consts/const-int-unchecked.rs
diff --git a/src/test/ui/consts/const-int-unchecked.stderr b/tests/ui/consts/const-int-unchecked.stderr
index ad880d56d..ad880d56d 100644
--- a/src/test/ui/consts/const-int-unchecked.stderr
+++ b/tests/ui/consts/const-int-unchecked.stderr
diff --git a/src/test/ui/consts/const-int-wrapping-rpass.rs b/tests/ui/consts/const-int-wrapping-rpass.rs
index 225d1e939..225d1e939 100644
--- a/src/test/ui/consts/const-int-wrapping-rpass.rs
+++ b/tests/ui/consts/const-int-wrapping-rpass.rs
diff --git a/src/test/ui/consts/const-int-wrapping.rs b/tests/ui/consts/const-int-wrapping.rs
index 50d04f964..50d04f964 100644
--- a/src/test/ui/consts/const-int-wrapping.rs
+++ b/tests/ui/consts/const-int-wrapping.rs
diff --git a/src/test/ui/consts/const-int-wrapping.stderr b/tests/ui/consts/const-int-wrapping.stderr
index 1342fadc4..1342fadc4 100644
--- a/src/test/ui/consts/const-int-wrapping.stderr
+++ b/tests/ui/consts/const-int-wrapping.stderr
diff --git a/src/test/ui/consts/const-integer-bool-ops.rs b/tests/ui/consts/const-integer-bool-ops.rs
index 4110ae3e4..4110ae3e4 100644
--- a/src/test/ui/consts/const-integer-bool-ops.rs
+++ b/tests/ui/consts/const-integer-bool-ops.rs
diff --git a/src/test/ui/consts/const-integer-bool-ops.stderr b/tests/ui/consts/const-integer-bool-ops.stderr
index b5c3b22fd..b5c3b22fd 100644
--- a/src/test/ui/consts/const-integer-bool-ops.stderr
+++ b/tests/ui/consts/const-integer-bool-ops.stderr
diff --git a/src/test/ui/consts/const-labeled-break.rs b/tests/ui/consts/const-labeled-break.rs
index 6864f7247..6864f7247 100644
--- a/src/test/ui/consts/const-labeled-break.rs
+++ b/tests/ui/consts/const-labeled-break.rs
diff --git a/src/test/ui/consts/const-len-underflow-separate-spans.rs b/tests/ui/consts/const-len-underflow-separate-spans.rs
index 4544c8876..4544c8876 100644
--- a/src/test/ui/consts/const-len-underflow-separate-spans.rs
+++ b/tests/ui/consts/const-len-underflow-separate-spans.rs
diff --git a/src/test/ui/consts/const-len-underflow-separate-spans.stderr b/tests/ui/consts/const-len-underflow-separate-spans.stderr
index 269553631..269553631 100644
--- a/src/test/ui/consts/const-len-underflow-separate-spans.stderr
+++ b/tests/ui/consts/const-len-underflow-separate-spans.stderr
diff --git a/src/test/ui/consts/const-len-underflow-subspans.rs b/tests/ui/consts/const-len-underflow-subspans.rs
index ed77e9078..ed77e9078 100644
--- a/src/test/ui/consts/const-len-underflow-subspans.rs
+++ b/tests/ui/consts/const-len-underflow-subspans.rs
diff --git a/src/test/ui/consts/const-len-underflow-subspans.stderr b/tests/ui/consts/const-len-underflow-subspans.stderr
index 68e958b37..68e958b37 100644
--- a/src/test/ui/consts/const-len-underflow-subspans.stderr
+++ b/tests/ui/consts/const-len-underflow-subspans.stderr
diff --git a/tests/ui/consts/const-match-check.eval1.stderr b/tests/ui/consts/const-match-check.eval1.stderr
new file mode 100644
index 000000000..08fcd1dea
--- /dev/null
+++ b/tests/ui/consts/const-match-check.eval1.stderr
@@ -0,0 +1,21 @@
+error[E0005]: refutable pattern in local binding
+  --> $DIR/const-match-check.rs:25:15
+   |
+LL |     A = { let 0 = 0; 0 },
+   |               ^ patterns `i32::MIN..=-1_i32` and `1_i32..=i32::MAX` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+   = note: the matched value is of type `i32`
+help: you might want to use `if let` to ignore the variants that aren't matched
+   |
+LL |     A = { if let 0 = 0 { todo!() } 0 },
+   |           ++           ~~~~~~~~~~~
+help: alternatively, you could prepend the pattern with an underscore to define a new named variable; identifiers cannot begin with digits
+   |
+LL |     A = { let _0 = 0; 0 },
+   |               +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/tests/ui/consts/const-match-check.eval2.stderr b/tests/ui/consts/const-match-check.eval2.stderr
new file mode 100644
index 000000000..5d86ca4bf
--- /dev/null
+++ b/tests/ui/consts/const-match-check.eval2.stderr
@@ -0,0 +1,21 @@
+error[E0005]: refutable pattern in local binding
+  --> $DIR/const-match-check.rs:31:24
+   |
+LL |     let x: [i32; { let 0 = 0; 0 }] = [];
+   |                        ^ patterns `i32::MIN..=-1_i32` and `1_i32..=i32::MAX` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+   = note: the matched value is of type `i32`
+help: you might want to use `if let` to ignore the variants that aren't matched
+   |
+LL |     let x: [i32; { if let 0 = 0 { todo!() } 0 }] = [];
+   |                    ++           ~~~~~~~~~~~
+help: alternatively, you could prepend the pattern with an underscore to define a new named variable; identifiers cannot begin with digits
+   |
+LL |     let x: [i32; { let _0 = 0; 0 }] = [];
+   |                        +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/tests/ui/consts/const-match-check.matchck.stderr b/tests/ui/consts/const-match-check.matchck.stderr
new file mode 100644
index 000000000..c8f66bb0f
--- /dev/null
+++ b/tests/ui/consts/const-match-check.matchck.stderr
@@ -0,0 +1,75 @@
+error[E0005]: refutable pattern in local binding
+  --> $DIR/const-match-check.rs:4:22
+   |
+LL | const X: i32 = { let 0 = 0; 0 };
+   |                      ^ patterns `i32::MIN..=-1_i32` and `1_i32..=i32::MAX` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+   = note: the matched value is of type `i32`
+help: you might want to use `if let` to ignore the variants that aren't matched
+   |
+LL | const X: i32 = { if let 0 = 0 { todo!() } 0 };
+   |                  ++           ~~~~~~~~~~~
+help: alternatively, you could prepend the pattern with an underscore to define a new named variable; identifiers cannot begin with digits
+   |
+LL | const X: i32 = { let _0 = 0; 0 };
+   |                      +
+
+error[E0005]: refutable pattern in local binding
+  --> $DIR/const-match-check.rs:8:23
+   |
+LL | static Y: i32 = { let 0 = 0; 0 };
+   |                       ^ patterns `i32::MIN..=-1_i32` and `1_i32..=i32::MAX` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+   = note: the matched value is of type `i32`
+help: you might want to use `if let` to ignore the variants that aren't matched
+   |
+LL | static Y: i32 = { if let 0 = 0 { todo!() } 0 };
+   |                   ++           ~~~~~~~~~~~
+help: alternatively, you could prepend the pattern with an underscore to define a new named variable; identifiers cannot begin with digits
+   |
+LL | static Y: i32 = { let _0 = 0; 0 };
+   |                       +
+
+error[E0005]: refutable pattern in local binding
+  --> $DIR/const-match-check.rs:13:26
+   |
+LL |     const X: i32 = { let 0 = 0; 0 };
+   |                          ^ patterns `i32::MIN..=-1_i32` and `1_i32..=i32::MAX` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+   = note: the matched value is of type `i32`
+help: you might want to use `if let` to ignore the variants that aren't matched
+   |
+LL |     const X: i32 = { if let 0 = 0 { todo!() } 0 };
+   |                      ++           ~~~~~~~~~~~
+help: alternatively, you could prepend the pattern with an underscore to define a new named variable; identifiers cannot begin with digits
+   |
+LL |     const X: i32 = { let _0 = 0; 0 };
+   |                          +
+
+error[E0005]: refutable pattern in local binding
+  --> $DIR/const-match-check.rs:19:26
+   |
+LL |     const X: i32 = { let 0 = 0; 0 };
+   |                          ^ patterns `i32::MIN..=-1_i32` and `1_i32..=i32::MAX` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+   = note: the matched value is of type `i32`
+help: you might want to use `if let` to ignore the variants that aren't matched
+   |
+LL |     const X: i32 = { if let 0 = 0 { todo!() } 0 };
+   |                      ++           ~~~~~~~~~~~
+help: alternatively, you could prepend the pattern with an underscore to define a new named variable; identifiers cannot begin with digits
+   |
+LL |     const X: i32 = { let _0 = 0; 0 };
+   |                          +
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/consts/const-match-check.rs b/tests/ui/consts/const-match-check.rs
index 60f60fa40..60f60fa40 100644
--- a/src/test/ui/consts/const-match-check.rs
+++ b/tests/ui/consts/const-match-check.rs
diff --git a/src/test/ui/consts/const-match-pattern-arm.rs b/tests/ui/consts/const-match-pattern-arm.rs
index 90680c019..90680c019 100644
--- a/src/test/ui/consts/const-match-pattern-arm.rs
+++ b/tests/ui/consts/const-match-pattern-arm.rs
diff --git a/src/test/ui/consts/const-meth-pattern.rs b/tests/ui/consts/const-meth-pattern.rs
index 1544d760a..1544d760a 100644
--- a/src/test/ui/consts/const-meth-pattern.rs
+++ b/tests/ui/consts/const-meth-pattern.rs
diff --git a/src/test/ui/consts/const-multi-ref.rs b/tests/ui/consts/const-multi-ref.rs
index 7e0f1a812..7e0f1a812 100644
--- a/src/test/ui/consts/const-multi-ref.rs
+++ b/tests/ui/consts/const-multi-ref.rs
diff --git a/src/test/ui/consts/const-multi-ref.stderr b/tests/ui/consts/const-multi-ref.stderr
index dd5cadfe2..dd5cadfe2 100644
--- a/src/test/ui/consts/const-multi-ref.stderr
+++ b/tests/ui/consts/const-multi-ref.stderr
diff --git a/src/test/ui/consts/const-mut-refs/const_mut_address_of.rs b/tests/ui/consts/const-mut-refs/const_mut_address_of.rs
index 03b2f9e3c..03b2f9e3c 100644
--- a/src/test/ui/consts/const-mut-refs/const_mut_address_of.rs
+++ b/tests/ui/consts/const-mut-refs/const_mut_address_of.rs
diff --git a/src/test/ui/consts/const-mut-refs/const_mut_refs.rs b/tests/ui/consts/const-mut-refs/const_mut_refs.rs
index 544458dfc..544458dfc 100644
--- a/src/test/ui/consts/const-mut-refs/const_mut_refs.rs
+++ b/tests/ui/consts/const-mut-refs/const_mut_refs.rs
diff --git a/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.rs b/tests/ui/consts/const-mut-refs/feature-gate-const_mut_refs.rs
index ce9be4ac5..ce9be4ac5 100644
--- a/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.rs
+++ b/tests/ui/consts/const-mut-refs/feature-gate-const_mut_refs.rs
diff --git a/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.stderr b/tests/ui/consts/const-mut-refs/feature-gate-const_mut_refs.stderr
index 3f9bd3705..3f9bd3705 100644
--- a/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.stderr
+++ b/tests/ui/consts/const-mut-refs/feature-gate-const_mut_refs.stderr
diff --git a/src/test/ui/consts/const-mut-refs/issue-76510.32bit.stderr b/tests/ui/consts/const-mut-refs/issue-76510.32bit.stderr
index 109d15a8e..109d15a8e 100644
--- a/src/test/ui/consts/const-mut-refs/issue-76510.32bit.stderr
+++ b/tests/ui/consts/const-mut-refs/issue-76510.32bit.stderr
diff --git a/src/test/ui/consts/const-mut-refs/issue-76510.64bit.stderr b/tests/ui/consts/const-mut-refs/issue-76510.64bit.stderr
index 109d15a8e..109d15a8e 100644
--- a/src/test/ui/consts/const-mut-refs/issue-76510.64bit.stderr
+++ b/tests/ui/consts/const-mut-refs/issue-76510.64bit.stderr
diff --git a/src/test/ui/consts/const-mut-refs/issue-76510.rs b/tests/ui/consts/const-mut-refs/issue-76510.rs
index b853e2737..b853e2737 100644
--- a/src/test/ui/consts/const-mut-refs/issue-76510.rs
+++ b/tests/ui/consts/const-mut-refs/issue-76510.rs
diff --git a/src/test/ui/consts/const-mut-refs/mut_ref_in_final.rs b/tests/ui/consts/const-mut-refs/mut_ref_in_final.rs
index a7d329f12..a7d329f12 100644
--- a/src/test/ui/consts/const-mut-refs/mut_ref_in_final.rs
+++ b/tests/ui/consts/const-mut-refs/mut_ref_in_final.rs
diff --git a/src/test/ui/consts/const-mut-refs/mut_ref_in_final.stderr b/tests/ui/consts/const-mut-refs/mut_ref_in_final.stderr
index 78c58b5ab..78c58b5ab 100644
--- a/src/test/ui/consts/const-mut-refs/mut_ref_in_final.stderr
+++ b/tests/ui/consts/const-mut-refs/mut_ref_in_final.stderr
diff --git a/src/test/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs b/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs
index 074beaab2..074beaab2 100644
--- a/src/test/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs
+++ b/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs
diff --git a/src/test/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.stderr b/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.stderr
index 6e110dbdd..6e110dbdd 100644
--- a/src/test/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.stderr
+++ b/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.stderr
diff --git a/src/test/ui/consts/const-needs_drop-monomorphic.rs b/tests/ui/consts/const-needs_drop-monomorphic.rs
index 7402c6809..7402c6809 100644
--- a/src/test/ui/consts/const-needs_drop-monomorphic.rs
+++ b/tests/ui/consts/const-needs_drop-monomorphic.rs
diff --git a/src/test/ui/consts/const-needs_drop-monomorphic.stderr b/tests/ui/consts/const-needs_drop-monomorphic.stderr
index 0874a70ce..0874a70ce 100644
--- a/src/test/ui/consts/const-needs_drop-monomorphic.stderr
+++ b/tests/ui/consts/const-needs_drop-monomorphic.stderr
diff --git a/src/test/ui/consts/const-needs_drop.rs b/tests/ui/consts/const-needs_drop.rs
index 11ee7084c..11ee7084c 100644
--- a/src/test/ui/consts/const-needs_drop.rs
+++ b/tests/ui/consts/const-needs_drop.rs
diff --git a/src/test/ui/consts/const-negation.rs b/tests/ui/consts/const-negation.rs
index 18bcdfb01..18bcdfb01 100644
--- a/src/test/ui/consts/const-negation.rs
+++ b/tests/ui/consts/const-negation.rs
diff --git a/src/test/ui/consts/const-negative.rs b/tests/ui/consts/const-negative.rs
index 1cb560936..1cb560936 100644
--- a/src/test/ui/consts/const-negative.rs
+++ b/tests/ui/consts/const-negative.rs
diff --git a/src/test/ui/consts/const-nullary-enum.rs b/tests/ui/consts/const-nullary-enum.rs
index b6574dce6..b6574dce6 100644
--- a/src/test/ui/consts/const-nullary-enum.rs
+++ b/tests/ui/consts/const-nullary-enum.rs
diff --git a/src/test/ui/consts/const-nullary-univariant-enum.rs b/tests/ui/consts/const-nullary-univariant-enum.rs
index 51349ad31..51349ad31 100644
--- a/src/test/ui/consts/const-nullary-univariant-enum.rs
+++ b/tests/ui/consts/const-nullary-univariant-enum.rs
diff --git a/tests/ui/consts/const-pattern-irrefutable.rs b/tests/ui/consts/const-pattern-irrefutable.rs
new file mode 100644
index 000000000..61bdf57ff
--- /dev/null
+++ b/tests/ui/consts/const-pattern-irrefutable.rs
@@ -0,0 +1,28 @@
+mod foo {
+    pub const b: u8 = 2;
+    pub const d: u8 = 2;
+}
+
+use foo::b as c;
+use foo::d;
+
+const a: u8 = 2;
+
+fn main() {
+    let a = 4;
+    //~^ ERROR refutable pattern in local binding
+    //~| patterns `0_u8..=1_u8` and `3_u8..=u8::MAX` not covered
+    //~| missing patterns are not covered because `a` is interpreted as a constant pattern, not a new variable
+    //~| HELP introduce a variable instead
+    let c = 4;
+    //~^ ERROR refutable pattern in local binding
+    //~| patterns `0_u8..=1_u8` and `3_u8..=u8::MAX` not covered
+    //~| missing patterns are not covered because `c` is interpreted as a constant pattern, not a new variable
+    //~| HELP introduce a variable instead
+    let d = 4;
+    //~^ ERROR refutable pattern in local binding
+    //~| patterns `0_u8..=1_u8` and `3_u8..=u8::MAX` not covered
+    //~| missing patterns are not covered because `d` is interpreted as a constant pattern, not a new variable
+    //~| HELP introduce a variable instead
+    fn f() {} // Check that the `NOTE`s still work with an item here (cf. issue #35115).
+}
diff --git a/tests/ui/consts/const-pattern-irrefutable.stderr b/tests/ui/consts/const-pattern-irrefutable.stderr
new file mode 100644
index 000000000..c156ea161
--- /dev/null
+++ b/tests/ui/consts/const-pattern-irrefutable.stderr
@@ -0,0 +1,48 @@
+error[E0005]: refutable pattern in local binding
+  --> $DIR/const-pattern-irrefutable.rs:12:9
+   |
+LL | const a: u8 = 2;
+   | ----------- constant defined here
+...
+LL |     let a = 4;
+   |         ^
+   |         |
+   |         patterns `0_u8..=1_u8` and `3_u8..=u8::MAX` not covered
+   |         missing patterns are not covered because `a` is interpreted as a constant pattern, not a new variable
+   |         help: introduce a variable instead: `a_var`
+   |
+   = note: the matched value is of type `u8`
+
+error[E0005]: refutable pattern in local binding
+  --> $DIR/const-pattern-irrefutable.rs:17:9
+   |
+LL |     pub const b: u8 = 2;
+   |     --------------- constant defined here
+...
+LL |     let c = 4;
+   |         ^
+   |         |
+   |         patterns `0_u8..=1_u8` and `3_u8..=u8::MAX` not covered
+   |         missing patterns are not covered because `c` is interpreted as a constant pattern, not a new variable
+   |         help: introduce a variable instead: `c_var`
+   |
+   = note: the matched value is of type `u8`
+
+error[E0005]: refutable pattern in local binding
+  --> $DIR/const-pattern-irrefutable.rs:22:9
+   |
+LL |     pub const d: u8 = 2;
+   |     --------------- constant defined here
+...
+LL |     let d = 4;
+   |         ^
+   |         |
+   |         patterns `0_u8..=1_u8` and `3_u8..=u8::MAX` not covered
+   |         missing patterns are not covered because `d` is interpreted as a constant pattern, not a new variable
+   |         help: introduce a variable instead: `d_var`
+   |
+   = note: the matched value is of type `u8`
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/consts/const-pattern-not-const-evaluable.rs b/tests/ui/consts/const-pattern-not-const-evaluable.rs
index dae5343fe..dae5343fe 100644
--- a/src/test/ui/consts/const-pattern-not-const-evaluable.rs
+++ b/tests/ui/consts/const-pattern-not-const-evaluable.rs
diff --git a/src/test/ui/consts/const-pattern-variant.rs b/tests/ui/consts/const-pattern-variant.rs
index 80f749ed7..80f749ed7 100644
--- a/src/test/ui/consts/const-pattern-variant.rs
+++ b/tests/ui/consts/const-pattern-variant.rs
diff --git a/src/test/ui/consts/const-points-to-static.32bit.stderr b/tests/ui/consts/const-points-to-static.32bit.stderr
index c7a435a1e..c7a435a1e 100644
--- a/src/test/ui/consts/const-points-to-static.32bit.stderr
+++ b/tests/ui/consts/const-points-to-static.32bit.stderr
diff --git a/src/test/ui/consts/const-points-to-static.64bit.stderr b/tests/ui/consts/const-points-to-static.64bit.stderr
index 4d5b8eac5..4d5b8eac5 100644
--- a/src/test/ui/consts/const-points-to-static.64bit.stderr
+++ b/tests/ui/consts/const-points-to-static.64bit.stderr
diff --git a/src/test/ui/consts/const-points-to-static.rs b/tests/ui/consts/const-points-to-static.rs
index ca825a1f5..ca825a1f5 100644
--- a/src/test/ui/consts/const-points-to-static.rs
+++ b/tests/ui/consts/const-points-to-static.rs
diff --git a/src/test/ui/consts/const-prop-ice.rs b/tests/ui/consts/const-prop-ice.rs
index 5bffe0206..5bffe0206 100644
--- a/src/test/ui/consts/const-prop-ice.rs
+++ b/tests/ui/consts/const-prop-ice.rs
diff --git a/src/test/ui/consts/const-prop-ice.stderr b/tests/ui/consts/const-prop-ice.stderr
index 3bcf2b2de..3bcf2b2de 100644
--- a/src/test/ui/consts/const-prop-ice.stderr
+++ b/tests/ui/consts/const-prop-ice.stderr
diff --git a/src/test/ui/consts/const-prop-ice2.rs b/tests/ui/consts/const-prop-ice2.rs
index d533e394c..d533e394c 100644
--- a/src/test/ui/consts/const-prop-ice2.rs
+++ b/tests/ui/consts/const-prop-ice2.rs
diff --git a/src/test/ui/consts/const-prop-ice2.stderr b/tests/ui/consts/const-prop-ice2.stderr
index 2b65ffc2d..2b65ffc2d 100644
--- a/src/test/ui/consts/const-prop-ice2.stderr
+++ b/tests/ui/consts/const-prop-ice2.stderr
diff --git a/src/test/ui/consts/const-prop-ice3.rs b/tests/ui/consts/const-prop-ice3.rs
index 8ab011661..8ab011661 100644
--- a/src/test/ui/consts/const-prop-ice3.rs
+++ b/tests/ui/consts/const-prop-ice3.rs
diff --git a/src/test/ui/consts/const-prop-overflowing-casts.rs b/tests/ui/consts/const-prop-overflowing-casts.rs
index 8cc5b9825..8cc5b9825 100644
--- a/src/test/ui/consts/const-prop-overflowing-casts.rs
+++ b/tests/ui/consts/const-prop-overflowing-casts.rs
diff --git a/src/test/ui/consts/const-prop-read-static-in-const.rs b/tests/ui/consts/const-prop-read-static-in-const.rs
index 214262059..214262059 100644
--- a/src/test/ui/consts/const-prop-read-static-in-const.rs
+++ b/tests/ui/consts/const-prop-read-static-in-const.rs
diff --git a/src/test/ui/consts/const-prop-read-static-in-const.stderr b/tests/ui/consts/const-prop-read-static-in-const.stderr
index 793da6285..793da6285 100644
--- a/src/test/ui/consts/const-prop-read-static-in-const.stderr
+++ b/tests/ui/consts/const-prop-read-static-in-const.stderr
diff --git a/src/test/ui/consts/const-ptr-nonnull-rpass.rs b/tests/ui/consts/const-ptr-nonnull-rpass.rs
index 67d52ad08..67d52ad08 100644
--- a/src/test/ui/consts/const-ptr-nonnull-rpass.rs
+++ b/tests/ui/consts/const-ptr-nonnull-rpass.rs
diff --git a/src/test/ui/consts/const-ptr-nonnull.rs b/tests/ui/consts/const-ptr-nonnull.rs
index 25cf6cf4a..25cf6cf4a 100644
--- a/src/test/ui/consts/const-ptr-nonnull.rs
+++ b/tests/ui/consts/const-ptr-nonnull.rs
diff --git a/src/test/ui/consts/const-ptr-nonnull.stderr b/tests/ui/consts/const-ptr-nonnull.stderr
index dbcb0c860..dbcb0c860 100644
--- a/src/test/ui/consts/const-ptr-nonnull.stderr
+++ b/tests/ui/consts/const-ptr-nonnull.stderr
diff --git a/src/test/ui/consts/const-ptr-unique-rpass.rs b/tests/ui/consts/const-ptr-unique-rpass.rs
index fc13bb98b..fc13bb98b 100644
--- a/src/test/ui/consts/const-ptr-unique-rpass.rs
+++ b/tests/ui/consts/const-ptr-unique-rpass.rs
diff --git a/src/test/ui/consts/const-ptr-unique.rs b/tests/ui/consts/const-ptr-unique.rs
index 252c5d1a9..252c5d1a9 100644
--- a/src/test/ui/consts/const-ptr-unique.rs
+++ b/tests/ui/consts/const-ptr-unique.rs
diff --git a/src/test/ui/consts/const-ptr-unique.stderr b/tests/ui/consts/const-ptr-unique.stderr
index 83448c3e8..83448c3e8 100644
--- a/src/test/ui/consts/const-ptr-unique.stderr
+++ b/tests/ui/consts/const-ptr-unique.stderr
diff --git a/src/test/ui/consts/const-rec-and-tup.rs b/tests/ui/consts/const-rec-and-tup.rs
index 0bddaf75d..0bddaf75d 100644
--- a/src/test/ui/consts/const-rec-and-tup.rs
+++ b/tests/ui/consts/const-rec-and-tup.rs
diff --git a/src/test/ui/consts/const-region-ptrs-noncopy.rs b/tests/ui/consts/const-region-ptrs-noncopy.rs
index 10b9ce896..10b9ce896 100644
--- a/src/test/ui/consts/const-region-ptrs-noncopy.rs
+++ b/tests/ui/consts/const-region-ptrs-noncopy.rs
diff --git a/src/test/ui/consts/const-region-ptrs.rs b/tests/ui/consts/const-region-ptrs.rs
index 9b94a2b11..9b94a2b11 100644
--- a/src/test/ui/consts/const-region-ptrs.rs
+++ b/tests/ui/consts/const-region-ptrs.rs
diff --git a/src/test/ui/consts/const-repeated-values.rs b/tests/ui/consts/const-repeated-values.rs
index 27efb5ba2..27efb5ba2 100644
--- a/src/test/ui/consts/const-repeated-values.rs
+++ b/tests/ui/consts/const-repeated-values.rs
diff --git a/src/test/ui/consts/const-size_of-align_of.rs b/tests/ui/consts/const-size_of-align_of.rs
index 0c63dc84a..0c63dc84a 100644
--- a/src/test/ui/consts/const-size_of-align_of.rs
+++ b/tests/ui/consts/const-size_of-align_of.rs
diff --git a/src/test/ui/consts/const-size_of-cycle.rs b/tests/ui/consts/const-size_of-cycle.rs
index 1f56c8bd8..1f56c8bd8 100644
--- a/src/test/ui/consts/const-size_of-cycle.rs
+++ b/tests/ui/consts/const-size_of-cycle.rs
diff --git a/src/test/ui/consts/const-size_of-cycle.stderr b/tests/ui/consts/const-size_of-cycle.stderr
index 46f02ce8a..17088d999 100644
--- a/src/test/ui/consts/const-size_of-cycle.stderr
+++ b/tests/ui/consts/const-size_of-cycle.stderr
@@ -15,8 +15,8 @@ note: ...which requires const-evaluating + checking `Foo::bytes::{constant#0}`..
 LL |     bytes: [u8; std::mem::size_of::<Foo>()]
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: ...which requires computing layout of `Foo`...
-   = note: ...which requires computing layout of `[u8; _]`...
-   = note: ...which requires normalizing `[u8; _]`...
+   = note: ...which requires computing layout of `[u8; std::mem::size_of::<Foo>()]`...
+   = note: ...which requires normalizing `[u8; std::mem::size_of::<Foo>()]`...
    = note: ...which again requires evaluating type-level constant, completing the cycle
 note: cycle used when checking that `Foo` is well-formed
   --> $DIR/const-size_of-cycle.rs:3:1
diff --git a/src/test/ui/consts/const-size_of_val-align_of_val-extern-type.rs b/tests/ui/consts/const-size_of_val-align_of_val-extern-type.rs
index 4df3a793b..4df3a793b 100644
--- a/src/test/ui/consts/const-size_of_val-align_of_val-extern-type.rs
+++ b/tests/ui/consts/const-size_of_val-align_of_val-extern-type.rs
diff --git a/src/test/ui/consts/const-size_of_val-align_of_val-extern-type.stderr b/tests/ui/consts/const-size_of_val-align_of_val-extern-type.stderr
index ad2de0f4d..ad2de0f4d 100644
--- a/src/test/ui/consts/const-size_of_val-align_of_val-extern-type.stderr
+++ b/tests/ui/consts/const-size_of_val-align_of_val-extern-type.stderr
diff --git a/src/test/ui/consts/const-size_of_val-align_of_val.rs b/tests/ui/consts/const-size_of_val-align_of_val.rs
index e8323e4ae..e8323e4ae 100644
--- a/src/test/ui/consts/const-size_of_val-align_of_val.rs
+++ b/tests/ui/consts/const-size_of_val-align_of_val.rs
diff --git a/src/test/ui/consts/const-slice-oob.rs b/tests/ui/consts/const-slice-oob.rs
index 429b97821..429b97821 100644
--- a/src/test/ui/consts/const-slice-oob.rs
+++ b/tests/ui/consts/const-slice-oob.rs
diff --git a/src/test/ui/consts/const-slice-oob.stderr b/tests/ui/consts/const-slice-oob.stderr
index 746883a79..746883a79 100644
--- a/src/test/ui/consts/const-slice-oob.stderr
+++ b/tests/ui/consts/const-slice-oob.stderr
diff --git a/src/test/ui/consts/const-struct-offsets.rs b/tests/ui/consts/const-struct-offsets.rs
index 26a008320..26a008320 100644
--- a/src/test/ui/consts/const-struct-offsets.rs
+++ b/tests/ui/consts/const-struct-offsets.rs
diff --git a/src/test/ui/consts/const-struct.rs b/tests/ui/consts/const-struct.rs
index db397a891..db397a891 100644
--- a/src/test/ui/consts/const-struct.rs
+++ b/tests/ui/consts/const-struct.rs
diff --git a/src/test/ui/consts/const-suggest-feature.rs b/tests/ui/consts/const-suggest-feature.rs
index d76d01a3d..d76d01a3d 100644
--- a/src/test/ui/consts/const-suggest-feature.rs
+++ b/tests/ui/consts/const-suggest-feature.rs
diff --git a/src/test/ui/consts/const-suggest-feature.stderr b/tests/ui/consts/const-suggest-feature.stderr
index 3bc1eacf3..3bc1eacf3 100644
--- a/src/test/ui/consts/const-suggest-feature.stderr
+++ b/tests/ui/consts/const-suggest-feature.stderr
diff --git a/src/test/ui/consts/const-trait-to-trait.rs b/tests/ui/consts/const-trait-to-trait.rs
index 12a2999d7..12a2999d7 100644
--- a/src/test/ui/consts/const-trait-to-trait.rs
+++ b/tests/ui/consts/const-trait-to-trait.rs
diff --git a/src/test/ui/consts/const-try-feature-gate.rs b/tests/ui/consts/const-try-feature-gate.rs
index 0839c23a0..0839c23a0 100644
--- a/src/test/ui/consts/const-try-feature-gate.rs
+++ b/tests/ui/consts/const-try-feature-gate.rs
diff --git a/src/test/ui/consts/const-try-feature-gate.stderr b/tests/ui/consts/const-try-feature-gate.stderr
index cd1a06304..cd1a06304 100644
--- a/src/test/ui/consts/const-try-feature-gate.stderr
+++ b/tests/ui/consts/const-try-feature-gate.stderr
diff --git a/src/test/ui/consts/const-try.rs b/tests/ui/consts/const-try.rs
index e199fd9ff..e199fd9ff 100644
--- a/src/test/ui/consts/const-try.rs
+++ b/tests/ui/consts/const-try.rs
diff --git a/src/test/ui/consts/const-tup-index-span.rs b/tests/ui/consts/const-tup-index-span.rs
index 778a21224..778a21224 100644
--- a/src/test/ui/consts/const-tup-index-span.rs
+++ b/tests/ui/consts/const-tup-index-span.rs
diff --git a/src/test/ui/consts/const-tup-index-span.stderr b/tests/ui/consts/const-tup-index-span.stderr
index ad8468056..ad8468056 100644
--- a/src/test/ui/consts/const-tup-index-span.stderr
+++ b/tests/ui/consts/const-tup-index-span.stderr
diff --git a/src/test/ui/consts/const-tuple-struct.rs b/tests/ui/consts/const-tuple-struct.rs
index 0144afaac..0144afaac 100644
--- a/src/test/ui/consts/const-tuple-struct.rs
+++ b/tests/ui/consts/const-tuple-struct.rs
diff --git a/src/test/ui/consts/const-type-mismatch.rs b/tests/ui/consts/const-type-mismatch.rs
index 6e56c046f..6e56c046f 100644
--- a/src/test/ui/consts/const-type-mismatch.rs
+++ b/tests/ui/consts/const-type-mismatch.rs
diff --git a/src/test/ui/consts/const-type-mismatch.stderr b/tests/ui/consts/const-type-mismatch.stderr
index 17bb27d4b..17bb27d4b 100644
--- a/src/test/ui/consts/const-type-mismatch.stderr
+++ b/tests/ui/consts/const-type-mismatch.stderr
diff --git a/src/test/ui/consts/const-typeid-of-rpass.rs b/tests/ui/consts/const-typeid-of-rpass.rs
index 89d57ae4f..89d57ae4f 100644
--- a/src/test/ui/consts/const-typeid-of-rpass.rs
+++ b/tests/ui/consts/const-typeid-of-rpass.rs
diff --git a/src/test/ui/consts/const-unit-struct.rs b/tests/ui/consts/const-unit-struct.rs
index 1c9e0e8d3..1c9e0e8d3 100644
--- a/src/test/ui/consts/const-unit-struct.rs
+++ b/tests/ui/consts/const-unit-struct.rs
diff --git a/src/test/ui/consts/const-unsafe-fn.rs b/tests/ui/consts/const-unsafe-fn.rs
index 72ce73f74..72ce73f74 100644
--- a/src/test/ui/consts/const-unsafe-fn.rs
+++ b/tests/ui/consts/const-unsafe-fn.rs
diff --git a/src/test/ui/consts/const-unsized.rs b/tests/ui/consts/const-unsized.rs
index 319b8ef97..319b8ef97 100644
--- a/src/test/ui/consts/const-unsized.rs
+++ b/tests/ui/consts/const-unsized.rs
diff --git a/src/test/ui/consts/const-unsized.stderr b/tests/ui/consts/const-unsized.stderr
index 27b200648..27b200648 100644
--- a/src/test/ui/consts/const-unsized.stderr
+++ b/tests/ui/consts/const-unsized.stderr
diff --git a/src/test/ui/consts/const-unwrap.rs b/tests/ui/consts/const-unwrap.rs
index 729ae535c..729ae535c 100644
--- a/src/test/ui/consts/const-unwrap.rs
+++ b/tests/ui/consts/const-unwrap.rs
diff --git a/src/test/ui/consts/const-unwrap.stderr b/tests/ui/consts/const-unwrap.stderr
index d2cbe4550..d2cbe4550 100644
--- a/src/test/ui/consts/const-unwrap.stderr
+++ b/tests/ui/consts/const-unwrap.stderr
diff --git a/src/test/ui/consts/const-validation-fail-55455.rs b/tests/ui/consts/const-validation-fail-55455.rs
index 583074888..583074888 100644
--- a/src/test/ui/consts/const-validation-fail-55455.rs
+++ b/tests/ui/consts/const-validation-fail-55455.rs
diff --git a/src/test/ui/consts/const-variant-count.rs b/tests/ui/consts/const-variant-count.rs
index 50eaeeb46..50eaeeb46 100644
--- a/src/test/ui/consts/const-variant-count.rs
+++ b/tests/ui/consts/const-variant-count.rs
diff --git a/src/test/ui/consts/const-vec-of-fns.rs b/tests/ui/consts/const-vec-of-fns.rs
index 6d90b066b..6d90b066b 100644
--- a/src/test/ui/consts/const-vec-of-fns.rs
+++ b/tests/ui/consts/const-vec-of-fns.rs
diff --git a/src/test/ui/consts/const-vec-syntax.rs b/tests/ui/consts/const-vec-syntax.rs
index 61246e44e..61246e44e 100644
--- a/src/test/ui/consts/const-vec-syntax.rs
+++ b/tests/ui/consts/const-vec-syntax.rs
diff --git a/src/test/ui/consts/const-vecs-and-slices.rs b/tests/ui/consts/const-vecs-and-slices.rs
index 1cdc33b7a..1cdc33b7a 100644
--- a/src/test/ui/consts/const-vecs-and-slices.rs
+++ b/tests/ui/consts/const-vecs-and-slices.rs
diff --git a/src/test/ui/consts/const.rs b/tests/ui/consts/const.rs
index 71fbadfa8..71fbadfa8 100644
--- a/src/test/ui/consts/const.rs
+++ b/tests/ui/consts/const.rs
diff --git a/tests/ui/consts/const_cmp_type_id.rs b/tests/ui/consts/const_cmp_type_id.rs
new file mode 100644
index 000000000..f10d1c24f
--- /dev/null
+++ b/tests/ui/consts/const_cmp_type_id.rs
@@ -0,0 +1,12 @@
+// run-pass
+#![feature(const_type_id)]
+#![feature(const_trait_impl)]
+
+use std::any::TypeId;
+
+const fn main() {
+    assert!(TypeId::of::<u8>() == TypeId::of::<u8>());
+    assert!(TypeId::of::<()>() != TypeId::of::<u8>());
+    const _A: bool = TypeId::of::<u8>() < TypeId::of::<u16>();
+    // can't assert `_A` because it is not deterministic
+}
diff --git a/src/test/ui/consts/const_constructor/const-construct-call.rs b/tests/ui/consts/const_constructor/const-construct-call.rs
index cb735d7b3..cb735d7b3 100644
--- a/src/test/ui/consts/const_constructor/const-construct-call.rs
+++ b/tests/ui/consts/const_constructor/const-construct-call.rs
diff --git a/src/test/ui/consts/const_constructor/const_constructor_qpath.rs b/tests/ui/consts/const_constructor/const_constructor_qpath.rs
index 7c55f470f..7c55f470f 100644
--- a/src/test/ui/consts/const_constructor/const_constructor_qpath.rs
+++ b/tests/ui/consts/const_constructor/const_constructor_qpath.rs
diff --git a/src/test/ui/consts/const_discriminant.rs b/tests/ui/consts/const_discriminant.rs
index 79e68590e..79e68590e 100644
--- a/src/test/ui/consts/const_discriminant.rs
+++ b/tests/ui/consts/const_discriminant.rs
diff --git a/src/test/ui/consts/const_fn_floating_point_arithmetic.gated.stderr b/tests/ui/consts/const_fn_floating_point_arithmetic.gated.stderr
index ae24f8f65..ae24f8f65 100644
--- a/src/test/ui/consts/const_fn_floating_point_arithmetic.gated.stderr
+++ b/tests/ui/consts/const_fn_floating_point_arithmetic.gated.stderr
diff --git a/src/test/ui/consts/const_fn_floating_point_arithmetic.rs b/tests/ui/consts/const_fn_floating_point_arithmetic.rs
index 5e32482b2..5e32482b2 100644
--- a/src/test/ui/consts/const_fn_floating_point_arithmetic.rs
+++ b/tests/ui/consts/const_fn_floating_point_arithmetic.rs
diff --git a/src/test/ui/consts/const_fn_floating_point_arithmetic.stock.stderr b/tests/ui/consts/const_fn_floating_point_arithmetic.stock.stderr
index ef7a60faf..ef7a60faf 100644
--- a/src/test/ui/consts/const_fn_floating_point_arithmetic.stock.stderr
+++ b/tests/ui/consts/const_fn_floating_point_arithmetic.stock.stderr
diff --git a/src/test/ui/consts/const_fn_return_nested_fn_ptr.rs b/tests/ui/consts/const_fn_return_nested_fn_ptr.rs
index d22c78960..d22c78960 100644
--- a/src/test/ui/consts/const_fn_return_nested_fn_ptr.rs
+++ b/tests/ui/consts/const_fn_return_nested_fn_ptr.rs
diff --git a/src/test/ui/consts/const_fn_unsize.rs b/tests/ui/consts/const_fn_unsize.rs
index 01da57320..01da57320 100644
--- a/src/test/ui/consts/const_fn_unsize.rs
+++ b/tests/ui/consts/const_fn_unsize.rs
diff --git a/src/test/ui/consts/const_forget.rs b/tests/ui/consts/const_forget.rs
index ec7dde8c9..ec7dde8c9 100644
--- a/src/test/ui/consts/const_forget.rs
+++ b/tests/ui/consts/const_forget.rs
diff --git a/src/test/ui/consts/const_in_pattern/accept_structural.rs b/tests/ui/consts/const_in_pattern/accept_structural.rs
index 1f56f581c..1f56f581c 100644
--- a/src/test/ui/consts/const_in_pattern/accept_structural.rs
+++ b/tests/ui/consts/const_in_pattern/accept_structural.rs
diff --git a/src/test/ui/consts/const_in_pattern/auxiliary/consts.rs b/tests/ui/consts/const_in_pattern/auxiliary/consts.rs
index b438bcd9f..b438bcd9f 100644
--- a/src/test/ui/consts/const_in_pattern/auxiliary/consts.rs
+++ b/tests/ui/consts/const_in_pattern/auxiliary/consts.rs
diff --git a/src/test/ui/consts/const_in_pattern/cross-crate-fail.rs b/tests/ui/consts/const_in_pattern/cross-crate-fail.rs
index ab297f54d..ab297f54d 100644
--- a/src/test/ui/consts/const_in_pattern/cross-crate-fail.rs
+++ b/tests/ui/consts/const_in_pattern/cross-crate-fail.rs
diff --git a/src/test/ui/consts/const_in_pattern/cross-crate-fail.stderr b/tests/ui/consts/const_in_pattern/cross-crate-fail.stderr
index a8066a88c..a8066a88c 100644
--- a/src/test/ui/consts/const_in_pattern/cross-crate-fail.stderr
+++ b/tests/ui/consts/const_in_pattern/cross-crate-fail.stderr
diff --git a/src/test/ui/consts/const_in_pattern/cross-crate-pass.rs b/tests/ui/consts/const_in_pattern/cross-crate-pass.rs
index 1d8ecf8ae..1d8ecf8ae 100644
--- a/src/test/ui/consts/const_in_pattern/cross-crate-pass.rs
+++ b/tests/ui/consts/const_in_pattern/cross-crate-pass.rs
diff --git a/src/test/ui/consts/const_in_pattern/custom-eq-branch-pass.rs b/tests/ui/consts/const_in_pattern/custom-eq-branch-pass.rs
index a38731ceb..a38731ceb 100644
--- a/src/test/ui/consts/const_in_pattern/custom-eq-branch-pass.rs
+++ b/tests/ui/consts/const_in_pattern/custom-eq-branch-pass.rs
diff --git a/src/test/ui/consts/const_in_pattern/custom-eq-branch-warn.rs b/tests/ui/consts/const_in_pattern/custom-eq-branch-warn.rs
index 856d20417..856d20417 100644
--- a/src/test/ui/consts/const_in_pattern/custom-eq-branch-warn.rs
+++ b/tests/ui/consts/const_in_pattern/custom-eq-branch-warn.rs
diff --git a/src/test/ui/consts/const_in_pattern/custom-eq-branch-warn.stderr b/tests/ui/consts/const_in_pattern/custom-eq-branch-warn.stderr
index 223482722..223482722 100644
--- a/src/test/ui/consts/const_in_pattern/custom-eq-branch-warn.stderr
+++ b/tests/ui/consts/const_in_pattern/custom-eq-branch-warn.stderr
diff --git a/src/test/ui/consts/const_in_pattern/incomplete-slice.rs b/tests/ui/consts/const_in_pattern/incomplete-slice.rs
index e1ccda71d..e1ccda71d 100644
--- a/src/test/ui/consts/const_in_pattern/incomplete-slice.rs
+++ b/tests/ui/consts/const_in_pattern/incomplete-slice.rs
diff --git a/src/test/ui/consts/const_in_pattern/incomplete-slice.stderr b/tests/ui/consts/const_in_pattern/incomplete-slice.stderr
index ddc576ced..ddc576ced 100644
--- a/src/test/ui/consts/const_in_pattern/incomplete-slice.stderr
+++ b/tests/ui/consts/const_in_pattern/incomplete-slice.stderr
diff --git a/src/test/ui/consts/const_in_pattern/issue-44333.rs b/tests/ui/consts/const_in_pattern/issue-44333.rs
index 96e8795e5..96e8795e5 100644
--- a/src/test/ui/consts/const_in_pattern/issue-44333.rs
+++ b/tests/ui/consts/const_in_pattern/issue-44333.rs
diff --git a/src/test/ui/consts/const_in_pattern/issue-44333.stderr b/tests/ui/consts/const_in_pattern/issue-44333.stderr
index 731ef509c..731ef509c 100644
--- a/src/test/ui/consts/const_in_pattern/issue-44333.stderr
+++ b/tests/ui/consts/const_in_pattern/issue-44333.stderr
diff --git a/src/test/ui/consts/const_in_pattern/issue-53708.rs b/tests/ui/consts/const_in_pattern/issue-53708.rs
index 355ba6379..355ba6379 100644
--- a/src/test/ui/consts/const_in_pattern/issue-53708.rs
+++ b/tests/ui/consts/const_in_pattern/issue-53708.rs
diff --git a/src/test/ui/consts/const_in_pattern/issue-62614.rs b/tests/ui/consts/const_in_pattern/issue-62614.rs
index 4ea9a2836..4ea9a2836 100644
--- a/src/test/ui/consts/const_in_pattern/issue-62614.rs
+++ b/tests/ui/consts/const_in_pattern/issue-62614.rs
diff --git a/src/test/ui/consts/const_in_pattern/issue-65466.rs b/tests/ui/consts/const_in_pattern/issue-65466.rs
index 2b421f4c7..2b421f4c7 100644
--- a/src/test/ui/consts/const_in_pattern/issue-65466.rs
+++ b/tests/ui/consts/const_in_pattern/issue-65466.rs
diff --git a/src/test/ui/consts/const_in_pattern/issue-73431.rs b/tests/ui/consts/const_in_pattern/issue-73431.rs
index fa18a3af1..fa18a3af1 100644
--- a/src/test/ui/consts/const_in_pattern/issue-73431.rs
+++ b/tests/ui/consts/const_in_pattern/issue-73431.rs
diff --git a/src/test/ui/consts/const_in_pattern/issue-73431.stderr b/tests/ui/consts/const_in_pattern/issue-73431.stderr
index c82dea4aa..c82dea4aa 100644
--- a/src/test/ui/consts/const_in_pattern/issue-73431.stderr
+++ b/tests/ui/consts/const_in_pattern/issue-73431.stderr
diff --git a/src/test/ui/consts/const_in_pattern/issue-78057.rs b/tests/ui/consts/const_in_pattern/issue-78057.rs
index 69cf8404d..69cf8404d 100644
--- a/src/test/ui/consts/const_in_pattern/issue-78057.rs
+++ b/tests/ui/consts/const_in_pattern/issue-78057.rs
diff --git a/src/test/ui/consts/const_in_pattern/issue-78057.stderr b/tests/ui/consts/const_in_pattern/issue-78057.stderr
index 35619594f..35619594f 100644
--- a/src/test/ui/consts/const_in_pattern/issue-78057.stderr
+++ b/tests/ui/consts/const_in_pattern/issue-78057.stderr
diff --git a/src/test/ui/consts/const_in_pattern/no-eq-branch-fail.rs b/tests/ui/consts/const_in_pattern/no-eq-branch-fail.rs
index fc80d51c7..fc80d51c7 100644
--- a/src/test/ui/consts/const_in_pattern/no-eq-branch-fail.rs
+++ b/tests/ui/consts/const_in_pattern/no-eq-branch-fail.rs
diff --git a/src/test/ui/consts/const_in_pattern/no-eq-branch-fail.stderr b/tests/ui/consts/const_in_pattern/no-eq-branch-fail.stderr
index e505dad69..e505dad69 100644
--- a/src/test/ui/consts/const_in_pattern/no-eq-branch-fail.stderr
+++ b/tests/ui/consts/const_in_pattern/no-eq-branch-fail.stderr
diff --git a/src/test/ui/consts/const_in_pattern/reject_non_partial_eq.rs b/tests/ui/consts/const_in_pattern/reject_non_partial_eq.rs
index a8216901c..a8216901c 100644
--- a/src/test/ui/consts/const_in_pattern/reject_non_partial_eq.rs
+++ b/tests/ui/consts/const_in_pattern/reject_non_partial_eq.rs
diff --git a/src/test/ui/consts/const_in_pattern/reject_non_partial_eq.stderr b/tests/ui/consts/const_in_pattern/reject_non_partial_eq.stderr
index 95cfa4a9e..95cfa4a9e 100644
--- a/src/test/ui/consts/const_in_pattern/reject_non_partial_eq.stderr
+++ b/tests/ui/consts/const_in_pattern/reject_non_partial_eq.stderr
diff --git a/src/test/ui/consts/const_in_pattern/reject_non_structural.rs b/tests/ui/consts/const_in_pattern/reject_non_structural.rs
index 75fde0d92..75fde0d92 100644
--- a/src/test/ui/consts/const_in_pattern/reject_non_structural.rs
+++ b/tests/ui/consts/const_in_pattern/reject_non_structural.rs
diff --git a/src/test/ui/consts/const_in_pattern/reject_non_structural.stderr b/tests/ui/consts/const_in_pattern/reject_non_structural.stderr
index 660198349..660198349 100644
--- a/src/test/ui/consts/const_in_pattern/reject_non_structural.stderr
+++ b/tests/ui/consts/const_in_pattern/reject_non_structural.stderr
diff --git a/src/test/ui/consts/const_in_pattern/warn_corner_cases.rs b/tests/ui/consts/const_in_pattern/warn_corner_cases.rs
index 15cf3c84d..15cf3c84d 100644
--- a/src/test/ui/consts/const_in_pattern/warn_corner_cases.rs
+++ b/tests/ui/consts/const_in_pattern/warn_corner_cases.rs
diff --git a/src/test/ui/consts/const_in_pattern/warn_corner_cases.stderr b/tests/ui/consts/const_in_pattern/warn_corner_cases.stderr
index e957a43a1..e957a43a1 100644
--- a/src/test/ui/consts/const_in_pattern/warn_corner_cases.stderr
+++ b/tests/ui/consts/const_in_pattern/warn_corner_cases.stderr
diff --git a/src/test/ui/consts/const_let_assign.rs b/tests/ui/consts/const_let_assign.rs
index b83acfb73..b83acfb73 100644
--- a/src/test/ui/consts/const_let_assign.rs
+++ b/tests/ui/consts/const_let_assign.rs
diff --git a/src/test/ui/consts/const_let_assign2.rs b/tests/ui/consts/const_let_assign2.rs
index 28265c85d..28265c85d 100644
--- a/src/test/ui/consts/const_let_assign2.rs
+++ b/tests/ui/consts/const_let_assign2.rs
diff --git a/src/test/ui/consts/const_let_assign3.rs b/tests/ui/consts/const_let_assign3.rs
index 1f68de8ee..1f68de8ee 100644
--- a/src/test/ui/consts/const_let_assign3.rs
+++ b/tests/ui/consts/const_let_assign3.rs
diff --git a/src/test/ui/consts/const_let_assign3.stderr b/tests/ui/consts/const_let_assign3.stderr
index b550ac545..b550ac545 100644
--- a/src/test/ui/consts/const_let_assign3.stderr
+++ b/tests/ui/consts/const_let_assign3.stderr
diff --git a/src/test/ui/consts/const_let_eq.rs b/tests/ui/consts/const_let_eq.rs
index 818819f9f..818819f9f 100644
--- a/src/test/ui/consts/const_let_eq.rs
+++ b/tests/ui/consts/const_let_eq.rs
diff --git a/src/test/ui/consts/const_let_eq_float.rs b/tests/ui/consts/const_let_eq_float.rs
index e15f4b804..e15f4b804 100644
--- a/src/test/ui/consts/const_let_eq_float.rs
+++ b/tests/ui/consts/const_let_eq_float.rs
diff --git a/src/test/ui/consts/const_let_irrefutable.rs b/tests/ui/consts/const_let_irrefutable.rs
index e889abf4a..e889abf4a 100644
--- a/src/test/ui/consts/const_let_irrefutable.rs
+++ b/tests/ui/consts/const_let_irrefutable.rs
diff --git a/src/test/ui/consts/const_let_promote.rs b/tests/ui/consts/const_let_promote.rs
index f4661e9e4..f4661e9e4 100644
--- a/src/test/ui/consts/const_let_promote.rs
+++ b/tests/ui/consts/const_let_promote.rs
diff --git a/src/test/ui/consts/const_let_refutable.rs b/tests/ui/consts/const_let_refutable.rs
index efb134d2e..efb134d2e 100644
--- a/src/test/ui/consts/const_let_refutable.rs
+++ b/tests/ui/consts/const_let_refutable.rs
diff --git a/src/test/ui/consts/const_let_refutable.stderr b/tests/ui/consts/const_let_refutable.stderr
index d7e8c048f..d6119028f 100644
--- a/src/test/ui/consts/const_let_refutable.stderr
+++ b/tests/ui/consts/const_let_refutable.stderr
@@ -1,4 +1,4 @@
-error[E0005]: refutable pattern in function argument: `&[]`, `&[_]` and `&[_, _, _, ..]` not covered
+error[E0005]: refutable pattern in function argument
   --> $DIR/const_let_refutable.rs:3:16
    |
 LL | const fn slice(&[a, b]: &[i32]) -> i32 {
diff --git a/src/test/ui/consts/const_limit/const_eval_limit_not_reached.rs b/tests/ui/consts/const_limit/const_eval_limit_not_reached.rs
index 629d1f02a..629d1f02a 100644
--- a/src/test/ui/consts/const_limit/const_eval_limit_not_reached.rs
+++ b/tests/ui/consts/const_limit/const_eval_limit_not_reached.rs
diff --git a/src/test/ui/consts/const_limit/const_eval_limit_overflow.rs b/tests/ui/consts/const_limit/const_eval_limit_overflow.rs
index 1c49593cd..1c49593cd 100644
--- a/src/test/ui/consts/const_limit/const_eval_limit_overflow.rs
+++ b/tests/ui/consts/const_limit/const_eval_limit_overflow.rs
diff --git a/src/test/ui/consts/const_limit/const_eval_limit_overflow.stderr b/tests/ui/consts/const_limit/const_eval_limit_overflow.stderr
index 7f5d5e6cd..7f5d5e6cd 100644
--- a/src/test/ui/consts/const_limit/const_eval_limit_overflow.stderr
+++ b/tests/ui/consts/const_limit/const_eval_limit_overflow.stderr
diff --git a/src/test/ui/consts/const_limit/const_eval_limit_reached.rs b/tests/ui/consts/const_limit/const_eval_limit_reached.rs
index 3ce038c1d..3ce038c1d 100644
--- a/src/test/ui/consts/const_limit/const_eval_limit_reached.rs
+++ b/tests/ui/consts/const_limit/const_eval_limit_reached.rs
diff --git a/src/test/ui/consts/const_limit/const_eval_limit_reached.stderr b/tests/ui/consts/const_limit/const_eval_limit_reached.stderr
index 850aebdfb..850aebdfb 100644
--- a/src/test/ui/consts/const_limit/const_eval_limit_reached.stderr
+++ b/tests/ui/consts/const_limit/const_eval_limit_reached.stderr
diff --git a/src/test/ui/consts/const_limit/feature-gate-const_eval_limit.rs b/tests/ui/consts/const_limit/feature-gate-const_eval_limit.rs
index 61119d751..61119d751 100644
--- a/src/test/ui/consts/const_limit/feature-gate-const_eval_limit.rs
+++ b/tests/ui/consts/const_limit/feature-gate-const_eval_limit.rs
diff --git a/src/test/ui/consts/const_limit/feature-gate-const_eval_limit.stderr b/tests/ui/consts/const_limit/feature-gate-const_eval_limit.stderr
index 5bd29c7df..5bd29c7df 100644
--- a/src/test/ui/consts/const_limit/feature-gate-const_eval_limit.stderr
+++ b/tests/ui/consts/const_limit/feature-gate-const_eval_limit.stderr
diff --git a/src/test/ui/consts/const_prop_slice_pat_ice.rs b/tests/ui/consts/const_prop_slice_pat_ice.rs
index 60b06a497..60b06a497 100644
--- a/src/test/ui/consts/const_prop_slice_pat_ice.rs
+++ b/tests/ui/consts/const_prop_slice_pat_ice.rs
diff --git a/src/test/ui/consts/const_short_circuit.rs b/tests/ui/consts/const_short_circuit.rs
index 6403fbb17..6403fbb17 100644
--- a/src/test/ui/consts/const_short_circuit.rs
+++ b/tests/ui/consts/const_short_circuit.rs
diff --git a/src/test/ui/consts/const_unsafe_unreachable.rs b/tests/ui/consts/const_unsafe_unreachable.rs
index 1c3baec5d..1c3baec5d 100644
--- a/src/test/ui/consts/const_unsafe_unreachable.rs
+++ b/tests/ui/consts/const_unsafe_unreachable.rs
diff --git a/src/test/ui/consts/const_unsafe_unreachable_ub.rs b/tests/ui/consts/const_unsafe_unreachable_ub.rs
index b418fea61..b418fea61 100644
--- a/src/test/ui/consts/const_unsafe_unreachable_ub.rs
+++ b/tests/ui/consts/const_unsafe_unreachable_ub.rs
diff --git a/src/test/ui/consts/const_unsafe_unreachable_ub.stderr b/tests/ui/consts/const_unsafe_unreachable_ub.stderr
index cbc7cac93..593a51bfe 100644
--- a/src/test/ui/consts/const_unsafe_unreachable_ub.stderr
+++ b/tests/ui/consts/const_unsafe_unreachable_ub.stderr
@@ -1,14 +1,10 @@
 error[E0080]: evaluation of constant value failed
   --> $SRC_DIR/core/src/hint.rs:LL:COL
    |
-LL |         intrinsics::unreachable()
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^ entering unreachable code
+   = note: entering unreachable code
    |
 note: inside `unreachable_unchecked`
   --> $SRC_DIR/core/src/hint.rs:LL:COL
-   |
-LL |         intrinsics::unreachable()
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `foo`
   --> $DIR/const_unsafe_unreachable_ub.rs:6:18
    |
diff --git a/src/test/ui/consts/constifconst-call-in-const-position.rs b/tests/ui/consts/constifconst-call-in-const-position.rs
index fcf01d5bc..fcf01d5bc 100644
--- a/src/test/ui/consts/constifconst-call-in-const-position.rs
+++ b/tests/ui/consts/constifconst-call-in-const-position.rs
diff --git a/src/test/ui/consts/constifconst-call-in-const-position.stderr b/tests/ui/consts/constifconst-call-in-const-position.stderr
index d4a445120..d4a445120 100644
--- a/src/test/ui/consts/constifconst-call-in-const-position.stderr
+++ b/tests/ui/consts/constifconst-call-in-const-position.stderr
diff --git a/src/test/ui/consts/consts-in-patterns.rs b/tests/ui/consts/consts-in-patterns.rs
index 0295204c8..0295204c8 100644
--- a/src/test/ui/consts/consts-in-patterns.rs
+++ b/tests/ui/consts/consts-in-patterns.rs
diff --git a/src/test/ui/consts/control-flow/assert.rs b/tests/ui/consts/control-flow/assert.rs
index 9d17f65b9..9d17f65b9 100644
--- a/src/test/ui/consts/control-flow/assert.rs
+++ b/tests/ui/consts/control-flow/assert.rs
diff --git a/src/test/ui/consts/control-flow/assert.stderr b/tests/ui/consts/control-flow/assert.stderr
index 8b1ca183d..8b1ca183d 100644
--- a/src/test/ui/consts/control-flow/assert.stderr
+++ b/tests/ui/consts/control-flow/assert.stderr
diff --git a/src/test/ui/consts/control-flow/basics.rs b/tests/ui/consts/control-flow/basics.rs
index 02e5501f1..02e5501f1 100644
--- a/src/test/ui/consts/control-flow/basics.rs
+++ b/tests/ui/consts/control-flow/basics.rs
diff --git a/src/test/ui/consts/control-flow/drop-fail.precise.stderr b/tests/ui/consts/control-flow/drop-fail.precise.stderr
index 93b5f257e..93b5f257e 100644
--- a/src/test/ui/consts/control-flow/drop-fail.precise.stderr
+++ b/tests/ui/consts/control-flow/drop-fail.precise.stderr
diff --git a/src/test/ui/consts/control-flow/drop-fail.rs b/tests/ui/consts/control-flow/drop-fail.rs
index 41341f312..41341f312 100644
--- a/src/test/ui/consts/control-flow/drop-fail.rs
+++ b/tests/ui/consts/control-flow/drop-fail.rs
diff --git a/src/test/ui/consts/control-flow/drop-fail.stock.stderr b/tests/ui/consts/control-flow/drop-fail.stock.stderr
index 2cc856802..2cc856802 100644
--- a/src/test/ui/consts/control-flow/drop-fail.stock.stderr
+++ b/tests/ui/consts/control-flow/drop-fail.stock.stderr
diff --git a/src/test/ui/consts/control-flow/drop-pass.rs b/tests/ui/consts/control-flow/drop-pass.rs
index 2a6d12768..2a6d12768 100644
--- a/src/test/ui/consts/control-flow/drop-pass.rs
+++ b/tests/ui/consts/control-flow/drop-pass.rs
diff --git a/src/test/ui/consts/control-flow/drop-precise.rs b/tests/ui/consts/control-flow/drop-precise.rs
index 4ecc5ef78..4ecc5ef78 100644
--- a/src/test/ui/consts/control-flow/drop-precise.rs
+++ b/tests/ui/consts/control-flow/drop-precise.rs
diff --git a/src/test/ui/consts/control-flow/exhaustive-c-like-enum-match.rs b/tests/ui/consts/control-flow/exhaustive-c-like-enum-match.rs
index 4320133df..4320133df 100644
--- a/src/test/ui/consts/control-flow/exhaustive-c-like-enum-match.rs
+++ b/tests/ui/consts/control-flow/exhaustive-c-like-enum-match.rs
diff --git a/src/test/ui/consts/control-flow/feature-gate-const-if-match.rs b/tests/ui/consts/control-flow/feature-gate-const-if-match.rs
index cb66bc753..cb66bc753 100644
--- a/src/test/ui/consts/control-flow/feature-gate-const-if-match.rs
+++ b/tests/ui/consts/control-flow/feature-gate-const-if-match.rs
diff --git a/src/test/ui/consts/control-flow/interior-mutability.rs b/tests/ui/consts/control-flow/interior-mutability.rs
index a6d44237b..a6d44237b 100644
--- a/src/test/ui/consts/control-flow/interior-mutability.rs
+++ b/tests/ui/consts/control-flow/interior-mutability.rs
diff --git a/src/test/ui/consts/control-flow/interior-mutability.stderr b/tests/ui/consts/control-flow/interior-mutability.stderr
index db2ffb91b..db2ffb91b 100644
--- a/src/test/ui/consts/control-flow/interior-mutability.stderr
+++ b/tests/ui/consts/control-flow/interior-mutability.stderr
diff --git a/src/test/ui/consts/control-flow/issue-46843.rs b/tests/ui/consts/control-flow/issue-46843.rs
index ddddc8505..ddddc8505 100644
--- a/src/test/ui/consts/control-flow/issue-46843.rs
+++ b/tests/ui/consts/control-flow/issue-46843.rs
diff --git a/src/test/ui/consts/control-flow/issue-46843.stderr b/tests/ui/consts/control-flow/issue-46843.stderr
index 66227f61e..66227f61e 100644
--- a/src/test/ui/consts/control-flow/issue-46843.stderr
+++ b/tests/ui/consts/control-flow/issue-46843.stderr
diff --git a/src/test/ui/consts/control-flow/issue-50577.rs b/tests/ui/consts/control-flow/issue-50577.rs
index beb9a44fc..beb9a44fc 100644
--- a/src/test/ui/consts/control-flow/issue-50577.rs
+++ b/tests/ui/consts/control-flow/issue-50577.rs
diff --git a/src/test/ui/consts/control-flow/issue-50577.stderr b/tests/ui/consts/control-flow/issue-50577.stderr
index a931c89f4..a931c89f4 100644
--- a/src/test/ui/consts/control-flow/issue-50577.stderr
+++ b/tests/ui/consts/control-flow/issue-50577.stderr
diff --git a/src/test/ui/consts/control-flow/loop.rs b/tests/ui/consts/control-flow/loop.rs
index 2b8561a26..2b8561a26 100644
--- a/src/test/ui/consts/control-flow/loop.rs
+++ b/tests/ui/consts/control-flow/loop.rs
diff --git a/src/test/ui/consts/control-flow/loop.stderr b/tests/ui/consts/control-flow/loop.stderr
index 5f6ad8c10..5f6ad8c10 100644
--- a/src/test/ui/consts/control-flow/loop.stderr
+++ b/tests/ui/consts/control-flow/loop.stderr
diff --git a/src/test/ui/consts/control-flow/short-circuit-let.rs b/tests/ui/consts/control-flow/short-circuit-let.rs
index 8a58d06ac..8a58d06ac 100644
--- a/src/test/ui/consts/control-flow/short-circuit-let.rs
+++ b/tests/ui/consts/control-flow/short-circuit-let.rs
diff --git a/src/test/ui/consts/control-flow/short-circuit.rs b/tests/ui/consts/control-flow/short-circuit.rs
index 6abe10785..6abe10785 100644
--- a/src/test/ui/consts/control-flow/short-circuit.rs
+++ b/tests/ui/consts/control-flow/short-circuit.rs
diff --git a/src/test/ui/consts/control-flow/single_variant_match_ice.rs b/tests/ui/consts/control-flow/single_variant_match_ice.rs
index b59be00ff..b59be00ff 100644
--- a/src/test/ui/consts/control-flow/single_variant_match_ice.rs
+++ b/tests/ui/consts/control-flow/single_variant_match_ice.rs
diff --git a/src/test/ui/consts/control-flow/try.rs b/tests/ui/consts/control-flow/try.rs
index 7d85a412b..7d85a412b 100644
--- a/src/test/ui/consts/control-flow/try.rs
+++ b/tests/ui/consts/control-flow/try.rs
diff --git a/src/test/ui/consts/control-flow/try.stderr b/tests/ui/consts/control-flow/try.stderr
index 5aeec8fbf..5aeec8fbf 100644
--- a/src/test/ui/consts/control-flow/try.stderr
+++ b/tests/ui/consts/control-flow/try.stderr
diff --git a/src/test/ui/consts/copy-intrinsic.rs b/tests/ui/consts/copy-intrinsic.rs
index 249bbb599..94d7bdc6b 100644
--- a/src/test/ui/consts/copy-intrinsic.rs
+++ b/tests/ui/consts/copy-intrinsic.rs
@@ -17,7 +17,7 @@ const COPY_ZERO: () = unsafe {
     // Since we are not copying anything, this should be allowed.
     let src = ();
     let mut dst = ();
-    copy_nonoverlapping(&src as *const _ as *const i32, &mut dst as *mut _ as *mut i32, 0);
+    copy_nonoverlapping(&src as *const _ as *const u8, &mut dst as *mut _ as *mut u8, 0);
 };
 
 const COPY_OOB_1: () = unsafe {
diff --git a/src/test/ui/consts/copy-intrinsic.stderr b/tests/ui/consts/copy-intrinsic.stderr
index be41c2db3..be41c2db3 100644
--- a/src/test/ui/consts/copy-intrinsic.stderr
+++ b/tests/ui/consts/copy-intrinsic.stderr
diff --git a/tests/ui/consts/ct-var-in-collect_all_mismatches.rs b/tests/ui/consts/ct-var-in-collect_all_mismatches.rs
new file mode 100644
index 000000000..5fb633de9
--- /dev/null
+++ b/tests/ui/consts/ct-var-in-collect_all_mismatches.rs
@@ -0,0 +1,20 @@
+struct Foo<T, const N: usize> {
+    array: [T; N],
+}
+
+trait Bar<const N: usize> {}
+
+impl<T, const N: usize> Foo<T, N> {
+    fn trigger(self) {
+        self.unsatisfied()
+        //~^ ERROR the trait bound `T: Bar<N>` is not satisfied
+    }
+
+    fn unsatisfied(self)
+    where
+        T: Bar<N>,
+    {
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/consts/ct-var-in-collect_all_mismatches.stderr b/tests/ui/consts/ct-var-in-collect_all_mismatches.stderr
new file mode 100644
index 000000000..43fba2573
--- /dev/null
+++ b/tests/ui/consts/ct-var-in-collect_all_mismatches.stderr
@@ -0,0 +1,22 @@
+error[E0277]: the trait bound `T: Bar<N>` is not satisfied
+  --> $DIR/ct-var-in-collect_all_mismatches.rs:9:14
+   |
+LL |         self.unsatisfied()
+   |              ^^^^^^^^^^^ the trait `Bar<N>` is not implemented for `T`
+   |
+note: required by a bound in `Foo::<T, N>::unsatisfied`
+  --> $DIR/ct-var-in-collect_all_mismatches.rs:15:12
+   |
+LL |     fn unsatisfied(self)
+   |        ----------- required by a bound in this
+LL |     where
+LL |         T: Bar<N>,
+   |            ^^^^^^ required by this bound in `Foo::<T, N>::unsatisfied`
+help: consider restricting type parameter `T`
+   |
+LL | impl<T: Bar<N>, const N: usize> Foo<T, N> {
+   |       ++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/consts/dangling-alloc-id-ice.rs b/tests/ui/consts/dangling-alloc-id-ice.rs
index d591bfc73..d591bfc73 100644
--- a/src/test/ui/consts/dangling-alloc-id-ice.rs
+++ b/tests/ui/consts/dangling-alloc-id-ice.rs
diff --git a/src/test/ui/consts/dangling-alloc-id-ice.stderr b/tests/ui/consts/dangling-alloc-id-ice.stderr
index 0a1cca4ca..0a1cca4ca 100644
--- a/src/test/ui/consts/dangling-alloc-id-ice.stderr
+++ b/tests/ui/consts/dangling-alloc-id-ice.stderr
diff --git a/src/test/ui/consts/dangling_raw_ptr.rs b/tests/ui/consts/dangling_raw_ptr.rs
index ddd1fb1ba..ddd1fb1ba 100644
--- a/src/test/ui/consts/dangling_raw_ptr.rs
+++ b/tests/ui/consts/dangling_raw_ptr.rs
diff --git a/src/test/ui/consts/dangling_raw_ptr.stderr b/tests/ui/consts/dangling_raw_ptr.stderr
index bdfe1e4ef..bdfe1e4ef 100644
--- a/src/test/ui/consts/dangling_raw_ptr.stderr
+++ b/tests/ui/consts/dangling_raw_ptr.stderr
diff --git a/src/test/ui/consts/deref_in_pattern.rs b/tests/ui/consts/deref_in_pattern.rs
index cc47b5b49..cc47b5b49 100644
--- a/src/test/ui/consts/deref_in_pattern.rs
+++ b/tests/ui/consts/deref_in_pattern.rs
diff --git a/src/test/ui/consts/drop_box.rs b/tests/ui/consts/drop_box.rs
index 679974130..679974130 100644
--- a/src/test/ui/consts/drop_box.rs
+++ b/tests/ui/consts/drop_box.rs
diff --git a/src/test/ui/consts/drop_box.stderr b/tests/ui/consts/drop_box.stderr
index 62324939b..62324939b 100644
--- a/src/test/ui/consts/drop_box.stderr
+++ b/tests/ui/consts/drop_box.stderr
diff --git a/src/test/ui/consts/drop_none.rs b/tests/ui/consts/drop_none.rs
index 9d98d3be8..9d98d3be8 100644
--- a/src/test/ui/consts/drop_none.rs
+++ b/tests/ui/consts/drop_none.rs
diff --git a/src/test/ui/consts/drop_zst.rs b/tests/ui/consts/drop_zst.rs
index f7c70d397..f7c70d397 100644
--- a/src/test/ui/consts/drop_zst.rs
+++ b/tests/ui/consts/drop_zst.rs
diff --git a/src/test/ui/consts/drop_zst.stderr b/tests/ui/consts/drop_zst.stderr
index 37758a4cb..37758a4cb 100644
--- a/src/test/ui/consts/drop_zst.stderr
+++ b/tests/ui/consts/drop_zst.stderr
diff --git a/src/test/ui/consts/enum-discr-type-err.rs b/tests/ui/consts/enum-discr-type-err.rs
index 5adb2fa54..5adb2fa54 100644
--- a/src/test/ui/consts/enum-discr-type-err.rs
+++ b/tests/ui/consts/enum-discr-type-err.rs
diff --git a/src/test/ui/consts/enum-discr-type-err.stderr b/tests/ui/consts/enum-discr-type-err.stderr
index 2f97582be..2f97582be 100644
--- a/src/test/ui/consts/enum-discr-type-err.stderr
+++ b/tests/ui/consts/enum-discr-type-err.stderr
diff --git a/src/test/ui/consts/eval-enum.rs b/tests/ui/consts/eval-enum.rs
index 551f10e66..551f10e66 100644
--- a/src/test/ui/consts/eval-enum.rs
+++ b/tests/ui/consts/eval-enum.rs
diff --git a/src/test/ui/consts/eval-enum.stderr b/tests/ui/consts/eval-enum.stderr
index fb4d90348..fb4d90348 100644
--- a/src/test/ui/consts/eval-enum.stderr
+++ b/tests/ui/consts/eval-enum.stderr
diff --git a/tests/ui/consts/extra-const-ub/detect-extra-ub.rs b/tests/ui/consts/extra-const-ub/detect-extra-ub.rs
new file mode 100644
index 000000000..e2f814988
--- /dev/null
+++ b/tests/ui/consts/extra-const-ub/detect-extra-ub.rs
@@ -0,0 +1,31 @@
+// revisions: no_flag with_flag
+// [no_flag] check-pass
+// [with_flag] compile-flags: -Zextra-const-ub-checks
+#![feature(const_ptr_read)]
+
+use std::mem::transmute;
+
+const INVALID_BOOL: () = unsafe {
+    let _x: bool = transmute(3u8);
+    //[with_flag]~^ ERROR: evaluation of constant value failed
+    //[with_flag]~| invalid value
+};
+
+const INVALID_PTR_IN_INT: () = unsafe {
+    let _x: usize = transmute(&3u8);
+    //[with_flag]~^ ERROR: evaluation of constant value failed
+};
+
+const INVALID_SLICE_TO_USIZE_TRANSMUTE: () = unsafe {
+    let x: &[u8] = &[0; 32];
+    let _x: (usize, usize) = transmute(x);
+    //[with_flag]~^ ERROR: evaluation of constant value failed
+};
+
+const UNALIGNED_PTR: () = unsafe {
+    let _x: &u32 = transmute(&[0u8; 4]);
+    //[with_flag]~^ ERROR: evaluation of constant value failed
+    //[with_flag]~| invalid value
+};
+
+fn main() {}
diff --git a/tests/ui/consts/extra-const-ub/detect-extra-ub.with_flag.stderr b/tests/ui/consts/extra-const-ub/detect-extra-ub.with_flag.stderr
new file mode 100644
index 000000000..b2a5fd901
--- /dev/null
+++ b/tests/ui/consts/extra-const-ub/detect-extra-ub.with_flag.stderr
@@ -0,0 +1,33 @@
+error[E0080]: evaluation of constant value failed
+  --> $DIR/detect-extra-ub.rs:9:20
+   |
+LL |     let _x: bool = transmute(3u8);
+   |                    ^^^^^^^^^^^^^^ constructing invalid value: encountered 0x03, but expected a boolean
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/detect-extra-ub.rs:15:21
+   |
+LL |     let _x: usize = transmute(&3u8);
+   |                     ^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/detect-extra-ub.rs:21:30
+   |
+LL |     let _x: (usize, usize) = transmute(x);
+   |                              ^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+
+error[E0080]: evaluation of constant value failed
+  --> $DIR/detect-extra-ub.rs:26:20
+   |
+LL |     let _x: &u32 = transmute(&[0u8; 4]);
+   |                    ^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered an unaligned reference (required 4 byte alignment but found 1)
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/extra-const-ub/issue-100771.rs b/tests/ui/consts/extra-const-ub/issue-100771.rs
index a32960328..a32960328 100644
--- a/src/test/ui/consts/extra-const-ub/issue-100771.rs
+++ b/tests/ui/consts/extra-const-ub/issue-100771.rs
diff --git a/src/test/ui/consts/extra-const-ub/issue-101034.rs b/tests/ui/consts/extra-const-ub/issue-101034.rs
index e0de705c4..e0de705c4 100644
--- a/src/test/ui/consts/extra-const-ub/issue-101034.rs
+++ b/tests/ui/consts/extra-const-ub/issue-101034.rs
diff --git a/src/test/ui/consts/fn_trait_refs.rs b/tests/ui/consts/fn_trait_refs.rs
index b50749297..b50749297 100644
--- a/src/test/ui/consts/fn_trait_refs.rs
+++ b/tests/ui/consts/fn_trait_refs.rs
diff --git a/src/test/ui/consts/huge-values.rs b/tests/ui/consts/huge-values.rs
index 70a5b10e9..70a5b10e9 100644
--- a/src/test/ui/consts/huge-values.rs
+++ b/tests/ui/consts/huge-values.rs
diff --git a/src/test/ui/consts/ice-48279.rs b/tests/ui/consts/ice-48279.rs
index d1d90df24..d1d90df24 100644
--- a/src/test/ui/consts/ice-48279.rs
+++ b/tests/ui/consts/ice-48279.rs
diff --git a/src/test/ui/consts/ice-zst-static-access.rs b/tests/ui/consts/ice-zst-static-access.rs
index b68e442a5..b68e442a5 100644
--- a/src/test/ui/consts/ice-zst-static-access.rs
+++ b/tests/ui/consts/ice-zst-static-access.rs
diff --git a/src/test/ui/consts/inline_asm.rs b/tests/ui/consts/inline_asm.rs
index 4cd7e2717..4cd7e2717 100644
--- a/src/test/ui/consts/inline_asm.rs
+++ b/tests/ui/consts/inline_asm.rs
diff --git a/src/test/ui/consts/inline_asm.stderr b/tests/ui/consts/inline_asm.stderr
index 65a828d11..65a828d11 100644
--- a/src/test/ui/consts/inline_asm.stderr
+++ b/tests/ui/consts/inline_asm.stderr
diff --git a/src/test/ui/consts/int_ptr_for_zst_slices.rs b/tests/ui/consts/int_ptr_for_zst_slices.rs
index 34e5bb322..34e5bb322 100644
--- a/src/test/ui/consts/int_ptr_for_zst_slices.rs
+++ b/tests/ui/consts/int_ptr_for_zst_slices.rs
diff --git a/src/test/ui/consts/intrinsic_without_const_stab.rs b/tests/ui/consts/intrinsic_without_const_stab.rs
index 40ec65d51..40ec65d51 100644
--- a/src/test/ui/consts/intrinsic_without_const_stab.rs
+++ b/tests/ui/consts/intrinsic_without_const_stab.rs
diff --git a/src/test/ui/consts/intrinsic_without_const_stab.stderr b/tests/ui/consts/intrinsic_without_const_stab.stderr
index b32b6398e..b32b6398e 100644
--- a/src/test/ui/consts/intrinsic_without_const_stab.stderr
+++ b/tests/ui/consts/intrinsic_without_const_stab.stderr
diff --git a/src/test/ui/consts/intrinsic_without_const_stab_fail.rs b/tests/ui/consts/intrinsic_without_const_stab_fail.rs
index 2b0745b3c..2b0745b3c 100644
--- a/src/test/ui/consts/intrinsic_without_const_stab_fail.rs
+++ b/tests/ui/consts/intrinsic_without_const_stab_fail.rs
diff --git a/src/test/ui/consts/intrinsic_without_const_stab_fail.stderr b/tests/ui/consts/intrinsic_without_const_stab_fail.stderr
index fcbb37245..fcbb37245 100644
--- a/src/test/ui/consts/intrinsic_without_const_stab_fail.stderr
+++ b/tests/ui/consts/intrinsic_without_const_stab_fail.stderr
diff --git a/src/test/ui/consts/invalid-const-in-body.rs b/tests/ui/consts/invalid-const-in-body.rs
index f0fa3bb7b..f0fa3bb7b 100644
--- a/src/test/ui/consts/invalid-const-in-body.rs
+++ b/tests/ui/consts/invalid-const-in-body.rs
diff --git a/src/test/ui/consts/invalid-const-in-body.stderr b/tests/ui/consts/invalid-const-in-body.stderr
index 3be658359..3be658359 100644
--- a/src/test/ui/consts/invalid-const-in-body.stderr
+++ b/tests/ui/consts/invalid-const-in-body.stderr
diff --git a/src/test/ui/consts/invalid-inline-const-in-match-arm.rs b/tests/ui/consts/invalid-inline-const-in-match-arm.rs
index 4d2d8fb13..4d2d8fb13 100644
--- a/src/test/ui/consts/invalid-inline-const-in-match-arm.rs
+++ b/tests/ui/consts/invalid-inline-const-in-match-arm.rs
diff --git a/src/test/ui/consts/invalid-inline-const-in-match-arm.stderr b/tests/ui/consts/invalid-inline-const-in-match-arm.stderr
index ab594c921..257ecd7f3 100644
--- a/src/test/ui/consts/invalid-inline-const-in-match-arm.stderr
+++ b/tests/ui/consts/invalid-inline-const-in-match-arm.stderr
@@ -6,6 +6,7 @@ LL |         const { (|| {})() } => {}
    |
    = note: closures need an RFC before allowed to be called in constants
    = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/invalid-union.32bit.stderr b/tests/ui/consts/invalid-union.32bit.stderr
index 4758ea4ae..0dd18a557 100644
--- a/src/test/ui/consts/invalid-union.32bit.stderr
+++ b/tests/ui/consts/invalid-union.32bit.stderr
@@ -21,12 +21,6 @@ note: erroneous constant used
 LL |     let _: &'static _ = &C;
    |                         ^^
 
-note: erroneous constant used
-  --> $DIR/invalid-union.rs:43:25
-   |
-LL |     let _: &'static _ = &C;
-   |                         ^^
-
 error: aborting due to previous error
 
 For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/invalid-union.64bit.stderr b/tests/ui/consts/invalid-union.64bit.stderr
index 22b85d20c..07f36ee28 100644
--- a/src/test/ui/consts/invalid-union.64bit.stderr
+++ b/tests/ui/consts/invalid-union.64bit.stderr
@@ -21,12 +21,6 @@ note: erroneous constant used
 LL |     let _: &'static _ = &C;
    |                         ^^
 
-note: erroneous constant used
-  --> $DIR/invalid-union.rs:43:25
-   |
-LL |     let _: &'static _ = &C;
-   |                         ^^
-
 error: aborting due to previous error
 
 For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/invalid-union.rs b/tests/ui/consts/invalid-union.rs
index 28706b4a9..28706b4a9 100644
--- a/src/test/ui/consts/invalid-union.rs
+++ b/tests/ui/consts/invalid-union.rs
diff --git a/src/test/ui/consts/invalid_promotion.rs b/tests/ui/consts/invalid_promotion.rs
index a31eaf40e..a31eaf40e 100644
--- a/src/test/ui/consts/invalid_promotion.rs
+++ b/tests/ui/consts/invalid_promotion.rs
diff --git a/src/test/ui/consts/issue-102117.rs b/tests/ui/consts/issue-102117.rs
index 3ed90aed2..3ed90aed2 100644
--- a/src/test/ui/consts/issue-102117.rs
+++ b/tests/ui/consts/issue-102117.rs
diff --git a/src/test/ui/consts/issue-102117.stderr b/tests/ui/consts/issue-102117.stderr
index f42bcf90f..f42bcf90f 100644
--- a/src/test/ui/consts/issue-102117.stderr
+++ b/tests/ui/consts/issue-102117.stderr
diff --git a/src/test/ui/consts/issue-103790.rs b/tests/ui/consts/issue-103790.rs
index ea3cac605..ea3cac605 100644
--- a/src/test/ui/consts/issue-103790.rs
+++ b/tests/ui/consts/issue-103790.rs
diff --git a/src/test/ui/consts/issue-103790.stderr b/tests/ui/consts/issue-103790.stderr
index 41b0816dc..34d8ee281 100644
--- a/src/test/ui/consts/issue-103790.stderr
+++ b/tests/ui/consts/issue-103790.stderr
@@ -20,7 +20,7 @@ LL | struct S<const S: (), const S: S = { S }>;
 help: add missing generic argument
    |
 LL | struct S<const S: (), const S: S<S> = { S }>;
-   |                                ~~~~
+   |                                 +++
 
 error[E0391]: cycle detected when computing type of `S::S`
   --> $DIR/issue-103790.rs:4:32
diff --git a/src/test/ui/consts/issue-104155.rs b/tests/ui/consts/issue-104155.rs
index 1cc8f81b0..1cc8f81b0 100644
--- a/src/test/ui/consts/issue-104155.rs
+++ b/tests/ui/consts/issue-104155.rs
diff --git a/tests/ui/consts/issue-104396.rs b/tests/ui/consts/issue-104396.rs
new file mode 100644
index 000000000..315b0cf0f
--- /dev/null
+++ b/tests/ui/consts/issue-104396.rs
@@ -0,0 +1,36 @@
+// compile-flags: -Zmir-opt-level=3
+// check-pass
+
+#![feature(generic_const_exprs)]
+//~^ WARN the feature `generic_const_exprs` is incomplete
+
+#[inline(always)]
+fn from_fn_1<const N: usize, F: FnMut(usize) -> f32>(mut f: F) -> [f32; N] {
+    let mut result = [0.0; N];
+    let mut i = 0;
+    while i < N {
+        result[i] = f(i);
+        i += 1;
+    }
+    result
+}
+
+pub struct TestArray<const N: usize>
+where
+    [(); N / 2]:,
+{
+    array: [f32; N / 2],
+}
+
+impl<const N: usize> TestArray<N>
+where
+    [(); N / 2]:,
+{
+    fn from_fn_2<F: FnMut(usize) -> f32>(f: F) -> Self {
+        Self { array: from_fn_1(f) }
+    }
+}
+
+fn main() {
+    TestArray::<4>::from_fn_2(|i| 0.0);
+}
diff --git a/tests/ui/consts/issue-104396.stderr b/tests/ui/consts/issue-104396.stderr
new file mode 100644
index 000000000..5856bee09
--- /dev/null
+++ b/tests/ui/consts/issue-104396.stderr
@@ -0,0 +1,11 @@
+warning: the feature `generic_const_exprs` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/issue-104396.rs:4:12
+   |
+LL | #![feature(generic_const_exprs)]
+   |            ^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #76560 <https://github.com/rust-lang/rust/issues/76560> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+warning: 1 warning emitted
+
diff --git a/src/test/ui/consts/issue-104609.rs b/tests/ui/consts/issue-104609.rs
index 01fd1c48c..01fd1c48c 100644
--- a/src/test/ui/consts/issue-104609.rs
+++ b/tests/ui/consts/issue-104609.rs
diff --git a/src/test/ui/consts/issue-104609.stderr b/tests/ui/consts/issue-104609.stderr
index 00360c44d..00360c44d 100644
--- a/src/test/ui/consts/issue-104609.stderr
+++ b/tests/ui/consts/issue-104609.stderr
diff --git a/src/test/ui/consts/issue-104768.rs b/tests/ui/consts/issue-104768.rs
index 3192daafa..3192daafa 100644
--- a/src/test/ui/consts/issue-104768.rs
+++ b/tests/ui/consts/issue-104768.rs
diff --git a/src/test/ui/consts/issue-104768.stderr b/tests/ui/consts/issue-104768.stderr
index 55b2b6f04..55b2b6f04 100644
--- a/src/test/ui/consts/issue-104768.stderr
+++ b/tests/ui/consts/issue-104768.stderr
diff --git a/src/test/ui/consts/issue-13837.rs b/tests/ui/consts/issue-13837.rs
index 645b1c0eb..645b1c0eb 100644
--- a/src/test/ui/consts/issue-13837.rs
+++ b/tests/ui/consts/issue-13837.rs
diff --git a/src/test/ui/consts/issue-13902.rs b/tests/ui/consts/issue-13902.rs
index 1afde0ebe..1afde0ebe 100644
--- a/src/test/ui/consts/issue-13902.rs
+++ b/tests/ui/consts/issue-13902.rs
diff --git a/src/test/ui/consts/issue-17074.rs b/tests/ui/consts/issue-17074.rs
index 0ed81132e..0ed81132e 100644
--- a/src/test/ui/consts/issue-17074.rs
+++ b/tests/ui/consts/issue-17074.rs
diff --git a/src/test/ui/consts/issue-17458.rs b/tests/ui/consts/issue-17458.rs
index 44125a1c3..44125a1c3 100644
--- a/src/test/ui/consts/issue-17458.rs
+++ b/tests/ui/consts/issue-17458.rs
diff --git a/src/test/ui/consts/issue-17458.stderr b/tests/ui/consts/issue-17458.stderr
index 8936c8d84..8936c8d84 100644
--- a/src/test/ui/consts/issue-17458.stderr
+++ b/tests/ui/consts/issue-17458.stderr
diff --git a/src/test/ui/consts/issue-17718-borrow-interior.rs b/tests/ui/consts/issue-17718-borrow-interior.rs
index 5861f2186..5861f2186 100644
--- a/src/test/ui/consts/issue-17718-borrow-interior.rs
+++ b/tests/ui/consts/issue-17718-borrow-interior.rs
diff --git a/src/test/ui/consts/issue-17718-const-bad-values.rs b/tests/ui/consts/issue-17718-const-bad-values.rs
index 62bbb3b56..62bbb3b56 100644
--- a/src/test/ui/consts/issue-17718-const-bad-values.rs
+++ b/tests/ui/consts/issue-17718-const-bad-values.rs
diff --git a/src/test/ui/consts/issue-17718-const-bad-values.stderr b/tests/ui/consts/issue-17718-const-bad-values.stderr
index ce60aaa07..ce60aaa07 100644
--- a/src/test/ui/consts/issue-17718-const-bad-values.stderr
+++ b/tests/ui/consts/issue-17718-const-bad-values.stderr
diff --git a/src/test/ui/consts/issue-17718-const-borrow.rs b/tests/ui/consts/issue-17718-const-borrow.rs
index 89316dbd5..89316dbd5 100644
--- a/src/test/ui/consts/issue-17718-const-borrow.rs
+++ b/tests/ui/consts/issue-17718-const-borrow.rs
diff --git a/src/test/ui/consts/issue-17718-const-borrow.stderr b/tests/ui/consts/issue-17718-const-borrow.stderr
index e3ff6c923..e3ff6c923 100644
--- a/src/test/ui/consts/issue-17718-const-borrow.stderr
+++ b/tests/ui/consts/issue-17718-const-borrow.stderr
diff --git a/src/test/ui/consts/issue-17718-constants-not-static.rs b/tests/ui/consts/issue-17718-constants-not-static.rs
index 2e6aff161..2e6aff161 100644
--- a/src/test/ui/consts/issue-17718-constants-not-static.rs
+++ b/tests/ui/consts/issue-17718-constants-not-static.rs
diff --git a/src/test/ui/consts/issue-17718-constants-not-static.stderr b/tests/ui/consts/issue-17718-constants-not-static.stderr
index 8f3acae71..8f3acae71 100644
--- a/src/test/ui/consts/issue-17718-constants-not-static.stderr
+++ b/tests/ui/consts/issue-17718-constants-not-static.stderr
diff --git a/src/test/ui/consts/issue-17718-references.rs b/tests/ui/consts/issue-17718-references.rs
index 03d5f8bb3..03d5f8bb3 100644
--- a/src/test/ui/consts/issue-17718-references.rs
+++ b/tests/ui/consts/issue-17718-references.rs
diff --git a/src/test/ui/consts/issue-17718-references.stderr b/tests/ui/consts/issue-17718-references.stderr
index e3c3b369f..e3c3b369f 100644
--- a/src/test/ui/consts/issue-17718-references.stderr
+++ b/tests/ui/consts/issue-17718-references.stderr
diff --git a/src/test/ui/consts/issue-17718.rs b/tests/ui/consts/issue-17718.rs
index c6341d808..c6341d808 100644
--- a/src/test/ui/consts/issue-17718.rs
+++ b/tests/ui/consts/issue-17718.rs
diff --git a/src/test/ui/consts/issue-17756.rs b/tests/ui/consts/issue-17756.rs
index 1835b177f..1835b177f 100644
--- a/src/test/ui/consts/issue-17756.rs
+++ b/tests/ui/consts/issue-17756.rs
diff --git a/src/test/ui/consts/issue-18294.rs b/tests/ui/consts/issue-18294.rs
index 77355f0d7..77355f0d7 100644
--- a/src/test/ui/consts/issue-18294.rs
+++ b/tests/ui/consts/issue-18294.rs
diff --git a/src/test/ui/consts/issue-18294.stderr b/tests/ui/consts/issue-18294.stderr
index e0cbd2a21..e0cbd2a21 100644
--- a/src/test/ui/consts/issue-18294.stderr
+++ b/tests/ui/consts/issue-18294.stderr
diff --git a/src/test/ui/consts/issue-19244.rs b/tests/ui/consts/issue-19244.rs
index 44d9748fd..44d9748fd 100644
--- a/src/test/ui/consts/issue-19244.rs
+++ b/tests/ui/consts/issue-19244.rs
diff --git a/src/test/ui/consts/issue-21562.rs b/tests/ui/consts/issue-21562.rs
index a47d739c6..a47d739c6 100644
--- a/src/test/ui/consts/issue-21562.rs
+++ b/tests/ui/consts/issue-21562.rs
diff --git a/src/test/ui/consts/issue-21721.rs b/tests/ui/consts/issue-21721.rs
index 4c1411e1e..4c1411e1e 100644
--- a/src/test/ui/consts/issue-21721.rs
+++ b/tests/ui/consts/issue-21721.rs
diff --git a/src/test/ui/consts/issue-23833.rs b/tests/ui/consts/issue-23833.rs
index d4128fa54..d4128fa54 100644
--- a/src/test/ui/consts/issue-23833.rs
+++ b/tests/ui/consts/issue-23833.rs
diff --git a/src/test/ui/consts/issue-23968-const-not-overflow.rs b/tests/ui/consts/issue-23968-const-not-overflow.rs
index b95930212..b95930212 100644
--- a/src/test/ui/consts/issue-23968-const-not-overflow.rs
+++ b/tests/ui/consts/issue-23968-const-not-overflow.rs
diff --git a/src/test/ui/consts/issue-25826.rs b/tests/ui/consts/issue-25826.rs
index c340c30a1..c340c30a1 100644
--- a/src/test/ui/consts/issue-25826.rs
+++ b/tests/ui/consts/issue-25826.rs
diff --git a/src/test/ui/consts/issue-25826.stderr b/tests/ui/consts/issue-25826.stderr
index 905c5ee6e..905c5ee6e 100644
--- a/src/test/ui/consts/issue-25826.stderr
+++ b/tests/ui/consts/issue-25826.stderr
diff --git a/src/test/ui/consts/issue-27890.rs b/tests/ui/consts/issue-27890.rs
index 9f8547338..9f8547338 100644
--- a/src/test/ui/consts/issue-27890.rs
+++ b/tests/ui/consts/issue-27890.rs
diff --git a/src/test/ui/consts/issue-28113.rs b/tests/ui/consts/issue-28113.rs
index f8131c9f3..f8131c9f3 100644
--- a/src/test/ui/consts/issue-28113.rs
+++ b/tests/ui/consts/issue-28113.rs
diff --git a/src/test/ui/consts/issue-28113.stderr b/tests/ui/consts/issue-28113.stderr
index 7ad1f752e..1294cc99b 100644
--- a/src/test/ui/consts/issue-28113.stderr
+++ b/tests/ui/consts/issue-28113.stderr
@@ -6,6 +6,7 @@ LL |     || -> u8 { 5 }()
    |
    = note: closures need an RFC before allowed to be called in constants
    = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/issue-29914-2.rs b/tests/ui/consts/issue-29914-2.rs
index 626de269d..626de269d 100644
--- a/src/test/ui/consts/issue-29914-2.rs
+++ b/tests/ui/consts/issue-29914-2.rs
diff --git a/src/test/ui/consts/issue-29914-3.rs b/tests/ui/consts/issue-29914-3.rs
index 1c6c64eb3..1c6c64eb3 100644
--- a/src/test/ui/consts/issue-29914-3.rs
+++ b/tests/ui/consts/issue-29914-3.rs
diff --git a/src/test/ui/consts/issue-29914.rs b/tests/ui/consts/issue-29914.rs
index 6da63664d..6da63664d 100644
--- a/src/test/ui/consts/issue-29914.rs
+++ b/tests/ui/consts/issue-29914.rs
diff --git a/src/test/ui/consts/issue-29927-1.rs b/tests/ui/consts/issue-29927-1.rs
index a236e4913..a236e4913 100644
--- a/src/test/ui/consts/issue-29927-1.rs
+++ b/tests/ui/consts/issue-29927-1.rs
diff --git a/src/test/ui/consts/issue-29927.rs b/tests/ui/consts/issue-29927.rs
index 3385e4e6e..3385e4e6e 100644
--- a/src/test/ui/consts/issue-29927.rs
+++ b/tests/ui/consts/issue-29927.rs
diff --git a/src/test/ui/consts/issue-32829-2.rs b/tests/ui/consts/issue-32829-2.rs
index d70b5a8c4..d70b5a8c4 100644
--- a/src/test/ui/consts/issue-32829-2.rs
+++ b/tests/ui/consts/issue-32829-2.rs
diff --git a/src/test/ui/consts/issue-32829-2.stderr b/tests/ui/consts/issue-32829-2.stderr
index 0fec35818..0fec35818 100644
--- a/src/test/ui/consts/issue-32829-2.stderr
+++ b/tests/ui/consts/issue-32829-2.stderr
diff --git a/src/test/ui/consts/issue-32829.rs b/tests/ui/consts/issue-32829.rs
index 25f323b98..25f323b98 100644
--- a/src/test/ui/consts/issue-32829.rs
+++ b/tests/ui/consts/issue-32829.rs
diff --git a/src/test/ui/consts/issue-32829.stderr b/tests/ui/consts/issue-32829.stderr
index cae5163f0..cae5163f0 100644
--- a/src/test/ui/consts/issue-32829.stderr
+++ b/tests/ui/consts/issue-32829.stderr
diff --git a/src/test/ui/consts/issue-33537.rs b/tests/ui/consts/issue-33537.rs
index 3539aa647..3539aa647 100644
--- a/src/test/ui/consts/issue-33537.rs
+++ b/tests/ui/consts/issue-33537.rs
diff --git a/src/test/ui/consts/issue-34784.rs b/tests/ui/consts/issue-34784.rs
index 98d943470..98d943470 100644
--- a/src/test/ui/consts/issue-34784.rs
+++ b/tests/ui/consts/issue-34784.rs
diff --git a/src/test/ui/consts/issue-3521.fixed b/tests/ui/consts/issue-3521.fixed
index f76106dff..f76106dff 100644
--- a/src/test/ui/consts/issue-3521.fixed
+++ b/tests/ui/consts/issue-3521.fixed
diff --git a/src/test/ui/consts/issue-3521.rs b/tests/ui/consts/issue-3521.rs
index c425a22df..c425a22df 100644
--- a/src/test/ui/consts/issue-3521.rs
+++ b/tests/ui/consts/issue-3521.rs
diff --git a/src/test/ui/consts/issue-3521.stderr b/tests/ui/consts/issue-3521.stderr
index aa42772f1..aa42772f1 100644
--- a/src/test/ui/consts/issue-3521.stderr
+++ b/tests/ui/consts/issue-3521.stderr
diff --git a/src/test/ui/consts/issue-36163.rs b/tests/ui/consts/issue-36163.rs
index 340d2c399..340d2c399 100644
--- a/src/test/ui/consts/issue-36163.rs
+++ b/tests/ui/consts/issue-36163.rs
diff --git a/src/test/ui/consts/issue-36163.stderr b/tests/ui/consts/issue-36163.stderr
index 7137c0538..7137c0538 100644
--- a/src/test/ui/consts/issue-36163.stderr
+++ b/tests/ui/consts/issue-36163.stderr
diff --git a/src/test/ui/consts/issue-37222.rs b/tests/ui/consts/issue-37222.rs
index 8ea5f6b7a..8ea5f6b7a 100644
--- a/src/test/ui/consts/issue-37222.rs
+++ b/tests/ui/consts/issue-37222.rs
diff --git a/src/test/ui/consts/issue-37550-1.rs b/tests/ui/consts/issue-37550-1.rs
index 4d00ac7fd..4d00ac7fd 100644
--- a/src/test/ui/consts/issue-37550-1.rs
+++ b/tests/ui/consts/issue-37550-1.rs
diff --git a/src/test/ui/consts/issue-37550.rs b/tests/ui/consts/issue-37550.rs
index 724eb2829..724eb2829 100644
--- a/src/test/ui/consts/issue-37550.rs
+++ b/tests/ui/consts/issue-37550.rs
diff --git a/src/test/ui/consts/issue-37991.rs b/tests/ui/consts/issue-37991.rs
index a6ac4d5ca..a6ac4d5ca 100644
--- a/src/test/ui/consts/issue-37991.rs
+++ b/tests/ui/consts/issue-37991.rs
diff --git a/src/test/ui/consts/issue-39161-bogus-error.rs b/tests/ui/consts/issue-39161-bogus-error.rs
index a954385da..a954385da 100644
--- a/src/test/ui/consts/issue-39161-bogus-error.rs
+++ b/tests/ui/consts/issue-39161-bogus-error.rs
diff --git a/src/test/ui/consts/issue-39974.rs b/tests/ui/consts/issue-39974.rs
index 503647ef4..503647ef4 100644
--- a/src/test/ui/consts/issue-39974.rs
+++ b/tests/ui/consts/issue-39974.rs
diff --git a/src/test/ui/consts/issue-39974.stderr b/tests/ui/consts/issue-39974.stderr
index 56365e51e..56365e51e 100644
--- a/src/test/ui/consts/issue-39974.stderr
+++ b/tests/ui/consts/issue-39974.stderr
diff --git a/src/test/ui/consts/issue-43105.rs b/tests/ui/consts/issue-43105.rs
index cac12b909..cac12b909 100644
--- a/src/test/ui/consts/issue-43105.rs
+++ b/tests/ui/consts/issue-43105.rs
diff --git a/src/test/ui/consts/issue-43105.stderr b/tests/ui/consts/issue-43105.stderr
index 2d1174af7..2d1174af7 100644
--- a/src/test/ui/consts/issue-43105.stderr
+++ b/tests/ui/consts/issue-43105.stderr
diff --git a/src/test/ui/consts/issue-44415.rs b/tests/ui/consts/issue-44415.rs
index d93b451be..d93b451be 100644
--- a/src/test/ui/consts/issue-44415.rs
+++ b/tests/ui/consts/issue-44415.rs
diff --git a/src/test/ui/consts/issue-44415.stderr b/tests/ui/consts/issue-44415.stderr
index 57f94f8c6..ec64b956d 100644
--- a/src/test/ui/consts/issue-44415.stderr
+++ b/tests/ui/consts/issue-44415.stderr
@@ -15,8 +15,8 @@ note: ...which requires const-evaluating + checking `Foo::bytes::{constant#0}`..
 LL |     bytes: [u8; unsafe { intrinsics::size_of::<Foo>() }],
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: ...which requires computing layout of `Foo`...
-   = note: ...which requires computing layout of `[u8; _]`...
-   = note: ...which requires normalizing `[u8; _]`...
+   = note: ...which requires computing layout of `[u8; unsafe { intrinsics::size_of::<Foo>() }]`...
+   = note: ...which requires normalizing `[u8; unsafe { intrinsics::size_of::<Foo>() }]`...
    = note: ...which again requires evaluating type-level constant, completing the cycle
 note: cycle used when checking that `Foo` is well-formed
   --> $DIR/issue-44415.rs:5:1
diff --git a/src/test/ui/consts/issue-46553.rs b/tests/ui/consts/issue-46553.rs
index abeaf10f2..abeaf10f2 100644
--- a/src/test/ui/consts/issue-46553.rs
+++ b/tests/ui/consts/issue-46553.rs
diff --git a/src/test/ui/consts/issue-47789.rs b/tests/ui/consts/issue-47789.rs
index 32dd909b2..32dd909b2 100644
--- a/src/test/ui/consts/issue-47789.rs
+++ b/tests/ui/consts/issue-47789.rs
diff --git a/src/test/ui/consts/issue-50439.rs b/tests/ui/consts/issue-50439.rs
index 0be7c4054..0be7c4054 100644
--- a/src/test/ui/consts/issue-50439.rs
+++ b/tests/ui/consts/issue-50439.rs
diff --git a/src/test/ui/consts/issue-50439.stderr b/tests/ui/consts/issue-50439.stderr
index 3fbdf33b2..3fbdf33b2 100644
--- a/src/test/ui/consts/issue-50439.stderr
+++ b/tests/ui/consts/issue-50439.stderr
diff --git a/src/test/ui/consts/issue-52023-array-size-pointer-cast.rs b/tests/ui/consts/issue-52023-array-size-pointer-cast.rs
index 2249d9879..2249d9879 100644
--- a/src/test/ui/consts/issue-52023-array-size-pointer-cast.rs
+++ b/tests/ui/consts/issue-52023-array-size-pointer-cast.rs
diff --git a/src/test/ui/consts/issue-52023-array-size-pointer-cast.stderr b/tests/ui/consts/issue-52023-array-size-pointer-cast.stderr
index 9a3d5716e..9a3d5716e 100644
--- a/src/test/ui/consts/issue-52023-array-size-pointer-cast.stderr
+++ b/tests/ui/consts/issue-52023-array-size-pointer-cast.stderr
diff --git a/src/test/ui/consts/issue-52060.rs b/tests/ui/consts/issue-52060.rs
index 13b914c03..13b914c03 100644
--- a/src/test/ui/consts/issue-52060.rs
+++ b/tests/ui/consts/issue-52060.rs
diff --git a/src/test/ui/consts/issue-52060.stderr b/tests/ui/consts/issue-52060.stderr
index 95e5f2a82..95e5f2a82 100644
--- a/src/test/ui/consts/issue-52060.stderr
+++ b/tests/ui/consts/issue-52060.stderr
diff --git a/src/test/ui/consts/issue-54224.rs b/tests/ui/consts/issue-54224.rs
index f1947933d..f1947933d 100644
--- a/src/test/ui/consts/issue-54224.rs
+++ b/tests/ui/consts/issue-54224.rs
diff --git a/src/test/ui/consts/issue-54224.stderr b/tests/ui/consts/issue-54224.stderr
index 55fe55759..55fe55759 100644
--- a/src/test/ui/consts/issue-54224.stderr
+++ b/tests/ui/consts/issue-54224.stderr
diff --git a/src/test/ui/consts/issue-54348.rs b/tests/ui/consts/issue-54348.rs
index 5c38d7c42..5c38d7c42 100644
--- a/src/test/ui/consts/issue-54348.rs
+++ b/tests/ui/consts/issue-54348.rs
diff --git a/src/test/ui/consts/issue-54348.stderr b/tests/ui/consts/issue-54348.stderr
index eb85f3498..eb85f3498 100644
--- a/src/test/ui/consts/issue-54348.stderr
+++ b/tests/ui/consts/issue-54348.stderr
diff --git a/src/test/ui/consts/issue-54387.rs b/tests/ui/consts/issue-54387.rs
index 60e3a02f4..60e3a02f4 100644
--- a/src/test/ui/consts/issue-54387.rs
+++ b/tests/ui/consts/issue-54387.rs
diff --git a/src/test/ui/consts/issue-54954.rs b/tests/ui/consts/issue-54954.rs
index 520bf508f..520bf508f 100644
--- a/src/test/ui/consts/issue-54954.rs
+++ b/tests/ui/consts/issue-54954.rs
diff --git a/src/test/ui/consts/issue-54954.stderr b/tests/ui/consts/issue-54954.stderr
index 850558287..850558287 100644
--- a/src/test/ui/consts/issue-54954.stderr
+++ b/tests/ui/consts/issue-54954.stderr
diff --git a/src/test/ui/consts/issue-56164.rs b/tests/ui/consts/issue-56164.rs
index 22c257d0b..22c257d0b 100644
--- a/src/test/ui/consts/issue-56164.rs
+++ b/tests/ui/consts/issue-56164.rs
diff --git a/src/test/ui/consts/issue-56164.stderr b/tests/ui/consts/issue-56164.stderr
index 2579b3e78..845b23d5d 100644
--- a/src/test/ui/consts/issue-56164.stderr
+++ b/tests/ui/consts/issue-56164.stderr
@@ -6,6 +6,7 @@ LL | const fn foo() { (||{})() }
    |
    = note: closures need an RFC before allowed to be called in constant functions
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error: function pointer calls are not allowed in constant functions
   --> $DIR/issue-56164.rs:5:5
diff --git a/src/test/ui/consts/issue-58435-ice-with-assoc-const.rs b/tests/ui/consts/issue-58435-ice-with-assoc-const.rs
index fac727d2d..fac727d2d 100644
--- a/src/test/ui/consts/issue-58435-ice-with-assoc-const.rs
+++ b/tests/ui/consts/issue-58435-ice-with-assoc-const.rs
diff --git a/src/test/ui/consts/issue-62045.rs b/tests/ui/consts/issue-62045.rs
index 5abed374a..5abed374a 100644
--- a/src/test/ui/consts/issue-62045.rs
+++ b/tests/ui/consts/issue-62045.rs
diff --git a/src/test/ui/consts/issue-63226.rs b/tests/ui/consts/issue-63226.rs
index deec44990..deec44990 100644
--- a/src/test/ui/consts/issue-63226.rs
+++ b/tests/ui/consts/issue-63226.rs
diff --git a/src/test/ui/consts/issue-63952.32bit.stderr b/tests/ui/consts/issue-63952.32bit.stderr
index 755c7fb7d..755c7fb7d 100644
--- a/src/test/ui/consts/issue-63952.32bit.stderr
+++ b/tests/ui/consts/issue-63952.32bit.stderr
diff --git a/src/test/ui/consts/issue-63952.64bit.stderr b/tests/ui/consts/issue-63952.64bit.stderr
index abdb9a4f7..abdb9a4f7 100644
--- a/src/test/ui/consts/issue-63952.64bit.stderr
+++ b/tests/ui/consts/issue-63952.64bit.stderr
diff --git a/src/test/ui/consts/issue-63952.rs b/tests/ui/consts/issue-63952.rs
index 5c83e6f45..5c83e6f45 100644
--- a/src/test/ui/consts/issue-63952.rs
+++ b/tests/ui/consts/issue-63952.rs
diff --git a/src/test/ui/consts/issue-64059.rs b/tests/ui/consts/issue-64059.rs
index 02c8b7250..02c8b7250 100644
--- a/src/test/ui/consts/issue-64059.rs
+++ b/tests/ui/consts/issue-64059.rs
diff --git a/src/test/ui/consts/issue-64506.rs b/tests/ui/consts/issue-64506.rs
index db3e85a7b..db3e85a7b 100644
--- a/src/test/ui/consts/issue-64506.rs
+++ b/tests/ui/consts/issue-64506.rs
diff --git a/src/test/ui/consts/issue-64662.rs b/tests/ui/consts/issue-64662.rs
index e3a8c8583..e3a8c8583 100644
--- a/src/test/ui/consts/issue-64662.rs
+++ b/tests/ui/consts/issue-64662.rs
diff --git a/src/test/ui/consts/issue-64662.stderr b/tests/ui/consts/issue-64662.stderr
index 21a419711..21a419711 100644
--- a/src/test/ui/consts/issue-64662.stderr
+++ b/tests/ui/consts/issue-64662.stderr
diff --git a/src/test/ui/consts/issue-65348.rs b/tests/ui/consts/issue-65348.rs
index 5eafa831d..5eafa831d 100644
--- a/src/test/ui/consts/issue-65348.rs
+++ b/tests/ui/consts/issue-65348.rs
diff --git a/src/test/ui/consts/issue-66342.rs b/tests/ui/consts/issue-66342.rs
index 417f69041..417f69041 100644
--- a/src/test/ui/consts/issue-66342.rs
+++ b/tests/ui/consts/issue-66342.rs
diff --git a/src/test/ui/consts/issue-66345.rs b/tests/ui/consts/issue-66345.rs
index 4971d9647..4971d9647 100644
--- a/src/test/ui/consts/issue-66345.rs
+++ b/tests/ui/consts/issue-66345.rs
diff --git a/src/test/ui/consts/issue-66397.rs b/tests/ui/consts/issue-66397.rs
index 1b4aff43b..1b4aff43b 100644
--- a/src/test/ui/consts/issue-66397.rs
+++ b/tests/ui/consts/issue-66397.rs
diff --git a/src/test/ui/consts/issue-66693-panic-in-array-len.rs b/tests/ui/consts/issue-66693-panic-in-array-len.rs
index fc0dcd7a4..fc0dcd7a4 100644
--- a/src/test/ui/consts/issue-66693-panic-in-array-len.rs
+++ b/tests/ui/consts/issue-66693-panic-in-array-len.rs
diff --git a/src/test/ui/consts/issue-66693-panic-in-array-len.stderr b/tests/ui/consts/issue-66693-panic-in-array-len.stderr
index 1585ea317..1585ea317 100644
--- a/src/test/ui/consts/issue-66693-panic-in-array-len.stderr
+++ b/tests/ui/consts/issue-66693-panic-in-array-len.stderr
diff --git a/src/test/ui/consts/issue-66693.rs b/tests/ui/consts/issue-66693.rs
index df45d01ec..df45d01ec 100644
--- a/src/test/ui/consts/issue-66693.rs
+++ b/tests/ui/consts/issue-66693.rs
diff --git a/src/test/ui/consts/issue-66693.stderr b/tests/ui/consts/issue-66693.stderr
index e9a3fced6..e9a3fced6 100644
--- a/src/test/ui/consts/issue-66693.stderr
+++ b/tests/ui/consts/issue-66693.stderr
diff --git a/src/test/ui/consts/issue-66787.rs b/tests/ui/consts/issue-66787.rs
index 612b795eb..612b795eb 100644
--- a/src/test/ui/consts/issue-66787.rs
+++ b/tests/ui/consts/issue-66787.rs
diff --git a/src/test/ui/consts/issue-67529.rs b/tests/ui/consts/issue-67529.rs
index dd24c2d27..dd24c2d27 100644
--- a/src/test/ui/consts/issue-67529.rs
+++ b/tests/ui/consts/issue-67529.rs
diff --git a/src/test/ui/consts/issue-67640.rs b/tests/ui/consts/issue-67640.rs
index 4c71a2e02..4c71a2e02 100644
--- a/src/test/ui/consts/issue-67640.rs
+++ b/tests/ui/consts/issue-67640.rs
diff --git a/src/test/ui/consts/issue-67641.rs b/tests/ui/consts/issue-67641.rs
index e5a74f156..e5a74f156 100644
--- a/src/test/ui/consts/issue-67641.rs
+++ b/tests/ui/consts/issue-67641.rs
diff --git a/src/test/ui/consts/issue-67696-const-prop-ice.rs b/tests/ui/consts/issue-67696-const-prop-ice.rs
index ad52608b3..ad52608b3 100644
--- a/src/test/ui/consts/issue-67696-const-prop-ice.rs
+++ b/tests/ui/consts/issue-67696-const-prop-ice.rs
diff --git a/src/test/ui/consts/issue-67862.rs b/tests/ui/consts/issue-67862.rs
index b9e96a87f..b9e96a87f 100644
--- a/src/test/ui/consts/issue-67862.rs
+++ b/tests/ui/consts/issue-67862.rs
diff --git a/src/test/ui/consts/issue-68264-overflow.rs b/tests/ui/consts/issue-68264-overflow.rs
index 8f21e0648..8f21e0648 100644
--- a/src/test/ui/consts/issue-68264-overflow.rs
+++ b/tests/ui/consts/issue-68264-overflow.rs
diff --git a/src/test/ui/consts/issue-68542-closure-in-array-len.rs b/tests/ui/consts/issue-68542-closure-in-array-len.rs
index 37958e791..37958e791 100644
--- a/src/test/ui/consts/issue-68542-closure-in-array-len.rs
+++ b/tests/ui/consts/issue-68542-closure-in-array-len.rs
diff --git a/src/test/ui/consts/issue-68542-closure-in-array-len.stderr b/tests/ui/consts/issue-68542-closure-in-array-len.stderr
index 74fbbc680..d23513ed7 100644
--- a/src/test/ui/consts/issue-68542-closure-in-array-len.stderr
+++ b/tests/ui/consts/issue-68542-closure-in-array-len.stderr
@@ -6,6 +6,7 @@ LL |     a: [(); (|| { 0 })()]
    |
    = note: closures need an RFC before allowed to be called in constants
    = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/issue-68684.rs b/tests/ui/consts/issue-68684.rs
index c98f199b6..c98f199b6 100644
--- a/src/test/ui/consts/issue-68684.rs
+++ b/tests/ui/consts/issue-68684.rs
diff --git a/src/test/ui/consts/issue-69191-ice-on-uninhabited-enum-field.rs b/tests/ui/consts/issue-69191-ice-on-uninhabited-enum-field.rs
index 5b7c7be42..5b7c7be42 100644
--- a/src/test/ui/consts/issue-69191-ice-on-uninhabited-enum-field.rs
+++ b/tests/ui/consts/issue-69191-ice-on-uninhabited-enum-field.rs
diff --git a/src/test/ui/consts/issue-69310-array-size-lit-wrong-ty.rs b/tests/ui/consts/issue-69310-array-size-lit-wrong-ty.rs
index f0d5fea8e..f0d5fea8e 100644
--- a/src/test/ui/consts/issue-69310-array-size-lit-wrong-ty.rs
+++ b/tests/ui/consts/issue-69310-array-size-lit-wrong-ty.rs
diff --git a/src/test/ui/consts/issue-69310-array-size-lit-wrong-ty.stderr b/tests/ui/consts/issue-69310-array-size-lit-wrong-ty.stderr
index 7078b4bd7..7078b4bd7 100644
--- a/src/test/ui/consts/issue-69310-array-size-lit-wrong-ty.stderr
+++ b/tests/ui/consts/issue-69310-array-size-lit-wrong-ty.stderr
diff --git a/src/test/ui/consts/issue-69312.rs b/tests/ui/consts/issue-69312.rs
index 413c67520..413c67520 100644
--- a/src/test/ui/consts/issue-69312.rs
+++ b/tests/ui/consts/issue-69312.rs
diff --git a/src/test/ui/consts/issue-69488.rs b/tests/ui/consts/issue-69488.rs
index 46546eada..46546eada 100644
--- a/src/test/ui/consts/issue-69488.rs
+++ b/tests/ui/consts/issue-69488.rs
diff --git a/src/test/ui/consts/issue-69532.rs b/tests/ui/consts/issue-69532.rs
index 0a8917812..0a8917812 100644
--- a/src/test/ui/consts/issue-69532.rs
+++ b/tests/ui/consts/issue-69532.rs
diff --git a/src/test/ui/consts/issue-6991.rs b/tests/ui/consts/issue-6991.rs
index f00cd9aef..f00cd9aef 100644
--- a/src/test/ui/consts/issue-6991.rs
+++ b/tests/ui/consts/issue-6991.rs
diff --git a/src/test/ui/consts/issue-70773-mir-typeck-lt-norm.rs b/tests/ui/consts/issue-70773-mir-typeck-lt-norm.rs
index dd56faa31..dd56faa31 100644
--- a/src/test/ui/consts/issue-70773-mir-typeck-lt-norm.rs
+++ b/tests/ui/consts/issue-70773-mir-typeck-lt-norm.rs
diff --git a/src/test/ui/consts/issue-70942-trait-vs-impl-mismatch.rs b/tests/ui/consts/issue-70942-trait-vs-impl-mismatch.rs
index b65f53450..b65f53450 100644
--- a/src/test/ui/consts/issue-70942-trait-vs-impl-mismatch.rs
+++ b/tests/ui/consts/issue-70942-trait-vs-impl-mismatch.rs
diff --git a/src/test/ui/consts/issue-70942-trait-vs-impl-mismatch.stderr b/tests/ui/consts/issue-70942-trait-vs-impl-mismatch.stderr
index 1597120fb..1597120fb 100644
--- a/src/test/ui/consts/issue-70942-trait-vs-impl-mismatch.stderr
+++ b/tests/ui/consts/issue-70942-trait-vs-impl-mismatch.stderr
diff --git a/src/test/ui/consts/issue-73976-monomorphic.rs b/tests/ui/consts/issue-73976-monomorphic.rs
index 7706a97f2..addcc1eaa 100644
--- a/src/test/ui/consts/issue-73976-monomorphic.rs
+++ b/tests/ui/consts/issue-73976-monomorphic.rs
@@ -7,6 +7,7 @@
 
 #![feature(const_type_id)]
 #![feature(const_type_name)]
+#![feature(const_trait_impl)]
 
 use std::any::{self, TypeId};
 
@@ -17,7 +18,7 @@ impl<T: 'static> GetTypeId<T> {
 }
 
 const fn check_type_id<T: 'static>() -> bool {
-    matches!(GetTypeId::<T>::VALUE, GetTypeId::<usize>::VALUE)
+    GetTypeId::<T>::VALUE == GetTypeId::<usize>::VALUE
 }
 
 pub struct GetTypeNameLen<T>(T);
diff --git a/src/test/ui/consts/issue-73976-polymorphic.rs b/tests/ui/consts/issue-73976-polymorphic.rs
index 787462da9..787462da9 100644
--- a/src/test/ui/consts/issue-73976-polymorphic.rs
+++ b/tests/ui/consts/issue-73976-polymorphic.rs
diff --git a/src/test/ui/consts/issue-73976-polymorphic.stderr b/tests/ui/consts/issue-73976-polymorphic.stderr
index 442ad23f2..442ad23f2 100644
--- a/src/test/ui/consts/issue-73976-polymorphic.stderr
+++ b/tests/ui/consts/issue-73976-polymorphic.stderr
diff --git a/src/test/ui/consts/issue-76064.rs b/tests/ui/consts/issue-76064.rs
index 3c153ad72..3c153ad72 100644
--- a/src/test/ui/consts/issue-76064.rs
+++ b/tests/ui/consts/issue-76064.rs
diff --git a/src/test/ui/consts/issue-76064.stderr b/tests/ui/consts/issue-76064.stderr
index 67b2e90db..67b2e90db 100644
--- a/src/test/ui/consts/issue-76064.stderr
+++ b/tests/ui/consts/issue-76064.stderr
diff --git a/src/test/ui/consts/issue-77062-large-zst-array.rs b/tests/ui/consts/issue-77062-large-zst-array.rs
index 0566b802e..0566b802e 100644
--- a/src/test/ui/consts/issue-77062-large-zst-array.rs
+++ b/tests/ui/consts/issue-77062-large-zst-array.rs
diff --git a/src/test/ui/consts/issue-78655.rs b/tests/ui/consts/issue-78655.rs
index 82d2d7c21..82d2d7c21 100644
--- a/src/test/ui/consts/issue-78655.rs
+++ b/tests/ui/consts/issue-78655.rs
diff --git a/src/test/ui/consts/issue-78655.stderr b/tests/ui/consts/issue-78655.stderr
index 6b83fa0e5..6b83fa0e5 100644
--- a/src/test/ui/consts/issue-78655.stderr
+++ b/tests/ui/consts/issue-78655.stderr
diff --git a/src/test/ui/consts/issue-79137-monomorphic.rs b/tests/ui/consts/issue-79137-monomorphic.rs
index 58e0c387f..58e0c387f 100644
--- a/src/test/ui/consts/issue-79137-monomorphic.rs
+++ b/tests/ui/consts/issue-79137-monomorphic.rs
diff --git a/src/test/ui/consts/issue-79137-toogeneric.rs b/tests/ui/consts/issue-79137-toogeneric.rs
index 456035458..456035458 100644
--- a/src/test/ui/consts/issue-79137-toogeneric.rs
+++ b/tests/ui/consts/issue-79137-toogeneric.rs
diff --git a/src/test/ui/consts/issue-79137-toogeneric.stderr b/tests/ui/consts/issue-79137-toogeneric.stderr
index 579e6aa09..579e6aa09 100644
--- a/src/test/ui/consts/issue-79137-toogeneric.stderr
+++ b/tests/ui/consts/issue-79137-toogeneric.stderr
diff --git a/src/test/ui/consts/issue-79152-const-array-index.rs b/tests/ui/consts/issue-79152-const-array-index.rs
index 95518e1bb..95518e1bb 100644
--- a/src/test/ui/consts/issue-79152-const-array-index.rs
+++ b/tests/ui/consts/issue-79152-const-array-index.rs
diff --git a/src/test/ui/consts/issue-79690.64bit.stderr b/tests/ui/consts/issue-79690.64bit.stderr
index b8798a975..b8798a975 100644
--- a/src/test/ui/consts/issue-79690.64bit.stderr
+++ b/tests/ui/consts/issue-79690.64bit.stderr
diff --git a/src/test/ui/consts/issue-79690.rs b/tests/ui/consts/issue-79690.rs
index 56747bf5a..56747bf5a 100644
--- a/src/test/ui/consts/issue-79690.rs
+++ b/tests/ui/consts/issue-79690.rs
diff --git a/tests/ui/consts/issue-83182.rs b/tests/ui/consts/issue-83182.rs
new file mode 100644
index 000000000..b62f903bd
--- /dev/null
+++ b/tests/ui/consts/issue-83182.rs
@@ -0,0 +1,9 @@
+// Strip out raw byte dumps to make comparison platform-independent:
+// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
+
+use std::mem;
+struct MyStr(str);
+const MYSTR_NO_INIT: &MyStr = unsafe { mem::transmute::<&[_], _>(&[&()]) };
+//~^ ERROR: it is undefined behavior to use this value
+fn main() {}
diff --git a/tests/ui/consts/issue-83182.stderr b/tests/ui/consts/issue-83182.stderr
new file mode 100644
index 000000000..1d578f910
--- /dev/null
+++ b/tests/ui/consts/issue-83182.stderr
@@ -0,0 +1,15 @@
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/issue-83182.rs:7:1
+   |
+LL | const MYSTR_NO_INIT: &MyStr = unsafe { mem::transmute::<&[_], _>(&[&()]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ unable to turn pointer into raw bytes
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/issue-87046.rs b/tests/ui/consts/issue-87046.rs
index 4b8f9f536..4b8f9f536 100644
--- a/src/test/ui/consts/issue-87046.rs
+++ b/tests/ui/consts/issue-87046.rs
diff --git a/src/test/ui/consts/issue-87046.stderr b/tests/ui/consts/issue-87046.stderr
index d0dbb21ce..d0dbb21ce 100644
--- a/src/test/ui/consts/issue-87046.stderr
+++ b/tests/ui/consts/issue-87046.stderr
diff --git a/src/test/ui/consts/issue-88071.rs b/tests/ui/consts/issue-88071.rs
index f58cdb594..f58cdb594 100644
--- a/src/test/ui/consts/issue-88071.rs
+++ b/tests/ui/consts/issue-88071.rs
diff --git a/src/test/ui/consts/issue-88649.rs b/tests/ui/consts/issue-88649.rs
index 43e562b5a..43e562b5a 100644
--- a/src/test/ui/consts/issue-88649.rs
+++ b/tests/ui/consts/issue-88649.rs
diff --git a/src/test/ui/consts/issue-89088.rs b/tests/ui/consts/issue-89088.rs
index 40cc665fb..40cc665fb 100644
--- a/src/test/ui/consts/issue-89088.rs
+++ b/tests/ui/consts/issue-89088.rs
diff --git a/src/test/ui/consts/issue-90762.rs b/tests/ui/consts/issue-90762.rs
index 78d387386..78d387386 100644
--- a/src/test/ui/consts/issue-90762.rs
+++ b/tests/ui/consts/issue-90762.rs
diff --git a/src/test/ui/consts/issue-90870.fixed b/tests/ui/consts/issue-90870.fixed
index 0d28e06e5..df44689ef 100644
--- a/src/test/ui/consts/issue-90870.fixed
+++ b/tests/ui/consts/issue-90870.fixed
@@ -8,12 +8,14 @@ const fn f(a: &u8, b: &u8) -> bool {
     *a == *b
     //~^ ERROR: cannot call non-const operator in constant functions [E0015]
     //~| HELP: consider dereferencing here
+    //~| HELP: add `#![feature(const_trait_impl)]`
 }
 
 const fn g(a: &&&&i64, b: &&&&i64) -> bool {
     ****a == ****b
     //~^ ERROR: cannot call non-const operator in constant functions [E0015]
     //~| HELP: consider dereferencing here
+    //~| HELP: add `#![feature(const_trait_impl)]`
 }
 
 const fn h(mut a: &[u8], mut b: &[u8]) -> bool {
@@ -21,6 +23,7 @@ const fn h(mut a: &[u8], mut b: &[u8]) -> bool {
         if *l == *r {
         //~^ ERROR: cannot call non-const operator in constant functions [E0015]
         //~| HELP: consider dereferencing here
+        //~| HELP: add `#![feature(const_trait_impl)]`
             a = at;
             b = bt;
         } else {
diff --git a/src/test/ui/consts/issue-90870.rs b/tests/ui/consts/issue-90870.rs
index c6bfffd2c..676ac73c6 100644
--- a/src/test/ui/consts/issue-90870.rs
+++ b/tests/ui/consts/issue-90870.rs
@@ -8,12 +8,14 @@ const fn f(a: &u8, b: &u8) -> bool {
     a == b
     //~^ ERROR: cannot call non-const operator in constant functions [E0015]
     //~| HELP: consider dereferencing here
+    //~| HELP: add `#![feature(const_trait_impl)]`
 }
 
 const fn g(a: &&&&i64, b: &&&&i64) -> bool {
     a == b
     //~^ ERROR: cannot call non-const operator in constant functions [E0015]
     //~| HELP: consider dereferencing here
+    //~| HELP: add `#![feature(const_trait_impl)]`
 }
 
 const fn h(mut a: &[u8], mut b: &[u8]) -> bool {
@@ -21,6 +23,7 @@ const fn h(mut a: &[u8], mut b: &[u8]) -> bool {
         if l == r {
         //~^ ERROR: cannot call non-const operator in constant functions [E0015]
         //~| HELP: consider dereferencing here
+        //~| HELP: add `#![feature(const_trait_impl)]`
             a = at;
             b = bt;
         } else {
diff --git a/src/test/ui/consts/issue-90870.stderr b/tests/ui/consts/issue-90870.stderr
index 478445cfb..8825efd14 100644
--- a/src/test/ui/consts/issue-90870.stderr
+++ b/tests/ui/consts/issue-90870.stderr
@@ -5,30 +5,33 @@ LL |     a == b
    |     ^^^^^^
    |
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 help: consider dereferencing here
    |
 LL |     *a == *b
    |     +     +
 
 error[E0015]: cannot call non-const operator in constant functions
-  --> $DIR/issue-90870.rs:14:5
+  --> $DIR/issue-90870.rs:15:5
    |
 LL |     a == b
    |     ^^^^^^
    |
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 help: consider dereferencing here
    |
 LL |     ****a == ****b
    |     ++++     ++++
 
 error[E0015]: cannot call non-const operator in constant functions
-  --> $DIR/issue-90870.rs:21:12
+  --> $DIR/issue-90870.rs:23:12
    |
 LL |         if l == r {
    |            ^^^^^^
    |
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 help: consider dereferencing here
    |
 LL |         if *l == *r {
diff --git a/src/test/ui/consts/issue-90878-2.rs b/tests/ui/consts/issue-90878-2.rs
index e5bcecce6..e5bcecce6 100644
--- a/src/test/ui/consts/issue-90878-2.rs
+++ b/tests/ui/consts/issue-90878-2.rs
diff --git a/src/test/ui/consts/issue-90878-2.stderr b/tests/ui/consts/issue-90878-2.stderr
index 71b8d21fb..71b8d21fb 100644
--- a/src/test/ui/consts/issue-90878-2.stderr
+++ b/tests/ui/consts/issue-90878-2.stderr
diff --git a/src/test/ui/consts/issue-90878-3.rs b/tests/ui/consts/issue-90878-3.rs
index 0e36646eb..0e36646eb 100644
--- a/src/test/ui/consts/issue-90878-3.rs
+++ b/tests/ui/consts/issue-90878-3.rs
diff --git a/src/test/ui/consts/issue-90878-3.stderr b/tests/ui/consts/issue-90878-3.stderr
index 1bcc0eb37..1bcc0eb37 100644
--- a/src/test/ui/consts/issue-90878-3.stderr
+++ b/tests/ui/consts/issue-90878-3.stderr
diff --git a/src/test/ui/consts/issue-90878.rs b/tests/ui/consts/issue-90878.rs
index 43f6fe5f3..43f6fe5f3 100644
--- a/src/test/ui/consts/issue-90878.rs
+++ b/tests/ui/consts/issue-90878.rs
diff --git a/src/test/ui/consts/issue-90878.stderr b/tests/ui/consts/issue-90878.stderr
index c038fc622..c038fc622 100644
--- a/src/test/ui/consts/issue-90878.stderr
+++ b/tests/ui/consts/issue-90878.stderr
diff --git a/src/test/ui/consts/issue-91434.rs b/tests/ui/consts/issue-91434.rs
index 001dc708f..001dc708f 100644
--- a/src/test/ui/consts/issue-91434.rs
+++ b/tests/ui/consts/issue-91434.rs
diff --git a/src/test/ui/consts/issue-91434.stderr b/tests/ui/consts/issue-91434.stderr
index 08d3ad770..08d3ad770 100644
--- a/src/test/ui/consts/issue-91434.stderr
+++ b/tests/ui/consts/issue-91434.stderr
diff --git a/src/test/ui/consts/issue-91560.fixed b/tests/ui/consts/issue-91560.fixed
index 41b9d9573..41b9d9573 100644
--- a/src/test/ui/consts/issue-91560.fixed
+++ b/tests/ui/consts/issue-91560.fixed
diff --git a/src/test/ui/consts/issue-91560.rs b/tests/ui/consts/issue-91560.rs
index 04592feb5..04592feb5 100644
--- a/src/test/ui/consts/issue-91560.rs
+++ b/tests/ui/consts/issue-91560.rs
diff --git a/src/test/ui/consts/issue-91560.stderr b/tests/ui/consts/issue-91560.stderr
index e1b5d4cac..e1b5d4cac 100644
--- a/src/test/ui/consts/issue-91560.stderr
+++ b/tests/ui/consts/issue-91560.stderr
diff --git a/src/test/ui/consts/issue-94371.rs b/tests/ui/consts/issue-94371.rs
index de9ff730b..de9ff730b 100644
--- a/src/test/ui/consts/issue-94371.rs
+++ b/tests/ui/consts/issue-94371.rs
diff --git a/src/test/ui/consts/issue-94675.rs b/tests/ui/consts/issue-94675.rs
index ce21ebdb9..ce21ebdb9 100644
--- a/src/test/ui/consts/issue-94675.rs
+++ b/tests/ui/consts/issue-94675.rs
diff --git a/src/test/ui/consts/issue-94675.stderr b/tests/ui/consts/issue-94675.stderr
index f4683f7f5..f4683f7f5 100644
--- a/src/test/ui/consts/issue-94675.stderr
+++ b/tests/ui/consts/issue-94675.stderr
diff --git a/src/test/ui/consts/issue-96169.rs b/tests/ui/consts/issue-96169.rs
index 14c0a1399..14c0a1399 100644
--- a/src/test/ui/consts/issue-96169.rs
+++ b/tests/ui/consts/issue-96169.rs
diff --git a/src/test/ui/consts/issue-broken-mir.rs b/tests/ui/consts/issue-broken-mir.rs
index 36f0ff921..36f0ff921 100644
--- a/src/test/ui/consts/issue-broken-mir.rs
+++ b/tests/ui/consts/issue-broken-mir.rs
diff --git a/src/test/ui/consts/issue-miri-1910.rs b/tests/ui/consts/issue-miri-1910.rs
index 29e0ea950..29e0ea950 100644
--- a/src/test/ui/consts/issue-miri-1910.rs
+++ b/tests/ui/consts/issue-miri-1910.rs
diff --git a/tests/ui/consts/issue-miri-1910.stderr b/tests/ui/consts/issue-miri-1910.stderr
new file mode 100644
index 000000000..61865b1da
--- /dev/null
+++ b/tests/ui/consts/issue-miri-1910.stderr
@@ -0,0 +1,20 @@
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+   |
+   = note: unable to copy parts of a pointer from memory at ALLOC
+   |
+   = help: this code performed an operation that depends on the underlying bytes representing a pointer
+   = help: the absolute address of a pointer is not known at compile-time, so such operations are not supported
+note: inside `std::ptr::read::<u8>`
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+note: inside `ptr::const_ptr::<impl *const u8>::read`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `C`
+  --> $DIR/issue-miri-1910.rs:8:5
+   |
+LL |     (&foo as *const _ as *const u8).add(one_and_a_half_pointers).read();
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/large_const_alloc.rs b/tests/ui/consts/large_const_alloc.rs
index 54abaab22..54abaab22 100644
--- a/src/test/ui/consts/large_const_alloc.rs
+++ b/tests/ui/consts/large_const_alloc.rs
diff --git a/src/test/ui/consts/large_const_alloc.stderr b/tests/ui/consts/large_const_alloc.stderr
index 25d660f12..25d660f12 100644
--- a/src/test/ui/consts/large_const_alloc.stderr
+++ b/tests/ui/consts/large_const_alloc.stderr
diff --git a/src/test/ui/consts/locals-in-const-fn.rs b/tests/ui/consts/locals-in-const-fn.rs
index 95d50171a..95d50171a 100644
--- a/src/test/ui/consts/locals-in-const-fn.rs
+++ b/tests/ui/consts/locals-in-const-fn.rs
diff --git a/src/test/ui/consts/match-const-fn-structs.rs b/tests/ui/consts/match-const-fn-structs.rs
index 5a68048c4..5a68048c4 100644
--- a/src/test/ui/consts/match-const-fn-structs.rs
+++ b/tests/ui/consts/match-const-fn-structs.rs
diff --git a/src/test/ui/consts/match_ice.rs b/tests/ui/consts/match_ice.rs
index 632335c84..632335c84 100644
--- a/src/test/ui/consts/match_ice.rs
+++ b/tests/ui/consts/match_ice.rs
diff --git a/src/test/ui/consts/match_ice.stderr b/tests/ui/consts/match_ice.stderr
index 699b4a5e2..699b4a5e2 100644
--- a/src/test/ui/consts/match_ice.stderr
+++ b/tests/ui/consts/match_ice.stderr
diff --git a/src/test/ui/consts/min_const_fn/address_of.rs b/tests/ui/consts/min_const_fn/address_of.rs
index 40d1882d7..40d1882d7 100644
--- a/src/test/ui/consts/min_const_fn/address_of.rs
+++ b/tests/ui/consts/min_const_fn/address_of.rs
diff --git a/src/test/ui/consts/min_const_fn/address_of.stderr b/tests/ui/consts/min_const_fn/address_of.stderr
index facc56651..facc56651 100644
--- a/src/test/ui/consts/min_const_fn/address_of.stderr
+++ b/tests/ui/consts/min_const_fn/address_of.stderr
diff --git a/src/test/ui/consts/min_const_fn/address_of_const.rs b/tests/ui/consts/min_const_fn/address_of_const.rs
index 3db19e9cd..3db19e9cd 100644
--- a/src/test/ui/consts/min_const_fn/address_of_const.rs
+++ b/tests/ui/consts/min_const_fn/address_of_const.rs
diff --git a/src/test/ui/consts/min_const_fn/allow_const_fn_ptr_run_pass.rs b/tests/ui/consts/min_const_fn/allow_const_fn_ptr_run_pass.rs
index 2dbc424d3..2dbc424d3 100644
--- a/src/test/ui/consts/min_const_fn/allow_const_fn_ptr_run_pass.rs
+++ b/tests/ui/consts/min_const_fn/allow_const_fn_ptr_run_pass.rs
diff --git a/src/test/ui/consts/min_const_fn/allow_raw_ptr_dereference_const_fn.rs b/tests/ui/consts/min_const_fn/allow_raw_ptr_dereference_const_fn.rs
index d22115755..d22115755 100644
--- a/src/test/ui/consts/min_const_fn/allow_raw_ptr_dereference_const_fn.rs
+++ b/tests/ui/consts/min_const_fn/allow_raw_ptr_dereference_const_fn.rs
diff --git a/src/test/ui/consts/min_const_fn/bad_const_fn_body_ice.rs b/tests/ui/consts/min_const_fn/bad_const_fn_body_ice.rs
index 258997597..258997597 100644
--- a/src/test/ui/consts/min_const_fn/bad_const_fn_body_ice.rs
+++ b/tests/ui/consts/min_const_fn/bad_const_fn_body_ice.rs
diff --git a/src/test/ui/consts/min_const_fn/bad_const_fn_body_ice.stderr b/tests/ui/consts/min_const_fn/bad_const_fn_body_ice.stderr
index 742341089..742341089 100644
--- a/src/test/ui/consts/min_const_fn/bad_const_fn_body_ice.stderr
+++ b/tests/ui/consts/min_const_fn/bad_const_fn_body_ice.stderr
diff --git a/src/test/ui/consts/min_const_fn/cast_fn.rs b/tests/ui/consts/min_const_fn/cast_fn.rs
index 85802a514..85802a514 100644
--- a/src/test/ui/consts/min_const_fn/cast_fn.rs
+++ b/tests/ui/consts/min_const_fn/cast_fn.rs
diff --git a/src/test/ui/consts/min_const_fn/cmp_fn_pointers.rs b/tests/ui/consts/min_const_fn/cmp_fn_pointers.rs
index 9a2775688..9a2775688 100644
--- a/src/test/ui/consts/min_const_fn/cmp_fn_pointers.rs
+++ b/tests/ui/consts/min_const_fn/cmp_fn_pointers.rs
diff --git a/src/test/ui/consts/min_const_fn/cmp_fn_pointers.stderr b/tests/ui/consts/min_const_fn/cmp_fn_pointers.stderr
index 8a1b20a33..8a1b20a33 100644
--- a/src/test/ui/consts/min_const_fn/cmp_fn_pointers.stderr
+++ b/tests/ui/consts/min_const_fn/cmp_fn_pointers.stderr
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn.rs b/tests/ui/consts/min_const_fn/min_const_fn.rs
index c2891488c..c2891488c 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn.rs
+++ b/tests/ui/consts/min_const_fn/min_const_fn.rs
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn.stderr b/tests/ui/consts/min_const_fn/min_const_fn.stderr
index 11c79e8e2..11c79e8e2 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn.stderr
+++ b/tests/ui/consts/min_const_fn/min_const_fn.stderr
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_dyn.rs b/tests/ui/consts/min_const_fn/min_const_fn_dyn.rs
index 36c888009..36c888009 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn_dyn.rs
+++ b/tests/ui/consts/min_const_fn/min_const_fn_dyn.rs
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_libstd.rs b/tests/ui/consts/min_const_fn/min_const_fn_libstd.rs
index cb8f74186..cb8f74186 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn_libstd.rs
+++ b/tests/ui/consts/min_const_fn/min_const_fn_libstd.rs
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_libstd_stability.rs b/tests/ui/consts/min_const_fn/min_const_fn_libstd_stability.rs
index bb240fb4a..bb240fb4a 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn_libstd_stability.rs
+++ b/tests/ui/consts/min_const_fn/min_const_fn_libstd_stability.rs
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_libstd_stability.stderr b/tests/ui/consts/min_const_fn/min_const_fn_libstd_stability.stderr
index 778b0e55f..778b0e55f 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn_libstd_stability.stderr
+++ b/tests/ui/consts/min_const_fn/min_const_fn_libstd_stability.stderr
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_unsafe_bad.rs b/tests/ui/consts/min_const_fn/min_const_fn_unsafe_bad.rs
index a6e1788bb..a6e1788bb 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn_unsafe_bad.rs
+++ b/tests/ui/consts/min_const_fn/min_const_fn_unsafe_bad.rs
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_unsafe_bad.stderr b/tests/ui/consts/min_const_fn/min_const_fn_unsafe_bad.stderr
index 820b6433f..820b6433f 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn_unsafe_bad.stderr
+++ b/tests/ui/consts/min_const_fn/min_const_fn_unsafe_bad.stderr
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_unsafe_ok.rs b/tests/ui/consts/min_const_fn/min_const_fn_unsafe_ok.rs
index 02c7970de..02c7970de 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn_unsafe_ok.rs
+++ b/tests/ui/consts/min_const_fn/min_const_fn_unsafe_ok.rs
diff --git a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.rs b/tests/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.rs
index 03084c867..03084c867 100644
--- a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.rs
+++ b/tests/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.rs
diff --git a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.stderr b/tests/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.stderr
index 0174cb77f..0174cb77f 100644
--- a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.stderr
+++ b/tests/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.stderr
diff --git a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.rs b/tests/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.rs
index 94b620713..94b620713 100644
--- a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.rs
+++ b/tests/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.rs
diff --git a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.stderr b/tests/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.stderr
index e90ba9b91..e90ba9b91 100644
--- a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.stderr
+++ b/tests/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.stderr
diff --git a/src/test/ui/consts/min_const_fn/mutable_borrow.rs b/tests/ui/consts/min_const_fn/mutable_borrow.rs
index 580b1d50f..580b1d50f 100644
--- a/src/test/ui/consts/min_const_fn/mutable_borrow.rs
+++ b/tests/ui/consts/min_const_fn/mutable_borrow.rs
diff --git a/src/test/ui/consts/min_const_fn/mutable_borrow.stderr b/tests/ui/consts/min_const_fn/mutable_borrow.stderr
index 8e95a4c68..8e95a4c68 100644
--- a/src/test/ui/consts/min_const_fn/mutable_borrow.stderr
+++ b/tests/ui/consts/min_const_fn/mutable_borrow.stderr
diff --git a/src/test/ui/consts/min_const_fn/promotion.rs b/tests/ui/consts/min_const_fn/promotion.rs
index fbe535c71..fbe535c71 100644
--- a/src/test/ui/consts/min_const_fn/promotion.rs
+++ b/tests/ui/consts/min_const_fn/promotion.rs
diff --git a/src/test/ui/consts/min_const_fn/promotion.stderr b/tests/ui/consts/min_const_fn/promotion.stderr
index 0b8dc0ce0..0b8dc0ce0 100644
--- a/src/test/ui/consts/min_const_fn/promotion.stderr
+++ b/tests/ui/consts/min_const_fn/promotion.stderr
diff --git a/src/test/ui/consts/mir_check_nonconst.rs b/tests/ui/consts/mir_check_nonconst.rs
index b6f34b922..b6f34b922 100644
--- a/src/test/ui/consts/mir_check_nonconst.rs
+++ b/tests/ui/consts/mir_check_nonconst.rs
diff --git a/src/test/ui/consts/mir_check_nonconst.stderr b/tests/ui/consts/mir_check_nonconst.stderr
index 1e0652722..1e0652722 100644
--- a/src/test/ui/consts/mir_check_nonconst.stderr
+++ b/tests/ui/consts/mir_check_nonconst.stderr
diff --git a/src/test/ui/consts/miri_unleashed/abi-mismatch.rs b/tests/ui/consts/miri_unleashed/abi-mismatch.rs
index 205f7183b..205f7183b 100644
--- a/src/test/ui/consts/miri_unleashed/abi-mismatch.rs
+++ b/tests/ui/consts/miri_unleashed/abi-mismatch.rs
diff --git a/src/test/ui/consts/miri_unleashed/abi-mismatch.stderr b/tests/ui/consts/miri_unleashed/abi-mismatch.stderr
index cf3fd88d0..cf3fd88d0 100644
--- a/src/test/ui/consts/miri_unleashed/abi-mismatch.stderr
+++ b/tests/ui/consts/miri_unleashed/abi-mismatch.stderr
diff --git a/src/test/ui/consts/miri_unleashed/assoc_const.rs b/tests/ui/consts/miri_unleashed/assoc_const.rs
index 7bb0c1b77..7bb0c1b77 100644
--- a/src/test/ui/consts/miri_unleashed/assoc_const.rs
+++ b/tests/ui/consts/miri_unleashed/assoc_const.rs
diff --git a/src/test/ui/consts/miri_unleashed/assoc_const.stderr b/tests/ui/consts/miri_unleashed/assoc_const.stderr
index b26f121db..e1da43c3a 100644
--- a/src/test/ui/consts/miri_unleashed/assoc_const.stderr
+++ b/tests/ui/consts/miri_unleashed/assoc_const.stderr
@@ -1,19 +1,12 @@
 error[E0080]: evaluation of `<std::string::String as Bar<std::vec::Vec<u32>, std::string::String>>::F` failed
   --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
    |
-LL | pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ calling non-const function `<Vec<u32> as Drop>::drop`
+   = note: calling non-const function `<Vec<u32> as Drop>::drop`
    |
 note: inside `std::ptr::drop_in_place::<Vec<u32>> - shim(Some(Vec<u32>))`
   --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-   |
-LL | pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `std::ptr::drop_in_place::<(Vec<u32>, u32)> - shim(Some((Vec<u32>, u32)))`
   --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-   |
-LL | pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `<String as Bar<Vec<u32>, String>>::F`
   --> $DIR/assoc_const.rs:12:31
    |
diff --git a/src/test/ui/consts/miri_unleashed/assoc_const_2.rs b/tests/ui/consts/miri_unleashed/assoc_const_2.rs
index aad5b3460..aad5b3460 100644
--- a/src/test/ui/consts/miri_unleashed/assoc_const_2.rs
+++ b/tests/ui/consts/miri_unleashed/assoc_const_2.rs
diff --git a/src/test/ui/consts/miri_unleashed/assoc_const_2.stderr b/tests/ui/consts/miri_unleashed/assoc_const_2.stderr
index fc4b18056..fc4b18056 100644
--- a/src/test/ui/consts/miri_unleashed/assoc_const_2.stderr
+++ b/tests/ui/consts/miri_unleashed/assoc_const_2.stderr
diff --git a/src/test/ui/consts/miri_unleashed/auxiliary/static_cross_crate.rs b/tests/ui/consts/miri_unleashed/auxiliary/static_cross_crate.rs
index 4fc6ae66a..4fc6ae66a 100644
--- a/src/test/ui/consts/miri_unleashed/auxiliary/static_cross_crate.rs
+++ b/tests/ui/consts/miri_unleashed/auxiliary/static_cross_crate.rs
diff --git a/src/test/ui/consts/miri_unleashed/box.rs b/tests/ui/consts/miri_unleashed/box.rs
index c2a260aa1..c2a260aa1 100644
--- a/src/test/ui/consts/miri_unleashed/box.rs
+++ b/tests/ui/consts/miri_unleashed/box.rs
diff --git a/src/test/ui/consts/miri_unleashed/box.stderr b/tests/ui/consts/miri_unleashed/box.stderr
index bc5d4a257..bc5d4a257 100644
--- a/src/test/ui/consts/miri_unleashed/box.stderr
+++ b/tests/ui/consts/miri_unleashed/box.stderr
diff --git a/src/test/ui/consts/miri_unleashed/const_refers_to_static.32bit.stderr b/tests/ui/consts/miri_unleashed/const_refers_to_static.32bit.stderr
index a6f467b9e..a6f467b9e 100644
--- a/src/test/ui/consts/miri_unleashed/const_refers_to_static.32bit.stderr
+++ b/tests/ui/consts/miri_unleashed/const_refers_to_static.32bit.stderr
diff --git a/src/test/ui/consts/miri_unleashed/const_refers_to_static.64bit.stderr b/tests/ui/consts/miri_unleashed/const_refers_to_static.64bit.stderr
index cfaf31a6e..cfaf31a6e 100644
--- a/src/test/ui/consts/miri_unleashed/const_refers_to_static.64bit.stderr
+++ b/tests/ui/consts/miri_unleashed/const_refers_to_static.64bit.stderr
diff --git a/src/test/ui/consts/miri_unleashed/const_refers_to_static.rs b/tests/ui/consts/miri_unleashed/const_refers_to_static.rs
index 7ed5a48d9..7ed5a48d9 100644
--- a/src/test/ui/consts/miri_unleashed/const_refers_to_static.rs
+++ b/tests/ui/consts/miri_unleashed/const_refers_to_static.rs
diff --git a/src/test/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.32bit.stderr b/tests/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.32bit.stderr
index 6df2fe3d0..6df2fe3d0 100644
--- a/src/test/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.32bit.stderr
+++ b/tests/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.32bit.stderr
diff --git a/src/test/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.64bit.stderr b/tests/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.64bit.stderr
index 8802f3ada..8802f3ada 100644
--- a/src/test/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.64bit.stderr
+++ b/tests/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.64bit.stderr
diff --git a/src/test/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.rs b/tests/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.rs
index bf4f14f4d..bf4f14f4d 100644
--- a/src/test/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.rs
+++ b/tests/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.rs
diff --git a/src/test/ui/consts/miri_unleashed/drop.rs b/tests/ui/consts/miri_unleashed/drop.rs
index 3942e7ef7..3942e7ef7 100644
--- a/src/test/ui/consts/miri_unleashed/drop.rs
+++ b/tests/ui/consts/miri_unleashed/drop.rs
diff --git a/tests/ui/consts/miri_unleashed/drop.stderr b/tests/ui/consts/miri_unleashed/drop.stderr
new file mode 100644
index 000000000..4f60b8820
--- /dev/null
+++ b/tests/ui/consts/miri_unleashed/drop.stderr
@@ -0,0 +1,24 @@
+error[E0080]: could not evaluate static initializer
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+   |
+   = note: calling non-const function `<Vec<i32> as Drop>::drop`
+   |
+note: inside `std::ptr::drop_in_place::<Vec<i32>> - shim(Some(Vec<i32>))`
+  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+note: inside `TEST_BAD`
+  --> $DIR/drop.rs:17:1
+   |
+LL | };
+   | ^
+
+warning: skipping const checks
+   |
+help: skipping check that does not even have a feature gate
+  --> $DIR/drop.rs:16:9
+   |
+LL |     let _v: Vec<i32> = Vec::new();
+   |         ^^
+
+error: aborting due to previous error; 1 warning emitted
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/miri_unleashed/feature-gate-unleash_the_miri_inside_of_you.rs b/tests/ui/consts/miri_unleashed/feature-gate-unleash_the_miri_inside_of_you.rs
index c24d3338e..c24d3338e 100644
--- a/src/test/ui/consts/miri_unleashed/feature-gate-unleash_the_miri_inside_of_you.rs
+++ b/tests/ui/consts/miri_unleashed/feature-gate-unleash_the_miri_inside_of_you.rs
diff --git a/src/test/ui/consts/miri_unleashed/feature-gate-unleash_the_miri_inside_of_you.stderr b/tests/ui/consts/miri_unleashed/feature-gate-unleash_the_miri_inside_of_you.stderr
index 45ed88b1b..45ed88b1b 100644
--- a/src/test/ui/consts/miri_unleashed/feature-gate-unleash_the_miri_inside_of_you.stderr
+++ b/tests/ui/consts/miri_unleashed/feature-gate-unleash_the_miri_inside_of_you.stderr
diff --git a/src/test/ui/consts/miri_unleashed/inline_asm.rs b/tests/ui/consts/miri_unleashed/inline_asm.rs
index 6fd52ceb2..6fd52ceb2 100644
--- a/src/test/ui/consts/miri_unleashed/inline_asm.rs
+++ b/tests/ui/consts/miri_unleashed/inline_asm.rs
diff --git a/src/test/ui/consts/miri_unleashed/inline_asm.stderr b/tests/ui/consts/miri_unleashed/inline_asm.stderr
index 6317cd882..6317cd882 100644
--- a/src/test/ui/consts/miri_unleashed/inline_asm.stderr
+++ b/tests/ui/consts/miri_unleashed/inline_asm.stderr
diff --git a/src/test/ui/consts/miri_unleashed/mutable_references.rs b/tests/ui/consts/miri_unleashed/mutable_references.rs
index 4e9964647..4e9964647 100644
--- a/src/test/ui/consts/miri_unleashed/mutable_references.rs
+++ b/tests/ui/consts/miri_unleashed/mutable_references.rs
diff --git a/src/test/ui/consts/miri_unleashed/mutable_references.stderr b/tests/ui/consts/miri_unleashed/mutable_references.stderr
index 3ed96701a..3ed96701a 100644
--- a/src/test/ui/consts/miri_unleashed/mutable_references.stderr
+++ b/tests/ui/consts/miri_unleashed/mutable_references.stderr
diff --git a/src/test/ui/consts/miri_unleashed/mutable_references_err.32bit.stderr b/tests/ui/consts/miri_unleashed/mutable_references_err.32bit.stderr
index 0ea179240..0ea179240 100644
--- a/src/test/ui/consts/miri_unleashed/mutable_references_err.32bit.stderr
+++ b/tests/ui/consts/miri_unleashed/mutable_references_err.32bit.stderr
diff --git a/src/test/ui/consts/miri_unleashed/mutable_references_err.64bit.stderr b/tests/ui/consts/miri_unleashed/mutable_references_err.64bit.stderr
index 67959d256..67959d256 100644
--- a/src/test/ui/consts/miri_unleashed/mutable_references_err.64bit.stderr
+++ b/tests/ui/consts/miri_unleashed/mutable_references_err.64bit.stderr
diff --git a/src/test/ui/consts/miri_unleashed/mutable_references_err.rs b/tests/ui/consts/miri_unleashed/mutable_references_err.rs
index 6399b122b..6399b122b 100644
--- a/src/test/ui/consts/miri_unleashed/mutable_references_err.rs
+++ b/tests/ui/consts/miri_unleashed/mutable_references_err.rs
diff --git a/src/test/ui/consts/miri_unleashed/mutating_global.rs b/tests/ui/consts/miri_unleashed/mutating_global.rs
index 231f4af0a..231f4af0a 100644
--- a/src/test/ui/consts/miri_unleashed/mutating_global.rs
+++ b/tests/ui/consts/miri_unleashed/mutating_global.rs
diff --git a/src/test/ui/consts/miri_unleashed/mutating_global.stderr b/tests/ui/consts/miri_unleashed/mutating_global.stderr
index c8770c8d7..c8770c8d7 100644
--- a/src/test/ui/consts/miri_unleashed/mutating_global.stderr
+++ b/tests/ui/consts/miri_unleashed/mutating_global.stderr
diff --git a/src/test/ui/consts/miri_unleashed/non_const_fn.rs b/tests/ui/consts/miri_unleashed/non_const_fn.rs
index 44ab60dca..44ab60dca 100644
--- a/src/test/ui/consts/miri_unleashed/non_const_fn.rs
+++ b/tests/ui/consts/miri_unleashed/non_const_fn.rs
diff --git a/src/test/ui/consts/miri_unleashed/non_const_fn.stderr b/tests/ui/consts/miri_unleashed/non_const_fn.stderr
index 57836f796..57836f796 100644
--- a/src/test/ui/consts/miri_unleashed/non_const_fn.stderr
+++ b/tests/ui/consts/miri_unleashed/non_const_fn.stderr
diff --git a/src/test/ui/consts/miri_unleashed/ptr_arith.rs b/tests/ui/consts/miri_unleashed/ptr_arith.rs
index 4d12960b8..4d12960b8 100644
--- a/src/test/ui/consts/miri_unleashed/ptr_arith.rs
+++ b/tests/ui/consts/miri_unleashed/ptr_arith.rs
diff --git a/src/test/ui/consts/miri_unleashed/ptr_arith.stderr b/tests/ui/consts/miri_unleashed/ptr_arith.stderr
index 30fd3a55e..30fd3a55e 100644
--- a/src/test/ui/consts/miri_unleashed/ptr_arith.stderr
+++ b/tests/ui/consts/miri_unleashed/ptr_arith.stderr
diff --git a/src/test/ui/consts/miri_unleashed/raw_mutable_const.rs b/tests/ui/consts/miri_unleashed/raw_mutable_const.rs
index 5f8ec4e6e..5f8ec4e6e 100644
--- a/src/test/ui/consts/miri_unleashed/raw_mutable_const.rs
+++ b/tests/ui/consts/miri_unleashed/raw_mutable_const.rs
diff --git a/src/test/ui/consts/miri_unleashed/raw_mutable_const.stderr b/tests/ui/consts/miri_unleashed/raw_mutable_const.stderr
index f8dc11d69..f8dc11d69 100644
--- a/src/test/ui/consts/miri_unleashed/raw_mutable_const.stderr
+++ b/tests/ui/consts/miri_unleashed/raw_mutable_const.stderr
diff --git a/src/test/ui/consts/miri_unleashed/slice_eq.rs b/tests/ui/consts/miri_unleashed/slice_eq.rs
index 83e10bf12..83e10bf12 100644
--- a/src/test/ui/consts/miri_unleashed/slice_eq.rs
+++ b/tests/ui/consts/miri_unleashed/slice_eq.rs
diff --git a/src/test/ui/consts/miri_unleashed/tls.rs b/tests/ui/consts/miri_unleashed/tls.rs
index d06d7cf19..d06d7cf19 100644
--- a/src/test/ui/consts/miri_unleashed/tls.rs
+++ b/tests/ui/consts/miri_unleashed/tls.rs
diff --git a/src/test/ui/consts/miri_unleashed/tls.stderr b/tests/ui/consts/miri_unleashed/tls.stderr
index 7aaeadd04..7aaeadd04 100644
--- a/src/test/ui/consts/miri_unleashed/tls.stderr
+++ b/tests/ui/consts/miri_unleashed/tls.stderr
diff --git a/src/test/ui/consts/missing_span_in_backtrace.rs b/tests/ui/consts/missing_span_in_backtrace.rs
index c4930b73a..dd2b81c5a 100644
--- a/src/test/ui/consts/missing_span_in_backtrace.rs
+++ b/tests/ui/consts/missing_span_in_backtrace.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z simulate-remapped-rust-src-base=/rustc/FAKE_PREFIX -Z translate-remapped-path-to-local-path=no -Z ui-testing=no
+// compile-flags: -Z ui-testing=no
 // normalize-stderr-test "alloc[0-9]+" -> "ALLOC_ID"
 
 #![feature(const_swap)]
diff --git a/src/test/ui/consts/missing_span_in_backtrace.stderr b/tests/ui/consts/missing_span_in_backtrace.stderr
index e6d3d5199..e6d3d5199 100644
--- a/src/test/ui/consts/missing_span_in_backtrace.stderr
+++ b/tests/ui/consts/missing_span_in_backtrace.stderr
diff --git a/src/test/ui/consts/mozjs-error.rs b/tests/ui/consts/mozjs-error.rs
index 7edcadbf2..7edcadbf2 100644
--- a/src/test/ui/consts/mozjs-error.rs
+++ b/tests/ui/consts/mozjs-error.rs
diff --git a/src/test/ui/consts/nested_erroneous_ctfe.rs b/tests/ui/consts/nested_erroneous_ctfe.rs
index 1ec271401..1ec271401 100644
--- a/src/test/ui/consts/nested_erroneous_ctfe.rs
+++ b/tests/ui/consts/nested_erroneous_ctfe.rs
diff --git a/src/test/ui/consts/nested_erroneous_ctfe.stderr b/tests/ui/consts/nested_erroneous_ctfe.stderr
index d579a54e9..d579a54e9 100644
--- a/src/test/ui/consts/nested_erroneous_ctfe.stderr
+++ b/tests/ui/consts/nested_erroneous_ctfe.stderr
diff --git a/src/test/ui/consts/non-const-value-in-const.rs b/tests/ui/consts/non-const-value-in-const.rs
index 1a20b1e09..1a20b1e09 100644
--- a/src/test/ui/consts/non-const-value-in-const.rs
+++ b/tests/ui/consts/non-const-value-in-const.rs
diff --git a/src/test/ui/consts/non-const-value-in-const.stderr b/tests/ui/consts/non-const-value-in-const.stderr
index 0ce4b4b70..0ce4b4b70 100644
--- a/src/test/ui/consts/non-const-value-in-const.stderr
+++ b/tests/ui/consts/non-const-value-in-const.stderr
diff --git a/src/test/ui/consts/non-scalar-cast.rs b/tests/ui/consts/non-scalar-cast.rs
index 671366c90..671366c90 100644
--- a/src/test/ui/consts/non-scalar-cast.rs
+++ b/tests/ui/consts/non-scalar-cast.rs
diff --git a/src/test/ui/consts/offset.rs b/tests/ui/consts/offset.rs
index b2c663fe6..b2c663fe6 100644
--- a/src/test/ui/consts/offset.rs
+++ b/tests/ui/consts/offset.rs
diff --git a/src/test/ui/consts/offset_from.rs b/tests/ui/consts/offset_from.rs
index 465147041..465147041 100644
--- a/src/test/ui/consts/offset_from.rs
+++ b/tests/ui/consts/offset_from.rs
diff --git a/src/test/ui/consts/offset_from_ub.rs b/tests/ui/consts/offset_from_ub.rs
index 51163e650..51163e650 100644
--- a/src/test/ui/consts/offset_from_ub.rs
+++ b/tests/ui/consts/offset_from_ub.rs
diff --git a/src/test/ui/consts/offset_from_ub.stderr b/tests/ui/consts/offset_from_ub.stderr
index 9578d90ea..fff472968 100644
--- a/src/test/ui/consts/offset_from_ub.stderr
+++ b/tests/ui/consts/offset_from_ub.stderr
@@ -7,14 +7,10 @@ LL |     let offset = unsafe { ptr_offset_from(field_ptr, base_ptr) };
 error[E0080]: evaluation of constant value failed
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
    |
-LL |         unsafe { intrinsics::ptr_offset_from(self, origin) }
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `ptr_offset_from` called on pointers into different allocations
+   = note: `ptr_offset_from` called on pointers into different allocations
    |
 note: inside `ptr::const_ptr::<impl *const u8>::offset_from`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
-   |
-LL |         unsafe { intrinsics::ptr_offset_from(self, origin) }
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `NOT_PTR`
   --> $DIR/offset_from_ub.rs:24:14
    |
@@ -90,14 +86,10 @@ LL |     unsafe { ptr_offset_from_unsigned(ptr2, ptr1) }
 error[E0080]: evaluation of constant value failed
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
    |
-LL |         unsafe { intrinsics::ptr_offset_from(self, origin) }
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ out-of-bounds offset_from: null pointer is a dangling pointer (it has no provenance)
+   = note: out-of-bounds offset_from: null pointer is a dangling pointer (it has no provenance)
    |
 note: inside `ptr::const_ptr::<impl *const u8>::offset_from`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
-   |
-LL |         unsafe { intrinsics::ptr_offset_from(self, origin) }
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `OFFSET_VERY_FAR1`
   --> $DIR/offset_from_ub.rs:115:14
    |
@@ -107,14 +99,10 @@ LL |     unsafe { ptr2.offset_from(ptr1) }
 error[E0080]: evaluation of constant value failed
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
    |
-LL |         unsafe { intrinsics::ptr_offset_from(self, origin) }
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ out-of-bounds offset_from: null pointer is a dangling pointer (it has no provenance)
+   = note: out-of-bounds offset_from: null pointer is a dangling pointer (it has no provenance)
    |
 note: inside `ptr::const_ptr::<impl *const u8>::offset_from`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
-   |
-LL |         unsafe { intrinsics::ptr_offset_from(self, origin) }
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `OFFSET_VERY_FAR2`
   --> $DIR/offset_from_ub.rs:121:14
    |
diff --git a/src/test/ui/consts/offset_ub.rs b/tests/ui/consts/offset_ub.rs
index 1b01e4fd1..1b01e4fd1 100644
--- a/src/test/ui/consts/offset_ub.rs
+++ b/tests/ui/consts/offset_ub.rs
diff --git a/tests/ui/consts/offset_ub.stderr b/tests/ui/consts/offset_ub.stderr
new file mode 100644
index 000000000..c0c851df5
--- /dev/null
+++ b/tests/ui/consts/offset_ub.stderr
@@ -0,0 +1,159 @@
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: overflowing in-bounds pointer arithmetic
+   |
+note: inside `ptr::const_ptr::<impl *const u8>::offset`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `BEFORE_START`
+  --> $DIR/offset_ub.rs:7:46
+   |
+LL | pub const BEFORE_START: *const u8 = unsafe { (&0u8 as *const u8).offset(-1) };
+   |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: out-of-bounds pointer arithmetic: allocN has size 1, so pointer to 2 bytes starting at offset 0 is out-of-bounds
+   |
+note: inside `ptr::const_ptr::<impl *const u8>::offset`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `AFTER_END`
+  --> $DIR/offset_ub.rs:8:43
+   |
+LL | pub const AFTER_END: *const u8 = unsafe { (&0u8 as *const u8).offset(2) };
+   |                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: out-of-bounds pointer arithmetic: allocN has size 100, so pointer to 101 bytes starting at offset 0 is out-of-bounds
+   |
+note: inside `ptr::const_ptr::<impl *const u8>::offset`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `AFTER_ARRAY`
+  --> $DIR/offset_ub.rs:9:45
+   |
+LL | pub const AFTER_ARRAY: *const u8 = unsafe { [0u8; 100].as_ptr().offset(101) };
+   |                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: overflowing in-bounds pointer arithmetic
+   |
+note: inside `ptr::const_ptr::<impl *const u16>::offset`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `OVERFLOW`
+  --> $DIR/offset_ub.rs:11:43
+   |
+LL | pub const OVERFLOW: *const u16 = unsafe { [0u16; 1].as_ptr().offset(isize::MAX) };
+   |                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: overflowing in-bounds pointer arithmetic
+   |
+note: inside `ptr::const_ptr::<impl *const u16>::offset`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `UNDERFLOW`
+  --> $DIR/offset_ub.rs:12:44
+   |
+LL | pub const UNDERFLOW: *const u16 = unsafe { [0u16; 1].as_ptr().offset(isize::MIN) };
+   |                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: overflowing in-bounds pointer arithmetic
+   |
+note: inside `ptr::const_ptr::<impl *const u8>::offset`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `OVERFLOW_ADDRESS_SPACE`
+  --> $DIR/offset_ub.rs:13:56
+   |
+LL | pub const OVERFLOW_ADDRESS_SPACE: *const u8 = unsafe { (usize::MAX as *const u8).offset(2) };
+   |                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: overflowing in-bounds pointer arithmetic
+   |
+note: inside `ptr::const_ptr::<impl *const u8>::offset`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `UNDERFLOW_ADDRESS_SPACE`
+  --> $DIR/offset_ub.rs:14:57
+   |
+LL | pub const UNDERFLOW_ADDRESS_SPACE: *const u8 = unsafe { (1 as *const u8).offset(-2) };
+   |                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: out-of-bounds pointer arithmetic: allocN has size 1, so pointer to 2 bytes starting at offset -4 is out-of-bounds
+   |
+note: inside `ptr::const_ptr::<impl *const u8>::offset`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `NEGATIVE_OFFSET`
+  --> $DIR/offset_ub.rs:15:49
+   |
+LL | pub const NEGATIVE_OFFSET: *const u8 = unsafe { [0u8; 1].as_ptr().wrapping_offset(-2).offset(-2) };
+   |                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: out-of-bounds pointer arithmetic: allocN has size 0, so pointer to 1 byte starting at offset 0 is out-of-bounds
+   |
+note: inside `ptr::const_ptr::<impl *const u8>::offset`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `ZERO_SIZED_ALLOC`
+  --> $DIR/offset_ub.rs:17:50
+   |
+LL | pub const ZERO_SIZED_ALLOC: *const u8 = unsafe { [0u8; 0].as_ptr().offset(1) };
+   |                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/mut_ptr.rs:LL:COL
+   |
+   = note: out-of-bounds pointer arithmetic: 0x1[noalloc] is a dangling pointer (it has no provenance)
+   |
+note: inside `ptr::mut_ptr::<impl *mut u8>::offset`
+  --> $SRC_DIR/core/src/ptr/mut_ptr.rs:LL:COL
+note: inside `DANGLING`
+  --> $DIR/offset_ub.rs:18:42
+   |
+LL | pub const DANGLING: *const u8 = unsafe { ptr::NonNull::<u8>::dangling().as_ptr().offset(4) };
+   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: out-of-bounds pointer arithmetic: null pointer is a dangling pointer (it has no provenance)
+   |
+note: inside `ptr::const_ptr::<impl *const u8>::offset`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `NULL_OFFSET_ZERO`
+  --> $DIR/offset_ub.rs:21:50
+   |
+LL | pub const NULL_OFFSET_ZERO: *const u8 = unsafe { ptr::null::<u8>().offset(0) };
+   |                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation of constant value failed
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+   |
+   = note: out-of-bounds pointer arithmetic: 0x7f..f[noalloc] is a dangling pointer (it has no provenance)
+   |
+note: inside `ptr::const_ptr::<impl *const u8>::offset`
+  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
+note: inside `UNDERFLOW_ABS`
+  --> $DIR/offset_ub.rs:24:47
+   |
+LL | pub const UNDERFLOW_ABS: *const u8 = unsafe { (usize::MAX as *const u8).offset(isize::MIN) };
+   |                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 12 previous errors
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/packed_pattern.rs b/tests/ui/consts/packed_pattern.rs
index 370fec6fb..370fec6fb 100644
--- a/src/test/ui/consts/packed_pattern.rs
+++ b/tests/ui/consts/packed_pattern.rs
diff --git a/src/test/ui/consts/packed_pattern.stderr b/tests/ui/consts/packed_pattern.stderr
index 9ca50a95e..9ca50a95e 100644
--- a/src/test/ui/consts/packed_pattern.stderr
+++ b/tests/ui/consts/packed_pattern.stderr
diff --git a/src/test/ui/consts/packed_pattern2.rs b/tests/ui/consts/packed_pattern2.rs
index ef68d9e51..ef68d9e51 100644
--- a/src/test/ui/consts/packed_pattern2.rs
+++ b/tests/ui/consts/packed_pattern2.rs
diff --git a/src/test/ui/consts/packed_pattern2.stderr b/tests/ui/consts/packed_pattern2.stderr
index 4dc54461e..4dc54461e 100644
--- a/src/test/ui/consts/packed_pattern2.stderr
+++ b/tests/ui/consts/packed_pattern2.stderr
diff --git a/src/test/ui/consts/partial_qualif.rs b/tests/ui/consts/partial_qualif.rs
index 7c28b8b8a..7c28b8b8a 100644
--- a/src/test/ui/consts/partial_qualif.rs
+++ b/tests/ui/consts/partial_qualif.rs
diff --git a/src/test/ui/consts/partial_qualif.stderr b/tests/ui/consts/partial_qualif.stderr
index 32c25be21..32c25be21 100644
--- a/src/test/ui/consts/partial_qualif.stderr
+++ b/tests/ui/consts/partial_qualif.stderr
diff --git a/src/test/ui/consts/precise-drop-with-coverage.rs b/tests/ui/consts/precise-drop-with-coverage.rs
index 275cb3869..275cb3869 100644
--- a/src/test/ui/consts/precise-drop-with-coverage.rs
+++ b/tests/ui/consts/precise-drop-with-coverage.rs
diff --git a/src/test/ui/consts/precise-drop-with-promoted.rs b/tests/ui/consts/precise-drop-with-promoted.rs
index 6f2317a5a..6f2317a5a 100644
--- a/src/test/ui/consts/precise-drop-with-promoted.rs
+++ b/tests/ui/consts/precise-drop-with-promoted.rs
diff --git a/src/test/ui/consts/promote-not.rs b/tests/ui/consts/promote-not.rs
index 907617052..907617052 100644
--- a/src/test/ui/consts/promote-not.rs
+++ b/tests/ui/consts/promote-not.rs
diff --git a/src/test/ui/consts/promote-not.stderr b/tests/ui/consts/promote-not.stderr
index b93358e8d..b93358e8d 100644
--- a/src/test/ui/consts/promote-not.stderr
+++ b/tests/ui/consts/promote-not.stderr
diff --git a/src/test/ui/consts/promote_borrowed_field.rs b/tests/ui/consts/promote_borrowed_field.rs
index c4841b46f..c4841b46f 100644
--- a/src/test/ui/consts/promote_borrowed_field.rs
+++ b/tests/ui/consts/promote_borrowed_field.rs
diff --git a/src/test/ui/consts/promote_const_let.rs b/tests/ui/consts/promote_const_let.rs
index 51a0fec2e..51a0fec2e 100644
--- a/src/test/ui/consts/promote_const_let.rs
+++ b/tests/ui/consts/promote_const_let.rs
diff --git a/src/test/ui/consts/promote_const_let.stderr b/tests/ui/consts/promote_const_let.stderr
index 975a235a6..975a235a6 100644
--- a/src/test/ui/consts/promote_const_let.stderr
+++ b/tests/ui/consts/promote_const_let.stderr
diff --git a/src/test/ui/consts/promote_evaluation_unused_result.rs b/tests/ui/consts/promote_evaluation_unused_result.rs
index 4eda785bb..4eda785bb 100644
--- a/src/test/ui/consts/promote_evaluation_unused_result.rs
+++ b/tests/ui/consts/promote_evaluation_unused_result.rs
diff --git a/src/test/ui/consts/promote_fn_calls.rs b/tests/ui/consts/promote_fn_calls.rs
index 8995aaacd..8995aaacd 100644
--- a/src/test/ui/consts/promote_fn_calls.rs
+++ b/tests/ui/consts/promote_fn_calls.rs
diff --git a/src/test/ui/consts/promote_fn_calls_std.rs b/tests/ui/consts/promote_fn_calls_std.rs
index 557f6a434..557f6a434 100644
--- a/src/test/ui/consts/promote_fn_calls_std.rs
+++ b/tests/ui/consts/promote_fn_calls_std.rs
diff --git a/src/test/ui/consts/promoted-const-drop.rs b/tests/ui/consts/promoted-const-drop.rs
index c896c011a..c896c011a 100644
--- a/src/test/ui/consts/promoted-const-drop.rs
+++ b/tests/ui/consts/promoted-const-drop.rs
diff --git a/src/test/ui/consts/promoted-const-drop.stderr b/tests/ui/consts/promoted-const-drop.stderr
index 480283417..480283417 100644
--- a/src/test/ui/consts/promoted-const-drop.stderr
+++ b/tests/ui/consts/promoted-const-drop.stderr
diff --git a/src/test/ui/consts/promoted-storage.rs b/tests/ui/consts/promoted-storage.rs
index 52ef685e8..52ef685e8 100644
--- a/src/test/ui/consts/promoted-storage.rs
+++ b/tests/ui/consts/promoted-storage.rs
diff --git a/src/test/ui/consts/promoted-validation-55454.rs b/tests/ui/consts/promoted-validation-55454.rs
index 23cae4fb5..23cae4fb5 100644
--- a/src/test/ui/consts/promoted-validation-55454.rs
+++ b/tests/ui/consts/promoted-validation-55454.rs
diff --git a/tests/ui/consts/promoted_const_call.rs b/tests/ui/consts/promoted_const_call.rs
new file mode 100644
index 000000000..30ae73053
--- /dev/null
+++ b/tests/ui/consts/promoted_const_call.rs
@@ -0,0 +1,19 @@
+#![feature(const_mut_refs)]
+#![feature(const_trait_impl)]
+struct Panic;
+impl const Drop for Panic { fn drop(&mut self) { panic!(); } }
+pub const fn id<T>(x: T) -> T { x }
+pub const C: () = {
+    let _: &'static _ = &id(&Panic);
+    //~^ ERROR: temporary value dropped while borrowed
+    //~| ERROR: temporary value dropped while borrowed
+};
+
+fn main() {
+    let _: &'static _ = &id(&Panic);
+    //~^ ERROR: temporary value dropped while borrowed
+    //~| ERROR: temporary value dropped while borrowed
+    let _: &'static _ = &&(Panic, 0).1;
+    //~^ ERROR: temporary value dropped while borrowed
+    //~| ERROR: temporary value dropped while borrowed
+}
diff --git a/tests/ui/consts/promoted_const_call.stderr b/tests/ui/consts/promoted_const_call.stderr
new file mode 100644
index 000000000..83cc16f6f
--- /dev/null
+++ b/tests/ui/consts/promoted_const_call.stderr
@@ -0,0 +1,65 @@
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call.rs:7:26
+   |
+LL |     let _: &'static _ = &id(&Panic);
+   |            ----------    ^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | };
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call.rs:7:30
+   |
+LL |     let _: &'static _ = &id(&Panic);
+   |            ----------        ^^^^^ - temporary value is freed at the end of this statement
+   |            |                 |
+   |            |                 creates a temporary value which is freed while still in use
+   |            type annotation requires that borrow lasts for `'static`
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call.rs:13:26
+   |
+LL |     let _: &'static _ = &id(&Panic);
+   |            ----------    ^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | }
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call.rs:13:30
+   |
+LL |     let _: &'static _ = &id(&Panic);
+   |            ----------        ^^^^^ - temporary value is freed at the end of this statement
+   |            |                 |
+   |            |                 creates a temporary value which is freed while still in use
+   |            type annotation requires that borrow lasts for `'static`
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call.rs:16:26
+   |
+LL |     let _: &'static _ = &&(Panic, 0).1;
+   |            ----------    ^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | }
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call.rs:16:27
+   |
+LL |     let _: &'static _ = &&(Panic, 0).1;
+   |            ----------     ^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | }
+   | - temporary value is freed at the end of this statement
+
+error: aborting due to 6 previous errors
+
+For more information about this error, try `rustc --explain E0716`.
diff --git a/tests/ui/consts/promoted_const_call2.rs b/tests/ui/consts/promoted_const_call2.rs
new file mode 100644
index 000000000..f332cd18c
--- /dev/null
+++ b/tests/ui/consts/promoted_const_call2.rs
@@ -0,0 +1,14 @@
+#![feature(const_precise_live_drops)]
+pub const fn id<T>(x: T) -> T { x }
+pub const C: () = {
+    let _: &'static _ = &id(&String::new());
+    //~^ ERROR: temporary value dropped while borrowed
+    //~| ERROR: temporary value dropped while borrowed
+    //~| ERROR: destructor of `String` cannot be evaluated at compile-time
+};
+
+fn main() {
+    let _: &'static _ = &id(&String::new());
+    //~^ ERROR: temporary value dropped while borrowed
+    //~| ERROR: temporary value dropped while borrowed
+}
diff --git a/tests/ui/consts/promoted_const_call2.stderr b/tests/ui/consts/promoted_const_call2.stderr
new file mode 100644
index 000000000..13d864ed3
--- /dev/null
+++ b/tests/ui/consts/promoted_const_call2.stderr
@@ -0,0 +1,50 @@
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call2.rs:4:26
+   |
+LL |     let _: &'static _ = &id(&String::new());
+   |            ----------    ^^^^^^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | };
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call2.rs:4:30
+   |
+LL |     let _: &'static _ = &id(&String::new());
+   |            ----------        ^^^^^^^^^^^^^ - temporary value is freed at the end of this statement
+   |            |                 |
+   |            |                 creates a temporary value which is freed while still in use
+   |            type annotation requires that borrow lasts for `'static`
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call2.rs:11:26
+   |
+LL |     let _: &'static _ = &id(&String::new());
+   |            ----------    ^^^^^^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | }
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call2.rs:11:30
+   |
+LL |     let _: &'static _ = &id(&String::new());
+   |            ----------        ^^^^^^^^^^^^^ - temporary value is freed at the end of this statement
+   |            |                 |
+   |            |                 creates a temporary value which is freed while still in use
+   |            type annotation requires that borrow lasts for `'static`
+
+error[E0493]: destructor of `String` cannot be evaluated at compile-time
+  --> $DIR/promoted_const_call2.rs:4:30
+   |
+LL |     let _: &'static _ = &id(&String::new());
+   |                              ^^^^^^^^^^^^^ the destructor for this type cannot be evaluated in constants
+
+error: aborting due to 5 previous errors
+
+Some errors have detailed explanations: E0493, E0716.
+For more information about an error, try `rustc --explain E0493`.
diff --git a/tests/ui/consts/promoted_const_call3.rs b/tests/ui/consts/promoted_const_call3.rs
new file mode 100644
index 000000000..6d68a2de7
--- /dev/null
+++ b/tests/ui/consts/promoted_const_call3.rs
@@ -0,0 +1,26 @@
+pub const fn id<T>(x: T) -> T { x }
+pub const C: () = {
+    let _: &'static _ = &String::new();
+    //~^ ERROR: destructor of `String` cannot be evaluated at compile-time
+    //~| ERROR: temporary value dropped while borrowed
+
+    let _: &'static _ = &id(&String::new());
+    //~^ ERROR: destructor of `String` cannot be evaluated at compile-time
+    //~| ERROR: temporary value dropped while borrowed
+    //~| ERROR: temporary value dropped while borrowed
+
+    let _: &'static _ = &std::mem::ManuallyDrop::new(String::new());
+    //~^ ERROR: temporary value dropped while borrowed
+};
+
+fn main() {
+    let _: &'static _ = &String::new();
+    //~^ ERROR: temporary value dropped while borrowed
+
+    let _: &'static _ = &id(&String::new());
+    //~^ ERROR: temporary value dropped while borrowed
+    //~| ERROR: temporary value dropped while borrowed
+
+    let _: &'static _ = &std::mem::ManuallyDrop::new(String::new());
+    //~^ ERROR: temporary value dropped while borrowed
+}
diff --git a/tests/ui/consts/promoted_const_call3.stderr b/tests/ui/consts/promoted_const_call3.stderr
new file mode 100644
index 000000000..af17457a1
--- /dev/null
+++ b/tests/ui/consts/promoted_const_call3.stderr
@@ -0,0 +1,105 @@
+error[E0493]: destructor of `String` cannot be evaluated at compile-time
+  --> $DIR/promoted_const_call3.rs:7:30
+   |
+LL |     let _: &'static _ = &id(&String::new());
+   |                              ^^^^^^^^^^^^^ - value is dropped here
+   |                              |
+   |                              the destructor for this type cannot be evaluated in constants
+
+error[E0493]: destructor of `String` cannot be evaluated at compile-time
+  --> $DIR/promoted_const_call3.rs:3:26
+   |
+LL |     let _: &'static _ = &String::new();
+   |                          ^^^^^^^^^^^^^ the destructor for this type cannot be evaluated in constants
+...
+LL | };
+   | - value is dropped here
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call3.rs:3:26
+   |
+LL |     let _: &'static _ = &String::new();
+   |            ----------    ^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | };
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call3.rs:7:26
+   |
+LL |     let _: &'static _ = &id(&String::new());
+   |            ----------    ^^^^^^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | };
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call3.rs:7:30
+   |
+LL |     let _: &'static _ = &id(&String::new());
+   |            ----------        ^^^^^^^^^^^^^ - temporary value is freed at the end of this statement
+   |            |                 |
+   |            |                 creates a temporary value which is freed while still in use
+   |            type annotation requires that borrow lasts for `'static`
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call3.rs:12:26
+   |
+LL |     let _: &'static _ = &std::mem::ManuallyDrop::new(String::new());
+   |            ----------    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+LL |
+LL | };
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call3.rs:17:26
+   |
+LL |     let _: &'static _ = &String::new();
+   |            ----------    ^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | }
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call3.rs:20:26
+   |
+LL |     let _: &'static _ = &id(&String::new());
+   |            ----------    ^^^^^^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | }
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call3.rs:20:30
+   |
+LL |     let _: &'static _ = &id(&String::new());
+   |            ----------        ^^^^^^^^^^^^^ - temporary value is freed at the end of this statement
+   |            |                 |
+   |            |                 creates a temporary value which is freed while still in use
+   |            type annotation requires that borrow lasts for `'static`
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call3.rs:24:26
+   |
+LL |     let _: &'static _ = &std::mem::ManuallyDrop::new(String::new());
+   |            ----------    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+LL |
+LL | }
+   | - temporary value is freed at the end of this statement
+
+error: aborting due to 10 previous errors
+
+Some errors have detailed explanations: E0493, E0716.
+For more information about an error, try `rustc --explain E0493`.
diff --git a/tests/ui/consts/promoted_const_call4.rs b/tests/ui/consts/promoted_const_call4.rs
new file mode 100644
index 000000000..82a17b7bf
--- /dev/null
+++ b/tests/ui/consts/promoted_const_call4.rs
@@ -0,0 +1,18 @@
+// run-pass
+
+use std::sync::atomic::*;
+
+static FLAG: AtomicBool = AtomicBool::new(false);
+
+struct NoisyDrop(&'static str);
+impl Drop for NoisyDrop {
+    fn drop(&mut self) {
+        FLAG.store(true, Ordering::SeqCst);
+    }
+}
+fn main() {
+    {
+        let _val = &&(NoisyDrop("drop!"), 0).1;
+    }
+    assert!(FLAG.load(Ordering::SeqCst));
+}
diff --git a/tests/ui/consts/promoted_const_call5.rs b/tests/ui/consts/promoted_const_call5.rs
new file mode 100644
index 000000000..3ac8d358c
--- /dev/null
+++ b/tests/ui/consts/promoted_const_call5.rs
@@ -0,0 +1,42 @@
+#![feature(rustc_attrs)]
+#![feature(staged_api)]
+#![stable(feature = "a", since = "1.0.0")]
+
+#[rustc_promotable]
+#[stable(feature = "a", since = "1.0.0")]
+#[rustc_const_stable(feature = "a", since = "1.0.0")]
+pub const fn id<T>(x: &'static T) -> &'static T { x }
+
+#[rustc_promotable]
+#[stable(feature = "a", since = "1.0.0")]
+#[rustc_const_stable(feature = "a", since = "1.0.0")]
+pub const fn new_string() -> String {
+    String::new()
+}
+
+#[rustc_promotable]
+#[stable(feature = "a", since = "1.0.0")]
+#[rustc_const_stable(feature = "a", since = "1.0.0")]
+pub const fn new_manually_drop<T>(t: T) -> std::mem::ManuallyDrop<T>  {
+    std::mem::ManuallyDrop::new(t)
+}
+
+
+const C: () = {
+    let _: &'static _ = &id(&new_string());
+    //~^ ERROR destructor of `String` cannot be evaluated at compile-time
+    //~| ERROR: temporary value dropped while borrowed
+    //~| ERROR: temporary value dropped while borrowed
+
+    let _: &'static _ = &new_manually_drop(new_string());
+    //~^ ERROR: temporary value dropped while borrowed
+};
+
+fn main() {
+    let _: &'static _ = &id(&new_string());
+    //~^ ERROR: temporary value dropped while borrowed
+    //~| ERROR: temporary value dropped while borrowed
+
+    let _: &'static _ = &new_manually_drop(new_string());
+    //~^ ERROR: temporary value dropped while borrowed
+}
diff --git a/tests/ui/consts/promoted_const_call5.stderr b/tests/ui/consts/promoted_const_call5.stderr
new file mode 100644
index 000000000..f736220b1
--- /dev/null
+++ b/tests/ui/consts/promoted_const_call5.stderr
@@ -0,0 +1,74 @@
+error[E0493]: destructor of `String` cannot be evaluated at compile-time
+  --> $DIR/promoted_const_call5.rs:26:30
+   |
+LL |     let _: &'static _ = &id(&new_string());
+   |                              ^^^^^^^^^^^^ - value is dropped here
+   |                              |
+   |                              the destructor for this type cannot be evaluated in constants
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call5.rs:26:26
+   |
+LL |     let _: &'static _ = &id(&new_string());
+   |            ----------    ^^^^^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | };
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call5.rs:26:30
+   |
+LL |     let _: &'static _ = &id(&new_string());
+   |                          ----^^^^^^^^^^^^-- temporary value is freed at the end of this statement
+   |                          |   |
+   |                          |   creates a temporary value which is freed while still in use
+   |                          argument requires that borrow lasts for `'static`
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call5.rs:31:26
+   |
+LL |     let _: &'static _ = &new_manually_drop(new_string());
+   |            ----------    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+LL |
+LL | };
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call5.rs:36:26
+   |
+LL |     let _: &'static _ = &id(&new_string());
+   |            ----------    ^^^^^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | }
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call5.rs:36:30
+   |
+LL |     let _: &'static _ = &id(&new_string());
+   |                          ----^^^^^^^^^^^^-- temporary value is freed at the end of this statement
+   |                          |   |
+   |                          |   creates a temporary value which is freed while still in use
+   |                          argument requires that borrow lasts for `'static`
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/promoted_const_call5.rs:40:26
+   |
+LL |     let _: &'static _ = &new_manually_drop(new_string());
+   |            ----------    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+LL |
+LL | }
+   | - temporary value is freed at the end of this statement
+
+error: aborting due to 7 previous errors
+
+Some errors have detailed explanations: E0493, E0716.
+For more information about an error, try `rustc --explain E0493`.
diff --git a/src/test/ui/consts/promoted_regression.rs b/tests/ui/consts/promoted_regression.rs
index d57036ae5..d57036ae5 100644
--- a/src/test/ui/consts/promoted_regression.rs
+++ b/tests/ui/consts/promoted_regression.rs
diff --git a/src/test/ui/consts/promotion-mutable-ref.rs b/tests/ui/consts/promotion-mutable-ref.rs
index d103c5a9d..d103c5a9d 100644
--- a/src/test/ui/consts/promotion-mutable-ref.rs
+++ b/tests/ui/consts/promotion-mutable-ref.rs
diff --git a/src/test/ui/consts/promotion.rs b/tests/ui/consts/promotion.rs
index e379e3aea..e379e3aea 100644
--- a/src/test/ui/consts/promotion.rs
+++ b/tests/ui/consts/promotion.rs
diff --git a/src/test/ui/consts/ptr_comparisons.rs b/tests/ui/consts/ptr_comparisons.rs
index f442e6138..f442e6138 100644
--- a/src/test/ui/consts/ptr_comparisons.rs
+++ b/tests/ui/consts/ptr_comparisons.rs
diff --git a/src/test/ui/consts/ptr_comparisons.stderr b/tests/ui/consts/ptr_comparisons.stderr
index 274753ef1..fea924d12 100644
--- a/src/test/ui/consts/ptr_comparisons.stderr
+++ b/tests/ui/consts/ptr_comparisons.stderr
@@ -1,14 +1,10 @@
 error[E0080]: evaluation of constant value failed
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
    |
-LL |         unsafe { intrinsics::offset(self, count) }
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ out-of-bounds pointer arithmetic: alloc3 has size $WORD, so pointer to $TWO_WORDS bytes starting at offset 0 is out-of-bounds
+   = note: out-of-bounds pointer arithmetic: alloc3 has size $WORD, so pointer to $TWO_WORDS bytes starting at offset 0 is out-of-bounds
    |
 note: inside `ptr::const_ptr::<impl *const usize>::offset`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
-   |
-LL |         unsafe { intrinsics::offset(self, count) }
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `_`
   --> $DIR/ptr_comparisons.rs:50:34
    |
diff --git a/src/test/ui/consts/ptr_is_null.rs b/tests/ui/consts/ptr_is_null.rs
index 8babb6858..8babb6858 100644
--- a/src/test/ui/consts/ptr_is_null.rs
+++ b/tests/ui/consts/ptr_is_null.rs
diff --git a/src/test/ui/consts/qualif-indirect-mutation-fail.rs b/tests/ui/consts/qualif-indirect-mutation-fail.rs
index a6d293404..a6d293404 100644
--- a/src/test/ui/consts/qualif-indirect-mutation-fail.rs
+++ b/tests/ui/consts/qualif-indirect-mutation-fail.rs
diff --git a/src/test/ui/consts/qualif-indirect-mutation-fail.stderr b/tests/ui/consts/qualif-indirect-mutation-fail.stderr
index 6379c00e4..6379c00e4 100644
--- a/src/test/ui/consts/qualif-indirect-mutation-fail.stderr
+++ b/tests/ui/consts/qualif-indirect-mutation-fail.stderr
diff --git a/src/test/ui/consts/qualif-indirect-mutation-pass.rs b/tests/ui/consts/qualif-indirect-mutation-pass.rs
index 06af6a03b..06af6a03b 100644
--- a/src/test/ui/consts/qualif-indirect-mutation-pass.rs
+++ b/tests/ui/consts/qualif-indirect-mutation-pass.rs
diff --git a/src/test/ui/consts/qualif-union.rs b/tests/ui/consts/qualif-union.rs
index 11c019be9..11c019be9 100644
--- a/src/test/ui/consts/qualif-union.rs
+++ b/tests/ui/consts/qualif-union.rs
diff --git a/src/test/ui/consts/qualif-union.stderr b/tests/ui/consts/qualif-union.stderr
index d847cf88f..d847cf88f 100644
--- a/src/test/ui/consts/qualif-union.stderr
+++ b/tests/ui/consts/qualif-union.stderr
diff --git a/src/test/ui/consts/qualif_overwrite.rs b/tests/ui/consts/qualif_overwrite.rs
index aae4e41ff..aae4e41ff 100644
--- a/src/test/ui/consts/qualif_overwrite.rs
+++ b/tests/ui/consts/qualif_overwrite.rs
diff --git a/src/test/ui/consts/qualif_overwrite.stderr b/tests/ui/consts/qualif_overwrite.stderr
index 86a669c43..86a669c43 100644
--- a/src/test/ui/consts/qualif_overwrite.stderr
+++ b/tests/ui/consts/qualif_overwrite.stderr
diff --git a/src/test/ui/consts/qualif_overwrite_2.rs b/tests/ui/consts/qualif_overwrite_2.rs
index 1819d9a6d..1819d9a6d 100644
--- a/src/test/ui/consts/qualif_overwrite_2.rs
+++ b/tests/ui/consts/qualif_overwrite_2.rs
diff --git a/src/test/ui/consts/qualif_overwrite_2.stderr b/tests/ui/consts/qualif_overwrite_2.stderr
index 9eb123d0b..9eb123d0b 100644
--- a/src/test/ui/consts/qualif_overwrite_2.stderr
+++ b/tests/ui/consts/qualif_overwrite_2.stderr
diff --git a/src/test/ui/consts/raw-ptr-const.rs b/tests/ui/consts/raw-ptr-const.rs
index b9c542d03..b9c542d03 100644
--- a/src/test/ui/consts/raw-ptr-const.rs
+++ b/tests/ui/consts/raw-ptr-const.rs
diff --git a/src/test/ui/consts/raw-ptr-const.stderr b/tests/ui/consts/raw-ptr-const.stderr
index f7b53433b..f7b53433b 100644
--- a/src/test/ui/consts/raw-ptr-const.stderr
+++ b/tests/ui/consts/raw-ptr-const.stderr
diff --git a/src/test/ui/consts/raw_pointer_promoted.rs b/tests/ui/consts/raw_pointer_promoted.rs
index 4c62ad444..4c62ad444 100644
--- a/src/test/ui/consts/raw_pointer_promoted.rs
+++ b/tests/ui/consts/raw_pointer_promoted.rs
diff --git a/src/test/ui/consts/recursive-zst-static.default.stderr b/tests/ui/consts/recursive-zst-static.default.stderr
index d68960b09..d68960b09 100644
--- a/src/test/ui/consts/recursive-zst-static.default.stderr
+++ b/tests/ui/consts/recursive-zst-static.default.stderr
diff --git a/src/test/ui/consts/recursive-zst-static.rs b/tests/ui/consts/recursive-zst-static.rs
index 4e61634b3..4e61634b3 100644
--- a/src/test/ui/consts/recursive-zst-static.rs
+++ b/tests/ui/consts/recursive-zst-static.rs
diff --git a/src/test/ui/consts/recursive-zst-static.unleash.stderr b/tests/ui/consts/recursive-zst-static.unleash.stderr
index d68960b09..d68960b09 100644
--- a/src/test/ui/consts/recursive-zst-static.unleash.stderr
+++ b/tests/ui/consts/recursive-zst-static.unleash.stderr
diff --git a/src/test/ui/consts/recursive.rs b/tests/ui/consts/recursive.rs
index 5d736e31b..5d736e31b 100644
--- a/src/test/ui/consts/recursive.rs
+++ b/tests/ui/consts/recursive.rs
diff --git a/src/test/ui/consts/recursive.stderr b/tests/ui/consts/recursive.stderr
index 60ce64d2a..60ce64d2a 100644
--- a/src/test/ui/consts/recursive.stderr
+++ b/tests/ui/consts/recursive.stderr
diff --git a/src/test/ui/consts/references.rs b/tests/ui/consts/references.rs
index d0af47a8e..d0af47a8e 100644
--- a/src/test/ui/consts/references.rs
+++ b/tests/ui/consts/references.rs
diff --git a/src/test/ui/consts/refs_check_const_eq-issue-88384.rs b/tests/ui/consts/refs_check_const_eq-issue-88384.rs
index 1496b28bd..1496b28bd 100644
--- a/src/test/ui/consts/refs_check_const_eq-issue-88384.rs
+++ b/tests/ui/consts/refs_check_const_eq-issue-88384.rs
diff --git a/src/test/ui/consts/refs_check_const_eq-issue-88384.stderr b/tests/ui/consts/refs_check_const_eq-issue-88384.stderr
index 3855b5f2a..3855b5f2a 100644
--- a/src/test/ui/consts/refs_check_const_eq-issue-88384.stderr
+++ b/tests/ui/consts/refs_check_const_eq-issue-88384.stderr
diff --git a/src/test/ui/consts/refs_check_const_value_eq-issue-88876.rs b/tests/ui/consts/refs_check_const_value_eq-issue-88876.rs
index 6ce9da436..6ce9da436 100644
--- a/src/test/ui/consts/refs_check_const_value_eq-issue-88876.rs
+++ b/tests/ui/consts/refs_check_const_value_eq-issue-88876.rs
diff --git a/src/test/ui/consts/repeat_match.rs b/tests/ui/consts/repeat_match.rs
index 20983184a..20983184a 100644
--- a/src/test/ui/consts/repeat_match.rs
+++ b/tests/ui/consts/repeat_match.rs
diff --git a/src/test/ui/consts/return-in-const-fn.rs b/tests/ui/consts/return-in-const-fn.rs
index 077a33c08..077a33c08 100644
--- a/src/test/ui/consts/return-in-const-fn.rs
+++ b/tests/ui/consts/return-in-const-fn.rs
diff --git a/src/test/ui/consts/rustc-const-stability-require-const.rs b/tests/ui/consts/rustc-const-stability-require-const.rs
index 4fb259b33..4fb259b33 100644
--- a/src/test/ui/consts/rustc-const-stability-require-const.rs
+++ b/tests/ui/consts/rustc-const-stability-require-const.rs
diff --git a/src/test/ui/consts/rustc-const-stability-require-const.stderr b/tests/ui/consts/rustc-const-stability-require-const.stderr
index 1027b9311..1027b9311 100644
--- a/src/test/ui/consts/rustc-const-stability-require-const.stderr
+++ b/tests/ui/consts/rustc-const-stability-require-const.stderr
diff --git a/src/test/ui/consts/rustc-impl-const-stability.rs b/tests/ui/consts/rustc-impl-const-stability.rs
index 0c18efa0a..0c18efa0a 100644
--- a/src/test/ui/consts/rustc-impl-const-stability.rs
+++ b/tests/ui/consts/rustc-impl-const-stability.rs
diff --git a/src/test/ui/consts/rvalue-static-promotion.rs b/tests/ui/consts/rvalue-static-promotion.rs
index c48d9eae9..c48d9eae9 100644
--- a/src/test/ui/consts/rvalue-static-promotion.rs
+++ b/tests/ui/consts/rvalue-static-promotion.rs
diff --git a/src/test/ui/consts/self_normalization.rs b/tests/ui/consts/self_normalization.rs
index b2a34f587..b2a34f587 100644
--- a/src/test/ui/consts/self_normalization.rs
+++ b/tests/ui/consts/self_normalization.rs
diff --git a/src/test/ui/consts/self_normalization2.rs b/tests/ui/consts/self_normalization2.rs
index 4fca38cba..4fca38cba 100644
--- a/src/test/ui/consts/self_normalization2.rs
+++ b/tests/ui/consts/self_normalization2.rs
diff --git a/src/test/ui/consts/signed_enum_discr.rs b/tests/ui/consts/signed_enum_discr.rs
index 2e4395ccf..2e4395ccf 100644
--- a/src/test/ui/consts/signed_enum_discr.rs
+++ b/tests/ui/consts/signed_enum_discr.rs
diff --git a/src/test/ui/consts/stable-precise-live-drops-in-libcore.rs b/tests/ui/consts/stable-precise-live-drops-in-libcore.rs
index 7cd3dbec9..7cd3dbec9 100644
--- a/src/test/ui/consts/stable-precise-live-drops-in-libcore.rs
+++ b/tests/ui/consts/stable-precise-live-drops-in-libcore.rs
diff --git a/src/test/ui/consts/stable-precise-live-drops-in-libcore.stderr b/tests/ui/consts/stable-precise-live-drops-in-libcore.stderr
index 5f70391ee..5f70391ee 100644
--- a/src/test/ui/consts/stable-precise-live-drops-in-libcore.stderr
+++ b/tests/ui/consts/stable-precise-live-drops-in-libcore.stderr
diff --git a/src/test/ui/consts/static-cycle-error.rs b/tests/ui/consts/static-cycle-error.rs
index 9ce050aae..9ce050aae 100644
--- a/src/test/ui/consts/static-cycle-error.rs
+++ b/tests/ui/consts/static-cycle-error.rs
diff --git a/src/test/ui/consts/static-raw-pointer-interning.rs b/tests/ui/consts/static-raw-pointer-interning.rs
index cab60c91e..cab60c91e 100644
--- a/src/test/ui/consts/static-raw-pointer-interning.rs
+++ b/tests/ui/consts/static-raw-pointer-interning.rs
diff --git a/src/test/ui/consts/static-raw-pointer-interning2.rs b/tests/ui/consts/static-raw-pointer-interning2.rs
index 2b915fd7c..2b915fd7c 100644
--- a/src/test/ui/consts/static-raw-pointer-interning2.rs
+++ b/tests/ui/consts/static-raw-pointer-interning2.rs
diff --git a/src/test/ui/consts/static_mut_containing_mut_ref.rs b/tests/ui/consts/static_mut_containing_mut_ref.rs
index df09c76c5..df09c76c5 100644
--- a/src/test/ui/consts/static_mut_containing_mut_ref.rs
+++ b/tests/ui/consts/static_mut_containing_mut_ref.rs
diff --git a/src/test/ui/consts/static_mut_containing_mut_ref2.mut_refs.stderr b/tests/ui/consts/static_mut_containing_mut_ref2.mut_refs.stderr
index 8db75dd63..8db75dd63 100644
--- a/src/test/ui/consts/static_mut_containing_mut_ref2.mut_refs.stderr
+++ b/tests/ui/consts/static_mut_containing_mut_ref2.mut_refs.stderr
diff --git a/src/test/ui/consts/static_mut_containing_mut_ref2.rs b/tests/ui/consts/static_mut_containing_mut_ref2.rs
index 613685460..613685460 100644
--- a/src/test/ui/consts/static_mut_containing_mut_ref2.rs
+++ b/tests/ui/consts/static_mut_containing_mut_ref2.rs
diff --git a/src/test/ui/consts/static_mut_containing_mut_ref2.stock.stderr b/tests/ui/consts/static_mut_containing_mut_ref2.stock.stderr
index 5cdcea232..5cdcea232 100644
--- a/src/test/ui/consts/static_mut_containing_mut_ref2.stock.stderr
+++ b/tests/ui/consts/static_mut_containing_mut_ref2.stock.stderr
diff --git a/src/test/ui/consts/static_mut_containing_mut_ref3.rs b/tests/ui/consts/static_mut_containing_mut_ref3.rs
index c24c7e279..c24c7e279 100644
--- a/src/test/ui/consts/static_mut_containing_mut_ref3.rs
+++ b/tests/ui/consts/static_mut_containing_mut_ref3.rs
diff --git a/src/test/ui/consts/static_mut_containing_mut_ref3.stderr b/tests/ui/consts/static_mut_containing_mut_ref3.stderr
index 91f9dbd8d..91f9dbd8d 100644
--- a/src/test/ui/consts/static_mut_containing_mut_ref3.stderr
+++ b/tests/ui/consts/static_mut_containing_mut_ref3.stderr
diff --git a/src/test/ui/consts/std/alloc.32bit.stderr b/tests/ui/consts/std/alloc.32bit.stderr
index 79efcd3f6..8c83df53d 100644
--- a/src/test/ui/consts/std/alloc.32bit.stderr
+++ b/tests/ui/consts/std/alloc.32bit.stderr
@@ -1,23 +1,23 @@
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/alloc.rs:9:1
+  --> $DIR/alloc.rs:12:1
    |
 LL | const LAYOUT_INVALID_ZERO: Layout = unsafe { Layout::from_size_align_unchecked(0x1000, 0x00) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .align.0.<enum-tag>: encountered 0x00000000, but expected a valid enum tag
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 8, align: 4) {
-               00 10 00 00 00 00 00 00                         │ ........
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/alloc.rs:13:1
+  --> $DIR/alloc.rs:16:1
    |
 LL | const LAYOUT_INVALID_THREE: Layout = unsafe { Layout::from_size_align_unchecked(9, 3) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .align.0.<enum-tag>: encountered 0x00000003, but expected a valid enum tag
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 8, align: 4) {
-               09 00 00 00 03 00 00 00                         │ ........
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/consts/std/alloc.64bit.stderr b/tests/ui/consts/std/alloc.64bit.stderr
index cb477b72b..addedad17 100644
--- a/src/test/ui/consts/std/alloc.64bit.stderr
+++ b/tests/ui/consts/std/alloc.64bit.stderr
@@ -1,23 +1,23 @@
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/alloc.rs:9:1
+  --> $DIR/alloc.rs:12:1
    |
 LL | const LAYOUT_INVALID_ZERO: Layout = unsafe { Layout::from_size_align_unchecked(0x1000, 0x00) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .align.0.<enum-tag>: encountered 0x0000000000000000, but expected a valid enum tag
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 16, align: 8) {
-               00 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/alloc.rs:13:1
+  --> $DIR/alloc.rs:16:1
    |
 LL | const LAYOUT_INVALID_THREE: Layout = unsafe { Layout::from_size_align_unchecked(9, 3) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .align.0.<enum-tag>: encountered 0x0000000000000003, but expected a valid enum tag
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
-   = note: the raw bytes of the constant (size: 16, align: 8) {
-               09 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 │ ................
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
            }
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/consts/std/alloc.rs b/tests/ui/consts/std/alloc.rs
new file mode 100644
index 000000000..9abf35d63
--- /dev/null
+++ b/tests/ui/consts/std/alloc.rs
@@ -0,0 +1,19 @@
+// stderr-per-bitwidth
+// ignore-debug (the debug assertions change the error)
+// Strip out raw byte dumps to make comparison platform-independent:
+// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
+use std::alloc::Layout;
+
+// ok
+const LAYOUT_VALID: Layout = unsafe { Layout::from_size_align_unchecked(0x1000, 0x08) };
+
+// not ok, since alignment needs to be non-zero.
+const LAYOUT_INVALID_ZERO: Layout = unsafe { Layout::from_size_align_unchecked(0x1000, 0x00) };
+//~^ ERROR it is undefined behavior to use this value
+
+// not ok, since alignment needs to be a power of two.
+const LAYOUT_INVALID_THREE: Layout = unsafe { Layout::from_size_align_unchecked(9, 3) };
+//~^ ERROR it is undefined behavior to use this value
+
+fn main() {}
diff --git a/src/test/ui/consts/std/cell.rs b/tests/ui/consts/std/cell.rs
index f1ef54131..f1ef54131 100644
--- a/src/test/ui/consts/std/cell.rs
+++ b/tests/ui/consts/std/cell.rs
diff --git a/src/test/ui/consts/std/cell.stderr b/tests/ui/consts/std/cell.stderr
index 937fa7db0..937fa7db0 100644
--- a/src/test/ui/consts/std/cell.stderr
+++ b/tests/ui/consts/std/cell.stderr
diff --git a/src/test/ui/consts/std/iter.rs b/tests/ui/consts/std/iter.rs
index e9af781eb..e9af781eb 100644
--- a/src/test/ui/consts/std/iter.rs
+++ b/tests/ui/consts/std/iter.rs
diff --git a/src/test/ui/consts/std/slice.rs b/tests/ui/consts/std/slice.rs
index f19defc64..f19defc64 100644
--- a/src/test/ui/consts/std/slice.rs
+++ b/tests/ui/consts/std/slice.rs
diff --git a/src/test/ui/consts/too_generic_eval_ice.rs b/tests/ui/consts/too_generic_eval_ice.rs
index af494e373..8b3f4b714 100644
--- a/src/test/ui/consts/too_generic_eval_ice.rs
+++ b/tests/ui/consts/too_generic_eval_ice.rs
@@ -7,7 +7,7 @@ impl<A, B> Foo<A, B> {
         [5; Self::HOST_SIZE] == [6; 0]
         //~^ ERROR constant expression depends on a generic parameter
         //~| ERROR constant expression depends on a generic parameter
-        //~| ERROR can't compare `[{integer}; _]` with `[{integer}; 0]`
+        //~| ERROR can't compare `[{integer}; Self::HOST_SIZE]` with `[{integer}; 0]`
     }
 }
 
diff --git a/src/test/ui/consts/too_generic_eval_ice.stderr b/tests/ui/consts/too_generic_eval_ice.stderr
index 8de61fcfb..5af82a3e3 100644
--- a/src/test/ui/consts/too_generic_eval_ice.stderr
+++ b/tests/ui/consts/too_generic_eval_ice.stderr
@@ -14,13 +14,13 @@ LL |         [5; Self::HOST_SIZE] == [6; 0]
    |
    = note: this may fail depending on what value the parameter takes
 
-error[E0277]: can't compare `[{integer}; _]` with `[{integer}; 0]`
+error[E0277]: can't compare `[{integer}; Self::HOST_SIZE]` with `[{integer}; 0]`
   --> $DIR/too_generic_eval_ice.rs:7:30
    |
 LL |         [5; Self::HOST_SIZE] == [6; 0]
-   |                              ^^ no implementation for `[{integer}; _] == [{integer}; 0]`
+   |                              ^^ no implementation for `[{integer}; Self::HOST_SIZE] == [{integer}; 0]`
    |
-   = help: the trait `PartialEq<[{integer}; 0]>` is not implemented for `[{integer}; _]`
+   = help: the trait `PartialEq<[{integer}; 0]>` is not implemented for `[{integer}; Self::HOST_SIZE]`
    = help: the following other types implement trait `PartialEq<Rhs>`:
              <&[B] as PartialEq<[A; N]>>
              <&[T] as PartialEq<Vec<U, A>>>
diff --git a/src/test/ui/consts/trait_specialization.rs b/tests/ui/consts/trait_specialization.rs
index c581ef6b0..c581ef6b0 100644
--- a/src/test/ui/consts/trait_specialization.rs
+++ b/tests/ui/consts/trait_specialization.rs
diff --git a/src/test/ui/consts/trait_specialization.stderr b/tests/ui/consts/trait_specialization.stderr
index 10bebe8eb..10bebe8eb 100644
--- a/src/test/ui/consts/trait_specialization.stderr
+++ b/tests/ui/consts/trait_specialization.stderr
diff --git a/src/test/ui/consts/transmute-const.rs b/tests/ui/consts/transmute-const.rs
index c5c3dfc4c..c5c3dfc4c 100644
--- a/src/test/ui/consts/transmute-const.rs
+++ b/tests/ui/consts/transmute-const.rs
diff --git a/src/test/ui/consts/transmute-size-mismatch-before-typeck.rs b/tests/ui/consts/transmute-size-mismatch-before-typeck.rs
index 852a5b3b4..852a5b3b4 100644
--- a/src/test/ui/consts/transmute-size-mismatch-before-typeck.rs
+++ b/tests/ui/consts/transmute-size-mismatch-before-typeck.rs
diff --git a/src/test/ui/consts/transmute-size-mismatch-before-typeck.stderr b/tests/ui/consts/transmute-size-mismatch-before-typeck.stderr
index 4e8470173..4e8470173 100644
--- a/src/test/ui/consts/transmute-size-mismatch-before-typeck.stderr
+++ b/tests/ui/consts/transmute-size-mismatch-before-typeck.stderr
diff --git a/src/test/ui/consts/try-operator.rs b/tests/ui/consts/try-operator.rs
index fe43b132c..fe43b132c 100644
--- a/src/test/ui/consts/try-operator.rs
+++ b/tests/ui/consts/try-operator.rs
diff --git a/src/test/ui/consts/tuple-struct-constructors.rs b/tests/ui/consts/tuple-struct-constructors.rs
index 1655f0eb8..1655f0eb8 100644
--- a/src/test/ui/consts/tuple-struct-constructors.rs
+++ b/tests/ui/consts/tuple-struct-constructors.rs
diff --git a/src/test/ui/consts/underscore_const_names.rs b/tests/ui/consts/underscore_const_names.rs
index d0e625bf1..d0e625bf1 100644
--- a/src/test/ui/consts/underscore_const_names.rs
+++ b/tests/ui/consts/underscore_const_names.rs
diff --git a/src/test/ui/consts/uninhabited-const-issue-61744.rs b/tests/ui/consts/uninhabited-const-issue-61744.rs
index ca6449cce..ca6449cce 100644
--- a/src/test/ui/consts/uninhabited-const-issue-61744.rs
+++ b/tests/ui/consts/uninhabited-const-issue-61744.rs
diff --git a/src/test/ui/consts/uninhabited-const-issue-61744.stderr b/tests/ui/consts/uninhabited-const-issue-61744.stderr
index 3a94e1931..3a94e1931 100644
--- a/src/test/ui/consts/uninhabited-const-issue-61744.stderr
+++ b/tests/ui/consts/uninhabited-const-issue-61744.stderr
diff --git a/src/test/ui/consts/union_constant.rs b/tests/ui/consts/union_constant.rs
index 508ff7e0a..508ff7e0a 100644
--- a/src/test/ui/consts/union_constant.rs
+++ b/tests/ui/consts/union_constant.rs
diff --git a/src/test/ui/consts/unnormalized-param-env.rs b/tests/ui/consts/unnormalized-param-env.rs
index a7bbe4db9..a7bbe4db9 100644
--- a/src/test/ui/consts/unnormalized-param-env.rs
+++ b/tests/ui/consts/unnormalized-param-env.rs
diff --git a/src/test/ui/consts/unstable-const-fn-in-libcore.rs b/tests/ui/consts/unstable-const-fn-in-libcore.rs
index ca4ed8f0b..ca4ed8f0b 100644
--- a/src/test/ui/consts/unstable-const-fn-in-libcore.rs
+++ b/tests/ui/consts/unstable-const-fn-in-libcore.rs
diff --git a/src/test/ui/consts/unstable-const-fn-in-libcore.stderr b/tests/ui/consts/unstable-const-fn-in-libcore.stderr
index e5b00dd07..e5b00dd07 100644
--- a/src/test/ui/consts/unstable-const-fn-in-libcore.stderr
+++ b/tests/ui/consts/unstable-const-fn-in-libcore.stderr
diff --git a/src/test/ui/consts/unstable-precise-live-drops-in-libcore.rs b/tests/ui/consts/unstable-precise-live-drops-in-libcore.rs
index 619084eaa..619084eaa 100644
--- a/src/test/ui/consts/unstable-precise-live-drops-in-libcore.rs
+++ b/tests/ui/consts/unstable-precise-live-drops-in-libcore.rs
diff --git a/src/test/ui/consts/unwind-abort.rs b/tests/ui/consts/unwind-abort.rs
index 6c94fc7b9..6c94fc7b9 100644
--- a/src/test/ui/consts/unwind-abort.rs
+++ b/tests/ui/consts/unwind-abort.rs
diff --git a/tests/ui/consts/validate_never_arrays.rs b/tests/ui/consts/validate_never_arrays.rs
new file mode 100644
index 000000000..f96ca6839
--- /dev/null
+++ b/tests/ui/consts/validate_never_arrays.rs
@@ -0,0 +1,12 @@
+// Strip out raw byte dumps to make comparison platform-independent:
+// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
+#![feature(never_type)]
+
+const _: &[!; 1] = unsafe { &*(1_usize as *const [!; 1]) }; //~ ERROR undefined behavior
+const _: &[!; 0] = unsafe { &*(1_usize as *const [!; 0]) }; // ok
+const _: &[!] = unsafe { &*(1_usize as *const [!; 0]) }; // ok
+const _: &[!] = unsafe { &*(1_usize as *const [!; 1]) }; //~ ERROR undefined behavior
+const _: &[!] = unsafe { &*(1_usize as *const [!; 42]) }; //~ ERROR undefined behavior
+
+fn main() {}
diff --git a/tests/ui/consts/validate_never_arrays.stderr b/tests/ui/consts/validate_never_arrays.stderr
new file mode 100644
index 000000000..12090e483
--- /dev/null
+++ b/tests/ui/consts/validate_never_arrays.stderr
@@ -0,0 +1,36 @@
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/validate_never_arrays.rs:6:1
+   |
+LL | const _: &[!; 1] = unsafe { &*(1_usize as *const [!; 1]) };
+   | ^^^^^^^^^^^^^^^^ constructing invalid value: encountered a reference pointing to uninhabited type [!; 1]
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/validate_never_arrays.rs:9:1
+   |
+LL | const _: &[!] = unsafe { &*(1_usize as *const [!; 1]) };
+   | ^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered a value of the never type `!`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/validate_never_arrays.rs:10:1
+   |
+LL | const _: &[!] = unsafe { &*(1_usize as *const [!; 42]) };
+   | ^^^^^^^^^^^^^ constructing invalid value at .<deref>[0]: encountered a value of the never type `!`
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+   = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
+               HEX_DUMP
+           }
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/write-to-static-mut-in-static.rs b/tests/ui/consts/write-to-static-mut-in-static.rs
index 43c63fed8..43c63fed8 100644
--- a/src/test/ui/consts/write-to-static-mut-in-static.rs
+++ b/tests/ui/consts/write-to-static-mut-in-static.rs
diff --git a/src/test/ui/consts/write-to-static-mut-in-static.stderr b/tests/ui/consts/write-to-static-mut-in-static.stderr
index 395b2d42f..395b2d42f 100644
--- a/src/test/ui/consts/write-to-static-mut-in-static.stderr
+++ b/tests/ui/consts/write-to-static-mut-in-static.stderr
diff --git a/src/test/ui/consts/write_to_mut_ref_dest.rs b/tests/ui/consts/write_to_mut_ref_dest.rs
index 484ec4244..484ec4244 100644
--- a/src/test/ui/consts/write_to_mut_ref_dest.rs
+++ b/tests/ui/consts/write_to_mut_ref_dest.rs
diff --git a/src/test/ui/consts/write_to_mut_ref_dest.stock.stderr b/tests/ui/consts/write_to_mut_ref_dest.stock.stderr
index bb1059276..bb1059276 100644
--- a/src/test/ui/consts/write_to_mut_ref_dest.stock.stderr
+++ b/tests/ui/consts/write_to_mut_ref_dest.stock.stderr
diff --git a/src/test/ui/consts/write_to_static_via_mut_ref.rs b/tests/ui/consts/write_to_static_via_mut_ref.rs
index 39b830ae4..39b830ae4 100644
--- a/src/test/ui/consts/write_to_static_via_mut_ref.rs
+++ b/tests/ui/consts/write_to_static_via_mut_ref.rs
diff --git a/src/test/ui/consts/write_to_static_via_mut_ref.stderr b/tests/ui/consts/write_to_static_via_mut_ref.stderr
index f64f0db6b..f64f0db6b 100644
--- a/src/test/ui/consts/write_to_static_via_mut_ref.stderr
+++ b/tests/ui/consts/write_to_static_via_mut_ref.stderr
diff --git a/src/test/ui/consts/zst_no_llvm_alloc.rs b/tests/ui/consts/zst_no_llvm_alloc.rs
index 2a41f708c..2a41f708c 100644
--- a/src/test/ui/consts/zst_no_llvm_alloc.rs
+++ b/tests/ui/consts/zst_no_llvm_alloc.rs
diff --git a/src/test/ui/copy-a-resource.rs b/tests/ui/copy-a-resource.rs
index 55f2dd4ee..55f2dd4ee 100644
--- a/src/test/ui/copy-a-resource.rs
+++ b/tests/ui/copy-a-resource.rs
diff --git a/src/test/ui/copy-a-resource.stderr b/tests/ui/copy-a-resource.stderr
index 128087f1e..128087f1e 100644
--- a/src/test/ui/copy-a-resource.stderr
+++ b/tests/ui/copy-a-resource.stderr
diff --git a/src/test/ui/crate-leading-sep.rs b/tests/ui/crate-leading-sep.rs
index ca5905fab..ca5905fab 100644
--- a/src/test/ui/crate-leading-sep.rs
+++ b/tests/ui/crate-leading-sep.rs
diff --git a/tests/ui/crate-loading/auxiliary/crateresolve1-1.rs b/tests/ui/crate-loading/auxiliary/crateresolve1-1.rs
new file mode 100644
index 000000000..bd9c8483e
--- /dev/null
+++ b/tests/ui/crate-loading/auxiliary/crateresolve1-1.rs
@@ -0,0 +1,6 @@
+// compile-flags:-C extra-filename=-1
+// no-prefer-dynamic
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 10 }
diff --git a/tests/ui/crate-loading/auxiliary/crateresolve1-2.rs b/tests/ui/crate-loading/auxiliary/crateresolve1-2.rs
new file mode 100644
index 000000000..bd0f08f45
--- /dev/null
+++ b/tests/ui/crate-loading/auxiliary/crateresolve1-2.rs
@@ -0,0 +1,6 @@
+// compile-flags:-C extra-filename=-2
+// no-prefer-dynamic
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 20 }
diff --git a/tests/ui/crate-loading/auxiliary/crateresolve1-3.rs b/tests/ui/crate-loading/auxiliary/crateresolve1-3.rs
new file mode 100644
index 000000000..1226c2fbb
--- /dev/null
+++ b/tests/ui/crate-loading/auxiliary/crateresolve1-3.rs
@@ -0,0 +1,6 @@
+// compile-flags:-C extra-filename=-3
+// no-prefer-dynamic
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 30 }
diff --git a/src/test/ui/crate-loading/auxiliary/crateresolve2-1.rs b/tests/ui/crate-loading/auxiliary/crateresolve2-1.rs
index e9459ed07..e9459ed07 100644
--- a/src/test/ui/crate-loading/auxiliary/crateresolve2-1.rs
+++ b/tests/ui/crate-loading/auxiliary/crateresolve2-1.rs
diff --git a/src/test/ui/crate-loading/auxiliary/crateresolve2-2.rs b/tests/ui/crate-loading/auxiliary/crateresolve2-2.rs
index c45416827..c45416827 100644
--- a/src/test/ui/crate-loading/auxiliary/crateresolve2-2.rs
+++ b/tests/ui/crate-loading/auxiliary/crateresolve2-2.rs
diff --git a/src/test/ui/crate-loading/auxiliary/crateresolve2-3.rs b/tests/ui/crate-loading/auxiliary/crateresolve2-3.rs
index b356db4b6..b356db4b6 100644
--- a/src/test/ui/crate-loading/auxiliary/crateresolve2-3.rs
+++ b/tests/ui/crate-loading/auxiliary/crateresolve2-3.rs
diff --git a/src/test/ui/crate-loading/auxiliary/libfoo.rlib b/tests/ui/crate-loading/auxiliary/libfoo.rlib
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/crate-loading/auxiliary/libfoo.rlib
+++ b/tests/ui/crate-loading/auxiliary/libfoo.rlib
diff --git a/src/test/ui/crate-loading/auxiliary/proc-macro.rs b/tests/ui/crate-loading/auxiliary/proc-macro.rs
index 52631de57..52631de57 100644
--- a/src/test/ui/crate-loading/auxiliary/proc-macro.rs
+++ b/tests/ui/crate-loading/auxiliary/proc-macro.rs
diff --git a/tests/ui/crate-loading/crateresolve1.rs b/tests/ui/crate-loading/crateresolve1.rs
new file mode 100644
index 000000000..61a1ee263
--- /dev/null
+++ b/tests/ui/crate-loading/crateresolve1.rs
@@ -0,0 +1,14 @@
+// aux-build:crateresolve1-1.rs
+// aux-build:crateresolve1-2.rs
+// aux-build:crateresolve1-3.rs
+
+// normalize-stderr-test: "\.nll/" -> "/"
+// normalize-stderr-test: "\\\?\\" -> ""
+// normalize-stderr-test: "(lib)?crateresolve1-([123])\.[a-z]+" -> "libcrateresolve1-$2.somelib"
+
+// NOTE: This test is duplicated at `tests/ui/error-codes/E0464.rs`.
+
+extern crate crateresolve1;
+//~^ ERROR multiple candidates for `rlib` dependency `crateresolve1` found
+
+fn main() {}
diff --git a/tests/ui/crate-loading/crateresolve1.stderr b/tests/ui/crate-loading/crateresolve1.stderr
new file mode 100644
index 000000000..7b840b526
--- /dev/null
+++ b/tests/ui/crate-loading/crateresolve1.stderr
@@ -0,0 +1,13 @@
+error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
+  --> $DIR/crateresolve1.rs:11:1
+   |
+LL | extern crate crateresolve1;
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: candidate #1: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-1.somelib
+   = note: candidate #2: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-2.somelib
+   = note: candidate #3: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-3.somelib
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0464`.
diff --git a/tests/ui/crate-loading/crateresolve2.rs b/tests/ui/crate-loading/crateresolve2.rs
new file mode 100644
index 000000000..0774c0dfd
--- /dev/null
+++ b/tests/ui/crate-loading/crateresolve2.rs
@@ -0,0 +1,13 @@
+// check-fail
+
+// aux-build:crateresolve2-1.rs
+// aux-build:crateresolve2-2.rs
+// aux-build:crateresolve2-3.rs
+
+// normalize-stderr-test: "\.nll/" -> "/"
+// normalize-stderr-test: "\\\?\\" -> ""
+
+extern crate crateresolve2;
+//~^ ERROR multiple candidates for `rmeta` dependency `crateresolve2` found
+
+fn main() {}
diff --git a/tests/ui/crate-loading/crateresolve2.stderr b/tests/ui/crate-loading/crateresolve2.stderr
new file mode 100644
index 000000000..a36f4f022
--- /dev/null
+++ b/tests/ui/crate-loading/crateresolve2.stderr
@@ -0,0 +1,13 @@
+error[E0464]: multiple candidates for `rmeta` dependency `crateresolve2` found
+  --> $DIR/crateresolve2.rs:10:1
+   |
+LL | extern crate crateresolve2;
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: candidate #1: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-1.rmeta
+   = note: candidate #2: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-2.rmeta
+   = note: candidate #3: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-3.rmeta
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0464`.
diff --git a/src/test/ui/crate-loading/cross-compiled-proc-macro.rs b/tests/ui/crate-loading/cross-compiled-proc-macro.rs
index c1f433143..c1f433143 100644
--- a/src/test/ui/crate-loading/cross-compiled-proc-macro.rs
+++ b/tests/ui/crate-loading/cross-compiled-proc-macro.rs
diff --git a/src/test/ui/crate-loading/invalid-rlib.rs b/tests/ui/crate-loading/invalid-rlib.rs
index aea861e32..aea861e32 100644
--- a/src/test/ui/crate-loading/invalid-rlib.rs
+++ b/tests/ui/crate-loading/invalid-rlib.rs
diff --git a/src/test/ui/crate-loading/invalid-rlib.stderr b/tests/ui/crate-loading/invalid-rlib.stderr
index 3c0d23bf7..3c0d23bf7 100644
--- a/src/test/ui/crate-loading/invalid-rlib.stderr
+++ b/tests/ui/crate-loading/invalid-rlib.stderr
diff --git a/src/test/ui/crate-loading/missing-std.rs b/tests/ui/crate-loading/missing-std.rs
index 400d9f6e0..400d9f6e0 100644
--- a/src/test/ui/crate-loading/missing-std.rs
+++ b/tests/ui/crate-loading/missing-std.rs
diff --git a/src/test/ui/crate-loading/missing-std.stderr b/tests/ui/crate-loading/missing-std.stderr
index 70bcae1e0..70bcae1e0 100644
--- a/src/test/ui/crate-loading/missing-std.stderr
+++ b/tests/ui/crate-loading/missing-std.stderr
diff --git a/src/test/ui/crate-method-reexport-grrrrrrr.rs b/tests/ui/crate-method-reexport-grrrrrrr.rs
index 55e05cfb2..55e05cfb2 100644
--- a/src/test/ui/crate-method-reexport-grrrrrrr.rs
+++ b/tests/ui/crate-method-reexport-grrrrrrr.rs
diff --git a/src/test/ui/crate-name-attr-used.rs b/tests/ui/crate-name-attr-used.rs
index ad53a5314..ad53a5314 100644
--- a/src/test/ui/crate-name-attr-used.rs
+++ b/tests/ui/crate-name-attr-used.rs
diff --git a/src/test/ui/crate-name-mismatch.rs b/tests/ui/crate-name-mismatch.rs
index 23ad39a6f..23ad39a6f 100644
--- a/src/test/ui/crate-name-mismatch.rs
+++ b/tests/ui/crate-name-mismatch.rs
diff --git a/src/test/ui/crate-name-mismatch.stderr b/tests/ui/crate-name-mismatch.stderr
index 96618570d..96618570d 100644
--- a/src/test/ui/crate-name-mismatch.stderr
+++ b/tests/ui/crate-name-mismatch.stderr
diff --git a/src/test/ui/cross-crate/auxiliary/cci_borrow_lib.rs b/tests/ui/cross-crate/auxiliary/cci_borrow_lib.rs
index 7c57a1c66..7c57a1c66 100644
--- a/src/test/ui/cross-crate/auxiliary/cci_borrow_lib.rs
+++ b/tests/ui/cross-crate/auxiliary/cci_borrow_lib.rs
diff --git a/src/test/ui/cross-crate/auxiliary/cci_capture_clause.rs b/tests/ui/cross-crate/auxiliary/cci_capture_clause.rs
index 4cd001ecc..4cd001ecc 100644
--- a/src/test/ui/cross-crate/auxiliary/cci_capture_clause.rs
+++ b/tests/ui/cross-crate/auxiliary/cci_capture_clause.rs
diff --git a/src/test/ui/cross-crate/auxiliary/cci_const.rs b/tests/ui/cross-crate/auxiliary/cci_const.rs
index c83b3f4a5..c83b3f4a5 100644
--- a/src/test/ui/cross-crate/auxiliary/cci_const.rs
+++ b/tests/ui/cross-crate/auxiliary/cci_const.rs
diff --git a/src/test/ui/cross-crate/auxiliary/cci_impl_lib.rs b/tests/ui/cross-crate/auxiliary/cci_impl_lib.rs
index 0db0037b2..0db0037b2 100644
--- a/src/test/ui/cross-crate/auxiliary/cci_impl_lib.rs
+++ b/tests/ui/cross-crate/auxiliary/cci_impl_lib.rs
diff --git a/src/test/ui/cross-crate/auxiliary/cci_iter_lib.rs b/tests/ui/cross-crate/auxiliary/cci_iter_lib.rs
index 60c36bc7d..60c36bc7d 100644
--- a/src/test/ui/cross-crate/auxiliary/cci_iter_lib.rs
+++ b/tests/ui/cross-crate/auxiliary/cci_iter_lib.rs
diff --git a/src/test/ui/cross-crate/auxiliary/cci_nested_lib.rs b/tests/ui/cross-crate/auxiliary/cci_nested_lib.rs
index 23d76ef36..23d76ef36 100644
--- a/src/test/ui/cross-crate/auxiliary/cci_nested_lib.rs
+++ b/tests/ui/cross-crate/auxiliary/cci_nested_lib.rs
diff --git a/src/test/ui/cross-crate/auxiliary/cci_no_inline_lib.rs b/tests/ui/cross-crate/auxiliary/cci_no_inline_lib.rs
index 177dba217..177dba217 100644
--- a/src/test/ui/cross-crate/auxiliary/cci_no_inline_lib.rs
+++ b/tests/ui/cross-crate/auxiliary/cci_no_inline_lib.rs
diff --git a/src/test/ui/cross-crate/auxiliary/moves_based_on_type_lib.rs b/tests/ui/cross-crate/auxiliary/moves_based_on_type_lib.rs
index 7e7e3b860..7e7e3b860 100644
--- a/src/test/ui/cross-crate/auxiliary/moves_based_on_type_lib.rs
+++ b/tests/ui/cross-crate/auxiliary/moves_based_on_type_lib.rs
diff --git a/src/test/ui/cross-crate/auxiliary/pub_static_array.rs b/tests/ui/cross-crate/auxiliary/pub_static_array.rs
index 49cb76921..49cb76921 100644
--- a/src/test/ui/cross-crate/auxiliary/pub_static_array.rs
+++ b/tests/ui/cross-crate/auxiliary/pub_static_array.rs
diff --git a/src/test/ui/cross-crate/auxiliary/reexported_static_methods.rs b/tests/ui/cross-crate/auxiliary/reexported_static_methods.rs
index cc961625f..cc961625f 100644
--- a/src/test/ui/cross-crate/auxiliary/reexported_static_methods.rs
+++ b/tests/ui/cross-crate/auxiliary/reexported_static_methods.rs
diff --git a/src/test/ui/cross-crate/auxiliary/static_init_aux.rs b/tests/ui/cross-crate/auxiliary/static_init_aux.rs
index 3b664f436..3b664f436 100644
--- a/src/test/ui/cross-crate/auxiliary/static_init_aux.rs
+++ b/tests/ui/cross-crate/auxiliary/static_init_aux.rs
diff --git a/src/test/ui/cross-crate/auxiliary/xcrate-trait-lifetime-param.rs b/tests/ui/cross-crate/auxiliary/xcrate-trait-lifetime-param.rs
index 7c1175f7a..7c1175f7a 100644
--- a/src/test/ui/cross-crate/auxiliary/xcrate-trait-lifetime-param.rs
+++ b/tests/ui/cross-crate/auxiliary/xcrate-trait-lifetime-param.rs
diff --git a/src/test/ui/cross-crate/auxiliary/xcrate_address_insignificant.rs b/tests/ui/cross-crate/auxiliary/xcrate_address_insignificant.rs
index e79e334b5..e79e334b5 100644
--- a/src/test/ui/cross-crate/auxiliary/xcrate_address_insignificant.rs
+++ b/tests/ui/cross-crate/auxiliary/xcrate_address_insignificant.rs
diff --git a/src/test/ui/cross-crate/auxiliary/xcrate_associated_type_defaults.rs b/tests/ui/cross-crate/auxiliary/xcrate_associated_type_defaults.rs
index d8a55dd34..d8a55dd34 100644
--- a/src/test/ui/cross-crate/auxiliary/xcrate_associated_type_defaults.rs
+++ b/tests/ui/cross-crate/auxiliary/xcrate_associated_type_defaults.rs
diff --git a/src/test/ui/cross-crate/auxiliary/xcrate_generic_fn_nested_return.rs b/tests/ui/cross-crate/auxiliary/xcrate_generic_fn_nested_return.rs
index 2ab23b4d7..2ab23b4d7 100644
--- a/src/test/ui/cross-crate/auxiliary/xcrate_generic_fn_nested_return.rs
+++ b/tests/ui/cross-crate/auxiliary/xcrate_generic_fn_nested_return.rs
diff --git a/src/test/ui/cross-crate/auxiliary/xcrate_static_addresses.rs b/tests/ui/cross-crate/auxiliary/xcrate_static_addresses.rs
index e18d34799..e18d34799 100644
--- a/src/test/ui/cross-crate/auxiliary/xcrate_static_addresses.rs
+++ b/tests/ui/cross-crate/auxiliary/xcrate_static_addresses.rs
diff --git a/src/test/ui/cross-crate/cci_borrow.rs b/tests/ui/cross-crate/cci_borrow.rs
index fee6b5d03..fee6b5d03 100644
--- a/src/test/ui/cross-crate/cci_borrow.rs
+++ b/tests/ui/cross-crate/cci_borrow.rs
diff --git a/src/test/ui/cross-crate/cci_capture_clause.rs b/tests/ui/cross-crate/cci_capture_clause.rs
index ea699b5f5..ea699b5f5 100644
--- a/src/test/ui/cross-crate/cci_capture_clause.rs
+++ b/tests/ui/cross-crate/cci_capture_clause.rs
diff --git a/src/test/ui/cross-crate/cci_impl_exe.rs b/tests/ui/cross-crate/cci_impl_exe.rs
index b11fb23eb..b11fb23eb 100644
--- a/src/test/ui/cross-crate/cci_impl_exe.rs
+++ b/tests/ui/cross-crate/cci_impl_exe.rs
diff --git a/src/test/ui/cross-crate/cci_iter_exe.rs b/tests/ui/cross-crate/cci_iter_exe.rs
index 8b58d90fe..8b58d90fe 100644
--- a/src/test/ui/cross-crate/cci_iter_exe.rs
+++ b/tests/ui/cross-crate/cci_iter_exe.rs
diff --git a/src/test/ui/cross-crate/cci_nested_exe.rs b/tests/ui/cross-crate/cci_nested_exe.rs
index 1c001a2a3..1c001a2a3 100644
--- a/src/test/ui/cross-crate/cci_nested_exe.rs
+++ b/tests/ui/cross-crate/cci_nested_exe.rs
diff --git a/src/test/ui/cross-crate/cci_no_inline_exe.rs b/tests/ui/cross-crate/cci_no_inline_exe.rs
index ffc701678..ffc701678 100644
--- a/src/test/ui/cross-crate/cci_no_inline_exe.rs
+++ b/tests/ui/cross-crate/cci_no_inline_exe.rs
diff --git a/src/test/ui/cross-crate/const-cross-crate-const.rs b/tests/ui/cross-crate/const-cross-crate-const.rs
index 92020417f..92020417f 100644
--- a/src/test/ui/cross-crate/const-cross-crate-const.rs
+++ b/tests/ui/cross-crate/const-cross-crate-const.rs
diff --git a/src/test/ui/cross-crate/const-cross-crate-extern.rs b/tests/ui/cross-crate/const-cross-crate-extern.rs
index 3c61afd5b..3c61afd5b 100644
--- a/src/test/ui/cross-crate/const-cross-crate-extern.rs
+++ b/tests/ui/cross-crate/const-cross-crate-extern.rs
diff --git a/src/test/ui/cross-crate/cross-crate-const-pat.rs b/tests/ui/cross-crate/cross-crate-const-pat.rs
index e8fa8485a..e8fa8485a 100644
--- a/src/test/ui/cross-crate/cross-crate-const-pat.rs
+++ b/tests/ui/cross-crate/cross-crate-const-pat.rs
diff --git a/src/test/ui/cross-crate/issue-64872/auxiliary/a_def_obj.rs b/tests/ui/cross-crate/issue-64872/auxiliary/a_def_obj.rs
index 82bb95f1e..82bb95f1e 100644
--- a/src/test/ui/cross-crate/issue-64872/auxiliary/a_def_obj.rs
+++ b/tests/ui/cross-crate/issue-64872/auxiliary/a_def_obj.rs
diff --git a/src/test/ui/cross-crate/issue-64872/auxiliary/b_reexport_obj.rs b/tests/ui/cross-crate/issue-64872/auxiliary/b_reexport_obj.rs
index 21c0274b9..21c0274b9 100644
--- a/src/test/ui/cross-crate/issue-64872/auxiliary/b_reexport_obj.rs
+++ b/tests/ui/cross-crate/issue-64872/auxiliary/b_reexport_obj.rs
diff --git a/src/test/ui/cross-crate/issue-64872/auxiliary/c_another_vtable_for_obj.rs b/tests/ui/cross-crate/issue-64872/auxiliary/c_another_vtable_for_obj.rs
index 611238f56..611238f56 100644
--- a/src/test/ui/cross-crate/issue-64872/auxiliary/c_another_vtable_for_obj.rs
+++ b/tests/ui/cross-crate/issue-64872/auxiliary/c_another_vtable_for_obj.rs
diff --git a/src/test/ui/cross-crate/issue-64872/auxiliary/d_chain_of_rlibs_and_dylibs.rs b/tests/ui/cross-crate/issue-64872/auxiliary/d_chain_of_rlibs_and_dylibs.rs
index 8d73f9b66..8d73f9b66 100644
--- a/src/test/ui/cross-crate/issue-64872/auxiliary/d_chain_of_rlibs_and_dylibs.rs
+++ b/tests/ui/cross-crate/issue-64872/auxiliary/d_chain_of_rlibs_and_dylibs.rs
diff --git a/src/test/ui/cross-crate/issue-64872/issue-64872.rs b/tests/ui/cross-crate/issue-64872/issue-64872.rs
index 20fe2053c..20fe2053c 100644
--- a/src/test/ui/cross-crate/issue-64872/issue-64872.rs
+++ b/tests/ui/cross-crate/issue-64872/issue-64872.rs
diff --git a/src/test/ui/cross-crate/moves-based-on-type-cross-crate.rs b/tests/ui/cross-crate/moves-based-on-type-cross-crate.rs
index 3881e3352..3881e3352 100644
--- a/src/test/ui/cross-crate/moves-based-on-type-cross-crate.rs
+++ b/tests/ui/cross-crate/moves-based-on-type-cross-crate.rs
diff --git a/src/test/ui/cross-crate/reexported-static-methods-cross-crate.rs b/tests/ui/cross-crate/reexported-static-methods-cross-crate.rs
index 8c70a1ce4..8c70a1ce4 100644
--- a/src/test/ui/cross-crate/reexported-static-methods-cross-crate.rs
+++ b/tests/ui/cross-crate/reexported-static-methods-cross-crate.rs
diff --git a/src/test/ui/cross-crate/static-array-across-crate.rs b/tests/ui/cross-crate/static-array-across-crate.rs
index 0b84e0e6a..0b84e0e6a 100644
--- a/src/test/ui/cross-crate/static-array-across-crate.rs
+++ b/tests/ui/cross-crate/static-array-across-crate.rs
diff --git a/src/test/ui/cross-crate/static-init.rs b/tests/ui/cross-crate/static-init.rs
index 2e893c5d9..2e893c5d9 100644
--- a/src/test/ui/cross-crate/static-init.rs
+++ b/tests/ui/cross-crate/static-init.rs
diff --git a/src/test/ui/cross-crate/xcrate-address-insignificant.rs b/tests/ui/cross-crate/xcrate-address-insignificant.rs
index 33c706506..33c706506 100644
--- a/src/test/ui/cross-crate/xcrate-address-insignificant.rs
+++ b/tests/ui/cross-crate/xcrate-address-insignificant.rs
diff --git a/src/test/ui/cross-crate/xcrate-associated-type-defaults.rs b/tests/ui/cross-crate/xcrate-associated-type-defaults.rs
index 0f3e077d1..0f3e077d1 100644
--- a/src/test/ui/cross-crate/xcrate-associated-type-defaults.rs
+++ b/tests/ui/cross-crate/xcrate-associated-type-defaults.rs
diff --git a/src/test/ui/cross-crate/xcrate-static-addresses.rs b/tests/ui/cross-crate/xcrate-static-addresses.rs
index 3c3397656..3c3397656 100644
--- a/src/test/ui/cross-crate/xcrate-static-addresses.rs
+++ b/tests/ui/cross-crate/xcrate-static-addresses.rs
diff --git a/src/test/ui/cross-crate/xcrate-trait-lifetime-param.rs b/tests/ui/cross-crate/xcrate-trait-lifetime-param.rs
index 1fd7eb878..1fd7eb878 100644
--- a/src/test/ui/cross-crate/xcrate-trait-lifetime-param.rs
+++ b/tests/ui/cross-crate/xcrate-trait-lifetime-param.rs
diff --git a/src/test/ui/cross-crate/xcrate_generic_fn_nested_return.rs b/tests/ui/cross-crate/xcrate_generic_fn_nested_return.rs
index 4593fec51..4593fec51 100644
--- a/src/test/ui/cross-crate/xcrate_generic_fn_nested_return.rs
+++ b/tests/ui/cross-crate/xcrate_generic_fn_nested_return.rs
diff --git a/src/test/ui/cross/cross-borrow-trait.rs b/tests/ui/cross/cross-borrow-trait.rs
index 180a75e3d..180a75e3d 100644
--- a/src/test/ui/cross/cross-borrow-trait.rs
+++ b/tests/ui/cross/cross-borrow-trait.rs
diff --git a/src/test/ui/cross/cross-borrow-trait.stderr b/tests/ui/cross/cross-borrow-trait.stderr
index 81f309eae..81f309eae 100644
--- a/src/test/ui/cross/cross-borrow-trait.stderr
+++ b/tests/ui/cross/cross-borrow-trait.stderr
diff --git a/src/test/ui/cross/cross-crate-macro-backtrace/auxiliary/extern_macro_crate.rs b/tests/ui/cross/cross-crate-macro-backtrace/auxiliary/extern_macro_crate.rs
index fbda3dbe9..fbda3dbe9 100644
--- a/src/test/ui/cross/cross-crate-macro-backtrace/auxiliary/extern_macro_crate.rs
+++ b/tests/ui/cross/cross-crate-macro-backtrace/auxiliary/extern_macro_crate.rs
diff --git a/src/test/ui/cross/cross-crate-macro-backtrace/main.rs b/tests/ui/cross/cross-crate-macro-backtrace/main.rs
index f7d4330ab..f7d4330ab 100644
--- a/src/test/ui/cross/cross-crate-macro-backtrace/main.rs
+++ b/tests/ui/cross/cross-crate-macro-backtrace/main.rs
diff --git a/src/test/ui/cross/cross-crate-macro-backtrace/main.stderr b/tests/ui/cross/cross-crate-macro-backtrace/main.stderr
index 5bd4ea97e..5bd4ea97e 100644
--- a/src/test/ui/cross/cross-crate-macro-backtrace/main.stderr
+++ b/tests/ui/cross/cross-crate-macro-backtrace/main.stderr
diff --git a/src/test/ui/cross/cross-file-errors/main.rs b/tests/ui/cross/cross-file-errors/main.rs
index 4219f892d..4219f892d 100644
--- a/src/test/ui/cross/cross-file-errors/main.rs
+++ b/tests/ui/cross/cross-file-errors/main.rs
diff --git a/src/test/ui/cross/cross-file-errors/main.stderr b/tests/ui/cross/cross-file-errors/main.stderr
index 293a300ed..293a300ed 100644
--- a/src/test/ui/cross/cross-file-errors/main.stderr
+++ b/tests/ui/cross/cross-file-errors/main.stderr
diff --git a/src/test/ui/cross/cross-file-errors/underscore.rs b/tests/ui/cross/cross-file-errors/underscore.rs
index 76e72a93f..76e72a93f 100644
--- a/src/test/ui/cross/cross-file-errors/underscore.rs
+++ b/tests/ui/cross/cross-file-errors/underscore.rs
diff --git a/src/test/ui/cross/cross-fn-cache-hole.rs b/tests/ui/cross/cross-fn-cache-hole.rs
index c38a5001a..c38a5001a 100644
--- a/src/test/ui/cross/cross-fn-cache-hole.rs
+++ b/tests/ui/cross/cross-fn-cache-hole.rs
diff --git a/src/test/ui/cross/cross-fn-cache-hole.stderr b/tests/ui/cross/cross-fn-cache-hole.stderr
index 7e15562b0..7e15562b0 100644
--- a/src/test/ui/cross/cross-fn-cache-hole.stderr
+++ b/tests/ui/cross/cross-fn-cache-hole.stderr
diff --git a/src/test/ui/custom-attribute-multisegment.rs b/tests/ui/custom-attribute-multisegment.rs
index 243492139..243492139 100644
--- a/src/test/ui/custom-attribute-multisegment.rs
+++ b/tests/ui/custom-attribute-multisegment.rs
diff --git a/src/test/ui/custom-attribute-multisegment.stderr b/tests/ui/custom-attribute-multisegment.stderr
index 57eca211e..57eca211e 100644
--- a/src/test/ui/custom-attribute-multisegment.stderr
+++ b/tests/ui/custom-attribute-multisegment.stderr
diff --git a/src/test/ui/custom-test-frameworks-simple.rs b/tests/ui/custom-test-frameworks-simple.rs
index aee0040ef..aee0040ef 100644
--- a/src/test/ui/custom-test-frameworks-simple.rs
+++ b/tests/ui/custom-test-frameworks-simple.rs
diff --git a/src/test/ui/custom_attribute.rs b/tests/ui/custom_attribute.rs
index 495718422..495718422 100644
--- a/src/test/ui/custom_attribute.rs
+++ b/tests/ui/custom_attribute.rs
diff --git a/src/test/ui/custom_attribute.stderr b/tests/ui/custom_attribute.stderr
index 4023892d2..4023892d2 100644
--- a/src/test/ui/custom_attribute.stderr
+++ b/tests/ui/custom_attribute.stderr
diff --git a/src/test/ui/custom_test_frameworks/auxiliary/dynamic_runner.rs b/tests/ui/custom_test_frameworks/auxiliary/dynamic_runner.rs
index a56e0b1f5..a56e0b1f5 100644
--- a/src/test/ui/custom_test_frameworks/auxiliary/dynamic_runner.rs
+++ b/tests/ui/custom_test_frameworks/auxiliary/dynamic_runner.rs
diff --git a/src/test/ui/custom_test_frameworks/auxiliary/example_runner.rs b/tests/ui/custom_test_frameworks/auxiliary/example_runner.rs
index dd68c0685..dd68c0685 100644
--- a/src/test/ui/custom_test_frameworks/auxiliary/example_runner.rs
+++ b/tests/ui/custom_test_frameworks/auxiliary/example_runner.rs
diff --git a/src/test/ui/custom_test_frameworks/dynamic.rs b/tests/ui/custom_test_frameworks/dynamic.rs
index 6766ec542..6766ec542 100644
--- a/src/test/ui/custom_test_frameworks/dynamic.rs
+++ b/tests/ui/custom_test_frameworks/dynamic.rs
diff --git a/src/test/ui/custom_test_frameworks/full.rs b/tests/ui/custom_test_frameworks/full.rs
index 8c8188268..8c8188268 100644
--- a/src/test/ui/custom_test_frameworks/full.rs
+++ b/tests/ui/custom_test_frameworks/full.rs
diff --git a/src/test/ui/custom_test_frameworks/mismatch.rs b/tests/ui/custom_test_frameworks/mismatch.rs
index ac850552b..ac850552b 100644
--- a/src/test/ui/custom_test_frameworks/mismatch.rs
+++ b/tests/ui/custom_test_frameworks/mismatch.rs
diff --git a/src/test/ui/custom_test_frameworks/mismatch.stderr b/tests/ui/custom_test_frameworks/mismatch.stderr
index 61061ae52..61061ae52 100644
--- a/src/test/ui/custom_test_frameworks/mismatch.stderr
+++ b/tests/ui/custom_test_frameworks/mismatch.stderr
diff --git a/src/test/ui/cycle-trait/cycle-trait-default-type-trait.rs b/tests/ui/cycle-trait/cycle-trait-default-type-trait.rs
index 6175b7df1..6175b7df1 100644
--- a/src/test/ui/cycle-trait/cycle-trait-default-type-trait.rs
+++ b/tests/ui/cycle-trait/cycle-trait-default-type-trait.rs
diff --git a/src/test/ui/cycle-trait/cycle-trait-default-type-trait.stderr b/tests/ui/cycle-trait/cycle-trait-default-type-trait.stderr
index 9d715f494..9d715f494 100644
--- a/src/test/ui/cycle-trait/cycle-trait-default-type-trait.stderr
+++ b/tests/ui/cycle-trait/cycle-trait-default-type-trait.stderr
diff --git a/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.rs b/tests/ui/cycle-trait/cycle-trait-supertrait-direct.rs
index e6ab2c790..e6ab2c790 100644
--- a/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.rs
+++ b/tests/ui/cycle-trait/cycle-trait-supertrait-direct.rs
diff --git a/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.stderr b/tests/ui/cycle-trait/cycle-trait-supertrait-direct.stderr
index f6ffcc4b5..f6ffcc4b5 100644
--- a/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.stderr
+++ b/tests/ui/cycle-trait/cycle-trait-supertrait-direct.stderr
diff --git a/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.rs b/tests/ui/cycle-trait/cycle-trait-supertrait-indirect.rs
index 9a72b65da..9a72b65da 100644
--- a/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.rs
+++ b/tests/ui/cycle-trait/cycle-trait-supertrait-indirect.rs
diff --git a/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.stderr b/tests/ui/cycle-trait/cycle-trait-supertrait-indirect.stderr
index 0a2284e0e..0a2284e0e 100644
--- a/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.stderr
+++ b/tests/ui/cycle-trait/cycle-trait-supertrait-indirect.stderr
diff --git a/src/test/ui/debuginfo/debuginfo-box-with-large-allocator.rs b/tests/ui/debuginfo/debuginfo-box-with-large-allocator.rs
index 761539227..761539227 100644
--- a/src/test/ui/debuginfo/debuginfo-box-with-large-allocator.rs
+++ b/tests/ui/debuginfo/debuginfo-box-with-large-allocator.rs
diff --git a/src/test/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs b/tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs
index ff764015d..ff764015d 100644
--- a/src/test/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs
+++ b/tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs
diff --git a/src/test/ui/debuginfo/debuginfo-type-name-layout-ice-94961-1.rs b/tests/ui/debuginfo/debuginfo-type-name-layout-ice-94961-1.rs
index 78bda2848..78bda2848 100644
--- a/src/test/ui/debuginfo/debuginfo-type-name-layout-ice-94961-1.rs
+++ b/tests/ui/debuginfo/debuginfo-type-name-layout-ice-94961-1.rs
diff --git a/tests/ui/debuginfo/debuginfo-type-name-layout-ice-94961-1.stderr b/tests/ui/debuginfo/debuginfo-type-name-layout-ice-94961-1.stderr
new file mode 100644
index 000000000..d5991bcf5
--- /dev/null
+++ b/tests/ui/debuginfo/debuginfo-type-name-layout-ice-94961-1.stderr
@@ -0,0 +1,4 @@
+error: values of the type `[u8; usize::MAX]` are too big for the current architecture
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/debuginfo/debuginfo-type-name-layout-ice-94961-2.rs b/tests/ui/debuginfo/debuginfo-type-name-layout-ice-94961-2.rs
index fdc088dc0..fdc088dc0 100644
--- a/src/test/ui/debuginfo/debuginfo-type-name-layout-ice-94961-2.rs
+++ b/tests/ui/debuginfo/debuginfo-type-name-layout-ice-94961-2.rs
diff --git a/tests/ui/debuginfo/debuginfo-type-name-layout-ice-94961-2.stderr b/tests/ui/debuginfo/debuginfo-type-name-layout-ice-94961-2.stderr
new file mode 100644
index 000000000..d5991bcf5
--- /dev/null
+++ b/tests/ui/debuginfo/debuginfo-type-name-layout-ice-94961-2.stderr
@@ -0,0 +1,4 @@
+error: values of the type `[u8; usize::MAX]` are too big for the current architecture
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/debuginfo/debuginfo_with_uninhabitable_field_and_unsized.rs b/tests/ui/debuginfo/debuginfo_with_uninhabitable_field_and_unsized.rs
index b3f22ecf5..b3f22ecf5 100644
--- a/src/test/ui/debuginfo/debuginfo_with_uninhabitable_field_and_unsized.rs
+++ b/tests/ui/debuginfo/debuginfo_with_uninhabitable_field_and_unsized.rs
diff --git a/tests/ui/debuginfo/issue-105386-debuginfo-ub.rs b/tests/ui/debuginfo/issue-105386-debuginfo-ub.rs
new file mode 100644
index 000000000..6c6eb5d4e
--- /dev/null
+++ b/tests/ui/debuginfo/issue-105386-debuginfo-ub.rs
@@ -0,0 +1,20 @@
+// run-pass
+// compile-flags: --edition 2021 -Copt-level=3 -Cdebuginfo=2 -Zmir-opt-level=3
+
+fn main() {
+    TranslatorI.visit_pre();
+}
+
+impl TranslatorI {
+    fn visit_pre(self) {
+        Some(())
+            .map(|_| self.flags())
+            .unwrap_or_else(|| self.flags());
+    }
+}
+
+struct TranslatorI;
+
+impl TranslatorI {
+    fn flags(&self) {}
+}
diff --git a/src/test/ui/debuginfo/late-bound-projection.rs b/tests/ui/debuginfo/late-bound-projection.rs
index 601807845..601807845 100644
--- a/src/test/ui/debuginfo/late-bound-projection.rs
+++ b/tests/ui/debuginfo/late-bound-projection.rs
diff --git a/src/test/ui/deduplicate-diagnostics.deduplicate.stderr b/tests/ui/deduplicate-diagnostics.deduplicate.stderr
index 5df2c687b..5df2c687b 100644
--- a/src/test/ui/deduplicate-diagnostics.deduplicate.stderr
+++ b/tests/ui/deduplicate-diagnostics.deduplicate.stderr
diff --git a/src/test/ui/deduplicate-diagnostics.duplicate.stderr b/tests/ui/deduplicate-diagnostics.duplicate.stderr
index cd4700c7a..cd4700c7a 100644
--- a/src/test/ui/deduplicate-diagnostics.duplicate.stderr
+++ b/tests/ui/deduplicate-diagnostics.duplicate.stderr
diff --git a/src/test/ui/deduplicate-diagnostics.rs b/tests/ui/deduplicate-diagnostics.rs
index 7d1c4f5f8..7d1c4f5f8 100644
--- a/src/test/ui/deduplicate-diagnostics.rs
+++ b/tests/ui/deduplicate-diagnostics.rs
diff --git a/src/test/ui/deep.rs b/tests/ui/deep.rs
index 2bb109c0e..2bb109c0e 100644
--- a/src/test/ui/deep.rs
+++ b/tests/ui/deep.rs
diff --git a/src/test/ui/default-method-parsing.rs b/tests/ui/default-method-parsing.rs
index 9ffb8d94a..9ffb8d94a 100644
--- a/src/test/ui/default-method-parsing.rs
+++ b/tests/ui/default-method-parsing.rs
diff --git a/src/test/ui/default-method-simple.rs b/tests/ui/default-method-simple.rs
index 6f7ae6a3e..6f7ae6a3e 100644
--- a/src/test/ui/default-method-simple.rs
+++ b/tests/ui/default-method-simple.rs
diff --git a/src/test/ui/defaults-well-formedness.rs b/tests/ui/defaults-well-formedness.rs
index 327589061..327589061 100644
--- a/src/test/ui/defaults-well-formedness.rs
+++ b/tests/ui/defaults-well-formedness.rs
diff --git a/src/test/ui/definition-reachable/auxiliary/field-method-macro.rs b/tests/ui/definition-reachable/auxiliary/field-method-macro.rs
index 30ba70bdf..30ba70bdf 100644
--- a/src/test/ui/definition-reachable/auxiliary/field-method-macro.rs
+++ b/tests/ui/definition-reachable/auxiliary/field-method-macro.rs
diff --git a/src/test/ui/definition-reachable/auxiliary/nested-fn-macro.rs b/tests/ui/definition-reachable/auxiliary/nested-fn-macro.rs
index a39e8c986..a39e8c986 100644
--- a/src/test/ui/definition-reachable/auxiliary/nested-fn-macro.rs
+++ b/tests/ui/definition-reachable/auxiliary/nested-fn-macro.rs
diff --git a/src/test/ui/definition-reachable/auxiliary/private-use-macro.rs b/tests/ui/definition-reachable/auxiliary/private-use-macro.rs
index 4f283d9c1..4f283d9c1 100644
--- a/src/test/ui/definition-reachable/auxiliary/private-use-macro.rs
+++ b/tests/ui/definition-reachable/auxiliary/private-use-macro.rs
diff --git a/src/test/ui/definition-reachable/field-method.rs b/tests/ui/definition-reachable/field-method.rs
index 60e895a2f..60e895a2f 100644
--- a/src/test/ui/definition-reachable/field-method.rs
+++ b/tests/ui/definition-reachable/field-method.rs
diff --git a/src/test/ui/definition-reachable/nested-fn.rs b/tests/ui/definition-reachable/nested-fn.rs
index b665b049f..b665b049f 100644
--- a/src/test/ui/definition-reachable/nested-fn.rs
+++ b/tests/ui/definition-reachable/nested-fn.rs
diff --git a/src/test/ui/definition-reachable/private-non-types.rs b/tests/ui/definition-reachable/private-non-types.rs
index a601dabcb..a601dabcb 100644
--- a/src/test/ui/definition-reachable/private-non-types.rs
+++ b/tests/ui/definition-reachable/private-non-types.rs
diff --git a/src/test/ui/definition-reachable/private-types.rs b/tests/ui/definition-reachable/private-types.rs
index 02c1224f4..02c1224f4 100644
--- a/src/test/ui/definition-reachable/private-types.rs
+++ b/tests/ui/definition-reachable/private-types.rs
diff --git a/src/test/ui/definition-reachable/private-use.rs b/tests/ui/definition-reachable/private-use.rs
index 02cff0475..02cff0475 100644
--- a/src/test/ui/definition-reachable/private-use.rs
+++ b/tests/ui/definition-reachable/private-use.rs
diff --git a/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.rs b/tests/ui/dep-graph/dep-graph-assoc-type-codegen.rs
index 978c19948..978c19948 100644
--- a/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.rs
+++ b/tests/ui/dep-graph/dep-graph-assoc-type-codegen.rs
diff --git a/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.stderr b/tests/ui/dep-graph/dep-graph-assoc-type-codegen.stderr
index cdc268cff..cdc268cff 100644
--- a/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.stderr
+++ b/tests/ui/dep-graph/dep-graph-assoc-type-codegen.stderr
diff --git a/src/test/ui/dep-graph/dep-graph-caller-callee.rs b/tests/ui/dep-graph/dep-graph-caller-callee.rs
index 4a3a8bb6b..4a3a8bb6b 100644
--- a/src/test/ui/dep-graph/dep-graph-caller-callee.rs
+++ b/tests/ui/dep-graph/dep-graph-caller-callee.rs
diff --git a/src/test/ui/dep-graph/dep-graph-caller-callee.stderr b/tests/ui/dep-graph/dep-graph-caller-callee.stderr
index 4d06dc7f3..4d06dc7f3 100644
--- a/src/test/ui/dep-graph/dep-graph-caller-callee.stderr
+++ b/tests/ui/dep-graph/dep-graph-caller-callee.stderr
diff --git a/src/test/ui/dep-graph/dep-graph-check-attr.rs b/tests/ui/dep-graph/dep-graph-check-attr.rs
index a45bf24f8..a45bf24f8 100644
--- a/src/test/ui/dep-graph/dep-graph-check-attr.rs
+++ b/tests/ui/dep-graph/dep-graph-check-attr.rs
diff --git a/src/test/ui/dep-graph/dep-graph-check-attr.stderr b/tests/ui/dep-graph/dep-graph-check-attr.stderr
index 46f4e4358..46f4e4358 100644
--- a/src/test/ui/dep-graph/dep-graph-check-attr.stderr
+++ b/tests/ui/dep-graph/dep-graph-check-attr.stderr
diff --git a/tests/ui/dep-graph/dep-graph-dump.rs b/tests/ui/dep-graph/dep-graph-dump.rs
new file mode 100644
index 000000000..cbc4def0e
--- /dev/null
+++ b/tests/ui/dep-graph/dep-graph-dump.rs
@@ -0,0 +1,6 @@
+// Test dump-dep-graph requires query-dep-graph enabled
+
+// incremental
+// compile-flags: -Z dump-dep-graph
+
+fn main() {}
diff --git a/tests/ui/dep-graph/dep-graph-dump.stderr b/tests/ui/dep-graph/dep-graph-dump.stderr
new file mode 100644
index 000000000..ea44b8bb0
--- /dev/null
+++ b/tests/ui/dep-graph/dep-graph-dump.stderr
@@ -0,0 +1,2 @@
+error: can't dump dependency graph without `-Z query-dep-graph`
+
diff --git a/src/test/ui/dep-graph/dep-graph-struct-signature.rs b/tests/ui/dep-graph/dep-graph-struct-signature.rs
index fcf9f6387..fcf9f6387 100644
--- a/src/test/ui/dep-graph/dep-graph-struct-signature.rs
+++ b/tests/ui/dep-graph/dep-graph-struct-signature.rs
diff --git a/src/test/ui/dep-graph/dep-graph-struct-signature.stderr b/tests/ui/dep-graph/dep-graph-struct-signature.stderr
index cfe1e62d9..cfe1e62d9 100644
--- a/src/test/ui/dep-graph/dep-graph-struct-signature.stderr
+++ b/tests/ui/dep-graph/dep-graph-struct-signature.stderr
diff --git a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs
index 5da8df570..5da8df570 100644
--- a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs
+++ b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs
diff --git a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr
index 6f56cbc8d..6f56cbc8d 100644
--- a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr
+++ b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr
diff --git a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.rs b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits.rs
index 590475fa0..590475fa0 100644
--- a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.rs
+++ b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits.rs
diff --git a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr
index 4e1043736..4e1043736 100644
--- a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr
+++ b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr
diff --git a/src/test/ui/dep-graph/dep-graph-trait-impl.rs b/tests/ui/dep-graph/dep-graph-trait-impl.rs
index 19002965b..19002965b 100644
--- a/src/test/ui/dep-graph/dep-graph-trait-impl.rs
+++ b/tests/ui/dep-graph/dep-graph-trait-impl.rs
diff --git a/src/test/ui/dep-graph/dep-graph-trait-impl.stderr b/tests/ui/dep-graph/dep-graph-trait-impl.stderr
index bfee6d5c8..bfee6d5c8 100644
--- a/src/test/ui/dep-graph/dep-graph-trait-impl.stderr
+++ b/tests/ui/dep-graph/dep-graph-trait-impl.stderr
diff --git a/src/test/ui/dep-graph/dep-graph-type-alias.rs b/tests/ui/dep-graph/dep-graph-type-alias.rs
index 0e1b3db19..0e1b3db19 100644
--- a/src/test/ui/dep-graph/dep-graph-type-alias.rs
+++ b/tests/ui/dep-graph/dep-graph-type-alias.rs
diff --git a/src/test/ui/dep-graph/dep-graph-type-alias.stderr b/tests/ui/dep-graph/dep-graph-type-alias.stderr
index 42ac803b2..42ac803b2 100644
--- a/src/test/ui/dep-graph/dep-graph-type-alias.stderr
+++ b/tests/ui/dep-graph/dep-graph-type-alias.stderr
diff --git a/src/test/ui/dep-graph/dep-graph-variance-alias.rs b/tests/ui/dep-graph/dep-graph-variance-alias.rs
index 008434696..008434696 100644
--- a/src/test/ui/dep-graph/dep-graph-variance-alias.rs
+++ b/tests/ui/dep-graph/dep-graph-variance-alias.rs
diff --git a/src/test/ui/dep-graph/dep-graph-variance-alias.stderr b/tests/ui/dep-graph/dep-graph-variance-alias.stderr
index 554ff455a..554ff455a 100644
--- a/src/test/ui/dep-graph/dep-graph-variance-alias.stderr
+++ b/tests/ui/dep-graph/dep-graph-variance-alias.stderr
diff --git a/src/test/ui/deprecation-in-force-unstable.rs b/tests/ui/deprecation-in-force-unstable.rs
index 4df9b802d..4df9b802d 100644
--- a/src/test/ui/deprecation-in-force-unstable.rs
+++ b/tests/ui/deprecation-in-force-unstable.rs
diff --git a/src/test/ui/deprecation/atomic_initializers.fixed b/tests/ui/deprecation/atomic_initializers.fixed
index 4fb0aeeb5..4fb0aeeb5 100644
--- a/src/test/ui/deprecation/atomic_initializers.fixed
+++ b/tests/ui/deprecation/atomic_initializers.fixed
diff --git a/src/test/ui/deprecation/atomic_initializers.rs b/tests/ui/deprecation/atomic_initializers.rs
index 1dcfd36d7..1dcfd36d7 100644
--- a/src/test/ui/deprecation/atomic_initializers.rs
+++ b/tests/ui/deprecation/atomic_initializers.rs
diff --git a/src/test/ui/deprecation/atomic_initializers.stderr b/tests/ui/deprecation/atomic_initializers.stderr
index 30fcc9de6..30fcc9de6 100644
--- a/src/test/ui/deprecation/atomic_initializers.stderr
+++ b/tests/ui/deprecation/atomic_initializers.stderr
diff --git a/src/test/ui/deprecation/auxiliary/deprecation-lint.rs b/tests/ui/deprecation/auxiliary/deprecation-lint.rs
index 948bf1cb7..948bf1cb7 100644
--- a/src/test/ui/deprecation/auxiliary/deprecation-lint.rs
+++ b/tests/ui/deprecation/auxiliary/deprecation-lint.rs
diff --git a/src/test/ui/deprecation/deprecated-macro_escape-inner.rs b/tests/ui/deprecation/deprecated-macro_escape-inner.rs
index e2957c422..e2957c422 100644
--- a/src/test/ui/deprecation/deprecated-macro_escape-inner.rs
+++ b/tests/ui/deprecation/deprecated-macro_escape-inner.rs
diff --git a/src/test/ui/deprecation/deprecated-macro_escape-inner.stderr b/tests/ui/deprecation/deprecated-macro_escape-inner.stderr
index 5b866bbbe..5b866bbbe 100644
--- a/src/test/ui/deprecation/deprecated-macro_escape-inner.stderr
+++ b/tests/ui/deprecation/deprecated-macro_escape-inner.stderr
diff --git a/src/test/ui/deprecation/deprecated-macro_escape.rs b/tests/ui/deprecation/deprecated-macro_escape.rs
index 4a89b4062..4a89b4062 100644
--- a/src/test/ui/deprecation/deprecated-macro_escape.rs
+++ b/tests/ui/deprecation/deprecated-macro_escape.rs
diff --git a/src/test/ui/deprecation/deprecated-macro_escape.stderr b/tests/ui/deprecation/deprecated-macro_escape.stderr
index 0bb8dc17e..0bb8dc17e 100644
--- a/src/test/ui/deprecation/deprecated-macro_escape.stderr
+++ b/tests/ui/deprecation/deprecated-macro_escape.stderr
diff --git a/src/test/ui/deprecation/deprecated_no_stack_check.rs b/tests/ui/deprecation/deprecated_no_stack_check.rs
index 8e1f5bbf0..8e1f5bbf0 100644
--- a/src/test/ui/deprecation/deprecated_no_stack_check.rs
+++ b/tests/ui/deprecation/deprecated_no_stack_check.rs
diff --git a/src/test/ui/deprecation/deprecated_no_stack_check.stderr b/tests/ui/deprecation/deprecated_no_stack_check.stderr
index 141664c10..141664c10 100644
--- a/src/test/ui/deprecation/deprecated_no_stack_check.stderr
+++ b/tests/ui/deprecation/deprecated_no_stack_check.stderr
diff --git a/src/test/ui/deprecation/deprecation-in-future.rs b/tests/ui/deprecation/deprecation-in-future.rs
index fb2a9a401..fb2a9a401 100644
--- a/src/test/ui/deprecation/deprecation-in-future.rs
+++ b/tests/ui/deprecation/deprecation-in-future.rs
diff --git a/src/test/ui/deprecation/deprecation-in-future.stderr b/tests/ui/deprecation/deprecation-in-future.stderr
index 99d1c7341..99d1c7341 100644
--- a/src/test/ui/deprecation/deprecation-in-future.stderr
+++ b/tests/ui/deprecation/deprecation-in-future.stderr
diff --git a/src/test/ui/deprecation/deprecation-lint-2.rs b/tests/ui/deprecation/deprecation-lint-2.rs
index 16ed6d4ec..16ed6d4ec 100644
--- a/src/test/ui/deprecation/deprecation-lint-2.rs
+++ b/tests/ui/deprecation/deprecation-lint-2.rs
diff --git a/src/test/ui/deprecation/deprecation-lint-2.stderr b/tests/ui/deprecation/deprecation-lint-2.stderr
index a73e56052..a73e56052 100644
--- a/src/test/ui/deprecation/deprecation-lint-2.stderr
+++ b/tests/ui/deprecation/deprecation-lint-2.stderr
diff --git a/src/test/ui/deprecation/deprecation-lint-3.rs b/tests/ui/deprecation/deprecation-lint-3.rs
index e6e1587da..e6e1587da 100644
--- a/src/test/ui/deprecation/deprecation-lint-3.rs
+++ b/tests/ui/deprecation/deprecation-lint-3.rs
diff --git a/src/test/ui/deprecation/deprecation-lint-3.stderr b/tests/ui/deprecation/deprecation-lint-3.stderr
index f499ff85e..f499ff85e 100644
--- a/src/test/ui/deprecation/deprecation-lint-3.stderr
+++ b/tests/ui/deprecation/deprecation-lint-3.stderr
diff --git a/src/test/ui/deprecation/deprecation-lint-nested.rs b/tests/ui/deprecation/deprecation-lint-nested.rs
index 589522cdb..589522cdb 100644
--- a/src/test/ui/deprecation/deprecation-lint-nested.rs
+++ b/tests/ui/deprecation/deprecation-lint-nested.rs
diff --git a/src/test/ui/deprecation/deprecation-lint-nested.stderr b/tests/ui/deprecation/deprecation-lint-nested.stderr
index 47607b8cc..47607b8cc 100644
--- a/src/test/ui/deprecation/deprecation-lint-nested.stderr
+++ b/tests/ui/deprecation/deprecation-lint-nested.stderr
diff --git a/src/test/ui/deprecation/deprecation-lint.rs b/tests/ui/deprecation/deprecation-lint.rs
index 0417e952e..0417e952e 100644
--- a/src/test/ui/deprecation/deprecation-lint.rs
+++ b/tests/ui/deprecation/deprecation-lint.rs
diff --git a/src/test/ui/deprecation/deprecation-lint.stderr b/tests/ui/deprecation/deprecation-lint.stderr
index 3842f8492..3842f8492 100644
--- a/src/test/ui/deprecation/deprecation-lint.stderr
+++ b/tests/ui/deprecation/deprecation-lint.stderr
diff --git a/src/test/ui/deprecation/deprecation-sanity.rs b/tests/ui/deprecation/deprecation-sanity.rs
index 9ea75b68f..9ea75b68f 100644
--- a/src/test/ui/deprecation/deprecation-sanity.rs
+++ b/tests/ui/deprecation/deprecation-sanity.rs
diff --git a/src/test/ui/deprecation/deprecation-sanity.stderr b/tests/ui/deprecation/deprecation-sanity.stderr
index 8b2b480d1..8b2b480d1 100644
--- a/src/test/ui/deprecation/deprecation-sanity.stderr
+++ b/tests/ui/deprecation/deprecation-sanity.stderr
diff --git a/src/test/ui/deprecation/derive_on_deprecated.rs b/tests/ui/deprecation/derive_on_deprecated.rs
index ac771ac81..ac771ac81 100644
--- a/src/test/ui/deprecation/derive_on_deprecated.rs
+++ b/tests/ui/deprecation/derive_on_deprecated.rs
diff --git a/src/test/ui/deprecation/derive_on_deprecated_forbidden.rs b/tests/ui/deprecation/derive_on_deprecated_forbidden.rs
index 3fd434664..3fd434664 100644
--- a/src/test/ui/deprecation/derive_on_deprecated_forbidden.rs
+++ b/tests/ui/deprecation/derive_on_deprecated_forbidden.rs
diff --git a/src/test/ui/deprecation/feature-gate-deprecated_suggestion.rs b/tests/ui/deprecation/feature-gate-deprecated_suggestion.rs
index a2d0023e3..a2d0023e3 100644
--- a/src/test/ui/deprecation/feature-gate-deprecated_suggestion.rs
+++ b/tests/ui/deprecation/feature-gate-deprecated_suggestion.rs
diff --git a/src/test/ui/deprecation/feature-gate-deprecated_suggestion.stderr b/tests/ui/deprecation/feature-gate-deprecated_suggestion.stderr
index 438ce3349..438ce3349 100644
--- a/src/test/ui/deprecation/feature-gate-deprecated_suggestion.stderr
+++ b/tests/ui/deprecation/feature-gate-deprecated_suggestion.stderr
diff --git a/src/test/ui/deprecation/invalid-literal.rs b/tests/ui/deprecation/invalid-literal.rs
index fbdfbd160..fbdfbd160 100644
--- a/src/test/ui/deprecation/invalid-literal.rs
+++ b/tests/ui/deprecation/invalid-literal.rs
diff --git a/src/test/ui/deprecation/invalid-literal.stderr b/tests/ui/deprecation/invalid-literal.stderr
index b56eedeb8..b56eedeb8 100644
--- a/src/test/ui/deprecation/invalid-literal.stderr
+++ b/tests/ui/deprecation/invalid-literal.stderr
diff --git a/src/test/ui/deprecation/issue-66340-deprecated-attr-non-meta-grammar.rs b/tests/ui/deprecation/issue-66340-deprecated-attr-non-meta-grammar.rs
index c0cde75d4..c0cde75d4 100644
--- a/src/test/ui/deprecation/issue-66340-deprecated-attr-non-meta-grammar.rs
+++ b/tests/ui/deprecation/issue-66340-deprecated-attr-non-meta-grammar.rs
diff --git a/src/test/ui/deprecation/issue-66340-deprecated-attr-non-meta-grammar.stderr b/tests/ui/deprecation/issue-66340-deprecated-attr-non-meta-grammar.stderr
index 24178faf8..24178faf8 100644
--- a/src/test/ui/deprecation/issue-66340-deprecated-attr-non-meta-grammar.stderr
+++ b/tests/ui/deprecation/issue-66340-deprecated-attr-non-meta-grammar.stderr
diff --git a/src/test/ui/deprecation/issue-84637-deprecated-associated-function.fixed b/tests/ui/deprecation/issue-84637-deprecated-associated-function.fixed
index 99a2b0961..99a2b0961 100644
--- a/src/test/ui/deprecation/issue-84637-deprecated-associated-function.fixed
+++ b/tests/ui/deprecation/issue-84637-deprecated-associated-function.fixed
diff --git a/src/test/ui/deprecation/issue-84637-deprecated-associated-function.rs b/tests/ui/deprecation/issue-84637-deprecated-associated-function.rs
index 62bf84aa3..62bf84aa3 100644
--- a/src/test/ui/deprecation/issue-84637-deprecated-associated-function.rs
+++ b/tests/ui/deprecation/issue-84637-deprecated-associated-function.rs
diff --git a/src/test/ui/deprecation/issue-84637-deprecated-associated-function.stderr b/tests/ui/deprecation/issue-84637-deprecated-associated-function.stderr
index 8d4529526..8d4529526 100644
--- a/src/test/ui/deprecation/issue-84637-deprecated-associated-function.stderr
+++ b/tests/ui/deprecation/issue-84637-deprecated-associated-function.stderr
diff --git a/src/test/ui/deprecation/staged-deprecation-in-future.rs b/tests/ui/deprecation/staged-deprecation-in-future.rs
index 87b15ec30..87b15ec30 100644
--- a/src/test/ui/deprecation/staged-deprecation-in-future.rs
+++ b/tests/ui/deprecation/staged-deprecation-in-future.rs
diff --git a/src/test/ui/deprecation/staged-deprecation-in-future.stderr b/tests/ui/deprecation/staged-deprecation-in-future.stderr
index 13d98044a..13d98044a 100644
--- a/src/test/ui/deprecation/staged-deprecation-in-future.stderr
+++ b/tests/ui/deprecation/staged-deprecation-in-future.stderr
diff --git a/src/test/ui/deprecation/suggestion.fixed b/tests/ui/deprecation/suggestion.fixed
index d9fa2b56e..d9fa2b56e 100644
--- a/src/test/ui/deprecation/suggestion.fixed
+++ b/tests/ui/deprecation/suggestion.fixed
diff --git a/src/test/ui/deprecation/suggestion.rs b/tests/ui/deprecation/suggestion.rs
index 9dc2eaf25..9dc2eaf25 100644
--- a/src/test/ui/deprecation/suggestion.rs
+++ b/tests/ui/deprecation/suggestion.rs
diff --git a/src/test/ui/deprecation/suggestion.stderr b/tests/ui/deprecation/suggestion.stderr
index c5f2fc091..c5f2fc091 100644
--- a/src/test/ui/deprecation/suggestion.stderr
+++ b/tests/ui/deprecation/suggestion.stderr
diff --git a/src/test/ui/deprecation/try-macro-suggestion.rs b/tests/ui/deprecation/try-macro-suggestion.rs
index 635ceac0b..635ceac0b 100644
--- a/src/test/ui/deprecation/try-macro-suggestion.rs
+++ b/tests/ui/deprecation/try-macro-suggestion.rs
diff --git a/src/test/ui/deprecation/try-macro-suggestion.stderr b/tests/ui/deprecation/try-macro-suggestion.stderr
index 63c8a6eef..63c8a6eef 100644
--- a/src/test/ui/deprecation/try-macro-suggestion.stderr
+++ b/tests/ui/deprecation/try-macro-suggestion.stderr
diff --git a/src/test/ui/deref-non-pointer.rs b/tests/ui/deref-non-pointer.rs
index 82ab355e6..82ab355e6 100644
--- a/src/test/ui/deref-non-pointer.rs
+++ b/tests/ui/deref-non-pointer.rs
diff --git a/src/test/ui/deref-non-pointer.stderr b/tests/ui/deref-non-pointer.stderr
index 1297e496b..1297e496b 100644
--- a/src/test/ui/deref-non-pointer.stderr
+++ b/tests/ui/deref-non-pointer.stderr
diff --git a/src/test/ui/deref-patterns/basic.rs b/tests/ui/deref-patterns/basic.rs
index 249716040..249716040 100644
--- a/src/test/ui/deref-patterns/basic.rs
+++ b/tests/ui/deref-patterns/basic.rs
diff --git a/src/test/ui/deref-patterns/basic.run.stdout b/tests/ui/deref-patterns/basic.run.stdout
index e50df0582..e50df0582 100644
--- a/src/test/ui/deref-patterns/basic.run.stdout
+++ b/tests/ui/deref-patterns/basic.run.stdout
diff --git a/src/test/ui/deref-patterns/default-infer.rs b/tests/ui/deref-patterns/default-infer.rs
index 050b84730..050b84730 100644
--- a/src/test/ui/deref-patterns/default-infer.rs
+++ b/tests/ui/deref-patterns/default-infer.rs
diff --git a/src/test/ui/deref-patterns/gate.rs b/tests/ui/deref-patterns/gate.rs
index ff50e30de..ff50e30de 100644
--- a/src/test/ui/deref-patterns/gate.rs
+++ b/tests/ui/deref-patterns/gate.rs
diff --git a/src/test/ui/deref-patterns/gate.stderr b/tests/ui/deref-patterns/gate.stderr
index 993468b5e..993468b5e 100644
--- a/src/test/ui/deref-patterns/gate.stderr
+++ b/tests/ui/deref-patterns/gate.stderr
diff --git a/src/test/ui/deref-patterns/refs.rs b/tests/ui/deref-patterns/refs.rs
index 97e260d27..97e260d27 100644
--- a/src/test/ui/deref-patterns/refs.rs
+++ b/tests/ui/deref-patterns/refs.rs
diff --git a/src/test/ui/deref-rc.rs b/tests/ui/deref-rc.rs
index 9b4c63b19..9b4c63b19 100644
--- a/src/test/ui/deref-rc.rs
+++ b/tests/ui/deref-rc.rs
diff --git a/src/test/ui/deref.rs b/tests/ui/deref.rs
index 0d4e08ad9..0d4e08ad9 100644
--- a/src/test/ui/deref.rs
+++ b/tests/ui/deref.rs
diff --git a/src/test/ui/derive-uninhabited-enum-38885.rs b/tests/ui/derive-uninhabited-enum-38885.rs
index 0089453ef..0089453ef 100644
--- a/src/test/ui/derive-uninhabited-enum-38885.rs
+++ b/tests/ui/derive-uninhabited-enum-38885.rs
diff --git a/src/test/ui/derive-uninhabited-enum-38885.stderr b/tests/ui/derive-uninhabited-enum-38885.stderr
index dcdf8f843..dcdf8f843 100644
--- a/src/test/ui/derive-uninhabited-enum-38885.stderr
+++ b/tests/ui/derive-uninhabited-enum-38885.stderr
diff --git a/src/test/ui/derived-errors/issue-30580.rs b/tests/ui/derived-errors/issue-30580.rs
index 6940fcf7c..6940fcf7c 100644
--- a/src/test/ui/derived-errors/issue-30580.rs
+++ b/tests/ui/derived-errors/issue-30580.rs
diff --git a/src/test/ui/derived-errors/issue-30580.stderr b/tests/ui/derived-errors/issue-30580.stderr
index 7bd0eaf77..7bd0eaf77 100644
--- a/src/test/ui/derived-errors/issue-30580.stderr
+++ b/tests/ui/derived-errors/issue-30580.stderr
diff --git a/src/test/ui/derived-errors/issue-31997-1.rs b/tests/ui/derived-errors/issue-31997-1.rs
index 90c1b498c..90c1b498c 100644
--- a/src/test/ui/derived-errors/issue-31997-1.rs
+++ b/tests/ui/derived-errors/issue-31997-1.rs
diff --git a/src/test/ui/derived-errors/issue-31997-1.stderr b/tests/ui/derived-errors/issue-31997-1.stderr
index 2f4aabf84..2f4aabf84 100644
--- a/src/test/ui/derived-errors/issue-31997-1.stderr
+++ b/tests/ui/derived-errors/issue-31997-1.stderr
diff --git a/src/test/ui/derived-errors/issue-31997.rs b/tests/ui/derived-errors/issue-31997.rs
index ff619313a..ff619313a 100644
--- a/src/test/ui/derived-errors/issue-31997.rs
+++ b/tests/ui/derived-errors/issue-31997.rs
diff --git a/src/test/ui/derived-errors/issue-31997.stderr b/tests/ui/derived-errors/issue-31997.stderr
index b53c0cda8..b53c0cda8 100644
--- a/src/test/ui/derived-errors/issue-31997.stderr
+++ b/tests/ui/derived-errors/issue-31997.stderr
diff --git a/src/test/ui/derives/auxiliary/derive-marker-tricky.rs b/tests/ui/derives/auxiliary/derive-marker-tricky.rs
index 70345351b..70345351b 100644
--- a/src/test/ui/derives/auxiliary/derive-marker-tricky.rs
+++ b/tests/ui/derives/auxiliary/derive-marker-tricky.rs
diff --git a/src/test/ui/derives/clone-debug-dead-code-in-the-same-struct.rs b/tests/ui/derives/clone-debug-dead-code-in-the-same-struct.rs
index 6ab1fb7b0..6ab1fb7b0 100644
--- a/src/test/ui/derives/clone-debug-dead-code-in-the-same-struct.rs
+++ b/tests/ui/derives/clone-debug-dead-code-in-the-same-struct.rs
diff --git a/src/test/ui/derives/clone-debug-dead-code-in-the-same-struct.stderr b/tests/ui/derives/clone-debug-dead-code-in-the-same-struct.stderr
index 7f4f78ceb..7f4f78ceb 100644
--- a/src/test/ui/derives/clone-debug-dead-code-in-the-same-struct.stderr
+++ b/tests/ui/derives/clone-debug-dead-code-in-the-same-struct.stderr
diff --git a/src/test/ui/derives/clone-debug-dead-code.rs b/tests/ui/derives/clone-debug-dead-code.rs
index ab49260c0..ab49260c0 100644
--- a/src/test/ui/derives/clone-debug-dead-code.rs
+++ b/tests/ui/derives/clone-debug-dead-code.rs
diff --git a/src/test/ui/derives/clone-debug-dead-code.stderr b/tests/ui/derives/clone-debug-dead-code.stderr
index 38be486e3..38be486e3 100644
--- a/src/test/ui/derives/clone-debug-dead-code.stderr
+++ b/tests/ui/derives/clone-debug-dead-code.stderr
diff --git a/src/test/ui/derives/derive-Debug-use-ufcs-struct.rs b/tests/ui/derives/derive-Debug-use-ufcs-struct.rs
index cb9dda841..cb9dda841 100644
--- a/src/test/ui/derives/derive-Debug-use-ufcs-struct.rs
+++ b/tests/ui/derives/derive-Debug-use-ufcs-struct.rs
diff --git a/src/test/ui/derives/derive-Debug-use-ufcs-tuple.rs b/tests/ui/derives/derive-Debug-use-ufcs-tuple.rs
index 5f786769f..5f786769f 100644
--- a/src/test/ui/derives/derive-Debug-use-ufcs-tuple.rs
+++ b/tests/ui/derives/derive-Debug-use-ufcs-tuple.rs
diff --git a/src/test/ui/derives/derive-assoc-type-not-impl.rs b/tests/ui/derives/derive-assoc-type-not-impl.rs
index 0f642d63a..0f642d63a 100644
--- a/src/test/ui/derives/derive-assoc-type-not-impl.rs
+++ b/tests/ui/derives/derive-assoc-type-not-impl.rs
diff --git a/src/test/ui/derives/derive-assoc-type-not-impl.stderr b/tests/ui/derives/derive-assoc-type-not-impl.stderr
index c4fddcf5f..91b334b41 100644
--- a/src/test/ui/derives/derive-assoc-type-not-impl.stderr
+++ b/tests/ui/derives/derive-assoc-type-not-impl.stderr
@@ -18,9 +18,6 @@ note: trait bound `NotClone: Clone` was not satisfied
    |
 LL | #[derive(Clone)]
    |          ^^^^^ unsatisfied trait bound introduced in this `derive` macro
-   = note: the following trait bounds were not satisfied:
-           `NotClone: Clone`
-           which is required by `Bar<NotClone>: Clone`
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `clone`, perhaps you need to implement it:
            candidate #1: `Clone`
diff --git a/src/test/ui/derives/derive-deadlock.rs b/tests/ui/derives/derive-deadlock.rs
index 0137b1e5b..0137b1e5b 100644
--- a/src/test/ui/derives/derive-deadlock.rs
+++ b/tests/ui/derives/derive-deadlock.rs
diff --git a/src/test/ui/derives/derive-deadlock.stderr b/tests/ui/derives/derive-deadlock.stderr
index 8d062491c..8d062491c 100644
--- a/src/test/ui/derives/derive-deadlock.stderr
+++ b/tests/ui/derives/derive-deadlock.stderr
diff --git a/src/test/ui/derives/derive-hygiene.rs b/tests/ui/derives/derive-hygiene.rs
index 4fa83c490..4fa83c490 100644
--- a/src/test/ui/derives/derive-hygiene.rs
+++ b/tests/ui/derives/derive-hygiene.rs
diff --git a/src/test/ui/derives/derive-macro-const-default.rs b/tests/ui/derives/derive-macro-const-default.rs
index ce80271d2..ce80271d2 100644
--- a/src/test/ui/derives/derive-macro-const-default.rs
+++ b/tests/ui/derives/derive-macro-const-default.rs
diff --git a/src/test/ui/derives/derive-marker-tricky.rs b/tests/ui/derives/derive-marker-tricky.rs
index 730ea4714..730ea4714 100644
--- a/src/test/ui/derives/derive-marker-tricky.rs
+++ b/tests/ui/derives/derive-marker-tricky.rs
diff --git a/src/test/ui/derives/derive-multiple-with-packed.rs b/tests/ui/derives/derive-multiple-with-packed.rs
index e762ee357..e762ee357 100644
--- a/src/test/ui/derives/derive-multiple-with-packed.rs
+++ b/tests/ui/derives/derive-multiple-with-packed.rs
diff --git a/src/test/ui/derives/derive-on-trait-item-or-impl-item.rs b/tests/ui/derives/derive-on-trait-item-or-impl-item.rs
index 7e579ec22..7e579ec22 100644
--- a/src/test/ui/derives/derive-on-trait-item-or-impl-item.rs
+++ b/tests/ui/derives/derive-on-trait-item-or-impl-item.rs
diff --git a/src/test/ui/derives/derive-on-trait-item-or-impl-item.stderr b/tests/ui/derives/derive-on-trait-item-or-impl-item.stderr
index 1fd97bdd5..1fd97bdd5 100644
--- a/src/test/ui/derives/derive-on-trait-item-or-impl-item.stderr
+++ b/tests/ui/derives/derive-on-trait-item-or-impl-item.stderr
diff --git a/src/test/ui/derives/derive-partial-ord.rs b/tests/ui/derives/derive-partial-ord.rs
index 9078a7ffa..9078a7ffa 100644
--- a/src/test/ui/derives/derive-partial-ord.rs
+++ b/tests/ui/derives/derive-partial-ord.rs
diff --git a/src/test/ui/derives/derive-renamed.rs b/tests/ui/derives/derive-renamed.rs
index d310e5806..d310e5806 100644
--- a/src/test/ui/derives/derive-renamed.rs
+++ b/tests/ui/derives/derive-renamed.rs
diff --git a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.rs b/tests/ui/derives/derives-span-Clone-enum-struct-variant.rs
index b556d4424..b556d4424 100644
--- a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-Clone-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr b/tests/ui/derives/derives-span-Clone-enum-struct-variant.stderr
index 7326324b0..7326324b0 100644
--- a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-Clone-enum-struct-variant.stderr
diff --git a/src/test/ui/derives/derives-span-Clone-enum.rs b/tests/ui/derives/derives-span-Clone-enum.rs
index 9bb4f486c..9bb4f486c 100644
--- a/src/test/ui/derives/derives-span-Clone-enum.rs
+++ b/tests/ui/derives/derives-span-Clone-enum.rs
diff --git a/src/test/ui/derives/derives-span-Clone-enum.stderr b/tests/ui/derives/derives-span-Clone-enum.stderr
index 229a4f7d9..229a4f7d9 100644
--- a/src/test/ui/derives/derives-span-Clone-enum.stderr
+++ b/tests/ui/derives/derives-span-Clone-enum.stderr
diff --git a/src/test/ui/derives/derives-span-Clone-struct.rs b/tests/ui/derives/derives-span-Clone-struct.rs
index f151636f8..f151636f8 100644
--- a/src/test/ui/derives/derives-span-Clone-struct.rs
+++ b/tests/ui/derives/derives-span-Clone-struct.rs
diff --git a/src/test/ui/derives/derives-span-Clone-struct.stderr b/tests/ui/derives/derives-span-Clone-struct.stderr
index 96bad9eda..96bad9eda 100644
--- a/src/test/ui/derives/derives-span-Clone-struct.stderr
+++ b/tests/ui/derives/derives-span-Clone-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Clone-tuple-struct.rs b/tests/ui/derives/derives-span-Clone-tuple-struct.rs
index 7a6288532..7a6288532 100644
--- a/src/test/ui/derives/derives-span-Clone-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-Clone-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-Clone-tuple-struct.stderr b/tests/ui/derives/derives-span-Clone-tuple-struct.stderr
index b61341e57..b61341e57 100644
--- a/src/test/ui/derives/derives-span-Clone-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-Clone-tuple-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.rs b/tests/ui/derives/derives-span-Debug-enum-struct-variant.rs
index 949597bc8..949597bc8 100644
--- a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-Debug-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr b/tests/ui/derives/derives-span-Debug-enum-struct-variant.stderr
index 58a64a4f5..58a64a4f5 100644
--- a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-Debug-enum-struct-variant.stderr
diff --git a/src/test/ui/derives/derives-span-Debug-enum.rs b/tests/ui/derives/derives-span-Debug-enum.rs
index b2a39708c..b2a39708c 100644
--- a/src/test/ui/derives/derives-span-Debug-enum.rs
+++ b/tests/ui/derives/derives-span-Debug-enum.rs
diff --git a/src/test/ui/derives/derives-span-Debug-enum.stderr b/tests/ui/derives/derives-span-Debug-enum.stderr
index e9bb5f960..e9bb5f960 100644
--- a/src/test/ui/derives/derives-span-Debug-enum.stderr
+++ b/tests/ui/derives/derives-span-Debug-enum.stderr
diff --git a/src/test/ui/derives/derives-span-Debug-struct.rs b/tests/ui/derives/derives-span-Debug-struct.rs
index cf91c9436..cf91c9436 100644
--- a/src/test/ui/derives/derives-span-Debug-struct.rs
+++ b/tests/ui/derives/derives-span-Debug-struct.rs
diff --git a/src/test/ui/derives/derives-span-Debug-struct.stderr b/tests/ui/derives/derives-span-Debug-struct.stderr
index 0a117c060..0a117c060 100644
--- a/src/test/ui/derives/derives-span-Debug-struct.stderr
+++ b/tests/ui/derives/derives-span-Debug-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Debug-tuple-struct.rs b/tests/ui/derives/derives-span-Debug-tuple-struct.rs
index cea973c91..cea973c91 100644
--- a/src/test/ui/derives/derives-span-Debug-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-Debug-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-Debug-tuple-struct.stderr b/tests/ui/derives/derives-span-Debug-tuple-struct.stderr
index f2e90a418..f2e90a418 100644
--- a/src/test/ui/derives/derives-span-Debug-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-Debug-tuple-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Default-struct.rs b/tests/ui/derives/derives-span-Default-struct.rs
index 71fd5829e..71fd5829e 100644
--- a/src/test/ui/derives/derives-span-Default-struct.rs
+++ b/tests/ui/derives/derives-span-Default-struct.rs
diff --git a/src/test/ui/derives/derives-span-Default-struct.stderr b/tests/ui/derives/derives-span-Default-struct.stderr
index d4affd535..d4affd535 100644
--- a/src/test/ui/derives/derives-span-Default-struct.stderr
+++ b/tests/ui/derives/derives-span-Default-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Default-tuple-struct.rs b/tests/ui/derives/derives-span-Default-tuple-struct.rs
index 463f7d230..463f7d230 100644
--- a/src/test/ui/derives/derives-span-Default-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-Default-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-Default-tuple-struct.stderr b/tests/ui/derives/derives-span-Default-tuple-struct.stderr
index 129351f59..129351f59 100644
--- a/src/test/ui/derives/derives-span-Default-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-Default-tuple-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.rs b/tests/ui/derives/derives-span-Eq-enum-struct-variant.rs
index d2dab8687..d2dab8687 100644
--- a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-Eq-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr b/tests/ui/derives/derives-span-Eq-enum-struct-variant.stderr
index e3fb234b9..2be69a30b 100644
--- a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-Eq-enum-struct-variant.stderr
@@ -9,9 +9,6 @@ LL |      x: Error
    |
 note: required by a bound in `AssertParamIsEq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub struct AssertParamIsEq<T: Eq + ?Sized> {
-   |                               ^^ required by this bound in `AssertParamIsEq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `Error` with `#[derive(Eq)]`
    |
diff --git a/src/test/ui/derives/derives-span-Eq-enum.rs b/tests/ui/derives/derives-span-Eq-enum.rs
index c6c0d4321..c6c0d4321 100644
--- a/src/test/ui/derives/derives-span-Eq-enum.rs
+++ b/tests/ui/derives/derives-span-Eq-enum.rs
diff --git a/src/test/ui/derives/derives-span-Eq-enum.stderr b/tests/ui/derives/derives-span-Eq-enum.stderr
index 4e10c3f69..4f4f821cc 100644
--- a/src/test/ui/derives/derives-span-Eq-enum.stderr
+++ b/tests/ui/derives/derives-span-Eq-enum.stderr
@@ -9,9 +9,6 @@ LL |      Error
    |
 note: required by a bound in `AssertParamIsEq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub struct AssertParamIsEq<T: Eq + ?Sized> {
-   |                               ^^ required by this bound in `AssertParamIsEq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `Error` with `#[derive(Eq)]`
    |
diff --git a/src/test/ui/derives/derives-span-Eq-struct.rs b/tests/ui/derives/derives-span-Eq-struct.rs
index df3100398..df3100398 100644
--- a/src/test/ui/derives/derives-span-Eq-struct.rs
+++ b/tests/ui/derives/derives-span-Eq-struct.rs
diff --git a/src/test/ui/derives/derives-span-Eq-struct.stderr b/tests/ui/derives/derives-span-Eq-struct.stderr
index bfdab052a..f15659c3e 100644
--- a/src/test/ui/derives/derives-span-Eq-struct.stderr
+++ b/tests/ui/derives/derives-span-Eq-struct.stderr
@@ -9,9 +9,6 @@ LL |     x: Error
    |
 note: required by a bound in `AssertParamIsEq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub struct AssertParamIsEq<T: Eq + ?Sized> {
-   |                               ^^ required by this bound in `AssertParamIsEq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `Error` with `#[derive(Eq)]`
    |
diff --git a/src/test/ui/derives/derives-span-Eq-tuple-struct.rs b/tests/ui/derives/derives-span-Eq-tuple-struct.rs
index abf6526b9..abf6526b9 100644
--- a/src/test/ui/derives/derives-span-Eq-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-Eq-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-Eq-tuple-struct.stderr b/tests/ui/derives/derives-span-Eq-tuple-struct.stderr
index 26b8be343..4e5659b35 100644
--- a/src/test/ui/derives/derives-span-Eq-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-Eq-tuple-struct.stderr
@@ -9,9 +9,6 @@ LL |     Error
    |
 note: required by a bound in `AssertParamIsEq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub struct AssertParamIsEq<T: Eq + ?Sized> {
-   |                               ^^ required by this bound in `AssertParamIsEq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `Error` with `#[derive(Eq)]`
    |
diff --git a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.rs b/tests/ui/derives/derives-span-Hash-enum-struct-variant.rs
index 3018a7b6d..3018a7b6d 100644
--- a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-Hash-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr b/tests/ui/derives/derives-span-Hash-enum-struct-variant.stderr
index fe5e0e96a..fe5e0e96a 100644
--- a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-Hash-enum-struct-variant.stderr
diff --git a/src/test/ui/derives/derives-span-Hash-enum.rs b/tests/ui/derives/derives-span-Hash-enum.rs
index 8ce7df18f..8ce7df18f 100644
--- a/src/test/ui/derives/derives-span-Hash-enum.rs
+++ b/tests/ui/derives/derives-span-Hash-enum.rs
diff --git a/src/test/ui/derives/derives-span-Hash-enum.stderr b/tests/ui/derives/derives-span-Hash-enum.stderr
index 99785b87c..99785b87c 100644
--- a/src/test/ui/derives/derives-span-Hash-enum.stderr
+++ b/tests/ui/derives/derives-span-Hash-enum.stderr
diff --git a/src/test/ui/derives/derives-span-Hash-struct.rs b/tests/ui/derives/derives-span-Hash-struct.rs
index fa5e2af6b..fa5e2af6b 100644
--- a/src/test/ui/derives/derives-span-Hash-struct.rs
+++ b/tests/ui/derives/derives-span-Hash-struct.rs
diff --git a/src/test/ui/derives/derives-span-Hash-struct.stderr b/tests/ui/derives/derives-span-Hash-struct.stderr
index 4db83dd13..4db83dd13 100644
--- a/src/test/ui/derives/derives-span-Hash-struct.stderr
+++ b/tests/ui/derives/derives-span-Hash-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Hash-tuple-struct.rs b/tests/ui/derives/derives-span-Hash-tuple-struct.rs
index 3822bce14..3822bce14 100644
--- a/src/test/ui/derives/derives-span-Hash-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-Hash-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr b/tests/ui/derives/derives-span-Hash-tuple-struct.stderr
index 8660c97e6..8660c97e6 100644
--- a/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-Hash-tuple-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.rs b/tests/ui/derives/derives-span-Ord-enum-struct-variant.rs
index 62355cc2d..62355cc2d 100644
--- a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-Ord-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr b/tests/ui/derives/derives-span-Ord-enum-struct-variant.stderr
index 6e48332c2..6e48332c2 100644
--- a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-Ord-enum-struct-variant.stderr
diff --git a/src/test/ui/derives/derives-span-Ord-enum.rs b/tests/ui/derives/derives-span-Ord-enum.rs
index 72738931d..72738931d 100644
--- a/src/test/ui/derives/derives-span-Ord-enum.rs
+++ b/tests/ui/derives/derives-span-Ord-enum.rs
diff --git a/src/test/ui/derives/derives-span-Ord-enum.stderr b/tests/ui/derives/derives-span-Ord-enum.stderr
index b05cf0a05..b05cf0a05 100644
--- a/src/test/ui/derives/derives-span-Ord-enum.stderr
+++ b/tests/ui/derives/derives-span-Ord-enum.stderr
diff --git a/src/test/ui/derives/derives-span-Ord-struct.rs b/tests/ui/derives/derives-span-Ord-struct.rs
index 53d4c2c22..53d4c2c22 100644
--- a/src/test/ui/derives/derives-span-Ord-struct.rs
+++ b/tests/ui/derives/derives-span-Ord-struct.rs
diff --git a/src/test/ui/derives/derives-span-Ord-struct.stderr b/tests/ui/derives/derives-span-Ord-struct.stderr
index c4def34a8..c4def34a8 100644
--- a/src/test/ui/derives/derives-span-Ord-struct.stderr
+++ b/tests/ui/derives/derives-span-Ord-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Ord-tuple-struct.rs b/tests/ui/derives/derives-span-Ord-tuple-struct.rs
index 4e09c2709..4e09c2709 100644
--- a/src/test/ui/derives/derives-span-Ord-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-Ord-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-Ord-tuple-struct.stderr b/tests/ui/derives/derives-span-Ord-tuple-struct.stderr
index a3b288d0f..a3b288d0f 100644
--- a/src/test/ui/derives/derives-span-Ord-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-Ord-tuple-struct.stderr
diff --git a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.rs b/tests/ui/derives/derives-span-PartialEq-enum-struct-variant.rs
index 67a27729d..67a27729d 100644
--- a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-PartialEq-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr b/tests/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr
index 9953154fd..9953154fd 100644
--- a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr
diff --git a/src/test/ui/derives/derives-span-PartialEq-enum.rs b/tests/ui/derives/derives-span-PartialEq-enum.rs
index 0becc7e0d..0becc7e0d 100644
--- a/src/test/ui/derives/derives-span-PartialEq-enum.rs
+++ b/tests/ui/derives/derives-span-PartialEq-enum.rs
diff --git a/src/test/ui/derives/derives-span-PartialEq-enum.stderr b/tests/ui/derives/derives-span-PartialEq-enum.stderr
index 7c1304523..7c1304523 100644
--- a/src/test/ui/derives/derives-span-PartialEq-enum.stderr
+++ b/tests/ui/derives/derives-span-PartialEq-enum.stderr
diff --git a/src/test/ui/derives/derives-span-PartialEq-struct.rs b/tests/ui/derives/derives-span-PartialEq-struct.rs
index c92ef5fad..c92ef5fad 100644
--- a/src/test/ui/derives/derives-span-PartialEq-struct.rs
+++ b/tests/ui/derives/derives-span-PartialEq-struct.rs
diff --git a/src/test/ui/derives/derives-span-PartialEq-struct.stderr b/tests/ui/derives/derives-span-PartialEq-struct.stderr
index ba3d6ced3..ba3d6ced3 100644
--- a/src/test/ui/derives/derives-span-PartialEq-struct.stderr
+++ b/tests/ui/derives/derives-span-PartialEq-struct.stderr
diff --git a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.rs b/tests/ui/derives/derives-span-PartialEq-tuple-struct.rs
index 10ac347aa..10ac347aa 100644
--- a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-PartialEq-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr b/tests/ui/derives/derives-span-PartialEq-tuple-struct.stderr
index ab0b56a9e..ab0b56a9e 100644
--- a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-PartialEq-tuple-struct.stderr
diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs b/tests/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs
index a769c1376..a769c1376 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr b/tests/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr
index 2d19aaf68..2d19aaf68 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr
diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum.rs b/tests/ui/derives/derives-span-PartialOrd-enum.rs
index 4f0d794e4..4f0d794e4 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-enum.rs
+++ b/tests/ui/derives/derives-span-PartialOrd-enum.rs
diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum.stderr b/tests/ui/derives/derives-span-PartialOrd-enum.stderr
index dfbb8060f..dfbb8060f 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-enum.stderr
+++ b/tests/ui/derives/derives-span-PartialOrd-enum.stderr
diff --git a/src/test/ui/derives/derives-span-PartialOrd-struct.rs b/tests/ui/derives/derives-span-PartialOrd-struct.rs
index da857c674..da857c674 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-struct.rs
+++ b/tests/ui/derives/derives-span-PartialOrd-struct.rs
diff --git a/src/test/ui/derives/derives-span-PartialOrd-struct.stderr b/tests/ui/derives/derives-span-PartialOrd-struct.stderr
index ba63d86e8..ba63d86e8 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-struct.stderr
+++ b/tests/ui/derives/derives-span-PartialOrd-struct.stderr
diff --git a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.rs b/tests/ui/derives/derives-span-PartialOrd-tuple-struct.rs
index 61d507670..61d507670 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-PartialOrd-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr b/tests/ui/derives/derives-span-PartialOrd-tuple-struct.stderr
index 7686ed806..7686ed806 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-PartialOrd-tuple-struct.stderr
diff --git a/src/test/ui/derives/deriving-bounds.rs b/tests/ui/derives/deriving-bounds.rs
index 95d440420..95d440420 100644
--- a/src/test/ui/derives/deriving-bounds.rs
+++ b/tests/ui/derives/deriving-bounds.rs
diff --git a/src/test/ui/derives/deriving-bounds.stderr b/tests/ui/derives/deriving-bounds.stderr
index 74ca37287..74ca37287 100644
--- a/src/test/ui/derives/deriving-bounds.stderr
+++ b/tests/ui/derives/deriving-bounds.stderr
diff --git a/src/test/ui/derives/deriving-copyclone.rs b/tests/ui/derives/deriving-copyclone.rs
index 06b3157a7..06b3157a7 100644
--- a/src/test/ui/derives/deriving-copyclone.rs
+++ b/tests/ui/derives/deriving-copyclone.rs
diff --git a/src/test/ui/derives/deriving-copyclone.stderr b/tests/ui/derives/deriving-copyclone.stderr
index 80e2dd7fe..9c4ca01ff 100644
--- a/src/test/ui/derives/deriving-copyclone.stderr
+++ b/tests/ui/derives/deriving-copyclone.stderr
@@ -10,7 +10,7 @@ note: required for `B<C>` to implement `Copy`
   --> $DIR/deriving-copyclone.rs:9:10
    |
 LL | #[derive(Copy, Clone)]
-   |          ^^^^
+   |          ^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `is_copy`
   --> $DIR/deriving-copyclone.rs:18:15
    |
@@ -34,7 +34,7 @@ note: required for `B<C>` to implement `Clone`
   --> $DIR/deriving-copyclone.rs:9:16
    |
 LL | #[derive(Copy, Clone)]
-   |                ^^^^^
+   |                ^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `is_clone`
   --> $DIR/deriving-copyclone.rs:19:16
    |
@@ -58,7 +58,7 @@ note: required for `B<D>` to implement `Copy`
   --> $DIR/deriving-copyclone.rs:9:10
    |
 LL | #[derive(Copy, Clone)]
-   |          ^^^^
+   |          ^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `is_copy`
   --> $DIR/deriving-copyclone.rs:18:15
    |
diff --git a/src/test/ui/derives/deriving-meta-empty-trait-list.rs b/tests/ui/derives/deriving-meta-empty-trait-list.rs
index 0306ce717..0306ce717 100644
--- a/src/test/ui/derives/deriving-meta-empty-trait-list.rs
+++ b/tests/ui/derives/deriving-meta-empty-trait-list.rs
diff --git a/src/test/ui/derives/deriving-meta-unknown-trait.rs b/tests/ui/derives/deriving-meta-unknown-trait.rs
index 6463a7664..6463a7664 100644
--- a/src/test/ui/derives/deriving-meta-unknown-trait.rs
+++ b/tests/ui/derives/deriving-meta-unknown-trait.rs
diff --git a/tests/ui/derives/deriving-meta-unknown-trait.stderr b/tests/ui/derives/deriving-meta-unknown-trait.stderr
new file mode 100644
index 000000000..053d34f68
--- /dev/null
+++ b/tests/ui/derives/deriving-meta-unknown-trait.stderr
@@ -0,0 +1,20 @@
+error: cannot find derive macro `Eqr` in this scope
+  --> $DIR/deriving-meta-unknown-trait.rs:1:10
+   |
+LL | #[derive(Eqr)]
+   |          ^^^ help: a derive macro with a similar name exists: `Eq`
+  --> $SRC_DIR/core/src/cmp.rs:LL:COL
+   |
+   = note: similarly named derive macro `Eq` defined here
+
+error: cannot find derive macro `Eqr` in this scope
+  --> $DIR/deriving-meta-unknown-trait.rs:1:10
+   |
+LL | #[derive(Eqr)]
+   |          ^^^ help: a derive macro with a similar name exists: `Eq`
+  --> $SRC_DIR/core/src/cmp.rs:LL:COL
+   |
+   = note: similarly named derive macro `Eq` defined here
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/derives/deriving-no-inner-impl-error-message.rs b/tests/ui/derives/deriving-no-inner-impl-error-message.rs
index b3ce31bf0..b3ce31bf0 100644
--- a/src/test/ui/derives/deriving-no-inner-impl-error-message.rs
+++ b/tests/ui/derives/deriving-no-inner-impl-error-message.rs
diff --git a/src/test/ui/derives/deriving-no-inner-impl-error-message.stderr b/tests/ui/derives/deriving-no-inner-impl-error-message.stderr
index ef8c44caa..ef8c44caa 100644
--- a/src/test/ui/derives/deriving-no-inner-impl-error-message.stderr
+++ b/tests/ui/derives/deriving-no-inner-impl-error-message.stderr
diff --git a/src/test/ui/derives/deriving-non-type.rs b/tests/ui/derives/deriving-non-type.rs
index 9afffa900..9afffa900 100644
--- a/src/test/ui/derives/deriving-non-type.rs
+++ b/tests/ui/derives/deriving-non-type.rs
diff --git a/src/test/ui/derives/deriving-non-type.stderr b/tests/ui/derives/deriving-non-type.stderr
index ef7ef54d1..ef7ef54d1 100644
--- a/src/test/ui/derives/deriving-non-type.stderr
+++ b/tests/ui/derives/deriving-non-type.stderr
diff --git a/src/test/ui/derives/deriving-primitive.rs b/tests/ui/derives/deriving-primitive.rs
index 1173eca64..1173eca64 100644
--- a/src/test/ui/derives/deriving-primitive.rs
+++ b/tests/ui/derives/deriving-primitive.rs
diff --git a/src/test/ui/derives/deriving-primitive.stderr b/tests/ui/derives/deriving-primitive.stderr
index ca64c9ee7..ca64c9ee7 100644
--- a/src/test/ui/derives/deriving-primitive.stderr
+++ b/tests/ui/derives/deriving-primitive.stderr
diff --git a/src/test/ui/derives/deriving-with-repr-packed.rs b/tests/ui/derives/deriving-with-repr-packed.rs
index 3884e3977..3884e3977 100644
--- a/src/test/ui/derives/deriving-with-repr-packed.rs
+++ b/tests/ui/derives/deriving-with-repr-packed.rs
diff --git a/src/test/ui/derives/deriving-with-repr-packed.stderr b/tests/ui/derives/deriving-with-repr-packed.stderr
index 0ad800c39..0ad800c39 100644
--- a/src/test/ui/derives/deriving-with-repr-packed.stderr
+++ b/tests/ui/derives/deriving-with-repr-packed.stderr
diff --git a/src/test/ui/derives/issue-36617.rs b/tests/ui/derives/issue-36617.rs
index 08f293d2e..08f293d2e 100644
--- a/src/test/ui/derives/issue-36617.rs
+++ b/tests/ui/derives/issue-36617.rs
diff --git a/src/test/ui/derives/issue-36617.stderr b/tests/ui/derives/issue-36617.stderr
index 9cc0a29b0..9cc0a29b0 100644
--- a/src/test/ui/derives/issue-36617.stderr
+++ b/tests/ui/derives/issue-36617.stderr
diff --git a/src/test/ui/derives/issue-43023.rs b/tests/ui/derives/issue-43023.rs
index c0208e680..c0208e680 100644
--- a/src/test/ui/derives/issue-43023.rs
+++ b/tests/ui/derives/issue-43023.rs
diff --git a/src/test/ui/derives/issue-43023.stderr b/tests/ui/derives/issue-43023.stderr
index 007eb2595..007eb2595 100644
--- a/src/test/ui/derives/issue-43023.stderr
+++ b/tests/ui/derives/issue-43023.stderr
diff --git a/src/test/ui/derives/issue-91492.rs b/tests/ui/derives/issue-91492.rs
index df792f118..df792f118 100644
--- a/src/test/ui/derives/issue-91492.rs
+++ b/tests/ui/derives/issue-91492.rs
diff --git a/src/test/ui/derives/issue-91492.stderr b/tests/ui/derives/issue-91492.stderr
index fbd48336d..cee30ac50 100644
--- a/src/test/ui/derives/issue-91492.stderr
+++ b/tests/ui/derives/issue-91492.stderr
@@ -42,8 +42,13 @@ LL | struct Object<T, A>(T, A);
 LL |     foo.use_clone();
    |         ^^^^^^^^^ method cannot be called on `Object<NoDerives, SomeDerives>` due to unsatisfied trait bounds
    |
-   = note: the following trait bounds were not satisfied:
-           `NoDerives: Clone`
+note: trait bound `NoDerives: Clone` was not satisfied
+  --> $DIR/issue-91492.rs:18:9
+   |
+LL | impl<T: Clone, A: Default> Object<T, A> {
+   |         ^^^^^              ------------
+   |         |
+   |         unsatisfied trait bound introduced here
 help: consider annotating `NoDerives` with `#[derive(Clone)]`
    |
 LL | #[derive(Clone)]
diff --git a/src/test/ui/derives/issue-91550.rs b/tests/ui/derives/issue-91550.rs
index 56fd5ffa8..56fd5ffa8 100644
--- a/src/test/ui/derives/issue-91550.rs
+++ b/tests/ui/derives/issue-91550.rs
diff --git a/tests/ui/derives/issue-91550.stderr b/tests/ui/derives/issue-91550.stderr
new file mode 100644
index 000000000..af03f0e5e
--- /dev/null
+++ b/tests/ui/derives/issue-91550.stderr
@@ -0,0 +1,131 @@
+error[E0599]: the method `insert` exists for struct `HashSet<Value>`, but its trait bounds were not satisfied
+  --> $DIR/issue-91550.rs:8:8
+   |
+LL | struct Value(u32);
+   | ------------
+   | |
+   | doesn't satisfy `Value: Eq`
+   | doesn't satisfy `Value: Hash`
+   | doesn't satisfy `Value: PartialEq`
+...
+LL |     hs.insert(Value(0));
+   |        ^^^^^^
+   |
+   = note: the following trait bounds were not satisfied:
+           `Value: Eq`
+           `Value: PartialEq`
+           which is required by `Value: Eq`
+           `Value: Hash`
+help: consider annotating `Value` with `#[derive(Eq, Hash, PartialEq)]`
+   |
+LL | #[derive(Eq, Hash, PartialEq)]
+   |
+
+error[E0599]: the method `use_eq` exists for struct `Object<NoDerives>`, but its trait bounds were not satisfied
+  --> $DIR/issue-91550.rs:26:9
+   |
+LL | pub struct NoDerives;
+   | --------------------
+   | |
+   | doesn't satisfy `NoDerives: Eq`
+   | doesn't satisfy `NoDerives: PartialEq`
+LL |
+LL | struct Object<T>(T);
+   | ---------------- method `use_eq` not found for this struct
+...
+LL |     foo.use_eq();
+   |         ^^^^^^ method cannot be called on `Object<NoDerives>` due to unsatisfied trait bounds
+   |
+note: trait bound `NoDerives: Eq` was not satisfied
+  --> $DIR/issue-91550.rs:15:9
+   |
+LL | impl<T: Eq> Object<T> {
+   |         ^^  ---------
+   |         |
+   |         unsatisfied trait bound introduced here
+   = note: the following trait bounds were not satisfied:
+           `NoDerives: PartialEq`
+           which is required by `NoDerives: Eq`
+help: consider annotating `NoDerives` with `#[derive(Eq, PartialEq)]`
+   |
+LL | #[derive(Eq, PartialEq)]
+   |
+
+error[E0599]: the method `use_ord` exists for struct `Object<NoDerives>`, but its trait bounds were not satisfied
+  --> $DIR/issue-91550.rs:27:9
+   |
+LL | pub struct NoDerives;
+   | --------------------
+   | |
+   | doesn't satisfy `NoDerives: Eq`
+   | doesn't satisfy `NoDerives: Ord`
+   | doesn't satisfy `NoDerives: PartialEq`
+   | doesn't satisfy `NoDerives: PartialOrd`
+LL |
+LL | struct Object<T>(T);
+   | ---------------- method `use_ord` not found for this struct
+...
+LL |     foo.use_ord();
+   |         ^^^^^^^ method cannot be called on `Object<NoDerives>` due to unsatisfied trait bounds
+   |
+note: trait bound `NoDerives: Ord` was not satisfied
+  --> $DIR/issue-91550.rs:18:9
+   |
+LL | impl<T: Ord> Object<T> {
+   |         ^^^  ---------
+   |         |
+   |         unsatisfied trait bound introduced here
+   = note: the following trait bounds were not satisfied:
+           `NoDerives: PartialOrd`
+           which is required by `NoDerives: Ord`
+           `NoDerives: PartialEq`
+           which is required by `NoDerives: Ord`
+           `NoDerives: Eq`
+           which is required by `NoDerives: Ord`
+help: consider annotating `NoDerives` with `#[derive(Eq, Ord, PartialEq, PartialOrd)]`
+   |
+LL | #[derive(Eq, Ord, PartialEq, PartialOrd)]
+   |
+
+error[E0599]: the method `use_ord_and_partial_ord` exists for struct `Object<NoDerives>`, but its trait bounds were not satisfied
+  --> $DIR/issue-91550.rs:28:9
+   |
+LL | pub struct NoDerives;
+   | --------------------
+   | |
+   | doesn't satisfy `NoDerives: Eq`
+   | doesn't satisfy `NoDerives: Ord`
+   | doesn't satisfy `NoDerives: PartialEq`
+   | doesn't satisfy `NoDerives: PartialOrd`
+LL |
+LL | struct Object<T>(T);
+   | ---------------- method `use_ord_and_partial_ord` not found for this struct
+...
+LL |     foo.use_ord_and_partial_ord();
+   |         ^^^^^^^^^^^^^^^^^^^^^^^ method cannot be called on `Object<NoDerives>` due to unsatisfied trait bounds
+   |
+note: the following trait bounds were not satisfied:
+      `NoDerives: Ord`
+      `NoDerives: PartialOrd`
+  --> $DIR/issue-91550.rs:21:9
+   |
+LL | impl<T: Ord + PartialOrd> Object<T> {
+   |         ^^^   ^^^^^^^^^^  ---------
+   |         |     |
+   |         |     unsatisfied trait bound introduced here
+   |         unsatisfied trait bound introduced here
+   = note: the following trait bounds were not satisfied:
+           `NoDerives: PartialEq`
+           which is required by `NoDerives: Ord`
+           `NoDerives: Eq`
+           which is required by `NoDerives: Ord`
+           `NoDerives: PartialEq`
+           which is required by `NoDerives: PartialOrd`
+help: consider annotating `NoDerives` with `#[derive(Eq, Ord, PartialEq, PartialOrd)]`
+   |
+LL | #[derive(Eq, Ord, PartialEq, PartialOrd)]
+   |
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/derives/issue-97343.rs b/tests/ui/derives/issue-97343.rs
index 6f0e4d55a..6f0e4d55a 100644
--- a/src/test/ui/derives/issue-97343.rs
+++ b/tests/ui/derives/issue-97343.rs
diff --git a/src/test/ui/derives/issue-97343.stderr b/tests/ui/derives/issue-97343.stderr
index e83bbb5b6..e83bbb5b6 100644
--- a/src/test/ui/derives/issue-97343.stderr
+++ b/tests/ui/derives/issue-97343.stderr
diff --git a/src/test/ui/deriving/auxiliary/derive-no-std.rs b/tests/ui/deriving/auxiliary/derive-no-std.rs
index 3893dc1be..3893dc1be 100644
--- a/src/test/ui/deriving/auxiliary/derive-no-std.rs
+++ b/tests/ui/deriving/auxiliary/derive-no-std.rs
diff --git a/src/test/ui/deriving/derive-no-std.rs b/tests/ui/deriving/derive-no-std.rs
index 74c73b99c..74c73b99c 100644
--- a/src/test/ui/deriving/derive-no-std.rs
+++ b/tests/ui/deriving/derive-no-std.rs
diff --git a/src/test/ui/deriving/derive-partialord-correctness.rs b/tests/ui/deriving/derive-partialord-correctness.rs
index 36763eda1..36763eda1 100644
--- a/src/test/ui/deriving/derive-partialord-correctness.rs
+++ b/tests/ui/deriving/derive-partialord-correctness.rs
diff --git a/src/test/ui/deriving/deriving-all-codegen.rs b/tests/ui/deriving/deriving-all-codegen.rs
index ba7809413..ba7809413 100644
--- a/src/test/ui/deriving/deriving-all-codegen.rs
+++ b/tests/ui/deriving/deriving-all-codegen.rs
diff --git a/src/test/ui/deriving/deriving-all-codegen.stdout b/tests/ui/deriving/deriving-all-codegen.stdout
index a63cbd4ca..e6ee11a78 100644
--- a/src/test/ui/deriving/deriving-all-codegen.stdout
+++ b/tests/ui/deriving/deriving-all-codegen.stdout
@@ -731,11 +731,12 @@ impl ::core::marker::Copy for Fieldless { }
 #[automatically_derived]
 impl ::core::fmt::Debug for Fieldless {
     fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
-        match self {
-            Fieldless::A => ::core::fmt::Formatter::write_str(f, "A"),
-            Fieldless::B => ::core::fmt::Formatter::write_str(f, "B"),
-            Fieldless::C => ::core::fmt::Formatter::write_str(f, "C"),
-        }
+        ::core::fmt::Formatter::write_str(f,
+            match self {
+                Fieldless::A => "A",
+                Fieldless::B => "B",
+                Fieldless::C => "C",
+            })
     }
 }
 #[automatically_derived]
diff --git a/src/test/ui/deriving/deriving-associated-types.rs b/tests/ui/deriving/deriving-associated-types.rs
index 4b1cbe80c..4b1cbe80c 100644
--- a/src/test/ui/deriving/deriving-associated-types.rs
+++ b/tests/ui/deriving/deriving-associated-types.rs
diff --git a/src/test/ui/deriving/deriving-bounds.rs b/tests/ui/deriving/deriving-bounds.rs
index f0b921d0e..f0b921d0e 100644
--- a/src/test/ui/deriving/deriving-bounds.rs
+++ b/tests/ui/deriving/deriving-bounds.rs
diff --git a/src/test/ui/deriving/deriving-clone-array.rs b/tests/ui/deriving/deriving-clone-array.rs
index 4569749df..4569749df 100644
--- a/src/test/ui/deriving/deriving-clone-array.rs
+++ b/tests/ui/deriving/deriving-clone-array.rs
diff --git a/src/test/ui/deriving/deriving-clone-enum.rs b/tests/ui/deriving/deriving-clone-enum.rs
index 09e749740..09e749740 100644
--- a/src/test/ui/deriving/deriving-clone-enum.rs
+++ b/tests/ui/deriving/deriving-clone-enum.rs
diff --git a/src/test/ui/deriving/deriving-clone-generic-enum.rs b/tests/ui/deriving/deriving-clone-generic-enum.rs
index a344d7fc4..a344d7fc4 100644
--- a/src/test/ui/deriving/deriving-clone-generic-enum.rs
+++ b/tests/ui/deriving/deriving-clone-generic-enum.rs
diff --git a/src/test/ui/deriving/deriving-clone-generic-struct.rs b/tests/ui/deriving/deriving-clone-generic-struct.rs
index 4374d1594..4374d1594 100644
--- a/src/test/ui/deriving/deriving-clone-generic-struct.rs
+++ b/tests/ui/deriving/deriving-clone-generic-struct.rs
diff --git a/src/test/ui/deriving/deriving-clone-generic-tuple-struct.rs b/tests/ui/deriving/deriving-clone-generic-tuple-struct.rs
index 3480ccc10..3480ccc10 100644
--- a/src/test/ui/deriving/deriving-clone-generic-tuple-struct.rs
+++ b/tests/ui/deriving/deriving-clone-generic-tuple-struct.rs
diff --git a/src/test/ui/deriving/deriving-clone-struct.rs b/tests/ui/deriving/deriving-clone-struct.rs
index b93cbe5f8..b93cbe5f8 100644
--- a/src/test/ui/deriving/deriving-clone-struct.rs
+++ b/tests/ui/deriving/deriving-clone-struct.rs
diff --git a/src/test/ui/deriving/deriving-clone-tuple-struct.rs b/tests/ui/deriving/deriving-clone-tuple-struct.rs
index 7ad3f0347..7ad3f0347 100644
--- a/src/test/ui/deriving/deriving-clone-tuple-struct.rs
+++ b/tests/ui/deriving/deriving-clone-tuple-struct.rs
diff --git a/src/test/ui/deriving/deriving-cmp-generic-enum.rs b/tests/ui/deriving/deriving-cmp-generic-enum.rs
index 88da4bd06..88da4bd06 100644
--- a/src/test/ui/deriving/deriving-cmp-generic-enum.rs
+++ b/tests/ui/deriving/deriving-cmp-generic-enum.rs
diff --git a/src/test/ui/deriving/deriving-cmp-generic-struct-enum.rs b/tests/ui/deriving/deriving-cmp-generic-struct-enum.rs
index eeaf2ff7e..eeaf2ff7e 100644
--- a/src/test/ui/deriving/deriving-cmp-generic-struct-enum.rs
+++ b/tests/ui/deriving/deriving-cmp-generic-struct-enum.rs
diff --git a/src/test/ui/deriving/deriving-cmp-generic-struct.rs b/tests/ui/deriving/deriving-cmp-generic-struct.rs
index 538caf439..538caf439 100644
--- a/src/test/ui/deriving/deriving-cmp-generic-struct.rs
+++ b/tests/ui/deriving/deriving-cmp-generic-struct.rs
diff --git a/src/test/ui/deriving/deriving-cmp-generic-tuple-struct.rs b/tests/ui/deriving/deriving-cmp-generic-tuple-struct.rs
index 79f58d456..79f58d456 100644
--- a/src/test/ui/deriving/deriving-cmp-generic-tuple-struct.rs
+++ b/tests/ui/deriving/deriving-cmp-generic-tuple-struct.rs
diff --git a/src/test/ui/deriving/deriving-cmp-shortcircuit.rs b/tests/ui/deriving/deriving-cmp-shortcircuit.rs
index 140373e95..140373e95 100644
--- a/src/test/ui/deriving/deriving-cmp-shortcircuit.rs
+++ b/tests/ui/deriving/deriving-cmp-shortcircuit.rs
diff --git a/src/test/ui/deriving/deriving-copyclone.rs b/tests/ui/deriving/deriving-copyclone.rs
index f8403b1fe..f8403b1fe 100644
--- a/src/test/ui/deriving/deriving-copyclone.rs
+++ b/tests/ui/deriving/deriving-copyclone.rs
diff --git a/src/test/ui/deriving/deriving-default-box.rs b/tests/ui/deriving/deriving-default-box.rs
index b71e11496..b71e11496 100644
--- a/src/test/ui/deriving/deriving-default-box.rs
+++ b/tests/ui/deriving/deriving-default-box.rs
diff --git a/src/test/ui/deriving/deriving-default-enum.rs b/tests/ui/deriving/deriving-default-enum.rs
index 1c7a501ed..1c7a501ed 100644
--- a/src/test/ui/deriving/deriving-default-enum.rs
+++ b/tests/ui/deriving/deriving-default-enum.rs
diff --git a/src/test/ui/deriving/deriving-enum-single-variant.rs b/tests/ui/deriving/deriving-enum-single-variant.rs
index 1c5979c07..1c5979c07 100644
--- a/src/test/ui/deriving/deriving-enum-single-variant.rs
+++ b/tests/ui/deriving/deriving-enum-single-variant.rs
diff --git a/src/test/ui/deriving/deriving-eq-ord-boxed-slice.rs b/tests/ui/deriving/deriving-eq-ord-boxed-slice.rs
index 5b4b09836..5b4b09836 100644
--- a/src/test/ui/deriving/deriving-eq-ord-boxed-slice.rs
+++ b/tests/ui/deriving/deriving-eq-ord-boxed-slice.rs
diff --git a/src/test/ui/deriving/deriving-hash.rs b/tests/ui/deriving/deriving-hash.rs
index 16738ec4a..16738ec4a 100644
--- a/src/test/ui/deriving/deriving-hash.rs
+++ b/tests/ui/deriving/deriving-hash.rs
diff --git a/src/test/ui/deriving/deriving-in-fn.rs b/tests/ui/deriving/deriving-in-fn.rs
index 07f91d059..07f91d059 100644
--- a/src/test/ui/deriving/deriving-in-fn.rs
+++ b/tests/ui/deriving/deriving-in-fn.rs
diff --git a/src/test/ui/deriving/deriving-in-macro.rs b/tests/ui/deriving/deriving-in-macro.rs
index 46e8e3783..46e8e3783 100644
--- a/src/test/ui/deriving/deriving-in-macro.rs
+++ b/tests/ui/deriving/deriving-in-macro.rs
diff --git a/src/test/ui/deriving/deriving-meta-multiple.rs b/tests/ui/deriving/deriving-meta-multiple.rs
index ad255be8d..ad255be8d 100644
--- a/src/test/ui/deriving/deriving-meta-multiple.rs
+++ b/tests/ui/deriving/deriving-meta-multiple.rs
diff --git a/src/test/ui/deriving/deriving-meta.rs b/tests/ui/deriving/deriving-meta.rs
index f2ff4f535..f2ff4f535 100644
--- a/src/test/ui/deriving/deriving-meta.rs
+++ b/tests/ui/deriving/deriving-meta.rs
diff --git a/src/test/ui/deriving/deriving-self-lifetime-totalord-totaleq.rs b/tests/ui/deriving/deriving-self-lifetime-totalord-totaleq.rs
index e01b5a26f..e01b5a26f 100644
--- a/src/test/ui/deriving/deriving-self-lifetime-totalord-totaleq.rs
+++ b/tests/ui/deriving/deriving-self-lifetime-totalord-totaleq.rs
diff --git a/src/test/ui/deriving/deriving-show-2.rs b/tests/ui/deriving/deriving-show-2.rs
index 13d124ed4..13d124ed4 100644
--- a/src/test/ui/deriving/deriving-show-2.rs
+++ b/tests/ui/deriving/deriving-show-2.rs
diff --git a/src/test/ui/deriving/deriving-show.rs b/tests/ui/deriving/deriving-show.rs
index eb3a8948f..eb3a8948f 100644
--- a/src/test/ui/deriving/deriving-show.rs
+++ b/tests/ui/deriving/deriving-show.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-c-enum.rs b/tests/ui/deriving/deriving-via-extension-c-enum.rs
index 7fa1a69d7..7fa1a69d7 100644
--- a/src/test/ui/deriving/deriving-via-extension-c-enum.rs
+++ b/tests/ui/deriving/deriving-via-extension-c-enum.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-enum.rs b/tests/ui/deriving/deriving-via-extension-enum.rs
index 6b58fd966..6b58fd966 100644
--- a/src/test/ui/deriving/deriving-via-extension-enum.rs
+++ b/tests/ui/deriving/deriving-via-extension-enum.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-hash-enum.rs b/tests/ui/deriving/deriving-via-extension-hash-enum.rs
index 2d1ca05f4..2d1ca05f4 100644
--- a/src/test/ui/deriving/deriving-via-extension-hash-enum.rs
+++ b/tests/ui/deriving/deriving-via-extension-hash-enum.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-hash-struct.rs b/tests/ui/deriving/deriving-via-extension-hash-struct.rs
index c4037dc27..c4037dc27 100644
--- a/src/test/ui/deriving/deriving-via-extension-hash-struct.rs
+++ b/tests/ui/deriving/deriving-via-extension-hash-struct.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-struct-empty.rs b/tests/ui/deriving/deriving-via-extension-struct-empty.rs
index 9fb250e84..9fb250e84 100644
--- a/src/test/ui/deriving/deriving-via-extension-struct-empty.rs
+++ b/tests/ui/deriving/deriving-via-extension-struct-empty.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs b/tests/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs
index b6e6f136c..b6e6f136c 100644
--- a/src/test/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs
+++ b/tests/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-struct-tuple.rs b/tests/ui/deriving/deriving-via-extension-struct-tuple.rs
index e84906c96..e84906c96 100644
--- a/src/test/ui/deriving/deriving-via-extension-struct-tuple.rs
+++ b/tests/ui/deriving/deriving-via-extension-struct-tuple.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-struct.rs b/tests/ui/deriving/deriving-via-extension-struct.rs
index f4d8b16a0..f4d8b16a0 100644
--- a/src/test/ui/deriving/deriving-via-extension-struct.rs
+++ b/tests/ui/deriving/deriving-via-extension-struct.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-type-params.rs b/tests/ui/deriving/deriving-via-extension-type-params.rs
index a5dec8ee1..a5dec8ee1 100644
--- a/src/test/ui/deriving/deriving-via-extension-type-params.rs
+++ b/tests/ui/deriving/deriving-via-extension-type-params.rs
diff --git a/src/test/ui/deriving/deriving-with-helper.rs b/tests/ui/deriving/deriving-with-helper.rs
index 1c30b0b6f..1c30b0b6f 100644
--- a/src/test/ui/deriving/deriving-with-helper.rs
+++ b/tests/ui/deriving/deriving-with-helper.rs
diff --git a/src/test/ui/deriving/deriving-with-repr-packed.rs b/tests/ui/deriving/deriving-with-repr-packed.rs
index 8ce444be1..8ce444be1 100644
--- a/src/test/ui/deriving/deriving-with-repr-packed.rs
+++ b/tests/ui/deriving/deriving-with-repr-packed.rs
diff --git a/src/test/ui/deriving/issue-103157.rs b/tests/ui/deriving/issue-103157.rs
index 52b4c7898..52b4c7898 100644
--- a/src/test/ui/deriving/issue-103157.rs
+++ b/tests/ui/deriving/issue-103157.rs
diff --git a/src/test/ui/deriving/issue-103157.stderr b/tests/ui/deriving/issue-103157.stderr
index ee3528fe1..b18e1e509 100644
--- a/src/test/ui/deriving/issue-103157.stderr
+++ b/tests/ui/deriving/issue-103157.stderr
@@ -20,9 +20,6 @@ LL |     Float(Option<f64>),
    = note: required for `Option<f64>` to implement `Eq`
 note: required by a bound in `AssertParamIsEq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub struct AssertParamIsEq<T: Eq + ?Sized> {
-   |                               ^^ required by this bound in `AssertParamIsEq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
diff --git a/src/test/ui/deriving/issue-105101.rs b/tests/ui/deriving/issue-105101.rs
index 1a377feb9..1a377feb9 100644
--- a/src/test/ui/deriving/issue-105101.rs
+++ b/tests/ui/deriving/issue-105101.rs
diff --git a/src/test/ui/deriving/issue-105101.stderr b/tests/ui/deriving/issue-105101.stderr
index 0f6f67043..0f6f67043 100644
--- a/src/test/ui/deriving/issue-105101.stderr
+++ b/tests/ui/deriving/issue-105101.stderr
diff --git a/src/test/ui/deriving/issue-19358.rs b/tests/ui/deriving/issue-19358.rs
index 3970a4155..3970a4155 100644
--- a/src/test/ui/deriving/issue-19358.rs
+++ b/tests/ui/deriving/issue-19358.rs
diff --git a/src/test/ui/deriving/issue-3935.rs b/tests/ui/deriving/issue-3935.rs
index e98d68e0e..e98d68e0e 100644
--- a/src/test/ui/deriving/issue-3935.rs
+++ b/tests/ui/deriving/issue-3935.rs
diff --git a/src/test/ui/deriving/issue-58319.rs b/tests/ui/deriving/issue-58319.rs
index 8041bd5bb..8041bd5bb 100644
--- a/src/test/ui/deriving/issue-58319.rs
+++ b/tests/ui/deriving/issue-58319.rs
diff --git a/src/test/ui/deriving/issue-6341.rs b/tests/ui/deriving/issue-6341.rs
index 1be1394df..1be1394df 100644
--- a/src/test/ui/deriving/issue-6341.rs
+++ b/tests/ui/deriving/issue-6341.rs
diff --git a/src/test/ui/deriving/issue-89188-gat-hrtb.rs b/tests/ui/deriving/issue-89188-gat-hrtb.rs
index e8118f0c6..e8118f0c6 100644
--- a/src/test/ui/deriving/issue-89188-gat-hrtb.rs
+++ b/tests/ui/deriving/issue-89188-gat-hrtb.rs
diff --git a/src/test/ui/dest-prop/skeptic-miscompile.rs b/tests/ui/dest-prop/skeptic-miscompile.rs
index 4bb61dbc7..4bb61dbc7 100644
--- a/src/test/ui/dest-prop/skeptic-miscompile.rs
+++ b/tests/ui/dest-prop/skeptic-miscompile.rs
diff --git a/src/test/ui/destructure-trait-ref.rs b/tests/ui/destructure-trait-ref.rs
index 50b64aeeb..50b64aeeb 100644
--- a/src/test/ui/destructure-trait-ref.rs
+++ b/tests/ui/destructure-trait-ref.rs
diff --git a/src/test/ui/destructure-trait-ref.stderr b/tests/ui/destructure-trait-ref.stderr
index 18a889837..18a889837 100644
--- a/src/test/ui/destructure-trait-ref.stderr
+++ b/tests/ui/destructure-trait-ref.stderr
diff --git a/src/test/ui/destructuring-assignment/bad-expr-lhs.rs b/tests/ui/destructuring-assignment/bad-expr-lhs.rs
index 53794783a..53794783a 100644
--- a/src/test/ui/destructuring-assignment/bad-expr-lhs.rs
+++ b/tests/ui/destructuring-assignment/bad-expr-lhs.rs
diff --git a/src/test/ui/destructuring-assignment/bad-expr-lhs.stderr b/tests/ui/destructuring-assignment/bad-expr-lhs.stderr
index d29867474..d29867474 100644
--- a/src/test/ui/destructuring-assignment/bad-expr-lhs.stderr
+++ b/tests/ui/destructuring-assignment/bad-expr-lhs.stderr
diff --git a/src/test/ui/destructuring-assignment/default-match-bindings-forbidden.rs b/tests/ui/destructuring-assignment/default-match-bindings-forbidden.rs
index ff867c000..ff867c000 100644
--- a/src/test/ui/destructuring-assignment/default-match-bindings-forbidden.rs
+++ b/tests/ui/destructuring-assignment/default-match-bindings-forbidden.rs
diff --git a/src/test/ui/destructuring-assignment/default-match-bindings-forbidden.stderr b/tests/ui/destructuring-assignment/default-match-bindings-forbidden.stderr
index 950e0223e..950e0223e 100644
--- a/src/test/ui/destructuring-assignment/default-match-bindings-forbidden.stderr
+++ b/tests/ui/destructuring-assignment/default-match-bindings-forbidden.stderr
diff --git a/src/test/ui/destructuring-assignment/drop-order.rs b/tests/ui/destructuring-assignment/drop-order.rs
index 79671054c..79671054c 100644
--- a/src/test/ui/destructuring-assignment/drop-order.rs
+++ b/tests/ui/destructuring-assignment/drop-order.rs
diff --git a/src/test/ui/destructuring-assignment/nested_destructure.rs b/tests/ui/destructuring-assignment/nested_destructure.rs
index 94b3a5ff9..94b3a5ff9 100644
--- a/src/test/ui/destructuring-assignment/nested_destructure.rs
+++ b/tests/ui/destructuring-assignment/nested_destructure.rs
diff --git a/src/test/ui/destructuring-assignment/note-unsupported.rs b/tests/ui/destructuring-assignment/note-unsupported.rs
index c69edd421..c69edd421 100644
--- a/src/test/ui/destructuring-assignment/note-unsupported.rs
+++ b/tests/ui/destructuring-assignment/note-unsupported.rs
diff --git a/src/test/ui/destructuring-assignment/note-unsupported.stderr b/tests/ui/destructuring-assignment/note-unsupported.stderr
index e45344aa5..8a88332b7 100644
--- a/src/test/ui/destructuring-assignment/note-unsupported.stderr
+++ b/tests/ui/destructuring-assignment/note-unsupported.stderr
@@ -49,11 +49,8 @@ note: an implementation of `AddAssign<_>` might be missing for `S`
    |
 LL | struct S { x: u8, y: u8 }
    | ^^^^^^^^ must implement `AddAssign<_>`
-note: the following trait must be implemented
+note: the trait `AddAssign` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait AddAssign<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0067]: invalid left-hand side of assignment
   --> $DIR/note-unsupported.rs:17:22
diff --git a/src/test/ui/destructuring-assignment/slice_destructure.rs b/tests/ui/destructuring-assignment/slice_destructure.rs
index 762c4b5e8..762c4b5e8 100644
--- a/src/test/ui/destructuring-assignment/slice_destructure.rs
+++ b/tests/ui/destructuring-assignment/slice_destructure.rs
diff --git a/src/test/ui/destructuring-assignment/slice_destructure_fail.rs b/tests/ui/destructuring-assignment/slice_destructure_fail.rs
index 33b09eb34..33b09eb34 100644
--- a/src/test/ui/destructuring-assignment/slice_destructure_fail.rs
+++ b/tests/ui/destructuring-assignment/slice_destructure_fail.rs
diff --git a/src/test/ui/destructuring-assignment/slice_destructure_fail.stderr b/tests/ui/destructuring-assignment/slice_destructure_fail.stderr
index 92c86feba..92c86feba 100644
--- a/src/test/ui/destructuring-assignment/slice_destructure_fail.stderr
+++ b/tests/ui/destructuring-assignment/slice_destructure_fail.stderr
diff --git a/src/test/ui/destructuring-assignment/struct-or-enum-variant-path.rs b/tests/ui/destructuring-assignment/struct-or-enum-variant-path.rs
index 8da7f90c5..8da7f90c5 100644
--- a/src/test/ui/destructuring-assignment/struct-or-enum-variant-path.rs
+++ b/tests/ui/destructuring-assignment/struct-or-enum-variant-path.rs
diff --git a/src/test/ui/destructuring-assignment/struct_destructure.rs b/tests/ui/destructuring-assignment/struct_destructure.rs
index 8cceaadd7..8cceaadd7 100644
--- a/src/test/ui/destructuring-assignment/struct_destructure.rs
+++ b/tests/ui/destructuring-assignment/struct_destructure.rs
diff --git a/src/test/ui/destructuring-assignment/struct_destructure_fail.rs b/tests/ui/destructuring-assignment/struct_destructure_fail.rs
index c001fccd4..c001fccd4 100644
--- a/src/test/ui/destructuring-assignment/struct_destructure_fail.rs
+++ b/tests/ui/destructuring-assignment/struct_destructure_fail.rs
diff --git a/src/test/ui/destructuring-assignment/struct_destructure_fail.stderr b/tests/ui/destructuring-assignment/struct_destructure_fail.stderr
index ae7b3d1e5..ae7b3d1e5 100644
--- a/src/test/ui/destructuring-assignment/struct_destructure_fail.stderr
+++ b/tests/ui/destructuring-assignment/struct_destructure_fail.stderr
diff --git a/src/test/ui/destructuring-assignment/tuple_destructure.rs b/tests/ui/destructuring-assignment/tuple_destructure.rs
index 2a8584029..2a8584029 100644
--- a/src/test/ui/destructuring-assignment/tuple_destructure.rs
+++ b/tests/ui/destructuring-assignment/tuple_destructure.rs
diff --git a/src/test/ui/destructuring-assignment/tuple_destructure_fail.rs b/tests/ui/destructuring-assignment/tuple_destructure_fail.rs
index 4e3172d19..4e3172d19 100644
--- a/src/test/ui/destructuring-assignment/tuple_destructure_fail.rs
+++ b/tests/ui/destructuring-assignment/tuple_destructure_fail.rs
diff --git a/src/test/ui/destructuring-assignment/tuple_destructure_fail.stderr b/tests/ui/destructuring-assignment/tuple_destructure_fail.stderr
index a3004cbbe..a3004cbbe 100644
--- a/src/test/ui/destructuring-assignment/tuple_destructure_fail.stderr
+++ b/tests/ui/destructuring-assignment/tuple_destructure_fail.stderr
diff --git a/src/test/ui/destructuring-assignment/tuple_struct_destructure.rs b/tests/ui/destructuring-assignment/tuple_struct_destructure.rs
index 07b5f7a31..07b5f7a31 100644
--- a/src/test/ui/destructuring-assignment/tuple_struct_destructure.rs
+++ b/tests/ui/destructuring-assignment/tuple_struct_destructure.rs
diff --git a/src/test/ui/destructuring-assignment/tuple_struct_destructure_fail.rs b/tests/ui/destructuring-assignment/tuple_struct_destructure_fail.rs
index 845f867d7..845f867d7 100644
--- a/src/test/ui/destructuring-assignment/tuple_struct_destructure_fail.rs
+++ b/tests/ui/destructuring-assignment/tuple_struct_destructure_fail.rs
diff --git a/src/test/ui/destructuring-assignment/tuple_struct_destructure_fail.stderr b/tests/ui/destructuring-assignment/tuple_struct_destructure_fail.stderr
index 5cc7acba3..5cc7acba3 100644
--- a/src/test/ui/destructuring-assignment/tuple_struct_destructure_fail.stderr
+++ b/tests/ui/destructuring-assignment/tuple_struct_destructure_fail.stderr
diff --git a/src/test/ui/destructuring-assignment/warn-unused-duplication.rs b/tests/ui/destructuring-assignment/warn-unused-duplication.rs
index 390f44b8a..390f44b8a 100644
--- a/src/test/ui/destructuring-assignment/warn-unused-duplication.rs
+++ b/tests/ui/destructuring-assignment/warn-unused-duplication.rs
diff --git a/src/test/ui/destructuring-assignment/warn-unused-duplication.stderr b/tests/ui/destructuring-assignment/warn-unused-duplication.stderr
index e16625136..e16625136 100644
--- a/src/test/ui/destructuring-assignment/warn-unused-duplication.stderr
+++ b/tests/ui/destructuring-assignment/warn-unused-duplication.stderr
diff --git a/tests/ui/diagnostic-width/E0271.rs b/tests/ui/diagnostic-width/E0271.rs
new file mode 100644
index 000000000..7e6b71408
--- /dev/null
+++ b/tests/ui/diagnostic-width/E0271.rs
@@ -0,0 +1,33 @@
+// compile-flags: --diagnostic-width=40
+// normalize-stderr-test: "long-type-\d+" -> "long-type-hash"
+trait Future {
+    type Error;
+}
+
+impl<T, E> Future for Result<T, E> {
+    type Error = E;
+}
+
+impl<T> Future for Option<T> {
+    type Error = ();
+}
+
+struct Foo;
+
+fn foo() -> Box<dyn Future<Error=Foo>> {
+    Box::new( //~ ERROR E0271
+        Ok::<_, ()>(
+            Err::<(), _>(
+                Ok::<_, ()>(
+                    Err::<(), _>(
+                        Ok::<_, ()>(
+                            Err::<(), _>(Some(5))
+                        )
+                    )
+                )
+            )
+        )
+    )
+}
+fn main() {
+}
diff --git a/tests/ui/diagnostic-width/E0271.stderr b/tests/ui/diagnostic-width/E0271.stderr
new file mode 100644
index 000000000..ed7b6651d
--- /dev/null
+++ b/tests/ui/diagnostic-width/E0271.stderr
@@ -0,0 +1,23 @@
+error[E0271]: type mismatch resolving `<Result<Result<(), Result<Result<(), Result<Result<(), Option<{integer}>>, ...>>, ...>>, ...> as Future>::Error == Foo`
+  --> $DIR/E0271.rs:18:5
+   |
+LL | /     Box::new(
+LL | |         Ok::<_, ()>(
+LL | |             Err::<(), _>(
+LL | |                 Ok::<_, ()>(
+...  |
+LL | |         )
+LL | |     )
+   | |_____^ type mismatch resolving `<Result<Result<(), Result<Result<(), ...>, ...>>, ...> as Future>::Error == Foo`
+   |
+note: expected this to be `Foo`
+  --> $DIR/E0271.rs:8:18
+   |
+LL |     type Error = E;
+   |                  ^
+   = note: required for the cast from `Result<Result<..., ...>, ...>` to the object type `dyn Future<Error = Foo>`
+   = note: the full name for the casted type has been written to '$TEST_BUILD_DIR/diagnostic-width/E0271/E0271.long-type-hash.txt'
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0271`.
diff --git a/src/test/ui/diagnostic-width/flag-human.rs b/tests/ui/diagnostic-width/flag-human.rs
index 289bfbabd..289bfbabd 100644
--- a/src/test/ui/diagnostic-width/flag-human.rs
+++ b/tests/ui/diagnostic-width/flag-human.rs
diff --git a/src/test/ui/diagnostic-width/flag-human.stderr b/tests/ui/diagnostic-width/flag-human.stderr
index 393dcf2b8..393dcf2b8 100644
--- a/src/test/ui/diagnostic-width/flag-human.stderr
+++ b/tests/ui/diagnostic-width/flag-human.stderr
diff --git a/src/test/ui/diagnostic-width/flag-json.rs b/tests/ui/diagnostic-width/flag-json.rs
index 51a1fb447..51a1fb447 100644
--- a/src/test/ui/diagnostic-width/flag-json.rs
+++ b/tests/ui/diagnostic-width/flag-json.rs
diff --git a/src/test/ui/diagnostic-width/flag-json.stderr b/tests/ui/diagnostic-width/flag-json.stderr
index b21391d16..b21391d16 100644
--- a/src/test/ui/diagnostic-width/flag-json.stderr
+++ b/tests/ui/diagnostic-width/flag-json.stderr
diff --git a/src/test/ui/diagnostic-width/long-E0308.rs b/tests/ui/diagnostic-width/long-E0308.rs
index 3fd7a7110..f021f1029 100644
--- a/src/test/ui/diagnostic-width/long-E0308.rs
+++ b/tests/ui/diagnostic-width/long-E0308.rs
@@ -1,9 +1,20 @@
 // compile-flags: --diagnostic-width=60
 // normalize-stderr-test: "long-type-\d+" -> "long-type-hash"
 
-struct Atype<T, K>(T, K);
-struct Btype<T, K>(T, K);
-struct Ctype<T, K>(T, K);
+mod a {
+    // Force the "short path for unique types" machinery to trip up
+    pub struct Atype;
+    pub struct Btype;
+    pub struct Ctype;
+}
+
+mod b {
+    pub struct Atype<T, K>(T, K);
+    pub struct Btype<T, K>(T, K);
+    pub struct Ctype<T, K>(T, K);
+}
+
+use b::*;
 
 fn main() {
     let x: Atype<
diff --git a/src/test/ui/diagnostic-width/long-E0308.stderr b/tests/ui/diagnostic-width/long-E0308.stderr
index 487ab23a1..1c99898bc 100644
--- a/src/test/ui/diagnostic-width/long-E0308.stderr
+++ b/tests/ui/diagnostic-width/long-E0308.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/long-E0308.rs:33:9
+  --> $DIR/long-E0308.rs:44:9
    |
 LL |        let x: Atype<
    |  _____________-
@@ -24,7 +24,7 @@ LL |  |     ))))))))))))))))))))))))))))));
            the full type name has been written to '$TEST_BUILD_DIR/diagnostic-width/long-E0308/long-E0308.long-type-hash.txt'
 
 error[E0308]: mismatched types
-  --> $DIR/long-E0308.rs:46:26
+  --> $DIR/long-E0308.rs:57:26
    |
 LL |       ))))))))))))))))) == Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(O...
    |  __________________________^
@@ -40,7 +40,7 @@ LL | |     ))))))))))))))))))))))));
            the full type name has been written to '$TEST_BUILD_DIR/diagnostic-width/long-E0308/long-E0308.long-type-hash.txt'
 
 error[E0308]: mismatched types
-  --> $DIR/long-E0308.rs:77:9
+  --> $DIR/long-E0308.rs:88:9
    |
 LL |       let x: Atype<
    |  ____________-
@@ -59,7 +59,7 @@ LL | |     > = ();
            found unit type `()`
 
 error[E0308]: mismatched types
-  --> $DIR/long-E0308.rs:80:17
+  --> $DIR/long-E0308.rs:91:17
    |
 LL |       let _: () = Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(O...
    |  ____________--___^
diff --git a/src/test/ui/diagnostic-width/non-1-width-unicode-multiline-label.rs b/tests/ui/diagnostic-width/non-1-width-unicode-multiline-label.rs
index 1989ea886..1989ea886 100644
--- a/src/test/ui/diagnostic-width/non-1-width-unicode-multiline-label.rs
+++ b/tests/ui/diagnostic-width/non-1-width-unicode-multiline-label.rs
diff --git a/src/test/ui/diagnostic-width/non-1-width-unicode-multiline-label.stderr b/tests/ui/diagnostic-width/non-1-width-unicode-multiline-label.stderr
index bf277362d..bf277362d 100644
--- a/src/test/ui/diagnostic-width/non-1-width-unicode-multiline-label.stderr
+++ b/tests/ui/diagnostic-width/non-1-width-unicode-multiline-label.stderr
diff --git a/src/test/ui/diagnostic-width/non-whitespace-trimming-2.rs b/tests/ui/diagnostic-width/non-whitespace-trimming-2.rs
index abd9e189a..abd9e189a 100644
--- a/src/test/ui/diagnostic-width/non-whitespace-trimming-2.rs
+++ b/tests/ui/diagnostic-width/non-whitespace-trimming-2.rs
diff --git a/src/test/ui/diagnostic-width/non-whitespace-trimming-2.stderr b/tests/ui/diagnostic-width/non-whitespace-trimming-2.stderr
index 5dbb9ce45..5dbb9ce45 100644
--- a/src/test/ui/diagnostic-width/non-whitespace-trimming-2.stderr
+++ b/tests/ui/diagnostic-width/non-whitespace-trimming-2.stderr
diff --git a/src/test/ui/diagnostic-width/non-whitespace-trimming-unicode.rs b/tests/ui/diagnostic-width/non-whitespace-trimming-unicode.rs
index 8d4d1b162..8d4d1b162 100644
--- a/src/test/ui/diagnostic-width/non-whitespace-trimming-unicode.rs
+++ b/tests/ui/diagnostic-width/non-whitespace-trimming-unicode.rs
diff --git a/src/test/ui/diagnostic-width/non-whitespace-trimming-unicode.stderr b/tests/ui/diagnostic-width/non-whitespace-trimming-unicode.stderr
index 1e5ff9398..1e5ff9398 100644
--- a/src/test/ui/diagnostic-width/non-whitespace-trimming-unicode.stderr
+++ b/tests/ui/diagnostic-width/non-whitespace-trimming-unicode.stderr
diff --git a/src/test/ui/diagnostic-width/non-whitespace-trimming.rs b/tests/ui/diagnostic-width/non-whitespace-trimming.rs
index f6c8d345c..f6c8d345c 100644
--- a/src/test/ui/diagnostic-width/non-whitespace-trimming.rs
+++ b/tests/ui/diagnostic-width/non-whitespace-trimming.rs
diff --git a/src/test/ui/diagnostic-width/non-whitespace-trimming.stderr b/tests/ui/diagnostic-width/non-whitespace-trimming.stderr
index c4ff0e168..c4ff0e168 100644
--- a/src/test/ui/diagnostic-width/non-whitespace-trimming.stderr
+++ b/tests/ui/diagnostic-width/non-whitespace-trimming.stderr
diff --git a/src/test/ui/diagnostic-width/tabs-trimming.rs b/tests/ui/diagnostic-width/tabs-trimming.rs
index ade21753b..ade21753b 100644
--- a/src/test/ui/diagnostic-width/tabs-trimming.rs
+++ b/tests/ui/diagnostic-width/tabs-trimming.rs
diff --git a/src/test/ui/diagnostic-width/tabs-trimming.stderr b/tests/ui/diagnostic-width/tabs-trimming.stderr
index 6c8d9afc7..6c8d9afc7 100644
--- a/src/test/ui/diagnostic-width/tabs-trimming.stderr
+++ b/tests/ui/diagnostic-width/tabs-trimming.stderr
diff --git a/src/test/ui/diagnostic-width/whitespace-trimming-2.rs b/tests/ui/diagnostic-width/whitespace-trimming-2.rs
index c68f678aa..c68f678aa 100644
--- a/src/test/ui/diagnostic-width/whitespace-trimming-2.rs
+++ b/tests/ui/diagnostic-width/whitespace-trimming-2.rs
diff --git a/src/test/ui/diagnostic-width/whitespace-trimming-2.stderr b/tests/ui/diagnostic-width/whitespace-trimming-2.stderr
index 97a64e603..97a64e603 100644
--- a/src/test/ui/diagnostic-width/whitespace-trimming-2.stderr
+++ b/tests/ui/diagnostic-width/whitespace-trimming-2.stderr
diff --git a/src/test/ui/diagnostic-width/whitespace-trimming.rs b/tests/ui/diagnostic-width/whitespace-trimming.rs
index f747bcf17..f747bcf17 100644
--- a/src/test/ui/diagnostic-width/whitespace-trimming.rs
+++ b/tests/ui/diagnostic-width/whitespace-trimming.rs
diff --git a/src/test/ui/diagnostic-width/whitespace-trimming.stderr b/tests/ui/diagnostic-width/whitespace-trimming.stderr
index e296d4889..e296d4889 100644
--- a/src/test/ui/diagnostic-width/whitespace-trimming.stderr
+++ b/tests/ui/diagnostic-width/whitespace-trimming.stderr
diff --git a/src/test/ui/did_you_mean/E0178.rs b/tests/ui/did_you_mean/E0178.rs
index 095df640c..095df640c 100644
--- a/src/test/ui/did_you_mean/E0178.rs
+++ b/tests/ui/did_you_mean/E0178.rs
diff --git a/src/test/ui/did_you_mean/E0178.stderr b/tests/ui/did_you_mean/E0178.stderr
index 58ac6e908..58ac6e908 100644
--- a/src/test/ui/did_you_mean/E0178.stderr
+++ b/tests/ui/did_you_mean/E0178.stderr
diff --git a/src/test/ui/did_you_mean/bad-assoc-expr.rs b/tests/ui/did_you_mean/bad-assoc-expr.rs
index 1d584757f..1d584757f 100644
--- a/src/test/ui/did_you_mean/bad-assoc-expr.rs
+++ b/tests/ui/did_you_mean/bad-assoc-expr.rs
diff --git a/src/test/ui/did_you_mean/bad-assoc-expr.stderr b/tests/ui/did_you_mean/bad-assoc-expr.stderr
index c295cac9a..c295cac9a 100644
--- a/src/test/ui/did_you_mean/bad-assoc-expr.stderr
+++ b/tests/ui/did_you_mean/bad-assoc-expr.stderr
diff --git a/src/test/ui/did_you_mean/bad-assoc-pat.rs b/tests/ui/did_you_mean/bad-assoc-pat.rs
index 3f912f7ff..3f912f7ff 100644
--- a/src/test/ui/did_you_mean/bad-assoc-pat.rs
+++ b/tests/ui/did_you_mean/bad-assoc-pat.rs
diff --git a/src/test/ui/did_you_mean/bad-assoc-pat.stderr b/tests/ui/did_you_mean/bad-assoc-pat.stderr
index 19d173f1b..19d173f1b 100644
--- a/src/test/ui/did_you_mean/bad-assoc-pat.stderr
+++ b/tests/ui/did_you_mean/bad-assoc-pat.stderr
diff --git a/src/test/ui/did_you_mean/bad-assoc-ty.rs b/tests/ui/did_you_mean/bad-assoc-ty.rs
index f787c416c..f787c416c 100644
--- a/src/test/ui/did_you_mean/bad-assoc-ty.rs
+++ b/tests/ui/did_you_mean/bad-assoc-ty.rs
diff --git a/src/test/ui/did_you_mean/bad-assoc-ty.stderr b/tests/ui/did_you_mean/bad-assoc-ty.stderr
index 21f957ab5..55096e95d 100644
--- a/src/test/ui/did_you_mean/bad-assoc-ty.stderr
+++ b/tests/ui/did_you_mean/bad-assoc-ty.stderr
@@ -61,25 +61,45 @@ error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:1:10
    |
 LL | type A = [u8; 4]::AssocTy;
-   |          ^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<[u8; 4] as Trait>::AssocTy`
+   |          ^^^^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `[u8; 4]`, you could use the fully-qualified path
+   |
+LL | type A = <[u8; 4] as Example>::AssocTy;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:5:10
    |
 LL | type B = [u8]::AssocTy;
-   |          ^^^^^^^^^^^^^ help: use fully-qualified syntax: `<[u8] as Trait>::AssocTy`
+   |          ^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `[u8]`, you could use the fully-qualified path
+   |
+LL | type B = <[u8] as Example>::AssocTy;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:9:10
    |
 LL | type C = (u8)::AssocTy;
-   |          ^^^^^^^^^^^^^ help: use fully-qualified syntax: `<u8 as Trait>::AssocTy`
+   |          ^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `u8`, you could use the fully-qualified path
+   |
+LL | type C = <u8 as Example>::AssocTy;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:13:10
    |
 LL | type D = (u8, u8)::AssocTy;
-   |          ^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<(u8, u8) as Trait>::AssocTy`
+   |          ^^^^^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `(u8, u8)`, you could use the fully-qualified path
+   |
+LL | type D = <(u8, u8) as Example>::AssocTy;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0121]: the placeholder `_` is not allowed within types on item signatures for type aliases
   --> $DIR/bad-assoc-ty.rs:17:10
@@ -91,13 +111,23 @@ error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:21:19
    |
 LL | type F = &'static (u8)::AssocTy;
-   |                   ^^^^^^^^^^^^^ help: use fully-qualified syntax: `<u8 as Trait>::AssocTy`
+   |                   ^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `u8`, you could use the fully-qualified path
+   |
+LL | type F = &'static <u8 as Example>::AssocTy;
+   |                   ~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:27:10
    |
 LL | type G = dyn 'static + (Send)::AssocTy;
-   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<(dyn Send + 'static) as Trait>::AssocTy`
+   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `(dyn Send + 'static)`, you could use the fully-qualified path
+   |
+LL | type G = <(dyn Send + 'static) as Example>::AssocTy;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 warning: trait objects without an explicit `dyn` are deprecated
   --> $DIR/bad-assoc-ty.rs:33:10
@@ -117,24 +147,33 @@ error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:33:10
    |
 LL | type H = Fn(u8) -> (u8)::Output;
-   |          ^^^^^^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<(dyn Fn(u8) -> u8 + 'static) as Trait>::Output`
+   |          ^^^^^^^^^^^^^^^^^^^^^^ help: use the fully-qualified path: `<(dyn Fn(u8) -> u8 + 'static) as IntoFuture>::Output`
 
 error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:39:19
    |
 LL |     ($ty: ty) => ($ty::AssocTy);
-   |                   ^^^^^^^^^^^^ help: use fully-qualified syntax: `<u8 as Trait>::AssocTy`
+   |                   ^^^^^^^^^^^^
 ...
 LL | type J = ty!(u8);
    |          ------- in this macro invocation
    |
    = note: this error originates in the macro `ty` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `u8`, you could use the fully-qualified path
+   |
+LL |     ($ty: ty) => (<u8 as Example>::AssocTy);
+   |                   ~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:46:10
    |
 LL | type I = ty!()::AssocTy;
-   |          ^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<u8 as Trait>::AssocTy`
+   |          ^^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `u8`, you could use the fully-qualified path
+   |
+LL | type I = <u8 as Example>::AssocTy;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0121]: the placeholder `_` is not allowed within types on item signatures for functions
   --> $DIR/bad-assoc-ty.rs:51:13
diff --git a/src/test/ui/did_you_mean/brackets-to-braces-single-element.rs b/tests/ui/did_you_mean/brackets-to-braces-single-element.rs
index 4d0109767..4d0109767 100644
--- a/src/test/ui/did_you_mean/brackets-to-braces-single-element.rs
+++ b/tests/ui/did_you_mean/brackets-to-braces-single-element.rs
diff --git a/src/test/ui/did_you_mean/brackets-to-braces-single-element.stderr b/tests/ui/did_you_mean/brackets-to-braces-single-element.stderr
index 6ded03e45..6ded03e45 100644
--- a/src/test/ui/did_you_mean/brackets-to-braces-single-element.stderr
+++ b/tests/ui/did_you_mean/brackets-to-braces-single-element.stderr
diff --git a/src/test/ui/did_you_mean/compatible-variants-in-pat.rs b/tests/ui/did_you_mean/compatible-variants-in-pat.rs
index 09e12dab2..09e12dab2 100644
--- a/src/test/ui/did_you_mean/compatible-variants-in-pat.rs
+++ b/tests/ui/did_you_mean/compatible-variants-in-pat.rs
diff --git a/src/test/ui/did_you_mean/compatible-variants-in-pat.stderr b/tests/ui/did_you_mean/compatible-variants-in-pat.stderr
index 473468af6..473468af6 100644
--- a/src/test/ui/did_you_mean/compatible-variants-in-pat.stderr
+++ b/tests/ui/did_you_mean/compatible-variants-in-pat.stderr
diff --git a/src/test/ui/did_you_mean/compatible-variants.rs b/tests/ui/did_you_mean/compatible-variants.rs
index b1c7dc2a7..b1c7dc2a7 100644
--- a/src/test/ui/did_you_mean/compatible-variants.rs
+++ b/tests/ui/did_you_mean/compatible-variants.rs
diff --git a/src/test/ui/did_you_mean/compatible-variants.stderr b/tests/ui/did_you_mean/compatible-variants.stderr
index fe81da198..fe81da198 100644
--- a/src/test/ui/did_you_mean/compatible-variants.stderr
+++ b/tests/ui/did_you_mean/compatible-variants.stderr
diff --git a/src/test/ui/did_you_mean/issue-103909.rs b/tests/ui/did_you_mean/issue-103909.rs
index 20b67cd10..20b67cd10 100644
--- a/src/test/ui/did_you_mean/issue-103909.rs
+++ b/tests/ui/did_you_mean/issue-103909.rs
diff --git a/src/test/ui/did_you_mean/issue-103909.stderr b/tests/ui/did_you_mean/issue-103909.stderr
index 864101747..864101747 100644
--- a/src/test/ui/did_you_mean/issue-103909.stderr
+++ b/tests/ui/did_you_mean/issue-103909.stderr
diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.rs b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.rs
index 1749137d4..1749137d4 100644
--- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.rs
+++ b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.rs
diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr
index b69fcd5d3..b69fcd5d3 100644
--- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr
+++ b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr
diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.rs b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.rs
index e898b224e..e898b224e 100644
--- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.rs
+++ b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.rs
diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr
index 5e0e4a011..5e0e4a011 100644
--- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr
+++ b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr
diff --git a/src/test/ui/did_you_mean/issue-31424.rs b/tests/ui/did_you_mean/issue-31424.rs
index 95ccf2a4c..95ccf2a4c 100644
--- a/src/test/ui/did_you_mean/issue-31424.rs
+++ b/tests/ui/did_you_mean/issue-31424.rs
diff --git a/src/test/ui/did_you_mean/issue-31424.stderr b/tests/ui/did_you_mean/issue-31424.stderr
index 8fe38bf69..8fe38bf69 100644
--- a/src/test/ui/did_you_mean/issue-31424.stderr
+++ b/tests/ui/did_you_mean/issue-31424.stderr
diff --git a/src/test/ui/did_you_mean/issue-34126.rs b/tests/ui/did_you_mean/issue-34126.rs
index 53516f4f2..53516f4f2 100644
--- a/src/test/ui/did_you_mean/issue-34126.rs
+++ b/tests/ui/did_you_mean/issue-34126.rs
diff --git a/src/test/ui/did_you_mean/issue-34126.stderr b/tests/ui/did_you_mean/issue-34126.stderr
index 5343acea4..5343acea4 100644
--- a/src/test/ui/did_you_mean/issue-34126.stderr
+++ b/tests/ui/did_you_mean/issue-34126.stderr
diff --git a/src/test/ui/did_you_mean/issue-34337.rs b/tests/ui/did_you_mean/issue-34337.rs
index e89eda33f..e89eda33f 100644
--- a/src/test/ui/did_you_mean/issue-34337.rs
+++ b/tests/ui/did_you_mean/issue-34337.rs
diff --git a/src/test/ui/did_you_mean/issue-34337.stderr b/tests/ui/did_you_mean/issue-34337.stderr
index 1f18ea892..1f18ea892 100644
--- a/src/test/ui/did_you_mean/issue-34337.stderr
+++ b/tests/ui/did_you_mean/issue-34337.stderr
diff --git a/src/test/ui/did_you_mean/issue-35937.rs b/tests/ui/did_you_mean/issue-35937.rs
index ebeba74f1..ebeba74f1 100644
--- a/src/test/ui/did_you_mean/issue-35937.rs
+++ b/tests/ui/did_you_mean/issue-35937.rs
diff --git a/tests/ui/did_you_mean/issue-35937.stderr b/tests/ui/did_you_mean/issue-35937.stderr
new file mode 100644
index 000000000..1670da559
--- /dev/null
+++ b/tests/ui/did_you_mean/issue-35937.stderr
@@ -0,0 +1,37 @@
+error[E0596]: cannot borrow `f.v` as mutable, as `f` is not declared as mutable
+  --> $DIR/issue-35937.rs:7:5
+   |
+LL |     f.v.push("cat".to_string());
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut f = Foo { v: Vec::new() };
+   |         +++
+
+error[E0594]: cannot assign to `s.x`, as `s` is not declared as mutable
+  --> $DIR/issue-35937.rs:16:5
+   |
+LL |     s.x += 1;
+   |     ^^^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut s = S { x: 42 };
+   |         +++
+
+error[E0594]: cannot assign to `s.x`, as `s` is not declared as mutable
+  --> $DIR/issue-35937.rs:20:5
+   |
+LL |     s.x += 1;
+   |     ^^^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL | fn bar(mut s: S) {
+   |        +++
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0594, E0596.
+For more information about an error, try `rustc --explain E0594`.
diff --git a/src/test/ui/did_you_mean/issue-36798.rs b/tests/ui/did_you_mean/issue-36798.rs
index 89d71d831..89d71d831 100644
--- a/src/test/ui/did_you_mean/issue-36798.rs
+++ b/tests/ui/did_you_mean/issue-36798.rs
diff --git a/src/test/ui/did_you_mean/issue-36798.stderr b/tests/ui/did_you_mean/issue-36798.stderr
index 98876e305..98876e305 100644
--- a/src/test/ui/did_you_mean/issue-36798.stderr
+++ b/tests/ui/did_you_mean/issue-36798.stderr
diff --git a/src/test/ui/did_you_mean/issue-36798_unknown_field.rs b/tests/ui/did_you_mean/issue-36798_unknown_field.rs
index ef9744b4a..ef9744b4a 100644
--- a/src/test/ui/did_you_mean/issue-36798_unknown_field.rs
+++ b/tests/ui/did_you_mean/issue-36798_unknown_field.rs
diff --git a/src/test/ui/did_you_mean/issue-36798_unknown_field.stderr b/tests/ui/did_you_mean/issue-36798_unknown_field.stderr
index 2ed0a0924..2ed0a0924 100644
--- a/src/test/ui/did_you_mean/issue-36798_unknown_field.stderr
+++ b/tests/ui/did_you_mean/issue-36798_unknown_field.stderr
diff --git a/src/test/ui/did_you_mean/issue-37139.rs b/tests/ui/did_you_mean/issue-37139.rs
index 6a19d85ff..6a19d85ff 100644
--- a/src/test/ui/did_you_mean/issue-37139.rs
+++ b/tests/ui/did_you_mean/issue-37139.rs
diff --git a/src/test/ui/did_you_mean/issue-37139.stderr b/tests/ui/did_you_mean/issue-37139.stderr
index dc1bdfaae..dc1bdfaae 100644
--- a/src/test/ui/did_you_mean/issue-37139.stderr
+++ b/tests/ui/did_you_mean/issue-37139.stderr
diff --git a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.rs b/tests/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.rs
index a1ef68ecf..a1ef68ecf 100644
--- a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.rs
+++ b/tests/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.rs
diff --git a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr b/tests/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr
index 852abaed7..852abaed7 100644
--- a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr
+++ b/tests/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr
diff --git a/src/test/ui/did_you_mean/issue-38147-1.rs b/tests/ui/did_you_mean/issue-38147-1.rs
index c068a1834..c068a1834 100644
--- a/src/test/ui/did_you_mean/issue-38147-1.rs
+++ b/tests/ui/did_you_mean/issue-38147-1.rs
diff --git a/src/test/ui/did_you_mean/issue-38147-1.stderr b/tests/ui/did_you_mean/issue-38147-1.stderr
index dd193458b..74fb1c2ec 100644
--- a/src/test/ui/did_you_mean/issue-38147-1.stderr
+++ b/tests/ui/did_you_mean/issue-38147-1.stderr
@@ -1,10 +1,13 @@
 error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` reference
   --> $DIR/issue-38147-1.rs:17:9
    |
-LL |     fn f(&self) {
-   |          ----- help: consider changing this to be a mutable reference: `&mut self`
 LL |         self.s.push('x');
    |         ^^^^^^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn f(&mut self) {
+   |          ~~~~~~~~~
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/did_you_mean/issue-38147-2.rs b/tests/ui/did_you_mean/issue-38147-2.rs
index 154b149b7..154b149b7 100644
--- a/src/test/ui/did_you_mean/issue-38147-2.rs
+++ b/tests/ui/did_you_mean/issue-38147-2.rs
diff --git a/src/test/ui/did_you_mean/issue-38147-2.stderr b/tests/ui/did_you_mean/issue-38147-2.stderr
index 7c287a7db..7c287a7db 100644
--- a/src/test/ui/did_you_mean/issue-38147-2.stderr
+++ b/tests/ui/did_you_mean/issue-38147-2.stderr
diff --git a/src/test/ui/did_you_mean/issue-38147-3.rs b/tests/ui/did_you_mean/issue-38147-3.rs
index 40b8e0dba..40b8e0dba 100644
--- a/src/test/ui/did_you_mean/issue-38147-3.rs
+++ b/tests/ui/did_you_mean/issue-38147-3.rs
diff --git a/src/test/ui/did_you_mean/issue-38147-3.stderr b/tests/ui/did_you_mean/issue-38147-3.stderr
index 94ffe17f1..94ffe17f1 100644
--- a/src/test/ui/did_you_mean/issue-38147-3.stderr
+++ b/tests/ui/did_you_mean/issue-38147-3.stderr
diff --git a/src/test/ui/did_you_mean/issue-38147-4.rs b/tests/ui/did_you_mean/issue-38147-4.rs
index e2028a9e6..e2028a9e6 100644
--- a/src/test/ui/did_you_mean/issue-38147-4.rs
+++ b/tests/ui/did_you_mean/issue-38147-4.rs
diff --git a/tests/ui/did_you_mean/issue-38147-4.stderr b/tests/ui/did_you_mean/issue-38147-4.stderr
new file mode 100644
index 000000000..d33399893
--- /dev/null
+++ b/tests/ui/did_you_mean/issue-38147-4.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `*f.s` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-38147-4.rs:6:5
+   |
+LL |     f.s.push('x');
+   |     ^^^^^^^^^^^^^ `f` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn f(x: usize, f: &mut Foo<'_>) {
+   |                   ~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/did_you_mean/issue-39544.rs b/tests/ui/did_you_mean/issue-39544.rs
index a19d3f704..a19d3f704 100644
--- a/src/test/ui/did_you_mean/issue-39544.rs
+++ b/tests/ui/did_you_mean/issue-39544.rs
diff --git a/tests/ui/did_you_mean/issue-39544.stderr b/tests/ui/did_you_mean/issue-39544.stderr
new file mode 100644
index 000000000..8dc0512a9
--- /dev/null
+++ b/tests/ui/did_you_mean/issue-39544.stderr
@@ -0,0 +1,131 @@
+error[E0596]: cannot borrow `z.x` as mutable, as `z` is not declared as mutable
+  --> $DIR/issue-39544.rs:11:13
+   |
+LL |     let _ = &mut z.x;
+   |             ^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut z = Z { x: X::Y };
+   |         +++
+
+error[E0596]: cannot borrow `self.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:16:17
+   |
+LL |         let _ = &mut self.x;
+   |                 ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo<'z>(&'z mut self) {
+   |                ~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `self.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:20:17
+   |
+LL |         let _ = &mut self.x;
+   |                 ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo1(&mut self, other: &Z) {
+   |             ~~~~~~~~~
+
+error[E0596]: cannot borrow `other.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:21:17
+   |
+LL |         let _ = &mut other.x;
+   |                 ^^^^^^^^^^^^ `other` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo1(&self, other: &mut Z) {
+   |                           ~~~~~~
+
+error[E0596]: cannot borrow `self.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:25:17
+   |
+LL |         let _ = &mut self.x;
+   |                 ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo2<'a>(&'a mut self, other: &Z) {
+   |                 ~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `other.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:26:17
+   |
+LL |         let _ = &mut other.x;
+   |                 ^^^^^^^^^^^^ `other` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo2<'a>(&'a self, other: &mut Z) {
+   |                                  ~~~~~~
+
+error[E0596]: cannot borrow `self.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:30:17
+   |
+LL |         let _ = &mut self.x;
+   |                 ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo3<'a>(self: &'a mut Self, other: &Z) {
+   |                       ~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `other.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:31:17
+   |
+LL |         let _ = &mut other.x;
+   |                 ^^^^^^^^^^^^ `other` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo3<'a>(self: &'a Self, other: &mut Z) {
+   |                                        ~~~~~~
+
+error[E0596]: cannot borrow `other.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:35:17
+   |
+LL |         let _ = &mut other.x;
+   |                 ^^^^^^^^^^^^ `other` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo4(other: &mut Z) {
+   |                    ~~~~~~
+
+error[E0596]: cannot borrow `z.x` as mutable, as `z` is not declared as mutable
+  --> $DIR/issue-39544.rs:41:13
+   |
+LL |     let _ = &mut z.x;
+   |             ^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | pub fn with_arg(mut z: Z, w: &Z) {
+   |                 +++
+
+error[E0596]: cannot borrow `w.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:42:13
+   |
+LL |     let _ = &mut w.x;
+   |             ^^^^^^^^ `w` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | pub fn with_arg(z: Z, w: &mut Z) {
+   |                          ~~~~~~
+
+error[E0594]: cannot assign to `*x.0`, which is behind a `&` reference
+  --> $DIR/issue-39544.rs:48:5
+   |
+LL |     *x.0 = 1;
+   |     ^^^^^^^^ cannot assign
+
+error: aborting due to 12 previous errors
+
+Some errors have detailed explanations: E0594, E0596.
+For more information about an error, try `rustc --explain E0594`.
diff --git a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.rs b/tests/ui/did_you_mean/issue-39802-show-5-trait-impls.rs
index 63a8c547c..63a8c547c 100644
--- a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.rs
+++ b/tests/ui/did_you_mean/issue-39802-show-5-trait-impls.rs
diff --git a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr b/tests/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr
index 7229b9ac9..7229b9ac9 100644
--- a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr
+++ b/tests/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr
diff --git a/src/test/ui/did_you_mean/issue-40006.rs b/tests/ui/did_you_mean/issue-40006.rs
index 74f304d81..74f304d81 100644
--- a/src/test/ui/did_you_mean/issue-40006.rs
+++ b/tests/ui/did_you_mean/issue-40006.rs
diff --git a/src/test/ui/did_you_mean/issue-40006.stderr b/tests/ui/did_you_mean/issue-40006.stderr
index bdbfa4dd7..bdbfa4dd7 100644
--- a/src/test/ui/did_you_mean/issue-40006.stderr
+++ b/tests/ui/did_you_mean/issue-40006.stderr
diff --git a/src/test/ui/did_you_mean/issue-40396.rs b/tests/ui/did_you_mean/issue-40396.rs
index 5497ba2e1..5497ba2e1 100644
--- a/src/test/ui/did_you_mean/issue-40396.rs
+++ b/tests/ui/did_you_mean/issue-40396.rs
diff --git a/src/test/ui/did_you_mean/issue-40396.stderr b/tests/ui/did_you_mean/issue-40396.stderr
index d0249efd0..d0249efd0 100644
--- a/src/test/ui/did_you_mean/issue-40396.stderr
+++ b/tests/ui/did_you_mean/issue-40396.stderr
diff --git a/src/test/ui/did_you_mean/issue-40823.rs b/tests/ui/did_you_mean/issue-40823.rs
index 0f8c74554..0f8c74554 100644
--- a/src/test/ui/did_you_mean/issue-40823.rs
+++ b/tests/ui/did_you_mean/issue-40823.rs
diff --git a/tests/ui/did_you_mean/issue-40823.stderr b/tests/ui/did_you_mean/issue-40823.stderr
new file mode 100644
index 000000000..aadd69889
--- /dev/null
+++ b/tests/ui/did_you_mean/issue-40823.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `*buf` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-40823.rs:3:5
+   |
+LL |     buf.iter_mut();
+   |     ^^^^^^^^^^^^^^ `buf` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let mut buf = &mut [1, 2, 3, 4];
+   |                   ~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.fixed b/tests/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.fixed
index e566ed488..e566ed488 100644
--- a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.fixed
+++ b/tests/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.fixed
diff --git a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs b/tests/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs
index 1708a8050..1708a8050 100644
--- a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs
+++ b/tests/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs
diff --git a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr b/tests/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr
index 2a3242abe..2a3242abe 100644
--- a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr
+++ b/tests/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr
diff --git a/src/test/ui/did_you_mean/issue-42599_available_fields_note.rs b/tests/ui/did_you_mean/issue-42599_available_fields_note.rs
index c377dfc12..c377dfc12 100644
--- a/src/test/ui/did_you_mean/issue-42599_available_fields_note.rs
+++ b/tests/ui/did_you_mean/issue-42599_available_fields_note.rs
diff --git a/src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr b/tests/ui/did_you_mean/issue-42599_available_fields_note.stderr
index dbd9dc1bc..dbd9dc1bc 100644
--- a/src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr
+++ b/tests/ui/did_you_mean/issue-42599_available_fields_note.stderr
diff --git a/src/test/ui/did_you_mean/issue-42764.rs b/tests/ui/did_you_mean/issue-42764.rs
index eb96c2480..eb96c2480 100644
--- a/src/test/ui/did_you_mean/issue-42764.rs
+++ b/tests/ui/did_you_mean/issue-42764.rs
diff --git a/src/test/ui/did_you_mean/issue-42764.stderr b/tests/ui/did_you_mean/issue-42764.stderr
index 6a7fd8fe2..6a7fd8fe2 100644
--- a/src/test/ui/did_you_mean/issue-42764.stderr
+++ b/tests/ui/did_you_mean/issue-42764.stderr
diff --git a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.rs b/tests/ui/did_you_mean/issue-43871-enum-instead-of-variant.rs
index 9602d2746..9602d2746 100644
--- a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.rs
+++ b/tests/ui/did_you_mean/issue-43871-enum-instead-of-variant.rs
diff --git a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr b/tests/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr
index 9dde5b3eb..9dde5b3eb 100644
--- a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr
+++ b/tests/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr
diff --git a/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.rs b/tests/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.rs
index 63e8b2ba0..63e8b2ba0 100644
--- a/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.rs
+++ b/tests/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.rs
diff --git a/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.stderr b/tests/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.stderr
index bfe1ed328..bfe1ed328 100644
--- a/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.stderr
+++ b/tests/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.stderr
diff --git a/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.rs b/tests/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.rs
index df697ccb6..df697ccb6 100644
--- a/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.rs
+++ b/tests/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.rs
diff --git a/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr b/tests/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr
index 14918ba89..14918ba89 100644
--- a/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr
+++ b/tests/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr
diff --git a/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.rs b/tests/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.rs
index 43b5f6d54..43b5f6d54 100644
--- a/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.rs
+++ b/tests/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.rs
diff --git a/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.stderr b/tests/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.stderr
index a3c607b59..a3c607b59 100644
--- a/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.stderr
+++ b/tests/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.stderr
diff --git a/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.rs b/tests/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.rs
index 66d562d2e..66d562d2e 100644
--- a/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.rs
+++ b/tests/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.rs
diff --git a/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr b/tests/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr
index 81f3f2694..81f3f2694 100644
--- a/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr
+++ b/tests/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr
diff --git a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.rs b/tests/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.rs
index 73f1856ca..73f1856ca 100644
--- a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.rs
+++ b/tests/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.rs
diff --git a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr b/tests/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr
index 6f853ccab..6f853ccab 100644
--- a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr
+++ b/tests/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr
diff --git a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.rs b/tests/ui/did_you_mean/issue-54109-and_instead_of_ampersands.rs
index 44421b077..44421b077 100644
--- a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.rs
+++ b/tests/ui/did_you_mean/issue-54109-and_instead_of_ampersands.rs
diff --git a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr b/tests/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr
index cbe59e8e0..cbe59e8e0 100644
--- a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr
+++ b/tests/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr
diff --git a/src/test/ui/did_you_mean/issue-54109-without-witness.fixed b/tests/ui/did_you_mean/issue-54109-without-witness.fixed
index 5079a37f4..5079a37f4 100644
--- a/src/test/ui/did_you_mean/issue-54109-without-witness.fixed
+++ b/tests/ui/did_you_mean/issue-54109-without-witness.fixed
diff --git a/src/test/ui/did_you_mean/issue-54109-without-witness.rs b/tests/ui/did_you_mean/issue-54109-without-witness.rs
index 00660a938..00660a938 100644
--- a/src/test/ui/did_you_mean/issue-54109-without-witness.rs
+++ b/tests/ui/did_you_mean/issue-54109-without-witness.rs
diff --git a/src/test/ui/did_you_mean/issue-54109-without-witness.stderr b/tests/ui/did_you_mean/issue-54109-without-witness.stderr
index 6455b0863..6455b0863 100644
--- a/src/test/ui/did_you_mean/issue-54109-without-witness.stderr
+++ b/tests/ui/did_you_mean/issue-54109-without-witness.stderr
diff --git a/src/test/ui/did_you_mean/issue-56028-there-is-an-enum-variant.rs b/tests/ui/did_you_mean/issue-56028-there-is-an-enum-variant.rs
index 264cfa449..264cfa449 100644
--- a/src/test/ui/did_you_mean/issue-56028-there-is-an-enum-variant.rs
+++ b/tests/ui/did_you_mean/issue-56028-there-is-an-enum-variant.rs
diff --git a/src/test/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr b/tests/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr
index abc040c05..abc040c05 100644
--- a/src/test/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr
+++ b/tests/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr
diff --git a/src/test/ui/did_you_mean/issue-87830-try-brackets-for-arrays.rs b/tests/ui/did_you_mean/issue-87830-try-brackets-for-arrays.rs
index 070ffaa1e..070ffaa1e 100644
--- a/src/test/ui/did_you_mean/issue-87830-try-brackets-for-arrays.rs
+++ b/tests/ui/did_you_mean/issue-87830-try-brackets-for-arrays.rs
diff --git a/src/test/ui/did_you_mean/issue-87830-try-brackets-for-arrays.stderr b/tests/ui/did_you_mean/issue-87830-try-brackets-for-arrays.stderr
index d5ad1a72b..d5ad1a72b 100644
--- a/src/test/ui/did_you_mean/issue-87830-try-brackets-for-arrays.stderr
+++ b/tests/ui/did_you_mean/issue-87830-try-brackets-for-arrays.stderr
diff --git a/src/test/ui/did_you_mean/issue-93210-ignore-doc-hidden.rs b/tests/ui/did_you_mean/issue-93210-ignore-doc-hidden.rs
index 0efc7daa3..0efc7daa3 100644
--- a/src/test/ui/did_you_mean/issue-93210-ignore-doc-hidden.rs
+++ b/tests/ui/did_you_mean/issue-93210-ignore-doc-hidden.rs
diff --git a/src/test/ui/did_you_mean/issue-93210-ignore-doc-hidden.stderr b/tests/ui/did_you_mean/issue-93210-ignore-doc-hidden.stderr
index 784986d3b..784986d3b 100644
--- a/src/test/ui/did_you_mean/issue-93210-ignore-doc-hidden.stderr
+++ b/tests/ui/did_you_mean/issue-93210-ignore-doc-hidden.stderr
diff --git a/src/test/ui/did_you_mean/pub-macro-rules.rs b/tests/ui/did_you_mean/pub-macro-rules.rs
index c5393703f..c5393703f 100644
--- a/src/test/ui/did_you_mean/pub-macro-rules.rs
+++ b/tests/ui/did_you_mean/pub-macro-rules.rs
diff --git a/src/test/ui/did_you_mean/pub-macro-rules.stderr b/tests/ui/did_you_mean/pub-macro-rules.stderr
index 0bde5783b..0bde5783b 100644
--- a/src/test/ui/did_you_mean/pub-macro-rules.stderr
+++ b/tests/ui/did_you_mean/pub-macro-rules.stderr
diff --git a/src/test/ui/did_you_mean/recursion_limit.rs b/tests/ui/did_you_mean/recursion_limit.rs
index 38db12960..38db12960 100644
--- a/src/test/ui/did_you_mean/recursion_limit.rs
+++ b/tests/ui/did_you_mean/recursion_limit.rs
diff --git a/src/test/ui/did_you_mean/recursion_limit.stderr b/tests/ui/did_you_mean/recursion_limit.stderr
index 247fe4b5b..247fe4b5b 100644
--- a/src/test/ui/did_you_mean/recursion_limit.stderr
+++ b/tests/ui/did_you_mean/recursion_limit.stderr
diff --git a/src/test/ui/did_you_mean/recursion_limit_deref.rs b/tests/ui/did_you_mean/recursion_limit_deref.rs
index 41bbca661..41bbca661 100644
--- a/src/test/ui/did_you_mean/recursion_limit_deref.rs
+++ b/tests/ui/did_you_mean/recursion_limit_deref.rs
diff --git a/src/test/ui/did_you_mean/recursion_limit_deref.stderr b/tests/ui/did_you_mean/recursion_limit_deref.stderr
index a6b5681a6..a6b5681a6 100644
--- a/src/test/ui/did_you_mean/recursion_limit_deref.stderr
+++ b/tests/ui/did_you_mean/recursion_limit_deref.stderr
diff --git a/src/test/ui/did_you_mean/recursion_limit_macro.rs b/tests/ui/did_you_mean/recursion_limit_macro.rs
index a68a5ece7..a68a5ece7 100644
--- a/src/test/ui/did_you_mean/recursion_limit_macro.rs
+++ b/tests/ui/did_you_mean/recursion_limit_macro.rs
diff --git a/src/test/ui/did_you_mean/recursion_limit_macro.stderr b/tests/ui/did_you_mean/recursion_limit_macro.stderr
index 71855cf1e..71855cf1e 100644
--- a/src/test/ui/did_you_mean/recursion_limit_macro.stderr
+++ b/tests/ui/did_you_mean/recursion_limit_macro.stderr
diff --git a/src/test/ui/did_you_mean/replace-impl-infer-ty-from-trait.fixed b/tests/ui/did_you_mean/replace-impl-infer-ty-from-trait.fixed
index 4963790c3..4963790c3 100644
--- a/src/test/ui/did_you_mean/replace-impl-infer-ty-from-trait.fixed
+++ b/tests/ui/did_you_mean/replace-impl-infer-ty-from-trait.fixed
diff --git a/src/test/ui/did_you_mean/replace-impl-infer-ty-from-trait.rs b/tests/ui/did_you_mean/replace-impl-infer-ty-from-trait.rs
index ddf39c9c8..ddf39c9c8 100644
--- a/src/test/ui/did_you_mean/replace-impl-infer-ty-from-trait.rs
+++ b/tests/ui/did_you_mean/replace-impl-infer-ty-from-trait.rs
diff --git a/src/test/ui/did_you_mean/replace-impl-infer-ty-from-trait.stderr b/tests/ui/did_you_mean/replace-impl-infer-ty-from-trait.stderr
index 730836a40..730836a40 100644
--- a/src/test/ui/did_you_mean/replace-impl-infer-ty-from-trait.stderr
+++ b/tests/ui/did_you_mean/replace-impl-infer-ty-from-trait.stderr
diff --git a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.rs b/tests/ui/did_you_mean/trait-object-reference-without-parens-suggestion.rs
index c9a097d36..c9a097d36 100644
--- a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.rs
+++ b/tests/ui/did_you_mean/trait-object-reference-without-parens-suggestion.rs
diff --git a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr b/tests/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr
index 68734cd4c..68734cd4c 100644
--- a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr
+++ b/tests/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr
diff --git a/src/test/ui/did_you_mean/use_instead_of_import.fixed b/tests/ui/did_you_mean/use_instead_of_import.fixed
index a8aae76f4..a8aae76f4 100644
--- a/src/test/ui/did_you_mean/use_instead_of_import.fixed
+++ b/tests/ui/did_you_mean/use_instead_of_import.fixed
diff --git a/src/test/ui/did_you_mean/use_instead_of_import.rs b/tests/ui/did_you_mean/use_instead_of_import.rs
index 2db7c2407..2db7c2407 100644
--- a/src/test/ui/did_you_mean/use_instead_of_import.rs
+++ b/tests/ui/did_you_mean/use_instead_of_import.rs
diff --git a/src/test/ui/did_you_mean/use_instead_of_import.stderr b/tests/ui/did_you_mean/use_instead_of_import.stderr
index 2aac8f68c..2aac8f68c 100644
--- a/src/test/ui/did_you_mean/use_instead_of_import.stderr
+++ b/tests/ui/did_you_mean/use_instead_of_import.stderr
diff --git a/src/test/ui/directory_ownership/foo/compiletest-ignore-dir b/tests/ui/directory_ownership/foo/compiletest-ignore-dir
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/directory_ownership/foo/compiletest-ignore-dir
+++ b/tests/ui/directory_ownership/foo/compiletest-ignore-dir
diff --git a/src/test/ui/directory_ownership/foo/mod_file_not_owning/aux2.rs b/tests/ui/directory_ownership/foo/mod_file_not_owning/aux2.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/ui/directory_ownership/foo/mod_file_not_owning/aux2.rs
+++ b/tests/ui/directory_ownership/foo/mod_file_not_owning/aux2.rs
diff --git a/src/test/ui/directory_ownership/foo/mod_file_not_owning_aux2.rs b/tests/ui/directory_ownership/foo/mod_file_not_owning_aux2.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/ui/directory_ownership/foo/mod_file_not_owning_aux2.rs
+++ b/tests/ui/directory_ownership/foo/mod_file_not_owning_aux2.rs
diff --git a/src/test/ui/directory_ownership/macro-expanded-mod.rs b/tests/ui/directory_ownership/macro-expanded-mod.rs
index fa81769e5..fa81769e5 100644
--- a/src/test/ui/directory_ownership/macro-expanded-mod.rs
+++ b/tests/ui/directory_ownership/macro-expanded-mod.rs
diff --git a/src/test/ui/directory_ownership/macro-expanded-mod.stderr b/tests/ui/directory_ownership/macro-expanded-mod.stderr
index 8976341b1..8976341b1 100644
--- a/src/test/ui/directory_ownership/macro-expanded-mod.stderr
+++ b/tests/ui/directory_ownership/macro-expanded-mod.stderr
diff --git a/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/bar.rs b/tests/ui/directory_ownership/macro_expanded_mod_helper/foo/bar.rs
index 01c087dbc..01c087dbc 100644
--- a/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/bar.rs
+++ b/tests/ui/directory_ownership/macro_expanded_mod_helper/foo/bar.rs
diff --git a/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/mod.rs b/tests/ui/directory_ownership/macro_expanded_mod_helper/foo/mod.rs
index 2ec1c8bcc..2ec1c8bcc 100644
--- a/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/mod.rs
+++ b/tests/ui/directory_ownership/macro_expanded_mod_helper/foo/mod.rs
diff --git a/src/test/ui/directory_ownership/mod_file_not_owning_aux1.rs b/tests/ui/directory_ownership/mod_file_not_owning_aux1.rs
index eb5e8e3e1..eb5e8e3e1 100644
--- a/src/test/ui/directory_ownership/mod_file_not_owning_aux1.rs
+++ b/tests/ui/directory_ownership/mod_file_not_owning_aux1.rs
diff --git a/src/test/ui/directory_ownership/mod_file_not_owning_aux1/compiletest-ignore-dir b/tests/ui/directory_ownership/mod_file_not_owning_aux1/compiletest-ignore-dir
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/directory_ownership/mod_file_not_owning_aux1/compiletest-ignore-dir
+++ b/tests/ui/directory_ownership/mod_file_not_owning_aux1/compiletest-ignore-dir
diff --git a/src/test/ui/directory_ownership/mod_file_not_owning_aux1/mod_file_not_owning_aux2.rs b/tests/ui/directory_ownership/mod_file_not_owning_aux1/mod_file_not_owning_aux2.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/ui/directory_ownership/mod_file_not_owning_aux1/mod_file_not_owning_aux2.rs
+++ b/tests/ui/directory_ownership/mod_file_not_owning_aux1/mod_file_not_owning_aux2.rs
diff --git a/src/test/ui/directory_ownership/mod_file_not_owning_aux2.rs b/tests/ui/directory_ownership/mod_file_not_owning_aux2.rs
index 920938c4a..920938c4a 100644
--- a/src/test/ui/directory_ownership/mod_file_not_owning_aux2.rs
+++ b/tests/ui/directory_ownership/mod_file_not_owning_aux2.rs
diff --git a/src/test/ui/directory_ownership/mod_file_not_owning_aux3.rs b/tests/ui/directory_ownership/mod_file_not_owning_aux3.rs
index 6e4a39289..6e4a39289 100644
--- a/src/test/ui/directory_ownership/mod_file_not_owning_aux3.rs
+++ b/tests/ui/directory_ownership/mod_file_not_owning_aux3.rs
diff --git a/src/test/ui/directory_ownership/non-inline-mod-restriction.rs b/tests/ui/directory_ownership/non-inline-mod-restriction.rs
index de4f81665..de4f81665 100644
--- a/src/test/ui/directory_ownership/non-inline-mod-restriction.rs
+++ b/tests/ui/directory_ownership/non-inline-mod-restriction.rs
diff --git a/src/test/ui/directory_ownership/non-inline-mod-restriction.stderr b/tests/ui/directory_ownership/non-inline-mod-restriction.stderr
index 64189bee4..64189bee4 100644
--- a/src/test/ui/directory_ownership/non-inline-mod-restriction.stderr
+++ b/tests/ui/directory_ownership/non-inline-mod-restriction.stderr
diff --git a/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.fixed b/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.fixed
new file mode 100644
index 000000000..ae0a84eea
--- /dev/null
+++ b/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.fixed
@@ -0,0 +1,21 @@
+// run-rustfix
+struct X {
+    x: String,
+}
+
+impl Drop for X {
+    fn drop(&mut self) {
+        println!("value: {}", self.x);
+    }
+}
+
+fn unwrap(x: X) -> String {
+    let X { x: ref y } = x; //~ ERROR cannot move out of type
+    y.to_string()
+}
+
+fn main() {
+    let x = X { x: "hello".to_string() };
+    let y = unwrap(x);
+    println!("contents: {}", y);
+}
diff --git a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.rs b/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.rs
index 8e394498a..c8db78610 100644
--- a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.rs
+++ b/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.rs
@@ -1,3 +1,4 @@
+// run-rustfix
 struct X {
     x: String,
 }
@@ -10,7 +11,7 @@ impl Drop for X {
 
 fn unwrap(x: X) -> String {
     let X { x: y } = x; //~ ERROR cannot move out of type
-    y
+    y.to_string()
 }
 
 fn main() {
diff --git a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.stderr b/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.stderr
index cda81d136..596ad4bf7 100644
--- a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.stderr
+++ b/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.stderr
@@ -1,11 +1,16 @@
 error[E0509]: cannot move out of type `X`, which implements the `Drop` trait
-  --> $DIR/disallowed-deconstructing-destructing-struct-let.rs:12:22
+  --> $DIR/disallowed-deconstructing-destructing-struct-let.rs:13:22
    |
 LL |     let X { x: y } = x;
    |                -     ^ cannot move out of here
    |                |
    |                data moved here
    |                move occurs because `y` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     let X { x: ref y } = x;
+   |                +++
 
 error: aborting due to previous error
 
diff --git a/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.fixed b/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.fixed
new file mode 100644
index 000000000..c8a451efe
--- /dev/null
+++ b/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.fixed
@@ -0,0 +1,19 @@
+// run-rustfix
+struct X {
+    x: String,
+}
+
+impl Drop for X {
+    fn drop(&mut self) {
+        println!("value: {}", self.x);
+    }
+}
+
+fn main() {
+    let x = X { x: "hello".to_string() };
+
+    match x {
+    //~^ ERROR cannot move out of type `X`, which implements the `Drop` trait
+        X { x: ref y } => println!("contents: {}", y)
+    }
+}
diff --git a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.rs b/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.rs
index 9c996a93b..815567ffe 100644
--- a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.rs
+++ b/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.rs
@@ -1,3 +1,4 @@
+// run-rustfix
 struct X {
     x: String,
 }
diff --git a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.stderr b/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.stderr
index 70cdd6446..e32a4dd44 100644
--- a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.stderr
+++ b/tests/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.stderr
@@ -1,5 +1,5 @@
 error[E0509]: cannot move out of type `X`, which implements the `Drop` trait
-  --> $DIR/disallowed-deconstructing-destructing-struct-match.rs:14:11
+  --> $DIR/disallowed-deconstructing-destructing-struct-match.rs:15:11
    |
 LL |     match x {
    |           ^ cannot move out of here
@@ -9,6 +9,11 @@ LL |         X { x: y } => println!("contents: {}", y)
    |                |
    |                data moved here
    |                move occurs because `y` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |         X { x: ref y } => println!("contents: {}", y)
+   |                +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/disambiguate-identical-names.rs b/tests/ui/disambiguate-identical-names.rs
index 708d2cd76..708d2cd76 100644
--- a/src/test/ui/disambiguate-identical-names.rs
+++ b/tests/ui/disambiguate-identical-names.rs
diff --git a/src/test/ui/disambiguate-identical-names.stderr b/tests/ui/disambiguate-identical-names.stderr
index 42925cfed..87560c4c7 100644
--- a/src/test/ui/disambiguate-identical-names.stderr
+++ b/tests/ui/disambiguate-identical-names.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/disambiguate-identical-names.rs:13:10
    |
 LL |     test(&v);
-   |     ---- ^^ expected struct `std::vec::Vec`, found struct `HashMap`
+   |     ---- ^^ expected struct `Vec`, found struct `HashMap`
    |     |
    |     arguments to this function are incorrect
    |
diff --git a/src/test/ui/discrim/discrim-ill-typed.rs b/tests/ui/discrim/discrim-ill-typed.rs
index 3cf0ea0e6..3cf0ea0e6 100644
--- a/src/test/ui/discrim/discrim-ill-typed.rs
+++ b/tests/ui/discrim/discrim-ill-typed.rs
diff --git a/src/test/ui/discrim/discrim-ill-typed.stderr b/tests/ui/discrim/discrim-ill-typed.stderr
index 27f516341..27f516341 100644
--- a/src/test/ui/discrim/discrim-ill-typed.stderr
+++ b/tests/ui/discrim/discrim-ill-typed.stderr
diff --git a/src/test/ui/discrim/discrim-overflow-2.rs b/tests/ui/discrim/discrim-overflow-2.rs
index ca24317c5..ca24317c5 100644
--- a/src/test/ui/discrim/discrim-overflow-2.rs
+++ b/tests/ui/discrim/discrim-overflow-2.rs
diff --git a/src/test/ui/discrim/discrim-overflow-2.stderr b/tests/ui/discrim/discrim-overflow-2.stderr
index 3ca84c667..3ca84c667 100644
--- a/src/test/ui/discrim/discrim-overflow-2.stderr
+++ b/tests/ui/discrim/discrim-overflow-2.stderr
diff --git a/src/test/ui/discrim/discrim-overflow.rs b/tests/ui/discrim/discrim-overflow.rs
index 774ced93c..774ced93c 100644
--- a/src/test/ui/discrim/discrim-overflow.rs
+++ b/tests/ui/discrim/discrim-overflow.rs
diff --git a/src/test/ui/discrim/discrim-overflow.stderr b/tests/ui/discrim/discrim-overflow.stderr
index 1b331bb1b..1b331bb1b 100644
--- a/src/test/ui/discrim/discrim-overflow.stderr
+++ b/tests/ui/discrim/discrim-overflow.stderr
diff --git a/src/test/ui/diverging-fallback-method-chain.rs b/tests/ui/diverging-fallback-method-chain.rs
index ba9f05c64..ba9f05c64 100644
--- a/src/test/ui/diverging-fallback-method-chain.rs
+++ b/tests/ui/diverging-fallback-method-chain.rs
diff --git a/src/test/ui/diverging-fallback-option.rs b/tests/ui/diverging-fallback-option.rs
index 46bdfc96d..46bdfc96d 100644
--- a/src/test/ui/diverging-fallback-option.rs
+++ b/tests/ui/diverging-fallback-option.rs
diff --git a/src/test/ui/diverging-fn-tail-35849.rs b/tests/ui/diverging-fn-tail-35849.rs
index f21ce2973..f21ce2973 100644
--- a/src/test/ui/diverging-fn-tail-35849.rs
+++ b/tests/ui/diverging-fn-tail-35849.rs
diff --git a/src/test/ui/diverging-fn-tail-35849.stderr b/tests/ui/diverging-fn-tail-35849.stderr
index 21361489a..21361489a 100644
--- a/src/test/ui/diverging-fn-tail-35849.stderr
+++ b/tests/ui/diverging-fn-tail-35849.stderr
diff --git a/src/test/ui/does-nothing.rs b/tests/ui/does-nothing.rs
index e4992e2cf..e4992e2cf 100644
--- a/src/test/ui/does-nothing.rs
+++ b/tests/ui/does-nothing.rs
diff --git a/src/test/ui/does-nothing.stderr b/tests/ui/does-nothing.stderr
index dca792315..dca792315 100644
--- a/src/test/ui/does-nothing.stderr
+++ b/tests/ui/does-nothing.stderr
diff --git a/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.rs b/tests/ui/dollar-crate/dollar-crate-is-keyword-2.rs
index bbab6f877..bbab6f877 100644
--- a/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.rs
+++ b/tests/ui/dollar-crate/dollar-crate-is-keyword-2.rs
diff --git a/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr b/tests/ui/dollar-crate/dollar-crate-is-keyword-2.stderr
index d46029710..d46029710 100644
--- a/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr
+++ b/tests/ui/dollar-crate/dollar-crate-is-keyword-2.stderr
diff --git a/src/test/ui/dollar-crate/dollar-crate-is-keyword.rs b/tests/ui/dollar-crate/dollar-crate-is-keyword.rs
index d625163dc..d625163dc 100644
--- a/src/test/ui/dollar-crate/dollar-crate-is-keyword.rs
+++ b/tests/ui/dollar-crate/dollar-crate-is-keyword.rs
diff --git a/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr b/tests/ui/dollar-crate/dollar-crate-is-keyword.stderr
index b02782230..b02782230 100644
--- a/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr
+++ b/tests/ui/dollar-crate/dollar-crate-is-keyword.stderr
diff --git a/src/test/ui/dont-suggest-private-trait-method.rs b/tests/ui/dont-suggest-private-trait-method.rs
index 6e2b1abd1..6e2b1abd1 100644
--- a/src/test/ui/dont-suggest-private-trait-method.rs
+++ b/tests/ui/dont-suggest-private-trait-method.rs
diff --git a/src/test/ui/dont-suggest-private-trait-method.stderr b/tests/ui/dont-suggest-private-trait-method.stderr
index 1492670dc..1492670dc 100644
--- a/src/test/ui/dont-suggest-private-trait-method.stderr
+++ b/tests/ui/dont-suggest-private-trait-method.stderr
diff --git a/src/test/ui/double-ref.rs b/tests/ui/double-ref.rs
index e68b86833..e68b86833 100644
--- a/src/test/ui/double-ref.rs
+++ b/tests/ui/double-ref.rs
diff --git a/src/test/ui/double-type-import.rs b/tests/ui/double-type-import.rs
index 6b1eb65d5..6b1eb65d5 100644
--- a/src/test/ui/double-type-import.rs
+++ b/tests/ui/double-type-import.rs
diff --git a/src/test/ui/double-type-import.stderr b/tests/ui/double-type-import.stderr
index a2f30d82e..a2f30d82e 100644
--- a/src/test/ui/double-type-import.stderr
+++ b/tests/ui/double-type-import.stderr
diff --git a/src/test/ui/drop-bounds/drop-bounds-impl-drop.rs b/tests/ui/drop-bounds/drop-bounds-impl-drop.rs
index 063efc7b3..063efc7b3 100644
--- a/src/test/ui/drop-bounds/drop-bounds-impl-drop.rs
+++ b/tests/ui/drop-bounds/drop-bounds-impl-drop.rs
diff --git a/src/test/ui/drop-bounds/drop-bounds.rs b/tests/ui/drop-bounds/drop-bounds.rs
index c73538278..c73538278 100644
--- a/src/test/ui/drop-bounds/drop-bounds.rs
+++ b/tests/ui/drop-bounds/drop-bounds.rs
diff --git a/src/test/ui/drop-bounds/drop-bounds.stderr b/tests/ui/drop-bounds/drop-bounds.stderr
index 3ffb855a5..3ffb855a5 100644
--- a/src/test/ui/drop-bounds/drop-bounds.stderr
+++ b/tests/ui/drop-bounds/drop-bounds.stderr
diff --git a/src/test/ui/drop/auxiliary/dropck_eyepatch_extern_crate.rs b/tests/ui/drop/auxiliary/dropck_eyepatch_extern_crate.rs
index 270d5de7a..270d5de7a 100644
--- a/src/test/ui/drop/auxiliary/dropck_eyepatch_extern_crate.rs
+++ b/tests/ui/drop/auxiliary/dropck_eyepatch_extern_crate.rs
diff --git a/src/test/ui/drop/auxiliary/inline_dtor.rs b/tests/ui/drop/auxiliary/inline_dtor.rs
index 5eee89fdc..5eee89fdc 100644
--- a/src/test/ui/drop/auxiliary/inline_dtor.rs
+++ b/tests/ui/drop/auxiliary/inline_dtor.rs
diff --git a/src/test/ui/drop/auxiliary/issue-10028.rs b/tests/ui/drop/auxiliary/issue-10028.rs
index 135f26f40..135f26f40 100644
--- a/src/test/ui/drop/auxiliary/issue-10028.rs
+++ b/tests/ui/drop/auxiliary/issue-10028.rs
diff --git a/src/test/ui/drop/drop-foreign-fundamental.rs b/tests/ui/drop/drop-foreign-fundamental.rs
index c43df40d6..c43df40d6 100644
--- a/src/test/ui/drop/drop-foreign-fundamental.rs
+++ b/tests/ui/drop/drop-foreign-fundamental.rs
diff --git a/src/test/ui/drop/drop-foreign-fundamental.stderr b/tests/ui/drop/drop-foreign-fundamental.stderr
index fbd1ba085..fbd1ba085 100644
--- a/src/test/ui/drop/drop-foreign-fundamental.stderr
+++ b/tests/ui/drop/drop-foreign-fundamental.stderr
diff --git a/src/test/ui/drop/drop-if-let-binding.rs b/tests/ui/drop/drop-if-let-binding.rs
index 9c1ac4e0c..9c1ac4e0c 100644
--- a/src/test/ui/drop/drop-if-let-binding.rs
+++ b/tests/ui/drop/drop-if-let-binding.rs
diff --git a/src/test/ui/drop/drop-on-empty-block-exit.rs b/tests/ui/drop/drop-on-empty-block-exit.rs
index ef3a90a53..ef3a90a53 100644
--- a/src/test/ui/drop/drop-on-empty-block-exit.rs
+++ b/tests/ui/drop/drop-on-empty-block-exit.rs
diff --git a/src/test/ui/drop/drop-on-ret.rs b/tests/ui/drop/drop-on-ret.rs
index 290e274f3..290e274f3 100644
--- a/src/test/ui/drop/drop-on-ret.rs
+++ b/tests/ui/drop/drop-on-ret.rs
diff --git a/src/test/ui/drop/drop-struct-as-object.rs b/tests/ui/drop/drop-struct-as-object.rs
index 377027a4f..377027a4f 100644
--- a/src/test/ui/drop/drop-struct-as-object.rs
+++ b/tests/ui/drop/drop-struct-as-object.rs
diff --git a/src/test/ui/drop/drop-trait-enum.rs b/tests/ui/drop/drop-trait-enum.rs
index d2b77650a..d2b77650a 100644
--- a/src/test/ui/drop/drop-trait-enum.rs
+++ b/tests/ui/drop/drop-trait-enum.rs
diff --git a/src/test/ui/drop/drop-trait-generic.rs b/tests/ui/drop/drop-trait-generic.rs
index cdefb680c..cdefb680c 100644
--- a/src/test/ui/drop/drop-trait-generic.rs
+++ b/tests/ui/drop/drop-trait-generic.rs
diff --git a/src/test/ui/drop/drop-trait.rs b/tests/ui/drop/drop-trait.rs
index d93f77180..d93f77180 100644
--- a/src/test/ui/drop/drop-trait.rs
+++ b/tests/ui/drop/drop-trait.rs
diff --git a/src/test/ui/drop/drop-uninhabited-enum.rs b/tests/ui/drop/drop-uninhabited-enum.rs
index b3566f685..b3566f685 100644
--- a/src/test/ui/drop/drop-uninhabited-enum.rs
+++ b/tests/ui/drop/drop-uninhabited-enum.rs
diff --git a/src/test/ui/drop/drop-with-type-ascription-1.rs b/tests/ui/drop/drop-with-type-ascription-1.rs
index e5a1a48df..e5a1a48df 100644
--- a/src/test/ui/drop/drop-with-type-ascription-1.rs
+++ b/tests/ui/drop/drop-with-type-ascription-1.rs
diff --git a/src/test/ui/drop/drop-with-type-ascription-2.rs b/tests/ui/drop/drop-with-type-ascription-2.rs
index fb70ad48e..fb70ad48e 100644
--- a/src/test/ui/drop/drop-with-type-ascription-2.rs
+++ b/tests/ui/drop/drop-with-type-ascription-2.rs
diff --git a/src/test/ui/drop/drop_order.rs b/tests/ui/drop/drop_order.rs
index 5ce1fd54a..5ce1fd54a 100644
--- a/src/test/ui/drop/drop_order.rs
+++ b/tests/ui/drop/drop_order.rs
diff --git a/src/test/ui/drop/dropck-eyepatch-extern-crate.rs b/tests/ui/drop/dropck-eyepatch-extern-crate.rs
index fecfd5edf..fecfd5edf 100644
--- a/src/test/ui/drop/dropck-eyepatch-extern-crate.rs
+++ b/tests/ui/drop/dropck-eyepatch-extern-crate.rs
diff --git a/src/test/ui/drop/dropck-eyepatch-reorder.rs b/tests/ui/drop/dropck-eyepatch-reorder.rs
index 0d7af3d4f..0d7af3d4f 100644
--- a/src/test/ui/drop/dropck-eyepatch-reorder.rs
+++ b/tests/ui/drop/dropck-eyepatch-reorder.rs
diff --git a/src/test/ui/drop/dropck-eyepatch.rs b/tests/ui/drop/dropck-eyepatch.rs
index 3c4840d5c..3c4840d5c 100644
--- a/src/test/ui/drop/dropck-eyepatch.rs
+++ b/tests/ui/drop/dropck-eyepatch.rs
diff --git a/src/test/ui/drop/dropck_legal_cycles.rs b/tests/ui/drop/dropck_legal_cycles.rs
index 6a0fe7784..6a0fe7784 100644
--- a/src/test/ui/drop/dropck_legal_cycles.rs
+++ b/tests/ui/drop/dropck_legal_cycles.rs
diff --git a/src/test/ui/drop/dynamic-drop-async.rs b/tests/ui/drop/dynamic-drop-async.rs
index 8f1cc6691..8f1cc6691 100644
--- a/src/test/ui/drop/dynamic-drop-async.rs
+++ b/tests/ui/drop/dynamic-drop-async.rs
diff --git a/src/test/ui/drop/dynamic-drop.rs b/tests/ui/drop/dynamic-drop.rs
index 9e51d3ada..9e51d3ada 100644
--- a/src/test/ui/drop/dynamic-drop.rs
+++ b/tests/ui/drop/dynamic-drop.rs
diff --git a/src/test/ui/drop/issue-100276.rs b/tests/ui/drop/issue-100276.rs
index 6401a8d14..6401a8d14 100644
--- a/src/test/ui/drop/issue-100276.rs
+++ b/tests/ui/drop/issue-100276.rs
diff --git a/src/test/ui/drop/issue-10028.rs b/tests/ui/drop/issue-10028.rs
index 1692470e8..1692470e8 100644
--- a/src/test/ui/drop/issue-10028.rs
+++ b/tests/ui/drop/issue-10028.rs
diff --git a/src/test/ui/drop/issue-103107.rs b/tests/ui/drop/issue-103107.rs
index 5f4475956..5f4475956 100644
--- a/src/test/ui/drop/issue-103107.rs
+++ b/tests/ui/drop/issue-103107.rs
diff --git a/src/test/ui/drop/issue-17718-const-destructors.rs b/tests/ui/drop/issue-17718-const-destructors.rs
index c9a729c7b..c9a729c7b 100644
--- a/src/test/ui/drop/issue-17718-const-destructors.rs
+++ b/tests/ui/drop/issue-17718-const-destructors.rs
diff --git a/src/test/ui/issues/issue-21486.rs b/tests/ui/drop/issue-21486.rs
index 46d6ccd56..46d6ccd56 100644
--- a/src/test/ui/issues/issue-21486.rs
+++ b/tests/ui/drop/issue-21486.rs
diff --git a/src/test/ui/drop/issue-23338-ensure-param-drop-order.rs b/tests/ui/drop/issue-23338-ensure-param-drop-order.rs
index a99f260dd..a99f260dd 100644
--- a/src/test/ui/drop/issue-23338-ensure-param-drop-order.rs
+++ b/tests/ui/drop/issue-23338-ensure-param-drop-order.rs
diff --git a/src/test/ui/issues/issue-2734.rs b/tests/ui/drop/issue-2734.rs
index df4f394dc..df4f394dc 100644
--- a/src/test/ui/issues/issue-2734.rs
+++ b/tests/ui/drop/issue-2734.rs
diff --git a/src/test/ui/drop/issue-30018-nopanic.rs b/tests/ui/drop/issue-30018-nopanic.rs
index 291bab273..291bab273 100644
--- a/src/test/ui/drop/issue-30018-nopanic.rs
+++ b/tests/ui/drop/issue-30018-nopanic.rs
diff --git a/src/test/ui/drop/issue-35546.rs b/tests/ui/drop/issue-35546.rs
index 004679a62..004679a62 100644
--- a/src/test/ui/drop/issue-35546.rs
+++ b/tests/ui/drop/issue-35546.rs
diff --git a/src/test/ui/drop/issue-48962.rs b/tests/ui/drop/issue-48962.rs
index 80d815379..80d815379 100644
--- a/src/test/ui/drop/issue-48962.rs
+++ b/tests/ui/drop/issue-48962.rs
diff --git a/src/test/ui/drop/issue-90752-raw-ptr-shenanigans.rs b/tests/ui/drop/issue-90752-raw-ptr-shenanigans.rs
index 4e67b3594..4e67b3594 100644
--- a/src/test/ui/drop/issue-90752-raw-ptr-shenanigans.rs
+++ b/tests/ui/drop/issue-90752-raw-ptr-shenanigans.rs
diff --git a/src/test/ui/drop/issue-90752.rs b/tests/ui/drop/issue-90752.rs
index 4395e45e7..4395e45e7 100644
--- a/src/test/ui/drop/issue-90752.rs
+++ b/tests/ui/drop/issue-90752.rs
diff --git a/src/test/ui/drop/no-drop-flag-size.rs b/tests/ui/drop/no-drop-flag-size.rs
index 103e70ef6..103e70ef6 100644
--- a/src/test/ui/drop/no-drop-flag-size.rs
+++ b/tests/ui/drop/no-drop-flag-size.rs
diff --git a/src/test/ui/drop/nondrop-cycle.rs b/tests/ui/drop/nondrop-cycle.rs
index 29070f917..29070f917 100644
--- a/src/test/ui/drop/nondrop-cycle.rs
+++ b/tests/ui/drop/nondrop-cycle.rs
diff --git a/src/test/ui/drop/repeat-drop-2.rs b/tests/ui/drop/repeat-drop-2.rs
index 3cfacea5e..3cfacea5e 100644
--- a/src/test/ui/drop/repeat-drop-2.rs
+++ b/tests/ui/drop/repeat-drop-2.rs
diff --git a/src/test/ui/drop/repeat-drop-2.stderr b/tests/ui/drop/repeat-drop-2.stderr
index f030228f7..f030228f7 100644
--- a/src/test/ui/drop/repeat-drop-2.stderr
+++ b/tests/ui/drop/repeat-drop-2.stderr
diff --git a/src/test/ui/drop/repeat-drop.rs b/tests/ui/drop/repeat-drop.rs
index 8fd46ecaf..8fd46ecaf 100644
--- a/src/test/ui/drop/repeat-drop.rs
+++ b/tests/ui/drop/repeat-drop.rs
diff --git a/src/test/ui/drop/terminate-in-initializer.rs b/tests/ui/drop/terminate-in-initializer.rs
index 66f267aa7..66f267aa7 100644
--- a/src/test/ui/drop/terminate-in-initializer.rs
+++ b/tests/ui/drop/terminate-in-initializer.rs
diff --git a/src/test/ui/drop/use_inline_dtor.rs b/tests/ui/drop/use_inline_dtor.rs
index ac916de46..ac916de46 100644
--- a/src/test/ui/drop/use_inline_dtor.rs
+++ b/tests/ui/drop/use_inline_dtor.rs
diff --git a/src/test/ui/dropck/auxiliary/dropck_eyepatch_extern_crate.rs b/tests/ui/dropck/auxiliary/dropck_eyepatch_extern_crate.rs
index e07082957..e07082957 100644
--- a/src/test/ui/dropck/auxiliary/dropck_eyepatch_extern_crate.rs
+++ b/tests/ui/dropck/auxiliary/dropck_eyepatch_extern_crate.rs
diff --git a/src/test/ui/dropck/cleanup-arm-conditional.rs b/tests/ui/dropck/cleanup-arm-conditional.rs
index 38c717089..38c717089 100644
--- a/src/test/ui/dropck/cleanup-arm-conditional.rs
+++ b/tests/ui/dropck/cleanup-arm-conditional.rs
diff --git a/src/test/ui/dropck/drop-on-non-struct.rs b/tests/ui/dropck/drop-on-non-struct.rs
index 145eab126..145eab126 100644
--- a/src/test/ui/dropck/drop-on-non-struct.rs
+++ b/tests/ui/dropck/drop-on-non-struct.rs
diff --git a/src/test/ui/dropck/drop-on-non-struct.stderr b/tests/ui/dropck/drop-on-non-struct.stderr
index e8fbe5e97..e8fbe5e97 100644
--- a/src/test/ui/dropck/drop-on-non-struct.stderr
+++ b/tests/ui/dropck/drop-on-non-struct.stderr
diff --git a/src/test/ui/dropck/drop-with-active-borrows-1.rs b/tests/ui/dropck/drop-with-active-borrows-1.rs
index 1e924af29..1e924af29 100644
--- a/src/test/ui/dropck/drop-with-active-borrows-1.rs
+++ b/tests/ui/dropck/drop-with-active-borrows-1.rs
diff --git a/src/test/ui/dropck/drop-with-active-borrows-1.stderr b/tests/ui/dropck/drop-with-active-borrows-1.stderr
index 8d6a7f372..8d6a7f372 100644
--- a/src/test/ui/dropck/drop-with-active-borrows-1.stderr
+++ b/tests/ui/dropck/drop-with-active-borrows-1.stderr
diff --git a/src/test/ui/dropck/drop-with-active-borrows-2.rs b/tests/ui/dropck/drop-with-active-borrows-2.rs
index cf4cb3dbe..cf4cb3dbe 100644
--- a/src/test/ui/dropck/drop-with-active-borrows-2.rs
+++ b/tests/ui/dropck/drop-with-active-borrows-2.rs
diff --git a/src/test/ui/dropck/drop-with-active-borrows-2.stderr b/tests/ui/dropck/drop-with-active-borrows-2.stderr
index 24650dfac..24650dfac 100644
--- a/src/test/ui/dropck/drop-with-active-borrows-2.stderr
+++ b/tests/ui/dropck/drop-with-active-borrows-2.stderr
diff --git a/src/test/ui/dropck/dropck-eyepatch-extern-crate.rs b/tests/ui/dropck/dropck-eyepatch-extern-crate.rs
index b8f303554..b8f303554 100644
--- a/src/test/ui/dropck/dropck-eyepatch-extern-crate.rs
+++ b/tests/ui/dropck/dropck-eyepatch-extern-crate.rs
diff --git a/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr b/tests/ui/dropck/dropck-eyepatch-extern-crate.stderr
index 5d5340557..5d5340557 100644
--- a/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr
+++ b/tests/ui/dropck/dropck-eyepatch-extern-crate.stderr
diff --git a/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.rs b/tests/ui/dropck/dropck-eyepatch-implies-unsafe-impl.rs
index 6869ab1c4..6869ab1c4 100644
--- a/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.rs
+++ b/tests/ui/dropck/dropck-eyepatch-implies-unsafe-impl.rs
diff --git a/tests/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr b/tests/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr
new file mode 100644
index 000000000..5cec2bcb0
--- /dev/null
+++ b/tests/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr
@@ -0,0 +1,27 @@
+error[E0569]: requires an `unsafe impl` declaration due to `#[may_dangle]` attribute
+  --> $DIR/dropck-eyepatch-implies-unsafe-impl.rs:21:1
+   |
+LL | impl<#[may_dangle] A, B: fmt::Debug> Drop for Pt<A, B> {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: the trait `Drop` enforces invariants that the compiler can't check. Review the trait documentation and make sure this implementation upholds those invariants before adding the `unsafe` keyword
+help: add `unsafe` to this trait implementation
+   |
+LL | unsafe impl<#[may_dangle] A, B: fmt::Debug> Drop for Pt<A, B> {
+   | ++++++
+
+error[E0569]: requires an `unsafe impl` declaration due to `#[may_dangle]` attribute
+  --> $DIR/dropck-eyepatch-implies-unsafe-impl.rs:27:1
+   |
+LL | impl<#[may_dangle] 'a, 'b, B: fmt::Debug> Drop for Pr<'a, 'b, B> {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: the trait `Drop` enforces invariants that the compiler can't check. Review the trait documentation and make sure this implementation upholds those invariants before adding the `unsafe` keyword
+help: add `unsafe` to this trait implementation
+   |
+LL | unsafe impl<#[may_dangle] 'a, 'b, B: fmt::Debug> Drop for Pr<'a, 'b, B> {
+   | ++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0569`.
diff --git a/src/test/ui/dropck/dropck-eyepatch-reorder.rs b/tests/ui/dropck/dropck-eyepatch-reorder.rs
index 44552b3fc..44552b3fc 100644
--- a/src/test/ui/dropck/dropck-eyepatch-reorder.rs
+++ b/tests/ui/dropck/dropck-eyepatch-reorder.rs
diff --git a/src/test/ui/dropck/dropck-eyepatch-reorder.stderr b/tests/ui/dropck/dropck-eyepatch-reorder.stderr
index 5055cdd8b..5055cdd8b 100644
--- a/src/test/ui/dropck/dropck-eyepatch-reorder.stderr
+++ b/tests/ui/dropck/dropck-eyepatch-reorder.stderr
diff --git a/src/test/ui/dropck/dropck-eyepatch.rs b/tests/ui/dropck/dropck-eyepatch.rs
index ec1c68561..ec1c68561 100644
--- a/src/test/ui/dropck/dropck-eyepatch.rs
+++ b/tests/ui/dropck/dropck-eyepatch.rs
diff --git a/src/test/ui/dropck/dropck-eyepatch.stderr b/tests/ui/dropck/dropck-eyepatch.stderr
index 21295e6c6..21295e6c6 100644
--- a/src/test/ui/dropck/dropck-eyepatch.stderr
+++ b/tests/ui/dropck/dropck-eyepatch.stderr
diff --git a/src/test/ui/dropck/dropck-union.rs b/tests/ui/dropck/dropck-union.rs
index 5a9965db5..5a9965db5 100644
--- a/src/test/ui/dropck/dropck-union.rs
+++ b/tests/ui/dropck/dropck-union.rs
diff --git a/src/test/ui/dropck/dropck-union.stderr b/tests/ui/dropck/dropck-union.stderr
index 854e29385..854e29385 100644
--- a/src/test/ui/dropck/dropck-union.stderr
+++ b/tests/ui/dropck/dropck-union.stderr
diff --git a/src/test/ui/dropck/dropck_fn_type.rs b/tests/ui/dropck/dropck_fn_type.rs
index 2934217df..2934217df 100644
--- a/src/test/ui/dropck/dropck_fn_type.rs
+++ b/tests/ui/dropck/dropck_fn_type.rs
diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.rs b/tests/ui/dropck/dropck_no_diverge_on_nonregular_1.rs
index 43c1c7759..43c1c7759 100644
--- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.rs
+++ b/tests/ui/dropck/dropck_no_diverge_on_nonregular_1.rs
diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr b/tests/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr
index c447e2f79..3e39d15f9 100644
--- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr
+++ b/tests/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr
@@ -8,3 +8,4 @@ LL |     let ft =
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0320`.
diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.rs b/tests/ui/dropck/dropck_no_diverge_on_nonregular_2.rs
index edd07652e..edd07652e 100644
--- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.rs
+++ b/tests/ui/dropck/dropck_no_diverge_on_nonregular_2.rs
diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr b/tests/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr
index cd4706dd9..dbb743544 100644
--- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr
+++ b/tests/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr
@@ -8,3 +8,4 @@ LL |     let ft =
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0320`.
diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.rs b/tests/ui/dropck/dropck_no_diverge_on_nonregular_3.rs
index af7402ca4..af7402ca4 100644
--- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.rs
+++ b/tests/ui/dropck/dropck_no_diverge_on_nonregular_3.rs
diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr b/tests/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr
index 18cd1b6cd..deaf116b6 100644
--- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr
+++ b/tests/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr
@@ -16,3 +16,4 @@ LL |         Some(Wrapper::Simple::<u32>);
 
 error: aborting due to 2 previous errors
 
+For more information about this error, try `rustc --explain E0320`.
diff --git a/src/test/ui/dropck/dropck_trait_cycle_checked.rs b/tests/ui/dropck/dropck_trait_cycle_checked.rs
index be6ec3e4e..be6ec3e4e 100644
--- a/src/test/ui/dropck/dropck_trait_cycle_checked.rs
+++ b/tests/ui/dropck/dropck_trait_cycle_checked.rs
diff --git a/src/test/ui/dropck/dropck_trait_cycle_checked.stderr b/tests/ui/dropck/dropck_trait_cycle_checked.stderr
index dc3fbed59..dc3fbed59 100644
--- a/src/test/ui/dropck/dropck_trait_cycle_checked.stderr
+++ b/tests/ui/dropck/dropck_trait_cycle_checked.stderr
diff --git a/src/test/ui/dropck/dropck_traits.rs b/tests/ui/dropck/dropck_traits.rs
index 98e8e88a2..98e8e88a2 100644
--- a/src/test/ui/dropck/dropck_traits.rs
+++ b/tests/ui/dropck/dropck_traits.rs
diff --git a/src/test/ui/dropck/issue-24805-dropck-itemless.rs b/tests/ui/dropck/issue-24805-dropck-itemless.rs
index 45761b61c..45761b61c 100644
--- a/src/test/ui/dropck/issue-24805-dropck-itemless.rs
+++ b/tests/ui/dropck/issue-24805-dropck-itemless.rs
diff --git a/src/test/ui/dropck/issue-28498-ugeh-with-lifetime-param.rs b/tests/ui/dropck/issue-28498-ugeh-with-lifetime-param.rs
index 43c0bfb26..43c0bfb26 100644
--- a/src/test/ui/dropck/issue-28498-ugeh-with-lifetime-param.rs
+++ b/tests/ui/dropck/issue-28498-ugeh-with-lifetime-param.rs
diff --git a/src/test/ui/dropck/issue-28498-ugeh-with-passed-to-fn.rs b/tests/ui/dropck/issue-28498-ugeh-with-passed-to-fn.rs
index 04d0d3203..04d0d3203 100644
--- a/src/test/ui/dropck/issue-28498-ugeh-with-passed-to-fn.rs
+++ b/tests/ui/dropck/issue-28498-ugeh-with-passed-to-fn.rs
diff --git a/src/test/ui/dropck/issue-28498-ugeh-with-trait-bound.rs b/tests/ui/dropck/issue-28498-ugeh-with-trait-bound.rs
index 61d11cf38..61d11cf38 100644
--- a/src/test/ui/dropck/issue-28498-ugeh-with-trait-bound.rs
+++ b/tests/ui/dropck/issue-28498-ugeh-with-trait-bound.rs
diff --git a/src/test/ui/dropck/issue-29844.rs b/tests/ui/dropck/issue-29844.rs
index e08942da5..e08942da5 100644
--- a/src/test/ui/dropck/issue-29844.rs
+++ b/tests/ui/dropck/issue-29844.rs
diff --git a/src/test/ui/issues/issue-34053.rs b/tests/ui/dropck/issue-34053.rs
index fa23ae8f9..fa23ae8f9 100644
--- a/src/test/ui/issues/issue-34053.rs
+++ b/tests/ui/dropck/issue-34053.rs
diff --git a/src/test/ui/dropck/issue-38868.rs b/tests/ui/dropck/issue-38868.rs
index b0e5c3713..b0e5c3713 100644
--- a/src/test/ui/dropck/issue-38868.rs
+++ b/tests/ui/dropck/issue-38868.rs
diff --git a/src/test/ui/dropck/issue-38868.stderr b/tests/ui/dropck/issue-38868.stderr
index ec81c2ea6..ec81c2ea6 100644
--- a/src/test/ui/dropck/issue-38868.stderr
+++ b/tests/ui/dropck/issue-38868.stderr
diff --git a/src/test/ui/dropck/issue-54943-1.rs b/tests/ui/dropck/issue-54943-1.rs
index ec682d960..ec682d960 100644
--- a/src/test/ui/dropck/issue-54943-1.rs
+++ b/tests/ui/dropck/issue-54943-1.rs
diff --git a/src/test/ui/dropck/issue-54943-2.rs b/tests/ui/dropck/issue-54943-2.rs
index d400ae58d..d400ae58d 100644
--- a/src/test/ui/dropck/issue-54943-2.rs
+++ b/tests/ui/dropck/issue-54943-2.rs
diff --git a/src/test/ui/dropck/reject-specialized-drops-8142.rs b/tests/ui/dropck/reject-specialized-drops-8142.rs
index 7a3bbe7cb..7a3bbe7cb 100644
--- a/src/test/ui/dropck/reject-specialized-drops-8142.rs
+++ b/tests/ui/dropck/reject-specialized-drops-8142.rs
diff --git a/src/test/ui/dropck/reject-specialized-drops-8142.stderr b/tests/ui/dropck/reject-specialized-drops-8142.stderr
index cb48221c6..cb48221c6 100644
--- a/src/test/ui/dropck/reject-specialized-drops-8142.stderr
+++ b/tests/ui/dropck/reject-specialized-drops-8142.stderr
diff --git a/src/test/ui/dropck/relate_lt_in_type_outlives_bound.rs b/tests/ui/dropck/relate_lt_in_type_outlives_bound.rs
index 42530d317..42530d317 100644
--- a/src/test/ui/dropck/relate_lt_in_type_outlives_bound.rs
+++ b/tests/ui/dropck/relate_lt_in_type_outlives_bound.rs
diff --git a/src/test/ui/dropck/relate_lt_in_type_outlives_bound.stderr b/tests/ui/dropck/relate_lt_in_type_outlives_bound.stderr
index 3d9685db6..3d9685db6 100644
--- a/src/test/ui/dropck/relate_lt_in_type_outlives_bound.stderr
+++ b/tests/ui/dropck/relate_lt_in_type_outlives_bound.stderr
diff --git a/src/test/ui/dst/dst-bad-assign-2.rs b/tests/ui/dst/dst-bad-assign-2.rs
index 7ba31bf2e..7ba31bf2e 100644
--- a/src/test/ui/dst/dst-bad-assign-2.rs
+++ b/tests/ui/dst/dst-bad-assign-2.rs
diff --git a/src/test/ui/dst/dst-bad-assign-2.stderr b/tests/ui/dst/dst-bad-assign-2.stderr
index 6c9e2971c..6c9e2971c 100644
--- a/src/test/ui/dst/dst-bad-assign-2.stderr
+++ b/tests/ui/dst/dst-bad-assign-2.stderr
diff --git a/src/test/ui/dst/dst-bad-assign-3.rs b/tests/ui/dst/dst-bad-assign-3.rs
index d05b3937c..d05b3937c 100644
--- a/src/test/ui/dst/dst-bad-assign-3.rs
+++ b/tests/ui/dst/dst-bad-assign-3.rs
diff --git a/src/test/ui/dst/dst-bad-assign-3.stderr b/tests/ui/dst/dst-bad-assign-3.stderr
index b326dbbbc..b326dbbbc 100644
--- a/src/test/ui/dst/dst-bad-assign-3.stderr
+++ b/tests/ui/dst/dst-bad-assign-3.stderr
diff --git a/src/test/ui/dst/dst-bad-assign.rs b/tests/ui/dst/dst-bad-assign.rs
index 496e01ae0..496e01ae0 100644
--- a/src/test/ui/dst/dst-bad-assign.rs
+++ b/tests/ui/dst/dst-bad-assign.rs
diff --git a/src/test/ui/dst/dst-bad-assign.stderr b/tests/ui/dst/dst-bad-assign.stderr
index 614f21387..614f21387 100644
--- a/src/test/ui/dst/dst-bad-assign.stderr
+++ b/tests/ui/dst/dst-bad-assign.stderr
diff --git a/src/test/ui/dst/dst-bad-coerce1.rs b/tests/ui/dst/dst-bad-coerce1.rs
index 7ef237e39..7ef237e39 100644
--- a/src/test/ui/dst/dst-bad-coerce1.rs
+++ b/tests/ui/dst/dst-bad-coerce1.rs
diff --git a/src/test/ui/dst/dst-bad-coerce1.stderr b/tests/ui/dst/dst-bad-coerce1.stderr
index 594acff85..594acff85 100644
--- a/src/test/ui/dst/dst-bad-coerce1.stderr
+++ b/tests/ui/dst/dst-bad-coerce1.stderr
diff --git a/src/test/ui/dst/dst-bad-coerce2.rs b/tests/ui/dst/dst-bad-coerce2.rs
index e7ce20b89..e7ce20b89 100644
--- a/src/test/ui/dst/dst-bad-coerce2.rs
+++ b/tests/ui/dst/dst-bad-coerce2.rs
diff --git a/src/test/ui/dst/dst-bad-coerce2.stderr b/tests/ui/dst/dst-bad-coerce2.stderr
index 3ded96cfb..3ded96cfb 100644
--- a/src/test/ui/dst/dst-bad-coerce2.stderr
+++ b/tests/ui/dst/dst-bad-coerce2.stderr
diff --git a/src/test/ui/dst/dst-bad-coerce3.rs b/tests/ui/dst/dst-bad-coerce3.rs
index fd5ee3b57..fd5ee3b57 100644
--- a/src/test/ui/dst/dst-bad-coerce3.rs
+++ b/tests/ui/dst/dst-bad-coerce3.rs
diff --git a/src/test/ui/dst/dst-bad-coerce3.stderr b/tests/ui/dst/dst-bad-coerce3.stderr
index 957e98bbe..957e98bbe 100644
--- a/src/test/ui/dst/dst-bad-coerce3.stderr
+++ b/tests/ui/dst/dst-bad-coerce3.stderr
diff --git a/src/test/ui/dst/dst-bad-coerce4.rs b/tests/ui/dst/dst-bad-coerce4.rs
index f63da60d2..f63da60d2 100644
--- a/src/test/ui/dst/dst-bad-coerce4.rs
+++ b/tests/ui/dst/dst-bad-coerce4.rs
diff --git a/src/test/ui/dst/dst-bad-coerce4.stderr b/tests/ui/dst/dst-bad-coerce4.stderr
index 4c9954f35..4c9954f35 100644
--- a/src/test/ui/dst/dst-bad-coerce4.stderr
+++ b/tests/ui/dst/dst-bad-coerce4.stderr
diff --git a/src/test/ui/dst/dst-bad-coercions.rs b/tests/ui/dst/dst-bad-coercions.rs
index bffef378c..bffef378c 100644
--- a/src/test/ui/dst/dst-bad-coercions.rs
+++ b/tests/ui/dst/dst-bad-coercions.rs
diff --git a/src/test/ui/dst/dst-bad-coercions.stderr b/tests/ui/dst/dst-bad-coercions.stderr
index 0d6f4d020..0d6f4d020 100644
--- a/src/test/ui/dst/dst-bad-coercions.stderr
+++ b/tests/ui/dst/dst-bad-coercions.stderr
diff --git a/src/test/ui/dst/dst-bad-deep-2.rs b/tests/ui/dst/dst-bad-deep-2.rs
index e58739913..e58739913 100644
--- a/src/test/ui/dst/dst-bad-deep-2.rs
+++ b/tests/ui/dst/dst-bad-deep-2.rs
diff --git a/src/test/ui/dst/dst-bad-deep-2.stderr b/tests/ui/dst/dst-bad-deep-2.stderr
index b22850814..b22850814 100644
--- a/src/test/ui/dst/dst-bad-deep-2.stderr
+++ b/tests/ui/dst/dst-bad-deep-2.stderr
diff --git a/src/test/ui/dst/dst-bad-deep.rs b/tests/ui/dst/dst-bad-deep.rs
index a42672960..a42672960 100644
--- a/src/test/ui/dst/dst-bad-deep.rs
+++ b/tests/ui/dst/dst-bad-deep.rs
diff --git a/src/test/ui/dst/dst-bad-deep.stderr b/tests/ui/dst/dst-bad-deep.stderr
index 98db79591..98db79591 100644
--- a/src/test/ui/dst/dst-bad-deep.stderr
+++ b/tests/ui/dst/dst-bad-deep.stderr
diff --git a/src/test/ui/dst/dst-index.rs b/tests/ui/dst/dst-index.rs
index 2f2c5df46..2f2c5df46 100644
--- a/src/test/ui/dst/dst-index.rs
+++ b/tests/ui/dst/dst-index.rs
diff --git a/src/test/ui/dst/dst-index.stderr b/tests/ui/dst/dst-index.stderr
index d38af3f89..d38af3f89 100644
--- a/src/test/ui/dst/dst-index.stderr
+++ b/tests/ui/dst/dst-index.stderr
diff --git a/src/test/ui/dst/dst-object-from-unsized-type.rs b/tests/ui/dst/dst-object-from-unsized-type.rs
index 3cd5b1ed6..3cd5b1ed6 100644
--- a/src/test/ui/dst/dst-object-from-unsized-type.rs
+++ b/tests/ui/dst/dst-object-from-unsized-type.rs
diff --git a/src/test/ui/dst/dst-object-from-unsized-type.stderr b/tests/ui/dst/dst-object-from-unsized-type.stderr
index e24c96ebe..e24c96ebe 100644
--- a/src/test/ui/dst/dst-object-from-unsized-type.stderr
+++ b/tests/ui/dst/dst-object-from-unsized-type.stderr
diff --git a/src/test/ui/dst/dst-rvalue.rs b/tests/ui/dst/dst-rvalue.rs
index fbb32cac1..fbb32cac1 100644
--- a/src/test/ui/dst/dst-rvalue.rs
+++ b/tests/ui/dst/dst-rvalue.rs
diff --git a/src/test/ui/dst/dst-rvalue.stderr b/tests/ui/dst/dst-rvalue.stderr
index 727f4d843..8d0a82b70 100644
--- a/src/test/ui/dst/dst-rvalue.stderr
+++ b/tests/ui/dst/dst-rvalue.stderr
@@ -9,9 +9,6 @@ LL |     let _x: Box<str> = Box::new(*"hello world");
    = help: the trait `Sized` is not implemented for `str`
 note: required by a bound in `Box::<T>::new`
   --> $SRC_DIR/alloc/src/boxed.rs:LL:COL
-   |
-LL | impl<T> Box<T> {
-   |      ^ required by this bound in `Box::<T>::new`
 
 error[E0277]: the size for values of type `[isize]` cannot be known at compilation time
   --> $DIR/dst-rvalue.rs:8:37
@@ -24,9 +21,6 @@ LL |     let _x: Box<[isize]> = Box::new(*array);
    = help: the trait `Sized` is not implemented for `[isize]`
 note: required by a bound in `Box::<T>::new`
   --> $SRC_DIR/alloc/src/boxed.rs:LL:COL
-   |
-LL | impl<T> Box<T> {
-   |      ^ required by this bound in `Box::<T>::new`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/dst/dst-sized-trait-param.rs b/tests/ui/dst/dst-sized-trait-param.rs
index cfd59197b..cfd59197b 100644
--- a/src/test/ui/dst/dst-sized-trait-param.rs
+++ b/tests/ui/dst/dst-sized-trait-param.rs
diff --git a/src/test/ui/dst/dst-sized-trait-param.stderr b/tests/ui/dst/dst-sized-trait-param.stderr
index 8ec94f5a3..60e9de903 100644
--- a/src/test/ui/dst/dst-sized-trait-param.stderr
+++ b/tests/ui/dst/dst-sized-trait-param.stderr
@@ -16,10 +16,10 @@ LL | trait Foo<T: ?Sized> : Sized { fn take(self, x: &T) { } } // Note: T is siz
    |            ++++++++
 
 error[E0277]: the size for values of type `[usize]` cannot be known at compilation time
-  --> $DIR/dst-sized-trait-param.rs:10:6
+  --> $DIR/dst-sized-trait-param.rs:10:21
    |
 LL | impl Foo<isize> for [usize] { }
-   |      ^^^^^^^^^^ doesn't have a size known at compile-time
+   |                     ^^^^^^^ doesn't have a size known at compile-time
    |
    = help: the trait `Sized` is not implemented for `[usize]`
 note: required by a bound in `Foo`
diff --git a/src/test/ui/dupe-first-attr.rc b/tests/ui/dupe-first-attr.rc
index 8b7025b7b..8b7025b7b 100644
--- a/src/test/ui/dupe-first-attr.rc
+++ b/tests/ui/dupe-first-attr.rc
diff --git a/src/test/ui/duplicate/dupe-symbols-1.rs b/tests/ui/duplicate/dupe-symbols-1.rs
index 28e329b56..28e329b56 100644
--- a/src/test/ui/duplicate/dupe-symbols-1.rs
+++ b/tests/ui/duplicate/dupe-symbols-1.rs
diff --git a/src/test/ui/duplicate/dupe-symbols-1.stderr b/tests/ui/duplicate/dupe-symbols-1.stderr
index 933ed5e89..933ed5e89 100644
--- a/src/test/ui/duplicate/dupe-symbols-1.stderr
+++ b/tests/ui/duplicate/dupe-symbols-1.stderr
diff --git a/src/test/ui/duplicate/dupe-symbols-2.rs b/tests/ui/duplicate/dupe-symbols-2.rs
index e303a790b..e303a790b 100644
--- a/src/test/ui/duplicate/dupe-symbols-2.rs
+++ b/tests/ui/duplicate/dupe-symbols-2.rs
diff --git a/src/test/ui/duplicate/dupe-symbols-2.stderr b/tests/ui/duplicate/dupe-symbols-2.stderr
index b132eae4b..b132eae4b 100644
--- a/src/test/ui/duplicate/dupe-symbols-2.stderr
+++ b/tests/ui/duplicate/dupe-symbols-2.stderr
diff --git a/src/test/ui/duplicate/dupe-symbols-3.rs b/tests/ui/duplicate/dupe-symbols-3.rs
index 1af2fe98e..1af2fe98e 100644
--- a/src/test/ui/duplicate/dupe-symbols-3.rs
+++ b/tests/ui/duplicate/dupe-symbols-3.rs
diff --git a/src/test/ui/duplicate/dupe-symbols-3.stderr b/tests/ui/duplicate/dupe-symbols-3.stderr
index 6300b4908..6300b4908 100644
--- a/src/test/ui/duplicate/dupe-symbols-3.stderr
+++ b/tests/ui/duplicate/dupe-symbols-3.stderr
diff --git a/src/test/ui/duplicate/dupe-symbols-4.rs b/tests/ui/duplicate/dupe-symbols-4.rs
index de6610c3e..de6610c3e 100644
--- a/src/test/ui/duplicate/dupe-symbols-4.rs
+++ b/tests/ui/duplicate/dupe-symbols-4.rs
diff --git a/src/test/ui/duplicate/dupe-symbols-4.stderr b/tests/ui/duplicate/dupe-symbols-4.stderr
index 1407a4883..1407a4883 100644
--- a/src/test/ui/duplicate/dupe-symbols-4.stderr
+++ b/tests/ui/duplicate/dupe-symbols-4.stderr
diff --git a/src/test/ui/duplicate/dupe-symbols-5.rs b/tests/ui/duplicate/dupe-symbols-5.rs
index ea801cef6..ea801cef6 100644
--- a/src/test/ui/duplicate/dupe-symbols-5.rs
+++ b/tests/ui/duplicate/dupe-symbols-5.rs
diff --git a/src/test/ui/duplicate/dupe-symbols-5.stderr b/tests/ui/duplicate/dupe-symbols-5.stderr
index 558f868a0..558f868a0 100644
--- a/src/test/ui/duplicate/dupe-symbols-5.stderr
+++ b/tests/ui/duplicate/dupe-symbols-5.stderr
diff --git a/src/test/ui/duplicate/dupe-symbols-6.rs b/tests/ui/duplicate/dupe-symbols-6.rs
index 018f4bb7f..018f4bb7f 100644
--- a/src/test/ui/duplicate/dupe-symbols-6.rs
+++ b/tests/ui/duplicate/dupe-symbols-6.rs
diff --git a/src/test/ui/duplicate/dupe-symbols-6.stderr b/tests/ui/duplicate/dupe-symbols-6.stderr
index 6692a63dc..6692a63dc 100644
--- a/src/test/ui/duplicate/dupe-symbols-6.stderr
+++ b/tests/ui/duplicate/dupe-symbols-6.stderr
diff --git a/src/test/ui/duplicate/dupe-symbols-7.rs b/tests/ui/duplicate/dupe-symbols-7.rs
index 633ca4c31..633ca4c31 100644
--- a/src/test/ui/duplicate/dupe-symbols-7.rs
+++ b/tests/ui/duplicate/dupe-symbols-7.rs
diff --git a/src/test/ui/duplicate/dupe-symbols-7.stderr b/tests/ui/duplicate/dupe-symbols-7.stderr
index 1455f0e75..1455f0e75 100644
--- a/src/test/ui/duplicate/dupe-symbols-7.stderr
+++ b/tests/ui/duplicate/dupe-symbols-7.stderr
diff --git a/src/test/ui/duplicate/dupe-symbols-8.rs b/tests/ui/duplicate/dupe-symbols-8.rs
index ce7fa24a9..ce7fa24a9 100644
--- a/src/test/ui/duplicate/dupe-symbols-8.rs
+++ b/tests/ui/duplicate/dupe-symbols-8.rs
diff --git a/src/test/ui/duplicate/dupe-symbols-8.stderr b/tests/ui/duplicate/dupe-symbols-8.stderr
index 8d6a79e12..8d6a79e12 100644
--- a/src/test/ui/duplicate/dupe-symbols-8.stderr
+++ b/tests/ui/duplicate/dupe-symbols-8.stderr
diff --git a/src/test/ui/duplicate/duplicate-check-macro-exports.rs b/tests/ui/duplicate/duplicate-check-macro-exports.rs
index 9ba28acfd..9ba28acfd 100644
--- a/src/test/ui/duplicate/duplicate-check-macro-exports.rs
+++ b/tests/ui/duplicate/duplicate-check-macro-exports.rs
diff --git a/src/test/ui/duplicate/duplicate-check-macro-exports.stderr b/tests/ui/duplicate/duplicate-check-macro-exports.stderr
index ba723b38b..ba723b38b 100644
--- a/src/test/ui/duplicate/duplicate-check-macro-exports.stderr
+++ b/tests/ui/duplicate/duplicate-check-macro-exports.stderr
diff --git a/src/test/ui/duplicate/duplicate-parameter.rs b/tests/ui/duplicate/duplicate-parameter.rs
index e5b21bbcd..e5b21bbcd 100644
--- a/src/test/ui/duplicate/duplicate-parameter.rs
+++ b/tests/ui/duplicate/duplicate-parameter.rs
diff --git a/src/test/ui/duplicate/duplicate-parameter.stderr b/tests/ui/duplicate/duplicate-parameter.stderr
index f3ef0bcf3..f3ef0bcf3 100644
--- a/src/test/ui/duplicate/duplicate-parameter.stderr
+++ b/tests/ui/duplicate/duplicate-parameter.stderr
diff --git a/src/test/ui/duplicate/duplicate-type-parameter.rs b/tests/ui/duplicate/duplicate-type-parameter.rs
index 2751b3c8d..2751b3c8d 100644
--- a/src/test/ui/duplicate/duplicate-type-parameter.rs
+++ b/tests/ui/duplicate/duplicate-type-parameter.rs
diff --git a/src/test/ui/duplicate/duplicate-type-parameter.stderr b/tests/ui/duplicate/duplicate-type-parameter.stderr
index 628f898d5..628f898d5 100644
--- a/src/test/ui/duplicate/duplicate-type-parameter.stderr
+++ b/tests/ui/duplicate/duplicate-type-parameter.stderr
diff --git a/src/test/ui/duplicate_entry_error.rs b/tests/ui/duplicate_entry_error.rs
index 776ecedea..776ecedea 100644
--- a/src/test/ui/duplicate_entry_error.rs
+++ b/tests/ui/duplicate_entry_error.rs
diff --git a/src/test/ui/duplicate_entry_error.stderr b/tests/ui/duplicate_entry_error.stderr
index 6d078dfbd..6d078dfbd 100644
--- a/src/test/ui/duplicate_entry_error.stderr
+++ b/tests/ui/duplicate_entry_error.stderr
diff --git a/src/test/ui/dyn-drop/dyn-drop.rs b/tests/ui/dyn-drop/dyn-drop.rs
index e1668a3f1..e1668a3f1 100644
--- a/src/test/ui/dyn-drop/dyn-drop.rs
+++ b/tests/ui/dyn-drop/dyn-drop.rs
diff --git a/src/test/ui/dyn-drop/dyn-drop.stderr b/tests/ui/dyn-drop/dyn-drop.stderr
index 1b1dbc4d1..1b1dbc4d1 100644
--- a/src/test/ui/dyn-drop/dyn-drop.stderr
+++ b/tests/ui/dyn-drop/dyn-drop.stderr
diff --git a/src/test/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.fixed b/tests/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.fixed
index c815080fc..c815080fc 100644
--- a/src/test/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.fixed
+++ b/tests/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.fixed
diff --git a/src/test/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.rs b/tests/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.rs
index 6cdc70714..6cdc70714 100644
--- a/src/test/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.rs
+++ b/tests/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.rs
diff --git a/src/test/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.stderr b/tests/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.stderr
index 89aded913..89aded913 100644
--- a/src/test/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.stderr
+++ b/tests/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.stderr
diff --git a/src/test/ui/dyn-keyword/dyn-2015-idents-in-decl-macros-unlinted.rs b/tests/ui/dyn-keyword/dyn-2015-idents-in-decl-macros-unlinted.rs
index bda2ed17e..bda2ed17e 100644
--- a/src/test/ui/dyn-keyword/dyn-2015-idents-in-decl-macros-unlinted.rs
+++ b/tests/ui/dyn-keyword/dyn-2015-idents-in-decl-macros-unlinted.rs
diff --git a/src/test/ui/dyn-keyword/dyn-2015-idents-in-macros-unlinted.rs b/tests/ui/dyn-keyword/dyn-2015-idents-in-macros-unlinted.rs
index 472f6b5c8..472f6b5c8 100644
--- a/src/test/ui/dyn-keyword/dyn-2015-idents-in-macros-unlinted.rs
+++ b/tests/ui/dyn-keyword/dyn-2015-idents-in-macros-unlinted.rs
diff --git a/src/test/ui/dyn-keyword/dyn-2015-no-warnings-without-lints.rs b/tests/ui/dyn-keyword/dyn-2015-no-warnings-without-lints.rs
index d6a33c08d..d6a33c08d 100644
--- a/src/test/ui/dyn-keyword/dyn-2015-no-warnings-without-lints.rs
+++ b/tests/ui/dyn-keyword/dyn-2015-no-warnings-without-lints.rs
diff --git a/src/test/ui/dyn-keyword/dyn-2018-edition-lint.rs b/tests/ui/dyn-keyword/dyn-2018-edition-lint.rs
index a074b5fa5..a074b5fa5 100644
--- a/src/test/ui/dyn-keyword/dyn-2018-edition-lint.rs
+++ b/tests/ui/dyn-keyword/dyn-2018-edition-lint.rs
diff --git a/src/test/ui/dyn-keyword/dyn-2018-edition-lint.stderr b/tests/ui/dyn-keyword/dyn-2018-edition-lint.stderr
index 6bafff919..6bafff919 100644
--- a/src/test/ui/dyn-keyword/dyn-2018-edition-lint.stderr
+++ b/tests/ui/dyn-keyword/dyn-2018-edition-lint.stderr
diff --git a/src/test/ui/dyn-keyword/dyn-2021-edition-error.rs b/tests/ui/dyn-keyword/dyn-2021-edition-error.rs
index 0f05d8753..0f05d8753 100644
--- a/src/test/ui/dyn-keyword/dyn-2021-edition-error.rs
+++ b/tests/ui/dyn-keyword/dyn-2021-edition-error.rs
diff --git a/src/test/ui/dyn-keyword/dyn-2021-edition-error.stderr b/tests/ui/dyn-keyword/dyn-2021-edition-error.stderr
index 08ee77116..08ee77116 100644
--- a/src/test/ui/dyn-keyword/dyn-2021-edition-error.stderr
+++ b/tests/ui/dyn-keyword/dyn-2021-edition-error.stderr
diff --git a/src/test/ui/dyn-keyword/dyn-angle-brackets.fixed b/tests/ui/dyn-keyword/dyn-angle-brackets.fixed
index 00069a3e7..00069a3e7 100644
--- a/src/test/ui/dyn-keyword/dyn-angle-brackets.fixed
+++ b/tests/ui/dyn-keyword/dyn-angle-brackets.fixed
diff --git a/src/test/ui/dyn-keyword/dyn-angle-brackets.rs b/tests/ui/dyn-keyword/dyn-angle-brackets.rs
index ee5fee4cf..ee5fee4cf 100644
--- a/src/test/ui/dyn-keyword/dyn-angle-brackets.rs
+++ b/tests/ui/dyn-keyword/dyn-angle-brackets.rs
diff --git a/src/test/ui/dyn-keyword/dyn-angle-brackets.stderr b/tests/ui/dyn-keyword/dyn-angle-brackets.stderr
index 0bb764d71..0bb764d71 100644
--- a/src/test/ui/dyn-keyword/dyn-angle-brackets.stderr
+++ b/tests/ui/dyn-keyword/dyn-angle-brackets.stderr
diff --git a/src/test/ui/dyn-keyword/issue-56327-dyn-trait-in-macro-is-okay.rs b/tests/ui/dyn-keyword/issue-56327-dyn-trait-in-macro-is-okay.rs
index 59e7f9a60..59e7f9a60 100644
--- a/src/test/ui/dyn-keyword/issue-56327-dyn-trait-in-macro-is-okay.rs
+++ b/tests/ui/dyn-keyword/issue-56327-dyn-trait-in-macro-is-okay.rs
diff --git a/tests/ui/dyn-star/align.normal.stderr b/tests/ui/dyn-star/align.normal.stderr
new file mode 100644
index 000000000..53c2cbeac
--- /dev/null
+++ b/tests/ui/dyn-star/align.normal.stderr
@@ -0,0 +1,11 @@
+warning: the feature `dyn_star` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/align.rs:4:12
+   |
+LL | #![feature(dyn_star)]
+   |            ^^^^^^^^
+   |
+   = note: see issue #102425 <https://github.com/rust-lang/rust/issues/102425> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+warning: 1 warning emitted
+
diff --git a/src/test/ui/dyn-star/align.over_aligned.stderr b/tests/ui/dyn-star/align.over_aligned.stderr
index 6b6fc55d8..62e28efab 100644
--- a/src/test/ui/dyn-star/align.over_aligned.stderr
+++ b/tests/ui/dyn-star/align.over_aligned.stderr
@@ -4,7 +4,7 @@ warning: the feature `dyn_star` is incomplete and may not be safe to use and/or
 LL | #![feature(dyn_star)]
    |            ^^^^^^^^
    |
-   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+   = note: see issue #102425 <https://github.com/rust-lang/rust/issues/102425> for more information
    = note: `#[warn(incomplete_features)]` on by default
 
 error[E0277]: `AlignedUsize` needs to be a pointer-sized type
diff --git a/src/test/ui/dyn-star/align.rs b/tests/ui/dyn-star/align.rs
index fb41a05a0..fb41a05a0 100644
--- a/src/test/ui/dyn-star/align.rs
+++ b/tests/ui/dyn-star/align.rs
diff --git a/src/test/ui/dyn-star/auxiliary/dyn-star-foreign.rs b/tests/ui/dyn-star/auxiliary/dyn-star-foreign.rs
index 7673c7936..7673c7936 100644
--- a/src/test/ui/dyn-star/auxiliary/dyn-star-foreign.rs
+++ b/tests/ui/dyn-star/auxiliary/dyn-star-foreign.rs
diff --git a/src/test/ui/dyn-star/box.rs b/tests/ui/dyn-star/box.rs
index d1f1819d9..d1f1819d9 100644
--- a/src/test/ui/dyn-star/box.rs
+++ b/tests/ui/dyn-star/box.rs
diff --git a/src/test/ui/dyn-star/check-size-at-cast-polymorphic-bad.rs b/tests/ui/dyn-star/check-size-at-cast-polymorphic-bad.rs
index e19e36cc7..e19e36cc7 100644
--- a/src/test/ui/dyn-star/check-size-at-cast-polymorphic-bad.rs
+++ b/tests/ui/dyn-star/check-size-at-cast-polymorphic-bad.rs
diff --git a/src/test/ui/dyn-star/check-size-at-cast-polymorphic-bad.stderr b/tests/ui/dyn-star/check-size-at-cast-polymorphic-bad.stderr
index 53ccbe43d..53ccbe43d 100644
--- a/src/test/ui/dyn-star/check-size-at-cast-polymorphic-bad.stderr
+++ b/tests/ui/dyn-star/check-size-at-cast-polymorphic-bad.stderr
diff --git a/src/test/ui/dyn-star/check-size-at-cast-polymorphic.rs b/tests/ui/dyn-star/check-size-at-cast-polymorphic.rs
index 5c0a3d256..5c0a3d256 100644
--- a/src/test/ui/dyn-star/check-size-at-cast-polymorphic.rs
+++ b/tests/ui/dyn-star/check-size-at-cast-polymorphic.rs
diff --git a/src/test/ui/dyn-star/check-size-at-cast.rs b/tests/ui/dyn-star/check-size-at-cast.rs
index 1f22f7983..1f22f7983 100644
--- a/src/test/ui/dyn-star/check-size-at-cast.rs
+++ b/tests/ui/dyn-star/check-size-at-cast.rs
diff --git a/src/test/ui/dyn-star/check-size-at-cast.stderr b/tests/ui/dyn-star/check-size-at-cast.stderr
index af2a1ccf7..af2a1ccf7 100644
--- a/src/test/ui/dyn-star/check-size-at-cast.stderr
+++ b/tests/ui/dyn-star/check-size-at-cast.stderr
diff --git a/src/test/ui/dyn-star/const.rs b/tests/ui/dyn-star/const.rs
index 67e3ab7ab..67e3ab7ab 100644
--- a/src/test/ui/dyn-star/const.rs
+++ b/tests/ui/dyn-star/const.rs
diff --git a/src/test/ui/dyn-star/dispatch-on-pin-mut.rs b/tests/ui/dyn-star/dispatch-on-pin-mut.rs
index 5774c8b2a..5774c8b2a 100644
--- a/src/test/ui/dyn-star/dispatch-on-pin-mut.rs
+++ b/tests/ui/dyn-star/dispatch-on-pin-mut.rs
diff --git a/src/test/ui/dyn-star/dispatch-on-pin-mut.run.stdout b/tests/ui/dyn-star/dispatch-on-pin-mut.run.stdout
index 96c5ca698..96c5ca698 100644
--- a/src/test/ui/dyn-star/dispatch-on-pin-mut.run.stdout
+++ b/tests/ui/dyn-star/dispatch-on-pin-mut.run.stdout
diff --git a/tests/ui/dyn-star/dispatch-on-pin-mut.stderr b/tests/ui/dyn-star/dispatch-on-pin-mut.stderr
new file mode 100644
index 000000000..cb9c78158
--- /dev/null
+++ b/tests/ui/dyn-star/dispatch-on-pin-mut.stderr
@@ -0,0 +1,11 @@
+warning: the feature `dyn_star` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/dispatch-on-pin-mut.rs:5:12
+   |
+LL | #![feature(dyn_star)]
+   |            ^^^^^^^^
+   |
+   = note: see issue #102425 <https://github.com/rust-lang/rust/issues/102425> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+warning: 1 warning emitted
+
diff --git a/src/test/ui/dyn-star/dont-unsize-coerce-dyn-star.rs b/tests/ui/dyn-star/dont-unsize-coerce-dyn-star.rs
index c12b16f16..c12b16f16 100644
--- a/src/test/ui/dyn-star/dont-unsize-coerce-dyn-star.rs
+++ b/tests/ui/dyn-star/dont-unsize-coerce-dyn-star.rs
diff --git a/src/test/ui/dyn-star/dont-unsize-coerce-dyn-star.run.stdout b/tests/ui/dyn-star/dont-unsize-coerce-dyn-star.run.stdout
index b4db3ed70..b4db3ed70 100644
--- a/src/test/ui/dyn-star/dont-unsize-coerce-dyn-star.run.stdout
+++ b/tests/ui/dyn-star/dont-unsize-coerce-dyn-star.run.stdout
diff --git a/tests/ui/dyn-star/dont-unsize-coerce-dyn-star.stderr b/tests/ui/dyn-star/dont-unsize-coerce-dyn-star.stderr
new file mode 100644
index 000000000..bcd014f8d
--- /dev/null
+++ b/tests/ui/dyn-star/dont-unsize-coerce-dyn-star.stderr
@@ -0,0 +1,11 @@
+warning: the feature `dyn_star` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/dont-unsize-coerce-dyn-star.rs:4:12
+   |
+LL | #![feature(dyn_star)]
+   |            ^^^^^^^^
+   |
+   = note: see issue #102425 <https://github.com/rust-lang/rust/issues/102425> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+warning: 1 warning emitted
+
diff --git a/src/test/ui/dyn-star/drop.rs b/tests/ui/dyn-star/drop.rs
index 1478498c0..1478498c0 100644
--- a/src/test/ui/dyn-star/drop.rs
+++ b/tests/ui/dyn-star/drop.rs
diff --git a/src/test/ui/dyn-star/drop.run.stdout b/tests/ui/dyn-star/drop.run.stdout
index dadb33ccf..dadb33ccf 100644
--- a/src/test/ui/dyn-star/drop.run.stdout
+++ b/tests/ui/dyn-star/drop.run.stdout
diff --git a/src/test/ui/dyn-star/dyn-async-trait.rs b/tests/ui/dyn-star/dyn-async-trait.rs
index 9b27133b4..9b27133b4 100644
--- a/src/test/ui/dyn-star/dyn-async-trait.rs
+++ b/tests/ui/dyn-star/dyn-async-trait.rs
diff --git a/tests/ui/dyn-star/dyn-star-to-dyn.rs b/tests/ui/dyn-star/dyn-star-to-dyn.rs
new file mode 100644
index 000000000..a6d9df952
--- /dev/null
+++ b/tests/ui/dyn-star/dyn-star-to-dyn.rs
@@ -0,0 +1,9 @@
+// build-pass
+
+#![feature(dyn_star)]
+//~^ WARN the feature `dyn_star` is incomplete and may not be safe to use and/or cause compiler crashes
+
+fn main() {
+    let x: dyn* Send = &();
+    let x = Box::new(x) as Box<dyn Send>;
+}
diff --git a/tests/ui/dyn-star/dyn-star-to-dyn.stderr b/tests/ui/dyn-star/dyn-star-to-dyn.stderr
new file mode 100644
index 000000000..03aedf5f7
--- /dev/null
+++ b/tests/ui/dyn-star/dyn-star-to-dyn.stderr
@@ -0,0 +1,11 @@
+warning: the feature `dyn_star` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/dyn-star-to-dyn.rs:3:12
+   |
+LL | #![feature(dyn_star)]
+   |            ^^^^^^^^
+   |
+   = note: see issue #102425 <https://github.com/rust-lang/rust/issues/102425> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+warning: 1 warning emitted
+
diff --git a/tests/ui/dyn-star/dyn-to-rigid.rs b/tests/ui/dyn-star/dyn-to-rigid.rs
new file mode 100644
index 000000000..e80ee1590
--- /dev/null
+++ b/tests/ui/dyn-star/dyn-to-rigid.rs
@@ -0,0 +1,11 @@
+#![feature(dyn_star)]
+#![allow(incomplete_features)]
+
+trait Tr {}
+
+fn f(x: dyn* Tr) -> usize {
+    x as usize
+    //~^ ERROR casting `(dyn* Tr + 'static)` as `usize` is invalid
+}
+
+fn main() {}
diff --git a/tests/ui/dyn-star/dyn-to-rigid.stderr b/tests/ui/dyn-star/dyn-to-rigid.stderr
new file mode 100644
index 000000000..588e6d97e
--- /dev/null
+++ b/tests/ui/dyn-star/dyn-to-rigid.stderr
@@ -0,0 +1,9 @@
+error[E0606]: casting `(dyn* Tr + 'static)` as `usize` is invalid
+  --> $DIR/dyn-to-rigid.rs:7:5
+   |
+LL |     x as usize
+   |     ^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0606`.
diff --git a/src/test/ui/dyn-star/error.rs b/tests/ui/dyn-star/error.rs
index d8261387e..d8261387e 100644
--- a/src/test/ui/dyn-star/error.rs
+++ b/tests/ui/dyn-star/error.rs
diff --git a/src/test/ui/dyn-star/error.stderr b/tests/ui/dyn-star/error.stderr
index ae54b9ca7..ae54b9ca7 100644
--- a/src/test/ui/dyn-star/error.stderr
+++ b/tests/ui/dyn-star/error.stderr
diff --git a/src/test/ui/dyn-star/feature-gate-dyn_star.rs b/tests/ui/dyn-star/feature-gate-dyn_star.rs
index 4756661cf..4756661cf 100644
--- a/src/test/ui/dyn-star/feature-gate-dyn_star.rs
+++ b/tests/ui/dyn-star/feature-gate-dyn_star.rs
diff --git a/src/test/ui/dyn-star/feature-gate-dyn_star.stderr b/tests/ui/dyn-star/feature-gate-dyn_star.stderr
index 2767e9478..c3449b627 100644
--- a/src/test/ui/dyn-star/feature-gate-dyn_star.stderr
+++ b/tests/ui/dyn-star/feature-gate-dyn_star.stderr
@@ -4,7 +4,7 @@ error[E0658]: dyn* trait objects are unstable
 LL | pub fn dyn_star_parameter(_: &dyn* Send) {
    |                               ^^^^^^^^^
    |
-   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+   = note: see issue #102425 <https://github.com/rust-lang/rust/issues/102425> for more information
    = help: add `#![feature(dyn_star)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/dyn-star/issue-102430.rs b/tests/ui/dyn-star/issue-102430.rs
index 244ecda66..244ecda66 100644
--- a/src/test/ui/dyn-star/issue-102430.rs
+++ b/tests/ui/dyn-star/issue-102430.rs
diff --git a/src/test/ui/dyn-star/make-dyn-star.rs b/tests/ui/dyn-star/make-dyn-star.rs
index e5255a64b..e5255a64b 100644
--- a/src/test/ui/dyn-star/make-dyn-star.rs
+++ b/tests/ui/dyn-star/make-dyn-star.rs
diff --git a/src/test/ui/dyn-star/method.rs b/tests/ui/dyn-star/method.rs
index 5a77640f0..5a77640f0 100644
--- a/src/test/ui/dyn-star/method.rs
+++ b/tests/ui/dyn-star/method.rs
diff --git a/src/test/ui/dyn-star/no-explicit-dyn-star-cast.rs b/tests/ui/dyn-star/no-explicit-dyn-star-cast.rs
index 67240c8e8..67240c8e8 100644
--- a/src/test/ui/dyn-star/no-explicit-dyn-star-cast.rs
+++ b/tests/ui/dyn-star/no-explicit-dyn-star-cast.rs
diff --git a/src/test/ui/dyn-star/no-explicit-dyn-star-cast.stderr b/tests/ui/dyn-star/no-explicit-dyn-star-cast.stderr
index 687d7db04..eb9c93305 100644
--- a/src/test/ui/dyn-star/no-explicit-dyn-star-cast.stderr
+++ b/tests/ui/dyn-star/no-explicit-dyn-star-cast.stderr
@@ -4,7 +4,7 @@ error[E0658]: dyn* trait objects are unstable
 LL |     let dyn_i: dyn* Debug = i as dyn* Debug;
    |                ^^^^^^^^^^
    |
-   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+   = note: see issue #102425 <https://github.com/rust-lang/rust/issues/102425> for more information
    = help: add `#![feature(dyn_star)]` to the crate attributes to enable
 
 error[E0658]: dyn* trait objects are unstable
@@ -13,7 +13,7 @@ error[E0658]: dyn* trait objects are unstable
 LL |     let dyn_i: dyn* Debug = i as dyn* Debug;
    |                                  ^^^^^^^^^^
    |
-   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+   = note: see issue #102425 <https://github.com/rust-lang/rust/issues/102425> for more information
    = help: add `#![feature(dyn_star)]` to the crate attributes to enable
 
 error[E0606]: casting `usize` as `dyn* Debug` is invalid
diff --git a/src/test/ui/dyn-star/no-explicit-dyn-star.rs b/tests/ui/dyn-star/no-explicit-dyn-star.rs
index 4f726b7c6..4f726b7c6 100644
--- a/src/test/ui/dyn-star/no-explicit-dyn-star.rs
+++ b/tests/ui/dyn-star/no-explicit-dyn-star.rs
diff --git a/src/test/ui/dyn-star/no-explicit-dyn-star.stderr b/tests/ui/dyn-star/no-explicit-dyn-star.stderr
index 49706fae1..49706fae1 100644
--- a/src/test/ui/dyn-star/no-explicit-dyn-star.stderr
+++ b/tests/ui/dyn-star/no-explicit-dyn-star.stderr
diff --git a/src/test/ui/dyn-star/no-implicit-dyn-star.rs b/tests/ui/dyn-star/no-implicit-dyn-star.rs
index d9470e284..d9470e284 100644
--- a/src/test/ui/dyn-star/no-implicit-dyn-star.rs
+++ b/tests/ui/dyn-star/no-implicit-dyn-star.rs
diff --git a/src/test/ui/dyn-star/no-implicit-dyn-star.stderr b/tests/ui/dyn-star/no-implicit-dyn-star.stderr
index e7c591862..a3f4d21ca 100644
--- a/src/test/ui/dyn-star/no-implicit-dyn-star.stderr
+++ b/tests/ui/dyn-star/no-implicit-dyn-star.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/no-implicit-dyn-star.rs:6:48
    |
 LL |     dyn_star_foreign::require_dyn_star_display(1usize);
-   |     ------------------------------------------ ^^^^^^ expected trait object `dyn std::fmt::Display`, found `usize`
+   |     ------------------------------------------ ^^^^^^ expected trait object `dyn Display`, found `usize`
    |     |
    |     arguments to this function are incorrect
    |
diff --git a/src/test/ui/dyn-star/no-unsize-coerce-dyn-trait.rs b/tests/ui/dyn-star/no-unsize-coerce-dyn-trait.rs
index a4eb669e3..a4eb669e3 100644
--- a/src/test/ui/dyn-star/no-unsize-coerce-dyn-trait.rs
+++ b/tests/ui/dyn-star/no-unsize-coerce-dyn-trait.rs
diff --git a/src/test/ui/dyn-star/no-unsize-coerce-dyn-trait.stderr b/tests/ui/dyn-star/no-unsize-coerce-dyn-trait.stderr
index 2fc751b3b..c7f1a4b9a 100644
--- a/src/test/ui/dyn-star/no-unsize-coerce-dyn-trait.stderr
+++ b/tests/ui/dyn-star/no-unsize-coerce-dyn-trait.stderr
@@ -4,7 +4,7 @@ warning: the feature `dyn_star` is incomplete and may not be safe to use and/or
 LL | #![feature(dyn_star, trait_upcasting)]
    |            ^^^^^^^^
    |
-   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+   = note: see issue #102425 <https://github.com/rust-lang/rust/issues/102425> for more information
    = note: `#[warn(incomplete_features)]` on by default
 
 error[E0308]: mismatched types
diff --git a/src/test/ui/dyn-star/return.rs b/tests/ui/dyn-star/return.rs
index fa3d8d7d5..fa3d8d7d5 100644
--- a/src/test/ui/dyn-star/return.rs
+++ b/tests/ui/dyn-star/return.rs
diff --git a/tests/ui/dyn-star/return.stderr b/tests/ui/dyn-star/return.stderr
new file mode 100644
index 000000000..9c2656829
--- /dev/null
+++ b/tests/ui/dyn-star/return.stderr
@@ -0,0 +1,11 @@
+warning: the feature `dyn_star` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/return.rs:3:12
+   |
+LL | #![feature(dyn_star)]
+   |            ^^^^^^^^
+   |
+   = note: see issue #102425 <https://github.com/rust-lang/rust/issues/102425> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+warning: 1 warning emitted
+
diff --git a/src/test/ui/dyn-star/syntax.rs b/tests/ui/dyn-star/syntax.rs
index 618c72562..618c72562 100644
--- a/src/test/ui/dyn-star/syntax.rs
+++ b/tests/ui/dyn-star/syntax.rs
diff --git a/src/test/ui/dyn-star/unsize-into-ref-dyn-star.rs b/tests/ui/dyn-star/unsize-into-ref-dyn-star.rs
index 1e8cafe15..1e8cafe15 100644
--- a/src/test/ui/dyn-star/unsize-into-ref-dyn-star.rs
+++ b/tests/ui/dyn-star/unsize-into-ref-dyn-star.rs
diff --git a/src/test/ui/dyn-star/unsize-into-ref-dyn-star.stderr b/tests/ui/dyn-star/unsize-into-ref-dyn-star.stderr
index f6444a60a..f6444a60a 100644
--- a/src/test/ui/dyn-star/unsize-into-ref-dyn-star.stderr
+++ b/tests/ui/dyn-star/unsize-into-ref-dyn-star.stderr
diff --git a/src/test/ui/dyn-star/upcast.rs b/tests/ui/dyn-star/upcast.rs
index c667ac143..c667ac143 100644
--- a/src/test/ui/dyn-star/upcast.rs
+++ b/tests/ui/dyn-star/upcast.rs
diff --git a/src/test/ui/dyn-star/upcast.stderr b/tests/ui/dyn-star/upcast.stderr
index 6a95f7754..74ccd6a18 100644
--- a/src/test/ui/dyn-star/upcast.stderr
+++ b/tests/ui/dyn-star/upcast.stderr
@@ -4,7 +4,7 @@ warning: the feature `dyn_star` is incomplete and may not be safe to use and/or
 LL | #![feature(dyn_star, trait_upcasting)]
    |            ^^^^^^^^
    |
-   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+   = note: see issue #102425 <https://github.com/rust-lang/rust/issues/102425> for more information
    = note: `#[warn(incomplete_features)]` on by default
 
 error[E0277]: `dyn* Foo` needs to be a pointer-sized type
diff --git a/src/test/ui/dynamically-sized-types/dst-coerce-custom.rs b/tests/ui/dynamically-sized-types/dst-coerce-custom.rs
index 24d83eb53..24d83eb53 100644
--- a/src/test/ui/dynamically-sized-types/dst-coerce-custom.rs
+++ b/tests/ui/dynamically-sized-types/dst-coerce-custom.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-coerce-rc.rs b/tests/ui/dynamically-sized-types/dst-coerce-rc.rs
index 683fa6850..683fa6850 100644
--- a/src/test/ui/dynamically-sized-types/dst-coerce-rc.rs
+++ b/tests/ui/dynamically-sized-types/dst-coerce-rc.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-coercions.rs b/tests/ui/dynamically-sized-types/dst-coercions.rs
index 66688e93f..66688e93f 100644
--- a/src/test/ui/dynamically-sized-types/dst-coercions.rs
+++ b/tests/ui/dynamically-sized-types/dst-coercions.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-deref-mut.rs b/tests/ui/dynamically-sized-types/dst-deref-mut.rs
index 1d62f42bd..1d62f42bd 100644
--- a/src/test/ui/dynamically-sized-types/dst-deref-mut.rs
+++ b/tests/ui/dynamically-sized-types/dst-deref-mut.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-deref.rs b/tests/ui/dynamically-sized-types/dst-deref.rs
index 0a350bac1..0a350bac1 100644
--- a/src/test/ui/dynamically-sized-types/dst-deref.rs
+++ b/tests/ui/dynamically-sized-types/dst-deref.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-field-align.rs b/tests/ui/dynamically-sized-types/dst-field-align.rs
index 6c338e999..6c338e999 100644
--- a/src/test/ui/dynamically-sized-types/dst-field-align.rs
+++ b/tests/ui/dynamically-sized-types/dst-field-align.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-index.rs b/tests/ui/dynamically-sized-types/dst-index.rs
index 8aa65bbfd..8aa65bbfd 100644
--- a/src/test/ui/dynamically-sized-types/dst-index.rs
+++ b/tests/ui/dynamically-sized-types/dst-index.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-irrefutable-bind.rs b/tests/ui/dynamically-sized-types/dst-irrefutable-bind.rs
index 0a6c49111..0a6c49111 100644
--- a/src/test/ui/dynamically-sized-types/dst-irrefutable-bind.rs
+++ b/tests/ui/dynamically-sized-types/dst-irrefutable-bind.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-raw.rs b/tests/ui/dynamically-sized-types/dst-raw.rs
index 0893b02e7..0893b02e7 100644
--- a/src/test/ui/dynamically-sized-types/dst-raw.rs
+++ b/tests/ui/dynamically-sized-types/dst-raw.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-struct-sole.rs b/tests/ui/dynamically-sized-types/dst-struct-sole.rs
index 6ca07fcf8..6ca07fcf8 100644
--- a/src/test/ui/dynamically-sized-types/dst-struct-sole.rs
+++ b/tests/ui/dynamically-sized-types/dst-struct-sole.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-struct.rs b/tests/ui/dynamically-sized-types/dst-struct.rs
index 5da9381f8..5da9381f8 100644
--- a/src/test/ui/dynamically-sized-types/dst-struct.rs
+++ b/tests/ui/dynamically-sized-types/dst-struct.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-trait-tuple.rs b/tests/ui/dynamically-sized-types/dst-trait-tuple.rs
index c1e45215a..c1e45215a 100644
--- a/src/test/ui/dynamically-sized-types/dst-trait-tuple.rs
+++ b/tests/ui/dynamically-sized-types/dst-trait-tuple.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-trait.rs b/tests/ui/dynamically-sized-types/dst-trait.rs
index 7ac6f0392..7ac6f0392 100644
--- a/src/test/ui/dynamically-sized-types/dst-trait.rs
+++ b/tests/ui/dynamically-sized-types/dst-trait.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-tuple-no-reorder.rs b/tests/ui/dynamically-sized-types/dst-tuple-no-reorder.rs
index 26b923f43..26b923f43 100644
--- a/src/test/ui/dynamically-sized-types/dst-tuple-no-reorder.rs
+++ b/tests/ui/dynamically-sized-types/dst-tuple-no-reorder.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-tuple-sole.rs b/tests/ui/dynamically-sized-types/dst-tuple-sole.rs
index 606689da0..606689da0 100644
--- a/src/test/ui/dynamically-sized-types/dst-tuple-sole.rs
+++ b/tests/ui/dynamically-sized-types/dst-tuple-sole.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-tuple-zst-offsets.rs b/tests/ui/dynamically-sized-types/dst-tuple-zst-offsets.rs
index b0cefe770..b0cefe770 100644
--- a/src/test/ui/dynamically-sized-types/dst-tuple-zst-offsets.rs
+++ b/tests/ui/dynamically-sized-types/dst-tuple-zst-offsets.rs
diff --git a/src/test/ui/dynamically-sized-types/dst-tuple.rs b/tests/ui/dynamically-sized-types/dst-tuple.rs
index 604ac5112..604ac5112 100644
--- a/src/test/ui/dynamically-sized-types/dst-tuple.rs
+++ b/tests/ui/dynamically-sized-types/dst-tuple.rs
diff --git a/src/test/ui/early-ret-binop-add.rs b/tests/ui/early-ret-binop-add.rs
index 2b5df52a5..2b5df52a5 100644
--- a/src/test/ui/early-ret-binop-add.rs
+++ b/tests/ui/early-ret-binop-add.rs
diff --git a/src/test/ui/editions/async-block-2015.rs b/tests/ui/editions/async-block-2015.rs
index 3daf4930c..3daf4930c 100644
--- a/src/test/ui/editions/async-block-2015.rs
+++ b/tests/ui/editions/async-block-2015.rs
diff --git a/src/test/ui/editions/async-block-2015.stderr b/tests/ui/editions/async-block-2015.stderr
index b792b8c1e..b792b8c1e 100644
--- a/src/test/ui/editions/async-block-2015.stderr
+++ b/tests/ui/editions/async-block-2015.stderr
diff --git a/src/test/ui/editions/auxiliary/absolute.rs b/tests/ui/editions/auxiliary/absolute.rs
index d596f9735..d596f9735 100644
--- a/src/test/ui/editions/auxiliary/absolute.rs
+++ b/tests/ui/editions/auxiliary/absolute.rs
diff --git a/src/test/ui/editions/auxiliary/edition-extern-crate-allowed.rs b/tests/ui/editions/auxiliary/edition-extern-crate-allowed.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/ui/editions/auxiliary/edition-extern-crate-allowed.rs
+++ b/tests/ui/editions/auxiliary/edition-extern-crate-allowed.rs
diff --git a/src/test/ui/editions/auxiliary/edition-imports-2015.rs b/tests/ui/editions/auxiliary/edition-imports-2015.rs
index c72331ca2..c72331ca2 100644
--- a/src/test/ui/editions/auxiliary/edition-imports-2015.rs
+++ b/tests/ui/editions/auxiliary/edition-imports-2015.rs
diff --git a/src/test/ui/editions/auxiliary/edition-imports-2018.rs b/tests/ui/editions/auxiliary/edition-imports-2018.rs
index b08dc499a..b08dc499a 100644
--- a/src/test/ui/editions/auxiliary/edition-imports-2018.rs
+++ b/tests/ui/editions/auxiliary/edition-imports-2018.rs
diff --git a/src/test/ui/editions/auxiliary/edition-kw-macro-2015.rs b/tests/ui/editions/auxiliary/edition-kw-macro-2015.rs
index 7cfd128f2..7cfd128f2 100644
--- a/src/test/ui/editions/auxiliary/edition-kw-macro-2015.rs
+++ b/tests/ui/editions/auxiliary/edition-kw-macro-2015.rs
diff --git a/src/test/ui/editions/auxiliary/edition-kw-macro-2018.rs b/tests/ui/editions/auxiliary/edition-kw-macro-2018.rs
index d07c0218d..d07c0218d 100644
--- a/src/test/ui/editions/auxiliary/edition-kw-macro-2018.rs
+++ b/tests/ui/editions/auxiliary/edition-kw-macro-2018.rs
diff --git a/src/test/ui/editions/dyn-trait-sugg-2021.rs b/tests/ui/editions/dyn-trait-sugg-2021.rs
index de0444b63..de0444b63 100644
--- a/src/test/ui/editions/dyn-trait-sugg-2021.rs
+++ b/tests/ui/editions/dyn-trait-sugg-2021.rs
diff --git a/src/test/ui/editions/dyn-trait-sugg-2021.stderr b/tests/ui/editions/dyn-trait-sugg-2021.stderr
index 8c68dec1d..8c68dec1d 100644
--- a/src/test/ui/editions/dyn-trait-sugg-2021.stderr
+++ b/tests/ui/editions/dyn-trait-sugg-2021.stderr
diff --git a/src/test/ui/editions/edition-extern-crate-allowed.rs b/tests/ui/editions/edition-extern-crate-allowed.rs
index 8d142cea5..8d142cea5 100644
--- a/src/test/ui/editions/edition-extern-crate-allowed.rs
+++ b/tests/ui/editions/edition-extern-crate-allowed.rs
diff --git a/src/test/ui/editions/edition-extern-crate-allowed.stderr b/tests/ui/editions/edition-extern-crate-allowed.stderr
index dde774c52..dde774c52 100644
--- a/src/test/ui/editions/edition-extern-crate-allowed.stderr
+++ b/tests/ui/editions/edition-extern-crate-allowed.stderr
diff --git a/src/test/ui/editions/edition-feature-ok.rs b/tests/ui/editions/edition-feature-ok.rs
index 69242fd71..69242fd71 100644
--- a/src/test/ui/editions/edition-feature-ok.rs
+++ b/tests/ui/editions/edition-feature-ok.rs
diff --git a/src/test/ui/editions/edition-feature-redundant.rs b/tests/ui/editions/edition-feature-redundant.rs
index 1049a2da8..1049a2da8 100644
--- a/src/test/ui/editions/edition-feature-redundant.rs
+++ b/tests/ui/editions/edition-feature-redundant.rs
diff --git a/src/test/ui/editions/edition-feature-redundant.stderr b/tests/ui/editions/edition-feature-redundant.stderr
index b11e616d7..b11e616d7 100644
--- a/src/test/ui/editions/edition-feature-redundant.stderr
+++ b/tests/ui/editions/edition-feature-redundant.stderr
diff --git a/src/test/ui/editions/edition-imports-2015.rs b/tests/ui/editions/edition-imports-2015.rs
index 5ba45b19d..5ba45b19d 100644
--- a/src/test/ui/editions/edition-imports-2015.rs
+++ b/tests/ui/editions/edition-imports-2015.rs
diff --git a/src/test/ui/editions/edition-imports-2015.stderr b/tests/ui/editions/edition-imports-2015.stderr
index 3f38e6f8e..3f38e6f8e 100644
--- a/src/test/ui/editions/edition-imports-2015.stderr
+++ b/tests/ui/editions/edition-imports-2015.stderr
diff --git a/src/test/ui/editions/edition-imports-2018.rs b/tests/ui/editions/edition-imports-2018.rs
index dcdbf0d05..dcdbf0d05 100644
--- a/src/test/ui/editions/edition-imports-2018.rs
+++ b/tests/ui/editions/edition-imports-2018.rs
diff --git a/src/test/ui/editions/edition-imports-2018.stderr b/tests/ui/editions/edition-imports-2018.stderr
index e7f760e49..e7f760e49 100644
--- a/src/test/ui/editions/edition-imports-2018.stderr
+++ b/tests/ui/editions/edition-imports-2018.stderr
diff --git a/src/test/ui/editions/edition-imports-virtual-2015-ambiguity.rs b/tests/ui/editions/edition-imports-virtual-2015-ambiguity.rs
index 3fffb30c6..3fffb30c6 100644
--- a/src/test/ui/editions/edition-imports-virtual-2015-ambiguity.rs
+++ b/tests/ui/editions/edition-imports-virtual-2015-ambiguity.rs
diff --git a/src/test/ui/editions/edition-imports-virtual-2015-gated.rs b/tests/ui/editions/edition-imports-virtual-2015-gated.rs
index 634d3e9a4..634d3e9a4 100644
--- a/src/test/ui/editions/edition-imports-virtual-2015-gated.rs
+++ b/tests/ui/editions/edition-imports-virtual-2015-gated.rs
diff --git a/src/test/ui/editions/edition-imports-virtual-2015-gated.stderr b/tests/ui/editions/edition-imports-virtual-2015-gated.stderr
index e4bdd2821..e4bdd2821 100644
--- a/src/test/ui/editions/edition-imports-virtual-2015-gated.stderr
+++ b/tests/ui/editions/edition-imports-virtual-2015-gated.stderr
diff --git a/src/test/ui/editions/edition-keywords-2015-2015-expansion.rs b/tests/ui/editions/edition-keywords-2015-2015-expansion.rs
index b2695bea5..b2695bea5 100644
--- a/src/test/ui/editions/edition-keywords-2015-2015-expansion.rs
+++ b/tests/ui/editions/edition-keywords-2015-2015-expansion.rs
diff --git a/src/test/ui/editions/edition-keywords-2015-2015-parsing.rs b/tests/ui/editions/edition-keywords-2015-2015-parsing.rs
index d1752a7ec..d1752a7ec 100644
--- a/src/test/ui/editions/edition-keywords-2015-2015-parsing.rs
+++ b/tests/ui/editions/edition-keywords-2015-2015-parsing.rs
diff --git a/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr b/tests/ui/editions/edition-keywords-2015-2015-parsing.stderr
index 39944622d..39944622d 100644
--- a/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr
+++ b/tests/ui/editions/edition-keywords-2015-2015-parsing.stderr
diff --git a/src/test/ui/editions/edition-keywords-2015-2015.rs b/tests/ui/editions/edition-keywords-2015-2015.rs
index 943d203b8..943d203b8 100644
--- a/src/test/ui/editions/edition-keywords-2015-2015.rs
+++ b/tests/ui/editions/edition-keywords-2015-2015.rs
diff --git a/src/test/ui/editions/edition-keywords-2015-2018-expansion.rs b/tests/ui/editions/edition-keywords-2015-2018-expansion.rs
index 9f34a3887..9f34a3887 100644
--- a/src/test/ui/editions/edition-keywords-2015-2018-expansion.rs
+++ b/tests/ui/editions/edition-keywords-2015-2018-expansion.rs
diff --git a/src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr b/tests/ui/editions/edition-keywords-2015-2018-expansion.stderr
index 570bbac2b..570bbac2b 100644
--- a/src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr
+++ b/tests/ui/editions/edition-keywords-2015-2018-expansion.stderr
diff --git a/src/test/ui/editions/edition-keywords-2015-2018-parsing.rs b/tests/ui/editions/edition-keywords-2015-2018-parsing.rs
index 44455f438..44455f438 100644
--- a/src/test/ui/editions/edition-keywords-2015-2018-parsing.rs
+++ b/tests/ui/editions/edition-keywords-2015-2018-parsing.rs
diff --git a/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr b/tests/ui/editions/edition-keywords-2015-2018-parsing.stderr
index fa83908e6..fa83908e6 100644
--- a/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr
+++ b/tests/ui/editions/edition-keywords-2015-2018-parsing.stderr
diff --git a/src/test/ui/editions/edition-keywords-2015-2018.rs b/tests/ui/editions/edition-keywords-2015-2018.rs
index 8c3397c95..8c3397c95 100644
--- a/src/test/ui/editions/edition-keywords-2015-2018.rs
+++ b/tests/ui/editions/edition-keywords-2015-2018.rs
diff --git a/src/test/ui/editions/edition-keywords-2018-2015-expansion.rs b/tests/ui/editions/edition-keywords-2018-2015-expansion.rs
index 707d8e95c..707d8e95c 100644
--- a/src/test/ui/editions/edition-keywords-2018-2015-expansion.rs
+++ b/tests/ui/editions/edition-keywords-2018-2015-expansion.rs
diff --git a/src/test/ui/editions/edition-keywords-2018-2015-parsing.rs b/tests/ui/editions/edition-keywords-2018-2015-parsing.rs
index d5ed9fb9a..d5ed9fb9a 100644
--- a/src/test/ui/editions/edition-keywords-2018-2015-parsing.rs
+++ b/tests/ui/editions/edition-keywords-2018-2015-parsing.rs
diff --git a/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr b/tests/ui/editions/edition-keywords-2018-2015-parsing.stderr
index 1a4a94e97..1a4a94e97 100644
--- a/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr
+++ b/tests/ui/editions/edition-keywords-2018-2015-parsing.stderr
diff --git a/src/test/ui/editions/edition-keywords-2018-2015.rs b/tests/ui/editions/edition-keywords-2018-2015.rs
index 2cb2dfb18..2cb2dfb18 100644
--- a/src/test/ui/editions/edition-keywords-2018-2015.rs
+++ b/tests/ui/editions/edition-keywords-2018-2015.rs
diff --git a/src/test/ui/editions/edition-keywords-2018-2018-expansion.rs b/tests/ui/editions/edition-keywords-2018-2018-expansion.rs
index a8e69fed6..a8e69fed6 100644
--- a/src/test/ui/editions/edition-keywords-2018-2018-expansion.rs
+++ b/tests/ui/editions/edition-keywords-2018-2018-expansion.rs
diff --git a/src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr b/tests/ui/editions/edition-keywords-2018-2018-expansion.stderr
index 69f275746..69f275746 100644
--- a/src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr
+++ b/tests/ui/editions/edition-keywords-2018-2018-expansion.stderr
diff --git a/src/test/ui/editions/edition-keywords-2018-2018-parsing.rs b/tests/ui/editions/edition-keywords-2018-2018-parsing.rs
index 044ab249f..044ab249f 100644
--- a/src/test/ui/editions/edition-keywords-2018-2018-parsing.rs
+++ b/tests/ui/editions/edition-keywords-2018-2018-parsing.rs
diff --git a/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr b/tests/ui/editions/edition-keywords-2018-2018-parsing.stderr
index 19eb7ac98..19eb7ac98 100644
--- a/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr
+++ b/tests/ui/editions/edition-keywords-2018-2018-parsing.stderr
diff --git a/src/test/ui/editions/edition-keywords-2018-2018.rs b/tests/ui/editions/edition-keywords-2018-2018.rs
index 5043440aa..5043440aa 100644
--- a/src/test/ui/editions/edition-keywords-2018-2018.rs
+++ b/tests/ui/editions/edition-keywords-2018-2018.rs
diff --git a/src/test/ui/editions/edition-raw-pointer-method-2015.rs b/tests/ui/editions/edition-raw-pointer-method-2015.rs
index fcfe493c1..fcfe493c1 100644
--- a/src/test/ui/editions/edition-raw-pointer-method-2015.rs
+++ b/tests/ui/editions/edition-raw-pointer-method-2015.rs
diff --git a/src/test/ui/editions/edition-raw-pointer-method-2015.stderr b/tests/ui/editions/edition-raw-pointer-method-2015.stderr
index 612dd17e7..612dd17e7 100644
--- a/src/test/ui/editions/edition-raw-pointer-method-2015.stderr
+++ b/tests/ui/editions/edition-raw-pointer-method-2015.stderr
diff --git a/src/test/ui/editions/edition-raw-pointer-method-2018.rs b/tests/ui/editions/edition-raw-pointer-method-2018.rs
index af0b2d6bd..af0b2d6bd 100644
--- a/src/test/ui/editions/edition-raw-pointer-method-2018.rs
+++ b/tests/ui/editions/edition-raw-pointer-method-2018.rs
diff --git a/src/test/ui/editions/edition-raw-pointer-method-2018.stderr b/tests/ui/editions/edition-raw-pointer-method-2018.stderr
index 23452495b..23452495b 100644
--- a/src/test/ui/editions/edition-raw-pointer-method-2018.stderr
+++ b/tests/ui/editions/edition-raw-pointer-method-2018.stderr
diff --git a/src/test/ui/editions/epoch-gate-feature.rs b/tests/ui/editions/epoch-gate-feature.rs
index 5f7feb534..5f7feb534 100644
--- a/src/test/ui/editions/epoch-gate-feature.rs
+++ b/tests/ui/editions/epoch-gate-feature.rs
diff --git a/src/test/ui/elide-errors-on-mismatched-tuple.rs b/tests/ui/elide-errors-on-mismatched-tuple.rs
index 7d87b0a77..7d87b0a77 100644
--- a/src/test/ui/elide-errors-on-mismatched-tuple.rs
+++ b/tests/ui/elide-errors-on-mismatched-tuple.rs
diff --git a/src/test/ui/elide-errors-on-mismatched-tuple.stderr b/tests/ui/elide-errors-on-mismatched-tuple.stderr
index e0537ff6f..e0537ff6f 100644
--- a/src/test/ui/elide-errors-on-mismatched-tuple.stderr
+++ b/tests/ui/elide-errors-on-mismatched-tuple.stderr
diff --git a/src/test/ui/elided-test.rs b/tests/ui/elided-test.rs
index b3f4446f1..b3f4446f1 100644
--- a/src/test/ui/elided-test.rs
+++ b/tests/ui/elided-test.rs
diff --git a/src/test/ui/elided-test.stderr b/tests/ui/elided-test.stderr
index c74c307c4..c74c307c4 100644
--- a/src/test/ui/elided-test.stderr
+++ b/tests/ui/elided-test.stderr
diff --git a/src/test/ui/else-if.rs b/tests/ui/else-if.rs
index 77d8d1abf..77d8d1abf 100644
--- a/src/test/ui/else-if.rs
+++ b/tests/ui/else-if.rs
diff --git a/src/test/ui/empty-allocation-non-null.rs b/tests/ui/empty-allocation-non-null.rs
index 925bddd5e..925bddd5e 100644
--- a/src/test/ui/empty-allocation-non-null.rs
+++ b/tests/ui/empty-allocation-non-null.rs
diff --git a/src/test/ui/empty-allocation-rvalue-non-null.rs b/tests/ui/empty-allocation-rvalue-non-null.rs
index 2f5a5c4bb..2f5a5c4bb 100644
--- a/src/test/ui/empty-allocation-rvalue-non-null.rs
+++ b/tests/ui/empty-allocation-rvalue-non-null.rs
diff --git a/src/test/ui/empty-type-parameter-list.rs b/tests/ui/empty-type-parameter-list.rs
index e168cd03b..e168cd03b 100644
--- a/src/test/ui/empty-type-parameter-list.rs
+++ b/tests/ui/empty-type-parameter-list.rs
diff --git a/src/test/ui/empty/auxiliary/empty-struct.rs b/tests/ui/empty/auxiliary/empty-struct.rs
index 3fb40f6bf..3fb40f6bf 100644
--- a/src/test/ui/empty/auxiliary/empty-struct.rs
+++ b/tests/ui/empty/auxiliary/empty-struct.rs
diff --git a/src/test/ui/empty/auxiliary/two_macros.rs b/tests/ui/empty/auxiliary/two_macros.rs
index 2330c75c8..2330c75c8 100644
--- a/src/test/ui/empty/auxiliary/two_macros.rs
+++ b/tests/ui/empty/auxiliary/two_macros.rs
diff --git a/src/test/ui/empty/empty-attributes.rs b/tests/ui/empty/empty-attributes.rs
index d319227b2..d319227b2 100644
--- a/src/test/ui/empty/empty-attributes.rs
+++ b/tests/ui/empty/empty-attributes.rs
diff --git a/src/test/ui/empty/empty-attributes.stderr b/tests/ui/empty/empty-attributes.stderr
index 01d0d5a6b..01d0d5a6b 100644
--- a/src/test/ui/empty/empty-attributes.stderr
+++ b/tests/ui/empty/empty-attributes.stderr
diff --git a/src/test/ui/empty/empty-comment.rs b/tests/ui/empty/empty-comment.rs
index 174274d28..174274d28 100644
--- a/src/test/ui/empty/empty-comment.rs
+++ b/tests/ui/empty/empty-comment.rs
diff --git a/src/test/ui/empty/empty-comment.stderr b/tests/ui/empty/empty-comment.stderr
index 7cc8d8fe9..7cc8d8fe9 100644
--- a/src/test/ui/empty/empty-comment.stderr
+++ b/tests/ui/empty/empty-comment.stderr
diff --git a/src/test/ui/empty/empty-linkname.rs b/tests/ui/empty/empty-linkname.rs
index 7113d913c..7113d913c 100644
--- a/src/test/ui/empty/empty-linkname.rs
+++ b/tests/ui/empty/empty-linkname.rs
diff --git a/src/test/ui/empty/empty-linkname.stderr b/tests/ui/empty/empty-linkname.stderr
index adcf3670d..adcf3670d 100644
--- a/src/test/ui/empty/empty-linkname.stderr
+++ b/tests/ui/empty/empty-linkname.stderr
diff --git a/src/test/ui/empty/empty-macro-use.rs b/tests/ui/empty/empty-macro-use.rs
index 846004e66..846004e66 100644
--- a/src/test/ui/empty/empty-macro-use.rs
+++ b/tests/ui/empty/empty-macro-use.rs
diff --git a/src/test/ui/empty/empty-macro-use.stderr b/tests/ui/empty/empty-macro-use.stderr
index 700f6616a..e0b3b8685 100644
--- a/src/test/ui/empty/empty-macro-use.stderr
+++ b/tests/ui/empty/empty-macro-use.stderr
@@ -4,7 +4,7 @@ error: cannot find macro `macro_two` in this scope
 LL |     macro_two!();
    |     ^^^^^^^^^
    |
-   = note: consider importing this macro:
+   = help: consider importing this macro:
            two_macros::macro_two
 
 error: aborting due to previous error
diff --git a/src/test/ui/empty/empty-never-array.rs b/tests/ui/empty/empty-never-array.rs
index 3de2b1a78..fd9334610 100644
--- a/src/test/ui/empty/empty-never-array.rs
+++ b/tests/ui/empty/empty-never-array.rs
@@ -8,7 +8,8 @@ enum Helper<T, U> {
 
 fn transmute<T, U>(t: T) -> U {
     let Helper::U(u) = Helper::T(t, []);
-    //~^ ERROR refutable pattern in local binding: `Helper::T(_, _)` not covered
+    //~^ ERROR refutable pattern in local binding
+    //~| `Helper::T(_, _)` not covered
     u
 }
 
diff --git a/tests/ui/empty/empty-never-array.stderr b/tests/ui/empty/empty-never-array.stderr
new file mode 100644
index 000000000..a488e484b
--- /dev/null
+++ b/tests/ui/empty/empty-never-array.stderr
@@ -0,0 +1,24 @@
+error[E0005]: refutable pattern in local binding
+  --> $DIR/empty-never-array.rs:10:9
+   |
+LL |     let Helper::U(u) = Helper::T(t, []);
+   |         ^^^^^^^^^^^^ pattern `Helper::T(_, _)` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+note: `Helper<T, U>` defined here
+  --> $DIR/empty-never-array.rs:3:6
+   |
+LL | enum Helper<T, U> {
+   |      ^^^^^^
+LL |     T(T, [!; 0]),
+   |     - not covered
+   = note: the matched value is of type `Helper<T, U>`
+help: you might want to use `let else` to handle the variant that isn't matched
+   |
+LL |     let Helper::U(u) = Helper::T(t, []) else { todo!() };
+   |                                         ++++++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/empty/empty-struct-braces-expr.rs b/tests/ui/empty/empty-struct-braces-expr.rs
index 2aab3e777..2aab3e777 100644
--- a/src/test/ui/empty/empty-struct-braces-expr.rs
+++ b/tests/ui/empty/empty-struct-braces-expr.rs
diff --git a/src/test/ui/empty/empty-struct-braces-expr.stderr b/tests/ui/empty/empty-struct-braces-expr.stderr
index e1a7a02a5..0e580aede 100644
--- a/src/test/ui/empty/empty-struct-braces-expr.stderr
+++ b/tests/ui/empty/empty-struct-braces-expr.stderr
@@ -100,22 +100,22 @@ help: a unit struct with a similar name exists
 LL |     let xe1 = XEmpty2();
    |               ~~~~~~~
 
-error[E0599]: no variant or associated item named `Empty3` found for enum `empty_struct::XE` in the current scope
+error[E0599]: no variant or associated item named `Empty3` found for enum `XE` in the current scope
   --> $DIR/empty-struct-braces-expr.rs:25:19
    |
 LL |     let xe3 = XE::Empty3;
    |                   ^^^^^^
    |                   |
-   |                   variant or associated item not found in `empty_struct::XE`
+   |                   variant or associated item not found in `XE`
    |                   help: there is a variant with a similar name: `XEmpty3`
 
-error[E0599]: no variant or associated item named `Empty3` found for enum `empty_struct::XE` in the current scope
+error[E0599]: no variant or associated item named `Empty3` found for enum `XE` in the current scope
   --> $DIR/empty-struct-braces-expr.rs:26:19
    |
 LL |     let xe3 = XE::Empty3();
    |                   ^^^^^^
    |                   |
-   |                   variant or associated item not found in `empty_struct::XE`
+   |                   variant or associated item not found in `XE`
    |                   help: there is a variant with a similar name: `XEmpty3`
 
 error[E0599]: no variant named `Empty1` found for enum `empty_struct::XE`
diff --git a/src/test/ui/empty/empty-struct-braces-pat-1.rs b/tests/ui/empty/empty-struct-braces-pat-1.rs
index 9bed93f9c..9bed93f9c 100644
--- a/src/test/ui/empty/empty-struct-braces-pat-1.rs
+++ b/tests/ui/empty/empty-struct-braces-pat-1.rs
diff --git a/src/test/ui/empty/empty-struct-braces-pat-1.stderr b/tests/ui/empty/empty-struct-braces-pat-1.stderr
index 14e09fc27..14e09fc27 100644
--- a/src/test/ui/empty/empty-struct-braces-pat-1.stderr
+++ b/tests/ui/empty/empty-struct-braces-pat-1.stderr
diff --git a/src/test/ui/empty/empty-struct-braces-pat-2.rs b/tests/ui/empty/empty-struct-braces-pat-2.rs
index cfe4641f3..cfe4641f3 100644
--- a/src/test/ui/empty/empty-struct-braces-pat-2.rs
+++ b/tests/ui/empty/empty-struct-braces-pat-2.rs
diff --git a/src/test/ui/empty/empty-struct-braces-pat-2.stderr b/tests/ui/empty/empty-struct-braces-pat-2.stderr
index 7fb5cb203..7fb5cb203 100644
--- a/src/test/ui/empty/empty-struct-braces-pat-2.stderr
+++ b/tests/ui/empty/empty-struct-braces-pat-2.stderr
diff --git a/src/test/ui/empty/empty-struct-braces-pat-3.rs b/tests/ui/empty/empty-struct-braces-pat-3.rs
index 54d547eef..54d547eef 100644
--- a/src/test/ui/empty/empty-struct-braces-pat-3.rs
+++ b/tests/ui/empty/empty-struct-braces-pat-3.rs
diff --git a/src/test/ui/empty/empty-struct-braces-pat-3.stderr b/tests/ui/empty/empty-struct-braces-pat-3.stderr
index 00c8b12e6..00c8b12e6 100644
--- a/src/test/ui/empty/empty-struct-braces-pat-3.stderr
+++ b/tests/ui/empty/empty-struct-braces-pat-3.stderr
diff --git a/src/test/ui/empty/empty-struct-tuple-pat.rs b/tests/ui/empty/empty-struct-tuple-pat.rs
index 47da8a306..47da8a306 100644
--- a/src/test/ui/empty/empty-struct-tuple-pat.rs
+++ b/tests/ui/empty/empty-struct-tuple-pat.rs
diff --git a/src/test/ui/empty/empty-struct-tuple-pat.stderr b/tests/ui/empty/empty-struct-tuple-pat.stderr
index 8d0f75d20..8d0f75d20 100644
--- a/src/test/ui/empty/empty-struct-tuple-pat.stderr
+++ b/tests/ui/empty/empty-struct-tuple-pat.stderr
diff --git a/src/test/ui/empty/empty-struct-unit-expr.rs b/tests/ui/empty/empty-struct-unit-expr.rs
index 8f3688a2a..8f3688a2a 100644
--- a/src/test/ui/empty/empty-struct-unit-expr.rs
+++ b/tests/ui/empty/empty-struct-unit-expr.rs
diff --git a/src/test/ui/empty/empty-struct-unit-expr.stderr b/tests/ui/empty/empty-struct-unit-expr.stderr
index e97209527..e97209527 100644
--- a/src/test/ui/empty/empty-struct-unit-expr.stderr
+++ b/tests/ui/empty/empty-struct-unit-expr.stderr
diff --git a/src/test/ui/empty/empty-struct-unit-pat.rs b/tests/ui/empty/empty-struct-unit-pat.rs
index 44a1e9e3d..44a1e9e3d 100644
--- a/src/test/ui/empty/empty-struct-unit-pat.rs
+++ b/tests/ui/empty/empty-struct-unit-pat.rs
diff --git a/src/test/ui/empty/empty-struct-unit-pat.stderr b/tests/ui/empty/empty-struct-unit-pat.stderr
index 5c0b4cffa..5c0b4cffa 100644
--- a/src/test/ui/empty/empty-struct-unit-pat.stderr
+++ b/tests/ui/empty/empty-struct-unit-pat.stderr
diff --git a/src/test/ui/empty/issue-37026.rs b/tests/ui/empty/issue-37026.rs
index fd678a717..fd678a717 100644
--- a/src/test/ui/empty/issue-37026.rs
+++ b/tests/ui/empty/issue-37026.rs
diff --git a/src/test/ui/empty/issue-37026.stderr b/tests/ui/empty/issue-37026.stderr
index 48a4a5bca..48a4a5bca 100644
--- a/src/test/ui/empty/issue-37026.stderr
+++ b/tests/ui/empty/issue-37026.stderr
diff --git a/src/test/ui/empty/no-link.rs b/tests/ui/empty/no-link.rs
index c80e61b45..c80e61b45 100644
--- a/src/test/ui/empty/no-link.rs
+++ b/tests/ui/empty/no-link.rs
diff --git a/src/test/ui/empty_global_asm.rs b/tests/ui/empty_global_asm.rs
index af13762d1..af13762d1 100644
--- a/src/test/ui/empty_global_asm.rs
+++ b/tests/ui/empty_global_asm.rs
diff --git a/src/test/ui/entry-point/auxiliary/main_functions.rs b/tests/ui/entry-point/auxiliary/main_functions.rs
index cc7992a42..cc7992a42 100644
--- a/src/test/ui/entry-point/auxiliary/main_functions.rs
+++ b/tests/ui/entry-point/auxiliary/main_functions.rs
diff --git a/src/test/ui/entry-point/imported_main_conflict.rs b/tests/ui/entry-point/imported_main_conflict.rs
index e8c70b065..e8c70b065 100644
--- a/src/test/ui/entry-point/imported_main_conflict.rs
+++ b/tests/ui/entry-point/imported_main_conflict.rs
diff --git a/src/test/ui/entry-point/imported_main_conflict.stderr b/tests/ui/entry-point/imported_main_conflict.stderr
index 8fadd0e19..8fadd0e19 100644
--- a/src/test/ui/entry-point/imported_main_conflict.stderr
+++ b/tests/ui/entry-point/imported_main_conflict.stderr
diff --git a/src/test/ui/entry-point/imported_main_const_fn_item_type_forbidden.rs b/tests/ui/entry-point/imported_main_const_fn_item_type_forbidden.rs
index 405d6e2a9..405d6e2a9 100644
--- a/src/test/ui/entry-point/imported_main_const_fn_item_type_forbidden.rs
+++ b/tests/ui/entry-point/imported_main_const_fn_item_type_forbidden.rs
diff --git a/src/test/ui/entry-point/imported_main_const_fn_item_type_forbidden.stderr b/tests/ui/entry-point/imported_main_const_fn_item_type_forbidden.stderr
index fabb6ffb0..fabb6ffb0 100644
--- a/src/test/ui/entry-point/imported_main_const_fn_item_type_forbidden.stderr
+++ b/tests/ui/entry-point/imported_main_const_fn_item_type_forbidden.stderr
diff --git a/src/test/ui/entry-point/imported_main_const_forbidden.rs b/tests/ui/entry-point/imported_main_const_forbidden.rs
index 1508280c0..1508280c0 100644
--- a/src/test/ui/entry-point/imported_main_const_forbidden.rs
+++ b/tests/ui/entry-point/imported_main_const_forbidden.rs
diff --git a/src/test/ui/entry-point/imported_main_const_forbidden.stderr b/tests/ui/entry-point/imported_main_const_forbidden.stderr
index 9d8b40dc3..9d8b40dc3 100644
--- a/src/test/ui/entry-point/imported_main_const_forbidden.stderr
+++ b/tests/ui/entry-point/imported_main_const_forbidden.stderr
diff --git a/src/test/ui/entry-point/imported_main_from_extern_crate.rs b/tests/ui/entry-point/imported_main_from_extern_crate.rs
index 4fddfc44a..4fddfc44a 100644
--- a/src/test/ui/entry-point/imported_main_from_extern_crate.rs
+++ b/tests/ui/entry-point/imported_main_from_extern_crate.rs
diff --git a/src/test/ui/entry-point/imported_main_from_inner_mod.rs b/tests/ui/entry-point/imported_main_from_inner_mod.rs
index 45750072a..45750072a 100644
--- a/src/test/ui/entry-point/imported_main_from_inner_mod.rs
+++ b/tests/ui/entry-point/imported_main_from_inner_mod.rs
diff --git a/src/test/ui/entry-point/imported_main_unused_not_trigger_feature_gate.rs b/tests/ui/entry-point/imported_main_unused_not_trigger_feature_gate.rs
index 4762fbb7c..4762fbb7c 100644
--- a/src/test/ui/entry-point/imported_main_unused_not_trigger_feature_gate.rs
+++ b/tests/ui/entry-point/imported_main_unused_not_trigger_feature_gate.rs
diff --git a/src/test/ui/enum-discriminant/actually_not_an_enum-discriminant.rs b/tests/ui/enum-discriminant/actually_not_an_enum-discriminant.rs
index 6a566ab3a..6a566ab3a 100644
--- a/src/test/ui/enum-discriminant/actually_not_an_enum-discriminant.rs
+++ b/tests/ui/enum-discriminant/actually_not_an_enum-discriminant.rs
diff --git a/src/test/ui/enum-discriminant/arbitrary_enum_discriminant-no-repr.rs b/tests/ui/enum-discriminant/arbitrary_enum_discriminant-no-repr.rs
index a6e5f70fd..a6e5f70fd 100644
--- a/src/test/ui/enum-discriminant/arbitrary_enum_discriminant-no-repr.rs
+++ b/tests/ui/enum-discriminant/arbitrary_enum_discriminant-no-repr.rs
diff --git a/src/test/ui/enum-discriminant/arbitrary_enum_discriminant-no-repr.stderr b/tests/ui/enum-discriminant/arbitrary_enum_discriminant-no-repr.stderr
index 8cee74696..8cee74696 100644
--- a/src/test/ui/enum-discriminant/arbitrary_enum_discriminant-no-repr.stderr
+++ b/tests/ui/enum-discriminant/arbitrary_enum_discriminant-no-repr.stderr
diff --git a/src/test/ui/enum-discriminant/arbitrary_enum_discriminant.rs b/tests/ui/enum-discriminant/arbitrary_enum_discriminant.rs
index 83e74a6e6..83e74a6e6 100644
--- a/src/test/ui/enum-discriminant/arbitrary_enum_discriminant.rs
+++ b/tests/ui/enum-discriminant/arbitrary_enum_discriminant.rs
diff --git a/src/test/ui/enum-discriminant/discriminant_size.rs b/tests/ui/enum-discriminant/discriminant_size.rs
index b939a70df..b939a70df 100644
--- a/src/test/ui/enum-discriminant/discriminant_size.rs
+++ b/tests/ui/enum-discriminant/discriminant_size.rs
diff --git a/src/test/ui/enum-discriminant/discriminant_size.stderr b/tests/ui/enum-discriminant/discriminant_size.stderr
index 9b1505b5c..9b1505b5c 100644
--- a/src/test/ui/enum-discriminant/discriminant_size.stderr
+++ b/tests/ui/enum-discriminant/discriminant_size.stderr
diff --git a/src/test/ui/enum-discriminant/discriminant_value-wrapper.rs b/tests/ui/enum-discriminant/discriminant_value-wrapper.rs
index 8e162d5c4..8e162d5c4 100644
--- a/src/test/ui/enum-discriminant/discriminant_value-wrapper.rs
+++ b/tests/ui/enum-discriminant/discriminant_value-wrapper.rs
diff --git a/src/test/ui/enum-discriminant/discriminant_value.rs b/tests/ui/enum-discriminant/discriminant_value.rs
index f3dfac298..f3dfac298 100644
--- a/src/test/ui/enum-discriminant/discriminant_value.rs
+++ b/tests/ui/enum-discriminant/discriminant_value.rs
diff --git a/src/test/ui/enum-discriminant/forbidden-discriminant-kind-impl.rs b/tests/ui/enum-discriminant/forbidden-discriminant-kind-impl.rs
index 4760ca548..4760ca548 100644
--- a/src/test/ui/enum-discriminant/forbidden-discriminant-kind-impl.rs
+++ b/tests/ui/enum-discriminant/forbidden-discriminant-kind-impl.rs
diff --git a/src/test/ui/enum-discriminant/forbidden-discriminant-kind-impl.stderr b/tests/ui/enum-discriminant/forbidden-discriminant-kind-impl.stderr
index 38cfd13b9..38cfd13b9 100644
--- a/src/test/ui/enum-discriminant/forbidden-discriminant-kind-impl.stderr
+++ b/tests/ui/enum-discriminant/forbidden-discriminant-kind-impl.stderr
diff --git a/src/test/ui/enum-discriminant/get_discr.rs b/tests/ui/enum-discriminant/get_discr.rs
index 71eea4e0f..71eea4e0f 100644
--- a/src/test/ui/enum-discriminant/get_discr.rs
+++ b/tests/ui/enum-discriminant/get_discr.rs
diff --git a/src/test/ui/enum-discriminant/issue-104519.rs b/tests/ui/enum-discriminant/issue-104519.rs
index c4630f76b..c4630f76b 100644
--- a/src/test/ui/enum-discriminant/issue-104519.rs
+++ b/tests/ui/enum-discriminant/issue-104519.rs
diff --git a/src/test/ui/enum-discriminant/issue-43398.rs b/tests/ui/enum-discriminant/issue-43398.rs
index 581db033f..581db033f 100644
--- a/src/test/ui/enum-discriminant/issue-43398.rs
+++ b/tests/ui/enum-discriminant/issue-43398.rs
diff --git a/src/test/ui/enum-discriminant/issue-43398.stderr b/tests/ui/enum-discriminant/issue-43398.stderr
index fc7bbd062..fc7bbd062 100644
--- a/src/test/ui/enum-discriminant/issue-43398.stderr
+++ b/tests/ui/enum-discriminant/issue-43398.stderr
diff --git a/src/test/ui/enum-discriminant/issue-46519.rs b/tests/ui/enum-discriminant/issue-46519.rs
index 0567923b7..0567923b7 100644
--- a/src/test/ui/enum-discriminant/issue-46519.rs
+++ b/tests/ui/enum-discriminant/issue-46519.rs
diff --git a/src/test/ui/enum-discriminant/issue-51582.rs b/tests/ui/enum-discriminant/issue-51582.rs
index 40a70c623..40a70c623 100644
--- a/src/test/ui/enum-discriminant/issue-51582.rs
+++ b/tests/ui/enum-discriminant/issue-51582.rs
diff --git a/src/test/ui/enum-discriminant/issue-70453-generics-in-discr-ice-2.rs b/tests/ui/enum-discriminant/issue-70453-generics-in-discr-ice-2.rs
index ad9fcc25b..ad9fcc25b 100644
--- a/src/test/ui/enum-discriminant/issue-70453-generics-in-discr-ice-2.rs
+++ b/tests/ui/enum-discriminant/issue-70453-generics-in-discr-ice-2.rs
diff --git a/src/test/ui/enum-discriminant/issue-70453-generics-in-discr-ice-2.stderr b/tests/ui/enum-discriminant/issue-70453-generics-in-discr-ice-2.stderr
index e4e10468d..e4e10468d 100644
--- a/src/test/ui/enum-discriminant/issue-70453-generics-in-discr-ice-2.stderr
+++ b/tests/ui/enum-discriminant/issue-70453-generics-in-discr-ice-2.stderr
diff --git a/src/test/ui/enum-discriminant/issue-70453-generics-in-discr-ice.rs b/tests/ui/enum-discriminant/issue-70453-generics-in-discr-ice.rs
index a0fb788a5..a0fb788a5 100644
--- a/src/test/ui/enum-discriminant/issue-70453-generics-in-discr-ice.rs
+++ b/tests/ui/enum-discriminant/issue-70453-generics-in-discr-ice.rs
diff --git a/src/test/ui/enum-discriminant/issue-70453-generics-in-discr-ice.stderr b/tests/ui/enum-discriminant/issue-70453-generics-in-discr-ice.stderr
index 7ea8a3912..7ea8a3912 100644
--- a/src/test/ui/enum-discriminant/issue-70453-generics-in-discr-ice.stderr
+++ b/tests/ui/enum-discriminant/issue-70453-generics-in-discr-ice.stderr
diff --git a/src/test/ui/enum-discriminant/issue-70453-polymorphic-ctfe.rs b/tests/ui/enum-discriminant/issue-70453-polymorphic-ctfe.rs
index 42a062239..42a062239 100644
--- a/src/test/ui/enum-discriminant/issue-70453-polymorphic-ctfe.rs
+++ b/tests/ui/enum-discriminant/issue-70453-polymorphic-ctfe.rs
diff --git a/src/test/ui/enum-discriminant/issue-70453-polymorphic-ctfe.stderr b/tests/ui/enum-discriminant/issue-70453-polymorphic-ctfe.stderr
index 0a7a63160..0a7a63160 100644
--- a/src/test/ui/enum-discriminant/issue-70453-polymorphic-ctfe.stderr
+++ b/tests/ui/enum-discriminant/issue-70453-polymorphic-ctfe.stderr
diff --git a/src/test/ui/enum-discriminant/issue-70509-partial_eq.rs b/tests/ui/enum-discriminant/issue-70509-partial_eq.rs
index 3adac7b72..3adac7b72 100644
--- a/src/test/ui/enum-discriminant/issue-70509-partial_eq.rs
+++ b/tests/ui/enum-discriminant/issue-70509-partial_eq.rs
diff --git a/src/test/ui/enum-discriminant/issue-70509-partial_eq.stderr b/tests/ui/enum-discriminant/issue-70509-partial_eq.stderr
index 2eef930c3..2eef930c3 100644
--- a/src/test/ui/enum-discriminant/issue-70509-partial_eq.stderr
+++ b/tests/ui/enum-discriminant/issue-70509-partial_eq.stderr
diff --git a/src/test/ui/issues/issue-72554.rs b/tests/ui/enum-discriminant/issue-72554.rs
index 54f7e9ac5..54f7e9ac5 100644
--- a/src/test/ui/issues/issue-72554.rs
+++ b/tests/ui/enum-discriminant/issue-72554.rs
diff --git a/src/test/ui/issues/issue-72554.stderr b/tests/ui/enum-discriminant/issue-72554.stderr
index d12be539f..d12be539f 100644
--- a/src/test/ui/issues/issue-72554.stderr
+++ b/tests/ui/enum-discriminant/issue-72554.stderr
diff --git a/src/test/ui/enum-discriminant/issue-90038.rs b/tests/ui/enum-discriminant/issue-90038.rs
index 5e98eccd9..5e98eccd9 100644
--- a/src/test/ui/enum-discriminant/issue-90038.rs
+++ b/tests/ui/enum-discriminant/issue-90038.rs
diff --git a/src/test/ui/enum-discriminant/niche-prefer-zero.rs b/tests/ui/enum-discriminant/niche-prefer-zero.rs
index f20607a89..f20607a89 100644
--- a/src/test/ui/enum-discriminant/niche-prefer-zero.rs
+++ b/tests/ui/enum-discriminant/niche-prefer-zero.rs
diff --git a/src/test/ui/enum-discriminant/niche.rs b/tests/ui/enum-discriminant/niche.rs
index 8d3061050..8d3061050 100644
--- a/src/test/ui/enum-discriminant/niche.rs
+++ b/tests/ui/enum-discriminant/niche.rs
diff --git a/src/test/ui/enum-discriminant/repr128.rs b/tests/ui/enum-discriminant/repr128.rs
index 00021a07b..00021a07b 100644
--- a/src/test/ui/enum-discriminant/repr128.rs
+++ b/tests/ui/enum-discriminant/repr128.rs
diff --git a/src/test/ui/enum-discriminant/repr128.stderr b/tests/ui/enum-discriminant/repr128.stderr
index da8d75c11..da8d75c11 100644
--- a/src/test/ui/enum-discriminant/repr128.stderr
+++ b/tests/ui/enum-discriminant/repr128.stderr
diff --git a/src/test/ui/enum/enum-and-module-in-same-scope.rs b/tests/ui/enum/enum-and-module-in-same-scope.rs
index cc6e199bd..cc6e199bd 100644
--- a/src/test/ui/enum/enum-and-module-in-same-scope.rs
+++ b/tests/ui/enum/enum-and-module-in-same-scope.rs
diff --git a/src/test/ui/enum/enum-and-module-in-same-scope.stderr b/tests/ui/enum/enum-and-module-in-same-scope.stderr
index 538898c2f..538898c2f 100644
--- a/src/test/ui/enum/enum-and-module-in-same-scope.stderr
+++ b/tests/ui/enum/enum-and-module-in-same-scope.stderr
diff --git a/src/test/ui/enum/enum-discrim-autosizing.rs b/tests/ui/enum/enum-discrim-autosizing.rs
index fc94d281c..fc94d281c 100644
--- a/src/test/ui/enum/enum-discrim-autosizing.rs
+++ b/tests/ui/enum/enum-discrim-autosizing.rs
diff --git a/src/test/ui/enum/enum-discrim-autosizing.stderr b/tests/ui/enum/enum-discrim-autosizing.stderr
index be3d7c64e..be3d7c64e 100644
--- a/src/test/ui/enum/enum-discrim-autosizing.stderr
+++ b/tests/ui/enum/enum-discrim-autosizing.stderr
diff --git a/src/test/ui/enum/enum-discrim-too-small.rs b/tests/ui/enum/enum-discrim-too-small.rs
index e49841402..e49841402 100644
--- a/src/test/ui/enum/enum-discrim-too-small.rs
+++ b/tests/ui/enum/enum-discrim-too-small.rs
diff --git a/src/test/ui/enum/enum-discrim-too-small.stderr b/tests/ui/enum/enum-discrim-too-small.stderr
index 40205d95b..40205d95b 100644
--- a/src/test/ui/enum/enum-discrim-too-small.stderr
+++ b/tests/ui/enum/enum-discrim-too-small.stderr
diff --git a/src/test/ui/enum/enum-discrim-too-small2.rs b/tests/ui/enum/enum-discrim-too-small2.rs
index 85cd73d6f..85cd73d6f 100644
--- a/src/test/ui/enum/enum-discrim-too-small2.rs
+++ b/tests/ui/enum/enum-discrim-too-small2.rs
diff --git a/src/test/ui/enum/enum-discrim-too-small2.stderr b/tests/ui/enum/enum-discrim-too-small2.stderr
index f79f7a043..f79f7a043 100644
--- a/src/test/ui/enum/enum-discrim-too-small2.stderr
+++ b/tests/ui/enum/enum-discrim-too-small2.stderr
diff --git a/src/test/ui/enum/enum-in-scope.rs b/tests/ui/enum/enum-in-scope.rs
index df14bc62e..df14bc62e 100644
--- a/src/test/ui/enum/enum-in-scope.rs
+++ b/tests/ui/enum/enum-in-scope.rs
diff --git a/src/test/ui/enum/enum-in-scope.stderr b/tests/ui/enum/enum-in-scope.stderr
index 49a01abcb..49a01abcb 100644
--- a/src/test/ui/enum/enum-in-scope.stderr
+++ b/tests/ui/enum/enum-in-scope.stderr
diff --git a/src/test/ui/enum/enum-size-variance.rs b/tests/ui/enum/enum-size-variance.rs
index 082bd0dcf..082bd0dcf 100644
--- a/src/test/ui/enum/enum-size-variance.rs
+++ b/tests/ui/enum/enum-size-variance.rs
diff --git a/src/test/ui/enum/enum-size-variance.stderr b/tests/ui/enum/enum-size-variance.stderr
index 6012033dc..6012033dc 100644
--- a/src/test/ui/enum/enum-size-variance.stderr
+++ b/tests/ui/enum/enum-size-variance.stderr
diff --git a/src/test/ui/enum/enum-to-float-cast-2.rs b/tests/ui/enum/enum-to-float-cast-2.rs
index c861b5ed9..c861b5ed9 100644
--- a/src/test/ui/enum/enum-to-float-cast-2.rs
+++ b/tests/ui/enum/enum-to-float-cast-2.rs
diff --git a/src/test/ui/enum/enum-to-float-cast-2.stderr b/tests/ui/enum/enum-to-float-cast-2.stderr
index 2bc414098..2bc414098 100644
--- a/src/test/ui/enum/enum-to-float-cast-2.stderr
+++ b/tests/ui/enum/enum-to-float-cast-2.stderr
diff --git a/src/test/ui/enum/enum-to-float-cast.rs b/tests/ui/enum/enum-to-float-cast.rs
index 05acdfd34..05acdfd34 100644
--- a/src/test/ui/enum/enum-to-float-cast.rs
+++ b/tests/ui/enum/enum-to-float-cast.rs
diff --git a/src/test/ui/enum/enum-to-float-cast.stderr b/tests/ui/enum/enum-to-float-cast.stderr
index 191606d8d..191606d8d 100644
--- a/src/test/ui/enum/enum-to-float-cast.stderr
+++ b/tests/ui/enum/enum-to-float-cast.stderr
diff --git a/src/test/ui/enum/enum-variant-type-2.rs b/tests/ui/enum/enum-variant-type-2.rs
index 27286a0a3..27286a0a3 100644
--- a/src/test/ui/enum/enum-variant-type-2.rs
+++ b/tests/ui/enum/enum-variant-type-2.rs
diff --git a/src/test/ui/enum/enum-variant-type-2.stderr b/tests/ui/enum/enum-variant-type-2.stderr
index 7e8453c61..7e8453c61 100644
--- a/src/test/ui/enum/enum-variant-type-2.stderr
+++ b/tests/ui/enum/enum-variant-type-2.stderr
diff --git a/src/test/ui/enum/issue-42747.rs b/tests/ui/enum/issue-42747.rs
index fec658782..fec658782 100644
--- a/src/test/ui/enum/issue-42747.rs
+++ b/tests/ui/enum/issue-42747.rs
diff --git a/src/test/ui/enum/issue-67945-1.rs b/tests/ui/enum/issue-67945-1.rs
index f4697344c..f4697344c 100644
--- a/src/test/ui/enum/issue-67945-1.rs
+++ b/tests/ui/enum/issue-67945-1.rs
diff --git a/src/test/ui/enum/issue-67945-1.stderr b/tests/ui/enum/issue-67945-1.stderr
index 8f1b5b38e..8f1b5b38e 100644
--- a/src/test/ui/enum/issue-67945-1.stderr
+++ b/tests/ui/enum/issue-67945-1.stderr
diff --git a/src/test/ui/enum/issue-67945-2.rs b/tests/ui/enum/issue-67945-2.rs
index 2eb123b73..2eb123b73 100644
--- a/src/test/ui/enum/issue-67945-2.rs
+++ b/tests/ui/enum/issue-67945-2.rs
diff --git a/src/test/ui/enum/issue-67945-2.stderr b/tests/ui/enum/issue-67945-2.stderr
index 63d3521af..63d3521af 100644
--- a/src/test/ui/enum/issue-67945-2.stderr
+++ b/tests/ui/enum/issue-67945-2.stderr
diff --git a/src/test/ui/enum/nested-enum.rs b/tests/ui/enum/nested-enum.rs
index 80957b8a1..80957b8a1 100644
--- a/src/test/ui/enum/nested-enum.rs
+++ b/tests/ui/enum/nested-enum.rs
diff --git a/src/test/ui/enum/nested-enum.stderr b/tests/ui/enum/nested-enum.stderr
index 7d6f57e88..7d6f57e88 100644
--- a/src/test/ui/enum/nested-enum.stderr
+++ b/tests/ui/enum/nested-enum.stderr
diff --git a/src/test/ui/enum/suggest-default-attribute.rs b/tests/ui/enum/suggest-default-attribute.rs
index 1d7567e60..1d7567e60 100644
--- a/src/test/ui/enum/suggest-default-attribute.rs
+++ b/tests/ui/enum/suggest-default-attribute.rs
diff --git a/src/test/ui/enum/suggest-default-attribute.stderr b/tests/ui/enum/suggest-default-attribute.stderr
index fb830d3f7..fb830d3f7 100644
--- a/src/test/ui/enum/suggest-default-attribute.stderr
+++ b/tests/ui/enum/suggest-default-attribute.stderr
diff --git a/src/test/ui/enum/union-in-enum.rs b/tests/ui/enum/union-in-enum.rs
index 048913e25..048913e25 100644
--- a/src/test/ui/enum/union-in-enum.rs
+++ b/tests/ui/enum/union-in-enum.rs
diff --git a/src/test/ui/env-args-reverse-iterator.rs b/tests/ui/env-args-reverse-iterator.rs
index 7f06718c0..7f06718c0 100644
--- a/src/test/ui/env-args-reverse-iterator.rs
+++ b/tests/ui/env-args-reverse-iterator.rs
diff --git a/src/test/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs
index 46e20d8c6..46e20d8c6 100644
--- a/src/test/ui/env-funky-keys.rs
+++ b/tests/ui/env-funky-keys.rs
diff --git a/src/test/ui/env-null-vars.rs b/tests/ui/env-null-vars.rs
index 10582a8a5..10582a8a5 100644
--- a/src/test/ui/env-null-vars.rs
+++ b/tests/ui/env-null-vars.rs
diff --git a/src/test/ui/env-vars.rs b/tests/ui/env-vars.rs
index f5035bb2c..f5035bb2c 100644
--- a/src/test/ui/env-vars.rs
+++ b/tests/ui/env-vars.rs
diff --git a/src/test/ui/error-codes/E0001.rs b/tests/ui/error-codes/E0001.rs
index 2c95f02bf..2c95f02bf 100644
--- a/src/test/ui/error-codes/E0001.rs
+++ b/tests/ui/error-codes/E0001.rs
diff --git a/src/test/ui/error-codes/E0001.stderr b/tests/ui/error-codes/E0001.stderr
index 577c49032..577c49032 100644
--- a/src/test/ui/error-codes/E0001.stderr
+++ b/tests/ui/error-codes/E0001.stderr
diff --git a/src/test/ui/error-codes/E0004-2.rs b/tests/ui/error-codes/E0004-2.rs
index c7612fd50..c7612fd50 100644
--- a/src/test/ui/error-codes/E0004-2.rs
+++ b/tests/ui/error-codes/E0004-2.rs
diff --git a/src/test/ui/error-codes/E0004-2.stderr b/tests/ui/error-codes/E0004-2.stderr
index 6f5bb4309..e829bac19 100644
--- a/src/test/ui/error-codes/E0004-2.stderr
+++ b/tests/ui/error-codes/E0004-2.stderr
@@ -6,15 +6,12 @@ LL |     match x { }
    |
 note: `Option<i32>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
+  ::: $SRC_DIR/core/src/option.rs:LL:COL
    |
-LL | pub enum Option<T> {
-   | ------------------
-...
-LL |     None,
-   |     ^^^^ not covered
-...
-LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^^^ not covered
+   = note: not covered
+  ::: $SRC_DIR/core/src/option.rs:LL:COL
+   |
+   = note: not covered
    = note: the matched value is of type `Option<i32>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
    |
diff --git a/src/test/ui/error-codes/E0004.rs b/tests/ui/error-codes/E0004.rs
index 1ee9d2bad..1ee9d2bad 100644
--- a/src/test/ui/error-codes/E0004.rs
+++ b/tests/ui/error-codes/E0004.rs
diff --git a/src/test/ui/error-codes/E0004.stderr b/tests/ui/error-codes/E0004.stderr
index 4ac8c904f..4ac8c904f 100644
--- a/src/test/ui/error-codes/E0004.stderr
+++ b/tests/ui/error-codes/E0004.stderr
diff --git a/src/test/ui/error-codes/E0005.rs b/tests/ui/error-codes/E0005.rs
index f4730697e..f4730697e 100644
--- a/src/test/ui/error-codes/E0005.rs
+++ b/tests/ui/error-codes/E0005.rs
diff --git a/tests/ui/error-codes/E0005.stderr b/tests/ui/error-codes/E0005.stderr
new file mode 100644
index 000000000..4692b6641
--- /dev/null
+++ b/tests/ui/error-codes/E0005.stderr
@@ -0,0 +1,17 @@
+error[E0005]: refutable pattern in local binding
+  --> $DIR/E0005.rs:3:9
+   |
+LL |     let Some(y) = x;
+   |         ^^^^^^^ pattern `None` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+   = note: the matched value is of type `Option<i32>`
+help: you might want to use `let else` to handle the variant that isn't matched
+   |
+LL |     let Some(y) = x else { todo!() };
+   |                     ++++++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/error-codes/E0010-teach.rs b/tests/ui/error-codes/E0010-teach.rs
index fc5dffb37..fc5dffb37 100644
--- a/src/test/ui/error-codes/E0010-teach.rs
+++ b/tests/ui/error-codes/E0010-teach.rs
diff --git a/src/test/ui/error-codes/E0010-teach.stderr b/tests/ui/error-codes/E0010-teach.stderr
index 33de9fd68..33de9fd68 100644
--- a/src/test/ui/error-codes/E0010-teach.stderr
+++ b/tests/ui/error-codes/E0010-teach.stderr
diff --git a/src/test/ui/error-codes/E0010.rs b/tests/ui/error-codes/E0010.rs
index e62997640..e62997640 100644
--- a/src/test/ui/error-codes/E0010.rs
+++ b/tests/ui/error-codes/E0010.rs
diff --git a/src/test/ui/error-codes/E0010.stderr b/tests/ui/error-codes/E0010.stderr
index 0042333b9..0042333b9 100644
--- a/src/test/ui/error-codes/E0010.stderr
+++ b/tests/ui/error-codes/E0010.stderr
diff --git a/tests/ui/error-codes/E0013.rs b/tests/ui/error-codes/E0013.rs
new file mode 100644
index 000000000..9b3982a78
--- /dev/null
+++ b/tests/ui/error-codes/E0013.rs
@@ -0,0 +1,4 @@
+static X: i32 = 42;
+const Y: i32 = X; //~ ERROR constants cannot refer to statics [E0013]
+
+fn main() {}
diff --git a/tests/ui/error-codes/E0013.stderr b/tests/ui/error-codes/E0013.stderr
new file mode 100644
index 000000000..dc22053a6
--- /dev/null
+++ b/tests/ui/error-codes/E0013.stderr
@@ -0,0 +1,11 @@
+error[E0013]: constants cannot refer to statics
+  --> $DIR/E0013.rs:2:16
+   |
+LL | const Y: i32 = X;
+   |                ^
+   |
+   = help: consider extracting the value of the `static` to a `const`, and referring to that
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0013`.
diff --git a/tests/ui/error-codes/E0015.rs b/tests/ui/error-codes/E0015.rs
new file mode 100644
index 000000000..b0211358d
--- /dev/null
+++ b/tests/ui/error-codes/E0015.rs
@@ -0,0 +1,8 @@
+fn create_some() -> Option<u8> {
+    Some(1)
+}
+
+const FOO: Option<u8> = create_some();
+//~^ ERROR cannot call non-const fn `create_some` in constants [E0015]
+
+fn main() {}
diff --git a/tests/ui/error-codes/E0015.stderr b/tests/ui/error-codes/E0015.stderr
new file mode 100644
index 000000000..ec1ce47b2
--- /dev/null
+++ b/tests/ui/error-codes/E0015.stderr
@@ -0,0 +1,11 @@
+error[E0015]: cannot call non-const fn `create_some` in constants
+  --> $DIR/E0015.rs:5:25
+   |
+LL | const FOO: Option<u8> = create_some();
+   |                         ^^^^^^^^^^^^^
+   |
+   = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0015`.
diff --git a/src/test/ui/error-codes/E0017.rs b/tests/ui/error-codes/E0017.rs
index c211ad1a2..c211ad1a2 100644
--- a/src/test/ui/error-codes/E0017.rs
+++ b/tests/ui/error-codes/E0017.rs
diff --git a/src/test/ui/error-codes/E0017.stderr b/tests/ui/error-codes/E0017.stderr
index 6e48f9582..6e48f9582 100644
--- a/src/test/ui/error-codes/E0017.stderr
+++ b/tests/ui/error-codes/E0017.stderr
diff --git a/src/test/ui/error-codes/E0023.rs b/tests/ui/error-codes/E0023.rs
index 7ac22bb71..7ac22bb71 100644
--- a/src/test/ui/error-codes/E0023.rs
+++ b/tests/ui/error-codes/E0023.rs
diff --git a/src/test/ui/error-codes/E0023.stderr b/tests/ui/error-codes/E0023.stderr
index 3e321b037..3e321b037 100644
--- a/src/test/ui/error-codes/E0023.stderr
+++ b/tests/ui/error-codes/E0023.stderr
diff --git a/src/test/ui/error-codes/E0025.rs b/tests/ui/error-codes/E0025.rs
index 549269a75..549269a75 100644
--- a/src/test/ui/error-codes/E0025.rs
+++ b/tests/ui/error-codes/E0025.rs
diff --git a/src/test/ui/error-codes/E0025.stderr b/tests/ui/error-codes/E0025.stderr
index dfec6d027..dfec6d027 100644
--- a/src/test/ui/error-codes/E0025.stderr
+++ b/tests/ui/error-codes/E0025.stderr
diff --git a/src/test/ui/error-codes/E0026-teach.rs b/tests/ui/error-codes/E0026-teach.rs
index 7c51004ff..7c51004ff 100644
--- a/src/test/ui/error-codes/E0026-teach.rs
+++ b/tests/ui/error-codes/E0026-teach.rs
diff --git a/src/test/ui/error-codes/E0026-teach.stderr b/tests/ui/error-codes/E0026-teach.stderr
index 1a80edcbb..1a80edcbb 100644
--- a/src/test/ui/error-codes/E0026-teach.stderr
+++ b/tests/ui/error-codes/E0026-teach.stderr
diff --git a/src/test/ui/error-codes/E0026.rs b/tests/ui/error-codes/E0026.rs
index 0b1ea1c7b..0b1ea1c7b 100644
--- a/src/test/ui/error-codes/E0026.rs
+++ b/tests/ui/error-codes/E0026.rs
diff --git a/src/test/ui/error-codes/E0026.stderr b/tests/ui/error-codes/E0026.stderr
index 031481812..031481812 100644
--- a/src/test/ui/error-codes/E0026.stderr
+++ b/tests/ui/error-codes/E0026.stderr
diff --git a/src/test/ui/error-codes/E0027.rs b/tests/ui/error-codes/E0027.rs
index e7eca1ce5..e7eca1ce5 100644
--- a/src/test/ui/error-codes/E0027.rs
+++ b/tests/ui/error-codes/E0027.rs
diff --git a/src/test/ui/error-codes/E0027.stderr b/tests/ui/error-codes/E0027.stderr
index 9ae97e4a9..9ae97e4a9 100644
--- a/src/test/ui/error-codes/E0027.stderr
+++ b/tests/ui/error-codes/E0027.stderr
diff --git a/src/test/ui/error-codes/E0029-teach.rs b/tests/ui/error-codes/E0029-teach.rs
index 3ff8cb348..3ff8cb348 100644
--- a/src/test/ui/error-codes/E0029-teach.rs
+++ b/tests/ui/error-codes/E0029-teach.rs
diff --git a/src/test/ui/error-codes/E0029-teach.stderr b/tests/ui/error-codes/E0029-teach.stderr
index b89b2e7d1..b89b2e7d1 100644
--- a/src/test/ui/error-codes/E0029-teach.stderr
+++ b/tests/ui/error-codes/E0029-teach.stderr
diff --git a/src/test/ui/error-codes/E0029.rs b/tests/ui/error-codes/E0029.rs
index d9b53e113..d9b53e113 100644
--- a/src/test/ui/error-codes/E0029.rs
+++ b/tests/ui/error-codes/E0029.rs
diff --git a/src/test/ui/error-codes/E0029.stderr b/tests/ui/error-codes/E0029.stderr
index f7250b39d..f7250b39d 100644
--- a/src/test/ui/error-codes/E0029.stderr
+++ b/tests/ui/error-codes/E0029.stderr
diff --git a/src/test/ui/error-codes/E0030-teach.rs b/tests/ui/error-codes/E0030-teach.rs
index 8caa4f093..8caa4f093 100644
--- a/src/test/ui/error-codes/E0030-teach.rs
+++ b/tests/ui/error-codes/E0030-teach.rs
diff --git a/src/test/ui/error-codes/E0030-teach.stderr b/tests/ui/error-codes/E0030-teach.stderr
index 800f66416..800f66416 100644
--- a/src/test/ui/error-codes/E0030-teach.stderr
+++ b/tests/ui/error-codes/E0030-teach.stderr
diff --git a/src/test/ui/error-codes/E0030.rs b/tests/ui/error-codes/E0030.rs
index a5d8f8726..a5d8f8726 100644
--- a/src/test/ui/error-codes/E0030.rs
+++ b/tests/ui/error-codes/E0030.rs
diff --git a/src/test/ui/error-codes/E0030.stderr b/tests/ui/error-codes/E0030.stderr
index 8a6114024..8a6114024 100644
--- a/src/test/ui/error-codes/E0030.stderr
+++ b/tests/ui/error-codes/E0030.stderr
diff --git a/tests/ui/error-codes/E0033-teach.rs b/tests/ui/error-codes/E0033-teach.rs
new file mode 100644
index 000000000..289561bad
--- /dev/null
+++ b/tests/ui/error-codes/E0033-teach.rs
@@ -0,0 +1,14 @@
+// compile-flags: -Z teach
+trait SomeTrait {
+    fn foo(&self);
+}
+struct S;
+impl SomeTrait for S {
+    fn foo(&self) {}
+}
+fn main() {
+    let trait_obj: &dyn SomeTrait = &S;
+
+    let &invalid = trait_obj;
+    //~^ ERROR E0033
+}
diff --git a/tests/ui/error-codes/E0033-teach.stderr b/tests/ui/error-codes/E0033-teach.stderr
new file mode 100644
index 000000000..31bc6719a
--- /dev/null
+++ b/tests/ui/error-codes/E0033-teach.stderr
@@ -0,0 +1,13 @@
+error[E0033]: type `&dyn SomeTrait` cannot be dereferenced
+  --> $DIR/E0033-teach.rs:12:9
+   |
+LL |     let &invalid = trait_obj;
+   |         ^^^^^^^^ type `&dyn SomeTrait` cannot be dereferenced
+   |
+   = note: This error indicates that a pointer to a trait type cannot be implicitly dereferenced by a pattern. Every trait defines a type, but because the size of trait implementors isn't fixed, this type has no compile-time size. Therefore, all accesses to trait types must be through pointers. If you encounter this error you should try to avoid dereferencing the pointer.
+           
+           You can read more about trait objects in the Trait Objects section of the Reference: https://doc.rust-lang.org/reference/types.html#trait-objects
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0033`.
diff --git a/tests/ui/error-codes/E0033.rs b/tests/ui/error-codes/E0033.rs
new file mode 100644
index 000000000..bd6ec2072
--- /dev/null
+++ b/tests/ui/error-codes/E0033.rs
@@ -0,0 +1,13 @@
+trait SomeTrait {
+    fn foo(&self);
+}
+struct S;
+impl SomeTrait for S {
+    fn foo(&self) {}
+}
+fn main() {
+    let trait_obj: &dyn SomeTrait = &S;
+
+    let &invalid = trait_obj;
+    //~^ ERROR E0033
+}
diff --git a/tests/ui/error-codes/E0033.stderr b/tests/ui/error-codes/E0033.stderr
new file mode 100644
index 000000000..ab2e780ee
--- /dev/null
+++ b/tests/ui/error-codes/E0033.stderr
@@ -0,0 +1,9 @@
+error[E0033]: type `&dyn SomeTrait` cannot be dereferenced
+  --> $DIR/E0033.rs:11:9
+   |
+LL |     let &invalid = trait_obj;
+   |         ^^^^^^^^ type `&dyn SomeTrait` cannot be dereferenced
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0033`.
diff --git a/src/test/ui/error-codes/E0034.rs b/tests/ui/error-codes/E0034.rs
index f962da115..f962da115 100644
--- a/src/test/ui/error-codes/E0034.rs
+++ b/tests/ui/error-codes/E0034.rs
diff --git a/src/test/ui/error-codes/E0034.stderr b/tests/ui/error-codes/E0034.stderr
index e29621702..e29621702 100644
--- a/src/test/ui/error-codes/E0034.stderr
+++ b/tests/ui/error-codes/E0034.stderr
diff --git a/src/test/ui/error-codes/E0038.rs b/tests/ui/error-codes/E0038.rs
index 9757e2ab1..9757e2ab1 100644
--- a/src/test/ui/error-codes/E0038.rs
+++ b/tests/ui/error-codes/E0038.rs
diff --git a/src/test/ui/error-codes/E0038.stderr b/tests/ui/error-codes/E0038.stderr
index 3773d6f52..3773d6f52 100644
--- a/src/test/ui/error-codes/E0038.stderr
+++ b/tests/ui/error-codes/E0038.stderr
diff --git a/src/test/ui/error-codes/E0040.fixed b/tests/ui/error-codes/E0040.fixed
index 139dc8f94..139dc8f94 100644
--- a/src/test/ui/error-codes/E0040.fixed
+++ b/tests/ui/error-codes/E0040.fixed
diff --git a/src/test/ui/error-codes/E0040.rs b/tests/ui/error-codes/E0040.rs
index 9ffc42d0c..9ffc42d0c 100644
--- a/src/test/ui/error-codes/E0040.rs
+++ b/tests/ui/error-codes/E0040.rs
diff --git a/src/test/ui/error-codes/E0040.stderr b/tests/ui/error-codes/E0040.stderr
index 9fcda1a93..9fcda1a93 100644
--- a/src/test/ui/error-codes/E0040.stderr
+++ b/tests/ui/error-codes/E0040.stderr
diff --git a/src/test/ui/error-codes/E0044.rs b/tests/ui/error-codes/E0044.rs
index d9cdaf83c..d9cdaf83c 100644
--- a/src/test/ui/error-codes/E0044.rs
+++ b/tests/ui/error-codes/E0044.rs
diff --git a/src/test/ui/error-codes/E0044.stderr b/tests/ui/error-codes/E0044.stderr
index e889c167b..e889c167b 100644
--- a/src/test/ui/error-codes/E0044.stderr
+++ b/tests/ui/error-codes/E0044.stderr
diff --git a/src/test/ui/error-codes/E0045.rs b/tests/ui/error-codes/E0045.rs
index fb3df56f7..fb3df56f7 100644
--- a/src/test/ui/error-codes/E0045.rs
+++ b/tests/ui/error-codes/E0045.rs
diff --git a/src/test/ui/error-codes/E0045.stderr b/tests/ui/error-codes/E0045.stderr
index fcc613b11..fcc613b11 100644
--- a/src/test/ui/error-codes/E0045.stderr
+++ b/tests/ui/error-codes/E0045.stderr
diff --git a/src/test/ui/error-codes/E0049.rs b/tests/ui/error-codes/E0049.rs
index 3dd910019..3dd910019 100644
--- a/src/test/ui/error-codes/E0049.rs
+++ b/tests/ui/error-codes/E0049.rs
diff --git a/src/test/ui/error-codes/E0049.stderr b/tests/ui/error-codes/E0049.stderr
index c0cd31faa..c0cd31faa 100644
--- a/src/test/ui/error-codes/E0049.stderr
+++ b/tests/ui/error-codes/E0049.stderr
diff --git a/src/test/ui/error-codes/E0050.rs b/tests/ui/error-codes/E0050.rs
index 98fb62785..98fb62785 100644
--- a/src/test/ui/error-codes/E0050.rs
+++ b/tests/ui/error-codes/E0050.rs
diff --git a/src/test/ui/error-codes/E0050.stderr b/tests/ui/error-codes/E0050.stderr
index fe9ac5e8e..fe9ac5e8e 100644
--- a/src/test/ui/error-codes/E0050.stderr
+++ b/tests/ui/error-codes/E0050.stderr
diff --git a/src/test/ui/error-codes/E0054.rs b/tests/ui/error-codes/E0054.rs
index 55bda4ead..55bda4ead 100644
--- a/src/test/ui/error-codes/E0054.rs
+++ b/tests/ui/error-codes/E0054.rs
diff --git a/src/test/ui/error-codes/E0054.stderr b/tests/ui/error-codes/E0054.stderr
index 6b1092760..6b1092760 100644
--- a/src/test/ui/error-codes/E0054.stderr
+++ b/tests/ui/error-codes/E0054.stderr
diff --git a/src/test/ui/error-codes/E0055.rs b/tests/ui/error-codes/E0055.rs
index fd5804bbc..fd5804bbc 100644
--- a/src/test/ui/error-codes/E0055.rs
+++ b/tests/ui/error-codes/E0055.rs
diff --git a/src/test/ui/error-codes/E0055.stderr b/tests/ui/error-codes/E0055.stderr
index a52c90962..a52c90962 100644
--- a/src/test/ui/error-codes/E0055.stderr
+++ b/tests/ui/error-codes/E0055.stderr
diff --git a/src/test/ui/error-codes/E0057.rs b/tests/ui/error-codes/E0057.rs
index 83f941f65..83f941f65 100644
--- a/src/test/ui/error-codes/E0057.rs
+++ b/tests/ui/error-codes/E0057.rs
diff --git a/src/test/ui/error-codes/E0057.stderr b/tests/ui/error-codes/E0057.stderr
index bea226f09..163737895 100644
--- a/src/test/ui/error-codes/E0057.stderr
+++ b/tests/ui/error-codes/E0057.stderr
@@ -11,8 +11,8 @@ LL |     let f = |x| x * 3;
    |             ^^^
 help: provide the argument
    |
-LL |     let a = f(/* value */);
-   |              ~~~~~~~~~~~~~
+LL |     let a = f(/* x */);
+   |              ~~~~~~~~~
 
 error[E0057]: this function takes 1 argument but 2 arguments were supplied
   --> $DIR/E0057.rs:5:13
diff --git a/src/test/ui/error-codes/E0059.rs b/tests/ui/error-codes/E0059.rs
index f775089bf..f775089bf 100644
--- a/src/test/ui/error-codes/E0059.rs
+++ b/tests/ui/error-codes/E0059.rs
diff --git a/src/test/ui/error-codes/E0059.stderr b/tests/ui/error-codes/E0059.stderr
index f331d0142..4f6abb22a 100644
--- a/src/test/ui/error-codes/E0059.stderr
+++ b/tests/ui/error-codes/E0059.stderr
@@ -6,9 +6,6 @@ LL | fn foo<F: Fn<i32>>(f: F) -> F::Output { f(3) }
    |
 note: required by a bound in `Fn`
   --> $SRC_DIR/core/src/ops/function.rs:LL:COL
-   |
-LL | pub trait Fn<Args: Tuple>: FnMut<Args> {
-   |                    ^^^^^ required by this bound in `Fn`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0060.rs b/tests/ui/error-codes/E0060.rs
index 7050a1dff..7050a1dff 100644
--- a/src/test/ui/error-codes/E0060.rs
+++ b/tests/ui/error-codes/E0060.rs
diff --git a/src/test/ui/error-codes/E0060.stderr b/tests/ui/error-codes/E0060.stderr
index 934a18d89..934a18d89 100644
--- a/src/test/ui/error-codes/E0060.stderr
+++ b/tests/ui/error-codes/E0060.stderr
diff --git a/src/test/ui/error-codes/E0061.rs b/tests/ui/error-codes/E0061.rs
index b6fae6c63..b6fae6c63 100644
--- a/src/test/ui/error-codes/E0061.rs
+++ b/tests/ui/error-codes/E0061.rs
diff --git a/src/test/ui/error-codes/E0061.stderr b/tests/ui/error-codes/E0061.stderr
index fa4ccbe66..fa4ccbe66 100644
--- a/src/test/ui/error-codes/E0061.stderr
+++ b/tests/ui/error-codes/E0061.stderr
diff --git a/src/test/ui/error-codes/E0062.rs b/tests/ui/error-codes/E0062.rs
index 3b7f88750..3b7f88750 100644
--- a/src/test/ui/error-codes/E0062.rs
+++ b/tests/ui/error-codes/E0062.rs
diff --git a/src/test/ui/error-codes/E0062.stderr b/tests/ui/error-codes/E0062.stderr
index a3e140995..a3e140995 100644
--- a/src/test/ui/error-codes/E0062.stderr
+++ b/tests/ui/error-codes/E0062.stderr
diff --git a/src/test/ui/error-codes/E0063.rs b/tests/ui/error-codes/E0063.rs
index 48c9c13f0..48c9c13f0 100644
--- a/src/test/ui/error-codes/E0063.rs
+++ b/tests/ui/error-codes/E0063.rs
diff --git a/src/test/ui/error-codes/E0063.stderr b/tests/ui/error-codes/E0063.stderr
index 235e20402..235e20402 100644
--- a/src/test/ui/error-codes/E0063.stderr
+++ b/tests/ui/error-codes/E0063.stderr
diff --git a/src/test/ui/error-codes/E0067.rs b/tests/ui/error-codes/E0067.rs
index 5925443dd..5925443dd 100644
--- a/src/test/ui/error-codes/E0067.rs
+++ b/tests/ui/error-codes/E0067.rs
diff --git a/src/test/ui/error-codes/E0067.stderr b/tests/ui/error-codes/E0067.stderr
index ec0358cb7..ec0358cb7 100644
--- a/src/test/ui/error-codes/E0067.stderr
+++ b/tests/ui/error-codes/E0067.stderr
diff --git a/src/test/ui/error-codes/E0069.rs b/tests/ui/error-codes/E0069.rs
index a4ba9fd8d..a4ba9fd8d 100644
--- a/src/test/ui/error-codes/E0069.rs
+++ b/tests/ui/error-codes/E0069.rs
diff --git a/src/test/ui/error-codes/E0069.stderr b/tests/ui/error-codes/E0069.stderr
index ff9bbe01d..ff9bbe01d 100644
--- a/src/test/ui/error-codes/E0069.stderr
+++ b/tests/ui/error-codes/E0069.stderr
diff --git a/src/test/ui/error-codes/E0070.rs b/tests/ui/error-codes/E0070.rs
index 3aae0c9ff..3aae0c9ff 100644
--- a/src/test/ui/error-codes/E0070.rs
+++ b/tests/ui/error-codes/E0070.rs
diff --git a/src/test/ui/error-codes/E0070.stderr b/tests/ui/error-codes/E0070.stderr
index 8868bc257..8868bc257 100644
--- a/src/test/ui/error-codes/E0070.stderr
+++ b/tests/ui/error-codes/E0070.stderr
diff --git a/src/test/ui/error-codes/E0071.rs b/tests/ui/error-codes/E0071.rs
index bd8469de7..bd8469de7 100644
--- a/src/test/ui/error-codes/E0071.rs
+++ b/tests/ui/error-codes/E0071.rs
diff --git a/src/test/ui/error-codes/E0071.stderr b/tests/ui/error-codes/E0071.stderr
index ae312fc40..ae312fc40 100644
--- a/src/test/ui/error-codes/E0071.stderr
+++ b/tests/ui/error-codes/E0071.stderr
diff --git a/src/test/ui/error-codes/E0075.rs b/tests/ui/error-codes/E0075.rs
index 7feab0a8b..7feab0a8b 100644
--- a/src/test/ui/error-codes/E0075.rs
+++ b/tests/ui/error-codes/E0075.rs
diff --git a/src/test/ui/error-codes/E0075.stderr b/tests/ui/error-codes/E0075.stderr
index 3f927726a..3f927726a 100644
--- a/src/test/ui/error-codes/E0075.stderr
+++ b/tests/ui/error-codes/E0075.stderr
diff --git a/src/test/ui/error-codes/E0076.rs b/tests/ui/error-codes/E0076.rs
index a27072eb7..a27072eb7 100644
--- a/src/test/ui/error-codes/E0076.rs
+++ b/tests/ui/error-codes/E0076.rs
diff --git a/src/test/ui/error-codes/E0076.stderr b/tests/ui/error-codes/E0076.stderr
index 7d4ff8798..7d4ff8798 100644
--- a/src/test/ui/error-codes/E0076.stderr
+++ b/tests/ui/error-codes/E0076.stderr
diff --git a/src/test/ui/error-codes/E0077.rs b/tests/ui/error-codes/E0077.rs
index fa2d5e24f..fa2d5e24f 100644
--- a/src/test/ui/error-codes/E0077.rs
+++ b/tests/ui/error-codes/E0077.rs
diff --git a/src/test/ui/error-codes/E0077.stderr b/tests/ui/error-codes/E0077.stderr
index 9a84b2ec4..9a84b2ec4 100644
--- a/src/test/ui/error-codes/E0077.stderr
+++ b/tests/ui/error-codes/E0077.stderr
diff --git a/src/test/ui/error-codes/E0080.rs b/tests/ui/error-codes/E0080.rs
index ea3264b61..ea3264b61 100644
--- a/src/test/ui/error-codes/E0080.rs
+++ b/tests/ui/error-codes/E0080.rs
diff --git a/src/test/ui/error-codes/E0080.stderr b/tests/ui/error-codes/E0080.stderr
index 60ed9a435..60ed9a435 100644
--- a/src/test/ui/error-codes/E0080.stderr
+++ b/tests/ui/error-codes/E0080.stderr
diff --git a/src/test/ui/error-codes/E0081.rs b/tests/ui/error-codes/E0081.rs
index f53fda864..f53fda864 100644
--- a/src/test/ui/error-codes/E0081.rs
+++ b/tests/ui/error-codes/E0081.rs
diff --git a/src/test/ui/error-codes/E0081.stderr b/tests/ui/error-codes/E0081.stderr
index d4b21f689..d4b21f689 100644
--- a/src/test/ui/error-codes/E0081.stderr
+++ b/tests/ui/error-codes/E0081.stderr
diff --git a/src/test/ui/error-codes/E0084.rs b/tests/ui/error-codes/E0084.rs
index a550e0412..a550e0412 100644
--- a/src/test/ui/error-codes/E0084.rs
+++ b/tests/ui/error-codes/E0084.rs
diff --git a/src/test/ui/error-codes/E0084.stderr b/tests/ui/error-codes/E0084.stderr
index e1bda22b8..e1bda22b8 100644
--- a/src/test/ui/error-codes/E0084.stderr
+++ b/tests/ui/error-codes/E0084.stderr
diff --git a/src/test/ui/error-codes/E0091.rs b/tests/ui/error-codes/E0091.rs
index 2427f5cfe..2427f5cfe 100644
--- a/src/test/ui/error-codes/E0091.rs
+++ b/tests/ui/error-codes/E0091.rs
diff --git a/src/test/ui/error-codes/E0091.stderr b/tests/ui/error-codes/E0091.stderr
index a596b75e4..a596b75e4 100644
--- a/src/test/ui/error-codes/E0091.stderr
+++ b/tests/ui/error-codes/E0091.stderr
diff --git a/src/test/ui/error-codes/E0092.rs b/tests/ui/error-codes/E0092.rs
index ddaace98b..ddaace98b 100644
--- a/src/test/ui/error-codes/E0092.rs
+++ b/tests/ui/error-codes/E0092.rs
diff --git a/src/test/ui/error-codes/E0092.stderr b/tests/ui/error-codes/E0092.stderr
index 2d590a8e1..2d590a8e1 100644
--- a/src/test/ui/error-codes/E0092.stderr
+++ b/tests/ui/error-codes/E0092.stderr
diff --git a/src/test/ui/error-codes/E0093.rs b/tests/ui/error-codes/E0093.rs
index a2f0b1ae4..a2f0b1ae4 100644
--- a/src/test/ui/error-codes/E0093.rs
+++ b/tests/ui/error-codes/E0093.rs
diff --git a/src/test/ui/error-codes/E0093.stderr b/tests/ui/error-codes/E0093.stderr
index cb0305593..cb0305593 100644
--- a/src/test/ui/error-codes/E0093.stderr
+++ b/tests/ui/error-codes/E0093.stderr
diff --git a/src/test/ui/error-codes/E0094.rs b/tests/ui/error-codes/E0094.rs
index a2ec932c1..a2ec932c1 100644
--- a/src/test/ui/error-codes/E0094.rs
+++ b/tests/ui/error-codes/E0094.rs
diff --git a/src/test/ui/error-codes/E0094.stderr b/tests/ui/error-codes/E0094.stderr
index 531cd4c78..531cd4c78 100644
--- a/src/test/ui/error-codes/E0094.stderr
+++ b/tests/ui/error-codes/E0094.stderr
diff --git a/src/test/ui/error-codes/E0106.rs b/tests/ui/error-codes/E0106.rs
index cc3438727..cc3438727 100644
--- a/src/test/ui/error-codes/E0106.rs
+++ b/tests/ui/error-codes/E0106.rs
diff --git a/src/test/ui/error-codes/E0106.stderr b/tests/ui/error-codes/E0106.stderr
index d11a24f77..d11a24f77 100644
--- a/src/test/ui/error-codes/E0106.stderr
+++ b/tests/ui/error-codes/E0106.stderr
diff --git a/src/test/ui/error-codes/E0107.rs b/tests/ui/error-codes/E0107.rs
index d369fc2a5..d369fc2a5 100644
--- a/src/test/ui/error-codes/E0107.rs
+++ b/tests/ui/error-codes/E0107.rs
diff --git a/src/test/ui/error-codes/E0107.stderr b/tests/ui/error-codes/E0107.stderr
index 03430f8fa..03430f8fa 100644
--- a/src/test/ui/error-codes/E0107.stderr
+++ b/tests/ui/error-codes/E0107.stderr
diff --git a/src/test/ui/error-codes/E0109.rs b/tests/ui/error-codes/E0109.rs
index 2e3825649..2e3825649 100644
--- a/src/test/ui/error-codes/E0109.rs
+++ b/tests/ui/error-codes/E0109.rs
diff --git a/src/test/ui/error-codes/E0109.stderr b/tests/ui/error-codes/E0109.stderr
index 8f4cb86de..8f4cb86de 100644
--- a/src/test/ui/error-codes/E0109.stderr
+++ b/tests/ui/error-codes/E0109.stderr
diff --git a/src/test/ui/error-codes/E0110.rs b/tests/ui/error-codes/E0110.rs
index 314c7f5af..314c7f5af 100644
--- a/src/test/ui/error-codes/E0110.rs
+++ b/tests/ui/error-codes/E0110.rs
diff --git a/src/test/ui/error-codes/E0110.stderr b/tests/ui/error-codes/E0110.stderr
index 4ce2a0a41..4ce2a0a41 100644
--- a/src/test/ui/error-codes/E0110.stderr
+++ b/tests/ui/error-codes/E0110.stderr
diff --git a/src/test/ui/error-codes/E0116.rs b/tests/ui/error-codes/E0116.rs
index 898beb10b..898beb10b 100644
--- a/src/test/ui/error-codes/E0116.rs
+++ b/tests/ui/error-codes/E0116.rs
diff --git a/src/test/ui/error-codes/E0116.stderr b/tests/ui/error-codes/E0116.stderr
index a5ceeb4a5..a5ceeb4a5 100644
--- a/src/test/ui/error-codes/E0116.stderr
+++ b/tests/ui/error-codes/E0116.stderr
diff --git a/src/test/ui/error-codes/E0117.rs b/tests/ui/error-codes/E0117.rs
index 406d24e36..406d24e36 100644
--- a/src/test/ui/error-codes/E0117.rs
+++ b/tests/ui/error-codes/E0117.rs
diff --git a/src/test/ui/error-codes/E0117.stderr b/tests/ui/error-codes/E0117.stderr
index f144aa9f7..f144aa9f7 100644
--- a/src/test/ui/error-codes/E0117.stderr
+++ b/tests/ui/error-codes/E0117.stderr
diff --git a/src/test/ui/error-codes/E0118.rs b/tests/ui/error-codes/E0118.rs
index a61ba7bbf..a61ba7bbf 100644
--- a/src/test/ui/error-codes/E0118.rs
+++ b/tests/ui/error-codes/E0118.rs
diff --git a/src/test/ui/error-codes/E0118.stderr b/tests/ui/error-codes/E0118.stderr
index 8c6fa7947..8c6fa7947 100644
--- a/src/test/ui/error-codes/E0118.stderr
+++ b/tests/ui/error-codes/E0118.stderr
diff --git a/src/test/ui/error-codes/E0119.rs b/tests/ui/error-codes/E0119.rs
index 7f89e5a1a..7f89e5a1a 100644
--- a/src/test/ui/error-codes/E0119.rs
+++ b/tests/ui/error-codes/E0119.rs
diff --git a/src/test/ui/error-codes/E0119.stderr b/tests/ui/error-codes/E0119.stderr
index e08a2c7fc..e08a2c7fc 100644
--- a/src/test/ui/error-codes/E0119.stderr
+++ b/tests/ui/error-codes/E0119.stderr
diff --git a/src/test/ui/error-codes/E0120.rs b/tests/ui/error-codes/E0120.rs
index a0a301a06..a0a301a06 100644
--- a/src/test/ui/error-codes/E0120.rs
+++ b/tests/ui/error-codes/E0120.rs
diff --git a/src/test/ui/error-codes/E0120.stderr b/tests/ui/error-codes/E0120.stderr
index 75778f1f9..75778f1f9 100644
--- a/src/test/ui/error-codes/E0120.stderr
+++ b/tests/ui/error-codes/E0120.stderr
diff --git a/src/test/ui/error-codes/E0121.rs b/tests/ui/error-codes/E0121.rs
index 98cd6d54c..98cd6d54c 100644
--- a/src/test/ui/error-codes/E0121.rs
+++ b/tests/ui/error-codes/E0121.rs
diff --git a/src/test/ui/error-codes/E0121.stderr b/tests/ui/error-codes/E0121.stderr
index 023d7e011..023d7e011 100644
--- a/src/test/ui/error-codes/E0121.stderr
+++ b/tests/ui/error-codes/E0121.stderr
diff --git a/src/test/ui/error-codes/E0124.rs b/tests/ui/error-codes/E0124.rs
index 9d6a716a6..9d6a716a6 100644
--- a/src/test/ui/error-codes/E0124.rs
+++ b/tests/ui/error-codes/E0124.rs
diff --git a/src/test/ui/error-codes/E0124.stderr b/tests/ui/error-codes/E0124.stderr
index 73819a89d..73819a89d 100644
--- a/src/test/ui/error-codes/E0124.stderr
+++ b/tests/ui/error-codes/E0124.stderr
diff --git a/src/test/ui/error-codes/E0128.rs b/tests/ui/error-codes/E0128.rs
index f42c32b91..f42c32b91 100644
--- a/src/test/ui/error-codes/E0128.rs
+++ b/tests/ui/error-codes/E0128.rs
diff --git a/src/test/ui/error-codes/E0128.stderr b/tests/ui/error-codes/E0128.stderr
index eb66d4693..eb66d4693 100644
--- a/src/test/ui/error-codes/E0128.stderr
+++ b/tests/ui/error-codes/E0128.stderr
diff --git a/src/test/ui/error-codes/E0130.rs b/tests/ui/error-codes/E0130.rs
index d52350789..d52350789 100644
--- a/src/test/ui/error-codes/E0130.rs
+++ b/tests/ui/error-codes/E0130.rs
diff --git a/src/test/ui/error-codes/E0130.stderr b/tests/ui/error-codes/E0130.stderr
index a45571f40..a45571f40 100644
--- a/src/test/ui/error-codes/E0130.stderr
+++ b/tests/ui/error-codes/E0130.stderr
diff --git a/src/test/ui/error-codes/E0131.rs b/tests/ui/error-codes/E0131.rs
index 3ed739949..3ed739949 100644
--- a/src/test/ui/error-codes/E0131.rs
+++ b/tests/ui/error-codes/E0131.rs
diff --git a/src/test/ui/error-codes/E0131.stderr b/tests/ui/error-codes/E0131.stderr
index 4467e19e9..4467e19e9 100644
--- a/src/test/ui/error-codes/E0131.stderr
+++ b/tests/ui/error-codes/E0131.stderr
diff --git a/src/test/ui/error-codes/E0132.rs b/tests/ui/error-codes/E0132.rs
index fb5e5d7b9..fb5e5d7b9 100644
--- a/src/test/ui/error-codes/E0132.rs
+++ b/tests/ui/error-codes/E0132.rs
diff --git a/src/test/ui/error-codes/E0132.stderr b/tests/ui/error-codes/E0132.stderr
index c21363756..c21363756 100644
--- a/src/test/ui/error-codes/E0132.stderr
+++ b/tests/ui/error-codes/E0132.stderr
diff --git a/src/test/ui/error-codes/E0133.mir.stderr b/tests/ui/error-codes/E0133.mir.stderr
index b11d5e2c2..b11d5e2c2 100644
--- a/src/test/ui/error-codes/E0133.mir.stderr
+++ b/tests/ui/error-codes/E0133.mir.stderr
diff --git a/src/test/ui/error-codes/E0133.rs b/tests/ui/error-codes/E0133.rs
index dee1475ba..dee1475ba 100644
--- a/src/test/ui/error-codes/E0133.rs
+++ b/tests/ui/error-codes/E0133.rs
diff --git a/src/test/ui/error-codes/E0133.thir.stderr b/tests/ui/error-codes/E0133.thir.stderr
index f1d7aba2a..f1d7aba2a 100644
--- a/src/test/ui/error-codes/E0133.thir.stderr
+++ b/tests/ui/error-codes/E0133.thir.stderr
diff --git a/src/test/ui/error-codes/E0138.rs b/tests/ui/error-codes/E0138.rs
index 6f3c36282..6f3c36282 100644
--- a/src/test/ui/error-codes/E0138.rs
+++ b/tests/ui/error-codes/E0138.rs
diff --git a/src/test/ui/error-codes/E0138.stderr b/tests/ui/error-codes/E0138.stderr
index fa8c39427..fa8c39427 100644
--- a/src/test/ui/error-codes/E0138.stderr
+++ b/tests/ui/error-codes/E0138.stderr
diff --git a/src/test/ui/error-codes/E0152.rs b/tests/ui/error-codes/E0152.rs
index ee8e5e6df..ee8e5e6df 100644
--- a/src/test/ui/error-codes/E0152.rs
+++ b/tests/ui/error-codes/E0152.rs
diff --git a/src/test/ui/error-codes/E0152.stderr b/tests/ui/error-codes/E0152.stderr
index 29f7e4ad6..29f7e4ad6 100644
--- a/src/test/ui/error-codes/E0152.stderr
+++ b/tests/ui/error-codes/E0152.stderr
diff --git a/src/test/ui/error-codes/E0161.base.stderr b/tests/ui/error-codes/E0161.base.stderr
index 15d98b657..15d98b657 100644
--- a/src/test/ui/error-codes/E0161.base.stderr
+++ b/tests/ui/error-codes/E0161.base.stderr
diff --git a/src/test/ui/error-codes/E0161.rs b/tests/ui/error-codes/E0161.rs
index c906e3c35..c906e3c35 100644
--- a/src/test/ui/error-codes/E0161.rs
+++ b/tests/ui/error-codes/E0161.rs
diff --git a/src/test/ui/error-codes/E0164.rs b/tests/ui/error-codes/E0164.rs
index 2d412f754..2d412f754 100644
--- a/src/test/ui/error-codes/E0164.rs
+++ b/tests/ui/error-codes/E0164.rs
diff --git a/src/test/ui/error-codes/E0164.stderr b/tests/ui/error-codes/E0164.stderr
index 5a80d6ec3..5a80d6ec3 100644
--- a/src/test/ui/error-codes/E0164.stderr
+++ b/tests/ui/error-codes/E0164.stderr
diff --git a/src/test/ui/error-codes/E0184.rs b/tests/ui/error-codes/E0184.rs
index 0c448e4ad..0c448e4ad 100644
--- a/src/test/ui/error-codes/E0184.rs
+++ b/tests/ui/error-codes/E0184.rs
diff --git a/src/test/ui/error-codes/E0184.stderr b/tests/ui/error-codes/E0184.stderr
index bb3017b6e..bb3017b6e 100644
--- a/src/test/ui/error-codes/E0184.stderr
+++ b/tests/ui/error-codes/E0184.stderr
diff --git a/src/test/ui/error-codes/E0185.rs b/tests/ui/error-codes/E0185.rs
index 45eb8b0f2..45eb8b0f2 100644
--- a/src/test/ui/error-codes/E0185.rs
+++ b/tests/ui/error-codes/E0185.rs
diff --git a/src/test/ui/error-codes/E0185.stderr b/tests/ui/error-codes/E0185.stderr
index 8a99c0688..8a99c0688 100644
--- a/src/test/ui/error-codes/E0185.stderr
+++ b/tests/ui/error-codes/E0185.stderr
diff --git a/src/test/ui/error-codes/E0186.rs b/tests/ui/error-codes/E0186.rs
index 83ef78ef2..83ef78ef2 100644
--- a/src/test/ui/error-codes/E0186.rs
+++ b/tests/ui/error-codes/E0186.rs
diff --git a/src/test/ui/error-codes/E0186.stderr b/tests/ui/error-codes/E0186.stderr
index 8971d61fc..8971d61fc 100644
--- a/src/test/ui/error-codes/E0186.stderr
+++ b/tests/ui/error-codes/E0186.stderr
diff --git a/src/test/ui/error-codes/E0191.rs b/tests/ui/error-codes/E0191.rs
index 22f739b9e..22f739b9e 100644
--- a/src/test/ui/error-codes/E0191.rs
+++ b/tests/ui/error-codes/E0191.rs
diff --git a/src/test/ui/error-codes/E0191.stderr b/tests/ui/error-codes/E0191.stderr
index cf80c9c46..cf80c9c46 100644
--- a/src/test/ui/error-codes/E0191.stderr
+++ b/tests/ui/error-codes/E0191.stderr
diff --git a/src/test/ui/error-codes/E0194.rs b/tests/ui/error-codes/E0194.rs
index 8a43f38fc..8a43f38fc 100644
--- a/src/test/ui/error-codes/E0194.rs
+++ b/tests/ui/error-codes/E0194.rs
diff --git a/src/test/ui/error-codes/E0194.stderr b/tests/ui/error-codes/E0194.stderr
index f2c908eea..f2c908eea 100644
--- a/src/test/ui/error-codes/E0194.stderr
+++ b/tests/ui/error-codes/E0194.stderr
diff --git a/src/test/ui/error-codes/E0195.rs b/tests/ui/error-codes/E0195.rs
index f712ee42b..f712ee42b 100644
--- a/src/test/ui/error-codes/E0195.rs
+++ b/tests/ui/error-codes/E0195.rs
diff --git a/src/test/ui/error-codes/E0195.stderr b/tests/ui/error-codes/E0195.stderr
index 6eaa1750e..6eaa1750e 100644
--- a/src/test/ui/error-codes/E0195.stderr
+++ b/tests/ui/error-codes/E0195.stderr
diff --git a/src/test/ui/error-codes/E0197.rs b/tests/ui/error-codes/E0197.rs
index 4025a1f6c..4025a1f6c 100644
--- a/src/test/ui/error-codes/E0197.rs
+++ b/tests/ui/error-codes/E0197.rs
diff --git a/src/test/ui/error-codes/E0197.stderr b/tests/ui/error-codes/E0197.stderr
index 35e104264..35e104264 100644
--- a/src/test/ui/error-codes/E0197.stderr
+++ b/tests/ui/error-codes/E0197.stderr
diff --git a/src/test/ui/error-codes/E0198.rs b/tests/ui/error-codes/E0198.rs
index 041bbe8fd..041bbe8fd 100644
--- a/src/test/ui/error-codes/E0198.rs
+++ b/tests/ui/error-codes/E0198.rs
diff --git a/src/test/ui/error-codes/E0198.stderr b/tests/ui/error-codes/E0198.stderr
index bb2efefb4..bb2efefb4 100644
--- a/src/test/ui/error-codes/E0198.stderr
+++ b/tests/ui/error-codes/E0198.stderr
diff --git a/src/test/ui/error-codes/E0199.rs b/tests/ui/error-codes/E0199.rs
index 2421bf0a5..2421bf0a5 100644
--- a/src/test/ui/error-codes/E0199.rs
+++ b/tests/ui/error-codes/E0199.rs
diff --git a/src/test/ui/error-codes/E0199.stderr b/tests/ui/error-codes/E0199.stderr
index 99d808c0d..68c308b15 100644
--- a/src/test/ui/error-codes/E0199.stderr
+++ b/tests/ui/error-codes/E0199.stderr
@@ -2,7 +2,7 @@ error[E0199]: implementing the trait `Bar` is not unsafe
   --> $DIR/E0199.rs:6:1
    |
 LL | unsafe impl Bar for Foo { }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: remove `unsafe` from this trait implementation
    |
diff --git a/src/test/ui/error-codes/E0200.rs b/tests/ui/error-codes/E0200.rs
index 24806a6cb..24806a6cb 100644
--- a/src/test/ui/error-codes/E0200.rs
+++ b/tests/ui/error-codes/E0200.rs
diff --git a/src/test/ui/error-codes/E0200.stderr b/tests/ui/error-codes/E0200.stderr
index 1fd86aece..c70a2d4f3 100644
--- a/src/test/ui/error-codes/E0200.stderr
+++ b/tests/ui/error-codes/E0200.stderr
@@ -2,7 +2,7 @@ error[E0200]: the trait `Bar` requires an `unsafe impl` declaration
   --> $DIR/E0200.rs:5:1
    |
 LL | impl Bar for Foo { }
-   | ^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^
    |
    = note: the trait `Bar` enforces invariants that the compiler can't check. Review the trait documentation and make sure this implementation upholds those invariants before adding the `unsafe` keyword
 help: add `unsafe` to this trait implementation
diff --git a/src/test/ui/error-codes/E0201.rs b/tests/ui/error-codes/E0201.rs
index 04b37091b..04b37091b 100644
--- a/src/test/ui/error-codes/E0201.rs
+++ b/tests/ui/error-codes/E0201.rs
diff --git a/src/test/ui/error-codes/E0201.stderr b/tests/ui/error-codes/E0201.stderr
index 608ff6917..608ff6917 100644
--- a/src/test/ui/error-codes/E0201.stderr
+++ b/tests/ui/error-codes/E0201.stderr
diff --git a/src/test/ui/error-codes/E0206.rs b/tests/ui/error-codes/E0206.rs
index 0f3d427ce..0f3d427ce 100644
--- a/src/test/ui/error-codes/E0206.rs
+++ b/tests/ui/error-codes/E0206.rs
diff --git a/src/test/ui/error-codes/E0206.stderr b/tests/ui/error-codes/E0206.stderr
index 57ae2647d..57ae2647d 100644
--- a/src/test/ui/error-codes/E0206.stderr
+++ b/tests/ui/error-codes/E0206.stderr
diff --git a/src/test/ui/error-codes/E0207.rs b/tests/ui/error-codes/E0207.rs
index 7f5d4ab51..7f5d4ab51 100644
--- a/src/test/ui/error-codes/E0207.rs
+++ b/tests/ui/error-codes/E0207.rs
diff --git a/src/test/ui/error-codes/E0207.stderr b/tests/ui/error-codes/E0207.stderr
index 5ef51ed86..5ef51ed86 100644
--- a/src/test/ui/error-codes/E0207.stderr
+++ b/tests/ui/error-codes/E0207.stderr
diff --git a/tests/ui/error-codes/E0208.rs b/tests/ui/error-codes/E0208.rs
new file mode 100644
index 000000000..c67d42889
--- /dev/null
+++ b/tests/ui/error-codes/E0208.rs
@@ -0,0 +1,8 @@
+#![feature(rustc_attrs)]
+
+#[rustc_variance]
+struct Foo<'a, T> { //~ ERROR [-, o]
+    t: &'a mut T,
+}
+
+fn main() {}
diff --git a/tests/ui/error-codes/E0208.stderr b/tests/ui/error-codes/E0208.stderr
new file mode 100644
index 000000000..dbbb41e79
--- /dev/null
+++ b/tests/ui/error-codes/E0208.stderr
@@ -0,0 +1,8 @@
+error: [-, o]
+  --> $DIR/E0208.rs:4:1
+   |
+LL | struct Foo<'a, T> {
+   | ^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/error-codes/E0214.rs b/tests/ui/error-codes/E0214.rs
index fd73189f9..fd73189f9 100644
--- a/src/test/ui/error-codes/E0214.rs
+++ b/tests/ui/error-codes/E0214.rs
diff --git a/src/test/ui/error-codes/E0214.stderr b/tests/ui/error-codes/E0214.stderr
index e0179aac2..e0179aac2 100644
--- a/src/test/ui/error-codes/E0214.stderr
+++ b/tests/ui/error-codes/E0214.stderr
diff --git a/src/test/ui/error-codes/E0220.rs b/tests/ui/error-codes/E0220.rs
index e11a570df..e11a570df 100644
--- a/src/test/ui/error-codes/E0220.rs
+++ b/tests/ui/error-codes/E0220.rs
diff --git a/src/test/ui/error-codes/E0220.stderr b/tests/ui/error-codes/E0220.stderr
index 11763ce78..11763ce78 100644
--- a/src/test/ui/error-codes/E0220.stderr
+++ b/tests/ui/error-codes/E0220.stderr
diff --git a/src/test/ui/error-codes/E0221.rs b/tests/ui/error-codes/E0221.rs
index 7c7e139a0..7c7e139a0 100644
--- a/src/test/ui/error-codes/E0221.rs
+++ b/tests/ui/error-codes/E0221.rs
diff --git a/src/test/ui/error-codes/E0221.stderr b/tests/ui/error-codes/E0221.stderr
index 5414d77ad..5414d77ad 100644
--- a/src/test/ui/error-codes/E0221.stderr
+++ b/tests/ui/error-codes/E0221.stderr
diff --git a/tests/ui/error-codes/E0223.rs b/tests/ui/error-codes/E0223.rs
new file mode 100644
index 000000000..2fe252de2
--- /dev/null
+++ b/tests/ui/error-codes/E0223.rs
@@ -0,0 +1,10 @@
+trait MyTrait { type X; }
+struct MyStruct;
+impl MyTrait for MyStruct {
+    type X = ();
+}
+
+fn main() {
+    let foo: MyTrait::X;
+    //~^ ERROR ambiguous associated type
+}
diff --git a/tests/ui/error-codes/E0223.stderr b/tests/ui/error-codes/E0223.stderr
new file mode 100644
index 000000000..42945e42f
--- /dev/null
+++ b/tests/ui/error-codes/E0223.stderr
@@ -0,0 +1,9 @@
+error[E0223]: ambiguous associated type
+  --> $DIR/E0223.rs:8:14
+   |
+LL |     let foo: MyTrait::X;
+   |              ^^^^^^^^^^ help: use the fully-qualified path: `<MyStruct as MyTrait>::X`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/error-codes/E0225.rs b/tests/ui/error-codes/E0225.rs
index b50f68e64..b50f68e64 100644
--- a/src/test/ui/error-codes/E0225.rs
+++ b/tests/ui/error-codes/E0225.rs
diff --git a/src/test/ui/error-codes/E0225.stderr b/tests/ui/error-codes/E0225.stderr
index a4b33a0b7..a4b33a0b7 100644
--- a/src/test/ui/error-codes/E0225.stderr
+++ b/tests/ui/error-codes/E0225.stderr
diff --git a/src/test/ui/error-codes/E0227.rs b/tests/ui/error-codes/E0227.rs
index 0f0a781d2..0f0a781d2 100644
--- a/src/test/ui/error-codes/E0227.rs
+++ b/tests/ui/error-codes/E0227.rs
diff --git a/src/test/ui/error-codes/E0227.stderr b/tests/ui/error-codes/E0227.stderr
index 26de5b4c4..26de5b4c4 100644
--- a/src/test/ui/error-codes/E0227.stderr
+++ b/tests/ui/error-codes/E0227.stderr
diff --git a/src/test/ui/error-codes/E0229.rs b/tests/ui/error-codes/E0229.rs
index 4c1934107..4c1934107 100644
--- a/src/test/ui/error-codes/E0229.rs
+++ b/tests/ui/error-codes/E0229.rs
diff --git a/src/test/ui/error-codes/E0229.stderr b/tests/ui/error-codes/E0229.stderr
index 46793314b..46793314b 100644
--- a/src/test/ui/error-codes/E0229.stderr
+++ b/tests/ui/error-codes/E0229.stderr
diff --git a/src/test/ui/error-codes/E0252.rs b/tests/ui/error-codes/E0252.rs
index 6b5163417..6b5163417 100644
--- a/src/test/ui/error-codes/E0252.rs
+++ b/tests/ui/error-codes/E0252.rs
diff --git a/src/test/ui/error-codes/E0252.stderr b/tests/ui/error-codes/E0252.stderr
index 2722dfe5e..2722dfe5e 100644
--- a/src/test/ui/error-codes/E0252.stderr
+++ b/tests/ui/error-codes/E0252.stderr
diff --git a/src/test/ui/error-codes/E0253.rs b/tests/ui/error-codes/E0253.rs
index 284b16da8..284b16da8 100644
--- a/src/test/ui/error-codes/E0253.rs
+++ b/tests/ui/error-codes/E0253.rs
diff --git a/src/test/ui/error-codes/E0253.stderr b/tests/ui/error-codes/E0253.stderr
index 8f21a0aab..8f21a0aab 100644
--- a/src/test/ui/error-codes/E0253.stderr
+++ b/tests/ui/error-codes/E0253.stderr
diff --git a/src/test/ui/error-codes/E0254.rs b/tests/ui/error-codes/E0254.rs
index e291268be..e291268be 100644
--- a/src/test/ui/error-codes/E0254.rs
+++ b/tests/ui/error-codes/E0254.rs
diff --git a/src/test/ui/error-codes/E0254.stderr b/tests/ui/error-codes/E0254.stderr
index b098f8e1a..b098f8e1a 100644
--- a/src/test/ui/error-codes/E0254.stderr
+++ b/tests/ui/error-codes/E0254.stderr
diff --git a/src/test/ui/error-codes/E0255.rs b/tests/ui/error-codes/E0255.rs
index d1c21eb79..d1c21eb79 100644
--- a/src/test/ui/error-codes/E0255.rs
+++ b/tests/ui/error-codes/E0255.rs
diff --git a/src/test/ui/error-codes/E0255.stderr b/tests/ui/error-codes/E0255.stderr
index 352c5ba5b..352c5ba5b 100644
--- a/src/test/ui/error-codes/E0255.stderr
+++ b/tests/ui/error-codes/E0255.stderr
diff --git a/src/test/ui/error-codes/E0259.rs b/tests/ui/error-codes/E0259.rs
index e7e94d586..e7e94d586 100644
--- a/src/test/ui/error-codes/E0259.rs
+++ b/tests/ui/error-codes/E0259.rs
diff --git a/src/test/ui/error-codes/E0259.stderr b/tests/ui/error-codes/E0259.stderr
index 06cbc5b4f..06cbc5b4f 100644
--- a/src/test/ui/error-codes/E0259.stderr
+++ b/tests/ui/error-codes/E0259.stderr
diff --git a/src/test/ui/error-codes/E0260.rs b/tests/ui/error-codes/E0260.rs
index f7eb220b0..f7eb220b0 100644
--- a/src/test/ui/error-codes/E0260.rs
+++ b/tests/ui/error-codes/E0260.rs
diff --git a/src/test/ui/error-codes/E0260.stderr b/tests/ui/error-codes/E0260.stderr
index 2d3305bd1..2d3305bd1 100644
--- a/src/test/ui/error-codes/E0260.stderr
+++ b/tests/ui/error-codes/E0260.stderr
diff --git a/src/test/ui/error-codes/E0261.rs b/tests/ui/error-codes/E0261.rs
index f05e09aa0..f05e09aa0 100644
--- a/src/test/ui/error-codes/E0261.rs
+++ b/tests/ui/error-codes/E0261.rs
diff --git a/src/test/ui/error-codes/E0261.stderr b/tests/ui/error-codes/E0261.stderr
index 0eab2dc0e..0eab2dc0e 100644
--- a/src/test/ui/error-codes/E0261.stderr
+++ b/tests/ui/error-codes/E0261.stderr
diff --git a/src/test/ui/error-codes/E0262.rs b/tests/ui/error-codes/E0262.rs
index 55264f138..55264f138 100644
--- a/src/test/ui/error-codes/E0262.rs
+++ b/tests/ui/error-codes/E0262.rs
diff --git a/src/test/ui/error-codes/E0262.stderr b/tests/ui/error-codes/E0262.stderr
index ad90b7171..ad90b7171 100644
--- a/src/test/ui/error-codes/E0262.stderr
+++ b/tests/ui/error-codes/E0262.stderr
diff --git a/src/test/ui/error-codes/E0263.rs b/tests/ui/error-codes/E0263.rs
index 92917678e..92917678e 100644
--- a/src/test/ui/error-codes/E0263.rs
+++ b/tests/ui/error-codes/E0263.rs
diff --git a/src/test/ui/error-codes/E0263.stderr b/tests/ui/error-codes/E0263.stderr
index e3f9aea29..e3f9aea29 100644
--- a/src/test/ui/error-codes/E0263.stderr
+++ b/tests/ui/error-codes/E0263.stderr
diff --git a/src/test/ui/error-codes/E0264.rs b/tests/ui/error-codes/E0264.rs
index 6adaf01fb..6adaf01fb 100644
--- a/src/test/ui/error-codes/E0264.rs
+++ b/tests/ui/error-codes/E0264.rs
diff --git a/src/test/ui/error-codes/E0264.stderr b/tests/ui/error-codes/E0264.stderr
index e8e35a12c..e8e35a12c 100644
--- a/src/test/ui/error-codes/E0264.stderr
+++ b/tests/ui/error-codes/E0264.stderr
diff --git a/src/test/ui/error-codes/E0267.rs b/tests/ui/error-codes/E0267.rs
index 45e875a0a..45e875a0a 100644
--- a/src/test/ui/error-codes/E0267.rs
+++ b/tests/ui/error-codes/E0267.rs
diff --git a/src/test/ui/error-codes/E0267.stderr b/tests/ui/error-codes/E0267.stderr
index 1f8657373..1f8657373 100644
--- a/src/test/ui/error-codes/E0267.stderr
+++ b/tests/ui/error-codes/E0267.stderr
diff --git a/src/test/ui/error-codes/E0268.rs b/tests/ui/error-codes/E0268.rs
index 742ba5441..742ba5441 100644
--- a/src/test/ui/error-codes/E0268.rs
+++ b/tests/ui/error-codes/E0268.rs
diff --git a/src/test/ui/error-codes/E0268.stderr b/tests/ui/error-codes/E0268.stderr
index 6422e8a94..6422e8a94 100644
--- a/src/test/ui/error-codes/E0268.stderr
+++ b/tests/ui/error-codes/E0268.stderr
diff --git a/src/test/ui/error-codes/E0271.rs b/tests/ui/error-codes/E0271.rs
index f27190754..f27190754 100644
--- a/src/test/ui/error-codes/E0271.rs
+++ b/tests/ui/error-codes/E0271.rs
diff --git a/src/test/ui/error-codes/E0271.stderr b/tests/ui/error-codes/E0271.stderr
index 1e2f43834..1e2f43834 100644
--- a/src/test/ui/error-codes/E0271.stderr
+++ b/tests/ui/error-codes/E0271.stderr
diff --git a/src/test/ui/error-codes/E0275.rs b/tests/ui/error-codes/E0275.rs
index 95d7f85f1..95d7f85f1 100644
--- a/src/test/ui/error-codes/E0275.rs
+++ b/tests/ui/error-codes/E0275.rs
diff --git a/src/test/ui/error-codes/E0275.stderr b/tests/ui/error-codes/E0275.stderr
index 451a683ac..cf9a7f69b 100644
--- a/src/test/ui/error-codes/E0275.stderr
+++ b/tests/ui/error-codes/E0275.stderr
@@ -9,7 +9,7 @@ note: required for `Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<
   --> $DIR/E0275.rs:6:9
    |
 LL | impl<T> Foo for T where Bar<T>: Foo {}
-   |         ^^^     ^
+   |         ^^^     ^               --- unsatisfied trait bound introduced here
    = note: the full type name has been written to '$TEST_BUILD_DIR/error-codes/E0275/E0275.long-type-hash.txt'
    = note: 127 redundant requirements hidden
    = note: required for `Bar<T>` to implement `Foo`
diff --git a/src/test/ui/error-codes/E0276.rs b/tests/ui/error-codes/E0276.rs
index 5e3d9f602..5e3d9f602 100644
--- a/src/test/ui/error-codes/E0276.rs
+++ b/tests/ui/error-codes/E0276.rs
diff --git a/src/test/ui/error-codes/E0276.stderr b/tests/ui/error-codes/E0276.stderr
index 1013f041b..1013f041b 100644
--- a/src/test/ui/error-codes/E0276.stderr
+++ b/tests/ui/error-codes/E0276.stderr
diff --git a/src/test/ui/error-codes/E0277-2.rs b/tests/ui/error-codes/E0277-2.rs
index 428518705..428518705 100644
--- a/src/test/ui/error-codes/E0277-2.rs
+++ b/tests/ui/error-codes/E0277-2.rs
diff --git a/src/test/ui/error-codes/E0277-2.stderr b/tests/ui/error-codes/E0277-2.stderr
index a2abf3793..a2abf3793 100644
--- a/src/test/ui/error-codes/E0277-2.stderr
+++ b/tests/ui/error-codes/E0277-2.stderr
diff --git a/src/test/ui/error-codes/E0277-3.rs b/tests/ui/error-codes/E0277-3.rs
index 428be7961..428be7961 100644
--- a/src/test/ui/error-codes/E0277-3.rs
+++ b/tests/ui/error-codes/E0277-3.rs
diff --git a/src/test/ui/error-codes/E0277-3.stderr b/tests/ui/error-codes/E0277-3.stderr
index 0127e1ccc..0127e1ccc 100644
--- a/src/test/ui/error-codes/E0277-3.stderr
+++ b/tests/ui/error-codes/E0277-3.stderr
diff --git a/src/test/ui/error-codes/E0277.rs b/tests/ui/error-codes/E0277.rs
index f0de4e3de..f0de4e3de 100644
--- a/src/test/ui/error-codes/E0277.rs
+++ b/tests/ui/error-codes/E0277.rs
diff --git a/src/test/ui/error-codes/E0277.stderr b/tests/ui/error-codes/E0277.stderr
index 2b4784d7e..2b4784d7e 100644
--- a/src/test/ui/error-codes/E0277.stderr
+++ b/tests/ui/error-codes/E0277.stderr
diff --git a/src/test/ui/error-codes/E0282.rs b/tests/ui/error-codes/E0282.rs
index f1f93b3ae..f1f93b3ae 100644
--- a/src/test/ui/error-codes/E0282.rs
+++ b/tests/ui/error-codes/E0282.rs
diff --git a/src/test/ui/error-codes/E0282.stderr b/tests/ui/error-codes/E0282.stderr
index d01aa3617..892d3a81f 100644
--- a/src/test/ui/error-codes/E0282.stderr
+++ b/tests/ui/error-codes/E0282.stderr
@@ -6,8 +6,8 @@ LL |     let x = "hello".chars().rev().collect();
    |
 help: consider giving `x` an explicit type
    |
-LL |     let x: _ = "hello".chars().rev().collect();
-   |          +++
+LL |     let x: Vec<_> = "hello".chars().rev().collect();
+   |          ++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0283.rs b/tests/ui/error-codes/E0283.rs
index 0643af4b7..0643af4b7 100644
--- a/src/test/ui/error-codes/E0283.rs
+++ b/tests/ui/error-codes/E0283.rs
diff --git a/src/test/ui/error-codes/E0283.stderr b/tests/ui/error-codes/E0283.stderr
index 90316c6e9..90316c6e9 100644
--- a/src/test/ui/error-codes/E0283.stderr
+++ b/tests/ui/error-codes/E0283.stderr
diff --git a/src/test/ui/error-codes/E0297.rs b/tests/ui/error-codes/E0297.rs
index 27c7960d9..27c7960d9 100644
--- a/src/test/ui/error-codes/E0297.rs
+++ b/tests/ui/error-codes/E0297.rs
diff --git a/tests/ui/error-codes/E0297.stderr b/tests/ui/error-codes/E0297.stderr
new file mode 100644
index 000000000..293028f5f
--- /dev/null
+++ b/tests/ui/error-codes/E0297.stderr
@@ -0,0 +1,11 @@
+error[E0005]: refutable pattern in `for` loop binding
+  --> $DIR/E0297.rs:4:9
+   |
+LL |     for Some(x) in xs {}
+   |         ^^^^^^^ pattern `None` not covered
+   |
+   = note: the matched value is of type `Option<i32>`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/error-codes/E0308-2.rs b/tests/ui/error-codes/E0308-2.rs
index 157f992da..157f992da 100644
--- a/src/test/ui/error-codes/E0308-2.rs
+++ b/tests/ui/error-codes/E0308-2.rs
diff --git a/src/test/ui/error-codes/E0308-2.stderr b/tests/ui/error-codes/E0308-2.stderr
index de54a4172..3a8a81a73 100644
--- a/src/test/ui/error-codes/E0308-2.stderr
+++ b/tests/ui/error-codes/E0308-2.stderr
@@ -1,8 +1,8 @@
 error[E0308]: mismatched types
-  --> $DIR/E0308-2.rs:9:6
+  --> $DIR/E0308-2.rs:9:13
    |
 LL | impl Eq for &dyn DynEq {}
-   |      ^^ lifetime mismatch
+   |             ^^^^^^^^^^ lifetime mismatch
    |
    = note: expected trait `<&dyn DynEq as PartialEq>`
               found trait `<&(dyn DynEq + 'static) as PartialEq>`
diff --git a/src/test/ui/error-codes/E0308-4.rs b/tests/ui/error-codes/E0308-4.rs
index aaf7ef5bd..aaf7ef5bd 100644
--- a/src/test/ui/error-codes/E0308-4.rs
+++ b/tests/ui/error-codes/E0308-4.rs
diff --git a/src/test/ui/error-codes/E0308-4.stderr b/tests/ui/error-codes/E0308-4.stderr
index 39c067637..39c067637 100644
--- a/src/test/ui/error-codes/E0308-4.stderr
+++ b/tests/ui/error-codes/E0308-4.stderr
diff --git a/src/test/ui/error-codes/E0308.rs b/tests/ui/error-codes/E0308.rs
index dd9e0b284..dd9e0b284 100644
--- a/src/test/ui/error-codes/E0308.rs
+++ b/tests/ui/error-codes/E0308.rs
diff --git a/src/test/ui/error-codes/E0308.stderr b/tests/ui/error-codes/E0308.stderr
index 187b775f9..187b775f9 100644
--- a/src/test/ui/error-codes/E0308.stderr
+++ b/tests/ui/error-codes/E0308.stderr
diff --git a/tests/ui/error-codes/E0311.fixed b/tests/ui/error-codes/E0311.fixed
new file mode 100644
index 000000000..4410a4d70
--- /dev/null
+++ b/tests/ui/error-codes/E0311.fixed
@@ -0,0 +1,13 @@
+// run-rustfix
+
+#![allow(warnings)]
+
+fn no_restriction<'a, T: 'a>(x: &'a ()) -> &() {
+    with_restriction::<T>(x) //~ ERROR E0311
+}
+
+fn with_restriction<'a, T: 'a>(x: &'a ()) -> &'a () {
+    x
+}
+
+fn main() {}
diff --git a/src/test/ui/error-codes/E0311.rs b/tests/ui/error-codes/E0311.rs
index 566b518b4..99e454f4d 100644
--- a/src/test/ui/error-codes/E0311.rs
+++ b/tests/ui/error-codes/E0311.rs
@@ -1,3 +1,7 @@
+// run-rustfix
+
+#![allow(warnings)]
+
 fn no_restriction<T>(x: &()) -> &() {
     with_restriction::<T>(x) //~ ERROR E0311
 }
diff --git a/src/test/ui/error-codes/E0311.stderr b/tests/ui/error-codes/E0311.stderr
index 9873b5ae6..b0e6dd1e2 100644
--- a/src/test/ui/error-codes/E0311.stderr
+++ b/tests/ui/error-codes/E0311.stderr
@@ -1,23 +1,23 @@
 error[E0311]: the parameter type `T` may not live long enough
-  --> $DIR/E0311.rs:2:5
+  --> $DIR/E0311.rs:6:5
    |
 LL |     with_restriction::<T>(x)
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
 note: the parameter type `T` must be valid for the anonymous lifetime defined here...
-  --> $DIR/E0311.rs:1:25
+  --> $DIR/E0311.rs:5:25
    |
 LL | fn no_restriction<T>(x: &()) -> &() {
    |                         ^^^
 note: ...so that the type `T` will meet its required lifetime bounds
-  --> $DIR/E0311.rs:2:5
+  --> $DIR/E0311.rs:6:5
    |
 LL |     with_restriction::<T>(x)
    |     ^^^^^^^^^^^^^^^^^^^^^
 help: consider adding an explicit lifetime bound...
    |
-LL | fn no_restriction<'a, T: 'a>(x: &()) -> &() {
-   |                   +++  ++++
+LL | fn no_restriction<'a, T: 'a>(x: &'a ()) -> &() {
+   |                   +++  ++++      ++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0328.rs b/tests/ui/error-codes/E0328.rs
index ef55f44dd..ef55f44dd 100644
--- a/src/test/ui/error-codes/E0328.rs
+++ b/tests/ui/error-codes/E0328.rs
diff --git a/src/test/ui/error-codes/E0328.stderr b/tests/ui/error-codes/E0328.stderr
index 70e6baf69..70e6baf69 100644
--- a/src/test/ui/error-codes/E0328.stderr
+++ b/tests/ui/error-codes/E0328.stderr
diff --git a/src/test/ui/error-codes/E0365.rs b/tests/ui/error-codes/E0365.rs
index 464109247..464109247 100644
--- a/src/test/ui/error-codes/E0365.rs
+++ b/tests/ui/error-codes/E0365.rs
diff --git a/src/test/ui/error-codes/E0365.stderr b/tests/ui/error-codes/E0365.stderr
index 5bfcf1394..5bfcf1394 100644
--- a/src/test/ui/error-codes/E0365.stderr
+++ b/tests/ui/error-codes/E0365.stderr
diff --git a/src/test/ui/error-codes/E0370.rs b/tests/ui/error-codes/E0370.rs
index 32a66b63b..32a66b63b 100644
--- a/src/test/ui/error-codes/E0370.rs
+++ b/tests/ui/error-codes/E0370.rs
diff --git a/src/test/ui/error-codes/E0370.stderr b/tests/ui/error-codes/E0370.stderr
index 7fb622ee8..7fb622ee8 100644
--- a/src/test/ui/error-codes/E0370.stderr
+++ b/tests/ui/error-codes/E0370.stderr
diff --git a/src/test/ui/error-codes/E0374.rs b/tests/ui/error-codes/E0374.rs
index 41fcedc32..41fcedc32 100644
--- a/src/test/ui/error-codes/E0374.rs
+++ b/tests/ui/error-codes/E0374.rs
diff --git a/src/test/ui/error-codes/E0374.stderr b/tests/ui/error-codes/E0374.stderr
index 68e15e6f8..68e15e6f8 100644
--- a/src/test/ui/error-codes/E0374.stderr
+++ b/tests/ui/error-codes/E0374.stderr
diff --git a/src/test/ui/error-codes/E0375.rs b/tests/ui/error-codes/E0375.rs
index 0c03a8761..0c03a8761 100644
--- a/src/test/ui/error-codes/E0375.rs
+++ b/tests/ui/error-codes/E0375.rs
diff --git a/src/test/ui/error-codes/E0375.stderr b/tests/ui/error-codes/E0375.stderr
index a68b3af5a..a68b3af5a 100644
--- a/src/test/ui/error-codes/E0375.stderr
+++ b/tests/ui/error-codes/E0375.stderr
diff --git a/src/test/ui/error-codes/E0376.rs b/tests/ui/error-codes/E0376.rs
index f092eb02c..f092eb02c 100644
--- a/src/test/ui/error-codes/E0376.rs
+++ b/tests/ui/error-codes/E0376.rs
diff --git a/src/test/ui/error-codes/E0376.stderr b/tests/ui/error-codes/E0376.stderr
index e91efb045..e91efb045 100644
--- a/src/test/ui/error-codes/E0376.stderr
+++ b/tests/ui/error-codes/E0376.stderr
diff --git a/tests/ui/error-codes/E0377.rs b/tests/ui/error-codes/E0377.rs
new file mode 100644
index 000000000..6da2c2095
--- /dev/null
+++ b/tests/ui/error-codes/E0377.rs
@@ -0,0 +1,14 @@
+#![feature(coerce_unsized)]
+use std::ops::CoerceUnsized;
+
+pub struct Foo<T: ?Sized> {
+    field_with_unsized_type: T,
+}
+
+pub struct Bar<T: ?Sized> {
+    field_with_unsized_type: T,
+}
+
+impl<T, U> CoerceUnsized<Bar<U>> for Foo<T> where T: CoerceUnsized<U> {} //~ ERROR E0377
+
+fn main() {}
diff --git a/tests/ui/error-codes/E0377.stderr b/tests/ui/error-codes/E0377.stderr
new file mode 100644
index 000000000..bf7d8c8d3
--- /dev/null
+++ b/tests/ui/error-codes/E0377.stderr
@@ -0,0 +1,9 @@
+error[E0377]: the trait `CoerceUnsized` may only be implemented for a coercion between structures with the same definition; expected `Foo`, found `Bar`
+  --> $DIR/E0377.rs:12:1
+   |
+LL | impl<T, U> CoerceUnsized<Bar<U>> for Foo<T> where T: CoerceUnsized<U> {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0377`.
diff --git a/src/test/ui/error-codes/E0388.rs b/tests/ui/error-codes/E0388.rs
index 6049d95f0..6049d95f0 100644
--- a/src/test/ui/error-codes/E0388.rs
+++ b/tests/ui/error-codes/E0388.rs
diff --git a/src/test/ui/error-codes/E0388.stderr b/tests/ui/error-codes/E0388.stderr
index b51aa263d..b51aa263d 100644
--- a/src/test/ui/error-codes/E0388.stderr
+++ b/tests/ui/error-codes/E0388.stderr
diff --git a/src/test/ui/error-codes/E0389.rs b/tests/ui/error-codes/E0389.rs
index 41172b362..41172b362 100644
--- a/src/test/ui/error-codes/E0389.rs
+++ b/tests/ui/error-codes/E0389.rs
diff --git a/tests/ui/error-codes/E0389.stderr b/tests/ui/error-codes/E0389.stderr
new file mode 100644
index 000000000..51c4c92ad
--- /dev/null
+++ b/tests/ui/error-codes/E0389.stderr
@@ -0,0 +1,14 @@
+error[E0594]: cannot assign to `fancy_ref.num`, which is behind a `&` reference
+  --> $DIR/E0389.rs:8:5
+   |
+LL |     fancy_ref.num = 6;
+   |     ^^^^^^^^^^^^^^^^^ `fancy_ref` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let fancy_ref = &mut (&mut fancy);
+   |                     ~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/error-codes/E0390.rs b/tests/ui/error-codes/E0390.rs
index 507483dec..507483dec 100644
--- a/src/test/ui/error-codes/E0390.rs
+++ b/tests/ui/error-codes/E0390.rs
diff --git a/src/test/ui/error-codes/E0390.stderr b/tests/ui/error-codes/E0390.stderr
index 0e5a9ca76..0e5a9ca76 100644
--- a/src/test/ui/error-codes/E0390.stderr
+++ b/tests/ui/error-codes/E0390.stderr
diff --git a/src/test/ui/error-codes/E0392.rs b/tests/ui/error-codes/E0392.rs
index c98d900b6..c98d900b6 100644
--- a/src/test/ui/error-codes/E0392.rs
+++ b/tests/ui/error-codes/E0392.rs
diff --git a/src/test/ui/error-codes/E0392.stderr b/tests/ui/error-codes/E0392.stderr
index 622402999..622402999 100644
--- a/src/test/ui/error-codes/E0392.stderr
+++ b/tests/ui/error-codes/E0392.stderr
diff --git a/src/test/ui/error-codes/E0393.rs b/tests/ui/error-codes/E0393.rs
index 0c1a36980..0c1a36980 100644
--- a/src/test/ui/error-codes/E0393.rs
+++ b/tests/ui/error-codes/E0393.rs
diff --git a/src/test/ui/error-codes/E0393.stderr b/tests/ui/error-codes/E0393.stderr
index d9f70b729..d9f70b729 100644
--- a/src/test/ui/error-codes/E0393.stderr
+++ b/tests/ui/error-codes/E0393.stderr
diff --git a/src/test/ui/error-codes/E0396-fixed.rs b/tests/ui/error-codes/E0396-fixed.rs
index fe20da1a8..fe20da1a8 100644
--- a/src/test/ui/error-codes/E0396-fixed.rs
+++ b/tests/ui/error-codes/E0396-fixed.rs
diff --git a/src/test/ui/error-codes/E0396-fixed.stderr b/tests/ui/error-codes/E0396-fixed.stderr
index 2efbd6989..2efbd6989 100644
--- a/src/test/ui/error-codes/E0396-fixed.stderr
+++ b/tests/ui/error-codes/E0396-fixed.stderr
diff --git a/src/test/ui/error-codes/E0396.rs b/tests/ui/error-codes/E0396.rs
index 4415b70e7..4415b70e7 100644
--- a/src/test/ui/error-codes/E0396.rs
+++ b/tests/ui/error-codes/E0396.rs
diff --git a/src/test/ui/error-codes/E0396.stderr b/tests/ui/error-codes/E0396.stderr
index 8c87f4067..8c87f4067 100644
--- a/src/test/ui/error-codes/E0396.stderr
+++ b/tests/ui/error-codes/E0396.stderr
diff --git a/src/test/ui/error-codes/E0401.rs b/tests/ui/error-codes/E0401.rs
index 8f8d6b87e..8f8d6b87e 100644
--- a/src/test/ui/error-codes/E0401.rs
+++ b/tests/ui/error-codes/E0401.rs
diff --git a/src/test/ui/error-codes/E0401.stderr b/tests/ui/error-codes/E0401.stderr
index 9687eca61..fa4b91cac 100644
--- a/src/test/ui/error-codes/E0401.stderr
+++ b/tests/ui/error-codes/E0401.stderr
@@ -59,7 +59,7 @@ note: required by a bound in `bfnr`
    |
 LL |     fn bfnr<U, V: Baz<U>, W: Fn()>(y: T) {
    |                              ^^^^ required by this bound in `bfnr`
-help: consider specifying the type arguments in the function call
+help: consider specifying the generic arguments
    |
 LL |     bfnr::<U, V, W>(x);
    |         +++++++++++
diff --git a/src/test/ui/error-codes/E0403.rs b/tests/ui/error-codes/E0403.rs
index 8bccb631a..8bccb631a 100644
--- a/src/test/ui/error-codes/E0403.rs
+++ b/tests/ui/error-codes/E0403.rs
diff --git a/src/test/ui/error-codes/E0403.stderr b/tests/ui/error-codes/E0403.stderr
index d76a58a7c..d76a58a7c 100644
--- a/src/test/ui/error-codes/E0403.stderr
+++ b/tests/ui/error-codes/E0403.stderr
diff --git a/src/test/ui/error-codes/E0404.rs b/tests/ui/error-codes/E0404.rs
index b17333724..b17333724 100644
--- a/src/test/ui/error-codes/E0404.rs
+++ b/tests/ui/error-codes/E0404.rs
diff --git a/src/test/ui/error-codes/E0404.stderr b/tests/ui/error-codes/E0404.stderr
index 4ccb6c572..4ccb6c572 100644
--- a/src/test/ui/error-codes/E0404.stderr
+++ b/tests/ui/error-codes/E0404.stderr
diff --git a/src/test/ui/error-codes/E0405.rs b/tests/ui/error-codes/E0405.rs
index f03c4e19b..f03c4e19b 100644
--- a/src/test/ui/error-codes/E0405.rs
+++ b/tests/ui/error-codes/E0405.rs
diff --git a/src/test/ui/error-codes/E0405.stderr b/tests/ui/error-codes/E0405.stderr
index a22afe6f3..a22afe6f3 100644
--- a/src/test/ui/error-codes/E0405.stderr
+++ b/tests/ui/error-codes/E0405.stderr
diff --git a/src/test/ui/error-codes/E0407.rs b/tests/ui/error-codes/E0407.rs
index 962bd5741..962bd5741 100644
--- a/src/test/ui/error-codes/E0407.rs
+++ b/tests/ui/error-codes/E0407.rs
diff --git a/src/test/ui/error-codes/E0407.stderr b/tests/ui/error-codes/E0407.stderr
index 6f6d1ff6a..6f6d1ff6a 100644
--- a/src/test/ui/error-codes/E0407.stderr
+++ b/tests/ui/error-codes/E0407.stderr
diff --git a/src/test/ui/error-codes/E0408.rs b/tests/ui/error-codes/E0408.rs
index e91a98f38..e91a98f38 100644
--- a/src/test/ui/error-codes/E0408.rs
+++ b/tests/ui/error-codes/E0408.rs
diff --git a/src/test/ui/error-codes/E0408.stderr b/tests/ui/error-codes/E0408.stderr
index 132a94322..132a94322 100644
--- a/src/test/ui/error-codes/E0408.stderr
+++ b/tests/ui/error-codes/E0408.stderr
diff --git a/src/test/ui/error-codes/E0411.rs b/tests/ui/error-codes/E0411.rs
index 872370f2a..872370f2a 100644
--- a/src/test/ui/error-codes/E0411.rs
+++ b/tests/ui/error-codes/E0411.rs
diff --git a/src/test/ui/error-codes/E0411.stderr b/tests/ui/error-codes/E0411.stderr
index 4c99f9fcb..4c99f9fcb 100644
--- a/src/test/ui/error-codes/E0411.stderr
+++ b/tests/ui/error-codes/E0411.stderr
diff --git a/src/test/ui/error-codes/E0412.rs b/tests/ui/error-codes/E0412.rs
index 5f922a50a..5f922a50a 100644
--- a/src/test/ui/error-codes/E0412.rs
+++ b/tests/ui/error-codes/E0412.rs
diff --git a/src/test/ui/error-codes/E0412.stderr b/tests/ui/error-codes/E0412.stderr
index 7bdaa1807..7bdaa1807 100644
--- a/src/test/ui/error-codes/E0412.stderr
+++ b/tests/ui/error-codes/E0412.stderr
diff --git a/src/test/ui/error-codes/E0415.rs b/tests/ui/error-codes/E0415.rs
index 6177ac35b..6177ac35b 100644
--- a/src/test/ui/error-codes/E0415.rs
+++ b/tests/ui/error-codes/E0415.rs
diff --git a/src/test/ui/error-codes/E0415.stderr b/tests/ui/error-codes/E0415.stderr
index c2b8fdc7c..c2b8fdc7c 100644
--- a/src/test/ui/error-codes/E0415.stderr
+++ b/tests/ui/error-codes/E0415.stderr
diff --git a/src/test/ui/error-codes/E0416.rs b/tests/ui/error-codes/E0416.rs
index 88eece07a..88eece07a 100644
--- a/src/test/ui/error-codes/E0416.rs
+++ b/tests/ui/error-codes/E0416.rs
diff --git a/src/test/ui/error-codes/E0416.stderr b/tests/ui/error-codes/E0416.stderr
index 78acac5c6..78acac5c6 100644
--- a/src/test/ui/error-codes/E0416.stderr
+++ b/tests/ui/error-codes/E0416.stderr
diff --git a/src/test/ui/error-codes/E0423.rs b/tests/ui/error-codes/E0423.rs
index 5080a5e05..5080a5e05 100644
--- a/src/test/ui/error-codes/E0423.rs
+++ b/tests/ui/error-codes/E0423.rs
diff --git a/src/test/ui/error-codes/E0423.stderr b/tests/ui/error-codes/E0423.stderr
index ac70d905d..ac70d905d 100644
--- a/src/test/ui/error-codes/E0423.stderr
+++ b/tests/ui/error-codes/E0423.stderr
diff --git a/src/test/ui/error-codes/E0424.rs b/tests/ui/error-codes/E0424.rs
index 6e531942c..6e531942c 100644
--- a/src/test/ui/error-codes/E0424.rs
+++ b/tests/ui/error-codes/E0424.rs
diff --git a/src/test/ui/error-codes/E0424.stderr b/tests/ui/error-codes/E0424.stderr
index d02da3e4e..d02da3e4e 100644
--- a/src/test/ui/error-codes/E0424.stderr
+++ b/tests/ui/error-codes/E0424.stderr
diff --git a/src/test/ui/error-codes/E0425.rs b/tests/ui/error-codes/E0425.rs
index ec234ae99..ec234ae99 100644
--- a/src/test/ui/error-codes/E0425.rs
+++ b/tests/ui/error-codes/E0425.rs
diff --git a/src/test/ui/error-codes/E0425.stderr b/tests/ui/error-codes/E0425.stderr
index 9ef4608da..9ef4608da 100644
--- a/src/test/ui/error-codes/E0425.stderr
+++ b/tests/ui/error-codes/E0425.stderr
diff --git a/src/test/ui/error-codes/E0426.rs b/tests/ui/error-codes/E0426.rs
index 7a1dcde49..7a1dcde49 100644
--- a/src/test/ui/error-codes/E0426.rs
+++ b/tests/ui/error-codes/E0426.rs
diff --git a/src/test/ui/error-codes/E0426.stderr b/tests/ui/error-codes/E0426.stderr
index 035f2eb86..035f2eb86 100644
--- a/src/test/ui/error-codes/E0426.stderr
+++ b/tests/ui/error-codes/E0426.stderr
diff --git a/src/test/ui/error-codes/E0428.rs b/tests/ui/error-codes/E0428.rs
index eb9594fb8..eb9594fb8 100644
--- a/src/test/ui/error-codes/E0428.rs
+++ b/tests/ui/error-codes/E0428.rs
diff --git a/src/test/ui/error-codes/E0428.stderr b/tests/ui/error-codes/E0428.stderr
index 205bcf342..205bcf342 100644
--- a/src/test/ui/error-codes/E0428.stderr
+++ b/tests/ui/error-codes/E0428.stderr
diff --git a/src/test/ui/error-codes/E0429.rs b/tests/ui/error-codes/E0429.rs
index e74b27a78..e74b27a78 100644
--- a/src/test/ui/error-codes/E0429.rs
+++ b/tests/ui/error-codes/E0429.rs
diff --git a/src/test/ui/error-codes/E0429.stderr b/tests/ui/error-codes/E0429.stderr
index 08b99232e..08b99232e 100644
--- a/src/test/ui/error-codes/E0429.stderr
+++ b/tests/ui/error-codes/E0429.stderr
diff --git a/src/test/ui/error-codes/E0430.rs b/tests/ui/error-codes/E0430.rs
index ba2f671d6..ba2f671d6 100644
--- a/src/test/ui/error-codes/E0430.rs
+++ b/tests/ui/error-codes/E0430.rs
diff --git a/src/test/ui/error-codes/E0430.stderr b/tests/ui/error-codes/E0430.stderr
index 69a0d6e11..69a0d6e11 100644
--- a/src/test/ui/error-codes/E0430.stderr
+++ b/tests/ui/error-codes/E0430.stderr
diff --git a/src/test/ui/error-codes/E0431.rs b/tests/ui/error-codes/E0431.rs
index 2e2ccba17..2e2ccba17 100644
--- a/src/test/ui/error-codes/E0431.rs
+++ b/tests/ui/error-codes/E0431.rs
diff --git a/src/test/ui/error-codes/E0431.stderr b/tests/ui/error-codes/E0431.stderr
index adfd2d923..adfd2d923 100644
--- a/src/test/ui/error-codes/E0431.stderr
+++ b/tests/ui/error-codes/E0431.stderr
diff --git a/src/test/ui/error-codes/E0432.rs b/tests/ui/error-codes/E0432.rs
index 1fc95f945..1fc95f945 100644
--- a/src/test/ui/error-codes/E0432.rs
+++ b/tests/ui/error-codes/E0432.rs
diff --git a/src/test/ui/error-codes/E0432.stderr b/tests/ui/error-codes/E0432.stderr
index ed9536f16..ed9536f16 100644
--- a/src/test/ui/error-codes/E0432.stderr
+++ b/tests/ui/error-codes/E0432.stderr
diff --git a/src/test/ui/error-codes/E0433.rs b/tests/ui/error-codes/E0433.rs
index d555e6542..d555e6542 100644
--- a/src/test/ui/error-codes/E0433.rs
+++ b/tests/ui/error-codes/E0433.rs
diff --git a/src/test/ui/error-codes/E0433.stderr b/tests/ui/error-codes/E0433.stderr
index 265d8885c..265d8885c 100644
--- a/src/test/ui/error-codes/E0433.stderr
+++ b/tests/ui/error-codes/E0433.stderr
diff --git a/src/test/ui/error-codes/E0434.rs b/tests/ui/error-codes/E0434.rs
index db7037ee1..db7037ee1 100644
--- a/src/test/ui/error-codes/E0434.rs
+++ b/tests/ui/error-codes/E0434.rs
diff --git a/src/test/ui/error-codes/E0434.stderr b/tests/ui/error-codes/E0434.stderr
index 14508ccbc..14508ccbc 100644
--- a/src/test/ui/error-codes/E0434.stderr
+++ b/tests/ui/error-codes/E0434.stderr
diff --git a/src/test/ui/error-codes/E0435.fixed b/tests/ui/error-codes/E0435.fixed
index fdf896d2d..fdf896d2d 100644
--- a/src/test/ui/error-codes/E0435.fixed
+++ b/tests/ui/error-codes/E0435.fixed
diff --git a/src/test/ui/error-codes/E0435.rs b/tests/ui/error-codes/E0435.rs
index d9354efb8..d9354efb8 100644
--- a/src/test/ui/error-codes/E0435.rs
+++ b/tests/ui/error-codes/E0435.rs
diff --git a/src/test/ui/error-codes/E0435.stderr b/tests/ui/error-codes/E0435.stderr
index fc08fade9..fc08fade9 100644
--- a/src/test/ui/error-codes/E0435.stderr
+++ b/tests/ui/error-codes/E0435.stderr
diff --git a/src/test/ui/error-codes/E0437.rs b/tests/ui/error-codes/E0437.rs
index f8c15007d..f8c15007d 100644
--- a/src/test/ui/error-codes/E0437.rs
+++ b/tests/ui/error-codes/E0437.rs
diff --git a/src/test/ui/error-codes/E0437.stderr b/tests/ui/error-codes/E0437.stderr
index 217b16403..217b16403 100644
--- a/src/test/ui/error-codes/E0437.stderr
+++ b/tests/ui/error-codes/E0437.stderr
diff --git a/src/test/ui/error-codes/E0438.rs b/tests/ui/error-codes/E0438.rs
index 02898b886..02898b886 100644
--- a/src/test/ui/error-codes/E0438.rs
+++ b/tests/ui/error-codes/E0438.rs
diff --git a/src/test/ui/error-codes/E0438.stderr b/tests/ui/error-codes/E0438.stderr
index 853f0c3c2..853f0c3c2 100644
--- a/src/test/ui/error-codes/E0438.stderr
+++ b/tests/ui/error-codes/E0438.stderr
diff --git a/src/test/ui/error-codes/E0445.rs b/tests/ui/error-codes/E0445.rs
index a9a3aee25..a9a3aee25 100644
--- a/src/test/ui/error-codes/E0445.rs
+++ b/tests/ui/error-codes/E0445.rs
diff --git a/src/test/ui/error-codes/E0445.stderr b/tests/ui/error-codes/E0445.stderr
index 23b7a3350..23b7a3350 100644
--- a/src/test/ui/error-codes/E0445.stderr
+++ b/tests/ui/error-codes/E0445.stderr
diff --git a/src/test/ui/error-codes/E0446.rs b/tests/ui/error-codes/E0446.rs
index f61c7e546..f61c7e546 100644
--- a/src/test/ui/error-codes/E0446.rs
+++ b/tests/ui/error-codes/E0446.rs
diff --git a/src/test/ui/error-codes/E0446.stderr b/tests/ui/error-codes/E0446.stderr
index b6a195c40..b6a195c40 100644
--- a/src/test/ui/error-codes/E0446.stderr
+++ b/tests/ui/error-codes/E0446.stderr
diff --git a/src/test/ui/error-codes/E0449.rs b/tests/ui/error-codes/E0449.rs
index eba0d479e..eba0d479e 100644
--- a/src/test/ui/error-codes/E0449.rs
+++ b/tests/ui/error-codes/E0449.rs
diff --git a/src/test/ui/error-codes/E0449.stderr b/tests/ui/error-codes/E0449.stderr
index 8221a5e0a..8221a5e0a 100644
--- a/src/test/ui/error-codes/E0449.stderr
+++ b/tests/ui/error-codes/E0449.stderr
diff --git a/src/test/ui/error-codes/E0451.rs b/tests/ui/error-codes/E0451.rs
index aa8f051af..aa8f051af 100644
--- a/src/test/ui/error-codes/E0451.rs
+++ b/tests/ui/error-codes/E0451.rs
diff --git a/src/test/ui/error-codes/E0451.stderr b/tests/ui/error-codes/E0451.stderr
index 419cf117e..419cf117e 100644
--- a/src/test/ui/error-codes/E0451.stderr
+++ b/tests/ui/error-codes/E0451.stderr
diff --git a/src/test/ui/error-codes/E0452.rs b/tests/ui/error-codes/E0452.rs
index 5066cd99b..5066cd99b 100644
--- a/src/test/ui/error-codes/E0452.rs
+++ b/tests/ui/error-codes/E0452.rs
diff --git a/src/test/ui/error-codes/E0452.stderr b/tests/ui/error-codes/E0452.stderr
index f67b740ff..f67b740ff 100644
--- a/src/test/ui/error-codes/E0452.stderr
+++ b/tests/ui/error-codes/E0452.stderr
diff --git a/src/test/ui/error-codes/E0453.rs b/tests/ui/error-codes/E0453.rs
index ca9573c5b..ca9573c5b 100644
--- a/src/test/ui/error-codes/E0453.rs
+++ b/tests/ui/error-codes/E0453.rs
diff --git a/src/test/ui/error-codes/E0453.stderr b/tests/ui/error-codes/E0453.stderr
index f982ed26f..f982ed26f 100644
--- a/src/test/ui/error-codes/E0453.stderr
+++ b/tests/ui/error-codes/E0453.stderr
diff --git a/src/test/ui/error-codes/E0454.rs b/tests/ui/error-codes/E0454.rs
index ff5478382..ff5478382 100644
--- a/src/test/ui/error-codes/E0454.rs
+++ b/tests/ui/error-codes/E0454.rs
diff --git a/src/test/ui/error-codes/E0454.stderr b/tests/ui/error-codes/E0454.stderr
index b9a506fee..b9a506fee 100644
--- a/src/test/ui/error-codes/E0454.stderr
+++ b/tests/ui/error-codes/E0454.stderr
diff --git a/src/test/ui/error-codes/E0458.rs b/tests/ui/error-codes/E0458.rs
index 35e7e84d4..35e7e84d4 100644
--- a/src/test/ui/error-codes/E0458.rs
+++ b/tests/ui/error-codes/E0458.rs
diff --git a/src/test/ui/error-codes/E0458.stderr b/tests/ui/error-codes/E0458.stderr
index e641bba54..e641bba54 100644
--- a/src/test/ui/error-codes/E0458.stderr
+++ b/tests/ui/error-codes/E0458.stderr
diff --git a/src/test/ui/error-codes/E0459.rs b/tests/ui/error-codes/E0459.rs
index c56d8f0a8..c56d8f0a8 100644
--- a/src/test/ui/error-codes/E0459.rs
+++ b/tests/ui/error-codes/E0459.rs
diff --git a/src/test/ui/error-codes/E0459.stderr b/tests/ui/error-codes/E0459.stderr
index 8f0dd25e0..8f0dd25e0 100644
--- a/src/test/ui/error-codes/E0459.stderr
+++ b/tests/ui/error-codes/E0459.stderr
diff --git a/tests/ui/error-codes/E0462.rs b/tests/ui/error-codes/E0462.rs
new file mode 100644
index 000000000..f839ee783
--- /dev/null
+++ b/tests/ui/error-codes/E0462.rs
@@ -0,0 +1,11 @@
+// aux-build:found-staticlib.rs
+
+// normalize-stderr-test: "\.nll/" -> "/"
+// normalize-stderr-test: "\\\?\\" -> ""
+// normalize-stderr-test: "(lib)?found_staticlib\.[a-z]+" -> "libfound_staticlib.somelib"
+
+extern crate found_staticlib; //~ ERROR E0462
+
+fn main() {
+    found_staticlib::foo();
+}
diff --git a/tests/ui/error-codes/E0462.stderr b/tests/ui/error-codes/E0462.stderr
new file mode 100644
index 000000000..43e27965f
--- /dev/null
+++ b/tests/ui/error-codes/E0462.stderr
@@ -0,0 +1,13 @@
+error[E0462]: found staticlib `found_staticlib` instead of rlib or dylib
+  --> $DIR/E0462.rs:7:1
+   |
+LL | extern crate found_staticlib;
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: the following crate versions were found:
+           crate `found_staticlib`: $TEST_BUILD_DIR/error-codes/E0462/auxiliary/libfound_staticlib.somelib
+   = help: please recompile that crate using --crate-type lib
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0462`.
diff --git a/src/test/ui/error-codes/E0463.rs b/tests/ui/error-codes/E0463.rs
index 683565281..683565281 100644
--- a/src/test/ui/error-codes/E0463.rs
+++ b/tests/ui/error-codes/E0463.rs
diff --git a/src/test/ui/error-codes/E0463.stderr b/tests/ui/error-codes/E0463.stderr
index 1aa66e1ec..1aa66e1ec 100644
--- a/src/test/ui/error-codes/E0463.stderr
+++ b/tests/ui/error-codes/E0463.stderr
diff --git a/tests/ui/error-codes/E0464.rs b/tests/ui/error-codes/E0464.rs
new file mode 100644
index 000000000..47717fbd5
--- /dev/null
+++ b/tests/ui/error-codes/E0464.rs
@@ -0,0 +1,14 @@
+// aux-build:crateresolve1-1.rs
+// aux-build:crateresolve1-2.rs
+// aux-build:crateresolve1-3.rs
+
+// normalize-stderr-test: "\.nll/" -> "/"
+// normalize-stderr-test: "\\\?\\" -> ""
+// normalize-stderr-test: "(lib)?crateresolve1-([123])\.[a-z]+" -> "libcrateresolve1-$2.somelib"
+
+// NOTE: This test is duplicated from `tests/ui/crate-loading/crateresolve1.rs`.
+
+extern crate crateresolve1;
+//~^ ERROR multiple candidates for `rlib` dependency `crateresolve1` found
+
+fn main() {}
diff --git a/tests/ui/error-codes/E0464.stderr b/tests/ui/error-codes/E0464.stderr
new file mode 100644
index 000000000..574270f94
--- /dev/null
+++ b/tests/ui/error-codes/E0464.stderr
@@ -0,0 +1,13 @@
+error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
+  --> $DIR/E0464.rs:11:1
+   |
+LL | extern crate crateresolve1;
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: candidate #1: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-1.somelib
+   = note: candidate #2: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-2.somelib
+   = note: candidate #3: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-3.somelib
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0464`.
diff --git a/src/test/ui/error-codes/E0478.rs b/tests/ui/error-codes/E0478.rs
index b1562dc0a..b1562dc0a 100644
--- a/src/test/ui/error-codes/E0478.rs
+++ b/tests/ui/error-codes/E0478.rs
diff --git a/src/test/ui/error-codes/E0478.stderr b/tests/ui/error-codes/E0478.stderr
index ec650085a..ec650085a 100644
--- a/src/test/ui/error-codes/E0478.stderr
+++ b/tests/ui/error-codes/E0478.stderr
diff --git a/src/test/ui/error-codes/E0492.rs b/tests/ui/error-codes/E0492.rs
index 2c735fcc9..2c735fcc9 100644
--- a/src/test/ui/error-codes/E0492.rs
+++ b/tests/ui/error-codes/E0492.rs
diff --git a/src/test/ui/error-codes/E0492.stderr b/tests/ui/error-codes/E0492.stderr
index 557c977e8..557c977e8 100644
--- a/src/test/ui/error-codes/E0492.stderr
+++ b/tests/ui/error-codes/E0492.stderr
diff --git a/src/test/ui/error-codes/E0496.rs b/tests/ui/error-codes/E0496.rs
index b57c9c79e..b57c9c79e 100644
--- a/src/test/ui/error-codes/E0496.rs
+++ b/tests/ui/error-codes/E0496.rs
diff --git a/src/test/ui/error-codes/E0496.stderr b/tests/ui/error-codes/E0496.stderr
index 80ca2b1fb..80ca2b1fb 100644
--- a/src/test/ui/error-codes/E0496.stderr
+++ b/tests/ui/error-codes/E0496.stderr
diff --git a/src/test/ui/error-codes/E0499.rs b/tests/ui/error-codes/E0499.rs
index 919f97c8a..919f97c8a 100644
--- a/src/test/ui/error-codes/E0499.rs
+++ b/tests/ui/error-codes/E0499.rs
diff --git a/src/test/ui/error-codes/E0499.stderr b/tests/ui/error-codes/E0499.stderr
index af5a1e186..af5a1e186 100644
--- a/src/test/ui/error-codes/E0499.stderr
+++ b/tests/ui/error-codes/E0499.stderr
diff --git a/src/test/ui/error-codes/E0501.rs b/tests/ui/error-codes/E0501.rs
index 3e39d9a63..3e39d9a63 100644
--- a/src/test/ui/error-codes/E0501.rs
+++ b/tests/ui/error-codes/E0501.rs
diff --git a/src/test/ui/error-codes/E0501.stderr b/tests/ui/error-codes/E0501.stderr
index 53d98d7e1..53d98d7e1 100644
--- a/src/test/ui/error-codes/E0501.stderr
+++ b/tests/ui/error-codes/E0501.stderr
diff --git a/src/test/ui/error-codes/E0502.rs b/tests/ui/error-codes/E0502.rs
index 958380ece..958380ece 100644
--- a/src/test/ui/error-codes/E0502.rs
+++ b/tests/ui/error-codes/E0502.rs
diff --git a/src/test/ui/error-codes/E0502.stderr b/tests/ui/error-codes/E0502.stderr
index 94cc89754..94cc89754 100644
--- a/src/test/ui/error-codes/E0502.stderr
+++ b/tests/ui/error-codes/E0502.stderr
diff --git a/src/test/ui/error-codes/E0503.rs b/tests/ui/error-codes/E0503.rs
index 88f5fc1bb..88f5fc1bb 100644
--- a/src/test/ui/error-codes/E0503.rs
+++ b/tests/ui/error-codes/E0503.rs
diff --git a/src/test/ui/error-codes/E0503.stderr b/tests/ui/error-codes/E0503.stderr
index fafe363eb..fafe363eb 100644
--- a/src/test/ui/error-codes/E0503.stderr
+++ b/tests/ui/error-codes/E0503.stderr
diff --git a/src/test/ui/error-codes/E0504.rs b/tests/ui/error-codes/E0504.rs
index c2658bef6..c2658bef6 100644
--- a/src/test/ui/error-codes/E0504.rs
+++ b/tests/ui/error-codes/E0504.rs
diff --git a/src/test/ui/error-codes/E0504.stderr b/tests/ui/error-codes/E0504.stderr
index e677e8916..e677e8916 100644
--- a/src/test/ui/error-codes/E0504.stderr
+++ b/tests/ui/error-codes/E0504.stderr
diff --git a/src/test/ui/error-codes/E0505.rs b/tests/ui/error-codes/E0505.rs
index 941f5f219..941f5f219 100644
--- a/src/test/ui/error-codes/E0505.rs
+++ b/tests/ui/error-codes/E0505.rs
diff --git a/src/test/ui/error-codes/E0505.stderr b/tests/ui/error-codes/E0505.stderr
index bd3f37f54..bd3f37f54 100644
--- a/src/test/ui/error-codes/E0505.stderr
+++ b/tests/ui/error-codes/E0505.stderr
diff --git a/src/test/ui/error-codes/E0506.rs b/tests/ui/error-codes/E0506.rs
index 062a44a52..062a44a52 100644
--- a/src/test/ui/error-codes/E0506.rs
+++ b/tests/ui/error-codes/E0506.rs
diff --git a/src/test/ui/error-codes/E0506.stderr b/tests/ui/error-codes/E0506.stderr
index d70406b75..d70406b75 100644
--- a/src/test/ui/error-codes/E0506.stderr
+++ b/tests/ui/error-codes/E0506.stderr
diff --git a/src/test/ui/error-codes/E0507.rs b/tests/ui/error-codes/E0507.rs
index bae90a44c..bae90a44c 100644
--- a/src/test/ui/error-codes/E0507.rs
+++ b/tests/ui/error-codes/E0507.rs
diff --git a/src/test/ui/error-codes/E0507.stderr b/tests/ui/error-codes/E0507.stderr
index ce8d1ef03..03630f389 100644
--- a/src/test/ui/error-codes/E0507.stderr
+++ b/tests/ui/error-codes/E0507.stderr
@@ -7,7 +7,7 @@ LL |     x.borrow().nothing_is_true();
    |     |          value moved due to this method call
    |     move occurs because value has type `TheDarkKnight`, which does not implement the `Copy` trait
    |
-note: this function takes ownership of the receiver `self`, which moves value
+note: `TheDarkKnight::nothing_is_true` takes ownership of the receiver `self`, which moves value
   --> $DIR/E0507.rs:6:24
    |
 LL |     fn nothing_is_true(self) {}
diff --git a/src/test/ui/error-codes/E0508-fail.rs b/tests/ui/error-codes/E0508-fail.rs
index 072c3d661..072c3d661 100644
--- a/src/test/ui/error-codes/E0508-fail.rs
+++ b/tests/ui/error-codes/E0508-fail.rs
diff --git a/src/test/ui/error-codes/E0508-fail.stderr b/tests/ui/error-codes/E0508-fail.stderr
index b69d7743b..208ba3072 100644
--- a/src/test/ui/error-codes/E0508-fail.stderr
+++ b/tests/ui/error-codes/E0508-fail.stderr
@@ -6,7 +6,11 @@ LL |     let _value = array[0];
    |                  |
    |                  cannot move out of here
    |                  move occurs because `array[_]` has type `NonCopy`, which does not implement the `Copy` trait
-   |                  help: consider borrowing here: `&array[0]`
+   |
+help: consider borrowing here
+   |
+LL |     let _value = &array[0];
+   |                  +
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0508.rs b/tests/ui/error-codes/E0508.rs
index 072c3d661..072c3d661 100644
--- a/src/test/ui/error-codes/E0508.rs
+++ b/tests/ui/error-codes/E0508.rs
diff --git a/src/test/ui/error-codes/E0508.stderr b/tests/ui/error-codes/E0508.stderr
index 5e7b56dcd..df2d3b0d3 100644
--- a/src/test/ui/error-codes/E0508.stderr
+++ b/tests/ui/error-codes/E0508.stderr
@@ -6,7 +6,11 @@ LL |     let _value = array[0];
    |                  |
    |                  cannot move out of here
    |                  move occurs because `array[_]` has type `NonCopy`, which does not implement the `Copy` trait
-   |                  help: consider borrowing here: `&array[0]`
+   |
+help: consider borrowing here
+   |
+LL |     let _value = &array[0];
+   |                  +
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0509.rs b/tests/ui/error-codes/E0509.rs
index b2665c4cc..b2665c4cc 100644
--- a/src/test/ui/error-codes/E0509.rs
+++ b/tests/ui/error-codes/E0509.rs
diff --git a/src/test/ui/error-codes/E0509.stderr b/tests/ui/error-codes/E0509.stderr
index cbfbc3ccf..c00d9142e 100644
--- a/src/test/ui/error-codes/E0509.stderr
+++ b/tests/ui/error-codes/E0509.stderr
@@ -6,7 +6,11 @@ LL |     let fancy_field = drop_struct.fancy;
    |                       |
    |                       cannot move out of here
    |                       move occurs because `drop_struct.fancy` has type `FancyNum`, which does not implement the `Copy` trait
-   |                       help: consider borrowing here: `&drop_struct.fancy`
+   |
+help: consider borrowing here
+   |
+LL |     let fancy_field = &drop_struct.fancy;
+   |                       +
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0511.rs b/tests/ui/error-codes/E0511.rs
index a52f81a6c..a52f81a6c 100644
--- a/src/test/ui/error-codes/E0511.rs
+++ b/tests/ui/error-codes/E0511.rs
diff --git a/src/test/ui/error-codes/E0511.stderr b/tests/ui/error-codes/E0511.stderr
index d797b10d5..d797b10d5 100644
--- a/src/test/ui/error-codes/E0511.stderr
+++ b/tests/ui/error-codes/E0511.stderr
diff --git a/src/test/ui/error-codes/E0512.rs b/tests/ui/error-codes/E0512.rs
index e70992aee..e70992aee 100644
--- a/src/test/ui/error-codes/E0512.rs
+++ b/tests/ui/error-codes/E0512.rs
diff --git a/src/test/ui/error-codes/E0512.stderr b/tests/ui/error-codes/E0512.stderr
index 3fecce542..3fecce542 100644
--- a/src/test/ui/error-codes/E0512.stderr
+++ b/tests/ui/error-codes/E0512.stderr
diff --git a/src/test/ui/error-codes/E0516.rs b/tests/ui/error-codes/E0516.rs
index 834bb6309..834bb6309 100644
--- a/src/test/ui/error-codes/E0516.rs
+++ b/tests/ui/error-codes/E0516.rs
diff --git a/src/test/ui/error-codes/E0516.stderr b/tests/ui/error-codes/E0516.stderr
index 5243b7caf..5243b7caf 100644
--- a/src/test/ui/error-codes/E0516.stderr
+++ b/tests/ui/error-codes/E0516.stderr
diff --git a/src/test/ui/error-codes/E0517.rs b/tests/ui/error-codes/E0517.rs
index 1dcaa2d74..1dcaa2d74 100644
--- a/src/test/ui/error-codes/E0517.rs
+++ b/tests/ui/error-codes/E0517.rs
diff --git a/src/test/ui/error-codes/E0517.stderr b/tests/ui/error-codes/E0517.stderr
index 2f90d4d0b..2f90d4d0b 100644
--- a/src/test/ui/error-codes/E0517.stderr
+++ b/tests/ui/error-codes/E0517.stderr
diff --git a/src/test/ui/error-codes/E0518.rs b/tests/ui/error-codes/E0518.rs
index 9c99702ad..9c99702ad 100644
--- a/src/test/ui/error-codes/E0518.rs
+++ b/tests/ui/error-codes/E0518.rs
diff --git a/src/test/ui/error-codes/E0518.stderr b/tests/ui/error-codes/E0518.stderr
index 561446f81..561446f81 100644
--- a/src/test/ui/error-codes/E0518.stderr
+++ b/tests/ui/error-codes/E0518.stderr
diff --git a/tests/ui/error-codes/E0519.rs b/tests/ui/error-codes/E0519.rs
new file mode 100644
index 000000000..269ffd632
--- /dev/null
+++ b/tests/ui/error-codes/E0519.rs
@@ -0,0 +1,8 @@
+// no need to create a new aux file, we can use an existing.
+// aux-build: crateresolve1-1.rs
+
+// set same metadata as `crateresolve1`
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+extern crate crateresolve1; //~ ERROR E0519
diff --git a/tests/ui/error-codes/E0519.stderr b/tests/ui/error-codes/E0519.stderr
new file mode 100644
index 000000000..e24fc4aaa
--- /dev/null
+++ b/tests/ui/error-codes/E0519.stderr
@@ -0,0 +1,9 @@
+error[E0519]: the current crate is indistinguishable from one of its dependencies: it has the same crate-name `crateresolve1` and was compiled with the same `-C metadata` arguments. This will result in symbol conflicts between the two.
+  --> $DIR/E0519.rs:8:1
+   |
+LL | extern crate crateresolve1;
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0519`.
diff --git a/src/test/ui/error-codes/E0520.rs b/tests/ui/error-codes/E0520.rs
index ead78b7ff..ead78b7ff 100644
--- a/src/test/ui/error-codes/E0520.rs
+++ b/tests/ui/error-codes/E0520.rs
diff --git a/src/test/ui/error-codes/E0520.stderr b/tests/ui/error-codes/E0520.stderr
index 12ecead13..12ecead13 100644
--- a/src/test/ui/error-codes/E0520.stderr
+++ b/tests/ui/error-codes/E0520.stderr
diff --git a/src/test/ui/error-codes/E0522.rs b/tests/ui/error-codes/E0522.rs
index 1414e8240..1414e8240 100644
--- a/src/test/ui/error-codes/E0522.rs
+++ b/tests/ui/error-codes/E0522.rs
diff --git a/src/test/ui/error-codes/E0522.stderr b/tests/ui/error-codes/E0522.stderr
index 0a8a41598..0a8a41598 100644
--- a/src/test/ui/error-codes/E0522.stderr
+++ b/tests/ui/error-codes/E0522.stderr
diff --git a/src/test/ui/error-codes/E0527.rs b/tests/ui/error-codes/E0527.rs
index af055ff26..af055ff26 100644
--- a/src/test/ui/error-codes/E0527.rs
+++ b/tests/ui/error-codes/E0527.rs
diff --git a/src/test/ui/error-codes/E0527.stderr b/tests/ui/error-codes/E0527.stderr
index a2e6288b2..a2e6288b2 100644
--- a/src/test/ui/error-codes/E0527.stderr
+++ b/tests/ui/error-codes/E0527.stderr
diff --git a/src/test/ui/error-codes/E0528.rs b/tests/ui/error-codes/E0528.rs
index 0a337c961..0a337c961 100644
--- a/src/test/ui/error-codes/E0528.rs
+++ b/tests/ui/error-codes/E0528.rs
diff --git a/src/test/ui/error-codes/E0528.stderr b/tests/ui/error-codes/E0528.stderr
index 21615f954..21615f954 100644
--- a/src/test/ui/error-codes/E0528.stderr
+++ b/tests/ui/error-codes/E0528.stderr
diff --git a/src/test/ui/error-codes/E0529.rs b/tests/ui/error-codes/E0529.rs
index a82bc9ebc..a82bc9ebc 100644
--- a/src/test/ui/error-codes/E0529.rs
+++ b/tests/ui/error-codes/E0529.rs
diff --git a/src/test/ui/error-codes/E0529.stderr b/tests/ui/error-codes/E0529.stderr
index 96b22bb22..96b22bb22 100644
--- a/src/test/ui/error-codes/E0529.stderr
+++ b/tests/ui/error-codes/E0529.stderr
diff --git a/src/test/ui/error-codes/E0530.rs b/tests/ui/error-codes/E0530.rs
index 5bc40964f..5bc40964f 100644
--- a/src/test/ui/error-codes/E0530.rs
+++ b/tests/ui/error-codes/E0530.rs
diff --git a/src/test/ui/error-codes/E0530.stderr b/tests/ui/error-codes/E0530.stderr
index c31214413..c31214413 100644
--- a/src/test/ui/error-codes/E0530.stderr
+++ b/tests/ui/error-codes/E0530.stderr
diff --git a/src/test/ui/error-codes/E0532.rs b/tests/ui/error-codes/E0532.rs
index 486da0e02..486da0e02 100644
--- a/src/test/ui/error-codes/E0532.rs
+++ b/tests/ui/error-codes/E0532.rs
diff --git a/src/test/ui/error-codes/E0532.stderr b/tests/ui/error-codes/E0532.stderr
index eeccadccc..eeccadccc 100644
--- a/src/test/ui/error-codes/E0532.stderr
+++ b/tests/ui/error-codes/E0532.stderr
diff --git a/src/test/ui/error-codes/E0534.rs b/tests/ui/error-codes/E0534.rs
index a42424994..a42424994 100644
--- a/src/test/ui/error-codes/E0534.rs
+++ b/tests/ui/error-codes/E0534.rs
diff --git a/src/test/ui/error-codes/E0534.stderr b/tests/ui/error-codes/E0534.stderr
index 23f9cd7ce..23f9cd7ce 100644
--- a/src/test/ui/error-codes/E0534.stderr
+++ b/tests/ui/error-codes/E0534.stderr
diff --git a/src/test/ui/error-codes/E0559.rs b/tests/ui/error-codes/E0559.rs
index c6d04ff14..c6d04ff14 100644
--- a/src/test/ui/error-codes/E0559.rs
+++ b/tests/ui/error-codes/E0559.rs
diff --git a/src/test/ui/error-codes/E0559.stderr b/tests/ui/error-codes/E0559.stderr
index 63ee1cd78..63ee1cd78 100644
--- a/src/test/ui/error-codes/E0559.stderr
+++ b/tests/ui/error-codes/E0559.stderr
diff --git a/src/test/ui/error-codes/E0560.rs b/tests/ui/error-codes/E0560.rs
index 1d60f8948..1d60f8948 100644
--- a/src/test/ui/error-codes/E0560.rs
+++ b/tests/ui/error-codes/E0560.rs
diff --git a/src/test/ui/error-codes/E0560.stderr b/tests/ui/error-codes/E0560.stderr
index 6b634f185..6b634f185 100644
--- a/src/test/ui/error-codes/E0560.stderr
+++ b/tests/ui/error-codes/E0560.stderr
diff --git a/src/test/ui/error-codes/E0565-1.rs b/tests/ui/error-codes/E0565-1.rs
index 30fba0191..30fba0191 100644
--- a/src/test/ui/error-codes/E0565-1.rs
+++ b/tests/ui/error-codes/E0565-1.rs
diff --git a/src/test/ui/error-codes/E0565-1.stderr b/tests/ui/error-codes/E0565-1.stderr
index 1283a9c5e..1283a9c5e 100644
--- a/src/test/ui/error-codes/E0565-1.stderr
+++ b/tests/ui/error-codes/E0565-1.stderr
diff --git a/src/test/ui/error-codes/E0565-2.rs b/tests/ui/error-codes/E0565-2.rs
index 0319ecb11..0319ecb11 100644
--- a/src/test/ui/error-codes/E0565-2.rs
+++ b/tests/ui/error-codes/E0565-2.rs
diff --git a/src/test/ui/error-codes/E0565-2.stderr b/tests/ui/error-codes/E0565-2.stderr
index 097871bd3..097871bd3 100644
--- a/src/test/ui/error-codes/E0565-2.stderr
+++ b/tests/ui/error-codes/E0565-2.stderr
diff --git a/src/test/ui/error-codes/E0565.rs b/tests/ui/error-codes/E0565.rs
index df76f6b13..df76f6b13 100644
--- a/src/test/ui/error-codes/E0565.rs
+++ b/tests/ui/error-codes/E0565.rs
diff --git a/src/test/ui/error-codes/E0565.stderr b/tests/ui/error-codes/E0565.stderr
index 6ed90c0ae..6ed90c0ae 100644
--- a/src/test/ui/error-codes/E0565.stderr
+++ b/tests/ui/error-codes/E0565.stderr
diff --git a/src/test/ui/error-codes/E0572.rs b/tests/ui/error-codes/E0572.rs
index cb842c933..cb842c933 100644
--- a/src/test/ui/error-codes/E0572.rs
+++ b/tests/ui/error-codes/E0572.rs
diff --git a/src/test/ui/error-codes/E0572.stderr b/tests/ui/error-codes/E0572.stderr
index 36619f8de..36619f8de 100644
--- a/src/test/ui/error-codes/E0572.stderr
+++ b/tests/ui/error-codes/E0572.stderr
diff --git a/src/test/ui/error-codes/E0582.rs b/tests/ui/error-codes/E0582.rs
index ff25012d0..ff25012d0 100644
--- a/src/test/ui/error-codes/E0582.rs
+++ b/tests/ui/error-codes/E0582.rs
diff --git a/src/test/ui/error-codes/E0582.stderr b/tests/ui/error-codes/E0582.stderr
index 81a2f0046..81a2f0046 100644
--- a/src/test/ui/error-codes/E0582.stderr
+++ b/tests/ui/error-codes/E0582.stderr
diff --git a/src/test/ui/error-codes/E0583.rs b/tests/ui/error-codes/E0583.rs
index 969de79c0..969de79c0 100644
--- a/src/test/ui/error-codes/E0583.rs
+++ b/tests/ui/error-codes/E0583.rs
diff --git a/src/test/ui/error-codes/E0583.stderr b/tests/ui/error-codes/E0583.stderr
index c7bbbf114..c7bbbf114 100644
--- a/src/test/ui/error-codes/E0583.stderr
+++ b/tests/ui/error-codes/E0583.stderr
diff --git a/src/test/ui/error-codes/E0585.rs b/tests/ui/error-codes/E0585.rs
index 890b77b53..890b77b53 100644
--- a/src/test/ui/error-codes/E0585.rs
+++ b/tests/ui/error-codes/E0585.rs
diff --git a/src/test/ui/error-codes/E0585.stderr b/tests/ui/error-codes/E0585.stderr
index 53c82fb41..53c82fb41 100644
--- a/src/test/ui/error-codes/E0585.stderr
+++ b/tests/ui/error-codes/E0585.stderr
diff --git a/src/test/ui/error-codes/E0586.rs b/tests/ui/error-codes/E0586.rs
index 2ab8a2959..2ab8a2959 100644
--- a/src/test/ui/error-codes/E0586.rs
+++ b/tests/ui/error-codes/E0586.rs
diff --git a/src/test/ui/error-codes/E0586.stderr b/tests/ui/error-codes/E0586.stderr
index 0bbf9a608..0bbf9a608 100644
--- a/src/test/ui/error-codes/E0586.stderr
+++ b/tests/ui/error-codes/E0586.stderr
diff --git a/src/test/ui/error-codes/E0594.rs b/tests/ui/error-codes/E0594.rs
index 8b0cae7e1..8b0cae7e1 100644
--- a/src/test/ui/error-codes/E0594.rs
+++ b/tests/ui/error-codes/E0594.rs
diff --git a/src/test/ui/error-codes/E0594.stderr b/tests/ui/error-codes/E0594.stderr
index f4d96f4e4..f4d96f4e4 100644
--- a/src/test/ui/error-codes/E0594.stderr
+++ b/tests/ui/error-codes/E0594.stderr
diff --git a/src/test/ui/error-codes/E0596.rs b/tests/ui/error-codes/E0596.rs
index 9e2f5ee76..9e2f5ee76 100644
--- a/src/test/ui/error-codes/E0596.rs
+++ b/tests/ui/error-codes/E0596.rs
diff --git a/src/test/ui/error-codes/E0596.stderr b/tests/ui/error-codes/E0596.stderr
index 79bc258f1..3f9aebcc8 100644
--- a/src/test/ui/error-codes/E0596.stderr
+++ b/tests/ui/error-codes/E0596.stderr
@@ -1,10 +1,13 @@
 error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
   --> $DIR/E0596.rs:3:13
    |
-LL |     let x = 1;
-   |         - help: consider changing this to be mutable: `mut x`
 LL |     let y = &mut x;
    |             ^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut x = 1;
+   |         +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0597.rs b/tests/ui/error-codes/E0597.rs
index 7217e3512..7217e3512 100644
--- a/src/test/ui/error-codes/E0597.rs
+++ b/tests/ui/error-codes/E0597.rs
diff --git a/src/test/ui/error-codes/E0597.stderr b/tests/ui/error-codes/E0597.stderr
index b4a1180ad..b4a1180ad 100644
--- a/src/test/ui/error-codes/E0597.stderr
+++ b/tests/ui/error-codes/E0597.stderr
diff --git a/src/test/ui/error-codes/E0599.rs b/tests/ui/error-codes/E0599.rs
index a2d7bb2dc..a2d7bb2dc 100644
--- a/src/test/ui/error-codes/E0599.rs
+++ b/tests/ui/error-codes/E0599.rs
diff --git a/src/test/ui/error-codes/E0599.stderr b/tests/ui/error-codes/E0599.stderr
index a1fb58f48..a1fb58f48 100644
--- a/src/test/ui/error-codes/E0599.stderr
+++ b/tests/ui/error-codes/E0599.stderr
diff --git a/src/test/ui/error-codes/E0600.rs b/tests/ui/error-codes/E0600.rs
index 7731d8619..7731d8619 100644
--- a/src/test/ui/error-codes/E0600.rs
+++ b/tests/ui/error-codes/E0600.rs
diff --git a/src/test/ui/error-codes/E0600.stderr b/tests/ui/error-codes/E0600.stderr
index 95ac4510c..95ac4510c 100644
--- a/src/test/ui/error-codes/E0600.stderr
+++ b/tests/ui/error-codes/E0600.stderr
diff --git a/src/test/ui/error-codes/E0601.rs b/tests/ui/error-codes/E0601.rs
index 4380ddeac..4380ddeac 100644
--- a/src/test/ui/error-codes/E0601.rs
+++ b/tests/ui/error-codes/E0601.rs
diff --git a/src/test/ui/error-codes/E0601.stderr b/tests/ui/error-codes/E0601.stderr
index a687f5756..a687f5756 100644
--- a/src/test/ui/error-codes/E0601.stderr
+++ b/tests/ui/error-codes/E0601.stderr
diff --git a/src/test/ui/error-codes/E0602.rs b/tests/ui/error-codes/E0602.rs
index 8fadce526..8fadce526 100644
--- a/src/test/ui/error-codes/E0602.rs
+++ b/tests/ui/error-codes/E0602.rs
diff --git a/src/test/ui/error-codes/E0602.stderr b/tests/ui/error-codes/E0602.stderr
index 2b3722633..2b3722633 100644
--- a/src/test/ui/error-codes/E0602.stderr
+++ b/tests/ui/error-codes/E0602.stderr
diff --git a/src/test/ui/error-codes/E0603.rs b/tests/ui/error-codes/E0603.rs
index 24a9ba887..24a9ba887 100644
--- a/src/test/ui/error-codes/E0603.rs
+++ b/tests/ui/error-codes/E0603.rs
diff --git a/src/test/ui/error-codes/E0603.stderr b/tests/ui/error-codes/E0603.stderr
index ee902584f..ee902584f 100644
--- a/src/test/ui/error-codes/E0603.stderr
+++ b/tests/ui/error-codes/E0603.stderr
diff --git a/src/test/ui/error-codes/E0604.rs b/tests/ui/error-codes/E0604.rs
index b9c0d1f92..b9c0d1f92 100644
--- a/src/test/ui/error-codes/E0604.rs
+++ b/tests/ui/error-codes/E0604.rs
diff --git a/src/test/ui/error-codes/E0604.stderr b/tests/ui/error-codes/E0604.stderr
index 68da03928..68da03928 100644
--- a/src/test/ui/error-codes/E0604.stderr
+++ b/tests/ui/error-codes/E0604.stderr
diff --git a/src/test/ui/error-codes/E0605.rs b/tests/ui/error-codes/E0605.rs
index cfbf1aa2b..cfbf1aa2b 100644
--- a/src/test/ui/error-codes/E0605.rs
+++ b/tests/ui/error-codes/E0605.rs
diff --git a/src/test/ui/error-codes/E0605.stderr b/tests/ui/error-codes/E0605.stderr
index e385b3394..e385b3394 100644
--- a/src/test/ui/error-codes/E0605.stderr
+++ b/tests/ui/error-codes/E0605.stderr
diff --git a/tests/ui/error-codes/E0606.rs b/tests/ui/error-codes/E0606.rs
new file mode 100644
index 000000000..6f6c65138
--- /dev/null
+++ b/tests/ui/error-codes/E0606.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let x = &(&0u8 as u8); //~ ERROR E0606
+    x as u8; //~ casting `&u8` as `u8` is invalid [E0606]
+}
diff --git a/tests/ui/error-codes/E0606.stderr b/tests/ui/error-codes/E0606.stderr
new file mode 100644
index 000000000..2492eb299
--- /dev/null
+++ b/tests/ui/error-codes/E0606.stderr
@@ -0,0 +1,26 @@
+error[E0606]: casting `&u8` as `u8` is invalid
+  --> $DIR/E0606.rs:2:14
+   |
+LL |     let x = &(&0u8 as u8);
+   |              ^^^^^^^^^^^^
+   |
+help: remove the unneeded borrow
+   |
+LL -     let x = &(&0u8 as u8);
+LL +     let x = &(0u8 as u8);
+   |
+
+error[E0606]: casting `&u8` as `u8` is invalid
+  --> $DIR/E0606.rs:3:5
+   |
+LL |     x as u8;
+   |     ^^^^^^^
+   |
+help: dereference the expression
+   |
+LL |     *x as u8;
+   |     +
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0606`.
diff --git a/src/test/ui/error-codes/E0607.rs b/tests/ui/error-codes/E0607.rs
index 65001c471..65001c471 100644
--- a/src/test/ui/error-codes/E0607.rs
+++ b/tests/ui/error-codes/E0607.rs
diff --git a/src/test/ui/error-codes/E0607.stderr b/tests/ui/error-codes/E0607.stderr
index a0fe02c1c..a0fe02c1c 100644
--- a/src/test/ui/error-codes/E0607.stderr
+++ b/tests/ui/error-codes/E0607.stderr
diff --git a/src/test/ui/error-codes/E0608.rs b/tests/ui/error-codes/E0608.rs
index 1e342d668..1e342d668 100644
--- a/src/test/ui/error-codes/E0608.rs
+++ b/tests/ui/error-codes/E0608.rs
diff --git a/src/test/ui/error-codes/E0608.stderr b/tests/ui/error-codes/E0608.stderr
index 3aec50993..3aec50993 100644
--- a/src/test/ui/error-codes/E0608.stderr
+++ b/tests/ui/error-codes/E0608.stderr
diff --git a/src/test/ui/error-codes/E0609.rs b/tests/ui/error-codes/E0609.rs
index e3a97f2fb..e3a97f2fb 100644
--- a/src/test/ui/error-codes/E0609.rs
+++ b/tests/ui/error-codes/E0609.rs
diff --git a/src/test/ui/error-codes/E0609.stderr b/tests/ui/error-codes/E0609.stderr
index 797e95d02..797e95d02 100644
--- a/src/test/ui/error-codes/E0609.stderr
+++ b/tests/ui/error-codes/E0609.stderr
diff --git a/src/test/ui/error-codes/E0610.rs b/tests/ui/error-codes/E0610.rs
index de246f371..de246f371 100644
--- a/src/test/ui/error-codes/E0610.rs
+++ b/tests/ui/error-codes/E0610.rs
diff --git a/src/test/ui/error-codes/E0610.stderr b/tests/ui/error-codes/E0610.stderr
index a2966eea4..a2966eea4 100644
--- a/src/test/ui/error-codes/E0610.stderr
+++ b/tests/ui/error-codes/E0610.stderr
diff --git a/src/test/ui/error-codes/E0614.rs b/tests/ui/error-codes/E0614.rs
index 6b4817b69..6b4817b69 100644
--- a/src/test/ui/error-codes/E0614.rs
+++ b/tests/ui/error-codes/E0614.rs
diff --git a/src/test/ui/error-codes/E0614.stderr b/tests/ui/error-codes/E0614.stderr
index 598117c2b..598117c2b 100644
--- a/src/test/ui/error-codes/E0614.stderr
+++ b/tests/ui/error-codes/E0614.stderr
diff --git a/src/test/ui/error-codes/E0615.rs b/tests/ui/error-codes/E0615.rs
index d04e4d5f7..d04e4d5f7 100644
--- a/src/test/ui/error-codes/E0615.rs
+++ b/tests/ui/error-codes/E0615.rs
diff --git a/src/test/ui/error-codes/E0615.stderr b/tests/ui/error-codes/E0615.stderr
index c12e1a3a6..c12e1a3a6 100644
--- a/src/test/ui/error-codes/E0615.stderr
+++ b/tests/ui/error-codes/E0615.stderr
diff --git a/src/test/ui/error-codes/E0616.rs b/tests/ui/error-codes/E0616.rs
index 98f87a83b..98f87a83b 100644
--- a/src/test/ui/error-codes/E0616.rs
+++ b/tests/ui/error-codes/E0616.rs
diff --git a/src/test/ui/error-codes/E0616.stderr b/tests/ui/error-codes/E0616.stderr
index da349ed2f..da349ed2f 100644
--- a/src/test/ui/error-codes/E0616.stderr
+++ b/tests/ui/error-codes/E0616.stderr
diff --git a/src/test/ui/error-codes/E0617.rs b/tests/ui/error-codes/E0617.rs
index b71ba0ed8..b71ba0ed8 100644
--- a/src/test/ui/error-codes/E0617.rs
+++ b/tests/ui/error-codes/E0617.rs
diff --git a/src/test/ui/error-codes/E0617.stderr b/tests/ui/error-codes/E0617.stderr
index ea91ad082..ea91ad082 100644
--- a/src/test/ui/error-codes/E0617.stderr
+++ b/tests/ui/error-codes/E0617.stderr
diff --git a/src/test/ui/error-codes/E0618.rs b/tests/ui/error-codes/E0618.rs
index 2616e7134..2616e7134 100644
--- a/src/test/ui/error-codes/E0618.rs
+++ b/tests/ui/error-codes/E0618.rs
diff --git a/src/test/ui/error-codes/E0618.stderr b/tests/ui/error-codes/E0618.stderr
index 793ec02a8..793ec02a8 100644
--- a/src/test/ui/error-codes/E0618.stderr
+++ b/tests/ui/error-codes/E0618.stderr
diff --git a/src/test/ui/error-codes/E0620.rs b/tests/ui/error-codes/E0620.rs
index 2831413ea..2831413ea 100644
--- a/src/test/ui/error-codes/E0620.rs
+++ b/tests/ui/error-codes/E0620.rs
diff --git a/src/test/ui/error-codes/E0620.stderr b/tests/ui/error-codes/E0620.stderr
index 65152b2b7..65152b2b7 100644
--- a/src/test/ui/error-codes/E0620.stderr
+++ b/tests/ui/error-codes/E0620.stderr
diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs b/tests/ui/error-codes/E0621-does-not-trigger-for-closures.rs
index 44f174c0f..44f174c0f 100644
--- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs
+++ b/tests/ui/error-codes/E0621-does-not-trigger-for-closures.rs
diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr b/tests/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
index b9edeb834..b9edeb834 100644
--- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
+++ b/tests/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
diff --git a/src/test/ui/error-codes/E0622.rs b/tests/ui/error-codes/E0622.rs
index ae7378a70..ae7378a70 100644
--- a/src/test/ui/error-codes/E0622.rs
+++ b/tests/ui/error-codes/E0622.rs
diff --git a/src/test/ui/error-codes/E0622.stderr b/tests/ui/error-codes/E0622.stderr
index 8466dfe38..8466dfe38 100644
--- a/src/test/ui/error-codes/E0622.stderr
+++ b/tests/ui/error-codes/E0622.stderr
diff --git a/src/test/ui/error-codes/E0624.rs b/tests/ui/error-codes/E0624.rs
index 4c68b70fb..4c68b70fb 100644
--- a/src/test/ui/error-codes/E0624.rs
+++ b/tests/ui/error-codes/E0624.rs
diff --git a/src/test/ui/error-codes/E0624.stderr b/tests/ui/error-codes/E0624.stderr
index e59b8a8ae..e59b8a8ae 100644
--- a/src/test/ui/error-codes/E0624.stderr
+++ b/tests/ui/error-codes/E0624.stderr
diff --git a/src/test/ui/error-codes/E0637.rs b/tests/ui/error-codes/E0637.rs
index 382ce3ed0..382ce3ed0 100644
--- a/src/test/ui/error-codes/E0637.rs
+++ b/tests/ui/error-codes/E0637.rs
diff --git a/src/test/ui/error-codes/E0637.stderr b/tests/ui/error-codes/E0637.stderr
index 35a4b34fb..78341735e 100644
--- a/src/test/ui/error-codes/E0637.stderr
+++ b/tests/ui/error-codes/E0637.stderr
@@ -21,6 +21,12 @@ error[E0637]: `&` without an explicit lifetime name cannot be used here
    |
 LL |     T: Into<&u32>,
    |             ^ explicit lifetime name needed here
+   |
+help: consider introducing a higher-ranked lifetime here with `for<'a>`
+  --> $DIR/E0637.rs:13:8
+   |
+LL |     T: Into<&u32>,
+   |        ^
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/error-codes/E0642.fixed b/tests/ui/error-codes/E0642.fixed
index fc6255e02..fc6255e02 100644
--- a/src/test/ui/error-codes/E0642.fixed
+++ b/tests/ui/error-codes/E0642.fixed
diff --git a/src/test/ui/error-codes/E0642.rs b/tests/ui/error-codes/E0642.rs
index 5f85f3935..5f85f3935 100644
--- a/src/test/ui/error-codes/E0642.rs
+++ b/tests/ui/error-codes/E0642.rs
diff --git a/src/test/ui/error-codes/E0642.stderr b/tests/ui/error-codes/E0642.stderr
index dd9e28ad4..dd9e28ad4 100644
--- a/src/test/ui/error-codes/E0642.stderr
+++ b/tests/ui/error-codes/E0642.stderr
diff --git a/src/test/ui/error-codes/E0646.rs b/tests/ui/error-codes/E0646.rs
index bb62428f5..bb62428f5 100644
--- a/src/test/ui/error-codes/E0646.rs
+++ b/tests/ui/error-codes/E0646.rs
diff --git a/src/test/ui/error-codes/E0646.stderr b/tests/ui/error-codes/E0646.stderr
index 069401b3f..069401b3f 100644
--- a/src/test/ui/error-codes/E0646.stderr
+++ b/tests/ui/error-codes/E0646.stderr
diff --git a/src/test/ui/error-codes/E0647.rs b/tests/ui/error-codes/E0647.rs
index fc085511c..fc085511c 100644
--- a/src/test/ui/error-codes/E0647.rs
+++ b/tests/ui/error-codes/E0647.rs
diff --git a/src/test/ui/error-codes/E0647.stderr b/tests/ui/error-codes/E0647.stderr
index 08cedfaef..08cedfaef 100644
--- a/src/test/ui/error-codes/E0647.stderr
+++ b/tests/ui/error-codes/E0647.stderr
diff --git a/src/test/ui/error-codes/E0648.rs b/tests/ui/error-codes/E0648.rs
index 8408a78c7..8408a78c7 100644
--- a/src/test/ui/error-codes/E0648.rs
+++ b/tests/ui/error-codes/E0648.rs
diff --git a/src/test/ui/error-codes/E0648.stderr b/tests/ui/error-codes/E0648.stderr
index 1a65825c7..1a65825c7 100644
--- a/src/test/ui/error-codes/E0648.stderr
+++ b/tests/ui/error-codes/E0648.stderr
diff --git a/src/test/ui/error-codes/E0657.rs b/tests/ui/error-codes/E0657.rs
index cb11de13f..cb11de13f 100644
--- a/src/test/ui/error-codes/E0657.rs
+++ b/tests/ui/error-codes/E0657.rs
diff --git a/src/test/ui/error-codes/E0657.stderr b/tests/ui/error-codes/E0657.stderr
index df76b45a5..df76b45a5 100644
--- a/src/test/ui/error-codes/E0657.stderr
+++ b/tests/ui/error-codes/E0657.stderr
diff --git a/src/test/ui/error-codes/E0658.rs b/tests/ui/error-codes/E0658.rs
index 9c9b95d70..9c9b95d70 100644
--- a/src/test/ui/error-codes/E0658.rs
+++ b/tests/ui/error-codes/E0658.rs
diff --git a/src/test/ui/error-codes/E0658.stderr b/tests/ui/error-codes/E0658.stderr
index 8d4234845..8d4234845 100644
--- a/src/test/ui/error-codes/E0658.stderr
+++ b/tests/ui/error-codes/E0658.stderr
diff --git a/src/test/ui/error-codes/E0659.rs b/tests/ui/error-codes/E0659.rs
index c00026bb7..c00026bb7 100644
--- a/src/test/ui/error-codes/E0659.rs
+++ b/tests/ui/error-codes/E0659.rs
diff --git a/src/test/ui/error-codes/E0659.stderr b/tests/ui/error-codes/E0659.stderr
index b0c73c636..b0c73c636 100644
--- a/src/test/ui/error-codes/E0659.stderr
+++ b/tests/ui/error-codes/E0659.stderr
diff --git a/src/test/ui/error-codes/E0705.rs b/tests/ui/error-codes/E0705.rs
index 05abcb629..05abcb629 100644
--- a/src/test/ui/error-codes/E0705.rs
+++ b/tests/ui/error-codes/E0705.rs
diff --git a/src/test/ui/error-codes/E0705.stderr b/tests/ui/error-codes/E0705.stderr
index 6fa843158..6fa843158 100644
--- a/src/test/ui/error-codes/E0705.stderr
+++ b/tests/ui/error-codes/E0705.stderr
diff --git a/tests/ui/error-codes/E0711.rs b/tests/ui/error-codes/E0711.rs
new file mode 100644
index 000000000..7b1a217bd
--- /dev/null
+++ b/tests/ui/error-codes/E0711.rs
@@ -0,0 +1,18 @@
+// copied from: tests/ui/feature-gates/stability-attribute-consistency.rs
+
+#![feature(staged_api)]
+
+#![stable(feature = "stable_test_feature", since = "1.0.0")]
+
+#[stable(feature = "foo", since = "1.0.0")]
+fn foo_stable_1_0_0() {}
+
+#[stable(feature = "foo", since = "1.29.0")]
+//~^ ERROR feature `foo` is declared stable since 1.29.0
+fn foo_stable_1_29_0() {}
+
+#[unstable(feature = "foo", issue = "none")]
+//~^ ERROR feature `foo` is declared unstable
+fn foo_unstable() {}
+
+fn main() {}
diff --git a/tests/ui/error-codes/E0711.stderr b/tests/ui/error-codes/E0711.stderr
new file mode 100644
index 000000000..f39cb4ecd
--- /dev/null
+++ b/tests/ui/error-codes/E0711.stderr
@@ -0,0 +1,15 @@
+error[E0711]: feature `foo` is declared stable since 1.29.0, but was previously declared stable since 1.0.0
+  --> $DIR/E0711.rs:10:1
+   |
+LL | #[stable(feature = "foo", since = "1.29.0")]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0711]: feature `foo` is declared unstable, but was previously declared stable
+  --> $DIR/E0711.rs:14:1
+   |
+LL | #[unstable(feature = "foo", issue = "none")]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0711`.
diff --git a/src/test/ui/error-codes/E0718.rs b/tests/ui/error-codes/E0718.rs
index 909cae0ba..909cae0ba 100644
--- a/src/test/ui/error-codes/E0718.rs
+++ b/tests/ui/error-codes/E0718.rs
diff --git a/src/test/ui/error-codes/E0718.stderr b/tests/ui/error-codes/E0718.stderr
index 30378dd16..30378dd16 100644
--- a/src/test/ui/error-codes/E0718.stderr
+++ b/tests/ui/error-codes/E0718.stderr
diff --git a/src/test/ui/error-codes/E0719.rs b/tests/ui/error-codes/E0719.rs
index 3311e1909..3311e1909 100644
--- a/src/test/ui/error-codes/E0719.rs
+++ b/tests/ui/error-codes/E0719.rs
diff --git a/src/test/ui/error-codes/E0719.stderr b/tests/ui/error-codes/E0719.stderr
index b342d6343..b342d6343 100644
--- a/src/test/ui/error-codes/E0719.stderr
+++ b/tests/ui/error-codes/E0719.stderr
diff --git a/src/test/ui/error-codes/E0730.rs b/tests/ui/error-codes/E0730.rs
index 04f5e5d42..04f5e5d42 100644
--- a/src/test/ui/error-codes/E0730.rs
+++ b/tests/ui/error-codes/E0730.rs
diff --git a/src/test/ui/error-codes/E0730.stderr b/tests/ui/error-codes/E0730.stderr
index 067e8c57c..067e8c57c 100644
--- a/src/test/ui/error-codes/E0730.stderr
+++ b/tests/ui/error-codes/E0730.stderr
diff --git a/src/test/ui/error-codes/E0746.fixed b/tests/ui/error-codes/E0746.fixed
index ca8319aa0..ca8319aa0 100644
--- a/src/test/ui/error-codes/E0746.fixed
+++ b/tests/ui/error-codes/E0746.fixed
diff --git a/src/test/ui/error-codes/E0746.rs b/tests/ui/error-codes/E0746.rs
index bf5ba8fff..bf5ba8fff 100644
--- a/src/test/ui/error-codes/E0746.rs
+++ b/tests/ui/error-codes/E0746.rs
diff --git a/src/test/ui/error-codes/E0746.stderr b/tests/ui/error-codes/E0746.stderr
index 2153b59ad..2153b59ad 100644
--- a/src/test/ui/error-codes/E0746.stderr
+++ b/tests/ui/error-codes/E0746.stderr
diff --git a/src/test/ui/error-codes/E0767.rs b/tests/ui/error-codes/E0767.rs
index 14215d36a..14215d36a 100644
--- a/src/test/ui/error-codes/E0767.rs
+++ b/tests/ui/error-codes/E0767.rs
diff --git a/src/test/ui/error-codes/E0767.stderr b/tests/ui/error-codes/E0767.stderr
index ee8524730..ee8524730 100644
--- a/src/test/ui/error-codes/E0767.stderr
+++ b/tests/ui/error-codes/E0767.stderr
diff --git a/src/test/ui/error-codes/E0771.rs b/tests/ui/error-codes/E0771.rs
index 67e7d106a..67e7d106a 100644
--- a/src/test/ui/error-codes/E0771.rs
+++ b/tests/ui/error-codes/E0771.rs
diff --git a/src/test/ui/error-codes/E0771.stderr b/tests/ui/error-codes/E0771.stderr
index b759399a9..b759399a9 100644
--- a/src/test/ui/error-codes/E0771.stderr
+++ b/tests/ui/error-codes/E0771.stderr
diff --git a/src/test/ui/error-codes/E0777.rs b/tests/ui/error-codes/E0777.rs
index ff70f7368..ff70f7368 100644
--- a/src/test/ui/error-codes/E0777.rs
+++ b/tests/ui/error-codes/E0777.rs
diff --git a/src/test/ui/error-codes/E0777.stderr b/tests/ui/error-codes/E0777.stderr
index 14697d89e..14697d89e 100644
--- a/src/test/ui/error-codes/E0777.stderr
+++ b/tests/ui/error-codes/E0777.stderr
diff --git a/src/test/ui/error-codes/E0778.rs b/tests/ui/error-codes/E0778.rs
index 74653886d..74653886d 100644
--- a/src/test/ui/error-codes/E0778.rs
+++ b/tests/ui/error-codes/E0778.rs
diff --git a/src/test/ui/error-codes/E0778.stderr b/tests/ui/error-codes/E0778.stderr
index 42647e5c6..42647e5c6 100644
--- a/src/test/ui/error-codes/E0778.stderr
+++ b/tests/ui/error-codes/E0778.stderr
diff --git a/src/test/ui/error-codes/E0779.rs b/tests/ui/error-codes/E0779.rs
index c32dae12c..c32dae12c 100644
--- a/src/test/ui/error-codes/E0779.rs
+++ b/tests/ui/error-codes/E0779.rs
diff --git a/src/test/ui/error-codes/E0779.stderr b/tests/ui/error-codes/E0779.stderr
index 7c6a119a0..7c6a119a0 100644
--- a/src/test/ui/error-codes/E0779.stderr
+++ b/tests/ui/error-codes/E0779.stderr
diff --git a/src/test/ui/error-codes/E0790.rs b/tests/ui/error-codes/E0790.rs
index d99006d2d..d99006d2d 100644
--- a/src/test/ui/error-codes/E0790.rs
+++ b/tests/ui/error-codes/E0790.rs
diff --git a/src/test/ui/error-codes/E0790.stderr b/tests/ui/error-codes/E0790.stderr
index f68c0e7d2..fc025a3fc 100644
--- a/src/test/ui/error-codes/E0790.stderr
+++ b/tests/ui/error-codes/E0790.stderr
@@ -37,8 +37,8 @@ LL |     inner::MyTrait::my_fn();
    |
 help: use the fully-qualified path to the only available implementation
    |
-LL |     inner::<MyStruct as MyTrait>::my_fn();
-   |            ++++++++++++        +
+LL |     <MyStruct as inner::MyTrait>::my_fn();
+   |     ++++++++++++               +
 
 error[E0790]: cannot refer to the associated constant on trait without specifying the corresponding `impl` type
   --> $DIR/E0790.rs:30:13
@@ -51,8 +51,8 @@ LL |     let _ = inner::MyTrait::MY_ASSOC_CONST;
    |
 help: use the fully-qualified path to the only available implementation
    |
-LL |     let _ = inner::<MyStruct as MyTrait>::MY_ASSOC_CONST;
-   |                    ++++++++++++        +
+LL |     let _ = <MyStruct as inner::MyTrait>::MY_ASSOC_CONST;
+   |             ++++++++++++               +
 
 error[E0790]: cannot call associated function on trait without specifying the corresponding `impl` type
   --> $DIR/E0790.rs:50:5
diff --git a/tests/ui/error-codes/auxiliary/crateresolve1-1.rs b/tests/ui/error-codes/auxiliary/crateresolve1-1.rs
new file mode 100644
index 000000000..bd9c8483e
--- /dev/null
+++ b/tests/ui/error-codes/auxiliary/crateresolve1-1.rs
@@ -0,0 +1,6 @@
+// compile-flags:-C extra-filename=-1
+// no-prefer-dynamic
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 10 }
diff --git a/tests/ui/error-codes/auxiliary/crateresolve1-2.rs b/tests/ui/error-codes/auxiliary/crateresolve1-2.rs
new file mode 100644
index 000000000..bd0f08f45
--- /dev/null
+++ b/tests/ui/error-codes/auxiliary/crateresolve1-2.rs
@@ -0,0 +1,6 @@
+// compile-flags:-C extra-filename=-2
+// no-prefer-dynamic
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 20 }
diff --git a/tests/ui/error-codes/auxiliary/crateresolve1-3.rs b/tests/ui/error-codes/auxiliary/crateresolve1-3.rs
new file mode 100644
index 000000000..1226c2fbb
--- /dev/null
+++ b/tests/ui/error-codes/auxiliary/crateresolve1-3.rs
@@ -0,0 +1,6 @@
+// compile-flags:-C extra-filename=-3
+// no-prefer-dynamic
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 30 }
diff --git a/tests/ui/error-codes/auxiliary/found-staticlib.rs b/tests/ui/error-codes/auxiliary/found-staticlib.rs
new file mode 100644
index 000000000..04e2c5978
--- /dev/null
+++ b/tests/ui/error-codes/auxiliary/found-staticlib.rs
@@ -0,0 +1,4 @@
+// no-prefer-dynamic
+#![crate_type = "staticlib"]
+
+pub fn foo() {}
diff --git a/src/test/ui/error-codes/e0119/auxiliary/complex_impl_support.rs b/tests/ui/error-codes/e0119/auxiliary/complex_impl_support.rs
index ad5bb107f..ad5bb107f 100644
--- a/src/test/ui/error-codes/e0119/auxiliary/complex_impl_support.rs
+++ b/tests/ui/error-codes/e0119/auxiliary/complex_impl_support.rs
diff --git a/src/test/ui/error-codes/e0119/auxiliary/issue-23563-a.rs b/tests/ui/error-codes/e0119/auxiliary/issue-23563-a.rs
index 141f36369..141f36369 100644
--- a/src/test/ui/error-codes/e0119/auxiliary/issue-23563-a.rs
+++ b/tests/ui/error-codes/e0119/auxiliary/issue-23563-a.rs
diff --git a/src/test/ui/error-codes/e0119/complex-impl.rs b/tests/ui/error-codes/e0119/complex-impl.rs
index 9149e4ce5..9149e4ce5 100644
--- a/src/test/ui/error-codes/e0119/complex-impl.rs
+++ b/tests/ui/error-codes/e0119/complex-impl.rs
diff --git a/src/test/ui/error-codes/e0119/complex-impl.stderr b/tests/ui/error-codes/e0119/complex-impl.stderr
index 654073eec..654073eec 100644
--- a/src/test/ui/error-codes/e0119/complex-impl.stderr
+++ b/tests/ui/error-codes/e0119/complex-impl.stderr
diff --git a/src/test/ui/error-codes/e0119/conflict-with-std.rs b/tests/ui/error-codes/e0119/conflict-with-std.rs
index c9db2bab1..c9db2bab1 100644
--- a/src/test/ui/error-codes/e0119/conflict-with-std.rs
+++ b/tests/ui/error-codes/e0119/conflict-with-std.rs
diff --git a/src/test/ui/error-codes/e0119/conflict-with-std.stderr b/tests/ui/error-codes/e0119/conflict-with-std.stderr
index ef888a1c2..ef888a1c2 100644
--- a/src/test/ui/error-codes/e0119/conflict-with-std.stderr
+++ b/tests/ui/error-codes/e0119/conflict-with-std.stderr
diff --git a/src/test/ui/error-codes/e0119/issue-23563.rs b/tests/ui/error-codes/e0119/issue-23563.rs
index f578560c5..f578560c5 100644
--- a/src/test/ui/error-codes/e0119/issue-23563.rs
+++ b/tests/ui/error-codes/e0119/issue-23563.rs
diff --git a/src/test/ui/error-codes/e0119/issue-23563.stderr b/tests/ui/error-codes/e0119/issue-23563.stderr
index 1b2d64282..1b2d64282 100644
--- a/src/test/ui/error-codes/e0119/issue-23563.stderr
+++ b/tests/ui/error-codes/e0119/issue-23563.stderr
diff --git a/src/test/ui/error-codes/e0119/issue-27403.rs b/tests/ui/error-codes/e0119/issue-27403.rs
index b03a564ff..b03a564ff 100644
--- a/src/test/ui/error-codes/e0119/issue-27403.rs
+++ b/tests/ui/error-codes/e0119/issue-27403.rs
diff --git a/src/test/ui/error-codes/e0119/issue-27403.stderr b/tests/ui/error-codes/e0119/issue-27403.stderr
index 9b3345c23..9b3345c23 100644
--- a/src/test/ui/error-codes/e0119/issue-27403.stderr
+++ b/tests/ui/error-codes/e0119/issue-27403.stderr
diff --git a/src/test/ui/error-codes/e0119/issue-28981.rs b/tests/ui/error-codes/e0119/issue-28981.rs
index 5fb7e9a99..5fb7e9a99 100644
--- a/src/test/ui/error-codes/e0119/issue-28981.rs
+++ b/tests/ui/error-codes/e0119/issue-28981.rs
diff --git a/src/test/ui/error-codes/e0119/issue-28981.stderr b/tests/ui/error-codes/e0119/issue-28981.stderr
index 97b570bc7..97b570bc7 100644
--- a/src/test/ui/error-codes/e0119/issue-28981.stderr
+++ b/tests/ui/error-codes/e0119/issue-28981.stderr
diff --git a/src/test/ui/error-codes/e0119/so-37347311.rs b/tests/ui/error-codes/e0119/so-37347311.rs
index d5f624bc4..d5f624bc4 100644
--- a/src/test/ui/error-codes/e0119/so-37347311.rs
+++ b/tests/ui/error-codes/e0119/so-37347311.rs
diff --git a/src/test/ui/error-codes/e0119/so-37347311.stderr b/tests/ui/error-codes/e0119/so-37347311.stderr
index 99367e808..99367e808 100644
--- a/src/test/ui/error-codes/e0119/so-37347311.stderr
+++ b/tests/ui/error-codes/e0119/so-37347311.stderr
diff --git a/src/test/ui/error-codes/ex-E0611.rs b/tests/ui/error-codes/ex-E0611.rs
index f18a3619f..f18a3619f 100644
--- a/src/test/ui/error-codes/ex-E0611.rs
+++ b/tests/ui/error-codes/ex-E0611.rs
diff --git a/src/test/ui/error-codes/ex-E0611.stderr b/tests/ui/error-codes/ex-E0611.stderr
index 1da7b33be..1da7b33be 100644
--- a/src/test/ui/error-codes/ex-E0611.stderr
+++ b/tests/ui/error-codes/ex-E0611.stderr
diff --git a/src/test/ui/error-codes/ex-E0612.rs b/tests/ui/error-codes/ex-E0612.rs
index c8ea53ae9..c8ea53ae9 100644
--- a/src/test/ui/error-codes/ex-E0612.rs
+++ b/tests/ui/error-codes/ex-E0612.rs
diff --git a/src/test/ui/error-codes/ex-E0612.stderr b/tests/ui/error-codes/ex-E0612.stderr
index b21b6fdfc..b21b6fdfc 100644
--- a/src/test/ui/error-codes/ex-E0612.stderr
+++ b/tests/ui/error-codes/ex-E0612.stderr
diff --git a/src/test/ui/error-festival.rs b/tests/ui/error-festival.rs
index 356564e54..356564e54 100644
--- a/src/test/ui/error-festival.rs
+++ b/tests/ui/error-festival.rs
diff --git a/src/test/ui/error-festival.stderr b/tests/ui/error-festival.stderr
index 43122c13e..e8ee1d969 100644
--- a/src/test/ui/error-festival.stderr
+++ b/tests/ui/error-festival.stderr
@@ -41,11 +41,8 @@ note: an implementation of `Not` might be missing for `Question`
    |
 LL | enum Question {
    | ^^^^^^^^^^^^^ must implement `Not`
-note: the following trait must be implemented
+note: the trait `Not` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL | pub trait Not {
-   | ^^^^^^^^^^^^^
 
 error[E0604]: only `u8` can be cast as `char`, not `u32`
   --> $DIR/error-festival.rs:25:5
@@ -72,10 +69,12 @@ error[E0606]: casting `&u8` as `u32` is invalid
   --> $DIR/error-festival.rs:37:18
    |
 LL |     let y: u32 = x as u32;
-   |                  -^^^^^^^
-   |                  |
-   |                  cannot cast `&u8` as `u32`
-   |                  help: dereference the expression: `*x`
+   |                  ^^^^^^^^
+   |
+help: dereference the expression
+   |
+LL |     let y: u32 = *x as u32;
+   |                  +
 
 error[E0607]: cannot cast thin pointer `*const u8` to fat pointer `*const [u8]`
   --> $DIR/error-festival.rs:41:5
diff --git a/src/test/ui/error-should-say-copy-not-pod.rs b/tests/ui/error-should-say-copy-not-pod.rs
index 40c4730ef..40c4730ef 100644
--- a/src/test/ui/error-should-say-copy-not-pod.rs
+++ b/tests/ui/error-should-say-copy-not-pod.rs
diff --git a/src/test/ui/error-should-say-copy-not-pod.stderr b/tests/ui/error-should-say-copy-not-pod.stderr
index 637eb27db..637eb27db 100644
--- a/src/test/ui/error-should-say-copy-not-pod.stderr
+++ b/tests/ui/error-should-say-copy-not-pod.stderr
diff --git a/tests/ui/errors/auxiliary/remapped_dep.rs b/tests/ui/errors/auxiliary/remapped_dep.rs
new file mode 100644
index 000000000..f9bb7bf89
--- /dev/null
+++ b/tests/ui/errors/auxiliary/remapped_dep.rs
@@ -0,0 +1,4 @@
+// compile-flags: --remap-path-prefix={{src-base}}/errors/auxiliary=remapped-aux
+// no-remap-src-base: Manually remap, so the remapped path remains in .stderr file.
+
+pub struct SomeStruct {} // This line should be show as part of the error.
diff --git a/src/test/ui/errors/issue-104621-extern-bad-file.rs b/tests/ui/errors/issue-104621-extern-bad-file.rs
index 3f13d6052..3f13d6052 100644
--- a/src/test/ui/errors/issue-104621-extern-bad-file.rs
+++ b/tests/ui/errors/issue-104621-extern-bad-file.rs
diff --git a/src/test/ui/errors/issue-104621-extern-bad-file.stderr b/tests/ui/errors/issue-104621-extern-bad-file.stderr
index b8500ad0e..b8500ad0e 100644
--- a/src/test/ui/errors/issue-104621-extern-bad-file.stderr
+++ b/tests/ui/errors/issue-104621-extern-bad-file.stderr
diff --git a/src/test/ui/errors/issue-104621-extern-not-file.rs b/tests/ui/errors/issue-104621-extern-not-file.rs
index 899e45a30..899e45a30 100644
--- a/src/test/ui/errors/issue-104621-extern-not-file.rs
+++ b/tests/ui/errors/issue-104621-extern-not-file.rs
diff --git a/src/test/ui/errors/issue-104621-extern-not-file.stderr b/tests/ui/errors/issue-104621-extern-not-file.stderr
index 5aaf97413..5aaf97413 100644
--- a/src/test/ui/errors/issue-104621-extern-not-file.stderr
+++ b/tests/ui/errors/issue-104621-extern-not-file.stderr
diff --git a/src/test/ui/errors/issue-89280-emitter-overflow-splice-lines.rs b/tests/ui/errors/issue-89280-emitter-overflow-splice-lines.rs
index a1c7af128..a1c7af128 100644
--- a/src/test/ui/errors/issue-89280-emitter-overflow-splice-lines.rs
+++ b/tests/ui/errors/issue-89280-emitter-overflow-splice-lines.rs
diff --git a/src/test/ui/errors/issue-89280-emitter-overflow-splice-lines.stderr b/tests/ui/errors/issue-89280-emitter-overflow-splice-lines.stderr
index 08eb8cfac..08eb8cfac 100644
--- a/src/test/ui/errors/issue-89280-emitter-overflow-splice-lines.stderr
+++ b/tests/ui/errors/issue-89280-emitter-overflow-splice-lines.stderr
diff --git a/src/test/ui/errors/issue-99572-impl-trait-on-pointer.rs b/tests/ui/errors/issue-99572-impl-trait-on-pointer.rs
index 272c6bd3f..272c6bd3f 100644
--- a/src/test/ui/errors/issue-99572-impl-trait-on-pointer.rs
+++ b/tests/ui/errors/issue-99572-impl-trait-on-pointer.rs
diff --git a/src/test/ui/errors/issue-99572-impl-trait-on-pointer.stderr b/tests/ui/errors/issue-99572-impl-trait-on-pointer.stderr
index 78d7a47de..78d7a47de 100644
--- a/src/test/ui/errors/issue-99572-impl-trait-on-pointer.stderr
+++ b/tests/ui/errors/issue-99572-impl-trait-on-pointer.stderr
diff --git a/tests/ui/errors/remap-path-prefix-reverse.local-self.stderr b/tests/ui/errors/remap-path-prefix-reverse.local-self.stderr
new file mode 100644
index 000000000..51e3b776c
--- /dev/null
+++ b/tests/ui/errors/remap-path-prefix-reverse.local-self.stderr
@@ -0,0 +1,14 @@
+error[E0423]: expected value, found struct `remapped_dep::SomeStruct`
+  --> $DIR/remap-path-prefix-reverse.rs:16:13
+   |
+LL |     let _ = remapped_dep::SomeStruct; // ~ERROR E0423
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^ help: use struct literal syntax instead: `remapped_dep::SomeStruct {}`
+   |
+  ::: remapped-aux/remapped_dep.rs:4:1
+   |
+LL | pub struct SomeStruct {} // This line should be show as part of the error.
+   | --------------------- `remapped_dep::SomeStruct` defined here
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0423`.
diff --git a/tests/ui/errors/remap-path-prefix-reverse.remapped-self.stderr b/tests/ui/errors/remap-path-prefix-reverse.remapped-self.stderr
new file mode 100644
index 000000000..51e3b776c
--- /dev/null
+++ b/tests/ui/errors/remap-path-prefix-reverse.remapped-self.stderr
@@ -0,0 +1,14 @@
+error[E0423]: expected value, found struct `remapped_dep::SomeStruct`
+  --> $DIR/remap-path-prefix-reverse.rs:16:13
+   |
+LL |     let _ = remapped_dep::SomeStruct; // ~ERROR E0423
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^ help: use struct literal syntax instead: `remapped_dep::SomeStruct {}`
+   |
+  ::: remapped-aux/remapped_dep.rs:4:1
+   |
+LL | pub struct SomeStruct {} // This line should be show as part of the error.
+   | --------------------- `remapped_dep::SomeStruct` defined here
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0423`.
diff --git a/tests/ui/errors/remap-path-prefix-reverse.rs b/tests/ui/errors/remap-path-prefix-reverse.rs
new file mode 100644
index 000000000..71c80063c
--- /dev/null
+++ b/tests/ui/errors/remap-path-prefix-reverse.rs
@@ -0,0 +1,17 @@
+// aux-build:remapped_dep.rs
+// compile-flags: --remap-path-prefix={{src-base}}/errors/auxiliary=remapped-aux
+
+// revisions: local-self remapped-self
+// [local-self] no-remap-src-base: The hack should work regardless of remapping.
+// [remapped-self] remap-src-base
+
+// Verify that the expected source code is shown.
+// error-pattern: pub struct SomeStruct {} // This line should be show
+
+extern crate remapped_dep;
+
+fn main() {
+    // The actual error is irrelevant. The important part it that is should show
+    // a snippet of the dependency's source.
+    let _ = remapped_dep::SomeStruct; // ~ERROR E0423
+}
diff --git a/tests/ui/errors/remap-path-prefix.rs b/tests/ui/errors/remap-path-prefix.rs
new file mode 100644
index 000000000..393b8e22f
--- /dev/null
+++ b/tests/ui/errors/remap-path-prefix.rs
@@ -0,0 +1,17 @@
+// compile-flags: --remap-path-prefix={{src-base}}=remapped
+// no-remap-src-base: Manually remap, so the remapped path remains in .stderr file.
+
+// The remapped paths are not normalized by compiletest.
+// normalize-stderr-test: "\\(errors)" -> "/$1"
+
+// The remapped paths aren't recognized by compiletest, so we
+// cannot use line-specific patterns.
+// error-pattern: E0425
+
+fn main() {
+    // We cannot actually put an ERROR marker here because
+    // the file name in the error message is not what the
+    // test framework expects (since the filename gets remapped).
+    // We still test the expected error in the stderr file.
+    ferris
+}
diff --git a/src/test/ui/remap-path-prefix.stderr b/tests/ui/errors/remap-path-prefix.stderr
index ad6a35d12..62dbd4b88 100644
--- a/src/test/ui/remap-path-prefix.stderr
+++ b/tests/ui/errors/remap-path-prefix.stderr
@@ -1,5 +1,5 @@
 error[E0425]: cannot find value `ferris` in this scope
-  --> remapped/remap-path-prefix.rs:8:5
+  --> remapped/errors/remap-path-prefix.rs:16:5
    |
 LL |     ferris
    |     ^^^^^^ not found in this scope
diff --git a/src/test/ui/exclusive-drop-and-copy.rs b/tests/ui/exclusive-drop-and-copy.rs
index 7a251671e..7a251671e 100644
--- a/src/test/ui/exclusive-drop-and-copy.rs
+++ b/tests/ui/exclusive-drop-and-copy.rs
diff --git a/src/test/ui/exclusive-drop-and-copy.stderr b/tests/ui/exclusive-drop-and-copy.stderr
index 8649c8abb..8649c8abb 100644
--- a/src/test/ui/exclusive-drop-and-copy.stderr
+++ b/tests/ui/exclusive-drop-and-copy.stderr
diff --git a/src/test/ui/exec-env.rs b/tests/ui/exec-env.rs
index d7f15bcae..d7f15bcae 100644
--- a/src/test/ui/exec-env.rs
+++ b/tests/ui/exec-env.rs
diff --git a/src/test/ui/explain.rs b/tests/ui/explain.rs
index 5364d92e0..5364d92e0 100644
--- a/src/test/ui/explain.rs
+++ b/tests/ui/explain.rs
diff --git a/src/test/ui/explain.stdout b/tests/ui/explain.stdout
index ef1d866c3..ef1d866c3 100644
--- a/src/test/ui/explain.stdout
+++ b/tests/ui/explain.stdout
diff --git a/src/test/ui/explicit-i-suffix.rs b/tests/ui/explicit-i-suffix.rs
index 40c7e4751..40c7e4751 100644
--- a/src/test/ui/explicit-i-suffix.rs
+++ b/tests/ui/explicit-i-suffix.rs
diff --git a/src/test/ui/explicit/explicit-call-to-dtor.fixed b/tests/ui/explicit/explicit-call-to-dtor.fixed
index 91a4ca608..91a4ca608 100644
--- a/src/test/ui/explicit/explicit-call-to-dtor.fixed
+++ b/tests/ui/explicit/explicit-call-to-dtor.fixed
diff --git a/src/test/ui/explicit/explicit-call-to-dtor.rs b/tests/ui/explicit/explicit-call-to-dtor.rs
index 0656871eb..0656871eb 100644
--- a/src/test/ui/explicit/explicit-call-to-dtor.rs
+++ b/tests/ui/explicit/explicit-call-to-dtor.rs
diff --git a/src/test/ui/explicit/explicit-call-to-dtor.stderr b/tests/ui/explicit/explicit-call-to-dtor.stderr
index f3c9bf6cc..f3c9bf6cc 100644
--- a/src/test/ui/explicit/explicit-call-to-dtor.stderr
+++ b/tests/ui/explicit/explicit-call-to-dtor.stderr
diff --git a/src/test/ui/explicit/explicit-call-to-supertrait-dtor.fixed b/tests/ui/explicit/explicit-call-to-supertrait-dtor.fixed
index 47c4c9f67..47c4c9f67 100644
--- a/src/test/ui/explicit/explicit-call-to-supertrait-dtor.fixed
+++ b/tests/ui/explicit/explicit-call-to-supertrait-dtor.fixed
diff --git a/src/test/ui/explicit/explicit-call-to-supertrait-dtor.rs b/tests/ui/explicit/explicit-call-to-supertrait-dtor.rs
index c698de50c..c698de50c 100644
--- a/src/test/ui/explicit/explicit-call-to-supertrait-dtor.rs
+++ b/tests/ui/explicit/explicit-call-to-supertrait-dtor.rs
diff --git a/src/test/ui/explicit/explicit-call-to-supertrait-dtor.stderr b/tests/ui/explicit/explicit-call-to-supertrait-dtor.stderr
index 7f5106eb5..7f5106eb5 100644
--- a/src/test/ui/explicit/explicit-call-to-supertrait-dtor.stderr
+++ b/tests/ui/explicit/explicit-call-to-supertrait-dtor.stderr
diff --git a/src/test/ui/explicit/explicit-self-lifetime-mismatch.rs b/tests/ui/explicit/explicit-self-lifetime-mismatch.rs
index a9a6f50fb..a9a6f50fb 100644
--- a/src/test/ui/explicit/explicit-self-lifetime-mismatch.rs
+++ b/tests/ui/explicit/explicit-self-lifetime-mismatch.rs
diff --git a/src/test/ui/explicit/explicit-self-lifetime-mismatch.stderr b/tests/ui/explicit/explicit-self-lifetime-mismatch.stderr
index d5ffa8f1b..d5ffa8f1b 100644
--- a/src/test/ui/explicit/explicit-self-lifetime-mismatch.stderr
+++ b/tests/ui/explicit/explicit-self-lifetime-mismatch.stderr
diff --git a/src/test/ui/explore-issue-38412.rs b/tests/ui/explore-issue-38412.rs
index 46d952df7..46d952df7 100644
--- a/src/test/ui/explore-issue-38412.rs
+++ b/tests/ui/explore-issue-38412.rs
diff --git a/src/test/ui/explore-issue-38412.stderr b/tests/ui/explore-issue-38412.stderr
index 08dadb4db..08dadb4db 100644
--- a/src/test/ui/explore-issue-38412.stderr
+++ b/tests/ui/explore-issue-38412.stderr
diff --git a/src/test/ui/expr-block-fn.rs b/tests/ui/expr-block-fn.rs
index 1cac2cac0..1cac2cac0 100644
--- a/src/test/ui/expr-block-fn.rs
+++ b/tests/ui/expr-block-fn.rs
diff --git a/src/test/ui/expr-block-generic-unique1.rs b/tests/ui/expr-block-generic-unique1.rs
index 14603a2c7..14603a2c7 100644
--- a/src/test/ui/expr-block-generic-unique1.rs
+++ b/tests/ui/expr-block-generic-unique1.rs
diff --git a/src/test/ui/expr-block-generic-unique2.rs b/tests/ui/expr-block-generic-unique2.rs
index 7879c144b..7879c144b 100644
--- a/src/test/ui/expr-block-generic-unique2.rs
+++ b/tests/ui/expr-block-generic-unique2.rs
diff --git a/src/test/ui/expr-block-generic.rs b/tests/ui/expr-block-generic.rs
index 29c7c4221..29c7c4221 100644
--- a/src/test/ui/expr-block-generic.rs
+++ b/tests/ui/expr-block-generic.rs
diff --git a/src/test/ui/expr-block.rs b/tests/ui/expr-block.rs
index ff87595c9..ff87595c9 100644
--- a/src/test/ui/expr-block.rs
+++ b/tests/ui/expr-block.rs
diff --git a/src/test/ui/expr-copy.rs b/tests/ui/expr-copy.rs
index 1c6ae0381..1c6ae0381 100644
--- a/src/test/ui/expr-copy.rs
+++ b/tests/ui/expr-copy.rs
diff --git a/src/test/ui/expr-if-generic.rs b/tests/ui/expr-if-generic.rs
index 32ed6d9be..32ed6d9be 100644
--- a/src/test/ui/expr-if-generic.rs
+++ b/tests/ui/expr-if-generic.rs
diff --git a/src/test/ui/expr-if-panic-all.rs b/tests/ui/expr-if-panic-all.rs
index f915a7d9d..f915a7d9d 100644
--- a/src/test/ui/expr-if-panic-all.rs
+++ b/tests/ui/expr-if-panic-all.rs
diff --git a/src/test/ui/expr-if-unique.rs b/tests/ui/expr-if-unique.rs
index 862326835..862326835 100644
--- a/src/test/ui/expr-if-unique.rs
+++ b/tests/ui/expr-if-unique.rs
diff --git a/src/test/ui/expr-scope.rs b/tests/ui/expr-scope.rs
index 9976b6814..9976b6814 100644
--- a/src/test/ui/expr-scope.rs
+++ b/tests/ui/expr-scope.rs
diff --git a/src/test/ui/expr/compound-assignment/eval-order.rs b/tests/ui/expr/compound-assignment/eval-order.rs
index 658adae19..658adae19 100644
--- a/src/test/ui/expr/compound-assignment/eval-order.rs
+++ b/tests/ui/expr/compound-assignment/eval-order.rs
diff --git a/src/test/ui/expr/if-bot.rs b/tests/ui/expr/if-bot.rs
index 0f09db530..0f09db530 100644
--- a/src/test/ui/expr/if-bot.rs
+++ b/tests/ui/expr/if-bot.rs
diff --git a/src/test/ui/expr/if/attrs/bad-cfg.rs b/tests/ui/expr/if/attrs/bad-cfg.rs
index 3f84929a0..3f84929a0 100644
--- a/src/test/ui/expr/if/attrs/bad-cfg.rs
+++ b/tests/ui/expr/if/attrs/bad-cfg.rs
diff --git a/src/test/ui/expr/if/attrs/bad-cfg.stderr b/tests/ui/expr/if/attrs/bad-cfg.stderr
index 8a2890886..8a2890886 100644
--- a/src/test/ui/expr/if/attrs/bad-cfg.stderr
+++ b/tests/ui/expr/if/attrs/bad-cfg.stderr
diff --git a/src/test/ui/expr/if/attrs/builtin-if-attr.rs b/tests/ui/expr/if/attrs/builtin-if-attr.rs
index 7e2906615..7e2906615 100644
--- a/src/test/ui/expr/if/attrs/builtin-if-attr.rs
+++ b/tests/ui/expr/if/attrs/builtin-if-attr.rs
diff --git a/src/test/ui/expr/if/attrs/cfg-false-if-attr.rs b/tests/ui/expr/if/attrs/cfg-false-if-attr.rs
index 1f77a1bb3..1f77a1bb3 100644
--- a/src/test/ui/expr/if/attrs/cfg-false-if-attr.rs
+++ b/tests/ui/expr/if/attrs/cfg-false-if-attr.rs
diff --git a/src/test/ui/expr/if/attrs/else-attrs.rs b/tests/ui/expr/if/attrs/else-attrs.rs
index 85da7cf6b..85da7cf6b 100644
--- a/src/test/ui/expr/if/attrs/else-attrs.rs
+++ b/tests/ui/expr/if/attrs/else-attrs.rs
diff --git a/src/test/ui/expr/if/attrs/else-attrs.stderr b/tests/ui/expr/if/attrs/else-attrs.stderr
index 273337705..273337705 100644
--- a/src/test/ui/expr/if/attrs/else-attrs.stderr
+++ b/tests/ui/expr/if/attrs/else-attrs.stderr
diff --git a/src/test/ui/expr/if/attrs/gate-whole-expr.rs b/tests/ui/expr/if/attrs/gate-whole-expr.rs
index 63772d54b..63772d54b 100644
--- a/src/test/ui/expr/if/attrs/gate-whole-expr.rs
+++ b/tests/ui/expr/if/attrs/gate-whole-expr.rs
diff --git a/src/test/ui/expr/if/attrs/let-chains-attr.rs b/tests/ui/expr/if/attrs/let-chains-attr.rs
index 2cd873114..2cd873114 100644
--- a/src/test/ui/expr/if/attrs/let-chains-attr.rs
+++ b/tests/ui/expr/if/attrs/let-chains-attr.rs
diff --git a/src/test/ui/expr/if/attrs/stmt-expr-gated.rs b/tests/ui/expr/if/attrs/stmt-expr-gated.rs
index 38599c8e6..38599c8e6 100644
--- a/src/test/ui/expr/if/attrs/stmt-expr-gated.rs
+++ b/tests/ui/expr/if/attrs/stmt-expr-gated.rs
diff --git a/src/test/ui/expr/if/attrs/stmt-expr-gated.stderr b/tests/ui/expr/if/attrs/stmt-expr-gated.stderr
index 47dac39a9..47dac39a9 100644
--- a/src/test/ui/expr/if/attrs/stmt-expr-gated.stderr
+++ b/tests/ui/expr/if/attrs/stmt-expr-gated.stderr
diff --git a/src/test/ui/expr/if/bad-if-let-suggestion.rs b/tests/ui/expr/if/bad-if-let-suggestion.rs
index a8b2a2830..a8b2a2830 100644
--- a/src/test/ui/expr/if/bad-if-let-suggestion.rs
+++ b/tests/ui/expr/if/bad-if-let-suggestion.rs
diff --git a/src/test/ui/expr/if/bad-if-let-suggestion.stderr b/tests/ui/expr/if/bad-if-let-suggestion.stderr
index 3a53a20b4..3a53a20b4 100644
--- a/src/test/ui/expr/if/bad-if-let-suggestion.stderr
+++ b/tests/ui/expr/if/bad-if-let-suggestion.stderr
diff --git a/src/test/ui/expr/if/expr-if-panic-fn.rs b/tests/ui/expr/if/expr-if-panic-fn.rs
index 36e49785a..36e49785a 100644
--- a/src/test/ui/expr/if/expr-if-panic-fn.rs
+++ b/tests/ui/expr/if/expr-if-panic-fn.rs
diff --git a/src/test/ui/expr/if/expr-if-panic-pass.rs b/tests/ui/expr/if/expr-if-panic-pass.rs
index 6069cd835..6069cd835 100644
--- a/src/test/ui/expr/if/expr-if-panic-pass.rs
+++ b/tests/ui/expr/if/expr-if-panic-pass.rs
diff --git a/src/test/ui/expr/if/expr-if-panic.rs b/tests/ui/expr/if/expr-if-panic.rs
index 520ee0870..520ee0870 100644
--- a/src/test/ui/expr/if/expr-if-panic.rs
+++ b/tests/ui/expr/if/expr-if-panic.rs
diff --git a/src/test/ui/expr/if/expr-if.rs b/tests/ui/expr/if/expr-if.rs
index 2b8474ff4..2b8474ff4 100644
--- a/src/test/ui/expr/if/expr-if.rs
+++ b/tests/ui/expr/if/expr-if.rs
diff --git a/src/test/ui/expr/if/if-branch-types.rs b/tests/ui/expr/if/if-branch-types.rs
index c125ba306..c125ba306 100644
--- a/src/test/ui/expr/if/if-branch-types.rs
+++ b/tests/ui/expr/if/if-branch-types.rs
diff --git a/src/test/ui/expr/if/if-branch-types.stderr b/tests/ui/expr/if/if-branch-types.stderr
index d2bba8821..d2bba8821 100644
--- a/src/test/ui/expr/if/if-branch-types.stderr
+++ b/tests/ui/expr/if/if-branch-types.stderr
diff --git a/src/test/ui/expr/if/if-check-panic.rs b/tests/ui/expr/if/if-check-panic.rs
index 037cd427c..037cd427c 100644
--- a/src/test/ui/expr/if/if-check-panic.rs
+++ b/tests/ui/expr/if/if-check-panic.rs
diff --git a/src/test/ui/expr/if/if-check.rs b/tests/ui/expr/if/if-check.rs
index 6593225e7..6593225e7 100644
--- a/src/test/ui/expr/if/if-check.rs
+++ b/tests/ui/expr/if/if-check.rs
diff --git a/src/test/ui/expr/if/if-cond-bot.rs b/tests/ui/expr/if/if-cond-bot.rs
index bcd114678..bcd114678 100644
--- a/src/test/ui/expr/if/if-cond-bot.rs
+++ b/tests/ui/expr/if/if-cond-bot.rs
diff --git a/src/test/ui/expr/if/if-else-type-mismatch.rs b/tests/ui/expr/if/if-else-type-mismatch.rs
index 1a0a36df2..1a0a36df2 100644
--- a/src/test/ui/expr/if/if-else-type-mismatch.rs
+++ b/tests/ui/expr/if/if-else-type-mismatch.rs
diff --git a/src/test/ui/expr/if/if-else-type-mismatch.stderr b/tests/ui/expr/if/if-else-type-mismatch.stderr
index f1fffdb1e..f1fffdb1e 100644
--- a/src/test/ui/expr/if/if-else-type-mismatch.stderr
+++ b/tests/ui/expr/if/if-else-type-mismatch.stderr
diff --git a/src/test/ui/expr/if/if-let-arm-types.rs b/tests/ui/expr/if/if-let-arm-types.rs
index 1e8260a01..1e8260a01 100644
--- a/src/test/ui/expr/if/if-let-arm-types.rs
+++ b/tests/ui/expr/if/if-let-arm-types.rs
diff --git a/src/test/ui/expr/if/if-let-arm-types.stderr b/tests/ui/expr/if/if-let-arm-types.stderr
index b40a0f479..b40a0f479 100644
--- a/src/test/ui/expr/if/if-let-arm-types.stderr
+++ b/tests/ui/expr/if/if-let-arm-types.stderr
diff --git a/src/test/ui/expr/if/if-let.rs b/tests/ui/expr/if/if-let.rs
index 7fdd2be95..7fdd2be95 100644
--- a/src/test/ui/expr/if/if-let.rs
+++ b/tests/ui/expr/if/if-let.rs
diff --git a/src/test/ui/expr/if/if-let.stderr b/tests/ui/expr/if/if-let.stderr
index c4bba3cb1..c4bba3cb1 100644
--- a/src/test/ui/expr/if/if-let.stderr
+++ b/tests/ui/expr/if/if-let.stderr
diff --git a/src/test/ui/expr/if/if-loop.rs b/tests/ui/expr/if/if-loop.rs
index 06d0bdf45..06d0bdf45 100644
--- a/src/test/ui/expr/if/if-loop.rs
+++ b/tests/ui/expr/if/if-loop.rs
diff --git a/src/test/ui/expr/if/if-no-match-bindings.rs b/tests/ui/expr/if/if-no-match-bindings.rs
index ca3df0fdd..ca3df0fdd 100644
--- a/src/test/ui/expr/if/if-no-match-bindings.rs
+++ b/tests/ui/expr/if/if-no-match-bindings.rs
diff --git a/src/test/ui/expr/if/if-no-match-bindings.stderr b/tests/ui/expr/if/if-no-match-bindings.stderr
index 737a5d604..737a5d604 100644
--- a/src/test/ui/expr/if/if-no-match-bindings.stderr
+++ b/tests/ui/expr/if/if-no-match-bindings.stderr
diff --git a/src/test/ui/expr/if/if-ret.rs b/tests/ui/expr/if/if-ret.rs
index 896072ce7..896072ce7 100644
--- a/src/test/ui/expr/if/if-ret.rs
+++ b/tests/ui/expr/if/if-ret.rs
diff --git a/src/test/ui/expr/if/if-ret.stderr b/tests/ui/expr/if/if-ret.stderr
index 8ced271aa..8ced271aa 100644
--- a/src/test/ui/expr/if/if-ret.stderr
+++ b/tests/ui/expr/if/if-ret.stderr
diff --git a/src/test/ui/expr/if/if-typeck.rs b/tests/ui/expr/if/if-typeck.rs
index d8c262bd6..d8c262bd6 100644
--- a/src/test/ui/expr/if/if-typeck.rs
+++ b/tests/ui/expr/if/if-typeck.rs
diff --git a/src/test/ui/expr/if/if-typeck.stderr b/tests/ui/expr/if/if-typeck.stderr
index 74ed0ed0a..74ed0ed0a 100644
--- a/src/test/ui/expr/if/if-typeck.stderr
+++ b/tests/ui/expr/if/if-typeck.stderr
diff --git a/src/test/ui/expr/if/if-without-block.rs b/tests/ui/expr/if/if-without-block.rs
index 5add9dfda..5add9dfda 100644
--- a/src/test/ui/expr/if/if-without-block.rs
+++ b/tests/ui/expr/if/if-without-block.rs
diff --git a/src/test/ui/expr/if/if-without-block.stderr b/tests/ui/expr/if/if-without-block.stderr
index 2d1ee04ce..2d1ee04ce 100644
--- a/src/test/ui/expr/if/if-without-block.stderr
+++ b/tests/ui/expr/if/if-without-block.stderr
diff --git a/src/test/ui/expr/if/if-without-else-as-fn-expr.rs b/tests/ui/expr/if/if-without-else-as-fn-expr.rs
index 19fbfb27b..19fbfb27b 100644
--- a/src/test/ui/expr/if/if-without-else-as-fn-expr.rs
+++ b/tests/ui/expr/if/if-without-else-as-fn-expr.rs
diff --git a/src/test/ui/expr/if/if-without-else-as-fn-expr.stderr b/tests/ui/expr/if/if-without-else-as-fn-expr.stderr
index 4daf27493..4daf27493 100644
--- a/src/test/ui/expr/if/if-without-else-as-fn-expr.stderr
+++ b/tests/ui/expr/if/if-without-else-as-fn-expr.stderr
diff --git a/src/test/ui/expr/if/if-without-else-result.rs b/tests/ui/expr/if/if-without-else-result.rs
index 95604758a..95604758a 100644
--- a/src/test/ui/expr/if/if-without-else-result.rs
+++ b/tests/ui/expr/if/if-without-else-result.rs
diff --git a/src/test/ui/expr/if/if-without-else-result.stderr b/tests/ui/expr/if/if-without-else-result.stderr
index 317faf7c6..317faf7c6 100644
--- a/src/test/ui/expr/if/if-without-else-result.stderr
+++ b/tests/ui/expr/if/if-without-else-result.stderr
diff --git a/src/test/ui/expr/if/issue-4201.rs b/tests/ui/expr/if/issue-4201.rs
index 59c465b9e..59c465b9e 100644
--- a/src/test/ui/expr/if/issue-4201.rs
+++ b/tests/ui/expr/if/issue-4201.rs
diff --git a/src/test/ui/expr/if/issue-4201.stderr b/tests/ui/expr/if/issue-4201.stderr
index 612fe7764..612fe7764 100644
--- a/src/test/ui/expr/if/issue-4201.stderr
+++ b/tests/ui/expr/if/issue-4201.stderr
diff --git a/src/test/ui/expr/malformed_closure/missing_braces_around_block.fixed b/tests/ui/expr/malformed_closure/missing_braces_around_block.fixed
index c50b9a12b..c50b9a12b 100644
--- a/src/test/ui/expr/malformed_closure/missing_braces_around_block.fixed
+++ b/tests/ui/expr/malformed_closure/missing_braces_around_block.fixed
diff --git a/src/test/ui/expr/malformed_closure/missing_braces_around_block.rs b/tests/ui/expr/malformed_closure/missing_braces_around_block.rs
index 58c81f3a6..58c81f3a6 100644
--- a/src/test/ui/expr/malformed_closure/missing_braces_around_block.rs
+++ b/tests/ui/expr/malformed_closure/missing_braces_around_block.rs
diff --git a/src/test/ui/expr/malformed_closure/missing_braces_around_block.stderr b/tests/ui/expr/malformed_closure/missing_braces_around_block.stderr
index dac9a8cfc..dac9a8cfc 100644
--- a/src/test/ui/expr/malformed_closure/missing_braces_around_block.stderr
+++ b/tests/ui/expr/malformed_closure/missing_braces_around_block.stderr
diff --git a/src/test/ui/expr/malformed_closure/ruby_style_closure.rs b/tests/ui/expr/malformed_closure/ruby_style_closure.rs
index e4341e196..fdec072b8 100644
--- a/src/test/ui/expr/malformed_closure/ruby_style_closure.rs
+++ b/tests/ui/expr/malformed_closure/ruby_style_closure.rs
@@ -8,7 +8,6 @@
 
 fn main() {
     let p = Some(45).and_then({
-        //~^ expected a `FnOnce<({integer},)>` closure, found `Option<_>`
         |x| println!("doubling {}", x);
         Some(x * 2)
         //~^ ERROR: cannot find value `x` in this scope
diff --git a/tests/ui/expr/malformed_closure/ruby_style_closure.stderr b/tests/ui/expr/malformed_closure/ruby_style_closure.stderr
new file mode 100644
index 000000000..e8b34121b
--- /dev/null
+++ b/tests/ui/expr/malformed_closure/ruby_style_closure.stderr
@@ -0,0 +1,9 @@
+error[E0425]: cannot find value `x` in this scope
+  --> $DIR/ruby_style_closure.rs:12:14
+   |
+LL |         Some(x * 2)
+   |              ^ not found in this scope
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/ext-expand-inner-exprs.rs b/tests/ui/ext-expand-inner-exprs.rs
index 5bbdf5ec9..5bbdf5ec9 100644
--- a/src/test/ui/ext-expand-inner-exprs.rs
+++ b/tests/ui/ext-expand-inner-exprs.rs
diff --git a/src/test/ui/ext-nonexistent.rs b/tests/ui/ext-nonexistent.rs
index e65b16543..e65b16543 100644
--- a/src/test/ui/ext-nonexistent.rs
+++ b/tests/ui/ext-nonexistent.rs
diff --git a/src/test/ui/ext-nonexistent.stderr b/tests/ui/ext-nonexistent.stderr
index f3aa83fd5..f3aa83fd5 100644
--- a/src/test/ui/ext-nonexistent.stderr
+++ b/tests/ui/ext-nonexistent.stderr
diff --git a/src/test/ui/extenv/extenv-arg-2-not-string-literal.rs b/tests/ui/extenv/extenv-arg-2-not-string-literal.rs
index 66dced478..66dced478 100644
--- a/src/test/ui/extenv/extenv-arg-2-not-string-literal.rs
+++ b/tests/ui/extenv/extenv-arg-2-not-string-literal.rs
diff --git a/src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr b/tests/ui/extenv/extenv-arg-2-not-string-literal.stderr
index 258e2b347..258e2b347 100644
--- a/src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr
+++ b/tests/ui/extenv/extenv-arg-2-not-string-literal.stderr
diff --git a/src/test/ui/extenv/extenv-no-args.rs b/tests/ui/extenv/extenv-no-args.rs
index 9f221ed10..9f221ed10 100644
--- a/src/test/ui/extenv/extenv-no-args.rs
+++ b/tests/ui/extenv/extenv-no-args.rs
diff --git a/src/test/ui/extenv/extenv-no-args.stderr b/tests/ui/extenv/extenv-no-args.stderr
index 318ed635b..318ed635b 100644
--- a/src/test/ui/extenv/extenv-no-args.stderr
+++ b/tests/ui/extenv/extenv-no-args.stderr
diff --git a/src/test/ui/extenv/extenv-not-defined-custom.rs b/tests/ui/extenv/extenv-not-defined-custom.rs
index 30b72783f..30b72783f 100644
--- a/src/test/ui/extenv/extenv-not-defined-custom.rs
+++ b/tests/ui/extenv/extenv-not-defined-custom.rs
diff --git a/src/test/ui/extenv/extenv-not-defined-custom.stderr b/tests/ui/extenv/extenv-not-defined-custom.stderr
index e7da4e046..e7da4e046 100644
--- a/src/test/ui/extenv/extenv-not-defined-custom.stderr
+++ b/tests/ui/extenv/extenv-not-defined-custom.stderr
diff --git a/src/test/ui/extenv/extenv-not-defined-default.rs b/tests/ui/extenv/extenv-not-defined-default.rs
index 30a06a254..30a06a254 100644
--- a/src/test/ui/extenv/extenv-not-defined-default.rs
+++ b/tests/ui/extenv/extenv-not-defined-default.rs
diff --git a/src/test/ui/extenv/extenv-not-defined-default.stderr b/tests/ui/extenv/extenv-not-defined-default.stderr
index 884875dca..884875dca 100644
--- a/src/test/ui/extenv/extenv-not-defined-default.stderr
+++ b/tests/ui/extenv/extenv-not-defined-default.stderr
diff --git a/src/test/ui/extenv/extenv-not-string-literal.rs b/tests/ui/extenv/extenv-not-string-literal.rs
index 3eaa0b5da..3eaa0b5da 100644
--- a/src/test/ui/extenv/extenv-not-string-literal.rs
+++ b/tests/ui/extenv/extenv-not-string-literal.rs
diff --git a/src/test/ui/extenv/extenv-not-string-literal.stderr b/tests/ui/extenv/extenv-not-string-literal.stderr
index 342a9f709..342a9f709 100644
--- a/src/test/ui/extenv/extenv-not-string-literal.stderr
+++ b/tests/ui/extenv/extenv-not-string-literal.stderr
diff --git a/src/test/ui/extenv/extenv-too-many-args.rs b/tests/ui/extenv/extenv-too-many-args.rs
index 1adbee583..1adbee583 100644
--- a/src/test/ui/extenv/extenv-too-many-args.rs
+++ b/tests/ui/extenv/extenv-too-many-args.rs
diff --git a/src/test/ui/extenv/extenv-too-many-args.stderr b/tests/ui/extenv/extenv-too-many-args.stderr
index 54150a332..54150a332 100644
--- a/src/test/ui/extenv/extenv-too-many-args.stderr
+++ b/tests/ui/extenv/extenv-too-many-args.stderr
diff --git a/src/test/ui/extenv/issue-55897.rs b/tests/ui/extenv/issue-55897.rs
index b7533f413..b7533f413 100644
--- a/src/test/ui/extenv/issue-55897.rs
+++ b/tests/ui/extenv/issue-55897.rs
diff --git a/src/test/ui/extenv/issue-55897.stderr b/tests/ui/extenv/issue-55897.stderr
index 63797d4a7..92e8a44b5 100644
--- a/src/test/ui/extenv/issue-55897.stderr
+++ b/tests/ui/extenv/issue-55897.stderr
@@ -30,7 +30,7 @@ LL |     use env;
 help: consider importing this module instead
    |
 LL |     use std::env;
-   |         ~~~~~~~~~
+   |         ~~~~~~~~
 
 error: cannot determine resolution for the macro `env`
   --> $DIR/issue-55897.rs:6:22
diff --git a/src/test/ui/extern-flag/auxiliary/somedep.rs b/tests/ui/extern-flag/auxiliary/somedep.rs
index dd2f373f8..dd2f373f8 100644
--- a/src/test/ui/extern-flag/auxiliary/somedep.rs
+++ b/tests/ui/extern-flag/auxiliary/somedep.rs
diff --git a/src/test/ui/extern-flag/empty-extern-arg.rs b/tests/ui/extern-flag/empty-extern-arg.rs
index 2f4ae7d8e..2f4ae7d8e 100644
--- a/src/test/ui/extern-flag/empty-extern-arg.rs
+++ b/tests/ui/extern-flag/empty-extern-arg.rs
diff --git a/src/test/ui/extern-flag/empty-extern-arg.stderr b/tests/ui/extern-flag/empty-extern-arg.stderr
index 54b5e66fc..54b5e66fc 100644
--- a/src/test/ui/extern-flag/empty-extern-arg.stderr
+++ b/tests/ui/extern-flag/empty-extern-arg.stderr
diff --git a/src/test/ui/extern-flag/multiple-opts.rs b/tests/ui/extern-flag/multiple-opts.rs
index 3dc2f1d73..3dc2f1d73 100644
--- a/src/test/ui/extern-flag/multiple-opts.rs
+++ b/tests/ui/extern-flag/multiple-opts.rs
diff --git a/src/test/ui/extern-flag/multiple-opts.stderr b/tests/ui/extern-flag/multiple-opts.stderr
index 5088fb1c4..5088fb1c4 100644
--- a/src/test/ui/extern-flag/multiple-opts.stderr
+++ b/tests/ui/extern-flag/multiple-opts.stderr
diff --git a/src/test/ui/extern-flag/no-nounused.rs b/tests/ui/extern-flag/no-nounused.rs
index 5ec755952..5ec755952 100644
--- a/src/test/ui/extern-flag/no-nounused.rs
+++ b/tests/ui/extern-flag/no-nounused.rs
diff --git a/src/test/ui/extern-flag/no-nounused.stderr b/tests/ui/extern-flag/no-nounused.stderr
index 6446c5323..6446c5323 100644
--- a/src/test/ui/extern-flag/no-nounused.stderr
+++ b/tests/ui/extern-flag/no-nounused.stderr
diff --git a/src/test/ui/extern-flag/noprelude-and-prelude.rs b/tests/ui/extern-flag/noprelude-and-prelude.rs
index e6a150b9e..e6a150b9e 100644
--- a/src/test/ui/extern-flag/noprelude-and-prelude.rs
+++ b/tests/ui/extern-flag/noprelude-and-prelude.rs
diff --git a/src/test/ui/extern-flag/noprelude-resolves.rs b/tests/ui/extern-flag/noprelude-resolves.rs
index f69f552b6..f69f552b6 100644
--- a/src/test/ui/extern-flag/noprelude-resolves.rs
+++ b/tests/ui/extern-flag/noprelude-resolves.rs
diff --git a/src/test/ui/extern-flag/noprelude.rs b/tests/ui/extern-flag/noprelude.rs
index cdbf34091..cdbf34091 100644
--- a/src/test/ui/extern-flag/noprelude.rs
+++ b/tests/ui/extern-flag/noprelude.rs
diff --git a/src/test/ui/extern-flag/noprelude.stderr b/tests/ui/extern-flag/noprelude.stderr
index 578787216..578787216 100644
--- a/src/test/ui/extern-flag/noprelude.stderr
+++ b/tests/ui/extern-flag/noprelude.stderr
diff --git a/src/test/ui/extern-flag/nounused.rs b/tests/ui/extern-flag/nounused.rs
index 2513986bb..2513986bb 100644
--- a/src/test/ui/extern-flag/nounused.rs
+++ b/tests/ui/extern-flag/nounused.rs
diff --git a/src/test/ui/extern-flag/public-and-private.rs b/tests/ui/extern-flag/public-and-private.rs
index a3a81cbf3..a3a81cbf3 100644
--- a/src/test/ui/extern-flag/public-and-private.rs
+++ b/tests/ui/extern-flag/public-and-private.rs
diff --git a/src/test/ui/extern-flag/public-and-private.stderr b/tests/ui/extern-flag/public-and-private.stderr
index 9dfc10eff..9dfc10eff 100644
--- a/src/test/ui/extern-flag/public-and-private.stderr
+++ b/tests/ui/extern-flag/public-and-private.stderr
diff --git a/src/test/ui/extern/auxiliary/extern-take-value.rs b/tests/ui/extern/auxiliary/extern-take-value.rs
index 56256aa19..56256aa19 100644
--- a/src/test/ui/extern/auxiliary/extern-take-value.rs
+++ b/tests/ui/extern/auxiliary/extern-take-value.rs
diff --git a/src/test/ui/extern/auxiliary/extern-types-inherent-impl.rs b/tests/ui/extern/auxiliary/extern-types-inherent-impl.rs
index a1efe1818..a1efe1818 100644
--- a/src/test/ui/extern/auxiliary/extern-types-inherent-impl.rs
+++ b/tests/ui/extern/auxiliary/extern-types-inherent-impl.rs
diff --git a/src/test/ui/extern/auxiliary/extern_calling_convention.rs b/tests/ui/extern/auxiliary/extern_calling_convention.rs
index e24cf9fda..e24cf9fda 100644
--- a/src/test/ui/extern/auxiliary/extern_calling_convention.rs
+++ b/tests/ui/extern/auxiliary/extern_calling_convention.rs
diff --git a/src/test/ui/extern/auxiliary/extern_mod_ordering_lib.rs b/tests/ui/extern/auxiliary/extern_mod_ordering_lib.rs
index 7357f5970..7357f5970 100644
--- a/src/test/ui/extern/auxiliary/extern_mod_ordering_lib.rs
+++ b/tests/ui/extern/auxiliary/extern_mod_ordering_lib.rs
diff --git a/src/test/ui/extern/auxiliary/fat_drop.rs b/tests/ui/extern/auxiliary/fat_drop.rs
index 768d29876..768d29876 100644
--- a/src/test/ui/extern/auxiliary/fat_drop.rs
+++ b/tests/ui/extern/auxiliary/fat_drop.rs
diff --git a/src/test/ui/extern/auxiliary/invalid-utf8.txt b/tests/ui/extern/auxiliary/invalid-utf8.txt
index dc1115b82..dc1115b82 100644
--- a/src/test/ui/extern/auxiliary/invalid-utf8.txt
+++ b/tests/ui/extern/auxiliary/invalid-utf8.txt
diff --git a/src/test/ui/extern/auxiliary/issue-80074-macro.rs b/tests/ui/extern/auxiliary/issue-80074-macro.rs
index 30e0f19ab..30e0f19ab 100644
--- a/src/test/ui/extern/auxiliary/issue-80074-macro.rs
+++ b/tests/ui/extern/auxiliary/issue-80074-macro.rs
diff --git a/src/test/ui/extern/auxiliary/m1.rs b/tests/ui/extern/auxiliary/m1.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/ui/extern/auxiliary/m1.rs
+++ b/tests/ui/extern/auxiliary/m1.rs
diff --git a/tests/ui/extern/auxiliary/m2.rs b/tests/ui/extern/auxiliary/m2.rs
new file mode 100644
index 000000000..c5c0bc606
--- /dev/null
+++ b/tests/ui/extern/auxiliary/m2.rs
@@ -0,0 +1 @@
+pub fn bar() {}
diff --git a/src/test/ui/extern/auxiliary/no-mangle-associated-fn.rs b/tests/ui/extern/auxiliary/no-mangle-associated-fn.rs
index 7fc73c76c..7fc73c76c 100644
--- a/src/test/ui/extern/auxiliary/no-mangle-associated-fn.rs
+++ b/tests/ui/extern/auxiliary/no-mangle-associated-fn.rs
diff --git a/src/test/ui/extern/auxiliary/reexport-should-still-link.rs b/tests/ui/extern/auxiliary/reexport-should-still-link.rs
index 237ea8dfc..237ea8dfc 100644
--- a/src/test/ui/extern/auxiliary/reexport-should-still-link.rs
+++ b/tests/ui/extern/auxiliary/reexport-should-still-link.rs
diff --git a/src/test/ui/extern/extern-1.rs b/tests/ui/extern/extern-1.rs
index 66e560501..66e560501 100644
--- a/src/test/ui/extern/extern-1.rs
+++ b/tests/ui/extern/extern-1.rs
diff --git a/src/test/ui/extern/extern-calling-convention-test.rs b/tests/ui/extern/extern-calling-convention-test.rs
index 7231a7cde..7231a7cde 100644
--- a/src/test/ui/extern/extern-calling-convention-test.rs
+++ b/tests/ui/extern/extern-calling-convention-test.rs
diff --git a/src/test/ui/extern/extern-compare-with-return-type.rs b/tests/ui/extern/extern-compare-with-return-type.rs
index 42693d3a0..42693d3a0 100644
--- a/src/test/ui/extern/extern-compare-with-return-type.rs
+++ b/tests/ui/extern/extern-compare-with-return-type.rs
diff --git a/src/test/ui/extern/extern-const.fixed b/tests/ui/extern/extern-const.fixed
index 9d96b4f63..9d96b4f63 100644
--- a/src/test/ui/extern/extern-const.fixed
+++ b/tests/ui/extern/extern-const.fixed
diff --git a/src/test/ui/extern/extern-const.rs b/tests/ui/extern/extern-const.rs
index 7cef5b349..7cef5b349 100644
--- a/src/test/ui/extern/extern-const.rs
+++ b/tests/ui/extern/extern-const.rs
diff --git a/src/test/ui/extern/extern-const.stderr b/tests/ui/extern/extern-const.stderr
index 7f67adbdb..7f67adbdb 100644
--- a/src/test/ui/extern/extern-const.stderr
+++ b/tests/ui/extern/extern-const.stderr
diff --git a/src/test/ui/extern/extern-crate-multiple-missing.rs b/tests/ui/extern/extern-crate-multiple-missing.rs
index a6560ca78..a6560ca78 100644
--- a/src/test/ui/extern/extern-crate-multiple-missing.rs
+++ b/tests/ui/extern/extern-crate-multiple-missing.rs
diff --git a/src/test/ui/extern/extern-crate-multiple-missing.stderr b/tests/ui/extern/extern-crate-multiple-missing.stderr
index 893bb4fb2..893bb4fb2 100644
--- a/src/test/ui/extern/extern-crate-multiple-missing.stderr
+++ b/tests/ui/extern/extern-crate-multiple-missing.stderr
diff --git a/src/test/ui/extern/extern-crate-rename.rs b/tests/ui/extern/extern-crate-rename.rs
index fc8afc3e1..fc8afc3e1 100644
--- a/src/test/ui/extern/extern-crate-rename.rs
+++ b/tests/ui/extern/extern-crate-rename.rs
diff --git a/src/test/ui/extern/extern-crate-rename.stderr b/tests/ui/extern/extern-crate-rename.stderr
index 5f1477955..5f1477955 100644
--- a/src/test/ui/extern/extern-crate-rename.stderr
+++ b/tests/ui/extern/extern-crate-rename.stderr
diff --git a/src/test/ui/extern/extern-crate-visibility.rs b/tests/ui/extern/extern-crate-visibility.rs
index cda1227cc..cda1227cc 100644
--- a/src/test/ui/extern/extern-crate-visibility.rs
+++ b/tests/ui/extern/extern-crate-visibility.rs
diff --git a/src/test/ui/extern/extern-crate-visibility.stderr b/tests/ui/extern/extern-crate-visibility.stderr
index 9eeb83ae1..9eeb83ae1 100644
--- a/src/test/ui/extern/extern-crate-visibility.stderr
+++ b/tests/ui/extern/extern-crate-visibility.stderr
diff --git a/src/test/ui/extern/extern-ffi-fn-with-body.rs b/tests/ui/extern/extern-ffi-fn-with-body.rs
index ef234e8af..ef234e8af 100644
--- a/src/test/ui/extern/extern-ffi-fn-with-body.rs
+++ b/tests/ui/extern/extern-ffi-fn-with-body.rs
diff --git a/src/test/ui/extern/extern-ffi-fn-with-body.stderr b/tests/ui/extern/extern-ffi-fn-with-body.stderr
index 079c9cecd..079c9cecd 100644
--- a/src/test/ui/extern/extern-ffi-fn-with-body.stderr
+++ b/tests/ui/extern/extern-ffi-fn-with-body.stderr
diff --git a/src/test/ui/extern/extern-foreign-crate.rs b/tests/ui/extern/extern-foreign-crate.rs
index 7f774c442..7f774c442 100644
--- a/src/test/ui/extern/extern-foreign-crate.rs
+++ b/tests/ui/extern/extern-foreign-crate.rs
diff --git a/src/test/ui/extern/extern-macro.rs b/tests/ui/extern/extern-macro.rs
index ab974e628..ab974e628 100644
--- a/src/test/ui/extern/extern-macro.rs
+++ b/tests/ui/extern/extern-macro.rs
diff --git a/src/test/ui/extern/extern-macro.stderr b/tests/ui/extern/extern-macro.stderr
index 5b7a72073..5b7a72073 100644
--- a/src/test/ui/extern/extern-macro.stderr
+++ b/tests/ui/extern/extern-macro.stderr
diff --git a/src/test/ui/extern/extern-main-fn.rs b/tests/ui/extern/extern-main-fn.rs
index bb1468a70..bb1468a70 100644
--- a/src/test/ui/extern/extern-main-fn.rs
+++ b/tests/ui/extern/extern-main-fn.rs
diff --git a/src/test/ui/extern/extern-main-fn.stderr b/tests/ui/extern/extern-main-fn.stderr
index 136c95753..136c95753 100644
--- a/src/test/ui/extern/extern-main-fn.stderr
+++ b/tests/ui/extern/extern-main-fn.stderr
diff --git a/src/test/ui/extern/extern-main-issue-86110.rs b/tests/ui/extern/extern-main-issue-86110.rs
index 83af7a14c..83af7a14c 100644
--- a/src/test/ui/extern/extern-main-issue-86110.rs
+++ b/tests/ui/extern/extern-main-issue-86110.rs
diff --git a/src/test/ui/extern/extern-main-issue-86110.stderr b/tests/ui/extern/extern-main-issue-86110.stderr
index 18dfddc46..18dfddc46 100644
--- a/src/test/ui/extern/extern-main-issue-86110.stderr
+++ b/tests/ui/extern/extern-main-issue-86110.stderr
diff --git a/src/test/ui/extern/extern-methods.rs b/tests/ui/extern/extern-methods.rs
index 22792c113..22792c113 100644
--- a/src/test/ui/extern/extern-methods.rs
+++ b/tests/ui/extern/extern-methods.rs
diff --git a/src/test/ui/extern/extern-mod-abi.rs b/tests/ui/extern/extern-mod-abi.rs
index c543394cc..c543394cc 100644
--- a/src/test/ui/extern/extern-mod-abi.rs
+++ b/tests/ui/extern/extern-mod-abi.rs
diff --git a/src/test/ui/extern/extern-mod-ordering-exe.rs b/tests/ui/extern/extern-mod-ordering-exe.rs
index d7cc4dffb..d7cc4dffb 100644
--- a/src/test/ui/extern/extern-mod-ordering-exe.rs
+++ b/tests/ui/extern/extern-mod-ordering-exe.rs
diff --git a/src/test/ui/extern/extern-no-mangle.rs b/tests/ui/extern/extern-no-mangle.rs
index ab7c9824a..ab7c9824a 100644
--- a/src/test/ui/extern/extern-no-mangle.rs
+++ b/tests/ui/extern/extern-no-mangle.rs
diff --git a/src/test/ui/extern/extern-no-mangle.stderr b/tests/ui/extern/extern-no-mangle.stderr
index f20ee158a..f20ee158a 100644
--- a/src/test/ui/extern/extern-no-mangle.stderr
+++ b/tests/ui/extern/extern-no-mangle.stderr
diff --git a/src/test/ui/extern/extern-prelude-core.rs b/tests/ui/extern/extern-prelude-core.rs
index 56206425f..56206425f 100644
--- a/src/test/ui/extern/extern-prelude-core.rs
+++ b/tests/ui/extern/extern-prelude-core.rs
diff --git a/src/test/ui/extern/extern-prelude-no-speculative.rs b/tests/ui/extern/extern-prelude-no-speculative.rs
index 3ba124159..3ba124159 100644
--- a/src/test/ui/extern/extern-prelude-no-speculative.rs
+++ b/tests/ui/extern/extern-prelude-no-speculative.rs
diff --git a/src/test/ui/extern/extern-prelude-std.rs b/tests/ui/extern/extern-prelude-std.rs
index b5627fad9..b5627fad9 100644
--- a/src/test/ui/extern/extern-prelude-std.rs
+++ b/tests/ui/extern/extern-prelude-std.rs
diff --git a/src/test/ui/extern/extern-pub.rs b/tests/ui/extern/extern-pub.rs
index 0b95045a0..0b95045a0 100644
--- a/src/test/ui/extern/extern-pub.rs
+++ b/tests/ui/extern/extern-pub.rs
diff --git a/src/test/ui/extern/extern-rust.rs b/tests/ui/extern/extern-rust.rs
index 7cea8be59..7cea8be59 100644
--- a/src/test/ui/extern/extern-rust.rs
+++ b/tests/ui/extern/extern-rust.rs
diff --git a/src/test/ui/extern/extern-static-size-overflow.rs b/tests/ui/extern/extern-static-size-overflow.rs
index a96ce0cf4..a96ce0cf4 100644
--- a/src/test/ui/extern/extern-static-size-overflow.rs
+++ b/tests/ui/extern/extern-static-size-overflow.rs
diff --git a/src/test/ui/extern/extern-static-size-overflow.stderr b/tests/ui/extern/extern-static-size-overflow.stderr
index 1c9263995..1c9263995 100644
--- a/src/test/ui/extern/extern-static-size-overflow.stderr
+++ b/tests/ui/extern/extern-static-size-overflow.stderr
diff --git a/src/test/ui/extern/extern-take-value.rs b/tests/ui/extern/extern-take-value.rs
index c09a77436..c09a77436 100644
--- a/src/test/ui/extern/extern-take-value.rs
+++ b/tests/ui/extern/extern-take-value.rs
diff --git a/src/test/ui/extern/extern-thiscall.rs b/tests/ui/extern/extern-thiscall.rs
index 717df57ec..717df57ec 100644
--- a/src/test/ui/extern/extern-thiscall.rs
+++ b/tests/ui/extern/extern-thiscall.rs
diff --git a/src/test/ui/extern/extern-type-diag-not-similar.rs b/tests/ui/extern/extern-type-diag-not-similar.rs
index 39d00a6c1..39d00a6c1 100644
--- a/src/test/ui/extern/extern-type-diag-not-similar.rs
+++ b/tests/ui/extern/extern-type-diag-not-similar.rs
diff --git a/src/test/ui/extern/extern-type-diag-not-similar.stderr b/tests/ui/extern/extern-type-diag-not-similar.stderr
index 75836f7ec..75836f7ec 100644
--- a/src/test/ui/extern/extern-type-diag-not-similar.stderr
+++ b/tests/ui/extern/extern-type-diag-not-similar.stderr
diff --git a/src/test/ui/extern/extern-types-distinct-types.rs b/tests/ui/extern/extern-types-distinct-types.rs
index 4da049b78..4da049b78 100644
--- a/src/test/ui/extern/extern-types-distinct-types.rs
+++ b/tests/ui/extern/extern-types-distinct-types.rs
diff --git a/src/test/ui/extern/extern-types-distinct-types.stderr b/tests/ui/extern/extern-types-distinct-types.stderr
index ca25aa64e..ca25aa64e 100644
--- a/src/test/ui/extern/extern-types-distinct-types.stderr
+++ b/tests/ui/extern/extern-types-distinct-types.stderr
diff --git a/src/test/ui/extern/extern-types-inherent-impl.rs b/tests/ui/extern/extern-types-inherent-impl.rs
index 3f09ac7b8..3f09ac7b8 100644
--- a/src/test/ui/extern/extern-types-inherent-impl.rs
+++ b/tests/ui/extern/extern-types-inherent-impl.rs
diff --git a/src/test/ui/extern/extern-types-manual-sync-send.rs b/tests/ui/extern/extern-types-manual-sync-send.rs
index 87eb3f622..87eb3f622 100644
--- a/src/test/ui/extern/extern-types-manual-sync-send.rs
+++ b/tests/ui/extern/extern-types-manual-sync-send.rs
diff --git a/src/test/ui/extern/extern-types-not-sync-send.rs b/tests/ui/extern/extern-types-not-sync-send.rs
index ba82caced..ba82caced 100644
--- a/src/test/ui/extern/extern-types-not-sync-send.rs
+++ b/tests/ui/extern/extern-types-not-sync-send.rs
diff --git a/src/test/ui/extern/extern-types-not-sync-send.stderr b/tests/ui/extern/extern-types-not-sync-send.stderr
index 7865ddeda..7865ddeda 100644
--- a/src/test/ui/extern/extern-types-not-sync-send.stderr
+++ b/tests/ui/extern/extern-types-not-sync-send.stderr
diff --git a/src/test/ui/extern/extern-types-pointer-cast.rs b/tests/ui/extern/extern-types-pointer-cast.rs
index de6955bfa..de6955bfa 100644
--- a/src/test/ui/extern/extern-types-pointer-cast.rs
+++ b/tests/ui/extern/extern-types-pointer-cast.rs
diff --git a/src/test/ui/extern/extern-types-size_of_val.rs b/tests/ui/extern/extern-types-size_of_val.rs
index 3b02ea28e..3b02ea28e 100644
--- a/src/test/ui/extern/extern-types-size_of_val.rs
+++ b/tests/ui/extern/extern-types-size_of_val.rs
diff --git a/src/test/ui/extern/extern-types-thin-pointer.rs b/tests/ui/extern/extern-types-thin-pointer.rs
index b85fc4886..b85fc4886 100644
--- a/src/test/ui/extern/extern-types-thin-pointer.rs
+++ b/tests/ui/extern/extern-types-thin-pointer.rs
diff --git a/src/test/ui/extern/extern-types-trait-impl.rs b/tests/ui/extern/extern-types-trait-impl.rs
index 656101ed5..656101ed5 100644
--- a/src/test/ui/extern/extern-types-trait-impl.rs
+++ b/tests/ui/extern/extern-types-trait-impl.rs
diff --git a/src/test/ui/extern/extern-types-unsized.rs b/tests/ui/extern/extern-types-unsized.rs
index 94a222a7e..94a222a7e 100644
--- a/src/test/ui/extern/extern-types-unsized.rs
+++ b/tests/ui/extern/extern-types-unsized.rs
diff --git a/src/test/ui/extern/extern-types-unsized.stderr b/tests/ui/extern/extern-types-unsized.stderr
index a79caced1..a79caced1 100644
--- a/src/test/ui/extern/extern-types-unsized.stderr
+++ b/tests/ui/extern/extern-types-unsized.stderr
diff --git a/src/test/ui/extern/extern-vectorcall.rs b/tests/ui/extern/extern-vectorcall.rs
index a283573c9..a283573c9 100644
--- a/src/test/ui/extern/extern-vectorcall.rs
+++ b/tests/ui/extern/extern-vectorcall.rs
diff --git a/src/test/ui/extern/extern-with-type-bounds.rs b/tests/ui/extern/extern-with-type-bounds.rs
index a72aa4171..a72aa4171 100644
--- a/src/test/ui/extern/extern-with-type-bounds.rs
+++ b/tests/ui/extern/extern-with-type-bounds.rs
diff --git a/src/test/ui/extern/extern-with-type-bounds.stderr b/tests/ui/extern/extern-with-type-bounds.stderr
index 88be1e5dd..88be1e5dd 100644
--- a/src/test/ui/extern/extern-with-type-bounds.stderr
+++ b/tests/ui/extern/extern-with-type-bounds.stderr
diff --git a/src/test/ui/extern/extern-wrong-value-type.rs b/tests/ui/extern/extern-wrong-value-type.rs
index 337865ec1..337865ec1 100644
--- a/src/test/ui/extern/extern-wrong-value-type.rs
+++ b/tests/ui/extern/extern-wrong-value-type.rs
diff --git a/src/test/ui/extern/extern-wrong-value-type.stderr b/tests/ui/extern/extern-wrong-value-type.stderr
index ff2934a2b..ff2934a2b 100644
--- a/src/test/ui/extern/extern-wrong-value-type.stderr
+++ b/tests/ui/extern/extern-wrong-value-type.stderr
diff --git a/src/test/ui/extern/extern_fat_drop.rs b/tests/ui/extern/extern_fat_drop.rs
index 1cd12c2ca..1cd12c2ca 100644
--- a/src/test/ui/extern/extern_fat_drop.rs
+++ b/tests/ui/extern/extern_fat_drop.rs
diff --git a/src/test/ui/extern/issue-10025.rs b/tests/ui/extern/issue-10025.rs
index 4439b4685..4439b4685 100644
--- a/src/test/ui/extern/issue-10025.rs
+++ b/tests/ui/extern/issue-10025.rs
diff --git a/src/test/ui/extern/issue-10763.rs b/tests/ui/extern/issue-10763.rs
index 627a8c238..627a8c238 100644
--- a/src/test/ui/extern/issue-10763.rs
+++ b/tests/ui/extern/issue-10763.rs
diff --git a/src/test/ui/extern/issue-10764-rpass.rs b/tests/ui/extern/issue-10764-rpass.rs
index 42ed1ae93..42ed1ae93 100644
--- a/src/test/ui/extern/issue-10764-rpass.rs
+++ b/tests/ui/extern/issue-10764-rpass.rs
diff --git a/src/test/ui/issues/issue-13655.rs b/tests/ui/extern/issue-13655.rs
index 6dd184799..6dd184799 100644
--- a/src/test/ui/issues/issue-13655.rs
+++ b/tests/ui/extern/issue-13655.rs
diff --git a/src/test/ui/extern/issue-28324.mir.stderr b/tests/ui/extern/issue-28324.mir.stderr
index aff8bf792..aff8bf792 100644
--- a/src/test/ui/extern/issue-28324.mir.stderr
+++ b/tests/ui/extern/issue-28324.mir.stderr
diff --git a/src/test/ui/extern/issue-28324.rs b/tests/ui/extern/issue-28324.rs
index fbe83e325..fbe83e325 100644
--- a/src/test/ui/extern/issue-28324.rs
+++ b/tests/ui/extern/issue-28324.rs
diff --git a/src/test/ui/extern/issue-28324.thir.stderr b/tests/ui/extern/issue-28324.thir.stderr
index c696c3598..c696c3598 100644
--- a/src/test/ui/extern/issue-28324.thir.stderr
+++ b/tests/ui/extern/issue-28324.thir.stderr
diff --git a/src/test/ui/extern/issue-36122-accessing-externed-dst.rs b/tests/ui/extern/issue-36122-accessing-externed-dst.rs
index 5f886ff57..5f886ff57 100644
--- a/src/test/ui/extern/issue-36122-accessing-externed-dst.rs
+++ b/tests/ui/extern/issue-36122-accessing-externed-dst.rs
diff --git a/src/test/ui/extern/issue-36122-accessing-externed-dst.stderr b/tests/ui/extern/issue-36122-accessing-externed-dst.stderr
index 5f78775f5..5f78775f5 100644
--- a/src/test/ui/extern/issue-36122-accessing-externed-dst.stderr
+++ b/tests/ui/extern/issue-36122-accessing-externed-dst.stderr
diff --git a/src/test/ui/extern/issue-64655-allow-unwind-when-calling-panic-directly.rs b/tests/ui/extern/issue-64655-allow-unwind-when-calling-panic-directly.rs
index 233120c92..233120c92 100644
--- a/src/test/ui/extern/issue-64655-allow-unwind-when-calling-panic-directly.rs
+++ b/tests/ui/extern/issue-64655-allow-unwind-when-calling-panic-directly.rs
diff --git a/src/test/ui/extern/issue-64655-extern-rust-must-allow-unwind.rs b/tests/ui/extern/issue-64655-extern-rust-must-allow-unwind.rs
index 3b263e58c..3b263e58c 100644
--- a/src/test/ui/extern/issue-64655-extern-rust-must-allow-unwind.rs
+++ b/tests/ui/extern/issue-64655-extern-rust-must-allow-unwind.rs
diff --git a/src/test/ui/extern/issue-80074.rs b/tests/ui/extern/issue-80074.rs
index f83027d4a..f83027d4a 100644
--- a/src/test/ui/extern/issue-80074.rs
+++ b/tests/ui/extern/issue-80074.rs
diff --git a/src/test/ui/extern/issue-95829.rs b/tests/ui/extern/issue-95829.rs
index 3379148ae..3379148ae 100644
--- a/src/test/ui/extern/issue-95829.rs
+++ b/tests/ui/extern/issue-95829.rs
diff --git a/src/test/ui/extern/issue-95829.stderr b/tests/ui/extern/issue-95829.stderr
index b902f0ef8..b902f0ef8 100644
--- a/src/test/ui/extern/issue-95829.stderr
+++ b/tests/ui/extern/issue-95829.stderr
diff --git a/src/test/ui/extern/no-mangle-associated-fn.rs b/tests/ui/extern/no-mangle-associated-fn.rs
index ecd44abbf..ecd44abbf 100644
--- a/src/test/ui/extern/no-mangle-associated-fn.rs
+++ b/tests/ui/extern/no-mangle-associated-fn.rs
diff --git a/src/test/ui/extern/not-in-block.rs b/tests/ui/extern/not-in-block.rs
index d3bcafdef..d3bcafdef 100644
--- a/src/test/ui/extern/not-in-block.rs
+++ b/tests/ui/extern/not-in-block.rs
diff --git a/src/test/ui/extern/not-in-block.stderr b/tests/ui/extern/not-in-block.stderr
index 2544949ab..2544949ab 100644
--- a/src/test/ui/extern/not-in-block.stderr
+++ b/tests/ui/extern/not-in-block.stderr
diff --git a/src/test/ui/extoption_env-no-args.rs b/tests/ui/extoption_env-no-args.rs
index bc5f77bc6..bc5f77bc6 100644
--- a/src/test/ui/extoption_env-no-args.rs
+++ b/tests/ui/extoption_env-no-args.rs
diff --git a/src/test/ui/extoption_env-no-args.stderr b/tests/ui/extoption_env-no-args.stderr
index 65067942b..65067942b 100644
--- a/src/test/ui/extoption_env-no-args.stderr
+++ b/tests/ui/extoption_env-no-args.stderr
diff --git a/src/test/ui/extoption_env-not-defined.rs b/tests/ui/extoption_env-not-defined.rs
index 4014902ff..4014902ff 100644
--- a/src/test/ui/extoption_env-not-defined.rs
+++ b/tests/ui/extoption_env-not-defined.rs
diff --git a/src/test/ui/extoption_env-not-string-literal.rs b/tests/ui/extoption_env-not-string-literal.rs
index 27c3a8e83..27c3a8e83 100644
--- a/src/test/ui/extoption_env-not-string-literal.rs
+++ b/tests/ui/extoption_env-not-string-literal.rs
diff --git a/src/test/ui/extoption_env-not-string-literal.stderr b/tests/ui/extoption_env-not-string-literal.stderr
index 272751916..272751916 100644
--- a/src/test/ui/extoption_env-not-string-literal.stderr
+++ b/tests/ui/extoption_env-not-string-literal.stderr
diff --git a/src/test/ui/extoption_env-too-many-args.rs b/tests/ui/extoption_env-too-many-args.rs
index ecc8b61ac..ecc8b61ac 100644
--- a/src/test/ui/extoption_env-too-many-args.rs
+++ b/tests/ui/extoption_env-too-many-args.rs
diff --git a/src/test/ui/extoption_env-too-many-args.stderr b/tests/ui/extoption_env-too-many-args.stderr
index a34e60b64..a34e60b64 100644
--- a/src/test/ui/extoption_env-too-many-args.stderr
+++ b/tests/ui/extoption_env-too-many-args.stderr
diff --git a/src/test/ui/fact.rs b/tests/ui/fact.rs
index c6c2f57e7..c6c2f57e7 100644
--- a/src/test/ui/fact.rs
+++ b/tests/ui/fact.rs
diff --git a/src/test/ui/fail-simple.rs b/tests/ui/fail-simple.rs
index cd81a5d0a..cd81a5d0a 100644
--- a/src/test/ui/fail-simple.rs
+++ b/tests/ui/fail-simple.rs
diff --git a/src/test/ui/fail-simple.stderr b/tests/ui/fail-simple.stderr
index af8f54291..af8f54291 100644
--- a/src/test/ui/fail-simple.stderr
+++ b/tests/ui/fail-simple.stderr
diff --git a/src/test/ui/feature-gates/allow-features-empty.rs b/tests/ui/feature-gates/allow-features-empty.rs
index 88a609349..88a609349 100644
--- a/src/test/ui/feature-gates/allow-features-empty.rs
+++ b/tests/ui/feature-gates/allow-features-empty.rs
diff --git a/src/test/ui/feature-gates/allow-features-empty.stderr b/tests/ui/feature-gates/allow-features-empty.stderr
index f88b3ea0a..f88b3ea0a 100644
--- a/src/test/ui/feature-gates/allow-features-empty.stderr
+++ b/tests/ui/feature-gates/allow-features-empty.stderr
diff --git a/src/test/ui/feature-gates/allow-features.rs b/tests/ui/feature-gates/allow-features.rs
index 2ce4701a8..2ce4701a8 100644
--- a/src/test/ui/feature-gates/allow-features.rs
+++ b/tests/ui/feature-gates/allow-features.rs
diff --git a/src/test/ui/feature-gates/allow-features.stderr b/tests/ui/feature-gates/allow-features.stderr
index 9caf48dd1..9caf48dd1 100644
--- a/src/test/ui/feature-gates/allow-features.stderr
+++ b/tests/ui/feature-gates/allow-features.stderr
diff --git a/src/test/ui/feature-gates/auxiliary/cfg-target-thread-local.rs b/tests/ui/feature-gates/auxiliary/cfg-target-thread-local.rs
index bd5c8f81c..bd5c8f81c 100644
--- a/src/test/ui/feature-gates/auxiliary/cfg-target-thread-local.rs
+++ b/tests/ui/feature-gates/auxiliary/cfg-target-thread-local.rs
diff --git a/src/test/ui/feature-gates/auxiliary/debugger-visualizer.natvis b/tests/ui/feature-gates/auxiliary/debugger-visualizer.natvis
index 6eb47e3d8..6eb47e3d8 100644
--- a/src/test/ui/feature-gates/auxiliary/debugger-visualizer.natvis
+++ b/tests/ui/feature-gates/auxiliary/debugger-visualizer.natvis
diff --git a/src/test/ui/feature-gates/auxiliary/pub_dep.rs b/tests/ui/feature-gates/auxiliary/pub_dep.rs
index 3ebafd953..3ebafd953 100644
--- a/src/test/ui/feature-gates/auxiliary/pub_dep.rs
+++ b/tests/ui/feature-gates/auxiliary/pub_dep.rs
diff --git a/src/test/ui/feature-gates/auxiliary/re_rebalance_coherence_lib.rs b/tests/ui/feature-gates/auxiliary/re_rebalance_coherence_lib.rs
index 41b9d64d5..41b9d64d5 100644
--- a/src/test/ui/feature-gates/auxiliary/re_rebalance_coherence_lib.rs
+++ b/tests/ui/feature-gates/auxiliary/re_rebalance_coherence_lib.rs
diff --git a/src/test/ui/feature-gates/bench.rs b/tests/ui/feature-gates/bench.rs
index 8de390bec..8de390bec 100644
--- a/src/test/ui/feature-gates/bench.rs
+++ b/tests/ui/feature-gates/bench.rs
diff --git a/src/test/ui/feature-gates/bench.stderr b/tests/ui/feature-gates/bench.stderr
index 5f0aaf925..5f0aaf925 100644
--- a/src/test/ui/feature-gates/bench.stderr
+++ b/tests/ui/feature-gates/bench.stderr
diff --git a/src/test/ui/feature-gates/duplicate-features.rs b/tests/ui/feature-gates/duplicate-features.rs
index d8f781805..d8f781805 100644
--- a/src/test/ui/feature-gates/duplicate-features.rs
+++ b/tests/ui/feature-gates/duplicate-features.rs
diff --git a/src/test/ui/feature-gates/duplicate-features.stderr b/tests/ui/feature-gates/duplicate-features.stderr
index dbde806f6..dbde806f6 100644
--- a/src/test/ui/feature-gates/duplicate-features.stderr
+++ b/tests/ui/feature-gates/duplicate-features.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-abi-avr-interrupt.rs b/tests/ui/feature-gates/feature-gate-abi-avr-interrupt.rs
index 05461297a..05461297a 100644
--- a/src/test/ui/feature-gates/feature-gate-abi-avr-interrupt.rs
+++ b/tests/ui/feature-gates/feature-gate-abi-avr-interrupt.rs
diff --git a/src/test/ui/feature-gates/feature-gate-abi-avr-interrupt.stderr b/tests/ui/feature-gates/feature-gate-abi-avr-interrupt.stderr
index d017d03a3..d017d03a3 100644
--- a/src/test/ui/feature-gates/feature-gate-abi-avr-interrupt.stderr
+++ b/tests/ui/feature-gates/feature-gate-abi-avr-interrupt.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs b/tests/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs
index 8b7d8066a..8b7d8066a 100644
--- a/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs
+++ b/tests/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs
diff --git a/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr b/tests/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr
index c19ec9789..c19ec9789 100644
--- a/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr
+++ b/tests/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-abi-x86-interrupt.rs b/tests/ui/feature-gates/feature-gate-abi-x86-interrupt.rs
index 7c3e4d10d..7c3e4d10d 100644
--- a/src/test/ui/feature-gates/feature-gate-abi-x86-interrupt.rs
+++ b/tests/ui/feature-gates/feature-gate-abi-x86-interrupt.rs
diff --git a/src/test/ui/feature-gates/feature-gate-abi-x86-interrupt.stderr b/tests/ui/feature-gates/feature-gate-abi-x86-interrupt.stderr
index 3b727a745..3b727a745 100644
--- a/src/test/ui/feature-gates/feature-gate-abi-x86-interrupt.stderr
+++ b/tests/ui/feature-gates/feature-gate-abi-x86-interrupt.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-abi.rs b/tests/ui/feature-gates/feature-gate-abi.rs
index 712655f97..712655f97 100644
--- a/src/test/ui/feature-gates/feature-gate-abi.rs
+++ b/tests/ui/feature-gates/feature-gate-abi.rs
diff --git a/src/test/ui/feature-gates/feature-gate-abi.stderr b/tests/ui/feature-gates/feature-gate-abi.stderr
index e9791b951..e9791b951 100644
--- a/src/test/ui/feature-gates/feature-gate-abi.stderr
+++ b/tests/ui/feature-gates/feature-gate-abi.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-abi_amdgpu_kernel.rs b/tests/ui/feature-gates/feature-gate-abi_amdgpu_kernel.rs
index 465b81d7f..465b81d7f 100644
--- a/src/test/ui/feature-gates/feature-gate-abi_amdgpu_kernel.rs
+++ b/tests/ui/feature-gates/feature-gate-abi_amdgpu_kernel.rs
diff --git a/src/test/ui/feature-gates/feature-gate-abi_amdgpu_kernel.stderr b/tests/ui/feature-gates/feature-gate-abi_amdgpu_kernel.stderr
index c89ab7bae..c89ab7bae 100644
--- a/src/test/ui/feature-gates/feature-gate-abi_amdgpu_kernel.stderr
+++ b/tests/ui/feature-gates/feature-gate-abi_amdgpu_kernel.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-abi_ptx.rs b/tests/ui/feature-gates/feature-gate-abi_ptx.rs
index e3405641e..e3405641e 100644
--- a/src/test/ui/feature-gates/feature-gate-abi_ptx.rs
+++ b/tests/ui/feature-gates/feature-gate-abi_ptx.rs
diff --git a/src/test/ui/feature-gates/feature-gate-abi_ptx.stderr b/tests/ui/feature-gates/feature-gate-abi_ptx.stderr
index 40782d361..40782d361 100644
--- a/src/test/ui/feature-gates/feature-gate-abi_ptx.stderr
+++ b/tests/ui/feature-gates/feature-gate-abi_ptx.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-abi_unadjusted.rs b/tests/ui/feature-gates/feature-gate-abi_unadjusted.rs
index 35a7d7328..35a7d7328 100644
--- a/src/test/ui/feature-gates/feature-gate-abi_unadjusted.rs
+++ b/tests/ui/feature-gates/feature-gate-abi_unadjusted.rs
diff --git a/src/test/ui/feature-gates/feature-gate-abi_unadjusted.stderr b/tests/ui/feature-gates/feature-gate-abi_unadjusted.stderr
index 1757befec..1757befec 100644
--- a/src/test/ui/feature-gates/feature-gate-abi_unadjusted.stderr
+++ b/tests/ui/feature-gates/feature-gate-abi_unadjusted.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-adt_const_params.rs b/tests/ui/feature-gates/feature-gate-adt_const_params.rs
index 8a3bcf259..8a3bcf259 100644
--- a/src/test/ui/feature-gates/feature-gate-adt_const_params.rs
+++ b/tests/ui/feature-gates/feature-gate-adt_const_params.rs
diff --git a/src/test/ui/feature-gates/feature-gate-adt_const_params.stderr b/tests/ui/feature-gates/feature-gate-adt_const_params.stderr
index d8f089a28..d8f089a28 100644
--- a/src/test/ui/feature-gates/feature-gate-adt_const_params.stderr
+++ b/tests/ui/feature-gates/feature-gate-adt_const_params.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-alloc-error-handler.rs b/tests/ui/feature-gates/feature-gate-alloc-error-handler.rs
index 78d189d20..78d189d20 100644
--- a/src/test/ui/feature-gates/feature-gate-alloc-error-handler.rs
+++ b/tests/ui/feature-gates/feature-gate-alloc-error-handler.rs
diff --git a/src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr b/tests/ui/feature-gates/feature-gate-alloc-error-handler.stderr
index f414eb463..f414eb463 100644
--- a/src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr
+++ b/tests/ui/feature-gates/feature-gate-alloc-error-handler.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-allocator_internals.rs b/tests/ui/feature-gates/feature-gate-allocator_internals.rs
index a17d17da6..a17d17da6 100644
--- a/src/test/ui/feature-gates/feature-gate-allocator_internals.rs
+++ b/tests/ui/feature-gates/feature-gate-allocator_internals.rs
diff --git a/src/test/ui/feature-gates/feature-gate-allocator_internals.stderr b/tests/ui/feature-gates/feature-gate-allocator_internals.stderr
index 6e276f7bc..6e276f7bc 100644
--- a/src/test/ui/feature-gates/feature-gate-allocator_internals.stderr
+++ b/tests/ui/feature-gates/feature-gate-allocator_internals.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.rs b/tests/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.rs
index 9f604aafd..9f604aafd 100644
--- a/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.rs
+++ b/tests/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.rs
diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr b/tests/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr
index 4621bc0b3..4621bc0b3 100644
--- a/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr
+++ b/tests/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.rs b/tests/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.rs
index ee48f9516..ee48f9516 100644
--- a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.rs
+++ b/tests/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.rs
diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr b/tests/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr
index 1232d13a4..1232d13a4 100644
--- a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr
+++ b/tests/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.rs b/tests/ui/feature-gates/feature-gate-allow-internal-unstable-struct.rs
index 8b13f1bf2..8b13f1bf2 100644
--- a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.rs
+++ b/tests/ui/feature-gates/feature-gate-allow-internal-unstable-struct.rs
diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.stderr b/tests/ui/feature-gates/feature-gate-allow-internal-unstable-struct.stderr
index df7773ba4..df7773ba4 100644
--- a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.stderr
+++ b/tests/ui/feature-gates/feature-gate-allow-internal-unstable-struct.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.rs b/tests/ui/feature-gates/feature-gate-allow-internal-unstable.rs
index 0a1b6acd9..0a1b6acd9 100644
--- a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.rs
+++ b/tests/ui/feature-gates/feature-gate-allow-internal-unstable.rs
diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.stderr b/tests/ui/feature-gates/feature-gate-allow-internal-unstable.stderr
index 3c1a4bfc7..3c1a4bfc7 100644
--- a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.stderr
+++ b/tests/ui/feature-gates/feature-gate-allow-internal-unstable.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.rs b/tests/ui/feature-gates/feature-gate-arbitrary-self-types.rs
index 47ca7e349..47ca7e349 100644
--- a/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.rs
+++ b/tests/ui/feature-gates/feature-gate-arbitrary-self-types.rs
diff --git a/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.stderr b/tests/ui/feature-gates/feature-gate-arbitrary-self-types.stderr
index a1c69a5af..a1c69a5af 100644
--- a/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.stderr
+++ b/tests/ui/feature-gates/feature-gate-arbitrary-self-types.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.rs b/tests/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.rs
index f7e94117e..f7e94117e 100644
--- a/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.rs
+++ b/tests/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.rs
diff --git a/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr b/tests/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr
index a9f611b87..a9f611b87 100644
--- a/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr
+++ b/tests/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-asm_const.rs b/tests/ui/feature-gates/feature-gate-asm_const.rs
index 936918a3c..936918a3c 100644
--- a/src/test/ui/feature-gates/feature-gate-asm_const.rs
+++ b/tests/ui/feature-gates/feature-gate-asm_const.rs
diff --git a/src/test/ui/feature-gates/feature-gate-asm_const.stderr b/tests/ui/feature-gates/feature-gate-asm_const.stderr
index c248374ec..c248374ec 100644
--- a/src/test/ui/feature-gates/feature-gate-asm_const.stderr
+++ b/tests/ui/feature-gates/feature-gate-asm_const.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-asm_experimental_arch.rs b/tests/ui/feature-gates/feature-gate-asm_experimental_arch.rs
index 53e2a4d13..53e2a4d13 100644
--- a/src/test/ui/feature-gates/feature-gate-asm_experimental_arch.rs
+++ b/tests/ui/feature-gates/feature-gate-asm_experimental_arch.rs
diff --git a/src/test/ui/feature-gates/feature-gate-asm_experimental_arch.stderr b/tests/ui/feature-gates/feature-gate-asm_experimental_arch.stderr
index 4a859430e..4a859430e 100644
--- a/src/test/ui/feature-gates/feature-gate-asm_experimental_arch.stderr
+++ b/tests/ui/feature-gates/feature-gate-asm_experimental_arch.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-asm_unwind.rs b/tests/ui/feature-gates/feature-gate-asm_unwind.rs
index df161b600..df161b600 100644
--- a/src/test/ui/feature-gates/feature-gate-asm_unwind.rs
+++ b/tests/ui/feature-gates/feature-gate-asm_unwind.rs
diff --git a/src/test/ui/feature-gates/feature-gate-asm_unwind.stderr b/tests/ui/feature-gates/feature-gate-asm_unwind.stderr
index 05e66acb5..05e66acb5 100644
--- a/src/test/ui/feature-gates/feature-gate-asm_unwind.stderr
+++ b/tests/ui/feature-gates/feature-gate-asm_unwind.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.rs b/tests/ui/feature-gates/feature-gate-assoc-type-defaults.rs
index d7c6a9f97..d7c6a9f97 100644
--- a/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.rs
+++ b/tests/ui/feature-gates/feature-gate-assoc-type-defaults.rs
diff --git a/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.stderr b/tests/ui/feature-gates/feature-gate-assoc-type-defaults.stderr
index 9edad6153..9edad6153 100644
--- a/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.stderr
+++ b/tests/ui/feature-gates/feature-gate-assoc-type-defaults.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-associated_const_equality.rs b/tests/ui/feature-gates/feature-gate-associated_const_equality.rs
index 2534c527b..2534c527b 100644
--- a/src/test/ui/feature-gates/feature-gate-associated_const_equality.rs
+++ b/tests/ui/feature-gates/feature-gate-associated_const_equality.rs
diff --git a/src/test/ui/feature-gates/feature-gate-associated_const_equality.stderr b/tests/ui/feature-gates/feature-gate-associated_const_equality.stderr
index 6563fbcba..6563fbcba 100644
--- a/src/test/ui/feature-gates/feature-gate-associated_const_equality.stderr
+++ b/tests/ui/feature-gates/feature-gate-associated_const_equality.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-associated_type_bounds.rs b/tests/ui/feature-gates/feature-gate-associated_type_bounds.rs
index 4e0203274..4e0203274 100644
--- a/src/test/ui/feature-gates/feature-gate-associated_type_bounds.rs
+++ b/tests/ui/feature-gates/feature-gate-associated_type_bounds.rs
diff --git a/src/test/ui/feature-gates/feature-gate-associated_type_bounds.stderr b/tests/ui/feature-gates/feature-gate-associated_type_bounds.stderr
index 5be1d97a0..5be1d97a0 100644
--- a/src/test/ui/feature-gates/feature-gate-associated_type_bounds.stderr
+++ b/tests/ui/feature-gates/feature-gate-associated_type_bounds.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-auto-traits.rs b/tests/ui/feature-gates/feature-gate-auto-traits.rs
index 80cfa9cee..80cfa9cee 100644
--- a/src/test/ui/feature-gates/feature-gate-auto-traits.rs
+++ b/tests/ui/feature-gates/feature-gate-auto-traits.rs
diff --git a/src/test/ui/feature-gates/feature-gate-auto-traits.stderr b/tests/ui/feature-gates/feature-gate-auto-traits.stderr
index e01541816..e01541816 100644
--- a/src/test/ui/feature-gates/feature-gate-auto-traits.stderr
+++ b/tests/ui/feature-gates/feature-gate-auto-traits.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-box-expr.rs b/tests/ui/feature-gates/feature-gate-box-expr.rs
index 870253d2f..870253d2f 100644
--- a/src/test/ui/feature-gates/feature-gate-box-expr.rs
+++ b/tests/ui/feature-gates/feature-gate-box-expr.rs
diff --git a/src/test/ui/feature-gates/feature-gate-box-expr.stderr b/tests/ui/feature-gates/feature-gate-box-expr.stderr
index af864b25f..af864b25f 100644
--- a/src/test/ui/feature-gates/feature-gate-box-expr.stderr
+++ b/tests/ui/feature-gates/feature-gate-box-expr.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-box_patterns.rs b/tests/ui/feature-gates/feature-gate-box_patterns.rs
index 8bec16a97..8bec16a97 100644
--- a/src/test/ui/feature-gates/feature-gate-box_patterns.rs
+++ b/tests/ui/feature-gates/feature-gate-box_patterns.rs
diff --git a/src/test/ui/feature-gates/feature-gate-box_patterns.stderr b/tests/ui/feature-gates/feature-gate-box_patterns.stderr
index 601ec46a4..601ec46a4 100644
--- a/src/test/ui/feature-gates/feature-gate-box_patterns.stderr
+++ b/tests/ui/feature-gates/feature-gate-box_patterns.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-box_syntax.rs b/tests/ui/feature-gates/feature-gate-box_syntax.rs
index 778660cc0..778660cc0 100644
--- a/src/test/ui/feature-gates/feature-gate-box_syntax.rs
+++ b/tests/ui/feature-gates/feature-gate-box_syntax.rs
diff --git a/src/test/ui/feature-gates/feature-gate-box_syntax.stderr b/tests/ui/feature-gates/feature-gate-box_syntax.stderr
index dcf8eeed7..dcf8eeed7 100644
--- a/src/test/ui/feature-gates/feature-gate-box_syntax.stderr
+++ b/tests/ui/feature-gates/feature-gate-box_syntax.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-c_variadic.rs b/tests/ui/feature-gates/feature-gate-c_variadic.rs
index 8b40c36c7..8b40c36c7 100644
--- a/src/test/ui/feature-gates/feature-gate-c_variadic.rs
+++ b/tests/ui/feature-gates/feature-gate-c_variadic.rs
diff --git a/src/test/ui/feature-gates/feature-gate-c_variadic.stderr b/tests/ui/feature-gates/feature-gate-c_variadic.stderr
index 7b3af8d99..7b3af8d99 100644
--- a/src/test/ui/feature-gates/feature-gate-c_variadic.stderr
+++ b/tests/ui/feature-gates/feature-gate-c_variadic.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-abi.rs b/tests/ui/feature-gates/feature-gate-cfg-target-abi.rs
index d005dc3ad..d005dc3ad 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-target-abi.rs
+++ b/tests/ui/feature-gates/feature-gate-cfg-target-abi.rs
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-abi.stderr b/tests/ui/feature-gates/feature-gate-cfg-target-abi.stderr
index 013705d48..013705d48 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-target-abi.stderr
+++ b/tests/ui/feature-gates/feature-gate-cfg-target-abi.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-compact.rs b/tests/ui/feature-gates/feature-gate-cfg-target-compact.rs
index df81b7d22..df81b7d22 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-target-compact.rs
+++ b/tests/ui/feature-gates/feature-gate-cfg-target-compact.rs
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-compact.stderr b/tests/ui/feature-gates/feature-gate-cfg-target-compact.stderr
index be6fe23de..be6fe23de 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-target-compact.stderr
+++ b/tests/ui/feature-gates/feature-gate-cfg-target-compact.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic-equal-alignment.rs b/tests/ui/feature-gates/feature-gate-cfg-target-has-atomic-equal-alignment.rs
index 3d692a070..3d692a070 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic-equal-alignment.rs
+++ b/tests/ui/feature-gates/feature-gate-cfg-target-has-atomic-equal-alignment.rs
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic-equal-alignment.stderr b/tests/ui/feature-gates/feature-gate-cfg-target-has-atomic-equal-alignment.stderr
index 8ad3b034a..8ad3b034a 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic-equal-alignment.stderr
+++ b/tests/ui/feature-gates/feature-gate-cfg-target-has-atomic-equal-alignment.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.rs b/tests/ui/feature-gates/feature-gate-cfg-target-has-atomic.rs
index df9c51cb1..df9c51cb1 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.rs
+++ b/tests/ui/feature-gates/feature-gate-cfg-target-has-atomic.rs
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr b/tests/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr
index b9e6830a9..b9e6830a9 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr
+++ b/tests/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.rs b/tests/ui/feature-gates/feature-gate-cfg-target-thread-local.rs
index b600ad23e..b600ad23e 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.rs
+++ b/tests/ui/feature-gates/feature-gate-cfg-target-thread-local.rs
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr b/tests/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr
index af59c7141..af59c7141 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr
+++ b/tests/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-version.rs b/tests/ui/feature-gates/feature-gate-cfg-version.rs
index e35784a68..e35784a68 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-version.rs
+++ b/tests/ui/feature-gates/feature-gate-cfg-version.rs
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-version.stderr b/tests/ui/feature-gates/feature-gate-cfg-version.stderr
index ae899d409..ae899d409 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-version.stderr
+++ b/tests/ui/feature-gates/feature-gate-cfg-version.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-cfg_sanitize.rs b/tests/ui/feature-gates/feature-gate-cfg_sanitize.rs
index c3e7cc9ed..c3e7cc9ed 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg_sanitize.rs
+++ b/tests/ui/feature-gates/feature-gate-cfg_sanitize.rs
diff --git a/src/test/ui/feature-gates/feature-gate-cfg_sanitize.stderr b/tests/ui/feature-gates/feature-gate-cfg_sanitize.stderr
index 8088585da..8088585da 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg_sanitize.stderr
+++ b/tests/ui/feature-gates/feature-gate-cfg_sanitize.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-check-cfg.rs b/tests/ui/feature-gates/feature-gate-check-cfg.rs
index 4012a3b04..4012a3b04 100644
--- a/src/test/ui/feature-gates/feature-gate-check-cfg.rs
+++ b/tests/ui/feature-gates/feature-gate-check-cfg.rs
diff --git a/src/test/ui/feature-gates/feature-gate-check-cfg.stderr b/tests/ui/feature-gates/feature-gate-check-cfg.stderr
index 9b27c2bc0..9b27c2bc0 100644
--- a/src/test/ui/feature-gates/feature-gate-check-cfg.stderr
+++ b/tests/ui/feature-gates/feature-gate-check-cfg.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-closure_lifetime_binder.rs b/tests/ui/feature-gates/feature-gate-closure_lifetime_binder.rs
index b0b494fa3..b0b494fa3 100644
--- a/src/test/ui/feature-gates/feature-gate-closure_lifetime_binder.rs
+++ b/tests/ui/feature-gates/feature-gate-closure_lifetime_binder.rs
diff --git a/src/test/ui/feature-gates/feature-gate-closure_lifetime_binder.stderr b/tests/ui/feature-gates/feature-gate-closure_lifetime_binder.stderr
index aea5cfeed..aea5cfeed 100644
--- a/src/test/ui/feature-gates/feature-gate-closure_lifetime_binder.stderr
+++ b/tests/ui/feature-gates/feature-gate-closure_lifetime_binder.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-closure_track_caller.rs b/tests/ui/feature-gates/feature-gate-closure_track_caller.rs
index a8d63a814..a8d63a814 100644
--- a/src/test/ui/feature-gates/feature-gate-closure_track_caller.rs
+++ b/tests/ui/feature-gates/feature-gate-closure_track_caller.rs
diff --git a/src/test/ui/feature-gates/feature-gate-closure_track_caller.stderr b/tests/ui/feature-gates/feature-gate-closure_track_caller.stderr
index ed63d74fe..ed63d74fe 100644
--- a/src/test/ui/feature-gates/feature-gate-closure_track_caller.stderr
+++ b/tests/ui/feature-gates/feature-gate-closure_track_caller.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-collapse_debuginfo.rs b/tests/ui/feature-gates/feature-gate-collapse_debuginfo.rs
index f73bf579f..f73bf579f 100644
--- a/src/test/ui/feature-gates/feature-gate-collapse_debuginfo.rs
+++ b/tests/ui/feature-gates/feature-gate-collapse_debuginfo.rs
diff --git a/src/test/ui/feature-gates/feature-gate-collapse_debuginfo.stderr b/tests/ui/feature-gates/feature-gate-collapse_debuginfo.stderr
index 2cbde893a..2cbde893a 100644
--- a/src/test/ui/feature-gates/feature-gate-collapse_debuginfo.stderr
+++ b/tests/ui/feature-gates/feature-gate-collapse_debuginfo.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-compiler-builtins.rs b/tests/ui/feature-gates/feature-gate-compiler-builtins.rs
index 0d64f1fdc..0d64f1fdc 100644
--- a/src/test/ui/feature-gates/feature-gate-compiler-builtins.rs
+++ b/tests/ui/feature-gates/feature-gate-compiler-builtins.rs
diff --git a/src/test/ui/feature-gates/feature-gate-compiler-builtins.stderr b/tests/ui/feature-gates/feature-gate-compiler-builtins.stderr
index 9d04aef86..9d04aef86 100644
--- a/src/test/ui/feature-gates/feature-gate-compiler-builtins.stderr
+++ b/tests/ui/feature-gates/feature-gate-compiler-builtins.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-concat_bytes.rs b/tests/ui/feature-gates/feature-gate-concat_bytes.rs
index 07d63cb11..07d63cb11 100644
--- a/src/test/ui/feature-gates/feature-gate-concat_bytes.rs
+++ b/tests/ui/feature-gates/feature-gate-concat_bytes.rs
diff --git a/src/test/ui/feature-gates/feature-gate-concat_bytes.stderr b/tests/ui/feature-gates/feature-gate-concat_bytes.stderr
index 4b3ee4c19..4b3ee4c19 100644
--- a/src/test/ui/feature-gates/feature-gate-concat_bytes.stderr
+++ b/tests/ui/feature-gates/feature-gate-concat_bytes.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents.rs b/tests/ui/feature-gates/feature-gate-concat_idents.rs
index 68caf3d71..68caf3d71 100644
--- a/src/test/ui/feature-gates/feature-gate-concat_idents.rs
+++ b/tests/ui/feature-gates/feature-gate-concat_idents.rs
diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents.stderr b/tests/ui/feature-gates/feature-gate-concat_idents.stderr
index 0454fd494..0454fd494 100644
--- a/src/test/ui/feature-gates/feature-gate-concat_idents.stderr
+++ b/tests/ui/feature-gates/feature-gate-concat_idents.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents2.rs b/tests/ui/feature-gates/feature-gate-concat_idents2.rs
index 9660ffeaf..9660ffeaf 100644
--- a/src/test/ui/feature-gates/feature-gate-concat_idents2.rs
+++ b/tests/ui/feature-gates/feature-gate-concat_idents2.rs
diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents2.stderr b/tests/ui/feature-gates/feature-gate-concat_idents2.stderr
index 8663bc7ca..8663bc7ca 100644
--- a/src/test/ui/feature-gates/feature-gate-concat_idents2.stderr
+++ b/tests/ui/feature-gates/feature-gate-concat_idents2.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents3.rs b/tests/ui/feature-gates/feature-gate-concat_idents3.rs
index 81710fd9f..81710fd9f 100644
--- a/src/test/ui/feature-gates/feature-gate-concat_idents3.rs
+++ b/tests/ui/feature-gates/feature-gate-concat_idents3.rs
diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents3.stderr b/tests/ui/feature-gates/feature-gate-concat_idents3.stderr
index 1316107a3..1316107a3 100644
--- a/src/test/ui/feature-gates/feature-gate-concat_idents3.stderr
+++ b/tests/ui/feature-gates/feature-gate-concat_idents3.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-const-indexing.rs b/tests/ui/feature-gates/feature-gate-const-indexing.rs
index 2b1067b34..2b1067b34 100644
--- a/src/test/ui/feature-gates/feature-gate-const-indexing.rs
+++ b/tests/ui/feature-gates/feature-gate-const-indexing.rs
diff --git a/src/test/ui/feature-gates/feature-gate-const_refs_to_cell.rs b/tests/ui/feature-gates/feature-gate-const_refs_to_cell.rs
index 63159ed05..63159ed05 100644
--- a/src/test/ui/feature-gates/feature-gate-const_refs_to_cell.rs
+++ b/tests/ui/feature-gates/feature-gate-const_refs_to_cell.rs
diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute.rs b/tests/ui/feature-gates/feature-gate-custom_attribute.rs
index 936cab268..936cab268 100644
--- a/src/test/ui/feature-gates/feature-gate-custom_attribute.rs
+++ b/tests/ui/feature-gates/feature-gate-custom_attribute.rs
diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr b/tests/ui/feature-gates/feature-gate-custom_attribute.stderr
index b7c45ec1f..b7c45ec1f 100644
--- a/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr
+++ b/tests/ui/feature-gates/feature-gate-custom_attribute.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs b/tests/ui/feature-gates/feature-gate-custom_attribute2.rs
index 724e53deb..724e53deb 100644
--- a/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs
+++ b/tests/ui/feature-gates/feature-gate-custom_attribute2.rs
diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr b/tests/ui/feature-gates/feature-gate-custom_attribute2.stderr
index f22871117..f22871117 100644
--- a/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr
+++ b/tests/ui/feature-gates/feature-gate-custom_attribute2.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-custom_mir.rs b/tests/ui/feature-gates/feature-gate-custom_mir.rs
index 0126dde2f..0126dde2f 100644
--- a/src/test/ui/feature-gates/feature-gate-custom_mir.rs
+++ b/tests/ui/feature-gates/feature-gate-custom_mir.rs
diff --git a/src/test/ui/feature-gates/feature-gate-custom_mir.stderr b/tests/ui/feature-gates/feature-gate-custom_mir.stderr
index 3c149d30d..3c149d30d 100644
--- a/src/test/ui/feature-gates/feature-gate-custom_mir.stderr
+++ b/tests/ui/feature-gates/feature-gate-custom_mir.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-custom_test_frameworks.rs b/tests/ui/feature-gates/feature-gate-custom_test_frameworks.rs
index 83bb153ba..83bb153ba 100644
--- a/src/test/ui/feature-gates/feature-gate-custom_test_frameworks.rs
+++ b/tests/ui/feature-gates/feature-gate-custom_test_frameworks.rs
diff --git a/src/test/ui/feature-gates/feature-gate-custom_test_frameworks.stderr b/tests/ui/feature-gates/feature-gate-custom_test_frameworks.stderr
index b65b009a3..b65b009a3 100644
--- a/src/test/ui/feature-gates/feature-gate-custom_test_frameworks.stderr
+++ b/tests/ui/feature-gates/feature-gate-custom_test_frameworks.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-debugger-visualizer.rs b/tests/ui/feature-gates/feature-gate-debugger-visualizer.rs
index 4c4dc450d..4c4dc450d 100644
--- a/src/test/ui/feature-gates/feature-gate-debugger-visualizer.rs
+++ b/tests/ui/feature-gates/feature-gate-debugger-visualizer.rs
diff --git a/src/test/ui/feature-gates/feature-gate-debugger-visualizer.stderr b/tests/ui/feature-gates/feature-gate-debugger-visualizer.stderr
index e9367fbc6..e9367fbc6 100644
--- a/src/test/ui/feature-gates/feature-gate-debugger-visualizer.stderr
+++ b/tests/ui/feature-gates/feature-gate-debugger-visualizer.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-decl_macro.rs b/tests/ui/feature-gates/feature-gate-decl_macro.rs
index d002c5dbb..d002c5dbb 100644
--- a/src/test/ui/feature-gates/feature-gate-decl_macro.rs
+++ b/tests/ui/feature-gates/feature-gate-decl_macro.rs
diff --git a/src/test/ui/feature-gates/feature-gate-decl_macro.stderr b/tests/ui/feature-gates/feature-gate-decl_macro.stderr
index 800caf252..800caf252 100644
--- a/src/test/ui/feature-gates/feature-gate-decl_macro.stderr
+++ b/tests/ui/feature-gates/feature-gate-decl_macro.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.rs b/tests/ui/feature-gates/feature-gate-default_type_parameter_fallback.rs
index 33038e24b..33038e24b 100644
--- a/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.rs
+++ b/tests/ui/feature-gates/feature-gate-default_type_parameter_fallback.rs
diff --git a/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr b/tests/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr
index 308de2692..308de2692 100644
--- a/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr
+++ b/tests/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-deprecated_safe.rs b/tests/ui/feature-gates/feature-gate-deprecated_safe.rs
index d5f4a4705..d5f4a4705 100644
--- a/src/test/ui/feature-gates/feature-gate-deprecated_safe.rs
+++ b/tests/ui/feature-gates/feature-gate-deprecated_safe.rs
diff --git a/src/test/ui/feature-gates/feature-gate-deprecated_safe.stderr b/tests/ui/feature-gates/feature-gate-deprecated_safe.stderr
index 5e98a1faa..5e98a1faa 100644
--- a/src/test/ui/feature-gates/feature-gate-deprecated_safe.stderr
+++ b/tests/ui/feature-gates/feature-gate-deprecated_safe.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-doc_cfg.rs b/tests/ui/feature-gates/feature-gate-doc_cfg.rs
index b12b8a105..b12b8a105 100644
--- a/src/test/ui/feature-gates/feature-gate-doc_cfg.rs
+++ b/tests/ui/feature-gates/feature-gate-doc_cfg.rs
diff --git a/src/test/ui/feature-gates/feature-gate-doc_cfg.stderr b/tests/ui/feature-gates/feature-gate-doc_cfg.stderr
index fe88e08c1..fe88e08c1 100644
--- a/src/test/ui/feature-gates/feature-gate-doc_cfg.stderr
+++ b/tests/ui/feature-gates/feature-gate-doc_cfg.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-doc_masked.rs b/tests/ui/feature-gates/feature-gate-doc_masked.rs
index bde3af6b5..bde3af6b5 100644
--- a/src/test/ui/feature-gates/feature-gate-doc_masked.rs
+++ b/tests/ui/feature-gates/feature-gate-doc_masked.rs
diff --git a/src/test/ui/feature-gates/feature-gate-doc_masked.stderr b/tests/ui/feature-gates/feature-gate-doc_masked.stderr
index 80522b6ee..80522b6ee 100644
--- a/src/test/ui/feature-gates/feature-gate-doc_masked.stderr
+++ b/tests/ui/feature-gates/feature-gate-doc_masked.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-doc_notable_trait.rs b/tests/ui/feature-gates/feature-gate-doc_notable_trait.rs
index 7f3392ead..7f3392ead 100644
--- a/src/test/ui/feature-gates/feature-gate-doc_notable_trait.rs
+++ b/tests/ui/feature-gates/feature-gate-doc_notable_trait.rs
diff --git a/src/test/ui/feature-gates/feature-gate-doc_notable_trait.stderr b/tests/ui/feature-gates/feature-gate-doc_notable_trait.stderr
index 1f9bef40c..1f9bef40c 100644
--- a/src/test/ui/feature-gates/feature-gate-doc_notable_trait.stderr
+++ b/tests/ui/feature-gates/feature-gate-doc_notable_trait.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.rs b/tests/ui/feature-gates/feature-gate-exclusive-range-pattern.rs
index ded08b93f..ded08b93f 100644
--- a/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.rs
+++ b/tests/ui/feature-gates/feature-gate-exclusive-range-pattern.rs
diff --git a/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr b/tests/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr
index 6d7f4844a..6d7f4844a 100644
--- a/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr
+++ b/tests/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.rs b/tests/ui/feature-gates/feature-gate-exhaustive-patterns.rs
index f0cc9ea70..f0cc9ea70 100644
--- a/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.rs
+++ b/tests/ui/feature-gates/feature-gate-exhaustive-patterns.rs
diff --git a/tests/ui/feature-gates/feature-gate-exhaustive-patterns.stderr b/tests/ui/feature-gates/feature-gate-exhaustive-patterns.stderr
new file mode 100644
index 000000000..49e7ab608
--- /dev/null
+++ b/tests/ui/feature-gates/feature-gate-exhaustive-patterns.stderr
@@ -0,0 +1,17 @@
+error[E0005]: refutable pattern in local binding
+  --> $DIR/feature-gate-exhaustive-patterns.rs:8:9
+   |
+LL |     let Ok(_x) = foo();
+   |         ^^^^^^ pattern `Err(_)` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+   = note: the matched value is of type `Result<u32, !>`
+help: you might want to use `let else` to handle the variant that isn't matched
+   |
+LL |     let Ok(_x) = foo() else { todo!() };
+   |                        ++++++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.rs b/tests/ui/feature-gates/feature-gate-extern_absolute_paths.rs
index cff273ce2..cff273ce2 100644
--- a/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.rs
+++ b/tests/ui/feature-gates/feature-gate-extern_absolute_paths.rs
diff --git a/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.stderr b/tests/ui/feature-gates/feature-gate-extern_absolute_paths.stderr
index 3bae23a4a..3bae23a4a 100644
--- a/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.stderr
+++ b/tests/ui/feature-gates/feature-gate-extern_absolute_paths.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-extern_prelude.rs b/tests/ui/feature-gates/feature-gate-extern_prelude.rs
index 237099e79..237099e79 100644
--- a/src/test/ui/feature-gates/feature-gate-extern_prelude.rs
+++ b/tests/ui/feature-gates/feature-gate-extern_prelude.rs
diff --git a/src/test/ui/feature-gates/feature-gate-extern_prelude.stderr b/tests/ui/feature-gates/feature-gate-extern_prelude.stderr
index d72e47e9e..d72e47e9e 100644
--- a/src/test/ui/feature-gates/feature-gate-extern_prelude.stderr
+++ b/tests/ui/feature-gates/feature-gate-extern_prelude.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-extern_types.rs b/tests/ui/feature-gates/feature-gate-extern_types.rs
index 103f8eed6..103f8eed6 100644
--- a/src/test/ui/feature-gates/feature-gate-extern_types.rs
+++ b/tests/ui/feature-gates/feature-gate-extern_types.rs
diff --git a/src/test/ui/feature-gates/feature-gate-extern_types.stderr b/tests/ui/feature-gates/feature-gate-extern_types.stderr
index 923fae400..923fae400 100644
--- a/src/test/ui/feature-gates/feature-gate-extern_types.stderr
+++ b/tests/ui/feature-gates/feature-gate-extern_types.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-feature-gate.rs b/tests/ui/feature-gates/feature-gate-feature-gate.rs
index 3c98e16a1..3c98e16a1 100644
--- a/src/test/ui/feature-gates/feature-gate-feature-gate.rs
+++ b/tests/ui/feature-gates/feature-gate-feature-gate.rs
diff --git a/src/test/ui/feature-gates/feature-gate-feature-gate.stderr b/tests/ui/feature-gates/feature-gate-feature-gate.stderr
index ad97741da..ad97741da 100644
--- a/src/test/ui/feature-gates/feature-gate-feature-gate.stderr
+++ b/tests/ui/feature-gates/feature-gate-feature-gate.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-ffi_const.rs b/tests/ui/feature-gates/feature-gate-ffi_const.rs
index 9f3d783cc..9f3d783cc 100644
--- a/src/test/ui/feature-gates/feature-gate-ffi_const.rs
+++ b/tests/ui/feature-gates/feature-gate-ffi_const.rs
diff --git a/src/test/ui/feature-gates/feature-gate-ffi_const.stderr b/tests/ui/feature-gates/feature-gate-ffi_const.stderr
index bed6a2ce4..bed6a2ce4 100644
--- a/src/test/ui/feature-gates/feature-gate-ffi_const.stderr
+++ b/tests/ui/feature-gates/feature-gate-ffi_const.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-ffi_pure.rs b/tests/ui/feature-gates/feature-gate-ffi_pure.rs
index b0dfa01ff..b0dfa01ff 100644
--- a/src/test/ui/feature-gates/feature-gate-ffi_pure.rs
+++ b/tests/ui/feature-gates/feature-gate-ffi_pure.rs
diff --git a/src/test/ui/feature-gates/feature-gate-ffi_pure.stderr b/tests/ui/feature-gates/feature-gate-ffi_pure.stderr
index 2b0308fd6..2b0308fd6 100644
--- a/src/test/ui/feature-gates/feature-gate-ffi_pure.stderr
+++ b/tests/ui/feature-gates/feature-gate-ffi_pure.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-ffi_returns_twice.rs b/tests/ui/feature-gates/feature-gate-ffi_returns_twice.rs
index f35453435..f35453435 100644
--- a/src/test/ui/feature-gates/feature-gate-ffi_returns_twice.rs
+++ b/tests/ui/feature-gates/feature-gate-ffi_returns_twice.rs
diff --git a/src/test/ui/feature-gates/feature-gate-ffi_returns_twice.stderr b/tests/ui/feature-gates/feature-gate-ffi_returns_twice.stderr
index 3585355ab..3585355ab 100644
--- a/src/test/ui/feature-gates/feature-gate-ffi_returns_twice.stderr
+++ b/tests/ui/feature-gates/feature-gate-ffi_returns_twice.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-fn_align.rs b/tests/ui/feature-gates/feature-gate-fn_align.rs
index ea873dba2..ea873dba2 100644
--- a/src/test/ui/feature-gates/feature-gate-fn_align.rs
+++ b/tests/ui/feature-gates/feature-gate-fn_align.rs
diff --git a/src/test/ui/feature-gates/feature-gate-fn_align.stderr b/tests/ui/feature-gates/feature-gate-fn_align.stderr
index 5ff124e48..5ff124e48 100644
--- a/src/test/ui/feature-gates/feature-gate-fn_align.stderr
+++ b/tests/ui/feature-gates/feature-gate-fn_align.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-format_args_nl.rs b/tests/ui/feature-gates/feature-gate-format_args_nl.rs
index aeee2fbad..aeee2fbad 100644
--- a/src/test/ui/feature-gates/feature-gate-format_args_nl.rs
+++ b/tests/ui/feature-gates/feature-gate-format_args_nl.rs
diff --git a/src/test/ui/feature-gates/feature-gate-format_args_nl.stderr b/tests/ui/feature-gates/feature-gate-format_args_nl.stderr
index b211e2f8e..b211e2f8e 100644
--- a/src/test/ui/feature-gates/feature-gate-format_args_nl.stderr
+++ b/tests/ui/feature-gates/feature-gate-format_args_nl.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-fundamental.rs b/tests/ui/feature-gates/feature-gate-fundamental.rs
index 70e013392..70e013392 100644
--- a/src/test/ui/feature-gates/feature-gate-fundamental.rs
+++ b/tests/ui/feature-gates/feature-gate-fundamental.rs
diff --git a/src/test/ui/feature-gates/feature-gate-fundamental.stderr b/tests/ui/feature-gates/feature-gate-fundamental.stderr
index 1ae8d9128..1ae8d9128 100644
--- a/src/test/ui/feature-gates/feature-gate-fundamental.stderr
+++ b/tests/ui/feature-gates/feature-gate-fundamental.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-generators.rs b/tests/ui/feature-gates/feature-gate-generators.rs
index 931fee134..931fee134 100644
--- a/src/test/ui/feature-gates/feature-gate-generators.rs
+++ b/tests/ui/feature-gates/feature-gate-generators.rs
diff --git a/src/test/ui/feature-gates/feature-gate-generators.stderr b/tests/ui/feature-gates/feature-gate-generators.stderr
index dfea178a6..dfea178a6 100644
--- a/src/test/ui/feature-gates/feature-gate-generators.stderr
+++ b/tests/ui/feature-gates/feature-gate-generators.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-generic_arg_infer.normal.stderr b/tests/ui/feature-gates/feature-gate-generic_arg_infer.normal.stderr
index 56123a983..56123a983 100644
--- a/src/test/ui/feature-gates/feature-gate-generic_arg_infer.normal.stderr
+++ b/tests/ui/feature-gates/feature-gate-generic_arg_infer.normal.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-generic_arg_infer.rs b/tests/ui/feature-gates/feature-gate-generic_arg_infer.rs
index afd14b784..afd14b784 100644
--- a/src/test/ui/feature-gates/feature-gate-generic_arg_infer.rs
+++ b/tests/ui/feature-gates/feature-gate-generic_arg_infer.rs
diff --git a/src/test/ui/feature-gates/feature-gate-generic_associated_types_extended.rs b/tests/ui/feature-gates/feature-gate-generic_associated_types_extended.rs
index 7842d44ac..7842d44ac 100644
--- a/src/test/ui/feature-gates/feature-gate-generic_associated_types_extended.rs
+++ b/tests/ui/feature-gates/feature-gate-generic_associated_types_extended.rs
diff --git a/src/test/ui/feature-gates/feature-gate-generic_associated_types_extended.stderr b/tests/ui/feature-gates/feature-gate-generic_associated_types_extended.stderr
index bb1622628..bb1622628 100644
--- a/src/test/ui/feature-gates/feature-gate-generic_associated_types_extended.stderr
+++ b/tests/ui/feature-gates/feature-gate-generic_associated_types_extended.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-impl_trait_in_fn_trait_return.rs b/tests/ui/feature-gates/feature-gate-impl_trait_in_fn_trait_return.rs
index 0db8088f7..0db8088f7 100644
--- a/src/test/ui/feature-gates/feature-gate-impl_trait_in_fn_trait_return.rs
+++ b/tests/ui/feature-gates/feature-gate-impl_trait_in_fn_trait_return.rs
diff --git a/src/test/ui/feature-gates/feature-gate-impl_trait_in_fn_trait_return.stderr b/tests/ui/feature-gates/feature-gate-impl_trait_in_fn_trait_return.stderr
index 760dcb615..760dcb615 100644
--- a/src/test/ui/feature-gates/feature-gate-impl_trait_in_fn_trait_return.stderr
+++ b/tests/ui/feature-gates/feature-gate-impl_trait_in_fn_trait_return.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-imported_main.rs b/tests/ui/feature-gates/feature-gate-imported_main.rs
index b351d0d0e..b351d0d0e 100644
--- a/src/test/ui/feature-gates/feature-gate-imported_main.rs
+++ b/tests/ui/feature-gates/feature-gate-imported_main.rs
diff --git a/src/test/ui/feature-gates/feature-gate-imported_main.stderr b/tests/ui/feature-gates/feature-gate-imported_main.stderr
index 3b879fdfc..3b879fdfc 100644
--- a/src/test/ui/feature-gates/feature-gate-imported_main.stderr
+++ b/tests/ui/feature-gates/feature-gate-imported_main.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-inherent_associated_types.rs b/tests/ui/feature-gates/feature-gate-inherent_associated_types.rs
index fc7c6dbc0..fc7c6dbc0 100644
--- a/src/test/ui/feature-gates/feature-gate-inherent_associated_types.rs
+++ b/tests/ui/feature-gates/feature-gate-inherent_associated_types.rs
diff --git a/src/test/ui/feature-gates/feature-gate-inherent_associated_types.stderr b/tests/ui/feature-gates/feature-gate-inherent_associated_types.stderr
index 76e65d239..76e65d239 100644
--- a/src/test/ui/feature-gates/feature-gate-inherent_associated_types.stderr
+++ b/tests/ui/feature-gates/feature-gate-inherent_associated_types.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-inline_const.rs b/tests/ui/feature-gates/feature-gate-inline_const.rs
index 43ff90d23..43ff90d23 100644
--- a/src/test/ui/feature-gates/feature-gate-inline_const.rs
+++ b/tests/ui/feature-gates/feature-gate-inline_const.rs
diff --git a/src/test/ui/feature-gates/feature-gate-inline_const.stderr b/tests/ui/feature-gates/feature-gate-inline_const.stderr
index be2f56715..be2f56715 100644
--- a/src/test/ui/feature-gates/feature-gate-inline_const.stderr
+++ b/tests/ui/feature-gates/feature-gate-inline_const.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-inline_const_pat.rs b/tests/ui/feature-gates/feature-gate-inline_const_pat.rs
index 3d0df289f..3d0df289f 100644
--- a/src/test/ui/feature-gates/feature-gate-inline_const_pat.rs
+++ b/tests/ui/feature-gates/feature-gate-inline_const_pat.rs
diff --git a/src/test/ui/feature-gates/feature-gate-inline_const_pat.stderr b/tests/ui/feature-gates/feature-gate-inline_const_pat.stderr
index ca533d850..ca533d850 100644
--- a/src/test/ui/feature-gates/feature-gate-inline_const_pat.stderr
+++ b/tests/ui/feature-gates/feature-gate-inline_const_pat.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-intrinsics.rs b/tests/ui/feature-gates/feature-gate-intrinsics.rs
index e0dc3cc57..e0dc3cc57 100644
--- a/src/test/ui/feature-gates/feature-gate-intrinsics.rs
+++ b/tests/ui/feature-gates/feature-gate-intrinsics.rs
diff --git a/src/test/ui/feature-gates/feature-gate-intrinsics.stderr b/tests/ui/feature-gates/feature-gate-intrinsics.stderr
index 8f943d357..8f943d357 100644
--- a/src/test/ui/feature-gates/feature-gate-intrinsics.stderr
+++ b/tests/ui/feature-gates/feature-gate-intrinsics.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-is_sorted.rs b/tests/ui/feature-gates/feature-gate-is_sorted.rs
index 359ed835b..359ed835b 100644
--- a/src/test/ui/feature-gates/feature-gate-is_sorted.rs
+++ b/tests/ui/feature-gates/feature-gate-is_sorted.rs
diff --git a/src/test/ui/feature-gates/feature-gate-is_sorted.stderr b/tests/ui/feature-gates/feature-gate-is_sorted.stderr
index ccac82707..ccac82707 100644
--- a/src/test/ui/feature-gates/feature-gate-is_sorted.stderr
+++ b/tests/ui/feature-gates/feature-gate-is_sorted.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-lang-items.rs b/tests/ui/feature-gates/feature-gate-lang-items.rs
index 93262f217..93262f217 100644
--- a/src/test/ui/feature-gates/feature-gate-lang-items.rs
+++ b/tests/ui/feature-gates/feature-gate-lang-items.rs
diff --git a/src/test/ui/feature-gates/feature-gate-lang-items.stderr b/tests/ui/feature-gates/feature-gate-lang-items.stderr
index c2496863f..c2496863f 100644
--- a/src/test/ui/feature-gates/feature-gate-lang-items.stderr
+++ b/tests/ui/feature-gates/feature-gate-lang-items.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-large-assignments.rs b/tests/ui/feature-gates/feature-gate-large-assignments.rs
index 7e9e574bf..7e9e574bf 100644
--- a/src/test/ui/feature-gates/feature-gate-large-assignments.rs
+++ b/tests/ui/feature-gates/feature-gate-large-assignments.rs
diff --git a/src/test/ui/feature-gates/feature-gate-large-assignments.stderr b/tests/ui/feature-gates/feature-gate-large-assignments.stderr
index 8ddc3043e..8ddc3043e 100644
--- a/src/test/ui/feature-gates/feature-gate-large-assignments.stderr
+++ b/tests/ui/feature-gates/feature-gate-large-assignments.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-link_cfg.rs b/tests/ui/feature-gates/feature-gate-link_cfg.rs
index d30ee3bcf..d30ee3bcf 100644
--- a/src/test/ui/feature-gates/feature-gate-link_cfg.rs
+++ b/tests/ui/feature-gates/feature-gate-link_cfg.rs
diff --git a/src/test/ui/feature-gates/feature-gate-link_cfg.stderr b/tests/ui/feature-gates/feature-gate-link_cfg.stderr
index 8f47d5965..8f47d5965 100644
--- a/src/test/ui/feature-gates/feature-gate-link_cfg.stderr
+++ b/tests/ui/feature-gates/feature-gate-link_cfg.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.rs b/tests/ui/feature-gates/feature-gate-link_llvm_intrinsics.rs
index 7391ea94e..7391ea94e 100644
--- a/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.rs
+++ b/tests/ui/feature-gates/feature-gate-link_llvm_intrinsics.rs
diff --git a/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr b/tests/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr
index 6bce5b823..6bce5b823 100644
--- a/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr
+++ b/tests/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-linkage.rs b/tests/ui/feature-gates/feature-gate-linkage.rs
index 505f31ec6..505f31ec6 100644
--- a/src/test/ui/feature-gates/feature-gate-linkage.rs
+++ b/tests/ui/feature-gates/feature-gate-linkage.rs
diff --git a/src/test/ui/feature-gates/feature-gate-linkage.stderr b/tests/ui/feature-gates/feature-gate-linkage.stderr
index a1c73e555..a1c73e555 100644
--- a/src/test/ui/feature-gates/feature-gate-linkage.stderr
+++ b/tests/ui/feature-gates/feature-gate-linkage.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-lint-reasons.rs b/tests/ui/feature-gates/feature-gate-lint-reasons.rs
index 7756074e2..7756074e2 100644
--- a/src/test/ui/feature-gates/feature-gate-lint-reasons.rs
+++ b/tests/ui/feature-gates/feature-gate-lint-reasons.rs
diff --git a/src/test/ui/feature-gates/feature-gate-lint-reasons.stderr b/tests/ui/feature-gates/feature-gate-lint-reasons.stderr
index 12793c7a2..12793c7a2 100644
--- a/src/test/ui/feature-gates/feature-gate-lint-reasons.stderr
+++ b/tests/ui/feature-gates/feature-gate-lint-reasons.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-log_syntax.rs b/tests/ui/feature-gates/feature-gate-log_syntax.rs
index 181f66cb0..181f66cb0 100644
--- a/src/test/ui/feature-gates/feature-gate-log_syntax.rs
+++ b/tests/ui/feature-gates/feature-gate-log_syntax.rs
diff --git a/src/test/ui/feature-gates/feature-gate-log_syntax.stderr b/tests/ui/feature-gates/feature-gate-log_syntax.stderr
index fdc1c8553..fdc1c8553 100644
--- a/src/test/ui/feature-gates/feature-gate-log_syntax.stderr
+++ b/tests/ui/feature-gates/feature-gate-log_syntax.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-log_syntax.stdout b/tests/ui/feature-gates/feature-gate-log_syntax.stdout
index 8b1378917..8b1378917 100644
--- a/src/test/ui/feature-gates/feature-gate-log_syntax.stdout
+++ b/tests/ui/feature-gates/feature-gate-log_syntax.stdout
diff --git a/src/test/ui/feature-gates/feature-gate-log_syntax2.rs b/tests/ui/feature-gates/feature-gate-log_syntax2.rs
index db1a96f1f..db1a96f1f 100644
--- a/src/test/ui/feature-gates/feature-gate-log_syntax2.rs
+++ b/tests/ui/feature-gates/feature-gate-log_syntax2.rs
diff --git a/src/test/ui/feature-gates/feature-gate-log_syntax2.stderr b/tests/ui/feature-gates/feature-gate-log_syntax2.stderr
index 6deb4a46c..6deb4a46c 100644
--- a/src/test/ui/feature-gates/feature-gate-log_syntax2.stderr
+++ b/tests/ui/feature-gates/feature-gate-log_syntax2.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-log_syntax2.stdout b/tests/ui/feature-gates/feature-gate-log_syntax2.stdout
index 8b1378917..8b1378917 100644
--- a/src/test/ui/feature-gates/feature-gate-log_syntax2.stdout
+++ b/tests/ui/feature-gates/feature-gate-log_syntax2.stdout
diff --git a/src/test/ui/feature-gates/feature-gate-marker_trait_attr.rs b/tests/ui/feature-gates/feature-gate-marker_trait_attr.rs
index 5050c4792..5050c4792 100644
--- a/src/test/ui/feature-gates/feature-gate-marker_trait_attr.rs
+++ b/tests/ui/feature-gates/feature-gate-marker_trait_attr.rs
diff --git a/src/test/ui/feature-gates/feature-gate-marker_trait_attr.stderr b/tests/ui/feature-gates/feature-gate-marker_trait_attr.stderr
index e3c3756fd..e3c3756fd 100644
--- a/src/test/ui/feature-gates/feature-gate-marker_trait_attr.stderr
+++ b/tests/ui/feature-gates/feature-gate-marker_trait_attr.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-may-dangle.rs b/tests/ui/feature-gates/feature-gate-may-dangle.rs
index 23db92c15..23db92c15 100644
--- a/src/test/ui/feature-gates/feature-gate-may-dangle.rs
+++ b/tests/ui/feature-gates/feature-gate-may-dangle.rs
diff --git a/src/test/ui/feature-gates/feature-gate-may-dangle.stderr b/tests/ui/feature-gates/feature-gate-may-dangle.stderr
index d47a76a50..d47a76a50 100644
--- a/src/test/ui/feature-gates/feature-gate-may-dangle.stderr
+++ b/tests/ui/feature-gates/feature-gate-may-dangle.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-min_const_fn.rs b/tests/ui/feature-gates/feature-gate-min_const_fn.rs
index 8f9b43300..8f9b43300 100644
--- a/src/test/ui/feature-gates/feature-gate-min_const_fn.rs
+++ b/tests/ui/feature-gates/feature-gate-min_const_fn.rs
diff --git a/src/test/ui/feature-gates/feature-gate-min_const_fn.stderr b/tests/ui/feature-gates/feature-gate-min_const_fn.stderr
index d7a585913..d7a585913 100644
--- a/src/test/ui/feature-gates/feature-gate-min_const_fn.stderr
+++ b/tests/ui/feature-gates/feature-gate-min_const_fn.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-more-qualified-paths.rs b/tests/ui/feature-gates/feature-gate-more-qualified-paths.rs
index 2e05acbfa..2e05acbfa 100644
--- a/src/test/ui/feature-gates/feature-gate-more-qualified-paths.rs
+++ b/tests/ui/feature-gates/feature-gate-more-qualified-paths.rs
diff --git a/src/test/ui/feature-gates/feature-gate-more-qualified-paths.stderr b/tests/ui/feature-gates/feature-gate-more-qualified-paths.stderr
index 80ebcabcf..80ebcabcf 100644
--- a/src/test/ui/feature-gates/feature-gate-more-qualified-paths.stderr
+++ b/tests/ui/feature-gates/feature-gate-more-qualified-paths.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-naked_functions.rs b/tests/ui/feature-gates/feature-gate-naked_functions.rs
index 8e93b1941..8e93b1941 100644
--- a/src/test/ui/feature-gates/feature-gate-naked_functions.rs
+++ b/tests/ui/feature-gates/feature-gate-naked_functions.rs
diff --git a/src/test/ui/feature-gates/feature-gate-naked_functions.stderr b/tests/ui/feature-gates/feature-gate-naked_functions.stderr
index 4378fb363..4378fb363 100644
--- a/src/test/ui/feature-gates/feature-gate-naked_functions.stderr
+++ b/tests/ui/feature-gates/feature-gate-naked_functions.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-native_link_modifiers_as_needed.rs b/tests/ui/feature-gates/feature-gate-native_link_modifiers_as_needed.rs
index 132bc6ab0..132bc6ab0 100644
--- a/src/test/ui/feature-gates/feature-gate-native_link_modifiers_as_needed.rs
+++ b/tests/ui/feature-gates/feature-gate-native_link_modifiers_as_needed.rs
diff --git a/src/test/ui/feature-gates/feature-gate-native_link_modifiers_as_needed.stderr b/tests/ui/feature-gates/feature-gate-native_link_modifiers_as_needed.stderr
index 2ef6a1c04..2ef6a1c04 100644
--- a/src/test/ui/feature-gates/feature-gate-native_link_modifiers_as_needed.stderr
+++ b/tests/ui/feature-gates/feature-gate-native_link_modifiers_as_needed.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-needs-allocator.rs b/tests/ui/feature-gates/feature-gate-needs-allocator.rs
index 08954944b..08954944b 100644
--- a/src/test/ui/feature-gates/feature-gate-needs-allocator.rs
+++ b/tests/ui/feature-gates/feature-gate-needs-allocator.rs
diff --git a/src/test/ui/feature-gates/feature-gate-needs-allocator.stderr b/tests/ui/feature-gates/feature-gate-needs-allocator.stderr
index 2b213aceb..2b213aceb 100644
--- a/src/test/ui/feature-gates/feature-gate-needs-allocator.stderr
+++ b/tests/ui/feature-gates/feature-gate-needs-allocator.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-negate-unsigned.rs b/tests/ui/feature-gates/feature-gate-negate-unsigned.rs
index 05e04f3e2..05e04f3e2 100644
--- a/src/test/ui/feature-gates/feature-gate-negate-unsigned.rs
+++ b/tests/ui/feature-gates/feature-gate-negate-unsigned.rs
diff --git a/src/test/ui/feature-gates/feature-gate-negate-unsigned.stderr b/tests/ui/feature-gates/feature-gate-negate-unsigned.stderr
index d1f4ed5cb..d1f4ed5cb 100644
--- a/src/test/ui/feature-gates/feature-gate-negate-unsigned.stderr
+++ b/tests/ui/feature-gates/feature-gate-negate-unsigned.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-never_type.rs b/tests/ui/feature-gates/feature-gate-never_type.rs
index be8c27dbb..be8c27dbb 100644
--- a/src/test/ui/feature-gates/feature-gate-never_type.rs
+++ b/tests/ui/feature-gates/feature-gate-never_type.rs
diff --git a/src/test/ui/feature-gates/feature-gate-never_type.stderr b/tests/ui/feature-gates/feature-gate-never_type.stderr
index 0a59cae9c..0a59cae9c 100644
--- a/src/test/ui/feature-gates/feature-gate-never_type.stderr
+++ b/tests/ui/feature-gates/feature-gate-never_type.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-no_core.rs b/tests/ui/feature-gates/feature-gate-no_core.rs
index 706efd786..706efd786 100644
--- a/src/test/ui/feature-gates/feature-gate-no_core.rs
+++ b/tests/ui/feature-gates/feature-gate-no_core.rs
diff --git a/src/test/ui/feature-gates/feature-gate-no_core.stderr b/tests/ui/feature-gates/feature-gate-no_core.stderr
index 8430a9ec6..8430a9ec6 100644
--- a/src/test/ui/feature-gates/feature-gate-no_core.stderr
+++ b/tests/ui/feature-gates/feature-gate-no_core.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-no_coverage.rs b/tests/ui/feature-gates/feature-gate-no_coverage.rs
index fd4c6f760..fd4c6f760 100644
--- a/src/test/ui/feature-gates/feature-gate-no_coverage.rs
+++ b/tests/ui/feature-gates/feature-gate-no_coverage.rs
diff --git a/src/test/ui/feature-gates/feature-gate-no_coverage.stderr b/tests/ui/feature-gates/feature-gate-no_coverage.stderr
index f7167e0b7..f7167e0b7 100644
--- a/src/test/ui/feature-gates/feature-gate-no_coverage.stderr
+++ b/tests/ui/feature-gates/feature-gate-no_coverage.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-no_sanitize.rs b/tests/ui/feature-gates/feature-gate-no_sanitize.rs
index 66a9263e1..66a9263e1 100644
--- a/src/test/ui/feature-gates/feature-gate-no_sanitize.rs
+++ b/tests/ui/feature-gates/feature-gate-no_sanitize.rs
diff --git a/src/test/ui/feature-gates/feature-gate-no_sanitize.stderr b/tests/ui/feature-gates/feature-gate-no_sanitize.stderr
index 399335700..399335700 100644
--- a/src/test/ui/feature-gates/feature-gate-no_sanitize.stderr
+++ b/tests/ui/feature-gates/feature-gate-no_sanitize.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-non_exhaustive_omitted_patterns_lint.rs b/tests/ui/feature-gates/feature-gate-non_exhaustive_omitted_patterns_lint.rs
index 9b646060a..9b646060a 100644
--- a/src/test/ui/feature-gates/feature-gate-non_exhaustive_omitted_patterns_lint.rs
+++ b/tests/ui/feature-gates/feature-gate-non_exhaustive_omitted_patterns_lint.rs
diff --git a/src/test/ui/feature-gates/feature-gate-non_exhaustive_omitted_patterns_lint.stderr b/tests/ui/feature-gates/feature-gate-non_exhaustive_omitted_patterns_lint.stderr
index 4d79ce3c6..4d79ce3c6 100644
--- a/src/test/ui/feature-gates/feature-gate-non_exhaustive_omitted_patterns_lint.stderr
+++ b/tests/ui/feature-gates/feature-gate-non_exhaustive_omitted_patterns_lint.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.rs b/tests/ui/feature-gates/feature-gate-object_safe_for_dispatch.rs
index 37348e476..37348e476 100644
--- a/src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.rs
+++ b/tests/ui/feature-gates/feature-gate-object_safe_for_dispatch.rs
diff --git a/src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr b/tests/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr
index d76c697fe..d76c697fe 100644
--- a/src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr
+++ b/tests/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.rs b/tests/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.rs
index 66bf79738..66bf79738 100644
--- a/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.rs
+++ b/tests/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.rs
diff --git a/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.stderr b/tests/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.stderr
index a5ec3599f..a5ec3599f 100644
--- a/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.stderr
+++ b/tests/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-optimize_attribute.rs b/tests/ui/feature-gates/feature-gate-optimize_attribute.rs
index 15aa3a6af..15aa3a6af 100644
--- a/src/test/ui/feature-gates/feature-gate-optimize_attribute.rs
+++ b/tests/ui/feature-gates/feature-gate-optimize_attribute.rs
diff --git a/src/test/ui/feature-gates/feature-gate-optimize_attribute.stderr b/tests/ui/feature-gates/feature-gate-optimize_attribute.stderr
index a3ced3515..a3ced3515 100644
--- a/src/test/ui/feature-gates/feature-gate-optimize_attribute.stderr
+++ b/tests/ui/feature-gates/feature-gate-optimize_attribute.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.rs b/tests/ui/feature-gates/feature-gate-overlapping_marker_traits.rs
index 6922d6f83..6922d6f83 100644
--- a/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.rs
+++ b/tests/ui/feature-gates/feature-gate-overlapping_marker_traits.rs
diff --git a/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.stderr b/tests/ui/feature-gates/feature-gate-overlapping_marker_traits.stderr
index 0526c6dc8..0526c6dc8 100644
--- a/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.stderr
+++ b/tests/ui/feature-gates/feature-gate-overlapping_marker_traits.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-precise_pointer_size_matching.rs b/tests/ui/feature-gates/feature-gate-precise_pointer_size_matching.rs
index 4c77180b7..4c77180b7 100644
--- a/src/test/ui/feature-gates/feature-gate-precise_pointer_size_matching.rs
+++ b/tests/ui/feature-gates/feature-gate-precise_pointer_size_matching.rs
diff --git a/src/test/ui/feature-gates/feature-gate-precise_pointer_size_matching.stderr b/tests/ui/feature-gates/feature-gate-precise_pointer_size_matching.stderr
index b55106833..b55106833 100644
--- a/src/test/ui/feature-gates/feature-gate-precise_pointer_size_matching.stderr
+++ b/tests/ui/feature-gates/feature-gate-precise_pointer_size_matching.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-prelude_import.rs b/tests/ui/feature-gates/feature-gate-prelude_import.rs
index a338bf973..a338bf973 100644
--- a/src/test/ui/feature-gates/feature-gate-prelude_import.rs
+++ b/tests/ui/feature-gates/feature-gate-prelude_import.rs
diff --git a/src/test/ui/feature-gates/feature-gate-prelude_import.stderr b/tests/ui/feature-gates/feature-gate-prelude_import.stderr
index 8686aed8f..8686aed8f 100644
--- a/src/test/ui/feature-gates/feature-gate-prelude_import.stderr
+++ b/tests/ui/feature-gates/feature-gate-prelude_import.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-profiler-runtime.rs b/tests/ui/feature-gates/feature-gate-profiler-runtime.rs
index f8a709634..f8a709634 100644
--- a/src/test/ui/feature-gates/feature-gate-profiler-runtime.rs
+++ b/tests/ui/feature-gates/feature-gate-profiler-runtime.rs
diff --git a/src/test/ui/feature-gates/feature-gate-profiler-runtime.stderr b/tests/ui/feature-gates/feature-gate-profiler-runtime.stderr
index 18e6503c5..18e6503c5 100644
--- a/src/test/ui/feature-gates/feature-gate-profiler-runtime.stderr
+++ b/tests/ui/feature-gates/feature-gate-profiler-runtime.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-public_private_dependencies.rs b/tests/ui/feature-gates/feature-gate-public_private_dependencies.rs
index b8fb4b8dc..b8fb4b8dc 100644
--- a/src/test/ui/feature-gates/feature-gate-public_private_dependencies.rs
+++ b/tests/ui/feature-gates/feature-gate-public_private_dependencies.rs
diff --git a/src/test/ui/feature-gates/feature-gate-raw-dylib-2.rs b/tests/ui/feature-gates/feature-gate-raw-dylib-2.rs
index fc47a9061..fc47a9061 100644
--- a/src/test/ui/feature-gates/feature-gate-raw-dylib-2.rs
+++ b/tests/ui/feature-gates/feature-gate-raw-dylib-2.rs
diff --git a/src/test/ui/feature-gates/feature-gate-raw-dylib-2.stderr b/tests/ui/feature-gates/feature-gate-raw-dylib-2.stderr
index 0e900760d..0e900760d 100644
--- a/src/test/ui/feature-gates/feature-gate-raw-dylib-2.stderr
+++ b/tests/ui/feature-gates/feature-gate-raw-dylib-2.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-raw-dylib-import-name-type.rs b/tests/ui/feature-gates/feature-gate-raw-dylib-import-name-type.rs
index 295f502d6..295f502d6 100644
--- a/src/test/ui/feature-gates/feature-gate-raw-dylib-import-name-type.rs
+++ b/tests/ui/feature-gates/feature-gate-raw-dylib-import-name-type.rs
diff --git a/src/test/ui/feature-gates/feature-gate-raw-dylib-import-name-type.stderr b/tests/ui/feature-gates/feature-gate-raw-dylib-import-name-type.stderr
index d6b165b76..d6b165b76 100644
--- a/src/test/ui/feature-gates/feature-gate-raw-dylib-import-name-type.stderr
+++ b/tests/ui/feature-gates/feature-gate-raw-dylib-import-name-type.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-raw-dylib.rs b/tests/ui/feature-gates/feature-gate-raw-dylib.rs
index 291cca8fd..291cca8fd 100644
--- a/src/test/ui/feature-gates/feature-gate-raw-dylib.rs
+++ b/tests/ui/feature-gates/feature-gate-raw-dylib.rs
diff --git a/src/test/ui/feature-gates/feature-gate-raw-dylib.stderr b/tests/ui/feature-gates/feature-gate-raw-dylib.stderr
index f02241e49..f02241e49 100644
--- a/src/test/ui/feature-gates/feature-gate-raw-dylib.stderr
+++ b/tests/ui/feature-gates/feature-gate-raw-dylib.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-register_tool.rs b/tests/ui/feature-gates/feature-gate-register_tool.rs
index e59959328..e59959328 100644
--- a/src/test/ui/feature-gates/feature-gate-register_tool.rs
+++ b/tests/ui/feature-gates/feature-gate-register_tool.rs
diff --git a/src/test/ui/feature-gates/feature-gate-register_tool.stderr b/tests/ui/feature-gates/feature-gate-register_tool.stderr
index 9ffaaa8de..9ffaaa8de 100644
--- a/src/test/ui/feature-gates/feature-gate-register_tool.stderr
+++ b/tests/ui/feature-gates/feature-gate-register_tool.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-repr-simd.rs b/tests/ui/feature-gates/feature-gate-repr-simd.rs
index c527404f5..c527404f5 100644
--- a/src/test/ui/feature-gates/feature-gate-repr-simd.rs
+++ b/tests/ui/feature-gates/feature-gate-repr-simd.rs
diff --git a/src/test/ui/feature-gates/feature-gate-repr-simd.stderr b/tests/ui/feature-gates/feature-gate-repr-simd.stderr
index 5b1270a19..5b1270a19 100644
--- a/src/test/ui/feature-gates/feature-gate-repr-simd.stderr
+++ b/tests/ui/feature-gates/feature-gate-repr-simd.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-repr128.rs b/tests/ui/feature-gates/feature-gate-repr128.rs
index 0290874dd..0290874dd 100644
--- a/src/test/ui/feature-gates/feature-gate-repr128.rs
+++ b/tests/ui/feature-gates/feature-gate-repr128.rs
diff --git a/src/test/ui/feature-gates/feature-gate-repr128.stderr b/tests/ui/feature-gates/feature-gate-repr128.stderr
index 3999a6d2d..3999a6d2d 100644
--- a/src/test/ui/feature-gates/feature-gate-repr128.stderr
+++ b/tests/ui/feature-gates/feature-gate-repr128.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.rs b/tests/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.rs
index 637765fff..637765fff 100644
--- a/src/test/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.rs
+++ b/tests/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.rs
diff --git a/src/test/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.stderr b/tests/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.stderr
index aeabed4a6..aeabed4a6 100644
--- a/src/test/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.stderr
+++ b/tests/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-rust_cold_cc.rs b/tests/ui/feature-gates/feature-gate-rust_cold_cc.rs
index 9ba8e32ac..9ba8e32ac 100644
--- a/src/test/ui/feature-gates/feature-gate-rust_cold_cc.rs
+++ b/tests/ui/feature-gates/feature-gate-rust_cold_cc.rs
diff --git a/src/test/ui/feature-gates/feature-gate-rust_cold_cc.stderr b/tests/ui/feature-gates/feature-gate-rust_cold_cc.stderr
index ab7e5f036..ab7e5f036 100644
--- a/src/test/ui/feature-gates/feature-gate-rust_cold_cc.stderr
+++ b/tests/ui/feature-gates/feature-gate-rust_cold_cc.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-rustc-allow-const-fn-unstable.rs b/tests/ui/feature-gates/feature-gate-rustc-allow-const-fn-unstable.rs
index 19d8fa87f..19d8fa87f 100644
--- a/src/test/ui/feature-gates/feature-gate-rustc-allow-const-fn-unstable.rs
+++ b/tests/ui/feature-gates/feature-gate-rustc-allow-const-fn-unstable.rs
diff --git a/src/test/ui/feature-gates/feature-gate-rustc-allow-const-fn-unstable.stderr b/tests/ui/feature-gates/feature-gate-rustc-allow-const-fn-unstable.stderr
index a549cb64e..a549cb64e 100644
--- a/src/test/ui/feature-gates/feature-gate-rustc-allow-const-fn-unstable.stderr
+++ b/tests/ui/feature-gates/feature-gate-rustc-allow-const-fn-unstable.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.rs b/tests/ui/feature-gates/feature-gate-rustc-attrs-1.rs
index 667bc9f8d..667bc9f8d 100644
--- a/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.rs
+++ b/tests/ui/feature-gates/feature-gate-rustc-attrs-1.rs
diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.stderr b/tests/ui/feature-gates/feature-gate-rustc-attrs-1.stderr
index 45a095903..45a095903 100644
--- a/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.stderr
+++ b/tests/ui/feature-gates/feature-gate-rustc-attrs-1.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs.rs b/tests/ui/feature-gates/feature-gate-rustc-attrs.rs
index c985298a3..c985298a3 100644
--- a/src/test/ui/feature-gates/feature-gate-rustc-attrs.rs
+++ b/tests/ui/feature-gates/feature-gate-rustc-attrs.rs
diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr b/tests/ui/feature-gates/feature-gate-rustc-attrs.stderr
index 1517a7a5c..1517a7a5c 100644
--- a/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr
+++ b/tests/ui/feature-gates/feature-gate-rustc-attrs.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.rs b/tests/ui/feature-gates/feature-gate-rustc_const_unstable.rs
index d7daaaaa1..d7daaaaa1 100644
--- a/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.rs
+++ b/tests/ui/feature-gates/feature-gate-rustc_const_unstable.rs
diff --git a/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.stderr b/tests/ui/feature-gates/feature-gate-rustc_const_unstable.stderr
index 48493b786..48493b786 100644
--- a/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.stderr
+++ b/tests/ui/feature-gates/feature-gate-rustc_const_unstable.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-rustdoc_internals.rs b/tests/ui/feature-gates/feature-gate-rustdoc_internals.rs
index 58306a4cf..58306a4cf 100644
--- a/src/test/ui/feature-gates/feature-gate-rustdoc_internals.rs
+++ b/tests/ui/feature-gates/feature-gate-rustdoc_internals.rs
diff --git a/src/test/ui/feature-gates/feature-gate-rustdoc_internals.stderr b/tests/ui/feature-gates/feature-gate-rustdoc_internals.stderr
index c4272a2c0..c4272a2c0 100644
--- a/src/test/ui/feature-gates/feature-gate-rustdoc_internals.stderr
+++ b/tests/ui/feature-gates/feature-gate-rustdoc_internals.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-simd-ffi.rs b/tests/ui/feature-gates/feature-gate-simd-ffi.rs
index abffa4a10..abffa4a10 100644
--- a/src/test/ui/feature-gates/feature-gate-simd-ffi.rs
+++ b/tests/ui/feature-gates/feature-gate-simd-ffi.rs
diff --git a/src/test/ui/feature-gates/feature-gate-simd-ffi.stderr b/tests/ui/feature-gates/feature-gate-simd-ffi.stderr
index 8166b6baa..8166b6baa 100644
--- a/src/test/ui/feature-gates/feature-gate-simd-ffi.stderr
+++ b/tests/ui/feature-gates/feature-gate-simd-ffi.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-simd.rs b/tests/ui/feature-gates/feature-gate-simd.rs
index d01d33de2..d01d33de2 100644
--- a/src/test/ui/feature-gates/feature-gate-simd.rs
+++ b/tests/ui/feature-gates/feature-gate-simd.rs
diff --git a/src/test/ui/feature-gates/feature-gate-simd.stderr b/tests/ui/feature-gates/feature-gate-simd.stderr
index 6e0e0b270..6e0e0b270 100644
--- a/src/test/ui/feature-gates/feature-gate-simd.stderr
+++ b/tests/ui/feature-gates/feature-gate-simd.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-staged_api.rs b/tests/ui/feature-gates/feature-gate-staged_api.rs
index 2571ab5d1..2571ab5d1 100644
--- a/src/test/ui/feature-gates/feature-gate-staged_api.rs
+++ b/tests/ui/feature-gates/feature-gate-staged_api.rs
diff --git a/src/test/ui/feature-gates/feature-gate-staged_api.stderr b/tests/ui/feature-gates/feature-gate-staged_api.stderr
index 951bb5a17..951bb5a17 100644
--- a/src/test/ui/feature-gates/feature-gate-staged_api.stderr
+++ b/tests/ui/feature-gates/feature-gate-staged_api.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-start.rs b/tests/ui/feature-gates/feature-gate-start.rs
index e617f1c47..e617f1c47 100644
--- a/src/test/ui/feature-gates/feature-gate-start.rs
+++ b/tests/ui/feature-gates/feature-gate-start.rs
diff --git a/src/test/ui/feature-gates/feature-gate-start.stderr b/tests/ui/feature-gates/feature-gate-start.stderr
index eec9d1a29..eec9d1a29 100644
--- a/src/test/ui/feature-gates/feature-gate-start.stderr
+++ b/tests/ui/feature-gates/feature-gate-start.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.rs b/tests/ui/feature-gates/feature-gate-stmt_expr_attributes.rs
index f213e8933..f213e8933 100644
--- a/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.rs
+++ b/tests/ui/feature-gates/feature-gate-stmt_expr_attributes.rs
diff --git a/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr b/tests/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr
index 57ffaed78..57ffaed78 100644
--- a/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr
+++ b/tests/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-strict_provenance.rs b/tests/ui/feature-gates/feature-gate-strict_provenance.rs
index 75d0ee570..75d0ee570 100644
--- a/src/test/ui/feature-gates/feature-gate-strict_provenance.rs
+++ b/tests/ui/feature-gates/feature-gate-strict_provenance.rs
diff --git a/src/test/ui/feature-gates/feature-gate-strict_provenance.stderr b/tests/ui/feature-gates/feature-gate-strict_provenance.stderr
index 751da87cc..751da87cc 100644
--- a/src/test/ui/feature-gates/feature-gate-strict_provenance.stderr
+++ b/tests/ui/feature-gates/feature-gate-strict_provenance.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-test_unstable_lint.rs b/tests/ui/feature-gates/feature-gate-test_unstable_lint.rs
index c398394cb..c398394cb 100644
--- a/src/test/ui/feature-gates/feature-gate-test_unstable_lint.rs
+++ b/tests/ui/feature-gates/feature-gate-test_unstable_lint.rs
diff --git a/src/test/ui/feature-gates/feature-gate-test_unstable_lint.stderr b/tests/ui/feature-gates/feature-gate-test_unstable_lint.stderr
index b4d6aa658..b4d6aa658 100644
--- a/src/test/ui/feature-gates/feature-gate-test_unstable_lint.stderr
+++ b/tests/ui/feature-gates/feature-gate-test_unstable_lint.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-thread_local.rs b/tests/ui/feature-gates/feature-gate-thread_local.rs
index 0efae1f6b..0efae1f6b 100644
--- a/src/test/ui/feature-gates/feature-gate-thread_local.rs
+++ b/tests/ui/feature-gates/feature-gate-thread_local.rs
diff --git a/src/test/ui/feature-gates/feature-gate-thread_local.stderr b/tests/ui/feature-gates/feature-gate-thread_local.stderr
index 6352e9087..6352e9087 100644
--- a/src/test/ui/feature-gates/feature-gate-thread_local.stderr
+++ b/tests/ui/feature-gates/feature-gate-thread_local.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-trace_macros.rs b/tests/ui/feature-gates/feature-gate-trace_macros.rs
index 07159b7b5..07159b7b5 100644
--- a/src/test/ui/feature-gates/feature-gate-trace_macros.rs
+++ b/tests/ui/feature-gates/feature-gate-trace_macros.rs
diff --git a/src/test/ui/feature-gates/feature-gate-trace_macros.stderr b/tests/ui/feature-gates/feature-gate-trace_macros.stderr
index 3978d4111..3978d4111 100644
--- a/src/test/ui/feature-gates/feature-gate-trace_macros.stderr
+++ b/tests/ui/feature-gates/feature-gate-trace_macros.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-trait-alias.rs b/tests/ui/feature-gates/feature-gate-trait-alias.rs
index 819085add..819085add 100644
--- a/src/test/ui/feature-gates/feature-gate-trait-alias.rs
+++ b/tests/ui/feature-gates/feature-gate-trait-alias.rs
diff --git a/src/test/ui/feature-gates/feature-gate-trait-alias.stderr b/tests/ui/feature-gates/feature-gate-trait-alias.stderr
index 41cd6dbd8..41cd6dbd8 100644
--- a/src/test/ui/feature-gates/feature-gate-trait-alias.stderr
+++ b/tests/ui/feature-gates/feature-gate-trait-alias.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-trait_upcasting.rs b/tests/ui/feature-gates/feature-gate-trait_upcasting.rs
index e4102f1cf..e4102f1cf 100644
--- a/src/test/ui/feature-gates/feature-gate-trait_upcasting.rs
+++ b/tests/ui/feature-gates/feature-gate-trait_upcasting.rs
diff --git a/src/test/ui/feature-gates/feature-gate-trait_upcasting.stderr b/tests/ui/feature-gates/feature-gate-trait_upcasting.stderr
index 93afa7845..93afa7845 100644
--- a/src/test/ui/feature-gates/feature-gate-trait_upcasting.stderr
+++ b/tests/ui/feature-gates/feature-gate-trait_upcasting.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-transparent_unions.rs b/tests/ui/feature-gates/feature-gate-transparent_unions.rs
index 73cac0a49..73cac0a49 100644
--- a/src/test/ui/feature-gates/feature-gate-transparent_unions.rs
+++ b/tests/ui/feature-gates/feature-gate-transparent_unions.rs
diff --git a/src/test/ui/feature-gates/feature-gate-transparent_unions.stderr b/tests/ui/feature-gates/feature-gate-transparent_unions.stderr
index 65c8fe052..65c8fe052 100644
--- a/src/test/ui/feature-gates/feature-gate-transparent_unions.stderr
+++ b/tests/ui/feature-gates/feature-gate-transparent_unions.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-trivial_bounds-lint.rs b/tests/ui/feature-gates/feature-gate-trivial_bounds-lint.rs
index 8f68d5d6d..8f68d5d6d 100644
--- a/src/test/ui/feature-gates/feature-gate-trivial_bounds-lint.rs
+++ b/tests/ui/feature-gates/feature-gate-trivial_bounds-lint.rs
diff --git a/src/test/ui/feature-gates/feature-gate-trivial_bounds.rs b/tests/ui/feature-gates/feature-gate-trivial_bounds.rs
index 3dbaf5dea..3dbaf5dea 100644
--- a/src/test/ui/feature-gates/feature-gate-trivial_bounds.rs
+++ b/tests/ui/feature-gates/feature-gate-trivial_bounds.rs
diff --git a/src/test/ui/feature-gates/feature-gate-trivial_bounds.stderr b/tests/ui/feature-gates/feature-gate-trivial_bounds.stderr
index 1b87ebd9f..1b87ebd9f 100644
--- a/src/test/ui/feature-gates/feature-gate-trivial_bounds.stderr
+++ b/tests/ui/feature-gates/feature-gate-trivial_bounds.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-try_blocks.rs b/tests/ui/feature-gates/feature-gate-try_blocks.rs
index 06cadd82c..06cadd82c 100644
--- a/src/test/ui/feature-gates/feature-gate-try_blocks.rs
+++ b/tests/ui/feature-gates/feature-gate-try_blocks.rs
diff --git a/src/test/ui/feature-gates/feature-gate-try_blocks.stderr b/tests/ui/feature-gates/feature-gate-try_blocks.stderr
index 022409f95..022409f95 100644
--- a/src/test/ui/feature-gates/feature-gate-try_blocks.stderr
+++ b/tests/ui/feature-gates/feature-gate-try_blocks.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-type_alias_impl_trait.rs b/tests/ui/feature-gates/feature-gate-type_alias_impl_trait.rs
index 6dfd7f684..6dfd7f684 100644
--- a/src/test/ui/feature-gates/feature-gate-type_alias_impl_trait.rs
+++ b/tests/ui/feature-gates/feature-gate-type_alias_impl_trait.rs
diff --git a/src/test/ui/feature-gates/feature-gate-type_ascription.rs b/tests/ui/feature-gates/feature-gate-type_ascription.rs
index 7a5971573..7a5971573 100644
--- a/src/test/ui/feature-gates/feature-gate-type_ascription.rs
+++ b/tests/ui/feature-gates/feature-gate-type_ascription.rs
diff --git a/src/test/ui/feature-gates/feature-gate-type_ascription.stderr b/tests/ui/feature-gates/feature-gate-type_ascription.stderr
index 615d5b9a1..615d5b9a1 100644
--- a/src/test/ui/feature-gates/feature-gate-type_ascription.stderr
+++ b/tests/ui/feature-gates/feature-gate-type_ascription.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.rs b/tests/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.rs
index eecf2046c..eecf2046c 100644
--- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.rs
+++ b/tests/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.rs
diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr b/tests/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr
index f647380ef..f647380ef 100644
--- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr
+++ b/tests/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.rs b/tests/ui/feature-gates/feature-gate-unboxed-closures-method-calls.rs
index 42f7c5f0f..42f7c5f0f 100644
--- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.rs
+++ b/tests/ui/feature-gates/feature-gate-unboxed-closures-method-calls.rs
diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr b/tests/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr
index c61382c64..c61382c64 100644
--- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr
+++ b/tests/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.rs b/tests/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.rs
index 25c90492e..25c90492e 100644
--- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.rs
+++ b/tests/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.rs
diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr b/tests/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr
index 50eaeecde..50eaeecde 100644
--- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr
+++ b/tests/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures.rs b/tests/ui/feature-gates/feature-gate-unboxed-closures.rs
index ebc5a2536..ebc5a2536 100644
--- a/src/test/ui/feature-gates/feature-gate-unboxed-closures.rs
+++ b/tests/ui/feature-gates/feature-gate-unboxed-closures.rs
diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures.stderr b/tests/ui/feature-gates/feature-gate-unboxed-closures.stderr
index a763c28de..a763c28de 100644
--- a/src/test/ui/feature-gates/feature-gate-unboxed-closures.stderr
+++ b/tests/ui/feature-gates/feature-gate-unboxed-closures.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-unix_sigpipe.rs b/tests/ui/feature-gates/feature-gate-unix_sigpipe.rs
index 46dc3f6cc..46dc3f6cc 100644
--- a/src/test/ui/feature-gates/feature-gate-unix_sigpipe.rs
+++ b/tests/ui/feature-gates/feature-gate-unix_sigpipe.rs
diff --git a/src/test/ui/feature-gates/feature-gate-unix_sigpipe.stderr b/tests/ui/feature-gates/feature-gate-unix_sigpipe.stderr
index cf3284467..cf3284467 100644
--- a/src/test/ui/feature-gates/feature-gate-unix_sigpipe.stderr
+++ b/tests/ui/feature-gates/feature-gate-unix_sigpipe.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-unsafe_pin_internals.rs b/tests/ui/feature-gates/feature-gate-unsafe_pin_internals.rs
index 0680d2344..0680d2344 100644
--- a/src/test/ui/feature-gates/feature-gate-unsafe_pin_internals.rs
+++ b/tests/ui/feature-gates/feature-gate-unsafe_pin_internals.rs
diff --git a/src/test/ui/feature-gates/feature-gate-unsafe_pin_internals.stderr b/tests/ui/feature-gates/feature-gate-unsafe_pin_internals.stderr
index 4d0c931b4..4d0c931b4 100644
--- a/src/test/ui/feature-gates/feature-gate-unsafe_pin_internals.stderr
+++ b/tests/ui/feature-gates/feature-gate-unsafe_pin_internals.stderr
diff --git a/tests/ui/feature-gates/feature-gate-unsized_fn_params.rs b/tests/ui/feature-gates/feature-gate-unsized_fn_params.rs
new file mode 100644
index 000000000..c04e57843
--- /dev/null
+++ b/tests/ui/feature-gates/feature-gate-unsized_fn_params.rs
@@ -0,0 +1,30 @@
+#![allow(unused, bare_trait_objects)]
+#[repr(align(256))]
+struct A {
+    v: u8,
+}
+
+trait Foo {
+    fn foo(&self);
+}
+
+impl Foo for A {
+    fn foo(&self) {
+        assert_eq!(self as *const A as usize % 256, 0);
+    }
+}
+
+fn foo(x: dyn Foo) { //~ ERROR [E0277]
+    x.foo()
+}
+
+fn bar(x: Foo) { //~ ERROR [E0277]
+    x.foo()
+}
+
+fn qux(_: [()]) {} //~ ERROR [E0277]
+
+fn main() {
+    let x: Box<dyn Foo> = Box::new(A { v: 22 });
+    foo(*x); //~ ERROR [E0277]
+}
diff --git a/tests/ui/feature-gates/feature-gate-unsized_fn_params.stderr b/tests/ui/feature-gates/feature-gate-unsized_fn_params.stderr
new file mode 100644
index 000000000..92c713926
--- /dev/null
+++ b/tests/ui/feature-gates/feature-gate-unsized_fn_params.stderr
@@ -0,0 +1,60 @@
+error[E0277]: the size for values of type `(dyn Foo + 'static)` cannot be known at compilation time
+  --> $DIR/feature-gate-unsized_fn_params.rs:17:8
+   |
+LL | fn foo(x: dyn Foo) {
+   |        ^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `(dyn Foo + 'static)`
+   = help: unsized fn params are gated as an unstable feature
+help: you can use `impl Trait` as the argument type
+   |
+LL | fn foo(x: impl Foo) {
+   |           ~~~~
+help: function arguments must have a statically known size, borrowed types always have a known size
+   |
+LL | fn foo(x: &dyn Foo) {
+   |           +
+
+error[E0277]: the size for values of type `(dyn Foo + 'static)` cannot be known at compilation time
+  --> $DIR/feature-gate-unsized_fn_params.rs:21:8
+   |
+LL | fn bar(x: Foo) {
+   |        ^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `(dyn Foo + 'static)`
+   = help: unsized fn params are gated as an unstable feature
+help: you can use `impl Trait` as the argument type
+   |
+LL | fn bar(x: impl Foo) {
+   |           ++++
+help: function arguments must have a statically known size, borrowed types always have a known size
+   |
+LL | fn bar(x: &Foo) {
+   |           +
+
+error[E0277]: the size for values of type `[()]` cannot be known at compilation time
+  --> $DIR/feature-gate-unsized_fn_params.rs:25:8
+   |
+LL | fn qux(_: [()]) {}
+   |        ^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `[()]`
+   = help: unsized fn params are gated as an unstable feature
+help: function arguments must have a statically known size, borrowed types always have a known size
+   |
+LL | fn qux(_: &[()]) {}
+   |           +
+
+error[E0277]: the size for values of type `(dyn Foo + 'static)` cannot be known at compilation time
+  --> $DIR/feature-gate-unsized_fn_params.rs:29:9
+   |
+LL |     foo(*x);
+   |         ^^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `(dyn Foo + 'static)`
+   = note: all function arguments must have a statically known size
+   = help: unsized fn params are gated as an unstable feature
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/feature-gates/feature-gate-unsized_locals.rs b/tests/ui/feature-gates/feature-gate-unsized_locals.rs
index 3686e7b37..3686e7b37 100644
--- a/src/test/ui/feature-gates/feature-gate-unsized_locals.rs
+++ b/tests/ui/feature-gates/feature-gate-unsized_locals.rs
diff --git a/src/test/ui/feature-gates/feature-gate-unsized_locals.stderr b/tests/ui/feature-gates/feature-gate-unsized_locals.stderr
index c4507843e..9aeeb88cf 100644
--- a/src/test/ui/feature-gates/feature-gate-unsized_locals.stderr
+++ b/tests/ui/feature-gates/feature-gate-unsized_locals.stderr
@@ -6,6 +6,10 @@ LL | fn f(f: dyn FnOnce()) {}
    |
    = help: the trait `Sized` is not implemented for `(dyn FnOnce() + 'static)`
    = help: unsized fn params are gated as an unstable feature
+help: you can use `impl Trait` as the argument type
+   |
+LL | fn f(f: impl FnOnce()) {}
+   |         ~~~~
 help: function arguments must have a statically known size, borrowed types always have a known size
    |
 LL | fn f(f: &dyn FnOnce()) {}
diff --git a/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.rs b/tests/ui/feature-gates/feature-gate-unsized_tuple_coercion.rs
index c3d62a231..c3d62a231 100644
--- a/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.rs
+++ b/tests/ui/feature-gates/feature-gate-unsized_tuple_coercion.rs
diff --git a/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr b/tests/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr
index bea6cee0a..bea6cee0a 100644
--- a/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr
+++ b/tests/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-used_with_arg.rs b/tests/ui/feature-gates/feature-gate-used_with_arg.rs
index 1c8f01bde..1c8f01bde 100644
--- a/src/test/ui/feature-gates/feature-gate-used_with_arg.rs
+++ b/tests/ui/feature-gates/feature-gate-used_with_arg.rs
diff --git a/src/test/ui/feature-gates/feature-gate-used_with_arg.stderr b/tests/ui/feature-gates/feature-gate-used_with_arg.stderr
index d115bf4e3..d115bf4e3 100644
--- a/src/test/ui/feature-gates/feature-gate-used_with_arg.stderr
+++ b/tests/ui/feature-gates/feature-gate-used_with_arg.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-vectorcall.rs b/tests/ui/feature-gates/feature-gate-vectorcall.rs
index 5a6c6d288..5a6c6d288 100644
--- a/src/test/ui/feature-gates/feature-gate-vectorcall.rs
+++ b/tests/ui/feature-gates/feature-gate-vectorcall.rs
diff --git a/src/test/ui/feature-gates/feature-gate-vectorcall.stderr b/tests/ui/feature-gates/feature-gate-vectorcall.stderr
index 55ee76ec3..55ee76ec3 100644
--- a/src/test/ui/feature-gates/feature-gate-vectorcall.stderr
+++ b/tests/ui/feature-gates/feature-gate-vectorcall.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-wasm_abi.rs b/tests/ui/feature-gates/feature-gate-wasm_abi.rs
index 222c88daf..222c88daf 100644
--- a/src/test/ui/feature-gates/feature-gate-wasm_abi.rs
+++ b/tests/ui/feature-gates/feature-gate-wasm_abi.rs
diff --git a/src/test/ui/feature-gates/feature-gate-wasm_abi.stderr b/tests/ui/feature-gates/feature-gate-wasm_abi.stderr
index 0140002e3..0140002e3 100644
--- a/src/test/ui/feature-gates/feature-gate-wasm_abi.stderr
+++ b/tests/ui/feature-gates/feature-gate-wasm_abi.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-with_negative_coherence.rs b/tests/ui/feature-gates/feature-gate-with_negative_coherence.rs
index d1d0a6a90..d1d0a6a90 100644
--- a/src/test/ui/feature-gates/feature-gate-with_negative_coherence.rs
+++ b/tests/ui/feature-gates/feature-gate-with_negative_coherence.rs
diff --git a/src/test/ui/feature-gates/feature-gate-with_negative_coherence.stderr b/tests/ui/feature-gates/feature-gate-with_negative_coherence.stderr
index d4c201b5d..d4c201b5d 100644
--- a/src/test/ui/feature-gates/feature-gate-with_negative_coherence.stderr
+++ b/tests/ui/feature-gates/feature-gate-with_negative_coherence.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-yeet_expr-in-cfg.rs b/tests/ui/feature-gates/feature-gate-yeet_expr-in-cfg.rs
index a33bd3450..a33bd3450 100644
--- a/src/test/ui/feature-gates/feature-gate-yeet_expr-in-cfg.rs
+++ b/tests/ui/feature-gates/feature-gate-yeet_expr-in-cfg.rs
diff --git a/src/test/ui/feature-gates/feature-gate-yeet_expr-in-cfg.stderr b/tests/ui/feature-gates/feature-gate-yeet_expr-in-cfg.stderr
index f90c379bd..f90c379bd 100644
--- a/src/test/ui/feature-gates/feature-gate-yeet_expr-in-cfg.stderr
+++ b/tests/ui/feature-gates/feature-gate-yeet_expr-in-cfg.stderr
diff --git a/src/test/ui/feature-gates/feature-gate-yeet_expr.rs b/tests/ui/feature-gates/feature-gate-yeet_expr.rs
index 978a84cf6..978a84cf6 100644
--- a/src/test/ui/feature-gates/feature-gate-yeet_expr.rs
+++ b/tests/ui/feature-gates/feature-gate-yeet_expr.rs
diff --git a/src/test/ui/feature-gates/feature-gate-yeet_expr.stderr b/tests/ui/feature-gates/feature-gate-yeet_expr.stderr
index 8d1b92370..8d1b92370 100644
--- a/src/test/ui/feature-gates/feature-gate-yeet_expr.stderr
+++ b/tests/ui/feature-gates/feature-gate-yeet_expr.stderr
diff --git a/src/test/ui/feature-gates/feature-gated-feature-in-macro-arg.rs b/tests/ui/feature-gates/feature-gated-feature-in-macro-arg.rs
index 1285cca6b..1285cca6b 100644
--- a/src/test/ui/feature-gates/feature-gated-feature-in-macro-arg.rs
+++ b/tests/ui/feature-gates/feature-gated-feature-in-macro-arg.rs
diff --git a/src/test/ui/feature-gates/feature-gated-feature-in-macro-arg.stderr b/tests/ui/feature-gates/feature-gated-feature-in-macro-arg.stderr
index 218e02927..218e02927 100644
--- a/src/test/ui/feature-gates/feature-gated-feature-in-macro-arg.stderr
+++ b/tests/ui/feature-gates/feature-gated-feature-in-macro-arg.stderr
diff --git a/src/test/ui/feature-gates/gated-bad-feature.rs b/tests/ui/feature-gates/gated-bad-feature.rs
index 51f2db555..51f2db555 100644
--- a/src/test/ui/feature-gates/gated-bad-feature.rs
+++ b/tests/ui/feature-gates/gated-bad-feature.rs
diff --git a/src/test/ui/feature-gates/gated-bad-feature.stderr b/tests/ui/feature-gates/gated-bad-feature.stderr
index 2d01bdf3c..2d01bdf3c 100644
--- a/src/test/ui/feature-gates/gated-bad-feature.stderr
+++ b/tests/ui/feature-gates/gated-bad-feature.stderr
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-bench.rs b/tests/ui/feature-gates/issue-43106-gating-of-bench.rs
index 796325b79..796325b79 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-bench.rs
+++ b/tests/ui/feature-gates/issue-43106-gating-of-bench.rs
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-bench.stderr b/tests/ui/feature-gates/issue-43106-gating-of-bench.stderr
index 6b3322119..6b3322119 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-bench.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-bench.stderr
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.rs b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.rs
index 1fe133ac2..1fe133ac2 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.rs
+++ b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.rs
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr
index 787670404..787670404 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs.rs b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.rs
index 1fa315f3d..1fa315f3d 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs.rs
+++ b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.rs
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
index 300392679..300392679 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-deprecated.rs b/tests/ui/feature-gates/issue-43106-gating-of-deprecated.rs
index 5e1d08dd9..5e1d08dd9 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-deprecated.rs
+++ b/tests/ui/feature-gates/issue-43106-gating-of-deprecated.rs
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-derive-2.rs b/tests/ui/feature-gates/issue-43106-gating-of-derive-2.rs
index 3276309f7..3276309f7 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-derive-2.rs
+++ b/tests/ui/feature-gates/issue-43106-gating-of-derive-2.rs
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-derive-2.stderr b/tests/ui/feature-gates/issue-43106-gating-of-derive-2.stderr
index ab1659173..ab1659173 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-derive-2.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-derive-2.stderr
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-derive.rs b/tests/ui/feature-gates/issue-43106-gating-of-derive.rs
index 86a352251..86a352251 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-derive.rs
+++ b/tests/ui/feature-gates/issue-43106-gating-of-derive.rs
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-derive.stderr b/tests/ui/feature-gates/issue-43106-gating-of-derive.stderr
index bb8651ffb..bb8651ffb 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-derive.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-derive.stderr
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-macro_escape.rs b/tests/ui/feature-gates/issue-43106-gating-of-macro_escape.rs
index de00bc4cb..de00bc4cb 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-macro_escape.rs
+++ b/tests/ui/feature-gates/issue-43106-gating-of-macro_escape.rs
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-macro_escape.stderr b/tests/ui/feature-gates/issue-43106-gating-of-macro_escape.stderr
index 0eaec5202..0eaec5202 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-macro_escape.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-macro_escape.stderr
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-macro_use.rs b/tests/ui/feature-gates/issue-43106-gating-of-macro_use.rs
index 6a7ef7939..6a7ef7939 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-macro_use.rs
+++ b/tests/ui/feature-gates/issue-43106-gating-of-macro_use.rs
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-macro_use.stderr b/tests/ui/feature-gates/issue-43106-gating-of-macro_use.stderr
index 9a12851f2..9a12851f2 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-macro_use.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-macro_use.stderr
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.rs b/tests/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.rs
index a94ffd602..a94ffd602 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.rs
+++ b/tests/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.rs
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.stderr b/tests/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.stderr
index e202b472d..e202b472d 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.stderr
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-stable.rs b/tests/ui/feature-gates/issue-43106-gating-of-stable.rs
index 621ec01bb..621ec01bb 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-stable.rs
+++ b/tests/ui/feature-gates/issue-43106-gating-of-stable.rs
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-stable.stderr b/tests/ui/feature-gates/issue-43106-gating-of-stable.stderr
index 677fef3a9..677fef3a9 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-stable.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-stable.stderr
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-test.rs b/tests/ui/feature-gates/issue-43106-gating-of-test.rs
index 39835c926..39835c926 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-test.rs
+++ b/tests/ui/feature-gates/issue-43106-gating-of-test.rs
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-test.stderr b/tests/ui/feature-gates/issue-43106-gating-of-test.stderr
index 300a9966d..300a9966d 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-test.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-test.stderr
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-unstable.rs b/tests/ui/feature-gates/issue-43106-gating-of-unstable.rs
index d507bcd8f..d507bcd8f 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-unstable.rs
+++ b/tests/ui/feature-gates/issue-43106-gating-of-unstable.rs
diff --git a/src/test/ui/feature-gates/issue-43106-gating-of-unstable.stderr b/tests/ui/feature-gates/issue-43106-gating-of-unstable.stderr
index a2f361878..a2f361878 100644
--- a/src/test/ui/feature-gates/issue-43106-gating-of-unstable.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-unstable.stderr
diff --git a/src/test/ui/feature-gates/issue-49983-see-issue-0.rs b/tests/ui/feature-gates/issue-49983-see-issue-0.rs
index eeb80d014..eeb80d014 100644
--- a/src/test/ui/feature-gates/issue-49983-see-issue-0.rs
+++ b/tests/ui/feature-gates/issue-49983-see-issue-0.rs
diff --git a/src/test/ui/feature-gates/issue-49983-see-issue-0.stderr b/tests/ui/feature-gates/issue-49983-see-issue-0.stderr
index 314238a34..314238a34 100644
--- a/src/test/ui/feature-gates/issue-49983-see-issue-0.stderr
+++ b/tests/ui/feature-gates/issue-49983-see-issue-0.stderr
diff --git a/src/test/ui/feature-gates/rustc-private.rs b/tests/ui/feature-gates/rustc-private.rs
index 7b8944bb0..7b8944bb0 100644
--- a/src/test/ui/feature-gates/rustc-private.rs
+++ b/tests/ui/feature-gates/rustc-private.rs
diff --git a/src/test/ui/feature-gates/rustc-private.stderr b/tests/ui/feature-gates/rustc-private.stderr
index 1a8536d37..1a8536d37 100644
--- a/src/test/ui/feature-gates/rustc-private.stderr
+++ b/tests/ui/feature-gates/rustc-private.stderr
diff --git a/src/test/ui/feature-gates/soft-syntax-gates-with-errors.rs b/tests/ui/feature-gates/soft-syntax-gates-with-errors.rs
index 49f1cba71..49f1cba71 100644
--- a/src/test/ui/feature-gates/soft-syntax-gates-with-errors.rs
+++ b/tests/ui/feature-gates/soft-syntax-gates-with-errors.rs
diff --git a/src/test/ui/feature-gates/soft-syntax-gates-with-errors.stderr b/tests/ui/feature-gates/soft-syntax-gates-with-errors.stderr
index 49550d811..49550d811 100644
--- a/src/test/ui/feature-gates/soft-syntax-gates-with-errors.stderr
+++ b/tests/ui/feature-gates/soft-syntax-gates-with-errors.stderr
diff --git a/src/test/ui/feature-gates/soft-syntax-gates-without-errors.rs b/tests/ui/feature-gates/soft-syntax-gates-without-errors.rs
index ca4ad2320..ca4ad2320 100644
--- a/src/test/ui/feature-gates/soft-syntax-gates-without-errors.rs
+++ b/tests/ui/feature-gates/soft-syntax-gates-without-errors.rs
diff --git a/src/test/ui/feature-gates/soft-syntax-gates-without-errors.stderr b/tests/ui/feature-gates/soft-syntax-gates-without-errors.stderr
index 3d9c22e54..3d9c22e54 100644
--- a/src/test/ui/feature-gates/soft-syntax-gates-without-errors.stderr
+++ b/tests/ui/feature-gates/soft-syntax-gates-without-errors.stderr
diff --git a/src/test/ui/feature-gates/stability-attribute-consistency.rs b/tests/ui/feature-gates/stability-attribute-consistency.rs
index 6ee7003c3..6ee7003c3 100644
--- a/src/test/ui/feature-gates/stability-attribute-consistency.rs
+++ b/tests/ui/feature-gates/stability-attribute-consistency.rs
diff --git a/src/test/ui/feature-gates/stability-attribute-consistency.stderr b/tests/ui/feature-gates/stability-attribute-consistency.stderr
index d49b44c8a..1b93d3c96 100644
--- a/src/test/ui/feature-gates/stability-attribute-consistency.stderr
+++ b/tests/ui/feature-gates/stability-attribute-consistency.stderr
@@ -12,3 +12,4 @@ LL | #[unstable(feature = "foo", issue = "none")]
 
 error: aborting due to 2 previous errors
 
+For more information about this error, try `rustc --explain E0711`.
diff --git a/src/test/ui/feature-gates/stable-features.rs b/tests/ui/feature-gates/stable-features.rs
index ed7f0899d..ed7f0899d 100644
--- a/src/test/ui/feature-gates/stable-features.rs
+++ b/tests/ui/feature-gates/stable-features.rs
diff --git a/src/test/ui/feature-gates/stable-features.stderr b/tests/ui/feature-gates/stable-features.stderr
index 831b40b86..831b40b86 100644
--- a/src/test/ui/feature-gates/stable-features.stderr
+++ b/tests/ui/feature-gates/stable-features.stderr
diff --git a/src/test/ui/feature-gates/trace_macros-gate.rs b/tests/ui/feature-gates/trace_macros-gate.rs
index c9af04741..c9af04741 100644
--- a/src/test/ui/feature-gates/trace_macros-gate.rs
+++ b/tests/ui/feature-gates/trace_macros-gate.rs
diff --git a/src/test/ui/feature-gates/trace_macros-gate.stderr b/tests/ui/feature-gates/trace_macros-gate.stderr
index 1ca10aeec..1ca10aeec 100644
--- a/src/test/ui/feature-gates/trace_macros-gate.stderr
+++ b/tests/ui/feature-gates/trace_macros-gate.stderr
diff --git a/src/test/ui/feature-gates/unknown-feature.rs b/tests/ui/feature-gates/unknown-feature.rs
index 20fd932d4..20fd932d4 100644
--- a/src/test/ui/feature-gates/unknown-feature.rs
+++ b/tests/ui/feature-gates/unknown-feature.rs
diff --git a/src/test/ui/feature-gates/unknown-feature.stderr b/tests/ui/feature-gates/unknown-feature.stderr
index e5c05872d..e5c05872d 100644
--- a/src/test/ui/feature-gates/unknown-feature.stderr
+++ b/tests/ui/feature-gates/unknown-feature.stderr
diff --git a/src/test/ui/feature-gates/unstable-attribute-allow-issue-0.rs b/tests/ui/feature-gates/unstable-attribute-allow-issue-0.rs
index bffe43262..bffe43262 100644
--- a/src/test/ui/feature-gates/unstable-attribute-allow-issue-0.rs
+++ b/tests/ui/feature-gates/unstable-attribute-allow-issue-0.rs
diff --git a/src/test/ui/feature-gates/unstable-attribute-allow-issue-0.stderr b/tests/ui/feature-gates/unstable-attribute-allow-issue-0.stderr
index 4ed42101a..4ed42101a 100644
--- a/src/test/ui/feature-gates/unstable-attribute-allow-issue-0.stderr
+++ b/tests/ui/feature-gates/unstable-attribute-allow-issue-0.stderr
diff --git a/src/test/ui/ffi_const.rs b/tests/ui/ffi_const.rs
index 7aeb5a49a..7aeb5a49a 100644
--- a/src/test/ui/ffi_const.rs
+++ b/tests/ui/ffi_const.rs
diff --git a/src/test/ui/ffi_const.stderr b/tests/ui/ffi_const.stderr
index bc3c12eaf..bc3c12eaf 100644
--- a/src/test/ui/ffi_const.stderr
+++ b/tests/ui/ffi_const.stderr
diff --git a/src/test/ui/ffi_const2.rs b/tests/ui/ffi_const2.rs
index 82fe8a9c9..82fe8a9c9 100644
--- a/src/test/ui/ffi_const2.rs
+++ b/tests/ui/ffi_const2.rs
diff --git a/src/test/ui/ffi_const2.stderr b/tests/ui/ffi_const2.stderr
index 0c30c9dc5..0c30c9dc5 100644
--- a/src/test/ui/ffi_const2.stderr
+++ b/tests/ui/ffi_const2.stderr
diff --git a/src/test/ui/ffi_pure.rs b/tests/ui/ffi_pure.rs
index c37d34c87..c37d34c87 100644
--- a/src/test/ui/ffi_pure.rs
+++ b/tests/ui/ffi_pure.rs
diff --git a/src/test/ui/ffi_pure.stderr b/tests/ui/ffi_pure.stderr
index bc911c85d..bc911c85d 100644
--- a/src/test/ui/ffi_pure.stderr
+++ b/tests/ui/ffi_pure.stderr
diff --git a/src/test/ui/ffi_returns_twice.rs b/tests/ui/ffi_returns_twice.rs
index 845e18df1..845e18df1 100644
--- a/src/test/ui/ffi_returns_twice.rs
+++ b/tests/ui/ffi_returns_twice.rs
diff --git a/src/test/ui/ffi_returns_twice.stderr b/tests/ui/ffi_returns_twice.stderr
index 2b7f5694f..2b7f5694f 100644
--- a/src/test/ui/ffi_returns_twice.stderr
+++ b/tests/ui/ffi_returns_twice.stderr
diff --git a/src/test/ui/filter-block-view-items.rs b/tests/ui/filter-block-view-items.rs
index e63aa9157..e63aa9157 100644
--- a/src/test/ui/filter-block-view-items.rs
+++ b/tests/ui/filter-block-view-items.rs
diff --git a/tests/ui/fmt/auxiliary/format-string-proc-macro.rs b/tests/ui/fmt/auxiliary/format-string-proc-macro.rs
new file mode 100644
index 000000000..1b7ef93f4
--- /dev/null
+++ b/tests/ui/fmt/auxiliary/format-string-proc-macro.rs
@@ -0,0 +1,52 @@
+// force-host
+// no-prefer-dynamic
+
+#![crate_type = "proc-macro"]
+
+extern crate proc_macro;
+
+use proc_macro::{Delimiter, Group, Ident, Literal, Punct, Spacing, Span, TokenStream, TokenTree};
+use std::iter::FromIterator;
+
+#[proc_macro]
+pub fn foo_with_input_span(input: TokenStream) -> TokenStream {
+    let span = input.into_iter().next().unwrap().span();
+
+    let mut lit = Literal::string("{foo}");
+    lit.set_span(span);
+
+    TokenStream::from(TokenTree::Literal(lit))
+}
+
+#[proc_macro]
+pub fn err_with_input_span(input: TokenStream) -> TokenStream {
+    let span = input.into_iter().next().unwrap().span();
+
+    let mut lit = Literal::string("         }");
+    lit.set_span(span);
+
+    TokenStream::from(TokenTree::Literal(lit))
+}
+
+
+#[proc_macro]
+pub fn respan_to_invalid_format_literal(input: TokenStream) -> TokenStream {
+    let mut s = Literal::string("{");
+    s.set_span(input.into_iter().next().unwrap().span());
+    TokenStream::from_iter([
+        TokenTree::from(Ident::new("format", Span::call_site())),
+        TokenTree::from(Punct::new('!', Spacing::Alone)),
+        TokenTree::from(Group::new(Delimiter::Parenthesis, TokenTree::from(s).into())),
+    ])
+}
+
+#[proc_macro]
+pub fn capture_a_with_prepended_space_preserve_span(input: TokenStream) -> TokenStream {
+    let mut s = Literal::string(" {a}");
+    s.set_span(input.into_iter().next().unwrap().span());
+    TokenStream::from_iter([
+        TokenTree::from(Ident::new("format", Span::call_site())),
+        TokenTree::from(Punct::new('!', Spacing::Alone)),
+        TokenTree::from(Group::new(Delimiter::Parenthesis, TokenTree::from(s).into())),
+    ])
+}
diff --git a/src/test/ui/fmt/format-args-capture-issue-102057.rs b/tests/ui/fmt/format-args-capture-issue-102057.rs
index b8089d49b..b8089d49b 100644
--- a/src/test/ui/fmt/format-args-capture-issue-102057.rs
+++ b/tests/ui/fmt/format-args-capture-issue-102057.rs
diff --git a/src/test/ui/fmt/format-args-capture-issue-102057.stderr b/tests/ui/fmt/format-args-capture-issue-102057.stderr
index f2d625e7f..f2d625e7f 100644
--- a/src/test/ui/fmt/format-args-capture-issue-102057.stderr
+++ b/tests/ui/fmt/format-args-capture-issue-102057.stderr
diff --git a/src/test/ui/fmt/format-args-capture-issue-93378.rs b/tests/ui/fmt/format-args-capture-issue-93378.rs
index 9d722a028..9d722a028 100644
--- a/src/test/ui/fmt/format-args-capture-issue-93378.rs
+++ b/tests/ui/fmt/format-args-capture-issue-93378.rs
diff --git a/src/test/ui/fmt/format-args-capture-issue-93378.stderr b/tests/ui/fmt/format-args-capture-issue-93378.stderr
index 6429b0d46..6429b0d46 100644
--- a/src/test/ui/fmt/format-args-capture-issue-93378.stderr
+++ b/tests/ui/fmt/format-args-capture-issue-93378.stderr
diff --git a/src/test/ui/fmt/format-args-capture-issue-94010.rs b/tests/ui/fmt/format-args-capture-issue-94010.rs
index bd03e9c93..bd03e9c93 100644
--- a/src/test/ui/fmt/format-args-capture-issue-94010.rs
+++ b/tests/ui/fmt/format-args-capture-issue-94010.rs
diff --git a/src/test/ui/fmt/format-args-capture-issue-94010.stderr b/tests/ui/fmt/format-args-capture-issue-94010.stderr
index ed90dc855..ed90dc855 100644
--- a/src/test/ui/fmt/format-args-capture-issue-94010.stderr
+++ b/tests/ui/fmt/format-args-capture-issue-94010.stderr
diff --git a/src/test/ui/fmt/format-args-capture-macro-hygiene.rs b/tests/ui/fmt/format-args-capture-macro-hygiene.rs
index b04f80ba4..b04f80ba4 100644
--- a/src/test/ui/fmt/format-args-capture-macro-hygiene.rs
+++ b/tests/ui/fmt/format-args-capture-macro-hygiene.rs
diff --git a/src/test/ui/fmt/format-args-capture-macro-hygiene.stderr b/tests/ui/fmt/format-args-capture-macro-hygiene.stderr
index 1b5fbd2af..1b5fbd2af 100644
--- a/src/test/ui/fmt/format-args-capture-macro-hygiene.stderr
+++ b/tests/ui/fmt/format-args-capture-macro-hygiene.stderr
diff --git a/src/test/ui/fmt/format-args-capture-missing-variables.rs b/tests/ui/fmt/format-args-capture-missing-variables.rs
index 46fc083cb..46fc083cb 100644
--- a/src/test/ui/fmt/format-args-capture-missing-variables.rs
+++ b/tests/ui/fmt/format-args-capture-missing-variables.rs
diff --git a/src/test/ui/fmt/format-args-capture-missing-variables.stderr b/tests/ui/fmt/format-args-capture-missing-variables.stderr
index d980e7be2..d980e7be2 100644
--- a/src/test/ui/fmt/format-args-capture-missing-variables.stderr
+++ b/tests/ui/fmt/format-args-capture-missing-variables.stderr
diff --git a/src/test/ui/fmt/format-args-capture.rs b/tests/ui/fmt/format-args-capture.rs
index 560352b5c..560352b5c 100644
--- a/src/test/ui/fmt/format-args-capture.rs
+++ b/tests/ui/fmt/format-args-capture.rs
diff --git a/src/test/ui/fmt/format-expanded-string.rs b/tests/ui/fmt/format-expanded-string.rs
index 4c716f08c..4c716f08c 100644
--- a/src/test/ui/fmt/format-expanded-string.rs
+++ b/tests/ui/fmt/format-expanded-string.rs
diff --git a/src/test/ui/fmt/format-expanded-string.stderr b/tests/ui/fmt/format-expanded-string.stderr
index 26ce7f269..26ce7f269 100644
--- a/src/test/ui/fmt/format-expanded-string.stderr
+++ b/tests/ui/fmt/format-expanded-string.stderr
diff --git a/src/test/ui/fmt/format-raw-string-error.rs b/tests/ui/fmt/format-raw-string-error.rs
index 9f0bc01a7..9f0bc01a7 100644
--- a/src/test/ui/fmt/format-raw-string-error.rs
+++ b/tests/ui/fmt/format-raw-string-error.rs
diff --git a/src/test/ui/fmt/format-raw-string-error.stderr b/tests/ui/fmt/format-raw-string-error.stderr
index 8d61950d8..8d61950d8 100644
--- a/src/test/ui/fmt/format-raw-string-error.stderr
+++ b/tests/ui/fmt/format-raw-string-error.stderr
diff --git a/src/test/ui/fmt/format-string-error-2.rs b/tests/ui/fmt/format-string-error-2.rs
index 1f7f0d8f6..1f7f0d8f6 100644
--- a/src/test/ui/fmt/format-string-error-2.rs
+++ b/tests/ui/fmt/format-string-error-2.rs
diff --git a/src/test/ui/fmt/format-string-error-2.stderr b/tests/ui/fmt/format-string-error-2.stderr
index 76cdfbb93..76cdfbb93 100644
--- a/src/test/ui/fmt/format-string-error-2.stderr
+++ b/tests/ui/fmt/format-string-error-2.stderr
diff --git a/src/test/ui/fmt/format-string-error.rs b/tests/ui/fmt/format-string-error.rs
index eae4f3cb5..eae4f3cb5 100644
--- a/src/test/ui/fmt/format-string-error.rs
+++ b/tests/ui/fmt/format-string-error.rs
diff --git a/src/test/ui/fmt/format-string-error.stderr b/tests/ui/fmt/format-string-error.stderr
index 8a32c2254..8a32c2254 100644
--- a/src/test/ui/fmt/format-string-error.stderr
+++ b/tests/ui/fmt/format-string-error.stderr
diff --git a/src/test/ui/fmt/format-with-yield-point.rs b/tests/ui/fmt/format-with-yield-point.rs
index e484074cc..e484074cc 100644
--- a/src/test/ui/fmt/format-with-yield-point.rs
+++ b/tests/ui/fmt/format-with-yield-point.rs
diff --git a/src/test/ui/fmt/ifmt-bad-arg.rs b/tests/ui/fmt/ifmt-bad-arg.rs
index 68861d7bf..68861d7bf 100644
--- a/src/test/ui/fmt/ifmt-bad-arg.rs
+++ b/tests/ui/fmt/ifmt-bad-arg.rs
diff --git a/src/test/ui/fmt/ifmt-bad-arg.stderr b/tests/ui/fmt/ifmt-bad-arg.stderr
index 1b595a50e..c2619d6df 100644
--- a/src/test/ui/fmt/ifmt-bad-arg.stderr
+++ b/tests/ui/fmt/ifmt-bad-arg.stderr
@@ -170,7 +170,7 @@ LL |     format!("foo %s baz", "bar");
    |                  |
    |                  help: format specifiers use curly braces: `{}`
    |
-   = note: printf formatting not supported; see the documentation for `std::fmt`
+   = note: printf formatting is not supported; see the documentation for `std::fmt`
 
 error: invalid format string: expected `'}'`, found `'t'`
   --> $DIR/ifmt-bad-arg.rs:75:1
@@ -309,9 +309,6 @@ LL |     println!("{} {:.*} {}", 1, 3.2, 4);
               found reference `&{float}`
 note: associated function defined here
   --> $SRC_DIR/core/src/fmt/mod.rs:LL:COL
-   |
-LL |     pub fn from_usize(x: &usize) -> ArgumentV1<'_> {
-   |            ^^^^^^^^^^
    = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
@@ -327,9 +324,6 @@ LL |     println!("{} {:07$.*} {}", 1, 3.2, 4);
               found reference `&{float}`
 note: associated function defined here
   --> $SRC_DIR/core/src/fmt/mod.rs:LL:COL
-   |
-LL |     pub fn from_usize(x: &usize) -> ArgumentV1<'_> {
-   |            ^^^^^^^^^^
    = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 38 previous errors
diff --git a/src/test/ui/fmt/ifmt-bad-format-args.rs b/tests/ui/fmt/ifmt-bad-format-args.rs
index ba7301561..ba7301561 100644
--- a/src/test/ui/fmt/ifmt-bad-format-args.rs
+++ b/tests/ui/fmt/ifmt-bad-format-args.rs
diff --git a/src/test/ui/fmt/ifmt-bad-format-args.stderr b/tests/ui/fmt/ifmt-bad-format-args.stderr
index 2db280c5e..2db280c5e 100644
--- a/src/test/ui/fmt/ifmt-bad-format-args.stderr
+++ b/tests/ui/fmt/ifmt-bad-format-args.stderr
diff --git a/src/test/ui/fmt/ifmt-unimpl.rs b/tests/ui/fmt/ifmt-unimpl.rs
index 258f4eea5..258f4eea5 100644
--- a/src/test/ui/fmt/ifmt-unimpl.rs
+++ b/tests/ui/fmt/ifmt-unimpl.rs
diff --git a/src/test/ui/fmt/ifmt-unimpl.stderr b/tests/ui/fmt/ifmt-unimpl.stderr
index 0e34f9135..be321c3c5 100644
--- a/src/test/ui/fmt/ifmt-unimpl.stderr
+++ b/tests/ui/fmt/ifmt-unimpl.stderr
@@ -17,9 +17,6 @@ LL |     format!("{:X}", "3");
    = note: required for `&str` to implement `UpperHex`
 note: required by a bound in `ArgumentV1::<'a>::new_upper_hex`
   --> $SRC_DIR/core/src/fmt/mod.rs:LL:COL
-   |
-LL |     arg_new!(new_upper_hex, UpperHex);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `ArgumentV1::<'a>::new_upper_hex`
    = note: this error originates in the macro `$crate::__export::format_args` which comes from the expansion of the macro `arg_new` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
diff --git a/src/test/ui/fmt/ifmt-unknown-trait.rs b/tests/ui/fmt/ifmt-unknown-trait.rs
index 158152c89..158152c89 100644
--- a/src/test/ui/fmt/ifmt-unknown-trait.rs
+++ b/tests/ui/fmt/ifmt-unknown-trait.rs
diff --git a/src/test/ui/fmt/ifmt-unknown-trait.stderr b/tests/ui/fmt/ifmt-unknown-trait.stderr
index 459432bf4..459432bf4 100644
--- a/src/test/ui/fmt/ifmt-unknown-trait.stderr
+++ b/tests/ui/fmt/ifmt-unknown-trait.stderr
diff --git a/src/test/ui/fmt/incorrect-separator.rs b/tests/ui/fmt/incorrect-separator.rs
index b8d2e4a34..b8d2e4a34 100644
--- a/src/test/ui/fmt/incorrect-separator.rs
+++ b/tests/ui/fmt/incorrect-separator.rs
diff --git a/src/test/ui/fmt/incorrect-separator.stderr b/tests/ui/fmt/incorrect-separator.stderr
index 5a3e5515b..5a3e5515b 100644
--- a/src/test/ui/fmt/incorrect-separator.stderr
+++ b/tests/ui/fmt/incorrect-separator.stderr
diff --git a/tests/ui/fmt/indoc-issue-106408.rs b/tests/ui/fmt/indoc-issue-106408.rs
new file mode 100644
index 000000000..e4e3093b5
--- /dev/null
+++ b/tests/ui/fmt/indoc-issue-106408.rs
@@ -0,0 +1,9 @@
+// aux-build:format-string-proc-macro.rs
+// check-pass
+
+extern crate format_string_proc_macro;
+
+fn main() {
+    let a = 0;
+    format_string_proc_macro::capture_a_with_prepended_space_preserve_span!("{a}");
+}
diff --git a/tests/ui/fmt/issue-103826.rs b/tests/ui/fmt/issue-103826.rs
new file mode 100644
index 000000000..a11ec37a0
--- /dev/null
+++ b/tests/ui/fmt/issue-103826.rs
@@ -0,0 +1,8 @@
+fn main() {
+    format!("{\x7D");
+    //~^ ERROR 1 positional argument in format string, but no arguments were given
+    format!("\x7B\x7D");
+    //~^ ERROR 1 positional argument in format string, but no arguments were given
+    format!("{\x7D {\x7D");
+    //~^ ERROR 2 positional arguments in format string, but no arguments were given
+}
diff --git a/tests/ui/fmt/issue-103826.stderr b/tests/ui/fmt/issue-103826.stderr
new file mode 100644
index 000000000..0f27e1930
--- /dev/null
+++ b/tests/ui/fmt/issue-103826.stderr
@@ -0,0 +1,20 @@
+error: 1 positional argument in format string, but no arguments were given
+  --> $DIR/issue-103826.rs:2:14
+   |
+LL |     format!("{\x7D");
+   |              ^^^^^
+
+error: 1 positional argument in format string, but no arguments were given
+  --> $DIR/issue-103826.rs:4:14
+   |
+LL |     format!("\x7B\x7D");
+   |              ^^^^^^^^
+
+error: 2 positional arguments in format string, but no arguments were given
+  --> $DIR/issue-103826.rs:6:14
+   |
+LL |     format!("{\x7D {\x7D");
+   |              ^^^^^ ^^^^^
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/fmt/issue-104142.rs b/tests/ui/fmt/issue-104142.rs
index 8d7283a71..8d7283a71 100644
--- a/src/test/ui/fmt/issue-104142.rs
+++ b/tests/ui/fmt/issue-104142.rs
diff --git a/src/test/ui/fmt/issue-104142.stderr b/tests/ui/fmt/issue-104142.stderr
index d41644faa..d41644faa 100644
--- a/src/test/ui/fmt/issue-104142.stderr
+++ b/tests/ui/fmt/issue-104142.stderr
diff --git a/src/test/ui/fmt/issue-86085.rs b/tests/ui/fmt/issue-86085.rs
index 63d42b769..63d42b769 100644
--- a/src/test/ui/fmt/issue-86085.rs
+++ b/tests/ui/fmt/issue-86085.rs
diff --git a/src/test/ui/fmt/issue-86085.stderr b/tests/ui/fmt/issue-86085.stderr
index ee7d8a5cc..ee7d8a5cc 100644
--- a/src/test/ui/fmt/issue-86085.stderr
+++ b/tests/ui/fmt/issue-86085.stderr
diff --git a/src/test/ui/fmt/issue-89173.rs b/tests/ui/fmt/issue-89173.rs
index 96277d4d0..fc99af408 100644
--- a/src/test/ui/fmt/issue-89173.rs
+++ b/tests/ui/fmt/issue-89173.rs
@@ -10,5 +10,5 @@ fn main() {
     //~| NOTE: argument never used
     //~| NOTE: argument never used
     //~| NOTE: format specifiers use curly braces, and you have to use a positional or named parameter for the width
-    //~| NOTE: printf formatting not supported
+    //~| NOTE: printf formatting is not supported
 }
diff --git a/src/test/ui/fmt/issue-89173.stderr b/tests/ui/fmt/issue-89173.stderr
index 7b21e0a4f..ddeb769ea 100644
--- a/src/test/ui/fmt/issue-89173.stderr
+++ b/tests/ui/fmt/issue-89173.stderr
@@ -12,7 +12,7 @@ note: format specifiers use curly braces, and you have to use a positional or na
    |
 LL |     print!("%0*x", width, num);
    |             ^^^^
-   = note: printf formatting not supported; see the documentation for `std::fmt`
+   = note: printf formatting is not supported; see the documentation for `std::fmt`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/fmt/issue-91556.rs b/tests/ui/fmt/issue-91556.rs
index e782e6f90..e782e6f90 100644
--- a/src/test/ui/fmt/issue-91556.rs
+++ b/tests/ui/fmt/issue-91556.rs
diff --git a/src/test/ui/fmt/issue-91556.stderr b/tests/ui/fmt/issue-91556.stderr
index dbd5aef45..dbd5aef45 100644
--- a/src/test/ui/fmt/issue-91556.stderr
+++ b/tests/ui/fmt/issue-91556.stderr
diff --git a/tests/ui/fmt/respanned-literal-issue-106191.rs b/tests/ui/fmt/respanned-literal-issue-106191.rs
new file mode 100644
index 000000000..bb741c0ef
--- /dev/null
+++ b/tests/ui/fmt/respanned-literal-issue-106191.rs
@@ -0,0 +1,15 @@
+// aux-build:format-string-proc-macro.rs
+// check-fail
+// known-bug: #106191
+// unset-rustc-env:RUST_BACKTRACE
+// had to be reverted
+// error-pattern:internal compiler error
+// failure-status:101
+// dont-check-compiler-stderr
+
+extern crate format_string_proc_macro;
+
+fn main() {
+    format_string_proc_macro::respan_to_invalid_format_literal!("¡");
+    format_args!(r#concat!("¡        {"));
+}
diff --git a/tests/ui/fmt/respanned-literal-issue-106191.stderr b/tests/ui/fmt/respanned-literal-issue-106191.stderr
new file mode 100644
index 000000000..16717f422
--- /dev/null
+++ b/tests/ui/fmt/respanned-literal-issue-106191.stderr
@@ -0,0 +1,2 @@
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  query stack during panic:
+end of query stack
diff --git a/src/test/ui/fmt/send-sync.rs b/tests/ui/fmt/send-sync.rs
index 95ec68d1d..95ec68d1d 100644
--- a/src/test/ui/fmt/send-sync.rs
+++ b/tests/ui/fmt/send-sync.rs
diff --git a/src/test/ui/fmt/send-sync.stderr b/tests/ui/fmt/send-sync.stderr
index 3ed040c3a..3ed040c3a 100644
--- a/src/test/ui/fmt/send-sync.stderr
+++ b/tests/ui/fmt/send-sync.stderr
diff --git a/src/test/ui/fmt/struct-field-as-captured-argument.fixed b/tests/ui/fmt/struct-field-as-captured-argument.fixed
index f7244f674..f7244f674 100644
--- a/src/test/ui/fmt/struct-field-as-captured-argument.fixed
+++ b/tests/ui/fmt/struct-field-as-captured-argument.fixed
diff --git a/src/test/ui/fmt/struct-field-as-captured-argument.rs b/tests/ui/fmt/struct-field-as-captured-argument.rs
index ab5f2552b..ab5f2552b 100644
--- a/src/test/ui/fmt/struct-field-as-captured-argument.rs
+++ b/tests/ui/fmt/struct-field-as-captured-argument.rs
diff --git a/src/test/ui/fmt/struct-field-as-captured-argument.stderr b/tests/ui/fmt/struct-field-as-captured-argument.stderr
index 7ea8b4068..7ea8b4068 100644
--- a/src/test/ui/fmt/struct-field-as-captured-argument.stderr
+++ b/tests/ui/fmt/struct-field-as-captured-argument.stderr
diff --git a/src/test/ui/fmt/unicode-escape-spans.rs b/tests/ui/fmt/unicode-escape-spans.rs
index 753d91ce5..753d91ce5 100644
--- a/src/test/ui/fmt/unicode-escape-spans.rs
+++ b/tests/ui/fmt/unicode-escape-spans.rs
diff --git a/src/test/ui/fmt/unicode-escape-spans.stderr b/tests/ui/fmt/unicode-escape-spans.stderr
index 1d8473f01..1d8473f01 100644
--- a/src/test/ui/fmt/unicode-escape-spans.stderr
+++ b/tests/ui/fmt/unicode-escape-spans.stderr
diff --git a/src/test/ui/fn-in-pat.rs b/tests/ui/fn-in-pat.rs
index 2d7c86b86..2d7c86b86 100644
--- a/src/test/ui/fn-in-pat.rs
+++ b/tests/ui/fn-in-pat.rs
diff --git a/src/test/ui/fn-in-pat.stderr b/tests/ui/fn-in-pat.stderr
index 2482d6326..2482d6326 100644
--- a/src/test/ui/fn-in-pat.stderr
+++ b/tests/ui/fn-in-pat.stderr
diff --git a/src/test/ui/fn/bad-main.rs b/tests/ui/fn/bad-main.rs
index 751159961..751159961 100644
--- a/src/test/ui/fn/bad-main.rs
+++ b/tests/ui/fn/bad-main.rs
diff --git a/src/test/ui/fn/bad-main.stderr b/tests/ui/fn/bad-main.stderr
index 675b66d05..675b66d05 100644
--- a/src/test/ui/fn/bad-main.stderr
+++ b/tests/ui/fn/bad-main.stderr
diff --git a/src/test/ui/fn/dyn-fn-alignment.rs b/tests/ui/fn/dyn-fn-alignment.rs
index cedfd1cf2..cedfd1cf2 100644
--- a/src/test/ui/fn/dyn-fn-alignment.rs
+++ b/tests/ui/fn/dyn-fn-alignment.rs
diff --git a/src/test/ui/fn/expr-fn-panic.rs b/tests/ui/fn/expr-fn-panic.rs
index 123b57f97..123b57f97 100644
--- a/src/test/ui/fn/expr-fn-panic.rs
+++ b/tests/ui/fn/expr-fn-panic.rs
diff --git a/src/test/ui/fn/expr-fn.rs b/tests/ui/fn/expr-fn.rs
index 253cbfd5d..253cbfd5d 100644
--- a/src/test/ui/fn/expr-fn.rs
+++ b/tests/ui/fn/expr-fn.rs
diff --git a/src/test/ui/fn/fn-bad-block-type.rs b/tests/ui/fn/fn-bad-block-type.rs
index 01dcff058..01dcff058 100644
--- a/src/test/ui/fn/fn-bad-block-type.rs
+++ b/tests/ui/fn/fn-bad-block-type.rs
diff --git a/src/test/ui/fn/fn-bad-block-type.stderr b/tests/ui/fn/fn-bad-block-type.stderr
index 13ebfd1e2..13ebfd1e2 100644
--- a/src/test/ui/fn/fn-bad-block-type.stderr
+++ b/tests/ui/fn/fn-bad-block-type.stderr
diff --git a/src/test/ui/fn/fn-closure-mutable-capture.rs b/tests/ui/fn/fn-closure-mutable-capture.rs
index 97141886f..97141886f 100644
--- a/src/test/ui/fn/fn-closure-mutable-capture.rs
+++ b/tests/ui/fn/fn-closure-mutable-capture.rs
diff --git a/src/test/ui/fn/fn-closure-mutable-capture.stderr b/tests/ui/fn/fn-closure-mutable-capture.stderr
index 03e3d545a..03e3d545a 100644
--- a/src/test/ui/fn/fn-closure-mutable-capture.stderr
+++ b/tests/ui/fn/fn-closure-mutable-capture.stderr
diff --git a/src/test/ui/fn/fn-compare-mismatch.rs b/tests/ui/fn/fn-compare-mismatch.rs
index d734d54e8..d734d54e8 100644
--- a/src/test/ui/fn/fn-compare-mismatch.rs
+++ b/tests/ui/fn/fn-compare-mismatch.rs
diff --git a/src/test/ui/fn/fn-compare-mismatch.stderr b/tests/ui/fn/fn-compare-mismatch.stderr
index df838cb11..df838cb11 100644
--- a/src/test/ui/fn/fn-compare-mismatch.stderr
+++ b/tests/ui/fn/fn-compare-mismatch.stderr
diff --git a/src/test/ui/fn/fn-item-type.rs b/tests/ui/fn/fn-item-type.rs
index 1831e6cbf..1831e6cbf 100644
--- a/src/test/ui/fn/fn-item-type.rs
+++ b/tests/ui/fn/fn-item-type.rs
diff --git a/src/test/ui/fn/fn-item-type.stderr b/tests/ui/fn/fn-item-type.stderr
index f03a47d5c..f03a47d5c 100644
--- a/src/test/ui/fn/fn-item-type.stderr
+++ b/tests/ui/fn/fn-item-type.stderr
diff --git a/src/test/ui/fn/fn-recover-return-sign.fixed b/tests/ui/fn/fn-recover-return-sign.fixed
index 076be6a35..076be6a35 100644
--- a/src/test/ui/fn/fn-recover-return-sign.fixed
+++ b/tests/ui/fn/fn-recover-return-sign.fixed
diff --git a/src/test/ui/fn/fn-recover-return-sign.rs b/tests/ui/fn/fn-recover-return-sign.rs
index 0656023c0..0656023c0 100644
--- a/src/test/ui/fn/fn-recover-return-sign.rs
+++ b/tests/ui/fn/fn-recover-return-sign.rs
diff --git a/src/test/ui/fn/fn-recover-return-sign.stderr b/tests/ui/fn/fn-recover-return-sign.stderr
index 983109730..983109730 100644
--- a/src/test/ui/fn/fn-recover-return-sign.stderr
+++ b/tests/ui/fn/fn-recover-return-sign.stderr
diff --git a/src/test/ui/fn/fn-recover-return-sign2.rs b/tests/ui/fn/fn-recover-return-sign2.rs
index 31f56565c..31f56565c 100644
--- a/src/test/ui/fn/fn-recover-return-sign2.rs
+++ b/tests/ui/fn/fn-recover-return-sign2.rs
diff --git a/src/test/ui/fn/fn-recover-return-sign2.stderr b/tests/ui/fn/fn-recover-return-sign2.stderr
index 25ee8dd0c..25ee8dd0c 100644
--- a/src/test/ui/fn/fn-recover-return-sign2.stderr
+++ b/tests/ui/fn/fn-recover-return-sign2.stderr
diff --git a/src/test/ui/fn/fn-trait-formatting.rs b/tests/ui/fn/fn-trait-formatting.rs
index 636ac7107..636ac7107 100644
--- a/src/test/ui/fn/fn-trait-formatting.rs
+++ b/tests/ui/fn/fn-trait-formatting.rs
diff --git a/src/test/ui/fn/fn-trait-formatting.stderr b/tests/ui/fn/fn-trait-formatting.stderr
index 2a674d3c1..2a674d3c1 100644
--- a/src/test/ui/fn/fn-trait-formatting.stderr
+++ b/tests/ui/fn/fn-trait-formatting.stderr
diff --git a/src/test/ui/fn/fun-call-variants.rs b/tests/ui/fn/fun-call-variants.rs
index 5b83e2620..5b83e2620 100644
--- a/src/test/ui/fn/fun-call-variants.rs
+++ b/tests/ui/fn/fun-call-variants.rs
diff --git a/src/test/ui/fn/implied-bounds-unnorm-associated-type-2.rs b/tests/ui/fn/implied-bounds-unnorm-associated-type-2.rs
index 5d9245556..5d9245556 100644
--- a/src/test/ui/fn/implied-bounds-unnorm-associated-type-2.rs
+++ b/tests/ui/fn/implied-bounds-unnorm-associated-type-2.rs
diff --git a/src/test/ui/fn/implied-bounds-unnorm-associated-type-2.stderr b/tests/ui/fn/implied-bounds-unnorm-associated-type-2.stderr
index 0c3df04ea..0c3df04ea 100644
--- a/src/test/ui/fn/implied-bounds-unnorm-associated-type-2.stderr
+++ b/tests/ui/fn/implied-bounds-unnorm-associated-type-2.stderr
diff --git a/src/test/ui/fn/implied-bounds-unnorm-associated-type-3.rs b/tests/ui/fn/implied-bounds-unnorm-associated-type-3.rs
index 888f74cf6..888f74cf6 100644
--- a/src/test/ui/fn/implied-bounds-unnorm-associated-type-3.rs
+++ b/tests/ui/fn/implied-bounds-unnorm-associated-type-3.rs
diff --git a/src/test/ui/fn/implied-bounds-unnorm-associated-type-4.rs b/tests/ui/fn/implied-bounds-unnorm-associated-type-4.rs
index 12859252c..12859252c 100644
--- a/src/test/ui/fn/implied-bounds-unnorm-associated-type-4.rs
+++ b/tests/ui/fn/implied-bounds-unnorm-associated-type-4.rs
diff --git a/src/test/ui/fn/implied-bounds-unnorm-associated-type-4.stderr b/tests/ui/fn/implied-bounds-unnorm-associated-type-4.stderr
index fcbaa91d1..fcbaa91d1 100644
--- a/src/test/ui/fn/implied-bounds-unnorm-associated-type-4.stderr
+++ b/tests/ui/fn/implied-bounds-unnorm-associated-type-4.stderr
diff --git a/src/test/ui/fn/implied-bounds-unnorm-associated-type-5.rs b/tests/ui/fn/implied-bounds-unnorm-associated-type-5.rs
index 2a9a6a8cc..2a9a6a8cc 100644
--- a/src/test/ui/fn/implied-bounds-unnorm-associated-type-5.rs
+++ b/tests/ui/fn/implied-bounds-unnorm-associated-type-5.rs
diff --git a/src/test/ui/fn/implied-bounds-unnorm-associated-type-5.stderr b/tests/ui/fn/implied-bounds-unnorm-associated-type-5.stderr
index 458756a3d..458756a3d 100644
--- a/src/test/ui/fn/implied-bounds-unnorm-associated-type-5.stderr
+++ b/tests/ui/fn/implied-bounds-unnorm-associated-type-5.stderr
diff --git a/src/test/ui/fn/implied-bounds-unnorm-associated-type.rs b/tests/ui/fn/implied-bounds-unnorm-associated-type.rs
index d58d25036..d58d25036 100644
--- a/src/test/ui/fn/implied-bounds-unnorm-associated-type.rs
+++ b/tests/ui/fn/implied-bounds-unnorm-associated-type.rs
diff --git a/src/test/ui/fn/implied-bounds-unnorm-associated-type.stderr b/tests/ui/fn/implied-bounds-unnorm-associated-type.stderr
index e35f46e44..e35f46e44 100644
--- a/src/test/ui/fn/implied-bounds-unnorm-associated-type.stderr
+++ b/tests/ui/fn/implied-bounds-unnorm-associated-type.stderr
diff --git a/tests/ui/fn/issue-3044.rs b/tests/ui/fn/issue-3044.rs
new file mode 100644
index 000000000..19bee733e
--- /dev/null
+++ b/tests/ui/fn/issue-3044.rs
@@ -0,0 +1,6 @@
+fn main() {
+    let needlesArr: Vec<char> = vec!['a', 'f'];
+    needlesArr.iter().fold(|x, y| {
+        //~^ ERROR this method takes 2 arguments but 1 argument was supplied
+    });
+}
diff --git a/tests/ui/fn/issue-3044.stderr b/tests/ui/fn/issue-3044.stderr
new file mode 100644
index 000000000..2690ad711
--- /dev/null
+++ b/tests/ui/fn/issue-3044.stderr
@@ -0,0 +1,21 @@
+error[E0061]: this method takes 2 arguments but 1 argument was supplied
+  --> $DIR/issue-3044.rs:3:23
+   |
+LL |       needlesArr.iter().fold(|x, y| {
+   |  _______________________^^^^-
+LL | |
+LL | |     });
+   | |______- an argument is missing
+   |
+note: associated function defined here
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+help: provide the argument
+   |
+LL ~     needlesArr.iter().fold(|x, y| {
+LL +
+LL ~     }, /* f */);
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0061`.
diff --git a/src/test/ui/issues/issue-3904.rs b/tests/ui/fn/issue-3904.rs
index 7beb91a28..7beb91a28 100644
--- a/src/test/ui/issues/issue-3904.rs
+++ b/tests/ui/fn/issue-3904.rs
diff --git a/src/test/ui/fn/issue-80179.rs b/tests/ui/fn/issue-80179.rs
index fcef6f1b6..35e39bebb 100644
--- a/src/test/ui/fn/issue-80179.rs
+++ b/tests/ui/fn/issue-80179.rs
@@ -18,9 +18,9 @@ fn returns_fn_ptr() -> _ {
 fn returns_closure() -> _ {
 //~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types [E0121]
 //~| NOTE not allowed in type signatures
-//~| HELP consider using an `Fn`, `FnMut`, or `FnOnce` trait bound
-//~| NOTE for more information on `Fn` traits and closure types, see
-//        https://doc.rust-lang.org/book/ch13-01-closures.html
+//~| HELP replace with an appropriate return type
+//~| SUGGESTION impl Fn() -> i32
+//~| NOTE for more information on `Fn` traits and closure types
     || 0
 }
 
diff --git a/src/test/ui/fn/issue-80179.stderr b/tests/ui/fn/issue-80179.stderr
index 2ca4ae982..f5d6c44db 100644
--- a/src/test/ui/fn/issue-80179.stderr
+++ b/tests/ui/fn/issue-80179.stderr
@@ -11,9 +11,11 @@ error[E0121]: the placeholder `_` is not allowed within types on item signatures
   --> $DIR/issue-80179.rs:18:25
    |
 LL | fn returns_closure() -> _ {
-   |                         ^ not allowed in type signatures
+   |                         ^
+   |                         |
+   |                         not allowed in type signatures
+   |                         help: replace with an appropriate return type: `impl Fn() -> i32`
    |
-   = help: consider using an `Fn`, `FnMut`, or `FnOnce` trait bound
    = note: for more information on `Fn` traits and closure types, see https://doc.rust-lang.org/book/ch13-01-closures.html
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/fn/keyword-order.rs b/tests/ui/fn/keyword-order.rs
index 8a21db673..8a21db673 100644
--- a/src/test/ui/fn/keyword-order.rs
+++ b/tests/ui/fn/keyword-order.rs
diff --git a/src/test/ui/fn/keyword-order.stderr b/tests/ui/fn/keyword-order.stderr
index d3b140c85..d3b140c85 100644
--- a/src/test/ui/fn/keyword-order.stderr
+++ b/tests/ui/fn/keyword-order.stderr
diff --git a/src/test/ui/fn/nested-function-names-issue-8587.rs b/tests/ui/fn/nested-function-names-issue-8587.rs
index 8fafd41d9..8fafd41d9 100644
--- a/src/test/ui/fn/nested-function-names-issue-8587.rs
+++ b/tests/ui/fn/nested-function-names-issue-8587.rs
diff --git a/src/test/ui/fn/signature-error-reporting-under-verbose.rs b/tests/ui/fn/signature-error-reporting-under-verbose.rs
index d7a8c95e8..d7a8c95e8 100644
--- a/src/test/ui/fn/signature-error-reporting-under-verbose.rs
+++ b/tests/ui/fn/signature-error-reporting-under-verbose.rs
diff --git a/src/test/ui/fn/signature-error-reporting-under-verbose.stderr b/tests/ui/fn/signature-error-reporting-under-verbose.stderr
index 6260fc8dc..6260fc8dc 100644
--- a/src/test/ui/fn/signature-error-reporting-under-verbose.stderr
+++ b/tests/ui/fn/signature-error-reporting-under-verbose.stderr
diff --git a/tests/ui/fn/suggest-return-closure.rs b/tests/ui/fn/suggest-return-closure.rs
new file mode 100644
index 000000000..33daa1ea0
--- /dev/null
+++ b/tests/ui/fn/suggest-return-closure.rs
@@ -0,0 +1,34 @@
+fn fn_once() -> _ {
+    //~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types [E0121]
+    //~| NOTE not allowed in type signatures
+    //~| HELP replace with an appropriate return type
+    //~| SUGGESTION impl FnOnce()
+    //~| NOTE for more information on `Fn` traits and closure types
+    let x = String::new();
+    || {
+        drop(x);
+    }
+}
+
+fn fn_mut() -> _ {
+    //~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types [E0121]
+    //~| NOTE not allowed in type signatures
+    //~| HELP replace with an appropriate return type
+    //~| SUGGESTION impl FnMut(char)
+    //~| NOTE for more information on `Fn` traits and closure types
+    let x = String::new();
+    |c| {
+        x.push(c);
+    }
+}
+
+fn fun() -> _ {
+    //~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types [E0121]
+    //~| NOTE not allowed in type signatures
+    //~| HELP replace with an appropriate return type
+    //~| SUGGESTION impl Fn() -> i32
+    //~| NOTE for more information on `Fn` traits and closure types
+    || 1i32
+}
+
+fn main() {}
diff --git a/tests/ui/fn/suggest-return-closure.stderr b/tests/ui/fn/suggest-return-closure.stderr
new file mode 100644
index 000000000..341044469
--- /dev/null
+++ b/tests/ui/fn/suggest-return-closure.stderr
@@ -0,0 +1,36 @@
+error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
+  --> $DIR/suggest-return-closure.rs:1:17
+   |
+LL | fn fn_once() -> _ {
+   |                 ^
+   |                 |
+   |                 not allowed in type signatures
+   |                 help: replace with an appropriate return type: `impl FnOnce()`
+   |
+   = note: for more information on `Fn` traits and closure types, see https://doc.rust-lang.org/book/ch13-01-closures.html
+
+error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
+  --> $DIR/suggest-return-closure.rs:13:16
+   |
+LL | fn fn_mut() -> _ {
+   |                ^
+   |                |
+   |                not allowed in type signatures
+   |                help: replace with an appropriate return type: `impl FnMut(char)`
+   |
+   = note: for more information on `Fn` traits and closure types, see https://doc.rust-lang.org/book/ch13-01-closures.html
+
+error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
+  --> $DIR/suggest-return-closure.rs:25:13
+   |
+LL | fn fun() -> _ {
+   |             ^
+   |             |
+   |             not allowed in type signatures
+   |             help: replace with an appropriate return type: `impl Fn() -> i32`
+   |
+   = note: for more information on `Fn` traits and closure types, see https://doc.rust-lang.org/book/ch13-01-closures.html
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0121`.
diff --git a/tests/ui/fn/suggest-return-future.rs b/tests/ui/fn/suggest-return-future.rs
new file mode 100644
index 000000000..750740d94
--- /dev/null
+++ b/tests/ui/fn/suggest-return-future.rs
@@ -0,0 +1,23 @@
+// edition: 2021
+
+async fn a() -> i32 {
+    0
+}
+
+fn foo() -> _ {
+    //~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types [E0121]
+    //~| NOTE not allowed in type signatures
+    //~| HELP replace with an appropriate return type
+    //~| SUGGESTION impl Future<Output = i32>
+    a()
+}
+
+fn bar() -> _ {
+    //~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types [E0121]
+    //~| NOTE not allowed in type signatures
+    //~| HELP replace with an appropriate return type
+    //~| SUGGESTION impl Future<Output = i32>
+    async { a().await }
+}
+
+fn main() {}
diff --git a/tests/ui/fn/suggest-return-future.stderr b/tests/ui/fn/suggest-return-future.stderr
new file mode 100644
index 000000000..a4c8b5d8c
--- /dev/null
+++ b/tests/ui/fn/suggest-return-future.stderr
@@ -0,0 +1,21 @@
+error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
+  --> $DIR/suggest-return-future.rs:7:13
+   |
+LL | fn foo() -> _ {
+   |             ^
+   |             |
+   |             not allowed in type signatures
+   |             help: replace with an appropriate return type: `impl Future<Output = i32>`
+
+error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
+  --> $DIR/suggest-return-future.rs:15:13
+   |
+LL | fn bar() -> _ {
+   |             ^
+   |             |
+   |             not allowed in type signatures
+   |             help: replace with an appropriate return type: `impl Future<Output = i32>`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0121`.
diff --git a/src/test/ui/for-loop-while/auto-loop.rs b/tests/ui/for-loop-while/auto-loop.rs
index f02ac43c7..f02ac43c7 100644
--- a/src/test/ui/for-loop-while/auto-loop.rs
+++ b/tests/ui/for-loop-while/auto-loop.rs
diff --git a/src/test/ui/for-loop-while/break-outside-loop.rs b/tests/ui/for-loop-while/break-outside-loop.rs
index 26769b30d..26769b30d 100644
--- a/src/test/ui/for-loop-while/break-outside-loop.rs
+++ b/tests/ui/for-loop-while/break-outside-loop.rs
diff --git a/src/test/ui/for-loop-while/break-outside-loop.stderr b/tests/ui/for-loop-while/break-outside-loop.stderr
index 9092f34df..9092f34df 100644
--- a/src/test/ui/for-loop-while/break-outside-loop.stderr
+++ b/tests/ui/for-loop-while/break-outside-loop.stderr
diff --git a/src/test/ui/for-loop-while/break-value.rs b/tests/ui/for-loop-while/break-value.rs
index 9fc49fa81..9fc49fa81 100644
--- a/src/test/ui/for-loop-while/break-value.rs
+++ b/tests/ui/for-loop-while/break-value.rs
diff --git a/src/test/ui/for-loop-while/break-while-condition.rs b/tests/ui/for-loop-while/break-while-condition.rs
index 6064e6ab0..6064e6ab0 100644
--- a/src/test/ui/for-loop-while/break-while-condition.rs
+++ b/tests/ui/for-loop-while/break-while-condition.rs
diff --git a/src/test/ui/for-loop-while/break-while-condition.stderr b/tests/ui/for-loop-while/break-while-condition.stderr
index e79f6a75f..e79f6a75f 100644
--- a/src/test/ui/for-loop-while/break-while-condition.stderr
+++ b/tests/ui/for-loop-while/break-while-condition.stderr
diff --git a/src/test/ui/for-loop-while/break.rs b/tests/ui/for-loop-while/break.rs
index 427b1b7a0..427b1b7a0 100644
--- a/src/test/ui/for-loop-while/break.rs
+++ b/tests/ui/for-loop-while/break.rs
diff --git a/src/test/ui/for-loop-while/cleanup-rvalue-during-if-and-while.rs b/tests/ui/for-loop-while/cleanup-rvalue-during-if-and-while.rs
index afc77355a..afc77355a 100644
--- a/src/test/ui/for-loop-while/cleanup-rvalue-during-if-and-while.rs
+++ b/tests/ui/for-loop-while/cleanup-rvalue-during-if-and-while.rs
diff --git a/src/test/ui/for-loop-while/for-destruct.rs b/tests/ui/for-loop-while/for-destruct.rs
index 7ca8d4ded..7ca8d4ded 100644
--- a/src/test/ui/for-loop-while/for-destruct.rs
+++ b/tests/ui/for-loop-while/for-destruct.rs
diff --git a/src/test/ui/for-loop-while/for-loop-goofiness.rs b/tests/ui/for-loop-while/for-loop-goofiness.rs
index 872ab168b..872ab168b 100644
--- a/src/test/ui/for-loop-while/for-loop-goofiness.rs
+++ b/tests/ui/for-loop-while/for-loop-goofiness.rs
diff --git a/src/test/ui/for-loop-while/for-loop-has-unit-body.rs b/tests/ui/for-loop-while/for-loop-has-unit-body.rs
index eba385461..eba385461 100644
--- a/src/test/ui/for-loop-while/for-loop-has-unit-body.rs
+++ b/tests/ui/for-loop-while/for-loop-has-unit-body.rs
diff --git a/src/test/ui/for-loop-while/for-loop-into-iterator.rs b/tests/ui/for-loop-while/for-loop-into-iterator.rs
index 199d4ddb2..199d4ddb2 100644
--- a/src/test/ui/for-loop-while/for-loop-into-iterator.rs
+++ b/tests/ui/for-loop-while/for-loop-into-iterator.rs
diff --git a/src/test/ui/for-loop-while/for-loop-lifetime-of-unbound-values.rs b/tests/ui/for-loop-while/for-loop-lifetime-of-unbound-values.rs
index 6a38764a1..6a38764a1 100644
--- a/src/test/ui/for-loop-while/for-loop-lifetime-of-unbound-values.rs
+++ b/tests/ui/for-loop-while/for-loop-lifetime-of-unbound-values.rs
diff --git a/src/test/ui/for-loop-while/for-loop-macro.rs b/tests/ui/for-loop-while/for-loop-macro.rs
index 5abccd2a1..5abccd2a1 100644
--- a/src/test/ui/for-loop-while/for-loop-macro.rs
+++ b/tests/ui/for-loop-while/for-loop-macro.rs
diff --git a/src/test/ui/for-loop-while/for-loop-mut-ref-element.rs b/tests/ui/for-loop-while/for-loop-mut-ref-element.rs
index a3d82ace9..a3d82ace9 100644
--- a/src/test/ui/for-loop-while/for-loop-mut-ref-element.rs
+++ b/tests/ui/for-loop-while/for-loop-mut-ref-element.rs
diff --git a/src/test/ui/for-loop-while/for-loop-no-std.rs b/tests/ui/for-loop-while/for-loop-no-std.rs
index 65a33c5f1..65a33c5f1 100644
--- a/src/test/ui/for-loop-while/for-loop-no-std.rs
+++ b/tests/ui/for-loop-while/for-loop-no-std.rs
diff --git a/src/test/ui/for-loop-while/for-loop-panic.rs b/tests/ui/for-loop-while/for-loop-panic.rs
index ac607d6d7..ac607d6d7 100644
--- a/src/test/ui/for-loop-while/for-loop-panic.rs
+++ b/tests/ui/for-loop-while/for-loop-panic.rs
diff --git a/src/test/ui/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs b/tests/ui/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs
index a1e9b1ed8..a1e9b1ed8 100644
--- a/src/test/ui/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs
+++ b/tests/ui/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs
diff --git a/src/test/ui/for-loop-while/foreach-external-iterators-break.rs b/tests/ui/for-loop-while/foreach-external-iterators-break.rs
index 7de6a4f8a..7de6a4f8a 100644
--- a/src/test/ui/for-loop-while/foreach-external-iterators-break.rs
+++ b/tests/ui/for-loop-while/foreach-external-iterators-break.rs
diff --git a/src/test/ui/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs b/tests/ui/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs
index 5d690807e..5d690807e 100644
--- a/src/test/ui/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs
+++ b/tests/ui/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs
diff --git a/src/test/ui/for-loop-while/foreach-external-iterators-hashmap.rs b/tests/ui/for-loop-while/foreach-external-iterators-hashmap.rs
index 9f2ca05cd..9f2ca05cd 100644
--- a/src/test/ui/for-loop-while/foreach-external-iterators-hashmap.rs
+++ b/tests/ui/for-loop-while/foreach-external-iterators-hashmap.rs
diff --git a/src/test/ui/for-loop-while/foreach-external-iterators-loop.rs b/tests/ui/for-loop-while/foreach-external-iterators-loop.rs
index 78af195bc..78af195bc 100644
--- a/src/test/ui/for-loop-while/foreach-external-iterators-loop.rs
+++ b/tests/ui/for-loop-while/foreach-external-iterators-loop.rs
diff --git a/src/test/ui/for-loop-while/foreach-external-iterators-nested.rs b/tests/ui/for-loop-while/foreach-external-iterators-nested.rs
index 8a95f160a..8a95f160a 100644
--- a/src/test/ui/for-loop-while/foreach-external-iterators-nested.rs
+++ b/tests/ui/for-loop-while/foreach-external-iterators-nested.rs
diff --git a/src/test/ui/for-loop-while/foreach-external-iterators.rs b/tests/ui/for-loop-while/foreach-external-iterators.rs
index 24ecfe9b6..24ecfe9b6 100644
--- a/src/test/ui/for-loop-while/foreach-external-iterators.rs
+++ b/tests/ui/for-loop-while/foreach-external-iterators.rs
diff --git a/src/test/ui/for-loop-while/foreach-nested.rs b/tests/ui/for-loop-while/foreach-nested.rs
index bb6edbc07..bb6edbc07 100644
--- a/src/test/ui/for-loop-while/foreach-nested.rs
+++ b/tests/ui/for-loop-while/foreach-nested.rs
diff --git a/src/test/ui/for-loop-while/foreach-put-structured.rs b/tests/ui/for-loop-while/foreach-put-structured.rs
index 3a47fcf34..3a47fcf34 100644
--- a/src/test/ui/for-loop-while/foreach-put-structured.rs
+++ b/tests/ui/for-loop-while/foreach-put-structured.rs
diff --git a/src/test/ui/for-loop-while/foreach-simple-outer-slot.rs b/tests/ui/for-loop-while/foreach-simple-outer-slot.rs
index a8d42a789..a8d42a789 100644
--- a/src/test/ui/for-loop-while/foreach-simple-outer-slot.rs
+++ b/tests/ui/for-loop-while/foreach-simple-outer-slot.rs
diff --git a/src/test/ui/for-loop-while/issue-2216.rs b/tests/ui/for-loop-while/issue-2216.rs
index ad5410742..ad5410742 100644
--- a/src/test/ui/for-loop-while/issue-2216.rs
+++ b/tests/ui/for-loop-while/issue-2216.rs
diff --git a/src/test/ui/for-loop-while/issue-51345.rs b/tests/ui/for-loop-while/issue-51345.rs
index 15571e8bf..15571e8bf 100644
--- a/src/test/ui/for-loop-while/issue-51345.rs
+++ b/tests/ui/for-loop-while/issue-51345.rs
diff --git a/src/test/ui/for-loop-while/issue-69841.rs b/tests/ui/for-loop-while/issue-69841.rs
index 1aca16ca8..1aca16ca8 100644
--- a/src/test/ui/for-loop-while/issue-69841.rs
+++ b/tests/ui/for-loop-while/issue-69841.rs
diff --git a/src/test/ui/for-loop-while/label_break_value.rs b/tests/ui/for-loop-while/label_break_value.rs
index 10992c505..10992c505 100644
--- a/src/test/ui/for-loop-while/label_break_value.rs
+++ b/tests/ui/for-loop-while/label_break_value.rs
diff --git a/src/test/ui/for-loop-while/label_break_value_invalid.rs b/tests/ui/for-loop-while/label_break_value_invalid.rs
index fcf2e0f29..fcf2e0f29 100644
--- a/src/test/ui/for-loop-while/label_break_value_invalid.rs
+++ b/tests/ui/for-loop-while/label_break_value_invalid.rs
diff --git a/src/test/ui/for-loop-while/label_break_value_invalid.stderr b/tests/ui/for-loop-while/label_break_value_invalid.stderr
index f6999c4ab..f6999c4ab 100644
--- a/src/test/ui/for-loop-while/label_break_value_invalid.stderr
+++ b/tests/ui/for-loop-while/label_break_value_invalid.stderr
diff --git a/src/test/ui/for-loop-while/labeled-break.rs b/tests/ui/for-loop-while/labeled-break.rs
index 4dacc5757..4dacc5757 100644
--- a/src/test/ui/for-loop-while/labeled-break.rs
+++ b/tests/ui/for-loop-while/labeled-break.rs
diff --git a/src/test/ui/for-loop-while/linear-for-loop.rs b/tests/ui/for-loop-while/linear-for-loop.rs
index 3c573db1d..3c573db1d 100644
--- a/src/test/ui/for-loop-while/linear-for-loop.rs
+++ b/tests/ui/for-loop-while/linear-for-loop.rs
diff --git a/src/test/ui/for-loop-while/liveness-assign-imm-local-after-loop.rs b/tests/ui/for-loop-while/liveness-assign-imm-local-after-loop.rs
index 11b697165..11b697165 100644
--- a/src/test/ui/for-loop-while/liveness-assign-imm-local-after-loop.rs
+++ b/tests/ui/for-loop-while/liveness-assign-imm-local-after-loop.rs
diff --git a/src/test/ui/for-loop-while/liveness-loop-break.rs b/tests/ui/for-loop-while/liveness-loop-break.rs
index 60a63bccb..60a63bccb 100644
--- a/src/test/ui/for-loop-while/liveness-loop-break.rs
+++ b/tests/ui/for-loop-while/liveness-loop-break.rs
diff --git a/src/test/ui/for-loop-while/liveness-move-in-loop.rs b/tests/ui/for-loop-while/liveness-move-in-loop.rs
index ce73d6335..ce73d6335 100644
--- a/src/test/ui/for-loop-while/liveness-move-in-loop.rs
+++ b/tests/ui/for-loop-while/liveness-move-in-loop.rs
diff --git a/src/test/ui/for-loop-while/long-while.rs b/tests/ui/for-loop-while/long-while.rs
index 529cca7b7..529cca7b7 100644
--- a/src/test/ui/for-loop-while/long-while.rs
+++ b/tests/ui/for-loop-while/long-while.rs
diff --git a/src/test/ui/for-loop-while/loop-break-cont-1.rs b/tests/ui/for-loop-while/loop-break-cont-1.rs
index f207746f0..f207746f0 100644
--- a/src/test/ui/for-loop-while/loop-break-cont-1.rs
+++ b/tests/ui/for-loop-while/loop-break-cont-1.rs
diff --git a/src/test/ui/for-loop-while/loop-break-cont.rs b/tests/ui/for-loop-while/loop-break-cont.rs
index 92d5a32c6..92d5a32c6 100644
--- a/src/test/ui/for-loop-while/loop-break-cont.rs
+++ b/tests/ui/for-loop-while/loop-break-cont.rs
diff --git a/src/test/ui/for-loop-while/loop-break-value.rs b/tests/ui/for-loop-while/loop-break-value.rs
index d7209fc4d..d7209fc4d 100644
--- a/src/test/ui/for-loop-while/loop-break-value.rs
+++ b/tests/ui/for-loop-while/loop-break-value.rs
diff --git a/src/test/ui/for-loop-while/loop-diverges.rs b/tests/ui/for-loop-while/loop-diverges.rs
index f657bf9e0..f657bf9e0 100644
--- a/src/test/ui/for-loop-while/loop-diverges.rs
+++ b/tests/ui/for-loop-while/loop-diverges.rs
diff --git a/src/test/ui/for-loop-while/loop-label-shadowing.rs b/tests/ui/for-loop-while/loop-label-shadowing.rs
index 9bedde67b..9bedde67b 100644
--- a/src/test/ui/for-loop-while/loop-label-shadowing.rs
+++ b/tests/ui/for-loop-while/loop-label-shadowing.rs
diff --git a/src/test/ui/for-loop-while/loop-labeled-break-value.rs b/tests/ui/for-loop-while/loop-labeled-break-value.rs
index cc8f82698..cc8f82698 100644
--- a/src/test/ui/for-loop-while/loop-labeled-break-value.rs
+++ b/tests/ui/for-loop-while/loop-labeled-break-value.rs
diff --git a/src/test/ui/for-loop-while/loop-no-reinit-needed-post-bot.rs b/tests/ui/for-loop-while/loop-no-reinit-needed-post-bot.rs
index 1b5db2012..1b5db2012 100644
--- a/src/test/ui/for-loop-while/loop-no-reinit-needed-post-bot.rs
+++ b/tests/ui/for-loop-while/loop-no-reinit-needed-post-bot.rs
diff --git a/src/test/ui/for-loop-while/loop-scope.rs b/tests/ui/for-loop-while/loop-scope.rs
index 73324a3e1..73324a3e1 100644
--- a/src/test/ui/for-loop-while/loop-scope.rs
+++ b/tests/ui/for-loop-while/loop-scope.rs
diff --git a/src/test/ui/for-loop-while/while-cont.rs b/tests/ui/for-loop-while/while-cont.rs
index a864e8ef7..a864e8ef7 100644
--- a/src/test/ui/for-loop-while/while-cont.rs
+++ b/tests/ui/for-loop-while/while-cont.rs
diff --git a/src/test/ui/for-loop-while/while-flow-graph.rs b/tests/ui/for-loop-while/while-flow-graph.rs
index 1748964a7..1748964a7 100644
--- a/src/test/ui/for-loop-while/while-flow-graph.rs
+++ b/tests/ui/for-loop-while/while-flow-graph.rs
diff --git a/src/test/ui/for-loop-while/while-label.rs b/tests/ui/for-loop-while/while-label.rs
index 5abc41daf..5abc41daf 100644
--- a/src/test/ui/for-loop-while/while-label.rs
+++ b/tests/ui/for-loop-while/while-label.rs
diff --git a/src/test/ui/for-loop-while/while-let-2.rs b/tests/ui/for-loop-while/while-let-2.rs
index b9a49b47c..b9a49b47c 100644
--- a/src/test/ui/for-loop-while/while-let-2.rs
+++ b/tests/ui/for-loop-while/while-let-2.rs
diff --git a/src/test/ui/for-loop-while/while-let-2.stderr b/tests/ui/for-loop-while/while-let-2.stderr
index 1b1cf6792..1b1cf6792 100644
--- a/src/test/ui/for-loop-while/while-let-2.stderr
+++ b/tests/ui/for-loop-while/while-let-2.stderr
diff --git a/src/test/ui/for-loop-while/while-let.rs b/tests/ui/for-loop-while/while-let.rs
index b9d70ff0b..b9d70ff0b 100644
--- a/src/test/ui/for-loop-while/while-let.rs
+++ b/tests/ui/for-loop-while/while-let.rs
diff --git a/src/test/ui/for-loop-while/while-loop-constraints-2.rs b/tests/ui/for-loop-while/while-loop-constraints-2.rs
index 3c5cdf06c..3c5cdf06c 100644
--- a/src/test/ui/for-loop-while/while-loop-constraints-2.rs
+++ b/tests/ui/for-loop-while/while-loop-constraints-2.rs
diff --git a/src/test/ui/for-loop-while/while-prelude-drop.rs b/tests/ui/for-loop-while/while-prelude-drop.rs
index 196b9daf6..196b9daf6 100644
--- a/src/test/ui/for-loop-while/while-prelude-drop.rs
+++ b/tests/ui/for-loop-while/while-prelude-drop.rs
diff --git a/src/test/ui/for-loop-while/while-with-break.rs b/tests/ui/for-loop-while/while-with-break.rs
index a9d52dda5..a9d52dda5 100644
--- a/src/test/ui/for-loop-while/while-with-break.rs
+++ b/tests/ui/for-loop-while/while-with-break.rs
diff --git a/src/test/ui/for-loop-while/while.rs b/tests/ui/for-loop-while/while.rs
index 90f718a34..90f718a34 100644
--- a/src/test/ui/for-loop-while/while.rs
+++ b/tests/ui/for-loop-while/while.rs
diff --git a/src/test/ui/for/for-c-in-str.rs b/tests/ui/for/for-c-in-str.rs
index b086128d2..b086128d2 100644
--- a/src/test/ui/for/for-c-in-str.rs
+++ b/tests/ui/for/for-c-in-str.rs
diff --git a/src/test/ui/for/for-c-in-str.stderr b/tests/ui/for/for-c-in-str.stderr
index 959a7c43f..959a7c43f 100644
--- a/src/test/ui/for/for-c-in-str.stderr
+++ b/tests/ui/for/for-c-in-str.stderr
diff --git a/src/test/ui/for/for-expn.rs b/tests/ui/for/for-expn.rs
index b9c4bbeda..b9c4bbeda 100644
--- a/src/test/ui/for/for-expn.rs
+++ b/tests/ui/for/for-expn.rs
diff --git a/src/test/ui/for/for-expn.stderr b/tests/ui/for/for-expn.stderr
index cdb211555..cdb211555 100644
--- a/src/test/ui/for/for-expn.stderr
+++ b/tests/ui/for/for-expn.stderr
diff --git a/src/test/ui/for/for-loop-bogosity.rs b/tests/ui/for/for-loop-bogosity.rs
index 9341dea09..9341dea09 100644
--- a/src/test/ui/for/for-loop-bogosity.rs
+++ b/tests/ui/for/for-loop-bogosity.rs
diff --git a/src/test/ui/for/for-loop-bogosity.stderr b/tests/ui/for/for-loop-bogosity.stderr
index 9bf8056e8..9bf8056e8 100644
--- a/src/test/ui/for/for-loop-bogosity.stderr
+++ b/tests/ui/for/for-loop-bogosity.stderr
diff --git a/src/test/ui/for/for-loop-refutable-pattern-error-message.rs b/tests/ui/for/for-loop-refutable-pattern-error-message.rs
index 221951c87..221951c87 100644
--- a/src/test/ui/for/for-loop-refutable-pattern-error-message.rs
+++ b/tests/ui/for/for-loop-refutable-pattern-error-message.rs
diff --git a/src/test/ui/for/for-loop-refutable-pattern-error-message.stderr b/tests/ui/for/for-loop-refutable-pattern-error-message.stderr
index 20b689aa5..49a82a676 100644
--- a/src/test/ui/for/for-loop-refutable-pattern-error-message.stderr
+++ b/tests/ui/for/for-loop-refutable-pattern-error-message.stderr
@@ -1,4 +1,4 @@
-error[E0005]: refutable pattern in `for` loop binding: `&i32::MIN..=0_i32` and `&2_i32..=i32::MAX` not covered
+error[E0005]: refutable pattern in `for` loop binding
   --> $DIR/for-loop-refutable-pattern-error-message.rs:2:9
    |
 LL |     for &1 in [1].iter() {}
diff --git a/src/test/ui/for/for-loop-type-error.rs b/tests/ui/for/for-loop-type-error.rs
index 8d9fc20f0..8d9fc20f0 100644
--- a/src/test/ui/for/for-loop-type-error.rs
+++ b/tests/ui/for/for-loop-type-error.rs
diff --git a/src/test/ui/for/for-loop-type-error.stderr b/tests/ui/for/for-loop-type-error.stderr
index c93a3b9b2..c93a3b9b2 100644
--- a/src/test/ui/for/for-loop-type-error.stderr
+++ b/tests/ui/for/for-loop-type-error.stderr
diff --git a/src/test/ui/for/for-loop-unconstrained-element-type.rs b/tests/ui/for/for-loop-unconstrained-element-type.rs
index 0c7a3516a..0c7a3516a 100644
--- a/src/test/ui/for/for-loop-unconstrained-element-type.rs
+++ b/tests/ui/for/for-loop-unconstrained-element-type.rs
diff --git a/src/test/ui/for/for-loop-unconstrained-element-type.stderr b/tests/ui/for/for-loop-unconstrained-element-type.stderr
index b1b38f6b9..b1b38f6b9 100644
--- a/src/test/ui/for/for-loop-unconstrained-element-type.stderr
+++ b/tests/ui/for/for-loop-unconstrained-element-type.stderr
diff --git a/src/test/ui/foreign-fn-return-lifetime.fixed b/tests/ui/foreign-fn-return-lifetime.fixed
index 143d6343d..143d6343d 100644
--- a/src/test/ui/foreign-fn-return-lifetime.fixed
+++ b/tests/ui/foreign-fn-return-lifetime.fixed
diff --git a/src/test/ui/foreign-fn-return-lifetime.rs b/tests/ui/foreign-fn-return-lifetime.rs
index 76fe50a34..76fe50a34 100644
--- a/src/test/ui/foreign-fn-return-lifetime.rs
+++ b/tests/ui/foreign-fn-return-lifetime.rs
diff --git a/src/test/ui/foreign-fn-return-lifetime.stderr b/tests/ui/foreign-fn-return-lifetime.stderr
index df1a23a19..df1a23a19 100644
--- a/src/test/ui/foreign-fn-return-lifetime.stderr
+++ b/tests/ui/foreign-fn-return-lifetime.stderr
diff --git a/src/test/ui/foreign-unsafe-fn-called.mir.stderr b/tests/ui/foreign-unsafe-fn-called.mir.stderr
index d3cf5d84f..d3cf5d84f 100644
--- a/src/test/ui/foreign-unsafe-fn-called.mir.stderr
+++ b/tests/ui/foreign-unsafe-fn-called.mir.stderr
diff --git a/src/test/ui/foreign-unsafe-fn-called.rs b/tests/ui/foreign-unsafe-fn-called.rs
index 67302ea1b..67302ea1b 100644
--- a/src/test/ui/foreign-unsafe-fn-called.rs
+++ b/tests/ui/foreign-unsafe-fn-called.rs
diff --git a/src/test/ui/foreign-unsafe-fn-called.thir.stderr b/tests/ui/foreign-unsafe-fn-called.thir.stderr
index 00ba0f7a6..00ba0f7a6 100644
--- a/src/test/ui/foreign-unsafe-fn-called.thir.stderr
+++ b/tests/ui/foreign-unsafe-fn-called.thir.stderr
diff --git a/src/test/ui/foreign/auxiliary/fn-abi.rs b/tests/ui/foreign/auxiliary/fn-abi.rs
index 25c9e1b4c..25c9e1b4c 100644
--- a/src/test/ui/foreign/auxiliary/fn-abi.rs
+++ b/tests/ui/foreign/auxiliary/fn-abi.rs
diff --git a/src/test/ui/foreign/foreign-fn-linkname.rs b/tests/ui/foreign/foreign-fn-linkname.rs
index f6d820594..f6d820594 100644
--- a/src/test/ui/foreign/foreign-fn-linkname.rs
+++ b/tests/ui/foreign/foreign-fn-linkname.rs
diff --git a/src/test/ui/foreign/foreign-int-types.rs b/tests/ui/foreign/foreign-int-types.rs
index 2d01d3204..2d01d3204 100644
--- a/src/test/ui/foreign/foreign-int-types.rs
+++ b/tests/ui/foreign/foreign-int-types.rs
diff --git a/src/test/ui/foreign/foreign-mod-src/compiletest-ignore-dir b/tests/ui/foreign/foreign-mod-src/compiletest-ignore-dir
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/foreign/foreign-mod-src/compiletest-ignore-dir
+++ b/tests/ui/foreign/foreign-mod-src/compiletest-ignore-dir
diff --git a/src/test/ui/foreign/foreign-mod-src/inner.rs b/tests/ui/foreign/foreign-mod-src/inner.rs
index cf484878b..cf484878b 100644
--- a/src/test/ui/foreign/foreign-mod-src/inner.rs
+++ b/tests/ui/foreign/foreign-mod-src/inner.rs
diff --git a/src/test/ui/foreign/foreign-mod-unused-const.rs b/tests/ui/foreign/foreign-mod-unused-const.rs
index 7d79c30f4..7d79c30f4 100644
--- a/src/test/ui/foreign/foreign-mod-unused-const.rs
+++ b/tests/ui/foreign/foreign-mod-unused-const.rs
diff --git a/src/test/ui/foreign/foreign-pub-super.rs b/tests/ui/foreign/foreign-pub-super.rs
index 19f9e4e33..19f9e4e33 100644
--- a/src/test/ui/foreign/foreign-pub-super.rs
+++ b/tests/ui/foreign/foreign-pub-super.rs
diff --git a/src/test/ui/foreign/foreign-src/compiletest-ignore-dir b/tests/ui/foreign/foreign-src/compiletest-ignore-dir
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/foreign/foreign-src/compiletest-ignore-dir
+++ b/tests/ui/foreign/foreign-src/compiletest-ignore-dir
diff --git a/src/test/ui/foreign/foreign-src/foreign.rs b/tests/ui/foreign/foreign-src/foreign.rs
index 47016ad6c..47016ad6c 100644
--- a/src/test/ui/foreign/foreign-src/foreign.rs
+++ b/tests/ui/foreign/foreign-src/foreign.rs
diff --git a/src/test/ui/foreign/foreign-truncated-arguments.rs b/tests/ui/foreign/foreign-truncated-arguments.rs
index c61c2b587..c61c2b587 100644
--- a/src/test/ui/foreign/foreign-truncated-arguments.rs
+++ b/tests/ui/foreign/foreign-truncated-arguments.rs
diff --git a/src/test/ui/foreign/foreign2.rs b/tests/ui/foreign/foreign2.rs
index df431f299..df431f299 100644
--- a/src/test/ui/foreign/foreign2.rs
+++ b/tests/ui/foreign/foreign2.rs
diff --git a/src/test/ui/foreign/issue-74120-lowering-of-ffi-block-bodies.rs b/tests/ui/foreign/issue-74120-lowering-of-ffi-block-bodies.rs
index a84065e02..a84065e02 100644
--- a/src/test/ui/foreign/issue-74120-lowering-of-ffi-block-bodies.rs
+++ b/tests/ui/foreign/issue-74120-lowering-of-ffi-block-bodies.rs
diff --git a/src/test/ui/foreign/issue-74120-lowering-of-ffi-block-bodies.stderr b/tests/ui/foreign/issue-74120-lowering-of-ffi-block-bodies.stderr
index d4a9ca3e7..d4a9ca3e7 100644
--- a/src/test/ui/foreign/issue-74120-lowering-of-ffi-block-bodies.stderr
+++ b/tests/ui/foreign/issue-74120-lowering-of-ffi-block-bodies.stderr
diff --git a/src/test/ui/foreign/issue-91370-foreign-fn-block-impl.rs b/tests/ui/foreign/issue-91370-foreign-fn-block-impl.rs
index 2ac3ca293..2ac3ca293 100644
--- a/src/test/ui/foreign/issue-91370-foreign-fn-block-impl.rs
+++ b/tests/ui/foreign/issue-91370-foreign-fn-block-impl.rs
diff --git a/src/test/ui/foreign/issue-91370-foreign-fn-block-impl.stderr b/tests/ui/foreign/issue-91370-foreign-fn-block-impl.stderr
index 4fb2f8c65..4fb2f8c65 100644
--- a/src/test/ui/foreign/issue-91370-foreign-fn-block-impl.stderr
+++ b/tests/ui/foreign/issue-91370-foreign-fn-block-impl.stderr
diff --git a/src/test/ui/foreign/issue-99276-same-type-lifetimes.rs b/tests/ui/foreign/issue-99276-same-type-lifetimes.rs
index fce603c80..fce603c80 100644
--- a/src/test/ui/foreign/issue-99276-same-type-lifetimes.rs
+++ b/tests/ui/foreign/issue-99276-same-type-lifetimes.rs
diff --git a/src/test/ui/foreign/nil-decl-in-foreign.rs b/tests/ui/foreign/nil-decl-in-foreign.rs
index f3be94878..f3be94878 100644
--- a/src/test/ui/foreign/nil-decl-in-foreign.rs
+++ b/tests/ui/foreign/nil-decl-in-foreign.rs
diff --git a/src/test/ui/format-no-std.rs b/tests/ui/format-no-std.rs
index c9b7651bf..c9b7651bf 100644
--- a/src/test/ui/format-no-std.rs
+++ b/tests/ui/format-no-std.rs
diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name1.rs b/tests/ui/fully-qualified-type/fully-qualified-type-name1.rs
index 229c174da..229c174da 100644
--- a/src/test/ui/fully-qualified-type/fully-qualified-type-name1.rs
+++ b/tests/ui/fully-qualified-type/fully-qualified-type-name1.rs
diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name1.stderr b/tests/ui/fully-qualified-type/fully-qualified-type-name1.stderr
index 4750c5ccd..4750c5ccd 100644
--- a/src/test/ui/fully-qualified-type/fully-qualified-type-name1.stderr
+++ b/tests/ui/fully-qualified-type/fully-qualified-type-name1.stderr
diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.rs b/tests/ui/fully-qualified-type/fully-qualified-type-name2.rs
index 94a9f4e56..94a9f4e56 100644
--- a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.rs
+++ b/tests/ui/fully-qualified-type/fully-qualified-type-name2.rs
diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr b/tests/ui/fully-qualified-type/fully-qualified-type-name2.stderr
index a8f23f81d..a8f23f81d 100644
--- a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr
+++ b/tests/ui/fully-qualified-type/fully-qualified-type-name2.stderr
diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name4.rs b/tests/ui/fully-qualified-type/fully-qualified-type-name4.rs
index 2486ae009..2486ae009 100644
--- a/src/test/ui/fully-qualified-type/fully-qualified-type-name4.rs
+++ b/tests/ui/fully-qualified-type/fully-qualified-type-name4.rs
diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name4.stderr b/tests/ui/fully-qualified-type/fully-qualified-type-name4.stderr
index 778b13f24..778b13f24 100644
--- a/src/test/ui/fully-qualified-type/fully-qualified-type-name4.stderr
+++ b/tests/ui/fully-qualified-type/fully-qualified-type-name4.stderr
diff --git a/src/test/ui/fun-indirect-call.rs b/tests/ui/fun-indirect-call.rs
index 49da3d83f..49da3d83f 100644
--- a/src/test/ui/fun-indirect-call.rs
+++ b/tests/ui/fun-indirect-call.rs
diff --git a/src/test/ui/function-pointer/function-pointer-comparison-issue-54685.rs b/tests/ui/function-pointer/function-pointer-comparison-issue-54685.rs
index 855749c14..855749c14 100644
--- a/src/test/ui/function-pointer/function-pointer-comparison-issue-54685.rs
+++ b/tests/ui/function-pointer/function-pointer-comparison-issue-54685.rs
diff --git a/src/test/ui/function-pointer/issue-102289.rs b/tests/ui/function-pointer/issue-102289.rs
index de394ca9a..de394ca9a 100644
--- a/src/test/ui/function-pointer/issue-102289.rs
+++ b/tests/ui/function-pointer/issue-102289.rs
diff --git a/src/test/ui/function-pointer/sized-ret-with-binder.rs b/tests/ui/function-pointer/sized-ret-with-binder.rs
index 104ac4d22..104ac4d22 100644
--- a/src/test/ui/function-pointer/sized-ret-with-binder.rs
+++ b/tests/ui/function-pointer/sized-ret-with-binder.rs
diff --git a/src/test/ui/function-pointer/unsized-ret.rs b/tests/ui/function-pointer/unsized-ret.rs
index 79009c5cb..79009c5cb 100644
--- a/src/test/ui/function-pointer/unsized-ret.rs
+++ b/tests/ui/function-pointer/unsized-ret.rs
diff --git a/src/test/ui/function-pointer/unsized-ret.stderr b/tests/ui/function-pointer/unsized-ret.stderr
index 40bf7a389..6f430687e 100644
--- a/src/test/ui/function-pointer/unsized-ret.stderr
+++ b/tests/ui/function-pointer/unsized-ret.stderr
@@ -23,7 +23,7 @@ LL |     foo::<for<'a> fn(&'a ()) -> (dyn std::fmt::Display + 'a), _>(None, (&()
    |     required by a bound introduced by this call
    |
    = help: within `for<'a> fn(&'a ()) -> (dyn std::fmt::Display + 'a)`, the trait `for<'a> Sized` is not implemented for `(dyn std::fmt::Display + 'a)`
-   = note: required because it appears within the type `for<'a> fn(&'a ()) -> (dyn std::fmt::Display + 'a)`
+   = note: required because it appears within the type `for<'a> fn(&'a ()) -> (dyn Display + 'a)`
 note: required by a bound in `foo`
   --> $DIR/unsized-ret.rs:5:11
    |
diff --git a/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.rs b/tests/ui/functional-struct-update/functional-struct-update-noncopyable.rs
index a9d7d9c8a..a9d7d9c8a 100644
--- a/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.rs
+++ b/tests/ui/functional-struct-update/functional-struct-update-noncopyable.rs
diff --git a/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.stderr b/tests/ui/functional-struct-update/functional-struct-update-noncopyable.stderr
index 45cdd3d2d..45cdd3d2d 100644
--- a/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.stderr
+++ b/tests/ui/functional-struct-update/functional-struct-update-noncopyable.stderr
diff --git a/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.rs b/tests/ui/functional-struct-update/functional-struct-update-respects-privacy.rs
index 500633edf..500633edf 100644
--- a/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.rs
+++ b/tests/ui/functional-struct-update/functional-struct-update-respects-privacy.rs
diff --git a/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.stderr b/tests/ui/functional-struct-update/functional-struct-update-respects-privacy.stderr
index 0b8af90b4..0b8af90b4 100644
--- a/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.stderr
+++ b/tests/ui/functional-struct-update/functional-struct-update-respects-privacy.stderr
diff --git a/src/test/ui/functions-closures/auxiliary/fn-abi.rs b/tests/ui/functions-closures/auxiliary/fn-abi.rs
index ace9fbdfd..ace9fbdfd 100644
--- a/src/test/ui/functions-closures/auxiliary/fn-abi.rs
+++ b/tests/ui/functions-closures/auxiliary/fn-abi.rs
diff --git a/src/test/ui/functions-closures/call-closure-from-overloaded-op.rs b/tests/ui/functions-closures/call-closure-from-overloaded-op.rs
index 8e1c68fd7..8e1c68fd7 100644
--- a/src/test/ui/functions-closures/call-closure-from-overloaded-op.rs
+++ b/tests/ui/functions-closures/call-closure-from-overloaded-op.rs
diff --git a/src/test/ui/functions-closures/capture-clauses-boxed-closures.rs b/tests/ui/functions-closures/capture-clauses-boxed-closures.rs
index bcde50463..bcde50463 100644
--- a/src/test/ui/functions-closures/capture-clauses-boxed-closures.rs
+++ b/tests/ui/functions-closures/capture-clauses-boxed-closures.rs
diff --git a/src/test/ui/functions-closures/capture-clauses-unboxed-closures.rs b/tests/ui/functions-closures/capture-clauses-unboxed-closures.rs
index 206b3d7b6..206b3d7b6 100644
--- a/src/test/ui/functions-closures/capture-clauses-unboxed-closures.rs
+++ b/tests/ui/functions-closures/capture-clauses-unboxed-closures.rs
diff --git a/src/test/ui/functions-closures/clone-closure.rs b/tests/ui/functions-closures/clone-closure.rs
index 1e725d805..1e725d805 100644
--- a/src/test/ui/functions-closures/clone-closure.rs
+++ b/tests/ui/functions-closures/clone-closure.rs
diff --git a/src/test/ui/functions-closures/closure-bounds-can-capture-chan.rs b/tests/ui/functions-closures/closure-bounds-can-capture-chan.rs
index ccb2e201d..ccb2e201d 100644
--- a/src/test/ui/functions-closures/closure-bounds-can-capture-chan.rs
+++ b/tests/ui/functions-closures/closure-bounds-can-capture-chan.rs
diff --git a/tests/ui/functions-closures/closure-expected-type/README.md b/tests/ui/functions-closures/closure-expected-type/README.md
new file mode 100644
index 000000000..0b749040a
--- /dev/null
+++ b/tests/ui/functions-closures/closure-expected-type/README.md
@@ -0,0 +1,8 @@
+Some tests targeted at how we deduce the types of closure arguments.
+This process is a result of some heuristics aimed at combining the
+*expected type* we have with the *actual types* that we get from
+inputs. This investigation was kicked off by #38714, which revealed
+some pretty deep flaws in the ad-hoc way that we were doing things
+before.
+
+See also `tests/ui/closure-expected-type`.
diff --git a/src/test/ui/functions-closures/closure-expected-type/expect-infer-supply-two-infers.rs b/tests/ui/functions-closures/closure-expected-type/expect-infer-supply-two-infers.rs
index 6d5a9876c..6d5a9876c 100644
--- a/src/test/ui/functions-closures/closure-expected-type/expect-infer-supply-two-infers.rs
+++ b/tests/ui/functions-closures/closure-expected-type/expect-infer-supply-two-infers.rs
diff --git a/src/test/ui/functions-closures/closure-expected-type/issue-38714.rs b/tests/ui/functions-closures/closure-expected-type/issue-38714.rs
index e97785b5c..e97785b5c 100644
--- a/src/test/ui/functions-closures/closure-expected-type/issue-38714.rs
+++ b/tests/ui/functions-closures/closure-expected-type/issue-38714.rs
diff --git a/src/test/ui/functions-closures/closure-expected-type/supply-just-return-type.rs b/tests/ui/functions-closures/closure-expected-type/supply-just-return-type.rs
index e9964531c..e9964531c 100644
--- a/src/test/ui/functions-closures/closure-expected-type/supply-just-return-type.rs
+++ b/tests/ui/functions-closures/closure-expected-type/supply-just-return-type.rs
diff --git a/src/test/ui/functions-closures/closure-expected-type/supply-nothing.rs b/tests/ui/functions-closures/closure-expected-type/supply-nothing.rs
index 8665cfc21..8665cfc21 100644
--- a/src/test/ui/functions-closures/closure-expected-type/supply-nothing.rs
+++ b/tests/ui/functions-closures/closure-expected-type/supply-nothing.rs
diff --git a/src/test/ui/functions-closures/closure-immediate.rs b/tests/ui/functions-closures/closure-immediate.rs
index 428fc6bde..428fc6bde 100644
--- a/src/test/ui/functions-closures/closure-immediate.rs
+++ b/tests/ui/functions-closures/closure-immediate.rs
diff --git a/src/test/ui/functions-closures/closure-inference.rs b/tests/ui/functions-closures/closure-inference.rs
index 1877414f0..1877414f0 100644
--- a/src/test/ui/functions-closures/closure-inference.rs
+++ b/tests/ui/functions-closures/closure-inference.rs
diff --git a/src/test/ui/functions-closures/closure-inference2.rs b/tests/ui/functions-closures/closure-inference2.rs
index 4ce132e86..4ce132e86 100644
--- a/src/test/ui/functions-closures/closure-inference2.rs
+++ b/tests/ui/functions-closures/closure-inference2.rs
diff --git a/src/test/ui/functions-closures/closure-reform.rs b/tests/ui/functions-closures/closure-reform.rs
index 0bb6159ff..0bb6159ff 100644
--- a/src/test/ui/functions-closures/closure-reform.rs
+++ b/tests/ui/functions-closures/closure-reform.rs
diff --git a/src/test/ui/functions-closures/closure-returning-closure.rs b/tests/ui/functions-closures/closure-returning-closure.rs
index 17db81687..17db81687 100644
--- a/src/test/ui/functions-closures/closure-returning-closure.rs
+++ b/tests/ui/functions-closures/closure-returning-closure.rs
diff --git a/src/test/ui/functions-closures/closure-to-fn-coercion.rs b/tests/ui/functions-closures/closure-to-fn-coercion.rs
index 87ba488b5..87ba488b5 100644
--- a/src/test/ui/functions-closures/closure-to-fn-coercion.rs
+++ b/tests/ui/functions-closures/closure-to-fn-coercion.rs
diff --git a/src/test/ui/functions-closures/closure_to_fn_coercion-expected-types.rs b/tests/ui/functions-closures/closure_to_fn_coercion-expected-types.rs
index e7a938395..e7a938395 100644
--- a/src/test/ui/functions-closures/closure_to_fn_coercion-expected-types.rs
+++ b/tests/ui/functions-closures/closure_to_fn_coercion-expected-types.rs
diff --git a/src/test/ui/functions-closures/copy-closure.rs b/tests/ui/functions-closures/copy-closure.rs
index 72da02421..72da02421 100644
--- a/src/test/ui/functions-closures/copy-closure.rs
+++ b/tests/ui/functions-closures/copy-closure.rs
diff --git a/src/test/ui/functions-closures/fn-abi.rs b/tests/ui/functions-closures/fn-abi.rs
index ac3a4be33..ac3a4be33 100644
--- a/src/test/ui/functions-closures/fn-abi.rs
+++ b/tests/ui/functions-closures/fn-abi.rs
diff --git a/src/test/ui/functions-closures/fn-bare-assign.rs b/tests/ui/functions-closures/fn-bare-assign.rs
index f5dab3c84..f5dab3c84 100644
--- a/src/test/ui/functions-closures/fn-bare-assign.rs
+++ b/tests/ui/functions-closures/fn-bare-assign.rs
diff --git a/src/test/ui/functions-closures/fn-bare-coerce-to-block.rs b/tests/ui/functions-closures/fn-bare-coerce-to-block.rs
index 922e016dd..922e016dd 100644
--- a/src/test/ui/functions-closures/fn-bare-coerce-to-block.rs
+++ b/tests/ui/functions-closures/fn-bare-coerce-to-block.rs
diff --git a/src/test/ui/functions-closures/fn-bare-item.rs b/tests/ui/functions-closures/fn-bare-item.rs
index a6e6495a4..a6e6495a4 100644
--- a/src/test/ui/functions-closures/fn-bare-item.rs
+++ b/tests/ui/functions-closures/fn-bare-item.rs
diff --git a/src/test/ui/functions-closures/fn-bare-size.rs b/tests/ui/functions-closures/fn-bare-size.rs
index 2ba56eaae..2ba56eaae 100644
--- a/src/test/ui/functions-closures/fn-bare-size.rs
+++ b/tests/ui/functions-closures/fn-bare-size.rs
diff --git a/src/test/ui/functions-closures/fn-bare-spawn.rs b/tests/ui/functions-closures/fn-bare-spawn.rs
index 0d46fe220..0d46fe220 100644
--- a/src/test/ui/functions-closures/fn-bare-spawn.rs
+++ b/tests/ui/functions-closures/fn-bare-spawn.rs
diff --git a/src/test/ui/functions-closures/fn-coerce-field.rs b/tests/ui/functions-closures/fn-coerce-field.rs
index 38bde7b9e..38bde7b9e 100644
--- a/src/test/ui/functions-closures/fn-coerce-field.rs
+++ b/tests/ui/functions-closures/fn-coerce-field.rs
diff --git a/src/test/ui/functions-closures/fn-help-with-err-generic-is-not-function.rs b/tests/ui/functions-closures/fn-help-with-err-generic-is-not-function.rs
index e48ab4aa9..e48ab4aa9 100644
--- a/src/test/ui/functions-closures/fn-help-with-err-generic-is-not-function.rs
+++ b/tests/ui/functions-closures/fn-help-with-err-generic-is-not-function.rs
diff --git a/src/test/ui/functions-closures/fn-help-with-err-generic-is-not-function.stderr b/tests/ui/functions-closures/fn-help-with-err-generic-is-not-function.stderr
index 26bdf460f..9d4ea0115 100644
--- a/src/test/ui/functions-closures/fn-help-with-err-generic-is-not-function.stderr
+++ b/tests/ui/functions-closures/fn-help-with-err-generic-is-not-function.stderr
@@ -2,9 +2,12 @@ error[E0412]: cannot find type `T` in this scope
   --> $DIR/fn-help-with-err-generic-is-not-function.rs:2:13
    |
 LL | impl Struct<T>
-   |     -       ^ not found in this scope
-   |     |
-   |     help: you might be missing a type parameter: `<T>`
+   |             ^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+LL | impl<T> Struct<T>
+   |     +++
 
 error[E0412]: cannot find type `T` in this scope
   --> $DIR/fn-help-with-err-generic-is-not-function.rs:7:5
diff --git a/tests/ui/functions-closures/fn-help-with-err.rs b/tests/ui/functions-closures/fn-help-with-err.rs
new file mode 100644
index 000000000..612fe1b84
--- /dev/null
+++ b/tests/ui/functions-closures/fn-help-with-err.rs
@@ -0,0 +1,24 @@
+// This test case checks the behavior of typeck::check::method::suggest::is_fn on Ty::Error.
+
+struct Foo;
+
+trait Bar {
+    //~^ NOTE `Bar` defines an item `bar`, perhaps you need to implement it
+    fn bar(&self) {}
+}
+
+impl Bar for Foo {}
+
+fn main() {
+    let arc = std::sync::Arc::new(oops);
+    //~^ ERROR cannot find value `oops` in this scope
+    //~| NOTE not found
+    arc.bar();
+
+    let arc2 = std::sync::Arc::new(|| Foo);
+    arc2.bar();
+    //~^ ERROR no method named `bar`
+    //~| NOTE method not found
+    //~| HELP items from traits can only be used if the trait is implemented and in scope
+    //~| HELP use parentheses to call this closure
+}
diff --git a/tests/ui/functions-closures/fn-help-with-err.stderr b/tests/ui/functions-closures/fn-help-with-err.stderr
new file mode 100644
index 000000000..83a2b1f58
--- /dev/null
+++ b/tests/ui/functions-closures/fn-help-with-err.stderr
@@ -0,0 +1,27 @@
+error[E0425]: cannot find value `oops` in this scope
+  --> $DIR/fn-help-with-err.rs:13:35
+   |
+LL |     let arc = std::sync::Arc::new(oops);
+   |                                   ^^^^ not found in this scope
+
+error[E0599]: no method named `bar` found for struct `Arc<[closure@fn-help-with-err.rs:18:36]>` in the current scope
+  --> $DIR/fn-help-with-err.rs:19:10
+   |
+LL |     arc2.bar();
+   |          ^^^ method not found in `Arc<[closure@fn-help-with-err.rs:18:36]>`
+   |
+   = help: items from traits can only be used if the trait is implemented and in scope
+note: `Bar` defines an item `bar`, perhaps you need to implement it
+  --> $DIR/fn-help-with-err.rs:5:1
+   |
+LL | trait Bar {
+   | ^^^^^^^^^
+help: use parentheses to call this closure
+   |
+LL |     arc2().bar();
+   |         ++
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0425, E0599.
+For more information about an error, try `rustc --explain E0425`.
diff --git a/src/test/ui/functions-closures/fn-item-type-cast.rs b/tests/ui/functions-closures/fn-item-type-cast.rs
index 4d50ea97b..4d50ea97b 100644
--- a/src/test/ui/functions-closures/fn-item-type-cast.rs
+++ b/tests/ui/functions-closures/fn-item-type-cast.rs
diff --git a/src/test/ui/functions-closures/fn-item-type-coerce.rs b/tests/ui/functions-closures/fn-item-type-coerce.rs
index 7a096764e..7a096764e 100644
--- a/src/test/ui/functions-closures/fn-item-type-coerce.rs
+++ b/tests/ui/functions-closures/fn-item-type-coerce.rs
diff --git a/src/test/ui/functions-closures/fn-item-type-zero-sized.rs b/tests/ui/functions-closures/fn-item-type-zero-sized.rs
index bd9f1ed66..bd9f1ed66 100644
--- a/src/test/ui/functions-closures/fn-item-type-zero-sized.rs
+++ b/tests/ui/functions-closures/fn-item-type-zero-sized.rs
diff --git a/src/test/ui/functions-closures/fn-lval.rs b/tests/ui/functions-closures/fn-lval.rs
index 01079eea4..01079eea4 100644
--- a/src/test/ui/functions-closures/fn-lval.rs
+++ b/tests/ui/functions-closures/fn-lval.rs
diff --git a/src/test/ui/functions-closures/fn-type-infer.rs b/tests/ui/functions-closures/fn-type-infer.rs
index fe6567f22..fe6567f22 100644
--- a/src/test/ui/functions-closures/fn-type-infer.rs
+++ b/tests/ui/functions-closures/fn-type-infer.rs
diff --git a/src/test/ui/functions-closures/implied-bounds-closure-arg-outlives.rs b/tests/ui/functions-closures/implied-bounds-closure-arg-outlives.rs
index 4ac07123d..4ac07123d 100644
--- a/src/test/ui/functions-closures/implied-bounds-closure-arg-outlives.rs
+++ b/tests/ui/functions-closures/implied-bounds-closure-arg-outlives.rs
diff --git a/src/test/ui/functions-closures/nullable-pointer-opt-closures.rs b/tests/ui/functions-closures/nullable-pointer-opt-closures.rs
index 87dacfba2..87dacfba2 100644
--- a/src/test/ui/functions-closures/nullable-pointer-opt-closures.rs
+++ b/tests/ui/functions-closures/nullable-pointer-opt-closures.rs
diff --git a/src/test/ui/functions-closures/parallel-codegen-closures.rs b/tests/ui/functions-closures/parallel-codegen-closures.rs
index 79759daba..79759daba 100644
--- a/src/test/ui/functions-closures/parallel-codegen-closures.rs
+++ b/tests/ui/functions-closures/parallel-codegen-closures.rs
diff --git a/src/test/ui/functions-closures/return-from-closure.rs b/tests/ui/functions-closures/return-from-closure.rs
index 656a95f12..656a95f12 100644
--- a/src/test/ui/functions-closures/return-from-closure.rs
+++ b/tests/ui/functions-closures/return-from-closure.rs
diff --git a/src/test/ui/future-incompatible-lint-group.rs b/tests/ui/future-incompatible-lint-group.rs
index bbd0e33d7..bbd0e33d7 100644
--- a/src/test/ui/future-incompatible-lint-group.rs
+++ b/tests/ui/future-incompatible-lint-group.rs
diff --git a/src/test/ui/future-incompatible-lint-group.stderr b/tests/ui/future-incompatible-lint-group.stderr
index a8fb100a7..a8fb100a7 100644
--- a/src/test/ui/future-incompatible-lint-group.stderr
+++ b/tests/ui/future-incompatible-lint-group.stderr
diff --git a/src/test/ui/generator/addassign-yield.rs b/tests/ui/generator/addassign-yield.rs
index 66f22bf31..66f22bf31 100644
--- a/src/test/ui/generator/addassign-yield.rs
+++ b/tests/ui/generator/addassign-yield.rs
diff --git a/src/test/ui/generator/async-generator-issue-67158.rs b/tests/ui/generator/async-generator-issue-67158.rs
index 8125a7a9b..8125a7a9b 100644
--- a/src/test/ui/generator/async-generator-issue-67158.rs
+++ b/tests/ui/generator/async-generator-issue-67158.rs
diff --git a/src/test/ui/generator/async-generator-issue-67158.stderr b/tests/ui/generator/async-generator-issue-67158.stderr
index 7270d188e..7270d188e 100644
--- a/src/test/ui/generator/async-generator-issue-67158.stderr
+++ b/tests/ui/generator/async-generator-issue-67158.stderr
diff --git a/src/test/ui/generator/auto-trait-regions.rs b/tests/ui/generator/auto-trait-regions.rs
index ea4b0d554..ea4b0d554 100644
--- a/src/test/ui/generator/auto-trait-regions.rs
+++ b/tests/ui/generator/auto-trait-regions.rs
diff --git a/src/test/ui/generator/auto-trait-regions.stderr b/tests/ui/generator/auto-trait-regions.stderr
index 0b1f34aeb..0b1f34aeb 100644
--- a/src/test/ui/generator/auto-trait-regions.stderr
+++ b/tests/ui/generator/auto-trait-regions.stderr
diff --git a/src/test/ui/generator/auxiliary/metadata-sufficient-for-layout.rs b/tests/ui/generator/auxiliary/metadata-sufficient-for-layout.rs
index 207c2735f..207c2735f 100644
--- a/src/test/ui/generator/auxiliary/metadata-sufficient-for-layout.rs
+++ b/tests/ui/generator/auxiliary/metadata-sufficient-for-layout.rs
diff --git a/src/test/ui/generator/auxiliary/xcrate-reachable.rs b/tests/ui/generator/auxiliary/xcrate-reachable.rs
index 2dd5ea675..2dd5ea675 100644
--- a/src/test/ui/generator/auxiliary/xcrate-reachable.rs
+++ b/tests/ui/generator/auxiliary/xcrate-reachable.rs
diff --git a/src/test/ui/generator/auxiliary/xcrate.rs b/tests/ui/generator/auxiliary/xcrate.rs
index d07abd091..d07abd091 100644
--- a/src/test/ui/generator/auxiliary/xcrate.rs
+++ b/tests/ui/generator/auxiliary/xcrate.rs
diff --git a/src/test/ui/generator/borrow-in-tail-expr.rs b/tests/ui/generator/borrow-in-tail-expr.rs
index 540f5e3e1..540f5e3e1 100644
--- a/src/test/ui/generator/borrow-in-tail-expr.rs
+++ b/tests/ui/generator/borrow-in-tail-expr.rs
diff --git a/src/test/ui/generator/borrowing.rs b/tests/ui/generator/borrowing.rs
index d36592583..d36592583 100644
--- a/src/test/ui/generator/borrowing.rs
+++ b/tests/ui/generator/borrowing.rs
diff --git a/src/test/ui/generator/borrowing.stderr b/tests/ui/generator/borrowing.stderr
index 38e1ace8c..38e1ace8c 100644
--- a/src/test/ui/generator/borrowing.stderr
+++ b/tests/ui/generator/borrowing.stderr
diff --git a/src/test/ui/generator/clone-impl-async.rs b/tests/ui/generator/clone-impl-async.rs
index 9e9b59d36..9e9b59d36 100644
--- a/src/test/ui/generator/clone-impl-async.rs
+++ b/tests/ui/generator/clone-impl-async.rs
diff --git a/src/test/ui/generator/clone-impl-async.stderr b/tests/ui/generator/clone-impl-async.stderr
index 985472887..985472887 100644
--- a/src/test/ui/generator/clone-impl-async.stderr
+++ b/tests/ui/generator/clone-impl-async.stderr
diff --git a/src/test/ui/generator/clone-impl-static.rs b/tests/ui/generator/clone-impl-static.rs
index 55ed0f281..55ed0f281 100644
--- a/src/test/ui/generator/clone-impl-static.rs
+++ b/tests/ui/generator/clone-impl-static.rs
diff --git a/src/test/ui/generator/clone-impl-static.stderr b/tests/ui/generator/clone-impl-static.stderr
index cbadf6f15..cbadf6f15 100644
--- a/src/test/ui/generator/clone-impl-static.stderr
+++ b/tests/ui/generator/clone-impl-static.stderr
diff --git a/src/test/ui/generator/clone-impl.rs b/tests/ui/generator/clone-impl.rs
index cbfd65a53..cbfd65a53 100644
--- a/src/test/ui/generator/clone-impl.rs
+++ b/tests/ui/generator/clone-impl.rs
diff --git a/src/test/ui/generator/clone-impl.stderr b/tests/ui/generator/clone-impl.stderr
index a92646b19..a92646b19 100644
--- a/src/test/ui/generator/clone-impl.stderr
+++ b/tests/ui/generator/clone-impl.stderr
diff --git a/src/test/ui/generator/conditional-drop.rs b/tests/ui/generator/conditional-drop.rs
index 0927df869..0927df869 100644
--- a/src/test/ui/generator/conditional-drop.rs
+++ b/tests/ui/generator/conditional-drop.rs
diff --git a/src/test/ui/generator/control-flow.rs b/tests/ui/generator/control-flow.rs
index 4f69c7855..4f69c7855 100644
--- a/src/test/ui/generator/control-flow.rs
+++ b/tests/ui/generator/control-flow.rs
diff --git a/src/test/ui/generator/derived-drop-parent-expr.rs b/tests/ui/generator/derived-drop-parent-expr.rs
index 4bd34346a..4bd34346a 100644
--- a/src/test/ui/generator/derived-drop-parent-expr.rs
+++ b/tests/ui/generator/derived-drop-parent-expr.rs
diff --git a/src/test/ui/generator/discriminant.rs b/tests/ui/generator/discriminant.rs
index 195e77022..195e77022 100644
--- a/src/test/ui/generator/discriminant.rs
+++ b/tests/ui/generator/discriminant.rs
diff --git a/src/test/ui/generator/drop-and-replace.rs b/tests/ui/generator/drop-and-replace.rs
index a9a50a122..a9a50a122 100644
--- a/src/test/ui/generator/drop-and-replace.rs
+++ b/tests/ui/generator/drop-and-replace.rs
diff --git a/src/test/ui/generator/drop-control-flow.rs b/tests/ui/generator/drop-control-flow.rs
index d38368000..c6efda954 100644
--- a/src/test/ui/generator/drop-control-flow.rs
+++ b/tests/ui/generator/drop-control-flow.rs
@@ -18,7 +18,7 @@ impl !Send for NonSend {}
 
 fn assert_send<T: Send>(_: T) {}
 
-// This test case is reduced from src/test/ui/drop/dynamic-drop-async.rs
+// This test case is reduced from tests/ui/drop/dynamic-drop-async.rs
 fn one_armed_if(arg: bool) {
     let _ = || {
         let arr = [Ptr];
diff --git a/src/test/ui/generator/drop-env.rs b/tests/ui/generator/drop-env.rs
index 66dfb8c2c..66dfb8c2c 100644
--- a/src/test/ui/generator/drop-env.rs
+++ b/tests/ui/generator/drop-env.rs
diff --git a/src/test/ui/generator/drop-track-addassign-yield.rs b/tests/ui/generator/drop-track-addassign-yield.rs
index 71cfb170b..71cfb170b 100644
--- a/src/test/ui/generator/drop-track-addassign-yield.rs
+++ b/tests/ui/generator/drop-track-addassign-yield.rs
diff --git a/src/test/ui/generator/drop-tracking-parent-expression.rs b/tests/ui/generator/drop-tracking-parent-expression.rs
index d40f1b8f6..d40f1b8f6 100644
--- a/src/test/ui/generator/drop-tracking-parent-expression.rs
+++ b/tests/ui/generator/drop-tracking-parent-expression.rs
diff --git a/src/test/ui/generator/drop-tracking-parent-expression.stderr b/tests/ui/generator/drop-tracking-parent-expression.stderr
index fbf5d6e07..fbf5d6e07 100644
--- a/src/test/ui/generator/drop-tracking-parent-expression.stderr
+++ b/tests/ui/generator/drop-tracking-parent-expression.stderr
diff --git a/src/test/ui/generator/drop-tracking-yielding-in-match-guards.rs b/tests/ui/generator/drop-tracking-yielding-in-match-guards.rs
index 646365e43..646365e43 100644
--- a/src/test/ui/generator/drop-tracking-yielding-in-match-guards.rs
+++ b/tests/ui/generator/drop-tracking-yielding-in-match-guards.rs
diff --git a/src/test/ui/generator/drop-yield-twice.rs b/tests/ui/generator/drop-yield-twice.rs
index f484cbb8d..f484cbb8d 100644
--- a/src/test/ui/generator/drop-yield-twice.rs
+++ b/tests/ui/generator/drop-yield-twice.rs
diff --git a/src/test/ui/generator/drop-yield-twice.stderr b/tests/ui/generator/drop-yield-twice.stderr
index 0808a2c85..0808a2c85 100644
--- a/src/test/ui/generator/drop-yield-twice.stderr
+++ b/tests/ui/generator/drop-yield-twice.stderr
diff --git a/src/test/ui/generator/dropck-resume.rs b/tests/ui/generator/dropck-resume.rs
index 4c18077f3..4c18077f3 100644
--- a/src/test/ui/generator/dropck-resume.rs
+++ b/tests/ui/generator/dropck-resume.rs
diff --git a/src/test/ui/generator/dropck-resume.stderr b/tests/ui/generator/dropck-resume.stderr
index b0756eb55..b0756eb55 100644
--- a/src/test/ui/generator/dropck-resume.stderr
+++ b/tests/ui/generator/dropck-resume.stderr
diff --git a/src/test/ui/generator/dropck.rs b/tests/ui/generator/dropck.rs
index f82111a76..f82111a76 100644
--- a/src/test/ui/generator/dropck.rs
+++ b/tests/ui/generator/dropck.rs
diff --git a/src/test/ui/generator/dropck.stderr b/tests/ui/generator/dropck.stderr
index 7bb188352..7bb188352 100644
--- a/src/test/ui/generator/dropck.stderr
+++ b/tests/ui/generator/dropck.stderr
diff --git a/src/test/ui/generator/generator-region-requirements.migrate.stderr b/tests/ui/generator/generator-region-requirements.migrate.stderr
index 8a96d187f..8a96d187f 100644
--- a/src/test/ui/generator/generator-region-requirements.migrate.stderr
+++ b/tests/ui/generator/generator-region-requirements.migrate.stderr
diff --git a/src/test/ui/generator/generator-region-requirements.rs b/tests/ui/generator/generator-region-requirements.rs
index 7269a79ca..7269a79ca 100644
--- a/src/test/ui/generator/generator-region-requirements.rs
+++ b/tests/ui/generator/generator-region-requirements.rs
diff --git a/src/test/ui/generator/generator-region-requirements.stderr b/tests/ui/generator/generator-region-requirements.stderr
index 87f604672..87f604672 100644
--- a/src/test/ui/generator/generator-region-requirements.stderr
+++ b/tests/ui/generator/generator-region-requirements.stderr
diff --git a/src/test/ui/generator/generator-resume-after-panic.rs b/tests/ui/generator/generator-resume-after-panic.rs
index f2e67f1f7..f2e67f1f7 100644
--- a/src/test/ui/generator/generator-resume-after-panic.rs
+++ b/tests/ui/generator/generator-resume-after-panic.rs
diff --git a/src/test/ui/generator/generator-with-nll.rs b/tests/ui/generator/generator-with-nll.rs
index cee3e6d22..cee3e6d22 100644
--- a/src/test/ui/generator/generator-with-nll.rs
+++ b/tests/ui/generator/generator-with-nll.rs
diff --git a/src/test/ui/generator/generator-with-nll.stderr b/tests/ui/generator/generator-with-nll.stderr
index 14199aeb9..14199aeb9 100644
--- a/src/test/ui/generator/generator-with-nll.stderr
+++ b/tests/ui/generator/generator-with-nll.stderr
diff --git a/src/test/ui/generator/generator-yielding-or-returning-itself.rs b/tests/ui/generator/generator-yielding-or-returning-itself.rs
index 30788e3c1..30788e3c1 100644
--- a/src/test/ui/generator/generator-yielding-or-returning-itself.rs
+++ b/tests/ui/generator/generator-yielding-or-returning-itself.rs
diff --git a/src/test/ui/generator/generator-yielding-or-returning-itself.stderr b/tests/ui/generator/generator-yielding-or-returning-itself.stderr
index 8f5d2429a..8f5d2429a 100644
--- a/src/test/ui/generator/generator-yielding-or-returning-itself.stderr
+++ b/tests/ui/generator/generator-yielding-or-returning-itself.stderr
diff --git a/src/test/ui/generator/issue-102645.rs b/tests/ui/generator/issue-102645.rs
index 0589c5a00..35acd5cd7 100644
--- a/src/test/ui/generator/issue-102645.rs
+++ b/tests/ui/generator/issue-102645.rs
@@ -14,7 +14,7 @@ fn main() {
         a = d;
     };
     Pin::new(&mut b).resume();
-    //~^ ERROR this function takes 1 argument but 0 arguments were supplied
+    //~^ ERROR this method takes 1 argument but 0 arguments were supplied
     // This type error is required to reproduce the ICE...
 }
 
diff --git a/tests/ui/generator/issue-102645.stderr b/tests/ui/generator/issue-102645.stderr
new file mode 100644
index 000000000..f6d244029
--- /dev/null
+++ b/tests/ui/generator/issue-102645.stderr
@@ -0,0 +1,16 @@
+error[E0061]: this method takes 1 argument but 0 arguments were supplied
+  --> $DIR/issue-102645.rs:16:22
+   |
+LL |     Pin::new(&mut b).resume();
+   |                      ^^^^^^-- an argument of type `()` is missing
+   |
+note: associated function defined here
+  --> $SRC_DIR/core/src/ops/generator.rs:LL:COL
+help: provide the argument
+   |
+LL |     Pin::new(&mut b).resume(());
+   |                            ~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0061`.
diff --git a/src/test/ui/generator/issue-44197.rs b/tests/ui/generator/issue-44197.rs
index 389b9d139..389b9d139 100644
--- a/src/test/ui/generator/issue-44197.rs
+++ b/tests/ui/generator/issue-44197.rs
diff --git a/src/test/ui/generator/issue-45729-unsafe-in-generator.mir.stderr b/tests/ui/generator/issue-45729-unsafe-in-generator.mir.stderr
index 3afbea079..3afbea079 100644
--- a/src/test/ui/generator/issue-45729-unsafe-in-generator.mir.stderr
+++ b/tests/ui/generator/issue-45729-unsafe-in-generator.mir.stderr
diff --git a/src/test/ui/generator/issue-45729-unsafe-in-generator.rs b/tests/ui/generator/issue-45729-unsafe-in-generator.rs
index 379c36d2c..379c36d2c 100644
--- a/src/test/ui/generator/issue-45729-unsafe-in-generator.rs
+++ b/tests/ui/generator/issue-45729-unsafe-in-generator.rs
diff --git a/src/test/ui/generator/issue-45729-unsafe-in-generator.thir.stderr b/tests/ui/generator/issue-45729-unsafe-in-generator.thir.stderr
index 10d768f19..10d768f19 100644
--- a/src/test/ui/generator/issue-45729-unsafe-in-generator.thir.stderr
+++ b/tests/ui/generator/issue-45729-unsafe-in-generator.thir.stderr
diff --git a/src/test/ui/generator/issue-48048.rs b/tests/ui/generator/issue-48048.rs
index 992bbc97a..992bbc97a 100644
--- a/src/test/ui/generator/issue-48048.rs
+++ b/tests/ui/generator/issue-48048.rs
diff --git a/src/test/ui/generator/issue-48048.stderr b/tests/ui/generator/issue-48048.stderr
index 234235839..234235839 100644
--- a/src/test/ui/generator/issue-48048.stderr
+++ b/tests/ui/generator/issue-48048.stderr
diff --git a/src/test/ui/generator/issue-52304.rs b/tests/ui/generator/issue-52304.rs
index 3e9de765b..3e9de765b 100644
--- a/src/test/ui/generator/issue-52304.rs
+++ b/tests/ui/generator/issue-52304.rs
diff --git a/src/test/ui/generator/issue-52398.rs b/tests/ui/generator/issue-52398.rs
index ada380d11..ada380d11 100644
--- a/src/test/ui/generator/issue-52398.rs
+++ b/tests/ui/generator/issue-52398.rs
diff --git a/src/test/ui/generator/issue-52398.stderr b/tests/ui/generator/issue-52398.stderr
index 539343275..539343275 100644
--- a/src/test/ui/generator/issue-52398.stderr
+++ b/tests/ui/generator/issue-52398.stderr
diff --git a/src/test/ui/generator/issue-53548-1.rs b/tests/ui/generator/issue-53548-1.rs
index 173ae3c6f..173ae3c6f 100644
--- a/src/test/ui/generator/issue-53548-1.rs
+++ b/tests/ui/generator/issue-53548-1.rs
diff --git a/src/test/ui/generator/issue-53548.rs b/tests/ui/generator/issue-53548.rs
index 3ebabb914..3ebabb914 100644
--- a/src/test/ui/generator/issue-53548.rs
+++ b/tests/ui/generator/issue-53548.rs
diff --git a/src/test/ui/generator/issue-57017.rs b/tests/ui/generator/issue-57017.rs
index c0bde3b44..c0bde3b44 100644
--- a/src/test/ui/generator/issue-57017.rs
+++ b/tests/ui/generator/issue-57017.rs
diff --git a/src/test/ui/generator/issue-57084.rs b/tests/ui/generator/issue-57084.rs
index 2a5c3dd05..2a5c3dd05 100644
--- a/src/test/ui/generator/issue-57084.rs
+++ b/tests/ui/generator/issue-57084.rs
diff --git a/src/test/ui/generator/issue-57084.stderr b/tests/ui/generator/issue-57084.stderr
index 8f1fc5e80..8f1fc5e80 100644
--- a/src/test/ui/generator/issue-57084.stderr
+++ b/tests/ui/generator/issue-57084.stderr
diff --git a/src/test/ui/generator/issue-57478.rs b/tests/ui/generator/issue-57478.rs
index 91407ea18..91407ea18 100644
--- a/src/test/ui/generator/issue-57478.rs
+++ b/tests/ui/generator/issue-57478.rs
diff --git a/src/test/ui/generator/issue-58888.rs b/tests/ui/generator/issue-58888.rs
index d42d09d40..d42d09d40 100644
--- a/src/test/ui/generator/issue-58888.rs
+++ b/tests/ui/generator/issue-58888.rs
diff --git a/src/test/ui/generator/issue-61442-stmt-expr-with-drop.rs b/tests/ui/generator/issue-61442-stmt-expr-with-drop.rs
index 187c37402..187c37402 100644
--- a/src/test/ui/generator/issue-61442-stmt-expr-with-drop.rs
+++ b/tests/ui/generator/issue-61442-stmt-expr-with-drop.rs
diff --git a/src/test/ui/generator/issue-62506-two_awaits.rs b/tests/ui/generator/issue-62506-two_awaits.rs
index 672e16b78..672e16b78 100644
--- a/src/test/ui/generator/issue-62506-two_awaits.rs
+++ b/tests/ui/generator/issue-62506-two_awaits.rs
diff --git a/src/test/ui/generator/issue-64620-yield-array-element.rs b/tests/ui/generator/issue-64620-yield-array-element.rs
index 2cbe8f516..2cbe8f516 100644
--- a/src/test/ui/generator/issue-64620-yield-array-element.rs
+++ b/tests/ui/generator/issue-64620-yield-array-element.rs
diff --git a/src/test/ui/generator/issue-64620-yield-array-element.stderr b/tests/ui/generator/issue-64620-yield-array-element.stderr
index 48383c2ed..48383c2ed 100644
--- a/src/test/ui/generator/issue-64620-yield-array-element.stderr
+++ b/tests/ui/generator/issue-64620-yield-array-element.stderr
diff --git a/src/test/ui/generator/issue-68112.rs b/tests/ui/generator/issue-68112.rs
index 21026f45c..21026f45c 100644
--- a/src/test/ui/generator/issue-68112.rs
+++ b/tests/ui/generator/issue-68112.rs
diff --git a/src/test/ui/generator/issue-68112.stderr b/tests/ui/generator/issue-68112.stderr
index eb99d42c9..eb99d42c9 100644
--- a/src/test/ui/generator/issue-68112.stderr
+++ b/tests/ui/generator/issue-68112.stderr
diff --git a/src/test/ui/generator/issue-69017.rs b/tests/ui/generator/issue-69017.rs
index 511deb60e..511deb60e 100644
--- a/src/test/ui/generator/issue-69017.rs
+++ b/tests/ui/generator/issue-69017.rs
diff --git a/src/test/ui/generator/issue-69039.rs b/tests/ui/generator/issue-69039.rs
index ccc141860..ccc141860 100644
--- a/src/test/ui/generator/issue-69039.rs
+++ b/tests/ui/generator/issue-69039.rs
diff --git a/src/test/ui/generator/issue-87142.rs b/tests/ui/generator/issue-87142.rs
index fc10d04d4..fc10d04d4 100644
--- a/src/test/ui/generator/issue-87142.rs
+++ b/tests/ui/generator/issue-87142.rs
diff --git a/src/test/ui/generator/issue-88653.rs b/tests/ui/generator/issue-88653.rs
index 1d9377bce..1d9377bce 100644
--- a/src/test/ui/generator/issue-88653.rs
+++ b/tests/ui/generator/issue-88653.rs
diff --git a/src/test/ui/generator/issue-88653.stderr b/tests/ui/generator/issue-88653.stderr
index b742c6e2f..b742c6e2f 100644
--- a/src/test/ui/generator/issue-88653.stderr
+++ b/tests/ui/generator/issue-88653.stderr
diff --git a/src/test/ui/generator/issue-91477.rs b/tests/ui/generator/issue-91477.rs
index 6c027feb4..6c027feb4 100644
--- a/src/test/ui/generator/issue-91477.rs
+++ b/tests/ui/generator/issue-91477.rs
diff --git a/src/test/ui/generator/issue-91477.stderr b/tests/ui/generator/issue-91477.stderr
index 4597dc1bc..4597dc1bc 100644
--- a/src/test/ui/generator/issue-91477.stderr
+++ b/tests/ui/generator/issue-91477.stderr
diff --git a/src/test/ui/generator/issue-93161.rs b/tests/ui/generator/issue-93161.rs
index 92305609c..92305609c 100644
--- a/src/test/ui/generator/issue-93161.rs
+++ b/tests/ui/generator/issue-93161.rs
diff --git a/src/test/ui/generator/iterator-count.rs b/tests/ui/generator/iterator-count.rs
index 90eefe02f..90eefe02f 100644
--- a/src/test/ui/generator/iterator-count.rs
+++ b/tests/ui/generator/iterator-count.rs
diff --git a/src/test/ui/generator/layout-error.rs b/tests/ui/generator/layout-error.rs
index 7c3d18740..7c3d18740 100644
--- a/src/test/ui/generator/layout-error.rs
+++ b/tests/ui/generator/layout-error.rs
diff --git a/src/test/ui/generator/layout-error.stderr b/tests/ui/generator/layout-error.stderr
index b1a258f4f..b1a258f4f 100644
--- a/src/test/ui/generator/layout-error.stderr
+++ b/tests/ui/generator/layout-error.stderr
diff --git a/src/test/ui/generator/live-upvar-across-yield.rs b/tests/ui/generator/live-upvar-across-yield.rs
index 6a2e42a55..6a2e42a55 100644
--- a/src/test/ui/generator/live-upvar-across-yield.rs
+++ b/tests/ui/generator/live-upvar-across-yield.rs
diff --git a/src/test/ui/generator/match-bindings.rs b/tests/ui/generator/match-bindings.rs
index 865904a57..865904a57 100644
--- a/src/test/ui/generator/match-bindings.rs
+++ b/tests/ui/generator/match-bindings.rs
diff --git a/src/test/ui/generator/match-bindings.stderr b/tests/ui/generator/match-bindings.stderr
index 3dd2d5954..3dd2d5954 100644
--- a/src/test/ui/generator/match-bindings.stderr
+++ b/tests/ui/generator/match-bindings.stderr
diff --git a/src/test/ui/generator/metadata-sufficient-for-layout.rs b/tests/ui/generator/metadata-sufficient-for-layout.rs
index d0e648ee7..d0e648ee7 100644
--- a/src/test/ui/generator/metadata-sufficient-for-layout.rs
+++ b/tests/ui/generator/metadata-sufficient-for-layout.rs
diff --git a/src/test/ui/generator/metadata-sufficient-for-layout.stderr b/tests/ui/generator/metadata-sufficient-for-layout.stderr
index 3488b04f2..3488b04f2 100644
--- a/src/test/ui/generator/metadata-sufficient-for-layout.stderr
+++ b/tests/ui/generator/metadata-sufficient-for-layout.stderr
diff --git a/src/test/ui/generator/nested_generators.rs b/tests/ui/generator/nested_generators.rs
index 45519150e..45519150e 100644
--- a/src/test/ui/generator/nested_generators.rs
+++ b/tests/ui/generator/nested_generators.rs
diff --git a/src/test/ui/generator/niche-in-generator.rs b/tests/ui/generator/niche-in-generator.rs
index 42bee81f5..42bee81f5 100644
--- a/src/test/ui/generator/niche-in-generator.rs
+++ b/tests/ui/generator/niche-in-generator.rs
diff --git a/src/test/ui/generator/non-static-is-unpin.rs b/tests/ui/generator/non-static-is-unpin.rs
index 96d0a8e28..96d0a8e28 100644
--- a/src/test/ui/generator/non-static-is-unpin.rs
+++ b/tests/ui/generator/non-static-is-unpin.rs
diff --git a/src/test/ui/generator/not-send-sync.rs b/tests/ui/generator/not-send-sync.rs
index 8ca5565fb..8ca5565fb 100644
--- a/src/test/ui/generator/not-send-sync.rs
+++ b/tests/ui/generator/not-send-sync.rs
diff --git a/src/test/ui/generator/not-send-sync.stderr b/tests/ui/generator/not-send-sync.stderr
index a821c57b9..a821c57b9 100644
--- a/src/test/ui/generator/not-send-sync.stderr
+++ b/tests/ui/generator/not-send-sync.stderr
diff --git a/src/test/ui/generator/overlap-locals.rs b/tests/ui/generator/overlap-locals.rs
index 101c8714f..101c8714f 100644
--- a/src/test/ui/generator/overlap-locals.rs
+++ b/tests/ui/generator/overlap-locals.rs
diff --git a/src/test/ui/generator/panic-drops-resume.rs b/tests/ui/generator/panic-drops-resume.rs
index 4c3caeb14..4c3caeb14 100644
--- a/src/test/ui/generator/panic-drops-resume.rs
+++ b/tests/ui/generator/panic-drops-resume.rs
diff --git a/src/test/ui/generator/panic-drops.rs b/tests/ui/generator/panic-drops.rs
index 65001fd87..65001fd87 100644
--- a/src/test/ui/generator/panic-drops.rs
+++ b/tests/ui/generator/panic-drops.rs
diff --git a/src/test/ui/generator/panic-safe.rs b/tests/ui/generator/panic-safe.rs
index 3db80bb58..3db80bb58 100644
--- a/src/test/ui/generator/panic-safe.rs
+++ b/tests/ui/generator/panic-safe.rs
diff --git a/src/test/ui/generator/partial-drop.rs b/tests/ui/generator/partial-drop.rs
index c872fb7f3..c872fb7f3 100644
--- a/src/test/ui/generator/partial-drop.rs
+++ b/tests/ui/generator/partial-drop.rs
diff --git a/src/test/ui/generator/partial-drop.stderr b/tests/ui/generator/partial-drop.stderr
index 9baafe54e..9baafe54e 100644
--- a/src/test/ui/generator/partial-drop.stderr
+++ b/tests/ui/generator/partial-drop.stderr
diff --git a/src/test/ui/generator/partial-initialization-across-yield.rs b/tests/ui/generator/partial-initialization-across-yield.rs
index 65d9e6d39..65d9e6d39 100644
--- a/src/test/ui/generator/partial-initialization-across-yield.rs
+++ b/tests/ui/generator/partial-initialization-across-yield.rs
diff --git a/src/test/ui/generator/partial-initialization-across-yield.stderr b/tests/ui/generator/partial-initialization-across-yield.stderr
index 3f9f1c046..3f9f1c046 100644
--- a/src/test/ui/generator/partial-initialization-across-yield.stderr
+++ b/tests/ui/generator/partial-initialization-across-yield.stderr
diff --git a/src/test/ui/generator/pattern-borrow.rs b/tests/ui/generator/pattern-borrow.rs
index d19363708..d19363708 100644
--- a/src/test/ui/generator/pattern-borrow.rs
+++ b/tests/ui/generator/pattern-borrow.rs
diff --git a/src/test/ui/generator/pattern-borrow.stderr b/tests/ui/generator/pattern-borrow.stderr
index d78da5104..d78da5104 100644
--- a/src/test/ui/generator/pattern-borrow.stderr
+++ b/tests/ui/generator/pattern-borrow.stderr
diff --git a/src/test/ui/generator/pin-box-generator.rs b/tests/ui/generator/pin-box-generator.rs
index c3136f5c0..c3136f5c0 100644
--- a/src/test/ui/generator/pin-box-generator.rs
+++ b/tests/ui/generator/pin-box-generator.rs
diff --git a/src/test/ui/generator/print/generator-print-verbose-1.rs b/tests/ui/generator/print/generator-print-verbose-1.rs
index fe0687722..89124ad72 100644
--- a/src/test/ui/generator/print/generator-print-verbose-1.rs
+++ b/tests/ui/generator/print/generator-print-verbose-1.rs
@@ -1,6 +1,6 @@
 // compile-flags: -Zverbose
 
-// Same as: src/test/ui/generator/issue-68112.stderr
+// Same as: tests/ui/generator/issue-68112.stderr
 
 #![feature(generators, generator_trait)]
 
diff --git a/src/test/ui/generator/print/generator-print-verbose-1.stderr b/tests/ui/generator/print/generator-print-verbose-1.stderr
index ed0628bbb..ebf35be58 100644
--- a/src/test/ui/generator/print/generator-print-verbose-1.stderr
+++ b/tests/ui/generator/print/generator-print-verbose-1.stderr
@@ -35,7 +35,7 @@ note: required because it's used within this generator
    |
 LL |     || {
    |     ^^
-note: required because it appears within the type `Opaque(DefId(0:35 ~ generator_print_verbose_1[749a]::make_gen2::{opaque#0}), [std::sync::Arc<std::cell::RefCell<i32>>])`
+note: required because it appears within the type `Opaque(DefId(0:35 ~ generator_print_verbose_1[749a]::make_gen2::{opaque#0}), [Arc<RefCell<i32>>])`
   --> $DIR/generator-print-verbose-1.rs:41:30
    |
 LL | pub fn make_gen2<T>(t: T) -> impl Generator<Return = T> {
diff --git a/src/test/ui/generator/print/generator-print-verbose-2.rs b/tests/ui/generator/print/generator-print-verbose-2.rs
index d914719cb..d914719cb 100644
--- a/src/test/ui/generator/print/generator-print-verbose-2.rs
+++ b/tests/ui/generator/print/generator-print-verbose-2.rs
diff --git a/src/test/ui/generator/print/generator-print-verbose-2.stderr b/tests/ui/generator/print/generator-print-verbose-2.stderr
index 909e49c38..909e49c38 100644
--- a/src/test/ui/generator/print/generator-print-verbose-2.stderr
+++ b/tests/ui/generator/print/generator-print-verbose-2.stderr
diff --git a/src/test/ui/generator/print/generator-print-verbose-3.rs b/tests/ui/generator/print/generator-print-verbose-3.rs
index 8689539ec..8689539ec 100644
--- a/src/test/ui/generator/print/generator-print-verbose-3.rs
+++ b/tests/ui/generator/print/generator-print-verbose-3.rs
diff --git a/src/test/ui/generator/print/generator-print-verbose-3.stderr b/tests/ui/generator/print/generator-print-verbose-3.stderr
index d15646259..d15646259 100644
--- a/src/test/ui/generator/print/generator-print-verbose-3.stderr
+++ b/tests/ui/generator/print/generator-print-verbose-3.stderr
diff --git a/src/test/ui/generator/reborrow-mut-upvar.rs b/tests/ui/generator/reborrow-mut-upvar.rs
index dbd9e24e2..dbd9e24e2 100644
--- a/src/test/ui/generator/reborrow-mut-upvar.rs
+++ b/tests/ui/generator/reborrow-mut-upvar.rs
diff --git a/src/test/ui/generator/reborrow-mut-upvar.stderr b/tests/ui/generator/reborrow-mut-upvar.stderr
index 2e1fec35e..2e1fec35e 100644
--- a/src/test/ui/generator/reborrow-mut-upvar.stderr
+++ b/tests/ui/generator/reborrow-mut-upvar.stderr
diff --git a/src/test/ui/generator/ref-escapes-but-not-over-yield.rs b/tests/ui/generator/ref-escapes-but-not-over-yield.rs
index 3856d8233..3856d8233 100644
--- a/src/test/ui/generator/ref-escapes-but-not-over-yield.rs
+++ b/tests/ui/generator/ref-escapes-but-not-over-yield.rs
diff --git a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr b/tests/ui/generator/ref-escapes-but-not-over-yield.stderr
index 5fc810040..5fc810040 100644
--- a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr
+++ b/tests/ui/generator/ref-escapes-but-not-over-yield.stderr
diff --git a/tests/ui/generator/ref-upvar-not-send.rs b/tests/ui/generator/ref-upvar-not-send.rs
new file mode 100644
index 000000000..eb9ef63ec
--- /dev/null
+++ b/tests/ui/generator/ref-upvar-not-send.rs
@@ -0,0 +1,31 @@
+// For `Send` generators, suggest a `T: Sync` requirement for `&T` upvars,
+// and suggest a `T: Send` requirement for `&mut T` upvars.
+
+#![feature(generators)]
+
+fn assert_send<T: Send>(_: T) {}
+//~^ NOTE required by a bound in `assert_send`
+//~| NOTE required by this bound in `assert_send`
+//~| NOTE required by a bound in `assert_send`
+//~| NOTE required by this bound in `assert_send`
+
+fn main() {
+    let x: &*mut () = &std::ptr::null_mut();
+    let y: &mut *mut () = &mut std::ptr::null_mut();
+    assert_send(move || {
+        //~^ ERROR generator cannot be sent between threads safely
+        //~| NOTE generator is not `Send`
+        yield;
+        let _x = x;
+    });
+    //~^^ NOTE captured value is not `Send` because `&` references cannot be sent unless their referent is `Sync`
+    //~| NOTE has type `&*mut ()` which is not `Send`, because `*mut ()` is not `Sync`
+    assert_send(move || {
+        //~^ ERROR generator cannot be sent between threads safely
+        //~| NOTE generator is not `Send`
+        yield;
+        let _y = y;
+    });
+    //~^^ NOTE captured value is not `Send` because `&mut` references cannot be sent unless their referent is `Send`
+    //~| NOTE has type `&mut *mut ()` which is not `Send`, because `*mut ()` is not `Send`
+}
diff --git a/tests/ui/generator/ref-upvar-not-send.stderr b/tests/ui/generator/ref-upvar-not-send.stderr
new file mode 100644
index 000000000..689ace67e
--- /dev/null
+++ b/tests/ui/generator/ref-upvar-not-send.stderr
@@ -0,0 +1,50 @@
+error: generator cannot be sent between threads safely
+  --> $DIR/ref-upvar-not-send.rs:15:17
+   |
+LL |       assert_send(move || {
+   |  _________________^
+LL | |
+LL | |
+LL | |         yield;
+LL | |         let _x = x;
+LL | |     });
+   | |_____^ generator is not `Send`
+   |
+   = help: the trait `Sync` is not implemented for `*mut ()`
+note: captured value is not `Send` because `&` references cannot be sent unless their referent is `Sync`
+  --> $DIR/ref-upvar-not-send.rs:19:18
+   |
+LL |         let _x = x;
+   |                  ^ has type `&*mut ()` which is not `Send`, because `*mut ()` is not `Sync`
+note: required by a bound in `assert_send`
+  --> $DIR/ref-upvar-not-send.rs:6:19
+   |
+LL | fn assert_send<T: Send>(_: T) {}
+   |                   ^^^^ required by this bound in `assert_send`
+
+error: generator cannot be sent between threads safely
+  --> $DIR/ref-upvar-not-send.rs:23:17
+   |
+LL |       assert_send(move || {
+   |  _________________^
+LL | |
+LL | |
+LL | |         yield;
+LL | |         let _y = y;
+LL | |     });
+   | |_____^ generator is not `Send`
+   |
+   = help: within `[generator@$DIR/ref-upvar-not-send.rs:23:17: 23:24]`, the trait `Send` is not implemented for `*mut ()`
+note: captured value is not `Send` because `&mut` references cannot be sent unless their referent is `Send`
+  --> $DIR/ref-upvar-not-send.rs:27:18
+   |
+LL |         let _y = y;
+   |                  ^ has type `&mut *mut ()` which is not `Send`, because `*mut ()` is not `Send`
+note: required by a bound in `assert_send`
+  --> $DIR/ref-upvar-not-send.rs:6:19
+   |
+LL | fn assert_send<T: Send>(_: T) {}
+   |                   ^^^^ required by this bound in `assert_send`
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/generator/reinit-in-match-guard.rs b/tests/ui/generator/reinit-in-match-guard.rs
index 260b341a5..260b341a5 100644
--- a/src/test/ui/generator/reinit-in-match-guard.rs
+++ b/tests/ui/generator/reinit-in-match-guard.rs
diff --git a/src/test/ui/generator/resume-after-return.rs b/tests/ui/generator/resume-after-return.rs
index 01a059a16..01a059a16 100644
--- a/src/test/ui/generator/resume-after-return.rs
+++ b/tests/ui/generator/resume-after-return.rs
diff --git a/src/test/ui/generator/resume-arg-late-bound.rs b/tests/ui/generator/resume-arg-late-bound.rs
index 1c35ba80d..1c35ba80d 100644
--- a/src/test/ui/generator/resume-arg-late-bound.rs
+++ b/tests/ui/generator/resume-arg-late-bound.rs
diff --git a/src/test/ui/generator/resume-arg-late-bound.stderr b/tests/ui/generator/resume-arg-late-bound.stderr
index 34ee4036c..34ee4036c 100644
--- a/src/test/ui/generator/resume-arg-late-bound.stderr
+++ b/tests/ui/generator/resume-arg-late-bound.stderr
diff --git a/src/test/ui/generator/resume-arg-size.rs b/tests/ui/generator/resume-arg-size.rs
index b93dc54f7..b93dc54f7 100644
--- a/src/test/ui/generator/resume-arg-size.rs
+++ b/tests/ui/generator/resume-arg-size.rs
diff --git a/src/test/ui/generator/resume-live-across-yield.rs b/tests/ui/generator/resume-live-across-yield.rs
index 4c4cf117a..4c4cf117a 100644
--- a/src/test/ui/generator/resume-live-across-yield.rs
+++ b/tests/ui/generator/resume-live-across-yield.rs
diff --git a/src/test/ui/generator/retain-resume-ref.rs b/tests/ui/generator/retain-resume-ref.rs
index 0606ea71c..0606ea71c 100644
--- a/src/test/ui/generator/retain-resume-ref.rs
+++ b/tests/ui/generator/retain-resume-ref.rs
diff --git a/src/test/ui/generator/retain-resume-ref.stderr b/tests/ui/generator/retain-resume-ref.stderr
index e33310d12..e33310d12 100644
--- a/src/test/ui/generator/retain-resume-ref.stderr
+++ b/tests/ui/generator/retain-resume-ref.stderr
diff --git a/src/test/ui/generator/size-moved-locals.rs b/tests/ui/generator/size-moved-locals.rs
index 601a31418..601a31418 100644
--- a/src/test/ui/generator/size-moved-locals.rs
+++ b/tests/ui/generator/size-moved-locals.rs
diff --git a/src/test/ui/generator/sized-yield.rs b/tests/ui/generator/sized-yield.rs
index c6dd738d6..c6dd738d6 100644
--- a/src/test/ui/generator/sized-yield.rs
+++ b/tests/ui/generator/sized-yield.rs
diff --git a/src/test/ui/generator/sized-yield.stderr b/tests/ui/generator/sized-yield.stderr
index ea2a48d13..fb34540d9 100644
--- a/src/test/ui/generator/sized-yield.stderr
+++ b/tests/ui/generator/sized-yield.stderr
@@ -20,9 +20,6 @@ LL |    Pin::new(&mut gen).resume(());
    = help: the trait `Sized` is not implemented for `str`
 note: required by a bound in `GeneratorState`
   --> $SRC_DIR/core/src/ops/generator.rs:LL:COL
-   |
-LL | pub enum GeneratorState<Y, R> {
-   |                         ^ required by this bound in `GeneratorState`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/generator/smoke-resume-args.rs b/tests/ui/generator/smoke-resume-args.rs
index fa9271c53..fa9271c53 100644
--- a/src/test/ui/generator/smoke-resume-args.rs
+++ b/tests/ui/generator/smoke-resume-args.rs
diff --git a/src/test/ui/generator/smoke.rs b/tests/ui/generator/smoke.rs
index 7a917a05d..7a917a05d 100644
--- a/src/test/ui/generator/smoke.rs
+++ b/tests/ui/generator/smoke.rs
diff --git a/src/test/ui/generator/static-generators.rs b/tests/ui/generator/static-generators.rs
index d098bf1e6..d098bf1e6 100644
--- a/src/test/ui/generator/static-generators.rs
+++ b/tests/ui/generator/static-generators.rs
diff --git a/src/test/ui/generator/static-mut-reference-across-yield.rs b/tests/ui/generator/static-mut-reference-across-yield.rs
index 0fa6d9cdc..0fa6d9cdc 100644
--- a/src/test/ui/generator/static-mut-reference-across-yield.rs
+++ b/tests/ui/generator/static-mut-reference-across-yield.rs
diff --git a/src/test/ui/generator/static-not-unpin.rs b/tests/ui/generator/static-not-unpin.rs
index cfcb94737..cfcb94737 100644
--- a/src/test/ui/generator/static-not-unpin.rs
+++ b/tests/ui/generator/static-not-unpin.rs
diff --git a/src/test/ui/generator/static-not-unpin.stderr b/tests/ui/generator/static-not-unpin.stderr
index e3859595f..e3859595f 100644
--- a/src/test/ui/generator/static-not-unpin.stderr
+++ b/tests/ui/generator/static-not-unpin.stderr
diff --git a/src/test/ui/generator/static-reference-across-yield.rs b/tests/ui/generator/static-reference-across-yield.rs
index 23b11593b..23b11593b 100644
--- a/src/test/ui/generator/static-reference-across-yield.rs
+++ b/tests/ui/generator/static-reference-across-yield.rs
diff --git a/src/test/ui/generator/too-live-local-in-immovable-gen.rs b/tests/ui/generator/too-live-local-in-immovable-gen.rs
index e0b856db7..e0b856db7 100644
--- a/src/test/ui/generator/too-live-local-in-immovable-gen.rs
+++ b/tests/ui/generator/too-live-local-in-immovable-gen.rs
diff --git a/src/test/ui/generator/too-live-local-in-immovable-gen.stderr b/tests/ui/generator/too-live-local-in-immovable-gen.stderr
index e262f213f..e262f213f 100644
--- a/src/test/ui/generator/too-live-local-in-immovable-gen.stderr
+++ b/tests/ui/generator/too-live-local-in-immovable-gen.stderr
diff --git a/src/test/ui/generator/too-many-parameters.rs b/tests/ui/generator/too-many-parameters.rs
index 7a353ea29..7a353ea29 100644
--- a/src/test/ui/generator/too-many-parameters.rs
+++ b/tests/ui/generator/too-many-parameters.rs
diff --git a/src/test/ui/generator/too-many-parameters.stderr b/tests/ui/generator/too-many-parameters.stderr
index 22d40db3f..22d40db3f 100644
--- a/src/test/ui/generator/too-many-parameters.stderr
+++ b/tests/ui/generator/too-many-parameters.stderr
diff --git a/src/test/ui/generator/type-mismatch-error.rs b/tests/ui/generator/type-mismatch-error.rs
index d39c788a8..d39c788a8 100644
--- a/src/test/ui/generator/type-mismatch-error.rs
+++ b/tests/ui/generator/type-mismatch-error.rs
diff --git a/src/test/ui/generator/type-mismatch-error.stderr b/tests/ui/generator/type-mismatch-error.stderr
index 8f5949533..8f5949533 100644
--- a/src/test/ui/generator/type-mismatch-error.stderr
+++ b/tests/ui/generator/type-mismatch-error.stderr
diff --git a/src/test/ui/generator/type-mismatch-signature-deduction.rs b/tests/ui/generator/type-mismatch-signature-deduction.rs
index 8d1ce6c7a..8d1ce6c7a 100644
--- a/src/test/ui/generator/type-mismatch-signature-deduction.rs
+++ b/tests/ui/generator/type-mismatch-signature-deduction.rs
diff --git a/src/test/ui/generator/type-mismatch-signature-deduction.stderr b/tests/ui/generator/type-mismatch-signature-deduction.stderr
index b98da1ed8..b98da1ed8 100644
--- a/src/test/ui/generator/type-mismatch-signature-deduction.stderr
+++ b/tests/ui/generator/type-mismatch-signature-deduction.stderr
diff --git a/tests/ui/generator/unresolved-ct-var-drop-tracking.rs b/tests/ui/generator/unresolved-ct-var-drop-tracking.rs
new file mode 100644
index 000000000..a6589348d
--- /dev/null
+++ b/tests/ui/generator/unresolved-ct-var-drop-tracking.rs
@@ -0,0 +1,15 @@
+// incremental
+// edition:2021
+// compile-flags: -Zdrop-tracking
+
+fn main() {
+    let _ = async {
+        let s = std::array::from_fn(|_| ()).await;
+        //~^ ERROR `[(); _]` is not a future
+        //~| ERROR type inside `async` block must be known in this context
+        //~| ERROR type inside `async` block must be known in this context
+        //~| ERROR type inside `async` block must be known in this context
+        //~| ERROR type inside `async` block must be known in this context
+        //~| ERROR type inside `async` block must be known in this context
+    };
+}
diff --git a/tests/ui/generator/unresolved-ct-var-drop-tracking.stderr b/tests/ui/generator/unresolved-ct-var-drop-tracking.stderr
new file mode 100644
index 000000000..9e1fed54c
--- /dev/null
+++ b/tests/ui/generator/unresolved-ct-var-drop-tracking.stderr
@@ -0,0 +1,78 @@
+error[E0277]: `[(); _]` is not a future
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ---------------------------^^^^^^
+   |                 |                          |
+   |                 |                          `[(); _]` is not a future
+   |                 |                          help: remove the `.await`
+   |                 this call returns `[(); _]`
+   |
+   = help: the trait `Future` is not implemented for `[(); _]`
+   = note: [(); _] must be a future or must implement `IntoFuture` to be awaited
+   = note: required for `[(); _]` to implement `IntoFuture`
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error: aborting due to 6 previous errors
+
+Some errors have detailed explanations: E0277, E0698.
+For more information about an error, try `rustc --explain E0277`.
diff --git a/src/test/ui/generator/unresolved-ct-var.rs b/tests/ui/generator/unresolved-ct-var.rs
index 0a1570fc2..0a1570fc2 100644
--- a/src/test/ui/generator/unresolved-ct-var.rs
+++ b/tests/ui/generator/unresolved-ct-var.rs
diff --git a/src/test/ui/generator/unresolved-ct-var.stderr b/tests/ui/generator/unresolved-ct-var.stderr
index fdf00dfad..fdf00dfad 100644
--- a/src/test/ui/generator/unresolved-ct-var.stderr
+++ b/tests/ui/generator/unresolved-ct-var.stderr
diff --git a/src/test/ui/generator/xcrate-reachable.rs b/tests/ui/generator/xcrate-reachable.rs
index 1b1cff338..1b1cff338 100644
--- a/src/test/ui/generator/xcrate-reachable.rs
+++ b/tests/ui/generator/xcrate-reachable.rs
diff --git a/src/test/ui/generator/xcrate.rs b/tests/ui/generator/xcrate.rs
index 40986bbeb..40986bbeb 100644
--- a/src/test/ui/generator/xcrate.rs
+++ b/tests/ui/generator/xcrate.rs
diff --git a/src/test/ui/generator/yield-in-args-rev.rs b/tests/ui/generator/yield-in-args-rev.rs
index 4c99bb3ef..4c99bb3ef 100644
--- a/src/test/ui/generator/yield-in-args-rev.rs
+++ b/tests/ui/generator/yield-in-args-rev.rs
diff --git a/src/test/ui/generator/yield-in-args-rev.stderr b/tests/ui/generator/yield-in-args-rev.stderr
index a87248f66..a87248f66 100644
--- a/src/test/ui/generator/yield-in-args-rev.stderr
+++ b/tests/ui/generator/yield-in-args-rev.stderr
diff --git a/src/test/ui/generator/yield-in-args.rs b/tests/ui/generator/yield-in-args.rs
index 80110af55..80110af55 100644
--- a/src/test/ui/generator/yield-in-args.rs
+++ b/tests/ui/generator/yield-in-args.rs
diff --git a/src/test/ui/generator/yield-in-args.stderr b/tests/ui/generator/yield-in-args.stderr
index ee6d22c27..ee6d22c27 100644
--- a/src/test/ui/generator/yield-in-args.stderr
+++ b/tests/ui/generator/yield-in-args.stderr
diff --git a/src/test/ui/generator/yield-in-box.rs b/tests/ui/generator/yield-in-box.rs
index dd6fa7c15..dd6fa7c15 100644
--- a/src/test/ui/generator/yield-in-box.rs
+++ b/tests/ui/generator/yield-in-box.rs
diff --git a/src/test/ui/generator/yield-in-box.stderr b/tests/ui/generator/yield-in-box.stderr
index 9d03ee008..9d03ee008 100644
--- a/src/test/ui/generator/yield-in-box.stderr
+++ b/tests/ui/generator/yield-in-box.stderr
diff --git a/src/test/ui/generator/yield-in-const.rs b/tests/ui/generator/yield-in-const.rs
index fe5ca822c..fe5ca822c 100644
--- a/src/test/ui/generator/yield-in-const.rs
+++ b/tests/ui/generator/yield-in-const.rs
diff --git a/src/test/ui/generator/yield-in-const.stderr b/tests/ui/generator/yield-in-const.stderr
index dcf4fe63e..dcf4fe63e 100644
--- a/src/test/ui/generator/yield-in-const.stderr
+++ b/tests/ui/generator/yield-in-const.stderr
diff --git a/src/test/ui/generator/yield-in-function.rs b/tests/ui/generator/yield-in-function.rs
index 29b811621..29b811621 100644
--- a/src/test/ui/generator/yield-in-function.rs
+++ b/tests/ui/generator/yield-in-function.rs
diff --git a/src/test/ui/generator/yield-in-function.stderr b/tests/ui/generator/yield-in-function.stderr
index 51cce198c..51cce198c 100644
--- a/src/test/ui/generator/yield-in-function.stderr
+++ b/tests/ui/generator/yield-in-function.stderr
diff --git a/src/test/ui/generator/yield-in-initializer.rs b/tests/ui/generator/yield-in-initializer.rs
index 0cab36e5f..0cab36e5f 100644
--- a/src/test/ui/generator/yield-in-initializer.rs
+++ b/tests/ui/generator/yield-in-initializer.rs
diff --git a/src/test/ui/generator/yield-in-initializer.stderr b/tests/ui/generator/yield-in-initializer.stderr
index ed14a2e32..ed14a2e32 100644
--- a/src/test/ui/generator/yield-in-initializer.stderr
+++ b/tests/ui/generator/yield-in-initializer.stderr
diff --git a/src/test/ui/generator/yield-in-static.rs b/tests/ui/generator/yield-in-static.rs
index d27fbb33b..d27fbb33b 100644
--- a/src/test/ui/generator/yield-in-static.rs
+++ b/tests/ui/generator/yield-in-static.rs
diff --git a/src/test/ui/generator/yield-in-static.stderr b/tests/ui/generator/yield-in-static.stderr
index d867f3ad3..d867f3ad3 100644
--- a/src/test/ui/generator/yield-in-static.stderr
+++ b/tests/ui/generator/yield-in-static.stderr
diff --git a/src/test/ui/generator/yield-outside-generator-issue-78653.rs b/tests/ui/generator/yield-outside-generator-issue-78653.rs
index 4e8050c81..4e8050c81 100644
--- a/src/test/ui/generator/yield-outside-generator-issue-78653.rs
+++ b/tests/ui/generator/yield-outside-generator-issue-78653.rs
diff --git a/src/test/ui/generator/yield-outside-generator-issue-78653.stderr b/tests/ui/generator/yield-outside-generator-issue-78653.stderr
index dcfb21174..dcfb21174 100644
--- a/src/test/ui/generator/yield-outside-generator-issue-78653.stderr
+++ b/tests/ui/generator/yield-outside-generator-issue-78653.stderr
diff --git a/src/test/ui/generator/yield-subtype.rs b/tests/ui/generator/yield-subtype.rs
index cb3fc9091..cb3fc9091 100644
--- a/src/test/ui/generator/yield-subtype.rs
+++ b/tests/ui/generator/yield-subtype.rs
diff --git a/src/test/ui/generator/yield-subtype.stderr b/tests/ui/generator/yield-subtype.stderr
index 97862e91c..97862e91c 100644
--- a/src/test/ui/generator/yield-subtype.stderr
+++ b/tests/ui/generator/yield-subtype.stderr
diff --git a/src/test/ui/generator/yield-while-iterating.rs b/tests/ui/generator/yield-while-iterating.rs
index 985e5d8bd..985e5d8bd 100644
--- a/src/test/ui/generator/yield-while-iterating.rs
+++ b/tests/ui/generator/yield-while-iterating.rs
diff --git a/src/test/ui/generator/yield-while-iterating.stderr b/tests/ui/generator/yield-while-iterating.stderr
index b65634752..b65634752 100644
--- a/src/test/ui/generator/yield-while-iterating.stderr
+++ b/tests/ui/generator/yield-while-iterating.stderr
diff --git a/src/test/ui/generator/yield-while-local-borrowed.rs b/tests/ui/generator/yield-while-local-borrowed.rs
index 061a64dbc..061a64dbc 100644
--- a/src/test/ui/generator/yield-while-local-borrowed.rs
+++ b/tests/ui/generator/yield-while-local-borrowed.rs
diff --git a/src/test/ui/generator/yield-while-local-borrowed.stderr b/tests/ui/generator/yield-while-local-borrowed.stderr
index c1513ef9b..c1513ef9b 100644
--- a/src/test/ui/generator/yield-while-local-borrowed.stderr
+++ b/tests/ui/generator/yield-while-local-borrowed.stderr
diff --git a/src/test/ui/generator/yield-while-ref-reborrowed.rs b/tests/ui/generator/yield-while-ref-reborrowed.rs
index a03ef945d..a03ef945d 100644
--- a/src/test/ui/generator/yield-while-ref-reborrowed.rs
+++ b/tests/ui/generator/yield-while-ref-reborrowed.rs
diff --git a/src/test/ui/generator/yield-while-ref-reborrowed.stderr b/tests/ui/generator/yield-while-ref-reborrowed.stderr
index 47147f9c0..47147f9c0 100644
--- a/src/test/ui/generator/yield-while-ref-reborrowed.stderr
+++ b/tests/ui/generator/yield-while-ref-reborrowed.stderr
diff --git a/src/test/ui/generator/yielding-in-match-guards.rs b/tests/ui/generator/yielding-in-match-guards.rs
index 4e89fc975..4e89fc975 100644
--- a/src/test/ui/generator/yielding-in-match-guards.rs
+++ b/tests/ui/generator/yielding-in-match-guards.rs
diff --git a/src/test/ui/generic-associated-types/anonymize-bound-vars.rs b/tests/ui/generic-associated-types/anonymize-bound-vars.rs
index eb7a12412..eb7a12412 100644
--- a/src/test/ui/generic-associated-types/anonymize-bound-vars.rs
+++ b/tests/ui/generic-associated-types/anonymize-bound-vars.rs
diff --git a/src/test/ui/generic-associated-types/auxiliary/foo_defn.rs b/tests/ui/generic-associated-types/auxiliary/foo_defn.rs
index 21a9b3b89..21a9b3b89 100644
--- a/src/test/ui/generic-associated-types/auxiliary/foo_defn.rs
+++ b/tests/ui/generic-associated-types/auxiliary/foo_defn.rs
diff --git a/src/test/ui/generic-associated-types/bugs/hrtb-implied-1.rs b/tests/ui/generic-associated-types/bugs/hrtb-implied-1.rs
index 719d1bd5a..5101de19d 100644
--- a/src/test/ui/generic-associated-types/bugs/hrtb-implied-1.rs
+++ b/tests/ui/generic-associated-types/bugs/hrtb-implied-1.rs
@@ -1,5 +1,5 @@
 // check-fail
-// known-bug
+// known-bug: unknown
 
 // This gives us problems because `for<'a> I::Item<'a>: Debug` should mean "for
 // all 'a where I::Item<'a> is WF", but really means "for all 'a possible"
@@ -29,7 +29,6 @@ where
 
 fn main() {
     let slice = &mut ();
-    //~^ temporary value dropped while borrowed
     let windows = WindowsMut { slice };
     print_items::<WindowsMut<'_>>(windows);
 }
diff --git a/src/test/ui/generic-associated-types/bugs/hrtb-implied-1.stderr b/tests/ui/generic-associated-types/bugs/hrtb-implied-1.stderr
index 1c9abc4e8..362aeae23 100644
--- a/src/test/ui/generic-associated-types/bugs/hrtb-implied-1.stderr
+++ b/tests/ui/generic-associated-types/bugs/hrtb-implied-1.stderr
@@ -3,7 +3,7 @@ error[E0716]: temporary value dropped while borrowed
    |
 LL |     let slice = &mut ();
    |                      ^^ creates a temporary value which is freed while still in use
-...
+LL |     let windows = WindowsMut { slice };
 LL |     print_items::<WindowsMut<'_>>(windows);
    |     -------------------------------------- argument requires that borrow lasts for `'static`
 LL | }
diff --git a/src/test/ui/generic-associated-types/bugs/hrtb-implied-2.rs b/tests/ui/generic-associated-types/bugs/hrtb-implied-2.rs
index 8e6c5348e..3174227a7 100644
--- a/src/test/ui/generic-associated-types/bugs/hrtb-implied-2.rs
+++ b/tests/ui/generic-associated-types/bugs/hrtb-implied-2.rs
@@ -1,5 +1,5 @@
 // check-fail
-// known-bug
+// known-bug: unknown
 
 // This gives us problems because `for<'a> I::Item<'a>: Debug` should mean "for
 // all 'a where I::Item<'a> is WF", but really means "for all 'a possible"
@@ -16,7 +16,6 @@ where
 {
     let mut iter2 = Eat(iter, f);
     let _next = iter2.next();
-    //~^ borrowed data escapes
     true
 }
 impl<I: LendingIterator> LendingIterator for &mut I {
diff --git a/src/test/ui/generic-associated-types/bugs/hrtb-implied-2.stderr b/tests/ui/generic-associated-types/bugs/hrtb-implied-2.stderr
index 1ee270398..1ee270398 100644
--- a/src/test/ui/generic-associated-types/bugs/hrtb-implied-2.stderr
+++ b/tests/ui/generic-associated-types/bugs/hrtb-implied-2.stderr
diff --git a/src/test/ui/generic-associated-types/bugs/hrtb-implied-3.rs b/tests/ui/generic-associated-types/bugs/hrtb-implied-3.rs
index bc9e6c8ae..bc9e6c8ae 100644
--- a/src/test/ui/generic-associated-types/bugs/hrtb-implied-3.rs
+++ b/tests/ui/generic-associated-types/bugs/hrtb-implied-3.rs
diff --git a/src/test/ui/generic-associated-types/bugs/hrtb-implied-3.stderr b/tests/ui/generic-associated-types/bugs/hrtb-implied-3.stderr
index c67e02437..c67e02437 100644
--- a/src/test/ui/generic-associated-types/bugs/hrtb-implied-3.stderr
+++ b/tests/ui/generic-associated-types/bugs/hrtb-implied-3.stderr
diff --git a/src/test/ui/generic-associated-types/bugs/issue-100013.rs b/tests/ui/generic-associated-types/bugs/issue-100013.rs
index fc4e47a3b..973c548d7 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-100013.rs
+++ b/tests/ui/generic-associated-types/bugs/issue-100013.rs
@@ -1,5 +1,5 @@
 // check-fail
-// known-bug
+// known-bug: unknown
 // edition: 2021
 
 // We really should accept this, but we need implied bounds between the regions
@@ -13,7 +13,6 @@ pub trait FutureIterator {
 
 fn call<I: FutureIterator>() -> impl Send {
     async { // a generator checked for autotrait impl `Send`
-        //~^ lifetime bound not satisfied
         let x = None::<I::Future<'_, '_>>; // a type referencing GAT
         async {}.await; // a yield point
     }
@@ -21,16 +20,13 @@ fn call<I: FutureIterator>() -> impl Send {
 
 fn call2<'a, 'b, I: FutureIterator>() -> impl Send {
     async { // a generator checked for autotrait impl `Send`
-        //~^ lifetime bound not satisfied
         let x = None::<I::Future<'a, 'b>>; // a type referencing GAT
-        //~^ lifetime may not live long enough
         async {}.await; // a yield point
     }
 }
 
 fn call3<'a: 'b, 'b, I: FutureIterator>() -> impl Send {
     async { // a generator checked for autotrait impl `Send`
-        //~^ lifetime bound not satisfied
         let x = None::<I::Future<'a, 'b>>; // a type referencing GAT
         async {}.await; // a yield point
     }
diff --git a/src/test/ui/generic-associated-types/bugs/issue-100013.stderr b/tests/ui/generic-associated-types/bugs/issue-100013.stderr
index 72ae288dc..9db124a81 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-100013.stderr
+++ b/tests/ui/generic-associated-types/bugs/issue-100013.stderr
@@ -2,77 +2,73 @@ error: lifetime bound not satisfied
   --> $DIR/issue-100013.rs:15:5
    |
 LL | /     async { // a generator checked for autotrait impl `Send`
-LL | |
 LL | |         let x = None::<I::Future<'_, '_>>; // a type referencing GAT
 LL | |         async {}.await; // a yield point
 LL | |     }
    | |_____^
    |
 note: the lifetime defined here...
-  --> $DIR/issue-100013.rs:17:38
+  --> $DIR/issue-100013.rs:16:38
    |
 LL |         let x = None::<I::Future<'_, '_>>; // a type referencing GAT
    |                                      ^^
 note: ...must outlive the lifetime defined here
-  --> $DIR/issue-100013.rs:17:34
+  --> $DIR/issue-100013.rs:16:34
    |
 LL |         let x = None::<I::Future<'_, '_>>; // a type referencing GAT
    |                                  ^^
    = note: this is a known limitation that will be removed in the future (see issue #100013 <https://github.com/rust-lang/rust/issues/100013> for more information)
 
 error: lifetime bound not satisfied
-  --> $DIR/issue-100013.rs:23:5
+  --> $DIR/issue-100013.rs:22:5
    |
 LL | /     async { // a generator checked for autotrait impl `Send`
-LL | |
 LL | |         let x = None::<I::Future<'a, 'b>>; // a type referencing GAT
-LL | |
 LL | |         async {}.await; // a yield point
 LL | |     }
    | |_____^
    |
 note: the lifetime defined here...
-  --> $DIR/issue-100013.rs:22:14
+  --> $DIR/issue-100013.rs:21:14
    |
 LL | fn call2<'a, 'b, I: FutureIterator>() -> impl Send {
    |              ^^
 note: ...must outlive the lifetime defined here
-  --> $DIR/issue-100013.rs:22:10
+  --> $DIR/issue-100013.rs:21:10
    |
 LL | fn call2<'a, 'b, I: FutureIterator>() -> impl Send {
    |          ^^
    = note: this is a known limitation that will be removed in the future (see issue #100013 <https://github.com/rust-lang/rust/issues/100013> for more information)
 
 error: lifetime may not live long enough
-  --> $DIR/issue-100013.rs:25:17
+  --> $DIR/issue-100013.rs:23:17
    |
 LL | fn call2<'a, 'b, I: FutureIterator>() -> impl Send {
    |          --  -- lifetime `'b` defined here
    |          |
    |          lifetime `'a` defined here
-...
+LL |     async { // a generator checked for autotrait impl `Send`
 LL |         let x = None::<I::Future<'a, 'b>>; // a type referencing GAT
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'a` must outlive `'b`
    |
    = help: consider adding the following bound: `'a: 'b`
 
 error: lifetime bound not satisfied
-  --> $DIR/issue-100013.rs:32:5
+  --> $DIR/issue-100013.rs:29:5
    |
 LL | /     async { // a generator checked for autotrait impl `Send`
-LL | |
 LL | |         let x = None::<I::Future<'a, 'b>>; // a type referencing GAT
 LL | |         async {}.await; // a yield point
 LL | |     }
    | |_____^
    |
 note: the lifetime defined here...
-  --> $DIR/issue-100013.rs:31:18
+  --> $DIR/issue-100013.rs:28:18
    |
 LL | fn call3<'a: 'b, 'b, I: FutureIterator>() -> impl Send {
    |                  ^^
 note: ...must outlive the lifetime defined here
-  --> $DIR/issue-100013.rs:31:10
+  --> $DIR/issue-100013.rs:28:10
    |
 LL | fn call3<'a: 'b, 'b, I: FutureIterator>() -> impl Send {
    |          ^^
diff --git a/src/test/ui/generic-associated-types/bugs/issue-80626.rs b/tests/ui/generic-associated-types/bugs/issue-80626.rs
index d6e18010f..d6e18010f 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-80626.rs
+++ b/tests/ui/generic-associated-types/bugs/issue-80626.rs
diff --git a/src/test/ui/generic-associated-types/bugs/issue-87735.rs b/tests/ui/generic-associated-types/bugs/issue-87735.rs
index 80737a798..80737a798 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-87735.rs
+++ b/tests/ui/generic-associated-types/bugs/issue-87735.rs
diff --git a/src/test/ui/generic-associated-types/bugs/issue-87735.stderr b/tests/ui/generic-associated-types/bugs/issue-87735.stderr
index ebe2054ce..ebe2054ce 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-87735.stderr
+++ b/tests/ui/generic-associated-types/bugs/issue-87735.stderr
diff --git a/src/test/ui/generic-associated-types/bugs/issue-87755.rs b/tests/ui/generic-associated-types/bugs/issue-87755.rs
index cda722d2f..cda722d2f 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-87755.rs
+++ b/tests/ui/generic-associated-types/bugs/issue-87755.rs
diff --git a/src/test/ui/generic-associated-types/bugs/issue-87755.stderr b/tests/ui/generic-associated-types/bugs/issue-87755.stderr
index 5e94db9b0..5e94db9b0 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-87755.stderr
+++ b/tests/ui/generic-associated-types/bugs/issue-87755.stderr
diff --git a/src/test/ui/generic-associated-types/bugs/issue-87803.rs b/tests/ui/generic-associated-types/bugs/issue-87803.rs
index 56237e387..56237e387 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-87803.rs
+++ b/tests/ui/generic-associated-types/bugs/issue-87803.rs
diff --git a/src/test/ui/generic-associated-types/bugs/issue-87803.stderr b/tests/ui/generic-associated-types/bugs/issue-87803.stderr
index fe2abdedb..fe2abdedb 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-87803.stderr
+++ b/tests/ui/generic-associated-types/bugs/issue-87803.stderr
diff --git a/src/test/ui/generic-associated-types/bugs/issue-88382.rs b/tests/ui/generic-associated-types/bugs/issue-88382.rs
index 8f8cc4523..8f8cc4523 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-88382.rs
+++ b/tests/ui/generic-associated-types/bugs/issue-88382.rs
diff --git a/src/test/ui/generic-associated-types/bugs/issue-88382.stderr b/tests/ui/generic-associated-types/bugs/issue-88382.stderr
index a9a70bb71..a9a70bb71 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-88382.stderr
+++ b/tests/ui/generic-associated-types/bugs/issue-88382.stderr
diff --git a/src/test/ui/generic-associated-types/bugs/issue-88460.rs b/tests/ui/generic-associated-types/bugs/issue-88460.rs
index 224e696ad..224e696ad 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-88460.rs
+++ b/tests/ui/generic-associated-types/bugs/issue-88460.rs
diff --git a/src/test/ui/generic-associated-types/bugs/issue-88460.stderr b/tests/ui/generic-associated-types/bugs/issue-88460.stderr
index 6612c4b49..6612c4b49 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-88460.stderr
+++ b/tests/ui/generic-associated-types/bugs/issue-88460.stderr
diff --git a/src/test/ui/generic-associated-types/bugs/issue-88526.rs b/tests/ui/generic-associated-types/bugs/issue-88526.rs
index 99397744f..99397744f 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-88526.rs
+++ b/tests/ui/generic-associated-types/bugs/issue-88526.rs
diff --git a/src/test/ui/generic-associated-types/bugs/issue-88526.stderr b/tests/ui/generic-associated-types/bugs/issue-88526.stderr
index 56857c655..56857c655 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-88526.stderr
+++ b/tests/ui/generic-associated-types/bugs/issue-88526.stderr
diff --git a/src/test/ui/generic-associated-types/bugs/issue-91762.rs b/tests/ui/generic-associated-types/bugs/issue-91762.rs
index dec668bec..8f2cc4550 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-91762.rs
+++ b/tests/ui/generic-associated-types/bugs/issue-91762.rs
@@ -1,5 +1,5 @@
 // check-fail
-// known-bug
+// known-bug: unknown
 
 // We almost certainly want this to pass, but
 // it's particularly difficult currently, because we need a way of specifying
@@ -22,7 +22,6 @@ pub trait FunctorExt<T>: Sized {
 
         arg = self;
         ret = <Self::Base as Functor>::fmap(arg);
-        //~^ type annotations needed
     }
 }
 
diff --git a/src/test/ui/generic-associated-types/bugs/issue-91762.stderr b/tests/ui/generic-associated-types/bugs/issue-91762.stderr
index 1272c8b8a..1272c8b8a 100644
--- a/src/test/ui/generic-associated-types/bugs/issue-91762.stderr
+++ b/tests/ui/generic-associated-types/bugs/issue-91762.stderr
diff --git a/src/test/ui/generic-associated-types/collections-project-default.rs b/tests/ui/generic-associated-types/collections-project-default.rs
index e08aa18cf..e08aa18cf 100644
--- a/src/test/ui/generic-associated-types/collections-project-default.rs
+++ b/tests/ui/generic-associated-types/collections-project-default.rs
diff --git a/src/test/ui/generic-associated-types/collections-project-default.stderr b/tests/ui/generic-associated-types/collections-project-default.stderr
index 5701017dc..5701017dc 100644
--- a/src/test/ui/generic-associated-types/collections-project-default.stderr
+++ b/tests/ui/generic-associated-types/collections-project-default.stderr
diff --git a/src/test/ui/generic-associated-types/collections.rs b/tests/ui/generic-associated-types/collections.rs
index 15f429afb..15f429afb 100644
--- a/src/test/ui/generic-associated-types/collections.rs
+++ b/tests/ui/generic-associated-types/collections.rs
diff --git a/src/test/ui/generic-associated-types/collectivity-regression.rs b/tests/ui/generic-associated-types/collectivity-regression.rs
index 54154f9d1..54154f9d1 100644
--- a/src/test/ui/generic-associated-types/collectivity-regression.rs
+++ b/tests/ui/generic-associated-types/collectivity-regression.rs
diff --git a/tests/ui/generic-associated-types/collectivity-regression.stderr b/tests/ui/generic-associated-types/collectivity-regression.stderr
new file mode 100644
index 000000000..a085096e1
--- /dev/null
+++ b/tests/ui/generic-associated-types/collectivity-regression.stderr
@@ -0,0 +1,24 @@
+error: `T` does not live long enough
+  --> $DIR/collectivity-regression.rs:13:5
+   |
+LL | /     || {
+LL | |
+LL | |         //
+LL | |         // FIXME(#98437). This regressed at some point and
+LL | |         // probably should work.
+LL | |         let _x = x;
+LL | |     };
+   | |_____^
+   |
+note: due to current limitations in the borrow checker, this implies a `'static` lifetime
+  --> $DIR/collectivity-regression.rs:11:16
+   |
+LL |     for<'a> T: Get<Value<'a> = ()>,
+   |                ^^^^^^^^^^^^^^^^^^^
+help: consider restricting the type parameter to the `'static` lifetime
+   |
+LL |     for<'a> T: Get<Value<'a> = ()> + 'static,
+   |                                    +++++++++
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/generic-associated-types/const-generics-gat-in-trait-return-type-1.rs b/tests/ui/generic-associated-types/const-generics-gat-in-trait-return-type-1.rs
index c5f9a25a6..c5f9a25a6 100644
--- a/src/test/ui/generic-associated-types/const-generics-gat-in-trait-return-type-1.rs
+++ b/tests/ui/generic-associated-types/const-generics-gat-in-trait-return-type-1.rs
diff --git a/src/test/ui/generic-associated-types/const-generics-gat-in-trait-return-type-2.rs b/tests/ui/generic-associated-types/const-generics-gat-in-trait-return-type-2.rs
index cd7941ed9..cd7941ed9 100644
--- a/src/test/ui/generic-associated-types/const-generics-gat-in-trait-return-type-2.rs
+++ b/tests/ui/generic-associated-types/const-generics-gat-in-trait-return-type-2.rs
diff --git a/src/test/ui/generic-associated-types/const-generics-gat-in-trait-return-type-3.rs b/tests/ui/generic-associated-types/const-generics-gat-in-trait-return-type-3.rs
index db61fc080..db61fc080 100644
--- a/src/test/ui/generic-associated-types/const-generics-gat-in-trait-return-type-3.rs
+++ b/tests/ui/generic-associated-types/const-generics-gat-in-trait-return-type-3.rs
diff --git a/src/test/ui/generic-associated-types/const_params_have_right_type.rs b/tests/ui/generic-associated-types/const_params_have_right_type.rs
index d2cb12697..d2cb12697 100644
--- a/src/test/ui/generic-associated-types/const_params_have_right_type.rs
+++ b/tests/ui/generic-associated-types/const_params_have_right_type.rs
diff --git a/src/test/ui/generic-associated-types/const_params_have_right_type.stderr b/tests/ui/generic-associated-types/const_params_have_right_type.stderr
index fdedd3bf5..fdedd3bf5 100644
--- a/src/test/ui/generic-associated-types/const_params_have_right_type.stderr
+++ b/tests/ui/generic-associated-types/const_params_have_right_type.stderr
diff --git a/src/test/ui/generic-associated-types/constraint-assoc-type-suggestion.rs b/tests/ui/generic-associated-types/constraint-assoc-type-suggestion.rs
index c78a54997..c78a54997 100644
--- a/src/test/ui/generic-associated-types/constraint-assoc-type-suggestion.rs
+++ b/tests/ui/generic-associated-types/constraint-assoc-type-suggestion.rs
diff --git a/src/test/ui/generic-associated-types/constraint-assoc-type-suggestion.stderr b/tests/ui/generic-associated-types/constraint-assoc-type-suggestion.stderr
index 96c4330fe..96c4330fe 100644
--- a/src/test/ui/generic-associated-types/constraint-assoc-type-suggestion.stderr
+++ b/tests/ui/generic-associated-types/constraint-assoc-type-suggestion.stderr
diff --git a/src/test/ui/generic-associated-types/construct_with_other_type.rs b/tests/ui/generic-associated-types/construct_with_other_type.rs
index 5cb07f558..5cb07f558 100644
--- a/src/test/ui/generic-associated-types/construct_with_other_type.rs
+++ b/tests/ui/generic-associated-types/construct_with_other_type.rs
diff --git a/src/test/ui/generic-associated-types/cross-crate-bounds.rs b/tests/ui/generic-associated-types/cross-crate-bounds.rs
index 8934a07fd..8934a07fd 100644
--- a/src/test/ui/generic-associated-types/cross-crate-bounds.rs
+++ b/tests/ui/generic-associated-types/cross-crate-bounds.rs
diff --git a/src/test/ui/generic-associated-types/cross-crate-bounds.stderr b/tests/ui/generic-associated-types/cross-crate-bounds.stderr
index c81cd7e77..83ee04d5a 100644
--- a/src/test/ui/generic-associated-types/cross-crate-bounds.stderr
+++ b/tests/ui/generic-associated-types/cross-crate-bounds.stderr
@@ -8,7 +8,7 @@ note: required by a bound in `foo_defn::Foo::Bar`
   --> $DIR/auxiliary/foo_defn.rs:4:15
    |
 LL |     type Bar: AsRef<()>;
-   |               ^^^^^^^^^ required by this bound in `foo_defn::Foo::Bar`
+   |               ^^^^^^^^^ required by this bound in `Foo::Bar`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/elided-in-expr-position.rs b/tests/ui/generic-associated-types/elided-in-expr-position.rs
index e40093305..e40093305 100644
--- a/src/test/ui/generic-associated-types/elided-in-expr-position.rs
+++ b/tests/ui/generic-associated-types/elided-in-expr-position.rs
diff --git a/src/test/ui/generic-associated-types/elided-in-expr-position.stderr b/tests/ui/generic-associated-types/elided-in-expr-position.stderr
index a9996123f..842b23bd4 100644
--- a/src/test/ui/generic-associated-types/elided-in-expr-position.stderr
+++ b/tests/ui/generic-associated-types/elided-in-expr-position.stderr
@@ -12,7 +12,7 @@ LL |     type Assoc<'a> where Self: 'a;
 help: add missing lifetime argument
    |
 LL |     fn g(&self) -> Self::Assoc<'_>;
-   |                          ~~~~~~~~~
+   |                               ++++
 
 error[E0107]: missing generics for associated type `Trait::Assoc`
   --> $DIR/elided-in-expr-position.rs:31:26
@@ -28,7 +28,7 @@ LL |     type Assoc<'a> where Self: 'a;
 help: add missing lifetime argument
    |
 LL |     fn g(&self) -> Self::Assoc<'_> {
-   |                          ~~~~~~~~~
+   |                               ++++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/generic-associated-types/empty_generics.rs b/tests/ui/generic-associated-types/empty_generics.rs
index 964c2972d..964c2972d 100644
--- a/src/test/ui/generic-associated-types/empty_generics.rs
+++ b/tests/ui/generic-associated-types/empty_generics.rs
diff --git a/src/test/ui/generic-associated-types/empty_generics.stderr b/tests/ui/generic-associated-types/empty_generics.stderr
index b753181cf..b753181cf 100644
--- a/src/test/ui/generic-associated-types/empty_generics.stderr
+++ b/tests/ui/generic-associated-types/empty_generics.stderr
diff --git a/src/test/ui/generic-associated-types/equality-bound.rs b/tests/ui/generic-associated-types/equality-bound.rs
index fcc2da801..fcc2da801 100644
--- a/src/test/ui/generic-associated-types/equality-bound.rs
+++ b/tests/ui/generic-associated-types/equality-bound.rs
diff --git a/src/test/ui/generic-associated-types/equality-bound.stderr b/tests/ui/generic-associated-types/equality-bound.stderr
index d78f7a7fb..d78f7a7fb 100644
--- a/src/test/ui/generic-associated-types/equality-bound.stderr
+++ b/tests/ui/generic-associated-types/equality-bound.stderr
diff --git a/src/test/ui/generic-associated-types/extended/lending_iterator.base.stderr b/tests/ui/generic-associated-types/extended/lending_iterator.base.stderr
index 614c4a34c..614c4a34c 100644
--- a/src/test/ui/generic-associated-types/extended/lending_iterator.base.stderr
+++ b/tests/ui/generic-associated-types/extended/lending_iterator.base.stderr
diff --git a/src/test/ui/generic-associated-types/extended/lending_iterator.rs b/tests/ui/generic-associated-types/extended/lending_iterator.rs
index 247761dd0..247761dd0 100644
--- a/src/test/ui/generic-associated-types/extended/lending_iterator.rs
+++ b/tests/ui/generic-associated-types/extended/lending_iterator.rs
diff --git a/src/test/ui/generic-associated-types/extended/lending_iterator_2.base.stderr b/tests/ui/generic-associated-types/extended/lending_iterator_2.base.stderr
index f6b0b644e..f6b0b644e 100644
--- a/src/test/ui/generic-associated-types/extended/lending_iterator_2.base.stderr
+++ b/tests/ui/generic-associated-types/extended/lending_iterator_2.base.stderr
diff --git a/src/test/ui/generic-associated-types/extended/lending_iterator_2.rs b/tests/ui/generic-associated-types/extended/lending_iterator_2.rs
index eb9c0456a..eb9c0456a 100644
--- a/src/test/ui/generic-associated-types/extended/lending_iterator_2.rs
+++ b/tests/ui/generic-associated-types/extended/lending_iterator_2.rs
diff --git a/src/test/ui/generic-associated-types/gat-in-trait-path-undeclared-lifetime.rs b/tests/ui/generic-associated-types/gat-in-trait-path-undeclared-lifetime.rs
index 86b164ba7..86b164ba7 100644
--- a/src/test/ui/generic-associated-types/gat-in-trait-path-undeclared-lifetime.rs
+++ b/tests/ui/generic-associated-types/gat-in-trait-path-undeclared-lifetime.rs
diff --git a/src/test/ui/generic-associated-types/gat-in-trait-path-undeclared-lifetime.stderr b/tests/ui/generic-associated-types/gat-in-trait-path-undeclared-lifetime.stderr
index b77f10084..b77f10084 100644
--- a/src/test/ui/generic-associated-types/gat-in-trait-path-undeclared-lifetime.stderr
+++ b/tests/ui/generic-associated-types/gat-in-trait-path-undeclared-lifetime.stderr
diff --git a/src/test/ui/generic-associated-types/gat-in-trait-path.base.stderr b/tests/ui/generic-associated-types/gat-in-trait-path.base.stderr
index fd54faaf3..fd54faaf3 100644
--- a/src/test/ui/generic-associated-types/gat-in-trait-path.base.stderr
+++ b/tests/ui/generic-associated-types/gat-in-trait-path.base.stderr
diff --git a/src/test/ui/generic-associated-types/gat-in-trait-path.rs b/tests/ui/generic-associated-types/gat-in-trait-path.rs
index c55f5a726..c55f5a726 100644
--- a/src/test/ui/generic-associated-types/gat-in-trait-path.rs
+++ b/tests/ui/generic-associated-types/gat-in-trait-path.rs
diff --git a/src/test/ui/generic-associated-types/gat-trait-path-generic-type-arg.rs b/tests/ui/generic-associated-types/gat-trait-path-generic-type-arg.rs
index d00c036fb..d00c036fb 100644
--- a/src/test/ui/generic-associated-types/gat-trait-path-generic-type-arg.rs
+++ b/tests/ui/generic-associated-types/gat-trait-path-generic-type-arg.rs
diff --git a/src/test/ui/generic-associated-types/gat-trait-path-generic-type-arg.stderr b/tests/ui/generic-associated-types/gat-trait-path-generic-type-arg.stderr
index cb2b9f32b..cb2b9f32b 100644
--- a/src/test/ui/generic-associated-types/gat-trait-path-generic-type-arg.stderr
+++ b/tests/ui/generic-associated-types/gat-trait-path-generic-type-arg.stderr
diff --git a/src/test/ui/generic-associated-types/gat-trait-path-missing-lifetime.rs b/tests/ui/generic-associated-types/gat-trait-path-missing-lifetime.rs
index 83b86f04a..83b86f04a 100644
--- a/src/test/ui/generic-associated-types/gat-trait-path-missing-lifetime.rs
+++ b/tests/ui/generic-associated-types/gat-trait-path-missing-lifetime.rs
diff --git a/src/test/ui/generic-associated-types/gat-trait-path-missing-lifetime.stderr b/tests/ui/generic-associated-types/gat-trait-path-missing-lifetime.stderr
index 452dfefd1..499221637 100644
--- a/src/test/ui/generic-associated-types/gat-trait-path-missing-lifetime.stderr
+++ b/tests/ui/generic-associated-types/gat-trait-path-missing-lifetime.stderr
@@ -12,7 +12,7 @@ LL |   type Y<'a>;
 help: add missing lifetime argument
    |
 LL |   fn foo<'a, T1: X<Y<'a> = T1>>(t : T1) -> T1::Y<'a> {
-   |                    ~~~~~
+   |                     ++++
 
 error[E0107]: missing generics for associated type `X::Y`
   --> $DIR/gat-trait-path-missing-lifetime.rs:8:20
@@ -28,7 +28,7 @@ LL |   type Y<'a>;
 help: add missing lifetime argument
    |
 LL |   fn foo<'a, T1: X<Y<'a> = T1>>(t : T1) -> T1::Y<'a> {
-   |                    ~~~~~
+   |                     ++++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/generic-associated-types/gat-trait-path-parenthesised-args.rs b/tests/ui/generic-associated-types/gat-trait-path-parenthesised-args.rs
index 9eb069637..9eb069637 100644
--- a/src/test/ui/generic-associated-types/gat-trait-path-parenthesised-args.rs
+++ b/tests/ui/generic-associated-types/gat-trait-path-parenthesised-args.rs
diff --git a/src/test/ui/generic-associated-types/gat-trait-path-parenthesised-args.stderr b/tests/ui/generic-associated-types/gat-trait-path-parenthesised-args.stderr
index 165779796..165779796 100644
--- a/src/test/ui/generic-associated-types/gat-trait-path-parenthesised-args.stderr
+++ b/tests/ui/generic-associated-types/gat-trait-path-parenthesised-args.stderr
diff --git a/src/test/ui/generic-associated-types/generic-associated-type-bounds.rs b/tests/ui/generic-associated-types/generic-associated-type-bounds.rs
index fdc5a7267..fdc5a7267 100644
--- a/src/test/ui/generic-associated-types/generic-associated-type-bounds.rs
+++ b/tests/ui/generic-associated-types/generic-associated-type-bounds.rs
diff --git a/src/test/ui/generic-associated-types/generic-associated-types-where.rs b/tests/ui/generic-associated-types/generic-associated-types-where.rs
index bbdfffafe..bbdfffafe 100644
--- a/src/test/ui/generic-associated-types/generic-associated-types-where.rs
+++ b/tests/ui/generic-associated-types/generic-associated-types-where.rs
diff --git a/src/test/ui/generic-associated-types/generic-associated-types-where.stderr b/tests/ui/generic-associated-types/generic-associated-types-where.stderr
index 9a745c099..9a745c099 100644
--- a/src/test/ui/generic-associated-types/generic-associated-types-where.stderr
+++ b/tests/ui/generic-associated-types/generic-associated-types-where.stderr
diff --git a/src/test/ui/generic-associated-types/generic_associated_type_undeclared_lifetimes.rs b/tests/ui/generic-associated-types/generic_associated_type_undeclared_lifetimes.rs
index 2cb218bf8..2cb218bf8 100644
--- a/src/test/ui/generic-associated-types/generic_associated_type_undeclared_lifetimes.rs
+++ b/tests/ui/generic-associated-types/generic_associated_type_undeclared_lifetimes.rs
diff --git a/src/test/ui/generic-associated-types/generic_associated_type_undeclared_lifetimes.stderr b/tests/ui/generic-associated-types/generic_associated_type_undeclared_lifetimes.stderr
index 396ff15ab..396ff15ab 100644
--- a/src/test/ui/generic-associated-types/generic_associated_type_undeclared_lifetimes.stderr
+++ b/tests/ui/generic-associated-types/generic_associated_type_undeclared_lifetimes.stderr
diff --git a/src/test/ui/generic-associated-types/impl_bounds.rs b/tests/ui/generic-associated-types/impl_bounds.rs
index 01165fceb..e45bdcf92 100644
--- a/src/test/ui/generic-associated-types/impl_bounds.rs
+++ b/tests/ui/generic-associated-types/impl_bounds.rs
@@ -15,7 +15,6 @@ impl<T> Foo for Fooy<T> {
     //~^ ERROR impl has stricter requirements than trait
     type B<'a, 'b> = (&'a(), &'b ()) where 'b: 'a;
     //~^ ERROR impl has stricter requirements than trait
-    //~| ERROR lifetime bound not satisfied
     type C = String where Self: Copy;
     //~^ ERROR the trait bound `T: Copy` is not satisfied
     fn d() where Self: Copy {}
diff --git a/tests/ui/generic-associated-types/impl_bounds.stderr b/tests/ui/generic-associated-types/impl_bounds.stderr
new file mode 100644
index 000000000..261070d1d
--- /dev/null
+++ b/tests/ui/generic-associated-types/impl_bounds.stderr
@@ -0,0 +1,77 @@
+error[E0276]: impl has stricter requirements than trait
+  --> $DIR/impl_bounds.rs:14:39
+   |
+LL |     type A<'a> where Self: 'a;
+   |     ---------- definition of `A` from trait
+...
+LL |     type A<'a> = (&'a ()) where Self: 'static;
+   |                                       ^^^^^^^ impl has extra requirement `T: 'static`
+
+error[E0276]: impl has stricter requirements than trait
+  --> $DIR/impl_bounds.rs:16:48
+   |
+LL |     type B<'a, 'b> where 'a: 'b;
+   |     -------------- definition of `B` from trait
+...
+LL |     type B<'a, 'b> = (&'a(), &'b ()) where 'b: 'a;
+   |                                                ^^ impl has extra requirement `'b: 'a`
+   |
+help: copy the `where` clause predicates from the trait
+   |
+LL |     type B<'a, 'b> = (&'a(), &'b ()) where 'a: 'b;
+   |                                      ~~~~~~~~~~~~
+
+error[E0277]: the trait bound `T: Copy` is not satisfied
+  --> $DIR/impl_bounds.rs:18:33
+   |
+LL |     type C = String where Self: Copy;
+   |                                 ^^^^ the trait `Copy` is not implemented for `T`
+   |
+note: required for `Fooy<T>` to implement `Copy`
+  --> $DIR/impl_bounds.rs:10:10
+   |
+LL | #[derive(Copy, Clone)]
+   |          ^^^^ unsatisfied trait bound introduced in this `derive` macro
+note: the requirement `Fooy<T>: Copy` appears on the `impl`'s associated type `C` but not on the corresponding trait's associated type
+  --> $DIR/impl_bounds.rs:6:10
+   |
+LL | trait Foo {
+   |       --- in this trait
+...
+LL |     type C where Self: Clone;
+   |          ^ this trait's associated type doesn't have the requirement `Fooy<T>: Copy`
+   = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider restricting type parameter `T`
+   |
+LL | impl<T: std::marker::Copy> Foo for Fooy<T> {
+   |       +++++++++++++++++++
+
+error[E0277]: the trait bound `T: Copy` is not satisfied
+  --> $DIR/impl_bounds.rs:20:24
+   |
+LL |     fn d() where Self: Copy {}
+   |                        ^^^^ the trait `Copy` is not implemented for `T`
+   |
+note: required for `Fooy<T>` to implement `Copy`
+  --> $DIR/impl_bounds.rs:10:10
+   |
+LL | #[derive(Copy, Clone)]
+   |          ^^^^ unsatisfied trait bound introduced in this `derive` macro
+note: the requirement `Fooy<T>: Copy` appears on the `impl`'s method `d` but not on the corresponding trait's method
+  --> $DIR/impl_bounds.rs:7:8
+   |
+LL | trait Foo {
+   |       --- in this trait
+...
+LL |     fn d() where Self: Clone;
+   |        ^ this trait's method doesn't have the requirement `Fooy<T>: Copy`
+   = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider restricting type parameter `T`
+   |
+LL | impl<T: std::marker::Copy> Foo for Fooy<T> {
+   |       +++++++++++++++++++
+
+error: aborting due to 4 previous errors
+
+Some errors have detailed explanations: E0276, E0277.
+For more information about an error, try `rustc --explain E0276`.
diff --git a/src/test/ui/generic-associated-types/impl_bounds_ok.rs b/tests/ui/generic-associated-types/impl_bounds_ok.rs
index 88f829ea2..88f829ea2 100644
--- a/src/test/ui/generic-associated-types/impl_bounds_ok.rs
+++ b/tests/ui/generic-associated-types/impl_bounds_ok.rs
diff --git a/src/test/ui/generic-associated-types/issue-101020.rs b/tests/ui/generic-associated-types/issue-101020.rs
index 80d0fa5ad..80d0fa5ad 100644
--- a/src/test/ui/generic-associated-types/issue-101020.rs
+++ b/tests/ui/generic-associated-types/issue-101020.rs
diff --git a/src/test/ui/generic-associated-types/issue-101020.stderr b/tests/ui/generic-associated-types/issue-101020.stderr
index b4e94cb83..1f9273a8c 100644
--- a/src/test/ui/generic-associated-types/issue-101020.stderr
+++ b/tests/ui/generic-associated-types/issue-101020.stderr
@@ -1,16 +1,14 @@
 error[E0277]: the trait bound `for<'a> &'a mut (): Foo<&'a mut ()>` is not satisfied
-  --> $DIR/issue-101020.rs:31:5
+  --> $DIR/issue-101020.rs:31:22
    |
 LL |     (&mut EmptyIter).consume(());
-   |     ^^^^^^^^^^^^^^^^ ------- required by a bound introduced by this call
-   |     |
-   |     the trait `for<'a> Foo<&'a mut ()>` is not implemented for `&'a mut ()`
+   |                      ^^^^^^^ the trait `for<'a> Foo<&'a mut ()>` is not implemented for `&'a mut ()`
    |
 note: required for `&'a mut ()` to implement `for<'a> FuncInput<'a, &'a mut ()>`
   --> $DIR/issue-101020.rs:27:20
    |
 LL | impl<'a, T, F: 'a> FuncInput<'a, F> for T where F: Foo<T> {}
-   |                    ^^^^^^^^^^^^^^^^     ^
+   |                    ^^^^^^^^^^^^^^^^     ^          ------ unsatisfied trait bound introduced here
 note: required by a bound in `LendingIterator::consume`
   --> $DIR/issue-101020.rs:9:33
    |
diff --git a/src/test/ui/generic-associated-types/issue-102114.rs b/tests/ui/generic-associated-types/issue-102114.rs
index de31737ef..de31737ef 100644
--- a/src/test/ui/generic-associated-types/issue-102114.rs
+++ b/tests/ui/generic-associated-types/issue-102114.rs
diff --git a/src/test/ui/generic-associated-types/issue-102114.stderr b/tests/ui/generic-associated-types/issue-102114.stderr
index 8e41dee54..8e41dee54 100644
--- a/src/test/ui/generic-associated-types/issue-102114.stderr
+++ b/tests/ui/generic-associated-types/issue-102114.stderr
diff --git a/src/test/ui/generic-associated-types/issue-102333.rs b/tests/ui/generic-associated-types/issue-102333.rs
index 6c7256332..6c7256332 100644
--- a/src/test/ui/generic-associated-types/issue-102333.rs
+++ b/tests/ui/generic-associated-types/issue-102333.rs
diff --git a/src/test/ui/generic-associated-types/issue-102335-gat.rs b/tests/ui/generic-associated-types/issue-102335-gat.rs
index a7255fdcb..a7255fdcb 100644
--- a/src/test/ui/generic-associated-types/issue-102335-gat.rs
+++ b/tests/ui/generic-associated-types/issue-102335-gat.rs
diff --git a/src/test/ui/generic-associated-types/issue-102335-gat.stderr b/tests/ui/generic-associated-types/issue-102335-gat.stderr
index 7a7900a1e..7a7900a1e 100644
--- a/src/test/ui/generic-associated-types/issue-102335-gat.stderr
+++ b/tests/ui/generic-associated-types/issue-102335-gat.stderr
diff --git a/src/test/ui/generic-associated-types/issue-47206-where-clause.rs b/tests/ui/generic-associated-types/issue-47206-where-clause.rs
index 3d1b88ddf..3d1b88ddf 100644
--- a/src/test/ui/generic-associated-types/issue-47206-where-clause.rs
+++ b/tests/ui/generic-associated-types/issue-47206-where-clause.rs
diff --git a/src/test/ui/generic-associated-types/issue-47206-where-clause.stderr b/tests/ui/generic-associated-types/issue-47206-where-clause.stderr
index 7006744df..7006744df 100644
--- a/src/test/ui/generic-associated-types/issue-47206-where-clause.stderr
+++ b/tests/ui/generic-associated-types/issue-47206-where-clause.stderr
diff --git a/src/test/ui/generic-associated-types/issue-58694-parameter-out-of-range.rs b/tests/ui/generic-associated-types/issue-58694-parameter-out-of-range.rs
index 625ccfe89..625ccfe89 100644
--- a/src/test/ui/generic-associated-types/issue-58694-parameter-out-of-range.rs
+++ b/tests/ui/generic-associated-types/issue-58694-parameter-out-of-range.rs
diff --git a/src/test/ui/generic-associated-types/issue-62326-parameter-out-of-range.rs b/tests/ui/generic-associated-types/issue-62326-parameter-out-of-range.rs
index c1140bff8..c1140bff8 100644
--- a/src/test/ui/generic-associated-types/issue-62326-parameter-out-of-range.rs
+++ b/tests/ui/generic-associated-types/issue-62326-parameter-out-of-range.rs
diff --git a/src/test/ui/generic-associated-types/issue-67424.rs b/tests/ui/generic-associated-types/issue-67424.rs
index b6c7c70cd..b6c7c70cd 100644
--- a/src/test/ui/generic-associated-types/issue-67424.rs
+++ b/tests/ui/generic-associated-types/issue-67424.rs
diff --git a/src/test/ui/generic-associated-types/issue-67510-pass.base.stderr b/tests/ui/generic-associated-types/issue-67510-pass.base.stderr
index 4cc68530e..4cc68530e 100644
--- a/src/test/ui/generic-associated-types/issue-67510-pass.base.stderr
+++ b/tests/ui/generic-associated-types/issue-67510-pass.base.stderr
diff --git a/src/test/ui/generic-associated-types/issue-67510-pass.rs b/tests/ui/generic-associated-types/issue-67510-pass.rs
index 66ce3e807..66ce3e807 100644
--- a/src/test/ui/generic-associated-types/issue-67510-pass.rs
+++ b/tests/ui/generic-associated-types/issue-67510-pass.rs
diff --git a/src/test/ui/generic-associated-types/issue-67510.rs b/tests/ui/generic-associated-types/issue-67510.rs
index ab5c25d74..ab5c25d74 100644
--- a/src/test/ui/generic-associated-types/issue-67510.rs
+++ b/tests/ui/generic-associated-types/issue-67510.rs
diff --git a/src/test/ui/generic-associated-types/issue-67510.stderr b/tests/ui/generic-associated-types/issue-67510.stderr
index d25c5b0f3..d25c5b0f3 100644
--- a/src/test/ui/generic-associated-types/issue-67510.stderr
+++ b/tests/ui/generic-associated-types/issue-67510.stderr
diff --git a/src/test/ui/generic-associated-types/issue-68641-check-gat-bounds.rs b/tests/ui/generic-associated-types/issue-68641-check-gat-bounds.rs
index f1e779fcb..f1e779fcb 100644
--- a/src/test/ui/generic-associated-types/issue-68641-check-gat-bounds.rs
+++ b/tests/ui/generic-associated-types/issue-68641-check-gat-bounds.rs
diff --git a/src/test/ui/generic-associated-types/issue-68641-check-gat-bounds.stderr b/tests/ui/generic-associated-types/issue-68641-check-gat-bounds.stderr
index 6bb7492af..6bb7492af 100644
--- a/src/test/ui/generic-associated-types/issue-68641-check-gat-bounds.stderr
+++ b/tests/ui/generic-associated-types/issue-68641-check-gat-bounds.stderr
diff --git a/src/test/ui/generic-associated-types/issue-68642-broken-llvm-ir.rs b/tests/ui/generic-associated-types/issue-68642-broken-llvm-ir.rs
index f5502adee..f5502adee 100644
--- a/src/test/ui/generic-associated-types/issue-68642-broken-llvm-ir.rs
+++ b/tests/ui/generic-associated-types/issue-68642-broken-llvm-ir.rs
diff --git a/src/test/ui/generic-associated-types/issue-68642-broken-llvm-ir.stderr b/tests/ui/generic-associated-types/issue-68642-broken-llvm-ir.stderr
index 07452137b..07452137b 100644
--- a/src/test/ui/generic-associated-types/issue-68642-broken-llvm-ir.stderr
+++ b/tests/ui/generic-associated-types/issue-68642-broken-llvm-ir.stderr
diff --git a/src/test/ui/generic-associated-types/issue-68643-broken-mir.rs b/tests/ui/generic-associated-types/issue-68643-broken-mir.rs
index 6050a8bf5..6050a8bf5 100644
--- a/src/test/ui/generic-associated-types/issue-68643-broken-mir.rs
+++ b/tests/ui/generic-associated-types/issue-68643-broken-mir.rs
diff --git a/src/test/ui/generic-associated-types/issue-68643-broken-mir.stderr b/tests/ui/generic-associated-types/issue-68643-broken-mir.stderr
index 31ded5dab..31ded5dab 100644
--- a/src/test/ui/generic-associated-types/issue-68643-broken-mir.stderr
+++ b/tests/ui/generic-associated-types/issue-68643-broken-mir.stderr
diff --git a/src/test/ui/generic-associated-types/issue-68644-codegen-selection.rs b/tests/ui/generic-associated-types/issue-68644-codegen-selection.rs
index 898cfa1e7..898cfa1e7 100644
--- a/src/test/ui/generic-associated-types/issue-68644-codegen-selection.rs
+++ b/tests/ui/generic-associated-types/issue-68644-codegen-selection.rs
diff --git a/src/test/ui/generic-associated-types/issue-68644-codegen-selection.stderr b/tests/ui/generic-associated-types/issue-68644-codegen-selection.stderr
index e2f9930cc..e2f9930cc 100644
--- a/src/test/ui/generic-associated-types/issue-68644-codegen-selection.stderr
+++ b/tests/ui/generic-associated-types/issue-68644-codegen-selection.stderr
diff --git a/src/test/ui/generic-associated-types/issue-68645-codegen-fulfillment.rs b/tests/ui/generic-associated-types/issue-68645-codegen-fulfillment.rs
index 60b065bfc..60b065bfc 100644
--- a/src/test/ui/generic-associated-types/issue-68645-codegen-fulfillment.rs
+++ b/tests/ui/generic-associated-types/issue-68645-codegen-fulfillment.rs
diff --git a/src/test/ui/generic-associated-types/issue-68645-codegen-fulfillment.stderr b/tests/ui/generic-associated-types/issue-68645-codegen-fulfillment.stderr
index 0065368ad..0065368ad 100644
--- a/src/test/ui/generic-associated-types/issue-68645-codegen-fulfillment.stderr
+++ b/tests/ui/generic-associated-types/issue-68645-codegen-fulfillment.stderr
diff --git a/src/test/ui/generic-associated-types/issue-68648-1.rs b/tests/ui/generic-associated-types/issue-68648-1.rs
index 0df41bab3..0df41bab3 100644
--- a/src/test/ui/generic-associated-types/issue-68648-1.rs
+++ b/tests/ui/generic-associated-types/issue-68648-1.rs
diff --git a/src/test/ui/generic-associated-types/issue-68648-2.rs b/tests/ui/generic-associated-types/issue-68648-2.rs
index 0f963d58f..0f963d58f 100644
--- a/src/test/ui/generic-associated-types/issue-68648-2.rs
+++ b/tests/ui/generic-associated-types/issue-68648-2.rs
diff --git a/src/test/ui/generic-associated-types/issue-68648-2.stderr b/tests/ui/generic-associated-types/issue-68648-2.stderr
index b2bef19eb..b2bef19eb 100644
--- a/src/test/ui/generic-associated-types/issue-68648-2.stderr
+++ b/tests/ui/generic-associated-types/issue-68648-2.stderr
diff --git a/src/test/ui/generic-associated-types/issue-68649-pass.rs b/tests/ui/generic-associated-types/issue-68649-pass.rs
index 772743877..772743877 100644
--- a/src/test/ui/generic-associated-types/issue-68649-pass.rs
+++ b/tests/ui/generic-associated-types/issue-68649-pass.rs
diff --git a/src/test/ui/generic-associated-types/issue-68653.rs b/tests/ui/generic-associated-types/issue-68653.rs
index 170b87cf2..170b87cf2 100644
--- a/src/test/ui/generic-associated-types/issue-68653.rs
+++ b/tests/ui/generic-associated-types/issue-68653.rs
diff --git a/src/test/ui/generic-associated-types/issue-68656-unsized-values.rs b/tests/ui/generic-associated-types/issue-68656-unsized-values.rs
index 607cfed0b..607cfed0b 100644
--- a/src/test/ui/generic-associated-types/issue-68656-unsized-values.rs
+++ b/tests/ui/generic-associated-types/issue-68656-unsized-values.rs
diff --git a/src/test/ui/generic-associated-types/issue-68656-unsized-values.stderr b/tests/ui/generic-associated-types/issue-68656-unsized-values.stderr
index e8770aedf..e8770aedf 100644
--- a/src/test/ui/generic-associated-types/issue-68656-unsized-values.stderr
+++ b/tests/ui/generic-associated-types/issue-68656-unsized-values.stderr
diff --git a/src/test/ui/generic-associated-types/issue-70303.rs b/tests/ui/generic-associated-types/issue-70303.rs
index 0edff5e4e..0edff5e4e 100644
--- a/src/test/ui/generic-associated-types/issue-70303.rs
+++ b/tests/ui/generic-associated-types/issue-70303.rs
diff --git a/src/test/ui/generic-associated-types/issue-70304.rs b/tests/ui/generic-associated-types/issue-70304.rs
index 8898d4c7d..8898d4c7d 100644
--- a/src/test/ui/generic-associated-types/issue-70304.rs
+++ b/tests/ui/generic-associated-types/issue-70304.rs
diff --git a/src/test/ui/generic-associated-types/issue-70304.stderr b/tests/ui/generic-associated-types/issue-70304.stderr
index 99339e968..99339e968 100644
--- a/src/test/ui/generic-associated-types/issue-70304.stderr
+++ b/tests/ui/generic-associated-types/issue-70304.stderr
diff --git a/src/test/ui/generic-associated-types/issue-71176.rs b/tests/ui/generic-associated-types/issue-71176.rs
index f0e162d82..f0e162d82 100644
--- a/src/test/ui/generic-associated-types/issue-71176.rs
+++ b/tests/ui/generic-associated-types/issue-71176.rs
diff --git a/src/test/ui/generic-associated-types/issue-71176.stderr b/tests/ui/generic-associated-types/issue-71176.stderr
index 386c97161..4b4fe43e8 100644
--- a/src/test/ui/generic-associated-types/issue-71176.stderr
+++ b/tests/ui/generic-associated-types/issue-71176.stderr
@@ -12,7 +12,7 @@ LL |     type A<'a>;
 help: add missing lifetime argument
    |
 LL |   inner: Box<dyn Provider<A<'a> = B>>,
-   |                           ~~~~~
+   |                            ++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/issue-74684-1.rs b/tests/ui/generic-associated-types/issue-74684-1.rs
index e9ec80074..e9ec80074 100644
--- a/src/test/ui/generic-associated-types/issue-74684-1.rs
+++ b/tests/ui/generic-associated-types/issue-74684-1.rs
diff --git a/src/test/ui/generic-associated-types/issue-74684-1.stderr b/tests/ui/generic-associated-types/issue-74684-1.stderr
index cacc97307..cacc97307 100644
--- a/src/test/ui/generic-associated-types/issue-74684-1.stderr
+++ b/tests/ui/generic-associated-types/issue-74684-1.stderr
diff --git a/src/test/ui/generic-associated-types/issue-74684-2.rs b/tests/ui/generic-associated-types/issue-74684-2.rs
index ff243af2c..ff243af2c 100644
--- a/src/test/ui/generic-associated-types/issue-74684-2.rs
+++ b/tests/ui/generic-associated-types/issue-74684-2.rs
diff --git a/src/test/ui/generic-associated-types/issue-74684-2.stderr b/tests/ui/generic-associated-types/issue-74684-2.stderr
index 59b85abf5..59b85abf5 100644
--- a/src/test/ui/generic-associated-types/issue-74684-2.stderr
+++ b/tests/ui/generic-associated-types/issue-74684-2.stderr
diff --git a/src/test/ui/generic-associated-types/issue-74816.rs b/tests/ui/generic-associated-types/issue-74816.rs
index 344afb87f..344afb87f 100644
--- a/src/test/ui/generic-associated-types/issue-74816.rs
+++ b/tests/ui/generic-associated-types/issue-74816.rs
diff --git a/src/test/ui/generic-associated-types/issue-74816.stderr b/tests/ui/generic-associated-types/issue-74816.stderr
index 45018e697..45018e697 100644
--- a/src/test/ui/generic-associated-types/issue-74816.stderr
+++ b/tests/ui/generic-associated-types/issue-74816.stderr
diff --git a/src/test/ui/generic-associated-types/issue-74824.rs b/tests/ui/generic-associated-types/issue-74824.rs
index 10c45d133..10c45d133 100644
--- a/src/test/ui/generic-associated-types/issue-74824.rs
+++ b/tests/ui/generic-associated-types/issue-74824.rs
diff --git a/src/test/ui/generic-associated-types/issue-74824.stderr b/tests/ui/generic-associated-types/issue-74824.stderr
index 623adb1c2..e5638d90e 100644
--- a/src/test/ui/generic-associated-types/issue-74824.stderr
+++ b/tests/ui/generic-associated-types/issue-74824.stderr
@@ -17,6 +17,7 @@ LL |     type Copy<T>: Copy = Box<T>;
    |                          ^^^^^^ the trait `Clone` is not implemented for `T`
    |
    = note: required for `Box<T>` to implement `Clone`
+   = note: required for `<Self as UnsafeCopy>::Copy<T>` to implement `Copy`
 note: required by a bound in `UnsafeCopy::Copy`
   --> $DIR/issue-74824.rs:6:19
    |
diff --git a/src/test/ui/generic-associated-types/issue-76407.rs b/tests/ui/generic-associated-types/issue-76407.rs
index 9556ec6da..9556ec6da 100644
--- a/src/test/ui/generic-associated-types/issue-76407.rs
+++ b/tests/ui/generic-associated-types/issue-76407.rs
diff --git a/src/test/ui/generic-associated-types/issue-76535.base.stderr b/tests/ui/generic-associated-types/issue-76535.base.stderr
index 088f69b09..52c6e3eec 100644
--- a/src/test/ui/generic-associated-types/issue-76535.base.stderr
+++ b/tests/ui/generic-associated-types/issue-76535.base.stderr
@@ -12,7 +12,7 @@ LL |     type SubType<'a>: SubTrait where Self: 'a;
 help: add missing lifetime argument
    |
 LL |     let sub: Box<dyn SuperTrait<SubType<'a> = SubStruct>> = Box::new(SuperStruct::new(0));
-   |                                 ~~~~~~~~~~~
+   |                                        ++++
 
 error[E0038]: the trait `SuperTrait` cannot be made into an object
   --> $DIR/issue-76535.rs:39:14
diff --git a/src/test/ui/generic-associated-types/issue-76535.extended.stderr b/tests/ui/generic-associated-types/issue-76535.extended.stderr
index e79f0a73f..369b86d29 100644
--- a/src/test/ui/generic-associated-types/issue-76535.extended.stderr
+++ b/tests/ui/generic-associated-types/issue-76535.extended.stderr
@@ -12,7 +12,7 @@ LL |     type SubType<'a>: SubTrait where Self: 'a;
 help: add missing lifetime argument
    |
 LL |     let sub: Box<dyn SuperTrait<SubType<'a> = SubStruct>> = Box::new(SuperStruct::new(0));
-   |                                 ~~~~~~~~~~~
+   |                                        ++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/issue-76535.rs b/tests/ui/generic-associated-types/issue-76535.rs
index 2457a05a0..2457a05a0 100644
--- a/src/test/ui/generic-associated-types/issue-76535.rs
+++ b/tests/ui/generic-associated-types/issue-76535.rs
diff --git a/src/test/ui/generic-associated-types/issue-76826.rs b/tests/ui/generic-associated-types/issue-76826.rs
index ead78453e..ead78453e 100644
--- a/src/test/ui/generic-associated-types/issue-76826.rs
+++ b/tests/ui/generic-associated-types/issue-76826.rs
diff --git a/src/test/ui/generic-associated-types/issue-78113-lifetime-mismatch-dyn-trait-box.rs b/tests/ui/generic-associated-types/issue-78113-lifetime-mismatch-dyn-trait-box.rs
index fd3b967d9..fd3b967d9 100644
--- a/src/test/ui/generic-associated-types/issue-78113-lifetime-mismatch-dyn-trait-box.rs
+++ b/tests/ui/generic-associated-types/issue-78113-lifetime-mismatch-dyn-trait-box.rs
diff --git a/src/test/ui/generic-associated-types/issue-78113-lifetime-mismatch-dyn-trait-box.stderr b/tests/ui/generic-associated-types/issue-78113-lifetime-mismatch-dyn-trait-box.stderr
index 86e0f5745..86e0f5745 100644
--- a/src/test/ui/generic-associated-types/issue-78113-lifetime-mismatch-dyn-trait-box.stderr
+++ b/tests/ui/generic-associated-types/issue-78113-lifetime-mismatch-dyn-trait-box.stderr
diff --git a/src/test/ui/generic-associated-types/issue-78671.base.stderr b/tests/ui/generic-associated-types/issue-78671.base.stderr
index 514f8d45a..bad8c1c9d 100644
--- a/src/test/ui/generic-associated-types/issue-78671.base.stderr
+++ b/tests/ui/generic-associated-types/issue-78671.base.stderr
@@ -12,7 +12,7 @@ LL |     type Member<T>;
 help: add missing generic argument
    |
 LL |     Box::new(Family) as &dyn CollectionFamily<Member<T>=usize>
-   |                                               ~~~~~~~~~
+   |                                                     +++
 
 error[E0038]: the trait `CollectionFamily` cannot be made into an object
   --> $DIR/issue-78671.rs:10:25
diff --git a/src/test/ui/generic-associated-types/issue-78671.extended.stderr b/tests/ui/generic-associated-types/issue-78671.extended.stderr
index 6fa09a4c7..1d8a3d410 100644
--- a/src/test/ui/generic-associated-types/issue-78671.extended.stderr
+++ b/tests/ui/generic-associated-types/issue-78671.extended.stderr
@@ -12,7 +12,7 @@ LL |     type Member<T>;
 help: add missing generic argument
    |
 LL |     Box::new(Family) as &dyn CollectionFamily<Member<T>=usize>
-   |                                               ~~~~~~~~~
+   |                                                     +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/issue-78671.rs b/tests/ui/generic-associated-types/issue-78671.rs
index 327b0c14a..327b0c14a 100644
--- a/src/test/ui/generic-associated-types/issue-78671.rs
+++ b/tests/ui/generic-associated-types/issue-78671.rs
diff --git a/src/test/ui/generic-associated-types/issue-79422.base.stderr b/tests/ui/generic-associated-types/issue-79422.base.stderr
index 3c1a29d48..f1de77bc3 100644
--- a/src/test/ui/generic-associated-types/issue-79422.base.stderr
+++ b/tests/ui/generic-associated-types/issue-79422.base.stderr
@@ -12,7 +12,7 @@ LL |     type VRefCont<'a>: RefCont<'a, V> where Self: 'a;
 help: add missing lifetime argument
    |
 LL |         as Box<dyn MapLike<u8, u8, VRefCont<'a> = dyn RefCont<'_, u8>>>;
-   |                                    ~~~~~~~~~~~~
+   |                                            ++++
 
 error[E0038]: the trait `MapLike` cannot be made into an object
   --> $DIR/issue-79422.rs:47:12
diff --git a/src/test/ui/generic-associated-types/issue-79422.extended.stderr b/tests/ui/generic-associated-types/issue-79422.extended.stderr
index 58c921bf0..d79de0ca6 100644
--- a/src/test/ui/generic-associated-types/issue-79422.extended.stderr
+++ b/tests/ui/generic-associated-types/issue-79422.extended.stderr
@@ -12,7 +12,7 @@ LL |     type VRefCont<'a>: RefCont<'a, V> where Self: 'a;
 help: add missing lifetime argument
    |
 LL |         as Box<dyn MapLike<u8, u8, VRefCont<'a> = dyn RefCont<'_, u8>>>;
-   |                                    ~~~~~~~~~~~~
+   |                                            ++++
 
 error[E0271]: type mismatch resolving `<BTreeMap<u8, u8> as MapLike<u8, u8>>::VRefCont<'_> == (dyn RefCont<'_, u8> + 'static)`
   --> $DIR/issue-79422.rs:44:13
diff --git a/src/test/ui/generic-associated-types/issue-79422.rs b/tests/ui/generic-associated-types/issue-79422.rs
index a52dd792d..a52dd792d 100644
--- a/src/test/ui/generic-associated-types/issue-79422.rs
+++ b/tests/ui/generic-associated-types/issue-79422.rs
diff --git a/src/test/ui/generic-associated-types/issue-79636-1.rs b/tests/ui/generic-associated-types/issue-79636-1.rs
index a89039b5c..a89039b5c 100644
--- a/src/test/ui/generic-associated-types/issue-79636-1.rs
+++ b/tests/ui/generic-associated-types/issue-79636-1.rs
diff --git a/src/test/ui/generic-associated-types/issue-79636-1.stderr b/tests/ui/generic-associated-types/issue-79636-1.stderr
index 155477048..6e0d2ff4d 100644
--- a/src/test/ui/generic-associated-types/issue-79636-1.stderr
+++ b/tests/ui/generic-associated-types/issue-79636-1.stderr
@@ -12,7 +12,7 @@ LL |     type Wrapped<B>;
 help: add missing generic argument
    |
 LL |     MInner: Monad<Unwrapped = A, Wrapped<B> = MOuter::Wrapped<A>>,
-   |                                  ~~~~~~~~~~
+   |                                         +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/issue-79636-2.rs b/tests/ui/generic-associated-types/issue-79636-2.rs
index ff5ff38c9..ff5ff38c9 100644
--- a/src/test/ui/generic-associated-types/issue-79636-2.rs
+++ b/tests/ui/generic-associated-types/issue-79636-2.rs
diff --git a/src/test/ui/generic-associated-types/issue-79636-2.stderr b/tests/ui/generic-associated-types/issue-79636-2.stderr
index 6a36bfc37..162873239 100644
--- a/src/test/ui/generic-associated-types/issue-79636-2.stderr
+++ b/tests/ui/generic-associated-types/issue-79636-2.stderr
@@ -12,7 +12,7 @@ LL |     type Wrapped<A>: SomeTrait;
 help: add missing generic argument
    |
 LL |     W: SomeTrait<Wrapped<A> = W>,
-   |                  ~~~~~~~~~~
+   |                         +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/issue-80433-reduced.rs b/tests/ui/generic-associated-types/issue-80433-reduced.rs
index 44831a995..44831a995 100644
--- a/src/test/ui/generic-associated-types/issue-80433-reduced.rs
+++ b/tests/ui/generic-associated-types/issue-80433-reduced.rs
diff --git a/src/test/ui/generic-associated-types/issue-80433.rs b/tests/ui/generic-associated-types/issue-80433.rs
index 05ff82fa7..05ff82fa7 100644
--- a/src/test/ui/generic-associated-types/issue-80433.rs
+++ b/tests/ui/generic-associated-types/issue-80433.rs
diff --git a/src/test/ui/generic-associated-types/issue-80433.stderr b/tests/ui/generic-associated-types/issue-80433.stderr
index 20a407dd4..4f4f96a4b 100644
--- a/src/test/ui/generic-associated-types/issue-80433.stderr
+++ b/tests/ui/generic-associated-types/issue-80433.stderr
@@ -12,7 +12,7 @@ LL |     type Output<'a>;
 help: add missing lifetime argument
    |
 LL | fn test_simpler<'a>(dst: &'a mut impl TestMut<Output<'a> = &'a mut f32>)
-   |                                               ~~~~~~~~~~
+   |                                                     ++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/issue-81487.rs b/tests/ui/generic-associated-types/issue-81487.rs
index 0d19a75bb..0d19a75bb 100644
--- a/src/test/ui/generic-associated-types/issue-81487.rs
+++ b/tests/ui/generic-associated-types/issue-81487.rs
diff --git a/src/test/ui/generic-associated-types/issue-81712-cyclic-traits.rs b/tests/ui/generic-associated-types/issue-81712-cyclic-traits.rs
index a7cc9a605..a7cc9a605 100644
--- a/src/test/ui/generic-associated-types/issue-81712-cyclic-traits.rs
+++ b/tests/ui/generic-associated-types/issue-81712-cyclic-traits.rs
diff --git a/src/test/ui/generic-associated-types/issue-81712-cyclic-traits.stderr b/tests/ui/generic-associated-types/issue-81712-cyclic-traits.stderr
index c8961e28e..e0fc225f4 100644
--- a/src/test/ui/generic-associated-types/issue-81712-cyclic-traits.stderr
+++ b/tests/ui/generic-associated-types/issue-81712-cyclic-traits.stderr
@@ -12,7 +12,7 @@ LL |     type DType<T>: D<T, CType = Self>;
 help: add missing generic argument
    |
 LL |     type CType: C<DType<T> = Self>;
-   |                   ~~~~~~~~
+   |                        +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/issue-81862.rs b/tests/ui/generic-associated-types/issue-81862.rs
index bde828b77..bde828b77 100644
--- a/src/test/ui/generic-associated-types/issue-81862.rs
+++ b/tests/ui/generic-associated-types/issue-81862.rs
diff --git a/src/test/ui/generic-associated-types/issue-81862.stderr b/tests/ui/generic-associated-types/issue-81862.stderr
index 9e21c567c..df30be65e 100644
--- a/src/test/ui/generic-associated-types/issue-81862.stderr
+++ b/tests/ui/generic-associated-types/issue-81862.stderr
@@ -12,7 +12,7 @@ LL |     type Item<'a>;
 help: add missing lifetime argument
    |
 LL |     fn next(&mut self) -> Option<Self::Item<'_>>;
-   |                                        ~~~~~~~~
+   |                                            ++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/issue-84931.rs b/tests/ui/generic-associated-types/issue-84931.rs
index 4123ce9d4..4123ce9d4 100644
--- a/src/test/ui/generic-associated-types/issue-84931.rs
+++ b/tests/ui/generic-associated-types/issue-84931.rs
diff --git a/src/test/ui/generic-associated-types/issue-84931.stderr b/tests/ui/generic-associated-types/issue-84931.stderr
index fffea98a4..fffea98a4 100644
--- a/src/test/ui/generic-associated-types/issue-84931.stderr
+++ b/tests/ui/generic-associated-types/issue-84931.stderr
diff --git a/src/test/ui/generic-associated-types/issue-85921.rs b/tests/ui/generic-associated-types/issue-85921.rs
index d281ed9ee..d281ed9ee 100644
--- a/src/test/ui/generic-associated-types/issue-85921.rs
+++ b/tests/ui/generic-associated-types/issue-85921.rs
diff --git a/src/test/ui/generic-associated-types/issue-86218-2.rs b/tests/ui/generic-associated-types/issue-86218-2.rs
index 63c839ea8..63c839ea8 100644
--- a/src/test/ui/generic-associated-types/issue-86218-2.rs
+++ b/tests/ui/generic-associated-types/issue-86218-2.rs
diff --git a/src/test/ui/generic-associated-types/issue-86218.rs b/tests/ui/generic-associated-types/issue-86218.rs
index b2c3071f0..b2c3071f0 100644
--- a/src/test/ui/generic-associated-types/issue-86218.rs
+++ b/tests/ui/generic-associated-types/issue-86218.rs
diff --git a/src/test/ui/generic-associated-types/issue-86483.rs b/tests/ui/generic-associated-types/issue-86483.rs
index 70267637a..70267637a 100644
--- a/src/test/ui/generic-associated-types/issue-86483.rs
+++ b/tests/ui/generic-associated-types/issue-86483.rs
diff --git a/src/test/ui/generic-associated-types/issue-86787.rs b/tests/ui/generic-associated-types/issue-86787.rs
index 96075ca50..96075ca50 100644
--- a/src/test/ui/generic-associated-types/issue-86787.rs
+++ b/tests/ui/generic-associated-types/issue-86787.rs
diff --git a/src/test/ui/generic-associated-types/issue-86787.stderr b/tests/ui/generic-associated-types/issue-86787.stderr
index f34c63cf7..f34c63cf7 100644
--- a/src/test/ui/generic-associated-types/issue-86787.stderr
+++ b/tests/ui/generic-associated-types/issue-86787.stderr
diff --git a/src/test/ui/generic-associated-types/issue-87258_a.rs b/tests/ui/generic-associated-types/issue-87258_a.rs
index 9ab683d3d..9ab683d3d 100644
--- a/src/test/ui/generic-associated-types/issue-87258_a.rs
+++ b/tests/ui/generic-associated-types/issue-87258_a.rs
diff --git a/src/test/ui/generic-associated-types/issue-87258_a.stderr b/tests/ui/generic-associated-types/issue-87258_a.stderr
index eae9bd9b1..eae9bd9b1 100644
--- a/src/test/ui/generic-associated-types/issue-87258_a.stderr
+++ b/tests/ui/generic-associated-types/issue-87258_a.stderr
diff --git a/src/test/ui/generic-associated-types/issue-87258_b.rs b/tests/ui/generic-associated-types/issue-87258_b.rs
index 7b7610b21..7b7610b21 100644
--- a/src/test/ui/generic-associated-types/issue-87258_b.rs
+++ b/tests/ui/generic-associated-types/issue-87258_b.rs
diff --git a/src/test/ui/generic-associated-types/issue-87258_b.stderr b/tests/ui/generic-associated-types/issue-87258_b.stderr
index 0ee665f38..0ee665f38 100644
--- a/src/test/ui/generic-associated-types/issue-87258_b.stderr
+++ b/tests/ui/generic-associated-types/issue-87258_b.stderr
diff --git a/src/test/ui/generic-associated-types/issue-87429-2.rs b/tests/ui/generic-associated-types/issue-87429-2.rs
index feb43ee5a..feb43ee5a 100644
--- a/src/test/ui/generic-associated-types/issue-87429-2.rs
+++ b/tests/ui/generic-associated-types/issue-87429-2.rs
diff --git a/src/test/ui/generic-associated-types/issue-87429-associated-type-default.rs b/tests/ui/generic-associated-types/issue-87429-associated-type-default.rs
index 2006f9bc7..2006f9bc7 100644
--- a/src/test/ui/generic-associated-types/issue-87429-associated-type-default.rs
+++ b/tests/ui/generic-associated-types/issue-87429-associated-type-default.rs
diff --git a/src/test/ui/generic-associated-types/issue-87429-associated-type-default.stderr b/tests/ui/generic-associated-types/issue-87429-associated-type-default.stderr
index b1abe012b..b1abe012b 100644
--- a/src/test/ui/generic-associated-types/issue-87429-associated-type-default.stderr
+++ b/tests/ui/generic-associated-types/issue-87429-associated-type-default.stderr
diff --git a/src/test/ui/generic-associated-types/issue-87429-specialization.rs b/tests/ui/generic-associated-types/issue-87429-specialization.rs
index 6e31f1b21..6e31f1b21 100644
--- a/src/test/ui/generic-associated-types/issue-87429-specialization.rs
+++ b/tests/ui/generic-associated-types/issue-87429-specialization.rs
diff --git a/src/test/ui/generic-associated-types/issue-87429-specialization.stderr b/tests/ui/generic-associated-types/issue-87429-specialization.stderr
index 11c4ebf60..11c4ebf60 100644
--- a/src/test/ui/generic-associated-types/issue-87429-specialization.stderr
+++ b/tests/ui/generic-associated-types/issue-87429-specialization.stderr
diff --git a/src/test/ui/generic-associated-types/issue-87429.rs b/tests/ui/generic-associated-types/issue-87429.rs
index 56394823c..56394823c 100644
--- a/src/test/ui/generic-associated-types/issue-87429.rs
+++ b/tests/ui/generic-associated-types/issue-87429.rs
diff --git a/src/test/ui/generic-associated-types/issue-87748.rs b/tests/ui/generic-associated-types/issue-87748.rs
index 6cbe3d902..6cbe3d902 100644
--- a/src/test/ui/generic-associated-types/issue-87748.rs
+++ b/tests/ui/generic-associated-types/issue-87748.rs
diff --git a/src/test/ui/generic-associated-types/issue-87750.rs b/tests/ui/generic-associated-types/issue-87750.rs
index b35657989..b35657989 100644
--- a/src/test/ui/generic-associated-types/issue-87750.rs
+++ b/tests/ui/generic-associated-types/issue-87750.rs
diff --git a/src/test/ui/generic-associated-types/issue-88287.rs b/tests/ui/generic-associated-types/issue-88287.rs
index 82188493d..82188493d 100644
--- a/src/test/ui/generic-associated-types/issue-88287.rs
+++ b/tests/ui/generic-associated-types/issue-88287.rs
diff --git a/src/test/ui/generic-associated-types/issue-88287.stderr b/tests/ui/generic-associated-types/issue-88287.stderr
index 1b84cce62..1b84cce62 100644
--- a/src/test/ui/generic-associated-types/issue-88287.stderr
+++ b/tests/ui/generic-associated-types/issue-88287.stderr
diff --git a/src/test/ui/generic-associated-types/issue-88360.rs b/tests/ui/generic-associated-types/issue-88360.rs
index c02690618..c02690618 100644
--- a/src/test/ui/generic-associated-types/issue-88360.rs
+++ b/tests/ui/generic-associated-types/issue-88360.rs
diff --git a/src/test/ui/generic-associated-types/issue-88360.stderr b/tests/ui/generic-associated-types/issue-88360.stderr
index cd3750344..cd3750344 100644
--- a/src/test/ui/generic-associated-types/issue-88360.stderr
+++ b/tests/ui/generic-associated-types/issue-88360.stderr
diff --git a/src/test/ui/generic-associated-types/issue-88405.rs b/tests/ui/generic-associated-types/issue-88405.rs
index 8dad6a89f..8dad6a89f 100644
--- a/src/test/ui/generic-associated-types/issue-88405.rs
+++ b/tests/ui/generic-associated-types/issue-88405.rs
diff --git a/src/test/ui/generic-associated-types/issue-88459.rs b/tests/ui/generic-associated-types/issue-88459.rs
index 07d7bc06d..07d7bc06d 100644
--- a/src/test/ui/generic-associated-types/issue-88459.rs
+++ b/tests/ui/generic-associated-types/issue-88459.rs
diff --git a/src/test/ui/generic-associated-types/issue-88595.rs b/tests/ui/generic-associated-types/issue-88595.rs
index 24641ee1f..24641ee1f 100644
--- a/src/test/ui/generic-associated-types/issue-88595.rs
+++ b/tests/ui/generic-associated-types/issue-88595.rs
diff --git a/src/test/ui/generic-associated-types/issue-88595.stderr b/tests/ui/generic-associated-types/issue-88595.stderr
index bcefc8066..bcefc8066 100644
--- a/src/test/ui/generic-associated-types/issue-88595.stderr
+++ b/tests/ui/generic-associated-types/issue-88595.stderr
diff --git a/src/test/ui/generic-associated-types/issue-89008.rs b/tests/ui/generic-associated-types/issue-89008.rs
index 669dbafb5..669dbafb5 100644
--- a/src/test/ui/generic-associated-types/issue-89008.rs
+++ b/tests/ui/generic-associated-types/issue-89008.rs
diff --git a/src/test/ui/generic-associated-types/issue-89352.rs b/tests/ui/generic-associated-types/issue-89352.rs
index 1896d0c87..1896d0c87 100644
--- a/src/test/ui/generic-associated-types/issue-89352.rs
+++ b/tests/ui/generic-associated-types/issue-89352.rs
diff --git a/src/test/ui/generic-associated-types/issue-90014.rs b/tests/ui/generic-associated-types/issue-90014.rs
index 55db95a6d..55db95a6d 100644
--- a/src/test/ui/generic-associated-types/issue-90014.rs
+++ b/tests/ui/generic-associated-types/issue-90014.rs
diff --git a/tests/ui/generic-associated-types/issue-90014.stderr b/tests/ui/generic-associated-types/issue-90014.stderr
new file mode 100644
index 000000000..b4b1bc7da
--- /dev/null
+++ b/tests/ui/generic-associated-types/issue-90014.stderr
@@ -0,0 +1,22 @@
+error[E0477]: the type `&mut ()` does not fulfill the required lifetime
+  --> $DIR/issue-90014.rs:13:20
+   |
+LL |     type Fut<'a> where Self: 'a;
+   |     ------------ definition of `Fut` from trait
+...
+LL |     type Fut<'a> = impl Future<Output = ()>;
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+note: type must outlive the lifetime `'a` as defined here
+  --> $DIR/issue-90014.rs:13:14
+   |
+LL |     type Fut<'a> = impl Future<Output = ()>;
+   |              ^^
+help: copy the `where` clause predicates from the trait
+   |
+LL |     type Fut<'a> = impl Future<Output = ()> where Self: 'a;
+   |                                             ++++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0477`.
diff --git a/src/test/ui/generic-associated-types/issue-90729.rs b/tests/ui/generic-associated-types/issue-90729.rs
index bcec2e321..bcec2e321 100644
--- a/src/test/ui/generic-associated-types/issue-90729.rs
+++ b/tests/ui/generic-associated-types/issue-90729.rs
diff --git a/src/test/ui/generic-associated-types/issue-91139.migrate.stderr b/tests/ui/generic-associated-types/issue-91139.migrate.stderr
index 690160577..690160577 100644
--- a/src/test/ui/generic-associated-types/issue-91139.migrate.stderr
+++ b/tests/ui/generic-associated-types/issue-91139.migrate.stderr
diff --git a/tests/ui/generic-associated-types/issue-91139.rs b/tests/ui/generic-associated-types/issue-91139.rs
new file mode 100644
index 000000000..adc0cb4e0
--- /dev/null
+++ b/tests/ui/generic-associated-types/issue-91139.rs
@@ -0,0 +1,27 @@
+trait Foo<T> {
+    type Type<'a>
+    where
+        T: 'a;
+}
+
+impl<T> Foo<T> for () {
+    type Type<'a> = ()
+    where
+        T: 'a;
+}
+
+fn foo<T>() {
+    let _: for<'a> fn(<() as Foo<T>>::Type<'a>, &'a T) = |_, _| ();
+    //~^ ERROR `T` does not live long enough
+    //~| ERROR `T` does not live long enough
+    //
+    // FIXME: This error is bogus, but it arises because we try to validate
+    // that `<() as Foo<T>>::Type<'a>` is valid, which requires proving
+    // that `T: 'a`. Since `'a` is higher-ranked, this becomes
+    // `for<'a> T: 'a`, which is not true. Of course, the error is bogus
+    // because there *ought* to be an implied bound stating that `'a` is
+    // not any lifetime but specifically
+    // "some `'a` such that `<() as Foo<T>>::Type<'a>" is valid".
+}
+
+pub fn main() {}
diff --git a/tests/ui/generic-associated-types/issue-91139.stderr b/tests/ui/generic-associated-types/issue-91139.stderr
new file mode 100644
index 000000000..d9d76adfb
--- /dev/null
+++ b/tests/ui/generic-associated-types/issue-91139.stderr
@@ -0,0 +1,14 @@
+error: `T` does not live long enough
+  --> $DIR/issue-91139.rs:14:12
+   |
+LL |     let _: for<'a> fn(<() as Foo<T>>::Type<'a>, &'a T) = |_, _| ();
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: `T` does not live long enough
+  --> $DIR/issue-91139.rs:14:12
+   |
+LL |     let _: for<'a> fn(<() as Foo<T>>::Type<'a>, &'a T) = |_, _| ();
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/generic-associated-types/issue-91883.rs b/tests/ui/generic-associated-types/issue-91883.rs
index e870e08a3..e870e08a3 100644
--- a/src/test/ui/generic-associated-types/issue-91883.rs
+++ b/tests/ui/generic-associated-types/issue-91883.rs
diff --git a/tests/ui/generic-associated-types/issue-91883.stderr b/tests/ui/generic-associated-types/issue-91883.stderr
new file mode 100644
index 000000000..d5db96209
--- /dev/null
+++ b/tests/ui/generic-associated-types/issue-91883.stderr
@@ -0,0 +1,27 @@
+error[E0478]: lifetime bound not satisfied
+  --> $DIR/issue-91883.rs:30:24
+   |
+LL |     type Cursor<'tx>: Cursor<'tx>
+   |     ----------------------------- definition of `Cursor` from trait
+...
+LL |     type Cursor<'tx> = CursorImpl<'tx>;
+   |                        ^^^^^^^^^^^^^^^
+   |
+note: lifetime parameter instantiated with the lifetime `'db` as defined here
+  --> $DIR/issue-91883.rs:29:6
+   |
+LL | impl<'db> Transaction<'db> for TransactionImpl<'db> {
+   |      ^^^
+note: but lifetime parameter must outlive the lifetime `'tx` as defined here
+  --> $DIR/issue-91883.rs:30:17
+   |
+LL |     type Cursor<'tx> = CursorImpl<'tx>;
+   |                 ^^^
+help: copy the `where` clause predicates from the trait
+   |
+LL |     type Cursor<'tx> = CursorImpl<'tx> where 'db: 'tx, Self: 'tx;
+   |                                        +++++++++++++++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0478`.
diff --git a/src/test/ui/generic-associated-types/issue-92033.rs b/tests/ui/generic-associated-types/issue-92033.rs
index d111580b8..d111580b8 100644
--- a/src/test/ui/generic-associated-types/issue-92033.rs
+++ b/tests/ui/generic-associated-types/issue-92033.rs
diff --git a/src/test/ui/generic-associated-types/issue-92033.stderr b/tests/ui/generic-associated-types/issue-92033.stderr
index cd7eed254..ddc420a7b 100644
--- a/src/test/ui/generic-associated-types/issue-92033.stderr
+++ b/tests/ui/generic-associated-types/issue-92033.stderr
@@ -5,13 +5,17 @@ LL |     type TextureIter<'a>: Iterator<Item = &'a Texture>
    |     -------------------------------------------------- definition of `TextureIter` from trait
 ...
 LL |     type TextureIter<'a> = std::option::IntoIter<&'a Texture>;
-   |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- help: try copying this clause from the trait: `where Self: 'a`
+   |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: type must outlive the lifetime `'a` as defined here
   --> $DIR/issue-92033.rs:20:22
    |
 LL |     type TextureIter<'a> = std::option::IntoIter<&'a Texture>;
    |                      ^^
+help: copy the `where` clause predicates from the trait
+   |
+LL |     type TextureIter<'a> = std::option::IntoIter<&'a Texture> where Self: 'a;
+   |                                                               ++++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/issue-92096.migrate.stderr b/tests/ui/generic-associated-types/issue-92096.migrate.stderr
index ce1fd6dd9..ce1fd6dd9 100644
--- a/src/test/ui/generic-associated-types/issue-92096.migrate.stderr
+++ b/tests/ui/generic-associated-types/issue-92096.migrate.stderr
diff --git a/src/test/ui/generic-associated-types/issue-92096.rs b/tests/ui/generic-associated-types/issue-92096.rs
index e285af666..e285af666 100644
--- a/src/test/ui/generic-associated-types/issue-92096.rs
+++ b/tests/ui/generic-associated-types/issue-92096.rs
diff --git a/src/test/ui/generic-associated-types/issue-92096.stderr b/tests/ui/generic-associated-types/issue-92096.stderr
index 91a06d5ac..91a06d5ac 100644
--- a/src/test/ui/generic-associated-types/issue-92096.stderr
+++ b/tests/ui/generic-associated-types/issue-92096.stderr
diff --git a/src/test/ui/generic-associated-types/issue-92280.rs b/tests/ui/generic-associated-types/issue-92280.rs
index 9284beea3..9284beea3 100644
--- a/src/test/ui/generic-associated-types/issue-92280.rs
+++ b/tests/ui/generic-associated-types/issue-92280.rs
diff --git a/src/test/ui/generic-associated-types/issue-92954.rs b/tests/ui/generic-associated-types/issue-92954.rs
index 22ce8f9fe..22ce8f9fe 100644
--- a/src/test/ui/generic-associated-types/issue-92954.rs
+++ b/tests/ui/generic-associated-types/issue-92954.rs
diff --git a/src/test/ui/generic-associated-types/issue-93141.rs b/tests/ui/generic-associated-types/issue-93141.rs
index 48c78b9c0..48c78b9c0 100644
--- a/src/test/ui/generic-associated-types/issue-93141.rs
+++ b/tests/ui/generic-associated-types/issue-93141.rs
diff --git a/src/test/ui/generic-associated-types/issue-93262.rs b/tests/ui/generic-associated-types/issue-93262.rs
index a7bcd111d..a7bcd111d 100644
--- a/src/test/ui/generic-associated-types/issue-93262.rs
+++ b/tests/ui/generic-associated-types/issue-93262.rs
diff --git a/src/test/ui/generic-associated-types/issue-93340.rs b/tests/ui/generic-associated-types/issue-93340.rs
index 4662fda53..4662fda53 100644
--- a/src/test/ui/generic-associated-types/issue-93340.rs
+++ b/tests/ui/generic-associated-types/issue-93340.rs
diff --git a/src/test/ui/generic-associated-types/issue-93341.rs b/tests/ui/generic-associated-types/issue-93341.rs
index 737b2bbdb..737b2bbdb 100644
--- a/src/test/ui/generic-associated-types/issue-93341.rs
+++ b/tests/ui/generic-associated-types/issue-93341.rs
diff --git a/src/test/ui/generic-associated-types/issue-93342.rs b/tests/ui/generic-associated-types/issue-93342.rs
index d4422d5d1..d4422d5d1 100644
--- a/src/test/ui/generic-associated-types/issue-93342.rs
+++ b/tests/ui/generic-associated-types/issue-93342.rs
diff --git a/src/test/ui/generic-associated-types/issue-93874.rs b/tests/ui/generic-associated-types/issue-93874.rs
index 30956655a..30956655a 100644
--- a/src/test/ui/generic-associated-types/issue-93874.rs
+++ b/tests/ui/generic-associated-types/issue-93874.rs
diff --git a/src/test/ui/generic-associated-types/issue-95305.rs b/tests/ui/generic-associated-types/issue-95305.rs
index 6c3ec20e7..6c3ec20e7 100644
--- a/src/test/ui/generic-associated-types/issue-95305.rs
+++ b/tests/ui/generic-associated-types/issue-95305.rs
diff --git a/src/test/ui/generic-associated-types/issue-95305.stderr b/tests/ui/generic-associated-types/issue-95305.stderr
index eb15cbc62..eb15cbc62 100644
--- a/src/test/ui/generic-associated-types/issue-95305.stderr
+++ b/tests/ui/generic-associated-types/issue-95305.stderr
diff --git a/src/test/ui/generic-associated-types/iterable.rs b/tests/ui/generic-associated-types/iterable.rs
index 8ad351bd3..8ad351bd3 100644
--- a/src/test/ui/generic-associated-types/iterable.rs
+++ b/tests/ui/generic-associated-types/iterable.rs
diff --git a/src/test/ui/generic-associated-types/method-unsatified-assoc-type-predicate.rs b/tests/ui/generic-associated-types/method-unsatified-assoc-type-predicate.rs
index 36974b3df..83655341d 100644
--- a/src/test/ui/generic-associated-types/method-unsatified-assoc-type-predicate.rs
+++ b/tests/ui/generic-associated-types/method-unsatified-assoc-type-predicate.rs
@@ -11,7 +11,7 @@ trait M {
 
 impl<T: X<Y<i32> = i32>> M for T {}
 //~^ NOTE trait bound `<S as X>::Y<i32> = i32` was not satisfied
-//~| NOTE unsatisfied trait bound introduced here
+//~| NOTE
 //~| NOTE
 //~| NOTE
 
diff --git a/src/test/ui/generic-associated-types/method-unsatified-assoc-type-predicate.stderr b/tests/ui/generic-associated-types/method-unsatified-assoc-type-predicate.stderr
index baef38f6b..baef38f6b 100644
--- a/src/test/ui/generic-associated-types/method-unsatified-assoc-type-predicate.stderr
+++ b/tests/ui/generic-associated-types/method-unsatified-assoc-type-predicate.stderr
diff --git a/tests/ui/generic-associated-types/mismatched-where-clause-regions.rs b/tests/ui/generic-associated-types/mismatched-where-clause-regions.rs
new file mode 100644
index 000000000..8caf53176
--- /dev/null
+++ b/tests/ui/generic-associated-types/mismatched-where-clause-regions.rs
@@ -0,0 +1,12 @@
+trait Foo {
+    type T<'a1, 'b1>
+    where
+        'a1: 'b1;
+}
+
+impl Foo for () {
+    type T<'a2, 'b2> = () where 'b2: 'a2;
+    //~^ ERROR impl has stricter requirements than trait
+}
+
+fn main() {}
diff --git a/tests/ui/generic-associated-types/mismatched-where-clause-regions.stderr b/tests/ui/generic-associated-types/mismatched-where-clause-regions.stderr
new file mode 100644
index 000000000..91a030076
--- /dev/null
+++ b/tests/ui/generic-associated-types/mismatched-where-clause-regions.stderr
@@ -0,0 +1,17 @@
+error[E0276]: impl has stricter requirements than trait
+  --> $DIR/mismatched-where-clause-regions.rs:8:38
+   |
+LL |     type T<'a1, 'b1>
+   |     ---------------- definition of `T` from trait
+...
+LL |     type T<'a2, 'b2> = () where 'b2: 'a2;
+   |                                      ^^^ impl has extra requirement `'b2: 'a2`
+   |
+help: copy the `where` clause predicates from the trait
+   |
+LL |     type T<'a2, 'b2> = () where 'a2: 'b2;
+   |                           ~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0276`.
diff --git a/src/test/ui/generic-associated-types/missing-bounds.fixed b/tests/ui/generic-associated-types/missing-bounds.fixed
index ee758f19e..ee758f19e 100644
--- a/src/test/ui/generic-associated-types/missing-bounds.fixed
+++ b/tests/ui/generic-associated-types/missing-bounds.fixed
diff --git a/src/test/ui/generic-associated-types/missing-bounds.rs b/tests/ui/generic-associated-types/missing-bounds.rs
index ffafff5e9..ffafff5e9 100644
--- a/src/test/ui/generic-associated-types/missing-bounds.rs
+++ b/tests/ui/generic-associated-types/missing-bounds.rs
diff --git a/src/test/ui/generic-associated-types/missing-bounds.stderr b/tests/ui/generic-associated-types/missing-bounds.stderr
index c913483a8..9f669b9a5 100644
--- a/src/test/ui/generic-associated-types/missing-bounds.stderr
+++ b/tests/ui/generic-associated-types/missing-bounds.stderr
@@ -23,6 +23,13 @@ LL |         A(self.0 + rhs.0)
    |
    = note: expected type parameter `B`
              found associated type `<B as Add>::Output`
+help: the type constructed contains `<B as Add>::Output` due to the type of the argument passed
+  --> $DIR/missing-bounds.rs:11:9
+   |
+LL |         A(self.0 + rhs.0)
+   |         ^^--------------^
+   |           |
+   |           this argument influences the type of `A`
 note: tuple struct defined here
   --> $DIR/missing-bounds.rs:5:8
    |
diff --git a/src/test/ui/generic-associated-types/missing-where-clause-on-trait.rs b/tests/ui/generic-associated-types/missing-where-clause-on-trait.rs
index de9cad308..de9cad308 100644
--- a/src/test/ui/generic-associated-types/missing-where-clause-on-trait.rs
+++ b/tests/ui/generic-associated-types/missing-where-clause-on-trait.rs
diff --git a/src/test/ui/generic-associated-types/missing-where-clause-on-trait.stderr b/tests/ui/generic-associated-types/missing-where-clause-on-trait.stderr
index ffdba6676..8a71fc73a 100644
--- a/src/test/ui/generic-associated-types/missing-where-clause-on-trait.stderr
+++ b/tests/ui/generic-associated-types/missing-where-clause-on-trait.stderr
@@ -6,6 +6,12 @@ LL |     type Assoc<'a, 'b>;
 ...
 LL |     type Assoc<'a, 'b> = () where 'a: 'b;
    |                                       ^^ impl has extra requirement `'a: 'b`
+   |
+help: remove the `where` clause
+   |
+LL -     type Assoc<'a, 'b> = () where 'a: 'b;
+LL +     type Assoc<'a, 'b> = () ;
+   |
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/missing_lifetime_args.rs b/tests/ui/generic-associated-types/missing_lifetime_args.rs
index 78def8092..78def8092 100644
--- a/src/test/ui/generic-associated-types/missing_lifetime_args.rs
+++ b/tests/ui/generic-associated-types/missing_lifetime_args.rs
diff --git a/src/test/ui/generic-associated-types/missing_lifetime_args.stderr b/tests/ui/generic-associated-types/missing_lifetime_args.stderr
index 752587c25..8f74b12c0 100644
--- a/src/test/ui/generic-associated-types/missing_lifetime_args.stderr
+++ b/tests/ui/generic-associated-types/missing_lifetime_args.stderr
@@ -12,7 +12,7 @@ LL |     type Y<'a, 'b>;
 help: add missing lifetime arguments
    |
 LL | fn foo<'c, 'd>(_arg: Box<dyn X<Y<'_, '_> = (&'c u32, &'d u32)>>) {}
-   |                                ~~~~~~~~~
+   |                                 ++++++++
 
 error[E0107]: this struct takes 3 lifetime arguments but 2 lifetime arguments were supplied
   --> $DIR/missing_lifetime_args.rs:14:26
diff --git a/src/test/ui/generic-associated-types/missing_lifetime_const.rs b/tests/ui/generic-associated-types/missing_lifetime_const.rs
index 8b174b9e9..8b174b9e9 100644
--- a/src/test/ui/generic-associated-types/missing_lifetime_const.rs
+++ b/tests/ui/generic-associated-types/missing_lifetime_const.rs
diff --git a/src/test/ui/generic-associated-types/missing_lifetime_const.stderr b/tests/ui/generic-associated-types/missing_lifetime_const.stderr
index 62d2e9f49..62d2e9f49 100644
--- a/src/test/ui/generic-associated-types/missing_lifetime_const.stderr
+++ b/tests/ui/generic-associated-types/missing_lifetime_const.stderr
diff --git a/src/test/ui/generic-associated-types/own-bound-span.rs b/tests/ui/generic-associated-types/own-bound-span.rs
index 3699f7296..3699f7296 100644
--- a/src/test/ui/generic-associated-types/own-bound-span.rs
+++ b/tests/ui/generic-associated-types/own-bound-span.rs
diff --git a/src/test/ui/generic-associated-types/own-bound-span.stderr b/tests/ui/generic-associated-types/own-bound-span.stderr
index 8ab8ea623..8ab8ea623 100644
--- a/src/test/ui/generic-associated-types/own-bound-span.stderr
+++ b/tests/ui/generic-associated-types/own-bound-span.stderr
diff --git a/src/test/ui/generic-associated-types/parameter_number_and_kind.rs b/tests/ui/generic-associated-types/parameter_number_and_kind.rs
index 8428e7763..8428e7763 100644
--- a/src/test/ui/generic-associated-types/parameter_number_and_kind.rs
+++ b/tests/ui/generic-associated-types/parameter_number_and_kind.rs
diff --git a/src/test/ui/generic-associated-types/parameter_number_and_kind.stderr b/tests/ui/generic-associated-types/parameter_number_and_kind.stderr
index c20b9669e..c20b9669e 100644
--- a/src/test/ui/generic-associated-types/parameter_number_and_kind.stderr
+++ b/tests/ui/generic-associated-types/parameter_number_and_kind.stderr
diff --git a/src/test/ui/generic-associated-types/parameter_number_and_kind_impl.rs b/tests/ui/generic-associated-types/parameter_number_and_kind_impl.rs
index c1381025a..c1381025a 100644
--- a/src/test/ui/generic-associated-types/parameter_number_and_kind_impl.rs
+++ b/tests/ui/generic-associated-types/parameter_number_and_kind_impl.rs
diff --git a/src/test/ui/generic-associated-types/parameter_number_and_kind_impl.stderr b/tests/ui/generic-associated-types/parameter_number_and_kind_impl.stderr
index fdd6d305a..fdd6d305a 100644
--- a/src/test/ui/generic-associated-types/parameter_number_and_kind_impl.stderr
+++ b/tests/ui/generic-associated-types/parameter_number_and_kind_impl.stderr
diff --git a/src/test/ui/generic-associated-types/parse/in-trait-impl.rs b/tests/ui/generic-associated-types/parse/in-trait-impl.rs
index 767098835..767098835 100644
--- a/src/test/ui/generic-associated-types/parse/in-trait-impl.rs
+++ b/tests/ui/generic-associated-types/parse/in-trait-impl.rs
diff --git a/src/test/ui/generic-associated-types/parse/in-trait.rs b/tests/ui/generic-associated-types/parse/in-trait.rs
index 6628aac37..6628aac37 100644
--- a/src/test/ui/generic-associated-types/parse/in-trait.rs
+++ b/tests/ui/generic-associated-types/parse/in-trait.rs
diff --git a/src/test/ui/generic-associated-types/parse/trait-path-expected-token.rs b/tests/ui/generic-associated-types/parse/trait-path-expected-token.rs
index cbb051892..cbb051892 100644
--- a/src/test/ui/generic-associated-types/parse/trait-path-expected-token.rs
+++ b/tests/ui/generic-associated-types/parse/trait-path-expected-token.rs
diff --git a/src/test/ui/generic-associated-types/parse/trait-path-expected-token.stderr b/tests/ui/generic-associated-types/parse/trait-path-expected-token.stderr
index 53d5f9de6..53d5f9de6 100644
--- a/src/test/ui/generic-associated-types/parse/trait-path-expected-token.stderr
+++ b/tests/ui/generic-associated-types/parse/trait-path-expected-token.stderr
diff --git a/src/test/ui/generic-associated-types/parse/trait-path-expressions.rs b/tests/ui/generic-associated-types/parse/trait-path-expressions.rs
index 9183ec497..9183ec497 100644
--- a/src/test/ui/generic-associated-types/parse/trait-path-expressions.rs
+++ b/tests/ui/generic-associated-types/parse/trait-path-expressions.rs
diff --git a/src/test/ui/generic-associated-types/parse/trait-path-expressions.stderr b/tests/ui/generic-associated-types/parse/trait-path-expressions.stderr
index cf2b1763f..cf2b1763f 100644
--- a/src/test/ui/generic-associated-types/parse/trait-path-expressions.stderr
+++ b/tests/ui/generic-associated-types/parse/trait-path-expressions.stderr
diff --git a/src/test/ui/generic-associated-types/parse/trait-path-missing-gen_arg.rs b/tests/ui/generic-associated-types/parse/trait-path-missing-gen_arg.rs
index ecabf8943..ecabf8943 100644
--- a/src/test/ui/generic-associated-types/parse/trait-path-missing-gen_arg.rs
+++ b/tests/ui/generic-associated-types/parse/trait-path-missing-gen_arg.rs
diff --git a/src/test/ui/generic-associated-types/parse/trait-path-missing-gen_arg.stderr b/tests/ui/generic-associated-types/parse/trait-path-missing-gen_arg.stderr
index 10ceccedc..10ceccedc 100644
--- a/src/test/ui/generic-associated-types/parse/trait-path-missing-gen_arg.stderr
+++ b/tests/ui/generic-associated-types/parse/trait-path-missing-gen_arg.stderr
diff --git a/src/test/ui/generic-associated-types/parse/trait-path-segments.rs b/tests/ui/generic-associated-types/parse/trait-path-segments.rs
index 458e203eb..458e203eb 100644
--- a/src/test/ui/generic-associated-types/parse/trait-path-segments.rs
+++ b/tests/ui/generic-associated-types/parse/trait-path-segments.rs
diff --git a/src/test/ui/generic-associated-types/parse/trait-path-segments.stderr b/tests/ui/generic-associated-types/parse/trait-path-segments.stderr
index 8bc737d67..8bc737d67 100644
--- a/src/test/ui/generic-associated-types/parse/trait-path-segments.stderr
+++ b/tests/ui/generic-associated-types/parse/trait-path-segments.stderr
diff --git a/src/test/ui/generic-associated-types/parse/trait-path-type-error-once-implemented.rs b/tests/ui/generic-associated-types/parse/trait-path-type-error-once-implemented.rs
index 1622b92aa..1622b92aa 100644
--- a/src/test/ui/generic-associated-types/parse/trait-path-type-error-once-implemented.rs
+++ b/tests/ui/generic-associated-types/parse/trait-path-type-error-once-implemented.rs
diff --git a/src/test/ui/generic-associated-types/parse/trait-path-type-error-once-implemented.stderr b/tests/ui/generic-associated-types/parse/trait-path-type-error-once-implemented.stderr
index 0a09ec5dc..0a09ec5dc 100644
--- a/src/test/ui/generic-associated-types/parse/trait-path-type-error-once-implemented.stderr
+++ b/tests/ui/generic-associated-types/parse/trait-path-type-error-once-implemented.stderr
diff --git a/src/test/ui/generic-associated-types/parse/trait-path-types.rs b/tests/ui/generic-associated-types/parse/trait-path-types.rs
index 74a00342f..74a00342f 100644
--- a/src/test/ui/generic-associated-types/parse/trait-path-types.rs
+++ b/tests/ui/generic-associated-types/parse/trait-path-types.rs
diff --git a/src/test/ui/generic-associated-types/parse/trait-path-types.stderr b/tests/ui/generic-associated-types/parse/trait-path-types.stderr
index 8f7a73c95..8f7a73c95 100644
--- a/src/test/ui/generic-associated-types/parse/trait-path-types.stderr
+++ b/tests/ui/generic-associated-types/parse/trait-path-types.stderr
diff --git a/src/test/ui/generic-associated-types/pointer_family.rs b/tests/ui/generic-associated-types/pointer_family.rs
index 80827cd56..80827cd56 100644
--- a/src/test/ui/generic-associated-types/pointer_family.rs
+++ b/tests/ui/generic-associated-types/pointer_family.rs
diff --git a/src/test/ui/generic-associated-types/projection-bound-cycle-generic.rs b/tests/ui/generic-associated-types/projection-bound-cycle-generic.rs
index ecf6f69c9..ecf6f69c9 100644
--- a/src/test/ui/generic-associated-types/projection-bound-cycle-generic.rs
+++ b/tests/ui/generic-associated-types/projection-bound-cycle-generic.rs
diff --git a/src/test/ui/generic-associated-types/projection-bound-cycle-generic.stderr b/tests/ui/generic-associated-types/projection-bound-cycle-generic.stderr
index aae9a56bb..aae9a56bb 100644
--- a/src/test/ui/generic-associated-types/projection-bound-cycle-generic.stderr
+++ b/tests/ui/generic-associated-types/projection-bound-cycle-generic.stderr
diff --git a/src/test/ui/generic-associated-types/projection-bound-cycle.rs b/tests/ui/generic-associated-types/projection-bound-cycle.rs
index b51ae7ef2..b51ae7ef2 100644
--- a/src/test/ui/generic-associated-types/projection-bound-cycle.rs
+++ b/tests/ui/generic-associated-types/projection-bound-cycle.rs
diff --git a/src/test/ui/generic-associated-types/projection-bound-cycle.stderr b/tests/ui/generic-associated-types/projection-bound-cycle.stderr
index b1b8afeec..b1b8afeec 100644
--- a/src/test/ui/generic-associated-types/projection-bound-cycle.stderr
+++ b/tests/ui/generic-associated-types/projection-bound-cycle.stderr
diff --git a/src/test/ui/generic-associated-types/projection-type-lifetime-mismatch.rs b/tests/ui/generic-associated-types/projection-type-lifetime-mismatch.rs
index 8e4d5ca5e..8e4d5ca5e 100644
--- a/src/test/ui/generic-associated-types/projection-type-lifetime-mismatch.rs
+++ b/tests/ui/generic-associated-types/projection-type-lifetime-mismatch.rs
diff --git a/src/test/ui/generic-associated-types/projection-type-lifetime-mismatch.stderr b/tests/ui/generic-associated-types/projection-type-lifetime-mismatch.stderr
index 753ead48b..753ead48b 100644
--- a/src/test/ui/generic-associated-types/projection-type-lifetime-mismatch.stderr
+++ b/tests/ui/generic-associated-types/projection-type-lifetime-mismatch.stderr
diff --git a/src/test/ui/generic-associated-types/self-outlives-lint.rs b/tests/ui/generic-associated-types/self-outlives-lint.rs
index 673891fc3..673891fc3 100644
--- a/src/test/ui/generic-associated-types/self-outlives-lint.rs
+++ b/tests/ui/generic-associated-types/self-outlives-lint.rs
diff --git a/src/test/ui/generic-associated-types/self-outlives-lint.stderr b/tests/ui/generic-associated-types/self-outlives-lint.stderr
index 9e9b2e18a..9e9b2e18a 100644
--- a/src/test/ui/generic-associated-types/self-outlives-lint.stderr
+++ b/tests/ui/generic-associated-types/self-outlives-lint.stderr
diff --git a/src/test/ui/generic-associated-types/shadowing.rs b/tests/ui/generic-associated-types/shadowing.rs
index a05d6e143..a05d6e143 100644
--- a/src/test/ui/generic-associated-types/shadowing.rs
+++ b/tests/ui/generic-associated-types/shadowing.rs
diff --git a/src/test/ui/generic-associated-types/shadowing.stderr b/tests/ui/generic-associated-types/shadowing.stderr
index bb32684bc..bb32684bc 100644
--- a/src/test/ui/generic-associated-types/shadowing.stderr
+++ b/tests/ui/generic-associated-types/shadowing.stderr
diff --git a/src/test/ui/generic-associated-types/streaming_iterator.rs b/tests/ui/generic-associated-types/streaming_iterator.rs
index 408b8dc99..408b8dc99 100644
--- a/src/test/ui/generic-associated-types/streaming_iterator.rs
+++ b/tests/ui/generic-associated-types/streaming_iterator.rs
diff --git a/src/test/ui/generic-associated-types/trait-objects.base.stderr b/tests/ui/generic-associated-types/trait-objects.base.stderr
index 556422c27..556422c27 100644
--- a/src/test/ui/generic-associated-types/trait-objects.base.stderr
+++ b/tests/ui/generic-associated-types/trait-objects.base.stderr
diff --git a/src/test/ui/generic-associated-types/trait-objects.extended.stderr b/tests/ui/generic-associated-types/trait-objects.extended.stderr
index 45b64d2b0..45b64d2b0 100644
--- a/src/test/ui/generic-associated-types/trait-objects.extended.stderr
+++ b/tests/ui/generic-associated-types/trait-objects.extended.stderr
diff --git a/src/test/ui/generic-associated-types/trait-objects.rs b/tests/ui/generic-associated-types/trait-objects.rs
index 17fed11ba..17fed11ba 100644
--- a/src/test/ui/generic-associated-types/trait-objects.rs
+++ b/tests/ui/generic-associated-types/trait-objects.rs
diff --git a/src/test/ui/generic-associated-types/type-param-defaults.rs b/tests/ui/generic-associated-types/type-param-defaults.rs
index f034076b0..f034076b0 100644
--- a/src/test/ui/generic-associated-types/type-param-defaults.rs
+++ b/tests/ui/generic-associated-types/type-param-defaults.rs
diff --git a/src/test/ui/generic-associated-types/type-param-defaults.stderr b/tests/ui/generic-associated-types/type-param-defaults.stderr
index 85ccaba0e..85ccaba0e 100644
--- a/src/test/ui/generic-associated-types/type-param-defaults.stderr
+++ b/tests/ui/generic-associated-types/type-param-defaults.stderr
diff --git a/src/test/ui/generic-associated-types/unsatified-item-lifetime-bound.rs b/tests/ui/generic-associated-types/unsatified-item-lifetime-bound.rs
index 1cc09aa6d..1cc09aa6d 100644
--- a/src/test/ui/generic-associated-types/unsatified-item-lifetime-bound.rs
+++ b/tests/ui/generic-associated-types/unsatified-item-lifetime-bound.rs
diff --git a/src/test/ui/generic-associated-types/unsatified-item-lifetime-bound.stderr b/tests/ui/generic-associated-types/unsatified-item-lifetime-bound.stderr
index fbd79879d..fbd79879d 100644
--- a/src/test/ui/generic-associated-types/unsatified-item-lifetime-bound.stderr
+++ b/tests/ui/generic-associated-types/unsatified-item-lifetime-bound.stderr
diff --git a/src/test/ui/generic-associated-types/unsatisfied-outlives-bound.rs b/tests/ui/generic-associated-types/unsatisfied-outlives-bound.rs
index 7137d9237..7137d9237 100644
--- a/src/test/ui/generic-associated-types/unsatisfied-outlives-bound.rs
+++ b/tests/ui/generic-associated-types/unsatisfied-outlives-bound.rs
diff --git a/src/test/ui/generic-associated-types/unsatisfied-outlives-bound.stderr b/tests/ui/generic-associated-types/unsatisfied-outlives-bound.stderr
index 1c9ac01ec..1c9ac01ec 100644
--- a/src/test/ui/generic-associated-types/unsatisfied-outlives-bound.stderr
+++ b/tests/ui/generic-associated-types/unsatisfied-outlives-bound.stderr
diff --git a/src/test/ui/generic-associated-types/variance_constraints.rs b/tests/ui/generic-associated-types/variance_constraints.rs
index 0e9dbb8b1..0e9dbb8b1 100644
--- a/src/test/ui/generic-associated-types/variance_constraints.rs
+++ b/tests/ui/generic-associated-types/variance_constraints.rs
diff --git a/src/test/ui/generics/autobind.rs b/tests/ui/generics/autobind.rs
index 70606a2a2..70606a2a2 100644
--- a/src/test/ui/generics/autobind.rs
+++ b/tests/ui/generics/autobind.rs
diff --git a/src/test/ui/generics/auxiliary/default_type_params_xc.rs b/tests/ui/generics/auxiliary/default_type_params_xc.rs
index aacbd672a..aacbd672a 100644
--- a/src/test/ui/generics/auxiliary/default_type_params_xc.rs
+++ b/tests/ui/generics/auxiliary/default_type_params_xc.rs
diff --git a/src/test/ui/generics/bad-mid-path-type-params.rs b/tests/ui/generics/bad-mid-path-type-params.rs
index 23a5d1525..23a5d1525 100644
--- a/src/test/ui/generics/bad-mid-path-type-params.rs
+++ b/tests/ui/generics/bad-mid-path-type-params.rs
diff --git a/src/test/ui/generics/bad-mid-path-type-params.stderr b/tests/ui/generics/bad-mid-path-type-params.stderr
index aee2b6015..aee2b6015 100644
--- a/src/test/ui/generics/bad-mid-path-type-params.stderr
+++ b/tests/ui/generics/bad-mid-path-type-params.stderr
diff --git a/src/test/ui/generics/generic-alias-unique.rs b/tests/ui/generics/generic-alias-unique.rs
index fc1383986..fc1383986 100644
--- a/src/test/ui/generics/generic-alias-unique.rs
+++ b/tests/ui/generics/generic-alias-unique.rs
diff --git a/src/test/ui/generics/generic-arg-mismatch-recover.rs b/tests/ui/generics/generic-arg-mismatch-recover.rs
index 2cf7f1d65..2cf7f1d65 100644
--- a/src/test/ui/generics/generic-arg-mismatch-recover.rs
+++ b/tests/ui/generics/generic-arg-mismatch-recover.rs
diff --git a/src/test/ui/generics/generic-arg-mismatch-recover.stderr b/tests/ui/generics/generic-arg-mismatch-recover.stderr
index 45fea925f..45fea925f 100644
--- a/src/test/ui/generics/generic-arg-mismatch-recover.stderr
+++ b/tests/ui/generics/generic-arg-mismatch-recover.stderr
diff --git a/src/test/ui/generics/generic-default-type-params-cross-crate.rs b/tests/ui/generics/generic-default-type-params-cross-crate.rs
index 834b15be1..834b15be1 100644
--- a/src/test/ui/generics/generic-default-type-params-cross-crate.rs
+++ b/tests/ui/generics/generic-default-type-params-cross-crate.rs
diff --git a/src/test/ui/generics/generic-default-type-params.rs b/tests/ui/generics/generic-default-type-params.rs
index afdd301fd..afdd301fd 100644
--- a/src/test/ui/generics/generic-default-type-params.rs
+++ b/tests/ui/generics/generic-default-type-params.rs
diff --git a/src/test/ui/generics/generic-derived-type.rs b/tests/ui/generics/generic-derived-type.rs
index c643496fa..c643496fa 100644
--- a/src/test/ui/generics/generic-derived-type.rs
+++ b/tests/ui/generics/generic-derived-type.rs
diff --git a/src/test/ui/generics/generic-exterior-unique.rs b/tests/ui/generics/generic-exterior-unique.rs
index 10d87f9f4..10d87f9f4 100644
--- a/src/test/ui/generics/generic-exterior-unique.rs
+++ b/tests/ui/generics/generic-exterior-unique.rs
diff --git a/src/test/ui/generics/generic-extern-lifetime.rs b/tests/ui/generics/generic-extern-lifetime.rs
index c42744808..c42744808 100644
--- a/src/test/ui/generics/generic-extern-lifetime.rs
+++ b/tests/ui/generics/generic-extern-lifetime.rs
diff --git a/src/test/ui/generics/generic-extern-lifetime.stderr b/tests/ui/generics/generic-extern-lifetime.stderr
index 33332e760..33332e760 100644
--- a/src/test/ui/generics/generic-extern-lifetime.stderr
+++ b/tests/ui/generics/generic-extern-lifetime.stderr
diff --git a/src/test/ui/generics/generic-extern-mangle.rs b/tests/ui/generics/generic-extern-mangle.rs
index 985a6f39c..985a6f39c 100644
--- a/src/test/ui/generics/generic-extern-mangle.rs
+++ b/tests/ui/generics/generic-extern-mangle.rs
diff --git a/src/test/ui/generics/generic-extern.rs b/tests/ui/generics/generic-extern.rs
index 3690d6fd0..3690d6fd0 100644
--- a/src/test/ui/generics/generic-extern.rs
+++ b/tests/ui/generics/generic-extern.rs
diff --git a/src/test/ui/generics/generic-extern.stderr b/tests/ui/generics/generic-extern.stderr
index c90215b61..c90215b61 100644
--- a/src/test/ui/generics/generic-extern.stderr
+++ b/tests/ui/generics/generic-extern.stderr
diff --git a/src/test/ui/generics/generic-fn-infer.rs b/tests/ui/generics/generic-fn-infer.rs
index 9ba422473..9ba422473 100644
--- a/src/test/ui/generics/generic-fn-infer.rs
+++ b/tests/ui/generics/generic-fn-infer.rs
diff --git a/src/test/ui/generics/generic-fn-twice.rs b/tests/ui/generics/generic-fn-twice.rs
index 2f25fc24c..2f25fc24c 100644
--- a/src/test/ui/generics/generic-fn-twice.rs
+++ b/tests/ui/generics/generic-fn-twice.rs
diff --git a/src/test/ui/generics/generic-fn-unique.rs b/tests/ui/generics/generic-fn-unique.rs
index 7e246bce9..7e246bce9 100644
--- a/src/test/ui/generics/generic-fn-unique.rs
+++ b/tests/ui/generics/generic-fn-unique.rs
diff --git a/src/test/ui/generics/generic-fn.rs b/tests/ui/generics/generic-fn.rs
index 8038fabc1..8038fabc1 100644
--- a/src/test/ui/generics/generic-fn.rs
+++ b/tests/ui/generics/generic-fn.rs
diff --git a/src/test/ui/generics/generic-function-item-where-type.rs b/tests/ui/generics/generic-function-item-where-type.rs
index e1b0578ca..e1b0578ca 100644
--- a/src/test/ui/generics/generic-function-item-where-type.rs
+++ b/tests/ui/generics/generic-function-item-where-type.rs
diff --git a/src/test/ui/generics/generic-function-item-where-type.stderr b/tests/ui/generics/generic-function-item-where-type.stderr
index 88594129c..88594129c 100644
--- a/src/test/ui/generics/generic-function-item-where-type.stderr
+++ b/tests/ui/generics/generic-function-item-where-type.stderr
diff --git a/src/test/ui/generics/generic-impl-less-params-with-defaults.rs b/tests/ui/generics/generic-impl-less-params-with-defaults.rs
index 66afbb58a..66afbb58a 100644
--- a/src/test/ui/generics/generic-impl-less-params-with-defaults.rs
+++ b/tests/ui/generics/generic-impl-less-params-with-defaults.rs
diff --git a/src/test/ui/generics/generic-impl-less-params-with-defaults.stderr b/tests/ui/generics/generic-impl-less-params-with-defaults.stderr
index cdbb57902..cdbb57902 100644
--- a/src/test/ui/generics/generic-impl-less-params-with-defaults.stderr
+++ b/tests/ui/generics/generic-impl-less-params-with-defaults.stderr
diff --git a/src/test/ui/generics/generic-impl-more-params-with-defaults.rs b/tests/ui/generics/generic-impl-more-params-with-defaults.rs
index a28332374..a28332374 100644
--- a/src/test/ui/generics/generic-impl-more-params-with-defaults.rs
+++ b/tests/ui/generics/generic-impl-more-params-with-defaults.rs
diff --git a/src/test/ui/generics/generic-impl-more-params-with-defaults.stderr b/tests/ui/generics/generic-impl-more-params-with-defaults.stderr
index fe9b670da..fe9b670da 100644
--- a/src/test/ui/generics/generic-impl-more-params-with-defaults.stderr
+++ b/tests/ui/generics/generic-impl-more-params-with-defaults.stderr
diff --git a/src/test/ui/generics/generic-ivec-leak.rs b/tests/ui/generics/generic-ivec-leak.rs
index 9610bdcb3..9610bdcb3 100644
--- a/src/test/ui/generics/generic-ivec-leak.rs
+++ b/tests/ui/generics/generic-ivec-leak.rs
diff --git a/src/test/ui/generics/generic-lifetime-trait-impl.rs b/tests/ui/generics/generic-lifetime-trait-impl.rs
index 6ffaba19d..6ffaba19d 100644
--- a/src/test/ui/generics/generic-lifetime-trait-impl.rs
+++ b/tests/ui/generics/generic-lifetime-trait-impl.rs
diff --git a/src/test/ui/generics/generic-lifetime-trait-impl.stderr b/tests/ui/generics/generic-lifetime-trait-impl.stderr
index 4ae5098a1..4ae5098a1 100644
--- a/src/test/ui/generics/generic-lifetime-trait-impl.stderr
+++ b/tests/ui/generics/generic-lifetime-trait-impl.stderr
diff --git a/src/test/ui/generics/generic-newtype-struct.rs b/tests/ui/generics/generic-newtype-struct.rs
index aa879f01a..aa879f01a 100644
--- a/src/test/ui/generics/generic-newtype-struct.rs
+++ b/tests/ui/generics/generic-newtype-struct.rs
diff --git a/src/test/ui/generics/generic-no-mangle.fixed b/tests/ui/generics/generic-no-mangle.fixed
index 501acb6e1..501acb6e1 100644
--- a/src/test/ui/generics/generic-no-mangle.fixed
+++ b/tests/ui/generics/generic-no-mangle.fixed
diff --git a/src/test/ui/generics/generic-no-mangle.rs b/tests/ui/generics/generic-no-mangle.rs
index 74e407078..74e407078 100644
--- a/src/test/ui/generics/generic-no-mangle.rs
+++ b/tests/ui/generics/generic-no-mangle.rs
diff --git a/src/test/ui/generics/generic-no-mangle.stderr b/tests/ui/generics/generic-no-mangle.stderr
index adfddbe9c..adfddbe9c 100644
--- a/src/test/ui/generics/generic-no-mangle.stderr
+++ b/tests/ui/generics/generic-no-mangle.stderr
diff --git a/src/test/ui/generics/generic-non-trailing-defaults.rs b/tests/ui/generics/generic-non-trailing-defaults.rs
index 16ea71d48..16ea71d48 100644
--- a/src/test/ui/generics/generic-non-trailing-defaults.rs
+++ b/tests/ui/generics/generic-non-trailing-defaults.rs
diff --git a/src/test/ui/generics/generic-non-trailing-defaults.stderr b/tests/ui/generics/generic-non-trailing-defaults.stderr
index 713ba091b..713ba091b 100644
--- a/src/test/ui/generics/generic-non-trailing-defaults.stderr
+++ b/tests/ui/generics/generic-non-trailing-defaults.stderr
diff --git a/src/test/ui/generics/generic-object.rs b/tests/ui/generics/generic-object.rs
index 851424a11..851424a11 100644
--- a/src/test/ui/generics/generic-object.rs
+++ b/tests/ui/generics/generic-object.rs
diff --git a/src/test/ui/generics/generic-param-attrs.rs b/tests/ui/generics/generic-param-attrs.rs
index 3c5cc84c6..3c5cc84c6 100644
--- a/src/test/ui/generics/generic-param-attrs.rs
+++ b/tests/ui/generics/generic-param-attrs.rs
diff --git a/src/test/ui/generics/generic-recursive-tag.rs b/tests/ui/generics/generic-recursive-tag.rs
index b344da1c7..b344da1c7 100644
--- a/src/test/ui/generics/generic-recursive-tag.rs
+++ b/tests/ui/generics/generic-recursive-tag.rs
diff --git a/src/test/ui/generics/generic-static-methods.rs b/tests/ui/generics/generic-static-methods.rs
index b39fa081a..b39fa081a 100644
--- a/src/test/ui/generics/generic-static-methods.rs
+++ b/tests/ui/generics/generic-static-methods.rs
diff --git a/src/test/ui/generics/generic-tag-corruption.rs b/tests/ui/generics/generic-tag-corruption.rs
index 35de3c1f7..35de3c1f7 100644
--- a/src/test/ui/generics/generic-tag-corruption.rs
+++ b/tests/ui/generics/generic-tag-corruption.rs
diff --git a/src/test/ui/generics/generic-tag-local.rs b/tests/ui/generics/generic-tag-local.rs
index c5772e841..c5772e841 100644
--- a/src/test/ui/generics/generic-tag-local.rs
+++ b/tests/ui/generics/generic-tag-local.rs
diff --git a/src/test/ui/generics/generic-tag-match.rs b/tests/ui/generics/generic-tag-match.rs
index 09ed6a808..09ed6a808 100644
--- a/src/test/ui/generics/generic-tag-match.rs
+++ b/tests/ui/generics/generic-tag-match.rs
diff --git a/src/test/ui/generics/generic-tag-values.rs b/tests/ui/generics/generic-tag-values.rs
index 230f477b6..230f477b6 100644
--- a/src/test/ui/generics/generic-tag-values.rs
+++ b/tests/ui/generics/generic-tag-values.rs
diff --git a/src/test/ui/generics/generic-tag.rs b/tests/ui/generics/generic-tag.rs
index 31fc2178d..31fc2178d 100644
--- a/src/test/ui/generics/generic-tag.rs
+++ b/tests/ui/generics/generic-tag.rs
diff --git a/src/test/ui/generics/generic-temporary.rs b/tests/ui/generics/generic-temporary.rs
index b63b534d0..b63b534d0 100644
--- a/src/test/ui/generics/generic-temporary.rs
+++ b/tests/ui/generics/generic-temporary.rs
diff --git a/src/test/ui/generics/generic-tup.rs b/tests/ui/generics/generic-tup.rs
index 79ebd648c..79ebd648c 100644
--- a/src/test/ui/generics/generic-tup.rs
+++ b/tests/ui/generics/generic-tup.rs
diff --git a/src/test/ui/generics/generic-type-less-params-with-defaults.rs b/tests/ui/generics/generic-type-less-params-with-defaults.rs
index 6b877ab8a..6b877ab8a 100644
--- a/src/test/ui/generics/generic-type-less-params-with-defaults.rs
+++ b/tests/ui/generics/generic-type-less-params-with-defaults.rs
diff --git a/src/test/ui/generics/generic-type-less-params-with-defaults.stderr b/tests/ui/generics/generic-type-less-params-with-defaults.stderr
index e45a0d9ca..6450bbd8b 100644
--- a/src/test/ui/generics/generic-type-less-params-with-defaults.stderr
+++ b/tests/ui/generics/generic-type-less-params-with-defaults.stderr
@@ -12,7 +12,7 @@ LL | struct Vec<T, A = Heap>(
 help: add missing generic argument
    |
 LL |     let _: Vec<T>;
-   |            ~~~~~~
+   |               +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generics/generic-type-more-params-with-defaults.rs b/tests/ui/generics/generic-type-more-params-with-defaults.rs
index 3dab03297..3dab03297 100644
--- a/src/test/ui/generics/generic-type-more-params-with-defaults.rs
+++ b/tests/ui/generics/generic-type-more-params-with-defaults.rs
diff --git a/src/test/ui/generics/generic-type-more-params-with-defaults.stderr b/tests/ui/generics/generic-type-more-params-with-defaults.stderr
index 7f0198f0e..7f0198f0e 100644
--- a/src/test/ui/generics/generic-type-more-params-with-defaults.stderr
+++ b/tests/ui/generics/generic-type-more-params-with-defaults.stderr
diff --git a/src/test/ui/generics/generic-type-params-forward-mention.rs b/tests/ui/generics/generic-type-params-forward-mention.rs
index 000c47095..000c47095 100644
--- a/src/test/ui/generics/generic-type-params-forward-mention.rs
+++ b/tests/ui/generics/generic-type-params-forward-mention.rs
diff --git a/src/test/ui/generics/generic-type-params-forward-mention.stderr b/tests/ui/generics/generic-type-params-forward-mention.stderr
index fa661c274..fa661c274 100644
--- a/src/test/ui/generics/generic-type-params-forward-mention.stderr
+++ b/tests/ui/generics/generic-type-params-forward-mention.stderr
diff --git a/src/test/ui/generics/generic-type-params-name-repr.rs b/tests/ui/generics/generic-type-params-name-repr.rs
index 6e0beec66..6e0beec66 100644
--- a/src/test/ui/generics/generic-type-params-name-repr.rs
+++ b/tests/ui/generics/generic-type-params-name-repr.rs
diff --git a/src/test/ui/generics/generic-type-params-name-repr.stderr b/tests/ui/generics/generic-type-params-name-repr.stderr
index 4c3c00396..4c3c00396 100644
--- a/src/test/ui/generics/generic-type-params-name-repr.stderr
+++ b/tests/ui/generics/generic-type-params-name-repr.stderr
diff --git a/src/test/ui/generics/generic-type-synonym.rs b/tests/ui/generics/generic-type-synonym.rs
index 4f181fbcc..4f181fbcc 100644
--- a/src/test/ui/generics/generic-type-synonym.rs
+++ b/tests/ui/generics/generic-type-synonym.rs
diff --git a/src/test/ui/generics/generic-type.rs b/tests/ui/generics/generic-type.rs
index aa46db07e..aa46db07e 100644
--- a/src/test/ui/generics/generic-type.rs
+++ b/tests/ui/generics/generic-type.rs
diff --git a/src/test/ui/generics/generic-unique.rs b/tests/ui/generics/generic-unique.rs
index 2f34712ec..2f34712ec 100644
--- a/src/test/ui/generics/generic-unique.rs
+++ b/tests/ui/generics/generic-unique.rs
diff --git a/tests/ui/generics/issue-106694.rs b/tests/ui/generics/issue-106694.rs
new file mode 100644
index 000000000..c4b02ee81
--- /dev/null
+++ b/tests/ui/generics/issue-106694.rs
@@ -0,0 +1,24 @@
+trait Trait {}
+
+fn foo(_: impl &Trait) {}
+//~^ ERROR expected a trait, found type
+
+fn bar<T: &Trait>(_: T) {}
+//~^ ERROR expected a trait, found type
+
+fn partially_correct_impl(_: impl &*const &Trait + Copy) {}
+//~^ ERROR expected a trait, found type
+
+fn foo_bad(_: impl &BadTrait) {}
+//~^ ERROR expected a trait, found type
+//~^^ ERROR cannot find trait `BadTrait` in this scope
+
+fn bar_bad<T: &BadTrait>(_: T) {}
+//~^ ERROR expected a trait, found type
+//~^^ ERROR cannot find trait `BadTrait` in this scope
+
+fn partially_correct_impl_bad(_: impl &*const &BadTrait + Copy) {}
+//~^ ERROR expected a trait, found type
+//~^^ ERROR cannot find trait `BadTrait` in this scope
+
+fn main() {}
diff --git a/tests/ui/generics/issue-106694.stderr b/tests/ui/generics/issue-106694.stderr
new file mode 100644
index 000000000..235b8982a
--- /dev/null
+++ b/tests/ui/generics/issue-106694.stderr
@@ -0,0 +1,93 @@
+error: expected a trait, found type
+  --> $DIR/issue-106694.rs:3:16
+   |
+LL | fn foo(_: impl &Trait) {}
+   |                ^^^^^^
+   |
+help: consider removing the indirection
+   |
+LL - fn foo(_: impl &Trait) {}
+LL + fn foo(_: impl Trait) {}
+   |
+
+error: expected a trait, found type
+  --> $DIR/issue-106694.rs:6:11
+   |
+LL | fn bar<T: &Trait>(_: T) {}
+   |           ^^^^^^
+   |
+help: consider removing the indirection
+   |
+LL - fn bar<T: &Trait>(_: T) {}
+LL + fn bar<T: Trait>(_: T) {}
+   |
+
+error: expected a trait, found type
+  --> $DIR/issue-106694.rs:9:35
+   |
+LL | fn partially_correct_impl(_: impl &*const &Trait + Copy) {}
+   |                                   ^^^^^^^^^^^^^^
+   |
+help: consider removing the indirection
+   |
+LL - fn partially_correct_impl(_: impl &*const &Trait + Copy) {}
+LL + fn partially_correct_impl(_: impl Trait + Copy) {}
+   |
+
+error: expected a trait, found type
+  --> $DIR/issue-106694.rs:12:20
+   |
+LL | fn foo_bad(_: impl &BadTrait) {}
+   |                    ^^^^^^^^^
+   |
+help: consider removing the indirection
+   |
+LL - fn foo_bad(_: impl &BadTrait) {}
+LL + fn foo_bad(_: impl BadTrait) {}
+   |
+
+error: expected a trait, found type
+  --> $DIR/issue-106694.rs:16:15
+   |
+LL | fn bar_bad<T: &BadTrait>(_: T) {}
+   |               ^^^^^^^^^
+   |
+help: consider removing the indirection
+   |
+LL - fn bar_bad<T: &BadTrait>(_: T) {}
+LL + fn bar_bad<T: BadTrait>(_: T) {}
+   |
+
+error: expected a trait, found type
+  --> $DIR/issue-106694.rs:20:39
+   |
+LL | fn partially_correct_impl_bad(_: impl &*const &BadTrait + Copy) {}
+   |                                       ^^^^^^^^^^^^^^^^^
+   |
+help: consider removing the indirection
+   |
+LL - fn partially_correct_impl_bad(_: impl &*const &BadTrait + Copy) {}
+LL + fn partially_correct_impl_bad(_: impl BadTrait + Copy) {}
+   |
+
+error[E0405]: cannot find trait `BadTrait` in this scope
+  --> $DIR/issue-106694.rs:12:21
+   |
+LL | fn foo_bad(_: impl &BadTrait) {}
+   |                     ^^^^^^^^ not found in this scope
+
+error[E0405]: cannot find trait `BadTrait` in this scope
+  --> $DIR/issue-106694.rs:16:16
+   |
+LL | fn bar_bad<T: &BadTrait>(_: T) {}
+   |                ^^^^^^^^ not found in this scope
+
+error[E0405]: cannot find trait `BadTrait` in this scope
+  --> $DIR/issue-106694.rs:20:48
+   |
+LL | fn partially_correct_impl_bad(_: impl &*const &BadTrait + Copy) {}
+   |                                                ^^^^^^^^ not found in this scope
+
+error: aborting due to 9 previous errors
+
+For more information about this error, try `rustc --explain E0405`.
diff --git a/src/test/ui/generics/issue-1112.rs b/tests/ui/generics/issue-1112.rs
index 3ba7bb217..3ba7bb217 100644
--- a/src/test/ui/generics/issue-1112.rs
+++ b/tests/ui/generics/issue-1112.rs
diff --git a/src/test/ui/generics/issue-2936.rs b/tests/ui/generics/issue-2936.rs
index 6b932d01d..6b932d01d 100644
--- a/src/test/ui/generics/issue-2936.rs
+++ b/tests/ui/generics/issue-2936.rs
diff --git a/src/test/ui/generics/issue-32498.rs b/tests/ui/generics/issue-32498.rs
index 1b5440109..1b5440109 100644
--- a/src/test/ui/generics/issue-32498.rs
+++ b/tests/ui/generics/issue-32498.rs
diff --git a/src/test/ui/generics/issue-333.rs b/tests/ui/generics/issue-333.rs
index 0753aaa07..0753aaa07 100644
--- a/src/test/ui/generics/issue-333.rs
+++ b/tests/ui/generics/issue-333.rs
diff --git a/src/test/ui/generics/issue-59508-1.rs b/tests/ui/generics/issue-59508-1.rs
index 8e27749e8..8e27749e8 100644
--- a/src/test/ui/generics/issue-59508-1.rs
+++ b/tests/ui/generics/issue-59508-1.rs
diff --git a/src/test/ui/generics/issue-59508-1.stderr b/tests/ui/generics/issue-59508-1.stderr
index 1c510044f..1c510044f 100644
--- a/src/test/ui/generics/issue-59508-1.stderr
+++ b/tests/ui/generics/issue-59508-1.stderr
diff --git a/src/test/ui/generics/issue-59508.fixed b/tests/ui/generics/issue-59508.fixed
index de8f47d4c..de8f47d4c 100644
--- a/src/test/ui/generics/issue-59508.fixed
+++ b/tests/ui/generics/issue-59508.fixed
diff --git a/src/test/ui/generics/issue-59508.rs b/tests/ui/generics/issue-59508.rs
index a4c7d4ff2..a4c7d4ff2 100644
--- a/src/test/ui/generics/issue-59508.rs
+++ b/tests/ui/generics/issue-59508.rs
diff --git a/src/test/ui/generics/issue-59508.stderr b/tests/ui/generics/issue-59508.stderr
index fd23b6276..fd23b6276 100644
--- a/src/test/ui/generics/issue-59508.stderr
+++ b/tests/ui/generics/issue-59508.stderr
diff --git a/src/test/ui/generics/issue-61631-default-type-param-can-reference-self-in-trait.rs b/tests/ui/generics/issue-61631-default-type-param-can-reference-self-in-trait.rs
index cc93794e8..cc93794e8 100644
--- a/src/test/ui/generics/issue-61631-default-type-param-can-reference-self-in-trait.rs
+++ b/tests/ui/generics/issue-61631-default-type-param-can-reference-self-in-trait.rs
diff --git a/src/test/ui/generics/issue-61631-default-type-param-can-reference-self-in-trait.stderr b/tests/ui/generics/issue-61631-default-type-param-can-reference-self-in-trait.stderr
index 679118223..679118223 100644
--- a/src/test/ui/generics/issue-61631-default-type-param-can-reference-self-in-trait.stderr
+++ b/tests/ui/generics/issue-61631-default-type-param-can-reference-self-in-trait.stderr
diff --git a/src/test/ui/generics/issue-61631-default-type-param-cannot-reference-self.rs b/tests/ui/generics/issue-61631-default-type-param-cannot-reference-self.rs
index 12db143e4..12db143e4 100644
--- a/src/test/ui/generics/issue-61631-default-type-param-cannot-reference-self.rs
+++ b/tests/ui/generics/issue-61631-default-type-param-cannot-reference-self.rs
diff --git a/src/test/ui/generics/issue-61631-default-type-param-cannot-reference-self.stderr b/tests/ui/generics/issue-61631-default-type-param-cannot-reference-self.stderr
index f3a550801..f3a550801 100644
--- a/src/test/ui/generics/issue-61631-default-type-param-cannot-reference-self.stderr
+++ b/tests/ui/generics/issue-61631-default-type-param-cannot-reference-self.stderr
diff --git a/src/test/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.rs b/tests/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.rs
index 9ea9fc71b..9ea9fc71b 100644
--- a/src/test/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.rs
+++ b/tests/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.rs
diff --git a/src/test/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.stderr b/tests/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.stderr
index e45387aca..9d859fddf 100644
--- a/src/test/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.stderr
+++ b/tests/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.stderr
@@ -3,6 +3,12 @@ error[E0637]: `&` without an explicit lifetime name cannot be used here
    |
 LL | fn should_error<T>() where T : Into<&u32> {}
    |                                     ^ explicit lifetime name needed here
+   |
+help: consider introducing a higher-ranked lifetime here with `for<'a>`
+  --> $DIR/issue-65285-incorrect-explicit-lifetime-name-needed.rs:5:32
+   |
+LL | fn should_error<T>() where T : Into<&u32> {}
+   |                                ^
 
 error[E0106]: missing lifetime specifier
   --> $DIR/issue-65285-incorrect-explicit-lifetime-name-needed.rs:9:20
diff --git a/src/test/ui/generics/issue-80512-param-reordering-with-defaults.rs b/tests/ui/generics/issue-80512-param-reordering-with-defaults.rs
index 0e208818e..0e208818e 100644
--- a/src/test/ui/generics/issue-80512-param-reordering-with-defaults.rs
+++ b/tests/ui/generics/issue-80512-param-reordering-with-defaults.rs
diff --git a/src/test/ui/generics/issue-80512-param-reordering-with-defaults.stderr b/tests/ui/generics/issue-80512-param-reordering-with-defaults.stderr
index 70793a9c9..70793a9c9 100644
--- a/src/test/ui/generics/issue-80512-param-reordering-with-defaults.stderr
+++ b/tests/ui/generics/issue-80512-param-reordering-with-defaults.stderr
diff --git a/src/test/ui/generics/issue-94432-garbage-ice.rs b/tests/ui/generics/issue-94432-garbage-ice.rs
index d0709e2d2..d0709e2d2 100644
--- a/src/test/ui/generics/issue-94432-garbage-ice.rs
+++ b/tests/ui/generics/issue-94432-garbage-ice.rs
diff --git a/src/test/ui/generics/issue-94923.rs b/tests/ui/generics/issue-94923.rs
index d337a5dff..d337a5dff 100644
--- a/src/test/ui/generics/issue-94923.rs
+++ b/tests/ui/generics/issue-94923.rs
diff --git a/src/test/ui/generics/issue-95208-ignore-qself.fixed b/tests/ui/generics/issue-95208-ignore-qself.fixed
index 608b4a20f..608b4a20f 100644
--- a/src/test/ui/generics/issue-95208-ignore-qself.fixed
+++ b/tests/ui/generics/issue-95208-ignore-qself.fixed
diff --git a/src/test/ui/generics/issue-95208-ignore-qself.rs b/tests/ui/generics/issue-95208-ignore-qself.rs
index da7efd576..da7efd576 100644
--- a/src/test/ui/generics/issue-95208-ignore-qself.rs
+++ b/tests/ui/generics/issue-95208-ignore-qself.rs
diff --git a/src/test/ui/generics/issue-95208-ignore-qself.stderr b/tests/ui/generics/issue-95208-ignore-qself.stderr
index acbc1300d..acbc1300d 100644
--- a/src/test/ui/generics/issue-95208-ignore-qself.stderr
+++ b/tests/ui/generics/issue-95208-ignore-qself.stderr
diff --git a/src/test/ui/generics/issue-95208.fixed b/tests/ui/generics/issue-95208.fixed
index a0b1e886c..a0b1e886c 100644
--- a/src/test/ui/generics/issue-95208.fixed
+++ b/tests/ui/generics/issue-95208.fixed
diff --git a/src/test/ui/generics/issue-95208.rs b/tests/ui/generics/issue-95208.rs
index 0e3083484..0e3083484 100644
--- a/src/test/ui/generics/issue-95208.rs
+++ b/tests/ui/generics/issue-95208.rs
diff --git a/src/test/ui/generics/issue-95208.stderr b/tests/ui/generics/issue-95208.stderr
index 559527663..559527663 100644
--- a/src/test/ui/generics/issue-95208.stderr
+++ b/tests/ui/generics/issue-95208.stderr
diff --git a/src/test/ui/generics/issue-98432.rs b/tests/ui/generics/issue-98432.rs
index 780c50d6f..780c50d6f 100644
--- a/src/test/ui/generics/issue-98432.rs
+++ b/tests/ui/generics/issue-98432.rs
diff --git a/src/test/ui/generics/issue-98432.stderr b/tests/ui/generics/issue-98432.stderr
index c7b5c3361..c7b5c3361 100644
--- a/src/test/ui/generics/issue-98432.stderr
+++ b/tests/ui/generics/issue-98432.stderr
diff --git a/src/test/ui/generics/lifetime-before-type-params.rs b/tests/ui/generics/lifetime-before-type-params.rs
index d64b1b0b4..d64b1b0b4 100644
--- a/src/test/ui/generics/lifetime-before-type-params.rs
+++ b/tests/ui/generics/lifetime-before-type-params.rs
diff --git a/src/test/ui/generics/lifetime-before-type-params.stderr b/tests/ui/generics/lifetime-before-type-params.stderr
index 84825eb4c..84825eb4c 100644
--- a/src/test/ui/generics/lifetime-before-type-params.stderr
+++ b/tests/ui/generics/lifetime-before-type-params.stderr
diff --git a/src/test/ui/generics/mid-path-type-params.rs b/tests/ui/generics/mid-path-type-params.rs
index a8128207c..a8128207c 100644
--- a/src/test/ui/generics/mid-path-type-params.rs
+++ b/tests/ui/generics/mid-path-type-params.rs
diff --git a/src/test/ui/generics/param-in-ct-in-ty-param-default.rs b/tests/ui/generics/param-in-ct-in-ty-param-default.rs
index 3c62e4738..3c62e4738 100644
--- a/src/test/ui/generics/param-in-ct-in-ty-param-default.rs
+++ b/tests/ui/generics/param-in-ct-in-ty-param-default.rs
diff --git a/src/test/ui/generics/param-in-ct-in-ty-param-default.stderr b/tests/ui/generics/param-in-ct-in-ty-param-default.stderr
index ab09ebcae..ab09ebcae 100644
--- a/src/test/ui/generics/param-in-ct-in-ty-param-default.stderr
+++ b/tests/ui/generics/param-in-ct-in-ty-param-default.stderr
diff --git a/src/test/ui/generics/post_monomorphization_error_backtrace.rs b/tests/ui/generics/post_monomorphization_error_backtrace.rs
index 1fd9b6b3b..1fd9b6b3b 100644
--- a/src/test/ui/generics/post_monomorphization_error_backtrace.rs
+++ b/tests/ui/generics/post_monomorphization_error_backtrace.rs
diff --git a/src/test/ui/generics/post_monomorphization_error_backtrace.stderr b/tests/ui/generics/post_monomorphization_error_backtrace.stderr
index 0d707d83d..0d707d83d 100644
--- a/src/test/ui/generics/post_monomorphization_error_backtrace.stderr
+++ b/tests/ui/generics/post_monomorphization_error_backtrace.stderr
diff --git a/src/test/ui/generics/single-colon-path-not-const-generics.rs b/tests/ui/generics/single-colon-path-not-const-generics.rs
index 55a7ae0bb..55a7ae0bb 100644
--- a/src/test/ui/generics/single-colon-path-not-const-generics.rs
+++ b/tests/ui/generics/single-colon-path-not-const-generics.rs
diff --git a/src/test/ui/generics/single-colon-path-not-const-generics.stderr b/tests/ui/generics/single-colon-path-not-const-generics.stderr
index 3eafa9fa5..3eafa9fa5 100644
--- a/src/test/ui/generics/single-colon-path-not-const-generics.stderr
+++ b/tests/ui/generics/single-colon-path-not-const-generics.stderr
diff --git a/src/test/ui/generics/type-params-in-for-each.rs b/tests/ui/generics/type-params-in-for-each.rs
index 53475d280..53475d280 100644
--- a/src/test/ui/generics/type-params-in-for-each.rs
+++ b/tests/ui/generics/type-params-in-for-each.rs
diff --git a/src/test/ui/generics/wrong-number-of-args.rs b/tests/ui/generics/wrong-number-of-args.rs
index cd2f96a18..cd2f96a18 100644
--- a/src/test/ui/generics/wrong-number-of-args.rs
+++ b/tests/ui/generics/wrong-number-of-args.rs
diff --git a/src/test/ui/generics/wrong-number-of-args.stderr b/tests/ui/generics/wrong-number-of-args.stderr
index 0475eb908..75e33f680 100644
--- a/src/test/ui/generics/wrong-number-of-args.stderr
+++ b/tests/ui/generics/wrong-number-of-args.stderr
@@ -251,7 +251,7 @@ LL |     struct Ty<A, B>;
 help: add missing generic arguments
    |
 LL |     type A = Ty<A, B>;
-   |              ~~~~~~~~
+   |                ++++++
 
 error[E0107]: this struct takes 2 generic arguments but 1 generic argument was supplied
   --> $DIR/wrong-number-of-args.rs:30:14
@@ -315,7 +315,7 @@ LL |     struct Ty<'a, T>;
 help: add missing generic argument
    |
 LL |     type A = Ty<T>;
-   |              ~~~~~
+   |                +++
 
 error[E0107]: this struct takes 1 generic argument but 0 generic arguments were supplied
   --> $DIR/wrong-number-of-args.rs:54:14
@@ -391,7 +391,7 @@ LL |     struct Ty<A, B, C = &'static str>;
 help: add missing generic arguments
    |
 LL |     type A = Ty<A, B>;
-   |              ~~~~~~~~
+   |                ++++++
 
 error[E0107]: this struct takes at least 2 generic arguments but 1 generic argument was supplied
   --> $DIR/wrong-number-of-args.rs:84:14
@@ -483,7 +483,7 @@ LL |     trait GenericType<A> {
 help: add missing generic argument
    |
 LL |     type D = Box<dyn GenericType<A>>;
-   |                      ~~~~~~~~~~~~~~
+   |                                 +++
 
 error[E0107]: this trait takes 1 generic argument but 2 generic arguments were supplied
   --> $DIR/wrong-number-of-args.rs:133:22
@@ -889,15 +889,10 @@ error[E0107]: missing generics for struct `HashMap`
 LL |         type A = HashMap;
    |                  ^^^^^^^ expected at least 2 generic arguments
    |
-note: struct defined here, with at least 2 generic parameters: `K`, `V`
-  --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
-   |
-LL | pub struct HashMap<K, V, S = RandomState> {
-   |            ^^^^^^^ -  -
 help: add missing generic arguments
    |
 LL |         type A = HashMap<K, V>;
-   |                  ~~~~~~~~~~~~~
+   |                         ++++++
 
 error[E0107]: this struct takes at least 2 generic arguments but 1 generic argument was supplied
   --> $DIR/wrong-number-of-args.rs:314:18
@@ -907,11 +902,6 @@ LL |         type B = HashMap<String>;
    |                  |
    |                  expected at least 2 generic arguments
    |
-note: struct defined here, with at least 2 generic parameters: `K`, `V`
-  --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
-   |
-LL | pub struct HashMap<K, V, S = RandomState> {
-   |            ^^^^^^^ -  -
 help: add missing generic argument
    |
 LL |         type B = HashMap<String, V>;
@@ -924,12 +914,6 @@ LL |         type C = HashMap<'static>;
    |                  ^^^^^^^--------- help: remove these generics
    |                  |
    |                  expected 0 lifetime arguments
-   |
-note: struct defined here, with 0 lifetime parameters
-  --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
-   |
-LL | pub struct HashMap<K, V, S = RandomState> {
-   |            ^^^^^^^
 
 error[E0107]: this struct takes at least 2 generic arguments but 0 generic arguments were supplied
   --> $DIR/wrong-number-of-args.rs:318:18
@@ -937,11 +921,6 @@ error[E0107]: this struct takes at least 2 generic arguments but 0 generic argum
 LL |         type C = HashMap<'static>;
    |                  ^^^^^^^ expected at least 2 generic arguments
    |
-note: struct defined here, with at least 2 generic parameters: `K`, `V`
-  --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
-   |
-LL | pub struct HashMap<K, V, S = RandomState> {
-   |            ^^^^^^^ -  -
 help: add missing generic arguments
    |
 LL |         type C = HashMap<'static, K, V>;
@@ -954,12 +933,6 @@ LL |         type D = HashMap<usize, String, char, f64>;
    |                  ^^^^^^^                      --- help: remove this generic argument
    |                  |
    |                  expected at most 3 generic arguments
-   |
-note: struct defined here, with at most 3 generic parameters: `K`, `V`, `S`
-  --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
-   |
-LL | pub struct HashMap<K, V, S = RandomState> {
-   |            ^^^^^^^ -  -  ---------------
 
 error[E0107]: this struct takes at least 2 generic arguments but 0 generic arguments were supplied
   --> $DIR/wrong-number-of-args.rs:328:18
@@ -967,11 +940,6 @@ error[E0107]: this struct takes at least 2 generic arguments but 0 generic argum
 LL |         type E = HashMap<>;
    |                  ^^^^^^^ expected at least 2 generic arguments
    |
-note: struct defined here, with at least 2 generic parameters: `K`, `V`
-  --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
-   |
-LL | pub struct HashMap<K, V, S = RandomState> {
-   |            ^^^^^^^ -  -
 help: add missing generic arguments
    |
 LL |         type E = HashMap<K, V>;
@@ -983,15 +951,10 @@ error[E0107]: missing generics for enum `Result`
 LL |         type A = Result;
    |                  ^^^^^^ expected 2 generic arguments
    |
-note: enum defined here, with 2 generic parameters: `T`, `E`
-  --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   |          ^^^^^^ -  -
 help: add missing generic arguments
    |
 LL |         type A = Result<T, E>;
-   |                  ~~~~~~~~~~~~
+   |                        ++++++
 
 error[E0107]: this enum takes 2 generic arguments but 1 generic argument was supplied
   --> $DIR/wrong-number-of-args.rs:338:18
@@ -1001,11 +964,6 @@ LL |         type B = Result<String>;
    |                  |
    |                  expected 2 generic arguments
    |
-note: enum defined here, with 2 generic parameters: `T`, `E`
-  --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   |          ^^^^^^ -  -
 help: add missing generic argument
    |
 LL |         type B = Result<String, E>;
@@ -1018,12 +976,6 @@ LL |         type C = Result<'static>;
    |                  ^^^^^^--------- help: remove these generics
    |                  |
    |                  expected 0 lifetime arguments
-   |
-note: enum defined here, with 0 lifetime parameters
-  --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   |          ^^^^^^
 
 error[E0107]: this enum takes 2 generic arguments but 0 generic arguments were supplied
   --> $DIR/wrong-number-of-args.rs:342:18
@@ -1031,11 +983,6 @@ error[E0107]: this enum takes 2 generic arguments but 0 generic arguments were s
 LL |         type C = Result<'static>;
    |                  ^^^^^^ expected 2 generic arguments
    |
-note: enum defined here, with 2 generic parameters: `T`, `E`
-  --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   |          ^^^^^^ -  -
 help: add missing generic arguments
    |
 LL |         type C = Result<'static, T, E>;
@@ -1048,12 +995,6 @@ LL |         type D = Result<usize, String, char>;
    |                  ^^^^^^                ---- help: remove this generic argument
    |                  |
    |                  expected 2 generic arguments
-   |
-note: enum defined here, with 2 generic parameters: `T`, `E`
-  --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   |          ^^^^^^ -  -
 
 error[E0107]: this enum takes 2 generic arguments but 0 generic arguments were supplied
   --> $DIR/wrong-number-of-args.rs:352:18
@@ -1061,11 +1002,6 @@ error[E0107]: this enum takes 2 generic arguments but 0 generic arguments were s
 LL |         type E = Result<>;
    |                  ^^^^^^ expected 2 generic arguments
    |
-note: enum defined here, with 2 generic parameters: `T`, `E`
-  --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   |          ^^^^^^ -  -
 help: add missing generic arguments
    |
 LL |         type E = Result<T, E>;
diff --git a/src/test/ui/global-scope.rs b/tests/ui/global-scope.rs
index 944eee5af..944eee5af 100644
--- a/src/test/ui/global-scope.rs
+++ b/tests/ui/global-scope.rs
diff --git a/src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision.rs b/tests/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision.rs
index b2e9ffb57..b2e9ffb57 100644
--- a/src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision.rs
+++ b/tests/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision.rs
diff --git a/src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision.stderr b/tests/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision.stderr
index a6f8563a0..095a1c6af 100644
--- a/src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision.stderr
+++ b/tests/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 LL |     match [5..4, 99..105, 43..44] {
    |           ----------------------- this expression has type `[std::ops::Range<{integer}>; 3]`
 LL |         [_, 99.., _] => {},
-   |             ^^ expected struct `std::ops::Range`, found integer
+   |             ^^ expected struct `Range`, found integer
    |
    = note: expected struct `std::ops::Range<{integer}>`
                 found type `{integer}`
diff --git a/src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision2.rs b/tests/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision2.rs
index 20f4d8f88..20f4d8f88 100644
--- a/src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision2.rs
+++ b/tests/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision2.rs
diff --git a/src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision2.stderr b/tests/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision2.stderr
index 4e0102c93..2ea3205dc 100644
--- a/src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision2.stderr
+++ b/tests/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision2.stderr
@@ -10,7 +10,7 @@ error[E0308]: mismatched types
 LL |     match [5..4, 99..105, 43..44] {
    |           ----------------------- this expression has type `[std::ops::Range<{integer}>; 3]`
 LL |         [_, 99..] => {},
-   |             ^^ expected struct `std::ops::Range`, found integer
+   |             ^^ expected struct `Range`, found integer
    |
    = note: expected struct `std::ops::Range<{integer}>`
                 found type `{integer}`
diff --git a/src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision3.rs b/tests/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision3.rs
index 14ca07d0a..14ca07d0a 100644
--- a/src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision3.rs
+++ b/tests/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision3.rs
diff --git a/src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision3.stderr b/tests/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision3.stderr
index 790a13372..bbdf0c83f 100644
--- a/src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision3.stderr
+++ b/tests/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision3.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 LL |     match [5..4, 99..105, 43..44] {
    |           ----------------------- this expression has type `[std::ops::Range<{integer}>; 3]`
 LL |         [..9, 99..100, _] => {},
-   |            ^ expected struct `std::ops::Range`, found integer
+   |            ^ expected struct `Range`, found integer
    |
    = note: expected struct `std::ops::Range<{integer}>`
                 found type `{integer}`
@@ -17,7 +17,7 @@ LL |     match [5..4, 99..105, 43..44] {
 LL |         [..9, 99..100, _] => {},
    |               ^^  --- this is of type `{integer}`
    |               |
-   |               expected struct `std::ops::Range`, found integer
+   |               expected struct `Range`, found integer
    |
    = note: expected struct `std::ops::Range<{integer}>`
                 found type `{integer}`
@@ -28,7 +28,7 @@ error[E0308]: mismatched types
 LL |     match [5..4, 99..105, 43..44] {
    |           ----------------------- this expression has type `[std::ops::Range<{integer}>; 3]`
 LL |         [..9, 99..100, _] => {},
-   |               --  ^^^ expected struct `std::ops::Range`, found integer
+   |               --  ^^^ expected struct `Range`, found integer
    |               |
    |               this is of type `{integer}`
    |
diff --git a/src/test/ui/half-open-range-patterns/feature-gate-half-open-range-patterns-in-slices.rs b/tests/ui/half-open-range-patterns/feature-gate-half-open-range-patterns-in-slices.rs
index dac973473..dac973473 100644
--- a/src/test/ui/half-open-range-patterns/feature-gate-half-open-range-patterns-in-slices.rs
+++ b/tests/ui/half-open-range-patterns/feature-gate-half-open-range-patterns-in-slices.rs
diff --git a/src/test/ui/half-open-range-patterns/feature-gate-half-open-range-patterns-in-slices.stderr b/tests/ui/half-open-range-patterns/feature-gate-half-open-range-patterns-in-slices.stderr
index ee5b0e11c..ee5b0e11c 100644
--- a/src/test/ui/half-open-range-patterns/feature-gate-half-open-range-patterns-in-slices.stderr
+++ b/tests/ui/half-open-range-patterns/feature-gate-half-open-range-patterns-in-slices.stderr
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-bad-types.rs b/tests/ui/half-open-range-patterns/half-open-range-pats-bad-types.rs
index 17ea2b13f..17ea2b13f 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-bad-types.rs
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-bad-types.rs
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-bad-types.stderr b/tests/ui/half-open-range-patterns/half-open-range-pats-bad-types.stderr
index f7c59a196..f7c59a196 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-bad-types.stderr
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-bad-types.stderr
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-exhaustive-fail.rs b/tests/ui/half-open-range-patterns/half-open-range-pats-exhaustive-fail.rs
index a2a4c62fa..a2a4c62fa 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-exhaustive-fail.rs
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-exhaustive-fail.rs
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-exhaustive-fail.stderr b/tests/ui/half-open-range-patterns/half-open-range-pats-exhaustive-fail.stderr
index 6b20a820b..6b20a820b 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-exhaustive-fail.stderr
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-exhaustive-fail.stderr
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-exhaustive-pass.rs b/tests/ui/half-open-range-patterns/half-open-range-pats-exhaustive-pass.rs
index 4b7eee134..4b7eee134 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-exhaustive-pass.rs
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-exhaustive-pass.rs
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-dotdotdot-bad-syntax.rs b/tests/ui/half-open-range-patterns/half-open-range-pats-inclusive-dotdotdot-bad-syntax.rs
index 526a797e9..526a797e9 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-dotdotdot-bad-syntax.rs
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-inclusive-dotdotdot-bad-syntax.rs
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-dotdotdot-bad-syntax.stderr b/tests/ui/half-open-range-patterns/half-open-range-pats-inclusive-dotdotdot-bad-syntax.stderr
index ddffeaf97..ddffeaf97 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-dotdotdot-bad-syntax.stderr
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-inclusive-dotdotdot-bad-syntax.stderr
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-no-end.rs b/tests/ui/half-open-range-patterns/half-open-range-pats-inclusive-no-end.rs
index 6567c8cc6..6567c8cc6 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-no-end.rs
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-inclusive-no-end.rs
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-no-end.stderr b/tests/ui/half-open-range-patterns/half-open-range-pats-inclusive-no-end.stderr
index 3ad84b0ef..3ad84b0ef 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-no-end.stderr
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-inclusive-no-end.stderr
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-ref-ambiguous-interp.rs b/tests/ui/half-open-range-patterns/half-open-range-pats-ref-ambiguous-interp.rs
index 2d63fe078..2d63fe078 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-ref-ambiguous-interp.rs
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-ref-ambiguous-interp.rs
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-ref-ambiguous-interp.stderr b/tests/ui/half-open-range-patterns/half-open-range-pats-ref-ambiguous-interp.stderr
index 111e81799..111e81799 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-ref-ambiguous-interp.stderr
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-ref-ambiguous-interp.stderr
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-semantics.rs b/tests/ui/half-open-range-patterns/half-open-range-pats-semantics.rs
index 6c6ba9319..6c6ba9319 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-semantics.rs
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-semantics.rs
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-syntactic-pass.rs b/tests/ui/half-open-range-patterns/half-open-range-pats-syntactic-pass.rs
index 9a73e8906..9a73e8906 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-syntactic-pass.rs
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-syntactic-pass.rs
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-thir-lower-empty.rs b/tests/ui/half-open-range-patterns/half-open-range-pats-thir-lower-empty.rs
index f55566602..f55566602 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-thir-lower-empty.rs
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-thir-lower-empty.rs
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-thir-lower-empty.stderr b/tests/ui/half-open-range-patterns/half-open-range-pats-thir-lower-empty.stderr
index 56b224a85..56b224a85 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-thir-lower-empty.stderr
+++ b/tests/ui/half-open-range-patterns/half-open-range-pats-thir-lower-empty.stderr
diff --git a/src/test/ui/half-open-range-patterns/pat-tuple-4.rs b/tests/ui/half-open-range-patterns/pat-tuple-4.rs
index 11c4ab9c5..11c4ab9c5 100644
--- a/src/test/ui/half-open-range-patterns/pat-tuple-4.rs
+++ b/tests/ui/half-open-range-patterns/pat-tuple-4.rs
diff --git a/src/test/ui/half-open-range-patterns/pat-tuple-5.rs b/tests/ui/half-open-range-patterns/pat-tuple-5.rs
index 995ef03c8..995ef03c8 100644
--- a/src/test/ui/half-open-range-patterns/pat-tuple-5.rs
+++ b/tests/ui/half-open-range-patterns/pat-tuple-5.rs
diff --git a/src/test/ui/half-open-range-patterns/pat-tuple-5.stderr b/tests/ui/half-open-range-patterns/pat-tuple-5.stderr
index c60842638..c60842638 100644
--- a/src/test/ui/half-open-range-patterns/pat-tuple-5.stderr
+++ b/tests/ui/half-open-range-patterns/pat-tuple-5.stderr
diff --git a/src/test/ui/half-open-range-patterns/range_pat_interactions0.rs b/tests/ui/half-open-range-patterns/range_pat_interactions0.rs
index acb7feac1..acb7feac1 100644
--- a/src/test/ui/half-open-range-patterns/range_pat_interactions0.rs
+++ b/tests/ui/half-open-range-patterns/range_pat_interactions0.rs
diff --git a/src/test/ui/half-open-range-patterns/range_pat_interactions1.rs b/tests/ui/half-open-range-patterns/range_pat_interactions1.rs
index 55353999b..55353999b 100644
--- a/src/test/ui/half-open-range-patterns/range_pat_interactions1.rs
+++ b/tests/ui/half-open-range-patterns/range_pat_interactions1.rs
diff --git a/src/test/ui/half-open-range-patterns/range_pat_interactions1.stderr b/tests/ui/half-open-range-patterns/range_pat_interactions1.stderr
index 19ebcaf0f..19ebcaf0f 100644
--- a/src/test/ui/half-open-range-patterns/range_pat_interactions1.stderr
+++ b/tests/ui/half-open-range-patterns/range_pat_interactions1.stderr
diff --git a/src/test/ui/half-open-range-patterns/range_pat_interactions2.rs b/tests/ui/half-open-range-patterns/range_pat_interactions2.rs
index 4615ebd68..4615ebd68 100644
--- a/src/test/ui/half-open-range-patterns/range_pat_interactions2.rs
+++ b/tests/ui/half-open-range-patterns/range_pat_interactions2.rs
diff --git a/src/test/ui/half-open-range-patterns/range_pat_interactions2.stderr b/tests/ui/half-open-range-patterns/range_pat_interactions2.stderr
index 13a5542a4..13a5542a4 100644
--- a/src/test/ui/half-open-range-patterns/range_pat_interactions2.stderr
+++ b/tests/ui/half-open-range-patterns/range_pat_interactions2.stderr
diff --git a/src/test/ui/half-open-range-patterns/range_pat_interactions3.rs b/tests/ui/half-open-range-patterns/range_pat_interactions3.rs
index 446ed45f9..446ed45f9 100644
--- a/src/test/ui/half-open-range-patterns/range_pat_interactions3.rs
+++ b/tests/ui/half-open-range-patterns/range_pat_interactions3.rs
diff --git a/src/test/ui/half-open-range-patterns/range_pat_interactions3.stderr b/tests/ui/half-open-range-patterns/range_pat_interactions3.stderr
index f7fda6775..f7fda6775 100644
--- a/src/test/ui/half-open-range-patterns/range_pat_interactions3.stderr
+++ b/tests/ui/half-open-range-patterns/range_pat_interactions3.stderr
diff --git a/src/test/ui/half-open-range-patterns/slice_pattern_syntax_problem0.rs b/tests/ui/half-open-range-patterns/slice_pattern_syntax_problem0.rs
index d54cbfbf4..d54cbfbf4 100644
--- a/src/test/ui/half-open-range-patterns/slice_pattern_syntax_problem0.rs
+++ b/tests/ui/half-open-range-patterns/slice_pattern_syntax_problem0.rs
diff --git a/src/test/ui/half-open-range-patterns/slice_pattern_syntax_problem0.stderr b/tests/ui/half-open-range-patterns/slice_pattern_syntax_problem0.stderr
index ec3472a50..ec3472a50 100644
--- a/src/test/ui/half-open-range-patterns/slice_pattern_syntax_problem0.stderr
+++ b/tests/ui/half-open-range-patterns/slice_pattern_syntax_problem0.stderr
diff --git a/src/test/ui/half-open-range-patterns/slice_pattern_syntax_problem1.rs b/tests/ui/half-open-range-patterns/slice_pattern_syntax_problem1.rs
index c37af75b8..c37af75b8 100644
--- a/src/test/ui/half-open-range-patterns/slice_pattern_syntax_problem1.rs
+++ b/tests/ui/half-open-range-patterns/slice_pattern_syntax_problem1.rs
diff --git a/src/test/ui/half-open-range-patterns/slice_pattern_syntax_problem1.stderr b/tests/ui/half-open-range-patterns/slice_pattern_syntax_problem1.stderr
index 3bca554b1..3bca554b1 100644
--- a/src/test/ui/half-open-range-patterns/slice_pattern_syntax_problem1.stderr
+++ b/tests/ui/half-open-range-patterns/slice_pattern_syntax_problem1.stderr
diff --git a/src/test/ui/half-open-range-patterns/slice_pattern_syntax_problem2.rs b/tests/ui/half-open-range-patterns/slice_pattern_syntax_problem2.rs
index 6e7df3094..6e7df3094 100644
--- a/src/test/ui/half-open-range-patterns/slice_pattern_syntax_problem2.rs
+++ b/tests/ui/half-open-range-patterns/slice_pattern_syntax_problem2.rs
diff --git a/src/test/ui/hashmap/hashmap-capacity-overflow.rs b/tests/ui/hashmap/hashmap-capacity-overflow.rs
index 2988af065..2988af065 100644
--- a/src/test/ui/hashmap/hashmap-capacity-overflow.rs
+++ b/tests/ui/hashmap/hashmap-capacity-overflow.rs
diff --git a/src/test/ui/hashmap/hashmap-index-mut.rs b/tests/ui/hashmap/hashmap-index-mut.rs
index 98448e9d5..98448e9d5 100644
--- a/src/test/ui/hashmap/hashmap-index-mut.rs
+++ b/tests/ui/hashmap/hashmap-index-mut.rs
diff --git a/src/test/ui/hashmap/hashmap-index-mut.stderr b/tests/ui/hashmap/hashmap-index-mut.stderr
index c1948ab62..c1948ab62 100644
--- a/src/test/ui/hashmap/hashmap-index-mut.stderr
+++ b/tests/ui/hashmap/hashmap-index-mut.stderr
diff --git a/src/test/ui/hashmap/hashmap-iter-value-lifetime.rs b/tests/ui/hashmap/hashmap-iter-value-lifetime.rs
index 260ea8c7a..260ea8c7a 100644
--- a/src/test/ui/hashmap/hashmap-iter-value-lifetime.rs
+++ b/tests/ui/hashmap/hashmap-iter-value-lifetime.rs
diff --git a/src/test/ui/hashmap/hashmap-iter-value-lifetime.stderr b/tests/ui/hashmap/hashmap-iter-value-lifetime.stderr
index d6e7a1d45..d6e7a1d45 100644
--- a/src/test/ui/hashmap/hashmap-iter-value-lifetime.stderr
+++ b/tests/ui/hashmap/hashmap-iter-value-lifetime.stderr
diff --git a/src/test/ui/hashmap/hashmap-lifetimes.rs b/tests/ui/hashmap/hashmap-lifetimes.rs
index 295bf3b0e..295bf3b0e 100644
--- a/src/test/ui/hashmap/hashmap-lifetimes.rs
+++ b/tests/ui/hashmap/hashmap-lifetimes.rs
diff --git a/src/test/ui/hashmap/hashmap-lifetimes.stderr b/tests/ui/hashmap/hashmap-lifetimes.stderr
index d1bcd53ae..d1bcd53ae 100644
--- a/src/test/ui/hashmap/hashmap-lifetimes.stderr
+++ b/tests/ui/hashmap/hashmap-lifetimes.stderr
diff --git a/src/test/ui/hashmap/hashmap-memory.rs b/tests/ui/hashmap/hashmap-memory.rs
index 2031196ab..87f8b6ad5 100644
--- a/src/test/ui/hashmap/hashmap-memory.rs
+++ b/tests/ui/hashmap/hashmap-memory.rs
@@ -90,5 +90,5 @@ mod map_reduce {
 
 pub fn main() {
     map_reduce::map_reduce(
-        vec!["../src/test/run-pass/hashmap-memory.rs".to_string()]);
+        vec!["../tests/run-pass/hashmap-memory.rs".to_string()]);
 }
diff --git a/src/test/ui/hello.rs b/tests/ui/hello.rs
index c66b7c60f..c66b7c60f 100644
--- a/src/test/ui/hello.rs
+++ b/tests/ui/hello.rs
diff --git a/src/test/ui/hello_world/main.rs b/tests/ui/hello_world/main.rs
index 22ce47414..22ce47414 100644
--- a/src/test/ui/hello_world/main.rs
+++ b/tests/ui/hello_world/main.rs
diff --git a/src/test/ui/higher-lifetime-bounds.rs b/tests/ui/higher-lifetime-bounds.rs
index f3393347d..f3393347d 100644
--- a/src/test/ui/higher-lifetime-bounds.rs
+++ b/tests/ui/higher-lifetime-bounds.rs
diff --git a/src/test/ui/higher-lifetime-bounds.stderr b/tests/ui/higher-lifetime-bounds.stderr
index bc6d2288c..bc6d2288c 100644
--- a/src/test/ui/higher-lifetime-bounds.stderr
+++ b/tests/ui/higher-lifetime-bounds.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/complex.rs b/tests/ui/higher-rank-trait-bounds/complex.rs
index 8cdfe247e..8cdfe247e 100644
--- a/src/test/ui/higher-rank-trait-bounds/complex.rs
+++ b/tests/ui/higher-rank-trait-bounds/complex.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/due-to-where-clause.rs b/tests/ui/higher-rank-trait-bounds/due-to-where-clause.rs
index 1afd15613..1afd15613 100644
--- a/src/test/ui/higher-rank-trait-bounds/due-to-where-clause.rs
+++ b/tests/ui/higher-rank-trait-bounds/due-to-where-clause.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/due-to-where-clause.stderr b/tests/ui/higher-rank-trait-bounds/due-to-where-clause.stderr
index 520938a63..520938a63 100644
--- a/src/test/ui/higher-rank-trait-bounds/due-to-where-clause.stderr
+++ b/tests/ui/higher-rank-trait-bounds/due-to-where-clause.stderr
diff --git a/tests/ui/higher-rank-trait-bounds/hang-on-deeply-nested-dyn.rs b/tests/ui/higher-rank-trait-bounds/hang-on-deeply-nested-dyn.rs
new file mode 100644
index 000000000..d34b7a296
--- /dev/null
+++ b/tests/ui/higher-rank-trait-bounds/hang-on-deeply-nested-dyn.rs
@@ -0,0 +1,16 @@
+// normalize-stderr-test: "long-type-\d+" -> "long-type-hash"
+
+fn id(
+    f: &dyn Fn(u32),
+) -> &dyn Fn(
+    &dyn Fn(
+        &dyn Fn(
+            &dyn Fn(&dyn Fn(&dyn Fn(&dyn Fn(&dyn Fn(&dyn Fn(&dyn Fn(&dyn Fn(&dyn Fn(u32))))))))),
+        ),
+    ),
+) {
+    f
+    //~^ ERROR mismatched types
+}
+
+fn main() {}
diff --git a/tests/ui/higher-rank-trait-bounds/hang-on-deeply-nested-dyn.stderr b/tests/ui/higher-rank-trait-bounds/hang-on-deeply-nested-dyn.stderr
new file mode 100644
index 000000000..71e196c32
--- /dev/null
+++ b/tests/ui/higher-rank-trait-bounds/hang-on-deeply-nested-dyn.stderr
@@ -0,0 +1,22 @@
+error[E0308]: mismatched types
+  --> $DIR/hang-on-deeply-nested-dyn.rs:12:5
+   |
+LL |   ) -> &dyn Fn(
+   |  ______-
+LL | |     &dyn Fn(
+LL | |         &dyn Fn(
+LL | |             &dyn Fn(&dyn Fn(&dyn Fn(&dyn Fn(&dyn Fn(&dyn Fn(&dyn Fn(&dyn Fn(&dyn Fn(u32))))))))),
+LL | |         ),
+LL | |     ),
+LL | | ) {
+   | |_- expected `&dyn for<'a> Fn(&'a (dyn for<'a> Fn(&'a (dyn for<'a> Fn(&'a (dyn for<'a> Fn(&'a (dyn for<'a> Fn(&'a (dyn for<'a> Fn(&'a (dyn for<'a> Fn(&'a (dyn for<'a> Fn(&'a (dyn for<'a> Fn(&'a (dyn for<'a> Fn(&'a (dyn for<'a> Fn(&'a (dyn Fn(u32) + 'a)) + 'a)) + 'a)) + 'a)) + 'a)) + 'a)) + 'a)) + 'a)) + 'a)) + 'a)) + 'a))` because of return type
+LL |       f
+   |       ^ expected reference, found `u32`
+   |
+   = note: expected reference `&dyn for<'a> Fn(&'a (dyn for<'a> Fn(&'a (dyn for<'a> Fn(&'a (dyn for<'a> Fn(&'a ...) + 'a)) + 'a)) + 'a))`
+           the full type name has been written to '$TEST_BUILD_DIR/higher-rank-trait-bounds/hang-on-deeply-nested-dyn/hang-on-deeply-nested-dyn.long-type-hash.txt'
+              found reference `&dyn Fn(u32)`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-binder-levels-in-object-types.rs b/tests/ui/higher-rank-trait-bounds/hrtb-binder-levels-in-object-types.rs
index cc766c060..cc766c060 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-binder-levels-in-object-types.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-binder-levels-in-object-types.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-cache-issue-54302.rs b/tests/ui/higher-rank-trait-bounds/hrtb-cache-issue-54302.rs
index a20d03c77..a20d03c77 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-cache-issue-54302.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-cache-issue-54302.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-cache-issue-54302.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-cache-issue-54302.stderr
index f014eab86..f014eab86 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-cache-issue-54302.stderr
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-cache-issue-54302.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-conflate-regions.rs b/tests/ui/higher-rank-trait-bounds/hrtb-conflate-regions.rs
index e83686404..e83686404 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-conflate-regions.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-conflate-regions.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-conflate-regions.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-conflate-regions.stderr
index 46f5308dd..46f5308dd 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-conflate-regions.stderr
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-conflate-regions.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-debruijn-in-receiver.rs b/tests/ui/higher-rank-trait-bounds/hrtb-debruijn-in-receiver.rs
index 05d3e1a43..05d3e1a43 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-debruijn-in-receiver.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-debruijn-in-receiver.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-debruijn-in-receiver.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-debruijn-in-receiver.stderr
index fa391ecba..fa391ecba 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-debruijn-in-receiver.stderr
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-debruijn-in-receiver.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-debruijn-object-types-in-closures.rs b/tests/ui/higher-rank-trait-bounds/hrtb-debruijn-object-types-in-closures.rs
index 8431226a3..8431226a3 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-debruijn-object-types-in-closures.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-debruijn-object-types-in-closures.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-fn.rs b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-fn.rs
index 567802376..567802376 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-fn.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-fn.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-fn.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-fn.stderr
index 9914783d9..9914783d9 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-fn.stderr
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-fn.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-contravariant.rs b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-contravariant.rs
index 921061916..921061916 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-contravariant.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-contravariant.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-contravariant.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-contravariant.stderr
index 364b613fc..364b613fc 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-contravariant.stderr
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-contravariant.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-covariant.rs b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-covariant.rs
index f95496a6c..f95496a6c 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-covariant.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-covariant.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-invariant.rs b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-invariant.rs
index 9b9e4496a..9b9e4496a 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-invariant.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-invariant.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-invariant.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-invariant.stderr
index cb2ce8a41..cb2ce8a41 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-invariant.stderr
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-invariant.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-fn-like-trait-object.rs b/tests/ui/higher-rank-trait-bounds/hrtb-fn-like-trait-object.rs
index ff84ad9d2..ff84ad9d2 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-fn-like-trait-object.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-fn-like-trait-object.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-fn-like-trait.rs b/tests/ui/higher-rank-trait-bounds/hrtb-fn-like-trait.rs
index afab9986c..afab9986c 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-fn-like-trait.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-fn-like-trait.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits-transitive.rs b/tests/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits-transitive.rs
index f9ae1429e..f9ae1429e 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits-transitive.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits-transitive.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits-transitive.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits-transitive.stderr
index 8cda76b94..8cda76b94 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits-transitive.stderr
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits-transitive.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits.rs b/tests/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits.rs
index 48ebe5017..48ebe5017 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits.stderr
index 88793a152..88793a152 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits.stderr
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-identity-fn-borrows.rs b/tests/ui/higher-rank-trait-bounds/hrtb-identity-fn-borrows.rs
index 89fc4705a..89fc4705a 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-identity-fn-borrows.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-identity-fn-borrows.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-identity-fn-borrows.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-identity-fn-borrows.stderr
index 4886a3c8b..4886a3c8b 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-identity-fn-borrows.stderr
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-identity-fn-borrows.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-just-for-static.rs b/tests/ui/higher-rank-trait-bounds/hrtb-just-for-static.rs
index 8fb4218f8..8fb4218f8 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-just-for-static.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-just-for-static.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-just-for-static.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-just-for-static.stderr
index 31e11e128..31e11e128 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-just-for-static.stderr
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-just-for-static.stderr
diff --git a/tests/ui/higher-rank-trait-bounds/hrtb-malformed-lifetime-generics.rs b/tests/ui/higher-rank-trait-bounds/hrtb-malformed-lifetime-generics.rs
new file mode 100644
index 000000000..4b096be59
--- /dev/null
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-malformed-lifetime-generics.rs
@@ -0,0 +1,20 @@
+// Test that Fn-family traits with lifetime parameters shouldn't compile and
+// we suggest the usage of higher-rank trait bounds instead.
+
+fn fa(_: impl Fn<'a>(&'a str) -> bool) {}
+//~^ ERROR `Fn` traits cannot take lifetime parameters
+
+fn fb(_: impl FnMut<'a, 'b>(&'a str, &'b str) -> bool) {}
+//~^ ERROR `Fn` traits cannot take lifetime parameters
+
+fn fc(_: impl std::fmt::Display + FnOnce<'a>(&'a str) -> bool + std::fmt::Debug) {}
+//~^ ERROR `Fn` traits cannot take lifetime parameters
+
+use std::ops::Fn as AliasedFn;
+fn fd(_: impl AliasedFn<'a>(&'a str) -> bool) {}
+//~^ ERROR `Fn` traits cannot take lifetime parameters
+
+fn fe<F>(_: F) where F: Fn<'a>(&'a str) -> bool {}
+//~^ ERROR `Fn` traits cannot take lifetime parameters
+
+fn main() {}
diff --git a/tests/ui/higher-rank-trait-bounds/hrtb-malformed-lifetime-generics.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-malformed-lifetime-generics.stderr
new file mode 100644
index 000000000..e8f6d63b5
--- /dev/null
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-malformed-lifetime-generics.stderr
@@ -0,0 +1,62 @@
+error: `Fn` traits cannot take lifetime parameters
+  --> $DIR/hrtb-malformed-lifetime-generics.rs:4:17
+   |
+LL | fn fa(_: impl Fn<'a>(&'a str) -> bool) {}
+   |                 ^^^^
+   |
+help: consider using a higher-ranked trait bound instead
+   |
+LL - fn fa(_: impl Fn<'a>(&'a str) -> bool) {}
+LL + fn fa(_: impl for<'a> Fn(&'a str) -> bool) {}
+   |
+
+error: `Fn` traits cannot take lifetime parameters
+  --> $DIR/hrtb-malformed-lifetime-generics.rs:7:20
+   |
+LL | fn fb(_: impl FnMut<'a, 'b>(&'a str, &'b str) -> bool) {}
+   |                    ^^^^^^^^
+   |
+help: consider using a higher-ranked trait bound instead
+   |
+LL - fn fb(_: impl FnMut<'a, 'b>(&'a str, &'b str) -> bool) {}
+LL + fn fb(_: impl for<'a, 'b> FnMut(&'a str, &'b str) -> bool) {}
+   |
+
+error: `Fn` traits cannot take lifetime parameters
+  --> $DIR/hrtb-malformed-lifetime-generics.rs:10:41
+   |
+LL | fn fc(_: impl std::fmt::Display + FnOnce<'a>(&'a str) -> bool + std::fmt::Debug) {}
+   |                                         ^^^^
+   |
+help: consider using a higher-ranked trait bound instead
+   |
+LL - fn fc(_: impl std::fmt::Display + FnOnce<'a>(&'a str) -> bool + std::fmt::Debug) {}
+LL + fn fc(_: impl std::fmt::Display + for<'a> FnOnce(&'a str) -> bool + std::fmt::Debug) {}
+   |
+
+error: `Fn` traits cannot take lifetime parameters
+  --> $DIR/hrtb-malformed-lifetime-generics.rs:14:24
+   |
+LL | fn fd(_: impl AliasedFn<'a>(&'a str) -> bool) {}
+   |                        ^^^^
+   |
+help: consider using a higher-ranked trait bound instead
+   |
+LL - fn fd(_: impl AliasedFn<'a>(&'a str) -> bool) {}
+LL + fn fd(_: impl for<'a> AliasedFn(&'a str) -> bool) {}
+   |
+
+error: `Fn` traits cannot take lifetime parameters
+  --> $DIR/hrtb-malformed-lifetime-generics.rs:17:27
+   |
+LL | fn fe<F>(_: F) where F: Fn<'a>(&'a str) -> bool {}
+   |                           ^^^^
+   |
+help: consider using a higher-ranked trait bound instead
+   |
+LL - fn fe<F>(_: F) where F: Fn<'a>(&'a str) -> bool {}
+LL + fn fe<F>(_: F) where F: for<'a> Fn(&'a str) -> bool {}
+   |
+
+error: aborting due to 5 previous errors
+
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-opt-in-copy.rs b/tests/ui/higher-rank-trait-bounds/hrtb-opt-in-copy.rs
index 04519f116..04519f116 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-opt-in-copy.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-opt-in-copy.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-parse.rs b/tests/ui/higher-rank-trait-bounds/hrtb-parse.rs
index 1fab9758c..1fab9758c 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-parse.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-parse.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.polonius.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.polonius.stderr
index a94c80eb3..a94c80eb3 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.polonius.stderr
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.polonius.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.rs b/tests/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.rs
index d45fa183c..d45fa183c 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.stderr
index 727b9e6be..727b9e6be 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.stderr
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-precedence-of-plus-where-clause.rs b/tests/ui/higher-rank-trait-bounds/hrtb-precedence-of-plus-where-clause.rs
index 42247798f..42247798f 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-precedence-of-plus-where-clause.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-precedence-of-plus-where-clause.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-precedence-of-plus.rs b/tests/ui/higher-rank-trait-bounds/hrtb-precedence-of-plus.rs
index 6834c392d..6834c392d 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-precedence-of-plus.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-precedence-of-plus.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-resolve-lifetime.rs b/tests/ui/higher-rank-trait-bounds/hrtb-resolve-lifetime.rs
index b97fdf4df..b97fdf4df 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-resolve-lifetime.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-resolve-lifetime.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-trait-object-paren-notation.rs b/tests/ui/higher-rank-trait-bounds/hrtb-trait-object-paren-notation.rs
index d8c726cdd..d8c726cdd 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-trait-object-paren-notation.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-trait-object-paren-notation.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-trait-object-passed-to-closure.rs b/tests/ui/higher-rank-trait-bounds/hrtb-trait-object-passed-to-closure.rs
index 41ebb3f5a..41ebb3f5a 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-trait-object-passed-to-closure.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-trait-object-passed-to-closure.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-type-outlives.rs b/tests/ui/higher-rank-trait-bounds/hrtb-type-outlives.rs
index 88d396101..88d396101 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-type-outlives.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-type-outlives.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-unboxed-closure-trait.rs b/tests/ui/higher-rank-trait-bounds/hrtb-unboxed-closure-trait.rs
index a4a8a5ac6..a4a8a5ac6 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-unboxed-closure-trait.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-unboxed-closure-trait.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-wrong-kind.rs b/tests/ui/higher-rank-trait-bounds/hrtb-wrong-kind.rs
index 1a9bb2523..1a9bb2523 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-wrong-kind.rs
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-wrong-kind.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/hrtb-wrong-kind.stderr b/tests/ui/higher-rank-trait-bounds/hrtb-wrong-kind.stderr
index f31aa5546..f31aa5546 100644
--- a/src/test/ui/higher-rank-trait-bounds/hrtb-wrong-kind.stderr
+++ b/tests/ui/higher-rank-trait-bounds/hrtb-wrong-kind.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-100689.rs b/tests/ui/higher-rank-trait-bounds/issue-100689.rs
index 2db7f8a35..2db7f8a35 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-100689.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-100689.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-102899.rs b/tests/ui/higher-rank-trait-bounds/issue-102899.rs
index 952b81584..952b81584 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-102899.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-102899.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-30786.rs b/tests/ui/higher-rank-trait-bounds/issue-30786.rs
index e5f46f711..e5f46f711 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-30786.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-30786.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-30786.stderr b/tests/ui/higher-rank-trait-bounds/issue-30786.stderr
index c1e235441..0458d2535 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-30786.stderr
+++ b/tests/ui/higher-rank-trait-bounds/issue-30786.stderr
@@ -1,4 +1,4 @@
-error[E0599]: the method `filterx` exists for struct `Map<Repeat, [closure@$DIR/issue-30786.rs:117:27: 117:34]>`, but its trait bounds were not satisfied
+error[E0599]: the method `filterx` exists for struct `Map<Repeat, [closure@issue-30786.rs:117:27]>`, but its trait bounds were not satisfied
   --> $DIR/issue-30786.rs:118:22
    |
 LL | pub struct Map<S, F> {
@@ -8,7 +8,7 @@ LL | pub struct Map<S, F> {
    | doesn't satisfy `_: StreamExt`
 ...
 LL |     let filter = map.filterx(|x: &_| true);
-   |                      ^^^^^^^ method cannot be called on `Map<Repeat, [closure@$DIR/issue-30786.rs:117:27: 117:34]>` due to unsatisfied trait bounds
+   |                      ^^^^^^^ method cannot be called on `Map<Repeat, [closure@issue-30786.rs:117:27]>` due to unsatisfied trait bounds
    |
 note: the following trait bounds were not satisfied:
       `&'a mut &Map<Repeat, [closure@$DIR/issue-30786.rs:117:27: 117:34]>: Stream`
@@ -19,7 +19,7 @@ note: the following trait bounds were not satisfied:
 LL | impl<T> StreamExt for T where for<'a> &'a mut T: Stream {}
    |         ---------     -                          ^^^^^^ unsatisfied trait bound introduced here
 
-error[E0599]: the method `countx` exists for struct `Filter<Map<Repeat, for<'a> fn(&'a u64) -> &'a u64 {identity::<u64>}>, [closure@$DIR/issue-30786.rs:129:30: 129:37]>`, but its trait bounds were not satisfied
+error[E0599]: the method `countx` exists for struct `Filter<Map<Repeat, for<'a> fn(&'a u64) -> &'a u64 {identity::<u64>}>, [closure@issue-30786.rs:129:30]>`, but its trait bounds were not satisfied
   --> $DIR/issue-30786.rs:130:24
    |
 LL | pub struct Filter<S, F> {
@@ -29,7 +29,7 @@ LL | pub struct Filter<S, F> {
    | doesn't satisfy `_: StreamExt`
 ...
 LL |     let count = filter.countx();
-   |                        ^^^^^^ method cannot be called on `Filter<Map<Repeat, for<'a> fn(&'a u64) -> &'a u64 {identity::<u64>}>, [closure@$DIR/issue-30786.rs:129:30: 129:37]>` due to unsatisfied trait bounds
+   |                        ^^^^^^ method cannot be called due to unsatisfied trait bounds
    |
 note: the following trait bounds were not satisfied:
       `&'a mut &Filter<Map<Repeat, for<'a> fn(&'a u64) -> &'a u64 {identity::<u64>}>, [closure@$DIR/issue-30786.rs:129:30: 129:37]>: Stream`
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-36139-normalize-closure-sig.rs b/tests/ui/higher-rank-trait-bounds/issue-36139-normalize-closure-sig.rs
index 2d49151ff..2d49151ff 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-36139-normalize-closure-sig.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-36139-normalize-closure-sig.rs
diff --git a/tests/ui/higher-rank-trait-bounds/issue-42114.rs b/tests/ui/higher-rank-trait-bounds/issue-42114.rs
new file mode 100644
index 000000000..01515fdc9
--- /dev/null
+++ b/tests/ui/higher-rank-trait-bounds/issue-42114.rs
@@ -0,0 +1,20 @@
+// check-pass
+
+fn lifetime<'a>()
+where
+    &'a (): 'a,
+{
+    /* do nothing */
+}
+
+fn doesnt_work()
+where
+    for<'a> &'a (): 'a,
+{
+    /* do nothing */
+}
+
+fn main() {
+    lifetime();
+    doesnt_work();
+}
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-43623.rs b/tests/ui/higher-rank-trait-bounds/issue-43623.rs
index cedcf7c36..cedcf7c36 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-43623.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-43623.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-46989.rs b/tests/ui/higher-rank-trait-bounds/issue-46989.rs
index 4a09f4be1..4a09f4be1 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-46989.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-46989.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-46989.stderr b/tests/ui/higher-rank-trait-bounds/issue-46989.stderr
index 3f874220a..3f874220a 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-46989.stderr
+++ b/tests/ui/higher-rank-trait-bounds/issue-46989.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-57639.rs b/tests/ui/higher-rank-trait-bounds/issue-57639.rs
index 392e7233b..392e7233b 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-57639.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-57639.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-58451.rs b/tests/ui/higher-rank-trait-bounds/issue-58451.rs
index f36d549e4..6006a108c 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-58451.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-58451.rs
@@ -9,5 +9,5 @@ where
 {}
 
 fn main() {
-    f(&[f()]); //~ ERROR this function takes 1 argument
+    f(&[f()]); //~ ERROR function takes 1 argument
 }
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-58451.stderr b/tests/ui/higher-rank-trait-bounds/issue-58451.stderr
index 09e25f4dc..0f051be21 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-58451.stderr
+++ b/tests/ui/higher-rank-trait-bounds/issue-58451.stderr
@@ -11,8 +11,8 @@ LL | fn f<I>(i: I)
    |    ^    ----
 help: provide the argument
    |
-LL |     f(&[f(/* value */)]);
-   |          ~~~~~~~~~~~~~
+LL |     f(&[f(/* i */)]);
+   |          ~~~~~~~~~
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-59311.rs b/tests/ui/higher-rank-trait-bounds/issue-59311.rs
index 3ad548450..3ad548450 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-59311.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-59311.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-59311.stderr b/tests/ui/higher-rank-trait-bounds/issue-59311.stderr
index c01ab8e34..c01ab8e34 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-59311.stderr
+++ b/tests/ui/higher-rank-trait-bounds/issue-59311.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-60283.rs b/tests/ui/higher-rank-trait-bounds/issue-60283.rs
index 05315b3f9..05315b3f9 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-60283.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-60283.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.rs b/tests/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.rs
index e70f6fc34..e70f6fc34 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.stderr b/tests/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.stderr
index ab5598e36..810f7c28c 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.stderr
+++ b/tests/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.stderr
@@ -1,4 +1,4 @@
-error[E0271]: type mismatch resolving `for<'r> <L<[closure@$DIR/issue-62203-hrtb-ice.rs:42:16: 42:19]> as T0<'r, (&'r u8,)>>::O == <_ as Ty<'r>>::V`
+error[E0271]: type mismatch resolving `for<'r> <L<[closure@issue-62203-hrtb-ice.rs:42:16]> as T0<'r, (&'r u8,)>>::O == <_ as Ty<'r>>::V`
   --> $DIR/issue-62203-hrtb-ice.rs:39:9
    |
 LL |       let v = Unit2.m(
@@ -10,7 +10,7 @@ LL | |             f: |x| {
 ...  |
 LL | |             },
 LL | |         },
-   | |_________^ type mismatch resolving `for<'r> <L<[closure@$DIR/issue-62203-hrtb-ice.rs:42:16: 42:19]> as T0<'r, (&'r u8,)>>::O == <_ as Ty<'r>>::V`
+   | |_________^ type mismatch resolving `for<'r> <L<[closure@issue-62203-hrtb-ice.rs:42:16]> as T0<'r, (&'r u8,)>>::O == <_ as Ty<'r>>::V`
    |
 note: expected this to be `<_ as Ty<'_>>::V`
   --> $DIR/issue-62203-hrtb-ice.rs:21:14
@@ -30,7 +30,7 @@ LL |     where
 LL |         F: for<'r> T0<'r, (<Self as Ty<'r>>::V,), O = <B as Ty<'r>>::V>,
    |                                                   ^^^^^^^^^^^^^^^^^^^^ required by this bound in `T1::m`
 
-error[E0271]: expected `[closure@$DIR/issue-62203-hrtb-ice.rs:42:16: 42:19]` to be a closure that returns `Unit3`, but it returns `Unit4`
+error[E0271]: expected `[closure@issue-62203-hrtb-ice.rs:42:16]` to be a closure that returns `Unit3`, but it returns `Unit4`
   --> $DIR/issue-62203-hrtb-ice.rs:39:9
    |
 LL |       let v = Unit2.m(
@@ -49,6 +49,9 @@ note: required for `L<[closure@$DIR/issue-62203-hrtb-ice.rs:42:16: 42:19]>` to i
    |
 LL | impl<'a, A, T> T0<'a, A> for L<T>
    |                ^^^^^^^^^     ^^^^
+LL | where
+LL |     T: FnMut(A) -> Unit3,
+   |                    ----- unsatisfied trait bound introduced here
 note: required by a bound in `T1::m`
   --> $DIR/issue-62203-hrtb-ice.rs:27:12
    |
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-88446.rs b/tests/ui/higher-rank-trait-bounds/issue-88446.rs
index 571b85317..571b85317 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-88446.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-88446.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-88586-hr-self-outlives-in-trait-def.rs b/tests/ui/higher-rank-trait-bounds/issue-88586-hr-self-outlives-in-trait-def.rs
index 92b7c5deb..92b7c5deb 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-88586-hr-self-outlives-in-trait-def.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-88586-hr-self-outlives-in-trait-def.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-90177.rs b/tests/ui/higher-rank-trait-bounds/issue-90177.rs
index b151a9d3a..b151a9d3a 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-90177.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-90177.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-95034.rs b/tests/ui/higher-rank-trait-bounds/issue-95034.rs
index af4946a18..af4946a18 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-95034.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-95034.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/issue-95230.rs b/tests/ui/higher-rank-trait-bounds/issue-95230.rs
index 92c506eab..92c506eab 100644
--- a/src/test/ui/higher-rank-trait-bounds/issue-95230.rs
+++ b/tests/ui/higher-rank-trait-bounds/issue-95230.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-44005.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-44005.rs
index f255eac0c..f255eac0c 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-44005.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-44005.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-56556.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-56556.rs
index 4d38cb19e..4d38cb19e 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-56556.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-56556.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-1.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-1.rs
index c6f29fa59..c6f29fa59 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-1.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-1.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-2.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-2.rs
index 002054732..002054732 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-2.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-2.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-3.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-3.rs
index d84e30f49..d84e30f49 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-3.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-3.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-3.stderr b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-3.stderr
index b30dd36d2..b30dd36d2 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-3.stderr
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-3.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-4.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-4.rs
index 8c2a59868..8c2a59868 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-4.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-4.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-5.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-5.rs
index 03f257a02..03f257a02 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-5.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-5.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-6.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-6.rs
index 74a4785e4..74a4785e4 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-6.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-62529-6.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-70120.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-70120.rs
index 3ced40230..3ced40230 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-70120.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-70120.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.migrate.stderr b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.migrate.stderr
index 0f38f8e32..0f38f8e32 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.migrate.stderr
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.migrate.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.rs
index 1d90226a3..1d90226a3 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.stderr b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.stderr
index 4ef96cd95..4ef96cd95 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.stderr
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-74261.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-74261.rs
index 93ccb4268..93ccb4268 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-74261.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-74261.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-76956.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-76956.rs
index 583470080..583470080 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-76956.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-76956.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-80706.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-80706.rs
index 00a866f22..00a866f22 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-80706.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-80706.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-80956.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-80956.rs
index 6316ceea1..6316ceea1 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-80956.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-80956.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-81809.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-81809.rs
index f6ab9c203..f6ab9c203 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-81809.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-81809.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-85455.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-85455.rs
index c10a0888a..8aa29926d 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-85455.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-85455.rs
@@ -7,6 +7,7 @@ trait SomeTrait<'a> {
 fn give_me_ice<T>() {
     callee::<fn(&()) -> <T as SomeTrait<'_>>::Associated>();
     //~^ ERROR the trait bound `for<'a> T: SomeTrait<'a>` is not satisfied [E0277]
+    //~| ERROR the trait bound `for<'a> T: SomeTrait<'a>` is not satisfied [E0277]
 }
 
 fn callee<T: Fn<(&'static (),)>>() {
diff --git a/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-85455.stderr b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-85455.stderr
new file mode 100644
index 000000000..3240518fb
--- /dev/null
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-85455.stderr
@@ -0,0 +1,25 @@
+error[E0277]: the trait bound `for<'a> T: SomeTrait<'a>` is not satisfied
+  --> $DIR/issue-85455.rs:8:14
+   |
+LL |     callee::<fn(&()) -> <T as SomeTrait<'_>>::Associated>();
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `for<'a> SomeTrait<'a>` is not implemented for `T`
+   |
+help: consider restricting type parameter `T`
+   |
+LL | fn give_me_ice<T: for<'a> SomeTrait<'a>>() {
+   |                 +++++++++++++++++++++++
+
+error[E0277]: the trait bound `for<'a> T: SomeTrait<'a>` is not satisfied
+  --> $DIR/issue-85455.rs:8:5
+   |
+LL |     callee::<fn(&()) -> <T as SomeTrait<'_>>::Associated>();
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `for<'a> SomeTrait<'a>` is not implemented for `T`
+   |
+help: consider restricting type parameter `T`
+   |
+LL | fn give_me_ice<T: for<'a> SomeTrait<'a>>() {
+   |                 +++++++++++++++++++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-89118.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-89118.rs
index fffb54f86..fffb54f86 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-89118.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-89118.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-89118.stderr b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-89118.stderr
index 14fe1803b..62d0128fd 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-89118.stderr
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-89118.stderr
@@ -8,7 +8,9 @@ note: required for `Ctx<()>` to implement `for<'a> BufferUdpStateContext<&'a ()>
   --> $DIR/issue-89118.rs:5:23
    |
 LL | impl<B: BufferMut, C> BufferUdpStateContext<B> for C {}
-   |                       ^^^^^^^^^^^^^^^^^^^^^^^^     ^
+   |         ---------     ^^^^^^^^^^^^^^^^^^^^^^^^     ^
+   |         |
+   |         unsatisfied trait bound introduced here
 note: required by a bound in `StackContext`
   --> $DIR/issue-89118.rs:9:14
    |
@@ -28,7 +30,9 @@ note: required for `Ctx<()>` to implement `for<'a> BufferUdpStateContext<&'a ()>
   --> $DIR/issue-89118.rs:5:23
    |
 LL | impl<B: BufferMut, C> BufferUdpStateContext<B> for C {}
-   |                       ^^^^^^^^^^^^^^^^^^^^^^^^     ^
+   |         ---------     ^^^^^^^^^^^^^^^^^^^^^^^^     ^
+   |         |
+   |         unsatisfied trait bound introduced here
 note: required by a bound in `EthernetWorker`
   --> $DIR/issue-89118.rs:28:14
    |
@@ -48,7 +52,9 @@ note: required for `Ctx<()>` to implement `for<'a> BufferUdpStateContext<&'a ()>
   --> $DIR/issue-89118.rs:5:23
    |
 LL | impl<B: BufferMut, C> BufferUdpStateContext<B> for C {}
-   |                       ^^^^^^^^^^^^^^^^^^^^^^^^     ^
+   |         ---------     ^^^^^^^^^^^^^^^^^^^^^^^^     ^
+   |         |
+   |         unsatisfied trait bound introduced here
 note: required by a bound in `StackContext`
   --> $DIR/issue-89118.rs:9:14
    |
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-89436.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-89436.rs
index f7e467b37..f7e467b37 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-89436.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-89436.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90612.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90612.rs
index effc32945..effc32945 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90612.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90612.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90638.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90638.rs
index 628b5cba1..628b5cba1 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90638.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90638.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90875.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90875.rs
index ffd6857d8..ffd6857d8 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90875.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90875.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90950.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90950.rs
index ab9d9a7ce..ab9d9a7ce 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90950.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90950.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90950.stderr b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90950.stderr
index 6206b167b..6206b167b 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90950.stderr
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/issue-90950.stderr
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/norm-before-method-resolution.rs b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/norm-before-method-resolution.rs
index 7693b1182..7693b1182 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/norm-before-method-resolution.rs
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/norm-before-method-resolution.rs
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/norm-before-method-resolution.stderr b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/norm-before-method-resolution.stderr
index 51c964600..51c964600 100644
--- a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/norm-before-method-resolution.stderr
+++ b/tests/ui/higher-rank-trait-bounds/normalize-under-binder/norm-before-method-resolution.stderr
diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr b/tests/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr
index b7264c7e9..b7264c7e9 100644
--- a/src/test/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr
+++ b/tests/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr
diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr b/tests/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr
index 2355979b0..2355979b0 100644
--- a/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr
+++ b/tests/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr
diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr b/tests/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr
index a73c03feb..a73c03feb 100644
--- a/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr
+++ b/tests/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr
diff --git a/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr b/tests/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr
index 31d36d716..31d36d716 100644
--- a/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr
+++ b/tests/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr
diff --git a/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr b/tests/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr
index 269cde54c..269cde54c 100644
--- a/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr
+++ b/tests/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr
diff --git a/src/test/ui/hr-subtype/hr-subtype.rs b/tests/ui/hr-subtype/hr-subtype.rs
index c770e0de8..c770e0de8 100644
--- a/src/test/ui/hr-subtype/hr-subtype.rs
+++ b/tests/ui/hr-subtype/hr-subtype.rs
diff --git a/src/test/ui/hr-subtype/placeholder-pattern-fail.rs b/tests/ui/hr-subtype/placeholder-pattern-fail.rs
index bd4533e04..bd4533e04 100644
--- a/src/test/ui/hr-subtype/placeholder-pattern-fail.rs
+++ b/tests/ui/hr-subtype/placeholder-pattern-fail.rs
diff --git a/src/test/ui/hr-subtype/placeholder-pattern-fail.stderr b/tests/ui/hr-subtype/placeholder-pattern-fail.stderr
index 73b0a3173..73b0a3173 100644
--- a/src/test/ui/hr-subtype/placeholder-pattern-fail.stderr
+++ b/tests/ui/hr-subtype/placeholder-pattern-fail.stderr
diff --git a/src/test/ui/hr-subtype/placeholder-pattern.rs b/tests/ui/hr-subtype/placeholder-pattern.rs
index 061e66e54..061e66e54 100644
--- a/src/test/ui/hr-subtype/placeholder-pattern.rs
+++ b/tests/ui/hr-subtype/placeholder-pattern.rs
diff --git a/src/test/ui/hr-subtype/return-static.rs b/tests/ui/hr-subtype/return-static.rs
index 6455854f3..6455854f3 100644
--- a/src/test/ui/hr-subtype/return-static.rs
+++ b/tests/ui/hr-subtype/return-static.rs
diff --git a/src/test/ui/hygiene/arguments.rs b/tests/ui/hygiene/arguments.rs
index f0f732f4c..f0f732f4c 100644
--- a/src/test/ui/hygiene/arguments.rs
+++ b/tests/ui/hygiene/arguments.rs
diff --git a/src/test/ui/hygiene/arguments.stderr b/tests/ui/hygiene/arguments.stderr
index d072086e0..d072086e0 100644
--- a/src/test/ui/hygiene/arguments.stderr
+++ b/tests/ui/hygiene/arguments.stderr
diff --git a/src/test/ui/hygiene/assoc_item_ctxt.rs b/tests/ui/hygiene/assoc_item_ctxt.rs
index 65593d1d5..65593d1d5 100644
--- a/src/test/ui/hygiene/assoc_item_ctxt.rs
+++ b/tests/ui/hygiene/assoc_item_ctxt.rs
diff --git a/src/test/ui/hygiene/assoc_item_ctxt.stderr b/tests/ui/hygiene/assoc_item_ctxt.stderr
index d65716ec2..d65716ec2 100644
--- a/src/test/ui/hygiene/assoc_item_ctxt.stderr
+++ b/tests/ui/hygiene/assoc_item_ctxt.stderr
diff --git a/src/test/ui/hygiene/assoc_ty_bindings.rs b/tests/ui/hygiene/assoc_ty_bindings.rs
index 0567beab9..0567beab9 100644
--- a/src/test/ui/hygiene/assoc_ty_bindings.rs
+++ b/tests/ui/hygiene/assoc_ty_bindings.rs
diff --git a/src/test/ui/hygiene/auxiliary/codegen-attrs.rs b/tests/ui/hygiene/auxiliary/codegen-attrs.rs
index 74afedbeb..74afedbeb 100644
--- a/src/test/ui/hygiene/auxiliary/codegen-attrs.rs
+++ b/tests/ui/hygiene/auxiliary/codegen-attrs.rs
diff --git a/src/test/ui/hygiene/auxiliary/def-site-async-await.rs b/tests/ui/hygiene/auxiliary/def-site-async-await.rs
index f7e9b8013..f7e9b8013 100644
--- a/src/test/ui/hygiene/auxiliary/def-site-async-await.rs
+++ b/tests/ui/hygiene/auxiliary/def-site-async-await.rs
diff --git a/src/test/ui/hygiene/auxiliary/fields.rs b/tests/ui/hygiene/auxiliary/fields.rs
index 733d11a9e..733d11a9e 100644
--- a/src/test/ui/hygiene/auxiliary/fields.rs
+++ b/tests/ui/hygiene/auxiliary/fields.rs
diff --git a/src/test/ui/hygiene/auxiliary/intercrate.rs b/tests/ui/hygiene/auxiliary/intercrate.rs
index 068535885..068535885 100644
--- a/src/test/ui/hygiene/auxiliary/intercrate.rs
+++ b/tests/ui/hygiene/auxiliary/intercrate.rs
diff --git a/src/test/ui/hygiene/auxiliary/legacy_interaction.rs b/tests/ui/hygiene/auxiliary/legacy_interaction.rs
index 90d5243b7..90d5243b7 100644
--- a/src/test/ui/hygiene/auxiliary/legacy_interaction.rs
+++ b/tests/ui/hygiene/auxiliary/legacy_interaction.rs
diff --git a/src/test/ui/hygiene/auxiliary/local_inner_macros.rs b/tests/ui/hygiene/auxiliary/local_inner_macros.rs
index 4296ae2fd..4296ae2fd 100644
--- a/src/test/ui/hygiene/auxiliary/local_inner_macros.rs
+++ b/tests/ui/hygiene/auxiliary/local_inner_macros.rs
diff --git a/src/test/ui/hygiene/auxiliary/methods.rs b/tests/ui/hygiene/auxiliary/methods.rs
index 23b9c61cf..23b9c61cf 100644
--- a/src/test/ui/hygiene/auxiliary/methods.rs
+++ b/tests/ui/hygiene/auxiliary/methods.rs
diff --git a/src/test/ui/hygiene/auxiliary/my_crate.rs b/tests/ui/hygiene/auxiliary/my_crate.rs
index cdc6c27d8..cdc6c27d8 100644
--- a/src/test/ui/hygiene/auxiliary/my_crate.rs
+++ b/tests/ui/hygiene/auxiliary/my_crate.rs
diff --git a/src/test/ui/hygiene/auxiliary/needs_hygiene.rs b/tests/ui/hygiene/auxiliary/needs_hygiene.rs
index 3df6450fd..3df6450fd 100644
--- a/src/test/ui/hygiene/auxiliary/needs_hygiene.rs
+++ b/tests/ui/hygiene/auxiliary/needs_hygiene.rs
diff --git a/src/test/ui/hygiene/auxiliary/nested-dollar-crate.rs b/tests/ui/hygiene/auxiliary/nested-dollar-crate.rs
index e5caa0f9c..e5caa0f9c 100644
--- a/src/test/ui/hygiene/auxiliary/nested-dollar-crate.rs
+++ b/tests/ui/hygiene/auxiliary/nested-dollar-crate.rs
diff --git a/src/test/ui/hygiene/auxiliary/not-libstd.rs b/tests/ui/hygiene/auxiliary/not-libstd.rs
index babba293d..babba293d 100644
--- a/src/test/ui/hygiene/auxiliary/not-libstd.rs
+++ b/tests/ui/hygiene/auxiliary/not-libstd.rs
diff --git a/src/test/ui/hygiene/auxiliary/opaque-hygiene.rs b/tests/ui/hygiene/auxiliary/opaque-hygiene.rs
index 7730f91bd..7730f91bd 100644
--- a/src/test/ui/hygiene/auxiliary/opaque-hygiene.rs
+++ b/tests/ui/hygiene/auxiliary/opaque-hygiene.rs
diff --git a/src/test/ui/hygiene/auxiliary/pub_hygiene.rs b/tests/ui/hygiene/auxiliary/pub_hygiene.rs
index 47e76a629..47e76a629 100644
--- a/src/test/ui/hygiene/auxiliary/pub_hygiene.rs
+++ b/tests/ui/hygiene/auxiliary/pub_hygiene.rs
diff --git a/src/test/ui/hygiene/auxiliary/stdlib-prelude.rs b/tests/ui/hygiene/auxiliary/stdlib-prelude.rs
index 81b0b7faa..81b0b7faa 100644
--- a/src/test/ui/hygiene/auxiliary/stdlib-prelude.rs
+++ b/tests/ui/hygiene/auxiliary/stdlib-prelude.rs
diff --git a/src/test/ui/hygiene/auxiliary/transparent-basic.rs b/tests/ui/hygiene/auxiliary/transparent-basic.rs
index 37de27ee8..37de27ee8 100644
--- a/src/test/ui/hygiene/auxiliary/transparent-basic.rs
+++ b/tests/ui/hygiene/auxiliary/transparent-basic.rs
diff --git a/src/test/ui/hygiene/auxiliary/unhygienic_example.rs b/tests/ui/hygiene/auxiliary/unhygienic_example.rs
index 8e6e8f9b3..8e6e8f9b3 100644
--- a/src/test/ui/hygiene/auxiliary/unhygienic_example.rs
+++ b/tests/ui/hygiene/auxiliary/unhygienic_example.rs
diff --git a/src/test/ui/hygiene/auxiliary/use_by_macro.rs b/tests/ui/hygiene/auxiliary/use_by_macro.rs
index 791cf0358..791cf0358 100644
--- a/src/test/ui/hygiene/auxiliary/use_by_macro.rs
+++ b/tests/ui/hygiene/auxiliary/use_by_macro.rs
diff --git a/src/test/ui/hygiene/auxiliary/variants.rs b/tests/ui/hygiene/auxiliary/variants.rs
index dbfcce17d..dbfcce17d 100644
--- a/src/test/ui/hygiene/auxiliary/variants.rs
+++ b/tests/ui/hygiene/auxiliary/variants.rs
diff --git a/src/test/ui/hygiene/auxiliary/xcrate.rs b/tests/ui/hygiene/auxiliary/xcrate.rs
index f5a911f57..f5a911f57 100644
--- a/src/test/ui/hygiene/auxiliary/xcrate.rs
+++ b/tests/ui/hygiene/auxiliary/xcrate.rs
diff --git a/src/test/ui/hygiene/cross-crate-codegen-attrs.rs b/tests/ui/hygiene/cross-crate-codegen-attrs.rs
index af6b13343..af6b13343 100644
--- a/src/test/ui/hygiene/cross-crate-codegen-attrs.rs
+++ b/tests/ui/hygiene/cross-crate-codegen-attrs.rs
diff --git a/src/test/ui/hygiene/cross-crate-define-and-use.rs b/tests/ui/hygiene/cross-crate-define-and-use.rs
index 94f1adff6..94f1adff6 100644
--- a/src/test/ui/hygiene/cross-crate-define-and-use.rs
+++ b/tests/ui/hygiene/cross-crate-define-and-use.rs
diff --git a/src/test/ui/hygiene/cross-crate-fields.rs b/tests/ui/hygiene/cross-crate-fields.rs
index 1bcd64573..1bcd64573 100644
--- a/src/test/ui/hygiene/cross-crate-fields.rs
+++ b/tests/ui/hygiene/cross-crate-fields.rs
diff --git a/src/test/ui/hygiene/cross-crate-glob-hygiene.rs b/tests/ui/hygiene/cross-crate-glob-hygiene.rs
index de5576682..de5576682 100644
--- a/src/test/ui/hygiene/cross-crate-glob-hygiene.rs
+++ b/tests/ui/hygiene/cross-crate-glob-hygiene.rs
diff --git a/src/test/ui/hygiene/cross-crate-glob-hygiene.stderr b/tests/ui/hygiene/cross-crate-glob-hygiene.stderr
index 7369e77d0..7369e77d0 100644
--- a/src/test/ui/hygiene/cross-crate-glob-hygiene.stderr
+++ b/tests/ui/hygiene/cross-crate-glob-hygiene.stderr
diff --git a/src/test/ui/hygiene/cross-crate-methods.rs b/tests/ui/hygiene/cross-crate-methods.rs
index 0e6f57c33..0e6f57c33 100644
--- a/src/test/ui/hygiene/cross-crate-methods.rs
+++ b/tests/ui/hygiene/cross-crate-methods.rs
diff --git a/src/test/ui/hygiene/cross-crate-name-collision.rs b/tests/ui/hygiene/cross-crate-name-collision.rs
index 8f118782f..8f118782f 100644
--- a/src/test/ui/hygiene/cross-crate-name-collision.rs
+++ b/tests/ui/hygiene/cross-crate-name-collision.rs
diff --git a/src/test/ui/hygiene/cross-crate-name-hiding-2.rs b/tests/ui/hygiene/cross-crate-name-hiding-2.rs
index 3eacd775c..3eacd775c 100644
--- a/src/test/ui/hygiene/cross-crate-name-hiding-2.rs
+++ b/tests/ui/hygiene/cross-crate-name-hiding-2.rs
diff --git a/src/test/ui/hygiene/cross-crate-name-hiding-2.stderr b/tests/ui/hygiene/cross-crate-name-hiding-2.stderr
index 46314cdd5..46314cdd5 100644
--- a/src/test/ui/hygiene/cross-crate-name-hiding-2.stderr
+++ b/tests/ui/hygiene/cross-crate-name-hiding-2.stderr
diff --git a/src/test/ui/hygiene/cross-crate-name-hiding.rs b/tests/ui/hygiene/cross-crate-name-hiding.rs
index dd76ecc57..dd76ecc57 100644
--- a/src/test/ui/hygiene/cross-crate-name-hiding.rs
+++ b/tests/ui/hygiene/cross-crate-name-hiding.rs
diff --git a/src/test/ui/hygiene/cross-crate-name-hiding.stderr b/tests/ui/hygiene/cross-crate-name-hiding.stderr
index f8840c8f8..f8840c8f8 100644
--- a/src/test/ui/hygiene/cross-crate-name-hiding.stderr
+++ b/tests/ui/hygiene/cross-crate-name-hiding.stderr
diff --git a/src/test/ui/hygiene/cross-crate-redefine.rs b/tests/ui/hygiene/cross-crate-redefine.rs
index 3cb06b4ba..3cb06b4ba 100644
--- a/src/test/ui/hygiene/cross-crate-redefine.rs
+++ b/tests/ui/hygiene/cross-crate-redefine.rs
diff --git a/src/test/ui/hygiene/cross-crate-redefine.stderr b/tests/ui/hygiene/cross-crate-redefine.stderr
index 4f1419de4..4f1419de4 100644
--- a/src/test/ui/hygiene/cross-crate-redefine.stderr
+++ b/tests/ui/hygiene/cross-crate-redefine.stderr
diff --git a/src/test/ui/hygiene/cross-crate-variants.rs b/tests/ui/hygiene/cross-crate-variants.rs
index efc73a21f..efc73a21f 100644
--- a/src/test/ui/hygiene/cross-crate-variants.rs
+++ b/tests/ui/hygiene/cross-crate-variants.rs
diff --git a/src/test/ui/hygiene/dollar-crate-modern.rs b/tests/ui/hygiene/dollar-crate-modern.rs
index eb176fed8..eb176fed8 100644
--- a/src/test/ui/hygiene/dollar-crate-modern.rs
+++ b/tests/ui/hygiene/dollar-crate-modern.rs
diff --git a/src/test/ui/hygiene/duplicate_lifetimes.rs b/tests/ui/hygiene/duplicate_lifetimes.rs
index 8971fb626..8971fb626 100644
--- a/src/test/ui/hygiene/duplicate_lifetimes.rs
+++ b/tests/ui/hygiene/duplicate_lifetimes.rs
diff --git a/src/test/ui/hygiene/duplicate_lifetimes.stderr b/tests/ui/hygiene/duplicate_lifetimes.stderr
index 9f1a75147..9f1a75147 100644
--- a/src/test/ui/hygiene/duplicate_lifetimes.stderr
+++ b/tests/ui/hygiene/duplicate_lifetimes.stderr
diff --git a/src/test/ui/hygiene/eager-from-opaque-2.rs b/tests/ui/hygiene/eager-from-opaque-2.rs
index 220e55267..220e55267 100644
--- a/src/test/ui/hygiene/eager-from-opaque-2.rs
+++ b/tests/ui/hygiene/eager-from-opaque-2.rs
diff --git a/src/test/ui/hygiene/eager-from-opaque.rs b/tests/ui/hygiene/eager-from-opaque.rs
index 6f3215dd6..6f3215dd6 100644
--- a/src/test/ui/hygiene/eager-from-opaque.rs
+++ b/tests/ui/hygiene/eager-from-opaque.rs
diff --git a/src/test/ui/hygiene/expansion-info-reset.rs b/tests/ui/hygiene/expansion-info-reset.rs
index fa5f71212..fa5f71212 100644
--- a/src/test/ui/hygiene/expansion-info-reset.rs
+++ b/tests/ui/hygiene/expansion-info-reset.rs
diff --git a/src/test/ui/hygiene/expansion-info-reset.stderr b/tests/ui/hygiene/expansion-info-reset.stderr
index 64d27e064..64d27e064 100644
--- a/src/test/ui/hygiene/expansion-info-reset.stderr
+++ b/tests/ui/hygiene/expansion-info-reset.stderr
diff --git a/src/test/ui/hygiene/extern-prelude-from-opaque-fail.rs b/tests/ui/hygiene/extern-prelude-from-opaque-fail.rs
index 571017df4..571017df4 100644
--- a/src/test/ui/hygiene/extern-prelude-from-opaque-fail.rs
+++ b/tests/ui/hygiene/extern-prelude-from-opaque-fail.rs
diff --git a/src/test/ui/hygiene/extern-prelude-from-opaque-fail.stderr b/tests/ui/hygiene/extern-prelude-from-opaque-fail.stderr
index e89c19b58..f1f4caee3 100644
--- a/src/test/ui/hygiene/extern-prelude-from-opaque-fail.stderr
+++ b/tests/ui/hygiene/extern-prelude-from-opaque-fail.stderr
@@ -2,10 +2,7 @@ error[E0432]: unresolved import `my_core`
   --> $DIR/extern-prelude-from-opaque-fail.rs:20:9
    |
 LL |     use my_core;
-   |         ^^^^^^^
-   |         |
-   |         no `my_core` in the root
-   |         help: a similar name exists in the module: `my_core`
+   |         ^^^^^^^ no `my_core` in the root
 
 error[E0432]: unresolved import `my_core`
   --> $DIR/extern-prelude-from-opaque-fail.rs:7:13
diff --git a/src/test/ui/hygiene/fields-definition.rs b/tests/ui/hygiene/fields-definition.rs
index 173c357bd..173c357bd 100644
--- a/src/test/ui/hygiene/fields-definition.rs
+++ b/tests/ui/hygiene/fields-definition.rs
diff --git a/src/test/ui/hygiene/fields-definition.stderr b/tests/ui/hygiene/fields-definition.stderr
index 9d091cedd..9d091cedd 100644
--- a/src/test/ui/hygiene/fields-definition.stderr
+++ b/tests/ui/hygiene/fields-definition.stderr
diff --git a/src/test/ui/hygiene/fields-move.rs b/tests/ui/hygiene/fields-move.rs
index 401ad97e3..401ad97e3 100644
--- a/src/test/ui/hygiene/fields-move.rs
+++ b/tests/ui/hygiene/fields-move.rs
diff --git a/src/test/ui/hygiene/fields-move.stderr b/tests/ui/hygiene/fields-move.stderr
index b5b507c7d..b5b507c7d 100644
--- a/src/test/ui/hygiene/fields-move.stderr
+++ b/tests/ui/hygiene/fields-move.stderr
diff --git a/src/test/ui/hygiene/fields-numeric-borrowck.rs b/tests/ui/hygiene/fields-numeric-borrowck.rs
index 9536babc2..9536babc2 100644
--- a/src/test/ui/hygiene/fields-numeric-borrowck.rs
+++ b/tests/ui/hygiene/fields-numeric-borrowck.rs
diff --git a/src/test/ui/hygiene/fields-numeric-borrowck.stderr b/tests/ui/hygiene/fields-numeric-borrowck.stderr
index bc13aa62f..bc13aa62f 100644
--- a/src/test/ui/hygiene/fields-numeric-borrowck.stderr
+++ b/tests/ui/hygiene/fields-numeric-borrowck.stderr
diff --git a/src/test/ui/hygiene/fields.rs b/tests/ui/hygiene/fields.rs
index 7a417b46f..7a417b46f 100644
--- a/src/test/ui/hygiene/fields.rs
+++ b/tests/ui/hygiene/fields.rs
diff --git a/src/test/ui/hygiene/fields.stderr b/tests/ui/hygiene/fields.stderr
index 978120b1f..978120b1f 100644
--- a/src/test/ui/hygiene/fields.stderr
+++ b/tests/ui/hygiene/fields.stderr
diff --git a/src/test/ui/hygiene/for-loop.rs b/tests/ui/hygiene/for-loop.rs
index 2e5ae43a9..2e5ae43a9 100644
--- a/src/test/ui/hygiene/for-loop.rs
+++ b/tests/ui/hygiene/for-loop.rs
diff --git a/src/test/ui/hygiene/for-loop.stderr b/tests/ui/hygiene/for-loop.stderr
index 932c951e7..932c951e7 100644
--- a/src/test/ui/hygiene/for-loop.stderr
+++ b/tests/ui/hygiene/for-loop.stderr
diff --git a/src/test/ui/hygiene/format-args.rs b/tests/ui/hygiene/format-args.rs
index d74889b95..d74889b95 100644
--- a/src/test/ui/hygiene/format-args.rs
+++ b/tests/ui/hygiene/format-args.rs
diff --git a/src/test/ui/hygiene/generate-mod.rs b/tests/ui/hygiene/generate-mod.rs
index 882629354..882629354 100644
--- a/src/test/ui/hygiene/generate-mod.rs
+++ b/tests/ui/hygiene/generate-mod.rs
diff --git a/src/test/ui/hygiene/generate-mod.stderr b/tests/ui/hygiene/generate-mod.stderr
index 32a2e145c..32a2e145c 100644
--- a/src/test/ui/hygiene/generate-mod.stderr
+++ b/tests/ui/hygiene/generate-mod.stderr
diff --git a/src/test/ui/hygiene/generic_params.rs b/tests/ui/hygiene/generic_params.rs
index 3b6216c3e..3b6216c3e 100644
--- a/src/test/ui/hygiene/generic_params.rs
+++ b/tests/ui/hygiene/generic_params.rs
diff --git a/src/test/ui/hygiene/globs.rs b/tests/ui/hygiene/globs.rs
index a3f466ef4..a3f466ef4 100644
--- a/src/test/ui/hygiene/globs.rs
+++ b/tests/ui/hygiene/globs.rs
diff --git a/src/test/ui/hygiene/globs.stderr b/tests/ui/hygiene/globs.stderr
index 1f2a96a4c..c01901be5 100644
--- a/src/test/ui/hygiene/globs.stderr
+++ b/tests/ui/hygiene/globs.stderr
@@ -51,7 +51,7 @@ LL | n!(f);
 LL |         n!(f);
    |            ^ not found in this scope
    |
-   = note: consider importing this function:
+   = help: consider importing this function:
            foo::f
    = note: this error originates in the macro `n` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -64,7 +64,7 @@ LL | n!(f);
 LL |                 f
    |                 ^ not found in this scope
    |
-   = note: consider importing this function:
+   = help: consider importing this function:
            foo::f
    = note: this error originates in the macro `n` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/hygiene/hir-res-hygiene.rs b/tests/ui/hygiene/hir-res-hygiene.rs
index c26cf5fdb..c26cf5fdb 100644
--- a/src/test/ui/hygiene/hir-res-hygiene.rs
+++ b/tests/ui/hygiene/hir-res-hygiene.rs
diff --git a/src/test/ui/hygiene/hygiene-dodging-1.rs b/tests/ui/hygiene/hygiene-dodging-1.rs
index 69e47e82b..69e47e82b 100644
--- a/src/test/ui/hygiene/hygiene-dodging-1.rs
+++ b/tests/ui/hygiene/hygiene-dodging-1.rs
diff --git a/src/test/ui/hygiene/hygiene.rs b/tests/ui/hygiene/hygiene.rs
index fb351cf0f..fb351cf0f 100644
--- a/src/test/ui/hygiene/hygiene.rs
+++ b/tests/ui/hygiene/hygiene.rs
diff --git a/src/test/ui/hygiene/hygienic-label-1.rs b/tests/ui/hygiene/hygienic-label-1.rs
index a06d9255a..a06d9255a 100644
--- a/src/test/ui/hygiene/hygienic-label-1.rs
+++ b/tests/ui/hygiene/hygienic-label-1.rs
diff --git a/src/test/ui/hygiene/hygienic-label-1.stderr b/tests/ui/hygiene/hygienic-label-1.stderr
index deb6a2059..deb6a2059 100644
--- a/src/test/ui/hygiene/hygienic-label-1.stderr
+++ b/tests/ui/hygiene/hygienic-label-1.stderr
diff --git a/src/test/ui/hygiene/hygienic-label-2.rs b/tests/ui/hygiene/hygienic-label-2.rs
index 43e01a934..43e01a934 100644
--- a/src/test/ui/hygiene/hygienic-label-2.rs
+++ b/tests/ui/hygiene/hygienic-label-2.rs
diff --git a/src/test/ui/hygiene/hygienic-label-2.stderr b/tests/ui/hygiene/hygienic-label-2.stderr
index f23e741de..f23e741de 100644
--- a/src/test/ui/hygiene/hygienic-label-2.stderr
+++ b/tests/ui/hygiene/hygienic-label-2.stderr
diff --git a/src/test/ui/hygiene/hygienic-label-3.rs b/tests/ui/hygiene/hygienic-label-3.rs
index ab0559e1b..ab0559e1b 100644
--- a/src/test/ui/hygiene/hygienic-label-3.rs
+++ b/tests/ui/hygiene/hygienic-label-3.rs
diff --git a/src/test/ui/hygiene/hygienic-label-3.stderr b/tests/ui/hygiene/hygienic-label-3.stderr
index cf7f78a99..cf7f78a99 100644
--- a/src/test/ui/hygiene/hygienic-label-3.stderr
+++ b/tests/ui/hygiene/hygienic-label-3.stderr
diff --git a/src/test/ui/hygiene/hygienic-label-4.rs b/tests/ui/hygiene/hygienic-label-4.rs
index a7e1f0e78..a7e1f0e78 100644
--- a/src/test/ui/hygiene/hygienic-label-4.rs
+++ b/tests/ui/hygiene/hygienic-label-4.rs
diff --git a/src/test/ui/hygiene/hygienic-label-4.stderr b/tests/ui/hygiene/hygienic-label-4.stderr
index 1c93da02f..1c93da02f 100644
--- a/src/test/ui/hygiene/hygienic-label-4.stderr
+++ b/tests/ui/hygiene/hygienic-label-4.stderr
diff --git a/src/test/ui/hygiene/hygienic-labels-in-let.rs b/tests/ui/hygiene/hygienic-labels-in-let.rs
index 8cf66f31a..8cf66f31a 100644
--- a/src/test/ui/hygiene/hygienic-labels-in-let.rs
+++ b/tests/ui/hygiene/hygienic-labels-in-let.rs
diff --git a/src/test/ui/hygiene/hygienic-labels.rs b/tests/ui/hygiene/hygienic-labels.rs
index 6a7d81f04..6a7d81f04 100644
--- a/src/test/ui/hygiene/hygienic-labels.rs
+++ b/tests/ui/hygiene/hygienic-labels.rs
diff --git a/src/test/ui/hygiene/impl_items-2.rs b/tests/ui/hygiene/impl_items-2.rs
index 465e444ae..465e444ae 100644
--- a/src/test/ui/hygiene/impl_items-2.rs
+++ b/tests/ui/hygiene/impl_items-2.rs
diff --git a/src/test/ui/hygiene/impl_items-2.stderr b/tests/ui/hygiene/impl_items-2.stderr
index 3c0ffeb10..3c0ffeb10 100644
--- a/src/test/ui/hygiene/impl_items-2.stderr
+++ b/tests/ui/hygiene/impl_items-2.stderr
diff --git a/src/test/ui/hygiene/impl_items.rs b/tests/ui/hygiene/impl_items.rs
index ddb25c06b..ddb25c06b 100644
--- a/src/test/ui/hygiene/impl_items.rs
+++ b/tests/ui/hygiene/impl_items.rs
diff --git a/src/test/ui/hygiene/impl_items.stderr b/tests/ui/hygiene/impl_items.stderr
index 46a250038..46a250038 100644
--- a/src/test/ui/hygiene/impl_items.stderr
+++ b/tests/ui/hygiene/impl_items.stderr
diff --git a/src/test/ui/hygiene/intercrate.rs b/tests/ui/hygiene/intercrate.rs
index d9b5b789e..d9b5b789e 100644
--- a/src/test/ui/hygiene/intercrate.rs
+++ b/tests/ui/hygiene/intercrate.rs
diff --git a/src/test/ui/hygiene/intercrate.stderr b/tests/ui/hygiene/intercrate.stderr
index 91358b279..91358b279 100644
--- a/src/test/ui/hygiene/intercrate.stderr
+++ b/tests/ui/hygiene/intercrate.stderr
diff --git a/src/test/ui/issues/issue-15221.rs b/tests/ui/hygiene/issue-15221.rs
index 4b8319a83..4b8319a83 100644
--- a/src/test/ui/issues/issue-15221.rs
+++ b/tests/ui/hygiene/issue-15221.rs
diff --git a/src/test/ui/hygiene/issue-32922.rs b/tests/ui/hygiene/issue-32922.rs
index 54ec44a1c..54ec44a1c 100644
--- a/src/test/ui/hygiene/issue-32922.rs
+++ b/tests/ui/hygiene/issue-32922.rs
diff --git a/src/test/ui/hygiene/issue-40847.rs b/tests/ui/hygiene/issue-40847.rs
index 087b40ad6..087b40ad6 100644
--- a/src/test/ui/hygiene/issue-40847.rs
+++ b/tests/ui/hygiene/issue-40847.rs
diff --git a/src/test/ui/hygiene/issue-44128.rs b/tests/ui/hygiene/issue-44128.rs
index 5e03bdb8c..5e03bdb8c 100644
--- a/src/test/ui/hygiene/issue-44128.rs
+++ b/tests/ui/hygiene/issue-44128.rs
diff --git a/src/test/ui/hygiene/issue-47311.rs b/tests/ui/hygiene/issue-47311.rs
index 5c2379a8a..5c2379a8a 100644
--- a/src/test/ui/hygiene/issue-47311.rs
+++ b/tests/ui/hygiene/issue-47311.rs
diff --git a/src/test/ui/hygiene/issue-47312.rs b/tests/ui/hygiene/issue-47312.rs
index bbcb3a7f3..bbcb3a7f3 100644
--- a/src/test/ui/hygiene/issue-47312.rs
+++ b/tests/ui/hygiene/issue-47312.rs
diff --git a/src/test/ui/hygiene/issue-61574-const-parameters.rs b/tests/ui/hygiene/issue-61574-const-parameters.rs
index 3634ee004..3634ee004 100644
--- a/src/test/ui/hygiene/issue-61574-const-parameters.rs
+++ b/tests/ui/hygiene/issue-61574-const-parameters.rs
diff --git a/src/test/ui/hygiene/issue-77523-def-site-async-await.rs b/tests/ui/hygiene/issue-77523-def-site-async-await.rs
index 2af60ff6f..2af60ff6f 100644
--- a/src/test/ui/hygiene/issue-77523-def-site-async-await.rs
+++ b/tests/ui/hygiene/issue-77523-def-site-async-await.rs
diff --git a/src/test/ui/hygiene/items.rs b/tests/ui/hygiene/items.rs
index 1c625a972..1c625a972 100644
--- a/src/test/ui/hygiene/items.rs
+++ b/tests/ui/hygiene/items.rs
diff --git a/src/test/ui/hygiene/lambda-var-hygiene.rs b/tests/ui/hygiene/lambda-var-hygiene.rs
index bf06765e5..bf06765e5 100644
--- a/src/test/ui/hygiene/lambda-var-hygiene.rs
+++ b/tests/ui/hygiene/lambda-var-hygiene.rs
diff --git a/src/test/ui/hygiene/legacy_interaction.rs b/tests/ui/hygiene/legacy_interaction.rs
index 52008eed5..52008eed5 100644
--- a/src/test/ui/hygiene/legacy_interaction.rs
+++ b/tests/ui/hygiene/legacy_interaction.rs
diff --git a/src/test/ui/hygiene/lexical.rs b/tests/ui/hygiene/lexical.rs
index 3d25c7209..3d25c7209 100644
--- a/src/test/ui/hygiene/lexical.rs
+++ b/tests/ui/hygiene/lexical.rs
diff --git a/src/test/ui/hygiene/local_inner_macros.rs b/tests/ui/hygiene/local_inner_macros.rs
index 71ffcac40..71ffcac40 100644
--- a/src/test/ui/hygiene/local_inner_macros.rs
+++ b/tests/ui/hygiene/local_inner_macros.rs
diff --git a/src/test/ui/hygiene/macro-metavars-legacy.rs b/tests/ui/hygiene/macro-metavars-legacy.rs
index 09070f0f5..09070f0f5 100644
--- a/src/test/ui/hygiene/macro-metavars-legacy.rs
+++ b/tests/ui/hygiene/macro-metavars-legacy.rs
diff --git a/src/test/ui/hygiene/macro-metavars-transparent.rs b/tests/ui/hygiene/macro-metavars-transparent.rs
index e475b5728..e475b5728 100644
--- a/src/test/ui/hygiene/macro-metavars-transparent.rs
+++ b/tests/ui/hygiene/macro-metavars-transparent.rs
diff --git a/src/test/ui/hygiene/missing-self-diag.rs b/tests/ui/hygiene/missing-self-diag.rs
index f934f793c..f934f793c 100644
--- a/src/test/ui/hygiene/missing-self-diag.rs
+++ b/tests/ui/hygiene/missing-self-diag.rs
diff --git a/src/test/ui/hygiene/missing-self-diag.stderr b/tests/ui/hygiene/missing-self-diag.stderr
index 690bcd032..690bcd032 100644
--- a/src/test/ui/hygiene/missing-self-diag.stderr
+++ b/tests/ui/hygiene/missing-self-diag.stderr
diff --git a/src/test/ui/hygiene/nested-dollar-crate.rs b/tests/ui/hygiene/nested-dollar-crate.rs
index e8703bc77..e8703bc77 100644
--- a/src/test/ui/hygiene/nested-dollar-crate.rs
+++ b/tests/ui/hygiene/nested-dollar-crate.rs
diff --git a/src/test/ui/hygiene/nested_macro_privacy.rs b/tests/ui/hygiene/nested_macro_privacy.rs
index dea9101ee..dea9101ee 100644
--- a/src/test/ui/hygiene/nested_macro_privacy.rs
+++ b/tests/ui/hygiene/nested_macro_privacy.rs
diff --git a/src/test/ui/hygiene/nested_macro_privacy.stderr b/tests/ui/hygiene/nested_macro_privacy.stderr
index 1d11cd0f5..1d11cd0f5 100644
--- a/src/test/ui/hygiene/nested_macro_privacy.stderr
+++ b/tests/ui/hygiene/nested_macro_privacy.stderr
diff --git a/src/test/ui/hygiene/no_implicit_prelude-2018.rs b/tests/ui/hygiene/no_implicit_prelude-2018.rs
index 83ca28167..83ca28167 100644
--- a/src/test/ui/hygiene/no_implicit_prelude-2018.rs
+++ b/tests/ui/hygiene/no_implicit_prelude-2018.rs
diff --git a/src/test/ui/hygiene/no_implicit_prelude-2018.stderr b/tests/ui/hygiene/no_implicit_prelude-2018.stderr
index 02ddc391f..3f31b041b 100644
--- a/src/test/ui/hygiene/no_implicit_prelude-2018.stderr
+++ b/tests/ui/hygiene/no_implicit_prelude-2018.stderr
@@ -4,7 +4,7 @@ error: cannot find macro `print` in this scope
 LL |         print!();
    |         ^^^^^
    |
-   = note: consider importing this macro:
+   = help: consider importing this macro:
            std::print
 
 error: aborting due to previous error
diff --git a/src/test/ui/hygiene/no_implicit_prelude-2021.rs b/tests/ui/hygiene/no_implicit_prelude-2021.rs
index 0fe9ae56c..0fe9ae56c 100644
--- a/src/test/ui/hygiene/no_implicit_prelude-2021.rs
+++ b/tests/ui/hygiene/no_implicit_prelude-2021.rs
diff --git a/src/test/ui/hygiene/no_implicit_prelude.rs b/tests/ui/hygiene/no_implicit_prelude.rs
index e23826e9d..e23826e9d 100644
--- a/src/test/ui/hygiene/no_implicit_prelude.rs
+++ b/tests/ui/hygiene/no_implicit_prelude.rs
diff --git a/src/test/ui/hygiene/no_implicit_prelude.stderr b/tests/ui/hygiene/no_implicit_prelude.stderr
index c48c84035..c48c84035 100644
--- a/src/test/ui/hygiene/no_implicit_prelude.stderr
+++ b/tests/ui/hygiene/no_implicit_prelude.stderr
diff --git a/src/test/ui/hygiene/panic-location.rs b/tests/ui/hygiene/panic-location.rs
index 5cf169dfb..5cf169dfb 100644
--- a/src/test/ui/hygiene/panic-location.rs
+++ b/tests/ui/hygiene/panic-location.rs
diff --git a/src/test/ui/hygiene/panic-location.run.stderr b/tests/ui/hygiene/panic-location.run.stderr
index 0b23b1cc2..0b23b1cc2 100644
--- a/src/test/ui/hygiene/panic-location.run.stderr
+++ b/tests/ui/hygiene/panic-location.run.stderr
diff --git a/src/test/ui/hygiene/pattern-macro.rs b/tests/ui/hygiene/pattern-macro.rs
index e5d6a3aa1..e5d6a3aa1 100644
--- a/src/test/ui/hygiene/pattern-macro.rs
+++ b/tests/ui/hygiene/pattern-macro.rs
diff --git a/src/test/ui/hygiene/pattern-macro.stderr b/tests/ui/hygiene/pattern-macro.stderr
index edd05916e..edd05916e 100644
--- a/src/test/ui/hygiene/pattern-macro.stderr
+++ b/tests/ui/hygiene/pattern-macro.stderr
diff --git a/src/test/ui/hygiene/prelude-import-hygiene.rs b/tests/ui/hygiene/prelude-import-hygiene.rs
index 51e7bed65..51e7bed65 100644
--- a/src/test/ui/hygiene/prelude-import-hygiene.rs
+++ b/tests/ui/hygiene/prelude-import-hygiene.rs
diff --git a/src/test/ui/hygiene/privacy-early.rs b/tests/ui/hygiene/privacy-early.rs
index 58fc74d65..58fc74d65 100644
--- a/src/test/ui/hygiene/privacy-early.rs
+++ b/tests/ui/hygiene/privacy-early.rs
diff --git a/src/test/ui/hygiene/privacy-early.stderr b/tests/ui/hygiene/privacy-early.stderr
index 0375ed56d..0375ed56d 100644
--- a/src/test/ui/hygiene/privacy-early.stderr
+++ b/tests/ui/hygiene/privacy-early.stderr
diff --git a/src/test/ui/hygiene/privacy.rs b/tests/ui/hygiene/privacy.rs
index 78d255553..78d255553 100644
--- a/src/test/ui/hygiene/privacy.rs
+++ b/tests/ui/hygiene/privacy.rs
diff --git a/src/test/ui/hygiene/privacy.stderr b/tests/ui/hygiene/privacy.stderr
index 70a24304d..70a24304d 100644
--- a/src/test/ui/hygiene/privacy.stderr
+++ b/tests/ui/hygiene/privacy.stderr
diff --git a/src/test/ui/hygiene/rustc-macro-transparency.rs b/tests/ui/hygiene/rustc-macro-transparency.rs
index 5f36993af..5f36993af 100644
--- a/src/test/ui/hygiene/rustc-macro-transparency.rs
+++ b/tests/ui/hygiene/rustc-macro-transparency.rs
diff --git a/src/test/ui/hygiene/rustc-macro-transparency.stderr b/tests/ui/hygiene/rustc-macro-transparency.stderr
index 1d2a1e124..1d2a1e124 100644
--- a/src/test/ui/hygiene/rustc-macro-transparency.stderr
+++ b/tests/ui/hygiene/rustc-macro-transparency.stderr
diff --git a/src/test/ui/hygiene/specialization.rs b/tests/ui/hygiene/specialization.rs
index 656aa880a..656aa880a 100644
--- a/src/test/ui/hygiene/specialization.rs
+++ b/tests/ui/hygiene/specialization.rs
diff --git a/src/test/ui/hygiene/stdlib-prelude-from-opaque-early.rs b/tests/ui/hygiene/stdlib-prelude-from-opaque-early.rs
index c8c5c72bf..c8c5c72bf 100644
--- a/src/test/ui/hygiene/stdlib-prelude-from-opaque-early.rs
+++ b/tests/ui/hygiene/stdlib-prelude-from-opaque-early.rs
diff --git a/src/test/ui/hygiene/stdlib-prelude-from-opaque-late.rs b/tests/ui/hygiene/stdlib-prelude-from-opaque-late.rs
index cf65de2bc..cf65de2bc 100644
--- a/src/test/ui/hygiene/stdlib-prelude-from-opaque-late.rs
+++ b/tests/ui/hygiene/stdlib-prelude-from-opaque-late.rs
diff --git a/src/test/ui/hygiene/thread-local-not-in-prelude.rs b/tests/ui/hygiene/thread-local-not-in-prelude.rs
index e5ed09c60..e5ed09c60 100644
--- a/src/test/ui/hygiene/thread-local-not-in-prelude.rs
+++ b/tests/ui/hygiene/thread-local-not-in-prelude.rs
diff --git a/src/test/ui/hygiene/trait_items-2.rs b/tests/ui/hygiene/trait_items-2.rs
index 39edfc37d..39edfc37d 100644
--- a/src/test/ui/hygiene/trait_items-2.rs
+++ b/tests/ui/hygiene/trait_items-2.rs
diff --git a/src/test/ui/hygiene/trait_items.rs b/tests/ui/hygiene/trait_items.rs
index 15c4acbc9..15c4acbc9 100644
--- a/src/test/ui/hygiene/trait_items.rs
+++ b/tests/ui/hygiene/trait_items.rs
diff --git a/src/test/ui/hygiene/trait_items.stderr b/tests/ui/hygiene/trait_items.stderr
index 80bdbe0e2..80bdbe0e2 100644
--- a/src/test/ui/hygiene/trait_items.stderr
+++ b/tests/ui/hygiene/trait_items.stderr
diff --git a/src/test/ui/hygiene/traits-in-scope.rs b/tests/ui/hygiene/traits-in-scope.rs
index 548bb226b..548bb226b 100644
--- a/src/test/ui/hygiene/traits-in-scope.rs
+++ b/tests/ui/hygiene/traits-in-scope.rs
diff --git a/src/test/ui/hygiene/transparent-basic.rs b/tests/ui/hygiene/transparent-basic.rs
index bfa1713e4..bfa1713e4 100644
--- a/src/test/ui/hygiene/transparent-basic.rs
+++ b/tests/ui/hygiene/transparent-basic.rs
diff --git a/src/test/ui/hygiene/unpretty-debug.rs b/tests/ui/hygiene/unpretty-debug.rs
index 6e936bb3d..6e936bb3d 100644
--- a/src/test/ui/hygiene/unpretty-debug.rs
+++ b/tests/ui/hygiene/unpretty-debug.rs
diff --git a/src/test/ui/hygiene/unpretty-debug.stdout b/tests/ui/hygiene/unpretty-debug.stdout
index 51c21043d..51c21043d 100644
--- a/src/test/ui/hygiene/unpretty-debug.stdout
+++ b/tests/ui/hygiene/unpretty-debug.stdout
diff --git a/src/test/ui/hygiene/wrap_unhygienic_example.rs b/tests/ui/hygiene/wrap_unhygienic_example.rs
index 50c6b35ab..50c6b35ab 100644
--- a/src/test/ui/hygiene/wrap_unhygienic_example.rs
+++ b/tests/ui/hygiene/wrap_unhygienic_example.rs
diff --git a/src/test/ui/hygiene/xcrate.rs b/tests/ui/hygiene/xcrate.rs
index 6981ce3f6..6981ce3f6 100644
--- a/src/test/ui/hygiene/xcrate.rs
+++ b/tests/ui/hygiene/xcrate.rs
diff --git a/tests/ui/illegal-sized-bound/mutability-mismatch-arg.fixed b/tests/ui/illegal-sized-bound/mutability-mismatch-arg.fixed
new file mode 100644
index 000000000..74f3c887f
--- /dev/null
+++ b/tests/ui/illegal-sized-bound/mutability-mismatch-arg.fixed
@@ -0,0 +1,9 @@
+// run-rustfix
+fn test(t: &mut dyn Iterator<Item=&u64>) -> u64 {
+     *t.min().unwrap() //~ ERROR the `min` method cannot be invoked on
+}
+
+fn main() {
+     let array = [0u64];
+     test(&mut array.iter());
+}
diff --git a/tests/ui/illegal-sized-bound/mutability-mismatch-arg.rs b/tests/ui/illegal-sized-bound/mutability-mismatch-arg.rs
new file mode 100644
index 000000000..3b02c5a5a
--- /dev/null
+++ b/tests/ui/illegal-sized-bound/mutability-mismatch-arg.rs
@@ -0,0 +1,9 @@
+// run-rustfix
+fn test(t: &dyn Iterator<Item=&u64>) -> u64 {
+     *t.min().unwrap() //~ ERROR the `min` method cannot be invoked on
+}
+
+fn main() {
+     let array = [0u64];
+     test(&mut array.iter());
+}
diff --git a/tests/ui/illegal-sized-bound/mutability-mismatch-arg.stderr b/tests/ui/illegal-sized-bound/mutability-mismatch-arg.stderr
new file mode 100644
index 000000000..89613bd5c
--- /dev/null
+++ b/tests/ui/illegal-sized-bound/mutability-mismatch-arg.stderr
@@ -0,0 +1,13 @@
+error: the `min` method cannot be invoked on `&dyn Iterator<Item = &u64>`
+  --> $DIR/mutability-mismatch-arg.rs:3:9
+   |
+LL |      *t.min().unwrap()
+   |         ^^^
+   |
+help: you need `&mut dyn Iterator<Item = &u64>` instead of `&dyn Iterator<Item = &u64>`
+   |
+LL | fn test(t: &mut dyn Iterator<Item=&u64>) -> u64 {
+   |             +++
+
+error: aborting due to previous error
+
diff --git a/tests/ui/illegal-sized-bound/mutability-mismatch.rs b/tests/ui/illegal-sized-bound/mutability-mismatch.rs
new file mode 100644
index 000000000..01bb3537c
--- /dev/null
+++ b/tests/ui/illegal-sized-bound/mutability-mismatch.rs
@@ -0,0 +1,32 @@
+struct MutType;
+
+pub trait MutTrait {
+    fn function(&mut self)
+    where
+        Self: Sized;
+}
+
+impl MutTrait for MutType {
+    fn function(&mut self) {}
+}
+
+struct Type;
+
+pub trait Trait {
+    fn function(&self)
+    where
+        Self: Sized;
+}
+
+impl Trait for Type {
+    fn function(&self) {}
+}
+
+fn main() {
+    (&MutType as &dyn MutTrait).function();
+    //~^ ERROR the `function` method cannot be invoked on `&dyn MutTrait`
+    //~| HELP you need `&mut dyn MutTrait` instead of `&dyn MutTrait`
+    (&mut Type as &mut dyn Trait).function();
+    //~^ ERROR the `function` method cannot be invoked on `&mut dyn Trait`
+    //~| HELP you need `&dyn Trait` instead of `&mut dyn Trait`
+}
diff --git a/tests/ui/illegal-sized-bound/mutability-mismatch.stderr b/tests/ui/illegal-sized-bound/mutability-mismatch.stderr
new file mode 100644
index 000000000..2ca571d9b
--- /dev/null
+++ b/tests/ui/illegal-sized-bound/mutability-mismatch.stderr
@@ -0,0 +1,18 @@
+error: the `function` method cannot be invoked on `&dyn MutTrait`
+  --> $DIR/mutability-mismatch.rs:26:33
+   |
+LL |     (&MutType as &dyn MutTrait).function();
+   |                                 ^^^^^^^^
+   |
+   = help: you need `&mut dyn MutTrait` instead of `&dyn MutTrait`
+
+error: the `function` method cannot be invoked on `&mut dyn Trait`
+  --> $DIR/mutability-mismatch.rs:29:35
+   |
+LL |     (&mut Type as &mut dyn Trait).function();
+   |                                   ^^^^^^^^
+   |
+   = help: you need `&dyn Trait` instead of `&mut dyn Trait`
+
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/illegal-sized-bound/regular.rs b/tests/ui/illegal-sized-bound/regular.rs
new file mode 100644
index 000000000..7abd27ef9
--- /dev/null
+++ b/tests/ui/illegal-sized-bound/regular.rs
@@ -0,0 +1,32 @@
+struct MutType;
+
+pub trait MutTrait {
+    fn function(&mut self)
+    where
+        Self: Sized;
+    //~^ this has a `Sized` requirement
+}
+
+impl MutTrait for MutType {
+    fn function(&mut self) {}
+}
+
+struct Type;
+
+pub trait Trait {
+    fn function(&self)
+    where
+        Self: Sized;
+    //~^ this has a `Sized` requirement
+}
+
+impl Trait for Type {
+    fn function(&self) {}
+}
+
+fn main() {
+    (&mut MutType as &mut dyn MutTrait).function();
+    //~^ ERROR the `function` method cannot be invoked on a trait object
+    (&Type as &dyn Trait).function();
+    //~^ ERROR the `function` method cannot be invoked on a trait object
+}
diff --git a/tests/ui/illegal-sized-bound/regular.stderr b/tests/ui/illegal-sized-bound/regular.stderr
new file mode 100644
index 000000000..7f3744145
--- /dev/null
+++ b/tests/ui/illegal-sized-bound/regular.stderr
@@ -0,0 +1,20 @@
+error: the `function` method cannot be invoked on a trait object
+  --> $DIR/regular.rs:28:41
+   |
+LL |         Self: Sized;
+   |               ----- this has a `Sized` requirement
+...
+LL |     (&mut MutType as &mut dyn MutTrait).function();
+   |                                         ^^^^^^^^
+
+error: the `function` method cannot be invoked on a trait object
+  --> $DIR/regular.rs:30:27
+   |
+LL |         Self: Sized;
+   |               ----- this has a `Sized` requirement
+...
+LL |     (&Type as &dyn Trait).function();
+   |                           ^^^^^^^^
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/illegal-ufcs-drop.fixed b/tests/ui/illegal-ufcs-drop.fixed
index d73b391be..d73b391be 100644
--- a/src/test/ui/illegal-ufcs-drop.fixed
+++ b/tests/ui/illegal-ufcs-drop.fixed
diff --git a/src/test/ui/illegal-ufcs-drop.rs b/tests/ui/illegal-ufcs-drop.rs
index 11411f554..11411f554 100644
--- a/src/test/ui/illegal-ufcs-drop.rs
+++ b/tests/ui/illegal-ufcs-drop.rs
diff --git a/src/test/ui/illegal-ufcs-drop.stderr b/tests/ui/illegal-ufcs-drop.stderr
index 91f47d5e4..91f47d5e4 100644
--- a/src/test/ui/illegal-ufcs-drop.stderr
+++ b/tests/ui/illegal-ufcs-drop.stderr
diff --git a/src/test/ui/impl-header-lifetime-elision/assoc-type.rs b/tests/ui/impl-header-lifetime-elision/assoc-type.rs
index b0089a37a..b0089a37a 100644
--- a/src/test/ui/impl-header-lifetime-elision/assoc-type.rs
+++ b/tests/ui/impl-header-lifetime-elision/assoc-type.rs
diff --git a/src/test/ui/impl-header-lifetime-elision/assoc-type.stderr b/tests/ui/impl-header-lifetime-elision/assoc-type.stderr
index c4f27e0b8..c4f27e0b8 100644
--- a/src/test/ui/impl-header-lifetime-elision/assoc-type.stderr
+++ b/tests/ui/impl-header-lifetime-elision/assoc-type.stderr
diff --git a/src/test/ui/impl-header-lifetime-elision/constant-used-as-arraylen.rs b/tests/ui/impl-header-lifetime-elision/constant-used-as-arraylen.rs
index 929b82bfc..929b82bfc 100644
--- a/src/test/ui/impl-header-lifetime-elision/constant-used-as-arraylen.rs
+++ b/tests/ui/impl-header-lifetime-elision/constant-used-as-arraylen.rs
diff --git a/src/test/ui/impl-header-lifetime-elision/dyn-trait.rs b/tests/ui/impl-header-lifetime-elision/dyn-trait.rs
index 359c08c98..359c08c98 100644
--- a/src/test/ui/impl-header-lifetime-elision/dyn-trait.rs
+++ b/tests/ui/impl-header-lifetime-elision/dyn-trait.rs
diff --git a/src/test/ui/impl-header-lifetime-elision/dyn-trait.stderr b/tests/ui/impl-header-lifetime-elision/dyn-trait.stderr
index 762698c4f..762698c4f 100644
--- a/src/test/ui/impl-header-lifetime-elision/dyn-trait.stderr
+++ b/tests/ui/impl-header-lifetime-elision/dyn-trait.stderr
diff --git a/src/test/ui/impl-header-lifetime-elision/explicit-and-elided-same-header.rs b/tests/ui/impl-header-lifetime-elision/explicit-and-elided-same-header.rs
index 6301ac4a3..6301ac4a3 100644
--- a/src/test/ui/impl-header-lifetime-elision/explicit-and-elided-same-header.rs
+++ b/tests/ui/impl-header-lifetime-elision/explicit-and-elided-same-header.rs
diff --git a/src/test/ui/impl-header-lifetime-elision/inherent-impl.rs b/tests/ui/impl-header-lifetime-elision/inherent-impl.rs
index 9d7b2f2d0..9d7b2f2d0 100644
--- a/src/test/ui/impl-header-lifetime-elision/inherent-impl.rs
+++ b/tests/ui/impl-header-lifetime-elision/inherent-impl.rs
diff --git a/src/test/ui/impl-header-lifetime-elision/path-elided.rs b/tests/ui/impl-header-lifetime-elision/path-elided.rs
index 40a52efc7..40a52efc7 100644
--- a/src/test/ui/impl-header-lifetime-elision/path-elided.rs
+++ b/tests/ui/impl-header-lifetime-elision/path-elided.rs
diff --git a/src/test/ui/impl-header-lifetime-elision/path-elided.stderr b/tests/ui/impl-header-lifetime-elision/path-elided.stderr
index 0b7d3f1e8..0b7d3f1e8 100644
--- a/src/test/ui/impl-header-lifetime-elision/path-elided.stderr
+++ b/tests/ui/impl-header-lifetime-elision/path-elided.stderr
diff --git a/src/test/ui/impl-header-lifetime-elision/path-underscore.rs b/tests/ui/impl-header-lifetime-elision/path-underscore.rs
index f39ba5733..f39ba5733 100644
--- a/src/test/ui/impl-header-lifetime-elision/path-underscore.rs
+++ b/tests/ui/impl-header-lifetime-elision/path-underscore.rs
diff --git a/src/test/ui/impl-header-lifetime-elision/ref-underscore.rs b/tests/ui/impl-header-lifetime-elision/ref-underscore.rs
index 5be04d08a..5be04d08a 100644
--- a/src/test/ui/impl-header-lifetime-elision/ref-underscore.rs
+++ b/tests/ui/impl-header-lifetime-elision/ref-underscore.rs
diff --git a/src/test/ui/impl-header-lifetime-elision/trait-elided.rs b/tests/ui/impl-header-lifetime-elision/trait-elided.rs
index c3e76d9cb..c3e76d9cb 100644
--- a/src/test/ui/impl-header-lifetime-elision/trait-elided.rs
+++ b/tests/ui/impl-header-lifetime-elision/trait-elided.rs
diff --git a/src/test/ui/impl-header-lifetime-elision/trait-elided.stderr b/tests/ui/impl-header-lifetime-elision/trait-elided.stderr
index 412bba6be..412bba6be 100644
--- a/src/test/ui/impl-header-lifetime-elision/trait-elided.stderr
+++ b/tests/ui/impl-header-lifetime-elision/trait-elided.stderr
diff --git a/src/test/ui/impl-header-lifetime-elision/trait-underscore.rs b/tests/ui/impl-header-lifetime-elision/trait-underscore.rs
index 3e13b0426..3e13b0426 100644
--- a/src/test/ui/impl-header-lifetime-elision/trait-underscore.rs
+++ b/tests/ui/impl-header-lifetime-elision/trait-underscore.rs
diff --git a/src/test/ui/impl-inherent-non-conflict.rs b/tests/ui/impl-inherent-non-conflict.rs
index be524f87c..be524f87c 100644
--- a/src/test/ui/impl-inherent-non-conflict.rs
+++ b/tests/ui/impl-inherent-non-conflict.rs
diff --git a/src/test/ui/impl-not-adjacent-to-type.rs b/tests/ui/impl-not-adjacent-to-type.rs
index 97caf9083..97caf9083 100644
--- a/src/test/ui/impl-not-adjacent-to-type.rs
+++ b/tests/ui/impl-not-adjacent-to-type.rs
diff --git a/src/test/ui/impl-privacy-xc-1.rs b/tests/ui/impl-privacy-xc-1.rs
index c9f7f09c7..c9f7f09c7 100644
--- a/src/test/ui/impl-privacy-xc-1.rs
+++ b/tests/ui/impl-privacy-xc-1.rs
diff --git a/src/test/ui/impl-trait/associated-impl-trait-type-generic-trait.rs b/tests/ui/impl-trait/associated-impl-trait-type-generic-trait.rs
index 6c7c46b0e..6c7c46b0e 100644
--- a/src/test/ui/impl-trait/associated-impl-trait-type-generic-trait.rs
+++ b/tests/ui/impl-trait/associated-impl-trait-type-generic-trait.rs
diff --git a/src/test/ui/impl-trait/associated-impl-trait-type-trivial.rs b/tests/ui/impl-trait/associated-impl-trait-type-trivial.rs
index cdda341ca..cdda341ca 100644
--- a/src/test/ui/impl-trait/associated-impl-trait-type-trivial.rs
+++ b/tests/ui/impl-trait/associated-impl-trait-type-trivial.rs
diff --git a/src/test/ui/impl-trait/associated-impl-trait-type.rs b/tests/ui/impl-trait/associated-impl-trait-type.rs
index d0661d66f..d0661d66f 100644
--- a/src/test/ui/impl-trait/associated-impl-trait-type.rs
+++ b/tests/ui/impl-trait/associated-impl-trait-type.rs
diff --git a/src/test/ui/impl-trait/async_scope_creep.rs b/tests/ui/impl-trait/async_scope_creep.rs
index 7a9d64d33..7a9d64d33 100644
--- a/src/test/ui/impl-trait/async_scope_creep.rs
+++ b/tests/ui/impl-trait/async_scope_creep.rs
diff --git a/src/test/ui/impl-trait/auto-trait-leak-rpass.rs b/tests/ui/impl-trait/auto-trait-leak-rpass.rs
index 9976a018b..9976a018b 100644
--- a/src/test/ui/impl-trait/auto-trait-leak-rpass.rs
+++ b/tests/ui/impl-trait/auto-trait-leak-rpass.rs
diff --git a/src/test/ui/impl-trait/auto-trait-leak.rs b/tests/ui/impl-trait/auto-trait-leak.rs
index c2fbbf94f..c2fbbf94f 100644
--- a/src/test/ui/impl-trait/auto-trait-leak.rs
+++ b/tests/ui/impl-trait/auto-trait-leak.rs
diff --git a/src/test/ui/impl-trait/auto-trait-leak.stderr b/tests/ui/impl-trait/auto-trait-leak.stderr
index feedfc40a..feedfc40a 100644
--- a/src/test/ui/impl-trait/auto-trait-leak.stderr
+++ b/tests/ui/impl-trait/auto-trait-leak.stderr
diff --git a/src/test/ui/impl-trait/auto-trait-leak2.rs b/tests/ui/impl-trait/auto-trait-leak2.rs
index 09450089a..09450089a 100644
--- a/src/test/ui/impl-trait/auto-trait-leak2.rs
+++ b/tests/ui/impl-trait/auto-trait-leak2.rs
diff --git a/src/test/ui/impl-trait/auto-trait-leak2.stderr b/tests/ui/impl-trait/auto-trait-leak2.stderr
index 52fa28145..52fa28145 100644
--- a/src/test/ui/impl-trait/auto-trait-leak2.stderr
+++ b/tests/ui/impl-trait/auto-trait-leak2.stderr
diff --git a/src/test/ui/impl-trait/auto-trait.rs b/tests/ui/impl-trait/auto-trait.rs
index 35994e4a5..35994e4a5 100644
--- a/src/test/ui/impl-trait/auto-trait.rs
+++ b/tests/ui/impl-trait/auto-trait.rs
diff --git a/src/test/ui/impl-trait/auto-trait.stderr b/tests/ui/impl-trait/auto-trait.stderr
index 81009413c..81009413c 100644
--- a/src/test/ui/impl-trait/auto-trait.stderr
+++ b/tests/ui/impl-trait/auto-trait.stderr
diff --git a/src/test/ui/impl-trait/autoderef.rs b/tests/ui/impl-trait/autoderef.rs
index 5e4f49954..5e4f49954 100644
--- a/src/test/ui/impl-trait/autoderef.rs
+++ b/tests/ui/impl-trait/autoderef.rs
diff --git a/src/test/ui/impl-trait/auxiliary/extra-item.rs b/tests/ui/impl-trait/auxiliary/extra-item.rs
index 8eaeafa52..8eaeafa52 100644
--- a/src/test/ui/impl-trait/auxiliary/extra-item.rs
+++ b/tests/ui/impl-trait/auxiliary/extra-item.rs
diff --git a/src/test/ui/impl-trait/auxiliary/no_method_suggested_traits.rs b/tests/ui/impl-trait/auxiliary/no_method_suggested_traits.rs
index cefb17e0f..cefb17e0f 100644
--- a/src/test/ui/impl-trait/auxiliary/no_method_suggested_traits.rs
+++ b/tests/ui/impl-trait/auxiliary/no_method_suggested_traits.rs
diff --git a/src/test/ui/impl-trait/auxiliary/xcrate.rs b/tests/ui/impl-trait/auxiliary/xcrate.rs
index ac016258b..ac016258b 100644
--- a/src/test/ui/impl-trait/auxiliary/xcrate.rs
+++ b/tests/ui/impl-trait/auxiliary/xcrate.rs
diff --git a/src/test/ui/impl-trait/bound-normalization-fail.rs b/tests/ui/impl-trait/bound-normalization-fail.rs
index 332959247..332959247 100644
--- a/src/test/ui/impl-trait/bound-normalization-fail.rs
+++ b/tests/ui/impl-trait/bound-normalization-fail.rs
diff --git a/src/test/ui/impl-trait/bound-normalization-fail.stderr b/tests/ui/impl-trait/bound-normalization-fail.stderr
index a9fa2da56..f04a753a0 100644
--- a/src/test/ui/impl-trait/bound-normalization-fail.stderr
+++ b/tests/ui/impl-trait/bound-normalization-fail.stderr
@@ -1,8 +1,8 @@
-error[E0271]: type mismatch resolving `<Foo<()> as FooLike>::Output == <T as impl_trait::Trait>::Assoc`
+error[E0271]: type mismatch resolving `<Foo<()> as FooLike>::Output == <T as Trait>::Assoc`
   --> $DIR/bound-normalization-fail.rs:25:32
    |
 LL |     fn foo_fail<T: Trait>() -> impl FooLike<Output = T::Assoc> {
-   |                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type mismatch resolving `<Foo<()> as FooLike>::Output == <T as impl_trait::Trait>::Assoc`
+   |                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type mismatch resolving `<Foo<()> as FooLike>::Output == <T as Trait>::Assoc`
 LL |
 LL |         Foo(())
    |         ------- return type was inferred to be `Foo<()>` here
@@ -28,11 +28,11 @@ LL |     fn foo2_fail<'a, T: Trait<'a>>() -> impl FooLike<Output = T::Assoc> {
    = note: see issue #103532 <https://github.com/rust-lang/rust/issues/103532> for more information
    = help: add `#![feature(impl_trait_projections)]` to the crate attributes to enable
 
-error[E0271]: type mismatch resolving `<Foo<()> as FooLike>::Output == <T as lifetimes::Trait<'a>>::Assoc`
+error[E0271]: type mismatch resolving `<Foo<()> as FooLike>::Output == <T as Trait<'a>>::Assoc`
   --> $DIR/bound-normalization-fail.rs:41:41
    |
 LL |     fn foo2_fail<'a, T: Trait<'a>>() -> impl FooLike<Output = T::Assoc> {
-   |                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type mismatch resolving `<Foo<()> as FooLike>::Output == <T as lifetimes::Trait<'a>>::Assoc`
+   |                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type mismatch resolving `<Foo<()> as FooLike>::Output == <T as Trait<'a>>::Assoc`
 ...
 LL |         Foo(())
    |         ------- return type was inferred to be `Foo<()>` here
diff --git a/src/test/ui/impl-trait/bound-normalization-pass.rs b/tests/ui/impl-trait/bound-normalization-pass.rs
index 51718079d..51718079d 100644
--- a/src/test/ui/impl-trait/bound-normalization-pass.rs
+++ b/tests/ui/impl-trait/bound-normalization-pass.rs
diff --git a/src/test/ui/impl-trait/bounds_regression.rs b/tests/ui/impl-trait/bounds_regression.rs
index 31fc46203..31fc46203 100644
--- a/src/test/ui/impl-trait/bounds_regression.rs
+++ b/tests/ui/impl-trait/bounds_regression.rs
diff --git a/src/test/ui/impl-trait/can-return-unconstrained-closure.rs b/tests/ui/impl-trait/can-return-unconstrained-closure.rs
index 7ae1ac4f5..7ae1ac4f5 100644
--- a/src/test/ui/impl-trait/can-return-unconstrained-closure.rs
+++ b/tests/ui/impl-trait/can-return-unconstrained-closure.rs
diff --git a/src/test/ui/impl-trait/closure-calling-parent-fn.rs b/tests/ui/impl-trait/closure-calling-parent-fn.rs
index 9dab334a2..9dab334a2 100644
--- a/src/test/ui/impl-trait/closure-calling-parent-fn.rs
+++ b/tests/ui/impl-trait/closure-calling-parent-fn.rs
diff --git a/src/test/ui/impl-trait/closure-in-impl-trait-arg.rs b/tests/ui/impl-trait/closure-in-impl-trait-arg.rs
index 3cfce459e..3cfce459e 100644
--- a/src/test/ui/impl-trait/closure-in-impl-trait-arg.rs
+++ b/tests/ui/impl-trait/closure-in-impl-trait-arg.rs
diff --git a/src/test/ui/impl-trait/closure-in-impl-trait.rs b/tests/ui/impl-trait/closure-in-impl-trait.rs
index 3593a1d5c..3593a1d5c 100644
--- a/src/test/ui/impl-trait/closure-in-impl-trait.rs
+++ b/tests/ui/impl-trait/closure-in-impl-trait.rs
diff --git a/src/test/ui/impl-trait/cross-return-site-inference.rs b/tests/ui/impl-trait/cross-return-site-inference.rs
index 00aed2ad9..00aed2ad9 100644
--- a/src/test/ui/impl-trait/cross-return-site-inference.rs
+++ b/tests/ui/impl-trait/cross-return-site-inference.rs
diff --git a/src/test/ui/impl-trait/cross-return-site-inference.stderr b/tests/ui/impl-trait/cross-return-site-inference.stderr
index 766614e9e..766614e9e 100644
--- a/src/test/ui/impl-trait/cross-return-site-inference.stderr
+++ b/tests/ui/impl-trait/cross-return-site-inference.stderr
diff --git a/src/test/ui/impl-trait/deduce-signature-from-supertrait.rs b/tests/ui/impl-trait/deduce-signature-from-supertrait.rs
index d2c347920..d2c347920 100644
--- a/src/test/ui/impl-trait/deduce-signature-from-supertrait.rs
+++ b/tests/ui/impl-trait/deduce-signature-from-supertrait.rs
diff --git a/src/test/ui/impl-trait/deprecated_annotation.rs b/tests/ui/impl-trait/deprecated_annotation.rs
index f76724c8a..f76724c8a 100644
--- a/src/test/ui/impl-trait/deprecated_annotation.rs
+++ b/tests/ui/impl-trait/deprecated_annotation.rs
diff --git a/src/test/ui/impl-trait/diagnostics/fully-qualified-path-impl-trait.rs b/tests/ui/impl-trait/diagnostics/fully-qualified-path-impl-trait.rs
index 3a47710d5..3a47710d5 100644
--- a/src/test/ui/impl-trait/diagnostics/fully-qualified-path-impl-trait.rs
+++ b/tests/ui/impl-trait/diagnostics/fully-qualified-path-impl-trait.rs
diff --git a/src/test/ui/impl-trait/diagnostics/fully-qualified-path-impl-trait.stderr b/tests/ui/impl-trait/diagnostics/fully-qualified-path-impl-trait.stderr
index a1a629bdd..a1a629bdd 100644
--- a/src/test/ui/impl-trait/diagnostics/fully-qualified-path-impl-trait.stderr
+++ b/tests/ui/impl-trait/diagnostics/fully-qualified-path-impl-trait.stderr
diff --git a/src/test/ui/impl-trait/divergence.rs b/tests/ui/impl-trait/divergence.rs
index 211f7972d..211f7972d 100644
--- a/src/test/ui/impl-trait/divergence.rs
+++ b/tests/ui/impl-trait/divergence.rs
diff --git a/src/test/ui/impl-trait/does-not-live-long-enough.rs b/tests/ui/impl-trait/does-not-live-long-enough.rs
index d2a345231..d2a345231 100644
--- a/src/test/ui/impl-trait/does-not-live-long-enough.rs
+++ b/tests/ui/impl-trait/does-not-live-long-enough.rs
diff --git a/src/test/ui/impl-trait/does-not-live-long-enough.stderr b/tests/ui/impl-trait/does-not-live-long-enough.stderr
index 750687e23..750687e23 100644
--- a/src/test/ui/impl-trait/does-not-live-long-enough.stderr
+++ b/tests/ui/impl-trait/does-not-live-long-enough.stderr
diff --git a/src/test/ui/impl-trait/dyn-trait-elided-two-inputs-assoc.rs b/tests/ui/impl-trait/dyn-trait-elided-two-inputs-assoc.rs
index 3b7141573..3b7141573 100644
--- a/src/test/ui/impl-trait/dyn-trait-elided-two-inputs-assoc.rs
+++ b/tests/ui/impl-trait/dyn-trait-elided-two-inputs-assoc.rs
diff --git a/src/test/ui/impl-trait/dyn-trait-elided-two-inputs-param.rs b/tests/ui/impl-trait/dyn-trait-elided-two-inputs-param.rs
index e8da52aad..e8da52aad 100644
--- a/src/test/ui/impl-trait/dyn-trait-elided-two-inputs-param.rs
+++ b/tests/ui/impl-trait/dyn-trait-elided-two-inputs-param.rs
diff --git a/src/test/ui/impl-trait/dyn-trait-elided-two-inputs-ref-assoc.rs b/tests/ui/impl-trait/dyn-trait-elided-two-inputs-ref-assoc.rs
index aad9d89fe..aad9d89fe 100644
--- a/src/test/ui/impl-trait/dyn-trait-elided-two-inputs-ref-assoc.rs
+++ b/tests/ui/impl-trait/dyn-trait-elided-two-inputs-ref-assoc.rs
diff --git a/src/test/ui/impl-trait/dyn-trait-elided-two-inputs-ref-param.rs b/tests/ui/impl-trait/dyn-trait-elided-two-inputs-ref-param.rs
index 8d34c1b6c..8d34c1b6c 100644
--- a/src/test/ui/impl-trait/dyn-trait-elided-two-inputs-ref-param.rs
+++ b/tests/ui/impl-trait/dyn-trait-elided-two-inputs-ref-param.rs
diff --git a/src/test/ui/impl-trait/dyn-trait-return-should-be-impl-trait.rs b/tests/ui/impl-trait/dyn-trait-return-should-be-impl-trait.rs
index cbf1daabe..cbf1daabe 100644
--- a/src/test/ui/impl-trait/dyn-trait-return-should-be-impl-trait.rs
+++ b/tests/ui/impl-trait/dyn-trait-return-should-be-impl-trait.rs
diff --git a/src/test/ui/impl-trait/dyn-trait-return-should-be-impl-trait.stderr b/tests/ui/impl-trait/dyn-trait-return-should-be-impl-trait.stderr
index f90399b6b..7f73d5e12 100644
--- a/src/test/ui/impl-trait/dyn-trait-return-should-be-impl-trait.stderr
+++ b/tests/ui/impl-trait/dyn-trait-return-should-be-impl-trait.stderr
@@ -70,10 +70,6 @@ error[E0746]: return type cannot have an unboxed trait object
 LL | fn bak() -> dyn Trait { unimplemented!() }
    |             ^^^^^^^^^ doesn't have a size known at compile-time
    |
-help: use some type `T` that is `T: Sized` as the return type if all return paths have the same type
-   |
-LL | fn bak() -> T { unimplemented!() }
-   |             ~
 help: use `impl Trait` as the return type if all return paths have the same type but you want to expose only the trait in the signature
    |
 LL | fn bak() -> impl Trait { unimplemented!() }
diff --git a/src/test/ui/impl-trait/equal-hidden-lifetimes.rs b/tests/ui/impl-trait/equal-hidden-lifetimes.rs
index 79db88828..79db88828 100644
--- a/src/test/ui/impl-trait/equal-hidden-lifetimes.rs
+++ b/tests/ui/impl-trait/equal-hidden-lifetimes.rs
diff --git a/src/test/ui/impl-trait/equal-hidden-lifetimes.stderr b/tests/ui/impl-trait/equal-hidden-lifetimes.stderr
index 3e48aef55..3e48aef55 100644
--- a/src/test/ui/impl-trait/equal-hidden-lifetimes.stderr
+++ b/tests/ui/impl-trait/equal-hidden-lifetimes.stderr
diff --git a/src/test/ui/impl-trait/equality-rpass.rs b/tests/ui/impl-trait/equality-rpass.rs
index 607b4a496..607b4a496 100644
--- a/src/test/ui/impl-trait/equality-rpass.rs
+++ b/tests/ui/impl-trait/equality-rpass.rs
diff --git a/src/test/ui/impl-trait/equality-rpass.stderr b/tests/ui/impl-trait/equality-rpass.stderr
index bde8362fd..bde8362fd 100644
--- a/src/test/ui/impl-trait/equality-rpass.stderr
+++ b/tests/ui/impl-trait/equality-rpass.stderr
diff --git a/src/test/ui/impl-trait/equality.rs b/tests/ui/impl-trait/equality.rs
index 828b5aac8..828b5aac8 100644
--- a/src/test/ui/impl-trait/equality.rs
+++ b/tests/ui/impl-trait/equality.rs
diff --git a/src/test/ui/impl-trait/equality.stderr b/tests/ui/impl-trait/equality.stderr
index 69f4cbbbf..69f4cbbbf 100644
--- a/src/test/ui/impl-trait/equality.stderr
+++ b/tests/ui/impl-trait/equality.stderr
diff --git a/src/test/ui/impl-trait/equality2.rs b/tests/ui/impl-trait/equality2.rs
index 2e325867d..2e325867d 100644
--- a/src/test/ui/impl-trait/equality2.rs
+++ b/tests/ui/impl-trait/equality2.rs
diff --git a/src/test/ui/impl-trait/equality2.stderr b/tests/ui/impl-trait/equality2.stderr
index e399a6102..e399a6102 100644
--- a/src/test/ui/impl-trait/equality2.stderr
+++ b/tests/ui/impl-trait/equality2.stderr
diff --git a/src/test/ui/impl-trait/example-calendar.rs b/tests/ui/impl-trait/example-calendar.rs
index da45f0d13..da45f0d13 100644
--- a/src/test/ui/impl-trait/example-calendar.rs
+++ b/tests/ui/impl-trait/example-calendar.rs
diff --git a/src/test/ui/impl-trait/example-st.rs b/tests/ui/impl-trait/example-st.rs
index 4e1aa3a08..4e1aa3a08 100644
--- a/src/test/ui/impl-trait/example-st.rs
+++ b/tests/ui/impl-trait/example-st.rs
diff --git a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/const-args.rs b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/const-args.rs
index 1aa23c608..1aa23c608 100644
--- a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/const-args.rs
+++ b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/const-args.rs
diff --git a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.rs b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.rs
index 3b1024d61..3b1024d61 100644
--- a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.rs
+++ b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.rs
diff --git a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.stderr b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.stderr
index c8b82783e..c8b82783e 100644
--- a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.stderr
+++ b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.stderr
diff --git a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args.rs b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args.rs
index 99e0931ab..99e0931ab 100644
--- a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args.rs
+++ b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args.rs
diff --git a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/issue-87718.rs b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/issue-87718.rs
index 987df4997..987df4997 100644
--- a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/issue-87718.rs
+++ b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/issue-87718.rs
diff --git a/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/not-enough-args.rs b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/not-enough-args.rs
new file mode 100644
index 000000000..a93bdb178
--- /dev/null
+++ b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/not-enough-args.rs
@@ -0,0 +1,6 @@
+fn f<T: ?Sized, U: ?Sized>(_: impl AsRef<T>, _: impl AsRef<U>) {}
+
+fn main() {
+    f::<[u8]>("a", b"a");
+    //~^ ERROR function takes 2 generic arguments but 1 generic argument was supplied
+}
diff --git a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/not-enough-args.stderr b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/not-enough-args.stderr
index 9d6db88d3..9d6db88d3 100644
--- a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/not-enough-args.stderr
+++ b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/not-enough-args.stderr
diff --git a/src/test/ui/impl-trait/extra-item.rs b/tests/ui/impl-trait/extra-item.rs
index d82237cce..d82237cce 100644
--- a/src/test/ui/impl-trait/extra-item.rs
+++ b/tests/ui/impl-trait/extra-item.rs
diff --git a/src/test/ui/impl-trait/extra-item.stderr b/tests/ui/impl-trait/extra-item.stderr
index 728bcc0aa..728bcc0aa 100644
--- a/src/test/ui/impl-trait/extra-item.stderr
+++ b/tests/ui/impl-trait/extra-item.stderr
diff --git a/src/test/ui/impl-trait/fallback.rs b/tests/ui/impl-trait/fallback.rs
index 1e6eb5bb3..1e6eb5bb3 100644
--- a/src/test/ui/impl-trait/fallback.rs
+++ b/tests/ui/impl-trait/fallback.rs
diff --git a/src/test/ui/impl-trait/fallback_inference.rs b/tests/ui/impl-trait/fallback_inference.rs
index 98f0bd1af..98f0bd1af 100644
--- a/src/test/ui/impl-trait/fallback_inference.rs
+++ b/tests/ui/impl-trait/fallback_inference.rs
diff --git a/src/test/ui/impl-trait/fallback_inference.stderr b/tests/ui/impl-trait/fallback_inference.stderr
index 4ac3c238f..4ac3c238f 100644
--- a/src/test/ui/impl-trait/fallback_inference.stderr
+++ b/tests/ui/impl-trait/fallback_inference.stderr
diff --git a/src/test/ui/impl-trait/feature-self-return-type.rs b/tests/ui/impl-trait/feature-self-return-type.rs
index 51877e9cc..51877e9cc 100644
--- a/src/test/ui/impl-trait/feature-self-return-type.rs
+++ b/tests/ui/impl-trait/feature-self-return-type.rs
diff --git a/src/test/ui/impl-trait/feature-self-return-type.stderr b/tests/ui/impl-trait/feature-self-return-type.stderr
index 601e53b76..601e53b76 100644
--- a/src/test/ui/impl-trait/feature-self-return-type.stderr
+++ b/tests/ui/impl-trait/feature-self-return-type.stderr
diff --git a/src/test/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.edition2015.stderr b/tests/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.edition2015.stderr
index edf3911e2..edf3911e2 100644
--- a/src/test/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.edition2015.stderr
+++ b/tests/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.edition2015.stderr
diff --git a/src/test/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.edition2021.stderr b/tests/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.edition2021.stderr
index 30fbba168..30fbba168 100644
--- a/src/test/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.edition2021.stderr
+++ b/tests/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.edition2021.stderr
diff --git a/src/test/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.rs b/tests/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.rs
index bed81c4bc..bed81c4bc 100644
--- a/src/test/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.rs
+++ b/tests/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.rs
diff --git a/src/test/ui/impl-trait/hidden-lifetimes.rs b/tests/ui/impl-trait/hidden-lifetimes.rs
index ae07c8927..ae07c8927 100644
--- a/src/test/ui/impl-trait/hidden-lifetimes.rs
+++ b/tests/ui/impl-trait/hidden-lifetimes.rs
diff --git a/src/test/ui/impl-trait/hidden-lifetimes.stderr b/tests/ui/impl-trait/hidden-lifetimes.stderr
index 3cc47e1e8..3cc47e1e8 100644
--- a/src/test/ui/impl-trait/hidden-lifetimes.stderr
+++ b/tests/ui/impl-trait/hidden-lifetimes.stderr
diff --git a/src/test/ui/impl-trait/hidden-type-is-opaque-2.rs b/tests/ui/impl-trait/hidden-type-is-opaque-2.rs
index 970d84120..970d84120 100644
--- a/src/test/ui/impl-trait/hidden-type-is-opaque-2.rs
+++ b/tests/ui/impl-trait/hidden-type-is-opaque-2.rs
diff --git a/src/test/ui/impl-trait/hidden-type-is-opaque-2.stderr b/tests/ui/impl-trait/hidden-type-is-opaque-2.stderr
index 957052feb..957052feb 100644
--- a/src/test/ui/impl-trait/hidden-type-is-opaque-2.stderr
+++ b/tests/ui/impl-trait/hidden-type-is-opaque-2.stderr
diff --git a/src/test/ui/impl-trait/hidden-type-is-opaque.rs b/tests/ui/impl-trait/hidden-type-is-opaque.rs
index 72b4028d8..72b4028d8 100644
--- a/src/test/ui/impl-trait/hidden-type-is-opaque.rs
+++ b/tests/ui/impl-trait/hidden-type-is-opaque.rs
diff --git a/src/test/ui/impl-trait/impl-fn-hrtb-bounds-2.rs b/tests/ui/impl-trait/impl-fn-hrtb-bounds-2.rs
index b0aeded0e..b0aeded0e 100644
--- a/src/test/ui/impl-trait/impl-fn-hrtb-bounds-2.rs
+++ b/tests/ui/impl-trait/impl-fn-hrtb-bounds-2.rs
diff --git a/src/test/ui/impl-trait/impl-fn-hrtb-bounds-2.stderr b/tests/ui/impl-trait/impl-fn-hrtb-bounds-2.stderr
index 433b76b7a..433b76b7a 100644
--- a/src/test/ui/impl-trait/impl-fn-hrtb-bounds-2.stderr
+++ b/tests/ui/impl-trait/impl-fn-hrtb-bounds-2.stderr
diff --git a/src/test/ui/impl-trait/impl-fn-hrtb-bounds.rs b/tests/ui/impl-trait/impl-fn-hrtb-bounds.rs
index 527a4586f..527a4586f 100644
--- a/src/test/ui/impl-trait/impl-fn-hrtb-bounds.rs
+++ b/tests/ui/impl-trait/impl-fn-hrtb-bounds.rs
diff --git a/src/test/ui/impl-trait/impl-fn-hrtb-bounds.stderr b/tests/ui/impl-trait/impl-fn-hrtb-bounds.stderr
index 443ffeb55..443ffeb55 100644
--- a/src/test/ui/impl-trait/impl-fn-hrtb-bounds.stderr
+++ b/tests/ui/impl-trait/impl-fn-hrtb-bounds.stderr
diff --git a/src/test/ui/impl-trait/impl-fn-parsing-ambiguities.rs b/tests/ui/impl-trait/impl-fn-parsing-ambiguities.rs
index 61303a5b2..61303a5b2 100644
--- a/src/test/ui/impl-trait/impl-fn-parsing-ambiguities.rs
+++ b/tests/ui/impl-trait/impl-fn-parsing-ambiguities.rs
diff --git a/src/test/ui/impl-trait/impl-fn-parsing-ambiguities.stderr b/tests/ui/impl-trait/impl-fn-parsing-ambiguities.stderr
index cf6e5ef7b..cf6e5ef7b 100644
--- a/src/test/ui/impl-trait/impl-fn-parsing-ambiguities.stderr
+++ b/tests/ui/impl-trait/impl-fn-parsing-ambiguities.stderr
diff --git a/src/test/ui/impl-trait/impl-fn-predefined-lifetimes.rs b/tests/ui/impl-trait/impl-fn-predefined-lifetimes.rs
index 157786623..157786623 100644
--- a/src/test/ui/impl-trait/impl-fn-predefined-lifetimes.rs
+++ b/tests/ui/impl-trait/impl-fn-predefined-lifetimes.rs
diff --git a/src/test/ui/impl-trait/impl-fn-predefined-lifetimes.stderr b/tests/ui/impl-trait/impl-fn-predefined-lifetimes.stderr
index c19420bbb..c19420bbb 100644
--- a/src/test/ui/impl-trait/impl-fn-predefined-lifetimes.stderr
+++ b/tests/ui/impl-trait/impl-fn-predefined-lifetimes.stderr
diff --git a/src/test/ui/impl-trait/impl-generic-mismatch-ab.rs b/tests/ui/impl-trait/impl-generic-mismatch-ab.rs
index 6c9b119de..6c9b119de 100644
--- a/src/test/ui/impl-trait/impl-generic-mismatch-ab.rs
+++ b/tests/ui/impl-trait/impl-generic-mismatch-ab.rs
diff --git a/src/test/ui/impl-trait/impl-generic-mismatch-ab.stderr b/tests/ui/impl-trait/impl-generic-mismatch-ab.stderr
index acf768d57..db97fc2bd 100644
--- a/src/test/ui/impl-trait/impl-generic-mismatch-ab.stderr
+++ b/tests/ui/impl-trait/impl-generic-mismatch-ab.stderr
@@ -13,8 +13,8 @@ note: type in trait
    |
 LL |     fn foo<A: Debug>(&self, a: &A, b: &impl Debug);
    |                                ^^
-   = note: expected fn pointer `fn(&(), &B, &impl Debug)`
-              found fn pointer `fn(&(), &impl Debug, &B)`
+   = note: expected signature `fn(&(), &B, &impl Debug)`
+              found signature `fn(&(), &impl Debug, &B)`
    = note: a type parameter was expected, but a different one was found; you might be missing a type parameter or trait bound
    = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
 
diff --git a/src/test/ui/impl-trait/impl-generic-mismatch.rs b/tests/ui/impl-trait/impl-generic-mismatch.rs
index fb8bde0d0..fb8bde0d0 100644
--- a/src/test/ui/impl-trait/impl-generic-mismatch.rs
+++ b/tests/ui/impl-trait/impl-generic-mismatch.rs
diff --git a/src/test/ui/impl-trait/impl-generic-mismatch.stderr b/tests/ui/impl-trait/impl-generic-mismatch.stderr
index 542f02d7e..973b65bfd 100644
--- a/src/test/ui/impl-trait/impl-generic-mismatch.stderr
+++ b/tests/ui/impl-trait/impl-generic-mismatch.stderr
@@ -46,11 +46,9 @@ error[E0643]: method `hash` has incompatible signature for trait
    |
 LL |     fn hash(&self, hasher: &mut impl Hasher) {}
    |                                 ^^^^^^^^^^^ expected generic parameter, found `impl Trait`
+  --> $SRC_DIR/core/src/hash/mod.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/hash/mod.rs:LL:COL
-   |
-LL |     fn hash<H: Hasher>(&self, state: &mut H);
-   |             - declaration in trait here
+   = note: declaration in trait here
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/impl-trait/impl-trait-in-macro.rs b/tests/ui/impl-trait/impl-trait-in-macro.rs
index 3165c9b99..3165c9b99 100644
--- a/src/test/ui/impl-trait/impl-trait-in-macro.rs
+++ b/tests/ui/impl-trait/impl-trait-in-macro.rs
diff --git a/src/test/ui/impl-trait/impl-trait-in-macro.stderr b/tests/ui/impl-trait/impl-trait-in-macro.stderr
index 7cfbe3447..7cfbe3447 100644
--- a/src/test/ui/impl-trait/impl-trait-in-macro.stderr
+++ b/tests/ui/impl-trait/impl-trait-in-macro.stderr
diff --git a/src/test/ui/impl-trait/impl-trait-plus-priority.rs b/tests/ui/impl-trait/impl-trait-plus-priority.rs
index dfac9c0f1..dfac9c0f1 100644
--- a/src/test/ui/impl-trait/impl-trait-plus-priority.rs
+++ b/tests/ui/impl-trait/impl-trait-plus-priority.rs
diff --git a/src/test/ui/impl-trait/impl-trait-plus-priority.stderr b/tests/ui/impl-trait/impl-trait-plus-priority.stderr
index 205d9b0b7..205d9b0b7 100644
--- a/src/test/ui/impl-trait/impl-trait-plus-priority.stderr
+++ b/tests/ui/impl-trait/impl-trait-plus-priority.stderr
diff --git a/src/test/ui/impl-trait/impl_fn_associativity.rs b/tests/ui/impl-trait/impl_fn_associativity.rs
index 71a8f9c77..71a8f9c77 100644
--- a/src/test/ui/impl-trait/impl_fn_associativity.rs
+++ b/tests/ui/impl-trait/impl_fn_associativity.rs
diff --git a/src/test/ui/impl-trait/impl_trait_projections.rs b/tests/ui/impl-trait/impl_trait_projections.rs
index fd0986d7c..b3ff2ce5a 100644
--- a/src/test/ui/impl-trait/impl_trait_projections.rs
+++ b/tests/ui/impl-trait/impl_trait_projections.rs
@@ -11,7 +11,7 @@ fn path_parametrized_type_is_allowed() -> option::Option<impl Debug> {
 
 fn projection_is_disallowed(x: impl Iterator) -> <impl Iterator>::Item {
 //~^ ERROR `impl Trait` is not allowed in path parameters
-//~^^ ERROR ambiguous associated type
+//~| ERROR `impl Trait` is not allowed in path parameters
     x.next().unwrap()
 }
 
diff --git a/tests/ui/impl-trait/impl_trait_projections.stderr b/tests/ui/impl-trait/impl_trait_projections.stderr
new file mode 100644
index 000000000..4deb24731
--- /dev/null
+++ b/tests/ui/impl-trait/impl_trait_projections.stderr
@@ -0,0 +1,33 @@
+error[E0667]: `impl Trait` is not allowed in path parameters
+  --> $DIR/impl_trait_projections.rs:12:51
+   |
+LL | fn projection_is_disallowed(x: impl Iterator) -> <impl Iterator>::Item {
+   |                                                   ^^^^^^^^^^^^^
+
+error[E0667]: `impl Trait` is not allowed in path parameters
+  --> $DIR/impl_trait_projections.rs:19:9
+   |
+LL |     -> <impl Iterator as Iterator>::Item
+   |         ^^^^^^^^^^^^^
+
+error[E0667]: `impl Trait` is not allowed in path parameters
+  --> $DIR/impl_trait_projections.rs:26:27
+   |
+LL |     -> <::std::ops::Range<impl Debug> as Iterator>::Item
+   |                           ^^^^^^^^^^
+
+error[E0667]: `impl Trait` is not allowed in path parameters
+  --> $DIR/impl_trait_projections.rs:33:29
+   |
+LL |     -> <dyn Iterator<Item = impl Debug> as Iterator>::Item
+   |                             ^^^^^^^^^^
+
+error[E0667]: `impl Trait` is not allowed in path parameters
+  --> $DIR/impl_trait_projections.rs:12:51
+   |
+LL | fn projection_is_disallowed(x: impl Iterator) -> <impl Iterator>::Item {
+   |                                                   ^^^^^^^^^^^^^
+
+error: aborting due to 5 previous errors
+
+For more information about this error, try `rustc --explain E0667`.
diff --git a/src/test/ui/impl-trait/in-trait/auxiliary/rpitit.rs b/tests/ui/impl-trait/in-trait/auxiliary/rpitit.rs
index 74df300f8..74df300f8 100644
--- a/src/test/ui/impl-trait/in-trait/auxiliary/rpitit.rs
+++ b/tests/ui/impl-trait/in-trait/auxiliary/rpitit.rs
diff --git a/tests/ui/impl-trait/in-trait/box-coerce-span-in-default.rs b/tests/ui/impl-trait/in-trait/box-coerce-span-in-default.rs
new file mode 100644
index 000000000..a4d483dee
--- /dev/null
+++ b/tests/ui/impl-trait/in-trait/box-coerce-span-in-default.rs
@@ -0,0 +1,49 @@
+// check-pass
+
+#![feature(return_position_impl_trait_in_trait)]
+//~^ WARN the feature `return_position_impl_trait_in_trait` is incomplete
+
+struct TestA {}
+struct TestB {}
+
+impl TestTrait for TestA {
+    type Output = ();
+}
+impl TestTrait for TestB {
+    type Output = ();
+}
+
+trait TestTrait {
+    type Output;
+}
+
+impl<A, B> TestTrait for GreeterOutput<A, B>
+where
+    A: TestTrait<Output = ()>,
+    B: TestTrait<Output = ()>,
+{
+    type Output = ();
+}
+
+enum GreeterOutput<A, B>
+where
+    A: TestTrait<Output = ()>,
+    B: TestTrait<Output = ()>,
+{
+    SayHello(A),
+    SayGoodbye(B),
+}
+
+trait Greeter {
+    fn test_func(&self, func: &str) -> impl TestTrait<Output = ()> {
+        match func {
+            "SayHello" => GreeterOutput::SayHello(TestA {}),
+            "SayGoodbye" => GreeterOutput::SayGoodbye(TestB {}),
+            _ => GreeterOutput::SayHello(TestA {}),
+        }
+    }
+}
+
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/tests/ui/impl-trait/in-trait/box-coerce-span-in-default.stderr b/tests/ui/impl-trait/in-trait/box-coerce-span-in-default.stderr
new file mode 100644
index 000000000..d681ecf25
--- /dev/null
+++ b/tests/ui/impl-trait/in-trait/box-coerce-span-in-default.stderr
@@ -0,0 +1,11 @@
+warning: the feature `return_position_impl_trait_in_trait` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/box-coerce-span-in-default.rs:3:12
+   |
+LL | #![feature(return_position_impl_trait_in_trait)]
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+warning: 1 warning emitted
+
diff --git a/src/test/ui/impl-trait/in-trait/deep-match-works.rs b/tests/ui/impl-trait/in-trait/deep-match-works.rs
index 772da845e..772da845e 100644
--- a/src/test/ui/impl-trait/in-trait/deep-match-works.rs
+++ b/tests/ui/impl-trait/in-trait/deep-match-works.rs
diff --git a/src/test/ui/impl-trait/in-trait/deep-match.rs b/tests/ui/impl-trait/in-trait/deep-match.rs
index a6385147c..a6385147c 100644
--- a/src/test/ui/impl-trait/in-trait/deep-match.rs
+++ b/tests/ui/impl-trait/in-trait/deep-match.rs
diff --git a/src/test/ui/impl-trait/in-trait/deep-match.stderr b/tests/ui/impl-trait/in-trait/deep-match.stderr
index 034ee5ea4..034ee5ea4 100644
--- a/src/test/ui/impl-trait/in-trait/deep-match.stderr
+++ b/tests/ui/impl-trait/in-trait/deep-match.stderr
diff --git a/src/test/ui/impl-trait/in-trait/default-body-type-err-2.rs b/tests/ui/impl-trait/in-trait/default-body-type-err-2.rs
index 45ae2b8ad..45ae2b8ad 100644
--- a/src/test/ui/impl-trait/in-trait/default-body-type-err-2.rs
+++ b/tests/ui/impl-trait/in-trait/default-body-type-err-2.rs
diff --git a/src/test/ui/impl-trait/in-trait/default-body-type-err-2.stderr b/tests/ui/impl-trait/in-trait/default-body-type-err-2.stderr
index 142b1bff1..142b1bff1 100644
--- a/src/test/ui/impl-trait/in-trait/default-body-type-err-2.stderr
+++ b/tests/ui/impl-trait/in-trait/default-body-type-err-2.stderr
diff --git a/src/test/ui/impl-trait/in-trait/default-body-type-err.rs b/tests/ui/impl-trait/in-trait/default-body-type-err.rs
index ac9baf91c..ac9baf91c 100644
--- a/src/test/ui/impl-trait/in-trait/default-body-type-err.rs
+++ b/tests/ui/impl-trait/in-trait/default-body-type-err.rs
diff --git a/src/test/ui/impl-trait/in-trait/default-body-type-err.stderr b/tests/ui/impl-trait/in-trait/default-body-type-err.stderr
index 461247a3e..461247a3e 100644
--- a/src/test/ui/impl-trait/in-trait/default-body-type-err.stderr
+++ b/tests/ui/impl-trait/in-trait/default-body-type-err.stderr
diff --git a/src/test/ui/impl-trait/in-trait/default-body-with-rpit.rs b/tests/ui/impl-trait/in-trait/default-body-with-rpit.rs
index ad3cc7c25..ad3cc7c25 100644
--- a/src/test/ui/impl-trait/in-trait/default-body-with-rpit.rs
+++ b/tests/ui/impl-trait/in-trait/default-body-with-rpit.rs
diff --git a/src/test/ui/impl-trait/in-trait/default-body.rs b/tests/ui/impl-trait/in-trait/default-body.rs
index b0baf5bb1..b0baf5bb1 100644
--- a/src/test/ui/impl-trait/in-trait/default-body.rs
+++ b/tests/ui/impl-trait/in-trait/default-body.rs
diff --git a/src/test/ui/impl-trait/in-trait/doesnt-satisfy.rs b/tests/ui/impl-trait/in-trait/doesnt-satisfy.rs
index bb4e0d44f..bb4e0d44f 100644
--- a/src/test/ui/impl-trait/in-trait/doesnt-satisfy.rs
+++ b/tests/ui/impl-trait/in-trait/doesnt-satisfy.rs
diff --git a/src/test/ui/impl-trait/in-trait/doesnt-satisfy.stderr b/tests/ui/impl-trait/in-trait/doesnt-satisfy.stderr
index aa5492d28..aa5492d28 100644
--- a/src/test/ui/impl-trait/in-trait/doesnt-satisfy.stderr
+++ b/tests/ui/impl-trait/in-trait/doesnt-satisfy.stderr
diff --git a/src/test/ui/impl-trait/in-trait/early.rs b/tests/ui/impl-trait/in-trait/early.rs
index 9c1c2b503..9c1c2b503 100644
--- a/src/test/ui/impl-trait/in-trait/early.rs
+++ b/tests/ui/impl-trait/in-trait/early.rs
diff --git a/src/test/ui/impl-trait/in-trait/encode.rs b/tests/ui/impl-trait/in-trait/encode.rs
index efb9f6498..efb9f6498 100644
--- a/src/test/ui/impl-trait/in-trait/encode.rs
+++ b/tests/ui/impl-trait/in-trait/encode.rs
diff --git a/src/test/ui/impl-trait/in-trait/foreign.rs b/tests/ui/impl-trait/in-trait/foreign.rs
index 6341f5b42..6341f5b42 100644
--- a/src/test/ui/impl-trait/in-trait/foreign.rs
+++ b/tests/ui/impl-trait/in-trait/foreign.rs
diff --git a/src/test/ui/impl-trait/in-trait/generics-mismatch.rs b/tests/ui/impl-trait/in-trait/generics-mismatch.rs
index cc0fc720e..cc0fc720e 100644
--- a/src/test/ui/impl-trait/in-trait/generics-mismatch.rs
+++ b/tests/ui/impl-trait/in-trait/generics-mismatch.rs
diff --git a/src/test/ui/impl-trait/in-trait/generics-mismatch.stderr b/tests/ui/impl-trait/in-trait/generics-mismatch.stderr
index cd42683e0..cd42683e0 100644
--- a/src/test/ui/impl-trait/in-trait/generics-mismatch.stderr
+++ b/tests/ui/impl-trait/in-trait/generics-mismatch.stderr
diff --git a/src/test/ui/impl-trait/in-trait/issue-102140.rs b/tests/ui/impl-trait/in-trait/issue-102140.rs
index be1e012ac..be1e012ac 100644
--- a/src/test/ui/impl-trait/in-trait/issue-102140.rs
+++ b/tests/ui/impl-trait/in-trait/issue-102140.rs
diff --git a/src/test/ui/impl-trait/in-trait/issue-102140.stderr b/tests/ui/impl-trait/in-trait/issue-102140.stderr
index 08602185f..18bb63745 100644
--- a/src/test/ui/impl-trait/in-trait/issue-102140.stderr
+++ b/tests/ui/impl-trait/in-trait/issue-102140.stderr
@@ -2,11 +2,15 @@ error[E0277]: the trait bound `&dyn MyTrait: MyTrait` is not satisfied
   --> $DIR/issue-102140.rs:23:22
    |
 LL |         MyTrait::foo(&self)
-   |         ------------ -^^^^
-   |         |            |
-   |         |            the trait `MyTrait` is not implemented for `&dyn MyTrait`
-   |         |            help: consider removing the leading `&`-reference
+   |         ------------ ^^^^^ the trait `MyTrait` is not implemented for `&dyn MyTrait`
+   |         |
    |         required by a bound introduced by this call
+   |
+help: consider removing the leading `&`-reference
+   |
+LL -         MyTrait::foo(&self)
+LL +         MyTrait::foo(self)
+   |
 
 error[E0277]: the trait bound `&dyn MyTrait: MyTrait` is not satisfied
   --> $DIR/issue-102140.rs:23:9
diff --git a/src/test/ui/impl-trait/in-trait/issue-102301.rs b/tests/ui/impl-trait/in-trait/issue-102301.rs
index a93714a65..a93714a65 100644
--- a/src/test/ui/impl-trait/in-trait/issue-102301.rs
+++ b/tests/ui/impl-trait/in-trait/issue-102301.rs
diff --git a/src/test/ui/impl-trait/in-trait/issue-102571.rs b/tests/ui/impl-trait/in-trait/issue-102571.rs
index 61c91e644..61c91e644 100644
--- a/src/test/ui/impl-trait/in-trait/issue-102571.rs
+++ b/tests/ui/impl-trait/in-trait/issue-102571.rs
diff --git a/src/test/ui/impl-trait/in-trait/issue-102571.stderr b/tests/ui/impl-trait/in-trait/issue-102571.stderr
index 87219941d..87219941d 100644
--- a/src/test/ui/impl-trait/in-trait/issue-102571.stderr
+++ b/tests/ui/impl-trait/in-trait/issue-102571.stderr
diff --git a/src/test/ui/impl-trait/in-trait/method-signature-matches.rs b/tests/ui/impl-trait/in-trait/method-signature-matches.rs
index c848ee3f6..c848ee3f6 100644
--- a/src/test/ui/impl-trait/in-trait/method-signature-matches.rs
+++ b/tests/ui/impl-trait/in-trait/method-signature-matches.rs
diff --git a/src/test/ui/impl-trait/in-trait/method-signature-matches.stderr b/tests/ui/impl-trait/in-trait/method-signature-matches.stderr
index 2b32c52c8..4dfd77222 100644
--- a/src/test/ui/impl-trait/in-trait/method-signature-matches.stderr
+++ b/tests/ui/impl-trait/in-trait/method-signature-matches.stderr
@@ -12,8 +12,8 @@ note: type in trait
    |
 LL |     fn owo(x: ()) -> impl Sized;
    |               ^^
-   = note: expected fn pointer `fn(())`
-              found fn pointer `fn(u8)`
+   = note: expected signature `fn(())`
+              found signature `fn(u8)`
 
 error[E0053]: method `owo` has an incompatible type for trait
   --> $DIR/method-signature-matches.rs:20:21
@@ -39,8 +39,8 @@ note: type in trait
    |
 LL |     async fn owo(x: ()) {}
    |                     ^^
-   = note: expected fn pointer `fn(()) -> _`
-              found fn pointer `fn(u8) -> _`
+   = note: expected signature `fn(()) -> _`
+              found signature `fn(u8) -> _`
 
 error[E0050]: method `calm_down_please` has 3 parameters but the declaration in trait `TooMuch::calm_down_please` has 0
   --> $DIR/method-signature-matches.rs:29:28
@@ -75,8 +75,8 @@ note: type in trait
    |
 LL |     fn early<'early, T>(x: &'early T) -> impl Sized;
    |                            ^^^^^^^^^
-   = note: expected fn pointer `fn(&'early T)`
-              found fn pointer `fn(&())`
+   = note: expected signature `fn(&'early T)`
+              found signature `fn(&())`
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/impl-trait/in-trait/nested-rpitit.rs b/tests/ui/impl-trait/in-trait/nested-rpitit.rs
index 65285e3a3..65285e3a3 100644
--- a/src/test/ui/impl-trait/in-trait/nested-rpitit.rs
+++ b/tests/ui/impl-trait/in-trait/nested-rpitit.rs
diff --git a/src/test/ui/impl-trait/in-trait/object-safety.rs b/tests/ui/impl-trait/in-trait/object-safety.rs
index dd35b9a2d..dd35b9a2d 100644
--- a/src/test/ui/impl-trait/in-trait/object-safety.rs
+++ b/tests/ui/impl-trait/in-trait/object-safety.rs
diff --git a/src/test/ui/impl-trait/in-trait/object-safety.stderr b/tests/ui/impl-trait/in-trait/object-safety.stderr
index ca0e760ff..ca0e760ff 100644
--- a/src/test/ui/impl-trait/in-trait/object-safety.stderr
+++ b/tests/ui/impl-trait/in-trait/object-safety.stderr
diff --git a/src/test/ui/impl-trait/in-trait/opaque-in-impl-is-opaque.rs b/tests/ui/impl-trait/in-trait/opaque-in-impl-is-opaque.rs
index 3ac264e8e..3ac264e8e 100644
--- a/src/test/ui/impl-trait/in-trait/opaque-in-impl-is-opaque.rs
+++ b/tests/ui/impl-trait/in-trait/opaque-in-impl-is-opaque.rs
diff --git a/src/test/ui/impl-trait/in-trait/opaque-in-impl-is-opaque.stderr b/tests/ui/impl-trait/in-trait/opaque-in-impl-is-opaque.stderr
index 15edda483..15edda483 100644
--- a/src/test/ui/impl-trait/in-trait/opaque-in-impl-is-opaque.stderr
+++ b/tests/ui/impl-trait/in-trait/opaque-in-impl-is-opaque.stderr
diff --git a/src/test/ui/impl-trait/in-trait/opaque-in-impl.rs b/tests/ui/impl-trait/in-trait/opaque-in-impl.rs
index 2e0662969..2e0662969 100644
--- a/src/test/ui/impl-trait/in-trait/opaque-in-impl.rs
+++ b/tests/ui/impl-trait/in-trait/opaque-in-impl.rs
diff --git a/src/test/ui/impl-trait/in-trait/reveal.rs b/tests/ui/impl-trait/in-trait/reveal.rs
index d6ede1cc4..d6ede1cc4 100644
--- a/src/test/ui/impl-trait/in-trait/reveal.rs
+++ b/tests/ui/impl-trait/in-trait/reveal.rs
diff --git a/src/test/ui/impl-trait/in-trait/signature-mismatch.rs b/tests/ui/impl-trait/in-trait/signature-mismatch.rs
index 90682631a..90682631a 100644
--- a/src/test/ui/impl-trait/in-trait/signature-mismatch.rs
+++ b/tests/ui/impl-trait/in-trait/signature-mismatch.rs
diff --git a/src/test/ui/impl-trait/in-trait/signature-mismatch.stderr b/tests/ui/impl-trait/in-trait/signature-mismatch.stderr
index 6663d7faa..e10566017 100644
--- a/src/test/ui/impl-trait/in-trait/signature-mismatch.stderr
+++ b/tests/ui/impl-trait/in-trait/signature-mismatch.stderr
@@ -7,8 +7,8 @@ LL |     fn async_fn(&self, buff: &[u8]) -> impl Future<Output = Vec<u8>>;
 LL |     fn async_fn<'a>(&self, buff: &'a [u8]) -> impl Future<Output = Vec<u8>> + 'a {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found `fn(&'1 Struct, &'2 [u8]) -> impl Future<Output = Vec<u8>> + '2`
    |
-   = note: expected `fn(&'1 Struct, &'2 [u8]) -> impl Future<Output = Vec<u8>> + 'static`
-              found `fn(&'1 Struct, &'2 [u8]) -> impl Future<Output = Vec<u8>> + '2`
+   = note: expected signature `fn(&'1 Struct, &'2 [u8]) -> impl Future<Output = Vec<u8>> + 'static`
+              found signature `fn(&'1 Struct, &'2 [u8]) -> impl Future<Output = Vec<u8>> + '2`
    = help: the lifetime requirements from the `impl` do not correspond to the requirements in the `trait`
    = help: verify the lifetime relationships in the `trait` and `impl` between the `self` argument, the other inputs and its output
 
diff --git a/src/test/ui/impl-trait/in-trait/specialization-broken.rs b/tests/ui/impl-trait/in-trait/specialization-broken.rs
index 9d27d3710..9d27d3710 100644
--- a/src/test/ui/impl-trait/in-trait/specialization-broken.rs
+++ b/tests/ui/impl-trait/in-trait/specialization-broken.rs
diff --git a/src/test/ui/impl-trait/in-trait/specialization-broken.stderr b/tests/ui/impl-trait/in-trait/specialization-broken.stderr
index a30e6346b..37cfd7449 100644
--- a/src/test/ui/impl-trait/in-trait/specialization-broken.stderr
+++ b/tests/ui/impl-trait/in-trait/specialization-broken.stderr
@@ -15,8 +15,8 @@ note: type in trait
    |
 LL |     fn bar(&self) -> impl Sized;
    |                      ^^^^^^^^^^
-   = note: expected fn pointer `fn(&U) -> impl Sized`
-              found fn pointer `fn(&U) -> U`
+   = note: expected signature `fn(&U) -> impl Sized`
+              found signature `fn(&U) -> U`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/impl-trait/in-trait/specialization-substs-remap.rs b/tests/ui/impl-trait/in-trait/specialization-substs-remap.rs
index c9ee877db..c9ee877db 100644
--- a/src/test/ui/impl-trait/in-trait/specialization-substs-remap.rs
+++ b/tests/ui/impl-trait/in-trait/specialization-substs-remap.rs
diff --git a/src/test/ui/impl-trait/in-trait/success.rs b/tests/ui/impl-trait/in-trait/success.rs
index 4cbe682b4..4cbe682b4 100644
--- a/src/test/ui/impl-trait/in-trait/success.rs
+++ b/tests/ui/impl-trait/in-trait/success.rs
diff --git a/src/test/ui/impl-trait/in-trait/trait-more-generics-than-impl.rs b/tests/ui/impl-trait/in-trait/trait-more-generics-than-impl.rs
index 0bbe50ea6..0bbe50ea6 100644
--- a/src/test/ui/impl-trait/in-trait/trait-more-generics-than-impl.rs
+++ b/tests/ui/impl-trait/in-trait/trait-more-generics-than-impl.rs
diff --git a/src/test/ui/impl-trait/in-trait/trait-more-generics-than-impl.stderr b/tests/ui/impl-trait/in-trait/trait-more-generics-than-impl.stderr
index 8ff54cad9..8ff54cad9 100644
--- a/src/test/ui/impl-trait/in-trait/trait-more-generics-than-impl.stderr
+++ b/tests/ui/impl-trait/in-trait/trait-more-generics-than-impl.stderr
diff --git a/src/test/ui/impl-trait/in-trait/wf-bounds.rs b/tests/ui/impl-trait/in-trait/wf-bounds.rs
index 2c71583b3..2c71583b3 100644
--- a/src/test/ui/impl-trait/in-trait/wf-bounds.rs
+++ b/tests/ui/impl-trait/in-trait/wf-bounds.rs
diff --git a/src/test/ui/impl-trait/in-trait/wf-bounds.stderr b/tests/ui/impl-trait/in-trait/wf-bounds.stderr
index 92e36841b..03cc4c2b9 100644
--- a/src/test/ui/impl-trait/in-trait/wf-bounds.stderr
+++ b/tests/ui/impl-trait/in-trait/wf-bounds.stderr
@@ -7,9 +7,6 @@ LL |     fn nya() -> impl Wf<Vec<[u8]>>;
    = help: the trait `Sized` is not implemented for `[u8]`
 note: required by a bound in `Vec`
   --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-   |
-LL | pub struct Vec<T, #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global> {
-   |                ^ required by this bound in `Vec`
 
 error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
   --> $DIR/wf-bounds.rs:12:23
diff --git a/src/test/ui/impl-trait/in-trait/where-clause.rs b/tests/ui/impl-trait/in-trait/where-clause.rs
index 87bac519c..87bac519c 100644
--- a/src/test/ui/impl-trait/in-trait/where-clause.rs
+++ b/tests/ui/impl-trait/in-trait/where-clause.rs
diff --git a/src/test/ui/impl-trait/issue-100075-2.rs b/tests/ui/impl-trait/issue-100075-2.rs
index cf059af19..cf059af19 100644
--- a/src/test/ui/impl-trait/issue-100075-2.rs
+++ b/tests/ui/impl-trait/issue-100075-2.rs
diff --git a/src/test/ui/impl-trait/issue-100075-2.stderr b/tests/ui/impl-trait/issue-100075-2.stderr
index d2dbd8c62..d2dbd8c62 100644
--- a/src/test/ui/impl-trait/issue-100075-2.stderr
+++ b/tests/ui/impl-trait/issue-100075-2.stderr
diff --git a/src/test/ui/impl-trait/issue-100075.rs b/tests/ui/impl-trait/issue-100075.rs
index ea30abb48..ea30abb48 100644
--- a/src/test/ui/impl-trait/issue-100075.rs
+++ b/tests/ui/impl-trait/issue-100075.rs
diff --git a/src/test/ui/impl-trait/issue-100075.stderr b/tests/ui/impl-trait/issue-100075.stderr
index 267ecfdae..267ecfdae 100644
--- a/src/test/ui/impl-trait/issue-100075.stderr
+++ b/tests/ui/impl-trait/issue-100075.stderr
diff --git a/src/test/ui/impl-trait/issue-100187.rs b/tests/ui/impl-trait/issue-100187.rs
index fc541c696..fc541c696 100644
--- a/src/test/ui/impl-trait/issue-100187.rs
+++ b/tests/ui/impl-trait/issue-100187.rs
diff --git a/src/test/ui/impl-trait/issue-102605.rs b/tests/ui/impl-trait/issue-102605.rs
index 3bbdf35af..3bbdf35af 100644
--- a/src/test/ui/impl-trait/issue-102605.rs
+++ b/tests/ui/impl-trait/issue-102605.rs
diff --git a/src/test/ui/impl-trait/issue-102605.stderr b/tests/ui/impl-trait/issue-102605.stderr
index d4aba9149..d4aba9149 100644
--- a/src/test/ui/impl-trait/issue-102605.stderr
+++ b/tests/ui/impl-trait/issue-102605.stderr
diff --git a/src/test/ui/impl-trait/issue-103181-1.rs b/tests/ui/impl-trait/issue-103181-1.rs
index 197aedf9d..197aedf9d 100644
--- a/src/test/ui/impl-trait/issue-103181-1.rs
+++ b/tests/ui/impl-trait/issue-103181-1.rs
diff --git a/src/test/ui/impl-trait/issue-103181-1.stderr b/tests/ui/impl-trait/issue-103181-1.stderr
index cd026607d..cd026607d 100644
--- a/src/test/ui/impl-trait/issue-103181-1.stderr
+++ b/tests/ui/impl-trait/issue-103181-1.stderr
diff --git a/src/test/ui/impl-trait/issue-103181-2.rs b/tests/ui/impl-trait/issue-103181-2.rs
index b43ac4507..b43ac4507 100644
--- a/src/test/ui/impl-trait/issue-103181-2.rs
+++ b/tests/ui/impl-trait/issue-103181-2.rs
diff --git a/src/test/ui/impl-trait/issue-103181-2.stderr b/tests/ui/impl-trait/issue-103181-2.stderr
index 5eb2dd918..5eb2dd918 100644
--- a/src/test/ui/impl-trait/issue-103181-2.stderr
+++ b/tests/ui/impl-trait/issue-103181-2.stderr
diff --git a/src/test/ui/impl-trait/issue-103599.rs b/tests/ui/impl-trait/issue-103599.rs
index 043ae67f2..043ae67f2 100644
--- a/src/test/ui/impl-trait/issue-103599.rs
+++ b/tests/ui/impl-trait/issue-103599.rs
diff --git a/src/test/ui/impl-trait/issue-103599.stderr b/tests/ui/impl-trait/issue-103599.stderr
index 82038c1dc..82038c1dc 100644
--- a/src/test/ui/impl-trait/issue-103599.stderr
+++ b/tests/ui/impl-trait/issue-103599.stderr
diff --git a/src/test/ui/impl-trait/issue-35668.rs b/tests/ui/impl-trait/issue-35668.rs
index c970163fc..c970163fc 100644
--- a/src/test/ui/impl-trait/issue-35668.rs
+++ b/tests/ui/impl-trait/issue-35668.rs
diff --git a/src/test/ui/impl-trait/issue-35668.stderr b/tests/ui/impl-trait/issue-35668.stderr
index 84add5799..84add5799 100644
--- a/src/test/ui/impl-trait/issue-35668.stderr
+++ b/tests/ui/impl-trait/issue-35668.stderr
diff --git a/src/test/ui/impl-trait/issue-46959.rs b/tests/ui/impl-trait/issue-46959.rs
index 3611a9568..3611a9568 100644
--- a/src/test/ui/impl-trait/issue-46959.rs
+++ b/tests/ui/impl-trait/issue-46959.rs
diff --git a/src/test/ui/impl-trait/issue-49556.rs b/tests/ui/impl-trait/issue-49556.rs
index c8c172f0e..c8c172f0e 100644
--- a/src/test/ui/impl-trait/issue-49556.rs
+++ b/tests/ui/impl-trait/issue-49556.rs
diff --git a/src/test/ui/impl-trait/issue-49579.rs b/tests/ui/impl-trait/issue-49579.rs
index 98de014e9..98de014e9 100644
--- a/src/test/ui/impl-trait/issue-49579.rs
+++ b/tests/ui/impl-trait/issue-49579.rs
diff --git a/src/test/ui/impl-trait/issue-49685.rs b/tests/ui/impl-trait/issue-49685.rs
index fb328d67b..fb328d67b 100644
--- a/src/test/ui/impl-trait/issue-49685.rs
+++ b/tests/ui/impl-trait/issue-49685.rs
diff --git a/src/test/ui/impl-trait/issue-51185.rs b/tests/ui/impl-trait/issue-51185.rs
index 52a2b2553..52a2b2553 100644
--- a/src/test/ui/impl-trait/issue-51185.rs
+++ b/tests/ui/impl-trait/issue-51185.rs
diff --git a/src/test/ui/impl-trait/issue-54966.rs b/tests/ui/impl-trait/issue-54966.rs
index 0ed3c4b3c..0ed3c4b3c 100644
--- a/src/test/ui/impl-trait/issue-54966.rs
+++ b/tests/ui/impl-trait/issue-54966.rs
diff --git a/src/test/ui/impl-trait/issue-54966.stderr b/tests/ui/impl-trait/issue-54966.stderr
index aa9a61cb5..aa9a61cb5 100644
--- a/src/test/ui/impl-trait/issue-54966.stderr
+++ b/tests/ui/impl-trait/issue-54966.stderr
diff --git a/src/test/ui/impl-trait/issue-55872-1.rs b/tests/ui/impl-trait/issue-55872-1.rs
index 22ff7ffa2..22ff7ffa2 100644
--- a/src/test/ui/impl-trait/issue-55872-1.rs
+++ b/tests/ui/impl-trait/issue-55872-1.rs
diff --git a/src/test/ui/impl-trait/issue-55872-1.stderr b/tests/ui/impl-trait/issue-55872-1.stderr
index 8912cce1b..8912cce1b 100644
--- a/src/test/ui/impl-trait/issue-55872-1.stderr
+++ b/tests/ui/impl-trait/issue-55872-1.stderr
diff --git a/src/test/ui/impl-trait/issue-55872-2.rs b/tests/ui/impl-trait/issue-55872-2.rs
index 4443d3c4d..4443d3c4d 100644
--- a/src/test/ui/impl-trait/issue-55872-2.rs
+++ b/tests/ui/impl-trait/issue-55872-2.rs
diff --git a/src/test/ui/impl-trait/issue-55872-2.stderr b/tests/ui/impl-trait/issue-55872-2.stderr
index 11b8485c8..11b8485c8 100644
--- a/src/test/ui/impl-trait/issue-55872-2.stderr
+++ b/tests/ui/impl-trait/issue-55872-2.stderr
diff --git a/src/test/ui/impl-trait/issue-55872-3.rs b/tests/ui/impl-trait/issue-55872-3.rs
index 91811df93..91811df93 100644
--- a/src/test/ui/impl-trait/issue-55872-3.rs
+++ b/tests/ui/impl-trait/issue-55872-3.rs
diff --git a/src/test/ui/impl-trait/issue-55872-3.stderr b/tests/ui/impl-trait/issue-55872-3.stderr
index c6e10f0f3..c6e10f0f3 100644
--- a/src/test/ui/impl-trait/issue-55872-3.stderr
+++ b/tests/ui/impl-trait/issue-55872-3.stderr
diff --git a/src/test/ui/impl-trait/issue-55872.rs b/tests/ui/impl-trait/issue-55872.rs
index c4e6f6436..c4e6f6436 100644
--- a/src/test/ui/impl-trait/issue-55872.rs
+++ b/tests/ui/impl-trait/issue-55872.rs
diff --git a/src/test/ui/impl-trait/issue-55872.stderr b/tests/ui/impl-trait/issue-55872.stderr
index cb370fbe1..cb370fbe1 100644
--- a/src/test/ui/impl-trait/issue-55872.stderr
+++ b/tests/ui/impl-trait/issue-55872.stderr
diff --git a/src/test/ui/impl-trait/issue-56445.rs b/tests/ui/impl-trait/issue-56445.rs
index 6dd1648c9..6dd1648c9 100644
--- a/src/test/ui/impl-trait/issue-56445.rs
+++ b/tests/ui/impl-trait/issue-56445.rs
diff --git a/src/test/ui/impl-trait/issue-68532.rs b/tests/ui/impl-trait/issue-68532.rs
index 01a7af0ae..01a7af0ae 100644
--- a/src/test/ui/impl-trait/issue-68532.rs
+++ b/tests/ui/impl-trait/issue-68532.rs
diff --git a/src/test/ui/impl-trait/issue-72911.rs b/tests/ui/impl-trait/issue-72911.rs
index be9c643b2..63f4898f4 100644
--- a/src/test/ui/impl-trait/issue-72911.rs
+++ b/tests/ui/impl-trait/issue-72911.rs
@@ -5,7 +5,6 @@ pub struct Lint {}
 impl Lint {}
 
 pub fn gather_all() -> impl Iterator<Item = Lint> {
-    //~^ ERROR type annotations needed
     lint_files().flat_map(|f| gather_from_file(&f))
 }
 
diff --git a/tests/ui/impl-trait/issue-72911.stderr b/tests/ui/impl-trait/issue-72911.stderr
new file mode 100644
index 000000000..0e86561aa
--- /dev/null
+++ b/tests/ui/impl-trait/issue-72911.stderr
@@ -0,0 +1,15 @@
+error[E0433]: failed to resolve: use of undeclared crate or module `foo`
+  --> $DIR/issue-72911.rs:11:33
+   |
+LL | fn gather_from_file(dir_entry: &foo::MissingItem) -> impl Iterator<Item = Lint> {
+   |                                 ^^^ use of undeclared crate or module `foo`
+
+error[E0433]: failed to resolve: use of undeclared crate or module `foo`
+  --> $DIR/issue-72911.rs:16:41
+   |
+LL | fn lint_files() -> impl Iterator<Item = foo::MissingItem> {
+   |                                         ^^^ use of undeclared crate or module `foo`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0433`.
diff --git a/src/test/ui/impl-trait/issue-86465.rs b/tests/ui/impl-trait/issue-86465.rs
index 8c7b41d73..8c7b41d73 100644
--- a/src/test/ui/impl-trait/issue-86465.rs
+++ b/tests/ui/impl-trait/issue-86465.rs
diff --git a/src/test/ui/impl-trait/issue-86465.stderr b/tests/ui/impl-trait/issue-86465.stderr
index b949b2b42..b949b2b42 100644
--- a/src/test/ui/impl-trait/issue-86465.stderr
+++ b/tests/ui/impl-trait/issue-86465.stderr
diff --git a/src/test/ui/impl-trait/issue-87450.rs b/tests/ui/impl-trait/issue-87450.rs
index 983ef7cfb..983ef7cfb 100644
--- a/src/test/ui/impl-trait/issue-87450.rs
+++ b/tests/ui/impl-trait/issue-87450.rs
diff --git a/src/test/ui/impl-trait/issue-87450.stderr b/tests/ui/impl-trait/issue-87450.stderr
index 173fca63f..173fca63f 100644
--- a/src/test/ui/impl-trait/issue-87450.stderr
+++ b/tests/ui/impl-trait/issue-87450.stderr
diff --git a/src/test/ui/impl-trait/issue-99073-2.rs b/tests/ui/impl-trait/issue-99073-2.rs
index 14ac68880..14ac68880 100644
--- a/src/test/ui/impl-trait/issue-99073-2.rs
+++ b/tests/ui/impl-trait/issue-99073-2.rs
diff --git a/src/test/ui/impl-trait/issue-99073-2.stderr b/tests/ui/impl-trait/issue-99073-2.stderr
index 913bc8f56..913bc8f56 100644
--- a/src/test/ui/impl-trait/issue-99073-2.stderr
+++ b/tests/ui/impl-trait/issue-99073-2.stderr
diff --git a/src/test/ui/impl-trait/issue-99073.rs b/tests/ui/impl-trait/issue-99073.rs
index 7798e247d..7798e247d 100644
--- a/src/test/ui/impl-trait/issue-99073.rs
+++ b/tests/ui/impl-trait/issue-99073.rs
diff --git a/src/test/ui/impl-trait/issue-99073.stderr b/tests/ui/impl-trait/issue-99073.stderr
index 546367953..546367953 100644
--- a/src/test/ui/impl-trait/issue-99073.stderr
+++ b/tests/ui/impl-trait/issue-99073.stderr
diff --git a/src/test/ui/impl-trait/issue-99642-2.rs b/tests/ui/impl-trait/issue-99642-2.rs
index 0e88b3633..0e88b3633 100644
--- a/src/test/ui/impl-trait/issue-99642-2.rs
+++ b/tests/ui/impl-trait/issue-99642-2.rs
diff --git a/src/test/ui/impl-trait/issue-99642.rs b/tests/ui/impl-trait/issue-99642.rs
index 75af60491..75af60491 100644
--- a/src/test/ui/impl-trait/issue-99642.rs
+++ b/tests/ui/impl-trait/issue-99642.rs
diff --git a/src/test/ui/impl-trait/issue-99914.rs b/tests/ui/impl-trait/issue-99914.rs
index 4324a0229..4324a0229 100644
--- a/src/test/ui/impl-trait/issue-99914.rs
+++ b/tests/ui/impl-trait/issue-99914.rs
diff --git a/src/test/ui/impl-trait/issue-99914.stderr b/tests/ui/impl-trait/issue-99914.stderr
index 074d5d58d..074d5d58d 100644
--- a/src/test/ui/impl-trait/issue-99914.stderr
+++ b/tests/ui/impl-trait/issue-99914.stderr
diff --git a/src/test/ui/impl-trait/issues/infinite-impl-trait-issue-38064.rs b/tests/ui/impl-trait/issues/infinite-impl-trait-issue-38064.rs
index 451ddb3cc..451ddb3cc 100644
--- a/src/test/ui/impl-trait/issues/infinite-impl-trait-issue-38064.rs
+++ b/tests/ui/impl-trait/issues/infinite-impl-trait-issue-38064.rs
diff --git a/src/test/ui/impl-trait/issues/infinite-impl-trait-issue-38064.stderr b/tests/ui/impl-trait/issues/infinite-impl-trait-issue-38064.stderr
index 16a1262ec..16a1262ec 100644
--- a/src/test/ui/impl-trait/issues/infinite-impl-trait-issue-38064.stderr
+++ b/tests/ui/impl-trait/issues/infinite-impl-trait-issue-38064.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-104815.rs b/tests/ui/impl-trait/issues/issue-104815.rs
index 7a9826a8d..7a9826a8d 100644
--- a/src/test/ui/impl-trait/issues/issue-104815.rs
+++ b/tests/ui/impl-trait/issues/issue-104815.rs
diff --git a/src/test/ui/impl-trait/issues/issue-105826.rs b/tests/ui/impl-trait/issues/issue-105826.rs
index 06dc2d4c8..06dc2d4c8 100644
--- a/src/test/ui/impl-trait/issues/issue-105826.rs
+++ b/tests/ui/impl-trait/issues/issue-105826.rs
diff --git a/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.rs b/tests/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.rs
index 41f48cb56..41f48cb56 100644
--- a/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.rs
+++ b/tests/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.rs
diff --git a/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr b/tests/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr
index 9150d957d..9150d957d 100644
--- a/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr
+++ b/tests/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-42479.rs b/tests/ui/impl-trait/issues/issue-42479.rs
index efc1f975d..efc1f975d 100644
--- a/src/test/ui/impl-trait/issues/issue-42479.rs
+++ b/tests/ui/impl-trait/issues/issue-42479.rs
diff --git a/src/test/ui/impl-trait/issues/issue-49376.rs b/tests/ui/impl-trait/issues/issue-49376.rs
index e4472fcc1..e4472fcc1 100644
--- a/src/test/ui/impl-trait/issues/issue-49376.rs
+++ b/tests/ui/impl-trait/issues/issue-49376.rs
diff --git a/src/test/ui/impl-trait/issues/issue-52128.rs b/tests/ui/impl-trait/issues/issue-52128.rs
index 5afd380dd..5afd380dd 100644
--- a/src/test/ui/impl-trait/issues/issue-52128.rs
+++ b/tests/ui/impl-trait/issues/issue-52128.rs
diff --git a/src/test/ui/impl-trait/issues/issue-53457.rs b/tests/ui/impl-trait/issues/issue-53457.rs
index 7b9c2c53a..7b9c2c53a 100644
--- a/src/test/ui/impl-trait/issues/issue-53457.rs
+++ b/tests/ui/impl-trait/issues/issue-53457.rs
diff --git a/src/test/ui/impl-trait/issues/issue-54600.rs b/tests/ui/impl-trait/issues/issue-54600.rs
index 3024fedf7..3024fedf7 100644
--- a/src/test/ui/impl-trait/issues/issue-54600.rs
+++ b/tests/ui/impl-trait/issues/issue-54600.rs
diff --git a/src/test/ui/impl-trait/issues/issue-54600.stderr b/tests/ui/impl-trait/issues/issue-54600.stderr
index 316566a57..316566a57 100644
--- a/src/test/ui/impl-trait/issues/issue-54600.stderr
+++ b/tests/ui/impl-trait/issues/issue-54600.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-54840.rs b/tests/ui/impl-trait/issues/issue-54840.rs
index 8f1e0ece0..8f1e0ece0 100644
--- a/src/test/ui/impl-trait/issues/issue-54840.rs
+++ b/tests/ui/impl-trait/issues/issue-54840.rs
diff --git a/src/test/ui/impl-trait/issues/issue-54840.stderr b/tests/ui/impl-trait/issues/issue-54840.stderr
index 8d82133ac..8d82133ac 100644
--- a/src/test/ui/impl-trait/issues/issue-54840.stderr
+++ b/tests/ui/impl-trait/issues/issue-54840.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-54895.rs b/tests/ui/impl-trait/issues/issue-54895.rs
index 8d7a1d56f..8d7a1d56f 100644
--- a/src/test/ui/impl-trait/issues/issue-54895.rs
+++ b/tests/ui/impl-trait/issues/issue-54895.rs
diff --git a/src/test/ui/impl-trait/issues/issue-54895.stderr b/tests/ui/impl-trait/issues/issue-54895.stderr
index 7d22f027a..7d22f027a 100644
--- a/src/test/ui/impl-trait/issues/issue-54895.stderr
+++ b/tests/ui/impl-trait/issues/issue-54895.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-55608-captures-empty-region.rs b/tests/ui/impl-trait/issues/issue-55608-captures-empty-region.rs
index 0c34c97e2..0c34c97e2 100644
--- a/src/test/ui/impl-trait/issues/issue-55608-captures-empty-region.rs
+++ b/tests/ui/impl-trait/issues/issue-55608-captures-empty-region.rs
diff --git a/src/test/ui/impl-trait/issues/issue-57464-unexpected-regions.rs b/tests/ui/impl-trait/issues/issue-57464-unexpected-regions.rs
index c4f738a34..c4f738a34 100644
--- a/src/test/ui/impl-trait/issues/issue-57464-unexpected-regions.rs
+++ b/tests/ui/impl-trait/issues/issue-57464-unexpected-regions.rs
diff --git a/src/test/ui/impl-trait/issues/issue-57979-deeply-nested-impl-trait-in-assoc-proj.rs b/tests/ui/impl-trait/issues/issue-57979-deeply-nested-impl-trait-in-assoc-proj.rs
index 0daec3305..0daec3305 100644
--- a/src/test/ui/impl-trait/issues/issue-57979-deeply-nested-impl-trait-in-assoc-proj.rs
+++ b/tests/ui/impl-trait/issues/issue-57979-deeply-nested-impl-trait-in-assoc-proj.rs
diff --git a/src/test/ui/impl-trait/issues/issue-57979-deeply-nested-impl-trait-in-assoc-proj.stderr b/tests/ui/impl-trait/issues/issue-57979-deeply-nested-impl-trait-in-assoc-proj.stderr
index 6bebbc01f..6bebbc01f 100644
--- a/src/test/ui/impl-trait/issues/issue-57979-deeply-nested-impl-trait-in-assoc-proj.stderr
+++ b/tests/ui/impl-trait/issues/issue-57979-deeply-nested-impl-trait-in-assoc-proj.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-57979-impl-trait-in-path.rs b/tests/ui/impl-trait/issues/issue-57979-impl-trait-in-path.rs
index c5ecd1caa..c5ecd1caa 100644
--- a/src/test/ui/impl-trait/issues/issue-57979-impl-trait-in-path.rs
+++ b/tests/ui/impl-trait/issues/issue-57979-impl-trait-in-path.rs
diff --git a/src/test/ui/impl-trait/issues/issue-57979-impl-trait-in-path.stderr b/tests/ui/impl-trait/issues/issue-57979-impl-trait-in-path.stderr
index e31393181..e31393181 100644
--- a/src/test/ui/impl-trait/issues/issue-57979-impl-trait-in-path.stderr
+++ b/tests/ui/impl-trait/issues/issue-57979-impl-trait-in-path.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-57979-nested-impl-trait-in-assoc-proj.rs b/tests/ui/impl-trait/issues/issue-57979-nested-impl-trait-in-assoc-proj.rs
index 5a444d3df..5a444d3df 100644
--- a/src/test/ui/impl-trait/issues/issue-57979-nested-impl-trait-in-assoc-proj.rs
+++ b/tests/ui/impl-trait/issues/issue-57979-nested-impl-trait-in-assoc-proj.rs
diff --git a/src/test/ui/impl-trait/issues/issue-57979-nested-impl-trait-in-assoc-proj.stderr b/tests/ui/impl-trait/issues/issue-57979-nested-impl-trait-in-assoc-proj.stderr
index 8d3d4b5e2..8d3d4b5e2 100644
--- a/src/test/ui/impl-trait/issues/issue-57979-nested-impl-trait-in-assoc-proj.stderr
+++ b/tests/ui/impl-trait/issues/issue-57979-nested-impl-trait-in-assoc-proj.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-58504.rs b/tests/ui/impl-trait/issues/issue-58504.rs
index e5865d0df..e5865d0df 100644
--- a/src/test/ui/impl-trait/issues/issue-58504.rs
+++ b/tests/ui/impl-trait/issues/issue-58504.rs
diff --git a/src/test/ui/impl-trait/issues/issue-58504.stderr b/tests/ui/impl-trait/issues/issue-58504.stderr
index 6656e9fc3..6656e9fc3 100644
--- a/src/test/ui/impl-trait/issues/issue-58504.stderr
+++ b/tests/ui/impl-trait/issues/issue-58504.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-58956.rs b/tests/ui/impl-trait/issues/issue-58956.rs
index 68cfcd9ba..68cfcd9ba 100644
--- a/src/test/ui/impl-trait/issues/issue-58956.rs
+++ b/tests/ui/impl-trait/issues/issue-58956.rs
diff --git a/src/test/ui/impl-trait/issues/issue-58956.stderr b/tests/ui/impl-trait/issues/issue-58956.stderr
index 123fb4df4..123fb4df4 100644
--- a/src/test/ui/impl-trait/issues/issue-58956.stderr
+++ b/tests/ui/impl-trait/issues/issue-58956.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-62742.rs b/tests/ui/impl-trait/issues/issue-62742.rs
index 041bd0e38..041bd0e38 100644
--- a/src/test/ui/impl-trait/issues/issue-62742.rs
+++ b/tests/ui/impl-trait/issues/issue-62742.rs
diff --git a/src/test/ui/impl-trait/issues/issue-62742.stderr b/tests/ui/impl-trait/issues/issue-62742.stderr
index 34f4dc2ce..d872291c8 100644
--- a/src/test/ui/impl-trait/issues/issue-62742.stderr
+++ b/tests/ui/impl-trait/issues/issue-62742.stderr
@@ -23,9 +23,14 @@ LL | pub struct RawImpl<T>(PhantomData<T>);
 LL | pub struct SafeImpl<T: ?Sized, A: Raw<T>>(PhantomData<(A, T)>);
    | ----------------------------------------- function or associated item `foo` not found for this struct
    |
-   = note: the following trait bounds were not satisfied:
-           `RawImpl<()>: Raw<()>`
-note: the following trait must be implemented
+note: trait bound `RawImpl<()>: Raw<()>` was not satisfied
+  --> $DIR/issue-62742.rs:28:20
+   |
+LL | impl<T: ?Sized, A: Raw<T>> SafeImpl<T, A> {
+   |                    ^^^^^^  --------------
+   |                    |
+   |                    unsatisfied trait bound introduced here
+note: the trait `Raw` must be implemented
   --> $DIR/issue-62742.rs:12:1
    |
 LL | pub trait Raw<T: ?Sized> {
diff --git a/src/test/ui/impl-trait/issues/issue-65581.rs b/tests/ui/impl-trait/issues/issue-65581.rs
index b947fc1d2..b947fc1d2 100644
--- a/src/test/ui/impl-trait/issues/issue-65581.rs
+++ b/tests/ui/impl-trait/issues/issue-65581.rs
diff --git a/src/test/ui/impl-trait/issues/issue-67830.rs b/tests/ui/impl-trait/issues/issue-67830.rs
index 92f7e005d..92f7e005d 100644
--- a/src/test/ui/impl-trait/issues/issue-67830.rs
+++ b/tests/ui/impl-trait/issues/issue-67830.rs
diff --git a/src/test/ui/impl-trait/issues/issue-67830.stderr b/tests/ui/impl-trait/issues/issue-67830.stderr
index d3ea8cb03..d3ea8cb03 100644
--- a/src/test/ui/impl-trait/issues/issue-67830.stderr
+++ b/tests/ui/impl-trait/issues/issue-67830.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-70877.rs b/tests/ui/impl-trait/issues/issue-70877.rs
index 8169cfafa..8169cfafa 100644
--- a/src/test/ui/impl-trait/issues/issue-70877.rs
+++ b/tests/ui/impl-trait/issues/issue-70877.rs
diff --git a/src/test/ui/impl-trait/issues/issue-70877.stderr b/tests/ui/impl-trait/issues/issue-70877.stderr
index 8813bff3c..8813bff3c 100644
--- a/src/test/ui/impl-trait/issues/issue-70877.stderr
+++ b/tests/ui/impl-trait/issues/issue-70877.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-70971.rs b/tests/ui/impl-trait/issues/issue-70971.rs
index f8ae18bac..f8ae18bac 100644
--- a/src/test/ui/impl-trait/issues/issue-70971.rs
+++ b/tests/ui/impl-trait/issues/issue-70971.rs
diff --git a/src/test/ui/impl-trait/issues/issue-70971.stderr b/tests/ui/impl-trait/issues/issue-70971.stderr
index 4dda4c22a..4dda4c22a 100644
--- a/src/test/ui/impl-trait/issues/issue-70971.stderr
+++ b/tests/ui/impl-trait/issues/issue-70971.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-74282.rs b/tests/ui/impl-trait/issues/issue-74282.rs
index 654de0cd0..654de0cd0 100644
--- a/src/test/ui/impl-trait/issues/issue-74282.rs
+++ b/tests/ui/impl-trait/issues/issue-74282.rs
diff --git a/src/test/ui/impl-trait/issues/issue-74282.stderr b/tests/ui/impl-trait/issues/issue-74282.stderr
index 5b05fb281..5b05fb281 100644
--- a/src/test/ui/impl-trait/issues/issue-74282.stderr
+++ b/tests/ui/impl-trait/issues/issue-74282.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-77987.rs b/tests/ui/impl-trait/issues/issue-77987.rs
index d29710b6f..d29710b6f 100644
--- a/src/test/ui/impl-trait/issues/issue-77987.rs
+++ b/tests/ui/impl-trait/issues/issue-77987.rs
diff --git a/src/test/ui/impl-trait/issues/issue-78722.rs b/tests/ui/impl-trait/issues/issue-78722.rs
index 78233f300..78233f300 100644
--- a/src/test/ui/impl-trait/issues/issue-78722.rs
+++ b/tests/ui/impl-trait/issues/issue-78722.rs
diff --git a/src/test/ui/impl-trait/issues/issue-78722.stderr b/tests/ui/impl-trait/issues/issue-78722.stderr
index c00df8087..c00df8087 100644
--- a/src/test/ui/impl-trait/issues/issue-78722.stderr
+++ b/tests/ui/impl-trait/issues/issue-78722.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-79099.rs b/tests/ui/impl-trait/issues/issue-79099.rs
index da53594f3..da53594f3 100644
--- a/src/test/ui/impl-trait/issues/issue-79099.rs
+++ b/tests/ui/impl-trait/issues/issue-79099.rs
diff --git a/src/test/ui/impl-trait/issues/issue-79099.stderr b/tests/ui/impl-trait/issues/issue-79099.stderr
index 362c67daf..362c67daf 100644
--- a/src/test/ui/impl-trait/issues/issue-79099.stderr
+++ b/tests/ui/impl-trait/issues/issue-79099.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-82139.rs b/tests/ui/impl-trait/issues/issue-82139.rs
index cc9167b34..cc9167b34 100644
--- a/src/test/ui/impl-trait/issues/issue-82139.rs
+++ b/tests/ui/impl-trait/issues/issue-82139.rs
diff --git a/src/test/ui/impl-trait/issues/issue-82139.stderr b/tests/ui/impl-trait/issues/issue-82139.stderr
index 0adcd4a7a..0adcd4a7a 100644
--- a/src/test/ui/impl-trait/issues/issue-82139.stderr
+++ b/tests/ui/impl-trait/issues/issue-82139.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-83919.rs b/tests/ui/impl-trait/issues/issue-83919.rs
index e76443a65..e76443a65 100644
--- a/src/test/ui/impl-trait/issues/issue-83919.rs
+++ b/tests/ui/impl-trait/issues/issue-83919.rs
diff --git a/src/test/ui/impl-trait/issues/issue-83919.stderr b/tests/ui/impl-trait/issues/issue-83919.stderr
index d39dcf7fb..d39dcf7fb 100644
--- a/src/test/ui/impl-trait/issues/issue-83919.stderr
+++ b/tests/ui/impl-trait/issues/issue-83919.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-83929-impl-trait-in-generic-default.rs b/tests/ui/impl-trait/issues/issue-83929-impl-trait-in-generic-default.rs
index 344f35952..344f35952 100644
--- a/src/test/ui/impl-trait/issues/issue-83929-impl-trait-in-generic-default.rs
+++ b/tests/ui/impl-trait/issues/issue-83929-impl-trait-in-generic-default.rs
diff --git a/src/test/ui/impl-trait/issues/issue-83929-impl-trait-in-generic-default.stderr b/tests/ui/impl-trait/issues/issue-83929-impl-trait-in-generic-default.stderr
index e635e554e..e635e554e 100644
--- a/src/test/ui/impl-trait/issues/issue-83929-impl-trait-in-generic-default.stderr
+++ b/tests/ui/impl-trait/issues/issue-83929-impl-trait-in-generic-default.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-84073.rs b/tests/ui/impl-trait/issues/issue-84073.rs
index 49a34ccfa..49a34ccfa 100644
--- a/src/test/ui/impl-trait/issues/issue-84073.rs
+++ b/tests/ui/impl-trait/issues/issue-84073.rs
diff --git a/src/test/ui/impl-trait/issues/issue-84073.stderr b/tests/ui/impl-trait/issues/issue-84073.stderr
index 3c39aa6ce..3c39aa6ce 100644
--- a/src/test/ui/impl-trait/issues/issue-84073.stderr
+++ b/tests/ui/impl-trait/issues/issue-84073.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-84919.rs b/tests/ui/impl-trait/issues/issue-84919.rs
index a0b73743a..a0b73743a 100644
--- a/src/test/ui/impl-trait/issues/issue-84919.rs
+++ b/tests/ui/impl-trait/issues/issue-84919.rs
diff --git a/src/test/ui/impl-trait/issues/issue-84919.stderr b/tests/ui/impl-trait/issues/issue-84919.stderr
index 5abe1bd87..5abe1bd87 100644
--- a/src/test/ui/impl-trait/issues/issue-84919.stderr
+++ b/tests/ui/impl-trait/issues/issue-84919.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-86201.rs b/tests/ui/impl-trait/issues/issue-86201.rs
index 0786e66ca..0786e66ca 100644
--- a/src/test/ui/impl-trait/issues/issue-86201.rs
+++ b/tests/ui/impl-trait/issues/issue-86201.rs
diff --git a/src/test/ui/impl-trait/issues/issue-86642.rs b/tests/ui/impl-trait/issues/issue-86642.rs
index e6e957714..e6e957714 100644
--- a/src/test/ui/impl-trait/issues/issue-86642.rs
+++ b/tests/ui/impl-trait/issues/issue-86642.rs
diff --git a/src/test/ui/impl-trait/issues/issue-86642.stderr b/tests/ui/impl-trait/issues/issue-86642.stderr
index 0ec118d5b..0ec118d5b 100644
--- a/src/test/ui/impl-trait/issues/issue-86642.stderr
+++ b/tests/ui/impl-trait/issues/issue-86642.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-86719.rs b/tests/ui/impl-trait/issues/issue-86719.rs
index f4b0b3f33..f4b0b3f33 100644
--- a/src/test/ui/impl-trait/issues/issue-86719.rs
+++ b/tests/ui/impl-trait/issues/issue-86719.rs
diff --git a/src/test/ui/impl-trait/issues/issue-86719.stderr b/tests/ui/impl-trait/issues/issue-86719.stderr
index 09047cdcb..7592418fd 100644
--- a/src/test/ui/impl-trait/issues/issue-86719.stderr
+++ b/tests/ui/impl-trait/issues/issue-86719.stderr
@@ -20,8 +20,8 @@ LL |         |_| true
    |
 help: consider giving this closure parameter an explicit type
    |
-LL |         |_: _| true
-   |           +++
+LL |         |_: /* Type */| true
+   |           ++++++++++++
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/impl-trait/issues/issue-86800.rs b/tests/ui/impl-trait/issues/issue-86800.rs
index 351243c67..351243c67 100644
--- a/src/test/ui/impl-trait/issues/issue-86800.rs
+++ b/tests/ui/impl-trait/issues/issue-86800.rs
diff --git a/src/test/ui/impl-trait/issues/issue-86800.stderr b/tests/ui/impl-trait/issues/issue-86800.stderr
index 6c4aa3567..6c4aa3567 100644
--- a/src/test/ui/impl-trait/issues/issue-86800.stderr
+++ b/tests/ui/impl-trait/issues/issue-86800.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-87295.rs b/tests/ui/impl-trait/issues/issue-87295.rs
index aeb8f8332..aeb8f8332 100644
--- a/src/test/ui/impl-trait/issues/issue-87295.rs
+++ b/tests/ui/impl-trait/issues/issue-87295.rs
diff --git a/src/test/ui/impl-trait/issues/issue-87295.stderr b/tests/ui/impl-trait/issues/issue-87295.stderr
index 0b043056b..0b043056b 100644
--- a/src/test/ui/impl-trait/issues/issue-87295.stderr
+++ b/tests/ui/impl-trait/issues/issue-87295.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-87340.rs b/tests/ui/impl-trait/issues/issue-87340.rs
index f0f6d2bb6..f0f6d2bb6 100644
--- a/src/test/ui/impl-trait/issues/issue-87340.rs
+++ b/tests/ui/impl-trait/issues/issue-87340.rs
diff --git a/src/test/ui/impl-trait/issues/issue-87340.stderr b/tests/ui/impl-trait/issues/issue-87340.stderr
index 2ab1e6a03..2ab1e6a03 100644
--- a/src/test/ui/impl-trait/issues/issue-87340.stderr
+++ b/tests/ui/impl-trait/issues/issue-87340.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-88236-2.rs b/tests/ui/impl-trait/issues/issue-88236-2.rs
index fde8a6704..fde8a6704 100644
--- a/src/test/ui/impl-trait/issues/issue-88236-2.rs
+++ b/tests/ui/impl-trait/issues/issue-88236-2.rs
diff --git a/src/test/ui/impl-trait/issues/issue-88236-2.stderr b/tests/ui/impl-trait/issues/issue-88236-2.stderr
index 8605d07ab..8605d07ab 100644
--- a/src/test/ui/impl-trait/issues/issue-88236-2.stderr
+++ b/tests/ui/impl-trait/issues/issue-88236-2.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-88236.rs b/tests/ui/impl-trait/issues/issue-88236.rs
index 36d124173..36d124173 100644
--- a/src/test/ui/impl-trait/issues/issue-88236.rs
+++ b/tests/ui/impl-trait/issues/issue-88236.rs
diff --git a/src/test/ui/impl-trait/issues/issue-88236.stderr b/tests/ui/impl-trait/issues/issue-88236.stderr
index 7a4cc57b0..7a4cc57b0 100644
--- a/src/test/ui/impl-trait/issues/issue-88236.stderr
+++ b/tests/ui/impl-trait/issues/issue-88236.stderr
diff --git a/src/test/ui/impl-trait/issues/issue-89312.rs b/tests/ui/impl-trait/issues/issue-89312.rs
index d685a6f12..d685a6f12 100644
--- a/src/test/ui/impl-trait/issues/issue-89312.rs
+++ b/tests/ui/impl-trait/issues/issue-89312.rs
diff --git a/src/test/ui/impl-trait/issues/issue-92305.rs b/tests/ui/impl-trait/issues/issue-92305.rs
index 4a89238d0..4a89238d0 100644
--- a/src/test/ui/impl-trait/issues/issue-92305.rs
+++ b/tests/ui/impl-trait/issues/issue-92305.rs
diff --git a/tests/ui/impl-trait/issues/issue-92305.stderr b/tests/ui/impl-trait/issues/issue-92305.stderr
new file mode 100644
index 000000000..86d7184da
--- /dev/null
+++ b/tests/ui/impl-trait/issues/issue-92305.stderr
@@ -0,0 +1,14 @@
+error[E0107]: missing generics for struct `Vec`
+  --> $DIR/issue-92305.rs:5:45
+   |
+LL | fn f<T>(data: &[T]) -> impl Iterator<Item = Vec> {
+   |                                             ^^^ expected at least 1 generic argument
+   |
+help: add missing generic argument
+   |
+LL | fn f<T>(data: &[T]) -> impl Iterator<Item = Vec<T>> {
+   |                                                +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0107`.
diff --git a/src/test/ui/impl-trait/issues/issue-93788.rs b/tests/ui/impl-trait/issues/issue-93788.rs
index 6924931cd..6924931cd 100644
--- a/src/test/ui/impl-trait/issues/issue-93788.rs
+++ b/tests/ui/impl-trait/issues/issue-93788.rs
diff --git a/src/test/ui/impl-trait/issues/issue-99348-impl-compatibility.rs b/tests/ui/impl-trait/issues/issue-99348-impl-compatibility.rs
index b05579f21..b05579f21 100644
--- a/src/test/ui/impl-trait/issues/issue-99348-impl-compatibility.rs
+++ b/tests/ui/impl-trait/issues/issue-99348-impl-compatibility.rs
diff --git a/src/test/ui/impl-trait/issues/issue-99348-impl-compatibility.stderr b/tests/ui/impl-trait/issues/issue-99348-impl-compatibility.stderr
index f0dceb1b1..f0dceb1b1 100644
--- a/src/test/ui/impl-trait/issues/issue-99348-impl-compatibility.stderr
+++ b/tests/ui/impl-trait/issues/issue-99348-impl-compatibility.stderr
diff --git a/src/test/ui/impl-trait/lifetimes.rs b/tests/ui/impl-trait/lifetimes.rs
index 9a9843375..9a9843375 100644
--- a/src/test/ui/impl-trait/lifetimes.rs
+++ b/tests/ui/impl-trait/lifetimes.rs
diff --git a/src/test/ui/impl-trait/lifetimes2.rs b/tests/ui/impl-trait/lifetimes2.rs
index 834f2dc6c..834f2dc6c 100644
--- a/src/test/ui/impl-trait/lifetimes2.rs
+++ b/tests/ui/impl-trait/lifetimes2.rs
diff --git a/src/test/ui/impl-trait/method-suggestion-no-duplication.rs b/tests/ui/impl-trait/method-suggestion-no-duplication.rs
index c5c966a95..c5c966a95 100644
--- a/src/test/ui/impl-trait/method-suggestion-no-duplication.rs
+++ b/tests/ui/impl-trait/method-suggestion-no-duplication.rs
diff --git a/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr b/tests/ui/impl-trait/method-suggestion-no-duplication.stderr
index b727b2ca0..b727b2ca0 100644
--- a/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr
+++ b/tests/ui/impl-trait/method-suggestion-no-duplication.stderr
diff --git a/src/test/ui/impl-trait/multiple-lifetimes.rs b/tests/ui/impl-trait/multiple-lifetimes.rs
index 5407fb6dd..5407fb6dd 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes.rs
+++ b/tests/ui/impl-trait/multiple-lifetimes.rs
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/error-handling-2.rs b/tests/ui/impl-trait/multiple-lifetimes/error-handling-2.rs
index 2a2be6b74..2a2be6b74 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/error-handling-2.rs
+++ b/tests/ui/impl-trait/multiple-lifetimes/error-handling-2.rs
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/error-handling-2.stderr b/tests/ui/impl-trait/multiple-lifetimes/error-handling-2.stderr
index 908757080..908757080 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/error-handling-2.stderr
+++ b/tests/ui/impl-trait/multiple-lifetimes/error-handling-2.stderr
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/error-handling.polonius.stderr b/tests/ui/impl-trait/multiple-lifetimes/error-handling.polonius.stderr
index ccd004003..ccd004003 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/error-handling.polonius.stderr
+++ b/tests/ui/impl-trait/multiple-lifetimes/error-handling.polonius.stderr
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/error-handling.rs b/tests/ui/impl-trait/multiple-lifetimes/error-handling.rs
index 367e7f4e6..367e7f4e6 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/error-handling.rs
+++ b/tests/ui/impl-trait/multiple-lifetimes/error-handling.rs
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/error-handling.stderr b/tests/ui/impl-trait/multiple-lifetimes/error-handling.stderr
index 01d9f506a..01d9f506a 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/error-handling.stderr
+++ b/tests/ui/impl-trait/multiple-lifetimes/error-handling.stderr
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/inverse-bounds.rs b/tests/ui/impl-trait/multiple-lifetimes/inverse-bounds.rs
index 5251eeee8..5251eeee8 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/inverse-bounds.rs
+++ b/tests/ui/impl-trait/multiple-lifetimes/inverse-bounds.rs
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-elided.rs b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-elided.rs
index 0bddce49b..0bddce49b 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-elided.rs
+++ b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-elided.rs
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-type-alias-impl-trait.rs b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-type-alias-impl-trait.rs
index e363fdb36..e363fdb36 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-type-alias-impl-trait.rs
+++ b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-type-alias-impl-trait.rs
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original.rs b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original.rs
index 0f21dd5ff..0f21dd5ff 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original.rs
+++ b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original.rs
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-other.rs b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-other.rs
index 13ad1f721..13ad1f721 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-other.rs
+++ b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-other.rs
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.rs b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.rs
index c6eea5323..c6eea5323 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.rs
+++ b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.rs
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.stderr b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.stderr
index ec49a6179..ec49a6179 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.stderr
+++ b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.stderr
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.rs b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.rs
index adcbca2a4..adcbca2a4 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.rs
+++ b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.rs
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.stderr b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.stderr
index c36f9bc69..c36f9bc69 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.stderr
+++ b/tests/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.stderr
diff --git a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.rs b/tests/ui/impl-trait/must_outlive_least_region_or_bound.rs
index 18404f986..18404f986 100644
--- a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.rs
+++ b/tests/ui/impl-trait/must_outlive_least_region_or_bound.rs
diff --git a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr b/tests/ui/impl-trait/must_outlive_least_region_or_bound.stderr
index 9c81791fb..9c81791fb 100644
--- a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr
+++ b/tests/ui/impl-trait/must_outlive_least_region_or_bound.stderr
diff --git a/src/test/ui/impl-trait/needs_least_region_or_bound.rs b/tests/ui/impl-trait/needs_least_region_or_bound.rs
index c4bcfe5b2..c4bcfe5b2 100644
--- a/src/test/ui/impl-trait/needs_least_region_or_bound.rs
+++ b/tests/ui/impl-trait/needs_least_region_or_bound.rs
diff --git a/src/test/ui/impl-trait/negative-reasoning.rs b/tests/ui/impl-trait/negative-reasoning.rs
index 70e24a3a9..70e24a3a9 100644
--- a/src/test/ui/impl-trait/negative-reasoning.rs
+++ b/tests/ui/impl-trait/negative-reasoning.rs
diff --git a/src/test/ui/impl-trait/negative-reasoning.stderr b/tests/ui/impl-trait/negative-reasoning.stderr
index 6b8cc9e73..6b8cc9e73 100644
--- a/src/test/ui/impl-trait/negative-reasoning.stderr
+++ b/tests/ui/impl-trait/negative-reasoning.stderr
diff --git a/src/test/ui/impl-trait/nested-return-type.rs b/tests/ui/impl-trait/nested-return-type.rs
index 7d7a084b8..7d7a084b8 100644
--- a/src/test/ui/impl-trait/nested-return-type.rs
+++ b/tests/ui/impl-trait/nested-return-type.rs
diff --git a/src/test/ui/impl-trait/nested-return-type2-tait.rs b/tests/ui/impl-trait/nested-return-type2-tait.rs
index 089018a1c..089018a1c 100644
--- a/src/test/ui/impl-trait/nested-return-type2-tait.rs
+++ b/tests/ui/impl-trait/nested-return-type2-tait.rs
diff --git a/src/test/ui/impl-trait/nested-return-type2-tait.stderr b/tests/ui/impl-trait/nested-return-type2-tait.stderr
index a8eb69cfc..a8eb69cfc 100644
--- a/src/test/ui/impl-trait/nested-return-type2-tait.stderr
+++ b/tests/ui/impl-trait/nested-return-type2-tait.stderr
diff --git a/src/test/ui/impl-trait/nested-return-type2-tait2.rs b/tests/ui/impl-trait/nested-return-type2-tait2.rs
index af8e06630..af8e06630 100644
--- a/src/test/ui/impl-trait/nested-return-type2-tait2.rs
+++ b/tests/ui/impl-trait/nested-return-type2-tait2.rs
diff --git a/src/test/ui/impl-trait/nested-return-type2-tait2.stderr b/tests/ui/impl-trait/nested-return-type2-tait2.stderr
index 348c737b0..b85bb5efd 100644
--- a/src/test/ui/impl-trait/nested-return-type2-tait2.stderr
+++ b/tests/ui/impl-trait/nested-return-type2-tait2.stderr
@@ -9,7 +9,9 @@ note: required for `[closure@$DIR/nested-return-type2-tait2.rs:27:5: 27:7]` to i
   --> $DIR/nested-return-type2-tait2.rs:14:31
    |
 LL | impl<R: Duh, F: FnMut() -> R> Trait for F {
-   |                               ^^^^^     ^
+   |         ---                   ^^^^^     ^
+   |         |
+   |         unsatisfied trait bound introduced here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/impl-trait/nested-return-type2-tait3.rs b/tests/ui/impl-trait/nested-return-type2-tait3.rs
index 74fd8a9dd..74fd8a9dd 100644
--- a/src/test/ui/impl-trait/nested-return-type2-tait3.rs
+++ b/tests/ui/impl-trait/nested-return-type2-tait3.rs
diff --git a/src/test/ui/impl-trait/nested-return-type2-tait3.stderr b/tests/ui/impl-trait/nested-return-type2-tait3.stderr
index 6ac671415..19fd3c134 100644
--- a/src/test/ui/impl-trait/nested-return-type2-tait3.stderr
+++ b/tests/ui/impl-trait/nested-return-type2-tait3.stderr
@@ -9,7 +9,9 @@ note: required for `[closure@$DIR/nested-return-type2-tait3.rs:26:5: 26:7]` to i
   --> $DIR/nested-return-type2-tait3.rs:14:31
    |
 LL | impl<R: Duh, F: FnMut() -> R> Trait for F {
-   |                               ^^^^^     ^
+   |         ---                   ^^^^^     ^
+   |         |
+   |         unsatisfied trait bound introduced here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/impl-trait/nested-return-type2.rs b/tests/ui/impl-trait/nested-return-type2.rs
index cc1f1f4ec..cc1f1f4ec 100644
--- a/src/test/ui/impl-trait/nested-return-type2.rs
+++ b/tests/ui/impl-trait/nested-return-type2.rs
diff --git a/src/test/ui/impl-trait/nested-return-type2.stderr b/tests/ui/impl-trait/nested-return-type2.stderr
index 3aed05ca1..3aed05ca1 100644
--- a/src/test/ui/impl-trait/nested-return-type2.stderr
+++ b/tests/ui/impl-trait/nested-return-type2.stderr
diff --git a/src/test/ui/impl-trait/nested-return-type3-tait.rs b/tests/ui/impl-trait/nested-return-type3-tait.rs
index 3a97e35b4..3a97e35b4 100644
--- a/src/test/ui/impl-trait/nested-return-type3-tait.rs
+++ b/tests/ui/impl-trait/nested-return-type3-tait.rs
diff --git a/src/test/ui/impl-trait/nested-return-type3-tait.stderr b/tests/ui/impl-trait/nested-return-type3-tait.stderr
index 5f58c8dca..5f58c8dca 100644
--- a/src/test/ui/impl-trait/nested-return-type3-tait.stderr
+++ b/tests/ui/impl-trait/nested-return-type3-tait.stderr
diff --git a/src/test/ui/impl-trait/nested-return-type3-tait2.rs b/tests/ui/impl-trait/nested-return-type3-tait2.rs
index 5b6f78a98..5b6f78a98 100644
--- a/src/test/ui/impl-trait/nested-return-type3-tait2.rs
+++ b/tests/ui/impl-trait/nested-return-type3-tait2.rs
diff --git a/src/test/ui/impl-trait/nested-return-type3-tait2.stderr b/tests/ui/impl-trait/nested-return-type3-tait2.stderr
index c07f6ead7..c07f6ead7 100644
--- a/src/test/ui/impl-trait/nested-return-type3-tait2.stderr
+++ b/tests/ui/impl-trait/nested-return-type3-tait2.stderr
diff --git a/src/test/ui/impl-trait/nested-return-type3-tait3.rs b/tests/ui/impl-trait/nested-return-type3-tait3.rs
index 394d8f581..394d8f581 100644
--- a/src/test/ui/impl-trait/nested-return-type3-tait3.rs
+++ b/tests/ui/impl-trait/nested-return-type3-tait3.rs
diff --git a/src/test/ui/impl-trait/nested-return-type3-tait3.stderr b/tests/ui/impl-trait/nested-return-type3-tait3.stderr
index d98ad8922..d98ad8922 100644
--- a/src/test/ui/impl-trait/nested-return-type3-tait3.stderr
+++ b/tests/ui/impl-trait/nested-return-type3-tait3.stderr
diff --git a/src/test/ui/impl-trait/nested-return-type3.rs b/tests/ui/impl-trait/nested-return-type3.rs
index 5a764fc4c..5a764fc4c 100644
--- a/src/test/ui/impl-trait/nested-return-type3.rs
+++ b/tests/ui/impl-trait/nested-return-type3.rs
diff --git a/src/test/ui/impl-trait/nested-return-type3.stderr b/tests/ui/impl-trait/nested-return-type3.stderr
index 632de71aa..632de71aa 100644
--- a/src/test/ui/impl-trait/nested-return-type3.stderr
+++ b/tests/ui/impl-trait/nested-return-type3.stderr
diff --git a/src/test/ui/impl-trait/nested-return-type4.rs b/tests/ui/impl-trait/nested-return-type4.rs
index cec70bb1a..cec70bb1a 100644
--- a/src/test/ui/impl-trait/nested-return-type4.rs
+++ b/tests/ui/impl-trait/nested-return-type4.rs
diff --git a/src/test/ui/impl-trait/nested-return-type4.stderr b/tests/ui/impl-trait/nested-return-type4.stderr
index e761a60e7..e761a60e7 100644
--- a/src/test/ui/impl-trait/nested-return-type4.stderr
+++ b/tests/ui/impl-trait/nested-return-type4.stderr
diff --git a/src/test/ui/impl-trait/nested-rpit-hrtb.rs b/tests/ui/impl-trait/nested-rpit-hrtb.rs
index a5db10d3a..a5db10d3a 100644
--- a/src/test/ui/impl-trait/nested-rpit-hrtb.rs
+++ b/tests/ui/impl-trait/nested-rpit-hrtb.rs
diff --git a/src/test/ui/impl-trait/nested-rpit-hrtb.stderr b/tests/ui/impl-trait/nested-rpit-hrtb.stderr
index 3dbe6ebad..3dbe6ebad 100644
--- a/src/test/ui/impl-trait/nested-rpit-hrtb.stderr
+++ b/tests/ui/impl-trait/nested-rpit-hrtb.stderr
diff --git a/src/test/ui/impl-trait/nested-rpit-with-anonymous-lifetimes.rs b/tests/ui/impl-trait/nested-rpit-with-anonymous-lifetimes.rs
index 287a030cf..287a030cf 100644
--- a/src/test/ui/impl-trait/nested-rpit-with-anonymous-lifetimes.rs
+++ b/tests/ui/impl-trait/nested-rpit-with-anonymous-lifetimes.rs
diff --git a/src/test/ui/impl-trait/nested_impl_trait.rs b/tests/ui/impl-trait/nested_impl_trait.rs
index e95fab3b6..e95fab3b6 100644
--- a/src/test/ui/impl-trait/nested_impl_trait.rs
+++ b/tests/ui/impl-trait/nested_impl_trait.rs
diff --git a/src/test/ui/impl-trait/nested_impl_trait.stderr b/tests/ui/impl-trait/nested_impl_trait.stderr
index 9a8f5a340..9a8f5a340 100644
--- a/src/test/ui/impl-trait/nested_impl_trait.stderr
+++ b/tests/ui/impl-trait/nested_impl_trait.stderr
diff --git a/src/test/ui/impl-trait/nesting.rs b/tests/ui/impl-trait/nesting.rs
index 27bdd5fa4..27bdd5fa4 100644
--- a/src/test/ui/impl-trait/nesting.rs
+++ b/tests/ui/impl-trait/nesting.rs
diff --git a/src/test/ui/impl-trait/no-method-suggested-traits.rs b/tests/ui/impl-trait/no-method-suggested-traits.rs
index c8abc2d8f..c8abc2d8f 100644
--- a/src/test/ui/impl-trait/no-method-suggested-traits.rs
+++ b/tests/ui/impl-trait/no-method-suggested-traits.rs
diff --git a/src/test/ui/impl-trait/no-method-suggested-traits.stderr b/tests/ui/impl-trait/no-method-suggested-traits.stderr
index 3d4ae11e5..548c89d0a 100644
--- a/src/test/ui/impl-trait/no-method-suggested-traits.stderr
+++ b/tests/ui/impl-trait/no-method-suggested-traits.stderr
@@ -145,11 +145,11 @@ note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
 LL |     pub trait Bar {
    |     ^^^^^^^^^^^^^
 
-error[E0599]: no method named `method2` found for struct `no_method_suggested_traits::Foo` in the current scope
+error[E0599]: no method named `method2` found for struct `Foo` in the current scope
   --> $DIR/no-method-suggested-traits.rs:50:37
    |
 LL |     no_method_suggested_traits::Foo.method2();
-   |                                     ^^^^^^^ method not found in `no_method_suggested_traits::Foo`
+   |                                     ^^^^^^^ method not found in `Foo`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
 note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
@@ -158,11 +158,11 @@ note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
 LL |     pub trait Bar {
    |     ^^^^^^^^^^^^^
 
-error[E0599]: no method named `method2` found for struct `Rc<&mut Box<&no_method_suggested_traits::Foo>>` in the current scope
+error[E0599]: no method named `method2` found for struct `Rc<&mut Box<&Foo>>` in the current scope
   --> $DIR/no-method-suggested-traits.rs:52:71
    |
 LL |     std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Foo)).method2();
-   |                                                                       ^^^^^^^ method not found in `Rc<&mut Box<&no_method_suggested_traits::Foo>>`
+   |                                                                       ^^^^^^^ method not found in `Rc<&mut Box<&Foo>>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
 note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
@@ -171,11 +171,11 @@ note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
 LL |     pub trait Bar {
    |     ^^^^^^^^^^^^^
 
-error[E0599]: no method named `method2` found for enum `no_method_suggested_traits::Bar` in the current scope
+error[E0599]: no method named `method2` found for enum `Bar` in the current scope
   --> $DIR/no-method-suggested-traits.rs:54:40
    |
 LL |     no_method_suggested_traits::Bar::X.method2();
-   |                                        ^^^^^^^ method not found in `no_method_suggested_traits::Bar`
+   |                                        ^^^^^^^ method not found in `Bar`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
 note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
@@ -184,11 +184,11 @@ note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
 LL |     pub trait Bar {
    |     ^^^^^^^^^^^^^
 
-error[E0599]: no method named `method2` found for struct `Rc<&mut Box<&no_method_suggested_traits::Bar>>` in the current scope
+error[E0599]: no method named `method2` found for struct `Rc<&mut Box<&Bar>>` in the current scope
   --> $DIR/no-method-suggested-traits.rs:56:74
    |
 LL |     std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Bar::X)).method2();
-   |                                                                          ^^^^^^^ method not found in `Rc<&mut Box<&no_method_suggested_traits::Bar>>`
+   |                                                                          ^^^^^^^ method not found in `Rc<&mut Box<&Bar>>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
 note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
@@ -255,29 +255,29 @@ error[E0599]: no method named `method3` found for struct `Rc<&mut Box<&usize>>`
 LL |     std::rc::Rc::new(&mut Box::new(&1_usize)).method3();
    |                                               ^^^^^^^ method not found in `Rc<&mut Box<&usize>>`
 
-error[E0599]: no method named `method3` found for struct `no_method_suggested_traits::Foo` in the current scope
+error[E0599]: no method named `method3` found for struct `Foo` in the current scope
   --> $DIR/no-method-suggested-traits.rs:71:37
    |
 LL |     no_method_suggested_traits::Foo.method3();
-   |                                     ^^^^^^^ method not found in `no_method_suggested_traits::Foo`
+   |                                     ^^^^^^^ method not found in `Foo`
 
-error[E0599]: no method named `method3` found for struct `Rc<&mut Box<&no_method_suggested_traits::Foo>>` in the current scope
+error[E0599]: no method named `method3` found for struct `Rc<&mut Box<&Foo>>` in the current scope
   --> $DIR/no-method-suggested-traits.rs:72:71
    |
 LL |     std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Foo)).method3();
-   |                                                                       ^^^^^^^ method not found in `Rc<&mut Box<&no_method_suggested_traits::Foo>>`
+   |                                                                       ^^^^^^^ method not found in `Rc<&mut Box<&Foo>>`
 
-error[E0599]: no method named `method3` found for enum `no_method_suggested_traits::Bar` in the current scope
+error[E0599]: no method named `method3` found for enum `Bar` in the current scope
   --> $DIR/no-method-suggested-traits.rs:74:40
    |
 LL |     no_method_suggested_traits::Bar::X.method3();
-   |                                        ^^^^^^^ method not found in `no_method_suggested_traits::Bar`
+   |                                        ^^^^^^^ method not found in `Bar`
 
-error[E0599]: no method named `method3` found for struct `Rc<&mut Box<&no_method_suggested_traits::Bar>>` in the current scope
+error[E0599]: no method named `method3` found for struct `Rc<&mut Box<&Bar>>` in the current scope
   --> $DIR/no-method-suggested-traits.rs:75:74
    |
 LL |     std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Bar::X)).method3();
-   |                                                                          ^^^^^^^ method not found in `Rc<&mut Box<&no_method_suggested_traits::Bar>>`
+   |                                                                          ^^^^^^^ method not found in `Rc<&mut Box<&Bar>>`
 
 error: aborting due to 24 previous errors
 
diff --git a/src/test/ui/impl-trait/no-trait.rs b/tests/ui/impl-trait/no-trait.rs
index 9ce668f46..9ce668f46 100644
--- a/src/test/ui/impl-trait/no-trait.rs
+++ b/tests/ui/impl-trait/no-trait.rs
diff --git a/src/test/ui/impl-trait/no-trait.stderr b/tests/ui/impl-trait/no-trait.stderr
index 3a636f252..3a636f252 100644
--- a/src/test/ui/impl-trait/no-trait.stderr
+++ b/tests/ui/impl-trait/no-trait.stderr
diff --git a/src/test/ui/impl-trait/normalize-tait-in-const.rs b/tests/ui/impl-trait/normalize-tait-in-const.rs
index 020bcbb83..020bcbb83 100644
--- a/src/test/ui/impl-trait/normalize-tait-in-const.rs
+++ b/tests/ui/impl-trait/normalize-tait-in-const.rs
diff --git a/src/test/ui/impl-trait/normalize-tait-in-const.stderr b/tests/ui/impl-trait/normalize-tait-in-const.stderr
index b9fc8726f..b9fc8726f 100644
--- a/src/test/ui/impl-trait/normalize-tait-in-const.stderr
+++ b/tests/ui/impl-trait/normalize-tait-in-const.stderr
diff --git a/src/test/ui/impl-trait/object-unsafe-trait-in-return-position-dyn-trait.rs b/tests/ui/impl-trait/object-unsafe-trait-in-return-position-dyn-trait.rs
index ab3086c78..ab3086c78 100644
--- a/src/test/ui/impl-trait/object-unsafe-trait-in-return-position-dyn-trait.rs
+++ b/tests/ui/impl-trait/object-unsafe-trait-in-return-position-dyn-trait.rs
diff --git a/src/test/ui/impl-trait/object-unsafe-trait-in-return-position-dyn-trait.stderr b/tests/ui/impl-trait/object-unsafe-trait-in-return-position-dyn-trait.stderr
index 687dbe65e..687dbe65e 100644
--- a/src/test/ui/impl-trait/object-unsafe-trait-in-return-position-dyn-trait.stderr
+++ b/tests/ui/impl-trait/object-unsafe-trait-in-return-position-dyn-trait.stderr
diff --git a/src/test/ui/impl-trait/object-unsafe-trait-in-return-position-impl-trait.rs b/tests/ui/impl-trait/object-unsafe-trait-in-return-position-impl-trait.rs
index 503515013..503515013 100644
--- a/src/test/ui/impl-trait/object-unsafe-trait-in-return-position-impl-trait.rs
+++ b/tests/ui/impl-trait/object-unsafe-trait-in-return-position-impl-trait.rs
diff --git a/src/test/ui/impl-trait/object-unsafe-trait-in-return-position-impl-trait.stderr b/tests/ui/impl-trait/object-unsafe-trait-in-return-position-impl-trait.stderr
index d6f5a1ac2..d6f5a1ac2 100644
--- a/src/test/ui/impl-trait/object-unsafe-trait-in-return-position-impl-trait.stderr
+++ b/tests/ui/impl-trait/object-unsafe-trait-in-return-position-impl-trait.stderr
diff --git a/src/test/ui/impl-trait/point-to-type-err-cause-on-impl-trait-return.rs b/tests/ui/impl-trait/point-to-type-err-cause-on-impl-trait-return.rs
index fa7664a83..fa7664a83 100644
--- a/src/test/ui/impl-trait/point-to-type-err-cause-on-impl-trait-return.rs
+++ b/tests/ui/impl-trait/point-to-type-err-cause-on-impl-trait-return.rs
diff --git a/src/test/ui/impl-trait/point-to-type-err-cause-on-impl-trait-return.stderr b/tests/ui/impl-trait/point-to-type-err-cause-on-impl-trait-return.stderr
index 3c65fd998..3c65fd998 100644
--- a/src/test/ui/impl-trait/point-to-type-err-cause-on-impl-trait-return.stderr
+++ b/tests/ui/impl-trait/point-to-type-err-cause-on-impl-trait-return.stderr
diff --git a/src/test/ui/impl-trait/printing-binder.rs b/tests/ui/impl-trait/printing-binder.rs
index 273b5dcdb..273b5dcdb 100644
--- a/src/test/ui/impl-trait/printing-binder.rs
+++ b/tests/ui/impl-trait/printing-binder.rs
diff --git a/src/test/ui/impl-trait/printing-binder.stderr b/tests/ui/impl-trait/printing-binder.stderr
index 5ffec8af1..5ffec8af1 100644
--- a/src/test/ui/impl-trait/printing-binder.stderr
+++ b/tests/ui/impl-trait/printing-binder.stderr
diff --git a/src/test/ui/impl-trait/private_unused.rs b/tests/ui/impl-trait/private_unused.rs
index 92268f186..92268f186 100644
--- a/src/test/ui/impl-trait/private_unused.rs
+++ b/tests/ui/impl-trait/private_unused.rs
diff --git a/src/test/ui/impl-trait/projection-mismatch-in-impl-where-clause.rs b/tests/ui/impl-trait/projection-mismatch-in-impl-where-clause.rs
index b4fd6b3e7..b4fd6b3e7 100644
--- a/src/test/ui/impl-trait/projection-mismatch-in-impl-where-clause.rs
+++ b/tests/ui/impl-trait/projection-mismatch-in-impl-where-clause.rs
diff --git a/src/test/ui/impl-trait/projection-mismatch-in-impl-where-clause.stderr b/tests/ui/impl-trait/projection-mismatch-in-impl-where-clause.stderr
index cf2998bbf..a4ff51047 100644
--- a/src/test/ui/impl-trait/projection-mismatch-in-impl-where-clause.stderr
+++ b/tests/ui/impl-trait/projection-mismatch-in-impl-where-clause.stderr
@@ -13,7 +13,7 @@ note: required for `()` to implement `Test`
   --> $DIR/projection-mismatch-in-impl-where-clause.rs:11:9
    |
 LL | impl<T> Test for T where T: Super<Assoc = ()> {}
-   |         ^^^^     ^
+   |         ^^^^     ^                ---------- unsatisfied trait bound introduced here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/impl-trait/projection.rs b/tests/ui/impl-trait/projection.rs
index b33802e2b..b33802e2b 100644
--- a/src/test/ui/impl-trait/projection.rs
+++ b/tests/ui/impl-trait/projection.rs
diff --git a/src/test/ui/impl-trait/question_mark.rs b/tests/ui/impl-trait/question_mark.rs
index 7bd5cff31..7bd5cff31 100644
--- a/src/test/ui/impl-trait/question_mark.rs
+++ b/tests/ui/impl-trait/question_mark.rs
diff --git a/tests/ui/impl-trait/recursive-generator.rs b/tests/ui/impl-trait/recursive-generator.rs
new file mode 100644
index 000000000..e876f0fb4
--- /dev/null
+++ b/tests/ui/impl-trait/recursive-generator.rs
@@ -0,0 +1,23 @@
+#![feature(generators, generator_trait)]
+
+use std::ops::{Generator, GeneratorState};
+
+fn foo() -> impl Generator<Yield = (), Return = ()> {
+    //~^ ERROR cannot resolve opaque type
+    //~| NOTE recursive opaque type
+    //~| NOTE in this expansion of desugaring of
+    || {
+    //~^ NOTE returning here
+        let mut gen = Box::pin(foo());
+        //~^ NOTE generator captures itself here
+        let mut r = gen.as_mut().resume(());
+        while let GeneratorState::Yielded(v) = r {
+            yield v;
+            r = gen.as_mut().resume(());
+        }
+    }
+}
+
+fn main() {
+    foo();
+}
diff --git a/tests/ui/impl-trait/recursive-generator.stderr b/tests/ui/impl-trait/recursive-generator.stderr
new file mode 100644
index 000000000..e23fd4b4a
--- /dev/null
+++ b/tests/ui/impl-trait/recursive-generator.stderr
@@ -0,0 +1,19 @@
+error[E0720]: cannot resolve opaque type
+  --> $DIR/recursive-generator.rs:5:13
+   |
+LL |   fn foo() -> impl Generator<Yield = (), Return = ()> {
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive opaque type
+...
+LL | /     || {
+LL | |
+LL | |         let mut gen = Box::pin(foo());
+   | |             ------- generator captures itself here
+LL | |
+...  |
+LL | |         }
+LL | |     }
+   | |_____- returning here with type `[generator@$DIR/recursive-generator.rs:9:5: 9:7]`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0720`.
diff --git a/src/test/ui/impl-trait/recursive-impl-trait-type-direct.rs b/tests/ui/impl-trait/recursive-impl-trait-type-direct.rs
index 540a280f0..540a280f0 100644
--- a/src/test/ui/impl-trait/recursive-impl-trait-type-direct.rs
+++ b/tests/ui/impl-trait/recursive-impl-trait-type-direct.rs
diff --git a/src/test/ui/impl-trait/recursive-impl-trait-type-indirect.rs b/tests/ui/impl-trait/recursive-impl-trait-type-indirect.rs
index ffc0cd9d1..ffc0cd9d1 100644
--- a/src/test/ui/impl-trait/recursive-impl-trait-type-indirect.rs
+++ b/tests/ui/impl-trait/recursive-impl-trait-type-indirect.rs
diff --git a/src/test/ui/impl-trait/recursive-impl-trait-type-indirect.stderr b/tests/ui/impl-trait/recursive-impl-trait-type-indirect.stderr
index 2e34d3d42..ebb231ae1 100644
--- a/src/test/ui/impl-trait/recursive-impl-trait-type-indirect.stderr
+++ b/tests/ui/impl-trait/recursive-impl-trait-type-indirect.stderr
@@ -53,6 +53,7 @@ LL |   fn closure_capture() -> impl Sized {
 ...
 LL | /     move || {
 LL | |         x;
+   | |         - closure captures itself here
 LL | |     }
    | |_____- returning here with type `[closure@$DIR/recursive-impl-trait-type-indirect.rs:35:5: 35:12]`
 
@@ -64,6 +65,7 @@ LL |   fn closure_ref_capture() -> impl Sized {
 ...
 LL | /     move || {
 LL | |         &x;
+   | |          - closure captures itself here
 LL | |     }
    | |_____- returning here with type `[closure@$DIR/recursive-impl-trait-type-indirect.rs:43:5: 43:12]`
 
@@ -94,6 +96,7 @@ LL |   fn generator_capture() -> impl Sized {
 LL | /     move || {
 LL | |         yield;
 LL | |         x;
+   | |         - generator captures itself here
 LL | |     }
    | |_____- returning here with type `[generator@$DIR/recursive-impl-trait-type-indirect.rs:61:5: 61:12]`
 
@@ -114,6 +117,7 @@ LL |   fn generator_hold() -> impl Sized {
 LL |
 LL | /     move || {
 LL | |         let x = generator_hold();
+   | |             - generator captures itself here
 LL | |         yield;
 LL | |         x;
 LL | |     }
diff --git a/src/test/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.rs b/tests/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.rs
index 818e40365..818e40365 100644
--- a/src/test/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.rs
+++ b/tests/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.rs
diff --git a/src/test/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.stderr b/tests/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.stderr
index b514e9fef..b514e9fef 100644
--- a/src/test/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.stderr
+++ b/tests/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.stderr
diff --git a/src/test/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle-2.rs b/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle-2.rs
index af9dfe25b..af9dfe25b 100644
--- a/src/test/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle-2.rs
+++ b/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle-2.rs
diff --git a/src/test/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle-2.stderr b/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle-2.stderr
index 7b63a3d0b..7b63a3d0b 100644
--- a/src/test/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle-2.stderr
+++ b/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle-2.stderr
diff --git a/src/test/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle.rs b/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle.rs
index 91f1ed481..91f1ed481 100644
--- a/src/test/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle.rs
+++ b/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle.rs
diff --git a/src/test/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle.stderr b/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle.stderr
index 3dda5761a..c7c6ca440 100644
--- a/src/test/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle.stderr
+++ b/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle.stderr
@@ -15,11 +15,11 @@ LL |     type Foo = impl PartialEq<(Foo, i32)>;
 LL |         fn eq(&self, _other: &(Foo, i32)) -> bool {
    |                              ^^^^^^^^^^^
    |                              |
-   |                              expected struct `a::Bar`, found opaque type
+   |                              expected struct `Bar`, found opaque type
    |                              help: change the parameter type to match the trait: `&(a::Bar, i32)`
    |
-   = note: expected fn pointer `fn(&a::Bar, &(a::Bar, i32)) -> _`
-              found fn pointer `fn(&a::Bar, &(a::Foo, i32)) -> _`
+   = note: expected signature `fn(&a::Bar, &(a::Bar, i32)) -> _`
+              found signature `fn(&a::Bar, &(a::Foo, i32)) -> _`
 
 error: unconstrained opaque type
   --> $DIR/recursive-type-alias-impl-trait-declaration-too-subtle.rs:18:16
@@ -38,11 +38,11 @@ LL |     type Foo = impl PartialEq<(Foo, i32)>;
 LL |         fn eq(&self, _other: &(Bar, i32)) -> bool {
    |                              ^^^^^^^^^^^
    |                              |
-   |                              expected opaque type, found struct `b::Bar`
+   |                              expected opaque type, found struct `Bar`
    |                              help: change the parameter type to match the trait: `&(b::Foo, i32)`
    |
-   = note: expected fn pointer `fn(&b::Bar, &(b::Foo, i32)) -> _`
-              found fn pointer `fn(&b::Bar, &(b::Bar, i32)) -> _`
+   = note: expected signature `fn(&b::Bar, &(b::Foo, i32)) -> _`
+              found signature `fn(&b::Bar, &(b::Bar, i32)) -> _`
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/impl-trait/recursive-type-alias-impl-trait-declaration.rs b/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration.rs
index ad0a003e8..ad0a003e8 100644
--- a/src/test/ui/impl-trait/recursive-type-alias-impl-trait-declaration.rs
+++ b/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration.rs
diff --git a/src/test/ui/impl-trait/region-escape-via-bound-contravariant-closure.rs b/tests/ui/impl-trait/region-escape-via-bound-contravariant-closure.rs
index 9f63a8617..9f63a8617 100644
--- a/src/test/ui/impl-trait/region-escape-via-bound-contravariant-closure.rs
+++ b/tests/ui/impl-trait/region-escape-via-bound-contravariant-closure.rs
diff --git a/src/test/ui/impl-trait/region-escape-via-bound-contravariant.rs b/tests/ui/impl-trait/region-escape-via-bound-contravariant.rs
index 79319dfe7..79319dfe7 100644
--- a/src/test/ui/impl-trait/region-escape-via-bound-contravariant.rs
+++ b/tests/ui/impl-trait/region-escape-via-bound-contravariant.rs
diff --git a/src/test/ui/impl-trait/region-escape-via-bound.rs b/tests/ui/impl-trait/region-escape-via-bound.rs
index fe60c76ca..fe60c76ca 100644
--- a/src/test/ui/impl-trait/region-escape-via-bound.rs
+++ b/tests/ui/impl-trait/region-escape-via-bound.rs
diff --git a/src/test/ui/impl-trait/region-escape-via-bound.stderr b/tests/ui/impl-trait/region-escape-via-bound.stderr
index 44a790cb1..44a790cb1 100644
--- a/src/test/ui/impl-trait/region-escape-via-bound.stderr
+++ b/tests/ui/impl-trait/region-escape-via-bound.stderr
diff --git a/src/test/ui/impl-trait/return-position-impl-trait-minimal.rs b/tests/ui/impl-trait/return-position-impl-trait-minimal.rs
index 6d3c06929..6d3c06929 100644
--- a/src/test/ui/impl-trait/return-position-impl-trait-minimal.rs
+++ b/tests/ui/impl-trait/return-position-impl-trait-minimal.rs
diff --git a/src/test/ui/impl-trait/rpit-assoc-pair-with-lifetime.rs b/tests/ui/impl-trait/rpit-assoc-pair-with-lifetime.rs
index a4e603de1..a4e603de1 100644
--- a/src/test/ui/impl-trait/rpit-assoc-pair-with-lifetime.rs
+++ b/tests/ui/impl-trait/rpit-assoc-pair-with-lifetime.rs
diff --git a/src/test/ui/impl-trait/rpit-not-sized.rs b/tests/ui/impl-trait/rpit-not-sized.rs
index bd2594078..bd2594078 100644
--- a/src/test/ui/impl-trait/rpit-not-sized.rs
+++ b/tests/ui/impl-trait/rpit-not-sized.rs
diff --git a/src/test/ui/impl-trait/rpit-not-sized.stderr b/tests/ui/impl-trait/rpit-not-sized.stderr
index 608c94fc0..608c94fc0 100644
--- a/src/test/ui/impl-trait/rpit-not-sized.stderr
+++ b/tests/ui/impl-trait/rpit-not-sized.stderr
diff --git a/tests/ui/impl-trait/static-return-lifetime-infered.rs b/tests/ui/impl-trait/static-return-lifetime-infered.rs
new file mode 100644
index 000000000..36ef9ea44
--- /dev/null
+++ b/tests/ui/impl-trait/static-return-lifetime-infered.rs
@@ -0,0 +1,16 @@
+struct A {
+    x: [(u32, u32); 10]
+}
+
+impl A {
+    fn iter_values_anon(&self) -> impl Iterator<Item=u32> {
+        self.x.iter().map(|a| a.0)
+        //~^ ERROR: captures lifetime that does not appear in bounds
+    }
+    fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> {
+        self.x.iter().map(|a| a.0)
+        //~^ ERROR: captures lifetime that does not appear in bounds
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/impl-trait/static-return-lifetime-infered.stderr b/tests/ui/impl-trait/static-return-lifetime-infered.stderr
new file mode 100644
index 000000000..c451f8e37
--- /dev/null
+++ b/tests/ui/impl-trait/static-return-lifetime-infered.stderr
@@ -0,0 +1,29 @@
+error[E0700]: hidden type for `impl Iterator<Item = u32>` captures lifetime that does not appear in bounds
+  --> $DIR/static-return-lifetime-infered.rs:7:9
+   |
+LL |     fn iter_values_anon(&self) -> impl Iterator<Item=u32> {
+   |                         ----- hidden type `Map<std::slice::Iter<'_, (u32, u32)>, [closure@$DIR/static-return-lifetime-infered.rs:7:27: 7:30]>` captures the anonymous lifetime defined here
+LL |         self.x.iter().map(|a| a.0)
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: to declare that `impl Iterator<Item = u32>` captures `'_`, you can add an explicit `'_` lifetime bound
+   |
+LL |     fn iter_values_anon(&self) -> impl Iterator<Item=u32> + '_ {
+   |                                                           ++++
+
+error[E0700]: hidden type for `impl Iterator<Item = u32>` captures lifetime that does not appear in bounds
+  --> $DIR/static-return-lifetime-infered.rs:11:9
+   |
+LL |     fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> {
+   |                    -- hidden type `Map<std::slice::Iter<'a, (u32, u32)>, [closure@$DIR/static-return-lifetime-infered.rs:11:27: 11:30]>` captures the lifetime `'a` as defined here
+LL |         self.x.iter().map(|a| a.0)
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: to declare that `impl Iterator<Item = u32>` captures `'a`, you can add an explicit `'a` lifetime bound
+   |
+LL |     fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> + 'a {
+   |                                                             ++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0700`.
diff --git a/src/test/ui/impl-trait/suggest-calling-rpit-closure.rs b/tests/ui/impl-trait/suggest-calling-rpit-closure.rs
index 640156291..640156291 100644
--- a/src/test/ui/impl-trait/suggest-calling-rpit-closure.rs
+++ b/tests/ui/impl-trait/suggest-calling-rpit-closure.rs
diff --git a/src/test/ui/impl-trait/suggest-calling-rpit-closure.stderr b/tests/ui/impl-trait/suggest-calling-rpit-closure.stderr
index c10a856d8..c10a856d8 100644
--- a/src/test/ui/impl-trait/suggest-calling-rpit-closure.stderr
+++ b/tests/ui/impl-trait/suggest-calling-rpit-closure.stderr
diff --git a/src/test/ui/impl-trait/trait_resolution.rs b/tests/ui/impl-trait/trait_resolution.rs
index 8dcbbfd6e..8dcbbfd6e 100644
--- a/src/test/ui/impl-trait/trait_resolution.rs
+++ b/tests/ui/impl-trait/trait_resolution.rs
diff --git a/src/test/ui/impl-trait/trait_type.rs b/tests/ui/impl-trait/trait_type.rs
index 638fefc46..638fefc46 100644
--- a/src/test/ui/impl-trait/trait_type.rs
+++ b/tests/ui/impl-trait/trait_type.rs
diff --git a/src/test/ui/impl-trait/trait_type.stderr b/tests/ui/impl-trait/trait_type.stderr
index bea243398..81e4c933e 100644
--- a/src/test/ui/impl-trait/trait_type.stderr
+++ b/tests/ui/impl-trait/trait_type.stderr
@@ -7,8 +7,8 @@ LL |    fn fmt(&self, x: &str) -> () { }
    |                     types differ in mutability
    |                     help: change the parameter type to match the trait: `&mut Formatter<'_>`
    |
-   = note: expected fn pointer `fn(&MyType, &mut Formatter<'_>) -> Result<(), std::fmt::Error>`
-              found fn pointer `fn(&MyType, &str)`
+   = note: expected signature `fn(&MyType, &mut Formatter<'_>) -> Result<(), std::fmt::Error>`
+              found signature `fn(&MyType, &str)`
 
 error[E0050]: method `fmt` has 1 parameter but the declaration in trait `std::fmt::Display::fmt` has 2
   --> $DIR/trait_type.rs:12:11
diff --git a/src/test/ui/impl-trait/two_tait_defining_each_other.rs b/tests/ui/impl-trait/two_tait_defining_each_other.rs
index 6eb2a11b2..6eb2a11b2 100644
--- a/src/test/ui/impl-trait/two_tait_defining_each_other.rs
+++ b/tests/ui/impl-trait/two_tait_defining_each_other.rs
diff --git a/src/test/ui/impl-trait/two_tait_defining_each_other.stderr b/tests/ui/impl-trait/two_tait_defining_each_other.stderr
index 1a42ac525..1a42ac525 100644
--- a/src/test/ui/impl-trait/two_tait_defining_each_other.stderr
+++ b/tests/ui/impl-trait/two_tait_defining_each_other.stderr
diff --git a/src/test/ui/impl-trait/two_tait_defining_each_other2.rs b/tests/ui/impl-trait/two_tait_defining_each_other2.rs
index 05b096680..05b096680 100644
--- a/src/test/ui/impl-trait/two_tait_defining_each_other2.rs
+++ b/tests/ui/impl-trait/two_tait_defining_each_other2.rs
diff --git a/src/test/ui/impl-trait/two_tait_defining_each_other2.stderr b/tests/ui/impl-trait/two_tait_defining_each_other2.stderr
index 4d8f96de1..4d8f96de1 100644
--- a/src/test/ui/impl-trait/two_tait_defining_each_other2.stderr
+++ b/tests/ui/impl-trait/two_tait_defining_each_other2.stderr
diff --git a/src/test/ui/impl-trait/two_tait_defining_each_other3.rs b/tests/ui/impl-trait/two_tait_defining_each_other3.rs
index 37f8ae1b8..37f8ae1b8 100644
--- a/src/test/ui/impl-trait/two_tait_defining_each_other3.rs
+++ b/tests/ui/impl-trait/two_tait_defining_each_other3.rs
diff --git a/src/test/ui/impl-trait/two_tait_defining_each_other3.stderr b/tests/ui/impl-trait/two_tait_defining_each_other3.stderr
index b06dc16d5..b06dc16d5 100644
--- a/src/test/ui/impl-trait/two_tait_defining_each_other3.stderr
+++ b/tests/ui/impl-trait/two_tait_defining_each_other3.stderr
diff --git a/src/test/ui/impl-trait/type-alias-generic-param.rs b/tests/ui/impl-trait/type-alias-generic-param.rs
index 3499b2859..3499b2859 100644
--- a/src/test/ui/impl-trait/type-alias-generic-param.rs
+++ b/tests/ui/impl-trait/type-alias-generic-param.rs
diff --git a/src/test/ui/impl-trait/type-alias-impl-trait-in-fn-body.rs b/tests/ui/impl-trait/type-alias-impl-trait-in-fn-body.rs
index 91be4efd5..91be4efd5 100644
--- a/src/test/ui/impl-trait/type-alias-impl-trait-in-fn-body.rs
+++ b/tests/ui/impl-trait/type-alias-impl-trait-in-fn-body.rs
diff --git a/src/test/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.rs b/tests/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.rs
index ecfa5c69e..ecfa5c69e 100644
--- a/src/test/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.rs
+++ b/tests/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.rs
diff --git a/src/test/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.stderr b/tests/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.stderr
index 30322f88c..30322f88c 100644
--- a/src/test/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.stderr
+++ b/tests/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.stderr
diff --git a/src/test/ui/impl-trait/type_parameters_captured.rs b/tests/ui/impl-trait/type_parameters_captured.rs
index 81ee7d3f8..81ee7d3f8 100644
--- a/src/test/ui/impl-trait/type_parameters_captured.rs
+++ b/tests/ui/impl-trait/type_parameters_captured.rs
diff --git a/src/test/ui/impl-trait/type_parameters_captured.stderr b/tests/ui/impl-trait/type_parameters_captured.stderr
index fb502cfdd..fb502cfdd 100644
--- a/src/test/ui/impl-trait/type_parameters_captured.stderr
+++ b/tests/ui/impl-trait/type_parameters_captured.stderr
diff --git a/src/test/ui/impl-trait/unactionable_diagnostic.fixed b/tests/ui/impl-trait/unactionable_diagnostic.fixed
index 6c2505177..6c2505177 100644
--- a/src/test/ui/impl-trait/unactionable_diagnostic.fixed
+++ b/tests/ui/impl-trait/unactionable_diagnostic.fixed
diff --git a/src/test/ui/impl-trait/unactionable_diagnostic.rs b/tests/ui/impl-trait/unactionable_diagnostic.rs
index bce35cbdd..bce35cbdd 100644
--- a/src/test/ui/impl-trait/unactionable_diagnostic.rs
+++ b/tests/ui/impl-trait/unactionable_diagnostic.rs
diff --git a/src/test/ui/impl-trait/unactionable_diagnostic.stderr b/tests/ui/impl-trait/unactionable_diagnostic.stderr
index a32004cda..a32004cda 100644
--- a/src/test/ui/impl-trait/unactionable_diagnostic.stderr
+++ b/tests/ui/impl-trait/unactionable_diagnostic.stderr
diff --git a/src/test/ui/impl-trait/universal-mismatched-type.rs b/tests/ui/impl-trait/universal-mismatched-type.rs
index e9129bbd7..e9129bbd7 100644
--- a/src/test/ui/impl-trait/universal-mismatched-type.rs
+++ b/tests/ui/impl-trait/universal-mismatched-type.rs
diff --git a/src/test/ui/impl-trait/universal-mismatched-type.stderr b/tests/ui/impl-trait/universal-mismatched-type.stderr
index 817c573c0..817c573c0 100644
--- a/src/test/ui/impl-trait/universal-mismatched-type.stderr
+++ b/tests/ui/impl-trait/universal-mismatched-type.stderr
diff --git a/src/test/ui/impl-trait/universal-two-impl-traits.rs b/tests/ui/impl-trait/universal-two-impl-traits.rs
index 689c24012..689c24012 100644
--- a/src/test/ui/impl-trait/universal-two-impl-traits.rs
+++ b/tests/ui/impl-trait/universal-two-impl-traits.rs
diff --git a/src/test/ui/impl-trait/universal-two-impl-traits.stderr b/tests/ui/impl-trait/universal-two-impl-traits.stderr
index ab8a53d0d..ab8a53d0d 100644
--- a/src/test/ui/impl-trait/universal-two-impl-traits.stderr
+++ b/tests/ui/impl-trait/universal-two-impl-traits.stderr
diff --git a/src/test/ui/impl-trait/universal_hrtb_anon.rs b/tests/ui/impl-trait/universal_hrtb_anon.rs
index 30c8d291f..30c8d291f 100644
--- a/src/test/ui/impl-trait/universal_hrtb_anon.rs
+++ b/tests/ui/impl-trait/universal_hrtb_anon.rs
diff --git a/src/test/ui/impl-trait/universal_hrtb_named.rs b/tests/ui/impl-trait/universal_hrtb_named.rs
index 07ff5d23e..07ff5d23e 100644
--- a/src/test/ui/impl-trait/universal_hrtb_named.rs
+++ b/tests/ui/impl-trait/universal_hrtb_named.rs
diff --git a/src/test/ui/impl-trait/universal_in_adt_in_parameters.rs b/tests/ui/impl-trait/universal_in_adt_in_parameters.rs
index a3829133d..a3829133d 100644
--- a/src/test/ui/impl-trait/universal_in_adt_in_parameters.rs
+++ b/tests/ui/impl-trait/universal_in_adt_in_parameters.rs
diff --git a/src/test/ui/impl-trait/universal_in_impl_trait_in_parameters.rs b/tests/ui/impl-trait/universal_in_impl_trait_in_parameters.rs
index e98912d95..e98912d95 100644
--- a/src/test/ui/impl-trait/universal_in_impl_trait_in_parameters.rs
+++ b/tests/ui/impl-trait/universal_in_impl_trait_in_parameters.rs
diff --git a/src/test/ui/impl-trait/universal_in_trait_defn_parameters.rs b/tests/ui/impl-trait/universal_in_trait_defn_parameters.rs
index 23c217a8f..23c217a8f 100644
--- a/src/test/ui/impl-trait/universal_in_trait_defn_parameters.rs
+++ b/tests/ui/impl-trait/universal_in_trait_defn_parameters.rs
diff --git a/src/test/ui/impl-trait/universal_multiple_bounds.rs b/tests/ui/impl-trait/universal_multiple_bounds.rs
index 40c1405c3..40c1405c3 100644
--- a/src/test/ui/impl-trait/universal_multiple_bounds.rs
+++ b/tests/ui/impl-trait/universal_multiple_bounds.rs
diff --git a/src/test/ui/impl-trait/universal_wrong_bounds.rs b/tests/ui/impl-trait/universal_wrong_bounds.rs
index 2182506c7..2182506c7 100644
--- a/src/test/ui/impl-trait/universal_wrong_bounds.rs
+++ b/tests/ui/impl-trait/universal_wrong_bounds.rs
diff --git a/src/test/ui/impl-trait/universal_wrong_bounds.stderr b/tests/ui/impl-trait/universal_wrong_bounds.stderr
index 3b1a5e5f4..3b1a5e5f4 100644
--- a/src/test/ui/impl-trait/universal_wrong_bounds.stderr
+++ b/tests/ui/impl-trait/universal_wrong_bounds.stderr
diff --git a/src/test/ui/impl-trait/universal_wrong_hrtb.rs b/tests/ui/impl-trait/universal_wrong_hrtb.rs
index b9551c2ce..b9551c2ce 100644
--- a/src/test/ui/impl-trait/universal_wrong_hrtb.rs
+++ b/tests/ui/impl-trait/universal_wrong_hrtb.rs
diff --git a/src/test/ui/impl-trait/universal_wrong_hrtb.stderr b/tests/ui/impl-trait/universal_wrong_hrtb.stderr
index 37eb8dfa1..37eb8dfa1 100644
--- a/src/test/ui/impl-trait/universal_wrong_hrtb.stderr
+++ b/tests/ui/impl-trait/universal_wrong_hrtb.stderr
diff --git a/src/test/ui/impl-trait/unsafety-checking-cycle.rs b/tests/ui/impl-trait/unsafety-checking-cycle.rs
index 4a5831c5b..4a5831c5b 100644
--- a/src/test/ui/impl-trait/unsafety-checking-cycle.rs
+++ b/tests/ui/impl-trait/unsafety-checking-cycle.rs
diff --git a/src/test/ui/impl-trait/wf-eval-order.rs b/tests/ui/impl-trait/wf-eval-order.rs
index c7d6bb870..c7d6bb870 100644
--- a/src/test/ui/impl-trait/wf-eval-order.rs
+++ b/tests/ui/impl-trait/wf-eval-order.rs
diff --git a/src/test/ui/impl-trait/where-allowed-2.rs b/tests/ui/impl-trait/where-allowed-2.rs
index 1a1210d00..1a1210d00 100644
--- a/src/test/ui/impl-trait/where-allowed-2.rs
+++ b/tests/ui/impl-trait/where-allowed-2.rs
diff --git a/src/test/ui/impl-trait/where-allowed-2.stderr b/tests/ui/impl-trait/where-allowed-2.stderr
index 2b328c01c..2b328c01c 100644
--- a/src/test/ui/impl-trait/where-allowed-2.stderr
+++ b/tests/ui/impl-trait/where-allowed-2.stderr
diff --git a/src/test/ui/impl-trait/where-allowed.rs b/tests/ui/impl-trait/where-allowed.rs
index ff63b04c2..ff63b04c2 100644
--- a/src/test/ui/impl-trait/where-allowed.rs
+++ b/tests/ui/impl-trait/where-allowed.rs
diff --git a/src/test/ui/impl-trait/where-allowed.stderr b/tests/ui/impl-trait/where-allowed.stderr
index 3ad0a9f9d..3ad0a9f9d 100644
--- a/src/test/ui/impl-trait/where-allowed.stderr
+++ b/tests/ui/impl-trait/where-allowed.stderr
diff --git a/src/test/ui/impl-trait/xcrate.rs b/tests/ui/impl-trait/xcrate.rs
index fe106ff05..fe106ff05 100644
--- a/src/test/ui/impl-trait/xcrate.rs
+++ b/tests/ui/impl-trait/xcrate.rs
diff --git a/src/test/ui/impl-trait/xcrate_simple.rs b/tests/ui/impl-trait/xcrate_simple.rs
index 2b1fc97e3..2b1fc97e3 100644
--- a/src/test/ui/impl-trait/xcrate_simple.rs
+++ b/tests/ui/impl-trait/xcrate_simple.rs
diff --git a/src/test/ui/impl-unused-rps-in-assoc-type.rs b/tests/ui/impl-unused-rps-in-assoc-type.rs
index ea41997a6..ea41997a6 100644
--- a/src/test/ui/impl-unused-rps-in-assoc-type.rs
+++ b/tests/ui/impl-unused-rps-in-assoc-type.rs
diff --git a/src/test/ui/impl-unused-rps-in-assoc-type.stderr b/tests/ui/impl-unused-rps-in-assoc-type.stderr
index c7ad1b4e6..c7ad1b4e6 100644
--- a/src/test/ui/impl-unused-rps-in-assoc-type.stderr
+++ b/tests/ui/impl-unused-rps-in-assoc-type.stderr
diff --git a/src/test/ui/impl-unused-tps-inherent.rs b/tests/ui/impl-unused-tps-inherent.rs
index 83a228e55..83a228e55 100644
--- a/src/test/ui/impl-unused-tps-inherent.rs
+++ b/tests/ui/impl-unused-tps-inherent.rs
diff --git a/src/test/ui/impl-unused-tps-inherent.stderr b/tests/ui/impl-unused-tps-inherent.stderr
index 43f63cf96..43f63cf96 100644
--- a/src/test/ui/impl-unused-tps-inherent.stderr
+++ b/tests/ui/impl-unused-tps-inherent.stderr
diff --git a/src/test/ui/impl-unused-tps.rs b/tests/ui/impl-unused-tps.rs
index 7cc1ae613..7cc1ae613 100644
--- a/src/test/ui/impl-unused-tps.rs
+++ b/tests/ui/impl-unused-tps.rs
diff --git a/src/test/ui/impl-unused-tps.stderr b/tests/ui/impl-unused-tps.stderr
index 053ab91c8..053ab91c8 100644
--- a/src/test/ui/impl-unused-tps.stderr
+++ b/tests/ui/impl-unused-tps.stderr
diff --git a/src/test/ui/implicit-method-bind.rs b/tests/ui/implicit-method-bind.rs
index 5e27516a8..5e27516a8 100644
--- a/src/test/ui/implicit-method-bind.rs
+++ b/tests/ui/implicit-method-bind.rs
diff --git a/src/test/ui/implicit-method-bind.stderr b/tests/ui/implicit-method-bind.stderr
index e0a968527..e0a968527 100644
--- a/src/test/ui/implicit-method-bind.stderr
+++ b/tests/ui/implicit-method-bind.stderr
diff --git a/src/test/ui/implied-bounds/assoc-ty-wf-used-to-get-assoc-ty.rs b/tests/ui/implied-bounds/assoc-ty-wf-used-to-get-assoc-ty.rs
index 33b746c5e..33b746c5e 100644
--- a/src/test/ui/implied-bounds/assoc-ty-wf-used-to-get-assoc-ty.rs
+++ b/tests/ui/implied-bounds/assoc-ty-wf-used-to-get-assoc-ty.rs
diff --git a/src/test/ui/implied-bounds/assoc-ty-wf-used-to-get-assoc-ty.stderr b/tests/ui/implied-bounds/assoc-ty-wf-used-to-get-assoc-ty.stderr
index d0249e74f..d0249e74f 100644
--- a/src/test/ui/implied-bounds/assoc-ty-wf-used-to-get-assoc-ty.stderr
+++ b/tests/ui/implied-bounds/assoc-ty-wf-used-to-get-assoc-ty.stderr
diff --git a/src/test/ui/implied-bounds/hrlt-implied-trait-bounds-guard.rs b/tests/ui/implied-bounds/hrlt-implied-trait-bounds-guard.rs
index 79844dcbd..c177655c5 100644
--- a/src/test/ui/implied-bounds/hrlt-implied-trait-bounds-guard.rs
+++ b/tests/ui/implied-bounds/hrlt-implied-trait-bounds-guard.rs
@@ -1,5 +1,5 @@
 // A test exploiting the bug behind #25860 except with
-// implied trait bounds which currently don't exist without `-Zchalk`.
+// implied trait bounds which currently don't exist without `-Ztrait-solver=chalk`.
 use std::marker::PhantomData;
 struct Foo<'a, 'b, T>(PhantomData<(&'a (), &'b (), T)>)
 where
diff --git a/src/test/ui/implied-bounds/hrlt-implied-trait-bounds-guard.stderr b/tests/ui/implied-bounds/hrlt-implied-trait-bounds-guard.stderr
index 0c00bbc38..0c00bbc38 100644
--- a/src/test/ui/implied-bounds/hrlt-implied-trait-bounds-guard.stderr
+++ b/tests/ui/implied-bounds/hrlt-implied-trait-bounds-guard.stderr
diff --git a/src/test/ui/implied-bounds/hrlt-implied-trait-bounds-roundtrip.rs b/tests/ui/implied-bounds/hrlt-implied-trait-bounds-roundtrip.rs
index 69847d6a8..69847d6a8 100644
--- a/src/test/ui/implied-bounds/hrlt-implied-trait-bounds-roundtrip.rs
+++ b/tests/ui/implied-bounds/hrlt-implied-trait-bounds-roundtrip.rs
diff --git a/src/test/ui/implied-bounds/impl-header-unnormalized-types.rs b/tests/ui/implied-bounds/impl-header-unnormalized-types.rs
index d84539f8a..d84539f8a 100644
--- a/src/test/ui/implied-bounds/impl-header-unnormalized-types.rs
+++ b/tests/ui/implied-bounds/impl-header-unnormalized-types.rs
diff --git a/src/test/ui/implied-bounds/impl-header-unnormalized-types.stderr b/tests/ui/implied-bounds/impl-header-unnormalized-types.stderr
index 88abd5f54..88abd5f54 100644
--- a/src/test/ui/implied-bounds/impl-header-unnormalized-types.stderr
+++ b/tests/ui/implied-bounds/impl-header-unnormalized-types.stderr
diff --git a/src/test/ui/implied-bounds/impl-implied-bounds-compatibility-unnormalized.rs b/tests/ui/implied-bounds/impl-implied-bounds-compatibility-unnormalized.rs
index 6ccbb5bb2..6ccbb5bb2 100644
--- a/src/test/ui/implied-bounds/impl-implied-bounds-compatibility-unnormalized.rs
+++ b/tests/ui/implied-bounds/impl-implied-bounds-compatibility-unnormalized.rs
diff --git a/tests/ui/implied-bounds/impl-implied-bounds-compatibility-unnormalized.stderr b/tests/ui/implied-bounds/impl-implied-bounds-compatibility-unnormalized.stderr
new file mode 100644
index 000000000..ebe07027d
--- /dev/null
+++ b/tests/ui/implied-bounds/impl-implied-bounds-compatibility-unnormalized.stderr
@@ -0,0 +1,31 @@
+error: impl method assumes more implied bounds than the corresponding trait method
+  --> $DIR/impl-implied-bounds-compatibility-unnormalized.rs:13:31
+   |
+LL |     fn get<'s>(s: &'s str, _: <&'static &'s () as Project>::Ty) -> &'static str {
+   |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace this type to make the impl signature compatible: `()`
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #105572 <https://github.com/rust-lang/rust/issues/105572>
+note: the lint level is defined here
+  --> $DIR/impl-implied-bounds-compatibility-unnormalized.rs:1:9
+   |
+LL | #![deny(implied_bounds_entailment)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+Future incompatibility report: Future breakage diagnostic:
+error: impl method assumes more implied bounds than the corresponding trait method
+  --> $DIR/impl-implied-bounds-compatibility-unnormalized.rs:13:31
+   |
+LL |     fn get<'s>(s: &'s str, _: <&'static &'s () as Project>::Ty) -> &'static str {
+   |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace this type to make the impl signature compatible: `()`
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #105572 <https://github.com/rust-lang/rust/issues/105572>
+note: the lint level is defined here
+  --> $DIR/impl-implied-bounds-compatibility-unnormalized.rs:1:9
+   |
+LL | #![deny(implied_bounds_entailment)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
+
diff --git a/src/test/ui/implied-bounds/impl-implied-bounds-compatibility.rs b/tests/ui/implied-bounds/impl-implied-bounds-compatibility.rs
index d097bc16a..d097bc16a 100644
--- a/src/test/ui/implied-bounds/impl-implied-bounds-compatibility.rs
+++ b/tests/ui/implied-bounds/impl-implied-bounds-compatibility.rs
diff --git a/tests/ui/implied-bounds/impl-implied-bounds-compatibility.stderr b/tests/ui/implied-bounds/impl-implied-bounds-compatibility.stderr
new file mode 100644
index 000000000..43d3e058f
--- /dev/null
+++ b/tests/ui/implied-bounds/impl-implied-bounds-compatibility.stderr
@@ -0,0 +1,31 @@
+error: impl method assumes more implied bounds than the corresponding trait method
+  --> $DIR/impl-implied-bounds-compatibility.rs:14:35
+   |
+LL |     fn listeners<'b>(&'b self) -> &'a MessageListeners<'b> {
+   |                                   ^^^^^^^^^^^^^^^^^^^^^^^^ help: replace this type to make the impl signature compatible: `&'b MessageListeners<'b>`
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #105572 <https://github.com/rust-lang/rust/issues/105572>
+note: the lint level is defined here
+  --> $DIR/impl-implied-bounds-compatibility.rs:1:9
+   |
+LL | #![deny(implied_bounds_entailment)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+Future incompatibility report: Future breakage diagnostic:
+error: impl method assumes more implied bounds than the corresponding trait method
+  --> $DIR/impl-implied-bounds-compatibility.rs:14:35
+   |
+LL |     fn listeners<'b>(&'b self) -> &'a MessageListeners<'b> {
+   |                                   ^^^^^^^^^^^^^^^^^^^^^^^^ help: replace this type to make the impl signature compatible: `&'b MessageListeners<'b>`
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #105572 <https://github.com/rust-lang/rust/issues/105572>
+note: the lint level is defined here
+  --> $DIR/impl-implied-bounds-compatibility.rs:1:9
+   |
+LL | #![deny(implied_bounds_entailment)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
+
diff --git a/src/test/ui/implied-bounds/issue-100690.rs b/tests/ui/implied-bounds/issue-100690.rs
index 5599cd410..5599cd410 100644
--- a/src/test/ui/implied-bounds/issue-100690.rs
+++ b/tests/ui/implied-bounds/issue-100690.rs
diff --git a/src/test/ui/implied-bounds/issue-100690.stderr b/tests/ui/implied-bounds/issue-100690.stderr
index 3f6af70d8..3f6af70d8 100644
--- a/src/test/ui/implied-bounds/issue-100690.stderr
+++ b/tests/ui/implied-bounds/issue-100690.stderr
diff --git a/src/test/ui/implied-bounds/issue-101951.rs b/tests/ui/implied-bounds/issue-101951.rs
index 108fef8a1..108fef8a1 100644
--- a/src/test/ui/implied-bounds/issue-101951.rs
+++ b/tests/ui/implied-bounds/issue-101951.rs
diff --git a/src/test/ui/imports/absolute-paths-in-nested-use-groups.rs b/tests/ui/imports/absolute-paths-in-nested-use-groups.rs
index 96b513167..96b513167 100644
--- a/src/test/ui/imports/absolute-paths-in-nested-use-groups.rs
+++ b/tests/ui/imports/absolute-paths-in-nested-use-groups.rs
diff --git a/src/test/ui/imports/absolute-paths-in-nested-use-groups.stderr b/tests/ui/imports/absolute-paths-in-nested-use-groups.stderr
index e41590ac4..e41590ac4 100644
--- a/src/test/ui/imports/absolute-paths-in-nested-use-groups.stderr
+++ b/tests/ui/imports/absolute-paths-in-nested-use-groups.stderr
diff --git a/src/test/ui/imports/auxiliary/gensymed.rs b/tests/ui/imports/auxiliary/gensymed.rs
index bbb19f5ec..bbb19f5ec 100644
--- a/src/test/ui/imports/auxiliary/gensymed.rs
+++ b/tests/ui/imports/auxiliary/gensymed.rs
diff --git a/src/test/ui/imports/auxiliary/glob-conflict.rs b/tests/ui/imports/auxiliary/glob-conflict.rs
index c83db64c6..c83db64c6 100644
--- a/src/test/ui/imports/auxiliary/glob-conflict.rs
+++ b/tests/ui/imports/auxiliary/glob-conflict.rs
diff --git a/src/test/ui/imports/auxiliary/import_crate_var.rs b/tests/ui/imports/auxiliary/import_crate_var.rs
index a273b103a..a273b103a 100644
--- a/src/test/ui/imports/auxiliary/import_crate_var.rs
+++ b/tests/ui/imports/auxiliary/import_crate_var.rs
diff --git a/src/test/ui/imports/auxiliary/issue-36881-aux.rs b/tests/ui/imports/auxiliary/issue-36881-aux.rs
index e373b6438..e373b6438 100644
--- a/src/test/ui/imports/auxiliary/issue-36881-aux.rs
+++ b/tests/ui/imports/auxiliary/issue-36881-aux.rs
diff --git a/src/test/ui/imports/auxiliary/issue-52891.rs b/tests/ui/imports/auxiliary/issue-52891.rs
index 075981183..075981183 100644
--- a/src/test/ui/imports/auxiliary/issue-52891.rs
+++ b/tests/ui/imports/auxiliary/issue-52891.rs
diff --git a/src/test/ui/imports/auxiliary/issue-55811.rs b/tests/ui/imports/auxiliary/issue-55811.rs
index 877e4cdb0..877e4cdb0 100644
--- a/src/test/ui/imports/auxiliary/issue-55811.rs
+++ b/tests/ui/imports/auxiliary/issue-55811.rs
diff --git a/src/test/ui/imports/auxiliary/issue-56125.rs b/tests/ui/imports/auxiliary/issue-56125.rs
index 8e0797582..8e0797582 100644
--- a/src/test/ui/imports/auxiliary/issue-56125.rs
+++ b/tests/ui/imports/auxiliary/issue-56125.rs
diff --git a/src/test/ui/imports/auxiliary/issue-59764.rs b/tests/ui/imports/auxiliary/issue-59764.rs
index a92eed968..a92eed968 100644
--- a/src/test/ui/imports/auxiliary/issue-59764.rs
+++ b/tests/ui/imports/auxiliary/issue-59764.rs
diff --git a/src/test/ui/imports/auxiliary/overlapping_pub_trait_source.rs b/tests/ui/imports/auxiliary/overlapping_pub_trait_source.rs
index 2a25d60ac..2a25d60ac 100644
--- a/src/test/ui/imports/auxiliary/overlapping_pub_trait_source.rs
+++ b/tests/ui/imports/auxiliary/overlapping_pub_trait_source.rs
diff --git a/src/test/ui/imports/auxiliary/two_macros.rs b/tests/ui/imports/auxiliary/two_macros.rs
index 92c211467..92c211467 100644
--- a/src/test/ui/imports/auxiliary/two_macros.rs
+++ b/tests/ui/imports/auxiliary/two_macros.rs
diff --git a/src/test/ui/imports/auxiliary/unnamed_pub_trait_source.rs b/tests/ui/imports/auxiliary/unnamed_pub_trait_source.rs
index d73c9a795..d73c9a795 100644
--- a/src/test/ui/imports/auxiliary/unnamed_pub_trait_source.rs
+++ b/tests/ui/imports/auxiliary/unnamed_pub_trait_source.rs
diff --git a/tests/ui/imports/bad-import-in-nested.rs b/tests/ui/imports/bad-import-in-nested.rs
new file mode 100644
index 000000000..2e95480ad
--- /dev/null
+++ b/tests/ui/imports/bad-import-in-nested.rs
@@ -0,0 +1,27 @@
+// edition: 2021
+
+#![allow(unused)]
+
+mod A {
+    pub(crate) type AA = ();
+    pub(crate) type BB = ();
+
+    mod A2 {
+        use super::{super::C::D::AA, AA as _};
+        //~^ ERROR unresolved import
+    }
+}
+
+mod C {
+    pub mod D {}
+}
+
+mod B {
+    use crate::C::{self, AA};
+    //~^ ERROR unresolved import
+
+    use crate::{A, C::BB};
+    //~^ ERROR unresolved import
+}
+
+fn main() {}
diff --git a/tests/ui/imports/bad-import-in-nested.stderr b/tests/ui/imports/bad-import-in-nested.stderr
new file mode 100644
index 000000000..b6b1bc5fc
--- /dev/null
+++ b/tests/ui/imports/bad-import-in-nested.stderr
@@ -0,0 +1,30 @@
+error[E0432]: unresolved import `super::super::C::D::AA`
+  --> $DIR/bad-import-in-nested.rs:10:21
+   |
+LL |         use super::{super::C::D::AA, AA as _};
+   |                     ^^^^^^^^^^^^^^^ no `AA` in `C::D`
+   |
+   = help: consider importing this type alias instead:
+           crate::A::AA
+
+error[E0432]: unresolved import `crate::C::AA`
+  --> $DIR/bad-import-in-nested.rs:20:26
+   |
+LL |     use crate::C::{self, AA};
+   |                          ^^ no `AA` in `C`
+   |
+   = help: consider importing this type alias instead:
+           crate::A::AA
+
+error[E0432]: unresolved import `crate::C::BB`
+  --> $DIR/bad-import-in-nested.rs:23:20
+   |
+LL |     use crate::{A, C::BB};
+   |                    ^^^^^ no `BB` in `C`
+   |
+   = help: consider importing this type alias instead:
+           crate::A::BB
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0432`.
diff --git a/tests/ui/imports/bad-import-with-rename.rs b/tests/ui/imports/bad-import-with-rename.rs
new file mode 100644
index 000000000..ffe56916f
--- /dev/null
+++ b/tests/ui/imports/bad-import-with-rename.rs
@@ -0,0 +1,16 @@
+mod A {
+    pub type B = ();
+    pub type B2 = ();
+}
+
+mod C {
+    use crate::D::B as _;
+    //~^ ERROR unresolved import `crate::D::B`
+
+    use crate::D::B2;
+    //~^ ERROR unresolved import `crate::D::B2`
+}
+
+mod D {}
+
+fn main() {}
diff --git a/tests/ui/imports/bad-import-with-rename.stderr b/tests/ui/imports/bad-import-with-rename.stderr
new file mode 100644
index 000000000..f9c5cf920
--- /dev/null
+++ b/tests/ui/imports/bad-import-with-rename.stderr
@@ -0,0 +1,25 @@
+error[E0432]: unresolved import `crate::D::B`
+  --> $DIR/bad-import-with-rename.rs:7:9
+   |
+LL |     use crate::D::B as _;
+   |         ^^^^^^^^^^^^^^^^ no `B` in `D`
+   |
+help: consider importing this type alias instead
+   |
+LL |     use A::B as _;
+   |         ~~~~~~~~~
+
+error[E0432]: unresolved import `crate::D::B2`
+  --> $DIR/bad-import-with-rename.rs:10:9
+   |
+LL |     use crate::D::B2;
+   |         ^^^^^^^^^^^^ no `B2` in `D`
+   |
+help: consider importing this type alias instead
+   |
+LL |     use A::B2;
+   |         ~~~~~
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/imports/double-import.rs b/tests/ui/imports/double-import.rs
index e7325368b..e7325368b 100644
--- a/src/test/ui/imports/double-import.rs
+++ b/tests/ui/imports/double-import.rs
diff --git a/src/test/ui/imports/double-import.stderr b/tests/ui/imports/double-import.stderr
index 82f5eb83e..82f5eb83e 100644
--- a/src/test/ui/imports/double-import.stderr
+++ b/tests/ui/imports/double-import.stderr
diff --git a/src/test/ui/imports/duplicate.rs b/tests/ui/imports/duplicate.rs
index db6538969..db6538969 100644
--- a/src/test/ui/imports/duplicate.rs
+++ b/tests/ui/imports/duplicate.rs
diff --git a/src/test/ui/imports/duplicate.stderr b/tests/ui/imports/duplicate.stderr
index 997a2741b..997a2741b 100644
--- a/src/test/ui/imports/duplicate.stderr
+++ b/tests/ui/imports/duplicate.stderr
diff --git a/src/test/ui/imports/export-glob-imports-target.rs b/tests/ui/imports/export-glob-imports-target.rs
index 4df807ea4..4df807ea4 100644
--- a/src/test/ui/imports/export-glob-imports-target.rs
+++ b/tests/ui/imports/export-glob-imports-target.rs
diff --git a/src/test/ui/imports/export-multi.rs b/tests/ui/imports/export-multi.rs
index 02bdbe8af..02bdbe8af 100644
--- a/src/test/ui/imports/export-multi.rs
+++ b/tests/ui/imports/export-multi.rs
diff --git a/src/test/ui/imports/extern-crate-self/extern-crate-self-fail.rs b/tests/ui/imports/extern-crate-self/extern-crate-self-fail.rs
index 1c0d3b4b9..1c0d3b4b9 100644
--- a/src/test/ui/imports/extern-crate-self/extern-crate-self-fail.rs
+++ b/tests/ui/imports/extern-crate-self/extern-crate-self-fail.rs
diff --git a/src/test/ui/imports/extern-crate-self/extern-crate-self-fail.stderr b/tests/ui/imports/extern-crate-self/extern-crate-self-fail.stderr
index 127765727..127765727 100644
--- a/src/test/ui/imports/extern-crate-self/extern-crate-self-fail.stderr
+++ b/tests/ui/imports/extern-crate-self/extern-crate-self-fail.stderr
diff --git a/src/test/ui/imports/extern-crate-self/extern-crate-self-macro-alias.rs b/tests/ui/imports/extern-crate-self/extern-crate-self-macro-alias.rs
index 796835228..796835228 100644
--- a/src/test/ui/imports/extern-crate-self/extern-crate-self-macro-alias.rs
+++ b/tests/ui/imports/extern-crate-self/extern-crate-self-macro-alias.rs
diff --git a/src/test/ui/imports/extern-crate-self/extern-crate-self-macro-item.rs b/tests/ui/imports/extern-crate-self/extern-crate-self-macro-item.rs
index 244293be7..244293be7 100644
--- a/src/test/ui/imports/extern-crate-self/extern-crate-self-macro-item.rs
+++ b/tests/ui/imports/extern-crate-self/extern-crate-self-macro-item.rs
diff --git a/src/test/ui/imports/extern-crate-self/extern-crate-self-macro-self.rs b/tests/ui/imports/extern-crate-self/extern-crate-self-macro-self.rs
index 009a92e87..009a92e87 100644
--- a/src/test/ui/imports/extern-crate-self/extern-crate-self-macro-self.rs
+++ b/tests/ui/imports/extern-crate-self/extern-crate-self-macro-self.rs
diff --git a/src/test/ui/imports/extern-crate-self/extern-crate-self-pass.rs b/tests/ui/imports/extern-crate-self/extern-crate-self-pass.rs
index 9cebb622e..9cebb622e 100644
--- a/src/test/ui/imports/extern-crate-self/extern-crate-self-pass.rs
+++ b/tests/ui/imports/extern-crate-self/extern-crate-self-pass.rs
diff --git a/src/test/ui/imports/extern-crate-used.rs b/tests/ui/imports/extern-crate-used.rs
index 8198c1816..8198c1816 100644
--- a/src/test/ui/imports/extern-crate-used.rs
+++ b/tests/ui/imports/extern-crate-used.rs
diff --git a/src/test/ui/imports/extern-crate-used.stderr b/tests/ui/imports/extern-crate-used.stderr
index 1b9a2e472..1b9a2e472 100644
--- a/src/test/ui/imports/extern-crate-used.stderr
+++ b/tests/ui/imports/extern-crate-used.stderr
diff --git a/src/test/ui/imports/extern-prelude-extern-crate-absolute-expanded.rs b/tests/ui/imports/extern-prelude-extern-crate-absolute-expanded.rs
index 30d87f90b..30d87f90b 100644
--- a/src/test/ui/imports/extern-prelude-extern-crate-absolute-expanded.rs
+++ b/tests/ui/imports/extern-prelude-extern-crate-absolute-expanded.rs
diff --git a/src/test/ui/imports/extern-prelude-extern-crate-cfg.rs b/tests/ui/imports/extern-prelude-extern-crate-cfg.rs
index cfae08fcc..cfae08fcc 100644
--- a/src/test/ui/imports/extern-prelude-extern-crate-cfg.rs
+++ b/tests/ui/imports/extern-prelude-extern-crate-cfg.rs
diff --git a/src/test/ui/imports/extern-prelude-extern-crate-fail.rs b/tests/ui/imports/extern-prelude-extern-crate-fail.rs
index feb1ab09d..feb1ab09d 100644
--- a/src/test/ui/imports/extern-prelude-extern-crate-fail.rs
+++ b/tests/ui/imports/extern-prelude-extern-crate-fail.rs
diff --git a/src/test/ui/imports/extern-prelude-extern-crate-fail.stderr b/tests/ui/imports/extern-prelude-extern-crate-fail.stderr
index f7e37449e..f7e37449e 100644
--- a/src/test/ui/imports/extern-prelude-extern-crate-fail.stderr
+++ b/tests/ui/imports/extern-prelude-extern-crate-fail.stderr
diff --git a/src/test/ui/imports/extern-prelude-extern-crate-pass.rs b/tests/ui/imports/extern-prelude-extern-crate-pass.rs
index c87d58f63..c87d58f63 100644
--- a/src/test/ui/imports/extern-prelude-extern-crate-pass.rs
+++ b/tests/ui/imports/extern-prelude-extern-crate-pass.rs
diff --git a/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.rs b/tests/ui/imports/extern-prelude-extern-crate-restricted-shadowing.rs
index 6ff3ab736..6ff3ab736 100644
--- a/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.rs
+++ b/tests/ui/imports/extern-prelude-extern-crate-restricted-shadowing.rs
diff --git a/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr b/tests/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr
index c31c88403..ade479ed1 100644
--- a/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr
+++ b/tests/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr
@@ -24,11 +24,8 @@ LL |         extern crate std as Vec;
 ...
 LL | define_vec!();
    | ------------- in this macro invocation
-note: `Vec` could also refer to the struct defined here
+note: `Vec` could also refer to a struct from prelude
   --> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
-   |
-LL |     pub use super::v1::*;
-   |             ^^^^^^^^^^^^
    = note: this error originates in the macro `define_vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/imports/extern-prelude-extern-crate-shadowing.rs b/tests/ui/imports/extern-prelude-extern-crate-shadowing.rs
index 9e69a27d7..9e69a27d7 100644
--- a/src/test/ui/imports/extern-prelude-extern-crate-shadowing.rs
+++ b/tests/ui/imports/extern-prelude-extern-crate-shadowing.rs
diff --git a/src/test/ui/imports/gensymed.rs b/tests/ui/imports/gensymed.rs
index 7b53f0c53..7b53f0c53 100644
--- a/src/test/ui/imports/gensymed.rs
+++ b/tests/ui/imports/gensymed.rs
diff --git a/src/test/ui/imports/glob-conflict-cross-crate.rs b/tests/ui/imports/glob-conflict-cross-crate.rs
index d84c243f2..d84c243f2 100644
--- a/src/test/ui/imports/glob-conflict-cross-crate.rs
+++ b/tests/ui/imports/glob-conflict-cross-crate.rs
diff --git a/src/test/ui/imports/glob-conflict-cross-crate.stderr b/tests/ui/imports/glob-conflict-cross-crate.stderr
index 0e3b4222f..0e3b4222f 100644
--- a/src/test/ui/imports/glob-conflict-cross-crate.stderr
+++ b/tests/ui/imports/glob-conflict-cross-crate.stderr
diff --git a/src/test/ui/imports/glob-cycles.rs b/tests/ui/imports/glob-cycles.rs
index f354cc885..f354cc885 100644
--- a/src/test/ui/imports/glob-cycles.rs
+++ b/tests/ui/imports/glob-cycles.rs
diff --git a/src/test/ui/imports/glob-resolve1.rs b/tests/ui/imports/glob-resolve1.rs
index 904b77117..904b77117 100644
--- a/src/test/ui/imports/glob-resolve1.rs
+++ b/tests/ui/imports/glob-resolve1.rs
diff --git a/src/test/ui/imports/glob-resolve1.stderr b/tests/ui/imports/glob-resolve1.stderr
index 3b66a5e31..3b66a5e31 100644
--- a/src/test/ui/imports/glob-resolve1.stderr
+++ b/tests/ui/imports/glob-resolve1.stderr
diff --git a/src/test/ui/imports/glob-shadowing.rs b/tests/ui/imports/glob-shadowing.rs
index 3a33b592b..3a33b592b 100644
--- a/src/test/ui/imports/glob-shadowing.rs
+++ b/tests/ui/imports/glob-shadowing.rs
diff --git a/src/test/ui/imports/glob-shadowing.stderr b/tests/ui/imports/glob-shadowing.stderr
index aff2eff68..aff2eff68 100644
--- a/src/test/ui/imports/glob-shadowing.stderr
+++ b/tests/ui/imports/glob-shadowing.stderr
diff --git a/src/test/ui/imports/glob-use-std.rs b/tests/ui/imports/glob-use-std.rs
index ef06cc570..ef06cc570 100644
--- a/src/test/ui/imports/glob-use-std.rs
+++ b/tests/ui/imports/glob-use-std.rs
diff --git a/src/test/ui/imports/import-crate-var.rs b/tests/ui/imports/import-crate-var.rs
index aac5a15d3..aac5a15d3 100644
--- a/src/test/ui/imports/import-crate-var.rs
+++ b/tests/ui/imports/import-crate-var.rs
diff --git a/src/test/ui/imports/import-crate-var.stderr b/tests/ui/imports/import-crate-var.stderr
index f1f1dfbdb..f1f1dfbdb 100644
--- a/src/test/ui/imports/import-crate-var.stderr
+++ b/tests/ui/imports/import-crate-var.stderr
diff --git a/src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs b/tests/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs
index b76c1680b..b76c1680b 100644
--- a/src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs
+++ b/tests/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs
diff --git a/src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs b/tests/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs
index 63611c242..63611c242 100644
--- a/src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs
+++ b/tests/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs
diff --git a/src/test/ui/imports/import-crate-with-invalid-spans/main.rs b/tests/ui/imports/import-crate-with-invalid-spans/main.rs
index 64a4deca8..64a4deca8 100644
--- a/src/test/ui/imports/import-crate-with-invalid-spans/main.rs
+++ b/tests/ui/imports/import-crate-with-invalid-spans/main.rs
diff --git a/src/test/ui/imports/import-from-missing.rs b/tests/ui/imports/import-from-missing.rs
index 8eae70020..8eae70020 100644
--- a/src/test/ui/imports/import-from-missing.rs
+++ b/tests/ui/imports/import-from-missing.rs
diff --git a/src/test/ui/imports/import-from-missing.stderr b/tests/ui/imports/import-from-missing.stderr
index 4254bfb5e..4254bfb5e 100644
--- a/src/test/ui/imports/import-from-missing.stderr
+++ b/tests/ui/imports/import-from-missing.stderr
diff --git a/src/test/ui/imports/import-from.rs b/tests/ui/imports/import-from.rs
index 2817977b3..2817977b3 100644
--- a/src/test/ui/imports/import-from.rs
+++ b/tests/ui/imports/import-from.rs
diff --git a/src/test/ui/imports/import-glob-0-rpass.rs b/tests/ui/imports/import-glob-0-rpass.rs
index 9c6a87279..9c6a87279 100644
--- a/src/test/ui/imports/import-glob-0-rpass.rs
+++ b/tests/ui/imports/import-glob-0-rpass.rs
diff --git a/src/test/ui/imports/import-glob-0.rs b/tests/ui/imports/import-glob-0.rs
index 37a0d1545..37a0d1545 100644
--- a/src/test/ui/imports/import-glob-0.rs
+++ b/tests/ui/imports/import-glob-0.rs
diff --git a/src/test/ui/imports/import-glob-0.stderr b/tests/ui/imports/import-glob-0.stderr
index 820ff1bb5..820ff1bb5 100644
--- a/src/test/ui/imports/import-glob-0.stderr
+++ b/tests/ui/imports/import-glob-0.stderr
diff --git a/src/test/ui/imports/import-glob-1.rs b/tests/ui/imports/import-glob-1.rs
index fcc0b63f1..fcc0b63f1 100644
--- a/src/test/ui/imports/import-glob-1.rs
+++ b/tests/ui/imports/import-glob-1.rs
diff --git a/src/test/ui/imports/import-glob-circular.rs b/tests/ui/imports/import-glob-circular.rs
index e47fa870c..e47fa870c 100644
--- a/src/test/ui/imports/import-glob-circular.rs
+++ b/tests/ui/imports/import-glob-circular.rs
diff --git a/src/test/ui/imports/import-glob-circular.stderr b/tests/ui/imports/import-glob-circular.stderr
index 86bbea579..86bbea579 100644
--- a/src/test/ui/imports/import-glob-circular.stderr
+++ b/tests/ui/imports/import-glob-circular.stderr
diff --git a/src/test/ui/imports/import-glob-crate.rs b/tests/ui/imports/import-glob-crate.rs
index 501392b78..501392b78 100644
--- a/src/test/ui/imports/import-glob-crate.rs
+++ b/tests/ui/imports/import-glob-crate.rs
diff --git a/src/test/ui/imports/import-in-block.rs b/tests/ui/imports/import-in-block.rs
index 19703904e..19703904e 100644
--- a/src/test/ui/imports/import-in-block.rs
+++ b/tests/ui/imports/import-in-block.rs
diff --git a/src/test/ui/imports/import-loop-2.rs b/tests/ui/imports/import-loop-2.rs
index 14a85dd08..14a85dd08 100644
--- a/src/test/ui/imports/import-loop-2.rs
+++ b/tests/ui/imports/import-loop-2.rs
diff --git a/src/test/ui/imports/import-loop-2.stderr b/tests/ui/imports/import-loop-2.stderr
index 1abfcde03..1abfcde03 100644
--- a/src/test/ui/imports/import-loop-2.stderr
+++ b/tests/ui/imports/import-loop-2.stderr
diff --git a/src/test/ui/imports/import-loop.rs b/tests/ui/imports/import-loop.rs
index b48783401..b48783401 100644
--- a/src/test/ui/imports/import-loop.rs
+++ b/tests/ui/imports/import-loop.rs
diff --git a/src/test/ui/imports/import-loop.stderr b/tests/ui/imports/import-loop.stderr
index b87bfb1be..b87bfb1be 100644
--- a/src/test/ui/imports/import-loop.stderr
+++ b/tests/ui/imports/import-loop.stderr
diff --git a/src/test/ui/imports/import-prefix-macro-1.rs b/tests/ui/imports/import-prefix-macro-1.rs
index 91cfd3768..91cfd3768 100644
--- a/src/test/ui/imports/import-prefix-macro-1.rs
+++ b/tests/ui/imports/import-prefix-macro-1.rs
diff --git a/src/test/ui/imports/import-prefix-macro-1.stderr b/tests/ui/imports/import-prefix-macro-1.stderr
index 8868ee3ae..8868ee3ae 100644
--- a/src/test/ui/imports/import-prefix-macro-1.stderr
+++ b/tests/ui/imports/import-prefix-macro-1.stderr
diff --git a/src/test/ui/imports/import-prefix-macro-2.rs b/tests/ui/imports/import-prefix-macro-2.rs
index 952d161e8..952d161e8 100644
--- a/src/test/ui/imports/import-prefix-macro-2.rs
+++ b/tests/ui/imports/import-prefix-macro-2.rs
diff --git a/src/test/ui/imports/import-prefix-macro-2.stderr b/tests/ui/imports/import-prefix-macro-2.stderr
index 23f8d5764..23f8d5764 100644
--- a/src/test/ui/imports/import-prefix-macro-2.stderr
+++ b/tests/ui/imports/import-prefix-macro-2.stderr
diff --git a/src/test/ui/imports/import-prefix-macro.rs b/tests/ui/imports/import-prefix-macro.rs
index d770bb0da..d770bb0da 100644
--- a/src/test/ui/imports/import-prefix-macro.rs
+++ b/tests/ui/imports/import-prefix-macro.rs
diff --git a/src/test/ui/imports/import-rename.rs b/tests/ui/imports/import-rename.rs
index 9ad2b34b8..9ad2b34b8 100644
--- a/src/test/ui/imports/import-rename.rs
+++ b/tests/ui/imports/import-rename.rs
diff --git a/src/test/ui/imports/import-rpass.rs b/tests/ui/imports/import-rpass.rs
index de8bf6261..de8bf6261 100644
--- a/src/test/ui/imports/import-rpass.rs
+++ b/tests/ui/imports/import-rpass.rs
diff --git a/src/test/ui/imports/import-trailing-comma.rs b/tests/ui/imports/import-trailing-comma.rs
index f65c5c866..f65c5c866 100644
--- a/src/test/ui/imports/import-trailing-comma.rs
+++ b/tests/ui/imports/import-trailing-comma.rs
diff --git a/src/test/ui/imports/import-trait-method.rs b/tests/ui/imports/import-trait-method.rs
index 97dd68f1e..97dd68f1e 100644
--- a/src/test/ui/imports/import-trait-method.rs
+++ b/tests/ui/imports/import-trait-method.rs
diff --git a/src/test/ui/imports/import-trait-method.stderr b/tests/ui/imports/import-trait-method.stderr
index 3c26907d3..3c26907d3 100644
--- a/src/test/ui/imports/import-trait-method.stderr
+++ b/tests/ui/imports/import-trait-method.stderr
diff --git a/src/test/ui/imports/import.rs b/tests/ui/imports/import.rs
index 3170dd2fa..3170dd2fa 100644
--- a/src/test/ui/imports/import.rs
+++ b/tests/ui/imports/import.rs
diff --git a/src/test/ui/imports/import.stderr b/tests/ui/imports/import.stderr
index 797712e2d..797712e2d 100644
--- a/src/test/ui/imports/import.stderr
+++ b/tests/ui/imports/import.stderr
diff --git a/src/test/ui/imports/import2-rpass.rs b/tests/ui/imports/import2-rpass.rs
index 7b70f799e..7b70f799e 100644
--- a/src/test/ui/imports/import2-rpass.rs
+++ b/tests/ui/imports/import2-rpass.rs
diff --git a/src/test/ui/imports/import2.rs b/tests/ui/imports/import2.rs
index 036d6bc07..036d6bc07 100644
--- a/src/test/ui/imports/import2.rs
+++ b/tests/ui/imports/import2.rs
diff --git a/src/test/ui/imports/import2.stderr b/tests/ui/imports/import2.stderr
index da888979c..da888979c 100644
--- a/src/test/ui/imports/import2.stderr
+++ b/tests/ui/imports/import2.stderr
diff --git a/src/test/ui/imports/import3-rpass.rs b/tests/ui/imports/import3-rpass.rs
index 17797aed3..17797aed3 100644
--- a/src/test/ui/imports/import3-rpass.rs
+++ b/tests/ui/imports/import3-rpass.rs
diff --git a/src/test/ui/imports/import3.rs b/tests/ui/imports/import3.rs
index 2c6ac9a00..2c6ac9a00 100644
--- a/src/test/ui/imports/import3.rs
+++ b/tests/ui/imports/import3.rs
diff --git a/src/test/ui/imports/import3.stderr b/tests/ui/imports/import3.stderr
index ca75c9c18..ca75c9c18 100644
--- a/src/test/ui/imports/import3.stderr
+++ b/tests/ui/imports/import3.stderr
diff --git a/src/test/ui/imports/import4-rpass.rs b/tests/ui/imports/import4-rpass.rs
index 4fda53861..4fda53861 100644
--- a/src/test/ui/imports/import4-rpass.rs
+++ b/tests/ui/imports/import4-rpass.rs
diff --git a/src/test/ui/imports/import4.rs b/tests/ui/imports/import4.rs
index ba3b7fbf5..ba3b7fbf5 100644
--- a/src/test/ui/imports/import4.rs
+++ b/tests/ui/imports/import4.rs
diff --git a/src/test/ui/imports/import4.stderr b/tests/ui/imports/import4.stderr
index e0b478f1a..e0b478f1a 100644
--- a/src/test/ui/imports/import4.stderr
+++ b/tests/ui/imports/import4.stderr
diff --git a/src/test/ui/imports/import5.rs b/tests/ui/imports/import5.rs
index be2a55c2d..be2a55c2d 100644
--- a/src/test/ui/imports/import5.rs
+++ b/tests/ui/imports/import5.rs
diff --git a/src/test/ui/imports/import6.rs b/tests/ui/imports/import6.rs
index e11b28531..e11b28531 100644
--- a/src/test/ui/imports/import6.rs
+++ b/tests/ui/imports/import6.rs
diff --git a/src/test/ui/imports/import7.rs b/tests/ui/imports/import7.rs
index aca7fbdc4..aca7fbdc4 100644
--- a/src/test/ui/imports/import7.rs
+++ b/tests/ui/imports/import7.rs
diff --git a/src/test/ui/imports/import8.rs b/tests/ui/imports/import8.rs
index 87f0986ba..87f0986ba 100644
--- a/src/test/ui/imports/import8.rs
+++ b/tests/ui/imports/import8.rs
diff --git a/src/test/ui/imports/imports.rs b/tests/ui/imports/imports.rs
index acb2b32b5..acb2b32b5 100644
--- a/src/test/ui/imports/imports.rs
+++ b/tests/ui/imports/imports.rs
diff --git a/src/test/ui/imports/inaccessible_type_aliases.rs b/tests/ui/imports/inaccessible_type_aliases.rs
index c3d4214e2..c3d4214e2 100644
--- a/src/test/ui/imports/inaccessible_type_aliases.rs
+++ b/tests/ui/imports/inaccessible_type_aliases.rs
diff --git a/src/test/ui/imports/inaccessible_type_aliases.stderr b/tests/ui/imports/inaccessible_type_aliases.stderr
index ef2242460..ef2242460 100644
--- a/src/test/ui/imports/inaccessible_type_aliases.stderr
+++ b/tests/ui/imports/inaccessible_type_aliases.stderr
diff --git a/src/test/ui/imports/issue-13404.rs b/tests/ui/imports/issue-13404.rs
index c5af827d5..c5af827d5 100644
--- a/src/test/ui/imports/issue-13404.rs
+++ b/tests/ui/imports/issue-13404.rs
diff --git a/src/test/ui/imports/issue-13404.stderr b/tests/ui/imports/issue-13404.stderr
index 1f50debb0..1f50debb0 100644
--- a/src/test/ui/imports/issue-13404.stderr
+++ b/tests/ui/imports/issue-13404.stderr
diff --git a/src/test/ui/imports/issue-1697.rs b/tests/ui/imports/issue-1697.rs
index 5cd76d21f..5cd76d21f 100644
--- a/src/test/ui/imports/issue-1697.rs
+++ b/tests/ui/imports/issue-1697.rs
diff --git a/src/test/ui/imports/issue-1697.stderr b/tests/ui/imports/issue-1697.stderr
index 019ef9ad5..019ef9ad5 100644
--- a/src/test/ui/imports/issue-1697.stderr
+++ b/tests/ui/imports/issue-1697.stderr
diff --git a/src/test/ui/imports/issue-18083.rs b/tests/ui/imports/issue-18083.rs
index 36420ec14..36420ec14 100644
--- a/src/test/ui/imports/issue-18083.rs
+++ b/tests/ui/imports/issue-18083.rs
diff --git a/src/test/ui/imports/issue-19498.rs b/tests/ui/imports/issue-19498.rs
index 5fe6742f5..5fe6742f5 100644
--- a/src/test/ui/imports/issue-19498.rs
+++ b/tests/ui/imports/issue-19498.rs
diff --git a/src/test/ui/imports/issue-19498.stderr b/tests/ui/imports/issue-19498.stderr
index 9d2602209..9d2602209 100644
--- a/src/test/ui/imports/issue-19498.stderr
+++ b/tests/ui/imports/issue-19498.stderr
diff --git a/src/test/ui/imports/issue-24081.rs b/tests/ui/imports/issue-24081.rs
index 10983ce11..10983ce11 100644
--- a/src/test/ui/imports/issue-24081.rs
+++ b/tests/ui/imports/issue-24081.rs
diff --git a/src/test/ui/imports/issue-24081.stderr b/tests/ui/imports/issue-24081.stderr
index e5ed6b10a..e5ed6b10a 100644
--- a/src/test/ui/imports/issue-24081.stderr
+++ b/tests/ui/imports/issue-24081.stderr
diff --git a/src/test/ui/imports/issue-24883.rs b/tests/ui/imports/issue-24883.rs
index 819a20ddb..819a20ddb 100644
--- a/src/test/ui/imports/issue-24883.rs
+++ b/tests/ui/imports/issue-24883.rs
diff --git a/src/test/ui/imports/issue-25396.rs b/tests/ui/imports/issue-25396.rs
index 301658d23..301658d23 100644
--- a/src/test/ui/imports/issue-25396.rs
+++ b/tests/ui/imports/issue-25396.rs
diff --git a/src/test/ui/imports/issue-25396.stderr b/tests/ui/imports/issue-25396.stderr
index 518d2be78..518d2be78 100644
--- a/src/test/ui/imports/issue-25396.stderr
+++ b/tests/ui/imports/issue-25396.stderr
diff --git a/src/test/ui/imports/issue-26873-multifile/A/B.rs b/tests/ui/imports/issue-26873-multifile/A/B.rs
index ab7b0d816..ab7b0d816 100644
--- a/src/test/ui/imports/issue-26873-multifile/A/B.rs
+++ b/tests/ui/imports/issue-26873-multifile/A/B.rs
diff --git a/src/test/ui/imports/issue-26873-multifile/A/C.rs b/tests/ui/imports/issue-26873-multifile/A/C.rs
index b287283df..b287283df 100644
--- a/src/test/ui/imports/issue-26873-multifile/A/C.rs
+++ b/tests/ui/imports/issue-26873-multifile/A/C.rs
diff --git a/src/test/ui/imports/issue-26873-multifile/A/mod.rs b/tests/ui/imports/issue-26873-multifile/A/mod.rs
index 0f18772bf..0f18772bf 100644
--- a/src/test/ui/imports/issue-26873-multifile/A/mod.rs
+++ b/tests/ui/imports/issue-26873-multifile/A/mod.rs
diff --git a/src/test/ui/imports/issue-26873-multifile/compiletest-ignore-dir b/tests/ui/imports/issue-26873-multifile/compiletest-ignore-dir
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/imports/issue-26873-multifile/compiletest-ignore-dir
+++ b/tests/ui/imports/issue-26873-multifile/compiletest-ignore-dir
diff --git a/src/test/ui/imports/issue-26873-multifile/issue-26873-multifile.rs b/tests/ui/imports/issue-26873-multifile/issue-26873-multifile.rs
index da2acf6c9..da2acf6c9 100644
--- a/src/test/ui/imports/issue-26873-multifile/issue-26873-multifile.rs
+++ b/tests/ui/imports/issue-26873-multifile/issue-26873-multifile.rs
diff --git a/src/test/ui/imports/issue-26873-multifile/issue-26873-onefile.rs b/tests/ui/imports/issue-26873-multifile/issue-26873-onefile.rs
index f06c6499e..f06c6499e 100644
--- a/src/test/ui/imports/issue-26873-multifile/issue-26873-onefile.rs
+++ b/tests/ui/imports/issue-26873-multifile/issue-26873-onefile.rs
diff --git a/src/test/ui/imports/issue-26873-multifile/mod.rs b/tests/ui/imports/issue-26873-multifile/mod.rs
index a1ba53f91..a1ba53f91 100644
--- a/src/test/ui/imports/issue-26873-multifile/mod.rs
+++ b/tests/ui/imports/issue-26873-multifile/mod.rs
diff --git a/src/test/ui/imports/issue-26886.rs b/tests/ui/imports/issue-26886.rs
index 6e6d406c6..6e6d406c6 100644
--- a/src/test/ui/imports/issue-26886.rs
+++ b/tests/ui/imports/issue-26886.rs
diff --git a/src/test/ui/imports/issue-26886.stderr b/tests/ui/imports/issue-26886.stderr
index e2b925ec5..e2b925ec5 100644
--- a/src/test/ui/imports/issue-26886.stderr
+++ b/tests/ui/imports/issue-26886.stderr
diff --git a/src/test/ui/issues/issue-26930.rs b/tests/ui/imports/issue-26930.rs
index 707e71b11..707e71b11 100644
--- a/src/test/ui/issues/issue-26930.rs
+++ b/tests/ui/imports/issue-26930.rs
diff --git a/src/test/ui/imports/issue-28134.rs b/tests/ui/imports/issue-28134.rs
index ef2a5d634..ef2a5d634 100644
--- a/src/test/ui/imports/issue-28134.rs
+++ b/tests/ui/imports/issue-28134.rs
diff --git a/src/test/ui/imports/issue-28134.stderr b/tests/ui/imports/issue-28134.stderr
index 33cb53f20..33cb53f20 100644
--- a/src/test/ui/imports/issue-28134.stderr
+++ b/tests/ui/imports/issue-28134.stderr
diff --git a/src/test/ui/imports/issue-28388-1.rs b/tests/ui/imports/issue-28388-1.rs
index 14de62140..14de62140 100644
--- a/src/test/ui/imports/issue-28388-1.rs
+++ b/tests/ui/imports/issue-28388-1.rs
diff --git a/src/test/ui/imports/issue-28388-1.stderr b/tests/ui/imports/issue-28388-1.stderr
index 7f5e47aa8..7f5e47aa8 100644
--- a/src/test/ui/imports/issue-28388-1.stderr
+++ b/tests/ui/imports/issue-28388-1.stderr
diff --git a/src/test/ui/imports/issue-28388-2.rs b/tests/ui/imports/issue-28388-2.rs
index 024b0388b..024b0388b 100644
--- a/src/test/ui/imports/issue-28388-2.rs
+++ b/tests/ui/imports/issue-28388-2.rs
diff --git a/src/test/ui/imports/issue-28388-2.stderr b/tests/ui/imports/issue-28388-2.stderr
index 1afaf622b..1afaf622b 100644
--- a/src/test/ui/imports/issue-28388-2.stderr
+++ b/tests/ui/imports/issue-28388-2.stderr
diff --git a/src/test/ui/imports/issue-2937.rs b/tests/ui/imports/issue-2937.rs
index 335df5c07..335df5c07 100644
--- a/src/test/ui/imports/issue-2937.rs
+++ b/tests/ui/imports/issue-2937.rs
diff --git a/src/test/ui/imports/issue-2937.stderr b/tests/ui/imports/issue-2937.stderr
index 428634828..428634828 100644
--- a/src/test/ui/imports/issue-2937.stderr
+++ b/tests/ui/imports/issue-2937.stderr
diff --git a/src/test/ui/imports/issue-30560.rs b/tests/ui/imports/issue-30560.rs
index d8d4ca608..d8d4ca608 100644
--- a/src/test/ui/imports/issue-30560.rs
+++ b/tests/ui/imports/issue-30560.rs
diff --git a/src/test/ui/imports/issue-30560.stderr b/tests/ui/imports/issue-30560.stderr
index 69cfd4c06..69cfd4c06 100644
--- a/src/test/ui/imports/issue-30560.stderr
+++ b/tests/ui/imports/issue-30560.stderr
diff --git a/src/test/ui/imports/issue-31212.rs b/tests/ui/imports/issue-31212.rs
index 556f0d18f..556f0d18f 100644
--- a/src/test/ui/imports/issue-31212.rs
+++ b/tests/ui/imports/issue-31212.rs
diff --git a/src/test/ui/imports/issue-31212.stderr b/tests/ui/imports/issue-31212.stderr
index 0bb56b361..0bb56b361 100644
--- a/src/test/ui/imports/issue-31212.stderr
+++ b/tests/ui/imports/issue-31212.stderr
diff --git a/src/test/ui/imports/issue-32119.rs b/tests/ui/imports/issue-32119.rs
index 36adb5289..36adb5289 100644
--- a/src/test/ui/imports/issue-32119.rs
+++ b/tests/ui/imports/issue-32119.rs
diff --git a/src/test/ui/imports/issue-32222.rs b/tests/ui/imports/issue-32222.rs
index 4ed06bff8..4ed06bff8 100644
--- a/src/test/ui/imports/issue-32222.rs
+++ b/tests/ui/imports/issue-32222.rs
diff --git a/src/test/ui/imports/issue-32354-suggest-import-rename.fixed b/tests/ui/imports/issue-32354-suggest-import-rename.fixed
index 27f1b8964..27f1b8964 100644
--- a/src/test/ui/imports/issue-32354-suggest-import-rename.fixed
+++ b/tests/ui/imports/issue-32354-suggest-import-rename.fixed
diff --git a/src/test/ui/imports/issue-32354-suggest-import-rename.rs b/tests/ui/imports/issue-32354-suggest-import-rename.rs
index 5a7f234d5..5a7f234d5 100644
--- a/src/test/ui/imports/issue-32354-suggest-import-rename.rs
+++ b/tests/ui/imports/issue-32354-suggest-import-rename.rs
diff --git a/src/test/ui/imports/issue-32354-suggest-import-rename.stderr b/tests/ui/imports/issue-32354-suggest-import-rename.stderr
index 4c5875ba7..4c5875ba7 100644
--- a/src/test/ui/imports/issue-32354-suggest-import-rename.stderr
+++ b/tests/ui/imports/issue-32354-suggest-import-rename.stderr
diff --git a/src/test/ui/imports/issue-32833.rs b/tests/ui/imports/issue-32833.rs
index 379eedde7..379eedde7 100644
--- a/src/test/ui/imports/issue-32833.rs
+++ b/tests/ui/imports/issue-32833.rs
diff --git a/src/test/ui/imports/issue-32833.stderr b/tests/ui/imports/issue-32833.stderr
index 430cc0fda..430cc0fda 100644
--- a/src/test/ui/imports/issue-32833.stderr
+++ b/tests/ui/imports/issue-32833.stderr
diff --git a/src/test/ui/imports/issue-33464.rs b/tests/ui/imports/issue-33464.rs
index a0edb5fdb..a0edb5fdb 100644
--- a/src/test/ui/imports/issue-33464.rs
+++ b/tests/ui/imports/issue-33464.rs
diff --git a/src/test/ui/imports/issue-33464.stderr b/tests/ui/imports/issue-33464.stderr
index c4e5c5558..c4e5c5558 100644
--- a/src/test/ui/imports/issue-33464.stderr
+++ b/tests/ui/imports/issue-33464.stderr
diff --git a/src/test/ui/imports/issue-36881.rs b/tests/ui/imports/issue-36881.rs
index 04313872d..04313872d 100644
--- a/src/test/ui/imports/issue-36881.rs
+++ b/tests/ui/imports/issue-36881.rs
diff --git a/src/test/ui/imports/issue-36881.stderr b/tests/ui/imports/issue-36881.stderr
index 2e1b46860..2e1b46860 100644
--- a/src/test/ui/imports/issue-36881.stderr
+++ b/tests/ui/imports/issue-36881.stderr
diff --git a/src/test/ui/imports/issue-37887.rs b/tests/ui/imports/issue-37887.rs
index 58f0c6b65..58f0c6b65 100644
--- a/src/test/ui/imports/issue-37887.rs
+++ b/tests/ui/imports/issue-37887.rs
diff --git a/src/test/ui/imports/issue-37887.stderr b/tests/ui/imports/issue-37887.stderr
index 75185cad3..75185cad3 100644
--- a/src/test/ui/imports/issue-37887.stderr
+++ b/tests/ui/imports/issue-37887.stderr
diff --git a/src/test/ui/imports/issue-38293.rs b/tests/ui/imports/issue-38293.rs
index 3b1393600..3b1393600 100644
--- a/src/test/ui/imports/issue-38293.rs
+++ b/tests/ui/imports/issue-38293.rs
diff --git a/src/test/ui/imports/issue-38293.stderr b/tests/ui/imports/issue-38293.stderr
index d2450ab12..d2450ab12 100644
--- a/src/test/ui/imports/issue-38293.stderr
+++ b/tests/ui/imports/issue-38293.stderr
diff --git a/src/test/ui/imports/issue-4366-2.rs b/tests/ui/imports/issue-4366-2.rs
index c777b7502..c777b7502 100644
--- a/src/test/ui/imports/issue-4366-2.rs
+++ b/tests/ui/imports/issue-4366-2.rs
diff --git a/src/test/ui/imports/issue-4366-2.stderr b/tests/ui/imports/issue-4366-2.stderr
index 4c94634ee..4c94634ee 100644
--- a/src/test/ui/imports/issue-4366-2.stderr
+++ b/tests/ui/imports/issue-4366-2.stderr
diff --git a/src/test/ui/imports/issue-4366.rs b/tests/ui/imports/issue-4366.rs
index 9ec2e58ec..9ec2e58ec 100644
--- a/src/test/ui/imports/issue-4366.rs
+++ b/tests/ui/imports/issue-4366.rs
diff --git a/src/test/ui/imports/issue-4366.stderr b/tests/ui/imports/issue-4366.stderr
index 469ea93e9..469ea93e9 100644
--- a/src/test/ui/imports/issue-4366.stderr
+++ b/tests/ui/imports/issue-4366.stderr
diff --git a/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed
index b463848ae..b463848ae 100644
--- a/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed
+++ b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed
diff --git a/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs
index 1b491ac7e..1b491ac7e 100644
--- a/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs
+++ b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs
diff --git a/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr
index 25aca4cb7..25aca4cb7 100644
--- a/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr
+++ b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr
diff --git a/src/test/ui/imports/issue-45829/auxiliary/issue-45829-a.rs b/tests/ui/imports/issue-45829/auxiliary/issue-45829-a.rs
index e9f7fefb6..e9f7fefb6 100644
--- a/src/test/ui/imports/issue-45829/auxiliary/issue-45829-a.rs
+++ b/tests/ui/imports/issue-45829/auxiliary/issue-45829-a.rs
diff --git a/src/test/ui/imports/issue-45829/auxiliary/issue-45829-b.rs b/tests/ui/imports/issue-45829/auxiliary/issue-45829-b.rs
index e9f7fefb6..e9f7fefb6 100644
--- a/src/test/ui/imports/issue-45829/auxiliary/issue-45829-b.rs
+++ b/tests/ui/imports/issue-45829/auxiliary/issue-45829-b.rs
diff --git a/src/test/ui/imports/issue-45829/import-self.rs b/tests/ui/imports/issue-45829/import-self.rs
index 2dc4331ce..2dc4331ce 100644
--- a/src/test/ui/imports/issue-45829/import-self.rs
+++ b/tests/ui/imports/issue-45829/import-self.rs
diff --git a/src/test/ui/imports/issue-45829/import-self.stderr b/tests/ui/imports/issue-45829/import-self.stderr
index 0c9424f30..0c9424f30 100644
--- a/src/test/ui/imports/issue-45829/import-self.stderr
+++ b/tests/ui/imports/issue-45829/import-self.stderr
diff --git a/src/test/ui/imports/issue-45829/import-twice.rs b/tests/ui/imports/issue-45829/import-twice.rs
index e5a8bb7ad..e5a8bb7ad 100644
--- a/src/test/ui/imports/issue-45829/import-twice.rs
+++ b/tests/ui/imports/issue-45829/import-twice.rs
diff --git a/src/test/ui/imports/issue-45829/import-twice.stderr b/tests/ui/imports/issue-45829/import-twice.stderr
index 656b011bc..656b011bc 100644
--- a/src/test/ui/imports/issue-45829/import-twice.stderr
+++ b/tests/ui/imports/issue-45829/import-twice.stderr
diff --git a/src/test/ui/imports/issue-45829/issue-45829.rs b/tests/ui/imports/issue-45829/issue-45829.rs
index 1e76e4b14..1e76e4b14 100644
--- a/src/test/ui/imports/issue-45829/issue-45829.rs
+++ b/tests/ui/imports/issue-45829/issue-45829.rs
diff --git a/src/test/ui/imports/issue-45829/issue-45829.stderr b/tests/ui/imports/issue-45829/issue-45829.stderr
index e9a9d47ce..e9a9d47ce 100644
--- a/src/test/ui/imports/issue-45829/issue-45829.stderr
+++ b/tests/ui/imports/issue-45829/issue-45829.stderr
diff --git a/src/test/ui/imports/issue-45829/rename-extern-vs-use.rs b/tests/ui/imports/issue-45829/rename-extern-vs-use.rs
index aef7aa35c..aef7aa35c 100644
--- a/src/test/ui/imports/issue-45829/rename-extern-vs-use.rs
+++ b/tests/ui/imports/issue-45829/rename-extern-vs-use.rs
diff --git a/src/test/ui/imports/issue-45829/rename-extern-vs-use.stderr b/tests/ui/imports/issue-45829/rename-extern-vs-use.stderr
index 98fd8a623..98fd8a623 100644
--- a/src/test/ui/imports/issue-45829/rename-extern-vs-use.stderr
+++ b/tests/ui/imports/issue-45829/rename-extern-vs-use.stderr
diff --git a/src/test/ui/imports/issue-45829/rename-extern-with-tab.rs b/tests/ui/imports/issue-45829/rename-extern-with-tab.rs
index 0da8b826c..0da8b826c 100644
--- a/src/test/ui/imports/issue-45829/rename-extern-with-tab.rs
+++ b/tests/ui/imports/issue-45829/rename-extern-with-tab.rs
diff --git a/src/test/ui/imports/issue-45829/rename-extern-with-tab.stderr b/tests/ui/imports/issue-45829/rename-extern-with-tab.stderr
index 2c4e8ce99..2c4e8ce99 100644
--- a/src/test/ui/imports/issue-45829/rename-extern-with-tab.stderr
+++ b/tests/ui/imports/issue-45829/rename-extern-with-tab.stderr
diff --git a/src/test/ui/imports/issue-45829/rename-extern.rs b/tests/ui/imports/issue-45829/rename-extern.rs
index 7dbda6932..7dbda6932 100644
--- a/src/test/ui/imports/issue-45829/rename-extern.rs
+++ b/tests/ui/imports/issue-45829/rename-extern.rs
diff --git a/src/test/ui/imports/issue-45829/rename-extern.stderr b/tests/ui/imports/issue-45829/rename-extern.stderr
index 209ae2201..209ae2201 100644
--- a/src/test/ui/imports/issue-45829/rename-extern.stderr
+++ b/tests/ui/imports/issue-45829/rename-extern.stderr
diff --git a/src/test/ui/imports/issue-45829/rename-use-vs-extern.rs b/tests/ui/imports/issue-45829/rename-use-vs-extern.rs
index 0cf3a77fd..0cf3a77fd 100644
--- a/src/test/ui/imports/issue-45829/rename-use-vs-extern.rs
+++ b/tests/ui/imports/issue-45829/rename-use-vs-extern.rs
diff --git a/src/test/ui/imports/issue-45829/rename-use-vs-extern.stderr b/tests/ui/imports/issue-45829/rename-use-vs-extern.stderr
index dfb5810c4..dfb5810c4 100644
--- a/src/test/ui/imports/issue-45829/rename-use-vs-extern.stderr
+++ b/tests/ui/imports/issue-45829/rename-use-vs-extern.stderr
diff --git a/src/test/ui/imports/issue-45829/rename-use-with-tabs.rs b/tests/ui/imports/issue-45829/rename-use-with-tabs.rs
index 86c5fa00f..86c5fa00f 100644
--- a/src/test/ui/imports/issue-45829/rename-use-with-tabs.rs
+++ b/tests/ui/imports/issue-45829/rename-use-with-tabs.rs
diff --git a/src/test/ui/imports/issue-45829/rename-use-with-tabs.stderr b/tests/ui/imports/issue-45829/rename-use-with-tabs.stderr
index 5a63af588..5a63af588 100644
--- a/src/test/ui/imports/issue-45829/rename-use-with-tabs.stderr
+++ b/tests/ui/imports/issue-45829/rename-use-with-tabs.stderr
diff --git a/src/test/ui/imports/issue-45829/rename-with-path.rs b/tests/ui/imports/issue-45829/rename-with-path.rs
index e278a8789..e278a8789 100644
--- a/src/test/ui/imports/issue-45829/rename-with-path.rs
+++ b/tests/ui/imports/issue-45829/rename-with-path.rs
diff --git a/src/test/ui/imports/issue-45829/rename-with-path.stderr b/tests/ui/imports/issue-45829/rename-with-path.stderr
index 2d26b0838..2d26b0838 100644
--- a/src/test/ui/imports/issue-45829/rename-with-path.stderr
+++ b/tests/ui/imports/issue-45829/rename-with-path.stderr
diff --git a/src/test/ui/imports/issue-45829/rename.rs b/tests/ui/imports/issue-45829/rename.rs
index 1c45956c6..1c45956c6 100644
--- a/src/test/ui/imports/issue-45829/rename.rs
+++ b/tests/ui/imports/issue-45829/rename.rs
diff --git a/src/test/ui/imports/issue-45829/rename.stderr b/tests/ui/imports/issue-45829/rename.stderr
index ed185ae2a..ed185ae2a 100644
--- a/src/test/ui/imports/issue-45829/rename.stderr
+++ b/tests/ui/imports/issue-45829/rename.stderr
diff --git a/src/test/ui/imports/issue-47623.rs b/tests/ui/imports/issue-47623.rs
index ad8aa4c1a..ad8aa4c1a 100644
--- a/src/test/ui/imports/issue-47623.rs
+++ b/tests/ui/imports/issue-47623.rs
diff --git a/src/test/ui/imports/issue-47623.stderr b/tests/ui/imports/issue-47623.stderr
index 53968a296..53968a296 100644
--- a/src/test/ui/imports/issue-47623.stderr
+++ b/tests/ui/imports/issue-47623.stderr
diff --git a/src/test/ui/imports/issue-4865-1.rs b/tests/ui/imports/issue-4865-1.rs
index 68fbee37d..68fbee37d 100644
--- a/src/test/ui/imports/issue-4865-1.rs
+++ b/tests/ui/imports/issue-4865-1.rs
diff --git a/src/test/ui/imports/issue-4865-2.rs b/tests/ui/imports/issue-4865-2.rs
index cbe1d0d32..cbe1d0d32 100644
--- a/src/test/ui/imports/issue-4865-2.rs
+++ b/tests/ui/imports/issue-4865-2.rs
diff --git a/src/test/ui/imports/issue-4865-3.rs b/tests/ui/imports/issue-4865-3.rs
index 12f9bba18..12f9bba18 100644
--- a/src/test/ui/imports/issue-4865-3.rs
+++ b/tests/ui/imports/issue-4865-3.rs
diff --git a/src/test/ui/imports/issue-52891.fixed b/tests/ui/imports/issue-52891.fixed
index e694b5c9b..e694b5c9b 100644
--- a/src/test/ui/imports/issue-52891.fixed
+++ b/tests/ui/imports/issue-52891.fixed
diff --git a/src/test/ui/imports/issue-52891.rs b/tests/ui/imports/issue-52891.rs
index cd4b40629..cd4b40629 100644
--- a/src/test/ui/imports/issue-52891.rs
+++ b/tests/ui/imports/issue-52891.rs
diff --git a/src/test/ui/imports/issue-52891.stderr b/tests/ui/imports/issue-52891.stderr
index 7bb1301ed..7bb1301ed 100644
--- a/src/test/ui/imports/issue-52891.stderr
+++ b/tests/ui/imports/issue-52891.stderr
diff --git a/src/test/ui/imports/issue-53140.rs b/tests/ui/imports/issue-53140.rs
index 7b4cc1768..7b4cc1768 100644
--- a/src/test/ui/imports/issue-53140.rs
+++ b/tests/ui/imports/issue-53140.rs
diff --git a/src/test/ui/imports/issue-53269.rs b/tests/ui/imports/issue-53269.rs
index 1031d5071..1031d5071 100644
--- a/src/test/ui/imports/issue-53269.rs
+++ b/tests/ui/imports/issue-53269.rs
diff --git a/src/test/ui/imports/issue-53269.stderr b/tests/ui/imports/issue-53269.stderr
index 29c7556da..29c7556da 100644
--- a/src/test/ui/imports/issue-53269.stderr
+++ b/tests/ui/imports/issue-53269.stderr
diff --git a/src/test/ui/imports/issue-53512.rs b/tests/ui/imports/issue-53512.rs
index 67470f854..67470f854 100644
--- a/src/test/ui/imports/issue-53512.rs
+++ b/tests/ui/imports/issue-53512.rs
diff --git a/src/test/ui/imports/issue-53512.stderr b/tests/ui/imports/issue-53512.stderr
index 05fe111b3..05fe111b3 100644
--- a/src/test/ui/imports/issue-53512.stderr
+++ b/tests/ui/imports/issue-53512.stderr
diff --git a/src/test/ui/imports/issue-53565.rs b/tests/ui/imports/issue-53565.rs
index 114a53a92..114a53a92 100644
--- a/src/test/ui/imports/issue-53565.rs
+++ b/tests/ui/imports/issue-53565.rs
diff --git a/src/test/ui/imports/issue-53565.stderr b/tests/ui/imports/issue-53565.stderr
index 71c3b2aaa..71c3b2aaa 100644
--- a/src/test/ui/imports/issue-53565.stderr
+++ b/tests/ui/imports/issue-53565.stderr
diff --git a/src/test/ui/imports/issue-55457.rs b/tests/ui/imports/issue-55457.rs
index c1f048897..c1f048897 100644
--- a/src/test/ui/imports/issue-55457.rs
+++ b/tests/ui/imports/issue-55457.rs
diff --git a/src/test/ui/imports/issue-55457.stderr b/tests/ui/imports/issue-55457.stderr
index 788fcc830..788fcc830 100644
--- a/src/test/ui/imports/issue-55457.stderr
+++ b/tests/ui/imports/issue-55457.stderr
diff --git a/src/test/ui/imports/issue-55811.rs b/tests/ui/imports/issue-55811.rs
index 2df328cca..2df328cca 100644
--- a/src/test/ui/imports/issue-55811.rs
+++ b/tests/ui/imports/issue-55811.rs
diff --git a/src/test/ui/imports/issue-55884-1.rs b/tests/ui/imports/issue-55884-1.rs
index 21744aa5d..21744aa5d 100644
--- a/src/test/ui/imports/issue-55884-1.rs
+++ b/tests/ui/imports/issue-55884-1.rs
diff --git a/src/test/ui/imports/issue-55884-1.stderr b/tests/ui/imports/issue-55884-1.stderr
index c38166dde..c38166dde 100644
--- a/src/test/ui/imports/issue-55884-1.stderr
+++ b/tests/ui/imports/issue-55884-1.stderr
diff --git a/src/test/ui/imports/issue-55884-2.rs b/tests/ui/imports/issue-55884-2.rs
index 75bb4206f..75bb4206f 100644
--- a/src/test/ui/imports/issue-55884-2.rs
+++ b/tests/ui/imports/issue-55884-2.rs
diff --git a/src/test/ui/imports/issue-55884-2.stderr b/tests/ui/imports/issue-55884-2.stderr
index 5adbc4b66..5adbc4b66 100644
--- a/src/test/ui/imports/issue-55884-2.stderr
+++ b/tests/ui/imports/issue-55884-2.stderr
diff --git a/src/test/ui/imports/issue-56125.rs b/tests/ui/imports/issue-56125.rs
index ec5747b4b..ec5747b4b 100644
--- a/src/test/ui/imports/issue-56125.rs
+++ b/tests/ui/imports/issue-56125.rs
diff --git a/src/test/ui/imports/issue-56125.stderr b/tests/ui/imports/issue-56125.stderr
index 059ca9680..3448f3119 100644
--- a/src/test/ui/imports/issue-56125.stderr
+++ b/tests/ui/imports/issue-56125.stderr
@@ -7,13 +7,13 @@ LL |     use empty::issue_56125;
 help: consider importing one of these items instead
    |
 LL |     use crate::m3::last_segment::issue_56125;
-   |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 LL |     use crate::m3::non_last_segment::non_last_segment::issue_56125;
-   |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 LL |     use issue_56125::issue_56125;
-   |         ~~~~~~~~~~~~~~~~~~~~~~~~~
+   |         ~~~~~~~~~~~~~~~~~~~~~~~~
 LL |     use issue_56125::last_segment::issue_56125;
-   |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      and 1 other candidate
 
 error[E0659]: `issue_56125` is ambiguous
diff --git a/src/test/ui/imports/issue-56263.rs b/tests/ui/imports/issue-56263.rs
index 363781f2d..363781f2d 100644
--- a/src/test/ui/imports/issue-56263.rs
+++ b/tests/ui/imports/issue-56263.rs
diff --git a/src/test/ui/imports/issue-57015.rs b/tests/ui/imports/issue-57015.rs
index 27688fd34..27688fd34 100644
--- a/src/test/ui/imports/issue-57015.rs
+++ b/tests/ui/imports/issue-57015.rs
diff --git a/src/test/ui/imports/issue-57015.stderr b/tests/ui/imports/issue-57015.stderr
index 3b72d57fe..5374ba3dc 100644
--- a/src/test/ui/imports/issue-57015.stderr
+++ b/tests/ui/imports/issue-57015.stderr
@@ -7,7 +7,7 @@ LL | use single_err::something;
 help: consider importing this module instead
    |
 LL | use glob_ok::something;
-   |     ~~~~~~~~~~~~~~~~~~~
+   |     ~~~~~~~~~~~~~~~~~~
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/imports/issue-57539.rs b/tests/ui/imports/issue-57539.rs
index 90b74eb46..90b74eb46 100644
--- a/src/test/ui/imports/issue-57539.rs
+++ b/tests/ui/imports/issue-57539.rs
diff --git a/src/test/ui/imports/issue-57539.stderr b/tests/ui/imports/issue-57539.stderr
index 1a3ca4eda..1a3ca4eda 100644
--- a/src/test/ui/imports/issue-57539.stderr
+++ b/tests/ui/imports/issue-57539.stderr
diff --git a/src/test/ui/imports/issue-59764.rs b/tests/ui/imports/issue-59764.rs
index 09dee8c27..09dee8c27 100644
--- a/src/test/ui/imports/issue-59764.rs
+++ b/tests/ui/imports/issue-59764.rs
diff --git a/src/test/ui/imports/issue-59764.stderr b/tests/ui/imports/issue-59764.stderr
index b969515e2..b969515e2 100644
--- a/src/test/ui/imports/issue-59764.stderr
+++ b/tests/ui/imports/issue-59764.stderr
diff --git a/src/test/ui/imports/issue-62767.rs b/tests/ui/imports/issue-62767.rs
index 01184eea9..01184eea9 100644
--- a/src/test/ui/imports/issue-62767.rs
+++ b/tests/ui/imports/issue-62767.rs
diff --git a/src/test/ui/imports/issue-68103.rs b/tests/ui/imports/issue-68103.rs
index e775678fc..e775678fc 100644
--- a/src/test/ui/imports/issue-68103.rs
+++ b/tests/ui/imports/issue-68103.rs
diff --git a/src/test/ui/imports/issue-8208.rs b/tests/ui/imports/issue-8208.rs
index 1c566938f..1c566938f 100644
--- a/src/test/ui/imports/issue-8208.rs
+++ b/tests/ui/imports/issue-8208.rs
diff --git a/src/test/ui/imports/issue-8208.stderr b/tests/ui/imports/issue-8208.stderr
index e59aea12c..e59aea12c 100644
--- a/src/test/ui/imports/issue-8208.stderr
+++ b/tests/ui/imports/issue-8208.stderr
diff --git a/src/test/ui/imports/issue-8640.rs b/tests/ui/imports/issue-8640.rs
index 51a02a32e..51a02a32e 100644
--- a/src/test/ui/imports/issue-8640.rs
+++ b/tests/ui/imports/issue-8640.rs
diff --git a/src/test/ui/imports/issue-8640.stderr b/tests/ui/imports/issue-8640.stderr
index ab44f067f..ab44f067f 100644
--- a/src/test/ui/imports/issue-8640.stderr
+++ b/tests/ui/imports/issue-8640.stderr
diff --git a/tests/ui/imports/issue-99695-b.fixed b/tests/ui/imports/issue-99695-b.fixed
new file mode 100644
index 000000000..0e60c73b6
--- /dev/null
+++ b/tests/ui/imports/issue-99695-b.fixed
@@ -0,0 +1,20 @@
+// run-rustfix
+#![allow(unused, nonstandard_style)]
+mod m {
+
+    mod p {
+        #[macro_export]
+        macro_rules! nu {
+            {} => {};
+        }
+
+        pub struct other_item;
+    }
+
+    use ::nu;
+pub use self::p::{other_item as _};
+    //~^ ERROR unresolved import `self::p::nu` [E0432]
+    //~| HELP a macro with this name exists at the root of the crate
+}
+
+fn main() {}
diff --git a/tests/ui/imports/issue-99695-b.rs b/tests/ui/imports/issue-99695-b.rs
new file mode 100644
index 000000000..031443a1f
--- /dev/null
+++ b/tests/ui/imports/issue-99695-b.rs
@@ -0,0 +1,19 @@
+// run-rustfix
+#![allow(unused, nonstandard_style)]
+mod m {
+
+    mod p {
+        #[macro_export]
+        macro_rules! nu {
+            {} => {};
+        }
+
+        pub struct other_item;
+    }
+
+    pub use self::p::{nu, other_item as _};
+    //~^ ERROR unresolved import `self::p::nu` [E0432]
+    //~| HELP a macro with this name exists at the root of the crate
+}
+
+fn main() {}
diff --git a/tests/ui/imports/issue-99695-b.stderr b/tests/ui/imports/issue-99695-b.stderr
new file mode 100644
index 000000000..b6f5c726a
--- /dev/null
+++ b/tests/ui/imports/issue-99695-b.stderr
@@ -0,0 +1,16 @@
+error[E0432]: unresolved import `self::p::nu`
+  --> $DIR/issue-99695-b.rs:14:23
+   |
+LL |     pub use self::p::{nu, other_item as _};
+   |                       ^^ no `nu` in `m::p`
+   |
+   = note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
+help: a macro with this name exists at the root of the crate
+   |
+LL ~     use ::nu;
+LL ~ pub use self::p::{other_item as _};
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0432`.
diff --git a/tests/ui/imports/issue-99695.fixed b/tests/ui/imports/issue-99695.fixed
new file mode 100644
index 000000000..6bf228b23
--- /dev/null
+++ b/tests/ui/imports/issue-99695.fixed
@@ -0,0 +1,17 @@
+// run-rustfix
+#![allow(unused, nonstandard_style)]
+mod m {
+    #[macro_export]
+    macro_rules! nu {
+        {} => {};
+    }
+
+    pub struct other_item;
+
+    use ::nu;
+pub use self::{other_item as _};
+    //~^ ERROR unresolved import `self::nu` [E0432]
+    //~| HELP a macro with this name exists at the root of the crate
+}
+
+fn main() {}
diff --git a/tests/ui/imports/issue-99695.rs b/tests/ui/imports/issue-99695.rs
new file mode 100644
index 000000000..f7199f149
--- /dev/null
+++ b/tests/ui/imports/issue-99695.rs
@@ -0,0 +1,16 @@
+// run-rustfix
+#![allow(unused, nonstandard_style)]
+mod m {
+    #[macro_export]
+    macro_rules! nu {
+        {} => {};
+    }
+
+    pub struct other_item;
+
+    pub use self::{nu, other_item as _};
+    //~^ ERROR unresolved import `self::nu` [E0432]
+    //~| HELP a macro with this name exists at the root of the crate
+}
+
+fn main() {}
diff --git a/tests/ui/imports/issue-99695.stderr b/tests/ui/imports/issue-99695.stderr
new file mode 100644
index 000000000..0ef762e1c
--- /dev/null
+++ b/tests/ui/imports/issue-99695.stderr
@@ -0,0 +1,16 @@
+error[E0432]: unresolved import `self::nu`
+  --> $DIR/issue-99695.rs:11:20
+   |
+LL |     pub use self::{nu, other_item as _};
+   |                    ^^ no `nu` in `m`
+   |
+   = note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
+help: a macro with this name exists at the root of the crate
+   |
+LL ~     use ::nu;
+LL ~ pub use self::{other_item as _};
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/imports/local-modularized-tricky-fail-1.rs b/tests/ui/imports/local-modularized-tricky-fail-1.rs
index 37fe0ecee..29e9b8ec8 100644
--- a/src/test/ui/imports/local-modularized-tricky-fail-1.rs
+++ b/tests/ui/imports/local-modularized-tricky-fail-1.rs
@@ -26,7 +26,6 @@ mod inner1 {
 }
 
 exported!(); //~ ERROR `exported` is ambiguous
-             //~| ERROR `exported` is ambiguous
 
 mod inner2 {
     define_exported!();
diff --git a/tests/ui/imports/local-modularized-tricky-fail-1.stderr b/tests/ui/imports/local-modularized-tricky-fail-1.stderr
new file mode 100644
index 000000000..20eadaaaa
--- /dev/null
+++ b/tests/ui/imports/local-modularized-tricky-fail-1.stderr
@@ -0,0 +1,70 @@
+error[E0659]: `exported` is ambiguous
+  --> $DIR/local-modularized-tricky-fail-1.rs:28:1
+   |
+LL | exported!();
+   | ^^^^^^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a name from a glob import and a macro-expanded name in the same module during import or macro resolution
+note: `exported` could refer to the macro defined here
+  --> $DIR/local-modularized-tricky-fail-1.rs:5:5
+   |
+LL | /     macro_rules! exported {
+LL | |         () => ()
+LL | |     }
+   | |_____^
+...
+LL |       define_exported!();
+   |       ------------------ in this macro invocation
+note: `exported` could also refer to the macro imported here
+  --> $DIR/local-modularized-tricky-fail-1.rs:22:5
+   |
+LL | use inner1::*;
+   |     ^^^^^^^^^
+   = help: consider adding an explicit import of `exported` to disambiguate
+   = note: this error originates in the macro `define_exported` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0659]: `panic` is ambiguous
+  --> $DIR/local-modularized-tricky-fail-1.rs:35:5
+   |
+LL |     panic!();
+   |     ^^^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
+   = note: `panic` could refer to a macro from prelude
+note: `panic` could also refer to the macro defined here
+  --> $DIR/local-modularized-tricky-fail-1.rs:11:5
+   |
+LL | /     macro_rules! panic {
+LL | |         () => ()
+LL | |     }
+   | |_____^
+...
+LL |       define_panic!();
+   |       --------------- in this macro invocation
+   = help: use `crate::panic` to refer to this macro unambiguously
+   = note: this error originates in the macro `define_panic` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0659]: `include` is ambiguous
+  --> $DIR/local-modularized-tricky-fail-1.rs:46:1
+   |
+LL | include!();
+   | ^^^^^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
+   = note: `include` could refer to a macro from prelude
+note: `include` could also refer to the macro defined here
+  --> $DIR/local-modularized-tricky-fail-1.rs:17:5
+   |
+LL | /     macro_rules! include {
+LL | |         () => ()
+LL | |     }
+   | |_____^
+...
+LL |       define_include!();
+   |       ----------------- in this macro invocation
+   = help: use `crate::include` to refer to this macro unambiguously
+   = note: this error originates in the macro `define_include` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0659`.
diff --git a/src/test/ui/imports/local-modularized-tricky-fail-2.rs b/tests/ui/imports/local-modularized-tricky-fail-2.rs
index 386de88bc..386de88bc 100644
--- a/src/test/ui/imports/local-modularized-tricky-fail-2.rs
+++ b/tests/ui/imports/local-modularized-tricky-fail-2.rs
diff --git a/src/test/ui/imports/local-modularized-tricky-fail-2.stderr b/tests/ui/imports/local-modularized-tricky-fail-2.stderr
index 2c1965ac0..2c1965ac0 100644
--- a/src/test/ui/imports/local-modularized-tricky-fail-2.stderr
+++ b/tests/ui/imports/local-modularized-tricky-fail-2.stderr
diff --git a/src/test/ui/imports/local-modularized-tricky-pass-1.rs b/tests/ui/imports/local-modularized-tricky-pass-1.rs
index b52ddaf89..b52ddaf89 100644
--- a/src/test/ui/imports/local-modularized-tricky-pass-1.rs
+++ b/tests/ui/imports/local-modularized-tricky-pass-1.rs
diff --git a/src/test/ui/imports/local-modularized-tricky-pass-2.rs b/tests/ui/imports/local-modularized-tricky-pass-2.rs
index d5efbdf78..d5efbdf78 100644
--- a/src/test/ui/imports/local-modularized-tricky-pass-2.rs
+++ b/tests/ui/imports/local-modularized-tricky-pass-2.rs
diff --git a/src/test/ui/imports/local-modularized.rs b/tests/ui/imports/local-modularized.rs
index 8eeb1cf07..8eeb1cf07 100644
--- a/src/test/ui/imports/local-modularized.rs
+++ b/tests/ui/imports/local-modularized.rs
diff --git a/src/test/ui/imports/macro-paths.rs b/tests/ui/imports/macro-paths.rs
index cc584e05a..cc584e05a 100644
--- a/src/test/ui/imports/macro-paths.rs
+++ b/tests/ui/imports/macro-paths.rs
diff --git a/src/test/ui/imports/macro-paths.stderr b/tests/ui/imports/macro-paths.stderr
index 5f113ce2b..5f113ce2b 100644
--- a/src/test/ui/imports/macro-paths.stderr
+++ b/tests/ui/imports/macro-paths.stderr
diff --git a/tests/ui/imports/macros.rs b/tests/ui/imports/macros.rs
new file mode 100644
index 000000000..f2a22ad62
--- /dev/null
+++ b/tests/ui/imports/macros.rs
@@ -0,0 +1,41 @@
+// aux-build:two_macros.rs
+
+extern crate two_macros; // two identity macros `m` and `n`
+
+mod foo {
+    pub use two_macros::n as m;
+}
+
+mod m1 {
+    m!(use two_macros::*;);
+    use foo::m; // This shadows the glob import
+}
+
+mod m2 {
+    use two_macros::*;
+    m! { //~ ERROR ambiguous
+        use foo::m;
+    }
+}
+
+mod m3 {
+    use two_macros::m;
+    fn f() {
+        use two_macros::n as m; // This shadows the above import
+        m!();
+    }
+
+    fn g() {
+        m! { //~ ERROR ambiguous
+            use two_macros::n as m;
+        }
+    }
+}
+
+mod m4 {
+    macro_rules! m { () => {} }
+    use two_macros::m;
+    m!();
+}
+
+fn main() {}
diff --git a/tests/ui/imports/macros.stderr b/tests/ui/imports/macros.stderr
new file mode 100644
index 000000000..e34e5359b
--- /dev/null
+++ b/tests/ui/imports/macros.stderr
@@ -0,0 +1,41 @@
+error[E0659]: `m` is ambiguous
+  --> $DIR/macros.rs:16:5
+   |
+LL |     m! {
+   |     ^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a name from a glob import and a macro-expanded name in the same module during import or macro resolution
+note: `m` could refer to the macro imported here
+  --> $DIR/macros.rs:17:13
+   |
+LL |         use foo::m;
+   |             ^^^^^^
+note: `m` could also refer to the macro imported here
+  --> $DIR/macros.rs:15:9
+   |
+LL |     use two_macros::*;
+   |         ^^^^^^^^^^^^^
+   = help: consider adding an explicit import of `m` to disambiguate
+
+error[E0659]: `m` is ambiguous
+  --> $DIR/macros.rs:29:9
+   |
+LL |         m! {
+   |         ^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
+note: `m` could refer to the macro imported here
+  --> $DIR/macros.rs:30:17
+   |
+LL |             use two_macros::n as m;
+   |                 ^^^^^^^^^^^^^^^^^^
+note: `m` could also refer to the macro imported here
+  --> $DIR/macros.rs:22:9
+   |
+LL |     use two_macros::m;
+   |         ^^^^^^^^^^^^^
+   = help: use `self::m` to refer to this macro unambiguously
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0659`.
diff --git a/src/test/ui/imports/no-std-inject.rs b/tests/ui/imports/no-std-inject.rs
index e9664a4dd..e9664a4dd 100644
--- a/src/test/ui/imports/no-std-inject.rs
+++ b/tests/ui/imports/no-std-inject.rs
diff --git a/src/test/ui/imports/no-std-inject.stderr b/tests/ui/imports/no-std-inject.stderr
index 8e2268048..8e2268048 100644
--- a/src/test/ui/imports/no-std-inject.stderr
+++ b/tests/ui/imports/no-std-inject.stderr
diff --git a/src/test/ui/imports/overlapping_pub_trait.rs b/tests/ui/imports/overlapping_pub_trait.rs
index 69aba3ae9..69aba3ae9 100644
--- a/src/test/ui/imports/overlapping_pub_trait.rs
+++ b/tests/ui/imports/overlapping_pub_trait.rs
diff --git a/src/test/ui/imports/overlapping_pub_trait.stderr b/tests/ui/imports/overlapping_pub_trait.stderr
index d0c845a5e..d0c845a5e 100644
--- a/src/test/ui/imports/overlapping_pub_trait.stderr
+++ b/tests/ui/imports/overlapping_pub_trait.stderr
diff --git a/src/test/ui/imports/reexport-star.rs b/tests/ui/imports/reexport-star.rs
index 639ab1a0f..639ab1a0f 100644
--- a/src/test/ui/imports/reexport-star.rs
+++ b/tests/ui/imports/reexport-star.rs
diff --git a/src/test/ui/imports/reexports.rs b/tests/ui/imports/reexports.rs
index d76cc41be..d76cc41be 100644
--- a/src/test/ui/imports/reexports.rs
+++ b/tests/ui/imports/reexports.rs
diff --git a/src/test/ui/imports/reexports.stderr b/tests/ui/imports/reexports.stderr
index 8cbff0ac7..8cbff0ac7 100644
--- a/src/test/ui/imports/reexports.stderr
+++ b/tests/ui/imports/reexports.stderr
diff --git a/src/test/ui/imports/resolve_self_super_hint.rs b/tests/ui/imports/resolve_self_super_hint.rs
index a14ec5b72..a14ec5b72 100644
--- a/src/test/ui/imports/resolve_self_super_hint.rs
+++ b/tests/ui/imports/resolve_self_super_hint.rs
diff --git a/src/test/ui/imports/resolve_self_super_hint.stderr b/tests/ui/imports/resolve_self_super_hint.stderr
index bc862553b..bc862553b 100644
--- a/src/test/ui/imports/resolve_self_super_hint.stderr
+++ b/tests/ui/imports/resolve_self_super_hint.stderr
diff --git a/src/test/ui/imports/rfc-1560-warning-cycle.rs b/tests/ui/imports/rfc-1560-warning-cycle.rs
index cfa7179fb..cfa7179fb 100644
--- a/src/test/ui/imports/rfc-1560-warning-cycle.rs
+++ b/tests/ui/imports/rfc-1560-warning-cycle.rs
diff --git a/src/test/ui/imports/rfc-1560-warning-cycle.stderr b/tests/ui/imports/rfc-1560-warning-cycle.stderr
index fd7e99165..fd7e99165 100644
--- a/src/test/ui/imports/rfc-1560-warning-cycle.stderr
+++ b/tests/ui/imports/rfc-1560-warning-cycle.stderr
diff --git a/src/test/ui/imports/shadow_builtin_macros.rs b/tests/ui/imports/shadow_builtin_macros.rs
index 02c27d5ce..02c27d5ce 100644
--- a/src/test/ui/imports/shadow_builtin_macros.rs
+++ b/tests/ui/imports/shadow_builtin_macros.rs
diff --git a/src/test/ui/imports/shadow_builtin_macros.stderr b/tests/ui/imports/shadow_builtin_macros.stderr
index 6ffb31c20..6ffb31c20 100644
--- a/src/test/ui/imports/shadow_builtin_macros.stderr
+++ b/tests/ui/imports/shadow_builtin_macros.stderr
diff --git a/src/test/ui/imports/tool-mod-child.rs b/tests/ui/imports/tool-mod-child.rs
index 4581dc2e2..4581dc2e2 100644
--- a/src/test/ui/imports/tool-mod-child.rs
+++ b/tests/ui/imports/tool-mod-child.rs
diff --git a/src/test/ui/imports/tool-mod-child.stderr b/tests/ui/imports/tool-mod-child.stderr
index 6caf15bc7..6caf15bc7 100644
--- a/src/test/ui/imports/tool-mod-child.stderr
+++ b/tests/ui/imports/tool-mod-child.stderr
diff --git a/src/test/ui/imports/unnamed_pub_trait.rs b/tests/ui/imports/unnamed_pub_trait.rs
index c38fb17b9..c38fb17b9 100644
--- a/src/test/ui/imports/unnamed_pub_trait.rs
+++ b/tests/ui/imports/unnamed_pub_trait.rs
diff --git a/src/test/ui/imports/unnamed_pub_trait.stderr b/tests/ui/imports/unnamed_pub_trait.stderr
index 319dfd7e1..319dfd7e1 100644
--- a/src/test/ui/imports/unnamed_pub_trait.stderr
+++ b/tests/ui/imports/unnamed_pub_trait.stderr
diff --git a/src/test/ui/imports/unresolved-imports-used.rs b/tests/ui/imports/unresolved-imports-used.rs
index 75cf88019..75cf88019 100644
--- a/src/test/ui/imports/unresolved-imports-used.rs
+++ b/tests/ui/imports/unresolved-imports-used.rs
diff --git a/src/test/ui/imports/unresolved-imports-used.stderr b/tests/ui/imports/unresolved-imports-used.stderr
index 73f9d1bfb..73f9d1bfb 100644
--- a/src/test/ui/imports/unresolved-imports-used.stderr
+++ b/tests/ui/imports/unresolved-imports-used.stderr
diff --git a/src/test/ui/imports/unused-import-issue-87973.fixed b/tests/ui/imports/unused-import-issue-87973.fixed
index 5c194d18a..5c194d18a 100644
--- a/src/test/ui/imports/unused-import-issue-87973.fixed
+++ b/tests/ui/imports/unused-import-issue-87973.fixed
diff --git a/src/test/ui/imports/unused-import-issue-87973.rs b/tests/ui/imports/unused-import-issue-87973.rs
index c31f0f979..c31f0f979 100644
--- a/src/test/ui/imports/unused-import-issue-87973.rs
+++ b/tests/ui/imports/unused-import-issue-87973.rs
diff --git a/src/test/ui/imports/unused-import-issue-87973.stderr b/tests/ui/imports/unused-import-issue-87973.stderr
index 81b7ea791..81b7ea791 100644
--- a/src/test/ui/imports/unused-import-issue-87973.stderr
+++ b/tests/ui/imports/unused-import-issue-87973.stderr
diff --git a/src/test/ui/imports/unused-imports-in-test-mode.rs b/tests/ui/imports/unused-imports-in-test-mode.rs
index 039f59a88..039f59a88 100644
--- a/src/test/ui/imports/unused-imports-in-test-mode.rs
+++ b/tests/ui/imports/unused-imports-in-test-mode.rs
diff --git a/src/test/ui/imports/unused-imports-in-test-mode.stderr b/tests/ui/imports/unused-imports-in-test-mode.stderr
index c5faaa114..c5faaa114 100644
--- a/src/test/ui/imports/unused-imports-in-test-mode.stderr
+++ b/tests/ui/imports/unused-imports-in-test-mode.stderr
diff --git a/src/test/ui/imports/unused-imports-in-test-module.rs b/tests/ui/imports/unused-imports-in-test-module.rs
index 7849c3fcd..7849c3fcd 100644
--- a/src/test/ui/imports/unused-imports-in-test-module.rs
+++ b/tests/ui/imports/unused-imports-in-test-module.rs
diff --git a/src/test/ui/imports/unused-imports-in-test-module.stderr b/tests/ui/imports/unused-imports-in-test-module.stderr
index 1598368eb..1598368eb 100644
--- a/src/test/ui/imports/unused-imports-in-test-module.stderr
+++ b/tests/ui/imports/unused-imports-in-test-module.stderr
diff --git a/src/test/ui/imports/unused-macro-use.rs b/tests/ui/imports/unused-macro-use.rs
index 9f63eb4b4..9f63eb4b4 100644
--- a/src/test/ui/imports/unused-macro-use.rs
+++ b/tests/ui/imports/unused-macro-use.rs
diff --git a/src/test/ui/imports/unused-macro-use.stderr b/tests/ui/imports/unused-macro-use.stderr
index 7137a90e4..7137a90e4 100644
--- a/src/test/ui/imports/unused-macro-use.stderr
+++ b/tests/ui/imports/unused-macro-use.stderr
diff --git a/src/test/ui/imports/unused.rs b/tests/ui/imports/unused.rs
index c22e95ec3..c22e95ec3 100644
--- a/src/test/ui/imports/unused.rs
+++ b/tests/ui/imports/unused.rs
diff --git a/src/test/ui/imports/unused.stderr b/tests/ui/imports/unused.stderr
index 08128d794..08128d794 100644
--- a/src/test/ui/imports/unused.stderr
+++ b/tests/ui/imports/unused.stderr
diff --git a/src/test/ui/imports/use-mod.rs b/tests/ui/imports/use-mod.rs
index 84da2e708..84da2e708 100644
--- a/src/test/ui/imports/use-mod.rs
+++ b/tests/ui/imports/use-mod.rs
diff --git a/src/test/ui/impossible_range.fixed b/tests/ui/impossible_range.fixed
index 3fd950e0d..3fd950e0d 100644
--- a/src/test/ui/impossible_range.fixed
+++ b/tests/ui/impossible_range.fixed
diff --git a/src/test/ui/impossible_range.rs b/tests/ui/impossible_range.rs
index 0fe0e17be..0fe0e17be 100644
--- a/src/test/ui/impossible_range.rs
+++ b/tests/ui/impossible_range.rs
diff --git a/src/test/ui/impossible_range.stderr b/tests/ui/impossible_range.stderr
index 53c56065c..53c56065c 100644
--- a/src/test/ui/impossible_range.stderr
+++ b/tests/ui/impossible_range.stderr
diff --git a/src/test/ui/inc-range-pat.rs b/tests/ui/inc-range-pat.rs
index 1eb7dd0aa..1eb7dd0aa 100644
--- a/src/test/ui/inc-range-pat.rs
+++ b/tests/ui/inc-range-pat.rs
diff --git a/src/test/ui/include-macros/auxiliary/same-file-in-two-crates-aux.rs b/tests/ui/include-macros/auxiliary/same-file-in-two-crates-aux.rs
index 7b680bce4..7b680bce4 100644
--- a/src/test/ui/include-macros/auxiliary/same-file-in-two-crates-aux.rs
+++ b/tests/ui/include-macros/auxiliary/same-file-in-two-crates-aux.rs
diff --git a/src/test/ui/include-macros/data.bin b/tests/ui/include-macros/data.bin
index ce4e0b831..ce4e0b831 100644
--- a/src/test/ui/include-macros/data.bin
+++ b/tests/ui/include-macros/data.bin
diff --git a/src/test/ui/include-macros/file.txt b/tests/ui/include-macros/file.txt
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/include-macros/file.txt
+++ b/tests/ui/include-macros/file.txt
diff --git a/src/test/ui/include-macros/mismatched-types.rs b/tests/ui/include-macros/mismatched-types.rs
index 83fa378a3..83fa378a3 100644
--- a/src/test/ui/include-macros/mismatched-types.rs
+++ b/tests/ui/include-macros/mismatched-types.rs
diff --git a/src/test/ui/include-macros/mismatched-types.stderr b/tests/ui/include-macros/mismatched-types.stderr
index a408877af..a408877af 100644
--- a/src/test/ui/include-macros/mismatched-types.stderr
+++ b/tests/ui/include-macros/mismatched-types.stderr
diff --git a/src/test/ui/include-macros/normalization.rs b/tests/ui/include-macros/normalization.rs
index 889f08e60..889f08e60 100644
--- a/src/test/ui/include-macros/normalization.rs
+++ b/tests/ui/include-macros/normalization.rs
diff --git a/src/test/ui/include-macros/same-file-in-two-crates.rs b/tests/ui/include-macros/same-file-in-two-crates.rs
index f49efa2cf..f49efa2cf 100644
--- a/src/test/ui/include-macros/same-file-in-two-crates.rs
+++ b/tests/ui/include-macros/same-file-in-two-crates.rs
diff --git a/src/test/ui/incoherent-inherent-impls/auxiliary/extern-crate.rs b/tests/ui/incoherent-inherent-impls/auxiliary/extern-crate.rs
index 22f0d912c..22f0d912c 100644
--- a/src/test/ui/incoherent-inherent-impls/auxiliary/extern-crate.rs
+++ b/tests/ui/incoherent-inherent-impls/auxiliary/extern-crate.rs
diff --git a/src/test/ui/incoherent-inherent-impls/needs-has-incoherent-impls.rs b/tests/ui/incoherent-inherent-impls/needs-has-incoherent-impls.rs
index 0f7282bec..0f7282bec 100644
--- a/src/test/ui/incoherent-inherent-impls/needs-has-incoherent-impls.rs
+++ b/tests/ui/incoherent-inherent-impls/needs-has-incoherent-impls.rs
diff --git a/src/test/ui/incoherent-inherent-impls/needs-has-incoherent-impls.stderr b/tests/ui/incoherent-inherent-impls/needs-has-incoherent-impls.stderr
index 8f7082511..8f7082511 100644
--- a/src/test/ui/incoherent-inherent-impls/needs-has-incoherent-impls.stderr
+++ b/tests/ui/incoherent-inherent-impls/needs-has-incoherent-impls.stderr
diff --git a/src/test/ui/incoherent-inherent-impls/no-attr-empty-impl.rs b/tests/ui/incoherent-inherent-impls/no-attr-empty-impl.rs
index 62c249e58..62c249e58 100644
--- a/src/test/ui/incoherent-inherent-impls/no-attr-empty-impl.rs
+++ b/tests/ui/incoherent-inherent-impls/no-attr-empty-impl.rs
diff --git a/src/test/ui/incoherent-inherent-impls/no-attr-empty-impl.stderr b/tests/ui/incoherent-inherent-impls/no-attr-empty-impl.stderr
index b3f8b51d0..b3f8b51d0 100644
--- a/src/test/ui/incoherent-inherent-impls/no-attr-empty-impl.stderr
+++ b/tests/ui/incoherent-inherent-impls/no-attr-empty-impl.stderr
diff --git a/src/test/ui/index-bot.rs b/tests/ui/index-bot.rs
index e69c4019f..e69c4019f 100644
--- a/src/test/ui/index-bot.rs
+++ b/tests/ui/index-bot.rs
diff --git a/src/test/ui/index-bot.stderr b/tests/ui/index-bot.stderr
index b5d782975..b5d782975 100644
--- a/src/test/ui/index-bot.stderr
+++ b/tests/ui/index-bot.stderr
diff --git a/src/test/ui/index-help.rs b/tests/ui/index-help.rs
index 66571ec41..66571ec41 100644
--- a/src/test/ui/index-help.rs
+++ b/tests/ui/index-help.rs
diff --git a/src/test/ui/index-help.stderr b/tests/ui/index-help.stderr
index e020d0298..e020d0298 100644
--- a/src/test/ui/index-help.stderr
+++ b/tests/ui/index-help.stderr
diff --git a/src/test/ui/index_message.rs b/tests/ui/index_message.rs
index 87e0cde59..87e0cde59 100644
--- a/src/test/ui/index_message.rs
+++ b/tests/ui/index_message.rs
diff --git a/src/test/ui/index_message.stderr b/tests/ui/index_message.stderr
index 6c2b12673..6c2b12673 100644
--- a/src/test/ui/index_message.stderr
+++ b/tests/ui/index_message.stderr
diff --git a/src/test/ui/indexing-requires-a-uint.rs b/tests/ui/indexing-requires-a-uint.rs
index dbe9b44a1..dbe9b44a1 100644
--- a/src/test/ui/indexing-requires-a-uint.rs
+++ b/tests/ui/indexing-requires-a-uint.rs
diff --git a/src/test/ui/indexing-requires-a-uint.stderr b/tests/ui/indexing-requires-a-uint.stderr
index 7a741cfc7..7a741cfc7 100644
--- a/src/test/ui/indexing-requires-a-uint.stderr
+++ b/tests/ui/indexing-requires-a-uint.stderr
diff --git a/src/test/ui/infer-fn-tail-expr.rs b/tests/ui/infer-fn-tail-expr.rs
index 413b1877a..413b1877a 100644
--- a/src/test/ui/infer-fn-tail-expr.rs
+++ b/tests/ui/infer-fn-tail-expr.rs
diff --git a/src/test/ui/inference/ambiguous_type_parameter.rs b/tests/ui/inference/ambiguous_type_parameter.rs
index dc70ed661..dc70ed661 100644
--- a/src/test/ui/inference/ambiguous_type_parameter.rs
+++ b/tests/ui/inference/ambiguous_type_parameter.rs
diff --git a/src/test/ui/inference/ambiguous_type_parameter.stderr b/tests/ui/inference/ambiguous_type_parameter.stderr
index 9cbe221de..9cbe221de 100644
--- a/src/test/ui/inference/ambiguous_type_parameter.stderr
+++ b/tests/ui/inference/ambiguous_type_parameter.stderr
diff --git a/src/test/ui/inference/auxiliary/inference_unstable_iterator.rs b/tests/ui/inference/auxiliary/inference_unstable_iterator.rs
index 04bc0b1a8..04bc0b1a8 100644
--- a/src/test/ui/inference/auxiliary/inference_unstable_iterator.rs
+++ b/tests/ui/inference/auxiliary/inference_unstable_iterator.rs
diff --git a/src/test/ui/inference/auxiliary/inference_unstable_itertools.rs b/tests/ui/inference/auxiliary/inference_unstable_itertools.rs
index fa1efbcfe..fa1efbcfe 100644
--- a/src/test/ui/inference/auxiliary/inference_unstable_itertools.rs
+++ b/tests/ui/inference/auxiliary/inference_unstable_itertools.rs
diff --git a/src/test/ui/inference/cannot-infer-async.rs b/tests/ui/inference/cannot-infer-async.rs
index b5152d04f..b5152d04f 100644
--- a/src/test/ui/inference/cannot-infer-async.rs
+++ b/tests/ui/inference/cannot-infer-async.rs
diff --git a/src/test/ui/inference/cannot-infer-async.stderr b/tests/ui/inference/cannot-infer-async.stderr
index 0579cf238..0579cf238 100644
--- a/src/test/ui/inference/cannot-infer-async.stderr
+++ b/tests/ui/inference/cannot-infer-async.stderr
diff --git a/src/test/ui/inference/cannot-infer-closure-circular.rs b/tests/ui/inference/cannot-infer-closure-circular.rs
index affb48149..affb48149 100644
--- a/src/test/ui/inference/cannot-infer-closure-circular.rs
+++ b/tests/ui/inference/cannot-infer-closure-circular.rs
diff --git a/src/test/ui/inference/cannot-infer-closure-circular.stderr b/tests/ui/inference/cannot-infer-closure-circular.stderr
index b706cd2bc..b706cd2bc 100644
--- a/src/test/ui/inference/cannot-infer-closure-circular.stderr
+++ b/tests/ui/inference/cannot-infer-closure-circular.stderr
diff --git a/src/test/ui/inference/cannot-infer-closure.rs b/tests/ui/inference/cannot-infer-closure.rs
index bd5d10b41..bd5d10b41 100644
--- a/src/test/ui/inference/cannot-infer-closure.rs
+++ b/tests/ui/inference/cannot-infer-closure.rs
diff --git a/src/test/ui/inference/cannot-infer-closure.stderr b/tests/ui/inference/cannot-infer-closure.stderr
index a4b818e6e..a4b818e6e 100644
--- a/src/test/ui/inference/cannot-infer-closure.stderr
+++ b/tests/ui/inference/cannot-infer-closure.stderr
diff --git a/src/test/ui/inference/cannot-infer-partial-try-return.rs b/tests/ui/inference/cannot-infer-partial-try-return.rs
index b555697dc..b555697dc 100644
--- a/src/test/ui/inference/cannot-infer-partial-try-return.rs
+++ b/tests/ui/inference/cannot-infer-partial-try-return.rs
diff --git a/src/test/ui/inference/cannot-infer-partial-try-return.stderr b/tests/ui/inference/cannot-infer-partial-try-return.stderr
index 2a56aaa44..888c321bc 100644
--- a/src/test/ui/inference/cannot-infer-partial-try-return.stderr
+++ b/tests/ui/inference/cannot-infer-partial-try-return.stderr
@@ -1,8 +1,6 @@
 error[E0282]: type annotations needed
   --> $DIR/cannot-infer-partial-try-return.rs:20:9
    |
-LL |         infallible()?;
-   |         ------------- type must be known at this point
 LL |         Ok(())
    |         ^^ cannot infer type of the type parameter `E` declared on the enum `Result`
    |
diff --git a/src/test/ui/inference/char-as-str-multi.rs b/tests/ui/inference/char-as-str-multi.rs
index c29a15025..c29a15025 100644
--- a/src/test/ui/inference/char-as-str-multi.rs
+++ b/tests/ui/inference/char-as-str-multi.rs
diff --git a/src/test/ui/inference/char-as-str-multi.stderr b/tests/ui/inference/char-as-str-multi.stderr
index 297ca2b54..297ca2b54 100644
--- a/src/test/ui/inference/char-as-str-multi.stderr
+++ b/tests/ui/inference/char-as-str-multi.stderr
diff --git a/src/test/ui/inference/char-as-str-single.fixed b/tests/ui/inference/char-as-str-single.fixed
index bab1854dc..bab1854dc 100644
--- a/src/test/ui/inference/char-as-str-single.fixed
+++ b/tests/ui/inference/char-as-str-single.fixed
diff --git a/src/test/ui/inference/char-as-str-single.rs b/tests/ui/inference/char-as-str-single.rs
index 736920643..736920643 100644
--- a/src/test/ui/inference/char-as-str-single.rs
+++ b/tests/ui/inference/char-as-str-single.rs
diff --git a/src/test/ui/inference/char-as-str-single.stderr b/tests/ui/inference/char-as-str-single.stderr
index 3375ec6ac..3375ec6ac 100644
--- a/src/test/ui/inference/char-as-str-single.stderr
+++ b/tests/ui/inference/char-as-str-single.stderr
diff --git a/src/test/ui/inference/deref-suggestion.rs b/tests/ui/inference/deref-suggestion.rs
index 0d8e7289d..0d8e7289d 100644
--- a/src/test/ui/inference/deref-suggestion.rs
+++ b/tests/ui/inference/deref-suggestion.rs
diff --git a/src/test/ui/inference/deref-suggestion.stderr b/tests/ui/inference/deref-suggestion.stderr
index 034005697..3db67cdb5 100644
--- a/src/test/ui/inference/deref-suggestion.stderr
+++ b/tests/ui/inference/deref-suggestion.stderr
@@ -87,7 +87,10 @@ error[E0308]: mismatched types
   --> $DIR/deref-suggestion.rs:37:5
    |
 LL |     assert_eq!(3i32, &3i32);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `&i32`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^
+   |     |
+   |     expected `i32`, found `&i32`
+   |     expected because this is `i32`
    |
    = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/inference/erase-type-params-in-label.rs b/tests/ui/inference/erase-type-params-in-label.rs
index 1fea2da92..1fea2da92 100644
--- a/src/test/ui/inference/erase-type-params-in-label.rs
+++ b/tests/ui/inference/erase-type-params-in-label.rs
diff --git a/tests/ui/inference/erase-type-params-in-label.stderr b/tests/ui/inference/erase-type-params-in-label.stderr
new file mode 100644
index 000000000..9be182864
--- /dev/null
+++ b/tests/ui/inference/erase-type-params-in-label.stderr
@@ -0,0 +1,37 @@
+error[E0283]: type annotations needed for `Foo<i32, &str, W, Z>`
+  --> $DIR/erase-type-params-in-label.rs:2:9
+   |
+LL |     let foo = foo(1, "");
+   |         ^^^   --- type must be known at this point
+   |
+   = note: cannot satisfy `_: Default`
+note: required by a bound in `foo`
+  --> $DIR/erase-type-params-in-label.rs:25:17
+   |
+LL | fn foo<T, K, W: Default, Z: Default>(t: T, k: K) -> Foo<T, K, W, Z> {
+   |                 ^^^^^^^ required by this bound in `foo`
+help: consider giving `foo` an explicit type, where the type for type parameter `W` is specified
+   |
+LL |     let foo: Foo<i32, &str, W, Z> = foo(1, "");
+   |            ++++++++++++++++++++++
+
+error[E0283]: type annotations needed for `Bar<i32, &str, Z>`
+  --> $DIR/erase-type-params-in-label.rs:5:9
+   |
+LL |     let bar = bar(1, "");
+   |         ^^^   --- type must be known at this point
+   |
+   = note: cannot satisfy `_: Default`
+note: required by a bound in `bar`
+  --> $DIR/erase-type-params-in-label.rs:14:17
+   |
+LL | fn bar<T, K, Z: Default>(t: T, k: K) -> Bar<T, K, Z> {
+   |                 ^^^^^^^ required by this bound in `bar`
+help: consider giving `bar` an explicit type, where the type for type parameter `Z` is specified
+   |
+LL |     let bar: Bar<i32, &str, Z> = bar(1, "");
+   |            +++++++++++++++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0283`.
diff --git a/src/test/ui/inference/infer-binary-operand-behind-reference.rs b/tests/ui/inference/infer-binary-operand-behind-reference.rs
index 0c0a3171e..0c0a3171e 100644
--- a/src/test/ui/inference/infer-binary-operand-behind-reference.rs
+++ b/tests/ui/inference/infer-binary-operand-behind-reference.rs
diff --git a/src/test/ui/inference/inference-variable-behind-raw-pointer.rs b/tests/ui/inference/inference-variable-behind-raw-pointer.rs
index 6662e46b1..6662e46b1 100644
--- a/src/test/ui/inference/inference-variable-behind-raw-pointer.rs
+++ b/tests/ui/inference/inference-variable-behind-raw-pointer.rs
diff --git a/src/test/ui/inference/inference-variable-behind-raw-pointer.stderr b/tests/ui/inference/inference-variable-behind-raw-pointer.stderr
index 3dea09e7f..3dea09e7f 100644
--- a/src/test/ui/inference/inference-variable-behind-raw-pointer.stderr
+++ b/tests/ui/inference/inference-variable-behind-raw-pointer.stderr
diff --git a/src/test/ui/inference/inference_unstable.rs b/tests/ui/inference/inference_unstable.rs
index daf0cf042..daf0cf042 100644
--- a/src/test/ui/inference/inference_unstable.rs
+++ b/tests/ui/inference/inference_unstable.rs
diff --git a/src/test/ui/inference/inference_unstable.stderr b/tests/ui/inference/inference_unstable.stderr
index ecbf2641b..ecbf2641b 100644
--- a/src/test/ui/inference/inference_unstable.stderr
+++ b/tests/ui/inference/inference_unstable.stderr
diff --git a/src/test/ui/inference/inference_unstable_featured.rs b/tests/ui/inference/inference_unstable_featured.rs
index 792b29aaa..792b29aaa 100644
--- a/src/test/ui/inference/inference_unstable_featured.rs
+++ b/tests/ui/inference/inference_unstable_featured.rs
diff --git a/src/test/ui/inference/inference_unstable_featured.stderr b/tests/ui/inference/inference_unstable_featured.stderr
index 4ddede29c..4ddede29c 100644
--- a/src/test/ui/inference/inference_unstable_featured.stderr
+++ b/tests/ui/inference/inference_unstable_featured.stderr
diff --git a/src/test/ui/inference/inference_unstable_forced.rs b/tests/ui/inference/inference_unstable_forced.rs
index 649b3ed2a..649b3ed2a 100644
--- a/src/test/ui/inference/inference_unstable_forced.rs
+++ b/tests/ui/inference/inference_unstable_forced.rs
diff --git a/src/test/ui/inference/inference_unstable_forced.stderr b/tests/ui/inference/inference_unstable_forced.stderr
index a1c4cd851..a1c4cd851 100644
--- a/src/test/ui/inference/inference_unstable_forced.stderr
+++ b/tests/ui/inference/inference_unstable_forced.stderr
diff --git a/src/test/ui/inference/issue-103587.rs b/tests/ui/inference/issue-103587.rs
index 11536f9f4..11536f9f4 100644
--- a/src/test/ui/inference/issue-103587.rs
+++ b/tests/ui/inference/issue-103587.rs
diff --git a/src/test/ui/inference/issue-103587.stderr b/tests/ui/inference/issue-103587.stderr
index b373fbfbb..b373fbfbb 100644
--- a/src/test/ui/inference/issue-103587.stderr
+++ b/tests/ui/inference/issue-103587.stderr
diff --git a/src/test/ui/inference/issue-104649.rs b/tests/ui/inference/issue-104649.rs
index 4637b884d..4637b884d 100644
--- a/src/test/ui/inference/issue-104649.rs
+++ b/tests/ui/inference/issue-104649.rs
diff --git a/src/test/ui/inference/issue-104649.stderr b/tests/ui/inference/issue-104649.stderr
index 4962b21f9..4962b21f9 100644
--- a/src/test/ui/inference/issue-104649.stderr
+++ b/tests/ui/inference/issue-104649.stderr
diff --git a/src/test/ui/inference/issue-28935.rs b/tests/ui/inference/issue-28935.rs
index 872822dbd..872822dbd 100644
--- a/src/test/ui/inference/issue-28935.rs
+++ b/tests/ui/inference/issue-28935.rs
diff --git a/src/test/ui/inference/issue-36053.rs b/tests/ui/inference/issue-36053.rs
index 5c6d07804..5c6d07804 100644
--- a/src/test/ui/inference/issue-36053.rs
+++ b/tests/ui/inference/issue-36053.rs
diff --git a/src/test/ui/inference/issue-70703.rs b/tests/ui/inference/issue-70703.rs
index d90498e96..d90498e96 100644
--- a/src/test/ui/inference/issue-70703.rs
+++ b/tests/ui/inference/issue-70703.rs
diff --git a/src/test/ui/inference/issue-71309.rs b/tests/ui/inference/issue-71309.rs
index c31107d8f..c31107d8f 100644
--- a/src/test/ui/inference/issue-71309.rs
+++ b/tests/ui/inference/issue-71309.rs
diff --git a/src/test/ui/inference/issue-71309.stderr b/tests/ui/inference/issue-71309.stderr
index af8714f1c..af8714f1c 100644
--- a/src/test/ui/inference/issue-71309.stderr
+++ b/tests/ui/inference/issue-71309.stderr
diff --git a/src/test/ui/inference/issue-71732.rs b/tests/ui/inference/issue-71732.rs
index 8a9d2b235..8a9d2b235 100644
--- a/src/test/ui/inference/issue-71732.rs
+++ b/tests/ui/inference/issue-71732.rs
diff --git a/src/test/ui/inference/issue-71732.stderr b/tests/ui/inference/issue-71732.stderr
index 79bee3328..01b37f2ac 100644
--- a/src/test/ui/inference/issue-71732.stderr
+++ b/tests/ui/inference/issue-71732.stderr
@@ -12,9 +12,6 @@ LL |         .get(&"key".into())
              where T: ?Sized;
 note: required by a bound in `HashMap::<K, V, S>::get`
   --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
-   |
-LL |         K: Borrow<Q>,
-   |            ^^^^^^^^^ required by this bound in `HashMap::<K, V, S>::get`
 help: consider specifying the generic argument
    |
 LL |         .get::<Q>(&"key".into())
diff --git a/src/test/ui/inference/issue-72616.rs b/tests/ui/inference/issue-72616.rs
index 69ade1a75..69ade1a75 100644
--- a/src/test/ui/inference/issue-72616.rs
+++ b/tests/ui/inference/issue-72616.rs
diff --git a/src/test/ui/inference/issue-72616.stderr b/tests/ui/inference/issue-72616.stderr
index 6ee0626ca..6ee0626ca 100644
--- a/src/test/ui/inference/issue-72616.stderr
+++ b/tests/ui/inference/issue-72616.stderr
diff --git a/src/test/ui/inference/issue-72690.rs b/tests/ui/inference/issue-72690.rs
index 8c0a0f51a..8c0a0f51a 100644
--- a/src/test/ui/inference/issue-72690.rs
+++ b/tests/ui/inference/issue-72690.rs
diff --git a/src/test/ui/inference/issue-72690.stderr b/tests/ui/inference/issue-72690.stderr
index d4eeda073..8eda71ec0 100644
--- a/src/test/ui/inference/issue-72690.stderr
+++ b/tests/ui/inference/issue-72690.stderr
@@ -32,8 +32,8 @@ LL |     |x| String::from("x".as_ref());
    |
 help: consider giving this closure parameter an explicit type
    |
-LL |     |x: _| String::from("x".as_ref());
-   |       +++
+LL |     |x: /* Type */| String::from("x".as_ref());
+   |       ++++++++++++
 
 error[E0283]: type annotations needed
   --> $DIR/issue-72690.rs:12:26
diff --git a/tests/ui/inference/issue-80816.rs b/tests/ui/inference/issue-80816.rs
new file mode 100644
index 000000000..4d319b449
--- /dev/null
+++ b/tests/ui/inference/issue-80816.rs
@@ -0,0 +1,55 @@
+#![allow(unreachable_code)]
+
+use std::marker::PhantomData;
+use std::ops::Deref;
+use std::sync::Arc;
+
+pub struct Guard<T> {
+    _phantom: PhantomData<T>,
+}
+impl<T> Deref for Guard<T> {
+    type Target = T;
+    fn deref(&self) -> &T {
+        unimplemented!()
+    }
+}
+
+pub struct DirectDeref<T>(T);
+impl<T> Deref for DirectDeref<Arc<T>> {
+    type Target = T;
+    fn deref(&self) -> &T {
+        unimplemented!()
+    }
+}
+
+pub trait Access<T> {
+    type Guard: Deref<Target = T>;
+    fn load(&self) -> Self::Guard {
+        unimplemented!()
+    }
+}
+impl<T, A: Access<T>, P: Deref<Target = A>> Access<T> for P {
+    //~^ NOTE: required for `Arc<ArcSwapAny<Arc<usize>>>` to implement `Access<_>`
+    //~| NOTE unsatisfied trait bound introduced here
+    type Guard = A::Guard;
+}
+impl<T> Access<T> for ArcSwapAny<T> {
+    //~^ NOTE: multiple `impl`s satisfying `ArcSwapAny<Arc<usize>>: Access<_>` found
+    type Guard = Guard<T>;
+}
+impl<T> Access<T> for ArcSwapAny<Arc<T>> {
+    type Guard = DirectDeref<Arc<T>>;
+}
+
+pub struct ArcSwapAny<T> {
+    _phantom_arc: PhantomData<T>,
+}
+
+pub fn foo() {
+    let s: Arc<ArcSwapAny<Arc<usize>>> = unimplemented!();
+    let guard: Guard<Arc<usize>> = s.load();
+    //~^ ERROR: type annotations needed
+    //~| HELP: try using a fully qualified path to specify the expected types
+}
+
+fn main() {}
diff --git a/tests/ui/inference/issue-80816.stderr b/tests/ui/inference/issue-80816.stderr
new file mode 100644
index 000000000..80c0c8abe
--- /dev/null
+++ b/tests/ui/inference/issue-80816.stderr
@@ -0,0 +1,29 @@
+error[E0283]: type annotations needed
+  --> $DIR/issue-80816.rs:50:38
+   |
+LL |     let guard: Guard<Arc<usize>> = s.load();
+   |                                      ^^^^
+   |
+note: multiple `impl`s satisfying `ArcSwapAny<Arc<usize>>: Access<_>` found
+  --> $DIR/issue-80816.rs:36:1
+   |
+LL | impl<T> Access<T> for ArcSwapAny<T> {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+...
+LL | impl<T> Access<T> for ArcSwapAny<Arc<T>> {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+note: required for `Arc<ArcSwapAny<Arc<usize>>>` to implement `Access<_>`
+  --> $DIR/issue-80816.rs:31:45
+   |
+LL | impl<T, A: Access<T>, P: Deref<Target = A>> Access<T> for P {
+   |            ---------                        ^^^^^^^^^     ^
+   |            |
+   |            unsatisfied trait bound introduced here
+help: try using a fully qualified path to specify the expected types
+   |
+LL |     let guard: Guard<Arc<usize>> = <Arc<ArcSwapAny<Arc<usize>>> as Access<T>>::load(&s);
+   |                                    ++++++++++++++++++++++++++++++++++++++++++++++++++ ~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0283`.
diff --git a/src/test/ui/inference/issue-81522.rs b/tests/ui/inference/issue-81522.rs
index 902f8fdde..902f8fdde 100644
--- a/src/test/ui/inference/issue-81522.rs
+++ b/tests/ui/inference/issue-81522.rs
diff --git a/tests/ui/inference/issue-83606.rs b/tests/ui/inference/issue-83606.rs
new file mode 100644
index 000000000..c387046e9
--- /dev/null
+++ b/tests/ui/inference/issue-83606.rs
@@ -0,0 +1,10 @@
+// Regression test for #83606.
+
+fn foo<const N: usize>(_: impl std::fmt::Display) -> [usize; N] {
+    [0; N]
+}
+
+fn main() {
+    let _ = foo("foo");
+    //~^ ERROR: type annotations needed for `[usize; N]`
+}
diff --git a/src/test/ui/inference/issue-83606.stderr b/tests/ui/inference/issue-83606.stderr
index f5c84f960..f2ee8692e 100644
--- a/src/test/ui/inference/issue-83606.stderr
+++ b/tests/ui/inference/issue-83606.stderr
@@ -1,4 +1,4 @@
-error[E0282]: type annotations needed for `[usize; _]`
+error[E0282]: type annotations needed for `[usize; N]`
   --> $DIR/issue-83606.rs:8:9
    |
 LL |     let _ = foo("foo");
@@ -6,7 +6,7 @@ LL |     let _ = foo("foo");
    |
 help: consider giving this pattern a type, where the the value of const parameter `N` is specified
    |
-LL |     let _: [usize; _] = foo("foo");
+LL |     let _: [usize; N] = foo("foo");
    |          ++++++++++++
 
 error: aborting due to previous error
diff --git a/src/test/ui/inference/issue-86162-1.rs b/tests/ui/inference/issue-86162-1.rs
index 5a547eb38..5a547eb38 100644
--- a/src/test/ui/inference/issue-86162-1.rs
+++ b/tests/ui/inference/issue-86162-1.rs
diff --git a/src/test/ui/inference/issue-86162-1.stderr b/tests/ui/inference/issue-86162-1.stderr
index 4f621b82d..4f621b82d 100644
--- a/src/test/ui/inference/issue-86162-1.stderr
+++ b/tests/ui/inference/issue-86162-1.stderr
diff --git a/src/test/ui/inference/issue-86162-2.rs b/tests/ui/inference/issue-86162-2.rs
index b8c75dd77..b8c75dd77 100644
--- a/src/test/ui/inference/issue-86162-2.rs
+++ b/tests/ui/inference/issue-86162-2.rs
diff --git a/src/test/ui/inference/issue-86162-2.stderr b/tests/ui/inference/issue-86162-2.stderr
index 9aff2cec1..9aff2cec1 100644
--- a/src/test/ui/inference/issue-86162-2.stderr
+++ b/tests/ui/inference/issue-86162-2.stderr
diff --git a/src/test/ui/inference/lub-glb-with-unbound-infer-var.rs b/tests/ui/inference/lub-glb-with-unbound-infer-var.rs
index c9e117089..c9e117089 100644
--- a/src/test/ui/inference/lub-glb-with-unbound-infer-var.rs
+++ b/tests/ui/inference/lub-glb-with-unbound-infer-var.rs
diff --git a/src/test/ui/inference/need_type_info/channel.rs b/tests/ui/inference/need_type_info/channel.rs
index e2ba5a941..e2ba5a941 100644
--- a/src/test/ui/inference/need_type_info/channel.rs
+++ b/tests/ui/inference/need_type_info/channel.rs
diff --git a/src/test/ui/inference/need_type_info/channel.stderr b/tests/ui/inference/need_type_info/channel.stderr
index e33ace033..e33ace033 100644
--- a/src/test/ui/inference/need_type_info/channel.stderr
+++ b/tests/ui/inference/need_type_info/channel.stderr
diff --git a/src/test/ui/inference/need_type_info/concrete-impl.rs b/tests/ui/inference/need_type_info/concrete-impl.rs
index 72e0e74f3..72e0e74f3 100644
--- a/src/test/ui/inference/need_type_info/concrete-impl.rs
+++ b/tests/ui/inference/need_type_info/concrete-impl.rs
diff --git a/src/test/ui/inference/need_type_info/concrete-impl.stderr b/tests/ui/inference/need_type_info/concrete-impl.stderr
index aa3296995..aa3296995 100644
--- a/src/test/ui/inference/need_type_info/concrete-impl.stderr
+++ b/tests/ui/inference/need_type_info/concrete-impl.stderr
diff --git a/src/test/ui/inference/need_type_info/do-not-suggest-generic-arguments-for-turbofish.rs b/tests/ui/inference/need_type_info/do-not-suggest-generic-arguments-for-turbofish.rs
index 3084f6eac..3084f6eac 100644
--- a/src/test/ui/inference/need_type_info/do-not-suggest-generic-arguments-for-turbofish.rs
+++ b/tests/ui/inference/need_type_info/do-not-suggest-generic-arguments-for-turbofish.rs
diff --git a/src/test/ui/inference/need_type_info/do-not-suggest-generic-arguments-for-turbofish.stderr b/tests/ui/inference/need_type_info/do-not-suggest-generic-arguments-for-turbofish.stderr
index 2ad35ab03..2ad35ab03 100644
--- a/src/test/ui/inference/need_type_info/do-not-suggest-generic-arguments-for-turbofish.stderr
+++ b/tests/ui/inference/need_type_info/do-not-suggest-generic-arguments-for-turbofish.stderr
diff --git a/src/test/ui/inference/need_type_info/expr-struct-type-relative-enum.rs b/tests/ui/inference/need_type_info/expr-struct-type-relative-enum.rs
index 42af9fa8d..42af9fa8d 100644
--- a/src/test/ui/inference/need_type_info/expr-struct-type-relative-enum.rs
+++ b/tests/ui/inference/need_type_info/expr-struct-type-relative-enum.rs
diff --git a/src/test/ui/inference/need_type_info/expr-struct-type-relative-enum.stderr b/tests/ui/inference/need_type_info/expr-struct-type-relative-enum.stderr
index 68ecb3813..68ecb3813 100644
--- a/src/test/ui/inference/need_type_info/expr-struct-type-relative-enum.stderr
+++ b/tests/ui/inference/need_type_info/expr-struct-type-relative-enum.stderr
diff --git a/src/test/ui/inference/need_type_info/expr-struct-type-relative-gat.rs b/tests/ui/inference/need_type_info/expr-struct-type-relative-gat.rs
index b0c0d3397..b0c0d3397 100644
--- a/src/test/ui/inference/need_type_info/expr-struct-type-relative-gat.rs
+++ b/tests/ui/inference/need_type_info/expr-struct-type-relative-gat.rs
diff --git a/src/test/ui/inference/need_type_info/expr-struct-type-relative-gat.stderr b/tests/ui/inference/need_type_info/expr-struct-type-relative-gat.stderr
index cbc2477de..cbc2477de 100644
--- a/src/test/ui/inference/need_type_info/expr-struct-type-relative-gat.stderr
+++ b/tests/ui/inference/need_type_info/expr-struct-type-relative-gat.stderr
diff --git a/src/test/ui/inference/need_type_info/expr-struct-type-relative.rs b/tests/ui/inference/need_type_info/expr-struct-type-relative.rs
index c3ece2b16..c3ece2b16 100644
--- a/src/test/ui/inference/need_type_info/expr-struct-type-relative.rs
+++ b/tests/ui/inference/need_type_info/expr-struct-type-relative.rs
diff --git a/src/test/ui/inference/need_type_info/expr-struct-type-relative.stderr b/tests/ui/inference/need_type_info/expr-struct-type-relative.stderr
index 397d8e7be..397d8e7be 100644
--- a/src/test/ui/inference/need_type_info/expr-struct-type-relative.stderr
+++ b/tests/ui/inference/need_type_info/expr-struct-type-relative.stderr
diff --git a/src/test/ui/inference/need_type_info/issue-103053.rs b/tests/ui/inference/need_type_info/issue-103053.rs
index 05169666f..05169666f 100644
--- a/src/test/ui/inference/need_type_info/issue-103053.rs
+++ b/tests/ui/inference/need_type_info/issue-103053.rs
diff --git a/src/test/ui/inference/need_type_info/issue-103053.stderr b/tests/ui/inference/need_type_info/issue-103053.stderr
index 84f0475d8..84f0475d8 100644
--- a/src/test/ui/inference/need_type_info/issue-103053.stderr
+++ b/tests/ui/inference/need_type_info/issue-103053.stderr
diff --git a/src/test/ui/inference/need_type_info/self-ty-in-path.rs b/tests/ui/inference/need_type_info/self-ty-in-path.rs
index 768a8cc37..768a8cc37 100644
--- a/src/test/ui/inference/need_type_info/self-ty-in-path.rs
+++ b/tests/ui/inference/need_type_info/self-ty-in-path.rs
diff --git a/src/test/ui/inference/need_type_info/self-ty-in-path.stderr b/tests/ui/inference/need_type_info/self-ty-in-path.stderr
index 04b521dbd..04b521dbd 100644
--- a/src/test/ui/inference/need_type_info/self-ty-in-path.stderr
+++ b/tests/ui/inference/need_type_info/self-ty-in-path.stderr
diff --git a/src/test/ui/inference/need_type_info/type-alias-indirect.rs b/tests/ui/inference/need_type_info/type-alias-indirect.rs
index 0ed02ddc5..0ed02ddc5 100644
--- a/src/test/ui/inference/need_type_info/type-alias-indirect.rs
+++ b/tests/ui/inference/need_type_info/type-alias-indirect.rs
diff --git a/src/test/ui/inference/need_type_info/type-alias-indirect.stderr b/tests/ui/inference/need_type_info/type-alias-indirect.stderr
index 6161690df..6161690df 100644
--- a/src/test/ui/inference/need_type_info/type-alias-indirect.stderr
+++ b/tests/ui/inference/need_type_info/type-alias-indirect.stderr
diff --git a/src/test/ui/inference/need_type_info/type-alias.rs b/tests/ui/inference/need_type_info/type-alias.rs
index f921b046b..f921b046b 100644
--- a/src/test/ui/inference/need_type_info/type-alias.rs
+++ b/tests/ui/inference/need_type_info/type-alias.rs
diff --git a/src/test/ui/inference/need_type_info/type-alias.stderr b/tests/ui/inference/need_type_info/type-alias.stderr
index a33f49baf..a33f49baf 100644
--- a/src/test/ui/inference/need_type_info/type-alias.stderr
+++ b/tests/ui/inference/need_type_info/type-alias.stderr
diff --git a/src/test/ui/inference/newlambdas-ret-infer.rs b/tests/ui/inference/newlambdas-ret-infer.rs
index 9b629838f..9b629838f 100644
--- a/src/test/ui/inference/newlambdas-ret-infer.rs
+++ b/tests/ui/inference/newlambdas-ret-infer.rs
diff --git a/src/test/ui/inference/newlambdas-ret-infer2.rs b/tests/ui/inference/newlambdas-ret-infer2.rs
index abe31a05f..abe31a05f 100644
--- a/src/test/ui/inference/newlambdas-ret-infer2.rs
+++ b/tests/ui/inference/newlambdas-ret-infer2.rs
diff --git a/src/test/ui/inference/question-mark-type-infer.rs b/tests/ui/inference/question-mark-type-infer.rs
index 10560f85e..10560f85e 100644
--- a/src/test/ui/inference/question-mark-type-infer.rs
+++ b/tests/ui/inference/question-mark-type-infer.rs
diff --git a/tests/ui/inference/question-mark-type-infer.stderr b/tests/ui/inference/question-mark-type-infer.stderr
new file mode 100644
index 000000000..a9cb7e525
--- /dev/null
+++ b/tests/ui/inference/question-mark-type-infer.stderr
@@ -0,0 +1,14 @@
+error[E0282]: type annotations needed
+  --> $DIR/question-mark-type-infer.rs:10:21
+   |
+LL |     l.iter().map(f).collect()?
+   |                     ^^^^^^^ cannot infer type of the type parameter `B` declared on the associated function `collect`
+   |
+help: consider specifying the generic argument
+   |
+LL |     l.iter().map(f).collect::<Vec<_>>()?
+   |                            ++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/inference/range-type-infer.rs b/tests/ui/inference/range-type-infer.rs
index f07c04171..f07c04171 100644
--- a/src/test/ui/inference/range-type-infer.rs
+++ b/tests/ui/inference/range-type-infer.rs
diff --git a/src/test/ui/inference/simple-infer.rs b/tests/ui/inference/simple-infer.rs
index 561e4fdec..561e4fdec 100644
--- a/src/test/ui/inference/simple-infer.rs
+++ b/tests/ui/inference/simple-infer.rs
diff --git a/src/test/ui/inference/str-as-char.fixed b/tests/ui/inference/str-as-char.fixed
index 6aea809cb..6aea809cb 100644
--- a/src/test/ui/inference/str-as-char.fixed
+++ b/tests/ui/inference/str-as-char.fixed
diff --git a/src/test/ui/inference/str-as-char.rs b/tests/ui/inference/str-as-char.rs
index eaa8d788c..eaa8d788c 100644
--- a/src/test/ui/inference/str-as-char.rs
+++ b/tests/ui/inference/str-as-char.rs
diff --git a/src/test/ui/inference/str-as-char.stderr b/tests/ui/inference/str-as-char.stderr
index 2c84dac8e..2c84dac8e 100644
--- a/src/test/ui/inference/str-as-char.stderr
+++ b/tests/ui/inference/str-as-char.stderr
diff --git a/src/test/ui/inference/tutorial-suffix-inference-test.rs b/tests/ui/inference/tutorial-suffix-inference-test.rs
index 849adfd53..849adfd53 100644
--- a/src/test/ui/inference/tutorial-suffix-inference-test.rs
+++ b/tests/ui/inference/tutorial-suffix-inference-test.rs
diff --git a/src/test/ui/inference/tutorial-suffix-inference-test.stderr b/tests/ui/inference/tutorial-suffix-inference-test.stderr
index d83a1367d..d83a1367d 100644
--- a/src/test/ui/inference/tutorial-suffix-inference-test.stderr
+++ b/tests/ui/inference/tutorial-suffix-inference-test.stderr
diff --git a/src/test/ui/inference/type-infer-generalize-ty-var.rs b/tests/ui/inference/type-infer-generalize-ty-var.rs
index a3d6916cb..a3d6916cb 100644
--- a/src/test/ui/inference/type-infer-generalize-ty-var.rs
+++ b/tests/ui/inference/type-infer-generalize-ty-var.rs
diff --git a/src/test/ui/infinite/infinite-autoderef.rs b/tests/ui/infinite/infinite-autoderef.rs
index cbbe1f81d..cbbe1f81d 100644
--- a/src/test/ui/infinite/infinite-autoderef.rs
+++ b/tests/ui/infinite/infinite-autoderef.rs
diff --git a/src/test/ui/infinite/infinite-autoderef.stderr b/tests/ui/infinite/infinite-autoderef.stderr
index 51b61e3a6..51b61e3a6 100644
--- a/src/test/ui/infinite/infinite-autoderef.stderr
+++ b/tests/ui/infinite/infinite-autoderef.stderr
diff --git a/src/test/ui/infinite/infinite-instantiation.polonius.stderr b/tests/ui/infinite/infinite-instantiation.polonius.stderr
index 29eb8c481..29eb8c481 100644
--- a/src/test/ui/infinite/infinite-instantiation.polonius.stderr
+++ b/tests/ui/infinite/infinite-instantiation.polonius.stderr
diff --git a/src/test/ui/infinite/infinite-instantiation.rs b/tests/ui/infinite/infinite-instantiation.rs
index 9b9f332ca..9b9f332ca 100644
--- a/src/test/ui/infinite/infinite-instantiation.rs
+++ b/tests/ui/infinite/infinite-instantiation.rs
diff --git a/src/test/ui/infinite/infinite-instantiation.stderr b/tests/ui/infinite/infinite-instantiation.stderr
index 951e0f587..951e0f587 100644
--- a/src/test/ui/infinite/infinite-instantiation.stderr
+++ b/tests/ui/infinite/infinite-instantiation.stderr
diff --git a/src/test/ui/infinite/infinite-macro-expansion.rs b/tests/ui/infinite/infinite-macro-expansion.rs
index 6ea0bc73d..6ea0bc73d 100644
--- a/src/test/ui/infinite/infinite-macro-expansion.rs
+++ b/tests/ui/infinite/infinite-macro-expansion.rs
diff --git a/src/test/ui/infinite/infinite-macro-expansion.stderr b/tests/ui/infinite/infinite-macro-expansion.stderr
index 15654dfaf..15654dfaf 100644
--- a/src/test/ui/infinite/infinite-macro-expansion.stderr
+++ b/tests/ui/infinite/infinite-macro-expansion.stderr
diff --git a/src/test/ui/infinite/infinite-recursion-const-fn.rs b/tests/ui/infinite/infinite-recursion-const-fn.rs
index 420915311..420915311 100644
--- a/src/test/ui/infinite/infinite-recursion-const-fn.rs
+++ b/tests/ui/infinite/infinite-recursion-const-fn.rs
diff --git a/src/test/ui/infinite/infinite-recursion-const-fn.stderr b/tests/ui/infinite/infinite-recursion-const-fn.stderr
index 53b603a47..53b603a47 100644
--- a/src/test/ui/infinite/infinite-recursion-const-fn.stderr
+++ b/tests/ui/infinite/infinite-recursion-const-fn.stderr
diff --git a/src/test/ui/infinite/infinite-struct.rs b/tests/ui/infinite/infinite-struct.rs
index f08e10f6b..f08e10f6b 100644
--- a/src/test/ui/infinite/infinite-struct.rs
+++ b/tests/ui/infinite/infinite-struct.rs
diff --git a/src/test/ui/infinite/infinite-struct.stderr b/tests/ui/infinite/infinite-struct.stderr
index b6c72b1de..b6c72b1de 100644
--- a/src/test/ui/infinite/infinite-struct.stderr
+++ b/tests/ui/infinite/infinite-struct.stderr
diff --git a/src/test/ui/infinite/infinite-tag-type-recursion.rs b/tests/ui/infinite/infinite-tag-type-recursion.rs
index 87a9e08dd..87a9e08dd 100644
--- a/src/test/ui/infinite/infinite-tag-type-recursion.rs
+++ b/tests/ui/infinite/infinite-tag-type-recursion.rs
diff --git a/src/test/ui/infinite/infinite-tag-type-recursion.stderr b/tests/ui/infinite/infinite-tag-type-recursion.stderr
index 513bbfc1b..513bbfc1b 100644
--- a/src/test/ui/infinite/infinite-tag-type-recursion.stderr
+++ b/tests/ui/infinite/infinite-tag-type-recursion.stderr
diff --git a/src/test/ui/infinite/infinite-trait-alias-recursion.rs b/tests/ui/infinite/infinite-trait-alias-recursion.rs
index ec86744e6..ec86744e6 100644
--- a/src/test/ui/infinite/infinite-trait-alias-recursion.rs
+++ b/tests/ui/infinite/infinite-trait-alias-recursion.rs
diff --git a/src/test/ui/infinite/infinite-trait-alias-recursion.stderr b/tests/ui/infinite/infinite-trait-alias-recursion.stderr
index b925b3b01..b925b3b01 100644
--- a/src/test/ui/infinite/infinite-trait-alias-recursion.stderr
+++ b/tests/ui/infinite/infinite-trait-alias-recursion.stderr
diff --git a/src/test/ui/infinite/infinite-type-alias-mutual-recursion.rs b/tests/ui/infinite/infinite-type-alias-mutual-recursion.rs
index 5381eedcf..5381eedcf 100644
--- a/src/test/ui/infinite/infinite-type-alias-mutual-recursion.rs
+++ b/tests/ui/infinite/infinite-type-alias-mutual-recursion.rs
diff --git a/src/test/ui/infinite/infinite-type-alias-mutual-recursion.stderr b/tests/ui/infinite/infinite-type-alias-mutual-recursion.stderr
index 7f82b2944..7f82b2944 100644
--- a/src/test/ui/infinite/infinite-type-alias-mutual-recursion.stderr
+++ b/tests/ui/infinite/infinite-type-alias-mutual-recursion.stderr
diff --git a/src/test/ui/infinite/infinite-vec-type-recursion.rs b/tests/ui/infinite/infinite-vec-type-recursion.rs
index 356818225..356818225 100644
--- a/src/test/ui/infinite/infinite-vec-type-recursion.rs
+++ b/tests/ui/infinite/infinite-vec-type-recursion.rs
diff --git a/src/test/ui/infinite/infinite-vec-type-recursion.stderr b/tests/ui/infinite/infinite-vec-type-recursion.stderr
index 1e487a5b1..1e487a5b1 100644
--- a/src/test/ui/infinite/infinite-vec-type-recursion.stderr
+++ b/tests/ui/infinite/infinite-vec-type-recursion.stderr
diff --git a/tests/ui/infinite/issue-41731-infinite-macro-print.rs b/tests/ui/infinite/issue-41731-infinite-macro-print.rs
new file mode 100644
index 000000000..d52e6e7e9
--- /dev/null
+++ b/tests/ui/infinite/issue-41731-infinite-macro-print.rs
@@ -0,0 +1,15 @@
+// compile-flags: -Z trace-macros
+
+#![recursion_limit = "5"]
+
+fn main() {
+    macro_rules! stack {
+        ($overflow:expr) => {
+            print!(stack!($overflow));
+            //~^ ERROR recursion limit reached while expanding
+            //~| ERROR format argument must be a string literal
+        };
+    }
+
+    stack!("overflow");
+}
diff --git a/tests/ui/infinite/issue-41731-infinite-macro-print.stderr b/tests/ui/infinite/issue-41731-infinite-macro-print.stderr
new file mode 100644
index 000000000..e30b2039d
--- /dev/null
+++ b/tests/ui/infinite/issue-41731-infinite-macro-print.stderr
@@ -0,0 +1,38 @@
+error: recursion limit reached while expanding `$crate::format_args!`
+  --> $DIR/issue-41731-infinite-macro-print.rs:14:5
+   |
+LL |     stack!("overflow");
+   |     ^^^^^^^^^^^^^^^^^^
+   |
+   = help: consider increasing the recursion limit by adding a `#![recursion_limit = "10"]` attribute to your crate (`issue_41731_infinite_macro_print`)
+   = note: this error originates in the macro `print` which comes from the expansion of the macro `stack` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+note: trace_macro
+  --> $DIR/issue-41731-infinite-macro-print.rs:14:5
+   |
+LL |     stack!("overflow");
+   |     ^^^^^^^^^^^^^^^^^^
+   |
+   = note: expanding `stack! { "overflow" }`
+   = note: to `print! (stack! ("overflow")) ;`
+   = note: expanding `print! { stack! ("overflow") }`
+   = note: to `{ $crate :: io :: _print($crate :: format_args! (stack! ("overflow"))) ; }`
+   = note: expanding `stack! { "overflow" }`
+   = note: to `print! (stack! ("overflow")) ;`
+   = note: expanding `print! { stack! ("overflow") }`
+   = note: to `{ $crate :: io :: _print($crate :: format_args! (stack! ("overflow"))) ; }`
+
+error: format argument must be a string literal
+  --> $DIR/issue-41731-infinite-macro-print.rs:14:5
+   |
+LL |     stack!("overflow");
+   |     ^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in the macro `print` which comes from the expansion of the macro `stack` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: you might be missing a string literal to format with
+   |
+LL |             print!("{}", stack!($overflow));
+   |                    +++++
+
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/infinite/issue-41731-infinite-macro-println.rs b/tests/ui/infinite/issue-41731-infinite-macro-println.rs
new file mode 100644
index 000000000..3c2b7ee02
--- /dev/null
+++ b/tests/ui/infinite/issue-41731-infinite-macro-println.rs
@@ -0,0 +1,15 @@
+// compile-flags: -Z trace-macros
+
+#![recursion_limit = "5"]
+
+fn main() {
+    macro_rules! stack {
+        ($overflow:expr) => {
+            println!(stack!($overflow));
+            //~^ ERROR recursion limit reached while expanding
+            //~| ERROR format argument must be a string literal
+        };
+    }
+
+    stack!("overflow");
+}
diff --git a/tests/ui/infinite/issue-41731-infinite-macro-println.stderr b/tests/ui/infinite/issue-41731-infinite-macro-println.stderr
new file mode 100644
index 000000000..66b466daf
--- /dev/null
+++ b/tests/ui/infinite/issue-41731-infinite-macro-println.stderr
@@ -0,0 +1,38 @@
+error: recursion limit reached while expanding `$crate::format_args_nl!`
+  --> $DIR/issue-41731-infinite-macro-println.rs:14:5
+   |
+LL |     stack!("overflow");
+   |     ^^^^^^^^^^^^^^^^^^
+   |
+   = help: consider increasing the recursion limit by adding a `#![recursion_limit = "10"]` attribute to your crate (`issue_41731_infinite_macro_println`)
+   = note: this error originates in the macro `println` which comes from the expansion of the macro `stack` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+note: trace_macro
+  --> $DIR/issue-41731-infinite-macro-println.rs:14:5
+   |
+LL |     stack!("overflow");
+   |     ^^^^^^^^^^^^^^^^^^
+   |
+   = note: expanding `stack! { "overflow" }`
+   = note: to `println! (stack! ("overflow")) ;`
+   = note: expanding `println! { stack! ("overflow") }`
+   = note: to `{ $crate :: io :: _print($crate :: format_args_nl! (stack! ("overflow"))) ; }`
+   = note: expanding `stack! { "overflow" }`
+   = note: to `println! (stack! ("overflow")) ;`
+   = note: expanding `println! { stack! ("overflow") }`
+   = note: to `{ $crate :: io :: _print($crate :: format_args_nl! (stack! ("overflow"))) ; }`
+
+error: format argument must be a string literal
+  --> $DIR/issue-41731-infinite-macro-println.rs:14:5
+   |
+LL |     stack!("overflow");
+   |     ^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in the macro `println` which comes from the expansion of the macro `stack` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: you might be missing a string literal to format with
+   |
+LL |             println!("{}", stack!($overflow));
+   |                      +++++
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/inherent-impls-overlap-check/auxiliary/repeat.rs b/tests/ui/inherent-impls-overlap-check/auxiliary/repeat.rs
index 42ed5d19d..42ed5d19d 100644
--- a/src/test/ui/inherent-impls-overlap-check/auxiliary/repeat.rs
+++ b/tests/ui/inherent-impls-overlap-check/auxiliary/repeat.rs
diff --git a/src/test/ui/inherent-impls-overlap-check/no-overlap.rs b/tests/ui/inherent-impls-overlap-check/no-overlap.rs
index 450e6d420..450e6d420 100644
--- a/src/test/ui/inherent-impls-overlap-check/no-overlap.rs
+++ b/tests/ui/inherent-impls-overlap-check/no-overlap.rs
diff --git a/src/test/ui/inherent-impls-overlap-check/overlap.rs b/tests/ui/inherent-impls-overlap-check/overlap.rs
index 6f2801197..6f2801197 100644
--- a/src/test/ui/inherent-impls-overlap-check/overlap.rs
+++ b/tests/ui/inherent-impls-overlap-check/overlap.rs
diff --git a/src/test/ui/inherent-impls-overlap-check/overlap.stderr b/tests/ui/inherent-impls-overlap-check/overlap.stderr
index 3dd279371..3dd279371 100644
--- a/src/test/ui/inherent-impls-overlap-check/overlap.stderr
+++ b/tests/ui/inherent-impls-overlap-check/overlap.stderr
diff --git a/src/test/ui/inherit-env.rs b/tests/ui/inherit-env.rs
index e29fa04bb..e29fa04bb 100644
--- a/src/test/ui/inherit-env.rs
+++ b/tests/ui/inherit-env.rs
diff --git a/src/test/ui/inline-const/const-expr-array-init.rs b/tests/ui/inline-const/const-expr-array-init.rs
index 8a92cdbc0..8a92cdbc0 100644
--- a/src/test/ui/inline-const/const-expr-array-init.rs
+++ b/tests/ui/inline-const/const-expr-array-init.rs
diff --git a/src/test/ui/inline-const/const-expr-basic.rs b/tests/ui/inline-const/const-expr-basic.rs
index dac46fe25..dac46fe25 100644
--- a/src/test/ui/inline-const/const-expr-basic.rs
+++ b/tests/ui/inline-const/const-expr-basic.rs
diff --git a/src/test/ui/inline-const/const-expr-generic-err.rs b/tests/ui/inline-const/const-expr-generic-err.rs
index 4e8879af5..4e8879af5 100644
--- a/src/test/ui/inline-const/const-expr-generic-err.rs
+++ b/tests/ui/inline-const/const-expr-generic-err.rs
diff --git a/src/test/ui/inline-const/const-expr-generic-err.stderr b/tests/ui/inline-const/const-expr-generic-err.stderr
index fc0b6cc44..fc0b6cc44 100644
--- a/src/test/ui/inline-const/const-expr-generic-err.stderr
+++ b/tests/ui/inline-const/const-expr-generic-err.stderr
diff --git a/src/test/ui/inline-const/const-expr-generic-err2.rs b/tests/ui/inline-const/const-expr-generic-err2.rs
index e097cbe9d..e097cbe9d 100644
--- a/src/test/ui/inline-const/const-expr-generic-err2.rs
+++ b/tests/ui/inline-const/const-expr-generic-err2.rs
diff --git a/src/test/ui/inline-const/const-expr-generic-err2.stderr b/tests/ui/inline-const/const-expr-generic-err2.stderr
index 00b716cd2..00b716cd2 100644
--- a/src/test/ui/inline-const/const-expr-generic-err2.stderr
+++ b/tests/ui/inline-const/const-expr-generic-err2.stderr
diff --git a/src/test/ui/inline-const/const-expr-generic.rs b/tests/ui/inline-const/const-expr-generic.rs
index 3207bfa0e..3207bfa0e 100644
--- a/src/test/ui/inline-const/const-expr-generic.rs
+++ b/tests/ui/inline-const/const-expr-generic.rs
diff --git a/src/test/ui/inline-const/const-expr-inference.rs b/tests/ui/inline-const/const-expr-inference.rs
index 0d5892a74..0d5892a74 100644
--- a/src/test/ui/inline-const/const-expr-inference.rs
+++ b/tests/ui/inline-const/const-expr-inference.rs
diff --git a/src/test/ui/inline-const/const-expr-lifetime-err.rs b/tests/ui/inline-const/const-expr-lifetime-err.rs
index 0a032a733..0a032a733 100644
--- a/src/test/ui/inline-const/const-expr-lifetime-err.rs
+++ b/tests/ui/inline-const/const-expr-lifetime-err.rs
diff --git a/src/test/ui/inline-const/const-expr-lifetime-err.stderr b/tests/ui/inline-const/const-expr-lifetime-err.stderr
index a23f7c9a7..a23f7c9a7 100644
--- a/src/test/ui/inline-const/const-expr-lifetime-err.stderr
+++ b/tests/ui/inline-const/const-expr-lifetime-err.stderr
diff --git a/src/test/ui/inline-const/const-expr-lifetime.rs b/tests/ui/inline-const/const-expr-lifetime.rs
index d883deb28..d883deb28 100644
--- a/src/test/ui/inline-const/const-expr-lifetime.rs
+++ b/tests/ui/inline-const/const-expr-lifetime.rs
diff --git a/src/test/ui/inline-const/const-expr-macro.rs b/tests/ui/inline-const/const-expr-macro.rs
index 041f3e15a..041f3e15a 100644
--- a/src/test/ui/inline-const/const-expr-macro.rs
+++ b/tests/ui/inline-const/const-expr-macro.rs
diff --git a/src/test/ui/inline-const/const-expr-reference.rs b/tests/ui/inline-const/const-expr-reference.rs
index a54d879f6..a54d879f6 100644
--- a/src/test/ui/inline-const/const-expr-reference.rs
+++ b/tests/ui/inline-const/const-expr-reference.rs
diff --git a/src/test/ui/inline-const/const-match-pat-generic.rs b/tests/ui/inline-const/const-match-pat-generic.rs
index 7c0d83516..7c0d83516 100644
--- a/src/test/ui/inline-const/const-match-pat-generic.rs
+++ b/tests/ui/inline-const/const-match-pat-generic.rs
diff --git a/src/test/ui/inline-const/const-match-pat-generic.stderr b/tests/ui/inline-const/const-match-pat-generic.stderr
index 77267f12f..77267f12f 100644
--- a/src/test/ui/inline-const/const-match-pat-generic.stderr
+++ b/tests/ui/inline-const/const-match-pat-generic.stderr
diff --git a/src/test/ui/inline-const/const-match-pat-inference.rs b/tests/ui/inline-const/const-match-pat-inference.rs
index d83ae6e98..d83ae6e98 100644
--- a/src/test/ui/inline-const/const-match-pat-inference.rs
+++ b/tests/ui/inline-const/const-match-pat-inference.rs
diff --git a/src/test/ui/inline-const/const-match-pat-lifetime-err.rs b/tests/ui/inline-const/const-match-pat-lifetime-err.rs
index 436b8037f..436b8037f 100644
--- a/src/test/ui/inline-const/const-match-pat-lifetime-err.rs
+++ b/tests/ui/inline-const/const-match-pat-lifetime-err.rs
diff --git a/src/test/ui/inline-const/const-match-pat-lifetime.rs b/tests/ui/inline-const/const-match-pat-lifetime.rs
index 6d943bbcc..6d943bbcc 100644
--- a/src/test/ui/inline-const/const-match-pat-lifetime.rs
+++ b/tests/ui/inline-const/const-match-pat-lifetime.rs
diff --git a/src/test/ui/inline-const/const-match-pat-range.rs b/tests/ui/inline-const/const-match-pat-range.rs
index 73d6334c3..73d6334c3 100644
--- a/src/test/ui/inline-const/const-match-pat-range.rs
+++ b/tests/ui/inline-const/const-match-pat-range.rs
diff --git a/src/test/ui/inline-const/const-match-pat.rs b/tests/ui/inline-const/const-match-pat.rs
index 2f55e16b3..2f55e16b3 100644
--- a/src/test/ui/inline-const/const-match-pat.rs
+++ b/tests/ui/inline-const/const-match-pat.rs
diff --git a/tests/ui/inline-const/expr-unsafe-err.mir.stderr b/tests/ui/inline-const/expr-unsafe-err.mir.stderr
new file mode 100644
index 000000000..1bec41e2e
--- /dev/null
+++ b/tests/ui/inline-const/expr-unsafe-err.mir.stderr
@@ -0,0 +1,11 @@
+error[E0133]: call to unsafe function is unsafe and requires unsafe function or block
+  --> $DIR/expr-unsafe-err.rs:8:9
+   |
+LL |         require_unsafe();
+   |         ^^^^^^^^^^^^^^^^ call to unsafe function
+   |
+   = note: consult the function's documentation for information on how to avoid undefined behavior
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0133`.
diff --git a/tests/ui/inline-const/expr-unsafe-err.rs b/tests/ui/inline-const/expr-unsafe-err.rs
new file mode 100644
index 000000000..adf05d352
--- /dev/null
+++ b/tests/ui/inline-const/expr-unsafe-err.rs
@@ -0,0 +1,11 @@
+// revisions: mir thir
+// [thir]compile-flags: -Z thir-unsafeck
+#![feature(inline_const)]
+const unsafe fn require_unsafe() -> usize { 1 }
+
+fn main() {
+    const {
+        require_unsafe();
+        //~^ ERROR [E0133]
+    }
+}
diff --git a/tests/ui/inline-const/expr-unsafe-err.thir.stderr b/tests/ui/inline-const/expr-unsafe-err.thir.stderr
new file mode 100644
index 000000000..c971e8afb
--- /dev/null
+++ b/tests/ui/inline-const/expr-unsafe-err.thir.stderr
@@ -0,0 +1,11 @@
+error[E0133]: call to unsafe function `require_unsafe` is unsafe and requires unsafe function or block
+  --> $DIR/expr-unsafe-err.rs:8:9
+   |
+LL |         require_unsafe();
+   |         ^^^^^^^^^^^^^^^^ call to unsafe function
+   |
+   = note: consult the function's documentation for information on how to avoid undefined behavior
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0133`.
diff --git a/tests/ui/inline-const/expr-unsafe.mir.stderr b/tests/ui/inline-const/expr-unsafe.mir.stderr
new file mode 100644
index 000000000..1ab6e42fb
--- /dev/null
+++ b/tests/ui/inline-const/expr-unsafe.mir.stderr
@@ -0,0 +1,14 @@
+warning: unnecessary `unsafe` block
+  --> $DIR/expr-unsafe.rs:12:13
+   |
+LL |             unsafe {}
+   |             ^^^^^^ unnecessary `unsafe` block
+   |
+note: the lint level is defined here
+  --> $DIR/expr-unsafe.rs:4:9
+   |
+LL | #![warn(unused_unsafe)]
+   |         ^^^^^^^^^^^^^
+
+warning: 1 warning emitted
+
diff --git a/tests/ui/inline-const/expr-unsafe.rs b/tests/ui/inline-const/expr-unsafe.rs
new file mode 100644
index 000000000..d71efd33d
--- /dev/null
+++ b/tests/ui/inline-const/expr-unsafe.rs
@@ -0,0 +1,16 @@
+// check-pass
+// revisions: mir thir
+// [thir]compile-flags: -Z thir-unsafeck
+#![warn(unused_unsafe)]
+#![feature(inline_const)]
+const unsafe fn require_unsafe() -> usize { 1 }
+
+fn main() {
+    unsafe {
+        const {
+            require_unsafe();
+            unsafe {}
+            //~^ WARNING unnecessary `unsafe` block
+        }
+    }
+}
diff --git a/tests/ui/inline-const/expr-unsafe.thir.stderr b/tests/ui/inline-const/expr-unsafe.thir.stderr
new file mode 100644
index 000000000..4737444fb
--- /dev/null
+++ b/tests/ui/inline-const/expr-unsafe.thir.stderr
@@ -0,0 +1,17 @@
+warning: unnecessary `unsafe` block
+  --> $DIR/expr-unsafe.rs:12:13
+   |
+LL |     unsafe {
+   |     ------ because it's nested under this `unsafe` block
+...
+LL |             unsafe {}
+   |             ^^^^^^ unnecessary `unsafe` block
+   |
+note: the lint level is defined here
+  --> $DIR/expr-unsafe.rs:4:9
+   |
+LL | #![warn(unused_unsafe)]
+   |         ^^^^^^^^^^^^^
+
+warning: 1 warning emitted
+
diff --git a/src/test/ui/inline-const/expr-with-block-err.rs b/tests/ui/inline-const/expr-with-block-err.rs
index f7547742d..f7547742d 100644
--- a/src/test/ui/inline-const/expr-with-block-err.rs
+++ b/tests/ui/inline-const/expr-with-block-err.rs
diff --git a/src/test/ui/inline-const/expr-with-block-err.stderr b/tests/ui/inline-const/expr-with-block-err.stderr
index 6f7408f4e..6f7408f4e 100644
--- a/src/test/ui/inline-const/expr-with-block-err.stderr
+++ b/tests/ui/inline-const/expr-with-block-err.stderr
diff --git a/src/test/ui/inline-const/expr-with-block.rs b/tests/ui/inline-const/expr-with-block.rs
index 391872476..391872476 100644
--- a/src/test/ui/inline-const/expr-with-block.rs
+++ b/tests/ui/inline-const/expr-with-block.rs
diff --git a/src/test/ui/inline-const/macro-with-const.rs b/tests/ui/inline-const/macro-with-const.rs
index e7393166d..e7393166d 100644
--- a/src/test/ui/inline-const/macro-with-const.rs
+++ b/tests/ui/inline-const/macro-with-const.rs
diff --git a/tests/ui/inline-const/pat-unsafe-err.rs b/tests/ui/inline-const/pat-unsafe-err.rs
new file mode 100644
index 000000000..e290b438c
--- /dev/null
+++ b/tests/ui/inline-const/pat-unsafe-err.rs
@@ -0,0 +1,17 @@
+// ignore-test This is currently broken
+// revisions: mir thir
+// [thir]compile-flags: -Z thir-unsafeck
+
+#![allow(incomplete_features)]
+#![feature(inline_const_pat)]
+
+const unsafe fn require_unsafe() -> usize { 1 }
+
+fn main() {
+    match () {
+        const {
+            require_unsafe();
+            //~^ ERROR [E0133]
+        } => (),
+    }
+}
diff --git a/tests/ui/inline-const/pat-unsafe.rs b/tests/ui/inline-const/pat-unsafe.rs
new file mode 100644
index 000000000..bcf7f6e01
--- /dev/null
+++ b/tests/ui/inline-const/pat-unsafe.rs
@@ -0,0 +1,22 @@
+// ignore-test This is currently broken
+// check-pass
+// revisions: mir thir
+// [thir]compile-flags: -Z thir-unsafeck
+
+#![allow(incomplete_features)]
+#![warn(unused_unsafe)]
+#![feature(inline_const_pat)]
+
+const unsafe fn require_unsafe() -> usize { 1 }
+
+fn main() {
+    unsafe {
+        match () {
+            const {
+                require_unsafe();
+                unsafe {}
+                //~^ WARNING unnecessary `unsafe` block
+            } => (),
+        }
+    }
+}
diff --git a/src/test/ui/inline-disallow-on-variant.rs b/tests/ui/inline-disallow-on-variant.rs
index d92a4e8cc..d92a4e8cc 100644
--- a/src/test/ui/inline-disallow-on-variant.rs
+++ b/tests/ui/inline-disallow-on-variant.rs
diff --git a/src/test/ui/inline-disallow-on-variant.stderr b/tests/ui/inline-disallow-on-variant.stderr
index 1b176579b..1b176579b 100644
--- a/src/test/ui/inline-disallow-on-variant.stderr
+++ b/tests/ui/inline-disallow-on-variant.stderr
diff --git a/src/test/ui/inlined-main.rs b/tests/ui/inlined-main.rs
index 75ff4c87d..75ff4c87d 100644
--- a/src/test/ui/inlined-main.rs
+++ b/tests/ui/inlined-main.rs
diff --git a/src/test/ui/inner-attrs-on-impl.rs b/tests/ui/inner-attrs-on-impl.rs
index 636e8c488..636e8c488 100644
--- a/src/test/ui/inner-attrs-on-impl.rs
+++ b/tests/ui/inner-attrs-on-impl.rs
diff --git a/src/test/ui/inner-module.rs b/tests/ui/inner-module.rs
index 363f753e2..363f753e2 100644
--- a/src/test/ui/inner-module.rs
+++ b/tests/ui/inner-module.rs
diff --git a/src/test/ui/inner-static-type-parameter.rs b/tests/ui/inner-static-type-parameter.rs
index c08ccd29d..c08ccd29d 100644
--- a/src/test/ui/inner-static-type-parameter.rs
+++ b/tests/ui/inner-static-type-parameter.rs
diff --git a/src/test/ui/inner-static-type-parameter.stderr b/tests/ui/inner-static-type-parameter.stderr
index e4e449e41..e4e449e41 100644
--- a/src/test/ui/inner-static-type-parameter.stderr
+++ b/tests/ui/inner-static-type-parameter.stderr
diff --git a/src/test/ui/inner-static.rs b/tests/ui/inner-static.rs
index adba299eb..adba299eb 100644
--- a/src/test/ui/inner-static.rs
+++ b/tests/ui/inner-static.rs
diff --git a/src/test/ui/integral-indexing.rs b/tests/ui/integral-indexing.rs
index f076dfcb0..f076dfcb0 100644
--- a/src/test/ui/integral-indexing.rs
+++ b/tests/ui/integral-indexing.rs
diff --git a/src/test/ui/integral-indexing.stderr b/tests/ui/integral-indexing.stderr
index bbbb2a86a..bbbb2a86a 100644
--- a/src/test/ui/integral-indexing.stderr
+++ b/tests/ui/integral-indexing.stderr
diff --git a/src/test/ui/integral-variable-unification-error.rs b/tests/ui/integral-variable-unification-error.rs
index 8d1621321..8d1621321 100644
--- a/src/test/ui/integral-variable-unification-error.rs
+++ b/tests/ui/integral-variable-unification-error.rs
diff --git a/src/test/ui/integral-variable-unification-error.stderr b/tests/ui/integral-variable-unification-error.stderr
index f77c265a2..f77c265a2 100644
--- a/src/test/ui/integral-variable-unification-error.stderr
+++ b/tests/ui/integral-variable-unification-error.stderr
diff --git a/src/test/ui/interior-mutability/interior-mutability.rs b/tests/ui/interior-mutability/interior-mutability.rs
index c704acc22..c704acc22 100644
--- a/src/test/ui/interior-mutability/interior-mutability.rs
+++ b/tests/ui/interior-mutability/interior-mutability.rs
diff --git a/src/test/ui/interior-mutability/interior-mutability.stderr b/tests/ui/interior-mutability/interior-mutability.stderr
index 94f41c925..034d22591 100644
--- a/src/test/ui/interior-mutability/interior-mutability.stderr
+++ b/tests/ui/interior-mutability/interior-mutability.stderr
@@ -16,9 +16,6 @@ LL |     catch_unwind(|| { x.set(23); });
    |                  ^^
 note: required by a bound in `catch_unwind`
   --> $SRC_DIR/std/src/panic.rs:LL:COL
-   |
-LL | pub fn catch_unwind<F: FnOnce() -> R + UnwindSafe, R>(f: F) -> Result<R> {
-   |                                        ^^^^^^^^^^ required by this bound in `catch_unwind`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/internal/auxiliary/internal_unstable.rs b/tests/ui/internal/auxiliary/internal_unstable.rs
index eb4d6cb38..eb4d6cb38 100644
--- a/src/test/ui/internal/auxiliary/internal_unstable.rs
+++ b/tests/ui/internal/auxiliary/internal_unstable.rs
diff --git a/src/test/ui/internal/internal-unstable-const.rs b/tests/ui/internal/internal-unstable-const.rs
index 4ec2426df..4ec2426df 100644
--- a/src/test/ui/internal/internal-unstable-const.rs
+++ b/tests/ui/internal/internal-unstable-const.rs
diff --git a/src/test/ui/internal/internal-unstable-const.stderr b/tests/ui/internal/internal-unstable-const.stderr
index 37d2ea6d2..37d2ea6d2 100644
--- a/src/test/ui/internal/internal-unstable-const.stderr
+++ b/tests/ui/internal/internal-unstable-const.stderr
diff --git a/src/test/ui/internal/internal-unstable-noallow.rs b/tests/ui/internal/internal-unstable-noallow.rs
index 616f6668d..616f6668d 100644
--- a/src/test/ui/internal/internal-unstable-noallow.rs
+++ b/tests/ui/internal/internal-unstable-noallow.rs
diff --git a/src/test/ui/internal/internal-unstable-noallow.stderr b/tests/ui/internal/internal-unstable-noallow.stderr
index b0ceae62a..b0ceae62a 100644
--- a/src/test/ui/internal/internal-unstable-noallow.stderr
+++ b/tests/ui/internal/internal-unstable-noallow.stderr
diff --git a/src/test/ui/internal/internal-unstable-thread-local.rs b/tests/ui/internal/internal-unstable-thread-local.rs
index b9194c6b3..b9194c6b3 100644
--- a/src/test/ui/internal/internal-unstable-thread-local.rs
+++ b/tests/ui/internal/internal-unstable-thread-local.rs
diff --git a/src/test/ui/internal/internal-unstable-thread-local.stderr b/tests/ui/internal/internal-unstable-thread-local.stderr
index 558e3dbb7..558e3dbb7 100644
--- a/src/test/ui/internal/internal-unstable-thread-local.stderr
+++ b/tests/ui/internal/internal-unstable-thread-local.stderr
diff --git a/src/test/ui/internal/internal-unstable.rs b/tests/ui/internal/internal-unstable.rs
index b8987d3e1..b8987d3e1 100644
--- a/src/test/ui/internal/internal-unstable.rs
+++ b/tests/ui/internal/internal-unstable.rs
diff --git a/src/test/ui/internal/internal-unstable.stderr b/tests/ui/internal/internal-unstable.stderr
index f0f9bfb8d..f0f9bfb8d 100644
--- a/src/test/ui/internal/internal-unstable.stderr
+++ b/tests/ui/internal/internal-unstable.stderr
diff --git a/src/test/ui/intrinsics-always-extern.rs b/tests/ui/intrinsics-always-extern.rs
index 22951147d..22951147d 100644
--- a/src/test/ui/intrinsics-always-extern.rs
+++ b/tests/ui/intrinsics-always-extern.rs
diff --git a/src/test/ui/intrinsics-always-extern.stderr b/tests/ui/intrinsics-always-extern.stderr
index 24b6da160..24b6da160 100644
--- a/src/test/ui/intrinsics-always-extern.stderr
+++ b/tests/ui/intrinsics-always-extern.stderr
diff --git a/src/test/ui/intrinsics/auxiliary/cci_intrinsic.rs b/tests/ui/intrinsics/auxiliary/cci_intrinsic.rs
index f3b9d569c..f3b9d569c 100644
--- a/src/test/ui/intrinsics/auxiliary/cci_intrinsic.rs
+++ b/tests/ui/intrinsics/auxiliary/cci_intrinsic.rs
diff --git a/src/test/ui/intrinsics/bad-intrinsic-monomorphization.rs b/tests/ui/intrinsics/bad-intrinsic-monomorphization.rs
index f36a5f1ac..f36a5f1ac 100644
--- a/src/test/ui/intrinsics/bad-intrinsic-monomorphization.rs
+++ b/tests/ui/intrinsics/bad-intrinsic-monomorphization.rs
diff --git a/src/test/ui/intrinsics/bad-intrinsic-monomorphization.stderr b/tests/ui/intrinsics/bad-intrinsic-monomorphization.stderr
index c070f0181..c070f0181 100644
--- a/src/test/ui/intrinsics/bad-intrinsic-monomorphization.stderr
+++ b/tests/ui/intrinsics/bad-intrinsic-monomorphization.stderr
diff --git a/src/test/ui/intrinsics/const-eval-select-backtrace-std.rs b/tests/ui/intrinsics/const-eval-select-backtrace-std.rs
index 1164a3a5b..1164a3a5b 100644
--- a/src/test/ui/intrinsics/const-eval-select-backtrace-std.rs
+++ b/tests/ui/intrinsics/const-eval-select-backtrace-std.rs
diff --git a/src/test/ui/intrinsics/const-eval-select-backtrace-std.run.stderr b/tests/ui/intrinsics/const-eval-select-backtrace-std.run.stderr
index 463cd52c5..463cd52c5 100644
--- a/src/test/ui/intrinsics/const-eval-select-backtrace-std.run.stderr
+++ b/tests/ui/intrinsics/const-eval-select-backtrace-std.run.stderr
diff --git a/src/test/ui/intrinsics/const-eval-select-backtrace.rs b/tests/ui/intrinsics/const-eval-select-backtrace.rs
index ef1c7c419..ef1c7c419 100644
--- a/src/test/ui/intrinsics/const-eval-select-backtrace.rs
+++ b/tests/ui/intrinsics/const-eval-select-backtrace.rs
diff --git a/src/test/ui/intrinsics/const-eval-select-backtrace.run.stderr b/tests/ui/intrinsics/const-eval-select-backtrace.run.stderr
index 54e28db5e..54e28db5e 100644
--- a/src/test/ui/intrinsics/const-eval-select-backtrace.run.stderr
+++ b/tests/ui/intrinsics/const-eval-select-backtrace.run.stderr
diff --git a/src/test/ui/intrinsics/const-eval-select-bad.rs b/tests/ui/intrinsics/const-eval-select-bad.rs
index fa14efad7..fa14efad7 100644
--- a/src/test/ui/intrinsics/const-eval-select-bad.rs
+++ b/tests/ui/intrinsics/const-eval-select-bad.rs
diff --git a/src/test/ui/intrinsics/const-eval-select-bad.stderr b/tests/ui/intrinsics/const-eval-select-bad.stderr
index 3720528ad..fd7d061b6 100644
--- a/src/test/ui/intrinsics/const-eval-select-bad.stderr
+++ b/tests/ui/intrinsics/const-eval-select-bad.stderr
@@ -37,9 +37,6 @@ LL |     const_eval_select((), 42, 0xDEADBEEF);
    = note: wrap the `{integer}` in a closure with no arguments: `|| { /* code */ }`
 note: required by a bound in `const_eval_select`
   --> $SRC_DIR/core/src/intrinsics.rs:LL:COL
-   |
-LL |         F: FnOnce<ARG, Output = RET>;
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `const_eval_select`
 
 error: this argument must be a function item
   --> $DIR/const-eval-select-bad.rs:10:31
@@ -62,9 +59,6 @@ LL |     const_eval_select((), 42, 0xDEADBEEF);
    = note: wrap the `{integer}` in a closure with no arguments: `|| { /* code */ }`
 note: required by a bound in `const_eval_select`
   --> $SRC_DIR/core/src/intrinsics.rs:LL:COL
-   |
-LL |         G: FnOnce<ARG, Output = RET>,
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `const_eval_select`
 
 error[E0271]: expected `fn(i32) -> bool {bar}` to be a fn item that returns `i32`, but it returns `bool`
   --> $DIR/const-eval-select-bad.rs:32:34
@@ -76,9 +70,6 @@ LL |     const_eval_select((1,), foo, bar);
    |
 note: required by a bound in `const_eval_select`
   --> $SRC_DIR/core/src/intrinsics.rs:LL:COL
-   |
-LL |         G: FnOnce<ARG, Output = RET>,
-   |                        ^^^^^^^^^^^^ required by this bound in `const_eval_select`
 
 error[E0631]: type mismatch in function arguments
   --> $DIR/const-eval-select-bad.rs:37:32
@@ -95,9 +86,6 @@ LL |     const_eval_select((true,), foo, baz);
               found function signature `fn(i32) -> _`
 note: required by a bound in `const_eval_select`
   --> $SRC_DIR/core/src/intrinsics.rs:LL:COL
-   |
-LL |         F: FnOnce<ARG, Output = RET>;
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `const_eval_select`
 
 error: this argument must be a `const fn`
   --> $DIR/const-eval-select-bad.rs:42:29
diff --git a/src/test/ui/intrinsics/const-eval-select-stability.rs b/tests/ui/intrinsics/const-eval-select-stability.rs
index f9554dece..f9554dece 100644
--- a/src/test/ui/intrinsics/const-eval-select-stability.rs
+++ b/tests/ui/intrinsics/const-eval-select-stability.rs
diff --git a/src/test/ui/intrinsics/const-eval-select-stability.stderr b/tests/ui/intrinsics/const-eval-select-stability.stderr
index 65b507b88..65b507b88 100644
--- a/src/test/ui/intrinsics/const-eval-select-stability.stderr
+++ b/tests/ui/intrinsics/const-eval-select-stability.stderr
diff --git a/src/test/ui/intrinsics/const-eval-select-x86_64.rs b/tests/ui/intrinsics/const-eval-select-x86_64.rs
index f3924acf0..f3924acf0 100644
--- a/src/test/ui/intrinsics/const-eval-select-x86_64.rs
+++ b/tests/ui/intrinsics/const-eval-select-x86_64.rs
diff --git a/src/test/ui/intrinsics/const-eval-select.rs b/tests/ui/intrinsics/const-eval-select.rs
index 9ff20d3fb..9ff20d3fb 100644
--- a/src/test/ui/intrinsics/const-eval-select.rs
+++ b/tests/ui/intrinsics/const-eval-select.rs
diff --git a/src/test/ui/intrinsics/intrinsic-alignment.rs b/tests/ui/intrinsics/intrinsic-alignment.rs
index c8b1ff1db..c8b1ff1db 100644
--- a/src/test/ui/intrinsics/intrinsic-alignment.rs
+++ b/tests/ui/intrinsics/intrinsic-alignment.rs
diff --git a/src/test/ui/intrinsics/intrinsic-assume.rs b/tests/ui/intrinsics/intrinsic-assume.rs
index 3c9d70cb5..3c9d70cb5 100644
--- a/src/test/ui/intrinsics/intrinsic-assume.rs
+++ b/tests/ui/intrinsics/intrinsic-assume.rs
diff --git a/src/test/ui/intrinsics/intrinsic-atomics-cc.rs b/tests/ui/intrinsics/intrinsic-atomics-cc.rs
index ce3fa7b0c..ce3fa7b0c 100644
--- a/src/test/ui/intrinsics/intrinsic-atomics-cc.rs
+++ b/tests/ui/intrinsics/intrinsic-atomics-cc.rs
diff --git a/src/test/ui/intrinsics/intrinsic-atomics.rs b/tests/ui/intrinsics/intrinsic-atomics.rs
index b17f4347b..b17f4347b 100644
--- a/src/test/ui/intrinsics/intrinsic-atomics.rs
+++ b/tests/ui/intrinsics/intrinsic-atomics.rs
diff --git a/src/test/ui/intrinsics/intrinsic-nearby.rs b/tests/ui/intrinsics/intrinsic-nearby.rs
index 7b1d1eeaa..7b1d1eeaa 100644
--- a/src/test/ui/intrinsics/intrinsic-nearby.rs
+++ b/tests/ui/intrinsics/intrinsic-nearby.rs
diff --git a/src/test/ui/intrinsics/intrinsic-raw_eq-const-padding.rs b/tests/ui/intrinsics/intrinsic-raw_eq-const-padding.rs
index a93d777d2..a93d777d2 100644
--- a/src/test/ui/intrinsics/intrinsic-raw_eq-const-padding.rs
+++ b/tests/ui/intrinsics/intrinsic-raw_eq-const-padding.rs
diff --git a/src/test/ui/intrinsics/intrinsic-raw_eq-const-padding.stderr b/tests/ui/intrinsics/intrinsic-raw_eq-const-padding.stderr
index 56d5a4857..56d5a4857 100644
--- a/src/test/ui/intrinsics/intrinsic-raw_eq-const-padding.stderr
+++ b/tests/ui/intrinsics/intrinsic-raw_eq-const-padding.stderr
diff --git a/src/test/ui/intrinsics/intrinsic-raw_eq-const.rs b/tests/ui/intrinsics/intrinsic-raw_eq-const.rs
index 32841f531..32841f531 100644
--- a/src/test/ui/intrinsics/intrinsic-raw_eq-const.rs
+++ b/tests/ui/intrinsics/intrinsic-raw_eq-const.rs
diff --git a/src/test/ui/intrinsics/intrinsic-unreachable.rs b/tests/ui/intrinsics/intrinsic-unreachable.rs
index da1a32d58..73dd71d48 100644
--- a/src/test/ui/intrinsics/intrinsic-unreachable.rs
+++ b/tests/ui/intrinsics/intrinsic-unreachable.rs
@@ -3,7 +3,7 @@
 
 use std::intrinsics;
 
-// See also src/test/run-make/intrinsic-unreachable.
+// See also tests/run-make/intrinsic-unreachable.
 
 unsafe fn f(x: usize) -> usize {
     match x {
diff --git a/src/test/ui/intrinsics/intrinsic-volatile.rs b/tests/ui/intrinsics/intrinsic-volatile.rs
index 7b2c825a2..7b2c825a2 100644
--- a/src/test/ui/intrinsics/intrinsic-volatile.rs
+++ b/tests/ui/intrinsics/intrinsic-volatile.rs
diff --git a/src/test/ui/intrinsics/intrinsics-integer.rs b/tests/ui/intrinsics/intrinsics-integer.rs
index 88bf42b68..88bf42b68 100644
--- a/src/test/ui/intrinsics/intrinsics-integer.rs
+++ b/tests/ui/intrinsics/intrinsics-integer.rs
diff --git a/src/test/ui/intrinsics/intrinsics-math.rs b/tests/ui/intrinsics/intrinsics-math.rs
index aea9fde69..aea9fde69 100644
--- a/src/test/ui/intrinsics/intrinsics-math.rs
+++ b/tests/ui/intrinsics/intrinsics-math.rs
diff --git a/src/test/ui/intrinsics/issue-28575.mir.stderr b/tests/ui/intrinsics/issue-28575.mir.stderr
index c42498390..c42498390 100644
--- a/src/test/ui/intrinsics/issue-28575.mir.stderr
+++ b/tests/ui/intrinsics/issue-28575.mir.stderr
diff --git a/src/test/ui/intrinsics/issue-28575.rs b/tests/ui/intrinsics/issue-28575.rs
index 410f664f8..410f664f8 100644
--- a/src/test/ui/intrinsics/issue-28575.rs
+++ b/tests/ui/intrinsics/issue-28575.rs
diff --git a/src/test/ui/intrinsics/issue-28575.thir.stderr b/tests/ui/intrinsics/issue-28575.thir.stderr
index c42498390..c42498390 100644
--- a/src/test/ui/intrinsics/issue-28575.thir.stderr
+++ b/tests/ui/intrinsics/issue-28575.thir.stderr
diff --git a/src/test/ui/intrinsics/issue-84297-reifying-copy.rs b/tests/ui/intrinsics/issue-84297-reifying-copy.rs
index 08ba9ce7e..08ba9ce7e 100644
--- a/src/test/ui/intrinsics/issue-84297-reifying-copy.rs
+++ b/tests/ui/intrinsics/issue-84297-reifying-copy.rs
diff --git a/src/test/ui/intrinsics/non-integer-atomic.rs b/tests/ui/intrinsics/non-integer-atomic.rs
index 85ea81ba6..85ea81ba6 100644
--- a/src/test/ui/intrinsics/non-integer-atomic.rs
+++ b/tests/ui/intrinsics/non-integer-atomic.rs
diff --git a/src/test/ui/intrinsics/non-integer-atomic.stderr b/tests/ui/intrinsics/non-integer-atomic.stderr
index 32791a8e8..32791a8e8 100644
--- a/src/test/ui/intrinsics/non-integer-atomic.stderr
+++ b/tests/ui/intrinsics/non-integer-atomic.stderr
diff --git a/src/test/ui/intrinsics/panic-uninitialized-zeroed.rs b/tests/ui/intrinsics/panic-uninitialized-zeroed.rs
index ec3860a32..1a0104b85 100644
--- a/src/test/ui/intrinsics/panic-uninitialized-zeroed.rs
+++ b/tests/ui/intrinsics/panic-uninitialized-zeroed.rs
@@ -1,9 +1,9 @@
 // run-pass
-// needs-unwind
-// revisions: mir thir strict
-// [thir]compile-flags: -Zthir-unsafeck
+// revisions: default strict
 // [strict]compile-flags: -Zstrict-init-checks
 // ignore-tidy-linelength
+// ignore-emscripten spawning processes is not supported
+// ignore-sgx no processes
 
 // This test checks panic emitted from `mem::{uninitialized,zeroed}`.
 
@@ -12,7 +12,6 @@
 
 use std::{
     mem::{self, MaybeUninit, ManuallyDrop},
-    panic,
     ptr::NonNull,
     num,
 };
@@ -70,21 +69,42 @@ enum ZeroIsValid {
 }
 
 #[track_caller]
-fn test_panic_msg<T>(op: impl (FnOnce() -> T) + panic::UnwindSafe, msg: &str) {
-    let err = panic::catch_unwind(op).err();
-    assert_eq!(
-        err.as_ref().and_then(|a| a.downcast_ref::<&str>()),
-        Some(&msg)
-    );
+fn test_panic_msg<T, F: (FnOnce() -> T) + 'static>(op: F, msg: &str) {
+    use std::{panic, env, process};
+
+    // The tricky part is that we can't just run `op`, as that would *abort* the process.
+    // So instead, we reinvoke this process with the caller location as argument.
+    // For the purpose of this test, the line number is unique enough.
+    // If we are running in such a re-invocation, we skip all the tests *except* for the one with that type name.
+    let our_loc = panic::Location::caller().line().to_string();
+    let mut args = env::args();
+    let this = args.next().unwrap();
+    if let Some(loc) = args.next() {
+        if loc == our_loc {
+            op();
+            panic!("we did not abort");
+        } else {
+            // Nothing, we are running another test.
+        }
+    } else {
+        // Invoke new process for actual test, and check result.
+        let mut cmd = process::Command::new(this);
+        cmd.arg(our_loc);
+        let res = cmd.output().unwrap();
+        assert!(!res.status.success(), "test did not fail");
+        let stderr = String::from_utf8_lossy(&res.stderr);
+        assert!(stderr.contains(msg), "test did not contain expected output: looking for {:?}, output:\n{}", msg, stderr);
+    }
 }
 
 #[track_caller]
-fn test_panic_msg_only_if_strict<T>(op: impl (FnOnce() -> T) + panic::UnwindSafe, msg: &str) {
-    let err = panic::catch_unwind(op).err();
-    assert_eq!(
-        err.as_ref().and_then(|a| a.downcast_ref::<&str>()),
-        if cfg!(strict) { Some(&msg) } else { None },
-    );
+fn test_panic_msg_only_if_strict<T>(op: impl (FnOnce() -> T) + 'static, msg: &str) {
+    if !cfg!(strict) {
+        // Just run it.
+        op();
+    } else {
+        test_panic_msg(op, msg);
+    }
 }
 
 fn main() {
diff --git a/src/test/ui/intrinsics/safe-intrinsic-mismatch.rs b/tests/ui/intrinsics/safe-intrinsic-mismatch.rs
index 50e12eaeb..50e12eaeb 100644
--- a/src/test/ui/intrinsics/safe-intrinsic-mismatch.rs
+++ b/tests/ui/intrinsics/safe-intrinsic-mismatch.rs
diff --git a/src/test/ui/intrinsics/safe-intrinsic-mismatch.stderr b/tests/ui/intrinsics/safe-intrinsic-mismatch.stderr
index 0c2f3be49..0c2f3be49 100644
--- a/src/test/ui/intrinsics/safe-intrinsic-mismatch.stderr
+++ b/tests/ui/intrinsics/safe-intrinsic-mismatch.stderr
diff --git a/src/test/ui/intrinsics/unchecked_math_unsafe.mir.stderr b/tests/ui/intrinsics/unchecked_math_unsafe.mir.stderr
index 26b2f9f27..26b2f9f27 100644
--- a/src/test/ui/intrinsics/unchecked_math_unsafe.mir.stderr
+++ b/tests/ui/intrinsics/unchecked_math_unsafe.mir.stderr
diff --git a/src/test/ui/intrinsics/unchecked_math_unsafe.rs b/tests/ui/intrinsics/unchecked_math_unsafe.rs
index 98d3a11ad..98d3a11ad 100644
--- a/src/test/ui/intrinsics/unchecked_math_unsafe.rs
+++ b/tests/ui/intrinsics/unchecked_math_unsafe.rs
diff --git a/src/test/ui/intrinsics/unchecked_math_unsafe.thir.stderr b/tests/ui/intrinsics/unchecked_math_unsafe.thir.stderr
index 5c3728ccd..5c3728ccd 100644
--- a/src/test/ui/intrinsics/unchecked_math_unsafe.thir.stderr
+++ b/tests/ui/intrinsics/unchecked_math_unsafe.thir.stderr
diff --git a/src/test/ui/intrinsics/unchecked_math_unstable.rs b/tests/ui/intrinsics/unchecked_math_unstable.rs
index 8869063d1..8869063d1 100644
--- a/src/test/ui/intrinsics/unchecked_math_unstable.rs
+++ b/tests/ui/intrinsics/unchecked_math_unstable.rs
diff --git a/src/test/ui/intrinsics/unchecked_math_unstable.stderr b/tests/ui/intrinsics/unchecked_math_unstable.stderr
index a43aa16ae..a43aa16ae 100644
--- a/src/test/ui/intrinsics/unchecked_math_unstable.stderr
+++ b/tests/ui/intrinsics/unchecked_math_unstable.stderr
diff --git a/src/test/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr
index d0e8d4719..d0e8d4719 100644
--- a/src/test/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr
+++ b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr
diff --git a/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADTARGET.stderr b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADTARGET.stderr
new file mode 100644
index 000000000..52a591902
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADTARGET.stderr
@@ -0,0 +1,4 @@
+error: `-Zbranch-protection` is only supported on aarch64
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs
index 4bc4919bc..1d7ec5cba 100644
--- a/src/test/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs
+++ b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs
@@ -3,7 +3,7 @@
 // [BADFLAGS] check-fail
 // [BADFLAGS] needs-llvm-components: aarch64
 // [BADTARGET] compile-flags: --target=x86_64-unknown-linux-gnu -Zbranch-protection=bti
-// [BADTARGET] build-fail
+// [BADTARGET] check-fail
 // [BADTARGET] needs-llvm-components: x86
 
 #![crate_type = "lib"]
diff --git a/src/test/ui/invalid-compile-flags/codegen-option-without-group.rs b/tests/ui/invalid-compile-flags/codegen-option-without-group.rs
index 7bbf47a38..7bbf47a38 100644
--- a/src/test/ui/invalid-compile-flags/codegen-option-without-group.rs
+++ b/tests/ui/invalid-compile-flags/codegen-option-without-group.rs
diff --git a/src/test/ui/invalid-compile-flags/codegen-option-without-group.stderr b/tests/ui/invalid-compile-flags/codegen-option-without-group.stderr
index c5a0c29ca..c5a0c29ca 100644
--- a/src/test/ui/invalid-compile-flags/codegen-option-without-group.stderr
+++ b/tests/ui/invalid-compile-flags/codegen-option-without-group.stderr
diff --git a/src/test/ui/invalid-compile-flags/debug-option-without-group.rs b/tests/ui/invalid-compile-flags/debug-option-without-group.rs
index 86e40c178..86e40c178 100644
--- a/src/test/ui/invalid-compile-flags/debug-option-without-group.rs
+++ b/tests/ui/invalid-compile-flags/debug-option-without-group.rs
diff --git a/src/test/ui/invalid-compile-flags/debug-option-without-group.stderr b/tests/ui/invalid-compile-flags/debug-option-without-group.stderr
index 0e57e31ad..0e57e31ad 100644
--- a/src/test/ui/invalid-compile-flags/debug-option-without-group.stderr
+++ b/tests/ui/invalid-compile-flags/debug-option-without-group.stderr
diff --git a/src/test/ui/invalid-module-declaration/auxiliary/foo/bar.rs b/tests/ui/invalid-module-declaration/auxiliary/foo/bar.rs
index bcfd7dc0a..bcfd7dc0a 100644
--- a/src/test/ui/invalid-module-declaration/auxiliary/foo/bar.rs
+++ b/tests/ui/invalid-module-declaration/auxiliary/foo/bar.rs
diff --git a/src/test/ui/invalid-module-declaration/auxiliary/foo/mod.rs b/tests/ui/invalid-module-declaration/auxiliary/foo/mod.rs
index 46f285ca4..46f285ca4 100644
--- a/src/test/ui/invalid-module-declaration/auxiliary/foo/mod.rs
+++ b/tests/ui/invalid-module-declaration/auxiliary/foo/mod.rs
diff --git a/src/test/ui/invalid-module-declaration/invalid-module-declaration.rs b/tests/ui/invalid-module-declaration/invalid-module-declaration.rs
index 254d810d7..254d810d7 100644
--- a/src/test/ui/invalid-module-declaration/invalid-module-declaration.rs
+++ b/tests/ui/invalid-module-declaration/invalid-module-declaration.rs
diff --git a/src/test/ui/invalid-module-declaration/invalid-module-declaration.stderr b/tests/ui/invalid-module-declaration/invalid-module-declaration.stderr
index 7bc8efd7e..7bc8efd7e 100644
--- a/src/test/ui/invalid-module-declaration/invalid-module-declaration.stderr
+++ b/tests/ui/invalid-module-declaration/invalid-module-declaration.stderr
diff --git a/src/test/ui/invalid-self-argument/bare-fn-start.rs b/tests/ui/invalid-self-argument/bare-fn-start.rs
index 7c580bc5a..7c580bc5a 100644
--- a/src/test/ui/invalid-self-argument/bare-fn-start.rs
+++ b/tests/ui/invalid-self-argument/bare-fn-start.rs
diff --git a/src/test/ui/invalid-self-argument/bare-fn-start.stderr b/tests/ui/invalid-self-argument/bare-fn-start.stderr
index 37753e61f..37753e61f 100644
--- a/src/test/ui/invalid-self-argument/bare-fn-start.stderr
+++ b/tests/ui/invalid-self-argument/bare-fn-start.stderr
diff --git a/src/test/ui/invalid-self-argument/bare-fn.rs b/tests/ui/invalid-self-argument/bare-fn.rs
index 342bdc31a..342bdc31a 100644
--- a/src/test/ui/invalid-self-argument/bare-fn.rs
+++ b/tests/ui/invalid-self-argument/bare-fn.rs
diff --git a/src/test/ui/invalid-self-argument/bare-fn.stderr b/tests/ui/invalid-self-argument/bare-fn.stderr
index ff2217b5e..ff2217b5e 100644
--- a/src/test/ui/invalid-self-argument/bare-fn.stderr
+++ b/tests/ui/invalid-self-argument/bare-fn.stderr
diff --git a/src/test/ui/invalid-self-argument/trait-fn.rs b/tests/ui/invalid-self-argument/trait-fn.rs
index 5ccea5895..5ccea5895 100644
--- a/src/test/ui/invalid-self-argument/trait-fn.rs
+++ b/tests/ui/invalid-self-argument/trait-fn.rs
diff --git a/src/test/ui/invalid-self-argument/trait-fn.stderr b/tests/ui/invalid-self-argument/trait-fn.stderr
index b9887af96..b9887af96 100644
--- a/src/test/ui/invalid-self-argument/trait-fn.stderr
+++ b/tests/ui/invalid-self-argument/trait-fn.stderr
diff --git a/src/test/ui/invalid/invalid-crate-type-macro.rs b/tests/ui/invalid/invalid-crate-type-macro.rs
index 9ba5e79ba..9ba5e79ba 100644
--- a/src/test/ui/invalid/invalid-crate-type-macro.rs
+++ b/tests/ui/invalid/invalid-crate-type-macro.rs
diff --git a/src/test/ui/invalid/invalid-crate-type-macro.stderr b/tests/ui/invalid/invalid-crate-type-macro.stderr
index c196d4278..c196d4278 100644
--- a/src/test/ui/invalid/invalid-crate-type-macro.stderr
+++ b/tests/ui/invalid/invalid-crate-type-macro.stderr
diff --git a/src/test/ui/invalid/invalid-crate-type.rs b/tests/ui/invalid/invalid-crate-type.rs
index 6c44c3b4f..6c44c3b4f 100644
--- a/src/test/ui/invalid/invalid-crate-type.rs
+++ b/tests/ui/invalid/invalid-crate-type.rs
diff --git a/src/test/ui/invalid/invalid-crate-type.stderr b/tests/ui/invalid/invalid-crate-type.stderr
index 59d5d7bc9..59d5d7bc9 100644
--- a/src/test/ui/invalid/invalid-crate-type.stderr
+++ b/tests/ui/invalid/invalid-crate-type.stderr
diff --git a/src/test/ui/invalid/invalid-debugger-visualizer-option.rs b/tests/ui/invalid/invalid-debugger-visualizer-option.rs
index 5645a30cc..5645a30cc 100644
--- a/src/test/ui/invalid/invalid-debugger-visualizer-option.rs
+++ b/tests/ui/invalid/invalid-debugger-visualizer-option.rs
diff --git a/src/test/ui/invalid/invalid-debugger-visualizer-option.stderr b/tests/ui/invalid/invalid-debugger-visualizer-option.stderr
index afb8d16ee..afb8d16ee 100644
--- a/src/test/ui/invalid/invalid-debugger-visualizer-option.stderr
+++ b/tests/ui/invalid/invalid-debugger-visualizer-option.stderr
diff --git a/src/test/ui/invalid/invalid-debugger-visualizer-target.rs b/tests/ui/invalid/invalid-debugger-visualizer-target.rs
index f0aba6a75..f0aba6a75 100644
--- a/src/test/ui/invalid/invalid-debugger-visualizer-target.rs
+++ b/tests/ui/invalid/invalid-debugger-visualizer-target.rs
diff --git a/src/test/ui/invalid/invalid-debugger-visualizer-target.stderr b/tests/ui/invalid/invalid-debugger-visualizer-target.stderr
index 3555bbb16..3555bbb16 100644
--- a/src/test/ui/invalid/invalid-debugger-visualizer-target.stderr
+++ b/tests/ui/invalid/invalid-debugger-visualizer-target.stderr
diff --git a/src/test/ui/invalid/invalid-inline.rs b/tests/ui/invalid/invalid-inline.rs
index 2501b1e23..2501b1e23 100644
--- a/src/test/ui/invalid/invalid-inline.rs
+++ b/tests/ui/invalid/invalid-inline.rs
diff --git a/src/test/ui/invalid/invalid-inline.stderr b/tests/ui/invalid/invalid-inline.stderr
index 7edbf936b..7edbf936b 100644
--- a/src/test/ui/invalid/invalid-inline.stderr
+++ b/tests/ui/invalid/invalid-inline.stderr
diff --git a/src/test/ui/invalid/invalid-llvm-passes.rs b/tests/ui/invalid/invalid-llvm-passes.rs
index ee28f5eb6..ee28f5eb6 100644
--- a/src/test/ui/invalid/invalid-llvm-passes.rs
+++ b/tests/ui/invalid/invalid-llvm-passes.rs
diff --git a/src/test/ui/invalid/invalid-llvm-passes.stderr b/tests/ui/invalid/invalid-llvm-passes.stderr
index ae1f85e41..ae1f85e41 100644
--- a/src/test/ui/invalid/invalid-llvm-passes.stderr
+++ b/tests/ui/invalid/invalid-llvm-passes.stderr
diff --git a/src/test/ui/invalid/invalid-macro-matcher.rs b/tests/ui/invalid/invalid-macro-matcher.rs
index ff79d4e1a..ff79d4e1a 100644
--- a/src/test/ui/invalid/invalid-macro-matcher.rs
+++ b/tests/ui/invalid/invalid-macro-matcher.rs
diff --git a/src/test/ui/invalid/invalid-macro-matcher.stderr b/tests/ui/invalid/invalid-macro-matcher.stderr
index dbe025b73..dbe025b73 100644
--- a/src/test/ui/invalid/invalid-macro-matcher.stderr
+++ b/tests/ui/invalid/invalid-macro-matcher.stderr
diff --git a/src/test/ui/invalid/invalid-no-sanitize.rs b/tests/ui/invalid/invalid-no-sanitize.rs
index b52e3cc83..b52e3cc83 100644
--- a/src/test/ui/invalid/invalid-no-sanitize.rs
+++ b/tests/ui/invalid/invalid-no-sanitize.rs
diff --git a/tests/ui/invalid/invalid-no-sanitize.stderr b/tests/ui/invalid/invalid-no-sanitize.stderr
new file mode 100644
index 000000000..460003495
--- /dev/null
+++ b/tests/ui/invalid/invalid-no-sanitize.stderr
@@ -0,0 +1,10 @@
+error: invalid argument for `no_sanitize`
+  --> $DIR/invalid-no-sanitize.rs:3:15
+   |
+LL | #[no_sanitize(brontosaurus)]
+   |               ^^^^^^^^^^^^
+   |
+   = note: expected one of: `address`, `cfi`, `hwaddress`, `kcfi`, `memory`, `memtag`, `shadow-call-stack`, or `thread`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/invalid/invalid-path-in-const.rs b/tests/ui/invalid/invalid-path-in-const.rs
index 51eb86072..51eb86072 100644
--- a/src/test/ui/invalid/invalid-path-in-const.rs
+++ b/tests/ui/invalid/invalid-path-in-const.rs
diff --git a/src/test/ui/invalid/invalid-path-in-const.stderr b/tests/ui/invalid/invalid-path-in-const.stderr
index a14ab7d85..a14ab7d85 100644
--- a/src/test/ui/invalid/invalid-path-in-const.stderr
+++ b/tests/ui/invalid/invalid-path-in-const.stderr
diff --git a/src/test/ui/invalid/invalid-plugin-attr.rs b/tests/ui/invalid/invalid-plugin-attr.rs
index 3080af245..3080af245 100644
--- a/src/test/ui/invalid/invalid-plugin-attr.rs
+++ b/tests/ui/invalid/invalid-plugin-attr.rs
diff --git a/src/test/ui/invalid/invalid-plugin-attr.stderr b/tests/ui/invalid/invalid-plugin-attr.stderr
index d3882d33f..d3882d33f 100644
--- a/src/test/ui/invalid/invalid-plugin-attr.stderr
+++ b/tests/ui/invalid/invalid-plugin-attr.stderr
diff --git a/src/test/ui/invalid/invalid-rustc_legacy_const_generics-arguments.rs b/tests/ui/invalid/invalid-rustc_legacy_const_generics-arguments.rs
index 6eabd9b10..6eabd9b10 100644
--- a/src/test/ui/invalid/invalid-rustc_legacy_const_generics-arguments.rs
+++ b/tests/ui/invalid/invalid-rustc_legacy_const_generics-arguments.rs
diff --git a/src/test/ui/invalid/invalid-rustc_legacy_const_generics-arguments.stderr b/tests/ui/invalid/invalid-rustc_legacy_const_generics-arguments.stderr
index 1ced1433f..1ced1433f 100644
--- a/src/test/ui/invalid/invalid-rustc_legacy_const_generics-arguments.stderr
+++ b/tests/ui/invalid/invalid-rustc_legacy_const_generics-arguments.stderr
diff --git a/src/test/ui/invalid/invalid_rustc_layout_scalar_valid_range.rs b/tests/ui/invalid/invalid_rustc_layout_scalar_valid_range.rs
index 06cf8c0f0..06cf8c0f0 100644
--- a/src/test/ui/invalid/invalid_rustc_layout_scalar_valid_range.rs
+++ b/tests/ui/invalid/invalid_rustc_layout_scalar_valid_range.rs
diff --git a/src/test/ui/invalid/invalid_rustc_layout_scalar_valid_range.stderr b/tests/ui/invalid/invalid_rustc_layout_scalar_valid_range.stderr
index 7879e7358..7879e7358 100644
--- a/src/test/ui/invalid/invalid_rustc_layout_scalar_valid_range.stderr
+++ b/tests/ui/invalid/invalid_rustc_layout_scalar_valid_range.stderr
diff --git a/src/test/ui/invalid_crate_type_syntax.rs b/tests/ui/invalid_crate_type_syntax.rs
index 621587af3..621587af3 100644
--- a/src/test/ui/invalid_crate_type_syntax.rs
+++ b/tests/ui/invalid_crate_type_syntax.rs
diff --git a/src/test/ui/invalid_crate_type_syntax.stderr b/tests/ui/invalid_crate_type_syntax.stderr
index 4072a2fa1..4072a2fa1 100644
--- a/src/test/ui/invalid_crate_type_syntax.stderr
+++ b/tests/ui/invalid_crate_type_syntax.stderr
diff --git a/src/test/ui/invalid_dispatch_from_dyn_impls.rs b/tests/ui/invalid_dispatch_from_dyn_impls.rs
index b7bc766fb..b7bc766fb 100644
--- a/src/test/ui/invalid_dispatch_from_dyn_impls.rs
+++ b/tests/ui/invalid_dispatch_from_dyn_impls.rs
diff --git a/src/test/ui/invalid_dispatch_from_dyn_impls.stderr b/tests/ui/invalid_dispatch_from_dyn_impls.stderr
index b5b32d2f0..b5b32d2f0 100644
--- a/src/test/ui/invalid_dispatch_from_dyn_impls.stderr
+++ b/tests/ui/invalid_dispatch_from_dyn_impls.stderr
diff --git a/src/test/ui/issue-76387-llvm-miscompile.rs b/tests/ui/issue-76387-llvm-miscompile.rs
index a9b4686c9..a9b4686c9 100644
--- a/src/test/ui/issue-76387-llvm-miscompile.rs
+++ b/tests/ui/issue-76387-llvm-miscompile.rs
diff --git a/src/test/ui/issue-94866.rs b/tests/ui/issue-94866.rs
index c42034879..c42034879 100644
--- a/src/test/ui/issue-94866.rs
+++ b/tests/ui/issue-94866.rs
diff --git a/src/test/ui/issue-94866.stderr b/tests/ui/issue-94866.stderr
index b3c17ce89..b3c17ce89 100644
--- a/src/test/ui/issue-94866.stderr
+++ b/tests/ui/issue-94866.stderr
diff --git a/src/test/ui/issues-71798.rs b/tests/ui/issues-71798.rs
index 14b6c0f35..14b6c0f35 100644
--- a/src/test/ui/issues-71798.rs
+++ b/tests/ui/issues-71798.rs
diff --git a/src/test/ui/issues-71798.stderr b/tests/ui/issues-71798.stderr
index 829d0a02e..829d0a02e 100644
--- a/src/test/ui/issues-71798.stderr
+++ b/tests/ui/issues-71798.stderr
diff --git a/src/test/ui/issues/auxiliary/cgu_test.rs b/tests/ui/issues/auxiliary/cgu_test.rs
index 5ed973164..5ed973164 100644
--- a/src/test/ui/issues/auxiliary/cgu_test.rs
+++ b/tests/ui/issues/auxiliary/cgu_test.rs
diff --git a/src/test/ui/issues/auxiliary/cgu_test_a.rs b/tests/ui/issues/auxiliary/cgu_test_a.rs
index a3dcd9201..a3dcd9201 100644
--- a/src/test/ui/issues/auxiliary/cgu_test_a.rs
+++ b/tests/ui/issues/auxiliary/cgu_test_a.rs
diff --git a/src/test/ui/issues/auxiliary/cgu_test_b.rs b/tests/ui/issues/auxiliary/cgu_test_b.rs
index a3dcd9201..a3dcd9201 100644
--- a/src/test/ui/issues/auxiliary/cgu_test_b.rs
+++ b/tests/ui/issues/auxiliary/cgu_test_b.rs
diff --git a/src/test/ui/issues/auxiliary/i8.rs b/tests/ui/issues/auxiliary/i8.rs
index 889a9c4eb..889a9c4eb 100644
--- a/src/test/ui/issues/auxiliary/i8.rs
+++ b/tests/ui/issues/auxiliary/i8.rs
diff --git a/src/test/ui/issues/auxiliary/iss.rs b/tests/ui/issues/auxiliary/iss.rs
index cf32f6c2d..cf32f6c2d 100644
--- a/src/test/ui/issues/auxiliary/iss.rs
+++ b/tests/ui/issues/auxiliary/iss.rs
diff --git a/src/test/ui/issues/auxiliary/issue-11224.rs b/tests/ui/issues/auxiliary/issue-11224.rs
index 63543621a..63543621a 100644
--- a/src/test/ui/issues/auxiliary/issue-11224.rs
+++ b/tests/ui/issues/auxiliary/issue-11224.rs
diff --git a/src/test/ui/issues/auxiliary/issue-11508.rs b/tests/ui/issues/auxiliary/issue-11508.rs
index 16bfc65c2..16bfc65c2 100644
--- a/src/test/ui/issues/auxiliary/issue-11508.rs
+++ b/tests/ui/issues/auxiliary/issue-11508.rs
diff --git a/src/test/ui/issues/auxiliary/issue-11529.rs b/tests/ui/issues/auxiliary/issue-11529.rs
index dd3ef4387..dd3ef4387 100644
--- a/src/test/ui/issues/auxiliary/issue-11529.rs
+++ b/tests/ui/issues/auxiliary/issue-11529.rs
diff --git a/src/test/ui/issues/auxiliary/issue-11680.rs b/tests/ui/issues/auxiliary/issue-11680.rs
index 74abbf0bf..74abbf0bf 100644
--- a/src/test/ui/issues/auxiliary/issue-11680.rs
+++ b/tests/ui/issues/auxiliary/issue-11680.rs
diff --git a/src/test/ui/issues/auxiliary/issue-12133-dylib.rs b/tests/ui/issues/auxiliary/issue-12133-dylib.rs
index 8bd2b3353..8bd2b3353 100644
--- a/src/test/ui/issues/auxiliary/issue-12133-dylib.rs
+++ b/tests/ui/issues/auxiliary/issue-12133-dylib.rs
diff --git a/src/test/ui/issues/auxiliary/issue-12133-dylib2.rs b/tests/ui/issues/auxiliary/issue-12133-dylib2.rs
index 30de74006..30de74006 100644
--- a/src/test/ui/issues/auxiliary/issue-12133-dylib2.rs
+++ b/tests/ui/issues/auxiliary/issue-12133-dylib2.rs
diff --git a/src/test/ui/issues/auxiliary/issue-12133-rlib.rs b/tests/ui/issues/auxiliary/issue-12133-rlib.rs
index 39c261e11..39c261e11 100644
--- a/src/test/ui/issues/auxiliary/issue-12133-rlib.rs
+++ b/tests/ui/issues/auxiliary/issue-12133-rlib.rs
diff --git a/src/test/ui/issues/auxiliary/issue-12612-1.rs b/tests/ui/issues/auxiliary/issue-12612-1.rs
index 01f5a784b..01f5a784b 100644
--- a/src/test/ui/issues/auxiliary/issue-12612-1.rs
+++ b/tests/ui/issues/auxiliary/issue-12612-1.rs
diff --git a/src/test/ui/issues/auxiliary/issue-12612-2.rs b/tests/ui/issues/auxiliary/issue-12612-2.rs
index 2c7247871..2c7247871 100644
--- a/src/test/ui/issues/auxiliary/issue-12612-2.rs
+++ b/tests/ui/issues/auxiliary/issue-12612-2.rs
diff --git a/src/test/ui/issues/auxiliary/issue-12660-aux.rs b/tests/ui/issues/auxiliary/issue-12660-aux.rs
index 6dea8662d..6dea8662d 100644
--- a/src/test/ui/issues/auxiliary/issue-12660-aux.rs
+++ b/tests/ui/issues/auxiliary/issue-12660-aux.rs
diff --git a/src/test/ui/issues/auxiliary/issue-13507.rs b/tests/ui/issues/auxiliary/issue-13507.rs
index c91013043..c91013043 100644
--- a/src/test/ui/issues/auxiliary/issue-13507.rs
+++ b/tests/ui/issues/auxiliary/issue-13507.rs
diff --git a/src/test/ui/issues/auxiliary/issue-13620-1.rs b/tests/ui/issues/auxiliary/issue-13620-1.rs
index a77aa5a71..a77aa5a71 100644
--- a/src/test/ui/issues/auxiliary/issue-13620-1.rs
+++ b/tests/ui/issues/auxiliary/issue-13620-1.rs
diff --git a/src/test/ui/issues/auxiliary/issue-13620-2.rs b/tests/ui/issues/auxiliary/issue-13620-2.rs
index 7efd24407..7efd24407 100644
--- a/src/test/ui/issues/auxiliary/issue-13620-2.rs
+++ b/tests/ui/issues/auxiliary/issue-13620-2.rs
diff --git a/src/test/ui/issues/auxiliary/issue-13872-1.rs b/tests/ui/issues/auxiliary/issue-13872-1.rs
index fa9258834..fa9258834 100644
--- a/src/test/ui/issues/auxiliary/issue-13872-1.rs
+++ b/tests/ui/issues/auxiliary/issue-13872-1.rs
diff --git a/src/test/ui/issues/auxiliary/issue-13872-2.rs b/tests/ui/issues/auxiliary/issue-13872-2.rs
index 8c64f16e3..8c64f16e3 100644
--- a/src/test/ui/issues/auxiliary/issue-13872-2.rs
+++ b/tests/ui/issues/auxiliary/issue-13872-2.rs
diff --git a/src/test/ui/issues/auxiliary/issue-13872-3.rs b/tests/ui/issues/auxiliary/issue-13872-3.rs
index d31d52eb8..d31d52eb8 100644
--- a/src/test/ui/issues/auxiliary/issue-13872-3.rs
+++ b/tests/ui/issues/auxiliary/issue-13872-3.rs
diff --git a/src/test/ui/issues/auxiliary/issue-14344-1.rs b/tests/ui/issues/auxiliary/issue-14344-1.rs
index 954a1e554..954a1e554 100644
--- a/src/test/ui/issues/auxiliary/issue-14344-1.rs
+++ b/tests/ui/issues/auxiliary/issue-14344-1.rs
diff --git a/src/test/ui/issues/auxiliary/issue-14344-2.rs b/tests/ui/issues/auxiliary/issue-14344-2.rs
index c47b8c0ea..c47b8c0ea 100644
--- a/src/test/ui/issues/auxiliary/issue-14344-2.rs
+++ b/tests/ui/issues/auxiliary/issue-14344-2.rs
diff --git a/src/test/ui/issues/auxiliary/issue-14421.rs b/tests/ui/issues/auxiliary/issue-14421.rs
index 5fe4b24cf..5fe4b24cf 100644
--- a/src/test/ui/issues/auxiliary/issue-14421.rs
+++ b/tests/ui/issues/auxiliary/issue-14421.rs
diff --git a/src/test/ui/issues/auxiliary/issue-14422.rs b/tests/ui/issues/auxiliary/issue-14422.rs
index a6026c1d0..a6026c1d0 100644
--- a/src/test/ui/issues/auxiliary/issue-14422.rs
+++ b/tests/ui/issues/auxiliary/issue-14422.rs
diff --git a/src/test/ui/issues/auxiliary/issue-15562.rs b/tests/ui/issues/auxiliary/issue-15562.rs
index 6ff26b47e..6ff26b47e 100644
--- a/src/test/ui/issues/auxiliary/issue-15562.rs
+++ b/tests/ui/issues/auxiliary/issue-15562.rs
diff --git a/src/test/ui/issues/auxiliary/issue-16643.rs b/tests/ui/issues/auxiliary/issue-16643.rs
index 7808e0119..7808e0119 100644
--- a/src/test/ui/issues/auxiliary/issue-16643.rs
+++ b/tests/ui/issues/auxiliary/issue-16643.rs
diff --git a/src/test/ui/issues/auxiliary/issue-16725.rs b/tests/ui/issues/auxiliary/issue-16725.rs
index 9f9abd575..9f9abd575 100644
--- a/src/test/ui/issues/auxiliary/issue-16725.rs
+++ b/tests/ui/issues/auxiliary/issue-16725.rs
diff --git a/src/test/ui/issues/auxiliary/issue-17662.rs b/tests/ui/issues/auxiliary/issue-17662.rs
index 75efe110c..75efe110c 100644
--- a/src/test/ui/issues/auxiliary/issue-17662.rs
+++ b/tests/ui/issues/auxiliary/issue-17662.rs
diff --git a/src/test/ui/issues/auxiliary/issue-18501.rs b/tests/ui/issues/auxiliary/issue-18501.rs
index dd914b464..dd914b464 100644
--- a/src/test/ui/issues/auxiliary/issue-18501.rs
+++ b/tests/ui/issues/auxiliary/issue-18501.rs
diff --git a/src/test/ui/issues/auxiliary/issue-18514.rs b/tests/ui/issues/auxiliary/issue-18514.rs
index 20c8e60ee..20c8e60ee 100644
--- a/src/test/ui/issues/auxiliary/issue-18514.rs
+++ b/tests/ui/issues/auxiliary/issue-18514.rs
diff --git a/src/test/ui/issues/auxiliary/issue-18711.rs b/tests/ui/issues/auxiliary/issue-18711.rs
index 5cb1f9c43..5cb1f9c43 100644
--- a/src/test/ui/issues/auxiliary/issue-18711.rs
+++ b/tests/ui/issues/auxiliary/issue-18711.rs
diff --git a/src/test/ui/issues/auxiliary/issue-18913-1.rs b/tests/ui/issues/auxiliary/issue-18913-1.rs
index 053c5ada5..053c5ada5 100644
--- a/src/test/ui/issues/auxiliary/issue-18913-1.rs
+++ b/tests/ui/issues/auxiliary/issue-18913-1.rs
diff --git a/src/test/ui/issues/auxiliary/issue-18913-2.rs b/tests/ui/issues/auxiliary/issue-18913-2.rs
index 54747b45f..54747b45f 100644
--- a/src/test/ui/issues/auxiliary/issue-18913-2.rs
+++ b/tests/ui/issues/auxiliary/issue-18913-2.rs
diff --git a/src/test/ui/issues/auxiliary/issue-1920.rs b/tests/ui/issues/auxiliary/issue-1920.rs
index 1548cb995..1548cb995 100644
--- a/src/test/ui/issues/auxiliary/issue-1920.rs
+++ b/tests/ui/issues/auxiliary/issue-1920.rs
diff --git a/src/test/ui/issues/auxiliary/issue-19293.rs b/tests/ui/issues/auxiliary/issue-19293.rs
index 31359e865..31359e865 100644
--- a/src/test/ui/issues/auxiliary/issue-19293.rs
+++ b/tests/ui/issues/auxiliary/issue-19293.rs
diff --git a/src/test/ui/issues/auxiliary/issue-19340-1.rs b/tests/ui/issues/auxiliary/issue-19340-1.rs
index 39ee36b8b..39ee36b8b 100644
--- a/src/test/ui/issues/auxiliary/issue-19340-1.rs
+++ b/tests/ui/issues/auxiliary/issue-19340-1.rs
diff --git a/src/test/ui/issues/auxiliary/issue-20389.rs b/tests/ui/issues/auxiliary/issue-20389.rs
index ae6d44eeb..ae6d44eeb 100644
--- a/src/test/ui/issues/auxiliary/issue-20389.rs
+++ b/tests/ui/issues/auxiliary/issue-20389.rs
diff --git a/src/test/ui/issues/auxiliary/issue-21202.rs b/tests/ui/issues/auxiliary/issue-21202.rs
index e3daa1ba0..e3daa1ba0 100644
--- a/src/test/ui/issues/auxiliary/issue-21202.rs
+++ b/tests/ui/issues/auxiliary/issue-21202.rs
diff --git a/src/test/ui/issues/auxiliary/issue-2170-lib.rs b/tests/ui/issues/auxiliary/issue-2170-lib.rs
index a99385a83..a99385a83 100644
--- a/src/test/ui/issues/auxiliary/issue-2170-lib.rs
+++ b/tests/ui/issues/auxiliary/issue-2170-lib.rs
diff --git a/src/test/ui/issues/auxiliary/issue-2316-a.rs b/tests/ui/issues/auxiliary/issue-2316-a.rs
index 418ddc0b0..418ddc0b0 100644
--- a/src/test/ui/issues/auxiliary/issue-2316-a.rs
+++ b/tests/ui/issues/auxiliary/issue-2316-a.rs
diff --git a/src/test/ui/issues/auxiliary/issue-2316-b.rs b/tests/ui/issues/auxiliary/issue-2316-b.rs
index 550c2d6eb..550c2d6eb 100644
--- a/src/test/ui/issues/auxiliary/issue-2316-b.rs
+++ b/tests/ui/issues/auxiliary/issue-2316-b.rs
diff --git a/src/test/ui/issues/auxiliary/issue-2380.rs b/tests/ui/issues/auxiliary/issue-2380.rs
index 79fd62d16..79fd62d16 100644
--- a/src/test/ui/issues/auxiliary/issue-2380.rs
+++ b/tests/ui/issues/auxiliary/issue-2380.rs
diff --git a/src/test/ui/issues/auxiliary/issue-2414-a.rs b/tests/ui/issues/auxiliary/issue-2414-a.rs
index b90ab32dd..b90ab32dd 100644
--- a/src/test/ui/issues/auxiliary/issue-2414-a.rs
+++ b/tests/ui/issues/auxiliary/issue-2414-a.rs
diff --git a/src/test/ui/issues/auxiliary/issue-2414-b.rs b/tests/ui/issues/auxiliary/issue-2414-b.rs
index fc018349d..fc018349d 100644
--- a/src/test/ui/issues/auxiliary/issue-2414-b.rs
+++ b/tests/ui/issues/auxiliary/issue-2414-b.rs
diff --git a/src/test/ui/issues/auxiliary/issue-2472-b.rs b/tests/ui/issues/auxiliary/issue-2472-b.rs
index 0d151520f..0d151520f 100644
--- a/src/test/ui/issues/auxiliary/issue-2472-b.rs
+++ b/tests/ui/issues/auxiliary/issue-2472-b.rs
diff --git a/src/test/ui/issues/auxiliary/issue-25185-1.rs b/tests/ui/issues/auxiliary/issue-25185-1.rs
index e957be9c1..e957be9c1 100644
--- a/src/test/ui/issues/auxiliary/issue-25185-1.rs
+++ b/tests/ui/issues/auxiliary/issue-25185-1.rs
diff --git a/src/test/ui/issues/auxiliary/issue-25185-2.rs b/tests/ui/issues/auxiliary/issue-25185-2.rs
index 7ce3df255..7ce3df255 100644
--- a/src/test/ui/issues/auxiliary/issue-25185-2.rs
+++ b/tests/ui/issues/auxiliary/issue-25185-2.rs
diff --git a/src/test/ui/issues/auxiliary/issue-2526.rs b/tests/ui/issues/auxiliary/issue-2526.rs
index 3b27f658c..3b27f658c 100644
--- a/src/test/ui/issues/auxiliary/issue-2526.rs
+++ b/tests/ui/issues/auxiliary/issue-2526.rs
diff --git a/src/test/ui/issues/auxiliary/issue-25467.rs b/tests/ui/issues/auxiliary/issue-25467.rs
index ca9b3097c..ca9b3097c 100644
--- a/src/test/ui/issues/auxiliary/issue-25467.rs
+++ b/tests/ui/issues/auxiliary/issue-25467.rs
diff --git a/src/test/ui/issues/auxiliary/issue-2631-a.rs b/tests/ui/issues/auxiliary/issue-2631-a.rs
index 1e8211bfa..1e8211bfa 100644
--- a/src/test/ui/issues/auxiliary/issue-2631-a.rs
+++ b/tests/ui/issues/auxiliary/issue-2631-a.rs
diff --git a/src/test/ui/issues/auxiliary/issue-2723-a.rs b/tests/ui/issues/auxiliary/issue-2723-a.rs
index 661b46d82..661b46d82 100644
--- a/src/test/ui/issues/auxiliary/issue-2723-a.rs
+++ b/tests/ui/issues/auxiliary/issue-2723-a.rs
diff --git a/src/test/ui/issues/auxiliary/issue-29181.rs b/tests/ui/issues/auxiliary/issue-29181.rs
index bd1a9be4e..bd1a9be4e 100644
--- a/src/test/ui/issues/auxiliary/issue-29181.rs
+++ b/tests/ui/issues/auxiliary/issue-29181.rs
diff --git a/src/test/ui/issues/auxiliary/issue-29265.rs b/tests/ui/issues/auxiliary/issue-29265.rs
index 6d26002a2..6d26002a2 100644
--- a/src/test/ui/issues/auxiliary/issue-29265.rs
+++ b/tests/ui/issues/auxiliary/issue-29265.rs
diff --git a/src/test/ui/issues/auxiliary/issue-29485.rs b/tests/ui/issues/auxiliary/issue-29485.rs
index 1e8891c51..1e8891c51 100644
--- a/src/test/ui/issues/auxiliary/issue-29485.rs
+++ b/tests/ui/issues/auxiliary/issue-29485.rs
diff --git a/src/test/ui/issues/auxiliary/issue-3012-1.rs b/tests/ui/issues/auxiliary/issue-3012-1.rs
index 509af2a8d..509af2a8d 100644
--- a/src/test/ui/issues/auxiliary/issue-3012-1.rs
+++ b/tests/ui/issues/auxiliary/issue-3012-1.rs
diff --git a/src/test/ui/issues/auxiliary/issue-30123-aux.rs b/tests/ui/issues/auxiliary/issue-30123-aux.rs
index 07c743eb2..07c743eb2 100644
--- a/src/test/ui/issues/auxiliary/issue-30123-aux.rs
+++ b/tests/ui/issues/auxiliary/issue-30123-aux.rs
diff --git a/src/test/ui/issues/auxiliary/issue-3136-a.rc b/tests/ui/issues/auxiliary/issue-3136-a.rc
index cd5fd3145..cd5fd3145 100644
--- a/src/test/ui/issues/auxiliary/issue-3136-a.rc
+++ b/tests/ui/issues/auxiliary/issue-3136-a.rc
diff --git a/src/test/ui/issues/auxiliary/issue-3136-a.rs b/tests/ui/issues/auxiliary/issue-3136-a.rs
index 9bb546ab3..9bb546ab3 100644
--- a/src/test/ui/issues/auxiliary/issue-3136-a.rs
+++ b/tests/ui/issues/auxiliary/issue-3136-a.rs
diff --git a/src/test/ui/issues/auxiliary/issue-31702-1.rs b/tests/ui/issues/auxiliary/issue-31702-1.rs
index a48d0dc2c..a48d0dc2c 100644
--- a/src/test/ui/issues/auxiliary/issue-31702-1.rs
+++ b/tests/ui/issues/auxiliary/issue-31702-1.rs
diff --git a/src/test/ui/issues/auxiliary/issue-31702-2.rs b/tests/ui/issues/auxiliary/issue-31702-2.rs
index d360ae0ca..d360ae0ca 100644
--- a/src/test/ui/issues/auxiliary/issue-31702-2.rs
+++ b/tests/ui/issues/auxiliary/issue-31702-2.rs
diff --git a/src/test/ui/issues/auxiliary/issue-34796-aux.rs b/tests/ui/issues/auxiliary/issue-34796-aux.rs
index 09c69b903..09c69b903 100644
--- a/src/test/ui/issues/auxiliary/issue-34796-aux.rs
+++ b/tests/ui/issues/auxiliary/issue-34796-aux.rs
diff --git a/src/test/ui/issues/auxiliary/issue-36954.rs b/tests/ui/issues/auxiliary/issue-36954.rs
index bc444a381..bc444a381 100644
--- a/src/test/ui/issues/auxiliary/issue-36954.rs
+++ b/tests/ui/issues/auxiliary/issue-36954.rs
diff --git a/src/test/ui/issues/auxiliary/issue-38190.rs b/tests/ui/issues/auxiliary/issue-38190.rs
index 373e646ba..373e646ba 100644
--- a/src/test/ui/issues/auxiliary/issue-38190.rs
+++ b/tests/ui/issues/auxiliary/issue-38190.rs
diff --git a/src/test/ui/issues/auxiliary/issue-38226-aux.rs b/tests/ui/issues/auxiliary/issue-38226-aux.rs
index f96801719..f96801719 100644
--- a/src/test/ui/issues/auxiliary/issue-38226-aux.rs
+++ b/tests/ui/issues/auxiliary/issue-38226-aux.rs
diff --git a/src/test/ui/issues/auxiliary/issue-3979-traits.rs b/tests/ui/issues/auxiliary/issue-3979-traits.rs
index 5d03a0e9e..5d03a0e9e 100644
--- a/src/test/ui/issues/auxiliary/issue-3979-traits.rs
+++ b/tests/ui/issues/auxiliary/issue-3979-traits.rs
diff --git a/src/test/ui/issues/auxiliary/issue-41053.rs b/tests/ui/issues/auxiliary/issue-41053.rs
index ae73c3e78..ae73c3e78 100644
--- a/src/test/ui/issues/auxiliary/issue-41053.rs
+++ b/tests/ui/issues/auxiliary/issue-41053.rs
diff --git a/src/test/ui/issues/auxiliary/issue-41394.rs b/tests/ui/issues/auxiliary/issue-41394.rs
index 2e650efc7..2e650efc7 100644
--- a/src/test/ui/issues/auxiliary/issue-41394.rs
+++ b/tests/ui/issues/auxiliary/issue-41394.rs
diff --git a/src/test/ui/issues/auxiliary/issue-41549.rs b/tests/ui/issues/auxiliary/issue-41549.rs
index b7bd37525..b7bd37525 100644
--- a/src/test/ui/issues/auxiliary/issue-41549.rs
+++ b/tests/ui/issues/auxiliary/issue-41549.rs
diff --git a/src/test/ui/issues/auxiliary/issue-42007-s.rs b/tests/ui/issues/auxiliary/issue-42007-s.rs
index 95119a589..95119a589 100644
--- a/src/test/ui/issues/auxiliary/issue-42007-s.rs
+++ b/tests/ui/issues/auxiliary/issue-42007-s.rs
diff --git a/src/test/ui/issues/auxiliary/issue-4208-cc.rs b/tests/ui/issues/auxiliary/issue-4208-cc.rs
index 7b4c8b01a..7b4c8b01a 100644
--- a/src/test/ui/issues/auxiliary/issue-4208-cc.rs
+++ b/tests/ui/issues/auxiliary/issue-4208-cc.rs
diff --git a/src/test/ui/issues/auxiliary/issue-4545.rs b/tests/ui/issues/auxiliary/issue-4545.rs
index 2f6094750..2f6094750 100644
--- a/src/test/ui/issues/auxiliary/issue-4545.rs
+++ b/tests/ui/issues/auxiliary/issue-4545.rs
diff --git a/src/test/ui/issues/auxiliary/issue-48984-aux.rs b/tests/ui/issues/auxiliary/issue-48984-aux.rs
index 7cc888cd4..7cc888cd4 100644
--- a/src/test/ui/issues/auxiliary/issue-48984-aux.rs
+++ b/tests/ui/issues/auxiliary/issue-48984-aux.rs
diff --git a/src/test/ui/issues/auxiliary/issue-49544.rs b/tests/ui/issues/auxiliary/issue-49544.rs
index f8b3a3fba..f8b3a3fba 100644
--- a/src/test/ui/issues/auxiliary/issue-49544.rs
+++ b/tests/ui/issues/auxiliary/issue-49544.rs
diff --git a/src/test/ui/issues/auxiliary/issue-51798.rs b/tests/ui/issues/auxiliary/issue-51798.rs
index fef5213db..fef5213db 100644
--- a/src/test/ui/issues/auxiliary/issue-51798.rs
+++ b/tests/ui/issues/auxiliary/issue-51798.rs
diff --git a/src/test/ui/issues/auxiliary/issue-52489.rs b/tests/ui/issues/auxiliary/issue-52489.rs
index f53bf7db5..f53bf7db5 100644
--- a/src/test/ui/issues/auxiliary/issue-52489.rs
+++ b/tests/ui/issues/auxiliary/issue-52489.rs
diff --git a/src/test/ui/issues/auxiliary/issue-5518.rs b/tests/ui/issues/auxiliary/issue-5518.rs
index bfe96552a..bfe96552a 100644
--- a/src/test/ui/issues/auxiliary/issue-5518.rs
+++ b/tests/ui/issues/auxiliary/issue-5518.rs
diff --git a/src/test/ui/issues/auxiliary/issue-5521.rs b/tests/ui/issues/auxiliary/issue-5521.rs
index c2f81779b..c2f81779b 100644
--- a/src/test/ui/issues/auxiliary/issue-5521.rs
+++ b/tests/ui/issues/auxiliary/issue-5521.rs
diff --git a/src/test/ui/issues/auxiliary/issue-56943.rs b/tests/ui/issues/auxiliary/issue-56943.rs
index 65b9beb91..65b9beb91 100644
--- a/src/test/ui/issues/auxiliary/issue-56943.rs
+++ b/tests/ui/issues/auxiliary/issue-56943.rs
diff --git a/src/test/ui/issues/auxiliary/issue-57271-lib.rs b/tests/ui/issues/auxiliary/issue-57271-lib.rs
index ff625668a..ff625668a 100644
--- a/src/test/ui/issues/auxiliary/issue-57271-lib.rs
+++ b/tests/ui/issues/auxiliary/issue-57271-lib.rs
diff --git a/src/test/ui/issues/auxiliary/issue-5844-aux.rs b/tests/ui/issues/auxiliary/issue-5844-aux.rs
index ea83378ca..ea83378ca 100644
--- a/src/test/ui/issues/auxiliary/issue-5844-aux.rs
+++ b/tests/ui/issues/auxiliary/issue-5844-aux.rs
diff --git a/src/test/ui/issues/auxiliary/issue-7178.rs b/tests/ui/issues/auxiliary/issue-7178.rs
index 56ae5139a..56ae5139a 100644
--- a/src/test/ui/issues/auxiliary/issue-7178.rs
+++ b/tests/ui/issues/auxiliary/issue-7178.rs
diff --git a/src/test/ui/issues/auxiliary/issue-73112.rs b/tests/ui/issues/auxiliary/issue-73112.rs
index 6210c29bb..6210c29bb 100644
--- a/src/test/ui/issues/auxiliary/issue-73112.rs
+++ b/tests/ui/issues/auxiliary/issue-73112.rs
diff --git a/src/test/ui/issues/auxiliary/issue-7899.rs b/tests/ui/issues/auxiliary/issue-7899.rs
index 3af6e8716..3af6e8716 100644
--- a/src/test/ui/issues/auxiliary/issue-7899.rs
+++ b/tests/ui/issues/auxiliary/issue-7899.rs
diff --git a/src/test/ui/issues/auxiliary/issue-8044.rs b/tests/ui/issues/auxiliary/issue-8044.rs
index 2ec25f51c..2ec25f51c 100644
--- a/src/test/ui/issues/auxiliary/issue-8044.rs
+++ b/tests/ui/issues/auxiliary/issue-8044.rs
diff --git a/src/test/ui/issues/auxiliary/issue-8259.rs b/tests/ui/issues/auxiliary/issue-8259.rs
index 891aee099..891aee099 100644
--- a/src/test/ui/issues/auxiliary/issue-8259.rs
+++ b/tests/ui/issues/auxiliary/issue-8259.rs
diff --git a/src/test/ui/issues/auxiliary/issue-8401.rs b/tests/ui/issues/auxiliary/issue-8401.rs
index e35dbbfab..e35dbbfab 100644
--- a/src/test/ui/issues/auxiliary/issue-8401.rs
+++ b/tests/ui/issues/auxiliary/issue-8401.rs
diff --git a/src/test/ui/issues/auxiliary/issue-9123.rs b/tests/ui/issues/auxiliary/issue-9123.rs
index 60af53359..60af53359 100644
--- a/src/test/ui/issues/auxiliary/issue-9123.rs
+++ b/tests/ui/issues/auxiliary/issue-9123.rs
diff --git a/src/test/ui/issues/auxiliary/issue-9155.rs b/tests/ui/issues/auxiliary/issue-9155.rs
index 049a96a65..049a96a65 100644
--- a/src/test/ui/issues/auxiliary/issue-9155.rs
+++ b/tests/ui/issues/auxiliary/issue-9155.rs
diff --git a/src/test/ui/issues/auxiliary/issue-9188.rs b/tests/ui/issues/auxiliary/issue-9188.rs
index 3bc5697a1..3bc5697a1 100644
--- a/src/test/ui/issues/auxiliary/issue-9188.rs
+++ b/tests/ui/issues/auxiliary/issue-9188.rs
diff --git a/src/test/ui/issues/auxiliary/issue-9906.rs b/tests/ui/issues/auxiliary/issue-9906.rs
index 8a3eea790..8a3eea790 100644
--- a/src/test/ui/issues/auxiliary/issue-9906.rs
+++ b/tests/ui/issues/auxiliary/issue-9906.rs
diff --git a/src/test/ui/issues/auxiliary/issue-9968.rs b/tests/ui/issues/auxiliary/issue-9968.rs
index 8d795b59e..8d795b59e 100644
--- a/src/test/ui/issues/auxiliary/issue-9968.rs
+++ b/tests/ui/issues/auxiliary/issue-9968.rs
diff --git a/src/test/ui/issues/auxiliary/private-trait-xc.rs b/tests/ui/issues/auxiliary/private-trait-xc.rs
index 481a48a7c..481a48a7c 100644
--- a/src/test/ui/issues/auxiliary/private-trait-xc.rs
+++ b/tests/ui/issues/auxiliary/private-trait-xc.rs
diff --git a/src/test/ui/issues/auxiliary/reexported-trait.rs b/tests/ui/issues/auxiliary/reexported-trait.rs
index 51a991bef..51a991bef 100644
--- a/src/test/ui/issues/auxiliary/reexported-trait.rs
+++ b/tests/ui/issues/auxiliary/reexported-trait.rs
diff --git a/src/test/ui/issues/issue-100605.rs b/tests/ui/issues/issue-100605.rs
index 917a45c15..917a45c15 100644
--- a/src/test/ui/issues/issue-100605.rs
+++ b/tests/ui/issues/issue-100605.rs
diff --git a/src/test/ui/issues/issue-100605.stderr b/tests/ui/issues/issue-100605.stderr
index 886e3cd6b..886e3cd6b 100644
--- a/src/test/ui/issues/issue-100605.stderr
+++ b/tests/ui/issues/issue-100605.stderr
diff --git a/src/test/ui/issues/issue-10228.rs b/tests/ui/issues/issue-10228.rs
index ebf8b436f..ebf8b436f 100644
--- a/src/test/ui/issues/issue-10228.rs
+++ b/tests/ui/issues/issue-10228.rs
diff --git a/src/test/ui/issues/issue-10291.rs b/tests/ui/issues/issue-10291.rs
index 31b9e1240..31b9e1240 100644
--- a/src/test/ui/issues/issue-10291.rs
+++ b/tests/ui/issues/issue-10291.rs
diff --git a/src/test/ui/issues/issue-10291.stderr b/tests/ui/issues/issue-10291.stderr
index a7b827d27..a7b827d27 100644
--- a/src/test/ui/issues/issue-10291.stderr
+++ b/tests/ui/issues/issue-10291.stderr
diff --git a/src/test/ui/issues/issue-102964.rs b/tests/ui/issues/issue-102964.rs
index 43ff23600..43ff23600 100644
--- a/src/test/ui/issues/issue-102964.rs
+++ b/tests/ui/issues/issue-102964.rs
diff --git a/src/test/ui/issues/issue-102964.stderr b/tests/ui/issues/issue-102964.stderr
index 450403909..450403909 100644
--- a/src/test/ui/issues/issue-102964.stderr
+++ b/tests/ui/issues/issue-102964.stderr
diff --git a/src/test/ui/issues/issue-10396.rs b/tests/ui/issues/issue-10396.rs
index d16ea3dc3..d16ea3dc3 100644
--- a/src/test/ui/issues/issue-10396.rs
+++ b/tests/ui/issues/issue-10396.rs
diff --git a/src/test/ui/issues/issue-10412.rs b/tests/ui/issues/issue-10412.rs
index 0de170161..0de170161 100644
--- a/src/test/ui/issues/issue-10412.rs
+++ b/tests/ui/issues/issue-10412.rs
diff --git a/src/test/ui/issues/issue-10412.stderr b/tests/ui/issues/issue-10412.stderr
index 46b9fd541..46b9fd541 100644
--- a/src/test/ui/issues/issue-10412.stderr
+++ b/tests/ui/issues/issue-10412.stderr
diff --git a/src/test/ui/issues/issue-10436.rs b/tests/ui/issues/issue-10436.rs
index a7a20bad5..a7a20bad5 100644
--- a/src/test/ui/issues/issue-10436.rs
+++ b/tests/ui/issues/issue-10436.rs
diff --git a/src/test/ui/issues/issue-10456.rs b/tests/ui/issues/issue-10456.rs
index 9f8d25955..9f8d25955 100644
--- a/src/test/ui/issues/issue-10456.rs
+++ b/tests/ui/issues/issue-10456.rs
diff --git a/src/test/ui/issues/issue-10465.rs b/tests/ui/issues/issue-10465.rs
index d899c3ffa..d899c3ffa 100644
--- a/src/test/ui/issues/issue-10465.rs
+++ b/tests/ui/issues/issue-10465.rs
diff --git a/src/test/ui/issues/issue-10465.stderr b/tests/ui/issues/issue-10465.stderr
index 0ccf69dc0..0ccf69dc0 100644
--- a/src/test/ui/issues/issue-10465.stderr
+++ b/tests/ui/issues/issue-10465.stderr
diff --git a/src/test/ui/issues/issue-10545.rs b/tests/ui/issues/issue-10545.rs
index acd071496..acd071496 100644
--- a/src/test/ui/issues/issue-10545.rs
+++ b/tests/ui/issues/issue-10545.rs
diff --git a/src/test/ui/issues/issue-10545.stderr b/tests/ui/issues/issue-10545.stderr
index f1da33eab..f1da33eab 100644
--- a/src/test/ui/issues/issue-10545.stderr
+++ b/tests/ui/issues/issue-10545.stderr
diff --git a/src/test/ui/issues/issue-10638.rs b/tests/ui/issues/issue-10638.rs
index e359669c0..e359669c0 100644
--- a/src/test/ui/issues/issue-10638.rs
+++ b/tests/ui/issues/issue-10638.rs
diff --git a/src/test/ui/issues/issue-10656.rs b/tests/ui/issues/issue-10656.rs
index 250c4bc44..250c4bc44 100644
--- a/src/test/ui/issues/issue-10656.rs
+++ b/tests/ui/issues/issue-10656.rs
diff --git a/src/test/ui/issues/issue-10656.stderr b/tests/ui/issues/issue-10656.stderr
index 2e4365f1e..2e4365f1e 100644
--- a/src/test/ui/issues/issue-10656.stderr
+++ b/tests/ui/issues/issue-10656.stderr
diff --git a/src/test/ui/issues/issue-10682.rs b/tests/ui/issues/issue-10682.rs
index 72e4559d3..72e4559d3 100644
--- a/src/test/ui/issues/issue-10682.rs
+++ b/tests/ui/issues/issue-10682.rs
diff --git a/src/test/ui/issues/issue-10683.rs b/tests/ui/issues/issue-10683.rs
index dcb221f8c..dcb221f8c 100644
--- a/src/test/ui/issues/issue-10683.rs
+++ b/tests/ui/issues/issue-10683.rs
diff --git a/src/test/ui/issues/issue-10718.rs b/tests/ui/issues/issue-10718.rs
index a1de0cfe6..a1de0cfe6 100644
--- a/src/test/ui/issues/issue-10718.rs
+++ b/tests/ui/issues/issue-10718.rs
diff --git a/src/test/ui/issues/issue-10734.rs b/tests/ui/issues/issue-10734.rs
index 723e6ed22..723e6ed22 100644
--- a/src/test/ui/issues/issue-10734.rs
+++ b/tests/ui/issues/issue-10734.rs
diff --git a/src/test/ui/issues/issue-10764.rs b/tests/ui/issues/issue-10764.rs
index bb915f58d..bb915f58d 100644
--- a/src/test/ui/issues/issue-10764.rs
+++ b/tests/ui/issues/issue-10764.rs
diff --git a/src/test/ui/issues/issue-10764.stderr b/tests/ui/issues/issue-10764.stderr
index 4d8a85a13..4d8a85a13 100644
--- a/src/test/ui/issues/issue-10764.stderr
+++ b/tests/ui/issues/issue-10764.stderr
diff --git a/src/test/ui/issues/issue-10767.rs b/tests/ui/issues/issue-10767.rs
index 5670cd458..5670cd458 100644
--- a/src/test/ui/issues/issue-10767.rs
+++ b/tests/ui/issues/issue-10767.rs
diff --git a/src/test/ui/issues/issue-10802.rs b/tests/ui/issues/issue-10802.rs
index 99e1a92df..99e1a92df 100644
--- a/src/test/ui/issues/issue-10802.rs
+++ b/tests/ui/issues/issue-10802.rs
diff --git a/src/test/ui/issues/issue-10806.rs b/tests/ui/issues/issue-10806.rs
index 2f1d7bb5a..2f1d7bb5a 100644
--- a/src/test/ui/issues/issue-10806.rs
+++ b/tests/ui/issues/issue-10806.rs
diff --git a/src/test/ui/issues/issue-10853.rs b/tests/ui/issues/issue-10853.rs
index 3dcabf9b1..3dcabf9b1 100644
--- a/src/test/ui/issues/issue-10853.rs
+++ b/tests/ui/issues/issue-10853.rs
diff --git a/src/test/ui/issues/issue-10877.rs b/tests/ui/issues/issue-10877.rs
index 15a383175..15a383175 100644
--- a/src/test/ui/issues/issue-10877.rs
+++ b/tests/ui/issues/issue-10877.rs
diff --git a/src/test/ui/issues/issue-10877.stderr b/tests/ui/issues/issue-10877.stderr
index bd3797cba..bd3797cba 100644
--- a/src/test/ui/issues/issue-10877.stderr
+++ b/tests/ui/issues/issue-10877.stderr
diff --git a/src/test/ui/issues/issue-10902.rs b/tests/ui/issues/issue-10902.rs
index 162482d49..162482d49 100644
--- a/src/test/ui/issues/issue-10902.rs
+++ b/tests/ui/issues/issue-10902.rs
diff --git a/src/test/ui/issues/issue-11004.rs b/tests/ui/issues/issue-11004.rs
index 10ef1f5e3..10ef1f5e3 100644
--- a/src/test/ui/issues/issue-11004.rs
+++ b/tests/ui/issues/issue-11004.rs
diff --git a/src/test/ui/issues/issue-11004.stderr b/tests/ui/issues/issue-11004.stderr
index b5831e42e..b5831e42e 100644
--- a/src/test/ui/issues/issue-11004.stderr
+++ b/tests/ui/issues/issue-11004.stderr
diff --git a/src/test/ui/issues/issue-11047.rs b/tests/ui/issues/issue-11047.rs
index 1fb2b5bb3..1fb2b5bb3 100644
--- a/src/test/ui/issues/issue-11047.rs
+++ b/tests/ui/issues/issue-11047.rs
diff --git a/src/test/ui/issues/issue-11085.rs b/tests/ui/issues/issue-11085.rs
index 47c03238b..47c03238b 100644
--- a/src/test/ui/issues/issue-11085.rs
+++ b/tests/ui/issues/issue-11085.rs
diff --git a/src/test/ui/issues/issue-11192.rs b/tests/ui/issues/issue-11192.rs
index 1a3d8c9fe..1a3d8c9fe 100644
--- a/src/test/ui/issues/issue-11192.rs
+++ b/tests/ui/issues/issue-11192.rs
diff --git a/src/test/ui/issues/issue-11192.stderr b/tests/ui/issues/issue-11192.stderr
index fc1548013..fc1548013 100644
--- a/src/test/ui/issues/issue-11192.stderr
+++ b/tests/ui/issues/issue-11192.stderr
diff --git a/src/test/ui/issues/issue-11205.rs b/tests/ui/issues/issue-11205.rs
index ce0951eaf..ce0951eaf 100644
--- a/src/test/ui/issues/issue-11205.rs
+++ b/tests/ui/issues/issue-11205.rs
diff --git a/src/test/ui/issues/issue-11224.rs b/tests/ui/issues/issue-11224.rs
index e1c1df99a..e1c1df99a 100644
--- a/src/test/ui/issues/issue-11224.rs
+++ b/tests/ui/issues/issue-11224.rs
diff --git a/src/test/ui/issues/issue-11267.rs b/tests/ui/issues/issue-11267.rs
index 848ed6ac7..848ed6ac7 100644
--- a/src/test/ui/issues/issue-11267.rs
+++ b/tests/ui/issues/issue-11267.rs
diff --git a/src/test/ui/issues/issue-11374.rs b/tests/ui/issues/issue-11374.rs
index 7519ba282..7519ba282 100644
--- a/src/test/ui/issues/issue-11374.rs
+++ b/tests/ui/issues/issue-11374.rs
diff --git a/src/test/ui/issues/issue-11374.stderr b/tests/ui/issues/issue-11374.stderr
index 15b2bbeb7..ace77814a 100644
--- a/src/test/ui/issues/issue-11374.stderr
+++ b/tests/ui/issues/issue-11374.stderr
@@ -6,7 +6,7 @@ LL |     c.read_to(v);
    |       |       |
    |       |       expected `&mut [u8]`, found struct `Vec`
    |       |       help: consider mutably borrowing here: `&mut v`
-   |       arguments to this function are incorrect
+   |       arguments to this method are incorrect
    |
    = note: expected mutable reference `&mut [u8]`
                          found struct `Vec<_>`
diff --git a/src/test/ui/issues/issue-11382.rs b/tests/ui/issues/issue-11382.rs
index 42a7a0d04..42a7a0d04 100644
--- a/src/test/ui/issues/issue-11382.rs
+++ b/tests/ui/issues/issue-11382.rs
diff --git a/src/test/ui/issues/issue-11384.rs b/tests/ui/issues/issue-11384.rs
index 0105b4d22..0105b4d22 100644
--- a/src/test/ui/issues/issue-11384.rs
+++ b/tests/ui/issues/issue-11384.rs
diff --git a/src/test/ui/issues/issue-11508.rs b/tests/ui/issues/issue-11508.rs
index 49868b73e..49868b73e 100644
--- a/src/test/ui/issues/issue-11508.rs
+++ b/tests/ui/issues/issue-11508.rs
diff --git a/src/test/ui/issues/issue-11515.rs b/tests/ui/issues/issue-11515.rs
index b5c942f96..b5c942f96 100644
--- a/src/test/ui/issues/issue-11515.rs
+++ b/tests/ui/issues/issue-11515.rs
diff --git a/src/test/ui/issues/issue-11515.stderr b/tests/ui/issues/issue-11515.stderr
index accd47f0f..accd47f0f 100644
--- a/src/test/ui/issues/issue-11515.stderr
+++ b/tests/ui/issues/issue-11515.stderr
diff --git a/src/test/ui/issues/issue-11529.rs b/tests/ui/issues/issue-11529.rs
index 9a6cc8e9f..9a6cc8e9f 100644
--- a/src/test/ui/issues/issue-11529.rs
+++ b/tests/ui/issues/issue-11529.rs
diff --git a/src/test/ui/issues/issue-11552.rs b/tests/ui/issues/issue-11552.rs
index 9fb9f3d2e..9fb9f3d2e 100644
--- a/src/test/ui/issues/issue-11552.rs
+++ b/tests/ui/issues/issue-11552.rs
diff --git a/src/test/ui/issues/issue-11592.rs b/tests/ui/issues/issue-11592.rs
index a4611f2f9..a4611f2f9 100644
--- a/src/test/ui/issues/issue-11592.rs
+++ b/tests/ui/issues/issue-11592.rs
diff --git a/src/test/ui/issues/issue-11593.rs b/tests/ui/issues/issue-11593.rs
index 8bf034e82..8bf034e82 100644
--- a/src/test/ui/issues/issue-11593.rs
+++ b/tests/ui/issues/issue-11593.rs
diff --git a/src/test/ui/issues/issue-11593.stderr b/tests/ui/issues/issue-11593.stderr
index aa9768b18..aa9768b18 100644
--- a/src/test/ui/issues/issue-11593.stderr
+++ b/tests/ui/issues/issue-11593.stderr
diff --git a/src/test/ui/issues/issue-11677.rs b/tests/ui/issues/issue-11677.rs
index be18c736f..be18c736f 100644
--- a/src/test/ui/issues/issue-11677.rs
+++ b/tests/ui/issues/issue-11677.rs
diff --git a/src/test/ui/issues/issue-11680.rs b/tests/ui/issues/issue-11680.rs
index bfa8f5c5a..bfa8f5c5a 100644
--- a/src/test/ui/issues/issue-11680.rs
+++ b/tests/ui/issues/issue-11680.rs
diff --git a/src/test/ui/issues/issue-11680.stderr b/tests/ui/issues/issue-11680.stderr
index ea224af8e..ea224af8e 100644
--- a/src/test/ui/issues/issue-11680.stderr
+++ b/tests/ui/issues/issue-11680.stderr
diff --git a/src/test/ui/issues/issue-11681.rs b/tests/ui/issues/issue-11681.rs
index 6d8810d80..6d8810d80 100644
--- a/src/test/ui/issues/issue-11681.rs
+++ b/tests/ui/issues/issue-11681.rs
diff --git a/src/test/ui/issues/issue-11681.stderr b/tests/ui/issues/issue-11681.stderr
index f2f930766..f2f930766 100644
--- a/src/test/ui/issues/issue-11681.stderr
+++ b/tests/ui/issues/issue-11681.stderr
diff --git a/src/test/ui/issues/issue-11692-1.rs b/tests/ui/issues/issue-11692-1.rs
index b6f3bb8ef..b6f3bb8ef 100644
--- a/src/test/ui/issues/issue-11692-1.rs
+++ b/tests/ui/issues/issue-11692-1.rs
diff --git a/src/test/ui/issues/issue-11692-1.stderr b/tests/ui/issues/issue-11692-1.stderr
index 386463436..386463436 100644
--- a/src/test/ui/issues/issue-11692-1.stderr
+++ b/tests/ui/issues/issue-11692-1.stderr
diff --git a/src/test/ui/issues/issue-11692-2.rs b/tests/ui/issues/issue-11692-2.rs
index 5957ed338..5957ed338 100644
--- a/src/test/ui/issues/issue-11692-2.rs
+++ b/tests/ui/issues/issue-11692-2.rs
diff --git a/src/test/ui/issues/issue-11692-2.stderr b/tests/ui/issues/issue-11692-2.stderr
index 84746ca2c..84746ca2c 100644
--- a/src/test/ui/issues/issue-11692-2.stderr
+++ b/tests/ui/issues/issue-11692-2.stderr
diff --git a/src/test/ui/issues/issue-11709.rs b/tests/ui/issues/issue-11709.rs
index cb5e3dff3..cb5e3dff3 100644
--- a/src/test/ui/issues/issue-11709.rs
+++ b/tests/ui/issues/issue-11709.rs
diff --git a/src/test/ui/issues/issue-11740.rs b/tests/ui/issues/issue-11740.rs
index 9faeb7770..9faeb7770 100644
--- a/src/test/ui/issues/issue-11740.rs
+++ b/tests/ui/issues/issue-11740.rs
diff --git a/src/test/ui/issues/issue-11771.rs b/tests/ui/issues/issue-11771.rs
index c69cd1e79..c69cd1e79 100644
--- a/src/test/ui/issues/issue-11771.rs
+++ b/tests/ui/issues/issue-11771.rs
diff --git a/src/test/ui/issues/issue-11771.stderr b/tests/ui/issues/issue-11771.stderr
index 161fce4b0..161fce4b0 100644
--- a/src/test/ui/issues/issue-11771.stderr
+++ b/tests/ui/issues/issue-11771.stderr
diff --git a/src/test/ui/issues/issue-11820.rs b/tests/ui/issues/issue-11820.rs
index 7ffe96527..7ffe96527 100644
--- a/src/test/ui/issues/issue-11820.rs
+++ b/tests/ui/issues/issue-11820.rs
diff --git a/src/test/ui/issues/issue-11844.rs b/tests/ui/issues/issue-11844.rs
index f974a4702..f974a4702 100644
--- a/src/test/ui/issues/issue-11844.rs
+++ b/tests/ui/issues/issue-11844.rs
diff --git a/src/test/ui/issues/issue-11844.stderr b/tests/ui/issues/issue-11844.stderr
index 81cf918a1..81cf918a1 100644
--- a/src/test/ui/issues/issue-11844.stderr
+++ b/tests/ui/issues/issue-11844.stderr
diff --git a/src/test/ui/issues/issue-11869.rs b/tests/ui/issues/issue-11869.rs
index b300f4593..b300f4593 100644
--- a/src/test/ui/issues/issue-11869.rs
+++ b/tests/ui/issues/issue-11869.rs
diff --git a/src/test/ui/issues/issue-11873.rs b/tests/ui/issues/issue-11873.rs
index d3bd05caf..d3bd05caf 100644
--- a/src/test/ui/issues/issue-11873.rs
+++ b/tests/ui/issues/issue-11873.rs
diff --git a/src/test/ui/issues/issue-11873.stderr b/tests/ui/issues/issue-11873.stderr
index c814eedd2..c814eedd2 100644
--- a/src/test/ui/issues/issue-11873.stderr
+++ b/tests/ui/issues/issue-11873.stderr
diff --git a/src/test/ui/issues/issue-11958.rs b/tests/ui/issues/issue-11958.rs
index a7af01e25..a7af01e25 100644
--- a/src/test/ui/issues/issue-11958.rs
+++ b/tests/ui/issues/issue-11958.rs
diff --git a/src/test/ui/issues/issue-11958.stderr b/tests/ui/issues/issue-11958.stderr
index 5dca4c2f0..5dca4c2f0 100644
--- a/src/test/ui/issues/issue-11958.stderr
+++ b/tests/ui/issues/issue-11958.stderr
diff --git a/src/test/ui/issues/issue-12028.rs b/tests/ui/issues/issue-12028.rs
index 7503766ff..7503766ff 100644
--- a/src/test/ui/issues/issue-12028.rs
+++ b/tests/ui/issues/issue-12028.rs
diff --git a/src/test/ui/issues/issue-12028.stderr b/tests/ui/issues/issue-12028.stderr
index 8d6b81c24..8d6b81c24 100644
--- a/src/test/ui/issues/issue-12028.stderr
+++ b/tests/ui/issues/issue-12028.stderr
diff --git a/src/test/ui/issues/issue-12033.rs b/tests/ui/issues/issue-12033.rs
index 9dc7573c9..9dc7573c9 100644
--- a/src/test/ui/issues/issue-12033.rs
+++ b/tests/ui/issues/issue-12033.rs
diff --git a/src/test/ui/issues/issue-12041.rs b/tests/ui/issues/issue-12041.rs
index 091e8fe8b..091e8fe8b 100644
--- a/src/test/ui/issues/issue-12041.rs
+++ b/tests/ui/issues/issue-12041.rs
diff --git a/src/test/ui/issues/issue-12041.stderr b/tests/ui/issues/issue-12041.stderr
index b9ffa499a..b9ffa499a 100644
--- a/src/test/ui/issues/issue-12041.stderr
+++ b/tests/ui/issues/issue-12041.stderr
diff --git a/src/test/ui/issues/issue-12127.rs b/tests/ui/issues/issue-12127.rs
index 199d542e8..199d542e8 100644
--- a/src/test/ui/issues/issue-12127.rs
+++ b/tests/ui/issues/issue-12127.rs
diff --git a/src/test/ui/issues/issue-12127.stderr b/tests/ui/issues/issue-12127.stderr
index 2c451b07f..2c451b07f 100644
--- a/src/test/ui/issues/issue-12127.stderr
+++ b/tests/ui/issues/issue-12127.stderr
diff --git a/src/test/ui/issues/issue-12133-1.rs b/tests/ui/issues/issue-12133-1.rs
index 96ad5abd5..96ad5abd5 100644
--- a/src/test/ui/issues/issue-12133-1.rs
+++ b/tests/ui/issues/issue-12133-1.rs
diff --git a/src/test/ui/issues/issue-12133-2.rs b/tests/ui/issues/issue-12133-2.rs
index 02fec65c2..02fec65c2 100644
--- a/src/test/ui/issues/issue-12133-2.rs
+++ b/tests/ui/issues/issue-12133-2.rs
diff --git a/src/test/ui/issues/issue-12133-3.rs b/tests/ui/issues/issue-12133-3.rs
index e6b16e2da..e6b16e2da 100644
--- a/src/test/ui/issues/issue-12133-3.rs
+++ b/tests/ui/issues/issue-12133-3.rs
diff --git a/src/test/ui/issues/issue-12187-1.rs b/tests/ui/issues/issue-12187-1.rs
index 86128ed94..86128ed94 100644
--- a/src/test/ui/issues/issue-12187-1.rs
+++ b/tests/ui/issues/issue-12187-1.rs
diff --git a/src/test/ui/issues/issue-12187-1.stderr b/tests/ui/issues/issue-12187-1.stderr
index 806b7f0ac..806b7f0ac 100644
--- a/src/test/ui/issues/issue-12187-1.stderr
+++ b/tests/ui/issues/issue-12187-1.stderr
diff --git a/src/test/ui/issues/issue-12187-2.rs b/tests/ui/issues/issue-12187-2.rs
index 080a6206b..080a6206b 100644
--- a/src/test/ui/issues/issue-12187-2.rs
+++ b/tests/ui/issues/issue-12187-2.rs
diff --git a/src/test/ui/issues/issue-12187-2.stderr b/tests/ui/issues/issue-12187-2.stderr
index a1fa0a2b0..a1fa0a2b0 100644
--- a/src/test/ui/issues/issue-12187-2.stderr
+++ b/tests/ui/issues/issue-12187-2.stderr
diff --git a/src/test/ui/issues/issue-12285.rs b/tests/ui/issues/issue-12285.rs
index 24ac5d2fb..24ac5d2fb 100644
--- a/src/test/ui/issues/issue-12285.rs
+++ b/tests/ui/issues/issue-12285.rs
diff --git a/src/test/ui/issues/issue-1251.rs b/tests/ui/issues/issue-1251.rs
index c2c047c79..c2c047c79 100644
--- a/src/test/ui/issues/issue-1251.rs
+++ b/tests/ui/issues/issue-1251.rs
diff --git a/src/test/ui/issues/issue-12511.rs b/tests/ui/issues/issue-12511.rs
index ea83e3fd9..ea83e3fd9 100644
--- a/src/test/ui/issues/issue-12511.rs
+++ b/tests/ui/issues/issue-12511.rs
diff --git a/src/test/ui/issues/issue-12511.stderr b/tests/ui/issues/issue-12511.stderr
index 789a1141c..789a1141c 100644
--- a/src/test/ui/issues/issue-12511.stderr
+++ b/tests/ui/issues/issue-12511.stderr
diff --git a/src/test/ui/issues/issue-12567.rs b/tests/ui/issues/issue-12567.rs
index 1b2a37de4..1b2a37de4 100644
--- a/src/test/ui/issues/issue-12567.rs
+++ b/tests/ui/issues/issue-12567.rs
diff --git a/tests/ui/issues/issue-12567.stderr b/tests/ui/issues/issue-12567.stderr
new file mode 100644
index 000000000..7fa06825f
--- /dev/null
+++ b/tests/ui/issues/issue-12567.stderr
@@ -0,0 +1,47 @@
+error[E0508]: cannot move out of type `[T]`, a non-copy slice
+  --> $DIR/issue-12567.rs:2:11
+   |
+LL |     match (l1, l2) {
+   |           ^^^^^^^^ cannot move out of here
+...
+LL |         (&[], &[hd, ..]) | (&[hd, ..], &[])
+   |                 -- data moved here
+LL |             => println!("one empty"),
+LL |         (&[hd1, ..], &[hd2, ..])
+   |            --- ...and here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider borrowing the pattern binding
+   |
+LL |         (&[], &[ref hd, ..]) | (&[hd, ..], &[])
+   |                 +++
+help: consider borrowing the pattern binding
+   |
+LL |         (&[ref hd1, ..], &[hd2, ..])
+   |            +++
+
+error[E0508]: cannot move out of type `[T]`, a non-copy slice
+  --> $DIR/issue-12567.rs:2:11
+   |
+LL |     match (l1, l2) {
+   |           ^^^^^^^^ cannot move out of here
+...
+LL |         (&[], &[hd, ..]) | (&[hd, ..], &[])
+   |                 -- data moved here
+LL |             => println!("one empty"),
+LL |         (&[hd1, ..], &[hd2, ..])
+   |                        --- ...and here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider borrowing the pattern binding
+   |
+LL |         (&[], &[ref hd, ..]) | (&[hd, ..], &[])
+   |                 +++
+help: consider borrowing the pattern binding
+   |
+LL |         (&[hd1, ..], &[ref hd2, ..])
+   |                        +++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0508`.
diff --git a/src/test/ui/issues/issue-1257.rs b/tests/ui/issues/issue-1257.rs
index de5a6d359..de5a6d359 100644
--- a/src/test/ui/issues/issue-1257.rs
+++ b/tests/ui/issues/issue-1257.rs
diff --git a/src/test/ui/issues/issue-12612.rs b/tests/ui/issues/issue-12612.rs
index d254f6941..d254f6941 100644
--- a/src/test/ui/issues/issue-12612.rs
+++ b/tests/ui/issues/issue-12612.rs
diff --git a/src/test/ui/issues/issue-12660.rs b/tests/ui/issues/issue-12660.rs
index 44c492b43..44c492b43 100644
--- a/src/test/ui/issues/issue-12660.rs
+++ b/tests/ui/issues/issue-12660.rs
diff --git a/src/test/ui/issues/issue-12677.rs b/tests/ui/issues/issue-12677.rs
index d0e4c17d4..d0e4c17d4 100644
--- a/src/test/ui/issues/issue-12677.rs
+++ b/tests/ui/issues/issue-12677.rs
diff --git a/src/test/ui/issues/issue-12699.rs b/tests/ui/issues/issue-12699.rs
index e26c2d7cd..e26c2d7cd 100644
--- a/src/test/ui/issues/issue-12699.rs
+++ b/tests/ui/issues/issue-12699.rs
diff --git a/src/test/ui/issues/issue-12729.rs b/tests/ui/issues/issue-12729.rs
index aa0b04af2..aa0b04af2 100644
--- a/src/test/ui/issues/issue-12729.rs
+++ b/tests/ui/issues/issue-12729.rs
diff --git a/src/test/ui/issues/issue-12744.rs b/tests/ui/issues/issue-12744.rs
index e2756ec97..e2756ec97 100644
--- a/src/test/ui/issues/issue-12744.rs
+++ b/tests/ui/issues/issue-12744.rs
diff --git a/src/test/ui/issues/issue-12860.rs b/tests/ui/issues/issue-12860.rs
index 01b642cdf..01b642cdf 100644
--- a/src/test/ui/issues/issue-12860.rs
+++ b/tests/ui/issues/issue-12860.rs
diff --git a/src/test/ui/issues/issue-12863.rs b/tests/ui/issues/issue-12863.rs
index 1ac1c3d81..1ac1c3d81 100644
--- a/src/test/ui/issues/issue-12863.rs
+++ b/tests/ui/issues/issue-12863.rs
diff --git a/src/test/ui/issues/issue-12863.stderr b/tests/ui/issues/issue-12863.stderr
index 9c29a37cb..9c29a37cb 100644
--- a/src/test/ui/issues/issue-12863.stderr
+++ b/tests/ui/issues/issue-12863.stderr
diff --git a/src/test/ui/issues/issue-12909.rs b/tests/ui/issues/issue-12909.rs
index a68d73a00..a68d73a00 100644
--- a/src/test/ui/issues/issue-12909.rs
+++ b/tests/ui/issues/issue-12909.rs
diff --git a/src/test/ui/issues/issue-12920.rs b/tests/ui/issues/issue-12920.rs
index a0cfea055..a0cfea055 100644
--- a/src/test/ui/issues/issue-12920.rs
+++ b/tests/ui/issues/issue-12920.rs
diff --git a/src/test/ui/issues/issue-12997-1.rs b/tests/ui/issues/issue-12997-1.rs
index 9f808dac3..9f808dac3 100644
--- a/src/test/ui/issues/issue-12997-1.rs
+++ b/tests/ui/issues/issue-12997-1.rs
diff --git a/src/test/ui/issues/issue-12997-1.stderr b/tests/ui/issues/issue-12997-1.stderr
index 00c605174..00c605174 100644
--- a/src/test/ui/issues/issue-12997-1.stderr
+++ b/tests/ui/issues/issue-12997-1.stderr
diff --git a/src/test/ui/issues/issue-12997-2.rs b/tests/ui/issues/issue-12997-2.rs
index 9df965315..9df965315 100644
--- a/src/test/ui/issues/issue-12997-2.rs
+++ b/tests/ui/issues/issue-12997-2.rs
diff --git a/src/test/ui/issues/issue-12997-2.stderr b/tests/ui/issues/issue-12997-2.stderr
index 2a3d0e345..2a3d0e345 100644
--- a/src/test/ui/issues/issue-12997-2.stderr
+++ b/tests/ui/issues/issue-12997-2.stderr
diff --git a/src/test/ui/issues/issue-13027.rs b/tests/ui/issues/issue-13027.rs
index 64bf2a11d..64bf2a11d 100644
--- a/src/test/ui/issues/issue-13027.rs
+++ b/tests/ui/issues/issue-13027.rs
diff --git a/tests/ui/issues/issue-13033.rs b/tests/ui/issues/issue-13033.rs
new file mode 100644
index 000000000..fdb356e70
--- /dev/null
+++ b/tests/ui/issues/issue-13033.rs
@@ -0,0 +1,14 @@
+trait Foo {
+    fn bar(&mut self, other: &mut dyn Foo);
+}
+
+struct Baz;
+
+impl Foo for Baz {
+    fn bar(&mut self, other: &dyn Foo) {}
+    //~^ ERROR method `bar` has an incompatible type for trait
+    //~| expected signature `fn(&mut Baz, &mut dyn Foo)`
+    //~| found signature `fn(&mut Baz, &dyn Foo)`
+}
+
+fn main() {}
diff --git a/src/test/ui/issues/issue-13033.stderr b/tests/ui/issues/issue-13033.stderr
index 72e549813..db2c1189e 100644
--- a/src/test/ui/issues/issue-13033.stderr
+++ b/tests/ui/issues/issue-13033.stderr
@@ -12,8 +12,8 @@ note: type in trait
    |
 LL |     fn bar(&mut self, other: &mut dyn Foo);
    |                              ^^^^^^^^^^^^
-   = note: expected fn pointer `fn(&mut Baz, &mut dyn Foo)`
-              found fn pointer `fn(&mut Baz, &dyn Foo)`
+   = note: expected signature `fn(&mut Baz, &mut dyn Foo)`
+              found signature `fn(&mut Baz, &dyn Foo)`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-13058.rs b/tests/ui/issues/issue-13058.rs
index a5806feb7..a5806feb7 100644
--- a/src/test/ui/issues/issue-13058.rs
+++ b/tests/ui/issues/issue-13058.rs
diff --git a/src/test/ui/issues/issue-13058.stderr b/tests/ui/issues/issue-13058.stderr
index 8368978de..8368978de 100644
--- a/src/test/ui/issues/issue-13058.stderr
+++ b/tests/ui/issues/issue-13058.stderr
diff --git a/src/test/ui/issues/issue-13105.rs b/tests/ui/issues/issue-13105.rs
index 15a98c779..15a98c779 100644
--- a/src/test/ui/issues/issue-13105.rs
+++ b/tests/ui/issues/issue-13105.rs
diff --git a/src/test/ui/issues/issue-13167.rs b/tests/ui/issues/issue-13167.rs
index 8584c98de..8584c98de 100644
--- a/src/test/ui/issues/issue-13167.rs
+++ b/tests/ui/issues/issue-13167.rs
diff --git a/src/test/ui/issues/issue-13202.rs b/tests/ui/issues/issue-13202.rs
index 16debb5b6..16debb5b6 100644
--- a/src/test/ui/issues/issue-13202.rs
+++ b/tests/ui/issues/issue-13202.rs
diff --git a/src/test/ui/issues/issue-13204.rs b/tests/ui/issues/issue-13204.rs
index 3d6aba845..3d6aba845 100644
--- a/src/test/ui/issues/issue-13204.rs
+++ b/tests/ui/issues/issue-13204.rs
diff --git a/src/test/ui/issues/issue-13214.rs b/tests/ui/issues/issue-13214.rs
index 0cf8d0675..0cf8d0675 100644
--- a/src/test/ui/issues/issue-13214.rs
+++ b/tests/ui/issues/issue-13214.rs
diff --git a/src/test/ui/issues/issue-13259-windows-tcb-trash.rs b/tests/ui/issues/issue-13259-windows-tcb-trash.rs
index 740e7780d..740e7780d 100644
--- a/src/test/ui/issues/issue-13259-windows-tcb-trash.rs
+++ b/tests/ui/issues/issue-13259-windows-tcb-trash.rs
diff --git a/src/test/ui/issues/issue-13264.rs b/tests/ui/issues/issue-13264.rs
index 691bb63a2..691bb63a2 100644
--- a/src/test/ui/issues/issue-13264.rs
+++ b/tests/ui/issues/issue-13264.rs
diff --git a/src/test/ui/issues/issue-13323.rs b/tests/ui/issues/issue-13323.rs
index 71e14d4da..71e14d4da 100644
--- a/src/test/ui/issues/issue-13323.rs
+++ b/tests/ui/issues/issue-13323.rs
diff --git a/src/test/ui/issues/issue-13359.rs b/tests/ui/issues/issue-13359.rs
index 9129790c5..9129790c5 100644
--- a/src/test/ui/issues/issue-13359.rs
+++ b/tests/ui/issues/issue-13359.rs
diff --git a/src/test/ui/issues/issue-13359.stderr b/tests/ui/issues/issue-13359.stderr
index fef63680a..fef63680a 100644
--- a/src/test/ui/issues/issue-13359.stderr
+++ b/tests/ui/issues/issue-13359.stderr
diff --git a/src/test/ui/issues/issue-13405.rs b/tests/ui/issues/issue-13405.rs
index 732172b23..732172b23 100644
--- a/src/test/ui/issues/issue-13405.rs
+++ b/tests/ui/issues/issue-13405.rs
diff --git a/src/test/ui/issues/issue-13407.rs b/tests/ui/issues/issue-13407.rs
index 7ea81ffb5..7ea81ffb5 100644
--- a/src/test/ui/issues/issue-13407.rs
+++ b/tests/ui/issues/issue-13407.rs
diff --git a/src/test/ui/issues/issue-13407.stderr b/tests/ui/issues/issue-13407.stderr
index 54b6c640d..54b6c640d 100644
--- a/src/test/ui/issues/issue-13407.stderr
+++ b/tests/ui/issues/issue-13407.stderr
diff --git a/src/test/ui/issues/issue-13434.rs b/tests/ui/issues/issue-13434.rs
index 1b7d3e201..1b7d3e201 100644
--- a/src/test/ui/issues/issue-13434.rs
+++ b/tests/ui/issues/issue-13434.rs
diff --git a/src/test/ui/issues/issue-13446.rs b/tests/ui/issues/issue-13446.rs
index 9f1fc4277..9f1fc4277 100644
--- a/src/test/ui/issues/issue-13446.rs
+++ b/tests/ui/issues/issue-13446.rs
diff --git a/src/test/ui/issues/issue-13446.stderr b/tests/ui/issues/issue-13446.stderr
index 30fb73dd3..30fb73dd3 100644
--- a/src/test/ui/issues/issue-13446.stderr
+++ b/tests/ui/issues/issue-13446.stderr
diff --git a/src/test/ui/issues/issue-13466.rs b/tests/ui/issues/issue-13466.rs
index a420c7704..a420c7704 100644
--- a/src/test/ui/issues/issue-13466.rs
+++ b/tests/ui/issues/issue-13466.rs
diff --git a/src/test/ui/issues/issue-13466.stderr b/tests/ui/issues/issue-13466.stderr
index c78466f4e..c78466f4e 100644
--- a/src/test/ui/issues/issue-13466.stderr
+++ b/tests/ui/issues/issue-13466.stderr
diff --git a/src/test/ui/issues/issue-13482-2.rs b/tests/ui/issues/issue-13482-2.rs
index bbcb954af..bbcb954af 100644
--- a/src/test/ui/issues/issue-13482-2.rs
+++ b/tests/ui/issues/issue-13482-2.rs
diff --git a/src/test/ui/issues/issue-13482-2.stderr b/tests/ui/issues/issue-13482-2.stderr
index ccab95878..ccab95878 100644
--- a/src/test/ui/issues/issue-13482-2.stderr
+++ b/tests/ui/issues/issue-13482-2.stderr
diff --git a/src/test/ui/issues/issue-13482.rs b/tests/ui/issues/issue-13482.rs
index 244b3237e..244b3237e 100644
--- a/src/test/ui/issues/issue-13482.rs
+++ b/tests/ui/issues/issue-13482.rs
diff --git a/src/test/ui/issues/issue-13482.stderr b/tests/ui/issues/issue-13482.stderr
index 3eb05f504..3eb05f504 100644
--- a/src/test/ui/issues/issue-13482.stderr
+++ b/tests/ui/issues/issue-13482.stderr
diff --git a/src/test/ui/issues/issue-13497-2.rs b/tests/ui/issues/issue-13497-2.rs
index c82da0f00..c82da0f00 100644
--- a/src/test/ui/issues/issue-13497-2.rs
+++ b/tests/ui/issues/issue-13497-2.rs
diff --git a/src/test/ui/issues/issue-13497-2.stderr b/tests/ui/issues/issue-13497-2.stderr
index 3abeadf9e..a365e24e2 100644
--- a/src/test/ui/issues/issue-13497-2.stderr
+++ b/tests/ui/issues/issue-13497-2.stderr
@@ -1,10 +1,7 @@
 error[E0515]: cannot return value referencing local variable `rawLines`
   --> $DIR/issue-13497-2.rs:3:5
    |
-LL |        rawLines
-   |  ______^
-   | | _____|
-   | ||
+LL | //     rawLines
 LL | ||         .iter().map(|l| l.trim()).collect()
    | ||_______________-___________________________^ returns a value referencing data owned by the current function
    |  |_______________|
diff --git a/src/test/ui/issues/issue-13497.rs b/tests/ui/issues/issue-13497.rs
index 4b2795aa8..4b2795aa8 100644
--- a/src/test/ui/issues/issue-13497.rs
+++ b/tests/ui/issues/issue-13497.rs
diff --git a/src/test/ui/issues/issue-13497.stderr b/tests/ui/issues/issue-13497.stderr
index 4b1d979da..4b1d979da 100644
--- a/src/test/ui/issues/issue-13497.stderr
+++ b/tests/ui/issues/issue-13497.stderr
diff --git a/src/test/ui/issues/issue-13507-2.rs b/tests/ui/issues/issue-13507-2.rs
index 63f3589c6..63f3589c6 100644
--- a/src/test/ui/issues/issue-13507-2.rs
+++ b/tests/ui/issues/issue-13507-2.rs
diff --git a/src/test/ui/issues/issue-1362.rs b/tests/ui/issues/issue-1362.rs
index 6fd43f50e..6fd43f50e 100644
--- a/src/test/ui/issues/issue-1362.rs
+++ b/tests/ui/issues/issue-1362.rs
diff --git a/src/test/ui/issues/issue-1362.stderr b/tests/ui/issues/issue-1362.stderr
index babbb6e51..babbb6e51 100644
--- a/src/test/ui/issues/issue-1362.stderr
+++ b/tests/ui/issues/issue-1362.stderr
diff --git a/src/test/ui/issues/issue-13620.rs b/tests/ui/issues/issue-13620.rs
index 3c3c19df7..3c3c19df7 100644
--- a/src/test/ui/issues/issue-13620.rs
+++ b/tests/ui/issues/issue-13620.rs
diff --git a/src/test/ui/issues/issue-13665.rs b/tests/ui/issues/issue-13665.rs
index a3843c650..a3843c650 100644
--- a/src/test/ui/issues/issue-13665.rs
+++ b/tests/ui/issues/issue-13665.rs
diff --git a/src/test/ui/issues/issue-13703.rs b/tests/ui/issues/issue-13703.rs
index 424c99974..424c99974 100644
--- a/src/test/ui/issues/issue-13703.rs
+++ b/tests/ui/issues/issue-13703.rs
diff --git a/src/test/ui/issues/issue-13763.rs b/tests/ui/issues/issue-13763.rs
index dd5f6dbc9..dd5f6dbc9 100644
--- a/src/test/ui/issues/issue-13763.rs
+++ b/tests/ui/issues/issue-13763.rs
diff --git a/src/test/ui/issues/issue-13775.rs b/tests/ui/issues/issue-13775.rs
index f5977effc..f5977effc 100644
--- a/src/test/ui/issues/issue-13775.rs
+++ b/tests/ui/issues/issue-13775.rs
diff --git a/src/test/ui/issues/issue-13808.rs b/tests/ui/issues/issue-13808.rs
index 9f9db067b..9f9db067b 100644
--- a/src/test/ui/issues/issue-13808.rs
+++ b/tests/ui/issues/issue-13808.rs
diff --git a/src/test/ui/issues/issue-13847.rs b/tests/ui/issues/issue-13847.rs
index 06a0304ae..06a0304ae 100644
--- a/src/test/ui/issues/issue-13847.rs
+++ b/tests/ui/issues/issue-13847.rs
diff --git a/src/test/ui/issues/issue-13847.stderr b/tests/ui/issues/issue-13847.stderr
index 52b8dc049..52b8dc049 100644
--- a/src/test/ui/issues/issue-13847.stderr
+++ b/tests/ui/issues/issue-13847.stderr
diff --git a/src/test/ui/issues/issue-13867.rs b/tests/ui/issues/issue-13867.rs
index 9510aae77..9510aae77 100644
--- a/src/test/ui/issues/issue-13867.rs
+++ b/tests/ui/issues/issue-13867.rs
diff --git a/src/test/ui/issues/issue-13872.rs b/tests/ui/issues/issue-13872.rs
index aade6b836..aade6b836 100644
--- a/src/test/ui/issues/issue-13872.rs
+++ b/tests/ui/issues/issue-13872.rs
diff --git a/src/test/ui/issues/issue-14082.rs b/tests/ui/issues/issue-14082.rs
index 52b8c8680..52b8c8680 100644
--- a/src/test/ui/issues/issue-14082.rs
+++ b/tests/ui/issues/issue-14082.rs
diff --git a/src/test/ui/issues/issue-14091-2.rs b/tests/ui/issues/issue-14091-2.rs
index e2f6b1833..e2f6b1833 100644
--- a/src/test/ui/issues/issue-14091-2.rs
+++ b/tests/ui/issues/issue-14091-2.rs
diff --git a/src/test/ui/issues/issue-14091-2.stderr b/tests/ui/issues/issue-14091-2.stderr
index a191afd79..f8375d4ef 100644
--- a/src/test/ui/issues/issue-14091-2.stderr
+++ b/tests/ui/issues/issue-14091-2.stderr
@@ -9,11 +9,8 @@ note: an implementation of `Not` might be missing for `BytePos`
    |
 LL | pub struct BytePos(pub u32);
    | ^^^^^^^^^^^^^^^^^^ must implement `Not`
-note: the following trait must be implemented
+note: the trait `Not` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL | pub trait Not {
-   | ^^^^^^^^^^^^^
    = note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-14091.rs b/tests/ui/issues/issue-14091.rs
index 0ee20de90..0ee20de90 100644
--- a/src/test/ui/issues/issue-14091.rs
+++ b/tests/ui/issues/issue-14091.rs
diff --git a/src/test/ui/issues/issue-14091.stderr b/tests/ui/issues/issue-14091.stderr
index 0a9640a9e..0a9640a9e 100644
--- a/src/test/ui/issues/issue-14091.stderr
+++ b/tests/ui/issues/issue-14091.stderr
diff --git a/src/test/ui/issues/issue-14092.rs b/tests/ui/issues/issue-14092.rs
index 67c2a42ea..67c2a42ea 100644
--- a/src/test/ui/issues/issue-14092.rs
+++ b/tests/ui/issues/issue-14092.rs
diff --git a/tests/ui/issues/issue-14092.stderr b/tests/ui/issues/issue-14092.stderr
new file mode 100644
index 000000000..3a43627e6
--- /dev/null
+++ b/tests/ui/issues/issue-14092.stderr
@@ -0,0 +1,14 @@
+error[E0107]: missing generics for struct `Box`
+  --> $DIR/issue-14092.rs:1:11
+   |
+LL | fn fn1(0: Box) {}
+   |           ^^^ expected at least 1 generic argument
+   |
+help: add missing generic argument
+   |
+LL | fn fn1(0: Box<T>) {}
+   |              +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0107`.
diff --git a/src/test/ui/issues/issue-14229.rs b/tests/ui/issues/issue-14229.rs
index 477a2c650..477a2c650 100644
--- a/src/test/ui/issues/issue-14229.rs
+++ b/tests/ui/issues/issue-14229.rs
diff --git a/src/test/ui/issues/issue-14254.rs b/tests/ui/issues/issue-14254.rs
index 6f9308376..6f9308376 100644
--- a/src/test/ui/issues/issue-14254.rs
+++ b/tests/ui/issues/issue-14254.rs
diff --git a/src/test/ui/issues/issue-14285.rs b/tests/ui/issues/issue-14285.rs
index 2ba9ff717..2ba9ff717 100644
--- a/src/test/ui/issues/issue-14285.rs
+++ b/tests/ui/issues/issue-14285.rs
diff --git a/src/test/ui/issues/issue-14285.stderr b/tests/ui/issues/issue-14285.stderr
index 5c0706601..5c0706601 100644
--- a/src/test/ui/issues/issue-14285.stderr
+++ b/tests/ui/issues/issue-14285.stderr
diff --git a/src/test/ui/issues/issue-14308.rs b/tests/ui/issues/issue-14308.rs
index e067bcdf3..e067bcdf3 100644
--- a/src/test/ui/issues/issue-14308.rs
+++ b/tests/ui/issues/issue-14308.rs
diff --git a/src/test/ui/issues/issue-14330.rs b/tests/ui/issues/issue-14330.rs
index 0844fc720..0844fc720 100644
--- a/src/test/ui/issues/issue-14330.rs
+++ b/tests/ui/issues/issue-14330.rs
diff --git a/src/test/ui/issues/issue-14344.rs b/tests/ui/issues/issue-14344.rs
index 33b1df827..33b1df827 100644
--- a/src/test/ui/issues/issue-14344.rs
+++ b/tests/ui/issues/issue-14344.rs
diff --git a/src/test/ui/issues/issue-14366.rs b/tests/ui/issues/issue-14366.rs
index bb338860d..bb338860d 100644
--- a/src/test/ui/issues/issue-14366.rs
+++ b/tests/ui/issues/issue-14366.rs
diff --git a/src/test/ui/issues/issue-14366.stderr b/tests/ui/issues/issue-14366.stderr
index 10a73b245..10a73b245 100644
--- a/src/test/ui/issues/issue-14366.stderr
+++ b/tests/ui/issues/issue-14366.stderr
diff --git a/src/test/ui/issues/issue-14382.rs b/tests/ui/issues/issue-14382.rs
index dca24d0be..dca24d0be 100644
--- a/src/test/ui/issues/issue-14382.rs
+++ b/tests/ui/issues/issue-14382.rs
diff --git a/src/test/ui/issues/issue-14393.rs b/tests/ui/issues/issue-14393.rs
index df635407a..df635407a 100644
--- a/src/test/ui/issues/issue-14393.rs
+++ b/tests/ui/issues/issue-14393.rs
diff --git a/src/test/ui/issues/issue-14399.rs b/tests/ui/issues/issue-14399.rs
index 7b32bf8e4..7b32bf8e4 100644
--- a/src/test/ui/issues/issue-14399.rs
+++ b/tests/ui/issues/issue-14399.rs
diff --git a/src/test/ui/issues/issue-14421.rs b/tests/ui/issues/issue-14421.rs
index c59bd8706..c59bd8706 100644
--- a/src/test/ui/issues/issue-14421.rs
+++ b/tests/ui/issues/issue-14421.rs
diff --git a/src/test/ui/issues/issue-14422.rs b/tests/ui/issues/issue-14422.rs
index b9e2065d0..b9e2065d0 100644
--- a/src/test/ui/issues/issue-14422.rs
+++ b/tests/ui/issues/issue-14422.rs
diff --git a/src/test/ui/issues/issue-1448-2.rs b/tests/ui/issues/issue-1448-2.rs
index 829e81b9c..829e81b9c 100644
--- a/src/test/ui/issues/issue-1448-2.rs
+++ b/tests/ui/issues/issue-1448-2.rs
diff --git a/src/test/ui/issues/issue-1448-2.stderr b/tests/ui/issues/issue-1448-2.stderr
index 203dd92c9..203dd92c9 100644
--- a/src/test/ui/issues/issue-1448-2.stderr
+++ b/tests/ui/issues/issue-1448-2.stderr
diff --git a/src/test/ui/issues/issue-1451.rs b/tests/ui/issues/issue-1451.rs
index ad8928b20..ad8928b20 100644
--- a/src/test/ui/issues/issue-1451.rs
+++ b/tests/ui/issues/issue-1451.rs
diff --git a/src/test/ui/issues/issue-14541.rs b/tests/ui/issues/issue-14541.rs
index 555ec9f98..555ec9f98 100644
--- a/src/test/ui/issues/issue-14541.rs
+++ b/tests/ui/issues/issue-14541.rs
diff --git a/src/test/ui/issues/issue-14541.stderr b/tests/ui/issues/issue-14541.stderr
index cf155f428..cf155f428 100644
--- a/src/test/ui/issues/issue-14541.stderr
+++ b/tests/ui/issues/issue-14541.stderr
diff --git a/src/test/ui/issues/issue-1460.rs b/tests/ui/issues/issue-1460.rs
index e663f7fd4..e663f7fd4 100644
--- a/src/test/ui/issues/issue-1460.rs
+++ b/tests/ui/issues/issue-1460.rs
diff --git a/src/test/ui/issues/issue-1460.stderr b/tests/ui/issues/issue-1460.stderr
index eb7661fad..eb7661fad 100644
--- a/src/test/ui/issues/issue-1460.stderr
+++ b/tests/ui/issues/issue-1460.stderr
diff --git a/src/test/ui/issues/issue-14721.rs b/tests/ui/issues/issue-14721.rs
index a5c47dd8c..a5c47dd8c 100644
--- a/src/test/ui/issues/issue-14721.rs
+++ b/tests/ui/issues/issue-14721.rs
diff --git a/src/test/ui/issues/issue-14721.stderr b/tests/ui/issues/issue-14721.stderr
index 49ebb2976..49ebb2976 100644
--- a/src/test/ui/issues/issue-14721.stderr
+++ b/tests/ui/issues/issue-14721.stderr
diff --git a/src/test/ui/issues/issue-1476.rs b/tests/ui/issues/issue-1476.rs
index 138570a93..138570a93 100644
--- a/src/test/ui/issues/issue-1476.rs
+++ b/tests/ui/issues/issue-1476.rs
diff --git a/src/test/ui/issues/issue-1476.stderr b/tests/ui/issues/issue-1476.stderr
index 670bd5463..670bd5463 100644
--- a/src/test/ui/issues/issue-1476.stderr
+++ b/tests/ui/issues/issue-1476.stderr
diff --git a/src/test/ui/issues/issue-14821.rs b/tests/ui/issues/issue-14821.rs
index 00b2e3607..00b2e3607 100644
--- a/src/test/ui/issues/issue-14821.rs
+++ b/tests/ui/issues/issue-14821.rs
diff --git a/src/test/ui/issues/issue-14845.rs b/tests/ui/issues/issue-14845.rs
index d9b20e1f6..d9b20e1f6 100644
--- a/src/test/ui/issues/issue-14845.rs
+++ b/tests/ui/issues/issue-14845.rs
diff --git a/src/test/ui/issues/issue-14845.stderr b/tests/ui/issues/issue-14845.stderr
index 2fa9fbaa8..2fa9fbaa8 100644
--- a/src/test/ui/issues/issue-14845.stderr
+++ b/tests/ui/issues/issue-14845.stderr
diff --git a/src/test/ui/issues/issue-14853.rs b/tests/ui/issues/issue-14853.rs
index 4ce6e3174..4ce6e3174 100644
--- a/src/test/ui/issues/issue-14853.rs
+++ b/tests/ui/issues/issue-14853.rs
diff --git a/src/test/ui/issues/issue-14853.stderr b/tests/ui/issues/issue-14853.stderr
index 2adcf55ec..2adcf55ec 100644
--- a/src/test/ui/issues/issue-14853.stderr
+++ b/tests/ui/issues/issue-14853.stderr
diff --git a/src/test/ui/issues/issue-14865.rs b/tests/ui/issues/issue-14865.rs
index 56e78e78f..56e78e78f 100644
--- a/src/test/ui/issues/issue-14865.rs
+++ b/tests/ui/issues/issue-14865.rs
diff --git a/src/test/ui/issues/issue-14875.rs b/tests/ui/issues/issue-14875.rs
index fca330915..fca330915 100644
--- a/src/test/ui/issues/issue-14875.rs
+++ b/tests/ui/issues/issue-14875.rs
diff --git a/src/test/ui/issues/issue-14901.rs b/tests/ui/issues/issue-14901.rs
index 5319abbdf..5319abbdf 100644
--- a/src/test/ui/issues/issue-14901.rs
+++ b/tests/ui/issues/issue-14901.rs
diff --git a/src/test/ui/issues/issue-14915.rs b/tests/ui/issues/issue-14915.rs
index 127b909dd..127b909dd 100644
--- a/src/test/ui/issues/issue-14915.rs
+++ b/tests/ui/issues/issue-14915.rs
diff --git a/src/test/ui/issues/issue-14915.stderr b/tests/ui/issues/issue-14915.stderr
index 6e6326929..6e6326929 100644
--- a/src/test/ui/issues/issue-14915.stderr
+++ b/tests/ui/issues/issue-14915.stderr
diff --git a/src/test/ui/issues/issue-14919.rs b/tests/ui/issues/issue-14919.rs
index 943615433..943615433 100644
--- a/src/test/ui/issues/issue-14919.rs
+++ b/tests/ui/issues/issue-14919.rs
diff --git a/src/test/ui/issues/issue-14959.rs b/tests/ui/issues/issue-14959.rs
index e31a94315..e31a94315 100644
--- a/src/test/ui/issues/issue-14959.rs
+++ b/tests/ui/issues/issue-14959.rs
diff --git a/src/test/ui/issues/issue-15034.rs b/tests/ui/issues/issue-15034.rs
index 9ea6ed89c..9ea6ed89c 100644
--- a/src/test/ui/issues/issue-15034.rs
+++ b/tests/ui/issues/issue-15034.rs
diff --git a/src/test/ui/issues/issue-15034.stderr b/tests/ui/issues/issue-15034.stderr
index f142e260a..f142e260a 100644
--- a/src/test/ui/issues/issue-15034.stderr
+++ b/tests/ui/issues/issue-15034.stderr
diff --git a/src/test/ui/issues/issue-15043.rs b/tests/ui/issues/issue-15043.rs
index 53748be8a..53748be8a 100644
--- a/src/test/ui/issues/issue-15043.rs
+++ b/tests/ui/issues/issue-15043.rs
diff --git a/src/test/ui/issues/issue-15063.rs b/tests/ui/issues/issue-15063.rs
index 408267512..408267512 100644
--- a/src/test/ui/issues/issue-15063.rs
+++ b/tests/ui/issues/issue-15063.rs
diff --git a/src/test/ui/issues/issue-15094.rs b/tests/ui/issues/issue-15094.rs
index 71b75a6e7..cb27e2bcf 100644
--- a/src/test/ui/issues/issue-15094.rs
+++ b/tests/ui/issues/issue-15094.rs
@@ -10,8 +10,8 @@ impl<T: fmt::Debug> ops::FnOnce<(),> for Debuger<T> {
     type Output = ();
     fn call_once(self, _args: ()) {
     //~^ ERROR `call_once` has an incompatible type for trait
-    //~| expected fn pointer `extern "rust-call" fn
-    //~| found fn pointer `fn
+    //~| expected signature `extern "rust-call" fn
+    //~| found signature `fn
         println!("{:?}", self.x);
     }
 }
diff --git a/tests/ui/issues/issue-15094.stderr b/tests/ui/issues/issue-15094.stderr
new file mode 100644
index 000000000..b7c950892
--- /dev/null
+++ b/tests/ui/issues/issue-15094.stderr
@@ -0,0 +1,12 @@
+error[E0053]: method `call_once` has an incompatible type for trait
+  --> $DIR/issue-15094.rs:11:5
+   |
+LL |     fn call_once(self, _args: ()) {
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected "rust-call" fn, found "Rust" fn
+   |
+   = note: expected signature `extern "rust-call" fn(Debuger<_>, ())`
+              found signature `fn(Debuger<_>, ())`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0053`.
diff --git a/src/test/ui/issues/issue-15104.rs b/tests/ui/issues/issue-15104.rs
index 47b207ea9..47b207ea9 100644
--- a/src/test/ui/issues/issue-15104.rs
+++ b/tests/ui/issues/issue-15104.rs
diff --git a/src/test/ui/issues/issue-15129-rpass.rs b/tests/ui/issues/issue-15129-rpass.rs
index 522d0209c..522d0209c 100644
--- a/src/test/ui/issues/issue-15129-rpass.rs
+++ b/tests/ui/issues/issue-15129-rpass.rs
diff --git a/src/test/ui/issues/issue-15155.rs b/tests/ui/issues/issue-15155.rs
index 7b137b4af..7b137b4af 100644
--- a/src/test/ui/issues/issue-15155.rs
+++ b/tests/ui/issues/issue-15155.rs
diff --git a/src/test/ui/issues/issue-15167.rs b/tests/ui/issues/issue-15167.rs
index a2653c10e..a2653c10e 100644
--- a/src/test/ui/issues/issue-15167.rs
+++ b/tests/ui/issues/issue-15167.rs
diff --git a/src/test/ui/issues/issue-15167.stderr b/tests/ui/issues/issue-15167.stderr
index 53082ea0e..53082ea0e 100644
--- a/src/test/ui/issues/issue-15167.stderr
+++ b/tests/ui/issues/issue-15167.stderr
diff --git a/src/test/ui/issues/issue-15189.rs b/tests/ui/issues/issue-15189.rs
index a9c884bdc..a9c884bdc 100644
--- a/src/test/ui/issues/issue-15189.rs
+++ b/tests/ui/issues/issue-15189.rs
diff --git a/src/test/ui/issues/issue-15207.rs b/tests/ui/issues/issue-15207.rs
index 356e55ac9..356e55ac9 100644
--- a/src/test/ui/issues/issue-15207.rs
+++ b/tests/ui/issues/issue-15207.rs
diff --git a/src/test/ui/issues/issue-15207.stderr b/tests/ui/issues/issue-15207.stderr
index 25ce7cb5c..25ce7cb5c 100644
--- a/src/test/ui/issues/issue-15207.stderr
+++ b/tests/ui/issues/issue-15207.stderr
diff --git a/src/test/ui/issues/issue-15260.rs b/tests/ui/issues/issue-15260.rs
index 64fc3df3d..64fc3df3d 100644
--- a/src/test/ui/issues/issue-15260.rs
+++ b/tests/ui/issues/issue-15260.rs
diff --git a/src/test/ui/issues/issue-15260.stderr b/tests/ui/issues/issue-15260.stderr
index 4a3041122..4a3041122 100644
--- a/src/test/ui/issues/issue-15260.stderr
+++ b/tests/ui/issues/issue-15260.stderr
diff --git a/tests/ui/issues/issue-15381.rs b/tests/ui/issues/issue-15381.rs
new file mode 100644
index 000000000..23b266bef
--- /dev/null
+++ b/tests/ui/issues/issue-15381.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let values: Vec<u8> = vec![1,2,3,4,5,6,7,8];
+
+    for &[x,y,z] in values.chunks(3).filter(|&xs| xs.len() == 3) {
+        //~^ ERROR refutable pattern in `for` loop binding
+        //~| patterns `&[]`, `&[_]`, `&[_, _]` and 1 more not covered
+        println!("y={}", y);
+    }
+}
diff --git a/src/test/ui/issues/issue-15381.stderr b/tests/ui/issues/issue-15381.stderr
index c4667ce1c..085958411 100644
--- a/src/test/ui/issues/issue-15381.stderr
+++ b/tests/ui/issues/issue-15381.stderr
@@ -1,4 +1,4 @@
-error[E0005]: refutable pattern in `for` loop binding: `&[]`, `&[_]`, `&[_, _]` and 1 more not covered
+error[E0005]: refutable pattern in `for` loop binding
   --> $DIR/issue-15381.rs:4:9
    |
 LL |     for &[x,y,z] in values.chunks(3).filter(|&xs| xs.len() == 3) {
diff --git a/src/test/ui/issues/issue-15444.rs b/tests/ui/issues/issue-15444.rs
index e94afee96..e94afee96 100644
--- a/src/test/ui/issues/issue-15444.rs
+++ b/tests/ui/issues/issue-15444.rs
diff --git a/src/test/ui/issues/issue-15523-big.rs b/tests/ui/issues/issue-15523-big.rs
index 05414f1db..05414f1db 100644
--- a/src/test/ui/issues/issue-15523-big.rs
+++ b/tests/ui/issues/issue-15523-big.rs
diff --git a/src/test/ui/issues/issue-15523.rs b/tests/ui/issues/issue-15523.rs
index 220a34b9b..220a34b9b 100644
--- a/src/test/ui/issues/issue-15523.rs
+++ b/tests/ui/issues/issue-15523.rs
diff --git a/src/test/ui/issues/issue-15562.rs b/tests/ui/issues/issue-15562.rs
index dc0ecd365..dc0ecd365 100644
--- a/src/test/ui/issues/issue-15562.rs
+++ b/tests/ui/issues/issue-15562.rs
diff --git a/src/test/ui/issues/issue-15571.rs b/tests/ui/issues/issue-15571.rs
index 5f228b286..5f228b286 100644
--- a/src/test/ui/issues/issue-15571.rs
+++ b/tests/ui/issues/issue-15571.rs
diff --git a/src/test/ui/issues/issue-15673.rs b/tests/ui/issues/issue-15673.rs
index a8733d7f1..a8733d7f1 100644
--- a/src/test/ui/issues/issue-15673.rs
+++ b/tests/ui/issues/issue-15673.rs
diff --git a/src/test/ui/issues/issue-15689-1.rs b/tests/ui/issues/issue-15689-1.rs
index d143926b2..d143926b2 100644
--- a/src/test/ui/issues/issue-15689-1.rs
+++ b/tests/ui/issues/issue-15689-1.rs
diff --git a/src/test/ui/issues/issue-15689-2.rs b/tests/ui/issues/issue-15689-2.rs
index 83dcb1406..83dcb1406 100644
--- a/src/test/ui/issues/issue-15689-2.rs
+++ b/tests/ui/issues/issue-15689-2.rs
diff --git a/src/test/ui/issues/issue-15734.rs b/tests/ui/issues/issue-15734.rs
index be5820606..be5820606 100644
--- a/src/test/ui/issues/issue-15734.rs
+++ b/tests/ui/issues/issue-15734.rs
diff --git a/src/test/ui/issues/issue-15735.rs b/tests/ui/issues/issue-15735.rs
index f9ba34405..f9ba34405 100644
--- a/src/test/ui/issues/issue-15735.rs
+++ b/tests/ui/issues/issue-15735.rs
diff --git a/src/test/ui/issues/issue-15756.rs b/tests/ui/issues/issue-15756.rs
index e0861dee6..e0861dee6 100644
--- a/src/test/ui/issues/issue-15756.rs
+++ b/tests/ui/issues/issue-15756.rs
diff --git a/src/test/ui/issues/issue-15756.stderr b/tests/ui/issues/issue-15756.stderr
index d9bdc69ad..d9bdc69ad 100644
--- a/src/test/ui/issues/issue-15756.stderr
+++ b/tests/ui/issues/issue-15756.stderr
diff --git a/src/test/ui/issues/issue-15763.rs b/tests/ui/issues/issue-15763.rs
index ae0863615..ae0863615 100644
--- a/src/test/ui/issues/issue-15763.rs
+++ b/tests/ui/issues/issue-15763.rs
diff --git a/src/test/ui/issues/issue-15774.rs b/tests/ui/issues/issue-15774.rs
index ed2235758..ed2235758 100644
--- a/src/test/ui/issues/issue-15774.rs
+++ b/tests/ui/issues/issue-15774.rs
diff --git a/src/test/ui/issues/issue-15783.rs b/tests/ui/issues/issue-15783.rs
index 0b1f4545e..0b1f4545e 100644
--- a/src/test/ui/issues/issue-15783.rs
+++ b/tests/ui/issues/issue-15783.rs
diff --git a/src/test/ui/issues/issue-15783.stderr b/tests/ui/issues/issue-15783.stderr
index 660dfe9ed..660dfe9ed 100644
--- a/src/test/ui/issues/issue-15783.stderr
+++ b/tests/ui/issues/issue-15783.stderr
diff --git a/src/test/ui/issues/issue-15793.rs b/tests/ui/issues/issue-15793.rs
index 769012b1b..769012b1b 100644
--- a/src/test/ui/issues/issue-15793.rs
+++ b/tests/ui/issues/issue-15793.rs
diff --git a/src/test/ui/issues/issue-15858.rs b/tests/ui/issues/issue-15858.rs
index 8d65afc48..8d65afc48 100644
--- a/src/test/ui/issues/issue-15858.rs
+++ b/tests/ui/issues/issue-15858.rs
diff --git a/src/test/ui/issues/issue-15896.rs b/tests/ui/issues/issue-15896.rs
index d3153b516..d3153b516 100644
--- a/src/test/ui/issues/issue-15896.rs
+++ b/tests/ui/issues/issue-15896.rs
diff --git a/src/test/ui/issues/issue-15896.stderr b/tests/ui/issues/issue-15896.stderr
index 038337f5a..038337f5a 100644
--- a/src/test/ui/issues/issue-15896.stderr
+++ b/tests/ui/issues/issue-15896.stderr
diff --git a/src/test/ui/issues/issue-15965.rs b/tests/ui/issues/issue-15965.rs
index eef4900d4..eef4900d4 100644
--- a/src/test/ui/issues/issue-15965.rs
+++ b/tests/ui/issues/issue-15965.rs
diff --git a/src/test/ui/issues/issue-15965.stderr b/tests/ui/issues/issue-15965.stderr
index fe06810b8..fe06810b8 100644
--- a/src/test/ui/issues/issue-15965.stderr
+++ b/tests/ui/issues/issue-15965.stderr
diff --git a/src/test/ui/issues/issue-16048.rs b/tests/ui/issues/issue-16048.rs
index eaf6acff2..eaf6acff2 100644
--- a/src/test/ui/issues/issue-16048.rs
+++ b/tests/ui/issues/issue-16048.rs
diff --git a/src/test/ui/issues/issue-16048.stderr b/tests/ui/issues/issue-16048.stderr
index 73610942d..73610942d 100644
--- a/src/test/ui/issues/issue-16048.stderr
+++ b/tests/ui/issues/issue-16048.stderr
diff --git a/src/test/ui/issues/issue-16149.rs b/tests/ui/issues/issue-16149.rs
index 51b60725c..51b60725c 100644
--- a/src/test/ui/issues/issue-16149.rs
+++ b/tests/ui/issues/issue-16149.rs
diff --git a/src/test/ui/issues/issue-16149.stderr b/tests/ui/issues/issue-16149.stderr
index bb809840b..bb809840b 100644
--- a/src/test/ui/issues/issue-16149.stderr
+++ b/tests/ui/issues/issue-16149.stderr
diff --git a/src/test/ui/issues/issue-16151.rs b/tests/ui/issues/issue-16151.rs
index 48a14b2af..48a14b2af 100644
--- a/src/test/ui/issues/issue-16151.rs
+++ b/tests/ui/issues/issue-16151.rs
diff --git a/src/test/ui/issues/issue-16250.rs b/tests/ui/issues/issue-16250.rs
index 436e2a6ce..436e2a6ce 100644
--- a/src/test/ui/issues/issue-16250.rs
+++ b/tests/ui/issues/issue-16250.rs
diff --git a/src/test/ui/issues/issue-16250.stderr b/tests/ui/issues/issue-16250.stderr
index 5eb5e0864..5eb5e0864 100644
--- a/src/test/ui/issues/issue-16250.stderr
+++ b/tests/ui/issues/issue-16250.stderr
diff --git a/src/test/ui/issues/issue-16256.rs b/tests/ui/issues/issue-16256.rs
index eec23437b..eec23437b 100644
--- a/src/test/ui/issues/issue-16256.rs
+++ b/tests/ui/issues/issue-16256.rs
diff --git a/src/test/ui/issues/issue-16256.stderr b/tests/ui/issues/issue-16256.stderr
index d920530b5..d920530b5 100644
--- a/src/test/ui/issues/issue-16256.stderr
+++ b/tests/ui/issues/issue-16256.stderr
diff --git a/src/test/ui/issues/issue-16278.rs b/tests/ui/issues/issue-16278.rs
index 2f47b694a..2f47b694a 100644
--- a/src/test/ui/issues/issue-16278.rs
+++ b/tests/ui/issues/issue-16278.rs
diff --git a/src/test/ui/issues/issue-16338.rs b/tests/ui/issues/issue-16338.rs
index 321b3576c..321b3576c 100644
--- a/src/test/ui/issues/issue-16338.rs
+++ b/tests/ui/issues/issue-16338.rs
diff --git a/src/test/ui/issues/issue-16338.stderr b/tests/ui/issues/issue-16338.stderr
index 6878600b0..6878600b0 100644
--- a/src/test/ui/issues/issue-16338.stderr
+++ b/tests/ui/issues/issue-16338.stderr
diff --git a/src/test/ui/issues/issue-16401.rs b/tests/ui/issues/issue-16401.rs
index 332352ca7..332352ca7 100644
--- a/src/test/ui/issues/issue-16401.rs
+++ b/tests/ui/issues/issue-16401.rs
diff --git a/src/test/ui/issues/issue-16401.stderr b/tests/ui/issues/issue-16401.stderr
index f8ea09070..f8ea09070 100644
--- a/src/test/ui/issues/issue-16401.stderr
+++ b/tests/ui/issues/issue-16401.stderr
diff --git a/src/test/ui/issues/issue-16441.rs b/tests/ui/issues/issue-16441.rs
index bafa204e0..bafa204e0 100644
--- a/src/test/ui/issues/issue-16441.rs
+++ b/tests/ui/issues/issue-16441.rs
diff --git a/src/test/ui/issues/issue-16452.rs b/tests/ui/issues/issue-16452.rs
index faf9edd3b..faf9edd3b 100644
--- a/src/test/ui/issues/issue-16452.rs
+++ b/tests/ui/issues/issue-16452.rs
diff --git a/src/test/ui/issues/issue-16492.rs b/tests/ui/issues/issue-16492.rs
index 7fa808237..7fa808237 100644
--- a/src/test/ui/issues/issue-16492.rs
+++ b/tests/ui/issues/issue-16492.rs
diff --git a/src/test/ui/issues/issue-16530.rs b/tests/ui/issues/issue-16530.rs
index 25817a2a6..25817a2a6 100644
--- a/src/test/ui/issues/issue-16530.rs
+++ b/tests/ui/issues/issue-16530.rs
diff --git a/src/test/ui/issues/issue-16538.mir.stderr b/tests/ui/issues/issue-16538.mir.stderr
index e320df4b7..e320df4b7 100644
--- a/src/test/ui/issues/issue-16538.mir.stderr
+++ b/tests/ui/issues/issue-16538.mir.stderr
diff --git a/src/test/ui/issues/issue-16538.rs b/tests/ui/issues/issue-16538.rs
index 270fa3014..270fa3014 100644
--- a/src/test/ui/issues/issue-16538.rs
+++ b/tests/ui/issues/issue-16538.rs
diff --git a/src/test/ui/issues/issue-16538.thir.stderr b/tests/ui/issues/issue-16538.thir.stderr
index 4a8628692..4a8628692 100644
--- a/src/test/ui/issues/issue-16538.thir.stderr
+++ b/tests/ui/issues/issue-16538.thir.stderr
diff --git a/src/test/ui/issues/issue-16560.rs b/tests/ui/issues/issue-16560.rs
index d5fffc7ef..d5fffc7ef 100644
--- a/src/test/ui/issues/issue-16560.rs
+++ b/tests/ui/issues/issue-16560.rs
diff --git a/src/test/ui/issues/issue-16562.rs b/tests/ui/issues/issue-16562.rs
index e16a35158..e16a35158 100644
--- a/src/test/ui/issues/issue-16562.rs
+++ b/tests/ui/issues/issue-16562.rs
diff --git a/src/test/ui/issues/issue-16562.stderr b/tests/ui/issues/issue-16562.stderr
index 3fe7507e8..3fe7507e8 100644
--- a/src/test/ui/issues/issue-16562.stderr
+++ b/tests/ui/issues/issue-16562.stderr
diff --git a/src/test/ui/issues/issue-16596.rs b/tests/ui/issues/issue-16596.rs
index e7a096302..e7a096302 100644
--- a/src/test/ui/issues/issue-16596.rs
+++ b/tests/ui/issues/issue-16596.rs
diff --git a/src/test/ui/issues/issue-1660.rs b/tests/ui/issues/issue-1660.rs
index aa60a8d8a..aa60a8d8a 100644
--- a/src/test/ui/issues/issue-1660.rs
+++ b/tests/ui/issues/issue-1660.rs
diff --git a/src/test/ui/issues/issue-16643.rs b/tests/ui/issues/issue-16643.rs
index c74a554af..c74a554af 100644
--- a/src/test/ui/issues/issue-16643.rs
+++ b/tests/ui/issues/issue-16643.rs
diff --git a/src/test/ui/issues/issue-16648.rs b/tests/ui/issues/issue-16648.rs
index 539f015fa..539f015fa 100644
--- a/src/test/ui/issues/issue-16648.rs
+++ b/tests/ui/issues/issue-16648.rs
diff --git a/src/test/ui/issues/issue-16668.rs b/tests/ui/issues/issue-16668.rs
index 92efb42fe..92efb42fe 100644
--- a/src/test/ui/issues/issue-16668.rs
+++ b/tests/ui/issues/issue-16668.rs
diff --git a/src/test/ui/issues/issue-16671.rs b/tests/ui/issues/issue-16671.rs
index eff8e275b..eff8e275b 100644
--- a/src/test/ui/issues/issue-16671.rs
+++ b/tests/ui/issues/issue-16671.rs
diff --git a/src/test/ui/issues/issue-16683.rs b/tests/ui/issues/issue-16683.rs
index 72fa21bdd..72fa21bdd 100644
--- a/src/test/ui/issues/issue-16683.rs
+++ b/tests/ui/issues/issue-16683.rs
diff --git a/src/test/ui/issues/issue-16683.stderr b/tests/ui/issues/issue-16683.stderr
index fff681b2e..fff681b2e 100644
--- a/src/test/ui/issues/issue-16683.stderr
+++ b/tests/ui/issues/issue-16683.stderr
diff --git a/src/test/ui/issues/issue-16725.rs b/tests/ui/issues/issue-16725.rs
index 2cf8a6069..2cf8a6069 100644
--- a/src/test/ui/issues/issue-16725.rs
+++ b/tests/ui/issues/issue-16725.rs
diff --git a/src/test/ui/issues/issue-16725.stderr b/tests/ui/issues/issue-16725.stderr
index 5f6eae73e..5f6eae73e 100644
--- a/src/test/ui/issues/issue-16725.stderr
+++ b/tests/ui/issues/issue-16725.stderr
diff --git a/src/test/ui/issues/issue-16739.rs b/tests/ui/issues/issue-16739.rs
index b21ea4bcd..b21ea4bcd 100644
--- a/src/test/ui/issues/issue-16739.rs
+++ b/tests/ui/issues/issue-16739.rs
diff --git a/src/test/ui/issues/issue-16745.rs b/tests/ui/issues/issue-16745.rs
index e9137df0f..e9137df0f 100644
--- a/src/test/ui/issues/issue-16745.rs
+++ b/tests/ui/issues/issue-16745.rs
diff --git a/src/test/ui/issues/issue-16774.rs b/tests/ui/issues/issue-16774.rs
index 2b308ef76..2b308ef76 100644
--- a/src/test/ui/issues/issue-16774.rs
+++ b/tests/ui/issues/issue-16774.rs
diff --git a/src/test/ui/issues/issue-16783.rs b/tests/ui/issues/issue-16783.rs
index 4af4031d2..4af4031d2 100644
--- a/src/test/ui/issues/issue-16783.rs
+++ b/tests/ui/issues/issue-16783.rs
diff --git a/src/test/ui/issues/issue-16819.rs b/tests/ui/issues/issue-16819.rs
index cc0200904..cc0200904 100644
--- a/src/test/ui/issues/issue-16819.rs
+++ b/tests/ui/issues/issue-16819.rs
diff --git a/src/test/ui/issues/issue-16922-rpass.rs b/tests/ui/issues/issue-16922-rpass.rs
index c3c6ff304..c3c6ff304 100644
--- a/src/test/ui/issues/issue-16922-rpass.rs
+++ b/tests/ui/issues/issue-16922-rpass.rs
diff --git a/src/test/ui/issues/issue-16922.rs b/tests/ui/issues/issue-16922.rs
index bbbbf72db..bbbbf72db 100644
--- a/src/test/ui/issues/issue-16922.rs
+++ b/tests/ui/issues/issue-16922.rs
diff --git a/src/test/ui/issues/issue-16922.stderr b/tests/ui/issues/issue-16922.stderr
index 9d9f32a97..9d9f32a97 100644
--- a/src/test/ui/issues/issue-16922.stderr
+++ b/tests/ui/issues/issue-16922.stderr
diff --git a/src/test/ui/issues/issue-16939.rs b/tests/ui/issues/issue-16939.rs
index ad7248343..ad7248343 100644
--- a/src/test/ui/issues/issue-16939.rs
+++ b/tests/ui/issues/issue-16939.rs
diff --git a/src/test/ui/issues/issue-16939.stderr b/tests/ui/issues/issue-16939.stderr
index 766456454..766456454 100644
--- a/src/test/ui/issues/issue-16939.stderr
+++ b/tests/ui/issues/issue-16939.stderr
diff --git a/src/test/ui/issues/issue-1696.rs b/tests/ui/issues/issue-1696.rs
index b5d77df3a..b5d77df3a 100644
--- a/src/test/ui/issues/issue-1696.rs
+++ b/tests/ui/issues/issue-1696.rs
diff --git a/src/test/ui/issues/issue-16966.rs b/tests/ui/issues/issue-16966.rs
index 9c6188350..9c6188350 100644
--- a/src/test/ui/issues/issue-16966.rs
+++ b/tests/ui/issues/issue-16966.rs
diff --git a/src/test/ui/issues/issue-16966.stderr b/tests/ui/issues/issue-16966.stderr
index 8524a62a0..60f5190db 100644
--- a/src/test/ui/issues/issue-16966.stderr
+++ b/tests/ui/issues/issue-16966.stderr
@@ -5,11 +5,6 @@ LL |     panic!(std::default::Default::default());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type of the type parameter `M` declared on the function `begin_panic`
    |
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
-help: consider specifying the generic argument
-  --> $SRC_DIR/std/src/panic.rs:LL:COL
-   |
-LL |         $crate::rt::begin_panic::<M>($msg)
-   |                                +++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-16994.rs b/tests/ui/issues/issue-16994.rs
index 8d3074bce..8d3074bce 100644
--- a/src/test/ui/issues/issue-16994.rs
+++ b/tests/ui/issues/issue-16994.rs
diff --git a/src/test/ui/issues/issue-17001.rs b/tests/ui/issues/issue-17001.rs
index 68cb2865f..68cb2865f 100644
--- a/src/test/ui/issues/issue-17001.rs
+++ b/tests/ui/issues/issue-17001.rs
diff --git a/src/test/ui/issues/issue-17001.stderr b/tests/ui/issues/issue-17001.stderr
index d7e606997..d7e606997 100644
--- a/src/test/ui/issues/issue-17001.stderr
+++ b/tests/ui/issues/issue-17001.stderr
diff --git a/src/test/ui/issues/issue-17033.rs b/tests/ui/issues/issue-17033.rs
index 72a8cd982..72a8cd982 100644
--- a/src/test/ui/issues/issue-17033.rs
+++ b/tests/ui/issues/issue-17033.rs
diff --git a/src/test/ui/issues/issue-17033.stderr b/tests/ui/issues/issue-17033.stderr
index f26bee5ff..f26bee5ff 100644
--- a/src/test/ui/issues/issue-17033.stderr
+++ b/tests/ui/issues/issue-17033.stderr
diff --git a/src/test/ui/issues/issue-17068.rs b/tests/ui/issues/issue-17068.rs
index fe2c1a34b..fe2c1a34b 100644
--- a/src/test/ui/issues/issue-17068.rs
+++ b/tests/ui/issues/issue-17068.rs
diff --git a/src/test/ui/issues/issue-17121.rs b/tests/ui/issues/issue-17121.rs
index 1e7b9f015..1e7b9f015 100644
--- a/src/test/ui/issues/issue-17121.rs
+++ b/tests/ui/issues/issue-17121.rs
diff --git a/src/test/ui/issues/issue-17216.rs b/tests/ui/issues/issue-17216.rs
index 05baa1bff..05baa1bff 100644
--- a/src/test/ui/issues/issue-17216.rs
+++ b/tests/ui/issues/issue-17216.rs
diff --git a/src/test/ui/issues/issue-17252.rs b/tests/ui/issues/issue-17252.rs
index 7141e4874..7141e4874 100644
--- a/src/test/ui/issues/issue-17252.rs
+++ b/tests/ui/issues/issue-17252.rs
diff --git a/src/test/ui/issues/issue-17252.stderr b/tests/ui/issues/issue-17252.stderr
index aca5242b2..aca5242b2 100644
--- a/src/test/ui/issues/issue-17252.stderr
+++ b/tests/ui/issues/issue-17252.stderr
diff --git a/src/test/ui/issues/issue-17302.rs b/tests/ui/issues/issue-17302.rs
index cf7a2f1b0..cf7a2f1b0 100644
--- a/src/test/ui/issues/issue-17302.rs
+++ b/tests/ui/issues/issue-17302.rs
diff --git a/src/test/ui/issues/issue-17322.rs b/tests/ui/issues/issue-17322.rs
index b4fc40c3f..b4fc40c3f 100644
--- a/src/test/ui/issues/issue-17322.rs
+++ b/tests/ui/issues/issue-17322.rs
diff --git a/src/test/ui/issues/issue-17336.rs b/tests/ui/issues/issue-17336.rs
index 89ce59b11..89ce59b11 100644
--- a/src/test/ui/issues/issue-17336.rs
+++ b/tests/ui/issues/issue-17336.rs
diff --git a/src/test/ui/issues/issue-17337.rs b/tests/ui/issues/issue-17337.rs
index 193f89f83..193f89f83 100644
--- a/src/test/ui/issues/issue-17337.rs
+++ b/tests/ui/issues/issue-17337.rs
diff --git a/src/test/ui/issues/issue-17337.stderr b/tests/ui/issues/issue-17337.stderr
index 34c2eb05f..34c2eb05f 100644
--- a/src/test/ui/issues/issue-17337.stderr
+++ b/tests/ui/issues/issue-17337.stderr
diff --git a/src/test/ui/issues/issue-17351.rs b/tests/ui/issues/issue-17351.rs
index 62f6bcf15..62f6bcf15 100644
--- a/src/test/ui/issues/issue-17351.rs
+++ b/tests/ui/issues/issue-17351.rs
diff --git a/src/test/ui/issues/issue-17361.rs b/tests/ui/issues/issue-17361.rs
index e97fc3afd..e97fc3afd 100644
--- a/src/test/ui/issues/issue-17361.rs
+++ b/tests/ui/issues/issue-17361.rs
diff --git a/src/test/ui/issues/issue-17373.rs b/tests/ui/issues/issue-17373.rs
index dc3be48a7..dc3be48a7 100644
--- a/src/test/ui/issues/issue-17373.rs
+++ b/tests/ui/issues/issue-17373.rs
diff --git a/src/test/ui/issues/issue-17373.stderr b/tests/ui/issues/issue-17373.stderr
index 5c429d111..5c429d111 100644
--- a/src/test/ui/issues/issue-17373.stderr
+++ b/tests/ui/issues/issue-17373.stderr
diff --git a/src/test/ui/issues/issue-17385.rs b/tests/ui/issues/issue-17385.rs
index 7400aadb0..7400aadb0 100644
--- a/src/test/ui/issues/issue-17385.rs
+++ b/tests/ui/issues/issue-17385.rs
diff --git a/src/test/ui/issues/issue-17385.stderr b/tests/ui/issues/issue-17385.stderr
index 77aa201b3..77aa201b3 100644
--- a/src/test/ui/issues/issue-17385.stderr
+++ b/tests/ui/issues/issue-17385.stderr
diff --git a/src/test/ui/issues/issue-17405.rs b/tests/ui/issues/issue-17405.rs
index 14781a7d3..14781a7d3 100644
--- a/src/test/ui/issues/issue-17405.rs
+++ b/tests/ui/issues/issue-17405.rs
diff --git a/src/test/ui/issues/issue-17405.stderr b/tests/ui/issues/issue-17405.stderr
index 37274e239..37274e239 100644
--- a/src/test/ui/issues/issue-17405.stderr
+++ b/tests/ui/issues/issue-17405.stderr
diff --git a/src/test/ui/issues/issue-17431-1.rs b/tests/ui/issues/issue-17431-1.rs
index 3b692cc0e..3b692cc0e 100644
--- a/src/test/ui/issues/issue-17431-1.rs
+++ b/tests/ui/issues/issue-17431-1.rs
diff --git a/src/test/ui/issues/issue-17431-1.stderr b/tests/ui/issues/issue-17431-1.stderr
index e3af8976c..e3af8976c 100644
--- a/src/test/ui/issues/issue-17431-1.stderr
+++ b/tests/ui/issues/issue-17431-1.stderr
diff --git a/src/test/ui/issues/issue-17431-2.rs b/tests/ui/issues/issue-17431-2.rs
index f7b9c6a55..f7b9c6a55 100644
--- a/src/test/ui/issues/issue-17431-2.rs
+++ b/tests/ui/issues/issue-17431-2.rs
diff --git a/src/test/ui/issues/issue-17431-2.stderr b/tests/ui/issues/issue-17431-2.stderr
index 39a99ec1e..39a99ec1e 100644
--- a/src/test/ui/issues/issue-17431-2.stderr
+++ b/tests/ui/issues/issue-17431-2.stderr
diff --git a/src/test/ui/issues/issue-17431-3.rs b/tests/ui/issues/issue-17431-3.rs
index 83a63a88b..83a63a88b 100644
--- a/src/test/ui/issues/issue-17431-3.rs
+++ b/tests/ui/issues/issue-17431-3.rs
diff --git a/src/test/ui/issues/issue-17431-3.stderr b/tests/ui/issues/issue-17431-3.stderr
index 394134c78..394134c78 100644
--- a/src/test/ui/issues/issue-17431-3.stderr
+++ b/tests/ui/issues/issue-17431-3.stderr
diff --git a/src/test/ui/issues/issue-17431-4.rs b/tests/ui/issues/issue-17431-4.rs
index 48f0dba2a..48f0dba2a 100644
--- a/src/test/ui/issues/issue-17431-4.rs
+++ b/tests/ui/issues/issue-17431-4.rs
diff --git a/src/test/ui/issues/issue-17431-4.stderr b/tests/ui/issues/issue-17431-4.stderr
index 3d141e44b..3d141e44b 100644
--- a/src/test/ui/issues/issue-17431-4.stderr
+++ b/tests/ui/issues/issue-17431-4.stderr
diff --git a/src/test/ui/issues/issue-17431-5.rs b/tests/ui/issues/issue-17431-5.rs
index 0fd6ee611..0fd6ee611 100644
--- a/src/test/ui/issues/issue-17431-5.rs
+++ b/tests/ui/issues/issue-17431-5.rs
diff --git a/src/test/ui/issues/issue-17431-5.stderr b/tests/ui/issues/issue-17431-5.stderr
index 44a90a6fe..44a90a6fe 100644
--- a/src/test/ui/issues/issue-17431-5.stderr
+++ b/tests/ui/issues/issue-17431-5.stderr
diff --git a/src/test/ui/issues/issue-17431-6.rs b/tests/ui/issues/issue-17431-6.rs
index b7e49873d..b7e49873d 100644
--- a/src/test/ui/issues/issue-17431-6.rs
+++ b/tests/ui/issues/issue-17431-6.rs
diff --git a/src/test/ui/issues/issue-17431-6.stderr b/tests/ui/issues/issue-17431-6.stderr
index e0a822550..e0a822550 100644
--- a/src/test/ui/issues/issue-17431-6.stderr
+++ b/tests/ui/issues/issue-17431-6.stderr
diff --git a/src/test/ui/issues/issue-17431-7.rs b/tests/ui/issues/issue-17431-7.rs
index 4fd786278..4fd786278 100644
--- a/src/test/ui/issues/issue-17431-7.rs
+++ b/tests/ui/issues/issue-17431-7.rs
diff --git a/src/test/ui/issues/issue-17431-7.stderr b/tests/ui/issues/issue-17431-7.stderr
index ecf072b8e..ecf072b8e 100644
--- a/src/test/ui/issues/issue-17431-7.stderr
+++ b/tests/ui/issues/issue-17431-7.stderr
diff --git a/src/test/ui/issues/issue-17441.rs b/tests/ui/issues/issue-17441.rs
index e5f83c4eb..e5f83c4eb 100644
--- a/src/test/ui/issues/issue-17441.rs
+++ b/tests/ui/issues/issue-17441.rs
diff --git a/src/test/ui/issues/issue-17441.stderr b/tests/ui/issues/issue-17441.stderr
index 4dbe50178..4dbe50178 100644
--- a/src/test/ui/issues/issue-17441.stderr
+++ b/tests/ui/issues/issue-17441.stderr
diff --git a/src/test/ui/issues/issue-17450.rs b/tests/ui/issues/issue-17450.rs
index 1ac0af175..1ac0af175 100644
--- a/src/test/ui/issues/issue-17450.rs
+++ b/tests/ui/issues/issue-17450.rs
diff --git a/src/test/ui/issues/issue-17503.rs b/tests/ui/issues/issue-17503.rs
index 9a92c06e1..9a92c06e1 100644
--- a/src/test/ui/issues/issue-17503.rs
+++ b/tests/ui/issues/issue-17503.rs
diff --git a/src/test/ui/issues/issue-17546.rs b/tests/ui/issues/issue-17546.rs
index 6c62010f1..6c62010f1 100644
--- a/src/test/ui/issues/issue-17546.rs
+++ b/tests/ui/issues/issue-17546.rs
diff --git a/src/test/ui/issues/issue-17546.stderr b/tests/ui/issues/issue-17546.stderr
index 16678c8c8..81592320a 100644
--- a/src/test/ui/issues/issue-17546.stderr
+++ b/tests/ui/issues/issue-17546.stderr
@@ -3,11 +3,9 @@ error[E0573]: expected type, found variant `NoResult`
    |
 LL |     fn new() -> NoResult<MyEnum, String> {
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^
+  --> $SRC_DIR/core/src/result.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   | --------------------- similarly named enum `Result` defined here
+   = note: similarly named enum `Result` defined here
    |
 help: try using the variant's enum
    |
@@ -57,11 +55,9 @@ error[E0573]: expected type, found variant `NoResult`
    |
 LL | fn newer() -> NoResult<foo::MyEnum, String> {
    |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  --> $SRC_DIR/core/src/result.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   | --------------------- similarly named enum `Result` defined here
+   = note: similarly named enum `Result` defined here
    |
 help: try using the variant's enum
    |
diff --git a/src/test/ui/issues/issue-17551.rs b/tests/ui/issues/issue-17551.rs
index a65957ce0..a65957ce0 100644
--- a/src/test/ui/issues/issue-17551.rs
+++ b/tests/ui/issues/issue-17551.rs
diff --git a/src/test/ui/issues/issue-17551.stderr b/tests/ui/issues/issue-17551.stderr
index 5f45a2f84..5f45a2f84 100644
--- a/src/test/ui/issues/issue-17551.stderr
+++ b/tests/ui/issues/issue-17551.stderr
diff --git a/src/test/ui/issues/issue-17651.rs b/tests/ui/issues/issue-17651.rs
index 7629a5a3b..7629a5a3b 100644
--- a/src/test/ui/issues/issue-17651.rs
+++ b/tests/ui/issues/issue-17651.rs
diff --git a/src/test/ui/issues/issue-17651.stderr b/tests/ui/issues/issue-17651.stderr
index efaaeeda2..b37811e19 100644
--- a/src/test/ui/issues/issue-17651.stderr
+++ b/tests/ui/issues/issue-17651.stderr
@@ -9,9 +9,6 @@ LL |     (|| Box::new(*(&[0][..])))();
    = help: the trait `Sized` is not implemented for `[{integer}]`
 note: required by a bound in `Box::<T>::new`
   --> $SRC_DIR/alloc/src/boxed.rs:LL:COL
-   |
-LL | impl<T> Box<T> {
-   |      ^ required by this bound in `Box::<T>::new`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-17662.rs b/tests/ui/issues/issue-17662.rs
index a2683808b..a2683808b 100644
--- a/src/test/ui/issues/issue-17662.rs
+++ b/tests/ui/issues/issue-17662.rs
diff --git a/src/test/ui/issues/issue-17732.rs b/tests/ui/issues/issue-17732.rs
index 8f63d5bae..8f63d5bae 100644
--- a/src/test/ui/issues/issue-17732.rs
+++ b/tests/ui/issues/issue-17732.rs
diff --git a/src/test/ui/issues/issue-17734.rs b/tests/ui/issues/issue-17734.rs
index ba8d6c21c..ba8d6c21c 100644
--- a/src/test/ui/issues/issue-17734.rs
+++ b/tests/ui/issues/issue-17734.rs
diff --git a/src/test/ui/issues/issue-17740.rs b/tests/ui/issues/issue-17740.rs
index 3b868555f..3b868555f 100644
--- a/src/test/ui/issues/issue-17740.rs
+++ b/tests/ui/issues/issue-17740.rs
diff --git a/src/test/ui/issues/issue-17740.stderr b/tests/ui/issues/issue-17740.stderr
index d17738041..d17738041 100644
--- a/src/test/ui/issues/issue-17740.stderr
+++ b/tests/ui/issues/issue-17740.stderr
diff --git a/src/test/ui/issues/issue-17746.rs b/tests/ui/issues/issue-17746.rs
index bab64a4b5..bab64a4b5 100644
--- a/src/test/ui/issues/issue-17746.rs
+++ b/tests/ui/issues/issue-17746.rs
diff --git a/src/test/ui/issues/issue-17758.rs b/tests/ui/issues/issue-17758.rs
index e2ee84694..e2ee84694 100644
--- a/src/test/ui/issues/issue-17758.rs
+++ b/tests/ui/issues/issue-17758.rs
diff --git a/src/test/ui/issues/issue-17758.stderr b/tests/ui/issues/issue-17758.stderr
index 613ef6b90..613ef6b90 100644
--- a/src/test/ui/issues/issue-17758.stderr
+++ b/tests/ui/issues/issue-17758.stderr
diff --git a/src/test/ui/issues/issue-17771.rs b/tests/ui/issues/issue-17771.rs
index 2f6464668..2f6464668 100644
--- a/src/test/ui/issues/issue-17771.rs
+++ b/tests/ui/issues/issue-17771.rs
diff --git a/src/test/ui/issues/issue-17800.rs b/tests/ui/issues/issue-17800.rs
index 5254f45d7..5254f45d7 100644
--- a/src/test/ui/issues/issue-17800.rs
+++ b/tests/ui/issues/issue-17800.rs
diff --git a/src/test/ui/issues/issue-17800.stderr b/tests/ui/issues/issue-17800.stderr
index baab67583..baab67583 100644
--- a/src/test/ui/issues/issue-17800.stderr
+++ b/tests/ui/issues/issue-17800.stderr
diff --git a/src/test/ui/issues/issue-17816.rs b/tests/ui/issues/issue-17816.rs
index 7ca47d503..7ca47d503 100644
--- a/src/test/ui/issues/issue-17816.rs
+++ b/tests/ui/issues/issue-17816.rs
diff --git a/src/test/ui/issues/issue-17877.rs b/tests/ui/issues/issue-17877.rs
index 126e01de5..126e01de5 100644
--- a/src/test/ui/issues/issue-17877.rs
+++ b/tests/ui/issues/issue-17877.rs
diff --git a/src/test/ui/issues/issue-17897.rs b/tests/ui/issues/issue-17897.rs
index 6873c7ccb..6873c7ccb 100644
--- a/src/test/ui/issues/issue-17897.rs
+++ b/tests/ui/issues/issue-17897.rs
diff --git a/src/test/ui/issues/issue-17904-2.rs b/tests/ui/issues/issue-17904-2.rs
index 9603da097..9603da097 100644
--- a/src/test/ui/issues/issue-17904-2.rs
+++ b/tests/ui/issues/issue-17904-2.rs
diff --git a/src/test/ui/issues/issue-17904-2.stderr b/tests/ui/issues/issue-17904-2.stderr
index 62b7b7953..62b7b7953 100644
--- a/src/test/ui/issues/issue-17904-2.stderr
+++ b/tests/ui/issues/issue-17904-2.stderr
diff --git a/src/test/ui/issues/issue-17904.rs b/tests/ui/issues/issue-17904.rs
index c3f504ac1..c3f504ac1 100644
--- a/src/test/ui/issues/issue-17904.rs
+++ b/tests/ui/issues/issue-17904.rs
diff --git a/src/test/ui/issues/issue-17905-2.rs b/tests/ui/issues/issue-17905-2.rs
index 44279cc86..44279cc86 100644
--- a/src/test/ui/issues/issue-17905-2.rs
+++ b/tests/ui/issues/issue-17905-2.rs
diff --git a/src/test/ui/issues/issue-17905-2.stderr b/tests/ui/issues/issue-17905-2.stderr
index 88b5fbec6..88b5fbec6 100644
--- a/src/test/ui/issues/issue-17905-2.stderr
+++ b/tests/ui/issues/issue-17905-2.stderr
diff --git a/src/test/ui/issues/issue-17905.rs b/tests/ui/issues/issue-17905.rs
index dae9648b9..dae9648b9 100644
--- a/src/test/ui/issues/issue-17905.rs
+++ b/tests/ui/issues/issue-17905.rs
diff --git a/src/test/ui/issues/issue-17933.rs b/tests/ui/issues/issue-17933.rs
index 6da4e6e15..6da4e6e15 100644
--- a/src/test/ui/issues/issue-17933.rs
+++ b/tests/ui/issues/issue-17933.rs
diff --git a/src/test/ui/issues/issue-17933.stderr b/tests/ui/issues/issue-17933.stderr
index 33534d3f8..33534d3f8 100644
--- a/src/test/ui/issues/issue-17933.stderr
+++ b/tests/ui/issues/issue-17933.stderr
diff --git a/src/test/ui/issues/issue-17954.rs b/tests/ui/issues/issue-17954.rs
index eb6a3d70f..eb6a3d70f 100644
--- a/src/test/ui/issues/issue-17954.rs
+++ b/tests/ui/issues/issue-17954.rs
diff --git a/src/test/ui/issues/issue-17954.stderr b/tests/ui/issues/issue-17954.stderr
index e08375fee..e08375fee 100644
--- a/src/test/ui/issues/issue-17954.stderr
+++ b/tests/ui/issues/issue-17954.stderr
diff --git a/src/test/ui/issues/issue-17959.rs b/tests/ui/issues/issue-17959.rs
index 8bf9e6236..8bf9e6236 100644
--- a/src/test/ui/issues/issue-17959.rs
+++ b/tests/ui/issues/issue-17959.rs
diff --git a/src/test/ui/issues/issue-17959.stderr b/tests/ui/issues/issue-17959.stderr
index fb795febf..fb795febf 100644
--- a/src/test/ui/issues/issue-17959.stderr
+++ b/tests/ui/issues/issue-17959.stderr
diff --git a/src/test/ui/issues/issue-17994.rs b/tests/ui/issues/issue-17994.rs
index 39b0a7ebe..39b0a7ebe 100644
--- a/src/test/ui/issues/issue-17994.rs
+++ b/tests/ui/issues/issue-17994.rs
diff --git a/src/test/ui/issues/issue-17994.stderr b/tests/ui/issues/issue-17994.stderr
index 61e1e496f..61e1e496f 100644
--- a/src/test/ui/issues/issue-17994.stderr
+++ b/tests/ui/issues/issue-17994.stderr
diff --git a/src/test/ui/issues/issue-17999.rs b/tests/ui/issues/issue-17999.rs
index 941f1e775..941f1e775 100644
--- a/src/test/ui/issues/issue-17999.rs
+++ b/tests/ui/issues/issue-17999.rs
diff --git a/src/test/ui/issues/issue-17999.stderr b/tests/ui/issues/issue-17999.stderr
index 4a1ef7350..4a1ef7350 100644
--- a/src/test/ui/issues/issue-17999.stderr
+++ b/tests/ui/issues/issue-17999.stderr
diff --git a/src/test/ui/issues/issue-18058.rs b/tests/ui/issues/issue-18058.rs
index cced66717..cced66717 100644
--- a/src/test/ui/issues/issue-18058.rs
+++ b/tests/ui/issues/issue-18058.rs
diff --git a/src/test/ui/issues/issue-18058.stderr b/tests/ui/issues/issue-18058.stderr
index 18159ffc2..18159ffc2 100644
--- a/src/test/ui/issues/issue-18058.stderr
+++ b/tests/ui/issues/issue-18058.stderr
diff --git a/src/test/ui/issues/issue-18088.rs b/tests/ui/issues/issue-18088.rs
index c557b5a65..c557b5a65 100644
--- a/src/test/ui/issues/issue-18088.rs
+++ b/tests/ui/issues/issue-18088.rs
diff --git a/src/test/ui/issues/issue-18107.rs b/tests/ui/issues/issue-18107.rs
index 4bf5b6c0f..4bf5b6c0f 100644
--- a/src/test/ui/issues/issue-18107.rs
+++ b/tests/ui/issues/issue-18107.rs
diff --git a/src/test/ui/issues/issue-18107.stderr b/tests/ui/issues/issue-18107.stderr
index 28478457b..1669b550a 100644
--- a/src/test/ui/issues/issue-18107.stderr
+++ b/tests/ui/issues/issue-18107.stderr
@@ -4,10 +4,6 @@ error[E0746]: return type cannot have an unboxed trait object
 LL |     dyn AbstractRenderer
    |     ^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
    |
-help: use some type `T` that is `T: Sized` as the return type if all return paths have the same type
-   |
-LL |     T
-   |
 help: use `impl AbstractRenderer` as the return type if all return paths have the same type but you want to expose only the trait in the signature
    |
 LL |     impl AbstractRenderer
diff --git a/src/test/ui/issues/issue-18110.rs b/tests/ui/issues/issue-18110.rs
index 41c29e77d..41c29e77d 100644
--- a/src/test/ui/issues/issue-18110.rs
+++ b/tests/ui/issues/issue-18110.rs
diff --git a/src/test/ui/issues/issue-18119.rs b/tests/ui/issues/issue-18119.rs
index e48dc51a2..e48dc51a2 100644
--- a/src/test/ui/issues/issue-18119.rs
+++ b/tests/ui/issues/issue-18119.rs
diff --git a/src/test/ui/issues/issue-18119.stderr b/tests/ui/issues/issue-18119.stderr
index ddee5a9da..ddee5a9da 100644
--- a/src/test/ui/issues/issue-18119.stderr
+++ b/tests/ui/issues/issue-18119.stderr
diff --git a/src/test/ui/issues/issue-18159.rs b/tests/ui/issues/issue-18159.rs
index bd347d632..bd347d632 100644
--- a/src/test/ui/issues/issue-18159.rs
+++ b/tests/ui/issues/issue-18159.rs
diff --git a/src/test/ui/issues/issue-18159.stderr b/tests/ui/issues/issue-18159.stderr
index 605ff3829..5e0589eed 100644
--- a/src/test/ui/issues/issue-18159.stderr
+++ b/tests/ui/issues/issue-18159.stderr
@@ -6,8 +6,8 @@ LL |     let x;
    |
 help: consider giving `x` an explicit type
    |
-LL |     let x: _;
-   |          +++
+LL |     let x: /* Type */;
+   |          ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-18173.rs b/tests/ui/issues/issue-18173.rs
index 11468040e..11468040e 100644
--- a/src/test/ui/issues/issue-18173.rs
+++ b/tests/ui/issues/issue-18173.rs
diff --git a/src/test/ui/issues/issue-18183.rs b/tests/ui/issues/issue-18183.rs
index 64476d1c1..64476d1c1 100644
--- a/src/test/ui/issues/issue-18183.rs
+++ b/tests/ui/issues/issue-18183.rs
diff --git a/src/test/ui/issues/issue-18183.stderr b/tests/ui/issues/issue-18183.stderr
index a7dc64708..a7dc64708 100644
--- a/src/test/ui/issues/issue-18183.stderr
+++ b/tests/ui/issues/issue-18183.stderr
diff --git a/src/test/ui/issues/issue-18188.rs b/tests/ui/issues/issue-18188.rs
index ce166724a..ce166724a 100644
--- a/src/test/ui/issues/issue-18188.rs
+++ b/tests/ui/issues/issue-18188.rs
diff --git a/src/test/ui/issues/issue-1821.rs b/tests/ui/issues/issue-1821.rs
index 76ee9c3ed..76ee9c3ed 100644
--- a/src/test/ui/issues/issue-1821.rs
+++ b/tests/ui/issues/issue-1821.rs
diff --git a/src/test/ui/issues/issue-18232.rs b/tests/ui/issues/issue-18232.rs
index 7e6f6ef0f..7e6f6ef0f 100644
--- a/src/test/ui/issues/issue-18232.rs
+++ b/tests/ui/issues/issue-18232.rs
diff --git a/src/test/ui/issues/issue-18352.rs b/tests/ui/issues/issue-18352.rs
index 5d93ed064..5d93ed064 100644
--- a/src/test/ui/issues/issue-18352.rs
+++ b/tests/ui/issues/issue-18352.rs
diff --git a/src/test/ui/issues/issue-18353.rs b/tests/ui/issues/issue-18353.rs
index 3d15c9980..3d15c9980 100644
--- a/src/test/ui/issues/issue-18353.rs
+++ b/tests/ui/issues/issue-18353.rs
diff --git a/src/test/ui/issues/issue-18389.rs b/tests/ui/issues/issue-18389.rs
index 654dfb63b..654dfb63b 100644
--- a/src/test/ui/issues/issue-18389.rs
+++ b/tests/ui/issues/issue-18389.rs
diff --git a/src/test/ui/issues/issue-18389.stderr b/tests/ui/issues/issue-18389.stderr
index 6ce78c45d..6ce78c45d 100644
--- a/src/test/ui/issues/issue-18389.stderr
+++ b/tests/ui/issues/issue-18389.stderr
diff --git a/src/test/ui/issues/issue-18423.rs b/tests/ui/issues/issue-18423.rs
index a81b32f05..a81b32f05 100644
--- a/src/test/ui/issues/issue-18423.rs
+++ b/tests/ui/issues/issue-18423.rs
diff --git a/tests/ui/issues/issue-18423.stderr b/tests/ui/issues/issue-18423.stderr
new file mode 100644
index 000000000..bbf793662
--- /dev/null
+++ b/tests/ui/issues/issue-18423.stderr
@@ -0,0 +1,11 @@
+error[E0107]: this struct takes 0 lifetime arguments but 1 lifetime argument was supplied
+  --> $DIR/issue-18423.rs:4:8
+   |
+LL |     x: Box<'a, isize>
+   |        ^^^ -- help: remove this lifetime argument
+   |        |
+   |        expected 0 lifetime arguments
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0107`.
diff --git a/src/test/ui/issues/issue-18446-2.rs b/tests/ui/issues/issue-18446-2.rs
index 85422d4d2..85422d4d2 100644
--- a/src/test/ui/issues/issue-18446-2.rs
+++ b/tests/ui/issues/issue-18446-2.rs
diff --git a/src/test/ui/issues/issue-18446.rs b/tests/ui/issues/issue-18446.rs
index a2e238da0..a2e238da0 100644
--- a/src/test/ui/issues/issue-18446.rs
+++ b/tests/ui/issues/issue-18446.rs
diff --git a/src/test/ui/issues/issue-18446.stderr b/tests/ui/issues/issue-18446.stderr
index 939cf0292..939cf0292 100644
--- a/src/test/ui/issues/issue-18446.stderr
+++ b/tests/ui/issues/issue-18446.stderr
diff --git a/src/test/ui/issues/issue-18464.rs b/tests/ui/issues/issue-18464.rs
index 14d2d0a6c..14d2d0a6c 100644
--- a/src/test/ui/issues/issue-18464.rs
+++ b/tests/ui/issues/issue-18464.rs
diff --git a/src/test/ui/issues/issue-18501.rs b/tests/ui/issues/issue-18501.rs
index 0ca23074c..0ca23074c 100644
--- a/src/test/ui/issues/issue-18501.rs
+++ b/tests/ui/issues/issue-18501.rs
diff --git a/src/test/ui/issues/issue-18514.rs b/tests/ui/issues/issue-18514.rs
index 48e7f0741..48e7f0741 100644
--- a/src/test/ui/issues/issue-18514.rs
+++ b/tests/ui/issues/issue-18514.rs
diff --git a/src/test/ui/issues/issue-18532.rs b/tests/ui/issues/issue-18532.rs
index 31fd87961..31fd87961 100644
--- a/src/test/ui/issues/issue-18532.rs
+++ b/tests/ui/issues/issue-18532.rs
diff --git a/src/test/ui/issues/issue-18532.stderr b/tests/ui/issues/issue-18532.stderr
index 4c224eb2d..4c224eb2d 100644
--- a/src/test/ui/issues/issue-18532.stderr
+++ b/tests/ui/issues/issue-18532.stderr
diff --git a/src/test/ui/issues/issue-18539.rs b/tests/ui/issues/issue-18539.rs
index 745df26e3..745df26e3 100644
--- a/src/test/ui/issues/issue-18539.rs
+++ b/tests/ui/issues/issue-18539.rs
diff --git a/src/test/ui/issues/issue-18566.rs b/tests/ui/issues/issue-18566.rs
index 9da904acf..9da904acf 100644
--- a/src/test/ui/issues/issue-18566.rs
+++ b/tests/ui/issues/issue-18566.rs
diff --git a/src/test/ui/issues/issue-18566.stderr b/tests/ui/issues/issue-18566.stderr
index 8db78935f..8db78935f 100644
--- a/src/test/ui/issues/issue-18566.stderr
+++ b/tests/ui/issues/issue-18566.stderr
diff --git a/src/test/ui/issues/issue-18576.rs b/tests/ui/issues/issue-18576.rs
index 389cf108b..389cf108b 100644
--- a/src/test/ui/issues/issue-18576.rs
+++ b/tests/ui/issues/issue-18576.rs
diff --git a/src/test/ui/issues/issue-18611.rs b/tests/ui/issues/issue-18611.rs
index 91a765f34..91a765f34 100644
--- a/src/test/ui/issues/issue-18611.rs
+++ b/tests/ui/issues/issue-18611.rs
diff --git a/tests/ui/issues/issue-18611.stderr b/tests/ui/issues/issue-18611.stderr
new file mode 100644
index 000000000..bd18d4622
--- /dev/null
+++ b/tests/ui/issues/issue-18611.stderr
@@ -0,0 +1,9 @@
+error[E0277]: the trait bound `isize: HasState` is not satisfied
+  --> $DIR/issue-18611.rs:1:18
+   |
+LL | fn add_state(op: <isize as HasState>::State) {
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `HasState` is not implemented for `isize`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/issues/issue-18685.rs b/tests/ui/issues/issue-18685.rs
index bfe24b663..bfe24b663 100644
--- a/src/test/ui/issues/issue-18685.rs
+++ b/tests/ui/issues/issue-18685.rs
diff --git a/src/test/ui/issues/issue-1871.rs b/tests/ui/issues/issue-1871.rs
index f7a2bdd56..f7a2bdd56 100644
--- a/src/test/ui/issues/issue-1871.rs
+++ b/tests/ui/issues/issue-1871.rs
diff --git a/src/test/ui/issues/issue-1871.stderr b/tests/ui/issues/issue-1871.stderr
index b774ca22d..b774ca22d 100644
--- a/src/test/ui/issues/issue-1871.stderr
+++ b/tests/ui/issues/issue-1871.stderr
diff --git a/src/test/ui/issues/issue-18711.rs b/tests/ui/issues/issue-18711.rs
index 435841877..435841877 100644
--- a/src/test/ui/issues/issue-18711.rs
+++ b/tests/ui/issues/issue-18711.rs
diff --git a/src/test/ui/issues/issue-18738.rs b/tests/ui/issues/issue-18738.rs
index bcc1ec03f..bcc1ec03f 100644
--- a/src/test/ui/issues/issue-18738.rs
+++ b/tests/ui/issues/issue-18738.rs
diff --git a/src/test/ui/issues/issue-18767.rs b/tests/ui/issues/issue-18767.rs
index 2a5721b72..2a5721b72 100644
--- a/src/test/ui/issues/issue-18767.rs
+++ b/tests/ui/issues/issue-18767.rs
diff --git a/src/test/ui/issues/issue-18783.rs b/tests/ui/issues/issue-18783.rs
index d4851ac14..d4851ac14 100644
--- a/src/test/ui/issues/issue-18783.rs
+++ b/tests/ui/issues/issue-18783.rs
diff --git a/src/test/ui/issues/issue-18783.stderr b/tests/ui/issues/issue-18783.stderr
index cc223ac46..cc223ac46 100644
--- a/src/test/ui/issues/issue-18783.stderr
+++ b/tests/ui/issues/issue-18783.stderr
diff --git a/src/test/ui/issues/issue-18804/auxiliary/lib.rs b/tests/ui/issues/issue-18804/auxiliary/lib.rs
index e29d48285..e29d48285 100644
--- a/src/test/ui/issues/issue-18804/auxiliary/lib.rs
+++ b/tests/ui/issues/issue-18804/auxiliary/lib.rs
diff --git a/src/test/ui/issues/issue-18804/main.rs b/tests/ui/issues/issue-18804/main.rs
index c36048ea5..c36048ea5 100644
--- a/src/test/ui/issues/issue-18804/main.rs
+++ b/tests/ui/issues/issue-18804/main.rs
diff --git a/src/test/ui/issues/issue-18809.rs b/tests/ui/issues/issue-18809.rs
index cc5b4a64c..cc5b4a64c 100644
--- a/src/test/ui/issues/issue-18809.rs
+++ b/tests/ui/issues/issue-18809.rs
diff --git a/src/test/ui/issues/issue-18819.rs b/tests/ui/issues/issue-18819.rs
index e634c55f8..e634c55f8 100644
--- a/src/test/ui/issues/issue-18819.rs
+++ b/tests/ui/issues/issue-18819.rs
diff --git a/src/test/ui/issues/issue-18819.stderr b/tests/ui/issues/issue-18819.stderr
index 767fdd5ca..767fdd5ca 100644
--- a/src/test/ui/issues/issue-18819.stderr
+++ b/tests/ui/issues/issue-18819.stderr
diff --git a/src/test/ui/issues/issue-18845.rs b/tests/ui/issues/issue-18845.rs
index 83fab4b5e..83fab4b5e 100644
--- a/src/test/ui/issues/issue-18845.rs
+++ b/tests/ui/issues/issue-18845.rs
diff --git a/src/test/ui/issues/issue-18859.rs b/tests/ui/issues/issue-18859.rs
index c4575bce9..c4575bce9 100644
--- a/src/test/ui/issues/issue-18859.rs
+++ b/tests/ui/issues/issue-18859.rs
diff --git a/src/test/ui/issues/issue-18906.rs b/tests/ui/issues/issue-18906.rs
index 976a9f49b..976a9f49b 100644
--- a/src/test/ui/issues/issue-18906.rs
+++ b/tests/ui/issues/issue-18906.rs
diff --git a/src/test/ui/issues/issue-18913.rs b/tests/ui/issues/issue-18913.rs
index 27fae6d77..27fae6d77 100644
--- a/src/test/ui/issues/issue-18913.rs
+++ b/tests/ui/issues/issue-18913.rs
diff --git a/src/test/ui/issues/issue-18919.rs b/tests/ui/issues/issue-18919.rs
index f06771e9e..f06771e9e 100644
--- a/src/test/ui/issues/issue-18919.rs
+++ b/tests/ui/issues/issue-18919.rs
diff --git a/src/test/ui/issues/issue-18919.stderr b/tests/ui/issues/issue-18919.stderr
index b0b03a0ee..b0b03a0ee 100644
--- a/src/test/ui/issues/issue-18919.stderr
+++ b/tests/ui/issues/issue-18919.stderr
diff --git a/src/test/ui/issues/issue-18952.rs b/tests/ui/issues/issue-18952.rs
index 56378b59e..56378b59e 100644
--- a/src/test/ui/issues/issue-18952.rs
+++ b/tests/ui/issues/issue-18952.rs
diff --git a/src/test/ui/issues/issue-18959.rs b/tests/ui/issues/issue-18959.rs
index 4b6f04e25..4b6f04e25 100644
--- a/src/test/ui/issues/issue-18959.rs
+++ b/tests/ui/issues/issue-18959.rs
diff --git a/src/test/ui/issues/issue-18959.stderr b/tests/ui/issues/issue-18959.stderr
index b9e278736..b9e278736 100644
--- a/src/test/ui/issues/issue-18959.stderr
+++ b/tests/ui/issues/issue-18959.stderr
diff --git a/src/test/ui/issues/issue-18988.rs b/tests/ui/issues/issue-18988.rs
index 708965d81..708965d81 100644
--- a/src/test/ui/issues/issue-18988.rs
+++ b/tests/ui/issues/issue-18988.rs
diff --git a/src/test/ui/issues/issue-1900.rs b/tests/ui/issues/issue-1900.rs
index 761bd3170..761bd3170 100644
--- a/src/test/ui/issues/issue-1900.rs
+++ b/tests/ui/issues/issue-1900.rs
diff --git a/src/test/ui/issues/issue-1900.stderr b/tests/ui/issues/issue-1900.stderr
index ce413662f..ce413662f 100644
--- a/src/test/ui/issues/issue-1900.stderr
+++ b/tests/ui/issues/issue-1900.stderr
diff --git a/src/test/ui/issues/issue-19001.rs b/tests/ui/issues/issue-19001.rs
index 76c380c2f..76c380c2f 100644
--- a/src/test/ui/issues/issue-19001.rs
+++ b/tests/ui/issues/issue-19001.rs
diff --git a/src/test/ui/issues/issue-19037.rs b/tests/ui/issues/issue-19037.rs
index 74623da14..74623da14 100644
--- a/src/test/ui/issues/issue-19037.rs
+++ b/tests/ui/issues/issue-19037.rs
diff --git a/src/test/ui/issues/issue-19086.rs b/tests/ui/issues/issue-19086.rs
index 42148c5f5..42148c5f5 100644
--- a/src/test/ui/issues/issue-19086.rs
+++ b/tests/ui/issues/issue-19086.rs
diff --git a/src/test/ui/issues/issue-19086.stderr b/tests/ui/issues/issue-19086.stderr
index a3c06a725..a3c06a725 100644
--- a/src/test/ui/issues/issue-19086.stderr
+++ b/tests/ui/issues/issue-19086.stderr
diff --git a/src/test/ui/issues/issue-19097.rs b/tests/ui/issues/issue-19097.rs
index 2f4b0d575..2f4b0d575 100644
--- a/src/test/ui/issues/issue-19097.rs
+++ b/tests/ui/issues/issue-19097.rs
diff --git a/src/test/ui/issues/issue-19098.rs b/tests/ui/issues/issue-19098.rs
index 3d05f11b6..3d05f11b6 100644
--- a/src/test/ui/issues/issue-19098.rs
+++ b/tests/ui/issues/issue-19098.rs
diff --git a/tests/ui/issues/issue-19100.fixed b/tests/ui/issues/issue-19100.fixed
new file mode 100644
index 000000000..029855de2
--- /dev/null
+++ b/tests/ui/issues/issue-19100.fixed
@@ -0,0 +1,29 @@
+// run-rustfix
+
+#![allow(non_snake_case)]
+#![allow(dead_code)]
+#![allow(unused_variables)]
+
+#[derive(Copy, Clone)]
+enum Foo {
+    Bar,
+    Baz
+}
+
+impl Foo {
+    fn foo(&self) {
+        match self {
+            &
+Foo::Bar if true
+//~^ ERROR pattern binding `Bar` is named the same as one of the variants of the type `Foo`
+=> println!("bar"),
+            &
+Foo::Baz if false
+//~^ ERROR pattern binding `Baz` is named the same as one of the variants of the type `Foo`
+=> println!("baz"),
+_ => ()
+        }
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/issues/issue-19100.rs b/tests/ui/issues/issue-19100.rs
new file mode 100644
index 000000000..bd9e4ea5b
--- /dev/null
+++ b/tests/ui/issues/issue-19100.rs
@@ -0,0 +1,29 @@
+// run-rustfix
+
+#![allow(non_snake_case)]
+#![allow(dead_code)]
+#![allow(unused_variables)]
+
+#[derive(Copy, Clone)]
+enum Foo {
+    Bar,
+    Baz
+}
+
+impl Foo {
+    fn foo(&self) {
+        match self {
+            &
+Bar if true
+//~^ ERROR pattern binding `Bar` is named the same as one of the variants of the type `Foo`
+=> println!("bar"),
+            &
+Baz if false
+//~^ ERROR pattern binding `Baz` is named the same as one of the variants of the type `Foo`
+=> println!("baz"),
+_ => ()
+        }
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/issues/issue-19100.stderr b/tests/ui/issues/issue-19100.stderr
new file mode 100644
index 000000000..ebbf083b7
--- /dev/null
+++ b/tests/ui/issues/issue-19100.stderr
@@ -0,0 +1,17 @@
+error[E0170]: pattern binding `Bar` is named the same as one of the variants of the type `Foo`
+  --> $DIR/issue-19100.rs:17:1
+   |
+LL | Bar if true
+   | ^^^ help: to match on the variant, qualify the path: `Foo::Bar`
+   |
+   = note: `#[deny(bindings_with_variant_name)]` on by default
+
+error[E0170]: pattern binding `Baz` is named the same as one of the variants of the type `Foo`
+  --> $DIR/issue-19100.rs:21:1
+   |
+LL | Baz if false
+   | ^^^ help: to match on the variant, qualify the path: `Foo::Baz`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0170`.
diff --git a/src/test/ui/issues/issue-19102.rs b/tests/ui/issues/issue-19102.rs
index 1f32d10b6..1f32d10b6 100644
--- a/src/test/ui/issues/issue-19102.rs
+++ b/tests/ui/issues/issue-19102.rs
diff --git a/src/test/ui/issues/issue-19127.rs b/tests/ui/issues/issue-19127.rs
index c847ac9e4..c847ac9e4 100644
--- a/src/test/ui/issues/issue-19127.rs
+++ b/tests/ui/issues/issue-19127.rs
diff --git a/src/test/ui/issues/issue-19129-1.rs b/tests/ui/issues/issue-19129-1.rs
index 03a969101..03a969101 100644
--- a/src/test/ui/issues/issue-19129-1.rs
+++ b/tests/ui/issues/issue-19129-1.rs
diff --git a/src/test/ui/issues/issue-19129-2.rs b/tests/ui/issues/issue-19129-2.rs
index 991d79d41..991d79d41 100644
--- a/src/test/ui/issues/issue-19129-2.rs
+++ b/tests/ui/issues/issue-19129-2.rs
diff --git a/src/test/ui/issues/issue-19135.rs b/tests/ui/issues/issue-19135.rs
index 84540a3ff..84540a3ff 100644
--- a/src/test/ui/issues/issue-19135.rs
+++ b/tests/ui/issues/issue-19135.rs
diff --git a/src/test/ui/issues/issue-1920-1.rs b/tests/ui/issues/issue-1920-1.rs
index 26553f56b..26553f56b 100644
--- a/src/test/ui/issues/issue-1920-1.rs
+++ b/tests/ui/issues/issue-1920-1.rs
diff --git a/src/test/ui/issues/issue-1920-1.stderr b/tests/ui/issues/issue-1920-1.stderr
index a54692425..a54692425 100644
--- a/src/test/ui/issues/issue-1920-1.stderr
+++ b/tests/ui/issues/issue-1920-1.stderr
diff --git a/src/test/ui/issues/issue-1920-2.rs b/tests/ui/issues/issue-1920-2.rs
index 8d4a5f663..8d4a5f663 100644
--- a/src/test/ui/issues/issue-1920-2.rs
+++ b/tests/ui/issues/issue-1920-2.rs
diff --git a/src/test/ui/issues/issue-1920-2.stderr b/tests/ui/issues/issue-1920-2.stderr
index 1083b0112..1083b0112 100644
--- a/src/test/ui/issues/issue-1920-2.stderr
+++ b/tests/ui/issues/issue-1920-2.stderr
diff --git a/src/test/ui/issues/issue-1920-3.rs b/tests/ui/issues/issue-1920-3.rs
index 520db50f9..520db50f9 100644
--- a/src/test/ui/issues/issue-1920-3.rs
+++ b/tests/ui/issues/issue-1920-3.rs
diff --git a/src/test/ui/issues/issue-1920-3.stderr b/tests/ui/issues/issue-1920-3.stderr
index 3f0787c88..3f0787c88 100644
--- a/src/test/ui/issues/issue-1920-3.stderr
+++ b/tests/ui/issues/issue-1920-3.stderr
diff --git a/src/test/ui/issues/issue-19244-1.rs b/tests/ui/issues/issue-19244-1.rs
index 77fab7cfa..77fab7cfa 100644
--- a/src/test/ui/issues/issue-19244-1.rs
+++ b/tests/ui/issues/issue-19244-1.rs
diff --git a/src/test/ui/issues/issue-19244-1.stderr b/tests/ui/issues/issue-19244-1.stderr
index 1eb530542..1eb530542 100644
--- a/src/test/ui/issues/issue-19244-1.stderr
+++ b/tests/ui/issues/issue-19244-1.stderr
diff --git a/src/test/ui/issues/issue-19244-2.rs b/tests/ui/issues/issue-19244-2.rs
index c9a68b05c..c9a68b05c 100644
--- a/src/test/ui/issues/issue-19244-2.rs
+++ b/tests/ui/issues/issue-19244-2.rs
diff --git a/src/test/ui/issues/issue-19244-2.stderr b/tests/ui/issues/issue-19244-2.stderr
index 54529fdf5..54529fdf5 100644
--- a/src/test/ui/issues/issue-19244-2.stderr
+++ b/tests/ui/issues/issue-19244-2.stderr
diff --git a/src/test/ui/issues/issue-19293.rs b/tests/ui/issues/issue-19293.rs
index b6e9e3d06..b6e9e3d06 100644
--- a/src/test/ui/issues/issue-19293.rs
+++ b/tests/ui/issues/issue-19293.rs
diff --git a/src/test/ui/issues/issue-19340-1.rs b/tests/ui/issues/issue-19340-1.rs
index e3cc2daae..e3cc2daae 100644
--- a/src/test/ui/issues/issue-19340-1.rs
+++ b/tests/ui/issues/issue-19340-1.rs
diff --git a/src/test/ui/issues/issue-19340-2.rs b/tests/ui/issues/issue-19340-2.rs
index a222e9e46..a222e9e46 100644
--- a/src/test/ui/issues/issue-19340-2.rs
+++ b/tests/ui/issues/issue-19340-2.rs
diff --git a/src/test/ui/issues/issue-19367.rs b/tests/ui/issues/issue-19367.rs
index 0699533e7..0699533e7 100644
--- a/src/test/ui/issues/issue-19367.rs
+++ b/tests/ui/issues/issue-19367.rs
diff --git a/src/test/ui/issues/issue-19380.rs b/tests/ui/issues/issue-19380.rs
index 5c10e2067..5c10e2067 100644
--- a/src/test/ui/issues/issue-19380.rs
+++ b/tests/ui/issues/issue-19380.rs
diff --git a/src/test/ui/issues/issue-19380.stderr b/tests/ui/issues/issue-19380.stderr
index b2aeb5edf..b2aeb5edf 100644
--- a/src/test/ui/issues/issue-19380.stderr
+++ b/tests/ui/issues/issue-19380.stderr
diff --git a/src/test/ui/issues/issue-19398.rs b/tests/ui/issues/issue-19398.rs
index a9d0acaa2..a9d0acaa2 100644
--- a/src/test/ui/issues/issue-19398.rs
+++ b/tests/ui/issues/issue-19398.rs
diff --git a/src/test/ui/issues/issue-19404.rs b/tests/ui/issues/issue-19404.rs
index f1cf1feb0..f1cf1feb0 100644
--- a/src/test/ui/issues/issue-19404.rs
+++ b/tests/ui/issues/issue-19404.rs
diff --git a/src/test/ui/issues/issue-19479.rs b/tests/ui/issues/issue-19479.rs
index 70bfe7213..70bfe7213 100644
--- a/src/test/ui/issues/issue-19479.rs
+++ b/tests/ui/issues/issue-19479.rs
diff --git a/src/test/ui/issues/issue-19482.rs b/tests/ui/issues/issue-19482.rs
index 3f3c5de9b..3f3c5de9b 100644
--- a/src/test/ui/issues/issue-19482.rs
+++ b/tests/ui/issues/issue-19482.rs
diff --git a/src/test/ui/issues/issue-19482.stderr b/tests/ui/issues/issue-19482.stderr
index d51cc1f08..d51cc1f08 100644
--- a/src/test/ui/issues/issue-19482.stderr
+++ b/tests/ui/issues/issue-19482.stderr
diff --git a/src/test/ui/issues/issue-19499.rs b/tests/ui/issues/issue-19499.rs
index d09056ce3..d09056ce3 100644
--- a/src/test/ui/issues/issue-19499.rs
+++ b/tests/ui/issues/issue-19499.rs
diff --git a/src/test/ui/issues/issue-19521.rs b/tests/ui/issues/issue-19521.rs
index a2a32a21a..a2a32a21a 100644
--- a/src/test/ui/issues/issue-19521.rs
+++ b/tests/ui/issues/issue-19521.rs
diff --git a/src/test/ui/issues/issue-19521.stderr b/tests/ui/issues/issue-19521.stderr
index b6847cd75..b6847cd75 100644
--- a/src/test/ui/issues/issue-19521.stderr
+++ b/tests/ui/issues/issue-19521.stderr
diff --git a/src/test/ui/issues/issue-19601.rs b/tests/ui/issues/issue-19601.rs
index 176e6ba41..176e6ba41 100644
--- a/src/test/ui/issues/issue-19601.rs
+++ b/tests/ui/issues/issue-19601.rs
diff --git a/src/test/ui/issues/issue-1962.fixed b/tests/ui/issues/issue-1962.fixed
index 897fd172b..897fd172b 100644
--- a/src/test/ui/issues/issue-1962.fixed
+++ b/tests/ui/issues/issue-1962.fixed
diff --git a/src/test/ui/issues/issue-1962.rs b/tests/ui/issues/issue-1962.rs
index 71e874100..71e874100 100644
--- a/src/test/ui/issues/issue-1962.rs
+++ b/tests/ui/issues/issue-1962.rs
diff --git a/src/test/ui/issues/issue-1962.stderr b/tests/ui/issues/issue-1962.stderr
index 4c32a4cf3..4c32a4cf3 100644
--- a/src/test/ui/issues/issue-1962.stderr
+++ b/tests/ui/issues/issue-1962.stderr
diff --git a/src/test/ui/issues/issue-19631.rs b/tests/ui/issues/issue-19631.rs
index 694e6dcd1..694e6dcd1 100644
--- a/src/test/ui/issues/issue-19631.rs
+++ b/tests/ui/issues/issue-19631.rs
diff --git a/src/test/ui/issues/issue-19632.rs b/tests/ui/issues/issue-19632.rs
index 203976079..203976079 100644
--- a/src/test/ui/issues/issue-19632.rs
+++ b/tests/ui/issues/issue-19632.rs
diff --git a/src/test/ui/issues/issue-19692.rs b/tests/ui/issues/issue-19692.rs
index 99eccc8a8..99eccc8a8 100644
--- a/src/test/ui/issues/issue-19692.rs
+++ b/tests/ui/issues/issue-19692.rs
diff --git a/src/test/ui/issues/issue-19692.stderr b/tests/ui/issues/issue-19692.stderr
index 9e888ed75..9e888ed75 100644
--- a/src/test/ui/issues/issue-19692.stderr
+++ b/tests/ui/issues/issue-19692.stderr
diff --git a/src/test/ui/issues/issue-19707.rs b/tests/ui/issues/issue-19707.rs
index 6bc7132af..6bc7132af 100644
--- a/src/test/ui/issues/issue-19707.rs
+++ b/tests/ui/issues/issue-19707.rs
diff --git a/src/test/ui/issues/issue-19707.stderr b/tests/ui/issues/issue-19707.stderr
index 3e1bb32c1..3e1bb32c1 100644
--- a/src/test/ui/issues/issue-19707.stderr
+++ b/tests/ui/issues/issue-19707.stderr
diff --git a/src/test/ui/issues/issue-19734.rs b/tests/ui/issues/issue-19734.rs
index fe4a327ae..fe4a327ae 100644
--- a/src/test/ui/issues/issue-19734.rs
+++ b/tests/ui/issues/issue-19734.rs
diff --git a/src/test/ui/issues/issue-19734.stderr b/tests/ui/issues/issue-19734.stderr
index 81757974d..81757974d 100644
--- a/src/test/ui/issues/issue-19734.stderr
+++ b/tests/ui/issues/issue-19734.stderr
diff --git a/src/test/ui/issues/issue-1974.rs b/tests/ui/issues/issue-1974.rs
index 74a54a602..74a54a602 100644
--- a/src/test/ui/issues/issue-1974.rs
+++ b/tests/ui/issues/issue-1974.rs
diff --git a/src/test/ui/issues/issue-19811-escape-unicode.rs b/tests/ui/issues/issue-19811-escape-unicode.rs
index a2c50bc02..a2c50bc02 100644
--- a/src/test/ui/issues/issue-19811-escape-unicode.rs
+++ b/tests/ui/issues/issue-19811-escape-unicode.rs
diff --git a/src/test/ui/issues/issue-19850.rs b/tests/ui/issues/issue-19850.rs
index 4a578c398..4a578c398 100644
--- a/src/test/ui/issues/issue-19850.rs
+++ b/tests/ui/issues/issue-19850.rs
diff --git a/src/test/ui/issues/issue-19922.rs b/tests/ui/issues/issue-19922.rs
index fede86f22..fede86f22 100644
--- a/src/test/ui/issues/issue-19922.rs
+++ b/tests/ui/issues/issue-19922.rs
diff --git a/src/test/ui/issues/issue-19922.stderr b/tests/ui/issues/issue-19922.stderr
index 826b2ac04..826b2ac04 100644
--- a/src/test/ui/issues/issue-19922.stderr
+++ b/tests/ui/issues/issue-19922.stderr
diff --git a/src/test/ui/issues/issue-19982.rs b/tests/ui/issues/issue-19982.rs
index 12419c109..12419c109 100644
--- a/src/test/ui/issues/issue-19982.rs
+++ b/tests/ui/issues/issue-19982.rs
diff --git a/src/test/ui/issues/issue-19991.rs b/tests/ui/issues/issue-19991.rs
index dd0efa972..dd0efa972 100644
--- a/src/test/ui/issues/issue-19991.rs
+++ b/tests/ui/issues/issue-19991.rs
diff --git a/src/test/ui/issues/issue-19991.stderr b/tests/ui/issues/issue-19991.stderr
index 57b0882b6..57b0882b6 100644
--- a/src/test/ui/issues/issue-19991.stderr
+++ b/tests/ui/issues/issue-19991.stderr
diff --git a/src/test/ui/issues/issue-20009.rs b/tests/ui/issues/issue-20009.rs
index f289e58c5..f289e58c5 100644
--- a/src/test/ui/issues/issue-20009.rs
+++ b/tests/ui/issues/issue-20009.rs
diff --git a/src/test/ui/issues/issue-20055-box-trait.rs b/tests/ui/issues/issue-20055-box-trait.rs
index 772cd9d7e..772cd9d7e 100644
--- a/src/test/ui/issues/issue-20055-box-trait.rs
+++ b/tests/ui/issues/issue-20055-box-trait.rs
diff --git a/src/test/ui/issues/issue-20055-box-unsized-array.rs b/tests/ui/issues/issue-20055-box-unsized-array.rs
index 1246c8065..1246c8065 100644
--- a/src/test/ui/issues/issue-20055-box-unsized-array.rs
+++ b/tests/ui/issues/issue-20055-box-unsized-array.rs
diff --git a/src/test/ui/issues/issue-20162.rs b/tests/ui/issues/issue-20162.rs
index b491bc37f..b491bc37f 100644
--- a/src/test/ui/issues/issue-20162.rs
+++ b/tests/ui/issues/issue-20162.rs
diff --git a/tests/ui/issues/issue-20162.stderr b/tests/ui/issues/issue-20162.stderr
new file mode 100644
index 000000000..1c5b76fbf
--- /dev/null
+++ b/tests/ui/issues/issue-20162.stderr
@@ -0,0 +1,16 @@
+error[E0277]: the trait bound `X: Ord` is not satisfied
+  --> $DIR/issue-20162.rs:5:7
+   |
+LL |     b.sort();
+   |       ^^^^ the trait `Ord` is not implemented for `X`
+   |
+note: required by a bound in `slice::<impl [T]>::sort`
+  --> $SRC_DIR/alloc/src/slice.rs:LL:COL
+help: consider annotating `X` with `#[derive(Ord)]`
+   |
+LL | #[derive(Ord)]
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/issues/issue-20174.rs b/tests/ui/issues/issue-20174.rs
index 4ed5a97c1..4ed5a97c1 100644
--- a/src/test/ui/issues/issue-20174.rs
+++ b/tests/ui/issues/issue-20174.rs
diff --git a/src/test/ui/issues/issue-20186.rs b/tests/ui/issues/issue-20186.rs
index 54d68f100..54d68f100 100644
--- a/src/test/ui/issues/issue-20186.rs
+++ b/tests/ui/issues/issue-20186.rs
diff --git a/src/test/ui/issues/issue-20225.rs b/tests/ui/issues/issue-20225.rs
index 0c8e6e402..0c8e6e402 100644
--- a/src/test/ui/issues/issue-20225.rs
+++ b/tests/ui/issues/issue-20225.rs
diff --git a/src/test/ui/issues/issue-20225.stderr b/tests/ui/issues/issue-20225.stderr
index 6f4813ca6..582216010 100644
--- a/src/test/ui/issues/issue-20225.stderr
+++ b/tests/ui/issues/issue-20225.stderr
@@ -9,8 +9,8 @@ LL |   extern "rust-call" fn call(&self, (_,): (T,)) {}
    |                                           expected `&T`, found type parameter `T`
    |                                           help: change the parameter type to match the trait: `(&'a T,)`
    |
-   = note: expected fn pointer `extern "rust-call" fn(&Foo, (&'a T,))`
-              found fn pointer `extern "rust-call" fn(&Foo, (T,))`
+   = note: expected signature `extern "rust-call" fn(&Foo, (&'a T,))`
+              found signature `extern "rust-call" fn(&Foo, (T,))`
 
 error[E0053]: method `call_mut` has an incompatible type for trait
   --> $DIR/issue-20225.rs:11:51
@@ -23,8 +23,8 @@ LL |   extern "rust-call" fn call_mut(&mut self, (_,): (T,)) {}
    |                                                   expected `&T`, found type parameter `T`
    |                                                   help: change the parameter type to match the trait: `(&'a T,)`
    |
-   = note: expected fn pointer `extern "rust-call" fn(&mut Foo, (&'a T,))`
-              found fn pointer `extern "rust-call" fn(&mut Foo, (T,))`
+   = note: expected signature `extern "rust-call" fn(&mut Foo, (&'a T,))`
+              found signature `extern "rust-call" fn(&mut Foo, (T,))`
 
 error[E0053]: method `call_once` has an incompatible type for trait
   --> $DIR/issue-20225.rs:18:47
@@ -38,8 +38,8 @@ LL |   extern "rust-call" fn call_once(self, (_,): (T,)) {}
    |                                               expected `&T`, found type parameter `T`
    |                                               help: change the parameter type to match the trait: `(&'a T,)`
    |
-   = note: expected fn pointer `extern "rust-call" fn(Foo, (&'a T,))`
-              found fn pointer `extern "rust-call" fn(Foo, (T,))`
+   = note: expected signature `extern "rust-call" fn(Foo, (&'a T,))`
+              found signature `extern "rust-call" fn(Foo, (T,))`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/issues/issue-20261.rs b/tests/ui/issues/issue-20261.rs
index 528393606..528393606 100644
--- a/src/test/ui/issues/issue-20261.rs
+++ b/tests/ui/issues/issue-20261.rs
diff --git a/src/test/ui/issues/issue-20261.stderr b/tests/ui/issues/issue-20261.stderr
index 9ac751e4d..9ac751e4d 100644
--- a/src/test/ui/issues/issue-20261.stderr
+++ b/tests/ui/issues/issue-20261.stderr
diff --git a/src/test/ui/issues/issue-20313-rpass.rs b/tests/ui/issues/issue-20313-rpass.rs
index 591f3659e..591f3659e 100644
--- a/src/test/ui/issues/issue-20313-rpass.rs
+++ b/tests/ui/issues/issue-20313-rpass.rs
diff --git a/src/test/ui/issues/issue-20313.rs b/tests/ui/issues/issue-20313.rs
index a72af650c..a72af650c 100644
--- a/src/test/ui/issues/issue-20313.rs
+++ b/tests/ui/issues/issue-20313.rs
diff --git a/src/test/ui/issues/issue-20313.stderr b/tests/ui/issues/issue-20313.stderr
index 7a0b344a5..7a0b344a5 100644
--- a/src/test/ui/issues/issue-20313.stderr
+++ b/tests/ui/issues/issue-20313.stderr
diff --git a/src/test/ui/issues/issue-20389.rs b/tests/ui/issues/issue-20389.rs
index 9bc3efcc1..9bc3efcc1 100644
--- a/src/test/ui/issues/issue-20389.rs
+++ b/tests/ui/issues/issue-20389.rs
diff --git a/src/test/ui/issues/issue-20396.rs b/tests/ui/issues/issue-20396.rs
index 4a34f8b38..4a34f8b38 100644
--- a/src/test/ui/issues/issue-20396.rs
+++ b/tests/ui/issues/issue-20396.rs
diff --git a/src/test/ui/issues/issue-20413.rs b/tests/ui/issues/issue-20413.rs
index 4de22f0c9..4de22f0c9 100644
--- a/src/test/ui/issues/issue-20413.rs
+++ b/tests/ui/issues/issue-20413.rs
diff --git a/src/test/ui/issues/issue-20413.stderr b/tests/ui/issues/issue-20413.stderr
index 78df44597..202e84631 100644
--- a/src/test/ui/issues/issue-20413.stderr
+++ b/tests/ui/issues/issue-20413.stderr
@@ -18,7 +18,7 @@ note: required for `NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoDa
   --> $DIR/issue-20413.rs:9:9
    |
 LL | impl<T> Foo for T where NoData<T>: Foo {
-   |         ^^^     ^
+   |         ^^^     ^                  --- unsatisfied trait bound introduced here
    = note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-20413/issue-20413.long-type-hash.txt'
    = note: 127 redundant requirements hidden
    = note: required for `NoData<T>` to implement `Foo`
@@ -34,13 +34,13 @@ note: required for `AlmostNoData<EvenLessData<AlmostNoData<EvenLessData<AlmostNo
   --> $DIR/issue-20413.rs:28:9
    |
 LL | impl<T> Bar for T where EvenLessData<T>: Baz {
-   |         ^^^     ^
+   |         ^^^     ^                        --- unsatisfied trait bound introduced here
    = note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-20413/issue-20413.long-type-hash.txt'
 note: required for `EvenLessData<AlmostNoData<EvenLessData<AlmostNoData<EvenLessData<AlmostNoData<EvenLessData<...>>>>>>>` to implement `Baz`
   --> $DIR/issue-20413.rs:35:9
    |
 LL | impl<T> Baz for T where AlmostNoData<T>: Bar {
-   |         ^^^     ^
+   |         ^^^     ^                        --- unsatisfied trait bound introduced here
    = note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-20413/issue-20413.long-type-hash.txt'
    = note: 126 redundant requirements hidden
    = note: required for `EvenLessData<T>` to implement `Baz`
@@ -56,13 +56,13 @@ note: required for `EvenLessData<AlmostNoData<EvenLessData<AlmostNoData<EvenLess
   --> $DIR/issue-20413.rs:35:9
    |
 LL | impl<T> Baz for T where AlmostNoData<T>: Bar {
-   |         ^^^     ^
+   |         ^^^     ^                        --- unsatisfied trait bound introduced here
    = note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-20413/issue-20413.long-type-hash.txt'
 note: required for `AlmostNoData<EvenLessData<AlmostNoData<EvenLessData<AlmostNoData<EvenLessData<AlmostNoData<...>>>>>>>` to implement `Bar`
   --> $DIR/issue-20413.rs:28:9
    |
 LL | impl<T> Bar for T where EvenLessData<T>: Baz {
-   |         ^^^     ^
+   |         ^^^     ^                        --- unsatisfied trait bound introduced here
    = note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-20413/issue-20413.long-type-hash.txt'
    = note: 126 redundant requirements hidden
    = note: required for `AlmostNoData<T>` to implement `Bar`
diff --git a/src/test/ui/issues/issue-20414.rs b/tests/ui/issues/issue-20414.rs
index 2496e342a..2496e342a 100644
--- a/src/test/ui/issues/issue-20414.rs
+++ b/tests/ui/issues/issue-20414.rs
diff --git a/src/test/ui/issues/issue-20427.rs b/tests/ui/issues/issue-20427.rs
index cfd8b2191..cfd8b2191 100644
--- a/src/test/ui/issues/issue-20427.rs
+++ b/tests/ui/issues/issue-20427.rs
diff --git a/src/test/ui/issues/issue-20433.rs b/tests/ui/issues/issue-20433.rs
index a663239cc..a663239cc 100644
--- a/src/test/ui/issues/issue-20433.rs
+++ b/tests/ui/issues/issue-20433.rs
diff --git a/tests/ui/issues/issue-20433.stderr b/tests/ui/issues/issue-20433.stderr
new file mode 100644
index 000000000..3ae952546
--- /dev/null
+++ b/tests/ui/issues/issue-20433.stderr
@@ -0,0 +1,13 @@
+error[E0277]: the size for values of type `[i32]` cannot be known at compilation time
+  --> $DIR/issue-20433.rs:6:18
+   |
+LL |     fn iceman(c: Vec<[i32]>) {}
+   |                  ^^^^^^^^^^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `[i32]`
+note: required by a bound in `Vec`
+  --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/issues/issue-20454.rs b/tests/ui/issues/issue-20454.rs
index 46cae33f1..46cae33f1 100644
--- a/src/test/ui/issues/issue-20454.rs
+++ b/tests/ui/issues/issue-20454.rs
diff --git a/src/test/ui/issues/issue-20544.rs b/tests/ui/issues/issue-20544.rs
index 0f4d314f1..0f4d314f1 100644
--- a/src/test/ui/issues/issue-20544.rs
+++ b/tests/ui/issues/issue-20544.rs
diff --git a/src/test/ui/issues/issue-20575.rs b/tests/ui/issues/issue-20575.rs
index 0ca67d9dc..0ca67d9dc 100644
--- a/src/test/ui/issues/issue-20575.rs
+++ b/tests/ui/issues/issue-20575.rs
diff --git a/src/test/ui/issues/issue-20605.rs b/tests/ui/issues/issue-20605.rs
index 17b7d32eb..17b7d32eb 100644
--- a/src/test/ui/issues/issue-20605.rs
+++ b/tests/ui/issues/issue-20605.rs
diff --git a/src/test/ui/issues/issue-20605.stderr b/tests/ui/issues/issue-20605.stderr
index e1858b639..e1858b639 100644
--- a/src/test/ui/issues/issue-20605.stderr
+++ b/tests/ui/issues/issue-20605.stderr
diff --git a/src/test/ui/issues/issue-20616.rs b/tests/ui/issues/issue-20616.rs
index 6c24d4372..6c24d4372 100644
--- a/src/test/ui/issues/issue-20616.rs
+++ b/tests/ui/issues/issue-20616.rs
diff --git a/src/test/ui/issues/issue-2063-resource.rs b/tests/ui/issues/issue-2063-resource.rs
index 1d0527447..1d0527447 100644
--- a/src/test/ui/issues/issue-2063-resource.rs
+++ b/tests/ui/issues/issue-2063-resource.rs
diff --git a/src/test/ui/issues/issue-2063.rs b/tests/ui/issues/issue-2063.rs
index f08f9d4cf..f08f9d4cf 100644
--- a/src/test/ui/issues/issue-2063.rs
+++ b/tests/ui/issues/issue-2063.rs
diff --git a/src/test/ui/issues/issue-20644.rs b/tests/ui/issues/issue-20644.rs
index 1b90727fb..1b90727fb 100644
--- a/src/test/ui/issues/issue-20644.rs
+++ b/tests/ui/issues/issue-20644.rs
diff --git a/src/test/ui/issues/issue-20676.rs b/tests/ui/issues/issue-20676.rs
index 2bc503496..2bc503496 100644
--- a/src/test/ui/issues/issue-20676.rs
+++ b/tests/ui/issues/issue-20676.rs
diff --git a/src/test/ui/issues/issue-20714.rs b/tests/ui/issues/issue-20714.rs
index 3aa39bb73..3aa39bb73 100644
--- a/src/test/ui/issues/issue-20714.rs
+++ b/tests/ui/issues/issue-20714.rs
diff --git a/src/test/ui/issues/issue-20714.stderr b/tests/ui/issues/issue-20714.stderr
index a3447aa68..a3447aa68 100644
--- a/src/test/ui/issues/issue-20714.stderr
+++ b/tests/ui/issues/issue-20714.stderr
diff --git a/src/test/ui/issues/issue-2074.rs b/tests/ui/issues/issue-2074.rs
index a6bea3858..a6bea3858 100644
--- a/src/test/ui/issues/issue-2074.rs
+++ b/tests/ui/issues/issue-2074.rs
diff --git a/src/test/ui/issues/issue-20763-1.rs b/tests/ui/issues/issue-20763-1.rs
index 858d313fc..858d313fc 100644
--- a/src/test/ui/issues/issue-20763-1.rs
+++ b/tests/ui/issues/issue-20763-1.rs
diff --git a/src/test/ui/issues/issue-20763-2.rs b/tests/ui/issues/issue-20763-2.rs
index aa5bed209..aa5bed209 100644
--- a/src/test/ui/issues/issue-20763-2.rs
+++ b/tests/ui/issues/issue-20763-2.rs
diff --git a/src/test/ui/issues/issue-20772.rs b/tests/ui/issues/issue-20772.rs
index 1500bc831..1500bc831 100644
--- a/src/test/ui/issues/issue-20772.rs
+++ b/tests/ui/issues/issue-20772.rs
diff --git a/src/test/ui/issues/issue-20772.stderr b/tests/ui/issues/issue-20772.stderr
index 22b9f5bd4..22b9f5bd4 100644
--- a/src/test/ui/issues/issue-20772.stderr
+++ b/tests/ui/issues/issue-20772.stderr
diff --git a/src/test/ui/issues/issue-20797.rs b/tests/ui/issues/issue-20797.rs
index ef0e72571..ef0e72571 100644
--- a/src/test/ui/issues/issue-20797.rs
+++ b/tests/ui/issues/issue-20797.rs
diff --git a/src/test/ui/issues/issue-20803.rs b/tests/ui/issues/issue-20803.rs
index f657cf6cd..f657cf6cd 100644
--- a/src/test/ui/issues/issue-20803.rs
+++ b/tests/ui/issues/issue-20803.rs
diff --git a/src/test/ui/issues/issue-20831-debruijn.rs b/tests/ui/issues/issue-20831-debruijn.rs
index 20d980763..20d980763 100644
--- a/src/test/ui/issues/issue-20831-debruijn.rs
+++ b/tests/ui/issues/issue-20831-debruijn.rs
diff --git a/tests/ui/issues/issue-20831-debruijn.stderr b/tests/ui/issues/issue-20831-debruijn.stderr
new file mode 100644
index 000000000..c3af1f678
--- /dev/null
+++ b/tests/ui/issues/issue-20831-debruijn.stderr
@@ -0,0 +1,27 @@
+error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements
+  --> $DIR/issue-20831-debruijn.rs:28:33
+   |
+LL |     fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher>::Output> + 'a>) {
+   |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+note: first, the lifetime cannot outlive the anonymous lifetime defined here...
+  --> $DIR/issue-20831-debruijn.rs:28:58
+   |
+LL |     fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher>::Output> + 'a>) {
+   |                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...but the lifetime must also be valid for the lifetime `'a` as defined here...
+  --> $DIR/issue-20831-debruijn.rs:26:6
+   |
+LL | impl<'a> Publisher<'a> for MyStruct<'a> {
+   |      ^^
+note: ...so that the types are compatible
+  --> $DIR/issue-20831-debruijn.rs:28:33
+   |
+LL |     fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher>::Output> + 'a>) {
+   |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: expected `<MyStruct<'a> as Publisher<'_>>`
+              found `<MyStruct<'_> as Publisher<'_>>`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0495`.
diff --git a/src/test/ui/issues/issue-20847.rs b/tests/ui/issues/issue-20847.rs
index 0cd7edf89..0cd7edf89 100644
--- a/src/test/ui/issues/issue-20847.rs
+++ b/tests/ui/issues/issue-20847.rs
diff --git a/src/test/ui/issues/issue-20939.rs b/tests/ui/issues/issue-20939.rs
index c0c222978..c0c222978 100644
--- a/src/test/ui/issues/issue-20939.rs
+++ b/tests/ui/issues/issue-20939.rs
diff --git a/src/test/ui/issues/issue-20939.stderr b/tests/ui/issues/issue-20939.stderr
index 3819a21a2..3819a21a2 100644
--- a/src/test/ui/issues/issue-20939.stderr
+++ b/tests/ui/issues/issue-20939.stderr
diff --git a/src/test/ui/issues/issue-20953.rs b/tests/ui/issues/issue-20953.rs
index 4ec7e3195..4ec7e3195 100644
--- a/src/test/ui/issues/issue-20953.rs
+++ b/tests/ui/issues/issue-20953.rs
diff --git a/src/test/ui/issues/issue-20971.rs b/tests/ui/issues/issue-20971.rs
index 2e1041817..2e1041817 100644
--- a/src/test/ui/issues/issue-20971.rs
+++ b/tests/ui/issues/issue-20971.rs
diff --git a/src/test/ui/issues/issue-21033.rs b/tests/ui/issues/issue-21033.rs
index 91f72eb36..91f72eb36 100644
--- a/src/test/ui/issues/issue-21033.rs
+++ b/tests/ui/issues/issue-21033.rs
diff --git a/src/test/ui/issues/issue-21140.rs b/tests/ui/issues/issue-21140.rs
index 01de90111..01de90111 100644
--- a/src/test/ui/issues/issue-21140.rs
+++ b/tests/ui/issues/issue-21140.rs
diff --git a/src/test/ui/issues/issue-21160.rs b/tests/ui/issues/issue-21160.rs
index 10136ba11..10136ba11 100644
--- a/src/test/ui/issues/issue-21160.rs
+++ b/tests/ui/issues/issue-21160.rs
diff --git a/src/test/ui/issues/issue-21160.stderr b/tests/ui/issues/issue-21160.stderr
index 266749376..266749376 100644
--- a/src/test/ui/issues/issue-21160.stderr
+++ b/tests/ui/issues/issue-21160.stderr
diff --git a/src/test/ui/issues/issue-21174-2.rs b/tests/ui/issues/issue-21174-2.rs
index c90f91f6a..c90f91f6a 100644
--- a/src/test/ui/issues/issue-21174-2.rs
+++ b/tests/ui/issues/issue-21174-2.rs
diff --git a/src/test/ui/issues/issue-21174.rs b/tests/ui/issues/issue-21174.rs
index 078274251..078274251 100644
--- a/src/test/ui/issues/issue-21174.rs
+++ b/tests/ui/issues/issue-21174.rs
diff --git a/src/test/ui/issues/issue-21174.stderr b/tests/ui/issues/issue-21174.stderr
index 5981d9dc7..5981d9dc7 100644
--- a/src/test/ui/issues/issue-21174.stderr
+++ b/tests/ui/issues/issue-21174.stderr
diff --git a/src/test/ui/issues/issue-21177.rs b/tests/ui/issues/issue-21177.rs
index 258e362d1..258e362d1 100644
--- a/src/test/ui/issues/issue-21177.rs
+++ b/tests/ui/issues/issue-21177.rs
diff --git a/src/test/ui/issues/issue-21177.stderr b/tests/ui/issues/issue-21177.stderr
index 6877a1846..6877a1846 100644
--- a/src/test/ui/issues/issue-21177.stderr
+++ b/tests/ui/issues/issue-21177.stderr
diff --git a/src/test/ui/issues/issue-21202.rs b/tests/ui/issues/issue-21202.rs
index f62de7ce7..f62de7ce7 100644
--- a/src/test/ui/issues/issue-21202.rs
+++ b/tests/ui/issues/issue-21202.rs
diff --git a/src/test/ui/issues/issue-21202.stderr b/tests/ui/issues/issue-21202.stderr
index 1d2816fed..1d2816fed 100644
--- a/src/test/ui/issues/issue-21202.stderr
+++ b/tests/ui/issues/issue-21202.stderr
diff --git a/src/test/ui/issues/issue-21245.rs b/tests/ui/issues/issue-21245.rs
index c8e55a0cc..c8e55a0cc 100644
--- a/src/test/ui/issues/issue-21245.rs
+++ b/tests/ui/issues/issue-21245.rs
diff --git a/src/test/ui/issues/issue-21291.rs b/tests/ui/issues/issue-21291.rs
index b351e22d8..b351e22d8 100644
--- a/src/test/ui/issues/issue-21291.rs
+++ b/tests/ui/issues/issue-21291.rs
diff --git a/src/test/ui/issues/issue-21306.rs b/tests/ui/issues/issue-21306.rs
index b06a475e4..b06a475e4 100644
--- a/src/test/ui/issues/issue-21306.rs
+++ b/tests/ui/issues/issue-21306.rs
diff --git a/src/test/ui/issues/issue-21332.rs b/tests/ui/issues/issue-21332.rs
index 6547f3a9b..6547f3a9b 100644
--- a/src/test/ui/issues/issue-21332.rs
+++ b/tests/ui/issues/issue-21332.rs
diff --git a/src/test/ui/issues/issue-21332.stderr b/tests/ui/issues/issue-21332.stderr
index d92966da1..0e1beebf2 100644
--- a/src/test/ui/issues/issue-21332.stderr
+++ b/tests/ui/issues/issue-21332.stderr
@@ -7,8 +7,8 @@ LL |     fn next(&mut self) -> Result<i32, i32> { Ok(7) }
    |                           expected enum `Option`, found enum `Result`
    |                           help: change the output type to match the trait: `Option<i32>`
    |
-   = note: expected fn pointer `fn(&mut S) -> Option<i32>`
-              found fn pointer `fn(&mut S) -> Result<i32, i32>`
+   = note: expected signature `fn(&mut S) -> Option<i32>`
+              found signature `fn(&mut S) -> Result<i32, i32>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-21361.rs b/tests/ui/issues/issue-21361.rs
index c970e77ab..c970e77ab 100644
--- a/src/test/ui/issues/issue-21361.rs
+++ b/tests/ui/issues/issue-21361.rs
diff --git a/src/test/ui/issues/issue-21384.rs b/tests/ui/issues/issue-21384.rs
index caa99a159..caa99a159 100644
--- a/src/test/ui/issues/issue-21384.rs
+++ b/tests/ui/issues/issue-21384.rs
diff --git a/src/test/ui/issues/issue-21400.rs b/tests/ui/issues/issue-21400.rs
index 4a85158d9..4a85158d9 100644
--- a/src/test/ui/issues/issue-21400.rs
+++ b/tests/ui/issues/issue-21400.rs
diff --git a/src/test/ui/issues/issue-21402.rs b/tests/ui/issues/issue-21402.rs
index d140b6162..d140b6162 100644
--- a/src/test/ui/issues/issue-21402.rs
+++ b/tests/ui/issues/issue-21402.rs
diff --git a/src/test/ui/issues/issue-21449.rs b/tests/ui/issues/issue-21449.rs
index 00ce2b7ff..00ce2b7ff 100644
--- a/src/test/ui/issues/issue-21449.rs
+++ b/tests/ui/issues/issue-21449.rs
diff --git a/src/test/ui/issues/issue-21449.stderr b/tests/ui/issues/issue-21449.stderr
index ecaf6faba..ecaf6faba 100644
--- a/src/test/ui/issues/issue-21449.stderr
+++ b/tests/ui/issues/issue-21449.stderr
diff --git a/src/test/ui/issues/issue-2150.rs b/tests/ui/issues/issue-2150.rs
index baa1dde0f..baa1dde0f 100644
--- a/src/test/ui/issues/issue-2150.rs
+++ b/tests/ui/issues/issue-2150.rs
diff --git a/src/test/ui/issues/issue-2150.stderr b/tests/ui/issues/issue-2150.stderr
index 26874faa2..26874faa2 100644
--- a/src/test/ui/issues/issue-2150.stderr
+++ b/tests/ui/issues/issue-2150.stderr
diff --git a/src/test/ui/issues/issue-2151.rs b/tests/ui/issues/issue-2151.rs
index 82cf49de8..82cf49de8 100644
--- a/src/test/ui/issues/issue-2151.rs
+++ b/tests/ui/issues/issue-2151.rs
diff --git a/src/test/ui/issues/issue-2151.stderr b/tests/ui/issues/issue-2151.stderr
index 31a8ca5fb..c75038b61 100644
--- a/src/test/ui/issues/issue-2151.stderr
+++ b/tests/ui/issues/issue-2151.stderr
@@ -8,8 +8,8 @@ LL |     x.clone();
    |
 help: consider giving `x` an explicit type
    |
-LL |     let x: _ = panic!();
-   |          +++
+LL |     let x: /* Type */ = panic!();
+   |          ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-21546.rs b/tests/ui/issues/issue-21546.rs
index 9f3974b43..9f3974b43 100644
--- a/src/test/ui/issues/issue-21546.rs
+++ b/tests/ui/issues/issue-21546.rs
diff --git a/src/test/ui/issues/issue-21546.stderr b/tests/ui/issues/issue-21546.stderr
index 5fd06fc67..5fd06fc67 100644
--- a/src/test/ui/issues/issue-21546.stderr
+++ b/tests/ui/issues/issue-21546.stderr
diff --git a/src/test/ui/issues/issue-21554.rs b/tests/ui/issues/issue-21554.rs
index c176b1247..c176b1247 100644
--- a/src/test/ui/issues/issue-21554.rs
+++ b/tests/ui/issues/issue-21554.rs
diff --git a/src/test/ui/issues/issue-21554.stderr b/tests/ui/issues/issue-21554.stderr
index 6ea552a26..6ea552a26 100644
--- a/src/test/ui/issues/issue-21554.stderr
+++ b/tests/ui/issues/issue-21554.stderr
diff --git a/src/test/ui/issues/issue-21596.rs b/tests/ui/issues/issue-21596.rs
index 79f6c91d9..79f6c91d9 100644
--- a/src/test/ui/issues/issue-21596.rs
+++ b/tests/ui/issues/issue-21596.rs
diff --git a/src/test/ui/issues/issue-21596.stderr b/tests/ui/issues/issue-21596.stderr
index a336d1b0e..a336d1b0e 100644
--- a/src/test/ui/issues/issue-21596.stderr
+++ b/tests/ui/issues/issue-21596.stderr
diff --git a/src/test/ui/issues/issue-21600.rs b/tests/ui/issues/issue-21600.rs
index 2e22e5e6f..2e22e5e6f 100644
--- a/src/test/ui/issues/issue-21600.rs
+++ b/tests/ui/issues/issue-21600.rs
diff --git a/src/test/ui/issues/issue-21600.stderr b/tests/ui/issues/issue-21600.stderr
index ea304f936..ea304f936 100644
--- a/src/test/ui/issues/issue-21600.stderr
+++ b/tests/ui/issues/issue-21600.stderr
diff --git a/src/test/ui/issues/issue-21622.rs b/tests/ui/issues/issue-21622.rs
index 2d4cddac9..2d4cddac9 100644
--- a/src/test/ui/issues/issue-21622.rs
+++ b/tests/ui/issues/issue-21622.rs
diff --git a/src/test/ui/issues/issue-21634.rs b/tests/ui/issues/issue-21634.rs
index 2731bfd76..2731bfd76 100644
--- a/src/test/ui/issues/issue-21634.rs
+++ b/tests/ui/issues/issue-21634.rs
diff --git a/src/test/ui/issues/issue-21655.rs b/tests/ui/issues/issue-21655.rs
index d1cd4ec7b..d1cd4ec7b 100644
--- a/src/test/ui/issues/issue-21655.rs
+++ b/tests/ui/issues/issue-21655.rs
diff --git a/src/test/ui/issues/issue-2170-exe.rs b/tests/ui/issues/issue-2170-exe.rs
index a89579706..a89579706 100644
--- a/src/test/ui/issues/issue-2170-exe.rs
+++ b/tests/ui/issues/issue-2170-exe.rs
diff --git a/src/test/ui/issues/issue-21701.rs b/tests/ui/issues/issue-21701.rs
index bfa03c5e4..bfa03c5e4 100644
--- a/src/test/ui/issues/issue-21701.rs
+++ b/tests/ui/issues/issue-21701.rs
diff --git a/src/test/ui/issues/issue-21701.stderr b/tests/ui/issues/issue-21701.stderr
index 9f1fe7dde..9f1fe7dde 100644
--- a/src/test/ui/issues/issue-21701.stderr
+++ b/tests/ui/issues/issue-21701.stderr
diff --git a/src/test/ui/issues/issue-21763.rs b/tests/ui/issues/issue-21763.rs
index 5beb1d8b8..5beb1d8b8 100644
--- a/src/test/ui/issues/issue-21763.rs
+++ b/tests/ui/issues/issue-21763.rs
diff --git a/src/test/ui/issues/issue-21763.stderr b/tests/ui/issues/issue-21763.stderr
index 72c650297..04379f07b 100644
--- a/src/test/ui/issues/issue-21763.stderr
+++ b/tests/ui/issues/issue-21763.stderr
@@ -7,7 +7,7 @@ LL |     foo::<HashMap<Rc<()>, Rc<()>>>();
    = help: within `(Rc<()>, Rc<()>)`, the trait `Send` is not implemented for `Rc<()>`
    = note: required because it appears within the type `(Rc<()>, Rc<()>)`
    = note: required for `hashbrown::raw::RawTable<(Rc<()>, Rc<()>)>` to implement `Send`
-   = note: required because it appears within the type `hashbrown::map::HashMap<Rc<()>, Rc<()>, RandomState>`
+   = note: required because it appears within the type `HashMap<Rc<()>, Rc<()>, RandomState>`
    = note: required because it appears within the type `HashMap<Rc<()>, Rc<()>>`
 note: required by a bound in `foo`
   --> $DIR/issue-21763.rs:6:11
diff --git a/src/test/ui/issues/issue-21837.rs b/tests/ui/issues/issue-21837.rs
index 213119bd2..213119bd2 100644
--- a/src/test/ui/issues/issue-21837.rs
+++ b/tests/ui/issues/issue-21837.rs
diff --git a/src/test/ui/issues/issue-21837.stderr b/tests/ui/issues/issue-21837.stderr
index 3d3852664..3d3852664 100644
--- a/src/test/ui/issues/issue-21837.stderr
+++ b/tests/ui/issues/issue-21837.stderr
diff --git a/src/test/ui/issues/issue-21891.rs b/tests/ui/issues/issue-21891.rs
index 576f0253e..576f0253e 100644
--- a/src/test/ui/issues/issue-21891.rs
+++ b/tests/ui/issues/issue-21891.rs
diff --git a/src/test/ui/issues/issue-2190-1.rs b/tests/ui/issues/issue-2190-1.rs
index e67a924b9..e67a924b9 100644
--- a/src/test/ui/issues/issue-2190-1.rs
+++ b/tests/ui/issues/issue-2190-1.rs
diff --git a/src/test/ui/issues/issue-21909.rs b/tests/ui/issues/issue-21909.rs
index 7cb558d9a..7cb558d9a 100644
--- a/src/test/ui/issues/issue-21909.rs
+++ b/tests/ui/issues/issue-21909.rs
diff --git a/src/test/ui/issues/issue-21922.rs b/tests/ui/issues/issue-21922.rs
index 9727b2efe..9727b2efe 100644
--- a/src/test/ui/issues/issue-21922.rs
+++ b/tests/ui/issues/issue-21922.rs
diff --git a/src/test/ui/issues/issue-21946.rs b/tests/ui/issues/issue-21946.rs
index d0c052cb2..d0c052cb2 100644
--- a/src/test/ui/issues/issue-21946.rs
+++ b/tests/ui/issues/issue-21946.rs
diff --git a/src/test/ui/issues/issue-21946.stderr b/tests/ui/issues/issue-21946.stderr
index 67f6b3081..67f6b3081 100644
--- a/src/test/ui/issues/issue-21946.stderr
+++ b/tests/ui/issues/issue-21946.stderr
diff --git a/src/test/ui/issues/issue-21950.rs b/tests/ui/issues/issue-21950.rs
index 72a98bd8d..72a98bd8d 100644
--- a/src/test/ui/issues/issue-21950.rs
+++ b/tests/ui/issues/issue-21950.rs
diff --git a/src/test/ui/issues/issue-21950.stderr b/tests/ui/issues/issue-21950.stderr
index 731615a6b..731615a6b 100644
--- a/src/test/ui/issues/issue-21950.stderr
+++ b/tests/ui/issues/issue-21950.stderr
diff --git a/src/test/ui/issues/issue-21974.rs b/tests/ui/issues/issue-21974.rs
index f7c659be1..f7c659be1 100644
--- a/src/test/ui/issues/issue-21974.rs
+++ b/tests/ui/issues/issue-21974.rs
diff --git a/tests/ui/issues/issue-21974.stderr b/tests/ui/issues/issue-21974.stderr
new file mode 100644
index 000000000..2d60b18b1
--- /dev/null
+++ b/tests/ui/issues/issue-21974.stderr
@@ -0,0 +1,17 @@
+error[E0283]: type annotations needed: cannot satisfy `&'a T: Foo`
+  --> $DIR/issue-21974.rs:11:19
+   |
+LL |     where &'a T : Foo,
+   |                   ^^^
+   |
+note: multiple `impl`s or `where` clauses satisfying `&'a T: Foo` found
+  --> $DIR/issue-21974.rs:11:19
+   |
+LL |     where &'a T : Foo,
+   |                   ^^^
+LL |           &'b T : Foo
+   |                   ^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0283`.
diff --git a/src/test/ui/issues/issue-22008.rs b/tests/ui/issues/issue-22008.rs
index 004255822..004255822 100644
--- a/src/test/ui/issues/issue-22008.rs
+++ b/tests/ui/issues/issue-22008.rs
diff --git a/src/test/ui/issues/issue-22034.rs b/tests/ui/issues/issue-22034.rs
index 405ffd089..405ffd089 100644
--- a/src/test/ui/issues/issue-22034.rs
+++ b/tests/ui/issues/issue-22034.rs
diff --git a/src/test/ui/issues/issue-22034.stderr b/tests/ui/issues/issue-22034.stderr
index b32de5b24..b32de5b24 100644
--- a/src/test/ui/issues/issue-22034.stderr
+++ b/tests/ui/issues/issue-22034.stderr
diff --git a/src/test/ui/issues/issue-22036.rs b/tests/ui/issues/issue-22036.rs
index 30da2130a..30da2130a 100644
--- a/src/test/ui/issues/issue-22036.rs
+++ b/tests/ui/issues/issue-22036.rs
diff --git a/src/test/ui/issues/issue-2214.rs b/tests/ui/issues/issue-2214.rs
index 1994c3515..1994c3515 100644
--- a/src/test/ui/issues/issue-2214.rs
+++ b/tests/ui/issues/issue-2214.rs
diff --git a/src/test/ui/issues/issue-22258.rs b/tests/ui/issues/issue-22258.rs
index 93ead5818..93ead5818 100644
--- a/src/test/ui/issues/issue-22258.rs
+++ b/tests/ui/issues/issue-22258.rs
diff --git a/src/test/ui/issues/issue-22289.rs b/tests/ui/issues/issue-22289.rs
index e1b3dfe5b..e1b3dfe5b 100644
--- a/src/test/ui/issues/issue-22289.rs
+++ b/tests/ui/issues/issue-22289.rs
diff --git a/src/test/ui/issues/issue-22289.stderr b/tests/ui/issues/issue-22289.stderr
index b594e8b7a..b594e8b7a 100644
--- a/src/test/ui/issues/issue-22289.stderr
+++ b/tests/ui/issues/issue-22289.stderr
diff --git a/src/test/ui/issues/issue-22312.rs b/tests/ui/issues/issue-22312.rs
index 4e359b341..4e359b341 100644
--- a/src/test/ui/issues/issue-22312.rs
+++ b/tests/ui/issues/issue-22312.rs
diff --git a/src/test/ui/issues/issue-22312.stderr b/tests/ui/issues/issue-22312.stderr
index da15c092f..da15c092f 100644
--- a/src/test/ui/issues/issue-22312.stderr
+++ b/tests/ui/issues/issue-22312.stderr
diff --git a/src/test/ui/issues/issue-22346.rs b/tests/ui/issues/issue-22346.rs
index 5f6d9dcc9..5f6d9dcc9 100644
--- a/src/test/ui/issues/issue-22346.rs
+++ b/tests/ui/issues/issue-22346.rs
diff --git a/src/test/ui/issues/issue-22356.rs b/tests/ui/issues/issue-22356.rs
index 47fad3bb9..47fad3bb9 100644
--- a/src/test/ui/issues/issue-22356.rs
+++ b/tests/ui/issues/issue-22356.rs
diff --git a/src/test/ui/issues/issue-22370.rs b/tests/ui/issues/issue-22370.rs
index bab0469c0..bab0469c0 100644
--- a/src/test/ui/issues/issue-22370.rs
+++ b/tests/ui/issues/issue-22370.rs
diff --git a/src/test/ui/issues/issue-22370.stderr b/tests/ui/issues/issue-22370.stderr
index cd27c4e4e..cd27c4e4e 100644
--- a/src/test/ui/issues/issue-22370.stderr
+++ b/tests/ui/issues/issue-22370.stderr
diff --git a/src/test/ui/issues/issue-22384.rs b/tests/ui/issues/issue-22384.rs
index 98988f27e..98988f27e 100644
--- a/src/test/ui/issues/issue-22384.rs
+++ b/tests/ui/issues/issue-22384.rs
diff --git a/src/test/ui/issues/issue-22384.stderr b/tests/ui/issues/issue-22384.stderr
index 1f767a443..1f767a443 100644
--- a/src/test/ui/issues/issue-22384.stderr
+++ b/tests/ui/issues/issue-22384.stderr
diff --git a/src/test/ui/issues/issue-22403.rs b/tests/ui/issues/issue-22403.rs
index 8d8559094..8d8559094 100644
--- a/src/test/ui/issues/issue-22403.rs
+++ b/tests/ui/issues/issue-22403.rs
diff --git a/src/test/ui/issues/issue-22426.rs b/tests/ui/issues/issue-22426.rs
index adf060a82..adf060a82 100644
--- a/src/test/ui/issues/issue-22426.rs
+++ b/tests/ui/issues/issue-22426.rs
diff --git a/src/test/ui/issues/issue-22434.rs b/tests/ui/issues/issue-22434.rs
index 34057b46e..34057b46e 100644
--- a/src/test/ui/issues/issue-22434.rs
+++ b/tests/ui/issues/issue-22434.rs
diff --git a/src/test/ui/issues/issue-22434.stderr b/tests/ui/issues/issue-22434.stderr
index b97fa2503..b97fa2503 100644
--- a/src/test/ui/issues/issue-22434.stderr
+++ b/tests/ui/issues/issue-22434.stderr
diff --git a/src/test/ui/issues/issue-22468.rs b/tests/ui/issues/issue-22468.rs
index 197a19c03..197a19c03 100644
--- a/src/test/ui/issues/issue-22468.rs
+++ b/tests/ui/issues/issue-22468.rs
diff --git a/src/test/ui/issues/issue-22468.stderr b/tests/ui/issues/issue-22468.stderr
index 3fff91acb..3fff91acb 100644
--- a/src/test/ui/issues/issue-22468.stderr
+++ b/tests/ui/issues/issue-22468.stderr
diff --git a/src/test/ui/issues/issue-22471.rs b/tests/ui/issues/issue-22471.rs
index 69879ab7f..69879ab7f 100644
--- a/src/test/ui/issues/issue-22471.rs
+++ b/tests/ui/issues/issue-22471.rs
diff --git a/src/test/ui/issues/issue-22536-copy-mustnt-zero.rs b/tests/ui/issues/issue-22536-copy-mustnt-zero.rs
index 017f36484..017f36484 100644
--- a/src/test/ui/issues/issue-22536-copy-mustnt-zero.rs
+++ b/tests/ui/issues/issue-22536-copy-mustnt-zero.rs
diff --git a/src/test/ui/issues/issue-22577.rs b/tests/ui/issues/issue-22577.rs
index 8aca21bf1..8aca21bf1 100644
--- a/src/test/ui/issues/issue-22577.rs
+++ b/tests/ui/issues/issue-22577.rs
diff --git a/src/test/ui/issues/issue-22599.rs b/tests/ui/issues/issue-22599.rs
index 05096e5c1..05096e5c1 100644
--- a/src/test/ui/issues/issue-22599.rs
+++ b/tests/ui/issues/issue-22599.rs
diff --git a/src/test/ui/issues/issue-22599.stderr b/tests/ui/issues/issue-22599.stderr
index 2b34830d0..2b34830d0 100644
--- a/src/test/ui/issues/issue-22599.stderr
+++ b/tests/ui/issues/issue-22599.stderr
diff --git a/src/test/ui/issues/issue-22603.rs b/tests/ui/issues/issue-22603.rs
index a83e291f9..a83e291f9 100644
--- a/src/test/ui/issues/issue-22603.rs
+++ b/tests/ui/issues/issue-22603.rs
diff --git a/src/test/ui/issues/issue-22629.rs b/tests/ui/issues/issue-22629.rs
index 7beeb126e..7beeb126e 100644
--- a/src/test/ui/issues/issue-22629.rs
+++ b/tests/ui/issues/issue-22629.rs
diff --git a/src/test/ui/issues/issue-22638.polonius.stderr b/tests/ui/issues/issue-22638.polonius.stderr
index 87a7c00e4..87a7c00e4 100644
--- a/src/test/ui/issues/issue-22638.polonius.stderr
+++ b/tests/ui/issues/issue-22638.polonius.stderr
diff --git a/src/test/ui/issues/issue-22638.rs b/tests/ui/issues/issue-22638.rs
index 198ceccc2..198ceccc2 100644
--- a/src/test/ui/issues/issue-22638.rs
+++ b/tests/ui/issues/issue-22638.rs
diff --git a/src/test/ui/issues/issue-22638.stderr b/tests/ui/issues/issue-22638.stderr
index 1caa4221f..1caa4221f 100644
--- a/src/test/ui/issues/issue-22638.stderr
+++ b/tests/ui/issues/issue-22638.stderr
diff --git a/src/test/ui/issues/issue-22644.rs b/tests/ui/issues/issue-22644.rs
index b1d69dcd8..b1d69dcd8 100644
--- a/src/test/ui/issues/issue-22644.rs
+++ b/tests/ui/issues/issue-22644.rs
diff --git a/src/test/ui/issues/issue-22644.stderr b/tests/ui/issues/issue-22644.stderr
index 45027afa7..45027afa7 100644
--- a/src/test/ui/issues/issue-22644.stderr
+++ b/tests/ui/issues/issue-22644.stderr
diff --git a/src/test/ui/issues/issue-22673.rs b/tests/ui/issues/issue-22673.rs
index 4b9b4d6b2..4b9b4d6b2 100644
--- a/src/test/ui/issues/issue-22673.rs
+++ b/tests/ui/issues/issue-22673.rs
diff --git a/src/test/ui/issues/issue-22684.rs b/tests/ui/issues/issue-22684.rs
index a5b042706..a5b042706 100644
--- a/src/test/ui/issues/issue-22684.rs
+++ b/tests/ui/issues/issue-22684.rs
diff --git a/src/test/ui/issues/issue-22684.stderr b/tests/ui/issues/issue-22684.stderr
index 2407ece5e..2407ece5e 100644
--- a/src/test/ui/issues/issue-22684.stderr
+++ b/tests/ui/issues/issue-22684.stderr
diff --git a/src/test/ui/issues/issue-22706.rs b/tests/ui/issues/issue-22706.rs
index bb8a58d3d..bb8a58d3d 100644
--- a/src/test/ui/issues/issue-22706.rs
+++ b/tests/ui/issues/issue-22706.rs
diff --git a/src/test/ui/issues/issue-22706.stderr b/tests/ui/issues/issue-22706.stderr
index 5366a36b1..5366a36b1 100644
--- a/src/test/ui/issues/issue-22706.stderr
+++ b/tests/ui/issues/issue-22706.stderr
diff --git a/src/test/ui/issues/issue-22777.rs b/tests/ui/issues/issue-22777.rs
index 486683d12..486683d12 100644
--- a/src/test/ui/issues/issue-22777.rs
+++ b/tests/ui/issues/issue-22777.rs
diff --git a/src/test/ui/issues/issue-22781.rs b/tests/ui/issues/issue-22781.rs
index d644cec4d..d644cec4d 100644
--- a/src/test/ui/issues/issue-22781.rs
+++ b/tests/ui/issues/issue-22781.rs
diff --git a/src/test/ui/issues/issue-22789.rs b/tests/ui/issues/issue-22789.rs
index cef407537..cef407537 100644
--- a/src/test/ui/issues/issue-22789.rs
+++ b/tests/ui/issues/issue-22789.rs
diff --git a/src/test/ui/issues/issue-2281-part1.rs b/tests/ui/issues/issue-2281-part1.rs
index 8340ade22..8340ade22 100644
--- a/src/test/ui/issues/issue-2281-part1.rs
+++ b/tests/ui/issues/issue-2281-part1.rs
diff --git a/src/test/ui/issues/issue-2281-part1.stderr b/tests/ui/issues/issue-2281-part1.stderr
index c2391a7c0..c2391a7c0 100644
--- a/src/test/ui/issues/issue-2281-part1.stderr
+++ b/tests/ui/issues/issue-2281-part1.stderr
diff --git a/src/test/ui/issues/issue-22814.rs b/tests/ui/issues/issue-22814.rs
index 4079adfc8..4079adfc8 100644
--- a/src/test/ui/issues/issue-22814.rs
+++ b/tests/ui/issues/issue-22814.rs
diff --git a/src/test/ui/issues/issue-2284.rs b/tests/ui/issues/issue-2284.rs
index 6f2c95834..6f2c95834 100644
--- a/src/test/ui/issues/issue-2284.rs
+++ b/tests/ui/issues/issue-2284.rs
diff --git a/src/test/ui/issues/issue-22864-1.rs b/tests/ui/issues/issue-22864-1.rs
index 0fad5433d..0fad5433d 100644
--- a/src/test/ui/issues/issue-22864-1.rs
+++ b/tests/ui/issues/issue-22864-1.rs
diff --git a/src/test/ui/issues/issue-22864-2.rs b/tests/ui/issues/issue-22864-2.rs
index 4aa9e3e08..4aa9e3e08 100644
--- a/src/test/ui/issues/issue-22864-2.rs
+++ b/tests/ui/issues/issue-22864-2.rs
diff --git a/src/test/ui/issues/issue-22872.rs b/tests/ui/issues/issue-22872.rs
index 5db2891e6..5db2891e6 100644
--- a/src/test/ui/issues/issue-22872.rs
+++ b/tests/ui/issues/issue-22872.rs
diff --git a/src/test/ui/issues/issue-22872.stderr b/tests/ui/issues/issue-22872.stderr
index 7382d40c0..951019719 100644
--- a/src/test/ui/issues/issue-22872.stderr
+++ b/tests/ui/issues/issue-22872.stderr
@@ -10,6 +10,9 @@ note: required for `Wrapper<P>` to implement `for<'b> Wrap<'b>`
    |
 LL | impl<'b, P> Wrap<'b> for Wrapper<P>
    |             ^^^^^^^^     ^^^^^^^^^^
+LL | where P: Process<'b>,
+LL |       <P as Process<'b>>::Item: Iterator {
+   |                                 -------- unsatisfied trait bound introduced here
    = note: required for the cast from `Wrapper<P>` to the object type `dyn for<'b> Wrap<'b>`
 help: consider further restricting the associated type
    |
diff --git a/src/test/ui/issues/issue-22874.rs b/tests/ui/issues/issue-22874.rs
index 37c6c8143..37c6c8143 100644
--- a/src/test/ui/issues/issue-22874.rs
+++ b/tests/ui/issues/issue-22874.rs
diff --git a/src/test/ui/issues/issue-22874.stderr b/tests/ui/issues/issue-22874.stderr
index d64899080..d64899080 100644
--- a/src/test/ui/issues/issue-22874.stderr
+++ b/tests/ui/issues/issue-22874.stderr
diff --git a/src/test/ui/issues/issue-2288.rs b/tests/ui/issues/issue-2288.rs
index 6fd690a4d..6fd690a4d 100644
--- a/src/test/ui/issues/issue-2288.rs
+++ b/tests/ui/issues/issue-2288.rs
diff --git a/src/test/ui/issues/issue-22886.rs b/tests/ui/issues/issue-22886.rs
index f8b576e09..f8b576e09 100644
--- a/src/test/ui/issues/issue-22886.rs
+++ b/tests/ui/issues/issue-22886.rs
diff --git a/src/test/ui/issues/issue-22886.stderr b/tests/ui/issues/issue-22886.stderr
index c4b396559..c4b396559 100644
--- a/src/test/ui/issues/issue-22886.stderr
+++ b/tests/ui/issues/issue-22886.stderr
diff --git a/src/test/ui/issues/issue-22894.rs b/tests/ui/issues/issue-22894.rs
index 93c1db914..93c1db914 100644
--- a/src/test/ui/issues/issue-22894.rs
+++ b/tests/ui/issues/issue-22894.rs
diff --git a/src/test/ui/issues/issue-22933-1.rs b/tests/ui/issues/issue-22933-1.rs
index 3c9aa2669..3c9aa2669 100644
--- a/src/test/ui/issues/issue-22933-1.rs
+++ b/tests/ui/issues/issue-22933-1.rs
diff --git a/src/test/ui/issues/issue-22933-2.rs b/tests/ui/issues/issue-22933-2.rs
index dfd84b9a7..dfd84b9a7 100644
--- a/src/test/ui/issues/issue-22933-2.rs
+++ b/tests/ui/issues/issue-22933-2.rs
diff --git a/src/test/ui/issues/issue-22933-2.stderr b/tests/ui/issues/issue-22933-2.stderr
index 1a0e87e15..1a0e87e15 100644
--- a/src/test/ui/issues/issue-22933-2.stderr
+++ b/tests/ui/issues/issue-22933-2.stderr
diff --git a/src/test/ui/issues/issue-22992-2.rs b/tests/ui/issues/issue-22992-2.rs
index 042af40ed..042af40ed 100644
--- a/src/test/ui/issues/issue-22992-2.rs
+++ b/tests/ui/issues/issue-22992-2.rs
diff --git a/src/test/ui/issues/issue-22992.rs b/tests/ui/issues/issue-22992.rs
index 292a0ae29..292a0ae29 100644
--- a/src/test/ui/issues/issue-22992.rs
+++ b/tests/ui/issues/issue-22992.rs
diff --git a/src/test/ui/issues/issue-23024.rs b/tests/ui/issues/issue-23024.rs
index 010281ee3..010281ee3 100644
--- a/src/test/ui/issues/issue-23024.rs
+++ b/tests/ui/issues/issue-23024.rs
diff --git a/src/test/ui/issues/issue-23024.stderr b/tests/ui/issues/issue-23024.stderr
index dc8b34a70..2c325ffcc 100644
--- a/src/test/ui/issues/issue-23024.stderr
+++ b/tests/ui/issues/issue-23024.stderr
@@ -13,15 +13,10 @@ error[E0107]: missing generics for trait `Fn`
 LL |     println!("{:?}",(vfnfer[0] as dyn Fn)(3));
    |                                       ^^ expected 1 generic argument
    |
-note: trait defined here, with 1 generic parameter: `Args`
-  --> $SRC_DIR/core/src/ops/function.rs:LL:COL
-   |
-LL | pub trait Fn<Args: Tuple>: FnMut<Args> {
-   |           ^^ ----
 help: add missing generic argument
    |
 LL |     println!("{:?}",(vfnfer[0] as dyn Fn<Args>)(3));
-   |                                       ~~~~~~~~
+   |                                         ++++++
 
 error[E0191]: the value of the associated type `Output` (from trait `FnOnce`) must be specified
   --> $DIR/issue-23024.rs:8:39
diff --git a/src/test/ui/issues/issue-23036.rs b/tests/ui/issues/issue-23036.rs
index d67f18472..d67f18472 100644
--- a/src/test/ui/issues/issue-23036.rs
+++ b/tests/ui/issues/issue-23036.rs
diff --git a/src/test/ui/issues/issue-23041.rs b/tests/ui/issues/issue-23041.rs
index a1371521a..a1371521a 100644
--- a/src/test/ui/issues/issue-23041.rs
+++ b/tests/ui/issues/issue-23041.rs
diff --git a/src/test/ui/issues/issue-23041.stderr b/tests/ui/issues/issue-23041.stderr
index 6592b76a3..6592b76a3 100644
--- a/src/test/ui/issues/issue-23041.stderr
+++ b/tests/ui/issues/issue-23041.stderr
diff --git a/src/test/ui/issues/issue-23046.rs b/tests/ui/issues/issue-23046.rs
index a68369616..a68369616 100644
--- a/src/test/ui/issues/issue-23046.rs
+++ b/tests/ui/issues/issue-23046.rs
diff --git a/src/test/ui/issues/issue-23046.stderr b/tests/ui/issues/issue-23046.stderr
index 1403ecbd9..1403ecbd9 100644
--- a/src/test/ui/issues/issue-23046.stderr
+++ b/tests/ui/issues/issue-23046.stderr
diff --git a/src/test/ui/issues/issue-23073.rs b/tests/ui/issues/issue-23073.rs
index a0ca91336..a0ca91336 100644
--- a/src/test/ui/issues/issue-23073.rs
+++ b/tests/ui/issues/issue-23073.rs
diff --git a/tests/ui/issues/issue-23073.stderr b/tests/ui/issues/issue-23073.stderr
new file mode 100644
index 000000000..3a9f49ef1
--- /dev/null
+++ b/tests/ui/issues/issue-23073.stderr
@@ -0,0 +1,14 @@
+error[E0223]: ambiguous associated type
+  --> $DIR/issue-23073.rs:6:17
+   |
+LL |     type FooT = <<Self as Bar>::Foo>::T;
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `T` implemented for `<Self as Bar>::Foo`, you could use the fully-qualified path
+   |
+LL |     type FooT = <<Self as Bar>::Foo as Example>::T;
+   |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/issues/issue-2311-2.rs b/tests/ui/issues/issue-2311-2.rs
index 760d4edaa..760d4edaa 100644
--- a/src/test/ui/issues/issue-2311-2.rs
+++ b/tests/ui/issues/issue-2311-2.rs
diff --git a/src/test/ui/issues/issue-2311.rs b/tests/ui/issues/issue-2311.rs
index 21ff19f7f..21ff19f7f 100644
--- a/src/test/ui/issues/issue-2311.rs
+++ b/tests/ui/issues/issue-2311.rs
diff --git a/src/test/ui/issues/issue-2312.rs b/tests/ui/issues/issue-2312.rs
index 8a94bcbd4..8a94bcbd4 100644
--- a/src/test/ui/issues/issue-2312.rs
+++ b/tests/ui/issues/issue-2312.rs
diff --git a/src/test/ui/issues/issue-23122-1.rs b/tests/ui/issues/issue-23122-1.rs
index 7fe0900ed..7fe0900ed 100644
--- a/src/test/ui/issues/issue-23122-1.rs
+++ b/tests/ui/issues/issue-23122-1.rs
diff --git a/src/test/ui/issues/issue-23122-1.stderr b/tests/ui/issues/issue-23122-1.stderr
index 0b568b30e..0b568b30e 100644
--- a/src/test/ui/issues/issue-23122-1.stderr
+++ b/tests/ui/issues/issue-23122-1.stderr
diff --git a/src/test/ui/issues/issue-23122-2.rs b/tests/ui/issues/issue-23122-2.rs
index 338789c2e..338789c2e 100644
--- a/src/test/ui/issues/issue-23122-2.rs
+++ b/tests/ui/issues/issue-23122-2.rs
diff --git a/src/test/ui/issues/issue-23122-2.stderr b/tests/ui/issues/issue-23122-2.stderr
index 1f50b06a0..06e5b711a 100644
--- a/src/test/ui/issues/issue-23122-2.stderr
+++ b/tests/ui/issues/issue-23122-2.stderr
@@ -9,7 +9,9 @@ note: required for `GetNext<<<<<<<... as Next>::Next as Next>::Next as Next>::Ne
   --> $DIR/issue-23122-2.rs:10:15
    |
 LL | impl<T: Next> Next for GetNext<T> {
-   |               ^^^^     ^^^^^^^^^^
+   |      -        ^^^^     ^^^^^^^^^^
+   |      |
+   |      unsatisfied trait bound introduced here
    = note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-23122-2/issue-23122-2.long-type-hash.txt'
 
 error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-2316-c.rs b/tests/ui/issues/issue-2316-c.rs
index d975aa695..d975aa695 100644
--- a/src/test/ui/issues/issue-2316-c.rs
+++ b/tests/ui/issues/issue-2316-c.rs
diff --git a/src/test/ui/issues/issue-23173.rs b/tests/ui/issues/issue-23173.rs
index 92f4c5464..92f4c5464 100644
--- a/src/test/ui/issues/issue-23173.rs
+++ b/tests/ui/issues/issue-23173.rs
diff --git a/src/test/ui/issues/issue-23173.stderr b/tests/ui/issues/issue-23173.stderr
index d07d1a7ca..d07d1a7ca 100644
--- a/src/test/ui/issues/issue-23173.stderr
+++ b/tests/ui/issues/issue-23173.stderr
diff --git a/src/test/ui/issues/issue-23189.rs b/tests/ui/issues/issue-23189.rs
index e5526357c..e5526357c 100644
--- a/src/test/ui/issues/issue-23189.rs
+++ b/tests/ui/issues/issue-23189.rs
diff --git a/src/test/ui/issues/issue-23189.stderr b/tests/ui/issues/issue-23189.stderr
index ed065212c..ed065212c 100644
--- a/src/test/ui/issues/issue-23189.stderr
+++ b/tests/ui/issues/issue-23189.stderr
diff --git a/src/test/ui/issues/issue-23217.rs b/tests/ui/issues/issue-23217.rs
index 09f9ebccf..09f9ebccf 100644
--- a/src/test/ui/issues/issue-23217.rs
+++ b/tests/ui/issues/issue-23217.rs
diff --git a/src/test/ui/issues/issue-23217.stderr b/tests/ui/issues/issue-23217.stderr
index 5d3d8a4f8..5d3d8a4f8 100644
--- a/src/test/ui/issues/issue-23217.stderr
+++ b/tests/ui/issues/issue-23217.stderr
diff --git a/src/test/ui/issues/issue-23253.rs b/tests/ui/issues/issue-23253.rs
index 22b55c285..22b55c285 100644
--- a/src/test/ui/issues/issue-23253.rs
+++ b/tests/ui/issues/issue-23253.rs
diff --git a/src/test/ui/issues/issue-23253.stderr b/tests/ui/issues/issue-23253.stderr
index be5714cd9..be5714cd9 100644
--- a/src/test/ui/issues/issue-23253.stderr
+++ b/tests/ui/issues/issue-23253.stderr
diff --git a/src/test/ui/issues/issue-23261.rs b/tests/ui/issues/issue-23261.rs
index e21f86351..e21f86351 100644
--- a/src/test/ui/issues/issue-23261.rs
+++ b/tests/ui/issues/issue-23261.rs
diff --git a/src/test/ui/issues/issue-23281.rs b/tests/ui/issues/issue-23281.rs
index 727168964..727168964 100644
--- a/src/test/ui/issues/issue-23281.rs
+++ b/tests/ui/issues/issue-23281.rs
diff --git a/src/test/ui/issues/issue-23281.stderr b/tests/ui/issues/issue-23281.stderr
index 804334c9b..804334c9b 100644
--- a/src/test/ui/issues/issue-23281.stderr
+++ b/tests/ui/issues/issue-23281.stderr
diff --git a/src/test/ui/issues/issue-23302-1.rs b/tests/ui/issues/issue-23302-1.rs
index 24e79dc58..24e79dc58 100644
--- a/src/test/ui/issues/issue-23302-1.rs
+++ b/tests/ui/issues/issue-23302-1.rs
diff --git a/src/test/ui/issues/issue-23302-1.stderr b/tests/ui/issues/issue-23302-1.stderr
index 9366050d7..9366050d7 100644
--- a/src/test/ui/issues/issue-23302-1.stderr
+++ b/tests/ui/issues/issue-23302-1.stderr
diff --git a/src/test/ui/issues/issue-23302-2.rs b/tests/ui/issues/issue-23302-2.rs
index e89c7eab5..e89c7eab5 100644
--- a/src/test/ui/issues/issue-23302-2.rs
+++ b/tests/ui/issues/issue-23302-2.rs
diff --git a/src/test/ui/issues/issue-23302-2.stderr b/tests/ui/issues/issue-23302-2.stderr
index b97ae287a..b97ae287a 100644
--- a/src/test/ui/issues/issue-23302-2.stderr
+++ b/tests/ui/issues/issue-23302-2.stderr
diff --git a/src/test/ui/issues/issue-23302-3.rs b/tests/ui/issues/issue-23302-3.rs
index da75f3307..da75f3307 100644
--- a/src/test/ui/issues/issue-23302-3.rs
+++ b/tests/ui/issues/issue-23302-3.rs
diff --git a/src/test/ui/issues/issue-23302-3.stderr b/tests/ui/issues/issue-23302-3.stderr
index c6cafe575..c6cafe575 100644
--- a/src/test/ui/issues/issue-23302-3.stderr
+++ b/tests/ui/issues/issue-23302-3.stderr
diff --git a/src/test/ui/issues/issue-23304-1.rs b/tests/ui/issues/issue-23304-1.rs
index 1805c1c19..1805c1c19 100644
--- a/src/test/ui/issues/issue-23304-1.rs
+++ b/tests/ui/issues/issue-23304-1.rs
diff --git a/src/test/ui/issues/issue-23304-2.rs b/tests/ui/issues/issue-23304-2.rs
index 6376fdb65..6376fdb65 100644
--- a/src/test/ui/issues/issue-23304-2.rs
+++ b/tests/ui/issues/issue-23304-2.rs
diff --git a/src/test/ui/issues/issue-23311.rs b/tests/ui/issues/issue-23311.rs
index 62c96840b..62c96840b 100644
--- a/src/test/ui/issues/issue-23311.rs
+++ b/tests/ui/issues/issue-23311.rs
diff --git a/src/test/ui/issues/issue-23336.rs b/tests/ui/issues/issue-23336.rs
index cd71d7eed..cd71d7eed 100644
--- a/src/test/ui/issues/issue-23336.rs
+++ b/tests/ui/issues/issue-23336.rs
diff --git a/src/test/ui/issues/issue-23354-2.rs b/tests/ui/issues/issue-23354-2.rs
index c291d8a5e..c291d8a5e 100644
--- a/src/test/ui/issues/issue-23354-2.rs
+++ b/tests/ui/issues/issue-23354-2.rs
diff --git a/src/test/ui/issues/issue-23354.rs b/tests/ui/issues/issue-23354.rs
index 8b7c2eef2..8b7c2eef2 100644
--- a/src/test/ui/issues/issue-23354.rs
+++ b/tests/ui/issues/issue-23354.rs
diff --git a/src/test/ui/issues/issue-23406.rs b/tests/ui/issues/issue-23406.rs
index d00d5d6f9..d00d5d6f9 100644
--- a/src/test/ui/issues/issue-23406.rs
+++ b/tests/ui/issues/issue-23406.rs
diff --git a/src/test/ui/issues/issue-23433.rs b/tests/ui/issues/issue-23433.rs
index d4fbbde62..d4fbbde62 100644
--- a/src/test/ui/issues/issue-23433.rs
+++ b/tests/ui/issues/issue-23433.rs
diff --git a/src/test/ui/issues/issue-23442.rs b/tests/ui/issues/issue-23442.rs
index d1e4317e5..d1e4317e5 100644
--- a/src/test/ui/issues/issue-23442.rs
+++ b/tests/ui/issues/issue-23442.rs
diff --git a/src/test/ui/issues/issue-23477.rs b/tests/ui/issues/issue-23477.rs
index 988ebe03c..988ebe03c 100644
--- a/src/test/ui/issues/issue-23477.rs
+++ b/tests/ui/issues/issue-23477.rs
diff --git a/src/test/ui/issues/issue-23485.rs b/tests/ui/issues/issue-23485.rs
index 1dd3d9293..1dd3d9293 100644
--- a/src/test/ui/issues/issue-23485.rs
+++ b/tests/ui/issues/issue-23485.rs
diff --git a/src/test/ui/issues/issue-23491.rs b/tests/ui/issues/issue-23491.rs
index e5f9dd3ef..e5f9dd3ef 100644
--- a/src/test/ui/issues/issue-23491.rs
+++ b/tests/ui/issues/issue-23491.rs
diff --git a/src/test/ui/issues/issue-23543.rs b/tests/ui/issues/issue-23543.rs
index 843e1a8a8..843e1a8a8 100644
--- a/src/test/ui/issues/issue-23543.rs
+++ b/tests/ui/issues/issue-23543.rs
diff --git a/src/test/ui/issues/issue-23543.stderr b/tests/ui/issues/issue-23543.stderr
index ebb70afe3..ebb70afe3 100644
--- a/src/test/ui/issues/issue-23543.stderr
+++ b/tests/ui/issues/issue-23543.stderr
diff --git a/src/test/ui/issues/issue-23544.rs b/tests/ui/issues/issue-23544.rs
index 6ad00b2fb..6ad00b2fb 100644
--- a/src/test/ui/issues/issue-23544.rs
+++ b/tests/ui/issues/issue-23544.rs
diff --git a/src/test/ui/issues/issue-23544.stderr b/tests/ui/issues/issue-23544.stderr
index c912baccb..c912baccb 100644
--- a/src/test/ui/issues/issue-23544.stderr
+++ b/tests/ui/issues/issue-23544.stderr
diff --git a/src/test/ui/issues/issue-23550.rs b/tests/ui/issues/issue-23550.rs
index 9cce9a0a9..9cce9a0a9 100644
--- a/src/test/ui/issues/issue-23550.rs
+++ b/tests/ui/issues/issue-23550.rs
diff --git a/src/test/ui/issues/issue-23589.rs b/tests/ui/issues/issue-23589.rs
index 1c640af8d..1c640af8d 100644
--- a/src/test/ui/issues/issue-23589.rs
+++ b/tests/ui/issues/issue-23589.rs
diff --git a/src/test/ui/issues/issue-23589.stderr b/tests/ui/issues/issue-23589.stderr
index 1a91f5e04..1a91f5e04 100644
--- a/src/test/ui/issues/issue-23589.stderr
+++ b/tests/ui/issues/issue-23589.stderr
diff --git a/src/test/ui/issues/issue-23611-enum-swap-in-drop.rs b/tests/ui/issues/issue-23611-enum-swap-in-drop.rs
index cdb130d60..cdb130d60 100644
--- a/src/test/ui/issues/issue-23611-enum-swap-in-drop.rs
+++ b/tests/ui/issues/issue-23611-enum-swap-in-drop.rs
diff --git a/src/test/ui/issues/issue-23649-1.rs b/tests/ui/issues/issue-23649-1.rs
index fc0c9a605..fc0c9a605 100644
--- a/src/test/ui/issues/issue-23649-1.rs
+++ b/tests/ui/issues/issue-23649-1.rs
diff --git a/src/test/ui/issues/issue-23649-2.rs b/tests/ui/issues/issue-23649-2.rs
index ce7d8e3a7..ce7d8e3a7 100644
--- a/src/test/ui/issues/issue-23649-2.rs
+++ b/tests/ui/issues/issue-23649-2.rs
diff --git a/src/test/ui/issues/issue-23649-3.rs b/tests/ui/issues/issue-23649-3.rs
index 8f61c71d6..8f61c71d6 100644
--- a/src/test/ui/issues/issue-23649-3.rs
+++ b/tests/ui/issues/issue-23649-3.rs
diff --git a/src/test/ui/issues/issue-23699.rs b/tests/ui/issues/issue-23699.rs
index 952548837..952548837 100644
--- a/src/test/ui/issues/issue-23699.rs
+++ b/tests/ui/issues/issue-23699.rs
diff --git a/src/test/ui/issues/issue-23781.rs b/tests/ui/issues/issue-23781.rs
index 220ebdb18..220ebdb18 100644
--- a/src/test/ui/issues/issue-23781.rs
+++ b/tests/ui/issues/issue-23781.rs
diff --git a/src/test/ui/issues/issue-2380-b.rs b/tests/ui/issues/issue-2380-b.rs
index d708c7b42..d708c7b42 100644
--- a/src/test/ui/issues/issue-2380-b.rs
+++ b/tests/ui/issues/issue-2380-b.rs
diff --git a/src/test/ui/issues/issue-23808.rs b/tests/ui/issues/issue-23808.rs
index 0988b09fc..0988b09fc 100644
--- a/src/test/ui/issues/issue-23808.rs
+++ b/tests/ui/issues/issue-23808.rs
diff --git a/src/test/ui/issues/issue-2383.rs b/tests/ui/issues/issue-2383.rs
index 06e61ce68..06e61ce68 100644
--- a/src/test/ui/issues/issue-2383.rs
+++ b/tests/ui/issues/issue-2383.rs
diff --git a/src/test/ui/issues/issue-23891.rs b/tests/ui/issues/issue-23891.rs
index 73467f715..73467f715 100644
--- a/src/test/ui/issues/issue-23891.rs
+++ b/tests/ui/issues/issue-23891.rs
diff --git a/src/test/ui/issues/issue-23898.rs b/tests/ui/issues/issue-23898.rs
index 3de365675..3de365675 100644
--- a/src/test/ui/issues/issue-23898.rs
+++ b/tests/ui/issues/issue-23898.rs
diff --git a/src/test/ui/issues/issue-23958.rs b/tests/ui/issues/issue-23958.rs
index 7e90d7586..7e90d7586 100644
--- a/src/test/ui/issues/issue-23958.rs
+++ b/tests/ui/issues/issue-23958.rs
diff --git a/src/test/ui/issues/issue-23966.rs b/tests/ui/issues/issue-23966.rs
index 5fdec28ac..5fdec28ac 100644
--- a/src/test/ui/issues/issue-23966.rs
+++ b/tests/ui/issues/issue-23966.rs
diff --git a/src/test/ui/issues/issue-23966.stderr b/tests/ui/issues/issue-23966.stderr
index ae8233d5c..8f934481d 100644
--- a/src/test/ui/issues/issue-23966.stderr
+++ b/tests/ui/issues/issue-23966.stderr
@@ -9,9 +9,6 @@ LL |     "".chars().fold(|_, _| (), ());
    = help: the trait `FnMut<(_, char)>` is not implemented for `()`
 note: required by a bound in `fold`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-   |
-LL |         F: FnMut(B, Self::Item) -> B,
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `fold`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-23992.rs b/tests/ui/issues/issue-23992.rs
index 1ff44bd7f..1ff44bd7f 100644
--- a/src/test/ui/issues/issue-23992.rs
+++ b/tests/ui/issues/issue-23992.rs
diff --git a/src/test/ui/issues/issue-24013.rs b/tests/ui/issues/issue-24013.rs
index c6d301671..c6d301671 100644
--- a/src/test/ui/issues/issue-24013.rs
+++ b/tests/ui/issues/issue-24013.rs
diff --git a/src/test/ui/issues/issue-24013.stderr b/tests/ui/issues/issue-24013.stderr
index 72102f460..72102f460 100644
--- a/src/test/ui/issues/issue-24013.stderr
+++ b/tests/ui/issues/issue-24013.stderr
diff --git a/src/test/ui/issues/issue-24036.rs b/tests/ui/issues/issue-24036.rs
index 7df036c8e..7df036c8e 100644
--- a/src/test/ui/issues/issue-24036.rs
+++ b/tests/ui/issues/issue-24036.rs
diff --git a/src/test/ui/issues/issue-24036.stderr b/tests/ui/issues/issue-24036.stderr
index a42e35c4c..0e73a51fa 100644
--- a/src/test/ui/issues/issue-24036.stderr
+++ b/tests/ui/issues/issue-24036.stderr
@@ -19,8 +19,8 @@ LL |         1 => |c| c + 1,
    |
 help: consider giving this closure parameter an explicit type
    |
-LL |         1 => |c: _| c + 1,
-   |                +++
+LL |         1 => |c: /* Type */| c + 1,
+   |                ++++++++++++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-24086.rs b/tests/ui/issues/issue-24086.rs
index 54622afbc..54622afbc 100644
--- a/src/test/ui/issues/issue-24086.rs
+++ b/tests/ui/issues/issue-24086.rs
diff --git a/src/test/ui/issues/issue-2414-c.rs b/tests/ui/issues/issue-2414-c.rs
index f6fe97980..f6fe97980 100644
--- a/src/test/ui/issues/issue-2414-c.rs
+++ b/tests/ui/issues/issue-2414-c.rs
diff --git a/src/test/ui/issues/issue-24161.rs b/tests/ui/issues/issue-24161.rs
index f4cdd982a..f4cdd982a 100644
--- a/src/test/ui/issues/issue-24161.rs
+++ b/tests/ui/issues/issue-24161.rs
diff --git a/src/test/ui/issues/issue-24227.rs b/tests/ui/issues/issue-24227.rs
index 12816c235..12816c235 100644
--- a/src/test/ui/issues/issue-24227.rs
+++ b/tests/ui/issues/issue-24227.rs
diff --git a/src/test/ui/issues/issue-2428.rs b/tests/ui/issues/issue-2428.rs
index 94b830de3..94b830de3 100644
--- a/src/test/ui/issues/issue-2428.rs
+++ b/tests/ui/issues/issue-2428.rs
diff --git a/src/test/ui/issues/issue-24308.rs b/tests/ui/issues/issue-24308.rs
index 4a582c68e..4a582c68e 100644
--- a/src/test/ui/issues/issue-24308.rs
+++ b/tests/ui/issues/issue-24308.rs
diff --git a/src/test/ui/issues/issue-24322.rs b/tests/ui/issues/issue-24322.rs
index 6567fcab4..6567fcab4 100644
--- a/src/test/ui/issues/issue-24322.rs
+++ b/tests/ui/issues/issue-24322.rs
diff --git a/src/test/ui/issues/issue-24322.stderr b/tests/ui/issues/issue-24322.stderr
index 1e4c8ac7c..1e4c8ac7c 100644
--- a/src/test/ui/issues/issue-24322.stderr
+++ b/tests/ui/issues/issue-24322.stderr
diff --git a/src/test/ui/issues/issue-24352.rs b/tests/ui/issues/issue-24352.rs
index 5c8246d17..5c8246d17 100644
--- a/src/test/ui/issues/issue-24352.rs
+++ b/tests/ui/issues/issue-24352.rs
diff --git a/src/test/ui/issues/issue-24352.stderr b/tests/ui/issues/issue-24352.stderr
index 1f51b6e29..1f51b6e29 100644
--- a/src/test/ui/issues/issue-24352.stderr
+++ b/tests/ui/issues/issue-24352.stderr
diff --git a/src/test/ui/issues/issue-24353.rs b/tests/ui/issues/issue-24353.rs
index f78255b7e..f78255b7e 100644
--- a/src/test/ui/issues/issue-24353.rs
+++ b/tests/ui/issues/issue-24353.rs
diff --git a/src/test/ui/issues/issue-24357.rs b/tests/ui/issues/issue-24357.rs
index 152e69ebc..152e69ebc 100644
--- a/src/test/ui/issues/issue-24357.rs
+++ b/tests/ui/issues/issue-24357.rs
diff --git a/src/test/ui/issues/issue-24357.stderr b/tests/ui/issues/issue-24357.stderr
index b9e15f5e2..b9e15f5e2 100644
--- a/src/test/ui/issues/issue-24357.stderr
+++ b/tests/ui/issues/issue-24357.stderr
diff --git a/src/test/ui/issues/issue-24363.rs b/tests/ui/issues/issue-24363.rs
index 34726fba9..34726fba9 100644
--- a/src/test/ui/issues/issue-24363.rs
+++ b/tests/ui/issues/issue-24363.rs
diff --git a/src/test/ui/issues/issue-24363.stderr b/tests/ui/issues/issue-24363.stderr
index 16537e21a..16537e21a 100644
--- a/src/test/ui/issues/issue-24363.stderr
+++ b/tests/ui/issues/issue-24363.stderr
diff --git a/src/test/ui/issues/issue-24365.rs b/tests/ui/issues/issue-24365.rs
index eca104b6f..eca104b6f 100644
--- a/src/test/ui/issues/issue-24365.rs
+++ b/tests/ui/issues/issue-24365.rs
diff --git a/src/test/ui/issues/issue-24365.stderr b/tests/ui/issues/issue-24365.stderr
index f9eead8a4..f9eead8a4 100644
--- a/src/test/ui/issues/issue-24365.stderr
+++ b/tests/ui/issues/issue-24365.stderr
diff --git a/src/test/ui/issues/issue-24389.rs b/tests/ui/issues/issue-24389.rs
index 7cc761176..7cc761176 100644
--- a/src/test/ui/issues/issue-24389.rs
+++ b/tests/ui/issues/issue-24389.rs
diff --git a/src/test/ui/issues/issue-24424.rs b/tests/ui/issues/issue-24424.rs
index 22bf513af..22bf513af 100644
--- a/src/test/ui/issues/issue-24424.rs
+++ b/tests/ui/issues/issue-24424.rs
diff --git a/tests/ui/issues/issue-24424.stderr b/tests/ui/issues/issue-24424.stderr
new file mode 100644
index 000000000..50d7f988e
--- /dev/null
+++ b/tests/ui/issues/issue-24424.stderr
@@ -0,0 +1,15 @@
+error[E0283]: type annotations needed: cannot satisfy `T0: Trait0<'l0>`
+  --> $DIR/issue-24424.rs:4:57
+   |
+LL | impl <'l0, 'l1, T0> Trait1<'l0, T0> for bool where T0 : Trait0<'l0>, T0 : Trait0<'l1> {}
+   |                                                         ^^^^^^^^^^^
+   |
+note: multiple `impl`s or `where` clauses satisfying `T0: Trait0<'l0>` found
+  --> $DIR/issue-24424.rs:4:57
+   |
+LL | impl <'l0, 'l1, T0> Trait1<'l0, T0> for bool where T0 : Trait0<'l0>, T0 : Trait0<'l1> {}
+   |                                                         ^^^^^^^^^^^       ^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0283`.
diff --git a/src/test/ui/issues/issue-24434.rs b/tests/ui/issues/issue-24434.rs
index 4c1bfc03c..4c1bfc03c 100644
--- a/src/test/ui/issues/issue-24434.rs
+++ b/tests/ui/issues/issue-24434.rs
diff --git a/src/test/ui/issues/issue-24446.rs b/tests/ui/issues/issue-24446.rs
index 9ab952ade..9ab952ade 100644
--- a/src/test/ui/issues/issue-24446.rs
+++ b/tests/ui/issues/issue-24446.rs
diff --git a/src/test/ui/issues/issue-24446.stderr b/tests/ui/issues/issue-24446.stderr
index 4afb87c48..4afb87c48 100644
--- a/src/test/ui/issues/issue-24446.stderr
+++ b/tests/ui/issues/issue-24446.stderr
diff --git a/src/test/ui/issues/issue-2445-b.rs b/tests/ui/issues/issue-2445-b.rs
index f369eae3a..f369eae3a 100644
--- a/src/test/ui/issues/issue-2445-b.rs
+++ b/tests/ui/issues/issue-2445-b.rs
diff --git a/src/test/ui/issues/issue-2445.rs b/tests/ui/issues/issue-2445.rs
index 5730ce165..5730ce165 100644
--- a/src/test/ui/issues/issue-2445.rs
+++ b/tests/ui/issues/issue-2445.rs
diff --git a/src/test/ui/issues/issue-24533.rs b/tests/ui/issues/issue-24533.rs
index 8592bf430..8592bf430 100644
--- a/src/test/ui/issues/issue-24533.rs
+++ b/tests/ui/issues/issue-24533.rs
diff --git a/src/test/ui/issues/issue-24589.rs b/tests/ui/issues/issue-24589.rs
index 6b03e14f9..6b03e14f9 100644
--- a/src/test/ui/issues/issue-24589.rs
+++ b/tests/ui/issues/issue-24589.rs
diff --git a/src/test/ui/issues/issue-2463.rs b/tests/ui/issues/issue-2463.rs
index d24a47c53..d24a47c53 100644
--- a/src/test/ui/issues/issue-2463.rs
+++ b/tests/ui/issues/issue-2463.rs
diff --git a/src/test/ui/issues/issue-24682.rs b/tests/ui/issues/issue-24682.rs
index 0d1ab7341..0d1ab7341 100644
--- a/src/test/ui/issues/issue-24682.rs
+++ b/tests/ui/issues/issue-24682.rs
diff --git a/src/test/ui/issues/issue-24682.stderr b/tests/ui/issues/issue-24682.stderr
index e1943bf4d..e1943bf4d 100644
--- a/src/test/ui/issues/issue-24682.stderr
+++ b/tests/ui/issues/issue-24682.stderr
diff --git a/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs b/tests/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs
index 5b1b1389c..5b1b1389c 100644
--- a/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs
+++ b/tests/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs
diff --git a/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs b/tests/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs
index 215145a64..215145a64 100644
--- a/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs
+++ b/tests/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs
diff --git a/src/test/ui/issues/issue-24687-embed-debuginfo/main.rs b/tests/ui/issues/issue-24687-embed-debuginfo/main.rs
index f08bcdfe6..f08bcdfe6 100644
--- a/src/test/ui/issues/issue-24687-embed-debuginfo/main.rs
+++ b/tests/ui/issues/issue-24687-embed-debuginfo/main.rs
diff --git a/src/test/ui/issues/issue-2470-bounds-check-overflow.rs b/tests/ui/issues/issue-2470-bounds-check-overflow.rs
index f0e8e185e..f0e8e185e 100644
--- a/src/test/ui/issues/issue-2470-bounds-check-overflow.rs
+++ b/tests/ui/issues/issue-2470-bounds-check-overflow.rs
diff --git a/src/test/ui/issues/issue-2472.rs b/tests/ui/issues/issue-2472.rs
index c790bc2d0..c790bc2d0 100644
--- a/src/test/ui/issues/issue-2472.rs
+++ b/tests/ui/issues/issue-2472.rs
diff --git a/src/test/ui/issues/issue-24779.rs b/tests/ui/issues/issue-24779.rs
index f1283d0dc..f1283d0dc 100644
--- a/src/test/ui/issues/issue-24779.rs
+++ b/tests/ui/issues/issue-24779.rs
diff --git a/src/test/ui/issues/issue-24819.rs b/tests/ui/issues/issue-24819.rs
index 59c3f2cd1..59c3f2cd1 100644
--- a/src/test/ui/issues/issue-24819.rs
+++ b/tests/ui/issues/issue-24819.rs
diff --git a/src/test/ui/issues/issue-24819.stderr b/tests/ui/issues/issue-24819.stderr
index 982a11fef..982a11fef 100644
--- a/src/test/ui/issues/issue-24819.stderr
+++ b/tests/ui/issues/issue-24819.stderr
diff --git a/src/test/ui/issues/issue-2487-a.rs b/tests/ui/issues/issue-2487-a.rs
index fe12dad74..fe12dad74 100644
--- a/src/test/ui/issues/issue-2487-a.rs
+++ b/tests/ui/issues/issue-2487-a.rs
diff --git a/src/test/ui/issues/issue-24945-repeat-dash-opts.rs b/tests/ui/issues/issue-24945-repeat-dash-opts.rs
index 0f92fc2f7..0f92fc2f7 100644
--- a/src/test/ui/issues/issue-24945-repeat-dash-opts.rs
+++ b/tests/ui/issues/issue-24945-repeat-dash-opts.rs
diff --git a/src/test/ui/issues/issue-24947.rs b/tests/ui/issues/issue-24947.rs
index 23705b4c9..23705b4c9 100644
--- a/src/test/ui/issues/issue-24947.rs
+++ b/tests/ui/issues/issue-24947.rs
diff --git a/src/test/ui/issues/issue-24954.rs b/tests/ui/issues/issue-24954.rs
index 0177dd4ea..0177dd4ea 100644
--- a/src/test/ui/issues/issue-24954.rs
+++ b/tests/ui/issues/issue-24954.rs
diff --git a/src/test/ui/issues/issue-2502.rs b/tests/ui/issues/issue-2502.rs
index 631510024..631510024 100644
--- a/src/test/ui/issues/issue-2502.rs
+++ b/tests/ui/issues/issue-2502.rs
diff --git a/src/test/ui/issues/issue-25076.rs b/tests/ui/issues/issue-25076.rs
index 6c5a55392..6c5a55392 100644
--- a/src/test/ui/issues/issue-25076.rs
+++ b/tests/ui/issues/issue-25076.rs
diff --git a/src/test/ui/issues/issue-25076.stderr b/tests/ui/issues/issue-25076.stderr
index 159cc484c..159cc484c 100644
--- a/src/test/ui/issues/issue-25076.stderr
+++ b/tests/ui/issues/issue-25076.stderr
diff --git a/src/test/ui/issues/issue-25089.rs b/tests/ui/issues/issue-25089.rs
index c988f8f55..c988f8f55 100644
--- a/src/test/ui/issues/issue-25089.rs
+++ b/tests/ui/issues/issue-25089.rs
diff --git a/src/test/ui/issues/issue-25145.rs b/tests/ui/issues/issue-25145.rs
index f5ae28fbb..f5ae28fbb 100644
--- a/src/test/ui/issues/issue-25145.rs
+++ b/tests/ui/issues/issue-25145.rs
diff --git a/src/test/ui/issues/issue-25180.rs b/tests/ui/issues/issue-25180.rs
index 29dc07f49..29dc07f49 100644
--- a/src/test/ui/issues/issue-25180.rs
+++ b/tests/ui/issues/issue-25180.rs
diff --git a/src/test/ui/issues/issue-25185.rs b/tests/ui/issues/issue-25185.rs
index 383c9a1e9..383c9a1e9 100644
--- a/src/test/ui/issues/issue-25185.rs
+++ b/tests/ui/issues/issue-25185.rs
diff --git a/src/test/ui/issues/issue-2526-a.rs b/tests/ui/issues/issue-2526-a.rs
index f3fdc0bd3..f3fdc0bd3 100644
--- a/src/test/ui/issues/issue-2526-a.rs
+++ b/tests/ui/issues/issue-2526-a.rs
diff --git a/src/test/ui/issues/issue-25279.rs b/tests/ui/issues/issue-25279.rs
index fdc516d37..fdc516d37 100644
--- a/src/test/ui/issues/issue-25279.rs
+++ b/tests/ui/issues/issue-25279.rs
diff --git a/src/test/ui/issues/issue-25343.rs b/tests/ui/issues/issue-25343.rs
index 95a0bd915..95a0bd915 100644
--- a/src/test/ui/issues/issue-25343.rs
+++ b/tests/ui/issues/issue-25343.rs
diff --git a/src/test/ui/issues/issue-25368.rs b/tests/ui/issues/issue-25368.rs
index 4be83457f..4be83457f 100644
--- a/src/test/ui/issues/issue-25368.rs
+++ b/tests/ui/issues/issue-25368.rs
diff --git a/src/test/ui/issues/issue-25368.stderr b/tests/ui/issues/issue-25368.stderr
index e6ed3aac7..e6ed3aac7 100644
--- a/src/test/ui/issues/issue-25368.stderr
+++ b/tests/ui/issues/issue-25368.stderr
diff --git a/src/test/ui/issues/issue-25386.rs b/tests/ui/issues/issue-25386.rs
index a76d8a615..b26cc7768 100644
--- a/src/test/ui/issues/issue-25386.rs
+++ b/tests/ui/issues/issue-25386.rs
@@ -24,5 +24,4 @@ macro_rules! check_ptr_exist {
 fn main() {
     let item = stuff::Item::new();
     println!("{}", check_ptr_exist!(item, name));
-    //~^ ERROR field `name` of struct `CObj` is private
 }
diff --git a/tests/ui/issues/issue-25386.stderr b/tests/ui/issues/issue-25386.stderr
new file mode 100644
index 000000000..727b96908
--- /dev/null
+++ b/tests/ui/issues/issue-25386.stderr
@@ -0,0 +1,14 @@
+error[E0616]: field `c_object` of struct `Item` is private
+  --> $DIR/issue-25386.rs:19:16
+   |
+LL |         (*$var.c_object).$member.is_some()
+   |                ^^^^^^^^ private field
+...
+LL |     println!("{}", check_ptr_exist!(item, name));
+   |                    ---------------------------- in this macro invocation
+   |
+   = note: this error originates in the macro `check_ptr_exist` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0616`.
diff --git a/src/test/ui/issues/issue-25394.rs b/tests/ui/issues/issue-25394.rs
index 2f0ae19fc..2f0ae19fc 100644
--- a/src/test/ui/issues/issue-25394.rs
+++ b/tests/ui/issues/issue-25394.rs
diff --git a/src/test/ui/issues/issue-25439.rs b/tests/ui/issues/issue-25439.rs
index 4f73ff3e3..4f73ff3e3 100644
--- a/src/test/ui/issues/issue-25439.rs
+++ b/tests/ui/issues/issue-25439.rs
diff --git a/tests/ui/issues/issue-25439.stderr b/tests/ui/issues/issue-25439.stderr
new file mode 100644
index 000000000..dadae23fd
--- /dev/null
+++ b/tests/ui/issues/issue-25439.stderr
@@ -0,0 +1,19 @@
+error[E0644]: closure/generator type that references itself
+  --> $DIR/issue-25439.rs:8:9
+   |
+LL |     fix(|_, x| x);
+   |         ^^^^^^ cyclic type of infinite size
+   |
+   = note: closures cannot capture themselves or take themselves as argument;
+           this error may be the result of a recent compiler bug-fix,
+           see issue #46062 <https://github.com/rust-lang/rust/issues/46062>
+           for more information
+note: required by a bound in `fix`
+  --> $DIR/issue-25439.rs:3:33
+   |
+LL | fn fix<F>(f: F) -> i32 where F: Fn(Helper<F>, i32) -> i32 {
+   |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `fix`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0644`.
diff --git a/src/test/ui/issues/issue-25467.rs b/tests/ui/issues/issue-25467.rs
index 31ac5f0f3..31ac5f0f3 100644
--- a/src/test/ui/issues/issue-25467.rs
+++ b/tests/ui/issues/issue-25467.rs
diff --git a/src/test/ui/issues/issue-25497.rs b/tests/ui/issues/issue-25497.rs
index 25f5ab90f..25f5ab90f 100644
--- a/src/test/ui/issues/issue-25497.rs
+++ b/tests/ui/issues/issue-25497.rs
diff --git a/src/test/ui/issues/issue-2550.rs b/tests/ui/issues/issue-2550.rs
index 04ec66b80..04ec66b80 100644
--- a/src/test/ui/issues/issue-2550.rs
+++ b/tests/ui/issues/issue-2550.rs
diff --git a/src/test/ui/issues/issue-25515.rs b/tests/ui/issues/issue-25515.rs
index e7b9ea3ac..e7b9ea3ac 100644
--- a/src/test/ui/issues/issue-25515.rs
+++ b/tests/ui/issues/issue-25515.rs
diff --git a/src/test/ui/issues/issue-25549-multiple-drop.rs b/tests/ui/issues/issue-25549-multiple-drop.rs
index 25a2da707..25a2da707 100644
--- a/src/test/ui/issues/issue-25549-multiple-drop.rs
+++ b/tests/ui/issues/issue-25549-multiple-drop.rs
diff --git a/src/test/ui/issues/issue-25579.rs b/tests/ui/issues/issue-25579.rs
index 5f5a0f4d2..5f5a0f4d2 100644
--- a/src/test/ui/issues/issue-25579.rs
+++ b/tests/ui/issues/issue-25579.rs
diff --git a/src/test/ui/issues/issue-25679.rs b/tests/ui/issues/issue-25679.rs
index b548da988..b548da988 100644
--- a/src/test/ui/issues/issue-25679.rs
+++ b/tests/ui/issues/issue-25679.rs
diff --git a/src/test/ui/issues/issue-25693.rs b/tests/ui/issues/issue-25693.rs
index 9af0ba100..9af0ba100 100644
--- a/src/test/ui/issues/issue-25693.rs
+++ b/tests/ui/issues/issue-25693.rs
diff --git a/src/test/ui/issues/issue-25746-bool-transmute.rs b/tests/ui/issues/issue-25746-bool-transmute.rs
index bc2f4a7c1..bc2f4a7c1 100644
--- a/src/test/ui/issues/issue-25746-bool-transmute.rs
+++ b/tests/ui/issues/issue-25746-bool-transmute.rs
diff --git a/src/test/ui/issues/issue-25757.rs b/tests/ui/issues/issue-25757.rs
index ec1864d7d..ec1864d7d 100644
--- a/src/test/ui/issues/issue-25757.rs
+++ b/tests/ui/issues/issue-25757.rs
diff --git a/src/test/ui/issues/issue-25810.rs b/tests/ui/issues/issue-25810.rs
index f32216f32..f32216f32 100644
--- a/src/test/ui/issues/issue-25810.rs
+++ b/tests/ui/issues/issue-25810.rs
diff --git a/src/test/ui/issues/issue-2590.rs b/tests/ui/issues/issue-2590.rs
index a9a0e5ca4..a9a0e5ca4 100644
--- a/src/test/ui/issues/issue-2590.rs
+++ b/tests/ui/issues/issue-2590.rs
diff --git a/src/test/ui/issues/issue-2590.stderr b/tests/ui/issues/issue-2590.stderr
index 6aacd563a..6aacd563a 100644
--- a/src/test/ui/issues/issue-2590.stderr
+++ b/tests/ui/issues/issue-2590.stderr
diff --git a/src/test/ui/issues/issue-25901.rs b/tests/ui/issues/issue-25901.rs
index 1f7b341a9..1f7b341a9 100644
--- a/src/test/ui/issues/issue-25901.rs
+++ b/tests/ui/issues/issue-25901.rs
diff --git a/src/test/ui/issues/issue-25901.stderr b/tests/ui/issues/issue-25901.stderr
index b9cac3222..b9cac3222 100644
--- a/src/test/ui/issues/issue-25901.stderr
+++ b/tests/ui/issues/issue-25901.stderr
diff --git a/src/test/ui/issues/issue-26056.rs b/tests/ui/issues/issue-26056.rs
index 99d43ec79..99d43ec79 100644
--- a/src/test/ui/issues/issue-26056.rs
+++ b/tests/ui/issues/issue-26056.rs
diff --git a/src/test/ui/issues/issue-26056.stderr b/tests/ui/issues/issue-26056.stderr
index 2c873243f..2c873243f 100644
--- a/src/test/ui/issues/issue-26056.stderr
+++ b/tests/ui/issues/issue-26056.stderr
diff --git a/src/test/ui/issues/issue-26093.rs b/tests/ui/issues/issue-26093.rs
index c838515ca..c838515ca 100644
--- a/src/test/ui/issues/issue-26093.rs
+++ b/tests/ui/issues/issue-26093.rs
diff --git a/src/test/ui/issues/issue-26093.stderr b/tests/ui/issues/issue-26093.stderr
index 1a08d0fef..1a08d0fef 100644
--- a/src/test/ui/issues/issue-26093.stderr
+++ b/tests/ui/issues/issue-26093.stderr
diff --git a/src/test/ui/issues/issue-26094.rs b/tests/ui/issues/issue-26094.rs
index df8c2f739..d3d670aa9 100644
--- a/src/test/ui/issues/issue-26094.rs
+++ b/tests/ui/issues/issue-26094.rs
@@ -8,6 +8,6 @@ fn some_function() {} //~ NOTE defined here
 
 fn main() {
     some_macro!(some_function);
-    //~^ ERROR this function takes 0 arguments but 1 argument was supplied
+    //~^ ERROR function takes 0 arguments but 1 argument was supplied
     //~| NOTE in this expansion of some_macro!
 }
diff --git a/src/test/ui/issues/issue-26094.stderr b/tests/ui/issues/issue-26094.stderr
index 881a6e538..881a6e538 100644
--- a/src/test/ui/issues/issue-26094.stderr
+++ b/tests/ui/issues/issue-26094.stderr
diff --git a/src/test/ui/issues/issue-26095.rs b/tests/ui/issues/issue-26095.rs
index 638f8f571..638f8f571 100644
--- a/src/test/ui/issues/issue-26095.rs
+++ b/tests/ui/issues/issue-26095.rs
diff --git a/src/test/ui/issues/issue-2611-3.rs b/tests/ui/issues/issue-2611-3.rs
index a95a748e0..a95a748e0 100644
--- a/src/test/ui/issues/issue-2611-3.rs
+++ b/tests/ui/issues/issue-2611-3.rs
diff --git a/src/test/ui/issues/issue-26127.rs b/tests/ui/issues/issue-26127.rs
index f3f9c1d9a..f3f9c1d9a 100644
--- a/src/test/ui/issues/issue-26127.rs
+++ b/tests/ui/issues/issue-26127.rs
diff --git a/src/test/ui/issues/issue-26186.rs b/tests/ui/issues/issue-26186.rs
index f93869352..f93869352 100644
--- a/src/test/ui/issues/issue-26186.rs
+++ b/tests/ui/issues/issue-26186.rs
diff --git a/src/test/ui/issues/issue-26205.rs b/tests/ui/issues/issue-26205.rs
index f5f39ded0..f5f39ded0 100644
--- a/src/test/ui/issues/issue-26205.rs
+++ b/tests/ui/issues/issue-26205.rs
diff --git a/src/test/ui/issues/issue-26217.rs b/tests/ui/issues/issue-26217.rs
index 422625e73..422625e73 100644
--- a/src/test/ui/issues/issue-26217.rs
+++ b/tests/ui/issues/issue-26217.rs
diff --git a/src/test/ui/issues/issue-26217.stderr b/tests/ui/issues/issue-26217.stderr
index 73c772205..73c772205 100644
--- a/src/test/ui/issues/issue-26217.stderr
+++ b/tests/ui/issues/issue-26217.stderr
diff --git a/src/test/ui/issues/issue-26237.rs b/tests/ui/issues/issue-26237.rs
index 71e96677d..71e96677d 100644
--- a/src/test/ui/issues/issue-26237.rs
+++ b/tests/ui/issues/issue-26237.rs
diff --git a/src/test/ui/issues/issue-26237.stderr b/tests/ui/issues/issue-26237.stderr
index 91d28a5e1..91d28a5e1 100644
--- a/src/test/ui/issues/issue-26237.stderr
+++ b/tests/ui/issues/issue-26237.stderr
diff --git a/src/test/ui/issues/issue-26262.rs b/tests/ui/issues/issue-26262.rs
index 41135db91..41135db91 100644
--- a/src/test/ui/issues/issue-26262.rs
+++ b/tests/ui/issues/issue-26262.rs
diff --git a/src/test/ui/issues/issue-26262.stderr b/tests/ui/issues/issue-26262.stderr
index 90e2d0d93..90e2d0d93 100644
--- a/src/test/ui/issues/issue-26262.stderr
+++ b/tests/ui/issues/issue-26262.stderr
diff --git a/src/test/ui/issues/issue-2631-b.rs b/tests/ui/issues/issue-2631-b.rs
index c7f6728e3..c7f6728e3 100644
--- a/src/test/ui/issues/issue-2631-b.rs
+++ b/tests/ui/issues/issue-2631-b.rs
diff --git a/src/test/ui/issues/issue-2642.rs b/tests/ui/issues/issue-2642.rs
index 95c563225..95c563225 100644
--- a/src/test/ui/issues/issue-2642.rs
+++ b/tests/ui/issues/issue-2642.rs
diff --git a/src/test/ui/issues/issue-26468.rs b/tests/ui/issues/issue-26468.rs
index 71cc90e8b..71cc90e8b 100644
--- a/src/test/ui/issues/issue-26468.rs
+++ b/tests/ui/issues/issue-26468.rs
diff --git a/src/test/ui/issues/issue-26472.rs b/tests/ui/issues/issue-26472.rs
index b100c59ad..b100c59ad 100644
--- a/src/test/ui/issues/issue-26472.rs
+++ b/tests/ui/issues/issue-26472.rs
diff --git a/src/test/ui/issues/issue-26472.stderr b/tests/ui/issues/issue-26472.stderr
index d7134bff1..d7134bff1 100644
--- a/src/test/ui/issues/issue-26472.stderr
+++ b/tests/ui/issues/issue-26472.stderr
diff --git a/src/test/ui/issues/issue-26484.rs b/tests/ui/issues/issue-26484.rs
index 2a8750d3e..2a8750d3e 100644
--- a/src/test/ui/issues/issue-26484.rs
+++ b/tests/ui/issues/issue-26484.rs
diff --git a/src/test/ui/issues/issue-26614.rs b/tests/ui/issues/issue-26614.rs
index b8ebbdc5a..b8ebbdc5a 100644
--- a/src/test/ui/issues/issue-26614.rs
+++ b/tests/ui/issues/issue-26614.rs
diff --git a/src/test/ui/issues/issue-26619.rs b/tests/ui/issues/issue-26619.rs
index b9d34b055..b9d34b055 100644
--- a/src/test/ui/issues/issue-26619.rs
+++ b/tests/ui/issues/issue-26619.rs
diff --git a/src/test/ui/issues/issue-26619.stderr b/tests/ui/issues/issue-26619.stderr
index 1282fd7d3..1282fd7d3 100644
--- a/src/test/ui/issues/issue-26619.stderr
+++ b/tests/ui/issues/issue-26619.stderr
diff --git a/src/test/ui/issues/issue-26641.rs b/tests/ui/issues/issue-26641.rs
index e08edd0b5..e08edd0b5 100644
--- a/src/test/ui/issues/issue-26641.rs
+++ b/tests/ui/issues/issue-26641.rs
diff --git a/src/test/ui/issues/issue-26646.rs b/tests/ui/issues/issue-26646.rs
index 86e4bd7e8..86e4bd7e8 100644
--- a/src/test/ui/issues/issue-26646.rs
+++ b/tests/ui/issues/issue-26646.rs
diff --git a/src/test/ui/issues/issue-26655.rs b/tests/ui/issues/issue-26655.rs
index cb386c908..cb386c908 100644
--- a/src/test/ui/issues/issue-26655.rs
+++ b/tests/ui/issues/issue-26655.rs
diff --git a/src/test/ui/issues/issue-26709.rs b/tests/ui/issues/issue-26709.rs
index 1bd2651dd..1bd2651dd 100644
--- a/src/test/ui/issues/issue-26709.rs
+++ b/tests/ui/issues/issue-26709.rs
diff --git a/src/test/ui/issues/issue-26802.rs b/tests/ui/issues/issue-26802.rs
index 307a67160..307a67160 100644
--- a/src/test/ui/issues/issue-26802.rs
+++ b/tests/ui/issues/issue-26802.rs
diff --git a/src/test/ui/issues/issue-26805.rs b/tests/ui/issues/issue-26805.rs
index bcf8a6731..bcf8a6731 100644
--- a/src/test/ui/issues/issue-26805.rs
+++ b/tests/ui/issues/issue-26805.rs
diff --git a/src/test/ui/issues/issue-26812.rs b/tests/ui/issues/issue-26812.rs
index 3391ea4b3..3391ea4b3 100644
--- a/src/test/ui/issues/issue-26812.rs
+++ b/tests/ui/issues/issue-26812.rs
diff --git a/src/test/ui/issues/issue-26812.stderr b/tests/ui/issues/issue-26812.stderr
index fd1bbb9c5..fd1bbb9c5 100644
--- a/src/test/ui/issues/issue-26812.stderr
+++ b/tests/ui/issues/issue-26812.stderr
diff --git a/src/test/ui/issues/issue-26905-rpass.rs b/tests/ui/issues/issue-26905-rpass.rs
index 2d5827f47..2d5827f47 100644
--- a/src/test/ui/issues/issue-26905-rpass.rs
+++ b/tests/ui/issues/issue-26905-rpass.rs
diff --git a/src/test/ui/issues/issue-26905.rs b/tests/ui/issues/issue-26905.rs
index 4c5c67d58..4c5c67d58 100644
--- a/src/test/ui/issues/issue-26905.rs
+++ b/tests/ui/issues/issue-26905.rs
diff --git a/src/test/ui/issues/issue-26905.stderr b/tests/ui/issues/issue-26905.stderr
index 10dbb7325..10dbb7325 100644
--- a/src/test/ui/issues/issue-26905.stderr
+++ b/tests/ui/issues/issue-26905.stderr
diff --git a/src/test/ui/issues/issue-26948.rs b/tests/ui/issues/issue-26948.rs
index 832c9641d..832c9641d 100644
--- a/src/test/ui/issues/issue-26948.rs
+++ b/tests/ui/issues/issue-26948.rs
diff --git a/src/test/ui/issues/issue-26948.stderr b/tests/ui/issues/issue-26948.stderr
index faede1687..faede1687 100644
--- a/src/test/ui/issues/issue-26948.stderr
+++ b/tests/ui/issues/issue-26948.stderr
diff --git a/src/test/ui/issues/issue-26997.rs b/tests/ui/issues/issue-26997.rs
index 3653e6273..3653e6273 100644
--- a/src/test/ui/issues/issue-26997.rs
+++ b/tests/ui/issues/issue-26997.rs
diff --git a/src/test/ui/issues/issue-27008.rs b/tests/ui/issues/issue-27008.rs
index e04de33f6..e04de33f6 100644
--- a/src/test/ui/issues/issue-27008.rs
+++ b/tests/ui/issues/issue-27008.rs
diff --git a/src/test/ui/issues/issue-27008.stderr b/tests/ui/issues/issue-27008.stderr
index 5b7e74c1c..5b7e74c1c 100644
--- a/src/test/ui/issues/issue-27008.stderr
+++ b/tests/ui/issues/issue-27008.stderr
diff --git a/src/test/ui/issues/issue-27033.rs b/tests/ui/issues/issue-27033.rs
index a23819a20..a23819a20 100644
--- a/src/test/ui/issues/issue-27033.rs
+++ b/tests/ui/issues/issue-27033.rs
diff --git a/src/test/ui/issues/issue-27033.stderr b/tests/ui/issues/issue-27033.stderr
index 9a38d49cd..7a0ca888d 100644
--- a/src/test/ui/issues/issue-27033.stderr
+++ b/tests/ui/issues/issue-27033.stderr
@@ -3,11 +3,9 @@ error[E0530]: match bindings cannot shadow unit variants
    |
 LL |         None @ _ => {}
    |         ^^^^ cannot be named the same as a unit variant
+  --> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
    |
-  ::: $SRC_DIR/std/src/prelude/mod.rs:LL:COL
-   |
-LL |     pub use super::v1::*;
-   |             ------------ the unit variant `None` is defined here
+   = note: the unit variant `None` is defined here
 
 error[E0530]: match bindings cannot shadow constants
   --> $DIR/issue-27033.rs:7:9
diff --git a/src/test/ui/issues/issue-27042.rs b/tests/ui/issues/issue-27042.rs
index 517c1f2e6..517c1f2e6 100644
--- a/src/test/ui/issues/issue-27042.rs
+++ b/tests/ui/issues/issue-27042.rs
diff --git a/src/test/ui/issues/issue-27042.stderr b/tests/ui/issues/issue-27042.stderr
index 59ef28481..59ef28481 100644
--- a/src/test/ui/issues/issue-27042.stderr
+++ b/tests/ui/issues/issue-27042.stderr
diff --git a/src/test/ui/issues/issue-27054-primitive-binary-ops.rs b/tests/ui/issues/issue-27054-primitive-binary-ops.rs
index c6f925de5..c6f925de5 100644
--- a/src/test/ui/issues/issue-27054-primitive-binary-ops.rs
+++ b/tests/ui/issues/issue-27054-primitive-binary-ops.rs
diff --git a/src/test/ui/issues/issue-27078.rs b/tests/ui/issues/issue-27078.rs
index 5f09b9587..5f09b9587 100644
--- a/src/test/ui/issues/issue-27078.rs
+++ b/tests/ui/issues/issue-27078.rs
diff --git a/src/test/ui/issues/issue-27078.stderr b/tests/ui/issues/issue-27078.stderr
index ced92bbd4..ced92bbd4 100644
--- a/src/test/ui/issues/issue-27078.stderr
+++ b/tests/ui/issues/issue-27078.stderr
diff --git a/src/test/ui/issues/issue-2708.rs b/tests/ui/issues/issue-2708.rs
index 4e53b9d14..4e53b9d14 100644
--- a/src/test/ui/issues/issue-2708.rs
+++ b/tests/ui/issues/issue-2708.rs
diff --git a/src/test/ui/issues/issue-27105.rs b/tests/ui/issues/issue-27105.rs
index 3339af364..3339af364 100644
--- a/src/test/ui/issues/issue-27105.rs
+++ b/tests/ui/issues/issue-27105.rs
diff --git a/src/test/ui/issues/issue-2723-b.rs b/tests/ui/issues/issue-2723-b.rs
index 1910561d0..1910561d0 100644
--- a/src/test/ui/issues/issue-2723-b.rs
+++ b/tests/ui/issues/issue-2723-b.rs
diff --git a/src/test/ui/issues/issue-27240.rs b/tests/ui/issues/issue-27240.rs
index eaf254f33..eaf254f33 100644
--- a/src/test/ui/issues/issue-27240.rs
+++ b/tests/ui/issues/issue-27240.rs
diff --git a/src/test/ui/issues/issue-27268.rs b/tests/ui/issues/issue-27268.rs
index 161e2d4d2..161e2d4d2 100644
--- a/src/test/ui/issues/issue-27268.rs
+++ b/tests/ui/issues/issue-27268.rs
diff --git a/src/test/ui/issues/issue-27281.rs b/tests/ui/issues/issue-27281.rs
index 717d8b2c2..717d8b2c2 100644
--- a/src/test/ui/issues/issue-27281.rs
+++ b/tests/ui/issues/issue-27281.rs
diff --git a/src/test/ui/issues/issue-27340.rs b/tests/ui/issues/issue-27340.rs
index 61c77cc1f..61c77cc1f 100644
--- a/src/test/ui/issues/issue-27340.rs
+++ b/tests/ui/issues/issue-27340.rs
diff --git a/src/test/ui/issues/issue-27340.stderr b/tests/ui/issues/issue-27340.stderr
index 40889b866..40889b866 100644
--- a/src/test/ui/issues/issue-27340.stderr
+++ b/tests/ui/issues/issue-27340.stderr
diff --git a/src/test/ui/issues/issue-2735-2.rs b/tests/ui/issues/issue-2735-2.rs
index 70ebce9d3..70ebce9d3 100644
--- a/src/test/ui/issues/issue-2735-2.rs
+++ b/tests/ui/issues/issue-2735-2.rs
diff --git a/src/test/ui/issues/issue-2735-3.rs b/tests/ui/issues/issue-2735-3.rs
index 233015378..233015378 100644
--- a/src/test/ui/issues/issue-2735-3.rs
+++ b/tests/ui/issues/issue-2735-3.rs
diff --git a/src/test/ui/issues/issue-2735.rs b/tests/ui/issues/issue-2735.rs
index 20d3949a9..20d3949a9 100644
--- a/src/test/ui/issues/issue-2735.rs
+++ b/tests/ui/issues/issue-2735.rs
diff --git a/src/test/ui/issues/issue-27401-dropflag-reinit.rs b/tests/ui/issues/issue-27401-dropflag-reinit.rs
index ab54af29b..ab54af29b 100644
--- a/src/test/ui/issues/issue-27401-dropflag-reinit.rs
+++ b/tests/ui/issues/issue-27401-dropflag-reinit.rs
diff --git a/src/test/ui/issues/issue-27433.fixed b/tests/ui/issues/issue-27433.fixed
index ce31f6bea..ce31f6bea 100644
--- a/src/test/ui/issues/issue-27433.fixed
+++ b/tests/ui/issues/issue-27433.fixed
diff --git a/src/test/ui/issues/issue-27433.rs b/tests/ui/issues/issue-27433.rs
index 01411a51c..01411a51c 100644
--- a/src/test/ui/issues/issue-27433.rs
+++ b/tests/ui/issues/issue-27433.rs
diff --git a/src/test/ui/issues/issue-27433.stderr b/tests/ui/issues/issue-27433.stderr
index da751a649..da751a649 100644
--- a/src/test/ui/issues/issue-27433.stderr
+++ b/tests/ui/issues/issue-27433.stderr
diff --git a/src/test/ui/issues/issue-2748-a.rs b/tests/ui/issues/issue-2748-a.rs
index cbb9bcc28..cbb9bcc28 100644
--- a/src/test/ui/issues/issue-2748-a.rs
+++ b/tests/ui/issues/issue-2748-a.rs
diff --git a/src/test/ui/issues/issue-27583.rs b/tests/ui/issues/issue-27583.rs
index 84c94c7c9..84c94c7c9 100644
--- a/src/test/ui/issues/issue-27583.rs
+++ b/tests/ui/issues/issue-27583.rs
diff --git a/src/test/ui/issues/issue-27592.rs b/tests/ui/issues/issue-27592.rs
index 88f70f584..88f70f584 100644
--- a/src/test/ui/issues/issue-27592.rs
+++ b/tests/ui/issues/issue-27592.rs
diff --git a/src/test/ui/issues/issue-27592.stderr b/tests/ui/issues/issue-27592.stderr
index 1205a8b65..1205a8b65 100644
--- a/src/test/ui/issues/issue-27592.stderr
+++ b/tests/ui/issues/issue-27592.stderr
diff --git a/src/test/ui/issues/issue-2761.rs b/tests/ui/issues/issue-2761.rs
index 3ba098abb..3ba098abb 100644
--- a/src/test/ui/issues/issue-2761.rs
+++ b/tests/ui/issues/issue-2761.rs
diff --git a/src/test/ui/issues/issue-27639.rs b/tests/ui/issues/issue-27639.rs
index 945fbad91..945fbad91 100644
--- a/src/test/ui/issues/issue-27639.rs
+++ b/tests/ui/issues/issue-27639.rs
diff --git a/src/test/ui/issues/issue-27697.rs b/tests/ui/issues/issue-27697.rs
index 12af8a8e8..12af8a8e8 100644
--- a/src/test/ui/issues/issue-27697.rs
+++ b/tests/ui/issues/issue-27697.rs
diff --git a/src/test/ui/issues/issue-27815.rs b/tests/ui/issues/issue-27815.rs
index 9e53014f4..9e53014f4 100644
--- a/src/test/ui/issues/issue-27815.rs
+++ b/tests/ui/issues/issue-27815.rs
diff --git a/src/test/ui/issues/issue-27815.stderr b/tests/ui/issues/issue-27815.stderr
index 43f78ccf6..43f78ccf6 100644
--- a/src/test/ui/issues/issue-27815.stderr
+++ b/tests/ui/issues/issue-27815.stderr
diff --git a/src/test/ui/issues/issue-27842.rs b/tests/ui/issues/issue-27842.rs
index 3bcfa1330..3bcfa1330 100644
--- a/src/test/ui/issues/issue-27842.rs
+++ b/tests/ui/issues/issue-27842.rs
diff --git a/src/test/ui/issues/issue-27842.stderr b/tests/ui/issues/issue-27842.stderr
index 784666a63..784666a63 100644
--- a/src/test/ui/issues/issue-27842.stderr
+++ b/tests/ui/issues/issue-27842.stderr
diff --git a/src/test/ui/issues/issue-27859.rs b/tests/ui/issues/issue-27859.rs
index 233670681..233670681 100644
--- a/src/test/ui/issues/issue-27859.rs
+++ b/tests/ui/issues/issue-27859.rs
diff --git a/src/test/ui/issues/issue-27889.rs b/tests/ui/issues/issue-27889.rs
index 623416a5d..623416a5d 100644
--- a/src/test/ui/issues/issue-27889.rs
+++ b/tests/ui/issues/issue-27889.rs
diff --git a/src/test/ui/issues/issue-27901.rs b/tests/ui/issues/issue-27901.rs
index ffd90b689..ffd90b689 100644
--- a/src/test/ui/issues/issue-27901.rs
+++ b/tests/ui/issues/issue-27901.rs
diff --git a/src/test/ui/issues/issue-27942.rs b/tests/ui/issues/issue-27942.rs
index 34b34de38..34b34de38 100644
--- a/src/test/ui/issues/issue-27942.rs
+++ b/tests/ui/issues/issue-27942.rs
diff --git a/src/test/ui/issues/issue-27942.stderr b/tests/ui/issues/issue-27942.stderr
index 7ea9345a6..7ea9345a6 100644
--- a/src/test/ui/issues/issue-27942.stderr
+++ b/tests/ui/issues/issue-27942.stderr
diff --git a/src/test/ui/issues/issue-27949.rs b/tests/ui/issues/issue-27949.rs
index e905da72a..e905da72a 100644
--- a/src/test/ui/issues/issue-27949.rs
+++ b/tests/ui/issues/issue-27949.rs
diff --git a/src/test/ui/issues/issue-27997.rs b/tests/ui/issues/issue-27997.rs
index dd74cf752..dd74cf752 100644
--- a/src/test/ui/issues/issue-27997.rs
+++ b/tests/ui/issues/issue-27997.rs
diff --git a/src/test/ui/issues/issue-2804-2.rs b/tests/ui/issues/issue-2804-2.rs
index d02725505..d02725505 100644
--- a/src/test/ui/issues/issue-2804-2.rs
+++ b/tests/ui/issues/issue-2804-2.rs
diff --git a/src/test/ui/issues/issue-28105.rs b/tests/ui/issues/issue-28105.rs
index 1e8d2d6cc..1e8d2d6cc 100644
--- a/src/test/ui/issues/issue-28105.rs
+++ b/tests/ui/issues/issue-28105.rs
diff --git a/src/test/ui/issues/issue-28105.stderr b/tests/ui/issues/issue-28105.stderr
index f450256f3..f450256f3 100644
--- a/src/test/ui/issues/issue-28105.stderr
+++ b/tests/ui/issues/issue-28105.stderr
diff --git a/src/test/ui/issues/issue-28109.rs b/tests/ui/issues/issue-28109.rs
index 755a539b5..755a539b5 100644
--- a/src/test/ui/issues/issue-28109.rs
+++ b/tests/ui/issues/issue-28109.rs
diff --git a/src/test/ui/issues/issue-28109.stderr b/tests/ui/issues/issue-28109.stderr
index 0f918d3b6..0f918d3b6 100644
--- a/src/test/ui/issues/issue-28109.stderr
+++ b/tests/ui/issues/issue-28109.stderr
diff --git a/src/test/ui/issues/issue-28181.rs b/tests/ui/issues/issue-28181.rs
index c46e131c6..c46e131c6 100644
--- a/src/test/ui/issues/issue-28181.rs
+++ b/tests/ui/issues/issue-28181.rs
diff --git a/src/test/ui/issues/issue-2823.rs b/tests/ui/issues/issue-2823.rs
index 7b443b415..7b443b415 100644
--- a/src/test/ui/issues/issue-2823.rs
+++ b/tests/ui/issues/issue-2823.rs
diff --git a/src/test/ui/issues/issue-2823.stderr b/tests/ui/issues/issue-2823.stderr
index b5a2b2f55..b5a2b2f55 100644
--- a/src/test/ui/issues/issue-2823.stderr
+++ b/tests/ui/issues/issue-2823.stderr
diff --git a/src/test/ui/issues/issue-28279.rs b/tests/ui/issues/issue-28279.rs
index bab5df122..bab5df122 100644
--- a/src/test/ui/issues/issue-28279.rs
+++ b/tests/ui/issues/issue-28279.rs
diff --git a/src/test/ui/issues/issue-28344.rs b/tests/ui/issues/issue-28344.rs
index 1a6a7f46b..1a6a7f46b 100644
--- a/src/test/ui/issues/issue-28344.rs
+++ b/tests/ui/issues/issue-28344.rs
diff --git a/src/test/ui/issues/issue-28344.stderr b/tests/ui/issues/issue-28344.stderr
index f398a5da3..f398a5da3 100644
--- a/src/test/ui/issues/issue-28344.stderr
+++ b/tests/ui/issues/issue-28344.stderr
diff --git a/src/test/ui/issues/issue-28433.rs b/tests/ui/issues/issue-28433.rs
index 8d05c32d5..8d05c32d5 100644
--- a/src/test/ui/issues/issue-28433.rs
+++ b/tests/ui/issues/issue-28433.rs
diff --git a/src/test/ui/issues/issue-28433.stderr b/tests/ui/issues/issue-28433.stderr
index 9f5f63336..9f5f63336 100644
--- a/src/test/ui/issues/issue-28433.stderr
+++ b/tests/ui/issues/issue-28433.stderr
diff --git a/src/test/ui/issues/issue-28472.rs b/tests/ui/issues/issue-28472.rs
index 6db1f9a5b..6db1f9a5b 100644
--- a/src/test/ui/issues/issue-28472.rs
+++ b/tests/ui/issues/issue-28472.rs
diff --git a/src/test/ui/issues/issue-28472.stderr b/tests/ui/issues/issue-28472.stderr
index 051ed25b6..051ed25b6 100644
--- a/src/test/ui/issues/issue-28472.stderr
+++ b/tests/ui/issues/issue-28472.stderr
diff --git a/src/test/ui/issues/issue-2848.rs b/tests/ui/issues/issue-2848.rs
index e0049bf8f..e0049bf8f 100644
--- a/src/test/ui/issues/issue-2848.rs
+++ b/tests/ui/issues/issue-2848.rs
diff --git a/src/test/ui/issues/issue-2848.stderr b/tests/ui/issues/issue-2848.stderr
index 71ed7d70b..71ed7d70b 100644
--- a/src/test/ui/issues/issue-2848.stderr
+++ b/tests/ui/issues/issue-2848.stderr
diff --git a/src/test/ui/issues/issue-2849.rs b/tests/ui/issues/issue-2849.rs
index 787ab0e28..787ab0e28 100644
--- a/src/test/ui/issues/issue-2849.rs
+++ b/tests/ui/issues/issue-2849.rs
diff --git a/src/test/ui/issues/issue-2849.stderr b/tests/ui/issues/issue-2849.stderr
index 9027098d2..9027098d2 100644
--- a/src/test/ui/issues/issue-2849.stderr
+++ b/tests/ui/issues/issue-2849.stderr
diff --git a/src/test/ui/issues/issue-28498-must-work-ex1.rs b/tests/ui/issues/issue-28498-must-work-ex1.rs
index ab6d190e0..ab6d190e0 100644
--- a/src/test/ui/issues/issue-28498-must-work-ex1.rs
+++ b/tests/ui/issues/issue-28498-must-work-ex1.rs
diff --git a/src/test/ui/issues/issue-28498-must-work-ex2.rs b/tests/ui/issues/issue-28498-must-work-ex2.rs
index 378d736ee..378d736ee 100644
--- a/src/test/ui/issues/issue-28498-must-work-ex2.rs
+++ b/tests/ui/issues/issue-28498-must-work-ex2.rs
diff --git a/src/test/ui/issues/issue-28498-ugeh-ex1.rs b/tests/ui/issues/issue-28498-ugeh-ex1.rs
index 24bf706ce..24bf706ce 100644
--- a/src/test/ui/issues/issue-28498-ugeh-ex1.rs
+++ b/tests/ui/issues/issue-28498-ugeh-ex1.rs
diff --git a/src/test/ui/issues/issue-28550.rs b/tests/ui/issues/issue-28550.rs
index 95583f805..95583f805 100644
--- a/src/test/ui/issues/issue-28550.rs
+++ b/tests/ui/issues/issue-28550.rs
diff --git a/src/test/ui/issues/issue-28561.rs b/tests/ui/issues/issue-28561.rs
index beb12c36d..beb12c36d 100644
--- a/src/test/ui/issues/issue-28561.rs
+++ b/tests/ui/issues/issue-28561.rs
diff --git a/src/test/ui/issues/issue-28568.rs b/tests/ui/issues/issue-28568.rs
index ce511158f..ce511158f 100644
--- a/src/test/ui/issues/issue-28568.rs
+++ b/tests/ui/issues/issue-28568.rs
diff --git a/src/test/ui/issues/issue-28568.stderr b/tests/ui/issues/issue-28568.stderr
index 960259080..960259080 100644
--- a/src/test/ui/issues/issue-28568.stderr
+++ b/tests/ui/issues/issue-28568.stderr
diff --git a/src/test/ui/issues/issue-28586.rs b/tests/ui/issues/issue-28586.rs
index c543ef9b0..c543ef9b0 100644
--- a/src/test/ui/issues/issue-28586.rs
+++ b/tests/ui/issues/issue-28586.rs
diff --git a/src/test/ui/issues/issue-28586.stderr b/tests/ui/issues/issue-28586.stderr
index d19c4af2d..d19c4af2d 100644
--- a/src/test/ui/issues/issue-28586.stderr
+++ b/tests/ui/issues/issue-28586.stderr
diff --git a/src/test/ui/issues/issue-28600.rs b/tests/ui/issues/issue-28600.rs
index 52db0d5fd..52db0d5fd 100644
--- a/src/test/ui/issues/issue-28600.rs
+++ b/tests/ui/issues/issue-28600.rs
diff --git a/src/test/ui/issues/issue-28625.rs b/tests/ui/issues/issue-28625.rs
index 15a6a63d5..15a6a63d5 100644
--- a/src/test/ui/issues/issue-28625.rs
+++ b/tests/ui/issues/issue-28625.rs
diff --git a/src/test/ui/issues/issue-28625.stderr b/tests/ui/issues/issue-28625.stderr
index 7ee0cd486..7ee0cd486 100644
--- a/src/test/ui/issues/issue-28625.stderr
+++ b/tests/ui/issues/issue-28625.stderr
diff --git a/src/test/ui/issues/issue-28776.mir.stderr b/tests/ui/issues/issue-28776.mir.stderr
index 1d470fb5e..1d470fb5e 100644
--- a/src/test/ui/issues/issue-28776.mir.stderr
+++ b/tests/ui/issues/issue-28776.mir.stderr
diff --git a/src/test/ui/issues/issue-28776.rs b/tests/ui/issues/issue-28776.rs
index 19df3c4a4..19df3c4a4 100644
--- a/src/test/ui/issues/issue-28776.rs
+++ b/tests/ui/issues/issue-28776.rs
diff --git a/src/test/ui/issues/issue-28776.thir.stderr b/tests/ui/issues/issue-28776.thir.stderr
index e3562810b..e3562810b 100644
--- a/src/test/ui/issues/issue-28776.thir.stderr
+++ b/tests/ui/issues/issue-28776.thir.stderr
diff --git a/src/test/ui/issues/issue-28777.rs b/tests/ui/issues/issue-28777.rs
index 1f426b718..1f426b718 100644
--- a/src/test/ui/issues/issue-28777.rs
+++ b/tests/ui/issues/issue-28777.rs
diff --git a/src/test/ui/issues/issue-28822.rs b/tests/ui/issues/issue-28822.rs
index 10e5d1dd0..10e5d1dd0 100644
--- a/src/test/ui/issues/issue-28822.rs
+++ b/tests/ui/issues/issue-28822.rs
diff --git a/src/test/ui/issues/issue-28828.rs b/tests/ui/issues/issue-28828.rs
index 03968809e..03968809e 100644
--- a/src/test/ui/issues/issue-28828.rs
+++ b/tests/ui/issues/issue-28828.rs
diff --git a/src/test/ui/issues/issue-28839.rs b/tests/ui/issues/issue-28839.rs
index 73be87a0c..73be87a0c 100644
--- a/src/test/ui/issues/issue-28839.rs
+++ b/tests/ui/issues/issue-28839.rs
diff --git a/src/test/ui/issues/issue-28936.rs b/tests/ui/issues/issue-28936.rs
index da9e92c0c..da9e92c0c 100644
--- a/src/test/ui/issues/issue-28936.rs
+++ b/tests/ui/issues/issue-28936.rs
diff --git a/src/test/ui/issues/issue-2895.rs b/tests/ui/issues/issue-2895.rs
index d8c08996b..d8c08996b 100644
--- a/src/test/ui/issues/issue-2895.rs
+++ b/tests/ui/issues/issue-2895.rs
diff --git a/src/test/ui/issues/issue-28971.rs b/tests/ui/issues/issue-28971.rs
index f0a1e2d00..f0a1e2d00 100644
--- a/src/test/ui/issues/issue-28971.rs
+++ b/tests/ui/issues/issue-28971.rs
diff --git a/src/test/ui/issues/issue-28971.stderr b/tests/ui/issues/issue-28971.stderr
index 2eb8a1c26..2eb8a1c26 100644
--- a/src/test/ui/issues/issue-28971.stderr
+++ b/tests/ui/issues/issue-28971.stderr
diff --git a/src/test/ui/issues/issue-28983.rs b/tests/ui/issues/issue-28983.rs
index 3db26a1ee..3db26a1ee 100644
--- a/src/test/ui/issues/issue-28983.rs
+++ b/tests/ui/issues/issue-28983.rs
diff --git a/src/test/ui/issues/issue-28992-empty.rs b/tests/ui/issues/issue-28992-empty.rs
index 74cfeb6db..74cfeb6db 100644
--- a/src/test/ui/issues/issue-28992-empty.rs
+++ b/tests/ui/issues/issue-28992-empty.rs
diff --git a/src/test/ui/issues/issue-28992-empty.stderr b/tests/ui/issues/issue-28992-empty.stderr
index f69773b8c..f69773b8c 100644
--- a/src/test/ui/issues/issue-28992-empty.stderr
+++ b/tests/ui/issues/issue-28992-empty.stderr
diff --git a/src/test/ui/issues/issue-28999.rs b/tests/ui/issues/issue-28999.rs
index cec3e25da..cec3e25da 100644
--- a/src/test/ui/issues/issue-28999.rs
+++ b/tests/ui/issues/issue-28999.rs
diff --git a/src/test/ui/issues/issue-29030.rs b/tests/ui/issues/issue-29030.rs
index 723e35840..723e35840 100644
--- a/src/test/ui/issues/issue-29030.rs
+++ b/tests/ui/issues/issue-29030.rs
diff --git a/src/test/ui/issues/issue-29037.rs b/tests/ui/issues/issue-29037.rs
index 155ed144b..155ed144b 100644
--- a/src/test/ui/issues/issue-29037.rs
+++ b/tests/ui/issues/issue-29037.rs
diff --git a/src/test/ui/issues/issue-2904.rs b/tests/ui/issues/issue-2904.rs
index 73aa78f09..73aa78f09 100644
--- a/src/test/ui/issues/issue-2904.rs
+++ b/tests/ui/issues/issue-2904.rs
diff --git a/src/test/ui/issues/issue-29048.rs b/tests/ui/issues/issue-29048.rs
index 039f072f1..039f072f1 100644
--- a/src/test/ui/issues/issue-29048.rs
+++ b/tests/ui/issues/issue-29048.rs
diff --git a/src/test/ui/issues/issue-29053.rs b/tests/ui/issues/issue-29053.rs
index 34c4a0f8f..34c4a0f8f 100644
--- a/src/test/ui/issues/issue-29053.rs
+++ b/tests/ui/issues/issue-29053.rs
diff --git a/src/test/ui/issues/issue-29071-2.rs b/tests/ui/issues/issue-29071-2.rs
index f27bf0261..f27bf0261 100644
--- a/src/test/ui/issues/issue-29071-2.rs
+++ b/tests/ui/issues/issue-29071-2.rs
diff --git a/src/test/ui/issues/issue-29071.rs b/tests/ui/issues/issue-29071.rs
index 8bdacf2ce..8bdacf2ce 100644
--- a/src/test/ui/issues/issue-29071.rs
+++ b/tests/ui/issues/issue-29071.rs
diff --git a/src/test/ui/issues/issue-29092.rs b/tests/ui/issues/issue-29092.rs
index f20d2a424..f20d2a424 100644
--- a/src/test/ui/issues/issue-29092.rs
+++ b/tests/ui/issues/issue-29092.rs
diff --git a/src/test/ui/issues/issue-29147-rpass.rs b/tests/ui/issues/issue-29147-rpass.rs
index 439f8bb53..439f8bb53 100644
--- a/src/test/ui/issues/issue-29147-rpass.rs
+++ b/tests/ui/issues/issue-29147-rpass.rs
diff --git a/src/test/ui/issues/issue-29147.rs b/tests/ui/issues/issue-29147.rs
index 190ecf460..190ecf460 100644
--- a/src/test/ui/issues/issue-29147.rs
+++ b/tests/ui/issues/issue-29147.rs
diff --git a/src/test/ui/issues/issue-29147.stderr b/tests/ui/issues/issue-29147.stderr
index 138d477dc..138d477dc 100644
--- a/src/test/ui/issues/issue-29147.stderr
+++ b/tests/ui/issues/issue-29147.stderr
diff --git a/src/test/ui/issues/issue-29181.rs b/tests/ui/issues/issue-29181.rs
index 70e5bc019..70e5bc019 100644
--- a/src/test/ui/issues/issue-29181.rs
+++ b/tests/ui/issues/issue-29181.rs
diff --git a/src/test/ui/issues/issue-29181.stderr b/tests/ui/issues/issue-29181.stderr
index 53addf2fe..53addf2fe 100644
--- a/src/test/ui/issues/issue-29181.stderr
+++ b/tests/ui/issues/issue-29181.stderr
diff --git a/src/test/ui/issues/issue-29265.rs b/tests/ui/issues/issue-29265.rs
index f554c4d16..f554c4d16 100644
--- a/src/test/ui/issues/issue-29265.rs
+++ b/tests/ui/issues/issue-29265.rs
diff --git a/src/test/ui/issues/issue-29276.rs b/tests/ui/issues/issue-29276.rs
index 02b695659..02b695659 100644
--- a/src/test/ui/issues/issue-29276.rs
+++ b/tests/ui/issues/issue-29276.rs
diff --git a/src/test/ui/issues/issue-2935.rs b/tests/ui/issues/issue-2935.rs
index 37f818199..37f818199 100644
--- a/src/test/ui/issues/issue-2935.rs
+++ b/tests/ui/issues/issue-2935.rs
diff --git a/src/test/ui/issues/issue-29466.rs b/tests/ui/issues/issue-29466.rs
index f8785a632..f8785a632 100644
--- a/src/test/ui/issues/issue-29466.rs
+++ b/tests/ui/issues/issue-29466.rs
diff --git a/src/test/ui/issues/issue-29485.rs b/tests/ui/issues/issue-29485.rs
index 8d58ee6d9..8d58ee6d9 100644
--- a/src/test/ui/issues/issue-29485.rs
+++ b/tests/ui/issues/issue-29485.rs
diff --git a/src/test/ui/issues/issue-2951.rs b/tests/ui/issues/issue-2951.rs
index 1798e3e75..1798e3e75 100644
--- a/src/test/ui/issues/issue-2951.rs
+++ b/tests/ui/issues/issue-2951.rs
diff --git a/src/test/ui/issues/issue-2951.stderr b/tests/ui/issues/issue-2951.stderr
index 538bbe2f5..538bbe2f5 100644
--- a/src/test/ui/issues/issue-2951.stderr
+++ b/tests/ui/issues/issue-2951.stderr
diff --git a/src/test/ui/issues/issue-29516.rs b/tests/ui/issues/issue-29516.rs
index 6779d508d..6779d508d 100644
--- a/src/test/ui/issues/issue-29516.rs
+++ b/tests/ui/issues/issue-29516.rs
diff --git a/src/test/ui/issues/issue-29522.rs b/tests/ui/issues/issue-29522.rs
index 3d2de5ef6..3d2de5ef6 100644
--- a/src/test/ui/issues/issue-29522.rs
+++ b/tests/ui/issues/issue-29522.rs
diff --git a/src/test/ui/issues/issue-29540.rs b/tests/ui/issues/issue-29540.rs
index c0de20822..c0de20822 100644
--- a/src/test/ui/issues/issue-29540.rs
+++ b/tests/ui/issues/issue-29540.rs
diff --git a/src/test/ui/issues/issue-29663.rs b/tests/ui/issues/issue-29663.rs
index e2e89a8bf..e2e89a8bf 100644
--- a/src/test/ui/issues/issue-29663.rs
+++ b/tests/ui/issues/issue-29663.rs
diff --git a/src/test/ui/issues/issue-29668.rs b/tests/ui/issues/issue-29668.rs
index 3d6c27bcd..3d6c27bcd 100644
--- a/src/test/ui/issues/issue-29668.rs
+++ b/tests/ui/issues/issue-29668.rs
diff --git a/src/test/ui/issues/issue-29710.rs b/tests/ui/issues/issue-29710.rs
index bc98d389c..bc98d389c 100644
--- a/src/test/ui/issues/issue-29710.rs
+++ b/tests/ui/issues/issue-29710.rs
diff --git a/tests/ui/issues/issue-29723.rs b/tests/ui/issues/issue-29723.rs
new file mode 100644
index 000000000..399e9ba0d
--- /dev/null
+++ b/tests/ui/issues/issue-29723.rs
@@ -0,0 +1,22 @@
+// test for https://github.com/rust-lang/rust/issues/29723
+
+#![feature(if_let_guard)]
+
+fn main() {
+    let s = String::new();
+    let _s = match 0 {
+        0 if { drop(s); false } => String::from("oops"),
+        _ => {
+            // This should trigger an error,
+            // s could have been moved from.
+            s
+            //~^ ERROR use of moved value: `s`
+        }
+    };
+
+    let s = String::new();
+    let _s = match 0 {
+        0 if let Some(()) = { drop(s); None } => String::from("oops"),
+        _ => s //~ ERROR use of moved value: `s`
+    };
+}
diff --git a/tests/ui/issues/issue-29723.stderr b/tests/ui/issues/issue-29723.stderr
new file mode 100644
index 000000000..044d8a9b5
--- /dev/null
+++ b/tests/ui/issues/issue-29723.stderr
@@ -0,0 +1,36 @@
+error[E0382]: use of moved value: `s`
+  --> $DIR/issue-29723.rs:12:13
+   |
+LL |     let s = String::new();
+   |         - move occurs because `s` has type `String`, which does not implement the `Copy` trait
+LL |     let _s = match 0 {
+LL |         0 if { drop(s); false } => String::from("oops"),
+   |                     - value moved here
+...
+LL |             s
+   |             ^ value used here after move
+   |
+help: consider cloning the value if the performance cost is acceptable
+   |
+LL |         0 if { drop(s.clone()); false } => String::from("oops"),
+   |                      ++++++++
+
+error[E0382]: use of moved value: `s`
+  --> $DIR/issue-29723.rs:20:14
+   |
+LL |     let s = String::new();
+   |         - move occurs because `s` has type `String`, which does not implement the `Copy` trait
+LL |     let _s = match 0 {
+LL |         0 if let Some(()) = { drop(s); None } => String::from("oops"),
+   |                                    - value moved here
+LL |         _ => s
+   |              ^ value used here after move
+   |
+help: consider cloning the value if the performance cost is acceptable
+   |
+LL |         0 if let Some(()) = { drop(s.clone()); None } => String::from("oops"),
+   |                                     ++++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/issues/issue-29740.rs b/tests/ui/issues/issue-29740.rs
index 20398890b..20398890b 100644
--- a/src/test/ui/issues/issue-29740.rs
+++ b/tests/ui/issues/issue-29740.rs
diff --git a/src/test/ui/issues/issue-29743.rs b/tests/ui/issues/issue-29743.rs
index 250cd7e1b..250cd7e1b 100644
--- a/src/test/ui/issues/issue-29743.rs
+++ b/tests/ui/issues/issue-29743.rs
diff --git a/src/test/ui/issues/issue-29746.rs b/tests/ui/issues/issue-29746.rs
index 3470a7e09..3470a7e09 100644
--- a/src/test/ui/issues/issue-29746.rs
+++ b/tests/ui/issues/issue-29746.rs
diff --git a/src/test/ui/issues/issue-29798.rs b/tests/ui/issues/issue-29798.rs
index 5eff5d191..5eff5d191 100644
--- a/src/test/ui/issues/issue-29798.rs
+++ b/tests/ui/issues/issue-29798.rs
diff --git a/src/test/ui/issues/issue-29821.rs b/tests/ui/issues/issue-29821.rs
index 54be3afb5..54be3afb5 100644
--- a/src/test/ui/issues/issue-29821.rs
+++ b/tests/ui/issues/issue-29821.rs
diff --git a/src/test/ui/issues/issue-29857.rs b/tests/ui/issues/issue-29857.rs
index 6f4c5f45d..6f4c5f45d 100644
--- a/src/test/ui/issues/issue-29857.rs
+++ b/tests/ui/issues/issue-29857.rs
diff --git a/src/test/ui/issues/issue-29861.rs b/tests/ui/issues/issue-29861.rs
index 58f8eb536..58f8eb536 100644
--- a/src/test/ui/issues/issue-29861.rs
+++ b/tests/ui/issues/issue-29861.rs
diff --git a/src/test/ui/issues/issue-29861.stderr b/tests/ui/issues/issue-29861.stderr
index d9d3cf360..d9d3cf360 100644
--- a/src/test/ui/issues/issue-29861.stderr
+++ b/tests/ui/issues/issue-29861.stderr
diff --git a/src/test/ui/issues/issue-2989.rs b/tests/ui/issues/issue-2989.rs
index c0b673743..c0b673743 100644
--- a/src/test/ui/issues/issue-2989.rs
+++ b/tests/ui/issues/issue-2989.rs
diff --git a/src/test/ui/issues/issue-29948.rs b/tests/ui/issues/issue-29948.rs
index 3ed701480..3ed701480 100644
--- a/src/test/ui/issues/issue-29948.rs
+++ b/tests/ui/issues/issue-29948.rs
diff --git a/src/test/ui/issues/issue-2995.rs b/tests/ui/issues/issue-2995.rs
index 0da790948..0da790948 100644
--- a/src/test/ui/issues/issue-2995.rs
+++ b/tests/ui/issues/issue-2995.rs
diff --git a/src/test/ui/issues/issue-2995.stderr b/tests/ui/issues/issue-2995.stderr
index 0d09612c6..0d09612c6 100644
--- a/src/test/ui/issues/issue-2995.stderr
+++ b/tests/ui/issues/issue-2995.stderr
diff --git a/src/test/ui/issues/issue-30007.rs b/tests/ui/issues/issue-30007.rs
index 918a821ba..918a821ba 100644
--- a/src/test/ui/issues/issue-30007.rs
+++ b/tests/ui/issues/issue-30007.rs
diff --git a/src/test/ui/issues/issue-30007.stderr b/tests/ui/issues/issue-30007.stderr
index 87e770e15..87e770e15 100644
--- a/src/test/ui/issues/issue-30007.stderr
+++ b/tests/ui/issues/issue-30007.stderr
diff --git a/src/test/ui/issues/issue-30018-panic.rs b/tests/ui/issues/issue-30018-panic.rs
index cba3055a2..cba3055a2 100644
--- a/src/test/ui/issues/issue-30018-panic.rs
+++ b/tests/ui/issues/issue-30018-panic.rs
diff --git a/src/test/ui/issues/issue-3008-1.rs b/tests/ui/issues/issue-3008-1.rs
index 1124969e6..1124969e6 100644
--- a/src/test/ui/issues/issue-3008-1.rs
+++ b/tests/ui/issues/issue-3008-1.rs
diff --git a/src/test/ui/issues/issue-3008-1.stderr b/tests/ui/issues/issue-3008-1.stderr
index be25b9091..be25b9091 100644
--- a/src/test/ui/issues/issue-3008-1.stderr
+++ b/tests/ui/issues/issue-3008-1.stderr
diff --git a/src/test/ui/issues/issue-3008-2.rs b/tests/ui/issues/issue-3008-2.rs
index 5846c69da..5846c69da 100644
--- a/src/test/ui/issues/issue-3008-2.rs
+++ b/tests/ui/issues/issue-3008-2.rs
diff --git a/src/test/ui/issues/issue-3008-2.stderr b/tests/ui/issues/issue-3008-2.stderr
index 858a8fd6a..858a8fd6a 100644
--- a/src/test/ui/issues/issue-3008-2.stderr
+++ b/tests/ui/issues/issue-3008-2.stderr
diff --git a/src/test/ui/issues/issue-3008-3.rs b/tests/ui/issues/issue-3008-3.rs
index 212eb2eb8..212eb2eb8 100644
--- a/src/test/ui/issues/issue-3008-3.rs
+++ b/tests/ui/issues/issue-3008-3.rs
diff --git a/src/test/ui/issues/issue-3008-3.stderr b/tests/ui/issues/issue-3008-3.stderr
index a1a81e293..a1a81e293 100644
--- a/src/test/ui/issues/issue-3008-3.stderr
+++ b/tests/ui/issues/issue-3008-3.stderr
diff --git a/src/test/ui/issues/issue-30081.rs b/tests/ui/issues/issue-30081.rs
index e7fca96ed..e7fca96ed 100644
--- a/src/test/ui/issues/issue-30081.rs
+++ b/tests/ui/issues/issue-30081.rs
diff --git a/src/test/ui/issues/issue-3012-2.rs b/tests/ui/issues/issue-3012-2.rs
index 7d32c51f5..7d32c51f5 100644
--- a/src/test/ui/issues/issue-3012-2.rs
+++ b/tests/ui/issues/issue-3012-2.rs
diff --git a/src/test/ui/issues/issue-30123.rs b/tests/ui/issues/issue-30123.rs
index 705355d91..705355d91 100644
--- a/src/test/ui/issues/issue-30123.rs
+++ b/tests/ui/issues/issue-30123.rs
diff --git a/src/test/ui/issues/issue-30123.stderr b/tests/ui/issues/issue-30123.stderr
index e9d934332..7808cbf8a 100644
--- a/src/test/ui/issues/issue-30123.stderr
+++ b/tests/ui/issues/issue-30123.stderr
@@ -1,8 +1,8 @@
-error[E0599]: no function or associated item named `new_undirected` found for struct `issue_30123_aux::Graph<i32, i32>` in the current scope
+error[E0599]: no function or associated item named `new_undirected` found for struct `Graph<i32, i32>` in the current scope
   --> $DIR/issue-30123.rs:7:33
    |
 LL |     let ug = Graph::<i32, i32>::new_undirected();
-   |                                 ^^^^^^^^^^^^^^ function or associated item not found in `issue_30123_aux::Graph<i32, i32>`
+   |                                 ^^^^^^^^^^^^^^ function or associated item not found in `Graph<i32, i32>`
    |
    = note: the function or associated item was found for
            - `issue_30123_aux::Graph<N, E, Undirected>`
diff --git a/src/test/ui/issues/issue-3021-b.rs b/tests/ui/issues/issue-3021-b.rs
index f1630afe1..f1630afe1 100644
--- a/src/test/ui/issues/issue-3021-b.rs
+++ b/tests/ui/issues/issue-3021-b.rs
diff --git a/src/test/ui/issues/issue-3021-b.stderr b/tests/ui/issues/issue-3021-b.stderr
index 72289c5f9..72289c5f9 100644
--- a/src/test/ui/issues/issue-3021-b.stderr
+++ b/tests/ui/issues/issue-3021-b.stderr
diff --git a/src/test/ui/issues/issue-3021-d.rs b/tests/ui/issues/issue-3021-d.rs
index 1fb0002b2..1fb0002b2 100644
--- a/src/test/ui/issues/issue-3021-d.rs
+++ b/tests/ui/issues/issue-3021-d.rs
diff --git a/src/test/ui/issues/issue-3021-d.stderr b/tests/ui/issues/issue-3021-d.stderr
index 39e6e8c43..39e6e8c43 100644
--- a/src/test/ui/issues/issue-3021-d.stderr
+++ b/tests/ui/issues/issue-3021-d.stderr
diff --git a/src/test/ui/issues/issue-30236.rs b/tests/ui/issues/issue-30236.rs
index 9c2d85507..9c2d85507 100644
--- a/src/test/ui/issues/issue-30236.rs
+++ b/tests/ui/issues/issue-30236.rs
diff --git a/src/test/ui/issues/issue-30236.stderr b/tests/ui/issues/issue-30236.stderr
index 64cbd58d6..64cbd58d6 100644
--- a/src/test/ui/issues/issue-30236.stderr
+++ b/tests/ui/issues/issue-30236.stderr
diff --git a/src/test/ui/issues/issue-30255.rs b/tests/ui/issues/issue-30255.rs
index 6970a122b..6970a122b 100644
--- a/src/test/ui/issues/issue-30255.rs
+++ b/tests/ui/issues/issue-30255.rs
diff --git a/src/test/ui/issues/issue-30255.stderr b/tests/ui/issues/issue-30255.stderr
index adb721a1c..adb721a1c 100644
--- a/src/test/ui/issues/issue-30255.stderr
+++ b/tests/ui/issues/issue-30255.stderr
diff --git a/src/test/ui/issues/issue-3026.rs b/tests/ui/issues/issue-3026.rs
index 4619a3fe7..4619a3fe7 100644
--- a/src/test/ui/issues/issue-3026.rs
+++ b/tests/ui/issues/issue-3026.rs
diff --git a/src/test/ui/issues/issue-3029.rs b/tests/ui/issues/issue-3029.rs
index a5d30960a..a5d30960a 100644
--- a/src/test/ui/issues/issue-3029.rs
+++ b/tests/ui/issues/issue-3029.rs
diff --git a/src/test/ui/issues/issue-3037.rs b/tests/ui/issues/issue-3037.rs
index ff4d32c28..ff4d32c28 100644
--- a/src/test/ui/issues/issue-3037.rs
+++ b/tests/ui/issues/issue-3037.rs
diff --git a/src/test/ui/issues/issue-30371.rs b/tests/ui/issues/issue-30371.rs
index eea548c48..eea548c48 100644
--- a/src/test/ui/issues/issue-30371.rs
+++ b/tests/ui/issues/issue-30371.rs
diff --git a/src/test/ui/issues/issue-3038.rs b/tests/ui/issues/issue-3038.rs
index cf3ba009f..cf3ba009f 100644
--- a/src/test/ui/issues/issue-3038.rs
+++ b/tests/ui/issues/issue-3038.rs
diff --git a/src/test/ui/issues/issue-3038.stderr b/tests/ui/issues/issue-3038.stderr
index 210da2cef..210da2cef 100644
--- a/src/test/ui/issues/issue-3038.stderr
+++ b/tests/ui/issues/issue-3038.stderr
diff --git a/src/test/ui/issues/issue-30380.rs b/tests/ui/issues/issue-30380.rs
index 48b329c5d..48b329c5d 100644
--- a/src/test/ui/issues/issue-30380.rs
+++ b/tests/ui/issues/issue-30380.rs
diff --git a/src/test/ui/issues/issue-30438-a.rs b/tests/ui/issues/issue-30438-a.rs
index 0d4eb796a..0d4eb796a 100644
--- a/src/test/ui/issues/issue-30438-a.rs
+++ b/tests/ui/issues/issue-30438-a.rs
diff --git a/src/test/ui/issues/issue-30438-a.stderr b/tests/ui/issues/issue-30438-a.stderr
index 53845af82..53845af82 100644
--- a/src/test/ui/issues/issue-30438-a.stderr
+++ b/tests/ui/issues/issue-30438-a.stderr
diff --git a/src/test/ui/issues/issue-30438-b.rs b/tests/ui/issues/issue-30438-b.rs
index 79510cdb6..79510cdb6 100644
--- a/src/test/ui/issues/issue-30438-b.rs
+++ b/tests/ui/issues/issue-30438-b.rs
diff --git a/src/test/ui/issues/issue-30438-b.stderr b/tests/ui/issues/issue-30438-b.stderr
index fd6bd25b1..fd6bd25b1 100644
--- a/src/test/ui/issues/issue-30438-b.stderr
+++ b/tests/ui/issues/issue-30438-b.stderr
diff --git a/src/test/ui/issues/issue-30438-c.rs b/tests/ui/issues/issue-30438-c.rs
index 4cf634245..4cf634245 100644
--- a/src/test/ui/issues/issue-30438-c.rs
+++ b/tests/ui/issues/issue-30438-c.rs
diff --git a/src/test/ui/issues/issue-30438-c.stderr b/tests/ui/issues/issue-30438-c.stderr
index a7a5c0500..a7a5c0500 100644
--- a/src/test/ui/issues/issue-30438-c.stderr
+++ b/tests/ui/issues/issue-30438-c.stderr
diff --git a/src/test/ui/issues/issue-30490.rs b/tests/ui/issues/issue-30490.rs
index 4f0eeac8f..4f0eeac8f 100644
--- a/src/test/ui/issues/issue-30490.rs
+++ b/tests/ui/issues/issue-30490.rs
diff --git a/src/test/ui/issues/issue-3052.rs b/tests/ui/issues/issue-3052.rs
index ee2456da3..ee2456da3 100644
--- a/src/test/ui/issues/issue-3052.rs
+++ b/tests/ui/issues/issue-3052.rs
diff --git a/src/test/ui/issues/issue-30530.rs b/tests/ui/issues/issue-30530.rs
index 111fb8aa5..111fb8aa5 100644
--- a/src/test/ui/issues/issue-30530.rs
+++ b/tests/ui/issues/issue-30530.rs
diff --git a/src/test/ui/issues/issue-30589.rs b/tests/ui/issues/issue-30589.rs
index 94eb58399..94eb58399 100644
--- a/src/test/ui/issues/issue-30589.rs
+++ b/tests/ui/issues/issue-30589.rs
diff --git a/src/test/ui/issues/issue-30589.stderr b/tests/ui/issues/issue-30589.stderr
index 4b88547a1..4b88547a1 100644
--- a/src/test/ui/issues/issue-30589.stderr
+++ b/tests/ui/issues/issue-30589.stderr
diff --git a/src/test/ui/issues/issue-30615.rs b/tests/ui/issues/issue-30615.rs
index c718449d8..c718449d8 100644
--- a/src/test/ui/issues/issue-30615.rs
+++ b/tests/ui/issues/issue-30615.rs
diff --git a/src/test/ui/issues/issue-30756.rs b/tests/ui/issues/issue-30756.rs
index 836db951b..836db951b 100644
--- a/src/test/ui/issues/issue-30756.rs
+++ b/tests/ui/issues/issue-30756.rs
diff --git a/src/test/ui/issues/issue-30891.rs b/tests/ui/issues/issue-30891.rs
index 30f55e0bd..30f55e0bd 100644
--- a/src/test/ui/issues/issue-30891.rs
+++ b/tests/ui/issues/issue-30891.rs
diff --git a/src/test/ui/issues/issue-3091.rs b/tests/ui/issues/issue-3091.rs
index 0c0a41242..0c0a41242 100644
--- a/src/test/ui/issues/issue-3091.rs
+++ b/tests/ui/issues/issue-3091.rs
diff --git a/src/test/ui/issues/issue-3099-a.rs b/tests/ui/issues/issue-3099-a.rs
index 9c3d8cf5a..9c3d8cf5a 100644
--- a/src/test/ui/issues/issue-3099-a.rs
+++ b/tests/ui/issues/issue-3099-a.rs
diff --git a/src/test/ui/issues/issue-3099-a.stderr b/tests/ui/issues/issue-3099-a.stderr
index e3733cebb..e3733cebb 100644
--- a/src/test/ui/issues/issue-3099-a.stderr
+++ b/tests/ui/issues/issue-3099-a.stderr
diff --git a/src/test/ui/issues/issue-3099-b.rs b/tests/ui/issues/issue-3099-b.rs
index 71952c3b0..71952c3b0 100644
--- a/src/test/ui/issues/issue-3099-b.rs
+++ b/tests/ui/issues/issue-3099-b.rs
diff --git a/src/test/ui/issues/issue-3099-b.stderr b/tests/ui/issues/issue-3099-b.stderr
index c0cfefeb9..c0cfefeb9 100644
--- a/src/test/ui/issues/issue-3099-b.stderr
+++ b/tests/ui/issues/issue-3099-b.stderr
diff --git a/src/test/ui/issues/issue-3099.rs b/tests/ui/issues/issue-3099.rs
index ee75b3593..ee75b3593 100644
--- a/src/test/ui/issues/issue-3099.rs
+++ b/tests/ui/issues/issue-3099.rs
diff --git a/src/test/ui/issues/issue-3099.stderr b/tests/ui/issues/issue-3099.stderr
index 32ee2e1d2..32ee2e1d2 100644
--- a/src/test/ui/issues/issue-3099.stderr
+++ b/tests/ui/issues/issue-3099.stderr
diff --git a/src/test/ui/issues/issue-31011.rs b/tests/ui/issues/issue-31011.rs
index 4dead04c2..4dead04c2 100644
--- a/src/test/ui/issues/issue-31011.rs
+++ b/tests/ui/issues/issue-31011.rs
diff --git a/src/test/ui/issues/issue-31011.stderr b/tests/ui/issues/issue-31011.stderr
index 58c170409..58c170409 100644
--- a/src/test/ui/issues/issue-31011.stderr
+++ b/tests/ui/issues/issue-31011.stderr
diff --git a/src/test/ui/issues/issue-3109.rs b/tests/ui/issues/issue-3109.rs
index bd807cad7..bd807cad7 100644
--- a/src/test/ui/issues/issue-3109.rs
+++ b/tests/ui/issues/issue-3109.rs
diff --git a/src/test/ui/issues/issue-3121.rs b/tests/ui/issues/issue-3121.rs
index 4bf5b9b60..4bf5b9b60 100644
--- a/src/test/ui/issues/issue-3121.rs
+++ b/tests/ui/issues/issue-3121.rs
diff --git a/src/test/ui/issues/issue-31260.rs b/tests/ui/issues/issue-31260.rs
index 4db7445b0..4db7445b0 100644
--- a/src/test/ui/issues/issue-31260.rs
+++ b/tests/ui/issues/issue-31260.rs
diff --git a/src/test/ui/issues/issue-31267-additional.rs b/tests/ui/issues/issue-31267-additional.rs
index 7f0cbd658..7f0cbd658 100644
--- a/src/test/ui/issues/issue-31267-additional.rs
+++ b/tests/ui/issues/issue-31267-additional.rs
diff --git a/src/test/ui/issues/issue-31267.rs b/tests/ui/issues/issue-31267.rs
index 50843c89e..50843c89e 100644
--- a/src/test/ui/issues/issue-31267.rs
+++ b/tests/ui/issues/issue-31267.rs
diff --git a/src/test/ui/issues/issue-31299.rs b/tests/ui/issues/issue-31299.rs
index 78c3252d3..78c3252d3 100644
--- a/src/test/ui/issues/issue-31299.rs
+++ b/tests/ui/issues/issue-31299.rs
diff --git a/src/test/ui/issues/issue-3136-b.rs b/tests/ui/issues/issue-3136-b.rs
index c4ca7236e..c4ca7236e 100644
--- a/src/test/ui/issues/issue-3136-b.rs
+++ b/tests/ui/issues/issue-3136-b.rs
diff --git a/src/test/ui/issues/issue-3149.rs b/tests/ui/issues/issue-3149.rs
index 6ab3bc846..6ab3bc846 100644
--- a/src/test/ui/issues/issue-3149.rs
+++ b/tests/ui/issues/issue-3149.rs
diff --git a/src/test/ui/issues/issue-31511.rs b/tests/ui/issues/issue-31511.rs
index 53fecb016..53fecb016 100644
--- a/src/test/ui/issues/issue-31511.rs
+++ b/tests/ui/issues/issue-31511.rs
diff --git a/src/test/ui/issues/issue-31511.stderr b/tests/ui/issues/issue-31511.stderr
index cb2991809..cb2991809 100644
--- a/src/test/ui/issues/issue-31511.stderr
+++ b/tests/ui/issues/issue-31511.stderr
diff --git a/src/test/ui/issues/issue-3154.rs b/tests/ui/issues/issue-3154.rs
index 91c7203c1..91c7203c1 100644
--- a/src/test/ui/issues/issue-3154.rs
+++ b/tests/ui/issues/issue-3154.rs
diff --git a/src/test/ui/issues/issue-3154.stderr b/tests/ui/issues/issue-3154.stderr
index da2af83ff..da2af83ff 100644
--- a/src/test/ui/issues/issue-3154.stderr
+++ b/tests/ui/issues/issue-3154.stderr
diff --git a/src/test/ui/issues/issue-31702.rs b/tests/ui/issues/issue-31702.rs
index 5b24eead3..5b24eead3 100644
--- a/src/test/ui/issues/issue-31702.rs
+++ b/tests/ui/issues/issue-31702.rs
diff --git a/src/test/ui/issues/issue-31769.rs b/tests/ui/issues/issue-31769.rs
index f56c6ea56..f56c6ea56 100644
--- a/src/test/ui/issues/issue-31769.rs
+++ b/tests/ui/issues/issue-31769.rs
diff --git a/src/test/ui/issues/issue-31769.stderr b/tests/ui/issues/issue-31769.stderr
index 03e2f931c..03e2f931c 100644
--- a/src/test/ui/issues/issue-31769.stderr
+++ b/tests/ui/issues/issue-31769.stderr
diff --git a/src/test/ui/issues/issue-31776.rs b/tests/ui/issues/issue-31776.rs
index c86623ce2..c86623ce2 100644
--- a/src/test/ui/issues/issue-31776.rs
+++ b/tests/ui/issues/issue-31776.rs
diff --git a/src/test/ui/issues/issue-31910.rs b/tests/ui/issues/issue-31910.rs
index e0655d3f6..e0655d3f6 100644
--- a/src/test/ui/issues/issue-31910.rs
+++ b/tests/ui/issues/issue-31910.rs
diff --git a/src/test/ui/issues/issue-31910.stderr b/tests/ui/issues/issue-31910.stderr
index 2603c9442..2603c9442 100644
--- a/src/test/ui/issues/issue-31910.stderr
+++ b/tests/ui/issues/issue-31910.stderr
diff --git a/src/test/ui/issues/issue-32004.rs b/tests/ui/issues/issue-32004.rs
index b3493508c..b3493508c 100644
--- a/src/test/ui/issues/issue-32004.rs
+++ b/tests/ui/issues/issue-32004.rs
diff --git a/src/test/ui/issues/issue-32004.stderr b/tests/ui/issues/issue-32004.stderr
index 2d2ed5a63..2d2ed5a63 100644
--- a/src/test/ui/issues/issue-32004.stderr
+++ b/tests/ui/issues/issue-32004.stderr
diff --git a/src/test/ui/issues/issue-32008.rs b/tests/ui/issues/issue-32008.rs
index 6c2e20679..6c2e20679 100644
--- a/src/test/ui/issues/issue-32008.rs
+++ b/tests/ui/issues/issue-32008.rs
diff --git a/src/test/ui/issues/issue-32086.rs b/tests/ui/issues/issue-32086.rs
index d595d1dd7..d595d1dd7 100644
--- a/src/test/ui/issues/issue-32086.rs
+++ b/tests/ui/issues/issue-32086.rs
diff --git a/src/test/ui/issues/issue-32086.stderr b/tests/ui/issues/issue-32086.stderr
index e566dea89..e566dea89 100644
--- a/src/test/ui/issues/issue-32086.stderr
+++ b/tests/ui/issues/issue-32086.stderr
diff --git a/src/test/ui/issues/issue-32122-1.fixed b/tests/ui/issues/issue-32122-1.fixed
index 4fc5f64ff..4fc5f64ff 100644
--- a/src/test/ui/issues/issue-32122-1.fixed
+++ b/tests/ui/issues/issue-32122-1.fixed
diff --git a/src/test/ui/issues/issue-32122-1.rs b/tests/ui/issues/issue-32122-1.rs
index 3c4859f07..3c4859f07 100644
--- a/src/test/ui/issues/issue-32122-1.rs
+++ b/tests/ui/issues/issue-32122-1.rs
diff --git a/src/test/ui/issues/issue-32122-1.stderr b/tests/ui/issues/issue-32122-1.stderr
index 10b0c0967..10b0c0967 100644
--- a/src/test/ui/issues/issue-32122-1.stderr
+++ b/tests/ui/issues/issue-32122-1.stderr
diff --git a/src/test/ui/issues/issue-32122-2.fixed b/tests/ui/issues/issue-32122-2.fixed
index cee0e5929..cee0e5929 100644
--- a/src/test/ui/issues/issue-32122-2.fixed
+++ b/tests/ui/issues/issue-32122-2.fixed
diff --git a/src/test/ui/issues/issue-32122-2.rs b/tests/ui/issues/issue-32122-2.rs
index 39e9df422..39e9df422 100644
--- a/src/test/ui/issues/issue-32122-2.rs
+++ b/tests/ui/issues/issue-32122-2.rs
diff --git a/src/test/ui/issues/issue-32122-2.stderr b/tests/ui/issues/issue-32122-2.stderr
index 5c3dade8e..5c3dade8e 100644
--- a/src/test/ui/issues/issue-32122-2.stderr
+++ b/tests/ui/issues/issue-32122-2.stderr
diff --git a/src/test/ui/issues/issue-3214.rs b/tests/ui/issues/issue-3214.rs
index 928a65938..928a65938 100644
--- a/src/test/ui/issues/issue-3214.rs
+++ b/tests/ui/issues/issue-3214.rs
diff --git a/src/test/ui/issues/issue-3214.stderr b/tests/ui/issues/issue-3214.stderr
index aa0b5ce64..aa0b5ce64 100644
--- a/src/test/ui/issues/issue-3214.stderr
+++ b/tests/ui/issues/issue-3214.stderr
diff --git a/src/test/ui/issues/issue-3220.rs b/tests/ui/issues/issue-3220.rs
index 7dc672edb..7dc672edb 100644
--- a/src/test/ui/issues/issue-3220.rs
+++ b/tests/ui/issues/issue-3220.rs
diff --git a/src/test/ui/issues/issue-32292.rs b/tests/ui/issues/issue-32292.rs
index 99b865391..99b865391 100644
--- a/src/test/ui/issues/issue-32292.rs
+++ b/tests/ui/issues/issue-32292.rs
diff --git a/src/test/ui/issues/issue-32323.rs b/tests/ui/issues/issue-32323.rs
index 5078f5523..5078f5523 100644
--- a/src/test/ui/issues/issue-32323.rs
+++ b/tests/ui/issues/issue-32323.rs
diff --git a/src/test/ui/issues/issue-32323.stderr b/tests/ui/issues/issue-32323.stderr
index 8212c607e..8212c607e 100644
--- a/src/test/ui/issues/issue-32323.stderr
+++ b/tests/ui/issues/issue-32323.stderr
diff --git a/src/test/ui/issues/issue-32324.rs b/tests/ui/issues/issue-32324.rs
index 2df547b2e..2df547b2e 100644
--- a/src/test/ui/issues/issue-32324.rs
+++ b/tests/ui/issues/issue-32324.rs
diff --git a/src/test/ui/issues/issue-32326.rs b/tests/ui/issues/issue-32326.rs
index e928c66e2..e928c66e2 100644
--- a/src/test/ui/issues/issue-32326.rs
+++ b/tests/ui/issues/issue-32326.rs
diff --git a/src/test/ui/issues/issue-32326.stderr b/tests/ui/issues/issue-32326.stderr
index dc51198d9..dc51198d9 100644
--- a/src/test/ui/issues/issue-32326.stderr
+++ b/tests/ui/issues/issue-32326.stderr
diff --git a/src/test/ui/issues/issue-32377.rs b/tests/ui/issues/issue-32377.rs
index 555f6abd7..555f6abd7 100644
--- a/src/test/ui/issues/issue-32377.rs
+++ b/tests/ui/issues/issue-32377.rs
diff --git a/src/test/ui/issues/issue-32377.stderr b/tests/ui/issues/issue-32377.stderr
index 5e870eb3e..5e870eb3e 100644
--- a/src/test/ui/issues/issue-32377.stderr
+++ b/tests/ui/issues/issue-32377.stderr
diff --git a/src/test/ui/issues/issue-32389.rs b/tests/ui/issues/issue-32389.rs
index cc94cc819..cc94cc819 100644
--- a/src/test/ui/issues/issue-32389.rs
+++ b/tests/ui/issues/issue-32389.rs
diff --git a/src/test/ui/issues/issue-32518.rs b/tests/ui/issues/issue-32518.rs
index 808b40f71..808b40f71 100644
--- a/src/test/ui/issues/issue-32518.rs
+++ b/tests/ui/issues/issue-32518.rs
diff --git a/src/test/ui/issues/issue-32655.rs b/tests/ui/issues/issue-32655.rs
index f52e09231..f52e09231 100644
--- a/src/test/ui/issues/issue-32655.rs
+++ b/tests/ui/issues/issue-32655.rs
diff --git a/tests/ui/issues/issue-32655.stderr b/tests/ui/issues/issue-32655.stderr
new file mode 100644
index 000000000..b8362499b
--- /dev/null
+++ b/tests/ui/issues/issue-32655.stderr
@@ -0,0 +1,25 @@
+error: cannot find attribute `derive_Clone` in this scope
+  --> $DIR/issue-32655.rs:3:11
+   |
+LL |         #[derive_Clone]
+   |           ^^^^^^^^^^^^ help: an attribute macro with a similar name exists: `derive_const`
+...
+LL | foo!();
+   | ------ in this macro invocation
+  --> $SRC_DIR/core/src/macros/mod.rs:LL:COL
+   |
+   = note: similarly named attribute macro `derive_const` defined here
+   |
+   = note: this error originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: cannot find attribute `derive_Clone` in this scope
+  --> $DIR/issue-32655.rs:15:7
+   |
+LL |     #[derive_Clone]
+   |       ^^^^^^^^^^^^ help: an attribute macro with a similar name exists: `derive_const`
+  --> $SRC_DIR/core/src/macros/mod.rs:LL:COL
+   |
+   = note: similarly named attribute macro `derive_const` defined here
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/issues/issue-32709.rs b/tests/ui/issues/issue-32709.rs
index c05bfdc4c..c05bfdc4c 100644
--- a/src/test/ui/issues/issue-32709.rs
+++ b/tests/ui/issues/issue-32709.rs
diff --git a/src/test/ui/issues/issue-32709.stderr b/tests/ui/issues/issue-32709.stderr
index 1d595ca56..1d595ca56 100644
--- a/src/test/ui/issues/issue-32709.stderr
+++ b/tests/ui/issues/issue-32709.stderr
diff --git a/src/test/ui/issues/issue-32782.rs b/tests/ui/issues/issue-32782.rs
index e3aa9f3bf..e3aa9f3bf 100644
--- a/src/test/ui/issues/issue-32782.rs
+++ b/tests/ui/issues/issue-32782.rs
diff --git a/src/test/ui/issues/issue-32782.stderr b/tests/ui/issues/issue-32782.stderr
index a6c55ba03..a6c55ba03 100644
--- a/src/test/ui/issues/issue-32782.stderr
+++ b/tests/ui/issues/issue-32782.stderr
diff --git a/src/test/ui/issues/issue-32797.rs b/tests/ui/issues/issue-32797.rs
index b12b929f8..b12b929f8 100644
--- a/src/test/ui/issues/issue-32797.rs
+++ b/tests/ui/issues/issue-32797.rs
diff --git a/src/test/ui/issues/issue-32805.rs b/tests/ui/issues/issue-32805.rs
index 23c194739..23c194739 100644
--- a/src/test/ui/issues/issue-32805.rs
+++ b/tests/ui/issues/issue-32805.rs
diff --git a/src/test/ui/issues/issue-3290.rs b/tests/ui/issues/issue-3290.rs
index 7014d517f..7014d517f 100644
--- a/src/test/ui/issues/issue-3290.rs
+++ b/tests/ui/issues/issue-3290.rs
diff --git a/src/test/ui/issues/issue-32950.rs b/tests/ui/issues/issue-32950.rs
index 27d68a11c..27d68a11c 100644
--- a/src/test/ui/issues/issue-32950.rs
+++ b/tests/ui/issues/issue-32950.rs
diff --git a/src/test/ui/issues/issue-32950.stderr b/tests/ui/issues/issue-32950.stderr
index f6635d982..f6635d982 100644
--- a/src/test/ui/issues/issue-32950.stderr
+++ b/tests/ui/issues/issue-32950.stderr
diff --git a/src/test/ui/issues/issue-32995-2.rs b/tests/ui/issues/issue-32995-2.rs
index e713a64d3..e713a64d3 100644
--- a/src/test/ui/issues/issue-32995-2.rs
+++ b/tests/ui/issues/issue-32995-2.rs
diff --git a/src/test/ui/issues/issue-32995-2.stderr b/tests/ui/issues/issue-32995-2.stderr
index 6c2d772a2..6c2d772a2 100644
--- a/src/test/ui/issues/issue-32995-2.stderr
+++ b/tests/ui/issues/issue-32995-2.stderr
diff --git a/src/test/ui/issues/issue-32995.rs b/tests/ui/issues/issue-32995.rs
index 0d07a7693..0d07a7693 100644
--- a/src/test/ui/issues/issue-32995.rs
+++ b/tests/ui/issues/issue-32995.rs
diff --git a/src/test/ui/issues/issue-32995.stderr b/tests/ui/issues/issue-32995.stderr
index b868011b9..b868011b9 100644
--- a/src/test/ui/issues/issue-32995.stderr
+++ b/tests/ui/issues/issue-32995.stderr
diff --git a/src/test/ui/issues/issue-33096.rs b/tests/ui/issues/issue-33096.rs
index 2501e1430..2501e1430 100644
--- a/src/test/ui/issues/issue-33096.rs
+++ b/tests/ui/issues/issue-33096.rs
diff --git a/src/test/ui/issues/issue-33187.rs b/tests/ui/issues/issue-33187.rs
index 8db9e0058..8db9e0058 100644
--- a/src/test/ui/issues/issue-33187.rs
+++ b/tests/ui/issues/issue-33187.rs
diff --git a/src/test/ui/issues/issue-33202.rs b/tests/ui/issues/issue-33202.rs
index 11b89ae1b..11b89ae1b 100644
--- a/src/test/ui/issues/issue-33202.rs
+++ b/tests/ui/issues/issue-33202.rs
diff --git a/src/test/ui/issues/issue-33241.rs b/tests/ui/issues/issue-33241.rs
index 5f9f1e4a7..5f9f1e4a7 100644
--- a/src/test/ui/issues/issue-33241.rs
+++ b/tests/ui/issues/issue-33241.rs
diff --git a/src/test/ui/issues/issue-33287.rs b/tests/ui/issues/issue-33287.rs
index 770eb7c02..770eb7c02 100644
--- a/src/test/ui/issues/issue-33287.rs
+++ b/tests/ui/issues/issue-33287.rs
diff --git a/src/test/ui/issues/issue-33293.rs b/tests/ui/issues/issue-33293.rs
index a6ef007d5..a6ef007d5 100644
--- a/src/test/ui/issues/issue-33293.rs
+++ b/tests/ui/issues/issue-33293.rs
diff --git a/src/test/ui/issues/issue-33293.stderr b/tests/ui/issues/issue-33293.stderr
index c8450f400..c8450f400 100644
--- a/src/test/ui/issues/issue-33293.stderr
+++ b/tests/ui/issues/issue-33293.stderr
diff --git a/src/test/ui/issues/issue-33387.rs b/tests/ui/issues/issue-33387.rs
index 499fa7c1f..499fa7c1f 100644
--- a/src/test/ui/issues/issue-33387.rs
+++ b/tests/ui/issues/issue-33387.rs
diff --git a/src/test/ui/issues/issue-3344.rs b/tests/ui/issues/issue-3344.rs
index de764b3d0..de764b3d0 100644
--- a/src/test/ui/issues/issue-3344.rs
+++ b/tests/ui/issues/issue-3344.rs
diff --git a/src/test/ui/issues/issue-3344.stderr b/tests/ui/issues/issue-3344.stderr
index 11d599967..11d599967 100644
--- a/src/test/ui/issues/issue-3344.stderr
+++ b/tests/ui/issues/issue-3344.stderr
diff --git a/src/test/ui/issues/issue-33461.rs b/tests/ui/issues/issue-33461.rs
index 4e01d4d30..4e01d4d30 100644
--- a/src/test/ui/issues/issue-33461.rs
+++ b/tests/ui/issues/issue-33461.rs
diff --git a/src/test/ui/issues/issue-33504.rs b/tests/ui/issues/issue-33504.rs
index 89cc06ede..89cc06ede 100644
--- a/src/test/ui/issues/issue-33504.rs
+++ b/tests/ui/issues/issue-33504.rs
diff --git a/src/test/ui/issues/issue-33504.stderr b/tests/ui/issues/issue-33504.stderr
index d9e7c3b16..d9e7c3b16 100644
--- a/src/test/ui/issues/issue-33504.stderr
+++ b/tests/ui/issues/issue-33504.stderr
diff --git a/src/test/ui/issues/issue-33525.rs b/tests/ui/issues/issue-33525.rs
index 74f21eff2..74f21eff2 100644
--- a/src/test/ui/issues/issue-33525.rs
+++ b/tests/ui/issues/issue-33525.rs
diff --git a/src/test/ui/issues/issue-33525.stderr b/tests/ui/issues/issue-33525.stderr
index f8d703dc3..f8d703dc3 100644
--- a/src/test/ui/issues/issue-33525.stderr
+++ b/tests/ui/issues/issue-33525.stderr
diff --git a/src/test/ui/issues/issue-33571.rs b/tests/ui/issues/issue-33571.rs
index 2713f47ad..2713f47ad 100644
--- a/src/test/ui/issues/issue-33571.rs
+++ b/tests/ui/issues/issue-33571.rs
diff --git a/src/test/ui/issues/issue-33571.stderr b/tests/ui/issues/issue-33571.stderr
index 2a9ba5ba7..2a9ba5ba7 100644
--- a/src/test/ui/issues/issue-33571.stderr
+++ b/tests/ui/issues/issue-33571.stderr
diff --git a/src/test/ui/issues/issue-33687.rs b/tests/ui/issues/issue-33687.rs
index ac802ed86..ac802ed86 100644
--- a/src/test/ui/issues/issue-33687.rs
+++ b/tests/ui/issues/issue-33687.rs
diff --git a/src/test/ui/issues/issue-33770.rs b/tests/ui/issues/issue-33770.rs
index f3c99015b..f3c99015b 100644
--- a/src/test/ui/issues/issue-33770.rs
+++ b/tests/ui/issues/issue-33770.rs
diff --git a/src/test/ui/issues/issue-3389.rs b/tests/ui/issues/issue-3389.rs
index 294a07229..294a07229 100644
--- a/src/test/ui/issues/issue-3389.rs
+++ b/tests/ui/issues/issue-3389.rs
diff --git a/src/test/ui/issues/issue-33903.rs b/tests/ui/issues/issue-33903.rs
index 613aa121a..613aa121a 100644
--- a/src/test/ui/issues/issue-33903.rs
+++ b/tests/ui/issues/issue-33903.rs
diff --git a/tests/ui/issues/issue-33941.rs b/tests/ui/issues/issue-33941.rs
new file mode 100644
index 000000000..e3b6dcf55
--- /dev/null
+++ b/tests/ui/issues/issue-33941.rs
@@ -0,0 +1,9 @@
+// compile-flags: -Zdeduplicate-diagnostics=yes
+
+use std::collections::HashMap;
+
+fn main() {
+    for _ in HashMap::new().iter().cloned() {} //~ ERROR expected `Iter<'_, _, _>` to be an iterator that yields `&_`, but it yields `(&_, &_)`
+    //~^ ERROR expected `Iter<'_, _, _>` to be an iterator that yields `&_`, but it yields `(&_, &_)`
+    //~| ERROR expected `Iter<'_, _, _>` to be an iterator that yields `&_`, but it yields `(&_, &_)`
+}
diff --git a/tests/ui/issues/issue-33941.stderr b/tests/ui/issues/issue-33941.stderr
new file mode 100644
index 000000000..668eaabca
--- /dev/null
+++ b/tests/ui/issues/issue-33941.stderr
@@ -0,0 +1,42 @@
+error[E0271]: expected `Iter<'_, _, _>` to be an iterator that yields `&_`, but it yields `(&_, &_)`
+  --> $DIR/issue-33941.rs:6:36
+   |
+LL |     for _ in HashMap::new().iter().cloned() {}
+   |                                    ^^^^^^ expected reference, found tuple
+   |
+   = note: expected reference `&_`
+                  found tuple `(&_, &_)`
+note: the method call chain might not have had the expected associated types
+  --> $DIR/issue-33941.rs:6:29
+   |
+LL |     for _ in HashMap::new().iter().cloned() {}
+   |              -------------- ^^^^^^ `Iterator::Item` is `(&_, &_)` here
+   |              |
+   |              this expression has type `HashMap<_, _>`
+note: required by a bound in `cloned`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error[E0271]: expected `Iter<'_, _, _>` to be an iterator that yields `&_`, but it yields `(&_, &_)`
+  --> $DIR/issue-33941.rs:6:14
+   |
+LL |     for _ in HashMap::new().iter().cloned() {}
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected tuple, found reference
+   |
+   = note:  expected tuple `(&_, &_)`
+           found reference `&_`
+   = note: required for `Cloned<std::collections::hash_map::Iter<'_, _, _>>` to implement `Iterator`
+   = note: required for `Cloned<std::collections::hash_map::Iter<'_, _, _>>` to implement `IntoIterator`
+
+error[E0271]: expected `Iter<'_, _, _>` to be an iterator that yields `&_`, but it yields `(&_, &_)`
+  --> $DIR/issue-33941.rs:6:14
+   |
+LL |     for _ in HashMap::new().iter().cloned() {}
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected tuple, found reference
+   |
+   = note:  expected tuple `(&_, &_)`
+           found reference `&_`
+   = note: required for `Cloned<std::collections::hash_map::Iter<'_, _, _>>` to implement `Iterator`
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0271`.
diff --git a/src/test/ui/issues/issue-33992.rs b/tests/ui/issues/issue-33992.rs
index a6b137ba6..a6b137ba6 100644
--- a/src/test/ui/issues/issue-33992.rs
+++ b/tests/ui/issues/issue-33992.rs
diff --git a/src/test/ui/issues/issue-34047.rs b/tests/ui/issues/issue-34047.rs
index 55196177f..55196177f 100644
--- a/src/test/ui/issues/issue-34047.rs
+++ b/tests/ui/issues/issue-34047.rs
diff --git a/src/test/ui/issues/issue-34047.stderr b/tests/ui/issues/issue-34047.stderr
index f770ded50..f770ded50 100644
--- a/src/test/ui/issues/issue-34047.stderr
+++ b/tests/ui/issues/issue-34047.stderr
diff --git a/src/test/ui/issues/issue-34074.rs b/tests/ui/issues/issue-34074.rs
index 0600d3937..0600d3937 100644
--- a/src/test/ui/issues/issue-34074.rs
+++ b/tests/ui/issues/issue-34074.rs
diff --git a/src/test/ui/issues/issue-34209.rs b/tests/ui/issues/issue-34209.rs
index 632ddb91b..632ddb91b 100644
--- a/src/test/ui/issues/issue-34209.rs
+++ b/tests/ui/issues/issue-34209.rs
diff --git a/src/test/ui/issues/issue-34209.stderr b/tests/ui/issues/issue-34209.stderr
index f9a25b69f..f9a25b69f 100644
--- a/src/test/ui/issues/issue-34209.stderr
+++ b/tests/ui/issues/issue-34209.stderr
diff --git a/src/test/ui/issues/issue-34229.rs b/tests/ui/issues/issue-34229.rs
index 13e627a49..13e627a49 100644
--- a/src/test/ui/issues/issue-34229.rs
+++ b/tests/ui/issues/issue-34229.rs
diff --git a/src/test/ui/issues/issue-34229.stderr b/tests/ui/issues/issue-34229.stderr
index 69ef876d2..69ef876d2 100644
--- a/src/test/ui/issues/issue-34229.stderr
+++ b/tests/ui/issues/issue-34229.stderr
diff --git a/src/test/ui/issues/issue-3424.rs b/tests/ui/issues/issue-3424.rs
index 43d75a652..43d75a652 100644
--- a/src/test/ui/issues/issue-3424.rs
+++ b/tests/ui/issues/issue-3424.rs
diff --git a/src/test/ui/issues/issue-3429.rs b/tests/ui/issues/issue-3429.rs
index 9d94c3ff6..9d94c3ff6 100644
--- a/src/test/ui/issues/issue-3429.rs
+++ b/tests/ui/issues/issue-3429.rs
diff --git a/src/test/ui/issues/issue-34334.rs b/tests/ui/issues/issue-34334.rs
index 51486bc40..51486bc40 100644
--- a/src/test/ui/issues/issue-34334.rs
+++ b/tests/ui/issues/issue-34334.rs
diff --git a/tests/ui/issues/issue-34334.stderr b/tests/ui/issues/issue-34334.stderr
new file mode 100644
index 000000000..9d2c315e4
--- /dev/null
+++ b/tests/ui/issues/issue-34334.stderr
@@ -0,0 +1,38 @@
+error: expected one of `,`, `:`, or `>`, found `=`
+  --> $DIR/issue-34334.rs:2:29
+   |
+LL |     let sr: Vec<(u32, _, _) = vec![];
+   |         --                - ^ expected one of `,`, `:`, or `>`
+   |         |                 |
+   |         |                 maybe try to close unmatched angle bracket
+   |         while parsing the type for `sr`
+   |
+help: you might have meant to end the type parameters here
+   |
+LL |     let sr: Vec<(u32, _, _)> = vec![];
+   |                            +
+
+error[E0277]: a value of type `Vec<(u32, _, _)>` cannot be built from an iterator over elements of type `()`
+  --> $DIR/issue-34334.rs:5:87
+   |
+LL |     let sr2: Vec<(u32, _, _)> = sr.iter().map(|(faction, th_sender, th_receiver)| {}).collect();
+   |                                                                                       ^^^^^^^ value of type `Vec<(u32, _, _)>` cannot be built from `std::iter::Iterator<Item=()>`
+   |
+   = help: the trait `FromIterator<()>` is not implemented for `Vec<(u32, _, _)>`
+   = help: the trait `FromIterator<T>` is implemented for `Vec<T>`
+note: the method call chain might not have had the expected associated types
+  --> $DIR/issue-34334.rs:5:43
+   |
+LL |     let sr: Vec<(u32, _, _) = vec![];
+   |                               ------ this expression has type `Vec<(_, _, _)>`
+...
+LL |     let sr2: Vec<(u32, _, _)> = sr.iter().map(|(faction, th_sender, th_receiver)| {}).collect();
+   |                                    ------ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `Iterator::Item` changed to `()` here
+   |                                    |
+   |                                    `Iterator::Item` is `&(_, _, _)` here
+note: required by a bound in `collect`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/issues/issue-34349.rs b/tests/ui/issues/issue-34349.rs
index d86180261..d86180261 100644
--- a/src/test/ui/issues/issue-34349.rs
+++ b/tests/ui/issues/issue-34349.rs
diff --git a/src/test/ui/issues/issue-34349.stderr b/tests/ui/issues/issue-34349.stderr
index 8e9a16619..8e9a16619 100644
--- a/src/test/ui/issues/issue-34349.stderr
+++ b/tests/ui/issues/issue-34349.stderr
diff --git a/src/test/ui/issues/issue-34373.rs b/tests/ui/issues/issue-34373.rs
index ca24e37d9..ca24e37d9 100644
--- a/src/test/ui/issues/issue-34373.rs
+++ b/tests/ui/issues/issue-34373.rs
diff --git a/src/test/ui/issues/issue-34373.stderr b/tests/ui/issues/issue-34373.stderr
index 8be3cfa72..8be3cfa72 100644
--- a/src/test/ui/issues/issue-34373.stderr
+++ b/tests/ui/issues/issue-34373.stderr
diff --git a/src/test/ui/issues/issue-34418.rs b/tests/ui/issues/issue-34418.rs
index 6132f744b..6132f744b 100644
--- a/src/test/ui/issues/issue-34418.rs
+++ b/tests/ui/issues/issue-34418.rs
diff --git a/src/test/ui/issues/issue-34427.rs b/tests/ui/issues/issue-34427.rs
index a14b5b9e2..a14b5b9e2 100644
--- a/src/test/ui/issues/issue-34427.rs
+++ b/tests/ui/issues/issue-34427.rs
diff --git a/src/test/ui/issues/issue-3447.rs b/tests/ui/issues/issue-3447.rs
index ee5b22778..ee5b22778 100644
--- a/src/test/ui/issues/issue-3447.rs
+++ b/tests/ui/issues/issue-3447.rs
diff --git a/src/test/ui/issues/issue-34503.rs b/tests/ui/issues/issue-34503.rs
index 26e735840..26e735840 100644
--- a/src/test/ui/issues/issue-34503.rs
+++ b/tests/ui/issues/issue-34503.rs
diff --git a/src/test/ui/issues/issue-34569.rs b/tests/ui/issues/issue-34569.rs
index 88dcdd411..88dcdd411 100644
--- a/src/test/ui/issues/issue-34569.rs
+++ b/tests/ui/issues/issue-34569.rs
diff --git a/src/test/ui/issues/issue-34571.rs b/tests/ui/issues/issue-34571.rs
index 5498091da..5498091da 100644
--- a/src/test/ui/issues/issue-34571.rs
+++ b/tests/ui/issues/issue-34571.rs
diff --git a/src/test/ui/issues/issue-34721.fixed b/tests/ui/issues/issue-34721.fixed
index f135ad383..f135ad383 100644
--- a/src/test/ui/issues/issue-34721.fixed
+++ b/tests/ui/issues/issue-34721.fixed
diff --git a/src/test/ui/issues/issue-34721.rs b/tests/ui/issues/issue-34721.rs
index 14dd01766..14dd01766 100644
--- a/src/test/ui/issues/issue-34721.rs
+++ b/tests/ui/issues/issue-34721.rs
diff --git a/src/test/ui/issues/issue-34721.stderr b/tests/ui/issues/issue-34721.stderr
index 045819061..f2bf22227 100644
--- a/src/test/ui/issues/issue-34721.stderr
+++ b/tests/ui/issues/issue-34721.stderr
@@ -13,7 +13,7 @@ LL |         };
 LL |         x.zero()
    |         ^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `x`
+note: `Foo::zero` takes ownership of the receiver `self`, which moves `x`
   --> $DIR/issue-34721.rs:4:13
    |
 LL |     fn zero(self) -> Self;
diff --git a/src/test/ui/issues/issue-34751.rs b/tests/ui/issues/issue-34751.rs
index 6309c0a02..6309c0a02 100644
--- a/src/test/ui/issues/issue-34751.rs
+++ b/tests/ui/issues/issue-34751.rs
diff --git a/src/test/ui/issues/issue-3477.rs b/tests/ui/issues/issue-3477.rs
index 3817d0e6a..3817d0e6a 100644
--- a/src/test/ui/issues/issue-3477.rs
+++ b/tests/ui/issues/issue-3477.rs
diff --git a/src/test/ui/issues/issue-3477.stderr b/tests/ui/issues/issue-3477.stderr
index fd5f7dcf6..fd5f7dcf6 100644
--- a/src/test/ui/issues/issue-3477.stderr
+++ b/tests/ui/issues/issue-3477.stderr
diff --git a/src/test/ui/issues/issue-34780.rs b/tests/ui/issues/issue-34780.rs
index fbedad35b..fbedad35b 100644
--- a/src/test/ui/issues/issue-34780.rs
+++ b/tests/ui/issues/issue-34780.rs
diff --git a/src/test/ui/issues/issue-34796.rs b/tests/ui/issues/issue-34796.rs
index 88d5c50a2..88d5c50a2 100644
--- a/src/test/ui/issues/issue-34796.rs
+++ b/tests/ui/issues/issue-34796.rs
diff --git a/src/test/ui/issues/issue-34839.rs b/tests/ui/issues/issue-34839.rs
index 8ffed827e..8ffed827e 100644
--- a/src/test/ui/issues/issue-34839.rs
+++ b/tests/ui/issues/issue-34839.rs
diff --git a/src/test/ui/issues/issue-34932.rs b/tests/ui/issues/issue-34932.rs
index ab568fd01..ab568fd01 100644
--- a/src/test/ui/issues/issue-34932.rs
+++ b/tests/ui/issues/issue-34932.rs
diff --git a/src/test/ui/issues/issue-3500.rs b/tests/ui/issues/issue-3500.rs
index 7b39cc16c..7b39cc16c 100644
--- a/src/test/ui/issues/issue-3500.rs
+++ b/tests/ui/issues/issue-3500.rs
diff --git a/src/test/ui/issues/issue-35139.rs b/tests/ui/issues/issue-35139.rs
index e462f3543..e462f3543 100644
--- a/src/test/ui/issues/issue-35139.rs
+++ b/tests/ui/issues/issue-35139.rs
diff --git a/src/test/ui/issues/issue-35139.stderr b/tests/ui/issues/issue-35139.stderr
index 79e889b7e..79e889b7e 100644
--- a/src/test/ui/issues/issue-35139.stderr
+++ b/tests/ui/issues/issue-35139.stderr
diff --git a/src/test/ui/issues/issue-3521-2.fixed b/tests/ui/issues/issue-3521-2.fixed
index 140c24b93..140c24b93 100644
--- a/src/test/ui/issues/issue-3521-2.fixed
+++ b/tests/ui/issues/issue-3521-2.fixed
diff --git a/src/test/ui/issues/issue-3521-2.rs b/tests/ui/issues/issue-3521-2.rs
index f66efec45..f66efec45 100644
--- a/src/test/ui/issues/issue-3521-2.rs
+++ b/tests/ui/issues/issue-3521-2.rs
diff --git a/src/test/ui/issues/issue-3521-2.stderr b/tests/ui/issues/issue-3521-2.stderr
index 84c7a9efa..84c7a9efa 100644
--- a/src/test/ui/issues/issue-3521-2.stderr
+++ b/tests/ui/issues/issue-3521-2.stderr
diff --git a/src/test/ui/issues/issue-35241.rs b/tests/ui/issues/issue-35241.rs
index 2fa762475..2fa762475 100644
--- a/src/test/ui/issues/issue-35241.rs
+++ b/tests/ui/issues/issue-35241.rs
diff --git a/tests/ui/issues/issue-35241.stderr b/tests/ui/issues/issue-35241.stderr
new file mode 100644
index 000000000..d600e934b
--- /dev/null
+++ b/tests/ui/issues/issue-35241.stderr
@@ -0,0 +1,21 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-35241.rs:3:20
+   |
+LL | struct Foo(u32);
+   | ---------- `Foo` defines a struct constructor here, which should be called
+LL |
+LL | fn test() -> Foo { Foo }
+   |              ---   ^^^ expected struct `Foo`, found struct constructor
+   |              |
+   |              expected `Foo` because of return type
+   |
+   = note:          expected struct `Foo`
+           found struct constructor `fn(u32) -> Foo {Foo}`
+help: use parentheses to construct this tuple struct
+   |
+LL | fn test() -> Foo { Foo(/* u32 */) }
+   |                       +++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/issues/issue-35423.rs b/tests/ui/issues/issue-35423.rs
index 202ffcc1d..202ffcc1d 100644
--- a/src/test/ui/issues/issue-35423.rs
+++ b/tests/ui/issues/issue-35423.rs
diff --git a/src/test/ui/issues/issue-3556.rs b/tests/ui/issues/issue-3556.rs
index 3c1934ade..3c1934ade 100644
--- a/src/test/ui/issues/issue-3556.rs
+++ b/tests/ui/issues/issue-3556.rs
diff --git a/src/test/ui/issues/issue-35570.rs b/tests/ui/issues/issue-35570.rs
index a2b0222d4..a2b0222d4 100644
--- a/src/test/ui/issues/issue-35570.rs
+++ b/tests/ui/issues/issue-35570.rs
diff --git a/src/test/ui/issues/issue-35570.stderr b/tests/ui/issues/issue-35570.stderr
index ebc40f678..3dc33729d 100644
--- a/src/test/ui/issues/issue-35570.stderr
+++ b/tests/ui/issues/issue-35570.stderr
@@ -1,4 +1,10 @@
 error[E0277]: the trait bound `for<'a> (): Trait2<'a>` is not satisfied
+  --> $DIR/issue-35570.rs:8:40
+   |
+LL | fn _ice(param: Box<dyn for <'a> Trait1<<() as Trait2<'a>>::Ty>>) {
+   |                                        ^^^^^^^^^^^^^^^^^^^^^^ the trait `for<'a> Trait2<'a>` is not implemented for `()`
+
+error[E0277]: the trait bound `for<'a> (): Trait2<'a>` is not satisfied
   --> $DIR/issue-35570.rs:8:1
    |
 LL | / fn _ice(param: Box<dyn for <'a> Trait1<<() as Trait2<'a>>::Ty>>) {
@@ -8,12 +14,6 @@ LL | |     let _e: (usize, usize) = unsafe{mem::transmute(param)};
 LL | | }
    | |_^ the trait `for<'a> Trait2<'a>` is not implemented for `()`
 
-error[E0277]: the trait bound `for<'a> (): Trait2<'a>` is not satisfied
-  --> $DIR/issue-35570.rs:8:40
-   |
-LL | fn _ice(param: Box<dyn for <'a> Trait1<<() as Trait2<'a>>::Ty>>) {
-   |                                        ^^^^^^^^^^^^^^^^^^^^^^ the trait `for<'a> Trait2<'a>` is not implemented for `()`
-
 error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/issues/issue-3559.rs b/tests/ui/issues/issue-3559.rs
index 9d498584a..9d498584a 100644
--- a/src/test/ui/issues/issue-3559.rs
+++ b/tests/ui/issues/issue-3559.rs
diff --git a/src/test/ui/issues/issue-35600.rs b/tests/ui/issues/issue-35600.rs
index f0bab6010..f0bab6010 100644
--- a/src/test/ui/issues/issue-35600.rs
+++ b/tests/ui/issues/issue-35600.rs
diff --git a/src/test/ui/issues/issue-3563-3.rs b/tests/ui/issues/issue-3563-3.rs
index bedfdab97..bedfdab97 100644
--- a/src/test/ui/issues/issue-3563-3.rs
+++ b/tests/ui/issues/issue-3563-3.rs
diff --git a/src/test/ui/issues/issue-3574.rs b/tests/ui/issues/issue-3574.rs
index eb967577f..eb967577f 100644
--- a/src/test/ui/issues/issue-3574.rs
+++ b/tests/ui/issues/issue-3574.rs
diff --git a/src/test/ui/issues/issue-35815.rs b/tests/ui/issues/issue-35815.rs
index 05fd1b15d..05fd1b15d 100644
--- a/src/test/ui/issues/issue-35815.rs
+++ b/tests/ui/issues/issue-35815.rs
diff --git a/src/test/ui/issues/issue-35976.rs b/tests/ui/issues/issue-35976.rs
index aa6f74cb5..aa6f74cb5 100644
--- a/src/test/ui/issues/issue-35976.rs
+++ b/tests/ui/issues/issue-35976.rs
diff --git a/src/test/ui/issues/issue-35976.unimported.stderr b/tests/ui/issues/issue-35976.unimported.stderr
index 5d61bb8ea..5d61bb8ea 100644
--- a/src/test/ui/issues/issue-35976.unimported.stderr
+++ b/tests/ui/issues/issue-35976.unimported.stderr
diff --git a/src/test/ui/issues/issue-35988.rs b/tests/ui/issues/issue-35988.rs
index 5cf2f8e52..5cf2f8e52 100644
--- a/src/test/ui/issues/issue-35988.rs
+++ b/tests/ui/issues/issue-35988.rs
diff --git a/src/test/ui/issues/issue-35988.stderr b/tests/ui/issues/issue-35988.stderr
index 55988844c..55988844c 100644
--- a/src/test/ui/issues/issue-35988.stderr
+++ b/tests/ui/issues/issue-35988.stderr
diff --git a/src/test/ui/issues/issue-36023.rs b/tests/ui/issues/issue-36023.rs
index 64d92bf8c..64d92bf8c 100644
--- a/src/test/ui/issues/issue-36023.rs
+++ b/tests/ui/issues/issue-36023.rs
diff --git a/src/test/ui/issues/issue-36036-associated-type-layout.rs b/tests/ui/issues/issue-36036-associated-type-layout.rs
index 022f9a5d5..022f9a5d5 100644
--- a/src/test/ui/issues/issue-36036-associated-type-layout.rs
+++ b/tests/ui/issues/issue-36036-associated-type-layout.rs
diff --git a/src/test/ui/issues/issue-36075.rs b/tests/ui/issues/issue-36075.rs
index bc5bdc3ff..bc5bdc3ff 100644
--- a/src/test/ui/issues/issue-36075.rs
+++ b/tests/ui/issues/issue-36075.rs
diff --git a/src/test/ui/issues/issue-3609.rs b/tests/ui/issues/issue-3609.rs
index 57ff12a08..57ff12a08 100644
--- a/src/test/ui/issues/issue-3609.rs
+++ b/tests/ui/issues/issue-3609.rs
diff --git a/src/test/ui/issues/issue-36116.rs b/tests/ui/issues/issue-36116.rs
index c7c70c7af..c7c70c7af 100644
--- a/src/test/ui/issues/issue-36116.rs
+++ b/tests/ui/issues/issue-36116.rs
diff --git a/src/test/ui/issues/issue-36260.rs b/tests/ui/issues/issue-36260.rs
index d96dc80ea..d96dc80ea 100644
--- a/src/test/ui/issues/issue-36260.rs
+++ b/tests/ui/issues/issue-36260.rs
diff --git a/src/test/ui/issues/issue-36278-prefix-nesting.rs b/tests/ui/issues/issue-36278-prefix-nesting.rs
index a809f7f13..a809f7f13 100644
--- a/src/test/ui/issues/issue-36278-prefix-nesting.rs
+++ b/tests/ui/issues/issue-36278-prefix-nesting.rs
diff --git a/src/test/ui/issues/issue-36299.rs b/tests/ui/issues/issue-36299.rs
index 7b68420b7..7b68420b7 100644
--- a/src/test/ui/issues/issue-36299.rs
+++ b/tests/ui/issues/issue-36299.rs
diff --git a/src/test/ui/issues/issue-36299.stderr b/tests/ui/issues/issue-36299.stderr
index dc24fb353..dc24fb353 100644
--- a/src/test/ui/issues/issue-36299.stderr
+++ b/tests/ui/issues/issue-36299.stderr
diff --git a/src/test/ui/issues/issue-36379.rs b/tests/ui/issues/issue-36379.rs
index 3a3e6f470..3a3e6f470 100644
--- a/src/test/ui/issues/issue-36379.rs
+++ b/tests/ui/issues/issue-36379.rs
diff --git a/src/test/ui/issues/issue-36400.rs b/tests/ui/issues/issue-36400.rs
index a405f9b11..a405f9b11 100644
--- a/src/test/ui/issues/issue-36400.rs
+++ b/tests/ui/issues/issue-36400.rs
diff --git a/tests/ui/issues/issue-36400.stderr b/tests/ui/issues/issue-36400.stderr
new file mode 100644
index 000000000..5b753c69d
--- /dev/null
+++ b/tests/ui/issues/issue-36400.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `*x` as mutable, as `x` is not declared as mutable
+  --> $DIR/issue-36400.rs:5:7
+   |
+LL |     f(&mut *x);
+   |       ^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut x = Box::new(3);
+   |         +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/issues/issue-36401.rs b/tests/ui/issues/issue-36401.rs
index f51197b01..f51197b01 100644
--- a/src/test/ui/issues/issue-36401.rs
+++ b/tests/ui/issues/issue-36401.rs
diff --git a/src/test/ui/issues/issue-36474.rs b/tests/ui/issues/issue-36474.rs
index 90ee5b3cd..90ee5b3cd 100644
--- a/src/test/ui/issues/issue-36474.rs
+++ b/tests/ui/issues/issue-36474.rs
diff --git a/src/test/ui/issues/issue-3656.rs b/tests/ui/issues/issue-3656.rs
index 4a9f94306..4a9f94306 100644
--- a/src/test/ui/issues/issue-3656.rs
+++ b/tests/ui/issues/issue-3656.rs
diff --git a/src/test/ui/issues/issue-3668-2.fixed b/tests/ui/issues/issue-3668-2.fixed
index a95781c6e..a95781c6e 100644
--- a/src/test/ui/issues/issue-3668-2.fixed
+++ b/tests/ui/issues/issue-3668-2.fixed
diff --git a/src/test/ui/issues/issue-3668-2.rs b/tests/ui/issues/issue-3668-2.rs
index 8aa0897ec..8aa0897ec 100644
--- a/src/test/ui/issues/issue-3668-2.rs
+++ b/tests/ui/issues/issue-3668-2.rs
diff --git a/src/test/ui/issues/issue-3668-2.stderr b/tests/ui/issues/issue-3668-2.stderr
index ba9651041..ba9651041 100644
--- a/src/test/ui/issues/issue-3668-2.stderr
+++ b/tests/ui/issues/issue-3668-2.stderr
diff --git a/src/test/ui/issues/issue-3668.rs b/tests/ui/issues/issue-3668.rs
index 0e1f19a75..0e1f19a75 100644
--- a/src/test/ui/issues/issue-3668.rs
+++ b/tests/ui/issues/issue-3668.rs
diff --git a/src/test/ui/issues/issue-3668.stderr b/tests/ui/issues/issue-3668.stderr
index edc49979c..edc49979c 100644
--- a/src/test/ui/issues/issue-3668.stderr
+++ b/tests/ui/issues/issue-3668.stderr
diff --git a/src/test/ui/issues/issue-36744-bitcast-args-if-needed.rs b/tests/ui/issues/issue-36744-bitcast-args-if-needed.rs
index 34bbb66d9..34bbb66d9 100644
--- a/src/test/ui/issues/issue-36744-bitcast-args-if-needed.rs
+++ b/tests/ui/issues/issue-36744-bitcast-args-if-needed.rs
diff --git a/src/test/ui/issues/issue-36744-without-calls.rs b/tests/ui/issues/issue-36744-without-calls.rs
index dc5dc4f13..dc5dc4f13 100644
--- a/src/test/ui/issues/issue-36744-without-calls.rs
+++ b/tests/ui/issues/issue-36744-without-calls.rs
diff --git a/src/test/ui/issues/issue-36786-resolve-call.rs b/tests/ui/issues/issue-36786-resolve-call.rs
index e5341ba7d..e5341ba7d 100644
--- a/src/test/ui/issues/issue-36786-resolve-call.rs
+++ b/tests/ui/issues/issue-36786-resolve-call.rs
diff --git a/src/test/ui/issues/issue-36792.rs b/tests/ui/issues/issue-36792.rs
index 99ae633dd..99ae633dd 100644
--- a/src/test/ui/issues/issue-36792.rs
+++ b/tests/ui/issues/issue-36792.rs
diff --git a/src/test/ui/issues/issue-3680.rs b/tests/ui/issues/issue-3680.rs
index 37c9000c0..37c9000c0 100644
--- a/src/test/ui/issues/issue-3680.rs
+++ b/tests/ui/issues/issue-3680.rs
diff --git a/src/test/ui/issues/issue-3680.stderr b/tests/ui/issues/issue-3680.stderr
index 29ba44f13..29ba44f13 100644
--- a/src/test/ui/issues/issue-3680.stderr
+++ b/tests/ui/issues/issue-3680.stderr
diff --git a/src/test/ui/issues/issue-36816.rs b/tests/ui/issues/issue-36816.rs
index 54690b43c..54690b43c 100644
--- a/src/test/ui/issues/issue-36816.rs
+++ b/tests/ui/issues/issue-36816.rs
diff --git a/src/test/ui/issues/issue-36836.rs b/tests/ui/issues/issue-36836.rs
index 99c562131..99c562131 100644
--- a/src/test/ui/issues/issue-36836.rs
+++ b/tests/ui/issues/issue-36836.rs
diff --git a/src/test/ui/issues/issue-36836.stderr b/tests/ui/issues/issue-36836.stderr
index 418194fac..418194fac 100644
--- a/src/test/ui/issues/issue-36836.stderr
+++ b/tests/ui/issues/issue-36836.stderr
diff --git a/src/test/ui/issues/issue-36839.rs b/tests/ui/issues/issue-36839.rs
index ca3d66b1c..ca3d66b1c 100644
--- a/src/test/ui/issues/issue-36839.rs
+++ b/tests/ui/issues/issue-36839.rs
diff --git a/src/test/ui/issues/issue-36856.rs b/tests/ui/issues/issue-36856.rs
index 5657ba69f..5657ba69f 100644
--- a/src/test/ui/issues/issue-36856.rs
+++ b/tests/ui/issues/issue-36856.rs
diff --git a/src/test/ui/issues/issue-36936.rs b/tests/ui/issues/issue-36936.rs
index 486a422b7..486a422b7 100644
--- a/src/test/ui/issues/issue-36936.rs
+++ b/tests/ui/issues/issue-36936.rs
diff --git a/src/test/ui/issues/issue-36954.rs b/tests/ui/issues/issue-36954.rs
index 56ff9926e..56ff9926e 100644
--- a/src/test/ui/issues/issue-36954.rs
+++ b/tests/ui/issues/issue-36954.rs
diff --git a/src/test/ui/issues/issue-3702-2.rs b/tests/ui/issues/issue-3702-2.rs
index d47f6d248..d47f6d248 100644
--- a/src/test/ui/issues/issue-3702-2.rs
+++ b/tests/ui/issues/issue-3702-2.rs
diff --git a/src/test/ui/issues/issue-3702-2.stderr b/tests/ui/issues/issue-3702-2.stderr
index 1fd64ca90..1fd64ca90 100644
--- a/src/test/ui/issues/issue-3702-2.stderr
+++ b/tests/ui/issues/issue-3702-2.stderr
diff --git a/src/test/ui/issues/issue-3702.rs b/tests/ui/issues/issue-3702.rs
index f48d549b3..f48d549b3 100644
--- a/src/test/ui/issues/issue-3702.rs
+++ b/tests/ui/issues/issue-3702.rs
diff --git a/src/test/ui/issues/issue-37051.rs b/tests/ui/issues/issue-37051.rs
index 9cae6cf5e..9cae6cf5e 100644
--- a/src/test/ui/issues/issue-37051.rs
+++ b/tests/ui/issues/issue-37051.rs
diff --git a/src/test/ui/issues/issue-3707.rs b/tests/ui/issues/issue-3707.rs
index 0817c51ee..0817c51ee 100644
--- a/src/test/ui/issues/issue-3707.rs
+++ b/tests/ui/issues/issue-3707.rs
diff --git a/src/test/ui/issues/issue-3707.stderr b/tests/ui/issues/issue-3707.stderr
index 07c8101cb..07c8101cb 100644
--- a/src/test/ui/issues/issue-3707.stderr
+++ b/tests/ui/issues/issue-3707.stderr
diff --git a/src/test/ui/issues/issue-37109.rs b/tests/ui/issues/issue-37109.rs
index 1e57d5f95..1e57d5f95 100644
--- a/src/test/ui/issues/issue-37109.rs
+++ b/tests/ui/issues/issue-37109.rs
diff --git a/src/test/ui/issues/issue-37131.rs b/tests/ui/issues/issue-37131.rs
index ac2d1d1ed..ac2d1d1ed 100644
--- a/src/test/ui/issues/issue-37131.rs
+++ b/tests/ui/issues/issue-37131.rs
diff --git a/src/test/ui/issues/issue-37131.stderr b/tests/ui/issues/issue-37131.stderr
index 9ecae3e7a..9ecae3e7a 100644
--- a/src/test/ui/issues/issue-37131.stderr
+++ b/tests/ui/issues/issue-37131.stderr
diff --git a/src/test/ui/issues/issue-37291/auxiliary/lib.rs b/tests/ui/issues/issue-37291/auxiliary/lib.rs
index 1b163ee13..1b163ee13 100644
--- a/src/test/ui/issues/issue-37291/auxiliary/lib.rs
+++ b/tests/ui/issues/issue-37291/auxiliary/lib.rs
diff --git a/src/test/ui/issues/issue-37291/main.rs b/tests/ui/issues/issue-37291/main.rs
index 6fb6b50da..6fb6b50da 100644
--- a/src/test/ui/issues/issue-37291/main.rs
+++ b/tests/ui/issues/issue-37291/main.rs
diff --git a/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.polonius.stderr b/tests/ui/issues/issue-37311-type-length-limit/issue-37311.polonius.stderr
index 3a1c0b82c..3a1c0b82c 100644
--- a/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.polonius.stderr
+++ b/tests/ui/issues/issue-37311-type-length-limit/issue-37311.polonius.stderr
diff --git a/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.rs b/tests/ui/issues/issue-37311-type-length-limit/issue-37311.rs
index 50d1f166c..50d1f166c 100644
--- a/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.rs
+++ b/tests/ui/issues/issue-37311-type-length-limit/issue-37311.rs
diff --git a/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.stderr b/tests/ui/issues/issue-37311-type-length-limit/issue-37311.stderr
index 5b8299fe8..5b8299fe8 100644
--- a/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.stderr
+++ b/tests/ui/issues/issue-37311-type-length-limit/issue-37311.stderr
diff --git a/src/test/ui/issues/issue-3743.rs b/tests/ui/issues/issue-3743.rs
index 07741914f..07741914f 100644
--- a/src/test/ui/issues/issue-3743.rs
+++ b/tests/ui/issues/issue-3743.rs
diff --git a/src/test/ui/issues/issue-37510.rs b/tests/ui/issues/issue-37510.rs
index 2081c9f7e..2081c9f7e 100644
--- a/src/test/ui/issues/issue-37510.rs
+++ b/tests/ui/issues/issue-37510.rs
diff --git a/src/test/ui/issues/issue-3753.rs b/tests/ui/issues/issue-3753.rs
index dc9e42bad..dc9e42bad 100644
--- a/src/test/ui/issues/issue-3753.rs
+++ b/tests/ui/issues/issue-3753.rs
diff --git a/src/test/ui/issues/issue-37534.rs b/tests/ui/issues/issue-37534.rs
index 1e67e9a81..1e67e9a81 100644
--- a/src/test/ui/issues/issue-37534.rs
+++ b/tests/ui/issues/issue-37534.rs
diff --git a/src/test/ui/issues/issue-37534.stderr b/tests/ui/issues/issue-37534.stderr
index 895479986..895479986 100644
--- a/src/test/ui/issues/issue-37534.stderr
+++ b/tests/ui/issues/issue-37534.stderr
diff --git a/src/test/ui/issues/issue-37576.rs b/tests/ui/issues/issue-37576.rs
index e7f933ab2..e7f933ab2 100644
--- a/src/test/ui/issues/issue-37576.rs
+++ b/tests/ui/issues/issue-37576.rs
diff --git a/src/test/ui/issues/issue-37576.stderr b/tests/ui/issues/issue-37576.stderr
index d19e1f453..d19e1f453 100644
--- a/src/test/ui/issues/issue-37576.stderr
+++ b/tests/ui/issues/issue-37576.stderr
diff --git a/src/test/ui/issues/issue-37598.rs b/tests/ui/issues/issue-37598.rs
index 458e999c3..458e999c3 100644
--- a/src/test/ui/issues/issue-37598.rs
+++ b/tests/ui/issues/issue-37598.rs
diff --git a/src/test/ui/issues/issue-3763.rs b/tests/ui/issues/issue-3763.rs
index 25ad6b319..25ad6b319 100644
--- a/src/test/ui/issues/issue-3763.rs
+++ b/tests/ui/issues/issue-3763.rs
diff --git a/src/test/ui/issues/issue-3763.stderr b/tests/ui/issues/issue-3763.stderr
index 6f4567546..6f4567546 100644
--- a/src/test/ui/issues/issue-3763.stderr
+++ b/tests/ui/issues/issue-3763.stderr
diff --git a/src/test/ui/issues/issue-37665.rs b/tests/ui/issues/issue-37665.rs
index 81ff478aa..81ff478aa 100644
--- a/src/test/ui/issues/issue-37665.rs
+++ b/tests/ui/issues/issue-37665.rs
diff --git a/src/test/ui/issues/issue-37665.stderr b/tests/ui/issues/issue-37665.stderr
index 1e1f451b4..1e1f451b4 100644
--- a/src/test/ui/issues/issue-37665.stderr
+++ b/tests/ui/issues/issue-37665.stderr
diff --git a/src/test/ui/issues/issue-37686.rs b/tests/ui/issues/issue-37686.rs
index ba58e9e9d..ba58e9e9d 100644
--- a/src/test/ui/issues/issue-37686.rs
+++ b/tests/ui/issues/issue-37686.rs
diff --git a/src/test/ui/issues/issue-37725.rs b/tests/ui/issues/issue-37725.rs
index 1c6df0da6..1c6df0da6 100644
--- a/src/test/ui/issues/issue-37725.rs
+++ b/tests/ui/issues/issue-37725.rs
diff --git a/src/test/ui/issues/issue-37733.rs b/tests/ui/issues/issue-37733.rs
index e211e2c33..e211e2c33 100644
--- a/src/test/ui/issues/issue-37733.rs
+++ b/tests/ui/issues/issue-37733.rs
diff --git a/src/test/ui/issues/issue-3779.rs b/tests/ui/issues/issue-3779.rs
index 901c1be80..901c1be80 100644
--- a/src/test/ui/issues/issue-3779.rs
+++ b/tests/ui/issues/issue-3779.rs
diff --git a/src/test/ui/issues/issue-3779.stderr b/tests/ui/issues/issue-3779.stderr
index a0dbcc920..a0dbcc920 100644
--- a/src/test/ui/issues/issue-3779.stderr
+++ b/tests/ui/issues/issue-3779.stderr
diff --git a/src/test/ui/issues/issue-37884.rs b/tests/ui/issues/issue-37884.rs
index ee37481b2..ee37481b2 100644
--- a/src/test/ui/issues/issue-37884.rs
+++ b/tests/ui/issues/issue-37884.rs
diff --git a/src/test/ui/issues/issue-37884.stderr b/tests/ui/issues/issue-37884.stderr
index e9f50b41f..7ddb36c8e 100644
--- a/src/test/ui/issues/issue-37884.stderr
+++ b/tests/ui/issues/issue-37884.stderr
@@ -4,8 +4,8 @@ error[E0308]: method not compatible with trait
 LL |     fn next(&'a mut self) -> Option<Self::Item>
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
-   = note: expected fn pointer `fn(&mut RepeatMut<'a, T>) -> Option<_>`
-              found fn pointer `fn(&'a mut RepeatMut<'a, T>) -> Option<_>`
+   = note: expected signature `fn(&mut RepeatMut<'a, T>) -> Option<_>`
+              found signature `fn(&'a mut RepeatMut<'a, T>) -> Option<_>`
 note: the anonymous lifetime as defined here...
   --> $DIR/issue-37884.rs:6:5
    |
diff --git a/src/test/ui/issues/issue-3794.rs b/tests/ui/issues/issue-3794.rs
index b1f028fbc..b1f028fbc 100644
--- a/src/test/ui/issues/issue-3794.rs
+++ b/tests/ui/issues/issue-3794.rs
diff --git a/src/test/ui/issues/issue-38160.rs b/tests/ui/issues/issue-38160.rs
index 0da8b7900..0da8b7900 100644
--- a/src/test/ui/issues/issue-38160.rs
+++ b/tests/ui/issues/issue-38160.rs
diff --git a/src/test/ui/issues/issue-38190.rs b/tests/ui/issues/issue-38190.rs
index cfa0420c8..cfa0420c8 100644
--- a/src/test/ui/issues/issue-38190.rs
+++ b/tests/ui/issues/issue-38190.rs
diff --git a/src/test/ui/issues/issue-38226.rs b/tests/ui/issues/issue-38226.rs
index 3213e3618..3213e3618 100644
--- a/src/test/ui/issues/issue-38226.rs
+++ b/tests/ui/issues/issue-38226.rs
diff --git a/src/test/ui/issues/issue-38381.rs b/tests/ui/issues/issue-38381.rs
index 82d4a4e32..82d4a4e32 100644
--- a/src/test/ui/issues/issue-38381.rs
+++ b/tests/ui/issues/issue-38381.rs
diff --git a/src/test/ui/issues/issue-38412.rs b/tests/ui/issues/issue-38412.rs
index 96bd93af5..96bd93af5 100644
--- a/src/test/ui/issues/issue-38412.rs
+++ b/tests/ui/issues/issue-38412.rs
diff --git a/src/test/ui/issues/issue-38412.stderr b/tests/ui/issues/issue-38412.stderr
index 610696f84..610696f84 100644
--- a/src/test/ui/issues/issue-38412.stderr
+++ b/tests/ui/issues/issue-38412.stderr
diff --git a/src/test/ui/issues/issue-38437.rs b/tests/ui/issues/issue-38437.rs
index e14121690..e14121690 100644
--- a/src/test/ui/issues/issue-38437.rs
+++ b/tests/ui/issues/issue-38437.rs
diff --git a/src/test/ui/issues/issue-38458.rs b/tests/ui/issues/issue-38458.rs
index 665a8fdf8..665a8fdf8 100644
--- a/src/test/ui/issues/issue-38458.rs
+++ b/tests/ui/issues/issue-38458.rs
diff --git a/src/test/ui/issues/issue-38458.stderr b/tests/ui/issues/issue-38458.stderr
index c04a01118..c04a01118 100644
--- a/src/test/ui/issues/issue-38458.stderr
+++ b/tests/ui/issues/issue-38458.stderr
diff --git a/src/test/ui/issues/issue-3847.rs b/tests/ui/issues/issue-3847.rs
index 16e0b00b3..16e0b00b3 100644
--- a/src/test/ui/issues/issue-3847.rs
+++ b/tests/ui/issues/issue-3847.rs
diff --git a/src/test/ui/issues/issue-38556.rs b/tests/ui/issues/issue-38556.rs
index 63fd9db08..63fd9db08 100644
--- a/src/test/ui/issues/issue-38556.rs
+++ b/tests/ui/issues/issue-38556.rs
diff --git a/src/test/ui/issues/issue-38727.rs b/tests/ui/issues/issue-38727.rs
index 2d418b652..2d418b652 100644
--- a/src/test/ui/issues/issue-38727.rs
+++ b/tests/ui/issues/issue-38727.rs
diff --git a/src/test/ui/issues/issue-3874.rs b/tests/ui/issues/issue-3874.rs
index f9553d88d..f9553d88d 100644
--- a/src/test/ui/issues/issue-3874.rs
+++ b/tests/ui/issues/issue-3874.rs
diff --git a/src/test/ui/issues/issue-38763.rs b/tests/ui/issues/issue-38763.rs
index a966cf217..a966cf217 100644
--- a/src/test/ui/issues/issue-38763.rs
+++ b/tests/ui/issues/issue-38763.rs
diff --git a/src/test/ui/issues/issue-3878.rs b/tests/ui/issues/issue-3878.rs
index 6de3405af..6de3405af 100644
--- a/src/test/ui/issues/issue-3878.rs
+++ b/tests/ui/issues/issue-3878.rs
diff --git a/src/test/ui/issues/issue-38821.rs b/tests/ui/issues/issue-38821.rs
index 6753860e9..6753860e9 100644
--- a/src/test/ui/issues/issue-38821.rs
+++ b/tests/ui/issues/issue-38821.rs
diff --git a/src/test/ui/issues/issue-38821.stderr b/tests/ui/issues/issue-38821.stderr
index 9abd2436b..a52a9c138 100644
--- a/src/test/ui/issues/issue-38821.stderr
+++ b/tests/ui/issues/issue-38821.stderr
@@ -8,7 +8,9 @@ note: required for `<Col as Expression>::SqlType` to implement `IntoNullable`
   --> $DIR/issue-38821.rs:9:18
    |
 LL | impl<T: NotNull> IntoNullable for T {
-   |                  ^^^^^^^^^^^^     ^
+   |         -------  ^^^^^^^^^^^^     ^
+   |         |
+   |         unsatisfied trait bound introduced here
    = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider further restricting the associated type
    |
diff --git a/src/test/ui/issues/issue-38857.rs b/tests/ui/issues/issue-38857.rs
index 81d881c10..81d881c10 100644
--- a/src/test/ui/issues/issue-38857.rs
+++ b/tests/ui/issues/issue-38857.rs
diff --git a/src/test/ui/issues/issue-38857.stderr b/tests/ui/issues/issue-38857.stderr
index 23090c1ed..4d505784b 100644
--- a/src/test/ui/issues/issue-38857.stderr
+++ b/tests/ui/issues/issue-38857.stderr
@@ -12,9 +12,6 @@ LL |     let a = std::sys::imp::process::process_common::StdioPipes { ..panic!()
    |
 note: the module `sys` is defined here
   --> $SRC_DIR/std/src/lib.rs:LL:COL
-   |
-LL | mod sys;
-   | ^^^^^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-38875/auxiliary/issue-38875-b.rs b/tests/ui/issues/issue-38875/auxiliary/issue-38875-b.rs
index e9f7fefb6..e9f7fefb6 100644
--- a/src/test/ui/issues/issue-38875/auxiliary/issue-38875-b.rs
+++ b/tests/ui/issues/issue-38875/auxiliary/issue-38875-b.rs
diff --git a/src/test/ui/issues/issue-38875/issue-38875.rs b/tests/ui/issues/issue-38875/issue-38875.rs
index 124e4d6fd..124e4d6fd 100644
--- a/src/test/ui/issues/issue-38875/issue-38875.rs
+++ b/tests/ui/issues/issue-38875/issue-38875.rs
diff --git a/src/test/ui/issues/issue-3888-2.rs b/tests/ui/issues/issue-3888-2.rs
index d1ef914bd..d1ef914bd 100644
--- a/src/test/ui/issues/issue-3888-2.rs
+++ b/tests/ui/issues/issue-3888-2.rs
diff --git a/src/test/ui/issues/issue-38919.rs b/tests/ui/issues/issue-38919.rs
index 3d28f1936..3d28f1936 100644
--- a/src/test/ui/issues/issue-38919.rs
+++ b/tests/ui/issues/issue-38919.rs
diff --git a/src/test/ui/issues/issue-38919.stderr b/tests/ui/issues/issue-38919.stderr
index f9ab8a515..f9ab8a515 100644
--- a/src/test/ui/issues/issue-38919.stderr
+++ b/tests/ui/issues/issue-38919.stderr
diff --git a/src/test/ui/issues/issue-38942.rs b/tests/ui/issues/issue-38942.rs
index 308bdd6e2..308bdd6e2 100644
--- a/src/test/ui/issues/issue-38942.rs
+++ b/tests/ui/issues/issue-38942.rs
diff --git a/src/test/ui/issues/issue-3895.rs b/tests/ui/issues/issue-3895.rs
index c560ca60d..c560ca60d 100644
--- a/src/test/ui/issues/issue-3895.rs
+++ b/tests/ui/issues/issue-3895.rs
diff --git a/src/test/ui/issues/issue-38954.rs b/tests/ui/issues/issue-38954.rs
index 61df411b1..61df411b1 100644
--- a/src/test/ui/issues/issue-38954.rs
+++ b/tests/ui/issues/issue-38954.rs
diff --git a/src/test/ui/issues/issue-38954.stderr b/tests/ui/issues/issue-38954.stderr
index ab15bb1af..ab15bb1af 100644
--- a/src/test/ui/issues/issue-38954.stderr
+++ b/tests/ui/issues/issue-38954.stderr
diff --git a/src/test/ui/issues/issue-38987.rs b/tests/ui/issues/issue-38987.rs
index cb4e1b0d4..cb4e1b0d4 100644
--- a/src/test/ui/issues/issue-38987.rs
+++ b/tests/ui/issues/issue-38987.rs
diff --git a/src/test/ui/issues/issue-39089.rs b/tests/ui/issues/issue-39089.rs
index c7d4f8bd3..c7d4f8bd3 100644
--- a/src/test/ui/issues/issue-39089.rs
+++ b/tests/ui/issues/issue-39089.rs
diff --git a/src/test/ui/issues/issue-39175.rs b/tests/ui/issues/issue-39175.rs
index 3866e0651..3866e0651 100644
--- a/src/test/ui/issues/issue-39175.rs
+++ b/tests/ui/issues/issue-39175.rs
diff --git a/src/test/ui/issues/issue-39175.stderr b/tests/ui/issues/issue-39175.stderr
index afceae82e..afceae82e 100644
--- a/src/test/ui/issues/issue-39175.stderr
+++ b/tests/ui/issues/issue-39175.stderr
diff --git a/src/test/ui/issues/issue-39211.rs b/tests/ui/issues/issue-39211.rs
index 6f3834d51..6f3834d51 100644
--- a/src/test/ui/issues/issue-39211.rs
+++ b/tests/ui/issues/issue-39211.rs
diff --git a/src/test/ui/issues/issue-39211.stderr b/tests/ui/issues/issue-39211.stderr
index cd2a014bb..cd2a014bb 100644
--- a/src/test/ui/issues/issue-39211.stderr
+++ b/tests/ui/issues/issue-39211.stderr
diff --git a/src/test/ui/issues/issue-39292.rs b/tests/ui/issues/issue-39292.rs
index 968cf0891..968cf0891 100644
--- a/src/test/ui/issues/issue-39292.rs
+++ b/tests/ui/issues/issue-39292.rs
diff --git a/src/test/ui/issues/issue-39367.rs b/tests/ui/issues/issue-39367.rs
index e7beb8a03..e7beb8a03 100644
--- a/src/test/ui/issues/issue-39367.rs
+++ b/tests/ui/issues/issue-39367.rs
diff --git a/src/test/ui/issues/issue-39467.rs b/tests/ui/issues/issue-39467.rs
index 397751e4e..397751e4e 100644
--- a/src/test/ui/issues/issue-39467.rs
+++ b/tests/ui/issues/issue-39467.rs
diff --git a/src/test/ui/issues/issue-39548.rs b/tests/ui/issues/issue-39548.rs
index 304e37bf3..304e37bf3 100644
--- a/src/test/ui/issues/issue-39548.rs
+++ b/tests/ui/issues/issue-39548.rs
diff --git a/src/test/ui/issues/issue-39687.rs b/tests/ui/issues/issue-39687.rs
index cbb721fbb..cbb721fbb 100644
--- a/src/test/ui/issues/issue-39687.rs
+++ b/tests/ui/issues/issue-39687.rs
diff --git a/src/test/ui/issues/issue-39687.stderr b/tests/ui/issues/issue-39687.stderr
index b1b3041ea..b1b3041ea 100644
--- a/src/test/ui/issues/issue-39687.stderr
+++ b/tests/ui/issues/issue-39687.stderr
diff --git a/src/test/ui/issues/issue-39709.rs b/tests/ui/issues/issue-39709.rs
index 69ef2700e..69ef2700e 100644
--- a/src/test/ui/issues/issue-39709.rs
+++ b/tests/ui/issues/issue-39709.rs
diff --git a/src/test/ui/issues/issue-3979-2.rs b/tests/ui/issues/issue-3979-2.rs
index 4ec128a45..4ec128a45 100644
--- a/src/test/ui/issues/issue-3979-2.rs
+++ b/tests/ui/issues/issue-3979-2.rs
diff --git a/src/test/ui/issues/issue-3979-generics.rs b/tests/ui/issues/issue-3979-generics.rs
index 519de1cad..519de1cad 100644
--- a/src/test/ui/issues/issue-3979-generics.rs
+++ b/tests/ui/issues/issue-3979-generics.rs
diff --git a/src/test/ui/issues/issue-3979-xcrate.rs b/tests/ui/issues/issue-3979-xcrate.rs
index fcb1f55c3..fcb1f55c3 100644
--- a/src/test/ui/issues/issue-3979-xcrate.rs
+++ b/tests/ui/issues/issue-3979-xcrate.rs
diff --git a/src/test/ui/issues/issue-3979.rs b/tests/ui/issues/issue-3979.rs
index 72949d8c7..72949d8c7 100644
--- a/src/test/ui/issues/issue-3979.rs
+++ b/tests/ui/issues/issue-3979.rs
diff --git a/src/test/ui/issues/issue-39808.rs b/tests/ui/issues/issue-39808.rs
index a47013673..a47013673 100644
--- a/src/test/ui/issues/issue-39808.rs
+++ b/tests/ui/issues/issue-39808.rs
diff --git a/src/test/ui/issues/issue-39827.rs b/tests/ui/issues/issue-39827.rs
index 782c668c8..782c668c8 100644
--- a/src/test/ui/issues/issue-39827.rs
+++ b/tests/ui/issues/issue-39827.rs
diff --git a/src/test/ui/issues/issue-39848.rs b/tests/ui/issues/issue-39848.rs
index 1964d7399..1964d7399 100644
--- a/src/test/ui/issues/issue-39848.rs
+++ b/tests/ui/issues/issue-39848.rs
diff --git a/src/test/ui/issues/issue-39848.stderr b/tests/ui/issues/issue-39848.stderr
index 387ef0776..387ef0776 100644
--- a/src/test/ui/issues/issue-39848.stderr
+++ b/tests/ui/issues/issue-39848.stderr
diff --git a/src/test/ui/issues/issue-3991.rs b/tests/ui/issues/issue-3991.rs
index 4851eddf5..4851eddf5 100644
--- a/src/test/ui/issues/issue-3991.rs
+++ b/tests/ui/issues/issue-3991.rs
diff --git a/src/test/ui/issues/issue-3993.rs b/tests/ui/issues/issue-3993.rs
index 9dea54ea7..9dea54ea7 100644
--- a/src/test/ui/issues/issue-3993.rs
+++ b/tests/ui/issues/issue-3993.rs
diff --git a/src/test/ui/issues/issue-3993.stderr b/tests/ui/issues/issue-3993.stderr
index deecf7a9d..deecf7a9d 100644
--- a/src/test/ui/issues/issue-3993.stderr
+++ b/tests/ui/issues/issue-3993.stderr
diff --git a/src/test/ui/issues/issue-39970.rs b/tests/ui/issues/issue-39970.rs
index f51e3b522..f51e3b522 100644
--- a/src/test/ui/issues/issue-39970.rs
+++ b/tests/ui/issues/issue-39970.rs
diff --git a/src/test/ui/issues/issue-39970.stderr b/tests/ui/issues/issue-39970.stderr
index 774575d1d..0cabdf7f2 100644
--- a/src/test/ui/issues/issue-39970.stderr
+++ b/tests/ui/issues/issue-39970.stderr
@@ -14,6 +14,9 @@ note: required for `()` to implement `Visit`
    |
 LL | impl Visit for () where
    |      ^^^^^     ^^
+LL |     //(): for<'a> Array<'a, Element=&'a ()>, // No ICE
+LL |     (): for<'a> Array<'a, Element=()>, // ICE
+   |                           ---------- unsatisfied trait bound introduced here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-39984.rs b/tests/ui/issues/issue-39984.rs
index 1c9ae26ca..1c9ae26ca 100644
--- a/src/test/ui/issues/issue-39984.rs
+++ b/tests/ui/issues/issue-39984.rs
diff --git a/src/test/ui/issues/issue-40000.rs b/tests/ui/issues/issue-40000.rs
index a6e05e7ba..a6e05e7ba 100644
--- a/src/test/ui/issues/issue-40000.rs
+++ b/tests/ui/issues/issue-40000.rs
diff --git a/src/test/ui/issues/issue-40000.stderr b/tests/ui/issues/issue-40000.stderr
index c41fbb9d2..c41fbb9d2 100644
--- a/src/test/ui/issues/issue-40000.stderr
+++ b/tests/ui/issues/issue-40000.stderr
diff --git a/src/test/ui/issues/issue-40003.rs b/tests/ui/issues/issue-40003.rs
index 5e61361f9..5e61361f9 100644
--- a/src/test/ui/issues/issue-40003.rs
+++ b/tests/ui/issues/issue-40003.rs
diff --git a/src/test/ui/issues/issue-40085.rs b/tests/ui/issues/issue-40085.rs
index 132044cfd..132044cfd 100644
--- a/src/test/ui/issues/issue-40085.rs
+++ b/tests/ui/issues/issue-40085.rs
diff --git a/src/test/ui/issues/issue-40136.rs b/tests/ui/issues/issue-40136.rs
index 29d3fc2d5..29d3fc2d5 100644
--- a/src/test/ui/issues/issue-40136.rs
+++ b/tests/ui/issues/issue-40136.rs
diff --git a/src/test/ui/issues/issue-40235.rs b/tests/ui/issues/issue-40235.rs
index 0f799c350..0f799c350 100644
--- a/src/test/ui/issues/issue-40235.rs
+++ b/tests/ui/issues/issue-40235.rs
diff --git a/src/test/ui/issues/issue-4025.rs b/tests/ui/issues/issue-4025.rs
index dc534c64c..dc534c64c 100644
--- a/src/test/ui/issues/issue-4025.rs
+++ b/tests/ui/issues/issue-4025.rs
diff --git a/src/test/ui/issues/issue-40288-2.rs b/tests/ui/issues/issue-40288-2.rs
index 032a2e65f..032a2e65f 100644
--- a/src/test/ui/issues/issue-40288-2.rs
+++ b/tests/ui/issues/issue-40288-2.rs
diff --git a/src/test/ui/issues/issue-40288-2.stderr b/tests/ui/issues/issue-40288-2.stderr
index 2c64856b0..2c64856b0 100644
--- a/src/test/ui/issues/issue-40288-2.stderr
+++ b/tests/ui/issues/issue-40288-2.stderr
diff --git a/src/test/ui/issues/issue-40288.rs b/tests/ui/issues/issue-40288.rs
index 60204c117..60204c117 100644
--- a/src/test/ui/issues/issue-40288.rs
+++ b/tests/ui/issues/issue-40288.rs
diff --git a/src/test/ui/issues/issue-40288.stderr b/tests/ui/issues/issue-40288.stderr
index fb4ecab36..fb4ecab36 100644
--- a/src/test/ui/issues/issue-40288.stderr
+++ b/tests/ui/issues/issue-40288.stderr
diff --git a/src/test/ui/issues/issue-40350.rs b/tests/ui/issues/issue-40350.rs
index a39a8519a..a39a8519a 100644
--- a/src/test/ui/issues/issue-40350.rs
+++ b/tests/ui/issues/issue-40350.rs
diff --git a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.rs b/tests/ui/issues/issue-40402-ref-hints/issue-40402-1.rs
index 254956ae3..254956ae3 100644
--- a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.rs
+++ b/tests/ui/issues/issue-40402-ref-hints/issue-40402-1.rs
diff --git a/tests/ui/issues/issue-40402-ref-hints/issue-40402-1.stderr b/tests/ui/issues/issue-40402-ref-hints/issue-40402-1.stderr
new file mode 100644
index 000000000..e15eed656
--- /dev/null
+++ b/tests/ui/issues/issue-40402-ref-hints/issue-40402-1.stderr
@@ -0,0 +1,14 @@
+error[E0507]: cannot move out of index of `Vec<String>`
+  --> $DIR/issue-40402-1.rs:9:13
+   |
+LL |     let e = f.v[0];
+   |             ^^^^^^ move occurs because value has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let e = &f.v[0];
+   |             +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.rs b/tests/ui/issues/issue-40402-ref-hints/issue-40402-2.rs
index 1fb6e31e9..1fb6e31e9 100644
--- a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.rs
+++ b/tests/ui/issues/issue-40402-ref-hints/issue-40402-2.rs
diff --git a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr b/tests/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr
index b6049f967..1bc554efb 100644
--- a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr
+++ b/tests/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr
@@ -2,12 +2,16 @@ error[E0507]: cannot move out of index of `Vec<(String, String)>`
   --> $DIR/issue-40402-2.rs:5:18
    |
 LL |     let (a, b) = x[0];
-   |          -  -    ^^^^ help: consider borrowing here: `&x[0]`
+   |          -  -    ^^^^
    |          |  |
    |          |  ...and here
    |          data moved here
    |
    = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider borrowing here
+   |
+LL |     let (a, b) = &x[0];
+   |                  +
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-40408.rs b/tests/ui/issues/issue-40408.rs
index 81acc41cb..81acc41cb 100644
--- a/src/test/ui/issues/issue-40408.rs
+++ b/tests/ui/issues/issue-40408.rs
diff --git a/src/test/ui/issues/issue-40510-1.migrate.stderr b/tests/ui/issues/issue-40510-1.migrate.stderr
index 776a724d3..776a724d3 100644
--- a/src/test/ui/issues/issue-40510-1.migrate.stderr
+++ b/tests/ui/issues/issue-40510-1.migrate.stderr
diff --git a/src/test/ui/issues/issue-40510-1.rs b/tests/ui/issues/issue-40510-1.rs
index ca53dcd9b..ca53dcd9b 100644
--- a/src/test/ui/issues/issue-40510-1.rs
+++ b/tests/ui/issues/issue-40510-1.rs
diff --git a/src/test/ui/issues/issue-40510-1.stderr b/tests/ui/issues/issue-40510-1.stderr
index e88f31ea1..e88f31ea1 100644
--- a/src/test/ui/issues/issue-40510-1.stderr
+++ b/tests/ui/issues/issue-40510-1.stderr
diff --git a/src/test/ui/issues/issue-40510-2.rs b/tests/ui/issues/issue-40510-2.rs
index 3ae84be05..3ae84be05 100644
--- a/src/test/ui/issues/issue-40510-2.rs
+++ b/tests/ui/issues/issue-40510-2.rs
diff --git a/src/test/ui/issues/issue-40510-3.migrate.stderr b/tests/ui/issues/issue-40510-3.migrate.stderr
index a49475a85..a49475a85 100644
--- a/src/test/ui/issues/issue-40510-3.migrate.stderr
+++ b/tests/ui/issues/issue-40510-3.migrate.stderr
diff --git a/src/test/ui/issues/issue-40510-3.rs b/tests/ui/issues/issue-40510-3.rs
index 181263adc..181263adc 100644
--- a/src/test/ui/issues/issue-40510-3.rs
+++ b/tests/ui/issues/issue-40510-3.rs
diff --git a/src/test/ui/issues/issue-40510-3.stderr b/tests/ui/issues/issue-40510-3.stderr
index eb077415e..eb077415e 100644
--- a/src/test/ui/issues/issue-40510-3.stderr
+++ b/tests/ui/issues/issue-40510-3.stderr
diff --git a/src/test/ui/issues/issue-40510-4.rs b/tests/ui/issues/issue-40510-4.rs
index 48bb8d36f..48bb8d36f 100644
--- a/src/test/ui/issues/issue-40510-4.rs
+++ b/tests/ui/issues/issue-40510-4.rs
diff --git a/src/test/ui/issues/issue-40610.rs b/tests/ui/issues/issue-40610.rs
index c01233605..c01233605 100644
--- a/src/test/ui/issues/issue-40610.rs
+++ b/tests/ui/issues/issue-40610.rs
diff --git a/src/test/ui/issues/issue-40610.stderr b/tests/ui/issues/issue-40610.stderr
index b4e302dff..b4e302dff 100644
--- a/src/test/ui/issues/issue-40610.stderr
+++ b/tests/ui/issues/issue-40610.stderr
diff --git a/src/test/ui/issues/issue-40749.rs b/tests/ui/issues/issue-40749.rs
index 0a847853b..0a847853b 100644
--- a/src/test/ui/issues/issue-40749.rs
+++ b/tests/ui/issues/issue-40749.rs
diff --git a/src/test/ui/issues/issue-40749.stderr b/tests/ui/issues/issue-40749.stderr
index fa239f744..fa239f744 100644
--- a/src/test/ui/issues/issue-40749.stderr
+++ b/tests/ui/issues/issue-40749.stderr
diff --git a/src/test/ui/issues/issue-40782.fixed b/tests/ui/issues/issue-40782.fixed
index 305a9c329..305a9c329 100644
--- a/src/test/ui/issues/issue-40782.fixed
+++ b/tests/ui/issues/issue-40782.fixed
diff --git a/src/test/ui/issues/issue-40782.rs b/tests/ui/issues/issue-40782.rs
index 43460ec15..43460ec15 100644
--- a/src/test/ui/issues/issue-40782.rs
+++ b/tests/ui/issues/issue-40782.rs
diff --git a/src/test/ui/issues/issue-40782.stderr b/tests/ui/issues/issue-40782.stderr
index 81f419bf6..81f419bf6 100644
--- a/src/test/ui/issues/issue-40782.stderr
+++ b/tests/ui/issues/issue-40782.stderr
diff --git a/src/test/ui/issues/issue-40827.rs b/tests/ui/issues/issue-40827.rs
index 6e42c5061..6e42c5061 100644
--- a/src/test/ui/issues/issue-40827.rs
+++ b/tests/ui/issues/issue-40827.rs
diff --git a/src/test/ui/issues/issue-40827.stderr b/tests/ui/issues/issue-40827.stderr
index 7f5c578ae..7f5c578ae 100644
--- a/src/test/ui/issues/issue-40827.stderr
+++ b/tests/ui/issues/issue-40827.stderr
diff --git a/src/test/ui/issues/issue-40845.rs b/tests/ui/issues/issue-40845.rs
index a4ede6adf..a4ede6adf 100644
--- a/src/test/ui/issues/issue-40845.rs
+++ b/tests/ui/issues/issue-40845.rs
diff --git a/src/test/ui/issues/issue-40845.stderr b/tests/ui/issues/issue-40845.stderr
index 66bf05320..66bf05320 100644
--- a/src/test/ui/issues/issue-40845.stderr
+++ b/tests/ui/issues/issue-40845.stderr
diff --git a/src/test/ui/issues/issue-40861.rs b/tests/ui/issues/issue-40861.rs
index d8a8384a5..d8a8384a5 100644
--- a/src/test/ui/issues/issue-40861.rs
+++ b/tests/ui/issues/issue-40861.rs
diff --git a/src/test/ui/issues/issue-40861.stderr b/tests/ui/issues/issue-40861.stderr
index 84e38b9bb..84e38b9bb 100644
--- a/src/test/ui/issues/issue-40861.stderr
+++ b/tests/ui/issues/issue-40861.stderr
diff --git a/src/test/ui/issues/issue-40883.rs b/tests/ui/issues/issue-40883.rs
index 8a4aef46d..8a4aef46d 100644
--- a/src/test/ui/issues/issue-40883.rs
+++ b/tests/ui/issues/issue-40883.rs
diff --git a/src/test/ui/issues/issue-40951.rs b/tests/ui/issues/issue-40951.rs
index 49171eba6..49171eba6 100644
--- a/src/test/ui/issues/issue-40951.rs
+++ b/tests/ui/issues/issue-40951.rs
diff --git a/src/test/ui/issues/issue-41053.rs b/tests/ui/issues/issue-41053.rs
index 967edfd44..967edfd44 100644
--- a/src/test/ui/issues/issue-41053.rs
+++ b/tests/ui/issues/issue-41053.rs
diff --git a/src/test/ui/issues/issue-41139.rs b/tests/ui/issues/issue-41139.rs
index 94c53216f..94c53216f 100644
--- a/src/test/ui/issues/issue-41139.rs
+++ b/tests/ui/issues/issue-41139.rs
diff --git a/src/test/ui/issues/issue-41139.stderr b/tests/ui/issues/issue-41139.stderr
index 97492e6e0..97492e6e0 100644
--- a/src/test/ui/issues/issue-41139.stderr
+++ b/tests/ui/issues/issue-41139.stderr
diff --git a/src/test/ui/issues/issue-41213.rs b/tests/ui/issues/issue-41213.rs
index 5c91bf711..5c91bf711 100644
--- a/src/test/ui/issues/issue-41213.rs
+++ b/tests/ui/issues/issue-41213.rs
diff --git a/src/test/ui/issues/issue-41229-ref-str.rs b/tests/ui/issues/issue-41229-ref-str.rs
index fe5e6cd6e..fe5e6cd6e 100644
--- a/src/test/ui/issues/issue-41229-ref-str.rs
+++ b/tests/ui/issues/issue-41229-ref-str.rs
diff --git a/src/test/ui/issues/issue-41229-ref-str.stderr b/tests/ui/issues/issue-41229-ref-str.stderr
index 31fdf3b72..31fdf3b72 100644
--- a/src/test/ui/issues/issue-41229-ref-str.stderr
+++ b/tests/ui/issues/issue-41229-ref-str.stderr
diff --git a/src/test/ui/issues/issue-41272.rs b/tests/ui/issues/issue-41272.rs
index 1f4da46f8..1f4da46f8 100644
--- a/src/test/ui/issues/issue-41272.rs
+++ b/tests/ui/issues/issue-41272.rs
diff --git a/src/test/ui/issues/issue-41298.rs b/tests/ui/issues/issue-41298.rs
index a1b4de39b..a1b4de39b 100644
--- a/src/test/ui/issues/issue-41298.rs
+++ b/tests/ui/issues/issue-41298.rs
diff --git a/src/test/ui/issues/issue-41394-rpass.rs b/tests/ui/issues/issue-41394-rpass.rs
index 37c652523..37c652523 100644
--- a/src/test/ui/issues/issue-41394-rpass.rs
+++ b/tests/ui/issues/issue-41394-rpass.rs
diff --git a/src/test/ui/issues/issue-41394.rs b/tests/ui/issues/issue-41394.rs
index 07cad8796..07cad8796 100644
--- a/src/test/ui/issues/issue-41394.rs
+++ b/tests/ui/issues/issue-41394.rs
diff --git a/src/test/ui/issues/issue-41394.stderr b/tests/ui/issues/issue-41394.stderr
index 1b5c64628..1b5c64628 100644
--- a/src/test/ui/issues/issue-41394.stderr
+++ b/tests/ui/issues/issue-41394.stderr
diff --git a/src/test/ui/issues/issue-41479.rs b/tests/ui/issues/issue-41479.rs
index 6daaf440e..6daaf440e 100644
--- a/src/test/ui/issues/issue-41479.rs
+++ b/tests/ui/issues/issue-41479.rs
diff --git a/src/test/ui/issues/issue-41498.rs b/tests/ui/issues/issue-41498.rs
index ad918ecdd..ad918ecdd 100644
--- a/src/test/ui/issues/issue-41498.rs
+++ b/tests/ui/issues/issue-41498.rs
diff --git a/src/test/ui/issues/issue-41549.rs b/tests/ui/issues/issue-41549.rs
index d19926a54..d19926a54 100644
--- a/src/test/ui/issues/issue-41549.rs
+++ b/tests/ui/issues/issue-41549.rs
diff --git a/src/test/ui/issues/issue-41549.stderr b/tests/ui/issues/issue-41549.stderr
index 62307d387..62307d387 100644
--- a/src/test/ui/issues/issue-41549.stderr
+++ b/tests/ui/issues/issue-41549.stderr
diff --git a/src/test/ui/issues/issue-41604.rs b/tests/ui/issues/issue-41604.rs
index 11a1cc25b..11a1cc25b 100644
--- a/src/test/ui/issues/issue-41604.rs
+++ b/tests/ui/issues/issue-41604.rs
diff --git a/src/test/ui/issues/issue-41628.rs b/tests/ui/issues/issue-41628.rs
index 92159824e..92159824e 100644
--- a/src/test/ui/issues/issue-41628.rs
+++ b/tests/ui/issues/issue-41628.rs
diff --git a/src/test/ui/issues/issue-41652/auxiliary/issue-41652-b.rs b/tests/ui/issues/issue-41652/auxiliary/issue-41652-b.rs
index 2ce21b036..2ce21b036 100644
--- a/src/test/ui/issues/issue-41652/auxiliary/issue-41652-b.rs
+++ b/tests/ui/issues/issue-41652/auxiliary/issue-41652-b.rs
diff --git a/src/test/ui/issues/issue-41652/issue-41652.rs b/tests/ui/issues/issue-41652/issue-41652.rs
index d8a6f4c8d..d8a6f4c8d 100644
--- a/src/test/ui/issues/issue-41652/issue-41652.rs
+++ b/tests/ui/issues/issue-41652/issue-41652.rs
diff --git a/src/test/ui/issues/issue-41652/issue-41652.stderr b/tests/ui/issues/issue-41652/issue-41652.stderr
index 1618f0f5a..1618f0f5a 100644
--- a/src/test/ui/issues/issue-41652/issue-41652.stderr
+++ b/tests/ui/issues/issue-41652/issue-41652.stderr
diff --git a/src/test/ui/issues/issue-41677.rs b/tests/ui/issues/issue-41677.rs
index afddbc799..afddbc799 100644
--- a/src/test/ui/issues/issue-41677.rs
+++ b/tests/ui/issues/issue-41677.rs
diff --git a/src/test/ui/issues/issue-41696.rs b/tests/ui/issues/issue-41696.rs
index d094f7194..d094f7194 100644
--- a/src/test/ui/issues/issue-41696.rs
+++ b/tests/ui/issues/issue-41696.rs
diff --git a/src/test/ui/issues/issue-41726.rs b/tests/ui/issues/issue-41726.rs
index 39631912c..39631912c 100644
--- a/src/test/ui/issues/issue-41726.rs
+++ b/tests/ui/issues/issue-41726.rs
diff --git a/src/test/ui/issues/issue-41726.stderr b/tests/ui/issues/issue-41726.stderr
index b05c1fb14..b05c1fb14 100644
--- a/src/test/ui/issues/issue-41726.stderr
+++ b/tests/ui/issues/issue-41726.stderr
diff --git a/src/test/ui/issues/issue-41742.rs b/tests/ui/issues/issue-41742.rs
index afe311b4d..afe311b4d 100644
--- a/src/test/ui/issues/issue-41742.rs
+++ b/tests/ui/issues/issue-41742.rs
diff --git a/src/test/ui/issues/issue-41742.stderr b/tests/ui/issues/issue-41742.stderr
index 61a0ae5fa..61a0ae5fa 100644
--- a/src/test/ui/issues/issue-41742.stderr
+++ b/tests/ui/issues/issue-41742.stderr
diff --git a/src/test/ui/issues/issue-41744.rs b/tests/ui/issues/issue-41744.rs
index dcdd1c21e..dcdd1c21e 100644
--- a/src/test/ui/issues/issue-41744.rs
+++ b/tests/ui/issues/issue-41744.rs
diff --git a/src/test/ui/issues/issue-41849-variance-req.rs b/tests/ui/issues/issue-41849-variance-req.rs
index af081083a..af081083a 100644
--- a/src/test/ui/issues/issue-41849-variance-req.rs
+++ b/tests/ui/issues/issue-41849-variance-req.rs
diff --git a/src/test/ui/issues/issue-41880.rs b/tests/ui/issues/issue-41880.rs
index 977c43b71..977c43b71 100644
--- a/src/test/ui/issues/issue-41880.rs
+++ b/tests/ui/issues/issue-41880.rs
diff --git a/src/test/ui/issues/issue-41880.stderr b/tests/ui/issues/issue-41880.stderr
index fd694df30..00c375f8d 100644
--- a/src/test/ui/issues/issue-41880.stderr
+++ b/tests/ui/issues/issue-41880.stderr
@@ -5,7 +5,7 @@ LL | pub struct Iterate<T, F> {
    | ------------------------ method `iter` not found for this struct
 ...
 LL |     println!("{:?}", a.iter().take(10).collect::<Vec<usize>>());
-   |                        ^^^^ method not found in `Iterate<{integer}, [closure@$DIR/issue-41880.rs:26:24: 26:27]>`
+   |                        ^^^^ method not found in `Iterate<{integer}, [closure@issue-41880.rs:26:24]>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-41888.rs b/tests/ui/issues/issue-41888.rs
index 32df520f2..32df520f2 100644
--- a/src/test/ui/issues/issue-41888.rs
+++ b/tests/ui/issues/issue-41888.rs
diff --git a/src/test/ui/issues/issue-41936-variance-coerce-unsized-cycle.rs b/tests/ui/issues/issue-41936-variance-coerce-unsized-cycle.rs
index 3d678ba04..3d678ba04 100644
--- a/src/test/ui/issues/issue-41936-variance-coerce-unsized-cycle.rs
+++ b/tests/ui/issues/issue-41936-variance-coerce-unsized-cycle.rs
diff --git a/src/test/ui/issues/issue-41974.rs b/tests/ui/issues/issue-41974.rs
index 10c363479..10c363479 100644
--- a/src/test/ui/issues/issue-41974.rs
+++ b/tests/ui/issues/issue-41974.rs
diff --git a/src/test/ui/issues/issue-41974.stderr b/tests/ui/issues/issue-41974.stderr
index e249db9df..e249db9df 100644
--- a/src/test/ui/issues/issue-41974.stderr
+++ b/tests/ui/issues/issue-41974.stderr
diff --git a/src/test/ui/issues/issue-41998.rs b/tests/ui/issues/issue-41998.rs
index 7696a3108..7696a3108 100644
--- a/src/test/ui/issues/issue-41998.rs
+++ b/tests/ui/issues/issue-41998.rs
diff --git a/src/test/ui/issues/issue-42007.rs b/tests/ui/issues/issue-42007.rs
index a477e476e..a477e476e 100644
--- a/src/test/ui/issues/issue-42007.rs
+++ b/tests/ui/issues/issue-42007.rs
diff --git a/src/test/ui/issues/issue-4208.rs b/tests/ui/issues/issue-4208.rs
index 3b01811a9..3b01811a9 100644
--- a/src/test/ui/issues/issue-4208.rs
+++ b/tests/ui/issues/issue-4208.rs
diff --git a/src/test/ui/issues/issue-42106.rs b/tests/ui/issues/issue-42106.rs
index 5e688693b..5e688693b 100644
--- a/src/test/ui/issues/issue-42106.rs
+++ b/tests/ui/issues/issue-42106.rs
diff --git a/src/test/ui/issues/issue-42106.stderr b/tests/ui/issues/issue-42106.stderr
index 73cf8652f..73cf8652f 100644
--- a/src/test/ui/issues/issue-42106.stderr
+++ b/tests/ui/issues/issue-42106.stderr
diff --git a/src/test/ui/issues/issue-42148.rs b/tests/ui/issues/issue-42148.rs
index cb8c0d6ed..cb8c0d6ed 100644
--- a/src/test/ui/issues/issue-42148.rs
+++ b/tests/ui/issues/issue-42148.rs
diff --git a/src/test/ui/issues/issue-42210.rs b/tests/ui/issues/issue-42210.rs
index 01a5d5636..01a5d5636 100644
--- a/src/test/ui/issues/issue-42210.rs
+++ b/tests/ui/issues/issue-42210.rs
diff --git a/src/test/ui/issues/issue-4228.rs b/tests/ui/issues/issue-4228.rs
index 491000b65..491000b65 100644
--- a/src/test/ui/issues/issue-4228.rs
+++ b/tests/ui/issues/issue-4228.rs
diff --git a/src/test/ui/issues/issue-42312.rs b/tests/ui/issues/issue-42312.rs
index 426efcbf9..426efcbf9 100644
--- a/src/test/ui/issues/issue-42312.rs
+++ b/tests/ui/issues/issue-42312.rs
diff --git a/src/test/ui/issues/issue-42312.stderr b/tests/ui/issues/issue-42312.stderr
index 6fe151622..3ca6a2957 100644
--- a/src/test/ui/issues/issue-42312.stderr
+++ b/tests/ui/issues/issue-42312.stderr
@@ -23,6 +23,10 @@ LL | pub fn f(_: dyn ToString) {}
    |
    = help: the trait `Sized` is not implemented for `(dyn ToString + 'static)`
    = help: unsized fn params are gated as an unstable feature
+help: you can use `impl Trait` as the argument type
+   |
+LL | pub fn f(_: impl ToString) {}
+   |             ~~~~
 help: function arguments must have a statically known size, borrowed types always have a known size
    |
 LL | pub fn f(_: &dyn ToString) {}
diff --git a/src/test/ui/issues/issue-42453.rs b/tests/ui/issues/issue-42453.rs
index 92fefceab..92fefceab 100644
--- a/src/test/ui/issues/issue-42453.rs
+++ b/tests/ui/issues/issue-42453.rs
diff --git a/src/test/ui/issues/issue-42467.rs b/tests/ui/issues/issue-42467.rs
index afa1bcd13..afa1bcd13 100644
--- a/src/test/ui/issues/issue-42467.rs
+++ b/tests/ui/issues/issue-42467.rs
diff --git a/src/test/ui/issues/issue-4252.rs b/tests/ui/issues/issue-4252.rs
index 0d47a7f0c..0d47a7f0c 100644
--- a/src/test/ui/issues/issue-4252.rs
+++ b/tests/ui/issues/issue-4252.rs
diff --git a/src/test/ui/issues/issue-42552.rs b/tests/ui/issues/issue-42552.rs
index 50d28a2f0..50d28a2f0 100644
--- a/src/test/ui/issues/issue-42552.rs
+++ b/tests/ui/issues/issue-42552.rs
diff --git a/src/test/ui/issues/issue-4265.rs b/tests/ui/issues/issue-4265.rs
index 2596079d3..2596079d3 100644
--- a/src/test/ui/issues/issue-4265.rs
+++ b/tests/ui/issues/issue-4265.rs
diff --git a/src/test/ui/issues/issue-4265.stderr b/tests/ui/issues/issue-4265.stderr
index 8c7303f3c..8c7303f3c 100644
--- a/src/test/ui/issues/issue-4265.stderr
+++ b/tests/ui/issues/issue-4265.stderr
diff --git a/src/test/ui/issues/issue-42755.rs b/tests/ui/issues/issue-42755.rs
index 65796fc24..65796fc24 100644
--- a/src/test/ui/issues/issue-42755.rs
+++ b/tests/ui/issues/issue-42755.rs
diff --git a/src/test/ui/issues/issue-42755.stderr b/tests/ui/issues/issue-42755.stderr
index 12047e22f..12047e22f 100644
--- a/src/test/ui/issues/issue-42755.stderr
+++ b/tests/ui/issues/issue-42755.stderr
diff --git a/src/test/ui/issues/issue-42796.rs b/tests/ui/issues/issue-42796.rs
index 5e83a1cd6..5e83a1cd6 100644
--- a/src/test/ui/issues/issue-42796.rs
+++ b/tests/ui/issues/issue-42796.rs
diff --git a/src/test/ui/issues/issue-42796.stderr b/tests/ui/issues/issue-42796.stderr
index f2971df5d..f2971df5d 100644
--- a/src/test/ui/issues/issue-42796.stderr
+++ b/tests/ui/issues/issue-42796.stderr
diff --git a/src/test/ui/issues/issue-42880.rs b/tests/ui/issues/issue-42880.rs
index b61ba80e2..b61ba80e2 100644
--- a/src/test/ui/issues/issue-42880.rs
+++ b/tests/ui/issues/issue-42880.rs
diff --git a/src/test/ui/issues/issue-42880.stderr b/tests/ui/issues/issue-42880.stderr
index bec14429d..bec14429d 100644
--- a/src/test/ui/issues/issue-42880.stderr
+++ b/tests/ui/issues/issue-42880.stderr
diff --git a/src/test/ui/issues/issue-42956.rs b/tests/ui/issues/issue-42956.rs
index e6b3f9ffa..e6b3f9ffa 100644
--- a/src/test/ui/issues/issue-42956.rs
+++ b/tests/ui/issues/issue-42956.rs
diff --git a/src/test/ui/issues/issue-43057.rs b/tests/ui/issues/issue-43057.rs
index 4ce52af43..4ce52af43 100644
--- a/src/test/ui/issues/issue-43057.rs
+++ b/tests/ui/issues/issue-43057.rs
diff --git a/src/test/ui/issues/issue-43162.rs b/tests/ui/issues/issue-43162.rs
index 782eb4229..782eb4229 100644
--- a/src/test/ui/issues/issue-43162.rs
+++ b/tests/ui/issues/issue-43162.rs
diff --git a/src/test/ui/issues/issue-43162.stderr b/tests/ui/issues/issue-43162.stderr
index 40d920005..40d920005 100644
--- a/src/test/ui/issues/issue-43162.stderr
+++ b/tests/ui/issues/issue-43162.stderr
diff --git a/src/test/ui/issues/issue-43205.rs b/tests/ui/issues/issue-43205.rs
index f47d5a347..f47d5a347 100644
--- a/src/test/ui/issues/issue-43205.rs
+++ b/tests/ui/issues/issue-43205.rs
diff --git a/src/test/ui/issues/issue-43250.rs b/tests/ui/issues/issue-43250.rs
index 24d70d296..24d70d296 100644
--- a/src/test/ui/issues/issue-43250.rs
+++ b/tests/ui/issues/issue-43250.rs
diff --git a/src/test/ui/issues/issue-43250.stderr b/tests/ui/issues/issue-43250.stderr
index f729c5cf1..f729c5cf1 100644
--- a/src/test/ui/issues/issue-43250.stderr
+++ b/tests/ui/issues/issue-43250.stderr
diff --git a/src/test/ui/issues/issue-43291.rs b/tests/ui/issues/issue-43291.rs
index 52b629e35..52b629e35 100644
--- a/src/test/ui/issues/issue-43291.rs
+++ b/tests/ui/issues/issue-43291.rs
diff --git a/src/test/ui/issues/issue-4333.rs b/tests/ui/issues/issue-4333.rs
index 3df319b68..3df319b68 100644
--- a/src/test/ui/issues/issue-4333.rs
+++ b/tests/ui/issues/issue-4333.rs
diff --git a/src/test/ui/issues/issue-4335.rs b/tests/ui/issues/issue-4335.rs
index c5914a17c..c5914a17c 100644
--- a/src/test/ui/issues/issue-4335.rs
+++ b/tests/ui/issues/issue-4335.rs
diff --git a/src/test/ui/issues/issue-4335.stderr b/tests/ui/issues/issue-4335.stderr
index ecc1fa523..ecc1fa523 100644
--- a/src/test/ui/issues/issue-4335.stderr
+++ b/tests/ui/issues/issue-4335.stderr
diff --git a/src/test/ui/issues/issue-43355.rs b/tests/ui/issues/issue-43355.rs
index bf819af79..bf819af79 100644
--- a/src/test/ui/issues/issue-43355.rs
+++ b/tests/ui/issues/issue-43355.rs
diff --git a/src/test/ui/issues/issue-43355.stderr b/tests/ui/issues/issue-43355.stderr
index 57adc8ad5..57adc8ad5 100644
--- a/src/test/ui/issues/issue-43355.stderr
+++ b/tests/ui/issues/issue-43355.stderr
diff --git a/src/test/ui/issues/issue-43357.rs b/tests/ui/issues/issue-43357.rs
index 474c97655..474c97655 100644
--- a/src/test/ui/issues/issue-43357.rs
+++ b/tests/ui/issues/issue-43357.rs
diff --git a/src/test/ui/issues/issue-43420-no-over-suggest.rs b/tests/ui/issues/issue-43420-no-over-suggest.rs
index 4365bff5a..4365bff5a 100644
--- a/src/test/ui/issues/issue-43420-no-over-suggest.rs
+++ b/tests/ui/issues/issue-43420-no-over-suggest.rs
diff --git a/src/test/ui/issues/issue-43420-no-over-suggest.stderr b/tests/ui/issues/issue-43420-no-over-suggest.stderr
index 58fd1121a..58fd1121a 100644
--- a/src/test/ui/issues/issue-43420-no-over-suggest.stderr
+++ b/tests/ui/issues/issue-43420-no-over-suggest.stderr
diff --git a/src/test/ui/issues/issue-43424.rs b/tests/ui/issues/issue-43424.rs
index b3f76d8b0..b3f76d8b0 100644
--- a/src/test/ui/issues/issue-43424.rs
+++ b/tests/ui/issues/issue-43424.rs
diff --git a/src/test/ui/issues/issue-43424.stderr b/tests/ui/issues/issue-43424.stderr
index 8f59d7cc3..8f59d7cc3 100644
--- a/src/test/ui/issues/issue-43424.stderr
+++ b/tests/ui/issues/issue-43424.stderr
diff --git a/src/test/ui/issues/issue-43431.rs b/tests/ui/issues/issue-43431.rs
index e7ec35105..e7ec35105 100644
--- a/src/test/ui/issues/issue-43431.rs
+++ b/tests/ui/issues/issue-43431.rs
diff --git a/src/test/ui/issues/issue-43431.stderr b/tests/ui/issues/issue-43431.stderr
index 4edb52869..4edb52869 100644
--- a/src/test/ui/issues/issue-43431.stderr
+++ b/tests/ui/issues/issue-43431.stderr
diff --git a/src/test/ui/issues/issue-43483.rs b/tests/ui/issues/issue-43483.rs
index 76dd1c2eb..76dd1c2eb 100644
--- a/src/test/ui/issues/issue-43483.rs
+++ b/tests/ui/issues/issue-43483.rs
diff --git a/src/test/ui/issues/issue-43692.rs b/tests/ui/issues/issue-43692.rs
index a9999c226..a9999c226 100644
--- a/src/test/ui/issues/issue-43692.rs
+++ b/tests/ui/issues/issue-43692.rs
diff --git a/src/test/ui/issues/issue-43806.rs b/tests/ui/issues/issue-43806.rs
index 8c8cccfb2..8c8cccfb2 100644
--- a/src/test/ui/issues/issue-43806.rs
+++ b/tests/ui/issues/issue-43806.rs
diff --git a/src/test/ui/issues/issue-43853.rs b/tests/ui/issues/issue-43853.rs
index dd42c1e3c..dd42c1e3c 100644
--- a/src/test/ui/issues/issue-43853.rs
+++ b/tests/ui/issues/issue-43853.rs
diff --git a/src/test/ui/issues/issue-4387.rs b/tests/ui/issues/issue-4387.rs
index 84592f16a..84592f16a 100644
--- a/src/test/ui/issues/issue-4387.rs
+++ b/tests/ui/issues/issue-4387.rs
diff --git a/src/test/ui/issues/issue-43910.rs b/tests/ui/issues/issue-43910.rs
index d8c877329..d8c877329 100644
--- a/src/test/ui/issues/issue-43910.rs
+++ b/tests/ui/issues/issue-43910.rs
diff --git a/src/test/ui/issues/issue-43923.rs b/tests/ui/issues/issue-43923.rs
index ad35a6685..ad35a6685 100644
--- a/src/test/ui/issues/issue-43923.rs
+++ b/tests/ui/issues/issue-43923.rs
diff --git a/src/test/ui/issues/issue-43925.rs b/tests/ui/issues/issue-43925.rs
index 1a2108871..1a2108871 100644
--- a/src/test/ui/issues/issue-43925.rs
+++ b/tests/ui/issues/issue-43925.rs
diff --git a/src/test/ui/issues/issue-43925.stderr b/tests/ui/issues/issue-43925.stderr
index b0ad25063..b0ad25063 100644
--- a/src/test/ui/issues/issue-43925.stderr
+++ b/tests/ui/issues/issue-43925.stderr
diff --git a/src/test/ui/issues/issue-43926.rs b/tests/ui/issues/issue-43926.rs
index 6d3003552..6d3003552 100644
--- a/src/test/ui/issues/issue-43926.rs
+++ b/tests/ui/issues/issue-43926.rs
diff --git a/src/test/ui/issues/issue-43926.stderr b/tests/ui/issues/issue-43926.stderr
index f67f91a6b..f67f91a6b 100644
--- a/src/test/ui/issues/issue-43926.stderr
+++ b/tests/ui/issues/issue-43926.stderr
diff --git a/src/test/ui/issues/issue-43988.rs b/tests/ui/issues/issue-43988.rs
index b114e8e03..b114e8e03 100644
--- a/src/test/ui/issues/issue-43988.rs
+++ b/tests/ui/issues/issue-43988.rs
diff --git a/src/test/ui/issues/issue-43988.stderr b/tests/ui/issues/issue-43988.stderr
index 02c5dd5bf..02c5dd5bf 100644
--- a/src/test/ui/issues/issue-43988.stderr
+++ b/tests/ui/issues/issue-43988.stderr
diff --git a/src/test/ui/issues/issue-44023.rs b/tests/ui/issues/issue-44023.rs
index e4320b7da..e4320b7da 100644
--- a/src/test/ui/issues/issue-44023.rs
+++ b/tests/ui/issues/issue-44023.rs
diff --git a/src/test/ui/issues/issue-44023.stderr b/tests/ui/issues/issue-44023.stderr
index 9e9701241..9e9701241 100644
--- a/src/test/ui/issues/issue-44023.stderr
+++ b/tests/ui/issues/issue-44023.stderr
diff --git a/src/test/ui/issues/issue-44056.rs b/tests/ui/issues/issue-44056.rs
index a4903ed2c..a4903ed2c 100644
--- a/src/test/ui/issues/issue-44056.rs
+++ b/tests/ui/issues/issue-44056.rs
diff --git a/src/test/ui/issues/issue-44078.rs b/tests/ui/issues/issue-44078.rs
index b8c0e285f..b8c0e285f 100644
--- a/src/test/ui/issues/issue-44078.rs
+++ b/tests/ui/issues/issue-44078.rs
diff --git a/src/test/ui/issues/issue-44078.stderr b/tests/ui/issues/issue-44078.stderr
index daf67219f..daf67219f 100644
--- a/src/test/ui/issues/issue-44078.stderr
+++ b/tests/ui/issues/issue-44078.stderr
diff --git a/src/test/ui/issues/issue-44216-add-instant.rs b/tests/ui/issues/issue-44216-add-instant.rs
index 78cfecf2f..78cfecf2f 100644
--- a/src/test/ui/issues/issue-44216-add-instant.rs
+++ b/tests/ui/issues/issue-44216-add-instant.rs
diff --git a/src/test/ui/issues/issue-44216-add-system-time.rs b/tests/ui/issues/issue-44216-add-system-time.rs
index 7e9a3f802..7e9a3f802 100644
--- a/src/test/ui/issues/issue-44216-add-system-time.rs
+++ b/tests/ui/issues/issue-44216-add-system-time.rs
diff --git a/src/test/ui/issues/issue-44216-sub-instant.rs b/tests/ui/issues/issue-44216-sub-instant.rs
index e40f80d44..e40f80d44 100644
--- a/src/test/ui/issues/issue-44216-sub-instant.rs
+++ b/tests/ui/issues/issue-44216-sub-instant.rs
diff --git a/src/test/ui/issues/issue-44216-sub-system-time.rs b/tests/ui/issues/issue-44216-sub-system-time.rs
index 2c5a000fa..2c5a000fa 100644
--- a/src/test/ui/issues/issue-44216-sub-system-time.rs
+++ b/tests/ui/issues/issue-44216-sub-system-time.rs
diff --git a/src/test/ui/issues/issue-44239.fixed b/tests/ui/issues/issue-44239.fixed
index e6c29cee9..e6c29cee9 100644
--- a/src/test/ui/issues/issue-44239.fixed
+++ b/tests/ui/issues/issue-44239.fixed
diff --git a/src/test/ui/issues/issue-44239.rs b/tests/ui/issues/issue-44239.rs
index 482ed194c..482ed194c 100644
--- a/src/test/ui/issues/issue-44239.rs
+++ b/tests/ui/issues/issue-44239.rs
diff --git a/src/test/ui/issues/issue-44239.stderr b/tests/ui/issues/issue-44239.stderr
index 2a245c92c..2a245c92c 100644
--- a/src/test/ui/issues/issue-44239.stderr
+++ b/tests/ui/issues/issue-44239.stderr
diff --git a/src/test/ui/issues/issue-44247.rs b/tests/ui/issues/issue-44247.rs
index 3544880fa..3544880fa 100644
--- a/src/test/ui/issues/issue-44247.rs
+++ b/tests/ui/issues/issue-44247.rs
diff --git a/src/test/ui/issues/issue-44255.rs b/tests/ui/issues/issue-44255.rs
index 224503204..224503204 100644
--- a/src/test/ui/issues/issue-44255.rs
+++ b/tests/ui/issues/issue-44255.rs
diff --git a/src/test/ui/issues/issue-44405.rs b/tests/ui/issues/issue-44405.rs
index d404b9044..d404b9044 100644
--- a/src/test/ui/issues/issue-44405.rs
+++ b/tests/ui/issues/issue-44405.rs
diff --git a/src/test/ui/issues/issue-44405.stderr b/tests/ui/issues/issue-44405.stderr
index 626cb2999..626cb2999 100644
--- a/src/test/ui/issues/issue-44405.stderr
+++ b/tests/ui/issues/issue-44405.stderr
diff --git a/src/test/ui/issues/issue-4464.rs b/tests/ui/issues/issue-4464.rs
index 7ac107150..7ac107150 100644
--- a/src/test/ui/issues/issue-4464.rs
+++ b/tests/ui/issues/issue-4464.rs
diff --git a/src/test/ui/issues/issue-44730.rs b/tests/ui/issues/issue-44730.rs
index 0493811b2..0493811b2 100644
--- a/src/test/ui/issues/issue-44730.rs
+++ b/tests/ui/issues/issue-44730.rs
diff --git a/src/test/ui/issues/issue-44851.rs b/tests/ui/issues/issue-44851.rs
index 23daaeb0f..23daaeb0f 100644
--- a/src/test/ui/issues/issue-44851.rs
+++ b/tests/ui/issues/issue-44851.rs
diff --git a/src/test/ui/issues/issue-4517.rs b/tests/ui/issues/issue-4517.rs
index caf85d44a..caf85d44a 100644
--- a/src/test/ui/issues/issue-4517.rs
+++ b/tests/ui/issues/issue-4517.rs
diff --git a/src/test/ui/issues/issue-4517.stderr b/tests/ui/issues/issue-4517.stderr
index 70b4ca5ec..70b4ca5ec 100644
--- a/src/test/ui/issues/issue-4517.stderr
+++ b/tests/ui/issues/issue-4517.stderr
diff --git a/src/test/ui/issues/issue-4541.rs b/tests/ui/issues/issue-4541.rs
index e7f26d021..e7f26d021 100644
--- a/src/test/ui/issues/issue-4541.rs
+++ b/tests/ui/issues/issue-4541.rs
diff --git a/src/test/ui/issues/issue-4542.rs b/tests/ui/issues/issue-4542.rs
index 2386561c3..2386561c3 100644
--- a/src/test/ui/issues/issue-4542.rs
+++ b/tests/ui/issues/issue-4542.rs
diff --git a/src/test/ui/issues/issue-45425.rs b/tests/ui/issues/issue-45425.rs
index 10ce374ea..10ce374ea 100644
--- a/src/test/ui/issues/issue-45425.rs
+++ b/tests/ui/issues/issue-45425.rs
diff --git a/src/test/ui/issues/issue-4545.rs b/tests/ui/issues/issue-4545.rs
index 86fcf9af2..86fcf9af2 100644
--- a/src/test/ui/issues/issue-4545.rs
+++ b/tests/ui/issues/issue-4545.rs
diff --git a/src/test/ui/issues/issue-45510.rs b/tests/ui/issues/issue-45510.rs
index 9e104ce6c..9e104ce6c 100644
--- a/src/test/ui/issues/issue-45510.rs
+++ b/tests/ui/issues/issue-45510.rs
diff --git a/src/test/ui/issues/issue-45562.fixed b/tests/ui/issues/issue-45562.fixed
index ac700fbd0..ac700fbd0 100644
--- a/src/test/ui/issues/issue-45562.fixed
+++ b/tests/ui/issues/issue-45562.fixed
diff --git a/src/test/ui/issues/issue-45562.rs b/tests/ui/issues/issue-45562.rs
index eabb5a5ce..eabb5a5ce 100644
--- a/src/test/ui/issues/issue-45562.rs
+++ b/tests/ui/issues/issue-45562.rs
diff --git a/src/test/ui/issues/issue-45562.stderr b/tests/ui/issues/issue-45562.stderr
index be259d3f8..be259d3f8 100644
--- a/src/test/ui/issues/issue-45562.stderr
+++ b/tests/ui/issues/issue-45562.stderr
diff --git a/src/test/ui/issues/issue-45697-1.rs b/tests/ui/issues/issue-45697-1.rs
index b45f1170b..b45f1170b 100644
--- a/src/test/ui/issues/issue-45697-1.rs
+++ b/tests/ui/issues/issue-45697-1.rs
diff --git a/src/test/ui/issues/issue-45697-1.stderr b/tests/ui/issues/issue-45697-1.stderr
index 30c69f196..30c69f196 100644
--- a/src/test/ui/issues/issue-45697-1.stderr
+++ b/tests/ui/issues/issue-45697-1.stderr
diff --git a/src/test/ui/issues/issue-45697.rs b/tests/ui/issues/issue-45697.rs
index db6d1d8fa..db6d1d8fa 100644
--- a/src/test/ui/issues/issue-45697.rs
+++ b/tests/ui/issues/issue-45697.rs
diff --git a/src/test/ui/issues/issue-45697.stderr b/tests/ui/issues/issue-45697.stderr
index 26749d36f..26749d36f 100644
--- a/src/test/ui/issues/issue-45697.stderr
+++ b/tests/ui/issues/issue-45697.stderr
diff --git a/src/test/ui/issues/issue-45730.rs b/tests/ui/issues/issue-45730.rs
index 3776759fe..3776759fe 100644
--- a/src/test/ui/issues/issue-45730.rs
+++ b/tests/ui/issues/issue-45730.rs
diff --git a/src/test/ui/issues/issue-45730.stderr b/tests/ui/issues/issue-45730.stderr
index d00f3d91b..d00f3d91b 100644
--- a/src/test/ui/issues/issue-45730.stderr
+++ b/tests/ui/issues/issue-45730.stderr
diff --git a/src/test/ui/issues/issue-45731.rs b/tests/ui/issues/issue-45731.rs
index 5c5ac5987..5c5ac5987 100644
--- a/src/test/ui/issues/issue-45731.rs
+++ b/tests/ui/issues/issue-45731.rs
diff --git a/src/test/ui/issues/issue-45801.rs b/tests/ui/issues/issue-45801.rs
index 780baa896..780baa896 100644
--- a/src/test/ui/issues/issue-45801.rs
+++ b/tests/ui/issues/issue-45801.rs
diff --git a/src/test/ui/issues/issue-45801.stderr b/tests/ui/issues/issue-45801.stderr
index 8967f49df..8967f49df 100644
--- a/src/test/ui/issues/issue-45801.stderr
+++ b/tests/ui/issues/issue-45801.stderr
diff --git a/src/test/ui/issues/issue-45965.rs b/tests/ui/issues/issue-45965.rs
index 15649f777..15649f777 100644
--- a/src/test/ui/issues/issue-45965.rs
+++ b/tests/ui/issues/issue-45965.rs
diff --git a/src/test/ui/issues/issue-45965.stderr b/tests/ui/issues/issue-45965.stderr
index f3eaa9176..f3eaa9176 100644
--- a/src/test/ui/issues/issue-45965.stderr
+++ b/tests/ui/issues/issue-45965.stderr
diff --git a/src/test/ui/issues/issue-46069.rs b/tests/ui/issues/issue-46069.rs
index c418128c1..c418128c1 100644
--- a/src/test/ui/issues/issue-46069.rs
+++ b/tests/ui/issues/issue-46069.rs
diff --git a/src/test/ui/issues/issue-46101.rs b/tests/ui/issues/issue-46101.rs
index ab3d30d40..ab3d30d40 100644
--- a/src/test/ui/issues/issue-46101.rs
+++ b/tests/ui/issues/issue-46101.rs
diff --git a/src/test/ui/issues/issue-46101.stderr b/tests/ui/issues/issue-46101.stderr
index 40295b8a1..40295b8a1 100644
--- a/src/test/ui/issues/issue-46101.stderr
+++ b/tests/ui/issues/issue-46101.stderr
diff --git a/src/test/ui/issues/issue-46302.rs b/tests/ui/issues/issue-46302.rs
index ba681d84e..ba681d84e 100644
--- a/src/test/ui/issues/issue-46302.rs
+++ b/tests/ui/issues/issue-46302.rs
diff --git a/src/test/ui/issues/issue-46302.stderr b/tests/ui/issues/issue-46302.stderr
index a6f97c3c9..a6f97c3c9 100644
--- a/src/test/ui/issues/issue-46302.stderr
+++ b/tests/ui/issues/issue-46302.stderr
diff --git a/src/test/ui/issues/issue-46311.rs b/tests/ui/issues/issue-46311.rs
index 1233a49c5..1233a49c5 100644
--- a/src/test/ui/issues/issue-46311.rs
+++ b/tests/ui/issues/issue-46311.rs
diff --git a/src/test/ui/issues/issue-46311.stderr b/tests/ui/issues/issue-46311.stderr
index d72d6477d..d72d6477d 100644
--- a/src/test/ui/issues/issue-46311.stderr
+++ b/tests/ui/issues/issue-46311.stderr
diff --git a/src/test/ui/issues/issue-46332.rs b/tests/ui/issues/issue-46332.rs
index bed74e313..bed74e313 100644
--- a/src/test/ui/issues/issue-46332.rs
+++ b/tests/ui/issues/issue-46332.rs
diff --git a/src/test/ui/issues/issue-46332.stderr b/tests/ui/issues/issue-46332.stderr
index 890ef8014..890ef8014 100644
--- a/src/test/ui/issues/issue-46332.stderr
+++ b/tests/ui/issues/issue-46332.stderr
diff --git a/src/test/ui/issues/issue-46438.rs b/tests/ui/issues/issue-46438.rs
index d78b95846..d78b95846 100644
--- a/src/test/ui/issues/issue-46438.rs
+++ b/tests/ui/issues/issue-46438.rs
diff --git a/src/test/ui/issues/issue-46438.stderr b/tests/ui/issues/issue-46438.stderr
index c1fad44b8..c1fad44b8 100644
--- a/src/test/ui/issues/issue-46438.stderr
+++ b/tests/ui/issues/issue-46438.stderr
diff --git a/src/test/ui/issues/issue-46471-1.rs b/tests/ui/issues/issue-46471-1.rs
index aa161d40f..aa161d40f 100644
--- a/src/test/ui/issues/issue-46471-1.rs
+++ b/tests/ui/issues/issue-46471-1.rs
diff --git a/src/test/ui/issues/issue-46471-1.stderr b/tests/ui/issues/issue-46471-1.stderr
index b09f31729..b09f31729 100644
--- a/src/test/ui/issues/issue-46471-1.stderr
+++ b/tests/ui/issues/issue-46471-1.stderr
diff --git a/src/test/ui/issues/issue-46472.rs b/tests/ui/issues/issue-46472.rs
index b9e20e8db..b9e20e8db 100644
--- a/src/test/ui/issues/issue-46472.rs
+++ b/tests/ui/issues/issue-46472.rs
diff --git a/src/test/ui/issues/issue-46472.stderr b/tests/ui/issues/issue-46472.stderr
index 6e561e03a..6e561e03a 100644
--- a/src/test/ui/issues/issue-46472.stderr
+++ b/tests/ui/issues/issue-46472.stderr
diff --git a/src/test/ui/issues/issue-46604.rs b/tests/ui/issues/issue-46604.rs
index 6ec6e7bdc..6ec6e7bdc 100644
--- a/src/test/ui/issues/issue-46604.rs
+++ b/tests/ui/issues/issue-46604.rs
diff --git a/src/test/ui/issues/issue-46604.stderr b/tests/ui/issues/issue-46604.stderr
index 7faa2d79b..7faa2d79b 100644
--- a/src/test/ui/issues/issue-46604.stderr
+++ b/tests/ui/issues/issue-46604.stderr
diff --git a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.fixed b/tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.fixed
index 8668d8acd..8668d8acd 100644
--- a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.fixed
+++ b/tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.fixed
diff --git a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs b/tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs
index c8494612c..c8494612c 100644
--- a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs
+++ b/tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs
diff --git a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr b/tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr
index e874ded8e..e874ded8e 100644
--- a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr
+++ b/tests/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr
diff --git a/src/test/ui/issues/issue-46771.rs b/tests/ui/issues/issue-46771.rs
index 22be8d6af..22be8d6af 100644
--- a/src/test/ui/issues/issue-46771.rs
+++ b/tests/ui/issues/issue-46771.rs
diff --git a/src/test/ui/issues/issue-46771.stderr b/tests/ui/issues/issue-46771.stderr
index 512827b2d..512827b2d 100644
--- a/src/test/ui/issues/issue-46771.stderr
+++ b/tests/ui/issues/issue-46771.stderr
diff --git a/src/test/ui/issues/issue-46855.rs b/tests/ui/issues/issue-46855.rs
index aa6378f85..aa6378f85 100644
--- a/src/test/ui/issues/issue-46855.rs
+++ b/tests/ui/issues/issue-46855.rs
diff --git a/src/test/ui/issues/issue-46964.rs b/tests/ui/issues/issue-46964.rs
index 28fa92f20..28fa92f20 100644
--- a/src/test/ui/issues/issue-46964.rs
+++ b/tests/ui/issues/issue-46964.rs
diff --git a/src/test/ui/issues/issue-46983.rs b/tests/ui/issues/issue-46983.rs
index 4bd49a879..4bd49a879 100644
--- a/src/test/ui/issues/issue-46983.rs
+++ b/tests/ui/issues/issue-46983.rs
diff --git a/src/test/ui/issues/issue-46983.stderr b/tests/ui/issues/issue-46983.stderr
index 38a219bbd..38a219bbd 100644
--- a/src/test/ui/issues/issue-46983.stderr
+++ b/tests/ui/issues/issue-46983.stderr
diff --git a/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.rs b/tests/ui/issues/issue-47073-zero-padded-tuple-struct-indices.rs
index 6cd1f1443..6cd1f1443 100644
--- a/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.rs
+++ b/tests/ui/issues/issue-47073-zero-padded-tuple-struct-indices.rs
diff --git a/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr b/tests/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr
index 5e1b816de..5e1b816de 100644
--- a/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr
+++ b/tests/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr
diff --git a/src/test/ui/issues/issue-47094.rs b/tests/ui/issues/issue-47094.rs
index c5d37feb1..c5d37feb1 100644
--- a/src/test/ui/issues/issue-47094.rs
+++ b/tests/ui/issues/issue-47094.rs
diff --git a/src/test/ui/issues/issue-47094.stderr b/tests/ui/issues/issue-47094.stderr
index 970e31847..970e31847 100644
--- a/src/test/ui/issues/issue-47094.stderr
+++ b/tests/ui/issues/issue-47094.stderr
diff --git a/src/test/ui/issues/issue-47184.rs b/tests/ui/issues/issue-47184.rs
index 2f78ce000..2f78ce000 100644
--- a/src/test/ui/issues/issue-47184.rs
+++ b/tests/ui/issues/issue-47184.rs
diff --git a/src/test/ui/issues/issue-47184.stderr b/tests/ui/issues/issue-47184.stderr
index c2c7df7a3..c2c7df7a3 100644
--- a/src/test/ui/issues/issue-47184.stderr
+++ b/tests/ui/issues/issue-47184.stderr
diff --git a/src/test/ui/issues/issue-47309.rs b/tests/ui/issues/issue-47309.rs
index abed9687b..abed9687b 100644
--- a/src/test/ui/issues/issue-47309.rs
+++ b/tests/ui/issues/issue-47309.rs
diff --git a/src/test/ui/issues/issue-4734.rs b/tests/ui/issues/issue-4734.rs
index 29c965d7f..29c965d7f 100644
--- a/src/test/ui/issues/issue-4734.rs
+++ b/tests/ui/issues/issue-4734.rs
diff --git a/src/test/ui/issues/issue-4735.rs b/tests/ui/issues/issue-4735.rs
index 3ea4b01cd..3ea4b01cd 100644
--- a/src/test/ui/issues/issue-4735.rs
+++ b/tests/ui/issues/issue-4735.rs
diff --git a/src/test/ui/issues/issue-4736.rs b/tests/ui/issues/issue-4736.rs
index 799d2d480..799d2d480 100644
--- a/src/test/ui/issues/issue-4736.rs
+++ b/tests/ui/issues/issue-4736.rs
diff --git a/src/test/ui/issues/issue-4736.stderr b/tests/ui/issues/issue-4736.stderr
index 2a1f1819c..2a1f1819c 100644
--- a/src/test/ui/issues/issue-4736.stderr
+++ b/tests/ui/issues/issue-4736.stderr
diff --git a/src/test/ui/issues/issue-47364.rs b/tests/ui/issues/issue-47364.rs
index b524354d9..b524354d9 100644
--- a/src/test/ui/issues/issue-47364.rs
+++ b/tests/ui/issues/issue-47364.rs
diff --git a/src/test/ui/issues/issue-47377.rs b/tests/ui/issues/issue-47377.rs
index 7a2e0fe6d..7a2e0fe6d 100644
--- a/src/test/ui/issues/issue-47377.rs
+++ b/tests/ui/issues/issue-47377.rs
diff --git a/src/test/ui/issues/issue-47377.stderr b/tests/ui/issues/issue-47377.stderr
index 4f0fd948e..4f0fd948e 100644
--- a/src/test/ui/issues/issue-47377.stderr
+++ b/tests/ui/issues/issue-47377.stderr
diff --git a/src/test/ui/issues/issue-47380.rs b/tests/ui/issues/issue-47380.rs
index 61e096622..61e096622 100644
--- a/src/test/ui/issues/issue-47380.rs
+++ b/tests/ui/issues/issue-47380.rs
diff --git a/src/test/ui/issues/issue-47380.stderr b/tests/ui/issues/issue-47380.stderr
index b04ac5536..b04ac5536 100644
--- a/src/test/ui/issues/issue-47380.stderr
+++ b/tests/ui/issues/issue-47380.stderr
diff --git a/src/test/ui/issues/issue-47486.rs b/tests/ui/issues/issue-47486.rs
index d686f02a9..d686f02a9 100644
--- a/src/test/ui/issues/issue-47486.rs
+++ b/tests/ui/issues/issue-47486.rs
diff --git a/src/test/ui/issues/issue-47486.stderr b/tests/ui/issues/issue-47486.stderr
index 2bd24f08c..c7e9af70e 100644
--- a/src/test/ui/issues/issue-47486.stderr
+++ b/tests/ui/issues/issue-47486.stderr
@@ -2,7 +2,9 @@ error[E0308]: mismatched types
   --> $DIR/issue-47486.rs:2:10
    |
 LL |     () < std::mem::size_of::<_>();
-   |          ^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found `usize`
+   |     --   ^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found `usize`
+   |     |
+   |     expected because this is `()`
 
 error[E0282]: type annotations needed
   --> $DIR/issue-47486.rs:3:11
diff --git a/src/test/ui/issues/issue-4759-1.rs b/tests/ui/issues/issue-4759-1.rs
index 96fae0fec..96fae0fec 100644
--- a/src/test/ui/issues/issue-4759-1.rs
+++ b/tests/ui/issues/issue-4759-1.rs
diff --git a/src/test/ui/issues/issue-4759.rs b/tests/ui/issues/issue-4759.rs
index e5b9e2ed5..e5b9e2ed5 100644
--- a/src/test/ui/issues/issue-4759.rs
+++ b/tests/ui/issues/issue-4759.rs
diff --git a/src/test/ui/issues/issue-47638.rs b/tests/ui/issues/issue-47638.rs
index a1ed3c365..a1ed3c365 100644
--- a/src/test/ui/issues/issue-47638.rs
+++ b/tests/ui/issues/issue-47638.rs
diff --git a/src/test/ui/issues/issue-47646.rs b/tests/ui/issues/issue-47646.rs
index ace6cdce8..ace6cdce8 100644
--- a/src/test/ui/issues/issue-47646.rs
+++ b/tests/ui/issues/issue-47646.rs
diff --git a/src/test/ui/issues/issue-47646.stderr b/tests/ui/issues/issue-47646.stderr
index 84cf9237a..84cf9237a 100644
--- a/src/test/ui/issues/issue-47646.stderr
+++ b/tests/ui/issues/issue-47646.stderr
diff --git a/src/test/ui/issues/issue-47673.rs b/tests/ui/issues/issue-47673.rs
index b5f0febfb..b5f0febfb 100644
--- a/src/test/ui/issues/issue-47673.rs
+++ b/tests/ui/issues/issue-47673.rs
diff --git a/src/test/ui/issues/issue-47703-1.rs b/tests/ui/issues/issue-47703-1.rs
index 61d684c2a..61d684c2a 100644
--- a/src/test/ui/issues/issue-47703-1.rs
+++ b/tests/ui/issues/issue-47703-1.rs
diff --git a/src/test/ui/issues/issue-47703-tuple.rs b/tests/ui/issues/issue-47703-tuple.rs
index bad187ead..bad187ead 100644
--- a/src/test/ui/issues/issue-47703-tuple.rs
+++ b/tests/ui/issues/issue-47703-tuple.rs
diff --git a/src/test/ui/issues/issue-47703.rs b/tests/ui/issues/issue-47703.rs
index 38be6f5d2..38be6f5d2 100644
--- a/src/test/ui/issues/issue-47703.rs
+++ b/tests/ui/issues/issue-47703.rs
diff --git a/src/test/ui/issues/issue-47715.rs b/tests/ui/issues/issue-47715.rs
index b8088c18d..b8088c18d 100644
--- a/src/test/ui/issues/issue-47715.rs
+++ b/tests/ui/issues/issue-47715.rs
diff --git a/src/test/ui/issues/issue-47715.stderr b/tests/ui/issues/issue-47715.stderr
index 0ee9388bf..0ee9388bf 100644
--- a/src/test/ui/issues/issue-47715.stderr
+++ b/tests/ui/issues/issue-47715.stderr
diff --git a/src/test/ui/issues/issue-47722.rs b/tests/ui/issues/issue-47722.rs
index 5645a6343..5645a6343 100644
--- a/src/test/ui/issues/issue-47722.rs
+++ b/tests/ui/issues/issue-47722.rs
diff --git a/src/test/ui/issues/issue-47725.rs b/tests/ui/issues/issue-47725.rs
index 9ec55be58..9ec55be58 100644
--- a/src/test/ui/issues/issue-47725.rs
+++ b/tests/ui/issues/issue-47725.rs
diff --git a/src/test/ui/issues/issue-47725.stderr b/tests/ui/issues/issue-47725.stderr
index 7143fb4d6..7143fb4d6 100644
--- a/src/test/ui/issues/issue-47725.stderr
+++ b/tests/ui/issues/issue-47725.stderr
diff --git a/src/test/ui/issues/issue-48006.rs b/tests/ui/issues/issue-48006.rs
index cfef270e5..cfef270e5 100644
--- a/src/test/ui/issues/issue-48006.rs
+++ b/tests/ui/issues/issue-48006.rs
diff --git a/src/test/ui/issues/issue-48131.mir.stderr b/tests/ui/issues/issue-48131.mir.stderr
index 6817e8830..6817e8830 100644
--- a/src/test/ui/issues/issue-48131.mir.stderr
+++ b/tests/ui/issues/issue-48131.mir.stderr
diff --git a/src/test/ui/issues/issue-48131.rs b/tests/ui/issues/issue-48131.rs
index df9854708..df9854708 100644
--- a/src/test/ui/issues/issue-48131.rs
+++ b/tests/ui/issues/issue-48131.rs
diff --git a/src/test/ui/issues/issue-48131.thir.stderr b/tests/ui/issues/issue-48131.thir.stderr
index 6817e8830..6817e8830 100644
--- a/src/test/ui/issues/issue-48131.thir.stderr
+++ b/tests/ui/issues/issue-48131.thir.stderr
diff --git a/src/test/ui/issues/issue-48132.rs b/tests/ui/issues/issue-48132.rs
index f564aefe7..f564aefe7 100644
--- a/src/test/ui/issues/issue-48132.rs
+++ b/tests/ui/issues/issue-48132.rs
diff --git a/src/test/ui/issues/issue-48159.rs b/tests/ui/issues/issue-48159.rs
index fc8f31fb1..fc8f31fb1 100644
--- a/src/test/ui/issues/issue-48159.rs
+++ b/tests/ui/issues/issue-48159.rs
diff --git a/src/test/ui/issues/issue-48179.rs b/tests/ui/issues/issue-48179.rs
index f81203dc4..f81203dc4 100644
--- a/src/test/ui/issues/issue-48179.rs
+++ b/tests/ui/issues/issue-48179.rs
diff --git a/src/test/ui/issues/issue-48276.rs b/tests/ui/issues/issue-48276.rs
index f55c056fa..f55c056fa 100644
--- a/src/test/ui/issues/issue-48276.rs
+++ b/tests/ui/issues/issue-48276.rs
diff --git a/src/test/ui/issues/issue-48276.stderr b/tests/ui/issues/issue-48276.stderr
index 370905ee0..370905ee0 100644
--- a/src/test/ui/issues/issue-48276.stderr
+++ b/tests/ui/issues/issue-48276.stderr
diff --git a/src/test/ui/issues/issue-4830.rs b/tests/ui/issues/issue-4830.rs
index a8553bd6b..a8553bd6b 100644
--- a/src/test/ui/issues/issue-4830.rs
+++ b/tests/ui/issues/issue-4830.rs
diff --git a/src/test/ui/issues/issue-48364.rs b/tests/ui/issues/issue-48364.rs
index 14ee75e7c..14ee75e7c 100644
--- a/src/test/ui/issues/issue-48364.rs
+++ b/tests/ui/issues/issue-48364.rs
diff --git a/src/test/ui/issues/issue-48364.stderr b/tests/ui/issues/issue-48364.stderr
index 7fd36676d..60bbfc0c6 100644
--- a/src/test/ui/issues/issue-48364.stderr
+++ b/tests/ui/issues/issue-48364.stderr
@@ -4,15 +4,12 @@ error[E0308]: mismatched types
 LL |     b"".starts_with(stringify!(foo))
    |         ----------- ^^^^^^^^^^^^^^^ expected slice `[u8]`, found `str`
    |         |
-   |         arguments to this function are incorrect
+   |         arguments to this method are incorrect
    |
    = note: expected reference `&[u8]`
               found reference `&'static str`
 note: associated function defined here
   --> $SRC_DIR/core/src/slice/mod.rs:LL:COL
-   |
-LL |     pub fn starts_with(&self, needle: &[T]) -> bool
-   |            ^^^^^^^^^^^
    = note: this error originates in the macro `stringify` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-48728.rs b/tests/ui/issues/issue-48728.rs
index cbdc10bd2..cbdc10bd2 100644
--- a/src/test/ui/issues/issue-48728.rs
+++ b/tests/ui/issues/issue-48728.rs
diff --git a/src/test/ui/issues/issue-48728.stderr b/tests/ui/issues/issue-48728.stderr
index 0bb46724f..0bb46724f 100644
--- a/src/test/ui/issues/issue-48728.stderr
+++ b/tests/ui/issues/issue-48728.stderr
diff --git a/src/test/ui/issues/issue-4875.rs b/tests/ui/issues/issue-4875.rs
index 8d361314f..8d361314f 100644
--- a/src/test/ui/issues/issue-4875.rs
+++ b/tests/ui/issues/issue-4875.rs
diff --git a/src/test/ui/issues/issue-48838.rs b/tests/ui/issues/issue-48838.rs
index 057a424df..057a424df 100644
--- a/src/test/ui/issues/issue-48838.rs
+++ b/tests/ui/issues/issue-48838.rs
diff --git a/src/test/ui/issues/issue-48838.stderr b/tests/ui/issues/issue-48838.stderr
index 3502af702..3502af702 100644
--- a/src/test/ui/issues/issue-48838.stderr
+++ b/tests/ui/issues/issue-48838.stderr
diff --git a/src/test/ui/issues/issue-48984.rs b/tests/ui/issues/issue-48984.rs
index cb340f848..cb340f848 100644
--- a/src/test/ui/issues/issue-48984.rs
+++ b/tests/ui/issues/issue-48984.rs
diff --git a/src/test/ui/issues/issue-49298.rs b/tests/ui/issues/issue-49298.rs
index e3ffa8e7c..e3ffa8e7c 100644
--- a/src/test/ui/issues/issue-49298.rs
+++ b/tests/ui/issues/issue-49298.rs
diff --git a/tests/ui/issues/issue-4935.rs b/tests/ui/issues/issue-4935.rs
new file mode 100644
index 000000000..c95020a0c
--- /dev/null
+++ b/tests/ui/issues/issue-4935.rs
@@ -0,0 +1,6 @@
+// Regression test for issue #4935
+
+fn foo(a: usize) {}
+//~^ defined here
+fn main() { foo(5, 6) }
+//~^ ERROR function takes 1 argument but 2 arguments were supplied
diff --git a/src/test/ui/issues/issue-4935.stderr b/tests/ui/issues/issue-4935.stderr
index bb45fa083..bb45fa083 100644
--- a/src/test/ui/issues/issue-4935.stderr
+++ b/tests/ui/issues/issue-4935.stderr
diff --git a/src/test/ui/issues/issue-49544.rs b/tests/ui/issues/issue-49544.rs
index ed356275f..ed356275f 100644
--- a/src/test/ui/issues/issue-49544.rs
+++ b/tests/ui/issues/issue-49544.rs
diff --git a/src/test/ui/issues/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs b/tests/ui/issues/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs
index f30d7e2ed..f30d7e2ed 100644
--- a/src/test/ui/issues/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs
+++ b/tests/ui/issues/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs
diff --git a/src/test/ui/issues/issue-49632.rs b/tests/ui/issues/issue-49632.rs
index 155fd0d24..155fd0d24 100644
--- a/src/test/ui/issues/issue-49632.rs
+++ b/tests/ui/issues/issue-49632.rs
diff --git a/src/test/ui/issues/issue-4968.rs b/tests/ui/issues/issue-4968.rs
index 634bd698d..634bd698d 100644
--- a/src/test/ui/issues/issue-4968.rs
+++ b/tests/ui/issues/issue-4968.rs
diff --git a/src/test/ui/issues/issue-4968.stderr b/tests/ui/issues/issue-4968.stderr
index bbaca4ed2..bbaca4ed2 100644
--- a/src/test/ui/issues/issue-4968.stderr
+++ b/tests/ui/issues/issue-4968.stderr
diff --git a/src/test/ui/issues/issue-4972.rs b/tests/ui/issues/issue-4972.rs
index 3f1c6f855..3f1c6f855 100644
--- a/src/test/ui/issues/issue-4972.rs
+++ b/tests/ui/issues/issue-4972.rs
diff --git a/src/test/ui/issues/issue-4972.stderr b/tests/ui/issues/issue-4972.stderr
index 83daded7e..83daded7e 100644
--- a/src/test/ui/issues/issue-4972.stderr
+++ b/tests/ui/issues/issue-4972.stderr
diff --git a/src/test/ui/issues/issue-49824.rs b/tests/ui/issues/issue-49824.rs
index bc1cd6856..bc1cd6856 100644
--- a/src/test/ui/issues/issue-49824.rs
+++ b/tests/ui/issues/issue-49824.rs
diff --git a/src/test/ui/issues/issue-49824.stderr b/tests/ui/issues/issue-49824.stderr
index 14beadece..14beadece 100644
--- a/src/test/ui/issues/issue-49824.stderr
+++ b/tests/ui/issues/issue-49824.stderr
diff --git a/src/test/ui/issues/issue-49851/compiler-builtins-error.rs b/tests/ui/issues/issue-49851/compiler-builtins-error.rs
index 4e56cca33..4e56cca33 100644
--- a/src/test/ui/issues/issue-49851/compiler-builtins-error.rs
+++ b/tests/ui/issues/issue-49851/compiler-builtins-error.rs
diff --git a/src/test/ui/issues/issue-49851/compiler-builtins-error.stderr b/tests/ui/issues/issue-49851/compiler-builtins-error.stderr
index fcfa2bf11..fcfa2bf11 100644
--- a/src/test/ui/issues/issue-49851/compiler-builtins-error.stderr
+++ b/tests/ui/issues/issue-49851/compiler-builtins-error.stderr
diff --git a/src/test/ui/issues/issue-49854.rs b/tests/ui/issues/issue-49854.rs
index 0e1db00a3..0e1db00a3 100644
--- a/src/test/ui/issues/issue-49854.rs
+++ b/tests/ui/issues/issue-49854.rs
diff --git a/src/test/ui/issues/issue-49919.rs b/tests/ui/issues/issue-49919.rs
index 780f33868..780f33868 100644
--- a/src/test/ui/issues/issue-49919.rs
+++ b/tests/ui/issues/issue-49919.rs
diff --git a/src/test/ui/issues/issue-49919.stderr b/tests/ui/issues/issue-49919.stderr
index 8098be5cc..8098be5cc 100644
--- a/src/test/ui/issues/issue-49919.stderr
+++ b/tests/ui/issues/issue-49919.stderr
diff --git a/src/test/ui/issues/issue-49934-errors.rs b/tests/ui/issues/issue-49934-errors.rs
index dd14bac5e..dd14bac5e 100644
--- a/src/test/ui/issues/issue-49934-errors.rs
+++ b/tests/ui/issues/issue-49934-errors.rs
diff --git a/src/test/ui/issues/issue-49934-errors.stderr b/tests/ui/issues/issue-49934-errors.stderr
index 8c4c54170..8c4c54170 100644
--- a/src/test/ui/issues/issue-49934-errors.stderr
+++ b/tests/ui/issues/issue-49934-errors.stderr
diff --git a/src/test/ui/issues/issue-49934.rs b/tests/ui/issues/issue-49934.rs
index 119d84a06..119d84a06 100644
--- a/src/test/ui/issues/issue-49934.rs
+++ b/tests/ui/issues/issue-49934.rs
diff --git a/src/test/ui/issues/issue-49934.stderr b/tests/ui/issues/issue-49934.stderr
index f2ff541bb..f2ff541bb 100644
--- a/src/test/ui/issues/issue-49934.stderr
+++ b/tests/ui/issues/issue-49934.stderr
diff --git a/src/test/ui/issues/issue-49955.rs b/tests/ui/issues/issue-49955.rs
index f2f3ebff2..f2f3ebff2 100644
--- a/src/test/ui/issues/issue-49955.rs
+++ b/tests/ui/issues/issue-49955.rs
diff --git a/src/test/ui/issues/issue-49973.rs b/tests/ui/issues/issue-49973.rs
index af421c52f..af421c52f 100644
--- a/src/test/ui/issues/issue-49973.rs
+++ b/tests/ui/issues/issue-49973.rs
diff --git a/src/test/ui/issues/issue-5008-borrowed-traitobject-method-call.rs b/tests/ui/issues/issue-5008-borrowed-traitobject-method-call.rs
index fc869ae4f..fc869ae4f 100644
--- a/src/test/ui/issues/issue-5008-borrowed-traitobject-method-call.rs
+++ b/tests/ui/issues/issue-5008-borrowed-traitobject-method-call.rs
diff --git a/src/test/ui/issues/issue-50187.rs b/tests/ui/issues/issue-50187.rs
index 4b0aeaab4..4b0aeaab4 100644
--- a/src/test/ui/issues/issue-50187.rs
+++ b/tests/ui/issues/issue-50187.rs
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref.rs b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.rs
index 160cfc3d4..160cfc3d4 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref.rs
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.rs
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr
index ce8173169..ce8173169 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.rs b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.rs
index ff5095ce3..ff5095ce3 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.rs
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.rs
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
index 943f77486..943f77486 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref.rs b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.rs
index 4232f14d2..4232f14d2 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref.rs
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.rs
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr
index a3b9ac677..a3b9ac677 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.rs b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.rs
index 3507d1d8e..3507d1d8e 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.rs
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.rs
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr
index aa771e4c0..aa771e4c0 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr
diff --git a/src/test/ui/issues/issue-50403.rs b/tests/ui/issues/issue-50403.rs
index 012057fc2..012057fc2 100644
--- a/src/test/ui/issues/issue-50403.rs
+++ b/tests/ui/issues/issue-50403.rs
diff --git a/src/test/ui/issues/issue-50403.stderr b/tests/ui/issues/issue-50403.stderr
index a3a2ed044..a3a2ed044 100644
--- a/src/test/ui/issues/issue-50403.stderr
+++ b/tests/ui/issues/issue-50403.stderr
diff --git a/src/test/ui/issues/issue-50411.rs b/tests/ui/issues/issue-50411.rs
index cd728b152..cd728b152 100644
--- a/src/test/ui/issues/issue-50411.rs
+++ b/tests/ui/issues/issue-50411.rs
diff --git a/src/test/ui/issues/issue-50415.rs b/tests/ui/issues/issue-50415.rs
index 151b9fe44..151b9fe44 100644
--- a/src/test/ui/issues/issue-50415.rs
+++ b/tests/ui/issues/issue-50415.rs
diff --git a/src/test/ui/issues/issue-50442.rs b/tests/ui/issues/issue-50442.rs
index 25c7dde7a..25c7dde7a 100644
--- a/src/test/ui/issues/issue-50442.rs
+++ b/tests/ui/issues/issue-50442.rs
diff --git a/src/test/ui/issues/issue-50471.rs b/tests/ui/issues/issue-50471.rs
index 7278c392d..7278c392d 100644
--- a/src/test/ui/issues/issue-50471.rs
+++ b/tests/ui/issues/issue-50471.rs
diff --git a/src/test/ui/issues/issue-50518.rs b/tests/ui/issues/issue-50518.rs
index 1e7b77949..1e7b77949 100644
--- a/src/test/ui/issues/issue-50518.rs
+++ b/tests/ui/issues/issue-50518.rs
diff --git a/src/test/ui/issues/issue-50571.fixed b/tests/ui/issues/issue-50571.fixed
index 2f8c925b8..2f8c925b8 100644
--- a/src/test/ui/issues/issue-50571.fixed
+++ b/tests/ui/issues/issue-50571.fixed
diff --git a/src/test/ui/issues/issue-50571.rs b/tests/ui/issues/issue-50571.rs
index 56f422e7d..56f422e7d 100644
--- a/src/test/ui/issues/issue-50571.rs
+++ b/tests/ui/issues/issue-50571.rs
diff --git a/src/test/ui/issues/issue-50571.stderr b/tests/ui/issues/issue-50571.stderr
index f69963bb7..f69963bb7 100644
--- a/src/test/ui/issues/issue-50571.stderr
+++ b/tests/ui/issues/issue-50571.stderr
diff --git a/src/test/ui/issues/issue-50576.rs b/tests/ui/issues/issue-50576.rs
index e0c36b827..e0c36b827 100644
--- a/src/test/ui/issues/issue-50576.rs
+++ b/tests/ui/issues/issue-50576.rs
diff --git a/src/test/ui/issues/issue-50576.stderr b/tests/ui/issues/issue-50576.stderr
index 4ec22fde9..4ec22fde9 100644
--- a/src/test/ui/issues/issue-50576.stderr
+++ b/tests/ui/issues/issue-50576.stderr
diff --git a/src/test/ui/issues/issue-50581.rs b/tests/ui/issues/issue-50581.rs
index 12bb9930e..12bb9930e 100644
--- a/src/test/ui/issues/issue-50581.rs
+++ b/tests/ui/issues/issue-50581.rs
diff --git a/src/test/ui/issues/issue-50581.stderr b/tests/ui/issues/issue-50581.stderr
index 07b6df072..07b6df072 100644
--- a/src/test/ui/issues/issue-50581.stderr
+++ b/tests/ui/issues/issue-50581.stderr
diff --git a/src/test/ui/issues/issue-50582.rs b/tests/ui/issues/issue-50582.rs
index 2d5c93587..2d5c93587 100644
--- a/src/test/ui/issues/issue-50582.rs
+++ b/tests/ui/issues/issue-50582.rs
diff --git a/src/test/ui/issues/issue-50582.stderr b/tests/ui/issues/issue-50582.stderr
index 53ecc6112..53ecc6112 100644
--- a/src/test/ui/issues/issue-50582.stderr
+++ b/tests/ui/issues/issue-50582.stderr
diff --git a/src/test/ui/issues/issue-50585.rs b/tests/ui/issues/issue-50585.rs
index a2f11c98d..a2f11c98d 100644
--- a/src/test/ui/issues/issue-50585.rs
+++ b/tests/ui/issues/issue-50585.rs
diff --git a/src/test/ui/issues/issue-50585.stderr b/tests/ui/issues/issue-50585.stderr
index e43cc20cb..e43cc20cb 100644
--- a/src/test/ui/issues/issue-50585.stderr
+++ b/tests/ui/issues/issue-50585.stderr
diff --git a/src/test/ui/issues/issue-50600.rs b/tests/ui/issues/issue-50600.rs
index 963e607af..963e607af 100644
--- a/src/test/ui/issues/issue-50600.rs
+++ b/tests/ui/issues/issue-50600.rs
diff --git a/src/test/ui/issues/issue-50600.stderr b/tests/ui/issues/issue-50600.stderr
index 7fea7e5c0..7fea7e5c0 100644
--- a/src/test/ui/issues/issue-50600.stderr
+++ b/tests/ui/issues/issue-50600.stderr
diff --git a/src/test/ui/issues/issue-50618.rs b/tests/ui/issues/issue-50618.rs
index 5f762bc43..5f762bc43 100644
--- a/src/test/ui/issues/issue-50618.rs
+++ b/tests/ui/issues/issue-50618.rs
diff --git a/src/test/ui/issues/issue-50618.stderr b/tests/ui/issues/issue-50618.stderr
index 1ac5dde66..1ac5dde66 100644
--- a/src/test/ui/issues/issue-50618.stderr
+++ b/tests/ui/issues/issue-50618.stderr
diff --git a/src/test/ui/issues/issue-5062.rs b/tests/ui/issues/issue-5062.rs
index 2db0a8e25..2db0a8e25 100644
--- a/src/test/ui/issues/issue-5062.rs
+++ b/tests/ui/issues/issue-5062.rs
diff --git a/src/test/ui/issues/issue-5062.stderr b/tests/ui/issues/issue-5062.stderr
index 3191bd3de..3191bd3de 100644
--- a/src/test/ui/issues/issue-5062.stderr
+++ b/tests/ui/issues/issue-5062.stderr
diff --git a/src/test/ui/issues/issue-5067.rs b/tests/ui/issues/issue-5067.rs
index 5857a0815..5857a0815 100644
--- a/src/test/ui/issues/issue-5067.rs
+++ b/tests/ui/issues/issue-5067.rs
diff --git a/src/test/ui/issues/issue-5067.stderr b/tests/ui/issues/issue-5067.stderr
index 7ffc60714..7ffc60714 100644
--- a/src/test/ui/issues/issue-5067.stderr
+++ b/tests/ui/issues/issue-5067.stderr
diff --git a/src/test/ui/issues/issue-50688.rs b/tests/ui/issues/issue-50688.rs
index 88f898b86..88f898b86 100644
--- a/src/test/ui/issues/issue-50688.rs
+++ b/tests/ui/issues/issue-50688.rs
diff --git a/src/test/ui/issues/issue-50688.stderr b/tests/ui/issues/issue-50688.stderr
index 6973ad271..6973ad271 100644
--- a/src/test/ui/issues/issue-50688.stderr
+++ b/tests/ui/issues/issue-50688.stderr
diff --git a/src/test/ui/issues/issue-50689.rs b/tests/ui/issues/issue-50689.rs
index b49f29500..b49f29500 100644
--- a/src/test/ui/issues/issue-50689.rs
+++ b/tests/ui/issues/issue-50689.rs
diff --git a/src/test/ui/issues/issue-50714-1.rs b/tests/ui/issues/issue-50714-1.rs
index a25940ce1..a25940ce1 100644
--- a/src/test/ui/issues/issue-50714-1.rs
+++ b/tests/ui/issues/issue-50714-1.rs
diff --git a/src/test/ui/issues/issue-50714-1.stderr b/tests/ui/issues/issue-50714-1.stderr
index 28469bee0..28469bee0 100644
--- a/src/test/ui/issues/issue-50714-1.stderr
+++ b/tests/ui/issues/issue-50714-1.stderr
diff --git a/src/test/ui/issues/issue-50714.rs b/tests/ui/issues/issue-50714.rs
index c571a470c..c571a470c 100644
--- a/src/test/ui/issues/issue-50714.rs
+++ b/tests/ui/issues/issue-50714.rs
diff --git a/src/test/ui/issues/issue-50714.stderr b/tests/ui/issues/issue-50714.stderr
index a11aceb62..a11aceb62 100644
--- a/src/test/ui/issues/issue-50714.stderr
+++ b/tests/ui/issues/issue-50714.stderr
diff --git a/src/test/ui/issues/issue-50761.rs b/tests/ui/issues/issue-50761.rs
index 1bf494ba8..1bf494ba8 100644
--- a/src/test/ui/issues/issue-50761.rs
+++ b/tests/ui/issues/issue-50761.rs
diff --git a/src/test/ui/issues/issue-50781.rs b/tests/ui/issues/issue-50781.rs
index 3c5e5a9f6..3c5e5a9f6 100644
--- a/src/test/ui/issues/issue-50781.rs
+++ b/tests/ui/issues/issue-50781.rs
diff --git a/src/test/ui/issues/issue-50781.stderr b/tests/ui/issues/issue-50781.stderr
index e185ecdda..e185ecdda 100644
--- a/src/test/ui/issues/issue-50781.stderr
+++ b/tests/ui/issues/issue-50781.stderr
diff --git a/src/test/ui/issues/issue-50802.rs b/tests/ui/issues/issue-50802.rs
index dece55968..dece55968 100644
--- a/src/test/ui/issues/issue-50802.rs
+++ b/tests/ui/issues/issue-50802.rs
diff --git a/src/test/ui/issues/issue-50802.stderr b/tests/ui/issues/issue-50802.stderr
index e064fabcc..e064fabcc 100644
--- a/src/test/ui/issues/issue-50802.stderr
+++ b/tests/ui/issues/issue-50802.stderr
diff --git a/src/test/ui/issues/issue-50811.rs b/tests/ui/issues/issue-50811.rs
index 683c85604..683c85604 100644
--- a/src/test/ui/issues/issue-50811.rs
+++ b/tests/ui/issues/issue-50811.rs
diff --git a/src/test/ui/issues/issue-50825-1.rs b/tests/ui/issues/issue-50825-1.rs
index ee4316029..ee4316029 100644
--- a/src/test/ui/issues/issue-50825-1.rs
+++ b/tests/ui/issues/issue-50825-1.rs
diff --git a/src/test/ui/issues/issue-50825.rs b/tests/ui/issues/issue-50825.rs
index 1ece2e9fc..1ece2e9fc 100644
--- a/src/test/ui/issues/issue-50825.rs
+++ b/tests/ui/issues/issue-50825.rs
diff --git a/src/test/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs b/tests/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs
index 1e20a5460..1e20a5460 100644
--- a/src/test/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs
+++ b/tests/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs
diff --git a/src/test/ui/issues/issue-50865-private-impl-trait/main.rs b/tests/ui/issues/issue-50865-private-impl-trait/main.rs
index 16dfac53a..16dfac53a 100644
--- a/src/test/ui/issues/issue-50865-private-impl-trait/main.rs
+++ b/tests/ui/issues/issue-50865-private-impl-trait/main.rs
diff --git a/src/test/ui/issues/issue-5100.rs b/tests/ui/issues/issue-5100.rs
index 69ed4b0e4..69ed4b0e4 100644
--- a/src/test/ui/issues/issue-5100.rs
+++ b/tests/ui/issues/issue-5100.rs
diff --git a/src/test/ui/issues/issue-5100.stderr b/tests/ui/issues/issue-5100.stderr
index c87a3e348..c87a3e348 100644
--- a/src/test/ui/issues/issue-5100.stderr
+++ b/tests/ui/issues/issue-5100.stderr
diff --git a/src/test/ui/issues/issue-51022.rs b/tests/ui/issues/issue-51022.rs
index cebdfe00c..cebdfe00c 100644
--- a/src/test/ui/issues/issue-51022.rs
+++ b/tests/ui/issues/issue-51022.rs
diff --git a/src/test/ui/issues/issue-51022.stderr b/tests/ui/issues/issue-51022.stderr
index 5e196bd4e..5e196bd4e 100644
--- a/src/test/ui/issues/issue-51022.stderr
+++ b/tests/ui/issues/issue-51022.stderr
diff --git a/src/test/ui/issues/issue-51044.rs b/tests/ui/issues/issue-51044.rs
index 628d78769..628d78769 100644
--- a/src/test/ui/issues/issue-51044.rs
+++ b/tests/ui/issues/issue-51044.rs
diff --git a/src/test/ui/issues/issue-51102.rs b/tests/ui/issues/issue-51102.rs
index 41446cd29..41446cd29 100644
--- a/src/test/ui/issues/issue-51102.rs
+++ b/tests/ui/issues/issue-51102.rs
diff --git a/src/test/ui/issues/issue-51102.stderr b/tests/ui/issues/issue-51102.stderr
index 09c52292d..09c52292d 100644
--- a/src/test/ui/issues/issue-51102.stderr
+++ b/tests/ui/issues/issue-51102.stderr
diff --git a/src/test/ui/issues/issue-51116.rs b/tests/ui/issues/issue-51116.rs
index 4c21cbfc6..4c21cbfc6 100644
--- a/src/test/ui/issues/issue-51116.rs
+++ b/tests/ui/issues/issue-51116.rs
diff --git a/src/test/ui/issues/issue-51116.stderr b/tests/ui/issues/issue-51116.stderr
index c07f8735e..c07f8735e 100644
--- a/src/test/ui/issues/issue-51116.stderr
+++ b/tests/ui/issues/issue-51116.stderr
diff --git a/src/test/ui/issues/issue-51154.rs b/tests/ui/issues/issue-51154.rs
index 12903f790..12903f790 100644
--- a/src/test/ui/issues/issue-51154.rs
+++ b/tests/ui/issues/issue-51154.rs
diff --git a/src/test/ui/issues/issue-51154.stderr b/tests/ui/issues/issue-51154.stderr
index 44ec626de..d8a833a86 100644
--- a/src/test/ui/issues/issue-51154.stderr
+++ b/tests/ui/issues/issue-51154.stderr
@@ -13,9 +13,6 @@ LL |     let _: Box<F> = Box::new(|| ());
    = help: every closure has a distinct type and so could not always match the caller-chosen type of parameter `F`
 note: associated function defined here
   --> $SRC_DIR/alloc/src/boxed.rs:LL:COL
-   |
-LL |     pub fn new(x: T) -> Self {
-   |            ^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-51515.rs b/tests/ui/issues/issue-51515.rs
index 797c1085d..797c1085d 100644
--- a/src/test/ui/issues/issue-51515.rs
+++ b/tests/ui/issues/issue-51515.rs
diff --git a/src/test/ui/issues/issue-51515.stderr b/tests/ui/issues/issue-51515.stderr
index 067bdef8b..c4e61e719 100644
--- a/src/test/ui/issues/issue-51515.stderr
+++ b/tests/ui/issues/issue-51515.stderr
@@ -1,11 +1,13 @@
 error[E0594]: cannot assign to `*foo`, which is behind a `&` reference
   --> $DIR/issue-51515.rs:5:5
    |
-LL |     let foo = &16;
-   |               --- help: consider changing this to be a mutable reference: `&mut 16`
-...
 LL |     *foo = 32;
    |     ^^^^^^^^^ `foo` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let foo = &mut 16;
+   |               ~~~~~~~
 
 error[E0594]: cannot assign to `*bar`, which is behind a `&` reference
   --> $DIR/issue-51515.rs:8:5
diff --git a/src/test/ui/issues/issue-5153.rs b/tests/ui/issues/issue-5153.rs
index 5bf057903..5bf057903 100644
--- a/src/test/ui/issues/issue-5153.rs
+++ b/tests/ui/issues/issue-5153.rs
diff --git a/src/test/ui/issues/issue-5153.stderr b/tests/ui/issues/issue-5153.stderr
index 93aaf4b9d..93aaf4b9d 100644
--- a/src/test/ui/issues/issue-5153.stderr
+++ b/tests/ui/issues/issue-5153.stderr
diff --git a/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.rs b/tests/ui/issues/issue-51632-try-desugar-incompatible-types.rs
index 35402dff6..35402dff6 100644
--- a/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.rs
+++ b/tests/ui/issues/issue-51632-try-desugar-incompatible-types.rs
diff --git a/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.stderr b/tests/ui/issues/issue-51632-try-desugar-incompatible-types.stderr
index cc0726bca..cc0726bca 100644
--- a/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.stderr
+++ b/tests/ui/issues/issue-51632-try-desugar-incompatible-types.stderr
diff --git a/src/test/ui/issues/issue-51655.rs b/tests/ui/issues/issue-51655.rs
index 36fd90dab..36fd90dab 100644
--- a/src/test/ui/issues/issue-51655.rs
+++ b/tests/ui/issues/issue-51655.rs
diff --git a/src/test/ui/issues/issue-51714.rs b/tests/ui/issues/issue-51714.rs
index 8716524d6..8716524d6 100644
--- a/src/test/ui/issues/issue-51714.rs
+++ b/tests/ui/issues/issue-51714.rs
diff --git a/src/test/ui/issues/issue-51714.stderr b/tests/ui/issues/issue-51714.stderr
index 514d69c1c..514d69c1c 100644
--- a/src/test/ui/issues/issue-51714.stderr
+++ b/tests/ui/issues/issue-51714.stderr
diff --git a/src/test/ui/issues/issue-51798.rs b/tests/ui/issues/issue-51798.rs
index b075809e9..b075809e9 100644
--- a/src/test/ui/issues/issue-51798.rs
+++ b/tests/ui/issues/issue-51798.rs
diff --git a/src/test/ui/issues/issue-51874.rs b/tests/ui/issues/issue-51874.rs
index d9d7e36b5..d9d7e36b5 100644
--- a/src/test/ui/issues/issue-51874.rs
+++ b/tests/ui/issues/issue-51874.rs
diff --git a/src/test/ui/issues/issue-51874.stderr b/tests/ui/issues/issue-51874.stderr
index b39159a65..b39159a65 100644
--- a/src/test/ui/issues/issue-51874.stderr
+++ b/tests/ui/issues/issue-51874.stderr
diff --git a/src/test/ui/issues/issue-51907.rs b/tests/ui/issues/issue-51907.rs
index 9378f4357..9378f4357 100644
--- a/src/test/ui/issues/issue-51907.rs
+++ b/tests/ui/issues/issue-51907.rs
diff --git a/src/test/ui/issues/issue-5192.rs b/tests/ui/issues/issue-5192.rs
index e2f835c19..e2f835c19 100644
--- a/src/test/ui/issues/issue-5192.rs
+++ b/tests/ui/issues/issue-5192.rs
diff --git a/src/test/ui/issues/issue-51947.rs b/tests/ui/issues/issue-51947.rs
index c877fb8ae..c877fb8ae 100644
--- a/src/test/ui/issues/issue-51947.rs
+++ b/tests/ui/issues/issue-51947.rs
diff --git a/src/test/ui/issues/issue-52049.rs b/tests/ui/issues/issue-52049.rs
index efdcc4493..efdcc4493 100644
--- a/src/test/ui/issues/issue-52049.rs
+++ b/tests/ui/issues/issue-52049.rs
diff --git a/src/test/ui/issues/issue-52049.stderr b/tests/ui/issues/issue-52049.stderr
index b25dbd1cb..b25dbd1cb 100644
--- a/src/test/ui/issues/issue-52049.stderr
+++ b/tests/ui/issues/issue-52049.stderr
diff --git a/src/test/ui/issues/issue-52126-assign-op-invariance.rs b/tests/ui/issues/issue-52126-assign-op-invariance.rs
index c96cfdf3c..c96cfdf3c 100644
--- a/src/test/ui/issues/issue-52126-assign-op-invariance.rs
+++ b/tests/ui/issues/issue-52126-assign-op-invariance.rs
diff --git a/src/test/ui/issues/issue-52126-assign-op-invariance.stderr b/tests/ui/issues/issue-52126-assign-op-invariance.stderr
index d45067577..d45067577 100644
--- a/src/test/ui/issues/issue-52126-assign-op-invariance.stderr
+++ b/tests/ui/issues/issue-52126-assign-op-invariance.stderr
diff --git a/src/test/ui/issues/issue-52140/auxiliary/some_crate.rs b/tests/ui/issues/issue-52140/auxiliary/some_crate.rs
index 087005849..087005849 100644
--- a/src/test/ui/issues/issue-52140/auxiliary/some_crate.rs
+++ b/tests/ui/issues/issue-52140/auxiliary/some_crate.rs
diff --git a/src/test/ui/issues/issue-52140/main.rs b/tests/ui/issues/issue-52140/main.rs
index aeac43404..aeac43404 100644
--- a/src/test/ui/issues/issue-52140/main.rs
+++ b/tests/ui/issues/issue-52140/main.rs
diff --git a/src/test/ui/issues/issue-52141/auxiliary/some_crate.rs b/tests/ui/issues/issue-52141/auxiliary/some_crate.rs
index 087005849..087005849 100644
--- a/src/test/ui/issues/issue-52141/auxiliary/some_crate.rs
+++ b/tests/ui/issues/issue-52141/auxiliary/some_crate.rs
diff --git a/src/test/ui/issues/issue-52141/main.rs b/tests/ui/issues/issue-52141/main.rs
index 7eea1726c..7eea1726c 100644
--- a/src/test/ui/issues/issue-52141/main.rs
+++ b/tests/ui/issues/issue-52141/main.rs
diff --git a/src/test/ui/issues/issue-52262.rs b/tests/ui/issues/issue-52262.rs
index 547643f0d..547643f0d 100644
--- a/src/test/ui/issues/issue-52262.rs
+++ b/tests/ui/issues/issue-52262.rs
diff --git a/src/test/ui/issues/issue-52262.stderr b/tests/ui/issues/issue-52262.stderr
index ef41f078b..ef41f078b 100644
--- a/src/test/ui/issues/issue-52262.stderr
+++ b/tests/ui/issues/issue-52262.stderr
diff --git a/src/test/ui/issues/issue-5239-1.rs b/tests/ui/issues/issue-5239-1.rs
index 708ae34c6..708ae34c6 100644
--- a/src/test/ui/issues/issue-5239-1.rs
+++ b/tests/ui/issues/issue-5239-1.rs
diff --git a/src/test/ui/issues/issue-5239-1.stderr b/tests/ui/issues/issue-5239-1.stderr
index f53ddb954..f53ddb954 100644
--- a/src/test/ui/issues/issue-5239-1.stderr
+++ b/tests/ui/issues/issue-5239-1.stderr
diff --git a/src/test/ui/issues/issue-5239-2.rs b/tests/ui/issues/issue-5239-2.rs
index b501c6e18..b501c6e18 100644
--- a/src/test/ui/issues/issue-5239-2.rs
+++ b/tests/ui/issues/issue-5239-2.rs
diff --git a/src/test/ui/issues/issue-52489.rs b/tests/ui/issues/issue-52489.rs
index 8efe21698..8efe21698 100644
--- a/src/test/ui/issues/issue-52489.rs
+++ b/tests/ui/issues/issue-52489.rs
diff --git a/src/test/ui/issues/issue-52489.stderr b/tests/ui/issues/issue-52489.stderr
index 842ebd196..842ebd196 100644
--- a/src/test/ui/issues/issue-52489.stderr
+++ b/tests/ui/issues/issue-52489.stderr
diff --git a/src/test/ui/issues/issue-52533.rs b/tests/ui/issues/issue-52533.rs
index bb9a1911f..bb9a1911f 100644
--- a/src/test/ui/issues/issue-52533.rs
+++ b/tests/ui/issues/issue-52533.rs
diff --git a/src/test/ui/issues/issue-52533.stderr b/tests/ui/issues/issue-52533.stderr
index c764736d7..c764736d7 100644
--- a/src/test/ui/issues/issue-52533.stderr
+++ b/tests/ui/issues/issue-52533.stderr
diff --git a/src/test/ui/issues/issue-52705/auxiliary/png2.rs b/tests/ui/issues/issue-52705/auxiliary/png2.rs
index fa9956e44..fa9956e44 100644
--- a/src/test/ui/issues/issue-52705/auxiliary/png2.rs
+++ b/tests/ui/issues/issue-52705/auxiliary/png2.rs
diff --git a/src/test/ui/issues/issue-52705/main.rs b/tests/ui/issues/issue-52705/main.rs
index 90bb8ca75..90bb8ca75 100644
--- a/src/test/ui/issues/issue-52705/main.rs
+++ b/tests/ui/issues/issue-52705/main.rs
diff --git a/src/test/ui/issues/issue-52717.rs b/tests/ui/issues/issue-52717.rs
index f83232a4a..f83232a4a 100644
--- a/src/test/ui/issues/issue-52717.rs
+++ b/tests/ui/issues/issue-52717.rs
diff --git a/src/test/ui/issues/issue-52717.stderr b/tests/ui/issues/issue-52717.stderr
index 468cdf2dc..468cdf2dc 100644
--- a/src/test/ui/issues/issue-52717.stderr
+++ b/tests/ui/issues/issue-52717.stderr
diff --git a/src/test/ui/issues/issue-5280.rs b/tests/ui/issues/issue-5280.rs
index 5c5ce6c98..5c5ce6c98 100644
--- a/src/test/ui/issues/issue-5280.rs
+++ b/tests/ui/issues/issue-5280.rs
diff --git a/src/test/ui/issues/issue-5315.rs b/tests/ui/issues/issue-5315.rs
index 0c121a5ee..0c121a5ee 100644
--- a/src/test/ui/issues/issue-5315.rs
+++ b/tests/ui/issues/issue-5315.rs
diff --git a/src/test/ui/issues/issue-5321-immediates-with-bare-self.rs b/tests/ui/issues/issue-5321-immediates-with-bare-self.rs
index 64aa2836a..64aa2836a 100644
--- a/src/test/ui/issues/issue-5321-immediates-with-bare-self.rs
+++ b/tests/ui/issues/issue-5321-immediates-with-bare-self.rs
diff --git a/src/test/ui/issues/issue-53251.rs b/tests/ui/issues/issue-53251.rs
index 240826a16..240826a16 100644
--- a/src/test/ui/issues/issue-53251.rs
+++ b/tests/ui/issues/issue-53251.rs
diff --git a/src/test/ui/issues/issue-53251.stderr b/tests/ui/issues/issue-53251.stderr
index cee9a5deb..cee9a5deb 100644
--- a/src/test/ui/issues/issue-53251.stderr
+++ b/tests/ui/issues/issue-53251.stderr
diff --git a/src/test/ui/issues/issue-53275.rs b/tests/ui/issues/issue-53275.rs
index 5ae6fb2d4..5ae6fb2d4 100644
--- a/src/test/ui/issues/issue-53275.rs
+++ b/tests/ui/issues/issue-53275.rs
diff --git a/src/test/ui/issues/issue-53300.rs b/tests/ui/issues/issue-53300.rs
index 09f0fe9d9..09f0fe9d9 100644
--- a/src/test/ui/issues/issue-53300.rs
+++ b/tests/ui/issues/issue-53300.rs
diff --git a/src/test/ui/issues/issue-53300.stderr b/tests/ui/issues/issue-53300.stderr
index 2fedef7d2..2fedef7d2 100644
--- a/src/test/ui/issues/issue-53300.stderr
+++ b/tests/ui/issues/issue-53300.stderr
diff --git a/src/test/ui/issues/issue-53333.rs b/tests/ui/issues/issue-53333.rs
index ccc9971f9..ccc9971f9 100644
--- a/src/test/ui/issues/issue-53333.rs
+++ b/tests/ui/issues/issue-53333.rs
diff --git a/src/test/ui/issues/issue-53348.rs b/tests/ui/issues/issue-53348.rs
index d2f8c77c0..d2f8c77c0 100644
--- a/src/test/ui/issues/issue-53348.rs
+++ b/tests/ui/issues/issue-53348.rs
diff --git a/src/test/ui/issues/issue-53348.stderr b/tests/ui/issues/issue-53348.stderr
index 71d9f5b3d..71d9f5b3d 100644
--- a/src/test/ui/issues/issue-53348.stderr
+++ b/tests/ui/issues/issue-53348.stderr
diff --git a/src/test/ui/issues/issue-53419.rs b/tests/ui/issues/issue-53419.rs
index 892ec66af..892ec66af 100644
--- a/src/test/ui/issues/issue-53419.rs
+++ b/tests/ui/issues/issue-53419.rs
diff --git a/src/test/ui/issues/issue-53498.rs b/tests/ui/issues/issue-53498.rs
index 9e0437c46..9e0437c46 100644
--- a/src/test/ui/issues/issue-53498.rs
+++ b/tests/ui/issues/issue-53498.rs
diff --git a/src/test/ui/issues/issue-53498.stderr b/tests/ui/issues/issue-53498.stderr
index b28fbff62..b28fbff62 100644
--- a/src/test/ui/issues/issue-53498.stderr
+++ b/tests/ui/issues/issue-53498.stderr
diff --git a/src/test/ui/issues/issue-53568.rs b/tests/ui/issues/issue-53568.rs
index 49ae444f9..49ae444f9 100644
--- a/src/test/ui/issues/issue-53568.rs
+++ b/tests/ui/issues/issue-53568.rs
diff --git a/src/test/ui/issues/issue-5358-1.rs b/tests/ui/issues/issue-5358-1.rs
index f5e32e78d..f5e32e78d 100644
--- a/src/test/ui/issues/issue-5358-1.rs
+++ b/tests/ui/issues/issue-5358-1.rs
diff --git a/src/test/ui/issues/issue-5358-1.stderr b/tests/ui/issues/issue-5358-1.stderr
index 9d5b8d9d3..9d5b8d9d3 100644
--- a/src/test/ui/issues/issue-5358-1.stderr
+++ b/tests/ui/issues/issue-5358-1.stderr
diff --git a/src/test/ui/issues/issue-53712.rs b/tests/ui/issues/issue-53712.rs
index 2353904d7..2353904d7 100644
--- a/src/test/ui/issues/issue-53712.rs
+++ b/tests/ui/issues/issue-53712.rs
diff --git a/src/test/ui/issues/issue-53712.stderr b/tests/ui/issues/issue-53712.stderr
index db85919af..db85919af 100644
--- a/src/test/ui/issues/issue-53712.stderr
+++ b/tests/ui/issues/issue-53712.stderr
diff --git a/src/test/ui/issues/issue-53728.rs b/tests/ui/issues/issue-53728.rs
index 77b5010f7..77b5010f7 100644
--- a/src/test/ui/issues/issue-53728.rs
+++ b/tests/ui/issues/issue-53728.rs
diff --git a/src/test/ui/issues/issue-53843.rs b/tests/ui/issues/issue-53843.rs
index f305b370c..f305b370c 100644
--- a/src/test/ui/issues/issue-53843.rs
+++ b/tests/ui/issues/issue-53843.rs
diff --git a/src/test/ui/issues/issue-54044.rs b/tests/ui/issues/issue-54044.rs
index 809ea7a87..809ea7a87 100644
--- a/src/test/ui/issues/issue-54044.rs
+++ b/tests/ui/issues/issue-54044.rs
diff --git a/src/test/ui/issues/issue-54044.stderr b/tests/ui/issues/issue-54044.stderr
index 8bd94a041..8bd94a041 100644
--- a/src/test/ui/issues/issue-54044.stderr
+++ b/tests/ui/issues/issue-54044.stderr
diff --git a/src/test/ui/issues/issue-54062.rs b/tests/ui/issues/issue-54062.rs
index 093d6601d..093d6601d 100644
--- a/src/test/ui/issues/issue-54062.rs
+++ b/tests/ui/issues/issue-54062.rs
diff --git a/src/test/ui/issues/issue-54062.stderr b/tests/ui/issues/issue-54062.stderr
index 5361ee1d3..5361ee1d3 100644
--- a/src/test/ui/issues/issue-54062.stderr
+++ b/tests/ui/issues/issue-54062.stderr
diff --git a/src/test/ui/issues/issue-54094.rs b/tests/ui/issues/issue-54094.rs
index ec38dc40e..ec38dc40e 100644
--- a/src/test/ui/issues/issue-54094.rs
+++ b/tests/ui/issues/issue-54094.rs
diff --git a/src/test/ui/issues/issue-54302-cases.rs b/tests/ui/issues/issue-54302-cases.rs
index faa116269..faa116269 100644
--- a/src/test/ui/issues/issue-54302-cases.rs
+++ b/tests/ui/issues/issue-54302-cases.rs
diff --git a/src/test/ui/issues/issue-54302-cases.stderr b/tests/ui/issues/issue-54302-cases.stderr
index 6e8b69c4b..6e8b69c4b 100644
--- a/src/test/ui/issues/issue-54302-cases.stderr
+++ b/tests/ui/issues/issue-54302-cases.stderr
diff --git a/src/test/ui/issues/issue-54302.rs b/tests/ui/issues/issue-54302.rs
index 1bfaebc38..1bfaebc38 100644
--- a/src/test/ui/issues/issue-54302.rs
+++ b/tests/ui/issues/issue-54302.rs
diff --git a/src/test/ui/issues/issue-54302.stderr b/tests/ui/issues/issue-54302.stderr
index 26c46571f..26c46571f 100644
--- a/src/test/ui/issues/issue-54302.stderr
+++ b/tests/ui/issues/issue-54302.stderr
diff --git a/src/test/ui/issues/issue-5439.rs b/tests/ui/issues/issue-5439.rs
index 852b264dc..852b264dc 100644
--- a/src/test/ui/issues/issue-5439.rs
+++ b/tests/ui/issues/issue-5439.rs
diff --git a/src/test/ui/issues/issue-5439.stderr b/tests/ui/issues/issue-5439.stderr
index dc8f8b878..dc8f8b878 100644
--- a/src/test/ui/issues/issue-5439.stderr
+++ b/tests/ui/issues/issue-5439.stderr
diff --git a/src/test/ui/issues/issue-54410.rs b/tests/ui/issues/issue-54410.rs
index e3e8ca985..e3e8ca985 100644
--- a/src/test/ui/issues/issue-54410.rs
+++ b/tests/ui/issues/issue-54410.rs
diff --git a/src/test/ui/issues/issue-54410.stderr b/tests/ui/issues/issue-54410.stderr
index 516c59afb..516c59afb 100644
--- a/src/test/ui/issues/issue-54410.stderr
+++ b/tests/ui/issues/issue-54410.stderr
diff --git a/src/test/ui/issues/issue-54462-mutable-noalias-correctness.rs b/tests/ui/issues/issue-54462-mutable-noalias-correctness.rs
index 412028bdc..412028bdc 100644
--- a/src/test/ui/issues/issue-54462-mutable-noalias-correctness.rs
+++ b/tests/ui/issues/issue-54462-mutable-noalias-correctness.rs
diff --git a/src/test/ui/issues/issue-54477-reduced-2.rs b/tests/ui/issues/issue-54477-reduced-2.rs
index 199d69b45..199d69b45 100644
--- a/src/test/ui/issues/issue-54477-reduced-2.rs
+++ b/tests/ui/issues/issue-54477-reduced-2.rs
diff --git a/src/test/ui/issues/issue-54582.rs b/tests/ui/issues/issue-54582.rs
index 8c50cac67..8c50cac67 100644
--- a/src/test/ui/issues/issue-54582.rs
+++ b/tests/ui/issues/issue-54582.rs
diff --git a/src/test/ui/issues/issue-54696.rs b/tests/ui/issues/issue-54696.rs
index 15355d30d..15355d30d 100644
--- a/src/test/ui/issues/issue-54696.rs
+++ b/tests/ui/issues/issue-54696.rs
diff --git a/src/test/ui/issues/issue-5518.rs b/tests/ui/issues/issue-5518.rs
index 97ed9ef30..97ed9ef30 100644
--- a/src/test/ui/issues/issue-5518.rs
+++ b/tests/ui/issues/issue-5518.rs
diff --git a/src/test/ui/issues/issue-5521.rs b/tests/ui/issues/issue-5521.rs
index cafdbc399..cafdbc399 100644
--- a/src/test/ui/issues/issue-5521.rs
+++ b/tests/ui/issues/issue-5521.rs
diff --git a/src/test/ui/issues/issue-55376.rs b/tests/ui/issues/issue-55376.rs
index 4adff2b45..4adff2b45 100644
--- a/src/test/ui/issues/issue-55376.rs
+++ b/tests/ui/issues/issue-55376.rs
diff --git a/src/test/ui/issues/issue-55380.rs b/tests/ui/issues/issue-55380.rs
index f7cb296d3..f7cb296d3 100644
--- a/src/test/ui/issues/issue-55380.rs
+++ b/tests/ui/issues/issue-55380.rs
diff --git a/src/test/ui/issues/issue-55380.stderr b/tests/ui/issues/issue-55380.stderr
index 403844c72..403844c72 100644
--- a/src/test/ui/issues/issue-55380.stderr
+++ b/tests/ui/issues/issue-55380.stderr
diff --git a/src/test/ui/issues/issue-5550.rs b/tests/ui/issues/issue-5550.rs
index 6ea24747b..6ea24747b 100644
--- a/src/test/ui/issues/issue-5550.rs
+++ b/tests/ui/issues/issue-5550.rs
diff --git a/src/test/ui/issues/issue-5554.rs b/tests/ui/issues/issue-5554.rs
index 7737536f4..7737536f4 100644
--- a/src/test/ui/issues/issue-5554.rs
+++ b/tests/ui/issues/issue-5554.rs
diff --git a/src/test/ui/issues/issue-55587.rs b/tests/ui/issues/issue-55587.rs
index d9100cf55..d9100cf55 100644
--- a/src/test/ui/issues/issue-55587.rs
+++ b/tests/ui/issues/issue-55587.rs
diff --git a/src/test/ui/issues/issue-55587.stderr b/tests/ui/issues/issue-55587.stderr
index faf78cfe8..faf78cfe8 100644
--- a/src/test/ui/issues/issue-55587.stderr
+++ b/tests/ui/issues/issue-55587.stderr
diff --git a/src/test/ui/issues/issue-5572.rs b/tests/ui/issues/issue-5572.rs
index 175dc879d..175dc879d 100644
--- a/src/test/ui/issues/issue-5572.rs
+++ b/tests/ui/issues/issue-5572.rs
diff --git a/src/test/ui/issues/issue-55731.rs b/tests/ui/issues/issue-55731.rs
index 7b4f4e2cd..7b4f4e2cd 100644
--- a/src/test/ui/issues/issue-55731.rs
+++ b/tests/ui/issues/issue-55731.rs
diff --git a/src/test/ui/issues/issue-55731.stderr b/tests/ui/issues/issue-55731.stderr
index 97fd6678c..97fd6678c 100644
--- a/src/test/ui/issues/issue-55731.stderr
+++ b/tests/ui/issues/issue-55731.stderr
diff --git a/src/test/ui/issues/issue-56128.rs b/tests/ui/issues/issue-56128.rs
index 10b50943c..10b50943c 100644
--- a/src/test/ui/issues/issue-56128.rs
+++ b/tests/ui/issues/issue-56128.rs
diff --git a/src/test/ui/issues/issue-56175.rs b/tests/ui/issues/issue-56175.rs
index ca1d0d431..ca1d0d431 100644
--- a/src/test/ui/issues/issue-56175.rs
+++ b/tests/ui/issues/issue-56175.rs
diff --git a/src/test/ui/issues/issue-56175.stderr b/tests/ui/issues/issue-56175.stderr
index 013a440ed..013a440ed 100644
--- a/src/test/ui/issues/issue-56175.stderr
+++ b/tests/ui/issues/issue-56175.stderr
diff --git a/src/test/ui/issues/issue-56199.rs b/tests/ui/issues/issue-56199.rs
index ba11582a9..ba11582a9 100644
--- a/src/test/ui/issues/issue-56199.rs
+++ b/tests/ui/issues/issue-56199.rs
diff --git a/src/test/ui/issues/issue-56199.stderr b/tests/ui/issues/issue-56199.stderr
index 7aaf8e4ac..7aaf8e4ac 100644
--- a/src/test/ui/issues/issue-56199.stderr
+++ b/tests/ui/issues/issue-56199.stderr
diff --git a/src/test/ui/issues/issue-56229.rs b/tests/ui/issues/issue-56229.rs
index 9e5897b98..9e5897b98 100644
--- a/src/test/ui/issues/issue-56229.rs
+++ b/tests/ui/issues/issue-56229.rs
diff --git a/src/test/ui/issues/issue-56237.rs b/tests/ui/issues/issue-56237.rs
index 534b85ace..534b85ace 100644
--- a/src/test/ui/issues/issue-56237.rs
+++ b/tests/ui/issues/issue-56237.rs
diff --git a/src/test/ui/issues/issue-5666.rs b/tests/ui/issues/issue-5666.rs
index 810895b1b..810895b1b 100644
--- a/src/test/ui/issues/issue-5666.rs
+++ b/tests/ui/issues/issue-5666.rs
diff --git a/src/test/ui/issues/issue-56806.rs b/tests/ui/issues/issue-56806.rs
index b1dac26d6..b1dac26d6 100644
--- a/src/test/ui/issues/issue-56806.rs
+++ b/tests/ui/issues/issue-56806.rs
diff --git a/src/test/ui/issues/issue-56806.stderr b/tests/ui/issues/issue-56806.stderr
index f164fd0c5..f164fd0c5 100644
--- a/src/test/ui/issues/issue-56806.stderr
+++ b/tests/ui/issues/issue-56806.stderr
diff --git a/src/test/ui/issues/issue-56835.rs b/tests/ui/issues/issue-56835.rs
index 7132d15ee..7132d15ee 100644
--- a/src/test/ui/issues/issue-56835.rs
+++ b/tests/ui/issues/issue-56835.rs
diff --git a/src/test/ui/issues/issue-56835.stderr b/tests/ui/issues/issue-56835.stderr
index e949ae7b3..e949ae7b3 100644
--- a/src/test/ui/issues/issue-56835.stderr
+++ b/tests/ui/issues/issue-56835.stderr
diff --git a/src/test/ui/issues/issue-56870.rs b/tests/ui/issues/issue-56870.rs
index 137a0ede0..137a0ede0 100644
--- a/src/test/ui/issues/issue-56870.rs
+++ b/tests/ui/issues/issue-56870.rs
diff --git a/src/test/ui/issues/issue-5688.rs b/tests/ui/issues/issue-5688.rs
index b6e364c2f..b6e364c2f 100644
--- a/src/test/ui/issues/issue-5688.rs
+++ b/tests/ui/issues/issue-5688.rs
diff --git a/src/test/ui/issues/issue-56943.rs b/tests/ui/issues/issue-56943.rs
index 8fc77abdb..8fc77abdb 100644
--- a/src/test/ui/issues/issue-56943.rs
+++ b/tests/ui/issues/issue-56943.rs
diff --git a/src/test/ui/issues/issue-56943.stderr b/tests/ui/issues/issue-56943.stderr
index 74ed5ec0f..74ed5ec0f 100644
--- a/src/test/ui/issues/issue-56943.stderr
+++ b/tests/ui/issues/issue-56943.stderr
diff --git a/src/test/ui/issues/issue-5708.rs b/tests/ui/issues/issue-5708.rs
index 6fe9943d3..6fe9943d3 100644
--- a/src/test/ui/issues/issue-5708.rs
+++ b/tests/ui/issues/issue-5708.rs
diff --git a/src/test/ui/issues/issue-57156.rs b/tests/ui/issues/issue-57156.rs
index 9f5ec9f27..9f5ec9f27 100644
--- a/src/test/ui/issues/issue-57156.rs
+++ b/tests/ui/issues/issue-57156.rs
diff --git a/src/test/ui/issues/issue-57162.rs b/tests/ui/issues/issue-57162.rs
index 650700602..650700602 100644
--- a/src/test/ui/issues/issue-57162.rs
+++ b/tests/ui/issues/issue-57162.rs
diff --git a/src/test/ui/issues/issue-5718.rs b/tests/ui/issues/issue-5718.rs
index f29a1e2a0..f29a1e2a0 100644
--- a/src/test/ui/issues/issue-5718.rs
+++ b/tests/ui/issues/issue-5718.rs
diff --git a/src/test/ui/issues/issue-57198-pass.rs b/tests/ui/issues/issue-57198-pass.rs
index 3857def98..3857def98 100644
--- a/src/test/ui/issues/issue-57198-pass.rs
+++ b/tests/ui/issues/issue-57198-pass.rs
diff --git a/src/test/ui/issues/issue-57271.rs b/tests/ui/issues/issue-57271.rs
index f74222e3e..f74222e3e 100644
--- a/src/test/ui/issues/issue-57271.rs
+++ b/tests/ui/issues/issue-57271.rs
diff --git a/src/test/ui/issues/issue-57271.stderr b/tests/ui/issues/issue-57271.stderr
index 391e69c91..391e69c91 100644
--- a/src/test/ui/issues/issue-57271.stderr
+++ b/tests/ui/issues/issue-57271.stderr
diff --git a/src/test/ui/issues/issue-57362-1.rs b/tests/ui/issues/issue-57362-1.rs
index 1fa417fe9..1fa417fe9 100644
--- a/src/test/ui/issues/issue-57362-1.rs
+++ b/tests/ui/issues/issue-57362-1.rs
diff --git a/src/test/ui/issues/issue-57362-1.stderr b/tests/ui/issues/issue-57362-1.stderr
index b10273f14..b10273f14 100644
--- a/src/test/ui/issues/issue-57362-1.stderr
+++ b/tests/ui/issues/issue-57362-1.stderr
diff --git a/src/test/ui/issues/issue-57362-2.rs b/tests/ui/issues/issue-57362-2.rs
index a0b0ea1d0..a0b0ea1d0 100644
--- a/src/test/ui/issues/issue-57362-2.rs
+++ b/tests/ui/issues/issue-57362-2.rs
diff --git a/src/test/ui/issues/issue-57362-2.stderr b/tests/ui/issues/issue-57362-2.stderr
index 7d08c4643..7d08c4643 100644
--- a/src/test/ui/issues/issue-57362-2.stderr
+++ b/tests/ui/issues/issue-57362-2.stderr
diff --git a/src/test/ui/issues/issue-57399-self-return-impl-trait.rs b/tests/ui/issues/issue-57399-self-return-impl-trait.rs
index c7fe40e7b..c7fe40e7b 100644
--- a/src/test/ui/issues/issue-57399-self-return-impl-trait.rs
+++ b/tests/ui/issues/issue-57399-self-return-impl-trait.rs
diff --git a/src/test/ui/issues/issue-5741.rs b/tests/ui/issues/issue-5741.rs
index b9eaf0be7..b9eaf0be7 100644
--- a/src/test/ui/issues/issue-5741.rs
+++ b/tests/ui/issues/issue-5741.rs
diff --git a/src/test/ui/issues/issue-5754.rs b/tests/ui/issues/issue-5754.rs
index d90816635..d90816635 100644
--- a/src/test/ui/issues/issue-5754.rs
+++ b/tests/ui/issues/issue-5754.rs
diff --git a/src/test/ui/issues/issue-57741-1.rs b/tests/ui/issues/issue-57741-1.rs
index d0aae23b2..d0aae23b2 100644
--- a/src/test/ui/issues/issue-57741-1.rs
+++ b/tests/ui/issues/issue-57741-1.rs
diff --git a/src/test/ui/issues/issue-57741-1.stderr b/tests/ui/issues/issue-57741-1.stderr
index 789a1f44d..789a1f44d 100644
--- a/src/test/ui/issues/issue-57741-1.stderr
+++ b/tests/ui/issues/issue-57741-1.stderr
diff --git a/src/test/ui/issues/issue-57741.fixed b/tests/ui/issues/issue-57741.fixed
index 4cae08003..4cae08003 100644
--- a/src/test/ui/issues/issue-57741.fixed
+++ b/tests/ui/issues/issue-57741.fixed
diff --git a/src/test/ui/issues/issue-57741.rs b/tests/ui/issues/issue-57741.rs
index e2658295a..e2658295a 100644
--- a/src/test/ui/issues/issue-57741.rs
+++ b/tests/ui/issues/issue-57741.rs
diff --git a/src/test/ui/issues/issue-57741.stderr b/tests/ui/issues/issue-57741.stderr
index cd277f20e..cd277f20e 100644
--- a/src/test/ui/issues/issue-57741.stderr
+++ b/tests/ui/issues/issue-57741.stderr
diff --git a/src/test/ui/issues/issue-57781.rs b/tests/ui/issues/issue-57781.rs
index f5015aaf5..f5015aaf5 100644
--- a/src/test/ui/issues/issue-57781.rs
+++ b/tests/ui/issues/issue-57781.rs
diff --git a/src/test/ui/issues/issue-57924.rs b/tests/ui/issues/issue-57924.rs
index 8846912a8..8846912a8 100644
--- a/src/test/ui/issues/issue-57924.rs
+++ b/tests/ui/issues/issue-57924.rs
diff --git a/src/test/ui/issues/issue-57924.stderr b/tests/ui/issues/issue-57924.stderr
index 0323a4dfb..0323a4dfb 100644
--- a/src/test/ui/issues/issue-57924.stderr
+++ b/tests/ui/issues/issue-57924.stderr
diff --git a/src/test/ui/issues/issue-58212.rs b/tests/ui/issues/issue-58212.rs
index 4695497c3..4695497c3 100644
--- a/src/test/ui/issues/issue-58212.rs
+++ b/tests/ui/issues/issue-58212.rs
diff --git a/src/test/ui/issues/issue-58344.rs b/tests/ui/issues/issue-58344.rs
index 0cb04dcb2..0cb04dcb2 100644
--- a/src/test/ui/issues/issue-58344.rs
+++ b/tests/ui/issues/issue-58344.rs
diff --git a/src/test/ui/issues/issue-58375-monomorphize-default-impls.rs b/tests/ui/issues/issue-58375-monomorphize-default-impls.rs
index 6da6f398d..6da6f398d 100644
--- a/src/test/ui/issues/issue-58375-monomorphize-default-impls.rs
+++ b/tests/ui/issues/issue-58375-monomorphize-default-impls.rs
diff --git a/src/test/ui/issues/issue-5844.mir.stderr b/tests/ui/issues/issue-5844.mir.stderr
index 6134d6889..6134d6889 100644
--- a/src/test/ui/issues/issue-5844.mir.stderr
+++ b/tests/ui/issues/issue-5844.mir.stderr
diff --git a/src/test/ui/issues/issue-5844.rs b/tests/ui/issues/issue-5844.rs
index 4f90a9c66..4f90a9c66 100644
--- a/src/test/ui/issues/issue-5844.rs
+++ b/tests/ui/issues/issue-5844.rs
diff --git a/src/test/ui/issues/issue-5844.thir.stderr b/tests/ui/issues/issue-5844.thir.stderr
index 310a2b593..310a2b593 100644
--- a/src/test/ui/issues/issue-5844.thir.stderr
+++ b/tests/ui/issues/issue-5844.thir.stderr
diff --git a/src/test/ui/issues/issue-58463.rs b/tests/ui/issues/issue-58463.rs
index af93f7622..af93f7622 100644
--- a/src/test/ui/issues/issue-58463.rs
+++ b/tests/ui/issues/issue-58463.rs
diff --git a/src/test/ui/issues/issue-58712.rs b/tests/ui/issues/issue-58712.rs
index 930bec688..930bec688 100644
--- a/src/test/ui/issues/issue-58712.rs
+++ b/tests/ui/issues/issue-58712.rs
diff --git a/tests/ui/issues/issue-58712.stderr b/tests/ui/issues/issue-58712.stderr
new file mode 100644
index 000000000..f4bd4d1e8
--- /dev/null
+++ b/tests/ui/issues/issue-58712.stderr
@@ -0,0 +1,20 @@
+error[E0412]: cannot find type `DeviceId` in this scope
+  --> $DIR/issue-58712.rs:6:20
+   |
+LL | impl<H> AddrVec<H, DeviceId> {
+   |                    ^^^^^^^^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+LL | impl<H, DeviceId> AddrVec<H, DeviceId> {
+   |       ++++++++++
+
+error[E0412]: cannot find type `DeviceId` in this scope
+  --> $DIR/issue-58712.rs:8:29
+   |
+LL |     pub fn device(&self) -> DeviceId {
+   |                             ^^^^^^^^ not found in this scope
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/issues/issue-58734.rs b/tests/ui/issues/issue-58734.rs
index c838fde5d..c838fde5d 100644
--- a/src/test/ui/issues/issue-58734.rs
+++ b/tests/ui/issues/issue-58734.rs
diff --git a/src/test/ui/issues/issue-58734.stderr b/tests/ui/issues/issue-58734.stderr
index d2314626d..d2314626d 100644
--- a/src/test/ui/issues/issue-58734.stderr
+++ b/tests/ui/issues/issue-58734.stderr
diff --git a/src/test/ui/issues/issue-5883.rs b/tests/ui/issues/issue-5883.rs
index 82866b355..82866b355 100644
--- a/src/test/ui/issues/issue-5883.rs
+++ b/tests/ui/issues/issue-5883.rs
diff --git a/src/test/ui/issues/issue-5883.stderr b/tests/ui/issues/issue-5883.stderr
index 8a20a6085..ffff403e0 100644
--- a/src/test/ui/issues/issue-5883.stderr
+++ b/tests/ui/issues/issue-5883.stderr
@@ -6,6 +6,10 @@ LL |     r: dyn A + 'static
    |
    = help: the trait `Sized` is not implemented for `(dyn A + 'static)`
    = help: unsized fn params are gated as an unstable feature
+help: you can use `impl Trait` as the argument type
+   |
+LL |     r: impl A + 'static
+   |        ~~~~
 help: function arguments must have a statically known size, borrowed types always have a known size
    |
 LL |     r: &dyn A + 'static
diff --git a/src/test/ui/issues/issue-5884.rs b/tests/ui/issues/issue-5884.rs
index 991c52321..991c52321 100644
--- a/src/test/ui/issues/issue-5884.rs
+++ b/tests/ui/issues/issue-5884.rs
diff --git a/src/test/ui/issues/issue-58857.rs b/tests/ui/issues/issue-58857.rs
index 4350d7e5b..4350d7e5b 100644
--- a/src/test/ui/issues/issue-58857.rs
+++ b/tests/ui/issues/issue-58857.rs
diff --git a/src/test/ui/issues/issue-58857.stderr b/tests/ui/issues/issue-58857.stderr
index e2acec47e..e2acec47e 100644
--- a/src/test/ui/issues/issue-58857.stderr
+++ b/tests/ui/issues/issue-58857.stderr
diff --git a/src/test/ui/issues/issue-5900.rs b/tests/ui/issues/issue-5900.rs
index a7dc0eff4..a7dc0eff4 100644
--- a/src/test/ui/issues/issue-5900.rs
+++ b/tests/ui/issues/issue-5900.rs
diff --git a/src/test/ui/issues/issue-59020.rs b/tests/ui/issues/issue-59020.rs
index a2b11764a..a2b11764a 100644
--- a/src/test/ui/issues/issue-59020.rs
+++ b/tests/ui/issues/issue-59020.rs
diff --git a/src/test/ui/issues/issue-5917.rs b/tests/ui/issues/issue-5917.rs
index 6ab7081cf..6ab7081cf 100644
--- a/src/test/ui/issues/issue-5917.rs
+++ b/tests/ui/issues/issue-5917.rs
diff --git a/src/test/ui/issues/issue-59326.rs b/tests/ui/issues/issue-59326.rs
index c0e883774..c0e883774 100644
--- a/src/test/ui/issues/issue-59326.rs
+++ b/tests/ui/issues/issue-59326.rs
diff --git a/src/test/ui/issues/issue-59488.rs b/tests/ui/issues/issue-59488.rs
index 384501e3e..384501e3e 100644
--- a/src/test/ui/issues/issue-59488.rs
+++ b/tests/ui/issues/issue-59488.rs
diff --git a/src/test/ui/issues/issue-59488.stderr b/tests/ui/issues/issue-59488.stderr
index f9846b62a..f9846b62a 100644
--- a/src/test/ui/issues/issue-59488.stderr
+++ b/tests/ui/issues/issue-59488.stderr
diff --git a/src/test/ui/issues/issue-59494.rs b/tests/ui/issues/issue-59494.rs
index a53e28f72..a53e28f72 100644
--- a/src/test/ui/issues/issue-59494.rs
+++ b/tests/ui/issues/issue-59494.rs
diff --git a/src/test/ui/issues/issue-59494.stderr b/tests/ui/issues/issue-59494.stderr
index a9284535e..a9284535e 100644
--- a/src/test/ui/issues/issue-59494.stderr
+++ b/tests/ui/issues/issue-59494.stderr
diff --git a/src/test/ui/issues/issue-5950.rs b/tests/ui/issues/issue-5950.rs
index 492a9d572..492a9d572 100644
--- a/src/test/ui/issues/issue-5950.rs
+++ b/tests/ui/issues/issue-5950.rs
diff --git a/src/test/ui/issues/issue-59756.fixed b/tests/ui/issues/issue-59756.fixed
index 7b55d0f17..7b55d0f17 100644
--- a/src/test/ui/issues/issue-59756.fixed
+++ b/tests/ui/issues/issue-59756.fixed
diff --git a/src/test/ui/issues/issue-59756.rs b/tests/ui/issues/issue-59756.rs
index d6df0592b..d6df0592b 100644
--- a/src/test/ui/issues/issue-59756.rs
+++ b/tests/ui/issues/issue-59756.rs
diff --git a/src/test/ui/issues/issue-59756.stderr b/tests/ui/issues/issue-59756.stderr
index 9066e57aa..9066e57aa 100644
--- a/src/test/ui/issues/issue-59756.stderr
+++ b/tests/ui/issues/issue-59756.stderr
diff --git a/src/test/ui/issues/issue-5988.rs b/tests/ui/issues/issue-5988.rs
index 303fb4fbc..303fb4fbc 100644
--- a/src/test/ui/issues/issue-5988.rs
+++ b/tests/ui/issues/issue-5988.rs
diff --git a/src/test/ui/issues/issue-5997-enum.rs b/tests/ui/issues/issue-5997-enum.rs
index 3ff4e036c..3ff4e036c 100644
--- a/src/test/ui/issues/issue-5997-enum.rs
+++ b/tests/ui/issues/issue-5997-enum.rs
diff --git a/src/test/ui/issues/issue-5997-enum.stderr b/tests/ui/issues/issue-5997-enum.stderr
index 3a79215d3..3a79215d3 100644
--- a/src/test/ui/issues/issue-5997-enum.stderr
+++ b/tests/ui/issues/issue-5997-enum.stderr
diff --git a/src/test/ui/issues/issue-5997-struct.rs b/tests/ui/issues/issue-5997-struct.rs
index 6cf510b0a..6cf510b0a 100644
--- a/src/test/ui/issues/issue-5997-struct.rs
+++ b/tests/ui/issues/issue-5997-struct.rs
diff --git a/src/test/ui/issues/issue-5997-struct.stderr b/tests/ui/issues/issue-5997-struct.stderr
index d2e97f767..d2e97f767 100644
--- a/src/test/ui/issues/issue-5997-struct.stderr
+++ b/tests/ui/issues/issue-5997-struct.stderr
diff --git a/src/test/ui/issues/issue-5997.rs b/tests/ui/issues/issue-5997.rs
index 145e3a792..145e3a792 100644
--- a/src/test/ui/issues/issue-5997.rs
+++ b/tests/ui/issues/issue-5997.rs
diff --git a/src/test/ui/issues/issue-60218.rs b/tests/ui/issues/issue-60218.rs
index 4926691f3..4926691f3 100644
--- a/src/test/ui/issues/issue-60218.rs
+++ b/tests/ui/issues/issue-60218.rs
diff --git a/src/test/ui/issues/issue-60218.stderr b/tests/ui/issues/issue-60218.stderr
index dd72b6515..dd72b6515 100644
--- a/src/test/ui/issues/issue-60218.stderr
+++ b/tests/ui/issues/issue-60218.stderr
diff --git a/src/test/ui/issues/issue-60622.rs b/tests/ui/issues/issue-60622.rs
index 8e230c615..8e230c615 100644
--- a/src/test/ui/issues/issue-60622.rs
+++ b/tests/ui/issues/issue-60622.rs
diff --git a/src/test/ui/issues/issue-60622.stderr b/tests/ui/issues/issue-60622.stderr
index ecf1ae758..ecf1ae758 100644
--- a/src/test/ui/issues/issue-60622.stderr
+++ b/tests/ui/issues/issue-60622.stderr
diff --git a/src/test/ui/issues/issue-60989.rs b/tests/ui/issues/issue-60989.rs
index 29db3fdb4..29db3fdb4 100644
--- a/src/test/ui/issues/issue-60989.rs
+++ b/tests/ui/issues/issue-60989.rs
diff --git a/src/test/ui/issues/issue-60989.stderr b/tests/ui/issues/issue-60989.stderr
index e0236567b..e0236567b 100644
--- a/src/test/ui/issues/issue-60989.stderr
+++ b/tests/ui/issues/issue-60989.stderr
diff --git a/src/test/ui/issues/issue-61106.rs b/tests/ui/issues/issue-61106.rs
index 308ef1de3..308ef1de3 100644
--- a/src/test/ui/issues/issue-61106.rs
+++ b/tests/ui/issues/issue-61106.rs
diff --git a/src/test/ui/issues/issue-61106.stderr b/tests/ui/issues/issue-61106.stderr
index 2bc092341..2bc092341 100644
--- a/src/test/ui/issues/issue-61106.stderr
+++ b/tests/ui/issues/issue-61106.stderr
diff --git a/src/test/ui/issues/issue-61108.rs b/tests/ui/issues/issue-61108.rs
index 0a883b958..0a883b958 100644
--- a/src/test/ui/issues/issue-61108.rs
+++ b/tests/ui/issues/issue-61108.rs
diff --git a/src/test/ui/issues/issue-61108.stderr b/tests/ui/issues/issue-61108.stderr
index e5b671d7b..3aaf5fb3f 100644
--- a/src/test/ui/issues/issue-61108.stderr
+++ b/tests/ui/issues/issue-61108.stderr
@@ -9,11 +9,8 @@ LL |     for l in bad_letters {
 LL |     bad_letters.push('s');
    |     ^^^^^^^^^^^^^^^^^^^^^ value borrowed here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `bad_letters`
+note: `into_iter` takes ownership of the receiver `self`, which moves `bad_letters`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
 help: consider iterating over a slice of the `Vec<char>`'s content to avoid moving into the `for` loop
    |
 LL |     for l in &bad_letters {
diff --git a/src/test/ui/issues/issue-6117.rs b/tests/ui/issues/issue-6117.rs
index 5235d53d8..5235d53d8 100644
--- a/src/test/ui/issues/issue-6117.rs
+++ b/tests/ui/issues/issue-6117.rs
diff --git a/src/test/ui/issues/issue-6130.rs b/tests/ui/issues/issue-6130.rs
index a33ea6869..a33ea6869 100644
--- a/src/test/ui/issues/issue-6130.rs
+++ b/tests/ui/issues/issue-6130.rs
diff --git a/src/test/ui/issues/issue-61475.rs b/tests/ui/issues/issue-61475.rs
index 680449c9e..680449c9e 100644
--- a/src/test/ui/issues/issue-61475.rs
+++ b/tests/ui/issues/issue-61475.rs
diff --git a/src/test/ui/issues/issue-6153.rs b/tests/ui/issues/issue-6153.rs
index 25f026f21..25f026f21 100644
--- a/src/test/ui/issues/issue-6153.rs
+++ b/tests/ui/issues/issue-6153.rs
diff --git a/src/test/ui/issues/issue-61623.rs b/tests/ui/issues/issue-61623.rs
index 82df50d9d..82df50d9d 100644
--- a/src/test/ui/issues/issue-61623.rs
+++ b/tests/ui/issues/issue-61623.rs
diff --git a/tests/ui/issues/issue-61623.stderr b/tests/ui/issues/issue-61623.stderr
new file mode 100644
index 000000000..5fcc33855
--- /dev/null
+++ b/tests/ui/issues/issue-61623.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `*x.1` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-61623.rs:6:19
+   |
+LL |     f2(|| x.0, f1(x.1))
+   |                   ^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn f3<'a>(x: &'a mut ((), &'a mut ())) {
+   |              ~~~~~~~~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/issues/issue-61696.rs b/tests/ui/issues/issue-61696.rs
index dca52927f..dca52927f 100644
--- a/src/test/ui/issues/issue-61696.rs
+++ b/tests/ui/issues/issue-61696.rs
diff --git a/src/test/ui/issues/issue-61894.rs b/tests/ui/issues/issue-61894.rs
index 776fdbb74..776fdbb74 100644
--- a/src/test/ui/issues/issue-61894.rs
+++ b/tests/ui/issues/issue-61894.rs
diff --git a/src/test/ui/issues/issue-62375.rs b/tests/ui/issues/issue-62375.rs
index a2c8fe551..a2c8fe551 100644
--- a/src/test/ui/issues/issue-62375.rs
+++ b/tests/ui/issues/issue-62375.rs
diff --git a/src/test/ui/issues/issue-62375.stderr b/tests/ui/issues/issue-62375.stderr
index 478e025be..478e025be 100644
--- a/src/test/ui/issues/issue-62375.stderr
+++ b/tests/ui/issues/issue-62375.stderr
diff --git a/src/test/ui/issues/issue-62480.rs b/tests/ui/issues/issue-62480.rs
index 94a9c2ab8..94a9c2ab8 100644
--- a/src/test/ui/issues/issue-62480.rs
+++ b/tests/ui/issues/issue-62480.rs
diff --git a/src/test/ui/issues/issue-62480.stderr b/tests/ui/issues/issue-62480.stderr
index db2305370..db2305370 100644
--- a/src/test/ui/issues/issue-62480.stderr
+++ b/tests/ui/issues/issue-62480.stderr
diff --git a/src/test/ui/issues/issue-6318.rs b/tests/ui/issues/issue-6318.rs
index e5f245f6f..e5f245f6f 100644
--- a/src/test/ui/issues/issue-6318.rs
+++ b/tests/ui/issues/issue-6318.rs
diff --git a/src/test/ui/issues/issue-6344-let.rs b/tests/ui/issues/issue-6344-let.rs
index a7b6a2e2d..a7b6a2e2d 100644
--- a/src/test/ui/issues/issue-6344-let.rs
+++ b/tests/ui/issues/issue-6344-let.rs
diff --git a/src/test/ui/issues/issue-6344-match.rs b/tests/ui/issues/issue-6344-match.rs
index 4505a34c7..4505a34c7 100644
--- a/src/test/ui/issues/issue-6344-match.rs
+++ b/tests/ui/issues/issue-6344-match.rs
diff --git a/src/test/ui/issues/issue-63983.rs b/tests/ui/issues/issue-63983.rs
index ab952666f..ab952666f 100644
--- a/src/test/ui/issues/issue-63983.rs
+++ b/tests/ui/issues/issue-63983.rs
diff --git a/src/test/ui/issues/issue-63983.stderr b/tests/ui/issues/issue-63983.stderr
index f90c81116..f90c81116 100644
--- a/src/test/ui/issues/issue-63983.stderr
+++ b/tests/ui/issues/issue-63983.stderr
diff --git a/src/test/ui/issues/issue-64430.rs b/tests/ui/issues/issue-64430.rs
index 0bc66e06e..0bc66e06e 100644
--- a/src/test/ui/issues/issue-64430.rs
+++ b/tests/ui/issues/issue-64430.rs
diff --git a/src/test/ui/issues/issue-64430.stderr b/tests/ui/issues/issue-64430.stderr
index b6b1f3a66..b6b1f3a66 100644
--- a/src/test/ui/issues/issue-64430.stderr
+++ b/tests/ui/issues/issue-64430.stderr
diff --git a/src/test/ui/issues/issue-64559.rs b/tests/ui/issues/issue-64559.rs
index 71e054b5d..71e054b5d 100644
--- a/src/test/ui/issues/issue-64559.rs
+++ b/tests/ui/issues/issue-64559.rs
diff --git a/src/test/ui/issues/issue-64559.stderr b/tests/ui/issues/issue-64559.stderr
index ef178bbd1..386ac794d 100644
--- a/src/test/ui/issues/issue-64559.stderr
+++ b/tests/ui/issues/issue-64559.stderr
@@ -10,11 +10,8 @@ LL |     let _closure = || orig;
    |                    |
    |                    value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `orig`
+note: `into_iter` takes ownership of the receiver `self`, which moves `orig`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
 help: consider iterating over a slice of the `Vec<bool>`'s content to avoid moving into the `for` loop
    |
 LL |     for _val in &orig {}
diff --git a/src/test/ui/issues/issue-6458-1.rs b/tests/ui/issues/issue-6458-1.rs
index 184e4832b..184e4832b 100644
--- a/src/test/ui/issues/issue-6458-1.rs
+++ b/tests/ui/issues/issue-6458-1.rs
diff --git a/src/test/ui/issues/issue-6458-2.rs b/tests/ui/issues/issue-6458-2.rs
index b18cae3ed..b18cae3ed 100644
--- a/src/test/ui/issues/issue-6458-2.rs
+++ b/tests/ui/issues/issue-6458-2.rs
diff --git a/src/test/ui/issues/issue-6458-2.stderr b/tests/ui/issues/issue-6458-2.stderr
index 8dbdd9a27..8dbdd9a27 100644
--- a/src/test/ui/issues/issue-6458-2.stderr
+++ b/tests/ui/issues/issue-6458-2.stderr
diff --git a/src/test/ui/issues/issue-6458-3.rs b/tests/ui/issues/issue-6458-3.rs
index d4f8886e9..d4f8886e9 100644
--- a/src/test/ui/issues/issue-6458-3.rs
+++ b/tests/ui/issues/issue-6458-3.rs
diff --git a/src/test/ui/issues/issue-6458-3.stderr b/tests/ui/issues/issue-6458-3.stderr
index 520efccae..520efccae 100644
--- a/src/test/ui/issues/issue-6458-3.stderr
+++ b/tests/ui/issues/issue-6458-3.stderr
diff --git a/src/test/ui/issues/issue-6458-4.rs b/tests/ui/issues/issue-6458-4.rs
index 054a5c15c..054a5c15c 100644
--- a/src/test/ui/issues/issue-6458-4.rs
+++ b/tests/ui/issues/issue-6458-4.rs
diff --git a/src/test/ui/issues/issue-6458-4.stderr b/tests/ui/issues/issue-6458-4.stderr
index 168ececac..168ececac 100644
--- a/src/test/ui/issues/issue-6458-4.stderr
+++ b/tests/ui/issues/issue-6458-4.stderr
diff --git a/src/test/ui/issues/issue-6458.rs b/tests/ui/issues/issue-6458.rs
index 16718e90d..16718e90d 100644
--- a/src/test/ui/issues/issue-6458.rs
+++ b/tests/ui/issues/issue-6458.rs
diff --git a/src/test/ui/issues/issue-6458.stderr b/tests/ui/issues/issue-6458.stderr
index 2e93c1385..2e93c1385 100644
--- a/src/test/ui/issues/issue-6458.stderr
+++ b/tests/ui/issues/issue-6458.stderr
diff --git a/src/test/ui/issues/issue-64593.rs b/tests/ui/issues/issue-64593.rs
index 9e787f638..9e787f638 100644
--- a/src/test/ui/issues/issue-64593.rs
+++ b/tests/ui/issues/issue-64593.rs
diff --git a/src/test/ui/issues/issue-64792-bad-unicode-ctor.rs b/tests/ui/issues/issue-64792-bad-unicode-ctor.rs
index f1427ef46..f1427ef46 100644
--- a/src/test/ui/issues/issue-64792-bad-unicode-ctor.rs
+++ b/tests/ui/issues/issue-64792-bad-unicode-ctor.rs
diff --git a/src/test/ui/issues/issue-64792-bad-unicode-ctor.stderr b/tests/ui/issues/issue-64792-bad-unicode-ctor.stderr
index 2ec151d24..2ec151d24 100644
--- a/src/test/ui/issues/issue-64792-bad-unicode-ctor.stderr
+++ b/tests/ui/issues/issue-64792-bad-unicode-ctor.stderr
diff --git a/src/test/ui/issues/issue-65131.rs b/tests/ui/issues/issue-65131.rs
index 8b5345da9..8b5345da9 100644
--- a/src/test/ui/issues/issue-65131.rs
+++ b/tests/ui/issues/issue-65131.rs
diff --git a/src/test/ui/issues/issue-65131.stderr b/tests/ui/issues/issue-65131.stderr
index e234e6da5..e234e6da5 100644
--- a/src/test/ui/issues/issue-65131.stderr
+++ b/tests/ui/issues/issue-65131.stderr
diff --git a/src/test/ui/issues/issue-65230.rs b/tests/ui/issues/issue-65230.rs
index 54141d221..54141d221 100644
--- a/src/test/ui/issues/issue-65230.rs
+++ b/tests/ui/issues/issue-65230.rs
diff --git a/src/test/ui/issues/issue-65230.stderr b/tests/ui/issues/issue-65230.stderr
index fcabcdea7..7ccab8894 100644
--- a/src/test/ui/issues/issue-65230.stderr
+++ b/tests/ui/issues/issue-65230.stderr
@@ -1,8 +1,8 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-65230.rs:8:6
+  --> $DIR/issue-65230.rs:8:13
    |
 LL | impl T1 for &dyn T2 {}
-   |      ^^ lifetime mismatch
+   |             ^^^^^^^ lifetime mismatch
    |
    = note: expected trait `<&dyn T2 as T0>`
               found trait `<&(dyn T2 + 'static) as T0>`
diff --git a/src/test/ui/issues/issue-65462.rs b/tests/ui/issues/issue-65462.rs
index 8c39ea531..8c39ea531 100644
--- a/src/test/ui/issues/issue-65462.rs
+++ b/tests/ui/issues/issue-65462.rs
diff --git a/src/test/ui/issues/issue-6557.rs b/tests/ui/issues/issue-6557.rs
index 757e9608f..757e9608f 100644
--- a/src/test/ui/issues/issue-6557.rs
+++ b/tests/ui/issues/issue-6557.rs
diff --git a/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2015.stderr b/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2015.stderr
new file mode 100644
index 000000000..d0cb16995
--- /dev/null
+++ b/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2015.stderr
@@ -0,0 +1,28 @@
+error[E0034]: multiple applicable items in scope
+  --> $DIR/issue-65634-raw-ident-suggestion.rs:24:13
+   |
+LL |     r#fn {}.r#struct();
+   |             ^^^^^^^^ multiple `r#struct` found
+   |
+note: candidate #1 is defined in an impl of the trait `async` for the type `r#fn`
+  --> $DIR/issue-65634-raw-ident-suggestion.rs:7:5
+   |
+LL |     fn r#struct(&self) {
+   |     ^^^^^^^^^^^^^^^^^^
+note: candidate #2 is defined in an impl of the trait `await` for the type `r#fn`
+  --> $DIR/issue-65634-raw-ident-suggestion.rs:13:5
+   |
+LL |     fn r#struct(&self) {
+   |     ^^^^^^^^^^^^^^^^^^
+help: disambiguate the associated function for candidate #1
+   |
+LL |     async::r#struct(&r#fn {});
+   |     ~~~~~~~~~~~~~~~~~~~~~~~~~
+help: disambiguate the associated function for candidate #2
+   |
+LL |     await::r#struct(&r#fn {});
+   |     ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0034`.
diff --git a/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2018.stderr b/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2018.stderr
new file mode 100644
index 000000000..a75c1c413
--- /dev/null
+++ b/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2018.stderr
@@ -0,0 +1,28 @@
+error[E0034]: multiple applicable items in scope
+  --> $DIR/issue-65634-raw-ident-suggestion.rs:24:13
+   |
+LL |     r#fn {}.r#struct();
+   |             ^^^^^^^^ multiple `r#struct` found
+   |
+note: candidate #1 is defined in an impl of the trait `r#async` for the type `r#fn`
+  --> $DIR/issue-65634-raw-ident-suggestion.rs:7:5
+   |
+LL |     fn r#struct(&self) {
+   |     ^^^^^^^^^^^^^^^^^^
+note: candidate #2 is defined in an impl of the trait `r#await` for the type `r#fn`
+  --> $DIR/issue-65634-raw-ident-suggestion.rs:13:5
+   |
+LL |     fn r#struct(&self) {
+   |     ^^^^^^^^^^^^^^^^^^
+help: disambiguate the associated function for candidate #1
+   |
+LL |     r#async::r#struct(&r#fn {});
+   |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+help: disambiguate the associated function for candidate #2
+   |
+LL |     r#await::r#struct(&r#fn {});
+   |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0034`.
diff --git a/src/test/ui/issues/issue-65634-raw-ident-suggestion.rs b/tests/ui/issues/issue-65634-raw-ident-suggestion.rs
index b92851025..03dd0340c 100644
--- a/src/test/ui/issues/issue-65634-raw-ident-suggestion.rs
+++ b/tests/ui/issues/issue-65634-raw-ident-suggestion.rs
@@ -1,3 +1,6 @@
+// revisions: edition2015 edition2018
+//[edition2018]edition:2018
+
 #![allow(non_camel_case_types)]
 
 trait r#async {
diff --git a/src/test/ui/issues/issue-6596-2.rs b/tests/ui/issues/issue-6596-2.rs
index 8401c4a9d..8401c4a9d 100644
--- a/src/test/ui/issues/issue-6596-2.rs
+++ b/tests/ui/issues/issue-6596-2.rs
diff --git a/src/test/ui/issues/issue-6596-2.stderr b/tests/ui/issues/issue-6596-2.stderr
index 4fa73a464..4fa73a464 100644
--- a/src/test/ui/issues/issue-6596-2.stderr
+++ b/tests/ui/issues/issue-6596-2.stderr
diff --git a/src/test/ui/issues/issue-66308.rs b/tests/ui/issues/issue-66308.rs
index 8460b359a..8460b359a 100644
--- a/src/test/ui/issues/issue-66308.rs
+++ b/tests/ui/issues/issue-66308.rs
diff --git a/src/test/ui/issues/issue-66353.rs b/tests/ui/issues/issue-66353.rs
index d8abdd520..d8abdd520 100644
--- a/src/test/ui/issues/issue-66353.rs
+++ b/tests/ui/issues/issue-66353.rs
diff --git a/src/test/ui/issues/issue-66353.stderr b/tests/ui/issues/issue-66353.stderr
index 335618097..335618097 100644
--- a/src/test/ui/issues/issue-66353.stderr
+++ b/tests/ui/issues/issue-66353.stderr
diff --git a/src/test/ui/issues/issue-6642.rs b/tests/ui/issues/issue-6642.rs
index f80f6fffe..f80f6fffe 100644
--- a/src/test/ui/issues/issue-6642.rs
+++ b/tests/ui/issues/issue-6642.rs
diff --git a/src/test/ui/issues/issue-6642.stderr b/tests/ui/issues/issue-6642.stderr
index 6668108d0..6668108d0 100644
--- a/src/test/ui/issues/issue-6642.stderr
+++ b/tests/ui/issues/issue-6642.stderr
diff --git a/src/test/ui/issues/issue-66667-function-cmp-cycle.rs b/tests/ui/issues/issue-66667-function-cmp-cycle.rs
index 7b025be11..7b025be11 100644
--- a/src/test/ui/issues/issue-66667-function-cmp-cycle.rs
+++ b/tests/ui/issues/issue-66667-function-cmp-cycle.rs
diff --git a/src/test/ui/issues/issue-66667-function-cmp-cycle.stderr b/tests/ui/issues/issue-66667-function-cmp-cycle.stderr
index 887699ef5..887699ef5 100644
--- a/src/test/ui/issues/issue-66667-function-cmp-cycle.stderr
+++ b/tests/ui/issues/issue-66667-function-cmp-cycle.stderr
diff --git a/src/test/ui/issues/issue-66702-break-outside-loop-val.rs b/tests/ui/issues/issue-66702-break-outside-loop-val.rs
index 05b86cbbf..05b86cbbf 100644
--- a/src/test/ui/issues/issue-66702-break-outside-loop-val.rs
+++ b/tests/ui/issues/issue-66702-break-outside-loop-val.rs
diff --git a/src/test/ui/issues/issue-66702-break-outside-loop-val.stderr b/tests/ui/issues/issue-66702-break-outside-loop-val.stderr
index f92ede311..f92ede311 100644
--- a/src/test/ui/issues/issue-66702-break-outside-loop-val.stderr
+++ b/tests/ui/issues/issue-66702-break-outside-loop-val.stderr
diff --git a/src/test/ui/issues/issue-66706.rs b/tests/ui/issues/issue-66706.rs
index 835fdfae8..835fdfae8 100644
--- a/src/test/ui/issues/issue-66706.rs
+++ b/tests/ui/issues/issue-66706.rs
diff --git a/src/test/ui/issues/issue-66706.stderr b/tests/ui/issues/issue-66706.stderr
index 8a30c0cad..8a30c0cad 100644
--- a/src/test/ui/issues/issue-66706.stderr
+++ b/tests/ui/issues/issue-66706.stderr
diff --git a/src/test/ui/issues/issue-66768.rs b/tests/ui/issues/issue-66768.rs
index ce42c8b01..ce42c8b01 100644
--- a/src/test/ui/issues/issue-66768.rs
+++ b/tests/ui/issues/issue-66768.rs
diff --git a/src/test/ui/issues/issue-66923-show-error-for-correct-call.rs b/tests/ui/issues/issue-66923-show-error-for-correct-call.rs
index 833280739..833280739 100644
--- a/src/test/ui/issues/issue-66923-show-error-for-correct-call.rs
+++ b/tests/ui/issues/issue-66923-show-error-for-correct-call.rs
diff --git a/tests/ui/issues/issue-66923-show-error-for-correct-call.stderr b/tests/ui/issues/issue-66923-show-error-for-correct-call.stderr
new file mode 100644
index 000000000..cec482a53
--- /dev/null
+++ b/tests/ui/issues/issue-66923-show-error-for-correct-call.stderr
@@ -0,0 +1,40 @@
+error[E0277]: a value of type `Vec<f64>` cannot be built from an iterator over elements of type `&f64`
+  --> $DIR/issue-66923-show-error-for-correct-call.rs:8:39
+   |
+LL |     let x2: Vec<f64> = x1.into_iter().collect();
+   |                                       ^^^^^^^ value of type `Vec<f64>` cannot be built from `std::iter::Iterator<Item=&f64>`
+   |
+   = help: the trait `FromIterator<&f64>` is not implemented for `Vec<f64>`
+   = help: the trait `FromIterator<T>` is implemented for `Vec<T>`
+note: the method call chain might not have had the expected associated types
+  --> $DIR/issue-66923-show-error-for-correct-call.rs:8:27
+   |
+LL |     let x1: &[f64] = &v;
+   |                      -- this expression has type `&Vec<f64>`
+LL |     let x2: Vec<f64> = x1.into_iter().collect();
+   |                           ^^^^^^^^^^^ `Iterator::Item` is `&f64` here
+note: required by a bound in `collect`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error[E0277]: a value of type `Vec<f64>` cannot be built from an iterator over elements of type `&f64`
+  --> $DIR/issue-66923-show-error-for-correct-call.rs:12:29
+   |
+LL |     let x3 = x1.into_iter().collect::<Vec<f64>>();
+   |                             ^^^^^^^ value of type `Vec<f64>` cannot be built from `std::iter::Iterator<Item=&f64>`
+   |
+   = help: the trait `FromIterator<&f64>` is not implemented for `Vec<f64>`
+   = help: the trait `FromIterator<T>` is implemented for `Vec<T>`
+note: the method call chain might not have had the expected associated types
+  --> $DIR/issue-66923-show-error-for-correct-call.rs:12:17
+   |
+LL |     let x1: &[f64] = &v;
+   |                      -- this expression has type `&Vec<f64>`
+...
+LL |     let x3 = x1.into_iter().collect::<Vec<f64>>();
+   |                 ^^^^^^^^^^^ `Iterator::Item` is `&f64` here
+note: required by a bound in `collect`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/issues/issue-67039-unsound-pin-partialeq.rs b/tests/ui/issues/issue-67039-unsound-pin-partialeq.rs
index a496e58a7..a496e58a7 100644
--- a/src/test/ui/issues/issue-67039-unsound-pin-partialeq.rs
+++ b/tests/ui/issues/issue-67039-unsound-pin-partialeq.rs
diff --git a/src/test/ui/issues/issue-67039-unsound-pin-partialeq.stderr b/tests/ui/issues/issue-67039-unsound-pin-partialeq.stderr
index 37e2c3bdd..37e2c3bdd 100644
--- a/src/test/ui/issues/issue-67039-unsound-pin-partialeq.stderr
+++ b/tests/ui/issues/issue-67039-unsound-pin-partialeq.stderr
diff --git a/src/test/ui/issues/issue-6738.rs b/tests/ui/issues/issue-6738.rs
index a2f8dfe9c..a2f8dfe9c 100644
--- a/src/test/ui/issues/issue-6738.rs
+++ b/tests/ui/issues/issue-6738.rs
diff --git a/src/test/ui/issues/issue-6738.stderr b/tests/ui/issues/issue-6738.stderr
index f97d899c2..f97d899c2 100644
--- a/src/test/ui/issues/issue-6738.stderr
+++ b/tests/ui/issues/issue-6738.stderr
diff --git a/tests/ui/issues/issue-67535.rs b/tests/ui/issues/issue-67535.rs
new file mode 100644
index 000000000..24f506213
--- /dev/null
+++ b/tests/ui/issues/issue-67535.rs
@@ -0,0 +1,22 @@
+fn main() {}
+
+impl std::ops::AddAssign for () {
+    //~^ ERROR only traits defined in the current crate can be implemented for arbitrary types
+    fn add_assign(&self, other: ()) -> () {
+        ()
+    }
+}
+
+impl std::ops::AddAssign for [(); 1] {
+    //~^ ERROR only traits defined in the current crate can be implemented for arbitrary types
+    fn add_assign(&self, other: [(); 1]) -> [(); 1] {
+        [()]
+    }
+}
+
+impl std::ops::AddAssign for &[u8] {
+    //~^ ERROR only traits defined in the current crate can be implemented for arbitrary types
+    fn add_assign(&self, other: &[u8]) -> &[u8] {
+        self
+    }
+}
diff --git a/tests/ui/issues/issue-67535.stderr b/tests/ui/issues/issue-67535.stderr
new file mode 100644
index 000000000..4d7a02a50
--- /dev/null
+++ b/tests/ui/issues/issue-67535.stderr
@@ -0,0 +1,39 @@
+error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
+  --> $DIR/issue-67535.rs:3:1
+   |
+LL | impl std::ops::AddAssign for () {
+   | ^^^^^-------------------^^^^^--
+   | |    |                       |
+   | |    |                       this is not defined in the current crate because tuples are always foreign
+   | |    this is not defined in the current crate because this is a foreign trait
+   | impl doesn't use only types from inside the current crate
+   |
+   = note: define and implement a trait or new type instead
+
+error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
+  --> $DIR/issue-67535.rs:10:1
+   |
+LL | impl std::ops::AddAssign for [(); 1] {
+   | ^^^^^-------------------^^^^^-------
+   | |    |                       |
+   | |    |                       this is not defined in the current crate because arrays are always foreign
+   | |    this is not defined in the current crate because this is a foreign trait
+   | impl doesn't use only types from inside the current crate
+   |
+   = note: define and implement a trait or new type instead
+
+error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
+  --> $DIR/issue-67535.rs:17:1
+   |
+LL | impl std::ops::AddAssign for &[u8] {
+   | ^^^^^-------------------^^^^^-----
+   | |    |                       |
+   | |    |                       this is not defined in the current crate because slices are always foreign
+   | |    this is not defined in the current crate because this is a foreign trait
+   | impl doesn't use only types from inside the current crate
+   |
+   = note: define and implement a trait or new type instead
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0117`.
diff --git a/src/test/ui/issues/issue-67552.polonius.stderr b/tests/ui/issues/issue-67552.polonius.stderr
index 9ab77d344..9ab77d344 100644
--- a/src/test/ui/issues/issue-67552.polonius.stderr
+++ b/tests/ui/issues/issue-67552.polonius.stderr
diff --git a/src/test/ui/issues/issue-67552.rs b/tests/ui/issues/issue-67552.rs
index ec1997ccd..ec1997ccd 100644
--- a/src/test/ui/issues/issue-67552.rs
+++ b/tests/ui/issues/issue-67552.rs
diff --git a/src/test/ui/issues/issue-67552.stderr b/tests/ui/issues/issue-67552.stderr
index 4746f918b..4746f918b 100644
--- a/src/test/ui/issues/issue-67552.stderr
+++ b/tests/ui/issues/issue-67552.stderr
diff --git a/src/test/ui/issues/issue-68010-large-zst-consts.rs b/tests/ui/issues/issue-68010-large-zst-consts.rs
index 3277df69c..3277df69c 100644
--- a/src/test/ui/issues/issue-68010-large-zst-consts.rs
+++ b/tests/ui/issues/issue-68010-large-zst-consts.rs
diff --git a/src/test/ui/issues/issue-68696-catch-during-unwind.rs b/tests/ui/issues/issue-68696-catch-during-unwind.rs
index 2b12a62d0..2b12a62d0 100644
--- a/src/test/ui/issues/issue-68696-catch-during-unwind.rs
+++ b/tests/ui/issues/issue-68696-catch-during-unwind.rs
diff --git a/src/test/ui/issues/issue-6892.rs b/tests/ui/issues/issue-6892.rs
index a361461a4..a361461a4 100644
--- a/src/test/ui/issues/issue-6892.rs
+++ b/tests/ui/issues/issue-6892.rs
diff --git a/src/test/ui/issues/issue-68951.rs b/tests/ui/issues/issue-68951.rs
index 1c1e92c5b..1c1e92c5b 100644
--- a/src/test/ui/issues/issue-68951.rs
+++ b/tests/ui/issues/issue-68951.rs
diff --git a/src/test/ui/issues/issue-6898.rs b/tests/ui/issues/issue-6898.rs
index 44fd4bd07..44fd4bd07 100644
--- a/src/test/ui/issues/issue-6898.rs
+++ b/tests/ui/issues/issue-6898.rs
diff --git a/src/test/ui/issues/issue-69130.rs b/tests/ui/issues/issue-69130.rs
index 9552e8ec2..9552e8ec2 100644
--- a/src/test/ui/issues/issue-69130.rs
+++ b/tests/ui/issues/issue-69130.rs
diff --git a/src/test/ui/issues/issue-69130.stderr b/tests/ui/issues/issue-69130.stderr
index e67cc295d..e67cc295d 100644
--- a/src/test/ui/issues/issue-69130.stderr
+++ b/tests/ui/issues/issue-69130.stderr
diff --git a/src/test/ui/issues/issue-6919.rs b/tests/ui/issues/issue-6919.rs
index 6f1e1f977..6f1e1f977 100644
--- a/src/test/ui/issues/issue-6919.rs
+++ b/tests/ui/issues/issue-6919.rs
diff --git a/src/test/ui/issues/issue-69225-SCEVAddExpr-wrap-flag.rs b/tests/ui/issues/issue-69225-SCEVAddExpr-wrap-flag.rs
index 6e030f1cc..6e030f1cc 100644
--- a/src/test/ui/issues/issue-69225-SCEVAddExpr-wrap-flag.rs
+++ b/tests/ui/issues/issue-69225-SCEVAddExpr-wrap-flag.rs
diff --git a/src/test/ui/issues/issue-69225-layout-repeated-checked-add.rs b/tests/ui/issues/issue-69225-layout-repeated-checked-add.rs
index 7f43e4d1a..7f43e4d1a 100644
--- a/src/test/ui/issues/issue-69225-layout-repeated-checked-add.rs
+++ b/tests/ui/issues/issue-69225-layout-repeated-checked-add.rs
diff --git a/src/test/ui/issues/issue-69306.rs b/tests/ui/issues/issue-69306.rs
index 85d60952a..85d60952a 100644
--- a/src/test/ui/issues/issue-69306.rs
+++ b/tests/ui/issues/issue-69306.rs
diff --git a/src/test/ui/issues/issue-69306.stderr b/tests/ui/issues/issue-69306.stderr
index 61ec5d318..61ec5d318 100644
--- a/src/test/ui/issues/issue-69306.stderr
+++ b/tests/ui/issues/issue-69306.stderr
diff --git a/src/test/ui/issues/issue-6936.rs b/tests/ui/issues/issue-6936.rs
index 26531bba9..26531bba9 100644
--- a/src/test/ui/issues/issue-6936.rs
+++ b/tests/ui/issues/issue-6936.rs
diff --git a/src/test/ui/issues/issue-6936.stderr b/tests/ui/issues/issue-6936.stderr
index 9292d60ca..9292d60ca 100644
--- a/src/test/ui/issues/issue-6936.stderr
+++ b/tests/ui/issues/issue-6936.stderr
diff --git a/src/test/ui/issues/issue-69396-const-no-type-in-macro.rs b/tests/ui/issues/issue-69396-const-no-type-in-macro.rs
index 45a308574..45a308574 100644
--- a/src/test/ui/issues/issue-69396-const-no-type-in-macro.rs
+++ b/tests/ui/issues/issue-69396-const-no-type-in-macro.rs
diff --git a/src/test/ui/issues/issue-69396-const-no-type-in-macro.stderr b/tests/ui/issues/issue-69396-const-no-type-in-macro.stderr
index 89aeafeba..89aeafeba 100644
--- a/src/test/ui/issues/issue-69396-const-no-type-in-macro.stderr
+++ b/tests/ui/issues/issue-69396-const-no-type-in-macro.stderr
diff --git a/src/test/ui/issues/issue-69455.rs b/tests/ui/issues/issue-69455.rs
index a53aadcfa..a53aadcfa 100644
--- a/src/test/ui/issues/issue-69455.rs
+++ b/tests/ui/issues/issue-69455.rs
diff --git a/tests/ui/issues/issue-69455.stderr b/tests/ui/issues/issue-69455.stderr
new file mode 100644
index 000000000..fc343bb54
--- /dev/null
+++ b/tests/ui/issues/issue-69455.stderr
@@ -0,0 +1,39 @@
+error[E0284]: type annotations needed
+  --> $DIR/issue-69455.rs:29:41
+   |
+LL |     println!("{}", 23u64.test(xs.iter().sum()));
+   |                          ----           ^^^ cannot infer type of the type parameter `S` declared on the associated function `sum`
+   |                          |
+   |                          type must be known at this point
+   |
+   = note: cannot satisfy `<u64 as Test<_>>::Output == _`
+help: consider specifying the generic argument
+   |
+LL |     println!("{}", 23u64.test(xs.iter().sum::<S>()));
+   |                                            +++++
+
+error[E0283]: type annotations needed
+  --> $DIR/issue-69455.rs:29:41
+   |
+LL |     println!("{}", 23u64.test(xs.iter().sum()));
+   |                          ----           ^^^ cannot infer type of the type parameter `S` declared on the associated function `sum`
+   |                          |
+   |                          required by a bound introduced by this call
+   |
+note: multiple `impl`s satisfying `u64: Test<_>` found
+  --> $DIR/issue-69455.rs:11:1
+   |
+LL | impl Test<u32> for u64 {
+   | ^^^^^^^^^^^^^^^^^^^^^^
+...
+LL | impl Test<u64> for u64 {
+   | ^^^^^^^^^^^^^^^^^^^^^^
+help: consider specifying the generic argument
+   |
+LL |     println!("{}", 23u64.test(xs.iter().sum::<S>()));
+   |                                            +++++
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0283, E0284.
+For more information about an error, try `rustc --explain E0283`.
diff --git a/src/test/ui/issues/issue-69602-type-err-during-codegen-ice.rs b/tests/ui/issues/issue-69602-type-err-during-codegen-ice.rs
index e98affc5c..e98affc5c 100644
--- a/src/test/ui/issues/issue-69602-type-err-during-codegen-ice.rs
+++ b/tests/ui/issues/issue-69602-type-err-during-codegen-ice.rs
diff --git a/src/test/ui/issues/issue-69602-type-err-during-codegen-ice.stderr b/tests/ui/issues/issue-69602-type-err-during-codegen-ice.stderr
index ba385d887..ba385d887 100644
--- a/src/test/ui/issues/issue-69602-type-err-during-codegen-ice.stderr
+++ b/tests/ui/issues/issue-69602-type-err-during-codegen-ice.stderr
diff --git a/src/test/ui/issues/issue-69683.rs b/tests/ui/issues/issue-69683.rs
index 7a76e9ef2..7a76e9ef2 100644
--- a/src/test/ui/issues/issue-69683.rs
+++ b/tests/ui/issues/issue-69683.rs
diff --git a/src/test/ui/issues/issue-69683.stderr b/tests/ui/issues/issue-69683.stderr
index 193de1a35..193de1a35 100644
--- a/src/test/ui/issues/issue-69683.stderr
+++ b/tests/ui/issues/issue-69683.stderr
diff --git a/src/test/ui/issues/issue-70093.rs b/tests/ui/issues/issue-70093.rs
index 86459dc90..86459dc90 100644
--- a/src/test/ui/issues/issue-70093.rs
+++ b/tests/ui/issues/issue-70093.rs
diff --git a/src/test/ui/issues/issue-7012.rs b/tests/ui/issues/issue-7012.rs
index 90eba1706..90eba1706 100644
--- a/src/test/ui/issues/issue-7012.rs
+++ b/tests/ui/issues/issue-7012.rs
diff --git a/src/test/ui/issues/issue-70381.rs b/tests/ui/issues/issue-70381.rs
index 3df8277b8..3df8277b8 100644
--- a/src/test/ui/issues/issue-70381.rs
+++ b/tests/ui/issues/issue-70381.rs
diff --git a/src/test/ui/issues/issue-70381.stderr b/tests/ui/issues/issue-70381.stderr
index 96b8e6569..96b8e6569 100644
--- a/src/test/ui/issues/issue-70381.stderr
+++ b/tests/ui/issues/issue-70381.stderr
diff --git a/src/test/ui/issues/issue-7044.rs b/tests/ui/issues/issue-7044.rs
index a6e22bc52..a6e22bc52 100644
--- a/src/test/ui/issues/issue-7044.rs
+++ b/tests/ui/issues/issue-7044.rs
diff --git a/src/test/ui/issues/issue-7044.stderr b/tests/ui/issues/issue-7044.stderr
index 2ad67ec23..2ad67ec23 100644
--- a/src/test/ui/issues/issue-7044.stderr
+++ b/tests/ui/issues/issue-7044.stderr
diff --git a/src/test/ui/issues/issue-7061.rs b/tests/ui/issues/issue-7061.rs
index 8a6ee920a..8a6ee920a 100644
--- a/src/test/ui/issues/issue-7061.rs
+++ b/tests/ui/issues/issue-7061.rs
diff --git a/src/test/ui/issues/issue-7061.stderr b/tests/ui/issues/issue-7061.stderr
index 27034378d..27034378d 100644
--- a/src/test/ui/issues/issue-7061.stderr
+++ b/tests/ui/issues/issue-7061.stderr
diff --git a/src/test/ui/issues/issue-70673.rs b/tests/ui/issues/issue-70673.rs
index 3561f4012..3561f4012 100644
--- a/src/test/ui/issues/issue-70673.rs
+++ b/tests/ui/issues/issue-70673.rs
diff --git a/src/test/ui/issues/issue-70724-add_type_neq_err_label-unwrap.rs b/tests/ui/issues/issue-70724-add_type_neq_err_label-unwrap.rs
index c2683157f..c2683157f 100644
--- a/src/test/ui/issues/issue-70724-add_type_neq_err_label-unwrap.rs
+++ b/tests/ui/issues/issue-70724-add_type_neq_err_label-unwrap.rs
diff --git a/src/test/ui/issues/issue-70724-add_type_neq_err_label-unwrap.stderr b/tests/ui/issues/issue-70724-add_type_neq_err_label-unwrap.stderr
index b30bcfb77..b30bcfb77 100644
--- a/src/test/ui/issues/issue-70724-add_type_neq_err_label-unwrap.stderr
+++ b/tests/ui/issues/issue-70724-add_type_neq_err_label-unwrap.stderr
diff --git a/src/test/ui/issues/issue-70746.rs b/tests/ui/issues/issue-70746.rs
index 8930c15f5..8930c15f5 100644
--- a/src/test/ui/issues/issue-70746.rs
+++ b/tests/ui/issues/issue-70746.rs
diff --git a/src/test/ui/issues/issue-7092.rs b/tests/ui/issues/issue-7092.rs
index 85bfbf90d..85bfbf90d 100644
--- a/src/test/ui/issues/issue-7092.rs
+++ b/tests/ui/issues/issue-7092.rs
diff --git a/src/test/ui/issues/issue-7092.stderr b/tests/ui/issues/issue-7092.stderr
index 59e8d75e2..59e8d75e2 100644
--- a/src/test/ui/issues/issue-7092.stderr
+++ b/tests/ui/issues/issue-7092.stderr
diff --git a/src/test/ui/issues/issue-71406.rs b/tests/ui/issues/issue-71406.rs
index 6266112c3..6266112c3 100644
--- a/src/test/ui/issues/issue-71406.rs
+++ b/tests/ui/issues/issue-71406.rs
diff --git a/src/test/ui/issues/issue-71406.stderr b/tests/ui/issues/issue-71406.stderr
index 918163b60..918163b60 100644
--- a/src/test/ui/issues/issue-71406.stderr
+++ b/tests/ui/issues/issue-71406.stderr
diff --git a/src/test/ui/issues/issue-71584.rs b/tests/ui/issues/issue-71584.rs
index 7bf3ed60e..7bf3ed60e 100644
--- a/src/test/ui/issues/issue-71584.rs
+++ b/tests/ui/issues/issue-71584.rs
diff --git a/src/test/ui/issues/issue-71584.stderr b/tests/ui/issues/issue-71584.stderr
index 6ddb76573..6ddb76573 100644
--- a/src/test/ui/issues/issue-71584.stderr
+++ b/tests/ui/issues/issue-71584.stderr
diff --git a/src/test/ui/issues/issue-71676-1.fixed b/tests/ui/issues/issue-71676-1.fixed
index cbc0e8c06..cbc0e8c06 100644
--- a/src/test/ui/issues/issue-71676-1.fixed
+++ b/tests/ui/issues/issue-71676-1.fixed
diff --git a/src/test/ui/issues/issue-71676-1.rs b/tests/ui/issues/issue-71676-1.rs
index 6e87c7174..6e87c7174 100644
--- a/src/test/ui/issues/issue-71676-1.rs
+++ b/tests/ui/issues/issue-71676-1.rs
diff --git a/src/test/ui/issues/issue-71676-1.stderr b/tests/ui/issues/issue-71676-1.stderr
index 2104634eb..2104634eb 100644
--- a/src/test/ui/issues/issue-71676-1.stderr
+++ b/tests/ui/issues/issue-71676-1.stderr
diff --git a/src/test/ui/issues/issue-71676-2.rs b/tests/ui/issues/issue-71676-2.rs
index f3183899d..f3183899d 100644
--- a/src/test/ui/issues/issue-71676-2.rs
+++ b/tests/ui/issues/issue-71676-2.rs
diff --git a/src/test/ui/issues/issue-71676-2.stderr b/tests/ui/issues/issue-71676-2.stderr
index 80fb4aed1..80fb4aed1 100644
--- a/src/test/ui/issues/issue-71676-2.stderr
+++ b/tests/ui/issues/issue-71676-2.stderr
diff --git a/src/test/ui/issues/issue-7178.rs b/tests/ui/issues/issue-7178.rs
index 30aa736cd..30aa736cd 100644
--- a/src/test/ui/issues/issue-7178.rs
+++ b/tests/ui/issues/issue-7178.rs
diff --git a/src/test/ui/issues/issue-72002.rs b/tests/ui/issues/issue-72002.rs
index 54ff89355..54ff89355 100644
--- a/src/test/ui/issues/issue-72002.rs
+++ b/tests/ui/issues/issue-72002.rs
diff --git a/src/test/ui/issues/issue-72076.rs b/tests/ui/issues/issue-72076.rs
index 1659044a6..1659044a6 100644
--- a/src/test/ui/issues/issue-72076.rs
+++ b/tests/ui/issues/issue-72076.rs
diff --git a/src/test/ui/issues/issue-72076.stderr b/tests/ui/issues/issue-72076.stderr
index b942cf75b..b942cf75b 100644
--- a/src/test/ui/issues/issue-72076.stderr
+++ b/tests/ui/issues/issue-72076.stderr
diff --git a/src/test/ui/issues/issue-72278.rs b/tests/ui/issues/issue-72278.rs
index 92fd1f73a..92fd1f73a 100644
--- a/src/test/ui/issues/issue-72278.rs
+++ b/tests/ui/issues/issue-72278.rs
diff --git a/src/test/ui/issues/issue-72278.stderr b/tests/ui/issues/issue-72278.stderr
index 5468837a3..5468837a3 100644
--- a/src/test/ui/issues/issue-72278.stderr
+++ b/tests/ui/issues/issue-72278.stderr
diff --git a/src/test/ui/issues/issue-7246.rs b/tests/ui/issues/issue-7246.rs
index 7b16fa024..7b16fa024 100644
--- a/src/test/ui/issues/issue-7246.rs
+++ b/tests/ui/issues/issue-7246.rs
diff --git a/src/test/ui/issues/issue-7246.stderr b/tests/ui/issues/issue-7246.stderr
index a9bf2bf76..a9bf2bf76 100644
--- a/src/test/ui/issues/issue-7246.stderr
+++ b/tests/ui/issues/issue-7246.stderr
diff --git a/src/test/ui/issues/issue-7268.rs b/tests/ui/issues/issue-7268.rs
index 309176fb0..309176fb0 100644
--- a/src/test/ui/issues/issue-7268.rs
+++ b/tests/ui/issues/issue-7268.rs
diff --git a/src/test/ui/issues/issue-72839-error-overflow.rs b/tests/ui/issues/issue-72839-error-overflow.rs
index 6562d2284..6562d2284 100644
--- a/src/test/ui/issues/issue-72839-error-overflow.rs
+++ b/tests/ui/issues/issue-72839-error-overflow.rs
diff --git a/src/test/ui/issues/issue-72839-error-overflow.stderr b/tests/ui/issues/issue-72839-error-overflow.stderr
index c4b6f90ca..c4b6f90ca 100644
--- a/src/test/ui/issues/issue-72839-error-overflow.stderr
+++ b/tests/ui/issues/issue-72839-error-overflow.stderr
diff --git a/src/test/ui/issues/issue-72933-match-stack-overflow.rs b/tests/ui/issues/issue-72933-match-stack-overflow.rs
index aa796bcf5..aa796bcf5 100644
--- a/src/test/ui/issues/issue-72933-match-stack-overflow.rs
+++ b/tests/ui/issues/issue-72933-match-stack-overflow.rs
diff --git a/src/test/ui/issues/issue-73112.rs b/tests/ui/issues/issue-73112.rs
index cc7be9c95..cc7be9c95 100644
--- a/src/test/ui/issues/issue-73112.rs
+++ b/tests/ui/issues/issue-73112.rs
diff --git a/src/test/ui/issues/issue-73112.stderr b/tests/ui/issues/issue-73112.stderr
index 4b8b97966..4b8b97966 100644
--- a/src/test/ui/issues/issue-73112.stderr
+++ b/tests/ui/issues/issue-73112.stderr
diff --git a/src/test/ui/issues/issue-73229.rs b/tests/ui/issues/issue-73229.rs
index 35346199a..35346199a 100644
--- a/src/test/ui/issues/issue-73229.rs
+++ b/tests/ui/issues/issue-73229.rs
diff --git a/src/test/ui/issues/issue-7344.rs b/tests/ui/issues/issue-7344.rs
index f1727d0c1..f1727d0c1 100644
--- a/src/test/ui/issues/issue-7344.rs
+++ b/tests/ui/issues/issue-7344.rs
diff --git a/src/test/ui/issues/issue-7364.rs b/tests/ui/issues/issue-7364.rs
index 79642bd41..79642bd41 100644
--- a/src/test/ui/issues/issue-7364.rs
+++ b/tests/ui/issues/issue-7364.rs
diff --git a/src/test/ui/issues/issue-7364.stderr b/tests/ui/issues/issue-7364.stderr
index 5dc8c2b60..5dc8c2b60 100644
--- a/src/test/ui/issues/issue-7364.stderr
+++ b/tests/ui/issues/issue-7364.stderr
diff --git a/src/test/ui/issues/issue-74082.rs b/tests/ui/issues/issue-74082.rs
index e3e400c79..e3e400c79 100644
--- a/src/test/ui/issues/issue-74082.rs
+++ b/tests/ui/issues/issue-74082.rs
diff --git a/src/test/ui/issues/issue-74082.stderr b/tests/ui/issues/issue-74082.stderr
index 12f5a3b27..12f5a3b27 100644
--- a/src/test/ui/issues/issue-74082.stderr
+++ b/tests/ui/issues/issue-74082.stderr
diff --git a/src/test/ui/issues/issue-74236/auxiliary/dep.rs b/tests/ui/issues/issue-74236/auxiliary/dep.rs
index 45f2601d3..45f2601d3 100644
--- a/src/test/ui/issues/issue-74236/auxiliary/dep.rs
+++ b/tests/ui/issues/issue-74236/auxiliary/dep.rs
diff --git a/src/test/ui/issues/issue-74236/main.rs b/tests/ui/issues/issue-74236/main.rs
index daa7cfcf9..daa7cfcf9 100644
--- a/src/test/ui/issues/issue-74236/main.rs
+++ b/tests/ui/issues/issue-74236/main.rs
diff --git a/src/test/ui/issues/issue-74236/main.stderr b/tests/ui/issues/issue-74236/main.stderr
index 55e94ae72..55e94ae72 100644
--- a/src/test/ui/issues/issue-74236/main.stderr
+++ b/tests/ui/issues/issue-74236/main.stderr
diff --git a/src/test/ui/issues/issue-74564-if-expr-stack-overflow.rs b/tests/ui/issues/issue-74564-if-expr-stack-overflow.rs
index 36e993260..36e993260 100644
--- a/src/test/ui/issues/issue-74564-if-expr-stack-overflow.rs
+++ b/tests/ui/issues/issue-74564-if-expr-stack-overflow.rs
diff --git a/src/test/ui/issues/issue-7519-match-unit-in-arg.rs b/tests/ui/issues/issue-7519-match-unit-in-arg.rs
index 7d838cbb0..7d838cbb0 100644
--- a/src/test/ui/issues/issue-7519-match-unit-in-arg.rs
+++ b/tests/ui/issues/issue-7519-match-unit-in-arg.rs
diff --git a/src/test/ui/issues/issue-75283.rs b/tests/ui/issues/issue-75283.rs
index d556132e4..d556132e4 100644
--- a/src/test/ui/issues/issue-75283.rs
+++ b/tests/ui/issues/issue-75283.rs
diff --git a/src/test/ui/issues/issue-75283.stderr b/tests/ui/issues/issue-75283.stderr
index da3800aff..da3800aff 100644
--- a/src/test/ui/issues/issue-75283.stderr
+++ b/tests/ui/issues/issue-75283.stderr
diff --git a/src/test/ui/issues/issue-75307.rs b/tests/ui/issues/issue-75307.rs
index cffa6bea8..cffa6bea8 100644
--- a/src/test/ui/issues/issue-75307.rs
+++ b/tests/ui/issues/issue-75307.rs
diff --git a/src/test/ui/issues/issue-75307.stderr b/tests/ui/issues/issue-75307.stderr
index c5b0b11e7..c5b0b11e7 100644
--- a/src/test/ui/issues/issue-75307.stderr
+++ b/tests/ui/issues/issue-75307.stderr
diff --git a/src/test/ui/issues/issue-7563.rs b/tests/ui/issues/issue-7563.rs
index c62405554..c62405554 100644
--- a/src/test/ui/issues/issue-7563.rs
+++ b/tests/ui/issues/issue-7563.rs
diff --git a/src/test/ui/issues/issue-75704.rs b/tests/ui/issues/issue-75704.rs
index aed7ddbcb..aed7ddbcb 100644
--- a/src/test/ui/issues/issue-75704.rs
+++ b/tests/ui/issues/issue-75704.rs
diff --git a/src/test/ui/issues/issue-7575.rs b/tests/ui/issues/issue-7575.rs
index ac69f2b1c..ac69f2b1c 100644
--- a/src/test/ui/issues/issue-7575.rs
+++ b/tests/ui/issues/issue-7575.rs
diff --git a/src/test/ui/issues/issue-75777.rs b/tests/ui/issues/issue-75777.rs
index a1e438bc6..a1e438bc6 100644
--- a/src/test/ui/issues/issue-75777.rs
+++ b/tests/ui/issues/issue-75777.rs
diff --git a/src/test/ui/issues/issue-75777.stderr b/tests/ui/issues/issue-75777.stderr
index 370cd72fd..370cd72fd 100644
--- a/src/test/ui/issues/issue-75777.stderr
+++ b/tests/ui/issues/issue-75777.stderr
diff --git a/src/test/ui/issues/issue-76042.rs b/tests/ui/issues/issue-76042.rs
index 34d529379..34d529379 100644
--- a/src/test/ui/issues/issue-76042.rs
+++ b/tests/ui/issues/issue-76042.rs
diff --git a/src/test/ui/issues/issue-7607-1.rs b/tests/ui/issues/issue-7607-1.rs
index 5221f2c52..5221f2c52 100644
--- a/src/test/ui/issues/issue-7607-1.rs
+++ b/tests/ui/issues/issue-7607-1.rs
diff --git a/tests/ui/issues/issue-7607-1.stderr b/tests/ui/issues/issue-7607-1.stderr
new file mode 100644
index 000000000..c98302699
--- /dev/null
+++ b/tests/ui/issues/issue-7607-1.stderr
@@ -0,0 +1,12 @@
+error[E0412]: cannot find type `Fo` in this scope
+  --> $DIR/issue-7607-1.rs:5:6
+   |
+LL | impl Fo {
+   |      ^^ help: a trait with a similar name exists: `Fn`
+  --> $SRC_DIR/core/src/ops/function.rs:LL:COL
+   |
+   = note: similarly named trait `Fn` defined here
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/issues/issue-7607-2.rs b/tests/ui/issues/issue-7607-2.rs
index 420a0ffd3..420a0ffd3 100644
--- a/src/test/ui/issues/issue-7607-2.rs
+++ b/tests/ui/issues/issue-7607-2.rs
diff --git a/src/test/ui/issues/issue-76077-1.fixed b/tests/ui/issues/issue-76077-1.fixed
index 8103a7ca4..8103a7ca4 100644
--- a/src/test/ui/issues/issue-76077-1.fixed
+++ b/tests/ui/issues/issue-76077-1.fixed
diff --git a/src/test/ui/issues/issue-76077-1.rs b/tests/ui/issues/issue-76077-1.rs
index 730332853..730332853 100644
--- a/src/test/ui/issues/issue-76077-1.rs
+++ b/tests/ui/issues/issue-76077-1.rs
diff --git a/src/test/ui/issues/issue-76077-1.stderr b/tests/ui/issues/issue-76077-1.stderr
index 8e77662b4..8e77662b4 100644
--- a/src/test/ui/issues/issue-76077-1.stderr
+++ b/tests/ui/issues/issue-76077-1.stderr
diff --git a/src/test/ui/issues/issue-76077.rs b/tests/ui/issues/issue-76077.rs
index 2d29093b0..2d29093b0 100644
--- a/src/test/ui/issues/issue-76077.rs
+++ b/tests/ui/issues/issue-76077.rs
diff --git a/src/test/ui/issues/issue-76077.stderr b/tests/ui/issues/issue-76077.stderr
index 197ca8d5a..197ca8d5a 100644
--- a/src/test/ui/issues/issue-76077.stderr
+++ b/tests/ui/issues/issue-76077.stderr
diff --git a/src/test/ui/issues/issue-76191.rs b/tests/ui/issues/issue-76191.rs
index d9790d2b5..d9790d2b5 100644
--- a/src/test/ui/issues/issue-76191.rs
+++ b/tests/ui/issues/issue-76191.rs
diff --git a/src/test/ui/issues/issue-76191.stderr b/tests/ui/issues/issue-76191.stderr
index 137498047..137498047 100644
--- a/src/test/ui/issues/issue-76191.stderr
+++ b/tests/ui/issues/issue-76191.stderr
diff --git a/src/test/ui/issues/issue-7660.rs b/tests/ui/issues/issue-7660.rs
index ad0b8ecff..ad0b8ecff 100644
--- a/src/test/ui/issues/issue-7660.rs
+++ b/tests/ui/issues/issue-7660.rs
diff --git a/src/test/ui/issues/issue-7663.rs b/tests/ui/issues/issue-7663.rs
index b15e215db..b15e215db 100644
--- a/src/test/ui/issues/issue-7663.rs
+++ b/tests/ui/issues/issue-7663.rs
diff --git a/src/test/ui/issues/issue-7673-cast-generically-implemented-trait.rs b/tests/ui/issues/issue-7673-cast-generically-implemented-trait.rs
index c089c3308..c089c3308 100644
--- a/src/test/ui/issues/issue-7673-cast-generically-implemented-trait.rs
+++ b/tests/ui/issues/issue-7673-cast-generically-implemented-trait.rs
diff --git a/src/test/ui/issues/issue-77218/issue-77218-2.fixed b/tests/ui/issues/issue-77218/issue-77218-2.fixed
index 0e835d49c..0e835d49c 100644
--- a/src/test/ui/issues/issue-77218/issue-77218-2.fixed
+++ b/tests/ui/issues/issue-77218/issue-77218-2.fixed
diff --git a/src/test/ui/issues/issue-77218/issue-77218-2.rs b/tests/ui/issues/issue-77218/issue-77218-2.rs
index 01dca1ae1..01dca1ae1 100644
--- a/src/test/ui/issues/issue-77218/issue-77218-2.rs
+++ b/tests/ui/issues/issue-77218/issue-77218-2.rs
diff --git a/src/test/ui/issues/issue-77218/issue-77218-2.stderr b/tests/ui/issues/issue-77218/issue-77218-2.stderr
index 58c1c18f9..58c1c18f9 100644
--- a/src/test/ui/issues/issue-77218/issue-77218-2.stderr
+++ b/tests/ui/issues/issue-77218/issue-77218-2.stderr
diff --git a/src/test/ui/issues/issue-77218/issue-77218.fixed b/tests/ui/issues/issue-77218/issue-77218.fixed
index 4907b43b9..4907b43b9 100644
--- a/src/test/ui/issues/issue-77218/issue-77218.fixed
+++ b/tests/ui/issues/issue-77218/issue-77218.fixed
diff --git a/src/test/ui/issues/issue-77218/issue-77218.rs b/tests/ui/issues/issue-77218/issue-77218.rs
index 0ed154bf4..0ed154bf4 100644
--- a/src/test/ui/issues/issue-77218/issue-77218.rs
+++ b/tests/ui/issues/issue-77218/issue-77218.rs
diff --git a/src/test/ui/issues/issue-77218/issue-77218.stderr b/tests/ui/issues/issue-77218/issue-77218.stderr
index eda635646..eda635646 100644
--- a/src/test/ui/issues/issue-77218/issue-77218.stderr
+++ b/tests/ui/issues/issue-77218/issue-77218.stderr
diff --git a/src/test/ui/issues/issue-7784.rs b/tests/ui/issues/issue-7784.rs
index b7323f09d..b7323f09d 100644
--- a/src/test/ui/issues/issue-7784.rs
+++ b/tests/ui/issues/issue-7784.rs
diff --git a/src/test/ui/issues/issue-77919.rs b/tests/ui/issues/issue-77919.rs
index 966d76d14..966d76d14 100644
--- a/src/test/ui/issues/issue-77919.rs
+++ b/tests/ui/issues/issue-77919.rs
diff --git a/src/test/ui/issues/issue-77919.stderr b/tests/ui/issues/issue-77919.stderr
index ca256847b..d154bfe0c 100644
--- a/src/test/ui/issues/issue-77919.stderr
+++ b/tests/ui/issues/issue-77919.stderr
@@ -13,9 +13,12 @@ error[E0412]: cannot find type `VAL` in this scope
   --> $DIR/issue-77919.rs:11:63
    |
 LL | impl<N, M> TypeVal<usize> for Multiply<N, M> where N: TypeVal<VAL> {}
-   |          -                                                    ^^^ not found in this scope
-   |          |
-   |          help: you might be missing a type parameter: `, VAL`
+   |                                                               ^^^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+LL | impl<N, M, VAL> TypeVal<usize> for Multiply<N, M> where N: TypeVal<VAL> {}
+   |          +++++
 
 error[E0046]: not all trait items implemented, missing: `VAL`
   --> $DIR/issue-77919.rs:11:1
diff --git a/src/test/ui/issues/issue-78115.rs b/tests/ui/issues/issue-78115.rs
index ac18470c6..ac18470c6 100644
--- a/src/test/ui/issues/issue-78115.rs
+++ b/tests/ui/issues/issue-78115.rs
diff --git a/src/test/ui/issues/issue-7813.rs b/tests/ui/issues/issue-7813.rs
index ce549bde6..ce549bde6 100644
--- a/src/test/ui/issues/issue-7813.rs
+++ b/tests/ui/issues/issue-7813.rs
diff --git a/src/test/ui/issues/issue-7813.stderr b/tests/ui/issues/issue-7813.stderr
index 2a747f679..2a747f679 100644
--- a/src/test/ui/issues/issue-7813.stderr
+++ b/tests/ui/issues/issue-7813.stderr
diff --git a/src/test/ui/issues/issue-78192.rs b/tests/ui/issues/issue-78192.rs
index b5c300159..b5c300159 100644
--- a/src/test/ui/issues/issue-78192.rs
+++ b/tests/ui/issues/issue-78192.rs
diff --git a/src/test/ui/issues/issue-78622.rs b/tests/ui/issues/issue-78622.rs
index c00fd2660..c00fd2660 100644
--- a/src/test/ui/issues/issue-78622.rs
+++ b/tests/ui/issues/issue-78622.rs
diff --git a/tests/ui/issues/issue-78622.stderr b/tests/ui/issues/issue-78622.stderr
new file mode 100644
index 000000000..70daf8a2f
--- /dev/null
+++ b/tests/ui/issues/issue-78622.stderr
@@ -0,0 +1,14 @@
+error[E0223]: ambiguous associated type
+  --> $DIR/issue-78622.rs:5:5
+   |
+LL |     S::A::<f> {}
+   |     ^^^^
+   |
+help: if there were a trait named `Example` with associated type `A` implemented for `S`, you could use the fully-qualified path
+   |
+LL |     <S as Example>::A::<f> {}
+   |     ~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/issues/issue-7867.rs b/tests/ui/issues/issue-7867.rs
index 3074052f1..3074052f1 100644
--- a/src/test/ui/issues/issue-7867.rs
+++ b/tests/ui/issues/issue-7867.rs
diff --git a/src/test/ui/issues/issue-7867.stderr b/tests/ui/issues/issue-7867.stderr
index 0d3121d60..0d3121d60 100644
--- a/src/test/ui/issues/issue-7867.stderr
+++ b/tests/ui/issues/issue-7867.stderr
diff --git a/src/test/ui/issues/issue-78957.rs b/tests/ui/issues/issue-78957.rs
index 567c59fd5..567c59fd5 100644
--- a/src/test/ui/issues/issue-78957.rs
+++ b/tests/ui/issues/issue-78957.rs
diff --git a/src/test/ui/issues/issue-78957.stderr b/tests/ui/issues/issue-78957.stderr
index 6de22d6bf..6de22d6bf 100644
--- a/src/test/ui/issues/issue-78957.stderr
+++ b/tests/ui/issues/issue-78957.stderr
diff --git a/src/test/ui/issues/issue-7899.rs b/tests/ui/issues/issue-7899.rs
index fb631f836..fb631f836 100644
--- a/src/test/ui/issues/issue-7899.rs
+++ b/tests/ui/issues/issue-7899.rs
diff --git a/src/test/ui/issues/issue-7911.rs b/tests/ui/issues/issue-7911.rs
index f64887136..f64887136 100644
--- a/src/test/ui/issues/issue-7911.rs
+++ b/tests/ui/issues/issue-7911.rs
diff --git a/src/test/ui/issues/issue-7950.rs b/tests/ui/issues/issue-7950.rs
index d3dcb3380..d3dcb3380 100644
--- a/src/test/ui/issues/issue-7950.rs
+++ b/tests/ui/issues/issue-7950.rs
diff --git a/src/test/ui/issues/issue-7950.stderr b/tests/ui/issues/issue-7950.stderr
index b8b0eb310..b8b0eb310 100644
--- a/src/test/ui/issues/issue-7950.stderr
+++ b/tests/ui/issues/issue-7950.stderr
diff --git a/src/test/ui/issues/issue-7970a.rs b/tests/ui/issues/issue-7970a.rs
index dae906410..dae906410 100644
--- a/src/test/ui/issues/issue-7970a.rs
+++ b/tests/ui/issues/issue-7970a.rs
diff --git a/src/test/ui/issues/issue-7970a.stderr b/tests/ui/issues/issue-7970a.stderr
index b04a0eef3..b04a0eef3 100644
--- a/src/test/ui/issues/issue-7970a.stderr
+++ b/tests/ui/issues/issue-7970a.stderr
diff --git a/src/test/ui/issues/issue-8044.rs b/tests/ui/issues/issue-8044.rs
index 858f98b65..858f98b65 100644
--- a/src/test/ui/issues/issue-8044.rs
+++ b/tests/ui/issues/issue-8044.rs
diff --git a/src/test/ui/issues/issue-80607.rs b/tests/ui/issues/issue-80607.rs
index 63f4df359..63f4df359 100644
--- a/src/test/ui/issues/issue-80607.rs
+++ b/tests/ui/issues/issue-80607.rs
diff --git a/src/test/ui/issues/issue-80607.stderr b/tests/ui/issues/issue-80607.stderr
index 38e46683b..38e46683b 100644
--- a/src/test/ui/issues/issue-80607.stderr
+++ b/tests/ui/issues/issue-80607.stderr
diff --git a/src/test/ui/issues/issue-81584.fixed b/tests/ui/issues/issue-81584.fixed
index 1cad59f10..1cad59f10 100644
--- a/src/test/ui/issues/issue-81584.fixed
+++ b/tests/ui/issues/issue-81584.fixed
diff --git a/src/test/ui/issues/issue-81584.rs b/tests/ui/issues/issue-81584.rs
index 452288db0..452288db0 100644
--- a/src/test/ui/issues/issue-81584.rs
+++ b/tests/ui/issues/issue-81584.rs
diff --git a/src/test/ui/issues/issue-81584.stderr b/tests/ui/issues/issue-81584.stderr
index 54973cfa3..54973cfa3 100644
--- a/src/test/ui/issues/issue-81584.stderr
+++ b/tests/ui/issues/issue-81584.stderr
diff --git a/src/test/ui/issues/issue-8171-default-method-self-inherit-builtin-trait.rs b/tests/ui/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
index 505e7b84b..505e7b84b 100644
--- a/src/test/ui/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
+++ b/tests/ui/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
diff --git a/src/test/ui/issues/issue-81918.rs b/tests/ui/issues/issue-81918.rs
index 8938b8a6f..8938b8a6f 100644
--- a/src/test/ui/issues/issue-81918.rs
+++ b/tests/ui/issues/issue-81918.rs
diff --git a/src/test/ui/issues/issue-8248.rs b/tests/ui/issues/issue-8248.rs
index 31a305c31..31a305c31 100644
--- a/src/test/ui/issues/issue-8248.rs
+++ b/tests/ui/issues/issue-8248.rs
diff --git a/src/test/ui/issues/issue-8249.rs b/tests/ui/issues/issue-8249.rs
index d09dff3a6..d09dff3a6 100644
--- a/src/test/ui/issues/issue-8249.rs
+++ b/tests/ui/issues/issue-8249.rs
diff --git a/src/test/ui/issues/issue-8259.rs b/tests/ui/issues/issue-8259.rs
index 2802bea7f..2802bea7f 100644
--- a/src/test/ui/issues/issue-8259.rs
+++ b/tests/ui/issues/issue-8259.rs
diff --git a/src/test/ui/issues/issue-82833-slice-miscompile.rs b/tests/ui/issues/issue-82833-slice-miscompile.rs
index 8cf6a3137..8cf6a3137 100644
--- a/src/test/ui/issues/issue-82833-slice-miscompile.rs
+++ b/tests/ui/issues/issue-82833-slice-miscompile.rs
diff --git a/src/test/ui/issues/issue-83048.rs b/tests/ui/issues/issue-83048.rs
index 8e4fb6eae..8e4fb6eae 100644
--- a/src/test/ui/issues/issue-83048.rs
+++ b/tests/ui/issues/issue-83048.rs
diff --git a/src/test/ui/issues/issue-83048.stderr b/tests/ui/issues/issue-83048.stderr
index dade9e469..dade9e469 100644
--- a/src/test/ui/issues/issue-83048.stderr
+++ b/tests/ui/issues/issue-83048.stderr
diff --git a/src/test/ui/issues/issue-83190.rs b/tests/ui/issues/issue-83190.rs
index da931c3ed..da931c3ed 100644
--- a/src/test/ui/issues/issue-83190.rs
+++ b/tests/ui/issues/issue-83190.rs
diff --git a/src/test/ui/issues/issue-8391.rs b/tests/ui/issues/issue-8391.rs
index 1a9036965..1a9036965 100644
--- a/src/test/ui/issues/issue-8391.rs
+++ b/tests/ui/issues/issue-8391.rs
diff --git a/src/test/ui/issues/issue-83924.fixed b/tests/ui/issues/issue-83924.fixed
index aa40da12b..aa40da12b 100644
--- a/src/test/ui/issues/issue-83924.fixed
+++ b/tests/ui/issues/issue-83924.fixed
diff --git a/src/test/ui/issues/issue-83924.rs b/tests/ui/issues/issue-83924.rs
index 22b80fe2f..22b80fe2f 100644
--- a/src/test/ui/issues/issue-83924.rs
+++ b/tests/ui/issues/issue-83924.rs
diff --git a/src/test/ui/issues/issue-83924.stderr b/tests/ui/issues/issue-83924.stderr
index 767571cdd..572414df2 100644
--- a/src/test/ui/issues/issue-83924.stderr
+++ b/tests/ui/issues/issue-83924.stderr
@@ -10,11 +10,8 @@ LL |     for n in v {
 LL |     for n in v {
    |              ^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `v`
+note: `into_iter` takes ownership of the receiver `self`, which moves `v`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
 help: consider creating a fresh reborrow of `v` here
    |
 LL |     for n in &mut *v {
diff --git a/src/test/ui/issues/issue-8398.rs b/tests/ui/issues/issue-8398.rs
index 0ef39b6a6..0ef39b6a6 100644
--- a/src/test/ui/issues/issue-8398.rs
+++ b/tests/ui/issues/issue-8398.rs
diff --git a/src/test/ui/issues/issue-8401.rs b/tests/ui/issues/issue-8401.rs
index 1257bab6c..1257bab6c 100644
--- a/src/test/ui/issues/issue-8401.rs
+++ b/tests/ui/issues/issue-8401.rs
diff --git a/src/test/ui/issues/issue-8498.rs b/tests/ui/issues/issue-8498.rs
index e6241b761..e6241b761 100644
--- a/src/test/ui/issues/issue-8498.rs
+++ b/tests/ui/issues/issue-8498.rs
diff --git a/src/test/ui/issues/issue-8506.rs b/tests/ui/issues/issue-8506.rs
index cc32b8923..cc32b8923 100644
--- a/src/test/ui/issues/issue-8506.rs
+++ b/tests/ui/issues/issue-8506.rs
diff --git a/src/test/ui/issues/issue-8521.rs b/tests/ui/issues/issue-8521.rs
index 15fbd4465..15fbd4465 100644
--- a/src/test/ui/issues/issue-8521.rs
+++ b/tests/ui/issues/issue-8521.rs
diff --git a/src/test/ui/issues/issue-85461.rs b/tests/ui/issues/issue-85461.rs
index 965510887..965510887 100644
--- a/src/test/ui/issues/issue-85461.rs
+++ b/tests/ui/issues/issue-85461.rs
diff --git a/src/test/ui/issues/issue-8578.rs b/tests/ui/issues/issue-8578.rs
index 2346ef5a9..2346ef5a9 100644
--- a/src/test/ui/issues/issue-8578.rs
+++ b/tests/ui/issues/issue-8578.rs
diff --git a/src/test/ui/issues/issue-86756.rs b/tests/ui/issues/issue-86756.rs
index 7f864eb28..7f864eb28 100644
--- a/src/test/ui/issues/issue-86756.rs
+++ b/tests/ui/issues/issue-86756.rs
diff --git a/src/test/ui/issues/issue-86756.stderr b/tests/ui/issues/issue-86756.stderr
index 693cfeced..bfa7459ab 100644
--- a/src/test/ui/issues/issue-86756.stderr
+++ b/tests/ui/issues/issue-86756.stderr
@@ -9,8 +9,6 @@ LL | trait Foo<T, T = T> {}
 error[E0412]: cannot find type `dyn` in this scope
   --> $DIR/issue-86756.rs:5:10
    |
-LL | fn eq<A, B>() {
-   |           - help: you might be missing a type parameter: `, dyn`
 LL |     eq::<dyn, Foo>
    |          ^^^ not found in this scope
 
@@ -42,7 +40,7 @@ LL | trait Foo<T, T = T> {}
 help: add missing generic argument
    |
 LL |     eq::<dyn, Foo<T>>
-   |               ~~~~~~
+   |                  +++
 
 error: aborting due to 3 previous errors; 1 warning emitted
 
diff --git a/src/test/ui/issues/issue-868.rs b/tests/ui/issues/issue-868.rs
index ce0a3c7ca..ce0a3c7ca 100644
--- a/src/test/ui/issues/issue-868.rs
+++ b/tests/ui/issues/issue-868.rs
diff --git a/src/test/ui/issues/issue-87199.rs b/tests/ui/issues/issue-87199.rs
index a80a64a2f..a80a64a2f 100644
--- a/src/test/ui/issues/issue-87199.rs
+++ b/tests/ui/issues/issue-87199.rs
diff --git a/src/test/ui/issues/issue-87199.stderr b/tests/ui/issues/issue-87199.stderr
index 0ec5e73f3..0ec5e73f3 100644
--- a/src/test/ui/issues/issue-87199.stderr
+++ b/tests/ui/issues/issue-87199.stderr
diff --git a/src/test/ui/issues/issue-8727.polonius.stderr b/tests/ui/issues/issue-8727.polonius.stderr
index 283c01b6b..283c01b6b 100644
--- a/src/test/ui/issues/issue-8727.polonius.stderr
+++ b/tests/ui/issues/issue-8727.polonius.stderr
diff --git a/src/test/ui/issues/issue-8727.rs b/tests/ui/issues/issue-8727.rs
index a9b812661..a9b812661 100644
--- a/src/test/ui/issues/issue-8727.rs
+++ b/tests/ui/issues/issue-8727.rs
diff --git a/src/test/ui/issues/issue-8727.stderr b/tests/ui/issues/issue-8727.stderr
index 22332b357..22332b357 100644
--- a/src/test/ui/issues/issue-8727.stderr
+++ b/tests/ui/issues/issue-8727.stderr
diff --git a/src/test/ui/issues/issue-87490.rs b/tests/ui/issues/issue-87490.rs
index 998f61a6b..998f61a6b 100644
--- a/src/test/ui/issues/issue-87490.rs
+++ b/tests/ui/issues/issue-87490.rs
diff --git a/src/test/ui/issues/issue-87490.stderr b/tests/ui/issues/issue-87490.stderr
index f359dd638..f359dd638 100644
--- a/src/test/ui/issues/issue-87490.stderr
+++ b/tests/ui/issues/issue-87490.stderr
diff --git a/src/test/ui/issues/issue-8761.rs b/tests/ui/issues/issue-8761.rs
index 1453c3d75..1453c3d75 100644
--- a/src/test/ui/issues/issue-8761.rs
+++ b/tests/ui/issues/issue-8761.rs
diff --git a/src/test/ui/issues/issue-8761.stderr b/tests/ui/issues/issue-8761.stderr
index c70093baf..c70093baf 100644
--- a/src/test/ui/issues/issue-8761.stderr
+++ b/tests/ui/issues/issue-8761.stderr
diff --git a/src/test/ui/issues/issue-8767.rs b/tests/ui/issues/issue-8767.rs
index 972101a0b..972101a0b 100644
--- a/src/test/ui/issues/issue-8767.rs
+++ b/tests/ui/issues/issue-8767.rs
diff --git a/src/test/ui/issues/issue-8767.stderr b/tests/ui/issues/issue-8767.stderr
index 91d99f393..91d99f393 100644
--- a/src/test/ui/issues/issue-8767.stderr
+++ b/tests/ui/issues/issue-8767.stderr
diff --git a/src/test/ui/issues/issue-87707.rs b/tests/ui/issues/issue-87707.rs
index c14e52dfe..c14e52dfe 100644
--- a/src/test/ui/issues/issue-87707.rs
+++ b/tests/ui/issues/issue-87707.rs
diff --git a/src/test/ui/issues/issue-87707.run.stderr b/tests/ui/issues/issue-87707.run.stderr
index 527c78ba8..527c78ba8 100644
--- a/src/test/ui/issues/issue-87707.run.stderr
+++ b/tests/ui/issues/issue-87707.run.stderr
diff --git a/src/test/ui/issues/issue-8783.rs b/tests/ui/issues/issue-8783.rs
index 4eb49c821..4eb49c821 100644
--- a/src/test/ui/issues/issue-8783.rs
+++ b/tests/ui/issues/issue-8783.rs
diff --git a/src/test/ui/issues/issue-88150.rs b/tests/ui/issues/issue-88150.rs
index 555a38637..555a38637 100644
--- a/src/test/ui/issues/issue-88150.rs
+++ b/tests/ui/issues/issue-88150.rs
diff --git a/src/test/ui/issues/issue-8860.rs b/tests/ui/issues/issue-8860.rs
index b89a80c13..b89a80c13 100644
--- a/src/test/ui/issues/issue-8860.rs
+++ b/tests/ui/issues/issue-8860.rs
diff --git a/src/test/ui/issues/issue-8898.rs b/tests/ui/issues/issue-8898.rs
index 31d5ff86e..31d5ff86e 100644
--- a/src/test/ui/issues/issue-8898.rs
+++ b/tests/ui/issues/issue-8898.rs
diff --git a/src/test/ui/issues/issue-9047.rs b/tests/ui/issues/issue-9047.rs
index fa8d75aec..fa8d75aec 100644
--- a/src/test/ui/issues/issue-9047.rs
+++ b/tests/ui/issues/issue-9047.rs
diff --git a/src/test/ui/issues/issue-9110.rs b/tests/ui/issues/issue-9110.rs
index cbf3c92d0..cbf3c92d0 100644
--- a/src/test/ui/issues/issue-9110.rs
+++ b/tests/ui/issues/issue-9110.rs
diff --git a/src/test/ui/issues/issue-9123.rs b/tests/ui/issues/issue-9123.rs
index 8c21d06c4..8c21d06c4 100644
--- a/src/test/ui/issues/issue-9123.rs
+++ b/tests/ui/issues/issue-9123.rs
diff --git a/src/test/ui/issues/issue-9129.rs b/tests/ui/issues/issue-9129.rs
index 04110b3ae..04110b3ae 100644
--- a/src/test/ui/issues/issue-9129.rs
+++ b/tests/ui/issues/issue-9129.rs
diff --git a/src/test/ui/issues/issue-91489.rs b/tests/ui/issues/issue-91489.rs
index f028a4a3c..f028a4a3c 100644
--- a/src/test/ui/issues/issue-91489.rs
+++ b/tests/ui/issues/issue-91489.rs
diff --git a/src/test/ui/issues/issue-9155.rs b/tests/ui/issues/issue-9155.rs
index 4b5c451e8..4b5c451e8 100644
--- a/src/test/ui/issues/issue-9155.rs
+++ b/tests/ui/issues/issue-9155.rs
diff --git a/src/test/ui/issues/issue-9188.rs b/tests/ui/issues/issue-9188.rs
index 34e61fdf6..34e61fdf6 100644
--- a/src/test/ui/issues/issue-9188.rs
+++ b/tests/ui/issues/issue-9188.rs
diff --git a/src/test/ui/issues/issue-9243.rs b/tests/ui/issues/issue-9243.rs
index 59fdb4662..59fdb4662 100644
--- a/src/test/ui/issues/issue-9243.rs
+++ b/tests/ui/issues/issue-9243.rs
diff --git a/src/test/ui/issues/issue-9249.rs b/tests/ui/issues/issue-9249.rs
index caaba668a..caaba668a 100644
--- a/src/test/ui/issues/issue-9249.rs
+++ b/tests/ui/issues/issue-9249.rs
diff --git a/src/test/ui/issues/issue-9259.rs b/tests/ui/issues/issue-9259.rs
index d838edbdd..d838edbdd 100644
--- a/src/test/ui/issues/issue-9259.rs
+++ b/tests/ui/issues/issue-9259.rs
diff --git a/src/test/ui/issues/issue-9382.rs b/tests/ui/issues/issue-9382.rs
index 65718343f..65718343f 100644
--- a/src/test/ui/issues/issue-9382.rs
+++ b/tests/ui/issues/issue-9382.rs
diff --git a/src/test/ui/issues/issue-9446.rs b/tests/ui/issues/issue-9446.rs
index e200840d2..e200840d2 100644
--- a/src/test/ui/issues/issue-9446.rs
+++ b/tests/ui/issues/issue-9446.rs
diff --git a/src/test/ui/issues/issue-948.rs b/tests/ui/issues/issue-948.rs
index b9bbeb395..b9bbeb395 100644
--- a/src/test/ui/issues/issue-948.rs
+++ b/tests/ui/issues/issue-948.rs
diff --git a/src/test/ui/issues/issue-9575.rs b/tests/ui/issues/issue-9575.rs
index 06b252990..06b252990 100644
--- a/src/test/ui/issues/issue-9575.rs
+++ b/tests/ui/issues/issue-9575.rs
diff --git a/src/test/ui/issues/issue-9575.stderr b/tests/ui/issues/issue-9575.stderr
index 5b8ce84a0..5b8ce84a0 100644
--- a/src/test/ui/issues/issue-9575.stderr
+++ b/tests/ui/issues/issue-9575.stderr
diff --git a/src/test/ui/issues/issue-9719.rs b/tests/ui/issues/issue-9719.rs
index e8c3c9c19..e8c3c9c19 100644
--- a/src/test/ui/issues/issue-9719.rs
+++ b/tests/ui/issues/issue-9719.rs
diff --git a/src/test/ui/issues/issue-9725.rs b/tests/ui/issues/issue-9725.rs
index 360effbd1..360effbd1 100644
--- a/src/test/ui/issues/issue-9725.rs
+++ b/tests/ui/issues/issue-9725.rs
diff --git a/src/test/ui/issues/issue-9725.stderr b/tests/ui/issues/issue-9725.stderr
index 687e0cc0f..687e0cc0f 100644
--- a/src/test/ui/issues/issue-9725.stderr
+++ b/tests/ui/issues/issue-9725.stderr
diff --git a/src/test/ui/issues/issue-9737.rs b/tests/ui/issues/issue-9737.rs
index 7d3e05678..7d3e05678 100644
--- a/src/test/ui/issues/issue-9737.rs
+++ b/tests/ui/issues/issue-9737.rs
diff --git a/src/test/ui/issues/issue-979.rs b/tests/ui/issues/issue-979.rs
index 57a99b325..57a99b325 100644
--- a/src/test/ui/issues/issue-979.rs
+++ b/tests/ui/issues/issue-979.rs
diff --git a/src/test/ui/issues/issue-9814.rs b/tests/ui/issues/issue-9814.rs
index a87478e22..a87478e22 100644
--- a/src/test/ui/issues/issue-9814.rs
+++ b/tests/ui/issues/issue-9814.rs
diff --git a/src/test/ui/issues/issue-9814.stderr b/tests/ui/issues/issue-9814.stderr
index bd9e7df49..bd9e7df49 100644
--- a/src/test/ui/issues/issue-9814.stderr
+++ b/tests/ui/issues/issue-9814.stderr
diff --git a/src/test/ui/issues/issue-98299.rs b/tests/ui/issues/issue-98299.rs
index 63c058f91..63c058f91 100644
--- a/src/test/ui/issues/issue-98299.rs
+++ b/tests/ui/issues/issue-98299.rs
diff --git a/src/test/ui/issues/issue-98299.stderr b/tests/ui/issues/issue-98299.stderr
index fd905392a..fd905392a 100644
--- a/src/test/ui/issues/issue-98299.stderr
+++ b/tests/ui/issues/issue-98299.stderr
diff --git a/src/test/ui/issues/issue-9837.rs b/tests/ui/issues/issue-9837.rs
index 5d2c822a5..5d2c822a5 100644
--- a/src/test/ui/issues/issue-9837.rs
+++ b/tests/ui/issues/issue-9837.rs
diff --git a/src/test/ui/issues/issue-9906.rs b/tests/ui/issues/issue-9906.rs
index a2870cf0f..a2870cf0f 100644
--- a/src/test/ui/issues/issue-9906.rs
+++ b/tests/ui/issues/issue-9906.rs
diff --git a/src/test/ui/issues/issue-9918.rs b/tests/ui/issues/issue-9918.rs
index 63ad7040d..63ad7040d 100644
--- a/src/test/ui/issues/issue-9918.rs
+++ b/tests/ui/issues/issue-9918.rs
diff --git a/src/test/ui/issues/issue-9942.rs b/tests/ui/issues/issue-9942.rs
index f48804465..f48804465 100644
--- a/src/test/ui/issues/issue-9942.rs
+++ b/tests/ui/issues/issue-9942.rs
diff --git a/src/test/ui/issues/issue-9951.rs b/tests/ui/issues/issue-9951.rs
index 2698a3b17..2698a3b17 100644
--- a/src/test/ui/issues/issue-9951.rs
+++ b/tests/ui/issues/issue-9951.rs
diff --git a/src/test/ui/issues/issue-9968.rs b/tests/ui/issues/issue-9968.rs
index 3ab90d99a..3ab90d99a 100644
--- a/src/test/ui/issues/issue-9968.rs
+++ b/tests/ui/issues/issue-9968.rs
diff --git a/src/test/ui/issues/issue-99838.rs b/tests/ui/issues/issue-99838.rs
index 2e81d5e82..2e81d5e82 100644
--- a/src/test/ui/issues/issue-99838.rs
+++ b/tests/ui/issues/issue-99838.rs
diff --git a/src/test/ui/issues/issue-pr29383.rs b/tests/ui/issues/issue-pr29383.rs
index 2bcc0aa27..2bcc0aa27 100644
--- a/src/test/ui/issues/issue-pr29383.rs
+++ b/tests/ui/issues/issue-pr29383.rs
diff --git a/src/test/ui/issues/issue-pr29383.stderr b/tests/ui/issues/issue-pr29383.stderr
index 57783d75b..57783d75b 100644
--- a/src/test/ui/issues/issue-pr29383.stderr
+++ b/tests/ui/issues/issue-pr29383.stderr
diff --git a/src/test/ui/item-name-overload.rs b/tests/ui/item-name-overload.rs
index c8a302a2c..c8a302a2c 100644
--- a/src/test/ui/item-name-overload.rs
+++ b/tests/ui/item-name-overload.rs
diff --git a/src/test/ui/iterators/array-of-ranges.rs b/tests/ui/iterators/array-of-ranges.rs
index 037540a3e..037540a3e 100644
--- a/src/test/ui/iterators/array-of-ranges.rs
+++ b/tests/ui/iterators/array-of-ranges.rs
diff --git a/src/test/ui/iterators/array.rs b/tests/ui/iterators/array.rs
index 5985c74e1..5985c74e1 100644
--- a/src/test/ui/iterators/array.rs
+++ b/tests/ui/iterators/array.rs
diff --git a/src/test/ui/iterators/bound.rs b/tests/ui/iterators/bound.rs
index bdd99ef8d..bdd99ef8d 100644
--- a/src/test/ui/iterators/bound.rs
+++ b/tests/ui/iterators/bound.rs
diff --git a/src/test/ui/iterators/bound.stderr b/tests/ui/iterators/bound.stderr
index cc7ded498..cc7ded498 100644
--- a/src/test/ui/iterators/bound.stderr
+++ b/tests/ui/iterators/bound.stderr
diff --git a/src/test/ui/iterators/collect-into-array.rs b/tests/ui/iterators/collect-into-array.rs
index 4c424999b..99d0d9bd7 100644
--- a/src/test/ui/iterators/collect-into-array.rs
+++ b/tests/ui/iterators/collect-into-array.rs
@@ -3,5 +3,4 @@ fn main() {
     //~^ ERROR an array of type `[u32; 10]` cannot be built directly from an iterator
     //~| NOTE try collecting into a `Vec<{integer}>`, then using `.try_into()`
     //~| NOTE required by a bound in `collect`
-    //~| NOTE required by a bound introduced by this call
 }
diff --git a/tests/ui/iterators/collect-into-array.stderr b/tests/ui/iterators/collect-into-array.stderr
new file mode 100644
index 000000000..e38745cc1
--- /dev/null
+++ b/tests/ui/iterators/collect-into-array.stderr
@@ -0,0 +1,13 @@
+error[E0277]: an array of type `[u32; 10]` cannot be built directly from an iterator
+  --> $DIR/collect-into-array.rs:2:39
+   |
+LL |     let whatever: [u32; 10] = (0..10).collect();
+   |                                       ^^^^^^^ try collecting into a `Vec<{integer}>`, then using `.try_into()`
+   |
+   = help: the trait `FromIterator<{integer}>` is not implemented for `[u32; 10]`
+note: required by a bound in `collect`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/iterators/collect-into-slice.rs b/tests/ui/iterators/collect-into-slice.rs
index 09832c260..5a8aacb1a 100644
--- a/src/test/ui/iterators/collect-into-slice.rs
+++ b/tests/ui/iterators/collect-into-slice.rs
@@ -13,6 +13,5 @@ fn main() {
     //~| NOTE all local variables must have a statically known size
     //~| NOTE doesn't have a size known at compile-time
     //~| NOTE doesn't have a size known at compile-time
-    //~| NOTE required by a bound introduced by this call
     process_slice(&some_generated_vec);
 }
diff --git a/tests/ui/iterators/collect-into-slice.stderr b/tests/ui/iterators/collect-into-slice.stderr
new file mode 100644
index 000000000..29fff8c51
--- /dev/null
+++ b/tests/ui/iterators/collect-into-slice.stderr
@@ -0,0 +1,33 @@
+error[E0277]: the size for values of type `[i32]` cannot be known at compilation time
+  --> $DIR/collect-into-slice.rs:6:9
+   |
+LL |     let some_generated_vec = (0..10).collect();
+   |         ^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `[i32]`
+   = note: all local variables must have a statically known size
+   = help: unsized locals are gated as an unstable feature
+
+error[E0277]: the size for values of type `[i32]` cannot be known at compilation time
+  --> $DIR/collect-into-slice.rs:6:38
+   |
+LL |     let some_generated_vec = (0..10).collect();
+   |                                      ^^^^^^^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `[i32]`
+note: required by a bound in `collect`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error[E0277]: a slice of type `[i32]` cannot be built since `[i32]` has no definite size
+  --> $DIR/collect-into-slice.rs:6:38
+   |
+LL |     let some_generated_vec = (0..10).collect();
+   |                                      ^^^^^^^ try explicitly collecting into a `Vec<{integer}>`
+   |
+   = help: the trait `FromIterator<{integer}>` is not implemented for `[i32]`
+note: required by a bound in `collect`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/iterators/float_iterator_hint.rs b/tests/ui/iterators/float_iterator_hint.rs
new file mode 100644
index 000000000..a3335ca41
--- /dev/null
+++ b/tests/ui/iterators/float_iterator_hint.rs
@@ -0,0 +1,15 @@
+// #106728
+
+fn main() {
+    for i in 0.2 {
+        //~^ ERROR `{float}` is not an iterator
+        //~| `{float}` is not an iterator
+        //~| NOTE in this expansion of desugaring of `for` loop
+        //~| NOTE in this expansion of desugaring of `for` loop
+        //~| NOTE in this expansion of desugaring of `for` loop
+        //~| NOTE in this expansion of desugaring of `for` loop
+        //~| NOTE if you want to iterate between `start` until a value `end`, use the exclusive range syntax `start..end` or the inclusive range syntax `start..=end`
+        //~| NOTE required for `{float}` to implement `IntoIterator`
+        println!();
+    }
+}
diff --git a/tests/ui/iterators/float_iterator_hint.stderr b/tests/ui/iterators/float_iterator_hint.stderr
new file mode 100644
index 000000000..bae23a1f8
--- /dev/null
+++ b/tests/ui/iterators/float_iterator_hint.stderr
@@ -0,0 +1,13 @@
+error[E0277]: `{float}` is not an iterator
+  --> $DIR/float_iterator_hint.rs:4:14
+   |
+LL |     for i in 0.2 {
+   |              ^^^ `{float}` is not an iterator
+   |
+   = help: the trait `Iterator` is not implemented for `{float}`
+   = note: if you want to iterate between `start` until a value `end`, use the exclusive range syntax `start..end` or the inclusive range syntax `start..=end`
+   = note: required for `{float}` to implement `IntoIterator`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/iterators/integral.rs b/tests/ui/iterators/integral.rs
index 7537c7904..7537c7904 100644
--- a/src/test/ui/iterators/integral.rs
+++ b/tests/ui/iterators/integral.rs
diff --git a/src/test/ui/iterators/integral.stderr b/tests/ui/iterators/integral.stderr
index 047a71f98..c142fec8d 100644
--- a/src/test/ui/iterators/integral.stderr
+++ b/tests/ui/iterators/integral.stderr
@@ -115,6 +115,7 @@ LL |     for _ in 42.0 {}
    |              ^^^^ `{float}` is not an iterator
    |
    = help: the trait `Iterator` is not implemented for `{float}`
+   = note: if you want to iterate between `start` until a value `end`, use the exclusive range syntax `start..end` or the inclusive range syntax `start..=end`
    = note: required for `{float}` to implement `IntoIterator`
 
 error: aborting due to 12 previous errors
diff --git a/src/test/ui/iterators/into-iter-on-arrays-2018.rs b/tests/ui/iterators/into-iter-on-arrays-2018.rs
index 60995170a..60995170a 100644
--- a/src/test/ui/iterators/into-iter-on-arrays-2018.rs
+++ b/tests/ui/iterators/into-iter-on-arrays-2018.rs
diff --git a/src/test/ui/iterators/into-iter-on-arrays-2018.stderr b/tests/ui/iterators/into-iter-on-arrays-2018.stderr
index 2378476e5..2378476e5 100644
--- a/src/test/ui/iterators/into-iter-on-arrays-2018.stderr
+++ b/tests/ui/iterators/into-iter-on-arrays-2018.stderr
diff --git a/src/test/ui/iterators/into-iter-on-arrays-2021.rs b/tests/ui/iterators/into-iter-on-arrays-2021.rs
index 158317efe..158317efe 100644
--- a/src/test/ui/iterators/into-iter-on-arrays-2021.rs
+++ b/tests/ui/iterators/into-iter-on-arrays-2021.rs
diff --git a/src/test/ui/iterators/into-iter-on-arrays-lint.fixed b/tests/ui/iterators/into-iter-on-arrays-lint.fixed
index 6e02a7024..6e02a7024 100644
--- a/src/test/ui/iterators/into-iter-on-arrays-lint.fixed
+++ b/tests/ui/iterators/into-iter-on-arrays-lint.fixed
diff --git a/src/test/ui/iterators/into-iter-on-arrays-lint.rs b/tests/ui/iterators/into-iter-on-arrays-lint.rs
index 582d5cadd..582d5cadd 100644
--- a/src/test/ui/iterators/into-iter-on-arrays-lint.rs
+++ b/tests/ui/iterators/into-iter-on-arrays-lint.rs
diff --git a/src/test/ui/iterators/into-iter-on-arrays-lint.stderr b/tests/ui/iterators/into-iter-on-arrays-lint.stderr
index 2fde276fa..2fde276fa 100644
--- a/src/test/ui/iterators/into-iter-on-arrays-lint.stderr
+++ b/tests/ui/iterators/into-iter-on-arrays-lint.stderr
diff --git a/src/test/ui/iterators/into-iterator-type-inference-shift.rs b/tests/ui/iterators/into-iterator-type-inference-shift.rs
index 9151172fd..9151172fd 100644
--- a/src/test/ui/iterators/into-iterator-type-inference-shift.rs
+++ b/tests/ui/iterators/into-iterator-type-inference-shift.rs
diff --git a/tests/ui/iterators/invalid-iterator-chain-with-int-infer.rs b/tests/ui/iterators/invalid-iterator-chain-with-int-infer.rs
new file mode 100644
index 000000000..882a1d139
--- /dev/null
+++ b/tests/ui/iterators/invalid-iterator-chain-with-int-infer.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let x = Some(()).iter().map(|()| 1).sum::<f32>();
+    //~^ ERROR a value of type `f32` cannot be made by summing an iterator over elements of type `{integer}`
+}
diff --git a/tests/ui/iterators/invalid-iterator-chain-with-int-infer.stderr b/tests/ui/iterators/invalid-iterator-chain-with-int-infer.stderr
new file mode 100644
index 000000000..3cb5e44c7
--- /dev/null
+++ b/tests/ui/iterators/invalid-iterator-chain-with-int-infer.stderr
@@ -0,0 +1,24 @@
+error[E0277]: a value of type `f32` cannot be made by summing an iterator over elements of type `{integer}`
+  --> $DIR/invalid-iterator-chain-with-int-infer.rs:2:41
+   |
+LL |     let x = Some(()).iter().map(|()| 1).sum::<f32>();
+   |                                         ^^^ value of type `f32` cannot be made by summing a `std::iter::Iterator<Item={integer}>`
+   |
+   = help: the trait `Sum<{integer}>` is not implemented for `f32`
+   = help: the following other types implement trait `Sum<A>`:
+             <f32 as Sum<&'a f32>>
+             <f32 as Sum>
+note: the method call chain might not have had the expected associated types
+  --> $DIR/invalid-iterator-chain-with-int-infer.rs:2:29
+   |
+LL |     let x = Some(()).iter().map(|()| 1).sum::<f32>();
+   |             -------- ------ ^^^^^^^^^^^ `Iterator::Item` changed to `{integer}` here
+   |             |        |
+   |             |        `Iterator::Item` is `&()` here
+   |             this expression has type `Option<()>`
+note: required by a bound in `std::iter::Iterator::sum`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/iterators/invalid-iterator-chain.rs b/tests/ui/iterators/invalid-iterator-chain.rs
new file mode 100644
index 000000000..ebdf33303
--- /dev/null
+++ b/tests/ui/iterators/invalid-iterator-chain.rs
@@ -0,0 +1,53 @@
+use std::collections::hash_set::Iter;
+use std::collections::HashSet;
+
+fn iter_to_vec<'b, X>(i: Iter<'b, X>) -> Vec<X> {
+    let i = i.map(|x| x.clone());
+    i.collect() //~ ERROR E0277
+}
+
+fn main() {
+    let scores = vec![(0, 0)]
+        .iter()
+        .map(|(a, b)| {
+            a + b;
+        });
+    println!("{}", scores.sum::<i32>()); //~ ERROR E0277
+    println!(
+        "{}",
+        vec![0, 1]
+            .iter()
+            .map(|x| x * 2)
+            .map(|x| x as f64)
+            .map(|x| x as i64)
+            .filter(|x| *x > 0)
+            .map(|x| { x + 1 })
+            .map(|x| { x; })
+            .sum::<i32>(), //~ ERROR E0277
+    );
+    println!(
+        "{}",
+        vec![0, 1]
+            .iter()
+            .map(|x| x * 2)
+            .map(|x| x as f64)
+            .filter(|x| *x > 0.0)
+            .map(|x| { x + 1.0 })
+            .sum::<i32>(), //~ ERROR E0277
+    );
+    println!("{}", vec![0, 1].iter().map(|x| { x; }).sum::<i32>()); //~ ERROR E0277
+    println!("{}", vec![(), ()].iter().sum::<i32>()); //~ ERROR E0277
+    let a = vec![0];
+    let b = a.into_iter();
+    let c = b.map(|x| x + 1);
+    let d = c.filter(|x| *x > 10 );
+    let e = d.map(|x| {
+        x + 1;
+    });
+    let f = e.filter(|_| false);
+    let g: Vec<i32> = f.collect(); //~ ERROR E0277
+
+    let mut s = HashSet::new();
+    s.insert(1u8);
+    println!("{:?}", iter_to_vec(s.iter()));
+}
diff --git a/tests/ui/iterators/invalid-iterator-chain.stderr b/tests/ui/iterators/invalid-iterator-chain.stderr
new file mode 100644
index 000000000..f3dceca7e
--- /dev/null
+++ b/tests/ui/iterators/invalid-iterator-chain.stderr
@@ -0,0 +1,176 @@
+error[E0277]: a value of type `Vec<X>` cannot be built from an iterator over elements of type `&X`
+  --> $DIR/invalid-iterator-chain.rs:6:7
+   |
+LL |     i.collect()
+   |       ^^^^^^^ value of type `Vec<X>` cannot be built from `std::iter::Iterator<Item=&X>`
+   |
+   = help: the trait `FromIterator<&X>` is not implemented for `Vec<X>`
+   = help: the trait `FromIterator<T>` is implemented for `Vec<T>`
+note: the method call chain might not have had the expected associated types
+  --> $DIR/invalid-iterator-chain.rs:4:26
+   |
+LL | fn iter_to_vec<'b, X>(i: Iter<'b, X>) -> Vec<X> {
+   |                          ^^^^^^^^^^^ `Iterator::Item` is `&X` here
+LL |     let i = i.map(|x| x.clone());
+   |               ------------------ `Iterator::Item` remains `&X` here
+note: required by a bound in `collect`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error[E0277]: a value of type `i32` cannot be made by summing an iterator over elements of type `()`
+  --> $DIR/invalid-iterator-chain.rs:15:27
+   |
+LL |     println!("{}", scores.sum::<i32>());
+   |                           ^^^ value of type `i32` cannot be made by summing a `std::iter::Iterator<Item=()>`
+   |
+   = help: the trait `Sum<()>` is not implemented for `i32`
+   = help: the following other types implement trait `Sum<A>`:
+             <i32 as Sum<&'a i32>>
+             <i32 as Sum>
+note: the method call chain might not have had the expected associated types
+  --> $DIR/invalid-iterator-chain.rs:12:10
+   |
+LL |       let scores = vec![(0, 0)]
+   |                    ------------ this expression has type `Vec<({integer}, {integer})>`
+LL |           .iter()
+   |            ------ `Iterator::Item` is `&({integer}, {integer})` here
+LL |           .map(|(a, b)| {
+   |  __________^
+LL | |             a + b;
+LL | |         });
+   | |__________^ `Iterator::Item` changed to `()` here
+note: required by a bound in `std::iter::Iterator::sum`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error[E0277]: a value of type `i32` cannot be made by summing an iterator over elements of type `()`
+  --> $DIR/invalid-iterator-chain.rs:26:14
+   |
+LL |             .sum::<i32>(),
+   |              ^^^ value of type `i32` cannot be made by summing a `std::iter::Iterator<Item=()>`
+   |
+   = help: the trait `Sum<()>` is not implemented for `i32`
+   = help: the following other types implement trait `Sum<A>`:
+             <i32 as Sum<&'a i32>>
+             <i32 as Sum>
+note: the method call chain might not have had the expected associated types
+  --> $DIR/invalid-iterator-chain.rs:25:14
+   |
+LL |         vec![0, 1]
+   |         ---------- this expression has type `Vec<{integer}>`
+LL |             .iter()
+   |              ------ `Iterator::Item` is `&{integer}` here
+LL |             .map(|x| x * 2)
+   |              -------------- `Iterator::Item` changed to `{integer}` here
+LL |             .map(|x| x as f64)
+   |              ----------------- `Iterator::Item` changed to `f64` here
+LL |             .map(|x| x as i64)
+   |              ----------------- `Iterator::Item` changed to `i64` here
+LL |             .filter(|x| *x > 0)
+   |              ------------------ `Iterator::Item` remains `i64` here
+LL |             .map(|x| { x + 1 })
+   |              ------------------ `Iterator::Item` remains `i64` here
+LL |             .map(|x| { x; })
+   |              ^^^^^^^^^^^^^^^ `Iterator::Item` changed to `()` here
+note: required by a bound in `std::iter::Iterator::sum`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error[E0277]: a value of type `i32` cannot be made by summing an iterator over elements of type `f64`
+  --> $DIR/invalid-iterator-chain.rs:36:14
+   |
+LL |             .sum::<i32>(),
+   |              ^^^ value of type `i32` cannot be made by summing a `std::iter::Iterator<Item=f64>`
+   |
+   = help: the trait `Sum<f64>` is not implemented for `i32`
+   = help: the following other types implement trait `Sum<A>`:
+             <i32 as Sum<&'a i32>>
+             <i32 as Sum>
+note: the method call chain might not have had the expected associated types
+  --> $DIR/invalid-iterator-chain.rs:33:14
+   |
+LL |         vec![0, 1]
+   |         ---------- this expression has type `Vec<{integer}>`
+LL |             .iter()
+   |              ------ `Iterator::Item` is `&{integer}` here
+LL |             .map(|x| x * 2)
+   |              -------------- `Iterator::Item` changed to `{integer}` here
+LL |             .map(|x| x as f64)
+   |              ^^^^^^^^^^^^^^^^^ `Iterator::Item` changed to `f64` here
+LL |             .filter(|x| *x > 0.0)
+   |              -------------------- `Iterator::Item` remains `f64` here
+LL |             .map(|x| { x + 1.0 })
+   |              -------------------- `Iterator::Item` remains `f64` here
+note: required by a bound in `std::iter::Iterator::sum`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error[E0277]: a value of type `i32` cannot be made by summing an iterator over elements of type `()`
+  --> $DIR/invalid-iterator-chain.rs:38:54
+   |
+LL |     println!("{}", vec![0, 1].iter().map(|x| { x; }).sum::<i32>());
+   |                                                      ^^^ value of type `i32` cannot be made by summing a `std::iter::Iterator<Item=()>`
+   |
+   = help: the trait `Sum<()>` is not implemented for `i32`
+   = help: the following other types implement trait `Sum<A>`:
+             <i32 as Sum<&'a i32>>
+             <i32 as Sum>
+note: the method call chain might not have had the expected associated types
+  --> $DIR/invalid-iterator-chain.rs:38:38
+   |
+LL |     println!("{}", vec![0, 1].iter().map(|x| { x; }).sum::<i32>());
+   |                    ---------- ------ ^^^^^^^^^^^^^^^ `Iterator::Item` changed to `()` here
+   |                    |          |
+   |                    |          `Iterator::Item` is `&{integer}` here
+   |                    this expression has type `Vec<{integer}>`
+note: required by a bound in `std::iter::Iterator::sum`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error[E0277]: a value of type `i32` cannot be made by summing an iterator over elements of type `&()`
+  --> $DIR/invalid-iterator-chain.rs:39:40
+   |
+LL |     println!("{}", vec![(), ()].iter().sum::<i32>());
+   |                                        ^^^ value of type `i32` cannot be made by summing a `std::iter::Iterator<Item=&()>`
+   |
+   = help: the trait `Sum<&()>` is not implemented for `i32`
+   = help: the following other types implement trait `Sum<A>`:
+             <i32 as Sum<&'a i32>>
+             <i32 as Sum>
+note: the method call chain might not have had the expected associated types
+  --> $DIR/invalid-iterator-chain.rs:39:33
+   |
+LL |     println!("{}", vec![(), ()].iter().sum::<i32>());
+   |                    ------------ ^^^^^^ `Iterator::Item` is `&()` here
+   |                    |
+   |                    this expression has type `Vec<()>`
+note: required by a bound in `std::iter::Iterator::sum`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error[E0277]: a value of type `Vec<i32>` cannot be built from an iterator over elements of type `()`
+  --> $DIR/invalid-iterator-chain.rs:48:25
+   |
+LL |     let g: Vec<i32> = f.collect();
+   |                         ^^^^^^^ value of type `Vec<i32>` cannot be built from `std::iter::Iterator<Item=()>`
+   |
+   = help: the trait `FromIterator<()>` is not implemented for `Vec<i32>`
+   = help: the trait `FromIterator<T>` is implemented for `Vec<T>`
+note: the method call chain might not have had the expected associated types
+  --> $DIR/invalid-iterator-chain.rs:44:15
+   |
+LL |       let a = vec![0];
+   |               ------- this expression has type `Vec<{integer}>`
+LL |       let b = a.into_iter();
+   |                 ----------- `Iterator::Item` is `{integer}` here
+LL |       let c = b.map(|x| x + 1);
+   |                 -------------- `Iterator::Item` remains `{integer}` here
+LL |       let d = c.filter(|x| *x > 10 );
+   |                 -------------------- `Iterator::Item` remains `{integer}` here
+LL |       let e = d.map(|x| {
+   |  _______________^
+LL | |         x + 1;
+LL | |     });
+   | |______^ `Iterator::Item` changed to `()` here
+LL |       let f = e.filter(|_| false);
+   |                 ----------------- `Iterator::Item` remains `()` here
+note: required by a bound in `collect`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error: aborting due to 7 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/iterators/issue-28098.rs b/tests/ui/iterators/issue-28098.rs
index 80c77edae..80c77edae 100644
--- a/src/test/ui/iterators/issue-28098.rs
+++ b/tests/ui/iterators/issue-28098.rs
diff --git a/src/test/ui/iterators/issue-28098.stderr b/tests/ui/iterators/issue-28098.stderr
index 3256e57d4..3256e57d4 100644
--- a/src/test/ui/iterators/issue-28098.stderr
+++ b/tests/ui/iterators/issue-28098.stderr
diff --git a/src/test/ui/iterators/issue-58952-filter-type-length.rs b/tests/ui/iterators/issue-58952-filter-type-length.rs
index 6d12db8d1..6d12db8d1 100644
--- a/src/test/ui/iterators/issue-58952-filter-type-length.rs
+++ b/tests/ui/iterators/issue-58952-filter-type-length.rs
diff --git a/src/test/ui/iterators/iter-cloned-type-inference.rs b/tests/ui/iterators/iter-cloned-type-inference.rs
index 898e33719..898e33719 100644
--- a/src/test/ui/iterators/iter-cloned-type-inference.rs
+++ b/tests/ui/iterators/iter-cloned-type-inference.rs
diff --git a/src/test/ui/iterators/iter-count-overflow-debug.rs b/tests/ui/iterators/iter-count-overflow-debug.rs
index 8e59c11e9..8e59c11e9 100644
--- a/src/test/ui/iterators/iter-count-overflow-debug.rs
+++ b/tests/ui/iterators/iter-count-overflow-debug.rs
diff --git a/src/test/ui/iterators/iter-count-overflow-ndebug.rs b/tests/ui/iterators/iter-count-overflow-ndebug.rs
index dcaaff671..dcaaff671 100644
--- a/src/test/ui/iterators/iter-count-overflow-ndebug.rs
+++ b/tests/ui/iterators/iter-count-overflow-ndebug.rs
diff --git a/src/test/ui/iterators/iter-map-fold-type-length.rs b/tests/ui/iterators/iter-map-fold-type-length.rs
index 8ce4fcd87..8ce4fcd87 100644
--- a/src/test/ui/iterators/iter-map-fold-type-length.rs
+++ b/tests/ui/iterators/iter-map-fold-type-length.rs
diff --git a/src/test/ui/iterators/iter-position-overflow-debug.rs b/tests/ui/iterators/iter-position-overflow-debug.rs
index 7a871e744..7a871e744 100644
--- a/src/test/ui/iterators/iter-position-overflow-debug.rs
+++ b/tests/ui/iterators/iter-position-overflow-debug.rs
diff --git a/src/test/ui/iterators/iter-position-overflow-ndebug.rs b/tests/ui/iterators/iter-position-overflow-ndebug.rs
index e610c3559..e610c3559 100644
--- a/src/test/ui/iterators/iter-position-overflow-ndebug.rs
+++ b/tests/ui/iterators/iter-position-overflow-ndebug.rs
diff --git a/src/test/ui/iterators/iter-range.rs b/tests/ui/iterators/iter-range.rs
index 993d93790..993d93790 100644
--- a/src/test/ui/iterators/iter-range.rs
+++ b/tests/ui/iterators/iter-range.rs
diff --git a/src/test/ui/iterators/iter-step-overflow-debug.rs b/tests/ui/iterators/iter-step-overflow-debug.rs
index 6aa349ebe..6aa349ebe 100644
--- a/src/test/ui/iterators/iter-step-overflow-debug.rs
+++ b/tests/ui/iterators/iter-step-overflow-debug.rs
diff --git a/src/test/ui/iterators/iter-step-overflow-ndebug.rs b/tests/ui/iterators/iter-step-overflow-ndebug.rs
index 33e708769..33e708769 100644
--- a/src/test/ui/iterators/iter-step-overflow-ndebug.rs
+++ b/tests/ui/iterators/iter-step-overflow-ndebug.rs
diff --git a/src/test/ui/iterators/iter-sum-overflow-debug.rs b/tests/ui/iterators/iter-sum-overflow-debug.rs
index 24c764ff9..24c764ff9 100644
--- a/src/test/ui/iterators/iter-sum-overflow-debug.rs
+++ b/tests/ui/iterators/iter-sum-overflow-debug.rs
diff --git a/src/test/ui/iterators/iter-sum-overflow-ndebug.rs b/tests/ui/iterators/iter-sum-overflow-ndebug.rs
index 69f4744cc..69f4744cc 100644
--- a/src/test/ui/iterators/iter-sum-overflow-ndebug.rs
+++ b/tests/ui/iterators/iter-sum-overflow-ndebug.rs
diff --git a/src/test/ui/iterators/iter-sum-overflow-overflow-checks.rs b/tests/ui/iterators/iter-sum-overflow-overflow-checks.rs
index be45c075d..be45c075d 100644
--- a/src/test/ui/iterators/iter-sum-overflow-overflow-checks.rs
+++ b/tests/ui/iterators/iter-sum-overflow-overflow-checks.rs
diff --git a/src/test/ui/iterators/ranges.rs b/tests/ui/iterators/ranges.rs
index 925d2d61a..925d2d61a 100644
--- a/src/test/ui/iterators/ranges.rs
+++ b/tests/ui/iterators/ranges.rs
diff --git a/src/test/ui/iterators/ranges.stderr b/tests/ui/iterators/ranges.stderr
index b9fbcd530..b9fbcd530 100644
--- a/src/test/ui/iterators/ranges.stderr
+++ b/tests/ui/iterators/ranges.stderr
diff --git a/src/test/ui/iterators/rsplit-clone.rs b/tests/ui/iterators/rsplit-clone.rs
index 911da7429..911da7429 100644
--- a/src/test/ui/iterators/rsplit-clone.rs
+++ b/tests/ui/iterators/rsplit-clone.rs
diff --git a/src/test/ui/iterators/skip-count-overflow.rs b/tests/ui/iterators/skip-count-overflow.rs
index 64dee3e3c..64dee3e3c 100644
--- a/src/test/ui/iterators/skip-count-overflow.rs
+++ b/tests/ui/iterators/skip-count-overflow.rs
diff --git a/src/test/ui/iterators/string.rs b/tests/ui/iterators/string.rs
index ad58a463e..ad58a463e 100644
--- a/src/test/ui/iterators/string.rs
+++ b/tests/ui/iterators/string.rs
diff --git a/src/test/ui/iterators/string.stderr b/tests/ui/iterators/string.stderr
index ddfe0169b..ddfe0169b 100644
--- a/src/test/ui/iterators/string.stderr
+++ b/tests/ui/iterators/string.stderr
diff --git a/src/test/ui/iterators/vec-on-unimplemented.rs b/tests/ui/iterators/vec-on-unimplemented.rs
index 42b5d36bf..42b5d36bf 100644
--- a/src/test/ui/iterators/vec-on-unimplemented.rs
+++ b/tests/ui/iterators/vec-on-unimplemented.rs
diff --git a/tests/ui/iterators/vec-on-unimplemented.stderr b/tests/ui/iterators/vec-on-unimplemented.stderr
new file mode 100644
index 000000000..a7d9c481a
--- /dev/null
+++ b/tests/ui/iterators/vec-on-unimplemented.stderr
@@ -0,0 +1,18 @@
+error[E0599]: `Vec<bool>` is not an iterator
+  --> $DIR/vec-on-unimplemented.rs:2:23
+   |
+LL |     vec![true, false].map(|v| !v).collect::<Vec<_>>();
+   |                       ^^^ `Vec<bool>` is not an iterator; try calling `.into_iter()` or `.iter()`
+  --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
+   |
+   = note: doesn't satisfy `Vec<bool>: Iterator`
+   |
+   = note: the following trait bounds were not satisfied:
+           `Vec<bool>: Iterator`
+           which is required by `&mut Vec<bool>: Iterator`
+           `[bool]: Iterator`
+           which is required by `&mut [bool]: Iterator`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/json/json-and-color.rs b/tests/ui/json/json-and-color.rs
index 6f8326fe2..6f8326fe2 100644
--- a/src/test/ui/json/json-and-color.rs
+++ b/tests/ui/json/json-and-color.rs
diff --git a/src/test/ui/json/json-and-color.stderr b/tests/ui/json/json-and-color.stderr
index 1cda6af09..1cda6af09 100644
--- a/src/test/ui/json/json-and-color.stderr
+++ b/tests/ui/json/json-and-color.stderr
diff --git a/src/test/ui/json/json-and-error-format.rs b/tests/ui/json/json-and-error-format.rs
index 6e2d73c76..6e2d73c76 100644
--- a/src/test/ui/json/json-and-error-format.rs
+++ b/tests/ui/json/json-and-error-format.rs
diff --git a/src/test/ui/json/json-and-error-format.stderr b/tests/ui/json/json-and-error-format.stderr
index 80e022137..80e022137 100644
--- a/src/test/ui/json/json-and-error-format.stderr
+++ b/tests/ui/json/json-and-error-format.stderr
diff --git a/src/test/ui/json/json-bom-plus-crlf-multifile-aux.rs b/tests/ui/json/json-bom-plus-crlf-multifile-aux.rs
index 991ea1d85..991ea1d85 100644
--- a/src/test/ui/json/json-bom-plus-crlf-multifile-aux.rs
+++ b/tests/ui/json/json-bom-plus-crlf-multifile-aux.rs
diff --git a/src/test/ui/json/json-bom-plus-crlf-multifile.rs b/tests/ui/json/json-bom-plus-crlf-multifile.rs
index 9290e0104..9290e0104 100644
--- a/src/test/ui/json/json-bom-plus-crlf-multifile.rs
+++ b/tests/ui/json/json-bom-plus-crlf-multifile.rs
diff --git a/src/test/ui/json/json-bom-plus-crlf-multifile.stderr b/tests/ui/json/json-bom-plus-crlf-multifile.stderr
index 02f3bc687..02f3bc687 100644
--- a/src/test/ui/json/json-bom-plus-crlf-multifile.stderr
+++ b/tests/ui/json/json-bom-plus-crlf-multifile.stderr
diff --git a/src/test/ui/json/json-bom-plus-crlf.rs b/tests/ui/json/json-bom-plus-crlf.rs
index be5b7dd2a..be5b7dd2a 100644
--- a/src/test/ui/json/json-bom-plus-crlf.rs
+++ b/tests/ui/json/json-bom-plus-crlf.rs
diff --git a/src/test/ui/json/json-bom-plus-crlf.stderr b/tests/ui/json/json-bom-plus-crlf.stderr
index df6bd7286..df6bd7286 100644
--- a/src/test/ui/json/json-bom-plus-crlf.stderr
+++ b/tests/ui/json/json-bom-plus-crlf.stderr
diff --git a/src/test/ui/json/json-invalid.rs b/tests/ui/json/json-invalid.rs
index 54d0dd184..54d0dd184 100644
--- a/src/test/ui/json/json-invalid.rs
+++ b/tests/ui/json/json-invalid.rs
diff --git a/src/test/ui/json/json-invalid.stderr b/tests/ui/json/json-invalid.stderr
index 18bc76ab7..18bc76ab7 100644
--- a/src/test/ui/json/json-invalid.stderr
+++ b/tests/ui/json/json-invalid.stderr
diff --git a/src/test/ui/json/json-multiple.polonius.stderr b/tests/ui/json/json-multiple.polonius.stderr
index 0e4d442f2..0e4d442f2 100644
--- a/src/test/ui/json/json-multiple.polonius.stderr
+++ b/tests/ui/json/json-multiple.polonius.stderr
diff --git a/src/test/ui/json/json-multiple.rs b/tests/ui/json/json-multiple.rs
index fb126339d..fb126339d 100644
--- a/src/test/ui/json/json-multiple.rs
+++ b/tests/ui/json/json-multiple.rs
diff --git a/src/test/ui/json/json-multiple.stderr b/tests/ui/json/json-multiple.stderr
index 55ccfd5fa..55ccfd5fa 100644
--- a/src/test/ui/json/json-multiple.stderr
+++ b/tests/ui/json/json-multiple.stderr
diff --git a/src/test/ui/json/json-options.polonius.stderr b/tests/ui/json/json-options.polonius.stderr
index e21f6f85d..e21f6f85d 100644
--- a/src/test/ui/json/json-options.polonius.stderr
+++ b/tests/ui/json/json-options.polonius.stderr
diff --git a/src/test/ui/json/json-options.rs b/tests/ui/json/json-options.rs
index 8b6ba131e..8b6ba131e 100644
--- a/src/test/ui/json/json-options.rs
+++ b/tests/ui/json/json-options.rs
diff --git a/src/test/ui/json/json-options.stderr b/tests/ui/json/json-options.stderr
index 645a26f5a..645a26f5a 100644
--- a/src/test/ui/json/json-options.stderr
+++ b/tests/ui/json/json-options.stderr
diff --git a/src/test/ui/json/json-short.rs b/tests/ui/json/json-short.rs
index 7414a5586..7414a5586 100644
--- a/src/test/ui/json/json-short.rs
+++ b/tests/ui/json/json-short.rs
diff --git a/src/test/ui/json/json-short.stderr b/tests/ui/json/json-short.stderr
index 3bd85b083..3bd85b083 100644
--- a/src/test/ui/json/json-short.stderr
+++ b/tests/ui/json/json-short.stderr
diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-expr.rs b/tests/ui/keyword/extern/keyword-extern-as-identifier-expr.rs
index b738eb4c7..b738eb4c7 100644
--- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-expr.rs
+++ b/tests/ui/keyword/extern/keyword-extern-as-identifier-expr.rs
diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-expr.stderr b/tests/ui/keyword/extern/keyword-extern-as-identifier-expr.stderr
index 8bb89d2ee..8bb89d2ee 100644
--- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-expr.stderr
+++ b/tests/ui/keyword/extern/keyword-extern-as-identifier-expr.stderr
diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-pat.rs b/tests/ui/keyword/extern/keyword-extern-as-identifier-pat.rs
index 8a420f720..8a420f720 100644
--- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-pat.rs
+++ b/tests/ui/keyword/extern/keyword-extern-as-identifier-pat.rs
diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-pat.stderr b/tests/ui/keyword/extern/keyword-extern-as-identifier-pat.stderr
index 9bf416341..9bf416341 100644
--- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-pat.stderr
+++ b/tests/ui/keyword/extern/keyword-extern-as-identifier-pat.stderr
diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-type.rs b/tests/ui/keyword/extern/keyword-extern-as-identifier-type.rs
index 12aa05976..12aa05976 100644
--- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-type.rs
+++ b/tests/ui/keyword/extern/keyword-extern-as-identifier-type.rs
diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-type.stderr b/tests/ui/keyword/extern/keyword-extern-as-identifier-type.stderr
index 20ecf6bac..20ecf6bac 100644
--- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-type.stderr
+++ b/tests/ui/keyword/extern/keyword-extern-as-identifier-type.stderr
diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-use.rs b/tests/ui/keyword/extern/keyword-extern-as-identifier-use.rs
index a46ce67d4..a46ce67d4 100644
--- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-use.rs
+++ b/tests/ui/keyword/extern/keyword-extern-as-identifier-use.rs
diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-use.stderr b/tests/ui/keyword/extern/keyword-extern-as-identifier-use.stderr
index 54ee45c28..54ee45c28 100644
--- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-use.stderr
+++ b/tests/ui/keyword/extern/keyword-extern-as-identifier-use.stderr
diff --git a/src/test/ui/keyword/keyword-false-as-identifier.rs b/tests/ui/keyword/keyword-false-as-identifier.rs
index 6382f841b..6382f841b 100644
--- a/src/test/ui/keyword/keyword-false-as-identifier.rs
+++ b/tests/ui/keyword/keyword-false-as-identifier.rs
diff --git a/src/test/ui/keyword/keyword-false-as-identifier.stderr b/tests/ui/keyword/keyword-false-as-identifier.stderr
index 6dcfa3a48..6dcfa3a48 100644
--- a/src/test/ui/keyword/keyword-false-as-identifier.stderr
+++ b/tests/ui/keyword/keyword-false-as-identifier.stderr
diff --git a/src/test/ui/keyword/keyword-self-as-identifier.rs b/tests/ui/keyword/keyword-self-as-identifier.rs
index 72e4f01e2..72e4f01e2 100644
--- a/src/test/ui/keyword/keyword-self-as-identifier.rs
+++ b/tests/ui/keyword/keyword-self-as-identifier.rs
diff --git a/src/test/ui/keyword/keyword-self-as-identifier.stderr b/tests/ui/keyword/keyword-self-as-identifier.stderr
index 060e7c3ea..060e7c3ea 100644
--- a/src/test/ui/keyword/keyword-self-as-identifier.stderr
+++ b/tests/ui/keyword/keyword-self-as-identifier.stderr
diff --git a/src/test/ui/keyword/keyword-self-as-type-param.rs b/tests/ui/keyword/keyword-self-as-type-param.rs
index 55c7ac128..55c7ac128 100644
--- a/src/test/ui/keyword/keyword-self-as-type-param.rs
+++ b/tests/ui/keyword/keyword-self-as-type-param.rs
diff --git a/src/test/ui/keyword/keyword-self-as-type-param.stderr b/tests/ui/keyword/keyword-self-as-type-param.stderr
index 5aef94754..5aef94754 100644
--- a/src/test/ui/keyword/keyword-self-as-type-param.stderr
+++ b/tests/ui/keyword/keyword-self-as-type-param.stderr
diff --git a/src/test/ui/keyword/keyword-super-as-identifier.rs b/tests/ui/keyword/keyword-super-as-identifier.rs
index 02c1b27b0..02c1b27b0 100644
--- a/src/test/ui/keyword/keyword-super-as-identifier.rs
+++ b/tests/ui/keyword/keyword-super-as-identifier.rs
diff --git a/src/test/ui/keyword/keyword-super-as-identifier.stderr b/tests/ui/keyword/keyword-super-as-identifier.stderr
index 1f64f3b73..1f64f3b73 100644
--- a/src/test/ui/keyword/keyword-super-as-identifier.stderr
+++ b/tests/ui/keyword/keyword-super-as-identifier.stderr
diff --git a/src/test/ui/keyword/keyword-super.rs b/tests/ui/keyword/keyword-super.rs
index c121a6c10..c121a6c10 100644
--- a/src/test/ui/keyword/keyword-super.rs
+++ b/tests/ui/keyword/keyword-super.rs
diff --git a/src/test/ui/keyword/keyword-super.stderr b/tests/ui/keyword/keyword-super.stderr
index 0e0d67cb9..0e0d67cb9 100644
--- a/src/test/ui/keyword/keyword-super.stderr
+++ b/tests/ui/keyword/keyword-super.stderr
diff --git a/src/test/ui/keyword/keyword-true-as-identifier.rs b/tests/ui/keyword/keyword-true-as-identifier.rs
index 8c4ad7e2a..8c4ad7e2a 100644
--- a/src/test/ui/keyword/keyword-true-as-identifier.rs
+++ b/tests/ui/keyword/keyword-true-as-identifier.rs
diff --git a/src/test/ui/keyword/keyword-true-as-identifier.stderr b/tests/ui/keyword/keyword-true-as-identifier.stderr
index 86f6e0006..86f6e0006 100644
--- a/src/test/ui/keyword/keyword-true-as-identifier.stderr
+++ b/tests/ui/keyword/keyword-true-as-identifier.stderr
diff --git a/src/test/ui/kindck/kindck-copy.rs b/tests/ui/kindck/kindck-copy.rs
index 6df98c230..6df98c230 100644
--- a/src/test/ui/kindck/kindck-copy.rs
+++ b/tests/ui/kindck/kindck-copy.rs
diff --git a/src/test/ui/kindck/kindck-copy.stderr b/tests/ui/kindck/kindck-copy.stderr
index 9af89159a..aee2aa98a 100644
--- a/src/test/ui/kindck/kindck-copy.stderr
+++ b/tests/ui/kindck/kindck-copy.stderr
@@ -4,12 +4,16 @@ error[E0277]: the trait bound `&'static mut isize: Copy` is not satisfied
 LL |     assert_copy::<&'static mut isize>();
    |                   ^^^^^^^^^^^^^^^^^^ the trait `Copy` is not implemented for `&'static mut isize`
    |
-   = help: the trait `Copy` is implemented for `isize`
 note: required by a bound in `assert_copy`
   --> $DIR/kindck-copy.rs:5:18
    |
 LL | fn assert_copy<T:Copy>() { }
    |                  ^^^^ required by this bound in `assert_copy`
+help: consider removing the leading `&`-reference
+   |
+LL -     assert_copy::<&'static mut isize>();
+LL +     assert_copy::<isize>();
+   |
 
 error[E0277]: the trait bound `&'a mut isize: Copy` is not satisfied
   --> $DIR/kindck-copy.rs:28:19
@@ -17,12 +21,16 @@ error[E0277]: the trait bound `&'a mut isize: Copy` is not satisfied
 LL |     assert_copy::<&'a mut isize>();
    |                   ^^^^^^^^^^^^^ the trait `Copy` is not implemented for `&'a mut isize`
    |
-   = help: the trait `Copy` is implemented for `isize`
 note: required by a bound in `assert_copy`
   --> $DIR/kindck-copy.rs:5:18
    |
 LL | fn assert_copy<T:Copy>() { }
    |                  ^^^^ required by this bound in `assert_copy`
+help: consider removing the leading `&`-reference
+   |
+LL -     assert_copy::<&'a mut isize>();
+LL +     assert_copy::<isize>();
+   |
 
 error[E0277]: the trait bound `Box<isize>: Copy` is not satisfied
   --> $DIR/kindck-copy.rs:31:19
diff --git a/src/test/ui/kindck/kindck-impl-type-params-2.rs b/tests/ui/kindck/kindck-impl-type-params-2.rs
index 8950fc51e..8950fc51e 100644
--- a/src/test/ui/kindck/kindck-impl-type-params-2.rs
+++ b/tests/ui/kindck/kindck-impl-type-params-2.rs
diff --git a/src/test/ui/kindck/kindck-impl-type-params-2.stderr b/tests/ui/kindck/kindck-impl-type-params-2.stderr
index 930d96375..1d26ae51f 100644
--- a/src/test/ui/kindck/kindck-impl-type-params-2.stderr
+++ b/tests/ui/kindck/kindck-impl-type-params-2.stderr
@@ -10,7 +10,9 @@ note: required for `Box<{integer}>` to implement `Foo`
   --> $DIR/kindck-impl-type-params-2.rs:6:14
    |
 LL | impl<T:Copy> Foo for T {
-   |              ^^^     ^
+   |        ----  ^^^     ^
+   |        |
+   |        unsatisfied trait bound introduced here
 note: required by a bound in `take_param`
   --> $DIR/kindck-impl-type-params-2.rs:9:17
    |
diff --git a/src/test/ui/kindck/kindck-impl-type-params.rs b/tests/ui/kindck/kindck-impl-type-params.rs
index 72a6599c3..72a6599c3 100644
--- a/src/test/ui/kindck/kindck-impl-type-params.rs
+++ b/tests/ui/kindck/kindck-impl-type-params.rs
diff --git a/src/test/ui/kindck/kindck-impl-type-params.stderr b/tests/ui/kindck/kindck-impl-type-params.stderr
index 8dbe0c38c..6fd1fc3f7 100644
--- a/src/test/ui/kindck/kindck-impl-type-params.stderr
+++ b/tests/ui/kindck/kindck-impl-type-params.stderr
@@ -8,7 +8,9 @@ note: required for `S<T>` to implement `Gettable<T>`
   --> $DIR/kindck-impl-type-params.rs:12:32
    |
 LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
-   |                                ^^^^^^^^^^^     ^^^^
+   |         ----                   ^^^^^^^^^^^     ^^^^
+   |         |
+   |         unsatisfied trait bound introduced here
    = note: required for the cast from `S<T>` to the object type `dyn Gettable<T>`
 help: consider restricting type parameter `T`
    |
@@ -25,7 +27,9 @@ note: required for `S<T>` to implement `Gettable<T>`
   --> $DIR/kindck-impl-type-params.rs:12:32
    |
 LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
-   |                                ^^^^^^^^^^^     ^^^^
+   |                ----            ^^^^^^^^^^^     ^^^^
+   |                |
+   |                unsatisfied trait bound introduced here
    = note: required for the cast from `S<T>` to the object type `dyn Gettable<T>`
 help: consider restricting type parameter `T`
    |
@@ -42,7 +46,9 @@ note: required for `S<T>` to implement `Gettable<T>`
   --> $DIR/kindck-impl-type-params.rs:12:32
    |
 LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
-   |                                ^^^^^^^^^^^     ^^^^
+   |         ----                   ^^^^^^^^^^^     ^^^^
+   |         |
+   |         unsatisfied trait bound introduced here
    = note: required for the cast from `S<T>` to the object type `dyn Gettable<T>`
 help: consider restricting type parameter `T`
    |
@@ -59,7 +65,9 @@ note: required for `S<T>` to implement `Gettable<T>`
   --> $DIR/kindck-impl-type-params.rs:12:32
    |
 LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
-   |                                ^^^^^^^^^^^     ^^^^
+   |                ----            ^^^^^^^^^^^     ^^^^
+   |                |
+   |                unsatisfied trait bound introduced here
    = note: required for the cast from `S<T>` to the object type `dyn Gettable<T>`
 help: consider restricting type parameter `T`
    |
@@ -77,7 +85,9 @@ note: required for `S<String>` to implement `Gettable<String>`
   --> $DIR/kindck-impl-type-params.rs:12:32
    |
 LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
-   |                                ^^^^^^^^^^^     ^^^^
+   |                ----            ^^^^^^^^^^^     ^^^^
+   |                |
+   |                unsatisfied trait bound introduced here
    = note: required for the cast from `S<String>` to the object type `dyn Gettable<String>`
 
 error[E0277]: the trait bound `Foo: Copy` is not satisfied
@@ -91,7 +101,9 @@ note: required for `S<Foo>` to implement `Gettable<Foo>`
   --> $DIR/kindck-impl-type-params.rs:12:32
    |
 LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
-   |                                ^^^^^^^^^^^     ^^^^
+   |                ----            ^^^^^^^^^^^     ^^^^
+   |                |
+   |                unsatisfied trait bound introduced here
    = note: required for the cast from `S<Foo>` to the object type `dyn Gettable<Foo>`
 help: consider annotating `Foo` with `#[derive(Copy)]`
    |
diff --git a/src/test/ui/kindck/kindck-inherited-copy-bound.curr.stderr b/tests/ui/kindck/kindck-inherited-copy-bound.curr.stderr
index e81d2441e..8d45748a6 100644
--- a/src/test/ui/kindck/kindck-inherited-copy-bound.curr.stderr
+++ b/tests/ui/kindck/kindck-inherited-copy-bound.curr.stderr
@@ -10,7 +10,9 @@ note: required for `Box<{integer}>` to implement `Foo`
   --> $DIR/kindck-inherited-copy-bound.rs:14:14
    |
 LL | impl<T:Copy> Foo for T {
-   |              ^^^     ^
+   |        ----  ^^^     ^
+   |        |
+   |        unsatisfied trait bound introduced here
 note: required by a bound in `take_param`
   --> $DIR/kindck-inherited-copy-bound.rs:17:17
    |
diff --git a/src/test/ui/kindck/kindck-inherited-copy-bound.object_safe_for_dispatch.stderr b/tests/ui/kindck/kindck-inherited-copy-bound.object_safe_for_dispatch.stderr
index 2380533b9..2fbb5a98a 100644
--- a/src/test/ui/kindck/kindck-inherited-copy-bound.object_safe_for_dispatch.stderr
+++ b/tests/ui/kindck/kindck-inherited-copy-bound.object_safe_for_dispatch.stderr
@@ -10,7 +10,9 @@ note: required for `Box<{integer}>` to implement `Foo`
   --> $DIR/kindck-inherited-copy-bound.rs:14:14
    |
 LL | impl<T:Copy> Foo for T {
-   |              ^^^     ^
+   |        ----  ^^^     ^
+   |        |
+   |        unsatisfied trait bound introduced here
 note: required by a bound in `take_param`
   --> $DIR/kindck-inherited-copy-bound.rs:17:17
    |
diff --git a/src/test/ui/kindck/kindck-inherited-copy-bound.rs b/tests/ui/kindck/kindck-inherited-copy-bound.rs
index 87d47556b..87d47556b 100644
--- a/src/test/ui/kindck/kindck-inherited-copy-bound.rs
+++ b/tests/ui/kindck/kindck-inherited-copy-bound.rs
diff --git a/src/test/ui/kindck/kindck-nonsendable-1.rs b/tests/ui/kindck/kindck-nonsendable-1.rs
index b32fd7862..b32fd7862 100644
--- a/src/test/ui/kindck/kindck-nonsendable-1.rs
+++ b/tests/ui/kindck/kindck-nonsendable-1.rs
diff --git a/src/test/ui/kindck/kindck-nonsendable-1.stderr b/tests/ui/kindck/kindck-nonsendable-1.stderr
index cc6e1f59c..cc6e1f59c 100644
--- a/src/test/ui/kindck/kindck-nonsendable-1.stderr
+++ b/tests/ui/kindck/kindck-nonsendable-1.stderr
diff --git a/src/test/ui/kindck/kindck-send-object.rs b/tests/ui/kindck/kindck-send-object.rs
index 6411e688b..6411e688b 100644
--- a/src/test/ui/kindck/kindck-send-object.rs
+++ b/tests/ui/kindck/kindck-send-object.rs
diff --git a/src/test/ui/kindck/kindck-send-object.stderr b/tests/ui/kindck/kindck-send-object.stderr
index e9bbeeacd..e9bbeeacd 100644
--- a/src/test/ui/kindck/kindck-send-object.stderr
+++ b/tests/ui/kindck/kindck-send-object.stderr
diff --git a/src/test/ui/kindck/kindck-send-object1.rs b/tests/ui/kindck/kindck-send-object1.rs
index 787d0f8f6..787d0f8f6 100644
--- a/src/test/ui/kindck/kindck-send-object1.rs
+++ b/tests/ui/kindck/kindck-send-object1.rs
diff --git a/src/test/ui/kindck/kindck-send-object1.stderr b/tests/ui/kindck/kindck-send-object1.stderr
index 11f597fee..11f597fee 100644
--- a/src/test/ui/kindck/kindck-send-object1.stderr
+++ b/tests/ui/kindck/kindck-send-object1.stderr
diff --git a/src/test/ui/kindck/kindck-send-object2.rs b/tests/ui/kindck/kindck-send-object2.rs
index b797588e4..b797588e4 100644
--- a/src/test/ui/kindck/kindck-send-object2.rs
+++ b/tests/ui/kindck/kindck-send-object2.rs
diff --git a/src/test/ui/kindck/kindck-send-object2.stderr b/tests/ui/kindck/kindck-send-object2.stderr
index b8af33d0d..b8af33d0d 100644
--- a/src/test/ui/kindck/kindck-send-object2.stderr
+++ b/tests/ui/kindck/kindck-send-object2.stderr
diff --git a/src/test/ui/kindck/kindck-send-owned.rs b/tests/ui/kindck/kindck-send-owned.rs
index 65efb6904..65efb6904 100644
--- a/src/test/ui/kindck/kindck-send-owned.rs
+++ b/tests/ui/kindck/kindck-send-owned.rs
diff --git a/src/test/ui/kindck/kindck-send-owned.stderr b/tests/ui/kindck/kindck-send-owned.stderr
index b03f56465..b03f56465 100644
--- a/src/test/ui/kindck/kindck-send-owned.stderr
+++ b/tests/ui/kindck/kindck-send-owned.stderr
diff --git a/src/test/ui/kindck/kindck-send-unsafe.rs b/tests/ui/kindck/kindck-send-unsafe.rs
index 4ef30a71f..4ef30a71f 100644
--- a/src/test/ui/kindck/kindck-send-unsafe.rs
+++ b/tests/ui/kindck/kindck-send-unsafe.rs
diff --git a/src/test/ui/kindck/kindck-send-unsafe.rs~rust-lang_master b/tests/ui/kindck/kindck-send-unsafe.rs~rust-lang_master
index 3f0444ec9..3f0444ec9 100644
--- a/src/test/ui/kindck/kindck-send-unsafe.rs~rust-lang_master
+++ b/tests/ui/kindck/kindck-send-unsafe.rs~rust-lang_master
diff --git a/src/test/ui/kindck/kindck-send-unsafe.stderr b/tests/ui/kindck/kindck-send-unsafe.stderr
index ceed0053c..ceed0053c 100644
--- a/src/test/ui/kindck/kindck-send-unsafe.stderr
+++ b/tests/ui/kindck/kindck-send-unsafe.stderr
diff --git a/src/test/ui/kinds-in-metadata.rs b/tests/ui/kinds-in-metadata.rs
index 136037a7a..136037a7a 100644
--- a/src/test/ui/kinds-in-metadata.rs
+++ b/tests/ui/kinds-in-metadata.rs
diff --git a/src/test/ui/kinds-of-primitive-impl.rs b/tests/ui/kinds-of-primitive-impl.rs
index 6a067a9a3..6a067a9a3 100644
--- a/src/test/ui/kinds-of-primitive-impl.rs
+++ b/tests/ui/kinds-of-primitive-impl.rs
diff --git a/src/test/ui/kinds-of-primitive-impl.stderr b/tests/ui/kinds-of-primitive-impl.stderr
index f4dbd1c40..f4dbd1c40 100644
--- a/src/test/ui/kinds-of-primitive-impl.stderr
+++ b/tests/ui/kinds-of-primitive-impl.stderr
diff --git a/src/test/ui/label/label-beginning-with-underscore.rs b/tests/ui/label/label-beginning-with-underscore.rs
index 4b620864a..4b620864a 100644
--- a/src/test/ui/label/label-beginning-with-underscore.rs
+++ b/tests/ui/label/label-beginning-with-underscore.rs
diff --git a/src/test/ui/label/label-static.rs b/tests/ui/label/label-static.rs
index 95e764d01..95e764d01 100644
--- a/src/test/ui/label/label-static.rs
+++ b/tests/ui/label/label-static.rs
diff --git a/src/test/ui/label/label-static.stderr b/tests/ui/label/label-static.stderr
index 1d3251d1b..1d3251d1b 100644
--- a/src/test/ui/label/label-static.stderr
+++ b/tests/ui/label/label-static.stderr
diff --git a/src/test/ui/label/label-underscore.rs b/tests/ui/label/label-underscore.rs
index de67f3d2c..de67f3d2c 100644
--- a/src/test/ui/label/label-underscore.rs
+++ b/tests/ui/label/label-underscore.rs
diff --git a/src/test/ui/label/label-underscore.stderr b/tests/ui/label/label-underscore.stderr
index 4558ec4cb..4558ec4cb 100644
--- a/src/test/ui/label/label-underscore.stderr
+++ b/tests/ui/label/label-underscore.stderr
diff --git a/src/test/ui/label/label_break_value_continue.rs b/tests/ui/label/label_break_value_continue.rs
index 22172f4fd..22172f4fd 100644
--- a/src/test/ui/label/label_break_value_continue.rs
+++ b/tests/ui/label/label_break_value_continue.rs
diff --git a/src/test/ui/label/label_break_value_continue.stderr b/tests/ui/label/label_break_value_continue.stderr
index 284d213d6..284d213d6 100644
--- a/src/test/ui/label/label_break_value_continue.stderr
+++ b/tests/ui/label/label_break_value_continue.stderr
diff --git a/src/test/ui/label/label_break_value_desugared_break.rs b/tests/ui/label/label_break_value_desugared_break.rs
index 70227d869..70227d869 100644
--- a/src/test/ui/label/label_break_value_desugared_break.rs
+++ b/tests/ui/label/label_break_value_desugared_break.rs
diff --git a/src/test/ui/label/label_break_value_illegal_uses.fixed b/tests/ui/label/label_break_value_illegal_uses.fixed
index fb75276b4..fb75276b4 100644
--- a/src/test/ui/label/label_break_value_illegal_uses.fixed
+++ b/tests/ui/label/label_break_value_illegal_uses.fixed
diff --git a/src/test/ui/label/label_break_value_illegal_uses.rs b/tests/ui/label/label_break_value_illegal_uses.rs
index 3cbf41380..3cbf41380 100644
--- a/src/test/ui/label/label_break_value_illegal_uses.rs
+++ b/tests/ui/label/label_break_value_illegal_uses.rs
diff --git a/src/test/ui/label/label_break_value_illegal_uses.stderr b/tests/ui/label/label_break_value_illegal_uses.stderr
index 15016ffd5..15016ffd5 100644
--- a/src/test/ui/label/label_break_value_illegal_uses.stderr
+++ b/tests/ui/label/label_break_value_illegal_uses.stderr
diff --git a/src/test/ui/label/label_break_value_unlabeled_break.rs b/tests/ui/label/label_break_value_unlabeled_break.rs
index 2a4f5d574..2a4f5d574 100644
--- a/src/test/ui/label/label_break_value_unlabeled_break.rs
+++ b/tests/ui/label/label_break_value_unlabeled_break.rs
diff --git a/src/test/ui/label/label_break_value_unlabeled_break.stderr b/tests/ui/label/label_break_value_unlabeled_break.stderr
index a2ccd27b8..a2ccd27b8 100644
--- a/src/test/ui/label/label_break_value_unlabeled_break.stderr
+++ b/tests/ui/label/label_break_value_unlabeled_break.stderr
diff --git a/src/test/ui/label/label_misspelled.rs b/tests/ui/label/label_misspelled.rs
index e3180b06e..e3180b06e 100644
--- a/src/test/ui/label/label_misspelled.rs
+++ b/tests/ui/label/label_misspelled.rs
diff --git a/src/test/ui/label/label_misspelled.stderr b/tests/ui/label/label_misspelled.stderr
index 4b5b9e92c..4b5b9e92c 100644
--- a/src/test/ui/label/label_misspelled.stderr
+++ b/tests/ui/label/label_misspelled.stderr
diff --git a/src/test/ui/label/label_misspelled_2.rs b/tests/ui/label/label_misspelled_2.rs
index 55bbe6b30..55bbe6b30 100644
--- a/src/test/ui/label/label_misspelled_2.rs
+++ b/tests/ui/label/label_misspelled_2.rs
diff --git a/src/test/ui/label/label_misspelled_2.stderr b/tests/ui/label/label_misspelled_2.stderr
index 960646d98..960646d98 100644
--- a/src/test/ui/label/label_misspelled_2.stderr
+++ b/tests/ui/label/label_misspelled_2.stderr
diff --git a/src/test/ui/lambda-infer-unresolved.rs b/tests/ui/lambda-infer-unresolved.rs
index 9cc466b28..9cc466b28 100644
--- a/src/test/ui/lambda-infer-unresolved.rs
+++ b/tests/ui/lambda-infer-unresolved.rs
diff --git a/src/test/ui/lang-items/fn-fn_mut-call-ill-formed.rs b/tests/ui/lang-items/fn-fn_mut-call-ill-formed.rs
index 52bd8136d..52bd8136d 100644
--- a/src/test/ui/lang-items/fn-fn_mut-call-ill-formed.rs
+++ b/tests/ui/lang-items/fn-fn_mut-call-ill-formed.rs
diff --git a/src/test/ui/lang-items/fn-fn_mut-call-ill-formed.stderr b/tests/ui/lang-items/fn-fn_mut-call-ill-formed.stderr
index 82bdae270..82bdae270 100644
--- a/src/test/ui/lang-items/fn-fn_mut-call-ill-formed.stderr
+++ b/tests/ui/lang-items/fn-fn_mut-call-ill-formed.stderr
diff --git a/src/test/ui/lang-items/issue-19660.rs b/tests/ui/lang-items/issue-19660.rs
index 400ac310b..400ac310b 100644
--- a/src/test/ui/lang-items/issue-19660.rs
+++ b/tests/ui/lang-items/issue-19660.rs
diff --git a/src/test/ui/lang-items/issue-19660.stderr b/tests/ui/lang-items/issue-19660.stderr
index f5d903f38..f5d903f38 100644
--- a/src/test/ui/lang-items/issue-19660.stderr
+++ b/tests/ui/lang-items/issue-19660.stderr
diff --git a/src/test/ui/lang-items/issue-31076.rs b/tests/ui/lang-items/issue-31076.rs
index cdb196d4f..cdb196d4f 100644
--- a/src/test/ui/lang-items/issue-31076.rs
+++ b/tests/ui/lang-items/issue-31076.rs
diff --git a/src/test/ui/lang-items/issue-31076.stderr b/tests/ui/lang-items/issue-31076.stderr
index ac0d9dc75..ac0d9dc75 100644
--- a/src/test/ui/lang-items/issue-31076.stderr
+++ b/tests/ui/lang-items/issue-31076.stderr
diff --git a/src/test/ui/lang-items/issue-83471.rs b/tests/ui/lang-items/issue-83471.rs
index b32aa0341..b32aa0341 100644
--- a/src/test/ui/lang-items/issue-83471.rs
+++ b/tests/ui/lang-items/issue-83471.rs
diff --git a/src/test/ui/lang-items/issue-83471.stderr b/tests/ui/lang-items/issue-83471.stderr
index b315df179..b315df179 100644
--- a/src/test/ui/lang-items/issue-83471.stderr
+++ b/tests/ui/lang-items/issue-83471.stderr
diff --git a/src/test/ui/lang-items/issue-86238.rs b/tests/ui/lang-items/issue-86238.rs
index 509f94f38..509f94f38 100644
--- a/src/test/ui/lang-items/issue-86238.rs
+++ b/tests/ui/lang-items/issue-86238.rs
diff --git a/src/test/ui/lang-items/issue-86238.stderr b/tests/ui/lang-items/issue-86238.stderr
index 767e6de22..767e6de22 100644
--- a/src/test/ui/lang-items/issue-86238.stderr
+++ b/tests/ui/lang-items/issue-86238.stderr
diff --git a/src/test/ui/lang-items/issue-87573.rs b/tests/ui/lang-items/issue-87573.rs
index aeb0c245a..aeb0c245a 100644
--- a/src/test/ui/lang-items/issue-87573.rs
+++ b/tests/ui/lang-items/issue-87573.rs
diff --git a/src/test/ui/lang-items/issue-87573.stderr b/tests/ui/lang-items/issue-87573.stderr
index 25560cfa0..25560cfa0 100644
--- a/src/test/ui/lang-items/issue-87573.stderr
+++ b/tests/ui/lang-items/issue-87573.stderr
diff --git a/src/test/ui/lang-items/lang-item-generic-requirements.rs b/tests/ui/lang-items/lang-item-generic-requirements.rs
index 3d33adf68..3d33adf68 100644
--- a/src/test/ui/lang-items/lang-item-generic-requirements.rs
+++ b/tests/ui/lang-items/lang-item-generic-requirements.rs
diff --git a/src/test/ui/lang-items/lang-item-generic-requirements.stderr b/tests/ui/lang-items/lang-item-generic-requirements.stderr
index 4d349a25f..4d349a25f 100644
--- a/src/test/ui/lang-items/lang-item-generic-requirements.stderr
+++ b/tests/ui/lang-items/lang-item-generic-requirements.stderr
diff --git a/src/test/ui/lang-items/lang-item-missing-generator.rs b/tests/ui/lang-items/lang-item-missing-generator.rs
index 9b9aff38e..9b9aff38e 100644
--- a/src/test/ui/lang-items/lang-item-missing-generator.rs
+++ b/tests/ui/lang-items/lang-item-missing-generator.rs
diff --git a/src/test/ui/lang-items/lang-item-missing-generator.stderr b/tests/ui/lang-items/lang-item-missing-generator.stderr
index a24fdb5fb..a24fdb5fb 100644
--- a/src/test/ui/lang-items/lang-item-missing-generator.stderr
+++ b/tests/ui/lang-items/lang-item-missing-generator.stderr
diff --git a/src/test/ui/lang-items/lang-item-missing.rs b/tests/ui/lang-items/lang-item-missing.rs
index 4e2634324..4e2634324 100644
--- a/src/test/ui/lang-items/lang-item-missing.rs
+++ b/tests/ui/lang-items/lang-item-missing.rs
diff --git a/src/test/ui/lang-items/lang-item-missing.stderr b/tests/ui/lang-items/lang-item-missing.stderr
index f7516c7d3..f7516c7d3 100644
--- a/src/test/ui/lang-items/lang-item-missing.stderr
+++ b/tests/ui/lang-items/lang-item-missing.stderr
diff --git a/src/test/ui/lang-items/missing-clone-for-suggestion.rs b/tests/ui/lang-items/missing-clone-for-suggestion.rs
index e8290c009..e8290c009 100644
--- a/src/test/ui/lang-items/missing-clone-for-suggestion.rs
+++ b/tests/ui/lang-items/missing-clone-for-suggestion.rs
diff --git a/src/test/ui/lang-items/missing-clone-for-suggestion.stderr b/tests/ui/lang-items/missing-clone-for-suggestion.stderr
index 35783a1be..35783a1be 100644
--- a/src/test/ui/lang-items/missing-clone-for-suggestion.stderr
+++ b/tests/ui/lang-items/missing-clone-for-suggestion.stderr
diff --git a/src/test/ui/lang-items/no_owned_box_lang_item.rs b/tests/ui/lang-items/no_owned_box_lang_item.rs
index c22b44ffc..c22b44ffc 100644
--- a/src/test/ui/lang-items/no_owned_box_lang_item.rs
+++ b/tests/ui/lang-items/no_owned_box_lang_item.rs
diff --git a/src/test/ui/lang-items/no_owned_box_lang_item.stderr b/tests/ui/lang-items/no_owned_box_lang_item.stderr
index c55c246b5..c55c246b5 100644
--- a/src/test/ui/lang-items/no_owned_box_lang_item.stderr
+++ b/tests/ui/lang-items/no_owned_box_lang_item.stderr
diff --git a/src/test/ui/lang-items/required-lang-item.rs b/tests/ui/lang-items/required-lang-item.rs
index 3b17c5b72..3b17c5b72 100644
--- a/src/test/ui/lang-items/required-lang-item.rs
+++ b/tests/ui/lang-items/required-lang-item.rs
diff --git a/src/test/ui/lang-items/required-lang-item.stderr b/tests/ui/lang-items/required-lang-item.stderr
index 83764a91a..83764a91a 100644
--- a/src/test/ui/lang-items/required-lang-item.stderr
+++ b/tests/ui/lang-items/required-lang-item.stderr
diff --git a/tests/ui/lang-items/start_lang_item_args.argc.stderr b/tests/ui/lang-items/start_lang_item_args.argc.stderr
new file mode 100644
index 000000000..65c99a93c
--- /dev/null
+++ b/tests/ui/lang-items/start_lang_item_args.argc.stderr
@@ -0,0 +1,8 @@
+error: parameter 2 of the `start` lang item is incorrect
+  --> $DIR/start_lang_item_args.rs:75:38
+   |
+LL | fn start<T>(_main: fn() -> T, _argc: i8, _argv: *const *const u8, _sigpipe: u8) -> isize {
+   |                                      ^^ help: change the type from `i8` to `isize`
+
+error: aborting due to previous error
+
diff --git a/tests/ui/lang-items/start_lang_item_args.argv.stderr b/tests/ui/lang-items/start_lang_item_args.argv.stderr
new file mode 100644
index 000000000..f0947a9b3
--- /dev/null
+++ b/tests/ui/lang-items/start_lang_item_args.argv.stderr
@@ -0,0 +1,8 @@
+error: parameter 3 of the `start` lang item is incorrect
+  --> $DIR/start_lang_item_args.rs:89:52
+   |
+LL | fn start<T>(_main: fn() -> T, _argc: isize, _argv: u8, _sigpipe: u8) -> isize {
+   |                                                    ^^ help: change the type from `u8` to `*const *const u8`
+
+error: aborting due to previous error
+
diff --git a/tests/ui/lang-items/start_lang_item_args.argv_inner_ptr.stderr b/tests/ui/lang-items/start_lang_item_args.argv_inner_ptr.stderr
new file mode 100644
index 000000000..08efd5088
--- /dev/null
+++ b/tests/ui/lang-items/start_lang_item_args.argv_inner_ptr.stderr
@@ -0,0 +1,13 @@
+error: parameter 3 of the `start` lang item is incorrect
+  --> $DIR/start_lang_item_args.rs:82:52
+   |
+LL | fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const usize, _sigpipe: u8) -> isize {
+   |                                                    ^^^^^^^^^^^^^^^^^^^
+   |
+help: change the type from `*const *const usize` to `*const *const u8`
+   |
+LL | fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8, _sigpipe: u8) -> isize {
+   |                                                    ~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
diff --git a/tests/ui/lang-items/start_lang_item_args.main_args.stderr b/tests/ui/lang-items/start_lang_item_args.main_args.stderr
new file mode 100644
index 000000000..c20a74466
--- /dev/null
+++ b/tests/ui/lang-items/start_lang_item_args.main_args.stderr
@@ -0,0 +1,13 @@
+error: parameter 1 of the `start` lang item is incorrect
+  --> $DIR/start_lang_item_args.rs:61:20
+   |
+LL | fn start<T>(_main: fn(i32) -> T, _argc: isize, _argv: *const *const u8, _sigpipe: u8) -> isize {
+   |                    ^^^^^^^^^^^^
+   |
+help: change the type from `fn(i32) -> T` to `fn() -> T`
+   |
+LL | fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8, _sigpipe: u8) -> isize {
+   |                    ~~~~~~~~~
+
+error: aborting due to previous error
+
diff --git a/tests/ui/lang-items/start_lang_item_args.main_ret.stderr b/tests/ui/lang-items/start_lang_item_args.main_ret.stderr
new file mode 100644
index 000000000..8f967252f
--- /dev/null
+++ b/tests/ui/lang-items/start_lang_item_args.main_ret.stderr
@@ -0,0 +1,13 @@
+error: parameter 1 of the `start` lang item is incorrect
+  --> $DIR/start_lang_item_args.rs:68:20
+   |
+LL | fn start<T>(_main: fn() -> u16, _argc: isize, _argv: *const *const u8, _sigpipe: u8) -> isize {
+   |                    ^^^^^^^^^^^
+   |
+help: change the type from `fn() -> u16` to `fn() -> T`
+   |
+LL | fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8, _sigpipe: u8) -> isize {
+   |                    ~~~~~~~~~
+
+error: aborting due to previous error
+
diff --git a/tests/ui/lang-items/start_lang_item_args.main_ty.stderr b/tests/ui/lang-items/start_lang_item_args.main_ty.stderr
new file mode 100644
index 000000000..deb37b868
--- /dev/null
+++ b/tests/ui/lang-items/start_lang_item_args.main_ty.stderr
@@ -0,0 +1,8 @@
+error: parameter 1 of the `start` lang item is incorrect
+  --> $DIR/start_lang_item_args.rs:54:20
+   |
+LL | fn start<T>(_main: u64, _argc: isize, _argv: *const *const u8, _sigpipe: u8) -> isize {
+   |                    ^^^ help: change the type from `u64` to `fn() -> T`
+
+error: aborting due to previous error
+
diff --git a/tests/ui/lang-items/start_lang_item_args.missing_all_args.stderr b/tests/ui/lang-items/start_lang_item_args.missing_all_args.stderr
new file mode 100644
index 000000000..004c2a67f
--- /dev/null
+++ b/tests/ui/lang-items/start_lang_item_args.missing_all_args.stderr
@@ -0,0 +1,11 @@
+error: incorrect number of parameters for the `start` lang item
+  --> $DIR/start_lang_item_args.rs:15:1
+   |
+LL | fn start<T>() -> isize {
+   | ^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: the `start` lang item should have four parameters, but found 0
+   = note: the `start` lang item should have the signature `fn(fn() -> T, isize, *const *const u8, u8) -> isize`
+
+error: aborting due to previous error
+
diff --git a/tests/ui/lang-items/start_lang_item_args.missing_ret.stderr b/tests/ui/lang-items/start_lang_item_args.missing_ret.stderr
new file mode 100644
index 000000000..1d8285b59
--- /dev/null
+++ b/tests/ui/lang-items/start_lang_item_args.missing_ret.stderr
@@ -0,0 +1,8 @@
+error: the return type of the `start` lang item is incorrect
+  --> $DIR/start_lang_item_args.rs:29:84
+   |
+LL | fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8, _sigpipe: u8) {}
+   |                                                                                    ^ help: change the type from `()` to `isize`
+
+error: aborting due to previous error
+
diff --git a/tests/ui/lang-items/start_lang_item_args.missing_sigpipe_arg.stderr b/tests/ui/lang-items/start_lang_item_args.missing_sigpipe_arg.stderr
new file mode 100644
index 000000000..e545a750f
--- /dev/null
+++ b/tests/ui/lang-items/start_lang_item_args.missing_sigpipe_arg.stderr
@@ -0,0 +1,11 @@
+error: incorrect number of parameters for the `start` lang item
+  --> $DIR/start_lang_item_args.rs:22:1
+   |
+LL | fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8) -> isize {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: the `start` lang item should have four parameters, but found 3
+   = note: the `start` lang item should have the signature `fn(fn() -> T, isize, *const *const u8, u8) -> isize`
+
+error: aborting due to previous error
+
diff --git a/tests/ui/lang-items/start_lang_item_args.rs b/tests/ui/lang-items/start_lang_item_args.rs
new file mode 100644
index 000000000..0dbfba39c
--- /dev/null
+++ b/tests/ui/lang-items/start_lang_item_args.rs
@@ -0,0 +1,101 @@
+// check-fail
+// revisions: missing_all_args missing_sigpipe_arg missing_ret start_ret too_many_args
+// revisions: main_ty main_args main_ret argc argv_inner_ptr argv sigpipe
+
+#![feature(lang_items, no_core)]
+#![no_core]
+
+#[lang = "copy"]
+pub trait Copy {}
+#[lang = "sized"]
+pub trait Sized {}
+
+#[cfg(missing_all_args)]
+#[lang = "start"]
+fn start<T>() -> isize {
+    //[missing_all_args]~^ ERROR incorrect number of parameters
+    100
+}
+
+#[cfg(missing_sigpipe_arg)]
+#[lang = "start"]
+fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8) -> isize {
+    //[missing_sigpipe_arg]~^ ERROR incorrect number of parameters
+    100
+}
+
+#[cfg(missing_ret)]
+#[lang = "start"]
+fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8, _sigpipe: u8) {}
+//[missing_ret]~^ ERROR the return type of the `start` lang item is incorrect
+
+#[cfg(start_ret)]
+#[lang = "start"]
+fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8, _sigpipe: u8) -> u8 {
+    //[start_ret]~^ ERROR the return type of the `start` lang item is incorrect
+    100
+}
+
+#[cfg(too_many_args)]
+#[lang = "start"]
+fn start<T>(
+    //[too_many_args]~^ ERROR incorrect number of parameters
+    _main: fn() -> T,
+    _argc: isize,
+    _argv: *const *const u8,
+    _sigpipe: u8,
+    _extra_arg: (),
+) -> isize {
+    100
+}
+
+#[cfg(main_ty)]
+#[lang = "start"]
+fn start<T>(_main: u64, _argc: isize, _argv: *const *const u8, _sigpipe: u8) -> isize {
+    //[main_ty]~^ ERROR parameter 1 of the `start` lang item is incorrect
+    100
+}
+
+#[cfg(main_args)]
+#[lang = "start"]
+fn start<T>(_main: fn(i32) -> T, _argc: isize, _argv: *const *const u8, _sigpipe: u8) -> isize {
+    //[main_args]~^ ERROR parameter 1 of the `start` lang item is incorrect
+    100
+}
+
+#[cfg(main_ret)]
+#[lang = "start"]
+fn start<T>(_main: fn() -> u16, _argc: isize, _argv: *const *const u8, _sigpipe: u8) -> isize {
+    //[main_ret]~^ ERROR parameter 1 of the `start` lang item is incorrect
+    100
+}
+
+#[cfg(argc)]
+#[lang = "start"]
+fn start<T>(_main: fn() -> T, _argc: i8, _argv: *const *const u8, _sigpipe: u8) -> isize {
+    //[argc]~^ ERROR parameter 2 of the `start` lang item is incorrect
+    100
+}
+
+#[cfg(argv_inner_ptr)]
+#[lang = "start"]
+fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const usize, _sigpipe: u8) -> isize {
+    //[argv_inner_ptr]~^ ERROR parameter 3 of the `start` lang item is incorrect
+    100
+}
+
+#[cfg(argv)]
+#[lang = "start"]
+fn start<T>(_main: fn() -> T, _argc: isize, _argv: u8, _sigpipe: u8) -> isize {
+    //[argv]~^ ERROR parameter 3 of the `start` lang item is incorrect
+    100
+}
+
+#[cfg(sigpipe)]
+#[lang = "start"]
+fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8, _sigpipe: i64) -> isize {
+    //[sigpipe]~^ ERROR parameter 4 of the `start` lang item is incorrect
+    100
+}
+
+fn main() {}
diff --git a/tests/ui/lang-items/start_lang_item_args.sigpipe.stderr b/tests/ui/lang-items/start_lang_item_args.sigpipe.stderr
new file mode 100644
index 000000000..b20ae3128
--- /dev/null
+++ b/tests/ui/lang-items/start_lang_item_args.sigpipe.stderr
@@ -0,0 +1,8 @@
+error: parameter 4 of the `start` lang item is incorrect
+  --> $DIR/start_lang_item_args.rs:96:80
+   |
+LL | fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8, _sigpipe: i64) -> isize {
+   |                                                                                ^^^ help: change the type from `i64` to `u8`
+
+error: aborting due to previous error
+
diff --git a/tests/ui/lang-items/start_lang_item_args.start_ret.stderr b/tests/ui/lang-items/start_lang_item_args.start_ret.stderr
new file mode 100644
index 000000000..935d5f3c8
--- /dev/null
+++ b/tests/ui/lang-items/start_lang_item_args.start_ret.stderr
@@ -0,0 +1,8 @@
+error: the return type of the `start` lang item is incorrect
+  --> $DIR/start_lang_item_args.rs:34:87
+   |
+LL | fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8, _sigpipe: u8) -> u8 {
+   |                                                                                       ^^ help: change the type from `u8` to `isize`
+
+error: aborting due to previous error
+
diff --git a/tests/ui/lang-items/start_lang_item_args.too_many_args.stderr b/tests/ui/lang-items/start_lang_item_args.too_many_args.stderr
new file mode 100644
index 000000000..30a7ed18a
--- /dev/null
+++ b/tests/ui/lang-items/start_lang_item_args.too_many_args.stderr
@@ -0,0 +1,17 @@
+error: incorrect number of parameters for the `start` lang item
+  --> $DIR/start_lang_item_args.rs:41:1
+   |
+LL | / fn start<T>(
+LL | |
+LL | |     _main: fn() -> T,
+LL | |     _argc: isize,
+...  |
+LL | |     _extra_arg: (),
+LL | | ) -> isize {
+   | |__________^
+   |
+   = note: the `start` lang item should have four parameters, but found 5
+   = note: the `start` lang item should have the signature `fn(fn() -> T, isize, *const *const u8, u8) -> isize`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/last-use-in-block.rs b/tests/ui/last-use-in-block.rs
index 1ab847dcd..1ab847dcd 100644
--- a/src/test/ui/last-use-in-block.rs
+++ b/tests/ui/last-use-in-block.rs
diff --git a/src/test/ui/last-use-in-cap-clause.rs b/tests/ui/last-use-in-cap-clause.rs
index 98d434632..98d434632 100644
--- a/src/test/ui/last-use-in-cap-clause.rs
+++ b/tests/ui/last-use-in-cap-clause.rs
diff --git a/src/test/ui/last-use-is-capture.rs b/tests/ui/last-use-is-capture.rs
index 1055fe799..1055fe799 100644
--- a/src/test/ui/last-use-is-capture.rs
+++ b/tests/ui/last-use-is-capture.rs
diff --git a/src/test/ui/late-bound-lifetimes/auxiliary/upstream_alias.rs b/tests/ui/late-bound-lifetimes/auxiliary/upstream_alias.rs
index 5b9dc0e43..5b9dc0e43 100644
--- a/src/test/ui/late-bound-lifetimes/auxiliary/upstream_alias.rs
+++ b/tests/ui/late-bound-lifetimes/auxiliary/upstream_alias.rs
diff --git a/src/test/ui/late-bound-lifetimes/cross_crate_alias.rs b/tests/ui/late-bound-lifetimes/cross_crate_alias.rs
index 4154c2792..4154c2792 100644
--- a/src/test/ui/late-bound-lifetimes/cross_crate_alias.rs
+++ b/tests/ui/late-bound-lifetimes/cross_crate_alias.rs
diff --git a/src/test/ui/late-bound-lifetimes/downgraded_to_early_through_alias.rs b/tests/ui/late-bound-lifetimes/downgraded_to_early_through_alias.rs
index e56a34218..e56a34218 100644
--- a/src/test/ui/late-bound-lifetimes/downgraded_to_early_through_alias.rs
+++ b/tests/ui/late-bound-lifetimes/downgraded_to_early_through_alias.rs
diff --git a/src/test/ui/issues/issue-36381.rs b/tests/ui/late-bound-lifetimes/issue-36381.rs
index 7db56f1dc..7db56f1dc 100644
--- a/src/test/ui/issues/issue-36381.rs
+++ b/tests/ui/late-bound-lifetimes/issue-36381.rs
diff --git a/src/test/ui/late-bound-lifetimes/issue-47511.rs b/tests/ui/late-bound-lifetimes/issue-47511.rs
index 789443515..789443515 100644
--- a/src/test/ui/late-bound-lifetimes/issue-47511.rs
+++ b/tests/ui/late-bound-lifetimes/issue-47511.rs
diff --git a/src/test/ui/late-bound-lifetimes/late_bound_through_alias.rs b/tests/ui/late-bound-lifetimes/late_bound_through_alias.rs
index 91839673c..91839673c 100644
--- a/src/test/ui/late-bound-lifetimes/late_bound_through_alias.rs
+++ b/tests/ui/late-bound-lifetimes/late_bound_through_alias.rs
diff --git a/src/test/ui/late-bound-lifetimes/mismatched_arg_count.rs b/tests/ui/late-bound-lifetimes/mismatched_arg_count.rs
index 0b331e203..0b331e203 100644
--- a/src/test/ui/late-bound-lifetimes/mismatched_arg_count.rs
+++ b/tests/ui/late-bound-lifetimes/mismatched_arg_count.rs
diff --git a/src/test/ui/late-bound-lifetimes/mismatched_arg_count.stderr b/tests/ui/late-bound-lifetimes/mismatched_arg_count.stderr
index 3704d9bb9..3704d9bb9 100644
--- a/src/test/ui/late-bound-lifetimes/mismatched_arg_count.stderr
+++ b/tests/ui/late-bound-lifetimes/mismatched_arg_count.stderr
diff --git a/src/test/ui/layout/big-type-no-err.rs b/tests/ui/layout/big-type-no-err.rs
index af8191a9c..af8191a9c 100644
--- a/src/test/ui/layout/big-type-no-err.rs
+++ b/tests/ui/layout/big-type-no-err.rs
diff --git a/src/test/ui/layout/debug.rs b/tests/ui/layout/debug.rs
index a282e7123..a282e7123 100644
--- a/src/test/ui/layout/debug.rs
+++ b/tests/ui/layout/debug.rs
diff --git a/src/test/ui/layout/debug.stderr b/tests/ui/layout/debug.stderr
index c5e1c41d1..c5e1c41d1 100644
--- a/src/test/ui/layout/debug.stderr
+++ b/tests/ui/layout/debug.stderr
diff --git a/src/test/ui/layout/hexagon-enum.rs b/tests/ui/layout/hexagon-enum.rs
index 4c58537e3..4c58537e3 100644
--- a/src/test/ui/layout/hexagon-enum.rs
+++ b/tests/ui/layout/hexagon-enum.rs
diff --git a/src/test/ui/layout/hexagon-enum.stderr b/tests/ui/layout/hexagon-enum.stderr
index d850dd69c..d850dd69c 100644
--- a/src/test/ui/layout/hexagon-enum.stderr
+++ b/tests/ui/layout/hexagon-enum.stderr
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.rs b/tests/ui/layout/homogeneous-aggr-zero-sized-c-struct.rs
index 7eecd99dc..7eecd99dc 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.rs
+++ b/tests/ui/layout/homogeneous-aggr-zero-sized-c-struct.rs
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr b/tests/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr
index e19216a99..e19216a99 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr
+++ b/tests/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs b/tests/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs
index a473c5c97..a473c5c97 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs
+++ b/tests/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr b/tests/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr
index 17d639da0..17d639da0 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr
+++ b/tests/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr
diff --git a/src/test/ui/layout/issue-60431-unsized-tail-behind-projection.rs b/tests/ui/layout/issue-60431-unsized-tail-behind-projection.rs
index 65845d2c9..65845d2c9 100644
--- a/src/test/ui/layout/issue-60431-unsized-tail-behind-projection.rs
+++ b/tests/ui/layout/issue-60431-unsized-tail-behind-projection.rs
diff --git a/src/test/ui/layout/issue-84108.rs b/tests/ui/layout/issue-84108.rs
index dd025c9b4..dd025c9b4 100644
--- a/src/test/ui/layout/issue-84108.rs
+++ b/tests/ui/layout/issue-84108.rs
diff --git a/src/test/ui/layout/issue-84108.stderr b/tests/ui/layout/issue-84108.stderr
index 36be64241..36be64241 100644
--- a/src/test/ui/layout/issue-84108.stderr
+++ b/tests/ui/layout/issue-84108.stderr
diff --git a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs b/tests/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs
index af5f5885d..af5f5885d 100644
--- a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs
+++ b/tests/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs
diff --git a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr b/tests/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr
index 20d4c418e..20d4c418e 100644
--- a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr
+++ b/tests/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr
diff --git a/src/test/ui/layout/issue-96185-overaligned-enum.rs b/tests/ui/layout/issue-96185-overaligned-enum.rs
index ae1e6b012..ae1e6b012 100644
--- a/src/test/ui/layout/issue-96185-overaligned-enum.rs
+++ b/tests/ui/layout/issue-96185-overaligned-enum.rs
diff --git a/src/test/ui/layout/issue-96185-overaligned-enum.stderr b/tests/ui/layout/issue-96185-overaligned-enum.stderr
index de6177c8d..de6177c8d 100644
--- a/src/test/ui/layout/issue-96185-overaligned-enum.stderr
+++ b/tests/ui/layout/issue-96185-overaligned-enum.stderr
diff --git a/tests/ui/layout/thin-meta-implies-thin-ptr.rs b/tests/ui/layout/thin-meta-implies-thin-ptr.rs
new file mode 100644
index 000000000..972579ea8
--- /dev/null
+++ b/tests/ui/layout/thin-meta-implies-thin-ptr.rs
@@ -0,0 +1,11 @@
+// check-pass
+
+#![feature(ptr_metadata)]
+
+use std::ptr::Thin;
+
+fn main() {}
+
+fn foo<T: ?Sized + Thin>(t: *const T) -> *const () {
+    unsafe { std::mem::transmute(t) }
+}
diff --git a/src/test/ui/layout/thumb-enum.rs b/tests/ui/layout/thumb-enum.rs
index 3b43b1b83..3b43b1b83 100644
--- a/src/test/ui/layout/thumb-enum.rs
+++ b/tests/ui/layout/thumb-enum.rs
diff --git a/src/test/ui/layout/thumb-enum.stderr b/tests/ui/layout/thumb-enum.stderr
index 227bd950b..227bd950b 100644
--- a/src/test/ui/layout/thumb-enum.stderr
+++ b/tests/ui/layout/thumb-enum.stderr
diff --git a/src/test/ui/layout/unsafe-cell-hides-niche.rs b/tests/ui/layout/unsafe-cell-hides-niche.rs
index 68bcc3c1a..68bcc3c1a 100644
--- a/src/test/ui/layout/unsafe-cell-hides-niche.rs
+++ b/tests/ui/layout/unsafe-cell-hides-niche.rs
diff --git a/src/test/ui/layout/valid_range_oob.rs b/tests/ui/layout/valid_range_oob.rs
index 74aa47fe4..74aa47fe4 100644
--- a/src/test/ui/layout/valid_range_oob.rs
+++ b/tests/ui/layout/valid_range_oob.rs
diff --git a/src/test/ui/layout/valid_range_oob.stderr b/tests/ui/layout/valid_range_oob.stderr
index 7398f0164..7398f0164 100644
--- a/src/test/ui/layout/valid_range_oob.stderr
+++ b/tests/ui/layout/valid_range_oob.stderr
diff --git a/src/test/ui/layout/zero-sized-array-enum-niche.rs b/tests/ui/layout/zero-sized-array-enum-niche.rs
index 23bbbfbfc..23bbbfbfc 100644
--- a/src/test/ui/layout/zero-sized-array-enum-niche.rs
+++ b/tests/ui/layout/zero-sized-array-enum-niche.rs
diff --git a/src/test/ui/layout/zero-sized-array-enum-niche.stderr b/tests/ui/layout/zero-sized-array-enum-niche.stderr
index a3e82070e..a3e82070e 100644
--- a/src/test/ui/layout/zero-sized-array-enum-niche.stderr
+++ b/tests/ui/layout/zero-sized-array-enum-niche.stderr
diff --git a/src/test/ui/layout/zero-sized-array-union.rs b/tests/ui/layout/zero-sized-array-union.rs
index 1a662ba44..1a662ba44 100644
--- a/src/test/ui/layout/zero-sized-array-union.rs
+++ b/tests/ui/layout/zero-sized-array-union.rs
diff --git a/src/test/ui/layout/zero-sized-array-union.stderr b/tests/ui/layout/zero-sized-array-union.stderr
index de2b863e4..de2b863e4 100644
--- a/src/test/ui/layout/zero-sized-array-union.stderr
+++ b/tests/ui/layout/zero-sized-array-union.stderr
diff --git a/src/test/ui/lazy-and-or.rs b/tests/ui/lazy-and-or.rs
index 0b44a70a5..0b44a70a5 100644
--- a/src/test/ui/lazy-and-or.rs
+++ b/tests/ui/lazy-and-or.rs
diff --git a/src/test/ui/lazy-type-alias-impl-trait/branches.rs b/tests/ui/lazy-type-alias-impl-trait/branches.rs
index 95239e2e3..95239e2e3 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/branches.rs
+++ b/tests/ui/lazy-type-alias-impl-trait/branches.rs
diff --git a/tests/ui/lazy-type-alias-impl-trait/branches.stderr b/tests/ui/lazy-type-alias-impl-trait/branches.stderr
new file mode 100644
index 000000000..0b206f31e
--- /dev/null
+++ b/tests/ui/lazy-type-alias-impl-trait/branches.stderr
@@ -0,0 +1,13 @@
+error[E0277]: a value of type `Bar` cannot be built from an iterator over elements of type `_`
+  --> $DIR/branches.rs:19:28
+   |
+LL |         std::iter::empty().collect()
+   |                            ^^^^^^^ value of type `Bar` cannot be built from `std::iter::Iterator<Item=_>`
+   |
+   = help: the trait `FromIterator<_>` is not implemented for `Bar`
+note: required by a bound in `collect`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/lazy-type-alias-impl-trait/branches2.rs b/tests/ui/lazy-type-alias-impl-trait/branches2.rs
index 04218f564..04218f564 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/branches2.rs
+++ b/tests/ui/lazy-type-alias-impl-trait/branches2.rs
diff --git a/src/test/ui/lazy-type-alias-impl-trait/branches3.rs b/tests/ui/lazy-type-alias-impl-trait/branches3.rs
index 30c0af8a5..30c0af8a5 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/branches3.rs
+++ b/tests/ui/lazy-type-alias-impl-trait/branches3.rs
diff --git a/src/test/ui/lazy-type-alias-impl-trait/branches3.stderr b/tests/ui/lazy-type-alias-impl-trait/branches3.stderr
index 420104e52..fe2631f94 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/branches3.stderr
+++ b/tests/ui/lazy-type-alias-impl-trait/branches3.stderr
@@ -6,8 +6,8 @@ LL |         |s| s.len()
    |
 help: consider giving this closure parameter an explicit type
    |
-LL |         |s: _| s.len()
-   |           +++
+LL |         |s: /* Type */| s.len()
+   |           ++++++++++++
 
 error[E0282]: type annotations needed
   --> $DIR/branches3.rs:15:10
@@ -17,8 +17,8 @@ LL |         |s| s.len()
    |
 help: consider giving this closure parameter an explicit type
    |
-LL |         |s: _| s.len()
-   |           +++
+LL |         |s: /* Type */| s.len()
+   |           ++++++++++++
 
 error[E0282]: type annotations needed
   --> $DIR/branches3.rs:23:10
@@ -28,8 +28,8 @@ LL |         |s| s.len()
    |
 help: consider giving this closure parameter an explicit type
    |
-LL |         |s: _| s.len()
-   |           +++
+LL |         |s: /* Type */| s.len()
+   |           ++++++++++++
 
 error[E0282]: type annotations needed
   --> $DIR/branches3.rs:30:10
@@ -39,8 +39,8 @@ LL |         |s| s.len()
    |
 help: consider giving this closure parameter an explicit type
    |
-LL |         |s: _| s.len()
-   |           +++
+LL |         |s: /* Type */| s.len()
+   |           ++++++++++++
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/lazy-type-alias-impl-trait/freeze_cycle.rs b/tests/ui/lazy-type-alias-impl-trait/freeze_cycle.rs
index f02a93ed4..f02a93ed4 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/freeze_cycle.rs
+++ b/tests/ui/lazy-type-alias-impl-trait/freeze_cycle.rs
diff --git a/src/test/ui/lazy-type-alias-impl-trait/infer_cross_function.rs b/tests/ui/lazy-type-alias-impl-trait/infer_cross_function.rs
index d07d732c7..d07d732c7 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/infer_cross_function.rs
+++ b/tests/ui/lazy-type-alias-impl-trait/infer_cross_function.rs
diff --git a/src/test/ui/lazy-type-alias-impl-trait/lifetime_inference.rs b/tests/ui/lazy-type-alias-impl-trait/lifetime_inference.rs
index f75a88aa8..f75a88aa8 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/lifetime_inference.rs
+++ b/tests/ui/lazy-type-alias-impl-trait/lifetime_inference.rs
diff --git a/src/test/ui/lazy-type-alias-impl-trait/nested.rs b/tests/ui/lazy-type-alias-impl-trait/nested.rs
index f82911127..f82911127 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/nested.rs
+++ b/tests/ui/lazy-type-alias-impl-trait/nested.rs
diff --git a/src/test/ui/lazy-type-alias-impl-trait/opaque_vs_opaque.rs b/tests/ui/lazy-type-alias-impl-trait/opaque_vs_opaque.rs
index 8d03b5158..8d03b5158 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/opaque_vs_opaque.rs
+++ b/tests/ui/lazy-type-alias-impl-trait/opaque_vs_opaque.rs
diff --git a/src/test/ui/lazy-type-alias-impl-trait/recursion.rs b/tests/ui/lazy-type-alias-impl-trait/recursion.rs
index cf7cd5d26..cf7cd5d26 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/recursion.rs
+++ b/tests/ui/lazy-type-alias-impl-trait/recursion.rs
diff --git a/src/test/ui/lazy-type-alias-impl-trait/recursion2.rs b/tests/ui/lazy-type-alias-impl-trait/recursion2.rs
index 6b3d9ff4c..6b3d9ff4c 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/recursion2.rs
+++ b/tests/ui/lazy-type-alias-impl-trait/recursion2.rs
diff --git a/src/test/ui/lazy-type-alias-impl-trait/recursion3.rs b/tests/ui/lazy-type-alias-impl-trait/recursion3.rs
index 7f1cedae0..7f1cedae0 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/recursion3.rs
+++ b/tests/ui/lazy-type-alias-impl-trait/recursion3.rs
diff --git a/src/test/ui/lazy-type-alias-impl-trait/recursion3.stderr b/tests/ui/lazy-type-alias-impl-trait/recursion3.stderr
index e1d5cafed..e1d5cafed 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/recursion3.stderr
+++ b/tests/ui/lazy-type-alias-impl-trait/recursion3.stderr
diff --git a/src/test/ui/lazy-type-alias-impl-trait/recursion4.rs b/tests/ui/lazy-type-alias-impl-trait/recursion4.rs
index 57dd7fb06..57dd7fb06 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/recursion4.rs
+++ b/tests/ui/lazy-type-alias-impl-trait/recursion4.rs
diff --git a/tests/ui/lazy-type-alias-impl-trait/recursion4.stderr b/tests/ui/lazy-type-alias-impl-trait/recursion4.stderr
new file mode 100644
index 000000000..d8ac39a4f
--- /dev/null
+++ b/tests/ui/lazy-type-alias-impl-trait/recursion4.stderr
@@ -0,0 +1,23 @@
+error[E0277]: a value of type `Foo` cannot be built from an iterator over elements of type `_`
+  --> $DIR/recursion4.rs:10:28
+   |
+LL |     x = std::iter::empty().collect();
+   |                            ^^^^^^^ value of type `Foo` cannot be built from `std::iter::Iterator<Item=_>`
+   |
+   = help: the trait `FromIterator<_>` is not implemented for `Foo`
+note: required by a bound in `collect`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error[E0277]: a value of type `impl Debug` cannot be built from an iterator over elements of type `_`
+  --> $DIR/recursion4.rs:19:28
+   |
+LL |     x = std::iter::empty().collect();
+   |                            ^^^^^^^ value of type `impl Debug` cannot be built from `std::iter::Iterator<Item=_>`
+   |
+   = help: the trait `FromIterator<_>` is not implemented for `impl Debug`
+note: required by a bound in `collect`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/lazy-type-alias-impl-trait/unsized_sized_opaque.rs b/tests/ui/lazy-type-alias-impl-trait/unsized_sized_opaque.rs
index 007101498..007101498 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/unsized_sized_opaque.rs
+++ b/tests/ui/lazy-type-alias-impl-trait/unsized_sized_opaque.rs
diff --git a/src/test/ui/let-else/const-fn.rs b/tests/ui/let-else/const-fn.rs
index a3921b803..a3921b803 100644
--- a/src/test/ui/let-else/const-fn.rs
+++ b/tests/ui/let-else/const-fn.rs
diff --git a/src/test/ui/let-else/issue-100103.rs b/tests/ui/let-else/issue-100103.rs
index f5f9b2f5f..f5f9b2f5f 100644
--- a/src/test/ui/let-else/issue-100103.rs
+++ b/tests/ui/let-else/issue-100103.rs
diff --git a/src/test/ui/let-else/issue-102317.rs b/tests/ui/let-else/issue-102317.rs
index 7369b4938..7369b4938 100644
--- a/src/test/ui/let-else/issue-102317.rs
+++ b/tests/ui/let-else/issue-102317.rs
diff --git a/src/test/ui/let-else/issue-94176.rs b/tests/ui/let-else/issue-94176.rs
index f76dfc15b..f76dfc15b 100644
--- a/src/test/ui/let-else/issue-94176.rs
+++ b/tests/ui/let-else/issue-94176.rs
diff --git a/src/test/ui/let-else/issue-94176.stderr b/tests/ui/let-else/issue-94176.stderr
index 0cb97acee..0cb97acee 100644
--- a/src/test/ui/let-else/issue-94176.stderr
+++ b/tests/ui/let-else/issue-94176.stderr
diff --git a/src/test/ui/let-else/issue-99975.rs b/tests/ui/let-else/issue-99975.rs
index 5b164f347..5b164f347 100644
--- a/src/test/ui/let-else/issue-99975.rs
+++ b/tests/ui/let-else/issue-99975.rs
diff --git a/src/test/ui/let-else/let-else-allow-in-expr.rs b/tests/ui/let-else/let-else-allow-in-expr.rs
index 33acb6c6a..33acb6c6a 100644
--- a/src/test/ui/let-else/let-else-allow-in-expr.rs
+++ b/tests/ui/let-else/let-else-allow-in-expr.rs
diff --git a/src/test/ui/let-else/let-else-allow-in-expr.stderr b/tests/ui/let-else/let-else-allow-in-expr.stderr
index 3b2b9066c..3b2b9066c 100644
--- a/src/test/ui/let-else/let-else-allow-in-expr.stderr
+++ b/tests/ui/let-else/let-else-allow-in-expr.stderr
diff --git a/src/test/ui/let-else/let-else-allow-unused.rs b/tests/ui/let-else/let-else-allow-unused.rs
index bbb1c7bea..bbb1c7bea 100644
--- a/src/test/ui/let-else/let-else-allow-unused.rs
+++ b/tests/ui/let-else/let-else-allow-unused.rs
diff --git a/src/test/ui/let-else/let-else-allow-unused.stderr b/tests/ui/let-else/let-else-allow-unused.stderr
index 05b8a9169..05b8a9169 100644
--- a/src/test/ui/let-else/let-else-allow-unused.stderr
+++ b/tests/ui/let-else/let-else-allow-unused.stderr
diff --git a/src/test/ui/let-else/let-else-binding-explicit-mut-annotated.rs b/tests/ui/let-else/let-else-binding-explicit-mut-annotated.rs
index 955f33ee1..955f33ee1 100644
--- a/src/test/ui/let-else/let-else-binding-explicit-mut-annotated.rs
+++ b/tests/ui/let-else/let-else-binding-explicit-mut-annotated.rs
diff --git a/src/test/ui/let-else/let-else-binding-explicit-mut-annotated.stderr b/tests/ui/let-else/let-else-binding-explicit-mut-annotated.stderr
index 065787cab..065787cab 100644
--- a/src/test/ui/let-else/let-else-binding-explicit-mut-annotated.stderr
+++ b/tests/ui/let-else/let-else-binding-explicit-mut-annotated.stderr
diff --git a/src/test/ui/let-else/let-else-binding-explicit-mut-borrow.rs b/tests/ui/let-else/let-else-binding-explicit-mut-borrow.rs
index 1524d0102..1524d0102 100644
--- a/src/test/ui/let-else/let-else-binding-explicit-mut-borrow.rs
+++ b/tests/ui/let-else/let-else-binding-explicit-mut-borrow.rs
diff --git a/src/test/ui/let-else/let-else-binding-explicit-mut-borrow.stderr b/tests/ui/let-else/let-else-binding-explicit-mut-borrow.stderr
index 023fab8fe..023fab8fe 100644
--- a/src/test/ui/let-else/let-else-binding-explicit-mut-borrow.stderr
+++ b/tests/ui/let-else/let-else-binding-explicit-mut-borrow.stderr
diff --git a/src/test/ui/let-else/let-else-binding-explicit-mut-pass.rs b/tests/ui/let-else/let-else-binding-explicit-mut-pass.rs
index b0a6264a1..b0a6264a1 100644
--- a/src/test/ui/let-else/let-else-binding-explicit-mut-pass.rs
+++ b/tests/ui/let-else/let-else-binding-explicit-mut-pass.rs
diff --git a/src/test/ui/let-else/let-else-binding-explicit-mut.rs b/tests/ui/let-else/let-else-binding-explicit-mut.rs
index a153b3af0..a153b3af0 100644
--- a/src/test/ui/let-else/let-else-binding-explicit-mut.rs
+++ b/tests/ui/let-else/let-else-binding-explicit-mut.rs
diff --git a/src/test/ui/let-else/let-else-binding-explicit-mut.stderr b/tests/ui/let-else/let-else-binding-explicit-mut.stderr
index 45f2b6b3b..45f2b6b3b 100644
--- a/src/test/ui/let-else/let-else-binding-explicit-mut.stderr
+++ b/tests/ui/let-else/let-else-binding-explicit-mut.stderr
diff --git a/src/test/ui/let-else/let-else-binding-immutable.rs b/tests/ui/let-else/let-else-binding-immutable.rs
index ff2d9f240..ff2d9f240 100644
--- a/src/test/ui/let-else/let-else-binding-immutable.rs
+++ b/tests/ui/let-else/let-else-binding-immutable.rs
diff --git a/src/test/ui/let-else/let-else-binding-immutable.stderr b/tests/ui/let-else/let-else-binding-immutable.stderr
index dd1365a9e..dd1365a9e 100644
--- a/src/test/ui/let-else/let-else-binding-immutable.stderr
+++ b/tests/ui/let-else/let-else-binding-immutable.stderr
diff --git a/src/test/ui/let-else/let-else-bindings.rs b/tests/ui/let-else/let-else-bindings.rs
index 7d2cad978..53ac398b8 100644
--- a/src/test/ui/let-else/let-else-bindings.rs
+++ b/tests/ui/let-else/let-else-bindings.rs
@@ -1,5 +1,5 @@
 // run-pass
-// adapted from src/test/ui/binding/if-let.rs
+// adapted from tests/ui/binding/if-let.rs
 
 #![allow(dead_code)]
 
diff --git a/src/test/ui/let-else/let-else-bool-binop-init.fixed b/tests/ui/let-else/let-else-bool-binop-init.fixed
index 20e558ca9..20e558ca9 100644
--- a/src/test/ui/let-else/let-else-bool-binop-init.fixed
+++ b/tests/ui/let-else/let-else-bool-binop-init.fixed
diff --git a/src/test/ui/let-else/let-else-bool-binop-init.rs b/tests/ui/let-else/let-else-bool-binop-init.rs
index f88179a94..f88179a94 100644
--- a/src/test/ui/let-else/let-else-bool-binop-init.rs
+++ b/tests/ui/let-else/let-else-bool-binop-init.rs
diff --git a/src/test/ui/let-else/let-else-bool-binop-init.stderr b/tests/ui/let-else/let-else-bool-binop-init.stderr
index edee65762..edee65762 100644
--- a/src/test/ui/let-else/let-else-bool-binop-init.stderr
+++ b/tests/ui/let-else/let-else-bool-binop-init.stderr
diff --git a/src/test/ui/let-else/let-else-brace-before-else.fixed b/tests/ui/let-else/let-else-brace-before-else.fixed
index a75c770dd..a75c770dd 100644
--- a/src/test/ui/let-else/let-else-brace-before-else.fixed
+++ b/tests/ui/let-else/let-else-brace-before-else.fixed
diff --git a/src/test/ui/let-else/let-else-brace-before-else.rs b/tests/ui/let-else/let-else-brace-before-else.rs
index 5603b946f..5603b946f 100644
--- a/src/test/ui/let-else/let-else-brace-before-else.rs
+++ b/tests/ui/let-else/let-else-brace-before-else.rs
diff --git a/src/test/ui/let-else/let-else-brace-before-else.stderr b/tests/ui/let-else/let-else-brace-before-else.stderr
index cb01e4c18..cb01e4c18 100644
--- a/src/test/ui/let-else/let-else-brace-before-else.stderr
+++ b/tests/ui/let-else/let-else-brace-before-else.stderr
diff --git a/src/test/ui/let-else/let-else-check.rs b/tests/ui/let-else/let-else-check.rs
index 713fd986e..713fd986e 100644
--- a/src/test/ui/let-else/let-else-check.rs
+++ b/tests/ui/let-else/let-else-check.rs
diff --git a/src/test/ui/let-else/let-else-check.stderr b/tests/ui/let-else/let-else-check.stderr
index bdecbf708..bdecbf708 100644
--- a/src/test/ui/let-else/let-else-check.stderr
+++ b/tests/ui/let-else/let-else-check.stderr
diff --git a/src/test/ui/let-else/let-else-deref-coercion-annotated.rs b/tests/ui/let-else/let-else-deref-coercion-annotated.rs
index 60fdf825a..60fdf825a 100644
--- a/src/test/ui/let-else/let-else-deref-coercion-annotated.rs
+++ b/tests/ui/let-else/let-else-deref-coercion-annotated.rs
diff --git a/src/test/ui/let-else/let-else-deref-coercion.rs b/tests/ui/let-else/let-else-deref-coercion.rs
index 052a5a8c7..052a5a8c7 100644
--- a/src/test/ui/let-else/let-else-deref-coercion.rs
+++ b/tests/ui/let-else/let-else-deref-coercion.rs
diff --git a/src/test/ui/let-else/let-else-deref-coercion.stderr b/tests/ui/let-else/let-else-deref-coercion.stderr
index addcd798f..bf78a079c 100644
--- a/src/test/ui/let-else/let-else-deref-coercion.stderr
+++ b/tests/ui/let-else/let-else-deref-coercion.stderr
@@ -12,7 +12,7 @@ error[E0308]: mismatched types
 LL |         let Bar(z) = x;
    |             ^^^^^^   - this expression has type `&mut irrefutable::Foo`
    |             |
-   |             expected struct `irrefutable::Foo`, found struct `irrefutable::Bar`
+   |             expected struct `Foo`, found struct `Bar`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/let-else/let-else-destructuring.rs b/tests/ui/let-else/let-else-destructuring.rs
index d1f1a69bf..d1f1a69bf 100644
--- a/src/test/ui/let-else/let-else-destructuring.rs
+++ b/tests/ui/let-else/let-else-destructuring.rs
diff --git a/src/test/ui/let-else/let-else-destructuring.stderr b/tests/ui/let-else/let-else-destructuring.stderr
index 7d6cb2386..7d6cb2386 100644
--- a/src/test/ui/let-else/let-else-destructuring.stderr
+++ b/tests/ui/let-else/let-else-destructuring.stderr
diff --git a/src/test/ui/let-else/let-else-drop-order.rs b/tests/ui/let-else/let-else-drop-order.rs
index e91e5de84..e91e5de84 100644
--- a/src/test/ui/let-else/let-else-drop-order.rs
+++ b/tests/ui/let-else/let-else-drop-order.rs
diff --git a/src/test/ui/let-else/let-else-drop-order.run.stdout b/tests/ui/let-else/let-else-drop-order.run.stdout
index 01cf2f73e..01cf2f73e 100644
--- a/src/test/ui/let-else/let-else-drop-order.run.stdout
+++ b/tests/ui/let-else/let-else-drop-order.run.stdout
diff --git a/src/test/ui/let-else/let-else-if.rs b/tests/ui/let-else/let-else-if.rs
index e8c54ca7a..e8c54ca7a 100644
--- a/src/test/ui/let-else/let-else-if.rs
+++ b/tests/ui/let-else/let-else-if.rs
diff --git a/src/test/ui/let-else/let-else-if.stderr b/tests/ui/let-else/let-else-if.stderr
index c63fd61c5..c63fd61c5 100644
--- a/src/test/ui/let-else/let-else-if.stderr
+++ b/tests/ui/let-else/let-else-if.stderr
diff --git a/src/test/ui/let-else/let-else-irrefutable.rs b/tests/ui/let-else/let-else-irrefutable.rs
index f4b338eb0..f4b338eb0 100644
--- a/src/test/ui/let-else/let-else-irrefutable.rs
+++ b/tests/ui/let-else/let-else-irrefutable.rs
diff --git a/src/test/ui/let-else/let-else-irrefutable.stderr b/tests/ui/let-else/let-else-irrefutable.stderr
index 73d4e5f34..73d4e5f34 100644
--- a/src/test/ui/let-else/let-else-irrefutable.stderr
+++ b/tests/ui/let-else/let-else-irrefutable.stderr
diff --git a/src/test/ui/let-else/let-else-missing-semicolon.rs b/tests/ui/let-else/let-else-missing-semicolon.rs
index d87ac90c1..d87ac90c1 100644
--- a/src/test/ui/let-else/let-else-missing-semicolon.rs
+++ b/tests/ui/let-else/let-else-missing-semicolon.rs
diff --git a/src/test/ui/let-else/let-else-missing-semicolon.stderr b/tests/ui/let-else/let-else-missing-semicolon.stderr
index 99029ff33..99029ff33 100644
--- a/src/test/ui/let-else/let-else-missing-semicolon.stderr
+++ b/tests/ui/let-else/let-else-missing-semicolon.stderr
diff --git a/src/test/ui/let-else/let-else-no-double-error.rs b/tests/ui/let-else/let-else-no-double-error.rs
index 91fcc5d7e..91fcc5d7e 100644
--- a/src/test/ui/let-else/let-else-no-double-error.rs
+++ b/tests/ui/let-else/let-else-no-double-error.rs
diff --git a/src/test/ui/let-else/let-else-no-double-error.stderr b/tests/ui/let-else/let-else-no-double-error.stderr
index 941e588b1..941e588b1 100644
--- a/src/test/ui/let-else/let-else-no-double-error.stderr
+++ b/tests/ui/let-else/let-else-no-double-error.stderr
diff --git a/src/test/ui/let-else/let-else-non-copy.rs b/tests/ui/let-else/let-else-non-copy.rs
index 08c07dd1a..08c07dd1a 100644
--- a/src/test/ui/let-else/let-else-non-copy.rs
+++ b/tests/ui/let-else/let-else-non-copy.rs
diff --git a/src/test/ui/let-else/let-else-non-diverging.rs b/tests/ui/let-else/let-else-non-diverging.rs
index a5442dd82..a5442dd82 100644
--- a/src/test/ui/let-else/let-else-non-diverging.rs
+++ b/tests/ui/let-else/let-else-non-diverging.rs
diff --git a/src/test/ui/let-else/let-else-non-diverging.stderr b/tests/ui/let-else/let-else-non-diverging.stderr
index 78551fcc4..78551fcc4 100644
--- a/src/test/ui/let-else/let-else-non-diverging.stderr
+++ b/tests/ui/let-else/let-else-non-diverging.stderr
diff --git a/src/test/ui/let-else/let-else-ref-bindings-pass.rs b/tests/ui/let-else/let-else-ref-bindings-pass.rs
index 62fc65731..62fc65731 100644
--- a/src/test/ui/let-else/let-else-ref-bindings-pass.rs
+++ b/tests/ui/let-else/let-else-ref-bindings-pass.rs
diff --git a/src/test/ui/let-else/let-else-ref-bindings.rs b/tests/ui/let-else/let-else-ref-bindings.rs
index 687e235d4..687e235d4 100644
--- a/src/test/ui/let-else/let-else-ref-bindings.rs
+++ b/tests/ui/let-else/let-else-ref-bindings.rs
diff --git a/src/test/ui/let-else/let-else-ref-bindings.stderr b/tests/ui/let-else/let-else-ref-bindings.stderr
index 56b9e0733..56b9e0733 100644
--- a/src/test/ui/let-else/let-else-ref-bindings.stderr
+++ b/tests/ui/let-else/let-else-ref-bindings.stderr
diff --git a/src/test/ui/let-else/let-else-run-pass.rs b/tests/ui/let-else/let-else-run-pass.rs
index a0fb6c683..a0fb6c683 100644
--- a/src/test/ui/let-else/let-else-run-pass.rs
+++ b/tests/ui/let-else/let-else-run-pass.rs
diff --git a/src/test/ui/let-else/let-else-scope.rs b/tests/ui/let-else/let-else-scope.rs
index 78a67769e..78a67769e 100644
--- a/src/test/ui/let-else/let-else-scope.rs
+++ b/tests/ui/let-else/let-else-scope.rs
diff --git a/src/test/ui/let-else/let-else-scope.stderr b/tests/ui/let-else/let-else-scope.stderr
index 3b4f09829..3b4f09829 100644
--- a/src/test/ui/let-else/let-else-scope.stderr
+++ b/tests/ui/let-else/let-else-scope.stderr
diff --git a/src/test/ui/let-else/let-else-slicing-error.rs b/tests/ui/let-else/let-else-slicing-error.rs
index 25770094b..25770094b 100644
--- a/src/test/ui/let-else/let-else-slicing-error.rs
+++ b/tests/ui/let-else/let-else-slicing-error.rs
diff --git a/src/test/ui/let-else/let-else-slicing-error.stderr b/tests/ui/let-else/let-else-slicing-error.stderr
index 064025e03..064025e03 100644
--- a/src/test/ui/let-else/let-else-slicing-error.stderr
+++ b/tests/ui/let-else/let-else-slicing-error.stderr
diff --git a/src/test/ui/let-else/let-else-source-expr-nomove-pass.rs b/tests/ui/let-else/let-else-source-expr-nomove-pass.rs
index ee378abcf..ee378abcf 100644
--- a/src/test/ui/let-else/let-else-source-expr-nomove-pass.rs
+++ b/tests/ui/let-else/let-else-source-expr-nomove-pass.rs
diff --git a/src/test/ui/let-else/let-else-temp-borrowck.rs b/tests/ui/let-else/let-else-temp-borrowck.rs
index 6b4642d2f..6b4642d2f 100644
--- a/src/test/ui/let-else/let-else-temp-borrowck.rs
+++ b/tests/ui/let-else/let-else-temp-borrowck.rs
diff --git a/src/test/ui/let-else/let-else-temporary-lifetime.rs b/tests/ui/let-else/let-else-temporary-lifetime.rs
index c23eaa997..c23eaa997 100644
--- a/src/test/ui/let-else/let-else-temporary-lifetime.rs
+++ b/tests/ui/let-else/let-else-temporary-lifetime.rs
diff --git a/src/test/ui/let-else/let-else-then-diverge.rs b/tests/ui/let-else/let-else-then-diverge.rs
index 1a75310c9..1a75310c9 100644
--- a/src/test/ui/let-else/let-else-then-diverge.rs
+++ b/tests/ui/let-else/let-else-then-diverge.rs
diff --git a/src/test/ui/let-else/let-else-then-diverge.stderr b/tests/ui/let-else/let-else-then-diverge.stderr
index 470a11d47..470a11d47 100644
--- a/src/test/ui/let-else/let-else-then-diverge.stderr
+++ b/tests/ui/let-else/let-else-then-diverge.stderr
diff --git a/src/test/ui/let-else/let-else.rs b/tests/ui/let-else/let-else.rs
index 3505533e6..3505533e6 100644
--- a/src/test/ui/let-else/let-else.rs
+++ b/tests/ui/let-else/let-else.rs
diff --git a/src/test/ui/lexer/error-stage.rs b/tests/ui/lexer/error-stage.rs
index c8d88f745..c8d88f745 100644
--- a/src/test/ui/lexer/error-stage.rs
+++ b/tests/ui/lexer/error-stage.rs
diff --git a/src/test/ui/lexer/error-stage.stderr b/tests/ui/lexer/error-stage.stderr
index 697a7c28d..ecbdb14dc 100644
--- a/src/test/ui/lexer/error-stage.stderr
+++ b/tests/ui/lexer/error-stage.stderr
@@ -49,6 +49,8 @@ error: integer literal is too large
    |
 LL |     999340282366920938463463374607431768211455999;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `340282366920938463463374607431768211455`
 
 error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/lexer/lex-bad-binary-literal.rs b/tests/ui/lexer/lex-bad-binary-literal.rs
index 7df98073e..7df98073e 100644
--- a/src/test/ui/lexer/lex-bad-binary-literal.rs
+++ b/tests/ui/lexer/lex-bad-binary-literal.rs
diff --git a/src/test/ui/lexer/lex-bad-binary-literal.stderr b/tests/ui/lexer/lex-bad-binary-literal.stderr
index 992b3d248..992b3d248 100644
--- a/src/test/ui/lexer/lex-bad-binary-literal.stderr
+++ b/tests/ui/lexer/lex-bad-binary-literal.stderr
diff --git a/src/test/ui/lexer/lex-bad-char-literals-1.rs b/tests/ui/lexer/lex-bad-char-literals-1.rs
index e7951cfd2..e7951cfd2 100644
--- a/src/test/ui/lexer/lex-bad-char-literals-1.rs
+++ b/tests/ui/lexer/lex-bad-char-literals-1.rs
diff --git a/src/test/ui/lexer/lex-bad-char-literals-1.stderr b/tests/ui/lexer/lex-bad-char-literals-1.stderr
index e6ff1f662..e6ff1f662 100644
--- a/src/test/ui/lexer/lex-bad-char-literals-1.stderr
+++ b/tests/ui/lexer/lex-bad-char-literals-1.stderr
diff --git a/src/test/ui/lexer/lex-bad-char-literals-2.rs b/tests/ui/lexer/lex-bad-char-literals-2.rs
index d35dafd9a..d35dafd9a 100644
--- a/src/test/ui/lexer/lex-bad-char-literals-2.rs
+++ b/tests/ui/lexer/lex-bad-char-literals-2.rs
diff --git a/src/test/ui/lexer/lex-bad-char-literals-2.stderr b/tests/ui/lexer/lex-bad-char-literals-2.stderr
index c2b19a7ad..c2b19a7ad 100644
--- a/src/test/ui/lexer/lex-bad-char-literals-2.stderr
+++ b/tests/ui/lexer/lex-bad-char-literals-2.stderr
diff --git a/src/test/ui/lexer/lex-bad-char-literals-3.rs b/tests/ui/lexer/lex-bad-char-literals-3.rs
index 5194ff4d9..5194ff4d9 100644
--- a/src/test/ui/lexer/lex-bad-char-literals-3.rs
+++ b/tests/ui/lexer/lex-bad-char-literals-3.rs
diff --git a/src/test/ui/lexer/lex-bad-char-literals-3.stderr b/tests/ui/lexer/lex-bad-char-literals-3.stderr
index 62a5e424c..62a5e424c 100644
--- a/src/test/ui/lexer/lex-bad-char-literals-3.stderr
+++ b/tests/ui/lexer/lex-bad-char-literals-3.stderr
diff --git a/src/test/ui/lexer/lex-bad-char-literals-4.rs b/tests/ui/lexer/lex-bad-char-literals-4.rs
index de0a19df9..de0a19df9 100644
--- a/src/test/ui/lexer/lex-bad-char-literals-4.rs
+++ b/tests/ui/lexer/lex-bad-char-literals-4.rs
diff --git a/src/test/ui/lexer/lex-bad-char-literals-4.stderr b/tests/ui/lexer/lex-bad-char-literals-4.stderr
index fec4421c4..fec4421c4 100644
--- a/src/test/ui/lexer/lex-bad-char-literals-4.stderr
+++ b/tests/ui/lexer/lex-bad-char-literals-4.stderr
diff --git a/src/test/ui/lexer/lex-bad-char-literals-5.rs b/tests/ui/lexer/lex-bad-char-literals-5.rs
index 0c4339edc..0c4339edc 100644
--- a/src/test/ui/lexer/lex-bad-char-literals-5.rs
+++ b/tests/ui/lexer/lex-bad-char-literals-5.rs
diff --git a/src/test/ui/lexer/lex-bad-char-literals-5.stderr b/tests/ui/lexer/lex-bad-char-literals-5.stderr
index 184817a65..184817a65 100644
--- a/src/test/ui/lexer/lex-bad-char-literals-5.stderr
+++ b/tests/ui/lexer/lex-bad-char-literals-5.stderr
diff --git a/src/test/ui/lexer/lex-bad-char-literals-6.rs b/tests/ui/lexer/lex-bad-char-literals-6.rs
index 4379b4fa6..1b498c0fb 100644
--- a/src/test/ui/lexer/lex-bad-char-literals-6.rs
+++ b/tests/ui/lexer/lex-bad-char-literals-6.rs
@@ -7,10 +7,8 @@ fn main() {
     //~^ ERROR: character literal may only contain one codepoint
 
     if x == y {}
-    //~^ ERROR: can't compare `&str` with `char`
     if y == z {}  // no error here
     if x == z {}
-    //~^ ERROR: can't compare `&str` with `char`
 
     let a: usize = "";
     //~^ ERROR: mismatched types
diff --git a/tests/ui/lexer/lex-bad-char-literals-6.stderr b/tests/ui/lexer/lex-bad-char-literals-6.stderr
new file mode 100644
index 000000000..2fe30304a
--- /dev/null
+++ b/tests/ui/lexer/lex-bad-char-literals-6.stderr
@@ -0,0 +1,44 @@
+error: character literal may only contain one codepoint
+  --> $DIR/lex-bad-char-literals-6.rs:2:19
+   |
+LL |     let x: &str = 'ab';
+   |                   ^^^^
+   |
+help: if you meant to write a `str` literal, use double quotes
+   |
+LL |     let x: &str = "ab";
+   |                   ~~~~
+
+error: character literal may only contain one codepoint
+  --> $DIR/lex-bad-char-literals-6.rs:4:19
+   |
+LL |     let y: char = 'cd';
+   |                   ^^^^
+   |
+help: if you meant to write a `str` literal, use double quotes
+   |
+LL |     let y: char = "cd";
+   |                   ~~~~
+
+error: character literal may only contain one codepoint
+  --> $DIR/lex-bad-char-literals-6.rs:6:13
+   |
+LL |     let z = 'ef';
+   |             ^^^^
+   |
+help: if you meant to write a `str` literal, use double quotes
+   |
+LL |     let z = "ef";
+   |             ~~~~
+
+error[E0308]: mismatched types
+  --> $DIR/lex-bad-char-literals-6.rs:13:20
+   |
+LL |     let a: usize = "";
+   |            -----   ^^ expected `usize`, found `&str`
+   |            |
+   |            expected due to this
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/lexer/lex-bad-char-literals-7.rs b/tests/ui/lexer/lex-bad-char-literals-7.rs
index c675df2f3..c675df2f3 100644
--- a/src/test/ui/lexer/lex-bad-char-literals-7.rs
+++ b/tests/ui/lexer/lex-bad-char-literals-7.rs
diff --git a/src/test/ui/lexer/lex-bad-char-literals-7.stderr b/tests/ui/lexer/lex-bad-char-literals-7.stderr
index 255b9c689..255b9c689 100644
--- a/src/test/ui/lexer/lex-bad-char-literals-7.stderr
+++ b/tests/ui/lexer/lex-bad-char-literals-7.stderr
diff --git a/src/test/ui/lexer/lex-bad-numeric-literals.rs b/tests/ui/lexer/lex-bad-numeric-literals.rs
index cf8440ca4..56bdc50e4 100644
--- a/src/test/ui/lexer/lex-bad-numeric-literals.rs
+++ b/tests/ui/lexer/lex-bad-numeric-literals.rs
@@ -1,3 +1,5 @@
+// ignore-tidy-linelength
+
 fn main() {
     0o1.0; //~ ERROR: octal float literal is not supported
     0o2f32; //~ ERROR: octal float literal is not supported
@@ -15,6 +17,12 @@ fn main() {
     //~^ ERROR: integer literal is too large
     9900000000000000000000000000999999999999999999999999999999;
     //~^ ERROR: integer literal is too large
+    0b111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110;
+    //~^ ERROR: integer literal is too large
+    0o37777777777777777777777777777777777777777770;
+    //~^ ERROR: integer literal is too large
+    0xffffffffffffffffffffffffffffffff0;
+    //~^ ERROR: integer literal is too large
     0x; //~ ERROR: no valid digits
     0xu32; //~ ERROR: no valid digits
     0ou32; //~ ERROR: no valid digits
diff --git a/tests/ui/lexer/lex-bad-numeric-literals.stderr b/tests/ui/lexer/lex-bad-numeric-literals.stderr
new file mode 100644
index 000000000..145754197
--- /dev/null
+++ b/tests/ui/lexer/lex-bad-numeric-literals.stderr
@@ -0,0 +1,169 @@
+error: octal float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:4:5
+   |
+LL |     0o1.0;
+   |     ^^^^^
+
+error: octal float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:6:5
+   |
+LL |     0o3.0f32;
+   |     ^^^^^
+
+error: octal float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:7:5
+   |
+LL |     0o4e4;
+   |     ^^^^^
+
+error: octal float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:8:5
+   |
+LL |     0o5.0e5;
+   |     ^^^^^^^
+
+error: octal float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:9:5
+   |
+LL |     0o6e6f32;
+   |     ^^^^^
+
+error: octal float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:10:5
+   |
+LL |     0o7.0e7f64;
+   |     ^^^^^^^
+
+error: hexadecimal float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:11:5
+   |
+LL |     0x8.0e+9;
+   |     ^^^^^^^^
+
+error: hexadecimal float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:12:5
+   |
+LL |     0x9.0e-9;
+   |     ^^^^^^^^
+
+error[E0768]: no valid digits found for number
+  --> $DIR/lex-bad-numeric-literals.rs:13:5
+   |
+LL |     0o;
+   |     ^^
+
+error: expected at least one digit in exponent
+  --> $DIR/lex-bad-numeric-literals.rs:14:5
+   |
+LL |     1e+;
+   |     ^^^
+
+error: hexadecimal float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:15:5
+   |
+LL |     0x539.0;
+   |     ^^^^^^^
+
+error[E0768]: no valid digits found for number
+  --> $DIR/lex-bad-numeric-literals.rs:26:5
+   |
+LL |     0x;
+   |     ^^
+
+error[E0768]: no valid digits found for number
+  --> $DIR/lex-bad-numeric-literals.rs:27:5
+   |
+LL |     0xu32;
+   |     ^^
+
+error[E0768]: no valid digits found for number
+  --> $DIR/lex-bad-numeric-literals.rs:28:5
+   |
+LL |     0ou32;
+   |     ^^
+
+error[E0768]: no valid digits found for number
+  --> $DIR/lex-bad-numeric-literals.rs:29:5
+   |
+LL |     0bu32;
+   |     ^^
+
+error[E0768]: no valid digits found for number
+  --> $DIR/lex-bad-numeric-literals.rs:30:5
+   |
+LL |     0b;
+   |     ^^
+
+error: octal float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:32:5
+   |
+LL |     0o123.456;
+   |     ^^^^^^^^^
+
+error: binary float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:34:5
+   |
+LL |     0b111.101;
+   |     ^^^^^^^^^
+
+error: octal float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:5:5
+   |
+LL |     0o2f32;
+   |     ^^^^^^ not supported
+
+error: integer literal is too large
+  --> $DIR/lex-bad-numeric-literals.rs:16:5
+   |
+LL |     9900000000000000000000000000999999999999999999999999999999;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `340282366920938463463374607431768211455`
+
+error: integer literal is too large
+  --> $DIR/lex-bad-numeric-literals.rs:18:5
+   |
+LL |     9900000000000000000000000000999999999999999999999999999999;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `340282366920938463463374607431768211455`
+
+error: integer literal is too large
+  --> $DIR/lex-bad-numeric-literals.rs:20:5
+   |
+LL |     0b111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `0b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111`
+
+error: integer literal is too large
+  --> $DIR/lex-bad-numeric-literals.rs:22:5
+   |
+LL |     0o37777777777777777777777777777777777777777770;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `0o3777777777777777777777777777777777777777777`
+
+error: integer literal is too large
+  --> $DIR/lex-bad-numeric-literals.rs:24:5
+   |
+LL |     0xffffffffffffffffffffffffffffffff0;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `0xffffffffffffffffffffffffffffffff`
+
+error: octal float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:31:5
+   |
+LL |     0o123f64;
+   |     ^^^^^^^^ not supported
+
+error: binary float literal is not supported
+  --> $DIR/lex-bad-numeric-literals.rs:33:5
+   |
+LL |     0b101f64;
+   |     ^^^^^^^^ not supported
+
+error: aborting due to 26 previous errors
+
+For more information about this error, try `rustc --explain E0768`.
diff --git a/src/test/ui/lexer/lex-bad-octal-literal.rs b/tests/ui/lexer/lex-bad-octal-literal.rs
index 49631f16b..49631f16b 100644
--- a/src/test/ui/lexer/lex-bad-octal-literal.rs
+++ b/tests/ui/lexer/lex-bad-octal-literal.rs
diff --git a/src/test/ui/lexer/lex-bad-octal-literal.stderr b/tests/ui/lexer/lex-bad-octal-literal.stderr
index 2cb8ca5de..2cb8ca5de 100644
--- a/src/test/ui/lexer/lex-bad-octal-literal.stderr
+++ b/tests/ui/lexer/lex-bad-octal-literal.stderr
diff --git a/src/test/ui/lexer/lex-bad-token.rs b/tests/ui/lexer/lex-bad-token.rs
index 9e4824611..9e4824611 100644
--- a/src/test/ui/lexer/lex-bad-token.rs
+++ b/tests/ui/lexer/lex-bad-token.rs
diff --git a/src/test/ui/lexer/lex-bad-token.stderr b/tests/ui/lexer/lex-bad-token.stderr
index 43c43721b..43c43721b 100644
--- a/src/test/ui/lexer/lex-bad-token.stderr
+++ b/tests/ui/lexer/lex-bad-token.stderr
diff --git a/src/test/ui/lexer/lex-bare-cr-nondoc-comment.rs b/tests/ui/lexer/lex-bare-cr-nondoc-comment.rs
index 5b528d6e1..5b528d6e1 100644
--- a/src/test/ui/lexer/lex-bare-cr-nondoc-comment.rs
+++ b/tests/ui/lexer/lex-bare-cr-nondoc-comment.rs
diff --git a/src/test/ui/lexer/lex-bare-cr-string-literal-doc-comment.rs b/tests/ui/lexer/lex-bare-cr-string-literal-doc-comment.rs
index b7752e1f0..b7752e1f0 100644
--- a/src/test/ui/lexer/lex-bare-cr-string-literal-doc-comment.rs
+++ b/tests/ui/lexer/lex-bare-cr-string-literal-doc-comment.rs
diff --git a/src/test/ui/lexer/lex-bare-cr-string-literal-doc-comment.stderr b/tests/ui/lexer/lex-bare-cr-string-literal-doc-comment.stderr
index 1a21fed63..1a21fed63 100644
--- a/src/test/ui/lexer/lex-bare-cr-string-literal-doc-comment.stderr
+++ b/tests/ui/lexer/lex-bare-cr-string-literal-doc-comment.stderr
diff --git a/src/test/ui/lexer/lex-emoji-identifiers.rs b/tests/ui/lexer/lex-emoji-identifiers.rs
index 91b5929c0..91b5929c0 100644
--- a/src/test/ui/lexer/lex-emoji-identifiers.rs
+++ b/tests/ui/lexer/lex-emoji-identifiers.rs
diff --git a/src/test/ui/lexer/lex-emoji-identifiers.stderr b/tests/ui/lexer/lex-emoji-identifiers.stderr
index 6237c5d02..6237c5d02 100644
--- a/src/test/ui/lexer/lex-emoji-identifiers.stderr
+++ b/tests/ui/lexer/lex-emoji-identifiers.stderr
diff --git a/src/test/ui/lexer/lex-stray-backslash.rs b/tests/ui/lexer/lex-stray-backslash.rs
index bb27f44c2..bb27f44c2 100644
--- a/src/test/ui/lexer/lex-stray-backslash.rs
+++ b/tests/ui/lexer/lex-stray-backslash.rs
diff --git a/src/test/ui/lexer/lex-stray-backslash.stderr b/tests/ui/lexer/lex-stray-backslash.stderr
index 06dc0f2b5..06dc0f2b5 100644
--- a/src/test/ui/lexer/lex-stray-backslash.stderr
+++ b/tests/ui/lexer/lex-stray-backslash.stderr
diff --git a/src/test/ui/lexer/lexer-crlf-line-endings-string-literal-doc-comment.rs b/tests/ui/lexer/lexer-crlf-line-endings-string-literal-doc-comment.rs
index 802be7f5a..802be7f5a 100644
--- a/src/test/ui/lexer/lexer-crlf-line-endings-string-literal-doc-comment.rs
+++ b/tests/ui/lexer/lexer-crlf-line-endings-string-literal-doc-comment.rs
diff --git a/src/test/ui/lexical-scopes.rs b/tests/ui/lexical-scopes.rs
index 46cfdf1ef..46cfdf1ef 100644
--- a/src/test/ui/lexical-scopes.rs
+++ b/tests/ui/lexical-scopes.rs
diff --git a/src/test/ui/lexical-scopes.stderr b/tests/ui/lexical-scopes.stderr
index f0eaa1a5c..f0eaa1a5c 100644
--- a/src/test/ui/lexical-scopes.stderr
+++ b/tests/ui/lexical-scopes.stderr
diff --git a/src/test/ui/lexical-scoping.rs b/tests/ui/lexical-scoping.rs
index 04904958a..04904958a 100644
--- a/src/test/ui/lexical-scoping.rs
+++ b/tests/ui/lexical-scoping.rs
diff --git a/src/test/ui/lifetimes/auxiliary/issue-91763-aux.rs b/tests/ui/lifetimes/auxiliary/issue-91763-aux.rs
index 0335f72b7..0335f72b7 100644
--- a/src/test/ui/lifetimes/auxiliary/issue-91763-aux.rs
+++ b/tests/ui/lifetimes/auxiliary/issue-91763-aux.rs
diff --git a/src/test/ui/lifetimes/auxiliary/lifetime_bound_will_change_warning_lib.rs b/tests/ui/lifetimes/auxiliary/lifetime_bound_will_change_warning_lib.rs
index 58f1b81cf..58f1b81cf 100644
--- a/src/test/ui/lifetimes/auxiliary/lifetime_bound_will_change_warning_lib.rs
+++ b/tests/ui/lifetimes/auxiliary/lifetime_bound_will_change_warning_lib.rs
diff --git a/src/test/ui/lifetimes/bare-trait-object-borrowck.rs b/tests/ui/lifetimes/bare-trait-object-borrowck.rs
index 45f5e4ae1..45f5e4ae1 100644
--- a/src/test/ui/lifetimes/bare-trait-object-borrowck.rs
+++ b/tests/ui/lifetimes/bare-trait-object-borrowck.rs
diff --git a/src/test/ui/lifetimes/bare-trait-object.rs b/tests/ui/lifetimes/bare-trait-object.rs
index 9eff618c7..9eff618c7 100644
--- a/src/test/ui/lifetimes/bare-trait-object.rs
+++ b/tests/ui/lifetimes/bare-trait-object.rs
diff --git a/src/test/ui/lifetimes/borrowck-let-suggestion.rs b/tests/ui/lifetimes/borrowck-let-suggestion.rs
index 3d591a506..3d591a506 100644
--- a/src/test/ui/lifetimes/borrowck-let-suggestion.rs
+++ b/tests/ui/lifetimes/borrowck-let-suggestion.rs
diff --git a/src/test/ui/lifetimes/borrowck-let-suggestion.stderr b/tests/ui/lifetimes/borrowck-let-suggestion.stderr
index 987b051b1..987b051b1 100644
--- a/src/test/ui/lifetimes/borrowck-let-suggestion.stderr
+++ b/tests/ui/lifetimes/borrowck-let-suggestion.stderr
diff --git a/tests/ui/lifetimes/conflicting-bounds.rs b/tests/ui/lifetimes/conflicting-bounds.rs
new file mode 100644
index 000000000..f37f163db
--- /dev/null
+++ b/tests/ui/lifetimes/conflicting-bounds.rs
@@ -0,0 +1,11 @@
+//~ type annotations needed: cannot satisfy `Self: Gen<'source>`
+
+pub trait Gen<'source> {
+    type Output;
+
+    fn gen<T>(&self) -> T
+    where
+        Self: for<'s> Gen<'s, Output = T>;
+}
+
+fn main() {}
diff --git a/tests/ui/lifetimes/conflicting-bounds.stderr b/tests/ui/lifetimes/conflicting-bounds.stderr
new file mode 100644
index 000000000..42aa39366
--- /dev/null
+++ b/tests/ui/lifetimes/conflicting-bounds.stderr
@@ -0,0 +1,14 @@
+error[E0283]: type annotations needed: cannot satisfy `Self: Gen<'source>`
+   |
+note: multiple `impl`s or `where` clauses satisfying `Self: Gen<'source>` found
+  --> $DIR/conflicting-bounds.rs:3:1
+   |
+LL | pub trait Gen<'source> {
+   | ^^^^^^^^^^^^^^^^^^^^^^
+...
+LL |         Self: for<'s> Gen<'s, Output = T>;
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0283`.
diff --git a/src/test/ui/lifetimes/copy_modulo_regions.rs b/tests/ui/lifetimes/copy_modulo_regions.rs
index 040fc4a00..040fc4a00 100644
--- a/src/test/ui/lifetimes/copy_modulo_regions.rs
+++ b/tests/ui/lifetimes/copy_modulo_regions.rs
diff --git a/src/test/ui/lifetimes/copy_modulo_regions.stderr b/tests/ui/lifetimes/copy_modulo_regions.stderr
index 87dbb64ab..87dbb64ab 100644
--- a/src/test/ui/lifetimes/copy_modulo_regions.stderr
+++ b/tests/ui/lifetimes/copy_modulo_regions.stderr
diff --git a/src/test/ui/lifetimes/elided-lifetime-in-param-pat.rs b/tests/ui/lifetimes/elided-lifetime-in-param-pat.rs
index c1425fa42..c1425fa42 100644
--- a/src/test/ui/lifetimes/elided-lifetime-in-param-pat.rs
+++ b/tests/ui/lifetimes/elided-lifetime-in-param-pat.rs
diff --git a/src/test/ui/lifetimes/elided-lifetime-in-path-in-impl-Fn.rs b/tests/ui/lifetimes/elided-lifetime-in-path-in-impl-Fn.rs
index 9c9965d8f..9c9965d8f 100644
--- a/src/test/ui/lifetimes/elided-lifetime-in-path-in-impl-Fn.rs
+++ b/tests/ui/lifetimes/elided-lifetime-in-path-in-impl-Fn.rs
diff --git a/src/test/ui/lifetimes/elided-lifetime-in-path-in-pat.rs b/tests/ui/lifetimes/elided-lifetime-in-path-in-pat.rs
index ff84d2511..ff84d2511 100644
--- a/src/test/ui/lifetimes/elided-lifetime-in-path-in-pat.rs
+++ b/tests/ui/lifetimes/elided-lifetime-in-path-in-pat.rs
diff --git a/src/test/ui/lifetimes/elided-lifetime-in-path-in-type-relative-expression.rs b/tests/ui/lifetimes/elided-lifetime-in-path-in-type-relative-expression.rs
index b9d2711fd..b9d2711fd 100644
--- a/src/test/ui/lifetimes/elided-lifetime-in-path-in-type-relative-expression.rs
+++ b/tests/ui/lifetimes/elided-lifetime-in-path-in-type-relative-expression.rs
diff --git a/src/test/ui/lifetimes/fullwidth-ampersand.rs b/tests/ui/lifetimes/fullwidth-ampersand.rs
index 7d8948bd8..7d8948bd8 100644
--- a/src/test/ui/lifetimes/fullwidth-ampersand.rs
+++ b/tests/ui/lifetimes/fullwidth-ampersand.rs
diff --git a/src/test/ui/lifetimes/fullwidth-ampersand.stderr b/tests/ui/lifetimes/fullwidth-ampersand.stderr
index 4645254f4..4645254f4 100644
--- a/src/test/ui/lifetimes/fullwidth-ampersand.stderr
+++ b/tests/ui/lifetimes/fullwidth-ampersand.stderr
diff --git a/tests/ui/lifetimes/issue-105227.fixed b/tests/ui/lifetimes/issue-105227.fixed
new file mode 100644
index 000000000..f6ed9c82e
--- /dev/null
+++ b/tests/ui/lifetimes/issue-105227.fixed
@@ -0,0 +1,26 @@
+// Regression test for issue #105227.
+
+// run-rustfix
+#![allow(warnings)]
+fn chars0<'a>(v :(&'a  str, &'a str)) -> impl Iterator<Item = char> + 'a  {
+//~^ HELP to declare that `impl Iterator<Item = char>` captures `'_`, you can introduce a named lifetime parameter `'a`
+    v.0.chars().chain(v.1.chars())
+    //~^ ERROR hidden type for `impl Iterator<Item = char>` captures lifetime that does not appear in bounds
+}
+
+fn chars1<'a>(v0 : &'a  str, v1 : &'a str) -> impl Iterator<Item = char> + 'a  {
+//~^ HELP to declare that `impl Iterator<Item = char>` captures `'_`, you can introduce a named lifetime parameter `'a`
+    v0.chars().chain(v1.chars())
+    //~^ ERROR hidden type for `impl Iterator<Item = char>` captures lifetime that does not appear in bound
+}
+
+fn chars2<'b>(v0 : &'b str, v1 : &'b str, v2 : &'b str) ->
+//~^ HELP to declare that `impl Iterator<Item = char>` captures `'_`, you can use the named lifetime parameter `'b`
+    (impl Iterator<Item = char> + 'b , &'b str)
+{
+    (v0.chars().chain(v1.chars()), v2)
+    //~^ ERROR hidden type for `impl Iterator<Item = char>` captures lifetime that does not appear in bound
+}
+
+fn main() {
+}
diff --git a/tests/ui/lifetimes/issue-105227.rs b/tests/ui/lifetimes/issue-105227.rs
new file mode 100644
index 000000000..6427a50bb
--- /dev/null
+++ b/tests/ui/lifetimes/issue-105227.rs
@@ -0,0 +1,26 @@
+// Regression test for issue #105227.
+
+// run-rustfix
+#![allow(warnings)]
+fn chars0(v :(& str, &str)) -> impl Iterator<Item = char> {
+//~^ HELP to declare that `impl Iterator<Item = char>` captures `'_`, you can introduce a named lifetime parameter `'a`
+    v.0.chars().chain(v.1.chars())
+    //~^ ERROR hidden type for `impl Iterator<Item = char>` captures lifetime that does not appear in bounds
+}
+
+fn chars1(v0 : & str, v1 : &str) -> impl Iterator<Item = char> {
+//~^ HELP to declare that `impl Iterator<Item = char>` captures `'_`, you can introduce a named lifetime parameter `'a`
+    v0.chars().chain(v1.chars())
+    //~^ ERROR hidden type for `impl Iterator<Item = char>` captures lifetime that does not appear in bound
+}
+
+fn chars2<'b>(v0 : &str, v1 : &'_ str, v2 : &'b str) ->
+//~^ HELP to declare that `impl Iterator<Item = char>` captures `'_`, you can use the named lifetime parameter `'b`
+    (impl Iterator<Item = char>, &'b str)
+{
+    (v0.chars().chain(v1.chars()), v2)
+    //~^ ERROR hidden type for `impl Iterator<Item = char>` captures lifetime that does not appear in bound
+}
+
+fn main() {
+}
diff --git a/tests/ui/lifetimes/issue-105227.stderr b/tests/ui/lifetimes/issue-105227.stderr
new file mode 100644
index 000000000..d21145937
--- /dev/null
+++ b/tests/ui/lifetimes/issue-105227.stderr
@@ -0,0 +1,47 @@
+error[E0700]: hidden type for `impl Iterator<Item = char>` captures lifetime that does not appear in bounds
+  --> $DIR/issue-105227.rs:7:5
+   |
+LL | fn chars0(v :(& str, &str)) -> impl Iterator<Item = char> {
+   |               ----- hidden type `std::iter::Chain<Chars<'_>, Chars<'_>>` captures the anonymous lifetime defined here
+LL |
+LL |     v.0.chars().chain(v.1.chars())
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: to declare that `impl Iterator<Item = char>` captures `'_`, you can introduce a named lifetime parameter `'a`
+   |
+LL | fn chars0<'a>(v :(&'a  str, &'a str)) -> impl Iterator<Item = char> + 'a  {
+   |          ++++      ++        ++                                     ++++
+
+error[E0700]: hidden type for `impl Iterator<Item = char>` captures lifetime that does not appear in bounds
+  --> $DIR/issue-105227.rs:13:5
+   |
+LL | fn chars1(v0 : & str, v1 : &str) -> impl Iterator<Item = char> {
+   |                ----- hidden type `std::iter::Chain<Chars<'_>, Chars<'_>>` captures the anonymous lifetime defined here
+LL |
+LL |     v0.chars().chain(v1.chars())
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: to declare that `impl Iterator<Item = char>` captures `'_`, you can introduce a named lifetime parameter `'a`
+   |
+LL | fn chars1<'a>(v0 : &'a  str, v1 : &'a str) -> impl Iterator<Item = char> + 'a  {
+   |          ++++       ++             ++                                    ++++
+
+error[E0700]: hidden type for `impl Iterator<Item = char>` captures lifetime that does not appear in bounds
+  --> $DIR/issue-105227.rs:21:5
+   |
+LL | fn chars2<'b>(v0 : &str, v1 : &'_ str, v2 : &'b str) ->
+   |                    ---- hidden type `std::iter::Chain<Chars<'_>, Chars<'_>>` captures the anonymous lifetime defined here
+...
+LL |     (v0.chars().chain(v1.chars()), v2)
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: to declare that `impl Iterator<Item = char>` captures `'_`, you can use the named lifetime parameter `'b`
+   |
+LL ~ fn chars2<'b>(v0 : &'b str, v1 : &'b str, v2 : &'b str) ->
+LL |
+LL ~     (impl Iterator<Item = char> + 'b , &'b str)
+   |
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0700`.
diff --git a/tests/ui/lifetimes/issue-105507.fixed b/tests/ui/lifetimes/issue-105507.fixed
new file mode 100644
index 000000000..277ce8a77
--- /dev/null
+++ b/tests/ui/lifetimes/issue-105507.fixed
@@ -0,0 +1,43 @@
+// run-rustfix
+//
+#![allow(warnings)]
+struct Wrapper<'a, T: ?Sized>(&'a T);
+
+trait Project {
+    type Projected<'a> where Self: 'a;
+    fn project(this: Wrapper<'_, Self>) -> Self::Projected<'_>;
+}
+trait MyTrait {}
+trait ProjectedMyTrait {}
+
+impl<T> Project for Option<T> {
+    type Projected<'a> = Option<Wrapper<'a, T>> where T: 'a;
+    fn project(this: Wrapper<'_, Self>) -> Self::Projected<'_> {
+        this.0.as_ref().map(Wrapper)
+    }
+}
+
+impl<T: MyTrait> MyTrait for Option<Wrapper<'_, T>> {}
+
+impl<T: ProjectedMyTrait> MyTrait for Wrapper<'_, T> {}
+
+impl<T> ProjectedMyTrait for T
+    where
+        T: Project,
+        for<'a> T::Projected<'a>: MyTrait,
+        //~^ NOTE due to current limitations in the borrow checker, this implies a `'static` lifetime
+        //~| NOTE due to current limitations in the borrow checker, this implies a `'static` lifetime
+{}
+
+fn require_trait<T: MyTrait>(_: T) {}
+
+fn foo<T : MyTrait + 'static + 'static, U : MyTrait + 'static + 'static>(wrap: Wrapper<'_, Option<T>>, wrap1: Wrapper<'_, Option<U>>) {
+    //~^ HELP consider restricting the type parameter to the `'static` lifetime
+    //~| HELP consider restricting the type parameter to the `'static` lifetime
+    require_trait(wrap);
+    //~^ ERROR `T` does not live long enough
+    require_trait(wrap1);
+    //~^ ERROR `U` does not live long enough
+}
+
+fn main() {}
diff --git a/tests/ui/lifetimes/issue-105507.rs b/tests/ui/lifetimes/issue-105507.rs
new file mode 100644
index 000000000..f46c6b6f2
--- /dev/null
+++ b/tests/ui/lifetimes/issue-105507.rs
@@ -0,0 +1,43 @@
+// run-rustfix
+//
+#![allow(warnings)]
+struct Wrapper<'a, T: ?Sized>(&'a T);
+
+trait Project {
+    type Projected<'a> where Self: 'a;
+    fn project(this: Wrapper<'_, Self>) -> Self::Projected<'_>;
+}
+trait MyTrait {}
+trait ProjectedMyTrait {}
+
+impl<T> Project for Option<T> {
+    type Projected<'a> = Option<Wrapper<'a, T>> where T: 'a;
+    fn project(this: Wrapper<'_, Self>) -> Self::Projected<'_> {
+        this.0.as_ref().map(Wrapper)
+    }
+}
+
+impl<T: MyTrait> MyTrait for Option<Wrapper<'_, T>> {}
+
+impl<T: ProjectedMyTrait> MyTrait for Wrapper<'_, T> {}
+
+impl<T> ProjectedMyTrait for T
+    where
+        T: Project,
+        for<'a> T::Projected<'a>: MyTrait,
+        //~^ NOTE due to current limitations in the borrow checker, this implies a `'static` lifetime
+        //~| NOTE due to current limitations in the borrow checker, this implies a `'static` lifetime
+{}
+
+fn require_trait<T: MyTrait>(_: T) {}
+
+fn foo<T : MyTrait, U : MyTrait>(wrap: Wrapper<'_, Option<T>>, wrap1: Wrapper<'_, Option<U>>) {
+    //~^ HELP consider restricting the type parameter to the `'static` lifetime
+    //~| HELP consider restricting the type parameter to the `'static` lifetime
+    require_trait(wrap);
+    //~^ ERROR `T` does not live long enough
+    require_trait(wrap1);
+    //~^ ERROR `U` does not live long enough
+}
+
+fn main() {}
diff --git a/tests/ui/lifetimes/issue-105507.stderr b/tests/ui/lifetimes/issue-105507.stderr
new file mode 100644
index 000000000..44d3a7eb9
--- /dev/null
+++ b/tests/ui/lifetimes/issue-105507.stderr
@@ -0,0 +1,34 @@
+error: `T` does not live long enough
+  --> $DIR/issue-105507.rs:37:5
+   |
+LL |     require_trait(wrap);
+   |     ^^^^^^^^^^^^^^^^^^^
+   |
+note: due to current limitations in the borrow checker, this implies a `'static` lifetime
+  --> $DIR/issue-105507.rs:27:35
+   |
+LL |         for<'a> T::Projected<'a>: MyTrait,
+   |                                   ^^^^^^^
+help: consider restricting the type parameter to the `'static` lifetime
+   |
+LL | fn foo<T : MyTrait + 'static, U : MyTrait + 'static>(wrap: Wrapper<'_, Option<T>>, wrap1: Wrapper<'_, Option<U>>) {
+   |                    +++++++++              +++++++++
+
+error: `U` does not live long enough
+  --> $DIR/issue-105507.rs:39:5
+   |
+LL |     require_trait(wrap1);
+   |     ^^^^^^^^^^^^^^^^^^^^
+   |
+note: due to current limitations in the borrow checker, this implies a `'static` lifetime
+  --> $DIR/issue-105507.rs:27:35
+   |
+LL |         for<'a> T::Projected<'a>: MyTrait,
+   |                                   ^^^^^^^
+help: consider restricting the type parameter to the `'static` lifetime
+   |
+LL | fn foo<T : MyTrait + 'static, U : MyTrait + 'static>(wrap: Wrapper<'_, Option<T>>, wrap1: Wrapper<'_, Option<U>>) {
+   |                    +++++++++              +++++++++
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/lifetimes/issue-17728.rs b/tests/ui/lifetimes/issue-17728.rs
index 6aca159c4..6aca159c4 100644
--- a/src/test/ui/lifetimes/issue-17728.rs
+++ b/tests/ui/lifetimes/issue-17728.rs
diff --git a/src/test/ui/lifetimes/issue-17728.stderr b/tests/ui/lifetimes/issue-17728.stderr
index 3b25902d7..3b25902d7 100644
--- a/src/test/ui/lifetimes/issue-17728.stderr
+++ b/tests/ui/lifetimes/issue-17728.stderr
diff --git a/src/test/ui/lifetimes/issue-26638.rs b/tests/ui/lifetimes/issue-26638.rs
index 000ab6492..4bec3b341 100644
--- a/src/test/ui/lifetimes/issue-26638.rs
+++ b/tests/ui/lifetimes/issue-26638.rs
@@ -5,7 +5,7 @@ fn parse_type(iter: Box<dyn Iterator<Item=&str>+'static>) -> &str { iter.next()
 fn parse_type_2(iter: fn(&u8)->&u8) -> &str { iter() }
 //~^ ERROR missing lifetime specifier [E0106]
 //~| ERROR mismatched types
-//~| ERROR this function takes 1 argument but 0 arguments were supplied
+//~| ERROR function takes 1 argument but 0 arguments were supplied
 
 fn parse_type_3() -> &str { unimplemented!() }
 //~^ ERROR missing lifetime specifier [E0106]
diff --git a/src/test/ui/lifetimes/issue-26638.stderr b/tests/ui/lifetimes/issue-26638.stderr
index 98d39d614..98d39d614 100644
--- a/src/test/ui/lifetimes/issue-26638.stderr
+++ b/tests/ui/lifetimes/issue-26638.stderr
diff --git a/src/test/ui/lifetimes/issue-34979.rs b/tests/ui/lifetimes/issue-34979.rs
index 252486dd9..252486dd9 100644
--- a/src/test/ui/lifetimes/issue-34979.rs
+++ b/tests/ui/lifetimes/issue-34979.rs
diff --git a/tests/ui/lifetimes/issue-34979.stderr b/tests/ui/lifetimes/issue-34979.stderr
new file mode 100644
index 000000000..3d4208031
--- /dev/null
+++ b/tests/ui/lifetimes/issue-34979.stderr
@@ -0,0 +1,20 @@
+error[E0283]: type annotations needed: cannot satisfy `&'a (): Foo`
+  --> $DIR/issue-34979.rs:6:13
+   |
+LL |     &'a (): Foo,
+   |             ^^^
+   |
+note: multiple `impl`s or `where` clauses satisfying `&'a (): Foo` found
+  --> $DIR/issue-34979.rs:2:1
+   |
+LL | impl<'a, T> Foo for &'a T {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+...
+LL |     &'a (): Foo,
+   |             ^^^
+LL |     &'static (): Foo;
+   |                  ^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0283`.
diff --git a/src/test/ui/lifetimes/issue-54378.rs b/tests/ui/lifetimes/issue-54378.rs
index aa42d4a7c..aa42d4a7c 100644
--- a/src/test/ui/lifetimes/issue-54378.rs
+++ b/tests/ui/lifetimes/issue-54378.rs
diff --git a/src/test/ui/lifetimes/issue-55796.rs b/tests/ui/lifetimes/issue-55796.rs
index a7b27a999..a7b27a999 100644
--- a/src/test/ui/lifetimes/issue-55796.rs
+++ b/tests/ui/lifetimes/issue-55796.rs
diff --git a/src/test/ui/lifetimes/issue-55796.stderr b/tests/ui/lifetimes/issue-55796.stderr
index 5809a56cd..5809a56cd 100644
--- a/src/test/ui/lifetimes/issue-55796.stderr
+++ b/tests/ui/lifetimes/issue-55796.stderr
diff --git a/src/test/ui/lifetimes/issue-64173-unused-lifetimes.rs b/tests/ui/lifetimes/issue-64173-unused-lifetimes.rs
index 8080dd7dc..8080dd7dc 100644
--- a/src/test/ui/lifetimes/issue-64173-unused-lifetimes.rs
+++ b/tests/ui/lifetimes/issue-64173-unused-lifetimes.rs
diff --git a/src/test/ui/lifetimes/issue-64173-unused-lifetimes.stderr b/tests/ui/lifetimes/issue-64173-unused-lifetimes.stderr
index a487cbea5..a487cbea5 100644
--- a/src/test/ui/lifetimes/issue-64173-unused-lifetimes.stderr
+++ b/tests/ui/lifetimes/issue-64173-unused-lifetimes.stderr
diff --git a/src/test/ui/lifetimes/issue-67498.rs b/tests/ui/lifetimes/issue-67498.rs
index 8d8826435..8d8826435 100644
--- a/src/test/ui/lifetimes/issue-67498.rs
+++ b/tests/ui/lifetimes/issue-67498.rs
diff --git a/src/test/ui/lifetimes/issue-70917-lifetimes-in-fn-def.rs b/tests/ui/lifetimes/issue-70917-lifetimes-in-fn-def.rs
index b9aab2714..b9aab2714 100644
--- a/src/test/ui/lifetimes/issue-70917-lifetimes-in-fn-def.rs
+++ b/tests/ui/lifetimes/issue-70917-lifetimes-in-fn-def.rs
diff --git a/src/test/ui/lifetimes/issue-76168-hr-outlives-2.rs b/tests/ui/lifetimes/issue-76168-hr-outlives-2.rs
index 348586fa2..348586fa2 100644
--- a/src/test/ui/lifetimes/issue-76168-hr-outlives-2.rs
+++ b/tests/ui/lifetimes/issue-76168-hr-outlives-2.rs
diff --git a/src/test/ui/lifetimes/issue-76168-hr-outlives.rs b/tests/ui/lifetimes/issue-76168-hr-outlives.rs
index 9366e94c9..9366e94c9 100644
--- a/src/test/ui/lifetimes/issue-76168-hr-outlives.rs
+++ b/tests/ui/lifetimes/issue-76168-hr-outlives.rs
diff --git a/src/test/ui/lifetimes/issue-77175.rs b/tests/ui/lifetimes/issue-77175.rs
index 2282752b6..2282752b6 100644
--- a/src/test/ui/lifetimes/issue-77175.rs
+++ b/tests/ui/lifetimes/issue-77175.rs
diff --git a/src/test/ui/lifetimes/issue-79187-2.rs b/tests/ui/lifetimes/issue-79187-2.rs
index fff92c30b..fff92c30b 100644
--- a/src/test/ui/lifetimes/issue-79187-2.rs
+++ b/tests/ui/lifetimes/issue-79187-2.rs
diff --git a/src/test/ui/lifetimes/issue-79187-2.stderr b/tests/ui/lifetimes/issue-79187-2.stderr
index c5f654b37..c5f654b37 100644
--- a/src/test/ui/lifetimes/issue-79187-2.stderr
+++ b/tests/ui/lifetimes/issue-79187-2.stderr
diff --git a/src/test/ui/lifetimes/issue-79187.rs b/tests/ui/lifetimes/issue-79187.rs
index 8e1304562..8e1304562 100644
--- a/src/test/ui/lifetimes/issue-79187.rs
+++ b/tests/ui/lifetimes/issue-79187.rs
diff --git a/src/test/ui/lifetimes/issue-79187.stderr b/tests/ui/lifetimes/issue-79187.stderr
index ee6e7b89d..ee6e7b89d 100644
--- a/src/test/ui/lifetimes/issue-79187.stderr
+++ b/tests/ui/lifetimes/issue-79187.stderr
diff --git a/src/test/ui/lifetimes/issue-83737-binders-across-types.rs b/tests/ui/lifetimes/issue-83737-binders-across-types.rs
index e130561e4..e130561e4 100644
--- a/src/test/ui/lifetimes/issue-83737-binders-across-types.rs
+++ b/tests/ui/lifetimes/issue-83737-binders-across-types.rs
diff --git a/src/test/ui/lifetimes/issue-83737-erasing-bound-vars.rs b/tests/ui/lifetimes/issue-83737-erasing-bound-vars.rs
index c496a3556..c496a3556 100644
--- a/src/test/ui/lifetimes/issue-83737-erasing-bound-vars.rs
+++ b/tests/ui/lifetimes/issue-83737-erasing-bound-vars.rs
diff --git a/src/test/ui/lifetimes/issue-83753-invalid-associated-type-supertrait-hrtb.rs b/tests/ui/lifetimes/issue-83753-invalid-associated-type-supertrait-hrtb.rs
index 7f0ea730d..7f0ea730d 100644
--- a/src/test/ui/lifetimes/issue-83753-invalid-associated-type-supertrait-hrtb.rs
+++ b/tests/ui/lifetimes/issue-83753-invalid-associated-type-supertrait-hrtb.rs
diff --git a/src/test/ui/lifetimes/issue-83753-invalid-associated-type-supertrait-hrtb.stderr b/tests/ui/lifetimes/issue-83753-invalid-associated-type-supertrait-hrtb.stderr
index f7bdee633..f7bdee633 100644
--- a/src/test/ui/lifetimes/issue-83753-invalid-associated-type-supertrait-hrtb.stderr
+++ b/tests/ui/lifetimes/issue-83753-invalid-associated-type-supertrait-hrtb.stderr
diff --git a/src/test/ui/lifetimes/issue-83907-invalid-fn-like-path.rs b/tests/ui/lifetimes/issue-83907-invalid-fn-like-path.rs
index 604687ce7..604687ce7 100644
--- a/src/test/ui/lifetimes/issue-83907-invalid-fn-like-path.rs
+++ b/tests/ui/lifetimes/issue-83907-invalid-fn-like-path.rs
diff --git a/src/test/ui/lifetimes/issue-83907-invalid-fn-like-path.stderr b/tests/ui/lifetimes/issue-83907-invalid-fn-like-path.stderr
index e57933da5..e57933da5 100644
--- a/src/test/ui/lifetimes/issue-83907-invalid-fn-like-path.stderr
+++ b/tests/ui/lifetimes/issue-83907-invalid-fn-like-path.stderr
diff --git a/src/test/ui/lifetimes/issue-84398.rs b/tests/ui/lifetimes/issue-84398.rs
index 1912fa59b..1912fa59b 100644
--- a/src/test/ui/lifetimes/issue-84398.rs
+++ b/tests/ui/lifetimes/issue-84398.rs
diff --git a/src/test/ui/lifetimes/issue-84604.rs b/tests/ui/lifetimes/issue-84604.rs
index b315ef051..b315ef051 100644
--- a/src/test/ui/lifetimes/issue-84604.rs
+++ b/tests/ui/lifetimes/issue-84604.rs
diff --git a/src/test/ui/lifetimes/issue-90170-elision-mismatch.fixed b/tests/ui/lifetimes/issue-90170-elision-mismatch.fixed
index bd85da1a7..bd85da1a7 100644
--- a/src/test/ui/lifetimes/issue-90170-elision-mismatch.fixed
+++ b/tests/ui/lifetimes/issue-90170-elision-mismatch.fixed
diff --git a/src/test/ui/lifetimes/issue-90170-elision-mismatch.rs b/tests/ui/lifetimes/issue-90170-elision-mismatch.rs
index 3c495368b..3c495368b 100644
--- a/src/test/ui/lifetimes/issue-90170-elision-mismatch.rs
+++ b/tests/ui/lifetimes/issue-90170-elision-mismatch.rs
diff --git a/src/test/ui/lifetimes/issue-90170-elision-mismatch.stderr b/tests/ui/lifetimes/issue-90170-elision-mismatch.stderr
index 48fb3fb4a..48fb3fb4a 100644
--- a/src/test/ui/lifetimes/issue-90170-elision-mismatch.stderr
+++ b/tests/ui/lifetimes/issue-90170-elision-mismatch.stderr
diff --git a/src/test/ui/lifetimes/issue-90600-expected-return-static-indirect.rs b/tests/ui/lifetimes/issue-90600-expected-return-static-indirect.rs
index ce4cddc9b..ce4cddc9b 100644
--- a/src/test/ui/lifetimes/issue-90600-expected-return-static-indirect.rs
+++ b/tests/ui/lifetimes/issue-90600-expected-return-static-indirect.rs
diff --git a/src/test/ui/lifetimes/issue-90600-expected-return-static-indirect.stderr b/tests/ui/lifetimes/issue-90600-expected-return-static-indirect.stderr
index 99e1e7217..99e1e7217 100644
--- a/src/test/ui/lifetimes/issue-90600-expected-return-static-indirect.stderr
+++ b/tests/ui/lifetimes/issue-90600-expected-return-static-indirect.stderr
diff --git a/src/test/ui/lifetimes/issue-91763.rs b/tests/ui/lifetimes/issue-91763.rs
index 2e8807fe6..2e8807fe6 100644
--- a/src/test/ui/lifetimes/issue-91763.rs
+++ b/tests/ui/lifetimes/issue-91763.rs
diff --git a/src/test/ui/lifetimes/issue-91763.stderr b/tests/ui/lifetimes/issue-91763.stderr
index 6ccf008c0..6ccf008c0 100644
--- a/src/test/ui/lifetimes/issue-91763.stderr
+++ b/tests/ui/lifetimes/issue-91763.stderr
diff --git a/src/test/ui/lifetimes/issue-95023.rs b/tests/ui/lifetimes/issue-95023.rs
index 3fba8c00c..3fba8c00c 100644
--- a/src/test/ui/lifetimes/issue-95023.rs
+++ b/tests/ui/lifetimes/issue-95023.rs
diff --git a/src/test/ui/lifetimes/issue-95023.stderr b/tests/ui/lifetimes/issue-95023.stderr
index 35c3797c7..35c3797c7 100644
--- a/src/test/ui/lifetimes/issue-95023.stderr
+++ b/tests/ui/lifetimes/issue-95023.stderr
diff --git a/src/test/ui/lifetimes/issue-97193.rs b/tests/ui/lifetimes/issue-97193.rs
index 6c82c29dd..6c82c29dd 100644
--- a/src/test/ui/lifetimes/issue-97193.rs
+++ b/tests/ui/lifetimes/issue-97193.rs
diff --git a/src/test/ui/lifetimes/issue-97193.stderr b/tests/ui/lifetimes/issue-97193.stderr
index 21be543cc..21be543cc 100644
--- a/src/test/ui/lifetimes/issue-97193.stderr
+++ b/tests/ui/lifetimes/issue-97193.stderr
diff --git a/src/test/ui/lifetimes/issue-97194.rs b/tests/ui/lifetimes/issue-97194.rs
index 5f3560dbe..5f3560dbe 100644
--- a/src/test/ui/lifetimes/issue-97194.rs
+++ b/tests/ui/lifetimes/issue-97194.rs
diff --git a/src/test/ui/lifetimes/issue-97194.stderr b/tests/ui/lifetimes/issue-97194.stderr
index 93bde285a..93bde285a 100644
--- a/src/test/ui/lifetimes/issue-97194.stderr
+++ b/tests/ui/lifetimes/issue-97194.stderr
diff --git a/src/test/ui/lifetimes/lifetime-bound-will-change-warning.rs b/tests/ui/lifetimes/lifetime-bound-will-change-warning.rs
index 0d0303705..0d0303705 100644
--- a/src/test/ui/lifetimes/lifetime-bound-will-change-warning.rs
+++ b/tests/ui/lifetimes/lifetime-bound-will-change-warning.rs
diff --git a/src/test/ui/lifetimes/lifetime-bound-will-change-warning.stderr b/tests/ui/lifetimes/lifetime-bound-will-change-warning.stderr
index c51580f28..c51580f28 100644
--- a/src/test/ui/lifetimes/lifetime-bound-will-change-warning.stderr
+++ b/tests/ui/lifetimes/lifetime-bound-will-change-warning.stderr
diff --git a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.rs b/tests/ui/lifetimes/lifetime-doesnt-live-long-enough.rs
index d2b782c92..d2b782c92 100644
--- a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.rs
+++ b/tests/ui/lifetimes/lifetime-doesnt-live-long-enough.rs
diff --git a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr b/tests/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr
index affb4e8d0..affb4e8d0 100644
--- a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr
+++ b/tests/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr
diff --git a/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.rs b/tests/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.rs
index d0a8fe795..d0a8fe795 100644
--- a/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.rs
+++ b/tests/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.rs
diff --git a/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr b/tests/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr
index 5eee953ef..5eee953ef 100644
--- a/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr
+++ b/tests/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr
diff --git a/src/test/ui/lifetimes/lifetime-elision-return-type-trait.rs b/tests/ui/lifetimes/lifetime-elision-return-type-trait.rs
index 5168cb20d..5168cb20d 100644
--- a/src/test/ui/lifetimes/lifetime-elision-return-type-trait.rs
+++ b/tests/ui/lifetimes/lifetime-elision-return-type-trait.rs
diff --git a/src/test/ui/lifetimes/lifetime-elision-return-type-trait.stderr b/tests/ui/lifetimes/lifetime-elision-return-type-trait.stderr
index ef1127c59..ef1127c59 100644
--- a/src/test/ui/lifetimes/lifetime-elision-return-type-trait.stderr
+++ b/tests/ui/lifetimes/lifetime-elision-return-type-trait.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.rs b/tests/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.rs
index b0c09c751..b0c09c751 100644
--- a/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.rs
+++ b/tests/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.stderr b/tests/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.stderr
index 63d00875d..63d00875d 100644
--- a/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.rs b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.rs
index 35f70dd19..35f70dd19 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr
index 64aa8361c..64aa8361c 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.rs b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.rs
index 9b15b378d..9b15b378d 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr
index b40481ecd..b40481ecd 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.rs b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.rs
index 6b062125c..6b062125c 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr
index 194fd9589..194fd9589 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.rs b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.rs
index 7bc3fa623..7bc3fa623 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr
index 64f4bd0fc..64f4bd0fc 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.rs b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.rs
index a1126d6bb..a1126d6bb 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr
index 961f9de66..961f9de66 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.rs b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.rs
index f0d73deb3..f0d73deb3 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr
index 5bb763813..5bb763813 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.rs b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.rs
index f72d567bb..f72d567bb 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.stderr b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.stderr
index 29a706957..29a706957 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.rs b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.rs
index 49993aca3..49993aca3 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr
index 4bcd7cf95..4bcd7cf95 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.rs b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.rs
index 63d81a57d..63d81a57d 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr
index 34a64f8a6..34a64f8a6 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.rs b/tests/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.rs
index d6c918843..d6c918843 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr b/tests/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr
index bcc3e9510..bcc3e9510 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.rs b/tests/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.rs
index 998a48ce2..998a48ce2 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.stderr b/tests/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.stderr
index 90d4754eb..90d4754eb 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.rs b/tests/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.rs
index d18b50d0d..d18b50d0d 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr b/tests/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr
index a03e16b3b..a03e16b3b 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.rs b/tests/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.rs
index 5188ea1cc..5188ea1cc 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.stderr b/tests/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.stderr
index 487b34e3d..487b34e3d 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.rs b/tests/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.rs
index 27424d79b..27424d79b 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.stderr b/tests/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.stderr
index 1622ce422..1622ce422 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.rs b/tests/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.rs
index 2236d78ef..2236d78ef 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.stderr b/tests/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.stderr
index 99fab4631..99fab4631 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.rs b/tests/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.rs
index f57323029..f57323029 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.stderr b/tests/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.stderr
index 52c5752f6..52c5752f6 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.rs b/tests/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.rs
index 4a934bbf0..4a934bbf0 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.stderr b/tests/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.stderr
index e90c81ee3..e90c81ee3 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.rs
index 09ee9accc..09ee9accc 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.stderr
index 5a23f1e0e..5a23f1e0e 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.rs
index b3106db77..b3106db77 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.stderr
index 6ba130308..6ba130308 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.rs
index 5d0367783..5d0367783 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr
index 4c0ffe5c0..4c0ffe5c0 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.rs
index 4a479f19c..4a479f19c 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr
index 97c665347..97c665347 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs
index 9b8cfe670..9b8cfe670 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr
index b3d0bc2b8..b3d0bc2b8 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.rs
index db934a0be..db934a0be 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr
index fbe98a426..fbe98a426 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.rs
index 4bf5db41f..4bf5db41f 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr
index 9630729d0..9630729d0 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.rs
index 8dcb814b2..8dcb814b2 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr
index 1e24032fc..1e24032fc 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.rs
index e4df870bc..e4df870bc 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr
index bbd62902d..bbd62902d 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.rs
index 00de48278..00de48278 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr
index 79e7e8e15..79e7e8e15 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.rs
index 00de48278..00de48278 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr
index 53615fd1a..53615fd1a 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.rs
index 5bb0e28d4..5bb0e28d4 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr
index 6ff441167..6ff441167 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.rs
index 3ffd7be4e..3ffd7be4e 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr
index 5601335d2..5601335d2 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.rs
index 9b67a7742..9b67a7742 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr
index e221902c4..e221902c4 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs
index 2f67750d8..2f67750d8 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr
index a909c5fa8..cc2447b18 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr
@@ -16,10 +16,13 @@ LL | fn foo<'a>(x:fn(&u8, &u8), y: Vec<&'a u8>, z: &'a u8) {
 error[E0596]: cannot borrow `y` as mutable, as it is not declared as mutable
   --> $DIR/ex3-both-anon-regions-using-fn-items.rs:2:3
    |
-LL | fn foo(x:fn(&u8, &u8), y: Vec<&u8>, z: &u8) {
-   |                        - help: consider changing this to be mutable: `mut y`
 LL |   y.push(z);
    |   ^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn foo(x:fn(&u8, &u8), mut y: Vec<&u8>, z: &u8) {
+   |                        +++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.rs
index 73e1789f2..73e1789f2 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr
index 9661f1e51..9661f1e51 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.rs
index 97fa9ef91..97fa9ef91 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr
index d85ea6529..2ba5afa80 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr
@@ -16,10 +16,13 @@ LL | fn foo<'a>(x:Box<dyn Fn(&u8, &u8)> , y: Vec<&'a u8>, z: &'a u8) {
 error[E0596]: cannot borrow `y` as mutable, as it is not declared as mutable
   --> $DIR/ex3-both-anon-regions-using-trait-objects.rs:2:3
    |
-LL | fn foo(x:Box<dyn Fn(&u8, &u8)> , y: Vec<&u8>, z: &u8) {
-   |                                  - help: consider changing this to be mutable: `mut y`
 LL |   y.push(z);
    |   ^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn foo(x:Box<dyn Fn(&u8, &u8)> , mut y: Vec<&u8>, z: &u8) {
+   |                                  +++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.rs b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.rs
index ca0feaba8..ca0feaba8 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.rs
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.stderr
index ec9fac0c2..ec9fac0c2 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/issue_74400.rs b/tests/ui/lifetimes/lifetime-errors/issue_74400.rs
index ddb8bacce..ddb8bacce 100644
--- a/src/test/ui/lifetimes/lifetime-errors/issue_74400.rs
+++ b/tests/ui/lifetimes/lifetime-errors/issue_74400.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/issue_74400.stderr b/tests/ui/lifetimes/lifetime-errors/issue_74400.stderr
index 7049f28e2..7049f28e2 100644
--- a/src/test/ui/lifetimes/lifetime-errors/issue_74400.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/issue_74400.stderr
diff --git a/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.rs b/tests/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.rs
index 81a20c587..81a20c587 100644
--- a/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.rs
+++ b/tests/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.rs
diff --git a/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.stderr b/tests/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.stderr
index b47a47d63..b47a47d63 100644
--- a/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.stderr
+++ b/tests/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.stderr
diff --git a/src/test/ui/lifetimes/lifetime-mismatch-between-trait-and-impl.rs b/tests/ui/lifetimes/lifetime-mismatch-between-trait-and-impl.rs
index 2ce1a0f45..2ce1a0f45 100644
--- a/src/test/ui/lifetimes/lifetime-mismatch-between-trait-and-impl.rs
+++ b/tests/ui/lifetimes/lifetime-mismatch-between-trait-and-impl.rs
diff --git a/src/test/ui/lifetimes/lifetime-mismatch-between-trait-and-impl.stderr b/tests/ui/lifetimes/lifetime-mismatch-between-trait-and-impl.stderr
index 3040a8512..9c61d5a0c 100644
--- a/src/test/ui/lifetimes/lifetime-mismatch-between-trait-and-impl.stderr
+++ b/tests/ui/lifetimes/lifetime-mismatch-between-trait-and-impl.stderr
@@ -7,8 +7,8 @@ LL |     fn foo<'a>(x: &i32, y: &'a i32) -> &'a i32;
 LL |     fn foo<'a>(x: &'a i32, y: &'a i32) -> &'a i32 {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found `fn(&'1 i32, &'1 i32) -> &'1 i32`
    |
-   = note: expected `fn(&'1 i32, &'a i32) -> &'a i32`
-              found `fn(&'1 i32, &'1 i32) -> &'1 i32`
+   = note: expected signature `fn(&'1 i32, &'a i32) -> &'a i32`
+              found signature `fn(&'1 i32, &'1 i32) -> &'1 i32`
    = help: the lifetime requirements from the `impl` do not correspond to the requirements in the `trait`
    = help: verify the lifetime relationships in the `trait` and `impl` between the `self` argument, the other inputs and its output
 
diff --git a/src/test/ui/lifetimes/lifetime-no-keyword.rs b/tests/ui/lifetimes/lifetime-no-keyword.rs
index f466f44f5..f466f44f5 100644
--- a/src/test/ui/lifetimes/lifetime-no-keyword.rs
+++ b/tests/ui/lifetimes/lifetime-no-keyword.rs
diff --git a/src/test/ui/lifetimes/lifetime-no-keyword.stderr b/tests/ui/lifetimes/lifetime-no-keyword.stderr
index ba8ceb80f..ba8ceb80f 100644
--- a/src/test/ui/lifetimes/lifetime-no-keyword.stderr
+++ b/tests/ui/lifetimes/lifetime-no-keyword.stderr
diff --git a/src/test/ui/lifetimes/missing-lifetime-in-alias.rs b/tests/ui/lifetimes/missing-lifetime-in-alias.rs
index 51c564c01..51c564c01 100644
--- a/src/test/ui/lifetimes/missing-lifetime-in-alias.rs
+++ b/tests/ui/lifetimes/missing-lifetime-in-alias.rs
diff --git a/src/test/ui/lifetimes/missing-lifetime-in-alias.stderr b/tests/ui/lifetimes/missing-lifetime-in-alias.stderr
index 428b8f14b..20159e144 100644
--- a/src/test/ui/lifetimes/missing-lifetime-in-alias.stderr
+++ b/tests/ui/lifetimes/missing-lifetime-in-alias.stderr
@@ -39,7 +39,7 @@ LL |     type Bar<'b>
 help: add missing lifetime argument
    |
 LL | type C<'a, 'b> = <A<'a> as Trait>::Bar<'a>;
-   |                                    ~~~~~~~
+   |                                       ++++
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/lifetimes/nested-binder-print.rs b/tests/ui/lifetimes/nested-binder-print.rs
index f97f349fd..f97f349fd 100644
--- a/src/test/ui/lifetimes/nested-binder-print.rs
+++ b/tests/ui/lifetimes/nested-binder-print.rs
diff --git a/src/test/ui/lifetimes/nested-binder-print.stderr b/tests/ui/lifetimes/nested-binder-print.stderr
index 32dd89693..32dd89693 100644
--- a/src/test/ui/lifetimes/nested-binder-print.stderr
+++ b/tests/ui/lifetimes/nested-binder-print.stderr
diff --git a/src/test/ui/lifetimes/nested.rs b/tests/ui/lifetimes/nested.rs
index f3f1f2016..f3f1f2016 100644
--- a/src/test/ui/lifetimes/nested.rs
+++ b/tests/ui/lifetimes/nested.rs
diff --git a/src/test/ui/lifetimes/re-empty-in-error.rs b/tests/ui/lifetimes/re-empty-in-error.rs
index 554028a96..554028a96 100644
--- a/src/test/ui/lifetimes/re-empty-in-error.rs
+++ b/tests/ui/lifetimes/re-empty-in-error.rs
diff --git a/src/test/ui/lifetimes/re-empty-in-error.stderr b/tests/ui/lifetimes/re-empty-in-error.stderr
index c35d8ecec..c35d8ecec 100644
--- a/src/test/ui/lifetimes/re-empty-in-error.stderr
+++ b/tests/ui/lifetimes/re-empty-in-error.stderr
diff --git a/src/test/ui/lifetimes/shadow.rs b/tests/ui/lifetimes/shadow.rs
index e2124887e..e2124887e 100644
--- a/src/test/ui/lifetimes/shadow.rs
+++ b/tests/ui/lifetimes/shadow.rs
diff --git a/src/test/ui/lifetimes/shadow.stderr b/tests/ui/lifetimes/shadow.stderr
index b834e90d8..b834e90d8 100644
--- a/src/test/ui/lifetimes/shadow.stderr
+++ b/tests/ui/lifetimes/shadow.stderr
diff --git a/tests/ui/lifetimes/suggest-introducing-and-adding-missing-lifetime.fixed b/tests/ui/lifetimes/suggest-introducing-and-adding-missing-lifetime.fixed
new file mode 100644
index 000000000..f977f0bd3
--- /dev/null
+++ b/tests/ui/lifetimes/suggest-introducing-and-adding-missing-lifetime.fixed
@@ -0,0 +1,13 @@
+// run-rustfix
+
+#![allow(warnings)]
+
+fn no_restriction<'a, T: 'a>(x: &'a ()) -> &() {
+    with_restriction::<T>(x) //~ ERROR the parameter type `T` may not live long enough
+}
+
+fn with_restriction<'b, T: 'b>(x: &'b ()) -> &'b () {
+    x
+}
+
+fn main() {}
diff --git a/src/test/ui/lifetimes/suggest-introducing-and-adding-missing-lifetime.rs b/tests/ui/lifetimes/suggest-introducing-and-adding-missing-lifetime.rs
index 645bc7db0..d6ce112ec 100644
--- a/src/test/ui/lifetimes/suggest-introducing-and-adding-missing-lifetime.rs
+++ b/tests/ui/lifetimes/suggest-introducing-and-adding-missing-lifetime.rs
@@ -1,3 +1,7 @@
+// run-rustfix
+
+#![allow(warnings)]
+
 fn no_restriction<T>(x: &()) -> &() {
     with_restriction::<T>(x) //~ ERROR the parameter type `T` may not live long enough
 }
diff --git a/tests/ui/lifetimes/suggest-introducing-and-adding-missing-lifetime.stderr b/tests/ui/lifetimes/suggest-introducing-and-adding-missing-lifetime.stderr
new file mode 100644
index 000000000..2d58d3a02
--- /dev/null
+++ b/tests/ui/lifetimes/suggest-introducing-and-adding-missing-lifetime.stderr
@@ -0,0 +1,24 @@
+error[E0311]: the parameter type `T` may not live long enough
+  --> $DIR/suggest-introducing-and-adding-missing-lifetime.rs:6:5
+   |
+LL |     with_restriction::<T>(x)
+   |     ^^^^^^^^^^^^^^^^^^^^^
+   |
+note: the parameter type `T` must be valid for the anonymous lifetime defined here...
+  --> $DIR/suggest-introducing-and-adding-missing-lifetime.rs:5:25
+   |
+LL | fn no_restriction<T>(x: &()) -> &() {
+   |                         ^^^
+note: ...so that the type `T` will meet its required lifetime bounds
+  --> $DIR/suggest-introducing-and-adding-missing-lifetime.rs:6:5
+   |
+LL |     with_restriction::<T>(x)
+   |     ^^^^^^^^^^^^^^^^^^^^^
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn no_restriction<'a, T: 'a>(x: &'a ()) -> &() {
+   |                   +++  ++++      ++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0311`.
diff --git a/src/test/ui/lifetimes/undeclared-lifetime-used-in-debug-macro-issue-70152.rs b/tests/ui/lifetimes/undeclared-lifetime-used-in-debug-macro-issue-70152.rs
index cc29f9de7..cc29f9de7 100644
--- a/src/test/ui/lifetimes/undeclared-lifetime-used-in-debug-macro-issue-70152.rs
+++ b/tests/ui/lifetimes/undeclared-lifetime-used-in-debug-macro-issue-70152.rs
diff --git a/src/test/ui/lifetimes/undeclared-lifetime-used-in-debug-macro-issue-70152.stderr b/tests/ui/lifetimes/undeclared-lifetime-used-in-debug-macro-issue-70152.stderr
index 0d6ade415..0d6ade415 100644
--- a/src/test/ui/lifetimes/undeclared-lifetime-used-in-debug-macro-issue-70152.stderr
+++ b/tests/ui/lifetimes/undeclared-lifetime-used-in-debug-macro-issue-70152.stderr
diff --git a/src/test/ui/lifetimes/unnamed-closure-doesnt-life-long-enough-issue-67634.rs b/tests/ui/lifetimes/unnamed-closure-doesnt-life-long-enough-issue-67634.rs
index 8deb36551..8deb36551 100644
--- a/src/test/ui/lifetimes/unnamed-closure-doesnt-life-long-enough-issue-67634.rs
+++ b/tests/ui/lifetimes/unnamed-closure-doesnt-life-long-enough-issue-67634.rs
diff --git a/src/test/ui/lifetimes/unnamed-closure-doesnt-life-long-enough-issue-67634.stderr b/tests/ui/lifetimes/unnamed-closure-doesnt-life-long-enough-issue-67634.stderr
index 439904509..439904509 100644
--- a/src/test/ui/lifetimes/unnamed-closure-doesnt-life-long-enough-issue-67634.stderr
+++ b/tests/ui/lifetimes/unnamed-closure-doesnt-life-long-enough-issue-67634.stderr
diff --git a/src/test/ui/lifetimes/unusual-rib-combinations.rs b/tests/ui/lifetimes/unusual-rib-combinations.rs
index b4c86aab8..b4c86aab8 100644
--- a/src/test/ui/lifetimes/unusual-rib-combinations.rs
+++ b/tests/ui/lifetimes/unusual-rib-combinations.rs
diff --git a/src/test/ui/lifetimes/unusual-rib-combinations.stderr b/tests/ui/lifetimes/unusual-rib-combinations.stderr
index 6d7b42506..6d7b42506 100644
--- a/src/test/ui/lifetimes/unusual-rib-combinations.stderr
+++ b/tests/ui/lifetimes/unusual-rib-combinations.stderr
diff --git a/src/test/ui/limits/huge-array-simple-32.rs b/tests/ui/limits/huge-array-simple-32.rs
index 2290e3d5e..2290e3d5e 100644
--- a/src/test/ui/limits/huge-array-simple-32.rs
+++ b/tests/ui/limits/huge-array-simple-32.rs
diff --git a/src/test/ui/limits/huge-array-simple-32.stderr b/tests/ui/limits/huge-array-simple-32.stderr
index 31e120df6..31e120df6 100644
--- a/src/test/ui/limits/huge-array-simple-32.stderr
+++ b/tests/ui/limits/huge-array-simple-32.stderr
diff --git a/src/test/ui/limits/huge-array-simple-64.rs b/tests/ui/limits/huge-array-simple-64.rs
index 02c961fc5..02c961fc5 100644
--- a/src/test/ui/limits/huge-array-simple-64.rs
+++ b/tests/ui/limits/huge-array-simple-64.rs
diff --git a/src/test/ui/limits/huge-array-simple-64.stderr b/tests/ui/limits/huge-array-simple-64.stderr
index c5d3fe85d..c5d3fe85d 100644
--- a/src/test/ui/limits/huge-array-simple-64.stderr
+++ b/tests/ui/limits/huge-array-simple-64.stderr
diff --git a/src/test/ui/limits/huge-array.rs b/tests/ui/limits/huge-array.rs
index 3070801f8..3070801f8 100644
--- a/src/test/ui/limits/huge-array.rs
+++ b/tests/ui/limits/huge-array.rs
diff --git a/src/test/ui/limits/huge-array.stderr b/tests/ui/limits/huge-array.stderr
index 817458b73..817458b73 100644
--- a/src/test/ui/limits/huge-array.stderr
+++ b/tests/ui/limits/huge-array.stderr
diff --git a/src/test/ui/limits/huge-enum.rs b/tests/ui/limits/huge-enum.rs
index 39ea6e11b..39ea6e11b 100644
--- a/src/test/ui/limits/huge-enum.rs
+++ b/tests/ui/limits/huge-enum.rs
diff --git a/src/test/ui/limits/huge-enum.stderr b/tests/ui/limits/huge-enum.stderr
index a1456e1a8..a1456e1a8 100644
--- a/src/test/ui/limits/huge-enum.stderr
+++ b/tests/ui/limits/huge-enum.stderr
diff --git a/src/test/ui/limits/huge-struct.rs b/tests/ui/limits/huge-struct.rs
index 02f38d860..02f38d860 100644
--- a/src/test/ui/limits/huge-struct.rs
+++ b/tests/ui/limits/huge-struct.rs
diff --git a/src/test/ui/limits/huge-struct.stderr b/tests/ui/limits/huge-struct.stderr
index f0ee88e59..f0ee88e59 100644
--- a/src/test/ui/limits/huge-struct.stderr
+++ b/tests/ui/limits/huge-struct.stderr
diff --git a/src/test/ui/limits/issue-15919-32.rs b/tests/ui/limits/issue-15919-32.rs
index 3c93f14cc..3c93f14cc 100644
--- a/src/test/ui/limits/issue-15919-32.rs
+++ b/tests/ui/limits/issue-15919-32.rs
diff --git a/tests/ui/limits/issue-15919-32.stderr b/tests/ui/limits/issue-15919-32.stderr
new file mode 100644
index 000000000..0d79fc0c7
--- /dev/null
+++ b/tests/ui/limits/issue-15919-32.stderr
@@ -0,0 +1,8 @@
+error: values of the type `[usize; usize::MAX]` are too big for the current architecture
+  --> $DIR/issue-15919-32.rs:9:9
+   |
+LL |     let x = [0usize; 0xffff_ffff];
+   |         ^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/limits/issue-15919-64.rs b/tests/ui/limits/issue-15919-64.rs
index 3ecbd34ea..3ecbd34ea 100644
--- a/src/test/ui/limits/issue-15919-64.rs
+++ b/tests/ui/limits/issue-15919-64.rs
diff --git a/tests/ui/limits/issue-15919-64.stderr b/tests/ui/limits/issue-15919-64.stderr
new file mode 100644
index 000000000..3399d644e
--- /dev/null
+++ b/tests/ui/limits/issue-15919-64.stderr
@@ -0,0 +1,8 @@
+error: values of the type `[usize; usize::MAX]` are too big for the current architecture
+  --> $DIR/issue-15919-64.rs:9:9
+   |
+LL |     let x = [0usize; 0xffff_ffff_ffff_ffff];
+   |         ^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/limits/issue-17913.rs b/tests/ui/limits/issue-17913.rs
index 8d4cbe201..56cf5d831 100644
--- a/src/test/ui/limits/issue-17913.rs
+++ b/tests/ui/limits/issue-17913.rs
@@ -1,5 +1,5 @@
 // build-fail
-// normalize-stderr-test "\[&usize; \d+\]" -> "[&usize; N]"
+// normalize-stderr-test "\[&usize; \d+\]" -> "[&usize; usize::MAX]"
 // error-pattern: too big for the current architecture
 
 // FIXME https://github.com/rust-lang/rust/issues/59774
diff --git a/tests/ui/limits/issue-17913.stderr b/tests/ui/limits/issue-17913.stderr
new file mode 100644
index 000000000..684db53a9
--- /dev/null
+++ b/tests/ui/limits/issue-17913.stderr
@@ -0,0 +1,4 @@
+error: values of the type `[&usize; usize::MAX]` are too big for the current architecture
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/limits/issue-55878.rs b/tests/ui/limits/issue-55878.rs
index c1c54646d..c1c54646d 100644
--- a/src/test/ui/limits/issue-55878.rs
+++ b/tests/ui/limits/issue-55878.rs
diff --git a/src/test/ui/limits/issue-55878.stderr b/tests/ui/limits/issue-55878.stderr
index f17f8141b..99f1fdf75 100644
--- a/src/test/ui/limits/issue-55878.stderr
+++ b/tests/ui/limits/issue-55878.stderr
@@ -1,14 +1,8 @@
-error[E0080]: values of the type `[u8; SIZE]` are too big for the current architecture
+error[E0080]: values of the type `[u8; usize::MAX]` are too big for the current architecture
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
    |
-LL |     intrinsics::size_of::<T>()
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-note: inside `std::mem::size_of::<[u8; SIZE]>`
+note: inside `std::mem::size_of::<[u8; usize::MAX]>`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL |     intrinsics::size_of::<T>()
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `main`
   --> $DIR/issue-55878.rs:7:26
    |
diff --git a/src/test/ui/limits/issue-56762.rs b/tests/ui/limits/issue-56762.rs
index fb0a270f1..fb0a270f1 100644
--- a/src/test/ui/limits/issue-56762.rs
+++ b/tests/ui/limits/issue-56762.rs
diff --git a/src/test/ui/limits/issue-56762.stderr b/tests/ui/limits/issue-56762.stderr
index e6b9c6762..e6b9c6762 100644
--- a/src/test/ui/limits/issue-56762.stderr
+++ b/tests/ui/limits/issue-56762.stderr
diff --git a/src/test/ui/limits/issue-69485-var-size-diffs-too-large.rs b/tests/ui/limits/issue-69485-var-size-diffs-too-large.rs
index 2560ffe16..2560ffe16 100644
--- a/src/test/ui/limits/issue-69485-var-size-diffs-too-large.rs
+++ b/tests/ui/limits/issue-69485-var-size-diffs-too-large.rs
diff --git a/tests/ui/limits/issue-69485-var-size-diffs-too-large.stderr b/tests/ui/limits/issue-69485-var-size-diffs-too-large.stderr
new file mode 100644
index 000000000..44b2be269
--- /dev/null
+++ b/tests/ui/limits/issue-69485-var-size-diffs-too-large.stderr
@@ -0,0 +1,8 @@
+error: values of the type `[u8; usize::MAX]` are too big for the current architecture
+  --> $DIR/issue-69485-var-size-diffs-too-large.rs:6:5
+   |
+LL |     Bug::V([0; !0]);
+   |     ^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/limits/issue-75158-64.rs b/tests/ui/limits/issue-75158-64.rs
index 06c209c07..06c209c07 100644
--- a/src/test/ui/limits/issue-75158-64.rs
+++ b/tests/ui/limits/issue-75158-64.rs
diff --git a/tests/ui/limits/issue-75158-64.stderr b/tests/ui/limits/issue-75158-64.stderr
new file mode 100644
index 000000000..d5991bcf5
--- /dev/null
+++ b/tests/ui/limits/issue-75158-64.stderr
@@ -0,0 +1,4 @@
+error: values of the type `[u8; usize::MAX]` are too big for the current architecture
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/link-section.rs b/tests/ui/link-section.rs
index 48efb07ff..48efb07ff 100644
--- a/src/test/ui/link-section.rs
+++ b/tests/ui/link-section.rs
diff --git a/src/test/ui/linkage-attr/auxiliary/def_colliding_external.rs b/tests/ui/linkage-attr/auxiliary/def_colliding_external.rs
index 60b55b3e2..60b55b3e2 100644
--- a/src/test/ui/linkage-attr/auxiliary/def_colliding_external.rs
+++ b/tests/ui/linkage-attr/auxiliary/def_colliding_external.rs
diff --git a/src/test/ui/linkage-attr/auxiliary/def_external.rs b/tests/ui/linkage-attr/auxiliary/def_external.rs
index 2300930e5..2300930e5 100644
--- a/src/test/ui/linkage-attr/auxiliary/def_external.rs
+++ b/tests/ui/linkage-attr/auxiliary/def_external.rs
diff --git a/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs b/tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs
index 0d927117d..0d927117d 100644
--- a/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs
+++ b/tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs
diff --git a/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs b/tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs
index 0a296f0b2..0a296f0b2 100644
--- a/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs
+++ b/tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs
diff --git a/src/test/ui/linkage-attr/auxiliary/linkage1.rs b/tests/ui/linkage-attr/auxiliary/linkage1.rs
index e87ce5e4d..e87ce5e4d 100644
--- a/src/test/ui/linkage-attr/auxiliary/linkage1.rs
+++ b/tests/ui/linkage-attr/auxiliary/linkage1.rs
diff --git a/src/test/ui/linkage-attr/issue-10755.rs b/tests/ui/linkage-attr/issue-10755.rs
index afd2dc46c..afd2dc46c 100644
--- a/src/test/ui/linkage-attr/issue-10755.rs
+++ b/tests/ui/linkage-attr/issue-10755.rs
diff --git a/src/test/ui/linkage-attr/link-attr-validation-early.rs b/tests/ui/linkage-attr/link-attr-validation-early.rs
index b9a835fb5..b9a835fb5 100644
--- a/src/test/ui/linkage-attr/link-attr-validation-early.rs
+++ b/tests/ui/linkage-attr/link-attr-validation-early.rs
diff --git a/src/test/ui/linkage-attr/link-attr-validation-early.stderr b/tests/ui/linkage-attr/link-attr-validation-early.stderr
index 24ad9d825..24ad9d825 100644
--- a/src/test/ui/linkage-attr/link-attr-validation-early.stderr
+++ b/tests/ui/linkage-attr/link-attr-validation-early.stderr
diff --git a/src/test/ui/linkage-attr/link-attr-validation-late.rs b/tests/ui/linkage-attr/link-attr-validation-late.rs
index 34f720dd2..34f720dd2 100644
--- a/src/test/ui/linkage-attr/link-attr-validation-late.rs
+++ b/tests/ui/linkage-attr/link-attr-validation-late.rs
diff --git a/src/test/ui/linkage-attr/link-attr-validation-late.stderr b/tests/ui/linkage-attr/link-attr-validation-late.stderr
index 1ad5fbaf7..1ad5fbaf7 100644
--- a/src/test/ui/linkage-attr/link-attr-validation-late.stderr
+++ b/tests/ui/linkage-attr/link-attr-validation-late.stderr
diff --git a/src/test/ui/linkage-attr/link-cfg-works.rs b/tests/ui/linkage-attr/link-cfg-works.rs
index 254091ff2..254091ff2 100644
--- a/src/test/ui/linkage-attr/link-cfg-works.rs
+++ b/tests/ui/linkage-attr/link-cfg-works.rs
diff --git a/src/test/ui/linkage-attr/linkage-detect-extern-generated-name-collision.rs b/tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.rs
index 3a0910658..3a0910658 100644
--- a/src/test/ui/linkage-attr/linkage-detect-extern-generated-name-collision.rs
+++ b/tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.rs
diff --git a/src/test/ui/linkage-attr/linkage-detect-extern-generated-name-collision.stderr b/tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.stderr
index 06a070822..06a070822 100644
--- a/src/test/ui/linkage-attr/linkage-detect-extern-generated-name-collision.stderr
+++ b/tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.stderr
diff --git a/src/test/ui/linkage-attr/linkage-detect-local-generated-name-collision.rs b/tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.rs
index c1df9ccef..c1df9ccef 100644
--- a/src/test/ui/linkage-attr/linkage-detect-local-generated-name-collision.rs
+++ b/tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.rs
diff --git a/src/test/ui/linkage-attr/linkage-detect-local-generated-name-collision.stderr b/tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.stderr
index e0be1ac21..e0be1ac21 100644
--- a/src/test/ui/linkage-attr/linkage-detect-local-generated-name-collision.stderr
+++ b/tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.stderr
diff --git a/src/test/ui/linkage-attr/linkage-import.rs b/tests/ui/linkage-attr/linkage-import.rs
index f754ddc6e..f754ddc6e 100644
--- a/src/test/ui/linkage-attr/linkage-import.rs
+++ b/tests/ui/linkage-attr/linkage-import.rs
diff --git a/src/test/ui/linkage-attr/linkage1.rs b/tests/ui/linkage-attr/linkage1.rs
index deab7a251..deab7a251 100644
--- a/src/test/ui/linkage-attr/linkage1.rs
+++ b/tests/ui/linkage-attr/linkage1.rs
diff --git a/src/test/ui/linkage-attr/linkage2.rs b/tests/ui/linkage-attr/linkage2.rs
index aa42874f7..aa42874f7 100644
--- a/src/test/ui/linkage-attr/linkage2.rs
+++ b/tests/ui/linkage-attr/linkage2.rs
diff --git a/src/test/ui/linkage-attr/linkage2.stderr b/tests/ui/linkage-attr/linkage2.stderr
index 7265f711f..7265f711f 100644
--- a/src/test/ui/linkage-attr/linkage2.stderr
+++ b/tests/ui/linkage-attr/linkage2.stderr
diff --git a/src/test/ui/linkage-attr/linkage3.rs b/tests/ui/linkage-attr/linkage3.rs
index 112eb1d3b..112eb1d3b 100644
--- a/src/test/ui/linkage-attr/linkage3.rs
+++ b/tests/ui/linkage-attr/linkage3.rs
diff --git a/src/test/ui/linkage-attr/linkage3.stderr b/tests/ui/linkage-attr/linkage3.stderr
index f2579c6e8..f2579c6e8 100644
--- a/src/test/ui/linkage-attr/linkage3.stderr
+++ b/tests/ui/linkage-attr/linkage3.stderr
diff --git a/src/test/ui/linkage-attr/linkage4.rs b/tests/ui/linkage-attr/linkage4.rs
index 3b935f972..3b935f972 100644
--- a/src/test/ui/linkage-attr/linkage4.rs
+++ b/tests/ui/linkage-attr/linkage4.rs
diff --git a/src/test/ui/linkage-attr/linkage4.stderr b/tests/ui/linkage-attr/linkage4.stderr
index 30d4d2b7b..30d4d2b7b 100644
--- a/src/test/ui/linkage-attr/linkage4.stderr
+++ b/tests/ui/linkage-attr/linkage4.stderr
diff --git a/src/test/ui/lint-unknown-lints-at-crate-level.rs b/tests/ui/lint-unknown-lints-at-crate-level.rs
index 61d27f1ef..61d27f1ef 100644
--- a/src/test/ui/lint-unknown-lints-at-crate-level.rs
+++ b/tests/ui/lint-unknown-lints-at-crate-level.rs
diff --git a/src/test/ui/lint/auxiliary/add-impl.rs b/tests/ui/lint/auxiliary/add-impl.rs
index 9d0e3068a..9d0e3068a 100644
--- a/src/test/ui/lint/auxiliary/add-impl.rs
+++ b/tests/ui/lint/auxiliary/add-impl.rs
diff --git a/src/test/ui/lint/auxiliary/external_extern_fn.rs b/tests/ui/lint/auxiliary/external_extern_fn.rs
index c2a8cadc6..c2a8cadc6 100644
--- a/src/test/ui/lint/auxiliary/external_extern_fn.rs
+++ b/tests/ui/lint/auxiliary/external_extern_fn.rs
diff --git a/src/test/ui/lint/auxiliary/inherited_stability.rs b/tests/ui/lint/auxiliary/inherited_stability.rs
index 62100e5cc..62100e5cc 100644
--- a/src/test/ui/lint/auxiliary/inherited_stability.rs
+++ b/tests/ui/lint/auxiliary/inherited_stability.rs
diff --git a/src/test/ui/lint/auxiliary/lint_output_format.rs b/tests/ui/lint/auxiliary/lint_output_format.rs
index 4e3547250..4e3547250 100644
--- a/src/test/ui/lint/auxiliary/lint_output_format.rs
+++ b/tests/ui/lint/auxiliary/lint_output_format.rs
diff --git a/src/test/ui/lint/auxiliary/lint_stability.rs b/tests/ui/lint/auxiliary/lint_stability.rs
index 99c29dcdd..99c29dcdd 100644
--- a/src/test/ui/lint/auxiliary/lint_stability.rs
+++ b/tests/ui/lint/auxiliary/lint_stability.rs
diff --git a/src/test/ui/lint/auxiliary/lint_stability_fields.rs b/tests/ui/lint/auxiliary/lint_stability_fields.rs
index e72a501e1..e72a501e1 100644
--- a/src/test/ui/lint/auxiliary/lint_stability_fields.rs
+++ b/tests/ui/lint/auxiliary/lint_stability_fields.rs
diff --git a/src/test/ui/lint/auxiliary/lints-in-foreign-macros.rs b/tests/ui/lint/auxiliary/lints-in-foreign-macros.rs
index b969d9dba..b969d9dba 100644
--- a/src/test/ui/lint/auxiliary/lints-in-foreign-macros.rs
+++ b/tests/ui/lint/auxiliary/lints-in-foreign-macros.rs
diff --git a/src/test/ui/lint/auxiliary/stability-cfg2.rs b/tests/ui/lint/auxiliary/stability-cfg2.rs
index c995038e5..c995038e5 100644
--- a/src/test/ui/lint/auxiliary/stability-cfg2.rs
+++ b/tests/ui/lint/auxiliary/stability-cfg2.rs
diff --git a/src/test/ui/lint/auxiliary/stability_cfg1.rs b/tests/ui/lint/auxiliary/stability_cfg1.rs
index 2e027cc27..2e027cc27 100644
--- a/src/test/ui/lint/auxiliary/stability_cfg1.rs
+++ b/tests/ui/lint/auxiliary/stability_cfg1.rs
diff --git a/src/test/ui/lint/auxiliary/stability_cfg2.rs b/tests/ui/lint/auxiliary/stability_cfg2.rs
index c995038e5..c995038e5 100644
--- a/src/test/ui/lint/auxiliary/stability_cfg2.rs
+++ b/tests/ui/lint/auxiliary/stability_cfg2.rs
diff --git a/src/test/ui/lint/auxiliary/trivial-cast-ice.rs b/tests/ui/lint/auxiliary/trivial-cast-ice.rs
index ab2332d06..ab2332d06 100644
--- a/src/test/ui/lint/auxiliary/trivial-cast-ice.rs
+++ b/tests/ui/lint/auxiliary/trivial-cast-ice.rs
diff --git a/src/test/ui/lint/auxiliary/unaligned_references_external_crate.rs b/tests/ui/lint/auxiliary/unaligned_references_external_crate.rs
index fb486c6b5..fb486c6b5 100644
--- a/src/test/ui/lint/auxiliary/unaligned_references_external_crate.rs
+++ b/tests/ui/lint/auxiliary/unaligned_references_external_crate.rs
diff --git a/src/test/ui/lint/bad-lint-cap.rs b/tests/ui/lint/bad-lint-cap.rs
index e65c8319d..e65c8319d 100644
--- a/src/test/ui/lint/bad-lint-cap.rs
+++ b/tests/ui/lint/bad-lint-cap.rs
diff --git a/src/test/ui/lint/bad-lint-cap.stderr b/tests/ui/lint/bad-lint-cap.stderr
index f284dbf84..f284dbf84 100644
--- a/src/test/ui/lint/bad-lint-cap.stderr
+++ b/tests/ui/lint/bad-lint-cap.stderr
diff --git a/src/test/ui/lint/bad-lint-cap2.rs b/tests/ui/lint/bad-lint-cap2.rs
index 8bc8aca20..8bc8aca20 100644
--- a/src/test/ui/lint/bad-lint-cap2.rs
+++ b/tests/ui/lint/bad-lint-cap2.rs
diff --git a/src/test/ui/lint/bad-lint-cap2.stderr b/tests/ui/lint/bad-lint-cap2.stderr
index 3f3affe5a..3f3affe5a 100644
--- a/src/test/ui/lint/bad-lint-cap2.stderr
+++ b/tests/ui/lint/bad-lint-cap2.stderr
diff --git a/src/test/ui/lint/bad-lint-cap3.rs b/tests/ui/lint/bad-lint-cap3.rs
index c38105870..c38105870 100644
--- a/src/test/ui/lint/bad-lint-cap3.rs
+++ b/tests/ui/lint/bad-lint-cap3.rs
diff --git a/src/test/ui/lint/bad-lint-cap3.stderr b/tests/ui/lint/bad-lint-cap3.stderr
index 0fb65322f..0fb65322f 100644
--- a/src/test/ui/lint/bad-lint-cap3.stderr
+++ b/tests/ui/lint/bad-lint-cap3.stderr
diff --git a/src/test/ui/lint/bare-trait-objects-path.rs b/tests/ui/lint/bare-trait-objects-path.rs
index 0e2294715..0e2294715 100644
--- a/src/test/ui/lint/bare-trait-objects-path.rs
+++ b/tests/ui/lint/bare-trait-objects-path.rs
diff --git a/src/test/ui/lint/bare-trait-objects-path.stderr b/tests/ui/lint/bare-trait-objects-path.stderr
index 8ed303ca6..a19f4963c 100644
--- a/src/test/ui/lint/bare-trait-objects-path.stderr
+++ b/tests/ui/lint/bare-trait-objects-path.stderr
@@ -16,7 +16,7 @@ error[E0223]: ambiguous associated type
   --> $DIR/bare-trait-objects-path.rs:23:12
    |
 LL |     let _: Dyn::Ty;
-   |            ^^^^^^^ help: use fully-qualified syntax: `<dyn Dyn as Trait>::Ty`
+   |            ^^^^^^^ help: use the fully-qualified path: `<dyn Dyn as Assoc>::Ty`
 
 warning: trait objects without an explicit `dyn` are deprecated
   --> $DIR/bare-trait-objects-path.rs:14:5
diff --git a/src/test/ui/lint/clashing-extern-fn-recursion.rs b/tests/ui/lint/clashing-extern-fn-recursion.rs
index ab0fd0a2e..ab0fd0a2e 100644
--- a/src/test/ui/lint/clashing-extern-fn-recursion.rs
+++ b/tests/ui/lint/clashing-extern-fn-recursion.rs
diff --git a/src/test/ui/lint/clashing-extern-fn-wasm.rs b/tests/ui/lint/clashing-extern-fn-wasm.rs
index eeb2b8eae..eeb2b8eae 100644
--- a/src/test/ui/lint/clashing-extern-fn-wasm.rs
+++ b/tests/ui/lint/clashing-extern-fn-wasm.rs
diff --git a/src/test/ui/lint/clashing-extern-fn.rs b/tests/ui/lint/clashing-extern-fn.rs
index 809e06026..809e06026 100644
--- a/src/test/ui/lint/clashing-extern-fn.rs
+++ b/tests/ui/lint/clashing-extern-fn.rs
diff --git a/src/test/ui/lint/clashing-extern-fn.stderr b/tests/ui/lint/clashing-extern-fn.stderr
index 217eed6c9..217eed6c9 100644
--- a/src/test/ui/lint/clashing-extern-fn.stderr
+++ b/tests/ui/lint/clashing-extern-fn.stderr
diff --git a/src/test/ui/lint/cli-lint-override.forbid_warn.stderr b/tests/ui/lint/cli-lint-override.forbid_warn.stderr
index d1c66a81c..d1c66a81c 100644
--- a/src/test/ui/lint/cli-lint-override.forbid_warn.stderr
+++ b/tests/ui/lint/cli-lint-override.forbid_warn.stderr
diff --git a/src/test/ui/lint/cli-lint-override.force_warn_deny.stderr b/tests/ui/lint/cli-lint-override.force_warn_deny.stderr
index 779c24c93..779c24c93 100644
--- a/src/test/ui/lint/cli-lint-override.force_warn_deny.stderr
+++ b/tests/ui/lint/cli-lint-override.force_warn_deny.stderr
diff --git a/src/test/ui/lint/cli-lint-override.rs b/tests/ui/lint/cli-lint-override.rs
index a0e853fc3..a0e853fc3 100644
--- a/src/test/ui/lint/cli-lint-override.rs
+++ b/tests/ui/lint/cli-lint-override.rs
diff --git a/src/test/ui/lint/cli-lint-override.warn_deny.stderr b/tests/ui/lint/cli-lint-override.warn_deny.stderr
index f034cfa93..f034cfa93 100644
--- a/src/test/ui/lint/cli-lint-override.warn_deny.stderr
+++ b/tests/ui/lint/cli-lint-override.warn_deny.stderr
diff --git a/src/test/ui/lint/cli-unknown-force-warn.rs b/tests/ui/lint/cli-unknown-force-warn.rs
index f3dea87a6..f3dea87a6 100644
--- a/src/test/ui/lint/cli-unknown-force-warn.rs
+++ b/tests/ui/lint/cli-unknown-force-warn.rs
diff --git a/src/test/ui/lint/cli-unknown-force-warn.stderr b/tests/ui/lint/cli-unknown-force-warn.stderr
index 9ce9f405a..9ce9f405a 100644
--- a/src/test/ui/lint/cli-unknown-force-warn.stderr
+++ b/tests/ui/lint/cli-unknown-force-warn.stderr
diff --git a/src/test/ui/lint/command-line-lint-group-allow.rs b/tests/ui/lint/command-line-lint-group-allow.rs
index 21c0df028..21c0df028 100644
--- a/src/test/ui/lint/command-line-lint-group-allow.rs
+++ b/tests/ui/lint/command-line-lint-group-allow.rs
diff --git a/src/test/ui/lint/command-line-lint-group-deny.rs b/tests/ui/lint/command-line-lint-group-deny.rs
index da999f33e..da999f33e 100644
--- a/src/test/ui/lint/command-line-lint-group-deny.rs
+++ b/tests/ui/lint/command-line-lint-group-deny.rs
diff --git a/src/test/ui/lint/command-line-lint-group-deny.stderr b/tests/ui/lint/command-line-lint-group-deny.stderr
index 04c3f6f26..04c3f6f26 100644
--- a/src/test/ui/lint/command-line-lint-group-deny.stderr
+++ b/tests/ui/lint/command-line-lint-group-deny.stderr
diff --git a/src/test/ui/lint/command-line-lint-group-forbid.rs b/tests/ui/lint/command-line-lint-group-forbid.rs
index 4e5c2aca5..4e5c2aca5 100644
--- a/src/test/ui/lint/command-line-lint-group-forbid.rs
+++ b/tests/ui/lint/command-line-lint-group-forbid.rs
diff --git a/src/test/ui/lint/command-line-lint-group-forbid.stderr b/tests/ui/lint/command-line-lint-group-forbid.stderr
index 736782140..736782140 100644
--- a/src/test/ui/lint/command-line-lint-group-forbid.stderr
+++ b/tests/ui/lint/command-line-lint-group-forbid.stderr
diff --git a/src/test/ui/lint/command-line-lint-group-warn.rs b/tests/ui/lint/command-line-lint-group-warn.rs
index f4536f9c9..f4536f9c9 100644
--- a/src/test/ui/lint/command-line-lint-group-warn.rs
+++ b/tests/ui/lint/command-line-lint-group-warn.rs
diff --git a/src/test/ui/lint/command-line-lint-group-warn.stderr b/tests/ui/lint/command-line-lint-group-warn.stderr
index e9c80b4ef..e9c80b4ef 100644
--- a/src/test/ui/lint/command-line-lint-group-warn.stderr
+++ b/tests/ui/lint/command-line-lint-group-warn.stderr
diff --git a/src/test/ui/lint/command-line-register-lint-tool.rs b/tests/ui/lint/command-line-register-lint-tool.rs
index d6e95fd3e..d6e95fd3e 100644
--- a/src/test/ui/lint/command-line-register-lint-tool.rs
+++ b/tests/ui/lint/command-line-register-lint-tool.rs
diff --git a/src/test/ui/lint/command-line-register-unknown-lint-tool.rs b/tests/ui/lint/command-line-register-unknown-lint-tool.rs
index 59fc02000..59fc02000 100644
--- a/src/test/ui/lint/command-line-register-unknown-lint-tool.rs
+++ b/tests/ui/lint/command-line-register-unknown-lint-tool.rs
diff --git a/src/test/ui/lint/command-line-register-unknown-lint-tool.stderr b/tests/ui/lint/command-line-register-unknown-lint-tool.stderr
index c9a2aff21..c9a2aff21 100644
--- a/src/test/ui/lint/command-line-register-unknown-lint-tool.stderr
+++ b/tests/ui/lint/command-line-register-unknown-lint-tool.stderr
diff --git a/src/test/ui/lint/crate_level_only_lint.rs b/tests/ui/lint/crate_level_only_lint.rs
index d9673faa2..d9673faa2 100644
--- a/src/test/ui/lint/crate_level_only_lint.rs
+++ b/tests/ui/lint/crate_level_only_lint.rs
diff --git a/src/test/ui/lint/crate_level_only_lint.stderr b/tests/ui/lint/crate_level_only_lint.stderr
index 8fb06df2a..8fb06df2a 100644
--- a/src/test/ui/lint/crate_level_only_lint.stderr
+++ b/tests/ui/lint/crate_level_only_lint.stderr
diff --git a/src/test/ui/lint/dead-code/alias-in-pat.rs b/tests/ui/lint/dead-code/alias-in-pat.rs
index 69d455f3b..69d455f3b 100644
--- a/src/test/ui/lint/dead-code/alias-in-pat.rs
+++ b/tests/ui/lint/dead-code/alias-in-pat.rs
diff --git a/src/test/ui/lint/dead-code/anon-const-in-pat.rs b/tests/ui/lint/dead-code/anon-const-in-pat.rs
index d3e39c0de..d3e39c0de 100644
--- a/src/test/ui/lint/dead-code/anon-const-in-pat.rs
+++ b/tests/ui/lint/dead-code/anon-const-in-pat.rs
diff --git a/src/test/ui/lint/dead-code/associated-type.rs b/tests/ui/lint/dead-code/associated-type.rs
index 1cf66e75a..1cf66e75a 100644
--- a/src/test/ui/lint/dead-code/associated-type.rs
+++ b/tests/ui/lint/dead-code/associated-type.rs
diff --git a/src/test/ui/lint/dead-code/basic.rs b/tests/ui/lint/dead-code/basic.rs
index 3b8ffd58c..3b8ffd58c 100644
--- a/src/test/ui/lint/dead-code/basic.rs
+++ b/tests/ui/lint/dead-code/basic.rs
diff --git a/src/test/ui/lint/dead-code/basic.stderr b/tests/ui/lint/dead-code/basic.stderr
index 7d068cead..7d068cead 100644
--- a/src/test/ui/lint/dead-code/basic.stderr
+++ b/tests/ui/lint/dead-code/basic.stderr
diff --git a/src/test/ui/lint/dead-code/closure-bang.rs b/tests/ui/lint/dead-code/closure-bang.rs
index 8e8636b11..8e8636b11 100644
--- a/src/test/ui/lint/dead-code/closure-bang.rs
+++ b/tests/ui/lint/dead-code/closure-bang.rs
diff --git a/src/test/ui/lint/dead-code/const-and-self.rs b/tests/ui/lint/dead-code/const-and-self.rs
index 5c96e4d0e..5c96e4d0e 100644
--- a/src/test/ui/lint/dead-code/const-and-self.rs
+++ b/tests/ui/lint/dead-code/const-and-self.rs
diff --git a/src/test/ui/lint/dead-code/const-and-self.stderr b/tests/ui/lint/dead-code/const-and-self.stderr
index 9d1d7d6ec..9d1d7d6ec 100644
--- a/src/test/ui/lint/dead-code/const-and-self.stderr
+++ b/tests/ui/lint/dead-code/const-and-self.stderr
diff --git a/src/test/ui/lint/dead-code/empty-unused-enum.rs b/tests/ui/lint/dead-code/empty-unused-enum.rs
index 864501e94..864501e94 100644
--- a/src/test/ui/lint/dead-code/empty-unused-enum.rs
+++ b/tests/ui/lint/dead-code/empty-unused-enum.rs
diff --git a/src/test/ui/lint/dead-code/empty-unused-enum.stderr b/tests/ui/lint/dead-code/empty-unused-enum.stderr
index 6391f0941..6391f0941 100644
--- a/src/test/ui/lint/dead-code/empty-unused-enum.stderr
+++ b/tests/ui/lint/dead-code/empty-unused-enum.stderr
diff --git a/src/test/ui/lint/dead-code/empty-unused-public-enum.rs b/tests/ui/lint/dead-code/empty-unused-public-enum.rs
index 15b04496b..15b04496b 100644
--- a/src/test/ui/lint/dead-code/empty-unused-public-enum.rs
+++ b/tests/ui/lint/dead-code/empty-unused-public-enum.rs
diff --git a/src/test/ui/lint/dead-code/enum-variants.rs b/tests/ui/lint/dead-code/enum-variants.rs
index 91c97232e..91c97232e 100644
--- a/src/test/ui/lint/dead-code/enum-variants.rs
+++ b/tests/ui/lint/dead-code/enum-variants.rs
diff --git a/src/test/ui/lint/dead-code/impl-trait.rs b/tests/ui/lint/dead-code/impl-trait.rs
index 757b8f83e..757b8f83e 100644
--- a/src/test/ui/lint/dead-code/impl-trait.rs
+++ b/tests/ui/lint/dead-code/impl-trait.rs
diff --git a/src/test/ui/lint/dead-code/impl-trait.stderr b/tests/ui/lint/dead-code/impl-trait.stderr
index e35e13a9e..e35e13a9e 100644
--- a/src/test/ui/lint/dead-code/impl-trait.stderr
+++ b/tests/ui/lint/dead-code/impl-trait.stderr
diff --git a/src/test/ui/lint/dead-code/issue-68408-false-positive.rs b/tests/ui/lint/dead-code/issue-68408-false-positive.rs
index 7ee6b5d72..7ee6b5d72 100644
--- a/src/test/ui/lint/dead-code/issue-68408-false-positive.rs
+++ b/tests/ui/lint/dead-code/issue-68408-false-positive.rs
diff --git a/src/test/ui/lint/dead-code/issue-85071-2.rs b/tests/ui/lint/dead-code/issue-85071-2.rs
index f0639931c..f0639931c 100644
--- a/src/test/ui/lint/dead-code/issue-85071-2.rs
+++ b/tests/ui/lint/dead-code/issue-85071-2.rs
diff --git a/src/test/ui/lint/dead-code/issue-85071-2.stderr b/tests/ui/lint/dead-code/issue-85071-2.stderr
index 5e963183d..5e963183d 100644
--- a/src/test/ui/lint/dead-code/issue-85071-2.stderr
+++ b/tests/ui/lint/dead-code/issue-85071-2.stderr
diff --git a/src/test/ui/lint/dead-code/issue-85071.rs b/tests/ui/lint/dead-code/issue-85071.rs
index d6969321c..d6969321c 100644
--- a/src/test/ui/lint/dead-code/issue-85071.rs
+++ b/tests/ui/lint/dead-code/issue-85071.rs
diff --git a/src/test/ui/lint/dead-code/issue-85071.stderr b/tests/ui/lint/dead-code/issue-85071.stderr
index 721fb8148..721fb8148 100644
--- a/src/test/ui/lint/dead-code/issue-85071.stderr
+++ b/tests/ui/lint/dead-code/issue-85071.stderr
diff --git a/src/test/ui/lint/dead-code/issue-85255.rs b/tests/ui/lint/dead-code/issue-85255.rs
index 043f68137..043f68137 100644
--- a/src/test/ui/lint/dead-code/issue-85255.rs
+++ b/tests/ui/lint/dead-code/issue-85255.rs
diff --git a/src/test/ui/lint/dead-code/issue-85255.stderr b/tests/ui/lint/dead-code/issue-85255.stderr
index 3497b952f..3497b952f 100644
--- a/src/test/ui/lint/dead-code/issue-85255.stderr
+++ b/tests/ui/lint/dead-code/issue-85255.stderr
diff --git a/src/test/ui/lint/dead-code/leading-underscore.rs b/tests/ui/lint/dead-code/leading-underscore.rs
index d3582961b..d3582961b 100644
--- a/src/test/ui/lint/dead-code/leading-underscore.rs
+++ b/tests/ui/lint/dead-code/leading-underscore.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-1.rs b/tests/ui/lint/dead-code/lint-dead-code-1.rs
index 8f5a4c41e..8f5a4c41e 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-1.rs
+++ b/tests/ui/lint/dead-code/lint-dead-code-1.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-1.stderr b/tests/ui/lint/dead-code/lint-dead-code-1.stderr
index eb728b5b9..eb728b5b9 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-1.stderr
+++ b/tests/ui/lint/dead-code/lint-dead-code-1.stderr
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-2.rs b/tests/ui/lint/dead-code/lint-dead-code-2.rs
index 6bfa4d96f..6bfa4d96f 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-2.rs
+++ b/tests/ui/lint/dead-code/lint-dead-code-2.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-2.stderr b/tests/ui/lint/dead-code/lint-dead-code-2.stderr
index 85af553c9..85af553c9 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-2.stderr
+++ b/tests/ui/lint/dead-code/lint-dead-code-2.stderr
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-3.rs b/tests/ui/lint/dead-code/lint-dead-code-3.rs
index 293fcdbc5..293fcdbc5 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-3.rs
+++ b/tests/ui/lint/dead-code/lint-dead-code-3.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-3.stderr b/tests/ui/lint/dead-code/lint-dead-code-3.stderr
index 26fc13bae..26fc13bae 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-3.stderr
+++ b/tests/ui/lint/dead-code/lint-dead-code-3.stderr
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-4.rs b/tests/ui/lint/dead-code/lint-dead-code-4.rs
index 0fc6c6156..0fc6c6156 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-4.rs
+++ b/tests/ui/lint/dead-code/lint-dead-code-4.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-4.stderr b/tests/ui/lint/dead-code/lint-dead-code-4.stderr
index 668c1dacf..668c1dacf 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-4.stderr
+++ b/tests/ui/lint/dead-code/lint-dead-code-4.stderr
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-5.rs b/tests/ui/lint/dead-code/lint-dead-code-5.rs
index ed90fb464..ed90fb464 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-5.rs
+++ b/tests/ui/lint/dead-code/lint-dead-code-5.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-5.stderr b/tests/ui/lint/dead-code/lint-dead-code-5.stderr
index eaf43e453..eaf43e453 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-5.stderr
+++ b/tests/ui/lint/dead-code/lint-dead-code-5.stderr
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-6.rs b/tests/ui/lint/dead-code/lint-dead-code-6.rs
index e3074acf1..e3074acf1 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-6.rs
+++ b/tests/ui/lint/dead-code/lint-dead-code-6.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-6.stderr b/tests/ui/lint/dead-code/lint-dead-code-6.stderr
index f9d83308a..f9d83308a 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-6.stderr
+++ b/tests/ui/lint/dead-code/lint-dead-code-6.stderr
diff --git a/src/test/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.rs b/tests/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.rs
index 2003e1e29..2003e1e29 100644
--- a/src/test/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.rs
+++ b/tests/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.rs
diff --git a/src/test/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.stderr b/tests/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.stderr
index 0e5c78a71..0e5c78a71 100644
--- a/src/test/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.stderr
+++ b/tests/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.stderr
diff --git a/src/test/ui/lint/dead-code/newline-span.rs b/tests/ui/lint/dead-code/newline-span.rs
index 209c3cd93..209c3cd93 100644
--- a/src/test/ui/lint/dead-code/newline-span.rs
+++ b/tests/ui/lint/dead-code/newline-span.rs
diff --git a/src/test/ui/lint/dead-code/newline-span.stderr b/tests/ui/lint/dead-code/newline-span.stderr
index 4eeadccc8..4eeadccc8 100644
--- a/src/test/ui/lint/dead-code/newline-span.stderr
+++ b/tests/ui/lint/dead-code/newline-span.stderr
diff --git a/src/test/ui/lint/dead-code/self-assign.rs b/tests/ui/lint/dead-code/self-assign.rs
index ea7ce98d8..ea7ce98d8 100644
--- a/src/test/ui/lint/dead-code/self-assign.rs
+++ b/tests/ui/lint/dead-code/self-assign.rs
diff --git a/src/test/ui/lint/dead-code/self-assign.stderr b/tests/ui/lint/dead-code/self-assign.stderr
index bb79c0ec7..bb79c0ec7 100644
--- a/src/test/ui/lint/dead-code/self-assign.stderr
+++ b/tests/ui/lint/dead-code/self-assign.stderr
diff --git a/src/test/ui/lint/dead-code/trait-impl.rs b/tests/ui/lint/dead-code/trait-impl.rs
index 92e389a93..92e389a93 100644
--- a/src/test/ui/lint/dead-code/trait-impl.rs
+++ b/tests/ui/lint/dead-code/trait-impl.rs
diff --git a/src/test/ui/lint/dead-code/tuple-struct-field.rs b/tests/ui/lint/dead-code/tuple-struct-field.rs
index 14fb30be9..14fb30be9 100644
--- a/src/test/ui/lint/dead-code/tuple-struct-field.rs
+++ b/tests/ui/lint/dead-code/tuple-struct-field.rs
diff --git a/src/test/ui/lint/dead-code/tuple-struct-field.stderr b/tests/ui/lint/dead-code/tuple-struct-field.stderr
index b8ad5cbe4..b8ad5cbe4 100644
--- a/src/test/ui/lint/dead-code/tuple-struct-field.stderr
+++ b/tests/ui/lint/dead-code/tuple-struct-field.stderr
diff --git a/src/test/ui/lint/dead-code/type-alias.rs b/tests/ui/lint/dead-code/type-alias.rs
index 35a7f125d..35a7f125d 100644
--- a/src/test/ui/lint/dead-code/type-alias.rs
+++ b/tests/ui/lint/dead-code/type-alias.rs
diff --git a/src/test/ui/lint/dead-code/type-alias.stderr b/tests/ui/lint/dead-code/type-alias.stderr
index 446447d97..446447d97 100644
--- a/src/test/ui/lint/dead-code/type-alias.stderr
+++ b/tests/ui/lint/dead-code/type-alias.stderr
diff --git a/src/test/ui/lint/dead-code/type-in-foreign.rs b/tests/ui/lint/dead-code/type-in-foreign.rs
index b6c593f31..b6c593f31 100644
--- a/src/test/ui/lint/dead-code/type-in-foreign.rs
+++ b/tests/ui/lint/dead-code/type-in-foreign.rs
diff --git a/src/test/ui/lint/dead-code/unused-enum.rs b/tests/ui/lint/dead-code/unused-enum.rs
index 20df3e1de..20df3e1de 100644
--- a/src/test/ui/lint/dead-code/unused-enum.rs
+++ b/tests/ui/lint/dead-code/unused-enum.rs
diff --git a/src/test/ui/lint/dead-code/unused-enum.stderr b/tests/ui/lint/dead-code/unused-enum.stderr
index d2602dbb3..d2602dbb3 100644
--- a/src/test/ui/lint/dead-code/unused-enum.stderr
+++ b/tests/ui/lint/dead-code/unused-enum.stderr
diff --git a/src/test/ui/lint/dead-code/unused-struct-variant.rs b/tests/ui/lint/dead-code/unused-struct-variant.rs
index a914e0c33..a914e0c33 100644
--- a/src/test/ui/lint/dead-code/unused-struct-variant.rs
+++ b/tests/ui/lint/dead-code/unused-struct-variant.rs
diff --git a/src/test/ui/lint/dead-code/unused-struct-variant.stderr b/tests/ui/lint/dead-code/unused-struct-variant.stderr
index d26dd3aff..d26dd3aff 100644
--- a/src/test/ui/lint/dead-code/unused-struct-variant.stderr
+++ b/tests/ui/lint/dead-code/unused-struct-variant.stderr
diff --git a/src/test/ui/lint/dead-code/unused-variant-pub.rs b/tests/ui/lint/dead-code/unused-variant-pub.rs
index 3a9061340..3a9061340 100644
--- a/src/test/ui/lint/dead-code/unused-variant-pub.rs
+++ b/tests/ui/lint/dead-code/unused-variant-pub.rs
diff --git a/src/test/ui/lint/dead-code/unused-variant.rs b/tests/ui/lint/dead-code/unused-variant.rs
index 82108fa9c..82108fa9c 100644
--- a/src/test/ui/lint/dead-code/unused-variant.rs
+++ b/tests/ui/lint/dead-code/unused-variant.rs
diff --git a/src/test/ui/lint/dead-code/unused-variant.stderr b/tests/ui/lint/dead-code/unused-variant.stderr
index 6029bf268..6029bf268 100644
--- a/src/test/ui/lint/dead-code/unused-variant.stderr
+++ b/tests/ui/lint/dead-code/unused-variant.stderr
diff --git a/src/test/ui/lint/dead-code/with-core-crate.rs b/tests/ui/lint/dead-code/with-core-crate.rs
index 0a94b528f..0a94b528f 100644
--- a/src/test/ui/lint/dead-code/with-core-crate.rs
+++ b/tests/ui/lint/dead-code/with-core-crate.rs
diff --git a/src/test/ui/lint/dead-code/with-core-crate.stderr b/tests/ui/lint/dead-code/with-core-crate.stderr
index 7adcf8848..7adcf8848 100644
--- a/src/test/ui/lint/dead-code/with-core-crate.stderr
+++ b/tests/ui/lint/dead-code/with-core-crate.stderr
diff --git a/src/test/ui/lint/dead-code/with-impl.rs b/tests/ui/lint/dead-code/with-impl.rs
index 812fcdd09..812fcdd09 100644
--- a/src/test/ui/lint/dead-code/with-impl.rs
+++ b/tests/ui/lint/dead-code/with-impl.rs
diff --git a/src/test/ui/lint/deny-overflowing-literals.rs b/tests/ui/lint/deny-overflowing-literals.rs
index 21c8ba7d6..21c8ba7d6 100644
--- a/src/test/ui/lint/deny-overflowing-literals.rs
+++ b/tests/ui/lint/deny-overflowing-literals.rs
diff --git a/src/test/ui/lint/deny-overflowing-literals.stderr b/tests/ui/lint/deny-overflowing-literals.stderr
index beb0ad795..beb0ad795 100644
--- a/src/test/ui/lint/deny-overflowing-literals.stderr
+++ b/tests/ui/lint/deny-overflowing-literals.stderr
diff --git a/src/test/ui/lint/empty-lint-attributes.rs b/tests/ui/lint/empty-lint-attributes.rs
index 9a0ec2533..9a0ec2533 100644
--- a/src/test/ui/lint/empty-lint-attributes.rs
+++ b/tests/ui/lint/empty-lint-attributes.rs
diff --git a/src/test/ui/lint/enable-unstable-lib-feature.rs b/tests/ui/lint/enable-unstable-lib-feature.rs
index aa6a973d7..aa6a973d7 100644
--- a/src/test/ui/lint/enable-unstable-lib-feature.rs
+++ b/tests/ui/lint/enable-unstable-lib-feature.rs
diff --git a/src/test/ui/lint/enable-unstable-lib-feature.stderr b/tests/ui/lint/enable-unstable-lib-feature.stderr
index bb4e928ad..bb4e928ad 100644
--- a/src/test/ui/lint/enable-unstable-lib-feature.stderr
+++ b/tests/ui/lint/enable-unstable-lib-feature.stderr
diff --git a/src/test/ui/lint/expansion-time-include.rs b/tests/ui/lint/expansion-time-include.rs
index 4ea89d5ad..4ea89d5ad 100644
--- a/src/test/ui/lint/expansion-time-include.rs
+++ b/tests/ui/lint/expansion-time-include.rs
diff --git a/src/test/ui/lint/expansion-time.rs b/tests/ui/lint/expansion-time.rs
index f23c7cb0d..f23c7cb0d 100644
--- a/src/test/ui/lint/expansion-time.rs
+++ b/tests/ui/lint/expansion-time.rs
diff --git a/src/test/ui/lint/expansion-time.stderr b/tests/ui/lint/expansion-time.stderr
index 064ee5fad..064ee5fad 100644
--- a/src/test/ui/lint/expansion-time.stderr
+++ b/tests/ui/lint/expansion-time.stderr
diff --git a/src/test/ui/lint/expr_attr_paren_order.rs b/tests/ui/lint/expr_attr_paren_order.rs
index e1ec2e951..e1ec2e951 100644
--- a/src/test/ui/lint/expr_attr_paren_order.rs
+++ b/tests/ui/lint/expr_attr_paren_order.rs
diff --git a/src/test/ui/lint/expr_attr_paren_order.stderr b/tests/ui/lint/expr_attr_paren_order.stderr
index 42beed10c..42beed10c 100644
--- a/src/test/ui/lint/expr_attr_paren_order.stderr
+++ b/tests/ui/lint/expr_attr_paren_order.stderr
diff --git a/src/test/ui/lint/fn_must_use.rs b/tests/ui/lint/fn_must_use.rs
index b4e9da0fc..b4e9da0fc 100644
--- a/src/test/ui/lint/fn_must_use.rs
+++ b/tests/ui/lint/fn_must_use.rs
diff --git a/src/test/ui/lint/fn_must_use.stderr b/tests/ui/lint/fn_must_use.stderr
index 657f23c60..657f23c60 100644
--- a/src/test/ui/lint/fn_must_use.stderr
+++ b/tests/ui/lint/fn_must_use.stderr
diff --git a/src/test/ui/lint/for_loop_over_fallibles.rs b/tests/ui/lint/for_loop_over_fallibles.rs
index 43d71c2e8..43d71c2e8 100644
--- a/src/test/ui/lint/for_loop_over_fallibles.rs
+++ b/tests/ui/lint/for_loop_over_fallibles.rs
diff --git a/src/test/ui/lint/for_loop_over_fallibles.stderr b/tests/ui/lint/for_loop_over_fallibles.stderr
index 96efdf85c..96efdf85c 100644
--- a/src/test/ui/lint/for_loop_over_fallibles.stderr
+++ b/tests/ui/lint/for_loop_over_fallibles.stderr
diff --git a/src/test/ui/lint/forbid-error-capped.rs b/tests/ui/lint/forbid-error-capped.rs
index b56471a75..b56471a75 100644
--- a/src/test/ui/lint/forbid-error-capped.rs
+++ b/tests/ui/lint/forbid-error-capped.rs
diff --git a/src/test/ui/lint/forbid-group-group-1.rs b/tests/ui/lint/forbid-group-group-1.rs
index 80f7db4e5..80f7db4e5 100644
--- a/src/test/ui/lint/forbid-group-group-1.rs
+++ b/tests/ui/lint/forbid-group-group-1.rs
diff --git a/src/test/ui/lint/forbid-group-group-1.stderr b/tests/ui/lint/forbid-group-group-1.stderr
index fd425e5f7..fd425e5f7 100644
--- a/src/test/ui/lint/forbid-group-group-1.stderr
+++ b/tests/ui/lint/forbid-group-group-1.stderr
diff --git a/src/test/ui/lint/forbid-group-group-2.rs b/tests/ui/lint/forbid-group-group-2.rs
index b12fd72da..b12fd72da 100644
--- a/src/test/ui/lint/forbid-group-group-2.rs
+++ b/tests/ui/lint/forbid-group-group-2.rs
diff --git a/src/test/ui/lint/forbid-group-group-2.stderr b/tests/ui/lint/forbid-group-group-2.stderr
index b2e2bcea1..b2e2bcea1 100644
--- a/src/test/ui/lint/forbid-group-group-2.stderr
+++ b/tests/ui/lint/forbid-group-group-2.stderr
diff --git a/src/test/ui/lint/forbid-group-member.rs b/tests/ui/lint/forbid-group-member.rs
index 664edeaa8..664edeaa8 100644
--- a/src/test/ui/lint/forbid-group-member.rs
+++ b/tests/ui/lint/forbid-group-member.rs
diff --git a/src/test/ui/lint/forbid-group-member.stderr b/tests/ui/lint/forbid-group-member.stderr
index 47336d4d8..47336d4d8 100644
--- a/src/test/ui/lint/forbid-group-member.stderr
+++ b/tests/ui/lint/forbid-group-member.stderr
diff --git a/src/test/ui/lint/forbid-member-group.rs b/tests/ui/lint/forbid-member-group.rs
index e2f76825a..e2f76825a 100644
--- a/src/test/ui/lint/forbid-member-group.rs
+++ b/tests/ui/lint/forbid-member-group.rs
diff --git a/src/test/ui/lint/forbid-member-group.stderr b/tests/ui/lint/forbid-member-group.stderr
index e65301778..e65301778 100644
--- a/src/test/ui/lint/forbid-member-group.stderr
+++ b/tests/ui/lint/forbid-member-group.stderr
diff --git a/src/test/ui/lint/force-warn/allow-warnings.rs b/tests/ui/lint/force-warn/allow-warnings.rs
index 0199381fc..0199381fc 100644
--- a/src/test/ui/lint/force-warn/allow-warnings.rs
+++ b/tests/ui/lint/force-warn/allow-warnings.rs
diff --git a/src/test/ui/lint/force-warn/allow-warnings.stderr b/tests/ui/lint/force-warn/allow-warnings.stderr
index 4de68a079..4de68a079 100644
--- a/src/test/ui/lint/force-warn/allow-warnings.stderr
+++ b/tests/ui/lint/force-warn/allow-warnings.stderr
diff --git a/src/test/ui/lint/force-warn/allowed-by-default-lint.rs b/tests/ui/lint/force-warn/allowed-by-default-lint.rs
index b24ab822d..b24ab822d 100644
--- a/src/test/ui/lint/force-warn/allowed-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/allowed-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/allowed-by-default-lint.stderr b/tests/ui/lint/force-warn/allowed-by-default-lint.stderr
index ac98b5896..ac98b5896 100644
--- a/src/test/ui/lint/force-warn/allowed-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/allowed-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/allowed-cli-deny-by-default-lint.rs b/tests/ui/lint/force-warn/allowed-cli-deny-by-default-lint.rs
index 257df13ef..257df13ef 100644
--- a/src/test/ui/lint/force-warn/allowed-cli-deny-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/allowed-cli-deny-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/allowed-cli-deny-by-default-lint.stderr b/tests/ui/lint/force-warn/allowed-cli-deny-by-default-lint.stderr
index 6a1fc76e1..6a1fc76e1 100644
--- a/src/test/ui/lint/force-warn/allowed-cli-deny-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/allowed-cli-deny-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/allowed-deny-by-default-lint.rs b/tests/ui/lint/force-warn/allowed-deny-by-default-lint.rs
index 0d4b468c2..0d4b468c2 100644
--- a/src/test/ui/lint/force-warn/allowed-deny-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/allowed-deny-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/allowed-deny-by-default-lint.stderr b/tests/ui/lint/force-warn/allowed-deny-by-default-lint.stderr
index 9ef53d47e..9ef53d47e 100644
--- a/src/test/ui/lint/force-warn/allowed-deny-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/allowed-deny-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/allowed-group-warn-by-default-lint.rs b/tests/ui/lint/force-warn/allowed-group-warn-by-default-lint.rs
index 631a8cb2f..631a8cb2f 100644
--- a/src/test/ui/lint/force-warn/allowed-group-warn-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/allowed-group-warn-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/allowed-group-warn-by-default-lint.stderr b/tests/ui/lint/force-warn/allowed-group-warn-by-default-lint.stderr
index 0f58953a5..0f58953a5 100644
--- a/src/test/ui/lint/force-warn/allowed-group-warn-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/allowed-group-warn-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/allowed-warn-by-default-lint.rs b/tests/ui/lint/force-warn/allowed-warn-by-default-lint.rs
index 06b372867..06b372867 100644
--- a/src/test/ui/lint/force-warn/allowed-warn-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/allowed-warn-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/allowed-warn-by-default-lint.stderr b/tests/ui/lint/force-warn/allowed-warn-by-default-lint.stderr
index a6634e212..a6634e212 100644
--- a/src/test/ui/lint/force-warn/allowed-warn-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/allowed-warn-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/cap-lints-allow.rs b/tests/ui/lint/force-warn/cap-lints-allow.rs
index fdba7f410..fdba7f410 100644
--- a/src/test/ui/lint/force-warn/cap-lints-allow.rs
+++ b/tests/ui/lint/force-warn/cap-lints-allow.rs
diff --git a/src/test/ui/lint/force-warn/cap-lints-allow.stderr b/tests/ui/lint/force-warn/cap-lints-allow.stderr
index 03a32fa6f..03a32fa6f 100644
--- a/src/test/ui/lint/force-warn/cap-lints-allow.stderr
+++ b/tests/ui/lint/force-warn/cap-lints-allow.stderr
diff --git a/src/test/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.rs b/tests/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.rs
index e65f156bf..e65f156bf 100644
--- a/src/test/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.stderr b/tests/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.stderr
index d1b764b34..d1b764b34 100644
--- a/src/test/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/deny-by-default-lint.rs b/tests/ui/lint/force-warn/deny-by-default-lint.rs
index c2e9377e9..c2e9377e9 100644
--- a/src/test/ui/lint/force-warn/deny-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/deny-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/deny-by-default-lint.stderr b/tests/ui/lint/force-warn/deny-by-default-lint.stderr
index c644d0fe7..c644d0fe7 100644
--- a/src/test/ui/lint/force-warn/deny-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/deny-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/lint-group-allow-warnings.rs b/tests/ui/lint/force-warn/lint-group-allow-warnings.rs
index 4b95f4d2d..4b95f4d2d 100644
--- a/src/test/ui/lint/force-warn/lint-group-allow-warnings.rs
+++ b/tests/ui/lint/force-warn/lint-group-allow-warnings.rs
diff --git a/src/test/ui/lint/force-warn/lint-group-allow-warnings.stderr b/tests/ui/lint/force-warn/lint-group-allow-warnings.stderr
index dc7b1b7b9..dc7b1b7b9 100644
--- a/src/test/ui/lint/force-warn/lint-group-allow-warnings.stderr
+++ b/tests/ui/lint/force-warn/lint-group-allow-warnings.stderr
diff --git a/src/test/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.rs b/tests/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.rs
index 7ad7462dd..7ad7462dd 100644
--- a/src/test/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.stderr b/tests/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.stderr
index e17630fd3..e17630fd3 100644
--- a/src/test/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/lint-group-allowed-lint-group.rs b/tests/ui/lint/force-warn/lint-group-allowed-lint-group.rs
index ee5a18c38..ee5a18c38 100644
--- a/src/test/ui/lint/force-warn/lint-group-allowed-lint-group.rs
+++ b/tests/ui/lint/force-warn/lint-group-allowed-lint-group.rs
diff --git a/src/test/ui/lint/force-warn/lint-group-allowed-lint-group.stderr b/tests/ui/lint/force-warn/lint-group-allowed-lint-group.stderr
index 72198541a..72198541a 100644
--- a/src/test/ui/lint/force-warn/lint-group-allowed-lint-group.stderr
+++ b/tests/ui/lint/force-warn/lint-group-allowed-lint-group.stderr
diff --git a/src/test/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.rs b/tests/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.rs
index 248aece6f..248aece6f 100644
--- a/src/test/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.stderr b/tests/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.stderr
index 52c870ac2..52c870ac2 100644
--- a/src/test/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/warn-by-default-lint-two-modules.rs b/tests/ui/lint/force-warn/warn-by-default-lint-two-modules.rs
index 47a480ad7..47a480ad7 100644
--- a/src/test/ui/lint/force-warn/warn-by-default-lint-two-modules.rs
+++ b/tests/ui/lint/force-warn/warn-by-default-lint-two-modules.rs
diff --git a/src/test/ui/lint/force-warn/warn-by-default-lint-two-modules.stderr b/tests/ui/lint/force-warn/warn-by-default-lint-two-modules.stderr
index 824bcccc0..824bcccc0 100644
--- a/src/test/ui/lint/force-warn/warn-by-default-lint-two-modules.stderr
+++ b/tests/ui/lint/force-warn/warn-by-default-lint-two-modules.stderr
diff --git a/src/test/ui/lint/force-warn/warnings-lint-group.rs b/tests/ui/lint/force-warn/warnings-lint-group.rs
index d1d4f5602..d1d4f5602 100644
--- a/src/test/ui/lint/force-warn/warnings-lint-group.rs
+++ b/tests/ui/lint/force-warn/warnings-lint-group.rs
diff --git a/src/test/ui/lint/force-warn/warnings-lint-group.stderr b/tests/ui/lint/force-warn/warnings-lint-group.stderr
index 1faeed337..1faeed337 100644
--- a/src/test/ui/lint/force-warn/warnings-lint-group.stderr
+++ b/tests/ui/lint/force-warn/warnings-lint-group.stderr
diff --git a/src/test/ui/lint/function-item-references.rs b/tests/ui/lint/function-item-references.rs
index 05213f4ed..05213f4ed 100644
--- a/src/test/ui/lint/function-item-references.rs
+++ b/tests/ui/lint/function-item-references.rs
diff --git a/src/test/ui/lint/function-item-references.stderr b/tests/ui/lint/function-item-references.stderr
index a9d18bb6a..a9d18bb6a 100644
--- a/src/test/ui/lint/function-item-references.stderr
+++ b/tests/ui/lint/function-item-references.stderr
diff --git a/src/test/ui/lint/future-incompat-test.rs b/tests/ui/lint/future-incompat-test.rs
index c5f477cc4..c5f477cc4 100644
--- a/src/test/ui/lint/future-incompat-test.rs
+++ b/tests/ui/lint/future-incompat-test.rs
diff --git a/src/test/ui/lint/future-incompat-test.stderr b/tests/ui/lint/future-incompat-test.stderr
index 52674a843..52674a843 100644
--- a/src/test/ui/lint/future-incompat-test.stderr
+++ b/tests/ui/lint/future-incompat-test.stderr
diff --git a/src/test/ui/lint/inclusive-range-pattern-syntax.fixed b/tests/ui/lint/inclusive-range-pattern-syntax.fixed
index bee5d4ae4..bee5d4ae4 100644
--- a/src/test/ui/lint/inclusive-range-pattern-syntax.fixed
+++ b/tests/ui/lint/inclusive-range-pattern-syntax.fixed
diff --git a/src/test/ui/lint/inclusive-range-pattern-syntax.rs b/tests/ui/lint/inclusive-range-pattern-syntax.rs
index d98c10c26..d98c10c26 100644
--- a/src/test/ui/lint/inclusive-range-pattern-syntax.rs
+++ b/tests/ui/lint/inclusive-range-pattern-syntax.rs
diff --git a/src/test/ui/lint/inclusive-range-pattern-syntax.stderr b/tests/ui/lint/inclusive-range-pattern-syntax.stderr
index ed9fa0d41..ed9fa0d41 100644
--- a/src/test/ui/lint/inclusive-range-pattern-syntax.stderr
+++ b/tests/ui/lint/inclusive-range-pattern-syntax.stderr
diff --git a/src/test/ui/lint/inert-attr-macro.rs b/tests/ui/lint/inert-attr-macro.rs
index dc0bb8ac2..dc0bb8ac2 100644
--- a/src/test/ui/lint/inert-attr-macro.rs
+++ b/tests/ui/lint/inert-attr-macro.rs
diff --git a/src/test/ui/lint/inert-attr-macro.stderr b/tests/ui/lint/inert-attr-macro.stderr
index 5ccb4ffe7..5ccb4ffe7 100644
--- a/src/test/ui/lint/inert-attr-macro.stderr
+++ b/tests/ui/lint/inert-attr-macro.stderr
diff --git a/src/test/ui/lint/inline-trait-and-foreign-items.rs b/tests/ui/lint/inline-trait-and-foreign-items.rs
index 13dab7ed9..13dab7ed9 100644
--- a/src/test/ui/lint/inline-trait-and-foreign-items.rs
+++ b/tests/ui/lint/inline-trait-and-foreign-items.rs
diff --git a/src/test/ui/lint/inline-trait-and-foreign-items.stderr b/tests/ui/lint/inline-trait-and-foreign-items.stderr
index 2f1fb4c46..2f1fb4c46 100644
--- a/src/test/ui/lint/inline-trait-and-foreign-items.stderr
+++ b/tests/ui/lint/inline-trait-and-foreign-items.stderr
diff --git a/src/test/ui/lint/invalid_value.rs b/tests/ui/lint/invalid_value.rs
index 57d8cbe7c..57d8cbe7c 100644
--- a/src/test/ui/lint/invalid_value.rs
+++ b/tests/ui/lint/invalid_value.rs
diff --git a/src/test/ui/lint/invalid_value.stderr b/tests/ui/lint/invalid_value.stderr
index 5370660d6..48fd4169d 100644
--- a/src/test/ui/lint/invalid_value.stderr
+++ b/tests/ui/lint/invalid_value.stderr
@@ -604,9 +604,6 @@ LL |         let _val: Result<i32, i32> = mem::uninitialized();
    |
 note: enums with multiple inhabited variants have to be initialized to a variant
   --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   | ^^^^^^^^^^^^^^^^^^^^^
 
 error: the type `&i32` does not permit zero-initialization
   --> $DIR/invalid_value.rs:152:34
diff --git a/src/test/ui/lint/issue-101284.rs b/tests/ui/lint/issue-101284.rs
index 1381d4f17..1381d4f17 100644
--- a/src/test/ui/lint/issue-101284.rs
+++ b/tests/ui/lint/issue-101284.rs
diff --git a/src/test/ui/lint/issue-102705.rs b/tests/ui/lint/issue-102705.rs
index 5bcc8950a..5bcc8950a 100644
--- a/src/test/ui/lint/issue-102705.rs
+++ b/tests/ui/lint/issue-102705.rs
diff --git a/src/test/ui/lint/issue-103317.fixed b/tests/ui/lint/issue-103317.fixed
index 5a987423e..5a987423e 100644
--- a/src/test/ui/lint/issue-103317.fixed
+++ b/tests/ui/lint/issue-103317.fixed
diff --git a/src/test/ui/lint/issue-103317.rs b/tests/ui/lint/issue-103317.rs
index c2ba939e1..c2ba939e1 100644
--- a/src/test/ui/lint/issue-103317.rs
+++ b/tests/ui/lint/issue-103317.rs
diff --git a/src/test/ui/lint/issue-103317.stderr b/tests/ui/lint/issue-103317.stderr
index 9c982ddc3..9c982ddc3 100644
--- a/src/test/ui/lint/issue-103317.stderr
+++ b/tests/ui/lint/issue-103317.stderr
diff --git a/src/test/ui/lint/issue-103435-extra-parentheses.fixed b/tests/ui/lint/issue-103435-extra-parentheses.fixed
index 2b01b414b..2b01b414b 100644
--- a/src/test/ui/lint/issue-103435-extra-parentheses.fixed
+++ b/tests/ui/lint/issue-103435-extra-parentheses.fixed
diff --git a/src/test/ui/lint/issue-103435-extra-parentheses.rs b/tests/ui/lint/issue-103435-extra-parentheses.rs
index 8261610cf..8261610cf 100644
--- a/src/test/ui/lint/issue-103435-extra-parentheses.rs
+++ b/tests/ui/lint/issue-103435-extra-parentheses.rs
diff --git a/src/test/ui/lint/issue-103435-extra-parentheses.stderr b/tests/ui/lint/issue-103435-extra-parentheses.stderr
index 29c41c910..29c41c910 100644
--- a/src/test/ui/lint/issue-103435-extra-parentheses.stderr
+++ b/tests/ui/lint/issue-103435-extra-parentheses.stderr
diff --git a/src/test/ui/lint/issue-104392.rs b/tests/ui/lint/issue-104392.rs
index d5608edb4..d5608edb4 100644
--- a/src/test/ui/lint/issue-104392.rs
+++ b/tests/ui/lint/issue-104392.rs
diff --git a/src/test/ui/lint/issue-104392.stderr b/tests/ui/lint/issue-104392.stderr
index 8e466439a..8e466439a 100644
--- a/src/test/ui/lint/issue-104392.stderr
+++ b/tests/ui/lint/issue-104392.stderr
diff --git a/src/test/ui/lint/issue-104897.rs b/tests/ui/lint/issue-104897.rs
index 5fbc658f1..5fbc658f1 100644
--- a/src/test/ui/lint/issue-104897.rs
+++ b/tests/ui/lint/issue-104897.rs
diff --git a/src/test/ui/lint/issue-104897.stderr b/tests/ui/lint/issue-104897.stderr
index 817a93c2f..817a93c2f 100644
--- a/src/test/ui/lint/issue-104897.stderr
+++ b/tests/ui/lint/issue-104897.stderr
diff --git a/tests/ui/lint/issue-108155.rs b/tests/ui/lint/issue-108155.rs
new file mode 100644
index 000000000..4ae0cbd92
--- /dev/null
+++ b/tests/ui/lint/issue-108155.rs
@@ -0,0 +1,15 @@
+// check-pass
+// check that `deref_into_dyn_supertrait` doesn't cause ICE by eagerly converting
+// a cancelled lint
+
+#![allow(deref_into_dyn_supertrait)]
+
+trait Trait {}
+impl std::ops::Deref for dyn Trait + Send + Sync {
+    type Target = dyn Trait;
+    fn deref(&self) -> &Self::Target {
+        self
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/lint/issue-14309.rs b/tests/ui/lint/issue-14309.rs
index 328a4c982..328a4c982 100644
--- a/src/test/ui/lint/issue-14309.rs
+++ b/tests/ui/lint/issue-14309.rs
diff --git a/src/test/ui/lint/issue-14309.stderr b/tests/ui/lint/issue-14309.stderr
index 9ce62a6b8..9ce62a6b8 100644
--- a/src/test/ui/lint/issue-14309.stderr
+++ b/tests/ui/lint/issue-14309.stderr
diff --git a/src/test/ui/lint/issue-14837.rs b/tests/ui/lint/issue-14837.rs
index a83bc4150..a83bc4150 100644
--- a/src/test/ui/lint/issue-14837.rs
+++ b/tests/ui/lint/issue-14837.rs
diff --git a/src/test/ui/lint/issue-17718-const-naming.rs b/tests/ui/lint/issue-17718-const-naming.rs
index d7f0e7276..d7f0e7276 100644
--- a/src/test/ui/lint/issue-17718-const-naming.rs
+++ b/tests/ui/lint/issue-17718-const-naming.rs
diff --git a/src/test/ui/lint/issue-17718-const-naming.stderr b/tests/ui/lint/issue-17718-const-naming.stderr
index 7d2aadd5f..7d2aadd5f 100644
--- a/src/test/ui/lint/issue-17718-const-naming.stderr
+++ b/tests/ui/lint/issue-17718-const-naming.stderr
diff --git a/src/test/ui/lint/issue-1866.rs b/tests/ui/lint/issue-1866.rs
index caac0c504..caac0c504 100644
--- a/src/test/ui/lint/issue-1866.rs
+++ b/tests/ui/lint/issue-1866.rs
diff --git a/src/test/ui/lint/issue-1866.stderr b/tests/ui/lint/issue-1866.stderr
index d19a13496..d19a13496 100644
--- a/src/test/ui/lint/issue-1866.stderr
+++ b/tests/ui/lint/issue-1866.stderr
diff --git a/src/test/ui/lint/issue-20343.rs b/tests/ui/lint/issue-20343.rs
index 000b63984..000b63984 100644
--- a/src/test/ui/lint/issue-20343.rs
+++ b/tests/ui/lint/issue-20343.rs
diff --git a/src/test/ui/lint/issue-30302.rs b/tests/ui/lint/issue-30302.rs
index c37d4f29d..5eccb8cd5 100644
--- a/src/test/ui/lint/issue-30302.rs
+++ b/tests/ui/lint/issue-30302.rs
@@ -11,7 +11,7 @@ enum Stack<T> {
 fn is_empty<T>(s: Stack<T>) -> bool {
     match s {
         Nil => true,
-//~^ WARN pattern binding `Nil` is named the same as one of the variants of the type `Stack`
+//~^ ERROR pattern binding `Nil` is named the same as one of the variants of the type `Stack`
         _ => false
 //~^ ERROR unreachable pattern
     }
diff --git a/tests/ui/lint/issue-30302.stderr b/tests/ui/lint/issue-30302.stderr
new file mode 100644
index 000000000..baf6c0d7a
--- /dev/null
+++ b/tests/ui/lint/issue-30302.stderr
@@ -0,0 +1,26 @@
+error[E0170]: pattern binding `Nil` is named the same as one of the variants of the type `Stack`
+  --> $DIR/issue-30302.rs:13:9
+   |
+LL |         Nil => true,
+   |         ^^^ help: to match on the variant, qualify the path: `Stack::Nil`
+   |
+   = note: `#[deny(bindings_with_variant_name)]` on by default
+
+error: unreachable pattern
+  --> $DIR/issue-30302.rs:15:9
+   |
+LL |         Nil => true,
+   |         --- matches any value
+LL |
+LL |         _ => false
+   |         ^ unreachable pattern
+   |
+note: the lint level is defined here
+  --> $DIR/issue-30302.rs:4:9
+   |
+LL | #![deny(unreachable_patterns)]
+   |         ^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0170`.
diff --git a/src/test/ui/lint/issue-31924-non-snake-ffi.rs b/tests/ui/lint/issue-31924-non-snake-ffi.rs
index 5b9faca49..5b9faca49 100644
--- a/src/test/ui/lint/issue-31924-non-snake-ffi.rs
+++ b/tests/ui/lint/issue-31924-non-snake-ffi.rs
diff --git a/src/test/ui/lint/issue-34798.rs b/tests/ui/lint/issue-34798.rs
index f0d710123..f0d710123 100644
--- a/src/test/ui/lint/issue-34798.rs
+++ b/tests/ui/lint/issue-34798.rs
diff --git a/src/test/ui/lint/issue-35075.rs b/tests/ui/lint/issue-35075.rs
index 0e54131c2..0e54131c2 100644
--- a/src/test/ui/lint/issue-35075.rs
+++ b/tests/ui/lint/issue-35075.rs
diff --git a/src/test/ui/lint/issue-35075.stderr b/tests/ui/lint/issue-35075.stderr
index 08bdaa728..08bdaa728 100644
--- a/src/test/ui/lint/issue-35075.stderr
+++ b/tests/ui/lint/issue-35075.stderr
diff --git a/src/test/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs b/tests/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs
index 0a951cfa9..0a951cfa9 100644
--- a/src/test/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs
+++ b/tests/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs
diff --git a/src/test/ui/lint/issue-54099-camel-case-underscore-types.rs b/tests/ui/lint/issue-54099-camel-case-underscore-types.rs
index b2bf87358..b2bf87358 100644
--- a/src/test/ui/lint/issue-54099-camel-case-underscore-types.rs
+++ b/tests/ui/lint/issue-54099-camel-case-underscore-types.rs
diff --git a/src/test/ui/lint/issue-57410-1.rs b/tests/ui/lint/issue-57410-1.rs
index d825cb180..d825cb180 100644
--- a/src/test/ui/lint/issue-57410-1.rs
+++ b/tests/ui/lint/issue-57410-1.rs
diff --git a/src/test/ui/lint/issue-57410.rs b/tests/ui/lint/issue-57410.rs
index 0cf4b8068..0cf4b8068 100644
--- a/src/test/ui/lint/issue-57410.rs
+++ b/tests/ui/lint/issue-57410.rs
diff --git a/src/test/ui/lint/issue-63364.rs b/tests/ui/lint/issue-63364.rs
index 5223267a6..5223267a6 100644
--- a/src/test/ui/lint/issue-63364.rs
+++ b/tests/ui/lint/issue-63364.rs
diff --git a/src/test/ui/lint/issue-63364.stderr b/tests/ui/lint/issue-63364.stderr
index 9b5453fa8..9b5453fa8 100644
--- a/src/test/ui/lint/issue-63364.stderr
+++ b/tests/ui/lint/issue-63364.stderr
diff --git a/src/test/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.rs b/tests/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.rs
index c2b81959f..c2b81959f 100644
--- a/src/test/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.rs
+++ b/tests/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.rs
diff --git a/src/test/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.stderr b/tests/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.stderr
index 09dc3640f..09dc3640f 100644
--- a/src/test/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.stderr
+++ b/tests/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.stderr
diff --git a/src/test/ui/lint/issue-70819-dont-override-forbid-in-same-scope.rs b/tests/ui/lint/issue-70819-dont-override-forbid-in-same-scope.rs
index b4fc33174..b4fc33174 100644
--- a/src/test/ui/lint/issue-70819-dont-override-forbid-in-same-scope.rs
+++ b/tests/ui/lint/issue-70819-dont-override-forbid-in-same-scope.rs
diff --git a/src/test/ui/lint/issue-70819-dont-override-forbid-in-same-scope.stderr b/tests/ui/lint/issue-70819-dont-override-forbid-in-same-scope.stderr
index cc44f8aa5..cc44f8aa5 100644
--- a/src/test/ui/lint/issue-70819-dont-override-forbid-in-same-scope.stderr
+++ b/tests/ui/lint/issue-70819-dont-override-forbid-in-same-scope.stderr
diff --git a/src/test/ui/lint/issue-79546-fuel-ice.rs b/tests/ui/lint/issue-79546-fuel-ice.rs
index 0e9f54088..0e9f54088 100644
--- a/src/test/ui/lint/issue-79546-fuel-ice.rs
+++ b/tests/ui/lint/issue-79546-fuel-ice.rs
diff --git a/src/test/ui/lint/issue-79744.rs b/tests/ui/lint/issue-79744.rs
index e9725a027..e9725a027 100644
--- a/src/test/ui/lint/issue-79744.rs
+++ b/tests/ui/lint/issue-79744.rs
diff --git a/src/test/ui/lint/issue-79744.stderr b/tests/ui/lint/issue-79744.stderr
index c1b56250d..c1b56250d 100644
--- a/src/test/ui/lint/issue-79744.stderr
+++ b/tests/ui/lint/issue-79744.stderr
diff --git a/src/test/ui/lint/issue-80988.rs b/tests/ui/lint/issue-80988.rs
index 1e116206f..1e116206f 100644
--- a/src/test/ui/lint/issue-80988.rs
+++ b/tests/ui/lint/issue-80988.rs
diff --git a/src/test/ui/lint/issue-80988.stderr b/tests/ui/lint/issue-80988.stderr
index 73e27ffda..73e27ffda 100644
--- a/src/test/ui/lint/issue-80988.stderr
+++ b/tests/ui/lint/issue-80988.stderr
diff --git a/src/test/ui/lint/issue-81218.rs b/tests/ui/lint/issue-81218.rs
index f02aa9040..f02aa9040 100644
--- a/src/test/ui/lint/issue-81218.rs
+++ b/tests/ui/lint/issue-81218.rs
diff --git a/src/test/ui/lint/issue-83477.rs b/tests/ui/lint/issue-83477.rs
index 4262a2879..4262a2879 100644
--- a/src/test/ui/lint/issue-83477.rs
+++ b/tests/ui/lint/issue-83477.rs
diff --git a/src/test/ui/lint/issue-83477.stderr b/tests/ui/lint/issue-83477.stderr
index f824fc09e..f824fc09e 100644
--- a/src/test/ui/lint/issue-83477.stderr
+++ b/tests/ui/lint/issue-83477.stderr
diff --git a/src/test/ui/lint/issue-86600-lint-twice.rs b/tests/ui/lint/issue-86600-lint-twice.rs
index 0e8a837d9..0e8a837d9 100644
--- a/src/test/ui/lint/issue-86600-lint-twice.rs
+++ b/tests/ui/lint/issue-86600-lint-twice.rs
diff --git a/src/test/ui/lint/issue-86600-lint-twice.stderr b/tests/ui/lint/issue-86600-lint-twice.stderr
index 5a65c6121..5a65c6121 100644
--- a/src/test/ui/lint/issue-86600-lint-twice.stderr
+++ b/tests/ui/lint/issue-86600-lint-twice.stderr
diff --git a/src/test/ui/lint/issue-87274-paren-parent.rs b/tests/ui/lint/issue-87274-paren-parent.rs
index 0141c5a25..0141c5a25 100644
--- a/src/test/ui/lint/issue-87274-paren-parent.rs
+++ b/tests/ui/lint/issue-87274-paren-parent.rs
diff --git a/src/test/ui/lint/issue-87274-paren-parent.stderr b/tests/ui/lint/issue-87274-paren-parent.stderr
index f06024298..f06024298 100644
--- a/src/test/ui/lint/issue-87274-paren-parent.stderr
+++ b/tests/ui/lint/issue-87274-paren-parent.stderr
diff --git a/src/test/ui/lint/issue-89469.rs b/tests/ui/lint/issue-89469.rs
index 3a6ab4528..3a6ab4528 100644
--- a/src/test/ui/lint/issue-89469.rs
+++ b/tests/ui/lint/issue-89469.rs
diff --git a/src/test/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs b/tests/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs
index 425e2703c..425e2703c 100644
--- a/src/test/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs
+++ b/tests/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs
diff --git a/src/test/ui/lint/issue-97094.rs b/tests/ui/lint/issue-97094.rs
index 22525ca11..22525ca11 100644
--- a/src/test/ui/lint/issue-97094.rs
+++ b/tests/ui/lint/issue-97094.rs
diff --git a/src/test/ui/lint/issue-97094.stderr b/tests/ui/lint/issue-97094.stderr
index 1a0a3eaf2..1a0a3eaf2 100644
--- a/src/test/ui/lint/issue-97094.stderr
+++ b/tests/ui/lint/issue-97094.stderr
diff --git a/src/test/ui/lint/issue-99387.rs b/tests/ui/lint/issue-99387.rs
index 616eb935e..616eb935e 100644
--- a/src/test/ui/lint/issue-99387.rs
+++ b/tests/ui/lint/issue-99387.rs
diff --git a/src/test/ui/lint/known-tool-in-submodule/root.rs b/tests/ui/lint/known-tool-in-submodule/root.rs
index 80806dcbd..80806dcbd 100644
--- a/src/test/ui/lint/known-tool-in-submodule/root.rs
+++ b/tests/ui/lint/known-tool-in-submodule/root.rs
diff --git a/src/test/ui/lint/known-tool-in-submodule/submodule.rs b/tests/ui/lint/known-tool-in-submodule/submodule.rs
index bb25e1005..bb25e1005 100644
--- a/src/test/ui/lint/known-tool-in-submodule/submodule.rs
+++ b/tests/ui/lint/known-tool-in-submodule/submodule.rs
diff --git a/src/test/ui/lint/let_underscore/let_underscore_drop.rs b/tests/ui/lint/let_underscore/let_underscore_drop.rs
index f298871f1..f298871f1 100644
--- a/src/test/ui/lint/let_underscore/let_underscore_drop.rs
+++ b/tests/ui/lint/let_underscore/let_underscore_drop.rs
diff --git a/src/test/ui/lint/let_underscore/let_underscore_drop.stderr b/tests/ui/lint/let_underscore/let_underscore_drop.stderr
index 7b7de202e..7b7de202e 100644
--- a/src/test/ui/lint/let_underscore/let_underscore_drop.stderr
+++ b/tests/ui/lint/let_underscore/let_underscore_drop.stderr
diff --git a/src/test/ui/lint/let_underscore/let_underscore_lock.rs b/tests/ui/lint/let_underscore/let_underscore_lock.rs
index 7423862cd..7423862cd 100644
--- a/src/test/ui/lint/let_underscore/let_underscore_lock.rs
+++ b/tests/ui/lint/let_underscore/let_underscore_lock.rs
diff --git a/src/test/ui/lint/let_underscore/let_underscore_lock.stderr b/tests/ui/lint/let_underscore/let_underscore_lock.stderr
index fb58af0a4..fb58af0a4 100644
--- a/src/test/ui/lint/let_underscore/let_underscore_lock.stderr
+++ b/tests/ui/lint/let_underscore/let_underscore_lock.stderr
diff --git a/src/test/ui/lint/lint-attr-everywhere-early.rs b/tests/ui/lint/lint-attr-everywhere-early.rs
index fd0c4b43e..fd0c4b43e 100644
--- a/src/test/ui/lint/lint-attr-everywhere-early.rs
+++ b/tests/ui/lint/lint-attr-everywhere-early.rs
diff --git a/src/test/ui/lint/lint-attr-everywhere-early.stderr b/tests/ui/lint/lint-attr-everywhere-early.stderr
index d6c6d5fae..d6c6d5fae 100644
--- a/src/test/ui/lint/lint-attr-everywhere-early.stderr
+++ b/tests/ui/lint/lint-attr-everywhere-early.stderr
diff --git a/src/test/ui/lint/lint-attr-everywhere-late.rs b/tests/ui/lint/lint-attr-everywhere-late.rs
index 1055157d6..1055157d6 100644
--- a/src/test/ui/lint/lint-attr-everywhere-late.rs
+++ b/tests/ui/lint/lint-attr-everywhere-late.rs
diff --git a/src/test/ui/lint/lint-attr-everywhere-late.stderr b/tests/ui/lint/lint-attr-everywhere-late.stderr
index a69c2e0ef..a69c2e0ef 100644
--- a/src/test/ui/lint/lint-attr-everywhere-late.stderr
+++ b/tests/ui/lint/lint-attr-everywhere-late.stderr
diff --git a/src/test/ui/lint/lint-attr-non-item-node.rs b/tests/ui/lint/lint-attr-non-item-node.rs
index 3f05e83a7..3f05e83a7 100644
--- a/src/test/ui/lint/lint-attr-non-item-node.rs
+++ b/tests/ui/lint/lint-attr-non-item-node.rs
diff --git a/src/test/ui/lint/lint-attr-non-item-node.stderr b/tests/ui/lint/lint-attr-non-item-node.stderr
index 583579140..583579140 100644
--- a/src/test/ui/lint/lint-attr-non-item-node.stderr
+++ b/tests/ui/lint/lint-attr-non-item-node.stderr
diff --git a/src/test/ui/lint/lint-cap.rs b/tests/ui/lint/lint-cap.rs
index 461b923cc..461b923cc 100644
--- a/src/test/ui/lint/lint-cap.rs
+++ b/tests/ui/lint/lint-cap.rs
diff --git a/src/test/ui/lint/lint-change-warnings.rs b/tests/ui/lint/lint-change-warnings.rs
index 37af3b761..37af3b761 100644
--- a/src/test/ui/lint/lint-change-warnings.rs
+++ b/tests/ui/lint/lint-change-warnings.rs
diff --git a/src/test/ui/lint/lint-change-warnings.stderr b/tests/ui/lint/lint-change-warnings.stderr
index 3fd5283aa..3fd5283aa 100644
--- a/src/test/ui/lint/lint-change-warnings.stderr
+++ b/tests/ui/lint/lint-change-warnings.stderr
diff --git a/src/test/ui/lint/lint-const-item-mutation.rs b/tests/ui/lint/lint-const-item-mutation.rs
index 4bf5e0a9e..4bf5e0a9e 100644
--- a/src/test/ui/lint/lint-const-item-mutation.rs
+++ b/tests/ui/lint/lint-const-item-mutation.rs
diff --git a/src/test/ui/lint/lint-const-item-mutation.stderr b/tests/ui/lint/lint-const-item-mutation.stderr
index 9f4360e67..747c38b80 100644
--- a/src/test/ui/lint/lint-const-item-mutation.stderr
+++ b/tests/ui/lint/lint-const-item-mutation.stderr
@@ -108,9 +108,6 @@ LL |     VEC.push(0);
    = note: the mutable reference will refer to this temporary, not the original `const` item
 note: mutable reference created due to call to this method
   --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-   |
-LL |     pub fn push(&mut self, value: T) {
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: `const` item defined here
   --> $DIR/lint-const-item-mutation.rs:31:1
    |
diff --git a/src/test/ui/lint/lint-ctypes-66202.rs b/tests/ui/lint/lint-ctypes-66202.rs
index ebab41d14..ebab41d14 100644
--- a/src/test/ui/lint/lint-ctypes-66202.rs
+++ b/tests/ui/lint/lint-ctypes-66202.rs
diff --git a/src/test/ui/lint/lint-ctypes-73249-1.rs b/tests/ui/lint/lint-ctypes-73249-1.rs
index cf416c3fe..cf416c3fe 100644
--- a/src/test/ui/lint/lint-ctypes-73249-1.rs
+++ b/tests/ui/lint/lint-ctypes-73249-1.rs
diff --git a/src/test/ui/lint/lint-ctypes-73249-2.rs b/tests/ui/lint/lint-ctypes-73249-2.rs
index 691047c8a..691047c8a 100644
--- a/src/test/ui/lint/lint-ctypes-73249-2.rs
+++ b/tests/ui/lint/lint-ctypes-73249-2.rs
diff --git a/src/test/ui/lint/lint-ctypes-73249-2.stderr b/tests/ui/lint/lint-ctypes-73249-2.stderr
index 8073c33dd..8073c33dd 100644
--- a/src/test/ui/lint/lint-ctypes-73249-2.stderr
+++ b/tests/ui/lint/lint-ctypes-73249-2.stderr
diff --git a/src/test/ui/lint/lint-ctypes-73249-3.rs b/tests/ui/lint/lint-ctypes-73249-3.rs
index ef8ab7e03..ef8ab7e03 100644
--- a/src/test/ui/lint/lint-ctypes-73249-3.rs
+++ b/tests/ui/lint/lint-ctypes-73249-3.rs
diff --git a/src/test/ui/lint/lint-ctypes-73249-3.stderr b/tests/ui/lint/lint-ctypes-73249-3.stderr
index c41ce666d..c41ce666d 100644
--- a/src/test/ui/lint/lint-ctypes-73249-3.stderr
+++ b/tests/ui/lint/lint-ctypes-73249-3.stderr
diff --git a/src/test/ui/lint/lint-ctypes-73249-4.rs b/tests/ui/lint/lint-ctypes-73249-4.rs
index 6c72bd691..6c72bd691 100644
--- a/src/test/ui/lint/lint-ctypes-73249-4.rs
+++ b/tests/ui/lint/lint-ctypes-73249-4.rs
diff --git a/src/test/ui/lint/lint-ctypes-73249-5.rs b/tests/ui/lint/lint-ctypes-73249-5.rs
index 083fb6c5f..083fb6c5f 100644
--- a/src/test/ui/lint/lint-ctypes-73249-5.rs
+++ b/tests/ui/lint/lint-ctypes-73249-5.rs
diff --git a/src/test/ui/lint/lint-ctypes-73249-5.stderr b/tests/ui/lint/lint-ctypes-73249-5.stderr
index 98245c4f1..98245c4f1 100644
--- a/src/test/ui/lint/lint-ctypes-73249-5.stderr
+++ b/tests/ui/lint/lint-ctypes-73249-5.stderr
diff --git a/src/test/ui/lint/lint-ctypes-73249.rs b/tests/ui/lint/lint-ctypes-73249.rs
index 5b48fa9b7..5b48fa9b7 100644
--- a/src/test/ui/lint/lint-ctypes-73249.rs
+++ b/tests/ui/lint/lint-ctypes-73249.rs
diff --git a/src/test/ui/lint/lint-ctypes-73251-1.rs b/tests/ui/lint/lint-ctypes-73251-1.rs
index 145ba784f..145ba784f 100644
--- a/src/test/ui/lint/lint-ctypes-73251-1.rs
+++ b/tests/ui/lint/lint-ctypes-73251-1.rs
diff --git a/src/test/ui/lint/lint-ctypes-73251-1.stderr b/tests/ui/lint/lint-ctypes-73251-1.stderr
index 9f43576ad..9f43576ad 100644
--- a/src/test/ui/lint/lint-ctypes-73251-1.stderr
+++ b/tests/ui/lint/lint-ctypes-73251-1.stderr
diff --git a/src/test/ui/lint/lint-ctypes-73251-2.rs b/tests/ui/lint/lint-ctypes-73251-2.rs
index df71a9457..df71a9457 100644
--- a/src/test/ui/lint/lint-ctypes-73251-2.rs
+++ b/tests/ui/lint/lint-ctypes-73251-2.rs
diff --git a/src/test/ui/lint/lint-ctypes-73251-2.stderr b/tests/ui/lint/lint-ctypes-73251-2.stderr
index 0b3de379c..0b3de379c 100644
--- a/src/test/ui/lint/lint-ctypes-73251-2.stderr
+++ b/tests/ui/lint/lint-ctypes-73251-2.stderr
diff --git a/src/test/ui/lint/lint-ctypes-73251.rs b/tests/ui/lint/lint-ctypes-73251.rs
index ebc2ca77b..ebc2ca77b 100644
--- a/src/test/ui/lint/lint-ctypes-73251.rs
+++ b/tests/ui/lint/lint-ctypes-73251.rs
diff --git a/src/test/ui/lint/lint-ctypes-73747.rs b/tests/ui/lint/lint-ctypes-73747.rs
index 293ffd5c2..293ffd5c2 100644
--- a/src/test/ui/lint/lint-ctypes-73747.rs
+++ b/tests/ui/lint/lint-ctypes-73747.rs
diff --git a/src/test/ui/lint/lint-ctypes-enum.rs b/tests/ui/lint/lint-ctypes-enum.rs
index 7c2060805..7c2060805 100644
--- a/src/test/ui/lint/lint-ctypes-enum.rs
+++ b/tests/ui/lint/lint-ctypes-enum.rs
diff --git a/src/test/ui/lint/lint-ctypes-enum.stderr b/tests/ui/lint/lint-ctypes-enum.stderr
index 8554e2617..8554e2617 100644
--- a/src/test/ui/lint/lint-ctypes-enum.stderr
+++ b/tests/ui/lint/lint-ctypes-enum.stderr
diff --git a/src/test/ui/lint/lint-ctypes-fn.rs b/tests/ui/lint/lint-ctypes-fn.rs
index d3b36a9d5..d3b36a9d5 100644
--- a/src/test/ui/lint/lint-ctypes-fn.rs
+++ b/tests/ui/lint/lint-ctypes-fn.rs
diff --git a/src/test/ui/lint/lint-ctypes-fn.stderr b/tests/ui/lint/lint-ctypes-fn.stderr
index a05206bf1..a05206bf1 100644
--- a/src/test/ui/lint/lint-ctypes-fn.stderr
+++ b/tests/ui/lint/lint-ctypes-fn.stderr
diff --git a/src/test/ui/lint/lint-ctypes.rs b/tests/ui/lint/lint-ctypes.rs
index 9165e14b7..9165e14b7 100644
--- a/src/test/ui/lint/lint-ctypes.rs
+++ b/tests/ui/lint/lint-ctypes.rs
diff --git a/src/test/ui/lint/lint-ctypes.stderr b/tests/ui/lint/lint-ctypes.stderr
index 121ad0ce8..121ad0ce8 100644
--- a/src/test/ui/lint/lint-ctypes.stderr
+++ b/tests/ui/lint/lint-ctypes.stderr
diff --git a/src/test/ui/lint/lint-deref-nullptr.rs b/tests/ui/lint/lint-deref-nullptr.rs
index d052dbd9b..d052dbd9b 100644
--- a/src/test/ui/lint/lint-deref-nullptr.rs
+++ b/tests/ui/lint/lint-deref-nullptr.rs
diff --git a/src/test/ui/lint/lint-deref-nullptr.stderr b/tests/ui/lint/lint-deref-nullptr.stderr
index c6f432e4e..c6f432e4e 100644
--- a/src/test/ui/lint/lint-deref-nullptr.stderr
+++ b/tests/ui/lint/lint-deref-nullptr.stderr
diff --git a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.rs b/tests/ui/lint/lint-directives-on-use-items-issue-10534.rs
index e5cb0d3df..e5cb0d3df 100644
--- a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.rs
+++ b/tests/ui/lint/lint-directives-on-use-items-issue-10534.rs
diff --git a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr b/tests/ui/lint/lint-directives-on-use-items-issue-10534.stderr
index ccb139e0e..ccb139e0e 100644
--- a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr
+++ b/tests/ui/lint/lint-directives-on-use-items-issue-10534.stderr
diff --git a/src/test/ui/lint/lint-enum-intrinsics-non-enums.rs b/tests/ui/lint/lint-enum-intrinsics-non-enums.rs
index 8ad337064..8ad337064 100644
--- a/src/test/ui/lint/lint-enum-intrinsics-non-enums.rs
+++ b/tests/ui/lint/lint-enum-intrinsics-non-enums.rs
diff --git a/src/test/ui/lint/lint-enum-intrinsics-non-enums.stderr b/tests/ui/lint/lint-enum-intrinsics-non-enums.stderr
index 63ed2503c..63ed2503c 100644
--- a/src/test/ui/lint/lint-enum-intrinsics-non-enums.stderr
+++ b/tests/ui/lint/lint-enum-intrinsics-non-enums.stderr
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.noopt.stderr b/tests/ui/lint/lint-exceeding-bitshifts.noopt.stderr
index 3a84c6c1f..3a84c6c1f 100644
--- a/src/test/ui/lint/lint-exceeding-bitshifts.noopt.stderr
+++ b/tests/ui/lint/lint-exceeding-bitshifts.noopt.stderr
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.opt.stderr b/tests/ui/lint/lint-exceeding-bitshifts.opt.stderr
index 3a84c6c1f..3a84c6c1f 100644
--- a/src/test/ui/lint/lint-exceeding-bitshifts.opt.stderr
+++ b/tests/ui/lint/lint-exceeding-bitshifts.opt.stderr
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.opt_with_overflow_checks.stderr b/tests/ui/lint/lint-exceeding-bitshifts.opt_with_overflow_checks.stderr
index 3a84c6c1f..3a84c6c1f 100644
--- a/src/test/ui/lint/lint-exceeding-bitshifts.opt_with_overflow_checks.stderr
+++ b/tests/ui/lint/lint-exceeding-bitshifts.opt_with_overflow_checks.stderr
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.rs b/tests/ui/lint/lint-exceeding-bitshifts.rs
index 048c1aff8..048c1aff8 100644
--- a/src/test/ui/lint/lint-exceeding-bitshifts.rs
+++ b/tests/ui/lint/lint-exceeding-bitshifts.rs
diff --git a/src/test/ui/lint/lint-expr-stmt-attrs-for-early-lints.rs b/tests/ui/lint/lint-expr-stmt-attrs-for-early-lints.rs
index 07a32904a..07a32904a 100644
--- a/src/test/ui/lint/lint-expr-stmt-attrs-for-early-lints.rs
+++ b/tests/ui/lint/lint-expr-stmt-attrs-for-early-lints.rs
diff --git a/tests/ui/lint/lint-ffi-safety-all-phantom.rs b/tests/ui/lint/lint-ffi-safety-all-phantom.rs
new file mode 100644
index 000000000..7419d3458
--- /dev/null
+++ b/tests/ui/lint/lint-ffi-safety-all-phantom.rs
@@ -0,0 +1,22 @@
+// This is a regression test for issue https://github.com/rust-lang/rust/issues/106629.
+// It ensures that transparent types where all fields are PhantomData are marked as
+// FFI-safe.
+
+// check-pass
+
+#[repr(transparent)]
+#[derive(Copy, Clone)]
+struct MyPhantom(core::marker::PhantomData<u8>);
+
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct Bar {
+    pub x: i32,
+    _marker: MyPhantom,
+}
+
+extern "C" {
+    pub fn foo(bar: *mut Bar);
+}
+
+fn main() {}
diff --git a/src/test/ui/lint/lint-forbid-attr.rs b/tests/ui/lint/lint-forbid-attr.rs
index 6d4cfd834..6d4cfd834 100644
--- a/src/test/ui/lint/lint-forbid-attr.rs
+++ b/tests/ui/lint/lint-forbid-attr.rs
diff --git a/src/test/ui/lint/lint-forbid-attr.stderr b/tests/ui/lint/lint-forbid-attr.stderr
index 5977b9c94..5977b9c94 100644
--- a/src/test/ui/lint/lint-forbid-attr.stderr
+++ b/tests/ui/lint/lint-forbid-attr.stderr
diff --git a/src/test/ui/lint/lint-forbid-cmdline.rs b/tests/ui/lint/lint-forbid-cmdline.rs
index 5246ccb57..5246ccb57 100644
--- a/src/test/ui/lint/lint-forbid-cmdline.rs
+++ b/tests/ui/lint/lint-forbid-cmdline.rs
diff --git a/src/test/ui/lint/lint-forbid-cmdline.stderr b/tests/ui/lint/lint-forbid-cmdline.stderr
index 0a92e58c0..0a92e58c0 100644
--- a/src/test/ui/lint/lint-forbid-cmdline.stderr
+++ b/tests/ui/lint/lint-forbid-cmdline.stderr
diff --git a/src/test/ui/lint/lint-forbid-internal-unsafe.rs b/tests/ui/lint/lint-forbid-internal-unsafe.rs
index 3ee55ba96..3ee55ba96 100644
--- a/src/test/ui/lint/lint-forbid-internal-unsafe.rs
+++ b/tests/ui/lint/lint-forbid-internal-unsafe.rs
diff --git a/src/test/ui/lint/lint-forbid-internal-unsafe.stderr b/tests/ui/lint/lint-forbid-internal-unsafe.stderr
index ba425ceb4..ba425ceb4 100644
--- a/src/test/ui/lint/lint-forbid-internal-unsafe.stderr
+++ b/tests/ui/lint/lint-forbid-internal-unsafe.stderr
diff --git a/src/test/ui/lint/lint-group-nonstandard-style.rs b/tests/ui/lint/lint-group-nonstandard-style.rs
index bd7f327bc..bd7f327bc 100644
--- a/src/test/ui/lint/lint-group-nonstandard-style.rs
+++ b/tests/ui/lint/lint-group-nonstandard-style.rs
diff --git a/src/test/ui/lint/lint-group-nonstandard-style.stderr b/tests/ui/lint/lint-group-nonstandard-style.stderr
index fcd010123..fcd010123 100644
--- a/src/test/ui/lint/lint-group-nonstandard-style.stderr
+++ b/tests/ui/lint/lint-group-nonstandard-style.stderr
diff --git a/src/test/ui/lint/lint-impl-fn.rs b/tests/ui/lint/lint-impl-fn.rs
index 46874d95c..46874d95c 100644
--- a/src/test/ui/lint/lint-impl-fn.rs
+++ b/tests/ui/lint/lint-impl-fn.rs
diff --git a/src/test/ui/lint/lint-impl-fn.stderr b/tests/ui/lint/lint-impl-fn.stderr
index 24ec9c7e4..24ec9c7e4 100644
--- a/src/test/ui/lint/lint-impl-fn.stderr
+++ b/tests/ui/lint/lint-impl-fn.stderr
diff --git a/src/test/ui/lint/lint-incoherent-auto-trait-objects.rs b/tests/ui/lint/lint-incoherent-auto-trait-objects.rs
index d53b51447..d53b51447 100644
--- a/src/test/ui/lint/lint-incoherent-auto-trait-objects.rs
+++ b/tests/ui/lint/lint-incoherent-auto-trait-objects.rs
diff --git a/src/test/ui/lint/lint-incoherent-auto-trait-objects.stderr b/tests/ui/lint/lint-incoherent-auto-trait-objects.stderr
index 553ab3869..553ab3869 100644
--- a/src/test/ui/lint/lint-incoherent-auto-trait-objects.stderr
+++ b/tests/ui/lint/lint-incoherent-auto-trait-objects.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-bool.rs b/tests/ui/lint/lint-invalid-atomic-ordering-bool.rs
index 15ceb6195..15ceb6195 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-bool.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-bool.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-bool.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-bool.stderr
index 9f38dcb0b..9f38dcb0b 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-bool.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-bool.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange-weak.rs b/tests/ui/lint/lint-invalid-atomic-ordering-exchange-weak.rs
index 63204c725..63204c725 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange-weak.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-exchange-weak.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange-weak.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-exchange-weak.stderr
index cc075ce9e..cc075ce9e 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange-weak.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-exchange-weak.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange.rs b/tests/ui/lint/lint-invalid-atomic-ordering-exchange.rs
index 488d268ee..488d268ee 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-exchange.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-exchange.stderr
index fe6c7e55c..fe6c7e55c 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-exchange.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-false-positive.rs b/tests/ui/lint/lint-invalid-atomic-ordering-false-positive.rs
index 4fb8605b4..4fb8605b4 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-false-positive.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-false-positive.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-fence.rs b/tests/ui/lint/lint-invalid-atomic-ordering-fence.rs
index 22034472c..22034472c 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-fence.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-fence.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-fence.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-fence.stderr
index 38327d607..38327d607 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-fence.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-fence.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-fetch-update.rs b/tests/ui/lint/lint-invalid-atomic-ordering-fetch-update.rs
index 734b63324..734b63324 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-fetch-update.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-fetch-update.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-fetch-update.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-fetch-update.stderr
index 33829d68f..33829d68f 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-fetch-update.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-fetch-update.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-int.rs b/tests/ui/lint/lint-invalid-atomic-ordering-int.rs
index 462c9670f..462c9670f 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-int.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-int.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-int.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-int.stderr
index 36930e2f4..36930e2f4 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-int.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-int.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-ptr.rs b/tests/ui/lint/lint-invalid-atomic-ordering-ptr.rs
index 984f7edeb..984f7edeb 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-ptr.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-ptr.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-ptr.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-ptr.stderr
index 12f4cad90..12f4cad90 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-ptr.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-ptr.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-uint.rs b/tests/ui/lint/lint-invalid-atomic-ordering-uint.rs
index 80ec3b9ee..80ec3b9ee 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-uint.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-uint.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-uint.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-uint.stderr
index d26621f2a..d26621f2a 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-uint.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-uint.stderr
diff --git a/src/test/ui/lint/lint-level-macro-def-mod.rs b/tests/ui/lint/lint-level-macro-def-mod.rs
index 79f7d1206..79f7d1206 100644
--- a/src/test/ui/lint/lint-level-macro-def-mod.rs
+++ b/tests/ui/lint/lint-level-macro-def-mod.rs
diff --git a/src/test/ui/lint/lint-level-macro-def.rs b/tests/ui/lint/lint-level-macro-def.rs
index 720f4b453..720f4b453 100644
--- a/src/test/ui/lint/lint-level-macro-def.rs
+++ b/tests/ui/lint/lint-level-macro-def.rs
diff --git a/src/test/ui/lint/lint-lowercase-static-const-pattern-rename.rs b/tests/ui/lint/lint-lowercase-static-const-pattern-rename.rs
index d085db43a..d085db43a 100644
--- a/src/test/ui/lint/lint-lowercase-static-const-pattern-rename.rs
+++ b/tests/ui/lint/lint-lowercase-static-const-pattern-rename.rs
diff --git a/src/test/ui/lint/lint-lowercase-static-const-pattern.rs b/tests/ui/lint/lint-lowercase-static-const-pattern.rs
index c2e159eec..c2e159eec 100644
--- a/src/test/ui/lint/lint-lowercase-static-const-pattern.rs
+++ b/tests/ui/lint/lint-lowercase-static-const-pattern.rs
diff --git a/src/test/ui/lint/lint-lowercase-static-const-pattern.stderr b/tests/ui/lint/lint-lowercase-static-const-pattern.stderr
index 8780fac05..8780fac05 100644
--- a/src/test/ui/lint/lint-lowercase-static-const-pattern.stderr
+++ b/tests/ui/lint/lint-lowercase-static-const-pattern.stderr
diff --git a/src/test/ui/lint/lint-malformed.rs b/tests/ui/lint/lint-malformed.rs
index 188e702f9..188e702f9 100644
--- a/src/test/ui/lint/lint-malformed.rs
+++ b/tests/ui/lint/lint-malformed.rs
diff --git a/src/test/ui/lint/lint-malformed.stderr b/tests/ui/lint/lint-malformed.stderr
index 91b4e509b..91b4e509b 100644
--- a/src/test/ui/lint/lint-malformed.stderr
+++ b/tests/ui/lint/lint-malformed.stderr
diff --git a/src/test/ui/lint/lint-match-arms.rs b/tests/ui/lint/lint-match-arms.rs
index 5c2ccc60e..5c2ccc60e 100644
--- a/src/test/ui/lint/lint-match-arms.rs
+++ b/tests/ui/lint/lint-match-arms.rs
diff --git a/src/test/ui/lint/lint-match-arms.stderr b/tests/ui/lint/lint-match-arms.stderr
index 1bc0e41fd..1bc0e41fd 100644
--- a/src/test/ui/lint/lint-match-arms.stderr
+++ b/tests/ui/lint/lint-match-arms.stderr
diff --git a/src/test/ui/lint/lint-misplaced-attr.rs b/tests/ui/lint/lint-misplaced-attr.rs
index d06917ea3..d06917ea3 100644
--- a/src/test/ui/lint/lint-misplaced-attr.rs
+++ b/tests/ui/lint/lint-misplaced-attr.rs
diff --git a/src/test/ui/lint/lint-misplaced-attr.stderr b/tests/ui/lint/lint-misplaced-attr.stderr
index abaf4620e..abaf4620e 100644
--- a/src/test/ui/lint/lint-misplaced-attr.stderr
+++ b/tests/ui/lint/lint-misplaced-attr.stderr
diff --git a/tests/ui/lint/lint-missing-copy-implementations-allow.rs b/tests/ui/lint/lint-missing-copy-implementations-allow.rs
new file mode 100644
index 000000000..051a905ae
--- /dev/null
+++ b/tests/ui/lint/lint-missing-copy-implementations-allow.rs
@@ -0,0 +1,35 @@
+// check-pass
+#![deny(missing_copy_implementations)]
+
+// Don't recommend implementing Copy on something stateful like an iterator.
+pub struct MyIterator {
+    num: u8,
+}
+
+impl Iterator for MyIterator {
+    type Item = u8;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        todo!()
+    }
+}
+
+pub struct Handle {
+    inner: *mut (),
+}
+
+pub struct Handle2 {
+    inner: *const (),
+}
+
+pub enum MaybeHandle {
+    Ptr(*mut ()),
+}
+
+pub union UnionHandle {
+    ptr: *mut (),
+}
+
+pub struct Array([u8; 2048]);
+
+fn main() {}
diff --git a/src/test/ui/lint/lint-missing-copy-implementations.rs b/tests/ui/lint/lint-missing-copy-implementations.rs
index 918f40de1..918f40de1 100644
--- a/src/test/ui/lint/lint-missing-copy-implementations.rs
+++ b/tests/ui/lint/lint-missing-copy-implementations.rs
diff --git a/src/test/ui/lint/lint-missing-copy-implementations.stderr b/tests/ui/lint/lint-missing-copy-implementations.stderr
index e5f5ce20d..e5f5ce20d 100644
--- a/src/test/ui/lint/lint-missing-copy-implementations.stderr
+++ b/tests/ui/lint/lint-missing-copy-implementations.stderr
diff --git a/src/test/ui/lint/lint-missing-doc.rs b/tests/ui/lint/lint-missing-doc.rs
index 229725791..229725791 100644
--- a/src/test/ui/lint/lint-missing-doc.rs
+++ b/tests/ui/lint/lint-missing-doc.rs
diff --git a/src/test/ui/lint/lint-missing-doc.stderr b/tests/ui/lint/lint-missing-doc.stderr
index d68472d4b..d68472d4b 100644
--- a/src/test/ui/lint/lint-missing-doc.stderr
+++ b/tests/ui/lint/lint-missing-doc.stderr
diff --git a/src/test/ui/lint/lint-non-camel-case-types.rs b/tests/ui/lint/lint-non-camel-case-types.rs
index acd5c5df9..acd5c5df9 100644
--- a/src/test/ui/lint/lint-non-camel-case-types.rs
+++ b/tests/ui/lint/lint-non-camel-case-types.rs
diff --git a/src/test/ui/lint/lint-non-camel-case-types.stderr b/tests/ui/lint/lint-non-camel-case-types.stderr
index 875380b5d..875380b5d 100644
--- a/src/test/ui/lint/lint-non-camel-case-types.stderr
+++ b/tests/ui/lint/lint-non-camel-case-types.stderr
diff --git a/src/test/ui/lint/lint-non-camel-case-variant.rs b/tests/ui/lint/lint-non-camel-case-variant.rs
index 2b1a52f25..2b1a52f25 100644
--- a/src/test/ui/lint/lint-non-camel-case-variant.rs
+++ b/tests/ui/lint/lint-non-camel-case-variant.rs
diff --git a/src/test/ui/lint/lint-non-camel-case-with-trailing-underscores.rs b/tests/ui/lint/lint-non-camel-case-with-trailing-underscores.rs
index b832e4bcd..b832e4bcd 100644
--- a/src/test/ui/lint/lint-non-camel-case-with-trailing-underscores.rs
+++ b/tests/ui/lint/lint-non-camel-case-with-trailing-underscores.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-crate-2.rs b/tests/ui/lint/lint-non-snake-case-crate-2.rs
index 1b763a9d8..1b763a9d8 100644
--- a/src/test/ui/lint/lint-non-snake-case-crate-2.rs
+++ b/tests/ui/lint/lint-non-snake-case-crate-2.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-crate-2.stderr b/tests/ui/lint/lint-non-snake-case-crate-2.stderr
index 4b42145bb..4b42145bb 100644
--- a/src/test/ui/lint/lint-non-snake-case-crate-2.stderr
+++ b/tests/ui/lint/lint-non-snake-case-crate-2.stderr
diff --git a/src/test/ui/lint/lint-non-snake-case-crate.rs b/tests/ui/lint/lint-non-snake-case-crate.rs
index e4e84261a..e4e84261a 100644
--- a/src/test/ui/lint/lint-non-snake-case-crate.rs
+++ b/tests/ui/lint/lint-non-snake-case-crate.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-crate.stderr b/tests/ui/lint/lint-non-snake-case-crate.stderr
index da6b89c1e..da6b89c1e 100644
--- a/src/test/ui/lint/lint-non-snake-case-crate.stderr
+++ b/tests/ui/lint/lint-non-snake-case-crate.stderr
diff --git a/src/test/ui/lint/lint-non-snake-case-functions.rs b/tests/ui/lint/lint-non-snake-case-functions.rs
index fa64a9f98..fa64a9f98 100644
--- a/src/test/ui/lint/lint-non-snake-case-functions.rs
+++ b/tests/ui/lint/lint-non-snake-case-functions.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-functions.stderr b/tests/ui/lint/lint-non-snake-case-functions.stderr
index f6ac6b99b..f6ac6b99b 100644
--- a/src/test/ui/lint/lint-non-snake-case-functions.stderr
+++ b/tests/ui/lint/lint-non-snake-case-functions.stderr
diff --git a/src/test/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.rs b/tests/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.rs
index 8cc4f976a..8cc4f976a 100644
--- a/src/test/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.rs
+++ b/tests/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.stderr b/tests/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.stderr
index 2841815ec..2841815ec 100644
--- a/src/test/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.stderr
+++ b/tests/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.stderr
diff --git a/src/test/ui/lint/lint-non-snake-case-lifetimes.rs b/tests/ui/lint/lint-non-snake-case-lifetimes.rs
index de76d2dbe..de76d2dbe 100644
--- a/src/test/ui/lint/lint-non-snake-case-lifetimes.rs
+++ b/tests/ui/lint/lint-non-snake-case-lifetimes.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-lifetimes.stderr b/tests/ui/lint/lint-non-snake-case-lifetimes.stderr
index d4fe26a43..d4fe26a43 100644
--- a/src/test/ui/lint/lint-non-snake-case-lifetimes.stderr
+++ b/tests/ui/lint/lint-non-snake-case-lifetimes.stderr
diff --git a/src/test/ui/lint/lint-non-snake-case-modules.rs b/tests/ui/lint/lint-non-snake-case-modules.rs
index 73f123321..73f123321 100644
--- a/src/test/ui/lint/lint-non-snake-case-modules.rs
+++ b/tests/ui/lint/lint-non-snake-case-modules.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-modules.stderr b/tests/ui/lint/lint-non-snake-case-modules.stderr
index c8b997c87..c8b997c87 100644
--- a/src/test/ui/lint/lint-non-snake-case-modules.stderr
+++ b/tests/ui/lint/lint-non-snake-case-modules.stderr
diff --git a/src/test/ui/lint/lint-non-snake-case-no-lowercase-equivalent.rs b/tests/ui/lint/lint-non-snake-case-no-lowercase-equivalent.rs
index 9f0c87dca..9f0c87dca 100644
--- a/src/test/ui/lint/lint-non-snake-case-no-lowercase-equivalent.rs
+++ b/tests/ui/lint/lint-non-snake-case-no-lowercase-equivalent.rs
diff --git a/src/test/ui/lint/lint-non-uppercase-associated-const.rs b/tests/ui/lint/lint-non-uppercase-associated-const.rs
index 7b0d93960..7b0d93960 100644
--- a/src/test/ui/lint/lint-non-uppercase-associated-const.rs
+++ b/tests/ui/lint/lint-non-uppercase-associated-const.rs
diff --git a/src/test/ui/lint/lint-non-uppercase-associated-const.stderr b/tests/ui/lint/lint-non-uppercase-associated-const.stderr
index 411ff51aa..411ff51aa 100644
--- a/src/test/ui/lint/lint-non-uppercase-associated-const.stderr
+++ b/tests/ui/lint/lint-non-uppercase-associated-const.stderr
diff --git a/src/test/ui/lint/lint-non-uppercase-statics.rs b/tests/ui/lint/lint-non-uppercase-statics.rs
index 5bd143032..5bd143032 100644
--- a/src/test/ui/lint/lint-non-uppercase-statics.rs
+++ b/tests/ui/lint/lint-non-uppercase-statics.rs
diff --git a/src/test/ui/lint/lint-non-uppercase-statics.stderr b/tests/ui/lint/lint-non-uppercase-statics.stderr
index c6fd0a6e0..c6fd0a6e0 100644
--- a/src/test/ui/lint/lint-non-uppercase-statics.stderr
+++ b/tests/ui/lint/lint-non-uppercase-statics.stderr
diff --git a/src/test/ui/lint/lint-nonstandard-style-unicode-1.rs b/tests/ui/lint/lint-nonstandard-style-unicode-1.rs
index 7c45c0993..7c45c0993 100644
--- a/src/test/ui/lint/lint-nonstandard-style-unicode-1.rs
+++ b/tests/ui/lint/lint-nonstandard-style-unicode-1.rs
diff --git a/src/test/ui/lint/lint-nonstandard-style-unicode-1.stderr b/tests/ui/lint/lint-nonstandard-style-unicode-1.stderr
index 6c2aa225e..6c2aa225e 100644
--- a/src/test/ui/lint/lint-nonstandard-style-unicode-1.stderr
+++ b/tests/ui/lint/lint-nonstandard-style-unicode-1.stderr
diff --git a/src/test/ui/lint/lint-nonstandard-style-unicode-2.rs b/tests/ui/lint/lint-nonstandard-style-unicode-2.rs
index 9690be590..9690be590 100644
--- a/src/test/ui/lint/lint-nonstandard-style-unicode-2.rs
+++ b/tests/ui/lint/lint-nonstandard-style-unicode-2.rs
diff --git a/src/test/ui/lint/lint-nonstandard-style-unicode-2.stderr b/tests/ui/lint/lint-nonstandard-style-unicode-2.stderr
index 8eb0654e0..8eb0654e0 100644
--- a/src/test/ui/lint/lint-nonstandard-style-unicode-2.stderr
+++ b/tests/ui/lint/lint-nonstandard-style-unicode-2.stderr
diff --git a/src/test/ui/lint/lint-nonstandard-style-unicode-3.rs b/tests/ui/lint/lint-nonstandard-style-unicode-3.rs
index 9175be7a0..9175be7a0 100644
--- a/src/test/ui/lint/lint-nonstandard-style-unicode-3.rs
+++ b/tests/ui/lint/lint-nonstandard-style-unicode-3.rs
diff --git a/src/test/ui/lint/lint-nonstandard-style-unicode-3.stderr b/tests/ui/lint/lint-nonstandard-style-unicode-3.stderr
index 970e6b838..970e6b838 100644
--- a/src/test/ui/lint/lint-nonstandard-style-unicode-3.stderr
+++ b/tests/ui/lint/lint-nonstandard-style-unicode-3.stderr
diff --git a/src/test/ui/lint/lint-output-format-2.rs b/tests/ui/lint/lint-output-format-2.rs
index 985166e09..985166e09 100644
--- a/src/test/ui/lint/lint-output-format-2.rs
+++ b/tests/ui/lint/lint-output-format-2.rs
diff --git a/src/test/ui/lint/lint-output-format-2.stderr b/tests/ui/lint/lint-output-format-2.stderr
index a36dbd61f..a36dbd61f 100644
--- a/src/test/ui/lint/lint-output-format-2.stderr
+++ b/tests/ui/lint/lint-output-format-2.stderr
diff --git a/src/test/ui/lint/lint-output-format.rs b/tests/ui/lint/lint-output-format.rs
index 67e8ec8f1..67e8ec8f1 100644
--- a/src/test/ui/lint/lint-output-format.rs
+++ b/tests/ui/lint/lint-output-format.rs
diff --git a/src/test/ui/lint/lint-output-format.stderr b/tests/ui/lint/lint-output-format.stderr
index 0db79a156..0db79a156 100644
--- a/src/test/ui/lint/lint-output-format.stderr
+++ b/tests/ui/lint/lint-output-format.stderr
diff --git a/src/test/ui/lint/lint-owned-heap-memory.rs b/tests/ui/lint/lint-owned-heap-memory.rs
index af47d5c07..af47d5c07 100644
--- a/src/test/ui/lint/lint-owned-heap-memory.rs
+++ b/tests/ui/lint/lint-owned-heap-memory.rs
diff --git a/src/test/ui/lint/lint-owned-heap-memory.stderr b/tests/ui/lint/lint-owned-heap-memory.stderr
index 5ba396970..5ba396970 100644
--- a/src/test/ui/lint/lint-owned-heap-memory.stderr
+++ b/tests/ui/lint/lint-owned-heap-memory.stderr
diff --git a/src/test/ui/lint/lint-pre-expansion-extern-module.rs b/tests/ui/lint/lint-pre-expansion-extern-module.rs
index 30e2ed8b7..30e2ed8b7 100644
--- a/src/test/ui/lint/lint-pre-expansion-extern-module.rs
+++ b/tests/ui/lint/lint-pre-expansion-extern-module.rs
diff --git a/src/test/ui/lint/lint-pre-expansion-extern-module.stderr b/tests/ui/lint/lint-pre-expansion-extern-module.stderr
index ce3e8806a..ce3e8806a 100644
--- a/src/test/ui/lint/lint-pre-expansion-extern-module.stderr
+++ b/tests/ui/lint/lint-pre-expansion-extern-module.stderr
diff --git a/src/test/ui/lint/lint-pub-unreachable-for-nested-glob.rs b/tests/ui/lint/lint-pub-unreachable-for-nested-glob.rs
index 2df6d08e7..2df6d08e7 100644
--- a/src/test/ui/lint/lint-pub-unreachable-for-nested-glob.rs
+++ b/tests/ui/lint/lint-pub-unreachable-for-nested-glob.rs
diff --git a/src/test/ui/lint/lint-qualification.rs b/tests/ui/lint/lint-qualification.rs
index 0cace0ca0..0cace0ca0 100644
--- a/src/test/ui/lint/lint-qualification.rs
+++ b/tests/ui/lint/lint-qualification.rs
diff --git a/src/test/ui/lint/lint-qualification.stderr b/tests/ui/lint/lint-qualification.stderr
index 149a782d9..149a782d9 100644
--- a/src/test/ui/lint/lint-qualification.stderr
+++ b/tests/ui/lint/lint-qualification.stderr
diff --git a/src/test/ui/lint/lint-range-endpoint-overflow.rs b/tests/ui/lint/lint-range-endpoint-overflow.rs
index 7034d56aa..7034d56aa 100644
--- a/src/test/ui/lint/lint-range-endpoint-overflow.rs
+++ b/tests/ui/lint/lint-range-endpoint-overflow.rs
diff --git a/src/test/ui/lint/lint-range-endpoint-overflow.stderr b/tests/ui/lint/lint-range-endpoint-overflow.stderr
index d2df73727..d2df73727 100644
--- a/src/test/ui/lint/lint-range-endpoint-overflow.stderr
+++ b/tests/ui/lint/lint-range-endpoint-overflow.stderr
diff --git a/src/test/ui/lint/lint-removed-allow.rs b/tests/ui/lint/lint-removed-allow.rs
index 30ba4f02f..30ba4f02f 100644
--- a/src/test/ui/lint/lint-removed-allow.rs
+++ b/tests/ui/lint/lint-removed-allow.rs
diff --git a/src/test/ui/lint/lint-removed-allow.stderr b/tests/ui/lint/lint-removed-allow.stderr
index 029334c2e..029334c2e 100644
--- a/src/test/ui/lint/lint-removed-allow.stderr
+++ b/tests/ui/lint/lint-removed-allow.stderr
diff --git a/src/test/ui/lint/lint-removed-cmdline.rs b/tests/ui/lint/lint-removed-cmdline.rs
index 462beabb9..462beabb9 100644
--- a/src/test/ui/lint/lint-removed-cmdline.rs
+++ b/tests/ui/lint/lint-removed-cmdline.rs
diff --git a/src/test/ui/lint/lint-removed-cmdline.stderr b/tests/ui/lint/lint-removed-cmdline.stderr
index 9be532ef2..9be532ef2 100644
--- a/src/test/ui/lint/lint-removed-cmdline.stderr
+++ b/tests/ui/lint/lint-removed-cmdline.stderr
diff --git a/src/test/ui/lint/lint-removed.rs b/tests/ui/lint/lint-removed.rs
index 92f4372c2..92f4372c2 100644
--- a/src/test/ui/lint/lint-removed.rs
+++ b/tests/ui/lint/lint-removed.rs
diff --git a/src/test/ui/lint/lint-removed.stderr b/tests/ui/lint/lint-removed.stderr
index dc0515b84..dc0515b84 100644
--- a/src/test/ui/lint/lint-removed.stderr
+++ b/tests/ui/lint/lint-removed.stderr
diff --git a/src/test/ui/lint/lint-renamed-allow.rs b/tests/ui/lint/lint-renamed-allow.rs
index 9cf6f329c..9cf6f329c 100644
--- a/src/test/ui/lint/lint-renamed-allow.rs
+++ b/tests/ui/lint/lint-renamed-allow.rs
diff --git a/src/test/ui/lint/lint-renamed-allow.stderr b/tests/ui/lint/lint-renamed-allow.stderr
index 46f6a10de..46f6a10de 100644
--- a/src/test/ui/lint/lint-renamed-allow.stderr
+++ b/tests/ui/lint/lint-renamed-allow.stderr
diff --git a/src/test/ui/lint/lint-renamed-cmdline.rs b/tests/ui/lint/lint-renamed-cmdline.rs
index c873771e3..c873771e3 100644
--- a/src/test/ui/lint/lint-renamed-cmdline.rs
+++ b/tests/ui/lint/lint-renamed-cmdline.rs
diff --git a/src/test/ui/lint/lint-renamed-cmdline.stderr b/tests/ui/lint/lint-renamed-cmdline.stderr
index 8dfd61ac9..8dfd61ac9 100644
--- a/src/test/ui/lint/lint-renamed-cmdline.stderr
+++ b/tests/ui/lint/lint-renamed-cmdline.stderr
diff --git a/src/test/ui/lint/lint-renamed.rs b/tests/ui/lint/lint-renamed.rs
index ca3299430..ca3299430 100644
--- a/src/test/ui/lint/lint-renamed.rs
+++ b/tests/ui/lint/lint-renamed.rs
diff --git a/src/test/ui/lint/lint-renamed.stderr b/tests/ui/lint/lint-renamed.stderr
index 984254571..984254571 100644
--- a/src/test/ui/lint/lint-renamed.stderr
+++ b/tests/ui/lint/lint-renamed.stderr
diff --git a/src/test/ui/lint/lint-shorthand-field.fixed b/tests/ui/lint/lint-shorthand-field.fixed
index 7cd5717bc..7cd5717bc 100644
--- a/src/test/ui/lint/lint-shorthand-field.fixed
+++ b/tests/ui/lint/lint-shorthand-field.fixed
diff --git a/src/test/ui/lint/lint-shorthand-field.rs b/tests/ui/lint/lint-shorthand-field.rs
index 22de9c325..22de9c325 100644
--- a/src/test/ui/lint/lint-shorthand-field.rs
+++ b/tests/ui/lint/lint-shorthand-field.rs
diff --git a/src/test/ui/lint/lint-shorthand-field.stderr b/tests/ui/lint/lint-shorthand-field.stderr
index 2d1ca30f9..2d1ca30f9 100644
--- a/src/test/ui/lint/lint-shorthand-field.stderr
+++ b/tests/ui/lint/lint-shorthand-field.stderr
diff --git a/src/test/ui/lint/lint-stability-2.rs b/tests/ui/lint/lint-stability-2.rs
index 94a8d08c8..94a8d08c8 100644
--- a/src/test/ui/lint/lint-stability-2.rs
+++ b/tests/ui/lint/lint-stability-2.rs
diff --git a/src/test/ui/lint/lint-stability-2.stderr b/tests/ui/lint/lint-stability-2.stderr
index 5b7537fa2..5b7537fa2 100644
--- a/src/test/ui/lint/lint-stability-2.stderr
+++ b/tests/ui/lint/lint-stability-2.stderr
diff --git a/src/test/ui/lint/lint-stability-deprecated.rs b/tests/ui/lint/lint-stability-deprecated.rs
index 74c35083e..74c35083e 100644
--- a/src/test/ui/lint/lint-stability-deprecated.rs
+++ b/tests/ui/lint/lint-stability-deprecated.rs
diff --git a/src/test/ui/lint/lint-stability-deprecated.stderr b/tests/ui/lint/lint-stability-deprecated.stderr
index 9f1e7b281..9f1e7b281 100644
--- a/src/test/ui/lint/lint-stability-deprecated.stderr
+++ b/tests/ui/lint/lint-stability-deprecated.stderr
diff --git a/src/test/ui/lint/lint-stability-fields-deprecated.rs b/tests/ui/lint/lint-stability-fields-deprecated.rs
index a5511966d..a5511966d 100644
--- a/src/test/ui/lint/lint-stability-fields-deprecated.rs
+++ b/tests/ui/lint/lint-stability-fields-deprecated.rs
diff --git a/src/test/ui/lint/lint-stability-fields-deprecated.stderr b/tests/ui/lint/lint-stability-fields-deprecated.stderr
index 2d8326020..2d8326020 100644
--- a/src/test/ui/lint/lint-stability-fields-deprecated.stderr
+++ b/tests/ui/lint/lint-stability-fields-deprecated.stderr
diff --git a/src/test/ui/lint/lint-stability-fields.rs b/tests/ui/lint/lint-stability-fields.rs
index 51990b6ee..51990b6ee 100644
--- a/src/test/ui/lint/lint-stability-fields.rs
+++ b/tests/ui/lint/lint-stability-fields.rs
diff --git a/src/test/ui/lint/lint-stability-fields.stderr b/tests/ui/lint/lint-stability-fields.stderr
index 3d2e73c1e..3d2e73c1e 100644
--- a/src/test/ui/lint/lint-stability-fields.stderr
+++ b/tests/ui/lint/lint-stability-fields.stderr
diff --git a/src/test/ui/lint/lint-stability.rs b/tests/ui/lint/lint-stability.rs
index d0f0e9f80..d0f0e9f80 100644
--- a/src/test/ui/lint/lint-stability.rs
+++ b/tests/ui/lint/lint-stability.rs
diff --git a/src/test/ui/lint/lint-stability.stderr b/tests/ui/lint/lint-stability.stderr
index bd1a57dc4..bd1a57dc4 100644
--- a/src/test/ui/lint/lint-stability.stderr
+++ b/tests/ui/lint/lint-stability.stderr
diff --git a/src/test/ui/lint/lint-stability2.rs b/tests/ui/lint/lint-stability2.rs
index 9ae23dac6..9ae23dac6 100644
--- a/src/test/ui/lint/lint-stability2.rs
+++ b/tests/ui/lint/lint-stability2.rs
diff --git a/src/test/ui/lint/lint-stability2.stderr b/tests/ui/lint/lint-stability2.stderr
index 51bdf84a3..51bdf84a3 100644
--- a/src/test/ui/lint/lint-stability2.stderr
+++ b/tests/ui/lint/lint-stability2.stderr
diff --git a/src/test/ui/lint/lint-stability3.rs b/tests/ui/lint/lint-stability3.rs
index 4452846ec..4452846ec 100644
--- a/src/test/ui/lint/lint-stability3.rs
+++ b/tests/ui/lint/lint-stability3.rs
diff --git a/src/test/ui/lint/lint-stability3.stderr b/tests/ui/lint/lint-stability3.stderr
index 3bbb60dd3..3bbb60dd3 100644
--- a/src/test/ui/lint/lint-stability3.stderr
+++ b/tests/ui/lint/lint-stability3.stderr
diff --git a/src/test/ui/lint/lint-strict-provenance-fuzzy-casts.rs b/tests/ui/lint/lint-strict-provenance-fuzzy-casts.rs
index d2d72a68f..d2d72a68f 100644
--- a/src/test/ui/lint/lint-strict-provenance-fuzzy-casts.rs
+++ b/tests/ui/lint/lint-strict-provenance-fuzzy-casts.rs
diff --git a/src/test/ui/lint/lint-strict-provenance-fuzzy-casts.stderr b/tests/ui/lint/lint-strict-provenance-fuzzy-casts.stderr
index 383623b48..383623b48 100644
--- a/src/test/ui/lint/lint-strict-provenance-fuzzy-casts.stderr
+++ b/tests/ui/lint/lint-strict-provenance-fuzzy-casts.stderr
diff --git a/src/test/ui/lint/lint-strict-provenance-lossy-casts.rs b/tests/ui/lint/lint-strict-provenance-lossy-casts.rs
index 9799a0537..9799a0537 100644
--- a/src/test/ui/lint/lint-strict-provenance-lossy-casts.rs
+++ b/tests/ui/lint/lint-strict-provenance-lossy-casts.rs
diff --git a/src/test/ui/lint/lint-strict-provenance-lossy-casts.stderr b/tests/ui/lint/lint-strict-provenance-lossy-casts.stderr
index aa151fe2d..aa151fe2d 100644
--- a/src/test/ui/lint/lint-strict-provenance-lossy-casts.stderr
+++ b/tests/ui/lint/lint-strict-provenance-lossy-casts.stderr
diff --git a/src/test/ui/lint/lint-temporary-cstring-as-param.rs b/tests/ui/lint/lint-temporary-cstring-as-param.rs
index 9f5805367..9f5805367 100644
--- a/src/test/ui/lint/lint-temporary-cstring-as-param.rs
+++ b/tests/ui/lint/lint-temporary-cstring-as-param.rs
diff --git a/src/test/ui/lint/lint-temporary-cstring-as-param.stderr b/tests/ui/lint/lint-temporary-cstring-as-param.stderr
index 838b3bc13..838b3bc13 100644
--- a/src/test/ui/lint/lint-temporary-cstring-as-param.stderr
+++ b/tests/ui/lint/lint-temporary-cstring-as-param.stderr
diff --git a/src/test/ui/lint/lint-temporary-cstring-as-ptr.rs b/tests/ui/lint/lint-temporary-cstring-as-ptr.rs
index 7aa4f2e1e..7aa4f2e1e 100644
--- a/src/test/ui/lint/lint-temporary-cstring-as-ptr.rs
+++ b/tests/ui/lint/lint-temporary-cstring-as-ptr.rs
diff --git a/src/test/ui/lint/lint-temporary-cstring-as-ptr.stderr b/tests/ui/lint/lint-temporary-cstring-as-ptr.stderr
index 79ef57dd1..79ef57dd1 100644
--- a/src/test/ui/lint/lint-temporary-cstring-as-ptr.stderr
+++ b/tests/ui/lint/lint-temporary-cstring-as-ptr.stderr
diff --git a/src/test/ui/lint/lint-type-limits.rs b/tests/ui/lint/lint-type-limits.rs
index 2b140f869..2b140f869 100644
--- a/src/test/ui/lint/lint-type-limits.rs
+++ b/tests/ui/lint/lint-type-limits.rs
diff --git a/src/test/ui/lint/lint-type-limits.stderr b/tests/ui/lint/lint-type-limits.stderr
index 71a2b3bfd..71a2b3bfd 100644
--- a/src/test/ui/lint/lint-type-limits.stderr
+++ b/tests/ui/lint/lint-type-limits.stderr
diff --git a/src/test/ui/lint/lint-type-limits2.rs b/tests/ui/lint/lint-type-limits2.rs
index 3f90119cd..3f90119cd 100644
--- a/src/test/ui/lint/lint-type-limits2.rs
+++ b/tests/ui/lint/lint-type-limits2.rs
diff --git a/src/test/ui/lint/lint-type-limits2.stderr b/tests/ui/lint/lint-type-limits2.stderr
index b3420ad8a..b3420ad8a 100644
--- a/src/test/ui/lint/lint-type-limits2.stderr
+++ b/tests/ui/lint/lint-type-limits2.stderr
diff --git a/src/test/ui/lint/lint-type-limits3.rs b/tests/ui/lint/lint-type-limits3.rs
index ceecf9ab3..ceecf9ab3 100644
--- a/src/test/ui/lint/lint-type-limits3.rs
+++ b/tests/ui/lint/lint-type-limits3.rs
diff --git a/src/test/ui/lint/lint-type-limits3.stderr b/tests/ui/lint/lint-type-limits3.stderr
index db46e7ae7..db46e7ae7 100644
--- a/src/test/ui/lint/lint-type-limits3.stderr
+++ b/tests/ui/lint/lint-type-limits3.stderr
diff --git a/src/test/ui/lint/lint-type-overflow.rs b/tests/ui/lint/lint-type-overflow.rs
index 9672da6d3..9672da6d3 100644
--- a/src/test/ui/lint/lint-type-overflow.rs
+++ b/tests/ui/lint/lint-type-overflow.rs
diff --git a/src/test/ui/lint/lint-type-overflow.stderr b/tests/ui/lint/lint-type-overflow.stderr
index 48d8228b8..48d8228b8 100644
--- a/src/test/ui/lint/lint-type-overflow.stderr
+++ b/tests/ui/lint/lint-type-overflow.stderr
diff --git a/src/test/ui/lint/lint-type-overflow2.rs b/tests/ui/lint/lint-type-overflow2.rs
index 9b1eb510b..9b1eb510b 100644
--- a/src/test/ui/lint/lint-type-overflow2.rs
+++ b/tests/ui/lint/lint-type-overflow2.rs
diff --git a/src/test/ui/lint/lint-type-overflow2.stderr b/tests/ui/lint/lint-type-overflow2.stderr
index eb593d062..eb593d062 100644
--- a/src/test/ui/lint/lint-type-overflow2.stderr
+++ b/tests/ui/lint/lint-type-overflow2.stderr
diff --git a/src/test/ui/lint/lint-unconditional-recursion.rs b/tests/ui/lint/lint-unconditional-recursion.rs
index ad052d36f..ad052d36f 100644
--- a/src/test/ui/lint/lint-unconditional-recursion.rs
+++ b/tests/ui/lint/lint-unconditional-recursion.rs
diff --git a/src/test/ui/lint/lint-unconditional-recursion.stderr b/tests/ui/lint/lint-unconditional-recursion.stderr
index 9d200a789..9d200a789 100644
--- a/src/test/ui/lint/lint-unconditional-recursion.stderr
+++ b/tests/ui/lint/lint-unconditional-recursion.stderr
diff --git a/src/test/ui/lint/lint-unexported-no-mangle.rs b/tests/ui/lint/lint-unexported-no-mangle.rs
index f260fc323..f260fc323 100644
--- a/src/test/ui/lint/lint-unexported-no-mangle.rs
+++ b/tests/ui/lint/lint-unexported-no-mangle.rs
diff --git a/src/test/ui/lint/lint-unexported-no-mangle.stderr b/tests/ui/lint/lint-unexported-no-mangle.stderr
index a11ee769c..a11ee769c 100644
--- a/src/test/ui/lint/lint-unexported-no-mangle.stderr
+++ b/tests/ui/lint/lint-unexported-no-mangle.stderr
diff --git a/src/test/ui/lint/lint-unknown-feature-default.rs b/tests/ui/lint/lint-unknown-feature-default.rs
index 84a2e5a4b..84a2e5a4b 100644
--- a/src/test/ui/lint/lint-unknown-feature-default.rs
+++ b/tests/ui/lint/lint-unknown-feature-default.rs
diff --git a/src/test/ui/lint/lint-unknown-feature.rs b/tests/ui/lint/lint-unknown-feature.rs
index 1af8d4ff8..1af8d4ff8 100644
--- a/src/test/ui/lint/lint-unknown-feature.rs
+++ b/tests/ui/lint/lint-unknown-feature.rs
diff --git a/src/test/ui/lint/lint-unknown-lint-cmdline.rs b/tests/ui/lint/lint-unknown-lint-cmdline.rs
index 7f3f55fba..7f3f55fba 100644
--- a/src/test/ui/lint/lint-unknown-lint-cmdline.rs
+++ b/tests/ui/lint/lint-unknown-lint-cmdline.rs
diff --git a/src/test/ui/lint/lint-unknown-lint-cmdline.stderr b/tests/ui/lint/lint-unknown-lint-cmdline.stderr
index 3855d5527..3855d5527 100644
--- a/src/test/ui/lint/lint-unknown-lint-cmdline.stderr
+++ b/tests/ui/lint/lint-unknown-lint-cmdline.stderr
diff --git a/src/test/ui/lint/lint-unknown-lint.rs b/tests/ui/lint/lint-unknown-lint.rs
index 2d842d514..2d842d514 100644
--- a/src/test/ui/lint/lint-unknown-lint.rs
+++ b/tests/ui/lint/lint-unknown-lint.rs
diff --git a/src/test/ui/lint/lint-unknown-lint.stderr b/tests/ui/lint/lint-unknown-lint.stderr
index 0cb6b4957..0cb6b4957 100644
--- a/src/test/ui/lint/lint-unknown-lint.stderr
+++ b/tests/ui/lint/lint-unknown-lint.stderr
diff --git a/src/test/ui/lint/lint-unnecessary-import-braces.rs b/tests/ui/lint/lint-unnecessary-import-braces.rs
index 9a3398a87..9a3398a87 100644
--- a/src/test/ui/lint/lint-unnecessary-import-braces.rs
+++ b/tests/ui/lint/lint-unnecessary-import-braces.rs
diff --git a/src/test/ui/lint/lint-unnecessary-import-braces.stderr b/tests/ui/lint/lint-unnecessary-import-braces.stderr
index 2d289404d..2d289404d 100644
--- a/src/test/ui/lint/lint-unnecessary-import-braces.stderr
+++ b/tests/ui/lint/lint-unnecessary-import-braces.stderr
diff --git a/src/test/ui/lint/lint-unnecessary-parens.fixed b/tests/ui/lint/lint-unnecessary-parens.fixed
index 9c144324f..9c144324f 100644
--- a/src/test/ui/lint/lint-unnecessary-parens.fixed
+++ b/tests/ui/lint/lint-unnecessary-parens.fixed
diff --git a/src/test/ui/lint/lint-unnecessary-parens.rs b/tests/ui/lint/lint-unnecessary-parens.rs
index 4fd9cabb3..4fd9cabb3 100644
--- a/src/test/ui/lint/lint-unnecessary-parens.rs
+++ b/tests/ui/lint/lint-unnecessary-parens.rs
diff --git a/src/test/ui/lint/lint-unnecessary-parens.stderr b/tests/ui/lint/lint-unnecessary-parens.stderr
index e13620f06..e13620f06 100644
--- a/src/test/ui/lint/lint-unnecessary-parens.stderr
+++ b/tests/ui/lint/lint-unnecessary-parens.stderr
diff --git a/src/test/ui/lint/lint-unsafe-code.rs b/tests/ui/lint/lint-unsafe-code.rs
index b72e4c3a9..b72e4c3a9 100644
--- a/src/test/ui/lint/lint-unsafe-code.rs
+++ b/tests/ui/lint/lint-unsafe-code.rs
diff --git a/src/test/ui/lint/lint-unsafe-code.stderr b/tests/ui/lint/lint-unsafe-code.stderr
index 037f0a832..037f0a832 100644
--- a/src/test/ui/lint/lint-unsafe-code.stderr
+++ b/tests/ui/lint/lint-unsafe-code.stderr
diff --git a/tests/ui/lint/lint-uppercase-variables.rs b/tests/ui/lint/lint-uppercase-variables.rs
new file mode 100644
index 000000000..59dba536f
--- /dev/null
+++ b/tests/ui/lint/lint-uppercase-variables.rs
@@ -0,0 +1,41 @@
+#![warn(unused)]
+#![allow(dead_code)]
+#![deny(non_snake_case)]
+
+mod foo {
+    pub enum Foo { Foo }
+}
+
+struct Something {
+    X: usize //~ ERROR structure field `X` should have a snake case name
+}
+
+fn test(Xx: usize) { //~ ERROR variable `Xx` should have a snake case name
+    println!("{}", Xx);
+}
+
+fn main() {
+    let Test: usize = 0; //~ ERROR variable `Test` should have a snake case name
+    println!("{}", Test);
+
+    match foo::Foo::Foo {
+        Foo => {}
+    //~^ ERROR variable `Foo` should have a snake case name
+    //~^^ ERROR `Foo` is named the same as one of the variants of the type `foo::Foo`
+    //~^^^ WARN unused variable: `Foo`
+    }
+
+    let Foo = foo::Foo::Foo;
+    //~^ ERROR variable `Foo` should have a snake case name
+    //~^^ ERROR `Foo` is named the same as one of the variants of the type `foo::Foo`
+    //~^^^ WARN unused variable: `Foo`
+
+    fn in_param(Foo: foo::Foo) {}
+    //~^ ERROR variable `Foo` should have a snake case name
+    //~^^ ERROR `Foo` is named the same as one of the variants of the type `foo::Foo`
+    //~^^^ WARN unused variable: `Foo`
+
+    test(1);
+
+    let _ = Something { X: 0 };
+}
diff --git a/src/test/ui/lint/lint-uppercase-variables.stderr b/tests/ui/lint/lint-uppercase-variables.stderr
index 71b24a835..42ec9364b 100644
--- a/src/test/ui/lint/lint-uppercase-variables.stderr
+++ b/tests/ui/lint/lint-uppercase-variables.stderr
@@ -1,22 +1,22 @@
-warning[E0170]: pattern binding `Foo` is named the same as one of the variants of the type `Foo`
+error[E0170]: pattern binding `Foo` is named the same as one of the variants of the type `foo::Foo`
   --> $DIR/lint-uppercase-variables.rs:22:9
    |
 LL |         Foo => {}
-   |         ^^^ help: to match on the variant, qualify the path: `Foo::Foo`
+   |         ^^^ help: to match on the variant, qualify the path: `foo::Foo::Foo`
    |
-   = note: `#[warn(bindings_with_variant_name)]` on by default
+   = note: `#[deny(bindings_with_variant_name)]` on by default
 
-warning[E0170]: pattern binding `Foo` is named the same as one of the variants of the type `Foo`
+error[E0170]: pattern binding `Foo` is named the same as one of the variants of the type `foo::Foo`
   --> $DIR/lint-uppercase-variables.rs:28:9
    |
 LL |     let Foo = foo::Foo::Foo;
-   |         ^^^ help: to match on the variant, qualify the path: `Foo::Foo`
+   |         ^^^ help: to match on the variant, qualify the path: `foo::Foo::Foo`
 
-warning[E0170]: pattern binding `Foo` is named the same as one of the variants of the type `Foo`
+error[E0170]: pattern binding `Foo` is named the same as one of the variants of the type `foo::Foo`
   --> $DIR/lint-uppercase-variables.rs:33:17
    |
 LL |     fn in_param(Foo: foo::Foo) {}
-   |                 ^^^ help: to match on the variant, qualify the path: `Foo::Foo`
+   |                 ^^^ help: to match on the variant, qualify the path: `foo::Foo::Foo`
 
 warning: unused variable: `Foo`
   --> $DIR/lint-uppercase-variables.rs:22:9
@@ -85,6 +85,6 @@ error: variable `Foo` should have a snake case name
 LL |     fn in_param(Foo: foo::Foo) {}
    |                 ^^^ help: convert the identifier to snake case (notice the capitalization): `foo`
 
-error: aborting due to 6 previous errors; 6 warnings emitted
+error: aborting due to 9 previous errors; 3 warnings emitted
 
 For more information about this error, try `rustc --explain E0170`.
diff --git a/src/test/ui/lint/lint_pre_expansion_extern_module_aux.rs b/tests/ui/lint/lint_pre_expansion_extern_module_aux.rs
index 71dec40ea..71dec40ea 100644
--- a/src/test/ui/lint/lint_pre_expansion_extern_module_aux.rs
+++ b/tests/ui/lint/lint_pre_expansion_extern_module_aux.rs
diff --git a/src/test/ui/lint/lints-in-foreign-macros.rs b/tests/ui/lint/lints-in-foreign-macros.rs
index 1e8b6788a..1e8b6788a 100644
--- a/src/test/ui/lint/lints-in-foreign-macros.rs
+++ b/tests/ui/lint/lints-in-foreign-macros.rs
diff --git a/src/test/ui/lint/lints-in-foreign-macros.stderr b/tests/ui/lint/lints-in-foreign-macros.stderr
index f20e16287..f20e16287 100644
--- a/src/test/ui/lint/lints-in-foreign-macros.stderr
+++ b/tests/ui/lint/lints-in-foreign-macros.stderr
diff --git a/src/test/ui/lint/missing-doc-private-macro.rs b/tests/ui/lint/missing-doc-private-macro.rs
index 0d4332ed0..0d4332ed0 100644
--- a/src/test/ui/lint/missing-doc-private-macro.rs
+++ b/tests/ui/lint/missing-doc-private-macro.rs
diff --git a/src/test/ui/lint/missing-doc-private-macro.stderr b/tests/ui/lint/missing-doc-private-macro.stderr
index 979b007d0..979b007d0 100644
--- a/src/test/ui/lint/missing-doc-private-macro.stderr
+++ b/tests/ui/lint/missing-doc-private-macro.stderr
diff --git a/src/test/ui/lint/must_not_suspend/boxed.rs b/tests/ui/lint/must_not_suspend/boxed.rs
index 1f823fc55..1f823fc55 100644
--- a/src/test/ui/lint/must_not_suspend/boxed.rs
+++ b/tests/ui/lint/must_not_suspend/boxed.rs
diff --git a/src/test/ui/lint/must_not_suspend/boxed.stderr b/tests/ui/lint/must_not_suspend/boxed.stderr
index 9efc7b069..9efc7b069 100644
--- a/src/test/ui/lint/must_not_suspend/boxed.stderr
+++ b/tests/ui/lint/must_not_suspend/boxed.stderr
diff --git a/src/test/ui/lint/must_not_suspend/dedup.rs b/tests/ui/lint/must_not_suspend/dedup.rs
index 81a08579b..81a08579b 100644
--- a/src/test/ui/lint/must_not_suspend/dedup.rs
+++ b/tests/ui/lint/must_not_suspend/dedup.rs
diff --git a/src/test/ui/lint/must_not_suspend/dedup.stderr b/tests/ui/lint/must_not_suspend/dedup.stderr
index f8978ba57..f8978ba57 100644
--- a/src/test/ui/lint/must_not_suspend/dedup.stderr
+++ b/tests/ui/lint/must_not_suspend/dedup.stderr
diff --git a/src/test/ui/lint/must_not_suspend/feature-gate-must_not_suspend.rs b/tests/ui/lint/must_not_suspend/feature-gate-must_not_suspend.rs
index 1554408c1..1554408c1 100644
--- a/src/test/ui/lint/must_not_suspend/feature-gate-must_not_suspend.rs
+++ b/tests/ui/lint/must_not_suspend/feature-gate-must_not_suspend.rs
diff --git a/src/test/ui/lint/must_not_suspend/feature-gate-must_not_suspend.stderr b/tests/ui/lint/must_not_suspend/feature-gate-must_not_suspend.stderr
index ab20a8be8..ab20a8be8 100644
--- a/src/test/ui/lint/must_not_suspend/feature-gate-must_not_suspend.stderr
+++ b/tests/ui/lint/must_not_suspend/feature-gate-must_not_suspend.stderr
diff --git a/src/test/ui/lint/must_not_suspend/gated.rs b/tests/ui/lint/must_not_suspend/gated.rs
index b73a76555..b73a76555 100644
--- a/src/test/ui/lint/must_not_suspend/gated.rs
+++ b/tests/ui/lint/must_not_suspend/gated.rs
diff --git a/src/test/ui/lint/must_not_suspend/gated.stderr b/tests/ui/lint/must_not_suspend/gated.stderr
index 64de1ebea..64de1ebea 100644
--- a/src/test/ui/lint/must_not_suspend/gated.stderr
+++ b/tests/ui/lint/must_not_suspend/gated.stderr
diff --git a/src/test/ui/lint/must_not_suspend/generic.rs b/tests/ui/lint/must_not_suspend/generic.rs
index b3effa020..b3effa020 100644
--- a/src/test/ui/lint/must_not_suspend/generic.rs
+++ b/tests/ui/lint/must_not_suspend/generic.rs
diff --git a/src/test/ui/lint/must_not_suspend/handled.rs b/tests/ui/lint/must_not_suspend/handled.rs
index 8714be644..8714be644 100644
--- a/src/test/ui/lint/must_not_suspend/handled.rs
+++ b/tests/ui/lint/must_not_suspend/handled.rs
diff --git a/src/test/ui/lint/must_not_suspend/issue-89562.rs b/tests/ui/lint/must_not_suspend/issue-89562.rs
index acdb36fcd..acdb36fcd 100644
--- a/src/test/ui/lint/must_not_suspend/issue-89562.rs
+++ b/tests/ui/lint/must_not_suspend/issue-89562.rs
diff --git a/src/test/ui/lint/must_not_suspend/mutex.rs b/tests/ui/lint/must_not_suspend/mutex.rs
index 7bb895e7d..7bb895e7d 100644
--- a/src/test/ui/lint/must_not_suspend/mutex.rs
+++ b/tests/ui/lint/must_not_suspend/mutex.rs
diff --git a/src/test/ui/lint/must_not_suspend/mutex.stderr b/tests/ui/lint/must_not_suspend/mutex.stderr
index c251cb845..c251cb845 100644
--- a/src/test/ui/lint/must_not_suspend/mutex.stderr
+++ b/tests/ui/lint/must_not_suspend/mutex.stderr
diff --git a/src/test/ui/lint/must_not_suspend/other_items.rs b/tests/ui/lint/must_not_suspend/other_items.rs
index 5aa1abb14..5aa1abb14 100644
--- a/src/test/ui/lint/must_not_suspend/other_items.rs
+++ b/tests/ui/lint/must_not_suspend/other_items.rs
diff --git a/src/test/ui/lint/must_not_suspend/other_items.stderr b/tests/ui/lint/must_not_suspend/other_items.stderr
index 41c889692..41c889692 100644
--- a/src/test/ui/lint/must_not_suspend/other_items.stderr
+++ b/tests/ui/lint/must_not_suspend/other_items.stderr
diff --git a/src/test/ui/lint/must_not_suspend/ref-drop-tracking.rs b/tests/ui/lint/must_not_suspend/ref-drop-tracking.rs
index 1bc4a3812..1bc4a3812 100644
--- a/src/test/ui/lint/must_not_suspend/ref-drop-tracking.rs
+++ b/tests/ui/lint/must_not_suspend/ref-drop-tracking.rs
diff --git a/src/test/ui/lint/must_not_suspend/ref-drop-tracking.stderr b/tests/ui/lint/must_not_suspend/ref-drop-tracking.stderr
index 180e187c1..180e187c1 100644
--- a/src/test/ui/lint/must_not_suspend/ref-drop-tracking.stderr
+++ b/tests/ui/lint/must_not_suspend/ref-drop-tracking.stderr
diff --git a/src/test/ui/lint/must_not_suspend/ref.drop_tracking.stderr b/tests/ui/lint/must_not_suspend/ref.drop_tracking.stderr
index abf76711b..abf76711b 100644
--- a/src/test/ui/lint/must_not_suspend/ref.drop_tracking.stderr
+++ b/tests/ui/lint/must_not_suspend/ref.drop_tracking.stderr
diff --git a/src/test/ui/lint/must_not_suspend/ref.no_drop_tracking.stderr b/tests/ui/lint/must_not_suspend/ref.no_drop_tracking.stderr
index 41ac09ea7..41ac09ea7 100644
--- a/src/test/ui/lint/must_not_suspend/ref.no_drop_tracking.stderr
+++ b/tests/ui/lint/must_not_suspend/ref.no_drop_tracking.stderr
diff --git a/src/test/ui/lint/must_not_suspend/ref.rs b/tests/ui/lint/must_not_suspend/ref.rs
index f6b23746f..f6b23746f 100644
--- a/src/test/ui/lint/must_not_suspend/ref.rs
+++ b/tests/ui/lint/must_not_suspend/ref.rs
diff --git a/src/test/ui/lint/must_not_suspend/return.rs b/tests/ui/lint/must_not_suspend/return.rs
index 5b1fa5e27..5b1fa5e27 100644
--- a/src/test/ui/lint/must_not_suspend/return.rs
+++ b/tests/ui/lint/must_not_suspend/return.rs
diff --git a/src/test/ui/lint/must_not_suspend/return.stderr b/tests/ui/lint/must_not_suspend/return.stderr
index fdada85eb..fdada85eb 100644
--- a/src/test/ui/lint/must_not_suspend/return.stderr
+++ b/tests/ui/lint/must_not_suspend/return.stderr
diff --git a/src/test/ui/lint/must_not_suspend/trait.rs b/tests/ui/lint/must_not_suspend/trait.rs
index 6c911cb4b..6c911cb4b 100644
--- a/src/test/ui/lint/must_not_suspend/trait.rs
+++ b/tests/ui/lint/must_not_suspend/trait.rs
diff --git a/src/test/ui/lint/must_not_suspend/trait.stderr b/tests/ui/lint/must_not_suspend/trait.stderr
index d64d25aae..d64d25aae 100644
--- a/src/test/ui/lint/must_not_suspend/trait.stderr
+++ b/tests/ui/lint/must_not_suspend/trait.stderr
diff --git a/tests/ui/lint/must_not_suspend/tuple-mismatch.rs b/tests/ui/lint/must_not_suspend/tuple-mismatch.rs
new file mode 100644
index 000000000..c7e14e425
--- /dev/null
+++ b/tests/ui/lint/must_not_suspend/tuple-mismatch.rs
@@ -0,0 +1,9 @@
+#![feature(generators)]
+
+fn main() {
+    let _generator = || {
+        yield ((), ((), ()));
+        yield ((), ());
+        //~^ ERROR mismatched types
+    };
+}
diff --git a/tests/ui/lint/must_not_suspend/tuple-mismatch.stderr b/tests/ui/lint/must_not_suspend/tuple-mismatch.stderr
new file mode 100644
index 000000000..cca8cd9bd
--- /dev/null
+++ b/tests/ui/lint/must_not_suspend/tuple-mismatch.stderr
@@ -0,0 +1,12 @@
+error[E0308]: mismatched types
+  --> $DIR/tuple-mismatch.rs:6:20
+   |
+LL |         yield ((), ());
+   |                    ^^ expected tuple, found `()`
+   |
+   = note:  expected tuple `((), ())`
+           found unit type `()`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/lint/must_not_suspend/unit.rs b/tests/ui/lint/must_not_suspend/unit.rs
index d3a19f704..d3a19f704 100644
--- a/src/test/ui/lint/must_not_suspend/unit.rs
+++ b/tests/ui/lint/must_not_suspend/unit.rs
diff --git a/src/test/ui/lint/must_not_suspend/unit.stderr b/tests/ui/lint/must_not_suspend/unit.stderr
index c967dbac5..c967dbac5 100644
--- a/src/test/ui/lint/must_not_suspend/unit.stderr
+++ b/tests/ui/lint/must_not_suspend/unit.stderr
diff --git a/src/test/ui/lint/must_not_suspend/warn.rs b/tests/ui/lint/must_not_suspend/warn.rs
index 7fdea66a2..7fdea66a2 100644
--- a/src/test/ui/lint/must_not_suspend/warn.rs
+++ b/tests/ui/lint/must_not_suspend/warn.rs
diff --git a/src/test/ui/lint/must_not_suspend/warn.stderr b/tests/ui/lint/must_not_suspend/warn.stderr
index fe551c652..fe551c652 100644
--- a/src/test/ui/lint/must_not_suspend/warn.stderr
+++ b/tests/ui/lint/must_not_suspend/warn.stderr
diff --git a/src/test/ui/lint/no-coverage.rs b/tests/ui/lint/no-coverage.rs
index ff24c12b2..ff24c12b2 100644
--- a/src/test/ui/lint/no-coverage.rs
+++ b/tests/ui/lint/no-coverage.rs
diff --git a/src/test/ui/lint/no-coverage.stderr b/tests/ui/lint/no-coverage.stderr
index 404efbeac..404efbeac 100644
--- a/src/test/ui/lint/no-coverage.stderr
+++ b/tests/ui/lint/no-coverage.stderr
diff --git a/src/test/ui/lint/noop-method-call.rs b/tests/ui/lint/noop-method-call.rs
index 89b296635..89b296635 100644
--- a/src/test/ui/lint/noop-method-call.rs
+++ b/tests/ui/lint/noop-method-call.rs
diff --git a/src/test/ui/lint/noop-method-call.stderr b/tests/ui/lint/noop-method-call.stderr
index 6a904d01a..6a904d01a 100644
--- a/src/test/ui/lint/noop-method-call.stderr
+++ b/tests/ui/lint/noop-method-call.stderr
diff --git a/src/test/ui/lint/not_found.rs b/tests/ui/lint/not_found.rs
index de120b6e0..de120b6e0 100644
--- a/src/test/ui/lint/not_found.rs
+++ b/tests/ui/lint/not_found.rs
diff --git a/src/test/ui/lint/not_found.stderr b/tests/ui/lint/not_found.stderr
index ea118c73c..ea118c73c 100644
--- a/src/test/ui/lint/not_found.stderr
+++ b/tests/ui/lint/not_found.stderr
diff --git a/src/test/ui/lint/opaque-ty-ffi-normalization-cycle.rs b/tests/ui/lint/opaque-ty-ffi-normalization-cycle.rs
index c83bca4a4..c83bca4a4 100644
--- a/src/test/ui/lint/opaque-ty-ffi-normalization-cycle.rs
+++ b/tests/ui/lint/opaque-ty-ffi-normalization-cycle.rs
diff --git a/src/test/ui/lint/opaque-ty-ffi-normalization-cycle.stderr b/tests/ui/lint/opaque-ty-ffi-normalization-cycle.stderr
index e8d696477..e8d696477 100644
--- a/src/test/ui/lint/opaque-ty-ffi-normalization-cycle.stderr
+++ b/tests/ui/lint/opaque-ty-ffi-normalization-cycle.stderr
diff --git a/src/test/ui/lint/opaque-ty-ffi-unsafe.rs b/tests/ui/lint/opaque-ty-ffi-unsafe.rs
index b7cc38e99..b7cc38e99 100644
--- a/src/test/ui/lint/opaque-ty-ffi-unsafe.rs
+++ b/tests/ui/lint/opaque-ty-ffi-unsafe.rs
diff --git a/src/test/ui/lint/opaque-ty-ffi-unsafe.stderr b/tests/ui/lint/opaque-ty-ffi-unsafe.stderr
index 33aa95854..33aa95854 100644
--- a/src/test/ui/lint/opaque-ty-ffi-unsafe.stderr
+++ b/tests/ui/lint/opaque-ty-ffi-unsafe.stderr
diff --git a/src/test/ui/lint/outer-forbid.rs b/tests/ui/lint/outer-forbid.rs
index ba330258d..ba330258d 100644
--- a/src/test/ui/lint/outer-forbid.rs
+++ b/tests/ui/lint/outer-forbid.rs
diff --git a/src/test/ui/lint/outer-forbid.stderr b/tests/ui/lint/outer-forbid.stderr
index a47877980..a47877980 100644
--- a/src/test/ui/lint/outer-forbid.stderr
+++ b/tests/ui/lint/outer-forbid.stderr
diff --git a/src/test/ui/lint/reasons-erroneous.rs b/tests/ui/lint/reasons-erroneous.rs
index cd693ae16..cd693ae16 100644
--- a/src/test/ui/lint/reasons-erroneous.rs
+++ b/tests/ui/lint/reasons-erroneous.rs
diff --git a/src/test/ui/lint/reasons-erroneous.stderr b/tests/ui/lint/reasons-erroneous.stderr
index 5521af17c..5521af17c 100644
--- a/src/test/ui/lint/reasons-erroneous.stderr
+++ b/tests/ui/lint/reasons-erroneous.stderr
diff --git a/src/test/ui/lint/reasons-forbidden.rs b/tests/ui/lint/reasons-forbidden.rs
index 9c2edec4d..9c2edec4d 100644
--- a/src/test/ui/lint/reasons-forbidden.rs
+++ b/tests/ui/lint/reasons-forbidden.rs
diff --git a/src/test/ui/lint/reasons-forbidden.stderr b/tests/ui/lint/reasons-forbidden.stderr
index ab6f19a01..ab6f19a01 100644
--- a/src/test/ui/lint/reasons-forbidden.stderr
+++ b/tests/ui/lint/reasons-forbidden.stderr
diff --git a/src/test/ui/lint/reasons.rs b/tests/ui/lint/reasons.rs
index da1c740c4..da1c740c4 100644
--- a/src/test/ui/lint/reasons.rs
+++ b/tests/ui/lint/reasons.rs
diff --git a/src/test/ui/lint/reasons.stderr b/tests/ui/lint/reasons.stderr
index cd8412153..cd8412153 100644
--- a/src/test/ui/lint/reasons.stderr
+++ b/tests/ui/lint/reasons.stderr
diff --git a/src/test/ui/lint/recommend-literal.rs b/tests/ui/lint/recommend-literal.rs
index 453cbf285..453cbf285 100644
--- a/src/test/ui/lint/recommend-literal.rs
+++ b/tests/ui/lint/recommend-literal.rs
diff --git a/src/test/ui/lint/recommend-literal.stderr b/tests/ui/lint/recommend-literal.stderr
index 424ecadd4..424ecadd4 100644
--- a/src/test/ui/lint/recommend-literal.stderr
+++ b/tests/ui/lint/recommend-literal.stderr
diff --git a/src/test/ui/lint/redundant-semicolon/auxiliary/redundant-semi-proc-macro-def.rs b/tests/ui/lint/redundant-semicolon/auxiliary/redundant-semi-proc-macro-def.rs
index 5a94ccd74..5a94ccd74 100644
--- a/src/test/ui/lint/redundant-semicolon/auxiliary/redundant-semi-proc-macro-def.rs
+++ b/tests/ui/lint/redundant-semicolon/auxiliary/redundant-semi-proc-macro-def.rs
diff --git a/src/test/ui/lint/redundant-semicolon/item-stmt-semi.rs b/tests/ui/lint/redundant-semicolon/item-stmt-semi.rs
index 8c79630b7..8c79630b7 100644
--- a/src/test/ui/lint/redundant-semicolon/item-stmt-semi.rs
+++ b/tests/ui/lint/redundant-semicolon/item-stmt-semi.rs
diff --git a/src/test/ui/lint/redundant-semicolon/item-stmt-semi.stderr b/tests/ui/lint/redundant-semicolon/item-stmt-semi.stderr
index 451b152cb..451b152cb 100644
--- a/src/test/ui/lint/redundant-semicolon/item-stmt-semi.stderr
+++ b/tests/ui/lint/redundant-semicolon/item-stmt-semi.stderr
diff --git a/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs b/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs
index 08a5c6c2b..08a5c6c2b 100644
--- a/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs
+++ b/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs
diff --git a/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr b/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
index e31d14c55..e31d14c55 100644
--- a/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
+++ b/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
diff --git a/src/test/ui/lint/register-tool-lint.rs b/tests/ui/lint/register-tool-lint.rs
index 17d3afbf6..17d3afbf6 100644
--- a/src/test/ui/lint/register-tool-lint.rs
+++ b/tests/ui/lint/register-tool-lint.rs
diff --git a/src/test/ui/lint/register-tool-lint.stderr b/tests/ui/lint/register-tool-lint.stderr
index 842d845ff..842d845ff 100644
--- a/src/test/ui/lint/register-tool-lint.stderr
+++ b/tests/ui/lint/register-tool-lint.stderr
diff --git a/src/test/ui/lint/renamed-lints-still-apply.rs b/tests/ui/lint/renamed-lints-still-apply.rs
index 01cd32536..01cd32536 100644
--- a/src/test/ui/lint/renamed-lints-still-apply.rs
+++ b/tests/ui/lint/renamed-lints-still-apply.rs
diff --git a/src/test/ui/lint/renamed-lints-still-apply.stderr b/tests/ui/lint/renamed-lints-still-apply.stderr
index e926719bb..e926719bb 100644
--- a/src/test/ui/lint/renamed-lints-still-apply.stderr
+++ b/tests/ui/lint/renamed-lints-still-apply.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/avoid_delayed_good_path_ice.rs b/tests/ui/lint/rfc-2383-lint-reason/avoid_delayed_good_path_ice.rs
index 912e831d8..912e831d8 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/avoid_delayed_good_path_ice.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/avoid_delayed_good_path_ice.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/catch_multiple_lint_triggers.rs b/tests/ui/lint/rfc-2383-lint-reason/catch_multiple_lint_triggers.rs
index 6b255b799..6b255b799 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/catch_multiple_lint_triggers.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/catch_multiple_lint_triggers.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/crate_level_expect.rs b/tests/ui/lint/rfc-2383-lint-reason/crate_level_expect.rs
index 9f591ba98..9f591ba98 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/crate_level_expect.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/crate_level_expect.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/crate_level_expect.stderr b/tests/ui/lint/rfc-2383-lint-reason/crate_level_expect.stderr
index 7237f6fb6..7237f6fb6 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/crate_level_expect.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/crate_level_expect.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_inside_macro.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_inside_macro.rs
index b95815bc5..b95815bc5 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_inside_macro.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_inside_macro.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.rs
index 07c60fa0c..07c60fa0c 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.stderr
index 817e16fdc..817e16fdc 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.rs
index 928e16106..928e16106 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.stderr
index b5601cf9e..b5601cf9e 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.rs
index dc9a719a3..dc9a719a3 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.stderr
index 90ee744b2..90ee744b2 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.rs
index 8f94bd6ec..8f94bd6ec 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.stderr
index 2c35647b8..2c35647b8 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.rs
index 5fdb71041..5fdb71041 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.stderr
index 69f7cda08..69f7cda08 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.rs
index f80fe88cb..f80fe88cb 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.stderr
index 6d49e7543..6d49e7543 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.rs
index d38e65533..d38e65533 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.stderr
index 9a1c3e442..9a1c3e442 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_forbid.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_with_forbid.rs
index 479ee198e..479ee198e 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_forbid.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_with_forbid.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_forbid.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_with_forbid.stderr
index a8116e934..a8116e934 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_forbid.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_with_forbid.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_reason.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_with_reason.rs
index b4183d982..b4183d982 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_reason.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_with_reason.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_reason.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_with_reason.stderr
index e349e4081..e349e4081 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_reason.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_with_reason.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs
index a3c3933d7..a3c3933d7 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.stderr b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.stderr
index 5942fa8ae..5942fa8ae 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.rs b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.rs
index 080e30023..080e30023 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.stderr b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.stderr
index c74fabe27..c74fabe27 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_early_lints.rs b/tests/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_early_lints.rs
index 6624b930e..6624b930e 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_early_lints.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_early_lints.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_late_lints.rs b/tests/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_late_lints.rs
index 5d928b3ca..5d928b3ca 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_late_lints.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_late_lints.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.rs b/tests/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.rs
index bafdea96e..bafdea96e 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.stderr b/tests/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.stderr
index 3e9d70821..3e9d70821 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.rs b/tests/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.rs
index 98080b4e8..98080b4e8 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.stderr b/tests/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.stderr
index df7d6584f..df7d6584f 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.rs b/tests/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.rs
index 2b6c3c6a1..2b6c3c6a1 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.stdout b/tests/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.stdout
index 0ee3a03c3..0ee3a03c3 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.stdout
+++ b/tests/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.stdout
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.rs b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.rs
index e7da825ae..e7da825ae 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.rs
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.rs
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.stderr b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.stderr
index e9906c83d..e9906c83d 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.stderr
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.stderr
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables-2.rs b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables-2.rs
index f62c8a190..f62c8a190 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables-2.rs
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables-2.rs
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.rs b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.rs
index 9d837d41f..9d837d41f 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.rs
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.rs
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.stderr b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.stderr
index 884a4a453..884a4a453 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.stderr
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.stderr
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.rs b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.rs
index 8ae174409..8ae174409 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.rs
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.rs
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.stderr b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.stderr
index 8ed7f093c..8ed7f093c 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.stderr
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.stderr
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.rs b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.rs
index ed8e7dddd..ed8e7dddd 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.rs
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.rs
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.stderr b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.stderr
index 0533da030..0533da030 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.stderr
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.stderr
diff --git a/src/test/ui/lint/rustdoc-group.rs b/tests/ui/lint/rustdoc-group.rs
index 130abe425..130abe425 100644
--- a/src/test/ui/lint/rustdoc-group.rs
+++ b/tests/ui/lint/rustdoc-group.rs
diff --git a/src/test/ui/lint/rustdoc-group.stderr b/tests/ui/lint/rustdoc-group.stderr
index fddc863ae..fddc863ae 100644
--- a/src/test/ui/lint/rustdoc-group.stderr
+++ b/tests/ui/lint/rustdoc-group.stderr
diff --git a/src/test/ui/lint/rustdoc-renamed.rs b/tests/ui/lint/rustdoc-renamed.rs
index ecd6155b7..ecd6155b7 100644
--- a/src/test/ui/lint/rustdoc-renamed.rs
+++ b/tests/ui/lint/rustdoc-renamed.rs
diff --git a/src/test/ui/lint/rustdoc-renamed.stderr b/tests/ui/lint/rustdoc-renamed.stderr
index 096e867aa..096e867aa 100644
--- a/src/test/ui/lint/rustdoc-renamed.stderr
+++ b/tests/ui/lint/rustdoc-renamed.stderr
diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/auxiliary/foreign-crate.rs b/tests/ui/lint/semicolon-in-expressions-from-macros/auxiliary/foreign-crate.rs
index 781391cc5..781391cc5 100644
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/auxiliary/foreign-crate.rs
+++ b/tests/ui/lint/semicolon-in-expressions-from-macros/auxiliary/foreign-crate.rs
diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/foreign-crate.rs b/tests/ui/lint/semicolon-in-expressions-from-macros/foreign-crate.rs
index 374506366..374506366 100644
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/foreign-crate.rs
+++ b/tests/ui/lint/semicolon-in-expressions-from-macros/foreign-crate.rs
diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.rs b/tests/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.rs
index fff380934..fff380934 100644
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.rs
+++ b/tests/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.rs
diff --git a/tests/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.stderr b/tests/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.stderr
new file mode 100644
index 000000000..c60120061
--- /dev/null
+++ b/tests/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.stderr
@@ -0,0 +1,185 @@
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         foo!(warn_in_block)
+   |         ------------------- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:4:9
+   |
+LL | #![warn(semicolon_in_expressions_from_macros)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |     let _ = foo!(warn_in_expr);
+   |             ------------------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |     let _ = #[allow(semicolon_in_expressions_from_macros)] foo!(allow_does_not_work);
+   |                                                            ------------------------- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: 3 warnings emitted
+
+Future incompatibility report: Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         foo!(first)
+   |         ----------- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:24:13
+   |
+LL |     #[allow(semicolon_in_expressions_from_macros)]
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |     let _ = foo!(second);
+   |             ------------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:29:13
+   |
+LL |     #[allow(semicolon_in_expressions_from_macros)]
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         let _ = foo!(third);
+   |                 ----------- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:32:13
+   |
+LL |     #[allow(semicolon_in_expressions_from_macros)]
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         let _ = foo!(fourth);
+   |                 ------------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:37:13
+   |
+LL |     #[allow(semicolon_in_expressions_from_macros)]
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         foo!(warn_in_block)
+   |         ------------------- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:4:9
+   |
+LL | #![warn(semicolon_in_expressions_from_macros)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |     let _ = foo!(warn_in_expr);
+   |             ------------------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:4:9
+   |
+LL | #![warn(semicolon_in_expressions_from_macros)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |     let _ = #[allow(semicolon_in_expressions_from_macros)] foo!(allow_does_not_work);
+   |                                                            ------------------------- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:4:9
+   |
+LL | #![warn(semicolon_in_expressions_from_macros)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.rs b/tests/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.rs
index 2c63311e6..2c63311e6 100644
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.rs
+++ b/tests/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.rs
diff --git a/tests/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.stderr b/tests/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.stderr
new file mode 100644
index 000000000..0fec4996f
--- /dev/null
+++ b/tests/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.stderr
@@ -0,0 +1,31 @@
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/warn-semicolon-in-expressions-from-macros.rs:6:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         _ => foo!()
+   |              ------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: 1 warning emitted
+
+Future incompatibility report: Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/warn-semicolon-in-expressions-from-macros.rs:6:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         _ => foo!()
+   |              ------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
diff --git a/src/test/ui/lint/special-upper-lower-cases.rs b/tests/ui/lint/special-upper-lower-cases.rs
index 761be61fa..761be61fa 100644
--- a/src/test/ui/lint/special-upper-lower-cases.rs
+++ b/tests/ui/lint/special-upper-lower-cases.rs
diff --git a/src/test/ui/lint/special-upper-lower-cases.stderr b/tests/ui/lint/special-upper-lower-cases.stderr
index 2aa13c33b..2aa13c33b 100644
--- a/src/test/ui/lint/special-upper-lower-cases.stderr
+++ b/tests/ui/lint/special-upper-lower-cases.stderr
diff --git a/src/test/ui/lint/suggestions.fixed b/tests/ui/lint/suggestions.fixed
index 35851690b..35851690b 100644
--- a/src/test/ui/lint/suggestions.fixed
+++ b/tests/ui/lint/suggestions.fixed
diff --git a/src/test/ui/lint/suggestions.rs b/tests/ui/lint/suggestions.rs
index be6f0d6b3..be6f0d6b3 100644
--- a/src/test/ui/lint/suggestions.rs
+++ b/tests/ui/lint/suggestions.rs
diff --git a/src/test/ui/lint/suggestions.stderr b/tests/ui/lint/suggestions.stderr
index 4caee777a..4caee777a 100644
--- a/src/test/ui/lint/suggestions.stderr
+++ b/tests/ui/lint/suggestions.stderr
diff --git a/src/test/ui/lint/test-allow-dead-extern-static-no-warning.rs b/tests/ui/lint/test-allow-dead-extern-static-no-warning.rs
index 2583e431e..2583e431e 100644
--- a/src/test/ui/lint/test-allow-dead-extern-static-no-warning.rs
+++ b/tests/ui/lint/test-allow-dead-extern-static-no-warning.rs
diff --git a/src/test/ui/lint/test-inner-fn.rs b/tests/ui/lint/test-inner-fn.rs
index d419cc6fa..d419cc6fa 100644
--- a/src/test/ui/lint/test-inner-fn.rs
+++ b/tests/ui/lint/test-inner-fn.rs
diff --git a/src/test/ui/lint/test-inner-fn.stderr b/tests/ui/lint/test-inner-fn.stderr
index 7a32bc86b..7a32bc86b 100644
--- a/src/test/ui/lint/test-inner-fn.stderr
+++ b/tests/ui/lint/test-inner-fn.stderr
diff --git a/src/test/ui/lint/trivial-cast-ice.rs b/tests/ui/lint/trivial-cast-ice.rs
index f781fab22..f781fab22 100644
--- a/src/test/ui/lint/trivial-cast-ice.rs
+++ b/tests/ui/lint/trivial-cast-ice.rs
diff --git a/src/test/ui/lint/trivial-casts-featuring-type-ascription.rs b/tests/ui/lint/trivial-casts-featuring-type-ascription.rs
index 96bf2dcfb..96bf2dcfb 100644
--- a/src/test/ui/lint/trivial-casts-featuring-type-ascription.rs
+++ b/tests/ui/lint/trivial-casts-featuring-type-ascription.rs
diff --git a/src/test/ui/lint/trivial-casts-featuring-type-ascription.stderr b/tests/ui/lint/trivial-casts-featuring-type-ascription.stderr
index 5087807b6..5087807b6 100644
--- a/src/test/ui/lint/trivial-casts-featuring-type-ascription.stderr
+++ b/tests/ui/lint/trivial-casts-featuring-type-ascription.stderr
diff --git a/src/test/ui/lint/trivial-casts.rs b/tests/ui/lint/trivial-casts.rs
index b17de624a..b17de624a 100644
--- a/src/test/ui/lint/trivial-casts.rs
+++ b/tests/ui/lint/trivial-casts.rs
diff --git a/src/test/ui/lint/trivial-casts.stderr b/tests/ui/lint/trivial-casts.stderr
index 7ace353de..7ace353de 100644
--- a/src/test/ui/lint/trivial-casts.stderr
+++ b/tests/ui/lint/trivial-casts.stderr
diff --git a/src/test/ui/lint/trivial_casts.rs b/tests/ui/lint/trivial_casts.rs
index 0a8b9de1d..0a8b9de1d 100644
--- a/src/test/ui/lint/trivial_casts.rs
+++ b/tests/ui/lint/trivial_casts.rs
diff --git a/src/test/ui/lint/trivial_casts.stderr b/tests/ui/lint/trivial_casts.stderr
index 74f962835..74f962835 100644
--- a/src/test/ui/lint/trivial_casts.stderr
+++ b/tests/ui/lint/trivial_casts.stderr
diff --git a/src/test/ui/lint/type-overflow.rs b/tests/ui/lint/type-overflow.rs
index 6234b794c..6234b794c 100644
--- a/src/test/ui/lint/type-overflow.rs
+++ b/tests/ui/lint/type-overflow.rs
diff --git a/src/test/ui/lint/type-overflow.stderr b/tests/ui/lint/type-overflow.stderr
index 62cb1f7f4..62cb1f7f4 100644
--- a/src/test/ui/lint/type-overflow.stderr
+++ b/tests/ui/lint/type-overflow.stderr
diff --git a/src/test/ui/lint/unaligned_references.rs b/tests/ui/lint/unaligned_references.rs
index e547f031a..e547f031a 100644
--- a/src/test/ui/lint/unaligned_references.rs
+++ b/tests/ui/lint/unaligned_references.rs
diff --git a/src/test/ui/lint/unaligned_references.stderr b/tests/ui/lint/unaligned_references.stderr
index 346f49b92..346f49b92 100644
--- a/src/test/ui/lint/unaligned_references.stderr
+++ b/tests/ui/lint/unaligned_references.stderr
diff --git a/src/test/ui/lint/unaligned_references_external_macro.rs b/tests/ui/lint/unaligned_references_external_macro.rs
index cb597c38e..cb597c38e 100644
--- a/src/test/ui/lint/unaligned_references_external_macro.rs
+++ b/tests/ui/lint/unaligned_references_external_macro.rs
diff --git a/src/test/ui/lint/unaligned_references_external_macro.stderr b/tests/ui/lint/unaligned_references_external_macro.stderr
index c46ca6742..c46ca6742 100644
--- a/src/test/ui/lint/unaligned_references_external_macro.stderr
+++ b/tests/ui/lint/unaligned_references_external_macro.stderr
diff --git a/src/test/ui/lint/unnecessary-extern-crate.rs b/tests/ui/lint/unnecessary-extern-crate.rs
index af2bd84bd..af2bd84bd 100644
--- a/src/test/ui/lint/unnecessary-extern-crate.rs
+++ b/tests/ui/lint/unnecessary-extern-crate.rs
diff --git a/src/test/ui/lint/unnecessary-extern-crate.stderr b/tests/ui/lint/unnecessary-extern-crate.stderr
index 14ba9d052..14ba9d052 100644
--- a/src/test/ui/lint/unnecessary-extern-crate.stderr
+++ b/tests/ui/lint/unnecessary-extern-crate.stderr
diff --git a/src/test/ui/lint/unreachable-async-fn.rs b/tests/ui/lint/unreachable-async-fn.rs
index eedd877fe..eedd877fe 100644
--- a/src/test/ui/lint/unreachable-async-fn.rs
+++ b/tests/ui/lint/unreachable-async-fn.rs
diff --git a/src/test/ui/lint/unreachable_pub.rs b/tests/ui/lint/unreachable_pub.rs
index a50467ce8..a50467ce8 100644
--- a/src/test/ui/lint/unreachable_pub.rs
+++ b/tests/ui/lint/unreachable_pub.rs
diff --git a/src/test/ui/lint/unreachable_pub.stderr b/tests/ui/lint/unreachable_pub.stderr
index 762834b97..762834b97 100644
--- a/src/test/ui/lint/unreachable_pub.stderr
+++ b/tests/ui/lint/unreachable_pub.stderr
diff --git a/src/test/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs b/tests/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs
index 26871c98d..26871c98d 100644
--- a/src/test/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs
+++ b/tests/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs
diff --git a/src/test/ui/lint/unsafe_code/forge_unsafe_block.rs b/tests/ui/lint/unsafe_code/forge_unsafe_block.rs
index a1bd7b413..a1bd7b413 100644
--- a/src/test/ui/lint/unsafe_code/forge_unsafe_block.rs
+++ b/tests/ui/lint/unsafe_code/forge_unsafe_block.rs
diff --git a/src/test/ui/lint/unused-borrows.rs b/tests/ui/lint/unused-borrows.rs
index 4518522ae..4518522ae 100644
--- a/src/test/ui/lint/unused-borrows.rs
+++ b/tests/ui/lint/unused-borrows.rs
diff --git a/src/test/ui/lint/unused-borrows.stderr b/tests/ui/lint/unused-borrows.stderr
index d8dd2b5fd..d8dd2b5fd 100644
--- a/src/test/ui/lint/unused-borrows.stderr
+++ b/tests/ui/lint/unused-borrows.stderr
diff --git a/src/test/ui/lint/unused-braces-while-let-with-mutable-value.rs b/tests/ui/lint/unused-braces-while-let-with-mutable-value.rs
index ac547293c..ac547293c 100644
--- a/src/test/ui/lint/unused-braces-while-let-with-mutable-value.rs
+++ b/tests/ui/lint/unused-braces-while-let-with-mutable-value.rs
diff --git a/src/test/ui/lint/unused-qualification-in-derive-expansion.rs b/tests/ui/lint/unused-qualification-in-derive-expansion.rs
index c2efbf507..c2efbf507 100644
--- a/src/test/ui/lint/unused-qualification-in-derive-expansion.rs
+++ b/tests/ui/lint/unused-qualification-in-derive-expansion.rs
diff --git a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate.rs b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate.rs
+++ b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate.rs
diff --git a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate2.rs b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate2.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate2.rs
+++ b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate2.rs
diff --git a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate3.rs b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate3.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate3.rs
+++ b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate3.rs
diff --git a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate4.rs b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate4.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate4.rs
+++ b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate4.rs
diff --git a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate5.rs b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate5.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate5.rs
+++ b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate5.rs
diff --git a/src/test/ui/lint/unused/issue-104397.rs b/tests/ui/lint/unused/issue-104397.rs
index 94e15cd96..94e15cd96 100644
--- a/src/test/ui/lint/unused/issue-104397.rs
+++ b/tests/ui/lint/unused/issue-104397.rs
diff --git a/tests/ui/lint/unused/issue-105061-array-lint.rs b/tests/ui/lint/unused/issue-105061-array-lint.rs
new file mode 100644
index 000000000..9b06a4fde
--- /dev/null
+++ b/tests/ui/lint/unused/issue-105061-array-lint.rs
@@ -0,0 +1,11 @@
+#![warn(unused)]
+#![deny(warnings)]
+
+fn main() {
+    let _x: ([u32; 3]); //~ ERROR unnecessary parentheses around type
+    let _y: [u8; (3)]; //~ ERROR unnecessary parentheses around const expression
+    let _z: ([u8; (3)]);
+    //~^ ERROR unnecessary parentheses around const expression
+    //~| ERROR unnecessary parentheses around type
+
+}
diff --git a/tests/ui/lint/unused/issue-105061-array-lint.stderr b/tests/ui/lint/unused/issue-105061-array-lint.stderr
new file mode 100644
index 000000000..7eb761aee
--- /dev/null
+++ b/tests/ui/lint/unused/issue-105061-array-lint.stderr
@@ -0,0 +1,56 @@
+error: unnecessary parentheses around type
+  --> $DIR/issue-105061-array-lint.rs:5:13
+   |
+LL |     let _x: ([u32; 3]);
+   |             ^        ^
+   |
+note: the lint level is defined here
+  --> $DIR/issue-105061-array-lint.rs:2:9
+   |
+LL | #![deny(warnings)]
+   |         ^^^^^^^^
+   = note: `#[deny(unused_parens)]` implied by `#[deny(warnings)]`
+help: remove these parentheses
+   |
+LL -     let _x: ([u32; 3]);
+LL +     let _x: [u32; 3];
+   |
+
+error: unnecessary parentheses around const expression
+  --> $DIR/issue-105061-array-lint.rs:6:18
+   |
+LL |     let _y: [u8; (3)];
+   |                  ^ ^
+   |
+help: remove these parentheses
+   |
+LL -     let _y: [u8; (3)];
+LL +     let _y: [u8; 3];
+   |
+
+error: unnecessary parentheses around type
+  --> $DIR/issue-105061-array-lint.rs:7:13
+   |
+LL |     let _z: ([u8; (3)]);
+   |             ^         ^
+   |
+help: remove these parentheses
+   |
+LL -     let _z: ([u8; (3)]);
+LL +     let _z: [u8; (3)];
+   |
+
+error: unnecessary parentheses around const expression
+  --> $DIR/issue-105061-array-lint.rs:7:19
+   |
+LL |     let _z: ([u8; (3)]);
+   |                   ^ ^
+   |
+help: remove these parentheses
+   |
+LL -     let _z: ([u8; (3)]);
+LL +     let _z: ([u8; 3]);
+   |
+
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/lint/unused/issue-105061-should-lint.rs b/tests/ui/lint/unused/issue-105061-should-lint.rs
new file mode 100644
index 000000000..7e4e09473
--- /dev/null
+++ b/tests/ui/lint/unused/issue-105061-should-lint.rs
@@ -0,0 +1,23 @@
+#![warn(unused)]
+#![deny(warnings)]
+
+struct Inv<'a>(&'a mut &'a ());
+
+trait Trait<'a> {}
+impl<'b> Trait<'b> for for<'a> fn(Inv<'a>) {}
+
+fn with_bound()
+where
+    for<'b> (for<'a> fn(Inv<'a>)): Trait<'b>, //~ ERROR unnecessary parentheses around type
+{}
+
+trait Hello<T> {}
+fn with_dyn_bound<T>()
+where
+    (dyn Hello<(for<'b> fn(&'b ()))>): Hello<T> //~ ERROR unnecessary parentheses around type
+{}
+
+fn main() {
+    with_bound();
+    with_dyn_bound();
+}
diff --git a/tests/ui/lint/unused/issue-105061-should-lint.stderr b/tests/ui/lint/unused/issue-105061-should-lint.stderr
new file mode 100644
index 000000000..e591f1ffb
--- /dev/null
+++ b/tests/ui/lint/unused/issue-105061-should-lint.stderr
@@ -0,0 +1,32 @@
+error: unnecessary parentheses around type
+  --> $DIR/issue-105061-should-lint.rs:11:13
+   |
+LL |     for<'b> (for<'a> fn(Inv<'a>)): Trait<'b>,
+   |             ^                   ^
+   |
+note: the lint level is defined here
+  --> $DIR/issue-105061-should-lint.rs:2:9
+   |
+LL | #![deny(warnings)]
+   |         ^^^^^^^^
+   = note: `#[deny(unused_parens)]` implied by `#[deny(warnings)]`
+help: remove these parentheses
+   |
+LL -     for<'b> (for<'a> fn(Inv<'a>)): Trait<'b>,
+LL +     for<'b> for<'a> fn(Inv<'a>): Trait<'b>,
+   |
+
+error: unnecessary parentheses around type
+  --> $DIR/issue-105061-should-lint.rs:17:16
+   |
+LL |     (dyn Hello<(for<'b> fn(&'b ()))>): Hello<T>
+   |                ^                  ^
+   |
+help: remove these parentheses
+   |
+LL -     (dyn Hello<(for<'b> fn(&'b ()))>): Hello<T>
+LL +     (dyn Hello<for<'b> fn(&'b ())>): Hello<T>
+   |
+
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/lint/unused/issue-105061.rs b/tests/ui/lint/unused/issue-105061.rs
new file mode 100644
index 000000000..92d636d0a
--- /dev/null
+++ b/tests/ui/lint/unused/issue-105061.rs
@@ -0,0 +1,17 @@
+#![warn(unused)]
+#![deny(warnings)]
+
+struct Inv<'a>(&'a mut &'a ());
+
+trait Trait {}
+impl Trait for (for<'a> fn(Inv<'a>),) {}
+
+
+fn with_bound()
+where
+    ((for<'a> fn(Inv<'a>)),): Trait, //~ ERROR unnecessary parentheses around type
+{}
+
+fn main() {
+    with_bound();
+}
diff --git a/tests/ui/lint/unused/issue-105061.stderr b/tests/ui/lint/unused/issue-105061.stderr
new file mode 100644
index 000000000..f07aa2012
--- /dev/null
+++ b/tests/ui/lint/unused/issue-105061.stderr
@@ -0,0 +1,20 @@
+error: unnecessary parentheses around type
+  --> $DIR/issue-105061.rs:12:6
+   |
+LL |     ((for<'a> fn(Inv<'a>)),): Trait,
+   |      ^                   ^
+   |
+note: the lint level is defined here
+  --> $DIR/issue-105061.rs:2:9
+   |
+LL | #![deny(warnings)]
+   |         ^^^^^^^^
+   = note: `#[deny(unused_parens)]` implied by `#[deny(warnings)]`
+help: remove these parentheses
+   |
+LL -     ((for<'a> fn(Inv<'a>)),): Trait,
+LL +     (for<'a> fn(Inv<'a>),): Trait,
+   |
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/lint/unused/issue-30730.rs b/tests/ui/lint/unused/issue-30730.rs
index d6be90c81..d6be90c81 100644
--- a/src/test/ui/lint/unused/issue-30730.rs
+++ b/tests/ui/lint/unused/issue-30730.rs
diff --git a/src/test/ui/lint/unused/issue-30730.stderr b/tests/ui/lint/unused/issue-30730.stderr
index b299e99a3..b299e99a3 100644
--- a/src/test/ui/lint/unused/issue-30730.stderr
+++ b/tests/ui/lint/unused/issue-30730.stderr
diff --git a/src/test/ui/lint/unused/issue-46576.rs b/tests/ui/lint/unused/issue-46576.rs
index 15f458f38..15f458f38 100644
--- a/src/test/ui/lint/unused/issue-46576.rs
+++ b/tests/ui/lint/unused/issue-46576.rs
diff --git a/src/test/ui/lint/unused/issue-46576.stderr b/tests/ui/lint/unused/issue-46576.stderr
index 6f4d97068..6f4d97068 100644
--- a/src/test/ui/lint/unused/issue-46576.stderr
+++ b/tests/ui/lint/unused/issue-46576.stderr
diff --git a/src/test/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.rs b/tests/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.rs
index 4822a9b2c..4822a9b2c 100644
--- a/src/test/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.rs
+++ b/tests/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.rs
diff --git a/src/test/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.stderr b/tests/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.stderr
index fe2e3afc8..fe2e3afc8 100644
--- a/src/test/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.stderr
+++ b/tests/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.stderr
diff --git a/src/test/ui/lint/unused/issue-54180-unused-ref-field.fixed b/tests/ui/lint/unused/issue-54180-unused-ref-field.fixed
index 1350b7ca6..1350b7ca6 100644
--- a/src/test/ui/lint/unused/issue-54180-unused-ref-field.fixed
+++ b/tests/ui/lint/unused/issue-54180-unused-ref-field.fixed
diff --git a/src/test/ui/lint/unused/issue-54180-unused-ref-field.rs b/tests/ui/lint/unused/issue-54180-unused-ref-field.rs
index 7b3392b60..7b3392b60 100644
--- a/src/test/ui/lint/unused/issue-54180-unused-ref-field.rs
+++ b/tests/ui/lint/unused/issue-54180-unused-ref-field.rs
diff --git a/src/test/ui/lint/unused/issue-54180-unused-ref-field.stderr b/tests/ui/lint/unused/issue-54180-unused-ref-field.stderr
index f2e616899..f2e616899 100644
--- a/src/test/ui/lint/unused/issue-54180-unused-ref-field.stderr
+++ b/tests/ui/lint/unused/issue-54180-unused-ref-field.stderr
diff --git a/src/test/ui/lint/unused/issue-54538-unused-parens-lint.fixed b/tests/ui/lint/unused/issue-54538-unused-parens-lint.fixed
index 0b3fe9371..71ebaea8e 100644
--- a/src/test/ui/lint/unused/issue-54538-unused-parens-lint.fixed
+++ b/tests/ui/lint/unused/issue-54538-unused-parens-lint.fixed
@@ -1,6 +1,6 @@
 // run-rustfix
 
-#![feature(box_patterns, stmt_expr_attributes)]
+#![feature(box_patterns, stmt_expr_attributes, yeet_expr)]
 
 #![allow(
     dead_code,
@@ -25,6 +25,13 @@ fn _no_lint_attr() {
     let _x = #[allow(dead_code)] (1 + 2);
 }
 
+fn _no_lint_yeet() -> Result<(), ()> {
+    #[allow(unreachable_code)]
+    if (do yeet) {}
+
+    Ok(())
+}
+
 // Don't lint in these cases (#64106).
 fn or_patterns_no_lint() {
     match Box::new(0) {
diff --git a/src/test/ui/lint/unused/issue-54538-unused-parens-lint.rs b/tests/ui/lint/unused/issue-54538-unused-parens-lint.rs
index 1e78ec5f7..28b662dd0 100644
--- a/src/test/ui/lint/unused/issue-54538-unused-parens-lint.rs
+++ b/tests/ui/lint/unused/issue-54538-unused-parens-lint.rs
@@ -1,6 +1,6 @@
 // run-rustfix
 
-#![feature(box_patterns, stmt_expr_attributes)]
+#![feature(box_patterns, stmt_expr_attributes, yeet_expr)]
 
 #![allow(
     dead_code,
@@ -25,6 +25,13 @@ fn _no_lint_attr() {
     let _x = #[allow(dead_code)] (1 + 2);
 }
 
+fn _no_lint_yeet() -> Result<(), ()> {
+    #[allow(unreachable_code)]
+    if (do yeet) {}
+
+    Ok(())
+}
+
 // Don't lint in these cases (#64106).
 fn or_patterns_no_lint() {
     match Box::new(0) {
diff --git a/src/test/ui/lint/unused/issue-54538-unused-parens-lint.stderr b/tests/ui/lint/unused/issue-54538-unused-parens-lint.stderr
index c73884663..a5e69e6d9 100644
--- a/src/test/ui/lint/unused/issue-54538-unused-parens-lint.stderr
+++ b/tests/ui/lint/unused/issue-54538-unused-parens-lint.stderr
@@ -76,7 +76,7 @@ LL +     let _ = |a: u8| 0;
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:49:12
+  --> $DIR/issue-54538-unused-parens-lint.rs:56:12
    |
 LL |     if let (0 | 1) = 0 {}
    |            ^     ^
@@ -88,7 +88,7 @@ LL +     if let 0 | 1 = 0 {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:50:13
+  --> $DIR/issue-54538-unused-parens-lint.rs:57:13
    |
 LL |     if let ((0 | 1),) = (0,) {}
    |             ^     ^
@@ -100,7 +100,7 @@ LL +     if let (0 | 1,) = (0,) {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:51:13
+  --> $DIR/issue-54538-unused-parens-lint.rs:58:13
    |
 LL |     if let [(0 | 1)] = [0] {}
    |             ^     ^
@@ -112,7 +112,7 @@ LL +     if let [0 | 1] = [0] {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:52:16
+  --> $DIR/issue-54538-unused-parens-lint.rs:59:16
    |
 LL |     if let 0 | (1 | 2) = 0 {}
    |                ^     ^
@@ -124,7 +124,7 @@ LL +     if let 0 | 1 | 2 = 0 {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:54:15
+  --> $DIR/issue-54538-unused-parens-lint.rs:61:15
    |
 LL |     if let TS((0 | 1)) = TS(0) {}
    |               ^     ^
@@ -136,7 +136,7 @@ LL +     if let TS(0 | 1) = TS(0) {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:56:20
+  --> $DIR/issue-54538-unused-parens-lint.rs:63:20
    |
 LL |     if let NS { f: (0 | 1) } = (NS { f: 0 }) {}
    |                    ^     ^
@@ -148,7 +148,7 @@ LL +     if let NS { f: 0 | 1 } = (NS { f: 0 }) {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:66:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:73:9
    |
 LL |         (_) => {}
    |         ^ ^
@@ -160,7 +160,7 @@ LL +         _ => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:67:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:74:9
    |
 LL |         (y) => {}
    |         ^ ^
@@ -172,7 +172,7 @@ LL +         y => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:68:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:75:9
    |
 LL |         (ref r) => {}
    |         ^     ^
@@ -184,7 +184,7 @@ LL +         ref r => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:69:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:76:9
    |
 LL |         (e @ 1...2) => {}
    |         ^         ^
@@ -196,7 +196,7 @@ LL +         e @ 1...2 => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:75:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:82:9
    |
 LL |         (e @ &(1...2)) => {}
    |         ^            ^
@@ -208,7 +208,7 @@ LL +         e @ &(1...2) => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:76:10
+  --> $DIR/issue-54538-unused-parens-lint.rs:83:10
    |
 LL |         &(_) => {}
    |          ^ ^
@@ -220,7 +220,7 @@ LL +         &_ => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:87:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:94:9
    |
 LL |         (_) => {}
    |         ^ ^
@@ -232,7 +232,7 @@ LL +         _ => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:88:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:95:9
    |
 LL |         (y) => {}
    |         ^ ^
@@ -244,7 +244,7 @@ LL +         y => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:89:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:96:9
    |
 LL |         (ref r) => {}
    |         ^     ^
@@ -256,7 +256,7 @@ LL +         ref r => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:90:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:97:9
    |
 LL |         (e @ 1..=2) => {}
    |         ^         ^
@@ -268,7 +268,7 @@ LL +         e @ 1..=2 => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:96:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:103:9
    |
 LL |         (e @ &(1..=2)) => {}
    |         ^            ^
@@ -280,7 +280,7 @@ LL +         e @ &(1..=2) => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:97:10
+  --> $DIR/issue-54538-unused-parens-lint.rs:104:10
    |
 LL |         &(_) => {}
    |          ^ ^
diff --git a/src/test/ui/lint/unused/issue-59896.rs b/tests/ui/lint/unused/issue-59896.rs
index ff9f19acf..ff9f19acf 100644
--- a/src/test/ui/lint/unused/issue-59896.rs
+++ b/tests/ui/lint/unused/issue-59896.rs
diff --git a/src/test/ui/lint/unused/issue-59896.stderr b/tests/ui/lint/unused/issue-59896.stderr
index 95b7938ae..95b7938ae 100644
--- a/src/test/ui/lint/unused/issue-59896.stderr
+++ b/tests/ui/lint/unused/issue-59896.stderr
diff --git a/src/test/ui/lint/unused/issue-67691-unused-field-in-or-pattern.rs b/tests/ui/lint/unused/issue-67691-unused-field-in-or-pattern.rs
index e3631d014..e3631d014 100644
--- a/src/test/ui/lint/unused/issue-67691-unused-field-in-or-pattern.rs
+++ b/tests/ui/lint/unused/issue-67691-unused-field-in-or-pattern.rs
diff --git a/src/test/ui/lint/unused/issue-67691-unused-field-in-or-pattern.stderr b/tests/ui/lint/unused/issue-67691-unused-field-in-or-pattern.stderr
index 8fc2d1bc8..8fc2d1bc8 100644
--- a/src/test/ui/lint/unused/issue-67691-unused-field-in-or-pattern.stderr
+++ b/tests/ui/lint/unused/issue-67691-unused-field-in-or-pattern.stderr
diff --git a/src/test/ui/lint/unused/issue-70041.rs b/tests/ui/lint/unused/issue-70041.rs
index 22e42295e..22e42295e 100644
--- a/src/test/ui/lint/unused/issue-70041.rs
+++ b/tests/ui/lint/unused/issue-70041.rs
diff --git a/src/test/ui/lint/unused/issue-70041.stderr b/tests/ui/lint/unused/issue-70041.stderr
index b2e6d1aeb..b2e6d1aeb 100644
--- a/src/test/ui/lint/unused/issue-70041.stderr
+++ b/tests/ui/lint/unused/issue-70041.stderr
diff --git a/src/test/ui/lint/unused/issue-71290-unused-paren-binop.rs b/tests/ui/lint/unused/issue-71290-unused-paren-binop.rs
index 24d77e36d..24d77e36d 100644
--- a/src/test/ui/lint/unused/issue-71290-unused-paren-binop.rs
+++ b/tests/ui/lint/unused/issue-71290-unused-paren-binop.rs
diff --git a/src/test/ui/lint/unused/issue-74883-unused-paren-baren-yield.rs b/tests/ui/lint/unused/issue-74883-unused-paren-baren-yield.rs
index 8064c3a88..8064c3a88 100644
--- a/src/test/ui/lint/unused/issue-74883-unused-paren-baren-yield.rs
+++ b/tests/ui/lint/unused/issue-74883-unused-paren-baren-yield.rs
diff --git a/src/test/ui/lint/unused/issue-74883-unused-paren-baren-yield.stderr b/tests/ui/lint/unused/issue-74883-unused-paren-baren-yield.stderr
index 3f1fee332..3f1fee332 100644
--- a/src/test/ui/lint/unused/issue-74883-unused-paren-baren-yield.stderr
+++ b/tests/ui/lint/unused/issue-74883-unused-paren-baren-yield.stderr
diff --git a/src/test/ui/lint/unused/issue-81314-unused-span-ident.fixed b/tests/ui/lint/unused/issue-81314-unused-span-ident.fixed
index aac918f2b..aac918f2b 100644
--- a/src/test/ui/lint/unused/issue-81314-unused-span-ident.fixed
+++ b/tests/ui/lint/unused/issue-81314-unused-span-ident.fixed
diff --git a/src/test/ui/lint/unused/issue-81314-unused-span-ident.rs b/tests/ui/lint/unused/issue-81314-unused-span-ident.rs
index 78296f425..78296f425 100644
--- a/src/test/ui/lint/unused/issue-81314-unused-span-ident.rs
+++ b/tests/ui/lint/unused/issue-81314-unused-span-ident.rs
diff --git a/src/test/ui/lint/unused/issue-81314-unused-span-ident.stderr b/tests/ui/lint/unused/issue-81314-unused-span-ident.stderr
index 519c71e94..519c71e94 100644
--- a/src/test/ui/lint/unused/issue-81314-unused-span-ident.stderr
+++ b/tests/ui/lint/unused/issue-81314-unused-span-ident.stderr
diff --git a/src/test/ui/lint/unused/issue-85913.rs b/tests/ui/lint/unused/issue-85913.rs
index 7f3817b6e..7f3817b6e 100644
--- a/src/test/ui/lint/unused/issue-85913.rs
+++ b/tests/ui/lint/unused/issue-85913.rs
diff --git a/src/test/ui/lint/unused/issue-85913.stderr b/tests/ui/lint/unused/issue-85913.stderr
index 8234ed3b1..8234ed3b1 100644
--- a/src/test/ui/lint/unused/issue-85913.stderr
+++ b/tests/ui/lint/unused/issue-85913.stderr
diff --git a/src/test/ui/lint/unused/issue-88519-unused-paren.rs b/tests/ui/lint/unused/issue-88519-unused-paren.rs
index ce3d15ac1..ce3d15ac1 100644
--- a/src/test/ui/lint/unused/issue-88519-unused-paren.rs
+++ b/tests/ui/lint/unused/issue-88519-unused-paren.rs
diff --git a/src/test/ui/lint/unused/issue-90807-unused-paren-error.rs b/tests/ui/lint/unused/issue-90807-unused-paren-error.rs
index 2fca2e262..2fca2e262 100644
--- a/src/test/ui/lint/unused/issue-90807-unused-paren-error.rs
+++ b/tests/ui/lint/unused/issue-90807-unused-paren-error.rs
diff --git a/src/test/ui/lint/unused/issue-90807-unused-paren-error.stderr b/tests/ui/lint/unused/issue-90807-unused-paren-error.stderr
index b3b809d5f..b3b809d5f 100644
--- a/src/test/ui/lint/unused/issue-90807-unused-paren-error.stderr
+++ b/tests/ui/lint/unused/issue-90807-unused-paren-error.stderr
diff --git a/src/test/ui/lint/unused/issue-90807-unused-paren.rs b/tests/ui/lint/unused/issue-90807-unused-paren.rs
index 4c0930f96..4c0930f96 100644
--- a/src/test/ui/lint/unused/issue-90807-unused-paren.rs
+++ b/tests/ui/lint/unused/issue-90807-unused-paren.rs
diff --git a/src/test/ui/lint/unused/issue-92751.rs b/tests/ui/lint/unused/issue-92751.rs
index 2fb292736..2fb292736 100644
--- a/src/test/ui/lint/unused/issue-92751.rs
+++ b/tests/ui/lint/unused/issue-92751.rs
diff --git a/src/test/ui/lint/unused/issue-92751.stderr b/tests/ui/lint/unused/issue-92751.stderr
index 0a8d8e672..0a8d8e672 100644
--- a/src/test/ui/lint/unused/issue-92751.stderr
+++ b/tests/ui/lint/unused/issue-92751.stderr
diff --git a/src/test/ui/lint/unused/lint-unused-extern-crate.rs b/tests/ui/lint/unused/lint-unused-extern-crate.rs
index d5e4da526..d5e4da526 100644
--- a/src/test/ui/lint/unused/lint-unused-extern-crate.rs
+++ b/tests/ui/lint/unused/lint-unused-extern-crate.rs
diff --git a/src/test/ui/lint/unused/lint-unused-extern-crate.stderr b/tests/ui/lint/unused/lint-unused-extern-crate.stderr
index 46d8f3bee..46d8f3bee 100644
--- a/src/test/ui/lint/unused/lint-unused-extern-crate.stderr
+++ b/tests/ui/lint/unused/lint-unused-extern-crate.stderr
diff --git a/src/test/ui/lint/unused/lint-unused-imports.rs b/tests/ui/lint/unused/lint-unused-imports.rs
index 4754d8880..4754d8880 100644
--- a/src/test/ui/lint/unused/lint-unused-imports.rs
+++ b/tests/ui/lint/unused/lint-unused-imports.rs
diff --git a/src/test/ui/lint/unused/lint-unused-imports.stderr b/tests/ui/lint/unused/lint-unused-imports.stderr
index 0574ca456..0574ca456 100644
--- a/src/test/ui/lint/unused/lint-unused-imports.stderr
+++ b/tests/ui/lint/unused/lint-unused-imports.stderr
diff --git a/src/test/ui/lint/unused/lint-unused-mut-self.fixed b/tests/ui/lint/unused/lint-unused-mut-self.fixed
index 92ce10358..92ce10358 100644
--- a/src/test/ui/lint/unused/lint-unused-mut-self.fixed
+++ b/tests/ui/lint/unused/lint-unused-mut-self.fixed
diff --git a/src/test/ui/lint/unused/lint-unused-mut-self.rs b/tests/ui/lint/unused/lint-unused-mut-self.rs
index 70736ce21..70736ce21 100644
--- a/src/test/ui/lint/unused/lint-unused-mut-self.rs
+++ b/tests/ui/lint/unused/lint-unused-mut-self.rs
diff --git a/src/test/ui/lint/unused/lint-unused-mut-self.stderr b/tests/ui/lint/unused/lint-unused-mut-self.stderr
index 01a524bd3..01a524bd3 100644
--- a/src/test/ui/lint/unused/lint-unused-mut-self.stderr
+++ b/tests/ui/lint/unused/lint-unused-mut-self.stderr
diff --git a/src/test/ui/lint/unused/lint-unused-mut-variables.rs b/tests/ui/lint/unused/lint-unused-mut-variables.rs
index 67ec7facf..67ec7facf 100644
--- a/src/test/ui/lint/unused/lint-unused-mut-variables.rs
+++ b/tests/ui/lint/unused/lint-unused-mut-variables.rs
diff --git a/src/test/ui/lint/unused/lint-unused-mut-variables.stderr b/tests/ui/lint/unused/lint-unused-mut-variables.stderr
index 805ed2b40..805ed2b40 100644
--- a/src/test/ui/lint/unused/lint-unused-mut-variables.stderr
+++ b/tests/ui/lint/unused/lint-unused-mut-variables.stderr
diff --git a/src/test/ui/lint/unused/lint-unused-variables.rs b/tests/ui/lint/unused/lint-unused-variables.rs
index 6850e9992..6850e9992 100644
--- a/src/test/ui/lint/unused/lint-unused-variables.rs
+++ b/tests/ui/lint/unused/lint-unused-variables.rs
diff --git a/src/test/ui/lint/unused/lint-unused-variables.stderr b/tests/ui/lint/unused/lint-unused-variables.stderr
index fd9a5bcbf..fd9a5bcbf 100644
--- a/src/test/ui/lint/unused/lint-unused-variables.stderr
+++ b/tests/ui/lint/unused/lint-unused-variables.stderr
diff --git a/src/test/ui/lint/unused/must-use-box-from-raw.rs b/tests/ui/lint/unused/must-use-box-from-raw.rs
index 9ea772689..9ea772689 100644
--- a/src/test/ui/lint/unused/must-use-box-from-raw.rs
+++ b/tests/ui/lint/unused/must-use-box-from-raw.rs
diff --git a/src/test/ui/lint/unused/must-use-box-from-raw.stderr b/tests/ui/lint/unused/must-use-box-from-raw.stderr
index 721182757..47ab613be 100644
--- a/src/test/ui/lint/unused/must-use-box-from-raw.stderr
+++ b/tests/ui/lint/unused/must-use-box-from-raw.stderr
@@ -4,7 +4,7 @@ warning: unused return value of `Box::<T>::from_raw` that must be used
 LL |     Box::from_raw(ptr);
    |     ^^^^^^^^^^^^^^^^^^
    |
-   = note: call `drop(from_raw(ptr))` if you intend to drop the `Box`
+   = note: call `drop(Box::from_raw(ptr))` if you intend to drop the `Box`
 note: the lint level is defined here
   --> $DIR/must-use-box-from-raw.rs:5:9
    |
diff --git a/src/test/ui/lint/unused/must-use-ops.rs b/tests/ui/lint/unused/must-use-ops.rs
index 60f877aa8..60f877aa8 100644
--- a/src/test/ui/lint/unused/must-use-ops.rs
+++ b/tests/ui/lint/unused/must-use-ops.rs
diff --git a/src/test/ui/lint/unused/must-use-ops.stderr b/tests/ui/lint/unused/must-use-ops.stderr
index 79a53d39c..79a53d39c 100644
--- a/src/test/ui/lint/unused/must-use-ops.stderr
+++ b/tests/ui/lint/unused/must-use-ops.stderr
diff --git a/src/test/ui/lint/unused/must_use-array.rs b/tests/ui/lint/unused/must_use-array.rs
index b7bae4b0a..b7bae4b0a 100644
--- a/src/test/ui/lint/unused/must_use-array.rs
+++ b/tests/ui/lint/unused/must_use-array.rs
diff --git a/src/test/ui/lint/unused/must_use-array.stderr b/tests/ui/lint/unused/must_use-array.stderr
index 61ef2088d..61ef2088d 100644
--- a/src/test/ui/lint/unused/must_use-array.stderr
+++ b/tests/ui/lint/unused/must_use-array.stderr
diff --git a/src/test/ui/lint/unused/must_use-in-stdlib-traits.rs b/tests/ui/lint/unused/must_use-in-stdlib-traits.rs
index 70dddf61f..70dddf61f 100644
--- a/src/test/ui/lint/unused/must_use-in-stdlib-traits.rs
+++ b/tests/ui/lint/unused/must_use-in-stdlib-traits.rs
diff --git a/src/test/ui/lint/unused/must_use-in-stdlib-traits.stderr b/tests/ui/lint/unused/must_use-in-stdlib-traits.stderr
index ef738708d..ef738708d 100644
--- a/src/test/ui/lint/unused/must_use-in-stdlib-traits.stderr
+++ b/tests/ui/lint/unused/must_use-in-stdlib-traits.stderr
diff --git a/src/test/ui/lint/unused/must_use-trait.rs b/tests/ui/lint/unused/must_use-trait.rs
index 0aa751443..0aa751443 100644
--- a/src/test/ui/lint/unused/must_use-trait.rs
+++ b/tests/ui/lint/unused/must_use-trait.rs
diff --git a/src/test/ui/lint/unused/must_use-trait.stderr b/tests/ui/lint/unused/must_use-trait.stderr
index 2f5496484..2f5496484 100644
--- a/src/test/ui/lint/unused/must_use-trait.stderr
+++ b/tests/ui/lint/unused/must_use-trait.stderr
diff --git a/src/test/ui/lint/unused/must_use-tuple.rs b/tests/ui/lint/unused/must_use-tuple.rs
index 0f0aa2025..0f0aa2025 100644
--- a/src/test/ui/lint/unused/must_use-tuple.rs
+++ b/tests/ui/lint/unused/must_use-tuple.rs
diff --git a/src/test/ui/lint/unused/must_use-tuple.stderr b/tests/ui/lint/unused/must_use-tuple.stderr
index 63e0318fb..63e0318fb 100644
--- a/src/test/ui/lint/unused/must_use-tuple.stderr
+++ b/tests/ui/lint/unused/must_use-tuple.stderr
diff --git a/src/test/ui/lint/unused/must_use-unit.rs b/tests/ui/lint/unused/must_use-unit.rs
index 4dd4798ab..4dd4798ab 100644
--- a/src/test/ui/lint/unused/must_use-unit.rs
+++ b/tests/ui/lint/unused/must_use-unit.rs
diff --git a/src/test/ui/lint/unused/must_use-unit.stderr b/tests/ui/lint/unused/must_use-unit.stderr
index 9fcbc5074..9fcbc5074 100644
--- a/src/test/ui/lint/unused/must_use-unit.stderr
+++ b/tests/ui/lint/unused/must_use-unit.stderr
diff --git a/src/test/ui/lint/unused/no-unused-parens-return-block.rs b/tests/ui/lint/unused/no-unused-parens-return-block.rs
index 37dc519a2..37dc519a2 100644
--- a/src/test/ui/lint/unused/no-unused-parens-return-block.rs
+++ b/tests/ui/lint/unused/no-unused-parens-return-block.rs
diff --git a/src/test/ui/lint/unused/unused-async.rs b/tests/ui/lint/unused/unused-async.rs
index 4be93aa15..4be93aa15 100644
--- a/src/test/ui/lint/unused/unused-async.rs
+++ b/tests/ui/lint/unused/unused-async.rs
diff --git a/src/test/ui/lint/unused/unused-async.stderr b/tests/ui/lint/unused/unused-async.stderr
index 4bcb26dc1..4bcb26dc1 100644
--- a/src/test/ui/lint/unused/unused-async.stderr
+++ b/tests/ui/lint/unused/unused-async.stderr
diff --git a/src/test/ui/lint/unused/unused-attr-duplicate.rs b/tests/ui/lint/unused/unused-attr-duplicate.rs
index 692617eac..692617eac 100644
--- a/src/test/ui/lint/unused/unused-attr-duplicate.rs
+++ b/tests/ui/lint/unused/unused-attr-duplicate.rs
diff --git a/src/test/ui/lint/unused/unused-attr-duplicate.stderr b/tests/ui/lint/unused/unused-attr-duplicate.stderr
index 769b17487..769b17487 100644
--- a/src/test/ui/lint/unused/unused-attr-duplicate.stderr
+++ b/tests/ui/lint/unused/unused-attr-duplicate.stderr
diff --git a/src/test/ui/lint/unused/unused-attr-macro-rules.rs b/tests/ui/lint/unused/unused-attr-macro-rules.rs
index c0fc280ab..c0fc280ab 100644
--- a/src/test/ui/lint/unused/unused-attr-macro-rules.rs
+++ b/tests/ui/lint/unused/unused-attr-macro-rules.rs
diff --git a/src/test/ui/lint/unused/unused-attr-macro-rules.stderr b/tests/ui/lint/unused/unused-attr-macro-rules.stderr
index e3ca90d9a..e3ca90d9a 100644
--- a/src/test/ui/lint/unused/unused-attr-macro-rules.stderr
+++ b/tests/ui/lint/unused/unused-attr-macro-rules.stderr
diff --git a/src/test/ui/lint/unused/unused-closure.rs b/tests/ui/lint/unused/unused-closure.rs
index c96c90731..c96c90731 100644
--- a/src/test/ui/lint/unused/unused-closure.rs
+++ b/tests/ui/lint/unused/unused-closure.rs
diff --git a/src/test/ui/lint/unused/unused-closure.stderr b/tests/ui/lint/unused/unused-closure.stderr
index c3a82402e..c3a82402e 100644
--- a/src/test/ui/lint/unused/unused-closure.stderr
+++ b/tests/ui/lint/unused/unused-closure.stderr
diff --git a/src/test/ui/lint/unused/unused-doc-comments-edge-cases.rs b/tests/ui/lint/unused/unused-doc-comments-edge-cases.rs
index 54d86c31f..54d86c31f 100644
--- a/src/test/ui/lint/unused/unused-doc-comments-edge-cases.rs
+++ b/tests/ui/lint/unused/unused-doc-comments-edge-cases.rs
diff --git a/src/test/ui/lint/unused/unused-doc-comments-edge-cases.stderr b/tests/ui/lint/unused/unused-doc-comments-edge-cases.stderr
index 078b780d8..078b780d8 100644
--- a/src/test/ui/lint/unused/unused-doc-comments-edge-cases.stderr
+++ b/tests/ui/lint/unused/unused-doc-comments-edge-cases.stderr
diff --git a/src/test/ui/lint/unused/unused-doc-comments-for-macros.rs b/tests/ui/lint/unused/unused-doc-comments-for-macros.rs
index 05828ebb2..05828ebb2 100644
--- a/src/test/ui/lint/unused/unused-doc-comments-for-macros.rs
+++ b/tests/ui/lint/unused/unused-doc-comments-for-macros.rs
diff --git a/src/test/ui/lint/unused/unused-doc-comments-for-macros.stderr b/tests/ui/lint/unused/unused-doc-comments-for-macros.stderr
index 26b1c2b05..26b1c2b05 100644
--- a/src/test/ui/lint/unused/unused-doc-comments-for-macros.stderr
+++ b/tests/ui/lint/unused/unused-doc-comments-for-macros.stderr
diff --git a/src/test/ui/lint/unused/unused-macro-rules-compile-error.rs b/tests/ui/lint/unused/unused-macro-rules-compile-error.rs
index 4d51db89b..4d51db89b 100644
--- a/src/test/ui/lint/unused/unused-macro-rules-compile-error.rs
+++ b/tests/ui/lint/unused/unused-macro-rules-compile-error.rs
diff --git a/src/test/ui/lint/unused/unused-macro-rules-compile-error.stderr b/tests/ui/lint/unused/unused-macro-rules-compile-error.stderr
index 76af8c967..76af8c967 100644
--- a/src/test/ui/lint/unused/unused-macro-rules-compile-error.stderr
+++ b/tests/ui/lint/unused/unused-macro-rules-compile-error.stderr
diff --git a/src/test/ui/lint/unused/unused-macro-rules-decl.rs b/tests/ui/lint/unused/unused-macro-rules-decl.rs
index 537c84940..537c84940 100644
--- a/src/test/ui/lint/unused/unused-macro-rules-decl.rs
+++ b/tests/ui/lint/unused/unused-macro-rules-decl.rs
diff --git a/src/test/ui/lint/unused/unused-macro-rules-decl.stderr b/tests/ui/lint/unused/unused-macro-rules-decl.stderr
index 4d9b22fed..4d9b22fed 100644
--- a/src/test/ui/lint/unused/unused-macro-rules-decl.stderr
+++ b/tests/ui/lint/unused/unused-macro-rules-decl.stderr
diff --git a/src/test/ui/lint/unused/unused-macro-rules-malformed-rule.rs b/tests/ui/lint/unused/unused-macro-rules-malformed-rule.rs
index a826026ec..a826026ec 100644
--- a/src/test/ui/lint/unused/unused-macro-rules-malformed-rule.rs
+++ b/tests/ui/lint/unused/unused-macro-rules-malformed-rule.rs
diff --git a/src/test/ui/lint/unused/unused-macro-rules-malformed-rule.stderr b/tests/ui/lint/unused/unused-macro-rules-malformed-rule.stderr
index 797c86710..797c86710 100644
--- a/src/test/ui/lint/unused/unused-macro-rules-malformed-rule.stderr
+++ b/tests/ui/lint/unused/unused-macro-rules-malformed-rule.stderr
diff --git a/src/test/ui/lint/unused/unused-macro-rules.rs b/tests/ui/lint/unused/unused-macro-rules.rs
index eeaf4d1b0..eeaf4d1b0 100644
--- a/src/test/ui/lint/unused/unused-macro-rules.rs
+++ b/tests/ui/lint/unused/unused-macro-rules.rs
diff --git a/src/test/ui/lint/unused/unused-macro-rules.stderr b/tests/ui/lint/unused/unused-macro-rules.stderr
index 2b3098a51..2b3098a51 100644
--- a/src/test/ui/lint/unused/unused-macro-rules.stderr
+++ b/tests/ui/lint/unused/unused-macro-rules.stderr
diff --git a/src/test/ui/lint/unused/unused-macro-with-bad-frag-spec.rs b/tests/ui/lint/unused/unused-macro-with-bad-frag-spec.rs
index ce187047b..ce187047b 100644
--- a/src/test/ui/lint/unused/unused-macro-with-bad-frag-spec.rs
+++ b/tests/ui/lint/unused/unused-macro-with-bad-frag-spec.rs
diff --git a/src/test/ui/lint/unused/unused-macro-with-bad-frag-spec.stderr b/tests/ui/lint/unused/unused-macro-with-bad-frag-spec.stderr
index 6edf0a2cf..6edf0a2cf 100644
--- a/src/test/ui/lint/unused/unused-macro-with-bad-frag-spec.stderr
+++ b/tests/ui/lint/unused/unused-macro-with-bad-frag-spec.stderr
diff --git a/src/test/ui/lint/unused/unused-macro-with-follow-violation.rs b/tests/ui/lint/unused/unused-macro-with-follow-violation.rs
index 1666dae69..1666dae69 100644
--- a/src/test/ui/lint/unused/unused-macro-with-follow-violation.rs
+++ b/tests/ui/lint/unused/unused-macro-with-follow-violation.rs
diff --git a/src/test/ui/lint/unused/unused-macro-with-follow-violation.stderr b/tests/ui/lint/unused/unused-macro-with-follow-violation.stderr
index 5eced4f06..5eced4f06 100644
--- a/src/test/ui/lint/unused/unused-macro-with-follow-violation.stderr
+++ b/tests/ui/lint/unused/unused-macro-with-follow-violation.stderr
diff --git a/src/test/ui/lint/unused/unused-macros-decl.rs b/tests/ui/lint/unused/unused-macros-decl.rs
index 21f6108b1..21f6108b1 100644
--- a/src/test/ui/lint/unused/unused-macros-decl.rs
+++ b/tests/ui/lint/unused/unused-macros-decl.rs
diff --git a/src/test/ui/lint/unused/unused-macros-decl.stderr b/tests/ui/lint/unused/unused-macros-decl.stderr
index 1f426b9d9..1f426b9d9 100644
--- a/src/test/ui/lint/unused/unused-macros-decl.stderr
+++ b/tests/ui/lint/unused/unused-macros-decl.stderr
diff --git a/src/test/ui/lint/unused/unused-macros-malformed-rule.rs b/tests/ui/lint/unused/unused-macros-malformed-rule.rs
index d4c35fad9..d4c35fad9 100644
--- a/src/test/ui/lint/unused/unused-macros-malformed-rule.rs
+++ b/tests/ui/lint/unused/unused-macros-malformed-rule.rs
diff --git a/src/test/ui/lint/unused/unused-macros-malformed-rule.stderr b/tests/ui/lint/unused/unused-macros-malformed-rule.stderr
index 9a880dccf..9a880dccf 100644
--- a/src/test/ui/lint/unused/unused-macros-malformed-rule.stderr
+++ b/tests/ui/lint/unused/unused-macros-malformed-rule.stderr
diff --git a/src/test/ui/lint/unused/unused-macros.rs b/tests/ui/lint/unused/unused-macros.rs
index 70b50b208..70b50b208 100644
--- a/src/test/ui/lint/unused/unused-macros.rs
+++ b/tests/ui/lint/unused/unused-macros.rs
diff --git a/src/test/ui/lint/unused/unused-macros.stderr b/tests/ui/lint/unused/unused-macros.stderr
index d0baf5bec..d0baf5bec 100644
--- a/src/test/ui/lint/unused/unused-macros.stderr
+++ b/tests/ui/lint/unused/unused-macros.stderr
diff --git a/src/test/ui/lint/unused/unused-mut-warning-captured-var.fixed b/tests/ui/lint/unused/unused-mut-warning-captured-var.fixed
index c21f18015..c21f18015 100644
--- a/src/test/ui/lint/unused/unused-mut-warning-captured-var.fixed
+++ b/tests/ui/lint/unused/unused-mut-warning-captured-var.fixed
diff --git a/src/test/ui/lint/unused/unused-mut-warning-captured-var.rs b/tests/ui/lint/unused/unused-mut-warning-captured-var.rs
index 3119d83a0..3119d83a0 100644
--- a/src/test/ui/lint/unused/unused-mut-warning-captured-var.rs
+++ b/tests/ui/lint/unused/unused-mut-warning-captured-var.rs
diff --git a/src/test/ui/lint/unused/unused-mut-warning-captured-var.stderr b/tests/ui/lint/unused/unused-mut-warning-captured-var.stderr
index 20aeedcc2..20aeedcc2 100644
--- a/src/test/ui/lint/unused/unused-mut-warning-captured-var.stderr
+++ b/tests/ui/lint/unused/unused-mut-warning-captured-var.stderr
diff --git a/src/test/ui/lint/unused/unused-result.rs b/tests/ui/lint/unused/unused-result.rs
index e283eaa88..e283eaa88 100644
--- a/src/test/ui/lint/unused/unused-result.rs
+++ b/tests/ui/lint/unused/unused-result.rs
diff --git a/src/test/ui/lint/unused/unused-result.stderr b/tests/ui/lint/unused/unused-result.stderr
index 4e1ba1fd9..4e1ba1fd9 100644
--- a/src/test/ui/lint/unused/unused-result.stderr
+++ b/tests/ui/lint/unused/unused-result.stderr
diff --git a/src/test/ui/lint/unused/unused-supertrait.rs b/tests/ui/lint/unused/unused-supertrait.rs
index 64a8e5204..64a8e5204 100644
--- a/src/test/ui/lint/unused/unused-supertrait.rs
+++ b/tests/ui/lint/unused/unused-supertrait.rs
diff --git a/src/test/ui/lint/unused/unused-supertrait.stderr b/tests/ui/lint/unused/unused-supertrait.stderr
index cb45add9c..cb45add9c 100644
--- a/src/test/ui/lint/unused/unused-supertrait.stderr
+++ b/tests/ui/lint/unused/unused-supertrait.stderr
diff --git a/src/test/ui/lint/unused/unused_attributes-must_use.rs b/tests/ui/lint/unused/unused_attributes-must_use.rs
index 51f868706..51f868706 100644
--- a/src/test/ui/lint/unused/unused_attributes-must_use.rs
+++ b/tests/ui/lint/unused/unused_attributes-must_use.rs
diff --git a/src/test/ui/lint/unused/unused_attributes-must_use.stderr b/tests/ui/lint/unused/unused_attributes-must_use.stderr
index 0f699429e..0f699429e 100644
--- a/src/test/ui/lint/unused/unused_attributes-must_use.stderr
+++ b/tests/ui/lint/unused/unused_attributes-must_use.stderr
diff --git a/src/test/ui/lint/unused/useless-comment.rs b/tests/ui/lint/unused/useless-comment.rs
index 7d2e5ab6f..7d2e5ab6f 100644
--- a/src/test/ui/lint/unused/useless-comment.rs
+++ b/tests/ui/lint/unused/useless-comment.rs
diff --git a/src/test/ui/lint/unused/useless-comment.stderr b/tests/ui/lint/unused/useless-comment.stderr
index 8bb5bdaeb..8bb5bdaeb 100644
--- a/src/test/ui/lint/unused/useless-comment.stderr
+++ b/tests/ui/lint/unused/useless-comment.stderr
diff --git a/tests/ui/lint/unused_braces.fixed b/tests/ui/lint/unused_braces.fixed
new file mode 100644
index 000000000..e691fb37e
--- /dev/null
+++ b/tests/ui/lint/unused_braces.fixed
@@ -0,0 +1,57 @@
+// check-pass
+// run-rustfix
+
+#![warn(unused_braces, unused_parens)]
+#![allow(unreachable_code, unused_unsafe)] // for rustfix
+
+fn consume<T>(_: T) {}
+
+fn main() {
+    let _ = 7;
+    //~^WARN unnecessary parentheses
+
+    // Do not emit a lint in these cases,
+    // as we have to be careful with
+    // `ref` patterns.
+    {
+        let _ = { 7 };
+
+        if let 7 = { 7 } { }
+
+        match { 7 } {
+            _ => (),
+        }
+    }
+
+    if true {
+        //~^ WARN unnecessary braces
+    }
+
+    while false {
+        //~^ WARN unnecessary braces
+    }
+
+    let _: [u8; 3];
+    //~^ WARN unnecessary braces
+
+    consume(7);
+    //~^ WARN unnecessary braces
+
+    // Do not emit lint for multiline blocks.
+    let _ = {
+        7
+    };
+
+    // Do not emit lint for unsafe blocks.
+    let _ = unsafe { 7 };
+
+    // Do not emit lint, as the `{` would then
+    // be parsed as part of the `return`.
+    if { return } {
+
+    }
+
+    // regression test for https://github.com/rust-lang/rust/issues/106899
+    return println!("!");
+    //~^ WARN unnecessary braces
+}
diff --git a/tests/ui/lint/unused_braces.rs b/tests/ui/lint/unused_braces.rs
new file mode 100644
index 000000000..0d260d2cb
--- /dev/null
+++ b/tests/ui/lint/unused_braces.rs
@@ -0,0 +1,57 @@
+// check-pass
+// run-rustfix
+
+#![warn(unused_braces, unused_parens)]
+#![allow(unreachable_code, unused_unsafe)] // for rustfix
+
+fn consume<T>(_: T) {}
+
+fn main() {
+    let _ = (7);
+    //~^WARN unnecessary parentheses
+
+    // Do not emit a lint in these cases,
+    // as we have to be careful with
+    // `ref` patterns.
+    {
+        let _ = { 7 };
+
+        if let 7 = { 7 } { }
+
+        match { 7 } {
+            _ => (),
+        }
+    }
+
+    if { true } {
+        //~^ WARN unnecessary braces
+    }
+
+    while { false } {
+        //~^ WARN unnecessary braces
+    }
+
+    let _: [u8; { 3 }];
+    //~^ WARN unnecessary braces
+
+    consume({ 7 });
+    //~^ WARN unnecessary braces
+
+    // Do not emit lint for multiline blocks.
+    let _ = {
+        7
+    };
+
+    // Do not emit lint for unsafe blocks.
+    let _ = unsafe { 7 };
+
+    // Do not emit lint, as the `{` would then
+    // be parsed as part of the `return`.
+    if { return } {
+
+    }
+
+    // regression test for https://github.com/rust-lang/rust/issues/106899
+    return { println!("!") };
+    //~^ WARN unnecessary braces
+}
diff --git a/tests/ui/lint/unused_braces.stderr b/tests/ui/lint/unused_braces.stderr
new file mode 100644
index 000000000..0b4a1c321
--- /dev/null
+++ b/tests/ui/lint/unused_braces.stderr
@@ -0,0 +1,84 @@
+warning: unnecessary parentheses around assigned value
+  --> $DIR/unused_braces.rs:10:13
+   |
+LL |     let _ = (7);
+   |             ^ ^
+   |
+note: the lint level is defined here
+  --> $DIR/unused_braces.rs:4:24
+   |
+LL | #![warn(unused_braces, unused_parens)]
+   |                        ^^^^^^^^^^^^^
+help: remove these parentheses
+   |
+LL -     let _ = (7);
+LL +     let _ = 7;
+   |
+
+warning: unnecessary braces around `if` condition
+  --> $DIR/unused_braces.rs:26:8
+   |
+LL |     if { true } {
+   |        ^^    ^^
+   |
+note: the lint level is defined here
+  --> $DIR/unused_braces.rs:4:9
+   |
+LL | #![warn(unused_braces, unused_parens)]
+   |         ^^^^^^^^^^^^^
+help: remove these braces
+   |
+LL -     if { true } {
+LL +     if true {
+   |
+
+warning: unnecessary braces around `while` condition
+  --> $DIR/unused_braces.rs:30:11
+   |
+LL |     while { false } {
+   |           ^^     ^^
+   |
+help: remove these braces
+   |
+LL -     while { false } {
+LL +     while false {
+   |
+
+warning: unnecessary braces around const expression
+  --> $DIR/unused_braces.rs:34:17
+   |
+LL |     let _: [u8; { 3 }];
+   |                 ^^ ^^
+   |
+help: remove these braces
+   |
+LL -     let _: [u8; { 3 }];
+LL +     let _: [u8; 3];
+   |
+
+warning: unnecessary braces around function argument
+  --> $DIR/unused_braces.rs:37:13
+   |
+LL |     consume({ 7 });
+   |             ^^ ^^
+   |
+help: remove these braces
+   |
+LL -     consume({ 7 });
+LL +     consume(7);
+   |
+
+warning: unnecessary braces around `return` value
+  --> $DIR/unused_braces.rs:55:12
+   |
+LL |     return { println!("!") };
+   |            ^^             ^^
+   |
+help: remove these braces
+   |
+LL -     return { println!("!") };
+LL +     return println!("!");
+   |
+
+warning: 6 warnings emitted
+
diff --git a/src/test/ui/lint/unused_braces_borrow.fixed b/tests/ui/lint/unused_braces_borrow.fixed
index 583506f89..583506f89 100644
--- a/src/test/ui/lint/unused_braces_borrow.fixed
+++ b/tests/ui/lint/unused_braces_borrow.fixed
diff --git a/src/test/ui/lint/unused_braces_borrow.rs b/tests/ui/lint/unused_braces_borrow.rs
index b7c529d73..b7c529d73 100644
--- a/src/test/ui/lint/unused_braces_borrow.rs
+++ b/tests/ui/lint/unused_braces_borrow.rs
diff --git a/src/test/ui/lint/unused_braces_borrow.stderr b/tests/ui/lint/unused_braces_borrow.stderr
index 05f7432b8..05f7432b8 100644
--- a/src/test/ui/lint/unused_braces_borrow.stderr
+++ b/tests/ui/lint/unused_braces_borrow.stderr
diff --git a/tests/ui/lint/unused_braces_macro.rs b/tests/ui/lint/unused_braces_macro.rs
new file mode 100644
index 000000000..bfee95378
--- /dev/null
+++ b/tests/ui/lint/unused_braces_macro.rs
@@ -0,0 +1,6 @@
+// build-pass
+pub fn foo<const BAR: bool> () {}
+
+fn main() {
+    foo::<{cfg!(feature = "foo")}>();
+}
diff --git a/src/test/ui/lint/unused_import_warning_issue_45268.rs b/tests/ui/lint/unused_import_warning_issue_45268.rs
index 5ae482863..5ae482863 100644
--- a/src/test/ui/lint/unused_import_warning_issue_45268.rs
+++ b/tests/ui/lint/unused_import_warning_issue_45268.rs
diff --git a/src/test/ui/lint/unused_import_warning_issue_45268.stderr b/tests/ui/lint/unused_import_warning_issue_45268.stderr
index fa8699abc..fa8699abc 100644
--- a/src/test/ui/lint/unused_import_warning_issue_45268.stderr
+++ b/tests/ui/lint/unused_import_warning_issue_45268.stderr
diff --git a/src/test/ui/lint/unused_labels.rs b/tests/ui/lint/unused_labels.rs
index 87a5392fd..87a5392fd 100644
--- a/src/test/ui/lint/unused_labels.rs
+++ b/tests/ui/lint/unused_labels.rs
diff --git a/src/test/ui/lint/unused_labels.stderr b/tests/ui/lint/unused_labels.stderr
index 846da792b..846da792b 100644
--- a/src/test/ui/lint/unused_labels.stderr
+++ b/tests/ui/lint/unused_labels.stderr
diff --git a/src/test/ui/lint/unused_parens_json_suggestion.fixed b/tests/ui/lint/unused_parens_json_suggestion.fixed
index c40045404..c40045404 100644
--- a/src/test/ui/lint/unused_parens_json_suggestion.fixed
+++ b/tests/ui/lint/unused_parens_json_suggestion.fixed
diff --git a/src/test/ui/lint/unused_parens_json_suggestion.rs b/tests/ui/lint/unused_parens_json_suggestion.rs
index 962c8bdd7..962c8bdd7 100644
--- a/src/test/ui/lint/unused_parens_json_suggestion.rs
+++ b/tests/ui/lint/unused_parens_json_suggestion.rs
diff --git a/src/test/ui/lint/unused_parens_json_suggestion.stderr b/tests/ui/lint/unused_parens_json_suggestion.stderr
index ea19e0cdc..ea19e0cdc 100644
--- a/src/test/ui/lint/unused_parens_json_suggestion.stderr
+++ b/tests/ui/lint/unused_parens_json_suggestion.stderr
diff --git a/src/test/ui/lint/unused_parens_multibyte_recovery.rs b/tests/ui/lint/unused_parens_multibyte_recovery.rs
index 8fcfae22a..8fcfae22a 100644
--- a/src/test/ui/lint/unused_parens_multibyte_recovery.rs
+++ b/tests/ui/lint/unused_parens_multibyte_recovery.rs
diff --git a/src/test/ui/lint/unused_parens_multibyte_recovery.stderr b/tests/ui/lint/unused_parens_multibyte_recovery.stderr
index a0302b17e..a0302b17e 100644
--- a/src/test/ui/lint/unused_parens_multibyte_recovery.stderr
+++ b/tests/ui/lint/unused_parens_multibyte_recovery.stderr
diff --git a/src/test/ui/lint/unused_parens_remove_json_suggestion.fixed b/tests/ui/lint/unused_parens_remove_json_suggestion.fixed
index 8a57cd573..8a57cd573 100644
--- a/src/test/ui/lint/unused_parens_remove_json_suggestion.fixed
+++ b/tests/ui/lint/unused_parens_remove_json_suggestion.fixed
diff --git a/src/test/ui/lint/unused_parens_remove_json_suggestion.rs b/tests/ui/lint/unused_parens_remove_json_suggestion.rs
index 952332d54..952332d54 100644
--- a/src/test/ui/lint/unused_parens_remove_json_suggestion.rs
+++ b/tests/ui/lint/unused_parens_remove_json_suggestion.rs
diff --git a/src/test/ui/lint/unused_parens_remove_json_suggestion.stderr b/tests/ui/lint/unused_parens_remove_json_suggestion.stderr
index f4c6ceaf1..f4c6ceaf1 100644
--- a/src/test/ui/lint/unused_parens_remove_json_suggestion.stderr
+++ b/tests/ui/lint/unused_parens_remove_json_suggestion.stderr
diff --git a/src/test/ui/lint/unused_variables-issue-82488.fixed b/tests/ui/lint/unused_variables-issue-82488.fixed
index 3cb2c90d0..3cb2c90d0 100644
--- a/src/test/ui/lint/unused_variables-issue-82488.fixed
+++ b/tests/ui/lint/unused_variables-issue-82488.fixed
diff --git a/src/test/ui/lint/unused_variables-issue-82488.rs b/tests/ui/lint/unused_variables-issue-82488.rs
index 007b0799b..007b0799b 100644
--- a/src/test/ui/lint/unused_variables-issue-82488.rs
+++ b/tests/ui/lint/unused_variables-issue-82488.rs
diff --git a/src/test/ui/lint/unused_variables-issue-82488.stderr b/tests/ui/lint/unused_variables-issue-82488.stderr
index dce03a0f7..dce03a0f7 100644
--- a/src/test/ui/lint/unused_variables-issue-82488.stderr
+++ b/tests/ui/lint/unused_variables-issue-82488.stderr
diff --git a/src/test/ui/lint/use-redundant.rs b/tests/ui/lint/use-redundant.rs
index 53315dcf6..53315dcf6 100644
--- a/src/test/ui/lint/use-redundant.rs
+++ b/tests/ui/lint/use-redundant.rs
diff --git a/src/test/ui/lint/use-redundant.stderr b/tests/ui/lint/use-redundant.stderr
index c861a1956..c861a1956 100644
--- a/src/test/ui/lint/use-redundant.stderr
+++ b/tests/ui/lint/use-redundant.stderr
diff --git a/src/test/ui/lint/use_suggestion_json.rs b/tests/ui/lint/use_suggestion_json.rs
index 7d641e08b..7d641e08b 100644
--- a/src/test/ui/lint/use_suggestion_json.rs
+++ b/tests/ui/lint/use_suggestion_json.rs
diff --git a/src/test/ui/lint/use_suggestion_json.stderr b/tests/ui/lint/use_suggestion_json.stderr
index d17514303..d17514303 100644
--- a/src/test/ui/lint/use_suggestion_json.stderr
+++ b/tests/ui/lint/use_suggestion_json.stderr
diff --git a/src/test/ui/lint/warn-ctypes-inhibit.rs b/tests/ui/lint/warn-ctypes-inhibit.rs
index 15d8b09d2..15d8b09d2 100644
--- a/src/test/ui/lint/warn-ctypes-inhibit.rs
+++ b/tests/ui/lint/warn-ctypes-inhibit.rs
diff --git a/src/test/ui/lint/warn-path-statement.rs b/tests/ui/lint/warn-path-statement.rs
index 2435be623..2435be623 100644
--- a/src/test/ui/lint/warn-path-statement.rs
+++ b/tests/ui/lint/warn-path-statement.rs
diff --git a/src/test/ui/lint/warn-path-statement.stderr b/tests/ui/lint/warn-path-statement.stderr
index 248d2ef29..248d2ef29 100644
--- a/src/test/ui/lint/warn-path-statement.stderr
+++ b/tests/ui/lint/warn-path-statement.stderr
diff --git a/src/test/ui/lint/warn-unused-inline-on-fn-prototypes.rs b/tests/ui/lint/warn-unused-inline-on-fn-prototypes.rs
index 4684fe145..4684fe145 100644
--- a/src/test/ui/lint/warn-unused-inline-on-fn-prototypes.rs
+++ b/tests/ui/lint/warn-unused-inline-on-fn-prototypes.rs
diff --git a/src/test/ui/lint/warn-unused-inline-on-fn-prototypes.stderr b/tests/ui/lint/warn-unused-inline-on-fn-prototypes.stderr
index ab19d80e7..ab19d80e7 100644
--- a/src/test/ui/lint/warn-unused-inline-on-fn-prototypes.stderr
+++ b/tests/ui/lint/warn-unused-inline-on-fn-prototypes.stderr
diff --git a/src/test/ui/list.rs b/tests/ui/list.rs
index ffe9f9386..ffe9f9386 100644
--- a/src/test/ui/list.rs
+++ b/tests/ui/list.rs
diff --git a/src/test/ui/liveness/liveness-asm.rs b/tests/ui/liveness/liveness-asm.rs
index ea5f033cb..ea5f033cb 100644
--- a/src/test/ui/liveness/liveness-asm.rs
+++ b/tests/ui/liveness/liveness-asm.rs
diff --git a/src/test/ui/liveness/liveness-asm.stderr b/tests/ui/liveness/liveness-asm.stderr
index 57d89e44d..57d89e44d 100644
--- a/src/test/ui/liveness/liveness-asm.stderr
+++ b/tests/ui/liveness/liveness-asm.stderr
diff --git a/src/test/ui/liveness/liveness-assign-imm-local-after-ret.rs b/tests/ui/liveness/liveness-assign-imm-local-after-ret.rs
index b463f4368..b463f4368 100644
--- a/src/test/ui/liveness/liveness-assign-imm-local-after-ret.rs
+++ b/tests/ui/liveness/liveness-assign-imm-local-after-ret.rs
diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs
index 08911c5bd..08911c5bd 100644
--- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs
+++ b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs
diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr
index 66cdce7da..66cdce7da 100644
--- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr
+++ b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr
diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs
index 1752d9690..1752d9690 100644
--- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs
+++ b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs
diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr
index 5db9539cb..5db9539cb 100644
--- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr
+++ b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr
diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs
index c9b16e439..c9b16e439 100644
--- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs
+++ b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs
diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr
index bb7e7e27a..bb7e7e27a 100644
--- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr
+++ b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr
diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs
index 4bb2db27a..4bb2db27a 100644
--- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs
+++ b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs
diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr
index 80458a70a..80458a70a 100644
--- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr
+++ b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr
diff --git a/src/test/ui/liveness/liveness-closure-require-ret.rs b/tests/ui/liveness/liveness-closure-require-ret.rs
index b86d1fe4a..b86d1fe4a 100644
--- a/src/test/ui/liveness/liveness-closure-require-ret.rs
+++ b/tests/ui/liveness/liveness-closure-require-ret.rs
diff --git a/src/test/ui/liveness/liveness-closure-require-ret.stderr b/tests/ui/liveness/liveness-closure-require-ret.stderr
index 07b2ef6cd..07b2ef6cd 100644
--- a/src/test/ui/liveness/liveness-closure-require-ret.stderr
+++ b/tests/ui/liveness/liveness-closure-require-ret.stderr
diff --git a/src/test/ui/liveness/liveness-consts.rs b/tests/ui/liveness/liveness-consts.rs
index 8fe2453ca..8fe2453ca 100644
--- a/src/test/ui/liveness/liveness-consts.rs
+++ b/tests/ui/liveness/liveness-consts.rs
diff --git a/src/test/ui/liveness/liveness-consts.stderr b/tests/ui/liveness/liveness-consts.stderr
index 6199ea96c..6199ea96c 100644
--- a/src/test/ui/liveness/liveness-consts.stderr
+++ b/tests/ui/liveness/liveness-consts.stderr
diff --git a/src/test/ui/liveness/liveness-dead.rs b/tests/ui/liveness/liveness-dead.rs
index 004663c85..004663c85 100644
--- a/src/test/ui/liveness/liveness-dead.rs
+++ b/tests/ui/liveness/liveness-dead.rs
diff --git a/src/test/ui/liveness/liveness-dead.stderr b/tests/ui/liveness/liveness-dead.stderr
index de6d5bd99..de6d5bd99 100644
--- a/src/test/ui/liveness/liveness-dead.stderr
+++ b/tests/ui/liveness/liveness-dead.stderr
diff --git a/src/test/ui/liveness/liveness-derive.rs b/tests/ui/liveness/liveness-derive.rs
index 1921d0d72..1921d0d72 100644
--- a/src/test/ui/liveness/liveness-derive.rs
+++ b/tests/ui/liveness/liveness-derive.rs
diff --git a/src/test/ui/liveness/liveness-derive.stderr b/tests/ui/liveness/liveness-derive.stderr
index c03d90991..c03d90991 100644
--- a/src/test/ui/liveness/liveness-derive.stderr
+++ b/tests/ui/liveness/liveness-derive.stderr
diff --git a/src/test/ui/liveness/liveness-forgot-ret.rs b/tests/ui/liveness/liveness-forgot-ret.rs
index b8c2bc734..b8c2bc734 100644
--- a/src/test/ui/liveness/liveness-forgot-ret.rs
+++ b/tests/ui/liveness/liveness-forgot-ret.rs
diff --git a/src/test/ui/liveness/liveness-forgot-ret.stderr b/tests/ui/liveness/liveness-forgot-ret.stderr
index ddbdbdb0f..ddbdbdb0f 100644
--- a/src/test/ui/liveness/liveness-forgot-ret.stderr
+++ b/tests/ui/liveness/liveness-forgot-ret.stderr
diff --git a/src/test/ui/liveness/liveness-issue-2163.rs b/tests/ui/liveness/liveness-issue-2163.rs
index a632b5b9c..a632b5b9c 100644
--- a/src/test/ui/liveness/liveness-issue-2163.rs
+++ b/tests/ui/liveness/liveness-issue-2163.rs
diff --git a/src/test/ui/liveness/liveness-issue-2163.stderr b/tests/ui/liveness/liveness-issue-2163.stderr
index 2adc2d438..2adc2d438 100644
--- a/src/test/ui/liveness/liveness-issue-2163.stderr
+++ b/tests/ui/liveness/liveness-issue-2163.stderr
diff --git a/src/test/ui/liveness/liveness-missing-ret2.rs b/tests/ui/liveness/liveness-missing-ret2.rs
index a18669f72..a18669f72 100644
--- a/src/test/ui/liveness/liveness-missing-ret2.rs
+++ b/tests/ui/liveness/liveness-missing-ret2.rs
diff --git a/src/test/ui/liveness/liveness-missing-ret2.stderr b/tests/ui/liveness/liveness-missing-ret2.stderr
index afdb733cd..afdb733cd 100644
--- a/src/test/ui/liveness/liveness-missing-ret2.stderr
+++ b/tests/ui/liveness/liveness-missing-ret2.stderr
diff --git a/src/test/ui/liveness/liveness-move-call-arg.rs b/tests/ui/liveness/liveness-move-call-arg.rs
index 1bc2ea6b9..1bc2ea6b9 100644
--- a/src/test/ui/liveness/liveness-move-call-arg.rs
+++ b/tests/ui/liveness/liveness-move-call-arg.rs
diff --git a/src/test/ui/liveness/liveness-move-call-arg.stderr b/tests/ui/liveness/liveness-move-call-arg.stderr
index d14cd6cb4..d14cd6cb4 100644
--- a/src/test/ui/liveness/liveness-move-call-arg.stderr
+++ b/tests/ui/liveness/liveness-move-call-arg.stderr
diff --git a/src/test/ui/liveness/liveness-move-in-loop.rs b/tests/ui/liveness/liveness-move-in-loop.rs
index 064be14d6..064be14d6 100644
--- a/src/test/ui/liveness/liveness-move-in-loop.rs
+++ b/tests/ui/liveness/liveness-move-in-loop.rs
diff --git a/src/test/ui/liveness/liveness-move-in-loop.stderr b/tests/ui/liveness/liveness-move-in-loop.stderr
index a060914f1..a060914f1 100644
--- a/src/test/ui/liveness/liveness-move-in-loop.stderr
+++ b/tests/ui/liveness/liveness-move-in-loop.stderr
diff --git a/src/test/ui/liveness/liveness-move-in-while.rs b/tests/ui/liveness/liveness-move-in-while.rs
index 7c0cd282c..7c0cd282c 100644
--- a/src/test/ui/liveness/liveness-move-in-while.rs
+++ b/tests/ui/liveness/liveness-move-in-while.rs
diff --git a/src/test/ui/liveness/liveness-move-in-while.stderr b/tests/ui/liveness/liveness-move-in-while.stderr
index 4dff7447d..4dff7447d 100644
--- a/src/test/ui/liveness/liveness-move-in-while.stderr
+++ b/tests/ui/liveness/liveness-move-in-while.stderr
diff --git a/src/test/ui/liveness/liveness-return-last-stmt-semi.rs b/tests/ui/liveness/liveness-return-last-stmt-semi.rs
index dff859429..dff859429 100644
--- a/src/test/ui/liveness/liveness-return-last-stmt-semi.rs
+++ b/tests/ui/liveness/liveness-return-last-stmt-semi.rs
diff --git a/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr b/tests/ui/liveness/liveness-return-last-stmt-semi.stderr
index de0843aa6..de0843aa6 100644
--- a/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr
+++ b/tests/ui/liveness/liveness-return-last-stmt-semi.stderr
diff --git a/src/test/ui/liveness/liveness-unused.rs b/tests/ui/liveness/liveness-unused.rs
index 9c7be15fc..9c7be15fc 100644
--- a/src/test/ui/liveness/liveness-unused.rs
+++ b/tests/ui/liveness/liveness-unused.rs
diff --git a/src/test/ui/liveness/liveness-unused.stderr b/tests/ui/liveness/liveness-unused.stderr
index f6c478ddb..f6c478ddb 100644
--- a/src/test/ui/liveness/liveness-unused.stderr
+++ b/tests/ui/liveness/liveness-unused.stderr
diff --git a/src/test/ui/liveness/liveness-upvars.rs b/tests/ui/liveness/liveness-upvars.rs
index d446d57d3..d446d57d3 100644
--- a/src/test/ui/liveness/liveness-upvars.rs
+++ b/tests/ui/liveness/liveness-upvars.rs
diff --git a/src/test/ui/liveness/liveness-upvars.stderr b/tests/ui/liveness/liveness-upvars.stderr
index 82f62371e..82f62371e 100644
--- a/src/test/ui/liveness/liveness-upvars.stderr
+++ b/tests/ui/liveness/liveness-upvars.stderr
diff --git a/src/test/ui/liveness/liveness-use-after-move.rs b/tests/ui/liveness/liveness-use-after-move.rs
index 46102ca1e..46102ca1e 100644
--- a/src/test/ui/liveness/liveness-use-after-move.rs
+++ b/tests/ui/liveness/liveness-use-after-move.rs
diff --git a/src/test/ui/liveness/liveness-use-after-move.stderr b/tests/ui/liveness/liveness-use-after-move.stderr
index 3accba197..3accba197 100644
--- a/src/test/ui/liveness/liveness-use-after-move.stderr
+++ b/tests/ui/liveness/liveness-use-after-move.stderr
diff --git a/src/test/ui/liveness/liveness-use-after-send.rs b/tests/ui/liveness/liveness-use-after-send.rs
index 6fcd91a9d..6fcd91a9d 100644
--- a/src/test/ui/liveness/liveness-use-after-send.rs
+++ b/tests/ui/liveness/liveness-use-after-send.rs
diff --git a/src/test/ui/liveness/liveness-use-after-send.stderr b/tests/ui/liveness/liveness-use-after-send.stderr
index 65d55ca8f..65d55ca8f 100644
--- a/src/test/ui/liveness/liveness-use-after-send.stderr
+++ b/tests/ui/liveness/liveness-use-after-send.stderr
diff --git a/src/test/ui/log-err-phi.rs b/tests/ui/log-err-phi.rs
index c0e04d2c9..c0e04d2c9 100644
--- a/src/test/ui/log-err-phi.rs
+++ b/tests/ui/log-err-phi.rs
diff --git a/src/test/ui/log-knows-the-names-of-variants.rs b/tests/ui/log-knows-the-names-of-variants.rs
index cf2876b6e..cf2876b6e 100644
--- a/src/test/ui/log-knows-the-names-of-variants.rs
+++ b/tests/ui/log-knows-the-names-of-variants.rs
diff --git a/src/test/ui/log-poly.rs b/tests/ui/log-poly.rs
index 14e1b40e1..14e1b40e1 100644
--- a/src/test/ui/log-poly.rs
+++ b/tests/ui/log-poly.rs
diff --git a/src/test/ui/logging-only-prints-once.rs b/tests/ui/logging-only-prints-once.rs
index 6d16819ce..6d16819ce 100644
--- a/src/test/ui/logging-only-prints-once.rs
+++ b/tests/ui/logging-only-prints-once.rs
diff --git a/src/test/ui/loops/for-each-loop-panic.rs b/tests/ui/loops/for-each-loop-panic.rs
index 5156999f4..5156999f4 100644
--- a/src/test/ui/loops/for-each-loop-panic.rs
+++ b/tests/ui/loops/for-each-loop-panic.rs
diff --git a/src/test/ui/loops/issue-82916.rs b/tests/ui/loops/issue-82916.rs
index 8633ea1e8..8633ea1e8 100644
--- a/src/test/ui/loops/issue-82916.rs
+++ b/tests/ui/loops/issue-82916.rs
diff --git a/src/test/ui/loops/issue-82916.stderr b/tests/ui/loops/issue-82916.stderr
index 57d76016c..e6a60d7bc 100644
--- a/src/test/ui/loops/issue-82916.stderr
+++ b/tests/ui/loops/issue-82916.stderr
@@ -9,11 +9,8 @@ LL |     for y in x {
 LL |     let z = x;
    |             ^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `x`
+note: `into_iter` takes ownership of the receiver `self`, which moves `x`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
 help: consider iterating over a slice of the `Vec<S>`'s content to avoid moving into the `for` loop
    |
 LL |     for y in &x {
diff --git a/src/test/ui/loops/loop-break-unsize.rs b/tests/ui/loops/loop-break-unsize.rs
index 974c63cea..974c63cea 100644
--- a/src/test/ui/loops/loop-break-unsize.rs
+++ b/tests/ui/loops/loop-break-unsize.rs
diff --git a/src/test/ui/loops/loop-break-value-no-repeat.rs b/tests/ui/loops/loop-break-value-no-repeat.rs
index 1c0b7a018..1c0b7a018 100644
--- a/src/test/ui/loops/loop-break-value-no-repeat.rs
+++ b/tests/ui/loops/loop-break-value-no-repeat.rs
diff --git a/src/test/ui/loops/loop-break-value-no-repeat.stderr b/tests/ui/loops/loop-break-value-no-repeat.stderr
index 605a1841c..605a1841c 100644
--- a/src/test/ui/loops/loop-break-value-no-repeat.stderr
+++ b/tests/ui/loops/loop-break-value-no-repeat.stderr
diff --git a/src/test/ui/loops/loop-break-value.rs b/tests/ui/loops/loop-break-value.rs
index 51c9a36a0..51c9a36a0 100644
--- a/src/test/ui/loops/loop-break-value.rs
+++ b/tests/ui/loops/loop-break-value.rs
diff --git a/src/test/ui/loops/loop-break-value.stderr b/tests/ui/loops/loop-break-value.stderr
index ccb27c350..ccb27c350 100644
--- a/src/test/ui/loops/loop-break-value.stderr
+++ b/tests/ui/loops/loop-break-value.stderr
diff --git a/src/test/ui/loops/loop-labeled-break-value.rs b/tests/ui/loops/loop-labeled-break-value.rs
index 3488b057b..3488b057b 100644
--- a/src/test/ui/loops/loop-labeled-break-value.rs
+++ b/tests/ui/loops/loop-labeled-break-value.rs
diff --git a/src/test/ui/loops/loop-labeled-break-value.stderr b/tests/ui/loops/loop-labeled-break-value.stderr
index aa04d330f..aa04d330f 100644
--- a/src/test/ui/loops/loop-labeled-break-value.stderr
+++ b/tests/ui/loops/loop-labeled-break-value.stderr
diff --git a/src/test/ui/loops/loop-no-implicit-break.rs b/tests/ui/loops/loop-no-implicit-break.rs
index 93078cb4b..93078cb4b 100644
--- a/src/test/ui/loops/loop-no-implicit-break.rs
+++ b/tests/ui/loops/loop-no-implicit-break.rs
diff --git a/src/test/ui/loops/loop-no-implicit-break.stderr b/tests/ui/loops/loop-no-implicit-break.stderr
index 8a1afdea2..8a1afdea2 100644
--- a/src/test/ui/loops/loop-no-implicit-break.stderr
+++ b/tests/ui/loops/loop-no-implicit-break.stderr
diff --git a/src/test/ui/loops/loop-proper-liveness.rs b/tests/ui/loops/loop-proper-liveness.rs
index 6546e3977..6546e3977 100644
--- a/src/test/ui/loops/loop-proper-liveness.rs
+++ b/tests/ui/loops/loop-proper-liveness.rs
diff --git a/src/test/ui/loops/loop-proper-liveness.stderr b/tests/ui/loops/loop-proper-liveness.stderr
index f9d94b681..f9d94b681 100644
--- a/src/test/ui/loops/loop-proper-liveness.stderr
+++ b/tests/ui/loops/loop-proper-liveness.stderr
diff --git a/src/test/ui/loops/loop-properly-diverging-2.rs b/tests/ui/loops/loop-properly-diverging-2.rs
index 97b3972c1..97b3972c1 100644
--- a/src/test/ui/loops/loop-properly-diverging-2.rs
+++ b/tests/ui/loops/loop-properly-diverging-2.rs
diff --git a/src/test/ui/loops/loop-properly-diverging-2.stderr b/tests/ui/loops/loop-properly-diverging-2.stderr
index 5030a2935..5030a2935 100644
--- a/src/test/ui/loops/loop-properly-diverging-2.stderr
+++ b/tests/ui/loops/loop-properly-diverging-2.stderr
diff --git a/src/test/ui/loud_ui.rs b/tests/ui/loud_ui.rs
index 6a151fa49..6a151fa49 100644
--- a/src/test/ui/loud_ui.rs
+++ b/tests/ui/loud_ui.rs
diff --git a/src/test/ui/lowering/issue-96847.rs b/tests/ui/lowering/issue-96847.rs
index 2aa34c8b3..2aa34c8b3 100644
--- a/src/test/ui/lowering/issue-96847.rs
+++ b/tests/ui/lowering/issue-96847.rs
diff --git a/src/test/ui/lto/all-crates.rs b/tests/ui/lto/all-crates.rs
index e910b2a9f..e910b2a9f 100644
--- a/src/test/ui/lto/all-crates.rs
+++ b/tests/ui/lto/all-crates.rs
diff --git a/src/test/ui/lto/auxiliary/debuginfo-lto-aux.rs b/tests/ui/lto/auxiliary/debuginfo-lto-aux.rs
index dd471154b..dd471154b 100644
--- a/src/test/ui/lto/auxiliary/debuginfo-lto-aux.rs
+++ b/tests/ui/lto/auxiliary/debuginfo-lto-aux.rs
diff --git a/src/test/ui/lto/auxiliary/dylib.rs b/tests/ui/lto/auxiliary/dylib.rs
index e8b7f8f9f..e8b7f8f9f 100644
--- a/src/test/ui/lto/auxiliary/dylib.rs
+++ b/tests/ui/lto/auxiliary/dylib.rs
diff --git a/src/test/ui/lto/auxiliary/lto-duplicate-symbols1.rs b/tests/ui/lto/auxiliary/lto-duplicate-symbols1.rs
index ec6d05603..ec6d05603 100644
--- a/src/test/ui/lto/auxiliary/lto-duplicate-symbols1.rs
+++ b/tests/ui/lto/auxiliary/lto-duplicate-symbols1.rs
diff --git a/src/test/ui/lto/auxiliary/lto-duplicate-symbols2.rs b/tests/ui/lto/auxiliary/lto-duplicate-symbols2.rs
index ec6d05603..ec6d05603 100644
--- a/src/test/ui/lto/auxiliary/lto-duplicate-symbols2.rs
+++ b/tests/ui/lto/auxiliary/lto-duplicate-symbols2.rs
diff --git a/src/test/ui/lto/auxiliary/lto-rustc-loads-linker-plugin.rs b/tests/ui/lto/auxiliary/lto-rustc-loads-linker-plugin.rs
index d24375b2d..d24375b2d 100644
--- a/src/test/ui/lto/auxiliary/lto-rustc-loads-linker-plugin.rs
+++ b/tests/ui/lto/auxiliary/lto-rustc-loads-linker-plugin.rs
diff --git a/src/test/ui/lto/auxiliary/msvc-imp-present.rs b/tests/ui/lto/auxiliary/msvc-imp-present.rs
index 933af050a..933af050a 100644
--- a/src/test/ui/lto/auxiliary/msvc-imp-present.rs
+++ b/tests/ui/lto/auxiliary/msvc-imp-present.rs
diff --git a/src/test/ui/lto/auxiliary/thin-lto-inlines-aux.rs b/tests/ui/lto/auxiliary/thin-lto-inlines-aux.rs
index 5fd3f1996..5fd3f1996 100644
--- a/src/test/ui/lto/auxiliary/thin-lto-inlines-aux.rs
+++ b/tests/ui/lto/auxiliary/thin-lto-inlines-aux.rs
diff --git a/src/test/ui/lto/auxiliary/thinlto-dylib.rs b/tests/ui/lto/auxiliary/thinlto-dylib.rs
index 9d17c35da..9d17c35da 100644
--- a/src/test/ui/lto/auxiliary/thinlto-dylib.rs
+++ b/tests/ui/lto/auxiliary/thinlto-dylib.rs
diff --git a/src/test/ui/lto/debuginfo-lto.rs b/tests/ui/lto/debuginfo-lto.rs
index 43f75b034..43f75b034 100644
--- a/src/test/ui/lto/debuginfo-lto.rs
+++ b/tests/ui/lto/debuginfo-lto.rs
diff --git a/src/test/ui/lto/dylib-works.rs b/tests/ui/lto/dylib-works.rs
index 9e0782b59..9e0782b59 100644
--- a/src/test/ui/lto/dylib-works.rs
+++ b/tests/ui/lto/dylib-works.rs
diff --git a/src/test/ui/lto/fat-lto.rs b/tests/ui/lto/fat-lto.rs
index c8d8095a2..c8d8095a2 100644
--- a/src/test/ui/lto/fat-lto.rs
+++ b/tests/ui/lto/fat-lto.rs
diff --git a/tests/ui/lto/issue-100772.rs b/tests/ui/lto/issue-100772.rs
new file mode 100644
index 000000000..d6b067192
--- /dev/null
+++ b/tests/ui/lto/issue-100772.rs
@@ -0,0 +1,11 @@
+// run-pass
+// needs-sanitizer-cfi
+// compile-flags: -Clto -Ctarget-feature=-crt-static -Zsanitizer=cfi
+// no-prefer-dynamic
+// only-x86_64-unknown-linux-gnu
+
+#![feature(allocator_api)]
+
+fn main() {
+    let _ = Box::new_in(&[0, 1], &std::alloc::Global);
+}
diff --git a/src/test/ui/lto/issue-105637.rs b/tests/ui/lto/issue-105637.rs
index 0d9f0bec0..0d9f0bec0 100644
--- a/src/test/ui/lto/issue-105637.rs
+++ b/tests/ui/lto/issue-105637.rs
diff --git a/src/test/ui/lto/issue-105637.run.stderr b/tests/ui/lto/issue-105637.run.stderr
index 43388e776..43388e776 100644
--- a/src/test/ui/lto/issue-105637.run.stderr
+++ b/tests/ui/lto/issue-105637.run.stderr
diff --git a/src/test/ui/lto/issue-11154.rs b/tests/ui/lto/issue-11154.rs
index e11cdc82f..e11cdc82f 100644
--- a/src/test/ui/lto/issue-11154.rs
+++ b/tests/ui/lto/issue-11154.rs
diff --git a/src/test/ui/lto/issue-11154.stderr b/tests/ui/lto/issue-11154.stderr
index 8eec8b37c..8eec8b37c 100644
--- a/src/test/ui/lto/issue-11154.stderr
+++ b/tests/ui/lto/issue-11154.stderr
diff --git a/src/test/ui/lto/lto-and-no-bitcode-in-rlib.rs b/tests/ui/lto/lto-and-no-bitcode-in-rlib.rs
index f381240e7..f381240e7 100644
--- a/src/test/ui/lto/lto-and-no-bitcode-in-rlib.rs
+++ b/tests/ui/lto/lto-and-no-bitcode-in-rlib.rs
diff --git a/src/test/ui/lto/lto-and-no-bitcode-in-rlib.stderr b/tests/ui/lto/lto-and-no-bitcode-in-rlib.stderr
index 11e370e91..11e370e91 100644
--- a/src/test/ui/lto/lto-and-no-bitcode-in-rlib.stderr
+++ b/tests/ui/lto/lto-and-no-bitcode-in-rlib.stderr
diff --git a/src/test/ui/lto/lto-duplicate-symbols.rs b/tests/ui/lto/lto-duplicate-symbols.rs
index e540094a3..e540094a3 100644
--- a/src/test/ui/lto/lto-duplicate-symbols.rs
+++ b/tests/ui/lto/lto-duplicate-symbols.rs
diff --git a/src/test/ui/lto/lto-duplicate-symbols.stderr b/tests/ui/lto/lto-duplicate-symbols.stderr
index f66afa94f..f66afa94f 100644
--- a/src/test/ui/lto/lto-duplicate-symbols.stderr
+++ b/tests/ui/lto/lto-duplicate-symbols.stderr
diff --git a/src/test/ui/lto/lto-many-codegen-units.rs b/tests/ui/lto/lto-many-codegen-units.rs
index f0f461ffe..f0f461ffe 100644
--- a/src/test/ui/lto/lto-many-codegen-units.rs
+++ b/tests/ui/lto/lto-many-codegen-units.rs
diff --git a/src/test/ui/lto/lto-opt-level-s.rs b/tests/ui/lto/lto-opt-level-s.rs
index a7d9d5024..a7d9d5024 100644
--- a/src/test/ui/lto/lto-opt-level-s.rs
+++ b/tests/ui/lto/lto-opt-level-s.rs
diff --git a/src/test/ui/lto/lto-opt-level-z.rs b/tests/ui/lto/lto-opt-level-z.rs
index bf1f5e2b2..bf1f5e2b2 100644
--- a/src/test/ui/lto/lto-opt-level-z.rs
+++ b/tests/ui/lto/lto-opt-level-z.rs
diff --git a/src/test/ui/lto/lto-rustc-loads-linker-plugin.rs b/tests/ui/lto/lto-rustc-loads-linker-plugin.rs
index 6ef1d4540..6ef1d4540 100644
--- a/src/test/ui/lto/lto-rustc-loads-linker-plugin.rs
+++ b/tests/ui/lto/lto-rustc-loads-linker-plugin.rs
diff --git a/src/test/ui/lto/lto-still-runs-thread-dtors.rs b/tests/ui/lto/lto-still-runs-thread-dtors.rs
index 1c7368b36..1c7368b36 100644
--- a/src/test/ui/lto/lto-still-runs-thread-dtors.rs
+++ b/tests/ui/lto/lto-still-runs-thread-dtors.rs
diff --git a/src/test/ui/lto/lto-thin-rustc-loads-linker-plugin.rs b/tests/ui/lto/lto-thin-rustc-loads-linker-plugin.rs
index 4d54ce32f..4d54ce32f 100644
--- a/src/test/ui/lto/lto-thin-rustc-loads-linker-plugin.rs
+++ b/tests/ui/lto/lto-thin-rustc-loads-linker-plugin.rs
diff --git a/src/test/ui/lto/msvc-imp-present.rs b/tests/ui/lto/msvc-imp-present.rs
index 5498afb29..5498afb29 100644
--- a/src/test/ui/lto/msvc-imp-present.rs
+++ b/tests/ui/lto/msvc-imp-present.rs
diff --git a/src/test/ui/lto/thin-lto-global-allocator.rs b/tests/ui/lto/thin-lto-global-allocator.rs
index e00c5caf9..e00c5caf9 100644
--- a/src/test/ui/lto/thin-lto-global-allocator.rs
+++ b/tests/ui/lto/thin-lto-global-allocator.rs
diff --git a/src/test/ui/lto/thin-lto-inlines.rs b/tests/ui/lto/thin-lto-inlines.rs
index dca791807..dca791807 100644
--- a/src/test/ui/lto/thin-lto-inlines.rs
+++ b/tests/ui/lto/thin-lto-inlines.rs
diff --git a/src/test/ui/lto/thin-lto-inlines2.rs b/tests/ui/lto/thin-lto-inlines2.rs
index 1eb29657c..1eb29657c 100644
--- a/src/test/ui/lto/thin-lto-inlines2.rs
+++ b/tests/ui/lto/thin-lto-inlines2.rs
diff --git a/src/test/ui/lto/weak-works.rs b/tests/ui/lto/weak-works.rs
index 163a38702..163a38702 100644
--- a/src/test/ui/lto/weak-works.rs
+++ b/tests/ui/lto/weak-works.rs
diff --git a/src/test/ui/lub-glb/empty-binder-future-compat.rs b/tests/ui/lub-glb/empty-binder-future-compat.rs
index 8700a88a3..8700a88a3 100644
--- a/src/test/ui/lub-glb/empty-binder-future-compat.rs
+++ b/tests/ui/lub-glb/empty-binder-future-compat.rs
diff --git a/src/test/ui/lub-glb/empty-binders-err.rs b/tests/ui/lub-glb/empty-binders-err.rs
index 557480173..557480173 100644
--- a/src/test/ui/lub-glb/empty-binders-err.rs
+++ b/tests/ui/lub-glb/empty-binders-err.rs
diff --git a/src/test/ui/lub-glb/empty-binders-err.stderr b/tests/ui/lub-glb/empty-binders-err.stderr
index f86f22d5e..f86f22d5e 100644
--- a/src/test/ui/lub-glb/empty-binders-err.stderr
+++ b/tests/ui/lub-glb/empty-binders-err.stderr
diff --git a/src/test/ui/lub-glb/empty-binders.rs b/tests/ui/lub-glb/empty-binders.rs
index f9d07e79f..f9d07e79f 100644
--- a/src/test/ui/lub-glb/empty-binders.rs
+++ b/tests/ui/lub-glb/empty-binders.rs
diff --git a/src/test/ui/lub-glb/old-lub-glb-hr-eq.rs b/tests/ui/lub-glb/old-lub-glb-hr-eq.rs
index fbf4aee02..fbf4aee02 100644
--- a/src/test/ui/lub-glb/old-lub-glb-hr-eq.rs
+++ b/tests/ui/lub-glb/old-lub-glb-hr-eq.rs
diff --git a/src/test/ui/lub-glb/old-lub-glb-hr-noteq1.baseleak.stderr b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.baseleak.stderr
index 4448f9326..4448f9326 100644
--- a/src/test/ui/lub-glb/old-lub-glb-hr-noteq1.baseleak.stderr
+++ b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.baseleak.stderr
diff --git a/src/test/ui/lub-glb/old-lub-glb-hr-noteq1.basenoleak.stderr b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.basenoleak.stderr
index 0d6131135..0d6131135 100644
--- a/src/test/ui/lub-glb/old-lub-glb-hr-noteq1.basenoleak.stderr
+++ b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.basenoleak.stderr
diff --git a/src/test/ui/lub-glb/old-lub-glb-hr-noteq1.leak.stderr b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.leak.stderr
index dd0fdf3a1..dd0fdf3a1 100644
--- a/src/test/ui/lub-glb/old-lub-glb-hr-noteq1.leak.stderr
+++ b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.leak.stderr
diff --git a/src/test/ui/lub-glb/old-lub-glb-hr-noteq1.noleak.stderr b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.noleak.stderr
index cb046d0b0..cb046d0b0 100644
--- a/src/test/ui/lub-glb/old-lub-glb-hr-noteq1.noleak.stderr
+++ b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.noleak.stderr
diff --git a/src/test/ui/lub-glb/old-lub-glb-hr-noteq1.rs b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.rs
index 589119abb..589119abb 100644
--- a/src/test/ui/lub-glb/old-lub-glb-hr-noteq1.rs
+++ b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.rs
diff --git a/src/test/ui/lub-glb/old-lub-glb-hr-noteq2.leak.stderr b/tests/ui/lub-glb/old-lub-glb-hr-noteq2.leak.stderr
index e54fcf068..e54fcf068 100644
--- a/src/test/ui/lub-glb/old-lub-glb-hr-noteq2.leak.stderr
+++ b/tests/ui/lub-glb/old-lub-glb-hr-noteq2.leak.stderr
diff --git a/src/test/ui/lub-glb/old-lub-glb-hr-noteq2.rs b/tests/ui/lub-glb/old-lub-glb-hr-noteq2.rs
index 9940c40da..9940c40da 100644
--- a/src/test/ui/lub-glb/old-lub-glb-hr-noteq2.rs
+++ b/tests/ui/lub-glb/old-lub-glb-hr-noteq2.rs
diff --git a/src/test/ui/lub-glb/old-lub-glb-object.rs b/tests/ui/lub-glb/old-lub-glb-object.rs
index b6ead9c68..b6ead9c68 100644
--- a/src/test/ui/lub-glb/old-lub-glb-object.rs
+++ b/tests/ui/lub-glb/old-lub-glb-object.rs
diff --git a/src/test/ui/lub-glb/old-lub-glb-object.stderr b/tests/ui/lub-glb/old-lub-glb-object.stderr
index 3d0c171e0..3d0c171e0 100644
--- a/src/test/ui/lub-glb/old-lub-glb-object.stderr
+++ b/tests/ui/lub-glb/old-lub-glb-object.stderr
diff --git a/src/test/ui/macro-quote-test.rs b/tests/ui/macro-quote-test.rs
index 2ba61acad..2ba61acad 100644
--- a/src/test/ui/macro-quote-test.rs
+++ b/tests/ui/macro-quote-test.rs
diff --git a/src/test/ui/macro_backtrace/auxiliary/ping.rs b/tests/ui/macro_backtrace/auxiliary/ping.rs
index 25b9efbc9..25b9efbc9 100644
--- a/src/test/ui/macro_backtrace/auxiliary/ping.rs
+++ b/tests/ui/macro_backtrace/auxiliary/ping.rs
diff --git a/src/test/ui/macro_backtrace/main.-Zmacro-backtrace.stderr b/tests/ui/macro_backtrace/main.-Zmacro-backtrace.stderr
index bf85a2d75..bf85a2d75 100644
--- a/src/test/ui/macro_backtrace/main.-Zmacro-backtrace.stderr
+++ b/tests/ui/macro_backtrace/main.-Zmacro-backtrace.stderr
diff --git a/src/test/ui/macro_backtrace/main.default.stderr b/tests/ui/macro_backtrace/main.default.stderr
index 9ed4b3525..9ed4b3525 100644
--- a/src/test/ui/macro_backtrace/main.default.stderr
+++ b/tests/ui/macro_backtrace/main.default.stderr
diff --git a/src/test/ui/macro_backtrace/main.rs b/tests/ui/macro_backtrace/main.rs
index 6cee3b4cd..6cee3b4cd 100644
--- a/src/test/ui/macro_backtrace/main.rs
+++ b/tests/ui/macro_backtrace/main.rs
diff --git a/src/test/ui/macros/ambiguity-legacy-vs-modern.rs b/tests/ui/macros/ambiguity-legacy-vs-modern.rs
index 216b9dd05..216b9dd05 100644
--- a/src/test/ui/macros/ambiguity-legacy-vs-modern.rs
+++ b/tests/ui/macros/ambiguity-legacy-vs-modern.rs
diff --git a/src/test/ui/macros/ambiguity-legacy-vs-modern.stderr b/tests/ui/macros/ambiguity-legacy-vs-modern.stderr
index 330aa6acf..330aa6acf 100644
--- a/src/test/ui/macros/ambiguity-legacy-vs-modern.stderr
+++ b/tests/ui/macros/ambiguity-legacy-vs-modern.stderr
diff --git a/src/test/ui/macros/assert-as-macro.rs b/tests/ui/macros/assert-as-macro.rs
index 23c054808..23c054808 100644
--- a/src/test/ui/macros/assert-as-macro.rs
+++ b/tests/ui/macros/assert-as-macro.rs
diff --git a/src/test/ui/macros/assert-eq-macro-msg.rs b/tests/ui/macros/assert-eq-macro-msg.rs
index accbd2d1e..accbd2d1e 100644
--- a/src/test/ui/macros/assert-eq-macro-msg.rs
+++ b/tests/ui/macros/assert-eq-macro-msg.rs
diff --git a/src/test/ui/macros/assert-eq-macro-panic.rs b/tests/ui/macros/assert-eq-macro-panic.rs
index 5e505c30b..5e505c30b 100644
--- a/src/test/ui/macros/assert-eq-macro-panic.rs
+++ b/tests/ui/macros/assert-eq-macro-panic.rs
diff --git a/src/test/ui/macros/assert-eq-macro-success.rs b/tests/ui/macros/assert-eq-macro-success.rs
index 57858b348..57858b348 100644
--- a/src/test/ui/macros/assert-eq-macro-success.rs
+++ b/tests/ui/macros/assert-eq-macro-success.rs
diff --git a/src/test/ui/macros/assert-eq-macro-unsized.rs b/tests/ui/macros/assert-eq-macro-unsized.rs
index 00823216b..00823216b 100644
--- a/src/test/ui/macros/assert-eq-macro-unsized.rs
+++ b/tests/ui/macros/assert-eq-macro-unsized.rs
diff --git a/src/test/ui/macros/assert-format-lazy.rs b/tests/ui/macros/assert-format-lazy.rs
index c7f05d763..c7f05d763 100644
--- a/src/test/ui/macros/assert-format-lazy.rs
+++ b/tests/ui/macros/assert-format-lazy.rs
diff --git a/src/test/ui/macros/assert-macro-explicit.rs b/tests/ui/macros/assert-macro-explicit.rs
index 578ef5632..578ef5632 100644
--- a/src/test/ui/macros/assert-macro-explicit.rs
+++ b/tests/ui/macros/assert-macro-explicit.rs
diff --git a/src/test/ui/macros/assert-macro-fmt.rs b/tests/ui/macros/assert-macro-fmt.rs
index b8d319d85..b8d319d85 100644
--- a/src/test/ui/macros/assert-macro-fmt.rs
+++ b/tests/ui/macros/assert-macro-fmt.rs
diff --git a/src/test/ui/macros/assert-macro-owned.rs b/tests/ui/macros/assert-macro-owned.rs
index 753675872..753675872 100644
--- a/src/test/ui/macros/assert-macro-owned.rs
+++ b/tests/ui/macros/assert-macro-owned.rs
diff --git a/src/test/ui/macros/assert-macro-static.rs b/tests/ui/macros/assert-macro-static.rs
index dc5274a7e..dc5274a7e 100644
--- a/src/test/ui/macros/assert-macro-static.rs
+++ b/tests/ui/macros/assert-macro-static.rs
diff --git a/src/test/ui/macros/assert-matches-macro-msg.rs b/tests/ui/macros/assert-matches-macro-msg.rs
index fd8cd5a1a..fd8cd5a1a 100644
--- a/src/test/ui/macros/assert-matches-macro-msg.rs
+++ b/tests/ui/macros/assert-matches-macro-msg.rs
diff --git a/src/test/ui/macros/assert-ne-macro-msg.rs b/tests/ui/macros/assert-ne-macro-msg.rs
index fc0472b99..fc0472b99 100644
--- a/src/test/ui/macros/assert-ne-macro-msg.rs
+++ b/tests/ui/macros/assert-ne-macro-msg.rs
diff --git a/src/test/ui/macros/assert-ne-macro-panic.rs b/tests/ui/macros/assert-ne-macro-panic.rs
index 4f507d7b5..4f507d7b5 100644
--- a/src/test/ui/macros/assert-ne-macro-panic.rs
+++ b/tests/ui/macros/assert-ne-macro-panic.rs
diff --git a/src/test/ui/macros/assert-ne-macro-success.rs b/tests/ui/macros/assert-ne-macro-success.rs
index 89b3a4c9d..89b3a4c9d 100644
--- a/src/test/ui/macros/assert-ne-macro-success.rs
+++ b/tests/ui/macros/assert-ne-macro-success.rs
diff --git a/src/test/ui/macros/assert-ne-macro-unsized.rs b/tests/ui/macros/assert-ne-macro-unsized.rs
index e8a86e3da..e8a86e3da 100644
--- a/src/test/ui/macros/assert-ne-macro-unsized.rs
+++ b/tests/ui/macros/assert-ne-macro-unsized.rs
diff --git a/src/test/ui/macros/assert-trailing-junk.rs b/tests/ui/macros/assert-trailing-junk.rs
index da725e19e..da725e19e 100644
--- a/src/test/ui/macros/assert-trailing-junk.rs
+++ b/tests/ui/macros/assert-trailing-junk.rs
diff --git a/src/test/ui/macros/assert-trailing-junk.with-generic-asset.stderr b/tests/ui/macros/assert-trailing-junk.with-generic-asset.stderr
index 1e73320e4..1e73320e4 100644
--- a/src/test/ui/macros/assert-trailing-junk.with-generic-asset.stderr
+++ b/tests/ui/macros/assert-trailing-junk.with-generic-asset.stderr
diff --git a/src/test/ui/macros/assert-trailing-junk.without-generic-asset.stderr b/tests/ui/macros/assert-trailing-junk.without-generic-asset.stderr
index 1e73320e4..1e73320e4 100644
--- a/src/test/ui/macros/assert-trailing-junk.without-generic-asset.stderr
+++ b/tests/ui/macros/assert-trailing-junk.without-generic-asset.stderr
diff --git a/src/test/ui/macros/assert.rs b/tests/ui/macros/assert.rs
index a314db907..a314db907 100644
--- a/src/test/ui/macros/assert.rs
+++ b/tests/ui/macros/assert.rs
diff --git a/src/test/ui/macros/assert.with-generic-asset.stderr b/tests/ui/macros/assert.with-generic-asset.stderr
index 51d8f28a3..51d8f28a3 100644
--- a/src/test/ui/macros/assert.with-generic-asset.stderr
+++ b/tests/ui/macros/assert.with-generic-asset.stderr
diff --git a/src/test/ui/macros/assert.without-generic-asset.stderr b/tests/ui/macros/assert.without-generic-asset.stderr
index 51d8f28a3..51d8f28a3 100644
--- a/src/test/ui/macros/assert.without-generic-asset.stderr
+++ b/tests/ui/macros/assert.without-generic-asset.stderr
diff --git a/src/test/ui/macros/attr-empty-expr.rs b/tests/ui/macros/attr-empty-expr.rs
index d4d1a3ee7..d4d1a3ee7 100644
--- a/src/test/ui/macros/attr-empty-expr.rs
+++ b/tests/ui/macros/attr-empty-expr.rs
diff --git a/src/test/ui/macros/attr-empty-expr.stderr b/tests/ui/macros/attr-empty-expr.stderr
index 53721053b..53721053b 100644
--- a/src/test/ui/macros/attr-empty-expr.stderr
+++ b/tests/ui/macros/attr-empty-expr.stderr
diff --git a/src/test/ui/macros/attr-from-macro.rs b/tests/ui/macros/attr-from-macro.rs
index bb3a5c94d..bb3a5c94d 100644
--- a/src/test/ui/macros/attr-from-macro.rs
+++ b/tests/ui/macros/attr-from-macro.rs
diff --git a/src/test/ui/macros/auxiliary/attr-from-macro.rs b/tests/ui/macros/auxiliary/attr-from-macro.rs
index 9b388675c..9b388675c 100644
--- a/src/test/ui/macros/auxiliary/attr-from-macro.rs
+++ b/tests/ui/macros/auxiliary/attr-from-macro.rs
diff --git a/src/test/ui/macros/auxiliary/define-macro.rs b/tests/ui/macros/auxiliary/define-macro.rs
index 4956907c5..4956907c5 100644
--- a/src/test/ui/macros/auxiliary/define-macro.rs
+++ b/tests/ui/macros/auxiliary/define-macro.rs
diff --git a/src/test/ui/macros/auxiliary/deprecated-macros.rs b/tests/ui/macros/auxiliary/deprecated-macros.rs
index 657a7252a..657a7252a 100644
--- a/src/test/ui/macros/auxiliary/deprecated-macros.rs
+++ b/tests/ui/macros/auxiliary/deprecated-macros.rs
diff --git a/src/test/ui/macros/auxiliary/dollar-crate-nested-encoding.rs b/tests/ui/macros/auxiliary/dollar-crate-nested-encoding.rs
index bbe6a48c5..bbe6a48c5 100644
--- a/src/test/ui/macros/auxiliary/dollar-crate-nested-encoding.rs
+++ b/tests/ui/macros/auxiliary/dollar-crate-nested-encoding.rs
diff --git a/src/test/ui/macros/auxiliary/foreign-crate-macro-pat.rs b/tests/ui/macros/auxiliary/foreign-crate-macro-pat.rs
index 26d4c96d5..26d4c96d5 100644
--- a/src/test/ui/macros/auxiliary/foreign-crate-macro-pat.rs
+++ b/tests/ui/macros/auxiliary/foreign-crate-macro-pat.rs
diff --git a/src/test/ui/macros/auxiliary/issue-100199.rs b/tests/ui/macros/auxiliary/issue-100199.rs
index 9e190b542..9e190b542 100644
--- a/src/test/ui/macros/auxiliary/issue-100199.rs
+++ b/tests/ui/macros/auxiliary/issue-100199.rs
diff --git a/src/test/ui/macros/auxiliary/issue-19163.rs b/tests/ui/macros/auxiliary/issue-19163.rs
index 0c0d9e43c..0c0d9e43c 100644
--- a/src/test/ui/macros/auxiliary/issue-19163.rs
+++ b/tests/ui/macros/auxiliary/issue-19163.rs
diff --git a/src/test/ui/macros/auxiliary/issue-40469.rs b/tests/ui/macros/auxiliary/issue-40469.rs
index 4f2f41f2c..4f2f41f2c 100644
--- a/src/test/ui/macros/auxiliary/issue-40469.rs
+++ b/tests/ui/macros/auxiliary/issue-40469.rs
diff --git a/src/test/ui/macros/auxiliary/issue-75982.rs b/tests/ui/macros/auxiliary/issue-75982.rs
index 1e1a6126a..1e1a6126a 100644
--- a/src/test/ui/macros/auxiliary/issue-75982.rs
+++ b/tests/ui/macros/auxiliary/issue-75982.rs
diff --git a/src/test/ui/macros/auxiliary/macro-comma-support.rs b/tests/ui/macros/auxiliary/macro-comma-support.rs
index 6a452c185..6a452c185 100644
--- a/src/test/ui/macros/auxiliary/macro-comma-support.rs
+++ b/tests/ui/macros/auxiliary/macro-comma-support.rs
diff --git a/src/test/ui/macros/auxiliary/macro-def-site-super.rs b/tests/ui/macros/auxiliary/macro-def-site-super.rs
index cab747c2c..cab747c2c 100644
--- a/src/test/ui/macros/auxiliary/macro-def-site-super.rs
+++ b/tests/ui/macros/auxiliary/macro-def-site-super.rs
diff --git a/src/test/ui/macros/auxiliary/macro-in-other-crate.rs b/tests/ui/macros/auxiliary/macro-in-other-crate.rs
index db8e92018..db8e92018 100644
--- a/src/test/ui/macros/auxiliary/macro-in-other-crate.rs
+++ b/tests/ui/macros/auxiliary/macro-in-other-crate.rs
diff --git a/src/test/ui/macros/auxiliary/macro-include-items-expr.rs b/tests/ui/macros/auxiliary/macro-include-items-expr.rs
index 7394f194b..7394f194b 100644
--- a/src/test/ui/macros/auxiliary/macro-include-items-expr.rs
+++ b/tests/ui/macros/auxiliary/macro-include-items-expr.rs
diff --git a/src/test/ui/macros/auxiliary/macro-include-items-item.rs b/tests/ui/macros/auxiliary/macro-include-items-item.rs
index 7d54745e0..7d54745e0 100644
--- a/src/test/ui/macros/auxiliary/macro-include-items-item.rs
+++ b/tests/ui/macros/auxiliary/macro-include-items-item.rs
diff --git a/src/test/ui/macros/auxiliary/macro_crate_def_only.rs b/tests/ui/macros/auxiliary/macro_crate_def_only.rs
index c267eefde..c267eefde 100644
--- a/src/test/ui/macros/auxiliary/macro_crate_def_only.rs
+++ b/tests/ui/macros/auxiliary/macro_crate_def_only.rs
diff --git a/src/test/ui/macros/auxiliary/macro_crate_nonterminal.rs b/tests/ui/macros/auxiliary/macro_crate_nonterminal.rs
index 2e2440462..2e2440462 100644
--- a/src/test/ui/macros/auxiliary/macro_crate_nonterminal.rs
+++ b/tests/ui/macros/auxiliary/macro_crate_nonterminal.rs
diff --git a/src/test/ui/macros/auxiliary/macro_export_inner_module.rs b/tests/ui/macros/auxiliary/macro_export_inner_module.rs
index d71af9ee6..d71af9ee6 100644
--- a/src/test/ui/macros/auxiliary/macro_export_inner_module.rs
+++ b/tests/ui/macros/auxiliary/macro_export_inner_module.rs
diff --git a/src/test/ui/macros/auxiliary/macro_with_super_1.rs b/tests/ui/macros/auxiliary/macro_with_super_1.rs
index b015500df..b015500df 100644
--- a/src/test/ui/macros/auxiliary/macro_with_super_1.rs
+++ b/tests/ui/macros/auxiliary/macro_with_super_1.rs
diff --git a/src/test/ui/macros/auxiliary/or-pattern.rs b/tests/ui/macros/auxiliary/or-pattern.rs
index a319c405e..a319c405e 100644
--- a/src/test/ui/macros/auxiliary/or-pattern.rs
+++ b/tests/ui/macros/auxiliary/or-pattern.rs
diff --git a/src/test/ui/macros/auxiliary/proc_macro_def.rs b/tests/ui/macros/auxiliary/proc_macro_def.rs
index 0497e4ae0..0497e4ae0 100644
--- a/src/test/ui/macros/auxiliary/proc_macro_def.rs
+++ b/tests/ui/macros/auxiliary/proc_macro_def.rs
diff --git a/src/test/ui/macros/auxiliary/proc_macro_sequence.rs b/tests/ui/macros/auxiliary/proc_macro_sequence.rs
index 1331480d8..1331480d8 100644
--- a/src/test/ui/macros/auxiliary/proc_macro_sequence.rs
+++ b/tests/ui/macros/auxiliary/proc_macro_sequence.rs
diff --git a/src/test/ui/macros/auxiliary/two_macros-rpass.rs b/tests/ui/macros/auxiliary/two_macros-rpass.rs
index 441a978dd..441a978dd 100644
--- a/src/test/ui/macros/auxiliary/two_macros-rpass.rs
+++ b/tests/ui/macros/auxiliary/two_macros-rpass.rs
diff --git a/src/test/ui/macros/auxiliary/two_macros.rs b/tests/ui/macros/auxiliary/two_macros.rs
index 2330c75c8..2330c75c8 100644
--- a/src/test/ui/macros/auxiliary/two_macros.rs
+++ b/tests/ui/macros/auxiliary/two_macros.rs
diff --git a/src/test/ui/macros/auxiliary/unstable-macros.rs b/tests/ui/macros/auxiliary/unstable-macros.rs
index 3aadd4b0c..3aadd4b0c 100644
--- a/src/test/ui/macros/auxiliary/unstable-macros.rs
+++ b/tests/ui/macros/auxiliary/unstable-macros.rs
diff --git a/src/test/ui/macros/auxiliary/use-macro-self.rs b/tests/ui/macros/auxiliary/use-macro-self.rs
index f1307411a..f1307411a 100644
--- a/src/test/ui/macros/auxiliary/use-macro-self.rs
+++ b/tests/ui/macros/auxiliary/use-macro-self.rs
diff --git a/src/test/ui/macros/bad-concat.rs b/tests/ui/macros/bad-concat.rs
index 263cd074d..263cd074d 100644
--- a/src/test/ui/macros/bad-concat.rs
+++ b/tests/ui/macros/bad-concat.rs
diff --git a/src/test/ui/macros/bad-concat.stderr b/tests/ui/macros/bad-concat.stderr
index 4316fd312..4316fd312 100644
--- a/src/test/ui/macros/bad-concat.stderr
+++ b/tests/ui/macros/bad-concat.stderr
diff --git a/src/test/ui/macros/bad_hello.rs b/tests/ui/macros/bad_hello.rs
index aaa9e243a..aaa9e243a 100644
--- a/src/test/ui/macros/bad_hello.rs
+++ b/tests/ui/macros/bad_hello.rs
diff --git a/src/test/ui/macros/bad_hello.stderr b/tests/ui/macros/bad_hello.stderr
index fc9bb82b7..fc9bb82b7 100644
--- a/src/test/ui/macros/bad_hello.stderr
+++ b/tests/ui/macros/bad_hello.stderr
diff --git a/src/test/ui/macros/bang-after-name.fixed b/tests/ui/macros/bang-after-name.fixed
index c107ddd5d..c107ddd5d 100644
--- a/src/test/ui/macros/bang-after-name.fixed
+++ b/tests/ui/macros/bang-after-name.fixed
diff --git a/src/test/ui/macros/bang-after-name.rs b/tests/ui/macros/bang-after-name.rs
index 7654d8c44..7654d8c44 100644
--- a/src/test/ui/macros/bang-after-name.rs
+++ b/tests/ui/macros/bang-after-name.rs
diff --git a/src/test/ui/macros/bang-after-name.stderr b/tests/ui/macros/bang-after-name.stderr
index f609c4943..f609c4943 100644
--- a/src/test/ui/macros/bang-after-name.stderr
+++ b/tests/ui/macros/bang-after-name.stderr
diff --git a/tests/ui/macros/best-failure.rs b/tests/ui/macros/best-failure.rs
new file mode 100644
index 000000000..bbdd465d5
--- /dev/null
+++ b/tests/ui/macros/best-failure.rs
@@ -0,0 +1,11 @@
+macro_rules! number {
+    (neg false, $self:ident) => { $self };
+    ($signed:tt => $ty:ty;) => {
+        number!(neg $signed, $self);
+        //~^ ERROR no rules expected the token `$`
+    };
+}
+
+number! { false => u8; }
+
+fn main() {}
diff --git a/tests/ui/macros/best-failure.stderr b/tests/ui/macros/best-failure.stderr
new file mode 100644
index 000000000..a52fc5e3d
--- /dev/null
+++ b/tests/ui/macros/best-failure.stderr
@@ -0,0 +1,21 @@
+error: no rules expected the token `$`
+  --> $DIR/best-failure.rs:4:30
+   |
+LL | macro_rules! number {
+   | ------------------- when calling this macro
+...
+LL |         number!(neg $signed, $self);
+   |                              ^^^^^ no rules expected this token in macro call
+...
+LL | number! { false => u8; }
+   | ------------------------ in this macro invocation
+   |
+note: while trying to match meta-variable `$self:ident`
+  --> $DIR/best-failure.rs:2:17
+   |
+LL |     (neg false, $self:ident) => { $self };
+   |                 ^^^^^^^^^^^
+   = note: this error originates in the macro `number` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/macros/builtin-prelude-no-accidents.rs b/tests/ui/macros/builtin-prelude-no-accidents.rs
index 01691a82d..01691a82d 100644
--- a/src/test/ui/macros/builtin-prelude-no-accidents.rs
+++ b/tests/ui/macros/builtin-prelude-no-accidents.rs
diff --git a/src/test/ui/macros/builtin-prelude-no-accidents.stderr b/tests/ui/macros/builtin-prelude-no-accidents.stderr
index 56af618d4..56af618d4 100644
--- a/src/test/ui/macros/builtin-prelude-no-accidents.stderr
+++ b/tests/ui/macros/builtin-prelude-no-accidents.stderr
diff --git a/src/test/ui/macros/builtin-std-paths-fail.rs b/tests/ui/macros/builtin-std-paths-fail.rs
index c1a4e32a6..c1a4e32a6 100644
--- a/src/test/ui/macros/builtin-std-paths-fail.rs
+++ b/tests/ui/macros/builtin-std-paths-fail.rs
diff --git a/src/test/ui/macros/builtin-std-paths-fail.stderr b/tests/ui/macros/builtin-std-paths-fail.stderr
index ba6261011..ba6261011 100644
--- a/src/test/ui/macros/builtin-std-paths-fail.stderr
+++ b/tests/ui/macros/builtin-std-paths-fail.stderr
diff --git a/src/test/ui/macros/builtin-std-paths.rs b/tests/ui/macros/builtin-std-paths.rs
index 2083f9ba3..2083f9ba3 100644
--- a/src/test/ui/macros/builtin-std-paths.rs
+++ b/tests/ui/macros/builtin-std-paths.rs
diff --git a/src/test/ui/macros/cfg.rs b/tests/ui/macros/cfg.rs
index 2aac50a9d..2aac50a9d 100644
--- a/src/test/ui/macros/cfg.rs
+++ b/tests/ui/macros/cfg.rs
diff --git a/src/test/ui/macros/cfg.stderr b/tests/ui/macros/cfg.stderr
index 2633d5f72..2633d5f72 100644
--- a/src/test/ui/macros/cfg.stderr
+++ b/tests/ui/macros/cfg.stderr
diff --git a/src/test/ui/macros/colorful-write-macros.rs b/tests/ui/macros/colorful-write-macros.rs
index eb1872cc7..eb1872cc7 100644
--- a/src/test/ui/macros/colorful-write-macros.rs
+++ b/tests/ui/macros/colorful-write-macros.rs
diff --git a/src/test/ui/macros/concat-bytes-error.rs b/tests/ui/macros/concat-bytes-error.rs
index db5d3cab0..db5d3cab0 100644
--- a/src/test/ui/macros/concat-bytes-error.rs
+++ b/tests/ui/macros/concat-bytes-error.rs
diff --git a/src/test/ui/macros/concat-bytes-error.stderr b/tests/ui/macros/concat-bytes-error.stderr
index d6cd1a3d1..d6cd1a3d1 100644
--- a/src/test/ui/macros/concat-bytes-error.stderr
+++ b/tests/ui/macros/concat-bytes-error.stderr
diff --git a/src/test/ui/macros/concat-bytes.rs b/tests/ui/macros/concat-bytes.rs
index fd8f99417..fd8f99417 100644
--- a/src/test/ui/macros/concat-bytes.rs
+++ b/tests/ui/macros/concat-bytes.rs
diff --git a/src/test/ui/macros/concat-rpass.rs b/tests/ui/macros/concat-rpass.rs
index 0c30a39d6..0c30a39d6 100644
--- a/src/test/ui/macros/concat-rpass.rs
+++ b/tests/ui/macros/concat-rpass.rs
diff --git a/src/test/ui/macros/concat.rs b/tests/ui/macros/concat.rs
index d7ab7d626..d7ab7d626 100644
--- a/src/test/ui/macros/concat.rs
+++ b/tests/ui/macros/concat.rs
diff --git a/src/test/ui/macros/concat.stderr b/tests/ui/macros/concat.stderr
index 61fb9de1e..61fb9de1e 100644
--- a/src/test/ui/macros/concat.stderr
+++ b/tests/ui/macros/concat.stderr
diff --git a/src/test/ui/macros/conditional-debug-macro-on.rs b/tests/ui/macros/conditional-debug-macro-on.rs
index 8665da897..8665da897 100644
--- a/src/test/ui/macros/conditional-debug-macro-on.rs
+++ b/tests/ui/macros/conditional-debug-macro-on.rs
diff --git a/src/test/ui/macros/cross-crate-pat-span.rs b/tests/ui/macros/cross-crate-pat-span.rs
index ed67142ce..ed67142ce 100644
--- a/src/test/ui/macros/cross-crate-pat-span.rs
+++ b/tests/ui/macros/cross-crate-pat-span.rs
diff --git a/src/test/ui/macros/derive-in-eager-expansion-hang.rs b/tests/ui/macros/derive-in-eager-expansion-hang.rs
index 0729e14d5..0729e14d5 100644
--- a/src/test/ui/macros/derive-in-eager-expansion-hang.rs
+++ b/tests/ui/macros/derive-in-eager-expansion-hang.rs
diff --git a/src/test/ui/macros/derive-in-eager-expansion-hang.stderr b/tests/ui/macros/derive-in-eager-expansion-hang.stderr
index e0a4f3878..e0a4f3878 100644
--- a/src/test/ui/macros/derive-in-eager-expansion-hang.stderr
+++ b/tests/ui/macros/derive-in-eager-expansion-hang.stderr
diff --git a/src/test/ui/macros/die-macro-2.rs b/tests/ui/macros/die-macro-2.rs
index ebbce528a..ebbce528a 100644
--- a/src/test/ui/macros/die-macro-2.rs
+++ b/tests/ui/macros/die-macro-2.rs
diff --git a/src/test/ui/macros/die-macro-expr.rs b/tests/ui/macros/die-macro-expr.rs
index c4b5f68dd..c4b5f68dd 100644
--- a/src/test/ui/macros/die-macro-expr.rs
+++ b/tests/ui/macros/die-macro-expr.rs
diff --git a/src/test/ui/macros/die-macro-pure.rs b/tests/ui/macros/die-macro-pure.rs
index 588fbe61b..588fbe61b 100644
--- a/src/test/ui/macros/die-macro-pure.rs
+++ b/tests/ui/macros/die-macro-pure.rs
diff --git a/src/test/ui/macros/die-macro.rs b/tests/ui/macros/die-macro.rs
index 2a726efe8..2a726efe8 100644
--- a/src/test/ui/macros/die-macro.rs
+++ b/tests/ui/macros/die-macro.rs
diff --git a/src/test/ui/macros/doc-comment.rs b/tests/ui/macros/doc-comment.rs
index 9de39e9b5..9de39e9b5 100644
--- a/src/test/ui/macros/doc-comment.rs
+++ b/tests/ui/macros/doc-comment.rs
diff --git a/src/test/ui/macros/dollar-crate-nested-encoding.rs b/tests/ui/macros/dollar-crate-nested-encoding.rs
index 5242f7830..5242f7830 100644
--- a/src/test/ui/macros/dollar-crate-nested-encoding.rs
+++ b/tests/ui/macros/dollar-crate-nested-encoding.rs
diff --git a/src/test/ui/macros/duplicate-builtin.rs b/tests/ui/macros/duplicate-builtin.rs
index 35f0f4290..35f0f4290 100644
--- a/src/test/ui/macros/duplicate-builtin.rs
+++ b/tests/ui/macros/duplicate-builtin.rs
diff --git a/src/test/ui/macros/duplicate-builtin.stderr b/tests/ui/macros/duplicate-builtin.stderr
index 58accea27..58accea27 100644
--- a/src/test/ui/macros/duplicate-builtin.stderr
+++ b/tests/ui/macros/duplicate-builtin.stderr
diff --git a/src/test/ui/macros/edition-macro-pats.rs b/tests/ui/macros/edition-macro-pats.rs
index 040894712..040894712 100644
--- a/src/test/ui/macros/edition-macro-pats.rs
+++ b/tests/ui/macros/edition-macro-pats.rs
diff --git a/src/test/ui/macros/empty-trailing-stmt.rs b/tests/ui/macros/empty-trailing-stmt.rs
index 3d78ed4a4..3d78ed4a4 100644
--- a/src/test/ui/macros/empty-trailing-stmt.rs
+++ b/tests/ui/macros/empty-trailing-stmt.rs
diff --git a/src/test/ui/macros/empty-trailing-stmt.stderr b/tests/ui/macros/empty-trailing-stmt.stderr
index 97a2edd39..97a2edd39 100644
--- a/src/test/ui/macros/empty-trailing-stmt.stderr
+++ b/tests/ui/macros/empty-trailing-stmt.stderr
diff --git a/src/test/ui/macros/format-args-temporaries-async.rs b/tests/ui/macros/format-args-temporaries-async.rs
index d959329b9..d959329b9 100644
--- a/src/test/ui/macros/format-args-temporaries-async.rs
+++ b/tests/ui/macros/format-args-temporaries-async.rs
diff --git a/src/test/ui/macros/format-args-temporaries-in-write.rs b/tests/ui/macros/format-args-temporaries-in-write.rs
index 339ccbc33..339ccbc33 100644
--- a/src/test/ui/macros/format-args-temporaries-in-write.rs
+++ b/tests/ui/macros/format-args-temporaries-in-write.rs
diff --git a/tests/ui/macros/format-args-temporaries-in-write.stderr b/tests/ui/macros/format-args-temporaries-in-write.stderr
new file mode 100644
index 000000000..287cd7d67
--- /dev/null
+++ b/tests/ui/macros/format-args-temporaries-in-write.stderr
@@ -0,0 +1,33 @@
+error[E0597]: `mutex` does not live long enough
+  --> $DIR/format-args-temporaries-in-write.rs:41:27
+   |
+LL |         write!(Out, "{}", mutex.lock()) /* no semicolon */
+   |                           ^^^^^^^^^^^^
+   |                           |
+   |                           borrowed value does not live long enough
+   |                           a temporary with access to the borrow is created here ...
+LL |
+LL |     };
+   |     -- ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `MutexGuard`
+   |     |
+   |     `mutex` dropped here while still borrowed
+   |
+
+error[E0597]: `mutex` does not live long enough
+  --> $DIR/format-args-temporaries-in-write.rs:47:29
+   |
+LL |         writeln!(Out, "{}", mutex.lock()) /* no semicolon */
+   |                             ^^^^^^^^^^^^
+   |                             |
+   |                             borrowed value does not live long enough
+   |                             a temporary with access to the borrow is created here ...
+LL |
+LL |     };
+   |     -- ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `MutexGuard`
+   |     |
+   |     `mutex` dropped here while still borrowed
+   |
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/macros/format-args-temporaries.rs b/tests/ui/macros/format-args-temporaries.rs
index 59323828b..59323828b 100644
--- a/src/test/ui/macros/format-args-temporaries.rs
+++ b/tests/ui/macros/format-args-temporaries.rs
diff --git a/src/test/ui/macros/format-foreign.rs b/tests/ui/macros/format-foreign.rs
index ac65838f2..ac65838f2 100644
--- a/src/test/ui/macros/format-foreign.rs
+++ b/tests/ui/macros/format-foreign.rs
diff --git a/src/test/ui/macros/format-foreign.stderr b/tests/ui/macros/format-foreign.stderr
index ff5236dc9..7971c2ab2 100644
--- a/src/test/ui/macros/format-foreign.stderr
+++ b/tests/ui/macros/format-foreign.stderr
@@ -8,7 +8,7 @@ LL |     println!("%.*3$s %s!\n", "Hello,", "World", 4);
    |              |               argument never used
    |              multiple missing formatting specifiers
    |
-   = note: printf formatting not supported; see the documentation for `std::fmt`
+   = note: printf formatting is not supported; see the documentation for `std::fmt`
 help: format specifiers use curly braces
    |
 LL |     println!("{:.2$} {}!\n", "Hello,", "World", 4);
@@ -22,7 +22,7 @@ LL |     println!("%1$*2$.*3$f", 123.456);
    |               |
    |               help: format specifiers use curly braces: `{0:1$.2$}`
    |
-   = note: printf formatting not supported; see the documentation for `std::fmt`
+   = note: printf formatting is not supported; see the documentation for `std::fmt`
 
 error: multiple unused formatting arguments
   --> $DIR/format-foreign.rs:6:7
@@ -37,7 +37,7 @@ LL | | "###, "Hello,", "World", 4);
    | |____|  argument never used
    |      multiple missing formatting specifiers
    |
-   = note: printf formatting not supported; see the documentation for `std::fmt`
+   = note: printf formatting is not supported; see the documentation for `std::fmt`
 help: format specifiers use curly braces
    |
 LL ~     println!(r###"{:.2$}
@@ -60,7 +60,7 @@ LL |     println!("Hi there, $NAME.", NAME="Tim");
    |                         |
    |                         help: format specifiers use curly braces: `{NAME}`
    |
-   = note: shell formatting not supported; see the documentation for `std::fmt`
+   = note: shell formatting is not supported; see the documentation for `std::fmt`
 
 error: multiple unused formatting arguments
   --> $DIR/format-foreign.rs:15:32
@@ -72,7 +72,7 @@ LL |     println!("$1 $0 $$ $NAME", 1, 2, NAME=3);
    |              |                 argument never used
    |              multiple missing formatting specifiers
    |
-   = note: shell formatting not supported; see the documentation for `std::fmt`
+   = note: shell formatting is not supported; see the documentation for `std::fmt`
 help: format specifiers use curly braces
    |
 LL |     println!("{1} {0} $$ {NAME}", 1, 2, NAME=3);
diff --git a/src/test/ui/macros/format-parse-errors.rs b/tests/ui/macros/format-parse-errors.rs
index ffa7a2817..ffa7a2817 100644
--- a/src/test/ui/macros/format-parse-errors.rs
+++ b/tests/ui/macros/format-parse-errors.rs
diff --git a/src/test/ui/macros/format-parse-errors.stderr b/tests/ui/macros/format-parse-errors.stderr
index f9ea4c633..f9ea4c633 100644
--- a/src/test/ui/macros/format-parse-errors.stderr
+++ b/tests/ui/macros/format-parse-errors.stderr
diff --git a/src/test/ui/macros/format-unused-lables.rs b/tests/ui/macros/format-unused-lables.rs
index 56382b101..56382b101 100644
--- a/src/test/ui/macros/format-unused-lables.rs
+++ b/tests/ui/macros/format-unused-lables.rs
diff --git a/src/test/ui/macros/format-unused-lables.stderr b/tests/ui/macros/format-unused-lables.stderr
index 7423c7b7c..fad87fa2a 100644
--- a/src/test/ui/macros/format-unused-lables.stderr
+++ b/tests/ui/macros/format-unused-lables.stderr
@@ -44,7 +44,7 @@ LL |        "things"
 LL |              , UNUSED="args");
    |                       ^^^^^^ named argument never used
    |
-   = note: shell formatting not supported; see the documentation for `std::fmt`
+   = note: shell formatting is not supported; see the documentation for `std::fmt`
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/macros/global-asm.rs b/tests/ui/macros/global-asm.rs
index 26e90edce..26e90edce 100644
--- a/src/test/ui/macros/global-asm.rs
+++ b/tests/ui/macros/global-asm.rs
diff --git a/src/test/ui/macros/global-asm.stderr b/tests/ui/macros/global-asm.stderr
index 3c26ec65a..3c26ec65a 100644
--- a/src/test/ui/macros/global-asm.stderr
+++ b/tests/ui/macros/global-asm.stderr
diff --git a/src/test/ui/macros/html-literals.rs b/tests/ui/macros/html-literals.rs
index 26f00fed9..26f00fed9 100644
--- a/src/test/ui/macros/html-literals.rs
+++ b/tests/ui/macros/html-literals.rs
diff --git a/src/test/ui/macros/include-single-expr-helper-1.rs b/tests/ui/macros/include-single-expr-helper-1.rs
index aa6380bd2..aa6380bd2 100644
--- a/src/test/ui/macros/include-single-expr-helper-1.rs
+++ b/tests/ui/macros/include-single-expr-helper-1.rs
diff --git a/src/test/ui/macros/include-single-expr-helper.rs b/tests/ui/macros/include-single-expr-helper.rs
index 84d8b6960..84d8b6960 100644
--- a/src/test/ui/macros/include-single-expr-helper.rs
+++ b/tests/ui/macros/include-single-expr-helper.rs
diff --git a/src/test/ui/macros/include-single-expr.rs b/tests/ui/macros/include-single-expr.rs
index 0f4c29ec0..0f4c29ec0 100644
--- a/src/test/ui/macros/include-single-expr.rs
+++ b/tests/ui/macros/include-single-expr.rs
diff --git a/src/test/ui/macros/include-single-expr.stderr b/tests/ui/macros/include-single-expr.stderr
index 80eecf8f1..80eecf8f1 100644
--- a/src/test/ui/macros/include-single-expr.stderr
+++ b/tests/ui/macros/include-single-expr.stderr
diff --git a/src/test/ui/macros/issue-100199.rs b/tests/ui/macros/issue-100199.rs
index 6e50afa07..6e50afa07 100644
--- a/src/test/ui/macros/issue-100199.rs
+++ b/tests/ui/macros/issue-100199.rs
diff --git a/src/test/ui/macros/issue-100199.stderr b/tests/ui/macros/issue-100199.stderr
index 2cb45dc12..2cb45dc12 100644
--- a/src/test/ui/macros/issue-100199.stderr
+++ b/tests/ui/macros/issue-100199.stderr
diff --git a/src/test/ui/macros/issue-102878.rs b/tests/ui/macros/issue-102878.rs
index aac589193..aac589193 100644
--- a/src/test/ui/macros/issue-102878.rs
+++ b/tests/ui/macros/issue-102878.rs
diff --git a/src/test/ui/macros/issue-102878.stderr b/tests/ui/macros/issue-102878.stderr
index e0b8855a3..e0b8855a3 100644
--- a/src/test/ui/macros/issue-102878.stderr
+++ b/tests/ui/macros/issue-102878.stderr
diff --git a/src/test/ui/macros/issue-103529.rs b/tests/ui/macros/issue-103529.rs
index fa05baed7..fa05baed7 100644
--- a/src/test/ui/macros/issue-103529.rs
+++ b/tests/ui/macros/issue-103529.rs
diff --git a/src/test/ui/macros/issue-103529.stderr b/tests/ui/macros/issue-103529.stderr
index 61e322afc..61e322afc 100644
--- a/src/test/ui/macros/issue-103529.stderr
+++ b/tests/ui/macros/issue-103529.stderr
diff --git a/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.rs b/tests/ui/macros/issue-104769-concat_bytes-invalid-literal.rs
index 24150376e..24150376e 100644
--- a/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.rs
+++ b/tests/ui/macros/issue-104769-concat_bytes-invalid-literal.rs
diff --git a/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.stderr b/tests/ui/macros/issue-104769-concat_bytes-invalid-literal.stderr
index 8d70faa49..8807279c2 100644
--- a/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.stderr
+++ b/tests/ui/macros/issue-104769-concat_bytes-invalid-literal.stderr
@@ -11,6 +11,8 @@ error: integer literal is too large
    |
 LL |     concat_bytes!(888888888888888888888888888888888888888);
    |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `340282366920938463463374607431768211455`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/macros/issue-105011.rs b/tests/ui/macros/issue-105011.rs
index da12c3814..da12c3814 100644
--- a/src/test/ui/macros/issue-105011.rs
+++ b/tests/ui/macros/issue-105011.rs
diff --git a/src/test/ui/macros/issue-105011.stderr b/tests/ui/macros/issue-105011.stderr
index e898af7fa..e898af7fa 100644
--- a/src/test/ui/macros/issue-105011.stderr
+++ b/tests/ui/macros/issue-105011.stderr
diff --git a/src/test/ui/issues/issue-10536.rs b/tests/ui/macros/issue-10536.rs
index f536d8f94..f536d8f94 100644
--- a/src/test/ui/issues/issue-10536.rs
+++ b/tests/ui/macros/issue-10536.rs
diff --git a/src/test/ui/issues/issue-10536.stderr b/tests/ui/macros/issue-10536.stderr
index cc0484458..cc0484458 100644
--- a/src/test/ui/issues/issue-10536.stderr
+++ b/tests/ui/macros/issue-10536.stderr
diff --git a/src/test/ui/macros/issue-16098.rs b/tests/ui/macros/issue-16098.rs
index 00acc20fc..00acc20fc 100644
--- a/src/test/ui/macros/issue-16098.rs
+++ b/tests/ui/macros/issue-16098.rs
diff --git a/src/test/ui/macros/issue-16098.stderr b/tests/ui/macros/issue-16098.stderr
index 64280219d..64280219d 100644
--- a/src/test/ui/macros/issue-16098.stderr
+++ b/tests/ui/macros/issue-16098.stderr
diff --git a/src/test/ui/macros/issue-19163.rs b/tests/ui/macros/issue-19163.rs
index d98c5912a..d98c5912a 100644
--- a/src/test/ui/macros/issue-19163.rs
+++ b/tests/ui/macros/issue-19163.rs
diff --git a/src/test/ui/macros/issue-19163.stderr b/tests/ui/macros/issue-19163.stderr
index ae1ae1426..ae1ae1426 100644
--- a/src/test/ui/macros/issue-19163.stderr
+++ b/tests/ui/macros/issue-19163.stderr
diff --git a/src/test/ui/macros/issue-21356.rs b/tests/ui/macros/issue-21356.rs
index ae623929d..ae623929d 100644
--- a/src/test/ui/macros/issue-21356.rs
+++ b/tests/ui/macros/issue-21356.rs
diff --git a/src/test/ui/macros/issue-21356.stderr b/tests/ui/macros/issue-21356.stderr
index 17014c6ce..17014c6ce 100644
--- a/src/test/ui/macros/issue-21356.stderr
+++ b/tests/ui/macros/issue-21356.stderr
diff --git a/src/test/ui/macros/issue-22463.rs b/tests/ui/macros/issue-22463.rs
index fdf5a2fca..fdf5a2fca 100644
--- a/src/test/ui/macros/issue-22463.rs
+++ b/tests/ui/macros/issue-22463.rs
diff --git a/src/test/ui/macros/issue-25274.rs b/tests/ui/macros/issue-25274.rs
index 65b29bba8..65b29bba8 100644
--- a/src/test/ui/macros/issue-25274.rs
+++ b/tests/ui/macros/issue-25274.rs
diff --git a/src/test/ui/issues/issue-25385.rs b/tests/ui/macros/issue-25385.rs
index ea042a6c7..ea042a6c7 100644
--- a/src/test/ui/issues/issue-25385.rs
+++ b/tests/ui/macros/issue-25385.rs
diff --git a/src/test/ui/issues/issue-25385.stderr b/tests/ui/macros/issue-25385.stderr
index 39dbdd753..39dbdd753 100644
--- a/src/test/ui/issues/issue-25385.stderr
+++ b/tests/ui/macros/issue-25385.stderr
diff --git a/src/test/ui/macros/issue-26322.rs b/tests/ui/macros/issue-26322.rs
index c1dc80eb7..c1dc80eb7 100644
--- a/src/test/ui/macros/issue-26322.rs
+++ b/tests/ui/macros/issue-26322.rs
diff --git a/src/test/ui/macros/issue-29084.rs b/tests/ui/macros/issue-29084.rs
index d16252686..d16252686 100644
--- a/src/test/ui/macros/issue-29084.rs
+++ b/tests/ui/macros/issue-29084.rs
diff --git a/src/test/ui/macros/issue-29084.stderr b/tests/ui/macros/issue-29084.stderr
index f83e19213..f83e19213 100644
--- a/src/test/ui/macros/issue-29084.stderr
+++ b/tests/ui/macros/issue-29084.stderr
diff --git a/src/test/ui/macros/issue-30143.rs b/tests/ui/macros/issue-30143.rs
index ac4c1da5c..ac4c1da5c 100644
--- a/src/test/ui/macros/issue-30143.rs
+++ b/tests/ui/macros/issue-30143.rs
diff --git a/src/test/ui/macros/issue-30143.stderr b/tests/ui/macros/issue-30143.stderr
index fd2378dbc..fd2378dbc 100644
--- a/src/test/ui/macros/issue-30143.stderr
+++ b/tests/ui/macros/issue-30143.stderr
diff --git a/src/test/ui/macros/issue-33185.rs b/tests/ui/macros/issue-33185.rs
index 0d6669146..0d6669146 100644
--- a/src/test/ui/macros/issue-33185.rs
+++ b/tests/ui/macros/issue-33185.rs
diff --git a/src/test/ui/macros/issue-34171.rs b/tests/ui/macros/issue-34171.rs
index 157c58c45..157c58c45 100644
--- a/src/test/ui/macros/issue-34171.rs
+++ b/tests/ui/macros/issue-34171.rs
diff --git a/src/test/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.rs b/tests/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.rs
index d78139365..d78139365 100644
--- a/src/test/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.rs
+++ b/tests/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.rs
diff --git a/src/test/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.stderr b/tests/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.stderr
index 00139662d..00139662d 100644
--- a/src/test/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.stderr
+++ b/tests/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.stderr
diff --git a/src/test/ui/macros/issue-35450.rs b/tests/ui/macros/issue-35450.rs
index ac4c16306..ac4c16306 100644
--- a/src/test/ui/macros/issue-35450.rs
+++ b/tests/ui/macros/issue-35450.rs
diff --git a/src/test/ui/macros/issue-35450.stderr b/tests/ui/macros/issue-35450.stderr
index f2065689f..f2065689f 100644
--- a/src/test/ui/macros/issue-35450.stderr
+++ b/tests/ui/macros/issue-35450.stderr
diff --git a/src/test/ui/macros/issue-37175.rs b/tests/ui/macros/issue-37175.rs
index 9ec9d48d1..9ec9d48d1 100644
--- a/src/test/ui/macros/issue-37175.rs
+++ b/tests/ui/macros/issue-37175.rs
diff --git a/src/test/ui/macros/issue-38715.rs b/tests/ui/macros/issue-38715.rs
index 85ed97663..85ed97663 100644
--- a/src/test/ui/macros/issue-38715.rs
+++ b/tests/ui/macros/issue-38715.rs
diff --git a/src/test/ui/macros/issue-38715.stderr b/tests/ui/macros/issue-38715.stderr
index 828a7f459..828a7f459 100644
--- a/src/test/ui/macros/issue-38715.stderr
+++ b/tests/ui/macros/issue-38715.stderr
diff --git a/src/test/ui/macros/issue-39388.rs b/tests/ui/macros/issue-39388.rs
index a8e31a648..a8e31a648 100644
--- a/src/test/ui/macros/issue-39388.rs
+++ b/tests/ui/macros/issue-39388.rs
diff --git a/src/test/ui/macros/issue-39388.stderr b/tests/ui/macros/issue-39388.stderr
index 62e7dff54..62e7dff54 100644
--- a/src/test/ui/macros/issue-39388.stderr
+++ b/tests/ui/macros/issue-39388.stderr
diff --git a/src/test/ui/macros/issue-39404.rs b/tests/ui/macros/issue-39404.rs
index 2229f2c39..2229f2c39 100644
--- a/src/test/ui/macros/issue-39404.rs
+++ b/tests/ui/macros/issue-39404.rs
diff --git a/src/test/ui/macros/issue-39404.stderr b/tests/ui/macros/issue-39404.stderr
index 3886a70bb..3886a70bb 100644
--- a/src/test/ui/macros/issue-39404.stderr
+++ b/tests/ui/macros/issue-39404.stderr
diff --git a/src/test/ui/macros/issue-40469.rs b/tests/ui/macros/issue-40469.rs
index 25e08ef85..25e08ef85 100644
--- a/src/test/ui/macros/issue-40469.rs
+++ b/tests/ui/macros/issue-40469.rs
diff --git a/src/test/ui/macros/issue-40770.rs b/tests/ui/macros/issue-40770.rs
index c9713c157..c9713c157 100644
--- a/src/test/ui/macros/issue-40770.rs
+++ b/tests/ui/macros/issue-40770.rs
diff --git a/src/test/ui/macros/issue-41776.rs b/tests/ui/macros/issue-41776.rs
index 24696d86d..24696d86d 100644
--- a/src/test/ui/macros/issue-41776.rs
+++ b/tests/ui/macros/issue-41776.rs
diff --git a/src/test/ui/macros/issue-41776.stderr b/tests/ui/macros/issue-41776.stderr
index e06873b50..e06873b50 100644
--- a/src/test/ui/macros/issue-41776.stderr
+++ b/tests/ui/macros/issue-41776.stderr
diff --git a/src/test/ui/macros/issue-41803.rs b/tests/ui/macros/issue-41803.rs
index bccfdc611..bccfdc611 100644
--- a/src/test/ui/macros/issue-41803.rs
+++ b/tests/ui/macros/issue-41803.rs
diff --git a/src/test/ui/issues/issue-42954.fixed b/tests/ui/macros/issue-42954.fixed
index a73054c92..a73054c92 100644
--- a/src/test/ui/issues/issue-42954.fixed
+++ b/tests/ui/macros/issue-42954.fixed
diff --git a/src/test/ui/issues/issue-42954.rs b/tests/ui/macros/issue-42954.rs
index 5f9b0e31d..5f9b0e31d 100644
--- a/src/test/ui/issues/issue-42954.rs
+++ b/tests/ui/macros/issue-42954.rs
diff --git a/src/test/ui/issues/issue-42954.stderr b/tests/ui/macros/issue-42954.stderr
index 396a91994..396a91994 100644
--- a/src/test/ui/issues/issue-42954.stderr
+++ b/tests/ui/macros/issue-42954.stderr
diff --git a/src/test/ui/macros/issue-44127.rs b/tests/ui/macros/issue-44127.rs
index 21b2e6826..21b2e6826 100644
--- a/src/test/ui/macros/issue-44127.rs
+++ b/tests/ui/macros/issue-44127.rs
diff --git a/src/test/ui/macros/issue-5060.rs b/tests/ui/macros/issue-5060.rs
index c4760bc02..c4760bc02 100644
--- a/src/test/ui/macros/issue-5060.rs
+++ b/tests/ui/macros/issue-5060.rs
diff --git a/src/test/ui/issues/issue-51848.rs b/tests/ui/macros/issue-51848.rs
index 4792bdd64..4792bdd64 100644
--- a/src/test/ui/issues/issue-51848.rs
+++ b/tests/ui/macros/issue-51848.rs
diff --git a/src/test/ui/issues/issue-51848.stderr b/tests/ui/macros/issue-51848.stderr
index c25bedf37..c25bedf37 100644
--- a/src/test/ui/issues/issue-51848.stderr
+++ b/tests/ui/macros/issue-51848.stderr
diff --git a/src/test/ui/macros/issue-52169.rs b/tests/ui/macros/issue-52169.rs
index f178cd30c..f178cd30c 100644
--- a/src/test/ui/macros/issue-52169.rs
+++ b/tests/ui/macros/issue-52169.rs
diff --git a/src/test/ui/macros/issue-54441.rs b/tests/ui/macros/issue-54441.rs
index b24d7e1f6..b24d7e1f6 100644
--- a/src/test/ui/macros/issue-54441.rs
+++ b/tests/ui/macros/issue-54441.rs
diff --git a/src/test/ui/macros/issue-54441.stderr b/tests/ui/macros/issue-54441.stderr
index bbbca211b..bbbca211b 100644
--- a/src/test/ui/macros/issue-54441.stderr
+++ b/tests/ui/macros/issue-54441.stderr
diff --git a/src/test/ui/macros/issue-57597.rs b/tests/ui/macros/issue-57597.rs
index ebeb3fe07..ebeb3fe07 100644
--- a/src/test/ui/macros/issue-57597.rs
+++ b/tests/ui/macros/issue-57597.rs
diff --git a/src/test/ui/macros/issue-57597.stderr b/tests/ui/macros/issue-57597.stderr
index 0a02ac8c4..0a02ac8c4 100644
--- a/src/test/ui/macros/issue-57597.stderr
+++ b/tests/ui/macros/issue-57597.stderr
diff --git a/src/test/ui/macros/issue-58490.rs b/tests/ui/macros/issue-58490.rs
index 97e71c9a1..97e71c9a1 100644
--- a/src/test/ui/macros/issue-58490.rs
+++ b/tests/ui/macros/issue-58490.rs
diff --git a/src/test/ui/macros/issue-58490.stderr b/tests/ui/macros/issue-58490.stderr
index b1f0896f3..b1f0896f3 100644
--- a/src/test/ui/macros/issue-58490.stderr
+++ b/tests/ui/macros/issue-58490.stderr
diff --git a/src/test/ui/macros/issue-61033-1.rs b/tests/ui/macros/issue-61033-1.rs
index 18df3f6ee..18df3f6ee 100644
--- a/src/test/ui/macros/issue-61033-1.rs
+++ b/tests/ui/macros/issue-61033-1.rs
diff --git a/src/test/ui/macros/issue-61033-1.stderr b/tests/ui/macros/issue-61033-1.stderr
index 18205c343..18205c343 100644
--- a/src/test/ui/macros/issue-61033-1.stderr
+++ b/tests/ui/macros/issue-61033-1.stderr
diff --git a/src/test/ui/macros/issue-61033-2.rs b/tests/ui/macros/issue-61033-2.rs
index 1760ba158..1760ba158 100644
--- a/src/test/ui/macros/issue-61033-2.rs
+++ b/tests/ui/macros/issue-61033-2.rs
diff --git a/src/test/ui/macros/issue-61033-2.stderr b/tests/ui/macros/issue-61033-2.stderr
index cdfe7934a..cdfe7934a 100644
--- a/src/test/ui/macros/issue-61033-2.stderr
+++ b/tests/ui/macros/issue-61033-2.stderr
diff --git a/src/test/ui/macros/issue-61053-different-kleene.rs b/tests/ui/macros/issue-61053-different-kleene.rs
index 9b7babdbb..9b7babdbb 100644
--- a/src/test/ui/macros/issue-61053-different-kleene.rs
+++ b/tests/ui/macros/issue-61053-different-kleene.rs
diff --git a/src/test/ui/macros/issue-61053-different-kleene.stderr b/tests/ui/macros/issue-61053-different-kleene.stderr
index aa8bac13b..aa8bac13b 100644
--- a/src/test/ui/macros/issue-61053-different-kleene.stderr
+++ b/tests/ui/macros/issue-61053-different-kleene.stderr
diff --git a/src/test/ui/macros/issue-61053-duplicate-binder.rs b/tests/ui/macros/issue-61053-duplicate-binder.rs
index 34aa571c1..34aa571c1 100644
--- a/src/test/ui/macros/issue-61053-duplicate-binder.rs
+++ b/tests/ui/macros/issue-61053-duplicate-binder.rs
diff --git a/src/test/ui/macros/issue-61053-duplicate-binder.stderr b/tests/ui/macros/issue-61053-duplicate-binder.stderr
index 5a2af45d0..5a2af45d0 100644
--- a/src/test/ui/macros/issue-61053-duplicate-binder.stderr
+++ b/tests/ui/macros/issue-61053-duplicate-binder.stderr
diff --git a/src/test/ui/macros/issue-61053-missing-repetition.rs b/tests/ui/macros/issue-61053-missing-repetition.rs
index 6b36c730b..6b36c730b 100644
--- a/src/test/ui/macros/issue-61053-missing-repetition.rs
+++ b/tests/ui/macros/issue-61053-missing-repetition.rs
diff --git a/src/test/ui/macros/issue-61053-missing-repetition.stderr b/tests/ui/macros/issue-61053-missing-repetition.stderr
index 738f711f0..738f711f0 100644
--- a/src/test/ui/macros/issue-61053-missing-repetition.stderr
+++ b/tests/ui/macros/issue-61053-missing-repetition.stderr
diff --git a/src/test/ui/macros/issue-61053-unbound.rs b/tests/ui/macros/issue-61053-unbound.rs
index b75cdce0c..b75cdce0c 100644
--- a/src/test/ui/macros/issue-61053-unbound.rs
+++ b/tests/ui/macros/issue-61053-unbound.rs
diff --git a/src/test/ui/macros/issue-61053-unbound.stderr b/tests/ui/macros/issue-61053-unbound.stderr
index 0d64effc9..0d64effc9 100644
--- a/src/test/ui/macros/issue-61053-unbound.stderr
+++ b/tests/ui/macros/issue-61053-unbound.stderr
diff --git a/src/test/ui/macros/issue-63102.rs b/tests/ui/macros/issue-63102.rs
index 6af5b1868..6af5b1868 100644
--- a/src/test/ui/macros/issue-63102.rs
+++ b/tests/ui/macros/issue-63102.rs
diff --git a/src/test/ui/macros/issue-6596-1.rs b/tests/ui/macros/issue-6596-1.rs
index 25f1d6500..25f1d6500 100644
--- a/src/test/ui/macros/issue-6596-1.rs
+++ b/tests/ui/macros/issue-6596-1.rs
diff --git a/src/test/ui/macros/issue-6596-1.stderr b/tests/ui/macros/issue-6596-1.stderr
index 7ab3685c5..7ab3685c5 100644
--- a/src/test/ui/macros/issue-6596-1.stderr
+++ b/tests/ui/macros/issue-6596-1.stderr
diff --git a/src/test/ui/macros/issue-68058.rs b/tests/ui/macros/issue-68058.rs
index 24da2620c..24da2620c 100644
--- a/src/test/ui/macros/issue-68058.rs
+++ b/tests/ui/macros/issue-68058.rs
diff --git a/src/test/ui/macros/issue-68060.rs b/tests/ui/macros/issue-68060.rs
index fb40cd538..fb40cd538 100644
--- a/src/test/ui/macros/issue-68060.rs
+++ b/tests/ui/macros/issue-68060.rs
diff --git a/src/test/ui/macros/issue-68060.stderr b/tests/ui/macros/issue-68060.stderr
index 52e6ed92e..52e6ed92e 100644
--- a/src/test/ui/macros/issue-68060.stderr
+++ b/tests/ui/macros/issue-68060.stderr
diff --git a/src/test/ui/macros/issue-69838-dir/bar.rs b/tests/ui/macros/issue-69838-dir/bar.rs
index ec12f8c5c..ec12f8c5c 100644
--- a/src/test/ui/macros/issue-69838-dir/bar.rs
+++ b/tests/ui/macros/issue-69838-dir/bar.rs
diff --git a/src/test/ui/macros/issue-69838-dir/included.rs b/tests/ui/macros/issue-69838-dir/included.rs
index 9900b8fd5..9900b8fd5 100644
--- a/src/test/ui/macros/issue-69838-dir/included.rs
+++ b/tests/ui/macros/issue-69838-dir/included.rs
diff --git a/src/test/ui/macros/issue-69838-mods-relative-to-included-path.rs b/tests/ui/macros/issue-69838-mods-relative-to-included-path.rs
index 2a4e97f0e..2a4e97f0e 100644
--- a/src/test/ui/macros/issue-69838-mods-relative-to-included-path.rs
+++ b/tests/ui/macros/issue-69838-mods-relative-to-included-path.rs
diff --git a/src/test/ui/macros/issue-70446.rs b/tests/ui/macros/issue-70446.rs
index 407094d55..407094d55 100644
--- a/src/test/ui/macros/issue-70446.rs
+++ b/tests/ui/macros/issue-70446.rs
diff --git a/src/test/ui/macros/issue-75982-foreign-macro-weird-mod.rs b/tests/ui/macros/issue-75982-foreign-macro-weird-mod.rs
index e76b09d4b..e76b09d4b 100644
--- a/src/test/ui/macros/issue-75982-foreign-macro-weird-mod.rs
+++ b/tests/ui/macros/issue-75982-foreign-macro-weird-mod.rs
diff --git a/src/test/ui/macros/issue-77475.rs b/tests/ui/macros/issue-77475.rs
index 7b32a33ea..7b32a33ea 100644
--- a/src/test/ui/macros/issue-77475.rs
+++ b/tests/ui/macros/issue-77475.rs
diff --git a/src/test/ui/macros/issue-78325-inconsistent-resolution.rs b/tests/ui/macros/issue-78325-inconsistent-resolution.rs
index 919eca4f9..919eca4f9 100644
--- a/src/test/ui/macros/issue-78325-inconsistent-resolution.rs
+++ b/tests/ui/macros/issue-78325-inconsistent-resolution.rs
diff --git a/src/test/ui/macros/issue-78325-inconsistent-resolution.stderr b/tests/ui/macros/issue-78325-inconsistent-resolution.stderr
index 53a0a0793..53a0a0793 100644
--- a/src/test/ui/macros/issue-78325-inconsistent-resolution.stderr
+++ b/tests/ui/macros/issue-78325-inconsistent-resolution.stderr
diff --git a/src/test/ui/macros/issue-78333.rs b/tests/ui/macros/issue-78333.rs
index c376f2067..c376f2067 100644
--- a/src/test/ui/macros/issue-78333.rs
+++ b/tests/ui/macros/issue-78333.rs
diff --git a/src/test/ui/macros/issue-78892-substitution-in-statement-attr.rs b/tests/ui/macros/issue-78892-substitution-in-statement-attr.rs
index 9d1fae7a2..9d1fae7a2 100644
--- a/src/test/ui/macros/issue-78892-substitution-in-statement-attr.rs
+++ b/tests/ui/macros/issue-78892-substitution-in-statement-attr.rs
diff --git a/src/test/ui/macros/issue-81006.rs b/tests/ui/macros/issue-81006.rs
index 602eb5974..602eb5974 100644
--- a/src/test/ui/macros/issue-81006.rs
+++ b/tests/ui/macros/issue-81006.rs
diff --git a/src/test/ui/macros/issue-81006.stderr b/tests/ui/macros/issue-81006.stderr
index 14a8cbe01..14a8cbe01 100644
--- a/src/test/ui/macros/issue-81006.stderr
+++ b/tests/ui/macros/issue-81006.stderr
diff --git a/src/test/ui/macros/issue-83340.rs b/tests/ui/macros/issue-83340.rs
index d26200295..d26200295 100644
--- a/src/test/ui/macros/issue-83340.rs
+++ b/tests/ui/macros/issue-83340.rs
diff --git a/src/test/ui/macros/issue-83340.stderr b/tests/ui/macros/issue-83340.stderr
index 1935de02b..1935de02b 100644
--- a/src/test/ui/macros/issue-83340.stderr
+++ b/tests/ui/macros/issue-83340.stderr
diff --git a/src/test/ui/macros/issue-83344.rs b/tests/ui/macros/issue-83344.rs
index c5f7f7235..c5f7f7235 100644
--- a/src/test/ui/macros/issue-83344.rs
+++ b/tests/ui/macros/issue-83344.rs
diff --git a/src/test/ui/macros/issue-83344.stderr b/tests/ui/macros/issue-83344.stderr
index 1ef70f87a..1ef70f87a 100644
--- a/src/test/ui/macros/issue-83344.stderr
+++ b/tests/ui/macros/issue-83344.stderr
diff --git a/src/test/ui/macros/issue-84195-lint-anon-const.rs b/tests/ui/macros/issue-84195-lint-anon-const.rs
index 71c768320..71c768320 100644
--- a/src/test/ui/macros/issue-84195-lint-anon-const.rs
+++ b/tests/ui/macros/issue-84195-lint-anon-const.rs
diff --git a/tests/ui/macros/issue-84195-lint-anon-const.stderr b/tests/ui/macros/issue-84195-lint-anon-const.stderr
new file mode 100644
index 000000000..29ccd17e0
--- /dev/null
+++ b/tests/ui/macros/issue-84195-lint-anon-const.stderr
@@ -0,0 +1,39 @@
+error: trailing semicolon in macro used in expression position
+  --> $DIR/issue-84195-lint-anon-const.rs:8:14
+   |
+LL |     () => { 0; };
+   |              ^
+...
+LL |     let val: [u8; len!()] = [];
+   |                   ------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/issue-84195-lint-anon-const.rs:5:9
+   |
+LL | #![deny(semicolon_in_expressions_from_macros)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this error originates in the macro `len` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to previous error
+
+Future incompatibility report: Future breakage diagnostic:
+error: trailing semicolon in macro used in expression position
+  --> $DIR/issue-84195-lint-anon-const.rs:8:14
+   |
+LL |     () => { 0; };
+   |              ^
+...
+LL |     let val: [u8; len!()] = [];
+   |                   ------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/issue-84195-lint-anon-const.rs:5:9
+   |
+LL | #![deny(semicolon_in_expressions_from_macros)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this error originates in the macro `len` (in Nightly builds, run with -Z macro-backtrace for more info)
+
diff --git a/src/test/ui/macros/issue-84429-matches-edition.rs b/tests/ui/macros/issue-84429-matches-edition.rs
index 53f134c26..53f134c26 100644
--- a/src/test/ui/macros/issue-84429-matches-edition.rs
+++ b/tests/ui/macros/issue-84429-matches-edition.rs
diff --git a/src/test/ui/macros/issue-84632-eager-expansion-recursion-limit.rs b/tests/ui/macros/issue-84632-eager-expansion-recursion-limit.rs
index 7a1e62d49..7a1e62d49 100644
--- a/src/test/ui/macros/issue-84632-eager-expansion-recursion-limit.rs
+++ b/tests/ui/macros/issue-84632-eager-expansion-recursion-limit.rs
diff --git a/src/test/ui/macros/issue-84632-eager-expansion-recursion-limit.stderr b/tests/ui/macros/issue-84632-eager-expansion-recursion-limit.stderr
index e266617bd..e266617bd 100644
--- a/src/test/ui/macros/issue-84632-eager-expansion-recursion-limit.stderr
+++ b/tests/ui/macros/issue-84632-eager-expansion-recursion-limit.stderr
diff --git a/src/test/ui/macros/issue-86082-option-env-invalid-char.rs b/tests/ui/macros/issue-86082-option-env-invalid-char.rs
index b556b24d6..b556b24d6 100644
--- a/src/test/ui/macros/issue-86082-option-env-invalid-char.rs
+++ b/tests/ui/macros/issue-86082-option-env-invalid-char.rs
diff --git a/src/test/ui/macros/issue-86865.rs b/tests/ui/macros/issue-86865.rs
index 01e0a20a5..01e0a20a5 100644
--- a/src/test/ui/macros/issue-86865.rs
+++ b/tests/ui/macros/issue-86865.rs
diff --git a/src/test/ui/macros/issue-86865.stderr b/tests/ui/macros/issue-86865.stderr
index eed755366..eed755366 100644
--- a/src/test/ui/macros/issue-86865.stderr
+++ b/tests/ui/macros/issue-86865.stderr
diff --git a/src/test/ui/macros/issue-8709.rs b/tests/ui/macros/issue-8709.rs
index ea7525d44..ea7525d44 100644
--- a/src/test/ui/macros/issue-8709.rs
+++ b/tests/ui/macros/issue-8709.rs
diff --git a/src/test/ui/macros/issue-87877.rs b/tests/ui/macros/issue-87877.rs
index a40e2c5f9..a40e2c5f9 100644
--- a/src/test/ui/macros/issue-87877.rs
+++ b/tests/ui/macros/issue-87877.rs
diff --git a/src/test/ui/macros/issue-88206.rs b/tests/ui/macros/issue-88206.rs
index 14e2f6606..14e2f6606 100644
--- a/src/test/ui/macros/issue-88206.rs
+++ b/tests/ui/macros/issue-88206.rs
diff --git a/src/test/ui/macros/issue-88206.stderr b/tests/ui/macros/issue-88206.stderr
index f7f5b5648..f7f5b5648 100644
--- a/src/test/ui/macros/issue-88206.stderr
+++ b/tests/ui/macros/issue-88206.stderr
diff --git a/src/test/ui/macros/issue-88228.rs b/tests/ui/macros/issue-88228.rs
index cbdef5f0d..60ba2eab7 100644
--- a/src/test/ui/macros/issue-88228.rs
+++ b/tests/ui/macros/issue-88228.rs
@@ -8,7 +8,7 @@ mod hey {
 
 #[derive(Bla)]
 //~^ ERROR cannot find derive macro `Bla`
-//~| NOTE consider importing this derive macro
+//~| HELP consider importing this derive macro
 struct A;
 
 #[derive(println)]
@@ -19,5 +19,5 @@ struct B;
 fn main() {
     bla!();
     //~^ ERROR cannot find macro `bla`
-    //~| NOTE consider importing this macro
+    //~| HELP consider importing this macro
 }
diff --git a/src/test/ui/macros/issue-88228.stderr b/tests/ui/macros/issue-88228.stderr
index 62afa67a7..fe8a1deae 100644
--- a/src/test/ui/macros/issue-88228.stderr
+++ b/tests/ui/macros/issue-88228.stderr
@@ -4,7 +4,7 @@ error: cannot find macro `bla` in this scope
 LL |     bla!();
    |     ^^^
    |
-   = note: consider importing this macro:
+   = help: consider importing this macro:
            crate::hey::bla
 
 error: cannot find derive macro `println` in this scope
@@ -21,7 +21,7 @@ error: cannot find derive macro `Bla` in this scope
 LL | #[derive(Bla)]
    |          ^^^
    |
-   = note: consider importing this derive macro:
+   = help: consider importing this derive macro:
            crate::hey::Bla
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/macros/issue-8851.rs b/tests/ui/macros/issue-8851.rs
index faacfe5f8..faacfe5f8 100644
--- a/src/test/ui/macros/issue-8851.rs
+++ b/tests/ui/macros/issue-8851.rs
diff --git a/src/test/ui/macros/issue-92267.rs b/tests/ui/macros/issue-92267.rs
index f1daaeb74..f1daaeb74 100644
--- a/src/test/ui/macros/issue-92267.rs
+++ b/tests/ui/macros/issue-92267.rs
diff --git a/src/test/ui/macros/issue-92267.stderr b/tests/ui/macros/issue-92267.stderr
index d2d66c811..5359f68cd 100644
--- a/src/test/ui/macros/issue-92267.stderr
+++ b/tests/ui/macros/issue-92267.stderr
@@ -10,7 +10,7 @@ note: format specifiers use curly braces, and the conversion specifier `
    |
 LL | pub fn main() { println!("🦀%%%", 0) }
    |                               ^^
-   = note: printf formatting not supported; see the documentation for `std::fmt`
+   = note: printf formatting is not supported; see the documentation for `std::fmt`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/issue-95267.rs b/tests/ui/macros/issue-95267.rs
index a2fe402bc..a2fe402bc 100644
--- a/src/test/ui/macros/issue-95267.rs
+++ b/tests/ui/macros/issue-95267.rs
diff --git a/src/test/ui/macros/issue-95533.rs b/tests/ui/macros/issue-95533.rs
index 905c14dc5..905c14dc5 100644
--- a/src/test/ui/macros/issue-95533.rs
+++ b/tests/ui/macros/issue-95533.rs
diff --git a/src/test/ui/macros/issue-98466-allow.rs b/tests/ui/macros/issue-98466-allow.rs
index c260148c1..c260148c1 100644
--- a/src/test/ui/macros/issue-98466-allow.rs
+++ b/tests/ui/macros/issue-98466-allow.rs
diff --git a/src/test/ui/macros/issue-98466.fixed b/tests/ui/macros/issue-98466.fixed
index e46e22f00..e46e22f00 100644
--- a/src/test/ui/macros/issue-98466.fixed
+++ b/tests/ui/macros/issue-98466.fixed
diff --git a/src/test/ui/macros/issue-98466.rs b/tests/ui/macros/issue-98466.rs
index 2c3b099af..2c3b099af 100644
--- a/src/test/ui/macros/issue-98466.rs
+++ b/tests/ui/macros/issue-98466.rs
diff --git a/src/test/ui/macros/issue-98466.stderr b/tests/ui/macros/issue-98466.stderr
index c93451c76..c93451c76 100644
--- a/src/test/ui/macros/issue-98466.stderr
+++ b/tests/ui/macros/issue-98466.stderr
diff --git a/src/test/ui/macros/issue-99261.rs b/tests/ui/macros/issue-99261.rs
index 40d26d08c..40d26d08c 100644
--- a/src/test/ui/macros/issue-99261.rs
+++ b/tests/ui/macros/issue-99261.rs
diff --git a/src/test/ui/macros/issue-99265.fixed b/tests/ui/macros/issue-99265.fixed
index f3be9c628..f3be9c628 100644
--- a/src/test/ui/macros/issue-99265.fixed
+++ b/tests/ui/macros/issue-99265.fixed
diff --git a/src/test/ui/macros/issue-99265.rs b/tests/ui/macros/issue-99265.rs
index e7cf60876..e7cf60876 100644
--- a/src/test/ui/macros/issue-99265.rs
+++ b/tests/ui/macros/issue-99265.rs
diff --git a/src/test/ui/macros/issue-99265.stderr b/tests/ui/macros/issue-99265.stderr
index 9185dbff6..9185dbff6 100644
--- a/src/test/ui/macros/issue-99265.stderr
+++ b/tests/ui/macros/issue-99265.stderr
diff --git a/src/test/ui/macros/issue-99907.fixed b/tests/ui/macros/issue-99907.fixed
index 9e0e1b80e..9e0e1b80e 100644
--- a/src/test/ui/macros/issue-99907.fixed
+++ b/tests/ui/macros/issue-99907.fixed
diff --git a/src/test/ui/macros/issue-99907.rs b/tests/ui/macros/issue-99907.rs
index eebcfc2ef..eebcfc2ef 100644
--- a/src/test/ui/macros/issue-99907.rs
+++ b/tests/ui/macros/issue-99907.rs
diff --git a/src/test/ui/macros/issue-99907.stderr b/tests/ui/macros/issue-99907.stderr
index eefb28dee..eefb28dee 100644
--- a/src/test/ui/macros/issue-99907.stderr
+++ b/tests/ui/macros/issue-99907.stderr
diff --git a/src/test/ui/macros/lint-trailing-macro-call.rs b/tests/ui/macros/lint-trailing-macro-call.rs
index f8e847563..f8e847563 100644
--- a/src/test/ui/macros/lint-trailing-macro-call.rs
+++ b/tests/ui/macros/lint-trailing-macro-call.rs
diff --git a/tests/ui/macros/lint-trailing-macro-call.stderr b/tests/ui/macros/lint-trailing-macro-call.stderr
new file mode 100644
index 000000000..13cecc3a3
--- /dev/null
+++ b/tests/ui/macros/lint-trailing-macro-call.stderr
@@ -0,0 +1,35 @@
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/lint-trailing-macro-call.rs:9:25
+   |
+LL |         #[cfg(FALSE)] 25;
+   |                         ^
+...
+LL |     expand_it!()
+   |     ------------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `expand_it`
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `expand_it` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: 1 warning emitted
+
+Future incompatibility report: Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/lint-trailing-macro-call.rs:9:25
+   |
+LL |         #[cfg(FALSE)] 25;
+   |                         ^
+...
+LL |     expand_it!()
+   |     ------------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `expand_it`
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `expand_it` (in Nightly builds, run with -Z macro-backtrace for more info)
+
diff --git a/src/test/ui/macros/local-ambiguity-multiple-parsing-options.rs b/tests/ui/macros/local-ambiguity-multiple-parsing-options.rs
index 396748109..396748109 100644
--- a/src/test/ui/macros/local-ambiguity-multiple-parsing-options.rs
+++ b/tests/ui/macros/local-ambiguity-multiple-parsing-options.rs
diff --git a/src/test/ui/macros/local-ambiguity-multiple-parsing-options.stderr b/tests/ui/macros/local-ambiguity-multiple-parsing-options.stderr
index 68b278fd3..68b278fd3 100644
--- a/src/test/ui/macros/local-ambiguity-multiple-parsing-options.stderr
+++ b/tests/ui/macros/local-ambiguity-multiple-parsing-options.stderr
diff --git a/src/test/ui/macros/log_syntax-trace_macros-macro-locations.rs b/tests/ui/macros/log_syntax-trace_macros-macro-locations.rs
index 2d78ae6f9..2d78ae6f9 100644
--- a/src/test/ui/macros/log_syntax-trace_macros-macro-locations.rs
+++ b/tests/ui/macros/log_syntax-trace_macros-macro-locations.rs
diff --git a/src/test/ui/macros/log_syntax-trace_macros-macro-locations.stdout b/tests/ui/macros/log_syntax-trace_macros-macro-locations.stdout
index b28b04f64..b28b04f64 100644
--- a/src/test/ui/macros/log_syntax-trace_macros-macro-locations.stdout
+++ b/tests/ui/macros/log_syntax-trace_macros-macro-locations.stdout
diff --git a/src/test/ui/macros/macro-2.rs b/tests/ui/macros/macro-2.rs
index a315981b6..a315981b6 100644
--- a/src/test/ui/macros/macro-2.rs
+++ b/tests/ui/macros/macro-2.rs
diff --git a/src/test/ui/macros/macro-as-fn-body.rs b/tests/ui/macros/macro-as-fn-body.rs
index 6781c9a9e..6781c9a9e 100644
--- a/src/test/ui/macros/macro-as-fn-body.rs
+++ b/tests/ui/macros/macro-as-fn-body.rs
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015-rpass.rs b/tests/ui/macros/macro-at-most-once-rep-2015-rpass.rs
index 66597c0ac..66597c0ac 100644
--- a/src/test/ui/macros/macro-at-most-once-rep-2015-rpass.rs
+++ b/tests/ui/macros/macro-at-most-once-rep-2015-rpass.rs
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015.rs b/tests/ui/macros/macro-at-most-once-rep-2015.rs
index f68100d45..f68100d45 100644
--- a/src/test/ui/macros/macro-at-most-once-rep-2015.rs
+++ b/tests/ui/macros/macro-at-most-once-rep-2015.rs
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015.stderr b/tests/ui/macros/macro-at-most-once-rep-2015.stderr
index 7c45b85bc..7c45b85bc 100644
--- a/src/test/ui/macros/macro-at-most-once-rep-2015.stderr
+++ b/tests/ui/macros/macro-at-most-once-rep-2015.stderr
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018-rpass.rs b/tests/ui/macros/macro-at-most-once-rep-2018-rpass.rs
index b37f38530..b37f38530 100644
--- a/src/test/ui/macros/macro-at-most-once-rep-2018-rpass.rs
+++ b/tests/ui/macros/macro-at-most-once-rep-2018-rpass.rs
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018.rs b/tests/ui/macros/macro-at-most-once-rep-2018.rs
index 886a25bbc..886a25bbc 100644
--- a/src/test/ui/macros/macro-at-most-once-rep-2018.rs
+++ b/tests/ui/macros/macro-at-most-once-rep-2018.rs
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018.stderr b/tests/ui/macros/macro-at-most-once-rep-2018.stderr
index 696520b28..696520b28 100644
--- a/src/test/ui/macros/macro-at-most-once-rep-2018.stderr
+++ b/tests/ui/macros/macro-at-most-once-rep-2018.stderr
diff --git a/src/test/ui/macros/macro-attribute-expansion.rs b/tests/ui/macros/macro-attribute-expansion.rs
index f01e5c44a..f01e5c44a 100644
--- a/src/test/ui/macros/macro-attribute-expansion.rs
+++ b/tests/ui/macros/macro-attribute-expansion.rs
diff --git a/src/test/ui/macros/macro-attribute.rs b/tests/ui/macros/macro-attribute.rs
index 88834a967..88834a967 100644
--- a/src/test/ui/macros/macro-attribute.rs
+++ b/tests/ui/macros/macro-attribute.rs
diff --git a/src/test/ui/macros/macro-attribute.stderr b/tests/ui/macros/macro-attribute.stderr
index 3316d3872..3316d3872 100644
--- a/src/test/ui/macros/macro-attribute.stderr
+++ b/tests/ui/macros/macro-attribute.stderr
diff --git a/src/test/ui/macros/macro-attributes.rs b/tests/ui/macros/macro-attributes.rs
index d382e8b71..d382e8b71 100644
--- a/src/test/ui/macros/macro-attributes.rs
+++ b/tests/ui/macros/macro-attributes.rs
diff --git a/src/test/ui/macros/macro-backtrace-invalid-internals.rs b/tests/ui/macros/macro-backtrace-invalid-internals.rs
index 9501e7cd0..9501e7cd0 100644
--- a/src/test/ui/macros/macro-backtrace-invalid-internals.rs
+++ b/tests/ui/macros/macro-backtrace-invalid-internals.rs
diff --git a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr b/tests/ui/macros/macro-backtrace-invalid-internals.stderr
index aa8f06a0d..aa8f06a0d 100644
--- a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr
+++ b/tests/ui/macros/macro-backtrace-invalid-internals.stderr
diff --git a/src/test/ui/macros/macro-backtrace-nested.rs b/tests/ui/macros/macro-backtrace-nested.rs
index 13d80163d..13d80163d 100644
--- a/src/test/ui/macros/macro-backtrace-nested.rs
+++ b/tests/ui/macros/macro-backtrace-nested.rs
diff --git a/src/test/ui/macros/macro-backtrace-nested.stderr b/tests/ui/macros/macro-backtrace-nested.stderr
index dadedfbe8..dadedfbe8 100644
--- a/src/test/ui/macros/macro-backtrace-nested.stderr
+++ b/tests/ui/macros/macro-backtrace-nested.stderr
diff --git a/src/test/ui/macros/macro-backtrace-println.rs b/tests/ui/macros/macro-backtrace-println.rs
index 859dd019d..859dd019d 100644
--- a/src/test/ui/macros/macro-backtrace-println.rs
+++ b/tests/ui/macros/macro-backtrace-println.rs
diff --git a/src/test/ui/macros/macro-backtrace-println.stderr b/tests/ui/macros/macro-backtrace-println.stderr
index b4e2883e8..b4e2883e8 100644
--- a/src/test/ui/macros/macro-backtrace-println.stderr
+++ b/tests/ui/macros/macro-backtrace-println.stderr
diff --git a/src/test/ui/macros/macro-block-nonterminal.rs b/tests/ui/macros/macro-block-nonterminal.rs
index a6c9dd6e1..a6c9dd6e1 100644
--- a/src/test/ui/macros/macro-block-nonterminal.rs
+++ b/tests/ui/macros/macro-block-nonterminal.rs
diff --git a/src/test/ui/macros/macro-comma-behavior-rpass.rs b/tests/ui/macros/macro-comma-behavior-rpass.rs
index 8406b4e78..8406b4e78 100644
--- a/src/test/ui/macros/macro-comma-behavior-rpass.rs
+++ b/tests/ui/macros/macro-comma-behavior-rpass.rs
diff --git a/src/test/ui/macros/macro-comma-behavior.core.stderr b/tests/ui/macros/macro-comma-behavior.core.stderr
index ac15e9fa8..ac15e9fa8 100644
--- a/src/test/ui/macros/macro-comma-behavior.core.stderr
+++ b/tests/ui/macros/macro-comma-behavior.core.stderr
diff --git a/src/test/ui/macros/macro-comma-behavior.rs b/tests/ui/macros/macro-comma-behavior.rs
index 27d50ff3d..27d50ff3d 100644
--- a/src/test/ui/macros/macro-comma-behavior.rs
+++ b/tests/ui/macros/macro-comma-behavior.rs
diff --git a/src/test/ui/macros/macro-comma-behavior.std.stderr b/tests/ui/macros/macro-comma-behavior.std.stderr
index 7fd060e22..7fd060e22 100644
--- a/src/test/ui/macros/macro-comma-behavior.std.stderr
+++ b/tests/ui/macros/macro-comma-behavior.std.stderr
diff --git a/src/test/ui/macros/macro-comma-support-rpass.rs b/tests/ui/macros/macro-comma-support-rpass.rs
index 25b8c3cc6..25b8c3cc6 100644
--- a/src/test/ui/macros/macro-comma-support-rpass.rs
+++ b/tests/ui/macros/macro-comma-support-rpass.rs
diff --git a/src/test/ui/macros/macro-comma-support.rs b/tests/ui/macros/macro-comma-support.rs
index 7df5b6233..7df5b6233 100644
--- a/src/test/ui/macros/macro-comma-support.rs
+++ b/tests/ui/macros/macro-comma-support.rs
diff --git a/src/test/ui/macros/macro-comma-support.stderr b/tests/ui/macros/macro-comma-support.stderr
index 874efccd3..874efccd3 100644
--- a/src/test/ui/macros/macro-comma-support.stderr
+++ b/tests/ui/macros/macro-comma-support.stderr
diff --git a/src/test/ui/macros/macro-context.rs b/tests/ui/macros/macro-context.rs
index d09fdf118..d09fdf118 100644
--- a/src/test/ui/macros/macro-context.rs
+++ b/tests/ui/macros/macro-context.rs
diff --git a/src/test/ui/macros/macro-context.stderr b/tests/ui/macros/macro-context.stderr
index f597c398b..7785f4159 100644
--- a/src/test/ui/macros/macro-context.stderr
+++ b/tests/ui/macros/macro-context.stderr
@@ -82,3 +82,18 @@ error: aborting due to 6 previous errors; 1 warning emitted
 
 Some errors have detailed explanations: E0412, E0425.
 For more information about an error, try `rustc --explain E0412`.
+Future incompatibility report: Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/macro-context.rs:3:15
+   |
+LL |     () => ( i ; typeof );
+   |               ^
+...
+LL |     let i = m!();
+   |             ---- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
diff --git a/src/test/ui/macros/macro-crate-def-only.rs b/tests/ui/macros/macro-crate-def-only.rs
index 514b33e38..514b33e38 100644
--- a/src/test/ui/macros/macro-crate-def-only.rs
+++ b/tests/ui/macros/macro-crate-def-only.rs
diff --git a/src/test/ui/macros/macro-crate-nonterminal-non-root.rs b/tests/ui/macros/macro-crate-nonterminal-non-root.rs
index 67899556f..67899556f 100644
--- a/src/test/ui/macros/macro-crate-nonterminal-non-root.rs
+++ b/tests/ui/macros/macro-crate-nonterminal-non-root.rs
diff --git a/src/test/ui/macros/macro-crate-nonterminal-non-root.stderr b/tests/ui/macros/macro-crate-nonterminal-non-root.stderr
index 1eca0186d..1eca0186d 100644
--- a/src/test/ui/macros/macro-crate-nonterminal-non-root.stderr
+++ b/tests/ui/macros/macro-crate-nonterminal-non-root.stderr
diff --git a/src/test/ui/macros/macro-crate-nonterminal-renamed.rs b/tests/ui/macros/macro-crate-nonterminal-renamed.rs
index 87bd397f0..87bd397f0 100644
--- a/src/test/ui/macros/macro-crate-nonterminal-renamed.rs
+++ b/tests/ui/macros/macro-crate-nonterminal-renamed.rs
diff --git a/src/test/ui/macros/macro-crate-nonterminal.rs b/tests/ui/macros/macro-crate-nonterminal.rs
index 4b1056fc7..4b1056fc7 100644
--- a/src/test/ui/macros/macro-crate-nonterminal.rs
+++ b/tests/ui/macros/macro-crate-nonterminal.rs
diff --git a/src/test/ui/macros/macro-crate-use.rs b/tests/ui/macros/macro-crate-use.rs
index 5c37cac96..5c37cac96 100644
--- a/src/test/ui/macros/macro-crate-use.rs
+++ b/tests/ui/macros/macro-crate-use.rs
diff --git a/src/test/ui/macros/macro-deep_expansion.rs b/tests/ui/macros/macro-deep_expansion.rs
index e13d8e1fc..e13d8e1fc 100644
--- a/src/test/ui/macros/macro-deep_expansion.rs
+++ b/tests/ui/macros/macro-deep_expansion.rs
diff --git a/src/test/ui/macros/macro-def-site-super.rs b/tests/ui/macros/macro-def-site-super.rs
index 716a8ced5..716a8ced5 100644
--- a/src/test/ui/macros/macro-def-site-super.rs
+++ b/tests/ui/macros/macro-def-site-super.rs
diff --git a/src/test/ui/macros/macro-delimiter-significance.rs b/tests/ui/macros/macro-delimiter-significance.rs
index 89f222b05..89f222b05 100644
--- a/src/test/ui/macros/macro-delimiter-significance.rs
+++ b/tests/ui/macros/macro-delimiter-significance.rs
diff --git a/src/test/ui/macros/macro-deprecation.rs b/tests/ui/macros/macro-deprecation.rs
index a7f327cf5..a7f327cf5 100644
--- a/src/test/ui/macros/macro-deprecation.rs
+++ b/tests/ui/macros/macro-deprecation.rs
diff --git a/src/test/ui/macros/macro-deprecation.stderr b/tests/ui/macros/macro-deprecation.stderr
index 07849d7ce..07849d7ce 100644
--- a/src/test/ui/macros/macro-deprecation.stderr
+++ b/tests/ui/macros/macro-deprecation.stderr
diff --git a/src/test/ui/macros/macro-doc-comments.rs b/tests/ui/macros/macro-doc-comments.rs
index fcc64cc06..fcc64cc06 100644
--- a/src/test/ui/macros/macro-doc-comments.rs
+++ b/tests/ui/macros/macro-doc-comments.rs
diff --git a/src/test/ui/macros/macro-doc-escapes.rs b/tests/ui/macros/macro-doc-escapes.rs
index ff5a5793b..ff5a5793b 100644
--- a/src/test/ui/macros/macro-doc-escapes.rs
+++ b/tests/ui/macros/macro-doc-escapes.rs
diff --git a/src/test/ui/macros/macro-doc-raw-str-hashes.rs b/tests/ui/macros/macro-doc-raw-str-hashes.rs
index a003bff3c..a003bff3c 100644
--- a/src/test/ui/macros/macro-doc-raw-str-hashes.rs
+++ b/tests/ui/macros/macro-doc-raw-str-hashes.rs
diff --git a/src/test/ui/macros/macro-error.rs b/tests/ui/macros/macro-error.rs
index 59ed79e91..59ed79e91 100644
--- a/src/test/ui/macros/macro-error.rs
+++ b/tests/ui/macros/macro-error.rs
diff --git a/src/test/ui/macros/macro-error.stderr b/tests/ui/macros/macro-error.stderr
index 2539a6d51..2539a6d51 100644
--- a/src/test/ui/macros/macro-error.stderr
+++ b/tests/ui/macros/macro-error.stderr
diff --git a/src/test/ui/macros/macro-expanded-include/file.txt b/tests/ui/macros/macro-expanded-include/file.txt
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/macros/macro-expanded-include/file.txt
+++ b/tests/ui/macros/macro-expanded-include/file.txt
diff --git a/src/test/ui/macros/macro-expanded-include/foo/mod.rs b/tests/ui/macros/macro-expanded-include/foo/mod.rs
index cff110470..cff110470 100644
--- a/src/test/ui/macros/macro-expanded-include/foo/mod.rs
+++ b/tests/ui/macros/macro-expanded-include/foo/mod.rs
diff --git a/src/test/ui/macros/macro-expanded-include/test.rs b/tests/ui/macros/macro-expanded-include/test.rs
index 20da58a7e..20da58a7e 100644
--- a/src/test/ui/macros/macro-expanded-include/test.rs
+++ b/tests/ui/macros/macro-expanded-include/test.rs
diff --git a/src/test/ui/macros/macro-expansion-tests.rs b/tests/ui/macros/macro-expansion-tests.rs
index 38f4937c1..38f4937c1 100644
--- a/src/test/ui/macros/macro-expansion-tests.rs
+++ b/tests/ui/macros/macro-expansion-tests.rs
diff --git a/src/test/ui/macros/macro-expansion-tests.stderr b/tests/ui/macros/macro-expansion-tests.stderr
index 8b3f7ca88..8b3f7ca88 100644
--- a/src/test/ui/macros/macro-expansion-tests.stderr
+++ b/tests/ui/macros/macro-expansion-tests.stderr
diff --git a/src/test/ui/macros/macro-export-inner-module.rs b/tests/ui/macros/macro-export-inner-module.rs
index 1f23e90b6..1f23e90b6 100644
--- a/src/test/ui/macros/macro-export-inner-module.rs
+++ b/tests/ui/macros/macro-export-inner-module.rs
diff --git a/src/test/ui/macros/macro-first-set.rs b/tests/ui/macros/macro-first-set.rs
index eeb1ddd84..eeb1ddd84 100644
--- a/src/test/ui/macros/macro-first-set.rs
+++ b/tests/ui/macros/macro-first-set.rs
diff --git a/src/test/ui/macros/macro-follow-rpass.rs b/tests/ui/macros/macro-follow-rpass.rs
index ca9365563..ca9365563 100644
--- a/src/test/ui/macros/macro-follow-rpass.rs
+++ b/tests/ui/macros/macro-follow-rpass.rs
diff --git a/src/test/ui/macros/macro-follow.rs b/tests/ui/macros/macro-follow.rs
index 8054418d9..8054418d9 100644
--- a/src/test/ui/macros/macro-follow.rs
+++ b/tests/ui/macros/macro-follow.rs
diff --git a/src/test/ui/macros/macro-follow.stderr b/tests/ui/macros/macro-follow.stderr
index 61ae79d23..61ae79d23 100644
--- a/src/test/ui/macros/macro-follow.stderr
+++ b/tests/ui/macros/macro-follow.stderr
diff --git a/src/test/ui/macros/macro-followed-by-seq-bad.rs b/tests/ui/macros/macro-followed-by-seq-bad.rs
index b73742f77..b73742f77 100644
--- a/src/test/ui/macros/macro-followed-by-seq-bad.rs
+++ b/tests/ui/macros/macro-followed-by-seq-bad.rs
diff --git a/src/test/ui/macros/macro-followed-by-seq-bad.stderr b/tests/ui/macros/macro-followed-by-seq-bad.stderr
index 7097979ae..7097979ae 100644
--- a/src/test/ui/macros/macro-followed-by-seq-bad.stderr
+++ b/tests/ui/macros/macro-followed-by-seq-bad.stderr
diff --git a/src/test/ui/macros/macro-followed-by-seq.rs b/tests/ui/macros/macro-followed-by-seq.rs
index 71d59d8d3..71d59d8d3 100644
--- a/src/test/ui/macros/macro-followed-by-seq.rs
+++ b/tests/ui/macros/macro-followed-by-seq.rs
diff --git a/src/test/ui/macros/macro-in-expression-context-2.rs b/tests/ui/macros/macro-in-expression-context-2.rs
index 9423f0a35..9423f0a35 100644
--- a/src/test/ui/macros/macro-in-expression-context-2.rs
+++ b/tests/ui/macros/macro-in-expression-context-2.rs
diff --git a/src/test/ui/macros/macro-in-expression-context-2.stderr b/tests/ui/macros/macro-in-expression-context-2.stderr
index d0312c485..d0312c485 100644
--- a/src/test/ui/macros/macro-in-expression-context-2.stderr
+++ b/tests/ui/macros/macro-in-expression-context-2.stderr
diff --git a/src/test/ui/macros/macro-in-expression-context.fixed b/tests/ui/macros/macro-in-expression-context.fixed
index f22caf279..f22caf279 100644
--- a/src/test/ui/macros/macro-in-expression-context.fixed
+++ b/tests/ui/macros/macro-in-expression-context.fixed
diff --git a/src/test/ui/macros/macro-in-expression-context.rs b/tests/ui/macros/macro-in-expression-context.rs
index 1a056e582..1a056e582 100644
--- a/src/test/ui/macros/macro-in-expression-context.rs
+++ b/tests/ui/macros/macro-in-expression-context.rs
diff --git a/tests/ui/macros/macro-in-expression-context.stderr b/tests/ui/macros/macro-in-expression-context.stderr
new file mode 100644
index 000000000..3f492b141
--- /dev/null
+++ b/tests/ui/macros/macro-in-expression-context.stderr
@@ -0,0 +1,50 @@
+error: macro expansion ignores token `assert_eq` and any following
+  --> $DIR/macro-in-expression-context.rs:12:9
+   |
+LL |         assert_eq!("B", "B");
+   |         ^^^^^^^^^
+...
+LL |     foo!()
+   |     ------ caused by the macro expansion here
+   |
+   = note: the usage of `foo!` is likely invalid in expression context
+help: you might be missing a semicolon here
+   |
+LL |     foo!();
+   |           +
+
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/macro-in-expression-context.rs:5:29
+   |
+LL |         assert_eq!("A", "A");
+   |                             ^
+...
+LL |     foo!()
+   |     ------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to previous error; 1 warning emitted
+
+Future incompatibility report: Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/macro-in-expression-context.rs:5:29
+   |
+LL |         assert_eq!("A", "A");
+   |                             ^
+...
+LL |     foo!()
+   |     ------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
diff --git a/src/test/ui/macros/macro-in-fn.rs b/tests/ui/macros/macro-in-fn.rs
index d354fe4a7..d354fe4a7 100644
--- a/src/test/ui/macros/macro-in-fn.rs
+++ b/tests/ui/macros/macro-in-fn.rs
diff --git a/src/test/ui/macros/macro-include-items.rs b/tests/ui/macros/macro-include-items.rs
index 332bf59c9..332bf59c9 100644
--- a/src/test/ui/macros/macro-include-items.rs
+++ b/tests/ui/macros/macro-include-items.rs
diff --git a/src/test/ui/macros/macro-inner-attributes.rs b/tests/ui/macros/macro-inner-attributes.rs
index a8cda2307..a8cda2307 100644
--- a/src/test/ui/macros/macro-inner-attributes.rs
+++ b/tests/ui/macros/macro-inner-attributes.rs
diff --git a/src/test/ui/macros/macro-inner-attributes.stderr b/tests/ui/macros/macro-inner-attributes.stderr
index 77b648615..77b648615 100644
--- a/src/test/ui/macros/macro-inner-attributes.stderr
+++ b/tests/ui/macros/macro-inner-attributes.stderr
diff --git a/src/test/ui/macros/macro-input-future-proofing.rs b/tests/ui/macros/macro-input-future-proofing.rs
index 9a5bdb08a..9a5bdb08a 100644
--- a/src/test/ui/macros/macro-input-future-proofing.rs
+++ b/tests/ui/macros/macro-input-future-proofing.rs
diff --git a/src/test/ui/macros/macro-input-future-proofing.stderr b/tests/ui/macros/macro-input-future-proofing.stderr
index 542486927..542486927 100644
--- a/src/test/ui/macros/macro-input-future-proofing.stderr
+++ b/tests/ui/macros/macro-input-future-proofing.stderr
diff --git a/src/test/ui/macros/macro-interpolation.rs b/tests/ui/macros/macro-interpolation.rs
index 35003a79a..35003a79a 100644
--- a/src/test/ui/macros/macro-interpolation.rs
+++ b/tests/ui/macros/macro-interpolation.rs
diff --git a/src/test/ui/macros/macro-invalid-fragment-spec.rs b/tests/ui/macros/macro-invalid-fragment-spec.rs
index dc4d75096..dc4d75096 100644
--- a/src/test/ui/macros/macro-invalid-fragment-spec.rs
+++ b/tests/ui/macros/macro-invalid-fragment-spec.rs
diff --git a/src/test/ui/macros/macro-invalid-fragment-spec.stderr b/tests/ui/macros/macro-invalid-fragment-spec.stderr
index b04734482..b04734482 100644
--- a/src/test/ui/macros/macro-invalid-fragment-spec.stderr
+++ b/tests/ui/macros/macro-invalid-fragment-spec.stderr
diff --git a/src/test/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs b/tests/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs
index 8f9dcb947..8f9dcb947 100644
--- a/src/test/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs
+++ b/tests/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs
diff --git a/src/test/ui/macros/macro-lifetime-used-with-bound.rs b/tests/ui/macros/macro-lifetime-used-with-bound.rs
index ea3f74c9a..ea3f74c9a 100644
--- a/src/test/ui/macros/macro-lifetime-used-with-bound.rs
+++ b/tests/ui/macros/macro-lifetime-used-with-bound.rs
diff --git a/src/test/ui/macros/macro-lifetime-used-with-labels.rs b/tests/ui/macros/macro-lifetime-used-with-labels.rs
index 59017da3b..59017da3b 100644
--- a/src/test/ui/macros/macro-lifetime-used-with-labels.rs
+++ b/tests/ui/macros/macro-lifetime-used-with-labels.rs
diff --git a/src/test/ui/macros/macro-lifetime-used-with-static.rs b/tests/ui/macros/macro-lifetime-used-with-static.rs
index 8552c4b81..8552c4b81 100644
--- a/src/test/ui/macros/macro-lifetime-used-with-static.rs
+++ b/tests/ui/macros/macro-lifetime-used-with-static.rs
diff --git a/src/test/ui/macros/macro-lifetime.rs b/tests/ui/macros/macro-lifetime.rs
index 5931fe009..5931fe009 100644
--- a/src/test/ui/macros/macro-lifetime.rs
+++ b/tests/ui/macros/macro-lifetime.rs
diff --git a/src/test/ui/macros/macro-literal.rs b/tests/ui/macros/macro-literal.rs
index 3c2e71f9c..3c2e71f9c 100644
--- a/src/test/ui/macros/macro-literal.rs
+++ b/tests/ui/macros/macro-literal.rs
diff --git a/src/test/ui/macros/macro-local-data-key-priv.rs b/tests/ui/macros/macro-local-data-key-priv.rs
index 2e4f88f9a..2e4f88f9a 100644
--- a/src/test/ui/macros/macro-local-data-key-priv.rs
+++ b/tests/ui/macros/macro-local-data-key-priv.rs
diff --git a/src/test/ui/macros/macro-local-data-key-priv.stderr b/tests/ui/macros/macro-local-data-key-priv.stderr
index fb8cab279..fb8cab279 100644
--- a/src/test/ui/macros/macro-local-data-key-priv.stderr
+++ b/tests/ui/macros/macro-local-data-key-priv.stderr
diff --git a/src/test/ui/macros/macro-match-nonterminal.rs b/tests/ui/macros/macro-match-nonterminal.rs
index 5d9eb55fe..5d9eb55fe 100644
--- a/src/test/ui/macros/macro-match-nonterminal.rs
+++ b/tests/ui/macros/macro-match-nonterminal.rs
diff --git a/src/test/ui/macros/macro-match-nonterminal.stderr b/tests/ui/macros/macro-match-nonterminal.stderr
index ef7261c02..ef7261c02 100644
--- a/src/test/ui/macros/macro-match-nonterminal.stderr
+++ b/tests/ui/macros/macro-match-nonterminal.stderr
diff --git a/src/test/ui/macros/macro-meta-items-modern.rs b/tests/ui/macros/macro-meta-items-modern.rs
index bc6938d4a..bc6938d4a 100644
--- a/src/test/ui/macros/macro-meta-items-modern.rs
+++ b/tests/ui/macros/macro-meta-items-modern.rs
diff --git a/src/test/ui/macros/macro-meta-items.rs b/tests/ui/macros/macro-meta-items.rs
index 4cbc252ae..4cbc252ae 100644
--- a/src/test/ui/macros/macro-meta-items.rs
+++ b/tests/ui/macros/macro-meta-items.rs
diff --git a/src/test/ui/macros/macro-method-issue-4621.rs b/tests/ui/macros/macro-method-issue-4621.rs
index 342fad5f6..342fad5f6 100644
--- a/src/test/ui/macros/macro-method-issue-4621.rs
+++ b/tests/ui/macros/macro-method-issue-4621.rs
diff --git a/src/test/ui/macros/macro-missing-delimiters.rs b/tests/ui/macros/macro-missing-delimiters.rs
index 290d7615e..290d7615e 100644
--- a/src/test/ui/macros/macro-missing-delimiters.rs
+++ b/tests/ui/macros/macro-missing-delimiters.rs
diff --git a/src/test/ui/macros/macro-missing-delimiters.stderr b/tests/ui/macros/macro-missing-delimiters.stderr
index e7c37c8dd..e7c37c8dd 100644
--- a/src/test/ui/macros/macro-missing-delimiters.stderr
+++ b/tests/ui/macros/macro-missing-delimiters.stderr
diff --git a/src/test/ui/macros/macro-missing-fragment-deduplication.rs b/tests/ui/macros/macro-missing-fragment-deduplication.rs
index c1e6ba746..c1e6ba746 100644
--- a/src/test/ui/macros/macro-missing-fragment-deduplication.rs
+++ b/tests/ui/macros/macro-missing-fragment-deduplication.rs
diff --git a/src/test/ui/macros/macro-missing-fragment-deduplication.stderr b/tests/ui/macros/macro-missing-fragment-deduplication.stderr
index 3b9e716e1..3b9e716e1 100644
--- a/src/test/ui/macros/macro-missing-fragment-deduplication.stderr
+++ b/tests/ui/macros/macro-missing-fragment-deduplication.stderr
diff --git a/src/test/ui/macros/macro-missing-fragment.rs b/tests/ui/macros/macro-missing-fragment.rs
index 210c85ebb..210c85ebb 100644
--- a/src/test/ui/macros/macro-missing-fragment.rs
+++ b/tests/ui/macros/macro-missing-fragment.rs
diff --git a/src/test/ui/macros/macro-missing-fragment.stderr b/tests/ui/macros/macro-missing-fragment.stderr
index 2aa1e58f6..2aa1e58f6 100644
--- a/src/test/ui/macros/macro-missing-fragment.stderr
+++ b/tests/ui/macros/macro-missing-fragment.stderr
diff --git a/src/test/ui/macros/macro-multiple-items.rs b/tests/ui/macros/macro-multiple-items.rs
index 3b6dfd9bc..3b6dfd9bc 100644
--- a/src/test/ui/macros/macro-multiple-items.rs
+++ b/tests/ui/macros/macro-multiple-items.rs
diff --git a/src/test/ui/macros/macro-multiple-matcher-bindings.rs b/tests/ui/macros/macro-multiple-matcher-bindings.rs
index 7d39dc0a5..7d39dc0a5 100644
--- a/src/test/ui/macros/macro-multiple-matcher-bindings.rs
+++ b/tests/ui/macros/macro-multiple-matcher-bindings.rs
diff --git a/src/test/ui/macros/macro-multiple-matcher-bindings.stderr b/tests/ui/macros/macro-multiple-matcher-bindings.stderr
index 3ad1297ff..3ad1297ff 100644
--- a/src/test/ui/macros/macro-multiple-matcher-bindings.stderr
+++ b/tests/ui/macros/macro-multiple-matcher-bindings.stderr
diff --git a/src/test/ui/macros/macro-name-typo.rs b/tests/ui/macros/macro-name-typo.rs
index 1ddc419d3..1ddc419d3 100644
--- a/src/test/ui/macros/macro-name-typo.rs
+++ b/tests/ui/macros/macro-name-typo.rs
diff --git a/tests/ui/macros/macro-name-typo.stderr b/tests/ui/macros/macro-name-typo.stderr
new file mode 100644
index 000000000..d7c8aaae2
--- /dev/null
+++ b/tests/ui/macros/macro-name-typo.stderr
@@ -0,0 +1,11 @@
+error: cannot find macro `printlx` in this scope
+  --> $DIR/macro-name-typo.rs:2:5
+   |
+LL |     printlx!("oh noes!");
+   |     ^^^^^^^ help: a macro with a similar name exists: `println`
+  --> $SRC_DIR/std/src/macros.rs:LL:COL
+   |
+   = note: similarly named macro `println` defined here
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/macros/macro-named-default.rs b/tests/ui/macros/macro-named-default.rs
index 9b6cd1916..9b6cd1916 100644
--- a/src/test/ui/macros/macro-named-default.rs
+++ b/tests/ui/macros/macro-named-default.rs
diff --git a/src/test/ui/macros/macro-nested_definition_issue-31946.rs b/tests/ui/macros/macro-nested_definition_issue-31946.rs
index a83c5b2e4..a83c5b2e4 100644
--- a/src/test/ui/macros/macro-nested_definition_issue-31946.rs
+++ b/tests/ui/macros/macro-nested_definition_issue-31946.rs
diff --git a/src/test/ui/macros/macro-nested_expr.rs b/tests/ui/macros/macro-nested_expr.rs
index f1433cbf4..f1433cbf4 100644
--- a/src/test/ui/macros/macro-nested_expr.rs
+++ b/tests/ui/macros/macro-nested_expr.rs
diff --git a/src/test/ui/macros/macro-nested_stmt_macros.rs b/tests/ui/macros/macro-nested_stmt_macros.rs
index 5d4758a0c..5d4758a0c 100644
--- a/src/test/ui/macros/macro-nested_stmt_macros.rs
+++ b/tests/ui/macros/macro-nested_stmt_macros.rs
diff --git a/src/test/ui/macros/macro-non-lifetime.rs b/tests/ui/macros/macro-non-lifetime.rs
index 26e1f2afa..26e1f2afa 100644
--- a/src/test/ui/macros/macro-non-lifetime.rs
+++ b/tests/ui/macros/macro-non-lifetime.rs
diff --git a/src/test/ui/macros/macro-non-lifetime.stderr b/tests/ui/macros/macro-non-lifetime.stderr
index e1ed87f94..e1ed87f94 100644
--- a/src/test/ui/macros/macro-non-lifetime.stderr
+++ b/tests/ui/macros/macro-non-lifetime.stderr
diff --git a/src/test/ui/macros/macro-nt-list.rs b/tests/ui/macros/macro-nt-list.rs
index 36aa74f08..36aa74f08 100644
--- a/src/test/ui/macros/macro-nt-list.rs
+++ b/tests/ui/macros/macro-nt-list.rs
diff --git a/src/test/ui/macros/macro-of-higher-order.rs b/tests/ui/macros/macro-of-higher-order.rs
index ec551d6cd..ec551d6cd 100644
--- a/src/test/ui/macros/macro-of-higher-order.rs
+++ b/tests/ui/macros/macro-of-higher-order.rs
diff --git a/src/test/ui/macros/macro-or-patterns-back-compat.fixed b/tests/ui/macros/macro-or-patterns-back-compat.fixed
index b0d56e9bb..b0d56e9bb 100644
--- a/src/test/ui/macros/macro-or-patterns-back-compat.fixed
+++ b/tests/ui/macros/macro-or-patterns-back-compat.fixed
diff --git a/src/test/ui/macros/macro-or-patterns-back-compat.rs b/tests/ui/macros/macro-or-patterns-back-compat.rs
index 9e24b5106..9e24b5106 100644
--- a/src/test/ui/macros/macro-or-patterns-back-compat.rs
+++ b/tests/ui/macros/macro-or-patterns-back-compat.rs
diff --git a/src/test/ui/macros/macro-or-patterns-back-compat.stderr b/tests/ui/macros/macro-or-patterns-back-compat.stderr
index e04dfefa4..e04dfefa4 100644
--- a/src/test/ui/macros/macro-or-patterns-back-compat.stderr
+++ b/tests/ui/macros/macro-or-patterns-back-compat.stderr
diff --git a/src/test/ui/macros/macro-outer-attributes.rs b/tests/ui/macros/macro-outer-attributes.rs
index 0752f7e31..0752f7e31 100644
--- a/src/test/ui/macros/macro-outer-attributes.rs
+++ b/tests/ui/macros/macro-outer-attributes.rs
diff --git a/src/test/ui/macros/macro-outer-attributes.stderr b/tests/ui/macros/macro-outer-attributes.stderr
index 4ea760ab8..4ea760ab8 100644
--- a/src/test/ui/macros/macro-outer-attributes.stderr
+++ b/tests/ui/macros/macro-outer-attributes.stderr
diff --git a/src/test/ui/macros/macro-parameter-span.rs b/tests/ui/macros/macro-parameter-span.rs
index 5609f84e1..5609f84e1 100644
--- a/src/test/ui/macros/macro-parameter-span.rs
+++ b/tests/ui/macros/macro-parameter-span.rs
diff --git a/src/test/ui/macros/macro-parameter-span.stderr b/tests/ui/macros/macro-parameter-span.stderr
index 24e3e89ea..24e3e89ea 100644
--- a/src/test/ui/macros/macro-parameter-span.stderr
+++ b/tests/ui/macros/macro-parameter-span.stderr
diff --git a/src/test/ui/macros/macro-pat-follow-2018.rs b/tests/ui/macros/macro-pat-follow-2018.rs
index ce2911de9..ce2911de9 100644
--- a/src/test/ui/macros/macro-pat-follow-2018.rs
+++ b/tests/ui/macros/macro-pat-follow-2018.rs
diff --git a/src/test/ui/macros/macro-pat-follow.rs b/tests/ui/macros/macro-pat-follow.rs
index 8e02789fd..8e02789fd 100644
--- a/src/test/ui/macros/macro-pat-follow.rs
+++ b/tests/ui/macros/macro-pat-follow.rs
diff --git a/src/test/ui/macros/macro-pat-neg-lit.rs b/tests/ui/macros/macro-pat-neg-lit.rs
index 79c68fd25..79c68fd25 100644
--- a/src/test/ui/macros/macro-pat-neg-lit.rs
+++ b/tests/ui/macros/macro-pat-neg-lit.rs
diff --git a/src/test/ui/macros/macro-pat-pattern-followed-by-or-in-2021.rs b/tests/ui/macros/macro-pat-pattern-followed-by-or-in-2021.rs
index f5a97eca2..f5a97eca2 100644
--- a/src/test/ui/macros/macro-pat-pattern-followed-by-or-in-2021.rs
+++ b/tests/ui/macros/macro-pat-pattern-followed-by-or-in-2021.rs
diff --git a/src/test/ui/macros/macro-pat-pattern-followed-by-or-in-2021.stderr b/tests/ui/macros/macro-pat-pattern-followed-by-or-in-2021.stderr
index a06487be3..a06487be3 100644
--- a/src/test/ui/macros/macro-pat-pattern-followed-by-or-in-2021.stderr
+++ b/tests/ui/macros/macro-pat-pattern-followed-by-or-in-2021.stderr
diff --git a/src/test/ui/macros/macro-pat-pattern-followed-by-or.rs b/tests/ui/macros/macro-pat-pattern-followed-by-or.rs
index 54bd13d7e..54bd13d7e 100644
--- a/src/test/ui/macros/macro-pat-pattern-followed-by-or.rs
+++ b/tests/ui/macros/macro-pat-pattern-followed-by-or.rs
diff --git a/src/test/ui/macros/macro-pat.rs b/tests/ui/macros/macro-pat.rs
index baf816e53..baf816e53 100644
--- a/src/test/ui/macros/macro-pat.rs
+++ b/tests/ui/macros/macro-pat.rs
diff --git a/src/test/ui/macros/macro-pat2021-pattern-followed-by-or.rs b/tests/ui/macros/macro-pat2021-pattern-followed-by-or.rs
index b4be03aad..b4be03aad 100644
--- a/src/test/ui/macros/macro-pat2021-pattern-followed-by-or.rs
+++ b/tests/ui/macros/macro-pat2021-pattern-followed-by-or.rs
diff --git a/src/test/ui/macros/macro-pat2021-pattern-followed-by-or.stderr b/tests/ui/macros/macro-pat2021-pattern-followed-by-or.stderr
index c3754dde0..c3754dde0 100644
--- a/src/test/ui/macros/macro-pat2021-pattern-followed-by-or.stderr
+++ b/tests/ui/macros/macro-pat2021-pattern-followed-by-or.stderr
diff --git a/src/test/ui/macros/macro-path-prelude-fail-1.rs b/tests/ui/macros/macro-path-prelude-fail-1.rs
index d93792bdf..d93792bdf 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-1.rs
+++ b/tests/ui/macros/macro-path-prelude-fail-1.rs
diff --git a/src/test/ui/macros/macro-path-prelude-fail-1.stderr b/tests/ui/macros/macro-path-prelude-fail-1.stderr
index f8377ffb3..f8377ffb3 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-1.stderr
+++ b/tests/ui/macros/macro-path-prelude-fail-1.stderr
diff --git a/src/test/ui/macros/macro-path-prelude-fail-2.rs b/tests/ui/macros/macro-path-prelude-fail-2.rs
index 816a3c4cc..816a3c4cc 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-2.rs
+++ b/tests/ui/macros/macro-path-prelude-fail-2.rs
diff --git a/src/test/ui/macros/macro-path-prelude-fail-2.stderr b/tests/ui/macros/macro-path-prelude-fail-2.stderr
index 9574b7a1e..9574b7a1e 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-2.stderr
+++ b/tests/ui/macros/macro-path-prelude-fail-2.stderr
diff --git a/src/test/ui/macros/macro-path-prelude-fail-3.rs b/tests/ui/macros/macro-path-prelude-fail-3.rs
index 68eb350a9..68eb350a9 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-3.rs
+++ b/tests/ui/macros/macro-path-prelude-fail-3.rs
diff --git a/tests/ui/macros/macro-path-prelude-fail-3.stderr b/tests/ui/macros/macro-path-prelude-fail-3.stderr
new file mode 100644
index 000000000..f1c3512bc
--- /dev/null
+++ b/tests/ui/macros/macro-path-prelude-fail-3.stderr
@@ -0,0 +1,13 @@
+error: cannot find macro `inline` in this scope
+  --> $DIR/macro-path-prelude-fail-3.rs:2:5
+   |
+LL |     inline!();
+   |     ^^^^^^ help: a macro with a similar name exists: `line`
+  --> $SRC_DIR/core/src/macros/mod.rs:LL:COL
+   |
+   = note: similarly named macro `line` defined here
+   |
+   = note: `inline` is in scope, but it is an attribute: `#[inline]`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/macros/macro-path-prelude-fail-4.rs b/tests/ui/macros/macro-path-prelude-fail-4.rs
index 0f93fcdaa..0f93fcdaa 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-4.rs
+++ b/tests/ui/macros/macro-path-prelude-fail-4.rs
diff --git a/src/test/ui/macros/macro-path-prelude-fail-4.stderr b/tests/ui/macros/macro-path-prelude-fail-4.stderr
index dfd6818b6..dfd6818b6 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-4.stderr
+++ b/tests/ui/macros/macro-path-prelude-fail-4.stderr
diff --git a/src/test/ui/macros/macro-path-prelude-pass.rs b/tests/ui/macros/macro-path-prelude-pass.rs
index 7cf346286..7cf346286 100644
--- a/src/test/ui/macros/macro-path-prelude-pass.rs
+++ b/tests/ui/macros/macro-path-prelude-pass.rs
diff --git a/src/test/ui/macros/macro-path-prelude-shadowing.rs b/tests/ui/macros/macro-path-prelude-shadowing.rs
index d71812000..d71812000 100644
--- a/src/test/ui/macros/macro-path-prelude-shadowing.rs
+++ b/tests/ui/macros/macro-path-prelude-shadowing.rs
diff --git a/src/test/ui/macros/macro-path-prelude-shadowing.stderr b/tests/ui/macros/macro-path-prelude-shadowing.stderr
index 4a864c2e9..4a864c2e9 100644
--- a/src/test/ui/macros/macro-path-prelude-shadowing.stderr
+++ b/tests/ui/macros/macro-path-prelude-shadowing.stderr
diff --git a/src/test/ui/macros/macro-path.rs b/tests/ui/macros/macro-path.rs
index 6c011c897..6c011c897 100644
--- a/src/test/ui/macros/macro-path.rs
+++ b/tests/ui/macros/macro-path.rs
diff --git a/src/test/ui/macros/macro-pub-matcher.rs b/tests/ui/macros/macro-pub-matcher.rs
index 7b02a70be..7b02a70be 100644
--- a/src/test/ui/macros/macro-pub-matcher.rs
+++ b/tests/ui/macros/macro-pub-matcher.rs
diff --git a/src/test/ui/macros/macro-reexport-removed.rs b/tests/ui/macros/macro-reexport-removed.rs
index 874c94d08..874c94d08 100644
--- a/src/test/ui/macros/macro-reexport-removed.rs
+++ b/tests/ui/macros/macro-reexport-removed.rs
diff --git a/src/test/ui/macros/macro-reexport-removed.stderr b/tests/ui/macros/macro-reexport-removed.stderr
index 475a586dd..475a586dd 100644
--- a/src/test/ui/macros/macro-reexport-removed.stderr
+++ b/tests/ui/macros/macro-reexport-removed.stderr
diff --git a/src/test/ui/macros/macro-seq-followed-by-seq.rs b/tests/ui/macros/macro-seq-followed-by-seq.rs
index 8f0f4fd4a..8f0f4fd4a 100644
--- a/src/test/ui/macros/macro-seq-followed-by-seq.rs
+++ b/tests/ui/macros/macro-seq-followed-by-seq.rs
diff --git a/src/test/ui/macros/macro-shadowing-relaxed.rs b/tests/ui/macros/macro-shadowing-relaxed.rs
index b2a639218..b2a639218 100644
--- a/src/test/ui/macros/macro-shadowing-relaxed.rs
+++ b/tests/ui/macros/macro-shadowing-relaxed.rs
diff --git a/src/test/ui/macros/macro-shadowing.rs b/tests/ui/macros/macro-shadowing.rs
index 7f956dd7d..7f956dd7d 100644
--- a/src/test/ui/macros/macro-shadowing.rs
+++ b/tests/ui/macros/macro-shadowing.rs
diff --git a/src/test/ui/macros/macro-shadowing.stderr b/tests/ui/macros/macro-shadowing.stderr
index a052b43ac..a052b43ac 100644
--- a/src/test/ui/macros/macro-shadowing.stderr
+++ b/tests/ui/macros/macro-shadowing.stderr
diff --git a/src/test/ui/macros/macro-stability-rpass.rs b/tests/ui/macros/macro-stability-rpass.rs
index 2d02b9528..2d02b9528 100644
--- a/src/test/ui/macros/macro-stability-rpass.rs
+++ b/tests/ui/macros/macro-stability-rpass.rs
diff --git a/src/test/ui/macros/macro-stability.rs b/tests/ui/macros/macro-stability.rs
index ed7618a67..ed7618a67 100644
--- a/src/test/ui/macros/macro-stability.rs
+++ b/tests/ui/macros/macro-stability.rs
diff --git a/src/test/ui/macros/macro-stability.stderr b/tests/ui/macros/macro-stability.stderr
index 2cfdb52b1..2cfdb52b1 100644
--- a/src/test/ui/macros/macro-stability.stderr
+++ b/tests/ui/macros/macro-stability.stderr
diff --git a/src/test/ui/macros/macro-stmt-matchers.rs b/tests/ui/macros/macro-stmt-matchers.rs
index a643e50e9..a643e50e9 100644
--- a/src/test/ui/macros/macro-stmt-matchers.rs
+++ b/tests/ui/macros/macro-stmt-matchers.rs
diff --git a/src/test/ui/macros/macro-stmt.rs b/tests/ui/macros/macro-stmt.rs
index c9a0b879a..c9a0b879a 100644
--- a/src/test/ui/macros/macro-stmt.rs
+++ b/tests/ui/macros/macro-stmt.rs
diff --git a/src/test/ui/macros/macro-stmt_macro_in_expr_macro.rs b/tests/ui/macros/macro-stmt_macro_in_expr_macro.rs
index 528d0b28b..528d0b28b 100644
--- a/src/test/ui/macros/macro-stmt_macro_in_expr_macro.rs
+++ b/tests/ui/macros/macro-stmt_macro_in_expr_macro.rs
diff --git a/src/test/ui/macros/macro-tt-followed-by-seq.rs b/tests/ui/macros/macro-tt-followed-by-seq.rs
index 080dbcfdd..080dbcfdd 100644
--- a/src/test/ui/macros/macro-tt-followed-by-seq.rs
+++ b/tests/ui/macros/macro-tt-followed-by-seq.rs
diff --git a/src/test/ui/macros/macro-tt-matchers.rs b/tests/ui/macros/macro-tt-matchers.rs
index 2ee41b088..2ee41b088 100644
--- a/src/test/ui/macros/macro-tt-matchers.rs
+++ b/tests/ui/macros/macro-tt-matchers.rs
diff --git a/src/test/ui/macros/macro-use-all-and-none.rs b/tests/ui/macros/macro-use-all-and-none.rs
index c8bd44008..c8bd44008 100644
--- a/src/test/ui/macros/macro-use-all-and-none.rs
+++ b/tests/ui/macros/macro-use-all-and-none.rs
diff --git a/src/test/ui/macros/macro-use-all-and-none.stderr b/tests/ui/macros/macro-use-all-and-none.stderr
index 00b10dccd..00b10dccd 100644
--- a/src/test/ui/macros/macro-use-all-and-none.stderr
+++ b/tests/ui/macros/macro-use-all-and-none.stderr
diff --git a/src/test/ui/macros/macro-use-all.rs b/tests/ui/macros/macro-use-all.rs
index 48c7b77e5..48c7b77e5 100644
--- a/src/test/ui/macros/macro-use-all.rs
+++ b/tests/ui/macros/macro-use-all.rs
diff --git a/src/test/ui/macros/macro-use-bad-args-1.rs b/tests/ui/macros/macro-use-bad-args-1.rs
index ec0b64a10..ec0b64a10 100644
--- a/src/test/ui/macros/macro-use-bad-args-1.rs
+++ b/tests/ui/macros/macro-use-bad-args-1.rs
diff --git a/src/test/ui/macros/macro-use-bad-args-1.stderr b/tests/ui/macros/macro-use-bad-args-1.stderr
index 4e5482a51..4e5482a51 100644
--- a/src/test/ui/macros/macro-use-bad-args-1.stderr
+++ b/tests/ui/macros/macro-use-bad-args-1.stderr
diff --git a/src/test/ui/macros/macro-use-bad-args-2.rs b/tests/ui/macros/macro-use-bad-args-2.rs
index c5f8f62c1..c5f8f62c1 100644
--- a/src/test/ui/macros/macro-use-bad-args-2.rs
+++ b/tests/ui/macros/macro-use-bad-args-2.rs
diff --git a/src/test/ui/macros/macro-use-bad-args-2.stderr b/tests/ui/macros/macro-use-bad-args-2.stderr
index c958104ea..c958104ea 100644
--- a/src/test/ui/macros/macro-use-bad-args-2.stderr
+++ b/tests/ui/macros/macro-use-bad-args-2.stderr
diff --git a/src/test/ui/macros/macro-use-both.rs b/tests/ui/macros/macro-use-both.rs
index ed5d1312f..ed5d1312f 100644
--- a/src/test/ui/macros/macro-use-both.rs
+++ b/tests/ui/macros/macro-use-both.rs
diff --git a/src/test/ui/macros/macro-use-one.rs b/tests/ui/macros/macro-use-one.rs
index f74795e68..f74795e68 100644
--- a/src/test/ui/macros/macro-use-one.rs
+++ b/tests/ui/macros/macro-use-one.rs
diff --git a/src/test/ui/macros/macro-use-scope.rs b/tests/ui/macros/macro-use-scope.rs
index 5e58fc9c1..5e58fc9c1 100644
--- a/src/test/ui/macros/macro-use-scope.rs
+++ b/tests/ui/macros/macro-use-scope.rs
diff --git a/src/test/ui/macros/macro-use-undef.rs b/tests/ui/macros/macro-use-undef.rs
index ae3054e7b..ae3054e7b 100644
--- a/src/test/ui/macros/macro-use-undef.rs
+++ b/tests/ui/macros/macro-use-undef.rs
diff --git a/src/test/ui/macros/macro-use-undef.stderr b/tests/ui/macros/macro-use-undef.stderr
index 85b86e221..85b86e221 100644
--- a/src/test/ui/macros/macro-use-undef.stderr
+++ b/tests/ui/macros/macro-use-undef.stderr
diff --git a/src/test/ui/macros/macro-use-wrong-name.rs b/tests/ui/macros/macro-use-wrong-name.rs
index d142b5800..d142b5800 100644
--- a/src/test/ui/macros/macro-use-wrong-name.rs
+++ b/tests/ui/macros/macro-use-wrong-name.rs
diff --git a/src/test/ui/macros/macro-use-wrong-name.stderr b/tests/ui/macros/macro-use-wrong-name.stderr
index 326001fc1..ca5f0f190 100644
--- a/src/test/ui/macros/macro-use-wrong-name.stderr
+++ b/tests/ui/macros/macro-use-wrong-name.stderr
@@ -9,7 +9,7 @@ LL |     macro_two!();
 LL | macro_rules! macro_one { () => ("one") }
    | ---------------------- similarly named macro `macro_one` defined here
    |
-   = note: consider importing this macro:
+   = help: consider importing this macro:
            two_macros::macro_two
 
 error: aborting due to previous error
diff --git a/src/test/ui/macros/macro-with-attrs1.rs b/tests/ui/macros/macro-with-attrs1.rs
index 4e943b224..4e943b224 100644
--- a/src/test/ui/macros/macro-with-attrs1.rs
+++ b/tests/ui/macros/macro-with-attrs1.rs
diff --git a/src/test/ui/macros/macro-with-attrs2.rs b/tests/ui/macros/macro-with-attrs2.rs
index 78c408102..78c408102 100644
--- a/src/test/ui/macros/macro-with-attrs2.rs
+++ b/tests/ui/macros/macro-with-attrs2.rs
diff --git a/src/test/ui/macros/macro-with-braces-in-expr-position.rs b/tests/ui/macros/macro-with-braces-in-expr-position.rs
index f7d87434d..f7d87434d 100644
--- a/src/test/ui/macros/macro-with-braces-in-expr-position.rs
+++ b/tests/ui/macros/macro-with-braces-in-expr-position.rs
diff --git a/src/test/ui/macros/macro_path_as_generic_bound.rs b/tests/ui/macros/macro_path_as_generic_bound.rs
index 663f85688..663f85688 100644
--- a/src/test/ui/macros/macro_path_as_generic_bound.rs
+++ b/tests/ui/macros/macro_path_as_generic_bound.rs
diff --git a/src/test/ui/macros/macro_path_as_generic_bound.stderr b/tests/ui/macros/macro_path_as_generic_bound.stderr
index 00d954d24..00d954d24 100644
--- a/src/test/ui/macros/macro_path_as_generic_bound.stderr
+++ b/tests/ui/macros/macro_path_as_generic_bound.stderr
diff --git a/src/test/ui/macros/macro_rules-unmatchable-literals.rs b/tests/ui/macros/macro_rules-unmatchable-literals.rs
index bde0fe1a0..bde0fe1a0 100644
--- a/src/test/ui/macros/macro_rules-unmatchable-literals.rs
+++ b/tests/ui/macros/macro_rules-unmatchable-literals.rs
diff --git a/src/test/ui/macros/macro_rules-unmatchable-literals.stderr b/tests/ui/macros/macro_rules-unmatchable-literals.stderr
index 956a66979..956a66979 100644
--- a/src/test/ui/macros/macro_rules-unmatchable-literals.stderr
+++ b/tests/ui/macros/macro_rules-unmatchable-literals.stderr
diff --git a/src/test/ui/macros/macro_undefined.rs b/tests/ui/macros/macro_undefined.rs
index 6ca1eb568..6ca1eb568 100644
--- a/src/test/ui/macros/macro_undefined.rs
+++ b/tests/ui/macros/macro_undefined.rs
diff --git a/src/test/ui/macros/macro_undefined.stderr b/tests/ui/macros/macro_undefined.stderr
index 4ab16bd10..4ab16bd10 100644
--- a/src/test/ui/macros/macro_undefined.stderr
+++ b/tests/ui/macros/macro_undefined.stderr
diff --git a/src/test/ui/macros/macro_with_super_2.rs b/tests/ui/macros/macro_with_super_2.rs
index 2901a74f6..2901a74f6 100644
--- a/src/test/ui/macros/macro_with_super_2.rs
+++ b/tests/ui/macros/macro_with_super_2.rs
diff --git a/src/test/ui/macros/macros-in-extern.rs b/tests/ui/macros/macros-in-extern.rs
index 568ae3a85..568ae3a85 100644
--- a/src/test/ui/macros/macros-in-extern.rs
+++ b/tests/ui/macros/macros-in-extern.rs
diff --git a/src/test/ui/macros/macros-nonfatal-errors.rs b/tests/ui/macros/macros-nonfatal-errors.rs
index ab14c3589..ab14c3589 100644
--- a/src/test/ui/macros/macros-nonfatal-errors.rs
+++ b/tests/ui/macros/macros-nonfatal-errors.rs
diff --git a/src/test/ui/macros/macros-nonfatal-errors.stderr b/tests/ui/macros/macros-nonfatal-errors.stderr
index d42f6c179..d42f6c179 100644
--- a/src/test/ui/macros/macros-nonfatal-errors.stderr
+++ b/tests/ui/macros/macros-nonfatal-errors.stderr
diff --git a/src/test/ui/macros/malformed_macro_lhs.rs b/tests/ui/macros/malformed_macro_lhs.rs
index f57d2fb4d..f57d2fb4d 100644
--- a/src/test/ui/macros/malformed_macro_lhs.rs
+++ b/tests/ui/macros/malformed_macro_lhs.rs
diff --git a/src/test/ui/macros/malformed_macro_lhs.stderr b/tests/ui/macros/malformed_macro_lhs.stderr
index adf64b089..adf64b089 100644
--- a/src/test/ui/macros/malformed_macro_lhs.stderr
+++ b/tests/ui/macros/malformed_macro_lhs.stderr
diff --git a/src/test/ui/macros/meta-item-absolute-path.rs b/tests/ui/macros/meta-item-absolute-path.rs
index 8ed911cbc..8ed911cbc 100644
--- a/src/test/ui/macros/meta-item-absolute-path.rs
+++ b/tests/ui/macros/meta-item-absolute-path.rs
diff --git a/src/test/ui/macros/meta-item-absolute-path.stderr b/tests/ui/macros/meta-item-absolute-path.stderr
index c53971e24..c53971e24 100644
--- a/src/test/ui/macros/meta-item-absolute-path.stderr
+++ b/tests/ui/macros/meta-item-absolute-path.stderr
diff --git a/src/test/ui/macros/meta-variable-depth-outside-repeat.rs b/tests/ui/macros/meta-variable-depth-outside-repeat.rs
index b7fb94785..b7fb94785 100644
--- a/src/test/ui/macros/meta-variable-depth-outside-repeat.rs
+++ b/tests/ui/macros/meta-variable-depth-outside-repeat.rs
diff --git a/src/test/ui/macros/meta-variable-depth-outside-repeat.stderr b/tests/ui/macros/meta-variable-depth-outside-repeat.stderr
index fad150cad..fad150cad 100644
--- a/src/test/ui/macros/meta-variable-depth-outside-repeat.stderr
+++ b/tests/ui/macros/meta-variable-depth-outside-repeat.stderr
diff --git a/src/test/ui/macros/meta-variable-misuse.rs b/tests/ui/macros/meta-variable-misuse.rs
index 99a2f9401..99a2f9401 100644
--- a/src/test/ui/macros/meta-variable-misuse.rs
+++ b/tests/ui/macros/meta-variable-misuse.rs
diff --git a/src/test/ui/macros/missing-bang-in-decl.fixed b/tests/ui/macros/missing-bang-in-decl.fixed
index b1aa3298b..b1aa3298b 100644
--- a/src/test/ui/macros/missing-bang-in-decl.fixed
+++ b/tests/ui/macros/missing-bang-in-decl.fixed
diff --git a/src/test/ui/macros/missing-bang-in-decl.rs b/tests/ui/macros/missing-bang-in-decl.rs
index 8393f15fc..8393f15fc 100644
--- a/src/test/ui/macros/missing-bang-in-decl.rs
+++ b/tests/ui/macros/missing-bang-in-decl.rs
diff --git a/src/test/ui/macros/missing-bang-in-decl.stderr b/tests/ui/macros/missing-bang-in-decl.stderr
index dfabafb0a..dfabafb0a 100644
--- a/src/test/ui/macros/missing-bang-in-decl.stderr
+++ b/tests/ui/macros/missing-bang-in-decl.stderr
diff --git a/src/test/ui/macros/missing-comma.rs b/tests/ui/macros/missing-comma.rs
index 92f8a7795..92f8a7795 100644
--- a/src/test/ui/macros/missing-comma.rs
+++ b/tests/ui/macros/missing-comma.rs
diff --git a/src/test/ui/macros/missing-comma.stderr b/tests/ui/macros/missing-comma.stderr
index 81877a29e..81877a29e 100644
--- a/src/test/ui/macros/missing-comma.stderr
+++ b/tests/ui/macros/missing-comma.stderr
diff --git a/src/test/ui/macros/must-use-in-macro-55516.rs b/tests/ui/macros/must-use-in-macro-55516.rs
index e7c346286..e7c346286 100644
--- a/src/test/ui/macros/must-use-in-macro-55516.rs
+++ b/tests/ui/macros/must-use-in-macro-55516.rs
diff --git a/src/test/ui/macros/must-use-in-macro-55516.stderr b/tests/ui/macros/must-use-in-macro-55516.stderr
index 8878b0eea..8878b0eea 100644
--- a/src/test/ui/macros/must-use-in-macro-55516.stderr
+++ b/tests/ui/macros/must-use-in-macro-55516.stderr
diff --git a/src/test/ui/macros/no-std-macros.rs b/tests/ui/macros/no-std-macros.rs
index ada643c7a..ada643c7a 100644
--- a/src/test/ui/macros/no-std-macros.rs
+++ b/tests/ui/macros/no-std-macros.rs
diff --git a/src/test/ui/macros/none-delim-lookahead.rs b/tests/ui/macros/none-delim-lookahead.rs
index bf4fddea1..bf4fddea1 100644
--- a/src/test/ui/macros/none-delim-lookahead.rs
+++ b/tests/ui/macros/none-delim-lookahead.rs
diff --git a/src/test/ui/macros/nonterminal-matching.rs b/tests/ui/macros/nonterminal-matching.rs
index 84fffe44d..84fffe44d 100644
--- a/src/test/ui/macros/nonterminal-matching.rs
+++ b/tests/ui/macros/nonterminal-matching.rs
diff --git a/src/test/ui/macros/nonterminal-matching.stderr b/tests/ui/macros/nonterminal-matching.stderr
index 5bbd54390..5bbd54390 100644
--- a/src/test/ui/macros/nonterminal-matching.stderr
+++ b/tests/ui/macros/nonterminal-matching.stderr
diff --git a/src/test/ui/macros/not-utf8.bin b/tests/ui/macros/not-utf8.bin
index 4148e5b88..4148e5b88 100644
--- a/src/test/ui/macros/not-utf8.bin
+++ b/tests/ui/macros/not-utf8.bin
diff --git a/src/test/ui/macros/not-utf8.rs b/tests/ui/macros/not-utf8.rs
index 1cb1fdcb8..1cb1fdcb8 100644
--- a/src/test/ui/macros/not-utf8.rs
+++ b/tests/ui/macros/not-utf8.rs
diff --git a/src/test/ui/macros/not-utf8.stderr b/tests/ui/macros/not-utf8.stderr
index 7e1f2dcad..7e1f2dcad 100644
--- a/src/test/ui/macros/not-utf8.stderr
+++ b/tests/ui/macros/not-utf8.stderr
diff --git a/src/test/ui/macros/out-of-order-shadowing.rs b/tests/ui/macros/out-of-order-shadowing.rs
index a0d1a9737..a0d1a9737 100644
--- a/src/test/ui/macros/out-of-order-shadowing.rs
+++ b/tests/ui/macros/out-of-order-shadowing.rs
diff --git a/src/test/ui/macros/out-of-order-shadowing.stderr b/tests/ui/macros/out-of-order-shadowing.stderr
index dedefac5c..dedefac5c 100644
--- a/src/test/ui/macros/out-of-order-shadowing.stderr
+++ b/tests/ui/macros/out-of-order-shadowing.stderr
diff --git a/src/test/ui/macros/parse-complex-macro-invoc-op.rs b/tests/ui/macros/parse-complex-macro-invoc-op.rs
index 8fef9b0ed..8fef9b0ed 100644
--- a/src/test/ui/macros/parse-complex-macro-invoc-op.rs
+++ b/tests/ui/macros/parse-complex-macro-invoc-op.rs
diff --git a/src/test/ui/macros/paths-in-macro-invocations.rs b/tests/ui/macros/paths-in-macro-invocations.rs
index 622818a92..622818a92 100644
--- a/src/test/ui/macros/paths-in-macro-invocations.rs
+++ b/tests/ui/macros/paths-in-macro-invocations.rs
diff --git a/src/test/ui/macros/proc_macro.rs b/tests/ui/macros/proc_macro.rs
index 66f9cdc55..66f9cdc55 100644
--- a/src/test/ui/macros/proc_macro.rs
+++ b/tests/ui/macros/proc_macro.rs
diff --git a/src/test/ui/macros/pub-item-inside-macro.rs b/tests/ui/macros/pub-item-inside-macro.rs
index d07681453..d07681453 100644
--- a/src/test/ui/macros/pub-item-inside-macro.rs
+++ b/tests/ui/macros/pub-item-inside-macro.rs
diff --git a/src/test/ui/macros/pub-method-inside-macro.rs b/tests/ui/macros/pub-method-inside-macro.rs
index bc918c7a4..bc918c7a4 100644
--- a/src/test/ui/macros/pub-method-inside-macro.rs
+++ b/tests/ui/macros/pub-method-inside-macro.rs
diff --git a/src/test/ui/macros/recovery-allowed.rs b/tests/ui/macros/recovery-allowed.rs
index ebf65f1cc..ebf65f1cc 100644
--- a/src/test/ui/macros/recovery-allowed.rs
+++ b/tests/ui/macros/recovery-allowed.rs
diff --git a/src/test/ui/macros/recovery-allowed.stderr b/tests/ui/macros/recovery-allowed.stderr
index ec036e8b1..ec036e8b1 100644
--- a/src/test/ui/macros/recovery-allowed.stderr
+++ b/tests/ui/macros/recovery-allowed.stderr
diff --git a/src/test/ui/macros/recovery-forbidden.rs b/tests/ui/macros/recovery-forbidden.rs
index 5dd261933..5dd261933 100644
--- a/src/test/ui/macros/recovery-forbidden.rs
+++ b/tests/ui/macros/recovery-forbidden.rs
diff --git a/src/test/ui/macros/restricted-shadowing-legacy.rs b/tests/ui/macros/restricted-shadowing-legacy.rs
index f5cac2dfb..f5cac2dfb 100644
--- a/src/test/ui/macros/restricted-shadowing-legacy.rs
+++ b/tests/ui/macros/restricted-shadowing-legacy.rs
diff --git a/src/test/ui/macros/restricted-shadowing-legacy.stderr b/tests/ui/macros/restricted-shadowing-legacy.stderr
index b8865112e..b8865112e 100644
--- a/src/test/ui/macros/restricted-shadowing-legacy.stderr
+++ b/tests/ui/macros/restricted-shadowing-legacy.stderr
diff --git a/src/test/ui/macros/restricted-shadowing-modern.rs b/tests/ui/macros/restricted-shadowing-modern.rs
index 1151a829e..1151a829e 100644
--- a/src/test/ui/macros/restricted-shadowing-modern.rs
+++ b/tests/ui/macros/restricted-shadowing-modern.rs
diff --git a/src/test/ui/macros/restricted-shadowing-modern.stderr b/tests/ui/macros/restricted-shadowing-modern.stderr
index 27665bfc3..27665bfc3 100644
--- a/src/test/ui/macros/restricted-shadowing-modern.stderr
+++ b/tests/ui/macros/restricted-shadowing-modern.stderr
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs
index b8b6f0846..b8b6f0846 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/all-not-available-cases.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/all-not-available-cases.rs
index d46f396ee..d46f396ee 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/all-not-available-cases.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/all-not-available-cases.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
index 6a1435f79..6a1435f79 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/assert-without-captures-does-not-create-unnecessary-code.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-without-captures-does-not-create-unnecessary-code.rs
index 1f5a29ab5..1f5a29ab5 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/assert-without-captures-does-not-create-unnecessary-code.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-without-captures-does-not-create-unnecessary-code.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/auxiliary/common.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/auxiliary/common.rs
index 903ed507c..903ed507c 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/auxiliary/common.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/auxiliary/common.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
index 01860adaa..01860adaa 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.rs
index 5ec84b08f..5ec84b08f 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.stdout b/tests/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.stdout
index 90f858f80..90f858f80 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.stdout
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.stdout
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/count-and-length-are-distinct.rs b/tests/ui/macros/rfc-3086-metavar-expr/count-and-length-are-distinct.rs
index ab8d95a41..ab8d95a41 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/count-and-length-are-distinct.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/count-and-length-are-distinct.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/dollar-dollar-has-correct-behavior.rs b/tests/ui/macros/rfc-3086-metavar-expr/dollar-dollar-has-correct-behavior.rs
index ed94c27cf..ed94c27cf 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/dollar-dollar-has-correct-behavior.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/dollar-dollar-has-correct-behavior.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/feature-gate-macro_metavar_expr.rs b/tests/ui/macros/rfc-3086-metavar-expr/feature-gate-macro_metavar_expr.rs
index d05cd1b31..d05cd1b31 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/feature-gate-macro_metavar_expr.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/feature-gate-macro_metavar_expr.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/macro-expansion.rs b/tests/ui/macros/rfc-3086-metavar-expr/macro-expansion.rs
index b954967c4..b954967c4 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/macro-expansion.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/macro-expansion.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.rs b/tests/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.rs
index 6a0d68bd6..6a0d68bd6 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.stderr b/tests/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.stderr
index 236122b64..236122b64 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.stderr
+++ b/tests/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.stderr
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/required-feature.rs b/tests/ui/macros/rfc-3086-metavar-expr/required-feature.rs
index b4fef11f1..b4fef11f1 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/required-feature.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/required-feature.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/required-feature.stderr b/tests/ui/macros/rfc-3086-metavar-expr/required-feature.stderr
index ecf598b10..ecf598b10 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/required-feature.stderr
+++ b/tests/ui/macros/rfc-3086-metavar-expr/required-feature.stderr
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/syntax-errors.rs b/tests/ui/macros/rfc-3086-metavar-expr/syntax-errors.rs
index fdf16442d..fdf16442d 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/syntax-errors.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/syntax-errors.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/syntax-errors.stderr b/tests/ui/macros/rfc-3086-metavar-expr/syntax-errors.stderr
index a6cff95fd..a6cff95fd 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/syntax-errors.stderr
+++ b/tests/ui/macros/rfc-3086-metavar-expr/syntax-errors.stderr
diff --git a/src/test/ui/macros/same-sequence-span.rs b/tests/ui/macros/same-sequence-span.rs
index e0bb4d985..e0bb4d985 100644
--- a/src/test/ui/macros/same-sequence-span.rs
+++ b/tests/ui/macros/same-sequence-span.rs
diff --git a/src/test/ui/macros/same-sequence-span.stderr b/tests/ui/macros/same-sequence-span.stderr
index bdd191e8e..bdd191e8e 100644
--- a/src/test/ui/macros/same-sequence-span.stderr
+++ b/tests/ui/macros/same-sequence-span.stderr
diff --git a/src/test/ui/macros/semi-after-macro-ty.rs b/tests/ui/macros/semi-after-macro-ty.rs
index f83ace8fa..f83ace8fa 100644
--- a/src/test/ui/macros/semi-after-macro-ty.rs
+++ b/tests/ui/macros/semi-after-macro-ty.rs
diff --git a/src/test/ui/macros/span-covering-argument-1.rs b/tests/ui/macros/span-covering-argument-1.rs
index 9b9506c80..9b9506c80 100644
--- a/src/test/ui/macros/span-covering-argument-1.rs
+++ b/tests/ui/macros/span-covering-argument-1.rs
diff --git a/src/test/ui/macros/span-covering-argument-1.stderr b/tests/ui/macros/span-covering-argument-1.stderr
index ce3424a8b..e57347b36 100644
--- a/src/test/ui/macros/span-covering-argument-1.stderr
+++ b/tests/ui/macros/span-covering-argument-1.stderr
@@ -1,8 +1,6 @@
 error[E0596]: cannot borrow `foo` as mutable, as it is not declared as mutable
   --> $DIR/span-covering-argument-1.rs:5:14
    |
-LL |             let $s = 0;
-   |                 -- help: consider changing this to be mutable: `mut foo`
 LL |             *&mut $s = 0;
    |              ^^^^^^^ cannot borrow as mutable
 ...
@@ -10,6 +8,10 @@ LL |     bad!(foo whatever);
    |     ------------------ in this macro invocation
    |
    = note: this error originates in the macro `bad` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider changing this to be mutable
+   |
+LL |             let mut $s = 0;
+   |                 +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/stmt_expr_attr_macro_parse.rs b/tests/ui/macros/stmt_expr_attr_macro_parse.rs
index 570191d2c..570191d2c 100644
--- a/src/test/ui/macros/stmt_expr_attr_macro_parse.rs
+++ b/tests/ui/macros/stmt_expr_attr_macro_parse.rs
diff --git a/src/test/ui/macros/stringify.rs b/tests/ui/macros/stringify.rs
index bc0d44881..5cd217df6 100644
--- a/src/test/ui/macros/stringify.rs
+++ b/tests/ui/macros/stringify.rs
@@ -801,7 +801,7 @@ fn test_ty() {
     assert_eq!(stringify_ty!(*const T), "*const T");
     assert_eq!(stringify_ty!(*mut T), "*mut T");
 
-    // TyKind::Rptr
+    // TyKind::Ref
     assert_eq!(stringify_ty!(&T), "&T");
     assert_eq!(stringify_ty!(&mut T), "&mut T");
     assert_eq!(stringify_ty!(&'a T), "&'a T");
diff --git a/src/test/ui/macros/syntax-error-recovery.rs b/tests/ui/macros/syntax-error-recovery.rs
index ae6de3c50..ae6de3c50 100644
--- a/src/test/ui/macros/syntax-error-recovery.rs
+++ b/tests/ui/macros/syntax-error-recovery.rs
diff --git a/src/test/ui/macros/syntax-error-recovery.stderr b/tests/ui/macros/syntax-error-recovery.stderr
index c42ee9b29..c42ee9b29 100644
--- a/src/test/ui/macros/syntax-error-recovery.stderr
+++ b/tests/ui/macros/syntax-error-recovery.stderr
diff --git a/src/test/ui/macros/syntax-extension-cfg.rs b/tests/ui/macros/syntax-extension-cfg.rs
index 2e929fc1d..2e929fc1d 100644
--- a/src/test/ui/macros/syntax-extension-cfg.rs
+++ b/tests/ui/macros/syntax-extension-cfg.rs
diff --git a/src/test/ui/macros/syntax-extension-source-utils-files/includeme.fragment b/tests/ui/macros/syntax-extension-source-utils-files/includeme.fragment
index d752015a4..d752015a4 100644
--- a/src/test/ui/macros/syntax-extension-source-utils-files/includeme.fragment
+++ b/tests/ui/macros/syntax-extension-source-utils-files/includeme.fragment
diff --git a/src/test/ui/macros/syntax-extension-source-utils.rs b/tests/ui/macros/syntax-extension-source-utils.rs
index 7e46260d5..7e46260d5 100644
--- a/src/test/ui/macros/syntax-extension-source-utils.rs
+++ b/tests/ui/macros/syntax-extension-source-utils.rs
diff --git a/src/test/ui/macros/trace-macro.rs b/tests/ui/macros/trace-macro.rs
index 576120811..576120811 100644
--- a/src/test/ui/macros/trace-macro.rs
+++ b/tests/ui/macros/trace-macro.rs
diff --git a/src/test/ui/macros/trace-macro.stderr b/tests/ui/macros/trace-macro.stderr
index 43272248c..43272248c 100644
--- a/src/test/ui/macros/trace-macro.stderr
+++ b/tests/ui/macros/trace-macro.stderr
diff --git a/src/test/ui/macros/trace_faulty_macros.rs b/tests/ui/macros/trace_faulty_macros.rs
index b2fdd2e19..b2fdd2e19 100644
--- a/src/test/ui/macros/trace_faulty_macros.rs
+++ b/tests/ui/macros/trace_faulty_macros.rs
diff --git a/src/test/ui/macros/trace_faulty_macros.stderr b/tests/ui/macros/trace_faulty_macros.stderr
index 21e47da07..21e47da07 100644
--- a/src/test/ui/macros/trace_faulty_macros.stderr
+++ b/tests/ui/macros/trace_faulty_macros.stderr
diff --git a/src/test/ui/macros/trace_macros-format.rs b/tests/ui/macros/trace_macros-format.rs
index afca45ca0..afca45ca0 100644
--- a/src/test/ui/macros/trace_macros-format.rs
+++ b/tests/ui/macros/trace_macros-format.rs
diff --git a/src/test/ui/macros/trace_macros-format.stderr b/tests/ui/macros/trace_macros-format.stderr
index c32027086..c32027086 100644
--- a/src/test/ui/macros/trace_macros-format.stderr
+++ b/tests/ui/macros/trace_macros-format.stderr
diff --git a/src/test/ui/macros/try-macro.rs b/tests/ui/macros/try-macro.rs
index 824c77d9d..824c77d9d 100644
--- a/src/test/ui/macros/try-macro.rs
+++ b/tests/ui/macros/try-macro.rs
diff --git a/src/test/ui/macros/two-macro-use.rs b/tests/ui/macros/two-macro-use.rs
index 07022bb01..07022bb01 100644
--- a/src/test/ui/macros/two-macro-use.rs
+++ b/tests/ui/macros/two-macro-use.rs
diff --git a/src/test/ui/macros/type-macros-hlist.rs b/tests/ui/macros/type-macros-hlist.rs
index 946b5bd5d..946b5bd5d 100644
--- a/src/test/ui/macros/type-macros-hlist.rs
+++ b/tests/ui/macros/type-macros-hlist.rs
diff --git a/src/test/ui/macros/type-macros-simple.rs b/tests/ui/macros/type-macros-simple.rs
index dd3ad2ef0..dd3ad2ef0 100644
--- a/src/test/ui/macros/type-macros-simple.rs
+++ b/tests/ui/macros/type-macros-simple.rs
diff --git a/src/test/ui/macros/typeck-macro-interaction-issue-8852.rs b/tests/ui/macros/typeck-macro-interaction-issue-8852.rs
index f2b089b74..f2b089b74 100644
--- a/src/test/ui/macros/typeck-macro-interaction-issue-8852.rs
+++ b/tests/ui/macros/typeck-macro-interaction-issue-8852.rs
diff --git a/src/test/ui/macros/unimplemented-macro-panic.rs b/tests/ui/macros/unimplemented-macro-panic.rs
index e7169903f..e7169903f 100644
--- a/src/test/ui/macros/unimplemented-macro-panic.rs
+++ b/tests/ui/macros/unimplemented-macro-panic.rs
diff --git a/src/test/ui/macros/unknown-builtin.rs b/tests/ui/macros/unknown-builtin.rs
index 16f9139e6..16f9139e6 100644
--- a/src/test/ui/macros/unknown-builtin.rs
+++ b/tests/ui/macros/unknown-builtin.rs
diff --git a/src/test/ui/macros/unknown-builtin.stderr b/tests/ui/macros/unknown-builtin.stderr
index 8f9dba165..22f54e04e 100644
--- a/src/test/ui/macros/unknown-builtin.stderr
+++ b/tests/ui/macros/unknown-builtin.stderr
@@ -7,9 +7,6 @@ LL | macro_rules! unknown { () => () }
 error[E0773]: attempted to define built-in macro more than once
   --> $SRC_DIR/core/src/macros/mod.rs:LL:COL
    |
-LL |     macro_rules! line {
-   |     ^^^^^^^^^^^^^^^^^
-   |
 note: previously defined here
   --> $DIR/unknown-builtin.rs:9:1
    |
diff --git a/src/test/ui/macros/unreachable-arg.edition_2021.stderr b/tests/ui/macros/unreachable-arg.edition_2021.stderr
index d70ef31ee..d70ef31ee 100644
--- a/src/test/ui/macros/unreachable-arg.edition_2021.stderr
+++ b/tests/ui/macros/unreachable-arg.edition_2021.stderr
diff --git a/src/test/ui/macros/unreachable-arg.rs b/tests/ui/macros/unreachable-arg.rs
index 4024bd20b..4024bd20b 100644
--- a/src/test/ui/macros/unreachable-arg.rs
+++ b/tests/ui/macros/unreachable-arg.rs
diff --git a/src/test/ui/macros/unreachable-fmt-msg.rs b/tests/ui/macros/unreachable-fmt-msg.rs
index eb17ed927..eb17ed927 100644
--- a/src/test/ui/macros/unreachable-fmt-msg.rs
+++ b/tests/ui/macros/unreachable-fmt-msg.rs
diff --git a/src/test/ui/macros/unreachable-format-arg.rs b/tests/ui/macros/unreachable-format-arg.rs
index ff059ad9e..ff059ad9e 100644
--- a/src/test/ui/macros/unreachable-format-arg.rs
+++ b/tests/ui/macros/unreachable-format-arg.rs
diff --git a/src/test/ui/macros/unreachable-format-args.edition_2015.stderr b/tests/ui/macros/unreachable-format-args.edition_2015.stderr
index 2cc2e134b..2cc2e134b 100644
--- a/src/test/ui/macros/unreachable-format-args.edition_2015.stderr
+++ b/tests/ui/macros/unreachable-format-args.edition_2015.stderr
diff --git a/src/test/ui/macros/unreachable-format-args.rs b/tests/ui/macros/unreachable-format-args.rs
index 04a31fc1b..04a31fc1b 100644
--- a/src/test/ui/macros/unreachable-format-args.rs
+++ b/tests/ui/macros/unreachable-format-args.rs
diff --git a/src/test/ui/macros/unreachable-macro-panic.rs b/tests/ui/macros/unreachable-macro-panic.rs
index 55e2102e2..55e2102e2 100644
--- a/src/test/ui/macros/unreachable-macro-panic.rs
+++ b/tests/ui/macros/unreachable-macro-panic.rs
diff --git a/src/test/ui/macros/unreachable-static-msg.rs b/tests/ui/macros/unreachable-static-msg.rs
index 55edf3af7..55edf3af7 100644
--- a/src/test/ui/macros/unreachable-static-msg.rs
+++ b/tests/ui/macros/unreachable-static-msg.rs
diff --git a/src/test/ui/macros/unreachable.rs b/tests/ui/macros/unreachable.rs
index 55e2102e2..55e2102e2 100644
--- a/src/test/ui/macros/unreachable.rs
+++ b/tests/ui/macros/unreachable.rs
diff --git a/src/test/ui/macros/use-macro-self.rs b/tests/ui/macros/use-macro-self.rs
index 06464ab0b..06464ab0b 100644
--- a/src/test/ui/macros/use-macro-self.rs
+++ b/tests/ui/macros/use-macro-self.rs
diff --git a/src/test/ui/macros/vec-macro-in-pattern.rs b/tests/ui/macros/vec-macro-in-pattern.rs
index ce4298b8b..ce4298b8b 100644
--- a/src/test/ui/macros/vec-macro-in-pattern.rs
+++ b/tests/ui/macros/vec-macro-in-pattern.rs
diff --git a/src/test/ui/macros/vec-macro-in-pattern.stderr b/tests/ui/macros/vec-macro-in-pattern.stderr
index 7060f5d8b..7060f5d8b 100644
--- a/src/test/ui/macros/vec-macro-in-pattern.stderr
+++ b/tests/ui/macros/vec-macro-in-pattern.stderr
diff --git a/src/test/ui/main-wrong-location.rs b/tests/ui/main-wrong-location.rs
index d7deeaed9..d7deeaed9 100644
--- a/src/test/ui/main-wrong-location.rs
+++ b/tests/ui/main-wrong-location.rs
diff --git a/src/test/ui/main-wrong-location.stderr b/tests/ui/main-wrong-location.stderr
index 3d64b0a67..3d64b0a67 100644
--- a/src/test/ui/main-wrong-location.stderr
+++ b/tests/ui/main-wrong-location.stderr
diff --git a/src/test/ui/main-wrong-type.rs b/tests/ui/main-wrong-type.rs
index 31deba72a..31deba72a 100644
--- a/src/test/ui/main-wrong-type.rs
+++ b/tests/ui/main-wrong-type.rs
diff --git a/src/test/ui/main-wrong-type.stderr b/tests/ui/main-wrong-type.stderr
index 43efaf884..43efaf884 100644
--- a/src/test/ui/main-wrong-type.stderr
+++ b/tests/ui/main-wrong-type.stderr
diff --git a/src/test/ui/malformed/issue-69341-malformed-derive-inert.rs b/tests/ui/malformed/issue-69341-malformed-derive-inert.rs
index fc4c3f4e6..fc4c3f4e6 100644
--- a/src/test/ui/malformed/issue-69341-malformed-derive-inert.rs
+++ b/tests/ui/malformed/issue-69341-malformed-derive-inert.rs
diff --git a/src/test/ui/malformed/issue-69341-malformed-derive-inert.stderr b/tests/ui/malformed/issue-69341-malformed-derive-inert.stderr
index 04f7ebe01..04f7ebe01 100644
--- a/src/test/ui/malformed/issue-69341-malformed-derive-inert.stderr
+++ b/tests/ui/malformed/issue-69341-malformed-derive-inert.stderr
diff --git a/src/test/ui/malformed/malformed-derive-entry.rs b/tests/ui/malformed/malformed-derive-entry.rs
index 77fa2f566..77fa2f566 100644
--- a/src/test/ui/malformed/malformed-derive-entry.rs
+++ b/tests/ui/malformed/malformed-derive-entry.rs
diff --git a/src/test/ui/malformed/malformed-derive-entry.stderr b/tests/ui/malformed/malformed-derive-entry.stderr
index 803883460..6ff6fbabb 100644
--- a/src/test/ui/malformed/malformed-derive-entry.stderr
+++ b/tests/ui/malformed/malformed-derive-entry.stderr
@@ -24,9 +24,6 @@ LL | #[derive(Copy(Bad))]
    |
 note: required by a bound in `Copy`
   --> $SRC_DIR/core/src/marker.rs:LL:COL
-   |
-LL | pub trait Copy: Clone {
-   |                 ^^^^^ required by this bound in `Copy`
    = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `Test1` with `#[derive(Clone)]`
    |
@@ -41,9 +38,6 @@ LL | #[derive(Copy="bad")]
    |
 note: required by a bound in `Copy`
   --> $SRC_DIR/core/src/marker.rs:LL:COL
-   |
-LL | pub trait Copy: Clone {
-   |                 ^^^^^ required by this bound in `Copy`
    = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `Test2` with `#[derive(Clone)]`
    |
diff --git a/src/test/ui/malformed/malformed-interpolated.rs b/tests/ui/malformed/malformed-interpolated.rs
index 0d84e723f..0d84e723f 100644
--- a/src/test/ui/malformed/malformed-interpolated.rs
+++ b/tests/ui/malformed/malformed-interpolated.rs
diff --git a/src/test/ui/malformed/malformed-interpolated.stderr b/tests/ui/malformed/malformed-interpolated.stderr
index c24d9f153..c24d9f153 100644
--- a/src/test/ui/malformed/malformed-interpolated.stderr
+++ b/tests/ui/malformed/malformed-interpolated.stderr
diff --git a/src/test/ui/malformed/malformed-meta-delim.rs b/tests/ui/malformed/malformed-meta-delim.rs
index 5b1614b69..5b1614b69 100644
--- a/src/test/ui/malformed/malformed-meta-delim.rs
+++ b/tests/ui/malformed/malformed-meta-delim.rs
diff --git a/src/test/ui/malformed/malformed-meta-delim.stderr b/tests/ui/malformed/malformed-meta-delim.stderr
index 27636c3d5..27636c3d5 100644
--- a/src/test/ui/malformed/malformed-meta-delim.stderr
+++ b/tests/ui/malformed/malformed-meta-delim.stderr
diff --git a/src/test/ui/malformed/malformed-plugin-1.rs b/tests/ui/malformed/malformed-plugin-1.rs
index d4c1a2a16..d4c1a2a16 100644
--- a/src/test/ui/malformed/malformed-plugin-1.rs
+++ b/tests/ui/malformed/malformed-plugin-1.rs
diff --git a/src/test/ui/malformed/malformed-plugin-1.stderr b/tests/ui/malformed/malformed-plugin-1.stderr
index 505f6b6f1..505f6b6f1 100644
--- a/src/test/ui/malformed/malformed-plugin-1.stderr
+++ b/tests/ui/malformed/malformed-plugin-1.stderr
diff --git a/src/test/ui/malformed/malformed-plugin-2.rs b/tests/ui/malformed/malformed-plugin-2.rs
index ba80d97a3..ba80d97a3 100644
--- a/src/test/ui/malformed/malformed-plugin-2.rs
+++ b/tests/ui/malformed/malformed-plugin-2.rs
diff --git a/src/test/ui/malformed/malformed-plugin-2.stderr b/tests/ui/malformed/malformed-plugin-2.stderr
index 52bbd82a3..52bbd82a3 100644
--- a/src/test/ui/malformed/malformed-plugin-2.stderr
+++ b/tests/ui/malformed/malformed-plugin-2.stderr
diff --git a/src/test/ui/malformed/malformed-plugin-3.rs b/tests/ui/malformed/malformed-plugin-3.rs
index d2bd8f9f8..d2bd8f9f8 100644
--- a/src/test/ui/malformed/malformed-plugin-3.rs
+++ b/tests/ui/malformed/malformed-plugin-3.rs
diff --git a/src/test/ui/malformed/malformed-plugin-3.stderr b/tests/ui/malformed/malformed-plugin-3.stderr
index 64cb429ea..64cb429ea 100644
--- a/src/test/ui/malformed/malformed-plugin-3.stderr
+++ b/tests/ui/malformed/malformed-plugin-3.stderr
diff --git a/src/test/ui/malformed/malformed-regressions.rs b/tests/ui/malformed/malformed-regressions.rs
index ac1444bba..ac1444bba 100644
--- a/src/test/ui/malformed/malformed-regressions.rs
+++ b/tests/ui/malformed/malformed-regressions.rs
diff --git a/src/test/ui/malformed/malformed-regressions.stderr b/tests/ui/malformed/malformed-regressions.stderr
index 9bfbe7eba..9bfbe7eba 100644
--- a/src/test/ui/malformed/malformed-regressions.stderr
+++ b/tests/ui/malformed/malformed-regressions.stderr
diff --git a/src/test/ui/malformed/malformed-special-attrs.rs b/tests/ui/malformed/malformed-special-attrs.rs
index 05b7ebe46..05b7ebe46 100644
--- a/src/test/ui/malformed/malformed-special-attrs.rs
+++ b/tests/ui/malformed/malformed-special-attrs.rs
diff --git a/src/test/ui/malformed/malformed-special-attrs.stderr b/tests/ui/malformed/malformed-special-attrs.stderr
index 1764c3969..1764c3969 100644
--- a/src/test/ui/malformed/malformed-special-attrs.stderr
+++ b/tests/ui/malformed/malformed-special-attrs.stderr
diff --git a/src/test/ui/manual/manual-link-bad-form.rs b/tests/ui/manual/manual-link-bad-form.rs
index bc9b6be02..bc9b6be02 100644
--- a/src/test/ui/manual/manual-link-bad-form.rs
+++ b/tests/ui/manual/manual-link-bad-form.rs
diff --git a/src/test/ui/manual/manual-link-bad-form.stderr b/tests/ui/manual/manual-link-bad-form.stderr
index 7fd7a1066..7fd7a1066 100644
--- a/src/test/ui/manual/manual-link-bad-form.stderr
+++ b/tests/ui/manual/manual-link-bad-form.stderr
diff --git a/src/test/ui/manual/manual-link-bad-kind.rs b/tests/ui/manual/manual-link-bad-kind.rs
index c50a6c034..c50a6c034 100644
--- a/src/test/ui/manual/manual-link-bad-kind.rs
+++ b/tests/ui/manual/manual-link-bad-kind.rs
diff --git a/src/test/ui/manual/manual-link-bad-kind.stderr b/tests/ui/manual/manual-link-bad-kind.stderr
index 647c4c61e..647c4c61e 100644
--- a/src/test/ui/manual/manual-link-bad-kind.stderr
+++ b/tests/ui/manual/manual-link-bad-kind.stderr
diff --git a/src/test/ui/manual/manual-link-bad-search-path.rs b/tests/ui/manual/manual-link-bad-search-path.rs
index 0fe23b02a..0fe23b02a 100644
--- a/src/test/ui/manual/manual-link-bad-search-path.rs
+++ b/tests/ui/manual/manual-link-bad-search-path.rs
diff --git a/src/test/ui/manual/manual-link-bad-search-path.stderr b/tests/ui/manual/manual-link-bad-search-path.stderr
index 2c0649ea1..2c0649ea1 100644
--- a/src/test/ui/manual/manual-link-bad-search-path.stderr
+++ b/tests/ui/manual/manual-link-bad-search-path.stderr
diff --git a/src/test/ui/manual/manual-link-framework.rs b/tests/ui/manual/manual-link-framework.rs
index 57c5966e9..57c5966e9 100644
--- a/src/test/ui/manual/manual-link-framework.rs
+++ b/tests/ui/manual/manual-link-framework.rs
diff --git a/src/test/ui/manual/manual-link-framework.stderr b/tests/ui/manual/manual-link-framework.stderr
index de045d56c..de045d56c 100644
--- a/src/test/ui/manual/manual-link-framework.stderr
+++ b/tests/ui/manual/manual-link-framework.stderr
diff --git a/src/test/ui/manual/manual-link-unsupported-kind.rs b/tests/ui/manual/manual-link-unsupported-kind.rs
index b8ec575a4..b8ec575a4 100644
--- a/src/test/ui/manual/manual-link-unsupported-kind.rs
+++ b/tests/ui/manual/manual-link-unsupported-kind.rs
diff --git a/src/test/ui/manual/manual-link-unsupported-kind.stderr b/tests/ui/manual/manual-link-unsupported-kind.stderr
index ae4a1ec9a..ae4a1ec9a 100644
--- a/src/test/ui/manual/manual-link-unsupported-kind.stderr
+++ b/tests/ui/manual/manual-link-unsupported-kind.stderr
diff --git a/src/test/ui/marker_trait_attr/issue-61651-type-mismatch.rs b/tests/ui/marker_trait_attr/issue-61651-type-mismatch.rs
index 0af706615..0af706615 100644
--- a/src/test/ui/marker_trait_attr/issue-61651-type-mismatch.rs
+++ b/tests/ui/marker_trait_attr/issue-61651-type-mismatch.rs
diff --git a/src/test/ui/marker_trait_attr/marker-attribute-on-non-trait.rs b/tests/ui/marker_trait_attr/marker-attribute-on-non-trait.rs
index 0bf620934..0bf620934 100644
--- a/src/test/ui/marker_trait_attr/marker-attribute-on-non-trait.rs
+++ b/tests/ui/marker_trait_attr/marker-attribute-on-non-trait.rs
diff --git a/src/test/ui/marker_trait_attr/marker-attribute-on-non-trait.stderr b/tests/ui/marker_trait_attr/marker-attribute-on-non-trait.stderr
index 19a5290dd..19a5290dd 100644
--- a/src/test/ui/marker_trait_attr/marker-attribute-on-non-trait.stderr
+++ b/tests/ui/marker_trait_attr/marker-attribute-on-non-trait.stderr
diff --git a/src/test/ui/marker_trait_attr/marker-attribute-with-values.rs b/tests/ui/marker_trait_attr/marker-attribute-with-values.rs
index 9e07f0eae..9e07f0eae 100644
--- a/src/test/ui/marker_trait_attr/marker-attribute-with-values.rs
+++ b/tests/ui/marker_trait_attr/marker-attribute-with-values.rs
diff --git a/src/test/ui/marker_trait_attr/marker-attribute-with-values.stderr b/tests/ui/marker_trait_attr/marker-attribute-with-values.stderr
index 6f9c9508e..6f9c9508e 100644
--- a/src/test/ui/marker_trait_attr/marker-attribute-with-values.stderr
+++ b/tests/ui/marker_trait_attr/marker-attribute-with-values.stderr
diff --git a/src/test/ui/marker_trait_attr/marker-trait-with-associated-items.rs b/tests/ui/marker_trait_attr/marker-trait-with-associated-items.rs
index a6e00ecc9..a6e00ecc9 100644
--- a/src/test/ui/marker_trait_attr/marker-trait-with-associated-items.rs
+++ b/tests/ui/marker_trait_attr/marker-trait-with-associated-items.rs
diff --git a/src/test/ui/marker_trait_attr/marker-trait-with-associated-items.stderr b/tests/ui/marker_trait_attr/marker-trait-with-associated-items.stderr
index ac218e30b..ac218e30b 100644
--- a/src/test/ui/marker_trait_attr/marker-trait-with-associated-items.stderr
+++ b/tests/ui/marker_trait_attr/marker-trait-with-associated-items.stderr
diff --git a/src/test/ui/marker_trait_attr/overlap-doesnt-conflict-with-specialization.rs b/tests/ui/marker_trait_attr/overlap-doesnt-conflict-with-specialization.rs
index 1e413120a..1e413120a 100644
--- a/src/test/ui/marker_trait_attr/overlap-doesnt-conflict-with-specialization.rs
+++ b/tests/ui/marker_trait_attr/overlap-doesnt-conflict-with-specialization.rs
diff --git a/src/test/ui/marker_trait_attr/overlap-doesnt-conflict-with-specialization.stderr b/tests/ui/marker_trait_attr/overlap-doesnt-conflict-with-specialization.stderr
index 649e58915..649e58915 100644
--- a/src/test/ui/marker_trait_attr/overlap-doesnt-conflict-with-specialization.stderr
+++ b/tests/ui/marker_trait_attr/overlap-doesnt-conflict-with-specialization.stderr
diff --git a/src/test/ui/marker_trait_attr/overlap-marker-trait-with-static-lifetime.rs b/tests/ui/marker_trait_attr/overlap-marker-trait-with-static-lifetime.rs
index 62aa22d41..62aa22d41 100644
--- a/src/test/ui/marker_trait_attr/overlap-marker-trait-with-static-lifetime.rs
+++ b/tests/ui/marker_trait_attr/overlap-marker-trait-with-static-lifetime.rs
diff --git a/src/test/ui/marker_trait_attr/overlap-marker-trait-with-underscore-lifetime.rs b/tests/ui/marker_trait_attr/overlap-marker-trait-with-underscore-lifetime.rs
index eabce1aef..eabce1aef 100644
--- a/src/test/ui/marker_trait_attr/overlap-marker-trait-with-underscore-lifetime.rs
+++ b/tests/ui/marker_trait_attr/overlap-marker-trait-with-underscore-lifetime.rs
diff --git a/src/test/ui/marker_trait_attr/overlap-marker-trait-with-underscore-lifetime.stderr b/tests/ui/marker_trait_attr/overlap-marker-trait-with-underscore-lifetime.stderr
index 235c89e20..3cd59d692 100644
--- a/src/test/ui/marker_trait_attr/overlap-marker-trait-with-underscore-lifetime.stderr
+++ b/tests/ui/marker_trait_attr/overlap-marker-trait-with-underscore-lifetime.stderr
@@ -1,8 +1,8 @@
 error[E0283]: type annotations needed: cannot satisfy `&(): Marker`
-  --> $DIR/overlap-marker-trait-with-underscore-lifetime.rs:6:6
+  --> $DIR/overlap-marker-trait-with-underscore-lifetime.rs:6:17
    |
 LL | impl Marker for &'_ () {}
-   |      ^^^^^^
+   |                 ^^^^^^
    |
 note: multiple `impl`s satisfying `&(): Marker` found
   --> $DIR/overlap-marker-trait-with-underscore-lifetime.rs:6:1
@@ -13,10 +13,10 @@ LL | impl Marker for &'_ () {}
    | ^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0283]: type annotations needed: cannot satisfy `&(): Marker`
-  --> $DIR/overlap-marker-trait-with-underscore-lifetime.rs:7:6
+  --> $DIR/overlap-marker-trait-with-underscore-lifetime.rs:7:17
    |
 LL | impl Marker for &'_ () {}
-   |      ^^^^^^
+   |                 ^^^^^^
    |
 note: multiple `impl`s satisfying `&(): Marker` found
   --> $DIR/overlap-marker-trait-with-underscore-lifetime.rs:6:1
diff --git a/src/test/ui/marker_trait_attr/overlap-marker-trait.rs b/tests/ui/marker_trait_attr/overlap-marker-trait.rs
index 67e551797..67e551797 100644
--- a/src/test/ui/marker_trait_attr/overlap-marker-trait.rs
+++ b/tests/ui/marker_trait_attr/overlap-marker-trait.rs
diff --git a/src/test/ui/marker_trait_attr/overlap-marker-trait.stderr b/tests/ui/marker_trait_attr/overlap-marker-trait.stderr
index 133bc0484..133bc0484 100644
--- a/src/test/ui/marker_trait_attr/overlap-marker-trait.stderr
+++ b/tests/ui/marker_trait_attr/overlap-marker-trait.stderr
diff --git a/src/test/ui/marker_trait_attr/overlap-permitted-for-annotated-marker-traits.rs b/tests/ui/marker_trait_attr/overlap-permitted-for-annotated-marker-traits.rs
index f7654458f..f7654458f 100644
--- a/src/test/ui/marker_trait_attr/overlap-permitted-for-annotated-marker-traits.rs
+++ b/tests/ui/marker_trait_attr/overlap-permitted-for-annotated-marker-traits.rs
diff --git a/src/test/ui/marker_trait_attr/overlapping-impl-1-modulo-regions.rs b/tests/ui/marker_trait_attr/overlapping-impl-1-modulo-regions.rs
index a8f3db5f5..a8f3db5f5 100644
--- a/src/test/ui/marker_trait_attr/overlapping-impl-1-modulo-regions.rs
+++ b/tests/ui/marker_trait_attr/overlapping-impl-1-modulo-regions.rs
diff --git a/src/test/ui/marker_trait_attr/override-item-on-marker-trait.rs b/tests/ui/marker_trait_attr/override-item-on-marker-trait.rs
index 5376fc89d..5376fc89d 100644
--- a/src/test/ui/marker_trait_attr/override-item-on-marker-trait.rs
+++ b/tests/ui/marker_trait_attr/override-item-on-marker-trait.rs
diff --git a/src/test/ui/marker_trait_attr/override-item-on-marker-trait.stderr b/tests/ui/marker_trait_attr/override-item-on-marker-trait.stderr
index 1d30c6d56..1d30c6d56 100644
--- a/src/test/ui/marker_trait_attr/override-item-on-marker-trait.stderr
+++ b/tests/ui/marker_trait_attr/override-item-on-marker-trait.stderr
diff --git a/src/test/ui/marker_trait_attr/region-overlap.rs b/tests/ui/marker_trait_attr/region-overlap.rs
index b3c667103..b3c667103 100644
--- a/src/test/ui/marker_trait_attr/region-overlap.rs
+++ b/tests/ui/marker_trait_attr/region-overlap.rs
diff --git a/src/test/ui/marker_trait_attr/region-overlap.stderr b/tests/ui/marker_trait_attr/region-overlap.stderr
index 6631fe987..c6497b466 100644
--- a/src/test/ui/marker_trait_attr/region-overlap.stderr
+++ b/tests/ui/marker_trait_attr/region-overlap.stderr
@@ -1,8 +1,8 @@
 error[E0283]: type annotations needed: cannot satisfy `(&'static (), &'a ()): A`
-  --> $DIR/region-overlap.rs:5:10
+  --> $DIR/region-overlap.rs:5:16
    |
 LL | impl<'a> A for (&'static (), &'a ()) {}
-   |          ^
+   |                ^^^^^^^^^^^^^^^^^^^^^
    |
 note: multiple `impl`s satisfying `(&'static (), &'a ()): A` found
   --> $DIR/region-overlap.rs:5:1
@@ -13,10 +13,10 @@ LL | impl<'a> A for (&'a (), &'static ()) {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0283]: type annotations needed: cannot satisfy `(&'a (), &'static ()): A`
-  --> $DIR/region-overlap.rs:6:10
+  --> $DIR/region-overlap.rs:6:16
    |
 LL | impl<'a> A for (&'a (), &'static ()) {}
-   |          ^
+   |                ^^^^^^^^^^^^^^^^^^^^^
    |
 note: multiple `impl`s satisfying `(&'a (), &'static ()): A` found
   --> $DIR/region-overlap.rs:5:1
diff --git a/src/test/ui/marker_trait_attr/unsound-overlap.rs b/tests/ui/marker_trait_attr/unsound-overlap.rs
index 2e5101b82..2e5101b82 100644
--- a/src/test/ui/marker_trait_attr/unsound-overlap.rs
+++ b/tests/ui/marker_trait_attr/unsound-overlap.rs
diff --git a/src/test/ui/marker_trait_attr/unsound-overlap.stderr b/tests/ui/marker_trait_attr/unsound-overlap.stderr
index 5ebac8270..5ebac8270 100644
--- a/src/test/ui/marker_trait_attr/unsound-overlap.stderr
+++ b/tests/ui/marker_trait_attr/unsound-overlap.stderr
diff --git a/src/test/ui/match/auxiliary/match_non_exhaustive_lib.rs b/tests/ui/match/auxiliary/match_non_exhaustive_lib.rs
index 3be72551e..3be72551e 100644
--- a/src/test/ui/match/auxiliary/match_non_exhaustive_lib.rs
+++ b/tests/ui/match/auxiliary/match_non_exhaustive_lib.rs
diff --git a/src/test/ui/match/const_non_normal_zst_ref_pattern.rs b/tests/ui/match/const_non_normal_zst_ref_pattern.rs
index a114fafb6..a114fafb6 100644
--- a/src/test/ui/match/const_non_normal_zst_ref_pattern.rs
+++ b/tests/ui/match/const_non_normal_zst_ref_pattern.rs
diff --git a/src/test/ui/match/expr-match-panic-fn.rs b/tests/ui/match/expr-match-panic-fn.rs
index ea471717e..ea471717e 100644
--- a/src/test/ui/match/expr-match-panic-fn.rs
+++ b/tests/ui/match/expr-match-panic-fn.rs
diff --git a/src/test/ui/match/expr-match-panic.rs b/tests/ui/match/expr-match-panic.rs
index 53f8a8bd3..53f8a8bd3 100644
--- a/src/test/ui/match/expr-match-panic.rs
+++ b/tests/ui/match/expr-match-panic.rs
diff --git a/src/test/ui/match/expr_before_ident_pat.rs b/tests/ui/match/expr_before_ident_pat.rs
index 27ef3d05a..27ef3d05a 100644
--- a/src/test/ui/match/expr_before_ident_pat.rs
+++ b/tests/ui/match/expr_before_ident_pat.rs
diff --git a/src/test/ui/match/expr_before_ident_pat.stderr b/tests/ui/match/expr_before_ident_pat.stderr
index 57a2d2b26..57a2d2b26 100644
--- a/src/test/ui/match/expr_before_ident_pat.stderr
+++ b/tests/ui/match/expr_before_ident_pat.stderr
diff --git a/src/test/ui/match/guards.rs b/tests/ui/match/guards.rs
index 10a4bb673..10a4bb673 100644
--- a/src/test/ui/match/guards.rs
+++ b/tests/ui/match/guards.rs
diff --git a/src/test/ui/match/issue-11319.rs b/tests/ui/match/issue-11319.rs
index ab69ab250..ab69ab250 100644
--- a/src/test/ui/match/issue-11319.rs
+++ b/tests/ui/match/issue-11319.rs
diff --git a/src/test/ui/match/issue-11319.stderr b/tests/ui/match/issue-11319.stderr
index fc44205e8..fc44205e8 100644
--- a/src/test/ui/match/issue-11319.stderr
+++ b/tests/ui/match/issue-11319.stderr
diff --git a/src/test/ui/match/issue-11940.rs b/tests/ui/match/issue-11940.rs
index 6815c87ed..6815c87ed 100644
--- a/src/test/ui/match/issue-11940.rs
+++ b/tests/ui/match/issue-11940.rs
diff --git a/src/test/ui/match/issue-12552.rs b/tests/ui/match/issue-12552.rs
index b7f71dd1c..b7f71dd1c 100644
--- a/src/test/ui/match/issue-12552.rs
+++ b/tests/ui/match/issue-12552.rs
diff --git a/src/test/ui/match/issue-12552.stderr b/tests/ui/match/issue-12552.stderr
index 4b027eba2..4b027eba2 100644
--- a/src/test/ui/match/issue-12552.stderr
+++ b/tests/ui/match/issue-12552.stderr
diff --git a/src/test/ui/match/issue-18060.rs b/tests/ui/match/issue-18060.rs
index b5f3d0f74..b5f3d0f74 100644
--- a/src/test/ui/match/issue-18060.rs
+++ b/tests/ui/match/issue-18060.rs
diff --git a/src/test/ui/match/issue-26251.rs b/tests/ui/match/issue-26251.rs
index a3e26a412..a3e26a412 100644
--- a/src/test/ui/match/issue-26251.rs
+++ b/tests/ui/match/issue-26251.rs
diff --git a/src/test/ui/match/issue-26996.rs b/tests/ui/match/issue-26996.rs
index 84037b72a..84037b72a 100644
--- a/src/test/ui/match/issue-26996.rs
+++ b/tests/ui/match/issue-26996.rs
diff --git a/src/test/ui/match/issue-27021.rs b/tests/ui/match/issue-27021.rs
index ef3b114a5..ef3b114a5 100644
--- a/src/test/ui/match/issue-27021.rs
+++ b/tests/ui/match/issue-27021.rs
diff --git a/src/test/ui/match/issue-33498.rs b/tests/ui/match/issue-33498.rs
index 9c8a97e7e..9c8a97e7e 100644
--- a/src/test/ui/match/issue-33498.rs
+++ b/tests/ui/match/issue-33498.rs
diff --git a/src/test/ui/match/issue-41255.rs b/tests/ui/match/issue-41255.rs
index d163801fd..d163801fd 100644
--- a/src/test/ui/match/issue-41255.rs
+++ b/tests/ui/match/issue-41255.rs
diff --git a/src/test/ui/match/issue-41255.stderr b/tests/ui/match/issue-41255.stderr
index 9bc49654e..9bc49654e 100644
--- a/src/test/ui/match/issue-41255.stderr
+++ b/tests/ui/match/issue-41255.stderr
diff --git a/src/test/ui/match/issue-42679.rs b/tests/ui/match/issue-42679.rs
index 46a0bd35d..46a0bd35d 100644
--- a/src/test/ui/match/issue-42679.rs
+++ b/tests/ui/match/issue-42679.rs
diff --git a/src/test/ui/match/issue-46920-byte-array-patterns.rs b/tests/ui/match/issue-46920-byte-array-patterns.rs
index 2a8b4bb49..2a8b4bb49 100644
--- a/src/test/ui/match/issue-46920-byte-array-patterns.rs
+++ b/tests/ui/match/issue-46920-byte-array-patterns.rs
diff --git a/src/test/ui/issues/issue-5530.rs b/tests/ui/match/issue-5530.rs
index 72731cbb1..72731cbb1 100644
--- a/src/test/ui/issues/issue-5530.rs
+++ b/tests/ui/match/issue-5530.rs
diff --git a/src/test/ui/match/issue-56685.rs b/tests/ui/match/issue-56685.rs
index f320c99ed..f320c99ed 100644
--- a/src/test/ui/match/issue-56685.rs
+++ b/tests/ui/match/issue-56685.rs
diff --git a/src/test/ui/match/issue-56685.stderr b/tests/ui/match/issue-56685.stderr
index ccf357d4a..ccf357d4a 100644
--- a/src/test/ui/match/issue-56685.stderr
+++ b/tests/ui/match/issue-56685.stderr
diff --git a/src/test/ui/match/issue-70972-dyn-trait.rs b/tests/ui/match/issue-70972-dyn-trait.rs
index 97d161c59..97d161c59 100644
--- a/src/test/ui/match/issue-70972-dyn-trait.rs
+++ b/tests/ui/match/issue-70972-dyn-trait.rs
diff --git a/src/test/ui/match/issue-70972-dyn-trait.stderr b/tests/ui/match/issue-70972-dyn-trait.stderr
index 7581070eb..7581070eb 100644
--- a/src/test/ui/match/issue-70972-dyn-trait.stderr
+++ b/tests/ui/match/issue-70972-dyn-trait.stderr
diff --git a/src/test/ui/match/issue-72680.rs b/tests/ui/match/issue-72680.rs
index c13cace76..c13cace76 100644
--- a/src/test/ui/match/issue-72680.rs
+++ b/tests/ui/match/issue-72680.rs
diff --git a/src/test/ui/match/issue-72896.rs b/tests/ui/match/issue-72896.rs
index 3a8b82037..3a8b82037 100644
--- a/src/test/ui/match/issue-72896.rs
+++ b/tests/ui/match/issue-72896.rs
diff --git a/src/test/ui/match/issue-74050-end-span.rs b/tests/ui/match/issue-74050-end-span.rs
index cc81214e2..cc81214e2 100644
--- a/src/test/ui/match/issue-74050-end-span.rs
+++ b/tests/ui/match/issue-74050-end-span.rs
diff --git a/src/test/ui/match/issue-74050-end-span.stderr b/tests/ui/match/issue-74050-end-span.stderr
index 59c091e44..59c091e44 100644
--- a/src/test/ui/match/issue-74050-end-span.stderr
+++ b/tests/ui/match/issue-74050-end-span.stderr
diff --git a/src/test/ui/match/issue-82392.rs b/tests/ui/match/issue-82392.rs
index d26d88304..d26d88304 100644
--- a/src/test/ui/match/issue-82392.rs
+++ b/tests/ui/match/issue-82392.rs
diff --git a/src/test/ui/match/issue-82392.stdout b/tests/ui/match/issue-82392.stdout
index ffe730743..ffe730743 100644
--- a/src/test/ui/match/issue-82392.stdout
+++ b/tests/ui/match/issue-82392.stdout
diff --git a/src/test/ui/match/issue-82866.rs b/tests/ui/match/issue-82866.rs
index 95cd62261..95cd62261 100644
--- a/src/test/ui/match/issue-82866.rs
+++ b/tests/ui/match/issue-82866.rs
diff --git a/src/test/ui/match/issue-82866.stderr b/tests/ui/match/issue-82866.stderr
index f9e3360a5..f9e3360a5 100644
--- a/src/test/ui/match/issue-82866.stderr
+++ b/tests/ui/match/issue-82866.stderr
diff --git a/src/test/ui/match/issue-84434.rs b/tests/ui/match/issue-84434.rs
index 423481fd5..423481fd5 100644
--- a/src/test/ui/match/issue-84434.rs
+++ b/tests/ui/match/issue-84434.rs
diff --git a/src/test/ui/match/issue-91058.rs b/tests/ui/match/issue-91058.rs
index 4845937d5..4845937d5 100644
--- a/src/test/ui/match/issue-91058.rs
+++ b/tests/ui/match/issue-91058.rs
diff --git a/src/test/ui/match/issue-91058.stderr b/tests/ui/match/issue-91058.stderr
index ec1d7e21f..ec1d7e21f 100644
--- a/src/test/ui/match/issue-91058.stderr
+++ b/tests/ui/match/issue-91058.stderr
diff --git a/src/test/ui/match/issue-92100.rs b/tests/ui/match/issue-92100.rs
index baac570dd..baac570dd 100644
--- a/src/test/ui/match/issue-92100.rs
+++ b/tests/ui/match/issue-92100.rs
diff --git a/src/test/ui/match/issue-92100.stderr b/tests/ui/match/issue-92100.stderr
index 0f694c587..0f694c587 100644
--- a/src/test/ui/match/issue-92100.stderr
+++ b/tests/ui/match/issue-92100.stderr
diff --git a/src/test/ui/match/match-arm-resolving-to-never.rs b/tests/ui/match/match-arm-resolving-to-never.rs
index 6ef249c05..6ef249c05 100644
--- a/src/test/ui/match/match-arm-resolving-to-never.rs
+++ b/tests/ui/match/match-arm-resolving-to-never.rs
diff --git a/src/test/ui/match/match-arm-resolving-to-never.stderr b/tests/ui/match/match-arm-resolving-to-never.stderr
index 686fbd0ba..686fbd0ba 100644
--- a/src/test/ui/match/match-arm-resolving-to-never.stderr
+++ b/tests/ui/match/match-arm-resolving-to-never.stderr
diff --git a/src/test/ui/match/match-bot-panic.rs b/tests/ui/match/match-bot-panic.rs
index e4a6f6d6f..e4a6f6d6f 100644
--- a/src/test/ui/match/match-bot-panic.rs
+++ b/tests/ui/match/match-bot-panic.rs
diff --git a/src/test/ui/match/match-disc-bot.rs b/tests/ui/match/match-disc-bot.rs
index 18cfd5e23..18cfd5e23 100644
--- a/src/test/ui/match/match-disc-bot.rs
+++ b/tests/ui/match/match-disc-bot.rs
diff --git a/src/test/ui/match/match-fn-call.rs b/tests/ui/match/match-fn-call.rs
index 99092602c..99092602c 100644
--- a/src/test/ui/match/match-fn-call.rs
+++ b/tests/ui/match/match-fn-call.rs
diff --git a/src/test/ui/match/match-fn-call.stderr b/tests/ui/match/match-fn-call.stderr
index 297aa4cd9..297aa4cd9 100644
--- a/src/test/ui/match/match-fn-call.stderr
+++ b/tests/ui/match/match-fn-call.stderr
diff --git a/src/test/ui/match/match-ill-type2.rs b/tests/ui/match/match-ill-type2.rs
index 6612f6e39..6612f6e39 100644
--- a/src/test/ui/match/match-ill-type2.rs
+++ b/tests/ui/match/match-ill-type2.rs
diff --git a/src/test/ui/match/match-ill-type2.stderr b/tests/ui/match/match-ill-type2.stderr
index 5078f03d6..5078f03d6 100644
--- a/src/test/ui/match/match-ill-type2.stderr
+++ b/tests/ui/match/match-ill-type2.stderr
diff --git a/src/test/ui/match/match-incompat-type-semi.rs b/tests/ui/match/match-incompat-type-semi.rs
index 37f6beabd..37f6beabd 100644
--- a/src/test/ui/match/match-incompat-type-semi.rs
+++ b/tests/ui/match/match-incompat-type-semi.rs
diff --git a/src/test/ui/match/match-incompat-type-semi.stderr b/tests/ui/match/match-incompat-type-semi.stderr
index 008b1c1e9..008b1c1e9 100644
--- a/src/test/ui/match/match-incompat-type-semi.stderr
+++ b/tests/ui/match/match-incompat-type-semi.stderr
diff --git a/src/test/ui/match/match-join.rs b/tests/ui/match/match-join.rs
index b0f2593c8..b0f2593c8 100644
--- a/src/test/ui/match/match-join.rs
+++ b/tests/ui/match/match-join.rs
diff --git a/src/test/ui/match/match-join.stderr b/tests/ui/match/match-join.stderr
index 27a82c124..27a82c124 100644
--- a/src/test/ui/match/match-join.stderr
+++ b/tests/ui/match/match-join.stderr
diff --git a/src/test/ui/match/match-no-arms-unreachable-after.rs b/tests/ui/match/match-no-arms-unreachable-after.rs
index 8f83fd1a3..8f83fd1a3 100644
--- a/src/test/ui/match/match-no-arms-unreachable-after.rs
+++ b/tests/ui/match/match-no-arms-unreachable-after.rs
diff --git a/src/test/ui/match/match-no-arms-unreachable-after.stderr b/tests/ui/match/match-no-arms-unreachable-after.stderr
index a0a369726..a0a369726 100644
--- a/src/test/ui/match/match-no-arms-unreachable-after.stderr
+++ b/tests/ui/match/match-no-arms-unreachable-after.stderr
diff --git a/src/test/ui/match/match-on-negative-integer-ranges.rs b/tests/ui/match/match-on-negative-integer-ranges.rs
index 53e9ea9a5..53e9ea9a5 100644
--- a/src/test/ui/match/match-on-negative-integer-ranges.rs
+++ b/tests/ui/match/match-on-negative-integer-ranges.rs
diff --git a/src/test/ui/match/match-pattern-field-mismatch-2.rs b/tests/ui/match/match-pattern-field-mismatch-2.rs
index fa03cdac2..fa03cdac2 100644
--- a/src/test/ui/match/match-pattern-field-mismatch-2.rs
+++ b/tests/ui/match/match-pattern-field-mismatch-2.rs
diff --git a/src/test/ui/match/match-pattern-field-mismatch-2.stderr b/tests/ui/match/match-pattern-field-mismatch-2.stderr
index ba32d0e99..ba32d0e99 100644
--- a/src/test/ui/match/match-pattern-field-mismatch-2.stderr
+++ b/tests/ui/match/match-pattern-field-mismatch-2.stderr
diff --git a/src/test/ui/match/match-pattern-field-mismatch.rs b/tests/ui/match/match-pattern-field-mismatch.rs
index a4fa97fef..a4fa97fef 100644
--- a/src/test/ui/match/match-pattern-field-mismatch.rs
+++ b/tests/ui/match/match-pattern-field-mismatch.rs
diff --git a/src/test/ui/match/match-pattern-field-mismatch.stderr b/tests/ui/match/match-pattern-field-mismatch.stderr
index c994ee4f6..c994ee4f6 100644
--- a/src/test/ui/match/match-pattern-field-mismatch.stderr
+++ b/tests/ui/match/match-pattern-field-mismatch.stderr
diff --git a/src/test/ui/match/match-range-fail-2.rs b/tests/ui/match/match-range-fail-2.rs
index 792664e1d..792664e1d 100644
--- a/src/test/ui/match/match-range-fail-2.rs
+++ b/tests/ui/match/match-range-fail-2.rs
diff --git a/src/test/ui/match/match-range-fail-2.stderr b/tests/ui/match/match-range-fail-2.stderr
index 7a0852d7e..7a0852d7e 100644
--- a/src/test/ui/match/match-range-fail-2.stderr
+++ b/tests/ui/match/match-range-fail-2.stderr
diff --git a/src/test/ui/match/match-range-fail.rs b/tests/ui/match/match-range-fail.rs
index e53c8463e..e53c8463e 100644
--- a/src/test/ui/match/match-range-fail.rs
+++ b/tests/ui/match/match-range-fail.rs
diff --git a/src/test/ui/match/match-range-fail.stderr b/tests/ui/match/match-range-fail.stderr
index 65db92df1..65db92df1 100644
--- a/src/test/ui/match/match-range-fail.stderr
+++ b/tests/ui/match/match-range-fail.stderr
diff --git a/src/test/ui/match/match-ref-mut-invariance.rs b/tests/ui/match/match-ref-mut-invariance.rs
index 4250696c6..4250696c6 100644
--- a/src/test/ui/match/match-ref-mut-invariance.rs
+++ b/tests/ui/match/match-ref-mut-invariance.rs
diff --git a/src/test/ui/match/match-ref-mut-invariance.stderr b/tests/ui/match/match-ref-mut-invariance.stderr
index 3b7e53cd5..3b7e53cd5 100644
--- a/src/test/ui/match/match-ref-mut-invariance.stderr
+++ b/tests/ui/match/match-ref-mut-invariance.stderr
diff --git a/src/test/ui/match/match-ref-mut-let-invariance.rs b/tests/ui/match/match-ref-mut-let-invariance.rs
index a33be09ac..a33be09ac 100644
--- a/src/test/ui/match/match-ref-mut-let-invariance.rs
+++ b/tests/ui/match/match-ref-mut-let-invariance.rs
diff --git a/src/test/ui/match/match-ref-mut-let-invariance.stderr b/tests/ui/match/match-ref-mut-let-invariance.stderr
index f4d1cea67..f4d1cea67 100644
--- a/src/test/ui/match/match-ref-mut-let-invariance.stderr
+++ b/tests/ui/match/match-ref-mut-let-invariance.stderr
diff --git a/src/test/ui/match/match-ref-mut-stability.rs b/tests/ui/match/match-ref-mut-stability.rs
index 52120360b..52120360b 100644
--- a/src/test/ui/match/match-ref-mut-stability.rs
+++ b/tests/ui/match/match-ref-mut-stability.rs
diff --git a/src/test/ui/match/match-struct.rs b/tests/ui/match/match-struct.rs
index 7a54c54b9..7a54c54b9 100644
--- a/src/test/ui/match/match-struct.rs
+++ b/tests/ui/match/match-struct.rs
diff --git a/src/test/ui/match/match-struct.stderr b/tests/ui/match/match-struct.stderr
index a475bd5e5..a475bd5e5 100644
--- a/src/test/ui/match/match-struct.stderr
+++ b/tests/ui/match/match-struct.stderr
diff --git a/src/test/ui/match/match-tag-nullary.rs b/tests/ui/match/match-tag-nullary.rs
index bb2f59969..bb2f59969 100644
--- a/src/test/ui/match/match-tag-nullary.rs
+++ b/tests/ui/match/match-tag-nullary.rs
diff --git a/src/test/ui/match/match-tag-nullary.stderr b/tests/ui/match/match-tag-nullary.stderr
index a6add31d1..a6add31d1 100644
--- a/src/test/ui/match/match-tag-nullary.stderr
+++ b/tests/ui/match/match-tag-nullary.stderr
diff --git a/src/test/ui/match/match-tag-unary.rs b/tests/ui/match/match-tag-unary.rs
index aedceafb4..aedceafb4 100644
--- a/src/test/ui/match/match-tag-unary.rs
+++ b/tests/ui/match/match-tag-unary.rs
diff --git a/src/test/ui/match/match-tag-unary.stderr b/tests/ui/match/match-tag-unary.stderr
index 31f77bdff..31f77bdff 100644
--- a/src/test/ui/match/match-tag-unary.stderr
+++ b/tests/ui/match/match-tag-unary.stderr
diff --git a/src/test/ui/match/match-type-err-first-arm.rs b/tests/ui/match/match-type-err-first-arm.rs
index e9027eb24..e9027eb24 100644
--- a/src/test/ui/match/match-type-err-first-arm.rs
+++ b/tests/ui/match/match-type-err-first-arm.rs
diff --git a/src/test/ui/match/match-type-err-first-arm.stderr b/tests/ui/match/match-type-err-first-arm.stderr
index 1cfe7ce1e..1cfe7ce1e 100644
--- a/src/test/ui/match/match-type-err-first-arm.stderr
+++ b/tests/ui/match/match-type-err-first-arm.stderr
diff --git a/src/test/ui/match/match-unresolved-one-arm.rs b/tests/ui/match/match-unresolved-one-arm.rs
index fa65d87b3..fa65d87b3 100644
--- a/src/test/ui/match/match-unresolved-one-arm.rs
+++ b/tests/ui/match/match-unresolved-one-arm.rs
diff --git a/src/test/ui/match/match-unresolved-one-arm.stderr b/tests/ui/match/match-unresolved-one-arm.stderr
index 9eadb88a8..e3b501b2f 100644
--- a/src/test/ui/match/match-unresolved-one-arm.stderr
+++ b/tests/ui/match/match-unresolved-one-arm.stderr
@@ -6,8 +6,8 @@ LL |     let x = match () {
    |
 help: consider giving `x` an explicit type
    |
-LL |     let x: _ = match () {
-   |          +++
+LL |     let x: /* Type */ = match () {
+   |          ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/match/match-vec-mismatch-2.rs b/tests/ui/match/match-vec-mismatch-2.rs
index 553095837..553095837 100644
--- a/src/test/ui/match/match-vec-mismatch-2.rs
+++ b/tests/ui/match/match-vec-mismatch-2.rs
diff --git a/src/test/ui/match/match-vec-mismatch-2.stderr b/tests/ui/match/match-vec-mismatch-2.stderr
index 5247bea62..5247bea62 100644
--- a/src/test/ui/match/match-vec-mismatch-2.stderr
+++ b/tests/ui/match/match-vec-mismatch-2.stderr
diff --git a/src/test/ui/match/match-wildcards.rs b/tests/ui/match/match-wildcards.rs
index 43f6e4913..43f6e4913 100644
--- a/src/test/ui/match/match-wildcards.rs
+++ b/tests/ui/match/match-wildcards.rs
diff --git a/src/test/ui/match/match_non_exhaustive.rs b/tests/ui/match/match_non_exhaustive.rs
index f162dd60f..f162dd60f 100644
--- a/src/test/ui/match/match_non_exhaustive.rs
+++ b/tests/ui/match/match_non_exhaustive.rs
diff --git a/src/test/ui/match/match_non_exhaustive.stderr b/tests/ui/match/match_non_exhaustive.stderr
index 46ee8d517..46ee8d517 100644
--- a/src/test/ui/match/match_non_exhaustive.stderr
+++ b/tests/ui/match/match_non_exhaustive.stderr
diff --git a/src/test/ui/match/pattern-deref-miscompile.rs b/tests/ui/match/pattern-deref-miscompile.rs
index caa6d184a..caa6d184a 100644
--- a/src/test/ui/match/pattern-deref-miscompile.rs
+++ b/tests/ui/match/pattern-deref-miscompile.rs
diff --git a/tests/ui/match/single-line.rs b/tests/ui/match/single-line.rs
new file mode 100644
index 000000000..0f69d089f
--- /dev/null
+++ b/tests/ui/match/single-line.rs
@@ -0,0 +1,3 @@
+fn main() {
+    let _ = match Some(42) { Some(x) => x, None => "" }; //~ ERROR E0308
+}
diff --git a/tests/ui/match/single-line.stderr b/tests/ui/match/single-line.stderr
new file mode 100644
index 000000000..ec3b76e3f
--- /dev/null
+++ b/tests/ui/match/single-line.stderr
@@ -0,0 +1,12 @@
+error[E0308]: `match` arms have incompatible types
+  --> $DIR/single-line.rs:2:52
+   |
+LL |     let _ = match Some(42) { Some(x) => x, None => "" };
+   |             --------------              -          ^^ expected integer, found `&str`
+   |             |                           |
+   |             |                           this is found to be of type `{integer}`
+   |             `match` arms have incompatible types
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/max-min-classes.rs b/tests/ui/max-min-classes.rs
index f9a39e486..f9a39e486 100644
--- a/src/test/ui/max-min-classes.rs
+++ b/tests/ui/max-min-classes.rs
diff --git a/src/test/ui/maximal_mir_to_hir_coverage.rs b/tests/ui/maximal_mir_to_hir_coverage.rs
index 5ca54633f..5ca54633f 100644
--- a/src/test/ui/maximal_mir_to_hir_coverage.rs
+++ b/tests/ui/maximal_mir_to_hir_coverage.rs
diff --git a/src/test/ui/maybe-bounds.rs b/tests/ui/maybe-bounds.rs
index 02ed45c65..02ed45c65 100644
--- a/src/test/ui/maybe-bounds.rs
+++ b/tests/ui/maybe-bounds.rs
diff --git a/src/test/ui/maybe-bounds.stderr b/tests/ui/maybe-bounds.stderr
index 1d823b6ac..1d823b6ac 100644
--- a/src/test/ui/maybe-bounds.stderr
+++ b/tests/ui/maybe-bounds.stderr
diff --git a/src/test/ui/meta/auxiliary/env.rs b/tests/ui/meta/auxiliary/env.rs
index b3644d8d5..b3644d8d5 100644
--- a/src/test/ui/meta/auxiliary/env.rs
+++ b/tests/ui/meta/auxiliary/env.rs
diff --git a/src/test/ui/meta/expected-error-correct-rev.a.stderr b/tests/ui/meta/expected-error-correct-rev.a.stderr
index 4adeebe2a..4adeebe2a 100644
--- a/src/test/ui/meta/expected-error-correct-rev.a.stderr
+++ b/tests/ui/meta/expected-error-correct-rev.a.stderr
diff --git a/src/test/ui/meta/expected-error-correct-rev.rs b/tests/ui/meta/expected-error-correct-rev.rs
index 26798c3df..26798c3df 100644
--- a/src/test/ui/meta/expected-error-correct-rev.rs
+++ b/tests/ui/meta/expected-error-correct-rev.rs
diff --git a/src/test/ui/meta/meta-expected-error-wrong-rev.a.stderr b/tests/ui/meta/meta-expected-error-wrong-rev.a.stderr
index 87330155e..87330155e 100644
--- a/src/test/ui/meta/meta-expected-error-wrong-rev.a.stderr
+++ b/tests/ui/meta/meta-expected-error-wrong-rev.a.stderr
diff --git a/src/test/ui/meta/meta-expected-error-wrong-rev.rs b/tests/ui/meta/meta-expected-error-wrong-rev.rs
index c30d4fe0a..c30d4fe0a 100644
--- a/src/test/ui/meta/meta-expected-error-wrong-rev.rs
+++ b/tests/ui/meta/meta-expected-error-wrong-rev.rs
diff --git a/src/test/ui/meta/revision-bad.rs b/tests/ui/meta/revision-bad.rs
index 37ddbe99a..37ddbe99a 100644
--- a/src/test/ui/meta/revision-bad.rs
+++ b/tests/ui/meta/revision-bad.rs
diff --git a/src/test/ui/meta/revision-ok.rs b/tests/ui/meta/revision-ok.rs
index bbeae41b8..bbeae41b8 100644
--- a/src/test/ui/meta/revision-ok.rs
+++ b/tests/ui/meta/revision-ok.rs
diff --git a/src/test/ui/meta/rustc-env.rs b/tests/ui/meta/rustc-env.rs
index 7d4e005be..7d4e005be 100644
--- a/src/test/ui/meta/rustc-env.rs
+++ b/tests/ui/meta/rustc-env.rs
diff --git a/src/test/ui/methods/assign-to-method.rs b/tests/ui/methods/assign-to-method.rs
index 85beaee8d..85beaee8d 100644
--- a/src/test/ui/methods/assign-to-method.rs
+++ b/tests/ui/methods/assign-to-method.rs
diff --git a/src/test/ui/methods/assign-to-method.stderr b/tests/ui/methods/assign-to-method.stderr
index cafe9abae..cafe9abae 100644
--- a/src/test/ui/methods/assign-to-method.stderr
+++ b/tests/ui/methods/assign-to-method.stderr
diff --git a/src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs b/tests/ui/methods/auxiliary/ambig_impl_2_lib.rs
index 0ed68bf69..0ed68bf69 100644
--- a/src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs
+++ b/tests/ui/methods/auxiliary/ambig_impl_2_lib.rs
diff --git a/src/test/ui/methods/auxiliary/macro-in-other-crate.rs b/tests/ui/methods/auxiliary/macro-in-other-crate.rs
index feda08463..feda08463 100644
--- a/src/test/ui/methods/auxiliary/macro-in-other-crate.rs
+++ b/tests/ui/methods/auxiliary/macro-in-other-crate.rs
diff --git a/src/test/ui/methods/auxiliary/method_self_arg1.rs b/tests/ui/methods/auxiliary/method_self_arg1.rs
index f89019fe5..f89019fe5 100644
--- a/src/test/ui/methods/auxiliary/method_self_arg1.rs
+++ b/tests/ui/methods/auxiliary/method_self_arg1.rs
diff --git a/src/test/ui/methods/auxiliary/method_self_arg2.rs b/tests/ui/methods/auxiliary/method_self_arg2.rs
index 967254562..967254562 100644
--- a/src/test/ui/methods/auxiliary/method_self_arg2.rs
+++ b/tests/ui/methods/auxiliary/method_self_arg2.rs
diff --git a/tests/ui/methods/field-method-suggestion-using-return-ty.rs b/tests/ui/methods/field-method-suggestion-using-return-ty.rs
new file mode 100644
index 000000000..07b975c44
--- /dev/null
+++ b/tests/ui/methods/field-method-suggestion-using-return-ty.rs
@@ -0,0 +1,18 @@
+struct Wrapper<T>(T);
+
+impl Wrapper<Option<i32>> {
+    fn inner_mut(&self) -> Option<&mut i32> {
+        self.as_mut()
+        //~^ ERROR no method named `as_mut` found for reference `&Wrapper<Option<i32>>` in the current scope
+        //~| HELP one of the expressions' fields has a method of the same name
+        //~| HELP items from traits can only be used if
+    }
+
+    fn inner_mut_bad(&self) -> Option<&mut u32> {
+        self.as_mut()
+        //~^ ERROR no method named `as_mut` found for reference `&Wrapper<Option<i32>>` in the current scope
+        //~| HELP items from traits can only be used if
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/methods/field-method-suggestion-using-return-ty.stderr b/tests/ui/methods/field-method-suggestion-using-return-ty.stderr
new file mode 100644
index 000000000..51c52a07e
--- /dev/null
+++ b/tests/ui/methods/field-method-suggestion-using-return-ty.stderr
@@ -0,0 +1,27 @@
+error[E0599]: no method named `as_mut` found for reference `&Wrapper<Option<i32>>` in the current scope
+  --> $DIR/field-method-suggestion-using-return-ty.rs:5:14
+   |
+LL |         self.as_mut()
+   |              ^^^^^^ method not found in `&Wrapper<Option<i32>>`
+   |
+   = help: items from traits can only be used if the trait is implemented and in scope
+   = note: the following trait defines an item `as_mut`, perhaps you need to implement it:
+           candidate #1: `AsMut`
+help: one of the expressions' fields has a method of the same name
+   |
+LL |         self.0.as_mut()
+   |              ++
+
+error[E0599]: no method named `as_mut` found for reference `&Wrapper<Option<i32>>` in the current scope
+  --> $DIR/field-method-suggestion-using-return-ty.rs:12:14
+   |
+LL |         self.as_mut()
+   |              ^^^^^^ method not found in `&Wrapper<Option<i32>>`
+   |
+   = help: items from traits can only be used if the trait is implemented and in scope
+   = note: the following trait defines an item `as_mut`, perhaps you need to implement it:
+           candidate #1: `AsMut`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/methods/issues/issue-105732.rs b/tests/ui/methods/issues/issue-105732.rs
new file mode 100644
index 000000000..d70050658
--- /dev/null
+++ b/tests/ui/methods/issues/issue-105732.rs
@@ -0,0 +1,14 @@
+#![feature(auto_traits)]
+
+auto trait Foo {
+    fn g(&self); //~ ERROR auto traits cannot have associated items
+}
+
+trait Bar {
+    fn f(&self) {
+        // issue #105788
+        self.g(); //~ ERROR no method named `g` found for reference `&Self` in the current scope
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/methods/issues/issue-105732.stderr b/tests/ui/methods/issues/issue-105732.stderr
new file mode 100644
index 000000000..769664254
--- /dev/null
+++ b/tests/ui/methods/issues/issue-105732.stderr
@@ -0,0 +1,18 @@
+error[E0380]: auto traits cannot have associated items
+  --> $DIR/issue-105732.rs:4:8
+   |
+LL | auto trait Foo {
+   |            --- auto trait cannot have associated items
+LL |     fn g(&self);
+   |     ---^-------- help: remove these associated items
+
+error[E0599]: no method named `g` found for reference `&Self` in the current scope
+  --> $DIR/issue-105732.rs:10:14
+   |
+LL |         self.g();
+   |              ^ help: there is a method with a similar name: `f`
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0380, E0599.
+For more information about an error, try `rustc --explain E0380`.
diff --git a/src/test/ui/methods/issues/issue-61525.rs b/tests/ui/methods/issues/issue-61525.rs
index c5ca0326e..c5ca0326e 100644
--- a/src/test/ui/methods/issues/issue-61525.rs
+++ b/tests/ui/methods/issues/issue-61525.rs
diff --git a/src/test/ui/methods/issues/issue-61525.stderr b/tests/ui/methods/issues/issue-61525.stderr
index aec968d7c..3e73b950a 100644
--- a/src/test/ui/methods/issues/issue-61525.stderr
+++ b/tests/ui/methods/issues/issue-61525.stderr
@@ -23,7 +23,7 @@ error[E0308]: mismatched types
 LL |         1.query::<dyn ToString>("")
    |           --------------------- ^^ expected trait object `dyn ToString`, found `&str`
    |           |
-   |           arguments to this function are incorrect
+   |           arguments to this method are incorrect
    |
    = note: expected trait object `dyn ToString`
                  found reference `&'static str`
diff --git a/src/test/ui/methods/issues/issue-84495.rs b/tests/ui/methods/issues/issue-84495.rs
index 28c094bf2..28c094bf2 100644
--- a/src/test/ui/methods/issues/issue-84495.rs
+++ b/tests/ui/methods/issues/issue-84495.rs
diff --git a/src/test/ui/methods/issues/issue-84495.stderr b/tests/ui/methods/issues/issue-84495.stderr
index b0217a7c8..b0217a7c8 100644
--- a/src/test/ui/methods/issues/issue-84495.stderr
+++ b/tests/ui/methods/issues/issue-84495.stderr
diff --git a/src/test/ui/methods/issues/issue-90315.rs b/tests/ui/methods/issues/issue-90315.rs
index 79cdc4195..fbecaf9b9 100644
--- a/src/test/ui/methods/issues/issue-90315.rs
+++ b/tests/ui/methods/issues/issue-90315.rs
@@ -69,8 +69,7 @@ fn main() {
     //~^ ERROR `usize` is not an iterator
 
     let _res: i32 = ..6.take(2).sum();
-    //~^ can't call method `take` on ambiguous numeric type
-    //~| ERROR mismatched types [E0308]
+    //~^ ERROR can't call method `take` on ambiguous numeric type
     //~| HELP you must specify a concrete type for this numeric value
     // Won't suggest because `RangeTo` dest not implemented `take`
 }
diff --git a/src/test/ui/methods/issues/issue-90315.stderr b/tests/ui/methods/issues/issue-90315.stderr
index 070cd3054..4d3c086ff 100644
--- a/src/test/ui/methods/issues/issue-90315.stderr
+++ b/tests/ui/methods/issues/issue-90315.stderr
@@ -57,7 +57,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-90315.rs:28:8
    |
 LL |     if 1..(end + 1).is_empty() {
-   |        ^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |        ^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<{integer}>`
@@ -77,7 +77,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-90315.rs:34:8
    |
 LL |     if 1..(end + 1).is_sorted() {
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<{integer}>`
@@ -97,7 +97,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-90315.rs:40:21
    |
 LL |     let _res: i32 = 3..6.take(2).sum();
-   |               ---   ^^^^^^^^^^^^^^^^^^ expected `i32`, found struct `std::ops::Range`
+   |               ---   ^^^^^^^^^^^^^^^^^^ expected `i32`, found struct `Range`
    |               |
    |               expected due to this
    |
@@ -119,7 +119,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-90315.rs:45:21
    |
 LL |     let _sum: i32 = 3..6.sum();
-   |               ---   ^^^^^^^^^^ expected `i32`, found struct `std::ops::Range`
+   |               ---   ^^^^^^^^^^ expected `i32`, found struct `Range`
    |               |
    |               expected due to this
    |
@@ -158,7 +158,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-90315.rs:62:8
    |
 LL |     if 1..end.error_method() {
-   |        ^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |        ^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<{integer}>`
@@ -184,18 +184,7 @@ help: you must specify a concrete type for this numeric value, like `i32`
 LL |     let _res: i32 = ..6_i32.take(2).sum();
    |                       ~~~~~
 
-error[E0308]: mismatched types
-  --> $DIR/issue-90315.rs:71:21
-   |
-LL |     let _res: i32 = ..6.take(2).sum();
-   |               ---   ^^^^^^^^^^^^^^^^^ expected `i32`, found struct `RangeTo`
-   |               |
-   |               expected due to this
-   |
-   = note: expected type `i32`
-            found struct `RangeTo<_>`
-
-error: aborting due to 19 previous errors
+error: aborting due to 18 previous errors
 
 Some errors have detailed explanations: E0308, E0599, E0689.
 For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/methods/issues/issue-94581.rs b/tests/ui/methods/issues/issue-94581.rs
index df393e91d..df393e91d 100644
--- a/src/test/ui/methods/issues/issue-94581.rs
+++ b/tests/ui/methods/issues/issue-94581.rs
diff --git a/src/test/ui/methods/issues/issue-94581.stderr b/tests/ui/methods/issues/issue-94581.stderr
index d6be29cf5..d6be29cf5 100644
--- a/src/test/ui/methods/issues/issue-94581.stderr
+++ b/tests/ui/methods/issues/issue-94581.stderr
diff --git a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.rs b/tests/ui/methods/method-ambig-one-trait-unknown-int-type.rs
index 7b2fc34e1..7b2fc34e1 100644
--- a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.rs
+++ b/tests/ui/methods/method-ambig-one-trait-unknown-int-type.rs
diff --git a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr b/tests/ui/methods/method-ambig-one-trait-unknown-int-type.stderr
index e0f8a5447..e0f8a5447 100644
--- a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr
+++ b/tests/ui/methods/method-ambig-one-trait-unknown-int-type.stderr
diff --git a/src/test/ui/methods/method-ambig-two-traits-cross-crate.rs b/tests/ui/methods/method-ambig-two-traits-cross-crate.rs
index 006e315b0..006e315b0 100644
--- a/src/test/ui/methods/method-ambig-two-traits-cross-crate.rs
+++ b/tests/ui/methods/method-ambig-two-traits-cross-crate.rs
diff --git a/src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr b/tests/ui/methods/method-ambig-two-traits-cross-crate.stderr
index 4b2597eed..4b2597eed 100644
--- a/src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr
+++ b/tests/ui/methods/method-ambig-two-traits-cross-crate.stderr
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-bounds.rs b/tests/ui/methods/method-ambig-two-traits-from-bounds.rs
index e3cc5557f..e3cc5557f 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-bounds.rs
+++ b/tests/ui/methods/method-ambig-two-traits-from-bounds.rs
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr b/tests/ui/methods/method-ambig-two-traits-from-bounds.stderr
index 1feaa2c73..1feaa2c73 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr
+++ b/tests/ui/methods/method-ambig-two-traits-from-bounds.stderr
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-impls.rs b/tests/ui/methods/method-ambig-two-traits-from-impls.rs
index 22bf84066..22bf84066 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-impls.rs
+++ b/tests/ui/methods/method-ambig-two-traits-from-impls.rs
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-impls.stderr b/tests/ui/methods/method-ambig-two-traits-from-impls.stderr
index f69b56892..f69b56892 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-impls.stderr
+++ b/tests/ui/methods/method-ambig-two-traits-from-impls.stderr
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-impls2.rs b/tests/ui/methods/method-ambig-two-traits-from-impls2.rs
index 0a96c1223..0a96c1223 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-impls2.rs
+++ b/tests/ui/methods/method-ambig-two-traits-from-impls2.rs
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-impls2.stderr b/tests/ui/methods/method-ambig-two-traits-from-impls2.stderr
index 4ba778e0e..4ba778e0e 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-impls2.stderr
+++ b/tests/ui/methods/method-ambig-two-traits-from-impls2.stderr
diff --git a/src/test/ui/methods/method-ambig-two-traits-with-default-method.rs b/tests/ui/methods/method-ambig-two-traits-with-default-method.rs
index aa7094b9e..aa7094b9e 100644
--- a/src/test/ui/methods/method-ambig-two-traits-with-default-method.rs
+++ b/tests/ui/methods/method-ambig-two-traits-with-default-method.rs
diff --git a/src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr b/tests/ui/methods/method-ambig-two-traits-with-default-method.stderr
index e84dff8ba..e84dff8ba 100644
--- a/src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr
+++ b/tests/ui/methods/method-ambig-two-traits-with-default-method.stderr
diff --git a/src/test/ui/methods/method-argument-inference-associated-type.rs b/tests/ui/methods/method-argument-inference-associated-type.rs
index a3c31fab1..a3c31fab1 100644
--- a/src/test/ui/methods/method-argument-inference-associated-type.rs
+++ b/tests/ui/methods/method-argument-inference-associated-type.rs
diff --git a/tests/ui/methods/method-call-err-msg.rs b/tests/ui/methods/method-call-err-msg.rs
new file mode 100644
index 000000000..4807a956a
--- /dev/null
+++ b/tests/ui/methods/method-call-err-msg.rs
@@ -0,0 +1,22 @@
+// Test that parameter cardinality or missing method error gets span exactly.
+
+pub struct Foo;
+impl Foo {
+    fn zero(self) -> Foo { self }
+    fn one(self, _: isize) -> Foo { self }
+    fn two(self, _: isize, _: isize) -> Foo { self }
+    fn three<T>(self, _: T, _: T, _: T) -> Foo { self }
+}
+
+fn main() {
+    let x = Foo;
+    x.zero(0)   //~ ERROR this method takes 0 arguments but 1 argument was supplied
+     .one()     //~ ERROR this method takes 1 argument but 0 arguments were supplied
+     .two(0);   //~ ERROR this method takes 2 arguments but 1 argument was supplied
+
+    let y = Foo;
+    y.zero()
+     .take()    //~ ERROR not an iterator
+     .one(0);
+    y.three::<usize>(); //~ ERROR this method takes 3 arguments but 0 arguments were supplied
+}
diff --git a/src/test/ui/methods/method-call-err-msg.stderr b/tests/ui/methods/method-call-err-msg.stderr
index a4ffb864d..81269b73b 100644
--- a/src/test/ui/methods/method-call-err-msg.stderr
+++ b/tests/ui/methods/method-call-err-msg.stderr
@@ -1,4 +1,4 @@
-error[E0061]: this function takes 0 arguments but 1 argument was supplied
+error[E0061]: this method takes 0 arguments but 1 argument was supplied
   --> $DIR/method-call-err-msg.rs:13:7
    |
 LL |     x.zero(0)
@@ -14,7 +14,7 @@ help: remove the extra argument
 LL |     x.zero()
    |           ~~
 
-error[E0061]: this function takes 1 argument but 0 arguments were supplied
+error[E0061]: this method takes 1 argument but 0 arguments were supplied
   --> $DIR/method-call-err-msg.rs:14:7
    |
 LL |      .one()
@@ -30,7 +30,7 @@ help: provide the argument
 LL |      .one(/* isize */)
    |          ~~~~~~~~~~~~~
 
-error[E0061]: this function takes 2 arguments but 1 argument was supplied
+error[E0061]: this method takes 2 arguments but 1 argument was supplied
   --> $DIR/method-call-err-msg.rs:15:7
    |
 LL |      .two(0);
@@ -61,16 +61,13 @@ LL |      .take()
    = note: the following trait bounds were not satisfied:
            `Foo: Iterator`
            which is required by `&mut Foo: Iterator`
-note: the following trait must be implemented
+note: the trait `Iterator` must be implemented
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-   |
-LL | pub trait Iterator {
-   | ^^^^^^^^^^^^^^^^^^
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `take`, perhaps you need to implement it:
            candidate #1: `Iterator`
 
-error[E0061]: this function takes 3 arguments but 0 arguments were supplied
+error[E0061]: this method takes 3 arguments but 0 arguments were supplied
   --> $DIR/method-call-err-msg.rs:21:7
    |
 LL |     y.three::<usize>();
diff --git a/src/test/ui/methods/method-call-lifetime-args-fail.rs b/tests/ui/methods/method-call-lifetime-args-fail.rs
index 6bf55844d..6bf55844d 100644
--- a/src/test/ui/methods/method-call-lifetime-args-fail.rs
+++ b/tests/ui/methods/method-call-lifetime-args-fail.rs
diff --git a/src/test/ui/methods/method-call-lifetime-args-fail.stderr b/tests/ui/methods/method-call-lifetime-args-fail.stderr
index 249b48ab1..249b48ab1 100644
--- a/src/test/ui/methods/method-call-lifetime-args-fail.stderr
+++ b/tests/ui/methods/method-call-lifetime-args-fail.stderr
diff --git a/src/test/ui/methods/method-call-lifetime-args-lint-fail.rs b/tests/ui/methods/method-call-lifetime-args-lint-fail.rs
index 23893911e..23893911e 100644
--- a/src/test/ui/methods/method-call-lifetime-args-lint-fail.rs
+++ b/tests/ui/methods/method-call-lifetime-args-lint-fail.rs
diff --git a/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr b/tests/ui/methods/method-call-lifetime-args-lint-fail.stderr
index 394c1ac3c..394c1ac3c 100644
--- a/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr
+++ b/tests/ui/methods/method-call-lifetime-args-lint-fail.stderr
diff --git a/src/test/ui/methods/method-call-lifetime-args-lint.rs b/tests/ui/methods/method-call-lifetime-args-lint.rs
index 14729e1e2..14729e1e2 100644
--- a/src/test/ui/methods/method-call-lifetime-args-lint.rs
+++ b/tests/ui/methods/method-call-lifetime-args-lint.rs
diff --git a/src/test/ui/methods/method-call-lifetime-args-lint.stderr b/tests/ui/methods/method-call-lifetime-args-lint.stderr
index b4fc2d717..b4fc2d717 100644
--- a/src/test/ui/methods/method-call-lifetime-args-lint.stderr
+++ b/tests/ui/methods/method-call-lifetime-args-lint.stderr
diff --git a/src/test/ui/methods/method-call-lifetime-args-subst-index.rs b/tests/ui/methods/method-call-lifetime-args-subst-index.rs
index 8df58a348..8df58a348 100644
--- a/src/test/ui/methods/method-call-lifetime-args-subst-index.rs
+++ b/tests/ui/methods/method-call-lifetime-args-subst-index.rs
diff --git a/src/test/ui/methods/method-call-lifetime-args-unresolved.rs b/tests/ui/methods/method-call-lifetime-args-unresolved.rs
index ba7231070..ba7231070 100644
--- a/src/test/ui/methods/method-call-lifetime-args-unresolved.rs
+++ b/tests/ui/methods/method-call-lifetime-args-unresolved.rs
diff --git a/src/test/ui/methods/method-call-lifetime-args-unresolved.stderr b/tests/ui/methods/method-call-lifetime-args-unresolved.stderr
index 62f20d6d5..25ad360b3 100644
--- a/src/test/ui/methods/method-call-lifetime-args-unresolved.stderr
+++ b/tests/ui/methods/method-call-lifetime-args-unresolved.stderr
@@ -11,11 +11,9 @@ warning: cannot specify lifetime arguments explicitly if late bound lifetime par
    |
 LL |     0.clone::<'a>();
    |               ^^
+  --> $SRC_DIR/core/src/clone.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/clone.rs:LL:COL
-   |
-LL |     fn clone(&self) -> Self;
-   |              - the late bound lifetime parameter is introduced here
+   = note: the late bound lifetime parameter is introduced here
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #42868 <https://github.com/rust-lang/rust/issues/42868>
diff --git a/src/test/ui/methods/method-call-lifetime-args.rs b/tests/ui/methods/method-call-lifetime-args.rs
index 3292e9fcd..3292e9fcd 100644
--- a/src/test/ui/methods/method-call-lifetime-args.rs
+++ b/tests/ui/methods/method-call-lifetime-args.rs
diff --git a/src/test/ui/methods/method-call-lifetime-args.stderr b/tests/ui/methods/method-call-lifetime-args.stderr
index 64ae79e9b..64ae79e9b 100644
--- a/src/test/ui/methods/method-call-lifetime-args.stderr
+++ b/tests/ui/methods/method-call-lifetime-args.stderr
diff --git a/src/test/ui/methods/method-call-type-binding.rs b/tests/ui/methods/method-call-type-binding.rs
index f547ca8d1..f547ca8d1 100644
--- a/src/test/ui/methods/method-call-type-binding.rs
+++ b/tests/ui/methods/method-call-type-binding.rs
diff --git a/src/test/ui/methods/method-call-type-binding.stderr b/tests/ui/methods/method-call-type-binding.stderr
index 4b93082ac..4b93082ac 100644
--- a/src/test/ui/methods/method-call-type-binding.stderr
+++ b/tests/ui/methods/method-call-type-binding.stderr
diff --git a/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.rs b/tests/ui/methods/method-deref-to-same-trait-object-with-separate-params.rs
index 9e53ff079..9e53ff079 100644
--- a/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.rs
+++ b/tests/ui/methods/method-deref-to-same-trait-object-with-separate-params.rs
diff --git a/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr b/tests/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr
index 82addab94..82addab94 100644
--- a/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr
+++ b/tests/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr
diff --git a/src/test/ui/methods/method-early-bound-lifetimes-on-self.rs b/tests/ui/methods/method-early-bound-lifetimes-on-self.rs
index f2ace32c6..f2ace32c6 100644
--- a/src/test/ui/methods/method-early-bound-lifetimes-on-self.rs
+++ b/tests/ui/methods/method-early-bound-lifetimes-on-self.rs
diff --git a/src/test/ui/methods/method-lookup-order.rs b/tests/ui/methods/method-lookup-order.rs
index 986fe103c..986fe103c 100644
--- a/src/test/ui/methods/method-lookup-order.rs
+++ b/tests/ui/methods/method-lookup-order.rs
diff --git a/src/test/ui/methods/method-macro-backtrace.rs b/tests/ui/methods/method-macro-backtrace.rs
index 00fe32b7c..00fe32b7c 100644
--- a/src/test/ui/methods/method-macro-backtrace.rs
+++ b/tests/ui/methods/method-macro-backtrace.rs
diff --git a/src/test/ui/methods/method-macro-backtrace.stderr b/tests/ui/methods/method-macro-backtrace.stderr
index dd616c4a5..dd616c4a5 100644
--- a/src/test/ui/methods/method-macro-backtrace.stderr
+++ b/tests/ui/methods/method-macro-backtrace.stderr
diff --git a/src/test/ui/methods/method-missing-call.rs b/tests/ui/methods/method-missing-call.rs
index 7ce1e9a4f..7ce1e9a4f 100644
--- a/src/test/ui/methods/method-missing-call.rs
+++ b/tests/ui/methods/method-missing-call.rs
diff --git a/src/test/ui/methods/method-missing-call.stderr b/tests/ui/methods/method-missing-call.stderr
index 040a65d16..040a65d16 100644
--- a/src/test/ui/methods/method-missing-call.stderr
+++ b/tests/ui/methods/method-missing-call.stderr
diff --git a/src/test/ui/methods/method-mut-self-modifies-mut-slice-lvalue.rs b/tests/ui/methods/method-mut-self-modifies-mut-slice-lvalue.rs
index daff037b2..daff037b2 100644
--- a/src/test/ui/methods/method-mut-self-modifies-mut-slice-lvalue.rs
+++ b/tests/ui/methods/method-mut-self-modifies-mut-slice-lvalue.rs
diff --git a/src/test/ui/methods/method-normalize-bounds-issue-20604.rs b/tests/ui/methods/method-normalize-bounds-issue-20604.rs
index 9c0b95284..9c0b95284 100644
--- a/src/test/ui/methods/method-normalize-bounds-issue-20604.rs
+++ b/tests/ui/methods/method-normalize-bounds-issue-20604.rs
diff --git a/src/test/ui/methods/method-not-found-generic-arg-elision.rs b/tests/ui/methods/method-not-found-generic-arg-elision.rs
index 799ced5e9..799ced5e9 100644
--- a/src/test/ui/methods/method-not-found-generic-arg-elision.rs
+++ b/tests/ui/methods/method-not-found-generic-arg-elision.rs
diff --git a/src/test/ui/methods/method-not-found-generic-arg-elision.stderr b/tests/ui/methods/method-not-found-generic-arg-elision.stderr
index fc42d1a4d..f3db56d1d 100644
--- a/src/test/ui/methods/method-not-found-generic-arg-elision.stderr
+++ b/tests/ui/methods/method-not-found-generic-arg-elision.stderr
@@ -23,7 +23,7 @@ error[E0599]: no method named `extend` found for struct `Map` in the current sco
   --> $DIR/method-not-found-generic-arg-elision.rs:87:29
    |
 LL |     v.iter().map(|x| x * x).extend(std::iter::once(100));
-   |                             ^^^^^^ method not found in `Map<std::slice::Iter<'_, i32>, [closure@$DIR/method-not-found-generic-arg-elision.rs:87:18: 87:21]>`
+   |                             ^^^^^^ method not found in `Map<Iter<'_, i32>, [closure@method-not-found-generic-arg-elision.rs:87:18]>`
 
 error[E0599]: no method named `method` found for struct `Wrapper<bool>` in the current scope
   --> $DIR/method-not-found-generic-arg-elision.rs:90:13
@@ -88,9 +88,16 @@ LL | struct Struct<T> {
 LL |     s.method();
    |       ^^^^^^ method cannot be called on `Struct<f64>` due to unsatisfied trait bounds
    |
-   = note: the following trait bounds were not satisfied:
-           `f64: Eq`
-           `f64: Ord`
+note: the following trait bounds were not satisfied:
+      `f64: Eq`
+      `f64: Ord`
+  --> $DIR/method-not-found-generic-arg-elision.rs:74:36
+   |
+LL | impl<T: Clone + Copy + PartialEq + Eq + PartialOrd + Ord> Struct<T> {
+   |                                    ^^                ^^^  ---------
+   |                                    |                 |
+   |                                    |                 unsatisfied trait bound introduced here
+   |                                    unsatisfied trait bound introduced here
 
 error: aborting due to 9 previous errors
 
diff --git a/src/test/ui/methods/method-on-ambiguous-numeric-type.rs b/tests/ui/methods/method-on-ambiguous-numeric-type.rs
index 82f47438d..82f47438d 100644
--- a/src/test/ui/methods/method-on-ambiguous-numeric-type.rs
+++ b/tests/ui/methods/method-on-ambiguous-numeric-type.rs
diff --git a/src/test/ui/methods/method-on-ambiguous-numeric-type.stderr b/tests/ui/methods/method-on-ambiguous-numeric-type.stderr
index 917334116..917334116 100644
--- a/src/test/ui/methods/method-on-ambiguous-numeric-type.stderr
+++ b/tests/ui/methods/method-on-ambiguous-numeric-type.stderr
diff --git a/src/test/ui/methods/method-path-in-pattern.rs b/tests/ui/methods/method-path-in-pattern.rs
index 406453095..406453095 100644
--- a/src/test/ui/methods/method-path-in-pattern.rs
+++ b/tests/ui/methods/method-path-in-pattern.rs
diff --git a/src/test/ui/methods/method-path-in-pattern.stderr b/tests/ui/methods/method-path-in-pattern.stderr
index 63c7abe0e..63c7abe0e 100644
--- a/src/test/ui/methods/method-path-in-pattern.stderr
+++ b/tests/ui/methods/method-path-in-pattern.stderr
diff --git a/src/test/ui/methods/method-probe-no-guessing-dyn-trait.rs b/tests/ui/methods/method-probe-no-guessing-dyn-trait.rs
index ec41b7117..ec41b7117 100644
--- a/src/test/ui/methods/method-probe-no-guessing-dyn-trait.rs
+++ b/tests/ui/methods/method-probe-no-guessing-dyn-trait.rs
diff --git a/src/test/ui/methods/method-projection.rs b/tests/ui/methods/method-projection.rs
index 21d983f19..21d983f19 100644
--- a/src/test/ui/methods/method-projection.rs
+++ b/tests/ui/methods/method-projection.rs
diff --git a/src/test/ui/methods/method-recursive-blanket-impl.rs b/tests/ui/methods/method-recursive-blanket-impl.rs
index a2db75b4e..a2db75b4e 100644
--- a/src/test/ui/methods/method-recursive-blanket-impl.rs
+++ b/tests/ui/methods/method-recursive-blanket-impl.rs
diff --git a/src/test/ui/methods/method-resolvable-path-in-pattern.rs b/tests/ui/methods/method-resolvable-path-in-pattern.rs
index 2973800a4..2973800a4 100644
--- a/src/test/ui/methods/method-resolvable-path-in-pattern.rs
+++ b/tests/ui/methods/method-resolvable-path-in-pattern.rs
diff --git a/src/test/ui/methods/method-resolvable-path-in-pattern.stderr b/tests/ui/methods/method-resolvable-path-in-pattern.stderr
index 7c454a9a7..7c454a9a7 100644
--- a/src/test/ui/methods/method-resolvable-path-in-pattern.stderr
+++ b/tests/ui/methods/method-resolvable-path-in-pattern.stderr
diff --git a/src/test/ui/methods/method-self-arg-1.rs b/tests/ui/methods/method-self-arg-1.rs
index f589f20d8..f589f20d8 100644
--- a/src/test/ui/methods/method-self-arg-1.rs
+++ b/tests/ui/methods/method-self-arg-1.rs
diff --git a/src/test/ui/methods/method-self-arg-1.stderr b/tests/ui/methods/method-self-arg-1.stderr
index 01fec6fca..01fec6fca 100644
--- a/src/test/ui/methods/method-self-arg-1.stderr
+++ b/tests/ui/methods/method-self-arg-1.stderr
diff --git a/src/test/ui/methods/method-self-arg-2.rs b/tests/ui/methods/method-self-arg-2.rs
index 0f8c048ac..0f8c048ac 100644
--- a/src/test/ui/methods/method-self-arg-2.rs
+++ b/tests/ui/methods/method-self-arg-2.rs
diff --git a/src/test/ui/methods/method-self-arg-2.stderr b/tests/ui/methods/method-self-arg-2.stderr
index b98f7a786..b98f7a786 100644
--- a/src/test/ui/methods/method-self-arg-2.stderr
+++ b/tests/ui/methods/method-self-arg-2.stderr
diff --git a/src/test/ui/methods/method-self-arg-aux1.rs b/tests/ui/methods/method-self-arg-aux1.rs
index 79b70a17c..79b70a17c 100644
--- a/src/test/ui/methods/method-self-arg-aux1.rs
+++ b/tests/ui/methods/method-self-arg-aux1.rs
diff --git a/src/test/ui/methods/method-self-arg-aux2.rs b/tests/ui/methods/method-self-arg-aux2.rs
index 16487b54f..16487b54f 100644
--- a/src/test/ui/methods/method-self-arg-aux2.rs
+++ b/tests/ui/methods/method-self-arg-aux2.rs
diff --git a/src/test/ui/methods/method-self-arg-trait.rs b/tests/ui/methods/method-self-arg-trait.rs
index ffa7a552b..ffa7a552b 100644
--- a/src/test/ui/methods/method-self-arg-trait.rs
+++ b/tests/ui/methods/method-self-arg-trait.rs
diff --git a/src/test/ui/methods/method-self-arg.rs b/tests/ui/methods/method-self-arg.rs
index f738fa19c..f738fa19c 100644
--- a/src/test/ui/methods/method-self-arg.rs
+++ b/tests/ui/methods/method-self-arg.rs
diff --git a/src/test/ui/methods/method-trait-object-with-hrtb.rs b/tests/ui/methods/method-trait-object-with-hrtb.rs
index d1bee676c..d1bee676c 100644
--- a/src/test/ui/methods/method-trait-object-with-hrtb.rs
+++ b/tests/ui/methods/method-trait-object-with-hrtb.rs
diff --git a/src/test/ui/methods/method-two-trait-defer-resolution-1.rs b/tests/ui/methods/method-two-trait-defer-resolution-1.rs
index b768620cd..b768620cd 100644
--- a/src/test/ui/methods/method-two-trait-defer-resolution-1.rs
+++ b/tests/ui/methods/method-two-trait-defer-resolution-1.rs
diff --git a/src/test/ui/methods/method-two-trait-defer-resolution-2.rs b/tests/ui/methods/method-two-trait-defer-resolution-2.rs
index fc5766da9..fc5766da9 100644
--- a/src/test/ui/methods/method-two-trait-defer-resolution-2.rs
+++ b/tests/ui/methods/method-two-trait-defer-resolution-2.rs
diff --git a/src/test/ui/methods/method-two-traits-distinguished-via-where-clause.rs b/tests/ui/methods/method-two-traits-distinguished-via-where-clause.rs
index d820d2ad0..d820d2ad0 100644
--- a/src/test/ui/methods/method-two-traits-distinguished-via-where-clause.rs
+++ b/tests/ui/methods/method-two-traits-distinguished-via-where-clause.rs
diff --git a/src/test/ui/methods/method-where-clause.rs b/tests/ui/methods/method-where-clause.rs
index 01692abf9..01692abf9 100644
--- a/src/test/ui/methods/method-where-clause.rs
+++ b/tests/ui/methods/method-where-clause.rs
diff --git a/src/test/ui/minus-string.rs b/tests/ui/minus-string.rs
index 018f0ef9a..018f0ef9a 100644
--- a/src/test/ui/minus-string.rs
+++ b/tests/ui/minus-string.rs
diff --git a/src/test/ui/minus-string.stderr b/tests/ui/minus-string.stderr
index b429ad304..b429ad304 100644
--- a/src/test/ui/minus-string.stderr
+++ b/tests/ui/minus-string.stderr
diff --git a/src/test/ui/mir-dataflow/README.md b/tests/ui/mir-dataflow/README.md
index a3ab14b23..a3ab14b23 100644
--- a/src/test/ui/mir-dataflow/README.md
+++ b/tests/ui/mir-dataflow/README.md
diff --git a/src/test/ui/mir-dataflow/def-inits-1.rs b/tests/ui/mir-dataflow/def-inits-1.rs
index 30460824a..30460824a 100644
--- a/src/test/ui/mir-dataflow/def-inits-1.rs
+++ b/tests/ui/mir-dataflow/def-inits-1.rs
diff --git a/src/test/ui/mir-dataflow/def-inits-1.stderr b/tests/ui/mir-dataflow/def-inits-1.stderr
index e2bddb54d..e2bddb54d 100644
--- a/src/test/ui/mir-dataflow/def-inits-1.stderr
+++ b/tests/ui/mir-dataflow/def-inits-1.stderr
diff --git a/src/test/ui/mir-dataflow/inits-1.rs b/tests/ui/mir-dataflow/inits-1.rs
index 8fb1d4bc7..8fb1d4bc7 100644
--- a/src/test/ui/mir-dataflow/inits-1.rs
+++ b/tests/ui/mir-dataflow/inits-1.rs
diff --git a/src/test/ui/mir-dataflow/inits-1.stderr b/tests/ui/mir-dataflow/inits-1.stderr
index 7a00a70af..7a00a70af 100644
--- a/src/test/ui/mir-dataflow/inits-1.stderr
+++ b/tests/ui/mir-dataflow/inits-1.stderr
diff --git a/src/test/ui/mir-dataflow/liveness-enum.rs b/tests/ui/mir-dataflow/liveness-enum.rs
index 5eb04ae8c..5eb04ae8c 100644
--- a/src/test/ui/mir-dataflow/liveness-enum.rs
+++ b/tests/ui/mir-dataflow/liveness-enum.rs
diff --git a/src/test/ui/mir-dataflow/liveness-enum.stderr b/tests/ui/mir-dataflow/liveness-enum.stderr
index 483944d73..483944d73 100644
--- a/src/test/ui/mir-dataflow/liveness-enum.stderr
+++ b/tests/ui/mir-dataflow/liveness-enum.stderr
diff --git a/src/test/ui/mir-dataflow/liveness-projection.rs b/tests/ui/mir-dataflow/liveness-projection.rs
index 486f31b63..486f31b63 100644
--- a/src/test/ui/mir-dataflow/liveness-projection.rs
+++ b/tests/ui/mir-dataflow/liveness-projection.rs
diff --git a/src/test/ui/mir-dataflow/liveness-projection.stderr b/tests/ui/mir-dataflow/liveness-projection.stderr
index f9480c880..f9480c880 100644
--- a/src/test/ui/mir-dataflow/liveness-projection.stderr
+++ b/tests/ui/mir-dataflow/liveness-projection.stderr
diff --git a/src/test/ui/mir-dataflow/liveness-ptr.rs b/tests/ui/mir-dataflow/liveness-ptr.rs
index 786da523a..786da523a 100644
--- a/src/test/ui/mir-dataflow/liveness-ptr.rs
+++ b/tests/ui/mir-dataflow/liveness-ptr.rs
diff --git a/src/test/ui/mir-dataflow/liveness-ptr.stderr b/tests/ui/mir-dataflow/liveness-ptr.stderr
index 858cdbac3..858cdbac3 100644
--- a/src/test/ui/mir-dataflow/liveness-ptr.stderr
+++ b/tests/ui/mir-dataflow/liveness-ptr.stderr
diff --git a/src/test/ui/mir-dataflow/uninits-1.rs b/tests/ui/mir-dataflow/uninits-1.rs
index c2b4284a7..c2b4284a7 100644
--- a/src/test/ui/mir-dataflow/uninits-1.rs
+++ b/tests/ui/mir-dataflow/uninits-1.rs
diff --git a/src/test/ui/mir-dataflow/uninits-1.stderr b/tests/ui/mir-dataflow/uninits-1.stderr
index c52f5ac7b..c52f5ac7b 100644
--- a/src/test/ui/mir-dataflow/uninits-1.stderr
+++ b/tests/ui/mir-dataflow/uninits-1.stderr
diff --git a/src/test/ui/mir-dataflow/uninits-2.rs b/tests/ui/mir-dataflow/uninits-2.rs
index c584ee74a..c584ee74a 100644
--- a/src/test/ui/mir-dataflow/uninits-2.rs
+++ b/tests/ui/mir-dataflow/uninits-2.rs
diff --git a/src/test/ui/mir-dataflow/uninits-2.stderr b/tests/ui/mir-dataflow/uninits-2.stderr
index 0ef954e35..0ef954e35 100644
--- a/src/test/ui/mir-dataflow/uninits-2.stderr
+++ b/tests/ui/mir-dataflow/uninits-2.stderr
diff --git a/src/test/ui/mir-unpretty.rs b/tests/ui/mir-unpretty.rs
index 30620c69f..30620c69f 100644
--- a/src/test/ui/mir-unpretty.rs
+++ b/tests/ui/mir-unpretty.rs
diff --git a/src/test/ui/mir-unpretty.stderr b/tests/ui/mir-unpretty.stderr
index 3808f8583..3808f8583 100644
--- a/src/test/ui/mir-unpretty.stderr
+++ b/tests/ui/mir-unpretty.stderr
diff --git a/src/test/ui/mir/auxiliary/issue_76375_aux.rs b/tests/ui/mir/auxiliary/issue_76375_aux.rs
index 90f4df739..90f4df739 100644
--- a/src/test/ui/mir/auxiliary/issue_76375_aux.rs
+++ b/tests/ui/mir/auxiliary/issue_76375_aux.rs
diff --git a/src/test/ui/mir/auxiliary/mir_external_refs.rs b/tests/ui/mir/auxiliary/mir_external_refs.rs
index 9fd58f1d7..9fd58f1d7 100644
--- a/src/test/ui/mir/auxiliary/mir_external_refs.rs
+++ b/tests/ui/mir/auxiliary/mir_external_refs.rs
diff --git a/src/test/ui/mir/drop-elaboration-after-borrowck-error.rs b/tests/ui/mir/drop-elaboration-after-borrowck-error.rs
index 624b464ec..624b464ec 100644
--- a/src/test/ui/mir/drop-elaboration-after-borrowck-error.rs
+++ b/tests/ui/mir/drop-elaboration-after-borrowck-error.rs
diff --git a/src/test/ui/mir/drop-elaboration-after-borrowck-error.stderr b/tests/ui/mir/drop-elaboration-after-borrowck-error.stderr
index d96106172..d96106172 100644
--- a/src/test/ui/mir/drop-elaboration-after-borrowck-error.stderr
+++ b/tests/ui/mir/drop-elaboration-after-borrowck-error.stderr
diff --git a/src/test/ui/mir/important-higher-ranked-regions.rs b/tests/ui/mir/important-higher-ranked-regions.rs
index cadfb3b66..cadfb3b66 100644
--- a/src/test/ui/mir/important-higher-ranked-regions.rs
+++ b/tests/ui/mir/important-higher-ranked-regions.rs
diff --git a/src/test/ui/mir/issue-101844.rs b/tests/ui/mir/issue-101844.rs
index da8a25f5f..da8a25f5f 100644
--- a/src/test/ui/mir/issue-101844.rs
+++ b/tests/ui/mir/issue-101844.rs
diff --git a/src/test/ui/mir/issue-102389.rs b/tests/ui/mir/issue-102389.rs
index 8b27d5e55..8b27d5e55 100644
--- a/src/test/ui/mir/issue-102389.rs
+++ b/tests/ui/mir/issue-102389.rs
diff --git a/src/test/ui/mir/issue-102389.stderr b/tests/ui/mir/issue-102389.stderr
index 925dc258a..925dc258a 100644
--- a/src/test/ui/mir/issue-102389.stderr
+++ b/tests/ui/mir/issue-102389.stderr
diff --git a/tests/ui/mir/issue-105809.rs b/tests/ui/mir/issue-105809.rs
new file mode 100644
index 000000000..57828feef
--- /dev/null
+++ b/tests/ui/mir/issue-105809.rs
@@ -0,0 +1,36 @@
+// Non-regression test ICE from issue #105809 and duplicates.
+
+// build-pass: the ICE is during codegen
+// compile-flags: --edition 2018 -Zmir-opt-level=1
+
+use std::{future::Future, pin::Pin};
+
+// Create a `T` without affecting analysis like `loop {}`.
+fn create<T>() -> T {
+    loop {}
+}
+
+async fn trivial_future() {}
+
+struct Connection<H> {
+    _h: H,
+}
+
+async fn complex_future<H>(conn: &Connection<H>) {
+    let small_fut = async move {
+        let _ = conn;
+        trivial_future().await;
+    };
+
+    let mut tuple = (small_fut,);
+    let (small_fut_again,) = &mut tuple;
+    let _ = small_fut_again;
+}
+
+fn main() {
+    let mut fut = complex_future(&Connection { _h: () });
+
+    let mut cx = create();
+    let future = unsafe { Pin::new_unchecked(&mut fut) };
+    let _ = future.poll(&mut cx);
+}
diff --git a/tests/ui/mir/issue-106062.rs b/tests/ui/mir/issue-106062.rs
new file mode 100644
index 000000000..621ba566e
--- /dev/null
+++ b/tests/ui/mir/issue-106062.rs
@@ -0,0 +1,26 @@
+// edition:2018
+
+use std::{future::Future, marker::PhantomData};
+
+fn spawn<T>(future: T) -> PhantomData<T::Output>
+where
+    T: Future,
+{
+    loop {}
+}
+
+#[derive(Debug)]
+struct IncomingServer {}
+impl IncomingServer {
+    async fn connection_handler(handler: impl Sized) -> Result<Ok, std::io::Error> {
+        //~^ ERROR expected type, found variant `Ok` [E0573]
+        loop {}
+    }
+    async fn spawn(&self, request_handler: impl Sized) {
+        async move {
+            spawn(Self::connection_handler(&request_handler));
+        };
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/mir/issue-106062.stderr b/tests/ui/mir/issue-106062.stderr
new file mode 100644
index 000000000..2f6524d03
--- /dev/null
+++ b/tests/ui/mir/issue-106062.stderr
@@ -0,0 +1,16 @@
+error[E0573]: expected type, found variant `Ok`
+  --> $DIR/issue-106062.rs:15:64
+   |
+LL |     async fn connection_handler(handler: impl Sized) -> Result<Ok, std::io::Error> {
+   |                                                                ^^ not a type
+   |
+help: try using the variant's enum
+   |
+LL |     async fn connection_handler(handler: impl Sized) -> Result<core::result::Result, std::io::Error> {
+   |                                                                ~~~~~~~~~~~~~~~~~~~~
+LL |     async fn connection_handler(handler: impl Sized) -> Result<std::result::Result, std::io::Error> {
+   |                                                                ~~~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0573`.
diff --git a/src/test/ui/issues/issue-29227.rs b/tests/ui/mir/issue-29227.rs
index e9dfc2840..e9dfc2840 100644
--- a/src/test/ui/issues/issue-29227.rs
+++ b/tests/ui/mir/issue-29227.rs
diff --git a/src/test/ui/issues/issue-46845.rs b/tests/ui/mir/issue-46845.rs
index fc85b2551..fc85b2551 100644
--- a/src/test/ui/issues/issue-46845.rs
+++ b/tests/ui/mir/issue-46845.rs
diff --git a/src/test/ui/mir/issue-60390.rs b/tests/ui/mir/issue-60390.rs
index fd9d6b46d..fd9d6b46d 100644
--- a/src/test/ui/mir/issue-60390.rs
+++ b/tests/ui/mir/issue-60390.rs
diff --git a/src/test/ui/mir/issue-66851.rs b/tests/ui/mir/issue-66851.rs
index 878ad4e47..878ad4e47 100644
--- a/src/test/ui/mir/issue-66851.rs
+++ b/tests/ui/mir/issue-66851.rs
diff --git a/src/test/ui/mir/issue-66930.rs b/tests/ui/mir/issue-66930.rs
index 5f9eb2bf4..5f9eb2bf4 100644
--- a/src/test/ui/mir/issue-66930.rs
+++ b/tests/ui/mir/issue-66930.rs
diff --git a/src/test/ui/mir/issue-67639-normalization-ice.rs b/tests/ui/mir/issue-67639-normalization-ice.rs
index 71150a80b..71150a80b 100644
--- a/src/test/ui/mir/issue-67639-normalization-ice.rs
+++ b/tests/ui/mir/issue-67639-normalization-ice.rs
diff --git a/src/test/ui/mir/issue-67710-inline-projection.rs b/tests/ui/mir/issue-67710-inline-projection.rs
index 1ff6b4d62..1ff6b4d62 100644
--- a/src/test/ui/mir/issue-67710-inline-projection.rs
+++ b/tests/ui/mir/issue-67710-inline-projection.rs
diff --git a/src/test/ui/mir/issue-67947.rs b/tests/ui/mir/issue-67947.rs
index f73d38f80..f73d38f80 100644
--- a/src/test/ui/mir/issue-67947.rs
+++ b/tests/ui/mir/issue-67947.rs
diff --git a/src/test/ui/mir/issue-67947.stderr b/tests/ui/mir/issue-67947.stderr
index 7697a411e..7697a411e 100644
--- a/src/test/ui/mir/issue-67947.stderr
+++ b/tests/ui/mir/issue-67947.stderr
diff --git a/src/test/ui/mir/issue-68841.rs b/tests/ui/mir/issue-68841.rs
index 550bd452a..550bd452a 100644
--- a/src/test/ui/mir/issue-68841.rs
+++ b/tests/ui/mir/issue-68841.rs
diff --git a/src/test/ui/mir/issue-71793-inline-args-storage.rs b/tests/ui/mir/issue-71793-inline-args-storage.rs
index 18f2e38d1..18f2e38d1 100644
--- a/src/test/ui/mir/issue-71793-inline-args-storage.rs
+++ b/tests/ui/mir/issue-71793-inline-args-storage.rs
diff --git a/src/test/ui/mir/issue-73914.rs b/tests/ui/mir/issue-73914.rs
index 1e99faade..1e99faade 100644
--- a/src/test/ui/mir/issue-73914.rs
+++ b/tests/ui/mir/issue-73914.rs
diff --git a/src/test/ui/mir/issue-74739.rs b/tests/ui/mir/issue-74739.rs
index 03622358a..03622358a 100644
--- a/src/test/ui/mir/issue-74739.rs
+++ b/tests/ui/mir/issue-74739.rs
diff --git a/src/test/ui/mir/issue-75053.rs b/tests/ui/mir/issue-75053.rs
index cb56eaa0b..cb56eaa0b 100644
--- a/src/test/ui/mir/issue-75053.rs
+++ b/tests/ui/mir/issue-75053.rs
diff --git a/src/test/ui/mir/issue-75053.stderr b/tests/ui/mir/issue-75053.stderr
index 64e59e6c4..64e59e6c4 100644
--- a/src/test/ui/mir/issue-75053.stderr
+++ b/tests/ui/mir/issue-75053.stderr
diff --git a/src/test/ui/mir/issue-75419-validation-impl-trait.rs b/tests/ui/mir/issue-75419-validation-impl-trait.rs
index a8741befb..a8741befb 100644
--- a/src/test/ui/mir/issue-75419-validation-impl-trait.rs
+++ b/tests/ui/mir/issue-75419-validation-impl-trait.rs
diff --git a/src/test/ui/mir/issue-76248.rs b/tests/ui/mir/issue-76248.rs
index 18473e79e..18473e79e 100644
--- a/src/test/ui/mir/issue-76248.rs
+++ b/tests/ui/mir/issue-76248.rs
diff --git a/src/test/ui/mir/issue-76375.rs b/tests/ui/mir/issue-76375.rs
index e635caca9..e635caca9 100644
--- a/src/test/ui/mir/issue-76375.rs
+++ b/tests/ui/mir/issue-76375.rs
diff --git a/src/test/ui/mir/issue-76740-copy-propagation.rs b/tests/ui/mir/issue-76740-copy-propagation.rs
index 1d4ec1176..1d4ec1176 100644
--- a/src/test/ui/mir/issue-76740-copy-propagation.rs
+++ b/tests/ui/mir/issue-76740-copy-propagation.rs
diff --git a/src/test/ui/mir/issue-76803-branches-not-same.rs b/tests/ui/mir/issue-76803-branches-not-same.rs
index a6a576220..a6a576220 100644
--- a/src/test/ui/mir/issue-76803-branches-not-same.rs
+++ b/tests/ui/mir/issue-76803-branches-not-same.rs
diff --git a/src/test/ui/issues/issue-77002.rs b/tests/ui/mir/issue-77002.rs
index 0c37346ea..0c37346ea 100644
--- a/src/test/ui/issues/issue-77002.rs
+++ b/tests/ui/mir/issue-77002.rs
diff --git a/src/test/ui/mir/issue-77359-simplify-arm-identity.rs b/tests/ui/mir/issue-77359-simplify-arm-identity.rs
index e58ba50a9..e58ba50a9 100644
--- a/src/test/ui/mir/issue-77359-simplify-arm-identity.rs
+++ b/tests/ui/mir/issue-77359-simplify-arm-identity.rs
diff --git a/src/test/ui/mir/issue-77911.rs b/tests/ui/mir/issue-77911.rs
index acf4c2054..acf4c2054 100644
--- a/src/test/ui/mir/issue-77911.rs
+++ b/tests/ui/mir/issue-77911.rs
diff --git a/src/test/ui/mir/issue-78496.rs b/tests/ui/mir/issue-78496.rs
index a0d1f5a78..a0d1f5a78 100644
--- a/src/test/ui/mir/issue-78496.rs
+++ b/tests/ui/mir/issue-78496.rs
diff --git a/src/test/ui/mir/issue-80949.rs b/tests/ui/mir/issue-80949.rs
index 7e34a4f5c..7e34a4f5c 100644
--- a/src/test/ui/mir/issue-80949.rs
+++ b/tests/ui/mir/issue-80949.rs
diff --git a/src/test/ui/mir/issue-83499-input-output-iteration-ice.rs b/tests/ui/mir/issue-83499-input-output-iteration-ice.rs
index 0086d2ec1..0086d2ec1 100644
--- a/src/test/ui/mir/issue-83499-input-output-iteration-ice.rs
+++ b/tests/ui/mir/issue-83499-input-output-iteration-ice.rs
diff --git a/src/test/ui/mir/issue-83499-input-output-iteration-ice.stderr b/tests/ui/mir/issue-83499-input-output-iteration-ice.stderr
index 4eb3adc8b..4eb3adc8b 100644
--- a/src/test/ui/mir/issue-83499-input-output-iteration-ice.stderr
+++ b/tests/ui/mir/issue-83499-input-output-iteration-ice.stderr
diff --git a/src/test/ui/mir/issue-89485.rs b/tests/ui/mir/issue-89485.rs
index cb507eefe..cb507eefe 100644
--- a/src/test/ui/mir/issue-89485.rs
+++ b/tests/ui/mir/issue-89485.rs
diff --git a/src/test/ui/mir/issue-91745.rs b/tests/ui/mir/issue-91745.rs
index ca3d66b1c..ca3d66b1c 100644
--- a/src/test/ui/mir/issue-91745.rs
+++ b/tests/ui/mir/issue-91745.rs
diff --git a/src/test/ui/mir/issue-92893.rs b/tests/ui/mir/issue-92893.rs
index 635050f37..635050f37 100644
--- a/src/test/ui/mir/issue-92893.rs
+++ b/tests/ui/mir/issue-92893.rs
diff --git a/src/test/ui/mir/issue-92893.stderr b/tests/ui/mir/issue-92893.stderr
index 4a0fcce31..4a0fcce31 100644
--- a/src/test/ui/mir/issue-92893.stderr
+++ b/tests/ui/mir/issue-92893.stderr
diff --git a/src/test/ui/mir/issue-99852.rs b/tests/ui/mir/issue-99852.rs
index 1c675788e..1c675788e 100644
--- a/src/test/ui/mir/issue-99852.rs
+++ b/tests/ui/mir/issue-99852.rs
diff --git a/src/test/ui/mir/issue-99866.rs b/tests/ui/mir/issue-99866.rs
index d39ae6ebf..d39ae6ebf 100644
--- a/src/test/ui/mir/issue-99866.rs
+++ b/tests/ui/mir/issue-99866.rs
diff --git a/src/test/ui/mir/issue66339.rs b/tests/ui/mir/issue66339.rs
index 2507af38c..2507af38c 100644
--- a/src/test/ui/mir/issue66339.rs
+++ b/tests/ui/mir/issue66339.rs
diff --git a/src/test/ui/mir/mir-inlining/array-clone-with-generic-size.rs b/tests/ui/mir/mir-inlining/array-clone-with-generic-size.rs
index e36e8bd74..e36e8bd74 100644
--- a/src/test/ui/mir/mir-inlining/array-clone-with-generic-size.rs
+++ b/tests/ui/mir/mir-inlining/array-clone-with-generic-size.rs
diff --git a/src/test/ui/mir/mir-inlining/ice-issue-100550-unnormalized-projection.rs b/tests/ui/mir/mir-inlining/ice-issue-100550-unnormalized-projection.rs
index f67b07354..f67b07354 100644
--- a/src/test/ui/mir/mir-inlining/ice-issue-100550-unnormalized-projection.rs
+++ b/tests/ui/mir/mir-inlining/ice-issue-100550-unnormalized-projection.rs
diff --git a/src/test/ui/mir/mir-inlining/ice-issue-45493.rs b/tests/ui/mir/mir-inlining/ice-issue-45493.rs
index 04a23212e..04a23212e 100644
--- a/src/test/ui/mir/mir-inlining/ice-issue-45493.rs
+++ b/tests/ui/mir/mir-inlining/ice-issue-45493.rs
diff --git a/src/test/ui/mir/mir-inlining/ice-issue-45885.rs b/tests/ui/mir/mir-inlining/ice-issue-45885.rs
index 09b1279ef..09b1279ef 100644
--- a/src/test/ui/mir/mir-inlining/ice-issue-45885.rs
+++ b/tests/ui/mir/mir-inlining/ice-issue-45885.rs
diff --git a/src/test/ui/mir/mir-inlining/ice-issue-68347.rs b/tests/ui/mir/mir-inlining/ice-issue-68347.rs
index 7c1352509..7c1352509 100644
--- a/src/test/ui/mir/mir-inlining/ice-issue-68347.rs
+++ b/tests/ui/mir/mir-inlining/ice-issue-68347.rs
diff --git a/src/test/ui/mir/mir-inlining/ice-issue-77306-1.rs b/tests/ui/mir/mir-inlining/ice-issue-77306-1.rs
index ef05ff9ce..ef05ff9ce 100644
--- a/src/test/ui/mir/mir-inlining/ice-issue-77306-1.rs
+++ b/tests/ui/mir/mir-inlining/ice-issue-77306-1.rs
diff --git a/src/test/ui/mir/mir-inlining/ice-issue-77306-2.rs b/tests/ui/mir/mir-inlining/ice-issue-77306-2.rs
index cb2084013..cb2084013 100644
--- a/src/test/ui/mir/mir-inlining/ice-issue-77306-2.rs
+++ b/tests/ui/mir/mir-inlining/ice-issue-77306-2.rs
diff --git a/src/test/ui/mir/mir-inlining/ice-issue-77564.rs b/tests/ui/mir/mir-inlining/ice-issue-77564.rs
index 0d3fbfe5d..0d3fbfe5d 100644
--- a/src/test/ui/mir/mir-inlining/ice-issue-77564.rs
+++ b/tests/ui/mir/mir-inlining/ice-issue-77564.rs
diff --git a/src/test/ui/mir/mir-inlining/no-trait-method-issue-40473.rs b/tests/ui/mir/mir-inlining/no-trait-method-issue-40473.rs
index 8b3cb703d..8b3cb703d 100644
--- a/src/test/ui/mir/mir-inlining/no-trait-method-issue-40473.rs
+++ b/tests/ui/mir/mir-inlining/no-trait-method-issue-40473.rs
diff --git a/src/test/ui/mir/mir-inlining/var-debuginfo-issue-67586.rs b/tests/ui/mir/mir-inlining/var-debuginfo-issue-67586.rs
index e26206826..e26206826 100644
--- a/src/test/ui/mir/mir-inlining/var-debuginfo-issue-67586.rs
+++ b/tests/ui/mir/mir-inlining/var-debuginfo-issue-67586.rs
diff --git a/src/test/ui/mir/mir-typeck-normalize-fn-sig.rs b/tests/ui/mir/mir-typeck-normalize-fn-sig.rs
index bdd9321af..bdd9321af 100644
--- a/src/test/ui/mir/mir-typeck-normalize-fn-sig.rs
+++ b/tests/ui/mir/mir-typeck-normalize-fn-sig.rs
diff --git a/src/test/ui/mir/mir_adt_construction.rs b/tests/ui/mir/mir_adt_construction.rs
index 9fb5896de..9fb5896de 100644
--- a/src/test/ui/mir/mir_adt_construction.rs
+++ b/tests/ui/mir/mir_adt_construction.rs
diff --git a/src/test/ui/mir/mir_ascription_coercion.rs b/tests/ui/mir/mir_ascription_coercion.rs
index 9e04d6019..9e04d6019 100644
--- a/src/test/ui/mir/mir_ascription_coercion.rs
+++ b/tests/ui/mir/mir_ascription_coercion.rs
diff --git a/src/test/ui/mir/mir_assign_eval_order.rs b/tests/ui/mir/mir_assign_eval_order.rs
index 799bf7f3a..799bf7f3a 100644
--- a/src/test/ui/mir/mir_assign_eval_order.rs
+++ b/tests/ui/mir/mir_assign_eval_order.rs
diff --git a/src/test/ui/mir/mir_augmented_assignments.rs b/tests/ui/mir/mir_augmented_assignments.rs
index 44454f8f4..44454f8f4 100644
--- a/src/test/ui/mir/mir_augmented_assignments.rs
+++ b/tests/ui/mir/mir_augmented_assignments.rs
diff --git a/src/test/ui/mir/mir_autoderef.rs b/tests/ui/mir/mir_autoderef.rs
index a0e615a73..a0e615a73 100644
--- a/src/test/ui/mir/mir_autoderef.rs
+++ b/tests/ui/mir/mir_autoderef.rs
diff --git a/src/test/ui/mir/mir_boxing.rs b/tests/ui/mir/mir_boxing.rs
index 83e1cfb64..83e1cfb64 100644
--- a/src/test/ui/mir/mir_boxing.rs
+++ b/tests/ui/mir/mir_boxing.rs
diff --git a/src/test/ui/mir/mir_build_match_comparisons.rs b/tests/ui/mir/mir_build_match_comparisons.rs
index 045700557..045700557 100644
--- a/src/test/ui/mir/mir_build_match_comparisons.rs
+++ b/tests/ui/mir/mir_build_match_comparisons.rs
diff --git a/src/test/ui/mir/mir_call_with_associated_type.rs b/tests/ui/mir/mir_call_with_associated_type.rs
index 7103533e1..7103533e1 100644
--- a/src/test/ui/mir/mir_call_with_associated_type.rs
+++ b/tests/ui/mir/mir_call_with_associated_type.rs
diff --git a/src/test/ui/mir/mir_calls_to_shims.rs b/tests/ui/mir/mir_calls_to_shims.rs
index 9dc0acfbf..9dc0acfbf 100644
--- a/src/test/ui/mir/mir_calls_to_shims.rs
+++ b/tests/ui/mir/mir_calls_to_shims.rs
diff --git a/src/test/ui/mir/mir_cast_fn_ret.rs b/tests/ui/mir/mir_cast_fn_ret.rs
index 4574dbd85..4574dbd85 100644
--- a/src/test/ui/mir/mir_cast_fn_ret.rs
+++ b/tests/ui/mir/mir_cast_fn_ret.rs
diff --git a/src/test/ui/mir/mir_codegen_array.rs b/tests/ui/mir/mir_codegen_array.rs
index 38e443d8e..38e443d8e 100644
--- a/src/test/ui/mir/mir_codegen_array.rs
+++ b/tests/ui/mir/mir_codegen_array.rs
diff --git a/src/test/ui/mir/mir_codegen_array_2.rs b/tests/ui/mir/mir_codegen_array_2.rs
index 03d3aa5ad..03d3aa5ad 100644
--- a/src/test/ui/mir/mir_codegen_array_2.rs
+++ b/tests/ui/mir/mir_codegen_array_2.rs
diff --git a/src/test/ui/mir/mir_codegen_call_converging.rs b/tests/ui/mir/mir_codegen_call_converging.rs
index 9c340e4e0..9c340e4e0 100644
--- a/src/test/ui/mir/mir_codegen_call_converging.rs
+++ b/tests/ui/mir/mir_codegen_call_converging.rs
diff --git a/src/test/ui/mir/mir_codegen_calls.rs b/tests/ui/mir/mir_codegen_calls.rs
index 6a5a4dace..6a5a4dace 100644
--- a/src/test/ui/mir/mir_codegen_calls.rs
+++ b/tests/ui/mir/mir_codegen_calls.rs
diff --git a/src/test/ui/mir/mir_codegen_calls_converging_drops.rs b/tests/ui/mir/mir_codegen_calls_converging_drops.rs
index b562f9308..b562f9308 100644
--- a/src/test/ui/mir/mir_codegen_calls_converging_drops.rs
+++ b/tests/ui/mir/mir_codegen_calls_converging_drops.rs
diff --git a/src/test/ui/mir/mir_codegen_calls_converging_drops_2.rs b/tests/ui/mir/mir_codegen_calls_converging_drops_2.rs
index e9446da9e..e9446da9e 100644
--- a/src/test/ui/mir/mir_codegen_calls_converging_drops_2.rs
+++ b/tests/ui/mir/mir_codegen_calls_converging_drops_2.rs
diff --git a/src/test/ui/mir/mir_codegen_calls_diverging.rs b/tests/ui/mir/mir_codegen_calls_diverging.rs
index 736d580e2..736d580e2 100644
--- a/src/test/ui/mir/mir_codegen_calls_diverging.rs
+++ b/tests/ui/mir/mir_codegen_calls_diverging.rs
diff --git a/src/test/ui/mir/mir_codegen_calls_diverging_drops.rs b/tests/ui/mir/mir_codegen_calls_diverging_drops.rs
index 19dba4970..19dba4970 100644
--- a/src/test/ui/mir/mir_codegen_calls_diverging_drops.rs
+++ b/tests/ui/mir/mir_codegen_calls_diverging_drops.rs
diff --git a/src/test/ui/mir/mir_codegen_critical_edge.rs b/tests/ui/mir/mir_codegen_critical_edge.rs
index 5c1f1c3b7..5c1f1c3b7 100644
--- a/src/test/ui/mir/mir_codegen_critical_edge.rs
+++ b/tests/ui/mir/mir_codegen_critical_edge.rs
diff --git a/src/test/ui/mir/mir_codegen_spike1.rs b/tests/ui/mir/mir_codegen_spike1.rs
index 90bdd6b4b..90bdd6b4b 100644
--- a/src/test/ui/mir/mir_codegen_spike1.rs
+++ b/tests/ui/mir/mir_codegen_spike1.rs
diff --git a/src/test/ui/mir/mir_codegen_switch.rs b/tests/ui/mir/mir_codegen_switch.rs
index 9c93499d9..9c93499d9 100644
--- a/src/test/ui/mir/mir_codegen_switch.rs
+++ b/tests/ui/mir/mir_codegen_switch.rs
diff --git a/src/test/ui/mir/mir_codegen_switchint.rs b/tests/ui/mir/mir_codegen_switchint.rs
index c092a6c31..c092a6c31 100644
--- a/src/test/ui/mir/mir_codegen_switchint.rs
+++ b/tests/ui/mir/mir_codegen_switchint.rs
diff --git a/src/test/ui/mir/mir_coercion_casts.rs b/tests/ui/mir/mir_coercion_casts.rs
index 7d761181d..7d761181d 100644
--- a/src/test/ui/mir/mir_coercion_casts.rs
+++ b/tests/ui/mir/mir_coercion_casts.rs
diff --git a/src/test/ui/mir/mir_coercions.rs b/tests/ui/mir/mir_coercions.rs
index f3dcc6b85..f3dcc6b85 100644
--- a/src/test/ui/mir/mir_coercions.rs
+++ b/tests/ui/mir/mir_coercions.rs
diff --git a/src/test/ui/mir/mir_const_prop_identity.rs b/tests/ui/mir/mir_const_prop_identity.rs
index 25d2202b9..25d2202b9 100644
--- a/src/test/ui/mir/mir_const_prop_identity.rs
+++ b/tests/ui/mir/mir_const_prop_identity.rs
diff --git a/src/test/ui/mir/mir_const_prop_tuple_field_reorder.rs b/tests/ui/mir/mir_const_prop_tuple_field_reorder.rs
index b66a85d07..b66a85d07 100644
--- a/src/test/ui/mir/mir_const_prop_tuple_field_reorder.rs
+++ b/tests/ui/mir/mir_const_prop_tuple_field_reorder.rs
diff --git a/src/test/ui/mir/mir_constval_adts.rs b/tests/ui/mir/mir_constval_adts.rs
index ee9d73451..ee9d73451 100644
--- a/src/test/ui/mir/mir_constval_adts.rs
+++ b/tests/ui/mir/mir_constval_adts.rs
diff --git a/src/test/ui/mir/mir_detects_invalid_ops.rs b/tests/ui/mir/mir_detects_invalid_ops.rs
index 136c03cd9..136c03cd9 100644
--- a/src/test/ui/mir/mir_detects_invalid_ops.rs
+++ b/tests/ui/mir/mir_detects_invalid_ops.rs
diff --git a/src/test/ui/mir/mir_detects_invalid_ops.stderr b/tests/ui/mir/mir_detects_invalid_ops.stderr
index 0fe56f417..0fe56f417 100644
--- a/src/test/ui/mir/mir_detects_invalid_ops.stderr
+++ b/tests/ui/mir/mir_detects_invalid_ops.stderr
diff --git a/src/test/ui/mir/mir_drop_order.rs b/tests/ui/mir/mir_drop_order.rs
index 75f5b171a..75f5b171a 100644
--- a/src/test/ui/mir/mir_drop_order.rs
+++ b/tests/ui/mir/mir_drop_order.rs
diff --git a/src/test/ui/mir/mir_drop_panics.rs b/tests/ui/mir/mir_drop_panics.rs
index 0d00426d6..0d00426d6 100644
--- a/src/test/ui/mir/mir_drop_panics.rs
+++ b/tests/ui/mir/mir_drop_panics.rs
diff --git a/src/test/ui/mir/mir_dynamic_drops_1.rs b/tests/ui/mir/mir_dynamic_drops_1.rs
index 2b33b6166..2b33b6166 100644
--- a/src/test/ui/mir/mir_dynamic_drops_1.rs
+++ b/tests/ui/mir/mir_dynamic_drops_1.rs
diff --git a/src/test/ui/mir/mir_dynamic_drops_2.rs b/tests/ui/mir/mir_dynamic_drops_2.rs
index c883efdab..c883efdab 100644
--- a/src/test/ui/mir/mir_dynamic_drops_2.rs
+++ b/tests/ui/mir/mir_dynamic_drops_2.rs
diff --git a/src/test/ui/mir/mir_dynamic_drops_3.rs b/tests/ui/mir/mir_dynamic_drops_3.rs
index 2bcd9fac5..2bcd9fac5 100644
--- a/src/test/ui/mir/mir_dynamic_drops_3.rs
+++ b/tests/ui/mir/mir_dynamic_drops_3.rs
diff --git a/src/test/ui/mir/mir_early_return_scope.rs b/tests/ui/mir/mir_early_return_scope.rs
index a696471c3..a696471c3 100644
--- a/src/test/ui/mir/mir_early_return_scope.rs
+++ b/tests/ui/mir/mir_early_return_scope.rs
diff --git a/src/test/ui/mir/mir_fat_ptr.rs b/tests/ui/mir/mir_fat_ptr.rs
index 7c3e07c9e..7c3e07c9e 100644
--- a/src/test/ui/mir/mir_fat_ptr.rs
+++ b/tests/ui/mir/mir_fat_ptr.rs
diff --git a/src/test/ui/mir/mir_fat_ptr_drop.rs b/tests/ui/mir/mir_fat_ptr_drop.rs
index d865c3499..d865c3499 100644
--- a/src/test/ui/mir/mir_fat_ptr_drop.rs
+++ b/tests/ui/mir/mir_fat_ptr_drop.rs
diff --git a/src/test/ui/mir/mir_heavy_promoted.rs b/tests/ui/mir/mir_heavy_promoted.rs
index 092299880..092299880 100644
--- a/src/test/ui/mir/mir_heavy_promoted.rs
+++ b/tests/ui/mir/mir_heavy_promoted.rs
diff --git a/src/test/ui/mir/mir_indexing_oob_1.rs b/tests/ui/mir/mir_indexing_oob_1.rs
index 6d769b6b2..6d769b6b2 100644
--- a/src/test/ui/mir/mir_indexing_oob_1.rs
+++ b/tests/ui/mir/mir_indexing_oob_1.rs
diff --git a/src/test/ui/mir/mir_indexing_oob_2.rs b/tests/ui/mir/mir_indexing_oob_2.rs
index a9e850570..a9e850570 100644
--- a/src/test/ui/mir/mir_indexing_oob_2.rs
+++ b/tests/ui/mir/mir_indexing_oob_2.rs
diff --git a/src/test/ui/mir/mir_indexing_oob_3.rs b/tests/ui/mir/mir_indexing_oob_3.rs
index 4f5cab59b..4f5cab59b 100644
--- a/src/test/ui/mir/mir_indexing_oob_3.rs
+++ b/tests/ui/mir/mir_indexing_oob_3.rs
diff --git a/src/test/ui/mir/mir_let_chains_drop_order.rs b/tests/ui/mir/mir_let_chains_drop_order.rs
index 6471553e9..6471553e9 100644
--- a/src/test/ui/mir/mir_let_chains_drop_order.rs
+++ b/tests/ui/mir/mir_let_chains_drop_order.rs
diff --git a/src/test/ui/mir/mir_match_arm_guard.rs b/tests/ui/mir/mir_match_arm_guard.rs
index 65e4ed041..65e4ed041 100644
--- a/src/test/ui/mir/mir_match_arm_guard.rs
+++ b/tests/ui/mir/mir_match_arm_guard.rs
diff --git a/src/test/ui/mir/mir_match_test.rs b/tests/ui/mir/mir_match_test.rs
index 1f96d6737..1f96d6737 100644
--- a/src/test/ui/mir/mir_match_test.rs
+++ b/tests/ui/mir/mir_match_test.rs
diff --git a/src/test/ui/mir/mir_misc_casts.rs b/tests/ui/mir/mir_misc_casts.rs
index 2e7fbeee5..2e7fbeee5 100644
--- a/src/test/ui/mir/mir_misc_casts.rs
+++ b/tests/ui/mir/mir_misc_casts.rs
diff --git a/src/test/ui/mir/mir_overflow_off.rs b/tests/ui/mir/mir_overflow_off.rs
index 0098584dd..0098584dd 100644
--- a/src/test/ui/mir/mir_overflow_off.rs
+++ b/tests/ui/mir/mir_overflow_off.rs
diff --git a/src/test/ui/mir/mir_raw_fat_ptr.rs b/tests/ui/mir/mir_raw_fat_ptr.rs
index 6aceefbe7..6aceefbe7 100644
--- a/src/test/ui/mir/mir_raw_fat_ptr.rs
+++ b/tests/ui/mir/mir_raw_fat_ptr.rs
diff --git a/src/test/ui/mir/mir_refs_correct.rs b/tests/ui/mir/mir_refs_correct.rs
index 6cd9526b7..6cd9526b7 100644
--- a/src/test/ui/mir/mir_refs_correct.rs
+++ b/tests/ui/mir/mir_refs_correct.rs
diff --git a/src/test/ui/mir/mir_small_agg_arg.rs b/tests/ui/mir/mir_small_agg_arg.rs
index 5a22a0420..5a22a0420 100644
--- a/src/test/ui/mir/mir_small_agg_arg.rs
+++ b/tests/ui/mir/mir_small_agg_arg.rs
diff --git a/src/test/ui/mir/mir_static_subtype.rs b/tests/ui/mir/mir_static_subtype.rs
index d471b8f14..d471b8f14 100644
--- a/src/test/ui/mir/mir_static_subtype.rs
+++ b/tests/ui/mir/mir_static_subtype.rs
diff --git a/src/test/ui/mir/mir_struct_with_assoc_ty.rs b/tests/ui/mir/mir_struct_with_assoc_ty.rs
index 26d026bdf..26d026bdf 100644
--- a/src/test/ui/mir/mir_struct_with_assoc_ty.rs
+++ b/tests/ui/mir/mir_struct_with_assoc_ty.rs
diff --git a/src/test/ui/mir/mir_temp_promotions.rs b/tests/ui/mir/mir_temp_promotions.rs
index 845dc4c04..845dc4c04 100644
--- a/src/test/ui/mir/mir_temp_promotions.rs
+++ b/tests/ui/mir/mir_temp_promotions.rs
diff --git a/src/test/ui/mir/mir_void_return.rs b/tests/ui/mir/mir_void_return.rs
index d257affc2..d257affc2 100644
--- a/src/test/ui/mir/mir_void_return.rs
+++ b/tests/ui/mir/mir_void_return.rs
diff --git a/src/test/ui/mir/mir_void_return_2.rs b/tests/ui/mir/mir_void_return_2.rs
index a1fb0a7db..a1fb0a7db 100644
--- a/src/test/ui/mir/mir_void_return_2.rs
+++ b/tests/ui/mir/mir_void_return_2.rs
diff --git a/src/test/ui/mir/remove-zsts-query-cycle.rs b/tests/ui/mir/remove-zsts-query-cycle.rs
index be4d68f2d..be4d68f2d 100644
--- a/src/test/ui/mir/remove-zsts-query-cycle.rs
+++ b/tests/ui/mir/remove-zsts-query-cycle.rs
diff --git a/src/test/ui/mir/simplify-branch-same.rs b/tests/ui/mir/simplify-branch-same.rs
index d631c33d6..d631c33d6 100644
--- a/src/test/ui/mir/simplify-branch-same.rs
+++ b/tests/ui/mir/simplify-branch-same.rs
diff --git a/src/test/ui/mir/ssa-analysis-regression-50041.rs b/tests/ui/mir/ssa-analysis-regression-50041.rs
index ebc3e2f8c..ebc3e2f8c 100644
--- a/src/test/ui/mir/ssa-analysis-regression-50041.rs
+++ b/tests/ui/mir/ssa-analysis-regression-50041.rs
diff --git a/src/test/ui/mir/thir-constparam-temp.rs b/tests/ui/mir/thir-constparam-temp.rs
index cdc5910b3..cdc5910b3 100644
--- a/src/test/ui/mir/thir-constparam-temp.rs
+++ b/tests/ui/mir/thir-constparam-temp.rs
diff --git a/src/test/ui/mir/thir-constparam-temp.stderr b/tests/ui/mir/thir-constparam-temp.stderr
index b77d67e08..b77d67e08 100644
--- a/src/test/ui/mir/thir-constparam-temp.stderr
+++ b/tests/ui/mir/thir-constparam-temp.stderr
diff --git a/src/test/ui/mir/validate/issue-95978-validator-lifetime-comparison.rs b/tests/ui/mir/validate/issue-95978-validator-lifetime-comparison.rs
index cd6c5bf27..cd6c5bf27 100644
--- a/src/test/ui/mir/validate/issue-95978-validator-lifetime-comparison.rs
+++ b/tests/ui/mir/validate/issue-95978-validator-lifetime-comparison.rs
diff --git a/src/test/ui/mir/validate/needs-reveal-all.rs b/tests/ui/mir/validate/needs-reveal-all.rs
index 3852daf24..3852daf24 100644
--- a/src/test/ui/mir/validate/needs-reveal-all.rs
+++ b/tests/ui/mir/validate/needs-reveal-all.rs
diff --git a/src/test/ui/mismatched_types/E0053.rs b/tests/ui/mismatched_types/E0053.rs
index d3146ce54..d3146ce54 100644
--- a/src/test/ui/mismatched_types/E0053.rs
+++ b/tests/ui/mismatched_types/E0053.rs
diff --git a/src/test/ui/mismatched_types/E0053.stderr b/tests/ui/mismatched_types/E0053.stderr
index 54b419264..154f2fcbe 100644
--- a/src/test/ui/mismatched_types/E0053.stderr
+++ b/tests/ui/mismatched_types/E0053.stderr
@@ -12,8 +12,8 @@ note: type in trait
    |
 LL |     fn foo(x: u16);
    |               ^^^
-   = note: expected fn pointer `fn(u16)`
-              found fn pointer `fn(i16)`
+   = note: expected signature `fn(u16)`
+              found signature `fn(i16)`
 
 error[E0053]: method `bar` has an incompatible type for trait
   --> $DIR/E0053.rs:11:12
@@ -29,8 +29,8 @@ note: type in trait
    |
 LL |     fn bar(&self);
    |            ^^^^^
-   = note: expected fn pointer `fn(&Bar)`
-              found fn pointer `fn(&mut Bar)`
+   = note: expected signature `fn(&Bar)`
+              found signature `fn(&mut Bar)`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/mismatched_types/E0409.rs b/tests/ui/mismatched_types/E0409.rs
index 3710534cc..3710534cc 100644
--- a/src/test/ui/mismatched_types/E0409.rs
+++ b/tests/ui/mismatched_types/E0409.rs
diff --git a/src/test/ui/mismatched_types/E0409.stderr b/tests/ui/mismatched_types/E0409.stderr
index 7fec6ecd7..7fec6ecd7 100644
--- a/src/test/ui/mismatched_types/E0409.stderr
+++ b/tests/ui/mismatched_types/E0409.stderr
diff --git a/src/test/ui/mismatched_types/E0631.rs b/tests/ui/mismatched_types/E0631.rs
index 83dbdb77a..83dbdb77a 100644
--- a/src/test/ui/mismatched_types/E0631.rs
+++ b/tests/ui/mismatched_types/E0631.rs
diff --git a/src/test/ui/mismatched_types/E0631.stderr b/tests/ui/mismatched_types/E0631.stderr
index 410ea4b0b..410ea4b0b 100644
--- a/src/test/ui/mismatched_types/E0631.stderr
+++ b/tests/ui/mismatched_types/E0631.stderr
diff --git a/src/test/ui/mismatched_types/abridged.rs b/tests/ui/mismatched_types/abridged.rs
index 9a5c183ca..9a5c183ca 100644
--- a/src/test/ui/mismatched_types/abridged.rs
+++ b/tests/ui/mismatched_types/abridged.rs
diff --git a/src/test/ui/mismatched_types/abridged.stderr b/tests/ui/mismatched_types/abridged.stderr
index ff1a836c9..ff1a836c9 100644
--- a/src/test/ui/mismatched_types/abridged.stderr
+++ b/tests/ui/mismatched_types/abridged.stderr
diff --git a/src/test/ui/mismatched_types/assignment-operator-unimplemented.rs b/tests/ui/mismatched_types/assignment-operator-unimplemented.rs
index 21df464d5..21df464d5 100644
--- a/src/test/ui/mismatched_types/assignment-operator-unimplemented.rs
+++ b/tests/ui/mismatched_types/assignment-operator-unimplemented.rs
diff --git a/src/test/ui/mismatched_types/assignment-operator-unimplemented.stderr b/tests/ui/mismatched_types/assignment-operator-unimplemented.stderr
index ffd95b48a..2393791a9 100644
--- a/src/test/ui/mismatched_types/assignment-operator-unimplemented.stderr
+++ b/tests/ui/mismatched_types/assignment-operator-unimplemented.stderr
@@ -11,11 +11,8 @@ note: an implementation of `AddAssign<_>` might be missing for `Foo`
    |
 LL | struct Foo;
    | ^^^^^^^^^^ must implement `AddAssign<_>`
-note: the following trait must be implemented
+note: the trait `AddAssign` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait AddAssign<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/mismatched_types/binops.rs b/tests/ui/mismatched_types/binops.rs
index f359451df..f359451df 100644
--- a/src/test/ui/mismatched_types/binops.rs
+++ b/tests/ui/mismatched_types/binops.rs
diff --git a/src/test/ui/mismatched_types/binops.stderr b/tests/ui/mismatched_types/binops.stderr
index 3585587ed..3585587ed 100644
--- a/src/test/ui/mismatched_types/binops.stderr
+++ b/tests/ui/mismatched_types/binops.stderr
diff --git a/src/test/ui/mismatched_types/cast-rfc0401.rs b/tests/ui/mismatched_types/cast-rfc0401.rs
index 57222f459..57222f459 100644
--- a/src/test/ui/mismatched_types/cast-rfc0401.rs
+++ b/tests/ui/mismatched_types/cast-rfc0401.rs
diff --git a/src/test/ui/mismatched_types/cast-rfc0401.stderr b/tests/ui/mismatched_types/cast-rfc0401.stderr
index eab8e8e80..2a36a352c 100644
--- a/src/test/ui/mismatched_types/cast-rfc0401.stderr
+++ b/tests/ui/mismatched_types/cast-rfc0401.stderr
@@ -243,10 +243,12 @@ error[E0606]: casting `&{float}` as `f32` is invalid
   --> $DIR/cast-rfc0401.rs:71:30
    |
 LL |     vec![0.0].iter().map(|s| s as f32).collect::<Vec<f32>>();
-   |                              -^^^^^^^
-   |                              |
-   |                              cannot cast `&{float}` as `f32`
-   |                              help: dereference the expression: `*s`
+   |                              ^^^^^^^^
+   |
+help: dereference the expression
+   |
+LL |     vec![0.0].iter().map(|s| *s as f32).collect::<Vec<f32>>();
+   |                              +
 
 error: aborting due to 34 previous errors
 
diff --git a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.fixed b/tests/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.fixed
index efba0543b..efba0543b 100644
--- a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.fixed
+++ b/tests/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.fixed
diff --git a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.rs b/tests/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.rs
index 3ddb93d12..3ddb93d12 100644
--- a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.rs
+++ b/tests/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.rs
diff --git a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr b/tests/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr
index d7db90e50..d7db90e50 100644
--- a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr
+++ b/tests/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr
diff --git a/src/test/ui/mismatched_types/closure-arg-count.rs b/tests/ui/mismatched_types/closure-arg-count.rs
index 65c8d6a7e..65c8d6a7e 100644
--- a/src/test/ui/mismatched_types/closure-arg-count.rs
+++ b/tests/ui/mismatched_types/closure-arg-count.rs
diff --git a/src/test/ui/mismatched_types/closure-arg-count.stderr b/tests/ui/mismatched_types/closure-arg-count.stderr
index a02ec8198..2ecab9f02 100644
--- a/src/test/ui/mismatched_types/closure-arg-count.stderr
+++ b/tests/ui/mismatched_types/closure-arg-count.stderr
@@ -128,9 +128,6 @@ LL | fn foo() {}
    |
 note: required by a bound in `map`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-   |
-LL |         F: FnMut(Self::Item) -> B,
-   |            ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `map`
 
 error[E0593]: closure is expected to take a single 2-tuple as argument, but it takes 3 distinct arguments
   --> $DIR/closure-arg-count.rs:27:57
@@ -144,9 +141,6 @@ LL |     let _it = vec![1, 2, 3].into_iter().enumerate().map(bar);
    |
 note: required by a bound in `map`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-   |
-LL |         F: FnMut(Self::Item) -> B,
-   |            ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `map`
 
 error[E0593]: function is expected to take a single 2-tuple as argument, but it takes 2 distinct arguments
   --> $DIR/closure-arg-count.rs:29:57
@@ -161,9 +155,6 @@ LL | fn qux(x: usize, y: usize) {}
    |
 note: required by a bound in `map`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-   |
-LL |         F: FnMut(Self::Item) -> B,
-   |            ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `map`
 
 error[E0593]: function is expected to take 1 argument, but it takes 2 arguments
   --> $DIR/closure-arg-count.rs:32:45
@@ -175,9 +166,6 @@ LL |     let _it = vec![1, 2, 3].into_iter().map(usize::checked_add);
    |
 note: required by a bound in `map`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-   |
-LL |         F: FnMut(Self::Item) -> B,
-   |            ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `map`
 
 error[E0593]: function is expected to take 0 arguments, but it takes 1 argument
   --> $DIR/closure-arg-count.rs:35:10
diff --git a/tests/ui/mismatched_types/closure-arg-type-mismatch-issue-45727.fixed b/tests/ui/mismatched_types/closure-arg-type-mismatch-issue-45727.fixed
new file mode 100644
index 000000000..6315fcca2
--- /dev/null
+++ b/tests/ui/mismatched_types/closure-arg-type-mismatch-issue-45727.fixed
@@ -0,0 +1,5 @@
+// run-rustfix
+fn main() {
+    let _ = (-10..=10).find(|x: &i32| x.signum() == 0); //~ ERROR type mismatch in closure arguments
+    let _ = (-10..=10).find(|x: &i32| x.signum() == 0); //~ ERROR type mismatch in closure arguments
+}
diff --git a/tests/ui/mismatched_types/closure-arg-type-mismatch-issue-45727.rs b/tests/ui/mismatched_types/closure-arg-type-mismatch-issue-45727.rs
new file mode 100644
index 000000000..c12c5362e
--- /dev/null
+++ b/tests/ui/mismatched_types/closure-arg-type-mismatch-issue-45727.rs
@@ -0,0 +1,5 @@
+// run-rustfix
+fn main() {
+    let _ = (-10..=10).find(|x: i32| x.signum() == 0); //~ ERROR type mismatch in closure arguments
+    let _ = (-10..=10).find(|x: &&&i32| x.signum() == 0); //~ ERROR type mismatch in closure arguments
+}
diff --git a/tests/ui/mismatched_types/closure-arg-type-mismatch-issue-45727.stderr b/tests/ui/mismatched_types/closure-arg-type-mismatch-issue-45727.stderr
new file mode 100644
index 000000000..fb8af4bb7
--- /dev/null
+++ b/tests/ui/mismatched_types/closure-arg-type-mismatch-issue-45727.stderr
@@ -0,0 +1,38 @@
+error[E0631]: type mismatch in closure arguments
+  --> $DIR/closure-arg-type-mismatch-issue-45727.rs:3:24
+   |
+LL |     let _ = (-10..=10).find(|x: i32| x.signum() == 0);
+   |                        ^^^^ -------- found signature defined here
+   |                        |
+   |                        expected due to this
+   |
+   = note: expected closure signature `for<'a> fn(&'a {integer}) -> _`
+              found closure signature `fn(i32) -> _`
+note: required by a bound in `find`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+help: consider borrowing the argument
+   |
+LL |     let _ = (-10..=10).find(|x: &i32| x.signum() == 0);
+   |                                 +
+
+error[E0631]: type mismatch in closure arguments
+  --> $DIR/closure-arg-type-mismatch-issue-45727.rs:4:24
+   |
+LL |     let _ = (-10..=10).find(|x: &&&i32| x.signum() == 0);
+   |                        ^^^^ ----------- found signature defined here
+   |                        |
+   |                        expected due to this
+   |
+   = note: expected closure signature `for<'a> fn(&'a {integer}) -> _`
+              found closure signature `for<'a, 'b, 'c> fn(&'a &'b &'c i32) -> _`
+note: required by a bound in `find`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+help: do not borrow the argument
+   |
+LL -     let _ = (-10..=10).find(|x: &&&i32| x.signum() == 0);
+LL +     let _ = (-10..=10).find(|x: &i32| x.signum() == 0);
+   |
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0631`.
diff --git a/src/test/ui/mismatched_types/closure-arg-type-mismatch.rs b/tests/ui/mismatched_types/closure-arg-type-mismatch.rs
index 98abb0ba9..98abb0ba9 100644
--- a/src/test/ui/mismatched_types/closure-arg-type-mismatch.rs
+++ b/tests/ui/mismatched_types/closure-arg-type-mismatch.rs
diff --git a/src/test/ui/mismatched_types/closure-arg-type-mismatch.stderr b/tests/ui/mismatched_types/closure-arg-type-mismatch.stderr
index 92d545b73..811ff0533 100644
--- a/src/test/ui/mismatched_types/closure-arg-type-mismatch.stderr
+++ b/tests/ui/mismatched_types/closure-arg-type-mismatch.stderr
@@ -10,9 +10,10 @@ LL |     a.iter().map(|_: (u32, u32)| 45);
               found closure signature `fn((u32, u32)) -> _`
 note: required by a bound in `map`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+help: consider borrowing the argument
    |
-LL |         F: FnMut(Self::Item) -> B,
-   |            ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `map`
+LL |     a.iter().map(|_: &(u32, u32)| 45);
+   |                      +
 
 error[E0631]: type mismatch in closure arguments
   --> $DIR/closure-arg-type-mismatch.rs:4:14
@@ -26,9 +27,6 @@ LL |     a.iter().map(|_: &(u16, u16)| 45);
               found closure signature `for<'a> fn(&'a (u16, u16)) -> _`
 note: required by a bound in `map`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-   |
-LL |         F: FnMut(Self::Item) -> B,
-   |            ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `map`
 
 error[E0631]: type mismatch in closure arguments
   --> $DIR/closure-arg-type-mismatch.rs:5:14
@@ -42,9 +40,6 @@ LL |     a.iter().map(|_: (u16, u16)| 45);
               found closure signature `fn((u16, u16)) -> _`
 note: required by a bound in `map`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-   |
-LL |         F: FnMut(Self::Item) -> B,
-   |            ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `map`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/mismatched_types/closure-mismatch.rs b/tests/ui/mismatched_types/closure-mismatch.rs
index b0644e796..b0644e796 100644
--- a/src/test/ui/mismatched_types/closure-mismatch.rs
+++ b/tests/ui/mismatched_types/closure-mismatch.rs
diff --git a/src/test/ui/mismatched_types/closure-mismatch.stderr b/tests/ui/mismatched_types/closure-mismatch.stderr
index a7ef8fa08..a7ef8fa08 100644
--- a/src/test/ui/mismatched_types/closure-mismatch.stderr
+++ b/tests/ui/mismatched_types/closure-mismatch.stderr
diff --git a/src/test/ui/mismatched_types/const-fn-in-trait.rs b/tests/ui/mismatched_types/const-fn-in-trait.rs
index e04d59c58..e04d59c58 100644
--- a/src/test/ui/mismatched_types/const-fn-in-trait.rs
+++ b/tests/ui/mismatched_types/const-fn-in-trait.rs
diff --git a/src/test/ui/mismatched_types/const-fn-in-trait.stderr b/tests/ui/mismatched_types/const-fn-in-trait.stderr
index 7d1fbe45c..7d1fbe45c 100644
--- a/src/test/ui/mismatched_types/const-fn-in-trait.stderr
+++ b/tests/ui/mismatched_types/const-fn-in-trait.stderr
diff --git a/src/test/ui/mismatched_types/do-not-suggest-boxed-trait-objects-instead-of-impl-trait.rs b/tests/ui/mismatched_types/do-not-suggest-boxed-trait-objects-instead-of-impl-trait.rs
index d302dc99b..d302dc99b 100644
--- a/src/test/ui/mismatched_types/do-not-suggest-boxed-trait-objects-instead-of-impl-trait.rs
+++ b/tests/ui/mismatched_types/do-not-suggest-boxed-trait-objects-instead-of-impl-trait.rs
diff --git a/src/test/ui/mismatched_types/do-not-suggest-boxed-trait-objects-instead-of-impl-trait.stderr b/tests/ui/mismatched_types/do-not-suggest-boxed-trait-objects-instead-of-impl-trait.stderr
index 2f814445b..2f814445b 100644
--- a/src/test/ui/mismatched_types/do-not-suggest-boxed-trait-objects-instead-of-impl-trait.stderr
+++ b/tests/ui/mismatched_types/do-not-suggest-boxed-trait-objects-instead-of-impl-trait.stderr
diff --git a/src/test/ui/mismatched_types/dont-point-return-on-E0308.rs b/tests/ui/mismatched_types/dont-point-return-on-E0308.rs
index f2ba610e2..f2ba610e2 100644
--- a/src/test/ui/mismatched_types/dont-point-return-on-E0308.rs
+++ b/tests/ui/mismatched_types/dont-point-return-on-E0308.rs
diff --git a/src/test/ui/mismatched_types/dont-point-return-on-E0308.stderr b/tests/ui/mismatched_types/dont-point-return-on-E0308.stderr
index 13942682d..13942682d 100644
--- a/src/test/ui/mismatched_types/dont-point-return-on-E0308.stderr
+++ b/tests/ui/mismatched_types/dont-point-return-on-E0308.stderr
diff --git a/src/test/ui/mismatched_types/float-literal-inference-restrictions.rs b/tests/ui/mismatched_types/float-literal-inference-restrictions.rs
index 34079b61e..34079b61e 100644
--- a/src/test/ui/mismatched_types/float-literal-inference-restrictions.rs
+++ b/tests/ui/mismatched_types/float-literal-inference-restrictions.rs
diff --git a/src/test/ui/mismatched_types/float-literal-inference-restrictions.stderr b/tests/ui/mismatched_types/float-literal-inference-restrictions.stderr
index 454373c32..454373c32 100644
--- a/src/test/ui/mismatched_types/float-literal-inference-restrictions.stderr
+++ b/tests/ui/mismatched_types/float-literal-inference-restrictions.stderr
diff --git a/src/test/ui/mismatched_types/fn-variance-1.rs b/tests/ui/mismatched_types/fn-variance-1.rs
index b8a6c9a9b..b8a6c9a9b 100644
--- a/src/test/ui/mismatched_types/fn-variance-1.rs
+++ b/tests/ui/mismatched_types/fn-variance-1.rs
diff --git a/src/test/ui/mismatched_types/fn-variance-1.stderr b/tests/ui/mismatched_types/fn-variance-1.stderr
index 5794e606e..5794e606e 100644
--- a/src/test/ui/mismatched_types/fn-variance-1.stderr
+++ b/tests/ui/mismatched_types/fn-variance-1.stderr
diff --git a/src/test/ui/mismatched_types/for-loop-has-unit-body.rs b/tests/ui/mismatched_types/for-loop-has-unit-body.rs
index a9433d7de..a9433d7de 100644
--- a/src/test/ui/mismatched_types/for-loop-has-unit-body.rs
+++ b/tests/ui/mismatched_types/for-loop-has-unit-body.rs
diff --git a/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr b/tests/ui/mismatched_types/for-loop-has-unit-body.stderr
index f36fe64bf..f36fe64bf 100644
--- a/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr
+++ b/tests/ui/mismatched_types/for-loop-has-unit-body.stderr
diff --git a/tests/ui/mismatched_types/issue-106182.fixed b/tests/ui/mismatched_types/issue-106182.fixed
new file mode 100644
index 000000000..b8ddebf6f
--- /dev/null
+++ b/tests/ui/mismatched_types/issue-106182.fixed
@@ -0,0 +1,14 @@
+// run-rustfix
+
+struct _S(u32, Vec<i32>);
+
+fn _foo(x: &_S) {
+    match x {
+        _S(mut _y, _v) => {
+        //~^ ERROR mismatched types [E0308]
+        }
+    }
+}
+
+fn main() {
+}
diff --git a/tests/ui/mismatched_types/issue-106182.rs b/tests/ui/mismatched_types/issue-106182.rs
new file mode 100644
index 000000000..6eb6df13a
--- /dev/null
+++ b/tests/ui/mismatched_types/issue-106182.rs
@@ -0,0 +1,14 @@
+// run-rustfix
+
+struct _S(u32, Vec<i32>);
+
+fn _foo(x: &_S) {
+    match x {
+        _S(& (mut _y), _v) => {
+        //~^ ERROR mismatched types [E0308]
+        }
+    }
+}
+
+fn main() {
+}
diff --git a/tests/ui/mismatched_types/issue-106182.stderr b/tests/ui/mismatched_types/issue-106182.stderr
new file mode 100644
index 000000000..ac3ab8e98
--- /dev/null
+++ b/tests/ui/mismatched_types/issue-106182.stderr
@@ -0,0 +1,18 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-106182.rs:7:12
+   |
+LL |     match x {
+   |           - this expression has type `&_S`
+LL |         _S(& (mut _y), _v) => {
+   |            ^^^^^^^^^^ expected `u32`, found reference
+   |
+   = note:   expected type `u32`
+           found reference `&_`
+help: consider removing `&` from the pattern
+   |
+LL |         _S(mut _y, _v) => {
+   |            ~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/mismatched_types/issue-19109.rs b/tests/ui/mismatched_types/issue-19109.rs
index eae6a8790..eae6a8790 100644
--- a/src/test/ui/mismatched_types/issue-19109.rs
+++ b/tests/ui/mismatched_types/issue-19109.rs
diff --git a/src/test/ui/mismatched_types/issue-19109.stderr b/tests/ui/mismatched_types/issue-19109.stderr
index 5cef64bb1..5cef64bb1 100644
--- a/src/test/ui/mismatched_types/issue-19109.stderr
+++ b/tests/ui/mismatched_types/issue-19109.stderr
diff --git a/src/test/ui/mismatched_types/issue-26480.rs b/tests/ui/mismatched_types/issue-26480.rs
index 8bd26cebc..8bd26cebc 100644
--- a/src/test/ui/mismatched_types/issue-26480.rs
+++ b/tests/ui/mismatched_types/issue-26480.rs
diff --git a/src/test/ui/mismatched_types/issue-26480.stderr b/tests/ui/mismatched_types/issue-26480.stderr
index ae10a0067..ae10a0067 100644
--- a/src/test/ui/mismatched_types/issue-26480.stderr
+++ b/tests/ui/mismatched_types/issue-26480.stderr
diff --git a/src/test/ui/mismatched_types/issue-35030.rs b/tests/ui/mismatched_types/issue-35030.rs
index 91ea7ea80..91ea7ea80 100644
--- a/src/test/ui/mismatched_types/issue-35030.rs
+++ b/tests/ui/mismatched_types/issue-35030.rs
diff --git a/tests/ui/mismatched_types/issue-35030.stderr b/tests/ui/mismatched_types/issue-35030.stderr
new file mode 100644
index 000000000..de4e067fe
--- /dev/null
+++ b/tests/ui/mismatched_types/issue-35030.stderr
@@ -0,0 +1,26 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-35030.rs:9:14
+   |
+LL | impl<bool> Parser<bool> for bool {
+   |      ---- this type parameter
+LL |     fn parse(text: &str) -> Option<bool> {
+LL |         Some(true)
+   |         ---- ^^^^ expected type parameter `bool`, found `bool`
+   |         |
+   |         arguments to this enum variant are incorrect
+   |
+   = note: expected type parameter `bool` (type parameter `bool`)
+                        found type `bool` (`bool`)
+help: the type constructed contains `bool` due to the type of the argument passed
+  --> $DIR/issue-35030.rs:9:9
+   |
+LL |         Some(true)
+   |         ^^^^^----^
+   |              |
+   |              this argument influences the type of `Some`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/mismatched_types/issue-36053-2.rs b/tests/ui/mismatched_types/issue-36053-2.rs
index 17d2292ba..17d2292ba 100644
--- a/src/test/ui/mismatched_types/issue-36053-2.rs
+++ b/tests/ui/mismatched_types/issue-36053-2.rs
diff --git a/src/test/ui/mismatched_types/issue-36053-2.stderr b/tests/ui/mismatched_types/issue-36053-2.stderr
index 906001ca1..a6764a1dc 100644
--- a/src/test/ui/mismatched_types/issue-36053-2.stderr
+++ b/tests/ui/mismatched_types/issue-36053-2.stderr
@@ -10,23 +10,22 @@ LL |     once::<&str>("str").fuse().filter(|a: &str| true).count();
               found closure signature `for<'a> fn(&'a str) -> _`
 note: required by a bound in `filter`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+help: consider borrowing the argument
    |
-LL |         P: FnMut(&Self::Item) -> bool,
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `filter`
+LL |     once::<&str>("str").fuse().filter(|a: &&str| true).count();
+   |                                           +
 
-error[E0599]: the method `count` exists for struct `Filter<Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:7:39: 7:48]>`, but its trait bounds were not satisfied
+error[E0599]: the method `count` exists for struct `Filter<Fuse<Once<&str>>, [closure@issue-36053-2.rs:7:39]>`, but its trait bounds were not satisfied
   --> $DIR/issue-36053-2.rs:7:55
    |
 LL |     once::<&str>("str").fuse().filter(|a: &str| true).count();
-   |                                       ---------       ^^^^^ method cannot be called on `Filter<Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:7:39: 7:48]>` due to unsatisfied trait bounds
+   |                                       ---------       ^^^^^ method cannot be called due to unsatisfied trait bounds
    |                                       |
    |                                       doesn't satisfy `<_ as FnOnce<(&&str,)>>::Output = bool`
    |                                       doesn't satisfy `_: FnMut<(&&str,)>`
+  --> $SRC_DIR/core/src/iter/adapters/filter.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/iter/adapters/filter.rs:LL:COL
-   |
-LL | pub struct Filter<I, P> {
-   | ----------------------- doesn't satisfy `_: Iterator`
+   = note: doesn't satisfy `_: Iterator`
    |
    = note: the following trait bounds were not satisfied:
            `<[closure@$DIR/issue-36053-2.rs:7:39: 7:48] as FnOnce<(&&str,)>>::Output = bool`
diff --git a/src/test/ui/mismatched_types/issue-38371-unfixable.rs b/tests/ui/mismatched_types/issue-38371-unfixable.rs
index c4316bfdd..c4316bfdd 100644
--- a/src/test/ui/mismatched_types/issue-38371-unfixable.rs
+++ b/tests/ui/mismatched_types/issue-38371-unfixable.rs
diff --git a/src/test/ui/mismatched_types/issue-38371-unfixable.stderr b/tests/ui/mismatched_types/issue-38371-unfixable.stderr
index 3c5e765ab..3c5e765ab 100644
--- a/src/test/ui/mismatched_types/issue-38371-unfixable.stderr
+++ b/tests/ui/mismatched_types/issue-38371-unfixable.stderr
diff --git a/src/test/ui/mismatched_types/issue-38371.fixed b/tests/ui/mismatched_types/issue-38371.fixed
index 0e20835be..0e20835be 100644
--- a/src/test/ui/mismatched_types/issue-38371.fixed
+++ b/tests/ui/mismatched_types/issue-38371.fixed
diff --git a/src/test/ui/mismatched_types/issue-38371.rs b/tests/ui/mismatched_types/issue-38371.rs
index fb9e4c173..fb9e4c173 100644
--- a/src/test/ui/mismatched_types/issue-38371.rs
+++ b/tests/ui/mismatched_types/issue-38371.rs
diff --git a/src/test/ui/mismatched_types/issue-38371.stderr b/tests/ui/mismatched_types/issue-38371.stderr
index f43427f98..f43427f98 100644
--- a/src/test/ui/mismatched_types/issue-38371.stderr
+++ b/tests/ui/mismatched_types/issue-38371.stderr
diff --git a/src/test/ui/mismatched_types/issue-47706-trait.rs b/tests/ui/mismatched_types/issue-47706-trait.rs
index 8fb4e0855..8fb4e0855 100644
--- a/src/test/ui/mismatched_types/issue-47706-trait.rs
+++ b/tests/ui/mismatched_types/issue-47706-trait.rs
diff --git a/src/test/ui/mismatched_types/issue-47706-trait.stderr b/tests/ui/mismatched_types/issue-47706-trait.stderr
index d596b4a69..a5f38dd53 100644
--- a/src/test/ui/mismatched_types/issue-47706-trait.stderr
+++ b/tests/ui/mismatched_types/issue-47706-trait.stderr
@@ -10,9 +10,6 @@ LL |         None::<()>.map(Self::f);
    |
 note: required by a bound in `Option::<T>::map`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL |         F: ~const FnOnce(T) -> U,
-   |            ^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Option::<T>::map`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/mismatched_types/issue-47706.rs b/tests/ui/mismatched_types/issue-47706.rs
index f47c1e694..f47c1e694 100644
--- a/src/test/ui/mismatched_types/issue-47706.rs
+++ b/tests/ui/mismatched_types/issue-47706.rs
diff --git a/src/test/ui/mismatched_types/issue-47706.stderr b/tests/ui/mismatched_types/issue-47706.stderr
index 8b8563684..d9d408844 100644
--- a/src/test/ui/mismatched_types/issue-47706.stderr
+++ b/tests/ui/mismatched_types/issue-47706.stderr
@@ -11,9 +11,6 @@ LL |         self.foo.map(Foo::new)
    |
 note: required by a bound in `Option::<T>::map`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL |         F: ~const FnOnce(T) -> U,
-   |            ^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Option::<T>::map`
 
 error[E0593]: function is expected to take 0 arguments, but it takes 1 argument
   --> $DIR/issue-47706.rs:27:9
diff --git a/src/test/ui/mismatched_types/issue-74918-missing-lifetime.rs b/tests/ui/mismatched_types/issue-74918-missing-lifetime.rs
index c7842667d..c7842667d 100644
--- a/src/test/ui/mismatched_types/issue-74918-missing-lifetime.rs
+++ b/tests/ui/mismatched_types/issue-74918-missing-lifetime.rs
diff --git a/src/test/ui/mismatched_types/issue-74918-missing-lifetime.stderr b/tests/ui/mismatched_types/issue-74918-missing-lifetime.stderr
index 94a9c9757..9ddea1629 100644
--- a/src/test/ui/mismatched_types/issue-74918-missing-lifetime.stderr
+++ b/tests/ui/mismatched_types/issue-74918-missing-lifetime.stderr
@@ -14,14 +14,12 @@ error: `impl` item signature doesn't match `trait` item signature
    |
 LL |     fn next(&mut self) -> Option<IteratorChunk<T, S>> {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found `fn(&'1 mut ChunkingIterator<T, S>) -> Option<IteratorChunk<'1, T, S>>`
-   |
-  ::: $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-   |
-LL |     fn next(&mut self) -> Option<Self::Item>;
-   |     ----------------------------------------- expected `fn(&'1 mut ChunkingIterator<T, S>) -> Option<IteratorChunk<'static, T, S>>`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
    |
    = note: expected `fn(&'1 mut ChunkingIterator<T, S>) -> Option<IteratorChunk<'static, T, S>>`
-              found `fn(&'1 mut ChunkingIterator<T, S>) -> Option<IteratorChunk<'1, T, S>>`
+   |
+   = note: expected signature `fn(&'1 mut ChunkingIterator<T, S>) -> Option<IteratorChunk<'static, T, S>>`
+              found signature `fn(&'1 mut ChunkingIterator<T, S>) -> Option<IteratorChunk<'1, T, S>>`
    = help: the lifetime requirements from the `impl` do not correspond to the requirements in the `trait`
    = help: verify the lifetime relationships in the `trait` and `impl` between the `self` argument, the other inputs and its output
 
diff --git a/src/test/ui/mismatched_types/issue-75361-mismatched-impl.rs b/tests/ui/mismatched_types/issue-75361-mismatched-impl.rs
index 441051447..441051447 100644
--- a/src/test/ui/mismatched_types/issue-75361-mismatched-impl.rs
+++ b/tests/ui/mismatched_types/issue-75361-mismatched-impl.rs
diff --git a/src/test/ui/mismatched_types/issue-75361-mismatched-impl.stderr b/tests/ui/mismatched_types/issue-75361-mismatched-impl.stderr
index 2a2c23c94..88416ba4b 100644
--- a/src/test/ui/mismatched_types/issue-75361-mismatched-impl.stderr
+++ b/tests/ui/mismatched_types/issue-75361-mismatched-impl.stderr
@@ -7,8 +7,8 @@ LL |   fn adjacent_edges(&self) -> Box<dyn MyTrait<Item = &Self::EdgeType>>;
 LL |   fn adjacent_edges(&self) -> Box<dyn MyTrait<Item = &Self::EdgeType> + '_> {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found `fn(&'1 T) -> Box<(dyn MyTrait<Item = &'1 T> + '1)>`
    |
-   = note: expected `fn(&'1 T) -> Box<(dyn MyTrait<Item = &'1 T> + 'static)>`
-              found `fn(&'1 T) -> Box<(dyn MyTrait<Item = &'1 T> + '1)>`
+   = note: expected signature `fn(&'1 T) -> Box<(dyn MyTrait<Item = &'1 T> + 'static)>`
+              found signature `fn(&'1 T) -> Box<(dyn MyTrait<Item = &'1 T> + '1)>`
 help: the lifetime requirements from the `impl` do not correspond to the requirements in the `trait`
   --> $DIR/issue-75361-mismatched-impl.rs:12:55
    |
diff --git a/src/test/ui/mismatched_types/issue-84976.rs b/tests/ui/mismatched_types/issue-84976.rs
index db6fe0b45..db6fe0b45 100644
--- a/src/test/ui/mismatched_types/issue-84976.rs
+++ b/tests/ui/mismatched_types/issue-84976.rs
diff --git a/src/test/ui/mismatched_types/issue-84976.stderr b/tests/ui/mismatched_types/issue-84976.stderr
index 9157566e3..9157566e3 100644
--- a/src/test/ui/mismatched_types/issue-84976.stderr
+++ b/tests/ui/mismatched_types/issue-84976.stderr
diff --git a/src/test/ui/mismatched_types/main.rs b/tests/ui/mismatched_types/main.rs
index e2d09dc21..e2d09dc21 100644
--- a/src/test/ui/mismatched_types/main.rs
+++ b/tests/ui/mismatched_types/main.rs
diff --git a/src/test/ui/mismatched_types/main.stderr b/tests/ui/mismatched_types/main.stderr
index a662741af..a662741af 100644
--- a/src/test/ui/mismatched_types/main.stderr
+++ b/tests/ui/mismatched_types/main.stderr
diff --git a/src/test/ui/mismatched_types/method-help-unsatisfied-bound.rs b/tests/ui/mismatched_types/method-help-unsatisfied-bound.rs
index 6303c6e6a..6303c6e6a 100644
--- a/src/test/ui/mismatched_types/method-help-unsatisfied-bound.rs
+++ b/tests/ui/mismatched_types/method-help-unsatisfied-bound.rs
diff --git a/tests/ui/mismatched_types/method-help-unsatisfied-bound.stderr b/tests/ui/mismatched_types/method-help-unsatisfied-bound.stderr
new file mode 100644
index 000000000..d3b752507
--- /dev/null
+++ b/tests/ui/mismatched_types/method-help-unsatisfied-bound.stderr
@@ -0,0 +1,18 @@
+error[E0277]: `Foo` doesn't implement `Debug`
+  --> $DIR/method-help-unsatisfied-bound.rs:5:7
+   |
+LL |     a.unwrap();
+   |       ^^^^^^ `Foo` cannot be formatted using `{:?}`
+   |
+   = help: the trait `Debug` is not implemented for `Foo`
+   = note: add `#[derive(Debug)]` to `Foo` or manually `impl Debug for Foo`
+note: required by a bound in `Result::<T, E>::unwrap`
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+help: consider annotating `Foo` with `#[derive(Debug)]`
+   |
+LL | #[derive(Debug)]
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/mismatched_types/non_zero_assigned_something.rs b/tests/ui/mismatched_types/non_zero_assigned_something.rs
index d2adbe01c..d2adbe01c 100644
--- a/src/test/ui/mismatched_types/non_zero_assigned_something.rs
+++ b/tests/ui/mismatched_types/non_zero_assigned_something.rs
diff --git a/src/test/ui/mismatched_types/non_zero_assigned_something.stderr b/tests/ui/mismatched_types/non_zero_assigned_something.stderr
index d4b2c902f..d4b2c902f 100644
--- a/src/test/ui/mismatched_types/non_zero_assigned_something.stderr
+++ b/tests/ui/mismatched_types/non_zero_assigned_something.stderr
diff --git a/src/test/ui/mismatched_types/normalize-fn-sig.rs b/tests/ui/mismatched_types/normalize-fn-sig.rs
index 1a2093c44..1a2093c44 100644
--- a/src/test/ui/mismatched_types/normalize-fn-sig.rs
+++ b/tests/ui/mismatched_types/normalize-fn-sig.rs
diff --git a/src/test/ui/mismatched_types/normalize-fn-sig.stderr b/tests/ui/mismatched_types/normalize-fn-sig.stderr
index 6c55f29c5..6c55f29c5 100644
--- a/src/test/ui/mismatched_types/normalize-fn-sig.stderr
+++ b/tests/ui/mismatched_types/normalize-fn-sig.stderr
diff --git a/src/test/ui/mismatched_types/numeric-literal-cast.rs b/tests/ui/mismatched_types/numeric-literal-cast.rs
index 69cfe262f..69cfe262f 100644
--- a/src/test/ui/mismatched_types/numeric-literal-cast.rs
+++ b/tests/ui/mismatched_types/numeric-literal-cast.rs
diff --git a/src/test/ui/mismatched_types/numeric-literal-cast.stderr b/tests/ui/mismatched_types/numeric-literal-cast.stderr
index fcf3eccbc..fcf3eccbc 100644
--- a/src/test/ui/mismatched_types/numeric-literal-cast.stderr
+++ b/tests/ui/mismatched_types/numeric-literal-cast.stderr
diff --git a/src/test/ui/mismatched_types/overloaded-calls-bad.rs b/tests/ui/mismatched_types/overloaded-calls-bad.rs
index 232cd2ba8..5b1804d82 100644
--- a/src/test/ui/mismatched_types/overloaded-calls-bad.rs
+++ b/tests/ui/mismatched_types/overloaded-calls-bad.rs
@@ -33,9 +33,9 @@ fn main() {
     let ans = s("what");
     //~^ ERROR mismatched types
     let ans = s();
-    //~^ ERROR this function takes 1 argument but 0 arguments were supplied
+    //~^ ERROR function takes 1 argument but 0 arguments were supplied
     let ans = s("burma", "shave");
-    //~^ ERROR this function takes 1 argument but 2 arguments were supplied
+    //~^ ERROR function takes 1 argument but 2 arguments were supplied
 
     F("");
     //~^ ERROR mismatched types
diff --git a/src/test/ui/mismatched_types/overloaded-calls-bad.stderr b/tests/ui/mismatched_types/overloaded-calls-bad.stderr
index 3a895acbd..3a895acbd 100644
--- a/src/test/ui/mismatched_types/overloaded-calls-bad.stderr
+++ b/tests/ui/mismatched_types/overloaded-calls-bad.stderr
diff --git a/src/test/ui/mismatched_types/recovered-block.rs b/tests/ui/mismatched_types/recovered-block.rs
index b230b47d3..b230b47d3 100644
--- a/src/test/ui/mismatched_types/recovered-block.rs
+++ b/tests/ui/mismatched_types/recovered-block.rs
diff --git a/src/test/ui/mismatched_types/recovered-block.stderr b/tests/ui/mismatched_types/recovered-block.stderr
index f275321ab..f275321ab 100644
--- a/src/test/ui/mismatched_types/recovered-block.stderr
+++ b/tests/ui/mismatched_types/recovered-block.stderr
diff --git a/src/test/ui/mismatched_types/ref-pat-suggestions.fixed b/tests/ui/mismatched_types/ref-pat-suggestions.fixed
index d50acd1ac..d50acd1ac 100644
--- a/src/test/ui/mismatched_types/ref-pat-suggestions.fixed
+++ b/tests/ui/mismatched_types/ref-pat-suggestions.fixed
diff --git a/src/test/ui/mismatched_types/ref-pat-suggestions.rs b/tests/ui/mismatched_types/ref-pat-suggestions.rs
index 1a77f6876..1a77f6876 100644
--- a/src/test/ui/mismatched_types/ref-pat-suggestions.rs
+++ b/tests/ui/mismatched_types/ref-pat-suggestions.rs
diff --git a/src/test/ui/mismatched_types/ref-pat-suggestions.stderr b/tests/ui/mismatched_types/ref-pat-suggestions.stderr
index d9501a9bb..63eaa3930 100644
--- a/src/test/ui/mismatched_types/ref-pat-suggestions.stderr
+++ b/tests/ui/mismatched_types/ref-pat-suggestions.stderr
@@ -336,9 +336,8 @@ LL |         let S(&mut _b) = S(0);
    |               ^^^^^^^
 help: consider removing `&mut` from the pattern
    |
-LL -         let S(&mut _b) = S(0);
-LL +         let S(_b) = S(0);
-   |
+LL |         let S(_b) = S(0);
+   |               ~~
 
 error[E0308]: mismatched types
   --> $DIR/ref-pat-suggestions.rs:31:14
diff --git a/src/test/ui/mismatched_types/show_module.rs b/tests/ui/mismatched_types/show_module.rs
index 61550b887..61550b887 100644
--- a/src/test/ui/mismatched_types/show_module.rs
+++ b/tests/ui/mismatched_types/show_module.rs
diff --git a/src/test/ui/mismatched_types/show_module.stderr b/tests/ui/mismatched_types/show_module.stderr
index 5e48e0955..5e48e0955 100644
--- a/src/test/ui/mismatched_types/show_module.stderr
+++ b/tests/ui/mismatched_types/show_module.stderr
diff --git a/src/test/ui/mismatched_types/similar_paths.rs b/tests/ui/mismatched_types/similar_paths.rs
index 4b9157f39..4b9157f39 100644
--- a/src/test/ui/mismatched_types/similar_paths.rs
+++ b/tests/ui/mismatched_types/similar_paths.rs
diff --git a/src/test/ui/mismatched_types/similar_paths.stderr b/tests/ui/mismatched_types/similar_paths.stderr
index e65ae58d4..46a383325 100644
--- a/src/test/ui/mismatched_types/similar_paths.stderr
+++ b/tests/ui/mismatched_types/similar_paths.stderr
@@ -9,9 +9,6 @@ LL |     Some(42_u8)
    = note: enum `std::option::Option` and enum `Option` have similar names, but are actually distinct types
 note: enum `std::option::Option` is defined in crate `core`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL | pub enum Option<T> {
-   | ^^^^^^^^^^^^^^^^^^
 note: enum `Option` is defined in the current crate
   --> $DIR/similar_paths.rs:1:1
    |
diff --git a/src/test/ui/mismatched_types/similar_paths_primitive.rs b/tests/ui/mismatched_types/similar_paths_primitive.rs
index 8f5b7cce4..8f5b7cce4 100644
--- a/src/test/ui/mismatched_types/similar_paths_primitive.rs
+++ b/tests/ui/mismatched_types/similar_paths_primitive.rs
diff --git a/src/test/ui/mismatched_types/similar_paths_primitive.stderr b/tests/ui/mismatched_types/similar_paths_primitive.stderr
index 8a2f73945..8a2f73945 100644
--- a/src/test/ui/mismatched_types/similar_paths_primitive.stderr
+++ b/tests/ui/mismatched_types/similar_paths_primitive.stderr
diff --git a/src/test/ui/mismatched_types/suggest-adding-or-removing-ref-for-binding-pattern.fixed b/tests/ui/mismatched_types/suggest-adding-or-removing-ref-for-binding-pattern.fixed
index 56f93cfbf..56f93cfbf 100644
--- a/src/test/ui/mismatched_types/suggest-adding-or-removing-ref-for-binding-pattern.fixed
+++ b/tests/ui/mismatched_types/suggest-adding-or-removing-ref-for-binding-pattern.fixed
diff --git a/src/test/ui/mismatched_types/suggest-adding-or-removing-ref-for-binding-pattern.rs b/tests/ui/mismatched_types/suggest-adding-or-removing-ref-for-binding-pattern.rs
index 0c33f99a4..0c33f99a4 100644
--- a/src/test/ui/mismatched_types/suggest-adding-or-removing-ref-for-binding-pattern.rs
+++ b/tests/ui/mismatched_types/suggest-adding-or-removing-ref-for-binding-pattern.rs
diff --git a/src/test/ui/mismatched_types/suggest-adding-or-removing-ref-for-binding-pattern.stderr b/tests/ui/mismatched_types/suggest-adding-or-removing-ref-for-binding-pattern.stderr
index e8357f9a3..e8357f9a3 100644
--- a/src/test/ui/mismatched_types/suggest-adding-or-removing-ref-for-binding-pattern.stderr
+++ b/tests/ui/mismatched_types/suggest-adding-or-removing-ref-for-binding-pattern.stderr
diff --git a/src/test/ui/mismatched_types/suggest-boxed-trait-objects-instead-of-impl-trait.fixed b/tests/ui/mismatched_types/suggest-boxed-trait-objects-instead-of-impl-trait.fixed
index f30feaed0..f30feaed0 100644
--- a/src/test/ui/mismatched_types/suggest-boxed-trait-objects-instead-of-impl-trait.fixed
+++ b/tests/ui/mismatched_types/suggest-boxed-trait-objects-instead-of-impl-trait.fixed
diff --git a/src/test/ui/mismatched_types/suggest-boxed-trait-objects-instead-of-impl-trait.rs b/tests/ui/mismatched_types/suggest-boxed-trait-objects-instead-of-impl-trait.rs
index 2bd8146e2..2bd8146e2 100644
--- a/src/test/ui/mismatched_types/suggest-boxed-trait-objects-instead-of-impl-trait.rs
+++ b/tests/ui/mismatched_types/suggest-boxed-trait-objects-instead-of-impl-trait.rs
diff --git a/src/test/ui/mismatched_types/suggest-boxed-trait-objects-instead-of-impl-trait.stderr b/tests/ui/mismatched_types/suggest-boxed-trait-objects-instead-of-impl-trait.stderr
index f58b9c3ec..f58b9c3ec 100644
--- a/src/test/ui/mismatched_types/suggest-boxed-trait-objects-instead-of-impl-trait.stderr
+++ b/tests/ui/mismatched_types/suggest-boxed-trait-objects-instead-of-impl-trait.stderr
diff --git a/src/test/ui/mismatched_types/suggest-removing-tulpe-struct-field.fixed b/tests/ui/mismatched_types/suggest-removing-tuple-struct-field.fixed
index 63b65ab20..63b65ab20 100644
--- a/src/test/ui/mismatched_types/suggest-removing-tulpe-struct-field.fixed
+++ b/tests/ui/mismatched_types/suggest-removing-tuple-struct-field.fixed
diff --git a/src/test/ui/mismatched_types/suggest-removing-tulpe-struct-field.rs b/tests/ui/mismatched_types/suggest-removing-tuple-struct-field.rs
index 2ab4e3955..2ab4e3955 100644
--- a/src/test/ui/mismatched_types/suggest-removing-tulpe-struct-field.rs
+++ b/tests/ui/mismatched_types/suggest-removing-tuple-struct-field.rs
diff --git a/tests/ui/mismatched_types/suggest-removing-tuple-struct-field.stderr b/tests/ui/mismatched_types/suggest-removing-tuple-struct-field.stderr
new file mode 100644
index 000000000..35871afb5
--- /dev/null
+++ b/tests/ui/mismatched_types/suggest-removing-tuple-struct-field.stderr
@@ -0,0 +1,41 @@
+error[E0308]: mismatched types
+  --> $DIR/suggest-removing-tuple-struct-field.rs:11:13
+   |
+LL |     some_fn(value.0);
+   |     ------- ^^^^^^^ expected struct `MyWrapper`, found `u32`
+   |     |
+   |     arguments to this function are incorrect
+   |
+note: function defined here
+  --> $DIR/suggest-removing-tuple-struct-field.rs:15:4
+   |
+LL | fn some_fn(wrapped: MyWrapper) {
+   |    ^^^^^^^ ------------------
+help: consider removing the tuple struct field `0`
+   |
+LL -     some_fn(value.0);
+LL +     some_fn(value);
+   |
+
+error[E0308]: mismatched types
+  --> $DIR/suggest-removing-tuple-struct-field.rs:12:13
+   |
+LL |     some_fn(my_wrapper!(123).0);
+   |     ------- ^^^^^^^^^^^^^^^^^^ expected struct `MyWrapper`, found `u32`
+   |     |
+   |     arguments to this function are incorrect
+   |
+note: function defined here
+  --> $DIR/suggest-removing-tuple-struct-field.rs:15:4
+   |
+LL | fn some_fn(wrapped: MyWrapper) {
+   |    ^^^^^^^ ------------------
+help: consider removing the tuple struct field `0`
+   |
+LL -     some_fn(my_wrapper!(123).0);
+LL +     some_fn(my_wrapper!(123));
+   |
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/mismatched_types/trait-bounds-cant-coerce.rs b/tests/ui/mismatched_types/trait-bounds-cant-coerce.rs
index 882533992..882533992 100644
--- a/src/test/ui/mismatched_types/trait-bounds-cant-coerce.rs
+++ b/tests/ui/mismatched_types/trait-bounds-cant-coerce.rs
diff --git a/src/test/ui/mismatched_types/trait-bounds-cant-coerce.stderr b/tests/ui/mismatched_types/trait-bounds-cant-coerce.stderr
index 80aef7fcb..80aef7fcb 100644
--- a/src/test/ui/mismatched_types/trait-bounds-cant-coerce.stderr
+++ b/tests/ui/mismatched_types/trait-bounds-cant-coerce.stderr
diff --git a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs b/tests/ui/mismatched_types/trait-impl-fn-incompatibility.rs
index ba206b860..ba206b860 100644
--- a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs
+++ b/tests/ui/mismatched_types/trait-impl-fn-incompatibility.rs
diff --git a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr b/tests/ui/mismatched_types/trait-impl-fn-incompatibility.stderr
index 6b2ba53da..6e7bf5eb4 100644
--- a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr
+++ b/tests/ui/mismatched_types/trait-impl-fn-incompatibility.stderr
@@ -12,8 +12,8 @@ note: type in trait
    |
 LL |     fn foo(x: u16);
    |               ^^^
-   = note: expected fn pointer `fn(u16)`
-              found fn pointer `fn(i16)`
+   = note: expected signature `fn(u16)`
+              found signature `fn(i16)`
 
 error[E0053]: method `bar` has an incompatible type for trait
   --> $DIR/trait-impl-fn-incompatibility.rs:10:28
@@ -29,8 +29,8 @@ note: type in trait
    |
 LL |     fn bar(&mut self, bar: &mut Bar);
    |                            ^^^^^^^^
-   = note: expected fn pointer `fn(&mut Bar, &mut Bar)`
-              found fn pointer `fn(&mut Bar, &Bar)`
+   = note: expected signature `fn(&mut Bar, &mut Bar)`
+              found signature `fn(&mut Bar, &Bar)`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.rs b/tests/ui/mismatched_types/unboxed-closures-vtable-mismatch.rs
index 307104e47..307104e47 100644
--- a/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.rs
+++ b/tests/ui/mismatched_types/unboxed-closures-vtable-mismatch.rs
diff --git a/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr b/tests/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr
index 54b220065..54b220065 100644
--- a/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr
+++ b/tests/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr
diff --git a/src/test/ui/mismatched_types/wrap-suggestion-privacy.rs b/tests/ui/mismatched_types/wrap-suggestion-privacy.rs
index 63cb1a129..63cb1a129 100644
--- a/src/test/ui/mismatched_types/wrap-suggestion-privacy.rs
+++ b/tests/ui/mismatched_types/wrap-suggestion-privacy.rs
diff --git a/src/test/ui/mismatched_types/wrap-suggestion-privacy.stderr b/tests/ui/mismatched_types/wrap-suggestion-privacy.stderr
index e8eb8d263..fdd92cbfc 100644
--- a/src/test/ui/mismatched_types/wrap-suggestion-privacy.stderr
+++ b/tests/ui/mismatched_types/wrap-suggestion-privacy.stderr
@@ -42,7 +42,7 @@ error[E0308]: mismatched types
   --> $DIR/wrap-suggestion-privacy.rs:22:17
    |
 LL |     needs_ready(Some(0));
-   |     ----------- ^^^^^^^ expected struct `std::future::Ready`, found enum `Option`
+   |     ----------- ^^^^^^^ expected struct `Ready`, found enum `Option`
    |     |
    |     arguments to this function are incorrect
    |
diff --git a/src/test/ui/missing-trait-bounds/auxiliary/issue-69725.rs b/tests/ui/missing-trait-bounds/auxiliary/issue-69725.rs
index 13606e498..13606e498 100644
--- a/src/test/ui/missing-trait-bounds/auxiliary/issue-69725.rs
+++ b/tests/ui/missing-trait-bounds/auxiliary/issue-69725.rs
diff --git a/src/test/ui/missing-trait-bounds/issue-35677.fixed b/tests/ui/missing-trait-bounds/issue-35677.fixed
index 08174d8d8..08174d8d8 100644
--- a/src/test/ui/missing-trait-bounds/issue-35677.fixed
+++ b/tests/ui/missing-trait-bounds/issue-35677.fixed
diff --git a/src/test/ui/missing-trait-bounds/issue-35677.rs b/tests/ui/missing-trait-bounds/issue-35677.rs
index 2cb394386..2cb394386 100644
--- a/src/test/ui/missing-trait-bounds/issue-35677.rs
+++ b/tests/ui/missing-trait-bounds/issue-35677.rs
diff --git a/src/test/ui/missing-trait-bounds/issue-35677.stderr b/tests/ui/missing-trait-bounds/issue-35677.stderr
index a2201b946..05d3de80d 100644
--- a/src/test/ui/missing-trait-bounds/issue-35677.stderr
+++ b/tests/ui/missing-trait-bounds/issue-35677.stderr
@@ -6,6 +6,8 @@ LL |     this.is_subset(other)
    |
    = note: the following trait bounds were not satisfied:
            `T: Eq`
+           `T: PartialEq`
+           which is required by `T: Eq`
            `T: Hash`
 help: consider restricting the type parameters to satisfy the trait bounds
    |
diff --git a/src/test/ui/missing-trait-bounds/issue-69725.fixed b/tests/ui/missing-trait-bounds/issue-69725.fixed
index d57badcfd..d57badcfd 100644
--- a/src/test/ui/missing-trait-bounds/issue-69725.fixed
+++ b/tests/ui/missing-trait-bounds/issue-69725.fixed
diff --git a/src/test/ui/missing-trait-bounds/issue-69725.rs b/tests/ui/missing-trait-bounds/issue-69725.rs
index 9c88969c5..9c88969c5 100644
--- a/src/test/ui/missing-trait-bounds/issue-69725.rs
+++ b/tests/ui/missing-trait-bounds/issue-69725.rs
diff --git a/src/test/ui/missing-trait-bounds/issue-69725.stderr b/tests/ui/missing-trait-bounds/issue-69725.stderr
index 980d9dd16..980d9dd16 100644
--- a/src/test/ui/missing-trait-bounds/issue-69725.stderr
+++ b/tests/ui/missing-trait-bounds/issue-69725.stderr
diff --git a/src/test/ui/missing-trait-bounds/missing-trait-bound-for-op.fixed b/tests/ui/missing-trait-bounds/missing-trait-bound-for-op.fixed
index 6b24375e4..6b24375e4 100644
--- a/src/test/ui/missing-trait-bounds/missing-trait-bound-for-op.fixed
+++ b/tests/ui/missing-trait-bounds/missing-trait-bound-for-op.fixed
diff --git a/src/test/ui/missing-trait-bounds/missing-trait-bound-for-op.rs b/tests/ui/missing-trait-bounds/missing-trait-bound-for-op.rs
index df47be070..df47be070 100644
--- a/src/test/ui/missing-trait-bounds/missing-trait-bound-for-op.rs
+++ b/tests/ui/missing-trait-bounds/missing-trait-bound-for-op.rs
diff --git a/src/test/ui/missing-trait-bounds/missing-trait-bound-for-op.stderr b/tests/ui/missing-trait-bounds/missing-trait-bound-for-op.stderr
index cde075501..cde075501 100644
--- a/src/test/ui/missing-trait-bounds/missing-trait-bound-for-op.stderr
+++ b/tests/ui/missing-trait-bounds/missing-trait-bound-for-op.stderr
diff --git a/src/test/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.rs b/tests/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.rs
index afd47f71c..afd47f71c 100644
--- a/src/test/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.rs
+++ b/tests/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.rs
diff --git a/src/test/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.stderr b/tests/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.stderr
index 9e94aa2c7..968e285af 100644
--- a/src/test/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.stderr
+++ b/tests/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.stderr
@@ -7,20 +7,16 @@ LL | struct Foo<T> {
 LL |         self.foo();
    |              ^^^ method cannot be called on `&Foo<T>` due to unsatisfied trait bounds
    |
-note: trait bound `T: Default` was not satisfied
+note: the following trait bounds were not satisfied:
+      `T: Bar`
+      `T: Default`
   --> $DIR/missing-trait-bounds-for-method-call.rs:10:9
    |
 LL | impl<T: Default + Bar> Bar for Foo<T> {}
-   |         ^^^^^^^        ---     ------
-   |         |
+   |         ^^^^^^^   ^^^  ---     ------
+   |         |         |
+   |         |         unsatisfied trait bound introduced here
    |         unsatisfied trait bound introduced here
-note: trait bound `T: Bar` was not satisfied
-  --> $DIR/missing-trait-bounds-for-method-call.rs:10:19
-   |
-LL | impl<T: Default + Bar> Bar for Foo<T> {}
-   |                   ^^^  ---     ------
-   |                   |
-   |                   unsatisfied trait bound introduced here
 help: consider restricting the type parameters to satisfy the trait bounds
    |
 LL | struct Foo<T> where T: Bar, T: Default {
diff --git a/src/test/ui/missing/auxiliary/two_macros.rs b/tests/ui/missing/auxiliary/two_macros.rs
index 2330c75c8..2330c75c8 100644
--- a/src/test/ui/missing/auxiliary/two_macros.rs
+++ b/tests/ui/missing/auxiliary/two_macros.rs
diff --git a/src/test/ui/missing/missing-allocator.rs b/tests/ui/missing/missing-allocator.rs
index 2dc509f2c..2dc509f2c 100644
--- a/src/test/ui/missing/missing-allocator.rs
+++ b/tests/ui/missing/missing-allocator.rs
diff --git a/src/test/ui/missing/missing-allocator.stderr b/tests/ui/missing/missing-allocator.stderr
index 0da5651c1..0da5651c1 100644
--- a/src/test/ui/missing/missing-allocator.stderr
+++ b/tests/ui/missing/missing-allocator.stderr
diff --git a/src/test/ui/missing/missing-block-hint.rs b/tests/ui/missing/missing-block-hint.rs
index 89db02a9c..89db02a9c 100644
--- a/src/test/ui/missing/missing-block-hint.rs
+++ b/tests/ui/missing/missing-block-hint.rs
diff --git a/src/test/ui/missing/missing-block-hint.stderr b/tests/ui/missing/missing-block-hint.stderr
index 16954223a..16954223a 100644
--- a/src/test/ui/missing/missing-block-hint.stderr
+++ b/tests/ui/missing/missing-block-hint.stderr
diff --git a/src/test/ui/missing/missing-comma-in-match.fixed b/tests/ui/missing/missing-comma-in-match.fixed
index f091082f3..f091082f3 100644
--- a/src/test/ui/missing/missing-comma-in-match.fixed
+++ b/tests/ui/missing/missing-comma-in-match.fixed
diff --git a/src/test/ui/missing/missing-comma-in-match.rs b/tests/ui/missing/missing-comma-in-match.rs
index 54dab4e97..54dab4e97 100644
--- a/src/test/ui/missing/missing-comma-in-match.rs
+++ b/tests/ui/missing/missing-comma-in-match.rs
diff --git a/src/test/ui/missing/missing-comma-in-match.stderr b/tests/ui/missing/missing-comma-in-match.stderr
index fe210f697..fe210f697 100644
--- a/src/test/ui/missing/missing-comma-in-match.stderr
+++ b/tests/ui/missing/missing-comma-in-match.stderr
diff --git a/src/test/ui/missing/missing-derivable-attr.rs b/tests/ui/missing/missing-derivable-attr.rs
index 58c94de50..58c94de50 100644
--- a/src/test/ui/missing/missing-derivable-attr.rs
+++ b/tests/ui/missing/missing-derivable-attr.rs
diff --git a/src/test/ui/missing/missing-derivable-attr.stderr b/tests/ui/missing/missing-derivable-attr.stderr
index 9b8c0c583..9b8c0c583 100644
--- a/src/test/ui/missing/missing-derivable-attr.stderr
+++ b/tests/ui/missing/missing-derivable-attr.stderr
diff --git a/src/test/ui/missing/missing-fields-in-struct-pattern.rs b/tests/ui/missing/missing-fields-in-struct-pattern.rs
index 40304a674..40304a674 100644
--- a/src/test/ui/missing/missing-fields-in-struct-pattern.rs
+++ b/tests/ui/missing/missing-fields-in-struct-pattern.rs
diff --git a/src/test/ui/missing/missing-fields-in-struct-pattern.stderr b/tests/ui/missing/missing-fields-in-struct-pattern.stderr
index 1fe9f5299..1fe9f5299 100644
--- a/src/test/ui/missing/missing-fields-in-struct-pattern.stderr
+++ b/tests/ui/missing/missing-fields-in-struct-pattern.stderr
diff --git a/src/test/ui/missing/missing-items/auxiliary/m1.rs b/tests/ui/missing/missing-items/auxiliary/m1.rs
index fcf52c9e8..fcf52c9e8 100644
--- a/src/test/ui/missing/missing-items/auxiliary/m1.rs
+++ b/tests/ui/missing/missing-items/auxiliary/m1.rs
diff --git a/src/test/ui/missing/missing-items/m2.rs b/tests/ui/missing/missing-items/m2.rs
index c2a6914ab..c2a6914ab 100644
--- a/src/test/ui/missing/missing-items/m2.rs
+++ b/tests/ui/missing/missing-items/m2.rs
diff --git a/src/test/ui/missing/missing-items/m2.stderr b/tests/ui/missing/missing-items/m2.stderr
index d18fb443a..d18fb443a 100644
--- a/src/test/ui/missing/missing-items/m2.stderr
+++ b/tests/ui/missing/missing-items/m2.stderr
diff --git a/src/test/ui/missing/missing-items/missing-type-parameter.rs b/tests/ui/missing/missing-items/missing-type-parameter.rs
index 8a64053a4..8a64053a4 100644
--- a/src/test/ui/missing/missing-items/missing-type-parameter.rs
+++ b/tests/ui/missing/missing-items/missing-type-parameter.rs
diff --git a/src/test/ui/missing/missing-items/missing-type-parameter.stderr b/tests/ui/missing/missing-items/missing-type-parameter.stderr
index 722539fca..722539fca 100644
--- a/src/test/ui/missing/missing-items/missing-type-parameter.stderr
+++ b/tests/ui/missing/missing-items/missing-type-parameter.stderr
diff --git a/src/test/ui/missing/missing-items/missing-type-parameter2.rs b/tests/ui/missing/missing-items/missing-type-parameter2.rs
index e9b32fb71..e9b32fb71 100644
--- a/src/test/ui/missing/missing-items/missing-type-parameter2.rs
+++ b/tests/ui/missing/missing-items/missing-type-parameter2.rs
diff --git a/src/test/ui/missing/missing-items/missing-type-parameter2.stderr b/tests/ui/missing/missing-items/missing-type-parameter2.stderr
index f33951c98..f33951c98 100644
--- a/src/test/ui/missing/missing-items/missing-type-parameter2.stderr
+++ b/tests/ui/missing/missing-items/missing-type-parameter2.stderr
diff --git a/src/test/ui/missing/missing-macro-use.rs b/tests/ui/missing/missing-macro-use.rs
index d494c4471..d494c4471 100644
--- a/src/test/ui/missing/missing-macro-use.rs
+++ b/tests/ui/missing/missing-macro-use.rs
diff --git a/src/test/ui/missing/missing-macro-use.stderr b/tests/ui/missing/missing-macro-use.stderr
index ced062269..99e291cda 100644
--- a/src/test/ui/missing/missing-macro-use.stderr
+++ b/tests/ui/missing/missing-macro-use.stderr
@@ -4,7 +4,7 @@ error: cannot find macro `macro_two` in this scope
 LL |     macro_two!();
    |     ^^^^^^^^^
    |
-   = note: consider importing this macro:
+   = help: consider importing this macro:
            two_macros::macro_two
 
 error: aborting due to previous error
diff --git a/src/test/ui/missing/missing-main.rs b/tests/ui/missing/missing-main.rs
index 6ad544533..6ad544533 100644
--- a/src/test/ui/missing/missing-main.rs
+++ b/tests/ui/missing/missing-main.rs
diff --git a/src/test/ui/missing/missing-main.stderr b/tests/ui/missing/missing-main.stderr
index 5113dc6ec..5113dc6ec 100644
--- a/src/test/ui/missing/missing-main.stderr
+++ b/tests/ui/missing/missing-main.stderr
diff --git a/src/test/ui/missing/missing-return.rs b/tests/ui/missing/missing-return.rs
index 6a171753d..6a171753d 100644
--- a/src/test/ui/missing/missing-return.rs
+++ b/tests/ui/missing/missing-return.rs
diff --git a/src/test/ui/missing/missing-return.stderr b/tests/ui/missing/missing-return.stderr
index ff7f261e0..ff7f261e0 100644
--- a/src/test/ui/missing/missing-return.stderr
+++ b/tests/ui/missing/missing-return.stderr
diff --git a/src/test/ui/missing/missing-stability.rs b/tests/ui/missing/missing-stability.rs
index 0da5808b4..0da5808b4 100644
--- a/src/test/ui/missing/missing-stability.rs
+++ b/tests/ui/missing/missing-stability.rs
diff --git a/src/test/ui/missing/missing-stability.stderr b/tests/ui/missing/missing-stability.stderr
index 659f8c78c..659f8c78c 100644
--- a/src/test/ui/missing/missing-stability.stderr
+++ b/tests/ui/missing/missing-stability.stderr
diff --git a/src/test/ui/missing_debug_impls.rs b/tests/ui/missing_debug_impls.rs
index dc4dacfc4..dc4dacfc4 100644
--- a/src/test/ui/missing_debug_impls.rs
+++ b/tests/ui/missing_debug_impls.rs
diff --git a/src/test/ui/missing_debug_impls.stderr b/tests/ui/missing_debug_impls.stderr
index 0538f207b..0538f207b 100644
--- a/src/test/ui/missing_debug_impls.stderr
+++ b/tests/ui/missing_debug_impls.stderr
diff --git a/src/test/ui/missing_non_modrs_mod/foo.rs b/tests/ui/missing_non_modrs_mod/foo.rs
index 4f41316c8..4f41316c8 100644
--- a/src/test/ui/missing_non_modrs_mod/foo.rs
+++ b/tests/ui/missing_non_modrs_mod/foo.rs
diff --git a/src/test/ui/missing_non_modrs_mod/foo_inline.rs b/tests/ui/missing_non_modrs_mod/foo_inline.rs
index df60629ec..df60629ec 100644
--- a/src/test/ui/missing_non_modrs_mod/foo_inline.rs
+++ b/tests/ui/missing_non_modrs_mod/foo_inline.rs
diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs
index 4ff975af6..4ff975af6 100644
--- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs
+++ b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs
diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr
index 31e4206a5..31e4206a5 100644
--- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr
+++ b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr
diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs
index 9ebb4f1bd..9ebb4f1bd 100644
--- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs
+++ b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs
diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr
index 9d252398b..9d252398b 100644
--- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr
+++ b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr
diff --git a/src/test/ui/mod-subitem-as-enum-variant.rs b/tests/ui/mod-subitem-as-enum-variant.rs
index 959024c46..959024c46 100644
--- a/src/test/ui/mod-subitem-as-enum-variant.rs
+++ b/tests/ui/mod-subitem-as-enum-variant.rs
diff --git a/src/test/ui/mod-subitem-as-enum-variant.stderr b/tests/ui/mod-subitem-as-enum-variant.stderr
index cf61e94bd..cf61e94bd 100644
--- a/src/test/ui/mod-subitem-as-enum-variant.stderr
+++ b/tests/ui/mod-subitem-as-enum-variant.stderr
diff --git a/src/test/ui/module-macro_use-arguments.rs b/tests/ui/module-macro_use-arguments.rs
index 121b492e2..121b492e2 100644
--- a/src/test/ui/module-macro_use-arguments.rs
+++ b/tests/ui/module-macro_use-arguments.rs
diff --git a/src/test/ui/module-macro_use-arguments.stderr b/tests/ui/module-macro_use-arguments.stderr
index af799cb6d..af799cb6d 100644
--- a/src/test/ui/module-macro_use-arguments.stderr
+++ b/tests/ui/module-macro_use-arguments.stderr
diff --git a/src/test/ui/modules/auxiliary/dummy_lib.rs b/tests/ui/modules/auxiliary/dummy_lib.rs
index ef805c1f0..ef805c1f0 100644
--- a/src/test/ui/modules/auxiliary/dummy_lib.rs
+++ b/tests/ui/modules/auxiliary/dummy_lib.rs
diff --git a/src/test/ui/modules/auxiliary/two_macros_2.rs b/tests/ui/modules/auxiliary/two_macros_2.rs
index 8ad2c0f12..8ad2c0f12 100644
--- a/src/test/ui/modules/auxiliary/two_macros_2.rs
+++ b/tests/ui/modules/auxiliary/two_macros_2.rs
diff --git a/src/test/ui/modules/issue-56411-aux.rs b/tests/ui/modules/issue-56411-aux.rs
index c8e5a0598..c8e5a0598 100644
--- a/src/test/ui/modules/issue-56411-aux.rs
+++ b/tests/ui/modules/issue-56411-aux.rs
diff --git a/src/test/ui/modules/issue-56411.rs b/tests/ui/modules/issue-56411.rs
index 0a20f5fe9..0a20f5fe9 100644
--- a/src/test/ui/modules/issue-56411.rs
+++ b/tests/ui/modules/issue-56411.rs
diff --git a/src/test/ui/modules/issue-56411.stderr b/tests/ui/modules/issue-56411.stderr
index 6732a8a3d..6732a8a3d 100644
--- a/src/test/ui/modules/issue-56411.stderr
+++ b/tests/ui/modules/issue-56411.stderr
diff --git a/src/test/ui/modules/mod-inside-fn.rs b/tests/ui/modules/mod-inside-fn.rs
index 93050c891..93050c891 100644
--- a/src/test/ui/modules/mod-inside-fn.rs
+++ b/tests/ui/modules/mod-inside-fn.rs
diff --git a/src/test/ui/modules/mod-view-items.rs b/tests/ui/modules/mod-view-items.rs
index db2b30366..db2b30366 100644
--- a/src/test/ui/modules/mod-view-items.rs
+++ b/tests/ui/modules/mod-view-items.rs
diff --git a/src/test/ui/modules/mod_dir_implicit.rs b/tests/ui/modules/mod_dir_implicit.rs
index d6ea6a98b..d6ea6a98b 100644
--- a/src/test/ui/modules/mod_dir_implicit.rs
+++ b/tests/ui/modules/mod_dir_implicit.rs
diff --git a/src/test/ui/modules/mod_dir_implicit_aux/compiletest-ignore-dir b/tests/ui/modules/mod_dir_implicit_aux/compiletest-ignore-dir
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/modules/mod_dir_implicit_aux/compiletest-ignore-dir
+++ b/tests/ui/modules/mod_dir_implicit_aux/compiletest-ignore-dir
diff --git a/src/test/ui/modules/mod_dir_implicit_aux/mod.rs b/tests/ui/modules/mod_dir_implicit_aux/mod.rs
index 4f1eb85e4..4f1eb85e4 100644
--- a/src/test/ui/modules/mod_dir_implicit_aux/mod.rs
+++ b/tests/ui/modules/mod_dir_implicit_aux/mod.rs
diff --git a/src/test/ui/modules/mod_dir_path.rs b/tests/ui/modules/mod_dir_path.rs
index 70f592d0c..70f592d0c 100644
--- a/src/test/ui/modules/mod_dir_path.rs
+++ b/tests/ui/modules/mod_dir_path.rs
diff --git a/src/test/ui/modules/mod_dir_path2.rs b/tests/ui/modules/mod_dir_path2.rs
index c3e3e1d63..c3e3e1d63 100644
--- a/src/test/ui/modules/mod_dir_path2.rs
+++ b/tests/ui/modules/mod_dir_path2.rs
diff --git a/src/test/ui/modules/mod_dir_path3.rs b/tests/ui/modules/mod_dir_path3.rs
index fed70c1bc..fed70c1bc 100644
--- a/src/test/ui/modules/mod_dir_path3.rs
+++ b/tests/ui/modules/mod_dir_path3.rs
diff --git a/src/test/ui/modules/mod_dir_path_multi.rs b/tests/ui/modules/mod_dir_path_multi.rs
index 2b805141a..2b805141a 100644
--- a/src/test/ui/modules/mod_dir_path_multi.rs
+++ b/tests/ui/modules/mod_dir_path_multi.rs
diff --git a/src/test/ui/modules/mod_dir_recursive.rs b/tests/ui/modules/mod_dir_recursive.rs
index b109d13d1..b109d13d1 100644
--- a/src/test/ui/modules/mod_dir_recursive.rs
+++ b/tests/ui/modules/mod_dir_recursive.rs
diff --git a/src/test/ui/modules/mod_dir_simple.rs b/tests/ui/modules/mod_dir_simple.rs
index 1d92c968a..1d92c968a 100644
--- a/src/test/ui/modules/mod_dir_simple.rs
+++ b/tests/ui/modules/mod_dir_simple.rs
diff --git a/src/test/ui/modules/mod_dir_simple/compiletest-ignore-dir b/tests/ui/modules/mod_dir_simple/compiletest-ignore-dir
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/modules/mod_dir_simple/compiletest-ignore-dir
+++ b/tests/ui/modules/mod_dir_simple/compiletest-ignore-dir
diff --git a/src/test/ui/modules/mod_dir_simple/load_another_mod.rs b/tests/ui/modules/mod_dir_simple/load_another_mod.rs
index f96b546aa..f96b546aa 100644
--- a/src/test/ui/modules/mod_dir_simple/load_another_mod.rs
+++ b/tests/ui/modules/mod_dir_simple/load_another_mod.rs
diff --git a/src/test/ui/modules/mod_dir_simple/test.rs b/tests/ui/modules/mod_dir_simple/test.rs
index 4f1eb85e4..4f1eb85e4 100644
--- a/src/test/ui/modules/mod_dir_simple/test.rs
+++ b/tests/ui/modules/mod_dir_simple/test.rs
diff --git a/src/test/ui/modules/mod_file.rs b/tests/ui/modules/mod_file.rs
index 0ca52889e..0ca52889e 100644
--- a/src/test/ui/modules/mod_file.rs
+++ b/tests/ui/modules/mod_file.rs
diff --git a/src/test/ui/modules/mod_file_aux.rs b/tests/ui/modules/mod_file_aux.rs
index 6d052272e..6d052272e 100644
--- a/src/test/ui/modules/mod_file_aux.rs
+++ b/tests/ui/modules/mod_file_aux.rs
diff --git a/src/test/ui/modules/mod_file_with_path_attr.rs b/tests/ui/modules/mod_file_with_path_attr.rs
index 48e253ead..48e253ead 100644
--- a/src/test/ui/modules/mod_file_with_path_attr.rs
+++ b/tests/ui/modules/mod_file_with_path_attr.rs
diff --git a/src/test/ui/modules/module-polymorphism3-files/compiletest-ignore-dir b/tests/ui/modules/module-polymorphism3-files/compiletest-ignore-dir
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/modules/module-polymorphism3-files/compiletest-ignore-dir
+++ b/tests/ui/modules/module-polymorphism3-files/compiletest-ignore-dir
diff --git a/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f32.rs b/tests/ui/modules/module-polymorphism3-files/float-template/inst_f32.rs
index 49d2b3d4b..49d2b3d4b 100644
--- a/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f32.rs
+++ b/tests/ui/modules/module-polymorphism3-files/float-template/inst_f32.rs
diff --git a/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f64.rs b/tests/ui/modules/module-polymorphism3-files/float-template/inst_f64.rs
index e2aad480e..e2aad480e 100644
--- a/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f64.rs
+++ b/tests/ui/modules/module-polymorphism3-files/float-template/inst_f64.rs
diff --git a/src/test/ui/modules/module-polymorphism3-files/float-template/inst_float.rs b/tests/ui/modules/module-polymorphism3-files/float-template/inst_float.rs
index 5828718cd..5828718cd 100644
--- a/src/test/ui/modules/module-polymorphism3-files/float-template/inst_float.rs
+++ b/tests/ui/modules/module-polymorphism3-files/float-template/inst_float.rs
diff --git a/src/test/ui/modules/path-invalid-form.rs b/tests/ui/modules/path-invalid-form.rs
index 713ef4a79..713ef4a79 100644
--- a/src/test/ui/modules/path-invalid-form.rs
+++ b/tests/ui/modules/path-invalid-form.rs
diff --git a/src/test/ui/modules/path-invalid-form.stderr b/tests/ui/modules/path-invalid-form.stderr
index 7e8aa44ef..7e8aa44ef 100644
--- a/src/test/ui/modules/path-invalid-form.stderr
+++ b/tests/ui/modules/path-invalid-form.stderr
diff --git a/src/test/ui/modules/path-macro.rs b/tests/ui/modules/path-macro.rs
index ce2d1e2da..ce2d1e2da 100644
--- a/src/test/ui/modules/path-macro.rs
+++ b/tests/ui/modules/path-macro.rs
diff --git a/src/test/ui/modules/path-macro.stderr b/tests/ui/modules/path-macro.stderr
index 9a2e01ea2..9a2e01ea2 100644
--- a/src/test/ui/modules/path-macro.stderr
+++ b/tests/ui/modules/path-macro.stderr
diff --git a/src/test/ui/modules/path-no-file-name.rs b/tests/ui/modules/path-no-file-name.rs
index f62cd2a9e..f62cd2a9e 100644
--- a/src/test/ui/modules/path-no-file-name.rs
+++ b/tests/ui/modules/path-no-file-name.rs
diff --git a/src/test/ui/modules/path-no-file-name.stderr b/tests/ui/modules/path-no-file-name.stderr
index 32a213c68..32a213c68 100644
--- a/src/test/ui/modules/path-no-file-name.stderr
+++ b/tests/ui/modules/path-no-file-name.stderr
diff --git a/src/test/ui/modules/special_module_name.rs b/tests/ui/modules/special_module_name.rs
index 15c59b2da..15c59b2da 100644
--- a/src/test/ui/modules/special_module_name.rs
+++ b/tests/ui/modules/special_module_name.rs
diff --git a/src/test/ui/modules/special_module_name.stderr b/tests/ui/modules/special_module_name.stderr
index bc4b4f1b3..bc4b4f1b3 100644
--- a/src/test/ui/modules/special_module_name.stderr
+++ b/tests/ui/modules/special_module_name.stderr
diff --git a/src/test/ui/modules/special_module_name_ignore.rs b/tests/ui/modules/special_module_name_ignore.rs
index 07cea9b2b..07cea9b2b 100644
--- a/src/test/ui/modules/special_module_name_ignore.rs
+++ b/tests/ui/modules/special_module_name_ignore.rs
diff --git a/src/test/ui/modules_and_files_visibility/mod_file_aux.rs b/tests/ui/modules_and_files_visibility/mod_file_aux.rs
index 98f42c5cd..98f42c5cd 100644
--- a/src/test/ui/modules_and_files_visibility/mod_file_aux.rs
+++ b/tests/ui/modules_and_files_visibility/mod_file_aux.rs
diff --git a/src/test/ui/modules_and_files_visibility/mod_file_correct_spans.rs b/tests/ui/modules_and_files_visibility/mod_file_correct_spans.rs
index c42d2eaa7..c42d2eaa7 100644
--- a/src/test/ui/modules_and_files_visibility/mod_file_correct_spans.rs
+++ b/tests/ui/modules_and_files_visibility/mod_file_correct_spans.rs
diff --git a/src/test/ui/modules_and_files_visibility/mod_file_correct_spans.stderr b/tests/ui/modules_and_files_visibility/mod_file_correct_spans.stderr
index 73044752b..73044752b 100644
--- a/src/test/ui/modules_and_files_visibility/mod_file_correct_spans.stderr
+++ b/tests/ui/modules_and_files_visibility/mod_file_correct_spans.stderr
diff --git a/src/test/ui/modules_and_files_visibility/mod_file_disambig.rs b/tests/ui/modules_and_files_visibility/mod_file_disambig.rs
index e5958af17..e5958af17 100644
--- a/src/test/ui/modules_and_files_visibility/mod_file_disambig.rs
+++ b/tests/ui/modules_and_files_visibility/mod_file_disambig.rs
diff --git a/src/test/ui/modules_and_files_visibility/mod_file_disambig.stderr b/tests/ui/modules_and_files_visibility/mod_file_disambig.stderr
index a2c993969..a2c993969 100644
--- a/src/test/ui/modules_and_files_visibility/mod_file_disambig.stderr
+++ b/tests/ui/modules_and_files_visibility/mod_file_disambig.stderr
diff --git a/src/test/ui/modules_and_files_visibility/mod_file_disambig_aux.rs b/tests/ui/modules_and_files_visibility/mod_file_disambig_aux.rs
index 3bf9609f4..3bf9609f4 100644
--- a/src/test/ui/modules_and_files_visibility/mod_file_disambig_aux.rs
+++ b/tests/ui/modules_and_files_visibility/mod_file_disambig_aux.rs
diff --git a/src/test/ui/modules_and_files_visibility/mod_file_disambig_aux/mod.rs b/tests/ui/modules_and_files_visibility/mod_file_disambig_aux/mod.rs
index 3bf9609f4..3bf9609f4 100644
--- a/src/test/ui/modules_and_files_visibility/mod_file_disambig_aux/mod.rs
+++ b/tests/ui/modules_and_files_visibility/mod_file_disambig_aux/mod.rs
diff --git a/src/test/ui/monomorphize-abi-alignment.rs b/tests/ui/monomorphize-abi-alignment.rs
index a8d8bd1d5..a8d8bd1d5 100644
--- a/src/test/ui/monomorphize-abi-alignment.rs
+++ b/tests/ui/monomorphize-abi-alignment.rs
diff --git a/src/test/ui/moves/borrow-closures-instead-of-move.rs b/tests/ui/moves/borrow-closures-instead-of-move.rs
index 51771ced7..51771ced7 100644
--- a/src/test/ui/moves/borrow-closures-instead-of-move.rs
+++ b/tests/ui/moves/borrow-closures-instead-of-move.rs
diff --git a/src/test/ui/moves/borrow-closures-instead-of-move.stderr b/tests/ui/moves/borrow-closures-instead-of-move.stderr
index 9a84ddef7..9a84ddef7 100644
--- a/src/test/ui/moves/borrow-closures-instead-of-move.stderr
+++ b/tests/ui/moves/borrow-closures-instead-of-move.stderr
diff --git a/src/test/ui/moves/issue-46099-move-in-macro.rs b/tests/ui/moves/issue-46099-move-in-macro.rs
index 576fe1f4c..576fe1f4c 100644
--- a/src/test/ui/moves/issue-46099-move-in-macro.rs
+++ b/tests/ui/moves/issue-46099-move-in-macro.rs
diff --git a/src/test/ui/moves/issue-46099-move-in-macro.stderr b/tests/ui/moves/issue-46099-move-in-macro.stderr
index 94bc9e6f4..94bc9e6f4 100644
--- a/src/test/ui/moves/issue-46099-move-in-macro.stderr
+++ b/tests/ui/moves/issue-46099-move-in-macro.stderr
diff --git a/src/test/ui/moves/issue-72649-uninit-in-loop.rs b/tests/ui/moves/issue-72649-uninit-in-loop.rs
index 56c225bab..56c225bab 100644
--- a/src/test/ui/moves/issue-72649-uninit-in-loop.rs
+++ b/tests/ui/moves/issue-72649-uninit-in-loop.rs
diff --git a/src/test/ui/moves/issue-72649-uninit-in-loop.stderr b/tests/ui/moves/issue-72649-uninit-in-loop.stderr
index 7e119fe8c..7e119fe8c 100644
--- a/src/test/ui/moves/issue-72649-uninit-in-loop.stderr
+++ b/tests/ui/moves/issue-72649-uninit-in-loop.stderr
diff --git a/src/test/ui/moves/issue-75904-move-closure-loop.rs b/tests/ui/moves/issue-75904-move-closure-loop.rs
index 6641a0376..6641a0376 100644
--- a/src/test/ui/moves/issue-75904-move-closure-loop.rs
+++ b/tests/ui/moves/issue-75904-move-closure-loop.rs
diff --git a/src/test/ui/moves/issue-75904-move-closure-loop.stderr b/tests/ui/moves/issue-75904-move-closure-loop.stderr
index 5e427a1fc..5e427a1fc 100644
--- a/src/test/ui/moves/issue-75904-move-closure-loop.stderr
+++ b/tests/ui/moves/issue-75904-move-closure-loop.stderr
diff --git a/src/test/ui/moves/issue-99470-move-out-of-some.rs b/tests/ui/moves/issue-99470-move-out-of-some.rs
index f404cd3cd..f404cd3cd 100644
--- a/src/test/ui/moves/issue-99470-move-out-of-some.rs
+++ b/tests/ui/moves/issue-99470-move-out-of-some.rs
diff --git a/tests/ui/moves/issue-99470-move-out-of-some.stderr b/tests/ui/moves/issue-99470-move-out-of-some.stderr
new file mode 100644
index 000000000..c5159471f
--- /dev/null
+++ b/tests/ui/moves/issue-99470-move-out-of-some.stderr
@@ -0,0 +1,21 @@
+error[E0507]: cannot move out of `x` as enum variant `Some` which is behind a shared reference
+  --> $DIR/issue-99470-move-out-of-some.rs:4:11
+   |
+LL |     match x {
+   |           ^
+LL |
+LL |         &Some(_y) => (),
+   |               --
+   |               |
+   |               data moved here
+   |               move occurs because `_y` has type `Box<i32>`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -         &Some(_y) => (),
+LL +         Some(_y) => (),
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/moves/move-1-unique.rs b/tests/ui/moves/move-1-unique.rs
index f98d075d1..f98d075d1 100644
--- a/src/test/ui/moves/move-1-unique.rs
+++ b/tests/ui/moves/move-1-unique.rs
diff --git a/src/test/ui/moves/move-2-unique.rs b/tests/ui/moves/move-2-unique.rs
index 8fda3c1c8..8fda3c1c8 100644
--- a/src/test/ui/moves/move-2-unique.rs
+++ b/tests/ui/moves/move-2-unique.rs
diff --git a/src/test/ui/moves/move-2.rs b/tests/ui/moves/move-2.rs
index 5e0100874..5e0100874 100644
--- a/src/test/ui/moves/move-2.rs
+++ b/tests/ui/moves/move-2.rs
diff --git a/src/test/ui/moves/move-3-unique.rs b/tests/ui/moves/move-3-unique.rs
index 8e5df2c3f..8e5df2c3f 100644
--- a/src/test/ui/moves/move-3-unique.rs
+++ b/tests/ui/moves/move-3-unique.rs
diff --git a/src/test/ui/moves/move-4-unique.rs b/tests/ui/moves/move-4-unique.rs
index 24aec7ea6..24aec7ea6 100644
--- a/src/test/ui/moves/move-4-unique.rs
+++ b/tests/ui/moves/move-4-unique.rs
diff --git a/src/test/ui/moves/move-4.rs b/tests/ui/moves/move-4.rs
index 63aa031a6..63aa031a6 100644
--- a/src/test/ui/moves/move-4.rs
+++ b/tests/ui/moves/move-4.rs
diff --git a/src/test/ui/moves/move-arg-2-unique.rs b/tests/ui/moves/move-arg-2-unique.rs
index 9622c8375..9622c8375 100644
--- a/src/test/ui/moves/move-arg-2-unique.rs
+++ b/tests/ui/moves/move-arg-2-unique.rs
diff --git a/src/test/ui/moves/move-arg-2.rs b/tests/ui/moves/move-arg-2.rs
index 77ee06e19..77ee06e19 100644
--- a/src/test/ui/moves/move-arg-2.rs
+++ b/tests/ui/moves/move-arg-2.rs
diff --git a/src/test/ui/moves/move-arg.rs b/tests/ui/moves/move-arg.rs
index 5942cd89f..5942cd89f 100644
--- a/src/test/ui/moves/move-arg.rs
+++ b/tests/ui/moves/move-arg.rs
diff --git a/src/test/ui/moves/move-deref-coercion.rs b/tests/ui/moves/move-deref-coercion.rs
index 41154388f..41154388f 100644
--- a/src/test/ui/moves/move-deref-coercion.rs
+++ b/tests/ui/moves/move-deref-coercion.rs
diff --git a/src/test/ui/moves/move-deref-coercion.stderr b/tests/ui/moves/move-deref-coercion.stderr
index 5760f4a7f..5760f4a7f 100644
--- a/src/test/ui/moves/move-deref-coercion.stderr
+++ b/tests/ui/moves/move-deref-coercion.stderr
diff --git a/src/test/ui/moves/move-fn-self-receiver.rs b/tests/ui/moves/move-fn-self-receiver.rs
index 946642ef6..946642ef6 100644
--- a/src/test/ui/moves/move-fn-self-receiver.rs
+++ b/tests/ui/moves/move-fn-self-receiver.rs
diff --git a/src/test/ui/moves/move-fn-self-receiver.stderr b/tests/ui/moves/move-fn-self-receiver.stderr
index c13dc5882..7f69e5dcf 100644
--- a/src/test/ui/moves/move-fn-self-receiver.stderr
+++ b/tests/ui/moves/move-fn-self-receiver.stderr
@@ -6,12 +6,13 @@ LL |     val.0.into_iter().next();
 LL |     val.0;
    |     ^^^^^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `val.0`
+note: `into_iter` takes ownership of the receiver `self`, which moves `val.0`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
    = note: move occurs because `val.0` has type `Vec<bool>`, which does not implement the `Copy` trait
+help: you can `clone` the value and consume it, but this might not be your desired behavior
+   |
+LL |     val.0.clone().into_iter().next();
+   |           ++++++++
 
 error[E0382]: use of moved value: `foo`
   --> $DIR/move-fn-self-receiver.rs:34:5
@@ -23,7 +24,7 @@ LL |     foo.use_self();
 LL |     foo;
    |     ^^^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `foo`
+note: `Foo::use_self` takes ownership of the receiver `self`, which moves `foo`
   --> $DIR/move-fn-self-receiver.rs:13:17
    |
 LL |     fn use_self(self) {}
@@ -49,7 +50,7 @@ LL |     boxed_foo.use_box_self();
 LL |     boxed_foo;
    |     ^^^^^^^^^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `boxed_foo`
+note: `Foo::use_box_self` takes ownership of the receiver `self`, which moves `boxed_foo`
   --> $DIR/move-fn-self-receiver.rs:14:21
    |
 LL |     fn use_box_self(self: Box<Self>) {}
@@ -65,7 +66,7 @@ LL |     pin_box_foo.use_pin_box_self();
 LL |     pin_box_foo;
    |     ^^^^^^^^^^^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `pin_box_foo`
+note: `Foo::use_pin_box_self` takes ownership of the receiver `self`, which moves `pin_box_foo`
   --> $DIR/move-fn-self-receiver.rs:15:25
    |
 LL |     fn use_pin_box_self(self: Pin<Box<Self>>) {}
@@ -91,15 +92,15 @@ LL |     rc_foo.use_rc_self();
 LL |     rc_foo;
    |     ^^^^^^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `rc_foo`
+note: `Foo::use_rc_self` takes ownership of the receiver `self`, which moves `rc_foo`
   --> $DIR/move-fn-self-receiver.rs:16:20
    |
 LL |     fn use_rc_self(self: Rc<Self>) {}
    |                    ^^^^
-help: consider cloning the value if the performance cost is acceptable
+help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     rc_foo.clone().use_rc_self();
-   |           ++++++++
+   |            ++++++++
 
 error[E0382]: use of moved value: `foo_add`
   --> $DIR/move-fn-self-receiver.rs:59:5
@@ -113,9 +114,6 @@ LL |     foo_add;
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn add(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 
 error[E0382]: use of moved value: `implicit_into_iter`
   --> $DIR/move-fn-self-receiver.rs:63:5
@@ -142,10 +140,10 @@ LL |     for _val in explicit_into_iter.into_iter() {}
 LL |     explicit_into_iter;
    |     ^^^^^^^^^^^^^^^^^^ value used here after move
    |
-help: consider cloning the value if the performance cost is acceptable
+help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     for _val in explicit_into_iter.clone().into_iter() {}
-   |                                   ++++++++
+   |                                    ++++++++
 
 error[E0382]: use of moved value: `container`
   --> $DIR/move-fn-self-receiver.rs:71:5
@@ -157,7 +155,7 @@ LL |     for _val in container.custom_into_iter() {}
 LL |     container;
    |     ^^^^^^^^^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `container`
+note: `Container::custom_into_iter` takes ownership of the receiver `self`, which moves `container`
   --> $DIR/move-fn-self-receiver.rs:23:25
    |
 LL |     fn custom_into_iter(self) -> impl Iterator<Item = bool> {
diff --git a/src/test/ui/moves/move-guard-same-consts.rs b/tests/ui/moves/move-guard-same-consts.rs
index b96ef8e19..b96ef8e19 100644
--- a/src/test/ui/moves/move-guard-same-consts.rs
+++ b/tests/ui/moves/move-guard-same-consts.rs
diff --git a/src/test/ui/moves/move-guard-same-consts.stderr b/tests/ui/moves/move-guard-same-consts.stderr
index 86e5f6524..86e5f6524 100644
--- a/src/test/ui/moves/move-guard-same-consts.stderr
+++ b/tests/ui/moves/move-guard-same-consts.stderr
diff --git a/src/test/ui/moves/move-in-guard-1.rs b/tests/ui/moves/move-in-guard-1.rs
index 36e39fea6..36e39fea6 100644
--- a/src/test/ui/moves/move-in-guard-1.rs
+++ b/tests/ui/moves/move-in-guard-1.rs
diff --git a/src/test/ui/moves/move-in-guard-1.stderr b/tests/ui/moves/move-in-guard-1.stderr
index f04cb34d7..f04cb34d7 100644
--- a/src/test/ui/moves/move-in-guard-1.stderr
+++ b/tests/ui/moves/move-in-guard-1.stderr
diff --git a/src/test/ui/moves/move-in-guard-2.rs b/tests/ui/moves/move-in-guard-2.rs
index 085b7ec6e..085b7ec6e 100644
--- a/src/test/ui/moves/move-in-guard-2.rs
+++ b/tests/ui/moves/move-in-guard-2.rs
diff --git a/src/test/ui/moves/move-in-guard-2.stderr b/tests/ui/moves/move-in-guard-2.stderr
index 26047861f..26047861f 100644
--- a/src/test/ui/moves/move-in-guard-2.stderr
+++ b/tests/ui/moves/move-in-guard-2.stderr
diff --git a/src/test/ui/moves/move-into-dead-array-1.rs b/tests/ui/moves/move-into-dead-array-1.rs
index 0b8d76def..0b8d76def 100644
--- a/src/test/ui/moves/move-into-dead-array-1.rs
+++ b/tests/ui/moves/move-into-dead-array-1.rs
diff --git a/src/test/ui/moves/move-into-dead-array-1.stderr b/tests/ui/moves/move-into-dead-array-1.stderr
index 6db0f0bcb..6db0f0bcb 100644
--- a/src/test/ui/moves/move-into-dead-array-1.stderr
+++ b/tests/ui/moves/move-into-dead-array-1.stderr
diff --git a/src/test/ui/moves/move-into-dead-array-2.rs b/tests/ui/moves/move-into-dead-array-2.rs
index 9b66ea35f..9b66ea35f 100644
--- a/src/test/ui/moves/move-into-dead-array-2.rs
+++ b/tests/ui/moves/move-into-dead-array-2.rs
diff --git a/src/test/ui/moves/move-into-dead-array-2.stderr b/tests/ui/moves/move-into-dead-array-2.stderr
index 19e476c04..19e476c04 100644
--- a/src/test/ui/moves/move-into-dead-array-2.stderr
+++ b/tests/ui/moves/move-into-dead-array-2.stderr
diff --git a/src/test/ui/moves/move-nullary-fn.rs b/tests/ui/moves/move-nullary-fn.rs
index 14c9262c7..14c9262c7 100644
--- a/src/test/ui/moves/move-nullary-fn.rs
+++ b/tests/ui/moves/move-nullary-fn.rs
diff --git a/src/test/ui/moves/move-of-addr-of-mut.rs b/tests/ui/moves/move-of-addr-of-mut.rs
index 19fd70286..19fd70286 100644
--- a/src/test/ui/moves/move-of-addr-of-mut.rs
+++ b/tests/ui/moves/move-of-addr-of-mut.rs
diff --git a/src/test/ui/moves/move-of-addr-of-mut.stderr b/tests/ui/moves/move-of-addr-of-mut.stderr
index ddebaa012..ddebaa012 100644
--- a/src/test/ui/moves/move-of-addr-of-mut.stderr
+++ b/tests/ui/moves/move-of-addr-of-mut.stderr
diff --git a/src/test/ui/moves/move-out-of-array-1.rs b/tests/ui/moves/move-out-of-array-1.rs
index 77cb73e47..77cb73e47 100644
--- a/src/test/ui/moves/move-out-of-array-1.rs
+++ b/tests/ui/moves/move-out-of-array-1.rs
diff --git a/src/test/ui/moves/move-out-of-array-1.stderr b/tests/ui/moves/move-out-of-array-1.stderr
index 0af083e5b..0af083e5b 100644
--- a/src/test/ui/moves/move-out-of-array-1.stderr
+++ b/tests/ui/moves/move-out-of-array-1.stderr
diff --git a/src/test/ui/moves/move-out-of-array-ref.rs b/tests/ui/moves/move-out-of-array-ref.rs
index 343f00ff2..343f00ff2 100644
--- a/src/test/ui/moves/move-out-of-array-ref.rs
+++ b/tests/ui/moves/move-out-of-array-ref.rs
diff --git a/tests/ui/moves/move-out-of-array-ref.stderr b/tests/ui/moves/move-out-of-array-ref.stderr
new file mode 100644
index 000000000..26d4996d6
--- /dev/null
+++ b/tests/ui/moves/move-out-of-array-ref.stderr
@@ -0,0 +1,63 @@
+error[E0508]: cannot move out of type `[D; 4]`, a non-copy array
+  --> $DIR/move-out-of-array-ref.rs:8:24
+   |
+LL |     let [_, e, _, _] = *a;
+   |             -          ^^ cannot move out of here
+   |             |
+   |             data moved here
+   |             move occurs because `e` has type `D`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let [_, e, _, _] = *a;
+LL +     let [_, e, _, _] = a;
+   |
+
+error[E0508]: cannot move out of type `[D; 4]`, a non-copy array
+  --> $DIR/move-out-of-array-ref.rs:13:27
+   |
+LL |     let [_, s @ .. , _] = *a;
+   |             -             ^^ cannot move out of here
+   |             |
+   |             data moved here
+   |             move occurs because `s` has type `[D; 2]`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let [_, s @ .. , _] = *a;
+LL +     let [_, s @ .. , _] = a;
+   |
+
+error[E0508]: cannot move out of type `[D; 4]`, a non-copy array
+  --> $DIR/move-out-of-array-ref.rs:18:24
+   |
+LL |     let [_, e, _, _] = *a;
+   |             -          ^^ cannot move out of here
+   |             |
+   |             data moved here
+   |             move occurs because `e` has type `D`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let [_, e, _, _] = *a;
+LL +     let [_, e, _, _] = a;
+   |
+
+error[E0508]: cannot move out of type `[D; 4]`, a non-copy array
+  --> $DIR/move-out-of-array-ref.rs:23:27
+   |
+LL |     let [_, s @ .. , _] = *a;
+   |             -             ^^ cannot move out of here
+   |             |
+   |             data moved here
+   |             move occurs because `s` has type `[D; 2]`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let [_, s @ .. , _] = *a;
+LL +     let [_, s @ .. , _] = a;
+   |
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0508`.
diff --git a/src/test/ui/moves/move-out-of-field.rs b/tests/ui/moves/move-out-of-field.rs
index 9f697db4f..9f697db4f 100644
--- a/src/test/ui/moves/move-out-of-field.rs
+++ b/tests/ui/moves/move-out-of-field.rs
diff --git a/src/test/ui/moves/move-out-of-slice-1.rs b/tests/ui/moves/move-out-of-slice-1.rs
index 982648f5b..982648f5b 100644
--- a/src/test/ui/moves/move-out-of-slice-1.rs
+++ b/tests/ui/moves/move-out-of-slice-1.rs
diff --git a/src/test/ui/moves/move-out-of-slice-1.stderr b/tests/ui/moves/move-out-of-slice-1.stderr
index ce5ddb3e1..5a0357cf5 100644
--- a/src/test/ui/moves/move-out-of-slice-1.stderr
+++ b/tests/ui/moves/move-out-of-slice-1.stderr
@@ -8,6 +8,11 @@ LL |         box [a] => {},
    |              |
    |              data moved here
    |              move occurs because `a` has type `A`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |         box [ref a] => {},
+   |              +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/moves/move-out-of-slice-2.rs b/tests/ui/moves/move-out-of-slice-2.rs
index 59c02d42b..2f7394fbf 100644
--- a/src/test/ui/moves/move-out-of-slice-2.rs
+++ b/tests/ui/moves/move-out-of-slice-2.rs
@@ -1,5 +1,6 @@
 #![feature(unsized_locals)]
 //~^ WARN the feature `unsized_locals` is incomplete
+#![allow(unused)]
 
 struct A;
 #[derive(Clone, Copy)]
diff --git a/src/test/ui/moves/move-out-of-slice-2.stderr b/tests/ui/moves/move-out-of-slice-2.stderr
index 46357ce6f..b46854cd6 100644
--- a/src/test/ui/moves/move-out-of-slice-2.stderr
+++ b/tests/ui/moves/move-out-of-slice-2.stderr
@@ -8,7 +8,7 @@ LL | #![feature(unsized_locals)]
    = note: `#[warn(incomplete_features)]` on by default
 
 error[E0508]: cannot move out of type `[A]`, a non-copy slice
-  --> $DIR/move-out-of-slice-2.rs:10:11
+  --> $DIR/move-out-of-slice-2.rs:11:11
    |
 LL |     match *a {
    |           ^^ cannot move out of here
@@ -18,9 +18,14 @@ LL |         [a @ ..] => {}
    |          |
    |          data moved here
    |          move occurs because `a` has type `[A]`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |         [ref a @ ..] => {}
+   |          +++
 
 error[E0508]: cannot move out of type `[A]`, a non-copy slice
-  --> $DIR/move-out-of-slice-2.rs:16:11
+  --> $DIR/move-out-of-slice-2.rs:17:11
    |
 LL |     match *b {
    |           ^^ cannot move out of here
@@ -30,9 +35,14 @@ LL |         [_, _, b @ .., _] => {}
    |                |
    |                data moved here
    |                move occurs because `b` has type `[A]`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |         [_, _, ref b @ .., _] => {}
+   |                +++
 
 error[E0508]: cannot move out of type `[C]`, a non-copy slice
-  --> $DIR/move-out-of-slice-2.rs:24:11
+  --> $DIR/move-out-of-slice-2.rs:25:11
    |
 LL |     match *c {
    |           ^^ cannot move out of here
@@ -42,9 +52,14 @@ LL |         [c @ ..] => {}
    |          |
    |          data moved here
    |          move occurs because `c` has type `[C]`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |         [ref c @ ..] => {}
+   |          +++
 
 error[E0508]: cannot move out of type `[C]`, a non-copy slice
-  --> $DIR/move-out-of-slice-2.rs:30:11
+  --> $DIR/move-out-of-slice-2.rs:31:11
    |
 LL |     match *d {
    |           ^^ cannot move out of here
@@ -54,6 +69,11 @@ LL |         [_, _, d @ .., _] => {}
    |                |
    |                data moved here
    |                move occurs because `d` has type `[C]`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |         [_, _, ref d @ .., _] => {}
+   |                +++
 
 error: aborting due to 4 previous errors; 1 warning emitted
 
diff --git a/src/test/ui/moves/move-out-of-tuple-field.rs b/tests/ui/moves/move-out-of-tuple-field.rs
index 66912fa4d..66912fa4d 100644
--- a/src/test/ui/moves/move-out-of-tuple-field.rs
+++ b/tests/ui/moves/move-out-of-tuple-field.rs
diff --git a/src/test/ui/moves/move-out-of-tuple-field.stderr b/tests/ui/moves/move-out-of-tuple-field.stderr
index bb4eb7677..bb4eb7677 100644
--- a/src/test/ui/moves/move-out-of-tuple-field.stderr
+++ b/tests/ui/moves/move-out-of-tuple-field.stderr
diff --git a/src/test/ui/moves/move-scalar.rs b/tests/ui/moves/move-scalar.rs
index 98bfeb1bc..98bfeb1bc 100644
--- a/src/test/ui/moves/move-scalar.rs
+++ b/tests/ui/moves/move-scalar.rs
diff --git a/src/test/ui/moves/moves-based-on-type-access-to-field.rs b/tests/ui/moves/moves-based-on-type-access-to-field.rs
index e2003ed6e..e2003ed6e 100644
--- a/src/test/ui/moves/moves-based-on-type-access-to-field.rs
+++ b/tests/ui/moves/moves-based-on-type-access-to-field.rs
diff --git a/tests/ui/moves/moves-based-on-type-access-to-field.stderr b/tests/ui/moves/moves-based-on-type-access-to-field.stderr
new file mode 100644
index 000000000..a28f324aa
--- /dev/null
+++ b/tests/ui/moves/moves-based-on-type-access-to-field.stderr
@@ -0,0 +1,20 @@
+error[E0382]: borrow of moved value: `x`
+  --> $DIR/moves-based-on-type-access-to-field.rs:11:12
+   |
+LL |     let x = vec!["hi".to_string()];
+   |         - move occurs because `x` has type `Vec<String>`, which does not implement the `Copy` trait
+LL |     consume(x.into_iter().next().unwrap());
+   |               ----------- `x` moved due to this method call
+LL |     touch(&x[0]);
+   |            ^ value borrowed here after move
+   |
+note: `into_iter` takes ownership of the receiver `self`, which moves `x`
+  --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
+help: you can `clone` the value and consume it, but this might not be your desired behavior
+   |
+LL |     consume(x.clone().into_iter().next().unwrap());
+   |               ++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/moves/moves-based-on-type-block-bad.rs b/tests/ui/moves/moves-based-on-type-block-bad.rs
index eca33167f..eca33167f 100644
--- a/src/test/ui/moves/moves-based-on-type-block-bad.rs
+++ b/tests/ui/moves/moves-based-on-type-block-bad.rs
diff --git a/src/test/ui/moves/moves-based-on-type-block-bad.stderr b/tests/ui/moves/moves-based-on-type-block-bad.stderr
index 5ed91a0d5..df09ababa 100644
--- a/src/test/ui/moves/moves-based-on-type-block-bad.stderr
+++ b/tests/ui/moves/moves-based-on-type-block-bad.stderr
@@ -2,13 +2,18 @@ error[E0507]: cannot move out of `hellothere.x` as enum variant `Bar` which is b
   --> $DIR/moves-based-on-type-block-bad.rs:22:19
    |
 LL |             match hellothere.x {
-   |                   ^^^^^^^^^^^^ help: consider borrowing here: `&hellothere.x`
+   |                   ^^^^^^^^^^^^
 LL |                 box E::Foo(_) => {}
 LL |                 box E::Bar(x) => println!("{}", x.to_string()),
    |                            -
    |                            |
    |                            data moved here
    |                            move occurs because `x` has type `Box<isize>`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |             match &hellothere.x {
+   |                   +
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/moves/moves-based-on-type-capture-clause-bad.rs b/tests/ui/moves/moves-based-on-type-capture-clause-bad.rs
index b2f68352f..b2f68352f 100644
--- a/src/test/ui/moves/moves-based-on-type-capture-clause-bad.rs
+++ b/tests/ui/moves/moves-based-on-type-capture-clause-bad.rs
diff --git a/src/test/ui/moves/moves-based-on-type-capture-clause-bad.stderr b/tests/ui/moves/moves-based-on-type-capture-clause-bad.stderr
index 34b7ea658..34b7ea658 100644
--- a/src/test/ui/moves/moves-based-on-type-capture-clause-bad.stderr
+++ b/tests/ui/moves/moves-based-on-type-capture-clause-bad.stderr
diff --git a/src/test/ui/moves/moves-based-on-type-capture-clause.rs b/tests/ui/moves/moves-based-on-type-capture-clause.rs
index 4a6a4ed28..4a6a4ed28 100644
--- a/src/test/ui/moves/moves-based-on-type-capture-clause.rs
+++ b/tests/ui/moves/moves-based-on-type-capture-clause.rs
diff --git a/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.rs b/tests/ui/moves/moves-based-on-type-cyclic-types-issue-4821.rs
index 4417fb926..4417fb926 100644
--- a/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.rs
+++ b/tests/ui/moves/moves-based-on-type-cyclic-types-issue-4821.rs
diff --git a/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.stderr b/tests/ui/moves/moves-based-on-type-cyclic-types-issue-4821.stderr
index db4382b58..db4382b58 100644
--- a/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.stderr
+++ b/tests/ui/moves/moves-based-on-type-cyclic-types-issue-4821.stderr
diff --git a/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.rs b/tests/ui/moves/moves-based-on-type-distribute-copy-over-paren.rs
index d256e18b6..d256e18b6 100644
--- a/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.rs
+++ b/tests/ui/moves/moves-based-on-type-distribute-copy-over-paren.rs
diff --git a/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.stderr b/tests/ui/moves/moves-based-on-type-distribute-copy-over-paren.stderr
index 0930df148..0930df148 100644
--- a/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.stderr
+++ b/tests/ui/moves/moves-based-on-type-distribute-copy-over-paren.stderr
diff --git a/src/test/ui/moves/moves-based-on-type-exprs.rs b/tests/ui/moves/moves-based-on-type-exprs.rs
index 4a52d8d32..4a52d8d32 100644
--- a/src/test/ui/moves/moves-based-on-type-exprs.rs
+++ b/tests/ui/moves/moves-based-on-type-exprs.rs
diff --git a/src/test/ui/moves/moves-based-on-type-exprs.stderr b/tests/ui/moves/moves-based-on-type-exprs.stderr
index 838b1282c..ab7c27456 100644
--- a/src/test/ui/moves/moves-based-on-type-exprs.stderr
+++ b/tests/ui/moves/moves-based-on-type-exprs.stderr
@@ -160,15 +160,12 @@ LL |     let _y = x.into_iter().next().unwrap();
 LL |     touch(&x);
    |           ^^ value borrowed here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `x`
+note: `into_iter` takes ownership of the receiver `self`, which moves `x`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
-help: consider cloning the value if the performance cost is acceptable
+help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     let _y = x.clone().into_iter().next().unwrap();
-   |               ++++++++
+   |                ++++++++
 
 error[E0382]: borrow of moved value: `x`
   --> $DIR/moves-based-on-type-exprs.rs:83:11
@@ -180,15 +177,12 @@ LL |     let _y = [x.into_iter().next().unwrap(); 1];
 LL |     touch(&x);
    |           ^^ value borrowed here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `x`
+note: `into_iter` takes ownership of the receiver `self`, which moves `x`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
-help: consider cloning the value if the performance cost is acceptable
+help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     let _y = [x.clone().into_iter().next().unwrap(); 1];
-   |                ++++++++
+   |                 ++++++++
 
 error: aborting due to 11 previous errors
 
diff --git a/src/test/ui/moves/moves-based-on-type-match-bindings.rs b/tests/ui/moves/moves-based-on-type-match-bindings.rs
index 4fb9b40e8..4fb9b40e8 100644
--- a/src/test/ui/moves/moves-based-on-type-match-bindings.rs
+++ b/tests/ui/moves/moves-based-on-type-match-bindings.rs
diff --git a/src/test/ui/moves/moves-based-on-type-match-bindings.stderr b/tests/ui/moves/moves-based-on-type-match-bindings.stderr
index 225935532..225935532 100644
--- a/src/test/ui/moves/moves-based-on-type-match-bindings.stderr
+++ b/tests/ui/moves/moves-based-on-type-match-bindings.stderr
diff --git a/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.rs b/tests/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.rs
index 490d91ac1..490d91ac1 100644
--- a/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.rs
+++ b/tests/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.rs
diff --git a/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.stderr b/tests/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.stderr
index 125e446c3..125e446c3 100644
--- a/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.stderr
+++ b/tests/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.stderr
diff --git a/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.rs b/tests/ui/moves/moves-based-on-type-no-recursive-stack-closure.rs
index 86fd37e78..86fd37e78 100644
--- a/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.rs
+++ b/tests/ui/moves/moves-based-on-type-no-recursive-stack-closure.rs
diff --git a/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr b/tests/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr
index 4759b4589..4759b4589 100644
--- a/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr
+++ b/tests/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr
diff --git a/src/test/ui/moves/moves-based-on-type-tuple.rs b/tests/ui/moves/moves-based-on-type-tuple.rs
index 2e67d8f8a..2e67d8f8a 100644
--- a/src/test/ui/moves/moves-based-on-type-tuple.rs
+++ b/tests/ui/moves/moves-based-on-type-tuple.rs
diff --git a/src/test/ui/moves/moves-based-on-type-tuple.stderr b/tests/ui/moves/moves-based-on-type-tuple.stderr
index 0bcce3012..0bcce3012 100644
--- a/src/test/ui/moves/moves-based-on-type-tuple.stderr
+++ b/tests/ui/moves/moves-based-on-type-tuple.stderr
diff --git a/src/test/ui/moves/moves-sru-moved-field.rs b/tests/ui/moves/moves-sru-moved-field.rs
index 72957c49f..72957c49f 100644
--- a/src/test/ui/moves/moves-sru-moved-field.rs
+++ b/tests/ui/moves/moves-sru-moved-field.rs
diff --git a/src/test/ui/moves/moves-sru-moved-field.stderr b/tests/ui/moves/moves-sru-moved-field.stderr
index cf7213637..cf7213637 100644
--- a/src/test/ui/moves/moves-sru-moved-field.stderr
+++ b/tests/ui/moves/moves-sru-moved-field.stderr
diff --git a/tests/ui/moves/pin-mut-reborrow.fixed b/tests/ui/moves/pin-mut-reborrow.fixed
new file mode 100644
index 000000000..e808186d7
--- /dev/null
+++ b/tests/ui/moves/pin-mut-reborrow.fixed
@@ -0,0 +1,15 @@
+// run-rustfix
+use std::pin::Pin;
+
+struct Foo;
+
+impl Foo {
+    fn foo(self: Pin<&mut Self>) {}
+}
+
+fn main() {
+    let mut foo = Foo;
+    let mut foo = Pin::new(&mut foo);
+    foo.as_mut().foo();
+    foo.foo(); //~ ERROR use of moved value
+}
diff --git a/tests/ui/moves/pin-mut-reborrow.rs b/tests/ui/moves/pin-mut-reborrow.rs
new file mode 100644
index 000000000..fee6236eb
--- /dev/null
+++ b/tests/ui/moves/pin-mut-reborrow.rs
@@ -0,0 +1,15 @@
+// run-rustfix
+use std::pin::Pin;
+
+struct Foo;
+
+impl Foo {
+    fn foo(self: Pin<&mut Self>) {}
+}
+
+fn main() {
+    let mut foo = Foo;
+    let mut foo = Pin::new(&mut foo);
+    foo.foo();
+    foo.foo(); //~ ERROR use of moved value
+}
diff --git a/tests/ui/moves/pin-mut-reborrow.stderr b/tests/ui/moves/pin-mut-reborrow.stderr
new file mode 100644
index 000000000..16fa4bacc
--- /dev/null
+++ b/tests/ui/moves/pin-mut-reborrow.stderr
@@ -0,0 +1,23 @@
+error[E0382]: use of moved value: `foo`
+  --> $DIR/pin-mut-reborrow.rs:14:5
+   |
+LL |     let mut foo = Pin::new(&mut foo);
+   |         ------- move occurs because `foo` has type `Pin<&mut Foo>`, which does not implement the `Copy` trait
+LL |     foo.foo();
+   |         ----- `foo` moved due to this method call
+LL |     foo.foo();
+   |     ^^^ value used here after move
+   |
+note: `Foo::foo` takes ownership of the receiver `self`, which moves `foo`
+  --> $DIR/pin-mut-reborrow.rs:7:12
+   |
+LL |     fn foo(self: Pin<&mut Self>) {}
+   |            ^^^^
+help: consider reborrowing the `Pin` instead of moving it
+   |
+LL |     foo.as_mut().foo();
+   |         +++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0382`.
diff --git a/tests/ui/moves/suggest-clone.fixed b/tests/ui/moves/suggest-clone.fixed
new file mode 100644
index 000000000..204bfdb10
--- /dev/null
+++ b/tests/ui/moves/suggest-clone.fixed
@@ -0,0 +1,11 @@
+// run-rustfix
+
+#[derive(Clone)]
+struct Foo;
+impl Foo {
+    fn foo(self) {}
+}
+fn main() {
+    let foo = &Foo;
+    foo.clone().foo(); //~ ERROR cannot move out
+}
diff --git a/tests/ui/moves/suggest-clone.rs b/tests/ui/moves/suggest-clone.rs
new file mode 100644
index 000000000..25dd9f006
--- /dev/null
+++ b/tests/ui/moves/suggest-clone.rs
@@ -0,0 +1,11 @@
+// run-rustfix
+
+#[derive(Clone)]
+struct Foo;
+impl Foo {
+    fn foo(self) {}
+}
+fn main() {
+    let foo = &Foo;
+    foo.foo(); //~ ERROR cannot move out
+}
diff --git a/tests/ui/moves/suggest-clone.stderr b/tests/ui/moves/suggest-clone.stderr
new file mode 100644
index 000000000..cbb3dfea3
--- /dev/null
+++ b/tests/ui/moves/suggest-clone.stderr
@@ -0,0 +1,22 @@
+error[E0507]: cannot move out of `*foo` which is behind a shared reference
+  --> $DIR/suggest-clone.rs:10:5
+   |
+LL |     foo.foo();
+   |     ^^^^-----
+   |     |   |
+   |     |   `*foo` moved due to this method call
+   |     move occurs because `*foo` has type `Foo`, which does not implement the `Copy` trait
+   |
+note: `Foo::foo` takes ownership of the receiver `self`, which moves `*foo`
+  --> $DIR/suggest-clone.rs:6:12
+   |
+LL |     fn foo(self) {}
+   |            ^^^^
+help: you can `clone` the value and consume it, but this might not be your desired behavior
+   |
+LL |     foo.clone().foo();
+   |         ++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/moves/use_of_moved_value_clone_suggestions.rs b/tests/ui/moves/use_of_moved_value_clone_suggestions.rs
index d5c8d4e6b..d5c8d4e6b 100644
--- a/src/test/ui/moves/use_of_moved_value_clone_suggestions.rs
+++ b/tests/ui/moves/use_of_moved_value_clone_suggestions.rs
diff --git a/src/test/ui/moves/use_of_moved_value_clone_suggestions.stderr b/tests/ui/moves/use_of_moved_value_clone_suggestions.stderr
index 22e7951db..22e7951db 100644
--- a/src/test/ui/moves/use_of_moved_value_clone_suggestions.stderr
+++ b/tests/ui/moves/use_of_moved_value_clone_suggestions.stderr
diff --git a/src/test/ui/moves/use_of_moved_value_copy_suggestions.fixed b/tests/ui/moves/use_of_moved_value_copy_suggestions.fixed
index 45acf5beb..45acf5beb 100644
--- a/src/test/ui/moves/use_of_moved_value_copy_suggestions.fixed
+++ b/tests/ui/moves/use_of_moved_value_copy_suggestions.fixed
diff --git a/src/test/ui/moves/use_of_moved_value_copy_suggestions.rs b/tests/ui/moves/use_of_moved_value_copy_suggestions.rs
index 0a43dd1a9..0a43dd1a9 100644
--- a/src/test/ui/moves/use_of_moved_value_copy_suggestions.rs
+++ b/tests/ui/moves/use_of_moved_value_copy_suggestions.rs
diff --git a/src/test/ui/moves/use_of_moved_value_copy_suggestions.stderr b/tests/ui/moves/use_of_moved_value_copy_suggestions.stderr
index 3e37fcb21..3e37fcb21 100644
--- a/src/test/ui/moves/use_of_moved_value_copy_suggestions.stderr
+++ b/tests/ui/moves/use_of_moved_value_copy_suggestions.stderr
diff --git a/src/test/ui/msvc-data-only.rs b/tests/ui/msvc-data-only.rs
index f668b0b06..f668b0b06 100644
--- a/src/test/ui/msvc-data-only.rs
+++ b/tests/ui/msvc-data-only.rs
diff --git a/src/test/ui/multibyte.rs b/tests/ui/multibyte.rs
index 7e3a577f9..7e3a577f9 100644
--- a/src/test/ui/multibyte.rs
+++ b/tests/ui/multibyte.rs
diff --git a/src/test/ui/multiline-comment.rs b/tests/ui/multiline-comment.rs
index 01aaac282..01aaac282 100644
--- a/src/test/ui/multiline-comment.rs
+++ b/tests/ui/multiline-comment.rs
diff --git a/src/test/ui/mut-function-arguments.rs b/tests/ui/mut-function-arguments.rs
index 1e682fc4b..1e682fc4b 100644
--- a/src/test/ui/mut-function-arguments.rs
+++ b/tests/ui/mut-function-arguments.rs
diff --git a/src/test/ui/mut/mut-cant-alias.rs b/tests/ui/mut/mut-cant-alias.rs
index 9146b931a..9146b931a 100644
--- a/src/test/ui/mut/mut-cant-alias.rs
+++ b/tests/ui/mut/mut-cant-alias.rs
diff --git a/src/test/ui/mut/mut-cant-alias.stderr b/tests/ui/mut/mut-cant-alias.stderr
index 6046c076f..6046c076f 100644
--- a/src/test/ui/mut/mut-cant-alias.stderr
+++ b/tests/ui/mut/mut-cant-alias.stderr
diff --git a/src/test/ui/mut/mut-cross-borrowing.rs b/tests/ui/mut/mut-cross-borrowing.rs
index 080faab73..080faab73 100644
--- a/src/test/ui/mut/mut-cross-borrowing.rs
+++ b/tests/ui/mut/mut-cross-borrowing.rs
diff --git a/src/test/ui/mut/mut-cross-borrowing.stderr b/tests/ui/mut/mut-cross-borrowing.stderr
index ee739d628..ee739d628 100644
--- a/src/test/ui/mut/mut-cross-borrowing.stderr
+++ b/tests/ui/mut/mut-cross-borrowing.stderr
diff --git a/src/test/ui/mut/mut-pattern-internal-mutability.rs b/tests/ui/mut/mut-pattern-internal-mutability.rs
index bcee878e3..bcee878e3 100644
--- a/src/test/ui/mut/mut-pattern-internal-mutability.rs
+++ b/tests/ui/mut/mut-pattern-internal-mutability.rs
diff --git a/src/test/ui/mut/mut-pattern-internal-mutability.stderr b/tests/ui/mut/mut-pattern-internal-mutability.stderr
index 6583546aa..6583546aa 100644
--- a/src/test/ui/mut/mut-pattern-internal-mutability.stderr
+++ b/tests/ui/mut/mut-pattern-internal-mutability.stderr
diff --git a/src/test/ui/mut/mut-pattern-mismatched.rs b/tests/ui/mut/mut-pattern-mismatched.rs
index 700261fe4..700261fe4 100644
--- a/src/test/ui/mut/mut-pattern-mismatched.rs
+++ b/tests/ui/mut/mut-pattern-mismatched.rs
diff --git a/src/test/ui/mut/mut-pattern-mismatched.stderr b/tests/ui/mut/mut-pattern-mismatched.stderr
index cad1cef51..cad1cef51 100644
--- a/src/test/ui/mut/mut-pattern-mismatched.stderr
+++ b/tests/ui/mut/mut-pattern-mismatched.stderr
diff --git a/src/test/ui/mut/mut-ref.rs b/tests/ui/mut/mut-ref.rs
index 80990b2bf..80990b2bf 100644
--- a/src/test/ui/mut/mut-ref.rs
+++ b/tests/ui/mut/mut-ref.rs
diff --git a/src/test/ui/mut/mut-ref.stderr b/tests/ui/mut/mut-ref.stderr
index e6d4901aa..e6d4901aa 100644
--- a/src/test/ui/mut/mut-ref.stderr
+++ b/tests/ui/mut/mut-ref.stderr
diff --git a/src/test/ui/mut/mut-suggestion.rs b/tests/ui/mut/mut-suggestion.rs
index 3104b20ac..8c269d1e7 100644
--- a/src/test/ui/mut/mut-suggestion.rs
+++ b/tests/ui/mut/mut-suggestion.rs
@@ -8,7 +8,7 @@ impl S {
 
 fn func(arg: S) {
     //~^ HELP consider changing this to be mutable
-    //~| SUGGESTION mut arg
+    //~| SUGGESTION mut
     arg.mutate();
     //~^ ERROR cannot borrow `arg` as mutable, as it is not declared as mutable
 }
@@ -16,7 +16,7 @@ fn func(arg: S) {
 fn main() {
     let local = S;
     //~^ HELP consider changing this to be mutable
-    //~| SUGGESTION mut local
+    //~| SUGGESTION mut
     local.mutate();
     //~^ ERROR cannot borrow `local` as mutable, as it is not declared as mutable
 }
diff --git a/tests/ui/mut/mut-suggestion.stderr b/tests/ui/mut/mut-suggestion.stderr
new file mode 100644
index 000000000..d89c8b413
--- /dev/null
+++ b/tests/ui/mut/mut-suggestion.stderr
@@ -0,0 +1,25 @@
+error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable
+  --> $DIR/mut-suggestion.rs:12:5
+   |
+LL |     arg.mutate();
+   |     ^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn func(mut arg: S) {
+   |         +++
+
+error[E0596]: cannot borrow `local` as mutable, as it is not declared as mutable
+  --> $DIR/mut-suggestion.rs:20:5
+   |
+LL |     local.mutate();
+   |     ^^^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut local = S;
+   |         +++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/mut/mutable-class-fields-2.rs b/tests/ui/mut/mutable-class-fields-2.rs
index 30e54dfc9..30e54dfc9 100644
--- a/src/test/ui/mut/mutable-class-fields-2.rs
+++ b/tests/ui/mut/mutable-class-fields-2.rs
diff --git a/tests/ui/mut/mutable-class-fields-2.stderr b/tests/ui/mut/mutable-class-fields-2.stderr
new file mode 100644
index 000000000..c53c6ea30
--- /dev/null
+++ b/tests/ui/mut/mutable-class-fields-2.stderr
@@ -0,0 +1,14 @@
+error[E0594]: cannot assign to `self.how_hungry`, which is behind a `&` reference
+  --> $DIR/mutable-class-fields-2.rs:9:5
+   |
+LL |     self.how_hungry -= 5;
+   |     ^^^^^^^^^^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |   pub fn eat(&mut self) {
+   |              ~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/mut/mutable-class-fields.rs b/tests/ui/mut/mutable-class-fields.rs
index 30768a1ec..30768a1ec 100644
--- a/src/test/ui/mut/mutable-class-fields.rs
+++ b/tests/ui/mut/mutable-class-fields.rs
diff --git a/tests/ui/mut/mutable-class-fields.stderr b/tests/ui/mut/mutable-class-fields.stderr
new file mode 100644
index 000000000..1d731be8a
--- /dev/null
+++ b/tests/ui/mut/mutable-class-fields.stderr
@@ -0,0 +1,14 @@
+error[E0594]: cannot assign to `nyan.how_hungry`, as `nyan` is not declared as mutable
+  --> $DIR/mutable-class-fields.rs:15:3
+   |
+LL |   nyan.how_hungry = 0;
+   |   ^^^^^^^^^^^^^^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL |   let mut nyan : Cat = cat(52, 99);
+   |       +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/mut/mutable-enum-indirect.rs b/tests/ui/mut/mutable-enum-indirect.rs
index 502859c04..502859c04 100644
--- a/src/test/ui/mut/mutable-enum-indirect.rs
+++ b/tests/ui/mut/mutable-enum-indirect.rs
diff --git a/src/test/ui/mut/mutable-enum-indirect.stderr b/tests/ui/mut/mutable-enum-indirect.stderr
index 9e1f4e1fe..9e1f4e1fe 100644
--- a/src/test/ui/mut/mutable-enum-indirect.stderr
+++ b/tests/ui/mut/mutable-enum-indirect.stderr
diff --git a/src/test/ui/mut/no-mut-lint-for-desugared-mut.rs b/tests/ui/mut/no-mut-lint-for-desugared-mut.rs
index 419d58041..419d58041 100644
--- a/src/test/ui/mut/no-mut-lint-for-desugared-mut.rs
+++ b/tests/ui/mut/no-mut-lint-for-desugared-mut.rs
diff --git a/src/test/ui/mutexguard-sync.rs b/tests/ui/mutexguard-sync.rs
index b56418383..b56418383 100644
--- a/src/test/ui/mutexguard-sync.rs
+++ b/tests/ui/mutexguard-sync.rs
diff --git a/src/test/ui/mutexguard-sync.stderr b/tests/ui/mutexguard-sync.stderr
index 3fbb2ddf1..3fbb2ddf1 100644
--- a/src/test/ui/mutexguard-sync.stderr
+++ b/tests/ui/mutexguard-sync.stderr
diff --git a/src/test/ui/mutual-recursion-group.rs b/tests/ui/mutual-recursion-group.rs
index 86b0f1d84..86b0f1d84 100644
--- a/src/test/ui/mutual-recursion-group.rs
+++ b/tests/ui/mutual-recursion-group.rs
diff --git a/src/test/ui/namespace/auxiliary/namespace-mix.rs b/tests/ui/namespace/auxiliary/namespace-mix.rs
index fb39d29f8..fb39d29f8 100644
--- a/src/test/ui/namespace/auxiliary/namespace-mix.rs
+++ b/tests/ui/namespace/auxiliary/namespace-mix.rs
diff --git a/src/test/ui/namespace/auxiliary/namespaced_enums.rs b/tests/ui/namespace/auxiliary/namespaced_enums.rs
index d3548c76c..d3548c76c 100644
--- a/src/test/ui/namespace/auxiliary/namespaced_enums.rs
+++ b/tests/ui/namespace/auxiliary/namespaced_enums.rs
diff --git a/src/test/ui/namespace/namespace-mix.rs b/tests/ui/namespace/namespace-mix.rs
index c5b30f148..c5b30f148 100644
--- a/src/test/ui/namespace/namespace-mix.rs
+++ b/tests/ui/namespace/namespace-mix.rs
diff --git a/src/test/ui/namespace/namespace-mix.stderr b/tests/ui/namespace/namespace-mix.stderr
index cb72d4a1c..cb72d4a1c 100644
--- a/src/test/ui/namespace/namespace-mix.stderr
+++ b/tests/ui/namespace/namespace-mix.stderr
diff --git a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.rs b/tests/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.rs
index feb94b681..feb94b681 100644
--- a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.rs
+++ b/tests/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.rs
diff --git a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.stderr b/tests/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.stderr
index 227d30282..227d30282 100644
--- a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.stderr
+++ b/tests/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.stderr
diff --git a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.rs b/tests/ui/namespace/namespaced-enum-glob-import-no-impls.rs
index ab24f36f9..ab24f36f9 100644
--- a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.rs
+++ b/tests/ui/namespace/namespaced-enum-glob-import-no-impls.rs
diff --git a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.stderr b/tests/ui/namespace/namespaced-enum-glob-import-no-impls.stderr
index 111ac7ab0..111ac7ab0 100644
--- a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.stderr
+++ b/tests/ui/namespace/namespaced-enum-glob-import-no-impls.stderr
diff --git a/src/test/ui/native-library-link-flags/empty-kind-1.rs b/tests/ui/native-library-link-flags/empty-kind-1.rs
index 18937856d..18937856d 100644
--- a/src/test/ui/native-library-link-flags/empty-kind-1.rs
+++ b/tests/ui/native-library-link-flags/empty-kind-1.rs
diff --git a/src/test/ui/native-library-link-flags/empty-kind-1.stderr b/tests/ui/native-library-link-flags/empty-kind-1.stderr
index 3e5b05493..3e5b05493 100644
--- a/src/test/ui/native-library-link-flags/empty-kind-1.stderr
+++ b/tests/ui/native-library-link-flags/empty-kind-1.stderr
diff --git a/src/test/ui/native-library-link-flags/empty-kind-2.rs b/tests/ui/native-library-link-flags/empty-kind-2.rs
index 851eb63fc..851eb63fc 100644
--- a/src/test/ui/native-library-link-flags/empty-kind-2.rs
+++ b/tests/ui/native-library-link-flags/empty-kind-2.rs
diff --git a/src/test/ui/native-library-link-flags/empty-kind-2.stderr b/tests/ui/native-library-link-flags/empty-kind-2.stderr
index 3e5b05493..3e5b05493 100644
--- a/src/test/ui/native-library-link-flags/empty-kind-2.stderr
+++ b/tests/ui/native-library-link-flags/empty-kind-2.stderr
diff --git a/src/test/ui/native-library-link-flags/link-arg-error.rs b/tests/ui/native-library-link-flags/link-arg-error.rs
index e041650d0..e041650d0 100644
--- a/src/test/ui/native-library-link-flags/link-arg-error.rs
+++ b/tests/ui/native-library-link-flags/link-arg-error.rs
diff --git a/src/test/ui/native-library-link-flags/link-arg-error.stderr b/tests/ui/native-library-link-flags/link-arg-error.stderr
index e1d01e141..e1d01e141 100644
--- a/src/test/ui/native-library-link-flags/link-arg-error.stderr
+++ b/tests/ui/native-library-link-flags/link-arg-error.stderr
diff --git a/src/test/ui/native-library-link-flags/link-arg-from-rs.rs b/tests/ui/native-library-link-flags/link-arg-from-rs.rs
index 075e4d9e7..075e4d9e7 100644
--- a/src/test/ui/native-library-link-flags/link-arg-from-rs.rs
+++ b/tests/ui/native-library-link-flags/link-arg-from-rs.rs
diff --git a/src/test/ui/native-library-link-flags/link-arg-from-rs.stderr b/tests/ui/native-library-link-flags/link-arg-from-rs.stderr
index 69a7825c0..69a7825c0 100644
--- a/src/test/ui/native-library-link-flags/link-arg-from-rs.stderr
+++ b/tests/ui/native-library-link-flags/link-arg-from-rs.stderr
diff --git a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.rs b/tests/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.rs
index 066048795..066048795 100644
--- a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.rs
+++ b/tests/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.rs
diff --git a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.stderr b/tests/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.stderr
index 246efb8d6..246efb8d6 100644
--- a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.stderr
+++ b/tests/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.stderr
diff --git a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.rs b/tests/ui/native-library-link-flags/mix-bundle-and-whole-archive.rs
index 1d0768d99..1d0768d99 100644
--- a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.rs
+++ b/tests/ui/native-library-link-flags/mix-bundle-and-whole-archive.rs
diff --git a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.stderr b/tests/ui/native-library-link-flags/mix-bundle-and-whole-archive.stderr
index 246efb8d6..246efb8d6 100644
--- a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.stderr
+++ b/tests/ui/native-library-link-flags/mix-bundle-and-whole-archive.stderr
diff --git a/src/test/ui/native-library-link-flags/modifiers-override-2.rs b/tests/ui/native-library-link-flags/modifiers-override-2.rs
index 333f6786b..333f6786b 100644
--- a/src/test/ui/native-library-link-flags/modifiers-override-2.rs
+++ b/tests/ui/native-library-link-flags/modifiers-override-2.rs
diff --git a/src/test/ui/native-library-link-flags/modifiers-override-2.stderr b/tests/ui/native-library-link-flags/modifiers-override-2.stderr
index aa5b59c5b..aa5b59c5b 100644
--- a/src/test/ui/native-library-link-flags/modifiers-override-2.stderr
+++ b/tests/ui/native-library-link-flags/modifiers-override-2.stderr
diff --git a/src/test/ui/native-library-link-flags/modifiers-override-3.rs b/tests/ui/native-library-link-flags/modifiers-override-3.rs
index b28c53c6b..b28c53c6b 100644
--- a/src/test/ui/native-library-link-flags/modifiers-override-3.rs
+++ b/tests/ui/native-library-link-flags/modifiers-override-3.rs
diff --git a/src/test/ui/native-library-link-flags/modifiers-override-3.stderr b/tests/ui/native-library-link-flags/modifiers-override-3.stderr
index 365e56181..365e56181 100644
--- a/src/test/ui/native-library-link-flags/modifiers-override-3.stderr
+++ b/tests/ui/native-library-link-flags/modifiers-override-3.stderr
diff --git a/src/test/ui/native-library-link-flags/modifiers-override.rs b/tests/ui/native-library-link-flags/modifiers-override.rs
index 42cdb5004..42cdb5004 100644
--- a/src/test/ui/native-library-link-flags/modifiers-override.rs
+++ b/tests/ui/native-library-link-flags/modifiers-override.rs
diff --git a/src/test/ui/native-library-link-flags/modifiers-override.stderr b/tests/ui/native-library-link-flags/modifiers-override.stderr
index eb3ab55c3..eb3ab55c3 100644
--- a/src/test/ui/native-library-link-flags/modifiers-override.stderr
+++ b/tests/ui/native-library-link-flags/modifiers-override.stderr
diff --git a/src/test/ui/native-library-link-flags/suggest-libname-only-1.rs b/tests/ui/native-library-link-flags/suggest-libname-only-1.rs
index abf988a7c..abf988a7c 100644
--- a/src/test/ui/native-library-link-flags/suggest-libname-only-1.rs
+++ b/tests/ui/native-library-link-flags/suggest-libname-only-1.rs
diff --git a/src/test/ui/native-library-link-flags/suggest-libname-only-1.stderr b/tests/ui/native-library-link-flags/suggest-libname-only-1.stderr
index 64d0a9077..64d0a9077 100644
--- a/src/test/ui/native-library-link-flags/suggest-libname-only-1.stderr
+++ b/tests/ui/native-library-link-flags/suggest-libname-only-1.stderr
diff --git a/src/test/ui/native-library-link-flags/suggest-libname-only-2.rs b/tests/ui/native-library-link-flags/suggest-libname-only-2.rs
index dfa70e56d..dfa70e56d 100644
--- a/src/test/ui/native-library-link-flags/suggest-libname-only-2.rs
+++ b/tests/ui/native-library-link-flags/suggest-libname-only-2.rs
diff --git a/src/test/ui/native-library-link-flags/suggest-libname-only-2.stderr b/tests/ui/native-library-link-flags/suggest-libname-only-2.stderr
index e166af9ed..e166af9ed 100644
--- a/src/test/ui/native-library-link-flags/suggest-libname-only-2.stderr
+++ b/tests/ui/native-library-link-flags/suggest-libname-only-2.stderr
diff --git a/src/test/ui/nested-block-comment.rs b/tests/ui/nested-block-comment.rs
index f8dfb5fa8..f8dfb5fa8 100644
--- a/src/test/ui/nested-block-comment.rs
+++ b/tests/ui/nested-block-comment.rs
diff --git a/src/test/ui/nested-cfg-attrs.rs b/tests/ui/nested-cfg-attrs.rs
index c988d4233..c988d4233 100644
--- a/src/test/ui/nested-cfg-attrs.rs
+++ b/tests/ui/nested-cfg-attrs.rs
diff --git a/src/test/ui/nested-cfg-attrs.stderr b/tests/ui/nested-cfg-attrs.stderr
index f63888b2f..f63888b2f 100644
--- a/src/test/ui/nested-cfg-attrs.stderr
+++ b/tests/ui/nested-cfg-attrs.stderr
diff --git a/src/test/ui/nested-class.rs b/tests/ui/nested-class.rs
index 303273618..303273618 100644
--- a/src/test/ui/nested-class.rs
+++ b/tests/ui/nested-class.rs
diff --git a/src/test/ui/nested-ty-params.rs b/tests/ui/nested-ty-params.rs
index 85413acdb..85413acdb 100644
--- a/src/test/ui/nested-ty-params.rs
+++ b/tests/ui/nested-ty-params.rs
diff --git a/src/test/ui/nested-ty-params.stderr b/tests/ui/nested-ty-params.stderr
index 8f4746f5e..8f4746f5e 100644
--- a/src/test/ui/nested-ty-params.stderr
+++ b/tests/ui/nested-ty-params.stderr
diff --git a/src/test/ui/never_type/adjust_never.rs b/tests/ui/never_type/adjust_never.rs
index 0d7d2c0ed..0d7d2c0ed 100644
--- a/src/test/ui/never_type/adjust_never.rs
+++ b/tests/ui/never_type/adjust_never.rs
diff --git a/src/test/ui/never_type/auto-traits.rs b/tests/ui/never_type/auto-traits.rs
index 42ede708e..42ede708e 100644
--- a/src/test/ui/never_type/auto-traits.rs
+++ b/tests/ui/never_type/auto-traits.rs
diff --git a/src/test/ui/never_type/call-fn-never-arg-wrong-type.rs b/tests/ui/never_type/call-fn-never-arg-wrong-type.rs
index d06637e74..d06637e74 100644
--- a/src/test/ui/never_type/call-fn-never-arg-wrong-type.rs
+++ b/tests/ui/never_type/call-fn-never-arg-wrong-type.rs
diff --git a/src/test/ui/never_type/call-fn-never-arg-wrong-type.stderr b/tests/ui/never_type/call-fn-never-arg-wrong-type.stderr
index fa3db33c9..fa3db33c9 100644
--- a/src/test/ui/never_type/call-fn-never-arg-wrong-type.stderr
+++ b/tests/ui/never_type/call-fn-never-arg-wrong-type.stderr
diff --git a/src/test/ui/never_type/call-fn-never-arg.rs b/tests/ui/never_type/call-fn-never-arg.rs
index 9d355817e..9d355817e 100644
--- a/src/test/ui/never_type/call-fn-never-arg.rs
+++ b/tests/ui/never_type/call-fn-never-arg.rs
diff --git a/src/test/ui/never_type/cast-never.rs b/tests/ui/never_type/cast-never.rs
index 0139ebe46..0139ebe46 100644
--- a/src/test/ui/never_type/cast-never.rs
+++ b/tests/ui/never_type/cast-never.rs
diff --git a/src/test/ui/never_type/defaulted-never-note.fallback.stderr b/tests/ui/never_type/defaulted-never-note.fallback.stderr
index 283aca1b0..283aca1b0 100644
--- a/src/test/ui/never_type/defaulted-never-note.fallback.stderr
+++ b/tests/ui/never_type/defaulted-never-note.fallback.stderr
diff --git a/src/test/ui/never_type/defaulted-never-note.rs b/tests/ui/never_type/defaulted-never-note.rs
index d30ffcd38..d30ffcd38 100644
--- a/src/test/ui/never_type/defaulted-never-note.rs
+++ b/tests/ui/never_type/defaulted-never-note.rs
diff --git a/src/test/ui/never_type/dispatch_from_dyn_zst.rs b/tests/ui/never_type/dispatch_from_dyn_zst.rs
index 764f58ce9..764f58ce9 100644
--- a/src/test/ui/never_type/dispatch_from_dyn_zst.rs
+++ b/tests/ui/never_type/dispatch_from_dyn_zst.rs
diff --git a/src/test/ui/never_type/diverging-fallback-control-flow.rs b/tests/ui/never_type/diverging-fallback-control-flow.rs
index 45a3362fa..45a3362fa 100644
--- a/src/test/ui/never_type/diverging-fallback-control-flow.rs
+++ b/tests/ui/never_type/diverging-fallback-control-flow.rs
diff --git a/src/test/ui/never_type/diverging-fallback-no-leak.fallback.stderr b/tests/ui/never_type/diverging-fallback-no-leak.fallback.stderr
index 3215c4669..3215c4669 100644
--- a/src/test/ui/never_type/diverging-fallback-no-leak.fallback.stderr
+++ b/tests/ui/never_type/diverging-fallback-no-leak.fallback.stderr
diff --git a/src/test/ui/never_type/diverging-fallback-no-leak.rs b/tests/ui/never_type/diverging-fallback-no-leak.rs
index 03478e19d..03478e19d 100644
--- a/src/test/ui/never_type/diverging-fallback-no-leak.rs
+++ b/tests/ui/never_type/diverging-fallback-no-leak.rs
diff --git a/src/test/ui/never_type/diverging-fallback-unconstrained-return.rs b/tests/ui/never_type/diverging-fallback-unconstrained-return.rs
index 7ea97126f..7ea97126f 100644
--- a/src/test/ui/never_type/diverging-fallback-unconstrained-return.rs
+++ b/tests/ui/never_type/diverging-fallback-unconstrained-return.rs
diff --git a/src/test/ui/never_type/diverging-tuple-parts-39485.rs b/tests/ui/never_type/diverging-tuple-parts-39485.rs
index 0cde61193..0cde61193 100644
--- a/src/test/ui/never_type/diverging-tuple-parts-39485.rs
+++ b/tests/ui/never_type/diverging-tuple-parts-39485.rs
diff --git a/src/test/ui/never_type/diverging-tuple-parts-39485.stderr b/tests/ui/never_type/diverging-tuple-parts-39485.stderr
index 52d07ae17..52d07ae17 100644
--- a/src/test/ui/never_type/diverging-tuple-parts-39485.stderr
+++ b/tests/ui/never_type/diverging-tuple-parts-39485.stderr
diff --git a/src/test/ui/never_type/exhaustive_patterns.rs b/tests/ui/never_type/exhaustive_patterns.rs
index 2e23fa182..2e23fa182 100644
--- a/src/test/ui/never_type/exhaustive_patterns.rs
+++ b/tests/ui/never_type/exhaustive_patterns.rs
diff --git a/src/test/ui/never_type/exhaustive_patterns.stderr b/tests/ui/never_type/exhaustive_patterns.stderr
index e41baf862..40c7c1d10 100644
--- a/src/test/ui/never_type/exhaustive_patterns.stderr
+++ b/tests/ui/never_type/exhaustive_patterns.stderr
@@ -1,4 +1,4 @@
-error[E0005]: refutable pattern in local binding: `Either::B(_)` not covered
+error[E0005]: refutable pattern in local binding
   --> $DIR/exhaustive_patterns.rs:20:9
    |
 LL |     let Either::A(()) = foo();
@@ -7,13 +7,13 @@ LL |     let Either::A(()) = foo();
    = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
    = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
 note: `Either<(), !>` defined here
-  --> $DIR/exhaustive_patterns.rs:12:5
+  --> $DIR/exhaustive_patterns.rs:10:6
    |
 LL | enum Either<A, B> {
-   |      ------
+   |      ^^^^^^
 LL |     A(A),
 LL |     B(inner::Wrapper<B>),
-   |     ^ not covered
+   |     - not covered
    = note: the matched value is of type `Either<(), !>`
 help: you might want to use `if let` to ignore the variant that isn't matched
    |
diff --git a/src/test/ui/never_type/expr-empty-ret.rs b/tests/ui/never_type/expr-empty-ret.rs
index ce8ffaf94..ce8ffaf94 100644
--- a/src/test/ui/never_type/expr-empty-ret.rs
+++ b/tests/ui/never_type/expr-empty-ret.rs
diff --git a/src/test/ui/never_type/fallback-closure-ret.rs b/tests/ui/never_type/fallback-closure-ret.rs
index 5c8ce48cb..5c8ce48cb 100644
--- a/src/test/ui/never_type/fallback-closure-ret.rs
+++ b/tests/ui/never_type/fallback-closure-ret.rs
diff --git a/src/test/ui/never_type/fallback-closure-wrap.fallback.stderr b/tests/ui/never_type/fallback-closure-wrap.fallback.stderr
index 45cf37234..a0f790dba 100644
--- a/src/test/ui/never_type/fallback-closure-wrap.fallback.stderr
+++ b/tests/ui/never_type/fallback-closure-wrap.fallback.stderr
@@ -1,4 +1,4 @@
-error[E0271]: expected `[closure@$DIR/fallback-closure-wrap.rs:18:40: 18:47]` to be a closure that returns `()`, but it returns `!`
+error[E0271]: expected `[closure@fallback-closure-wrap.rs:18:40]` to be a closure that returns `()`, but it returns `!`
   --> $DIR/fallback-closure-wrap.rs:18:31
    |
 LL |       let error = Closure::wrap(Box::new(move || {
diff --git a/src/test/ui/never_type/fallback-closure-wrap.rs b/tests/ui/never_type/fallback-closure-wrap.rs
index f88355bb2..f88355bb2 100644
--- a/src/test/ui/never_type/fallback-closure-wrap.rs
+++ b/tests/ui/never_type/fallback-closure-wrap.rs
diff --git a/src/test/ui/never_type/feature-gate-never_type_fallback.rs b/tests/ui/never_type/feature-gate-never_type_fallback.rs
index 7d0208411..7d0208411 100644
--- a/src/test/ui/never_type/feature-gate-never_type_fallback.rs
+++ b/tests/ui/never_type/feature-gate-never_type_fallback.rs
diff --git a/src/test/ui/never_type/feature-gate-never_type_fallback.stderr b/tests/ui/never_type/feature-gate-never_type_fallback.stderr
index 6dc039fc3..2db1cc4b7 100644
--- a/src/test/ui/never_type/feature-gate-never_type_fallback.stderr
+++ b/tests/ui/never_type/feature-gate-never_type_fallback.stderr
@@ -5,7 +5,7 @@ LL |     foo(panic!())
    |     --- ^^^^^^^^
    |     |   |
    |     |   the trait `T` is not implemented for `()`
-   |     |   this tail expression is of type `_`
+   |     |   this tail expression is of type `()`
    |     required by a bound introduced by this call
    |
 note: required by a bound in `foo`
diff --git a/src/test/ui/never_type/impl-for-never.rs b/tests/ui/never_type/impl-for-never.rs
index 9423f0885..9423f0885 100644
--- a/src/test/ui/never_type/impl-for-never.rs
+++ b/tests/ui/never_type/impl-for-never.rs
diff --git a/src/test/ui/never_type/impl_trait_fallback.rs b/tests/ui/never_type/impl_trait_fallback.rs
index cc9520c1b..cc9520c1b 100644
--- a/src/test/ui/never_type/impl_trait_fallback.rs
+++ b/tests/ui/never_type/impl_trait_fallback.rs
diff --git a/src/test/ui/never_type/impl_trait_fallback2.rs b/tests/ui/never_type/impl_trait_fallback2.rs
index 12c187b9e..12c187b9e 100644
--- a/src/test/ui/never_type/impl_trait_fallback2.rs
+++ b/tests/ui/never_type/impl_trait_fallback2.rs
diff --git a/src/test/ui/never_type/impl_trait_fallback2.stderr b/tests/ui/never_type/impl_trait_fallback2.stderr
index 78cc83bdb..78cc83bdb 100644
--- a/src/test/ui/never_type/impl_trait_fallback2.stderr
+++ b/tests/ui/never_type/impl_trait_fallback2.stderr
diff --git a/src/test/ui/never_type/impl_trait_fallback3.rs b/tests/ui/never_type/impl_trait_fallback3.rs
index ed645b823..ed645b823 100644
--- a/src/test/ui/never_type/impl_trait_fallback3.rs
+++ b/tests/ui/never_type/impl_trait_fallback3.rs
diff --git a/src/test/ui/never_type/impl_trait_fallback3.stderr b/tests/ui/never_type/impl_trait_fallback3.stderr
index 5d5d216fb..5d5d216fb 100644
--- a/src/test/ui/never_type/impl_trait_fallback3.stderr
+++ b/tests/ui/never_type/impl_trait_fallback3.stderr
diff --git a/src/test/ui/never_type/impl_trait_fallback4.rs b/tests/ui/never_type/impl_trait_fallback4.rs
index fe62773fa..fe62773fa 100644
--- a/src/test/ui/never_type/impl_trait_fallback4.rs
+++ b/tests/ui/never_type/impl_trait_fallback4.rs
diff --git a/src/test/ui/never_type/impl_trait_fallback4.stderr b/tests/ui/never_type/impl_trait_fallback4.stderr
index f2e216e90..f2e216e90 100644
--- a/src/test/ui/never_type/impl_trait_fallback4.stderr
+++ b/tests/ui/never_type/impl_trait_fallback4.stderr
diff --git a/src/test/ui/never_type/issue-10176.rs b/tests/ui/never_type/issue-10176.rs
index 6277aa05e..6277aa05e 100644
--- a/src/test/ui/never_type/issue-10176.rs
+++ b/tests/ui/never_type/issue-10176.rs
diff --git a/src/test/ui/never_type/issue-10176.stderr b/tests/ui/never_type/issue-10176.stderr
index cd5361ffa..cd5361ffa 100644
--- a/src/test/ui/never_type/issue-10176.stderr
+++ b/tests/ui/never_type/issue-10176.stderr
diff --git a/src/test/ui/never_type/issue-13352.rs b/tests/ui/never_type/issue-13352.rs
index 9c884a33c..9c884a33c 100644
--- a/src/test/ui/never_type/issue-13352.rs
+++ b/tests/ui/never_type/issue-13352.rs
diff --git a/src/test/ui/never_type/issue-13352.stderr b/tests/ui/never_type/issue-13352.stderr
index 2d22da0b4..2d22da0b4 100644
--- a/src/test/ui/never_type/issue-13352.stderr
+++ b/tests/ui/never_type/issue-13352.stderr
diff --git a/src/test/ui/never_type/issue-2149.rs b/tests/ui/never_type/issue-2149.rs
index d6426d2cf..d6426d2cf 100644
--- a/src/test/ui/never_type/issue-2149.rs
+++ b/tests/ui/never_type/issue-2149.rs
diff --git a/src/test/ui/never_type/issue-2149.stderr b/tests/ui/never_type/issue-2149.stderr
index 58fe2edb1..58fe2edb1 100644
--- a/src/test/ui/never_type/issue-2149.stderr
+++ b/tests/ui/never_type/issue-2149.stderr
diff --git a/src/test/ui/never_type/issue-44402.rs b/tests/ui/never_type/issue-44402.rs
index 699e480df..699e480df 100644
--- a/src/test/ui/never_type/issue-44402.rs
+++ b/tests/ui/never_type/issue-44402.rs
diff --git a/src/test/ui/never_type/issue-51506.rs b/tests/ui/never_type/issue-51506.rs
index d0fe6a0f5..d0fe6a0f5 100644
--- a/src/test/ui/never_type/issue-51506.rs
+++ b/tests/ui/never_type/issue-51506.rs
diff --git a/src/test/ui/never_type/issue-51506.stderr b/tests/ui/never_type/issue-51506.stderr
index 293ec3a72..293ec3a72 100644
--- a/src/test/ui/never_type/issue-51506.stderr
+++ b/tests/ui/never_type/issue-51506.stderr
diff --git a/src/test/ui/never_type/issue-52443.rs b/tests/ui/never_type/issue-52443.rs
index 0498a8a16..0498a8a16 100644
--- a/src/test/ui/never_type/issue-52443.rs
+++ b/tests/ui/never_type/issue-52443.rs
diff --git a/src/test/ui/never_type/issue-52443.stderr b/tests/ui/never_type/issue-52443.stderr
index 0910e9ad7..33b7a9185 100644
--- a/src/test/ui/never_type/issue-52443.stderr
+++ b/tests/ui/never_type/issue-52443.stderr
@@ -46,10 +46,8 @@ LL |     [(); { for _ in 0usize.. {}; 0}];
    |
 note: impl defined here, but it is not `const`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL | impl<I: Iterator> const IntoIterator for I {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error[E0658]: mutable references are not allowed in constants
   --> $DIR/issue-52443.rs:9:21
@@ -67,6 +65,7 @@ LL |     [(); { for _ in 0usize.. {}; 0}];
    |                     ^^^^^^^^
    |
    = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error: aborting due to 6 previous errors; 1 warning emitted
 
diff --git a/src/test/ui/never_type/issue-5500-1.rs b/tests/ui/never_type/issue-5500-1.rs
index 98d6e1a14..98d6e1a14 100644
--- a/src/test/ui/never_type/issue-5500-1.rs
+++ b/tests/ui/never_type/issue-5500-1.rs
diff --git a/src/test/ui/never_type/issue-96335.rs b/tests/ui/never_type/issue-96335.rs
index 411a7c9df..411a7c9df 100644
--- a/src/test/ui/never_type/issue-96335.rs
+++ b/tests/ui/never_type/issue-96335.rs
diff --git a/src/test/ui/never_type/issue-96335.stderr b/tests/ui/never_type/issue-96335.stderr
index 168cf2f83..e148b983e 100644
--- a/src/test/ui/never_type/issue-96335.stderr
+++ b/tests/ui/never_type/issue-96335.stderr
@@ -26,9 +26,6 @@ LL |     0.....{loop{}1};
             found struct `RangeTo<{integer}>`
 note: associated function defined here
   --> $SRC_DIR/core/src/ops/range.rs:LL:COL
-   |
-LL |     pub const fn new(start: Idx, end: Idx) -> Self {
-   |                  ^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/never_type/never-assign-dead-code.rs b/tests/ui/never_type/never-assign-dead-code.rs
index 7bb7c8709..7bb7c8709 100644
--- a/src/test/ui/never_type/never-assign-dead-code.rs
+++ b/tests/ui/never_type/never-assign-dead-code.rs
diff --git a/src/test/ui/never_type/never-assign-dead-code.stderr b/tests/ui/never_type/never-assign-dead-code.stderr
index 521b82023..521b82023 100644
--- a/src/test/ui/never_type/never-assign-dead-code.stderr
+++ b/tests/ui/never_type/never-assign-dead-code.stderr
diff --git a/src/test/ui/never_type/never-assign-wrong-type.rs b/tests/ui/never_type/never-assign-wrong-type.rs
index 67e26f566..67e26f566 100644
--- a/src/test/ui/never_type/never-assign-wrong-type.rs
+++ b/tests/ui/never_type/never-assign-wrong-type.rs
diff --git a/src/test/ui/never_type/never-assign-wrong-type.stderr b/tests/ui/never_type/never-assign-wrong-type.stderr
index ce34d9483..ce34d9483 100644
--- a/src/test/ui/never_type/never-assign-wrong-type.stderr
+++ b/tests/ui/never_type/never-assign-wrong-type.stderr
diff --git a/src/test/ui/never_type/never-associated-type.rs b/tests/ui/never_type/never-associated-type.rs
index 3bb917c93..3bb917c93 100644
--- a/src/test/ui/never_type/never-associated-type.rs
+++ b/tests/ui/never_type/never-associated-type.rs
diff --git a/src/test/ui/never_type/never-from-impl-is-reserved.rs b/tests/ui/never_type/never-from-impl-is-reserved.rs
index 9d16015bd..9d16015bd 100644
--- a/src/test/ui/never_type/never-from-impl-is-reserved.rs
+++ b/tests/ui/never_type/never-from-impl-is-reserved.rs
diff --git a/src/test/ui/never_type/never-from-impl-is-reserved.stderr b/tests/ui/never_type/never-from-impl-is-reserved.stderr
index f9f7c787e..f9f7c787e 100644
--- a/src/test/ui/never_type/never-from-impl-is-reserved.stderr
+++ b/tests/ui/never_type/never-from-impl-is-reserved.stderr
diff --git a/src/test/ui/never_type/never-result.rs b/tests/ui/never_type/never-result.rs
index 35af37910..35af37910 100644
--- a/src/test/ui/never_type/never-result.rs
+++ b/tests/ui/never_type/never-result.rs
diff --git a/src/test/ui/never_type/never-type-arg.rs b/tests/ui/never_type/never-type-arg.rs
index 13cd59e6a..13cd59e6a 100644
--- a/src/test/ui/never_type/never-type-arg.rs
+++ b/tests/ui/never_type/never-type-arg.rs
diff --git a/src/test/ui/never_type/never-type-rvalues.rs b/tests/ui/never_type/never-type-rvalues.rs
index 9ccc73dbf..9ccc73dbf 100644
--- a/src/test/ui/never_type/never-type-rvalues.rs
+++ b/tests/ui/never_type/never-type-rvalues.rs
diff --git a/src/test/ui/never_type/never-value-fallback-issue-66757.nofallback.stderr b/tests/ui/never_type/never-value-fallback-issue-66757.nofallback.stderr
index 06e902bca..06e902bca 100644
--- a/src/test/ui/never_type/never-value-fallback-issue-66757.nofallback.stderr
+++ b/tests/ui/never_type/never-value-fallback-issue-66757.nofallback.stderr
diff --git a/src/test/ui/never_type/never-value-fallback-issue-66757.rs b/tests/ui/never_type/never-value-fallback-issue-66757.rs
index fc6fe6eb5..fc6fe6eb5 100644
--- a/src/test/ui/never_type/never-value-fallback-issue-66757.rs
+++ b/tests/ui/never_type/never-value-fallback-issue-66757.rs
diff --git a/src/test/ui/never_type/never_coercions.rs b/tests/ui/never_type/never_coercions.rs
index 105c38635..105c38635 100644
--- a/src/test/ui/never_type/never_coercions.rs
+++ b/tests/ui/never_type/never_coercions.rs
diff --git a/src/test/ui/never_type/never_transmute_never.rs b/tests/ui/never_type/never_transmute_never.rs
index fce3ced9a..fce3ced9a 100644
--- a/src/test/ui/never_type/never_transmute_never.rs
+++ b/tests/ui/never_type/never_transmute_never.rs
diff --git a/src/test/ui/never_type/return-never-coerce.rs b/tests/ui/never_type/return-never-coerce.rs
index d615940ef..d615940ef 100644
--- a/src/test/ui/never_type/return-never-coerce.rs
+++ b/tests/ui/never_type/return-never-coerce.rs
diff --git a/src/test/ui/never_type/try_from.rs b/tests/ui/never_type/try_from.rs
index 50451576f..50451576f 100644
--- a/src/test/ui/never_type/try_from.rs
+++ b/tests/ui/never_type/try_from.rs
diff --git a/src/test/ui/new-impl-syntax.rs b/tests/ui/new-impl-syntax.rs
index e1f2bea9a..e1f2bea9a 100644
--- a/src/test/ui/new-impl-syntax.rs
+++ b/tests/ui/new-impl-syntax.rs
diff --git a/src/test/ui/new-import-syntax.rs b/tests/ui/new-import-syntax.rs
index f132ed57c..f132ed57c 100644
--- a/src/test/ui/new-import-syntax.rs
+++ b/tests/ui/new-import-syntax.rs
diff --git a/src/test/ui/new-style-constants.rs b/tests/ui/new-style-constants.rs
index 82ed7b557..82ed7b557 100644
--- a/src/test/ui/new-style-constants.rs
+++ b/tests/ui/new-style-constants.rs
diff --git a/src/test/ui/new-unicode-escapes.rs b/tests/ui/new-unicode-escapes.rs
index 850b0de44..850b0de44 100644
--- a/src/test/ui/new-unicode-escapes.rs
+++ b/tests/ui/new-unicode-escapes.rs
diff --git a/src/test/ui/new-unsafe-pointers.rs b/tests/ui/new-unsafe-pointers.rs
index d99eb4cbd..d99eb4cbd 100644
--- a/src/test/ui/new-unsafe-pointers.rs
+++ b/tests/ui/new-unsafe-pointers.rs
diff --git a/src/test/ui/newlambdas.rs b/tests/ui/newlambdas.rs
index 90de53856..90de53856 100644
--- a/src/test/ui/newlambdas.rs
+++ b/tests/ui/newlambdas.rs
diff --git a/src/test/ui/newtype-polymorphic.rs b/tests/ui/newtype-polymorphic.rs
index a6a725211..a6a725211 100644
--- a/src/test/ui/newtype-polymorphic.rs
+++ b/tests/ui/newtype-polymorphic.rs
diff --git a/src/test/ui/newtype.rs b/tests/ui/newtype.rs
index f02b66f45..f02b66f45 100644
--- a/src/test/ui/newtype.rs
+++ b/tests/ui/newtype.rs
diff --git a/src/test/ui/nll/assign-while-to-immutable.rs b/tests/ui/nll/assign-while-to-immutable.rs
index c803321b5..c803321b5 100644
--- a/src/test/ui/nll/assign-while-to-immutable.rs
+++ b/tests/ui/nll/assign-while-to-immutable.rs
diff --git a/src/test/ui/nll/borrow-use-issue-46875.rs b/tests/ui/nll/borrow-use-issue-46875.rs
index 42e28b967..42e28b967 100644
--- a/src/test/ui/nll/borrow-use-issue-46875.rs
+++ b/tests/ui/nll/borrow-use-issue-46875.rs
diff --git a/src/test/ui/nll/borrowck-thread-local-static-mut-borrow-outlives-fn.rs b/tests/ui/nll/borrowck-thread-local-static-mut-borrow-outlives-fn.rs
index 7d3b00dfc..7d3b00dfc 100644
--- a/src/test/ui/nll/borrowck-thread-local-static-mut-borrow-outlives-fn.rs
+++ b/tests/ui/nll/borrowck-thread-local-static-mut-borrow-outlives-fn.rs
diff --git a/src/test/ui/nll/borrowed-local-error.rs b/tests/ui/nll/borrowed-local-error.rs
index d333356d9..d333356d9 100644
--- a/src/test/ui/nll/borrowed-local-error.rs
+++ b/tests/ui/nll/borrowed-local-error.rs
diff --git a/src/test/ui/nll/borrowed-local-error.stderr b/tests/ui/nll/borrowed-local-error.stderr
index d629caa43..d629caa43 100644
--- a/src/test/ui/nll/borrowed-local-error.stderr
+++ b/tests/ui/nll/borrowed-local-error.stderr
diff --git a/src/test/ui/nll/borrowed-match-issue-45045.rs b/tests/ui/nll/borrowed-match-issue-45045.rs
index 978eeb868..978eeb868 100644
--- a/src/test/ui/nll/borrowed-match-issue-45045.rs
+++ b/tests/ui/nll/borrowed-match-issue-45045.rs
diff --git a/src/test/ui/nll/borrowed-match-issue-45045.stderr b/tests/ui/nll/borrowed-match-issue-45045.stderr
index 9d4682667..9d4682667 100644
--- a/src/test/ui/nll/borrowed-match-issue-45045.stderr
+++ b/tests/ui/nll/borrowed-match-issue-45045.stderr
diff --git a/src/test/ui/nll/borrowed-referent-issue-38899.rs b/tests/ui/nll/borrowed-referent-issue-38899.rs
index 1fe133283..1fe133283 100644
--- a/src/test/ui/nll/borrowed-referent-issue-38899.rs
+++ b/tests/ui/nll/borrowed-referent-issue-38899.rs
diff --git a/src/test/ui/nll/borrowed-referent-issue-38899.stderr b/tests/ui/nll/borrowed-referent-issue-38899.stderr
index 16588cbcf..16588cbcf 100644
--- a/src/test/ui/nll/borrowed-referent-issue-38899.stderr
+++ b/tests/ui/nll/borrowed-referent-issue-38899.stderr
diff --git a/src/test/ui/nll/borrowed-temporary-error.rs b/tests/ui/nll/borrowed-temporary-error.rs
index 37d0e670d..37d0e670d 100644
--- a/src/test/ui/nll/borrowed-temporary-error.rs
+++ b/tests/ui/nll/borrowed-temporary-error.rs
diff --git a/src/test/ui/nll/borrowed-temporary-error.stderr b/tests/ui/nll/borrowed-temporary-error.stderr
index 89781d96f..89781d96f 100644
--- a/src/test/ui/nll/borrowed-temporary-error.stderr
+++ b/tests/ui/nll/borrowed-temporary-error.stderr
diff --git a/src/test/ui/nll/borrowed-universal-error-2.rs b/tests/ui/nll/borrowed-universal-error-2.rs
index 3f9b2f292..3f9b2f292 100644
--- a/src/test/ui/nll/borrowed-universal-error-2.rs
+++ b/tests/ui/nll/borrowed-universal-error-2.rs
diff --git a/src/test/ui/nll/borrowed-universal-error-2.stderr b/tests/ui/nll/borrowed-universal-error-2.stderr
index 7213ed3ba..7213ed3ba 100644
--- a/src/test/ui/nll/borrowed-universal-error-2.stderr
+++ b/tests/ui/nll/borrowed-universal-error-2.stderr
diff --git a/src/test/ui/nll/borrowed-universal-error.rs b/tests/ui/nll/borrowed-universal-error.rs
index fc9ffd470..fc9ffd470 100644
--- a/src/test/ui/nll/borrowed-universal-error.rs
+++ b/tests/ui/nll/borrowed-universal-error.rs
diff --git a/src/test/ui/nll/borrowed-universal-error.stderr b/tests/ui/nll/borrowed-universal-error.stderr
index 88a2d8fcf..88a2d8fcf 100644
--- a/src/test/ui/nll/borrowed-universal-error.stderr
+++ b/tests/ui/nll/borrowed-universal-error.stderr
diff --git a/src/test/ui/nll/cannot-move-block-spans.rs b/tests/ui/nll/cannot-move-block-spans.rs
index e994fd3d5..e994fd3d5 100644
--- a/src/test/ui/nll/cannot-move-block-spans.rs
+++ b/tests/ui/nll/cannot-move-block-spans.rs
diff --git a/tests/ui/nll/cannot-move-block-spans.stderr b/tests/ui/nll/cannot-move-block-spans.stderr
new file mode 100644
index 000000000..0dc5c08ea
--- /dev/null
+++ b/tests/ui/nll/cannot-move-block-spans.stderr
@@ -0,0 +1,118 @@
+error[E0507]: cannot move out of `*r` which is behind a shared reference
+  --> $DIR/cannot-move-block-spans.rs:5:15
+   |
+LL |     let x = { *r };
+   |               ^^ move occurs because `*r` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let x = { *r };
+LL +     let x = { r };
+   |
+
+error[E0507]: cannot move out of `*r` which is behind a shared reference
+  --> $DIR/cannot-move-block-spans.rs:6:22
+   |
+LL |     let y = unsafe { *r };
+   |                      ^^ move occurs because `*r` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let y = unsafe { *r };
+LL +     let y = unsafe { r };
+   |
+
+error[E0507]: cannot move out of `*r` which is behind a shared reference
+  --> $DIR/cannot-move-block-spans.rs:7:26
+   |
+LL |     let z = loop { break *r; };
+   |                          ^^ move occurs because `*r` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let z = loop { break *r; };
+LL +     let z = loop { break r; };
+   |
+
+error[E0508]: cannot move out of type `[String; 2]`, a non-copy array
+  --> $DIR/cannot-move-block-spans.rs:11:15
+   |
+LL |     let x = { arr[0] };
+   |               ^^^^^^
+   |               |
+   |               cannot move out of here
+   |               move occurs because `arr[_]` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let x = { &arr[0] };
+   |               +
+
+error[E0508]: cannot move out of type `[String; 2]`, a non-copy array
+  --> $DIR/cannot-move-block-spans.rs:12:22
+   |
+LL |     let y = unsafe { arr[0] };
+   |                      ^^^^^^
+   |                      |
+   |                      cannot move out of here
+   |                      move occurs because `arr[_]` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let y = unsafe { &arr[0] };
+   |                      +
+
+error[E0508]: cannot move out of type `[String; 2]`, a non-copy array
+  --> $DIR/cannot-move-block-spans.rs:13:26
+   |
+LL |     let z = loop { break arr[0]; };
+   |                          ^^^^^^
+   |                          |
+   |                          cannot move out of here
+   |                          move occurs because `arr[_]` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let z = loop { break &arr[0]; };
+   |                          +
+
+error[E0507]: cannot move out of `*r` which is behind a shared reference
+  --> $DIR/cannot-move-block-spans.rs:17:38
+   |
+LL |     let x = { let mut u = 0; u += 1; *r };
+   |                                      ^^ move occurs because `*r` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let x = { let mut u = 0; u += 1; *r };
+LL +     let x = { let mut u = 0; u += 1; r };
+   |
+
+error[E0507]: cannot move out of `*r` which is behind a shared reference
+  --> $DIR/cannot-move-block-spans.rs:18:45
+   |
+LL |     let y = unsafe { let mut u = 0; u += 1; *r };
+   |                                             ^^ move occurs because `*r` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let y = unsafe { let mut u = 0; u += 1; *r };
+LL +     let y = unsafe { let mut u = 0; u += 1; r };
+   |
+
+error[E0507]: cannot move out of `*r` which is behind a shared reference
+  --> $DIR/cannot-move-block-spans.rs:19:49
+   |
+LL |     let z = loop { let mut u = 0; u += 1; break *r; u += 2; };
+   |                                                 ^^ move occurs because `*r` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let z = loop { let mut u = 0; u += 1; break *r; u += 2; };
+LL +     let z = loop { let mut u = 0; u += 1; break r; u += 2; };
+   |
+
+error: aborting due to 9 previous errors
+
+Some errors have detailed explanations: E0507, E0508.
+For more information about an error, try `rustc --explain E0507`.
diff --git a/src/test/ui/nll/capture-mut-ref.fixed b/tests/ui/nll/capture-mut-ref.fixed
index 2dacb26b6..2dacb26b6 100644
--- a/src/test/ui/nll/capture-mut-ref.fixed
+++ b/tests/ui/nll/capture-mut-ref.fixed
diff --git a/src/test/ui/nll/capture-mut-ref.rs b/tests/ui/nll/capture-mut-ref.rs
index 56e01f7b7..56e01f7b7 100644
--- a/src/test/ui/nll/capture-mut-ref.rs
+++ b/tests/ui/nll/capture-mut-ref.rs
diff --git a/src/test/ui/nll/capture-mut-ref.stderr b/tests/ui/nll/capture-mut-ref.stderr
index 4898d5692..4898d5692 100644
--- a/src/test/ui/nll/capture-mut-ref.stderr
+++ b/tests/ui/nll/capture-mut-ref.stderr
diff --git a/src/test/ui/nll/capture-ref-in-struct.rs b/tests/ui/nll/capture-ref-in-struct.rs
index db6ac7d66..db6ac7d66 100644
--- a/src/test/ui/nll/capture-ref-in-struct.rs
+++ b/tests/ui/nll/capture-ref-in-struct.rs
diff --git a/src/test/ui/nll/capture-ref-in-struct.stderr b/tests/ui/nll/capture-ref-in-struct.stderr
index cdfe7f6db..cdfe7f6db 100644
--- a/src/test/ui/nll/capture-ref-in-struct.stderr
+++ b/tests/ui/nll/capture-ref-in-struct.stderr
diff --git a/src/test/ui/nll/closure-access-spans.rs b/tests/ui/nll/closure-access-spans.rs
index 2a59e80b2..2a59e80b2 100644
--- a/src/test/ui/nll/closure-access-spans.rs
+++ b/tests/ui/nll/closure-access-spans.rs
diff --git a/src/test/ui/nll/closure-access-spans.stderr b/tests/ui/nll/closure-access-spans.stderr
index 0a09353b8..0a09353b8 100644
--- a/src/test/ui/nll/closure-access-spans.stderr
+++ b/tests/ui/nll/closure-access-spans.stderr
diff --git a/src/test/ui/nll/closure-borrow-spans.rs b/tests/ui/nll/closure-borrow-spans.rs
index b38f7900e..b38f7900e 100644
--- a/src/test/ui/nll/closure-borrow-spans.rs
+++ b/tests/ui/nll/closure-borrow-spans.rs
diff --git a/src/test/ui/nll/closure-borrow-spans.stderr b/tests/ui/nll/closure-borrow-spans.stderr
index bada4e1b8..bada4e1b8 100644
--- a/src/test/ui/nll/closure-borrow-spans.stderr
+++ b/tests/ui/nll/closure-borrow-spans.stderr
diff --git a/src/test/ui/nll/closure-captures.rs b/tests/ui/nll/closure-captures.rs
index 16d90b971..16d90b971 100644
--- a/src/test/ui/nll/closure-captures.rs
+++ b/tests/ui/nll/closure-captures.rs
diff --git a/src/test/ui/nll/closure-captures.stderr b/tests/ui/nll/closure-captures.stderr
index 5233f0b24..5233f0b24 100644
--- a/src/test/ui/nll/closure-captures.stderr
+++ b/tests/ui/nll/closure-captures.stderr
diff --git a/tests/ui/nll/closure-malformed-projection-input-issue-102800.rs b/tests/ui/nll/closure-malformed-projection-input-issue-102800.rs
new file mode 100644
index 000000000..260c16c17
--- /dev/null
+++ b/tests/ui/nll/closure-malformed-projection-input-issue-102800.rs
@@ -0,0 +1,21 @@
+// Regression test for #102800
+//
+// Here we are generating higher-ranked region constraints when normalizing and relating closure
+// input types. Previously this was an ICE in the error path because we didn't register enough
+// diagnostic information to render the higher-ranked subtyping error.
+
+// check-fail
+
+trait Trait {
+    type Ty;
+}
+
+impl Trait for &'static () {
+    type Ty = ();
+}
+
+fn main() {
+    let _: for<'a> fn(<&'a () as Trait>::Ty) = |_| {};
+    //~^ ERROR implementation of `Trait` is not general enough
+    //~| ERROR implementation of `Trait` is not general enough
+}
diff --git a/tests/ui/nll/closure-malformed-projection-input-issue-102800.stderr b/tests/ui/nll/closure-malformed-projection-input-issue-102800.stderr
new file mode 100644
index 000000000..46dba0064
--- /dev/null
+++ b/tests/ui/nll/closure-malformed-projection-input-issue-102800.stderr
@@ -0,0 +1,20 @@
+error: implementation of `Trait` is not general enough
+  --> $DIR/closure-malformed-projection-input-issue-102800.rs:18:12
+   |
+LL |     let _: for<'a> fn(<&'a () as Trait>::Ty) = |_| {};
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `Trait` is not general enough
+   |
+   = note: `&'0 ()` must implement `Trait`, for any lifetime `'0`...
+   = note: ...but `Trait` is actually implemented for the type `&'static ()`
+
+error: implementation of `Trait` is not general enough
+  --> $DIR/closure-malformed-projection-input-issue-102800.rs:18:12
+   |
+LL |     let _: for<'a> fn(<&'a () as Trait>::Ty) = |_| {};
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `Trait` is not general enough
+   |
+   = note: `&'0 ()` must implement `Trait`, for any lifetime `'0`...
+   = note: ...but `Trait` is actually implemented for the type `&'static ()`
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/nll/closure-move-spans.rs b/tests/ui/nll/closure-move-spans.rs
index bf2431870..bf2431870 100644
--- a/src/test/ui/nll/closure-move-spans.rs
+++ b/tests/ui/nll/closure-move-spans.rs
diff --git a/src/test/ui/nll/closure-move-spans.stderr b/tests/ui/nll/closure-move-spans.stderr
index 0446ef7b0..0446ef7b0 100644
--- a/src/test/ui/nll/closure-move-spans.stderr
+++ b/tests/ui/nll/closure-move-spans.stderr
diff --git a/src/test/ui/nll/closure-requirements/escape-argument-callee.rs b/tests/ui/nll/closure-requirements/escape-argument-callee.rs
index 3aea511b0..3aea511b0 100644
--- a/src/test/ui/nll/closure-requirements/escape-argument-callee.rs
+++ b/tests/ui/nll/closure-requirements/escape-argument-callee.rs
diff --git a/src/test/ui/nll/closure-requirements/escape-argument-callee.stderr b/tests/ui/nll/closure-requirements/escape-argument-callee.stderr
index 363ddfaff..363ddfaff 100644
--- a/src/test/ui/nll/closure-requirements/escape-argument-callee.stderr
+++ b/tests/ui/nll/closure-requirements/escape-argument-callee.stderr
diff --git a/src/test/ui/nll/closure-requirements/escape-argument.rs b/tests/ui/nll/closure-requirements/escape-argument.rs
index 066cd4360..066cd4360 100644
--- a/src/test/ui/nll/closure-requirements/escape-argument.rs
+++ b/tests/ui/nll/closure-requirements/escape-argument.rs
diff --git a/src/test/ui/nll/closure-requirements/escape-argument.stderr b/tests/ui/nll/closure-requirements/escape-argument.stderr
index f67c312b9..f67c312b9 100644
--- a/src/test/ui/nll/closure-requirements/escape-argument.stderr
+++ b/tests/ui/nll/closure-requirements/escape-argument.stderr
diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-nested.rs b/tests/ui/nll/closure-requirements/escape-upvar-nested.rs
index 765a3cf96..765a3cf96 100644
--- a/src/test/ui/nll/closure-requirements/escape-upvar-nested.rs
+++ b/tests/ui/nll/closure-requirements/escape-upvar-nested.rs
diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr b/tests/ui/nll/closure-requirements/escape-upvar-nested.stderr
index 4fbd5eb19..4fbd5eb19 100644
--- a/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr
+++ b/tests/ui/nll/closure-requirements/escape-upvar-nested.stderr
diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-ref.rs b/tests/ui/nll/closure-requirements/escape-upvar-ref.rs
index 0a562a0a1..0a562a0a1 100644
--- a/src/test/ui/nll/closure-requirements/escape-upvar-ref.rs
+++ b/tests/ui/nll/closure-requirements/escape-upvar-ref.rs
diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr b/tests/ui/nll/closure-requirements/escape-upvar-ref.stderr
index bc1ceac5b..bc1ceac5b 100644
--- a/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr
+++ b/tests/ui/nll/closure-requirements/escape-upvar-ref.stderr
diff --git a/src/test/ui/nll/closure-requirements/issue-58127-mutliple-requirements.rs b/tests/ui/nll/closure-requirements/issue-58127-mutliple-requirements.rs
index a83ebc21f..a83ebc21f 100644
--- a/src/test/ui/nll/closure-requirements/issue-58127-mutliple-requirements.rs
+++ b/tests/ui/nll/closure-requirements/issue-58127-mutliple-requirements.rs
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.rs b/tests/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.rs
index 35a864b88..35a864b88 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.rs
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.rs
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr b/tests/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr
index 7da6ce58b..7da6ce58b 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.rs b/tests/ui/nll/closure-requirements/propagate-approximated-ref.rs
index 7291c6e97..7291c6e97 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.rs
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-ref.rs
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr b/tests/ui/nll/closure-requirements/propagate-approximated-ref.stderr
index 993687605..993687605 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-ref.stderr
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.rs b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.rs
index afe6f10a5..afe6f10a5 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.rs
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.rs
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr
index 7991abeb7..7991abeb7 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.rs b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.rs
index 372209075..372209075 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.rs
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.rs
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr
index 43dfc3bb9..43dfc3bb9 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.rs b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.rs
index 9898777c7..9898777c7 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.rs
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.rs
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr
index 96c734226..96c734226 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-val.rs b/tests/ui/nll/closure-requirements/propagate-approximated-val.rs
index 5bb5eea99..5bb5eea99 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-val.rs
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-val.rs
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr b/tests/ui/nll/closure-requirements/propagate-approximated-val.stderr
index 03dbd686e..03dbd686e 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-val.stderr
diff --git a/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.rs b/tests/ui/nll/closure-requirements/propagate-despite-same-free-region.rs
index 704a026d2..704a026d2 100644
--- a/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.rs
+++ b/tests/ui/nll/closure-requirements/propagate-despite-same-free-region.rs
diff --git a/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr b/tests/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr
index d716d3de2..d716d3de2 100644
--- a/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr
+++ b/tests/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr
diff --git a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.rs b/tests/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.rs
index dcd05d7fa..dcd05d7fa 100644
--- a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.rs
+++ b/tests/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.rs
diff --git a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr b/tests/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr
index b924873fc..b924873fc 100644
--- a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr
+++ b/tests/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr
diff --git a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.rs b/tests/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.rs
index 98be92d1c..98be92d1c 100644
--- a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.rs
+++ b/tests/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.rs
diff --git a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr b/tests/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr
index 9b25efd0b..9b25efd0b 100644
--- a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr
+++ b/tests/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr
diff --git a/src/test/ui/nll/closure-requirements/propagate-from-trait-match.rs b/tests/ui/nll/closure-requirements/propagate-from-trait-match.rs
index cda781d8e..cda781d8e 100644
--- a/src/test/ui/nll/closure-requirements/propagate-from-trait-match.rs
+++ b/tests/ui/nll/closure-requirements/propagate-from-trait-match.rs
diff --git a/src/test/ui/nll/closure-requirements/propagate-from-trait-match.stderr b/tests/ui/nll/closure-requirements/propagate-from-trait-match.stderr
index 038a5e11f..038a5e11f 100644
--- a/src/test/ui/nll/closure-requirements/propagate-from-trait-match.stderr
+++ b/tests/ui/nll/closure-requirements/propagate-from-trait-match.stderr
diff --git a/src/test/ui/nll/closure-requirements/propagate-multiple-requirements.rs b/tests/ui/nll/closure-requirements/propagate-multiple-requirements.rs
index a9d2a0771..a9d2a0771 100644
--- a/src/test/ui/nll/closure-requirements/propagate-multiple-requirements.rs
+++ b/tests/ui/nll/closure-requirements/propagate-multiple-requirements.rs
diff --git a/src/test/ui/nll/closure-requirements/propagate-multiple-requirements.stderr b/tests/ui/nll/closure-requirements/propagate-multiple-requirements.stderr
index 2fec9bc62..2fec9bc62 100644
--- a/src/test/ui/nll/closure-requirements/propagate-multiple-requirements.stderr
+++ b/tests/ui/nll/closure-requirements/propagate-multiple-requirements.stderr
diff --git a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.rs b/tests/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.rs
index 8147da09d..8147da09d 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.rs
+++ b/tests/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.rs
diff --git a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr b/tests/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr
index 7034492ce..7034492ce 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr
+++ b/tests/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr
diff --git a/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.rs b/tests/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.rs
index 4acd2fc92..4acd2fc92 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.rs
+++ b/tests/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.rs
diff --git a/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.stderr b/tests/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.stderr
index d0a24a267..d0a24a267 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.stderr
+++ b/tests/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.stderr
diff --git a/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.rs b/tests/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.rs
index 06e96be80..06e96be80 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.rs
+++ b/tests/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.rs
diff --git a/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.stderr b/tests/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.stderr
index d0ba53925..d0ba53925 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.stderr
+++ b/tests/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.stderr
diff --git a/src/test/ui/nll/closure-requirements/region-lbr1-does-outlive-lbr2-because-implied-bound.rs b/tests/ui/nll/closure-requirements/region-lbr1-does-outlive-lbr2-because-implied-bound.rs
index 014959fdb..014959fdb 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr1-does-outlive-lbr2-because-implied-bound.rs
+++ b/tests/ui/nll/closure-requirements/region-lbr1-does-outlive-lbr2-because-implied-bound.rs
diff --git a/src/test/ui/nll/closure-requirements/return-wrong-bound-region.rs b/tests/ui/nll/closure-requirements/return-wrong-bound-region.rs
index e34a3f6f2..e34a3f6f2 100644
--- a/src/test/ui/nll/closure-requirements/return-wrong-bound-region.rs
+++ b/tests/ui/nll/closure-requirements/return-wrong-bound-region.rs
diff --git a/src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr b/tests/ui/nll/closure-requirements/return-wrong-bound-region.stderr
index 6db72b886..6db72b886 100644
--- a/src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr
+++ b/tests/ui/nll/closure-requirements/return-wrong-bound-region.stderr
diff --git a/src/test/ui/nll/closure-use-spans.rs b/tests/ui/nll/closure-use-spans.rs
index 6768250dc..6768250dc 100644
--- a/src/test/ui/nll/closure-use-spans.rs
+++ b/tests/ui/nll/closure-use-spans.rs
diff --git a/src/test/ui/nll/closure-use-spans.stderr b/tests/ui/nll/closure-use-spans.stderr
index ad928f1bb..ad928f1bb 100644
--- a/src/test/ui/nll/closure-use-spans.stderr
+++ b/tests/ui/nll/closure-use-spans.stderr
diff --git a/src/test/ui/nll/closures-in-loops.rs b/tests/ui/nll/closures-in-loops.rs
index 491c186ec..491c186ec 100644
--- a/src/test/ui/nll/closures-in-loops.rs
+++ b/tests/ui/nll/closures-in-loops.rs
diff --git a/src/test/ui/nll/closures-in-loops.stderr b/tests/ui/nll/closures-in-loops.stderr
index 1c1a31d35..1c1a31d35 100644
--- a/src/test/ui/nll/closures-in-loops.stderr
+++ b/tests/ui/nll/closures-in-loops.stderr
diff --git a/src/test/ui/nll/constant-thread-locals-issue-47053.rs b/tests/ui/nll/constant-thread-locals-issue-47053.rs
index dde0ef7a5..dde0ef7a5 100644
--- a/src/test/ui/nll/constant-thread-locals-issue-47053.rs
+++ b/tests/ui/nll/constant-thread-locals-issue-47053.rs
diff --git a/src/test/ui/nll/constant-thread-locals-issue-47053.stderr b/tests/ui/nll/constant-thread-locals-issue-47053.stderr
index a44acfb5f..a44acfb5f 100644
--- a/src/test/ui/nll/constant-thread-locals-issue-47053.stderr
+++ b/tests/ui/nll/constant-thread-locals-issue-47053.stderr
diff --git a/src/test/ui/nll/constant.rs b/tests/ui/nll/constant.rs
index 47f0eadf9..47f0eadf9 100644
--- a/src/test/ui/nll/constant.rs
+++ b/tests/ui/nll/constant.rs
diff --git a/src/test/ui/nll/continue-after-missing-main.rs b/tests/ui/nll/continue-after-missing-main.rs
index 778639158..778639158 100644
--- a/src/test/ui/nll/continue-after-missing-main.rs
+++ b/tests/ui/nll/continue-after-missing-main.rs
diff --git a/src/test/ui/nll/continue-after-missing-main.stderr b/tests/ui/nll/continue-after-missing-main.stderr
index 0df8d8d70..0df8d8d70 100644
--- a/src/test/ui/nll/continue-after-missing-main.stderr
+++ b/tests/ui/nll/continue-after-missing-main.stderr
diff --git a/src/test/ui/nll/decl-macro-illegal-copy.rs b/tests/ui/nll/decl-macro-illegal-copy.rs
index f72432946..f72432946 100644
--- a/src/test/ui/nll/decl-macro-illegal-copy.rs
+++ b/tests/ui/nll/decl-macro-illegal-copy.rs
diff --git a/src/test/ui/nll/decl-macro-illegal-copy.stderr b/tests/ui/nll/decl-macro-illegal-copy.stderr
index 7948485bd..7948485bd 100644
--- a/src/test/ui/nll/decl-macro-illegal-copy.stderr
+++ b/tests/ui/nll/decl-macro-illegal-copy.stderr
diff --git a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy-proj.rs b/tests/ui/nll/do-not-ignore-lifetime-bounds-in-copy-proj.rs
index 96c871946..96c871946 100644
--- a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy-proj.rs
+++ b/tests/ui/nll/do-not-ignore-lifetime-bounds-in-copy-proj.rs
diff --git a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy-proj.stderr b/tests/ui/nll/do-not-ignore-lifetime-bounds-in-copy-proj.stderr
index 65be3b37e..65be3b37e 100644
--- a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy-proj.stderr
+++ b/tests/ui/nll/do-not-ignore-lifetime-bounds-in-copy-proj.stderr
diff --git a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs b/tests/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs
index 99922cc51..99922cc51 100644
--- a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs
+++ b/tests/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs
diff --git a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr b/tests/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr
index b811ba4fd..b811ba4fd 100644
--- a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr
+++ b/tests/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr
diff --git a/src/test/ui/nll/dont-print-desugared.rs b/tests/ui/nll/dont-print-desugared.rs
index 829d78ed4..829d78ed4 100644
--- a/src/test/ui/nll/dont-print-desugared.rs
+++ b/tests/ui/nll/dont-print-desugared.rs
diff --git a/src/test/ui/nll/dont-print-desugared.stderr b/tests/ui/nll/dont-print-desugared.stderr
index fad6121cb..fad6121cb 100644
--- a/src/test/ui/nll/dont-print-desugared.stderr
+++ b/tests/ui/nll/dont-print-desugared.stderr
diff --git a/src/test/ui/nll/drop-may-dangle.rs b/tests/ui/nll/drop-may-dangle.rs
index b5531c29b..b5531c29b 100644
--- a/src/test/ui/nll/drop-may-dangle.rs
+++ b/tests/ui/nll/drop-may-dangle.rs
diff --git a/src/test/ui/nll/drop-no-may-dangle.rs b/tests/ui/nll/drop-no-may-dangle.rs
index a0ff0c398..a0ff0c398 100644
--- a/src/test/ui/nll/drop-no-may-dangle.rs
+++ b/tests/ui/nll/drop-no-may-dangle.rs
diff --git a/src/test/ui/nll/drop-no-may-dangle.stderr b/tests/ui/nll/drop-no-may-dangle.stderr
index cb2808809..cb2808809 100644
--- a/src/test/ui/nll/drop-no-may-dangle.stderr
+++ b/tests/ui/nll/drop-no-may-dangle.stderr
diff --git a/src/test/ui/nll/empty-type-predicate-2.rs b/tests/ui/nll/empty-type-predicate-2.rs
index 20d6e47f7..20d6e47f7 100644
--- a/src/test/ui/nll/empty-type-predicate-2.rs
+++ b/tests/ui/nll/empty-type-predicate-2.rs
diff --git a/src/test/ui/nll/empty-type-predicate.rs b/tests/ui/nll/empty-type-predicate.rs
index d126a455d..d126a455d 100644
--- a/src/test/ui/nll/empty-type-predicate.rs
+++ b/tests/ui/nll/empty-type-predicate.rs
diff --git a/src/test/ui/nll/enum-drop-access.rs b/tests/ui/nll/enum-drop-access.rs
index 5ef0c3fe7..5ef0c3fe7 100644
--- a/src/test/ui/nll/enum-drop-access.rs
+++ b/tests/ui/nll/enum-drop-access.rs
diff --git a/src/test/ui/nll/enum-drop-access.stderr b/tests/ui/nll/enum-drop-access.stderr
index a532ae121..a532ae121 100644
--- a/src/test/ui/nll/enum-drop-access.stderr
+++ b/tests/ui/nll/enum-drop-access.stderr
diff --git a/src/test/ui/nll/extra-unused-mut.rs b/tests/ui/nll/extra-unused-mut.rs
index 340f2952a..340f2952a 100644
--- a/src/test/ui/nll/extra-unused-mut.rs
+++ b/tests/ui/nll/extra-unused-mut.rs
diff --git a/src/test/ui/nll/generator-distinct-lifetime.rs b/tests/ui/nll/generator-distinct-lifetime.rs
index 90fe6b569..90fe6b569 100644
--- a/src/test/ui/nll/generator-distinct-lifetime.rs
+++ b/tests/ui/nll/generator-distinct-lifetime.rs
diff --git a/src/test/ui/nll/generator-upvar-mutability.rs b/tests/ui/nll/generator-upvar-mutability.rs
index c49ea15b8..c49ea15b8 100644
--- a/src/test/ui/nll/generator-upvar-mutability.rs
+++ b/tests/ui/nll/generator-upvar-mutability.rs
diff --git a/src/test/ui/nll/generator-upvar-mutability.stderr b/tests/ui/nll/generator-upvar-mutability.stderr
index 31b061b61..31b061b61 100644
--- a/src/test/ui/nll/generator-upvar-mutability.stderr
+++ b/tests/ui/nll/generator-upvar-mutability.stderr
diff --git a/src/test/ui/nll/get_default.polonius.stderr b/tests/ui/nll/get_default.polonius.stderr
index 476d86cfb..476d86cfb 100644
--- a/src/test/ui/nll/get_default.polonius.stderr
+++ b/tests/ui/nll/get_default.polonius.stderr
diff --git a/src/test/ui/nll/get_default.rs b/tests/ui/nll/get_default.rs
index ffac8a33d..ffac8a33d 100644
--- a/src/test/ui/nll/get_default.rs
+++ b/tests/ui/nll/get_default.rs
diff --git a/src/test/ui/nll/get_default.stderr b/tests/ui/nll/get_default.stderr
index 6998c0433..6998c0433 100644
--- a/src/test/ui/nll/get_default.stderr
+++ b/tests/ui/nll/get_default.stderr
diff --git a/src/test/ui/nll/guarantor-issue-46974.rs b/tests/ui/nll/guarantor-issue-46974.rs
index 96af4bf5c..96af4bf5c 100644
--- a/src/test/ui/nll/guarantor-issue-46974.rs
+++ b/tests/ui/nll/guarantor-issue-46974.rs
diff --git a/src/test/ui/nll/guarantor-issue-46974.stderr b/tests/ui/nll/guarantor-issue-46974.stderr
index 8854dd8d6..8854dd8d6 100644
--- a/src/test/ui/nll/guarantor-issue-46974.stderr
+++ b/tests/ui/nll/guarantor-issue-46974.stderr
diff --git a/src/test/ui/nll/issue-16223.rs b/tests/ui/nll/issue-16223.rs
index 0ae0ed3d8..0ae0ed3d8 100644
--- a/src/test/ui/nll/issue-16223.rs
+++ b/tests/ui/nll/issue-16223.rs
diff --git a/src/test/ui/nll/issue-21114-ebfull.rs b/tests/ui/nll/issue-21114-ebfull.rs
index fc4a6845a..fc4a6845a 100644
--- a/src/test/ui/nll/issue-21114-ebfull.rs
+++ b/tests/ui/nll/issue-21114-ebfull.rs
diff --git a/src/test/ui/nll/issue-21114-kixunil.rs b/tests/ui/nll/issue-21114-kixunil.rs
index 666f89f35..666f89f35 100644
--- a/src/test/ui/nll/issue-21114-kixunil.rs
+++ b/tests/ui/nll/issue-21114-kixunil.rs
diff --git a/src/test/ui/nll/issue-21232-partial-init-and-erroneous-use.rs b/tests/ui/nll/issue-21232-partial-init-and-erroneous-use.rs
index 46a156d2a..46a156d2a 100644
--- a/src/test/ui/nll/issue-21232-partial-init-and-erroneous-use.rs
+++ b/tests/ui/nll/issue-21232-partial-init-and-erroneous-use.rs
diff --git a/src/test/ui/nll/issue-21232-partial-init-and-erroneous-use.stderr b/tests/ui/nll/issue-21232-partial-init-and-erroneous-use.stderr
index 63f230be7..63f230be7 100644
--- a/src/test/ui/nll/issue-21232-partial-init-and-erroneous-use.stderr
+++ b/tests/ui/nll/issue-21232-partial-init-and-erroneous-use.stderr
diff --git a/src/test/ui/nll/issue-21232-partial-init-and-use.rs b/tests/ui/nll/issue-21232-partial-init-and-use.rs
index ad3eb2483..ad3eb2483 100644
--- a/src/test/ui/nll/issue-21232-partial-init-and-use.rs
+++ b/tests/ui/nll/issue-21232-partial-init-and-use.rs
diff --git a/src/test/ui/nll/issue-21232-partial-init-and-use.stderr b/tests/ui/nll/issue-21232-partial-init-and-use.stderr
index 97ed414b1..97ed414b1 100644
--- a/src/test/ui/nll/issue-21232-partial-init-and-use.stderr
+++ b/tests/ui/nll/issue-21232-partial-init-and-use.stderr
diff --git a/src/test/ui/nll/issue-22323-temp-destruction.rs b/tests/ui/nll/issue-22323-temp-destruction.rs
index 3f2ece1cf..3f2ece1cf 100644
--- a/src/test/ui/nll/issue-22323-temp-destruction.rs
+++ b/tests/ui/nll/issue-22323-temp-destruction.rs
diff --git a/src/test/ui/nll/issue-24535-allow-mutable-borrow-in-match-guard.rs b/tests/ui/nll/issue-24535-allow-mutable-borrow-in-match-guard.rs
index 7253d35ed..ccfc8937f 100644
--- a/src/test/ui/nll/issue-24535-allow-mutable-borrow-in-match-guard.rs
+++ b/tests/ui/nll/issue-24535-allow-mutable-borrow-in-match-guard.rs
@@ -5,6 +5,8 @@
 // See further discussion on rust-lang/rust#24535,
 // rust-lang/rfcs#1006, and rust-lang/rfcs#107
 
+#![feature(if_let_guard)]
+
 fn main() {
     rust_issue_24535();
     rfcs_issue_1006_1();
@@ -23,6 +25,12 @@ fn rust_issue_24535() {
         3 if compare(&a, &mut 3) => (),
         _ => panic!("nope"),
     }
+
+    match a {
+        0 => panic!("nope"),
+        3 if let true = compare(&a, &mut 3) => (),
+        _ => panic!("nope"),
+    }
 }
 
 fn rfcs_issue_1006_1() {
diff --git a/tests/ui/nll/issue-27282-move-match-input-into-guard.rs b/tests/ui/nll/issue-27282-move-match-input-into-guard.rs
new file mode 100644
index 000000000..85feda582
--- /dev/null
+++ b/tests/ui/nll/issue-27282-move-match-input-into-guard.rs
@@ -0,0 +1,34 @@
+// Issue 27282: Example 2: This sidesteps the AST checks disallowing
+// mutable borrows in match guards by hiding the mutable borrow in a
+// guard behind a move (of the mutably borrowed match input) within a
+// closure.
+//
+// This example is not rejected by AST borrowck (and then reliably
+// reaches the panic code when executed, despite the compiler warning
+// about that match arm being unreachable.
+
+#![feature(if_let_guard)]
+
+fn main() {
+    let b = &mut true;
+    match b {
+        //~^ ERROR use of moved value: `b` [E0382]
+        &mut false => {},
+        _ if { (|| { let bar = b; *bar = false; })();
+                     false } => { },
+        &mut true => { println!("You might think we should get here"); },
+        _ => panic!("surely we could never get here, since rustc warns it is unreachable."),
+    }
+
+    let b = &mut true;
+    match b {
+        //~^ ERROR use of moved value: `b` [E0382]
+        &mut false => {}
+        _ if let Some(()) = {
+            (|| { let bar = b; *bar = false; })();
+            None
+        } => {}
+        &mut true => {}
+        _ => {}
+    }
+}
diff --git a/tests/ui/nll/issue-27282-move-match-input-into-guard.stderr b/tests/ui/nll/issue-27282-move-match-input-into-guard.stderr
new file mode 100644
index 000000000..ae7978004
--- /dev/null
+++ b/tests/ui/nll/issue-27282-move-match-input-into-guard.stderr
@@ -0,0 +1,29 @@
+error[E0382]: use of moved value: `b`
+  --> $DIR/issue-27282-move-match-input-into-guard.rs:14:5
+   |
+LL |     let b = &mut true;
+   |         - move occurs because `b` has type `&mut bool`, which does not implement the `Copy` trait
+LL |     match b {
+   |     ^^^^^^^ value used here after move
+...
+LL |         _ if { (|| { let bar = b; *bar = false; })();
+   |                 --             - variable moved due to use in closure
+   |                 |
+   |                 value moved into closure here
+
+error[E0382]: use of moved value: `b`
+  --> $DIR/issue-27282-move-match-input-into-guard.rs:24:5
+   |
+LL |     let b = &mut true;
+   |         - move occurs because `b` has type `&mut bool`, which does not implement the `Copy` trait
+LL |     match b {
+   |     ^^^^^^^ value used here after move
+...
+LL |             (|| { let bar = b; *bar = false; })();
+   |              --             - variable moved due to use in closure
+   |              |
+   |              value moved into closure here
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0382`.
diff --git a/tests/ui/nll/issue-27282-move-ref-mut-into-guard.rs b/tests/ui/nll/issue-27282-move-ref-mut-into-guard.rs
new file mode 100644
index 000000000..833ca8afd
--- /dev/null
+++ b/tests/ui/nll/issue-27282-move-ref-mut-into-guard.rs
@@ -0,0 +1,23 @@
+// Issue 27282: Example 1: This sidesteps the AST checks disallowing
+// mutable borrows in match guards by hiding the mutable borrow in a
+// guard behind a move (of the ref mut pattern id) within a closure.
+
+#![feature(if_let_guard)]
+
+fn main() {
+    match Some(&4) {
+        None => {},
+        ref mut foo
+            if { (|| { let bar = foo; bar.take() })(); false } => {},
+        //~^ ERROR cannot move out of `foo` in pattern guard [E0507]
+        Some(s) => std::process::exit(*s),
+    }
+
+    match Some(&4) {
+        None => {},
+        ref mut foo
+            if let Some(()) = { (|| { let bar = foo; bar.take() })(); None } => {},
+        //~^ ERROR cannot move out of `foo` in pattern guard [E0507]
+        Some(s) => std::process::exit(*s),
+    }
+}
diff --git a/tests/ui/nll/issue-27282-move-ref-mut-into-guard.stderr b/tests/ui/nll/issue-27282-move-ref-mut-into-guard.stderr
new file mode 100644
index 000000000..45119018d
--- /dev/null
+++ b/tests/ui/nll/issue-27282-move-ref-mut-into-guard.stderr
@@ -0,0 +1,23 @@
+error[E0507]: cannot move out of `foo` in pattern guard
+  --> $DIR/issue-27282-move-ref-mut-into-guard.rs:11:19
+   |
+LL |             if { (|| { let bar = foo; bar.take() })(); false } => {},
+   |                   ^^             --- move occurs because `foo` has type `&mut Option<&i32>`, which does not implement the `Copy` trait
+   |                   |
+   |                   move out of `foo` occurs here
+   |
+   = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
+
+error[E0507]: cannot move out of `foo` in pattern guard
+  --> $DIR/issue-27282-move-ref-mut-into-guard.rs:19:34
+   |
+LL |             if let Some(()) = { (|| { let bar = foo; bar.take() })(); None } => {},
+   |                                  ^^             --- move occurs because `foo` has type `&mut Option<&i32>`, which does not implement the `Copy` trait
+   |                                  |
+   |                                  move out of `foo` occurs here
+   |
+   = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-1.rs b/tests/ui/nll/issue-27282-mutate-before-diverging-arm-1.rs
index d17d6f07f..d17d6f07f 100644
--- a/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-1.rs
+++ b/tests/ui/nll/issue-27282-mutate-before-diverging-arm-1.rs
diff --git a/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-1.stderr b/tests/ui/nll/issue-27282-mutate-before-diverging-arm-1.stderr
index a1f973e0f..a1f973e0f 100644
--- a/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-1.stderr
+++ b/tests/ui/nll/issue-27282-mutate-before-diverging-arm-1.stderr
diff --git a/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-2.rs b/tests/ui/nll/issue-27282-mutate-before-diverging-arm-2.rs
index 9c3e7e997..9c3e7e997 100644
--- a/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-2.rs
+++ b/tests/ui/nll/issue-27282-mutate-before-diverging-arm-2.rs
diff --git a/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-2.stderr b/tests/ui/nll/issue-27282-mutate-before-diverging-arm-2.stderr
index dd46308d1..dd46308d1 100644
--- a/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-2.stderr
+++ b/tests/ui/nll/issue-27282-mutate-before-diverging-arm-2.stderr
diff --git a/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-3.rs b/tests/ui/nll/issue-27282-mutate-before-diverging-arm-3.rs
index cff9e963e..cff9e963e 100644
--- a/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-3.rs
+++ b/tests/ui/nll/issue-27282-mutate-before-diverging-arm-3.rs
diff --git a/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-3.stderr b/tests/ui/nll/issue-27282-mutate-before-diverging-arm-3.stderr
index 4a4a25790..4a4a25790 100644
--- a/src/test/ui/nll/issue-27282-mutate-before-diverging-arm-3.stderr
+++ b/tests/ui/nll/issue-27282-mutate-before-diverging-arm-3.stderr
diff --git a/tests/ui/nll/issue-27282-mutation-in-guard.rs b/tests/ui/nll/issue-27282-mutation-in-guard.rs
new file mode 100644
index 000000000..4f41fc23f
--- /dev/null
+++ b/tests/ui/nll/issue-27282-mutation-in-guard.rs
@@ -0,0 +1,26 @@
+#![feature(if_let_guard)]
+
+fn main() {
+    match Some(&4) {
+        None => {},
+        ref mut foo
+            if {
+                (|| { let bar = foo; bar.take() })();
+                //~^ ERROR cannot move out of `foo` in pattern guard
+                false
+            } => {},
+        Some(ref _s) => println!("Note this arm is bogus; the `Some` became `None` in the guard."),
+        _ => println!("Here is some supposedly unreachable code."),
+    }
+
+    match Some(&4) {
+        None => {},
+        ref mut foo
+            if let Some(()) = {
+                (|| { let bar = foo; bar.take() })();
+                //~^ ERROR cannot move out of `foo` in pattern guard
+                None
+            } => {},
+        Some(_) => {},
+    }
+}
diff --git a/tests/ui/nll/issue-27282-mutation-in-guard.stderr b/tests/ui/nll/issue-27282-mutation-in-guard.stderr
new file mode 100644
index 000000000..1ba696593
--- /dev/null
+++ b/tests/ui/nll/issue-27282-mutation-in-guard.stderr
@@ -0,0 +1,23 @@
+error[E0507]: cannot move out of `foo` in pattern guard
+  --> $DIR/issue-27282-mutation-in-guard.rs:8:18
+   |
+LL |                 (|| { let bar = foo; bar.take() })();
+   |                  ^^             --- move occurs because `foo` has type `&mut Option<&i32>`, which does not implement the `Copy` trait
+   |                  |
+   |                  move out of `foo` occurs here
+   |
+   = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
+
+error[E0507]: cannot move out of `foo` in pattern guard
+  --> $DIR/issue-27282-mutation-in-guard.rs:20:18
+   |
+LL |                 (|| { let bar = foo; bar.take() })();
+   |                  ^^             --- move occurs because `foo` has type `&mut Option<&i32>`, which does not implement the `Copy` trait
+   |                  |
+   |                  move out of `foo` occurs here
+   |
+   = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/tests/ui/nll/issue-27282-reborrow-ref-mut-in-guard.rs b/tests/ui/nll/issue-27282-reborrow-ref-mut-in-guard.rs
new file mode 100644
index 000000000..ac06b2b01
--- /dev/null
+++ b/tests/ui/nll/issue-27282-reborrow-ref-mut-in-guard.rs
@@ -0,0 +1,30 @@
+// Issue 27282: This is a variation on issue-27282-move-ref-mut-into-guard.rs
+//
+// It reborrows instead of moving the `ref mut` pattern borrow. This
+// means that our conservative check for mutation in guards will
+// reject it. But I want to make sure that we continue to reject it
+// (under NLL) even when that conservative check goes away.
+
+#![feature(if_let_guard)]
+
+fn main() {
+    let mut b = &mut true;
+    match b {
+        &mut false => {},
+        ref mut r if { (|| { let bar = &mut *r; **bar = false; })();
+        //~^ ERROR cannot borrow `r` as mutable, as it is immutable for the pattern guard
+                             false } => { &mut *r; },
+        &mut true => { println!("You might think we should get here"); },
+        _ => panic!("surely we could never get here, since rustc warns it is unreachable."),
+    }
+
+    let mut b = &mut true;
+    match b {
+        &mut false => {},
+        ref mut r if let Some(()) = { (|| { let bar = &mut *r; **bar = false; })();
+        //~^ ERROR cannot borrow `r` as mutable, as it is immutable for the pattern guard
+                             None } => { &mut *r; },
+        &mut true => {},
+        _ => {},
+    }
+}
diff --git a/tests/ui/nll/issue-27282-reborrow-ref-mut-in-guard.stderr b/tests/ui/nll/issue-27282-reborrow-ref-mut-in-guard.stderr
new file mode 100644
index 000000000..5eb7a25bf
--- /dev/null
+++ b/tests/ui/nll/issue-27282-reborrow-ref-mut-in-guard.stderr
@@ -0,0 +1,23 @@
+error[E0596]: cannot borrow `r` as mutable, as it is immutable for the pattern guard
+  --> $DIR/issue-27282-reborrow-ref-mut-in-guard.rs:14:25
+   |
+LL |         ref mut r if { (|| { let bar = &mut *r; **bar = false; })();
+   |                         ^^                  -- mutable borrow occurs due to use of `r` in closure
+   |                         |
+   |                         cannot borrow as mutable
+   |
+   = note: variables bound in patterns are immutable until the end of the pattern guard
+
+error[E0596]: cannot borrow `r` as mutable, as it is immutable for the pattern guard
+  --> $DIR/issue-27282-reborrow-ref-mut-in-guard.rs:24:40
+   |
+LL |         ref mut r if let Some(()) = { (|| { let bar = &mut *r; **bar = false; })();
+   |                                        ^^                  -- mutable borrow occurs due to use of `r` in closure
+   |                                        |
+   |                                        cannot borrow as mutable
+   |
+   = note: variables bound in patterns are immutable until the end of the pattern guard
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/nll/issue-27868.rs b/tests/ui/nll/issue-27868.rs
index e436b22db..e436b22db 100644
--- a/src/test/ui/nll/issue-27868.rs
+++ b/tests/ui/nll/issue-27868.rs
diff --git a/src/test/ui/nll/issue-27868.stderr b/tests/ui/nll/issue-27868.stderr
index e0b3b5494..e0b3b5494 100644
--- a/src/test/ui/nll/issue-27868.stderr
+++ b/tests/ui/nll/issue-27868.stderr
diff --git a/src/test/ui/nll/issue-30104.rs b/tests/ui/nll/issue-30104.rs
index 38850cd3f..38850cd3f 100644
--- a/src/test/ui/nll/issue-30104.rs
+++ b/tests/ui/nll/issue-30104.rs
diff --git a/src/test/ui/nll/issue-31567.rs b/tests/ui/nll/issue-31567.rs
index 623954e6d..623954e6d 100644
--- a/src/test/ui/nll/issue-31567.rs
+++ b/tests/ui/nll/issue-31567.rs
diff --git a/src/test/ui/nll/issue-31567.stderr b/tests/ui/nll/issue-31567.stderr
index 7d43383e8..7d43383e8 100644
--- a/src/test/ui/nll/issue-31567.stderr
+++ b/tests/ui/nll/issue-31567.stderr
diff --git a/src/test/ui/nll/issue-32382-index-assoc-type-with-lifetime.rs b/tests/ui/nll/issue-32382-index-assoc-type-with-lifetime.rs
index a8a8e6930..a8a8e6930 100644
--- a/src/test/ui/nll/issue-32382-index-assoc-type-with-lifetime.rs
+++ b/tests/ui/nll/issue-32382-index-assoc-type-with-lifetime.rs
diff --git a/src/test/ui/nll/issue-42574-diagnostic-in-nested-closure.rs b/tests/ui/nll/issue-42574-diagnostic-in-nested-closure.rs
index 0ec0179e8..0ec0179e8 100644
--- a/src/test/ui/nll/issue-42574-diagnostic-in-nested-closure.rs
+++ b/tests/ui/nll/issue-42574-diagnostic-in-nested-closure.rs
diff --git a/src/test/ui/nll/issue-42574-diagnostic-in-nested-closure.stderr b/tests/ui/nll/issue-42574-diagnostic-in-nested-closure.stderr
index f7a525ee9..f7a525ee9 100644
--- a/src/test/ui/nll/issue-42574-diagnostic-in-nested-closure.stderr
+++ b/tests/ui/nll/issue-42574-diagnostic-in-nested-closure.stderr
diff --git a/src/test/ui/nll/issue-43058.rs b/tests/ui/nll/issue-43058.rs
index 227888d17..227888d17 100644
--- a/src/test/ui/nll/issue-43058.rs
+++ b/tests/ui/nll/issue-43058.rs
diff --git a/src/test/ui/nll/issue-45157.rs b/tests/ui/nll/issue-45157.rs
index 8d2bf22a0..8d2bf22a0 100644
--- a/src/test/ui/nll/issue-45157.rs
+++ b/tests/ui/nll/issue-45157.rs
diff --git a/src/test/ui/nll/issue-45157.stderr b/tests/ui/nll/issue-45157.stderr
index 57fd8d49c..57fd8d49c 100644
--- a/src/test/ui/nll/issue-45157.stderr
+++ b/tests/ui/nll/issue-45157.stderr
diff --git a/src/test/ui/nll/issue-45696-long-live-borrows-in-boxes.rs b/tests/ui/nll/issue-45696-long-live-borrows-in-boxes.rs
index b3f655628..b3f655628 100644
--- a/src/test/ui/nll/issue-45696-long-live-borrows-in-boxes.rs
+++ b/tests/ui/nll/issue-45696-long-live-borrows-in-boxes.rs
diff --git a/src/test/ui/nll/issue-45696-no-variant-box-recur.rs b/tests/ui/nll/issue-45696-no-variant-box-recur.rs
index 39f1607a3..39f1607a3 100644
--- a/src/test/ui/nll/issue-45696-no-variant-box-recur.rs
+++ b/tests/ui/nll/issue-45696-no-variant-box-recur.rs
diff --git a/src/test/ui/nll/issue-45696-scribble-on-boxed-borrow.rs b/tests/ui/nll/issue-45696-scribble-on-boxed-borrow.rs
index 637cf278f..637cf278f 100644
--- a/src/test/ui/nll/issue-45696-scribble-on-boxed-borrow.rs
+++ b/tests/ui/nll/issue-45696-scribble-on-boxed-borrow.rs
diff --git a/src/test/ui/nll/issue-45696-scribble-on-boxed-borrow.stderr b/tests/ui/nll/issue-45696-scribble-on-boxed-borrow.stderr
index db0a17199..db0a17199 100644
--- a/src/test/ui/nll/issue-45696-scribble-on-boxed-borrow.stderr
+++ b/tests/ui/nll/issue-45696-scribble-on-boxed-borrow.stderr
diff --git a/src/test/ui/nll/issue-46023.rs b/tests/ui/nll/issue-46023.rs
index a923eb244..a923eb244 100644
--- a/src/test/ui/nll/issue-46023.rs
+++ b/tests/ui/nll/issue-46023.rs
diff --git a/src/test/ui/nll/issue-46023.stderr b/tests/ui/nll/issue-46023.stderr
index ca19c2501..ca19c2501 100644
--- a/src/test/ui/nll/issue-46023.stderr
+++ b/tests/ui/nll/issue-46023.stderr
diff --git a/src/test/ui/nll/issue-46036.rs b/tests/ui/nll/issue-46036.rs
index 18af33c18..18af33c18 100644
--- a/src/test/ui/nll/issue-46036.rs
+++ b/tests/ui/nll/issue-46036.rs
diff --git a/src/test/ui/nll/issue-46036.stderr b/tests/ui/nll/issue-46036.stderr
index e6e95ee61..e6e95ee61 100644
--- a/src/test/ui/nll/issue-46036.stderr
+++ b/tests/ui/nll/issue-46036.stderr
diff --git a/src/test/ui/nll/issue-46589.rs b/tests/ui/nll/issue-46589.rs
index 0a4c20d15..0a4c20d15 100644
--- a/src/test/ui/nll/issue-46589.rs
+++ b/tests/ui/nll/issue-46589.rs
diff --git a/src/test/ui/nll/issue-46589.stderr b/tests/ui/nll/issue-46589.stderr
index 60ef3f7b8..60ef3f7b8 100644
--- a/src/test/ui/nll/issue-46589.stderr
+++ b/tests/ui/nll/issue-46589.stderr
diff --git a/src/test/ui/nll/issue-47022.rs b/tests/ui/nll/issue-47022.rs
index 521643c66..521643c66 100644
--- a/src/test/ui/nll/issue-47022.rs
+++ b/tests/ui/nll/issue-47022.rs
diff --git a/src/test/ui/nll/issue-47153-generic-const.rs b/tests/ui/nll/issue-47153-generic-const.rs
index 9f4d57111..9f4d57111 100644
--- a/src/test/ui/nll/issue-47153-generic-const.rs
+++ b/tests/ui/nll/issue-47153-generic-const.rs
diff --git a/src/test/ui/nll/issue-47388.rs b/tests/ui/nll/issue-47388.rs
index 207af380e..207af380e 100644
--- a/src/test/ui/nll/issue-47388.rs
+++ b/tests/ui/nll/issue-47388.rs
diff --git a/tests/ui/nll/issue-47388.stderr b/tests/ui/nll/issue-47388.stderr
new file mode 100644
index 000000000..c780451df
--- /dev/null
+++ b/tests/ui/nll/issue-47388.stderr
@@ -0,0 +1,14 @@
+error[E0594]: cannot assign to `fancy_ref.num`, which is behind a `&` reference
+  --> $DIR/issue-47388.rs:8:5
+   |
+LL |     fancy_ref.num = 6;
+   |     ^^^^^^^^^^^^^^^^^ `fancy_ref` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let fancy_ref = &mut (&mut fancy);
+   |                     ~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/nll/issue-47470.rs b/tests/ui/nll/issue-47470.rs
index 72ee7f886..72ee7f886 100644
--- a/src/test/ui/nll/issue-47470.rs
+++ b/tests/ui/nll/issue-47470.rs
diff --git a/src/test/ui/nll/issue-47470.stderr b/tests/ui/nll/issue-47470.stderr
index 0b1247d60..0b1247d60 100644
--- a/src/test/ui/nll/issue-47470.stderr
+++ b/tests/ui/nll/issue-47470.stderr
diff --git a/src/test/ui/nll/issue-47589.rs b/tests/ui/nll/issue-47589.rs
index 280bf0811..280bf0811 100644
--- a/src/test/ui/nll/issue-47589.rs
+++ b/tests/ui/nll/issue-47589.rs
diff --git a/src/test/ui/nll/issue-48070.rs b/tests/ui/nll/issue-48070.rs
index a9fe3521d..a9fe3521d 100644
--- a/src/test/ui/nll/issue-48070.rs
+++ b/tests/ui/nll/issue-48070.rs
diff --git a/src/test/ui/nll/issue-48238.rs b/tests/ui/nll/issue-48238.rs
index d2e9285fa..d2e9285fa 100644
--- a/src/test/ui/nll/issue-48238.rs
+++ b/tests/ui/nll/issue-48238.rs
diff --git a/src/test/ui/nll/issue-48238.stderr b/tests/ui/nll/issue-48238.stderr
index 0aa1eedad..0aa1eedad 100644
--- a/src/test/ui/nll/issue-48238.stderr
+++ b/tests/ui/nll/issue-48238.stderr
diff --git a/src/test/ui/nll/issue-48623-closure.rs b/tests/ui/nll/issue-48623-closure.rs
index 3f8587eed..3f8587eed 100644
--- a/src/test/ui/nll/issue-48623-closure.rs
+++ b/tests/ui/nll/issue-48623-closure.rs
diff --git a/src/test/ui/nll/issue-48623-generator.rs b/tests/ui/nll/issue-48623-generator.rs
index 08d2584ee..08d2584ee 100644
--- a/src/test/ui/nll/issue-48623-generator.rs
+++ b/tests/ui/nll/issue-48623-generator.rs
diff --git a/src/test/ui/nll/issue-48623-generator.stderr b/tests/ui/nll/issue-48623-generator.stderr
index bfdfca210..bfdfca210 100644
--- a/src/test/ui/nll/issue-48623-generator.stderr
+++ b/tests/ui/nll/issue-48623-generator.stderr
diff --git a/src/test/ui/nll/issue-48697.rs b/tests/ui/nll/issue-48697.rs
index 16e29ab2a..16e29ab2a 100644
--- a/src/test/ui/nll/issue-48697.rs
+++ b/tests/ui/nll/issue-48697.rs
diff --git a/src/test/ui/nll/issue-48697.stderr b/tests/ui/nll/issue-48697.stderr
index f0c29b72b..f0c29b72b 100644
--- a/src/test/ui/nll/issue-48697.stderr
+++ b/tests/ui/nll/issue-48697.stderr
diff --git a/src/test/ui/nll/issue-48803.rs b/tests/ui/nll/issue-48803.rs
index f7fd04179..f7fd04179 100644
--- a/src/test/ui/nll/issue-48803.rs
+++ b/tests/ui/nll/issue-48803.rs
diff --git a/src/test/ui/nll/issue-48803.stderr b/tests/ui/nll/issue-48803.stderr
index 2f94039c0..2f94039c0 100644
--- a/src/test/ui/nll/issue-48803.stderr
+++ b/tests/ui/nll/issue-48803.stderr
diff --git a/src/test/ui/nll/issue-50343.rs b/tests/ui/nll/issue-50343.rs
index dd0afbbdf..dd0afbbdf 100644
--- a/src/test/ui/nll/issue-50343.rs
+++ b/tests/ui/nll/issue-50343.rs
diff --git a/src/test/ui/nll/issue-50461-used-mut-from-moves.rs b/tests/ui/nll/issue-50461-used-mut-from-moves.rs
index 2458b171e..2458b171e 100644
--- a/src/test/ui/nll/issue-50461-used-mut-from-moves.rs
+++ b/tests/ui/nll/issue-50461-used-mut-from-moves.rs
diff --git a/src/test/ui/nll/issue-50716-1.rs b/tests/ui/nll/issue-50716-1.rs
index 9c3e24de4..9c3e24de4 100644
--- a/src/test/ui/nll/issue-50716-1.rs
+++ b/tests/ui/nll/issue-50716-1.rs
diff --git a/src/test/ui/nll/issue-50716.rs b/tests/ui/nll/issue-50716.rs
index c2fc345fa..c2fc345fa 100644
--- a/src/test/ui/nll/issue-50716.rs
+++ b/tests/ui/nll/issue-50716.rs
diff --git a/src/test/ui/nll/issue-50716.stderr b/tests/ui/nll/issue-50716.stderr
index 38dd1b5f6..38dd1b5f6 100644
--- a/src/test/ui/nll/issue-50716.stderr
+++ b/tests/ui/nll/issue-50716.stderr
diff --git a/src/test/ui/nll/issue-51191.rs b/tests/ui/nll/issue-51191.rs
index 836587d93..836587d93 100644
--- a/src/test/ui/nll/issue-51191.rs
+++ b/tests/ui/nll/issue-51191.rs
diff --git a/src/test/ui/nll/issue-51191.stderr b/tests/ui/nll/issue-51191.stderr
index 63ca6ae5c..27b1f8705 100644
--- a/src/test/ui/nll/issue-51191.stderr
+++ b/tests/ui/nll/issue-51191.stderr
@@ -30,10 +30,13 @@ LL |         (&mut self).bar();
 error[E0596]: cannot borrow `self` as mutable, as it is not declared as mutable
   --> $DIR/issue-51191.rs:13:9
    |
-LL |     fn imm(self) {
-   |            ---- help: consider changing this to be mutable: `mut self`
 LL |         (&mut self).bar();
    |         ^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     fn imm(mut self) {
+   |            +++
 
 error[E0596]: cannot borrow `self` as mutable, as it is not declared as mutable
   --> $DIR/issue-51191.rs:22:9
diff --git a/src/test/ui/nll/issue-51244.rs b/tests/ui/nll/issue-51244.rs
index c4cbee675..c4cbee675 100644
--- a/src/test/ui/nll/issue-51244.rs
+++ b/tests/ui/nll/issue-51244.rs
diff --git a/tests/ui/nll/issue-51244.stderr b/tests/ui/nll/issue-51244.stderr
new file mode 100644
index 000000000..03d8acc81
--- /dev/null
+++ b/tests/ui/nll/issue-51244.stderr
@@ -0,0 +1,14 @@
+error[E0594]: cannot assign to `*my_ref`, which is behind a `&` reference
+  --> $DIR/issue-51244.rs:3:5
+   |
+LL |     *my_ref = 0;
+   |     ^^^^^^^^^^^ `my_ref` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let ref mut my_ref @ _ = 0;
+   |         ~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/nll/issue-51268.rs b/tests/ui/nll/issue-51268.rs
index dcdedf7d4..dcdedf7d4 100644
--- a/src/test/ui/nll/issue-51268.rs
+++ b/tests/ui/nll/issue-51268.rs
diff --git a/src/test/ui/nll/issue-51268.stderr b/tests/ui/nll/issue-51268.stderr
index 0483bda63..0483bda63 100644
--- a/src/test/ui/nll/issue-51268.stderr
+++ b/tests/ui/nll/issue-51268.stderr
diff --git a/src/test/ui/nll/issue-51345-2.rs b/tests/ui/nll/issue-51345-2.rs
index 52f342a85..52f342a85 100644
--- a/src/test/ui/nll/issue-51345-2.rs
+++ b/tests/ui/nll/issue-51345-2.rs
diff --git a/src/test/ui/nll/issue-51351.rs b/tests/ui/nll/issue-51351.rs
index 591d49584..591d49584 100644
--- a/src/test/ui/nll/issue-51351.rs
+++ b/tests/ui/nll/issue-51351.rs
diff --git a/src/test/ui/nll/issue-51512.rs b/tests/ui/nll/issue-51512.rs
index 691760eb9..691760eb9 100644
--- a/src/test/ui/nll/issue-51512.rs
+++ b/tests/ui/nll/issue-51512.rs
diff --git a/src/test/ui/nll/issue-51512.stderr b/tests/ui/nll/issue-51512.stderr
index 072e96788..072e96788 100644
--- a/src/test/ui/nll/issue-51512.stderr
+++ b/tests/ui/nll/issue-51512.stderr
diff --git a/src/test/ui/nll/issue-51770.rs b/tests/ui/nll/issue-51770.rs
index 3d6bc82f1..3d6bc82f1 100644
--- a/src/test/ui/nll/issue-51770.rs
+++ b/tests/ui/nll/issue-51770.rs
diff --git a/src/test/ui/nll/issue-52057.rs b/tests/ui/nll/issue-52057.rs
index 98f49fe8f..98f49fe8f 100644
--- a/src/test/ui/nll/issue-52057.rs
+++ b/tests/ui/nll/issue-52057.rs
diff --git a/src/test/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.rs b/tests/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.rs
index 7ea1c445d..7ea1c445d 100644
--- a/src/test/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.rs
+++ b/tests/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.rs
diff --git a/src/test/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.stderr b/tests/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.stderr
index c0a17a67e..7f9cbc3c3 100644
--- a/src/test/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.stderr
+++ b/tests/ui/nll/issue-52059-report-when-borrow-and-drop-conflict.stderr
@@ -36,7 +36,11 @@ LL |     let p = s.url; p
    |             |
    |             cannot move out of here
    |             move occurs because `s.url` has type `&mut String`, which does not implement the `Copy` trait
-   |             help: consider borrowing here: `&s.url`
+   |
+help: consider borrowing here
+   |
+LL |     let p = &s.url; p
+   |             +
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/nll/issue-52078.rs b/tests/ui/nll/issue-52078.rs
index a2bcb91ac..a2bcb91ac 100644
--- a/src/test/ui/nll/issue-52078.rs
+++ b/tests/ui/nll/issue-52078.rs
diff --git a/src/test/ui/nll/issue-52086.rs b/tests/ui/nll/issue-52086.rs
index 0414428e4..0414428e4 100644
--- a/src/test/ui/nll/issue-52086.rs
+++ b/tests/ui/nll/issue-52086.rs
diff --git a/src/test/ui/nll/issue-52086.stderr b/tests/ui/nll/issue-52086.stderr
index 3b2dae9b7..3b2dae9b7 100644
--- a/src/test/ui/nll/issue-52086.stderr
+++ b/tests/ui/nll/issue-52086.stderr
diff --git a/src/test/ui/nll/issue-52113.rs b/tests/ui/nll/issue-52113.rs
index ffaef272a..ffaef272a 100644
--- a/src/test/ui/nll/issue-52113.rs
+++ b/tests/ui/nll/issue-52113.rs
diff --git a/src/test/ui/nll/issue-52113.stderr b/tests/ui/nll/issue-52113.stderr
index 84d4eb266..84d4eb266 100644
--- a/src/test/ui/nll/issue-52113.stderr
+++ b/tests/ui/nll/issue-52113.stderr
diff --git a/src/test/ui/nll/issue-52213.rs b/tests/ui/nll/issue-52213.rs
index a016924a8..a016924a8 100644
--- a/src/test/ui/nll/issue-52213.rs
+++ b/tests/ui/nll/issue-52213.rs
diff --git a/src/test/ui/nll/issue-52213.stderr b/tests/ui/nll/issue-52213.stderr
index da31bcd54..da31bcd54 100644
--- a/src/test/ui/nll/issue-52213.stderr
+++ b/tests/ui/nll/issue-52213.stderr
diff --git a/src/test/ui/nll/issue-52533-1.rs b/tests/ui/nll/issue-52533-1.rs
index d15daeddc..d15daeddc 100644
--- a/src/test/ui/nll/issue-52533-1.rs
+++ b/tests/ui/nll/issue-52533-1.rs
diff --git a/src/test/ui/nll/issue-52533-1.stderr b/tests/ui/nll/issue-52533-1.stderr
index 20f19b259..20f19b259 100644
--- a/src/test/ui/nll/issue-52533-1.stderr
+++ b/tests/ui/nll/issue-52533-1.stderr
diff --git a/src/test/ui/nll/issue-52534-1.rs b/tests/ui/nll/issue-52534-1.rs
index d9ea3ae42..d9ea3ae42 100644
--- a/src/test/ui/nll/issue-52534-1.rs
+++ b/tests/ui/nll/issue-52534-1.rs
diff --git a/src/test/ui/nll/issue-52534-1.stderr b/tests/ui/nll/issue-52534-1.stderr
index 743179f05..743179f05 100644
--- a/src/test/ui/nll/issue-52534-1.stderr
+++ b/tests/ui/nll/issue-52534-1.stderr
diff --git a/src/test/ui/nll/issue-52534-2.rs b/tests/ui/nll/issue-52534-2.rs
index e416264ed..e416264ed 100644
--- a/src/test/ui/nll/issue-52534-2.rs
+++ b/tests/ui/nll/issue-52534-2.rs
diff --git a/src/test/ui/nll/issue-52534-2.stderr b/tests/ui/nll/issue-52534-2.stderr
index ac385e056..ac385e056 100644
--- a/src/test/ui/nll/issue-52534-2.stderr
+++ b/tests/ui/nll/issue-52534-2.stderr
diff --git a/src/test/ui/nll/issue-52534.rs b/tests/ui/nll/issue-52534.rs
index 559d4c859..559d4c859 100644
--- a/src/test/ui/nll/issue-52534.rs
+++ b/tests/ui/nll/issue-52534.rs
diff --git a/src/test/ui/nll/issue-52534.stderr b/tests/ui/nll/issue-52534.stderr
index b2b727fd4..b2b727fd4 100644
--- a/src/test/ui/nll/issue-52534.stderr
+++ b/tests/ui/nll/issue-52534.stderr
diff --git a/src/test/ui/nll/issue-52663-span-decl-captured-variable.rs b/tests/ui/nll/issue-52663-span-decl-captured-variable.rs
index cd1f457a1..cd1f457a1 100644
--- a/src/test/ui/nll/issue-52663-span-decl-captured-variable.rs
+++ b/tests/ui/nll/issue-52663-span-decl-captured-variable.rs
diff --git a/src/test/ui/nll/issue-52663-span-decl-captured-variable.stderr b/tests/ui/nll/issue-52663-span-decl-captured-variable.stderr
index fb61b30f0..fb61b30f0 100644
--- a/src/test/ui/nll/issue-52663-span-decl-captured-variable.stderr
+++ b/tests/ui/nll/issue-52663-span-decl-captured-variable.stderr
diff --git a/src/test/ui/nll/issue-52663-trait-object.rs b/tests/ui/nll/issue-52663-trait-object.rs
index f6bbb2d14..f6bbb2d14 100644
--- a/src/test/ui/nll/issue-52663-trait-object.rs
+++ b/tests/ui/nll/issue-52663-trait-object.rs
diff --git a/src/test/ui/nll/issue-52663-trait-object.stderr b/tests/ui/nll/issue-52663-trait-object.stderr
index 5cedea6e6..5cedea6e6 100644
--- a/src/test/ui/nll/issue-52663-trait-object.stderr
+++ b/tests/ui/nll/issue-52663-trait-object.stderr
diff --git a/src/test/ui/nll/issue-52669.rs b/tests/ui/nll/issue-52669.rs
index e33528ac5..e33528ac5 100644
--- a/src/test/ui/nll/issue-52669.rs
+++ b/tests/ui/nll/issue-52669.rs
diff --git a/src/test/ui/nll/issue-52669.stderr b/tests/ui/nll/issue-52669.stderr
index 807b95f7e..807b95f7e 100644
--- a/src/test/ui/nll/issue-52669.stderr
+++ b/tests/ui/nll/issue-52669.stderr
diff --git a/src/test/ui/nll/issue-52742.rs b/tests/ui/nll/issue-52742.rs
index d3e201b8a..d3e201b8a 100644
--- a/src/test/ui/nll/issue-52742.rs
+++ b/tests/ui/nll/issue-52742.rs
diff --git a/src/test/ui/nll/issue-52742.stderr b/tests/ui/nll/issue-52742.stderr
index a79738296..a79738296 100644
--- a/src/test/ui/nll/issue-52742.stderr
+++ b/tests/ui/nll/issue-52742.stderr
diff --git a/src/test/ui/nll/issue-52992.rs b/tests/ui/nll/issue-52992.rs
index 530d1a61b..530d1a61b 100644
--- a/src/test/ui/nll/issue-52992.rs
+++ b/tests/ui/nll/issue-52992.rs
diff --git a/src/test/ui/nll/issue-53040.rs b/tests/ui/nll/issue-53040.rs
index e4ee6e913..e4ee6e913 100644
--- a/src/test/ui/nll/issue-53040.rs
+++ b/tests/ui/nll/issue-53040.rs
diff --git a/src/test/ui/nll/issue-53040.stderr b/tests/ui/nll/issue-53040.stderr
index 87ffe9b1a..87ffe9b1a 100644
--- a/src/test/ui/nll/issue-53040.stderr
+++ b/tests/ui/nll/issue-53040.stderr
diff --git a/src/test/ui/nll/issue-53119.rs b/tests/ui/nll/issue-53119.rs
index 03c9c071c..03c9c071c 100644
--- a/src/test/ui/nll/issue-53119.rs
+++ b/tests/ui/nll/issue-53119.rs
diff --git a/src/test/ui/nll/issue-53123-raw-pointer-cast.rs b/tests/ui/nll/issue-53123-raw-pointer-cast.rs
index 941c9eeb4..941c9eeb4 100644
--- a/src/test/ui/nll/issue-53123-raw-pointer-cast.rs
+++ b/tests/ui/nll/issue-53123-raw-pointer-cast.rs
diff --git a/src/test/ui/nll/issue-53570.rs b/tests/ui/nll/issue-53570.rs
index 35860ba9c..35860ba9c 100644
--- a/src/test/ui/nll/issue-53570.rs
+++ b/tests/ui/nll/issue-53570.rs
diff --git a/src/test/ui/nll/issue-53773.rs b/tests/ui/nll/issue-53773.rs
index ed971b6ce..ed971b6ce 100644
--- a/src/test/ui/nll/issue-53773.rs
+++ b/tests/ui/nll/issue-53773.rs
diff --git a/src/test/ui/nll/issue-53773.stderr b/tests/ui/nll/issue-53773.stderr
index 90cba2a14..90cba2a14 100644
--- a/src/test/ui/nll/issue-53773.stderr
+++ b/tests/ui/nll/issue-53773.stderr
diff --git a/src/test/ui/nll/issue-53807.rs b/tests/ui/nll/issue-53807.rs
index d494f7e15..d494f7e15 100644
--- a/src/test/ui/nll/issue-53807.rs
+++ b/tests/ui/nll/issue-53807.rs
diff --git a/src/test/ui/nll/issue-53807.stderr b/tests/ui/nll/issue-53807.stderr
index d8f58b591..d8f58b591 100644
--- a/src/test/ui/nll/issue-53807.stderr
+++ b/tests/ui/nll/issue-53807.stderr
diff --git a/src/test/ui/issues/issue-54189.rs b/tests/ui/nll/issue-54189.rs
index 70aecc384..70aecc384 100644
--- a/src/test/ui/issues/issue-54189.rs
+++ b/tests/ui/nll/issue-54189.rs
diff --git a/src/test/ui/issues/issue-54189.stderr b/tests/ui/nll/issue-54189.stderr
index 4787abd49..4787abd49 100644
--- a/src/test/ui/issues/issue-54189.stderr
+++ b/tests/ui/nll/issue-54189.stderr
diff --git a/src/test/ui/nll/issue-54382-use-span-of-tail-of-block.rs b/tests/ui/nll/issue-54382-use-span-of-tail-of-block.rs
index 312e6dce8..312e6dce8 100644
--- a/src/test/ui/nll/issue-54382-use-span-of-tail-of-block.rs
+++ b/tests/ui/nll/issue-54382-use-span-of-tail-of-block.rs
diff --git a/src/test/ui/nll/issue-54382-use-span-of-tail-of-block.stderr b/tests/ui/nll/issue-54382-use-span-of-tail-of-block.stderr
index d8f43cbc9..d8f43cbc9 100644
--- a/src/test/ui/nll/issue-54382-use-span-of-tail-of-block.stderr
+++ b/tests/ui/nll/issue-54382-use-span-of-tail-of-block.stderr
diff --git a/src/test/ui/nll/issue-54556-niconii.rs b/tests/ui/nll/issue-54556-niconii.rs
index cae389e8c..cae389e8c 100644
--- a/src/test/ui/nll/issue-54556-niconii.rs
+++ b/tests/ui/nll/issue-54556-niconii.rs
diff --git a/src/test/ui/nll/issue-54556-niconii.stderr b/tests/ui/nll/issue-54556-niconii.stderr
index a8e1edc54..a8e1edc54 100644
--- a/src/test/ui/nll/issue-54556-niconii.stderr
+++ b/tests/ui/nll/issue-54556-niconii.stderr
diff --git a/src/test/ui/nll/issue-54556-stephaneyfx.rs b/tests/ui/nll/issue-54556-stephaneyfx.rs
index b758228e4..b758228e4 100644
--- a/src/test/ui/nll/issue-54556-stephaneyfx.rs
+++ b/tests/ui/nll/issue-54556-stephaneyfx.rs
diff --git a/src/test/ui/nll/issue-54556-stephaneyfx.stderr b/tests/ui/nll/issue-54556-stephaneyfx.stderr
index 036a7a0ab..036a7a0ab 100644
--- a/src/test/ui/nll/issue-54556-stephaneyfx.stderr
+++ b/tests/ui/nll/issue-54556-stephaneyfx.stderr
diff --git a/src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.rs b/tests/ui/nll/issue-54556-temps-in-tail-diagnostic.rs
index 2935caaf2..2935caaf2 100644
--- a/src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.rs
+++ b/tests/ui/nll/issue-54556-temps-in-tail-diagnostic.rs
diff --git a/src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr b/tests/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr
index 92f5ffdf3..92f5ffdf3 100644
--- a/src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr
+++ b/tests/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr
diff --git a/src/test/ui/nll/issue-54556-used-vs-unused-tails.rs b/tests/ui/nll/issue-54556-used-vs-unused-tails.rs
index a111acca6..a111acca6 100644
--- a/src/test/ui/nll/issue-54556-used-vs-unused-tails.rs
+++ b/tests/ui/nll/issue-54556-used-vs-unused-tails.rs
diff --git a/src/test/ui/nll/issue-54556-used-vs-unused-tails.stderr b/tests/ui/nll/issue-54556-used-vs-unused-tails.stderr
index 25226e296..25226e296 100644
--- a/src/test/ui/nll/issue-54556-used-vs-unused-tails.stderr
+++ b/tests/ui/nll/issue-54556-used-vs-unused-tails.stderr
diff --git a/src/test/ui/nll/issue-54556-wrap-it-up.rs b/tests/ui/nll/issue-54556-wrap-it-up.rs
index 11dbef0d8..11dbef0d8 100644
--- a/src/test/ui/nll/issue-54556-wrap-it-up.rs
+++ b/tests/ui/nll/issue-54556-wrap-it-up.rs
diff --git a/src/test/ui/nll/issue-54556-wrap-it-up.stderr b/tests/ui/nll/issue-54556-wrap-it-up.stderr
index 9f27fac15..9f27fac15 100644
--- a/src/test/ui/nll/issue-54556-wrap-it-up.stderr
+++ b/tests/ui/nll/issue-54556-wrap-it-up.stderr
diff --git a/src/test/ui/nll/issue-54779-anon-static-lifetime.rs b/tests/ui/nll/issue-54779-anon-static-lifetime.rs
index 260b6b109..260b6b109 100644
--- a/src/test/ui/nll/issue-54779-anon-static-lifetime.rs
+++ b/tests/ui/nll/issue-54779-anon-static-lifetime.rs
diff --git a/src/test/ui/nll/issue-54779-anon-static-lifetime.stderr b/tests/ui/nll/issue-54779-anon-static-lifetime.stderr
index 64ad7a21a..64ad7a21a 100644
--- a/src/test/ui/nll/issue-54779-anon-static-lifetime.stderr
+++ b/tests/ui/nll/issue-54779-anon-static-lifetime.stderr
diff --git a/src/test/ui/nll/issue-54943-3.rs b/tests/ui/nll/issue-54943-3.rs
index 077eb1563..077eb1563 100644
--- a/src/test/ui/nll/issue-54943-3.rs
+++ b/tests/ui/nll/issue-54943-3.rs
diff --git a/src/test/ui/nll/issue-54943.rs b/tests/ui/nll/issue-54943.rs
index 85722300b..85722300b 100644
--- a/src/test/ui/nll/issue-54943.rs
+++ b/tests/ui/nll/issue-54943.rs
diff --git a/src/test/ui/nll/issue-54943.stderr b/tests/ui/nll/issue-54943.stderr
index 59be0f983..59be0f983 100644
--- a/src/test/ui/nll/issue-54943.stderr
+++ b/tests/ui/nll/issue-54943.stderr
diff --git a/src/test/ui/nll/issue-55288.rs b/tests/ui/nll/issue-55288.rs
index aab2dc267..aab2dc267 100644
--- a/src/test/ui/nll/issue-55288.rs
+++ b/tests/ui/nll/issue-55288.rs
diff --git a/src/test/ui/nll/issue-55344.rs b/tests/ui/nll/issue-55344.rs
index 20f18dc46..20f18dc46 100644
--- a/src/test/ui/nll/issue-55344.rs
+++ b/tests/ui/nll/issue-55344.rs
diff --git a/src/test/ui/nll/issue-55394.rs b/tests/ui/nll/issue-55394.rs
index f813d1c91..f813d1c91 100644
--- a/src/test/ui/nll/issue-55394.rs
+++ b/tests/ui/nll/issue-55394.rs
diff --git a/src/test/ui/nll/issue-55394.stderr b/tests/ui/nll/issue-55394.stderr
index 24b8c84b4..24b8c84b4 100644
--- a/src/test/ui/nll/issue-55394.stderr
+++ b/tests/ui/nll/issue-55394.stderr
diff --git a/src/test/ui/nll/issue-55401.rs b/tests/ui/nll/issue-55401.rs
index fc45824e9..fc45824e9 100644
--- a/src/test/ui/nll/issue-55401.rs
+++ b/tests/ui/nll/issue-55401.rs
diff --git a/src/test/ui/nll/issue-55401.stderr b/tests/ui/nll/issue-55401.stderr
index 4f797f26a..4f797f26a 100644
--- a/src/test/ui/nll/issue-55401.stderr
+++ b/tests/ui/nll/issue-55401.stderr
diff --git a/src/test/ui/nll/issue-55511.rs b/tests/ui/nll/issue-55511.rs
index 7dfa9c7bc..7dfa9c7bc 100644
--- a/src/test/ui/nll/issue-55511.rs
+++ b/tests/ui/nll/issue-55511.rs
diff --git a/src/test/ui/nll/issue-55511.stderr b/tests/ui/nll/issue-55511.stderr
index bf3e58e8c..bf3e58e8c 100644
--- a/src/test/ui/nll/issue-55511.stderr
+++ b/tests/ui/nll/issue-55511.stderr
diff --git a/src/test/ui/nll/issue-55651.rs b/tests/ui/nll/issue-55651.rs
index 75ba48271..75ba48271 100644
--- a/src/test/ui/nll/issue-55651.rs
+++ b/tests/ui/nll/issue-55651.rs
diff --git a/src/test/ui/nll/issue-55825-const-fn.rs b/tests/ui/nll/issue-55825-const-fn.rs
index 8aaa19813..8aaa19813 100644
--- a/src/test/ui/nll/issue-55825-const-fn.rs
+++ b/tests/ui/nll/issue-55825-const-fn.rs
diff --git a/src/test/ui/nll/issue-55850.rs b/tests/ui/nll/issue-55850.rs
index e6279bd02..e6279bd02 100644
--- a/src/test/ui/nll/issue-55850.rs
+++ b/tests/ui/nll/issue-55850.rs
diff --git a/src/test/ui/nll/issue-55850.stderr b/tests/ui/nll/issue-55850.stderr
index 86a8cdc42..86a8cdc42 100644
--- a/src/test/ui/nll/issue-55850.stderr
+++ b/tests/ui/nll/issue-55850.stderr
diff --git a/src/test/ui/nll/issue-57100.rs b/tests/ui/nll/issue-57100.rs
index f15929334..f15929334 100644
--- a/src/test/ui/nll/issue-57100.rs
+++ b/tests/ui/nll/issue-57100.rs
diff --git a/src/test/ui/nll/issue-57100.stderr b/tests/ui/nll/issue-57100.stderr
index 523c3e8d0..523c3e8d0 100644
--- a/src/test/ui/nll/issue-57100.stderr
+++ b/tests/ui/nll/issue-57100.stderr
diff --git a/src/test/ui/nll/issue-57265-return-type-wf-check.rs b/tests/ui/nll/issue-57265-return-type-wf-check.rs
index 8fb8351ce..8fb8351ce 100644
--- a/src/test/ui/nll/issue-57265-return-type-wf-check.rs
+++ b/tests/ui/nll/issue-57265-return-type-wf-check.rs
diff --git a/src/test/ui/nll/issue-57265-return-type-wf-check.stderr b/tests/ui/nll/issue-57265-return-type-wf-check.stderr
index bb45575fa..bb45575fa 100644
--- a/src/test/ui/nll/issue-57265-return-type-wf-check.stderr
+++ b/tests/ui/nll/issue-57265-return-type-wf-check.stderr
diff --git a/src/test/ui/nll/issue-57280-1-flipped.rs b/tests/ui/nll/issue-57280-1-flipped.rs
index ad4b8dcfd..ad4b8dcfd 100644
--- a/src/test/ui/nll/issue-57280-1-flipped.rs
+++ b/tests/ui/nll/issue-57280-1-flipped.rs
diff --git a/src/test/ui/nll/issue-57280-1-flipped.stderr b/tests/ui/nll/issue-57280-1-flipped.stderr
index 7a2135a2a..7a2135a2a 100644
--- a/src/test/ui/nll/issue-57280-1-flipped.stderr
+++ b/tests/ui/nll/issue-57280-1-flipped.stderr
diff --git a/src/test/ui/nll/issue-57280-1.rs b/tests/ui/nll/issue-57280-1.rs
index b8979624e..b8979624e 100644
--- a/src/test/ui/nll/issue-57280-1.rs
+++ b/tests/ui/nll/issue-57280-1.rs
diff --git a/src/test/ui/nll/issue-57280.rs b/tests/ui/nll/issue-57280.rs
index b9d336ec3..b9d336ec3 100644
--- a/src/test/ui/nll/issue-57280.rs
+++ b/tests/ui/nll/issue-57280.rs
diff --git a/src/test/ui/nll/issue-57642-higher-ranked-subtype.rs b/tests/ui/nll/issue-57642-higher-ranked-subtype.rs
index eba859cde..eba859cde 100644
--- a/src/test/ui/nll/issue-57642-higher-ranked-subtype.rs
+++ b/tests/ui/nll/issue-57642-higher-ranked-subtype.rs
diff --git a/src/test/ui/nll/issue-57642-higher-ranked-subtype.stderr b/tests/ui/nll/issue-57642-higher-ranked-subtype.stderr
index 6e96f40c0..6e96f40c0 100644
--- a/src/test/ui/nll/issue-57642-higher-ranked-subtype.stderr
+++ b/tests/ui/nll/issue-57642-higher-ranked-subtype.stderr
diff --git a/src/test/ui/nll/issue-57843.rs b/tests/ui/nll/issue-57843.rs
index 11629690e..11629690e 100644
--- a/src/test/ui/nll/issue-57843.rs
+++ b/tests/ui/nll/issue-57843.rs
diff --git a/src/test/ui/nll/issue-57843.stderr b/tests/ui/nll/issue-57843.stderr
index 2ab49ec61..2ab49ec61 100644
--- a/src/test/ui/nll/issue-57843.stderr
+++ b/tests/ui/nll/issue-57843.stderr
diff --git a/src/test/ui/nll/issue-57960.rs b/tests/ui/nll/issue-57960.rs
index 32e45184a..32e45184a 100644
--- a/src/test/ui/nll/issue-57960.rs
+++ b/tests/ui/nll/issue-57960.rs
diff --git a/src/test/ui/nll/issue-57989.rs b/tests/ui/nll/issue-57989.rs
index 8f3dec454..8f3dec454 100644
--- a/src/test/ui/nll/issue-57989.rs
+++ b/tests/ui/nll/issue-57989.rs
diff --git a/src/test/ui/nll/issue-57989.stderr b/tests/ui/nll/issue-57989.stderr
index e85e63e52..31f40d825 100644
--- a/src/test/ui/nll/issue-57989.stderr
+++ b/tests/ui/nll/issue-57989.stderr
@@ -1,11 +1,13 @@
 error[E0594]: cannot assign to `*x`, which is behind a `&` reference
   --> $DIR/issue-57989.rs:5:5
    |
-LL | fn f(x: &i32) {
-   |         ---- help: consider changing this to be a mutable reference: `&mut i32`
-LL |     let g = &x;
 LL |     *x = 0;
    |     ^^^^^^ `x` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn f(x: &mut i32) {
+   |         ~~~~~~~~
 
 error[E0506]: cannot assign to `*x` because it is borrowed
   --> $DIR/issue-57989.rs:5:5
diff --git a/src/test/ui/nll/issue-58053.rs b/tests/ui/nll/issue-58053.rs
index d5a2fa1a3..d5a2fa1a3 100644
--- a/src/test/ui/nll/issue-58053.rs
+++ b/tests/ui/nll/issue-58053.rs
diff --git a/src/test/ui/nll/issue-58053.stderr b/tests/ui/nll/issue-58053.stderr
index bf7416e1a..bf7416e1a 100644
--- a/src/test/ui/nll/issue-58053.stderr
+++ b/tests/ui/nll/issue-58053.stderr
diff --git a/src/test/ui/nll/issue-58299.rs b/tests/ui/nll/issue-58299.rs
index 0587fe8b4..0587fe8b4 100644
--- a/src/test/ui/nll/issue-58299.rs
+++ b/tests/ui/nll/issue-58299.rs
diff --git a/src/test/ui/nll/issue-58299.stderr b/tests/ui/nll/issue-58299.stderr
index 509ba67bd..509ba67bd 100644
--- a/src/test/ui/nll/issue-58299.stderr
+++ b/tests/ui/nll/issue-58299.stderr
diff --git a/src/test/ui/nll/issue-61311-normalize.rs b/tests/ui/nll/issue-61311-normalize.rs
index 77d67b07a..77d67b07a 100644
--- a/src/test/ui/nll/issue-61311-normalize.rs
+++ b/tests/ui/nll/issue-61311-normalize.rs
diff --git a/src/test/ui/nll/issue-61320-normalize.rs b/tests/ui/nll/issue-61320-normalize.rs
index 095bef03f..095bef03f 100644
--- a/src/test/ui/nll/issue-61320-normalize.rs
+++ b/tests/ui/nll/issue-61320-normalize.rs
diff --git a/src/test/ui/nll/issue-61424.fixed b/tests/ui/nll/issue-61424.fixed
index 63e00c172..63e00c172 100644
--- a/src/test/ui/nll/issue-61424.fixed
+++ b/tests/ui/nll/issue-61424.fixed
diff --git a/src/test/ui/nll/issue-61424.rs b/tests/ui/nll/issue-61424.rs
index 3b64996c2..3b64996c2 100644
--- a/src/test/ui/nll/issue-61424.rs
+++ b/tests/ui/nll/issue-61424.rs
diff --git a/src/test/ui/nll/issue-61424.stderr b/tests/ui/nll/issue-61424.stderr
index 6de6b7f3a..6de6b7f3a 100644
--- a/src/test/ui/nll/issue-61424.stderr
+++ b/tests/ui/nll/issue-61424.stderr
diff --git a/src/test/ui/nll/issue-62007-assign-const-index.rs b/tests/ui/nll/issue-62007-assign-const-index.rs
index 3ea5d3a7a..3ea5d3a7a 100644
--- a/src/test/ui/nll/issue-62007-assign-const-index.rs
+++ b/tests/ui/nll/issue-62007-assign-const-index.rs
diff --git a/src/test/ui/nll/issue-62007-assign-const-index.stderr b/tests/ui/nll/issue-62007-assign-const-index.stderr
index 12e28aa3f..12e28aa3f 100644
--- a/src/test/ui/nll/issue-62007-assign-const-index.stderr
+++ b/tests/ui/nll/issue-62007-assign-const-index.stderr
diff --git a/src/test/ui/nll/issue-62007-assign-differing-fields.rs b/tests/ui/nll/issue-62007-assign-differing-fields.rs
index 29d92b7b8..29d92b7b8 100644
--- a/src/test/ui/nll/issue-62007-assign-differing-fields.rs
+++ b/tests/ui/nll/issue-62007-assign-differing-fields.rs
diff --git a/src/test/ui/nll/issue-62007-assign-differing-fields.stderr b/tests/ui/nll/issue-62007-assign-differing-fields.stderr
index 4488431fc..4488431fc 100644
--- a/src/test/ui/nll/issue-62007-assign-differing-fields.stderr
+++ b/tests/ui/nll/issue-62007-assign-differing-fields.stderr
diff --git a/src/test/ui/nll/issue-63154-normalize.rs b/tests/ui/nll/issue-63154-normalize.rs
index 484c12879..484c12879 100644
--- a/src/test/ui/nll/issue-63154-normalize.rs
+++ b/tests/ui/nll/issue-63154-normalize.rs
diff --git a/src/test/ui/nll/issue-67007-escaping-data.rs b/tests/ui/nll/issue-67007-escaping-data.rs
index 49ea2e596..49ea2e596 100644
--- a/src/test/ui/nll/issue-67007-escaping-data.rs
+++ b/tests/ui/nll/issue-67007-escaping-data.rs
diff --git a/src/test/ui/nll/issue-67007-escaping-data.stderr b/tests/ui/nll/issue-67007-escaping-data.stderr
index ac9c59bf7..ac9c59bf7 100644
--- a/src/test/ui/nll/issue-67007-escaping-data.stderr
+++ b/tests/ui/nll/issue-67007-escaping-data.stderr
diff --git a/src/test/ui/nll/issue-68550.rs b/tests/ui/nll/issue-68550.rs
index 6bfd18de1..6bfd18de1 100644
--- a/src/test/ui/nll/issue-68550.rs
+++ b/tests/ui/nll/issue-68550.rs
diff --git a/src/test/ui/nll/issue-68550.stderr b/tests/ui/nll/issue-68550.stderr
index e234ebb04..e234ebb04 100644
--- a/src/test/ui/nll/issue-68550.stderr
+++ b/tests/ui/nll/issue-68550.stderr
diff --git a/src/test/ui/nll/issue-69114-static-mut-ty.rs b/tests/ui/nll/issue-69114-static-mut-ty.rs
index ce37da053..ce37da053 100644
--- a/src/test/ui/nll/issue-69114-static-mut-ty.rs
+++ b/tests/ui/nll/issue-69114-static-mut-ty.rs
diff --git a/src/test/ui/nll/issue-69114-static-mut-ty.stderr b/tests/ui/nll/issue-69114-static-mut-ty.stderr
index 5e55cb502..5e55cb502 100644
--- a/src/test/ui/nll/issue-69114-static-mut-ty.stderr
+++ b/tests/ui/nll/issue-69114-static-mut-ty.stderr
diff --git a/src/test/ui/nll/issue-69114-static-ty.rs b/tests/ui/nll/issue-69114-static-ty.rs
index 3318433a1..3318433a1 100644
--- a/src/test/ui/nll/issue-69114-static-ty.rs
+++ b/tests/ui/nll/issue-69114-static-ty.rs
diff --git a/src/test/ui/nll/issue-69114-static-ty.stderr b/tests/ui/nll/issue-69114-static-ty.stderr
index 0815e74b5..0815e74b5 100644
--- a/src/test/ui/nll/issue-69114-static-ty.stderr
+++ b/tests/ui/nll/issue-69114-static-ty.stderr
diff --git a/src/test/ui/nll/issue-73159-rpit-static.rs b/tests/ui/nll/issue-73159-rpit-static.rs
index 3002408b0..3002408b0 100644
--- a/src/test/ui/nll/issue-73159-rpit-static.rs
+++ b/tests/ui/nll/issue-73159-rpit-static.rs
diff --git a/src/test/ui/nll/issue-73159-rpit-static.stderr b/tests/ui/nll/issue-73159-rpit-static.stderr
index 260b9b597..260b9b597 100644
--- a/src/test/ui/nll/issue-73159-rpit-static.stderr
+++ b/tests/ui/nll/issue-73159-rpit-static.stderr
diff --git a/src/test/ui/nll/issue-78561.rs b/tests/ui/nll/issue-78561.rs
index 55147fcd1..55147fcd1 100644
--- a/src/test/ui/nll/issue-78561.rs
+++ b/tests/ui/nll/issue-78561.rs
diff --git a/src/test/ui/nll/issue-95272.rs b/tests/ui/nll/issue-95272.rs
index 958cbde37..958cbde37 100644
--- a/src/test/ui/nll/issue-95272.rs
+++ b/tests/ui/nll/issue-95272.rs
diff --git a/src/test/ui/nll/issue-95272.stderr b/tests/ui/nll/issue-95272.stderr
index 03edbc3a6..03edbc3a6 100644
--- a/src/test/ui/nll/issue-95272.stderr
+++ b/tests/ui/nll/issue-95272.stderr
diff --git a/src/test/ui/nll/issue-97997.rs b/tests/ui/nll/issue-97997.rs
index c64e720b1..c64e720b1 100644
--- a/src/test/ui/nll/issue-97997.rs
+++ b/tests/ui/nll/issue-97997.rs
diff --git a/src/test/ui/nll/issue-97997.stderr b/tests/ui/nll/issue-97997.stderr
index 46440c021..46440c021 100644
--- a/src/test/ui/nll/issue-97997.stderr
+++ b/tests/ui/nll/issue-97997.stderr
diff --git a/src/test/ui/nll/issue-98170.rs b/tests/ui/nll/issue-98170.rs
index 6bb12f52d..6bb12f52d 100644
--- a/src/test/ui/nll/issue-98170.rs
+++ b/tests/ui/nll/issue-98170.rs
diff --git a/src/test/ui/nll/issue-98170.stderr b/tests/ui/nll/issue-98170.stderr
index 0d17365e7..0d17365e7 100644
--- a/src/test/ui/nll/issue-98170.stderr
+++ b/tests/ui/nll/issue-98170.stderr
diff --git a/src/test/ui/nll/issue-98589-closures-relate-named-regions.rs b/tests/ui/nll/issue-98589-closures-relate-named-regions.rs
index 6cc4340bb..6cc4340bb 100644
--- a/src/test/ui/nll/issue-98589-closures-relate-named-regions.rs
+++ b/tests/ui/nll/issue-98589-closures-relate-named-regions.rs
diff --git a/src/test/ui/nll/issue-98589-closures-relate-named-regions.stderr b/tests/ui/nll/issue-98589-closures-relate-named-regions.stderr
index d8b26f0b0..d8b26f0b0 100644
--- a/src/test/ui/nll/issue-98589-closures-relate-named-regions.stderr
+++ b/tests/ui/nll/issue-98589-closures-relate-named-regions.stderr
diff --git a/src/test/ui/nll/issue-98693.rs b/tests/ui/nll/issue-98693.rs
index 7a325e2e9..7a325e2e9 100644
--- a/src/test/ui/nll/issue-98693.rs
+++ b/tests/ui/nll/issue-98693.rs
diff --git a/src/test/ui/nll/issue-98693.stderr b/tests/ui/nll/issue-98693.stderr
index 15ca38aa2..15ca38aa2 100644
--- a/src/test/ui/nll/issue-98693.stderr
+++ b/tests/ui/nll/issue-98693.stderr
diff --git a/src/test/ui/nll/lint-no-err.rs b/tests/ui/nll/lint-no-err.rs
index 2d1d5cb26..2d1d5cb26 100644
--- a/src/test/ui/nll/lint-no-err.rs
+++ b/tests/ui/nll/lint-no-err.rs
diff --git a/src/test/ui/nll/loan_ends_mid_block_pair.rs b/tests/ui/nll/loan_ends_mid_block_pair.rs
index acd6ec706..acd6ec706 100644
--- a/src/test/ui/nll/loan_ends_mid_block_pair.rs
+++ b/tests/ui/nll/loan_ends_mid_block_pair.rs
diff --git a/src/test/ui/nll/loan_ends_mid_block_pair.stderr b/tests/ui/nll/loan_ends_mid_block_pair.stderr
index eb8442b31..eb8442b31 100644
--- a/src/test/ui/nll/loan_ends_mid_block_pair.stderr
+++ b/tests/ui/nll/loan_ends_mid_block_pair.stderr
diff --git a/src/test/ui/nll/loan_ends_mid_block_vec.rs b/tests/ui/nll/loan_ends_mid_block_vec.rs
index 2edcdef0a..2edcdef0a 100644
--- a/src/test/ui/nll/loan_ends_mid_block_vec.rs
+++ b/tests/ui/nll/loan_ends_mid_block_vec.rs
diff --git a/src/test/ui/nll/loan_ends_mid_block_vec.stderr b/tests/ui/nll/loan_ends_mid_block_vec.stderr
index 22c72af61..22c72af61 100644
--- a/src/test/ui/nll/loan_ends_mid_block_vec.stderr
+++ b/tests/ui/nll/loan_ends_mid_block_vec.stderr
diff --git a/src/test/ui/nll/local-outlives-static-via-hrtb.rs b/tests/ui/nll/local-outlives-static-via-hrtb.rs
index 5f1f9b3a7..5f1f9b3a7 100644
--- a/src/test/ui/nll/local-outlives-static-via-hrtb.rs
+++ b/tests/ui/nll/local-outlives-static-via-hrtb.rs
diff --git a/src/test/ui/nll/local-outlives-static-via-hrtb.stderr b/tests/ui/nll/local-outlives-static-via-hrtb.stderr
index f5c10f3dd..f5c10f3dd 100644
--- a/src/test/ui/nll/local-outlives-static-via-hrtb.stderr
+++ b/tests/ui/nll/local-outlives-static-via-hrtb.stderr
diff --git a/src/test/ui/nll/lub-if.rs b/tests/ui/nll/lub-if.rs
index 50225a783..50225a783 100644
--- a/src/test/ui/nll/lub-if.rs
+++ b/tests/ui/nll/lub-if.rs
diff --git a/src/test/ui/nll/lub-if.stderr b/tests/ui/nll/lub-if.stderr
index 03f7f9204..03f7f9204 100644
--- a/src/test/ui/nll/lub-if.stderr
+++ b/tests/ui/nll/lub-if.stderr
diff --git a/src/test/ui/nll/lub-match.rs b/tests/ui/nll/lub-match.rs
index 454dd1fc6..454dd1fc6 100644
--- a/src/test/ui/nll/lub-match.rs
+++ b/tests/ui/nll/lub-match.rs
diff --git a/src/test/ui/nll/lub-match.stderr b/tests/ui/nll/lub-match.stderr
index 208ec07a1..208ec07a1 100644
--- a/src/test/ui/nll/lub-match.stderr
+++ b/tests/ui/nll/lub-match.stderr
diff --git a/tests/ui/nll/match-cfg-fake-edges.rs b/tests/ui/nll/match-cfg-fake-edges.rs
new file mode 100644
index 000000000..1afc7931a
--- /dev/null
+++ b/tests/ui/nll/match-cfg-fake-edges.rs
@@ -0,0 +1,70 @@
+// Test that we have enough false edges to avoid exposing the exact matching
+// algorithm in borrow checking.
+
+#![feature(if_let_guard)]
+
+fn guard_always_precedes_arm(y: i32) {
+    let mut x;
+    // x should always be initialized, as the only way to reach the arm is
+    // through the guard.
+    match y {
+        0 | 2 if { x = 2; true } => x,
+        _ => 2,
+    };
+
+    let mut x;
+    match y {
+        0 | 2 if let Some(()) = { x = 2; Some(()) } => x,
+        _ => 2,
+    };
+}
+
+fn guard_may_be_skipped(y: i32) {
+    let x;
+    // Even though x *is* always initialized, we don't want to have borrowck
+    // results be based on whether patterns are exhaustive.
+    match y {
+        _ if { x = 2; true } => 1,
+        _ if {
+            x; //~ ERROR E0381
+            false
+        } => 2,
+        _ => 3,
+    };
+
+    let x;
+    match y {
+        _ if let Some(()) = { x = 2; Some(()) } => 1,
+        _ if let Some(()) = {
+            x; //~ ERROR E0381
+            None
+        } => 2,
+        _ => 3,
+    };
+}
+
+fn guard_may_be_taken(y: bool) {
+    let x = String::new();
+    // Even though x *is* never moved before the use, we don't want to have
+    // borrowck results be based on whether patterns are disjoint.
+    match y {
+        false if { drop(x); true } => 1,
+        true => {
+            x; //~ ERROR use of moved value: `x`
+            2
+        }
+        false => 3,
+    };
+
+    let x = String::new();
+    match y {
+        false if let Some(()) = { drop(x); Some(()) } => 1,
+        true => {
+            x; //~ ERROR use of moved value: `x`
+            2
+        }
+        false => 3,
+    };
+}
+
+fn main() {}
diff --git a/tests/ui/nll/match-cfg-fake-edges.stderr b/tests/ui/nll/match-cfg-fake-edges.stderr
new file mode 100644
index 000000000..a6261345c
--- /dev/null
+++ b/tests/ui/nll/match-cfg-fake-edges.stderr
@@ -0,0 +1,72 @@
+error[E0381]: used binding `x` isn't initialized
+  --> $DIR/match-cfg-fake-edges.rs:29:13
+   |
+LL |     let x;
+   |         - binding declared here but left uninitialized
+...
+LL |         _ if { x = 2; true } => 1,
+   |                ----- binding initialized here in some conditions
+LL |         _ if {
+LL |             x;
+   |             ^ `x` used here but it isn't initialized
+   |
+help: consider assigning a value
+   |
+LL |     let x = 0;
+   |           +++
+
+error[E0381]: used binding `x` isn't initialized
+  --> $DIR/match-cfg-fake-edges.rs:39:13
+   |
+LL |     let x;
+   |         - binding declared here but left uninitialized
+LL |     match y {
+LL |         _ if let Some(()) = { x = 2; Some(()) } => 1,
+   |                               ----- binding initialized here in some conditions
+LL |         _ if let Some(()) = {
+LL |             x;
+   |             ^ `x` used here but it isn't initialized
+   |
+help: consider assigning a value
+   |
+LL |     let x = 0;
+   |           +++
+
+error[E0382]: use of moved value: `x`
+  --> $DIR/match-cfg-fake-edges.rs:53:13
+   |
+LL |     let x = String::new();
+   |         - move occurs because `x` has type `String`, which does not implement the `Copy` trait
+...
+LL |         false if { drop(x); true } => 1,
+   |                         - value moved here
+LL |         true => {
+LL |             x;
+   |             ^ value used here after move
+   |
+help: consider cloning the value if the performance cost is acceptable
+   |
+LL |         false if { drop(x.clone()); true } => 1,
+   |                          ++++++++
+
+error[E0382]: use of moved value: `x`
+  --> $DIR/match-cfg-fake-edges.rs:63:13
+   |
+LL |     let x = String::new();
+   |         - move occurs because `x` has type `String`, which does not implement the `Copy` trait
+LL |     match y {
+LL |         false if let Some(()) = { drop(x); Some(()) } => 1,
+   |                                        - value moved here
+LL |         true => {
+LL |             x;
+   |             ^ value used here after move
+   |
+help: consider cloning the value if the performance cost is acceptable
+   |
+LL |         false if let Some(()) = { drop(x.clone()); Some(()) } => 1,
+   |                                         ++++++++
+
+error: aborting due to 4 previous errors
+
+Some errors have detailed explanations: E0381, E0382.
+For more information about an error, try `rustc --explain E0381`.
diff --git a/src/test/ui/nll/match-cfg-fake-edges2.rs b/tests/ui/nll/match-cfg-fake-edges2.rs
index 48f95e03b..48f95e03b 100644
--- a/src/test/ui/nll/match-cfg-fake-edges2.rs
+++ b/tests/ui/nll/match-cfg-fake-edges2.rs
diff --git a/src/test/ui/nll/match-cfg-fake-edges2.stderr b/tests/ui/nll/match-cfg-fake-edges2.stderr
index c6d15a936..c6d15a936 100644
--- a/src/test/ui/nll/match-cfg-fake-edges2.stderr
+++ b/tests/ui/nll/match-cfg-fake-edges2.stderr
diff --git a/tests/ui/nll/match-guards-always-borrow.rs b/tests/ui/nll/match-guards-always-borrow.rs
new file mode 100644
index 000000000..ff63cc092
--- /dev/null
+++ b/tests/ui/nll/match-guards-always-borrow.rs
@@ -0,0 +1,64 @@
+#![feature(if_let_guard)]
+
+// Here is arielb1's basic example from rust-lang/rust#27282
+// that AST borrowck is flummoxed by:
+
+fn should_reject_destructive_mutate_in_guard() {
+    match Some(&4) {
+        None => {},
+        ref mut foo if {
+            (|| { let bar = foo; bar.take() })();
+            //~^ ERROR cannot move out of `foo` in pattern guard [E0507]
+            false } => { },
+        Some(s) => std::process::exit(*s),
+    }
+
+    match Some(&4) {
+        None => {},
+        ref mut foo if let Some(()) = {
+            (|| { let bar = foo; bar.take() })();
+            //~^ ERROR cannot move out of `foo` in pattern guard [E0507]
+            None } => { },
+        Some(s) => std::process::exit(*s),
+    }
+}
+
+// Here below is a case that needs to keep working: we only use the
+// binding via immutable-borrow in the guard, and we mutate in the arm
+// body.
+fn allow_mutate_in_arm_body() {
+    match Some(&4) {
+        None => {},
+        ref mut foo if foo.is_some() => { foo.take(); () }
+        Some(s) => std::process::exit(*s),
+    }
+
+    match Some(&4) {
+        None => {},
+        ref mut foo if let Some(_) = foo => { foo.take(); () }
+        Some(s) => std::process::exit(*s),
+    }
+}
+
+// Here below is a case that needs to keep working: we only use the
+// binding via immutable-borrow in the guard, and we move into the arm
+// body.
+fn allow_move_into_arm_body() {
+    match Some(&4) {
+        None => {},
+        mut foo if foo.is_some() => { foo.unwrap(); () }
+        Some(s) => std::process::exit(*s),
+    }
+
+    match Some(&4) {
+        None => {},
+        mut foo if let Some(_) = foo => { foo.unwrap(); () }
+        Some(s) => std::process::exit(*s),
+    }
+}
+
+fn main() {
+    should_reject_destructive_mutate_in_guard();
+    allow_mutate_in_arm_body();
+    allow_move_into_arm_body();
+}
diff --git a/tests/ui/nll/match-guards-always-borrow.stderr b/tests/ui/nll/match-guards-always-borrow.stderr
new file mode 100644
index 000000000..fa01d3a6f
--- /dev/null
+++ b/tests/ui/nll/match-guards-always-borrow.stderr
@@ -0,0 +1,23 @@
+error[E0507]: cannot move out of `foo` in pattern guard
+  --> $DIR/match-guards-always-borrow.rs:10:14
+   |
+LL |             (|| { let bar = foo; bar.take() })();
+   |              ^^             --- move occurs because `foo` has type `&mut Option<&i32>`, which does not implement the `Copy` trait
+   |              |
+   |              move out of `foo` occurs here
+   |
+   = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
+
+error[E0507]: cannot move out of `foo` in pattern guard
+  --> $DIR/match-guards-always-borrow.rs:19:14
+   |
+LL |             (|| { let bar = foo; bar.take() })();
+   |              ^^             --- move occurs because `foo` has type `&mut Option<&i32>`, which does not implement the `Copy` trait
+   |              |
+   |              move out of `foo` occurs here
+   |
+   = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/tests/ui/nll/match-guards-partially-borrow.rs b/tests/ui/nll/match-guards-partially-borrow.rs
new file mode 100644
index 000000000..3a9e1654b
--- /dev/null
+++ b/tests/ui/nll/match-guards-partially-borrow.rs
@@ -0,0 +1,332 @@
+// Test that a (partially) mutably borrowed place can be matched on, so long as
+// we don't have to read any values that are mutably borrowed to determine
+// which arm to take.
+//
+// Test that we don't allow mutating the value being matched on in a way that
+// changes which patterns it matches, until we have chosen an arm.
+
+#![feature(if_let_guard)]
+
+fn ok_mutation_in_if_guard(mut q: i32) {
+    match q {
+        // OK, mutation doesn't change which patterns g matches
+        _ if { q = 1; false } => (),
+        _ => (),
+    }
+}
+
+fn ok_mutation_in_if_let_guard(mut q: i32) {
+    match q {
+        // OK, mutation doesn't change which patterns g matches
+        _ if let Some(()) = { q = 1; None } => (),
+        _ => (),
+    }
+}
+
+fn ok_mutation_in_if_guard2(mut u: bool) {
+    // OK value of u is unused before modification
+    match u {
+        _ => (),
+        _ if {
+            u = true;
+            false
+        } => (),
+        x => (),
+    }
+}
+
+fn ok_mutation_in_if_let_guard2(mut u: bool) {
+    // OK value of u is unused before modification
+    match u {
+        _ => (),
+        _ if let Some(()) = {
+            u = true;
+            None
+        } => (),
+        x => (),
+    }
+}
+
+fn ok_mutation_in_if_guard4(mut w: (&mut bool,)) {
+    // OK value of u is unused before modification
+    match w {
+        _ => (),
+        _ if {
+            *w.0 = true;
+            false
+        } => (),
+        x => (),
+    }
+}
+
+fn ok_mutation_in_if_let_guard4(mut w: (&mut bool,)) {
+    // OK value of u is unused before modification
+    match w {
+        _ => (),
+        _ if let Some(()) = {
+            *w.0 = true;
+            None
+        } => (),
+        x => (),
+    }
+}
+
+fn ok_indirect_mutation_in_if_guard(mut p: &bool) {
+    match *p {
+        // OK, mutation doesn't change which patterns s matches
+        _ if {
+            p = &true;
+            false
+        } => (),
+        _ => (),
+    }
+}
+
+fn ok_indirect_mutation_in_if_let_guard(mut p: &bool) {
+    match *p {
+        // OK, mutation doesn't change which patterns s matches
+        _ if let Some(()) = {
+            p = &true;
+            None
+        } => (),
+        _ => (),
+    }
+}
+
+fn mutation_invalidates_pattern_in_if_guard(mut q: bool) {
+    match q {
+        // q doesn't match the pattern with the guard by the end of the guard.
+        false if {
+            q = true; //~ ERROR
+            true
+        } => (),
+        _ => (),
+    }
+}
+
+fn mutation_invalidates_pattern_in_if_let_guard(mut q: bool) {
+    match q {
+        // q doesn't match the pattern with the guard by the end of the guard.
+        false if let Some(()) = {
+            q = true; //~ ERROR
+            Some(())
+        } => (),
+        _ => (),
+    }
+}
+
+fn mutation_invalidates_previous_pattern_in_if_guard(mut r: bool) {
+    match r {
+        // r matches a previous pattern by the end of the guard.
+        true => (),
+        _ if {
+            r = true; //~ ERROR
+            true
+        } => (),
+        _ => (),
+    }
+}
+
+fn mutation_invalidates_previous_pattern_in_if_let_guard(mut r: bool) {
+    match r {
+        // r matches a previous pattern by the end of the guard.
+        true => (),
+        _ if let Some(()) = {
+            r = true; //~ ERROR
+            Some(())
+        } => (),
+        _ => (),
+    }
+}
+
+fn match_on_borrowed_early_end_if_guard(mut s: bool) {
+    let h = &mut s;
+    // OK value of s is unused before modification.
+    match s {
+        _ if {
+            *h = !*h;
+            false
+        } => (),
+        true => (),
+        false => (),
+    }
+}
+
+fn match_on_borrowed_early_end_if_let_guard(mut s: bool) {
+    let h = &mut s;
+    // OK value of s is unused before modification.
+    match s {
+        _ if let Some(()) = {
+            *h = !*h;
+            None
+        } => (),
+        true => (),
+        false => (),
+    }
+}
+
+fn bad_mutation_in_if_guard(mut t: bool) {
+    match t {
+        true => (),
+        false if {
+            t = true; //~ ERROR
+            false
+        } => (),
+        false => (),
+    }
+}
+
+fn bad_mutation_in_if_let_guard(mut t: bool) {
+    match t {
+        true => (),
+        false if let Some(()) = {
+            t = true; //~ ERROR
+            None
+        } => (),
+        false => (),
+    }
+}
+
+fn bad_mutation_in_if_guard2(mut x: Option<Option<&i32>>) {
+    // Check that nested patterns are checked.
+    match x {
+        None => (),
+        Some(None) => (),
+        _ if {
+            match x {
+                Some(ref mut r) => *r = None, //~ ERROR
+                _ => return,
+            };
+            false
+        } => (),
+        Some(Some(r)) => println!("{}", r),
+    }
+}
+
+fn bad_mutation_in_if_let_guard2(mut x: Option<Option<&i32>>) {
+    // Check that nested patterns are checked.
+    match x {
+        None => (),
+        Some(None) => (),
+        _ if let Some(()) = {
+            match x {
+                Some(ref mut r) => *r = None, //~ ERROR
+                _ => return,
+            };
+            None
+        } => (),
+        Some(Some(r)) => println!("{}", r),
+    }
+}
+
+fn bad_mutation_in_if_guard3(mut t: bool) {
+    match t {
+        s if {
+            t = !t; //~ ERROR
+            false
+        } => (), // What value should `s` have in the arm?
+        _ => (),
+    }
+}
+
+fn bad_mutation_in_if_let_guard3(mut t: bool) {
+    match t {
+        s if let Some(()) = {
+            t = !t; //~ ERROR
+            None
+        } => (), // What value should `s` have in the arm?
+        _ => (),
+    }
+}
+
+fn bad_indirect_mutation_in_if_guard(mut y: &bool) {
+    match *y {
+        true => (),
+        false if {
+            y = &true; //~ ERROR
+            false
+        } => (),
+        false => (),
+    }
+}
+
+fn bad_indirect_mutation_in_if_let_guard(mut y: &bool) {
+    match *y {
+        true => (),
+        false if let Some(()) = {
+            y = &true; //~ ERROR
+            None
+        } => (),
+        false => (),
+    }
+}
+
+fn bad_indirect_mutation_in_if_guard2(mut z: &bool) {
+    match z {
+        &true => (),
+        &false if {
+            z = &true; //~ ERROR
+            false
+        } => (),
+        &false => (),
+    }
+}
+
+fn bad_indirect_mutation_in_if_let_guard2(mut z: &bool) {
+    match z {
+        &true => (),
+        &false if let Some(()) = {
+            z = &true; //~ ERROR
+            None
+        } => (),
+        &false => (),
+    }
+}
+
+fn bad_indirect_mutation_in_if_guard3(mut a: &bool) {
+    // Same as bad_indirect_mutation_in_if_guard2, but using match ergonomics
+    match a {
+        true => (),
+        false if {
+            a = &true; //~ ERROR
+            false
+        } => (),
+        false => (),
+    }
+}
+
+fn bad_indirect_mutation_in_if_let_guard3(mut a: &bool) {
+    // Same as bad_indirect_mutation_in_if_guard2, but using match ergonomics
+    match a {
+        true => (),
+        false if let Some(()) = {
+            a = &true; //~ ERROR
+            None
+        } => (),
+        false => (),
+    }
+}
+
+fn bad_indirect_mutation_in_if_guard4(mut b: &bool) {
+    match b {
+        &_ => (),
+        &_ if {
+            b = &true; //~ ERROR
+            false
+        } => (),
+        &b => (),
+    }
+}
+
+fn bad_indirect_mutation_in_if_let_guard4(mut b: &bool) {
+    match b {
+        &_ => (),
+        &_ if let Some(()) = {
+            b = &true; //~ ERROR
+            None
+        } => (),
+        &b => (),
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/nll/match-guards-partially-borrow.stderr b/tests/ui/nll/match-guards-partially-borrow.stderr
new file mode 100644
index 000000000..60b8dee71
--- /dev/null
+++ b/tests/ui/nll/match-guards-partially-borrow.stderr
@@ -0,0 +1,170 @@
+error[E0510]: cannot assign `q` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:100:13
+   |
+LL |     match q {
+   |           - value is immutable in match guard
+...
+LL |             q = true;
+   |             ^^^^^^^^ cannot assign
+
+error[E0510]: cannot assign `q` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:111:13
+   |
+LL |     match q {
+   |           - value is immutable in match guard
+...
+LL |             q = true;
+   |             ^^^^^^^^ cannot assign
+
+error[E0510]: cannot assign `r` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:123:13
+   |
+LL |     match r {
+   |           - value is immutable in match guard
+...
+LL |             r = true;
+   |             ^^^^^^^^ cannot assign
+
+error[E0510]: cannot assign `r` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:135:13
+   |
+LL |     match r {
+   |           - value is immutable in match guard
+...
+LL |             r = true;
+   |             ^^^^^^^^ cannot assign
+
+error[E0510]: cannot assign `t` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:172:13
+   |
+LL |     match t {
+   |           - value is immutable in match guard
+...
+LL |             t = true;
+   |             ^^^^^^^^ cannot assign
+
+error[E0510]: cannot assign `t` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:183:13
+   |
+LL |     match t {
+   |           - value is immutable in match guard
+...
+LL |             t = true;
+   |             ^^^^^^^^ cannot assign
+
+error[E0510]: cannot mutably borrow `x.0` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:197:22
+   |
+LL |     match x {
+   |           - value is immutable in match guard
+...
+LL |                 Some(ref mut r) => *r = None,
+   |                      ^^^^^^^^^ cannot mutably borrow
+
+error[E0510]: cannot mutably borrow `x.0` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:213:22
+   |
+LL |     match x {
+   |           - value is immutable in match guard
+...
+LL |                 Some(ref mut r) => *r = None,
+   |                      ^^^^^^^^^ cannot mutably borrow
+
+error[E0506]: cannot assign to `t` because it is borrowed
+  --> $DIR/match-guards-partially-borrow.rs:225:13
+   |
+LL |         s if {
+   |         - borrow of `t` occurs here
+LL |             t = !t;
+   |             ^^^^^^ assignment to borrowed `t` occurs here
+LL |             false
+LL |         } => (), // What value should `s` have in the arm?
+   |         - borrow later used here
+
+error[E0506]: cannot assign to `t` because it is borrowed
+  --> $DIR/match-guards-partially-borrow.rs:235:13
+   |
+LL |         s if let Some(()) = {
+   |         - borrow of `t` occurs here
+LL |             t = !t;
+   |             ^^^^^^ assignment to borrowed `t` occurs here
+LL |             None
+LL |         } => (), // What value should `s` have in the arm?
+   |         - borrow later used here
+
+error[E0510]: cannot assign `y` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:246:13
+   |
+LL |     match *y {
+   |           -- value is immutable in match guard
+...
+LL |             y = &true;
+   |             ^^^^^^^^^ cannot assign
+
+error[E0510]: cannot assign `y` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:257:13
+   |
+LL |     match *y {
+   |           -- value is immutable in match guard
+...
+LL |             y = &true;
+   |             ^^^^^^^^^ cannot assign
+
+error[E0510]: cannot assign `z` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:268:13
+   |
+LL |     match z {
+   |           - value is immutable in match guard
+...
+LL |             z = &true;
+   |             ^^^^^^^^^ cannot assign
+
+error[E0510]: cannot assign `z` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:279:13
+   |
+LL |     match z {
+   |           - value is immutable in match guard
+...
+LL |             z = &true;
+   |             ^^^^^^^^^ cannot assign
+
+error[E0510]: cannot assign `a` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:291:13
+   |
+LL |     match a {
+   |           - value is immutable in match guard
+...
+LL |             a = &true;
+   |             ^^^^^^^^^ cannot assign
+
+error[E0510]: cannot assign `a` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:303:13
+   |
+LL |     match a {
+   |           - value is immutable in match guard
+...
+LL |             a = &true;
+   |             ^^^^^^^^^ cannot assign
+
+error[E0510]: cannot assign `b` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:314:13
+   |
+LL |     match b {
+   |           - value is immutable in match guard
+...
+LL |             b = &true;
+   |             ^^^^^^^^^ cannot assign
+
+error[E0510]: cannot assign `b` in match guard
+  --> $DIR/match-guards-partially-borrow.rs:325:13
+   |
+LL |     match b {
+   |           - value is immutable in match guard
+...
+LL |             b = &true;
+   |             ^^^^^^^^^ cannot assign
+
+error: aborting due to 18 previous errors
+
+Some errors have detailed explanations: E0506, E0510.
+For more information about an error, try `rustc --explain E0506`.
diff --git a/src/test/ui/nll/match-on-borrowed.rs b/tests/ui/nll/match-on-borrowed.rs
index 447dabeb4..447dabeb4 100644
--- a/src/test/ui/nll/match-on-borrowed.rs
+++ b/tests/ui/nll/match-on-borrowed.rs
diff --git a/src/test/ui/nll/match-on-borrowed.stderr b/tests/ui/nll/match-on-borrowed.stderr
index 32666529f..32666529f 100644
--- a/src/test/ui/nll/match-on-borrowed.stderr
+++ b/tests/ui/nll/match-on-borrowed.stderr
diff --git a/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.rs b/tests/ui/nll/maybe-initialized-drop-implicit-fragment-drop.rs
index 1de32ddf5..1de32ddf5 100644
--- a/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.rs
+++ b/tests/ui/nll/maybe-initialized-drop-implicit-fragment-drop.rs
diff --git a/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr b/tests/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr
index 80e297807..80e297807 100644
--- a/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr
+++ b/tests/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr
diff --git a/src/test/ui/nll/maybe-initialized-drop-uninitialized.rs b/tests/ui/nll/maybe-initialized-drop-uninitialized.rs
index 32e07cd14..32e07cd14 100644
--- a/src/test/ui/nll/maybe-initialized-drop-uninitialized.rs
+++ b/tests/ui/nll/maybe-initialized-drop-uninitialized.rs
diff --git a/src/test/ui/nll/maybe-initialized-drop-with-fragment.rs b/tests/ui/nll/maybe-initialized-drop-with-fragment.rs
index 778212918..778212918 100644
--- a/src/test/ui/nll/maybe-initialized-drop-with-fragment.rs
+++ b/tests/ui/nll/maybe-initialized-drop-with-fragment.rs
diff --git a/src/test/ui/nll/maybe-initialized-drop-with-fragment.stderr b/tests/ui/nll/maybe-initialized-drop-with-fragment.stderr
index 14074472e..14074472e 100644
--- a/src/test/ui/nll/maybe-initialized-drop-with-fragment.stderr
+++ b/tests/ui/nll/maybe-initialized-drop-with-fragment.stderr
diff --git a/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.rs b/tests/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.rs
index b0d6e27a3..b0d6e27a3 100644
--- a/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.rs
+++ b/tests/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.rs
diff --git a/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr b/tests/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr
index 91c0afc1d..91c0afc1d 100644
--- a/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr
+++ b/tests/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr
diff --git a/src/test/ui/nll/maybe-initialized-drop.rs b/tests/ui/nll/maybe-initialized-drop.rs
index 44a7ede78..44a7ede78 100644
--- a/src/test/ui/nll/maybe-initialized-drop.rs
+++ b/tests/ui/nll/maybe-initialized-drop.rs
diff --git a/src/test/ui/nll/maybe-initialized-drop.stderr b/tests/ui/nll/maybe-initialized-drop.stderr
index 9825ba461..9825ba461 100644
--- a/src/test/ui/nll/maybe-initialized-drop.stderr
+++ b/tests/ui/nll/maybe-initialized-drop.stderr
diff --git a/src/test/ui/nll/mir_check_cast_closure.rs b/tests/ui/nll/mir_check_cast_closure.rs
index 4aebcfdb4..4aebcfdb4 100644
--- a/src/test/ui/nll/mir_check_cast_closure.rs
+++ b/tests/ui/nll/mir_check_cast_closure.rs
diff --git a/src/test/ui/nll/mir_check_cast_closure.stderr b/tests/ui/nll/mir_check_cast_closure.stderr
index 72d99aad9..72d99aad9 100644
--- a/src/test/ui/nll/mir_check_cast_closure.stderr
+++ b/tests/ui/nll/mir_check_cast_closure.stderr
diff --git a/src/test/ui/nll/mir_check_cast_reify.rs b/tests/ui/nll/mir_check_cast_reify.rs
index 951459911..951459911 100644
--- a/src/test/ui/nll/mir_check_cast_reify.rs
+++ b/tests/ui/nll/mir_check_cast_reify.rs
diff --git a/src/test/ui/nll/mir_check_cast_reify.stderr b/tests/ui/nll/mir_check_cast_reify.stderr
index 9be2670fe..9be2670fe 100644
--- a/src/test/ui/nll/mir_check_cast_reify.stderr
+++ b/tests/ui/nll/mir_check_cast_reify.stderr
diff --git a/src/test/ui/nll/mir_check_cast_unsafe_fn.rs b/tests/ui/nll/mir_check_cast_unsafe_fn.rs
index 8f55bedfb..8f55bedfb 100644
--- a/src/test/ui/nll/mir_check_cast_unsafe_fn.rs
+++ b/tests/ui/nll/mir_check_cast_unsafe_fn.rs
diff --git a/src/test/ui/nll/mir_check_cast_unsafe_fn.stderr b/tests/ui/nll/mir_check_cast_unsafe_fn.stderr
index 321d17ba6..321d17ba6 100644
--- a/src/test/ui/nll/mir_check_cast_unsafe_fn.stderr
+++ b/tests/ui/nll/mir_check_cast_unsafe_fn.stderr
diff --git a/src/test/ui/nll/mir_check_cast_unsize.rs b/tests/ui/nll/mir_check_cast_unsize.rs
index f6c100ab6..f6c100ab6 100644
--- a/src/test/ui/nll/mir_check_cast_unsize.rs
+++ b/tests/ui/nll/mir_check_cast_unsize.rs
diff --git a/src/test/ui/nll/mir_check_cast_unsize.stderr b/tests/ui/nll/mir_check_cast_unsize.stderr
index 1cd2579e4..1cd2579e4 100644
--- a/src/test/ui/nll/mir_check_cast_unsize.stderr
+++ b/tests/ui/nll/mir_check_cast_unsize.stderr
diff --git a/src/test/ui/nll/move-errors.rs b/tests/ui/nll/move-errors.rs
index e0fcd6250..e0fcd6250 100644
--- a/src/test/ui/nll/move-errors.rs
+++ b/tests/ui/nll/move-errors.rs
diff --git a/tests/ui/nll/move-errors.stderr b/tests/ui/nll/move-errors.stderr
new file mode 100644
index 000000000..58b8aa31d
--- /dev/null
+++ b/tests/ui/nll/move-errors.stderr
@@ -0,0 +1,210 @@
+error[E0507]: cannot move out of `*a` which is behind a shared reference
+  --> $DIR/move-errors.rs:6:13
+   |
+LL |     let b = *a;
+   |             ^^ move occurs because `*a` has type `A`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let b = *a;
+LL +     let b = a;
+   |
+
+error[E0508]: cannot move out of type `[A; 1]`, a non-copy array
+  --> $DIR/move-errors.rs:12:13
+   |
+LL |     let b = a[0];
+   |             ^^^^
+   |             |
+   |             cannot move out of here
+   |             move occurs because `a[_]` has type `A`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let b = &a[0];
+   |             +
+
+error[E0507]: cannot move out of `**r` which is behind a shared reference
+  --> $DIR/move-errors.rs:19:13
+   |
+LL |     let s = **r;
+   |             ^^^ move occurs because `**r` has type `A`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let s = **r;
+LL +     let s = *r;
+   |
+
+error[E0507]: cannot move out of an `Rc`
+  --> $DIR/move-errors.rs:27:13
+   |
+LL |     let s = *r;
+   |             ^^ move occurs because value has type `A`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let s = *r;
+LL +     let s = r;
+   |
+
+error[E0508]: cannot move out of type `[A; 1]`, a non-copy array
+  --> $DIR/move-errors.rs:32:13
+   |
+LL |     let a = [A("".to_string())][0];
+   |             ^^^^^^^^^^^^^^^^^^^^^^
+   |             |
+   |             cannot move out of here
+   |             move occurs because value has type `A`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let a = &[A("".to_string())][0];
+   |             +
+
+error[E0507]: cannot move out of `a` which is behind a shared reference
+  --> $DIR/move-errors.rs:38:16
+   |
+LL |     let A(s) = *a;
+   |           -    ^^
+   |           |
+   |           data moved here
+   |           move occurs because `s` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let A(s) = *a;
+LL +     let A(s) = a;
+   |
+
+error[E0509]: cannot move out of type `D`, which implements the `Drop` trait
+  --> $DIR/move-errors.rs:44:19
+   |
+LL |     let C(D(s)) = c;
+   |             -     ^ cannot move out of here
+   |             |
+   |             data moved here
+   |             move occurs because `s` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     let C(D(ref s)) = c;
+   |             +++
+
+error[E0507]: cannot move out of `*a` which is behind a shared reference
+  --> $DIR/move-errors.rs:51:9
+   |
+LL |     b = *a;
+   |         ^^ move occurs because `*a` has type `A`, which does not implement the `Copy` trait
+
+error[E0508]: cannot move out of type `[B; 1]`, a non-copy array
+  --> $DIR/move-errors.rs:74:11
+   |
+LL |     match x[0] {
+   |           ^^^^ cannot move out of here
+LL |
+LL |         B::U(d) => (),
+   |              - data moved here
+LL |         B::V(s) => (),
+   |              - ...and here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider borrowing here
+   |
+LL |     match &x[0] {
+   |           +
+
+error[E0509]: cannot move out of type `D`, which implements the `Drop` trait
+  --> $DIR/move-errors.rs:83:11
+   |
+LL |     match x {
+   |           ^ cannot move out of here
+...
+LL |         B::U(D(s)) => (),
+   |                -
+   |                |
+   |                data moved here
+   |                move occurs because `s` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |         B::U(D(ref s)) => (),
+   |                +++
+
+error[E0509]: cannot move out of type `D`, which implements the `Drop` trait
+  --> $DIR/move-errors.rs:92:11
+   |
+LL |     match x {
+   |           ^ cannot move out of here
+...
+LL |         (D(s), &t) => (),
+   |            -
+   |            |
+   |            data moved here
+   |            move occurs because `s` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |         (D(ref s), &t) => (),
+   |            +++
+
+error[E0507]: cannot move out of `*x.1` which is behind a shared reference
+  --> $DIR/move-errors.rs:92:11
+   |
+LL |     match x {
+   |           ^
+...
+LL |         (D(s), &t) => (),
+   |                 -
+   |                 |
+   |                 data moved here
+   |                 move occurs because `t` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |         (D(s), &ref t) => (),
+   |                 +++
+
+error[E0509]: cannot move out of type `F`, which implements the `Drop` trait
+  --> $DIR/move-errors.rs:102:11
+   |
+LL |     match x {
+   |           ^ cannot move out of here
+LL |
+LL |         F(s, mut t) => (),
+   |           -  ----- ...and here
+   |           |
+   |           data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider borrowing the pattern binding
+   |
+LL |         F(ref s, mut t) => (),
+   |           +++
+help: consider borrowing the pattern binding
+   |
+LL |         F(s, ref mut t) => (),
+   |              +++
+
+error[E0507]: cannot move out of `x` as enum variant `Err` which is behind a shared reference
+  --> $DIR/move-errors.rs:110:11
+   |
+LL |     match *x {
+   |           ^^
+LL |
+LL |         Ok(s) | Err(s) => (),
+   |            -
+   |            |
+   |            data moved here
+   |            move occurs because `s` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     match *x {
+LL +     match x {
+   |
+
+error: aborting due to 14 previous errors
+
+Some errors have detailed explanations: E0507, E0508, E0509.
+For more information about an error, try `rustc --explain E0507`.
diff --git a/src/test/ui/nll/move-subpaths-moves-root.rs b/tests/ui/nll/move-subpaths-moves-root.rs
index d266c6bb6..d266c6bb6 100644
--- a/src/test/ui/nll/move-subpaths-moves-root.rs
+++ b/tests/ui/nll/move-subpaths-moves-root.rs
diff --git a/src/test/ui/nll/move-subpaths-moves-root.stderr b/tests/ui/nll/move-subpaths-moves-root.stderr
index ae9287f92..ae9287f92 100644
--- a/src/test/ui/nll/move-subpaths-moves-root.stderr
+++ b/tests/ui/nll/move-subpaths-moves-root.stderr
diff --git a/src/test/ui/nll/mutating_references.rs b/tests/ui/nll/mutating_references.rs
index eb46b30b6..eb46b30b6 100644
--- a/src/test/ui/nll/mutating_references.rs
+++ b/tests/ui/nll/mutating_references.rs
diff --git a/src/test/ui/nll/normalization-bounds-error.rs b/tests/ui/nll/normalization-bounds-error.rs
index b6cfcd987..b6cfcd987 100644
--- a/src/test/ui/nll/normalization-bounds-error.rs
+++ b/tests/ui/nll/normalization-bounds-error.rs
diff --git a/src/test/ui/nll/normalization-bounds-error.stderr b/tests/ui/nll/normalization-bounds-error.stderr
index 6abe53127..0fc3670d6 100644
--- a/src/test/ui/nll/normalization-bounds-error.stderr
+++ b/tests/ui/nll/normalization-bounds-error.stderr
@@ -1,8 +1,8 @@
 error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'d` due to conflicting requirements
-  --> $DIR/normalization-bounds-error.rs:12:1
+  --> $DIR/normalization-bounds-error.rs:12:31
    |
 LL | fn visit_seq<'d, 'a: 'd>() -> <&'a () as Visitor<'d>>::Value {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: first, the lifetime cannot outlive the lifetime `'d` as defined here...
   --> $DIR/normalization-bounds-error.rs:12:14
@@ -15,10 +15,10 @@ note: ...but the lifetime must also be valid for the lifetime `'a` as defined he
 LL | fn visit_seq<'d, 'a: 'd>() -> <&'a () as Visitor<'d>>::Value {}
    |                  ^^
 note: ...so that the types are compatible
-  --> $DIR/normalization-bounds-error.rs:12:1
+  --> $DIR/normalization-bounds-error.rs:12:31
    |
 LL | fn visit_seq<'d, 'a: 'd>() -> <&'a () as Visitor<'d>>::Value {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: expected `Visitor<'d>`
               found `Visitor<'_>`
 
diff --git a/src/test/ui/nll/normalization-bounds.rs b/tests/ui/nll/normalization-bounds.rs
index bb6d981e0..bb6d981e0 100644
--- a/src/test/ui/nll/normalization-bounds.rs
+++ b/tests/ui/nll/normalization-bounds.rs
diff --git a/src/test/ui/nll/outlives-suggestion-more.rs b/tests/ui/nll/outlives-suggestion-more.rs
index 2e1359fe5..2e1359fe5 100644
--- a/src/test/ui/nll/outlives-suggestion-more.rs
+++ b/tests/ui/nll/outlives-suggestion-more.rs
diff --git a/src/test/ui/nll/outlives-suggestion-more.stderr b/tests/ui/nll/outlives-suggestion-more.stderr
index c8c604b5b..c8c604b5b 100644
--- a/src/test/ui/nll/outlives-suggestion-more.stderr
+++ b/tests/ui/nll/outlives-suggestion-more.stderr
diff --git a/src/test/ui/nll/outlives-suggestion-simple.polonius.stderr b/tests/ui/nll/outlives-suggestion-simple.polonius.stderr
index c00288f2e..c00288f2e 100644
--- a/src/test/ui/nll/outlives-suggestion-simple.polonius.stderr
+++ b/tests/ui/nll/outlives-suggestion-simple.polonius.stderr
diff --git a/src/test/ui/nll/outlives-suggestion-simple.rs b/tests/ui/nll/outlives-suggestion-simple.rs
index 2a5c31e3a..2a5c31e3a 100644
--- a/src/test/ui/nll/outlives-suggestion-simple.rs
+++ b/tests/ui/nll/outlives-suggestion-simple.rs
diff --git a/src/test/ui/nll/outlives-suggestion-simple.stderr b/tests/ui/nll/outlives-suggestion-simple.stderr
index a8368c494..a8368c494 100644
--- a/src/test/ui/nll/outlives-suggestion-simple.stderr
+++ b/tests/ui/nll/outlives-suggestion-simple.stderr
diff --git a/src/test/ui/nll/polonius/assignment-kills-loans.rs b/tests/ui/nll/polonius/assignment-kills-loans.rs
index 696bf61ce..696bf61ce 100644
--- a/src/test/ui/nll/polonius/assignment-kills-loans.rs
+++ b/tests/ui/nll/polonius/assignment-kills-loans.rs
diff --git a/src/test/ui/nll/polonius/assignment-to-differing-field.rs b/tests/ui/nll/polonius/assignment-to-differing-field.rs
index 7ec3b9049..7ec3b9049 100644
--- a/src/test/ui/nll/polonius/assignment-to-differing-field.rs
+++ b/tests/ui/nll/polonius/assignment-to-differing-field.rs
diff --git a/src/test/ui/nll/polonius/assignment-to-differing-field.stderr b/tests/ui/nll/polonius/assignment-to-differing-field.stderr
index afa1b9344..afa1b9344 100644
--- a/src/test/ui/nll/polonius/assignment-to-differing-field.stderr
+++ b/tests/ui/nll/polonius/assignment-to-differing-field.stderr
diff --git a/src/test/ui/nll/polonius/call-kills-loans.rs b/tests/ui/nll/polonius/call-kills-loans.rs
index f430e9211..f430e9211 100644
--- a/src/test/ui/nll/polonius/call-kills-loans.rs
+++ b/tests/ui/nll/polonius/call-kills-loans.rs
diff --git a/src/test/ui/nll/polonius/issue-46589.rs b/tests/ui/nll/polonius/issue-46589.rs
index 648280a1d..648280a1d 100644
--- a/src/test/ui/nll/polonius/issue-46589.rs
+++ b/tests/ui/nll/polonius/issue-46589.rs
diff --git a/src/test/ui/nll/polonius/polonius-smoke-test.rs b/tests/ui/nll/polonius/polonius-smoke-test.rs
index c4344af71..c4344af71 100644
--- a/src/test/ui/nll/polonius/polonius-smoke-test.rs
+++ b/tests/ui/nll/polonius/polonius-smoke-test.rs
diff --git a/src/test/ui/nll/polonius/polonius-smoke-test.stderr b/tests/ui/nll/polonius/polonius-smoke-test.stderr
index fa1a6a9c9..fa1a6a9c9 100644
--- a/src/test/ui/nll/polonius/polonius-smoke-test.stderr
+++ b/tests/ui/nll/polonius/polonius-smoke-test.stderr
diff --git a/src/test/ui/nll/polonius/storagedead-kills-loans.rs b/tests/ui/nll/polonius/storagedead-kills-loans.rs
index 669e077de..669e077de 100644
--- a/src/test/ui/nll/polonius/storagedead-kills-loans.rs
+++ b/tests/ui/nll/polonius/storagedead-kills-loans.rs
diff --git a/src/test/ui/nll/polonius/subset-relations.rs b/tests/ui/nll/polonius/subset-relations.rs
index f223ab177..f223ab177 100644
--- a/src/test/ui/nll/polonius/subset-relations.rs
+++ b/tests/ui/nll/polonius/subset-relations.rs
diff --git a/src/test/ui/nll/polonius/subset-relations.stderr b/tests/ui/nll/polonius/subset-relations.stderr
index 6df5563ea..6df5563ea 100644
--- a/src/test/ui/nll/polonius/subset-relations.stderr
+++ b/tests/ui/nll/polonius/subset-relations.stderr
diff --git a/src/test/ui/nll/process_or_insert_default.rs b/tests/ui/nll/process_or_insert_default.rs
index 84ac9bbd0..84ac9bbd0 100644
--- a/src/test/ui/nll/process_or_insert_default.rs
+++ b/tests/ui/nll/process_or_insert_default.rs
diff --git a/src/test/ui/nll/projection-return.rs b/tests/ui/nll/projection-return.rs
index be141339a..be141339a 100644
--- a/src/test/ui/nll/projection-return.rs
+++ b/tests/ui/nll/projection-return.rs
diff --git a/src/test/ui/nll/promotable-mutable-zst-doesnt-conflict.rs b/tests/ui/nll/promotable-mutable-zst-doesnt-conflict.rs
index 3b06b0db3..3b06b0db3 100644
--- a/src/test/ui/nll/promotable-mutable-zst-doesnt-conflict.rs
+++ b/tests/ui/nll/promotable-mutable-zst-doesnt-conflict.rs
diff --git a/src/test/ui/nll/promoted-bounds.rs b/tests/ui/nll/promoted-bounds.rs
index 5f95ae13c..5f95ae13c 100644
--- a/src/test/ui/nll/promoted-bounds.rs
+++ b/tests/ui/nll/promoted-bounds.rs
diff --git a/src/test/ui/nll/promoted-bounds.stderr b/tests/ui/nll/promoted-bounds.stderr
index df347f4e7..df347f4e7 100644
--- a/src/test/ui/nll/promoted-bounds.stderr
+++ b/tests/ui/nll/promoted-bounds.stderr
diff --git a/src/test/ui/nll/promoted-closure-pair.rs b/tests/ui/nll/promoted-closure-pair.rs
index cc9f17fd4..cc9f17fd4 100644
--- a/src/test/ui/nll/promoted-closure-pair.rs
+++ b/tests/ui/nll/promoted-closure-pair.rs
diff --git a/src/test/ui/nll/promoted-closure-pair.stderr b/tests/ui/nll/promoted-closure-pair.stderr
index 000bdf858..000bdf858 100644
--- a/src/test/ui/nll/promoted-closure-pair.stderr
+++ b/tests/ui/nll/promoted-closure-pair.stderr
diff --git a/src/test/ui/nll/promoted-liveness.rs b/tests/ui/nll/promoted-liveness.rs
index e5a8e1e5c..e5a8e1e5c 100644
--- a/src/test/ui/nll/promoted-liveness.rs
+++ b/tests/ui/nll/promoted-liveness.rs
diff --git a/src/test/ui/nll/rc-loop.rs b/tests/ui/nll/rc-loop.rs
index e59303d1f..e59303d1f 100644
--- a/src/test/ui/nll/rc-loop.rs
+++ b/tests/ui/nll/rc-loop.rs
diff --git a/src/test/ui/nll/ref-suggestion.rs b/tests/ui/nll/ref-suggestion.rs
index 346d118f0..346d118f0 100644
--- a/src/test/ui/nll/ref-suggestion.rs
+++ b/tests/ui/nll/ref-suggestion.rs
diff --git a/src/test/ui/nll/ref-suggestion.stderr b/tests/ui/nll/ref-suggestion.stderr
index b1f5117cb..b1f5117cb 100644
--- a/src/test/ui/nll/ref-suggestion.stderr
+++ b/tests/ui/nll/ref-suggestion.stderr
diff --git a/src/test/ui/nll/reference-carried-through-struct-field.rs b/tests/ui/nll/reference-carried-through-struct-field.rs
index effd61084..effd61084 100644
--- a/src/test/ui/nll/reference-carried-through-struct-field.rs
+++ b/tests/ui/nll/reference-carried-through-struct-field.rs
diff --git a/src/test/ui/nll/reference-carried-through-struct-field.stderr b/tests/ui/nll/reference-carried-through-struct-field.stderr
index 56d878e43..56d878e43 100644
--- a/src/test/ui/nll/reference-carried-through-struct-field.stderr
+++ b/tests/ui/nll/reference-carried-through-struct-field.stderr
diff --git a/src/test/ui/nll/region-ends-after-if-condition.rs b/tests/ui/nll/region-ends-after-if-condition.rs
index f67de03ca..f67de03ca 100644
--- a/src/test/ui/nll/region-ends-after-if-condition.rs
+++ b/tests/ui/nll/region-ends-after-if-condition.rs
diff --git a/src/test/ui/nll/region-ends-after-if-condition.stderr b/tests/ui/nll/region-ends-after-if-condition.stderr
index c03e38579..c03e38579 100644
--- a/src/test/ui/nll/region-ends-after-if-condition.stderr
+++ b/tests/ui/nll/region-ends-after-if-condition.stderr
diff --git a/src/test/ui/nll/relate_tys/fn-subtype.rs b/tests/ui/nll/relate_tys/fn-subtype.rs
index ba89fa19c..ba89fa19c 100644
--- a/src/test/ui/nll/relate_tys/fn-subtype.rs
+++ b/tests/ui/nll/relate_tys/fn-subtype.rs
diff --git a/src/test/ui/nll/relate_tys/fn-subtype.stderr b/tests/ui/nll/relate_tys/fn-subtype.stderr
index 21073647e..21073647e 100644
--- a/src/test/ui/nll/relate_tys/fn-subtype.stderr
+++ b/tests/ui/nll/relate_tys/fn-subtype.stderr
diff --git a/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.rs b/tests/ui/nll/relate_tys/hr-fn-aaa-as-aba.rs
index 7891bab09..7891bab09 100644
--- a/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.rs
+++ b/tests/ui/nll/relate_tys/hr-fn-aaa-as-aba.rs
diff --git a/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr b/tests/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr
index 7d76c916d..7d76c916d 100644
--- a/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr
+++ b/tests/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr
diff --git a/src/test/ui/nll/relate_tys/hr-fn-aau-eq-abu.rs b/tests/ui/nll/relate_tys/hr-fn-aau-eq-abu.rs
index 92730341c..92730341c 100644
--- a/src/test/ui/nll/relate_tys/hr-fn-aau-eq-abu.rs
+++ b/tests/ui/nll/relate_tys/hr-fn-aau-eq-abu.rs
diff --git a/src/test/ui/nll/relate_tys/hr-fn-aba-as-aaa.rs b/tests/ui/nll/relate_tys/hr-fn-aba-as-aaa.rs
index 7cc0acf45..7cc0acf45 100644
--- a/src/test/ui/nll/relate_tys/hr-fn-aba-as-aaa.rs
+++ b/tests/ui/nll/relate_tys/hr-fn-aba-as-aaa.rs
diff --git a/src/test/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.rs b/tests/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.rs
index 05e2ea047..05e2ea047 100644
--- a/src/test/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.rs
+++ b/tests/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.rs
diff --git a/src/test/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.stderr b/tests/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.stderr
index b945ffedd..b945ffedd 100644
--- a/src/test/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.stderr
+++ b/tests/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.stderr
diff --git a/src/test/ui/nll/relate_tys/issue-48071.rs b/tests/ui/nll/relate_tys/issue-48071.rs
index 73361a0d3..73361a0d3 100644
--- a/src/test/ui/nll/relate_tys/issue-48071.rs
+++ b/tests/ui/nll/relate_tys/issue-48071.rs
diff --git a/src/test/ui/nll/relate_tys/opaque-hrtb.rs b/tests/ui/nll/relate_tys/opaque-hrtb.rs
index 261372523..261372523 100644
--- a/src/test/ui/nll/relate_tys/opaque-hrtb.rs
+++ b/tests/ui/nll/relate_tys/opaque-hrtb.rs
diff --git a/src/test/ui/nll/relate_tys/opaque-hrtb.stderr b/tests/ui/nll/relate_tys/opaque-hrtb.stderr
index d75ec2b57..d75ec2b57 100644
--- a/src/test/ui/nll/relate_tys/opaque-hrtb.stderr
+++ b/tests/ui/nll/relate_tys/opaque-hrtb.stderr
diff --git a/src/test/ui/nll/relate_tys/trait-hrtb.rs b/tests/ui/nll/relate_tys/trait-hrtb.rs
index 7f40e93cd..7f40e93cd 100644
--- a/src/test/ui/nll/relate_tys/trait-hrtb.rs
+++ b/tests/ui/nll/relate_tys/trait-hrtb.rs
diff --git a/src/test/ui/nll/relate_tys/trait-hrtb.stderr b/tests/ui/nll/relate_tys/trait-hrtb.stderr
index aa1927711..aa1927711 100644
--- a/src/test/ui/nll/relate_tys/trait-hrtb.stderr
+++ b/tests/ui/nll/relate_tys/trait-hrtb.stderr
diff --git a/src/test/ui/nll/relate_tys/universe-violation.rs b/tests/ui/nll/relate_tys/universe-violation.rs
index c5f9d4406..c5f9d4406 100644
--- a/src/test/ui/nll/relate_tys/universe-violation.rs
+++ b/tests/ui/nll/relate_tys/universe-violation.rs
diff --git a/src/test/ui/nll/relate_tys/universe-violation.stderr b/tests/ui/nll/relate_tys/universe-violation.stderr
index fe801b42c..fe801b42c 100644
--- a/src/test/ui/nll/relate_tys/universe-violation.stderr
+++ b/tests/ui/nll/relate_tys/universe-violation.stderr
diff --git a/src/test/ui/nll/relate_tys/var-appears-twice.rs b/tests/ui/nll/relate_tys/var-appears-twice.rs
index 77129f446..77129f446 100644
--- a/src/test/ui/nll/relate_tys/var-appears-twice.rs
+++ b/tests/ui/nll/relate_tys/var-appears-twice.rs
diff --git a/src/test/ui/nll/relate_tys/var-appears-twice.stderr b/tests/ui/nll/relate_tys/var-appears-twice.stderr
index d032ce6f2..d032ce6f2 100644
--- a/src/test/ui/nll/relate_tys/var-appears-twice.stderr
+++ b/tests/ui/nll/relate_tys/var-appears-twice.stderr
diff --git a/src/test/ui/nll/return-ref-mut-issue-46557.rs b/tests/ui/nll/return-ref-mut-issue-46557.rs
index dca61d39d..dca61d39d 100644
--- a/src/test/ui/nll/return-ref-mut-issue-46557.rs
+++ b/tests/ui/nll/return-ref-mut-issue-46557.rs
diff --git a/src/test/ui/nll/return-ref-mut-issue-46557.stderr b/tests/ui/nll/return-ref-mut-issue-46557.stderr
index 720440a0a..720440a0a 100644
--- a/src/test/ui/nll/return-ref-mut-issue-46557.stderr
+++ b/tests/ui/nll/return-ref-mut-issue-46557.stderr
diff --git a/src/test/ui/nll/return_from_loop.rs b/tests/ui/nll/return_from_loop.rs
index 495410894..495410894 100644
--- a/src/test/ui/nll/return_from_loop.rs
+++ b/tests/ui/nll/return_from_loop.rs
diff --git a/src/test/ui/nll/return_from_loop.stderr b/tests/ui/nll/return_from_loop.stderr
index bd2b8b158..bd2b8b158 100644
--- a/src/test/ui/nll/return_from_loop.stderr
+++ b/tests/ui/nll/return_from_loop.stderr
diff --git a/src/test/ui/nll/self-assign-ref-mut.rs b/tests/ui/nll/self-assign-ref-mut.rs
index 1ca4cf3a7..1ca4cf3a7 100644
--- a/src/test/ui/nll/self-assign-ref-mut.rs
+++ b/tests/ui/nll/self-assign-ref-mut.rs
diff --git a/src/test/ui/nll/snocat-regression.rs b/tests/ui/nll/snocat-regression.rs
index b2e5995aa..b2e5995aa 100644
--- a/src/test/ui/nll/snocat-regression.rs
+++ b/tests/ui/nll/snocat-regression.rs
diff --git a/src/test/ui/nll/snocat-regression.stderr b/tests/ui/nll/snocat-regression.stderr
index 086898473..086898473 100644
--- a/src/test/ui/nll/snocat-regression.stderr
+++ b/tests/ui/nll/snocat-regression.stderr
diff --git a/src/test/ui/nll/trait-associated-constant.rs b/tests/ui/nll/trait-associated-constant.rs
index e13ae80f9..e13ae80f9 100644
--- a/src/test/ui/nll/trait-associated-constant.rs
+++ b/tests/ui/nll/trait-associated-constant.rs
diff --git a/src/test/ui/nll/trait-associated-constant.stderr b/tests/ui/nll/trait-associated-constant.stderr
index cf1c52ba7..cf1c52ba7 100644
--- a/src/test/ui/nll/trait-associated-constant.stderr
+++ b/tests/ui/nll/trait-associated-constant.stderr
diff --git a/src/test/ui/nll/ty-outlives/impl-trait-captures.rs b/tests/ui/nll/ty-outlives/impl-trait-captures.rs
index 67b31b8bc..67b31b8bc 100644
--- a/src/test/ui/nll/ty-outlives/impl-trait-captures.rs
+++ b/tests/ui/nll/ty-outlives/impl-trait-captures.rs
diff --git a/src/test/ui/nll/ty-outlives/impl-trait-captures.stderr b/tests/ui/nll/ty-outlives/impl-trait-captures.stderr
index 7b9ed171d..7b9ed171d 100644
--- a/src/test/ui/nll/ty-outlives/impl-trait-captures.stderr
+++ b/tests/ui/nll/ty-outlives/impl-trait-captures.stderr
diff --git a/src/test/ui/nll/ty-outlives/impl-trait-outlives.rs b/tests/ui/nll/ty-outlives/impl-trait-outlives.rs
index 68ccb51fc..68ccb51fc 100644
--- a/src/test/ui/nll/ty-outlives/impl-trait-outlives.rs
+++ b/tests/ui/nll/ty-outlives/impl-trait-outlives.rs
diff --git a/src/test/ui/nll/ty-outlives/impl-trait-outlives.stderr b/tests/ui/nll/ty-outlives/impl-trait-outlives.stderr
index 64b08a9b3..64b08a9b3 100644
--- a/src/test/ui/nll/ty-outlives/impl-trait-outlives.stderr
+++ b/tests/ui/nll/ty-outlives/impl-trait-outlives.stderr
diff --git a/src/test/ui/nll/ty-outlives/issue-53789-1.rs b/tests/ui/nll/ty-outlives/issue-53789-1.rs
index a5201d4bb..a5201d4bb 100644
--- a/src/test/ui/nll/ty-outlives/issue-53789-1.rs
+++ b/tests/ui/nll/ty-outlives/issue-53789-1.rs
diff --git a/src/test/ui/nll/ty-outlives/issue-53789-2.rs b/tests/ui/nll/ty-outlives/issue-53789-2.rs
index 5109a0e4a..5109a0e4a 100644
--- a/src/test/ui/nll/ty-outlives/issue-53789-2.rs
+++ b/tests/ui/nll/ty-outlives/issue-53789-2.rs
diff --git a/src/test/ui/nll/ty-outlives/issue-55756.rs b/tests/ui/nll/ty-outlives/issue-55756.rs
index e1a3bc3c4..e1a3bc3c4 100644
--- a/src/test/ui/nll/ty-outlives/issue-55756.rs
+++ b/tests/ui/nll/ty-outlives/issue-55756.rs
diff --git a/src/test/ui/nll/ty-outlives/projection-body.rs b/tests/ui/nll/ty-outlives/projection-body.rs
index b03a539eb..b03a539eb 100644
--- a/src/test/ui/nll/ty-outlives/projection-body.rs
+++ b/tests/ui/nll/ty-outlives/projection-body.rs
diff --git a/src/test/ui/nll/ty-outlives/projection-implied-bounds.rs b/tests/ui/nll/ty-outlives/projection-implied-bounds.rs
index e1dac0824..e1dac0824 100644
--- a/src/test/ui/nll/ty-outlives/projection-implied-bounds.rs
+++ b/tests/ui/nll/ty-outlives/projection-implied-bounds.rs
diff --git a/src/test/ui/nll/ty-outlives/projection-implied-bounds.stderr b/tests/ui/nll/ty-outlives/projection-implied-bounds.stderr
index d949e29b2..d949e29b2 100644
--- a/src/test/ui/nll/ty-outlives/projection-implied-bounds.stderr
+++ b/tests/ui/nll/ty-outlives/projection-implied-bounds.stderr
diff --git a/src/test/ui/nll/ty-outlives/projection-no-regions-closure.rs b/tests/ui/nll/ty-outlives/projection-no-regions-closure.rs
index 2d9c008c7..2d9c008c7 100644
--- a/src/test/ui/nll/ty-outlives/projection-no-regions-closure.rs
+++ b/tests/ui/nll/ty-outlives/projection-no-regions-closure.rs
diff --git a/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr b/tests/ui/nll/ty-outlives/projection-no-regions-closure.stderr
index 4933b9348..4933b9348 100644
--- a/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr
+++ b/tests/ui/nll/ty-outlives/projection-no-regions-closure.stderr
diff --git a/src/test/ui/nll/ty-outlives/projection-no-regions-fn.rs b/tests/ui/nll/ty-outlives/projection-no-regions-fn.rs
index a10a0366a..a10a0366a 100644
--- a/src/test/ui/nll/ty-outlives/projection-no-regions-fn.rs
+++ b/tests/ui/nll/ty-outlives/projection-no-regions-fn.rs
diff --git a/src/test/ui/nll/ty-outlives/projection-no-regions-fn.stderr b/tests/ui/nll/ty-outlives/projection-no-regions-fn.stderr
index e0ff544fe..e0ff544fe 100644
--- a/src/test/ui/nll/ty-outlives/projection-no-regions-fn.stderr
+++ b/tests/ui/nll/ty-outlives/projection-no-regions-fn.stderr
diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-closure.rs b/tests/ui/nll/ty-outlives/projection-one-region-closure.rs
index af361e990..af361e990 100644
--- a/src/test/ui/nll/ty-outlives/projection-one-region-closure.rs
+++ b/tests/ui/nll/ty-outlives/projection-one-region-closure.rs
diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr b/tests/ui/nll/ty-outlives/projection-one-region-closure.stderr
index dbda04c42..dbda04c42 100644
--- a/src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr
+++ b/tests/ui/nll/ty-outlives/projection-one-region-closure.stderr
diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.rs b/tests/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.rs
index 6f8513491..6f8513491 100644
--- a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.rs
+++ b/tests/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.rs
diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr b/tests/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr
index 250c796e2..250c796e2 100644
--- a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr
+++ b/tests/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr
diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.rs b/tests/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.rs
index 7c0a3bc72..7c0a3bc72 100644
--- a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.rs
+++ b/tests/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.rs
diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.stderr b/tests/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.stderr
index b27186b05..b27186b05 100644
--- a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.stderr
+++ b/tests/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.stderr
diff --git a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.rs b/tests/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.rs
index 7b4a3c03a..7b4a3c03a 100644
--- a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.rs
+++ b/tests/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.rs
diff --git a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr b/tests/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr
index 90f049142..90f049142 100644
--- a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr
+++ b/tests/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.rs b/tests/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.rs
index dce88b88c..dce88b88c 100644
--- a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.rs
+++ b/tests/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.rs
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.stderr b/tests/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.stderr
index b4435fe06..b4435fe06 100644
--- a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.stderr
+++ b/tests/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.stderr
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.rs b/tests/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.rs
index 987148dce..987148dce 100644
--- a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.rs
+++ b/tests/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.rs
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.stderr b/tests/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.stderr
index ddeaf3c1f..ddeaf3c1f 100644
--- a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.stderr
+++ b/tests/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.stderr
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-env.rs b/tests/ui/nll/ty-outlives/projection-where-clause-env.rs
index a41116232..a41116232 100644
--- a/src/test/ui/nll/ty-outlives/projection-where-clause-env.rs
+++ b/tests/ui/nll/ty-outlives/projection-where-clause-env.rs
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-none.rs b/tests/ui/nll/ty-outlives/projection-where-clause-none.rs
index bb201e5c0..bb201e5c0 100644
--- a/src/test/ui/nll/ty-outlives/projection-where-clause-none.rs
+++ b/tests/ui/nll/ty-outlives/projection-where-clause-none.rs
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-none.stderr b/tests/ui/nll/ty-outlives/projection-where-clause-none.stderr
index 0df44644d..0df44644d 100644
--- a/src/test/ui/nll/ty-outlives/projection-where-clause-none.stderr
+++ b/tests/ui/nll/ty-outlives/projection-where-clause-none.stderr
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-trait.rs b/tests/ui/nll/ty-outlives/projection-where-clause-trait.rs
index 1a40d3b4c..1a40d3b4c 100644
--- a/src/test/ui/nll/ty-outlives/projection-where-clause-trait.rs
+++ b/tests/ui/nll/ty-outlives/projection-where-clause-trait.rs
diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.rs b/tests/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.rs
index 4d8380599..4d8380599 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.rs
+++ b/tests/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.rs
diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr b/tests/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr
index a442cf12d..a442cf12d 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr
+++ b/tests/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr
diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.rs b/tests/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.rs
index 4343c3aee..4343c3aee 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.rs
+++ b/tests/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.rs
diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr b/tests/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr
index 35979c8bf..35979c8bf 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr
+++ b/tests/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr
diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.rs b/tests/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.rs
index b80287610..b80287610 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.rs
+++ b/tests/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.rs
diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr b/tests/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr
index 4c97db58c..4c97db58c 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr
+++ b/tests/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr
diff --git a/src/test/ui/nll/ty-outlives/ty-param-fn-body.rs b/tests/ui/nll/ty-outlives/ty-param-fn-body.rs
index 98239f416..98239f416 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-fn-body.rs
+++ b/tests/ui/nll/ty-outlives/ty-param-fn-body.rs
diff --git a/src/test/ui/nll/ty-outlives/ty-param-fn-body.stderr b/tests/ui/nll/ty-outlives/ty-param-fn-body.stderr
index 5fb69255d..5fb69255d 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-fn-body.stderr
+++ b/tests/ui/nll/ty-outlives/ty-param-fn-body.stderr
diff --git a/src/test/ui/nll/ty-outlives/ty-param-fn.rs b/tests/ui/nll/ty-outlives/ty-param-fn.rs
index 4393a3b41..4393a3b41 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-fn.rs
+++ b/tests/ui/nll/ty-outlives/ty-param-fn.rs
diff --git a/src/test/ui/nll/ty-outlives/ty-param-fn.stderr b/tests/ui/nll/ty-outlives/ty-param-fn.stderr
index 825b26d2f..825b26d2f 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-fn.stderr
+++ b/tests/ui/nll/ty-outlives/ty-param-fn.stderr
diff --git a/src/test/ui/nll/ty-outlives/ty-param-implied-bounds.rs b/tests/ui/nll/ty-outlives/ty-param-implied-bounds.rs
index 9042844e8..9042844e8 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-implied-bounds.rs
+++ b/tests/ui/nll/ty-outlives/ty-param-implied-bounds.rs
diff --git a/src/test/ui/nll/ty-outlives/wf-unreachable.rs b/tests/ui/nll/ty-outlives/wf-unreachable.rs
index c6f4c4afa..c6f4c4afa 100644
--- a/src/test/ui/nll/ty-outlives/wf-unreachable.rs
+++ b/tests/ui/nll/ty-outlives/wf-unreachable.rs
diff --git a/tests/ui/nll/ty-outlives/wf-unreachable.stderr b/tests/ui/nll/ty-outlives/wf-unreachable.stderr
new file mode 100644
index 000000000..da3bc2083
--- /dev/null
+++ b/tests/ui/nll/ty-outlives/wf-unreachable.stderr
@@ -0,0 +1,73 @@
+error: lifetime may not live long enough
+  --> $DIR/wf-unreachable.rs:6:12
+   |
+LL | fn uninit<'a>() {
+   |           -- lifetime `'a` defined here
+LL |     return;
+LL |     let x: &'static &'a ();
+   |            ^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/wf-unreachable.rs:11:12
+   |
+LL | fn var_type<'a>() {
+   |             -- lifetime `'a` defined here
+LL |     return;
+LL |     let x: &'static &'a () = &&();
+   |            ^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/wf-unreachable.rs:15:12
+   |
+LL | fn uninit_infer<'a>() {
+   |                 -- lifetime `'a` defined here
+LL |     let x: &'static &'a _;
+   |            ^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/wf-unreachable.rs:21:12
+   |
+LL | fn infer<'a>() {
+   |          -- lifetime `'a` defined here
+LL |     return;
+LL |     let x: &'static &'a _ = &&();
+   |            ^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/wf-unreachable.rs:26:12
+   |
+LL | fn uninit_no_var<'a>() {
+   |                  -- lifetime `'a` defined here
+LL |     return;
+LL |     let _: &'static &'a ();
+   |            ^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/wf-unreachable.rs:31:12
+   |
+LL | fn no_var<'a>() {
+   |           -- lifetime `'a` defined here
+LL |     return;
+LL |     let _: &'static &'a () = &&();
+   |            ^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/wf-unreachable.rs:36:12
+   |
+LL | fn infer_no_var<'a>() {
+   |                 -- lifetime `'a` defined here
+LL |     return;
+LL |     let _: &'static &'a _ = &&();
+   |            ^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/wf-unreachable.rs:49:12
+   |
+LL | fn required_substs<'a>() {
+   |                    -- lifetime `'a` defined here
+LL |     return;
+LL |     let _: C<'static, 'a, _> = C((), &(), &());
+   |            ^^^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: aborting due to 8 previous errors
+
diff --git a/src/test/ui/nll/type-alias-free-regions.rs b/tests/ui/nll/type-alias-free-regions.rs
index fd5566f35..fd5566f35 100644
--- a/src/test/ui/nll/type-alias-free-regions.rs
+++ b/tests/ui/nll/type-alias-free-regions.rs
diff --git a/src/test/ui/nll/type-alias-free-regions.stderr b/tests/ui/nll/type-alias-free-regions.stderr
index 45fd5a2f1..45fd5a2f1 100644
--- a/src/test/ui/nll/type-alias-free-regions.stderr
+++ b/tests/ui/nll/type-alias-free-regions.stderr
diff --git a/src/test/ui/nll/type-check-pointer-coercions.rs b/tests/ui/nll/type-check-pointer-coercions.rs
index 66da57248..66da57248 100644
--- a/src/test/ui/nll/type-check-pointer-coercions.rs
+++ b/tests/ui/nll/type-check-pointer-coercions.rs
diff --git a/src/test/ui/nll/type-check-pointer-coercions.stderr b/tests/ui/nll/type-check-pointer-coercions.stderr
index ef2d92878..ef2d92878 100644
--- a/src/test/ui/nll/type-check-pointer-coercions.stderr
+++ b/tests/ui/nll/type-check-pointer-coercions.stderr
diff --git a/src/test/ui/nll/type-check-pointer-comparisons.rs b/tests/ui/nll/type-check-pointer-comparisons.rs
index 7b0ffeaef..7b0ffeaef 100644
--- a/src/test/ui/nll/type-check-pointer-comparisons.rs
+++ b/tests/ui/nll/type-check-pointer-comparisons.rs
diff --git a/src/test/ui/nll/type-check-pointer-comparisons.stderr b/tests/ui/nll/type-check-pointer-comparisons.stderr
index 0d8480a42..0d8480a42 100644
--- a/src/test/ui/nll/type-check-pointer-comparisons.stderr
+++ b/tests/ui/nll/type-check-pointer-comparisons.stderr
diff --git a/src/test/ui/nll/type-test-universe.rs b/tests/ui/nll/type-test-universe.rs
index f9801c07d..f9801c07d 100644
--- a/src/test/ui/nll/type-test-universe.rs
+++ b/tests/ui/nll/type-test-universe.rs
diff --git a/src/test/ui/nll/type-test-universe.stderr b/tests/ui/nll/type-test-universe.stderr
index 31e17d64b..31e17d64b 100644
--- a/src/test/ui/nll/type-test-universe.stderr
+++ b/tests/ui/nll/type-test-universe.stderr
diff --git a/src/test/ui/nll/unused-mut-issue-50343.fixed b/tests/ui/nll/unused-mut-issue-50343.fixed
index 5632de1cd..5632de1cd 100644
--- a/src/test/ui/nll/unused-mut-issue-50343.fixed
+++ b/tests/ui/nll/unused-mut-issue-50343.fixed
diff --git a/src/test/ui/nll/unused-mut-issue-50343.rs b/tests/ui/nll/unused-mut-issue-50343.rs
index c849ac8c7..c849ac8c7 100644
--- a/src/test/ui/nll/unused-mut-issue-50343.rs
+++ b/tests/ui/nll/unused-mut-issue-50343.rs
diff --git a/src/test/ui/nll/unused-mut-issue-50343.stderr b/tests/ui/nll/unused-mut-issue-50343.stderr
index cb02d7620..cb02d7620 100644
--- a/src/test/ui/nll/unused-mut-issue-50343.stderr
+++ b/tests/ui/nll/unused-mut-issue-50343.stderr
diff --git a/src/test/ui/nll/user-annotations/adt-brace-enums.rs b/tests/ui/nll/user-annotations/adt-brace-enums.rs
index 0d9828342..0d9828342 100644
--- a/src/test/ui/nll/user-annotations/adt-brace-enums.rs
+++ b/tests/ui/nll/user-annotations/adt-brace-enums.rs
diff --git a/src/test/ui/nll/user-annotations/adt-brace-enums.stderr b/tests/ui/nll/user-annotations/adt-brace-enums.stderr
index 253e38251..253e38251 100644
--- a/src/test/ui/nll/user-annotations/adt-brace-enums.stderr
+++ b/tests/ui/nll/user-annotations/adt-brace-enums.stderr
diff --git a/src/test/ui/nll/user-annotations/adt-brace-structs.rs b/tests/ui/nll/user-annotations/adt-brace-structs.rs
index bdbfd87d5..bdbfd87d5 100644
--- a/src/test/ui/nll/user-annotations/adt-brace-structs.rs
+++ b/tests/ui/nll/user-annotations/adt-brace-structs.rs
diff --git a/src/test/ui/nll/user-annotations/adt-brace-structs.stderr b/tests/ui/nll/user-annotations/adt-brace-structs.stderr
index 8b9d1705d..8b9d1705d 100644
--- a/src/test/ui/nll/user-annotations/adt-brace-structs.stderr
+++ b/tests/ui/nll/user-annotations/adt-brace-structs.stderr
diff --git a/src/test/ui/nll/user-annotations/adt-nullary-enums.rs b/tests/ui/nll/user-annotations/adt-nullary-enums.rs
index 53853668d..53853668d 100644
--- a/src/test/ui/nll/user-annotations/adt-nullary-enums.rs
+++ b/tests/ui/nll/user-annotations/adt-nullary-enums.rs
diff --git a/src/test/ui/nll/user-annotations/adt-nullary-enums.stderr b/tests/ui/nll/user-annotations/adt-nullary-enums.stderr
index 3326fa521..3326fa521 100644
--- a/src/test/ui/nll/user-annotations/adt-nullary-enums.stderr
+++ b/tests/ui/nll/user-annotations/adt-nullary-enums.stderr
diff --git a/src/test/ui/nll/user-annotations/adt-tuple-enums.rs b/tests/ui/nll/user-annotations/adt-tuple-enums.rs
index efe8dfda1..efe8dfda1 100644
--- a/src/test/ui/nll/user-annotations/adt-tuple-enums.rs
+++ b/tests/ui/nll/user-annotations/adt-tuple-enums.rs
diff --git a/src/test/ui/nll/user-annotations/adt-tuple-enums.stderr b/tests/ui/nll/user-annotations/adt-tuple-enums.stderr
index 2fa704263..2fa704263 100644
--- a/src/test/ui/nll/user-annotations/adt-tuple-enums.stderr
+++ b/tests/ui/nll/user-annotations/adt-tuple-enums.stderr
diff --git a/src/test/ui/nll/user-annotations/adt-tuple-struct-calls.rs b/tests/ui/nll/user-annotations/adt-tuple-struct-calls.rs
index 116583223..116583223 100644
--- a/src/test/ui/nll/user-annotations/adt-tuple-struct-calls.rs
+++ b/tests/ui/nll/user-annotations/adt-tuple-struct-calls.rs
diff --git a/src/test/ui/nll/user-annotations/adt-tuple-struct-calls.stderr b/tests/ui/nll/user-annotations/adt-tuple-struct-calls.stderr
index 9664fb9f5..9664fb9f5 100644
--- a/src/test/ui/nll/user-annotations/adt-tuple-struct-calls.stderr
+++ b/tests/ui/nll/user-annotations/adt-tuple-struct-calls.stderr
diff --git a/src/test/ui/nll/user-annotations/adt-tuple-struct.rs b/tests/ui/nll/user-annotations/adt-tuple-struct.rs
index 37284e1fd..37284e1fd 100644
--- a/src/test/ui/nll/user-annotations/adt-tuple-struct.rs
+++ b/tests/ui/nll/user-annotations/adt-tuple-struct.rs
diff --git a/src/test/ui/nll/user-annotations/adt-tuple-struct.stderr b/tests/ui/nll/user-annotations/adt-tuple-struct.stderr
index 76b525225..76b525225 100644
--- a/src/test/ui/nll/user-annotations/adt-tuple-struct.stderr
+++ b/tests/ui/nll/user-annotations/adt-tuple-struct.stderr
diff --git a/tests/ui/nll/user-annotations/ascribed-type-wf.rs b/tests/ui/nll/user-annotations/ascribed-type-wf.rs
new file mode 100644
index 000000000..5db02c46e
--- /dev/null
+++ b/tests/ui/nll/user-annotations/ascribed-type-wf.rs
@@ -0,0 +1,17 @@
+// Regression test for #101350.
+// check-fail
+
+trait Trait {
+    type Ty;
+}
+
+impl Trait for &'static () {
+    type Ty = ();
+}
+
+fn extend<'a>() {
+    None::<<&'a () as Trait>::Ty>;
+    //~^ ERROR lifetime may not live long enough
+}
+
+fn main() {}
diff --git a/tests/ui/nll/user-annotations/ascribed-type-wf.stderr b/tests/ui/nll/user-annotations/ascribed-type-wf.stderr
new file mode 100644
index 000000000..91e7c6b8e
--- /dev/null
+++ b/tests/ui/nll/user-annotations/ascribed-type-wf.stderr
@@ -0,0 +1,10 @@
+error: lifetime may not live long enough
+  --> $DIR/ascribed-type-wf.rs:13:5
+   |
+LL | fn extend<'a>() {
+   |           -- lifetime `'a` defined here
+LL |     None::<<&'a () as Trait>::Ty>;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/nll/user-annotations/cast_static_lifetime.rs b/tests/ui/nll/user-annotations/cast_static_lifetime.rs
index bb6129dac..bb6129dac 100644
--- a/src/test/ui/nll/user-annotations/cast_static_lifetime.rs
+++ b/tests/ui/nll/user-annotations/cast_static_lifetime.rs
diff --git a/src/test/ui/nll/user-annotations/cast_static_lifetime.stderr b/tests/ui/nll/user-annotations/cast_static_lifetime.stderr
index 4599d04e7..4599d04e7 100644
--- a/src/test/ui/nll/user-annotations/cast_static_lifetime.stderr
+++ b/tests/ui/nll/user-annotations/cast_static_lifetime.stderr
diff --git a/tests/ui/nll/user-annotations/closure-sig.rs b/tests/ui/nll/user-annotations/closure-sig.rs
new file mode 100644
index 000000000..4dbd3fd8d
--- /dev/null
+++ b/tests/ui/nll/user-annotations/closure-sig.rs
@@ -0,0 +1,15 @@
+// This test fails if #104478 is fixed before #104477.
+
+// check-pass
+
+struct Printer<'a, 'b>(&'a (), &'b ());
+
+impl Printer<'_, '_> {
+    fn test(self) {
+        let clo = |_: &'_ Self| {};
+        clo(&self);
+        clo(&self);
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/nll/user-annotations/closure-substs.polonius.stderr b/tests/ui/nll/user-annotations/closure-substs.polonius.stderr
index af159a6cd..af159a6cd 100644
--- a/src/test/ui/nll/user-annotations/closure-substs.polonius.stderr
+++ b/tests/ui/nll/user-annotations/closure-substs.polonius.stderr
diff --git a/src/test/ui/nll/user-annotations/closure-substs.rs b/tests/ui/nll/user-annotations/closure-substs.rs
index f7af54e8d..f7af54e8d 100644
--- a/src/test/ui/nll/user-annotations/closure-substs.rs
+++ b/tests/ui/nll/user-annotations/closure-substs.rs
diff --git a/src/test/ui/nll/user-annotations/closure-substs.stderr b/tests/ui/nll/user-annotations/closure-substs.stderr
index 1e8de4ba9..1e8de4ba9 100644
--- a/src/test/ui/nll/user-annotations/closure-substs.stderr
+++ b/tests/ui/nll/user-annotations/closure-substs.stderr
diff --git a/src/test/ui/nll/user-annotations/constant-in-expr-inherent-1.rs b/tests/ui/nll/user-annotations/constant-in-expr-inherent-1.rs
index e3a8a5f58..e3a8a5f58 100644
--- a/src/test/ui/nll/user-annotations/constant-in-expr-inherent-1.rs
+++ b/tests/ui/nll/user-annotations/constant-in-expr-inherent-1.rs
diff --git a/src/test/ui/nll/user-annotations/constant-in-expr-inherent-1.stderr b/tests/ui/nll/user-annotations/constant-in-expr-inherent-1.stderr
index c39301588..c39301588 100644
--- a/src/test/ui/nll/user-annotations/constant-in-expr-inherent-1.stderr
+++ b/tests/ui/nll/user-annotations/constant-in-expr-inherent-1.stderr
diff --git a/src/test/ui/nll/user-annotations/constant-in-expr-inherent-2.rs b/tests/ui/nll/user-annotations/constant-in-expr-inherent-2.rs
index 90696d4b1..90696d4b1 100644
--- a/src/test/ui/nll/user-annotations/constant-in-expr-inherent-2.rs
+++ b/tests/ui/nll/user-annotations/constant-in-expr-inherent-2.rs
diff --git a/src/test/ui/nll/user-annotations/constant-in-expr-inherent-2.stderr b/tests/ui/nll/user-annotations/constant-in-expr-inherent-2.stderr
index 12065a85a..12065a85a 100644
--- a/src/test/ui/nll/user-annotations/constant-in-expr-inherent-2.stderr
+++ b/tests/ui/nll/user-annotations/constant-in-expr-inherent-2.stderr
diff --git a/src/test/ui/nll/user-annotations/constant-in-expr-normalize.rs b/tests/ui/nll/user-annotations/constant-in-expr-normalize.rs
index b7095430d..b7095430d 100644
--- a/src/test/ui/nll/user-annotations/constant-in-expr-normalize.rs
+++ b/tests/ui/nll/user-annotations/constant-in-expr-normalize.rs
diff --git a/src/test/ui/nll/user-annotations/constant-in-expr-normalize.stderr b/tests/ui/nll/user-annotations/constant-in-expr-normalize.stderr
index 541a2cfaf..541a2cfaf 100644
--- a/src/test/ui/nll/user-annotations/constant-in-expr-normalize.stderr
+++ b/tests/ui/nll/user-annotations/constant-in-expr-normalize.stderr
diff --git a/src/test/ui/nll/user-annotations/constant-in-expr-trait-item-1.rs b/tests/ui/nll/user-annotations/constant-in-expr-trait-item-1.rs
index e0400b2cc..e0400b2cc 100644
--- a/src/test/ui/nll/user-annotations/constant-in-expr-trait-item-1.rs
+++ b/tests/ui/nll/user-annotations/constant-in-expr-trait-item-1.rs
diff --git a/src/test/ui/nll/user-annotations/constant-in-expr-trait-item-1.stderr b/tests/ui/nll/user-annotations/constant-in-expr-trait-item-1.stderr
index ea0fcb6d6..ea0fcb6d6 100644
--- a/src/test/ui/nll/user-annotations/constant-in-expr-trait-item-1.stderr
+++ b/tests/ui/nll/user-annotations/constant-in-expr-trait-item-1.stderr
diff --git a/src/test/ui/nll/user-annotations/constant-in-expr-trait-item-2.rs b/tests/ui/nll/user-annotations/constant-in-expr-trait-item-2.rs
index 73c4e577b..73c4e577b 100644
--- a/src/test/ui/nll/user-annotations/constant-in-expr-trait-item-2.rs
+++ b/tests/ui/nll/user-annotations/constant-in-expr-trait-item-2.rs
diff --git a/src/test/ui/nll/user-annotations/constant-in-expr-trait-item-2.stderr b/tests/ui/nll/user-annotations/constant-in-expr-trait-item-2.stderr
index ff549f1d8..ff549f1d8 100644
--- a/src/test/ui/nll/user-annotations/constant-in-expr-trait-item-2.stderr
+++ b/tests/ui/nll/user-annotations/constant-in-expr-trait-item-2.stderr
diff --git a/src/test/ui/nll/user-annotations/constant-in-expr-trait-item-3.rs b/tests/ui/nll/user-annotations/constant-in-expr-trait-item-3.rs
index 567e31ef9..567e31ef9 100644
--- a/src/test/ui/nll/user-annotations/constant-in-expr-trait-item-3.rs
+++ b/tests/ui/nll/user-annotations/constant-in-expr-trait-item-3.rs
diff --git a/src/test/ui/nll/user-annotations/constant-in-expr-trait-item-3.stderr b/tests/ui/nll/user-annotations/constant-in-expr-trait-item-3.stderr
index 7f160d8e3..7f160d8e3 100644
--- a/src/test/ui/nll/user-annotations/constant-in-expr-trait-item-3.stderr
+++ b/tests/ui/nll/user-annotations/constant-in-expr-trait-item-3.stderr
diff --git a/src/test/ui/nll/user-annotations/downcast-infer.rs b/tests/ui/nll/user-annotations/downcast-infer.rs
index b27429f4d..b27429f4d 100644
--- a/src/test/ui/nll/user-annotations/downcast-infer.rs
+++ b/tests/ui/nll/user-annotations/downcast-infer.rs
diff --git a/src/test/ui/nll/user-annotations/dump-adt-brace-struct.rs b/tests/ui/nll/user-annotations/dump-adt-brace-struct.rs
index ccda9129d..ccda9129d 100644
--- a/src/test/ui/nll/user-annotations/dump-adt-brace-struct.rs
+++ b/tests/ui/nll/user-annotations/dump-adt-brace-struct.rs
diff --git a/src/test/ui/nll/user-annotations/dump-adt-brace-struct.stderr b/tests/ui/nll/user-annotations/dump-adt-brace-struct.stderr
index 586062190..586062190 100644
--- a/src/test/ui/nll/user-annotations/dump-adt-brace-struct.stderr
+++ b/tests/ui/nll/user-annotations/dump-adt-brace-struct.stderr
diff --git a/src/test/ui/nll/user-annotations/dump-fn-method.rs b/tests/ui/nll/user-annotations/dump-fn-method.rs
index 148d63d84..148d63d84 100644
--- a/src/test/ui/nll/user-annotations/dump-fn-method.rs
+++ b/tests/ui/nll/user-annotations/dump-fn-method.rs
diff --git a/src/test/ui/nll/user-annotations/dump-fn-method.stderr b/tests/ui/nll/user-annotations/dump-fn-method.stderr
index d139efa88..d139efa88 100644
--- a/src/test/ui/nll/user-annotations/dump-fn-method.stderr
+++ b/tests/ui/nll/user-annotations/dump-fn-method.stderr
diff --git a/src/test/ui/nll/user-annotations/fns.rs b/tests/ui/nll/user-annotations/fns.rs
index 38db6d1c4..38db6d1c4 100644
--- a/src/test/ui/nll/user-annotations/fns.rs
+++ b/tests/ui/nll/user-annotations/fns.rs
diff --git a/src/test/ui/nll/user-annotations/fns.stderr b/tests/ui/nll/user-annotations/fns.stderr
index e0640da39..e0640da39 100644
--- a/src/test/ui/nll/user-annotations/fns.stderr
+++ b/tests/ui/nll/user-annotations/fns.stderr
diff --git a/src/test/ui/nll/user-annotations/inherent-associated-constants.rs b/tests/ui/nll/user-annotations/inherent-associated-constants.rs
index fe2641fd6..fe2641fd6 100644
--- a/src/test/ui/nll/user-annotations/inherent-associated-constants.rs
+++ b/tests/ui/nll/user-annotations/inherent-associated-constants.rs
diff --git a/src/test/ui/nll/user-annotations/inherent-associated-constants.stderr b/tests/ui/nll/user-annotations/inherent-associated-constants.stderr
index ffbfc40f5..ffbfc40f5 100644
--- a/src/test/ui/nll/user-annotations/inherent-associated-constants.stderr
+++ b/tests/ui/nll/user-annotations/inherent-associated-constants.stderr
diff --git a/src/test/ui/nll/user-annotations/issue-54124.rs b/tests/ui/nll/user-annotations/issue-54124.rs
index 5ae03c894..5ae03c894 100644
--- a/src/test/ui/nll/user-annotations/issue-54124.rs
+++ b/tests/ui/nll/user-annotations/issue-54124.rs
diff --git a/src/test/ui/nll/user-annotations/issue-54124.stderr b/tests/ui/nll/user-annotations/issue-54124.stderr
index 2556af2dd..2556af2dd 100644
--- a/src/test/ui/nll/user-annotations/issue-54124.stderr
+++ b/tests/ui/nll/user-annotations/issue-54124.stderr
diff --git a/src/test/ui/nll/user-annotations/issue-54570-bootstrapping.rs b/tests/ui/nll/user-annotations/issue-54570-bootstrapping.rs
index ff5b2244e..ff5b2244e 100644
--- a/src/test/ui/nll/user-annotations/issue-54570-bootstrapping.rs
+++ b/tests/ui/nll/user-annotations/issue-54570-bootstrapping.rs
diff --git a/src/test/ui/nll/user-annotations/issue-55219.rs b/tests/ui/nll/user-annotations/issue-55219.rs
index 147413663..147413663 100644
--- a/src/test/ui/nll/user-annotations/issue-55219.rs
+++ b/tests/ui/nll/user-annotations/issue-55219.rs
diff --git a/src/test/ui/nll/user-annotations/issue-55241.rs b/tests/ui/nll/user-annotations/issue-55241.rs
index 29969c7b4..29969c7b4 100644
--- a/src/test/ui/nll/user-annotations/issue-55241.rs
+++ b/tests/ui/nll/user-annotations/issue-55241.rs
diff --git a/src/test/ui/nll/user-annotations/issue-55748-pat-types-constrain-bindings.rs b/tests/ui/nll/user-annotations/issue-55748-pat-types-constrain-bindings.rs
index c71937a50..c71937a50 100644
--- a/src/test/ui/nll/user-annotations/issue-55748-pat-types-constrain-bindings.rs
+++ b/tests/ui/nll/user-annotations/issue-55748-pat-types-constrain-bindings.rs
diff --git a/src/test/ui/nll/user-annotations/issue-55748-pat-types-constrain-bindings.stderr b/tests/ui/nll/user-annotations/issue-55748-pat-types-constrain-bindings.stderr
index 8399ef04e..8399ef04e 100644
--- a/src/test/ui/nll/user-annotations/issue-55748-pat-types-constrain-bindings.stderr
+++ b/tests/ui/nll/user-annotations/issue-55748-pat-types-constrain-bindings.stderr
diff --git a/src/test/ui/nll/user-annotations/issue-57731-ascibed-coupled-types.rs b/tests/ui/nll/user-annotations/issue-57731-ascibed-coupled-types.rs
index 95c655654..95c655654 100644
--- a/src/test/ui/nll/user-annotations/issue-57731-ascibed-coupled-types.rs
+++ b/tests/ui/nll/user-annotations/issue-57731-ascibed-coupled-types.rs
diff --git a/src/test/ui/nll/user-annotations/issue-57731-ascibed-coupled-types.stderr b/tests/ui/nll/user-annotations/issue-57731-ascibed-coupled-types.stderr
index 8601691e8..8601691e8 100644
--- a/src/test/ui/nll/user-annotations/issue-57731-ascibed-coupled-types.stderr
+++ b/tests/ui/nll/user-annotations/issue-57731-ascibed-coupled-types.stderr
diff --git a/src/test/ui/nll/user-annotations/method-call.rs b/tests/ui/nll/user-annotations/method-call.rs
index beafc597a..beafc597a 100644
--- a/src/test/ui/nll/user-annotations/method-call.rs
+++ b/tests/ui/nll/user-annotations/method-call.rs
diff --git a/src/test/ui/nll/user-annotations/method-call.stderr b/tests/ui/nll/user-annotations/method-call.stderr
index 10447e45a..10447e45a 100644
--- a/src/test/ui/nll/user-annotations/method-call.stderr
+++ b/tests/ui/nll/user-annotations/method-call.stderr
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-1.rs b/tests/ui/nll/user-annotations/method-ufcs-1.rs
index 950771f35..950771f35 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-1.rs
+++ b/tests/ui/nll/user-annotations/method-ufcs-1.rs
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-1.stderr b/tests/ui/nll/user-annotations/method-ufcs-1.stderr
index 962ddfd2b..962ddfd2b 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-1.stderr
+++ b/tests/ui/nll/user-annotations/method-ufcs-1.stderr
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-2.rs b/tests/ui/nll/user-annotations/method-ufcs-2.rs
index 7dc0f0c12..7dc0f0c12 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-2.rs
+++ b/tests/ui/nll/user-annotations/method-ufcs-2.rs
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-2.stderr b/tests/ui/nll/user-annotations/method-ufcs-2.stderr
index 63d59905e..63d59905e 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-2.stderr
+++ b/tests/ui/nll/user-annotations/method-ufcs-2.stderr
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-3.rs b/tests/ui/nll/user-annotations/method-ufcs-3.rs
index 59d2009d1..59d2009d1 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-3.rs
+++ b/tests/ui/nll/user-annotations/method-ufcs-3.rs
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-3.stderr b/tests/ui/nll/user-annotations/method-ufcs-3.stderr
index e7851833e..e7851833e 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-3.stderr
+++ b/tests/ui/nll/user-annotations/method-ufcs-3.stderr
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-1.rs b/tests/ui/nll/user-annotations/method-ufcs-inherent-1.rs
index 7bfed61d4..7bfed61d4 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-1.rs
+++ b/tests/ui/nll/user-annotations/method-ufcs-inherent-1.rs
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-1.stderr b/tests/ui/nll/user-annotations/method-ufcs-inherent-1.stderr
index 94861babd..94861babd 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-1.stderr
+++ b/tests/ui/nll/user-annotations/method-ufcs-inherent-1.stderr
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.rs b/tests/ui/nll/user-annotations/method-ufcs-inherent-2.rs
index cfbc0bcf6..cfbc0bcf6 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.rs
+++ b/tests/ui/nll/user-annotations/method-ufcs-inherent-2.rs
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.stderr b/tests/ui/nll/user-annotations/method-ufcs-inherent-2.stderr
index 06f20d9b2..06f20d9b2 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.stderr
+++ b/tests/ui/nll/user-annotations/method-ufcs-inherent-2.stderr
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-3.rs b/tests/ui/nll/user-annotations/method-ufcs-inherent-3.rs
index 7ddb13360..7ddb13360 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-3.rs
+++ b/tests/ui/nll/user-annotations/method-ufcs-inherent-3.rs
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-3.stderr b/tests/ui/nll/user-annotations/method-ufcs-inherent-3.stderr
index 4ad61dc81..4ad61dc81 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-3.stderr
+++ b/tests/ui/nll/user-annotations/method-ufcs-inherent-3.stderr
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.rs b/tests/ui/nll/user-annotations/method-ufcs-inherent-4.rs
index 85e759739..85e759739 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.rs
+++ b/tests/ui/nll/user-annotations/method-ufcs-inherent-4.rs
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.stderr b/tests/ui/nll/user-annotations/method-ufcs-inherent-4.stderr
index 0f83e99cd..0f83e99cd 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.stderr
+++ b/tests/ui/nll/user-annotations/method-ufcs-inherent-4.stderr
diff --git a/tests/ui/nll/user-annotations/normalization-2.rs b/tests/ui/nll/user-annotations/normalization-2.rs
new file mode 100644
index 000000000..be23c3b74
--- /dev/null
+++ b/tests/ui/nll/user-annotations/normalization-2.rs
@@ -0,0 +1,152 @@
+// Make sure we honor region constraints when normalizing type annotations.
+
+// check-fail
+
+#![feature(more_qualified_paths)]
+
+trait Trait {
+    type Assoc;
+}
+
+impl<T> Trait for T
+where
+    T: 'static,
+{
+    type Assoc = MyTy<()>;
+}
+
+enum MyTy<T> {
+    Unit,
+    Tuple(),
+    Struct {},
+    Dumb(T),
+}
+
+impl<T> MyTy<T> {
+    const CONST: () = ();
+    fn method<X>() {}
+    fn method2<X>(&self) {}
+}
+
+trait TraitAssoc {
+    const TRAIT_CONST: ();
+    fn trait_method<X>(&self);
+}
+impl<T> TraitAssoc for T {
+    const TRAIT_CONST: () = ();
+    fn trait_method<X>(&self) {}
+}
+
+type Ty<'a> = <&'a () as Trait>::Assoc;
+
+fn test_local<'a>() {
+    let _: Ty<'a> = MyTy::Unit;
+    //~^ ERROR lifetime may not live long enough
+}
+
+fn test_closure_sig<'a, 'b>() {
+    |_: Ty<'a>| {};
+    //~^ ERROR lifetime may not live long enough
+    || -> Option<Ty<'b>> { None };
+    //~^ ERROR lifetime may not live long enough
+}
+
+fn test_path<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h>() {
+    <Ty<'a>>::method::<Ty<'static>>;
+    //~^ ERROR lifetime may not live long enough
+    <Ty<'static>>::method::<Ty<'b>>;
+    //~^ ERROR lifetime may not live long enough
+
+    <Ty<'c>>::trait_method::<Ty<'static>>;
+    //~^ ERROR lifetime may not live long enough
+    <Ty<'static>>::trait_method::<Ty<'d>>;
+    //~^ ERROR lifetime may not live long enough
+
+    <Ty<'e>>::CONST;
+    //~^ ERROR lifetime may not live long enough
+    <Ty<'f>>::TRAIT_CONST;
+    //~^ ERROR lifetime may not live long enough
+
+    <Ty<'static>>::method::<Ty<'static>>;
+    <Ty<'static>>::trait_method::<Ty<'static>>;
+    <Ty<'static>>::CONST;
+    <Ty<'static>>::TRAIT_CONST;
+
+    MyTy::Unit::<Ty<'g>>;
+    //~^ ERROR lifetime may not live long enough
+    MyTy::<Ty<'h>>::Unit;
+    //~^ ERROR lifetime may not live long enough
+}
+
+fn test_call<'a, 'b, 'c>() {
+    <Ty<'a>>::method::<Ty<'static>>();
+    //~^ ERROR lifetime may not live long enough
+    <Ty<'static>>::method::<Ty<'b>>();
+    //~^ ERROR lifetime may not live long enough
+}
+
+fn test_variants<'a, 'b, 'c>() {
+    <Ty<'a>>::Struct {};
+    //~^ ERROR lifetime may not live long enough
+    <Ty<'b>>::Tuple();
+    //~^ ERROR lifetime may not live long enough
+    <Ty<'c>>::Unit;
+    //~^ ERROR lifetime may not live long enough
+}
+
+fn test_method_call<'a, 'b>(x: MyTy<()>) {
+    x.method2::<Ty<'a>>();
+    //~^ ERROR lifetime may not live long enough
+    x.trait_method::<Ty<'b>>();
+    //~^ ERROR lifetime may not live long enough
+}
+
+fn test_struct_path<'a, 'b, 'c, 'd>() {
+    struct Struct<T> { x: Option<T>, }
+
+    trait Project {
+        type Struct;
+        type Enum;
+    }
+    impl<T> Project for T {
+        type Struct = Struct<()>;
+        type Enum = MyTy<()>;
+    }
+
+    // Resolves to enum variant
+    MyTy::<Ty<'a>>::Struct {}; // without SelfTy
+    //~^ ERROR lifetime may not live long enough
+    <Ty<'b> as Project>::Enum::Struct {}; // with SelfTy
+    //~^ ERROR lifetime may not live long enough
+
+    // Resolves to struct and associated type respectively
+    Struct::<Ty<'c>> { x: None, }; // without SelfTy
+    //~^ ERROR lifetime may not live long enough
+    <Ty<'d> as Project>::Struct { x: None, }; // with SelfTy
+    //~^ ERROR lifetime may not live long enough
+}
+
+fn test_pattern<'a, 'b, 'c, 'd, 'e, 'f>() {
+    use MyTy::*;
+    match MyTy::Unit {
+        Struct::<Ty<'a>> {..} => {},
+        //~^ ERROR lifetime may not live long enough
+        Tuple::<Ty<'b>> (..) => {},
+        //~^ ERROR lifetime may not live long enough
+        Unit::<Ty<'c>> => {},
+        //~^ ERROR lifetime may not live long enough
+        Dumb(_) => {},
+    };
+    match MyTy::Unit {
+        <Ty<'d>>::Struct {..} => {},
+        //~^ ERROR lifetime may not live long enough
+        <Ty<'e>>::Tuple (..) => {},
+        //~^ ERROR lifetime may not live long enough
+        <Ty<'f>>::Unit => {},
+        //~^ ERROR lifetime may not live long enough
+        Dumb(_) => {},
+    };
+}
+
+
+fn main() {}
diff --git a/tests/ui/nll/user-annotations/normalization-2.stderr b/tests/ui/nll/user-annotations/normalization-2.stderr
new file mode 100644
index 000000000..5299282ea
--- /dev/null
+++ b/tests/ui/nll/user-annotations/normalization-2.stderr
@@ -0,0 +1,296 @@
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:43:12
+   |
+LL | fn test_local<'a>() {
+   |               -- lifetime `'a` defined here
+LL |     let _: Ty<'a> = MyTy::Unit;
+   |            ^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:48:6
+   |
+LL | fn test_closure_sig<'a, 'b>() {
+   |                     -- lifetime `'a` defined here
+LL |     |_: Ty<'a>| {};
+   |      ^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:50:11
+   |
+LL | fn test_closure_sig<'a, 'b>() {
+   |                         -- lifetime `'b` defined here
+...
+LL |     || -> Option<Ty<'b>> { None };
+   |           ^^^^^^^^^^^^^^ requires that `'b` must outlive `'static`
+
+help: the following changes may resolve your lifetime errors
+   |
+   = help: replace `'a` with `'static`
+   = help: replace `'b` with `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:55:5
+   |
+LL | fn test_path<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h>() {
+   |              -- lifetime `'a` defined here
+LL |     <Ty<'a>>::method::<Ty<'static>>;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:57:5
+   |
+LL | fn test_path<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h>() {
+   |                  -- lifetime `'b` defined here
+...
+LL |     <Ty<'static>>::method::<Ty<'b>>;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'b` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:60:5
+   |
+LL | fn test_path<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h>() {
+   |                      -- lifetime `'c` defined here
+...
+LL |     <Ty<'c>>::trait_method::<Ty<'static>>;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'c` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:62:5
+   |
+LL | fn test_path<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h>() {
+   |                          -- lifetime `'d` defined here
+...
+LL |     <Ty<'static>>::trait_method::<Ty<'d>>;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'d` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:65:5
+   |
+LL | fn test_path<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h>() {
+   |                              -- lifetime `'e` defined here
+...
+LL |     <Ty<'e>>::CONST;
+   |     ^^^^^^^^^^^^^^^ requires that `'e` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:67:5
+   |
+LL | fn test_path<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h>() {
+   |                                  -- lifetime `'f` defined here
+...
+LL |     <Ty<'f>>::TRAIT_CONST;
+   |     ^^^^^^^^^^^^^^^^^^^^^ requires that `'f` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:75:5
+   |
+LL | fn test_path<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h>() {
+   |                                      -- lifetime `'g` defined here
+...
+LL |     MyTy::Unit::<Ty<'g>>;
+   |     ^^^^^^^^^^^^^^^^^^^^ requires that `'g` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:77:5
+   |
+LL | fn test_path<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h>() {
+   |                                          -- lifetime `'h` defined here
+...
+LL |     MyTy::<Ty<'h>>::Unit;
+   |     ^^^^^^^^^^^^^^^^^^^^ requires that `'h` must outlive `'static`
+
+help: the following changes may resolve your lifetime errors
+   |
+   = help: replace `'a` with `'static`
+   = help: replace `'b` with `'static`
+   = help: replace `'c` with `'static`
+   = help: replace `'d` with `'static`
+   = help: replace `'e` with `'static`
+   = help: replace `'f` with `'static`
+   = help: replace `'g` with `'static`
+   = help: replace `'h` with `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:82:5
+   |
+LL | fn test_call<'a, 'b, 'c>() {
+   |              -- lifetime `'a` defined here
+LL |     <Ty<'a>>::method::<Ty<'static>>();
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:84:5
+   |
+LL | fn test_call<'a, 'b, 'c>() {
+   |                  -- lifetime `'b` defined here
+...
+LL |     <Ty<'static>>::method::<Ty<'b>>();
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'b` must outlive `'static`
+
+help: the following changes may resolve your lifetime errors
+   |
+   = help: replace `'a` with `'static`
+   = help: replace `'b` with `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:89:5
+   |
+LL | fn test_variants<'a, 'b, 'c>() {
+   |                  -- lifetime `'a` defined here
+LL |     <Ty<'a>>::Struct {};
+   |     ^^^^^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:91:5
+   |
+LL | fn test_variants<'a, 'b, 'c>() {
+   |                      -- lifetime `'b` defined here
+...
+LL |     <Ty<'b>>::Tuple();
+   |     ^^^^^^^^^^^^^^^ requires that `'b` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:93:5
+   |
+LL | fn test_variants<'a, 'b, 'c>() {
+   |                          -- lifetime `'c` defined here
+...
+LL |     <Ty<'c>>::Unit;
+   |     ^^^^^^^^^^^^^^ requires that `'c` must outlive `'static`
+
+help: the following changes may resolve your lifetime errors
+   |
+   = help: replace `'a` with `'static`
+   = help: replace `'b` with `'static`
+   = help: replace `'c` with `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:98:7
+   |
+LL | fn test_method_call<'a, 'b>(x: MyTy<()>) {
+   |                     -- lifetime `'a` defined here
+LL |     x.method2::<Ty<'a>>();
+   |       ^^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:100:7
+   |
+LL | fn test_method_call<'a, 'b>(x: MyTy<()>) {
+   |                         -- lifetime `'b` defined here
+...
+LL |     x.trait_method::<Ty<'b>>();
+   |       ^^^^^^^^^^^^ requires that `'b` must outlive `'static`
+
+help: the following changes may resolve your lifetime errors
+   |
+   = help: replace `'a` with `'static`
+   = help: replace `'b` with `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:117:5
+   |
+LL | fn test_struct_path<'a, 'b, 'c, 'd>() {
+   |                     -- lifetime `'a` defined here
+...
+LL |     MyTy::<Ty<'a>>::Struct {}; // without SelfTy
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:119:5
+   |
+LL | fn test_struct_path<'a, 'b, 'c, 'd>() {
+   |                         -- lifetime `'b` defined here
+...
+LL |     <Ty<'b> as Project>::Enum::Struct {}; // with SelfTy
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'b` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:123:5
+   |
+LL | fn test_struct_path<'a, 'b, 'c, 'd>() {
+   |                             -- lifetime `'c` defined here
+...
+LL |     Struct::<Ty<'c>> { x: None, }; // without SelfTy
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'c` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:125:5
+   |
+LL | fn test_struct_path<'a, 'b, 'c, 'd>() {
+   |                                 -- lifetime `'d` defined here
+...
+LL |     <Ty<'d> as Project>::Struct { x: None, }; // with SelfTy
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'d` must outlive `'static`
+
+help: the following changes may resolve your lifetime errors
+   |
+   = help: replace `'a` with `'static`
+   = help: replace `'b` with `'static`
+   = help: replace `'c` with `'static`
+   = help: replace `'d` with `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:132:9
+   |
+LL | fn test_pattern<'a, 'b, 'c, 'd, 'e, 'f>() {
+   |                 -- lifetime `'a` defined here
+...
+LL |         Struct::<Ty<'a>> {..} => {},
+   |         ^^^^^^^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:134:9
+   |
+LL | fn test_pattern<'a, 'b, 'c, 'd, 'e, 'f>() {
+   |                     -- lifetime `'b` defined here
+...
+LL |         Tuple::<Ty<'b>> (..) => {},
+   |         ^^^^^^^^^^^^^^^^^^^^ requires that `'b` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:136:9
+   |
+LL | fn test_pattern<'a, 'b, 'c, 'd, 'e, 'f>() {
+   |                         -- lifetime `'c` defined here
+...
+LL |         Unit::<Ty<'c>> => {},
+   |         ^^^^^^^^^^^^^^ requires that `'c` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:141:9
+   |
+LL | fn test_pattern<'a, 'b, 'c, 'd, 'e, 'f>() {
+   |                             -- lifetime `'d` defined here
+...
+LL |         <Ty<'d>>::Struct {..} => {},
+   |         ^^^^^^^^^^^^^^^^^^^^^ requires that `'d` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:143:9
+   |
+LL | fn test_pattern<'a, 'b, 'c, 'd, 'e, 'f>() {
+   |                                 -- lifetime `'e` defined here
+...
+LL |         <Ty<'e>>::Tuple (..) => {},
+   |         ^^^^^^^^^^^^^^^^^^^^ requires that `'e` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-2.rs:145:9
+   |
+LL | fn test_pattern<'a, 'b, 'c, 'd, 'e, 'f>() {
+   |                                     -- lifetime `'f` defined here
+...
+LL |         <Ty<'f>>::Unit => {},
+   |         ^^^^^^^^^^^^^^ requires that `'f` must outlive `'static`
+
+help: the following changes may resolve your lifetime errors
+   |
+   = help: replace `'a` with `'static`
+   = help: replace `'b` with `'static`
+   = help: replace `'c` with `'static`
+   = help: replace `'d` with `'static`
+   = help: replace `'e` with `'static`
+   = help: replace `'f` with `'static`
+
+error: aborting due to 28 previous errors
+
diff --git a/tests/ui/nll/user-annotations/normalization-default.rs b/tests/ui/nll/user-annotations/normalization-default.rs
new file mode 100644
index 000000000..fa52e6d85
--- /dev/null
+++ b/tests/ui/nll/user-annotations/normalization-default.rs
@@ -0,0 +1,22 @@
+// check-fail
+
+trait Trait { type Assoc; }
+impl<'a> Trait for &'a () { type Assoc = &'a (); }
+
+struct MyTuple<T, U = <&'static () as Trait>::Assoc>(T, U);
+fn test_tuple(x: &(), y: &()) {
+    MyTuple::<_>((), x);
+    //~^ ERROR
+    let _: MyTuple::<_> = MyTuple((), y);
+    //~^ ERROR
+}
+
+struct MyStruct<T, U = <&'static () as Trait>::Assoc> { val: (T, U), }
+fn test_struct(x: &(), y: &()) {
+    MyStruct::<_> { val: ((), x) };
+    //~^ ERROR
+    let _: MyStruct::<_> = MyStruct { val: ((), y) };
+    //~^ ERROR
+}
+
+fn main() {}
diff --git a/tests/ui/nll/user-annotations/normalization-default.stderr b/tests/ui/nll/user-annotations/normalization-default.stderr
new file mode 100644
index 000000000..6c73ac692
--- /dev/null
+++ b/tests/ui/nll/user-annotations/normalization-default.stderr
@@ -0,0 +1,36 @@
+error: lifetime may not live long enough
+  --> $DIR/normalization-default.rs:8:22
+   |
+LL | fn test_tuple(x: &(), y: &()) {
+   |                  - let's call the lifetime of this reference `'1`
+LL |     MyTuple::<_>((), x);
+   |                      ^ this usage requires that `'1` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-default.rs:10:12
+   |
+LL | fn test_tuple(x: &(), y: &()) {
+   |                          - let's call the lifetime of this reference `'2`
+...
+LL |     let _: MyTuple::<_> = MyTuple((), y);
+   |            ^^^^^^^^^^^^ type annotation requires that `'2` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-default.rs:16:26
+   |
+LL | fn test_struct(x: &(), y: &()) {
+   |                   - let's call the lifetime of this reference `'1`
+LL |     MyStruct::<_> { val: ((), x) };
+   |                          ^^^^^^^ this usage requires that `'1` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-default.rs:18:12
+   |
+LL | fn test_struct(x: &(), y: &()) {
+   |                           - let's call the lifetime of this reference `'2`
+...
+LL |     let _: MyStruct::<_> = MyStruct { val: ((), y) };
+   |            ^^^^^^^^^^^^^ type annotation requires that `'2` must outlive `'static`
+
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/nll/user-annotations/normalization-infer.rs b/tests/ui/nll/user-annotations/normalization-infer.rs
new file mode 100644
index 000000000..8bfc272d4
--- /dev/null
+++ b/tests/ui/nll/user-annotations/normalization-infer.rs
@@ -0,0 +1,40 @@
+// Annnotations may contain projection types with inference variables as input.
+// Make sure we don't get ambiguities when normalizing them.
+
+// check-fail
+
+// Single impl.
+fn test1<A, B, C, D>(a: A, b: B, c: C) {
+    trait Tr { type Ty; }
+    impl<T: 'static> Tr for (T,) { type Ty = T; }
+
+    let _: <(_,) as Tr>::Ty = a; //~ ERROR type `A`
+    Some::<<(_,) as Tr>::Ty>(b); //~ ERROR type `B`
+    || -> <(_,) as Tr>::Ty { c }; //~ ERROR type `C`
+    |d: <(_,) as Tr>::Ty| -> D { d }; //~ ERROR type `D`
+}
+
+
+// Two impls. The selected impl depends on the actual type.
+fn test2<A, B, C>(a: A, b: B, c: C) {
+    trait Tr { type Ty; }
+    impl<T: 'static> Tr for (u8, T) { type Ty = T; }
+    impl<T>          Tr for (i8, T) { type Ty = T; }
+    type Alias<X, Y> = (<(X, Y) as Tr>::Ty, X);
+
+    fn temp() -> String { todo!() }
+
+    // `u8` impl, requires static.
+    let _: Alias<_, _> = (a, 0u8); //~ ERROR type `A`
+    Some::<Alias<_, _>>((b, 0u8)); //~ ERROR type `B`
+    || -> Alias<_, _> { (c, 0u8) }; //~ ERROR type `C`
+
+    let _: Alias<_, _> = (&temp(), 0u8); //~ ERROR temporary value
+    Some::<Alias<_, _>>((&temp(), 0u8)); //~ ERROR temporary value
+
+    // `i8` impl, no region constraints.
+    let _: Alias<_, _> = (&temp(), 0i8);
+    Some::<Alias<_, _>>((&temp(), 0i8));
+}
+
+fn main() {}
diff --git a/tests/ui/nll/user-annotations/normalization-infer.stderr b/tests/ui/nll/user-annotations/normalization-infer.stderr
new file mode 100644
index 000000000..12854ab68
--- /dev/null
+++ b/tests/ui/nll/user-annotations/normalization-infer.stderr
@@ -0,0 +1,101 @@
+error[E0310]: the parameter type `A` may not live long enough
+  --> $DIR/normalization-infer.rs:11:12
+   |
+LL |     let _: <(_,) as Tr>::Ty = a;
+   |            ^^^^^^^^^^^^^^^^ ...so that the type `A` will meet its required lifetime bounds
+   |
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn test1<A: 'static, B, C, D>(a: A, b: B, c: C) {
+   |           +++++++++
+
+error[E0310]: the parameter type `B` may not live long enough
+  --> $DIR/normalization-infer.rs:12:5
+   |
+LL |     Some::<<(_,) as Tr>::Ty>(b);
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `B` will meet its required lifetime bounds
+   |
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn test1<A, B: 'static, C, D>(a: A, b: B, c: C) {
+   |              +++++++++
+
+error[E0310]: the parameter type `C` may not live long enough
+  --> $DIR/normalization-infer.rs:13:11
+   |
+LL |     || -> <(_,) as Tr>::Ty { c };
+   |           ^^^^^^^^^^^^^^^^ ...so that the type `C` will meet its required lifetime bounds
+   |
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn test1<A, B, C: 'static, D>(a: A, b: B, c: C) {
+   |                 +++++++++
+
+error[E0310]: the parameter type `D` may not live long enough
+  --> $DIR/normalization-infer.rs:14:6
+   |
+LL |     |d: <(_,) as Tr>::Ty| -> D { d };
+   |      ^ ...so that the type `D` will meet its required lifetime bounds
+   |
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn test1<A, B, C, D: 'static>(a: A, b: B, c: C) {
+   |                    +++++++++
+
+error[E0310]: the parameter type `A` may not live long enough
+  --> $DIR/normalization-infer.rs:28:12
+   |
+LL |     let _: Alias<_, _> = (a, 0u8);
+   |            ^^^^^^^^^^^ ...so that the type `A` will meet its required lifetime bounds
+   |
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn test2<A: 'static, B, C>(a: A, b: B, c: C) {
+   |           +++++++++
+
+error[E0310]: the parameter type `B` may not live long enough
+  --> $DIR/normalization-infer.rs:29:5
+   |
+LL |     Some::<Alias<_, _>>((b, 0u8));
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `B` will meet its required lifetime bounds
+   |
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn test2<A, B: 'static, C>(a: A, b: B, c: C) {
+   |              +++++++++
+
+error[E0310]: the parameter type `C` may not live long enough
+  --> $DIR/normalization-infer.rs:30:11
+   |
+LL |     || -> Alias<_, _> { (c, 0u8) };
+   |           ^^^^^^^^^^^ ...so that the type `C` will meet its required lifetime bounds
+   |
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn test2<A, B, C: 'static>(a: A, b: B, c: C) {
+   |                 +++++++++
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/normalization-infer.rs:32:28
+   |
+LL |     let _: Alias<_, _> = (&temp(), 0u8);
+   |            -----------     ^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | }
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/normalization-infer.rs:33:27
+   |
+LL |     Some::<Alias<_, _>>((&temp(), 0u8));
+   |                         --^^^^^^------ - temporary value is freed at the end of this statement
+   |                         | |
+   |                         | creates a temporary value which is freed while still in use
+   |                         this usage requires that borrow lasts for `'static`
+
+error: aborting due to 9 previous errors
+
+Some errors have detailed explanations: E0310, E0716.
+For more information about an error, try `rustc --explain E0310`.
diff --git a/tests/ui/nll/user-annotations/normalization-self.rs b/tests/ui/nll/user-annotations/normalization-self.rs
new file mode 100644
index 000000000..c18760b53
--- /dev/null
+++ b/tests/ui/nll/user-annotations/normalization-self.rs
@@ -0,0 +1,26 @@
+// check-fail
+
+trait Trait { type Assoc; }
+impl<'a> Trait for &'a () { type Assoc = &'a (); }
+
+struct MyTuple<T>(T);
+impl MyTuple<<&'static () as Trait>::Assoc> {
+    fn test(x: &(), y: &()) {
+        Self(x);
+        //~^ ERROR
+        let _: Self = MyTuple(y);
+        //~^ ERROR
+    }
+}
+
+struct MyStruct<T> { val: T, }
+impl MyStruct<<&'static () as Trait>::Assoc> {
+    fn test(x: &(), y: &()) {
+        Self { val: x };
+        //~^ ERROR
+        let _: Self = MyStruct { val: y };
+        //~^ ERROR
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/nll/user-annotations/normalization-self.stderr b/tests/ui/nll/user-annotations/normalization-self.stderr
new file mode 100644
index 000000000..e231ed03c
--- /dev/null
+++ b/tests/ui/nll/user-annotations/normalization-self.stderr
@@ -0,0 +1,36 @@
+error: lifetime may not live long enough
+  --> $DIR/normalization-self.rs:9:14
+   |
+LL |     fn test(x: &(), y: &()) {
+   |                - let's call the lifetime of this reference `'1`
+LL |         Self(x);
+   |              ^ this usage requires that `'1` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-self.rs:11:16
+   |
+LL |     fn test(x: &(), y: &()) {
+   |                        - let's call the lifetime of this reference `'2`
+...
+LL |         let _: Self = MyTuple(y);
+   |                ^^^^ type annotation requires that `'2` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-self.rs:19:21
+   |
+LL |     fn test(x: &(), y: &()) {
+   |                - let's call the lifetime of this reference `'1`
+LL |         Self { val: x };
+   |                     ^ this usage requires that `'1` must outlive `'static`
+
+error: lifetime may not live long enough
+  --> $DIR/normalization-self.rs:21:16
+   |
+LL |     fn test(x: &(), y: &()) {
+   |                        - let's call the lifetime of this reference `'2`
+...
+LL |         let _: Self = MyStruct { val: y };
+   |                ^^^^ type annotation requires that `'2` must outlive `'static`
+
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/nll/user-annotations/normalization.rs b/tests/ui/nll/user-annotations/normalization.rs
new file mode 100644
index 000000000..c2e892f57
--- /dev/null
+++ b/tests/ui/nll/user-annotations/normalization.rs
@@ -0,0 +1,17 @@
+// Test that we enforce a `&'static` requirement that is only visible
+// after normalization.
+
+trait Foo { type Out; }
+impl Foo for () { type Out = &'static u32; }
+impl<'a> Foo for &'a () { type Out = &'a u32; }
+
+fn main() {
+    let a = 22;
+    let _: <() as Foo>::Out = &a; //~ ERROR
+
+    let a = 22;
+    let _: <&'static () as Foo>::Out = &a; //~ ERROR
+
+    let a = 22;
+    let _: <&'_ () as Foo>::Out = &a;
+}
diff --git a/tests/ui/nll/user-annotations/normalization.stderr b/tests/ui/nll/user-annotations/normalization.stderr
new file mode 100644
index 000000000..975cb4b66
--- /dev/null
+++ b/tests/ui/nll/user-annotations/normalization.stderr
@@ -0,0 +1,25 @@
+error[E0597]: `a` does not live long enough
+  --> $DIR/normalization.rs:10:31
+   |
+LL |     let _: <() as Foo>::Out = &a;
+   |            ----------------   ^^ borrowed value does not live long enough
+   |            |
+   |            type annotation requires that `a` is borrowed for `'static`
+...
+LL | }
+   | - `a` dropped here while still borrowed
+
+error[E0597]: `a` does not live long enough
+  --> $DIR/normalization.rs:13:40
+   |
+LL |     let _: <&'static () as Foo>::Out = &a;
+   |            -------------------------   ^^ borrowed value does not live long enough
+   |            |
+   |            type annotation requires that `a` is borrowed for `'static`
+...
+LL | }
+   | - `a` dropped here while still borrowed
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/nll/user-annotations/normalize-self-ty.rs b/tests/ui/nll/user-annotations/normalize-self-ty.rs
index df905c878..df905c878 100644
--- a/src/test/ui/nll/user-annotations/normalize-self-ty.rs
+++ b/tests/ui/nll/user-annotations/normalize-self-ty.rs
diff --git a/src/test/ui/nll/user-annotations/pattern_substs_on_brace_enum_variant.rs b/tests/ui/nll/user-annotations/pattern_substs_on_brace_enum_variant.rs
index 59cd69c0c..59cd69c0c 100644
--- a/src/test/ui/nll/user-annotations/pattern_substs_on_brace_enum_variant.rs
+++ b/tests/ui/nll/user-annotations/pattern_substs_on_brace_enum_variant.rs
diff --git a/src/test/ui/nll/user-annotations/pattern_substs_on_brace_enum_variant.stderr b/tests/ui/nll/user-annotations/pattern_substs_on_brace_enum_variant.stderr
index a97e7a9fd..a97e7a9fd 100644
--- a/src/test/ui/nll/user-annotations/pattern_substs_on_brace_enum_variant.stderr
+++ b/tests/ui/nll/user-annotations/pattern_substs_on_brace_enum_variant.stderr
diff --git a/src/test/ui/nll/user-annotations/pattern_substs_on_brace_struct.rs b/tests/ui/nll/user-annotations/pattern_substs_on_brace_struct.rs
index 1586c4ea3..1586c4ea3 100644
--- a/src/test/ui/nll/user-annotations/pattern_substs_on_brace_struct.rs
+++ b/tests/ui/nll/user-annotations/pattern_substs_on_brace_struct.rs
diff --git a/src/test/ui/nll/user-annotations/pattern_substs_on_brace_struct.stderr b/tests/ui/nll/user-annotations/pattern_substs_on_brace_struct.stderr
index 408d7c2a5..408d7c2a5 100644
--- a/src/test/ui/nll/user-annotations/pattern_substs_on_brace_struct.stderr
+++ b/tests/ui/nll/user-annotations/pattern_substs_on_brace_struct.stderr
diff --git a/src/test/ui/nll/user-annotations/pattern_substs_on_tuple_enum_variant.rs b/tests/ui/nll/user-annotations/pattern_substs_on_tuple_enum_variant.rs
index 6fa59fdd8..6fa59fdd8 100644
--- a/src/test/ui/nll/user-annotations/pattern_substs_on_tuple_enum_variant.rs
+++ b/tests/ui/nll/user-annotations/pattern_substs_on_tuple_enum_variant.rs
diff --git a/src/test/ui/nll/user-annotations/pattern_substs_on_tuple_enum_variant.stderr b/tests/ui/nll/user-annotations/pattern_substs_on_tuple_enum_variant.stderr
index 920c906f6..920c906f6 100644
--- a/src/test/ui/nll/user-annotations/pattern_substs_on_tuple_enum_variant.stderr
+++ b/tests/ui/nll/user-annotations/pattern_substs_on_tuple_enum_variant.stderr
diff --git a/src/test/ui/nll/user-annotations/pattern_substs_on_tuple_struct.rs b/tests/ui/nll/user-annotations/pattern_substs_on_tuple_struct.rs
index 7486aab0e..7486aab0e 100644
--- a/src/test/ui/nll/user-annotations/pattern_substs_on_tuple_struct.rs
+++ b/tests/ui/nll/user-annotations/pattern_substs_on_tuple_struct.rs
diff --git a/src/test/ui/nll/user-annotations/pattern_substs_on_tuple_struct.stderr b/tests/ui/nll/user-annotations/pattern_substs_on_tuple_struct.stderr
index 3f01638d8..3f01638d8 100644
--- a/src/test/ui/nll/user-annotations/pattern_substs_on_tuple_struct.stderr
+++ b/tests/ui/nll/user-annotations/pattern_substs_on_tuple_struct.stderr
diff --git a/src/test/ui/nll/user-annotations/patterns.rs b/tests/ui/nll/user-annotations/patterns.rs
index 1f635d7f5..1f635d7f5 100644
--- a/src/test/ui/nll/user-annotations/patterns.rs
+++ b/tests/ui/nll/user-annotations/patterns.rs
diff --git a/src/test/ui/nll/user-annotations/patterns.stderr b/tests/ui/nll/user-annotations/patterns.stderr
index de6f8f80f..de6f8f80f 100644
--- a/src/test/ui/nll/user-annotations/patterns.stderr
+++ b/tests/ui/nll/user-annotations/patterns.stderr
diff --git a/src/test/ui/nll/user-annotations/promoted-annotation.rs b/tests/ui/nll/user-annotations/promoted-annotation.rs
index b92f8bfd2..b92f8bfd2 100644
--- a/src/test/ui/nll/user-annotations/promoted-annotation.rs
+++ b/tests/ui/nll/user-annotations/promoted-annotation.rs
diff --git a/src/test/ui/nll/user-annotations/promoted-annotation.stderr b/tests/ui/nll/user-annotations/promoted-annotation.stderr
index cb99a6a36..cb99a6a36 100644
--- a/src/test/ui/nll/user-annotations/promoted-annotation.stderr
+++ b/tests/ui/nll/user-annotations/promoted-annotation.stderr
diff --git a/src/test/ui/nll/user-annotations/type-annotation-with-hrtb.rs b/tests/ui/nll/user-annotations/type-annotation-with-hrtb.rs
index 1f7c06038..1f7c06038 100644
--- a/src/test/ui/nll/user-annotations/type-annotation-with-hrtb.rs
+++ b/tests/ui/nll/user-annotations/type-annotation-with-hrtb.rs
diff --git a/src/test/ui/nll/user-annotations/type_ascription_static_lifetime.rs b/tests/ui/nll/user-annotations/type_ascription_static_lifetime.rs
index 88d646dee..88d646dee 100644
--- a/src/test/ui/nll/user-annotations/type_ascription_static_lifetime.rs
+++ b/tests/ui/nll/user-annotations/type_ascription_static_lifetime.rs
diff --git a/src/test/ui/nll/user-annotations/type_ascription_static_lifetime.stderr b/tests/ui/nll/user-annotations/type_ascription_static_lifetime.stderr
index ccbf3c1d9..ccbf3c1d9 100644
--- a/src/test/ui/nll/user-annotations/type_ascription_static_lifetime.stderr
+++ b/tests/ui/nll/user-annotations/type_ascription_static_lifetime.stderr
diff --git a/src/test/ui/nll/user-annotations/wf-self-type.rs b/tests/ui/nll/user-annotations/wf-self-type.rs
index 539226aab..539226aab 100644
--- a/src/test/ui/nll/user-annotations/wf-self-type.rs
+++ b/tests/ui/nll/user-annotations/wf-self-type.rs
diff --git a/src/test/ui/nll/user-annotations/wf-self-type.stderr b/tests/ui/nll/user-annotations/wf-self-type.stderr
index 1d3ae7cfb..1d3ae7cfb 100644
--- a/src/test/ui/nll/user-annotations/wf-self-type.stderr
+++ b/tests/ui/nll/user-annotations/wf-self-type.stderr
diff --git a/src/test/ui/nll/vimwiki-core-regression.rs b/tests/ui/nll/vimwiki-core-regression.rs
index 0a4ed7e0a..0a4ed7e0a 100644
--- a/src/test/ui/nll/vimwiki-core-regression.rs
+++ b/tests/ui/nll/vimwiki-core-regression.rs
diff --git a/src/test/ui/nll/where_clauses_in_functions.rs b/tests/ui/nll/where_clauses_in_functions.rs
index 826065d02..826065d02 100644
--- a/src/test/ui/nll/where_clauses_in_functions.rs
+++ b/tests/ui/nll/where_clauses_in_functions.rs
diff --git a/src/test/ui/nll/where_clauses_in_functions.stderr b/tests/ui/nll/where_clauses_in_functions.stderr
index afb25e3bc..afb25e3bc 100644
--- a/src/test/ui/nll/where_clauses_in_functions.stderr
+++ b/tests/ui/nll/where_clauses_in_functions.stderr
diff --git a/src/test/ui/nll/where_clauses_in_structs.rs b/tests/ui/nll/where_clauses_in_structs.rs
index fae5d3811..fae5d3811 100644
--- a/src/test/ui/nll/where_clauses_in_structs.rs
+++ b/tests/ui/nll/where_clauses_in_structs.rs
diff --git a/src/test/ui/nll/where_clauses_in_structs.stderr b/tests/ui/nll/where_clauses_in_structs.stderr
index c46cfcb41..c46cfcb41 100644
--- a/src/test/ui/nll/where_clauses_in_structs.stderr
+++ b/tests/ui/nll/where_clauses_in_structs.stderr
diff --git a/src/test/ui/no-capture-arc.rs b/tests/ui/no-capture-arc.rs
index 3f0b07577..3f0b07577 100644
--- a/src/test/ui/no-capture-arc.rs
+++ b/tests/ui/no-capture-arc.rs
diff --git a/src/test/ui/no-capture-arc.stderr b/tests/ui/no-capture-arc.stderr
index 9ae41e78c..296e1fb3f 100644
--- a/src/test/ui/no-capture-arc.stderr
+++ b/tests/ui/no-capture-arc.stderr
@@ -13,11 +13,6 @@ LL |     assert_eq!((*arc_v)[2], 3);
    |                ^^^^^^^^ value borrowed here after move
    |
    = note: borrow occurs due to deref coercion to `Vec<i32>`
-note: deref defined here
-  --> $SRC_DIR/alloc/src/sync.rs:LL:COL
-   |
-LL |     type Target = T;
-   |     ^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/no-core-1.rs b/tests/ui/no-core-1.rs
index 9374f546a..9374f546a 100644
--- a/src/test/ui/no-core-1.rs
+++ b/tests/ui/no-core-1.rs
diff --git a/src/test/ui/no-core-2.rs b/tests/ui/no-core-2.rs
index b08e63dc7..b08e63dc7 100644
--- a/src/test/ui/no-core-2.rs
+++ b/tests/ui/no-core-2.rs
diff --git a/src/test/ui/no-link-unknown-crate.rs b/tests/ui/no-link-unknown-crate.rs
index c7da2e418..c7da2e418 100644
--- a/src/test/ui/no-link-unknown-crate.rs
+++ b/tests/ui/no-link-unknown-crate.rs
diff --git a/src/test/ui/no-link-unknown-crate.stderr b/tests/ui/no-link-unknown-crate.stderr
index 068c7139e..068c7139e 100644
--- a/src/test/ui/no-link-unknown-crate.stderr
+++ b/tests/ui/no-link-unknown-crate.stderr
diff --git a/src/test/ui/no-patterns-in-args-2.rs b/tests/ui/no-patterns-in-args-2.rs
index 85b7fc5cd..85b7fc5cd 100644
--- a/src/test/ui/no-patterns-in-args-2.rs
+++ b/tests/ui/no-patterns-in-args-2.rs
diff --git a/src/test/ui/no-patterns-in-args-2.stderr b/tests/ui/no-patterns-in-args-2.stderr
index 6adcbb9dc..6adcbb9dc 100644
--- a/src/test/ui/no-patterns-in-args-2.stderr
+++ b/tests/ui/no-patterns-in-args-2.stderr
diff --git a/src/test/ui/no-patterns-in-args-macro.rs b/tests/ui/no-patterns-in-args-macro.rs
index b5109f9c2..b5109f9c2 100644
--- a/src/test/ui/no-patterns-in-args-macro.rs
+++ b/tests/ui/no-patterns-in-args-macro.rs
diff --git a/src/test/ui/no-patterns-in-args-macro.stderr b/tests/ui/no-patterns-in-args-macro.stderr
index 0016c7953..0016c7953 100644
--- a/src/test/ui/no-patterns-in-args-macro.stderr
+++ b/tests/ui/no-patterns-in-args-macro.stderr
diff --git a/src/test/ui/no-patterns-in-args.rs b/tests/ui/no-patterns-in-args.rs
index 54836b0a3..54836b0a3 100644
--- a/src/test/ui/no-patterns-in-args.rs
+++ b/tests/ui/no-patterns-in-args.rs
diff --git a/src/test/ui/no-patterns-in-args.stderr b/tests/ui/no-patterns-in-args.stderr
index 1c2ce8664..1c2ce8664 100644
--- a/src/test/ui/no-patterns-in-args.stderr
+++ b/tests/ui/no-patterns-in-args.stderr
diff --git a/src/test/ui/no-reuse-move-arc.rs b/tests/ui/no-reuse-move-arc.rs
index 9c957a4e0..9c957a4e0 100644
--- a/src/test/ui/no-reuse-move-arc.rs
+++ b/tests/ui/no-reuse-move-arc.rs
diff --git a/src/test/ui/no-reuse-move-arc.stderr b/tests/ui/no-reuse-move-arc.stderr
index 564b05854..bcd481c33 100644
--- a/src/test/ui/no-reuse-move-arc.stderr
+++ b/tests/ui/no-reuse-move-arc.stderr
@@ -13,11 +13,6 @@ LL |     assert_eq!((*arc_v)[2], 3);
    |                ^^^^^^^^ value borrowed here after move
    |
    = note: borrow occurs due to deref coercion to `Vec<i32>`
-note: deref defined here
-  --> $SRC_DIR/alloc/src/sync.rs:LL:COL
-   |
-LL |     type Target = T;
-   |     ^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/no-send-res-ports.rs b/tests/ui/no-send-res-ports.rs
index 1bac5868e..1bac5868e 100644
--- a/src/test/ui/no-send-res-ports.rs
+++ b/tests/ui/no-send-res-ports.rs
diff --git a/src/test/ui/no-send-res-ports.stderr b/tests/ui/no-send-res-ports.stderr
index c864b93db..75561f411 100644
--- a/src/test/ui/no-send-res-ports.stderr
+++ b/tests/ui/no-send-res-ports.stderr
@@ -31,9 +31,6 @@ LL |     thread::spawn(move|| {
    |                   ^^^^^^
 note: required by a bound in `spawn`
   --> $SRC_DIR/std/src/thread/mod.rs:LL:COL
-   |
-LL |     F: Send + 'static,
-   |        ^^^^ required by this bound in `spawn`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/no-warn-on-field-replace-issue-34101.rs b/tests/ui/no-warn-on-field-replace-issue-34101.rs
index 15df6d25c..15df6d25c 100644
--- a/src/test/ui/no-warn-on-field-replace-issue-34101.rs
+++ b/tests/ui/no-warn-on-field-replace-issue-34101.rs
diff --git a/src/test/ui/no_crate_type.rs b/tests/ui/no_crate_type.rs
index d8e687e04..d8e687e04 100644
--- a/src/test/ui/no_crate_type.rs
+++ b/tests/ui/no_crate_type.rs
diff --git a/src/test/ui/no_crate_type.stderr b/tests/ui/no_crate_type.stderr
index 93da7c3e0..93da7c3e0 100644
--- a/src/test/ui/no_crate_type.stderr
+++ b/tests/ui/no_crate_type.stderr
diff --git a/src/test/ui/no_send-enum.rs b/tests/ui/no_send-enum.rs
index bd560649b..bd560649b 100644
--- a/src/test/ui/no_send-enum.rs
+++ b/tests/ui/no_send-enum.rs
diff --git a/src/test/ui/no_send-enum.stderr b/tests/ui/no_send-enum.stderr
index b5a14b551..b5a14b551 100644
--- a/src/test/ui/no_send-enum.stderr
+++ b/tests/ui/no_send-enum.stderr
diff --git a/src/test/ui/no_send-rc.rs b/tests/ui/no_send-rc.rs
index f31db15ef..f31db15ef 100644
--- a/src/test/ui/no_send-rc.rs
+++ b/tests/ui/no_send-rc.rs
diff --git a/src/test/ui/no_send-rc.stderr b/tests/ui/no_send-rc.stderr
index ce25da559..ce25da559 100644
--- a/src/test/ui/no_send-rc.stderr
+++ b/tests/ui/no_send-rc.stderr
diff --git a/src/test/ui/no_share-enum.rs b/tests/ui/no_share-enum.rs
index 44bf1913e..44bf1913e 100644
--- a/src/test/ui/no_share-enum.rs
+++ b/tests/ui/no_share-enum.rs
diff --git a/src/test/ui/no_share-enum.stderr b/tests/ui/no_share-enum.stderr
index 5b453e0da..5b453e0da 100644
--- a/src/test/ui/no_share-enum.stderr
+++ b/tests/ui/no_share-enum.stderr
diff --git a/src/test/ui/no_share-struct.rs b/tests/ui/no_share-struct.rs
index 7d8a36a76..7d8a36a76 100644
--- a/src/test/ui/no_share-struct.rs
+++ b/tests/ui/no_share-struct.rs
diff --git a/src/test/ui/no_share-struct.stderr b/tests/ui/no_share-struct.stderr
index 9ce3a318f..9ce3a318f 100644
--- a/src/test/ui/no_share-struct.stderr
+++ b/tests/ui/no_share-struct.stderr
diff --git a/src/test/ui/noexporttypeexe.rs b/tests/ui/noexporttypeexe.rs
index 964ac9a30..964ac9a30 100644
--- a/src/test/ui/noexporttypeexe.rs
+++ b/tests/ui/noexporttypeexe.rs
diff --git a/src/test/ui/noexporttypeexe.stderr b/tests/ui/noexporttypeexe.stderr
index 7fc239613..7fc239613 100644
--- a/src/test/ui/noexporttypeexe.stderr
+++ b/tests/ui/noexporttypeexe.stderr
diff --git a/src/test/ui/non-constant-expr-for-arr-len.rs b/tests/ui/non-constant-expr-for-arr-len.rs
index 1b101d323..1b101d323 100644
--- a/src/test/ui/non-constant-expr-for-arr-len.rs
+++ b/tests/ui/non-constant-expr-for-arr-len.rs
diff --git a/src/test/ui/non-constant-expr-for-arr-len.stderr b/tests/ui/non-constant-expr-for-arr-len.stderr
index d684b8eaa..d684b8eaa 100644
--- a/src/test/ui/non-constant-expr-for-arr-len.stderr
+++ b/tests/ui/non-constant-expr-for-arr-len.stderr
diff --git a/src/test/ui/non-copyable-void.rs b/tests/ui/non-copyable-void.rs
index ddaaee436..ddaaee436 100644
--- a/src/test/ui/non-copyable-void.rs
+++ b/tests/ui/non-copyable-void.rs
diff --git a/src/test/ui/non-copyable-void.stderr b/tests/ui/non-copyable-void.stderr
index 99af04e7c..99af04e7c 100644
--- a/src/test/ui/non-copyable-void.stderr
+++ b/tests/ui/non-copyable-void.stderr
diff --git a/src/test/ui/non-fmt-panic.fixed b/tests/ui/non-fmt-panic.fixed
index 5191f1877..5191f1877 100644
--- a/src/test/ui/non-fmt-panic.fixed
+++ b/tests/ui/non-fmt-panic.fixed
diff --git a/src/test/ui/non-fmt-panic.rs b/tests/ui/non-fmt-panic.rs
index d0d06b797..d0d06b797 100644
--- a/src/test/ui/non-fmt-panic.rs
+++ b/tests/ui/non-fmt-panic.rs
diff --git a/src/test/ui/non-fmt-panic.stderr b/tests/ui/non-fmt-panic.stderr
index 162802b7f..162802b7f 100644
--- a/src/test/ui/non-fmt-panic.stderr
+++ b/tests/ui/non-fmt-panic.stderr
diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.rs b/tests/ui/non-ice-error-on-worker-io-fail.rs
index 134e7d420..134e7d420 100644
--- a/src/test/ui/non-ice-error-on-worker-io-fail.rs
+++ b/tests/ui/non-ice-error-on-worker-io-fail.rs
diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.stderr b/tests/ui/non-ice-error-on-worker-io-fail.stderr
index edadecf27..edadecf27 100644
--- a/src/test/ui/non-ice-error-on-worker-io-fail.stderr
+++ b/tests/ui/non-ice-error-on-worker-io-fail.stderr
diff --git a/src/test/ui/non_modrs_mods/foors_mod.rs b/tests/ui/non_modrs_mods/foors_mod.rs
index 5bf35fbf7..5bf35fbf7 100644
--- a/src/test/ui/non_modrs_mods/foors_mod.rs
+++ b/tests/ui/non_modrs_mods/foors_mod.rs
diff --git a/src/test/ui/non_modrs_mods/foors_mod/compiletest-ignore-dir b/tests/ui/non_modrs_mods/foors_mod/compiletest-ignore-dir
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/non_modrs_mods/foors_mod/compiletest-ignore-dir
+++ b/tests/ui/non_modrs_mods/foors_mod/compiletest-ignore-dir
diff --git a/src/test/ui/non_modrs_mods/foors_mod/inline/somename.rs b/tests/ui/non_modrs_mods/foors_mod/inline/somename.rs
index 04585f918..04585f918 100644
--- a/src/test/ui/non_modrs_mods/foors_mod/inline/somename.rs
+++ b/tests/ui/non_modrs_mods/foors_mod/inline/somename.rs
diff --git a/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs b/tests/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs
index 4d8eb350b..4d8eb350b 100644
--- a/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs
+++ b/tests/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs
diff --git a/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs b/tests/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
index 04585f918..04585f918 100644
--- a/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
+++ b/tests/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
diff --git a/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs b/tests/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
index 04585f918..04585f918 100644
--- a/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
+++ b/tests/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
diff --git a/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs b/tests/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
index 4d8eb350b..4d8eb350b 100644
--- a/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
+++ b/tests/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/compiletest-ignore-dir b/tests/ui/non_modrs_mods/modrs_mod/compiletest-ignore-dir
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/non_modrs_mods/modrs_mod/compiletest-ignore-dir
+++ b/tests/ui/non_modrs_mods/modrs_mod/compiletest-ignore-dir
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inline/somename.rs b/tests/ui/non_modrs_mods/modrs_mod/inline/somename.rs
index 04585f918..04585f918 100644
--- a/src/test/ui/non_modrs_mods/modrs_mod/inline/somename.rs
+++ b/tests/ui/non_modrs_mods/modrs_mod/inline/somename.rs
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs b/tests/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs
index 4d8eb350b..4d8eb350b 100644
--- a/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs
+++ b/tests/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs b/tests/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
index 04585f918..04585f918 100644
--- a/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
+++ b/tests/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs b/tests/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
index 04585f918..04585f918 100644
--- a/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
+++ b/tests/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs b/tests/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
index 4d8eb350b..4d8eb350b 100644
--- a/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
+++ b/tests/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/mod.rs b/tests/ui/non_modrs_mods/modrs_mod/mod.rs
index c8efa66d6..c8efa66d6 100644
--- a/src/test/ui/non_modrs_mods/modrs_mod/mod.rs
+++ b/tests/ui/non_modrs_mods/modrs_mod/mod.rs
diff --git a/src/test/ui/non_modrs_mods/non_modrs_mods.rs b/tests/ui/non_modrs_mods/non_modrs_mods.rs
index f664b0166..f664b0166 100644
--- a/src/test/ui/non_modrs_mods/non_modrs_mods.rs
+++ b/tests/ui/non_modrs_mods/non_modrs_mods.rs
diff --git a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs b/tests/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
index 7d5d5b9e5..7d5d5b9e5 100644
--- a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
+++ b/tests/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
diff --git a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir b/tests/ui/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir
+++ b/tests/ui/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir
diff --git a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs b/tests/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
index 04585f918..04585f918 100644
--- a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
+++ b/tests/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
diff --git a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs b/tests/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
index 4d8eb350b..4d8eb350b 100644
--- a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
+++ b/tests/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
diff --git a/src/test/ui/non_modrs_mods_and_inline_mods/non_modrs_mods_and_inline_mods.rs b/tests/ui/non_modrs_mods_and_inline_mods/non_modrs_mods_and_inline_mods.rs
index af6585aad..af6585aad 100644
--- a/src/test/ui/non_modrs_mods_and_inline_mods/non_modrs_mods_and_inline_mods.rs
+++ b/tests/ui/non_modrs_mods_and_inline_mods/non_modrs_mods_and_inline_mods.rs
diff --git a/src/test/ui/non_modrs_mods_and_inline_mods/x.rs b/tests/ui/non_modrs_mods_and_inline_mods/x.rs
index a39a7c6d9..a39a7c6d9 100644
--- a/src/test/ui/non_modrs_mods_and_inline_mods/x.rs
+++ b/tests/ui/non_modrs_mods_and_inline_mods/x.rs
diff --git a/src/test/ui/non_modrs_mods_and_inline_mods/x/y/z/mod.rs b/tests/ui/non_modrs_mods_and_inline_mods/x/y/z/mod.rs
index e8442a47f..e8442a47f 100644
--- a/src/test/ui/non_modrs_mods_and_inline_mods/x/y/z/mod.rs
+++ b/tests/ui/non_modrs_mods_and_inline_mods/x/y/z/mod.rs
diff --git a/src/test/ui/noncopyable-class.rs b/tests/ui/noncopyable-class.rs
index 11b6eb736..11b6eb736 100644
--- a/src/test/ui/noncopyable-class.rs
+++ b/tests/ui/noncopyable-class.rs
diff --git a/src/test/ui/noncopyable-class.stderr b/tests/ui/noncopyable-class.stderr
index 0c696163a..0c696163a 100644
--- a/src/test/ui/noncopyable-class.stderr
+++ b/tests/ui/noncopyable-class.stderr
diff --git a/src/test/ui/nonscalar-cast.fixed b/tests/ui/nonscalar-cast.fixed
index 0a4b98469..0a4b98469 100644
--- a/src/test/ui/nonscalar-cast.fixed
+++ b/tests/ui/nonscalar-cast.fixed
diff --git a/src/test/ui/nonscalar-cast.rs b/tests/ui/nonscalar-cast.rs
index 59fcf0966..59fcf0966 100644
--- a/src/test/ui/nonscalar-cast.rs
+++ b/tests/ui/nonscalar-cast.rs
diff --git a/src/test/ui/nonscalar-cast.stderr b/tests/ui/nonscalar-cast.stderr
index 2a7037121..2a7037121 100644
--- a/src/test/ui/nonscalar-cast.stderr
+++ b/tests/ui/nonscalar-cast.stderr
diff --git a/src/test/ui/not-clone-closure.rs b/tests/ui/not-clone-closure.rs
index 25635bc83..25635bc83 100644
--- a/src/test/ui/not-clone-closure.rs
+++ b/tests/ui/not-clone-closure.rs
diff --git a/tests/ui/not-clone-closure.stderr b/tests/ui/not-clone-closure.stderr
new file mode 100644
index 000000000..37d94cf0e
--- /dev/null
+++ b/tests/ui/not-clone-closure.stderr
@@ -0,0 +1,22 @@
+error[E0277]: the trait bound `S: Clone` is not satisfied in `[closure@$DIR/not-clone-closure.rs:7:17: 7:24]`
+  --> $DIR/not-clone-closure.rs:11:23
+   |
+LL |     let hello = move || {
+   |                 ------- within this `[closure@$DIR/not-clone-closure.rs:7:17: 7:24]`
+...
+LL |     let hello = hello.clone();
+   |                       ^^^^^ within `[closure@$DIR/not-clone-closure.rs:7:17: 7:24]`, the trait `Clone` is not implemented for `S`
+   |
+note: required because it's used within this closure
+  --> $DIR/not-clone-closure.rs:7:17
+   |
+LL |     let hello = move || {
+   |                 ^^^^^^^
+help: consider annotating `S` with `#[derive(Clone)]`
+   |
+LL | #[derive(Clone)]
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/not-copy-closure.rs b/tests/ui/not-copy-closure.rs
index f6530f9a4..f6530f9a4 100644
--- a/src/test/ui/not-copy-closure.rs
+++ b/tests/ui/not-copy-closure.rs
diff --git a/src/test/ui/not-copy-closure.stderr b/tests/ui/not-copy-closure.stderr
index 93e011cce..93e011cce 100644
--- a/src/test/ui/not-copy-closure.stderr
+++ b/tests/ui/not-copy-closure.stderr
diff --git a/src/test/ui/not-enough-arguments.rs b/tests/ui/not-enough-arguments.rs
index 424762551..4a2ea5e44 100644
--- a/src/test/ui/not-enough-arguments.rs
+++ b/tests/ui/not-enough-arguments.rs
@@ -25,7 +25,7 @@ fn bar(
 
 fn main() {
   foo(1, 2, 3);
-  //~^ ERROR this function takes 4 arguments but 3
+  //~^ ERROR function takes 4 arguments but 3
   bar(1, 2, 3);
-  //~^ ERROR this function takes 6 arguments but 3
+  //~^ ERROR function takes 6 arguments but 3
 }
diff --git a/src/test/ui/not-enough-arguments.stderr b/tests/ui/not-enough-arguments.stderr
index 8b2dafb4e..8b2dafb4e 100644
--- a/src/test/ui/not-enough-arguments.stderr
+++ b/tests/ui/not-enough-arguments.stderr
diff --git a/src/test/ui/not-panic/not-panic-safe-2.rs b/tests/ui/not-panic/not-panic-safe-2.rs
index f3faa7043..f3faa7043 100644
--- a/src/test/ui/not-panic/not-panic-safe-2.rs
+++ b/tests/ui/not-panic/not-panic-safe-2.rs
diff --git a/src/test/ui/not-panic/not-panic-safe-2.stderr b/tests/ui/not-panic/not-panic-safe-2.stderr
index 3b0f83b3b..3b0f83b3b 100644
--- a/src/test/ui/not-panic/not-panic-safe-2.stderr
+++ b/tests/ui/not-panic/not-panic-safe-2.stderr
diff --git a/src/test/ui/not-panic/not-panic-safe-3.rs b/tests/ui/not-panic/not-panic-safe-3.rs
index 21f0c0993..21f0c0993 100644
--- a/src/test/ui/not-panic/not-panic-safe-3.rs
+++ b/tests/ui/not-panic/not-panic-safe-3.rs
diff --git a/src/test/ui/not-panic/not-panic-safe-3.stderr b/tests/ui/not-panic/not-panic-safe-3.stderr
index 9e9a12764..9e9a12764 100644
--- a/src/test/ui/not-panic/not-panic-safe-3.stderr
+++ b/tests/ui/not-panic/not-panic-safe-3.stderr
diff --git a/src/test/ui/not-panic/not-panic-safe-4.rs b/tests/ui/not-panic/not-panic-safe-4.rs
index ba93af5c0..ba93af5c0 100644
--- a/src/test/ui/not-panic/not-panic-safe-4.rs
+++ b/tests/ui/not-panic/not-panic-safe-4.rs
diff --git a/src/test/ui/not-panic/not-panic-safe-4.stderr b/tests/ui/not-panic/not-panic-safe-4.stderr
index fc1c594d0..9428c1256 100644
--- a/src/test/ui/not-panic/not-panic-safe-4.stderr
+++ b/tests/ui/not-panic/not-panic-safe-4.stderr
@@ -12,6 +12,11 @@ note: required by a bound in `assert`
    |
 LL | fn assert<T: UnwindSafe + ?Sized>() {}
    |              ^^^^^^^^^^ required by this bound in `assert`
+help: consider removing the leading `&`-reference
+   |
+LL -     assert::<&RefCell<i32>>();
+LL +     assert::<RefCell<i32>>();
+   |
 
 error[E0277]: the type `UnsafeCell<isize>` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary
   --> $DIR/not-panic-safe-4.rs:9:14
@@ -28,6 +33,11 @@ note: required by a bound in `assert`
    |
 LL | fn assert<T: UnwindSafe + ?Sized>() {}
    |              ^^^^^^^^^^ required by this bound in `assert`
+help: consider removing the leading `&`-reference
+   |
+LL -     assert::<&RefCell<i32>>();
+LL +     assert::<RefCell<i32>>();
+   |
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/not-panic/not-panic-safe-5.rs b/tests/ui/not-panic/not-panic-safe-5.rs
index e0d37517d..e0d37517d 100644
--- a/src/test/ui/not-panic/not-panic-safe-5.rs
+++ b/tests/ui/not-panic/not-panic-safe-5.rs
diff --git a/src/test/ui/not-panic/not-panic-safe-5.stderr b/tests/ui/not-panic/not-panic-safe-5.stderr
index cb78370b4..cb78370b4 100644
--- a/src/test/ui/not-panic/not-panic-safe-5.stderr
+++ b/tests/ui/not-panic/not-panic-safe-5.stderr
diff --git a/src/test/ui/not-panic/not-panic-safe-6.rs b/tests/ui/not-panic/not-panic-safe-6.rs
index 4915096dc..4915096dc 100644
--- a/src/test/ui/not-panic/not-panic-safe-6.rs
+++ b/tests/ui/not-panic/not-panic-safe-6.rs
diff --git a/src/test/ui/not-panic/not-panic-safe-6.stderr b/tests/ui/not-panic/not-panic-safe-6.stderr
index 7986e341e..7986e341e 100644
--- a/src/test/ui/not-panic/not-panic-safe-6.stderr
+++ b/tests/ui/not-panic/not-panic-safe-6.stderr
diff --git a/tests/ui/not-panic/not-panic-safe.rs b/tests/ui/not-panic/not-panic-safe.rs
new file mode 100644
index 000000000..1b3c6482c
--- /dev/null
+++ b/tests/ui/not-panic/not-panic-safe.rs
@@ -0,0 +1,10 @@
+#![allow(dead_code)]
+
+use std::panic::UnwindSafe;
+
+fn assert<T: UnwindSafe + ?Sized>() {}
+
+fn main() {
+    assert::<&mut &mut &i32>();
+    //~^ ERROR the type `&mut &mut &i32` may not be safely transferred across an unwind boundary
+}
diff --git a/tests/ui/not-panic/not-panic-safe.stderr b/tests/ui/not-panic/not-panic-safe.stderr
new file mode 100644
index 000000000..37a6aee39
--- /dev/null
+++ b/tests/ui/not-panic/not-panic-safe.stderr
@@ -0,0 +1,22 @@
+error[E0277]: the type `&mut &mut &i32` may not be safely transferred across an unwind boundary
+  --> $DIR/not-panic-safe.rs:8:14
+   |
+LL |     assert::<&mut &mut &i32>();
+   |              ^^^^^^^^^^^^^^ `&mut &mut &i32` may not be safely transferred across an unwind boundary
+   |
+   = help: the trait `UnwindSafe` is not implemented for `&mut &mut &i32`
+   = note: `UnwindSafe` is implemented for `&&mut &i32`, but not for `&mut &mut &i32`
+note: required by a bound in `assert`
+  --> $DIR/not-panic-safe.rs:5:14
+   |
+LL | fn assert<T: UnwindSafe + ?Sized>() {}
+   |              ^^^^^^^^^^ required by this bound in `assert`
+help: consider removing 2 leading `&`-references
+   |
+LL -     assert::<&mut &mut &i32>();
+LL +     assert::<&i32>();
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/nul-characters.rs b/tests/ui/nul-characters.rs
index 11b6e9fe3..11b6e9fe3 100644
--- a/src/test/ui/nul-characters.rs
+++ b/tests/ui/nul-characters.rs
diff --git a/src/test/ui/nullable-pointer-iotareduction.rs b/tests/ui/nullable-pointer-iotareduction.rs
index d345fec81..d345fec81 100644
--- a/src/test/ui/nullable-pointer-iotareduction.rs
+++ b/tests/ui/nullable-pointer-iotareduction.rs
diff --git a/src/test/ui/nullable-pointer-size.rs b/tests/ui/nullable-pointer-size.rs
index 0384553b6..0384553b6 100644
--- a/src/test/ui/nullable-pointer-size.rs
+++ b/tests/ui/nullable-pointer-size.rs
diff --git a/src/test/ui/numbers-arithmetic/arith-unsigned.rs b/tests/ui/numbers-arithmetic/arith-unsigned.rs
index ad57d9f86..ad57d9f86 100644
--- a/src/test/ui/numbers-arithmetic/arith-unsigned.rs
+++ b/tests/ui/numbers-arithmetic/arith-unsigned.rs
diff --git a/src/test/ui/numbers-arithmetic/div-mod.rs b/tests/ui/numbers-arithmetic/div-mod.rs
index acb92a7df..acb92a7df 100644
--- a/src/test/ui/numbers-arithmetic/div-mod.rs
+++ b/tests/ui/numbers-arithmetic/div-mod.rs
diff --git a/src/test/ui/numbers-arithmetic/divide-by-zero.rs b/tests/ui/numbers-arithmetic/divide-by-zero.rs
index 30e0e6c1b..30e0e6c1b 100644
--- a/src/test/ui/numbers-arithmetic/divide-by-zero.rs
+++ b/tests/ui/numbers-arithmetic/divide-by-zero.rs
diff --git a/src/test/ui/numbers-arithmetic/float-int-invalid-const-cast.rs b/tests/ui/numbers-arithmetic/float-int-invalid-const-cast.rs
index 260281d75..260281d75 100644
--- a/src/test/ui/numbers-arithmetic/float-int-invalid-const-cast.rs
+++ b/tests/ui/numbers-arithmetic/float-int-invalid-const-cast.rs
diff --git a/src/test/ui/numbers-arithmetic/float-literal-inference.rs b/tests/ui/numbers-arithmetic/float-literal-inference.rs
index c4645e4f8..c4645e4f8 100644
--- a/src/test/ui/numbers-arithmetic/float-literal-inference.rs
+++ b/tests/ui/numbers-arithmetic/float-literal-inference.rs
diff --git a/src/test/ui/numbers-arithmetic/float-nan.rs b/tests/ui/numbers-arithmetic/float-nan.rs
index 0cc6473e5..0cc6473e5 100644
--- a/src/test/ui/numbers-arithmetic/float-nan.rs
+++ b/tests/ui/numbers-arithmetic/float-nan.rs
diff --git a/src/test/ui/numbers-arithmetic/float-signature.rs b/tests/ui/numbers-arithmetic/float-signature.rs
index d47280ea2..d47280ea2 100644
--- a/src/test/ui/numbers-arithmetic/float-signature.rs
+++ b/tests/ui/numbers-arithmetic/float-signature.rs
diff --git a/src/test/ui/numbers-arithmetic/float.rs b/tests/ui/numbers-arithmetic/float.rs
index d55c05857..d55c05857 100644
--- a/src/test/ui/numbers-arithmetic/float.rs
+++ b/tests/ui/numbers-arithmetic/float.rs
diff --git a/src/test/ui/numbers-arithmetic/float2.rs b/tests/ui/numbers-arithmetic/float2.rs
index b1bcf8da5..b1bcf8da5 100644
--- a/src/test/ui/numbers-arithmetic/float2.rs
+++ b/tests/ui/numbers-arithmetic/float2.rs
diff --git a/src/test/ui/numbers-arithmetic/float_math.rs b/tests/ui/numbers-arithmetic/float_math.rs
index a2902ee56..a2902ee56 100644
--- a/src/test/ui/numbers-arithmetic/float_math.rs
+++ b/tests/ui/numbers-arithmetic/float_math.rs
diff --git a/src/test/ui/numbers-arithmetic/floatlits.rs b/tests/ui/numbers-arithmetic/floatlits.rs
index 07049af31..07049af31 100644
--- a/src/test/ui/numbers-arithmetic/floatlits.rs
+++ b/tests/ui/numbers-arithmetic/floatlits.rs
diff --git a/src/test/ui/numbers-arithmetic/i128.rs b/tests/ui/numbers-arithmetic/i128.rs
index d61a1ab03..d61a1ab03 100644
--- a/src/test/ui/numbers-arithmetic/i128.rs
+++ b/tests/ui/numbers-arithmetic/i128.rs
diff --git a/src/test/ui/numbers-arithmetic/i32-sub.rs b/tests/ui/numbers-arithmetic/i32-sub.rs
index 56df772b4..56df772b4 100644
--- a/src/test/ui/numbers-arithmetic/i32-sub.rs
+++ b/tests/ui/numbers-arithmetic/i32-sub.rs
diff --git a/src/test/ui/numbers-arithmetic/i8-incr.rs b/tests/ui/numbers-arithmetic/i8-incr.rs
index 718d259f7..718d259f7 100644
--- a/src/test/ui/numbers-arithmetic/i8-incr.rs
+++ b/tests/ui/numbers-arithmetic/i8-incr.rs
diff --git a/src/test/ui/numbers-arithmetic/int-abs-overflow.rs b/tests/ui/numbers-arithmetic/int-abs-overflow.rs
index d63ba8cb0..d63ba8cb0 100644
--- a/src/test/ui/numbers-arithmetic/int-abs-overflow.rs
+++ b/tests/ui/numbers-arithmetic/int-abs-overflow.rs
diff --git a/src/test/ui/numbers-arithmetic/int.rs b/tests/ui/numbers-arithmetic/int.rs
index b496a70a6..b496a70a6 100644
--- a/src/test/ui/numbers-arithmetic/int.rs
+++ b/tests/ui/numbers-arithmetic/int.rs
diff --git a/src/test/ui/numbers-arithmetic/integer-literal-radix.rs b/tests/ui/numbers-arithmetic/integer-literal-radix.rs
index 8f61ea17a..8f61ea17a 100644
--- a/src/test/ui/numbers-arithmetic/integer-literal-radix.rs
+++ b/tests/ui/numbers-arithmetic/integer-literal-radix.rs
diff --git a/src/test/ui/numbers-arithmetic/integer-literal-suffix-inference-2.rs b/tests/ui/numbers-arithmetic/integer-literal-suffix-inference-2.rs
index 80248dc22..80248dc22 100644
--- a/src/test/ui/numbers-arithmetic/integer-literal-suffix-inference-2.rs
+++ b/tests/ui/numbers-arithmetic/integer-literal-suffix-inference-2.rs
diff --git a/src/test/ui/numbers-arithmetic/integer-literal-suffix-inference-3.rs b/tests/ui/numbers-arithmetic/integer-literal-suffix-inference-3.rs
index bec718a3c..bec718a3c 100644
--- a/src/test/ui/numbers-arithmetic/integer-literal-suffix-inference-3.rs
+++ b/tests/ui/numbers-arithmetic/integer-literal-suffix-inference-3.rs
diff --git a/src/test/ui/numbers-arithmetic/integer-literal-suffix-inference.rs b/tests/ui/numbers-arithmetic/integer-literal-suffix-inference.rs
index d177ced1a..d177ced1a 100644
--- a/src/test/ui/numbers-arithmetic/integer-literal-suffix-inference.rs
+++ b/tests/ui/numbers-arithmetic/integer-literal-suffix-inference.rs
diff --git a/src/test/ui/numbers-arithmetic/issue-8460-const.noopt.stderr b/tests/ui/numbers-arithmetic/issue-8460-const.noopt.stderr
index c4abcb784..c4abcb784 100644
--- a/src/test/ui/numbers-arithmetic/issue-8460-const.noopt.stderr
+++ b/tests/ui/numbers-arithmetic/issue-8460-const.noopt.stderr
diff --git a/src/test/ui/numbers-arithmetic/issue-8460-const.opt.stderr b/tests/ui/numbers-arithmetic/issue-8460-const.opt.stderr
index c4abcb784..c4abcb784 100644
--- a/src/test/ui/numbers-arithmetic/issue-8460-const.opt.stderr
+++ b/tests/ui/numbers-arithmetic/issue-8460-const.opt.stderr
diff --git a/src/test/ui/numbers-arithmetic/issue-8460-const.opt_with_overflow_checks.stderr b/tests/ui/numbers-arithmetic/issue-8460-const.opt_with_overflow_checks.stderr
index c4abcb784..c4abcb784 100644
--- a/src/test/ui/numbers-arithmetic/issue-8460-const.opt_with_overflow_checks.stderr
+++ b/tests/ui/numbers-arithmetic/issue-8460-const.opt_with_overflow_checks.stderr
diff --git a/src/test/ui/numbers-arithmetic/issue-8460-const.rs b/tests/ui/numbers-arithmetic/issue-8460-const.rs
index 02e7567da..02e7567da 100644
--- a/src/test/ui/numbers-arithmetic/issue-8460-const.rs
+++ b/tests/ui/numbers-arithmetic/issue-8460-const.rs
diff --git a/src/test/ui/numbers-arithmetic/issue-8460.rs b/tests/ui/numbers-arithmetic/issue-8460.rs
index 77368b87e..77368b87e 100644
--- a/src/test/ui/numbers-arithmetic/issue-8460.rs
+++ b/tests/ui/numbers-arithmetic/issue-8460.rs
diff --git a/src/test/ui/numbers-arithmetic/mod-zero.rs b/tests/ui/numbers-arithmetic/mod-zero.rs
index 083716394..083716394 100644
--- a/src/test/ui/numbers-arithmetic/mod-zero.rs
+++ b/tests/ui/numbers-arithmetic/mod-zero.rs
diff --git a/src/test/ui/numbers-arithmetic/next-power-of-two-overflow-debug.rs b/tests/ui/numbers-arithmetic/next-power-of-two-overflow-debug.rs
index 79d78da33..79d78da33 100644
--- a/src/test/ui/numbers-arithmetic/next-power-of-two-overflow-debug.rs
+++ b/tests/ui/numbers-arithmetic/next-power-of-two-overflow-debug.rs
diff --git a/src/test/ui/numbers-arithmetic/next-power-of-two-overflow-ndebug.rs b/tests/ui/numbers-arithmetic/next-power-of-two-overflow-ndebug.rs
index 982cd97c5..982cd97c5 100644
--- a/src/test/ui/numbers-arithmetic/next-power-of-two-overflow-ndebug.rs
+++ b/tests/ui/numbers-arithmetic/next-power-of-two-overflow-ndebug.rs
diff --git a/src/test/ui/numbers-arithmetic/not-suggest-float-literal.rs b/tests/ui/numbers-arithmetic/not-suggest-float-literal.rs
index 513d02db9..513d02db9 100644
--- a/src/test/ui/numbers-arithmetic/not-suggest-float-literal.rs
+++ b/tests/ui/numbers-arithmetic/not-suggest-float-literal.rs
diff --git a/src/test/ui/numbers-arithmetic/not-suggest-float-literal.stderr b/tests/ui/numbers-arithmetic/not-suggest-float-literal.stderr
index 8f0eef237..8f0eef237 100644
--- a/src/test/ui/numbers-arithmetic/not-suggest-float-literal.stderr
+++ b/tests/ui/numbers-arithmetic/not-suggest-float-literal.stderr
diff --git a/src/test/ui/numbers-arithmetic/num-wrapping.rs b/tests/ui/numbers-arithmetic/num-wrapping.rs
index 43b1059f9..43b1059f9 100644
--- a/src/test/ui/numbers-arithmetic/num-wrapping.rs
+++ b/tests/ui/numbers-arithmetic/num-wrapping.rs
diff --git a/src/test/ui/numbers-arithmetic/numeric-method-autoexport.rs b/tests/ui/numbers-arithmetic/numeric-method-autoexport.rs
index 5798c2591..5798c2591 100644
--- a/src/test/ui/numbers-arithmetic/numeric-method-autoexport.rs
+++ b/tests/ui/numbers-arithmetic/numeric-method-autoexport.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-add.rs b/tests/ui/numbers-arithmetic/overflowing-add.rs
index b0f22a74b..b0f22a74b 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-add.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-add.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-lsh-1.rs b/tests/ui/numbers-arithmetic/overflowing-lsh-1.rs
index 7f8b0c877..7f8b0c877 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-lsh-1.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-lsh-1.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-lsh-1.stderr b/tests/ui/numbers-arithmetic/overflowing-lsh-1.stderr
index 434c9d5b4..434c9d5b4 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-lsh-1.stderr
+++ b/tests/ui/numbers-arithmetic/overflowing-lsh-1.stderr
diff --git a/src/test/ui/numbers-arithmetic/overflowing-lsh-2.rs b/tests/ui/numbers-arithmetic/overflowing-lsh-2.rs
index 76718ecd1..76718ecd1 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-lsh-2.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-lsh-2.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-lsh-2.stderr b/tests/ui/numbers-arithmetic/overflowing-lsh-2.stderr
index c3b44e5a0..c3b44e5a0 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-lsh-2.stderr
+++ b/tests/ui/numbers-arithmetic/overflowing-lsh-2.stderr
diff --git a/src/test/ui/numbers-arithmetic/overflowing-lsh-3.rs b/tests/ui/numbers-arithmetic/overflowing-lsh-3.rs
index b2bdd09bf..b2bdd09bf 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-lsh-3.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-lsh-3.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-lsh-3.stderr b/tests/ui/numbers-arithmetic/overflowing-lsh-3.stderr
index 9d6479bd7..9d6479bd7 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-lsh-3.stderr
+++ b/tests/ui/numbers-arithmetic/overflowing-lsh-3.stderr
diff --git a/src/test/ui/numbers-arithmetic/overflowing-lsh-4.rs b/tests/ui/numbers-arithmetic/overflowing-lsh-4.rs
index 1042bfcb3..1042bfcb3 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-lsh-4.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-lsh-4.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-lsh-4.stderr b/tests/ui/numbers-arithmetic/overflowing-lsh-4.stderr
index 2bb5b6a6d..2bb5b6a6d 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-lsh-4.stderr
+++ b/tests/ui/numbers-arithmetic/overflowing-lsh-4.stderr
diff --git a/src/test/ui/numbers-arithmetic/overflowing-mul.rs b/tests/ui/numbers-arithmetic/overflowing-mul.rs
index 34ab5d8fa..34ab5d8fa 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-mul.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-mul.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-neg.rs b/tests/ui/numbers-arithmetic/overflowing-neg.rs
index df1198053..df1198053 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-neg.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-neg.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-pow-signed.rs b/tests/ui/numbers-arithmetic/overflowing-pow-signed.rs
index b59efe6f2..b59efe6f2 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-pow-signed.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-pow-signed.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-pow-unsigned.rs b/tests/ui/numbers-arithmetic/overflowing-pow-unsigned.rs
index f2643c164..f2643c164 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-pow-unsigned.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-pow-unsigned.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-1.rs b/tests/ui/numbers-arithmetic/overflowing-rsh-1.rs
index 80593c865..80593c865 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-rsh-1.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-rsh-1.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-1.stderr b/tests/ui/numbers-arithmetic/overflowing-rsh-1.stderr
index b2b3114d1..b2b3114d1 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-rsh-1.stderr
+++ b/tests/ui/numbers-arithmetic/overflowing-rsh-1.stderr
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-2.rs b/tests/ui/numbers-arithmetic/overflowing-rsh-2.rs
index 917352bfc..917352bfc 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-rsh-2.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-rsh-2.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-2.stderr b/tests/ui/numbers-arithmetic/overflowing-rsh-2.stderr
index ad18c3bb7..ad18c3bb7 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-rsh-2.stderr
+++ b/tests/ui/numbers-arithmetic/overflowing-rsh-2.stderr
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-3.rs b/tests/ui/numbers-arithmetic/overflowing-rsh-3.rs
index 1e052990a..1e052990a 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-rsh-3.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-rsh-3.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-3.stderr b/tests/ui/numbers-arithmetic/overflowing-rsh-3.stderr
index 37d02e09d..37d02e09d 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-rsh-3.stderr
+++ b/tests/ui/numbers-arithmetic/overflowing-rsh-3.stderr
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-4.rs b/tests/ui/numbers-arithmetic/overflowing-rsh-4.rs
index be918becd..be918becd 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-rsh-4.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-rsh-4.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-4.stderr b/tests/ui/numbers-arithmetic/overflowing-rsh-4.stderr
index 692602c07..692602c07 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-rsh-4.stderr
+++ b/tests/ui/numbers-arithmetic/overflowing-rsh-4.stderr
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-5.rs b/tests/ui/numbers-arithmetic/overflowing-rsh-5.rs
index f75e779ed..f75e779ed 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-rsh-5.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-rsh-5.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-5.stderr b/tests/ui/numbers-arithmetic/overflowing-rsh-5.stderr
index e3b5859df..e3b5859df 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-rsh-5.stderr
+++ b/tests/ui/numbers-arithmetic/overflowing-rsh-5.stderr
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-6.rs b/tests/ui/numbers-arithmetic/overflowing-rsh-6.rs
index f75e779ed..f75e779ed 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-rsh-6.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-rsh-6.rs
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-6.stderr b/tests/ui/numbers-arithmetic/overflowing-rsh-6.stderr
index a3475c04c..a3475c04c 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-rsh-6.stderr
+++ b/tests/ui/numbers-arithmetic/overflowing-rsh-6.stderr
diff --git a/src/test/ui/numbers-arithmetic/overflowing-sub.rs b/tests/ui/numbers-arithmetic/overflowing-sub.rs
index 66685ac96..66685ac96 100644
--- a/src/test/ui/numbers-arithmetic/overflowing-sub.rs
+++ b/tests/ui/numbers-arithmetic/overflowing-sub.rs
diff --git a/src/test/ui/numbers-arithmetic/promoted_overflow.rs b/tests/ui/numbers-arithmetic/promoted_overflow.rs
index ba168f773..ba168f773 100644
--- a/src/test/ui/numbers-arithmetic/promoted_overflow.rs
+++ b/tests/ui/numbers-arithmetic/promoted_overflow.rs
diff --git a/src/test/ui/numbers-arithmetic/promoted_overflow_opt.rs b/tests/ui/numbers-arithmetic/promoted_overflow_opt.rs
index 76279e913..76279e913 100644
--- a/src/test/ui/numbers-arithmetic/promoted_overflow_opt.rs
+++ b/tests/ui/numbers-arithmetic/promoted_overflow_opt.rs
diff --git a/src/test/ui/numbers-arithmetic/saturating-float-casts-impl.rs b/tests/ui/numbers-arithmetic/saturating-float-casts-impl.rs
index 4c6929d66..4c6929d66 100644
--- a/src/test/ui/numbers-arithmetic/saturating-float-casts-impl.rs
+++ b/tests/ui/numbers-arithmetic/saturating-float-casts-impl.rs
diff --git a/src/test/ui/numbers-arithmetic/saturating-float-casts-wasm.rs b/tests/ui/numbers-arithmetic/saturating-float-casts-wasm.rs
index cad059173..cad059173 100644
--- a/src/test/ui/numbers-arithmetic/saturating-float-casts-wasm.rs
+++ b/tests/ui/numbers-arithmetic/saturating-float-casts-wasm.rs
diff --git a/src/test/ui/numbers-arithmetic/saturating-float-casts.rs b/tests/ui/numbers-arithmetic/saturating-float-casts.rs
index cc248a9be..cc248a9be 100644
--- a/src/test/ui/numbers-arithmetic/saturating-float-casts.rs
+++ b/tests/ui/numbers-arithmetic/saturating-float-casts.rs
diff --git a/src/test/ui/numbers-arithmetic/shift-near-oflo.rs b/tests/ui/numbers-arithmetic/shift-near-oflo.rs
index 55006a113..55006a113 100644
--- a/src/test/ui/numbers-arithmetic/shift-near-oflo.rs
+++ b/tests/ui/numbers-arithmetic/shift-near-oflo.rs
diff --git a/src/test/ui/numbers-arithmetic/shift-various-types.rs b/tests/ui/numbers-arithmetic/shift-various-types.rs
index 473bda3d7..473bda3d7 100644
--- a/src/test/ui/numbers-arithmetic/shift-various-types.rs
+++ b/tests/ui/numbers-arithmetic/shift-various-types.rs
diff --git a/src/test/ui/numbers-arithmetic/shift.rs b/tests/ui/numbers-arithmetic/shift.rs
index 2fc77928e..2fc77928e 100644
--- a/src/test/ui/numbers-arithmetic/shift.rs
+++ b/tests/ui/numbers-arithmetic/shift.rs
diff --git a/src/test/ui/numbers-arithmetic/signed-shift-const-eval.rs b/tests/ui/numbers-arithmetic/signed-shift-const-eval.rs
index 6d0462b46..6d0462b46 100644
--- a/src/test/ui/numbers-arithmetic/signed-shift-const-eval.rs
+++ b/tests/ui/numbers-arithmetic/signed-shift-const-eval.rs
diff --git a/src/test/ui/numbers-arithmetic/suggest-float-literal.fixed b/tests/ui/numbers-arithmetic/suggest-float-literal.fixed
index 9278262a6..9278262a6 100644
--- a/src/test/ui/numbers-arithmetic/suggest-float-literal.fixed
+++ b/tests/ui/numbers-arithmetic/suggest-float-literal.fixed
diff --git a/src/test/ui/numbers-arithmetic/suggest-float-literal.rs b/tests/ui/numbers-arithmetic/suggest-float-literal.rs
index 59e67f8d3..59e67f8d3 100644
--- a/src/test/ui/numbers-arithmetic/suggest-float-literal.rs
+++ b/tests/ui/numbers-arithmetic/suggest-float-literal.rs
diff --git a/src/test/ui/numbers-arithmetic/suggest-float-literal.stderr b/tests/ui/numbers-arithmetic/suggest-float-literal.stderr
index 03779d356..03779d356 100644
--- a/src/test/ui/numbers-arithmetic/suggest-float-literal.stderr
+++ b/tests/ui/numbers-arithmetic/suggest-float-literal.stderr
diff --git a/src/test/ui/numbers-arithmetic/u128-as-f32.rs b/tests/ui/numbers-arithmetic/u128-as-f32.rs
index 839ce932d..839ce932d 100644
--- a/src/test/ui/numbers-arithmetic/u128-as-f32.rs
+++ b/tests/ui/numbers-arithmetic/u128-as-f32.rs
diff --git a/src/test/ui/numbers-arithmetic/u128.rs b/tests/ui/numbers-arithmetic/u128.rs
index d7e28055b..d7e28055b 100644
--- a/src/test/ui/numbers-arithmetic/u128.rs
+++ b/tests/ui/numbers-arithmetic/u128.rs
diff --git a/src/test/ui/numbers-arithmetic/u32-decr.rs b/tests/ui/numbers-arithmetic/u32-decr.rs
index d9e097818..d9e097818 100644
--- a/src/test/ui/numbers-arithmetic/u32-decr.rs
+++ b/tests/ui/numbers-arithmetic/u32-decr.rs
diff --git a/src/test/ui/numbers-arithmetic/u8-incr-decr.rs b/tests/ui/numbers-arithmetic/u8-incr-decr.rs
index b16ec011d..b16ec011d 100644
--- a/src/test/ui/numbers-arithmetic/u8-incr-decr.rs
+++ b/tests/ui/numbers-arithmetic/u8-incr-decr.rs
diff --git a/src/test/ui/numbers-arithmetic/u8-incr.rs b/tests/ui/numbers-arithmetic/u8-incr.rs
index 5242acf5b..5242acf5b 100644
--- a/src/test/ui/numbers-arithmetic/u8-incr.rs
+++ b/tests/ui/numbers-arithmetic/u8-incr.rs
diff --git a/src/test/ui/numbers-arithmetic/uint.rs b/tests/ui/numbers-arithmetic/uint.rs
index d219eae8f..d219eae8f 100644
--- a/src/test/ui/numbers-arithmetic/uint.rs
+++ b/tests/ui/numbers-arithmetic/uint.rs
diff --git a/src/test/ui/numbers-arithmetic/unary-minus-suffix-inference.rs b/tests/ui/numbers-arithmetic/unary-minus-suffix-inference.rs
index a4d0a8494..a4d0a8494 100644
--- a/src/test/ui/numbers-arithmetic/unary-minus-suffix-inference.rs
+++ b/tests/ui/numbers-arithmetic/unary-minus-suffix-inference.rs
diff --git a/src/test/ui/numeric/const-scope.rs b/tests/ui/numeric/const-scope.rs
index 053599a9b..053599a9b 100644
--- a/src/test/ui/numeric/const-scope.rs
+++ b/tests/ui/numeric/const-scope.rs
diff --git a/src/test/ui/numeric/const-scope.stderr b/tests/ui/numeric/const-scope.stderr
index 4e4bcdf23..4e4bcdf23 100644
--- a/src/test/ui/numeric/const-scope.stderr
+++ b/tests/ui/numeric/const-scope.stderr
diff --git a/src/test/ui/numeric/integer-literal-suffix-inference.rs b/tests/ui/numeric/integer-literal-suffix-inference.rs
index c320f2bb7..c320f2bb7 100644
--- a/src/test/ui/numeric/integer-literal-suffix-inference.rs
+++ b/tests/ui/numeric/integer-literal-suffix-inference.rs
diff --git a/src/test/ui/numeric/integer-literal-suffix-inference.stderr b/tests/ui/numeric/integer-literal-suffix-inference.stderr
index 5045f584c..5045f584c 100644
--- a/src/test/ui/numeric/integer-literal-suffix-inference.stderr
+++ b/tests/ui/numeric/integer-literal-suffix-inference.stderr
diff --git a/src/test/ui/numeric/len.rs b/tests/ui/numeric/len.rs
index a72540988..a72540988 100644
--- a/src/test/ui/numeric/len.rs
+++ b/tests/ui/numeric/len.rs
diff --git a/src/test/ui/numeric/len.stderr b/tests/ui/numeric/len.stderr
index 55a61b5e4..55a61b5e4 100644
--- a/src/test/ui/numeric/len.stderr
+++ b/tests/ui/numeric/len.stderr
diff --git a/src/test/ui/numeric/numeric-cast-2.rs b/tests/ui/numeric/numeric-cast-2.rs
index ad2de5d2b..ad2de5d2b 100644
--- a/src/test/ui/numeric/numeric-cast-2.rs
+++ b/tests/ui/numeric/numeric-cast-2.rs
diff --git a/src/test/ui/numeric/numeric-cast-2.stderr b/tests/ui/numeric/numeric-cast-2.stderr
index a7b342739..a7b342739 100644
--- a/src/test/ui/numeric/numeric-cast-2.stderr
+++ b/tests/ui/numeric/numeric-cast-2.stderr
diff --git a/src/test/ui/numeric/numeric-cast-binop.fixed b/tests/ui/numeric/numeric-cast-binop.fixed
index edb085e71..edb085e71 100644
--- a/src/test/ui/numeric/numeric-cast-binop.fixed
+++ b/tests/ui/numeric/numeric-cast-binop.fixed
diff --git a/src/test/ui/numeric/numeric-cast-binop.rs b/tests/ui/numeric/numeric-cast-binop.rs
index c1ed8de8a..c1ed8de8a 100644
--- a/src/test/ui/numeric/numeric-cast-binop.rs
+++ b/tests/ui/numeric/numeric-cast-binop.rs
diff --git a/tests/ui/numeric/numeric-cast-binop.stderr b/tests/ui/numeric/numeric-cast-binop.stderr
new file mode 100644
index 000000000..d5213e3f5
--- /dev/null
+++ b/tests/ui/numeric/numeric-cast-binop.stderr
@@ -0,0 +1,1719 @@
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:23:16
+   |
+LL |         x_u8 > x_u16;
+   |         ----   ^^^^^ expected `u8`, found `u16`
+   |         |
+   |         expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `u16`, matching the type of `x_u16`
+   |
+LL |         u16::from(x_u8) > x_u16;
+   |         ++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:25:16
+   |
+LL |         x_u8 > x_u32;
+   |         ----   ^^^^^ expected `u8`, found `u32`
+   |         |
+   |         expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `u32`, matching the type of `x_u32`
+   |
+LL |         u32::from(x_u8) > x_u32;
+   |         ++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:27:16
+   |
+LL |         x_u8 > x_u64;
+   |         ----   ^^^^^ expected `u8`, found `u64`
+   |         |
+   |         expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `u64`, matching the type of `x_u64`
+   |
+LL |         u64::from(x_u8) > x_u64;
+   |         ++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:29:16
+   |
+LL |         x_u8 > x_u128;
+   |         ----   ^^^^^^ expected `u8`, found `u128`
+   |         |
+   |         expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `u128`, matching the type of `x_u128`
+   |
+LL |         u128::from(x_u8) > x_u128;
+   |         +++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:31:16
+   |
+LL |         x_u8 > x_usize;
+   |         ----   ^^^^^^^ expected `u8`, found `usize`
+   |         |
+   |         expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `usize`, matching the type of `x_usize`
+   |
+LL |         usize::from(x_u8) > x_usize;
+   |         ++++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:34:17
+   |
+LL |         x_u16 > x_u8;
+   |         -----   ^^^^ expected `u16`, found `u8`
+   |         |
+   |         expected because this is `u16`
+   |
+help: you can convert a `u8` to a `u16`
+   |
+LL |         x_u16 > x_u8.into();
+   |                     +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:36:17
+   |
+LL |         x_u16 > x_u32;
+   |         -----   ^^^^^ expected `u16`, found `u32`
+   |         |
+   |         expected because this is `u16`
+   |
+help: you can convert `x_u16` from `u16` to `u32`, matching the type of `x_u32`
+   |
+LL |         u32::from(x_u16) > x_u32;
+   |         ++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:38:17
+   |
+LL |         x_u16 > x_u64;
+   |         -----   ^^^^^ expected `u16`, found `u64`
+   |         |
+   |         expected because this is `u16`
+   |
+help: you can convert `x_u16` from `u16` to `u64`, matching the type of `x_u64`
+   |
+LL |         u64::from(x_u16) > x_u64;
+   |         ++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:40:17
+   |
+LL |         x_u16 > x_u128;
+   |         -----   ^^^^^^ expected `u16`, found `u128`
+   |         |
+   |         expected because this is `u16`
+   |
+help: you can convert `x_u16` from `u16` to `u128`, matching the type of `x_u128`
+   |
+LL |         u128::from(x_u16) > x_u128;
+   |         +++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:42:17
+   |
+LL |         x_u16 > x_usize;
+   |         -----   ^^^^^^^ expected `u16`, found `usize`
+   |         |
+   |         expected because this is `u16`
+   |
+help: you can convert `x_u16` from `u16` to `usize`, matching the type of `x_usize`
+   |
+LL |         usize::from(x_u16) > x_usize;
+   |         ++++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:45:17
+   |
+LL |         x_u32 > x_u8;
+   |         -----   ^^^^ expected `u32`, found `u8`
+   |         |
+   |         expected because this is `u32`
+   |
+help: you can convert a `u8` to a `u32`
+   |
+LL |         x_u32 > x_u8.into();
+   |                     +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:47:17
+   |
+LL |         x_u32 > x_u16;
+   |         -----   ^^^^^ expected `u32`, found `u16`
+   |         |
+   |         expected because this is `u32`
+   |
+help: you can convert a `u16` to a `u32`
+   |
+LL |         x_u32 > x_u16.into();
+   |                      +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:49:17
+   |
+LL |         x_u32 > x_u64;
+   |         -----   ^^^^^ expected `u32`, found `u64`
+   |         |
+   |         expected because this is `u32`
+   |
+help: you can convert `x_u32` from `u32` to `u64`, matching the type of `x_u64`
+   |
+LL |         u64::from(x_u32) > x_u64;
+   |         ++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:51:17
+   |
+LL |         x_u32 > x_u128;
+   |         -----   ^^^^^^ expected `u32`, found `u128`
+   |         |
+   |         expected because this is `u32`
+   |
+help: you can convert `x_u32` from `u32` to `u128`, matching the type of `x_u128`
+   |
+LL |         u128::from(x_u32) > x_u128;
+   |         +++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:53:17
+   |
+LL |         x_u32 > x_usize;
+   |         -----   ^^^^^^^ expected `u32`, found `usize`
+   |         |
+   |         expected because this is `u32`
+   |
+help: you can convert a `usize` to a `u32` and panic if the converted value doesn't fit
+   |
+LL |         x_u32 > x_usize.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:56:17
+   |
+LL |         x_u64 > x_u8;
+   |         -----   ^^^^ expected `u64`, found `u8`
+   |         |
+   |         expected because this is `u64`
+   |
+help: you can convert a `u8` to a `u64`
+   |
+LL |         x_u64 > x_u8.into();
+   |                     +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:58:17
+   |
+LL |         x_u64 > x_u16;
+   |         -----   ^^^^^ expected `u64`, found `u16`
+   |         |
+   |         expected because this is `u64`
+   |
+help: you can convert a `u16` to a `u64`
+   |
+LL |         x_u64 > x_u16.into();
+   |                      +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:60:17
+   |
+LL |         x_u64 > x_u32;
+   |         -----   ^^^^^ expected `u64`, found `u32`
+   |         |
+   |         expected because this is `u64`
+   |
+help: you can convert a `u32` to a `u64`
+   |
+LL |         x_u64 > x_u32.into();
+   |                      +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:62:17
+   |
+LL |         x_u64 > x_u128;
+   |         -----   ^^^^^^ expected `u64`, found `u128`
+   |         |
+   |         expected because this is `u64`
+   |
+help: you can convert `x_u64` from `u64` to `u128`, matching the type of `x_u128`
+   |
+LL |         u128::from(x_u64) > x_u128;
+   |         +++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:64:17
+   |
+LL |         x_u64 > x_usize;
+   |         -----   ^^^^^^^ expected `u64`, found `usize`
+   |         |
+   |         expected because this is `u64`
+   |
+help: you can convert a `usize` to a `u64` and panic if the converted value doesn't fit
+   |
+LL |         x_u64 > x_usize.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:67:18
+   |
+LL |         x_u128 > x_u8;
+   |         ------   ^^^^ expected `u128`, found `u8`
+   |         |
+   |         expected because this is `u128`
+   |
+help: you can convert a `u8` to a `u128`
+   |
+LL |         x_u128 > x_u8.into();
+   |                      +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:69:18
+   |
+LL |         x_u128 > x_u16;
+   |         ------   ^^^^^ expected `u128`, found `u16`
+   |         |
+   |         expected because this is `u128`
+   |
+help: you can convert a `u16` to a `u128`
+   |
+LL |         x_u128 > x_u16.into();
+   |                       +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:71:18
+   |
+LL |         x_u128 > x_u32;
+   |         ------   ^^^^^ expected `u128`, found `u32`
+   |         |
+   |         expected because this is `u128`
+   |
+help: you can convert a `u32` to a `u128`
+   |
+LL |         x_u128 > x_u32.into();
+   |                       +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:73:18
+   |
+LL |         x_u128 > x_u64;
+   |         ------   ^^^^^ expected `u128`, found `u64`
+   |         |
+   |         expected because this is `u128`
+   |
+help: you can convert a `u64` to a `u128`
+   |
+LL |         x_u128 > x_u64.into();
+   |                       +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:75:18
+   |
+LL |         x_u128 > x_usize;
+   |         ------   ^^^^^^^ expected `u128`, found `usize`
+   |         |
+   |         expected because this is `u128`
+   |
+help: you can convert a `usize` to a `u128` and panic if the converted value doesn't fit
+   |
+LL |         x_u128 > x_usize.try_into().unwrap();
+   |                         ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:78:19
+   |
+LL |         x_usize > x_u8;
+   |         -------   ^^^^ expected `usize`, found `u8`
+   |         |
+   |         expected because this is `usize`
+   |
+help: you can convert a `u8` to a `usize`
+   |
+LL |         x_usize > x_u8.into();
+   |                       +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:80:19
+   |
+LL |         x_usize > x_u16;
+   |         -------   ^^^^^ expected `usize`, found `u16`
+   |         |
+   |         expected because this is `usize`
+   |
+help: you can convert a `u16` to a `usize`
+   |
+LL |         x_usize > x_u16.into();
+   |                        +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:82:19
+   |
+LL |         x_usize > x_u32;
+   |         -------   ^^^^^ expected `usize`, found `u32`
+   |         |
+   |         expected because this is `usize`
+   |
+help: you can convert a `u32` to a `usize` and panic if the converted value doesn't fit
+   |
+LL |         x_usize > x_u32.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:84:19
+   |
+LL |         x_usize > x_u64;
+   |         -------   ^^^^^ expected `usize`, found `u64`
+   |         |
+   |         expected because this is `usize`
+   |
+help: you can convert a `u64` to a `usize` and panic if the converted value doesn't fit
+   |
+LL |         x_usize > x_u64.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:86:19
+   |
+LL |         x_usize > x_u128;
+   |         -------   ^^^^^^ expected `usize`, found `u128`
+   |         |
+   |         expected because this is `usize`
+   |
+help: you can convert a `u128` to a `usize` and panic if the converted value doesn't fit
+   |
+LL |         x_usize > x_u128.try_into().unwrap();
+   |                         ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:92:16
+   |
+LL |         x_i8 > x_i16;
+   |         ----   ^^^^^ expected `i8`, found `i16`
+   |         |
+   |         expected because this is `i8`
+   |
+help: you can convert `x_i8` from `i8` to `i16`, matching the type of `x_i16`
+   |
+LL |         i16::from(x_i8) > x_i16;
+   |         ++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:94:16
+   |
+LL |         x_i8 > x_i32;
+   |         ----   ^^^^^ expected `i8`, found `i32`
+   |         |
+   |         expected because this is `i8`
+   |
+help: you can convert `x_i8` from `i8` to `i32`, matching the type of `x_i32`
+   |
+LL |         i32::from(x_i8) > x_i32;
+   |         ++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:96:16
+   |
+LL |         x_i8 > x_i64;
+   |         ----   ^^^^^ expected `i8`, found `i64`
+   |         |
+   |         expected because this is `i8`
+   |
+help: you can convert `x_i8` from `i8` to `i64`, matching the type of `x_i64`
+   |
+LL |         i64::from(x_i8) > x_i64;
+   |         ++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:98:16
+   |
+LL |         x_i8 > x_i128;
+   |         ----   ^^^^^^ expected `i8`, found `i128`
+   |         |
+   |         expected because this is `i8`
+   |
+help: you can convert `x_i8` from `i8` to `i128`, matching the type of `x_i128`
+   |
+LL |         i128::from(x_i8) > x_i128;
+   |         +++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:100:16
+   |
+LL |         x_i8 > x_isize;
+   |         ----   ^^^^^^^ expected `i8`, found `isize`
+   |         |
+   |         expected because this is `i8`
+   |
+help: you can convert `x_i8` from `i8` to `isize`, matching the type of `x_isize`
+   |
+LL |         isize::from(x_i8) > x_isize;
+   |         ++++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:103:17
+   |
+LL |         x_i16 > x_i8;
+   |         -----   ^^^^ expected `i16`, found `i8`
+   |         |
+   |         expected because this is `i16`
+   |
+help: you can convert an `i8` to an `i16`
+   |
+LL |         x_i16 > x_i8.into();
+   |                     +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:105:17
+   |
+LL |         x_i16 > x_i32;
+   |         -----   ^^^^^ expected `i16`, found `i32`
+   |         |
+   |         expected because this is `i16`
+   |
+help: you can convert `x_i16` from `i16` to `i32`, matching the type of `x_i32`
+   |
+LL |         i32::from(x_i16) > x_i32;
+   |         ++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:107:17
+   |
+LL |         x_i16 > x_i64;
+   |         -----   ^^^^^ expected `i16`, found `i64`
+   |         |
+   |         expected because this is `i16`
+   |
+help: you can convert `x_i16` from `i16` to `i64`, matching the type of `x_i64`
+   |
+LL |         i64::from(x_i16) > x_i64;
+   |         ++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:109:17
+   |
+LL |         x_i16 > x_i128;
+   |         -----   ^^^^^^ expected `i16`, found `i128`
+   |         |
+   |         expected because this is `i16`
+   |
+help: you can convert `x_i16` from `i16` to `i128`, matching the type of `x_i128`
+   |
+LL |         i128::from(x_i16) > x_i128;
+   |         +++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:111:17
+   |
+LL |         x_i16 > x_isize;
+   |         -----   ^^^^^^^ expected `i16`, found `isize`
+   |         |
+   |         expected because this is `i16`
+   |
+help: you can convert `x_i16` from `i16` to `isize`, matching the type of `x_isize`
+   |
+LL |         isize::from(x_i16) > x_isize;
+   |         ++++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:114:17
+   |
+LL |         x_i32 > x_i8;
+   |         -----   ^^^^ expected `i32`, found `i8`
+   |         |
+   |         expected because this is `i32`
+   |
+help: you can convert an `i8` to an `i32`
+   |
+LL |         x_i32 > x_i8.into();
+   |                     +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:116:17
+   |
+LL |         x_i32 > x_i16;
+   |         -----   ^^^^^ expected `i32`, found `i16`
+   |         |
+   |         expected because this is `i32`
+   |
+help: you can convert an `i16` to an `i32`
+   |
+LL |         x_i32 > x_i16.into();
+   |                      +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:118:17
+   |
+LL |         x_i32 > x_i64;
+   |         -----   ^^^^^ expected `i32`, found `i64`
+   |         |
+   |         expected because this is `i32`
+   |
+help: you can convert `x_i32` from `i32` to `i64`, matching the type of `x_i64`
+   |
+LL |         i64::from(x_i32) > x_i64;
+   |         ++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:120:17
+   |
+LL |         x_i32 > x_i128;
+   |         -----   ^^^^^^ expected `i32`, found `i128`
+   |         |
+   |         expected because this is `i32`
+   |
+help: you can convert `x_i32` from `i32` to `i128`, matching the type of `x_i128`
+   |
+LL |         i128::from(x_i32) > x_i128;
+   |         +++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:122:17
+   |
+LL |         x_i32 > x_isize;
+   |         -----   ^^^^^^^ expected `i32`, found `isize`
+   |         |
+   |         expected because this is `i32`
+   |
+help: you can convert an `isize` to an `i32` and panic if the converted value doesn't fit
+   |
+LL |         x_i32 > x_isize.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:125:17
+   |
+LL |         x_i64 > x_i8;
+   |         -----   ^^^^ expected `i64`, found `i8`
+   |         |
+   |         expected because this is `i64`
+   |
+help: you can convert an `i8` to an `i64`
+   |
+LL |         x_i64 > x_i8.into();
+   |                     +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:127:17
+   |
+LL |         x_i64 > x_i16;
+   |         -----   ^^^^^ expected `i64`, found `i16`
+   |         |
+   |         expected because this is `i64`
+   |
+help: you can convert an `i16` to an `i64`
+   |
+LL |         x_i64 > x_i16.into();
+   |                      +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:129:17
+   |
+LL |         x_i64 > x_i32;
+   |         -----   ^^^^^ expected `i64`, found `i32`
+   |         |
+   |         expected because this is `i64`
+   |
+help: you can convert an `i32` to an `i64`
+   |
+LL |         x_i64 > x_i32.into();
+   |                      +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:131:17
+   |
+LL |         x_i64 > x_i128;
+   |         -----   ^^^^^^ expected `i64`, found `i128`
+   |         |
+   |         expected because this is `i64`
+   |
+help: you can convert `x_i64` from `i64` to `i128`, matching the type of `x_i128`
+   |
+LL |         i128::from(x_i64) > x_i128;
+   |         +++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:133:17
+   |
+LL |         x_i64 > x_isize;
+   |         -----   ^^^^^^^ expected `i64`, found `isize`
+   |         |
+   |         expected because this is `i64`
+   |
+help: you can convert an `isize` to an `i64` and panic if the converted value doesn't fit
+   |
+LL |         x_i64 > x_isize.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:136:18
+   |
+LL |         x_i128 > x_i8;
+   |         ------   ^^^^ expected `i128`, found `i8`
+   |         |
+   |         expected because this is `i128`
+   |
+help: you can convert an `i8` to an `i128`
+   |
+LL |         x_i128 > x_i8.into();
+   |                      +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:138:18
+   |
+LL |         x_i128 > x_i16;
+   |         ------   ^^^^^ expected `i128`, found `i16`
+   |         |
+   |         expected because this is `i128`
+   |
+help: you can convert an `i16` to an `i128`
+   |
+LL |         x_i128 > x_i16.into();
+   |                       +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:140:18
+   |
+LL |         x_i128 > x_i32;
+   |         ------   ^^^^^ expected `i128`, found `i32`
+   |         |
+   |         expected because this is `i128`
+   |
+help: you can convert an `i32` to an `i128`
+   |
+LL |         x_i128 > x_i32.into();
+   |                       +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:142:18
+   |
+LL |         x_i128 > x_i64;
+   |         ------   ^^^^^ expected `i128`, found `i64`
+   |         |
+   |         expected because this is `i128`
+   |
+help: you can convert an `i64` to an `i128`
+   |
+LL |         x_i128 > x_i64.into();
+   |                       +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:144:18
+   |
+LL |         x_i128 > x_isize;
+   |         ------   ^^^^^^^ expected `i128`, found `isize`
+   |         |
+   |         expected because this is `i128`
+   |
+help: you can convert an `isize` to an `i128` and panic if the converted value doesn't fit
+   |
+LL |         x_i128 > x_isize.try_into().unwrap();
+   |                         ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:147:19
+   |
+LL |         x_isize > x_i8;
+   |         -------   ^^^^ expected `isize`, found `i8`
+   |         |
+   |         expected because this is `isize`
+   |
+help: you can convert an `i8` to an `isize`
+   |
+LL |         x_isize > x_i8.into();
+   |                       +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:149:19
+   |
+LL |         x_isize > x_i16;
+   |         -------   ^^^^^ expected `isize`, found `i16`
+   |         |
+   |         expected because this is `isize`
+   |
+help: you can convert an `i16` to an `isize`
+   |
+LL |         x_isize > x_i16.into();
+   |                        +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:151:19
+   |
+LL |         x_isize > x_i32;
+   |         -------   ^^^^^ expected `isize`, found `i32`
+   |         |
+   |         expected because this is `isize`
+   |
+help: you can convert an `i32` to an `isize` and panic if the converted value doesn't fit
+   |
+LL |         x_isize > x_i32.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:153:19
+   |
+LL |         x_isize > x_i64;
+   |         -------   ^^^^^ expected `isize`, found `i64`
+   |         |
+   |         expected because this is `isize`
+   |
+help: you can convert an `i64` to an `isize` and panic if the converted value doesn't fit
+   |
+LL |         x_isize > x_i64.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:155:19
+   |
+LL |         x_isize > x_i128;
+   |         -------   ^^^^^^ expected `isize`, found `i128`
+   |         |
+   |         expected because this is `isize`
+   |
+help: you can convert an `i128` to an `isize` and panic if the converted value doesn't fit
+   |
+LL |         x_isize > x_i128.try_into().unwrap();
+   |                         ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:161:16
+   |
+LL |         x_u8 > x_i8;
+   |         ----   ^^^^ expected `u8`, found `i8`
+   |         |
+   |         expected because this is `u8`
+   |
+help: you can convert an `i8` to a `u8` and panic if the converted value doesn't fit
+   |
+LL |         x_u8 > x_i8.try_into().unwrap();
+   |                    ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:163:16
+   |
+LL |         x_u8 > x_i16;
+   |         ----   ^^^^^ expected `u8`, found `i16`
+   |         |
+   |         expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `i16`, matching the type of `x_i16`
+   |
+LL |         i16::from(x_u8) > x_i16;
+   |         ++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:165:16
+   |
+LL |         x_u8 > x_i32;
+   |         ----   ^^^^^ expected `u8`, found `i32`
+   |         |
+   |         expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `i32`, matching the type of `x_i32`
+   |
+LL |         i32::from(x_u8) > x_i32;
+   |         ++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:167:16
+   |
+LL |         x_u8 > x_i64;
+   |         ----   ^^^^^ expected `u8`, found `i64`
+   |         |
+   |         expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `i64`, matching the type of `x_i64`
+   |
+LL |         i64::from(x_u8) > x_i64;
+   |         ++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:169:16
+   |
+LL |         x_u8 > x_i128;
+   |         ----   ^^^^^^ expected `u8`, found `i128`
+   |         |
+   |         expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `i128`, matching the type of `x_i128`
+   |
+LL |         i128::from(x_u8) > x_i128;
+   |         +++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:171:16
+   |
+LL |         x_u8 > x_isize;
+   |         ----   ^^^^^^^ expected `u8`, found `isize`
+   |         |
+   |         expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `isize`, matching the type of `x_isize`
+   |
+LL |         isize::from(x_u8) > x_isize;
+   |         ++++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:174:17
+   |
+LL |         x_u16 > x_i8;
+   |         -----   ^^^^ expected `u16`, found `i8`
+   |         |
+   |         expected because this is `u16`
+   |
+help: you can convert an `i8` to a `u16` and panic if the converted value doesn't fit
+   |
+LL |         x_u16 > x_i8.try_into().unwrap();
+   |                     ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:176:17
+   |
+LL |         x_u16 > x_i16;
+   |         -----   ^^^^^ expected `u16`, found `i16`
+   |         |
+   |         expected because this is `u16`
+   |
+help: you can convert an `i16` to a `u16` and panic if the converted value doesn't fit
+   |
+LL |         x_u16 > x_i16.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:178:17
+   |
+LL |         x_u16 > x_i32;
+   |         -----   ^^^^^ expected `u16`, found `i32`
+   |         |
+   |         expected because this is `u16`
+   |
+help: you can convert `x_u16` from `u16` to `i32`, matching the type of `x_i32`
+   |
+LL |         i32::from(x_u16) > x_i32;
+   |         ++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:180:17
+   |
+LL |         x_u16 > x_i64;
+   |         -----   ^^^^^ expected `u16`, found `i64`
+   |         |
+   |         expected because this is `u16`
+   |
+help: you can convert `x_u16` from `u16` to `i64`, matching the type of `x_i64`
+   |
+LL |         i64::from(x_u16) > x_i64;
+   |         ++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:182:17
+   |
+LL |         x_u16 > x_i128;
+   |         -----   ^^^^^^ expected `u16`, found `i128`
+   |         |
+   |         expected because this is `u16`
+   |
+help: you can convert `x_u16` from `u16` to `i128`, matching the type of `x_i128`
+   |
+LL |         i128::from(x_u16) > x_i128;
+   |         +++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:184:17
+   |
+LL |         x_u16 > x_isize;
+   |         -----   ^^^^^^^ expected `u16`, found `isize`
+   |         |
+   |         expected because this is `u16`
+   |
+help: you can convert an `isize` to a `u16` and panic if the converted value doesn't fit
+   |
+LL |         x_u16 > x_isize.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:187:17
+   |
+LL |         x_u32 > x_i8;
+   |         -----   ^^^^ expected `u32`, found `i8`
+   |         |
+   |         expected because this is `u32`
+   |
+help: you can convert an `i8` to a `u32` and panic if the converted value doesn't fit
+   |
+LL |         x_u32 > x_i8.try_into().unwrap();
+   |                     ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:189:17
+   |
+LL |         x_u32 > x_i16;
+   |         -----   ^^^^^ expected `u32`, found `i16`
+   |         |
+   |         expected because this is `u32`
+   |
+help: you can convert an `i16` to a `u32` and panic if the converted value doesn't fit
+   |
+LL |         x_u32 > x_i16.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:191:17
+   |
+LL |         x_u32 > x_i32;
+   |         -----   ^^^^^ expected `u32`, found `i32`
+   |         |
+   |         expected because this is `u32`
+   |
+help: you can convert an `i32` to a `u32` and panic if the converted value doesn't fit
+   |
+LL |         x_u32 > x_i32.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:193:17
+   |
+LL |         x_u32 > x_i64;
+   |         -----   ^^^^^ expected `u32`, found `i64`
+   |         |
+   |         expected because this is `u32`
+   |
+help: you can convert `x_u32` from `u32` to `i64`, matching the type of `x_i64`
+   |
+LL |         i64::from(x_u32) > x_i64;
+   |         ++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:195:17
+   |
+LL |         x_u32 > x_i128;
+   |         -----   ^^^^^^ expected `u32`, found `i128`
+   |         |
+   |         expected because this is `u32`
+   |
+help: you can convert `x_u32` from `u32` to `i128`, matching the type of `x_i128`
+   |
+LL |         i128::from(x_u32) > x_i128;
+   |         +++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:197:17
+   |
+LL |         x_u32 > x_isize;
+   |         -----   ^^^^^^^ expected `u32`, found `isize`
+   |         |
+   |         expected because this is `u32`
+   |
+help: you can convert an `isize` to a `u32` and panic if the converted value doesn't fit
+   |
+LL |         x_u32 > x_isize.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:200:17
+   |
+LL |         x_u64 > x_i8;
+   |         -----   ^^^^ expected `u64`, found `i8`
+   |         |
+   |         expected because this is `u64`
+   |
+help: you can convert an `i8` to a `u64` and panic if the converted value doesn't fit
+   |
+LL |         x_u64 > x_i8.try_into().unwrap();
+   |                     ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:202:17
+   |
+LL |         x_u64 > x_i16;
+   |         -----   ^^^^^ expected `u64`, found `i16`
+   |         |
+   |         expected because this is `u64`
+   |
+help: you can convert an `i16` to a `u64` and panic if the converted value doesn't fit
+   |
+LL |         x_u64 > x_i16.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:204:17
+   |
+LL |         x_u64 > x_i32;
+   |         -----   ^^^^^ expected `u64`, found `i32`
+   |         |
+   |         expected because this is `u64`
+   |
+help: you can convert an `i32` to a `u64` and panic if the converted value doesn't fit
+   |
+LL |         x_u64 > x_i32.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:206:17
+   |
+LL |         x_u64 > x_i64;
+   |         -----   ^^^^^ expected `u64`, found `i64`
+   |         |
+   |         expected because this is `u64`
+   |
+help: you can convert an `i64` to a `u64` and panic if the converted value doesn't fit
+   |
+LL |         x_u64 > x_i64.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:208:17
+   |
+LL |         x_u64 > x_i128;
+   |         -----   ^^^^^^ expected `u64`, found `i128`
+   |         |
+   |         expected because this is `u64`
+   |
+help: you can convert `x_u64` from `u64` to `i128`, matching the type of `x_i128`
+   |
+LL |         i128::from(x_u64) > x_i128;
+   |         +++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:210:17
+   |
+LL |         x_u64 > x_isize;
+   |         -----   ^^^^^^^ expected `u64`, found `isize`
+   |         |
+   |         expected because this is `u64`
+   |
+help: you can convert an `isize` to a `u64` and panic if the converted value doesn't fit
+   |
+LL |         x_u64 > x_isize.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:213:18
+   |
+LL |         x_u128 > x_i8;
+   |         ------   ^^^^ expected `u128`, found `i8`
+   |         |
+   |         expected because this is `u128`
+   |
+help: you can convert an `i8` to a `u128` and panic if the converted value doesn't fit
+   |
+LL |         x_u128 > x_i8.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:215:18
+   |
+LL |         x_u128 > x_i16;
+   |         ------   ^^^^^ expected `u128`, found `i16`
+   |         |
+   |         expected because this is `u128`
+   |
+help: you can convert an `i16` to a `u128` and panic if the converted value doesn't fit
+   |
+LL |         x_u128 > x_i16.try_into().unwrap();
+   |                       ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:217:18
+   |
+LL |         x_u128 > x_i32;
+   |         ------   ^^^^^ expected `u128`, found `i32`
+   |         |
+   |         expected because this is `u128`
+   |
+help: you can convert an `i32` to a `u128` and panic if the converted value doesn't fit
+   |
+LL |         x_u128 > x_i32.try_into().unwrap();
+   |                       ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:219:18
+   |
+LL |         x_u128 > x_i64;
+   |         ------   ^^^^^ expected `u128`, found `i64`
+   |         |
+   |         expected because this is `u128`
+   |
+help: you can convert an `i64` to a `u128` and panic if the converted value doesn't fit
+   |
+LL |         x_u128 > x_i64.try_into().unwrap();
+   |                       ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:221:18
+   |
+LL |         x_u128 > x_i128;
+   |         ------   ^^^^^^ expected `u128`, found `i128`
+   |         |
+   |         expected because this is `u128`
+   |
+help: you can convert an `i128` to a `u128` and panic if the converted value doesn't fit
+   |
+LL |         x_u128 > x_i128.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:223:18
+   |
+LL |         x_u128 > x_isize;
+   |         ------   ^^^^^^^ expected `u128`, found `isize`
+   |         |
+   |         expected because this is `u128`
+   |
+help: you can convert an `isize` to a `u128` and panic if the converted value doesn't fit
+   |
+LL |         x_u128 > x_isize.try_into().unwrap();
+   |                         ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:226:19
+   |
+LL |         x_usize > x_i8;
+   |         -------   ^^^^ expected `usize`, found `i8`
+   |         |
+   |         expected because this is `usize`
+   |
+help: you can convert an `i8` to a `usize` and panic if the converted value doesn't fit
+   |
+LL |         x_usize > x_i8.try_into().unwrap();
+   |                       ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:228:19
+   |
+LL |         x_usize > x_i16;
+   |         -------   ^^^^^ expected `usize`, found `i16`
+   |         |
+   |         expected because this is `usize`
+   |
+help: you can convert an `i16` to a `usize` and panic if the converted value doesn't fit
+   |
+LL |         x_usize > x_i16.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:230:19
+   |
+LL |         x_usize > x_i32;
+   |         -------   ^^^^^ expected `usize`, found `i32`
+   |         |
+   |         expected because this is `usize`
+   |
+help: you can convert an `i32` to a `usize` and panic if the converted value doesn't fit
+   |
+LL |         x_usize > x_i32.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:232:19
+   |
+LL |         x_usize > x_i64;
+   |         -------   ^^^^^ expected `usize`, found `i64`
+   |         |
+   |         expected because this is `usize`
+   |
+help: you can convert an `i64` to a `usize` and panic if the converted value doesn't fit
+   |
+LL |         x_usize > x_i64.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:234:19
+   |
+LL |         x_usize > x_i128;
+   |         -------   ^^^^^^ expected `usize`, found `i128`
+   |         |
+   |         expected because this is `usize`
+   |
+help: you can convert an `i128` to a `usize` and panic if the converted value doesn't fit
+   |
+LL |         x_usize > x_i128.try_into().unwrap();
+   |                         ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:236:19
+   |
+LL |         x_usize > x_isize;
+   |         -------   ^^^^^^^ expected `usize`, found `isize`
+   |         |
+   |         expected because this is `usize`
+   |
+help: you can convert an `isize` to a `usize` and panic if the converted value doesn't fit
+   |
+LL |         x_usize > x_isize.try_into().unwrap();
+   |                          ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:242:16
+   |
+LL |         x_i8 > x_u8;
+   |         ----   ^^^^ expected `i8`, found `u8`
+   |         |
+   |         expected because this is `i8`
+   |
+help: you can convert a `u8` to an `i8` and panic if the converted value doesn't fit
+   |
+LL |         x_i8 > x_u8.try_into().unwrap();
+   |                    ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:244:16
+   |
+LL |         x_i8 > x_u16;
+   |         ----   ^^^^^ expected `i8`, found `u16`
+   |         |
+   |         expected because this is `i8`
+   |
+help: you can convert a `u16` to an `i8` and panic if the converted value doesn't fit
+   |
+LL |         x_i8 > x_u16.try_into().unwrap();
+   |                     ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:246:16
+   |
+LL |         x_i8 > x_u32;
+   |         ----   ^^^^^ expected `i8`, found `u32`
+   |         |
+   |         expected because this is `i8`
+   |
+help: you can convert a `u32` to an `i8` and panic if the converted value doesn't fit
+   |
+LL |         x_i8 > x_u32.try_into().unwrap();
+   |                     ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:248:16
+   |
+LL |         x_i8 > x_u64;
+   |         ----   ^^^^^ expected `i8`, found `u64`
+   |         |
+   |         expected because this is `i8`
+   |
+help: you can convert a `u64` to an `i8` and panic if the converted value doesn't fit
+   |
+LL |         x_i8 > x_u64.try_into().unwrap();
+   |                     ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:250:16
+   |
+LL |         x_i8 > x_u128;
+   |         ----   ^^^^^^ expected `i8`, found `u128`
+   |         |
+   |         expected because this is `i8`
+   |
+help: you can convert a `u128` to an `i8` and panic if the converted value doesn't fit
+   |
+LL |         x_i8 > x_u128.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:252:16
+   |
+LL |         x_i8 > x_usize;
+   |         ----   ^^^^^^^ expected `i8`, found `usize`
+   |         |
+   |         expected because this is `i8`
+   |
+help: you can convert a `usize` to an `i8` and panic if the converted value doesn't fit
+   |
+LL |         x_i8 > x_usize.try_into().unwrap();
+   |                       ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:255:17
+   |
+LL |         x_i16 > x_u8;
+   |         -----   ^^^^ expected `i16`, found `u8`
+   |         |
+   |         expected because this is `i16`
+   |
+help: you can convert a `u8` to an `i16`
+   |
+LL |         x_i16 > x_u8.into();
+   |                     +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:257:17
+   |
+LL |         x_i16 > x_u16;
+   |         -----   ^^^^^ expected `i16`, found `u16`
+   |         |
+   |         expected because this is `i16`
+   |
+help: you can convert a `u16` to an `i16` and panic if the converted value doesn't fit
+   |
+LL |         x_i16 > x_u16.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:259:17
+   |
+LL |         x_i16 > x_u32;
+   |         -----   ^^^^^ expected `i16`, found `u32`
+   |         |
+   |         expected because this is `i16`
+   |
+help: you can convert a `u32` to an `i16` and panic if the converted value doesn't fit
+   |
+LL |         x_i16 > x_u32.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:261:17
+   |
+LL |         x_i16 > x_u64;
+   |         -----   ^^^^^ expected `i16`, found `u64`
+   |         |
+   |         expected because this is `i16`
+   |
+help: you can convert a `u64` to an `i16` and panic if the converted value doesn't fit
+   |
+LL |         x_i16 > x_u64.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:263:17
+   |
+LL |         x_i16 > x_u128;
+   |         -----   ^^^^^^ expected `i16`, found `u128`
+   |         |
+   |         expected because this is `i16`
+   |
+help: you can convert a `u128` to an `i16` and panic if the converted value doesn't fit
+   |
+LL |         x_i16 > x_u128.try_into().unwrap();
+   |                       ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:265:17
+   |
+LL |         x_i16 > x_usize;
+   |         -----   ^^^^^^^ expected `i16`, found `usize`
+   |         |
+   |         expected because this is `i16`
+   |
+help: you can convert a `usize` to an `i16` and panic if the converted value doesn't fit
+   |
+LL |         x_i16 > x_usize.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:268:17
+   |
+LL |         x_i32 > x_u8;
+   |         -----   ^^^^ expected `i32`, found `u8`
+   |         |
+   |         expected because this is `i32`
+   |
+help: you can convert a `u8` to an `i32`
+   |
+LL |         x_i32 > x_u8.into();
+   |                     +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:270:17
+   |
+LL |         x_i32 > x_u16;
+   |         -----   ^^^^^ expected `i32`, found `u16`
+   |         |
+   |         expected because this is `i32`
+   |
+help: you can convert a `u16` to an `i32`
+   |
+LL |         x_i32 > x_u16.into();
+   |                      +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:272:17
+   |
+LL |         x_i32 > x_u32;
+   |         -----   ^^^^^ expected `i32`, found `u32`
+   |         |
+   |         expected because this is `i32`
+   |
+help: you can convert a `u32` to an `i32` and panic if the converted value doesn't fit
+   |
+LL |         x_i32 > x_u32.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:274:17
+   |
+LL |         x_i32 > x_u64;
+   |         -----   ^^^^^ expected `i32`, found `u64`
+   |         |
+   |         expected because this is `i32`
+   |
+help: you can convert a `u64` to an `i32` and panic if the converted value doesn't fit
+   |
+LL |         x_i32 > x_u64.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:276:17
+   |
+LL |         x_i32 > x_u128;
+   |         -----   ^^^^^^ expected `i32`, found `u128`
+   |         |
+   |         expected because this is `i32`
+   |
+help: you can convert a `u128` to an `i32` and panic if the converted value doesn't fit
+   |
+LL |         x_i32 > x_u128.try_into().unwrap();
+   |                       ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:278:17
+   |
+LL |         x_i32 > x_usize;
+   |         -----   ^^^^^^^ expected `i32`, found `usize`
+   |         |
+   |         expected because this is `i32`
+   |
+help: you can convert a `usize` to an `i32` and panic if the converted value doesn't fit
+   |
+LL |         x_i32 > x_usize.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:281:17
+   |
+LL |         x_i64 > x_u8;
+   |         -----   ^^^^ expected `i64`, found `u8`
+   |         |
+   |         expected because this is `i64`
+   |
+help: you can convert a `u8` to an `i64`
+   |
+LL |         x_i64 > x_u8.into();
+   |                     +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:283:17
+   |
+LL |         x_i64 > x_u16;
+   |         -----   ^^^^^ expected `i64`, found `u16`
+   |         |
+   |         expected because this is `i64`
+   |
+help: you can convert a `u16` to an `i64`
+   |
+LL |         x_i64 > x_u16.into();
+   |                      +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:285:17
+   |
+LL |         x_i64 > x_u32;
+   |         -----   ^^^^^ expected `i64`, found `u32`
+   |         |
+   |         expected because this is `i64`
+   |
+help: you can convert a `u32` to an `i64`
+   |
+LL |         x_i64 > x_u32.into();
+   |                      +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:287:17
+   |
+LL |         x_i64 > x_u64;
+   |         -----   ^^^^^ expected `i64`, found `u64`
+   |         |
+   |         expected because this is `i64`
+   |
+help: you can convert a `u64` to an `i64` and panic if the converted value doesn't fit
+   |
+LL |         x_i64 > x_u64.try_into().unwrap();
+   |                      ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:289:17
+   |
+LL |         x_i64 > x_u128;
+   |         -----   ^^^^^^ expected `i64`, found `u128`
+   |         |
+   |         expected because this is `i64`
+   |
+help: you can convert a `u128` to an `i64` and panic if the converted value doesn't fit
+   |
+LL |         x_i64 > x_u128.try_into().unwrap();
+   |                       ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:291:17
+   |
+LL |         x_i64 > x_usize;
+   |         -----   ^^^^^^^ expected `i64`, found `usize`
+   |         |
+   |         expected because this is `i64`
+   |
+help: you can convert a `usize` to an `i64` and panic if the converted value doesn't fit
+   |
+LL |         x_i64 > x_usize.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:294:18
+   |
+LL |         x_i128 > x_u8;
+   |         ------   ^^^^ expected `i128`, found `u8`
+   |         |
+   |         expected because this is `i128`
+   |
+help: you can convert a `u8` to an `i128`
+   |
+LL |         x_i128 > x_u8.into();
+   |                      +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:296:18
+   |
+LL |         x_i128 > x_u16;
+   |         ------   ^^^^^ expected `i128`, found `u16`
+   |         |
+   |         expected because this is `i128`
+   |
+help: you can convert a `u16` to an `i128`
+   |
+LL |         x_i128 > x_u16.into();
+   |                       +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:298:18
+   |
+LL |         x_i128 > x_u32;
+   |         ------   ^^^^^ expected `i128`, found `u32`
+   |         |
+   |         expected because this is `i128`
+   |
+help: you can convert a `u32` to an `i128`
+   |
+LL |         x_i128 > x_u32.into();
+   |                       +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:300:18
+   |
+LL |         x_i128 > x_u64;
+   |         ------   ^^^^^ expected `i128`, found `u64`
+   |         |
+   |         expected because this is `i128`
+   |
+help: you can convert a `u64` to an `i128`
+   |
+LL |         x_i128 > x_u64.into();
+   |                       +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:302:18
+   |
+LL |         x_i128 > x_u128;
+   |         ------   ^^^^^^ expected `i128`, found `u128`
+   |         |
+   |         expected because this is `i128`
+   |
+help: you can convert a `u128` to an `i128` and panic if the converted value doesn't fit
+   |
+LL |         x_i128 > x_u128.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:304:18
+   |
+LL |         x_i128 > x_usize;
+   |         ------   ^^^^^^^ expected `i128`, found `usize`
+   |         |
+   |         expected because this is `i128`
+   |
+help: you can convert a `usize` to an `i128` and panic if the converted value doesn't fit
+   |
+LL |         x_i128 > x_usize.try_into().unwrap();
+   |                         ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:307:19
+   |
+LL |         x_isize > x_u8;
+   |         -------   ^^^^ expected `isize`, found `u8`
+   |         |
+   |         expected because this is `isize`
+   |
+help: you can convert a `u8` to an `isize`
+   |
+LL |         x_isize > x_u8.into();
+   |                       +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:309:19
+   |
+LL |         x_isize > x_u16;
+   |         -------   ^^^^^ expected `isize`, found `u16`
+   |         |
+   |         expected because this is `isize`
+   |
+help: you can convert a `u16` to an `isize` and panic if the converted value doesn't fit
+   |
+LL |         x_isize > x_u16.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:311:19
+   |
+LL |         x_isize > x_u32;
+   |         -------   ^^^^^ expected `isize`, found `u32`
+   |         |
+   |         expected because this is `isize`
+   |
+help: you can convert a `u32` to an `isize` and panic if the converted value doesn't fit
+   |
+LL |         x_isize > x_u32.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:313:19
+   |
+LL |         x_isize > x_u64;
+   |         -------   ^^^^^ expected `isize`, found `u64`
+   |         |
+   |         expected because this is `isize`
+   |
+help: you can convert a `u64` to an `isize` and panic if the converted value doesn't fit
+   |
+LL |         x_isize > x_u64.try_into().unwrap();
+   |                        ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:315:19
+   |
+LL |         x_isize > x_u128;
+   |         -------   ^^^^^^ expected `isize`, found `u128`
+   |         |
+   |         expected because this is `isize`
+   |
+help: you can convert a `u128` to an `isize` and panic if the converted value doesn't fit
+   |
+LL |         x_isize > x_u128.try_into().unwrap();
+   |                         ++++++++++++++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-binop.rs:317:19
+   |
+LL |         x_isize > x_usize;
+   |         -------   ^^^^^^^ expected `isize`, found `usize`
+   |         |
+   |         expected because this is `isize`
+   |
+help: you can convert a `usize` to an `isize` and panic if the converted value doesn't fit
+   |
+LL |         x_isize > x_usize.try_into().unwrap();
+   |                          ++++++++++++++++++++
+
+error: aborting due to 132 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/numeric/numeric-cast-no-fix.rs b/tests/ui/numeric/numeric-cast-no-fix.rs
index 63e5f098a..63e5f098a 100644
--- a/src/test/ui/numeric/numeric-cast-no-fix.rs
+++ b/tests/ui/numeric/numeric-cast-no-fix.rs
diff --git a/tests/ui/numeric/numeric-cast-no-fix.stderr b/tests/ui/numeric/numeric-cast-no-fix.stderr
new file mode 100644
index 000000000..c244e479d
--- /dev/null
+++ b/tests/ui/numeric/numeric-cast-no-fix.stderr
@@ -0,0 +1,396 @@
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:10:15
+   |
+LL |     x_usize > -1_isize;
+   |     -------   ^^^^^^^^ expected `usize`, found `isize`
+   |     |
+   |     expected because this is `usize`
+   |
+   = note: `-1_isize` cannot fit into type `usize`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:12:14
+   |
+LL |     x_u128 > -1_isize;
+   |     ------   ^^^^^^^^ expected `u128`, found `isize`
+   |     |
+   |     expected because this is `u128`
+   |
+   = note: `-1_isize` cannot fit into type `u128`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:14:13
+   |
+LL |     x_u64 > -1_isize;
+   |     -----   ^^^^^^^^ expected `u64`, found `isize`
+   |     |
+   |     expected because this is `u64`
+   |
+   = note: `-1_isize` cannot fit into type `u64`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:16:13
+   |
+LL |     x_u32 > -1_isize;
+   |     -----   ^^^^^^^^ expected `u32`, found `isize`
+   |     |
+   |     expected because this is `u32`
+   |
+   = note: `-1_isize` cannot fit into type `u32`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:18:13
+   |
+LL |     x_u16 > -1_isize;
+   |     -----   ^^^^^^^^ expected `u16`, found `isize`
+   |     |
+   |     expected because this is `u16`
+   |
+   = note: `-1_isize` cannot fit into type `u16`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:20:12
+   |
+LL |     x_u8 > -1_isize;
+   |     ----   ^^^^^^^^ expected `u8`, found `isize`
+   |     |
+   |     expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `isize`, matching the type of `-1_isize`
+   |
+LL |     isize::from(x_u8) > -1_isize;
+   |     ++++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:23:15
+   |
+LL |     x_usize > -1_i128;
+   |     -------   ^^^^^^^ expected `usize`, found `i128`
+   |     |
+   |     expected because this is `usize`
+   |
+   = note: `-1_i128` cannot fit into type `usize`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:25:14
+   |
+LL |     x_u128 > -1_i128;
+   |     ------   ^^^^^^^ expected `u128`, found `i128`
+   |     |
+   |     expected because this is `u128`
+   |
+   = note: `-1_i128` cannot fit into type `u128`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:27:13
+   |
+LL |     x_u64 > -1_i128;
+   |     -----   ^^^^^^^ expected `u64`, found `i128`
+   |     |
+   |     expected because this is `u64`
+   |
+help: you can convert `x_u64` from `u64` to `i128`, matching the type of `-1_i128`
+   |
+LL |     i128::from(x_u64) > -1_i128;
+   |     +++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:29:13
+   |
+LL |     x_u32 > -1_i128;
+   |     -----   ^^^^^^^ expected `u32`, found `i128`
+   |     |
+   |     expected because this is `u32`
+   |
+help: you can convert `x_u32` from `u32` to `i128`, matching the type of `-1_i128`
+   |
+LL |     i128::from(x_u32) > -1_i128;
+   |     +++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:31:13
+   |
+LL |     x_u16 > -1_i128;
+   |     -----   ^^^^^^^ expected `u16`, found `i128`
+   |     |
+   |     expected because this is `u16`
+   |
+help: you can convert `x_u16` from `u16` to `i128`, matching the type of `-1_i128`
+   |
+LL |     i128::from(x_u16) > -1_i128;
+   |     +++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:33:12
+   |
+LL |     x_u8 > -1_i128;
+   |     ----   ^^^^^^^ expected `u8`, found `i128`
+   |     |
+   |     expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `i128`, matching the type of `-1_i128`
+   |
+LL |     i128::from(x_u8) > -1_i128;
+   |     +++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:36:15
+   |
+LL |     x_usize > -1_i64;
+   |     -------   ^^^^^^ expected `usize`, found `i64`
+   |     |
+   |     expected because this is `usize`
+   |
+   = note: `-1_i64` cannot fit into type `usize`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:38:14
+   |
+LL |     x_u128 > -1_i64;
+   |     ------   ^^^^^^ expected `u128`, found `i64`
+   |     |
+   |     expected because this is `u128`
+   |
+   = note: `-1_i64` cannot fit into type `u128`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:40:13
+   |
+LL |     x_u64 > -1_i64;
+   |     -----   ^^^^^^ expected `u64`, found `i64`
+   |     |
+   |     expected because this is `u64`
+   |
+   = note: `-1_i64` cannot fit into type `u64`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:42:13
+   |
+LL |     x_u32 > -1_i64;
+   |     -----   ^^^^^^ expected `u32`, found `i64`
+   |     |
+   |     expected because this is `u32`
+   |
+help: you can convert `x_u32` from `u32` to `i64`, matching the type of `-1_i64`
+   |
+LL |     i64::from(x_u32) > -1_i64;
+   |     ++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:44:13
+   |
+LL |     x_u16 > -1_i64;
+   |     -----   ^^^^^^ expected `u16`, found `i64`
+   |     |
+   |     expected because this is `u16`
+   |
+help: you can convert `x_u16` from `u16` to `i64`, matching the type of `-1_i64`
+   |
+LL |     i64::from(x_u16) > -1_i64;
+   |     ++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:46:12
+   |
+LL |     x_u8 > -1_i64;
+   |     ----   ^^^^^^ expected `u8`, found `i64`
+   |     |
+   |     expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `i64`, matching the type of `-1_i64`
+   |
+LL |     i64::from(x_u8) > -1_i64;
+   |     ++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:49:15
+   |
+LL |     x_usize > -1_i32;
+   |     -------   ^^^^^^ expected `usize`, found `i32`
+   |     |
+   |     expected because this is `usize`
+   |
+   = note: `-1_i32` cannot fit into type `usize`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:51:14
+   |
+LL |     x_u128 > -1_i32;
+   |     ------   ^^^^^^ expected `u128`, found `i32`
+   |     |
+   |     expected because this is `u128`
+   |
+   = note: `-1_i32` cannot fit into type `u128`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:53:13
+   |
+LL |     x_u64 > -1_i32;
+   |     -----   ^^^^^^ expected `u64`, found `i32`
+   |     |
+   |     expected because this is `u64`
+   |
+   = note: `-1_i32` cannot fit into type `u64`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:55:13
+   |
+LL |     x_u32 > -1_i32;
+   |     -----   ^^^^^^ expected `u32`, found `i32`
+   |     |
+   |     expected because this is `u32`
+   |
+   = note: `-1_i32` cannot fit into type `u32`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:57:13
+   |
+LL |     x_u16 > -1_i32;
+   |     -----   ^^^^^^ expected `u16`, found `i32`
+   |     |
+   |     expected because this is `u16`
+   |
+help: you can convert `x_u16` from `u16` to `i32`, matching the type of `-1_i32`
+   |
+LL |     i32::from(x_u16) > -1_i32;
+   |     ++++++++++     +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:59:12
+   |
+LL |     x_u8 > -1_i32;
+   |     ----   ^^^^^^ expected `u8`, found `i32`
+   |     |
+   |     expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `i32`, matching the type of `-1_i32`
+   |
+LL |     i32::from(x_u8) > -1_i32;
+   |     ++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:62:15
+   |
+LL |     x_usize > -1_i16;
+   |     -------   ^^^^^^ expected `usize`, found `i16`
+   |     |
+   |     expected because this is `usize`
+   |
+   = note: `-1_i16` cannot fit into type `usize`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:64:14
+   |
+LL |     x_u128 > -1_i16;
+   |     ------   ^^^^^^ expected `u128`, found `i16`
+   |     |
+   |     expected because this is `u128`
+   |
+   = note: `-1_i16` cannot fit into type `u128`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:66:13
+   |
+LL |     x_u64 > -1_i16;
+   |     -----   ^^^^^^ expected `u64`, found `i16`
+   |     |
+   |     expected because this is `u64`
+   |
+   = note: `-1_i16` cannot fit into type `u64`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:68:13
+   |
+LL |     x_u32 > -1_i16;
+   |     -----   ^^^^^^ expected `u32`, found `i16`
+   |     |
+   |     expected because this is `u32`
+   |
+   = note: `-1_i16` cannot fit into type `u32`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:70:13
+   |
+LL |     x_u16 > -1_i16;
+   |     -----   ^^^^^^ expected `u16`, found `i16`
+   |     |
+   |     expected because this is `u16`
+   |
+   = note: `-1_i16` cannot fit into type `u16`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:72:12
+   |
+LL |     x_u8 > -1_i16;
+   |     ----   ^^^^^^ expected `u8`, found `i16`
+   |     |
+   |     expected because this is `u8`
+   |
+help: you can convert `x_u8` from `u8` to `i16`, matching the type of `-1_i16`
+   |
+LL |     i16::from(x_u8) > -1_i16;
+   |     ++++++++++    +
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:75:15
+   |
+LL |     x_usize > -1_i8;
+   |     -------   ^^^^^ expected `usize`, found `i8`
+   |     |
+   |     expected because this is `usize`
+   |
+   = note: `-1_i8` cannot fit into type `usize`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:77:14
+   |
+LL |     x_u128 > -1_i8;
+   |     ------   ^^^^^ expected `u128`, found `i8`
+   |     |
+   |     expected because this is `u128`
+   |
+   = note: `-1_i8` cannot fit into type `u128`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:79:13
+   |
+LL |     x_u64 > -1_i8;
+   |     -----   ^^^^^ expected `u64`, found `i8`
+   |     |
+   |     expected because this is `u64`
+   |
+   = note: `-1_i8` cannot fit into type `u64`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:81:13
+   |
+LL |     x_u32 > -1_i8;
+   |     -----   ^^^^^ expected `u32`, found `i8`
+   |     |
+   |     expected because this is `u32`
+   |
+   = note: `-1_i8` cannot fit into type `u32`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:83:13
+   |
+LL |     x_u16 > -1_i8;
+   |     -----   ^^^^^ expected `u16`, found `i8`
+   |     |
+   |     expected because this is `u16`
+   |
+   = note: `-1_i8` cannot fit into type `u16`
+
+error[E0308]: mismatched types
+  --> $DIR/numeric-cast-no-fix.rs:85:12
+   |
+LL |     x_u8 > -1_i8;
+   |     ----   ^^^^^ expected `u8`, found `i8`
+   |     |
+   |     expected because this is `u8`
+   |
+   = note: `-1_i8` cannot fit into type `u8`
+
+error: aborting due to 36 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/numeric/numeric-cast-without-suggestion.rs b/tests/ui/numeric/numeric-cast-without-suggestion.rs
index faf24a8c1..faf24a8c1 100644
--- a/src/test/ui/numeric/numeric-cast-without-suggestion.rs
+++ b/tests/ui/numeric/numeric-cast-without-suggestion.rs
diff --git a/src/test/ui/numeric/numeric-cast-without-suggestion.stderr b/tests/ui/numeric/numeric-cast-without-suggestion.stderr
index 581b548ab..581b548ab 100644
--- a/src/test/ui/numeric/numeric-cast-without-suggestion.stderr
+++ b/tests/ui/numeric/numeric-cast-without-suggestion.stderr
diff --git a/src/test/ui/numeric/numeric-cast.fixed b/tests/ui/numeric/numeric-cast.fixed
index cf0560a10..cf0560a10 100644
--- a/src/test/ui/numeric/numeric-cast.fixed
+++ b/tests/ui/numeric/numeric-cast.fixed
diff --git a/src/test/ui/numeric/numeric-cast.rs b/tests/ui/numeric/numeric-cast.rs
index 7bddfc509..7bddfc509 100644
--- a/src/test/ui/numeric/numeric-cast.rs
+++ b/tests/ui/numeric/numeric-cast.rs
diff --git a/src/test/ui/numeric/numeric-cast.stderr b/tests/ui/numeric/numeric-cast.stderr
index d347875d5..d347875d5 100644
--- a/src/test/ui/numeric/numeric-cast.stderr
+++ b/tests/ui/numeric/numeric-cast.stderr
diff --git a/src/test/ui/numeric/numeric-fields.rs b/tests/ui/numeric/numeric-fields.rs
index 28234bbdf..28234bbdf 100644
--- a/src/test/ui/numeric/numeric-fields.rs
+++ b/tests/ui/numeric/numeric-fields.rs
diff --git a/src/test/ui/numeric/numeric-fields.stderr b/tests/ui/numeric/numeric-fields.stderr
index 668405ed6..668405ed6 100644
--- a/src/test/ui/numeric/numeric-fields.stderr
+++ b/tests/ui/numeric/numeric-fields.stderr
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-i32.fixed b/tests/ui/numeric/numeric-suffix/numeric-suffix-i32.fixed
index 6e8c54df4..6e8c54df4 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-i32.fixed
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-i32.fixed
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-i32.rs b/tests/ui/numeric/numeric-suffix/numeric-suffix-i32.rs
index b47b0ed02..b47b0ed02 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-i32.rs
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-i32.rs
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-i32.stderr b/tests/ui/numeric/numeric-suffix/numeric-suffix-i32.stderr
index f4fb14e79..f4fb14e79 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-i32.stderr
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-i32.stderr
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-i64.fixed b/tests/ui/numeric/numeric-suffix/numeric-suffix-i64.fixed
index 03821cd44..03821cd44 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-i64.fixed
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-i64.fixed
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-i64.rs b/tests/ui/numeric/numeric-suffix/numeric-suffix-i64.rs
index 629fe7e74..629fe7e74 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-i64.rs
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-i64.rs
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-i64.stderr b/tests/ui/numeric/numeric-suffix/numeric-suffix-i64.stderr
index 47efe9f08..47efe9f08 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-i64.stderr
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-i64.stderr
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-isize.fixed b/tests/ui/numeric/numeric-suffix/numeric-suffix-isize.fixed
index faed65ca4..faed65ca4 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-isize.fixed
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-isize.fixed
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-isize.rs b/tests/ui/numeric/numeric-suffix/numeric-suffix-isize.rs
index df0b4cb62..df0b4cb62 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-isize.rs
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-isize.rs
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-isize.stderr b/tests/ui/numeric/numeric-suffix/numeric-suffix-isize.stderr
index 28b79413f..28b79413f 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-isize.stderr
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-isize.stderr
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u32.fixed b/tests/ui/numeric/numeric-suffix/numeric-suffix-u32.fixed
index 5955829e7..5955829e7 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u32.fixed
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-u32.fixed
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u32.rs b/tests/ui/numeric/numeric-suffix/numeric-suffix-u32.rs
index 5c303036a..5c303036a 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u32.rs
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-u32.rs
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u32.stderr b/tests/ui/numeric/numeric-suffix/numeric-suffix-u32.stderr
index d966893a8..d966893a8 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u32.stderr
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-u32.stderr
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u64.fixed b/tests/ui/numeric/numeric-suffix/numeric-suffix-u64.fixed
index 4623c211c..4623c211c 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u64.fixed
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-u64.fixed
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u64.rs b/tests/ui/numeric/numeric-suffix/numeric-suffix-u64.rs
index 3e9995c74..3e9995c74 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u64.rs
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-u64.rs
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u64.stderr b/tests/ui/numeric/numeric-suffix/numeric-suffix-u64.stderr
index ff332fa91..ff332fa91 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u64.stderr
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-u64.stderr
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-usize.fixed b/tests/ui/numeric/numeric-suffix/numeric-suffix-usize.fixed
index 6cb5243ca..6cb5243ca 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-usize.fixed
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-usize.fixed
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-usize.rs b/tests/ui/numeric/numeric-suffix/numeric-suffix-usize.rs
index a2304ba26..a2304ba26 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-usize.rs
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-usize.rs
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-usize.stderr b/tests/ui/numeric/numeric-suffix/numeric-suffix-usize.stderr
index 4889abee6..4889abee6 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-usize.stderr
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix-usize.stderr
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix.fixed b/tests/ui/numeric/numeric-suffix/numeric-suffix.fixed
index 69934db21..69934db21 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix.fixed
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix.fixed
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix.rs b/tests/ui/numeric/numeric-suffix/numeric-suffix.rs
index dabf43f82..dabf43f82 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix.rs
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix.rs
diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix.stderr b/tests/ui/numeric/numeric-suffix/numeric-suffix.stderr
index e05913b9c..e05913b9c 100644
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix.stderr
+++ b/tests/ui/numeric/numeric-suffix/numeric-suffix.stderr
diff --git a/tests/ui/numeric/uppercase-base-prefix-invalid-no-fix.rs b/tests/ui/numeric/uppercase-base-prefix-invalid-no-fix.rs
new file mode 100644
index 000000000..f00cde4a7
--- /dev/null
+++ b/tests/ui/numeric/uppercase-base-prefix-invalid-no-fix.rs
@@ -0,0 +1,34 @@
+// Checks that integers with seeming uppercase base prefixes do not get bogus capitalization
+// suggestions.
+
+fn main() {
+    _ = 123X1a3;
+    //~^ ERROR invalid suffix `X1a3` for number literal
+    //~| NOTE invalid suffix `X1a3`
+    //~| HELP the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
+
+    _ = 456O123;
+    //~^ ERROR invalid suffix `O123` for number literal
+    //~| NOTE invalid suffix `O123`
+    //~| HELP the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
+
+    _ = 789B101;
+    //~^ ERROR invalid suffix `B101` for number literal
+    //~| NOTE invalid suffix `B101`
+    //~| HELP the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
+
+    _ = 0XYZ;
+    //~^ ERROR invalid suffix `XYZ` for number literal
+    //~| NOTE invalid suffix `XYZ`
+    //~| HELP the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
+
+    _ = 0OPQ;
+    //~^ ERROR invalid suffix `OPQ` for number literal
+    //~| NOTE invalid suffix `OPQ`
+    //~| HELP the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
+
+    _ = 0BCD;
+    //~^ ERROR invalid suffix `BCD` for number literal
+    //~| NOTE invalid suffix `BCD`
+    //~| HELP the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
+}
diff --git a/tests/ui/numeric/uppercase-base-prefix-invalid-no-fix.stderr b/tests/ui/numeric/uppercase-base-prefix-invalid-no-fix.stderr
new file mode 100644
index 000000000..380c16ca7
--- /dev/null
+++ b/tests/ui/numeric/uppercase-base-prefix-invalid-no-fix.stderr
@@ -0,0 +1,50 @@
+error: invalid suffix `X1a3` for number literal
+  --> $DIR/uppercase-base-prefix-invalid-no-fix.rs:5:9
+   |
+LL |     _ = 123X1a3;
+   |         ^^^^^^^ invalid suffix `X1a3`
+   |
+   = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
+
+error: invalid suffix `O123` for number literal
+  --> $DIR/uppercase-base-prefix-invalid-no-fix.rs:10:9
+   |
+LL |     _ = 456O123;
+   |         ^^^^^^^ invalid suffix `O123`
+   |
+   = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
+
+error: invalid suffix `B101` for number literal
+  --> $DIR/uppercase-base-prefix-invalid-no-fix.rs:15:9
+   |
+LL |     _ = 789B101;
+   |         ^^^^^^^ invalid suffix `B101`
+   |
+   = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
+
+error: invalid suffix `XYZ` for number literal
+  --> $DIR/uppercase-base-prefix-invalid-no-fix.rs:20:9
+   |
+LL |     _ = 0XYZ;
+   |         ^^^^ invalid suffix `XYZ`
+   |
+   = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
+
+error: invalid suffix `OPQ` for number literal
+  --> $DIR/uppercase-base-prefix-invalid-no-fix.rs:25:9
+   |
+LL |     _ = 0OPQ;
+   |         ^^^^ invalid suffix `OPQ`
+   |
+   = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
+
+error: invalid suffix `BCD` for number literal
+  --> $DIR/uppercase-base-prefix-invalid-no-fix.rs:30:9
+   |
+LL |     _ = 0BCD;
+   |         ^^^^ invalid suffix `BCD`
+   |
+   = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
+
+error: aborting due to 6 previous errors
+
diff --git a/src/test/ui/numeric/uppercase-base-prefix.fixed b/tests/ui/numeric/uppercase-base-prefix.fixed
index 1b1c837ec..1b1c837ec 100644
--- a/src/test/ui/numeric/uppercase-base-prefix.fixed
+++ b/tests/ui/numeric/uppercase-base-prefix.fixed
diff --git a/src/test/ui/numeric/uppercase-base-prefix.rs b/tests/ui/numeric/uppercase-base-prefix.rs
index 233d553da..233d553da 100644
--- a/src/test/ui/numeric/uppercase-base-prefix.rs
+++ b/tests/ui/numeric/uppercase-base-prefix.rs
diff --git a/src/test/ui/numeric/uppercase-base-prefix.stderr b/tests/ui/numeric/uppercase-base-prefix.stderr
index 4ba8d5224..4ba8d5224 100644
--- a/src/test/ui/numeric/uppercase-base-prefix.stderr
+++ b/tests/ui/numeric/uppercase-base-prefix.stderr
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.rs b/tests/ui/object-lifetime/object-lifetime-default-ambiguous.rs
index 5dae92fee..5dae92fee 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-ambiguous.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.stderr b/tests/ui/object-lifetime/object-lifetime-default-ambiguous.stderr
index bd50a27fd..bd50a27fd 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.stderr
+++ b/tests/ui/object-lifetime/object-lifetime-default-ambiguous.stderr
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-default-to-static.rs b/tests/ui/object-lifetime/object-lifetime-default-default-to-static.rs
index 467767ae5..467767ae5 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-default-to-static.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-default-to-static.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic1.rs b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic1.rs
index 7337383e2..7337383e2 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic1.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic1.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic1.stderr b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic1.stderr
index f06a9da1d..f06a9da1d 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic1.stderr
+++ b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic1.stderr
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic2.rs b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic2.rs
index 2a7415174..2a7415174 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic2.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic2.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic2.stderr b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic2.stderr
index 51d8450af..51d8450af 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic2.stderr
+++ b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic2.stderr
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic3.rs b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic3.rs
index 51be999a6..51be999a6 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic3.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic3.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic3.stderr b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic3.stderr
index f721bf394..f721bf394 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic3.stderr
+++ b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-nonstatic3.stderr
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-static.rs b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-static.rs
index 339f3356b..339f3356b 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-dyn-binding-static.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-dyn-binding-static.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-elision.rs b/tests/ui/object-lifetime/object-lifetime-default-elision.rs
index f7c0261cf..f7c0261cf 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-elision.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-elision.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-elision.stderr b/tests/ui/object-lifetime/object-lifetime-default-elision.stderr
index 61e96f59f..61e96f59f 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-elision.stderr
+++ b/tests/ui/object-lifetime/object-lifetime-default-elision.stderr
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.rs b/tests/ui/object-lifetime/object-lifetime-default-from-box-error.rs
index f9b3e2238..f9b3e2238 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-from-box-error.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.stderr b/tests/ui/object-lifetime/object-lifetime-default-from-box-error.stderr
index 15b36925c..15b36925c 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.stderr
+++ b/tests/ui/object-lifetime/object-lifetime-default-from-box-error.stderr
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-ref-struct.rs b/tests/ui/object-lifetime/object-lifetime-default-from-ref-struct.rs
index e1a865fa5..e1a865fa5 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-ref-struct.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-from-ref-struct.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.rs b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.rs
index de79eee6a..de79eee6a 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.stderr b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.stderr
index 7d6f9f39d..7d6f9f39d 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.stderr
+++ b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.stderr
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box.rs b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-box.rs
index b61083078..b61083078 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-box.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-mut.rs b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-mut.rs
index a09fc03ab..a09fc03ab 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-mut.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-mut.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs
index 877486e15..877486e15 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr
index 2bc8e0978..2bc8e0978 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr
+++ b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct.rs b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-struct.rs
index d3e92e162..d3e92e162 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-from-rptr-struct.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr.rs b/tests/ui/object-lifetime/object-lifetime-default-from-rptr.rs
index 5093b1c27..5093b1c27 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-from-rptr.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-inferred.rs b/tests/ui/object-lifetime/object-lifetime-default-inferred.rs
index 8a1156b8f..8a1156b8f 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-inferred.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-inferred.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-mybox.rs b/tests/ui/object-lifetime/object-lifetime-default-mybox.rs
index 5e6e5e2c0..5e6e5e2c0 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-mybox.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default-mybox.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-mybox.stderr b/tests/ui/object-lifetime/object-lifetime-default-mybox.stderr
index a1ef0243e..a1ef0243e 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-mybox.stderr
+++ b/tests/ui/object-lifetime/object-lifetime-default-mybox.stderr
diff --git a/src/test/ui/object-lifetime/object-lifetime-default.rs b/tests/ui/object-lifetime/object-lifetime-default.rs
index 74f5bb7dd..74f5bb7dd 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default.rs
+++ b/tests/ui/object-lifetime/object-lifetime-default.rs
diff --git a/src/test/ui/object-lifetime/object-lifetime-default.stderr b/tests/ui/object-lifetime/object-lifetime-default.stderr
index a58afad3e..a58afad3e 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default.stderr
+++ b/tests/ui/object-lifetime/object-lifetime-default.stderr
diff --git a/src/test/ui/object-pointer-types.rs b/tests/ui/object-pointer-types.rs
index 760a50e5b..760a50e5b 100644
--- a/src/test/ui/object-pointer-types.rs
+++ b/tests/ui/object-pointer-types.rs
diff --git a/src/test/ui/object-pointer-types.stderr b/tests/ui/object-pointer-types.stderr
index a477425ed..a477425ed 100644
--- a/src/test/ui/object-pointer-types.stderr
+++ b/tests/ui/object-pointer-types.stderr
diff --git a/src/test/ui/object-safety/issue-102762.rs b/tests/ui/object-safety/issue-102762.rs
index 4f4c36345..4f4c36345 100644
--- a/src/test/ui/object-safety/issue-102762.rs
+++ b/tests/ui/object-safety/issue-102762.rs
diff --git a/src/test/ui/object-safety/issue-102762.stderr b/tests/ui/object-safety/issue-102762.stderr
index 5041ebe77..5041ebe77 100644
--- a/src/test/ui/object-safety/issue-102762.stderr
+++ b/tests/ui/object-safety/issue-102762.stderr
diff --git a/src/test/ui/object-safety/issue-102933.rs b/tests/ui/object-safety/issue-102933.rs
index 843391cff..843391cff 100644
--- a/src/test/ui/object-safety/issue-102933.rs
+++ b/tests/ui/object-safety/issue-102933.rs
diff --git a/tests/ui/object-safety/issue-106247.rs b/tests/ui/object-safety/issue-106247.rs
new file mode 100644
index 000000000..64bf59e5d
--- /dev/null
+++ b/tests/ui/object-safety/issue-106247.rs
@@ -0,0 +1,9 @@
+// check-pass
+
+#![deny(where_clauses_object_safety)]
+
+pub trait Trait {
+    fn method(&self) where Self: Sync;
+}
+
+fn main() {}
diff --git a/src/test/ui/object-safety/issue-19538.rs b/tests/ui/object-safety/issue-19538.rs
index 7054ef41b..7054ef41b 100644
--- a/src/test/ui/object-safety/issue-19538.rs
+++ b/tests/ui/object-safety/issue-19538.rs
diff --git a/src/test/ui/object-safety/issue-19538.stderr b/tests/ui/object-safety/issue-19538.stderr
index 8420637b3..8420637b3 100644
--- a/src/test/ui/object-safety/issue-19538.stderr
+++ b/tests/ui/object-safety/issue-19538.stderr
diff --git a/src/test/ui/object-safety/object-safety-associated-consts.curr.stderr b/tests/ui/object-safety/object-safety-associated-consts.curr.stderr
index 5f94c9284..5f94c9284 100644
--- a/src/test/ui/object-safety/object-safety-associated-consts.curr.stderr
+++ b/tests/ui/object-safety/object-safety-associated-consts.curr.stderr
diff --git a/src/test/ui/object-safety/object-safety-associated-consts.object_safe_for_dispatch.stderr b/tests/ui/object-safety/object-safety-associated-consts.object_safe_for_dispatch.stderr
index f44de07d5..f44de07d5 100644
--- a/src/test/ui/object-safety/object-safety-associated-consts.object_safe_for_dispatch.stderr
+++ b/tests/ui/object-safety/object-safety-associated-consts.object_safe_for_dispatch.stderr
diff --git a/src/test/ui/object-safety/object-safety-associated-consts.rs b/tests/ui/object-safety/object-safety-associated-consts.rs
index e1a772e5a..e1a772e5a 100644
--- a/src/test/ui/object-safety/object-safety-associated-consts.rs
+++ b/tests/ui/object-safety/object-safety-associated-consts.rs
diff --git a/src/test/ui/object-safety/object-safety-bounds.rs b/tests/ui/object-safety/object-safety-bounds.rs
index 44bd36932..44bd36932 100644
--- a/src/test/ui/object-safety/object-safety-bounds.rs
+++ b/tests/ui/object-safety/object-safety-bounds.rs
diff --git a/src/test/ui/object-safety/object-safety-bounds.stderr b/tests/ui/object-safety/object-safety-bounds.stderr
index 29ffb5448..29ffb5448 100644
--- a/src/test/ui/object-safety/object-safety-bounds.stderr
+++ b/tests/ui/object-safety/object-safety-bounds.stderr
diff --git a/src/test/ui/object-safety/object-safety-by-value-self-use.rs b/tests/ui/object-safety/object-safety-by-value-self-use.rs
index 8e93c5382..8e93c5382 100644
--- a/src/test/ui/object-safety/object-safety-by-value-self-use.rs
+++ b/tests/ui/object-safety/object-safety-by-value-self-use.rs
diff --git a/src/test/ui/object-safety/object-safety-by-value-self-use.stderr b/tests/ui/object-safety/object-safety-by-value-self-use.stderr
index 94fdcdf26..94fdcdf26 100644
--- a/src/test/ui/object-safety/object-safety-by-value-self-use.stderr
+++ b/tests/ui/object-safety/object-safety-by-value-self-use.stderr
diff --git a/src/test/ui/object-safety/object-safety-by-value-self.rs b/tests/ui/object-safety/object-safety-by-value-self.rs
index c74a4d1cb..c74a4d1cb 100644
--- a/src/test/ui/object-safety/object-safety-by-value-self.rs
+++ b/tests/ui/object-safety/object-safety-by-value-self.rs
diff --git a/src/test/ui/object-safety/object-safety-generics.curr.stderr b/tests/ui/object-safety/object-safety-generics.curr.stderr
index 458103752..458103752 100644
--- a/src/test/ui/object-safety/object-safety-generics.curr.stderr
+++ b/tests/ui/object-safety/object-safety-generics.curr.stderr
diff --git a/src/test/ui/object-safety/object-safety-generics.object_safe_for_dispatch.stderr b/tests/ui/object-safety/object-safety-generics.object_safe_for_dispatch.stderr
index 9a2d472d5..9a2d472d5 100644
--- a/src/test/ui/object-safety/object-safety-generics.object_safe_for_dispatch.stderr
+++ b/tests/ui/object-safety/object-safety-generics.object_safe_for_dispatch.stderr
diff --git a/src/test/ui/object-safety/object-safety-generics.rs b/tests/ui/object-safety/object-safety-generics.rs
index 63dcd1699..63dcd1699 100644
--- a/src/test/ui/object-safety/object-safety-generics.rs
+++ b/tests/ui/object-safety/object-safety-generics.rs
diff --git a/src/test/ui/object-safety/object-safety-issue-22040.rs b/tests/ui/object-safety/object-safety-issue-22040.rs
index 1fc5c5442..1fc5c5442 100644
--- a/src/test/ui/object-safety/object-safety-issue-22040.rs
+++ b/tests/ui/object-safety/object-safety-issue-22040.rs
diff --git a/src/test/ui/object-safety/object-safety-issue-22040.stderr b/tests/ui/object-safety/object-safety-issue-22040.stderr
index 0262d5362..0262d5362 100644
--- a/src/test/ui/object-safety/object-safety-issue-22040.stderr
+++ b/tests/ui/object-safety/object-safety-issue-22040.stderr
diff --git a/src/test/ui/object-safety/object-safety-mentions-Self.curr.stderr b/tests/ui/object-safety/object-safety-mentions-Self.curr.stderr
index de430a89b..de430a89b 100644
--- a/src/test/ui/object-safety/object-safety-mentions-Self.curr.stderr
+++ b/tests/ui/object-safety/object-safety-mentions-Self.curr.stderr
diff --git a/src/test/ui/object-safety/object-safety-mentions-Self.object_safe_for_dispatch.stderr b/tests/ui/object-safety/object-safety-mentions-Self.object_safe_for_dispatch.stderr
index 40a298bd1..40a298bd1 100644
--- a/src/test/ui/object-safety/object-safety-mentions-Self.object_safe_for_dispatch.stderr
+++ b/tests/ui/object-safety/object-safety-mentions-Self.object_safe_for_dispatch.stderr
diff --git a/src/test/ui/object-safety/object-safety-mentions-Self.rs b/tests/ui/object-safety/object-safety-mentions-Self.rs
index 412d16ff3..412d16ff3 100644
--- a/src/test/ui/object-safety/object-safety-mentions-Self.rs
+++ b/tests/ui/object-safety/object-safety-mentions-Self.rs
diff --git a/src/test/ui/object-safety/object-safety-no-static.curr.stderr b/tests/ui/object-safety/object-safety-no-static.curr.stderr
index 1b025229e..1b025229e 100644
--- a/src/test/ui/object-safety/object-safety-no-static.curr.stderr
+++ b/tests/ui/object-safety/object-safety-no-static.curr.stderr
diff --git a/src/test/ui/object-safety/object-safety-no-static.object_safe_for_dispatch.stderr b/tests/ui/object-safety/object-safety-no-static.object_safe_for_dispatch.stderr
index da87b58c9..da87b58c9 100644
--- a/src/test/ui/object-safety/object-safety-no-static.object_safe_for_dispatch.stderr
+++ b/tests/ui/object-safety/object-safety-no-static.object_safe_for_dispatch.stderr
diff --git a/src/test/ui/object-safety/object-safety-no-static.rs b/tests/ui/object-safety/object-safety-no-static.rs
index 03b622174..03b622174 100644
--- a/src/test/ui/object-safety/object-safety-no-static.rs
+++ b/tests/ui/object-safety/object-safety-no-static.rs
diff --git a/src/test/ui/object-safety/object-safety-phantom-fn.rs b/tests/ui/object-safety/object-safety-phantom-fn.rs
index 3ffeb81c1..3ffeb81c1 100644
--- a/src/test/ui/object-safety/object-safety-phantom-fn.rs
+++ b/tests/ui/object-safety/object-safety-phantom-fn.rs
diff --git a/src/test/ui/object-safety/object-safety-sized-2.curr.stderr b/tests/ui/object-safety/object-safety-sized-2.curr.stderr
index b01926412..b01926412 100644
--- a/src/test/ui/object-safety/object-safety-sized-2.curr.stderr
+++ b/tests/ui/object-safety/object-safety-sized-2.curr.stderr
diff --git a/src/test/ui/object-safety/object-safety-sized-2.object_safe_for_dispatch.stderr b/tests/ui/object-safety/object-safety-sized-2.object_safe_for_dispatch.stderr
index 6c29c8d5f..6c29c8d5f 100644
--- a/src/test/ui/object-safety/object-safety-sized-2.object_safe_for_dispatch.stderr
+++ b/tests/ui/object-safety/object-safety-sized-2.object_safe_for_dispatch.stderr
diff --git a/src/test/ui/object-safety/object-safety-sized-2.rs b/tests/ui/object-safety/object-safety-sized-2.rs
index 1e79b8cd9..1e79b8cd9 100644
--- a/src/test/ui/object-safety/object-safety-sized-2.rs
+++ b/tests/ui/object-safety/object-safety-sized-2.rs
diff --git a/src/test/ui/object-safety/object-safety-sized.curr.stderr b/tests/ui/object-safety/object-safety-sized.curr.stderr
index 974813121..974813121 100644
--- a/src/test/ui/object-safety/object-safety-sized.curr.stderr
+++ b/tests/ui/object-safety/object-safety-sized.curr.stderr
diff --git a/src/test/ui/object-safety/object-safety-sized.object_safe_for_dispatch.stderr b/tests/ui/object-safety/object-safety-sized.object_safe_for_dispatch.stderr
index 70a44ed61..70a44ed61 100644
--- a/src/test/ui/object-safety/object-safety-sized.object_safe_for_dispatch.stderr
+++ b/tests/ui/object-safety/object-safety-sized.object_safe_for_dispatch.stderr
diff --git a/src/test/ui/object-safety/object-safety-sized.rs b/tests/ui/object-safety/object-safety-sized.rs
index b424b892d..b424b892d 100644
--- a/src/test/ui/object-safety/object-safety-sized.rs
+++ b/tests/ui/object-safety/object-safety-sized.rs
diff --git a/src/test/ui/object-safety/object-safety-supertrait-mentions-GAT.rs b/tests/ui/object-safety/object-safety-supertrait-mentions-GAT.rs
index 14e00d2ef..14e00d2ef 100644
--- a/src/test/ui/object-safety/object-safety-supertrait-mentions-GAT.rs
+++ b/tests/ui/object-safety/object-safety-supertrait-mentions-GAT.rs
diff --git a/src/test/ui/object-safety/object-safety-supertrait-mentions-GAT.stderr b/tests/ui/object-safety/object-safety-supertrait-mentions-GAT.stderr
index f05b0cd65..f05b0cd65 100644
--- a/src/test/ui/object-safety/object-safety-supertrait-mentions-GAT.stderr
+++ b/tests/ui/object-safety/object-safety-supertrait-mentions-GAT.stderr
diff --git a/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.rs b/tests/ui/object-safety/object-safety-supertrait-mentions-Self.rs
index 2445b33c8..2445b33c8 100644
--- a/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.rs
+++ b/tests/ui/object-safety/object-safety-supertrait-mentions-Self.rs
diff --git a/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.stderr b/tests/ui/object-safety/object-safety-supertrait-mentions-Self.stderr
index a106ab995..a106ab995 100644
--- a/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.stderr
+++ b/tests/ui/object-safety/object-safety-supertrait-mentions-Self.stderr
diff --git a/src/test/ui/objects-coerce-freeze-borrored.rs b/tests/ui/objects-coerce-freeze-borrored.rs
index 704d77480..704d77480 100644
--- a/src/test/ui/objects-coerce-freeze-borrored.rs
+++ b/tests/ui/objects-coerce-freeze-borrored.rs
diff --git a/src/test/ui/obsolete-in-place/bad.rs b/tests/ui/obsolete-in-place/bad.rs
index a491bb21a..a491bb21a 100644
--- a/src/test/ui/obsolete-in-place/bad.rs
+++ b/tests/ui/obsolete-in-place/bad.rs
diff --git a/src/test/ui/obsolete-in-place/bad.stderr b/tests/ui/obsolete-in-place/bad.stderr
index 363dfb776..363dfb776 100644
--- a/src/test/ui/obsolete-in-place/bad.stderr
+++ b/tests/ui/obsolete-in-place/bad.stderr
diff --git a/src/test/ui/occurs-check-2.rs b/tests/ui/occurs-check-2.rs
index f36682a3d..f36682a3d 100644
--- a/src/test/ui/occurs-check-2.rs
+++ b/tests/ui/occurs-check-2.rs
diff --git a/src/test/ui/occurs-check-2.stderr b/tests/ui/occurs-check-2.stderr
index b68c3fa5b..b68c3fa5b 100644
--- a/src/test/ui/occurs-check-2.stderr
+++ b/tests/ui/occurs-check-2.stderr
diff --git a/src/test/ui/occurs-check-3.rs b/tests/ui/occurs-check-3.rs
index 9c0420401..9c0420401 100644
--- a/src/test/ui/occurs-check-3.rs
+++ b/tests/ui/occurs-check-3.rs
diff --git a/src/test/ui/occurs-check-3.stderr b/tests/ui/occurs-check-3.stderr
index 04c404d54..04c404d54 100644
--- a/src/test/ui/occurs-check-3.stderr
+++ b/tests/ui/occurs-check-3.stderr
diff --git a/src/test/ui/occurs-check.rs b/tests/ui/occurs-check.rs
index aec52d839..aec52d839 100644
--- a/src/test/ui/occurs-check.rs
+++ b/tests/ui/occurs-check.rs
diff --git a/src/test/ui/occurs-check.stderr b/tests/ui/occurs-check.stderr
index fdbbdc3ab..fdbbdc3ab 100644
--- a/src/test/ui/occurs-check.stderr
+++ b/tests/ui/occurs-check.stderr
diff --git a/src/test/ui/on-unimplemented/auxiliary/no_debug.rs b/tests/ui/on-unimplemented/auxiliary/no_debug.rs
index fd3dc0abd..fd3dc0abd 100644
--- a/src/test/ui/on-unimplemented/auxiliary/no_debug.rs
+++ b/tests/ui/on-unimplemented/auxiliary/no_debug.rs
diff --git a/src/test/ui/on-unimplemented/bad-annotation.rs b/tests/ui/on-unimplemented/bad-annotation.rs
index f05436b8c..f05436b8c 100644
--- a/src/test/ui/on-unimplemented/bad-annotation.rs
+++ b/tests/ui/on-unimplemented/bad-annotation.rs
diff --git a/src/test/ui/on-unimplemented/bad-annotation.stderr b/tests/ui/on-unimplemented/bad-annotation.stderr
index a8d3c8680..a8d3c8680 100644
--- a/src/test/ui/on-unimplemented/bad-annotation.stderr
+++ b/tests/ui/on-unimplemented/bad-annotation.stderr
diff --git a/src/test/ui/on-unimplemented/expected-comma-found-token.rs b/tests/ui/on-unimplemented/expected-comma-found-token.rs
index 8fb34f211..8fb34f211 100644
--- a/src/test/ui/on-unimplemented/expected-comma-found-token.rs
+++ b/tests/ui/on-unimplemented/expected-comma-found-token.rs
diff --git a/src/test/ui/on-unimplemented/expected-comma-found-token.stderr b/tests/ui/on-unimplemented/expected-comma-found-token.stderr
index 048b72ee3..048b72ee3 100644
--- a/src/test/ui/on-unimplemented/expected-comma-found-token.stderr
+++ b/tests/ui/on-unimplemented/expected-comma-found-token.stderr
diff --git a/src/test/ui/on-unimplemented/feature-gate-on-unimplemented.rs b/tests/ui/on-unimplemented/feature-gate-on-unimplemented.rs
index 3cc50e349..3cc50e349 100644
--- a/src/test/ui/on-unimplemented/feature-gate-on-unimplemented.rs
+++ b/tests/ui/on-unimplemented/feature-gate-on-unimplemented.rs
diff --git a/src/test/ui/on-unimplemented/feature-gate-on-unimplemented.stderr b/tests/ui/on-unimplemented/feature-gate-on-unimplemented.stderr
index a4b33963f..a4b33963f 100644
--- a/src/test/ui/on-unimplemented/feature-gate-on-unimplemented.stderr
+++ b/tests/ui/on-unimplemented/feature-gate-on-unimplemented.stderr
diff --git a/src/test/ui/on-unimplemented/impl-substs.rs b/tests/ui/on-unimplemented/impl-substs.rs
index fe9c50ec3..fe9c50ec3 100644
--- a/src/test/ui/on-unimplemented/impl-substs.rs
+++ b/tests/ui/on-unimplemented/impl-substs.rs
diff --git a/src/test/ui/on-unimplemented/impl-substs.stderr b/tests/ui/on-unimplemented/impl-substs.stderr
index a0fad0acd..a0fad0acd 100644
--- a/src/test/ui/on-unimplemented/impl-substs.stderr
+++ b/tests/ui/on-unimplemented/impl-substs.stderr
diff --git a/src/test/ui/on-unimplemented/issue-104140.rs b/tests/ui/on-unimplemented/issue-104140.rs
index ade3f7270..ade3f7270 100644
--- a/src/test/ui/on-unimplemented/issue-104140.rs
+++ b/tests/ui/on-unimplemented/issue-104140.rs
diff --git a/src/test/ui/on-unimplemented/issue-104140.stderr b/tests/ui/on-unimplemented/issue-104140.stderr
index ddb1f50f0..ddb1f50f0 100644
--- a/src/test/ui/on-unimplemented/issue-104140.stderr
+++ b/tests/ui/on-unimplemented/issue-104140.stderr
diff --git a/src/test/ui/on-unimplemented/multiple-impls.rs b/tests/ui/on-unimplemented/multiple-impls.rs
index a32fd4566..a32fd4566 100644
--- a/src/test/ui/on-unimplemented/multiple-impls.rs
+++ b/tests/ui/on-unimplemented/multiple-impls.rs
diff --git a/src/test/ui/on-unimplemented/multiple-impls.stderr b/tests/ui/on-unimplemented/multiple-impls.stderr
index d628b159a..d628b159a 100644
--- a/src/test/ui/on-unimplemented/multiple-impls.stderr
+++ b/tests/ui/on-unimplemented/multiple-impls.stderr
diff --git a/src/test/ui/on-unimplemented/no-debug.rs b/tests/ui/on-unimplemented/no-debug.rs
index bdc80c5b3..bdc80c5b3 100644
--- a/src/test/ui/on-unimplemented/no-debug.rs
+++ b/tests/ui/on-unimplemented/no-debug.rs
diff --git a/src/test/ui/on-unimplemented/no-debug.stderr b/tests/ui/on-unimplemented/no-debug.stderr
index 1035da54d..1035da54d 100644
--- a/src/test/ui/on-unimplemented/no-debug.stderr
+++ b/tests/ui/on-unimplemented/no-debug.stderr
diff --git a/src/test/ui/on-unimplemented/on-impl.rs b/tests/ui/on-unimplemented/on-impl.rs
index d0537810c..d0537810c 100644
--- a/src/test/ui/on-unimplemented/on-impl.rs
+++ b/tests/ui/on-unimplemented/on-impl.rs
diff --git a/src/test/ui/on-unimplemented/on-impl.stderr b/tests/ui/on-unimplemented/on-impl.stderr
index 2253c5992..2253c5992 100644
--- a/src/test/ui/on-unimplemented/on-impl.stderr
+++ b/tests/ui/on-unimplemented/on-impl.stderr
diff --git a/src/test/ui/on-unimplemented/on-trait.rs b/tests/ui/on-unimplemented/on-trait.rs
index 556813cd4..556813cd4 100644
--- a/src/test/ui/on-unimplemented/on-trait.rs
+++ b/tests/ui/on-unimplemented/on-trait.rs
diff --git a/src/test/ui/on-unimplemented/on-trait.stderr b/tests/ui/on-unimplemented/on-trait.stderr
index 4b040f1ac..4b040f1ac 100644
--- a/src/test/ui/on-unimplemented/on-trait.stderr
+++ b/tests/ui/on-unimplemented/on-trait.stderr
diff --git a/src/test/ui/on-unimplemented/parent-label.rs b/tests/ui/on-unimplemented/parent-label.rs
index b65f64968..b65f64968 100644
--- a/src/test/ui/on-unimplemented/parent-label.rs
+++ b/tests/ui/on-unimplemented/parent-label.rs
diff --git a/src/test/ui/on-unimplemented/parent-label.stderr b/tests/ui/on-unimplemented/parent-label.stderr
index 8cd7412fd..8cd7412fd 100644
--- a/src/test/ui/on-unimplemented/parent-label.stderr
+++ b/tests/ui/on-unimplemented/parent-label.stderr
diff --git a/src/test/ui/on-unimplemented/slice-index.rs b/tests/ui/on-unimplemented/slice-index.rs
index 758220d3c..758220d3c 100644
--- a/src/test/ui/on-unimplemented/slice-index.rs
+++ b/tests/ui/on-unimplemented/slice-index.rs
diff --git a/src/test/ui/on-unimplemented/slice-index.stderr b/tests/ui/on-unimplemented/slice-index.stderr
index a7ec3bda8..a7ec3bda8 100644
--- a/src/test/ui/on-unimplemented/slice-index.stderr
+++ b/tests/ui/on-unimplemented/slice-index.stderr
diff --git a/tests/ui/on-unimplemented/sum.rs b/tests/ui/on-unimplemented/sum.rs
new file mode 100644
index 000000000..4f1c521d9
--- /dev/null
+++ b/tests/ui/on-unimplemented/sum.rs
@@ -0,0 +1,9 @@
+// <https://github.com/rust-lang/rust/issues/105184>
+
+fn main() {
+    vec![(), ()].iter().sum::<i32>();
+    //~^ ERROR
+
+    vec![(), ()].iter().product::<i32>();
+    //~^ ERROR
+}
diff --git a/tests/ui/on-unimplemented/sum.stderr b/tests/ui/on-unimplemented/sum.stderr
new file mode 100644
index 000000000..2a316dba7
--- /dev/null
+++ b/tests/ui/on-unimplemented/sum.stderr
@@ -0,0 +1,43 @@
+error[E0277]: a value of type `i32` cannot be made by summing an iterator over elements of type `&()`
+  --> $DIR/sum.rs:4:25
+   |
+LL |     vec![(), ()].iter().sum::<i32>();
+   |                         ^^^ value of type `i32` cannot be made by summing a `std::iter::Iterator<Item=&()>`
+   |
+   = help: the trait `Sum<&()>` is not implemented for `i32`
+   = help: the following other types implement trait `Sum<A>`:
+             <i32 as Sum<&'a i32>>
+             <i32 as Sum>
+note: the method call chain might not have had the expected associated types
+  --> $DIR/sum.rs:4:18
+   |
+LL |     vec![(), ()].iter().sum::<i32>();
+   |     ------------ ^^^^^^ `Iterator::Item` is `&()` here
+   |     |
+   |     this expression has type `Vec<()>`
+note: required by a bound in `std::iter::Iterator::sum`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error[E0277]: a value of type `i32` cannot be made by multiplying all elements of type `&()` from an iterator
+  --> $DIR/sum.rs:7:25
+   |
+LL |     vec![(), ()].iter().product::<i32>();
+   |                         ^^^^^^^ value of type `i32` cannot be made by multiplying all elements from a `std::iter::Iterator<Item=&()>`
+   |
+   = help: the trait `Product<&()>` is not implemented for `i32`
+   = help: the following other types implement trait `Product<A>`:
+             <i32 as Product<&'a i32>>
+             <i32 as Product>
+note: the method call chain might not have had the expected associated types
+  --> $DIR/sum.rs:7:18
+   |
+LL |     vec![(), ()].iter().product::<i32>();
+   |     ------------ ^^^^^^ `Iterator::Item` is `&()` here
+   |     |
+   |     this expression has type `Vec<()>`
+note: required by a bound in `std::iter::Iterator::product`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/once-cant-call-twice-on-heap.rs b/tests/ui/once-cant-call-twice-on-heap.rs
index 3fd8c5cad..3fd8c5cad 100644
--- a/src/test/ui/once-cant-call-twice-on-heap.rs
+++ b/tests/ui/once-cant-call-twice-on-heap.rs
diff --git a/src/test/ui/once-cant-call-twice-on-heap.stderr b/tests/ui/once-cant-call-twice-on-heap.stderr
index 335ac6338..335ac6338 100644
--- a/src/test/ui/once-cant-call-twice-on-heap.stderr
+++ b/tests/ui/once-cant-call-twice-on-heap.stderr
diff --git a/src/test/ui/oom_unwind.rs b/tests/ui/oom_unwind.rs
index 21a8fb2b2..21a8fb2b2 100644
--- a/src/test/ui/oom_unwind.rs
+++ b/tests/ui/oom_unwind.rs
diff --git a/src/test/ui/op-assign-builtins-by-ref.rs b/tests/ui/op-assign-builtins-by-ref.rs
index 96853854d..96853854d 100644
--- a/src/test/ui/op-assign-builtins-by-ref.rs
+++ b/tests/ui/op-assign-builtins-by-ref.rs
diff --git a/src/test/ui/opeq.rs b/tests/ui/opeq.rs
index 9737be97f..9737be97f 100644
--- a/src/test/ui/opeq.rs
+++ b/tests/ui/opeq.rs
diff --git a/src/test/ui/operator-recovery/less-than-greater-than.rs b/tests/ui/operator-recovery/less-than-greater-than.rs
index 2beed528f..2beed528f 100644
--- a/src/test/ui/operator-recovery/less-than-greater-than.rs
+++ b/tests/ui/operator-recovery/less-than-greater-than.rs
diff --git a/src/test/ui/operator-recovery/less-than-greater-than.stderr b/tests/ui/operator-recovery/less-than-greater-than.stderr
index 80c921535..80c921535 100644
--- a/src/test/ui/operator-recovery/less-than-greater-than.stderr
+++ b/tests/ui/operator-recovery/less-than-greater-than.stderr
diff --git a/src/test/ui/operator-recovery/spaceship.rs b/tests/ui/operator-recovery/spaceship.rs
index a65f93896..a65f93896 100644
--- a/src/test/ui/operator-recovery/spaceship.rs
+++ b/tests/ui/operator-recovery/spaceship.rs
diff --git a/src/test/ui/operator-recovery/spaceship.stderr b/tests/ui/operator-recovery/spaceship.stderr
index ed6bd74c9..ed6bd74c9 100644
--- a/src/test/ui/operator-recovery/spaceship.stderr
+++ b/tests/ui/operator-recovery/spaceship.stderr
diff --git a/src/test/ui/opt-in-copy.rs b/tests/ui/opt-in-copy.rs
index 0b48418e4..0b48418e4 100644
--- a/src/test/ui/opt-in-copy.rs
+++ b/tests/ui/opt-in-copy.rs
diff --git a/src/test/ui/opt-in-copy.stderr b/tests/ui/opt-in-copy.stderr
index 4461567df..4461567df 100644
--- a/src/test/ui/opt-in-copy.stderr
+++ b/tests/ui/opt-in-copy.stderr
diff --git a/src/test/ui/optimization-fuel-0.rs b/tests/ui/optimization-fuel-0.rs
index 2643dbea1..2643dbea1 100644
--- a/src/test/ui/optimization-fuel-0.rs
+++ b/tests/ui/optimization-fuel-0.rs
diff --git a/src/test/ui/optimization-fuel-0.stderr b/tests/ui/optimization-fuel-0.stderr
index f0e2ebfc3..f0e2ebfc3 100644
--- a/src/test/ui/optimization-fuel-0.stderr
+++ b/tests/ui/optimization-fuel-0.stderr
diff --git a/src/test/ui/optimization-fuel-1.rs b/tests/ui/optimization-fuel-1.rs
index d5e2255d9..d5e2255d9 100644
--- a/src/test/ui/optimization-fuel-1.rs
+++ b/tests/ui/optimization-fuel-1.rs
diff --git a/src/test/ui/optimization-fuel-1.stderr b/tests/ui/optimization-fuel-1.stderr
index 53eafb058..53eafb058 100644
--- a/src/test/ui/optimization-fuel-1.stderr
+++ b/tests/ui/optimization-fuel-1.stderr
diff --git a/src/test/ui/optimization-remark.rs b/tests/ui/optimization-remark.rs
index d4b39c670..d4b39c670 100644
--- a/src/test/ui/optimization-remark.rs
+++ b/tests/ui/optimization-remark.rs
diff --git a/src/test/ui/or-patterns/already-bound-name.rs b/tests/ui/or-patterns/already-bound-name.rs
index 65c25293d..65c25293d 100644
--- a/src/test/ui/or-patterns/already-bound-name.rs
+++ b/tests/ui/or-patterns/already-bound-name.rs
diff --git a/src/test/ui/or-patterns/already-bound-name.stderr b/tests/ui/or-patterns/already-bound-name.stderr
index 368782c1e..368782c1e 100644
--- a/src/test/ui/or-patterns/already-bound-name.stderr
+++ b/tests/ui/or-patterns/already-bound-name.stderr
diff --git a/src/test/ui/or-patterns/basic-switch.rs b/tests/ui/or-patterns/basic-switch.rs
index 674fbc3cc..674fbc3cc 100644
--- a/src/test/ui/or-patterns/basic-switch.rs
+++ b/tests/ui/or-patterns/basic-switch.rs
diff --git a/src/test/ui/or-patterns/basic-switchint.rs b/tests/ui/or-patterns/basic-switchint.rs
index adb902caf..adb902caf 100644
--- a/src/test/ui/or-patterns/basic-switchint.rs
+++ b/tests/ui/or-patterns/basic-switchint.rs
diff --git a/src/test/ui/or-patterns/bindings-runpass-1.rs b/tests/ui/or-patterns/bindings-runpass-1.rs
index 3406d5197..3406d5197 100644
--- a/src/test/ui/or-patterns/bindings-runpass-1.rs
+++ b/tests/ui/or-patterns/bindings-runpass-1.rs
diff --git a/src/test/ui/or-patterns/bindings-runpass-2.rs b/tests/ui/or-patterns/bindings-runpass-2.rs
index 5b9bb748c..5b9bb748c 100644
--- a/src/test/ui/or-patterns/bindings-runpass-2.rs
+++ b/tests/ui/or-patterns/bindings-runpass-2.rs
diff --git a/src/test/ui/or-patterns/box-patterns.rs b/tests/ui/or-patterns/box-patterns.rs
index 73051401c..73051401c 100644
--- a/src/test/ui/or-patterns/box-patterns.rs
+++ b/tests/ui/or-patterns/box-patterns.rs
diff --git a/src/test/ui/or-patterns/consistent-bindings.rs b/tests/ui/or-patterns/consistent-bindings.rs
index ecae1d8a2..ecae1d8a2 100644
--- a/src/test/ui/or-patterns/consistent-bindings.rs
+++ b/tests/ui/or-patterns/consistent-bindings.rs
diff --git a/src/test/ui/or-patterns/const-fn.rs b/tests/ui/or-patterns/const-fn.rs
index ca512ac71..ca512ac71 100644
--- a/src/test/ui/or-patterns/const-fn.rs
+++ b/tests/ui/or-patterns/const-fn.rs
diff --git a/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.rs b/tests/ui/or-patterns/exhaustiveness-non-exhaustive.rs
index 5999e04e0..5999e04e0 100644
--- a/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.rs
+++ b/tests/ui/or-patterns/exhaustiveness-non-exhaustive.rs
diff --git a/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.stderr b/tests/ui/or-patterns/exhaustiveness-non-exhaustive.stderr
index 9aa808e6b..9aa808e6b 100644
--- a/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.stderr
+++ b/tests/ui/or-patterns/exhaustiveness-non-exhaustive.stderr
diff --git a/src/test/ui/or-patterns/exhaustiveness-pass.rs b/tests/ui/or-patterns/exhaustiveness-pass.rs
index e8c8a0e7b..e8c8a0e7b 100644
--- a/src/test/ui/or-patterns/exhaustiveness-pass.rs
+++ b/tests/ui/or-patterns/exhaustiveness-pass.rs
diff --git a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs b/tests/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
index 8429799ca..8429799ca 100644
--- a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
+++ b/tests/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
diff --git a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr b/tests/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
index 3f7d47dcb..3f7d47dcb 100644
--- a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
+++ b/tests/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
diff --git a/src/test/ui/or-patterns/fn-param-wrap-parens.fixed b/tests/ui/or-patterns/fn-param-wrap-parens.fixed
index b9490aaf9..b9490aaf9 100644
--- a/src/test/ui/or-patterns/fn-param-wrap-parens.fixed
+++ b/tests/ui/or-patterns/fn-param-wrap-parens.fixed
diff --git a/src/test/ui/or-patterns/fn-param-wrap-parens.rs b/tests/ui/or-patterns/fn-param-wrap-parens.rs
index 8e703d274..8e703d274 100644
--- a/src/test/ui/or-patterns/fn-param-wrap-parens.rs
+++ b/tests/ui/or-patterns/fn-param-wrap-parens.rs
diff --git a/src/test/ui/or-patterns/fn-param-wrap-parens.stderr b/tests/ui/or-patterns/fn-param-wrap-parens.stderr
index 732702841..732702841 100644
--- a/src/test/ui/or-patterns/fn-param-wrap-parens.stderr
+++ b/tests/ui/or-patterns/fn-param-wrap-parens.stderr
diff --git a/src/test/ui/or-patterns/for-loop.rs b/tests/ui/or-patterns/for-loop.rs
index 11b61cb69..11b61cb69 100644
--- a/src/test/ui/or-patterns/for-loop.rs
+++ b/tests/ui/or-patterns/for-loop.rs
diff --git a/src/test/ui/or-patterns/if-let-while-let.rs b/tests/ui/or-patterns/if-let-while-let.rs
index 92a1bb256..92a1bb256 100644
--- a/src/test/ui/or-patterns/if-let-while-let.rs
+++ b/tests/ui/or-patterns/if-let-while-let.rs
diff --git a/src/test/ui/or-patterns/inconsistent-modes.rs b/tests/ui/or-patterns/inconsistent-modes.rs
index a87a10ce8..a87a10ce8 100644
--- a/src/test/ui/or-patterns/inconsistent-modes.rs
+++ b/tests/ui/or-patterns/inconsistent-modes.rs
diff --git a/src/test/ui/or-patterns/inconsistent-modes.stderr b/tests/ui/or-patterns/inconsistent-modes.stderr
index f6367ef82..f6367ef82 100644
--- a/src/test/ui/or-patterns/inconsistent-modes.stderr
+++ b/tests/ui/or-patterns/inconsistent-modes.stderr
diff --git a/src/test/ui/or-patterns/inner-or-pat.or3.stderr b/tests/ui/or-patterns/inner-or-pat.or3.stderr
index 2236a38c3..2236a38c3 100644
--- a/src/test/ui/or-patterns/inner-or-pat.or3.stderr
+++ b/tests/ui/or-patterns/inner-or-pat.or3.stderr
diff --git a/src/test/ui/or-patterns/inner-or-pat.or4.stderr b/tests/ui/or-patterns/inner-or-pat.or4.stderr
index 058873ff5..058873ff5 100644
--- a/src/test/ui/or-patterns/inner-or-pat.or4.stderr
+++ b/tests/ui/or-patterns/inner-or-pat.or4.stderr
diff --git a/src/test/ui/or-patterns/inner-or-pat.rs b/tests/ui/or-patterns/inner-or-pat.rs
index f4cf4b0c1..f4cf4b0c1 100644
--- a/src/test/ui/or-patterns/inner-or-pat.rs
+++ b/tests/ui/or-patterns/inner-or-pat.rs
diff --git a/src/test/ui/or-patterns/issue-64879-trailing-before-guard.rs b/tests/ui/or-patterns/issue-64879-trailing-before-guard.rs
index 181c77009..181c77009 100644
--- a/src/test/ui/or-patterns/issue-64879-trailing-before-guard.rs
+++ b/tests/ui/or-patterns/issue-64879-trailing-before-guard.rs
diff --git a/src/test/ui/or-patterns/issue-64879-trailing-before-guard.stderr b/tests/ui/or-patterns/issue-64879-trailing-before-guard.stderr
index 9b827794f..9b827794f 100644
--- a/src/test/ui/or-patterns/issue-64879-trailing-before-guard.stderr
+++ b/tests/ui/or-patterns/issue-64879-trailing-before-guard.stderr
diff --git a/src/test/ui/or-patterns/issue-67514-irrefutable-param.rs b/tests/ui/or-patterns/issue-67514-irrefutable-param.rs
index 73931def8..73931def8 100644
--- a/src/test/ui/or-patterns/issue-67514-irrefutable-param.rs
+++ b/tests/ui/or-patterns/issue-67514-irrefutable-param.rs
diff --git a/src/test/ui/or-patterns/issue-68785-irrefutable-param-with-at.rs b/tests/ui/or-patterns/issue-68785-irrefutable-param-with-at.rs
index 7339a7e23..7339a7e23 100644
--- a/src/test/ui/or-patterns/issue-68785-irrefutable-param-with-at.rs
+++ b/tests/ui/or-patterns/issue-68785-irrefutable-param-with-at.rs
diff --git a/src/test/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.rs b/tests/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.rs
index 3538aad5d..3538aad5d 100644
--- a/src/test/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.rs
+++ b/tests/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.rs
diff --git a/src/test/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.stderr b/tests/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.stderr
index 95b22ac05..4adcf4fee 100644
--- a/src/test/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.stderr
+++ b/tests/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.stderr
@@ -1,4 +1,4 @@
-error[E0005]: refutable pattern in local binding: `i32::MIN..=-1_i32` and `3_i32..=i32::MAX` not covered
+error[E0005]: refutable pattern in local binding
   --> $DIR/issue-69875-should-have-been-expanded-earlier-non-exhaustive.rs:2:10
    |
 LL |     let (0 | (1 | 2)) = 0;
diff --git a/src/test/ui/or-patterns/issue-69875-should-have-been-expanded-earlier.rs b/tests/ui/or-patterns/issue-69875-should-have-been-expanded-earlier.rs
index 408ac24f3..408ac24f3 100644
--- a/src/test/ui/or-patterns/issue-69875-should-have-been-expanded-earlier.rs
+++ b/tests/ui/or-patterns/issue-69875-should-have-been-expanded-earlier.rs
diff --git a/src/test/ui/or-patterns/issue-70413-no-unreachable-pat-and-guard.rs b/tests/ui/or-patterns/issue-70413-no-unreachable-pat-and-guard.rs
index 8a3c640b1..8a3c640b1 100644
--- a/src/test/ui/or-patterns/issue-70413-no-unreachable-pat-and-guard.rs
+++ b/tests/ui/or-patterns/issue-70413-no-unreachable-pat-and-guard.rs
diff --git a/src/test/ui/or-patterns/let-pattern.rs b/tests/ui/or-patterns/let-pattern.rs
index 97207e83e..97207e83e 100644
--- a/src/test/ui/or-patterns/let-pattern.rs
+++ b/tests/ui/or-patterns/let-pattern.rs
diff --git a/src/test/ui/or-patterns/macro-pat.rs b/tests/ui/or-patterns/macro-pat.rs
index 20d8f84c2..20d8f84c2 100644
--- a/src/test/ui/or-patterns/macro-pat.rs
+++ b/tests/ui/or-patterns/macro-pat.rs
diff --git a/src/test/ui/or-patterns/mismatched-bindings-async-fn.rs b/tests/ui/or-patterns/mismatched-bindings-async-fn.rs
index d1cb73aaf..d1cb73aaf 100644
--- a/src/test/ui/or-patterns/mismatched-bindings-async-fn.rs
+++ b/tests/ui/or-patterns/mismatched-bindings-async-fn.rs
diff --git a/src/test/ui/or-patterns/mismatched-bindings-async-fn.stderr b/tests/ui/or-patterns/mismatched-bindings-async-fn.stderr
index 81602fffa..81602fffa 100644
--- a/src/test/ui/or-patterns/mismatched-bindings-async-fn.stderr
+++ b/tests/ui/or-patterns/mismatched-bindings-async-fn.stderr
diff --git a/src/test/ui/or-patterns/missing-bindings.rs b/tests/ui/or-patterns/missing-bindings.rs
index 7c26012c0..7c26012c0 100644
--- a/src/test/ui/or-patterns/missing-bindings.rs
+++ b/tests/ui/or-patterns/missing-bindings.rs
diff --git a/src/test/ui/or-patterns/missing-bindings.stderr b/tests/ui/or-patterns/missing-bindings.stderr
index 8fafa275b..8fafa275b 100644
--- a/src/test/ui/or-patterns/missing-bindings.stderr
+++ b/tests/ui/or-patterns/missing-bindings.stderr
diff --git a/src/test/ui/or-patterns/mix-with-wild.rs b/tests/ui/or-patterns/mix-with-wild.rs
index d9911cda1..d9911cda1 100644
--- a/src/test/ui/or-patterns/mix-with-wild.rs
+++ b/tests/ui/or-patterns/mix-with-wild.rs
diff --git a/src/test/ui/or-patterns/multiple-pattern-typo.rs b/tests/ui/or-patterns/multiple-pattern-typo.rs
index 5f2012533..5f2012533 100644
--- a/src/test/ui/or-patterns/multiple-pattern-typo.rs
+++ b/tests/ui/or-patterns/multiple-pattern-typo.rs
diff --git a/src/test/ui/or-patterns/multiple-pattern-typo.stderr b/tests/ui/or-patterns/multiple-pattern-typo.stderr
index b0a82b367..b0a82b367 100644
--- a/src/test/ui/or-patterns/multiple-pattern-typo.stderr
+++ b/tests/ui/or-patterns/multiple-pattern-typo.stderr
diff --git a/src/test/ui/or-patterns/nested-undelimited-precedence.rs b/tests/ui/or-patterns/nested-undelimited-precedence.rs
index 047836203..047836203 100644
--- a/src/test/ui/or-patterns/nested-undelimited-precedence.rs
+++ b/tests/ui/or-patterns/nested-undelimited-precedence.rs
diff --git a/src/test/ui/or-patterns/nested-undelimited-precedence.stderr b/tests/ui/or-patterns/nested-undelimited-precedence.stderr
index 2e25d8b3e..2e25d8b3e 100644
--- a/src/test/ui/or-patterns/nested-undelimited-precedence.stderr
+++ b/tests/ui/or-patterns/nested-undelimited-precedence.stderr
diff --git a/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.rs b/tests/ui/or-patterns/or-patterns-binding-type-mismatch.rs
index fa470de7f..fa470de7f 100644
--- a/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.rs
+++ b/tests/ui/or-patterns/or-patterns-binding-type-mismatch.rs
diff --git a/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr b/tests/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
index 00ce46c56..00ce46c56 100644
--- a/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
+++ b/tests/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
diff --git a/src/test/ui/or-patterns/or-patterns-default-binding-modes.rs b/tests/ui/or-patterns/or-patterns-default-binding-modes.rs
index e56f9ffe2..e56f9ffe2 100644
--- a/src/test/ui/or-patterns/or-patterns-default-binding-modes.rs
+++ b/tests/ui/or-patterns/or-patterns-default-binding-modes.rs
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.rs b/tests/ui/or-patterns/or-patterns-syntactic-fail-2018.rs
index a624cbc89..a624cbc89 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.rs
+++ b/tests/ui/or-patterns/or-patterns-syntactic-fail-2018.rs
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.stderr b/tests/ui/or-patterns/or-patterns-syntactic-fail-2018.stderr
index acc2099bb..acc2099bb 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.stderr
+++ b/tests/ui/or-patterns/or-patterns-syntactic-fail-2018.stderr
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail.rs b/tests/ui/or-patterns/or-patterns-syntactic-fail.rs
index 358e9d034..358e9d034 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-fail.rs
+++ b/tests/ui/or-patterns/or-patterns-syntactic-fail.rs
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr b/tests/ui/or-patterns/or-patterns-syntactic-fail.stderr
index 920720a4f..10d42b7e3 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr
+++ b/tests/ui/or-patterns/or-patterns-syntactic-fail.stderr
@@ -35,11 +35,8 @@ note: an implementation of `BitOr<_>` might be missing for `E`
    |
 LL | enum E { A, B }
    | ^^^^^^ must implement `BitOr<_>`
-note: the following trait must be implemented
+note: the trait `BitOr` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL | pub trait BitOr<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-pass-2021.rs b/tests/ui/or-patterns/or-patterns-syntactic-pass-2021.rs
index c0d148d92..c0d148d92 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-pass-2021.rs
+++ b/tests/ui/or-patterns/or-patterns-syntactic-pass-2021.rs
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-pass.rs b/tests/ui/or-patterns/or-patterns-syntactic-pass.rs
index 92750bec8..92750bec8 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-pass.rs
+++ b/tests/ui/or-patterns/or-patterns-syntactic-pass.rs
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-pass.stderr b/tests/ui/or-patterns/or-patterns-syntactic-pass.stderr
index c43fe192a..c43fe192a 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-pass.stderr
+++ b/tests/ui/or-patterns/or-patterns-syntactic-pass.stderr
diff --git a/src/test/ui/or-patterns/remove-leading-vert.fixed b/tests/ui/or-patterns/remove-leading-vert.fixed
index b1cd0a944..b1cd0a944 100644
--- a/src/test/ui/or-patterns/remove-leading-vert.fixed
+++ b/tests/ui/or-patterns/remove-leading-vert.fixed
diff --git a/src/test/ui/or-patterns/remove-leading-vert.rs b/tests/ui/or-patterns/remove-leading-vert.rs
index dc12382aa..dc12382aa 100644
--- a/src/test/ui/or-patterns/remove-leading-vert.rs
+++ b/tests/ui/or-patterns/remove-leading-vert.rs
diff --git a/src/test/ui/or-patterns/remove-leading-vert.stderr b/tests/ui/or-patterns/remove-leading-vert.stderr
index af51c67e1..af51c67e1 100644
--- a/src/test/ui/or-patterns/remove-leading-vert.stderr
+++ b/tests/ui/or-patterns/remove-leading-vert.stderr
diff --git a/src/test/ui/or-patterns/search-via-bindings.rs b/tests/ui/or-patterns/search-via-bindings.rs
index d98606ded..d98606ded 100644
--- a/src/test/ui/or-patterns/search-via-bindings.rs
+++ b/tests/ui/or-patterns/search-via-bindings.rs
diff --git a/src/test/ui/or-patterns/slice-patterns.rs b/tests/ui/or-patterns/slice-patterns.rs
index ed5eace0b..ed5eace0b 100644
--- a/src/test/ui/or-patterns/slice-patterns.rs
+++ b/tests/ui/or-patterns/slice-patterns.rs
diff --git a/src/test/ui/or-patterns/struct-like.rs b/tests/ui/or-patterns/struct-like.rs
index 7de690d2d..7de690d2d 100644
--- a/src/test/ui/or-patterns/struct-like.rs
+++ b/tests/ui/or-patterns/struct-like.rs
diff --git a/src/test/ui/or-patterns/while-parsing-this-or-pattern.rs b/tests/ui/or-patterns/while-parsing-this-or-pattern.rs
index b9bfb8638..b9bfb8638 100644
--- a/src/test/ui/or-patterns/while-parsing-this-or-pattern.rs
+++ b/tests/ui/or-patterns/while-parsing-this-or-pattern.rs
diff --git a/src/test/ui/or-patterns/while-parsing-this-or-pattern.stderr b/tests/ui/or-patterns/while-parsing-this-or-pattern.stderr
index 7ad62ff99..7ad62ff99 100644
--- a/src/test/ui/or-patterns/while-parsing-this-or-pattern.stderr
+++ b/tests/ui/or-patterns/while-parsing-this-or-pattern.stderr
diff --git a/src/test/ui/order-dependent-cast-inference.rs b/tests/ui/order-dependent-cast-inference.rs
index e666209b9..e666209b9 100644
--- a/src/test/ui/order-dependent-cast-inference.rs
+++ b/tests/ui/order-dependent-cast-inference.rs
diff --git a/src/test/ui/order-dependent-cast-inference.stderr b/tests/ui/order-dependent-cast-inference.stderr
index 9f4ac0fea..9f4ac0fea 100644
--- a/src/test/ui/order-dependent-cast-inference.stderr
+++ b/tests/ui/order-dependent-cast-inference.stderr
diff --git a/src/test/ui/orphan-check-diagnostics.rs b/tests/ui/orphan-check-diagnostics.rs
index c8803b9ae..c8803b9ae 100644
--- a/src/test/ui/orphan-check-diagnostics.rs
+++ b/tests/ui/orphan-check-diagnostics.rs
diff --git a/src/test/ui/orphan-check-diagnostics.stderr b/tests/ui/orphan-check-diagnostics.stderr
index 7a7cea563..7a7cea563 100644
--- a/src/test/ui/orphan-check-diagnostics.stderr
+++ b/tests/ui/orphan-check-diagnostics.stderr
diff --git a/src/test/ui/osx-frameworks.rs b/tests/ui/osx-frameworks.rs
index 958183ec0..958183ec0 100644
--- a/src/test/ui/osx-frameworks.rs
+++ b/tests/ui/osx-frameworks.rs
diff --git a/src/test/ui/osx-frameworks.stderr b/tests/ui/osx-frameworks.stderr
index e4a5c98dc..e4a5c98dc 100644
--- a/src/test/ui/osx-frameworks.stderr
+++ b/tests/ui/osx-frameworks.stderr
diff --git a/src/test/ui/out-pointer-aliasing.rs b/tests/ui/out-pointer-aliasing.rs
index b28a09101..b28a09101 100644
--- a/src/test/ui/out-pointer-aliasing.rs
+++ b/tests/ui/out-pointer-aliasing.rs
diff --git a/src/test/ui/output-slot-variants.rs b/tests/ui/output-slot-variants.rs
index 7c20a2b2f..7c20a2b2f 100644
--- a/src/test/ui/output-slot-variants.rs
+++ b/tests/ui/output-slot-variants.rs
diff --git a/src/test/ui/output-type-mismatch.rs b/tests/ui/output-type-mismatch.rs
index 35097aa9e..35097aa9e 100644
--- a/src/test/ui/output-type-mismatch.rs
+++ b/tests/ui/output-type-mismatch.rs
diff --git a/src/test/ui/output-type-mismatch.stderr b/tests/ui/output-type-mismatch.stderr
index 4507a4df6..4507a4df6 100644
--- a/src/test/ui/output-type-mismatch.stderr
+++ b/tests/ui/output-type-mismatch.stderr
diff --git a/src/test/ui/over-constrained-vregs.rs b/tests/ui/over-constrained-vregs.rs
index cc8081476..cc8081476 100644
--- a/src/test/ui/over-constrained-vregs.rs
+++ b/tests/ui/over-constrained-vregs.rs
diff --git a/src/test/ui/overloaded/auxiliary/overloaded_autoderef_xc.rs b/tests/ui/overloaded/auxiliary/overloaded_autoderef_xc.rs
index 112455f91..112455f91 100644
--- a/src/test/ui/overloaded/auxiliary/overloaded_autoderef_xc.rs
+++ b/tests/ui/overloaded/auxiliary/overloaded_autoderef_xc.rs
diff --git a/src/test/ui/overloaded/fixup-deref-mut.rs b/tests/ui/overloaded/fixup-deref-mut.rs
index 6b2fd72b8..6b2fd72b8 100644
--- a/src/test/ui/overloaded/fixup-deref-mut.rs
+++ b/tests/ui/overloaded/fixup-deref-mut.rs
diff --git a/src/test/ui/overloaded/issue-14958.rs b/tests/ui/overloaded/issue-14958.rs
index a12564ca9..a12564ca9 100644
--- a/src/test/ui/overloaded/issue-14958.rs
+++ b/tests/ui/overloaded/issue-14958.rs
diff --git a/src/test/ui/overloaded/overloaded-autoderef-count.rs b/tests/ui/overloaded/overloaded-autoderef-count.rs
index d58deda09..d58deda09 100644
--- a/src/test/ui/overloaded/overloaded-autoderef-count.rs
+++ b/tests/ui/overloaded/overloaded-autoderef-count.rs
diff --git a/src/test/ui/overloaded/overloaded-autoderef-indexing.rs b/tests/ui/overloaded/overloaded-autoderef-indexing.rs
index 1c8c7cca9..1c8c7cca9 100644
--- a/src/test/ui/overloaded/overloaded-autoderef-indexing.rs
+++ b/tests/ui/overloaded/overloaded-autoderef-indexing.rs
diff --git a/src/test/ui/overloaded/overloaded-autoderef-order.rs b/tests/ui/overloaded/overloaded-autoderef-order.rs
index f48bae55f..f48bae55f 100644
--- a/src/test/ui/overloaded/overloaded-autoderef-order.rs
+++ b/tests/ui/overloaded/overloaded-autoderef-order.rs
diff --git a/src/test/ui/overloaded/overloaded-autoderef-vtable.rs b/tests/ui/overloaded/overloaded-autoderef-vtable.rs
index f8e6d1208..f8e6d1208 100644
--- a/src/test/ui/overloaded/overloaded-autoderef-vtable.rs
+++ b/tests/ui/overloaded/overloaded-autoderef-vtable.rs
diff --git a/src/test/ui/overloaded/overloaded-autoderef-xcrate.rs b/tests/ui/overloaded/overloaded-autoderef-xcrate.rs
index d065e825c..d065e825c 100644
--- a/src/test/ui/overloaded/overloaded-autoderef-xcrate.rs
+++ b/tests/ui/overloaded/overloaded-autoderef-xcrate.rs
diff --git a/src/test/ui/overloaded/overloaded-autoderef.rs b/tests/ui/overloaded/overloaded-autoderef.rs
index cae3ec906..cae3ec906 100644
--- a/src/test/ui/overloaded/overloaded-autoderef.rs
+++ b/tests/ui/overloaded/overloaded-autoderef.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-nontuple.rs b/tests/ui/overloaded/overloaded-calls-nontuple.rs
index 32a3b93e0..32a3b93e0 100644
--- a/src/test/ui/overloaded/overloaded-calls-nontuple.rs
+++ b/tests/ui/overloaded/overloaded-calls-nontuple.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-nontuple.stderr b/tests/ui/overloaded/overloaded-calls-nontuple.stderr
index 794535aeb..2e1600782 100644
--- a/src/test/ui/overloaded/overloaded-calls-nontuple.stderr
+++ b/tests/ui/overloaded/overloaded-calls-nontuple.stderr
@@ -6,9 +6,6 @@ LL | impl FnMut<isize> for S {
    |
 note: required by a bound in `FnMut`
   --> $SRC_DIR/core/src/ops/function.rs:LL:COL
-   |
-LL | pub trait FnMut<Args: Tuple>: FnOnce<Args> {
-   |                       ^^^^^ required by this bound in `FnMut`
 
 error[E0059]: type parameter to bare `FnOnce` trait must be a tuple
   --> $DIR/overloaded-calls-nontuple.rs:18:6
@@ -18,9 +15,6 @@ LL | impl FnOnce<isize> for S {
    |
 note: required by a bound in `FnOnce`
   --> $SRC_DIR/core/src/ops/function.rs:LL:COL
-   |
-LL | pub trait FnOnce<Args: Tuple> {
-   |                        ^^^^^ required by this bound in `FnOnce`
 
 error[E0277]: functions with the "rust-call" ABI must take a single non-self tuple argument
   --> $DIR/overloaded-calls-nontuple.rs:12:5
diff --git a/src/test/ui/overloaded/overloaded-calls-object-one-arg.rs b/tests/ui/overloaded/overloaded-calls-object-one-arg.rs
index 1afab9a1f..1afab9a1f 100644
--- a/src/test/ui/overloaded/overloaded-calls-object-one-arg.rs
+++ b/tests/ui/overloaded/overloaded-calls-object-one-arg.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-object-two-args.rs b/tests/ui/overloaded/overloaded-calls-object-two-args.rs
index 38087bc87..38087bc87 100644
--- a/src/test/ui/overloaded/overloaded-calls-object-two-args.rs
+++ b/tests/ui/overloaded/overloaded-calls-object-two-args.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-object-zero-args.rs b/tests/ui/overloaded/overloaded-calls-object-zero-args.rs
index 9a7bfaa9b..9a7bfaa9b 100644
--- a/src/test/ui/overloaded/overloaded-calls-object-zero-args.rs
+++ b/tests/ui/overloaded/overloaded-calls-object-zero-args.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-param-vtables.rs b/tests/ui/overloaded/overloaded-calls-param-vtables.rs
index fde1ad20f..fde1ad20f 100644
--- a/src/test/ui/overloaded/overloaded-calls-param-vtables.rs
+++ b/tests/ui/overloaded/overloaded-calls-param-vtables.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-simple.rs b/tests/ui/overloaded/overloaded-calls-simple.rs
index 413183607..413183607 100644
--- a/src/test/ui/overloaded/overloaded-calls-simple.rs
+++ b/tests/ui/overloaded/overloaded-calls-simple.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-zero-args.rs b/tests/ui/overloaded/overloaded-calls-zero-args.rs
index 69ca88619..69ca88619 100644
--- a/src/test/ui/overloaded/overloaded-calls-zero-args.rs
+++ b/tests/ui/overloaded/overloaded-calls-zero-args.rs
diff --git a/src/test/ui/overloaded/overloaded-deref-count.rs b/tests/ui/overloaded/overloaded-deref-count.rs
index e2f1e10b5..e2f1e10b5 100644
--- a/src/test/ui/overloaded/overloaded-deref-count.rs
+++ b/tests/ui/overloaded/overloaded-deref-count.rs
diff --git a/src/test/ui/overloaded/overloaded-deref.rs b/tests/ui/overloaded/overloaded-deref.rs
index 73d8232a3..73d8232a3 100644
--- a/src/test/ui/overloaded/overloaded-deref.rs
+++ b/tests/ui/overloaded/overloaded-deref.rs
diff --git a/src/test/ui/overloaded/overloaded-index-assoc-list.rs b/tests/ui/overloaded/overloaded-index-assoc-list.rs
index eb027afea..eb027afea 100644
--- a/src/test/ui/overloaded/overloaded-index-assoc-list.rs
+++ b/tests/ui/overloaded/overloaded-index-assoc-list.rs
diff --git a/src/test/ui/overloaded/overloaded-index-autoderef.rs b/tests/ui/overloaded/overloaded-index-autoderef.rs
index 41f9efa8c..41f9efa8c 100644
--- a/src/test/ui/overloaded/overloaded-index-autoderef.rs
+++ b/tests/ui/overloaded/overloaded-index-autoderef.rs
diff --git a/src/test/ui/overloaded/overloaded-index-in-field.rs b/tests/ui/overloaded/overloaded-index-in-field.rs
index 8a1fa7deb..8a1fa7deb 100644
--- a/src/test/ui/overloaded/overloaded-index-in-field.rs
+++ b/tests/ui/overloaded/overloaded-index-in-field.rs
diff --git a/src/test/ui/overloaded/overloaded-index.rs b/tests/ui/overloaded/overloaded-index.rs
index 5ad6d2e70..5ad6d2e70 100644
--- a/src/test/ui/overloaded/overloaded-index.rs
+++ b/tests/ui/overloaded/overloaded-index.rs
diff --git a/src/test/ui/overloaded/overloaded_deref_with_ref_pattern.rs b/tests/ui/overloaded/overloaded_deref_with_ref_pattern.rs
index c87ba6a02..c87ba6a02 100644
--- a/src/test/ui/overloaded/overloaded_deref_with_ref_pattern.rs
+++ b/tests/ui/overloaded/overloaded_deref_with_ref_pattern.rs
diff --git a/src/test/ui/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs b/tests/ui/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs
index 61edd2ace..61edd2ace 100644
--- a/src/test/ui/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs
+++ b/tests/ui/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs
diff --git a/src/test/ui/packed-struct/packed-struct-generic-transmute.rs b/tests/ui/packed-struct/packed-struct-generic-transmute.rs
index c6264b6d2..c6264b6d2 100644
--- a/src/test/ui/packed-struct/packed-struct-generic-transmute.rs
+++ b/tests/ui/packed-struct/packed-struct-generic-transmute.rs
diff --git a/src/test/ui/packed-struct/packed-struct-generic-transmute.stderr b/tests/ui/packed-struct/packed-struct-generic-transmute.stderr
index 744c832db..744c832db 100644
--- a/src/test/ui/packed-struct/packed-struct-generic-transmute.stderr
+++ b/tests/ui/packed-struct/packed-struct-generic-transmute.stderr
diff --git a/src/test/ui/packed-struct/packed-struct-transmute.rs b/tests/ui/packed-struct/packed-struct-transmute.rs
index a7d284025..a7d284025 100644
--- a/src/test/ui/packed-struct/packed-struct-transmute.rs
+++ b/tests/ui/packed-struct/packed-struct-transmute.rs
diff --git a/src/test/ui/packed-struct/packed-struct-transmute.stderr b/tests/ui/packed-struct/packed-struct-transmute.stderr
index 80a8919f7..80a8919f7 100644
--- a/src/test/ui/packed-struct/packed-struct-transmute.stderr
+++ b/tests/ui/packed-struct/packed-struct-transmute.stderr
diff --git a/src/test/ui/packed/auxiliary/packed.rs b/tests/ui/packed/auxiliary/packed.rs
index cba166fac..cba166fac 100644
--- a/src/test/ui/packed/auxiliary/packed.rs
+++ b/tests/ui/packed/auxiliary/packed.rs
diff --git a/src/test/ui/packed/issue-27060-2.rs b/tests/ui/packed/issue-27060-2.rs
index a001ce1e0..a001ce1e0 100644
--- a/src/test/ui/packed/issue-27060-2.rs
+++ b/tests/ui/packed/issue-27060-2.rs
diff --git a/src/test/ui/packed/issue-27060-2.stderr b/tests/ui/packed/issue-27060-2.stderr
index 0836ceaec..0836ceaec 100644
--- a/src/test/ui/packed/issue-27060-2.stderr
+++ b/tests/ui/packed/issue-27060-2.stderr
diff --git a/src/test/ui/packed/issue-27060-rpass.rs b/tests/ui/packed/issue-27060-rpass.rs
index d9159f666..d9159f666 100644
--- a/src/test/ui/packed/issue-27060-rpass.rs
+++ b/tests/ui/packed/issue-27060-rpass.rs
diff --git a/src/test/ui/packed/issue-27060-rpass.stderr b/tests/ui/packed/issue-27060-rpass.stderr
index adf9ae9f5..adf9ae9f5 100644
--- a/src/test/ui/packed/issue-27060-rpass.stderr
+++ b/tests/ui/packed/issue-27060-rpass.stderr
diff --git a/src/test/ui/packed/issue-27060.rs b/tests/ui/packed/issue-27060.rs
index 886a00239..886a00239 100644
--- a/src/test/ui/packed/issue-27060.rs
+++ b/tests/ui/packed/issue-27060.rs
diff --git a/src/test/ui/packed/issue-27060.stderr b/tests/ui/packed/issue-27060.stderr
index 85e08fa02..85e08fa02 100644
--- a/src/test/ui/packed/issue-27060.stderr
+++ b/tests/ui/packed/issue-27060.stderr
diff --git a/src/test/ui/packed/issue-46152.rs b/tests/ui/packed/issue-46152.rs
index fb1c9fb78..fb1c9fb78 100644
--- a/src/test/ui/packed/issue-46152.rs
+++ b/tests/ui/packed/issue-46152.rs
diff --git a/src/test/ui/packed/packed-struct-address-of-element.rs b/tests/ui/packed/packed-struct-address-of-element.rs
index d86698cbf..d86698cbf 100644
--- a/src/test/ui/packed/packed-struct-address-of-element.rs
+++ b/tests/ui/packed/packed-struct-address-of-element.rs
diff --git a/src/test/ui/packed/packed-struct-borrow-element-64bit.rs b/tests/ui/packed/packed-struct-borrow-element-64bit.rs
index 00bddfe40..00bddfe40 100644
--- a/src/test/ui/packed/packed-struct-borrow-element-64bit.rs
+++ b/tests/ui/packed/packed-struct-borrow-element-64bit.rs
diff --git a/src/test/ui/packed/packed-struct-borrow-element-64bit.stderr b/tests/ui/packed/packed-struct-borrow-element-64bit.stderr
index fb2f5615c..fb2f5615c 100644
--- a/src/test/ui/packed/packed-struct-borrow-element-64bit.stderr
+++ b/tests/ui/packed/packed-struct-borrow-element-64bit.stderr
diff --git a/src/test/ui/packed/packed-struct-borrow-element.rs b/tests/ui/packed/packed-struct-borrow-element.rs
index a6ee90cef..a6ee90cef 100644
--- a/src/test/ui/packed/packed-struct-borrow-element.rs
+++ b/tests/ui/packed/packed-struct-borrow-element.rs
diff --git a/src/test/ui/packed/packed-struct-borrow-element.stderr b/tests/ui/packed/packed-struct-borrow-element.stderr
index 75d55c4f6..75d55c4f6 100644
--- a/src/test/ui/packed/packed-struct-borrow-element.stderr
+++ b/tests/ui/packed/packed-struct-borrow-element.stderr
diff --git a/src/test/ui/packed/packed-struct-drop-aligned.rs b/tests/ui/packed/packed-struct-drop-aligned.rs
index 9f9f41e25..9f9f41e25 100644
--- a/src/test/ui/packed/packed-struct-drop-aligned.rs
+++ b/tests/ui/packed/packed-struct-drop-aligned.rs
diff --git a/src/test/ui/packed/packed-struct-generic-layout.rs b/tests/ui/packed/packed-struct-generic-layout.rs
index e064eede4..e064eede4 100644
--- a/src/test/ui/packed/packed-struct-generic-layout.rs
+++ b/tests/ui/packed/packed-struct-generic-layout.rs
diff --git a/src/test/ui/packed/packed-struct-generic-size.rs b/tests/ui/packed/packed-struct-generic-size.rs
index 7c93e46c3..7c93e46c3 100644
--- a/src/test/ui/packed/packed-struct-generic-size.rs
+++ b/tests/ui/packed/packed-struct-generic-size.rs
diff --git a/src/test/ui/packed/packed-struct-layout.rs b/tests/ui/packed/packed-struct-layout.rs
index d49c222e6..d49c222e6 100644
--- a/src/test/ui/packed/packed-struct-layout.rs
+++ b/tests/ui/packed/packed-struct-layout.rs
diff --git a/src/test/ui/packed/packed-struct-match.rs b/tests/ui/packed/packed-struct-match.rs
index 9a572ced7..9a572ced7 100644
--- a/src/test/ui/packed/packed-struct-match.rs
+++ b/tests/ui/packed/packed-struct-match.rs
diff --git a/src/test/ui/packed/packed-struct-optimized-enum.rs b/tests/ui/packed/packed-struct-optimized-enum.rs
index 5e1a1f518..5e1a1f518 100644
--- a/src/test/ui/packed/packed-struct-optimized-enum.rs
+++ b/tests/ui/packed/packed-struct-optimized-enum.rs
diff --git a/src/test/ui/packed/packed-struct-size-xc.rs b/tests/ui/packed/packed-struct-size-xc.rs
index 46112d51d..46112d51d 100644
--- a/src/test/ui/packed/packed-struct-size-xc.rs
+++ b/tests/ui/packed/packed-struct-size-xc.rs
diff --git a/src/test/ui/packed/packed-struct-size.rs b/tests/ui/packed/packed-struct-size.rs
index c832c7cfa..c832c7cfa 100644
--- a/src/test/ui/packed/packed-struct-size.rs
+++ b/tests/ui/packed/packed-struct-size.rs
diff --git a/src/test/ui/packed/packed-struct-vec.rs b/tests/ui/packed/packed-struct-vec.rs
index 18676cfc2..18676cfc2 100644
--- a/src/test/ui/packed/packed-struct-vec.rs
+++ b/tests/ui/packed/packed-struct-vec.rs
diff --git a/src/test/ui/packed/packed-tuple-struct-layout.rs b/tests/ui/packed/packed-tuple-struct-layout.rs
index 931be5b94..931be5b94 100644
--- a/src/test/ui/packed/packed-tuple-struct-layout.rs
+++ b/tests/ui/packed/packed-tuple-struct-layout.rs
diff --git a/src/test/ui/packed/packed-tuple-struct-size.rs b/tests/ui/packed/packed-tuple-struct-size.rs
index f7a3c903f..f7a3c903f 100644
--- a/src/test/ui/packed/packed-tuple-struct-size.rs
+++ b/tests/ui/packed/packed-tuple-struct-size.rs
diff --git a/src/test/ui/packed/packed-with-inference-vars-issue-61402.rs b/tests/ui/packed/packed-with-inference-vars-issue-61402.rs
index 659864c1d..659864c1d 100644
--- a/src/test/ui/packed/packed-with-inference-vars-issue-61402.rs
+++ b/tests/ui/packed/packed-with-inference-vars-issue-61402.rs
diff --git a/src/test/ui/panic-handler/auxiliary/some-panic-impl.rs b/tests/ui/panic-handler/auxiliary/some-panic-impl.rs
index 0348b3a2d..0348b3a2d 100644
--- a/src/test/ui/panic-handler/auxiliary/some-panic-impl.rs
+++ b/tests/ui/panic-handler/auxiliary/some-panic-impl.rs
diff --git a/src/test/ui/panic-handler/auxiliary/weak-lang-items.rs b/tests/ui/panic-handler/auxiliary/weak-lang-items.rs
index 7a698cf76..7a698cf76 100644
--- a/src/test/ui/panic-handler/auxiliary/weak-lang-items.rs
+++ b/tests/ui/panic-handler/auxiliary/weak-lang-items.rs
diff --git a/src/test/ui/panic-handler/panic-handler-bad-signature-1.rs b/tests/ui/panic-handler/panic-handler-bad-signature-1.rs
index 775961d3f..775961d3f 100644
--- a/src/test/ui/panic-handler/panic-handler-bad-signature-1.rs
+++ b/tests/ui/panic-handler/panic-handler-bad-signature-1.rs
diff --git a/src/test/ui/panic-handler/panic-handler-bad-signature-1.stderr b/tests/ui/panic-handler/panic-handler-bad-signature-1.stderr
index 8b044f766..8b044f766 100644
--- a/src/test/ui/panic-handler/panic-handler-bad-signature-1.stderr
+++ b/tests/ui/panic-handler/panic-handler-bad-signature-1.stderr
diff --git a/src/test/ui/panic-handler/panic-handler-bad-signature-2.rs b/tests/ui/panic-handler/panic-handler-bad-signature-2.rs
index 727934000..727934000 100644
--- a/src/test/ui/panic-handler/panic-handler-bad-signature-2.rs
+++ b/tests/ui/panic-handler/panic-handler-bad-signature-2.rs
diff --git a/src/test/ui/panic-handler/panic-handler-bad-signature-2.stderr b/tests/ui/panic-handler/panic-handler-bad-signature-2.stderr
index 5ab693420..5ab693420 100644
--- a/src/test/ui/panic-handler/panic-handler-bad-signature-2.stderr
+++ b/tests/ui/panic-handler/panic-handler-bad-signature-2.stderr
diff --git a/src/test/ui/panic-handler/panic-handler-bad-signature-3.rs b/tests/ui/panic-handler/panic-handler-bad-signature-3.rs
index ab9c9d7f4..ab9c9d7f4 100644
--- a/src/test/ui/panic-handler/panic-handler-bad-signature-3.rs
+++ b/tests/ui/panic-handler/panic-handler-bad-signature-3.rs
diff --git a/src/test/ui/panic-handler/panic-handler-bad-signature-3.stderr b/tests/ui/panic-handler/panic-handler-bad-signature-3.stderr
index 0a70181fd..0a70181fd 100644
--- a/src/test/ui/panic-handler/panic-handler-bad-signature-3.stderr
+++ b/tests/ui/panic-handler/panic-handler-bad-signature-3.stderr
diff --git a/src/test/ui/panic-handler/panic-handler-bad-signature-4.rs b/tests/ui/panic-handler/panic-handler-bad-signature-4.rs
index 8240ab083..8240ab083 100644
--- a/src/test/ui/panic-handler/panic-handler-bad-signature-4.rs
+++ b/tests/ui/panic-handler/panic-handler-bad-signature-4.rs
diff --git a/src/test/ui/panic-handler/panic-handler-bad-signature-4.stderr b/tests/ui/panic-handler/panic-handler-bad-signature-4.stderr
index 5e46da121..5e46da121 100644
--- a/src/test/ui/panic-handler/panic-handler-bad-signature-4.stderr
+++ b/tests/ui/panic-handler/panic-handler-bad-signature-4.stderr
diff --git a/src/test/ui/panic-handler/panic-handler-duplicate.rs b/tests/ui/panic-handler/panic-handler-duplicate.rs
index bd99af999..bd99af999 100644
--- a/src/test/ui/panic-handler/panic-handler-duplicate.rs
+++ b/tests/ui/panic-handler/panic-handler-duplicate.rs
diff --git a/src/test/ui/panic-handler/panic-handler-duplicate.stderr b/tests/ui/panic-handler/panic-handler-duplicate.stderr
index 8cdc4888d..8cdc4888d 100644
--- a/src/test/ui/panic-handler/panic-handler-duplicate.stderr
+++ b/tests/ui/panic-handler/panic-handler-duplicate.stderr
diff --git a/src/test/ui/panic-handler/panic-handler-missing.rs b/tests/ui/panic-handler/panic-handler-missing.rs
index 6bb062ba6..6bb062ba6 100644
--- a/src/test/ui/panic-handler/panic-handler-missing.rs
+++ b/tests/ui/panic-handler/panic-handler-missing.rs
diff --git a/src/test/ui/panic-handler/panic-handler-requires-panic-info.rs b/tests/ui/panic-handler/panic-handler-requires-panic-info.rs
index f13c12fc5..f13c12fc5 100644
--- a/src/test/ui/panic-handler/panic-handler-requires-panic-info.rs
+++ b/tests/ui/panic-handler/panic-handler-requires-panic-info.rs
diff --git a/src/test/ui/panic-handler/panic-handler-requires-panic-info.stderr b/tests/ui/panic-handler/panic-handler-requires-panic-info.stderr
index 2bae12efb..2bae12efb 100644
--- a/src/test/ui/panic-handler/panic-handler-requires-panic-info.stderr
+++ b/tests/ui/panic-handler/panic-handler-requires-panic-info.stderr
diff --git a/src/test/ui/panic-handler/panic-handler-std.rs b/tests/ui/panic-handler/panic-handler-std.rs
index 6183c886c..6183c886c 100644
--- a/src/test/ui/panic-handler/panic-handler-std.rs
+++ b/tests/ui/panic-handler/panic-handler-std.rs
diff --git a/src/test/ui/panic-handler/panic-handler-std.stderr b/tests/ui/panic-handler/panic-handler-std.stderr
index 7c7feffe7..7c7feffe7 100644
--- a/src/test/ui/panic-handler/panic-handler-std.stderr
+++ b/tests/ui/panic-handler/panic-handler-std.stderr
diff --git a/src/test/ui/panic-handler/panic-handler-twice.rs b/tests/ui/panic-handler/panic-handler-twice.rs
index 05bef66d8..05bef66d8 100644
--- a/src/test/ui/panic-handler/panic-handler-twice.rs
+++ b/tests/ui/panic-handler/panic-handler-twice.rs
diff --git a/src/test/ui/panic-handler/panic-handler-wrong-location.rs b/tests/ui/panic-handler/panic-handler-wrong-location.rs
index dca591018..dca591018 100644
--- a/src/test/ui/panic-handler/panic-handler-wrong-location.rs
+++ b/tests/ui/panic-handler/panic-handler-wrong-location.rs
diff --git a/src/test/ui/panic-handler/panic-handler-wrong-location.stderr b/tests/ui/panic-handler/panic-handler-wrong-location.stderr
index ae3ed5ab1..ae3ed5ab1 100644
--- a/src/test/ui/panic-handler/panic-handler-wrong-location.stderr
+++ b/tests/ui/panic-handler/panic-handler-wrong-location.stderr
diff --git a/src/test/ui/panic-handler/weak-lang-item-2.rs b/tests/ui/panic-handler/weak-lang-item-2.rs
index a429d8fab..a429d8fab 100644
--- a/src/test/ui/panic-handler/weak-lang-item-2.rs
+++ b/tests/ui/panic-handler/weak-lang-item-2.rs
diff --git a/src/test/ui/panic-handler/weak-lang-item.rs b/tests/ui/panic-handler/weak-lang-item.rs
index 14a07a9ef..14a07a9ef 100644
--- a/src/test/ui/panic-handler/weak-lang-item.rs
+++ b/tests/ui/panic-handler/weak-lang-item.rs
diff --git a/src/test/ui/panic-handler/weak-lang-item.stderr b/tests/ui/panic-handler/weak-lang-item.stderr
index 202f3309d..202f3309d 100644
--- a/src/test/ui/panic-handler/weak-lang-item.stderr
+++ b/tests/ui/panic-handler/weak-lang-item.stderr
diff --git a/src/test/ui/panic-runtime/abort-link-to-unwind-dylib.rs b/tests/ui/panic-runtime/abort-link-to-unwind-dylib.rs
index 58a90a592..58a90a592 100644
--- a/src/test/ui/panic-runtime/abort-link-to-unwind-dylib.rs
+++ b/tests/ui/panic-runtime/abort-link-to-unwind-dylib.rs
diff --git a/src/test/ui/panic-runtime/abort-link-to-unwind-dylib.stderr b/tests/ui/panic-runtime/abort-link-to-unwind-dylib.stderr
index 704b81ae1..704b81ae1 100644
--- a/src/test/ui/panic-runtime/abort-link-to-unwind-dylib.stderr
+++ b/tests/ui/panic-runtime/abort-link-to-unwind-dylib.stderr
diff --git a/src/test/ui/panic-runtime/abort-link-to-unwinding-crates.rs b/tests/ui/panic-runtime/abort-link-to-unwinding-crates.rs
index 566626513..566626513 100644
--- a/src/test/ui/panic-runtime/abort-link-to-unwinding-crates.rs
+++ b/tests/ui/panic-runtime/abort-link-to-unwinding-crates.rs
diff --git a/src/test/ui/panic-runtime/abort.rs b/tests/ui/panic-runtime/abort.rs
index dcc4061fd..dcc4061fd 100644
--- a/src/test/ui/panic-runtime/abort.rs
+++ b/tests/ui/panic-runtime/abort.rs
diff --git a/src/test/ui/panic-runtime/auxiliary/depends.rs b/tests/ui/panic-runtime/auxiliary/depends.rs
index e9bc2f489..e9bc2f489 100644
--- a/src/test/ui/panic-runtime/auxiliary/depends.rs
+++ b/tests/ui/panic-runtime/auxiliary/depends.rs
diff --git a/src/test/ui/panic-runtime/auxiliary/exit-success-if-unwind.rs b/tests/ui/panic-runtime/auxiliary/exit-success-if-unwind.rs
index c0e057405..c0e057405 100644
--- a/src/test/ui/panic-runtime/auxiliary/exit-success-if-unwind.rs
+++ b/tests/ui/panic-runtime/auxiliary/exit-success-if-unwind.rs
diff --git a/src/test/ui/panic-runtime/auxiliary/needs-abort.rs b/tests/ui/panic-runtime/auxiliary/needs-abort.rs
index 8fad49b5e..8fad49b5e 100644
--- a/src/test/ui/panic-runtime/auxiliary/needs-abort.rs
+++ b/tests/ui/panic-runtime/auxiliary/needs-abort.rs
diff --git a/src/test/ui/panic-runtime/auxiliary/needs-panic-runtime.rs b/tests/ui/panic-runtime/auxiliary/needs-panic-runtime.rs
index 3f030c169..3f030c169 100644
--- a/src/test/ui/panic-runtime/auxiliary/needs-panic-runtime.rs
+++ b/tests/ui/panic-runtime/auxiliary/needs-panic-runtime.rs
diff --git a/src/test/ui/panic-runtime/auxiliary/needs-unwind.rs b/tests/ui/panic-runtime/auxiliary/needs-unwind.rs
index d555b5319..d555b5319 100644
--- a/src/test/ui/panic-runtime/auxiliary/needs-unwind.rs
+++ b/tests/ui/panic-runtime/auxiliary/needs-unwind.rs
diff --git a/src/test/ui/panic-runtime/auxiliary/panic-runtime-abort.rs b/tests/ui/panic-runtime/auxiliary/panic-runtime-abort.rs
index c92015eee..c92015eee 100644
--- a/src/test/ui/panic-runtime/auxiliary/panic-runtime-abort.rs
+++ b/tests/ui/panic-runtime/auxiliary/panic-runtime-abort.rs
diff --git a/src/test/ui/panic-runtime/auxiliary/panic-runtime-lang-items.rs b/tests/ui/panic-runtime/auxiliary/panic-runtime-lang-items.rs
index b9ef2f329..b9ef2f329 100644
--- a/src/test/ui/panic-runtime/auxiliary/panic-runtime-lang-items.rs
+++ b/tests/ui/panic-runtime/auxiliary/panic-runtime-lang-items.rs
diff --git a/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind.rs b/tests/ui/panic-runtime/auxiliary/panic-runtime-unwind.rs
index 2f7aed924..2f7aed924 100644
--- a/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind.rs
+++ b/tests/ui/panic-runtime/auxiliary/panic-runtime-unwind.rs
diff --git a/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind2.rs b/tests/ui/panic-runtime/auxiliary/panic-runtime-unwind2.rs
index 2f7aed924..2f7aed924 100644
--- a/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind2.rs
+++ b/tests/ui/panic-runtime/auxiliary/panic-runtime-unwind2.rs
diff --git a/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-abort.rs b/tests/ui/panic-runtime/auxiliary/wants-panic-runtime-abort.rs
index 3c0d2d658..3c0d2d658 100644
--- a/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-abort.rs
+++ b/tests/ui/panic-runtime/auxiliary/wants-panic-runtime-abort.rs
diff --git a/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-unwind.rs b/tests/ui/panic-runtime/auxiliary/wants-panic-runtime-unwind.rs
index d5f010219..d5f010219 100644
--- a/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-unwind.rs
+++ b/tests/ui/panic-runtime/auxiliary/wants-panic-runtime-unwind.rs
diff --git a/src/test/ui/panic-runtime/bad-panic-flag1.rs b/tests/ui/panic-runtime/bad-panic-flag1.rs
index 1ac6a3423..1ac6a3423 100644
--- a/src/test/ui/panic-runtime/bad-panic-flag1.rs
+++ b/tests/ui/panic-runtime/bad-panic-flag1.rs
diff --git a/src/test/ui/panic-runtime/bad-panic-flag1.stderr b/tests/ui/panic-runtime/bad-panic-flag1.stderr
index 013373c6f..013373c6f 100644
--- a/src/test/ui/panic-runtime/bad-panic-flag1.stderr
+++ b/tests/ui/panic-runtime/bad-panic-flag1.stderr
diff --git a/src/test/ui/panic-runtime/bad-panic-flag2.rs b/tests/ui/panic-runtime/bad-panic-flag2.rs
index c79701c83..c79701c83 100644
--- a/src/test/ui/panic-runtime/bad-panic-flag2.rs
+++ b/tests/ui/panic-runtime/bad-panic-flag2.rs
diff --git a/src/test/ui/panic-runtime/bad-panic-flag2.stderr b/tests/ui/panic-runtime/bad-panic-flag2.stderr
index 6ab94ea70..6ab94ea70 100644
--- a/src/test/ui/panic-runtime/bad-panic-flag2.stderr
+++ b/tests/ui/panic-runtime/bad-panic-flag2.stderr
diff --git a/src/test/ui/panic-runtime/incompatible-type.rs b/tests/ui/panic-runtime/incompatible-type.rs
index 026364a20..026364a20 100644
--- a/src/test/ui/panic-runtime/incompatible-type.rs
+++ b/tests/ui/panic-runtime/incompatible-type.rs
diff --git a/src/test/ui/panic-runtime/link-to-abort.rs b/tests/ui/panic-runtime/link-to-abort.rs
index 422206c57..422206c57 100644
--- a/src/test/ui/panic-runtime/link-to-abort.rs
+++ b/tests/ui/panic-runtime/link-to-abort.rs
diff --git a/src/test/ui/panic-runtime/link-to-unwind.rs b/tests/ui/panic-runtime/link-to-unwind.rs
index 59036ca99..59036ca99 100644
--- a/src/test/ui/panic-runtime/link-to-unwind.rs
+++ b/tests/ui/panic-runtime/link-to-unwind.rs
diff --git a/src/test/ui/panic-runtime/lto-abort.rs b/tests/ui/panic-runtime/lto-abort.rs
index 5cc4c0132..5cc4c0132 100644
--- a/src/test/ui/panic-runtime/lto-abort.rs
+++ b/tests/ui/panic-runtime/lto-abort.rs
diff --git a/src/test/ui/panic-runtime/lto-unwind.rs b/tests/ui/panic-runtime/lto-unwind.rs
index 24048ebe0..24048ebe0 100644
--- a/src/test/ui/panic-runtime/lto-unwind.rs
+++ b/tests/ui/panic-runtime/lto-unwind.rs
diff --git a/src/test/ui/panic-runtime/need-abort-got-unwind.rs b/tests/ui/panic-runtime/need-abort-got-unwind.rs
index e92400931..e92400931 100644
--- a/src/test/ui/panic-runtime/need-abort-got-unwind.rs
+++ b/tests/ui/panic-runtime/need-abort-got-unwind.rs
diff --git a/src/test/ui/panic-runtime/need-abort-got-unwind.stderr b/tests/ui/panic-runtime/need-abort-got-unwind.stderr
index d29c7875f..d29c7875f 100644
--- a/src/test/ui/panic-runtime/need-abort-got-unwind.stderr
+++ b/tests/ui/panic-runtime/need-abort-got-unwind.stderr
diff --git a/src/test/ui/panic-runtime/need-unwind-got-abort.rs b/tests/ui/panic-runtime/need-unwind-got-abort.rs
index 6752ecf90..6752ecf90 100644
--- a/src/test/ui/panic-runtime/need-unwind-got-abort.rs
+++ b/tests/ui/panic-runtime/need-unwind-got-abort.rs
diff --git a/src/test/ui/panic-runtime/need-unwind-got-abort.stderr b/tests/ui/panic-runtime/need-unwind-got-abort.stderr
index 4c71df3eb..4c71df3eb 100644
--- a/src/test/ui/panic-runtime/need-unwind-got-abort.stderr
+++ b/tests/ui/panic-runtime/need-unwind-got-abort.stderr
diff --git a/src/test/ui/panic-runtime/needs-gate.rs b/tests/ui/panic-runtime/needs-gate.rs
index 9e143adfe..9e143adfe 100644
--- a/src/test/ui/panic-runtime/needs-gate.rs
+++ b/tests/ui/panic-runtime/needs-gate.rs
diff --git a/src/test/ui/panic-runtime/needs-gate.stderr b/tests/ui/panic-runtime/needs-gate.stderr
index e067ccaeb..e067ccaeb 100644
--- a/src/test/ui/panic-runtime/needs-gate.stderr
+++ b/tests/ui/panic-runtime/needs-gate.stderr
diff --git a/src/test/ui/panic-runtime/runtime-depend-on-needs-runtime.rs b/tests/ui/panic-runtime/runtime-depend-on-needs-runtime.rs
index d57f1643e..d57f1643e 100644
--- a/src/test/ui/panic-runtime/runtime-depend-on-needs-runtime.rs
+++ b/tests/ui/panic-runtime/runtime-depend-on-needs-runtime.rs
diff --git a/src/test/ui/panic-runtime/transitive-link-a-bunch.rs b/tests/ui/panic-runtime/transitive-link-a-bunch.rs
index 0e74e300f..0e74e300f 100644
--- a/src/test/ui/panic-runtime/transitive-link-a-bunch.rs
+++ b/tests/ui/panic-runtime/transitive-link-a-bunch.rs
diff --git a/src/test/ui/panic-runtime/transitive-link-a-bunch.stderr b/tests/ui/panic-runtime/transitive-link-a-bunch.stderr
index 7f4a8ed29..7f4a8ed29 100644
--- a/src/test/ui/panic-runtime/transitive-link-a-bunch.stderr
+++ b/tests/ui/panic-runtime/transitive-link-a-bunch.stderr
diff --git a/src/test/ui/panic-runtime/two-panic-runtimes.rs b/tests/ui/panic-runtime/two-panic-runtimes.rs
index 7ec658ebc..7ec658ebc 100644
--- a/src/test/ui/panic-runtime/two-panic-runtimes.rs
+++ b/tests/ui/panic-runtime/two-panic-runtimes.rs
diff --git a/src/test/ui/panic-runtime/unwind-interleaved.rs b/tests/ui/panic-runtime/unwind-interleaved.rs
index a8b3f3493..a8b3f3493 100644
--- a/src/test/ui/panic-runtime/unwind-interleaved.rs
+++ b/tests/ui/panic-runtime/unwind-interleaved.rs
diff --git a/src/test/ui/panic-runtime/unwind-rec.rs b/tests/ui/panic-runtime/unwind-rec.rs
index a9b7ee8ec..a9b7ee8ec 100644
--- a/src/test/ui/panic-runtime/unwind-rec.rs
+++ b/tests/ui/panic-runtime/unwind-rec.rs
diff --git a/src/test/ui/panic-runtime/unwind-rec2.rs b/tests/ui/panic-runtime/unwind-rec2.rs
index a130f9e87..a130f9e87 100644
--- a/src/test/ui/panic-runtime/unwind-rec2.rs
+++ b/tests/ui/panic-runtime/unwind-rec2.rs
diff --git a/src/test/ui/panic-runtime/unwind-tables-target-required.rs b/tests/ui/panic-runtime/unwind-tables-target-required.rs
index 3abb52b67..3abb52b67 100644
--- a/src/test/ui/panic-runtime/unwind-tables-target-required.rs
+++ b/tests/ui/panic-runtime/unwind-tables-target-required.rs
diff --git a/src/test/ui/panic-runtime/unwind-unique.rs b/tests/ui/panic-runtime/unwind-unique.rs
index d66e39110..d66e39110 100644
--- a/src/test/ui/panic-runtime/unwind-unique.rs
+++ b/tests/ui/panic-runtime/unwind-unique.rs
diff --git a/src/test/ui/panic-runtime/want-abort-got-unwind.rs b/tests/ui/panic-runtime/want-abort-got-unwind.rs
index e33c3bcc3..e33c3bcc3 100644
--- a/src/test/ui/panic-runtime/want-abort-got-unwind.rs
+++ b/tests/ui/panic-runtime/want-abort-got-unwind.rs
diff --git a/src/test/ui/panic-runtime/want-abort-got-unwind2.rs b/tests/ui/panic-runtime/want-abort-got-unwind2.rs
index 438f1d85a..438f1d85a 100644
--- a/src/test/ui/panic-runtime/want-abort-got-unwind2.rs
+++ b/tests/ui/panic-runtime/want-abort-got-unwind2.rs
diff --git a/src/test/ui/panic-runtime/want-unwind-got-abort.rs b/tests/ui/panic-runtime/want-unwind-got-abort.rs
index b6174dc4e..b6174dc4e 100644
--- a/src/test/ui/panic-runtime/want-unwind-got-abort.rs
+++ b/tests/ui/panic-runtime/want-unwind-got-abort.rs
diff --git a/src/test/ui/panic-runtime/want-unwind-got-abort.stderr b/tests/ui/panic-runtime/want-unwind-got-abort.stderr
index d306ce6c5..d306ce6c5 100644
--- a/src/test/ui/panic-runtime/want-unwind-got-abort.stderr
+++ b/tests/ui/panic-runtime/want-unwind-got-abort.stderr
diff --git a/src/test/ui/panic-runtime/want-unwind-got-abort2.rs b/tests/ui/panic-runtime/want-unwind-got-abort2.rs
index b54babbef..b54babbef 100644
--- a/src/test/ui/panic-runtime/want-unwind-got-abort2.rs
+++ b/tests/ui/panic-runtime/want-unwind-got-abort2.rs
diff --git a/src/test/ui/panic-runtime/want-unwind-got-abort2.stderr b/tests/ui/panic-runtime/want-unwind-got-abort2.stderr
index 014437b7f..014437b7f 100644
--- a/src/test/ui/panic-runtime/want-unwind-got-abort2.stderr
+++ b/tests/ui/panic-runtime/want-unwind-got-abort2.stderr
diff --git a/src/test/ui/panic-while-printing.rs b/tests/ui/panic-while-printing.rs
index 3abedf2a7..3abedf2a7 100644
--- a/src/test/ui/panic-while-printing.rs
+++ b/tests/ui/panic-while-printing.rs
diff --git a/src/test/ui/panic_implementation-closures.rs b/tests/ui/panic_implementation-closures.rs
index b96125aa9..b96125aa9 100644
--- a/src/test/ui/panic_implementation-closures.rs
+++ b/tests/ui/panic_implementation-closures.rs
diff --git a/src/test/ui/panics/abort-on-panic.rs b/tests/ui/panics/abort-on-panic.rs
index 1f6ad64c0..1f6ad64c0 100644
--- a/src/test/ui/panics/abort-on-panic.rs
+++ b/tests/ui/panics/abort-on-panic.rs
diff --git a/src/test/ui/panics/args-panic.rs b/tests/ui/panics/args-panic.rs
index 7636025c2..7636025c2 100644
--- a/src/test/ui/panics/args-panic.rs
+++ b/tests/ui/panics/args-panic.rs
diff --git a/src/test/ui/panics/default-backtrace-ice.rs b/tests/ui/panics/default-backtrace-ice.rs
index fd86a3f9d..fd86a3f9d 100644
--- a/src/test/ui/panics/default-backtrace-ice.rs
+++ b/tests/ui/panics/default-backtrace-ice.rs
diff --git a/src/test/ui/panics/default-backtrace-ice.stderr b/tests/ui/panics/default-backtrace-ice.stderr
index a0025d7e2..a0025d7e2 100644
--- a/src/test/ui/panics/default-backtrace-ice.stderr
+++ b/tests/ui/panics/default-backtrace-ice.stderr
diff --git a/src/test/ui/panics/doublepanic.rs b/tests/ui/panics/doublepanic.rs
index c1fcc875c..c1fcc875c 100644
--- a/src/test/ui/panics/doublepanic.rs
+++ b/tests/ui/panics/doublepanic.rs
diff --git a/src/test/ui/panics/explicit-panic-msg.rs b/tests/ui/panics/explicit-panic-msg.rs
index 9d8035787..9d8035787 100644
--- a/src/test/ui/panics/explicit-panic-msg.rs
+++ b/tests/ui/panics/explicit-panic-msg.rs
diff --git a/src/test/ui/panics/explicit-panic.rs b/tests/ui/panics/explicit-panic.rs
index 27c73d349..27c73d349 100644
--- a/src/test/ui/panics/explicit-panic.rs
+++ b/tests/ui/panics/explicit-panic.rs
diff --git a/src/test/ui/panics/fmt-panic.rs b/tests/ui/panics/fmt-panic.rs
index 87fb2e6dd..87fb2e6dd 100644
--- a/src/test/ui/panics/fmt-panic.rs
+++ b/tests/ui/panics/fmt-panic.rs
diff --git a/src/test/ui/panics/issue-47429-short-backtraces.legacy.run.stderr b/tests/ui/panics/issue-47429-short-backtraces.legacy.run.stderr
index ac4ed8225..ac4ed8225 100644
--- a/src/test/ui/panics/issue-47429-short-backtraces.legacy.run.stderr
+++ b/tests/ui/panics/issue-47429-short-backtraces.legacy.run.stderr
diff --git a/src/test/ui/panics/issue-47429-short-backtraces.rs b/tests/ui/panics/issue-47429-short-backtraces.rs
index 58d0fa62c..58d0fa62c 100644
--- a/src/test/ui/panics/issue-47429-short-backtraces.rs
+++ b/tests/ui/panics/issue-47429-short-backtraces.rs
diff --git a/src/test/ui/panics/issue-47429-short-backtraces.v0.run.stderr b/tests/ui/panics/issue-47429-short-backtraces.v0.run.stderr
index 65401fe1c..65401fe1c 100644
--- a/src/test/ui/panics/issue-47429-short-backtraces.v0.run.stderr
+++ b/tests/ui/panics/issue-47429-short-backtraces.v0.run.stderr
diff --git a/src/test/ui/panics/location-detail-panic-no-column.rs b/tests/ui/panics/location-detail-panic-no-column.rs
index 7cf1bb09c..7cf1bb09c 100644
--- a/src/test/ui/panics/location-detail-panic-no-column.rs
+++ b/tests/ui/panics/location-detail-panic-no-column.rs
diff --git a/src/test/ui/panics/location-detail-panic-no-column.run.stderr b/tests/ui/panics/location-detail-panic-no-column.run.stderr
index 46c9b8448..46c9b8448 100644
--- a/src/test/ui/panics/location-detail-panic-no-column.run.stderr
+++ b/tests/ui/panics/location-detail-panic-no-column.run.stderr
diff --git a/src/test/ui/panics/location-detail-panic-no-file.rs b/tests/ui/panics/location-detail-panic-no-file.rs
index 9bcbf01d1..9bcbf01d1 100644
--- a/src/test/ui/panics/location-detail-panic-no-file.rs
+++ b/tests/ui/panics/location-detail-panic-no-file.rs
diff --git a/src/test/ui/panics/location-detail-panic-no-file.run.stderr b/tests/ui/panics/location-detail-panic-no-file.run.stderr
index 811f93bf3..811f93bf3 100644
--- a/src/test/ui/panics/location-detail-panic-no-file.run.stderr
+++ b/tests/ui/panics/location-detail-panic-no-file.run.stderr
diff --git a/src/test/ui/panics/location-detail-panic-no-line.rs b/tests/ui/panics/location-detail-panic-no-line.rs
index 25df092e1..25df092e1 100644
--- a/src/test/ui/panics/location-detail-panic-no-line.rs
+++ b/tests/ui/panics/location-detail-panic-no-line.rs
diff --git a/src/test/ui/panics/location-detail-panic-no-line.run.stderr b/tests/ui/panics/location-detail-panic-no-line.run.stderr
index cc3f1624c..cc3f1624c 100644
--- a/src/test/ui/panics/location-detail-panic-no-line.run.stderr
+++ b/tests/ui/panics/location-detail-panic-no-line.run.stderr
diff --git a/src/test/ui/panics/location-detail-panic-no-location-info.rs b/tests/ui/panics/location-detail-panic-no-location-info.rs
index 7b609145b..7b609145b 100644
--- a/src/test/ui/panics/location-detail-panic-no-location-info.rs
+++ b/tests/ui/panics/location-detail-panic-no-location-info.rs
diff --git a/src/test/ui/panics/location-detail-panic-no-location-info.run.stderr b/tests/ui/panics/location-detail-panic-no-location-info.run.stderr
index d1c310864..d1c310864 100644
--- a/src/test/ui/panics/location-detail-panic-no-location-info.run.stderr
+++ b/tests/ui/panics/location-detail-panic-no-location-info.run.stderr
diff --git a/src/test/ui/panics/location-detail-unwrap-no-file.rs b/tests/ui/panics/location-detail-unwrap-no-file.rs
index 5955d9a25..5955d9a25 100644
--- a/src/test/ui/panics/location-detail-unwrap-no-file.rs
+++ b/tests/ui/panics/location-detail-unwrap-no-file.rs
diff --git a/src/test/ui/panics/location-detail-unwrap-no-file.run.stderr b/tests/ui/panics/location-detail-unwrap-no-file.run.stderr
index 7d8e1d930..7d8e1d930 100644
--- a/src/test/ui/panics/location-detail-unwrap-no-file.run.stderr
+++ b/tests/ui/panics/location-detail-unwrap-no-file.run.stderr
diff --git a/src/test/ui/panics/main-panic.rs b/tests/ui/panics/main-panic.rs
index 023ab4701..023ab4701 100644
--- a/src/test/ui/panics/main-panic.rs
+++ b/tests/ui/panics/main-panic.rs
diff --git a/src/test/ui/panics/panic-2021.rs b/tests/ui/panics/panic-2021.rs
index e606612e1..e606612e1 100644
--- a/src/test/ui/panics/panic-2021.rs
+++ b/tests/ui/panics/panic-2021.rs
diff --git a/src/test/ui/panics/panic-2021.stderr b/tests/ui/panics/panic-2021.stderr
index 373c1c2c0..373c1c2c0 100644
--- a/src/test/ui/panics/panic-2021.stderr
+++ b/tests/ui/panics/panic-2021.stderr
diff --git a/src/test/ui/panics/panic-arg.rs b/tests/ui/panics/panic-arg.rs
index f7c2dbb09..f7c2dbb09 100644
--- a/src/test/ui/panics/panic-arg.rs
+++ b/tests/ui/panics/panic-arg.rs
diff --git a/src/test/ui/panics/panic-handler-chain-update-hook.rs b/tests/ui/panics/panic-handler-chain-update-hook.rs
index 4dd08ba4a..4dd08ba4a 100644
--- a/src/test/ui/panics/panic-handler-chain-update-hook.rs
+++ b/tests/ui/panics/panic-handler-chain-update-hook.rs
diff --git a/src/test/ui/panics/panic-handler-chain.rs b/tests/ui/panics/panic-handler-chain.rs
index 73d6e790d..73d6e790d 100644
--- a/src/test/ui/panics/panic-handler-chain.rs
+++ b/tests/ui/panics/panic-handler-chain.rs
diff --git a/src/test/ui/panics/panic-handler-flail-wildly.rs b/tests/ui/panics/panic-handler-flail-wildly.rs
index 679dc7de8..679dc7de8 100644
--- a/src/test/ui/panics/panic-handler-flail-wildly.rs
+++ b/tests/ui/panics/panic-handler-flail-wildly.rs
diff --git a/src/test/ui/panics/panic-handler-set-twice.rs b/tests/ui/panics/panic-handler-set-twice.rs
index 274453020..274453020 100644
--- a/src/test/ui/panics/panic-handler-set-twice.rs
+++ b/tests/ui/panics/panic-handler-set-twice.rs
diff --git a/src/test/ui/panics/panic-in-dtor-drops-fields.rs b/tests/ui/panics/panic-in-dtor-drops-fields.rs
index c0963aa31..c0963aa31 100644
--- a/src/test/ui/panics/panic-in-dtor-drops-fields.rs
+++ b/tests/ui/panics/panic-in-dtor-drops-fields.rs
diff --git a/src/test/ui/panics/panic-macro-any-wrapped.rs b/tests/ui/panics/panic-macro-any-wrapped.rs
index 663bf6713..663bf6713 100644
--- a/src/test/ui/panics/panic-macro-any-wrapped.rs
+++ b/tests/ui/panics/panic-macro-any-wrapped.rs
diff --git a/src/test/ui/panics/panic-macro-any.rs b/tests/ui/panics/panic-macro-any.rs
index c7df53654..c7df53654 100644
--- a/src/test/ui/panics/panic-macro-any.rs
+++ b/tests/ui/panics/panic-macro-any.rs
diff --git a/src/test/ui/panics/panic-macro-explicit.rs b/tests/ui/panics/panic-macro-explicit.rs
index ac4d6f812..ac4d6f812 100644
--- a/src/test/ui/panics/panic-macro-explicit.rs
+++ b/tests/ui/panics/panic-macro-explicit.rs
diff --git a/src/test/ui/panics/panic-macro-fmt.rs b/tests/ui/panics/panic-macro-fmt.rs
index a755ebc0f..a755ebc0f 100644
--- a/src/test/ui/panics/panic-macro-fmt.rs
+++ b/tests/ui/panics/panic-macro-fmt.rs
diff --git a/src/test/ui/panics/panic-macro-owned.rs b/tests/ui/panics/panic-macro-owned.rs
index b898fde77..b898fde77 100644
--- a/src/test/ui/panics/panic-macro-owned.rs
+++ b/tests/ui/panics/panic-macro-owned.rs
diff --git a/src/test/ui/panics/panic-macro-static.rs b/tests/ui/panics/panic-macro-static.rs
index a1d467cbf..a1d467cbf 100644
--- a/src/test/ui/panics/panic-macro-static.rs
+++ b/tests/ui/panics/panic-macro-static.rs
diff --git a/src/test/ui/panics/panic-main.rs b/tests/ui/panics/panic-main.rs
index 87df7688f..87df7688f 100644
--- a/src/test/ui/panics/panic-main.rs
+++ b/tests/ui/panics/panic-main.rs
diff --git a/src/test/ui/panics/panic-parens.rs b/tests/ui/panics/panic-parens.rs
index 59ab54446..59ab54446 100644
--- a/src/test/ui/panics/panic-parens.rs
+++ b/tests/ui/panics/panic-parens.rs
diff --git a/src/test/ui/panics/panic-recover-propagate.rs b/tests/ui/panics/panic-recover-propagate.rs
index e110d94b6..e110d94b6 100644
--- a/src/test/ui/panics/panic-recover-propagate.rs
+++ b/tests/ui/panics/panic-recover-propagate.rs
diff --git a/src/test/ui/panics/panic-set-handler.rs b/tests/ui/panics/panic-set-handler.rs
index 3c00183e2..3c00183e2 100644
--- a/src/test/ui/panics/panic-set-handler.rs
+++ b/tests/ui/panics/panic-set-handler.rs
diff --git a/src/test/ui/panics/panic-set-unset-handler.rs b/tests/ui/panics/panic-set-unset-handler.rs
index dde0c72f7..dde0c72f7 100644
--- a/src/test/ui/panics/panic-set-unset-handler.rs
+++ b/tests/ui/panics/panic-set-unset-handler.rs
diff --git a/src/test/ui/panics/panic-short-backtrace-windows-x86_64.rs b/tests/ui/panics/panic-short-backtrace-windows-x86_64.rs
index 39ffe86dd..39ffe86dd 100644
--- a/src/test/ui/panics/panic-short-backtrace-windows-x86_64.rs
+++ b/tests/ui/panics/panic-short-backtrace-windows-x86_64.rs
diff --git a/src/test/ui/panics/panic-short-backtrace-windows-x86_64.run.stderr b/tests/ui/panics/panic-short-backtrace-windows-x86_64.run.stderr
index 799a8b30e..799a8b30e 100644
--- a/src/test/ui/panics/panic-short-backtrace-windows-x86_64.run.stderr
+++ b/tests/ui/panics/panic-short-backtrace-windows-x86_64.run.stderr
diff --git a/src/test/ui/panics/panic-take-handler-nop.rs b/tests/ui/panics/panic-take-handler-nop.rs
index 41cbac97c..41cbac97c 100644
--- a/src/test/ui/panics/panic-take-handler-nop.rs
+++ b/tests/ui/panics/panic-take-handler-nop.rs
diff --git a/src/test/ui/panics/panic-task-name-none.rs b/tests/ui/panics/panic-task-name-none.rs
index 4e95fb5bd..4e95fb5bd 100644
--- a/src/test/ui/panics/panic-task-name-none.rs
+++ b/tests/ui/panics/panic-task-name-none.rs
diff --git a/src/test/ui/panics/panic-task-name-owned.rs b/tests/ui/panics/panic-task-name-owned.rs
index f85be7bb8..f85be7bb8 100644
--- a/src/test/ui/panics/panic-task-name-owned.rs
+++ b/tests/ui/panics/panic-task-name-owned.rs
diff --git a/src/test/ui/panics/panic.rs b/tests/ui/panics/panic.rs
index b6227a582..b6227a582 100644
--- a/src/test/ui/panics/panic.rs
+++ b/tests/ui/panics/panic.rs
diff --git a/src/test/ui/panics/result-get-panic.rs b/tests/ui/panics/result-get-panic.rs
index 461f30b91..461f30b91 100644
--- a/src/test/ui/panics/result-get-panic.rs
+++ b/tests/ui/panics/result-get-panic.rs
diff --git a/src/test/ui/panics/runtime-switch.legacy.run.stderr b/tests/ui/panics/runtime-switch.legacy.run.stderr
index 0f7655163..0f7655163 100644
--- a/src/test/ui/panics/runtime-switch.legacy.run.stderr
+++ b/tests/ui/panics/runtime-switch.legacy.run.stderr
diff --git a/src/test/ui/panics/runtime-switch.rs b/tests/ui/panics/runtime-switch.rs
index 882340e49..882340e49 100644
--- a/src/test/ui/panics/runtime-switch.rs
+++ b/tests/ui/panics/runtime-switch.rs
diff --git a/src/test/ui/panics/runtime-switch.v0.run.stderr b/tests/ui/panics/runtime-switch.v0.run.stderr
index a4ae44131..a4ae44131 100644
--- a/src/test/ui/panics/runtime-switch.v0.run.stderr
+++ b/tests/ui/panics/runtime-switch.v0.run.stderr
diff --git a/src/test/ui/panics/test-panic.rs b/tests/ui/panics/test-panic.rs
index 85c9279cd..85c9279cd 100644
--- a/src/test/ui/panics/test-panic.rs
+++ b/tests/ui/panics/test-panic.rs
diff --git a/src/test/ui/panics/test-should-fail-bad-message.rs b/tests/ui/panics/test-should-fail-bad-message.rs
index 701f26776..701f26776 100644
--- a/src/test/ui/panics/test-should-fail-bad-message.rs
+++ b/tests/ui/panics/test-should-fail-bad-message.rs
diff --git a/src/test/ui/panics/test-should-panic-bad-message.rs b/tests/ui/panics/test-should-panic-bad-message.rs
index a82c4e144..a82c4e144 100644
--- a/src/test/ui/panics/test-should-panic-bad-message.rs
+++ b/tests/ui/panics/test-should-panic-bad-message.rs
diff --git a/src/test/ui/panics/test-should-panic-no-message.rs b/tests/ui/panics/test-should-panic-no-message.rs
index 13f67a41c..13f67a41c 100644
--- a/src/test/ui/panics/test-should-panic-no-message.rs
+++ b/tests/ui/panics/test-should-panic-no-message.rs
diff --git a/src/test/ui/panics/unique-panic.rs b/tests/ui/panics/unique-panic.rs
index ae7911e59..ae7911e59 100644
--- a/src/test/ui/panics/unique-panic.rs
+++ b/tests/ui/panics/unique-panic.rs
diff --git a/src/test/ui/panics/while-body-panics.rs b/tests/ui/panics/while-body-panics.rs
index 2c05eb389..2c05eb389 100644
--- a/src/test/ui/panics/while-body-panics.rs
+++ b/tests/ui/panics/while-body-panics.rs
diff --git a/src/test/ui/panics/while-panic.rs b/tests/ui/panics/while-panic.rs
index 3c6ee8fa3..3c6ee8fa3 100644
--- a/src/test/ui/panics/while-panic.rs
+++ b/tests/ui/panics/while-panic.rs
diff --git a/src/test/ui/paren-span.rs b/tests/ui/paren-span.rs
index c8cb63d51..c8cb63d51 100644
--- a/src/test/ui/paren-span.rs
+++ b/tests/ui/paren-span.rs
diff --git a/src/test/ui/paren-span.stderr b/tests/ui/paren-span.stderr
index fc3137157..fc3137157 100644
--- a/src/test/ui/paren-span.stderr
+++ b/tests/ui/paren-span.stderr
diff --git a/src/test/ui/parser/ascii-only-character-escape.rs b/tests/ui/parser/ascii-only-character-escape.rs
index 725c8ad23..725c8ad23 100644
--- a/src/test/ui/parser/ascii-only-character-escape.rs
+++ b/tests/ui/parser/ascii-only-character-escape.rs
diff --git a/src/test/ui/parser/ascii-only-character-escape.stderr b/tests/ui/parser/ascii-only-character-escape.stderr
index b599b35f4..b599b35f4 100644
--- a/src/test/ui/parser/ascii-only-character-escape.stderr
+++ b/tests/ui/parser/ascii-only-character-escape.stderr
diff --git a/src/test/ui/parser/assoc-const-underscore-semantic-fail.rs b/tests/ui/parser/assoc-const-underscore-semantic-fail.rs
index d37ce06c5..d37ce06c5 100644
--- a/src/test/ui/parser/assoc-const-underscore-semantic-fail.rs
+++ b/tests/ui/parser/assoc-const-underscore-semantic-fail.rs
diff --git a/src/test/ui/parser/assoc-const-underscore-semantic-fail.stderr b/tests/ui/parser/assoc-const-underscore-semantic-fail.stderr
index 538bf0ec1..538bf0ec1 100644
--- a/src/test/ui/parser/assoc-const-underscore-semantic-fail.stderr
+++ b/tests/ui/parser/assoc-const-underscore-semantic-fail.stderr
diff --git a/src/test/ui/parser/assoc-const-underscore-syntactic-pass.rs b/tests/ui/parser/assoc-const-underscore-syntactic-pass.rs
index 60da408c8..60da408c8 100644
--- a/src/test/ui/parser/assoc-const-underscore-syntactic-pass.rs
+++ b/tests/ui/parser/assoc-const-underscore-syntactic-pass.rs
diff --git a/src/test/ui/parser/assoc-oddities-1.rs b/tests/ui/parser/assoc-oddities-1.rs
index 5914805e5..5914805e5 100644
--- a/src/test/ui/parser/assoc-oddities-1.rs
+++ b/tests/ui/parser/assoc-oddities-1.rs
diff --git a/src/test/ui/parser/assoc-oddities-1.stderr b/tests/ui/parser/assoc-oddities-1.stderr
index acf71b489..acf71b489 100644
--- a/src/test/ui/parser/assoc-oddities-1.stderr
+++ b/tests/ui/parser/assoc-oddities-1.stderr
diff --git a/src/test/ui/parser/assoc-oddities-2.rs b/tests/ui/parser/assoc-oddities-2.rs
index 3d35aad74..3d35aad74 100644
--- a/src/test/ui/parser/assoc-oddities-2.rs
+++ b/tests/ui/parser/assoc-oddities-2.rs
diff --git a/src/test/ui/parser/assoc-oddities-2.stderr b/tests/ui/parser/assoc-oddities-2.stderr
index d3b90c34c..d3b90c34c 100644
--- a/src/test/ui/parser/assoc-oddities-2.stderr
+++ b/tests/ui/parser/assoc-oddities-2.stderr
diff --git a/src/test/ui/parser/assoc-static-semantic-fail.rs b/tests/ui/parser/assoc-static-semantic-fail.rs
index a8759d209..a8759d209 100644
--- a/src/test/ui/parser/assoc-static-semantic-fail.rs
+++ b/tests/ui/parser/assoc-static-semantic-fail.rs
diff --git a/src/test/ui/parser/assoc-static-semantic-fail.stderr b/tests/ui/parser/assoc-static-semantic-fail.stderr
index 8a74f49b9..8a74f49b9 100644
--- a/src/test/ui/parser/assoc-static-semantic-fail.stderr
+++ b/tests/ui/parser/assoc-static-semantic-fail.stderr
diff --git a/src/test/ui/parser/assoc-static-syntactic-fail.rs b/tests/ui/parser/assoc-static-syntactic-fail.rs
index 492f2ea16..492f2ea16 100644
--- a/src/test/ui/parser/assoc-static-syntactic-fail.rs
+++ b/tests/ui/parser/assoc-static-syntactic-fail.rs
diff --git a/src/test/ui/parser/assoc-static-syntactic-fail.stderr b/tests/ui/parser/assoc-static-syntactic-fail.stderr
index e97236145..e97236145 100644
--- a/src/test/ui/parser/assoc-static-syntactic-fail.stderr
+++ b/tests/ui/parser/assoc-static-syntactic-fail.stderr
diff --git a/src/test/ui/parser/assoc-type-in-type-arg.rs b/tests/ui/parser/assoc-type-in-type-arg.rs
index 000956ea2..000956ea2 100644
--- a/src/test/ui/parser/assoc-type-in-type-arg.rs
+++ b/tests/ui/parser/assoc-type-in-type-arg.rs
diff --git a/src/test/ui/parser/assoc-type-in-type-arg.stderr b/tests/ui/parser/assoc-type-in-type-arg.stderr
index b637702f2..b637702f2 100644
--- a/src/test/ui/parser/assoc-type-in-type-arg.stderr
+++ b/tests/ui/parser/assoc-type-in-type-arg.stderr
diff --git a/src/test/ui/parser/associated-types-project-from-hrtb-explicit.rs b/tests/ui/parser/associated-types-project-from-hrtb-explicit.rs
index b238a9ca2..b238a9ca2 100644
--- a/src/test/ui/parser/associated-types-project-from-hrtb-explicit.rs
+++ b/tests/ui/parser/associated-types-project-from-hrtb-explicit.rs
diff --git a/src/test/ui/parser/associated-types-project-from-hrtb-explicit.stderr b/tests/ui/parser/associated-types-project-from-hrtb-explicit.stderr
index aa0fa0e3c..aa0fa0e3c 100644
--- a/src/test/ui/parser/associated-types-project-from-hrtb-explicit.stderr
+++ b/tests/ui/parser/associated-types-project-from-hrtb-explicit.stderr
diff --git a/src/test/ui/parser/attr-bad-meta-2.rs b/tests/ui/parser/attr-bad-meta-2.rs
index db612ed88..db612ed88 100644
--- a/src/test/ui/parser/attr-bad-meta-2.rs
+++ b/tests/ui/parser/attr-bad-meta-2.rs
diff --git a/src/test/ui/parser/attr-bad-meta-2.stderr b/tests/ui/parser/attr-bad-meta-2.stderr
index 6fc6fb665..6fc6fb665 100644
--- a/src/test/ui/parser/attr-bad-meta-2.stderr
+++ b/tests/ui/parser/attr-bad-meta-2.stderr
diff --git a/src/test/ui/parser/attr-bad-meta-3.rs b/tests/ui/parser/attr-bad-meta-3.rs
index b51e9f221..b51e9f221 100644
--- a/src/test/ui/parser/attr-bad-meta-3.rs
+++ b/tests/ui/parser/attr-bad-meta-3.rs
diff --git a/src/test/ui/parser/attr-bad-meta-3.stderr b/tests/ui/parser/attr-bad-meta-3.stderr
index 4fa420c79..4fa420c79 100644
--- a/src/test/ui/parser/attr-bad-meta-3.stderr
+++ b/tests/ui/parser/attr-bad-meta-3.stderr
diff --git a/src/test/ui/parser/attr-bad-meta.rs b/tests/ui/parser/attr-bad-meta.rs
index 8001977f5..8001977f5 100644
--- a/src/test/ui/parser/attr-bad-meta.rs
+++ b/tests/ui/parser/attr-bad-meta.rs
diff --git a/src/test/ui/parser/attr-bad-meta.stderr b/tests/ui/parser/attr-bad-meta.stderr
index 8d65c423c..8d65c423c 100644
--- a/src/test/ui/parser/attr-bad-meta.stderr
+++ b/tests/ui/parser/attr-bad-meta.stderr
diff --git a/src/test/ui/parser/attr-before-eof.rs b/tests/ui/parser/attr-before-eof.rs
index 6af1783e6..6af1783e6 100644
--- a/src/test/ui/parser/attr-before-eof.rs
+++ b/tests/ui/parser/attr-before-eof.rs
diff --git a/src/test/ui/parser/attr-before-eof.stderr b/tests/ui/parser/attr-before-eof.stderr
index a2acb9437..a2acb9437 100644
--- a/src/test/ui/parser/attr-before-eof.stderr
+++ b/tests/ui/parser/attr-before-eof.stderr
diff --git a/src/test/ui/parser/attr-dangling-in-fn.rs b/tests/ui/parser/attr-dangling-in-fn.rs
index c7c45bafb..c7c45bafb 100644
--- a/src/test/ui/parser/attr-dangling-in-fn.rs
+++ b/tests/ui/parser/attr-dangling-in-fn.rs
diff --git a/src/test/ui/parser/attr-dangling-in-fn.stderr b/tests/ui/parser/attr-dangling-in-fn.stderr
index b1bb3ab3b..b1bb3ab3b 100644
--- a/src/test/ui/parser/attr-dangling-in-fn.stderr
+++ b/tests/ui/parser/attr-dangling-in-fn.stderr
diff --git a/src/test/ui/parser/attr-dangling-in-mod.rs b/tests/ui/parser/attr-dangling-in-mod.rs
index 261ed3913..261ed3913 100644
--- a/src/test/ui/parser/attr-dangling-in-mod.rs
+++ b/tests/ui/parser/attr-dangling-in-mod.rs
diff --git a/src/test/ui/parser/attr-dangling-in-mod.stderr b/tests/ui/parser/attr-dangling-in-mod.stderr
index 1c892eac0..1c892eac0 100644
--- a/src/test/ui/parser/attr-dangling-in-mod.stderr
+++ b/tests/ui/parser/attr-dangling-in-mod.stderr
diff --git a/src/test/ui/parser/attr-stmt-expr-attr-bad.rs b/tests/ui/parser/attr-stmt-expr-attr-bad.rs
index 469c3855c..469c3855c 100644
--- a/src/test/ui/parser/attr-stmt-expr-attr-bad.rs
+++ b/tests/ui/parser/attr-stmt-expr-attr-bad.rs
diff --git a/src/test/ui/parser/attr-stmt-expr-attr-bad.stderr b/tests/ui/parser/attr-stmt-expr-attr-bad.stderr
index 872c560cb..872c560cb 100644
--- a/src/test/ui/parser/attr-stmt-expr-attr-bad.stderr
+++ b/tests/ui/parser/attr-stmt-expr-attr-bad.stderr
diff --git a/src/test/ui/parser/attr-with-a-semicolon.rs b/tests/ui/parser/attr-with-a-semicolon.rs
index 56fe40b91..56fe40b91 100644
--- a/src/test/ui/parser/attr-with-a-semicolon.rs
+++ b/tests/ui/parser/attr-with-a-semicolon.rs
diff --git a/src/test/ui/parser/attr-with-a-semicolon.stderr b/tests/ui/parser/attr-with-a-semicolon.stderr
index 0de3490b8..0de3490b8 100644
--- a/src/test/ui/parser/attr-with-a-semicolon.stderr
+++ b/tests/ui/parser/attr-with-a-semicolon.stderr
diff --git a/src/test/ui/parser/attr.rs b/tests/ui/parser/attr.rs
index 42b2dfde8..42b2dfde8 100644
--- a/src/test/ui/parser/attr.rs
+++ b/tests/ui/parser/attr.rs
diff --git a/src/test/ui/parser/attr.stderr b/tests/ui/parser/attr.stderr
index 7cd0ac224..7cd0ac224 100644
--- a/src/test/ui/parser/attr.stderr
+++ b/tests/ui/parser/attr.stderr
diff --git a/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.rs b/tests/ui/parser/attribute-with-no-generics-in-parameter-list.rs
index c2cc91d8f..c2cc91d8f 100644
--- a/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.rs
+++ b/tests/ui/parser/attribute-with-no-generics-in-parameter-list.rs
diff --git a/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.stderr b/tests/ui/parser/attribute-with-no-generics-in-parameter-list.stderr
index 4c5964715..4c5964715 100644
--- a/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.stderr
+++ b/tests/ui/parser/attribute-with-no-generics-in-parameter-list.stderr
diff --git a/src/test/ui/parser/attrs-after-extern-mod.rs b/tests/ui/parser/attrs-after-extern-mod.rs
index e3f0fa0fc..e3f0fa0fc 100644
--- a/src/test/ui/parser/attrs-after-extern-mod.rs
+++ b/tests/ui/parser/attrs-after-extern-mod.rs
diff --git a/src/test/ui/parser/attrs-after-extern-mod.stderr b/tests/ui/parser/attrs-after-extern-mod.stderr
index 135d98457..135d98457 100644
--- a/src/test/ui/parser/attrs-after-extern-mod.stderr
+++ b/tests/ui/parser/attrs-after-extern-mod.stderr
diff --git a/src/test/ui/parser/bad-char-literals.rs b/tests/ui/parser/bad-char-literals.rs
index 748b4a222..748b4a222 100644
--- a/src/test/ui/parser/bad-char-literals.rs
+++ b/tests/ui/parser/bad-char-literals.rs
diff --git a/src/test/ui/parser/bad-char-literals.stderr b/tests/ui/parser/bad-char-literals.stderr
index a22ddbac1..a22ddbac1 100644
--- a/src/test/ui/parser/bad-char-literals.stderr
+++ b/tests/ui/parser/bad-char-literals.stderr
diff --git a/src/test/ui/parser/bad-crate-name.rs b/tests/ui/parser/bad-crate-name.rs
index 837d5c354..837d5c354 100644
--- a/src/test/ui/parser/bad-crate-name.rs
+++ b/tests/ui/parser/bad-crate-name.rs
diff --git a/src/test/ui/parser/bad-crate-name.stderr b/tests/ui/parser/bad-crate-name.stderr
index c98a620f1..c98a620f1 100644
--- a/src/test/ui/parser/bad-crate-name.stderr
+++ b/tests/ui/parser/bad-crate-name.stderr
diff --git a/src/test/ui/parser/bad-escape-suggest-raw-string.rs b/tests/ui/parser/bad-escape-suggest-raw-string.rs
index 978b92cbc..978b92cbc 100644
--- a/src/test/ui/parser/bad-escape-suggest-raw-string.rs
+++ b/tests/ui/parser/bad-escape-suggest-raw-string.rs
diff --git a/src/test/ui/parser/bad-escape-suggest-raw-string.stderr b/tests/ui/parser/bad-escape-suggest-raw-string.stderr
index fc34bd328..fc34bd328 100644
--- a/src/test/ui/parser/bad-escape-suggest-raw-string.stderr
+++ b/tests/ui/parser/bad-escape-suggest-raw-string.stderr
diff --git a/src/test/ui/parser/bad-fn-ptr-qualifier.fixed b/tests/ui/parser/bad-fn-ptr-qualifier.fixed
index ad8e718cf..ad8e718cf 100644
--- a/src/test/ui/parser/bad-fn-ptr-qualifier.fixed
+++ b/tests/ui/parser/bad-fn-ptr-qualifier.fixed
diff --git a/src/test/ui/parser/bad-fn-ptr-qualifier.rs b/tests/ui/parser/bad-fn-ptr-qualifier.rs
index c04813dad..c04813dad 100644
--- a/src/test/ui/parser/bad-fn-ptr-qualifier.rs
+++ b/tests/ui/parser/bad-fn-ptr-qualifier.rs
diff --git a/src/test/ui/parser/bad-fn-ptr-qualifier.stderr b/tests/ui/parser/bad-fn-ptr-qualifier.stderr
index 265e31329..265e31329 100644
--- a/src/test/ui/parser/bad-fn-ptr-qualifier.stderr
+++ b/tests/ui/parser/bad-fn-ptr-qualifier.stderr
diff --git a/src/test/ui/parser/bad-if-statements.rs b/tests/ui/parser/bad-if-statements.rs
index 2c501e3a5..2c501e3a5 100644
--- a/src/test/ui/parser/bad-if-statements.rs
+++ b/tests/ui/parser/bad-if-statements.rs
diff --git a/src/test/ui/parser/bad-if-statements.stderr b/tests/ui/parser/bad-if-statements.stderr
index ee839db64..ee839db64 100644
--- a/src/test/ui/parser/bad-if-statements.stderr
+++ b/tests/ui/parser/bad-if-statements.stderr
diff --git a/src/test/ui/parser/bad-interpolated-block.rs b/tests/ui/parser/bad-interpolated-block.rs
index c6d7ae383..c6d7ae383 100644
--- a/src/test/ui/parser/bad-interpolated-block.rs
+++ b/tests/ui/parser/bad-interpolated-block.rs
diff --git a/src/test/ui/parser/bad-interpolated-block.stderr b/tests/ui/parser/bad-interpolated-block.stderr
index 2a0999afd..2a0999afd 100644
--- a/src/test/ui/parser/bad-interpolated-block.stderr
+++ b/tests/ui/parser/bad-interpolated-block.stderr
diff --git a/src/test/ui/parser/bad-let-as-field.rs b/tests/ui/parser/bad-let-as-field.rs
index fec2bc256..fec2bc256 100644
--- a/src/test/ui/parser/bad-let-as-field.rs
+++ b/tests/ui/parser/bad-let-as-field.rs
diff --git a/src/test/ui/parser/bad-let-as-field.stderr b/tests/ui/parser/bad-let-as-field.stderr
index 57def42b1..57def42b1 100644
--- a/src/test/ui/parser/bad-let-as-field.stderr
+++ b/tests/ui/parser/bad-let-as-field.stderr
diff --git a/src/test/ui/parser/bad-lit-suffixes.rs b/tests/ui/parser/bad-lit-suffixes.rs
index 8cb9ef7e0..8cb9ef7e0 100644
--- a/src/test/ui/parser/bad-lit-suffixes.rs
+++ b/tests/ui/parser/bad-lit-suffixes.rs
diff --git a/src/test/ui/parser/bad-lit-suffixes.stderr b/tests/ui/parser/bad-lit-suffixes.stderr
index 756f99ab1..756f99ab1 100644
--- a/src/test/ui/parser/bad-lit-suffixes.stderr
+++ b/tests/ui/parser/bad-lit-suffixes.stderr
diff --git a/src/test/ui/parser/bad-match.rs b/tests/ui/parser/bad-match.rs
index 04100d170..04100d170 100644
--- a/src/test/ui/parser/bad-match.rs
+++ b/tests/ui/parser/bad-match.rs
diff --git a/src/test/ui/parser/bad-match.stderr b/tests/ui/parser/bad-match.stderr
index 13784c409..13784c409 100644
--- a/src/test/ui/parser/bad-match.stderr
+++ b/tests/ui/parser/bad-match.stderr
diff --git a/src/test/ui/parser/bad-name.rs b/tests/ui/parser/bad-name.rs
index 9b4271692..9b4271692 100644
--- a/src/test/ui/parser/bad-name.rs
+++ b/tests/ui/parser/bad-name.rs
diff --git a/src/test/ui/parser/bad-name.stderr b/tests/ui/parser/bad-name.stderr
index a36b67794..a36b67794 100644
--- a/src/test/ui/parser/bad-name.stderr
+++ b/tests/ui/parser/bad-name.stderr
diff --git a/src/test/ui/parser/bad-pointer-type.rs b/tests/ui/parser/bad-pointer-type.rs
index 6a82acb4c..6a82acb4c 100644
--- a/src/test/ui/parser/bad-pointer-type.rs
+++ b/tests/ui/parser/bad-pointer-type.rs
diff --git a/src/test/ui/parser/bad-pointer-type.stderr b/tests/ui/parser/bad-pointer-type.stderr
index b7225ca88..b7225ca88 100644
--- a/src/test/ui/parser/bad-pointer-type.stderr
+++ b/tests/ui/parser/bad-pointer-type.stderr
diff --git a/tests/ui/parser/bad-recover-kw-after-impl.rs b/tests/ui/parser/bad-recover-kw-after-impl.rs
new file mode 100644
index 000000000..218cd7678
--- /dev/null
+++ b/tests/ui/parser/bad-recover-kw-after-impl.rs
@@ -0,0 +1,15 @@
+// check-pass
+
+// edition:2021
+// for the `impl` + keyword test
+
+macro_rules! impl_primitive {
+    ($ty:ty) => {
+        compile_error!("whoops");
+    };
+    (impl async) => {};
+}
+
+impl_primitive!(impl async);
+
+fn main() {}
diff --git a/tests/ui/parser/bad-recover-ty-after-impl.rs b/tests/ui/parser/bad-recover-ty-after-impl.rs
new file mode 100644
index 000000000..510e08ba0
--- /dev/null
+++ b/tests/ui/parser/bad-recover-ty-after-impl.rs
@@ -0,0 +1,17 @@
+// check-pass
+
+macro_rules! impl_primitive {
+    ($ty:ty) => { impl_primitive!(impl $ty); };
+    (impl $ty:ty) => { fn a(_: $ty) {} }
+}
+
+impl_primitive! { u8 }
+
+macro_rules! test {
+    ($ty:ty) => { compile_error!("oh no"); };
+    (impl &) => {};
+}
+
+test!(impl &);
+
+fn main() {}
diff --git a/src/test/ui/parser/bad-struct-following-where.rs b/tests/ui/parser/bad-struct-following-where.rs
index 823880b1b..823880b1b 100644
--- a/src/test/ui/parser/bad-struct-following-where.rs
+++ b/tests/ui/parser/bad-struct-following-where.rs
diff --git a/src/test/ui/parser/bad-struct-following-where.stderr b/tests/ui/parser/bad-struct-following-where.stderr
index bb79776dc..bb79776dc 100644
--- a/src/test/ui/parser/bad-struct-following-where.stderr
+++ b/tests/ui/parser/bad-struct-following-where.stderr
diff --git a/src/test/ui/parser/bad-value-ident-false.rs b/tests/ui/parser/bad-value-ident-false.rs
index 4645ab4a7..4645ab4a7 100644
--- a/src/test/ui/parser/bad-value-ident-false.rs
+++ b/tests/ui/parser/bad-value-ident-false.rs
diff --git a/src/test/ui/parser/bad-value-ident-false.stderr b/tests/ui/parser/bad-value-ident-false.stderr
index 30c05ecf3..30c05ecf3 100644
--- a/src/test/ui/parser/bad-value-ident-false.stderr
+++ b/tests/ui/parser/bad-value-ident-false.stderr
diff --git a/src/test/ui/parser/bad-value-ident-true.rs b/tests/ui/parser/bad-value-ident-true.rs
index 0f64266d3..0f64266d3 100644
--- a/src/test/ui/parser/bad-value-ident-true.rs
+++ b/tests/ui/parser/bad-value-ident-true.rs
diff --git a/src/test/ui/parser/bad-value-ident-true.stderr b/tests/ui/parser/bad-value-ident-true.stderr
index 74137fa70..74137fa70 100644
--- a/src/test/ui/parser/bad-value-ident-true.stderr
+++ b/tests/ui/parser/bad-value-ident-true.stderr
diff --git a/src/test/ui/parser/bare-struct-body.rs b/tests/ui/parser/bare-struct-body.rs
index a557e861d..a557e861d 100644
--- a/src/test/ui/parser/bare-struct-body.rs
+++ b/tests/ui/parser/bare-struct-body.rs
diff --git a/src/test/ui/parser/bare-struct-body.stderr b/tests/ui/parser/bare-struct-body.stderr
index c77992b2c..7d17ea596 100644
--- a/src/test/ui/parser/bare-struct-body.stderr
+++ b/tests/ui/parser/bare-struct-body.stderr
@@ -34,7 +34,9 @@ error[E0308]: mismatched types
   --> $DIR/bare-struct-body.rs:11:14
    |
 LL |     x.val == 42;
-   |              ^^ expected `()`, found integer
+   |     -----    ^^ expected `()`, found integer
+   |     |
+   |     expected because this is `()`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/parser/bastion-of-the-turbofish.rs b/tests/ui/parser/bastion-of-the-turbofish.rs
index e12857008..e12857008 100644
--- a/src/test/ui/parser/bastion-of-the-turbofish.rs
+++ b/tests/ui/parser/bastion-of-the-turbofish.rs
diff --git a/src/test/ui/parser/better-expected.rs b/tests/ui/parser/better-expected.rs
index 16b61caa4..16b61caa4 100644
--- a/src/test/ui/parser/better-expected.rs
+++ b/tests/ui/parser/better-expected.rs
diff --git a/src/test/ui/parser/better-expected.stderr b/tests/ui/parser/better-expected.stderr
index 21bf8d19a..21bf8d19a 100644
--- a/src/test/ui/parser/better-expected.stderr
+++ b/tests/ui/parser/better-expected.stderr
diff --git a/src/test/ui/parser/bind-struct-early-modifiers.rs b/tests/ui/parser/bind-struct-early-modifiers.rs
index c4b1937de..c4b1937de 100644
--- a/src/test/ui/parser/bind-struct-early-modifiers.rs
+++ b/tests/ui/parser/bind-struct-early-modifiers.rs
diff --git a/src/test/ui/parser/bind-struct-early-modifiers.stderr b/tests/ui/parser/bind-struct-early-modifiers.stderr
index b35762a88..b35762a88 100644
--- a/src/test/ui/parser/bind-struct-early-modifiers.stderr
+++ b/tests/ui/parser/bind-struct-early-modifiers.stderr
diff --git a/src/test/ui/parser/block-no-opening-brace.rs b/tests/ui/parser/block-no-opening-brace.rs
index 8a6599488..8a6599488 100644
--- a/src/test/ui/parser/block-no-opening-brace.rs
+++ b/tests/ui/parser/block-no-opening-brace.rs
diff --git a/src/test/ui/parser/block-no-opening-brace.stderr b/tests/ui/parser/block-no-opening-brace.stderr
index f232f480c..f232f480c 100644
--- a/src/test/ui/parser/block-no-opening-brace.stderr
+++ b/tests/ui/parser/block-no-opening-brace.stderr
diff --git a/src/test/ui/parser/bound-single-question-mark.rs b/tests/ui/parser/bound-single-question-mark.rs
index 64d702d14..64d702d14 100644
--- a/src/test/ui/parser/bound-single-question-mark.rs
+++ b/tests/ui/parser/bound-single-question-mark.rs
diff --git a/src/test/ui/parser/bound-single-question-mark.stderr b/tests/ui/parser/bound-single-question-mark.stderr
index 82937a517..82937a517 100644
--- a/src/test/ui/parser/bound-single-question-mark.stderr
+++ b/tests/ui/parser/bound-single-question-mark.stderr
diff --git a/src/test/ui/parser/bounds-lifetime-1.rs b/tests/ui/parser/bounds-lifetime-1.rs
index e458f644c..e458f644c 100644
--- a/src/test/ui/parser/bounds-lifetime-1.rs
+++ b/tests/ui/parser/bounds-lifetime-1.rs
diff --git a/src/test/ui/parser/bounds-lifetime-1.stderr b/tests/ui/parser/bounds-lifetime-1.stderr
index 000e84f63..000e84f63 100644
--- a/src/test/ui/parser/bounds-lifetime-1.stderr
+++ b/tests/ui/parser/bounds-lifetime-1.stderr
diff --git a/src/test/ui/parser/bounds-lifetime-2.rs b/tests/ui/parser/bounds-lifetime-2.rs
index f184107bb..f184107bb 100644
--- a/src/test/ui/parser/bounds-lifetime-2.rs
+++ b/tests/ui/parser/bounds-lifetime-2.rs
diff --git a/src/test/ui/parser/bounds-lifetime-2.stderr b/tests/ui/parser/bounds-lifetime-2.stderr
index dd3e69c11..dd3e69c11 100644
--- a/src/test/ui/parser/bounds-lifetime-2.stderr
+++ b/tests/ui/parser/bounds-lifetime-2.stderr
diff --git a/src/test/ui/parser/bounds-lifetime-where-1.rs b/tests/ui/parser/bounds-lifetime-where-1.rs
index f1a002a9f..f1a002a9f 100644
--- a/src/test/ui/parser/bounds-lifetime-where-1.rs
+++ b/tests/ui/parser/bounds-lifetime-where-1.rs
diff --git a/src/test/ui/parser/bounds-lifetime-where-1.stderr b/tests/ui/parser/bounds-lifetime-where-1.stderr
index b6bd86693..b6bd86693 100644
--- a/src/test/ui/parser/bounds-lifetime-where-1.stderr
+++ b/tests/ui/parser/bounds-lifetime-where-1.stderr
diff --git a/src/test/ui/parser/bounds-lifetime-where.rs b/tests/ui/parser/bounds-lifetime-where.rs
index 7ff75233d..7ff75233d 100644
--- a/src/test/ui/parser/bounds-lifetime-where.rs
+++ b/tests/ui/parser/bounds-lifetime-where.rs
diff --git a/src/test/ui/parser/bounds-lifetime-where.stderr b/tests/ui/parser/bounds-lifetime-where.stderr
index 785a1fb67..785a1fb67 100644
--- a/src/test/ui/parser/bounds-lifetime-where.stderr
+++ b/tests/ui/parser/bounds-lifetime-where.stderr
diff --git a/src/test/ui/parser/bounds-lifetime.rs b/tests/ui/parser/bounds-lifetime.rs
index c9251ac53..c9251ac53 100644
--- a/src/test/ui/parser/bounds-lifetime.rs
+++ b/tests/ui/parser/bounds-lifetime.rs
diff --git a/src/test/ui/parser/bounds-lifetime.stderr b/tests/ui/parser/bounds-lifetime.stderr
index e47a21d89..e47a21d89 100644
--- a/src/test/ui/parser/bounds-lifetime.stderr
+++ b/tests/ui/parser/bounds-lifetime.stderr
diff --git a/src/test/ui/parser/bounds-obj-parens.rs b/tests/ui/parser/bounds-obj-parens.rs
index 8c446d27d..8c446d27d 100644
--- a/src/test/ui/parser/bounds-obj-parens.rs
+++ b/tests/ui/parser/bounds-obj-parens.rs
diff --git a/src/test/ui/parser/bounds-type-where.rs b/tests/ui/parser/bounds-type-where.rs
index 2520ecb29..2520ecb29 100644
--- a/src/test/ui/parser/bounds-type-where.rs
+++ b/tests/ui/parser/bounds-type-where.rs
diff --git a/src/test/ui/parser/bounds-type-where.stderr b/tests/ui/parser/bounds-type-where.stderr
index 5636ee75c..5636ee75c 100644
--- a/src/test/ui/parser/bounds-type-where.stderr
+++ b/tests/ui/parser/bounds-type-where.stderr
diff --git a/src/test/ui/parser/bounds-type.rs b/tests/ui/parser/bounds-type.rs
index 4ae4549ea..4ae4549ea 100644
--- a/src/test/ui/parser/bounds-type.rs
+++ b/tests/ui/parser/bounds-type.rs
diff --git a/src/test/ui/parser/bounds-type.stderr b/tests/ui/parser/bounds-type.stderr
index 005bc1e54..005bc1e54 100644
--- a/src/test/ui/parser/bounds-type.stderr
+++ b/tests/ui/parser/bounds-type.stderr
diff --git a/src/test/ui/parser/byte-literals.rs b/tests/ui/parser/byte-literals.rs
index 896dc1a1a..896dc1a1a 100644
--- a/src/test/ui/parser/byte-literals.rs
+++ b/tests/ui/parser/byte-literals.rs
diff --git a/src/test/ui/parser/byte-literals.stderr b/tests/ui/parser/byte-literals.stderr
index efa55ae05..efa55ae05 100644
--- a/src/test/ui/parser/byte-literals.stderr
+++ b/tests/ui/parser/byte-literals.stderr
diff --git a/src/test/ui/parser/byte-string-literals.rs b/tests/ui/parser/byte-string-literals.rs
index 30a4f50c4..30a4f50c4 100644
--- a/src/test/ui/parser/byte-string-literals.rs
+++ b/tests/ui/parser/byte-string-literals.rs
diff --git a/src/test/ui/parser/byte-string-literals.stderr b/tests/ui/parser/byte-string-literals.stderr
index 5b96cc3d1..5b96cc3d1 100644
--- a/src/test/ui/parser/byte-string-literals.stderr
+++ b/tests/ui/parser/byte-string-literals.stderr
diff --git a/src/test/ui/parser/can-begin-expr-check.rs b/tests/ui/parser/can-begin-expr-check.rs
index e5be8de79..e5be8de79 100644
--- a/src/test/ui/parser/can-begin-expr-check.rs
+++ b/tests/ui/parser/can-begin-expr-check.rs
diff --git a/src/test/ui/parser/can-begin-expr-check.stderr b/tests/ui/parser/can-begin-expr-check.stderr
index 9569ababa..9569ababa 100644
--- a/src/test/ui/parser/can-begin-expr-check.stderr
+++ b/tests/ui/parser/can-begin-expr-check.stderr
diff --git a/src/test/ui/parser/chained-comparison-suggestion.rs b/tests/ui/parser/chained-comparison-suggestion.rs
index bbd46082c..bbd46082c 100644
--- a/src/test/ui/parser/chained-comparison-suggestion.rs
+++ b/tests/ui/parser/chained-comparison-suggestion.rs
diff --git a/src/test/ui/parser/chained-comparison-suggestion.stderr b/tests/ui/parser/chained-comparison-suggestion.stderr
index 694b0b6eb..ae243816d 100644
--- a/src/test/ui/parser/chained-comparison-suggestion.stderr
+++ b/tests/ui/parser/chained-comparison-suggestion.stderr
@@ -123,37 +123,49 @@ error[E0308]: mismatched types
   --> $DIR/chained-comparison-suggestion.rs:4:14
    |
 LL |     1 < 2 <= 3;
-   |              ^ expected `bool`, found integer
+   |     -----    ^ expected `bool`, found integer
+   |     |
+   |     expected because this is `bool`
 
 error[E0308]: mismatched types
   --> $DIR/chained-comparison-suggestion.rs:13:14
    |
 LL |     1 <= 2 < 3;
-   |              ^ expected `bool`, found integer
+   |     ------   ^ expected `bool`, found integer
+   |     |
+   |     expected because this is `bool`
 
 error[E0308]: mismatched types
   --> $DIR/chained-comparison-suggestion.rs:18:15
    |
 LL |     1 <= 2 <= 3;
-   |               ^ expected `bool`, found integer
+   |     ------    ^ expected `bool`, found integer
+   |     |
+   |     expected because this is `bool`
 
 error[E0308]: mismatched types
   --> $DIR/chained-comparison-suggestion.rs:23:14
    |
 LL |     1 > 2 >= 3;
-   |              ^ expected `bool`, found integer
+   |     -----    ^ expected `bool`, found integer
+   |     |
+   |     expected because this is `bool`
 
 error[E0308]: mismatched types
   --> $DIR/chained-comparison-suggestion.rs:36:15
    |
 LL |     1 >= 2 >= 3;
-   |               ^ expected `bool`, found integer
+   |     ------    ^ expected `bool`, found integer
+   |     |
+   |     expected because this is `bool`
 
 error[E0308]: mismatched types
   --> $DIR/chained-comparison-suggestion.rs:49:15
    |
 LL |     1 == 2 == 3;
-   |               ^ expected `bool`, found integer
+   |     ------    ^ expected `bool`, found integer
+   |     |
+   |     expected because this is `bool`
 
 error: aborting due to 17 previous errors
 
diff --git a/src/test/ui/parser/char/whitespace-character-literal.rs b/tests/ui/parser/char/whitespace-character-literal.rs
index de5e09204..de5e09204 100644
--- a/src/test/ui/parser/char/whitespace-character-literal.rs
+++ b/tests/ui/parser/char/whitespace-character-literal.rs
diff --git a/src/test/ui/parser/char/whitespace-character-literal.stderr b/tests/ui/parser/char/whitespace-character-literal.stderr
index d73de41a8..d73de41a8 100644
--- a/src/test/ui/parser/char/whitespace-character-literal.stderr
+++ b/tests/ui/parser/char/whitespace-character-literal.stderr
diff --git a/src/test/ui/parser/circular_modules_hello.rs b/tests/ui/parser/circular_modules_hello.rs
index 6968ca97b..6968ca97b 100644
--- a/src/test/ui/parser/circular_modules_hello.rs
+++ b/tests/ui/parser/circular_modules_hello.rs
diff --git a/src/test/ui/parser/circular_modules_main.rs b/tests/ui/parser/circular_modules_main.rs
index d4b47efe6..d4b47efe6 100644
--- a/src/test/ui/parser/circular_modules_main.rs
+++ b/tests/ui/parser/circular_modules_main.rs
diff --git a/src/test/ui/parser/circular_modules_main.stderr b/tests/ui/parser/circular_modules_main.stderr
index 1094def60..1094def60 100644
--- a/src/test/ui/parser/circular_modules_main.stderr
+++ b/tests/ui/parser/circular_modules_main.stderr
diff --git a/src/test/ui/parser/class-implements-bad-trait.rs b/tests/ui/parser/class-implements-bad-trait.rs
index f2f85d026..f2f85d026 100644
--- a/src/test/ui/parser/class-implements-bad-trait.rs
+++ b/tests/ui/parser/class-implements-bad-trait.rs
diff --git a/src/test/ui/parser/class-implements-bad-trait.stderr b/tests/ui/parser/class-implements-bad-trait.stderr
index 3a4dea95d..3a4dea95d 100644
--- a/src/test/ui/parser/class-implements-bad-trait.stderr
+++ b/tests/ui/parser/class-implements-bad-trait.stderr
diff --git a/src/test/ui/parser/closure-return-syntax.rs b/tests/ui/parser/closure-return-syntax.rs
index c6a08abef..c6a08abef 100644
--- a/src/test/ui/parser/closure-return-syntax.rs
+++ b/tests/ui/parser/closure-return-syntax.rs
diff --git a/src/test/ui/parser/closure-return-syntax.stderr b/tests/ui/parser/closure-return-syntax.stderr
index 3d16a2067..3d16a2067 100644
--- a/src/test/ui/parser/closure-return-syntax.stderr
+++ b/tests/ui/parser/closure-return-syntax.stderr
diff --git a/src/test/ui/parser/column-offset-1-based.rs b/tests/ui/parser/column-offset-1-based.rs
index 0c24478c2..0c24478c2 100644
--- a/src/test/ui/parser/column-offset-1-based.rs
+++ b/tests/ui/parser/column-offset-1-based.rs
diff --git a/src/test/ui/parser/column-offset-1-based.stderr b/tests/ui/parser/column-offset-1-based.stderr
index 766d72a0a..766d72a0a 100644
--- a/src/test/ui/parser/column-offset-1-based.stderr
+++ b/tests/ui/parser/column-offset-1-based.stderr
diff --git a/src/test/ui/parser/const-param-decl-on-type-instead-of-impl.rs b/tests/ui/parser/const-param-decl-on-type-instead-of-impl.rs
index 53e3c6f96..53e3c6f96 100644
--- a/src/test/ui/parser/const-param-decl-on-type-instead-of-impl.rs
+++ b/tests/ui/parser/const-param-decl-on-type-instead-of-impl.rs
diff --git a/src/test/ui/parser/const-param-decl-on-type-instead-of-impl.stderr b/tests/ui/parser/const-param-decl-on-type-instead-of-impl.stderr
index 96885d11e..96885d11e 100644
--- a/src/test/ui/parser/const-param-decl-on-type-instead-of-impl.stderr
+++ b/tests/ui/parser/const-param-decl-on-type-instead-of-impl.stderr
diff --git a/src/test/ui/parser/constraints-before-generic-args-syntactic-pass.rs b/tests/ui/parser/constraints-before-generic-args-syntactic-pass.rs
index d8346653c..d8346653c 100644
--- a/src/test/ui/parser/constraints-before-generic-args-syntactic-pass.rs
+++ b/tests/ui/parser/constraints-before-generic-args-syntactic-pass.rs
diff --git a/src/test/ui/parser/constraints-before-generic-args-syntactic-pass.stderr b/tests/ui/parser/constraints-before-generic-args-syntactic-pass.stderr
index 7e843c7f4..7e843c7f4 100644
--- a/src/test/ui/parser/constraints-before-generic-args-syntactic-pass.stderr
+++ b/tests/ui/parser/constraints-before-generic-args-syntactic-pass.stderr
diff --git a/src/test/ui/parser/default-on-wrong-item-kind.rs b/tests/ui/parser/default-on-wrong-item-kind.rs
index 98a95cfa3..98a95cfa3 100644
--- a/src/test/ui/parser/default-on-wrong-item-kind.rs
+++ b/tests/ui/parser/default-on-wrong-item-kind.rs
diff --git a/src/test/ui/parser/default-on-wrong-item-kind.stderr b/tests/ui/parser/default-on-wrong-item-kind.stderr
index af513f761..af513f761 100644
--- a/src/test/ui/parser/default-on-wrong-item-kind.stderr
+++ b/tests/ui/parser/default-on-wrong-item-kind.stderr
diff --git a/src/test/ui/parser/default-unmatched-assoc.rs b/tests/ui/parser/default-unmatched-assoc.rs
index 168ea3e76..168ea3e76 100644
--- a/src/test/ui/parser/default-unmatched-assoc.rs
+++ b/tests/ui/parser/default-unmatched-assoc.rs
diff --git a/src/test/ui/parser/default-unmatched-assoc.stderr b/tests/ui/parser/default-unmatched-assoc.stderr
index ee35fded9..ee35fded9 100644
--- a/src/test/ui/parser/default-unmatched-assoc.stderr
+++ b/tests/ui/parser/default-unmatched-assoc.stderr
diff --git a/src/test/ui/parser/default-unmatched-extern.rs b/tests/ui/parser/default-unmatched-extern.rs
index 8d0ea590f..8d0ea590f 100644
--- a/src/test/ui/parser/default-unmatched-extern.rs
+++ b/tests/ui/parser/default-unmatched-extern.rs
diff --git a/src/test/ui/parser/default-unmatched-extern.stderr b/tests/ui/parser/default-unmatched-extern.stderr
index bb4efd516..bb4efd516 100644
--- a/src/test/ui/parser/default-unmatched-extern.stderr
+++ b/tests/ui/parser/default-unmatched-extern.stderr
diff --git a/src/test/ui/parser/default-unmatched.rs b/tests/ui/parser/default-unmatched.rs
index 49346e5c6..49346e5c6 100644
--- a/src/test/ui/parser/default-unmatched.rs
+++ b/tests/ui/parser/default-unmatched.rs
diff --git a/src/test/ui/parser/default-unmatched.stderr b/tests/ui/parser/default-unmatched.stderr
index 331e003f6..331e003f6 100644
--- a/src/test/ui/parser/default-unmatched.stderr
+++ b/tests/ui/parser/default-unmatched.stderr
diff --git a/src/test/ui/parser/default.rs b/tests/ui/parser/default.rs
index 52338c1f1..52338c1f1 100644
--- a/src/test/ui/parser/default.rs
+++ b/tests/ui/parser/default.rs
diff --git a/src/test/ui/parser/default.stderr b/tests/ui/parser/default.stderr
index 37aa48ccf..37aa48ccf 100644
--- a/src/test/ui/parser/default.stderr
+++ b/tests/ui/parser/default.stderr
diff --git a/tests/ui/parser/diff-markers/enum-2.rs b/tests/ui/parser/diff-markers/enum-2.rs
new file mode 100644
index 000000000..76ea980fc
--- /dev/null
+++ b/tests/ui/parser/diff-markers/enum-2.rs
@@ -0,0 +1,11 @@
+enum E {
+    Foo {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+        x: u8,
+|||||||
+        z: (),
+=======
+        y: i8,
+>>>>>>> branch
+    }
+}
diff --git a/tests/ui/parser/diff-markers/enum-2.stderr b/tests/ui/parser/diff-markers/enum-2.stderr
new file mode 100644
index 000000000..63da5c2a6
--- /dev/null
+++ b/tests/ui/parser/diff-markers/enum-2.stderr
@@ -0,0 +1,21 @@
+error: encountered diff marker
+  --> $DIR/enum-2.rs:3:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |         x: u8,
+LL | |||||||
+   | -------
+LL |         z: (),
+LL | =======
+   | -------
+LL |         y: i8,
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/enum.rs b/tests/ui/parser/diff-markers/enum.rs
new file mode 100644
index 000000000..45df6e325
--- /dev/null
+++ b/tests/ui/parser/diff-markers/enum.rs
@@ -0,0 +1,7 @@
+enum E {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+    Foo(u8),
+=======
+    Bar(i8),
+>>>>>>> branch
+}
diff --git a/tests/ui/parser/diff-markers/enum.stderr b/tests/ui/parser/diff-markers/enum.stderr
new file mode 100644
index 000000000..abbf3fb41
--- /dev/null
+++ b/tests/ui/parser/diff-markers/enum.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/enum.rs:2:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |     Foo(u8),
+LL | =======
+   | -------
+LL |     Bar(i8),
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/fn-arg.rs b/tests/ui/parser/diff-markers/fn-arg.rs
new file mode 100644
index 000000000..86c355628
--- /dev/null
+++ b/tests/ui/parser/diff-markers/fn-arg.rs
@@ -0,0 +1,16 @@
+trait T {
+    fn foo(
+<<<<<<< HEAD //~ ERROR encountered diff marker
+        x: u8,
+=======
+        x: i8,
+>>>>>>> branch
+    ) {}
+}
+
+struct S;
+impl T for S {}
+
+fn main() {
+    S::foo(42);
+}
diff --git a/tests/ui/parser/diff-markers/fn-arg.stderr b/tests/ui/parser/diff-markers/fn-arg.stderr
new file mode 100644
index 000000000..933a20641
--- /dev/null
+++ b/tests/ui/parser/diff-markers/fn-arg.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/fn-arg.rs:3:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |         x: u8,
+LL | =======
+   | -------
+LL |         x: i8,
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/item-with-attr.rs b/tests/ui/parser/diff-markers/item-with-attr.rs
new file mode 100644
index 000000000..985907c08
--- /dev/null
+++ b/tests/ui/parser/diff-markers/item-with-attr.rs
@@ -0,0 +1,10 @@
+#[attribute]
+<<<<<<< HEAD //~ ERROR encountered diff marker
+fn foo() {}
+=======
+fn bar() {}
+>>>>>>> branch
+
+fn main() {
+    foo();
+}
diff --git a/tests/ui/parser/diff-markers/item-with-attr.stderr b/tests/ui/parser/diff-markers/item-with-attr.stderr
new file mode 100644
index 000000000..850e2368e
--- /dev/null
+++ b/tests/ui/parser/diff-markers/item-with-attr.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/item-with-attr.rs:2:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL | fn foo() {}
+LL | =======
+   | -------
+LL | fn bar() {}
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/item.rs b/tests/ui/parser/diff-markers/item.rs
new file mode 100644
index 000000000..4ed36b7b4
--- /dev/null
+++ b/tests/ui/parser/diff-markers/item.rs
@@ -0,0 +1,9 @@
+<<<<<<< HEAD //~ ERROR encountered diff marker
+fn foo() {}
+=======
+fn bar() {}
+>>>>>>> branch
+
+fn main() {
+    foo();
+}
diff --git a/tests/ui/parser/diff-markers/item.stderr b/tests/ui/parser/diff-markers/item.stderr
new file mode 100644
index 000000000..9ab3631a6
--- /dev/null
+++ b/tests/ui/parser/diff-markers/item.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/item.rs:1:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL | fn foo() {}
+LL | =======
+   | -------
+LL | fn bar() {}
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/statement.rs b/tests/ui/parser/diff-markers/statement.rs
new file mode 100644
index 000000000..e55d16d3b
--- /dev/null
+++ b/tests/ui/parser/diff-markers/statement.rs
@@ -0,0 +1,15 @@
+trait T {
+    fn foo() {}
+    fn bar() {}
+}
+
+struct S;
+impl T for S {}
+
+fn main() {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+    S::foo();
+=======
+    S::bar();
+>>>>>>> branch
+}
diff --git a/tests/ui/parser/diff-markers/statement.stderr b/tests/ui/parser/diff-markers/statement.stderr
new file mode 100644
index 000000000..7ca2495b8
--- /dev/null
+++ b/tests/ui/parser/diff-markers/statement.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/statement.rs:10:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |     S::foo();
+LL | =======
+   | -------
+LL |     S::bar();
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/struct-expr.rs b/tests/ui/parser/diff-markers/struct-expr.rs
new file mode 100644
index 000000000..99d2fd662
--- /dev/null
+++ b/tests/ui/parser/diff-markers/struct-expr.rs
@@ -0,0 +1,12 @@
+struct S {
+    x: u8,
+}
+fn main() {
+    let _ = S {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+        x: 42,
+=======
+        x: 0,
+>>>>>>> branch
+    }
+}
diff --git a/tests/ui/parser/diff-markers/struct-expr.stderr b/tests/ui/parser/diff-markers/struct-expr.stderr
new file mode 100644
index 000000000..d70476a98
--- /dev/null
+++ b/tests/ui/parser/diff-markers/struct-expr.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/struct-expr.rs:6:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |         x: 42,
+LL | =======
+   | -------
+LL |         x: 0,
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/struct.rs b/tests/ui/parser/diff-markers/struct.rs
new file mode 100644
index 000000000..d26464d47
--- /dev/null
+++ b/tests/ui/parser/diff-markers/struct.rs
@@ -0,0 +1,7 @@
+struct S {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+    x: u8,
+=======
+    x: i8,
+>>>>>>> branch
+}
diff --git a/tests/ui/parser/diff-markers/struct.stderr b/tests/ui/parser/diff-markers/struct.stderr
new file mode 100644
index 000000000..cc0b3da66
--- /dev/null
+++ b/tests/ui/parser/diff-markers/struct.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/struct.rs:2:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |     x: u8,
+LL | =======
+   | -------
+LL |     x: i8,
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/trait-item.rs b/tests/ui/parser/diff-markers/trait-item.rs
new file mode 100644
index 000000000..3227c8212
--- /dev/null
+++ b/tests/ui/parser/diff-markers/trait-item.rs
@@ -0,0 +1,14 @@
+trait T {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+    fn foo() {}
+=======
+    fn bar() {}
+>>>>>>> branch
+}
+
+struct S;
+impl T for S {}
+
+fn main() {
+    S::foo();
+}
diff --git a/tests/ui/parser/diff-markers/trait-item.stderr b/tests/ui/parser/diff-markers/trait-item.stderr
new file mode 100644
index 000000000..cdc19f8e0
--- /dev/null
+++ b/tests/ui/parser/diff-markers/trait-item.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/trait-item.rs:2:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |     fn foo() {}
+LL | =======
+   | -------
+LL |     fn bar() {}
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/tuple-struct.rs b/tests/ui/parser/diff-markers/tuple-struct.rs
new file mode 100644
index 000000000..7eec35c96
--- /dev/null
+++ b/tests/ui/parser/diff-markers/tuple-struct.rs
@@ -0,0 +1,7 @@
+struct S(
+<<<<<<< HEAD //~ ERROR encountered diff marker
+    u8,
+=======
+    i8,
+>>>>>>> branch
+);
diff --git a/tests/ui/parser/diff-markers/tuple-struct.stderr b/tests/ui/parser/diff-markers/tuple-struct.stderr
new file mode 100644
index 000000000..d673db898
--- /dev/null
+++ b/tests/ui/parser/diff-markers/tuple-struct.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/tuple-struct.rs:2:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |     u8,
+LL | =======
+   | -------
+LL |     i8,
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/use-statement.rs b/tests/ui/parser/diff-markers/use-statement.rs
new file mode 100644
index 000000000..6306243a5
--- /dev/null
+++ b/tests/ui/parser/diff-markers/use-statement.rs
@@ -0,0 +1,9 @@
+use foo::{
+<<<<<<< HEAD //~ ERROR encountered diff marker
+    bar,
+=======
+    baz,
+>>>>>>> branch
+};
+
+fn main() {}
diff --git a/tests/ui/parser/diff-markers/use-statement.stderr b/tests/ui/parser/diff-markers/use-statement.stderr
new file mode 100644
index 000000000..12e6f57dd
--- /dev/null
+++ b/tests/ui/parser/diff-markers/use-statement.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/use-statement.rs:2:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |     bar,
+LL | =======
+   | -------
+LL |     baz,
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/parser/do-catch-suggests-try.rs b/tests/ui/parser/do-catch-suggests-try.rs
index f64568d06..f64568d06 100644
--- a/src/test/ui/parser/do-catch-suggests-try.rs
+++ b/tests/ui/parser/do-catch-suggests-try.rs
diff --git a/src/test/ui/parser/do-catch-suggests-try.stderr b/tests/ui/parser/do-catch-suggests-try.stderr
index cd8907b7e..cd8907b7e 100644
--- a/src/test/ui/parser/do-catch-suggests-try.stderr
+++ b/tests/ui/parser/do-catch-suggests-try.stderr
diff --git a/src/test/ui/parser/do-not-suggest-semicolon-before-array.rs b/tests/ui/parser/do-not-suggest-semicolon-before-array.rs
index 7ebf3f6b0..7ebf3f6b0 100644
--- a/src/test/ui/parser/do-not-suggest-semicolon-before-array.rs
+++ b/tests/ui/parser/do-not-suggest-semicolon-before-array.rs
diff --git a/src/test/ui/parser/do-not-suggest-semicolon-before-array.stderr b/tests/ui/parser/do-not-suggest-semicolon-before-array.stderr
index a9dd52632..a9dd52632 100644
--- a/src/test/ui/parser/do-not-suggest-semicolon-before-array.stderr
+++ b/tests/ui/parser/do-not-suggest-semicolon-before-array.stderr
diff --git a/src/test/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs b/tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs
index d6f798181..d6f798181 100644
--- a/src/test/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs
+++ b/tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs
diff --git a/src/test/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.stderr b/tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.stderr
index 2fe6a28ee..2fe6a28ee 100644
--- a/src/test/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.stderr
+++ b/tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.stderr
diff --git a/src/test/ui/parser/doc-after-struct-field.rs b/tests/ui/parser/doc-after-struct-field.rs
index 03faa6733..03faa6733 100644
--- a/src/test/ui/parser/doc-after-struct-field.rs
+++ b/tests/ui/parser/doc-after-struct-field.rs
diff --git a/src/test/ui/parser/doc-after-struct-field.stderr b/tests/ui/parser/doc-after-struct-field.stderr
index ae177f1a2..ae177f1a2 100644
--- a/src/test/ui/parser/doc-after-struct-field.stderr
+++ b/tests/ui/parser/doc-after-struct-field.stderr
diff --git a/src/test/ui/parser/doc-before-attr.rs b/tests/ui/parser/doc-before-attr.rs
index c4125a09f..c4125a09f 100644
--- a/src/test/ui/parser/doc-before-attr.rs
+++ b/tests/ui/parser/doc-before-attr.rs
diff --git a/src/test/ui/parser/doc-before-attr.stderr b/tests/ui/parser/doc-before-attr.stderr
index 14fd01af2..14fd01af2 100644
--- a/src/test/ui/parser/doc-before-attr.stderr
+++ b/tests/ui/parser/doc-before-attr.stderr
diff --git a/src/test/ui/parser/doc-before-eof.rs b/tests/ui/parser/doc-before-eof.rs
index b31836e95..b31836e95 100644
--- a/src/test/ui/parser/doc-before-eof.rs
+++ b/tests/ui/parser/doc-before-eof.rs
diff --git a/src/test/ui/parser/doc-before-eof.stderr b/tests/ui/parser/doc-before-eof.stderr
index 827566267..827566267 100644
--- a/src/test/ui/parser/doc-before-eof.stderr
+++ b/tests/ui/parser/doc-before-eof.stderr
diff --git a/src/test/ui/parser/doc-before-extern-rbrace.rs b/tests/ui/parser/doc-before-extern-rbrace.rs
index 515c90ed4..515c90ed4 100644
--- a/src/test/ui/parser/doc-before-extern-rbrace.rs
+++ b/tests/ui/parser/doc-before-extern-rbrace.rs
diff --git a/src/test/ui/parser/doc-before-extern-rbrace.stderr b/tests/ui/parser/doc-before-extern-rbrace.stderr
index 8fa12ec26..8fa12ec26 100644
--- a/src/test/ui/parser/doc-before-extern-rbrace.stderr
+++ b/tests/ui/parser/doc-before-extern-rbrace.stderr
diff --git a/src/test/ui/parser/doc-before-fn-rbrace.rs b/tests/ui/parser/doc-before-fn-rbrace.rs
index c85021648..c85021648 100644
--- a/src/test/ui/parser/doc-before-fn-rbrace.rs
+++ b/tests/ui/parser/doc-before-fn-rbrace.rs
diff --git a/src/test/ui/parser/doc-before-fn-rbrace.stderr b/tests/ui/parser/doc-before-fn-rbrace.stderr
index 6ea68e42b..6ea68e42b 100644
--- a/src/test/ui/parser/doc-before-fn-rbrace.stderr
+++ b/tests/ui/parser/doc-before-fn-rbrace.stderr
diff --git a/src/test/ui/parser/doc-before-identifier.rs b/tests/ui/parser/doc-before-identifier.rs
index 76263ad92..76263ad92 100644
--- a/src/test/ui/parser/doc-before-identifier.rs
+++ b/tests/ui/parser/doc-before-identifier.rs
diff --git a/src/test/ui/parser/doc-before-identifier.stderr b/tests/ui/parser/doc-before-identifier.stderr
index 940d293b6..940d293b6 100644
--- a/src/test/ui/parser/doc-before-identifier.stderr
+++ b/tests/ui/parser/doc-before-identifier.stderr
diff --git a/src/test/ui/parser/doc-before-mod-rbrace.rs b/tests/ui/parser/doc-before-mod-rbrace.rs
index c65a0a931..c65a0a931 100644
--- a/src/test/ui/parser/doc-before-mod-rbrace.rs
+++ b/tests/ui/parser/doc-before-mod-rbrace.rs
diff --git a/src/test/ui/parser/doc-before-mod-rbrace.stderr b/tests/ui/parser/doc-before-mod-rbrace.stderr
index d5749c66c..d5749c66c 100644
--- a/src/test/ui/parser/doc-before-mod-rbrace.stderr
+++ b/tests/ui/parser/doc-before-mod-rbrace.stderr
diff --git a/src/test/ui/parser/doc-before-rbrace.rs b/tests/ui/parser/doc-before-rbrace.rs
index 570306f2c..570306f2c 100644
--- a/src/test/ui/parser/doc-before-rbrace.rs
+++ b/tests/ui/parser/doc-before-rbrace.rs
diff --git a/src/test/ui/parser/doc-before-rbrace.stderr b/tests/ui/parser/doc-before-rbrace.stderr
index 4d4741dfe..4d4741dfe 100644
--- a/src/test/ui/parser/doc-before-rbrace.stderr
+++ b/tests/ui/parser/doc-before-rbrace.stderr
diff --git a/src/test/ui/parser/doc-before-semi.rs b/tests/ui/parser/doc-before-semi.rs
index 444b5874e..444b5874e 100644
--- a/src/test/ui/parser/doc-before-semi.rs
+++ b/tests/ui/parser/doc-before-semi.rs
diff --git a/src/test/ui/parser/doc-before-semi.stderr b/tests/ui/parser/doc-before-semi.stderr
index a879e13ff..a879e13ff 100644
--- a/src/test/ui/parser/doc-before-semi.stderr
+++ b/tests/ui/parser/doc-before-semi.stderr
diff --git a/src/test/ui/parser/doc-before-struct-rbrace-1.rs b/tests/ui/parser/doc-before-struct-rbrace-1.rs
index 0c8d90c3b..0c8d90c3b 100644
--- a/src/test/ui/parser/doc-before-struct-rbrace-1.rs
+++ b/tests/ui/parser/doc-before-struct-rbrace-1.rs
diff --git a/src/test/ui/parser/doc-before-struct-rbrace-1.stderr b/tests/ui/parser/doc-before-struct-rbrace-1.stderr
index 94934f734..94934f734 100644
--- a/src/test/ui/parser/doc-before-struct-rbrace-1.stderr
+++ b/tests/ui/parser/doc-before-struct-rbrace-1.stderr
diff --git a/src/test/ui/parser/doc-before-struct-rbrace-2.rs b/tests/ui/parser/doc-before-struct-rbrace-2.rs
index 2b2aadf79..2b2aadf79 100644
--- a/src/test/ui/parser/doc-before-struct-rbrace-2.rs
+++ b/tests/ui/parser/doc-before-struct-rbrace-2.rs
diff --git a/src/test/ui/parser/doc-before-struct-rbrace-2.stderr b/tests/ui/parser/doc-before-struct-rbrace-2.stderr
index 6b5c8c1f8..6b5c8c1f8 100644
--- a/src/test/ui/parser/doc-before-struct-rbrace-2.stderr
+++ b/tests/ui/parser/doc-before-struct-rbrace-2.stderr
diff --git a/src/test/ui/parser/doc-comment-in-if-statement.rs b/tests/ui/parser/doc-comment-in-if-statement.rs
index 343eac1b8..343eac1b8 100644
--- a/src/test/ui/parser/doc-comment-in-if-statement.rs
+++ b/tests/ui/parser/doc-comment-in-if-statement.rs
diff --git a/src/test/ui/parser/doc-comment-in-if-statement.stderr b/tests/ui/parser/doc-comment-in-if-statement.stderr
index fc0bc5073..fc0bc5073 100644
--- a/src/test/ui/parser/doc-comment-in-if-statement.stderr
+++ b/tests/ui/parser/doc-comment-in-if-statement.stderr
diff --git a/src/test/ui/parser/doc-comment-in-stmt.rs b/tests/ui/parser/doc-comment-in-stmt.rs
index b02df1321..b02df1321 100644
--- a/src/test/ui/parser/doc-comment-in-stmt.rs
+++ b/tests/ui/parser/doc-comment-in-stmt.rs
diff --git a/src/test/ui/parser/doc-comment-in-stmt.stderr b/tests/ui/parser/doc-comment-in-stmt.stderr
index febfb600c..febfb600c 100644
--- a/src/test/ui/parser/doc-comment-in-stmt.stderr
+++ b/tests/ui/parser/doc-comment-in-stmt.stderr
diff --git a/src/test/ui/parser/doc-inside-trait-item.rs b/tests/ui/parser/doc-inside-trait-item.rs
index 87b501bd2..87b501bd2 100644
--- a/src/test/ui/parser/doc-inside-trait-item.rs
+++ b/tests/ui/parser/doc-inside-trait-item.rs
diff --git a/src/test/ui/parser/doc-inside-trait-item.stderr b/tests/ui/parser/doc-inside-trait-item.stderr
index 900124adc..900124adc 100644
--- a/src/test/ui/parser/doc-inside-trait-item.stderr
+++ b/tests/ui/parser/doc-inside-trait-item.stderr
diff --git a/src/test/ui/parser/dotdotdot-expr.rs b/tests/ui/parser/dotdotdot-expr.rs
index d842fb6e0..d842fb6e0 100644
--- a/src/test/ui/parser/dotdotdot-expr.rs
+++ b/tests/ui/parser/dotdotdot-expr.rs
diff --git a/src/test/ui/parser/dotdotdot-expr.stderr b/tests/ui/parser/dotdotdot-expr.stderr
index e7203f24d..e7203f24d 100644
--- a/src/test/ui/parser/dotdotdot-expr.stderr
+++ b/tests/ui/parser/dotdotdot-expr.stderr
diff --git a/src/test/ui/parser/double-pointer.rs b/tests/ui/parser/double-pointer.rs
index 54d34db4a..54d34db4a 100644
--- a/src/test/ui/parser/double-pointer.rs
+++ b/tests/ui/parser/double-pointer.rs
diff --git a/src/test/ui/parser/double-pointer.stderr b/tests/ui/parser/double-pointer.stderr
index 28037f932..28037f932 100644
--- a/src/test/ui/parser/double-pointer.stderr
+++ b/tests/ui/parser/double-pointer.stderr
diff --git a/src/test/ui/parser/duplicate-visibility.rs b/tests/ui/parser/duplicate-visibility.rs
index 54955944c..54955944c 100644
--- a/src/test/ui/parser/duplicate-visibility.rs
+++ b/tests/ui/parser/duplicate-visibility.rs
diff --git a/src/test/ui/parser/duplicate-visibility.stderr b/tests/ui/parser/duplicate-visibility.stderr
index 8ecebf01f..8ecebf01f 100644
--- a/src/test/ui/parser/duplicate-visibility.stderr
+++ b/tests/ui/parser/duplicate-visibility.stderr
diff --git a/src/test/ui/parser/duplicate-where-clauses.rs b/tests/ui/parser/duplicate-where-clauses.rs
index 9eb2ffb06..9eb2ffb06 100644
--- a/src/test/ui/parser/duplicate-where-clauses.rs
+++ b/tests/ui/parser/duplicate-where-clauses.rs
diff --git a/src/test/ui/parser/duplicate-where-clauses.stderr b/tests/ui/parser/duplicate-where-clauses.stderr
index 8250d4f1e..8250d4f1e 100644
--- a/src/test/ui/parser/duplicate-where-clauses.stderr
+++ b/tests/ui/parser/duplicate-where-clauses.stderr
diff --git a/src/test/ui/parser/dyn-trait-compatibility.rs b/tests/ui/parser/dyn-trait-compatibility.rs
index d2b02cc2a..d2b02cc2a 100644
--- a/src/test/ui/parser/dyn-trait-compatibility.rs
+++ b/tests/ui/parser/dyn-trait-compatibility.rs
diff --git a/src/test/ui/parser/dyn-trait-compatibility.stderr b/tests/ui/parser/dyn-trait-compatibility.stderr
index 9218ae9d5..0cae01bd1 100644
--- a/src/test/ui/parser/dyn-trait-compatibility.stderr
+++ b/tests/ui/parser/dyn-trait-compatibility.stderr
@@ -26,17 +26,13 @@ error[E0412]: cannot find type `dyn` in this scope
   --> $DIR/dyn-trait-compatibility.rs:5:15
    |
 LL | type A2 = dyn<dyn, dyn>;
-   |        -      ^^^ not found in this scope
-   |        |
-   |        help: you might be missing a type parameter: `<dyn>`
+   |               ^^^ not found in this scope
 
 error[E0412]: cannot find type `dyn` in this scope
   --> $DIR/dyn-trait-compatibility.rs:5:20
    |
 LL | type A2 = dyn<dyn, dyn>;
-   |        -           ^^^ not found in this scope
-   |        |
-   |        help: you might be missing a type parameter: `<dyn>`
+   |                    ^^^ not found in this scope
 
 error[E0412]: cannot find type `dyn` in this scope
   --> $DIR/dyn-trait-compatibility.rs:9:11
@@ -48,9 +44,7 @@ error[E0412]: cannot find type `dyn` in this scope
   --> $DIR/dyn-trait-compatibility.rs:9:16
    |
 LL | type A3 = dyn<<dyn as dyn>::dyn>;
-   |        -       ^^^ not found in this scope
-   |        |
-   |        help: you might be missing a type parameter: `<dyn>`
+   |                ^^^ not found in this scope
 
 error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/parser/else-no-if.rs b/tests/ui/parser/else-no-if.rs
index f0b40ecde..f0b40ecde 100644
--- a/src/test/ui/parser/else-no-if.rs
+++ b/tests/ui/parser/else-no-if.rs
diff --git a/src/test/ui/parser/else-no-if.stderr b/tests/ui/parser/else-no-if.stderr
index b9c1a7527..b9c1a7527 100644
--- a/src/test/ui/parser/else-no-if.stderr
+++ b/tests/ui/parser/else-no-if.stderr
diff --git a/src/test/ui/parser/emoji-identifiers.rs b/tests/ui/parser/emoji-identifiers.rs
index b50c046bc..b50c046bc 100644
--- a/src/test/ui/parser/emoji-identifiers.rs
+++ b/tests/ui/parser/emoji-identifiers.rs
diff --git a/src/test/ui/parser/emoji-identifiers.stderr b/tests/ui/parser/emoji-identifiers.stderr
index e645b68ba..e645b68ba 100644
--- a/src/test/ui/parser/emoji-identifiers.stderr
+++ b/tests/ui/parser/emoji-identifiers.stderr
diff --git a/src/test/ui/parser/empty-impl-semicolon.rs b/tests/ui/parser/empty-impl-semicolon.rs
index 2485f5b85..2485f5b85 100644
--- a/src/test/ui/parser/empty-impl-semicolon.rs
+++ b/tests/ui/parser/empty-impl-semicolon.rs
diff --git a/src/test/ui/parser/empty-impl-semicolon.stderr b/tests/ui/parser/empty-impl-semicolon.stderr
index 6ed309eba..6ed309eba 100644
--- a/src/test/ui/parser/empty-impl-semicolon.stderr
+++ b/tests/ui/parser/empty-impl-semicolon.stderr
diff --git a/src/test/ui/parser/expr-as-stmt-2.rs b/tests/ui/parser/expr-as-stmt-2.rs
index 3a18bdc3b..3a18bdc3b 100644
--- a/src/test/ui/parser/expr-as-stmt-2.rs
+++ b/tests/ui/parser/expr-as-stmt-2.rs
diff --git a/src/test/ui/parser/expr-as-stmt-2.stderr b/tests/ui/parser/expr-as-stmt-2.stderr
index 2b6314c38..2b6314c38 100644
--- a/src/test/ui/parser/expr-as-stmt-2.stderr
+++ b/tests/ui/parser/expr-as-stmt-2.stderr
diff --git a/src/test/ui/parser/expr-as-stmt.fixed b/tests/ui/parser/expr-as-stmt.fixed
index b06f62794..b06f62794 100644
--- a/src/test/ui/parser/expr-as-stmt.fixed
+++ b/tests/ui/parser/expr-as-stmt.fixed
diff --git a/src/test/ui/parser/expr-as-stmt.rs b/tests/ui/parser/expr-as-stmt.rs
index b39d2b886..b39d2b886 100644
--- a/src/test/ui/parser/expr-as-stmt.rs
+++ b/tests/ui/parser/expr-as-stmt.rs
diff --git a/src/test/ui/parser/expr-as-stmt.stderr b/tests/ui/parser/expr-as-stmt.stderr
index 18c8b0b7c..18c8b0b7c 100644
--- a/src/test/ui/parser/expr-as-stmt.stderr
+++ b/tests/ui/parser/expr-as-stmt.stderr
diff --git a/src/test/ui/parser/extern-abi-from-mac-literal-frag.rs b/tests/ui/parser/extern-abi-from-mac-literal-frag.rs
index 8f5d7f4f7..8f5d7f4f7 100644
--- a/src/test/ui/parser/extern-abi-from-mac-literal-frag.rs
+++ b/tests/ui/parser/extern-abi-from-mac-literal-frag.rs
diff --git a/src/test/ui/parser/extern-abi-raw-strings.rs b/tests/ui/parser/extern-abi-raw-strings.rs
index fad855a21..fad855a21 100644
--- a/src/test/ui/parser/extern-abi-raw-strings.rs
+++ b/tests/ui/parser/extern-abi-raw-strings.rs
diff --git a/src/test/ui/parser/extern-abi-string-escaping.rs b/tests/ui/parser/extern-abi-string-escaping.rs
index 87bd31aab..87bd31aab 100644
--- a/src/test/ui/parser/extern-abi-string-escaping.rs
+++ b/tests/ui/parser/extern-abi-string-escaping.rs
diff --git a/src/test/ui/parser/extern-abi-syntactic.rs b/tests/ui/parser/extern-abi-syntactic.rs
index 7d2bbfe8a..7d2bbfe8a 100644
--- a/src/test/ui/parser/extern-abi-syntactic.rs
+++ b/tests/ui/parser/extern-abi-syntactic.rs
diff --git a/src/test/ui/parser/extern-crate-async.rs b/tests/ui/parser/extern-crate-async.rs
index 6a54ac7f4..6a54ac7f4 100644
--- a/src/test/ui/parser/extern-crate-async.rs
+++ b/tests/ui/parser/extern-crate-async.rs
diff --git a/src/test/ui/parser/extern-crate-unexpected-token.rs b/tests/ui/parser/extern-crate-unexpected-token.rs
index 7687f5e64..7687f5e64 100644
--- a/src/test/ui/parser/extern-crate-unexpected-token.rs
+++ b/tests/ui/parser/extern-crate-unexpected-token.rs
diff --git a/src/test/ui/parser/extern-crate-unexpected-token.stderr b/tests/ui/parser/extern-crate-unexpected-token.stderr
index e9d287ac0..e9d287ac0 100644
--- a/src/test/ui/parser/extern-crate-unexpected-token.stderr
+++ b/tests/ui/parser/extern-crate-unexpected-token.stderr
diff --git a/src/test/ui/parser/extern-expected-fn-or-brace.rs b/tests/ui/parser/extern-expected-fn-or-brace.rs
index 1dcea1744..1dcea1744 100644
--- a/src/test/ui/parser/extern-expected-fn-or-brace.rs
+++ b/tests/ui/parser/extern-expected-fn-or-brace.rs
diff --git a/src/test/ui/parser/extern-expected-fn-or-brace.stderr b/tests/ui/parser/extern-expected-fn-or-brace.stderr
index 258a2c268..258a2c268 100644
--- a/src/test/ui/parser/extern-expected-fn-or-brace.stderr
+++ b/tests/ui/parser/extern-expected-fn-or-brace.stderr
diff --git a/src/test/ui/parser/extern-foreign-crate.rs b/tests/ui/parser/extern-foreign-crate.rs
index a5da77dc7..a5da77dc7 100644
--- a/src/test/ui/parser/extern-foreign-crate.rs
+++ b/tests/ui/parser/extern-foreign-crate.rs
diff --git a/src/test/ui/parser/extern-foreign-crate.stderr b/tests/ui/parser/extern-foreign-crate.stderr
index eb75c0fc9..eb75c0fc9 100644
--- a/src/test/ui/parser/extern-foreign-crate.stderr
+++ b/tests/ui/parser/extern-foreign-crate.stderr
diff --git a/src/test/ui/parser/extern-no-fn.rs b/tests/ui/parser/extern-no-fn.rs
index 73568609c..73568609c 100644
--- a/src/test/ui/parser/extern-no-fn.rs
+++ b/tests/ui/parser/extern-no-fn.rs
diff --git a/src/test/ui/parser/extern-no-fn.stderr b/tests/ui/parser/extern-no-fn.stderr
index d9183d564..d9183d564 100644
--- a/src/test/ui/parser/extern-no-fn.stderr
+++ b/tests/ui/parser/extern-no-fn.stderr
diff --git a/src/test/ui/parser/float-field-interpolated.rs b/tests/ui/parser/float-field-interpolated.rs
index a30532035..a30532035 100644
--- a/src/test/ui/parser/float-field-interpolated.rs
+++ b/tests/ui/parser/float-field-interpolated.rs
diff --git a/src/test/ui/parser/float-field-interpolated.stderr b/tests/ui/parser/float-field-interpolated.stderr
index 664adb358..664adb358 100644
--- a/src/test/ui/parser/float-field-interpolated.stderr
+++ b/tests/ui/parser/float-field-interpolated.stderr
diff --git a/src/test/ui/parser/float-field.rs b/tests/ui/parser/float-field.rs
index eaa7465dc..eaa7465dc 100644
--- a/src/test/ui/parser/float-field.rs
+++ b/tests/ui/parser/float-field.rs
diff --git a/src/test/ui/parser/float-field.stderr b/tests/ui/parser/float-field.stderr
index 7090efc50..7090efc50 100644
--- a/src/test/ui/parser/float-field.stderr
+++ b/tests/ui/parser/float-field.stderr
diff --git a/src/test/ui/parser/float-literals.rs b/tests/ui/parser/float-literals.rs
index 1e9319fd2..1e9319fd2 100644
--- a/src/test/ui/parser/float-literals.rs
+++ b/tests/ui/parser/float-literals.rs
diff --git a/src/test/ui/parser/fn-arg-doc-comment.rs b/tests/ui/parser/fn-arg-doc-comment.rs
index 21d753ad0..21d753ad0 100644
--- a/src/test/ui/parser/fn-arg-doc-comment.rs
+++ b/tests/ui/parser/fn-arg-doc-comment.rs
diff --git a/src/test/ui/parser/fn-arg-doc-comment.stderr b/tests/ui/parser/fn-arg-doc-comment.stderr
index c8d7e2efe..c8d7e2efe 100644
--- a/src/test/ui/parser/fn-arg-doc-comment.stderr
+++ b/tests/ui/parser/fn-arg-doc-comment.stderr
diff --git a/src/test/ui/parser/fn-body-eq-expr-semi.rs b/tests/ui/parser/fn-body-eq-expr-semi.rs
index 7127ba8da..7127ba8da 100644
--- a/src/test/ui/parser/fn-body-eq-expr-semi.rs
+++ b/tests/ui/parser/fn-body-eq-expr-semi.rs
diff --git a/src/test/ui/parser/fn-body-eq-expr-semi.stderr b/tests/ui/parser/fn-body-eq-expr-semi.stderr
index f1255d864..f1255d864 100644
--- a/src/test/ui/parser/fn-body-eq-expr-semi.stderr
+++ b/tests/ui/parser/fn-body-eq-expr-semi.stderr
diff --git a/src/test/ui/parser/fn-body-optional-semantic-fail.rs b/tests/ui/parser/fn-body-optional-semantic-fail.rs
index 12df48880..12df48880 100644
--- a/src/test/ui/parser/fn-body-optional-semantic-fail.rs
+++ b/tests/ui/parser/fn-body-optional-semantic-fail.rs
diff --git a/src/test/ui/parser/fn-body-optional-semantic-fail.stderr b/tests/ui/parser/fn-body-optional-semantic-fail.stderr
index 14bcd7c16..14bcd7c16 100644
--- a/src/test/ui/parser/fn-body-optional-semantic-fail.stderr
+++ b/tests/ui/parser/fn-body-optional-semantic-fail.stderr
diff --git a/src/test/ui/parser/fn-body-optional-syntactic-pass.rs b/tests/ui/parser/fn-body-optional-syntactic-pass.rs
index f9dbebf0b..f9dbebf0b 100644
--- a/src/test/ui/parser/fn-body-optional-syntactic-pass.rs
+++ b/tests/ui/parser/fn-body-optional-syntactic-pass.rs
diff --git a/src/test/ui/parser/fn-colon-return-type.rs b/tests/ui/parser/fn-colon-return-type.rs
index 0001ef57c..0001ef57c 100644
--- a/src/test/ui/parser/fn-colon-return-type.rs
+++ b/tests/ui/parser/fn-colon-return-type.rs
diff --git a/src/test/ui/parser/fn-colon-return-type.stderr b/tests/ui/parser/fn-colon-return-type.stderr
index 1de918782..1de918782 100644
--- a/src/test/ui/parser/fn-colon-return-type.stderr
+++ b/tests/ui/parser/fn-colon-return-type.stderr
diff --git a/src/test/ui/parser/fn-defined-using-def.rs b/tests/ui/parser/fn-defined-using-def.rs
index 21da34c47..21da34c47 100644
--- a/src/test/ui/parser/fn-defined-using-def.rs
+++ b/tests/ui/parser/fn-defined-using-def.rs
diff --git a/src/test/ui/parser/fn-defined-using-def.stderr b/tests/ui/parser/fn-defined-using-def.stderr
index f34329012..f34329012 100644
--- a/src/test/ui/parser/fn-defined-using-def.stderr
+++ b/tests/ui/parser/fn-defined-using-def.stderr
diff --git a/src/test/ui/parser/fn-defined-using-fun.rs b/tests/ui/parser/fn-defined-using-fun.rs
index 4f7460504..4f7460504 100644
--- a/src/test/ui/parser/fn-defined-using-fun.rs
+++ b/tests/ui/parser/fn-defined-using-fun.rs
diff --git a/src/test/ui/parser/fn-defined-using-fun.stderr b/tests/ui/parser/fn-defined-using-fun.stderr
index 2f6cfff35..2f6cfff35 100644
--- a/src/test/ui/parser/fn-defined-using-fun.stderr
+++ b/tests/ui/parser/fn-defined-using-fun.stderr
diff --git a/src/test/ui/parser/fn-defined-using-func.rs b/tests/ui/parser/fn-defined-using-func.rs
index 2dce96fdc..2dce96fdc 100644
--- a/src/test/ui/parser/fn-defined-using-func.rs
+++ b/tests/ui/parser/fn-defined-using-func.rs
diff --git a/src/test/ui/parser/fn-defined-using-func.stderr b/tests/ui/parser/fn-defined-using-func.stderr
index 355741e89..355741e89 100644
--- a/src/test/ui/parser/fn-defined-using-func.stderr
+++ b/tests/ui/parser/fn-defined-using-func.stderr
diff --git a/src/test/ui/parser/fn-defined-using-function.rs b/tests/ui/parser/fn-defined-using-function.rs
index fd8782728..fd8782728 100644
--- a/src/test/ui/parser/fn-defined-using-function.rs
+++ b/tests/ui/parser/fn-defined-using-function.rs
diff --git a/src/test/ui/parser/fn-defined-using-function.stderr b/tests/ui/parser/fn-defined-using-function.stderr
index 43c33a2cd..43c33a2cd 100644
--- a/src/test/ui/parser/fn-defined-using-function.stderr
+++ b/tests/ui/parser/fn-defined-using-function.stderr
diff --git a/src/test/ui/parser/fn-field-parse-error-ice.rs b/tests/ui/parser/fn-field-parse-error-ice.rs
index 188257ea5..188257ea5 100644
--- a/src/test/ui/parser/fn-field-parse-error-ice.rs
+++ b/tests/ui/parser/fn-field-parse-error-ice.rs
diff --git a/src/test/ui/parser/fn-field-parse-error-ice.stderr b/tests/ui/parser/fn-field-parse-error-ice.stderr
index 3bf68e8cc..3bf68e8cc 100644
--- a/src/test/ui/parser/fn-field-parse-error-ice.stderr
+++ b/tests/ui/parser/fn-field-parse-error-ice.stderr
diff --git a/src/test/ui/parser/fn-header-semantic-fail.rs b/tests/ui/parser/fn-header-semantic-fail.rs
index cf5d3dab4..cf5d3dab4 100644
--- a/src/test/ui/parser/fn-header-semantic-fail.rs
+++ b/tests/ui/parser/fn-header-semantic-fail.rs
diff --git a/src/test/ui/parser/fn-header-semantic-fail.stderr b/tests/ui/parser/fn-header-semantic-fail.stderr
index 038fdfb2d..038fdfb2d 100644
--- a/src/test/ui/parser/fn-header-semantic-fail.stderr
+++ b/tests/ui/parser/fn-header-semantic-fail.stderr
diff --git a/src/test/ui/parser/fn-header-syntactic-pass.rs b/tests/ui/parser/fn-header-syntactic-pass.rs
index 68f1f7901..68f1f7901 100644
--- a/src/test/ui/parser/fn-header-syntactic-pass.rs
+++ b/tests/ui/parser/fn-header-syntactic-pass.rs
diff --git a/src/test/ui/parser/fn-returns-fn-pointer.rs b/tests/ui/parser/fn-returns-fn-pointer.rs
index 15590e324..15590e324 100644
--- a/src/test/ui/parser/fn-returns-fn-pointer.rs
+++ b/tests/ui/parser/fn-returns-fn-pointer.rs
diff --git a/src/test/ui/parser/foreign-const-semantic-fail.rs b/tests/ui/parser/foreign-const-semantic-fail.rs
index c9940b74a..c9940b74a 100644
--- a/src/test/ui/parser/foreign-const-semantic-fail.rs
+++ b/tests/ui/parser/foreign-const-semantic-fail.rs
diff --git a/src/test/ui/parser/foreign-const-semantic-fail.stderr b/tests/ui/parser/foreign-const-semantic-fail.stderr
index 8dc66c0d0..8dc66c0d0 100644
--- a/src/test/ui/parser/foreign-const-semantic-fail.stderr
+++ b/tests/ui/parser/foreign-const-semantic-fail.stderr
diff --git a/src/test/ui/parser/foreign-const-syntactic-fail.rs b/tests/ui/parser/foreign-const-syntactic-fail.rs
index a6e77f846..a6e77f846 100644
--- a/src/test/ui/parser/foreign-const-syntactic-fail.rs
+++ b/tests/ui/parser/foreign-const-syntactic-fail.rs
diff --git a/src/test/ui/parser/foreign-const-syntactic-fail.stderr b/tests/ui/parser/foreign-const-syntactic-fail.stderr
index 9cf58fa95..9cf58fa95 100644
--- a/src/test/ui/parser/foreign-const-syntactic-fail.stderr
+++ b/tests/ui/parser/foreign-const-syntactic-fail.stderr
diff --git a/src/test/ui/parser/foreign-static-semantic-fail.rs b/tests/ui/parser/foreign-static-semantic-fail.rs
index 3d427ed0e..3d427ed0e 100644
--- a/src/test/ui/parser/foreign-static-semantic-fail.rs
+++ b/tests/ui/parser/foreign-static-semantic-fail.rs
diff --git a/src/test/ui/parser/foreign-static-semantic-fail.stderr b/tests/ui/parser/foreign-static-semantic-fail.stderr
index 105508cfe..105508cfe 100644
--- a/src/test/ui/parser/foreign-static-semantic-fail.stderr
+++ b/tests/ui/parser/foreign-static-semantic-fail.stderr
diff --git a/src/test/ui/parser/foreign-static-syntactic-pass.rs b/tests/ui/parser/foreign-static-syntactic-pass.rs
index 599496346..599496346 100644
--- a/src/test/ui/parser/foreign-static-syntactic-pass.rs
+++ b/tests/ui/parser/foreign-static-syntactic-pass.rs
diff --git a/src/test/ui/parser/foreign-ty-semantic-fail.rs b/tests/ui/parser/foreign-ty-semantic-fail.rs
index 96b15232b..96b15232b 100644
--- a/src/test/ui/parser/foreign-ty-semantic-fail.rs
+++ b/tests/ui/parser/foreign-ty-semantic-fail.rs
diff --git a/src/test/ui/parser/foreign-ty-semantic-fail.stderr b/tests/ui/parser/foreign-ty-semantic-fail.stderr
index 588e4966a..588e4966a 100644
--- a/src/test/ui/parser/foreign-ty-semantic-fail.stderr
+++ b/tests/ui/parser/foreign-ty-semantic-fail.stderr
diff --git a/src/test/ui/parser/foreign-ty-syntactic-pass.rs b/tests/ui/parser/foreign-ty-syntactic-pass.rs
index a746de1f1..a746de1f1 100644
--- a/src/test/ui/parser/foreign-ty-syntactic-pass.rs
+++ b/tests/ui/parser/foreign-ty-syntactic-pass.rs
diff --git a/src/test/ui/parser/if-block-unreachable-expr.rs b/tests/ui/parser/if-block-unreachable-expr.rs
index 4063a3370..4063a3370 100644
--- a/src/test/ui/parser/if-block-unreachable-expr.rs
+++ b/tests/ui/parser/if-block-unreachable-expr.rs
diff --git a/src/test/ui/parser/if-in-in.fixed b/tests/ui/parser/if-in-in.fixed
index 0bb88c559..0bb88c559 100644
--- a/src/test/ui/parser/if-in-in.fixed
+++ b/tests/ui/parser/if-in-in.fixed
diff --git a/src/test/ui/parser/if-in-in.rs b/tests/ui/parser/if-in-in.rs
index 6c0986fe1..6c0986fe1 100644
--- a/src/test/ui/parser/if-in-in.rs
+++ b/tests/ui/parser/if-in-in.rs
diff --git a/src/test/ui/parser/if-in-in.stderr b/tests/ui/parser/if-in-in.stderr
index 0e69bc4b2..0e69bc4b2 100644
--- a/src/test/ui/parser/if-in-in.stderr
+++ b/tests/ui/parser/if-in-in.stderr
diff --git a/src/test/ui/parser/impl-item-const-pass.rs b/tests/ui/parser/impl-item-const-pass.rs
index d11245613..d11245613 100644
--- a/src/test/ui/parser/impl-item-const-pass.rs
+++ b/tests/ui/parser/impl-item-const-pass.rs
diff --git a/src/test/ui/parser/impl-item-const-semantic-fail.rs b/tests/ui/parser/impl-item-const-semantic-fail.rs
index 5d4692f9f..5d4692f9f 100644
--- a/src/test/ui/parser/impl-item-const-semantic-fail.rs
+++ b/tests/ui/parser/impl-item-const-semantic-fail.rs
diff --git a/src/test/ui/parser/impl-item-const-semantic-fail.stderr b/tests/ui/parser/impl-item-const-semantic-fail.stderr
index ec3bee0ce..ec3bee0ce 100644
--- a/src/test/ui/parser/impl-item-const-semantic-fail.stderr
+++ b/tests/ui/parser/impl-item-const-semantic-fail.stderr
diff --git a/src/test/ui/parser/impl-item-fn-no-body-pass.rs b/tests/ui/parser/impl-item-fn-no-body-pass.rs
index 16b09d64e..16b09d64e 100644
--- a/src/test/ui/parser/impl-item-fn-no-body-pass.rs
+++ b/tests/ui/parser/impl-item-fn-no-body-pass.rs
diff --git a/src/test/ui/parser/impl-item-fn-no-body-semantic-fail.rs b/tests/ui/parser/impl-item-fn-no-body-semantic-fail.rs
index cb183db59..cb183db59 100644
--- a/src/test/ui/parser/impl-item-fn-no-body-semantic-fail.rs
+++ b/tests/ui/parser/impl-item-fn-no-body-semantic-fail.rs
diff --git a/src/test/ui/parser/impl-item-fn-no-body-semantic-fail.stderr b/tests/ui/parser/impl-item-fn-no-body-semantic-fail.stderr
index 1acb72736..1acb72736 100644
--- a/src/test/ui/parser/impl-item-fn-no-body-semantic-fail.stderr
+++ b/tests/ui/parser/impl-item-fn-no-body-semantic-fail.stderr
diff --git a/src/test/ui/parser/impl-item-type-no-body-pass.rs b/tests/ui/parser/impl-item-type-no-body-pass.rs
index 74a9c6ab7..74a9c6ab7 100644
--- a/src/test/ui/parser/impl-item-type-no-body-pass.rs
+++ b/tests/ui/parser/impl-item-type-no-body-pass.rs
diff --git a/src/test/ui/parser/impl-item-type-no-body-semantic-fail.rs b/tests/ui/parser/impl-item-type-no-body-semantic-fail.rs
index 1291a021b..1291a021b 100644
--- a/src/test/ui/parser/impl-item-type-no-body-semantic-fail.rs
+++ b/tests/ui/parser/impl-item-type-no-body-semantic-fail.rs
diff --git a/src/test/ui/parser/impl-item-type-no-body-semantic-fail.stderr b/tests/ui/parser/impl-item-type-no-body-semantic-fail.stderr
index 3856754e0..3856754e0 100644
--- a/src/test/ui/parser/impl-item-type-no-body-semantic-fail.stderr
+++ b/tests/ui/parser/impl-item-type-no-body-semantic-fail.stderr
diff --git a/src/test/ui/parser/impl-parsing.rs b/tests/ui/parser/impl-parsing.rs
index 80ce88855..80ce88855 100644
--- a/src/test/ui/parser/impl-parsing.rs
+++ b/tests/ui/parser/impl-parsing.rs
diff --git a/src/test/ui/parser/impl-parsing.stderr b/tests/ui/parser/impl-parsing.stderr
index 755addf14..755addf14 100644
--- a/src/test/ui/parser/impl-parsing.stderr
+++ b/tests/ui/parser/impl-parsing.stderr
diff --git a/src/test/ui/parser/impl-qpath.rs b/tests/ui/parser/impl-qpath.rs
index d1f0a0204..d1f0a0204 100644
--- a/src/test/ui/parser/impl-qpath.rs
+++ b/tests/ui/parser/impl-qpath.rs
diff --git a/src/test/ui/parser/import-from-path.rs b/tests/ui/parser/import-from-path.rs
index 3fce08259..3fce08259 100644
--- a/src/test/ui/parser/import-from-path.rs
+++ b/tests/ui/parser/import-from-path.rs
diff --git a/src/test/ui/parser/import-from-path.stderr b/tests/ui/parser/import-from-path.stderr
index 93bdf82d0..93bdf82d0 100644
--- a/src/test/ui/parser/import-from-path.stderr
+++ b/tests/ui/parser/import-from-path.stderr
diff --git a/src/test/ui/parser/import-from-rename.rs b/tests/ui/parser/import-from-rename.rs
index 27425a3c9..27425a3c9 100644
--- a/src/test/ui/parser/import-from-rename.rs
+++ b/tests/ui/parser/import-from-rename.rs
diff --git a/src/test/ui/parser/import-from-rename.stderr b/tests/ui/parser/import-from-rename.stderr
index d78f6de92..d78f6de92 100644
--- a/src/test/ui/parser/import-from-rename.stderr
+++ b/tests/ui/parser/import-from-rename.stderr
diff --git a/src/test/ui/parser/import-glob-path.rs b/tests/ui/parser/import-glob-path.rs
index de4c07aa7..de4c07aa7 100644
--- a/src/test/ui/parser/import-glob-path.rs
+++ b/tests/ui/parser/import-glob-path.rs
diff --git a/src/test/ui/parser/import-glob-path.stderr b/tests/ui/parser/import-glob-path.stderr
index a93ef255c..a93ef255c 100644
--- a/src/test/ui/parser/import-glob-path.stderr
+++ b/tests/ui/parser/import-glob-path.stderr
diff --git a/src/test/ui/parser/import-glob-rename.rs b/tests/ui/parser/import-glob-rename.rs
index b9b753dcd..b9b753dcd 100644
--- a/src/test/ui/parser/import-glob-rename.rs
+++ b/tests/ui/parser/import-glob-rename.rs
diff --git a/src/test/ui/parser/import-glob-rename.stderr b/tests/ui/parser/import-glob-rename.stderr
index e1a026b63..e1a026b63 100644
--- a/src/test/ui/parser/import-glob-rename.stderr
+++ b/tests/ui/parser/import-glob-rename.stderr
diff --git a/tests/ui/parser/increment-autofix-2.fixed b/tests/ui/parser/increment-autofix-2.fixed
new file mode 100644
index 000000000..580ebaf5d
--- /dev/null
+++ b/tests/ui/parser/increment-autofix-2.fixed
@@ -0,0 +1,63 @@
+// run-rustfix
+
+struct Foo {
+    bar: Bar,
+}
+
+struct Bar {
+    qux: i32,
+}
+
+pub fn post_regular() {
+    let mut i = 0;
+    i += 1; //~ ERROR Rust has no postfix increment operator
+    println!("{}", i);
+}
+
+pub fn post_while() {
+    let mut i = 0;
+    while { let tmp = i; i += 1; tmp } < 5 {
+        //~^ ERROR Rust has no postfix increment operator
+        println!("{}", i);
+    }
+}
+
+pub fn post_regular_tmp() {
+    let mut tmp = 0;
+    tmp += 1; //~ ERROR Rust has no postfix increment operator
+    println!("{}", tmp);
+}
+
+pub fn post_while_tmp() {
+    let mut tmp = 0;
+    while { let tmp_ = tmp; tmp += 1; tmp_ } < 5 {
+        //~^ ERROR Rust has no postfix increment operator
+        println!("{}", tmp);
+    }
+}
+
+pub fn post_field() {
+    let mut foo = Foo { bar: Bar { qux: 0 } };
+    foo.bar.qux += 1;
+    //~^ ERROR Rust has no postfix increment operator
+    println!("{}", foo.bar.qux);
+}
+
+pub fn post_field_tmp() {
+    struct S {
+        tmp: i32
+    }
+    let mut s = S { tmp: 0 };
+    s.tmp += 1;
+    //~^ ERROR Rust has no postfix increment operator
+    println!("{}", s.tmp);
+}
+
+pub fn pre_field() {
+    let mut foo = Foo { bar: Bar { qux: 0 } };
+    foo.bar.qux += 1;
+    //~^ ERROR Rust has no prefix increment operator
+    println!("{}", foo.bar.qux);
+}
+
+fn main() {}
diff --git a/tests/ui/parser/increment-autofix-2.rs b/tests/ui/parser/increment-autofix-2.rs
new file mode 100644
index 000000000..ebe5fa6ca
--- /dev/null
+++ b/tests/ui/parser/increment-autofix-2.rs
@@ -0,0 +1,63 @@
+// run-rustfix
+
+struct Foo {
+    bar: Bar,
+}
+
+struct Bar {
+    qux: i32,
+}
+
+pub fn post_regular() {
+    let mut i = 0;
+    i++; //~ ERROR Rust has no postfix increment operator
+    println!("{}", i);
+}
+
+pub fn post_while() {
+    let mut i = 0;
+    while i++ < 5 {
+        //~^ ERROR Rust has no postfix increment operator
+        println!("{}", i);
+    }
+}
+
+pub fn post_regular_tmp() {
+    let mut tmp = 0;
+    tmp++; //~ ERROR Rust has no postfix increment operator
+    println!("{}", tmp);
+}
+
+pub fn post_while_tmp() {
+    let mut tmp = 0;
+    while tmp++ < 5 {
+        //~^ ERROR Rust has no postfix increment operator
+        println!("{}", tmp);
+    }
+}
+
+pub fn post_field() {
+    let mut foo = Foo { bar: Bar { qux: 0 } };
+    foo.bar.qux++;
+    //~^ ERROR Rust has no postfix increment operator
+    println!("{}", foo.bar.qux);
+}
+
+pub fn post_field_tmp() {
+    struct S {
+        tmp: i32
+    }
+    let mut s = S { tmp: 0 };
+    s.tmp++;
+    //~^ ERROR Rust has no postfix increment operator
+    println!("{}", s.tmp);
+}
+
+pub fn pre_field() {
+    let mut foo = Foo { bar: Bar { qux: 0 } };
+    ++foo.bar.qux;
+    //~^ ERROR Rust has no prefix increment operator
+    println!("{}", foo.bar.qux);
+}
+
+fn main() {}
diff --git a/tests/ui/parser/increment-autofix-2.stderr b/tests/ui/parser/increment-autofix-2.stderr
new file mode 100644
index 000000000..11e985480
--- /dev/null
+++ b/tests/ui/parser/increment-autofix-2.stderr
@@ -0,0 +1,84 @@
+error: Rust has no postfix increment operator
+  --> $DIR/increment-autofix-2.rs:13:6
+   |
+LL |     i++;
+   |      ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     i += 1;
+   |       ~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/increment-autofix-2.rs:19:12
+   |
+LL |     while i++ < 5 {
+   |     -----  ^^ not a valid postfix operator
+   |     |
+   |     while parsing the condition of this `while` expression
+   |
+help: use `+= 1` instead
+   |
+LL |     while { let tmp = i; i += 1; tmp } < 5 {
+   |           +++++++++++  ~~~~~~~~~~~~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/increment-autofix-2.rs:27:8
+   |
+LL |     tmp++;
+   |        ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     tmp += 1;
+   |         ~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/increment-autofix-2.rs:33:14
+   |
+LL |     while tmp++ < 5 {
+   |     -----    ^^ not a valid postfix operator
+   |     |
+   |     while parsing the condition of this `while` expression
+   |
+help: use `+= 1` instead
+   |
+LL |     while { let tmp_ = tmp; tmp += 1; tmp_ } < 5 {
+   |           ++++++++++++    ~~~~~~~~~~~~~~~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/increment-autofix-2.rs:41:16
+   |
+LL |     foo.bar.qux++;
+   |                ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     foo.bar.qux += 1;
+   |                 ~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/increment-autofix-2.rs:51:10
+   |
+LL |     s.tmp++;
+   |          ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     s.tmp += 1;
+   |           ~~~~
+
+error: Rust has no prefix increment operator
+  --> $DIR/increment-autofix-2.rs:58:5
+   |
+LL |     ++foo.bar.qux;
+   |     ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL -     ++foo.bar.qux;
+LL +     foo.bar.qux += 1;
+   |
+
+error: aborting due to 7 previous errors
+
diff --git a/src/test/ui/parser/increment-autofix.fixed b/tests/ui/parser/increment-autofix.fixed
index 7a426badf..7a426badf 100644
--- a/src/test/ui/parser/increment-autofix.fixed
+++ b/tests/ui/parser/increment-autofix.fixed
diff --git a/src/test/ui/parser/increment-autofix.rs b/tests/ui/parser/increment-autofix.rs
index d38603697..d38603697 100644
--- a/src/test/ui/parser/increment-autofix.rs
+++ b/tests/ui/parser/increment-autofix.rs
diff --git a/src/test/ui/parser/increment-autofix.stderr b/tests/ui/parser/increment-autofix.stderr
index 1dc69fd9f..1dc69fd9f 100644
--- a/src/test/ui/parser/increment-autofix.stderr
+++ b/tests/ui/parser/increment-autofix.stderr
diff --git a/src/test/ui/parser/inner-attr-after-doc-comment.rs b/tests/ui/parser/inner-attr-after-doc-comment.rs
index 36f4191f0..36f4191f0 100644
--- a/src/test/ui/parser/inner-attr-after-doc-comment.rs
+++ b/tests/ui/parser/inner-attr-after-doc-comment.rs
diff --git a/src/test/ui/parser/inner-attr-after-doc-comment.stderr b/tests/ui/parser/inner-attr-after-doc-comment.stderr
index 3ec3ad8e9..3ec3ad8e9 100644
--- a/src/test/ui/parser/inner-attr-after-doc-comment.stderr
+++ b/tests/ui/parser/inner-attr-after-doc-comment.stderr
diff --git a/src/test/ui/parser/inner-attr-in-trait-def.rs b/tests/ui/parser/inner-attr-in-trait-def.rs
index 8dba6b362..8dba6b362 100644
--- a/src/test/ui/parser/inner-attr-in-trait-def.rs
+++ b/tests/ui/parser/inner-attr-in-trait-def.rs
diff --git a/src/test/ui/parser/inner-attr.rs b/tests/ui/parser/inner-attr.rs
index 1b405e20e..1b405e20e 100644
--- a/src/test/ui/parser/inner-attr.rs
+++ b/tests/ui/parser/inner-attr.rs
diff --git a/src/test/ui/parser/inner-attr.stderr b/tests/ui/parser/inner-attr.stderr
index 331c254a5..331c254a5 100644
--- a/src/test/ui/parser/inner-attr.stderr
+++ b/tests/ui/parser/inner-attr.stderr
diff --git a/src/test/ui/parser/int-literal-too-large-span.rs b/tests/ui/parser/int-literal-too-large-span.rs
index 666ca9350..666ca9350 100644
--- a/src/test/ui/parser/int-literal-too-large-span.rs
+++ b/tests/ui/parser/int-literal-too-large-span.rs
diff --git a/src/test/ui/parser/int-literal-too-large-span.stderr b/tests/ui/parser/int-literal-too-large-span.stderr
index 7cae85fc9..49d6aa5ef 100644
--- a/src/test/ui/parser/int-literal-too-large-span.stderr
+++ b/tests/ui/parser/int-literal-too-large-span.stderr
@@ -3,6 +3,8 @@ error: integer literal is too large
    |
 LL |     9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `340282366920938463463374607431768211455`
 
 error: aborting due to previous error
 
diff --git a/tests/ui/parser/intersection-patterns-1.fixed b/tests/ui/parser/intersection-patterns-1.fixed
new file mode 100644
index 000000000..44773095b
--- /dev/null
+++ b/tests/ui/parser/intersection-patterns-1.fixed
@@ -0,0 +1,35 @@
+// This tests the parser recovery in `recover_intersection_pat`
+// and serves as a regression test for the diagnostics issue #65400.
+//
+// The general idea is that for `$pat_lhs @ $pat_rhs` where
+// `$pat_lhs` is not generated by `ref? mut? $ident` we want
+// to suggest either switching the order or note that intersection
+// patterns are not allowed.
+
+// run-rustfix
+
+#![allow(unused_variables)]
+
+fn main() {
+    let s: Option<u8> = None;
+
+    match s {
+        y @ Some(x) => {}
+        //~^ ERROR pattern on wrong side of `@`
+        //~| pattern on the left, should be on the right
+        //~| binding on the right, should be on the left
+        //~| HELP switch the order
+        //~| SUGGESTION y @ Some(x)
+        _ => {}
+    }
+
+    match 2 {
+        e @ 1..=5 => {}
+        //~^ ERROR pattern on wrong side of `@`
+        //~| pattern on the left, should be on the right
+        //~| binding on the right, should be on the left
+        //~| HELP switch the order
+        //~| SUGGESTION e @ 1..=5
+        _ => {}
+    }
+}
diff --git a/tests/ui/parser/intersection-patterns-1.rs b/tests/ui/parser/intersection-patterns-1.rs
new file mode 100644
index 000000000..1036b9daf
--- /dev/null
+++ b/tests/ui/parser/intersection-patterns-1.rs
@@ -0,0 +1,35 @@
+// This tests the parser recovery in `recover_intersection_pat`
+// and serves as a regression test for the diagnostics issue #65400.
+//
+// The general idea is that for `$pat_lhs @ $pat_rhs` where
+// `$pat_lhs` is not generated by `ref? mut? $ident` we want
+// to suggest either switching the order or note that intersection
+// patterns are not allowed.
+
+// run-rustfix
+
+#![allow(unused_variables)]
+
+fn main() {
+    let s: Option<u8> = None;
+
+    match s {
+        Some(x) @ y => {}
+        //~^ ERROR pattern on wrong side of `@`
+        //~| pattern on the left, should be on the right
+        //~| binding on the right, should be on the left
+        //~| HELP switch the order
+        //~| SUGGESTION y @ Some(x)
+        _ => {}
+    }
+
+    match 2 {
+        1 ..= 5 @ e => {}
+        //~^ ERROR pattern on wrong side of `@`
+        //~| pattern on the left, should be on the right
+        //~| binding on the right, should be on the left
+        //~| HELP switch the order
+        //~| SUGGESTION e @ 1..=5
+        _ => {}
+    }
+}
diff --git a/tests/ui/parser/intersection-patterns-1.stderr b/tests/ui/parser/intersection-patterns-1.stderr
new file mode 100644
index 000000000..dc968656c
--- /dev/null
+++ b/tests/ui/parser/intersection-patterns-1.stderr
@@ -0,0 +1,22 @@
+error: pattern on wrong side of `@`
+  --> $DIR/intersection-patterns-1.rs:17:9
+   |
+LL |         Some(x) @ y => {}
+   |         -------^^^-
+   |         |         |
+   |         |         binding on the right, should be on the left
+   |         pattern on the left, should be on the right
+   |         help: switch the order: `y @ Some(x)`
+
+error: pattern on wrong side of `@`
+  --> $DIR/intersection-patterns-1.rs:27:9
+   |
+LL |         1 ..= 5 @ e => {}
+   |         -------^^^-
+   |         |         |
+   |         |         binding on the right, should be on the left
+   |         pattern on the left, should be on the right
+   |         help: switch the order: `e @ 1..=5`
+
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/parser/intersection-patterns-2.rs b/tests/ui/parser/intersection-patterns-2.rs
new file mode 100644
index 000000000..408415e87
--- /dev/null
+++ b/tests/ui/parser/intersection-patterns-2.rs
@@ -0,0 +1,20 @@
+// This tests the parser recovery in `recover_intersection_pat`
+// and serves as a regression test for the diagnostics issue #65400.
+//
+// The general idea is that for `$pat_lhs @ $pat_rhs` where
+// `$pat_lhs` is not generated by `ref? mut? $ident` we want
+// to suggest either switching the order or note that intersection
+// patterns are not allowed.
+
+fn main() {
+    let s: Option<u8> = None;
+
+    match s {
+        Some(x) @ Some(y) => {}
+        //~^ ERROR left-hand side of `@` must be a binding
+        //~| interpreted as a pattern, not a binding
+        //~| also a pattern
+        //~| NOTE bindings are `x`, `mut x`, `ref x`, and `ref mut x`
+        _ => {}
+    }
+}
diff --git a/tests/ui/parser/intersection-patterns-2.stderr b/tests/ui/parser/intersection-patterns-2.stderr
new file mode 100644
index 000000000..f7e78814c
--- /dev/null
+++ b/tests/ui/parser/intersection-patterns-2.stderr
@@ -0,0 +1,13 @@
+error: left-hand side of `@` must be a binding
+  --> $DIR/intersection-patterns-2.rs:13:9
+   |
+LL |         Some(x) @ Some(y) => {}
+   |         -------^^^-------
+   |         |         |
+   |         |         also a pattern
+   |         interpreted as a pattern, not a binding
+   |
+   = note: bindings are `x`, `mut x`, `ref x`, and `ref mut x`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/parser/inverted-parameters.rs b/tests/ui/parser/inverted-parameters.rs
index 5c4272504..5c4272504 100644
--- a/src/test/ui/parser/inverted-parameters.rs
+++ b/tests/ui/parser/inverted-parameters.rs
diff --git a/src/test/ui/parser/inverted-parameters.stderr b/tests/ui/parser/inverted-parameters.stderr
index 866227782..866227782 100644
--- a/src/test/ui/parser/inverted-parameters.stderr
+++ b/tests/ui/parser/inverted-parameters.stderr
diff --git a/src/test/ui/parser/issue-100197-mut-let.fixed b/tests/ui/parser/issue-100197-mut-let.fixed
index 5a8956222..5a8956222 100644
--- a/src/test/ui/parser/issue-100197-mut-let.fixed
+++ b/tests/ui/parser/issue-100197-mut-let.fixed
diff --git a/src/test/ui/parser/issue-100197-mut-let.rs b/tests/ui/parser/issue-100197-mut-let.rs
index 71103813a..71103813a 100644
--- a/src/test/ui/parser/issue-100197-mut-let.rs
+++ b/tests/ui/parser/issue-100197-mut-let.rs
diff --git a/src/test/ui/parser/issue-100197-mut-let.stderr b/tests/ui/parser/issue-100197-mut-let.stderr
index 86658e4f3..86658e4f3 100644
--- a/src/test/ui/parser/issue-100197-mut-let.stderr
+++ b/tests/ui/parser/issue-100197-mut-let.stderr
diff --git a/src/test/ui/parser/issue-101477-enum.fixed b/tests/ui/parser/issue-101477-enum.fixed
index 1dfeae22a..1dfeae22a 100644
--- a/src/test/ui/parser/issue-101477-enum.fixed
+++ b/tests/ui/parser/issue-101477-enum.fixed
diff --git a/src/test/ui/parser/issue-101477-enum.rs b/tests/ui/parser/issue-101477-enum.rs
index ea7051d69..ea7051d69 100644
--- a/src/test/ui/parser/issue-101477-enum.rs
+++ b/tests/ui/parser/issue-101477-enum.rs
diff --git a/src/test/ui/parser/issue-101477-enum.stderr b/tests/ui/parser/issue-101477-enum.stderr
index 1edca391e..1edca391e 100644
--- a/src/test/ui/parser/issue-101477-enum.stderr
+++ b/tests/ui/parser/issue-101477-enum.stderr
diff --git a/src/test/ui/parser/issue-101477-let.fixed b/tests/ui/parser/issue-101477-let.fixed
index 9989ad815..9989ad815 100644
--- a/src/test/ui/parser/issue-101477-let.fixed
+++ b/tests/ui/parser/issue-101477-let.fixed
diff --git a/src/test/ui/parser/issue-101477-let.rs b/tests/ui/parser/issue-101477-let.rs
index 8b0e8bee1..8b0e8bee1 100644
--- a/src/test/ui/parser/issue-101477-let.rs
+++ b/tests/ui/parser/issue-101477-let.rs
diff --git a/src/test/ui/parser/issue-101477-let.stderr b/tests/ui/parser/issue-101477-let.stderr
index 1b30d4b17..1b30d4b17 100644
--- a/src/test/ui/parser/issue-101477-let.stderr
+++ b/tests/ui/parser/issue-101477-let.stderr
diff --git a/src/test/ui/parser/issue-102806.rs b/tests/ui/parser/issue-102806.rs
index ba297bdc9..ba297bdc9 100644
--- a/src/test/ui/parser/issue-102806.rs
+++ b/tests/ui/parser/issue-102806.rs
diff --git a/src/test/ui/parser/issue-102806.stderr b/tests/ui/parser/issue-102806.stderr
index 6872b8bc0..6872b8bc0 100644
--- a/src/test/ui/parser/issue-102806.stderr
+++ b/tests/ui/parser/issue-102806.stderr
diff --git a/src/test/ui/parser/issue-103143.rs b/tests/ui/parser/issue-103143.rs
index a584274c4..a584274c4 100644
--- a/src/test/ui/parser/issue-103143.rs
+++ b/tests/ui/parser/issue-103143.rs
diff --git a/src/test/ui/parser/issue-103143.stderr b/tests/ui/parser/issue-103143.stderr
index 4035c69af..4035c69af 100644
--- a/src/test/ui/parser/issue-103143.stderr
+++ b/tests/ui/parser/issue-103143.stderr
diff --git a/src/test/ui/parser/issue-103381.fixed b/tests/ui/parser/issue-103381.fixed
index 6a9fb9910..6a9fb9910 100644
--- a/src/test/ui/parser/issue-103381.fixed
+++ b/tests/ui/parser/issue-103381.fixed
diff --git a/src/test/ui/parser/issue-103381.rs b/tests/ui/parser/issue-103381.rs
index bf79e1010..bf79e1010 100644
--- a/src/test/ui/parser/issue-103381.rs
+++ b/tests/ui/parser/issue-103381.rs
diff --git a/src/test/ui/parser/issue-103381.stderr b/tests/ui/parser/issue-103381.stderr
index 85fcc18e7..85fcc18e7 100644
--- a/src/test/ui/parser/issue-103381.stderr
+++ b/tests/ui/parser/issue-103381.stderr
diff --git a/src/test/ui/parser/issue-103425.rs b/tests/ui/parser/issue-103425.rs
index c2f8123ca..c2f8123ca 100644
--- a/src/test/ui/parser/issue-103425.rs
+++ b/tests/ui/parser/issue-103425.rs
diff --git a/src/test/ui/parser/issue-103425.stderr b/tests/ui/parser/issue-103425.stderr
index 0efe3e3ca..0efe3e3ca 100644
--- a/src/test/ui/parser/issue-103425.stderr
+++ b/tests/ui/parser/issue-103425.stderr
diff --git a/src/test/ui/parser/issue-103451.rs b/tests/ui/parser/issue-103451.rs
index 1fdb00148..1fdb00148 100644
--- a/src/test/ui/parser/issue-103451.rs
+++ b/tests/ui/parser/issue-103451.rs
diff --git a/src/test/ui/parser/issue-103451.stderr b/tests/ui/parser/issue-103451.stderr
index eb3c92fb4..eb3c92fb4 100644
--- a/src/test/ui/parser/issue-103451.stderr
+++ b/tests/ui/parser/issue-103451.stderr
diff --git a/src/test/ui/parser/issue-103748-ICE-wrong-braces.rs b/tests/ui/parser/issue-103748-ICE-wrong-braces.rs
index 8012cb652..8012cb652 100644
--- a/src/test/ui/parser/issue-103748-ICE-wrong-braces.rs
+++ b/tests/ui/parser/issue-103748-ICE-wrong-braces.rs
diff --git a/src/test/ui/parser/issue-103748-ICE-wrong-braces.stderr b/tests/ui/parser/issue-103748-ICE-wrong-braces.stderr
index b0d8b03ae..b0d8b03ae 100644
--- a/src/test/ui/parser/issue-103748-ICE-wrong-braces.stderr
+++ b/tests/ui/parser/issue-103748-ICE-wrong-braces.stderr
diff --git a/src/test/ui/parser/issue-103869.rs b/tests/ui/parser/issue-103869.rs
index 28c442bdd..28c442bdd 100644
--- a/src/test/ui/parser/issue-103869.rs
+++ b/tests/ui/parser/issue-103869.rs
diff --git a/src/test/ui/parser/issue-103869.stderr b/tests/ui/parser/issue-103869.stderr
index 0b8cd919a..0b8cd919a 100644
--- a/src/test/ui/parser/issue-103869.stderr
+++ b/tests/ui/parser/issue-103869.stderr
diff --git a/src/test/ui/parser/issue-104620.rs b/tests/ui/parser/issue-104620.rs
index f49476c44..f49476c44 100644
--- a/src/test/ui/parser/issue-104620.rs
+++ b/tests/ui/parser/issue-104620.rs
diff --git a/src/test/ui/parser/issue-104620.stderr b/tests/ui/parser/issue-104620.stderr
index d06a6b255..d06a6b255 100644
--- a/src/test/ui/parser/issue-104620.stderr
+++ b/tests/ui/parser/issue-104620.stderr
diff --git a/tests/ui/parser/issue-104867-inc-dec-2.rs b/tests/ui/parser/issue-104867-inc-dec-2.rs
new file mode 100644
index 000000000..a006421a9
--- /dev/null
+++ b/tests/ui/parser/issue-104867-inc-dec-2.rs
@@ -0,0 +1,52 @@
+fn test1() {
+    let mut i = 0;
+    let _ = i + ++i; //~ ERROR Rust has no prefix increment operator
+}
+
+fn test2() {
+    let mut i = 0;
+    let _ = ++i + i; //~ ERROR Rust has no prefix increment operator
+}
+
+fn test3() {
+    let mut i = 0;
+    let _ = ++i + ++i; //~ ERROR Rust has no prefix increment operator
+}
+
+fn test4() {
+    let mut i = 0;
+    let _ = i + i++; //~ ERROR Rust has no postfix increment operator
+    // won't suggest since we can not handle the precedences
+}
+
+fn test5() {
+    let mut i = 0;
+    let _ = i++ + i; //~ ERROR Rust has no postfix increment operator
+}
+
+fn test6() {
+    let mut i = 0;
+    let _ = i++ + i++; //~ ERROR Rust has no postfix increment operator
+}
+
+fn test7() {
+    let mut i = 0;
+    let _ = ++i + i++; //~ ERROR Rust has no prefix increment operator
+}
+
+fn test8() {
+    let mut i = 0;
+    let _ = i++ + ++i; //~ ERROR Rust has no postfix increment operator
+}
+
+fn test9() {
+    let mut i = 0;
+    let _ = (1 + 2 + i)++; //~ ERROR Rust has no postfix increment operator
+}
+
+fn test10() {
+    let mut i = 0;
+    let _ = (i++ + 1) + 2; //~ ERROR Rust has no postfix increment operator
+}
+
+fn main() { }
diff --git a/tests/ui/parser/issue-104867-inc-dec-2.stderr b/tests/ui/parser/issue-104867-inc-dec-2.stderr
new file mode 100644
index 000000000..4e2d05468
--- /dev/null
+++ b/tests/ui/parser/issue-104867-inc-dec-2.stderr
@@ -0,0 +1,107 @@
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:3:17
+   |
+LL |     let _ = i + ++i;
+   |                 ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = i + { i += 1; i };
+   |                 ~   +++++++++
+
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:8:13
+   |
+LL |     let _ = ++i + i;
+   |             ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { i += 1; i } + i;
+   |             ~   +++++++++
+
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:13:13
+   |
+LL |     let _ = ++i + ++i;
+   |             ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { i += 1; i } + ++i;
+   |             ~   +++++++++
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:18:18
+   |
+LL |     let _ = i + i++;
+   |                  ^^ not a valid postfix operator
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:24:14
+   |
+LL |     let _ = i++ + i;
+   |              ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { let tmp = i; i += 1; tmp } + i;
+   |             +++++++++++  ~~~~~~~~~~~~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:29:14
+   |
+LL |     let _ = i++ + i++;
+   |              ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { let tmp = i; i += 1; tmp } + i++;
+   |             +++++++++++  ~~~~~~~~~~~~~~~
+
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:34:13
+   |
+LL |     let _ = ++i + i++;
+   |             ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { i += 1; i } + i++;
+   |             ~   +++++++++
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:39:14
+   |
+LL |     let _ = i++ + ++i;
+   |              ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { let tmp = i; i += 1; tmp } + ++i;
+   |             +++++++++++  ~~~~~~~~~~~~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:44:24
+   |
+LL |     let _ = (1 + 2 + i)++;
+   |                        ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { let tmp = (1 + 2 + i); (1 + 2 + i) += 1; tmp };
+   |             +++++++++++            ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:49:15
+   |
+LL |     let _ = (i++ + 1) + 2;
+   |               ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = ({ let tmp = i; i += 1; tmp } + 1) + 2;
+   |              +++++++++++  ~~~~~~~~~~~~~~~
+
+error: aborting due to 10 previous errors
+
diff --git a/tests/ui/parser/issue-104867-inc-dec.rs b/tests/ui/parser/issue-104867-inc-dec.rs
new file mode 100644
index 000000000..760c67b4b
--- /dev/null
+++ b/tests/ui/parser/issue-104867-inc-dec.rs
@@ -0,0 +1,45 @@
+struct S {
+    x: i32,
+}
+
+fn test1() {
+    let mut i = 0;
+    i++; //~ ERROR Rust has no postfix increment operator
+}
+
+fn test2() {
+    let s = S { x: 0 };
+    s.x++; //~ ERROR Rust has no postfix increment operator
+}
+
+fn test3() {
+    let mut i = 0;
+    if i++ == 1 {} //~ ERROR Rust has no postfix increment operator
+}
+
+fn test4() {
+    let mut i = 0;
+    ++i; //~ ERROR Rust has no prefix increment operator
+}
+
+fn test5() {
+    let mut i = 0;
+    if ++i == 1 { } //~ ERROR Rust has no prefix increment operator
+}
+
+fn test6() {
+    let mut i = 0;
+    loop { break; }
+    i++; //~ ERROR Rust has no postfix increment operator
+    loop { break; }
+    ++i;
+}
+
+fn test7() {
+    let mut i = 0;
+    loop { break; }
+    ++i; //~ ERROR Rust has no prefix increment operator
+}
+
+
+fn main() {}
diff --git a/tests/ui/parser/issue-104867-inc-dec.stderr b/tests/ui/parser/issue-104867-inc-dec.stderr
new file mode 100644
index 000000000..78bfd3e82
--- /dev/null
+++ b/tests/ui/parser/issue-104867-inc-dec.stderr
@@ -0,0 +1,81 @@
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:7:6
+   |
+LL |     i++;
+   |      ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     i += 1;
+   |       ~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:12:8
+   |
+LL |     s.x++;
+   |        ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     s.x += 1;
+   |         ~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:17:9
+   |
+LL |     if i++ == 1 {}
+   |         ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     if { let tmp = i; i += 1; tmp } == 1 {}
+   |        +++++++++++  ~~~~~~~~~~~~~~~
+
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:22:5
+   |
+LL |     ++i;
+   |     ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL -     ++i;
+LL +     i += 1;
+   |
+
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:27:8
+   |
+LL |     if ++i == 1 { }
+   |        ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     if { i += 1; i } == 1 { }
+   |        ~   +++++++++
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:33:6
+   |
+LL |     i++;
+   |      ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     i += 1;
+   |       ~~~~
+
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:41:5
+   |
+LL |     ++i;
+   |     ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL -     ++i;
+LL +     i += 1;
+   |
+
+error: aborting due to 7 previous errors
+
diff --git a/tests/ui/parser/issue-105366.fixed b/tests/ui/parser/issue-105366.fixed
new file mode 100644
index 000000000..ad26643c3
--- /dev/null
+++ b/tests/ui/parser/issue-105366.fixed
@@ -0,0 +1,12 @@
+// run-rustfix
+
+struct Foo;
+
+impl From<i32> for Foo {
+    //~^ ERROR you might have meant to write `impl` instead of `fn`
+    fn from(_a: i32) -> Self {
+        Foo
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/parser/issue-105366.rs b/tests/ui/parser/issue-105366.rs
new file mode 100644
index 000000000..311b6a60f
--- /dev/null
+++ b/tests/ui/parser/issue-105366.rs
@@ -0,0 +1,12 @@
+// run-rustfix
+
+struct Foo;
+
+fn From<i32> for Foo {
+    //~^ ERROR you might have meant to write `impl` instead of `fn`
+    fn from(_a: i32) -> Self {
+        Foo
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/parser/issue-105366.stderr b/tests/ui/parser/issue-105366.stderr
new file mode 100644
index 000000000..0a7408e2c
--- /dev/null
+++ b/tests/ui/parser/issue-105366.stderr
@@ -0,0 +1,13 @@
+error: you might have meant to write `impl` instead of `fn`
+  --> $DIR/issue-105366.rs:5:1
+   |
+LL | fn From<i32> for Foo {
+   | ^^
+   |
+help: replace `fn` with `impl` here
+   |
+LL | impl From<i32> for Foo {
+   | ~~~~
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/issue-105634.rs b/tests/ui/parser/issue-105634.rs
new file mode 100644
index 000000000..579aa6e5b
--- /dev/null
+++ b/tests/ui/parser/issue-105634.rs
@@ -0,0 +1,8 @@
+// check-pass
+
+fn main() {
+    let _a = ..;
+    let _b = ..=10;
+    let _c = &..;
+    let _d = &..=10;
+}
diff --git a/src/test/ui/parser/issue-17718-parse-const.rs b/tests/ui/parser/issue-17718-parse-const.rs
index d5a5f445d..d5a5f445d 100644
--- a/src/test/ui/parser/issue-17718-parse-const.rs
+++ b/tests/ui/parser/issue-17718-parse-const.rs
diff --git a/src/test/ui/issues/issue-39616.rs b/tests/ui/parser/issue-39616.rs
index 46b5aa334..46b5aa334 100644
--- a/src/test/ui/issues/issue-39616.rs
+++ b/tests/ui/parser/issue-39616.rs
diff --git a/src/test/ui/issues/issue-39616.stderr b/tests/ui/parser/issue-39616.stderr
index 393d1f2e2..393d1f2e2 100644
--- a/src/test/ui/issues/issue-39616.stderr
+++ b/tests/ui/parser/issue-39616.stderr
diff --git a/src/test/ui/issues/issue-49257.rs b/tests/ui/parser/issue-49257.rs
index a7fa19d52..a7fa19d52 100644
--- a/src/test/ui/issues/issue-49257.rs
+++ b/tests/ui/parser/issue-49257.rs
diff --git a/src/test/ui/issues/issue-49257.stderr b/tests/ui/parser/issue-49257.stderr
index 846467f7f..846467f7f 100644
--- a/src/test/ui/issues/issue-49257.stderr
+++ b/tests/ui/parser/issue-49257.stderr
diff --git a/src/test/ui/parser/issue-61858.rs b/tests/ui/parser/issue-61858.rs
index 6c3b56586..6c3b56586 100644
--- a/src/test/ui/parser/issue-61858.rs
+++ b/tests/ui/parser/issue-61858.rs
diff --git a/src/test/ui/parser/issue-61858.stderr b/tests/ui/parser/issue-61858.stderr
index 03f51c6e3..03f51c6e3 100644
--- a/src/test/ui/parser/issue-61858.stderr
+++ b/tests/ui/parser/issue-61858.stderr
diff --git a/src/test/ui/parser/issue-68091-unicode-ident-after-if.rs b/tests/ui/parser/issue-68091-unicode-ident-after-if.rs
index 57d36feb3..57d36feb3 100644
--- a/src/test/ui/parser/issue-68091-unicode-ident-after-if.rs
+++ b/tests/ui/parser/issue-68091-unicode-ident-after-if.rs
diff --git a/src/test/ui/parser/issue-68091-unicode-ident-after-if.stderr b/tests/ui/parser/issue-68091-unicode-ident-after-if.stderr
index 6674b924e..6674b924e 100644
--- a/src/test/ui/parser/issue-68091-unicode-ident-after-if.stderr
+++ b/tests/ui/parser/issue-68091-unicode-ident-after-if.stderr
diff --git a/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs b/tests/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs
index 1a90b4724..1a90b4724 100644
--- a/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs
+++ b/tests/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs
diff --git a/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr b/tests/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr
index 0b9c364f1..0b9c364f1 100644
--- a/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr
+++ b/tests/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr
diff --git a/src/test/ui/parser/issue-81804.rs b/tests/ui/parser/issue-81804.rs
index 803bde11e..803bde11e 100644
--- a/src/test/ui/parser/issue-81804.rs
+++ b/tests/ui/parser/issue-81804.rs
diff --git a/src/test/ui/parser/issue-81804.stderr b/tests/ui/parser/issue-81804.stderr
index 19c4422c6..19c4422c6 100644
--- a/src/test/ui/parser/issue-81804.stderr
+++ b/tests/ui/parser/issue-81804.stderr
diff --git a/src/test/ui/parser/issue-81827.rs b/tests/ui/parser/issue-81827.rs
index 7ec581594..7ec581594 100644
--- a/src/test/ui/parser/issue-81827.rs
+++ b/tests/ui/parser/issue-81827.rs
diff --git a/src/test/ui/parser/issue-81827.stderr b/tests/ui/parser/issue-81827.stderr
index 069de3391..069de3391 100644
--- a/src/test/ui/parser/issue-81827.stderr
+++ b/tests/ui/parser/issue-81827.stderr
diff --git a/src/test/ui/parser/issue-87694-duplicated-pub.rs b/tests/ui/parser/issue-87694-duplicated-pub.rs
index e3ea61dc4..e3ea61dc4 100644
--- a/src/test/ui/parser/issue-87694-duplicated-pub.rs
+++ b/tests/ui/parser/issue-87694-duplicated-pub.rs
diff --git a/src/test/ui/parser/issue-87694-duplicated-pub.stderr b/tests/ui/parser/issue-87694-duplicated-pub.stderr
index 8d242bc9d..8d242bc9d 100644
--- a/src/test/ui/parser/issue-87694-duplicated-pub.stderr
+++ b/tests/ui/parser/issue-87694-duplicated-pub.stderr
diff --git a/src/test/ui/parser/issue-87694-misplaced-pub.rs b/tests/ui/parser/issue-87694-misplaced-pub.rs
index 3f824617c..3f824617c 100644
--- a/src/test/ui/parser/issue-87694-misplaced-pub.rs
+++ b/tests/ui/parser/issue-87694-misplaced-pub.rs
diff --git a/src/test/ui/parser/issue-87694-misplaced-pub.stderr b/tests/ui/parser/issue-87694-misplaced-pub.stderr
index 94c6a29ef..94c6a29ef 100644
--- a/src/test/ui/parser/issue-87694-misplaced-pub.stderr
+++ b/tests/ui/parser/issue-87694-misplaced-pub.stderr
diff --git a/src/test/ui/parser/issue-90728.rs b/tests/ui/parser/issue-90728.rs
index d6a898361..d6a898361 100644
--- a/src/test/ui/parser/issue-90728.rs
+++ b/tests/ui/parser/issue-90728.rs
diff --git a/src/test/ui/parser/issue-90728.stderr b/tests/ui/parser/issue-90728.stderr
index b55c46030..b55c46030 100644
--- a/src/test/ui/parser/issue-90728.stderr
+++ b/tests/ui/parser/issue-90728.stderr
diff --git a/src/test/ui/parser/issue-91421.rs b/tests/ui/parser/issue-91421.rs
index 8bba27f37..8bba27f37 100644
--- a/src/test/ui/parser/issue-91421.rs
+++ b/tests/ui/parser/issue-91421.rs
diff --git a/src/test/ui/parser/issue-91421.stderr b/tests/ui/parser/issue-91421.stderr
index 2d9652051..2d9652051 100644
--- a/src/test/ui/parser/issue-91421.stderr
+++ b/tests/ui/parser/issue-91421.stderr
diff --git a/src/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.fixed b/tests/ui/parser/issue-99625-enum-struct-mutually-exclusive.fixed
index 4b4a416b1..4b4a416b1 100644
--- a/src/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.fixed
+++ b/tests/ui/parser/issue-99625-enum-struct-mutually-exclusive.fixed
diff --git a/src/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.rs b/tests/ui/parser/issue-99625-enum-struct-mutually-exclusive.rs
index 9cc886641..9cc886641 100644
--- a/src/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.rs
+++ b/tests/ui/parser/issue-99625-enum-struct-mutually-exclusive.rs
diff --git a/src/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.stderr b/tests/ui/parser/issue-99625-enum-struct-mutually-exclusive.stderr
index edc640bf5..edc640bf5 100644
--- a/src/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.stderr
+++ b/tests/ui/parser/issue-99625-enum-struct-mutually-exclusive.stderr
diff --git a/src/test/ui/parser/issue-99910-const-let-mutually-exclusive.fixed b/tests/ui/parser/issue-99910-const-let-mutually-exclusive.fixed
index 64ab6f62b..64ab6f62b 100644
--- a/src/test/ui/parser/issue-99910-const-let-mutually-exclusive.fixed
+++ b/tests/ui/parser/issue-99910-const-let-mutually-exclusive.fixed
diff --git a/src/test/ui/parser/issue-99910-const-let-mutually-exclusive.rs b/tests/ui/parser/issue-99910-const-let-mutually-exclusive.rs
index 50520971f..50520971f 100644
--- a/src/test/ui/parser/issue-99910-const-let-mutually-exclusive.rs
+++ b/tests/ui/parser/issue-99910-const-let-mutually-exclusive.rs
diff --git a/src/test/ui/parser/issue-99910-const-let-mutually-exclusive.stderr b/tests/ui/parser/issue-99910-const-let-mutually-exclusive.stderr
index 72377fc37..72377fc37 100644
--- a/src/test/ui/parser/issue-99910-const-let-mutually-exclusive.stderr
+++ b/tests/ui/parser/issue-99910-const-let-mutually-exclusive.stderr
diff --git a/src/test/ui/parser/issues/auxiliary/issue-21146-inc.rs b/tests/ui/parser/issues/auxiliary/issue-21146-inc.rs
index 32a3b9dcc..32a3b9dcc 100644
--- a/src/test/ui/parser/issues/auxiliary/issue-21146-inc.rs
+++ b/tests/ui/parser/issues/auxiliary/issue-21146-inc.rs
diff --git a/src/test/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs b/tests/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs
index e5604b816..e5604b816 100644
--- a/src/test/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs
+++ b/tests/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs
diff --git a/src/test/ui/parser/issues/auxiliary/issue-94340-inc.rs b/tests/ui/parser/issues/auxiliary/issue-94340-inc.rs
index 9429e5143..9429e5143 100644
--- a/src/test/ui/parser/issues/auxiliary/issue-94340-inc.rs
+++ b/tests/ui/parser/issues/auxiliary/issue-94340-inc.rs
diff --git a/src/test/ui/parser/issues/issue-101540.rs b/tests/ui/parser/issues/issue-101540.rs
index 328ec6f90..328ec6f90 100644
--- a/src/test/ui/parser/issues/issue-101540.rs
+++ b/tests/ui/parser/issues/issue-101540.rs
diff --git a/src/test/ui/parser/issues/issue-101540.stderr b/tests/ui/parser/issues/issue-101540.stderr
index 8af887050..8af887050 100644
--- a/src/test/ui/parser/issues/issue-101540.stderr
+++ b/tests/ui/parser/issues/issue-101540.stderr
diff --git a/src/test/ui/parser/issues/issue-102182-impl-trait-recover.rs b/tests/ui/parser/issues/issue-102182-impl-trait-recover.rs
index 4bfc676d6..4bfc676d6 100644
--- a/src/test/ui/parser/issues/issue-102182-impl-trait-recover.rs
+++ b/tests/ui/parser/issues/issue-102182-impl-trait-recover.rs
diff --git a/src/test/ui/parser/issues/issue-102182-impl-trait-recover.stderr b/tests/ui/parser/issues/issue-102182-impl-trait-recover.stderr
index 52b6ae5df..52b6ae5df 100644
--- a/src/test/ui/parser/issues/issue-102182-impl-trait-recover.stderr
+++ b/tests/ui/parser/issues/issue-102182-impl-trait-recover.stderr
diff --git a/src/test/ui/parser/issues/issue-10392-2.fixed b/tests/ui/parser/issues/issue-10392-2.fixed
index 3386fac17..3386fac17 100644
--- a/src/test/ui/parser/issues/issue-10392-2.fixed
+++ b/tests/ui/parser/issues/issue-10392-2.fixed
diff --git a/src/test/ui/parser/issues/issue-10392-2.rs b/tests/ui/parser/issues/issue-10392-2.rs
index 30628ae31..30628ae31 100644
--- a/src/test/ui/parser/issues/issue-10392-2.rs
+++ b/tests/ui/parser/issues/issue-10392-2.rs
diff --git a/src/test/ui/parser/issues/issue-10392-2.stderr b/tests/ui/parser/issues/issue-10392-2.stderr
index 4154ecfeb..4154ecfeb 100644
--- a/src/test/ui/parser/issues/issue-10392-2.stderr
+++ b/tests/ui/parser/issues/issue-10392-2.stderr
diff --git a/src/test/ui/parser/issues/issue-10392.rs b/tests/ui/parser/issues/issue-10392.rs
index 5b0c2fc2b..5b0c2fc2b 100644
--- a/src/test/ui/parser/issues/issue-10392.rs
+++ b/tests/ui/parser/issues/issue-10392.rs
diff --git a/src/test/ui/parser/issues/issue-10392.stderr b/tests/ui/parser/issues/issue-10392.stderr
index 438ea67d3..438ea67d3 100644
--- a/src/test/ui/parser/issues/issue-10392.stderr
+++ b/tests/ui/parser/issues/issue-10392.stderr
diff --git a/src/test/ui/parser/issues/issue-104088.rs b/tests/ui/parser/issues/issue-104088.rs
index 5f794fe2d..5f794fe2d 100644
--- a/src/test/ui/parser/issues/issue-104088.rs
+++ b/tests/ui/parser/issues/issue-104088.rs
diff --git a/src/test/ui/parser/issues/issue-104088.stderr b/tests/ui/parser/issues/issue-104088.stderr
index ff4b4bdb6..ff4b4bdb6 100644
--- a/src/test/ui/parser/issues/issue-104088.stderr
+++ b/tests/ui/parser/issues/issue-104088.stderr
diff --git a/src/test/ui/parser/issues/issue-10636-1.rs b/tests/ui/parser/issues/issue-10636-1.rs
index 77c6072d6..77c6072d6 100644
--- a/src/test/ui/parser/issues/issue-10636-1.rs
+++ b/tests/ui/parser/issues/issue-10636-1.rs
diff --git a/src/test/ui/parser/issues/issue-10636-1.stderr b/tests/ui/parser/issues/issue-10636-1.stderr
index 1e6294ebe..1e6294ebe 100644
--- a/src/test/ui/parser/issues/issue-10636-1.stderr
+++ b/tests/ui/parser/issues/issue-10636-1.stderr
diff --git a/src/test/ui/parser/issues/issue-10636-2.rs b/tests/ui/parser/issues/issue-10636-2.rs
index 6fb63639d..6fb63639d 100644
--- a/src/test/ui/parser/issues/issue-10636-2.rs
+++ b/tests/ui/parser/issues/issue-10636-2.rs
diff --git a/src/test/ui/parser/issues/issue-10636-2.stderr b/tests/ui/parser/issues/issue-10636-2.stderr
index d4f2da9e3..d4f2da9e3 100644
--- a/src/test/ui/parser/issues/issue-10636-2.stderr
+++ b/tests/ui/parser/issues/issue-10636-2.stderr
diff --git a/src/test/ui/parser/issues/issue-13483.rs b/tests/ui/parser/issues/issue-13483.rs
index 4e32fcab3..4e32fcab3 100644
--- a/src/test/ui/parser/issues/issue-13483.rs
+++ b/tests/ui/parser/issues/issue-13483.rs
diff --git a/src/test/ui/parser/issues/issue-13483.stderr b/tests/ui/parser/issues/issue-13483.stderr
index f5534090f..f5534090f 100644
--- a/src/test/ui/parser/issues/issue-13483.stderr
+++ b/tests/ui/parser/issues/issue-13483.stderr
diff --git a/src/test/ui/parser/issues/issue-14303-fncall.full.stderr b/tests/ui/parser/issues/issue-14303-fncall.full.stderr
index 0c152516a..0c152516a 100644
--- a/src/test/ui/parser/issues/issue-14303-fncall.full.stderr
+++ b/tests/ui/parser/issues/issue-14303-fncall.full.stderr
diff --git a/src/test/ui/parser/issues/issue-14303-fncall.generic_arg.stderr b/tests/ui/parser/issues/issue-14303-fncall.generic_arg.stderr
index 571815776..571815776 100644
--- a/src/test/ui/parser/issues/issue-14303-fncall.generic_arg.stderr
+++ b/tests/ui/parser/issues/issue-14303-fncall.generic_arg.stderr
diff --git a/src/test/ui/parser/issues/issue-14303-fncall.rs b/tests/ui/parser/issues/issue-14303-fncall.rs
index afc4959f1..afc4959f1 100644
--- a/src/test/ui/parser/issues/issue-14303-fncall.rs
+++ b/tests/ui/parser/issues/issue-14303-fncall.rs
diff --git a/src/test/ui/parser/issues/issue-14303.rs b/tests/ui/parser/issues/issue-14303.rs
index 82850d77a..82850d77a 100644
--- a/src/test/ui/parser/issues/issue-14303.rs
+++ b/tests/ui/parser/issues/issue-14303.rs
diff --git a/src/test/ui/parser/issues/issue-14303.stderr b/tests/ui/parser/issues/issue-14303.stderr
index f121107c0..f121107c0 100644
--- a/src/test/ui/parser/issues/issue-14303.stderr
+++ b/tests/ui/parser/issues/issue-14303.stderr
diff --git a/src/test/ui/parser/issues/issue-15914.rs b/tests/ui/parser/issues/issue-15914.rs
index 4a5606af6..4a5606af6 100644
--- a/src/test/ui/parser/issues/issue-15914.rs
+++ b/tests/ui/parser/issues/issue-15914.rs
diff --git a/src/test/ui/parser/issues/issue-15914.stderr b/tests/ui/parser/issues/issue-15914.stderr
index ea26453f8..ea26453f8 100644
--- a/src/test/ui/parser/issues/issue-15914.stderr
+++ b/tests/ui/parser/issues/issue-15914.stderr
diff --git a/src/test/ui/parser/issues/issue-15980.rs b/tests/ui/parser/issues/issue-15980.rs
index 87faa7d5f..87faa7d5f 100644
--- a/src/test/ui/parser/issues/issue-15980.rs
+++ b/tests/ui/parser/issues/issue-15980.rs
diff --git a/src/test/ui/parser/issues/issue-15980.stderr b/tests/ui/parser/issues/issue-15980.stderr
index c59c81119..c59c81119 100644
--- a/src/test/ui/parser/issues/issue-15980.stderr
+++ b/tests/ui/parser/issues/issue-15980.stderr
diff --git a/src/test/ui/parser/issues/issue-1655.rs b/tests/ui/parser/issues/issue-1655.rs
index e9fc6f153..e9fc6f153 100644
--- a/src/test/ui/parser/issues/issue-1655.rs
+++ b/tests/ui/parser/issues/issue-1655.rs
diff --git a/src/test/ui/parser/issues/issue-1655.stderr b/tests/ui/parser/issues/issue-1655.stderr
index 0c390a0ec..0c390a0ec 100644
--- a/src/test/ui/parser/issues/issue-1655.stderr
+++ b/tests/ui/parser/issues/issue-1655.stderr
diff --git a/src/test/ui/parser/issues/issue-17718-const-mut.rs b/tests/ui/parser/issues/issue-17718-const-mut.rs
index 795a8c763..795a8c763 100644
--- a/src/test/ui/parser/issues/issue-17718-const-mut.rs
+++ b/tests/ui/parser/issues/issue-17718-const-mut.rs
diff --git a/src/test/ui/parser/issues/issue-17718-const-mut.stderr b/tests/ui/parser/issues/issue-17718-const-mut.stderr
index 8251ce999..8251ce999 100644
--- a/src/test/ui/parser/issues/issue-17718-const-mut.stderr
+++ b/tests/ui/parser/issues/issue-17718-const-mut.stderr
diff --git a/src/test/ui/parser/issues/issue-17904-2.rs b/tests/ui/parser/issues/issue-17904-2.rs
index 186a955c3..186a955c3 100644
--- a/src/test/ui/parser/issues/issue-17904-2.rs
+++ b/tests/ui/parser/issues/issue-17904-2.rs
diff --git a/src/test/ui/parser/issues/issue-17904-2.stderr b/tests/ui/parser/issues/issue-17904-2.stderr
index 9c7fdf6cc..9c7fdf6cc 100644
--- a/src/test/ui/parser/issues/issue-17904-2.stderr
+++ b/tests/ui/parser/issues/issue-17904-2.stderr
diff --git a/tests/ui/parser/issues/issue-17904.rs b/tests/ui/parser/issues/issue-17904.rs
new file mode 100644
index 000000000..020fb41c2
--- /dev/null
+++ b/tests/ui/parser/issues/issue-17904.rs
@@ -0,0 +1,8 @@
+// compile-flags: -Zparse-only
+
+struct Baz<U> where U: Eq(U); //This is parsed as the new Fn* style parenthesis syntax.
+struct Baz<U> where U: Eq(U) -> R; // Notice this parses as well.
+struct Baz<U>(U) where U: Eq; // This rightfully signals no error as well.
+struct Foo<T> where T: Copy, (T); //~ ERROR where clauses are not allowed before tuple struct bodies
+
+fn main() {}
diff --git a/tests/ui/parser/issues/issue-17904.stderr b/tests/ui/parser/issues/issue-17904.stderr
new file mode 100644
index 000000000..aa343975d
--- /dev/null
+++ b/tests/ui/parser/issues/issue-17904.stderr
@@ -0,0 +1,17 @@
+error: where clauses are not allowed before tuple struct bodies
+  --> $DIR/issue-17904.rs:6:15
+   |
+LL | struct Foo<T> where T: Copy, (T);
+   |        ---    ^^^^^^^^^^^^^^ --- the struct body
+   |        |      |
+   |        |      unexpected where clause
+   |        while parsing this tuple struct
+   |
+help: move the body before the where clause
+   |
+LL - struct Foo<T> where T: Copy, (T);
+LL + struct Foo<T>(T) where T: Copy;
+   |
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/parser/issues/issue-1802-1.rs b/tests/ui/parser/issues/issue-1802-1.rs
index 3c34b0d8f..3c34b0d8f 100644
--- a/src/test/ui/parser/issues/issue-1802-1.rs
+++ b/tests/ui/parser/issues/issue-1802-1.rs
diff --git a/src/test/ui/parser/issues/issue-1802-1.stderr b/tests/ui/parser/issues/issue-1802-1.stderr
index 954cc0bee..954cc0bee 100644
--- a/src/test/ui/parser/issues/issue-1802-1.stderr
+++ b/tests/ui/parser/issues/issue-1802-1.stderr
diff --git a/src/test/ui/parser/issues/issue-1802-2.rs b/tests/ui/parser/issues/issue-1802-2.rs
index 3c34b0d8f..3c34b0d8f 100644
--- a/src/test/ui/parser/issues/issue-1802-2.rs
+++ b/tests/ui/parser/issues/issue-1802-2.rs
diff --git a/src/test/ui/parser/issues/issue-1802-2.stderr b/tests/ui/parser/issues/issue-1802-2.stderr
index 49043d07b..49043d07b 100644
--- a/src/test/ui/parser/issues/issue-1802-2.stderr
+++ b/tests/ui/parser/issues/issue-1802-2.stderr
diff --git a/src/test/ui/parser/issues/issue-19096.rs b/tests/ui/parser/issues/issue-19096.rs
index c5bfd10ee..c5bfd10ee 100644
--- a/src/test/ui/parser/issues/issue-19096.rs
+++ b/tests/ui/parser/issues/issue-19096.rs
diff --git a/src/test/ui/parser/issues/issue-19096.stderr b/tests/ui/parser/issues/issue-19096.stderr
index 4df7f878b..4df7f878b 100644
--- a/src/test/ui/parser/issues/issue-19096.stderr
+++ b/tests/ui/parser/issues/issue-19096.stderr
diff --git a/src/test/ui/parser/issues/issue-19398.rs b/tests/ui/parser/issues/issue-19398.rs
index 46eb320a1..46eb320a1 100644
--- a/src/test/ui/parser/issues/issue-19398.rs
+++ b/tests/ui/parser/issues/issue-19398.rs
diff --git a/src/test/ui/parser/issues/issue-19398.stderr b/tests/ui/parser/issues/issue-19398.stderr
index 1da00960a..1da00960a 100644
--- a/src/test/ui/parser/issues/issue-19398.stderr
+++ b/tests/ui/parser/issues/issue-19398.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-1.rs b/tests/ui/parser/issues/issue-20616-1.rs
index 49e9cb310..49e9cb310 100644
--- a/src/test/ui/parser/issues/issue-20616-1.rs
+++ b/tests/ui/parser/issues/issue-20616-1.rs
diff --git a/src/test/ui/parser/issues/issue-20616-1.stderr b/tests/ui/parser/issues/issue-20616-1.stderr
index 816046237..816046237 100644
--- a/src/test/ui/parser/issues/issue-20616-1.stderr
+++ b/tests/ui/parser/issues/issue-20616-1.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-2.rs b/tests/ui/parser/issues/issue-20616-2.rs
index 2f2c6903a..2f2c6903a 100644
--- a/src/test/ui/parser/issues/issue-20616-2.rs
+++ b/tests/ui/parser/issues/issue-20616-2.rs
diff --git a/src/test/ui/parser/issues/issue-20616-2.stderr b/tests/ui/parser/issues/issue-20616-2.stderr
index 42059685c..42059685c 100644
--- a/src/test/ui/parser/issues/issue-20616-2.stderr
+++ b/tests/ui/parser/issues/issue-20616-2.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-3.rs b/tests/ui/parser/issues/issue-20616-3.rs
index b2371051c..b2371051c 100644
--- a/src/test/ui/parser/issues/issue-20616-3.rs
+++ b/tests/ui/parser/issues/issue-20616-3.rs
diff --git a/src/test/ui/parser/issues/issue-20616-3.stderr b/tests/ui/parser/issues/issue-20616-3.stderr
index dbff116e5..dbff116e5 100644
--- a/src/test/ui/parser/issues/issue-20616-3.stderr
+++ b/tests/ui/parser/issues/issue-20616-3.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-4.rs b/tests/ui/parser/issues/issue-20616-4.rs
index a71f47ca4..a71f47ca4 100644
--- a/src/test/ui/parser/issues/issue-20616-4.rs
+++ b/tests/ui/parser/issues/issue-20616-4.rs
diff --git a/src/test/ui/parser/issues/issue-20616-4.stderr b/tests/ui/parser/issues/issue-20616-4.stderr
index 48a06e00b..48a06e00b 100644
--- a/src/test/ui/parser/issues/issue-20616-4.stderr
+++ b/tests/ui/parser/issues/issue-20616-4.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-5.rs b/tests/ui/parser/issues/issue-20616-5.rs
index b96d09d59..b96d09d59 100644
--- a/src/test/ui/parser/issues/issue-20616-5.rs
+++ b/tests/ui/parser/issues/issue-20616-5.rs
diff --git a/src/test/ui/parser/issues/issue-20616-5.stderr b/tests/ui/parser/issues/issue-20616-5.stderr
index 84bee2ad1..84bee2ad1 100644
--- a/src/test/ui/parser/issues/issue-20616-5.stderr
+++ b/tests/ui/parser/issues/issue-20616-5.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-6.rs b/tests/ui/parser/issues/issue-20616-6.rs
index a2c45ecec..a2c45ecec 100644
--- a/src/test/ui/parser/issues/issue-20616-6.rs
+++ b/tests/ui/parser/issues/issue-20616-6.rs
diff --git a/src/test/ui/parser/issues/issue-20616-6.stderr b/tests/ui/parser/issues/issue-20616-6.stderr
index 67de41b97..67de41b97 100644
--- a/src/test/ui/parser/issues/issue-20616-6.stderr
+++ b/tests/ui/parser/issues/issue-20616-6.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-7.rs b/tests/ui/parser/issues/issue-20616-7.rs
index 67209c02a..67209c02a 100644
--- a/src/test/ui/parser/issues/issue-20616-7.rs
+++ b/tests/ui/parser/issues/issue-20616-7.rs
diff --git a/src/test/ui/parser/issues/issue-20616-7.stderr b/tests/ui/parser/issues/issue-20616-7.stderr
index 3b8e07fa0..3b8e07fa0 100644
--- a/src/test/ui/parser/issues/issue-20616-7.stderr
+++ b/tests/ui/parser/issues/issue-20616-7.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-8.rs b/tests/ui/parser/issues/issue-20616-8.rs
index 3ceb58d12..3ceb58d12 100644
--- a/src/test/ui/parser/issues/issue-20616-8.rs
+++ b/tests/ui/parser/issues/issue-20616-8.rs
diff --git a/src/test/ui/parser/issues/issue-20616-8.stderr b/tests/ui/parser/issues/issue-20616-8.stderr
index e9f37e50f..e9f37e50f 100644
--- a/src/test/ui/parser/issues/issue-20616-8.stderr
+++ b/tests/ui/parser/issues/issue-20616-8.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-9.rs b/tests/ui/parser/issues/issue-20616-9.rs
index 7f8428448..7f8428448 100644
--- a/src/test/ui/parser/issues/issue-20616-9.rs
+++ b/tests/ui/parser/issues/issue-20616-9.rs
diff --git a/src/test/ui/parser/issues/issue-20616-9.stderr b/tests/ui/parser/issues/issue-20616-9.stderr
index dc309d1bc..dc309d1bc 100644
--- a/src/test/ui/parser/issues/issue-20616-9.stderr
+++ b/tests/ui/parser/issues/issue-20616-9.stderr
diff --git a/src/test/ui/parser/issues/issue-20711-2.rs b/tests/ui/parser/issues/issue-20711-2.rs
index 168c7e761..168c7e761 100644
--- a/src/test/ui/parser/issues/issue-20711-2.rs
+++ b/tests/ui/parser/issues/issue-20711-2.rs
diff --git a/src/test/ui/parser/issues/issue-20711-2.stderr b/tests/ui/parser/issues/issue-20711-2.stderr
index 12b18bbc5..12b18bbc5 100644
--- a/src/test/ui/parser/issues/issue-20711-2.stderr
+++ b/tests/ui/parser/issues/issue-20711-2.stderr
diff --git a/src/test/ui/parser/issues/issue-20711.rs b/tests/ui/parser/issues/issue-20711.rs
index 020bb79d6..020bb79d6 100644
--- a/src/test/ui/parser/issues/issue-20711.rs
+++ b/tests/ui/parser/issues/issue-20711.rs
diff --git a/src/test/ui/parser/issues/issue-20711.stderr b/tests/ui/parser/issues/issue-20711.stderr
index 4af4b22be..4af4b22be 100644
--- a/src/test/ui/parser/issues/issue-20711.stderr
+++ b/tests/ui/parser/issues/issue-20711.stderr
diff --git a/src/test/ui/parser/issues/issue-21146.rs b/tests/ui/parser/issues/issue-21146.rs
index 19eaffc3e..19eaffc3e 100644
--- a/src/test/ui/parser/issues/issue-21146.rs
+++ b/tests/ui/parser/issues/issue-21146.rs
diff --git a/src/test/ui/parser/issues/issue-21146.stderr b/tests/ui/parser/issues/issue-21146.stderr
index c71fda3d6..c71fda3d6 100644
--- a/src/test/ui/parser/issues/issue-21146.stderr
+++ b/tests/ui/parser/issues/issue-21146.stderr
diff --git a/src/test/ui/parser/issues/issue-21153.rs b/tests/ui/parser/issues/issue-21153.rs
index bf5fdb1f3..bf5fdb1f3 100644
--- a/src/test/ui/parser/issues/issue-21153.rs
+++ b/tests/ui/parser/issues/issue-21153.rs
diff --git a/src/test/ui/parser/issues/issue-21153.stderr b/tests/ui/parser/issues/issue-21153.stderr
index cbfa9ded3..cbfa9ded3 100644
--- a/src/test/ui/parser/issues/issue-21153.stderr
+++ b/tests/ui/parser/issues/issue-21153.stderr
diff --git a/src/test/ui/parser/issues/issue-21475.rs b/tests/ui/parser/issues/issue-21475.rs
index b028fcae0..b028fcae0 100644
--- a/src/test/ui/parser/issues/issue-21475.rs
+++ b/tests/ui/parser/issues/issue-21475.rs
diff --git a/src/test/ui/parser/issues/issue-22647.rs b/tests/ui/parser/issues/issue-22647.rs
index a68614106..a68614106 100644
--- a/src/test/ui/parser/issues/issue-22647.rs
+++ b/tests/ui/parser/issues/issue-22647.rs
diff --git a/src/test/ui/parser/issues/issue-22647.stderr b/tests/ui/parser/issues/issue-22647.stderr
index 89b454d19..89b454d19 100644
--- a/src/test/ui/parser/issues/issue-22647.stderr
+++ b/tests/ui/parser/issues/issue-22647.stderr
diff --git a/src/test/ui/parser/issues/issue-22712.rs b/tests/ui/parser/issues/issue-22712.rs
index 774de9c7e..774de9c7e 100644
--- a/src/test/ui/parser/issues/issue-22712.rs
+++ b/tests/ui/parser/issues/issue-22712.rs
diff --git a/src/test/ui/parser/issues/issue-22712.stderr b/tests/ui/parser/issues/issue-22712.stderr
index 30fabac65..30fabac65 100644
--- a/src/test/ui/parser/issues/issue-22712.stderr
+++ b/tests/ui/parser/issues/issue-22712.stderr
diff --git a/src/test/ui/parser/issues/issue-2354-1.rs b/tests/ui/parser/issues/issue-2354-1.rs
index 996cf1bcb..996cf1bcb 100644
--- a/src/test/ui/parser/issues/issue-2354-1.rs
+++ b/tests/ui/parser/issues/issue-2354-1.rs
diff --git a/src/test/ui/parser/issues/issue-2354-1.stderr b/tests/ui/parser/issues/issue-2354-1.stderr
index 7ea0f2a98..7ea0f2a98 100644
--- a/src/test/ui/parser/issues/issue-2354-1.stderr
+++ b/tests/ui/parser/issues/issue-2354-1.stderr
diff --git a/src/test/ui/parser/issues/issue-2354.rs b/tests/ui/parser/issues/issue-2354.rs
index c422040cb..c422040cb 100644
--- a/src/test/ui/parser/issues/issue-2354.rs
+++ b/tests/ui/parser/issues/issue-2354.rs
diff --git a/src/test/ui/parser/issues/issue-2354.stderr b/tests/ui/parser/issues/issue-2354.stderr
index b89ed3958..b89ed3958 100644
--- a/src/test/ui/parser/issues/issue-2354.stderr
+++ b/tests/ui/parser/issues/issue-2354.stderr
diff --git a/src/test/ui/parser/issues/issue-23620-invalid-escapes.rs b/tests/ui/parser/issues/issue-23620-invalid-escapes.rs
index c1355f0d6..c1355f0d6 100644
--- a/src/test/ui/parser/issues/issue-23620-invalid-escapes.rs
+++ b/tests/ui/parser/issues/issue-23620-invalid-escapes.rs
diff --git a/src/test/ui/parser/issues/issue-23620-invalid-escapes.stderr b/tests/ui/parser/issues/issue-23620-invalid-escapes.stderr
index 88d97c795..88d97c795 100644
--- a/src/test/ui/parser/issues/issue-23620-invalid-escapes.stderr
+++ b/tests/ui/parser/issues/issue-23620-invalid-escapes.stderr
diff --git a/src/test/ui/parser/issues/issue-24197.rs b/tests/ui/parser/issues/issue-24197.rs
index aaf513746..aaf513746 100644
--- a/src/test/ui/parser/issues/issue-24197.rs
+++ b/tests/ui/parser/issues/issue-24197.rs
diff --git a/src/test/ui/parser/issues/issue-24197.stderr b/tests/ui/parser/issues/issue-24197.stderr
index fd7015ccd..fd7015ccd 100644
--- a/src/test/ui/parser/issues/issue-24197.stderr
+++ b/tests/ui/parser/issues/issue-24197.stderr
diff --git a/src/test/ui/parser/issues/issue-24375.rs b/tests/ui/parser/issues/issue-24375.rs
index 1d128d33e..1d128d33e 100644
--- a/src/test/ui/parser/issues/issue-24375.rs
+++ b/tests/ui/parser/issues/issue-24375.rs
diff --git a/src/test/ui/parser/issues/issue-24375.stderr b/tests/ui/parser/issues/issue-24375.stderr
index 7aed88768..7aed88768 100644
--- a/src/test/ui/parser/issues/issue-24375.stderr
+++ b/tests/ui/parser/issues/issue-24375.stderr
diff --git a/src/test/ui/parser/issues/issue-24780.rs b/tests/ui/parser/issues/issue-24780.rs
index 017521f57..017521f57 100644
--- a/src/test/ui/parser/issues/issue-24780.rs
+++ b/tests/ui/parser/issues/issue-24780.rs
diff --git a/src/test/ui/parser/issues/issue-24780.stderr b/tests/ui/parser/issues/issue-24780.stderr
index d9470191b..d9470191b 100644
--- a/src/test/ui/parser/issues/issue-24780.stderr
+++ b/tests/ui/parser/issues/issue-24780.stderr
diff --git a/src/test/ui/parser/issues/issue-27255.rs b/tests/ui/parser/issues/issue-27255.rs
index d619688e1..d619688e1 100644
--- a/src/test/ui/parser/issues/issue-27255.rs
+++ b/tests/ui/parser/issues/issue-27255.rs
diff --git a/src/test/ui/parser/issues/issue-27255.stderr b/tests/ui/parser/issues/issue-27255.stderr
index 391a23556..391a23556 100644
--- a/src/test/ui/parser/issues/issue-27255.stderr
+++ b/tests/ui/parser/issues/issue-27255.stderr
diff --git a/src/test/ui/parser/issues/issue-30318.fixed b/tests/ui/parser/issues/issue-30318.fixed
index 71fc82172..71fc82172 100644
--- a/src/test/ui/parser/issues/issue-30318.fixed
+++ b/tests/ui/parser/issues/issue-30318.fixed
diff --git a/src/test/ui/parser/issues/issue-30318.rs b/tests/ui/parser/issues/issue-30318.rs
index 465dca2ff..465dca2ff 100644
--- a/src/test/ui/parser/issues/issue-30318.rs
+++ b/tests/ui/parser/issues/issue-30318.rs
diff --git a/src/test/ui/parser/issues/issue-30318.stderr b/tests/ui/parser/issues/issue-30318.stderr
index c441a92ab..c441a92ab 100644
--- a/src/test/ui/parser/issues/issue-30318.stderr
+++ b/tests/ui/parser/issues/issue-30318.stderr
diff --git a/src/test/ui/parser/issues/issue-3036.fixed b/tests/ui/parser/issues/issue-3036.fixed
index e5d5622e6..e5d5622e6 100644
--- a/src/test/ui/parser/issues/issue-3036.fixed
+++ b/tests/ui/parser/issues/issue-3036.fixed
diff --git a/src/test/ui/parser/issues/issue-3036.rs b/tests/ui/parser/issues/issue-3036.rs
index 2f76fb99b..2f76fb99b 100644
--- a/src/test/ui/parser/issues/issue-3036.rs
+++ b/tests/ui/parser/issues/issue-3036.rs
diff --git a/src/test/ui/parser/issues/issue-3036.stderr b/tests/ui/parser/issues/issue-3036.stderr
index e02223931..e02223931 100644
--- a/src/test/ui/parser/issues/issue-3036.stderr
+++ b/tests/ui/parser/issues/issue-3036.stderr
diff --git a/src/test/ui/parser/issues/issue-31804.rs b/tests/ui/parser/issues/issue-31804.rs
index d056b77cf..d056b77cf 100644
--- a/src/test/ui/parser/issues/issue-31804.rs
+++ b/tests/ui/parser/issues/issue-31804.rs
diff --git a/src/test/ui/parser/issues/issue-31804.stderr b/tests/ui/parser/issues/issue-31804.stderr
index 76e68b0b3..76e68b0b3 100644
--- a/src/test/ui/parser/issues/issue-31804.stderr
+++ b/tests/ui/parser/issues/issue-31804.stderr
diff --git a/src/test/ui/parser/issues/issue-32214.rs b/tests/ui/parser/issues/issue-32214.rs
index 1379eeb58..1379eeb58 100644
--- a/src/test/ui/parser/issues/issue-32214.rs
+++ b/tests/ui/parser/issues/issue-32214.rs
diff --git a/src/test/ui/parser/issues/issue-32214.stderr b/tests/ui/parser/issues/issue-32214.stderr
index d0a9b5299..d0a9b5299 100644
--- a/src/test/ui/parser/issues/issue-32214.stderr
+++ b/tests/ui/parser/issues/issue-32214.stderr
diff --git a/src/test/ui/parser/issues/issue-32446.rs b/tests/ui/parser/issues/issue-32446.rs
index 53e519a72..53e519a72 100644
--- a/src/test/ui/parser/issues/issue-32446.rs
+++ b/tests/ui/parser/issues/issue-32446.rs
diff --git a/src/test/ui/parser/issues/issue-32446.stderr b/tests/ui/parser/issues/issue-32446.stderr
index 7515369aa..7515369aa 100644
--- a/src/test/ui/parser/issues/issue-32446.stderr
+++ b/tests/ui/parser/issues/issue-32446.stderr
diff --git a/src/test/ui/parser/issues/issue-32501.rs b/tests/ui/parser/issues/issue-32501.rs
index 500242030..500242030 100644
--- a/src/test/ui/parser/issues/issue-32501.rs
+++ b/tests/ui/parser/issues/issue-32501.rs
diff --git a/src/test/ui/parser/issues/issue-32501.stderr b/tests/ui/parser/issues/issue-32501.stderr
index d53302449..d53302449 100644
--- a/src/test/ui/parser/issues/issue-32501.stderr
+++ b/tests/ui/parser/issues/issue-32501.stderr
diff --git a/src/test/ui/parser/issues/issue-32505.rs b/tests/ui/parser/issues/issue-32505.rs
index f31c00e5c..f31c00e5c 100644
--- a/src/test/ui/parser/issues/issue-32505.rs
+++ b/tests/ui/parser/issues/issue-32505.rs
diff --git a/src/test/ui/parser/issues/issue-32505.stderr b/tests/ui/parser/issues/issue-32505.stderr
index cdd779a93..cdd779a93 100644
--- a/src/test/ui/parser/issues/issue-32505.stderr
+++ b/tests/ui/parser/issues/issue-32505.stderr
diff --git a/src/test/ui/parser/issues/issue-33262.rs b/tests/ui/parser/issues/issue-33262.rs
index 3a612f95c..3a612f95c 100644
--- a/src/test/ui/parser/issues/issue-33262.rs
+++ b/tests/ui/parser/issues/issue-33262.rs
diff --git a/src/test/ui/parser/issues/issue-33262.stderr b/tests/ui/parser/issues/issue-33262.stderr
index 2aff32839..2aff32839 100644
--- a/src/test/ui/parser/issues/issue-33262.stderr
+++ b/tests/ui/parser/issues/issue-33262.stderr
diff --git a/src/test/ui/parser/issues/issue-33413.rs b/tests/ui/parser/issues/issue-33413.rs
index 7291732ce..7291732ce 100644
--- a/src/test/ui/parser/issues/issue-33413.rs
+++ b/tests/ui/parser/issues/issue-33413.rs
diff --git a/src/test/ui/parser/issues/issue-33413.stderr b/tests/ui/parser/issues/issue-33413.stderr
index b7250f3b0..b7250f3b0 100644
--- a/src/test/ui/parser/issues/issue-33413.stderr
+++ b/tests/ui/parser/issues/issue-33413.stderr
diff --git a/src/test/ui/parser/issues/issue-33418.fixed b/tests/ui/parser/issues/issue-33418.fixed
index ed885ae14..ed885ae14 100644
--- a/src/test/ui/parser/issues/issue-33418.fixed
+++ b/tests/ui/parser/issues/issue-33418.fixed
diff --git a/src/test/ui/parser/issues/issue-33418.rs b/tests/ui/parser/issues/issue-33418.rs
index 9934284ab..9934284ab 100644
--- a/src/test/ui/parser/issues/issue-33418.rs
+++ b/tests/ui/parser/issues/issue-33418.rs
diff --git a/src/test/ui/parser/issues/issue-33418.stderr b/tests/ui/parser/issues/issue-33418.stderr
index 9a8733e89..9a8733e89 100644
--- a/src/test/ui/parser/issues/issue-33418.stderr
+++ b/tests/ui/parser/issues/issue-33418.stderr
diff --git a/src/test/ui/parser/issues/issue-33455.rs b/tests/ui/parser/issues/issue-33455.rs
index 6dff63f5c..6dff63f5c 100644
--- a/src/test/ui/parser/issues/issue-33455.rs
+++ b/tests/ui/parser/issues/issue-33455.rs
diff --git a/src/test/ui/parser/issues/issue-33455.stderr b/tests/ui/parser/issues/issue-33455.stderr
index c535ef23b..c535ef23b 100644
--- a/src/test/ui/parser/issues/issue-33455.stderr
+++ b/tests/ui/parser/issues/issue-33455.stderr
diff --git a/src/test/ui/parser/issues/issue-34222-1.rs b/tests/ui/parser/issues/issue-34222-1.rs
index d36dddc97..d36dddc97 100644
--- a/src/test/ui/parser/issues/issue-34222-1.rs
+++ b/tests/ui/parser/issues/issue-34222-1.rs
diff --git a/src/test/ui/parser/issues/issue-34222-1.stderr b/tests/ui/parser/issues/issue-34222-1.stderr
index b451484ba..b451484ba 100644
--- a/src/test/ui/parser/issues/issue-34222-1.stderr
+++ b/tests/ui/parser/issues/issue-34222-1.stderr
diff --git a/src/test/ui/parser/issues/issue-34255-1.rs b/tests/ui/parser/issues/issue-34255-1.rs
index c70cd8b50..c70cd8b50 100644
--- a/src/test/ui/parser/issues/issue-34255-1.rs
+++ b/tests/ui/parser/issues/issue-34255-1.rs
diff --git a/src/test/ui/parser/issues/issue-34255-1.stderr b/tests/ui/parser/issues/issue-34255-1.stderr
index 0e2b0d62e..0e2b0d62e 100644
--- a/src/test/ui/parser/issues/issue-34255-1.stderr
+++ b/tests/ui/parser/issues/issue-34255-1.stderr
diff --git a/src/test/ui/parser/issues/issue-35813-postfix-after-cast.rs b/tests/ui/parser/issues/issue-35813-postfix-after-cast.rs
index 7bd4b3a16..7bd4b3a16 100644
--- a/src/test/ui/parser/issues/issue-35813-postfix-after-cast.rs
+++ b/tests/ui/parser/issues/issue-35813-postfix-after-cast.rs
diff --git a/src/test/ui/parser/issues/issue-35813-postfix-after-cast.stderr b/tests/ui/parser/issues/issue-35813-postfix-after-cast.stderr
index 0c328bde2..0c328bde2 100644
--- a/src/test/ui/parser/issues/issue-35813-postfix-after-cast.stderr
+++ b/tests/ui/parser/issues/issue-35813-postfix-after-cast.stderr
diff --git a/src/test/ui/parser/issues/issue-41155.rs b/tests/ui/parser/issues/issue-41155.rs
index 5a7488e6f..5a7488e6f 100644
--- a/src/test/ui/parser/issues/issue-41155.rs
+++ b/tests/ui/parser/issues/issue-41155.rs
diff --git a/src/test/ui/parser/issues/issue-41155.stderr b/tests/ui/parser/issues/issue-41155.stderr
index 8491afae2..8491afae2 100644
--- a/src/test/ui/parser/issues/issue-41155.stderr
+++ b/tests/ui/parser/issues/issue-41155.stderr
diff --git a/src/test/ui/parser/issues/issue-43196.rs b/tests/ui/parser/issues/issue-43196.rs
index 0eefa01ce..0eefa01ce 100644
--- a/src/test/ui/parser/issues/issue-43196.rs
+++ b/tests/ui/parser/issues/issue-43196.rs
diff --git a/src/test/ui/parser/issues/issue-43196.stderr b/tests/ui/parser/issues/issue-43196.stderr
index 4f7ed5cc6..4f7ed5cc6 100644
--- a/src/test/ui/parser/issues/issue-43196.stderr
+++ b/tests/ui/parser/issues/issue-43196.stderr
diff --git a/src/test/ui/parser/issues/issue-43692.rs b/tests/ui/parser/issues/issue-43692.rs
index baf8bafb8..baf8bafb8 100644
--- a/src/test/ui/parser/issues/issue-43692.rs
+++ b/tests/ui/parser/issues/issue-43692.rs
diff --git a/src/test/ui/parser/issues/issue-43692.stderr b/tests/ui/parser/issues/issue-43692.stderr
index baf998035..baf998035 100644
--- a/src/test/ui/parser/issues/issue-43692.stderr
+++ b/tests/ui/parser/issues/issue-43692.stderr
diff --git a/src/test/ui/parser/issues/issue-44021.rs b/tests/ui/parser/issues/issue-44021.rs
index 0b9558cc9..0b9558cc9 100644
--- a/src/test/ui/parser/issues/issue-44021.rs
+++ b/tests/ui/parser/issues/issue-44021.rs
diff --git a/src/test/ui/parser/issues/issue-44021.stderr b/tests/ui/parser/issues/issue-44021.stderr
index b888cd989..b888cd989 100644
--- a/src/test/ui/parser/issues/issue-44021.stderr
+++ b/tests/ui/parser/issues/issue-44021.stderr
diff --git a/src/test/ui/parser/issues/issue-44406.rs b/tests/ui/parser/issues/issue-44406.rs
index a5b7e83a0..a5b7e83a0 100644
--- a/src/test/ui/parser/issues/issue-44406.rs
+++ b/tests/ui/parser/issues/issue-44406.rs
diff --git a/src/test/ui/parser/issues/issue-44406.stderr b/tests/ui/parser/issues/issue-44406.stderr
index 1f0c1ea4c..1f0c1ea4c 100644
--- a/src/test/ui/parser/issues/issue-44406.stderr
+++ b/tests/ui/parser/issues/issue-44406.stderr
diff --git a/src/test/ui/parser/issues/issue-45296.rs b/tests/ui/parser/issues/issue-45296.rs
index d3a97e89f..d3a97e89f 100644
--- a/src/test/ui/parser/issues/issue-45296.rs
+++ b/tests/ui/parser/issues/issue-45296.rs
diff --git a/src/test/ui/parser/issues/issue-45296.stderr b/tests/ui/parser/issues/issue-45296.stderr
index 081a72054..081a72054 100644
--- a/src/test/ui/parser/issues/issue-45296.stderr
+++ b/tests/ui/parser/issues/issue-45296.stderr
diff --git a/src/test/ui/parser/issues/issue-46186.fixed b/tests/ui/parser/issues/issue-46186.fixed
index 2cb5a4996..2cb5a4996 100644
--- a/src/test/ui/parser/issues/issue-46186.fixed
+++ b/tests/ui/parser/issues/issue-46186.fixed
diff --git a/src/test/ui/parser/issues/issue-46186.rs b/tests/ui/parser/issues/issue-46186.rs
index 84cad38c5..84cad38c5 100644
--- a/src/test/ui/parser/issues/issue-46186.rs
+++ b/tests/ui/parser/issues/issue-46186.rs
diff --git a/src/test/ui/parser/issues/issue-46186.stderr b/tests/ui/parser/issues/issue-46186.stderr
index 0766c8a33..0766c8a33 100644
--- a/src/test/ui/parser/issues/issue-46186.stderr
+++ b/tests/ui/parser/issues/issue-46186.stderr
diff --git a/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs b/tests/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs
index 48a679b2d..48a679b2d 100644
--- a/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs
+++ b/tests/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs
diff --git a/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr b/tests/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr
index fdef8ff6d..fdef8ff6d 100644
--- a/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr
+++ b/tests/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr
diff --git a/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items.rs b/tests/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items.rs
index 8592f8a72..8592f8a72 100644
--- a/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items.rs
+++ b/tests/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items.rs
diff --git a/src/test/ui/parser/issues/issue-48508-aux.rs b/tests/ui/parser/issues/issue-48508-aux.rs
index ebdc70a04..ebdc70a04 100644
--- a/src/test/ui/parser/issues/issue-48508-aux.rs
+++ b/tests/ui/parser/issues/issue-48508-aux.rs
diff --git a/src/test/ui/parser/issues/issue-48508.rs b/tests/ui/parser/issues/issue-48508.rs
index 37d04c5d6..37d04c5d6 100644
--- a/src/test/ui/parser/issues/issue-48508.rs
+++ b/tests/ui/parser/issues/issue-48508.rs
diff --git a/src/test/ui/parser/issues/issue-48636.fixed b/tests/ui/parser/issues/issue-48636.fixed
index 87c19a32d..87c19a32d 100644
--- a/src/test/ui/parser/issues/issue-48636.fixed
+++ b/tests/ui/parser/issues/issue-48636.fixed
diff --git a/src/test/ui/parser/issues/issue-48636.rs b/tests/ui/parser/issues/issue-48636.rs
index 8610dc2f7..8610dc2f7 100644
--- a/src/test/ui/parser/issues/issue-48636.rs
+++ b/tests/ui/parser/issues/issue-48636.rs
diff --git a/src/test/ui/parser/issues/issue-48636.stderr b/tests/ui/parser/issues/issue-48636.stderr
index 6177870d1..6177870d1 100644
--- a/src/test/ui/parser/issues/issue-48636.stderr
+++ b/tests/ui/parser/issues/issue-48636.stderr
diff --git a/src/test/ui/parser/issues/issue-49040.rs b/tests/ui/parser/issues/issue-49040.rs
index b7a541dd6..b7a541dd6 100644
--- a/src/test/ui/parser/issues/issue-49040.rs
+++ b/tests/ui/parser/issues/issue-49040.rs
diff --git a/src/test/ui/parser/issues/issue-49040.stderr b/tests/ui/parser/issues/issue-49040.stderr
index 8af7838c7..8af7838c7 100644
--- a/src/test/ui/parser/issues/issue-49040.stderr
+++ b/tests/ui/parser/issues/issue-49040.stderr
diff --git a/src/test/ui/parser/issues/issue-51602.rs b/tests/ui/parser/issues/issue-51602.rs
index 0e96ca914..0e96ca914 100644
--- a/src/test/ui/parser/issues/issue-51602.rs
+++ b/tests/ui/parser/issues/issue-51602.rs
diff --git a/src/test/ui/parser/issues/issue-51602.stderr b/tests/ui/parser/issues/issue-51602.stderr
index 4a5653fdb..4a5653fdb 100644
--- a/src/test/ui/parser/issues/issue-51602.stderr
+++ b/tests/ui/parser/issues/issue-51602.stderr
diff --git a/src/test/ui/parser/issues/issue-52496.rs b/tests/ui/parser/issues/issue-52496.rs
index 05461f8b8..05461f8b8 100644
--- a/src/test/ui/parser/issues/issue-52496.rs
+++ b/tests/ui/parser/issues/issue-52496.rs
diff --git a/src/test/ui/parser/issues/issue-52496.stderr b/tests/ui/parser/issues/issue-52496.stderr
index 77335c64c..77335c64c 100644
--- a/src/test/ui/parser/issues/issue-52496.stderr
+++ b/tests/ui/parser/issues/issue-52496.stderr
diff --git a/src/test/ui/parser/issues/issue-54521-1.rs b/tests/ui/parser/issues/issue-54521-1.rs
index 8a682ef0a..8a682ef0a 100644
--- a/src/test/ui/parser/issues/issue-54521-1.rs
+++ b/tests/ui/parser/issues/issue-54521-1.rs
diff --git a/src/test/ui/parser/issues/issue-54521-2.fixed b/tests/ui/parser/issues/issue-54521-2.fixed
index a91c4fe43..a91c4fe43 100644
--- a/src/test/ui/parser/issues/issue-54521-2.fixed
+++ b/tests/ui/parser/issues/issue-54521-2.fixed
diff --git a/src/test/ui/parser/issues/issue-54521-2.rs b/tests/ui/parser/issues/issue-54521-2.rs
index 3639aac87..3639aac87 100644
--- a/src/test/ui/parser/issues/issue-54521-2.rs
+++ b/tests/ui/parser/issues/issue-54521-2.rs
diff --git a/src/test/ui/parser/issues/issue-54521-2.stderr b/tests/ui/parser/issues/issue-54521-2.stderr
index 9556b83b7..9556b83b7 100644
--- a/src/test/ui/parser/issues/issue-54521-2.stderr
+++ b/tests/ui/parser/issues/issue-54521-2.stderr
diff --git a/src/test/ui/parser/issues/issue-54521-3.fixed b/tests/ui/parser/issues/issue-54521-3.fixed
index 84ab6866c..84ab6866c 100644
--- a/src/test/ui/parser/issues/issue-54521-3.fixed
+++ b/tests/ui/parser/issues/issue-54521-3.fixed
diff --git a/src/test/ui/parser/issues/issue-54521-3.rs b/tests/ui/parser/issues/issue-54521-3.rs
index f1d685041..f1d685041 100644
--- a/src/test/ui/parser/issues/issue-54521-3.rs
+++ b/tests/ui/parser/issues/issue-54521-3.rs
diff --git a/src/test/ui/parser/issues/issue-54521-3.stderr b/tests/ui/parser/issues/issue-54521-3.stderr
index 0f23dd621..0f23dd621 100644
--- a/src/test/ui/parser/issues/issue-54521-3.stderr
+++ b/tests/ui/parser/issues/issue-54521-3.stderr
diff --git a/src/test/ui/parser/issues/issue-5544-a.rs b/tests/ui/parser/issues/issue-5544-a.rs
index 3c239c73b..3c239c73b 100644
--- a/src/test/ui/parser/issues/issue-5544-a.rs
+++ b/tests/ui/parser/issues/issue-5544-a.rs
diff --git a/src/test/ui/parser/issues/issue-5544-a.stderr b/tests/ui/parser/issues/issue-5544-a.stderr
index de579c3c1..6e68c7585 100644
--- a/src/test/ui/parser/issues/issue-5544-a.stderr
+++ b/tests/ui/parser/issues/issue-5544-a.stderr
@@ -3,6 +3,8 @@ error: integer literal is too large
    |
 LL |     let __isize = 340282366920938463463374607431768211456; // 2^128
    |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `340282366920938463463374607431768211455`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issues/issue-5544-b.rs b/tests/ui/parser/issues/issue-5544-b.rs
index 93f2ff271..93f2ff271 100644
--- a/src/test/ui/parser/issues/issue-5544-b.rs
+++ b/tests/ui/parser/issues/issue-5544-b.rs
diff --git a/src/test/ui/parser/issues/issue-5544-b.stderr b/tests/ui/parser/issues/issue-5544-b.stderr
index 7df212ded..5d0e76d5d 100644
--- a/src/test/ui/parser/issues/issue-5544-b.stderr
+++ b/tests/ui/parser/issues/issue-5544-b.stderr
@@ -3,6 +3,8 @@ error: integer literal is too large
    |
 LL |     let __isize = 0xffff_ffff_ffff_ffff_ffff_ffff_ffff_ffff_ff;
    |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `0xffffffffffffffffffffffffffffffff`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issues/issue-56031.rs b/tests/ui/parser/issues/issue-56031.rs
index b68f56814..b68f56814 100644
--- a/src/test/ui/parser/issues/issue-56031.rs
+++ b/tests/ui/parser/issues/issue-56031.rs
diff --git a/src/test/ui/parser/issues/issue-56031.stderr b/tests/ui/parser/issues/issue-56031.stderr
index 2fa05dd2d..2fa05dd2d 100644
--- a/src/test/ui/parser/issues/issue-56031.stderr
+++ b/tests/ui/parser/issues/issue-56031.stderr
diff --git a/src/test/ui/parser/issues/issue-57198.rs b/tests/ui/parser/issues/issue-57198.rs
index 714a46cbc..714a46cbc 100644
--- a/src/test/ui/parser/issues/issue-57198.rs
+++ b/tests/ui/parser/issues/issue-57198.rs
diff --git a/src/test/ui/parser/issues/issue-57198.stderr b/tests/ui/parser/issues/issue-57198.stderr
index dd70b4022..dd70b4022 100644
--- a/src/test/ui/parser/issues/issue-57198.stderr
+++ b/tests/ui/parser/issues/issue-57198.stderr
diff --git a/src/test/ui/parser/issues/issue-57684.fixed b/tests/ui/parser/issues/issue-57684.fixed
index 4a432206d..4a432206d 100644
--- a/src/test/ui/parser/issues/issue-57684.fixed
+++ b/tests/ui/parser/issues/issue-57684.fixed
diff --git a/src/test/ui/parser/issues/issue-57684.rs b/tests/ui/parser/issues/issue-57684.rs
index 7a62785e3..7a62785e3 100644
--- a/src/test/ui/parser/issues/issue-57684.rs
+++ b/tests/ui/parser/issues/issue-57684.rs
diff --git a/src/test/ui/parser/issues/issue-57684.stderr b/tests/ui/parser/issues/issue-57684.stderr
index 514bbffde..514bbffde 100644
--- a/src/test/ui/parser/issues/issue-57684.stderr
+++ b/tests/ui/parser/issues/issue-57684.stderr
diff --git a/src/test/ui/parser/issues/issue-57819.fixed b/tests/ui/parser/issues/issue-57819.fixed
index 3fab21db2..3fab21db2 100644
--- a/src/test/ui/parser/issues/issue-57819.fixed
+++ b/tests/ui/parser/issues/issue-57819.fixed
diff --git a/src/test/ui/parser/issues/issue-57819.rs b/tests/ui/parser/issues/issue-57819.rs
index 5cafbf439..5cafbf439 100644
--- a/src/test/ui/parser/issues/issue-57819.rs
+++ b/tests/ui/parser/issues/issue-57819.rs
diff --git a/src/test/ui/parser/issues/issue-57819.stderr b/tests/ui/parser/issues/issue-57819.stderr
index 493e9835b..493e9835b 100644
--- a/src/test/ui/parser/issues/issue-57819.stderr
+++ b/tests/ui/parser/issues/issue-57819.stderr
diff --git a/src/test/ui/parser/issues/issue-5806.rs b/tests/ui/parser/issues/issue-5806.rs
index b694642a9..b694642a9 100644
--- a/src/test/ui/parser/issues/issue-5806.rs
+++ b/tests/ui/parser/issues/issue-5806.rs
diff --git a/src/test/ui/parser/issues/issue-5806.stderr b/tests/ui/parser/issues/issue-5806.stderr
index bdb5c91ff..bdb5c91ff 100644
--- a/src/test/ui/parser/issues/issue-5806.stderr
+++ b/tests/ui/parser/issues/issue-5806.stderr
diff --git a/src/test/ui/parser/issues/issue-58094-missing-right-square-bracket.rs b/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.rs
index 25699f9fe..25699f9fe 100644
--- a/src/test/ui/parser/issues/issue-58094-missing-right-square-bracket.rs
+++ b/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.rs
diff --git a/src/test/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr b/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr
index 8a44ee761..8a44ee761 100644
--- a/src/test/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr
+++ b/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr
diff --git a/src/test/ui/parser/issues/issue-58856-1.rs b/tests/ui/parser/issues/issue-58856-1.rs
index ea80eb871..ea80eb871 100644
--- a/src/test/ui/parser/issues/issue-58856-1.rs
+++ b/tests/ui/parser/issues/issue-58856-1.rs
diff --git a/src/test/ui/parser/issues/issue-58856-1.stderr b/tests/ui/parser/issues/issue-58856-1.stderr
index 96151f3fe..96151f3fe 100644
--- a/src/test/ui/parser/issues/issue-58856-1.stderr
+++ b/tests/ui/parser/issues/issue-58856-1.stderr
diff --git a/src/test/ui/parser/issues/issue-58856-2.rs b/tests/ui/parser/issues/issue-58856-2.rs
index 9356d57b0..9356d57b0 100644
--- a/src/test/ui/parser/issues/issue-58856-2.rs
+++ b/tests/ui/parser/issues/issue-58856-2.rs
diff --git a/src/test/ui/parser/issues/issue-58856-2.stderr b/tests/ui/parser/issues/issue-58856-2.stderr
index 627dd3890..627dd3890 100644
--- a/src/test/ui/parser/issues/issue-58856-2.stderr
+++ b/tests/ui/parser/issues/issue-58856-2.stderr
diff --git a/src/test/ui/parser/issues/issue-59418.rs b/tests/ui/parser/issues/issue-59418.rs
index 0fa191d4a..0fa191d4a 100644
--- a/src/test/ui/parser/issues/issue-59418.rs
+++ b/tests/ui/parser/issues/issue-59418.rs
diff --git a/src/test/ui/parser/issues/issue-59418.stderr b/tests/ui/parser/issues/issue-59418.stderr
index 347051e9f..347051e9f 100644
--- a/src/test/ui/parser/issues/issue-59418.stderr
+++ b/tests/ui/parser/issues/issue-59418.stderr
diff --git a/src/test/ui/parser/issues/issue-60075.rs b/tests/ui/parser/issues/issue-60075.rs
index e89d78ee8..e89d78ee8 100644
--- a/src/test/ui/parser/issues/issue-60075.rs
+++ b/tests/ui/parser/issues/issue-60075.rs
diff --git a/src/test/ui/parser/issues/issue-60075.stderr b/tests/ui/parser/issues/issue-60075.stderr
index 210ef700c..210ef700c 100644
--- a/src/test/ui/parser/issues/issue-60075.stderr
+++ b/tests/ui/parser/issues/issue-60075.stderr
diff --git a/src/test/ui/parser/issues/issue-62524.rs b/tests/ui/parser/issues/issue-62524.rs
index 5259dfe2e..5259dfe2e 100644
--- a/src/test/ui/parser/issues/issue-62524.rs
+++ b/tests/ui/parser/issues/issue-62524.rs
diff --git a/src/test/ui/parser/issues/issue-62524.stderr b/tests/ui/parser/issues/issue-62524.stderr
index 55eed0402..55eed0402 100644
--- a/src/test/ui/parser/issues/issue-62524.stderr
+++ b/tests/ui/parser/issues/issue-62524.stderr
diff --git a/src/test/ui/parser/issues/issue-62546.rs b/tests/ui/parser/issues/issue-62546.rs
index f06b65058..f06b65058 100644
--- a/src/test/ui/parser/issues/issue-62546.rs
+++ b/tests/ui/parser/issues/issue-62546.rs
diff --git a/src/test/ui/parser/issues/issue-62546.stderr b/tests/ui/parser/issues/issue-62546.stderr
index 32c61391e..32c61391e 100644
--- a/src/test/ui/parser/issues/issue-62546.stderr
+++ b/tests/ui/parser/issues/issue-62546.stderr
diff --git a/src/test/ui/parser/issues/issue-62554.rs b/tests/ui/parser/issues/issue-62554.rs
index cfd02183c..cfd02183c 100644
--- a/src/test/ui/parser/issues/issue-62554.rs
+++ b/tests/ui/parser/issues/issue-62554.rs
diff --git a/src/test/ui/parser/issues/issue-62554.stderr b/tests/ui/parser/issues/issue-62554.stderr
index 9e62572e3..9e62572e3 100644
--- a/src/test/ui/parser/issues/issue-62554.stderr
+++ b/tests/ui/parser/issues/issue-62554.stderr
diff --git a/src/test/ui/parser/issues/issue-62660.rs b/tests/ui/parser/issues/issue-62660.rs
index 33c8a9fa3..33c8a9fa3 100644
--- a/src/test/ui/parser/issues/issue-62660.rs
+++ b/tests/ui/parser/issues/issue-62660.rs
diff --git a/src/test/ui/parser/issues/issue-62660.stderr b/tests/ui/parser/issues/issue-62660.stderr
index 14c0bdcb1..14c0bdcb1 100644
--- a/src/test/ui/parser/issues/issue-62660.stderr
+++ b/tests/ui/parser/issues/issue-62660.stderr
diff --git a/src/test/ui/parser/issues/issue-62881.rs b/tests/ui/parser/issues/issue-62881.rs
index b9204595f..b9204595f 100644
--- a/src/test/ui/parser/issues/issue-62881.rs
+++ b/tests/ui/parser/issues/issue-62881.rs
diff --git a/src/test/ui/parser/issues/issue-62881.stderr b/tests/ui/parser/issues/issue-62881.stderr
index 87be69baa..87be69baa 100644
--- a/src/test/ui/parser/issues/issue-62881.stderr
+++ b/tests/ui/parser/issues/issue-62881.stderr
diff --git a/src/test/ui/parser/issues/issue-62894.rs b/tests/ui/parser/issues/issue-62894.rs
index b9c0bf834..b9c0bf834 100644
--- a/src/test/ui/parser/issues/issue-62894.rs
+++ b/tests/ui/parser/issues/issue-62894.rs
diff --git a/src/test/ui/parser/issues/issue-62894.stderr b/tests/ui/parser/issues/issue-62894.stderr
index ae8992691..07a203bf4 100644
--- a/src/test/ui/parser/issues/issue-62894.stderr
+++ b/tests/ui/parser/issues/issue-62894.stderr
@@ -42,11 +42,9 @@ LL | fn f() { assert_eq!(f(), (), assert_eq!(assert_eq!
 LL |
 LL | fn main() {}
    | ^^ unexpected token
+  --> $SRC_DIR/core/src/macros/mod.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/macros/mod.rs:LL:COL
-   |
-LL |     ($left:expr, $right:expr $(,)?) => {
-   |      ---------- while parsing argument for this `expr` macro fragment
+   = note: while parsing argument for this `expr` macro fragment
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/parser/issues/issue-62895.rs b/tests/ui/parser/issues/issue-62895.rs
index 53f17405d..53f17405d 100644
--- a/src/test/ui/parser/issues/issue-62895.rs
+++ b/tests/ui/parser/issues/issue-62895.rs
diff --git a/src/test/ui/parser/issues/issue-62895.stderr b/tests/ui/parser/issues/issue-62895.stderr
index 2e7e500f4..2e7e500f4 100644
--- a/src/test/ui/parser/issues/issue-62895.stderr
+++ b/tests/ui/parser/issues/issue-62895.stderr
diff --git a/src/test/ui/parser/issues/issue-62913.rs b/tests/ui/parser/issues/issue-62913.rs
index 0db06f636..0db06f636 100644
--- a/src/test/ui/parser/issues/issue-62913.rs
+++ b/tests/ui/parser/issues/issue-62913.rs
diff --git a/src/test/ui/parser/issues/issue-62913.stderr b/tests/ui/parser/issues/issue-62913.stderr
index 6f385e8dc..6f385e8dc 100644
--- a/src/test/ui/parser/issues/issue-62913.stderr
+++ b/tests/ui/parser/issues/issue-62913.stderr
diff --git a/src/test/ui/parser/issues/issue-62973.rs b/tests/ui/parser/issues/issue-62973.rs
index 1c5d0c6f8..1c5d0c6f8 100644
--- a/src/test/ui/parser/issues/issue-62973.rs
+++ b/tests/ui/parser/issues/issue-62973.rs
diff --git a/src/test/ui/parser/issues/issue-62973.stderr b/tests/ui/parser/issues/issue-62973.stderr
index 4737bc718..4737bc718 100644
--- a/src/test/ui/parser/issues/issue-62973.stderr
+++ b/tests/ui/parser/issues/issue-62973.stderr
diff --git a/src/test/ui/parser/issues/issue-63115-range-pat-interpolated.rs b/tests/ui/parser/issues/issue-63115-range-pat-interpolated.rs
index b6e5091b6..b6e5091b6 100644
--- a/src/test/ui/parser/issues/issue-63115-range-pat-interpolated.rs
+++ b/tests/ui/parser/issues/issue-63115-range-pat-interpolated.rs
diff --git a/src/test/ui/parser/issues/issue-63116.rs b/tests/ui/parser/issues/issue-63116.rs
index 430bc1d71..430bc1d71 100644
--- a/src/test/ui/parser/issues/issue-63116.rs
+++ b/tests/ui/parser/issues/issue-63116.rs
diff --git a/src/test/ui/parser/issues/issue-63116.stderr b/tests/ui/parser/issues/issue-63116.stderr
index cfdd99d14..cfdd99d14 100644
--- a/src/test/ui/parser/issues/issue-63116.stderr
+++ b/tests/ui/parser/issues/issue-63116.stderr
diff --git a/src/test/ui/parser/issues/issue-63135.rs b/tests/ui/parser/issues/issue-63135.rs
index a5a8de854..a5a8de854 100644
--- a/src/test/ui/parser/issues/issue-63135.rs
+++ b/tests/ui/parser/issues/issue-63135.rs
diff --git a/src/test/ui/parser/issues/issue-63135.stderr b/tests/ui/parser/issues/issue-63135.stderr
index 80e9ac5be..80e9ac5be 100644
--- a/src/test/ui/parser/issues/issue-63135.stderr
+++ b/tests/ui/parser/issues/issue-63135.stderr
diff --git a/src/test/ui/parser/issues/issue-64732.rs b/tests/ui/parser/issues/issue-64732.rs
index 2db51ea60..2db51ea60 100644
--- a/src/test/ui/parser/issues/issue-64732.rs
+++ b/tests/ui/parser/issues/issue-64732.rs
diff --git a/src/test/ui/parser/issues/issue-64732.stderr b/tests/ui/parser/issues/issue-64732.stderr
index 804625493..804625493 100644
--- a/src/test/ui/parser/issues/issue-64732.stderr
+++ b/tests/ui/parser/issues/issue-64732.stderr
diff --git a/src/test/ui/parser/issues/issue-65041-empty-vis-matcher-in-enum.rs b/tests/ui/parser/issues/issue-65041-empty-vis-matcher-in-enum.rs
index ef89e31d8..ef89e31d8 100644
--- a/src/test/ui/parser/issues/issue-65041-empty-vis-matcher-in-enum.rs
+++ b/tests/ui/parser/issues/issue-65041-empty-vis-matcher-in-enum.rs
diff --git a/src/test/ui/parser/issues/issue-65041-empty-vis-matcher-in-trait.rs b/tests/ui/parser/issues/issue-65041-empty-vis-matcher-in-trait.rs
index b08767b21..b08767b21 100644
--- a/src/test/ui/parser/issues/issue-65041-empty-vis-matcher-in-trait.rs
+++ b/tests/ui/parser/issues/issue-65041-empty-vis-matcher-in-trait.rs
diff --git a/src/test/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.rs b/tests/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.rs
index 30f3781bf..30f3781bf 100644
--- a/src/test/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.rs
+++ b/tests/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.rs
diff --git a/src/test/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr b/tests/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr
index 8c032e588..8c032e588 100644
--- a/src/test/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr
+++ b/tests/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr
diff --git a/src/test/ui/parser/issues/issue-65257-invalid-var-decl-recovery.rs b/tests/ui/parser/issues/issue-65257-invalid-var-decl-recovery.rs
index c1826f8ca..c1826f8ca 100644
--- a/src/test/ui/parser/issues/issue-65257-invalid-var-decl-recovery.rs
+++ b/tests/ui/parser/issues/issue-65257-invalid-var-decl-recovery.rs
diff --git a/src/test/ui/parser/issues/issue-65257-invalid-var-decl-recovery.stderr b/tests/ui/parser/issues/issue-65257-invalid-var-decl-recovery.stderr
index 0a88dd2c4..0a88dd2c4 100644
--- a/src/test/ui/parser/issues/issue-65257-invalid-var-decl-recovery.stderr
+++ b/tests/ui/parser/issues/issue-65257-invalid-var-decl-recovery.stderr
diff --git a/src/test/ui/parser/issues/issue-65846-rollback-gating-failing-matcher.rs b/tests/ui/parser/issues/issue-65846-rollback-gating-failing-matcher.rs
index 76c07bbfd..76c07bbfd 100644
--- a/src/test/ui/parser/issues/issue-65846-rollback-gating-failing-matcher.rs
+++ b/tests/ui/parser/issues/issue-65846-rollback-gating-failing-matcher.rs
diff --git a/src/test/ui/parser/issues/issue-6610.rs b/tests/ui/parser/issues/issue-6610.rs
index 9ed5a6122..9ed5a6122 100644
--- a/src/test/ui/parser/issues/issue-6610.rs
+++ b/tests/ui/parser/issues/issue-6610.rs
diff --git a/src/test/ui/parser/issues/issue-6610.stderr b/tests/ui/parser/issues/issue-6610.stderr
index 4a3bc7525..4a3bc7525 100644
--- a/src/test/ui/parser/issues/issue-6610.stderr
+++ b/tests/ui/parser/issues/issue-6610.stderr
diff --git a/src/test/ui/parser/issues/issue-66357-unexpected-unreachable.rs b/tests/ui/parser/issues/issue-66357-unexpected-unreachable.rs
index aed428bfc..aed428bfc 100644
--- a/src/test/ui/parser/issues/issue-66357-unexpected-unreachable.rs
+++ b/tests/ui/parser/issues/issue-66357-unexpected-unreachable.rs
diff --git a/src/test/ui/parser/issues/issue-66357-unexpected-unreachable.stderr b/tests/ui/parser/issues/issue-66357-unexpected-unreachable.stderr
index 6cbab855c..6cbab855c 100644
--- a/src/test/ui/parser/issues/issue-66357-unexpected-unreachable.stderr
+++ b/tests/ui/parser/issues/issue-66357-unexpected-unreachable.stderr
diff --git a/src/test/ui/parser/issues/issue-66473.rs b/tests/ui/parser/issues/issue-66473.rs
index 9db4521bb..9db4521bb 100644
--- a/src/test/ui/parser/issues/issue-66473.rs
+++ b/tests/ui/parser/issues/issue-66473.rs
diff --git a/tests/ui/parser/issues/issue-66473.stderr b/tests/ui/parser/issues/issue-66473.stderr
new file mode 100644
index 000000000..0e8b0a5da
--- /dev/null
+++ b/tests/ui/parser/issues/issue-66473.stderr
diff --git a/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.fixed b/tests/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.fixed
index 95019b278..95019b278 100644
--- a/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.fixed
+++ b/tests/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.fixed
diff --git a/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.rs b/tests/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.rs
index 82f54f8fa..82f54f8fa 100644
--- a/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.rs
+++ b/tests/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.rs
diff --git a/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.stderr b/tests/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.stderr
index a4a422948..a4a422948 100644
--- a/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.stderr
+++ b/tests/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.stderr
diff --git a/src/test/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.rs b/tests/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.rs
index 87222ef4b..87222ef4b 100644
--- a/src/test/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.rs
+++ b/tests/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.rs
diff --git a/src/test/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.stderr b/tests/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.stderr
index a00f37ed6..a00f37ed6 100644
--- a/src/test/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.stderr
+++ b/tests/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.stderr
diff --git a/src/test/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.rs b/tests/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.rs
index 3c49a5a97..3c49a5a97 100644
--- a/src/test/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.rs
+++ b/tests/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.rs
diff --git a/src/test/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.stderr b/tests/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.stderr
index adabb6859..adabb6859 100644
--- a/src/test/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.stderr
+++ b/tests/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.stderr
diff --git a/src/test/ui/parser/issues/issue-68629.rs b/tests/ui/parser/issues/issue-68629.rs
index 672a31f12..672a31f12 100644
--- a/src/test/ui/parser/issues/issue-68629.rs
+++ b/tests/ui/parser/issues/issue-68629.rs
diff --git a/src/test/ui/parser/issues/issue-68629.stderr b/tests/ui/parser/issues/issue-68629.stderr
index b2c7dddc8..43a903e6c 100644
--- a/src/test/ui/parser/issues/issue-68629.stderr
+++ b/tests/ui/parser/issues/issue-68629.stderr
diff --git a/src/test/ui/parser/issues/issue-68730.rs b/tests/ui/parser/issues/issue-68730.rs
index 20e18b4bc..20e18b4bc 100644
--- a/src/test/ui/parser/issues/issue-68730.rs
+++ b/tests/ui/parser/issues/issue-68730.rs
diff --git a/src/test/ui/parser/issues/issue-68730.stderr b/tests/ui/parser/issues/issue-68730.stderr
index 6585a19d9..5bca5bbeb 100644
--- a/src/test/ui/parser/issues/issue-68730.stderr
+++ b/tests/ui/parser/issues/issue-68730.stderr
diff --git a/src/test/ui/parser/issues/issue-68788-in-trait-item-propagation.rs b/tests/ui/parser/issues/issue-68788-in-trait-item-propagation.rs
index 7c3dd1d5a..7c3dd1d5a 100644
--- a/src/test/ui/parser/issues/issue-68788-in-trait-item-propagation.rs
+++ b/tests/ui/parser/issues/issue-68788-in-trait-item-propagation.rs
diff --git a/src/test/ui/parser/issues/issue-68890-2.rs b/tests/ui/parser/issues/issue-68890-2.rs
index 29c123521..29c123521 100644
--- a/src/test/ui/parser/issues/issue-68890-2.rs
+++ b/tests/ui/parser/issues/issue-68890-2.rs
diff --git a/src/test/ui/parser/issues/issue-68890-2.stderr b/tests/ui/parser/issues/issue-68890-2.stderr
index d9fb7beeb..d9fb7beeb 100644
--- a/src/test/ui/parser/issues/issue-68890-2.stderr
+++ b/tests/ui/parser/issues/issue-68890-2.stderr
diff --git a/src/test/ui/parser/issues/issue-68890.rs b/tests/ui/parser/issues/issue-68890.rs
index bab4ed7f8..bab4ed7f8 100644
--- a/src/test/ui/parser/issues/issue-68890.rs
+++ b/tests/ui/parser/issues/issue-68890.rs
diff --git a/src/test/ui/parser/issues/issue-68890.stderr b/tests/ui/parser/issues/issue-68890.stderr
index 2a3bf6b41..2a3bf6b41 100644
--- a/src/test/ui/parser/issues/issue-68890.stderr
+++ b/tests/ui/parser/issues/issue-68890.stderr
diff --git a/src/test/ui/parser/issues/issue-70050-ntliteral-accepts-negated-lit.rs b/tests/ui/parser/issues/issue-70050-ntliteral-accepts-negated-lit.rs
index aca9d9eb0..aca9d9eb0 100644
--- a/src/test/ui/parser/issues/issue-70050-ntliteral-accepts-negated-lit.rs
+++ b/tests/ui/parser/issues/issue-70050-ntliteral-accepts-negated-lit.rs
diff --git a/src/test/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.rs b/tests/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.rs
index ca8abd78c..ca8abd78c 100644
--- a/src/test/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.rs
+++ b/tests/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.rs
diff --git a/src/test/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.stderr b/tests/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.stderr
index 4961e8fc0..4961e8fc0 100644
--- a/src/test/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.stderr
+++ b/tests/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.stderr
diff --git a/src/test/ui/parser/issues/issue-70388-without-witness.fixed b/tests/ui/parser/issues/issue-70388-without-witness.fixed
index 8d981405e..8d981405e 100644
--- a/src/test/ui/parser/issues/issue-70388-without-witness.fixed
+++ b/tests/ui/parser/issues/issue-70388-without-witness.fixed
diff --git a/src/test/ui/parser/issues/issue-70388-without-witness.rs b/tests/ui/parser/issues/issue-70388-without-witness.rs
index bf3607308..bf3607308 100644
--- a/src/test/ui/parser/issues/issue-70388-without-witness.rs
+++ b/tests/ui/parser/issues/issue-70388-without-witness.rs
diff --git a/src/test/ui/parser/issues/issue-70388-without-witness.stderr b/tests/ui/parser/issues/issue-70388-without-witness.stderr
index b750ad4c6..b750ad4c6 100644
--- a/src/test/ui/parser/issues/issue-70388-without-witness.stderr
+++ b/tests/ui/parser/issues/issue-70388-without-witness.stderr
diff --git a/src/test/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.rs b/tests/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.rs
index aeccd0d9f..aeccd0d9f 100644
--- a/src/test/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.rs
+++ b/tests/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.rs
diff --git a/src/test/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.stderr b/tests/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.stderr
index 421f14540..421f14540 100644
--- a/src/test/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.stderr
+++ b/tests/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.stderr
diff --git a/src/test/ui/parser/issues/issue-70552-ascription-in-parens-after-call.rs b/tests/ui/parser/issues/issue-70552-ascription-in-parens-after-call.rs
index 9b6dd7db4..9b6dd7db4 100644
--- a/src/test/ui/parser/issues/issue-70552-ascription-in-parens-after-call.rs
+++ b/tests/ui/parser/issues/issue-70552-ascription-in-parens-after-call.rs
diff --git a/src/test/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr b/tests/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr
index f03c92e1b..f03c92e1b 100644
--- a/src/test/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr
+++ b/tests/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr
diff --git a/src/test/ui/parser/issues/issue-70583-block-is-empty-1.rs b/tests/ui/parser/issues/issue-70583-block-is-empty-1.rs
index f560f68f6..f560f68f6 100644
--- a/src/test/ui/parser/issues/issue-70583-block-is-empty-1.rs
+++ b/tests/ui/parser/issues/issue-70583-block-is-empty-1.rs
diff --git a/src/test/ui/parser/issues/issue-70583-block-is-empty-1.stderr b/tests/ui/parser/issues/issue-70583-block-is-empty-1.stderr
index 39bf113ef..39bf113ef 100644
--- a/src/test/ui/parser/issues/issue-70583-block-is-empty-1.stderr
+++ b/tests/ui/parser/issues/issue-70583-block-is-empty-1.stderr
diff --git a/src/test/ui/parser/issues/issue-70583-block-is-empty-2.rs b/tests/ui/parser/issues/issue-70583-block-is-empty-2.rs
index 80f53338a..80f53338a 100644
--- a/src/test/ui/parser/issues/issue-70583-block-is-empty-2.rs
+++ b/tests/ui/parser/issues/issue-70583-block-is-empty-2.rs
diff --git a/src/test/ui/parser/issues/issue-70583-block-is-empty-2.stderr b/tests/ui/parser/issues/issue-70583-block-is-empty-2.stderr
index 5d37b2164..5d37b2164 100644
--- a/src/test/ui/parser/issues/issue-70583-block-is-empty-2.stderr
+++ b/tests/ui/parser/issues/issue-70583-block-is-empty-2.stderr
diff --git a/src/test/ui/parser/issues/issue-7222.rs b/tests/ui/parser/issues/issue-7222.rs
index 649073166..649073166 100644
--- a/src/test/ui/parser/issues/issue-7222.rs
+++ b/tests/ui/parser/issues/issue-7222.rs
diff --git a/src/test/ui/parser/issues/issue-72253.rs b/tests/ui/parser/issues/issue-72253.rs
index 1446a796f..1446a796f 100644
--- a/src/test/ui/parser/issues/issue-72253.rs
+++ b/tests/ui/parser/issues/issue-72253.rs
diff --git a/src/test/ui/parser/issues/issue-72253.stderr b/tests/ui/parser/issues/issue-72253.stderr
index 477fa09f4..477fa09f4 100644
--- a/src/test/ui/parser/issues/issue-72253.stderr
+++ b/tests/ui/parser/issues/issue-72253.stderr
diff --git a/src/test/ui/parser/issues/issue-72373.rs b/tests/ui/parser/issues/issue-72373.rs
index 4da6061c2..4da6061c2 100644
--- a/src/test/ui/parser/issues/issue-72373.rs
+++ b/tests/ui/parser/issues/issue-72373.rs
diff --git a/src/test/ui/parser/issues/issue-72373.stderr b/tests/ui/parser/issues/issue-72373.stderr
index 0bb99a01e..0bb99a01e 100644
--- a/src/test/ui/parser/issues/issue-72373.stderr
+++ b/tests/ui/parser/issues/issue-72373.stderr
diff --git a/src/test/ui/parser/issues/issue-73568-lifetime-after-mut.rs b/tests/ui/parser/issues/issue-73568-lifetime-after-mut.rs
index 5f731f8db..5f731f8db 100644
--- a/src/test/ui/parser/issues/issue-73568-lifetime-after-mut.rs
+++ b/tests/ui/parser/issues/issue-73568-lifetime-after-mut.rs
diff --git a/src/test/ui/parser/issues/issue-73568-lifetime-after-mut.stderr b/tests/ui/parser/issues/issue-73568-lifetime-after-mut.stderr
index 799bc16bd..799bc16bd 100644
--- a/src/test/ui/parser/issues/issue-73568-lifetime-after-mut.stderr
+++ b/tests/ui/parser/issues/issue-73568-lifetime-after-mut.stderr
diff --git a/src/test/ui/parser/issues/issue-75599.rs b/tests/ui/parser/issues/issue-75599.rs
index 0857676e4..0857676e4 100644
--- a/src/test/ui/parser/issues/issue-75599.rs
+++ b/tests/ui/parser/issues/issue-75599.rs
diff --git a/src/test/ui/parser/issues/issue-76437-async.rs b/tests/ui/parser/issues/issue-76437-async.rs
index 84ee3dd21..84ee3dd21 100644
--- a/src/test/ui/parser/issues/issue-76437-async.rs
+++ b/tests/ui/parser/issues/issue-76437-async.rs
diff --git a/src/test/ui/parser/issues/issue-76437-async.stderr b/tests/ui/parser/issues/issue-76437-async.stderr
index 2c9c2a8cf..2c9c2a8cf 100644
--- a/src/test/ui/parser/issues/issue-76437-async.stderr
+++ b/tests/ui/parser/issues/issue-76437-async.stderr
diff --git a/src/test/ui/parser/issues/issue-76437-const-async-unsafe.rs b/tests/ui/parser/issues/issue-76437-const-async-unsafe.rs
index f1e06e4ad..f1e06e4ad 100644
--- a/src/test/ui/parser/issues/issue-76437-const-async-unsafe.rs
+++ b/tests/ui/parser/issues/issue-76437-const-async-unsafe.rs
diff --git a/src/test/ui/parser/issues/issue-76437-const-async-unsafe.stderr b/tests/ui/parser/issues/issue-76437-const-async-unsafe.stderr
index 2e91beda1..2e91beda1 100644
--- a/src/test/ui/parser/issues/issue-76437-const-async-unsafe.stderr
+++ b/tests/ui/parser/issues/issue-76437-const-async-unsafe.stderr
diff --git a/src/test/ui/parser/issues/issue-76437-const-async.rs b/tests/ui/parser/issues/issue-76437-const-async.rs
index 3c789fdcd..3c789fdcd 100644
--- a/src/test/ui/parser/issues/issue-76437-const-async.rs
+++ b/tests/ui/parser/issues/issue-76437-const-async.rs
diff --git a/src/test/ui/parser/issues/issue-76437-const-async.stderr b/tests/ui/parser/issues/issue-76437-const-async.stderr
index 21b96c14d..21b96c14d 100644
--- a/src/test/ui/parser/issues/issue-76437-const-async.stderr
+++ b/tests/ui/parser/issues/issue-76437-const-async.stderr
diff --git a/src/test/ui/parser/issues/issue-76437-const.rs b/tests/ui/parser/issues/issue-76437-const.rs
index d3815a523..d3815a523 100644
--- a/src/test/ui/parser/issues/issue-76437-const.rs
+++ b/tests/ui/parser/issues/issue-76437-const.rs
diff --git a/src/test/ui/parser/issues/issue-76437-const.stderr b/tests/ui/parser/issues/issue-76437-const.stderr
index cf80d9a90..cf80d9a90 100644
--- a/src/test/ui/parser/issues/issue-76437-const.stderr
+++ b/tests/ui/parser/issues/issue-76437-const.stderr
diff --git a/src/test/ui/parser/issues/issue-76437-pub-crate-unsafe.rs b/tests/ui/parser/issues/issue-76437-pub-crate-unsafe.rs
index daa1d1207..daa1d1207 100644
--- a/src/test/ui/parser/issues/issue-76437-pub-crate-unsafe.rs
+++ b/tests/ui/parser/issues/issue-76437-pub-crate-unsafe.rs
diff --git a/src/test/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr b/tests/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr
index fa8f13721..fa8f13721 100644
--- a/src/test/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr
+++ b/tests/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr
diff --git a/src/test/ui/parser/issues/issue-76437-unsafe.rs b/tests/ui/parser/issues/issue-76437-unsafe.rs
index 785a79a79..785a79a79 100644
--- a/src/test/ui/parser/issues/issue-76437-unsafe.rs
+++ b/tests/ui/parser/issues/issue-76437-unsafe.rs
diff --git a/src/test/ui/parser/issues/issue-76437-unsafe.stderr b/tests/ui/parser/issues/issue-76437-unsafe.stderr
index c63292ef8..c63292ef8 100644
--- a/src/test/ui/parser/issues/issue-76437-unsafe.stderr
+++ b/tests/ui/parser/issues/issue-76437-unsafe.stderr
diff --git a/src/test/ui/parser/issues/issue-76597.fixed b/tests/ui/parser/issues/issue-76597.fixed
index 2d7a30b83..2d7a30b83 100644
--- a/src/test/ui/parser/issues/issue-76597.fixed
+++ b/tests/ui/parser/issues/issue-76597.fixed
diff --git a/src/test/ui/parser/issues/issue-76597.rs b/tests/ui/parser/issues/issue-76597.rs
index 521b9c64b..521b9c64b 100644
--- a/src/test/ui/parser/issues/issue-76597.rs
+++ b/tests/ui/parser/issues/issue-76597.rs
diff --git a/src/test/ui/parser/issues/issue-76597.stderr b/tests/ui/parser/issues/issue-76597.stderr
index 50b23329f..50b23329f 100644
--- a/src/test/ui/parser/issues/issue-76597.stderr
+++ b/tests/ui/parser/issues/issue-76597.stderr
diff --git a/src/test/ui/parser/issues/issue-7970b.rs b/tests/ui/parser/issues/issue-7970b.rs
index 1c4abce39..1c4abce39 100644
--- a/src/test/ui/parser/issues/issue-7970b.rs
+++ b/tests/ui/parser/issues/issue-7970b.rs
diff --git a/src/test/ui/parser/issues/issue-7970b.stderr b/tests/ui/parser/issues/issue-7970b.stderr
index a62226a8a..a62226a8a 100644
--- a/src/test/ui/parser/issues/issue-7970b.stderr
+++ b/tests/ui/parser/issues/issue-7970b.stderr
diff --git a/src/test/ui/parser/issues/issue-81806.rs b/tests/ui/parser/issues/issue-81806.rs
index ca86788df..ca86788df 100644
--- a/src/test/ui/parser/issues/issue-81806.rs
+++ b/tests/ui/parser/issues/issue-81806.rs
diff --git a/src/test/ui/parser/issues/issue-81806.stderr b/tests/ui/parser/issues/issue-81806.stderr
index 40873388d..40873388d 100644
--- a/src/test/ui/parser/issues/issue-81806.stderr
+++ b/tests/ui/parser/issues/issue-81806.stderr
diff --git a/src/test/ui/parser/issues/issue-83639.rs b/tests/ui/parser/issues/issue-83639.rs
index 6ddbedfa0..6ddbedfa0 100644
--- a/src/test/ui/parser/issues/issue-83639.rs
+++ b/tests/ui/parser/issues/issue-83639.rs
diff --git a/src/test/ui/parser/issues/issue-83639.stderr b/tests/ui/parser/issues/issue-83639.stderr
index 4c10df191..4c10df191 100644
--- a/src/test/ui/parser/issues/issue-83639.stderr
+++ b/tests/ui/parser/issues/issue-83639.stderr
diff --git a/src/test/ui/parser/issues/issue-84104.rs b/tests/ui/parser/issues/issue-84104.rs
index 998949b94..998949b94 100644
--- a/src/test/ui/parser/issues/issue-84104.rs
+++ b/tests/ui/parser/issues/issue-84104.rs
diff --git a/src/test/ui/parser/issues/issue-84104.stderr b/tests/ui/parser/issues/issue-84104.stderr
index aff31f2c9..aff31f2c9 100644
--- a/src/test/ui/parser/issues/issue-84104.stderr
+++ b/tests/ui/parser/issues/issue-84104.stderr
diff --git a/src/test/ui/parser/issues/issue-84117.rs b/tests/ui/parser/issues/issue-84117.rs
index c9ebf1335..c9ebf1335 100644
--- a/src/test/ui/parser/issues/issue-84117.rs
+++ b/tests/ui/parser/issues/issue-84117.rs
diff --git a/src/test/ui/parser/issues/issue-84117.stderr b/tests/ui/parser/issues/issue-84117.stderr
index 237bc11bd..237bc11bd 100644
--- a/src/test/ui/parser/issues/issue-84117.stderr
+++ b/tests/ui/parser/issues/issue-84117.stderr
diff --git a/src/test/ui/parser/issues/issue-84148-1.rs b/tests/ui/parser/issues/issue-84148-1.rs
index 9fa8086c2..9fa8086c2 100644
--- a/src/test/ui/parser/issues/issue-84148-1.rs
+++ b/tests/ui/parser/issues/issue-84148-1.rs
diff --git a/src/test/ui/parser/issues/issue-84148-1.stderr b/tests/ui/parser/issues/issue-84148-1.stderr
index 9261067c2..9261067c2 100644
--- a/src/test/ui/parser/issues/issue-84148-1.stderr
+++ b/tests/ui/parser/issues/issue-84148-1.stderr
diff --git a/src/test/ui/parser/issues/issue-84148-2.rs b/tests/ui/parser/issues/issue-84148-2.rs
index 2f6a7facf..2f6a7facf 100644
--- a/src/test/ui/parser/issues/issue-84148-2.rs
+++ b/tests/ui/parser/issues/issue-84148-2.rs
diff --git a/src/test/ui/parser/issues/issue-84148-2.stderr b/tests/ui/parser/issues/issue-84148-2.stderr
index 71d543f9b..71d543f9b 100644
--- a/src/test/ui/parser/issues/issue-84148-2.stderr
+++ b/tests/ui/parser/issues/issue-84148-2.stderr
diff --git a/src/test/ui/parser/issues/issue-8537.rs b/tests/ui/parser/issues/issue-8537.rs
index 9d0cbce6c..9d0cbce6c 100644
--- a/src/test/ui/parser/issues/issue-8537.rs
+++ b/tests/ui/parser/issues/issue-8537.rs
diff --git a/src/test/ui/parser/issues/issue-8537.stderr b/tests/ui/parser/issues/issue-8537.stderr
index 523cc9dc5..523cc9dc5 100644
--- a/src/test/ui/parser/issues/issue-8537.stderr
+++ b/tests/ui/parser/issues/issue-8537.stderr
diff --git a/src/test/ui/parser/issues/issue-86895.rs b/tests/ui/parser/issues/issue-86895.rs
index 4cd098431..4cd098431 100644
--- a/src/test/ui/parser/issues/issue-86895.rs
+++ b/tests/ui/parser/issues/issue-86895.rs
diff --git a/src/test/ui/parser/issues/issue-86895.stderr b/tests/ui/parser/issues/issue-86895.stderr
index 575d857c0..575d857c0 100644
--- a/src/test/ui/parser/issues/issue-86895.stderr
+++ b/tests/ui/parser/issues/issue-86895.stderr
diff --git a/src/test/ui/parser/issues/issue-87086-colon-path-sep.rs b/tests/ui/parser/issues/issue-87086-colon-path-sep.rs
index 0b7b67496..0b7b67496 100644
--- a/src/test/ui/parser/issues/issue-87086-colon-path-sep.rs
+++ b/tests/ui/parser/issues/issue-87086-colon-path-sep.rs
diff --git a/src/test/ui/parser/issues/issue-87086-colon-path-sep.stderr b/tests/ui/parser/issues/issue-87086-colon-path-sep.stderr
index 2050a16be..2050a16be 100644
--- a/src/test/ui/parser/issues/issue-87086-colon-path-sep.stderr
+++ b/tests/ui/parser/issues/issue-87086-colon-path-sep.stderr
diff --git a/src/test/ui/parser/issues/issue-87197-missing-semicolon.fixed b/tests/ui/parser/issues/issue-87197-missing-semicolon.fixed
index 53f071db7..53f071db7 100644
--- a/src/test/ui/parser/issues/issue-87197-missing-semicolon.fixed
+++ b/tests/ui/parser/issues/issue-87197-missing-semicolon.fixed
diff --git a/src/test/ui/parser/issues/issue-87197-missing-semicolon.rs b/tests/ui/parser/issues/issue-87197-missing-semicolon.rs
index db0edf452..db0edf452 100644
--- a/src/test/ui/parser/issues/issue-87197-missing-semicolon.rs
+++ b/tests/ui/parser/issues/issue-87197-missing-semicolon.rs
diff --git a/src/test/ui/parser/issues/issue-87197-missing-semicolon.stderr b/tests/ui/parser/issues/issue-87197-missing-semicolon.stderr
index 57772de1e..57772de1e 100644
--- a/src/test/ui/parser/issues/issue-87197-missing-semicolon.stderr
+++ b/tests/ui/parser/issues/issue-87197-missing-semicolon.stderr
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs b/tests/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs
index df0cd5439..df0cd5439 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr b/tests/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr
index 977c6ebfe..977c6ebfe 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs b/tests/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs
index bbebc99e9..bbebc99e9 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr b/tests/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr
index f455caba1..f455caba1 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs
index 4ff4cf5c8..4ff4cf5c8 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr
index e9eb14bf0..e9eb14bf0 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs
index 2f5fbc513..2f5fbc513 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr
index 0d2bc3472..0d2bc3472 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs
index df2412e3e..df2412e3e 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr
index 4224713cc..4224713cc 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr
diff --git a/src/test/ui/parser/issues/issue-87635.rs b/tests/ui/parser/issues/issue-87635.rs
index f70a87fb0..f70a87fb0 100644
--- a/src/test/ui/parser/issues/issue-87635.rs
+++ b/tests/ui/parser/issues/issue-87635.rs
diff --git a/src/test/ui/parser/issues/issue-87635.stderr b/tests/ui/parser/issues/issue-87635.stderr
index 1d459f1b9..1d459f1b9 100644
--- a/src/test/ui/parser/issues/issue-87635.stderr
+++ b/tests/ui/parser/issues/issue-87635.stderr
diff --git a/src/test/ui/parser/issues/issue-87812-path.rs b/tests/ui/parser/issues/issue-87812-path.rs
index b88780876..b88780876 100644
--- a/src/test/ui/parser/issues/issue-87812-path.rs
+++ b/tests/ui/parser/issues/issue-87812-path.rs
diff --git a/src/test/ui/parser/issues/issue-87812-path.stderr b/tests/ui/parser/issues/issue-87812-path.stderr
index f8ee05175..f8ee05175 100644
--- a/src/test/ui/parser/issues/issue-87812-path.stderr
+++ b/tests/ui/parser/issues/issue-87812-path.stderr
diff --git a/src/test/ui/parser/issues/issue-87812.rs b/tests/ui/parser/issues/issue-87812.rs
index 0ba87b995..0ba87b995 100644
--- a/src/test/ui/parser/issues/issue-87812.rs
+++ b/tests/ui/parser/issues/issue-87812.rs
diff --git a/src/test/ui/parser/issues/issue-87812.stderr b/tests/ui/parser/issues/issue-87812.stderr
index d61ee23a5..d61ee23a5 100644
--- a/src/test/ui/parser/issues/issue-87812.stderr
+++ b/tests/ui/parser/issues/issue-87812.stderr
diff --git a/src/test/ui/parser/issues/issue-88276-unary-plus.fixed b/tests/ui/parser/issues/issue-88276-unary-plus.fixed
index 25b7c340f..25b7c340f 100644
--- a/src/test/ui/parser/issues/issue-88276-unary-plus.fixed
+++ b/tests/ui/parser/issues/issue-88276-unary-plus.fixed
diff --git a/src/test/ui/parser/issues/issue-88276-unary-plus.rs b/tests/ui/parser/issues/issue-88276-unary-plus.rs
index 11b2e9d60..11b2e9d60 100644
--- a/src/test/ui/parser/issues/issue-88276-unary-plus.rs
+++ b/tests/ui/parser/issues/issue-88276-unary-plus.rs
diff --git a/src/test/ui/parser/issues/issue-88276-unary-plus.stderr b/tests/ui/parser/issues/issue-88276-unary-plus.stderr
index 363e08201..363e08201 100644
--- a/src/test/ui/parser/issues/issue-88276-unary-plus.stderr
+++ b/tests/ui/parser/issues/issue-88276-unary-plus.stderr
diff --git a/src/test/ui/parser/issues/issue-88583-union-as-ident.rs b/tests/ui/parser/issues/issue-88583-union-as-ident.rs
index b3d66d46b..b3d66d46b 100644
--- a/src/test/ui/parser/issues/issue-88583-union-as-ident.rs
+++ b/tests/ui/parser/issues/issue-88583-union-as-ident.rs
diff --git a/src/test/ui/parser/issues/issue-88770.rs b/tests/ui/parser/issues/issue-88770.rs
index bb69951c7..bb69951c7 100644
--- a/src/test/ui/parser/issues/issue-88770.rs
+++ b/tests/ui/parser/issues/issue-88770.rs
diff --git a/src/test/ui/parser/issues/issue-88770.stderr b/tests/ui/parser/issues/issue-88770.stderr
index 4e3a21613..4e3a21613 100644
--- a/src/test/ui/parser/issues/issue-88770.stderr
+++ b/tests/ui/parser/issues/issue-88770.stderr
diff --git a/src/test/ui/parser/issues/issue-88818.rs b/tests/ui/parser/issues/issue-88818.rs
index b9233ca83..b9233ca83 100644
--- a/src/test/ui/parser/issues/issue-88818.rs
+++ b/tests/ui/parser/issues/issue-88818.rs
diff --git a/src/test/ui/parser/issues/issue-88818.stderr b/tests/ui/parser/issues/issue-88818.stderr
index 6e624c5a2..6e624c5a2 100644
--- a/src/test/ui/parser/issues/issue-88818.stderr
+++ b/tests/ui/parser/issues/issue-88818.stderr
diff --git a/src/test/ui/parser/issues/issue-89388.rs b/tests/ui/parser/issues/issue-89388.rs
index 9153c071e..9153c071e 100644
--- a/src/test/ui/parser/issues/issue-89388.rs
+++ b/tests/ui/parser/issues/issue-89388.rs
diff --git a/src/test/ui/parser/issues/issue-89388.stderr b/tests/ui/parser/issues/issue-89388.stderr
index cf28bef0f..cf28bef0f 100644
--- a/src/test/ui/parser/issues/issue-89388.stderr
+++ b/tests/ui/parser/issues/issue-89388.stderr
diff --git a/src/test/ui/parser/issues/issue-89396.fixed b/tests/ui/parser/issues/issue-89396.fixed
index 823ad8cd1..823ad8cd1 100644
--- a/src/test/ui/parser/issues/issue-89396.fixed
+++ b/tests/ui/parser/issues/issue-89396.fixed
diff --git a/src/test/ui/parser/issues/issue-89396.rs b/tests/ui/parser/issues/issue-89396.rs
index f1d9efa52..f1d9efa52 100644
--- a/src/test/ui/parser/issues/issue-89396.rs
+++ b/tests/ui/parser/issues/issue-89396.rs
diff --git a/src/test/ui/parser/issues/issue-89396.stderr b/tests/ui/parser/issues/issue-89396.stderr
index 504420574..504420574 100644
--- a/src/test/ui/parser/issues/issue-89396.stderr
+++ b/tests/ui/parser/issues/issue-89396.stderr
diff --git a/src/test/ui/parser/issues/issue-89574.rs b/tests/ui/parser/issues/issue-89574.rs
index 0a477f1aa..0a477f1aa 100644
--- a/src/test/ui/parser/issues/issue-89574.rs
+++ b/tests/ui/parser/issues/issue-89574.rs
diff --git a/src/test/ui/parser/issues/issue-89574.stderr b/tests/ui/parser/issues/issue-89574.stderr
index fb1312c78..fb1312c78 100644
--- a/src/test/ui/parser/issues/issue-89574.stderr
+++ b/tests/ui/parser/issues/issue-89574.stderr
diff --git a/src/test/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs b/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs
index fe67d9822..fe67d9822 100644
--- a/src/test/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs
+++ b/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs
diff --git a/src/test/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr b/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr
index a5ee24445..a5ee24445 100644
--- a/src/test/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr
+++ b/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr
diff --git a/src/test/ui/parser/issues/issue-90993.rs b/tests/ui/parser/issues/issue-90993.rs
index 40e6fc748..40e6fc748 100644
--- a/src/test/ui/parser/issues/issue-90993.rs
+++ b/tests/ui/parser/issues/issue-90993.rs
diff --git a/src/test/ui/parser/issues/issue-90993.stderr b/tests/ui/parser/issues/issue-90993.stderr
index ab6bce410..ab6bce410 100644
--- a/src/test/ui/parser/issues/issue-90993.stderr
+++ b/tests/ui/parser/issues/issue-90993.stderr
diff --git a/src/test/ui/parser/issues/issue-91461.rs b/tests/ui/parser/issues/issue-91461.rs
index 3e3c411c4..3e3c411c4 100644
--- a/src/test/ui/parser/issues/issue-91461.rs
+++ b/tests/ui/parser/issues/issue-91461.rs
diff --git a/src/test/ui/parser/issues/issue-91461.stderr b/tests/ui/parser/issues/issue-91461.stderr
index 94fcf1721..94fcf1721 100644
--- a/src/test/ui/parser/issues/issue-91461.stderr
+++ b/tests/ui/parser/issues/issue-91461.stderr
diff --git a/src/test/ui/parser/issues/issue-93282.rs b/tests/ui/parser/issues/issue-93282.rs
index 274245f1a..274245f1a 100644
--- a/src/test/ui/parser/issues/issue-93282.rs
+++ b/tests/ui/parser/issues/issue-93282.rs
diff --git a/src/test/ui/parser/issues/issue-93282.stderr b/tests/ui/parser/issues/issue-93282.stderr
index c6140bb82..c6140bb82 100644
--- a/src/test/ui/parser/issues/issue-93282.stderr
+++ b/tests/ui/parser/issues/issue-93282.stderr
diff --git a/src/test/ui/parser/issues/issue-93867.rs b/tests/ui/parser/issues/issue-93867.rs
index 507447923..507447923 100644
--- a/src/test/ui/parser/issues/issue-93867.rs
+++ b/tests/ui/parser/issues/issue-93867.rs
diff --git a/src/test/ui/parser/issues/issue-93867.stderr b/tests/ui/parser/issues/issue-93867.stderr
index ee0cb4efd..ee0cb4efd 100644
--- a/src/test/ui/parser/issues/issue-93867.stderr
+++ b/tests/ui/parser/issues/issue-93867.stderr
diff --git a/src/test/ui/parser/issues/issue-94340.rs b/tests/ui/parser/issues/issue-94340.rs
index d0fb84a68..d0fb84a68 100644
--- a/src/test/ui/parser/issues/issue-94340.rs
+++ b/tests/ui/parser/issues/issue-94340.rs
diff --git a/src/test/ui/parser/issues/issue-94340.stderr b/tests/ui/parser/issues/issue-94340.stderr
index 9fd7c38a8..9fd7c38a8 100644
--- a/src/test/ui/parser/issues/issue-94340.stderr
+++ b/tests/ui/parser/issues/issue-94340.stderr
diff --git a/src/test/ui/parser/item-free-const-no-body-semantic-fail.rs b/tests/ui/parser/item-free-const-no-body-semantic-fail.rs
index 613b3c985..613b3c985 100644
--- a/src/test/ui/parser/item-free-const-no-body-semantic-fail.rs
+++ b/tests/ui/parser/item-free-const-no-body-semantic-fail.rs
diff --git a/src/test/ui/parser/item-free-const-no-body-semantic-fail.stderr b/tests/ui/parser/item-free-const-no-body-semantic-fail.stderr
index 5365b0a1f..5365b0a1f 100644
--- a/src/test/ui/parser/item-free-const-no-body-semantic-fail.stderr
+++ b/tests/ui/parser/item-free-const-no-body-semantic-fail.stderr
diff --git a/src/test/ui/parser/item-free-const-no-body-syntactic-pass.rs b/tests/ui/parser/item-free-const-no-body-syntactic-pass.rs
index acfdd3c36..acfdd3c36 100644
--- a/src/test/ui/parser/item-free-const-no-body-syntactic-pass.rs
+++ b/tests/ui/parser/item-free-const-no-body-syntactic-pass.rs
diff --git a/src/test/ui/parser/item-free-static-no-body-semantic-fail.rs b/tests/ui/parser/item-free-static-no-body-semantic-fail.rs
index 780479e3d..780479e3d 100644
--- a/src/test/ui/parser/item-free-static-no-body-semantic-fail.rs
+++ b/tests/ui/parser/item-free-static-no-body-semantic-fail.rs
diff --git a/src/test/ui/parser/item-free-static-no-body-semantic-fail.stderr b/tests/ui/parser/item-free-static-no-body-semantic-fail.stderr
index 1b61e4305..1b61e4305 100644
--- a/src/test/ui/parser/item-free-static-no-body-semantic-fail.stderr
+++ b/tests/ui/parser/item-free-static-no-body-semantic-fail.stderr
diff --git a/src/test/ui/parser/item-free-static-no-body-syntactic-pass.rs b/tests/ui/parser/item-free-static-no-body-syntactic-pass.rs
index db0039204..db0039204 100644
--- a/src/test/ui/parser/item-free-static-no-body-syntactic-pass.rs
+++ b/tests/ui/parser/item-free-static-no-body-syntactic-pass.rs
diff --git a/src/test/ui/parser/item-free-type-bounds-semantic-fail.rs b/tests/ui/parser/item-free-type-bounds-semantic-fail.rs
index 9db4111fb..9db4111fb 100644
--- a/src/test/ui/parser/item-free-type-bounds-semantic-fail.rs
+++ b/tests/ui/parser/item-free-type-bounds-semantic-fail.rs
diff --git a/src/test/ui/parser/item-free-type-bounds-semantic-fail.stderr b/tests/ui/parser/item-free-type-bounds-semantic-fail.stderr
index 1b0865128..1b0865128 100644
--- a/src/test/ui/parser/item-free-type-bounds-semantic-fail.stderr
+++ b/tests/ui/parser/item-free-type-bounds-semantic-fail.stderr
diff --git a/src/test/ui/parser/item-free-type-bounds-syntactic-pass.rs b/tests/ui/parser/item-free-type-bounds-syntactic-pass.rs
index 58fc926d0..58fc926d0 100644
--- a/src/test/ui/parser/item-free-type-bounds-syntactic-pass.rs
+++ b/tests/ui/parser/item-free-type-bounds-syntactic-pass.rs
diff --git a/src/test/ui/parser/item-kw-case-mismatch.fixed b/tests/ui/parser/item-kw-case-mismatch.fixed
index 1794268f2..1794268f2 100644
--- a/src/test/ui/parser/item-kw-case-mismatch.fixed
+++ b/tests/ui/parser/item-kw-case-mismatch.fixed
diff --git a/src/test/ui/parser/item-kw-case-mismatch.rs b/tests/ui/parser/item-kw-case-mismatch.rs
index ac8390efd..ac8390efd 100644
--- a/src/test/ui/parser/item-kw-case-mismatch.rs
+++ b/tests/ui/parser/item-kw-case-mismatch.rs
diff --git a/src/test/ui/parser/item-kw-case-mismatch.stderr b/tests/ui/parser/item-kw-case-mismatch.stderr
index e66dae825..e66dae825 100644
--- a/src/test/ui/parser/item-kw-case-mismatch.stderr
+++ b/tests/ui/parser/item-kw-case-mismatch.stderr
diff --git a/src/test/ui/parser/item-needs-block.rs b/tests/ui/parser/item-needs-block.rs
index 4edac588e..4edac588e 100644
--- a/src/test/ui/parser/item-needs-block.rs
+++ b/tests/ui/parser/item-needs-block.rs
diff --git a/src/test/ui/parser/item-needs-block.stderr b/tests/ui/parser/item-needs-block.stderr
index 3cabd0c73..3cabd0c73 100644
--- a/src/test/ui/parser/item-needs-block.stderr
+++ b/tests/ui/parser/item-needs-block.stderr
diff --git a/src/test/ui/parser/keyword-abstract.rs b/tests/ui/parser/keyword-abstract.rs
index 570206575..570206575 100644
--- a/src/test/ui/parser/keyword-abstract.rs
+++ b/tests/ui/parser/keyword-abstract.rs
diff --git a/src/test/ui/parser/keyword-abstract.stderr b/tests/ui/parser/keyword-abstract.stderr
index b7d1ce7cd..b7d1ce7cd 100644
--- a/src/test/ui/parser/keyword-abstract.stderr
+++ b/tests/ui/parser/keyword-abstract.stderr
diff --git a/src/test/ui/parser/keyword-as-as-identifier.rs b/tests/ui/parser/keyword-as-as-identifier.rs
index cd47c8a39..cd47c8a39 100644
--- a/src/test/ui/parser/keyword-as-as-identifier.rs
+++ b/tests/ui/parser/keyword-as-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-as-as-identifier.stderr b/tests/ui/parser/keyword-as-as-identifier.stderr
index 3c5ad950d..3c5ad950d 100644
--- a/src/test/ui/parser/keyword-as-as-identifier.stderr
+++ b/tests/ui/parser/keyword-as-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-box-as-identifier.rs b/tests/ui/parser/keyword-box-as-identifier.rs
index 2cf49b66b..2cf49b66b 100644
--- a/src/test/ui/parser/keyword-box-as-identifier.rs
+++ b/tests/ui/parser/keyword-box-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-box-as-identifier.stderr b/tests/ui/parser/keyword-box-as-identifier.stderr
index eaa1f8003..eaa1f8003 100644
--- a/src/test/ui/parser/keyword-box-as-identifier.stderr
+++ b/tests/ui/parser/keyword-box-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-break-as-identifier.rs b/tests/ui/parser/keyword-break-as-identifier.rs
index 04b25a7aa..04b25a7aa 100644
--- a/src/test/ui/parser/keyword-break-as-identifier.rs
+++ b/tests/ui/parser/keyword-break-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-break-as-identifier.stderr b/tests/ui/parser/keyword-break-as-identifier.stderr
index a4535eb40..a4535eb40 100644
--- a/src/test/ui/parser/keyword-break-as-identifier.stderr
+++ b/tests/ui/parser/keyword-break-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-const-as-identifier.rs b/tests/ui/parser/keyword-const-as-identifier.rs
index 6a2d926bf..6a2d926bf 100644
--- a/src/test/ui/parser/keyword-const-as-identifier.rs
+++ b/tests/ui/parser/keyword-const-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-const-as-identifier.stderr b/tests/ui/parser/keyword-const-as-identifier.stderr
index 31922f150..31922f150 100644
--- a/src/test/ui/parser/keyword-const-as-identifier.stderr
+++ b/tests/ui/parser/keyword-const-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-continue-as-identifier.rs b/tests/ui/parser/keyword-continue-as-identifier.rs
index cfdd62a2d..cfdd62a2d 100644
--- a/src/test/ui/parser/keyword-continue-as-identifier.rs
+++ b/tests/ui/parser/keyword-continue-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-continue-as-identifier.stderr b/tests/ui/parser/keyword-continue-as-identifier.stderr
index 81285633f..81285633f 100644
--- a/src/test/ui/parser/keyword-continue-as-identifier.stderr
+++ b/tests/ui/parser/keyword-continue-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-else-as-identifier.rs b/tests/ui/parser/keyword-else-as-identifier.rs
index f12dac3ff..f12dac3ff 100644
--- a/src/test/ui/parser/keyword-else-as-identifier.rs
+++ b/tests/ui/parser/keyword-else-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-else-as-identifier.stderr b/tests/ui/parser/keyword-else-as-identifier.stderr
index 2125fe84a..2125fe84a 100644
--- a/src/test/ui/parser/keyword-else-as-identifier.stderr
+++ b/tests/ui/parser/keyword-else-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-enum-as-identifier.rs b/tests/ui/parser/keyword-enum-as-identifier.rs
index fe66230d0..fe66230d0 100644
--- a/src/test/ui/parser/keyword-enum-as-identifier.rs
+++ b/tests/ui/parser/keyword-enum-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-enum-as-identifier.stderr b/tests/ui/parser/keyword-enum-as-identifier.stderr
index 92d092ccb..92d092ccb 100644
--- a/src/test/ui/parser/keyword-enum-as-identifier.stderr
+++ b/tests/ui/parser/keyword-enum-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-final.rs b/tests/ui/parser/keyword-final.rs
index a79a11032..a79a11032 100644
--- a/src/test/ui/parser/keyword-final.rs
+++ b/tests/ui/parser/keyword-final.rs
diff --git a/src/test/ui/parser/keyword-final.stderr b/tests/ui/parser/keyword-final.stderr
index f1f9f2e2c..f1f9f2e2c 100644
--- a/src/test/ui/parser/keyword-final.stderr
+++ b/tests/ui/parser/keyword-final.stderr
diff --git a/src/test/ui/parser/keyword-fn-as-identifier.rs b/tests/ui/parser/keyword-fn-as-identifier.rs
index f30e115f7..f30e115f7 100644
--- a/src/test/ui/parser/keyword-fn-as-identifier.rs
+++ b/tests/ui/parser/keyword-fn-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-fn-as-identifier.stderr b/tests/ui/parser/keyword-fn-as-identifier.stderr
index 645efbcae..645efbcae 100644
--- a/src/test/ui/parser/keyword-fn-as-identifier.stderr
+++ b/tests/ui/parser/keyword-fn-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-for-as-identifier.rs b/tests/ui/parser/keyword-for-as-identifier.rs
index 9e8a2ad53..9e8a2ad53 100644
--- a/src/test/ui/parser/keyword-for-as-identifier.rs
+++ b/tests/ui/parser/keyword-for-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-for-as-identifier.stderr b/tests/ui/parser/keyword-for-as-identifier.stderr
index 26407cc4d..26407cc4d 100644
--- a/src/test/ui/parser/keyword-for-as-identifier.stderr
+++ b/tests/ui/parser/keyword-for-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-if-as-identifier.rs b/tests/ui/parser/keyword-if-as-identifier.rs
index 0bd5756af..0bd5756af 100644
--- a/src/test/ui/parser/keyword-if-as-identifier.rs
+++ b/tests/ui/parser/keyword-if-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-if-as-identifier.stderr b/tests/ui/parser/keyword-if-as-identifier.stderr
index 26f9a15a7..26f9a15a7 100644
--- a/src/test/ui/parser/keyword-if-as-identifier.stderr
+++ b/tests/ui/parser/keyword-if-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-impl-as-identifier.rs b/tests/ui/parser/keyword-impl-as-identifier.rs
index df529bae0..df529bae0 100644
--- a/src/test/ui/parser/keyword-impl-as-identifier.rs
+++ b/tests/ui/parser/keyword-impl-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-impl-as-identifier.stderr b/tests/ui/parser/keyword-impl-as-identifier.stderr
index 73a50bc38..73a50bc38 100644
--- a/src/test/ui/parser/keyword-impl-as-identifier.stderr
+++ b/tests/ui/parser/keyword-impl-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-in-as-identifier.rs b/tests/ui/parser/keyword-in-as-identifier.rs
index e4499dea2..e4499dea2 100644
--- a/src/test/ui/parser/keyword-in-as-identifier.rs
+++ b/tests/ui/parser/keyword-in-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-in-as-identifier.stderr b/tests/ui/parser/keyword-in-as-identifier.stderr
index 98332b723..98332b723 100644
--- a/src/test/ui/parser/keyword-in-as-identifier.stderr
+++ b/tests/ui/parser/keyword-in-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-let-as-identifier.rs b/tests/ui/parser/keyword-let-as-identifier.rs
index 9b1183501..9b1183501 100644
--- a/src/test/ui/parser/keyword-let-as-identifier.rs
+++ b/tests/ui/parser/keyword-let-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-let-as-identifier.stderr b/tests/ui/parser/keyword-let-as-identifier.stderr
index 86faaed38..86faaed38 100644
--- a/src/test/ui/parser/keyword-let-as-identifier.stderr
+++ b/tests/ui/parser/keyword-let-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-loop-as-identifier.rs b/tests/ui/parser/keyword-loop-as-identifier.rs
index 46914a19b..46914a19b 100644
--- a/src/test/ui/parser/keyword-loop-as-identifier.rs
+++ b/tests/ui/parser/keyword-loop-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-loop-as-identifier.stderr b/tests/ui/parser/keyword-loop-as-identifier.stderr
index 304ad61cc..304ad61cc 100644
--- a/src/test/ui/parser/keyword-loop-as-identifier.stderr
+++ b/tests/ui/parser/keyword-loop-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-match-as-identifier.rs b/tests/ui/parser/keyword-match-as-identifier.rs
index d3cecb991..d3cecb991 100644
--- a/src/test/ui/parser/keyword-match-as-identifier.rs
+++ b/tests/ui/parser/keyword-match-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-match-as-identifier.stderr b/tests/ui/parser/keyword-match-as-identifier.stderr
index 25ac397fb..25ac397fb 100644
--- a/src/test/ui/parser/keyword-match-as-identifier.stderr
+++ b/tests/ui/parser/keyword-match-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-mod-as-identifier.rs b/tests/ui/parser/keyword-mod-as-identifier.rs
index b9c7b6c78..b9c7b6c78 100644
--- a/src/test/ui/parser/keyword-mod-as-identifier.rs
+++ b/tests/ui/parser/keyword-mod-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-mod-as-identifier.stderr b/tests/ui/parser/keyword-mod-as-identifier.stderr
index d5688e871..d5688e871 100644
--- a/src/test/ui/parser/keyword-mod-as-identifier.stderr
+++ b/tests/ui/parser/keyword-mod-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-move-as-identifier.rs b/tests/ui/parser/keyword-move-as-identifier.rs
index 65be02e3c..65be02e3c 100644
--- a/src/test/ui/parser/keyword-move-as-identifier.rs
+++ b/tests/ui/parser/keyword-move-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-move-as-identifier.stderr b/tests/ui/parser/keyword-move-as-identifier.stderr
index 75653cffc..75653cffc 100644
--- a/src/test/ui/parser/keyword-move-as-identifier.stderr
+++ b/tests/ui/parser/keyword-move-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-mut-as-identifier.rs b/tests/ui/parser/keyword-mut-as-identifier.rs
index 9b919d2b3..9b919d2b3 100644
--- a/src/test/ui/parser/keyword-mut-as-identifier.rs
+++ b/tests/ui/parser/keyword-mut-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-mut-as-identifier.stderr b/tests/ui/parser/keyword-mut-as-identifier.stderr
index 040960835..040960835 100644
--- a/src/test/ui/parser/keyword-mut-as-identifier.stderr
+++ b/tests/ui/parser/keyword-mut-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-override.rs b/tests/ui/parser/keyword-override.rs
index 009bebd7d..009bebd7d 100644
--- a/src/test/ui/parser/keyword-override.rs
+++ b/tests/ui/parser/keyword-override.rs
diff --git a/src/test/ui/parser/keyword-override.stderr b/tests/ui/parser/keyword-override.stderr
index cdb573686..cdb573686 100644
--- a/src/test/ui/parser/keyword-override.stderr
+++ b/tests/ui/parser/keyword-override.stderr
diff --git a/src/test/ui/parser/keyword-pub-as-identifier.rs b/tests/ui/parser/keyword-pub-as-identifier.rs
index 2b2bb1411..2b2bb1411 100644
--- a/src/test/ui/parser/keyword-pub-as-identifier.rs
+++ b/tests/ui/parser/keyword-pub-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-pub-as-identifier.stderr b/tests/ui/parser/keyword-pub-as-identifier.stderr
index 8d513507c..8d513507c 100644
--- a/src/test/ui/parser/keyword-pub-as-identifier.stderr
+++ b/tests/ui/parser/keyword-pub-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-ref-as-identifier.rs b/tests/ui/parser/keyword-ref-as-identifier.rs
index f5e04b5db..f5e04b5db 100644
--- a/src/test/ui/parser/keyword-ref-as-identifier.rs
+++ b/tests/ui/parser/keyword-ref-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-ref-as-identifier.stderr b/tests/ui/parser/keyword-ref-as-identifier.stderr
index 618043d89..618043d89 100644
--- a/src/test/ui/parser/keyword-ref-as-identifier.stderr
+++ b/tests/ui/parser/keyword-ref-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-return-as-identifier.rs b/tests/ui/parser/keyword-return-as-identifier.rs
index e1a2db5e4..e1a2db5e4 100644
--- a/src/test/ui/parser/keyword-return-as-identifier.rs
+++ b/tests/ui/parser/keyword-return-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-return-as-identifier.stderr b/tests/ui/parser/keyword-return-as-identifier.stderr
index eeb8e468b..eeb8e468b 100644
--- a/src/test/ui/parser/keyword-return-as-identifier.stderr
+++ b/tests/ui/parser/keyword-return-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-static-as-identifier.rs b/tests/ui/parser/keyword-static-as-identifier.rs
index 423b9854b..423b9854b 100644
--- a/src/test/ui/parser/keyword-static-as-identifier.rs
+++ b/tests/ui/parser/keyword-static-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-static-as-identifier.stderr b/tests/ui/parser/keyword-static-as-identifier.stderr
index a3213e2f2..a3213e2f2 100644
--- a/src/test/ui/parser/keyword-static-as-identifier.stderr
+++ b/tests/ui/parser/keyword-static-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-struct-as-identifier.rs b/tests/ui/parser/keyword-struct-as-identifier.rs
index 18cfe1159..18cfe1159 100644
--- a/src/test/ui/parser/keyword-struct-as-identifier.rs
+++ b/tests/ui/parser/keyword-struct-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-struct-as-identifier.stderr b/tests/ui/parser/keyword-struct-as-identifier.stderr
index b73361a55..b73361a55 100644
--- a/src/test/ui/parser/keyword-struct-as-identifier.stderr
+++ b/tests/ui/parser/keyword-struct-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-trait-as-identifier.rs b/tests/ui/parser/keyword-trait-as-identifier.rs
index 67f81167d..67f81167d 100644
--- a/src/test/ui/parser/keyword-trait-as-identifier.rs
+++ b/tests/ui/parser/keyword-trait-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-trait-as-identifier.stderr b/tests/ui/parser/keyword-trait-as-identifier.stderr
index 56ef5f606..56ef5f606 100644
--- a/src/test/ui/parser/keyword-trait-as-identifier.stderr
+++ b/tests/ui/parser/keyword-trait-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-try-as-identifier-edition2018.rs b/tests/ui/parser/keyword-try-as-identifier-edition2018.rs
index 4fa37bdb0..4fa37bdb0 100644
--- a/src/test/ui/parser/keyword-try-as-identifier-edition2018.rs
+++ b/tests/ui/parser/keyword-try-as-identifier-edition2018.rs
diff --git a/src/test/ui/parser/keyword-try-as-identifier-edition2018.stderr b/tests/ui/parser/keyword-try-as-identifier-edition2018.stderr
index 94a106d47..94a106d47 100644
--- a/src/test/ui/parser/keyword-try-as-identifier-edition2018.stderr
+++ b/tests/ui/parser/keyword-try-as-identifier-edition2018.stderr
diff --git a/src/test/ui/parser/keyword-type-as-identifier.rs b/tests/ui/parser/keyword-type-as-identifier.rs
index 04adddf72..04adddf72 100644
--- a/src/test/ui/parser/keyword-type-as-identifier.rs
+++ b/tests/ui/parser/keyword-type-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-type-as-identifier.stderr b/tests/ui/parser/keyword-type-as-identifier.stderr
index 624c1006b..624c1006b 100644
--- a/src/test/ui/parser/keyword-type-as-identifier.stderr
+++ b/tests/ui/parser/keyword-type-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-typeof.rs b/tests/ui/parser/keyword-typeof.rs
index 29dc77d27..29dc77d27 100644
--- a/src/test/ui/parser/keyword-typeof.rs
+++ b/tests/ui/parser/keyword-typeof.rs
diff --git a/src/test/ui/parser/keyword-typeof.stderr b/tests/ui/parser/keyword-typeof.stderr
index 4c5324505..4c5324505 100644
--- a/src/test/ui/parser/keyword-typeof.stderr
+++ b/tests/ui/parser/keyword-typeof.stderr
diff --git a/src/test/ui/parser/keyword-unsafe-as-identifier.rs b/tests/ui/parser/keyword-unsafe-as-identifier.rs
index 0ff6d188c..0ff6d188c 100644
--- a/src/test/ui/parser/keyword-unsafe-as-identifier.rs
+++ b/tests/ui/parser/keyword-unsafe-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-unsafe-as-identifier.stderr b/tests/ui/parser/keyword-unsafe-as-identifier.stderr
index b552c9cd3..b552c9cd3 100644
--- a/src/test/ui/parser/keyword-unsafe-as-identifier.stderr
+++ b/tests/ui/parser/keyword-unsafe-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-use-as-identifier.rs b/tests/ui/parser/keyword-use-as-identifier.rs
index 821bedee0..821bedee0 100644
--- a/src/test/ui/parser/keyword-use-as-identifier.rs
+++ b/tests/ui/parser/keyword-use-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-use-as-identifier.stderr b/tests/ui/parser/keyword-use-as-identifier.stderr
index 630798659..630798659 100644
--- a/src/test/ui/parser/keyword-use-as-identifier.stderr
+++ b/tests/ui/parser/keyword-use-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-where-as-identifier.rs b/tests/ui/parser/keyword-where-as-identifier.rs
index 56301bd20..56301bd20 100644
--- a/src/test/ui/parser/keyword-where-as-identifier.rs
+++ b/tests/ui/parser/keyword-where-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-where-as-identifier.stderr b/tests/ui/parser/keyword-where-as-identifier.stderr
index 9e72f7940..9e72f7940 100644
--- a/src/test/ui/parser/keyword-where-as-identifier.stderr
+++ b/tests/ui/parser/keyword-where-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-while-as-identifier.rs b/tests/ui/parser/keyword-while-as-identifier.rs
index 22026d15d..22026d15d 100644
--- a/src/test/ui/parser/keyword-while-as-identifier.rs
+++ b/tests/ui/parser/keyword-while-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-while-as-identifier.stderr b/tests/ui/parser/keyword-while-as-identifier.stderr
index 2bb62105d..2bb62105d 100644
--- a/src/test/ui/parser/keyword-while-as-identifier.stderr
+++ b/tests/ui/parser/keyword-while-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword.rs b/tests/ui/parser/keyword.rs
index 1eb7886c5..1eb7886c5 100644
--- a/src/test/ui/parser/keyword.rs
+++ b/tests/ui/parser/keyword.rs
diff --git a/src/test/ui/parser/keyword.stderr b/tests/ui/parser/keyword.stderr
index ee7d72b39..ee7d72b39 100644
--- a/src/test/ui/parser/keyword.stderr
+++ b/tests/ui/parser/keyword.stderr
diff --git a/src/test/ui/parser/keywords-followed-by-double-colon.rs b/tests/ui/parser/keywords-followed-by-double-colon.rs
index 5c7049f7c..5c7049f7c 100644
--- a/src/test/ui/parser/keywords-followed-by-double-colon.rs
+++ b/tests/ui/parser/keywords-followed-by-double-colon.rs
diff --git a/src/test/ui/parser/keywords-followed-by-double-colon.stderr b/tests/ui/parser/keywords-followed-by-double-colon.stderr
index 4c4d5e5dd..4c4d5e5dd 100644
--- a/src/test/ui/parser/keywords-followed-by-double-colon.stderr
+++ b/tests/ui/parser/keywords-followed-by-double-colon.stderr
diff --git a/tests/ui/parser/kw-in-trait-bounds.rs b/tests/ui/parser/kw-in-trait-bounds.rs
new file mode 100644
index 000000000..e9e85339a
--- /dev/null
+++ b/tests/ui/parser/kw-in-trait-bounds.rs
@@ -0,0 +1,39 @@
+// edition:2018
+
+fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
+//~^ ERROR expected identifier, found keyword `fn`
+//~| ERROR expected identifier, found keyword `fn`
+//~| ERROR expected identifier, found keyword `fn`
+//~| HELP use `Fn` to refer to the trait
+//~| HELP use `Fn` to refer to the trait
+//~| HELP use `Fn` to refer to the trait
+where
+G: fn(),
+    //~^ ERROR expected identifier, found keyword `fn`
+    //~| HELP use `Fn` to refer to the trait
+{}
+
+fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+//~^ ERROR expected identifier, found keyword `struct`
+//~| ERROR expected identifier, found keyword `struct`
+//~| ERROR expected identifier, found keyword `struct`
+//~| ERROR cannot find trait `r#struct` in this scope
+//~| ERROR cannot find trait `r#struct` in this scope
+//~| ERROR cannot find trait `r#struct` in this scope
+//~| HELP  a trait with a similar name exists
+//~| HELP  a trait with a similar name exists
+//~| HELP  a trait with a similar name exists
+//~| HELP  escape `struct` to use it as an identifier
+//~| HELP  escape `struct` to use it as an identifier
+//~| HELP  escape `struct` to use it as an identifier
+where
+    B: struct,
+    //~^ ERROR expected identifier, found keyword `struct`
+    //~| ERROR cannot find trait `r#struct` in this scope
+    //~| HELP  a trait with a similar name exists
+    //~| HELP  escape `struct` to use it as an identifier
+{}
+
+trait Struct {}
+
+fn main() {}
diff --git a/tests/ui/parser/kw-in-trait-bounds.stderr b/tests/ui/parser/kw-in-trait-bounds.stderr
new file mode 100644
index 000000000..2d3aad4d6
--- /dev/null
+++ b/tests/ui/parser/kw-in-trait-bounds.stderr
@@ -0,0 +1,127 @@
+error: expected identifier, found keyword `fn`
+  --> $DIR/kw-in-trait-bounds.rs:3:10
+   |
+LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
+   |          ^^
+   |
+help: use `Fn` to refer to the trait
+   |
+LL | fn _f<F: Fn(), G>(_: impl fn(), _: &dyn fn())
+   |          ~~
+
+error: expected identifier, found keyword `fn`
+  --> $DIR/kw-in-trait-bounds.rs:3:27
+   |
+LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
+   |                           ^^
+   |
+help: use `Fn` to refer to the trait
+   |
+LL | fn _f<F: fn(), G>(_: impl Fn(), _: &dyn fn())
+   |                           ~~
+
+error: expected identifier, found keyword `fn`
+  --> $DIR/kw-in-trait-bounds.rs:3:41
+   |
+LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
+   |                                         ^^
+   |
+help: use `Fn` to refer to the trait
+   |
+LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn Fn())
+   |                                         ~~
+
+error: expected identifier, found keyword `fn`
+  --> $DIR/kw-in-trait-bounds.rs:11:4
+   |
+LL | G: fn(),
+   |    ^^
+   |
+help: use `Fn` to refer to the trait
+   |
+LL | G: Fn(),
+   |    ~~
+
+error: expected identifier, found keyword `struct`
+  --> $DIR/kw-in-trait-bounds.rs:16:10
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+   |          ^^^^^^ expected identifier, found keyword
+   |
+help: escape `struct` to use it as an identifier
+   |
+LL | fn _g<A: r#struct, B>(_: impl struct, _: &dyn struct)
+   |          ++
+
+error: expected identifier, found keyword `struct`
+  --> $DIR/kw-in-trait-bounds.rs:16:29
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+   |                             ^^^^^^ expected identifier, found keyword
+   |
+help: escape `struct` to use it as an identifier
+   |
+LL | fn _g<A: struct, B>(_: impl r#struct, _: &dyn struct)
+   |                             ++
+
+error: expected identifier, found keyword `struct`
+  --> $DIR/kw-in-trait-bounds.rs:16:45
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+   |                                             ^^^^^^ expected identifier, found keyword
+   |
+help: escape `struct` to use it as an identifier
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn r#struct)
+   |                                             ++
+
+error: expected identifier, found keyword `struct`
+  --> $DIR/kw-in-trait-bounds.rs:30:8
+   |
+LL |     B: struct,
+   |        ^^^^^^ expected identifier, found keyword
+   |
+help: escape `struct` to use it as an identifier
+   |
+LL |     B: r#struct,
+   |        ++
+
+error[E0405]: cannot find trait `r#struct` in this scope
+  --> $DIR/kw-in-trait-bounds.rs:16:10
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+   |          ^^^^^^ help: a trait with a similar name exists (notice the capitalization): `Struct`
+...
+LL | trait Struct {}
+   | ------------ similarly named trait `Struct` defined here
+
+error[E0405]: cannot find trait `r#struct` in this scope
+  --> $DIR/kw-in-trait-bounds.rs:30:8
+   |
+LL |     B: struct,
+   |        ^^^^^^ help: a trait with a similar name exists (notice the capitalization): `Struct`
+...
+LL | trait Struct {}
+   | ------------ similarly named trait `Struct` defined here
+
+error[E0405]: cannot find trait `r#struct` in this scope
+  --> $DIR/kw-in-trait-bounds.rs:16:29
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+   |                             ^^^^^^ help: a trait with a similar name exists (notice the capitalization): `Struct`
+...
+LL | trait Struct {}
+   | ------------ similarly named trait `Struct` defined here
+
+error[E0405]: cannot find trait `r#struct` in this scope
+  --> $DIR/kw-in-trait-bounds.rs:16:45
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+   |                                             ^^^^^^ help: a trait with a similar name exists (notice the capitalization): `Struct`
+...
+LL | trait Struct {}
+   | ------------ similarly named trait `Struct` defined here
+
+error: aborting due to 12 previous errors
+
+For more information about this error, try `rustc --explain E0405`.
diff --git a/src/test/ui/parser/label-after-block-like.rs b/tests/ui/parser/label-after-block-like.rs
index 55f3f8f9f..55f3f8f9f 100644
--- a/src/test/ui/parser/label-after-block-like.rs
+++ b/tests/ui/parser/label-after-block-like.rs
diff --git a/src/test/ui/parser/label-after-block-like.stderr b/tests/ui/parser/label-after-block-like.stderr
index 8ff50b124..8ff50b124 100644
--- a/src/test/ui/parser/label-after-block-like.stderr
+++ b/tests/ui/parser/label-after-block-like.stderr
diff --git a/src/test/ui/parser/label-is-actually-char.rs b/tests/ui/parser/label-is-actually-char.rs
index 183da603d..183da603d 100644
--- a/src/test/ui/parser/label-is-actually-char.rs
+++ b/tests/ui/parser/label-is-actually-char.rs
diff --git a/src/test/ui/parser/label-is-actually-char.stderr b/tests/ui/parser/label-is-actually-char.stderr
index 28c8d2ada..28c8d2ada 100644
--- a/src/test/ui/parser/label-is-actually-char.stderr
+++ b/tests/ui/parser/label-is-actually-char.stderr
diff --git a/src/test/ui/parser/labeled-no-colon-expr.rs b/tests/ui/parser/labeled-no-colon-expr.rs
index d9ebd7473..d9ebd7473 100644
--- a/src/test/ui/parser/labeled-no-colon-expr.rs
+++ b/tests/ui/parser/labeled-no-colon-expr.rs
diff --git a/src/test/ui/parser/labeled-no-colon-expr.stderr b/tests/ui/parser/labeled-no-colon-expr.stderr
index 62288fe15..62288fe15 100644
--- a/src/test/ui/parser/labeled-no-colon-expr.stderr
+++ b/tests/ui/parser/labeled-no-colon-expr.stderr
diff --git a/src/test/ui/parser/let-binop.fixed b/tests/ui/parser/let-binop.fixed
index 93f7f97b0..93f7f97b0 100644
--- a/src/test/ui/parser/let-binop.fixed
+++ b/tests/ui/parser/let-binop.fixed
diff --git a/src/test/ui/parser/let-binop.rs b/tests/ui/parser/let-binop.rs
index 2adbceae5..2adbceae5 100644
--- a/src/test/ui/parser/let-binop.rs
+++ b/tests/ui/parser/let-binop.rs
diff --git a/src/test/ui/parser/let-binop.stderr b/tests/ui/parser/let-binop.stderr
index dd33e9157..dd33e9157 100644
--- a/src/test/ui/parser/let-binop.stderr
+++ b/tests/ui/parser/let-binop.stderr
diff --git a/src/test/ui/parser/lifetime-in-pattern-recover.rs b/tests/ui/parser/lifetime-in-pattern-recover.rs
index 7fb14b800..7fb14b800 100644
--- a/src/test/ui/parser/lifetime-in-pattern-recover.rs
+++ b/tests/ui/parser/lifetime-in-pattern-recover.rs
diff --git a/src/test/ui/parser/lifetime-in-pattern-recover.stderr b/tests/ui/parser/lifetime-in-pattern-recover.stderr
index 4bf7f57bf..4bf7f57bf 100644
--- a/src/test/ui/parser/lifetime-in-pattern-recover.stderr
+++ b/tests/ui/parser/lifetime-in-pattern-recover.stderr
diff --git a/src/test/ui/parser/lifetime-in-pattern.rs b/tests/ui/parser/lifetime-in-pattern.rs
index d3c638d0c..d3c638d0c 100644
--- a/src/test/ui/parser/lifetime-in-pattern.rs
+++ b/tests/ui/parser/lifetime-in-pattern.rs
diff --git a/src/test/ui/parser/lifetime-in-pattern.stderr b/tests/ui/parser/lifetime-in-pattern.stderr
index a1d721e74..a1d721e74 100644
--- a/src/test/ui/parser/lifetime-in-pattern.stderr
+++ b/tests/ui/parser/lifetime-in-pattern.stderr
diff --git a/src/test/ui/parser/lifetime-semicolon.fixed b/tests/ui/parser/lifetime-semicolon.fixed
index 482b77046..482b77046 100644
--- a/src/test/ui/parser/lifetime-semicolon.fixed
+++ b/tests/ui/parser/lifetime-semicolon.fixed
diff --git a/src/test/ui/parser/lifetime-semicolon.rs b/tests/ui/parser/lifetime-semicolon.rs
index 21c8b0a7f..21c8b0a7f 100644
--- a/src/test/ui/parser/lifetime-semicolon.rs
+++ b/tests/ui/parser/lifetime-semicolon.rs
diff --git a/src/test/ui/parser/lifetime-semicolon.stderr b/tests/ui/parser/lifetime-semicolon.stderr
index ee486c236..ee486c236 100644
--- a/src/test/ui/parser/lifetime-semicolon.stderr
+++ b/tests/ui/parser/lifetime-semicolon.stderr
diff --git a/src/test/ui/parser/lifetime_starts_expressions.rs b/tests/ui/parser/lifetime_starts_expressions.rs
index 903b4de6e..903b4de6e 100644
--- a/src/test/ui/parser/lifetime_starts_expressions.rs
+++ b/tests/ui/parser/lifetime_starts_expressions.rs
diff --git a/src/test/ui/parser/lifetime_starts_expressions.stderr b/tests/ui/parser/lifetime_starts_expressions.stderr
index 82e274325..82e274325 100644
--- a/src/test/ui/parser/lifetime_starts_expressions.stderr
+++ b/tests/ui/parser/lifetime_starts_expressions.stderr
diff --git a/src/test/ui/parser/macro-bad-delimiter-ident.rs b/tests/ui/parser/macro-bad-delimiter-ident.rs
index f461f06b4..f461f06b4 100644
--- a/src/test/ui/parser/macro-bad-delimiter-ident.rs
+++ b/tests/ui/parser/macro-bad-delimiter-ident.rs
diff --git a/src/test/ui/parser/macro-bad-delimiter-ident.stderr b/tests/ui/parser/macro-bad-delimiter-ident.stderr
index f2365fed2..f2365fed2 100644
--- a/src/test/ui/parser/macro-bad-delimiter-ident.stderr
+++ b/tests/ui/parser/macro-bad-delimiter-ident.stderr
diff --git a/src/test/ui/parser/macro-braces-dot-question.rs b/tests/ui/parser/macro-braces-dot-question.rs
index 016b434a6..016b434a6 100644
--- a/src/test/ui/parser/macro-braces-dot-question.rs
+++ b/tests/ui/parser/macro-braces-dot-question.rs
diff --git a/src/test/ui/parser/macro-keyword.rs b/tests/ui/parser/macro-keyword.rs
index 58489fb2c..58489fb2c 100644
--- a/src/test/ui/parser/macro-keyword.rs
+++ b/tests/ui/parser/macro-keyword.rs
diff --git a/src/test/ui/parser/macro-keyword.stderr b/tests/ui/parser/macro-keyword.stderr
index d794671f8..d794671f8 100644
--- a/src/test/ui/parser/macro-keyword.stderr
+++ b/tests/ui/parser/macro-keyword.stderr
diff --git a/src/test/ui/parser/macro-mismatched-delim-brace-paren.rs b/tests/ui/parser/macro-mismatched-delim-brace-paren.rs
index 404aa7b80..404aa7b80 100644
--- a/src/test/ui/parser/macro-mismatched-delim-brace-paren.rs
+++ b/tests/ui/parser/macro-mismatched-delim-brace-paren.rs
diff --git a/src/test/ui/parser/macro-mismatched-delim-brace-paren.stderr b/tests/ui/parser/macro-mismatched-delim-brace-paren.stderr
index 077d31800..077d31800 100644
--- a/src/test/ui/parser/macro-mismatched-delim-brace-paren.stderr
+++ b/tests/ui/parser/macro-mismatched-delim-brace-paren.stderr
diff --git a/src/test/ui/parser/macro-mismatched-delim-paren-brace.rs b/tests/ui/parser/macro-mismatched-delim-paren-brace.rs
index 1a1b9edfb..1a1b9edfb 100644
--- a/src/test/ui/parser/macro-mismatched-delim-paren-brace.rs
+++ b/tests/ui/parser/macro-mismatched-delim-paren-brace.rs
diff --git a/src/test/ui/parser/macro-mismatched-delim-paren-brace.stderr b/tests/ui/parser/macro-mismatched-delim-paren-brace.stderr
index 967a3e6fd..967a3e6fd 100644
--- a/src/test/ui/parser/macro-mismatched-delim-paren-brace.stderr
+++ b/tests/ui/parser/macro-mismatched-delim-paren-brace.stderr
diff --git a/src/test/ui/parser/macro/bad-macro-argument.rs b/tests/ui/parser/macro/bad-macro-argument.rs
index 4b6d23890..4b6d23890 100644
--- a/src/test/ui/parser/macro/bad-macro-argument.rs
+++ b/tests/ui/parser/macro/bad-macro-argument.rs
diff --git a/src/test/ui/parser/macro/bad-macro-argument.stderr b/tests/ui/parser/macro/bad-macro-argument.stderr
index 3cd8accb6..3cd8accb6 100644
--- a/src/test/ui/parser/macro/bad-macro-argument.stderr
+++ b/tests/ui/parser/macro/bad-macro-argument.stderr
diff --git a/src/test/ui/parser/macro/issue-33569.rs b/tests/ui/parser/macro/issue-33569.rs
index 069d181e9..069d181e9 100644
--- a/src/test/ui/parser/macro/issue-33569.rs
+++ b/tests/ui/parser/macro/issue-33569.rs
diff --git a/src/test/ui/parser/macro/issue-33569.stderr b/tests/ui/parser/macro/issue-33569.stderr
index 0dca090fb..0dca090fb 100644
--- a/src/test/ui/parser/macro/issue-33569.stderr
+++ b/tests/ui/parser/macro/issue-33569.stderr
diff --git a/src/test/ui/parser/macro/issue-37113.rs b/tests/ui/parser/macro/issue-37113.rs
index 0044aa561..0044aa561 100644
--- a/src/test/ui/parser/macro/issue-37113.rs
+++ b/tests/ui/parser/macro/issue-37113.rs
diff --git a/src/test/ui/parser/macro/issue-37113.stderr b/tests/ui/parser/macro/issue-37113.stderr
index da9e743a0..da9e743a0 100644
--- a/src/test/ui/parser/macro/issue-37113.stderr
+++ b/tests/ui/parser/macro/issue-37113.stderr
diff --git a/src/test/ui/parser/macro/issue-37234.rs b/tests/ui/parser/macro/issue-37234.rs
index 4debc7479..4debc7479 100644
--- a/src/test/ui/parser/macro/issue-37234.rs
+++ b/tests/ui/parser/macro/issue-37234.rs
diff --git a/src/test/ui/parser/macro/issue-37234.stderr b/tests/ui/parser/macro/issue-37234.stderr
index d79196204..d79196204 100644
--- a/src/test/ui/parser/macro/issue-37234.stderr
+++ b/tests/ui/parser/macro/issue-37234.stderr
diff --git a/src/test/ui/parser/macro/literals-are-validated-before-expansion.rs b/tests/ui/parser/macro/literals-are-validated-before-expansion.rs
index c3fc754b5..c3fc754b5 100644
--- a/src/test/ui/parser/macro/literals-are-validated-before-expansion.rs
+++ b/tests/ui/parser/macro/literals-are-validated-before-expansion.rs
diff --git a/src/test/ui/parser/macro/literals-are-validated-before-expansion.stderr b/tests/ui/parser/macro/literals-are-validated-before-expansion.stderr
index e874f6249..e874f6249 100644
--- a/src/test/ui/parser/macro/literals-are-validated-before-expansion.stderr
+++ b/tests/ui/parser/macro/literals-are-validated-before-expansion.stderr
diff --git a/src/test/ui/parser/macro/macro-doc-comments-1.rs b/tests/ui/parser/macro/macro-doc-comments-1.rs
index 8d8103bb1..8d8103bb1 100644
--- a/src/test/ui/parser/macro/macro-doc-comments-1.rs
+++ b/tests/ui/parser/macro/macro-doc-comments-1.rs
diff --git a/src/test/ui/parser/macro/macro-doc-comments-1.stderr b/tests/ui/parser/macro/macro-doc-comments-1.stderr
index eaeb62d2c..eaeb62d2c 100644
--- a/src/test/ui/parser/macro/macro-doc-comments-1.stderr
+++ b/tests/ui/parser/macro/macro-doc-comments-1.stderr
diff --git a/src/test/ui/parser/macro/macro-doc-comments-2.rs b/tests/ui/parser/macro/macro-doc-comments-2.rs
index 8f33720ae..8f33720ae 100644
--- a/src/test/ui/parser/macro/macro-doc-comments-2.rs
+++ b/tests/ui/parser/macro/macro-doc-comments-2.rs
diff --git a/src/test/ui/parser/macro/macro-doc-comments-2.stderr b/tests/ui/parser/macro/macro-doc-comments-2.stderr
index 1dcd95f6f..1dcd95f6f 100644
--- a/src/test/ui/parser/macro/macro-doc-comments-2.stderr
+++ b/tests/ui/parser/macro/macro-doc-comments-2.stderr
diff --git a/src/test/ui/parser/macro/macro-incomplete-parse.rs b/tests/ui/parser/macro/macro-incomplete-parse.rs
index 544e4aa7b..544e4aa7b 100644
--- a/src/test/ui/parser/macro/macro-incomplete-parse.rs
+++ b/tests/ui/parser/macro/macro-incomplete-parse.rs
diff --git a/src/test/ui/parser/macro/macro-incomplete-parse.stderr b/tests/ui/parser/macro/macro-incomplete-parse.stderr
index 707417b72..707417b72 100644
--- a/src/test/ui/parser/macro/macro-incomplete-parse.stderr
+++ b/tests/ui/parser/macro/macro-incomplete-parse.stderr
diff --git a/src/test/ui/parser/macro/macro-repeat.rs b/tests/ui/parser/macro/macro-repeat.rs
index 3ffbea217..3ffbea217 100644
--- a/src/test/ui/parser/macro/macro-repeat.rs
+++ b/tests/ui/parser/macro/macro-repeat.rs
diff --git a/src/test/ui/parser/macro/macro-repeat.stderr b/tests/ui/parser/macro/macro-repeat.stderr
index 63554b197..63554b197 100644
--- a/src/test/ui/parser/macro/macro-repeat.stderr
+++ b/tests/ui/parser/macro/macro-repeat.stderr
diff --git a/src/test/ui/parser/macro/pub-item-macro.rs b/tests/ui/parser/macro/pub-item-macro.rs
index f5f8a01e6..f5f8a01e6 100644
--- a/src/test/ui/parser/macro/pub-item-macro.rs
+++ b/tests/ui/parser/macro/pub-item-macro.rs
diff --git a/src/test/ui/parser/macro/pub-item-macro.stderr b/tests/ui/parser/macro/pub-item-macro.stderr
index 9a2fffcce..9a2fffcce 100644
--- a/src/test/ui/parser/macro/pub-item-macro.stderr
+++ b/tests/ui/parser/macro/pub-item-macro.stderr
diff --git a/src/test/ui/parser/macro/trait-non-item-macros.rs b/tests/ui/parser/macro/trait-non-item-macros.rs
index 97fb564bf..97fb564bf 100644
--- a/src/test/ui/parser/macro/trait-non-item-macros.rs
+++ b/tests/ui/parser/macro/trait-non-item-macros.rs
diff --git a/src/test/ui/parser/macro/trait-non-item-macros.stderr b/tests/ui/parser/macro/trait-non-item-macros.stderr
index db20e6b24..db20e6b24 100644
--- a/src/test/ui/parser/macro/trait-non-item-macros.stderr
+++ b/tests/ui/parser/macro/trait-non-item-macros.stderr
diff --git a/src/test/ui/parser/macro/trait-object-macro-matcher.rs b/tests/ui/parser/macro/trait-object-macro-matcher.rs
index 560195977..560195977 100644
--- a/src/test/ui/parser/macro/trait-object-macro-matcher.rs
+++ b/tests/ui/parser/macro/trait-object-macro-matcher.rs
diff --git a/src/test/ui/parser/macro/trait-object-macro-matcher.stderr b/tests/ui/parser/macro/trait-object-macro-matcher.stderr
index 40082564b..40082564b 100644
--- a/src/test/ui/parser/macro/trait-object-macro-matcher.stderr
+++ b/tests/ui/parser/macro/trait-object-macro-matcher.stderr
diff --git a/src/test/ui/parser/macros-no-semicolon-items.rs b/tests/ui/parser/macros-no-semicolon-items.rs
index 3afc275d6..3afc275d6 100644
--- a/src/test/ui/parser/macros-no-semicolon-items.rs
+++ b/tests/ui/parser/macros-no-semicolon-items.rs
diff --git a/src/test/ui/parser/macros-no-semicolon-items.stderr b/tests/ui/parser/macros-no-semicolon-items.stderr
index 6d2431c4a..6d2431c4a 100644
--- a/src/test/ui/parser/macros-no-semicolon-items.stderr
+++ b/tests/ui/parser/macros-no-semicolon-items.stderr
diff --git a/src/test/ui/parser/macros-no-semicolon.rs b/tests/ui/parser/macros-no-semicolon.rs
index 24d1ae9e6..24d1ae9e6 100644
--- a/src/test/ui/parser/macros-no-semicolon.rs
+++ b/tests/ui/parser/macros-no-semicolon.rs
diff --git a/src/test/ui/parser/macros-no-semicolon.stderr b/tests/ui/parser/macros-no-semicolon.stderr
index f310662db..f310662db 100644
--- a/src/test/ui/parser/macros-no-semicolon.stderr
+++ b/tests/ui/parser/macros-no-semicolon.stderr
diff --git a/src/test/ui/parser/match-arm-without-braces.rs b/tests/ui/parser/match-arm-without-braces.rs
index bba38fd0f..bba38fd0f 100644
--- a/src/test/ui/parser/match-arm-without-braces.rs
+++ b/tests/ui/parser/match-arm-without-braces.rs
diff --git a/src/test/ui/parser/match-arm-without-braces.stderr b/tests/ui/parser/match-arm-without-braces.stderr
index 37d55aa53..37d55aa53 100644
--- a/src/test/ui/parser/match-arm-without-braces.stderr
+++ b/tests/ui/parser/match-arm-without-braces.stderr
diff --git a/src/test/ui/parser/match-arrows-block-then-binop.rs b/tests/ui/parser/match-arrows-block-then-binop.rs
index 56c917c74..56c917c74 100644
--- a/src/test/ui/parser/match-arrows-block-then-binop.rs
+++ b/tests/ui/parser/match-arrows-block-then-binop.rs
diff --git a/src/test/ui/parser/match-arrows-block-then-binop.stderr b/tests/ui/parser/match-arrows-block-then-binop.stderr
index cb361a3db..cb361a3db 100644
--- a/src/test/ui/parser/match-arrows-block-then-binop.stderr
+++ b/tests/ui/parser/match-arrows-block-then-binop.stderr
diff --git a/src/test/ui/parser/match-refactor-to-expr.fixed b/tests/ui/parser/match-refactor-to-expr.fixed
index 423147b27..423147b27 100644
--- a/src/test/ui/parser/match-refactor-to-expr.fixed
+++ b/tests/ui/parser/match-refactor-to-expr.fixed
diff --git a/src/test/ui/parser/match-refactor-to-expr.rs b/tests/ui/parser/match-refactor-to-expr.rs
index fcba5d044..fcba5d044 100644
--- a/src/test/ui/parser/match-refactor-to-expr.rs
+++ b/tests/ui/parser/match-refactor-to-expr.rs
diff --git a/src/test/ui/parser/match-refactor-to-expr.stderr b/tests/ui/parser/match-refactor-to-expr.stderr
index 851bef8f2..851bef8f2 100644
--- a/src/test/ui/parser/match-refactor-to-expr.stderr
+++ b/tests/ui/parser/match-refactor-to-expr.stderr
diff --git a/src/test/ui/parser/mbe_missing_right_paren.rs b/tests/ui/parser/mbe_missing_right_paren.rs
index 689176b3e..689176b3e 100644
--- a/src/test/ui/parser/mbe_missing_right_paren.rs
+++ b/tests/ui/parser/mbe_missing_right_paren.rs
diff --git a/src/test/ui/parser/mbe_missing_right_paren.stderr b/tests/ui/parser/mbe_missing_right_paren.stderr
index ccaf77d39..ccaf77d39 100644
--- a/src/test/ui/parser/mbe_missing_right_paren.stderr
+++ b/tests/ui/parser/mbe_missing_right_paren.stderr
diff --git a/tests/ui/parser/method-call-on-struct-literal-in-if-condition.rs b/tests/ui/parser/method-call-on-struct-literal-in-if-condition.rs
new file mode 100644
index 000000000..8be7c9ee8
--- /dev/null
+++ b/tests/ui/parser/method-call-on-struct-literal-in-if-condition.rs
@@ -0,0 +1,13 @@
+pub struct Example { a: i32 }
+
+impl Example {
+    fn is_pos(&self) -> bool { self.a > 0 }
+}
+
+fn one() -> i32 { 1 }
+
+fn main() {
+    if Example { a: one(), }.is_pos() { //~ ERROR invalid struct literal
+        println!("Positive!");
+    }
+}
diff --git a/tests/ui/parser/method-call-on-struct-literal-in-if-condition.stderr b/tests/ui/parser/method-call-on-struct-literal-in-if-condition.stderr
new file mode 100644
index 000000000..7fd7ffc94
--- /dev/null
+++ b/tests/ui/parser/method-call-on-struct-literal-in-if-condition.stderr
@@ -0,0 +1,13 @@
+error: invalid struct literal
+  --> $DIR/method-call-on-struct-literal-in-if-condition.rs:10:8
+   |
+LL |     if Example { a: one(), }.is_pos() {
+   |        ^^^^^^^^^^^^^^^^^^^^^
+   |
+help: you might need to surround the struct literal in parentheses
+   |
+LL |     if (Example { a: one(), }).is_pos() {
+   |        +                     +
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.rs b/tests/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.rs
index 8f46970b1..8f46970b1 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.rs
+++ b/tests/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.rs
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr b/tests/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr
index cc7cc0c55..cc7cc0c55 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr
+++ b/tests/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-struct.rs b/tests/ui/parser/mismatched-braces/missing-close-brace-in-struct.rs
index 090a17b41..090a17b41 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-struct.rs
+++ b/tests/ui/parser/mismatched-braces/missing-close-brace-in-struct.rs
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-struct.stderr b/tests/ui/parser/mismatched-braces/missing-close-brace-in-struct.stderr
index ad1e90e43..ad1e90e43 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-struct.stderr
+++ b/tests/ui/parser/mismatched-braces/missing-close-brace-in-struct.stderr
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.rs b/tests/ui/parser/mismatched-braces/missing-close-brace-in-trait.rs
index b6932deb5..b6932deb5 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.rs
+++ b/tests/ui/parser/mismatched-braces/missing-close-brace-in-trait.rs
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr b/tests/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr
index 7c6254356..7c6254356 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr
+++ b/tests/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr
diff --git a/src/test/ui/parser/mismatched-delim-brace-empty-block.rs b/tests/ui/parser/mismatched-delim-brace-empty-block.rs
index 61d7a9af2..61d7a9af2 100644
--- a/src/test/ui/parser/mismatched-delim-brace-empty-block.rs
+++ b/tests/ui/parser/mismatched-delim-brace-empty-block.rs
diff --git a/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr b/tests/ui/parser/mismatched-delim-brace-empty-block.stderr
index 165eb8ae9..165eb8ae9 100644
--- a/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr
+++ b/tests/ui/parser/mismatched-delim-brace-empty-block.stderr
diff --git a/src/test/ui/parser/missing-closing-angle-bracket-eq-constraint.rs b/tests/ui/parser/missing-closing-angle-bracket-eq-constraint.rs
index da95c1bfa..da95c1bfa 100644
--- a/src/test/ui/parser/missing-closing-angle-bracket-eq-constraint.rs
+++ b/tests/ui/parser/missing-closing-angle-bracket-eq-constraint.rs
diff --git a/src/test/ui/parser/missing-closing-angle-bracket-eq-constraint.stderr b/tests/ui/parser/missing-closing-angle-bracket-eq-constraint.stderr
index bad241634..bad241634 100644
--- a/src/test/ui/parser/missing-closing-angle-bracket-eq-constraint.stderr
+++ b/tests/ui/parser/missing-closing-angle-bracket-eq-constraint.stderr
diff --git a/src/test/ui/parser/missing-closing-angle-bracket-struct-field-ty.rs b/tests/ui/parser/missing-closing-angle-bracket-struct-field-ty.rs
index d69a56c51..d69a56c51 100644
--- a/src/test/ui/parser/missing-closing-angle-bracket-struct-field-ty.rs
+++ b/tests/ui/parser/missing-closing-angle-bracket-struct-field-ty.rs
diff --git a/src/test/ui/parser/missing-closing-angle-bracket-struct-field-ty.stderr b/tests/ui/parser/missing-closing-angle-bracket-struct-field-ty.stderr
index 6d8b0c3fc..6d8b0c3fc 100644
--- a/src/test/ui/parser/missing-closing-angle-bracket-struct-field-ty.stderr
+++ b/tests/ui/parser/missing-closing-angle-bracket-struct-field-ty.stderr
diff --git a/src/test/ui/parser/missing-semicolon.rs b/tests/ui/parser/missing-semicolon.rs
index f68d177c0..f68d177c0 100644
--- a/src/test/ui/parser/missing-semicolon.rs
+++ b/tests/ui/parser/missing-semicolon.rs
diff --git a/src/test/ui/parser/missing-semicolon.stderr b/tests/ui/parser/missing-semicolon.stderr
index e0d5e84ec..e0d5e84ec 100644
--- a/src/test/ui/parser/missing-semicolon.stderr
+++ b/tests/ui/parser/missing-semicolon.stderr
diff --git a/src/test/ui/parser/missing_right_paren.rs b/tests/ui/parser/missing_right_paren.rs
index 810dee957..810dee957 100644
--- a/src/test/ui/parser/missing_right_paren.rs
+++ b/tests/ui/parser/missing_right_paren.rs
diff --git a/src/test/ui/parser/missing_right_paren.stderr b/tests/ui/parser/missing_right_paren.stderr
index 3fe0d0f42..3fe0d0f42 100644
--- a/src/test/ui/parser/missing_right_paren.stderr
+++ b/tests/ui/parser/missing_right_paren.stderr
diff --git a/src/test/ui/parser/misspelled-macro-rules.fixed b/tests/ui/parser/misspelled-macro-rules.fixed
index 62be913d8..62be913d8 100644
--- a/src/test/ui/parser/misspelled-macro-rules.fixed
+++ b/tests/ui/parser/misspelled-macro-rules.fixed
diff --git a/src/test/ui/parser/misspelled-macro-rules.rs b/tests/ui/parser/misspelled-macro-rules.rs
index 4290e6e5e..4290e6e5e 100644
--- a/src/test/ui/parser/misspelled-macro-rules.rs
+++ b/tests/ui/parser/misspelled-macro-rules.rs
diff --git a/src/test/ui/parser/misspelled-macro-rules.stderr b/tests/ui/parser/misspelled-macro-rules.stderr
index 56df71238..56df71238 100644
--- a/src/test/ui/parser/misspelled-macro-rules.stderr
+++ b/tests/ui/parser/misspelled-macro-rules.stderr
diff --git a/src/test/ui/parser/mod_file_not_exist.rs b/tests/ui/parser/mod_file_not_exist.rs
index 7b079eb02..7b079eb02 100644
--- a/src/test/ui/parser/mod_file_not_exist.rs
+++ b/tests/ui/parser/mod_file_not_exist.rs
diff --git a/src/test/ui/parser/mod_file_not_exist.stderr b/tests/ui/parser/mod_file_not_exist.stderr
index 62456d518..62456d518 100644
--- a/src/test/ui/parser/mod_file_not_exist.stderr
+++ b/tests/ui/parser/mod_file_not_exist.stderr
diff --git a/src/test/ui/parser/mod_file_not_exist_windows.rs b/tests/ui/parser/mod_file_not_exist_windows.rs
index 5db21e2bb..5db21e2bb 100644
--- a/src/test/ui/parser/mod_file_not_exist_windows.rs
+++ b/tests/ui/parser/mod_file_not_exist_windows.rs
diff --git a/src/test/ui/parser/mod_file_not_exist_windows.stderr b/tests/ui/parser/mod_file_not_exist_windows.stderr
index d5143dbe9..d5143dbe9 100644
--- a/src/test/ui/parser/mod_file_not_exist_windows.stderr
+++ b/tests/ui/parser/mod_file_not_exist_windows.stderr
diff --git a/src/test/ui/parser/mod_file_with_path_attr.rs b/tests/ui/parser/mod_file_with_path_attr.rs
index 9450d89e5..9450d89e5 100644
--- a/src/test/ui/parser/mod_file_with_path_attr.rs
+++ b/tests/ui/parser/mod_file_with_path_attr.rs
diff --git a/src/test/ui/parser/mod_file_with_path_attr.stderr b/tests/ui/parser/mod_file_with_path_attr.stderr
index cd1add73d..cd1add73d 100644
--- a/src/test/ui/parser/mod_file_with_path_attr.stderr
+++ b/tests/ui/parser/mod_file_with_path_attr.stderr
diff --git a/src/test/ui/parser/multibyte-char-use-seperator-issue-80134.rs b/tests/ui/parser/multibyte-char-use-seperator-issue-80134.rs
index 7e7995d67..7e7995d67 100644
--- a/src/test/ui/parser/multibyte-char-use-seperator-issue-80134.rs
+++ b/tests/ui/parser/multibyte-char-use-seperator-issue-80134.rs
diff --git a/src/test/ui/parser/multibyte-char-use-seperator-issue-80134.stderr b/tests/ui/parser/multibyte-char-use-seperator-issue-80134.stderr
index 21e71aa12..21e71aa12 100644
--- a/src/test/ui/parser/multibyte-char-use-seperator-issue-80134.stderr
+++ b/tests/ui/parser/multibyte-char-use-seperator-issue-80134.stderr
diff --git a/src/test/ui/parser/multiline-comment-line-tracking.rs b/tests/ui/parser/multiline-comment-line-tracking.rs
index d4735e8a7..d4735e8a7 100644
--- a/src/test/ui/parser/multiline-comment-line-tracking.rs
+++ b/tests/ui/parser/multiline-comment-line-tracking.rs
diff --git a/src/test/ui/parser/multiline-comment-line-tracking.stderr b/tests/ui/parser/multiline-comment-line-tracking.stderr
index cac0c801a..cac0c801a 100644
--- a/src/test/ui/parser/multiline-comment-line-tracking.stderr
+++ b/tests/ui/parser/multiline-comment-line-tracking.stderr
diff --git a/src/test/ui/parser/multitrait.rs b/tests/ui/parser/multitrait.rs
index f9b4b37ac..f9b4b37ac 100644
--- a/src/test/ui/parser/multitrait.rs
+++ b/tests/ui/parser/multitrait.rs
diff --git a/src/test/ui/parser/multitrait.stderr b/tests/ui/parser/multitrait.stderr
index 5a8bb2f7a..5a8bb2f7a 100644
--- a/src/test/ui/parser/multitrait.stderr
+++ b/tests/ui/parser/multitrait.stderr
diff --git a/src/test/ui/parser/mut-patterns.rs b/tests/ui/parser/mut-patterns.rs
index 8b83d6ab2..8b83d6ab2 100644
--- a/src/test/ui/parser/mut-patterns.rs
+++ b/tests/ui/parser/mut-patterns.rs
diff --git a/src/test/ui/parser/mut-patterns.stderr b/tests/ui/parser/mut-patterns.stderr
index f179d8c9e..f179d8c9e 100644
--- a/src/test/ui/parser/mut-patterns.stderr
+++ b/tests/ui/parser/mut-patterns.stderr
diff --git a/tests/ui/parser/nested-bad-turbofish.rs b/tests/ui/parser/nested-bad-turbofish.rs
new file mode 100644
index 000000000..02099fde2
--- /dev/null
+++ b/tests/ui/parser/nested-bad-turbofish.rs
@@ -0,0 +1,3 @@
+fn main() {
+    foo<<S as T>::V>(); //~ ERROR
+}
diff --git a/tests/ui/parser/nested-bad-turbofish.stderr b/tests/ui/parser/nested-bad-turbofish.stderr
new file mode 100644
index 000000000..d82fa80e5
--- /dev/null
+++ b/tests/ui/parser/nested-bad-turbofish.stderr
@@ -0,0 +1,11 @@
+error: comparison operators cannot be chained
+  --> $DIR/nested-bad-turbofish.rs:2:16
+   |
+LL |     foo<<S as T>::V>();
+   |                ^   ^
+   |
+   = help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
+   = help: or use `(...)` if you meant to specify fn arguments
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/parser/nested-missing-closing-angle-bracket.rs b/tests/ui/parser/nested-missing-closing-angle-bracket.rs
index 84ffdd176..84ffdd176 100644
--- a/src/test/ui/parser/nested-missing-closing-angle-bracket.rs
+++ b/tests/ui/parser/nested-missing-closing-angle-bracket.rs
diff --git a/src/test/ui/parser/nested-missing-closing-angle-bracket.stderr b/tests/ui/parser/nested-missing-closing-angle-bracket.stderr
index b85bc0256..b85bc0256 100644
--- a/src/test/ui/parser/nested-missing-closing-angle-bracket.stderr
+++ b/tests/ui/parser/nested-missing-closing-angle-bracket.stderr
diff --git a/src/test/ui/parser/new-unicode-escapes-1.rs b/tests/ui/parser/new-unicode-escapes-1.rs
index d6a54660e..d6a54660e 100644
--- a/src/test/ui/parser/new-unicode-escapes-1.rs
+++ b/tests/ui/parser/new-unicode-escapes-1.rs
diff --git a/src/test/ui/parser/new-unicode-escapes-1.stderr b/tests/ui/parser/new-unicode-escapes-1.stderr
index d133e46b4..d133e46b4 100644
--- a/src/test/ui/parser/new-unicode-escapes-1.stderr
+++ b/tests/ui/parser/new-unicode-escapes-1.stderr
diff --git a/src/test/ui/parser/new-unicode-escapes-2.rs b/tests/ui/parser/new-unicode-escapes-2.rs
index cbb614c19..cbb614c19 100644
--- a/src/test/ui/parser/new-unicode-escapes-2.rs
+++ b/tests/ui/parser/new-unicode-escapes-2.rs
diff --git a/src/test/ui/parser/new-unicode-escapes-2.stderr b/tests/ui/parser/new-unicode-escapes-2.stderr
index 2f3f8c0f9..2f3f8c0f9 100644
--- a/src/test/ui/parser/new-unicode-escapes-2.stderr
+++ b/tests/ui/parser/new-unicode-escapes-2.stderr
diff --git a/src/test/ui/parser/new-unicode-escapes-3.rs b/tests/ui/parser/new-unicode-escapes-3.rs
index 295ab08c0..295ab08c0 100644
--- a/src/test/ui/parser/new-unicode-escapes-3.rs
+++ b/tests/ui/parser/new-unicode-escapes-3.rs
diff --git a/src/test/ui/parser/new-unicode-escapes-3.stderr b/tests/ui/parser/new-unicode-escapes-3.stderr
index f5a0f8fc7..f5a0f8fc7 100644
--- a/src/test/ui/parser/new-unicode-escapes-3.stderr
+++ b/tests/ui/parser/new-unicode-escapes-3.stderr
diff --git a/src/test/ui/parser/new-unicode-escapes-4.rs b/tests/ui/parser/new-unicode-escapes-4.rs
index 79882713e..79882713e 100644
--- a/src/test/ui/parser/new-unicode-escapes-4.rs
+++ b/tests/ui/parser/new-unicode-escapes-4.rs
diff --git a/src/test/ui/parser/new-unicode-escapes-4.stderr b/tests/ui/parser/new-unicode-escapes-4.stderr
index 514591af1..514591af1 100644
--- a/src/test/ui/parser/new-unicode-escapes-4.stderr
+++ b/tests/ui/parser/new-unicode-escapes-4.stderr
diff --git a/src/test/ui/parser/no-binary-float-literal.rs b/tests/ui/parser/no-binary-float-literal.rs
index e07ff6518..e07ff6518 100644
--- a/src/test/ui/parser/no-binary-float-literal.rs
+++ b/tests/ui/parser/no-binary-float-literal.rs
diff --git a/src/test/ui/parser/no-binary-float-literal.stderr b/tests/ui/parser/no-binary-float-literal.stderr
index cfd448684..cfd448684 100644
--- a/src/test/ui/parser/no-binary-float-literal.stderr
+++ b/tests/ui/parser/no-binary-float-literal.stderr
diff --git a/src/test/ui/parser/no-const-fn-in-extern-block.rs b/tests/ui/parser/no-const-fn-in-extern-block.rs
index 1993124ed..1993124ed 100644
--- a/src/test/ui/parser/no-const-fn-in-extern-block.rs
+++ b/tests/ui/parser/no-const-fn-in-extern-block.rs
diff --git a/src/test/ui/parser/no-const-fn-in-extern-block.stderr b/tests/ui/parser/no-const-fn-in-extern-block.stderr
index 4ac0e2655..4ac0e2655 100644
--- a/src/test/ui/parser/no-const-fn-in-extern-block.stderr
+++ b/tests/ui/parser/no-const-fn-in-extern-block.stderr
diff --git a/src/test/ui/parser/no-hex-float-literal.rs b/tests/ui/parser/no-hex-float-literal.rs
index bf11dee08..bf11dee08 100644
--- a/src/test/ui/parser/no-hex-float-literal.rs
+++ b/tests/ui/parser/no-hex-float-literal.rs
diff --git a/src/test/ui/parser/no-hex-float-literal.stderr b/tests/ui/parser/no-hex-float-literal.stderr
index 258ab06d5..258ab06d5 100644
--- a/src/test/ui/parser/no-hex-float-literal.stderr
+++ b/tests/ui/parser/no-hex-float-literal.stderr
diff --git a/src/test/ui/parser/no-unsafe-self.rs b/tests/ui/parser/no-unsafe-self.rs
index d1cd8ad53..d1cd8ad53 100644
--- a/src/test/ui/parser/no-unsafe-self.rs
+++ b/tests/ui/parser/no-unsafe-self.rs
diff --git a/src/test/ui/parser/no-unsafe-self.stderr b/tests/ui/parser/no-unsafe-self.stderr
index 23323945e..23323945e 100644
--- a/src/test/ui/parser/no-unsafe-self.stderr
+++ b/tests/ui/parser/no-unsafe-self.stderr
diff --git a/src/test/ui/parser/not-a-pred.rs b/tests/ui/parser/not-a-pred.rs
index 5518b554d..5518b554d 100644
--- a/src/test/ui/parser/not-a-pred.rs
+++ b/tests/ui/parser/not-a-pred.rs
diff --git a/src/test/ui/parser/not-a-pred.stderr b/tests/ui/parser/not-a-pred.stderr
index bcc64a687..bcc64a687 100644
--- a/src/test/ui/parser/not-a-pred.stderr
+++ b/tests/ui/parser/not-a-pred.stderr
diff --git a/src/test/ui/parser/nt-parsing-has-recovery.rs b/tests/ui/parser/nt-parsing-has-recovery.rs
index ccbeb398a..ccbeb398a 100644
--- a/src/test/ui/parser/nt-parsing-has-recovery.rs
+++ b/tests/ui/parser/nt-parsing-has-recovery.rs
diff --git a/src/test/ui/parser/nt-parsing-has-recovery.stderr b/tests/ui/parser/nt-parsing-has-recovery.stderr
index 263c4ad53..263c4ad53 100644
--- a/src/test/ui/parser/nt-parsing-has-recovery.stderr
+++ b/tests/ui/parser/nt-parsing-has-recovery.stderr
diff --git a/src/test/ui/parser/numeric-lifetime.rs b/tests/ui/parser/numeric-lifetime.rs
index 2d82354c6..2d82354c6 100644
--- a/src/test/ui/parser/numeric-lifetime.rs
+++ b/tests/ui/parser/numeric-lifetime.rs
diff --git a/src/test/ui/parser/numeric-lifetime.stderr b/tests/ui/parser/numeric-lifetime.stderr
index 7c1bcb726..7c1bcb726 100644
--- a/src/test/ui/parser/numeric-lifetime.stderr
+++ b/tests/ui/parser/numeric-lifetime.stderr
diff --git a/src/test/ui/parser/obsolete-syntax-impl-for-dotdot.rs b/tests/ui/parser/obsolete-syntax-impl-for-dotdot.rs
index e928f09aa..e928f09aa 100644
--- a/src/test/ui/parser/obsolete-syntax-impl-for-dotdot.rs
+++ b/tests/ui/parser/obsolete-syntax-impl-for-dotdot.rs
diff --git a/src/test/ui/parser/obsolete-syntax-impl-for-dotdot.stderr b/tests/ui/parser/obsolete-syntax-impl-for-dotdot.stderr
index b7108ced0..b7108ced0 100644
--- a/src/test/ui/parser/obsolete-syntax-impl-for-dotdot.stderr
+++ b/tests/ui/parser/obsolete-syntax-impl-for-dotdot.stderr
diff --git a/src/test/ui/parser/old-suffixes-are-really-forbidden.rs b/tests/ui/parser/old-suffixes-are-really-forbidden.rs
index eea95b7d6..eea95b7d6 100644
--- a/src/test/ui/parser/old-suffixes-are-really-forbidden.rs
+++ b/tests/ui/parser/old-suffixes-are-really-forbidden.rs
diff --git a/src/test/ui/parser/old-suffixes-are-really-forbidden.stderr b/tests/ui/parser/old-suffixes-are-really-forbidden.stderr
index fb309793b..fb309793b 100644
--- a/src/test/ui/parser/old-suffixes-are-really-forbidden.stderr
+++ b/tests/ui/parser/old-suffixes-are-really-forbidden.stderr
diff --git a/src/test/ui/parser/omitted-arg-in-item-fn.rs b/tests/ui/parser/omitted-arg-in-item-fn.rs
index 49cbc4d6b..49cbc4d6b 100644
--- a/src/test/ui/parser/omitted-arg-in-item-fn.rs
+++ b/tests/ui/parser/omitted-arg-in-item-fn.rs
diff --git a/src/test/ui/parser/omitted-arg-in-item-fn.stderr b/tests/ui/parser/omitted-arg-in-item-fn.stderr
index ce2eab051..ce2eab051 100644
--- a/src/test/ui/parser/omitted-arg-in-item-fn.stderr
+++ b/tests/ui/parser/omitted-arg-in-item-fn.stderr
diff --git a/src/test/ui/parser/operator-associativity.rs b/tests/ui/parser/operator-associativity.rs
index 4f40c80bc..4f40c80bc 100644
--- a/src/test/ui/parser/operator-associativity.rs
+++ b/tests/ui/parser/operator-associativity.rs
diff --git a/src/test/ui/parser/paamayim-nekudotayim.rs b/tests/ui/parser/paamayim-nekudotayim.rs
index cb151d652..cb151d652 100644
--- a/src/test/ui/parser/paamayim-nekudotayim.rs
+++ b/tests/ui/parser/paamayim-nekudotayim.rs
diff --git a/src/test/ui/parser/paamayim-nekudotayim.stderr b/tests/ui/parser/paamayim-nekudotayim.stderr
index 6ceba07f4..6ceba07f4 100644
--- a/src/test/ui/parser/paamayim-nekudotayim.stderr
+++ b/tests/ui/parser/paamayim-nekudotayim.stderr
diff --git a/src/test/ui/parser/parse-assoc-type-lt.rs b/tests/ui/parser/parse-assoc-type-lt.rs
index d3fe6079a..d3fe6079a 100644
--- a/src/test/ui/parser/parse-assoc-type-lt.rs
+++ b/tests/ui/parser/parse-assoc-type-lt.rs
diff --git a/src/test/ui/parser/parse-error-correct.rs b/tests/ui/parser/parse-error-correct.rs
index 13759a235..13759a235 100644
--- a/src/test/ui/parser/parse-error-correct.rs
+++ b/tests/ui/parser/parse-error-correct.rs
diff --git a/src/test/ui/parser/parse-error-correct.stderr b/tests/ui/parser/parse-error-correct.stderr
index 691df9126..691df9126 100644
--- a/src/test/ui/parser/parse-error-correct.stderr
+++ b/tests/ui/parser/parse-error-correct.stderr
diff --git a/src/test/ui/parser/parse-panic.rs b/tests/ui/parser/parse-panic.rs
index aeb2ba4fa..aeb2ba4fa 100644
--- a/src/test/ui/parser/parse-panic.rs
+++ b/tests/ui/parser/parse-panic.rs
diff --git a/src/test/ui/parser/parser-recovery-1.rs b/tests/ui/parser/parser-recovery-1.rs
index 7e26b4f2b..7e26b4f2b 100644
--- a/src/test/ui/parser/parser-recovery-1.rs
+++ b/tests/ui/parser/parser-recovery-1.rs
diff --git a/src/test/ui/parser/parser-recovery-1.stderr b/tests/ui/parser/parser-recovery-1.stderr
index 0cb771ea3..0cb771ea3 100644
--- a/src/test/ui/parser/parser-recovery-1.stderr
+++ b/tests/ui/parser/parser-recovery-1.stderr
diff --git a/src/test/ui/parser/parser-recovery-2.rs b/tests/ui/parser/parser-recovery-2.rs
index 48b22afff..48b22afff 100644
--- a/src/test/ui/parser/parser-recovery-2.rs
+++ b/tests/ui/parser/parser-recovery-2.rs
diff --git a/src/test/ui/parser/parser-recovery-2.stderr b/tests/ui/parser/parser-recovery-2.stderr
index 8829cf4c1..8829cf4c1 100644
--- a/src/test/ui/parser/parser-recovery-2.stderr
+++ b/tests/ui/parser/parser-recovery-2.stderr
diff --git a/src/test/ui/parser/parser-unicode-whitespace.rs b/tests/ui/parser/parser-unicode-whitespace.rs
index 555cd68c3..555cd68c3 100644
--- a/src/test/ui/parser/parser-unicode-whitespace.rs
+++ b/tests/ui/parser/parser-unicode-whitespace.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-1.rs b/tests/ui/parser/pat-lt-bracket-1.rs
index 2e2001434..2e2001434 100644
--- a/src/test/ui/parser/pat-lt-bracket-1.rs
+++ b/tests/ui/parser/pat-lt-bracket-1.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-1.stderr b/tests/ui/parser/pat-lt-bracket-1.stderr
index e8ccbad66..e8ccbad66 100644
--- a/src/test/ui/parser/pat-lt-bracket-1.stderr
+++ b/tests/ui/parser/pat-lt-bracket-1.stderr
diff --git a/src/test/ui/parser/pat-lt-bracket-2.rs b/tests/ui/parser/pat-lt-bracket-2.rs
index 3a778ed14..3a778ed14 100644
--- a/src/test/ui/parser/pat-lt-bracket-2.rs
+++ b/tests/ui/parser/pat-lt-bracket-2.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-2.stderr b/tests/ui/parser/pat-lt-bracket-2.stderr
index c78f96e1a..c78f96e1a 100644
--- a/src/test/ui/parser/pat-lt-bracket-2.stderr
+++ b/tests/ui/parser/pat-lt-bracket-2.stderr
diff --git a/src/test/ui/parser/pat-lt-bracket-3.rs b/tests/ui/parser/pat-lt-bracket-3.rs
index a8bdfd3fa..a8bdfd3fa 100644
--- a/src/test/ui/parser/pat-lt-bracket-3.rs
+++ b/tests/ui/parser/pat-lt-bracket-3.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-3.stderr b/tests/ui/parser/pat-lt-bracket-3.stderr
index bacf868e3..bacf868e3 100644
--- a/src/test/ui/parser/pat-lt-bracket-3.stderr
+++ b/tests/ui/parser/pat-lt-bracket-3.stderr
diff --git a/src/test/ui/parser/pat-lt-bracket-4.rs b/tests/ui/parser/pat-lt-bracket-4.rs
index de314f6c6..de314f6c6 100644
--- a/src/test/ui/parser/pat-lt-bracket-4.rs
+++ b/tests/ui/parser/pat-lt-bracket-4.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-4.stderr b/tests/ui/parser/pat-lt-bracket-4.stderr
index 911c276b9..911c276b9 100644
--- a/src/test/ui/parser/pat-lt-bracket-4.stderr
+++ b/tests/ui/parser/pat-lt-bracket-4.stderr
diff --git a/src/test/ui/parser/pat-lt-bracket-5.rs b/tests/ui/parser/pat-lt-bracket-5.rs
index aaece1f6b..aaece1f6b 100644
--- a/src/test/ui/parser/pat-lt-bracket-5.rs
+++ b/tests/ui/parser/pat-lt-bracket-5.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-5.stderr b/tests/ui/parser/pat-lt-bracket-5.stderr
index e23674bce..e23674bce 100644
--- a/src/test/ui/parser/pat-lt-bracket-5.stderr
+++ b/tests/ui/parser/pat-lt-bracket-5.stderr
diff --git a/src/test/ui/parser/pat-lt-bracket-6.rs b/tests/ui/parser/pat-lt-bracket-6.rs
index 7becffa9f..7becffa9f 100644
--- a/src/test/ui/parser/pat-lt-bracket-6.rs
+++ b/tests/ui/parser/pat-lt-bracket-6.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-6.stderr b/tests/ui/parser/pat-lt-bracket-6.stderr
index 035d0dbfe..035d0dbfe 100644
--- a/src/test/ui/parser/pat-lt-bracket-6.stderr
+++ b/tests/ui/parser/pat-lt-bracket-6.stderr
diff --git a/src/test/ui/parser/pat-lt-bracket-7.rs b/tests/ui/parser/pat-lt-bracket-7.rs
index 327aef5ad..327aef5ad 100644
--- a/src/test/ui/parser/pat-lt-bracket-7.rs
+++ b/tests/ui/parser/pat-lt-bracket-7.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-7.stderr b/tests/ui/parser/pat-lt-bracket-7.stderr
index 004dcfb2a..004dcfb2a 100644
--- a/src/test/ui/parser/pat-lt-bracket-7.stderr
+++ b/tests/ui/parser/pat-lt-bracket-7.stderr
diff --git a/src/test/ui/parser/pat-ranges-1.rs b/tests/ui/parser/pat-ranges-1.rs
index 1dafb5a07..1dafb5a07 100644
--- a/src/test/ui/parser/pat-ranges-1.rs
+++ b/tests/ui/parser/pat-ranges-1.rs
diff --git a/src/test/ui/parser/pat-ranges-1.stderr b/tests/ui/parser/pat-ranges-1.stderr
index b64a3ce5c..b64a3ce5c 100644
--- a/src/test/ui/parser/pat-ranges-1.stderr
+++ b/tests/ui/parser/pat-ranges-1.stderr
diff --git a/src/test/ui/parser/pat-ranges-2.rs b/tests/ui/parser/pat-ranges-2.rs
index 1593222ac..1593222ac 100644
--- a/src/test/ui/parser/pat-ranges-2.rs
+++ b/tests/ui/parser/pat-ranges-2.rs
diff --git a/src/test/ui/parser/pat-ranges-2.stderr b/tests/ui/parser/pat-ranges-2.stderr
index 1a9e33beb..1a9e33beb 100644
--- a/src/test/ui/parser/pat-ranges-2.stderr
+++ b/tests/ui/parser/pat-ranges-2.stderr
diff --git a/src/test/ui/parser/pat-ranges-3.rs b/tests/ui/parser/pat-ranges-3.rs
index 8976dcf0d..8976dcf0d 100644
--- a/src/test/ui/parser/pat-ranges-3.rs
+++ b/tests/ui/parser/pat-ranges-3.rs
diff --git a/src/test/ui/parser/pat-ranges-3.stderr b/tests/ui/parser/pat-ranges-3.stderr
index c9787b789..c9787b789 100644
--- a/src/test/ui/parser/pat-ranges-3.stderr
+++ b/tests/ui/parser/pat-ranges-3.stderr
diff --git a/src/test/ui/parser/pat-ranges-4.rs b/tests/ui/parser/pat-ranges-4.rs
index 61188976b..61188976b 100644
--- a/src/test/ui/parser/pat-ranges-4.rs
+++ b/tests/ui/parser/pat-ranges-4.rs
diff --git a/src/test/ui/parser/pat-ranges-4.stderr b/tests/ui/parser/pat-ranges-4.stderr
index 69084b5a4..69084b5a4 100644
--- a/src/test/ui/parser/pat-ranges-4.stderr
+++ b/tests/ui/parser/pat-ranges-4.stderr
diff --git a/src/test/ui/parser/pat-ref-enum.rs b/tests/ui/parser/pat-ref-enum.rs
index 412dd141d..412dd141d 100644
--- a/src/test/ui/parser/pat-ref-enum.rs
+++ b/tests/ui/parser/pat-ref-enum.rs
diff --git a/src/test/ui/parser/pat-ref-enum.stderr b/tests/ui/parser/pat-ref-enum.stderr
index a3bce3372..a3bce3372 100644
--- a/src/test/ui/parser/pat-ref-enum.stderr
+++ b/tests/ui/parser/pat-ref-enum.stderr
diff --git a/src/test/ui/parser/pat-tuple-1.rs b/tests/ui/parser/pat-tuple-1.rs
index 0e49b547f..0e49b547f 100644
--- a/src/test/ui/parser/pat-tuple-1.rs
+++ b/tests/ui/parser/pat-tuple-1.rs
diff --git a/src/test/ui/parser/pat-tuple-1.stderr b/tests/ui/parser/pat-tuple-1.stderr
index 391f2c428..391f2c428 100644
--- a/src/test/ui/parser/pat-tuple-1.stderr
+++ b/tests/ui/parser/pat-tuple-1.stderr
diff --git a/src/test/ui/parser/pat-tuple-2.rs b/tests/ui/parser/pat-tuple-2.rs
index a8f3debd3..a8f3debd3 100644
--- a/src/test/ui/parser/pat-tuple-2.rs
+++ b/tests/ui/parser/pat-tuple-2.rs
diff --git a/src/test/ui/parser/pat-tuple-3.rs b/tests/ui/parser/pat-tuple-3.rs
index 1486ab231..1486ab231 100644
--- a/src/test/ui/parser/pat-tuple-3.rs
+++ b/tests/ui/parser/pat-tuple-3.rs
diff --git a/src/test/ui/parser/pat-tuple-3.stderr b/tests/ui/parser/pat-tuple-3.stderr
index 9ac0611c5..9ac0611c5 100644
--- a/src/test/ui/parser/pat-tuple-3.stderr
+++ b/tests/ui/parser/pat-tuple-3.stderr
diff --git a/src/test/ui/parser/pub-method-macro.rs b/tests/ui/parser/pub-method-macro.rs
index 0183bdcf6..0183bdcf6 100644
--- a/src/test/ui/parser/pub-method-macro.rs
+++ b/tests/ui/parser/pub-method-macro.rs
diff --git a/src/test/ui/parser/pub-method-macro.stderr b/tests/ui/parser/pub-method-macro.stderr
index 7c7a90926..7c7a90926 100644
--- a/src/test/ui/parser/pub-method-macro.stderr
+++ b/tests/ui/parser/pub-method-macro.stderr
diff --git a/src/test/ui/parser/public-instead-of-pub-1.fixed b/tests/ui/parser/public-instead-of-pub-1.fixed
index a4fa68ba5..a4fa68ba5 100644
--- a/src/test/ui/parser/public-instead-of-pub-1.fixed
+++ b/tests/ui/parser/public-instead-of-pub-1.fixed
diff --git a/src/test/ui/parser/public-instead-of-pub-1.rs b/tests/ui/parser/public-instead-of-pub-1.rs
index 43565c9b1..43565c9b1 100644
--- a/src/test/ui/parser/public-instead-of-pub-1.rs
+++ b/tests/ui/parser/public-instead-of-pub-1.rs
diff --git a/src/test/ui/parser/public-instead-of-pub-1.stderr b/tests/ui/parser/public-instead-of-pub-1.stderr
index 795a5bcf5..795a5bcf5 100644
--- a/src/test/ui/parser/public-instead-of-pub-1.stderr
+++ b/tests/ui/parser/public-instead-of-pub-1.stderr
diff --git a/src/test/ui/parser/public-instead-of-pub-2.rs b/tests/ui/parser/public-instead-of-pub-2.rs
index 8a43c361e..8a43c361e 100644
--- a/src/test/ui/parser/public-instead-of-pub-2.rs
+++ b/tests/ui/parser/public-instead-of-pub-2.rs
diff --git a/src/test/ui/parser/public-instead-of-pub-2.stderr b/tests/ui/parser/public-instead-of-pub-2.stderr
index efe225656..efe225656 100644
--- a/src/test/ui/parser/public-instead-of-pub-2.stderr
+++ b/tests/ui/parser/public-instead-of-pub-2.stderr
diff --git a/src/test/ui/parser/public-instead-of-pub-3.fixed b/tests/ui/parser/public-instead-of-pub-3.fixed
index 14f620f41..14f620f41 100644
--- a/src/test/ui/parser/public-instead-of-pub-3.fixed
+++ b/tests/ui/parser/public-instead-of-pub-3.fixed
diff --git a/src/test/ui/parser/public-instead-of-pub-3.rs b/tests/ui/parser/public-instead-of-pub-3.rs
index ee27cb1a1..ee27cb1a1 100644
--- a/src/test/ui/parser/public-instead-of-pub-3.rs
+++ b/tests/ui/parser/public-instead-of-pub-3.rs
diff --git a/src/test/ui/parser/public-instead-of-pub-3.stderr b/tests/ui/parser/public-instead-of-pub-3.stderr
index 72efae08d..72efae08d 100644
--- a/src/test/ui/parser/public-instead-of-pub-3.stderr
+++ b/tests/ui/parser/public-instead-of-pub-3.stderr
diff --git a/src/test/ui/parser/public-instead-of-pub.fixed b/tests/ui/parser/public-instead-of-pub.fixed
index 01db60999..01db60999 100644
--- a/src/test/ui/parser/public-instead-of-pub.fixed
+++ b/tests/ui/parser/public-instead-of-pub.fixed
diff --git a/src/test/ui/parser/public-instead-of-pub.rs b/tests/ui/parser/public-instead-of-pub.rs
index 18e0fd3af..18e0fd3af 100644
--- a/src/test/ui/parser/public-instead-of-pub.rs
+++ b/tests/ui/parser/public-instead-of-pub.rs
diff --git a/src/test/ui/parser/public-instead-of-pub.stderr b/tests/ui/parser/public-instead-of-pub.stderr
index af875491e..af875491e 100644
--- a/src/test/ui/parser/public-instead-of-pub.stderr
+++ b/tests/ui/parser/public-instead-of-pub.stderr
diff --git a/src/test/ui/parser/qualified-path-in-turbofish.fixed b/tests/ui/parser/qualified-path-in-turbofish.fixed
index 404d2f776..404d2f776 100644
--- a/src/test/ui/parser/qualified-path-in-turbofish.fixed
+++ b/tests/ui/parser/qualified-path-in-turbofish.fixed
diff --git a/src/test/ui/parser/qualified-path-in-turbofish.rs b/tests/ui/parser/qualified-path-in-turbofish.rs
index 2f4b2ed34..2f4b2ed34 100644
--- a/src/test/ui/parser/qualified-path-in-turbofish.rs
+++ b/tests/ui/parser/qualified-path-in-turbofish.rs
diff --git a/src/test/ui/parser/qualified-path-in-turbofish.stderr b/tests/ui/parser/qualified-path-in-turbofish.stderr
index 8857d2ef3..8857d2ef3 100644
--- a/src/test/ui/parser/qualified-path-in-turbofish.stderr
+++ b/tests/ui/parser/qualified-path-in-turbofish.stderr
diff --git a/src/test/ui/parser/range-3.rs b/tests/ui/parser/range-3.rs
index 2c917a24e..2c917a24e 100644
--- a/src/test/ui/parser/range-3.rs
+++ b/tests/ui/parser/range-3.rs
diff --git a/src/test/ui/parser/range-3.stderr b/tests/ui/parser/range-3.stderr
index 340167f18..340167f18 100644
--- a/src/test/ui/parser/range-3.stderr
+++ b/tests/ui/parser/range-3.stderr
diff --git a/src/test/ui/parser/range-4.rs b/tests/ui/parser/range-4.rs
index c970c96de..c970c96de 100644
--- a/src/test/ui/parser/range-4.rs
+++ b/tests/ui/parser/range-4.rs
diff --git a/src/test/ui/parser/range-4.stderr b/tests/ui/parser/range-4.stderr
index 720d48938..720d48938 100644
--- a/src/test/ui/parser/range-4.stderr
+++ b/tests/ui/parser/range-4.stderr
diff --git a/src/test/ui/parser/range-inclusive-extra-equals.rs b/tests/ui/parser/range-inclusive-extra-equals.rs
index d41c0699c..d41c0699c 100644
--- a/src/test/ui/parser/range-inclusive-extra-equals.rs
+++ b/tests/ui/parser/range-inclusive-extra-equals.rs
diff --git a/src/test/ui/parser/range-inclusive-extra-equals.stderr b/tests/ui/parser/range-inclusive-extra-equals.stderr
index d37b6be4f..d37b6be4f 100644
--- a/src/test/ui/parser/range-inclusive-extra-equals.stderr
+++ b/tests/ui/parser/range-inclusive-extra-equals.stderr
diff --git a/src/test/ui/parser/range_inclusive.fixed b/tests/ui/parser/range_inclusive.fixed
index fe23880d1..fe23880d1 100644
--- a/src/test/ui/parser/range_inclusive.fixed
+++ b/tests/ui/parser/range_inclusive.fixed
diff --git a/src/test/ui/parser/range_inclusive.rs b/tests/ui/parser/range_inclusive.rs
index bc6d2413d..bc6d2413d 100644
--- a/src/test/ui/parser/range_inclusive.rs
+++ b/tests/ui/parser/range_inclusive.rs
diff --git a/src/test/ui/parser/range_inclusive.stderr b/tests/ui/parser/range_inclusive.stderr
index 8a9178263..8a9178263 100644
--- a/src/test/ui/parser/range_inclusive.stderr
+++ b/tests/ui/parser/range_inclusive.stderr
diff --git a/src/test/ui/parser/range_inclusive_dotdotdot.rs b/tests/ui/parser/range_inclusive_dotdotdot.rs
index c3e600e77..c3e600e77 100644
--- a/src/test/ui/parser/range_inclusive_dotdotdot.rs
+++ b/tests/ui/parser/range_inclusive_dotdotdot.rs
diff --git a/src/test/ui/parser/range_inclusive_dotdotdot.stderr b/tests/ui/parser/range_inclusive_dotdotdot.stderr
index 2dc2c87eb..2dc2c87eb 100644
--- a/src/test/ui/parser/range_inclusive_dotdotdot.stderr
+++ b/tests/ui/parser/range_inclusive_dotdotdot.stderr
diff --git a/src/test/ui/parser/ranges-precedence.rs b/tests/ui/parser/ranges-precedence.rs
index db241ed0c..db241ed0c 100644
--- a/src/test/ui/parser/ranges-precedence.rs
+++ b/tests/ui/parser/ranges-precedence.rs
diff --git a/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.rs b/tests/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.rs
index bdfc29a3d..bdfc29a3d 100644
--- a/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.rs
+++ b/tests/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.rs
diff --git a/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.stderr b/tests/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.stderr
index 3a7e2a4b1..3a7e2a4b1 100644
--- a/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.stderr
+++ b/tests/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.stderr
diff --git a/src/test/ui/parser/raw/raw-byte-string-eof.rs b/tests/ui/parser/raw/raw-byte-string-eof.rs
index b74907b72..b74907b72 100644
--- a/src/test/ui/parser/raw/raw-byte-string-eof.rs
+++ b/tests/ui/parser/raw/raw-byte-string-eof.rs
diff --git a/src/test/ui/parser/raw/raw-byte-string-eof.stderr b/tests/ui/parser/raw/raw-byte-string-eof.stderr
index a76668e80..a76668e80 100644
--- a/src/test/ui/parser/raw/raw-byte-string-eof.stderr
+++ b/tests/ui/parser/raw/raw-byte-string-eof.stderr
diff --git a/src/test/ui/parser/raw/raw-byte-string-literals.rs b/tests/ui/parser/raw/raw-byte-string-literals.rs
index 1b859fee5..1b859fee5 100644
--- a/src/test/ui/parser/raw/raw-byte-string-literals.rs
+++ b/tests/ui/parser/raw/raw-byte-string-literals.rs
diff --git a/src/test/ui/parser/raw/raw-byte-string-literals.stderr b/tests/ui/parser/raw/raw-byte-string-literals.stderr
index a2f27d1ed..a2f27d1ed 100644
--- a/src/test/ui/parser/raw/raw-byte-string-literals.stderr
+++ b/tests/ui/parser/raw/raw-byte-string-literals.stderr
diff --git a/src/test/ui/parser/raw/raw-literal-keywords.rs b/tests/ui/parser/raw/raw-literal-keywords.rs
index a986980fa..a986980fa 100644
--- a/src/test/ui/parser/raw/raw-literal-keywords.rs
+++ b/tests/ui/parser/raw/raw-literal-keywords.rs
diff --git a/src/test/ui/parser/raw/raw-literal-keywords.stderr b/tests/ui/parser/raw/raw-literal-keywords.stderr
index f7b6c894a..f7b6c894a 100644
--- a/src/test/ui/parser/raw/raw-literal-keywords.stderr
+++ b/tests/ui/parser/raw/raw-literal-keywords.stderr
diff --git a/src/test/ui/parser/raw/raw-literal-self.rs b/tests/ui/parser/raw/raw-literal-self.rs
index a0c9e24c2..a0c9e24c2 100644
--- a/src/test/ui/parser/raw/raw-literal-self.rs
+++ b/tests/ui/parser/raw/raw-literal-self.rs
diff --git a/src/test/ui/parser/raw/raw-literal-self.stderr b/tests/ui/parser/raw/raw-literal-self.stderr
index 2a40dfe20..2a40dfe20 100644
--- a/src/test/ui/parser/raw/raw-literal-self.stderr
+++ b/tests/ui/parser/raw/raw-literal-self.stderr
diff --git a/src/test/ui/parser/raw/raw-literal-underscore.rs b/tests/ui/parser/raw/raw-literal-underscore.rs
index a9d9e13a9..a9d9e13a9 100644
--- a/src/test/ui/parser/raw/raw-literal-underscore.rs
+++ b/tests/ui/parser/raw/raw-literal-underscore.rs
diff --git a/src/test/ui/parser/raw/raw-literal-underscore.stderr b/tests/ui/parser/raw/raw-literal-underscore.stderr
index d7a364d85..d7a364d85 100644
--- a/src/test/ui/parser/raw/raw-literal-underscore.stderr
+++ b/tests/ui/parser/raw/raw-literal-underscore.stderr
diff --git a/src/test/ui/parser/raw/raw-str-delim.rs b/tests/ui/parser/raw/raw-str-delim.rs
index 2f13893ce..2f13893ce 100644
--- a/src/test/ui/parser/raw/raw-str-delim.rs
+++ b/tests/ui/parser/raw/raw-str-delim.rs
diff --git a/src/test/ui/parser/raw/raw-str-delim.stderr b/tests/ui/parser/raw/raw-str-delim.stderr
index 8a04f99a1..8a04f99a1 100644
--- a/src/test/ui/parser/raw/raw-str-delim.stderr
+++ b/tests/ui/parser/raw/raw-str-delim.stderr
diff --git a/src/test/ui/parser/raw/raw-str-in-macro-call.rs b/tests/ui/parser/raw/raw-str-in-macro-call.rs
index 462c2279f..462c2279f 100644
--- a/src/test/ui/parser/raw/raw-str-in-macro-call.rs
+++ b/tests/ui/parser/raw/raw-str-in-macro-call.rs
diff --git a/src/test/ui/parser/raw/raw-str-unbalanced.rs b/tests/ui/parser/raw/raw-str-unbalanced.rs
index 38537f8b3..38537f8b3 100644
--- a/src/test/ui/parser/raw/raw-str-unbalanced.rs
+++ b/tests/ui/parser/raw/raw-str-unbalanced.rs
diff --git a/src/test/ui/parser/raw/raw-str-unbalanced.stderr b/tests/ui/parser/raw/raw-str-unbalanced.stderr
index eac8c06c1..eac8c06c1 100644
--- a/src/test/ui/parser/raw/raw-str-unbalanced.stderr
+++ b/tests/ui/parser/raw/raw-str-unbalanced.stderr
diff --git a/src/test/ui/parser/raw/raw-str-unterminated.rs b/tests/ui/parser/raw/raw-str-unterminated.rs
index fd3172955..fd3172955 100644
--- a/src/test/ui/parser/raw/raw-str-unterminated.rs
+++ b/tests/ui/parser/raw/raw-str-unterminated.rs
diff --git a/src/test/ui/parser/raw/raw-str-unterminated.stderr b/tests/ui/parser/raw/raw-str-unterminated.stderr
index 077f763f1..077f763f1 100644
--- a/src/test/ui/parser/raw/raw-str-unterminated.stderr
+++ b/tests/ui/parser/raw/raw-str-unterminated.stderr
diff --git a/src/test/ui/parser/raw/raw-string-2.rs b/tests/ui/parser/raw/raw-string-2.rs
index 067332d28..067332d28 100644
--- a/src/test/ui/parser/raw/raw-string-2.rs
+++ b/tests/ui/parser/raw/raw-string-2.rs
diff --git a/src/test/ui/parser/raw/raw-string-2.stderr b/tests/ui/parser/raw/raw-string-2.stderr
index 8bbac9d7b..8bbac9d7b 100644
--- a/src/test/ui/parser/raw/raw-string-2.stderr
+++ b/tests/ui/parser/raw/raw-string-2.stderr
diff --git a/src/test/ui/parser/raw/raw-string.rs b/tests/ui/parser/raw/raw-string.rs
index 84f07c4a9..84f07c4a9 100644
--- a/src/test/ui/parser/raw/raw-string.rs
+++ b/tests/ui/parser/raw/raw-string.rs
diff --git a/src/test/ui/parser/raw/raw-string.stderr b/tests/ui/parser/raw/raw-string.stderr
index b2b853a89..b2b853a89 100644
--- a/src/test/ui/parser/raw/raw-string.stderr
+++ b/tests/ui/parser/raw/raw-string.stderr
diff --git a/src/test/ui/parser/recover-assoc-const-constraint.rs b/tests/ui/parser/recover-assoc-const-constraint.rs
index 1453e6cb5..1453e6cb5 100644
--- a/src/test/ui/parser/recover-assoc-const-constraint.rs
+++ b/tests/ui/parser/recover-assoc-const-constraint.rs
diff --git a/src/test/ui/parser/recover-assoc-const-constraint.stderr b/tests/ui/parser/recover-assoc-const-constraint.stderr
index 2d36ce4e9..2d36ce4e9 100644
--- a/src/test/ui/parser/recover-assoc-const-constraint.stderr
+++ b/tests/ui/parser/recover-assoc-const-constraint.stderr
diff --git a/src/test/ui/parser/recover-assoc-eq-missing-term.rs b/tests/ui/parser/recover-assoc-eq-missing-term.rs
index 4b42c44dc..4b42c44dc 100644
--- a/src/test/ui/parser/recover-assoc-eq-missing-term.rs
+++ b/tests/ui/parser/recover-assoc-eq-missing-term.rs
diff --git a/src/test/ui/parser/recover-assoc-eq-missing-term.stderr b/tests/ui/parser/recover-assoc-eq-missing-term.stderr
index 152f7f2fb..152f7f2fb 100644
--- a/src/test/ui/parser/recover-assoc-eq-missing-term.stderr
+++ b/tests/ui/parser/recover-assoc-eq-missing-term.stderr
diff --git a/src/test/ui/parser/recover-assoc-lifetime-constraint.rs b/tests/ui/parser/recover-assoc-lifetime-constraint.rs
index 558fcdfe1..558fcdfe1 100644
--- a/src/test/ui/parser/recover-assoc-lifetime-constraint.rs
+++ b/tests/ui/parser/recover-assoc-lifetime-constraint.rs
diff --git a/src/test/ui/parser/recover-assoc-lifetime-constraint.stderr b/tests/ui/parser/recover-assoc-lifetime-constraint.stderr
index 79437533d..79437533d 100644
--- a/src/test/ui/parser/recover-assoc-lifetime-constraint.stderr
+++ b/tests/ui/parser/recover-assoc-lifetime-constraint.stderr
diff --git a/src/test/ui/parser/recover-const-async-fn-ptr.rs b/tests/ui/parser/recover-const-async-fn-ptr.rs
index 25af8772c..25af8772c 100644
--- a/src/test/ui/parser/recover-const-async-fn-ptr.rs
+++ b/tests/ui/parser/recover-const-async-fn-ptr.rs
diff --git a/src/test/ui/parser/recover-const-async-fn-ptr.stderr b/tests/ui/parser/recover-const-async-fn-ptr.stderr
index 7012096b6..7012096b6 100644
--- a/src/test/ui/parser/recover-const-async-fn-ptr.stderr
+++ b/tests/ui/parser/recover-const-async-fn-ptr.stderr
diff --git a/src/test/ui/parser/recover-enum.rs b/tests/ui/parser/recover-enum.rs
index 08dd939e2..08dd939e2 100644
--- a/src/test/ui/parser/recover-enum.rs
+++ b/tests/ui/parser/recover-enum.rs
diff --git a/src/test/ui/parser/recover-enum.stderr b/tests/ui/parser/recover-enum.stderr
index a2b650e4f..a2b650e4f 100644
--- a/src/test/ui/parser/recover-enum.stderr
+++ b/tests/ui/parser/recover-enum.stderr
diff --git a/src/test/ui/parser/recover-enum2.rs b/tests/ui/parser/recover-enum2.rs
index 0c9420889..0c9420889 100644
--- a/src/test/ui/parser/recover-enum2.rs
+++ b/tests/ui/parser/recover-enum2.rs
diff --git a/src/test/ui/parser/recover-enum2.stderr b/tests/ui/parser/recover-enum2.stderr
index 7634bca92..7634bca92 100644
--- a/src/test/ui/parser/recover-enum2.stderr
+++ b/tests/ui/parser/recover-enum2.stderr
diff --git a/src/test/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.rs b/tests/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.rs
index e815c7611..e815c7611 100644
--- a/src/test/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.rs
+++ b/tests/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.rs
diff --git a/src/test/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.stderr b/tests/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.stderr
index 17237c930..17237c930 100644
--- a/src/test/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.stderr
+++ b/tests/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.stderr
diff --git a/src/test/ui/parser/recover-field-extra-angle-brackets.rs b/tests/ui/parser/recover-field-extra-angle-brackets.rs
index 5e0e00bcb..5e0e00bcb 100644
--- a/src/test/ui/parser/recover-field-extra-angle-brackets.rs
+++ b/tests/ui/parser/recover-field-extra-angle-brackets.rs
diff --git a/src/test/ui/parser/recover-field-extra-angle-brackets.stderr b/tests/ui/parser/recover-field-extra-angle-brackets.stderr
index 318e55f6e..318e55f6e 100644
--- a/src/test/ui/parser/recover-field-extra-angle-brackets.stderr
+++ b/tests/ui/parser/recover-field-extra-angle-brackets.stderr
diff --git a/src/test/ui/parser/recover-field-semi.rs b/tests/ui/parser/recover-field-semi.rs
index b70357886..b70357886 100644
--- a/src/test/ui/parser/recover-field-semi.rs
+++ b/tests/ui/parser/recover-field-semi.rs
diff --git a/src/test/ui/parser/recover-field-semi.stderr b/tests/ui/parser/recover-field-semi.stderr
index 3cf484748..3cf484748 100644
--- a/src/test/ui/parser/recover-field-semi.stderr
+++ b/tests/ui/parser/recover-field-semi.stderr
diff --git a/src/test/ui/parser/recover-fn-ptr-with-generics.rs b/tests/ui/parser/recover-fn-ptr-with-generics.rs
index 31de418be..31de418be 100644
--- a/src/test/ui/parser/recover-fn-ptr-with-generics.rs
+++ b/tests/ui/parser/recover-fn-ptr-with-generics.rs
diff --git a/src/test/ui/parser/recover-fn-ptr-with-generics.stderr b/tests/ui/parser/recover-fn-ptr-with-generics.stderr
index 1da9c1857..1da9c1857 100644
--- a/src/test/ui/parser/recover-fn-ptr-with-generics.stderr
+++ b/tests/ui/parser/recover-fn-ptr-with-generics.stderr
diff --git a/tests/ui/parser/recover-fn-trait-from-fn-kw.rs b/tests/ui/parser/recover-fn-trait-from-fn-kw.rs
new file mode 100644
index 000000000..b6611e627
--- /dev/null
+++ b/tests/ui/parser/recover-fn-trait-from-fn-kw.rs
@@ -0,0 +1,12 @@
+fn foo(_: impl fn() -> i32) {}
+//~^ ERROR expected identifier, found keyword `fn`
+
+fn foo2<T: fn(i32)>(_: T) {}
+//~^ ERROR expected identifier, found keyword `fn`
+
+fn main() {
+    foo(|| ());
+    //~^ mismatched types
+    foo2(|_: ()| {});
+    //~^ type mismatch in closure arguments
+}
diff --git a/tests/ui/parser/recover-fn-trait-from-fn-kw.stderr b/tests/ui/parser/recover-fn-trait-from-fn-kw.stderr
new file mode 100644
index 000000000..3681a796c
--- /dev/null
+++ b/tests/ui/parser/recover-fn-trait-from-fn-kw.stderr
@@ -0,0 +1,48 @@
+error: expected identifier, found keyword `fn`
+  --> $DIR/recover-fn-trait-from-fn-kw.rs:1:16
+   |
+LL | fn foo(_: impl fn() -> i32) {}
+   |                ^^
+   |
+help: use `Fn` to refer to the trait
+   |
+LL | fn foo(_: impl Fn() -> i32) {}
+   |                ~~
+
+error: expected identifier, found keyword `fn`
+  --> $DIR/recover-fn-trait-from-fn-kw.rs:4:12
+   |
+LL | fn foo2<T: fn(i32)>(_: T) {}
+   |            ^^
+   |
+help: use `Fn` to refer to the trait
+   |
+LL | fn foo2<T: Fn(i32)>(_: T) {}
+   |            ~~
+
+error[E0308]: mismatched types
+  --> $DIR/recover-fn-trait-from-fn-kw.rs:8:12
+   |
+LL |     foo(|| ());
+   |            ^^ expected `i32`, found `()`
+
+error[E0631]: type mismatch in closure arguments
+  --> $DIR/recover-fn-trait-from-fn-kw.rs:10:5
+   |
+LL |     foo2(|_: ()| {});
+   |     ^^^^ ------- found signature defined here
+   |     |
+   |     expected due to this
+   |
+   = note: expected closure signature `fn(i32) -> _`
+              found closure signature `fn(()) -> _`
+note: required by a bound in `foo2`
+  --> $DIR/recover-fn-trait-from-fn-kw.rs:4:12
+   |
+LL | fn foo2<T: fn(i32)>(_: T) {}
+   |            ^^^^^^^ required by this bound in `foo2`
+
+error: aborting due to 4 previous errors
+
+Some errors have detailed explanations: E0308, E0631.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/parser/recover-for-loop-parens-around-head.rs b/tests/ui/parser/recover-for-loop-parens-around-head.rs
index 053b428bd..053b428bd 100644
--- a/src/test/ui/parser/recover-for-loop-parens-around-head.rs
+++ b/tests/ui/parser/recover-for-loop-parens-around-head.rs
diff --git a/src/test/ui/parser/recover-for-loop-parens-around-head.stderr b/tests/ui/parser/recover-for-loop-parens-around-head.stderr
index 3bad29f20..3bad29f20 100644
--- a/src/test/ui/parser/recover-for-loop-parens-around-head.stderr
+++ b/tests/ui/parser/recover-for-loop-parens-around-head.stderr
diff --git a/src/test/ui/parser/recover-from-bad-variant.rs b/tests/ui/parser/recover-from-bad-variant.rs
index e8887147c..e8887147c 100644
--- a/src/test/ui/parser/recover-from-bad-variant.rs
+++ b/tests/ui/parser/recover-from-bad-variant.rs
diff --git a/src/test/ui/parser/recover-from-bad-variant.stderr b/tests/ui/parser/recover-from-bad-variant.stderr
index 04968bbdf..04968bbdf 100644
--- a/src/test/ui/parser/recover-from-bad-variant.stderr
+++ b/tests/ui/parser/recover-from-bad-variant.stderr
diff --git a/src/test/ui/parser/recover-from-homoglyph.rs b/tests/ui/parser/recover-from-homoglyph.rs
index 99ce0d1a6..99ce0d1a6 100644
--- a/src/test/ui/parser/recover-from-homoglyph.rs
+++ b/tests/ui/parser/recover-from-homoglyph.rs
diff --git a/src/test/ui/parser/recover-from-homoglyph.stderr b/tests/ui/parser/recover-from-homoglyph.stderr
index f11ca9fd5..f11ca9fd5 100644
--- a/src/test/ui/parser/recover-from-homoglyph.stderr
+++ b/tests/ui/parser/recover-from-homoglyph.stderr
diff --git a/src/test/ui/parser/recover-labeled-non-block-expr.fixed b/tests/ui/parser/recover-labeled-non-block-expr.fixed
index c2e76444d..c2e76444d 100644
--- a/src/test/ui/parser/recover-labeled-non-block-expr.fixed
+++ b/tests/ui/parser/recover-labeled-non-block-expr.fixed
diff --git a/src/test/ui/parser/recover-labeled-non-block-expr.rs b/tests/ui/parser/recover-labeled-non-block-expr.rs
index fc11c646a..fc11c646a 100644
--- a/src/test/ui/parser/recover-labeled-non-block-expr.rs
+++ b/tests/ui/parser/recover-labeled-non-block-expr.rs
diff --git a/src/test/ui/parser/recover-labeled-non-block-expr.stderr b/tests/ui/parser/recover-labeled-non-block-expr.stderr
index d66ce6950..d66ce6950 100644
--- a/src/test/ui/parser/recover-labeled-non-block-expr.stderr
+++ b/tests/ui/parser/recover-labeled-non-block-expr.stderr
diff --git a/src/test/ui/parser/recover-missing-semi-before-item.fixed b/tests/ui/parser/recover-missing-semi-before-item.fixed
index 0be17e69e..0be17e69e 100644
--- a/src/test/ui/parser/recover-missing-semi-before-item.fixed
+++ b/tests/ui/parser/recover-missing-semi-before-item.fixed
diff --git a/src/test/ui/parser/recover-missing-semi-before-item.rs b/tests/ui/parser/recover-missing-semi-before-item.rs
index 867b7b749..867b7b749 100644
--- a/src/test/ui/parser/recover-missing-semi-before-item.rs
+++ b/tests/ui/parser/recover-missing-semi-before-item.rs
diff --git a/src/test/ui/parser/recover-missing-semi-before-item.stderr b/tests/ui/parser/recover-missing-semi-before-item.stderr
index 61c43f2f1..61c43f2f1 100644
--- a/src/test/ui/parser/recover-missing-semi-before-item.stderr
+++ b/tests/ui/parser/recover-missing-semi-before-item.stderr
diff --git a/src/test/ui/parser/recover-missing-semi.rs b/tests/ui/parser/recover-missing-semi.rs
index f47d5e680..f47d5e680 100644
--- a/src/test/ui/parser/recover-missing-semi.rs
+++ b/tests/ui/parser/recover-missing-semi.rs
diff --git a/src/test/ui/parser/recover-missing-semi.stderr b/tests/ui/parser/recover-missing-semi.stderr
index ba4798285..ba4798285 100644
--- a/src/test/ui/parser/recover-missing-semi.stderr
+++ b/tests/ui/parser/recover-missing-semi.stderr
diff --git a/src/test/ui/parser/recover-quantified-closure.rs b/tests/ui/parser/recover-quantified-closure.rs
index 10af39b70..df22f5e06 100644
--- a/src/test/ui/parser/recover-quantified-closure.rs
+++ b/tests/ui/parser/recover-quantified-closure.rs
@@ -7,6 +7,6 @@ fn main() {
 enum Foo { Bar }
 fn foo(x: impl Iterator<Item = Foo>) {
     for <Foo>::Bar in x {}
-    //~^ ERROR expected one of `move`, `static`, `|`
+    //~^ ERROR expected one of `const`, `move`, `static`, `|`
     //~^^ ERROR `for<...>` binders for closures are experimental
 }
diff --git a/src/test/ui/parser/recover-quantified-closure.stderr b/tests/ui/parser/recover-quantified-closure.stderr
index 39eec80f6..9ec4d2c03 100644
--- a/src/test/ui/parser/recover-quantified-closure.stderr
+++ b/tests/ui/parser/recover-quantified-closure.stderr
@@ -1,8 +1,8 @@
-error: expected one of `move`, `static`, `|`, or `||`, found `::`
+error: expected one of `const`, `move`, `static`, `|`, or `||`, found `::`
   --> $DIR/recover-quantified-closure.rs:9:14
    |
 LL |     for <Foo>::Bar in x {}
-   |              ^^ expected one of `move`, `static`, `|`, or `||`
+   |              ^^ expected one of `const`, `move`, `static`, `|`, or `||`
 
 error[E0658]: `for<...>` binders for closures are experimental
   --> $DIR/recover-quantified-closure.rs:2:5
diff --git a/src/test/ui/parser/recover-range-pats.rs b/tests/ui/parser/recover-range-pats.rs
index 156c7ad94..156c7ad94 100644
--- a/src/test/ui/parser/recover-range-pats.rs
+++ b/tests/ui/parser/recover-range-pats.rs
diff --git a/src/test/ui/parser/recover-range-pats.stderr b/tests/ui/parser/recover-range-pats.stderr
index c54f13e01..c54f13e01 100644
--- a/src/test/ui/parser/recover-range-pats.stderr
+++ b/tests/ui/parser/recover-range-pats.stderr
diff --git a/src/test/ui/parser/recover-ref-dyn-mut.rs b/tests/ui/parser/recover-ref-dyn-mut.rs
index 3016275cc..3016275cc 100644
--- a/src/test/ui/parser/recover-ref-dyn-mut.rs
+++ b/tests/ui/parser/recover-ref-dyn-mut.rs
diff --git a/src/test/ui/parser/recover-ref-dyn-mut.stderr b/tests/ui/parser/recover-ref-dyn-mut.stderr
index c048c8ea1..c048c8ea1 100644
--- a/src/test/ui/parser/recover-ref-dyn-mut.stderr
+++ b/tests/ui/parser/recover-ref-dyn-mut.stderr
diff --git a/src/test/ui/parser/recover-struct.rs b/tests/ui/parser/recover-struct.rs
index bfa5b454c..bfa5b454c 100644
--- a/src/test/ui/parser/recover-struct.rs
+++ b/tests/ui/parser/recover-struct.rs
diff --git a/src/test/ui/parser/recover-struct.stderr b/tests/ui/parser/recover-struct.stderr
index 9f6fb06ca..9f6fb06ca 100644
--- a/src/test/ui/parser/recover-struct.stderr
+++ b/tests/ui/parser/recover-struct.stderr
diff --git a/src/test/ui/parser/recover-tuple-pat.rs b/tests/ui/parser/recover-tuple-pat.rs
index 7fded752d..7fded752d 100644
--- a/src/test/ui/parser/recover-tuple-pat.rs
+++ b/tests/ui/parser/recover-tuple-pat.rs
diff --git a/src/test/ui/parser/recover-tuple-pat.stderr b/tests/ui/parser/recover-tuple-pat.stderr
index 93a6a66a6..93a6a66a6 100644
--- a/src/test/ui/parser/recover-tuple-pat.stderr
+++ b/tests/ui/parser/recover-tuple-pat.stderr
diff --git a/src/test/ui/parser/recover-tuple.rs b/tests/ui/parser/recover-tuple.rs
index 59e2695de..59e2695de 100644
--- a/src/test/ui/parser/recover-tuple.rs
+++ b/tests/ui/parser/recover-tuple.rs
diff --git a/src/test/ui/parser/recover-tuple.stderr b/tests/ui/parser/recover-tuple.stderr
index 88891b54b..88891b54b 100644
--- a/src/test/ui/parser/recover-tuple.stderr
+++ b/tests/ui/parser/recover-tuple.stderr
diff --git a/tests/ui/parser/recover-unticked-labels.fixed b/tests/ui/parser/recover-unticked-labels.fixed
new file mode 100644
index 000000000..159d995b8
--- /dev/null
+++ b/tests/ui/parser/recover-unticked-labels.fixed
@@ -0,0 +1,7 @@
+// run-rustfix
+
+fn main() {
+    'label: loop { break 'label };    //~ error: cannot find value `label` in this scope
+    'label: loop { break 'label 0 };  //~ error: expected a label, found an identifier
+    'label: loop { continue 'label }; //~ error: expected a label, found an identifier
+}
diff --git a/tests/ui/parser/recover-unticked-labels.rs b/tests/ui/parser/recover-unticked-labels.rs
new file mode 100644
index 000000000..56034de68
--- /dev/null
+++ b/tests/ui/parser/recover-unticked-labels.rs
@@ -0,0 +1,7 @@
+// run-rustfix
+
+fn main() {
+    'label: loop { break label };    //~ error: cannot find value `label` in this scope
+    'label: loop { break label 0 };  //~ error: expected a label, found an identifier
+    'label: loop { continue label }; //~ error: expected a label, found an identifier
+}
diff --git a/tests/ui/parser/recover-unticked-labels.stderr b/tests/ui/parser/recover-unticked-labels.stderr
new file mode 100644
index 000000000..c115dffb1
--- /dev/null
+++ b/tests/ui/parser/recover-unticked-labels.stderr
@@ -0,0 +1,25 @@
+error: expected a label, found an identifier
+  --> $DIR/recover-unticked-labels.rs:5:26
+   |
+LL |     'label: loop { break label 0 };
+   |                          ^^^^^ help: labels start with a tick: `'label`
+
+error: expected a label, found an identifier
+  --> $DIR/recover-unticked-labels.rs:6:29
+   |
+LL |     'label: loop { continue label };
+   |                             ^^^^^ help: labels start with a tick: `'label`
+
+error[E0425]: cannot find value `label` in this scope
+  --> $DIR/recover-unticked-labels.rs:4:26
+   |
+LL |     'label: loop { break label };
+   |     ------               ^^^^^
+   |     |                    |
+   |     |                    not found in this scope
+   |     |                    help: use the similarly named label: `'label`
+   |     a label with a similar name exists
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.fixed b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.fixed
new file mode 100644
index 000000000..227c40e97
--- /dev/null
+++ b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.fixed
@@ -0,0 +1,15 @@
+// Regression test for issues #100790 and #106439.
+// run-rustfix
+
+pub struct Example(usize)
+where
+    (): Sized;
+//~^^^ ERROR where clauses are not allowed before tuple struct bodies
+
+struct _Demo(pub usize, usize)
+where
+    (): Sized,
+    String: Clone;
+//~^^^^ ERROR where clauses are not allowed before tuple struct bodies
+
+fn main() {}
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.rs b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.rs
new file mode 100644
index 000000000..3699e6fe5
--- /dev/null
+++ b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.rs
@@ -0,0 +1,17 @@
+// Regression test for issues #100790 and #106439.
+// run-rustfix
+
+pub struct Example
+where
+    (): Sized,
+(usize);
+//~^^^ ERROR where clauses are not allowed before tuple struct bodies
+
+struct _Demo
+where
+    (): Sized,
+    String: Clone,
+(pub usize, usize);
+//~^^^^ ERROR where clauses are not allowed before tuple struct bodies
+
+fn main() {}
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.stderr b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.stderr
new file mode 100644
index 000000000..18aa5fadb
--- /dev/null
+++ b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.stderr
@@ -0,0 +1,40 @@
+error: where clauses are not allowed before tuple struct bodies
+  --> $DIR/recover-where-clause-before-tuple-struct-body-0.rs:5:1
+   |
+LL |   pub struct Example
+   |              ------- while parsing this tuple struct
+LL | / where
+LL | |     (): Sized,
+   | |______________^ unexpected where clause
+LL |   (usize);
+   |   ------- the struct body
+   |
+help: move the body before the where clause
+   |
+LL ~ pub struct Example(usize)
+LL | where
+LL ~     (): Sized;
+   |
+
+error: where clauses are not allowed before tuple struct bodies
+  --> $DIR/recover-where-clause-before-tuple-struct-body-0.rs:11:1
+   |
+LL |   struct _Demo
+   |          ----- while parsing this tuple struct
+LL | / where
+LL | |     (): Sized,
+LL | |     String: Clone,
+   | |__________________^ unexpected where clause
+LL |   (pub usize, usize);
+   |   ------------------ the struct body
+   |
+help: move the body before the where clause
+   |
+LL ~ struct _Demo(pub usize, usize)
+LL | where
+LL |     (): Sized,
+LL ~     String: Clone;
+   |
+
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.rs b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.rs
new file mode 100644
index 000000000..f515ae81e
--- /dev/null
+++ b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.rs
@@ -0,0 +1,7 @@
+// Regression test for issues #100790 and #106439.
+
+// Make sure that we still show a helpful error message even if the trailing semicolon is missing.
+
+struct Foo<T> where T: MyTrait, (T)
+//~^ ERROR where clauses are not allowed before tuple struct bodies
+//~| ERROR expected `;`, found `<eof>`
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.stderr b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.stderr
new file mode 100644
index 000000000..2219c2a73
--- /dev/null
+++ b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.stderr
@@ -0,0 +1,23 @@
+error: where clauses are not allowed before tuple struct bodies
+  --> $DIR/recover-where-clause-before-tuple-struct-body-1.rs:5:15
+   |
+LL | struct Foo<T> where T: MyTrait, (T)
+   |        ---    ^^^^^^^^^^^^^^^^^ --- the struct body
+   |        |      |
+   |        |      unexpected where clause
+   |        while parsing this tuple struct
+   |
+help: move the body before the where clause
+   |
+LL - struct Foo<T> where T: MyTrait, (T)
+LL + struct Foo<T>(T) where T: MyTrait
+   |
+
+error: expected `;`, found `<eof>`
+  --> $DIR/recover-where-clause-before-tuple-struct-body-1.rs:5:35
+   |
+LL | struct Foo<T> where T: MyTrait, (T)
+   |                                   ^ expected `;`
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/parser/recovered-struct-variant.rs b/tests/ui/parser/recovered-struct-variant.rs
index 5b195dcc3..5b195dcc3 100644
--- a/src/test/ui/parser/recovered-struct-variant.rs
+++ b/tests/ui/parser/recovered-struct-variant.rs
diff --git a/src/test/ui/parser/recovered-struct-variant.stderr b/tests/ui/parser/recovered-struct-variant.stderr
index 78c67866f..78c67866f 100644
--- a/src/test/ui/parser/recovered-struct-variant.stderr
+++ b/tests/ui/parser/recovered-struct-variant.stderr
diff --git a/src/test/ui/parser/regions-out-of-scope-slice.rs b/tests/ui/parser/regions-out-of-scope-slice.rs
index d223619e1..d223619e1 100644
--- a/src/test/ui/parser/regions-out-of-scope-slice.rs
+++ b/tests/ui/parser/regions-out-of-scope-slice.rs
diff --git a/src/test/ui/parser/regions-out-of-scope-slice.stderr b/tests/ui/parser/regions-out-of-scope-slice.stderr
index bbc657ffd..bbc657ffd 100644
--- a/src/test/ui/parser/regions-out-of-scope-slice.stderr
+++ b/tests/ui/parser/regions-out-of-scope-slice.stderr
diff --git a/src/test/ui/parser/removed-syntax-closure-lifetime.rs b/tests/ui/parser/removed-syntax-closure-lifetime.rs
index e807a1794..e807a1794 100644
--- a/src/test/ui/parser/removed-syntax-closure-lifetime.rs
+++ b/tests/ui/parser/removed-syntax-closure-lifetime.rs
diff --git a/src/test/ui/parser/removed-syntax-closure-lifetime.stderr b/tests/ui/parser/removed-syntax-closure-lifetime.stderr
index e107c6b78..e107c6b78 100644
--- a/src/test/ui/parser/removed-syntax-closure-lifetime.stderr
+++ b/tests/ui/parser/removed-syntax-closure-lifetime.stderr
diff --git a/src/test/ui/parser/removed-syntax-enum-newtype.rs b/tests/ui/parser/removed-syntax-enum-newtype.rs
index 518f90b2b..518f90b2b 100644
--- a/src/test/ui/parser/removed-syntax-enum-newtype.rs
+++ b/tests/ui/parser/removed-syntax-enum-newtype.rs
diff --git a/src/test/ui/parser/removed-syntax-enum-newtype.stderr b/tests/ui/parser/removed-syntax-enum-newtype.stderr
index 8f7ca3567..8f7ca3567 100644
--- a/src/test/ui/parser/removed-syntax-enum-newtype.stderr
+++ b/tests/ui/parser/removed-syntax-enum-newtype.stderr
diff --git a/src/test/ui/parser/removed-syntax-field-let-2.rs b/tests/ui/parser/removed-syntax-field-let-2.rs
index 7ff91b476..7ff91b476 100644
--- a/src/test/ui/parser/removed-syntax-field-let-2.rs
+++ b/tests/ui/parser/removed-syntax-field-let-2.rs
diff --git a/src/test/ui/parser/removed-syntax-field-let-2.stderr b/tests/ui/parser/removed-syntax-field-let-2.stderr
index fda0919b9..fda0919b9 100644
--- a/src/test/ui/parser/removed-syntax-field-let-2.stderr
+++ b/tests/ui/parser/removed-syntax-field-let-2.stderr
diff --git a/src/test/ui/parser/removed-syntax-field-let.rs b/tests/ui/parser/removed-syntax-field-let.rs
index 6d64de296..6d64de296 100644
--- a/src/test/ui/parser/removed-syntax-field-let.rs
+++ b/tests/ui/parser/removed-syntax-field-let.rs
diff --git a/src/test/ui/parser/removed-syntax-field-let.stderr b/tests/ui/parser/removed-syntax-field-let.stderr
index 9bc18dabd..9bc18dabd 100644
--- a/src/test/ui/parser/removed-syntax-field-let.stderr
+++ b/tests/ui/parser/removed-syntax-field-let.stderr
diff --git a/src/test/ui/parser/removed-syntax-field-semicolon.rs b/tests/ui/parser/removed-syntax-field-semicolon.rs
index 808f2a5cc..808f2a5cc 100644
--- a/src/test/ui/parser/removed-syntax-field-semicolon.rs
+++ b/tests/ui/parser/removed-syntax-field-semicolon.rs
diff --git a/src/test/ui/parser/removed-syntax-field-semicolon.stderr b/tests/ui/parser/removed-syntax-field-semicolon.stderr
index 532d4fb2b..532d4fb2b 100644
--- a/src/test/ui/parser/removed-syntax-field-semicolon.stderr
+++ b/tests/ui/parser/removed-syntax-field-semicolon.stderr
diff --git a/src/test/ui/parser/removed-syntax-fixed-vec.rs b/tests/ui/parser/removed-syntax-fixed-vec.rs
index 560efecb9..560efecb9 100644
--- a/src/test/ui/parser/removed-syntax-fixed-vec.rs
+++ b/tests/ui/parser/removed-syntax-fixed-vec.rs
diff --git a/src/test/ui/parser/removed-syntax-fixed-vec.stderr b/tests/ui/parser/removed-syntax-fixed-vec.stderr
index a2b97544f..a2b97544f 100644
--- a/src/test/ui/parser/removed-syntax-fixed-vec.stderr
+++ b/tests/ui/parser/removed-syntax-fixed-vec.stderr
diff --git a/src/test/ui/parser/removed-syntax-fn-sigil.rs b/tests/ui/parser/removed-syntax-fn-sigil.rs
index 725843429..725843429 100644
--- a/src/test/ui/parser/removed-syntax-fn-sigil.rs
+++ b/tests/ui/parser/removed-syntax-fn-sigil.rs
diff --git a/src/test/ui/parser/removed-syntax-fn-sigil.stderr b/tests/ui/parser/removed-syntax-fn-sigil.stderr
index 196a5af47..196a5af47 100644
--- a/src/test/ui/parser/removed-syntax-fn-sigil.stderr
+++ b/tests/ui/parser/removed-syntax-fn-sigil.stderr
diff --git a/src/test/ui/parser/removed-syntax-mode.rs b/tests/ui/parser/removed-syntax-mode.rs
index a438db3b0..a438db3b0 100644
--- a/src/test/ui/parser/removed-syntax-mode.rs
+++ b/tests/ui/parser/removed-syntax-mode.rs
diff --git a/src/test/ui/parser/removed-syntax-mode.stderr b/tests/ui/parser/removed-syntax-mode.stderr
index d0393b379..d0393b379 100644
--- a/src/test/ui/parser/removed-syntax-mode.stderr
+++ b/tests/ui/parser/removed-syntax-mode.stderr
diff --git a/src/test/ui/parser/removed-syntax-mut-vec-expr.rs b/tests/ui/parser/removed-syntax-mut-vec-expr.rs
index 2ee95db5a..2ee95db5a 100644
--- a/src/test/ui/parser/removed-syntax-mut-vec-expr.rs
+++ b/tests/ui/parser/removed-syntax-mut-vec-expr.rs
diff --git a/src/test/ui/parser/removed-syntax-mut-vec-expr.stderr b/tests/ui/parser/removed-syntax-mut-vec-expr.stderr
index 313420fb9..313420fb9 100644
--- a/src/test/ui/parser/removed-syntax-mut-vec-expr.stderr
+++ b/tests/ui/parser/removed-syntax-mut-vec-expr.stderr
diff --git a/src/test/ui/parser/removed-syntax-mut-vec-ty.rs b/tests/ui/parser/removed-syntax-mut-vec-ty.rs
index 923a7ea37..923a7ea37 100644
--- a/src/test/ui/parser/removed-syntax-mut-vec-ty.rs
+++ b/tests/ui/parser/removed-syntax-mut-vec-ty.rs
diff --git a/src/test/ui/parser/removed-syntax-mut-vec-ty.stderr b/tests/ui/parser/removed-syntax-mut-vec-ty.stderr
index 02b518e25..02b518e25 100644
--- a/src/test/ui/parser/removed-syntax-mut-vec-ty.stderr
+++ b/tests/ui/parser/removed-syntax-mut-vec-ty.stderr
diff --git a/src/test/ui/parser/removed-syntax-ptr-lifetime.rs b/tests/ui/parser/removed-syntax-ptr-lifetime.rs
index cc69af44a..cc69af44a 100644
--- a/src/test/ui/parser/removed-syntax-ptr-lifetime.rs
+++ b/tests/ui/parser/removed-syntax-ptr-lifetime.rs
diff --git a/src/test/ui/parser/removed-syntax-ptr-lifetime.stderr b/tests/ui/parser/removed-syntax-ptr-lifetime.stderr
index 914de43e6..914de43e6 100644
--- a/src/test/ui/parser/removed-syntax-ptr-lifetime.stderr
+++ b/tests/ui/parser/removed-syntax-ptr-lifetime.stderr
diff --git a/src/test/ui/parser/removed-syntax-record.rs b/tests/ui/parser/removed-syntax-record.rs
index d1d91c8f7..d1d91c8f7 100644
--- a/src/test/ui/parser/removed-syntax-record.rs
+++ b/tests/ui/parser/removed-syntax-record.rs
diff --git a/src/test/ui/parser/removed-syntax-record.stderr b/tests/ui/parser/removed-syntax-record.stderr
index 0a1655840..0a1655840 100644
--- a/src/test/ui/parser/removed-syntax-record.stderr
+++ b/tests/ui/parser/removed-syntax-record.stderr
diff --git a/src/test/ui/parser/removed-syntax-static-fn.rs b/tests/ui/parser/removed-syntax-static-fn.rs
index cd643b874..cd643b874 100644
--- a/src/test/ui/parser/removed-syntax-static-fn.rs
+++ b/tests/ui/parser/removed-syntax-static-fn.rs
diff --git a/src/test/ui/parser/removed-syntax-static-fn.stderr b/tests/ui/parser/removed-syntax-static-fn.stderr
index 52e065894..52e065894 100644
--- a/src/test/ui/parser/removed-syntax-static-fn.stderr
+++ b/tests/ui/parser/removed-syntax-static-fn.stderr
diff --git a/src/test/ui/parser/removed-syntax-uniq-mut-expr.rs b/tests/ui/parser/removed-syntax-uniq-mut-expr.rs
index 08ef4b432..08ef4b432 100644
--- a/src/test/ui/parser/removed-syntax-uniq-mut-expr.rs
+++ b/tests/ui/parser/removed-syntax-uniq-mut-expr.rs
diff --git a/src/test/ui/parser/removed-syntax-uniq-mut-expr.stderr b/tests/ui/parser/removed-syntax-uniq-mut-expr.stderr
index 63d2fdb8c..63d2fdb8c 100644
--- a/src/test/ui/parser/removed-syntax-uniq-mut-expr.stderr
+++ b/tests/ui/parser/removed-syntax-uniq-mut-expr.stderr
diff --git a/src/test/ui/parser/removed-syntax-uniq-mut-ty.rs b/tests/ui/parser/removed-syntax-uniq-mut-ty.rs
index a8dee5bbd..a8dee5bbd 100644
--- a/src/test/ui/parser/removed-syntax-uniq-mut-ty.rs
+++ b/tests/ui/parser/removed-syntax-uniq-mut-ty.rs
diff --git a/src/test/ui/parser/removed-syntax-uniq-mut-ty.stderr b/tests/ui/parser/removed-syntax-uniq-mut-ty.stderr
index 39db0be9f..39db0be9f 100644
--- a/src/test/ui/parser/removed-syntax-uniq-mut-ty.stderr
+++ b/tests/ui/parser/removed-syntax-uniq-mut-ty.stderr
diff --git a/src/test/ui/parser/removed-syntax-with-1.rs b/tests/ui/parser/removed-syntax-with-1.rs
index 2c1e152dc..2c1e152dc 100644
--- a/src/test/ui/parser/removed-syntax-with-1.rs
+++ b/tests/ui/parser/removed-syntax-with-1.rs
diff --git a/src/test/ui/parser/removed-syntax-with-1.stderr b/tests/ui/parser/removed-syntax-with-1.stderr
index c3f747b61..c3f747b61 100644
--- a/src/test/ui/parser/removed-syntax-with-1.stderr
+++ b/tests/ui/parser/removed-syntax-with-1.stderr
diff --git a/src/test/ui/parser/removed-syntax-with-2.rs b/tests/ui/parser/removed-syntax-with-2.rs
index 451057c66..451057c66 100644
--- a/src/test/ui/parser/removed-syntax-with-2.rs
+++ b/tests/ui/parser/removed-syntax-with-2.rs
diff --git a/src/test/ui/parser/removed-syntax-with-2.stderr b/tests/ui/parser/removed-syntax-with-2.stderr
index c6ae1ce67..c6ae1ce67 100644
--- a/src/test/ui/parser/removed-syntax-with-2.stderr
+++ b/tests/ui/parser/removed-syntax-with-2.stderr
diff --git a/src/test/ui/parser/require-parens-for-chained-comparison.rs b/tests/ui/parser/require-parens-for-chained-comparison.rs
index 5b90e905a..5b90e905a 100644
--- a/src/test/ui/parser/require-parens-for-chained-comparison.rs
+++ b/tests/ui/parser/require-parens-for-chained-comparison.rs
diff --git a/src/test/ui/parser/require-parens-for-chained-comparison.stderr b/tests/ui/parser/require-parens-for-chained-comparison.stderr
index 52e201c43..52e201c43 100644
--- a/src/test/ui/parser/require-parens-for-chained-comparison.stderr
+++ b/tests/ui/parser/require-parens-for-chained-comparison.stderr
diff --git a/src/test/ui/parser/self-in-function-arg.rs b/tests/ui/parser/self-in-function-arg.rs
index 6172ffe1b..6172ffe1b 100644
--- a/src/test/ui/parser/self-in-function-arg.rs
+++ b/tests/ui/parser/self-in-function-arg.rs
diff --git a/src/test/ui/parser/self-in-function-arg.stderr b/tests/ui/parser/self-in-function-arg.stderr
index 47d8381b0..47d8381b0 100644
--- a/src/test/ui/parser/self-in-function-arg.stderr
+++ b/tests/ui/parser/self-in-function-arg.stderr
diff --git a/src/test/ui/parser/self-param-semantic-fail.rs b/tests/ui/parser/self-param-semantic-fail.rs
index 621aab279..621aab279 100644
--- a/src/test/ui/parser/self-param-semantic-fail.rs
+++ b/tests/ui/parser/self-param-semantic-fail.rs
diff --git a/src/test/ui/parser/self-param-semantic-fail.stderr b/tests/ui/parser/self-param-semantic-fail.stderr
index e5d679773..e5d679773 100644
--- a/src/test/ui/parser/self-param-semantic-fail.stderr
+++ b/tests/ui/parser/self-param-semantic-fail.stderr
diff --git a/src/test/ui/parser/self-param-syntactic-pass.rs b/tests/ui/parser/self-param-syntactic-pass.rs
index d7bb7863c..d7bb7863c 100644
--- a/src/test/ui/parser/self-param-syntactic-pass.rs
+++ b/tests/ui/parser/self-param-syntactic-pass.rs
diff --git a/src/test/ui/parser/semi-after-closure-in-macro.rs b/tests/ui/parser/semi-after-closure-in-macro.rs
index 14efb6100..14efb6100 100644
--- a/src/test/ui/parser/semi-after-closure-in-macro.rs
+++ b/tests/ui/parser/semi-after-closure-in-macro.rs
diff --git a/src/test/ui/parser/several-carriage-returns-in-doc-comment.rs b/tests/ui/parser/several-carriage-returns-in-doc-comment.rs
index ee14c55d2..ee14c55d2 100644
--- a/src/test/ui/parser/several-carriage-returns-in-doc-comment.rs
+++ b/tests/ui/parser/several-carriage-returns-in-doc-comment.rs
diff --git a/src/test/ui/parser/several-carriage-returns-in-doc-comment.stderr b/tests/ui/parser/several-carriage-returns-in-doc-comment.stderr
index 07066fc22..07066fc22 100644
--- a/src/test/ui/parser/several-carriage-returns-in-doc-comment.stderr
+++ b/tests/ui/parser/several-carriage-returns-in-doc-comment.stderr
diff --git a/src/test/ui/parser/shebang/issue-71471-ignore-tidy.rs b/tests/ui/parser/shebang/issue-71471-ignore-tidy.rs
index a25051808..a25051808 100644
--- a/src/test/ui/parser/shebang/issue-71471-ignore-tidy.rs
+++ b/tests/ui/parser/shebang/issue-71471-ignore-tidy.rs
diff --git a/src/test/ui/parser/shebang/issue-71471-ignore-tidy.stderr b/tests/ui/parser/shebang/issue-71471-ignore-tidy.stderr
index 896a9dc83..896a9dc83 100644
--- a/src/test/ui/parser/shebang/issue-71471-ignore-tidy.stderr
+++ b/tests/ui/parser/shebang/issue-71471-ignore-tidy.stderr
diff --git a/src/test/ui/parser/shebang/multiline-attrib.rs b/tests/ui/parser/shebang/multiline-attrib.rs
index 931c94c7f..931c94c7f 100644
--- a/src/test/ui/parser/shebang/multiline-attrib.rs
+++ b/tests/ui/parser/shebang/multiline-attrib.rs
diff --git a/src/test/ui/parser/shebang/regular-attrib.rs b/tests/ui/parser/shebang/regular-attrib.rs
index ca8fb0830..ca8fb0830 100644
--- a/src/test/ui/parser/shebang/regular-attrib.rs
+++ b/tests/ui/parser/shebang/regular-attrib.rs
diff --git a/src/test/ui/parser/shebang/shebang-and-attrib.rs b/tests/ui/parser/shebang/shebang-and-attrib.rs
index 61b89c655..61b89c655 100644
--- a/src/test/ui/parser/shebang/shebang-and-attrib.rs
+++ b/tests/ui/parser/shebang/shebang-and-attrib.rs
diff --git a/src/test/ui/parser/shebang/shebang-comment.rs b/tests/ui/parser/shebang/shebang-comment.rs
index 2b1ab0c57..2b1ab0c57 100644
--- a/src/test/ui/parser/shebang/shebang-comment.rs
+++ b/tests/ui/parser/shebang/shebang-comment.rs
diff --git a/src/test/ui/parser/shebang/shebang-doc-comment.rs b/tests/ui/parser/shebang/shebang-doc-comment.rs
index 72866753e..72866753e 100644
--- a/src/test/ui/parser/shebang/shebang-doc-comment.rs
+++ b/tests/ui/parser/shebang/shebang-doc-comment.rs
diff --git a/src/test/ui/parser/shebang/shebang-doc-comment.stderr b/tests/ui/parser/shebang/shebang-doc-comment.stderr
index 2227d45ec..2227d45ec 100644
--- a/src/test/ui/parser/shebang/shebang-doc-comment.stderr
+++ b/tests/ui/parser/shebang/shebang-doc-comment.stderr
diff --git a/src/test/ui/parser/shebang/shebang-empty.rs b/tests/ui/parser/shebang/shebang-empty.rs
index e38cc637e..e38cc637e 100644
--- a/src/test/ui/parser/shebang/shebang-empty.rs
+++ b/tests/ui/parser/shebang/shebang-empty.rs
diff --git a/src/test/ui/parser/shebang/shebang-must-start-file.rs b/tests/ui/parser/shebang/shebang-must-start-file.rs
index e0392572d..e0392572d 100644
--- a/src/test/ui/parser/shebang/shebang-must-start-file.rs
+++ b/tests/ui/parser/shebang/shebang-must-start-file.rs
diff --git a/src/test/ui/parser/shebang/shebang-must-start-file.stderr b/tests/ui/parser/shebang/shebang-must-start-file.stderr
index 50543e8bd..50543e8bd 100644
--- a/src/test/ui/parser/shebang/shebang-must-start-file.stderr
+++ b/tests/ui/parser/shebang/shebang-must-start-file.stderr
diff --git a/src/test/ui/parser/shebang/shebang-space.rs b/tests/ui/parser/shebang/shebang-space.rs
index 0978b759d..0978b759d 100644
--- a/src/test/ui/parser/shebang/shebang-space.rs
+++ b/tests/ui/parser/shebang/shebang-space.rs
diff --git a/src/test/ui/parser/shebang/sneaky-attrib.rs b/tests/ui/parser/shebang/sneaky-attrib.rs
index b406cc3aa..b406cc3aa 100644
--- a/src/test/ui/parser/shebang/sneaky-attrib.rs
+++ b/tests/ui/parser/shebang/sneaky-attrib.rs
diff --git a/src/test/ui/parser/shebang/valid-shebang.rs b/tests/ui/parser/shebang/valid-shebang.rs
index e480d3da3..e480d3da3 100644
--- a/src/test/ui/parser/shebang/valid-shebang.rs
+++ b/tests/ui/parser/shebang/valid-shebang.rs
diff --git a/src/test/ui/parser/similar-tokens.rs b/tests/ui/parser/similar-tokens.rs
index e3024c61a..e3024c61a 100644
--- a/src/test/ui/parser/similar-tokens.rs
+++ b/tests/ui/parser/similar-tokens.rs
diff --git a/src/test/ui/parser/similar-tokens.stderr b/tests/ui/parser/similar-tokens.stderr
index 90acfc052..90acfc052 100644
--- a/src/test/ui/parser/similar-tokens.stderr
+++ b/tests/ui/parser/similar-tokens.stderr
diff --git a/src/test/ui/parser/slowparse-bstring.rs b/tests/ui/parser/slowparse-bstring.rs
index f3a6a6683..f3a6a6683 100644
--- a/src/test/ui/parser/slowparse-bstring.rs
+++ b/tests/ui/parser/slowparse-bstring.rs
diff --git a/src/test/ui/parser/slowparse-string.rs b/tests/ui/parser/slowparse-string.rs
index 6ebc61dae..6ebc61dae 100644
--- a/src/test/ui/parser/slowparse-string.rs
+++ b/tests/ui/parser/slowparse-string.rs
diff --git a/src/test/ui/parser/stmt_expr_attrs_placement.rs b/tests/ui/parser/stmt_expr_attrs_placement.rs
index 5e9d29a15..5e9d29a15 100644
--- a/src/test/ui/parser/stmt_expr_attrs_placement.rs
+++ b/tests/ui/parser/stmt_expr_attrs_placement.rs
diff --git a/src/test/ui/parser/stmt_expr_attrs_placement.stderr b/tests/ui/parser/stmt_expr_attrs_placement.stderr
index bf4005698..bf4005698 100644
--- a/src/test/ui/parser/stmt_expr_attrs_placement.stderr
+++ b/tests/ui/parser/stmt_expr_attrs_placement.stderr
diff --git a/src/test/ui/parser/stripped-nested-outline-mod-pass.rs b/tests/ui/parser/stripped-nested-outline-mod-pass.rs
index 1b4669a43..1b4669a43 100644
--- a/src/test/ui/parser/stripped-nested-outline-mod-pass.rs
+++ b/tests/ui/parser/stripped-nested-outline-mod-pass.rs
diff --git a/src/test/ui/parser/struct-default-values-and-missing-field-separator.fixed b/tests/ui/parser/struct-default-values-and-missing-field-separator.fixed
index 28191b826..28191b826 100644
--- a/src/test/ui/parser/struct-default-values-and-missing-field-separator.fixed
+++ b/tests/ui/parser/struct-default-values-and-missing-field-separator.fixed
diff --git a/src/test/ui/parser/struct-default-values-and-missing-field-separator.rs b/tests/ui/parser/struct-default-values-and-missing-field-separator.rs
index 924cb08a9..924cb08a9 100644
--- a/src/test/ui/parser/struct-default-values-and-missing-field-separator.rs
+++ b/tests/ui/parser/struct-default-values-and-missing-field-separator.rs
diff --git a/src/test/ui/parser/struct-default-values-and-missing-field-separator.stderr b/tests/ui/parser/struct-default-values-and-missing-field-separator.stderr
index 7f16ebcfc..7f16ebcfc 100644
--- a/src/test/ui/parser/struct-default-values-and-missing-field-separator.stderr
+++ b/tests/ui/parser/struct-default-values-and-missing-field-separator.stderr
diff --git a/src/test/ui/parser/struct-field-numeric-shorthand.rs b/tests/ui/parser/struct-field-numeric-shorthand.rs
index 645abd9c7..645abd9c7 100644
--- a/src/test/ui/parser/struct-field-numeric-shorthand.rs
+++ b/tests/ui/parser/struct-field-numeric-shorthand.rs
diff --git a/src/test/ui/parser/struct-field-numeric-shorthand.stderr b/tests/ui/parser/struct-field-numeric-shorthand.stderr
index bfb8a931b..bfb8a931b 100644
--- a/src/test/ui/parser/struct-field-numeric-shorthand.stderr
+++ b/tests/ui/parser/struct-field-numeric-shorthand.stderr
diff --git a/src/test/ui/parser/struct-filed-with-attr.fixed b/tests/ui/parser/struct-filed-with-attr.fixed
index a799ec8ca..a799ec8ca 100644
--- a/src/test/ui/parser/struct-filed-with-attr.fixed
+++ b/tests/ui/parser/struct-filed-with-attr.fixed
diff --git a/src/test/ui/parser/struct-filed-with-attr.rs b/tests/ui/parser/struct-filed-with-attr.rs
index bfc78e15b..bfc78e15b 100644
--- a/src/test/ui/parser/struct-filed-with-attr.rs
+++ b/tests/ui/parser/struct-filed-with-attr.rs
diff --git a/src/test/ui/parser/struct-filed-with-attr.stderr b/tests/ui/parser/struct-filed-with-attr.stderr
index c2cd7e82e..c2cd7e82e 100644
--- a/src/test/ui/parser/struct-filed-with-attr.stderr
+++ b/tests/ui/parser/struct-filed-with-attr.stderr
diff --git a/src/test/ui/parser/struct-literal-in-for.rs b/tests/ui/parser/struct-literal-in-for.rs
index 3227ae37b..3227ae37b 100644
--- a/src/test/ui/parser/struct-literal-in-for.rs
+++ b/tests/ui/parser/struct-literal-in-for.rs
diff --git a/src/test/ui/parser/struct-literal-in-for.stderr b/tests/ui/parser/struct-literal-in-for.stderr
index 1c91eba68..1c91eba68 100644
--- a/src/test/ui/parser/struct-literal-in-for.stderr
+++ b/tests/ui/parser/struct-literal-in-for.stderr
diff --git a/src/test/ui/parser/struct-literal-in-if.rs b/tests/ui/parser/struct-literal-in-if.rs
index 2ce2c8f18..2ce2c8f18 100644
--- a/src/test/ui/parser/struct-literal-in-if.rs
+++ b/tests/ui/parser/struct-literal-in-if.rs
diff --git a/src/test/ui/parser/struct-literal-in-if.stderr b/tests/ui/parser/struct-literal-in-if.stderr
index b5a9864bb..b5a9864bb 100644
--- a/src/test/ui/parser/struct-literal-in-if.stderr
+++ b/tests/ui/parser/struct-literal-in-if.stderr
diff --git a/src/test/ui/parser/struct-literal-in-match-discriminant.rs b/tests/ui/parser/struct-literal-in-match-discriminant.rs
index ce132df5a..ce132df5a 100644
--- a/src/test/ui/parser/struct-literal-in-match-discriminant.rs
+++ b/tests/ui/parser/struct-literal-in-match-discriminant.rs
diff --git a/src/test/ui/parser/struct-literal-in-match-discriminant.stderr b/tests/ui/parser/struct-literal-in-match-discriminant.stderr
index 692b4d735..692b4d735 100644
--- a/src/test/ui/parser/struct-literal-in-match-discriminant.stderr
+++ b/tests/ui/parser/struct-literal-in-match-discriminant.stderr
diff --git a/src/test/ui/parser/struct-literal-in-match-guard.rs b/tests/ui/parser/struct-literal-in-match-guard.rs
index bf0551b5c..bf0551b5c 100644
--- a/src/test/ui/parser/struct-literal-in-match-guard.rs
+++ b/tests/ui/parser/struct-literal-in-match-guard.rs
diff --git a/src/test/ui/parser/struct-literal-in-while.rs b/tests/ui/parser/struct-literal-in-while.rs
index 5000ce85b..5000ce85b 100644
--- a/src/test/ui/parser/struct-literal-in-while.rs
+++ b/tests/ui/parser/struct-literal-in-while.rs
diff --git a/src/test/ui/parser/struct-literal-in-while.stderr b/tests/ui/parser/struct-literal-in-while.stderr
index 17e9277e0..17e9277e0 100644
--- a/src/test/ui/parser/struct-literal-in-while.stderr
+++ b/tests/ui/parser/struct-literal-in-while.stderr
diff --git a/src/test/ui/parser/struct-literal-restrictions-in-lamda.rs b/tests/ui/parser/struct-literal-restrictions-in-lamda.rs
index e185153dc..e185153dc 100644
--- a/src/test/ui/parser/struct-literal-restrictions-in-lamda.rs
+++ b/tests/ui/parser/struct-literal-restrictions-in-lamda.rs
diff --git a/src/test/ui/parser/struct-literal-restrictions-in-lamda.stderr b/tests/ui/parser/struct-literal-restrictions-in-lamda.stderr
index 0852c7cb4..0852c7cb4 100644
--- a/src/test/ui/parser/struct-literal-restrictions-in-lamda.stderr
+++ b/tests/ui/parser/struct-literal-restrictions-in-lamda.stderr
diff --git a/src/test/ui/parser/struct-literal-variant-in-if.rs b/tests/ui/parser/struct-literal-variant-in-if.rs
index 4ef8effaf..4ef8effaf 100644
--- a/src/test/ui/parser/struct-literal-variant-in-if.rs
+++ b/tests/ui/parser/struct-literal-variant-in-if.rs
diff --git a/src/test/ui/parser/struct-literal-variant-in-if.stderr b/tests/ui/parser/struct-literal-variant-in-if.stderr
index 9f0c0074d..9f0c0074d 100644
--- a/src/test/ui/parser/struct-literal-variant-in-if.stderr
+++ b/tests/ui/parser/struct-literal-variant-in-if.stderr
diff --git a/src/test/ui/parser/suggest-assoc-const.fixed b/tests/ui/parser/suggest-assoc-const.fixed
index 259f37b23..259f37b23 100644
--- a/src/test/ui/parser/suggest-assoc-const.fixed
+++ b/tests/ui/parser/suggest-assoc-const.fixed
diff --git a/src/test/ui/parser/suggest-assoc-const.rs b/tests/ui/parser/suggest-assoc-const.rs
index c7be712ec..c7be712ec 100644
--- a/src/test/ui/parser/suggest-assoc-const.rs
+++ b/tests/ui/parser/suggest-assoc-const.rs
diff --git a/src/test/ui/parser/suggest-assoc-const.stderr b/tests/ui/parser/suggest-assoc-const.stderr
index 2ddfa07c5..2ddfa07c5 100644
--- a/src/test/ui/parser/suggest-assoc-const.stderr
+++ b/tests/ui/parser/suggest-assoc-const.stderr
diff --git a/src/test/ui/parser/suggest-const-for-global-var.rs b/tests/ui/parser/suggest-const-for-global-var.rs
index d6216cb7a..d6216cb7a 100644
--- a/src/test/ui/parser/suggest-const-for-global-var.rs
+++ b/tests/ui/parser/suggest-const-for-global-var.rs
diff --git a/src/test/ui/parser/suggest-const-for-global-var.stderr b/tests/ui/parser/suggest-const-for-global-var.stderr
index 94e44ec7f..94e44ec7f 100644
--- a/src/test/ui/parser/suggest-const-for-global-var.stderr
+++ b/tests/ui/parser/suggest-const-for-global-var.stderr
diff --git a/src/test/ui/parser/suggest-removing-semicolon-after-impl-trait-items.fixed b/tests/ui/parser/suggest-removing-semicolon-after-impl-trait-items.fixed
index 637047354..637047354 100644
--- a/src/test/ui/parser/suggest-removing-semicolon-after-impl-trait-items.fixed
+++ b/tests/ui/parser/suggest-removing-semicolon-after-impl-trait-items.fixed
diff --git a/src/test/ui/parser/suggest-removing-semicolon-after-impl-trait-items.rs b/tests/ui/parser/suggest-removing-semicolon-after-impl-trait-items.rs
index 4650b05e2..4650b05e2 100644
--- a/src/test/ui/parser/suggest-removing-semicolon-after-impl-trait-items.rs
+++ b/tests/ui/parser/suggest-removing-semicolon-after-impl-trait-items.rs
diff --git a/src/test/ui/parser/suggest-removing-semicolon-after-impl-trait-items.stderr b/tests/ui/parser/suggest-removing-semicolon-after-impl-trait-items.stderr
index 396e0c130..396e0c130 100644
--- a/src/test/ui/parser/suggest-removing-semicolon-after-impl-trait-items.stderr
+++ b/tests/ui/parser/suggest-removing-semicolon-after-impl-trait-items.stderr
diff --git a/src/test/ui/parser/suggest-semi-in-array.rs b/tests/ui/parser/suggest-semi-in-array.rs
index 9ce2e59e5..9ce2e59e5 100644
--- a/src/test/ui/parser/suggest-semi-in-array.rs
+++ b/tests/ui/parser/suggest-semi-in-array.rs
diff --git a/src/test/ui/parser/suggest-semi-in-array.stderr b/tests/ui/parser/suggest-semi-in-array.stderr
index d7cd6efae..d7cd6efae 100644
--- a/src/test/ui/parser/suggest-semi-in-array.stderr
+++ b/tests/ui/parser/suggest-semi-in-array.stderr
diff --git a/src/test/ui/parser/suggest-semicolon-before-array.fixed b/tests/ui/parser/suggest-semicolon-before-array.fixed
index a06b58b27..a06b58b27 100644
--- a/src/test/ui/parser/suggest-semicolon-before-array.fixed
+++ b/tests/ui/parser/suggest-semicolon-before-array.fixed
diff --git a/src/test/ui/parser/suggest-semicolon-before-array.rs b/tests/ui/parser/suggest-semicolon-before-array.rs
index f601ca2ae..f601ca2ae 100644
--- a/src/test/ui/parser/suggest-semicolon-before-array.rs
+++ b/tests/ui/parser/suggest-semicolon-before-array.rs
diff --git a/src/test/ui/parser/suggest-semicolon-before-array.stderr b/tests/ui/parser/suggest-semicolon-before-array.stderr
index 8a33321fb..8a33321fb 100644
--- a/src/test/ui/parser/suggest-semicolon-before-array.stderr
+++ b/tests/ui/parser/suggest-semicolon-before-array.stderr
diff --git a/src/test/ui/parser/trailing-carriage-return-in-string.rs b/tests/ui/parser/trailing-carriage-return-in-string.rs
index 5d3c31944..5d3c31944 100644
--- a/src/test/ui/parser/trailing-carriage-return-in-string.rs
+++ b/tests/ui/parser/trailing-carriage-return-in-string.rs
diff --git a/src/test/ui/parser/trailing-carriage-return-in-string.stderr b/tests/ui/parser/trailing-carriage-return-in-string.stderr
index 8a44e0270..8a44e0270 100644
--- a/src/test/ui/parser/trailing-carriage-return-in-string.stderr
+++ b/tests/ui/parser/trailing-carriage-return-in-string.stderr
diff --git a/src/test/ui/parser/trailing-plus-in-bounds.rs b/tests/ui/parser/trailing-plus-in-bounds.rs
index 400649bcf..400649bcf 100644
--- a/src/test/ui/parser/trailing-plus-in-bounds.rs
+++ b/tests/ui/parser/trailing-plus-in-bounds.rs
diff --git a/src/test/ui/parser/trailing-question-in-macro-type.rs b/tests/ui/parser/trailing-question-in-macro-type.rs
index e2a681ddd..e2a681ddd 100644
--- a/src/test/ui/parser/trailing-question-in-macro-type.rs
+++ b/tests/ui/parser/trailing-question-in-macro-type.rs
diff --git a/src/test/ui/parser/trailing-question-in-macro-type.stderr b/tests/ui/parser/trailing-question-in-macro-type.stderr
index c096ae04f..c096ae04f 100644
--- a/src/test/ui/parser/trailing-question-in-macro-type.stderr
+++ b/tests/ui/parser/trailing-question-in-macro-type.stderr
diff --git a/src/test/ui/parser/trailing-question-in-type.fixed b/tests/ui/parser/trailing-question-in-type.fixed
index 6ea24484e..6ea24484e 100644
--- a/src/test/ui/parser/trailing-question-in-type.fixed
+++ b/tests/ui/parser/trailing-question-in-type.fixed
diff --git a/src/test/ui/parser/trailing-question-in-type.rs b/tests/ui/parser/trailing-question-in-type.rs
index b1c508365..b1c508365 100644
--- a/src/test/ui/parser/trailing-question-in-type.rs
+++ b/tests/ui/parser/trailing-question-in-type.rs
diff --git a/src/test/ui/parser/trailing-question-in-type.stderr b/tests/ui/parser/trailing-question-in-type.stderr
index a3cd419c0..a3cd419c0 100644
--- a/src/test/ui/parser/trailing-question-in-type.stderr
+++ b/tests/ui/parser/trailing-question-in-type.stderr
diff --git a/src/test/ui/parser/trait-bounds-not-on-impl.rs b/tests/ui/parser/trait-bounds-not-on-impl.rs
index 02563847e..02563847e 100644
--- a/src/test/ui/parser/trait-bounds-not-on-impl.rs
+++ b/tests/ui/parser/trait-bounds-not-on-impl.rs
diff --git a/src/test/ui/parser/trait-bounds-not-on-impl.stderr b/tests/ui/parser/trait-bounds-not-on-impl.stderr
index 8d2d5e3d7..8d2d5e3d7 100644
--- a/src/test/ui/parser/trait-bounds-not-on-impl.stderr
+++ b/tests/ui/parser/trait-bounds-not-on-impl.stderr
diff --git a/src/test/ui/parser/trait-item-with-defaultness-fail-semantic.rs b/tests/ui/parser/trait-item-with-defaultness-fail-semantic.rs
index f2d97b7ba..f2d97b7ba 100644
--- a/src/test/ui/parser/trait-item-with-defaultness-fail-semantic.rs
+++ b/tests/ui/parser/trait-item-with-defaultness-fail-semantic.rs
diff --git a/src/test/ui/parser/trait-item-with-defaultness-fail-semantic.stderr b/tests/ui/parser/trait-item-with-defaultness-fail-semantic.stderr
index be858cd65..be858cd65 100644
--- a/src/test/ui/parser/trait-item-with-defaultness-fail-semantic.stderr
+++ b/tests/ui/parser/trait-item-with-defaultness-fail-semantic.stderr
diff --git a/src/test/ui/parser/trait-item-with-defaultness-pass.rs b/tests/ui/parser/trait-item-with-defaultness-pass.rs
index a6318bd99..a6318bd99 100644
--- a/src/test/ui/parser/trait-item-with-defaultness-pass.rs
+++ b/tests/ui/parser/trait-item-with-defaultness-pass.rs
diff --git a/src/test/ui/parser/trait-object-bad-parens.rs b/tests/ui/parser/trait-object-bad-parens.rs
index 8e267c744..8e267c744 100644
--- a/src/test/ui/parser/trait-object-bad-parens.rs
+++ b/tests/ui/parser/trait-object-bad-parens.rs
diff --git a/src/test/ui/parser/trait-object-bad-parens.stderr b/tests/ui/parser/trait-object-bad-parens.stderr
index 74e484eeb..74e484eeb 100644
--- a/src/test/ui/parser/trait-object-bad-parens.stderr
+++ b/tests/ui/parser/trait-object-bad-parens.stderr
diff --git a/src/test/ui/parser/trait-object-delimiters.rs b/tests/ui/parser/trait-object-delimiters.rs
index cc04ac052..cc04ac052 100644
--- a/src/test/ui/parser/trait-object-delimiters.rs
+++ b/tests/ui/parser/trait-object-delimiters.rs
diff --git a/src/test/ui/parser/trait-object-delimiters.stderr b/tests/ui/parser/trait-object-delimiters.stderr
index 99c451545..99c451545 100644
--- a/src/test/ui/parser/trait-object-delimiters.stderr
+++ b/tests/ui/parser/trait-object-delimiters.stderr
diff --git a/src/test/ui/parser/trait-object-lifetime-parens.rs b/tests/ui/parser/trait-object-lifetime-parens.rs
index f44ebe5ba..f44ebe5ba 100644
--- a/src/test/ui/parser/trait-object-lifetime-parens.rs
+++ b/tests/ui/parser/trait-object-lifetime-parens.rs
diff --git a/src/test/ui/parser/trait-object-lifetime-parens.stderr b/tests/ui/parser/trait-object-lifetime-parens.stderr
index 9c7a9662c..9c7a9662c 100644
--- a/src/test/ui/parser/trait-object-lifetime-parens.stderr
+++ b/tests/ui/parser/trait-object-lifetime-parens.stderr
diff --git a/src/test/ui/parser/trait-object-polytrait-priority.rs b/tests/ui/parser/trait-object-polytrait-priority.rs
index 63425f3e2..63425f3e2 100644
--- a/src/test/ui/parser/trait-object-polytrait-priority.rs
+++ b/tests/ui/parser/trait-object-polytrait-priority.rs
diff --git a/src/test/ui/parser/trait-object-polytrait-priority.stderr b/tests/ui/parser/trait-object-polytrait-priority.stderr
index a6add6079..a6add6079 100644
--- a/src/test/ui/parser/trait-object-polytrait-priority.stderr
+++ b/tests/ui/parser/trait-object-polytrait-priority.stderr
diff --git a/src/test/ui/parser/trait-object-trait-parens.rs b/tests/ui/parser/trait-object-trait-parens.rs
index 438034bc3..438034bc3 100644
--- a/src/test/ui/parser/trait-object-trait-parens.rs
+++ b/tests/ui/parser/trait-object-trait-parens.rs
diff --git a/src/test/ui/parser/trait-object-trait-parens.stderr b/tests/ui/parser/trait-object-trait-parens.stderr
index 5e07a3fe6..5e07a3fe6 100644
--- a/src/test/ui/parser/trait-object-trait-parens.stderr
+++ b/tests/ui/parser/trait-object-trait-parens.stderr
diff --git a/src/test/ui/parser/trait-plusequal-splitting.rs b/tests/ui/parser/trait-plusequal-splitting.rs
index 6ca677450..6ca677450 100644
--- a/src/test/ui/parser/trait-plusequal-splitting.rs
+++ b/tests/ui/parser/trait-plusequal-splitting.rs
diff --git a/src/test/ui/parser/trait-pub-assoc-const.rs b/tests/ui/parser/trait-pub-assoc-const.rs
index 219ffa309..219ffa309 100644
--- a/src/test/ui/parser/trait-pub-assoc-const.rs
+++ b/tests/ui/parser/trait-pub-assoc-const.rs
diff --git a/src/test/ui/parser/trait-pub-assoc-const.stderr b/tests/ui/parser/trait-pub-assoc-const.stderr
index efd09a036..efd09a036 100644
--- a/src/test/ui/parser/trait-pub-assoc-const.stderr
+++ b/tests/ui/parser/trait-pub-assoc-const.stderr
diff --git a/src/test/ui/parser/trait-pub-assoc-ty.rs b/tests/ui/parser/trait-pub-assoc-ty.rs
index a78dfbdcd..a78dfbdcd 100644
--- a/src/test/ui/parser/trait-pub-assoc-ty.rs
+++ b/tests/ui/parser/trait-pub-assoc-ty.rs
diff --git a/src/test/ui/parser/trait-pub-assoc-ty.stderr b/tests/ui/parser/trait-pub-assoc-ty.stderr
index e76373f5c..e76373f5c 100644
--- a/src/test/ui/parser/trait-pub-assoc-ty.stderr
+++ b/tests/ui/parser/trait-pub-assoc-ty.stderr
diff --git a/src/test/ui/parser/trait-pub-method.rs b/tests/ui/parser/trait-pub-method.rs
index 1f6ee028a..1f6ee028a 100644
--- a/src/test/ui/parser/trait-pub-method.rs
+++ b/tests/ui/parser/trait-pub-method.rs
diff --git a/src/test/ui/parser/trait-pub-method.stderr b/tests/ui/parser/trait-pub-method.stderr
index 0e3fe027c..0e3fe027c 100644
--- a/src/test/ui/parser/trait-pub-method.stderr
+++ b/tests/ui/parser/trait-pub-method.stderr
diff --git a/src/test/ui/parser/type-alias-where-fixable.fixed b/tests/ui/parser/type-alias-where-fixable.fixed
index 2f47c0d91..2f47c0d91 100644
--- a/src/test/ui/parser/type-alias-where-fixable.fixed
+++ b/tests/ui/parser/type-alias-where-fixable.fixed
diff --git a/src/test/ui/parser/type-alias-where-fixable.rs b/tests/ui/parser/type-alias-where-fixable.rs
index b20aa9398..b20aa9398 100644
--- a/src/test/ui/parser/type-alias-where-fixable.rs
+++ b/tests/ui/parser/type-alias-where-fixable.rs
diff --git a/src/test/ui/parser/type-alias-where-fixable.stderr b/tests/ui/parser/type-alias-where-fixable.stderr
index f0acb388b..f0acb388b 100644
--- a/src/test/ui/parser/type-alias-where-fixable.stderr
+++ b/tests/ui/parser/type-alias-where-fixable.stderr
diff --git a/src/test/ui/parser/type-alias-where.rs b/tests/ui/parser/type-alias-where.rs
index 62e301cb4..62e301cb4 100644
--- a/src/test/ui/parser/type-alias-where.rs
+++ b/tests/ui/parser/type-alias-where.rs
diff --git a/src/test/ui/parser/type-alias-where.stderr b/tests/ui/parser/type-alias-where.stderr
index fb8381792..fb8381792 100644
--- a/src/test/ui/parser/type-alias-where.stderr
+++ b/tests/ui/parser/type-alias-where.stderr
diff --git a/src/test/ui/parser/type-parameters-in-field-exprs.rs b/tests/ui/parser/type-parameters-in-field-exprs.rs
index 4cd77ebbd..4cd77ebbd 100644
--- a/src/test/ui/parser/type-parameters-in-field-exprs.rs
+++ b/tests/ui/parser/type-parameters-in-field-exprs.rs
diff --git a/src/test/ui/parser/type-parameters-in-field-exprs.stderr b/tests/ui/parser/type-parameters-in-field-exprs.stderr
index ce7364d35..ce7364d35 100644
--- a/src/test/ui/parser/type-parameters-in-field-exprs.stderr
+++ b/tests/ui/parser/type-parameters-in-field-exprs.stderr
diff --git a/src/test/ui/parser/unbalanced-doublequote.rs b/tests/ui/parser/unbalanced-doublequote.rs
index f21316205..f21316205 100644
--- a/src/test/ui/parser/unbalanced-doublequote.rs
+++ b/tests/ui/parser/unbalanced-doublequote.rs
diff --git a/src/test/ui/parser/unbalanced-doublequote.stderr b/tests/ui/parser/unbalanced-doublequote.stderr
index 94b300a7b..94b300a7b 100644
--- a/src/test/ui/parser/unbalanced-doublequote.stderr
+++ b/tests/ui/parser/unbalanced-doublequote.stderr
diff --git a/src/test/ui/parser/unclosed-braces.rs b/tests/ui/parser/unclosed-braces.rs
index ed94fff38..ed94fff38 100644
--- a/src/test/ui/parser/unclosed-braces.rs
+++ b/tests/ui/parser/unclosed-braces.rs
diff --git a/src/test/ui/parser/unclosed-braces.stderr b/tests/ui/parser/unclosed-braces.stderr
index cbc5f8de4..cbc5f8de4 100644
--- a/src/test/ui/parser/unclosed-braces.stderr
+++ b/tests/ui/parser/unclosed-braces.stderr
diff --git a/src/test/ui/parser/unclosed-delimiter-in-dep.rs b/tests/ui/parser/unclosed-delimiter-in-dep.rs
index 6db1b66e9..6db1b66e9 100644
--- a/src/test/ui/parser/unclosed-delimiter-in-dep.rs
+++ b/tests/ui/parser/unclosed-delimiter-in-dep.rs
diff --git a/src/test/ui/parser/unclosed-delimiter-in-dep.stderr b/tests/ui/parser/unclosed-delimiter-in-dep.stderr
index 1366ef1bb..1366ef1bb 100644
--- a/src/test/ui/parser/unclosed-delimiter-in-dep.stderr
+++ b/tests/ui/parser/unclosed-delimiter-in-dep.stderr
diff --git a/src/test/ui/parser/unclosed_delim_mod.rs b/tests/ui/parser/unclosed_delim_mod.rs
index d977d2c03..d977d2c03 100644
--- a/src/test/ui/parser/unclosed_delim_mod.rs
+++ b/tests/ui/parser/unclosed_delim_mod.rs
diff --git a/src/test/ui/parser/unclosed_delim_mod.stderr b/tests/ui/parser/unclosed_delim_mod.stderr
index a46d020b9..a46d020b9 100644
--- a/src/test/ui/parser/unclosed_delim_mod.stderr
+++ b/tests/ui/parser/unclosed_delim_mod.stderr
diff --git a/src/test/ui/parser/underscore-suffix-for-float.rs b/tests/ui/parser/underscore-suffix-for-float.rs
index c9b7eced0..c9b7eced0 100644
--- a/src/test/ui/parser/underscore-suffix-for-float.rs
+++ b/tests/ui/parser/underscore-suffix-for-float.rs
diff --git a/src/test/ui/parser/underscore-suffix-for-float.stderr b/tests/ui/parser/underscore-suffix-for-float.stderr
index a5f3b6551..a5f3b6551 100644
--- a/src/test/ui/parser/underscore-suffix-for-float.stderr
+++ b/tests/ui/parser/underscore-suffix-for-float.stderr
diff --git a/src/test/ui/parser/underscore-suffix-for-string.rs b/tests/ui/parser/underscore-suffix-for-string.rs
index bd260752e..bd260752e 100644
--- a/src/test/ui/parser/underscore-suffix-for-string.rs
+++ b/tests/ui/parser/underscore-suffix-for-string.rs
diff --git a/src/test/ui/parser/underscore-suffix-for-string.stderr b/tests/ui/parser/underscore-suffix-for-string.stderr
index 2fe2c130e..2fe2c130e 100644
--- a/src/test/ui/parser/underscore-suffix-for-string.stderr
+++ b/tests/ui/parser/underscore-suffix-for-string.stderr
diff --git a/src/test/ui/parser/underscore_item_not_const.rs b/tests/ui/parser/underscore_item_not_const.rs
index c01ac4752..c01ac4752 100644
--- a/src/test/ui/parser/underscore_item_not_const.rs
+++ b/tests/ui/parser/underscore_item_not_const.rs
diff --git a/src/test/ui/parser/underscore_item_not_const.stderr b/tests/ui/parser/underscore_item_not_const.stderr
index 0bc7642dd..0bc7642dd 100644
--- a/src/test/ui/parser/underscore_item_not_const.stderr
+++ b/tests/ui/parser/underscore_item_not_const.stderr
diff --git a/src/test/ui/parser/unicode-character-literal.fixed b/tests/ui/parser/unicode-character-literal.fixed
index 26ef5ffa1..26ef5ffa1 100644
--- a/src/test/ui/parser/unicode-character-literal.fixed
+++ b/tests/ui/parser/unicode-character-literal.fixed
diff --git a/src/test/ui/parser/unicode-character-literal.rs b/tests/ui/parser/unicode-character-literal.rs
index d331522c0..d331522c0 100644
--- a/src/test/ui/parser/unicode-character-literal.rs
+++ b/tests/ui/parser/unicode-character-literal.rs
diff --git a/src/test/ui/parser/unicode-character-literal.stderr b/tests/ui/parser/unicode-character-literal.stderr
index 5cd3bd0fe..5cd3bd0fe 100644
--- a/src/test/ui/parser/unicode-character-literal.stderr
+++ b/tests/ui/parser/unicode-character-literal.stderr
diff --git a/tests/ui/parser/unicode-chars.rs b/tests/ui/parser/unicode-chars.rs
new file mode 100644
index 000000000..cd25c7566
--- /dev/null
+++ b/tests/ui/parser/unicode-chars.rs
@@ -0,0 +1,12 @@
+fn main() {
+    let y = 0;
+    //~^ ERROR unknown start of token: \u{37e}
+    //~^^ HELP Unicode character ';' (Greek Question Mark) looks like ';' (Semicolon), but it is not
+        let x = 0;
+    //~^ ERROR unknown start of token: \u{a0}
+    //~^^ NOTE character appears 3 more times
+    //~^^^ HELP Unicode character ' ' (No-Break Space) looks like ' ' (Space), but it is not
+    let _ = 1 ⩵ 2;
+    //~^ ERROR unknown start of token
+    //~^^ HELP Unicode character '⩵' (Two Consecutive Equals Signs) looks like '==' (Double Equals Sign), but it is not
+}
diff --git a/tests/ui/parser/unicode-chars.stderr b/tests/ui/parser/unicode-chars.stderr
new file mode 100644
index 000000000..086de5ec0
--- /dev/null
+++ b/tests/ui/parser/unicode-chars.stderr
@@ -0,0 +1,36 @@
+error: unknown start of token: \u{37e}
+  --> $DIR/unicode-chars.rs:2:14
+   |
+LL |     let y = 0;
+   |              ^
+   |
+help: Unicode character ';' (Greek Question Mark) looks like ';' (Semicolon), but it is not
+   |
+LL |     let y = 0;
+   |              ~
+
+error: unknown start of token: \u{a0}
+  --> $DIR/unicode-chars.rs:5:5
+   |
+LL |         let x = 0;
+   |     ^^^^
+   |
+   = note: character appears 3 more times
+help: Unicode character ' ' (No-Break Space) looks like ' ' (Space), but it is not
+   |
+LL |         let x = 0;
+   |     ++++
+
+error: unknown start of token: \u{2a75}
+  --> $DIR/unicode-chars.rs:9:15
+   |
+LL |     let _ = 1 ⩵ 2;
+   |               ^
+   |
+help: Unicode character '⩵' (Two Consecutive Equals Signs) looks like '==' (Double Equals Sign), but it is not
+   |
+LL |     let _ = 1 == 2;
+   |               ~~
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/parser/unicode-control-codepoints.rs b/tests/ui/parser/unicode-control-codepoints.rs
index df099bb62..df099bb62 100644
--- a/src/test/ui/parser/unicode-control-codepoints.rs
+++ b/tests/ui/parser/unicode-control-codepoints.rs
diff --git a/src/test/ui/parser/unicode-control-codepoints.stderr b/tests/ui/parser/unicode-control-codepoints.stderr
index fc071a941..fc071a941 100644
--- a/src/test/ui/parser/unicode-control-codepoints.stderr
+++ b/tests/ui/parser/unicode-control-codepoints.stderr
diff --git a/src/test/ui/parser/unicode-quote-chars.rs b/tests/ui/parser/unicode-quote-chars.rs
index 868d2b227..868d2b227 100644
--- a/src/test/ui/parser/unicode-quote-chars.rs
+++ b/tests/ui/parser/unicode-quote-chars.rs
diff --git a/src/test/ui/parser/unicode-quote-chars.stderr b/tests/ui/parser/unicode-quote-chars.stderr
index 092abeb53..092abeb53 100644
--- a/src/test/ui/parser/unicode-quote-chars.stderr
+++ b/tests/ui/parser/unicode-quote-chars.stderr
diff --git a/src/test/ui/parser/unmatched-delimiter-at-end-of-file.rs b/tests/ui/parser/unmatched-delimiter-at-end-of-file.rs
index f56013266..f56013266 100644
--- a/src/test/ui/parser/unmatched-delimiter-at-end-of-file.rs
+++ b/tests/ui/parser/unmatched-delimiter-at-end-of-file.rs
diff --git a/src/test/ui/parser/unmatched-delimiter-at-end-of-file.stderr b/tests/ui/parser/unmatched-delimiter-at-end-of-file.stderr
index 430a13e6e..430a13e6e 100644
--- a/src/test/ui/parser/unmatched-delimiter-at-end-of-file.stderr
+++ b/tests/ui/parser/unmatched-delimiter-at-end-of-file.stderr
diff --git a/src/test/ui/parser/unmatched-langle-1.rs b/tests/ui/parser/unmatched-langle-1.rs
index fdf2ae398..fdf2ae398 100644
--- a/src/test/ui/parser/unmatched-langle-1.rs
+++ b/tests/ui/parser/unmatched-langle-1.rs
diff --git a/src/test/ui/parser/unmatched-langle-1.stderr b/tests/ui/parser/unmatched-langle-1.stderr
index cdf74bded..cdf74bded 100644
--- a/src/test/ui/parser/unmatched-langle-1.stderr
+++ b/tests/ui/parser/unmatched-langle-1.stderr
diff --git a/src/test/ui/parser/unmatched-langle-2.rs b/tests/ui/parser/unmatched-langle-2.rs
index 8de0d7d89..8de0d7d89 100644
--- a/src/test/ui/parser/unmatched-langle-2.rs
+++ b/tests/ui/parser/unmatched-langle-2.rs
diff --git a/src/test/ui/parser/unmatched-langle-2.stderr b/tests/ui/parser/unmatched-langle-2.stderr
index 773bb33d8..773bb33d8 100644
--- a/src/test/ui/parser/unmatched-langle-2.stderr
+++ b/tests/ui/parser/unmatched-langle-2.stderr
diff --git a/src/test/ui/parser/unnecessary-let.rs b/tests/ui/parser/unnecessary-let.rs
index 627910962..627910962 100644
--- a/src/test/ui/parser/unnecessary-let.rs
+++ b/tests/ui/parser/unnecessary-let.rs
diff --git a/src/test/ui/parser/unnecessary-let.stderr b/tests/ui/parser/unnecessary-let.stderr
index 952119cae..952119cae 100644
--- a/src/test/ui/parser/unnecessary-let.stderr
+++ b/tests/ui/parser/unnecessary-let.stderr
diff --git a/src/test/ui/parser/unsafe-foreign-mod-2.rs b/tests/ui/parser/unsafe-foreign-mod-2.rs
index 77856fb67..77856fb67 100644
--- a/src/test/ui/parser/unsafe-foreign-mod-2.rs
+++ b/tests/ui/parser/unsafe-foreign-mod-2.rs
diff --git a/src/test/ui/parser/unsafe-foreign-mod-2.stderr b/tests/ui/parser/unsafe-foreign-mod-2.stderr
index 7cc2de141..7cc2de141 100644
--- a/src/test/ui/parser/unsafe-foreign-mod-2.stderr
+++ b/tests/ui/parser/unsafe-foreign-mod-2.stderr
diff --git a/src/test/ui/parser/unsafe-foreign-mod.rs b/tests/ui/parser/unsafe-foreign-mod.rs
index eab134a4a..eab134a4a 100644
--- a/src/test/ui/parser/unsafe-foreign-mod.rs
+++ b/tests/ui/parser/unsafe-foreign-mod.rs
diff --git a/src/test/ui/parser/unsafe-foreign-mod.stderr b/tests/ui/parser/unsafe-foreign-mod.stderr
index 4acf72c5d..4acf72c5d 100644
--- a/src/test/ui/parser/unsafe-foreign-mod.stderr
+++ b/tests/ui/parser/unsafe-foreign-mod.stderr
diff --git a/src/test/ui/parser/unsafe-mod.rs b/tests/ui/parser/unsafe-mod.rs
index 7916d878e..7916d878e 100644
--- a/src/test/ui/parser/unsafe-mod.rs
+++ b/tests/ui/parser/unsafe-mod.rs
diff --git a/src/test/ui/parser/unsafe-mod.stderr b/tests/ui/parser/unsafe-mod.stderr
index dac6e7a35..dac6e7a35 100644
--- a/src/test/ui/parser/unsafe-mod.stderr
+++ b/tests/ui/parser/unsafe-mod.stderr
diff --git a/src/test/ui/parser/unsized.rs b/tests/ui/parser/unsized.rs
index e7fd7a196..e7fd7a196 100644
--- a/src/test/ui/parser/unsized.rs
+++ b/tests/ui/parser/unsized.rs
diff --git a/src/test/ui/parser/unsized.stderr b/tests/ui/parser/unsized.stderr
index 3d4ed526b..3d4ed526b 100644
--- a/src/test/ui/parser/unsized.stderr
+++ b/tests/ui/parser/unsized.stderr
diff --git a/src/test/ui/parser/unsized2.rs b/tests/ui/parser/unsized2.rs
index 21370b329..21370b329 100644
--- a/src/test/ui/parser/unsized2.rs
+++ b/tests/ui/parser/unsized2.rs
diff --git a/src/test/ui/parser/unsized2.stderr b/tests/ui/parser/unsized2.stderr
index 17e39b292..17e39b292 100644
--- a/src/test/ui/parser/unsized2.stderr
+++ b/tests/ui/parser/unsized2.stderr
diff --git a/src/test/ui/parser/use-as-where-use-ends-with-mod-sep.rs b/tests/ui/parser/use-as-where-use-ends-with-mod-sep.rs
index b4bb48418..b4bb48418 100644
--- a/src/test/ui/parser/use-as-where-use-ends-with-mod-sep.rs
+++ b/tests/ui/parser/use-as-where-use-ends-with-mod-sep.rs
diff --git a/src/test/ui/parser/use-as-where-use-ends-with-mod-sep.stderr b/tests/ui/parser/use-as-where-use-ends-with-mod-sep.stderr
index 192ab5eb7..192ab5eb7 100644
--- a/src/test/ui/parser/use-as-where-use-ends-with-mod-sep.stderr
+++ b/tests/ui/parser/use-as-where-use-ends-with-mod-sep.stderr
diff --git a/src/test/ui/parser/use-colon-as-mod-sep.rs b/tests/ui/parser/use-colon-as-mod-sep.rs
index e1e8756b0..e1e8756b0 100644
--- a/src/test/ui/parser/use-colon-as-mod-sep.rs
+++ b/tests/ui/parser/use-colon-as-mod-sep.rs
diff --git a/src/test/ui/parser/use-colon-as-mod-sep.stderr b/tests/ui/parser/use-colon-as-mod-sep.stderr
index e825dfed1..e825dfed1 100644
--- a/src/test/ui/parser/use-colon-as-mod-sep.stderr
+++ b/tests/ui/parser/use-colon-as-mod-sep.stderr
diff --git a/src/test/ui/parser/use-ends-with-mod-sep.rs b/tests/ui/parser/use-ends-with-mod-sep.rs
index ad8da4d18..ad8da4d18 100644
--- a/src/test/ui/parser/use-ends-with-mod-sep.rs
+++ b/tests/ui/parser/use-ends-with-mod-sep.rs
diff --git a/src/test/ui/parser/use-ends-with-mod-sep.stderr b/tests/ui/parser/use-ends-with-mod-sep.stderr
index bd0d881a0..bd0d881a0 100644
--- a/src/test/ui/parser/use-ends-with-mod-sep.stderr
+++ b/tests/ui/parser/use-ends-with-mod-sep.stderr
diff --git a/src/test/ui/parser/use-unclosed-brace.rs b/tests/ui/parser/use-unclosed-brace.rs
index 41742f37f..41742f37f 100644
--- a/src/test/ui/parser/use-unclosed-brace.rs
+++ b/tests/ui/parser/use-unclosed-brace.rs
diff --git a/src/test/ui/parser/use-unclosed-brace.stderr b/tests/ui/parser/use-unclosed-brace.stderr
index 438fe9c47..438fe9c47 100644
--- a/src/test/ui/parser/use-unclosed-brace.stderr
+++ b/tests/ui/parser/use-unclosed-brace.stderr
diff --git a/src/test/ui/parser/utf16-be-without-bom.rs b/tests/ui/parser/utf16-be-without-bom.rs
index 22aa19717..22aa19717 100644
--- a/src/test/ui/parser/utf16-be-without-bom.rs
+++ b/tests/ui/parser/utf16-be-without-bom.rs
diff --git a/src/test/ui/parser/utf16-be-without-bom.stderr b/tests/ui/parser/utf16-be-without-bom.stderr
index 768d2c531..768d2c531 100644
--- a/src/test/ui/parser/utf16-be-without-bom.stderr
+++ b/tests/ui/parser/utf16-be-without-bom.stderr
diff --git a/src/test/ui/parser/utf16-le-without-bom.rs b/tests/ui/parser/utf16-le-without-bom.rs
index 3c1049929..3c1049929 100644
--- a/src/test/ui/parser/utf16-le-without-bom.rs
+++ b/tests/ui/parser/utf16-le-without-bom.rs
diff --git a/src/test/ui/parser/utf16-le-without-bom.stderr b/tests/ui/parser/utf16-le-without-bom.stderr
index 4f4b91e39..4f4b91e39 100644
--- a/src/test/ui/parser/utf16-le-without-bom.stderr
+++ b/tests/ui/parser/utf16-le-without-bom.stderr
diff --git a/src/test/ui/parser/utf8_idents-rpass.rs b/tests/ui/parser/utf8_idents-rpass.rs
index 206744a58..206744a58 100644
--- a/src/test/ui/parser/utf8_idents-rpass.rs
+++ b/tests/ui/parser/utf8_idents-rpass.rs
diff --git a/src/test/ui/parser/variadic-ffi-nested-syntactic-fail.rs b/tests/ui/parser/variadic-ffi-nested-syntactic-fail.rs
index 9eeee195e..9eeee195e 100644
--- a/src/test/ui/parser/variadic-ffi-nested-syntactic-fail.rs
+++ b/tests/ui/parser/variadic-ffi-nested-syntactic-fail.rs
diff --git a/src/test/ui/parser/variadic-ffi-nested-syntactic-fail.stderr b/tests/ui/parser/variadic-ffi-nested-syntactic-fail.stderr
index 8b9d676a4..8b9d676a4 100644
--- a/src/test/ui/parser/variadic-ffi-nested-syntactic-fail.stderr
+++ b/tests/ui/parser/variadic-ffi-nested-syntactic-fail.stderr
diff --git a/src/test/ui/parser/variadic-ffi-semantic-restrictions.rs b/tests/ui/parser/variadic-ffi-semantic-restrictions.rs
index 0b61e267d..0b61e267d 100644
--- a/src/test/ui/parser/variadic-ffi-semantic-restrictions.rs
+++ b/tests/ui/parser/variadic-ffi-semantic-restrictions.rs
diff --git a/src/test/ui/parser/variadic-ffi-semantic-restrictions.stderr b/tests/ui/parser/variadic-ffi-semantic-restrictions.stderr
index f1cbbb279..f1cbbb279 100644
--- a/src/test/ui/parser/variadic-ffi-semantic-restrictions.stderr
+++ b/tests/ui/parser/variadic-ffi-semantic-restrictions.stderr
diff --git a/src/test/ui/parser/variadic-ffi-syntactic-pass.rs b/tests/ui/parser/variadic-ffi-syntactic-pass.rs
index 3875d6af1..3875d6af1 100644
--- a/src/test/ui/parser/variadic-ffi-syntactic-pass.rs
+++ b/tests/ui/parser/variadic-ffi-syntactic-pass.rs
diff --git a/src/test/ui/parser/virtual-structs.rs b/tests/ui/parser/virtual-structs.rs
index ce57a3454..ce57a3454 100644
--- a/src/test/ui/parser/virtual-structs.rs
+++ b/tests/ui/parser/virtual-structs.rs
diff --git a/src/test/ui/parser/virtual-structs.stderr b/tests/ui/parser/virtual-structs.stderr
index a5211d83f..a5211d83f 100644
--- a/src/test/ui/parser/virtual-structs.stderr
+++ b/tests/ui/parser/virtual-structs.stderr
diff --git a/src/test/ui/parser/where-clauses-no-bounds-or-predicates.rs b/tests/ui/parser/where-clauses-no-bounds-or-predicates.rs
index e80db5372..e80db5372 100644
--- a/src/test/ui/parser/where-clauses-no-bounds-or-predicates.rs
+++ b/tests/ui/parser/where-clauses-no-bounds-or-predicates.rs
diff --git a/src/test/ui/parser/where-clauses-no-bounds-or-predicates.stderr b/tests/ui/parser/where-clauses-no-bounds-or-predicates.stderr
index b80b0a409..b80b0a409 100644
--- a/src/test/ui/parser/where-clauses-no-bounds-or-predicates.stderr
+++ b/tests/ui/parser/where-clauses-no-bounds-or-predicates.stderr
diff --git a/src/test/ui/parser/where_with_bound.rs b/tests/ui/parser/where_with_bound.rs
index 3ca45f188..3ca45f188 100644
--- a/src/test/ui/parser/where_with_bound.rs
+++ b/tests/ui/parser/where_with_bound.rs
diff --git a/src/test/ui/parser/where_with_bound.stderr b/tests/ui/parser/where_with_bound.stderr
index ff98b3f5f..ff98b3f5f 100644
--- a/src/test/ui/parser/where_with_bound.stderr
+++ b/tests/ui/parser/where_with_bound.stderr
diff --git a/src/test/ui/parser/while-if-let-without-body.rs b/tests/ui/parser/while-if-let-without-body.rs
index 063c0145c..063c0145c 100644
--- a/src/test/ui/parser/while-if-let-without-body.rs
+++ b/tests/ui/parser/while-if-let-without-body.rs
diff --git a/src/test/ui/parser/while-if-let-without-body.stderr b/tests/ui/parser/while-if-let-without-body.stderr
index 2dac45c11..2dac45c11 100644
--- a/src/test/ui/parser/while-if-let-without-body.stderr
+++ b/tests/ui/parser/while-if-let-without-body.stderr
diff --git a/src/test/ui/parser/wrong-escape-of-curly-braces.rs b/tests/ui/parser/wrong-escape-of-curly-braces.rs
index 8e5258acd..8e5258acd 100644
--- a/src/test/ui/parser/wrong-escape-of-curly-braces.rs
+++ b/tests/ui/parser/wrong-escape-of-curly-braces.rs
diff --git a/src/test/ui/parser/wrong-escape-of-curly-braces.stderr b/tests/ui/parser/wrong-escape-of-curly-braces.stderr
index ff1a2fb0f..ff1a2fb0f 100644
--- a/src/test/ui/parser/wrong-escape-of-curly-braces.stderr
+++ b/tests/ui/parser/wrong-escape-of-curly-braces.stderr
diff --git a/src/test/ui/partialeq_help.rs b/tests/ui/partialeq_help.rs
index 34b88b8a8..34b88b8a8 100644
--- a/src/test/ui/partialeq_help.rs
+++ b/tests/ui/partialeq_help.rs
diff --git a/src/test/ui/partialeq_help.stderr b/tests/ui/partialeq_help.stderr
index fdff94f42..fdff94f42 100644
--- a/src/test/ui/partialeq_help.stderr
+++ b/tests/ui/partialeq_help.stderr
diff --git a/src/test/ui/path-lookahead.fixed b/tests/ui/path-lookahead.fixed
index 928955630..928955630 100644
--- a/src/test/ui/path-lookahead.fixed
+++ b/tests/ui/path-lookahead.fixed
diff --git a/src/test/ui/path-lookahead.rs b/tests/ui/path-lookahead.rs
index d05c75fe8..d05c75fe8 100644
--- a/src/test/ui/path-lookahead.rs
+++ b/tests/ui/path-lookahead.rs
diff --git a/src/test/ui/path-lookahead.stderr b/tests/ui/path-lookahead.stderr
index 2cc786fd9..2cc786fd9 100644
--- a/src/test/ui/path-lookahead.stderr
+++ b/tests/ui/path-lookahead.stderr
diff --git a/src/test/ui/path.rs b/tests/ui/path.rs
index 4c137de82..4c137de82 100644
--- a/src/test/ui/path.rs
+++ b/tests/ui/path.rs
diff --git a/src/test/ui/paths-containing-nul.rs b/tests/ui/paths-containing-nul.rs
index cb40c4f6f..cb40c4f6f 100644
--- a/src/test/ui/paths-containing-nul.rs
+++ b/tests/ui/paths-containing-nul.rs
diff --git a/src/test/ui/pattern/auxiliary/declarations-for-tuple-field-count-errors.rs b/tests/ui/pattern/auxiliary/declarations-for-tuple-field-count-errors.rs
index f7373c453..f7373c453 100644
--- a/src/test/ui/pattern/auxiliary/declarations-for-tuple-field-count-errors.rs
+++ b/tests/ui/pattern/auxiliary/declarations-for-tuple-field-count-errors.rs
diff --git a/src/test/ui/pattern/bindings-after-at/bind-by-copy.rs b/tests/ui/pattern/bindings-after-at/bind-by-copy.rs
index 2b349f0ed..2b349f0ed 100644
--- a/src/test/ui/pattern/bindings-after-at/bind-by-copy.rs
+++ b/tests/ui/pattern/bindings-after-at/bind-by-copy.rs
diff --git a/src/test/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.rs b/tests/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.rs
index 9d1f08d6e..9d1f08d6e 100644
--- a/src/test/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.rs
+++ b/tests/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.rs
diff --git a/src/test/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.stderr b/tests/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.stderr
index c8b45fd24..c8b45fd24 100644
--- a/src/test/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.stderr
+++ b/tests/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.rs b/tests/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.rs
index 1816a74a0..1816a74a0 100644
--- a/src/test/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.rs
+++ b/tests/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.rs
diff --git a/src/test/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.stderr b/tests/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.stderr
index a481ca468..a481ca468 100644
--- a/src/test/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.stderr
+++ b/tests/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-move-and-move.rs b/tests/ui/pattern/bindings-after-at/borrowck-move-and-move.rs
index a61d68215..a61d68215 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-move-and-move.rs
+++ b/tests/ui/pattern/bindings-after-at/borrowck-move-and-move.rs
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-move-and-move.stderr b/tests/ui/pattern/bindings-after-at/borrowck-move-and-move.stderr
index 324897151..324897151 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-move-and-move.stderr
+++ b/tests/ui/pattern/bindings-after-at/borrowck-move-and-move.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box-pass.rs b/tests/ui/pattern/bindings-after-at/borrowck-pat-at-and-box-pass.rs
index fbdefd9d3..fbdefd9d3 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box-pass.rs
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-at-and-box-pass.rs
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.rs b/tests/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.rs
index 45aa65e67..45aa65e67 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.rs
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.rs
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.stderr b/tests/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.stderr
index f27df32cc..f27df32cc 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.stderr
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-copy-bindings-in-at.rs b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-copy-bindings-in-at.rs
index 0108861cf..0108861cf 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-copy-bindings-in-at.rs
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-copy-bindings-in-at.rs
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.rs b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.rs
index 82f16fca6..82f16fca6 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.rs
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.rs
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.stderr b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.stderr
index d6474f1b4..d6474f1b4 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.stderr
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.rs b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.rs
index 06dc6e1c4..06dc6e1c4 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.rs
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.rs
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.stderr b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.stderr
index 389e86e64..389e86e64 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.stderr
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.rs b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.rs
index 0b0a78010..0b0a78010 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.rs
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.rs
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.stderr b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.stderr
index 770bb8953..770bb8953 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.stderr
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-both-sides.rs b/tests/ui/pattern/bindings-after-at/borrowck-pat-ref-both-sides.rs
index df213f688..df213f688 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-both-sides.rs
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-ref-both-sides.rs
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.rs b/tests/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.rs
index 6bc0d346c..6bc0d346c 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.rs
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.rs
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.stderr b/tests/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.stderr
index 8546b4bb4..8546b4bb4 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.stderr
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.rs b/tests/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.rs
index 99739c7bc..99739c7bc 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.rs
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.rs
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.stderr b/tests/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.stderr
index ad4ce7952..ad4ce7952 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.stderr
+++ b/tests/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/box-patterns.rs b/tests/ui/pattern/bindings-after-at/box-patterns.rs
index 9db37253c..9db37253c 100644
--- a/src/test/ui/pattern/bindings-after-at/box-patterns.rs
+++ b/tests/ui/pattern/bindings-after-at/box-patterns.rs
diff --git a/src/test/ui/pattern/bindings-after-at/copy-and-move-mixed.rs b/tests/ui/pattern/bindings-after-at/copy-and-move-mixed.rs
index 1e2c2968c..1e2c2968c 100644
--- a/src/test/ui/pattern/bindings-after-at/copy-and-move-mixed.rs
+++ b/tests/ui/pattern/bindings-after-at/copy-and-move-mixed.rs
diff --git a/src/test/ui/pattern/bindings-after-at/copy-and-move-mixed.stderr b/tests/ui/pattern/bindings-after-at/copy-and-move-mixed.stderr
index e0e623fa5..e0e623fa5 100644
--- a/src/test/ui/pattern/bindings-after-at/copy-and-move-mixed.stderr
+++ b/tests/ui/pattern/bindings-after-at/copy-and-move-mixed.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.rs b/tests/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.rs
index dfd4d0285..dfd4d0285 100644
--- a/src/test/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.rs
+++ b/tests/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.rs
diff --git a/src/test/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.stderr b/tests/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.stderr
index 638bdd6db..638bdd6db 100644
--- a/src/test/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.stderr
+++ b/tests/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/nested-binding-mode-lint.rs b/tests/ui/pattern/bindings-after-at/nested-binding-mode-lint.rs
index fe7d1eba1..fe7d1eba1 100644
--- a/src/test/ui/pattern/bindings-after-at/nested-binding-mode-lint.rs
+++ b/tests/ui/pattern/bindings-after-at/nested-binding-mode-lint.rs
diff --git a/src/test/ui/pattern/bindings-after-at/nested-binding-modes-mut.rs b/tests/ui/pattern/bindings-after-at/nested-binding-modes-mut.rs
index e7d99534d..e7d99534d 100644
--- a/src/test/ui/pattern/bindings-after-at/nested-binding-modes-mut.rs
+++ b/tests/ui/pattern/bindings-after-at/nested-binding-modes-mut.rs
diff --git a/tests/ui/pattern/bindings-after-at/nested-binding-modes-mut.stderr b/tests/ui/pattern/bindings-after-at/nested-binding-modes-mut.stderr
new file mode 100644
index 000000000..54118dc36
--- /dev/null
+++ b/tests/ui/pattern/bindings-after-at/nested-binding-modes-mut.stderr
@@ -0,0 +1,25 @@
+error[E0596]: cannot borrow `not_mut` as mutable, as it is not declared as mutable
+  --> $DIR/nested-binding-modes-mut.rs:4:5
+   |
+LL |     &mut not_mut;
+   |     ^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut is_mut @ mut not_mut = 42;
+   |                      +++
+
+error[E0596]: cannot borrow `not_mut` as mutable, as it is not declared as mutable
+  --> $DIR/nested-binding-modes-mut.rs:9:5
+   |
+LL |     &mut not_mut;
+   |     ^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut not_mut @ mut is_mut = 42;
+   |         +++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/pattern/bindings-after-at/nested-binding-modes-ref.rs b/tests/ui/pattern/bindings-after-at/nested-binding-modes-ref.rs
index adfb0387f..adfb0387f 100644
--- a/src/test/ui/pattern/bindings-after-at/nested-binding-modes-ref.rs
+++ b/tests/ui/pattern/bindings-after-at/nested-binding-modes-ref.rs
diff --git a/src/test/ui/pattern/bindings-after-at/nested-binding-modes-ref.stderr b/tests/ui/pattern/bindings-after-at/nested-binding-modes-ref.stderr
index b378fe356..b378fe356 100644
--- a/src/test/ui/pattern/bindings-after-at/nested-binding-modes-ref.stderr
+++ b/tests/ui/pattern/bindings-after-at/nested-binding-modes-ref.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/nested-patterns.rs b/tests/ui/pattern/bindings-after-at/nested-patterns.rs
index f06563d56..f06563d56 100644
--- a/src/test/ui/pattern/bindings-after-at/nested-patterns.rs
+++ b/tests/ui/pattern/bindings-after-at/nested-patterns.rs
diff --git a/src/test/ui/pattern/bindings-after-at/nested-type-ascription-syntactically-invalid.rs b/tests/ui/pattern/bindings-after-at/nested-type-ascription-syntactically-invalid.rs
index a709e34b5..a709e34b5 100644
--- a/src/test/ui/pattern/bindings-after-at/nested-type-ascription-syntactically-invalid.rs
+++ b/tests/ui/pattern/bindings-after-at/nested-type-ascription-syntactically-invalid.rs
diff --git a/src/test/ui/pattern/bindings-after-at/nested-type-ascription-syntactically-invalid.stderr b/tests/ui/pattern/bindings-after-at/nested-type-ascription-syntactically-invalid.stderr
index 27660ae40..27660ae40 100644
--- a/src/test/ui/pattern/bindings-after-at/nested-type-ascription-syntactically-invalid.stderr
+++ b/tests/ui/pattern/bindings-after-at/nested-type-ascription-syntactically-invalid.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/or-patterns-box-patterns.rs b/tests/ui/pattern/bindings-after-at/or-patterns-box-patterns.rs
index 383e377a5..383e377a5 100644
--- a/src/test/ui/pattern/bindings-after-at/or-patterns-box-patterns.rs
+++ b/tests/ui/pattern/bindings-after-at/or-patterns-box-patterns.rs
diff --git a/src/test/ui/pattern/bindings-after-at/or-patterns-slice-patterns.rs b/tests/ui/pattern/bindings-after-at/or-patterns-slice-patterns.rs
index d315f7ee3..d315f7ee3 100644
--- a/src/test/ui/pattern/bindings-after-at/or-patterns-slice-patterns.rs
+++ b/tests/ui/pattern/bindings-after-at/or-patterns-slice-patterns.rs
diff --git a/src/test/ui/pattern/bindings-after-at/or-patterns.rs b/tests/ui/pattern/bindings-after-at/or-patterns.rs
index fcc361489..fcc361489 100644
--- a/src/test/ui/pattern/bindings-after-at/or-patterns.rs
+++ b/tests/ui/pattern/bindings-after-at/or-patterns.rs
diff --git a/src/test/ui/pattern/bindings-after-at/pat-at-same-name-both.rs b/tests/ui/pattern/bindings-after-at/pat-at-same-name-both.rs
index f167a3952..f167a3952 100644
--- a/src/test/ui/pattern/bindings-after-at/pat-at-same-name-both.rs
+++ b/tests/ui/pattern/bindings-after-at/pat-at-same-name-both.rs
diff --git a/src/test/ui/pattern/bindings-after-at/pat-at-same-name-both.stderr b/tests/ui/pattern/bindings-after-at/pat-at-same-name-both.stderr
index a165549f6..a165549f6 100644
--- a/src/test/ui/pattern/bindings-after-at/pat-at-same-name-both.stderr
+++ b/tests/ui/pattern/bindings-after-at/pat-at-same-name-both.stderr
diff --git a/src/test/ui/pattern/bindings-after-at/slice-patterns.rs b/tests/ui/pattern/bindings-after-at/slice-patterns.rs
index 4f4c96e45..4f4c96e45 100644
--- a/src/test/ui/pattern/bindings-after-at/slice-patterns.rs
+++ b/tests/ui/pattern/bindings-after-at/slice-patterns.rs
diff --git a/src/test/ui/pattern/bindings-after-at/wild-before-at-syntactically-rejected.rs b/tests/ui/pattern/bindings-after-at/wild-before-at-syntactically-rejected.rs
index 50ac0ef27..50ac0ef27 100644
--- a/src/test/ui/pattern/bindings-after-at/wild-before-at-syntactically-rejected.rs
+++ b/tests/ui/pattern/bindings-after-at/wild-before-at-syntactically-rejected.rs
diff --git a/src/test/ui/pattern/bindings-after-at/wild-before-at-syntactically-rejected.stderr b/tests/ui/pattern/bindings-after-at/wild-before-at-syntactically-rejected.stderr
index 2f4541584..2f4541584 100644
--- a/src/test/ui/pattern/bindings-after-at/wild-before-at-syntactically-rejected.stderr
+++ b/tests/ui/pattern/bindings-after-at/wild-before-at-syntactically-rejected.stderr
diff --git a/src/test/ui/pattern/for-loop-bad-item.rs b/tests/ui/pattern/for-loop-bad-item.rs
index 9a56a399b..9a56a399b 100644
--- a/src/test/ui/pattern/for-loop-bad-item.rs
+++ b/tests/ui/pattern/for-loop-bad-item.rs
diff --git a/src/test/ui/pattern/for-loop-bad-item.stderr b/tests/ui/pattern/for-loop-bad-item.stderr
index f064a25a9..f064a25a9 100644
--- a/src/test/ui/pattern/for-loop-bad-item.stderr
+++ b/tests/ui/pattern/for-loop-bad-item.stderr
diff --git a/src/test/ui/pattern/ignore-all-the-things.rs b/tests/ui/pattern/ignore-all-the-things.rs
index 5980e1a85..5980e1a85 100644
--- a/src/test/ui/pattern/ignore-all-the-things.rs
+++ b/tests/ui/pattern/ignore-all-the-things.rs
diff --git a/src/test/ui/pattern/integer-range-binding.rs b/tests/ui/pattern/integer-range-binding.rs
index ff065882d..ff065882d 100644
--- a/src/test/ui/pattern/integer-range-binding.rs
+++ b/tests/ui/pattern/integer-range-binding.rs
diff --git a/src/test/ui/pattern/issue-10392.rs b/tests/ui/pattern/issue-10392.rs
index 926fa9480..926fa9480 100644
--- a/src/test/ui/pattern/issue-10392.rs
+++ b/tests/ui/pattern/issue-10392.rs
diff --git a/tests/ui/pattern/issue-106552.rs b/tests/ui/pattern/issue-106552.rs
new file mode 100644
index 000000000..aa2c141e0
--- /dev/null
+++ b/tests/ui/pattern/issue-106552.rs
@@ -0,0 +1,7 @@
+fn main() {
+    let 5 = 6;
+    //~^ error refutable pattern in local binding [E0005]
+
+    let x @ 5 = 6;
+    //~^ error refutable pattern in local binding [E0005]
+}
diff --git a/tests/ui/pattern/issue-106552.stderr b/tests/ui/pattern/issue-106552.stderr
new file mode 100644
index 000000000..ed5d40c09
--- /dev/null
+++ b/tests/ui/pattern/issue-106552.stderr
@@ -0,0 +1,35 @@
+error[E0005]: refutable pattern in local binding
+  --> $DIR/issue-106552.rs:2:9
+   |
+LL |     let 5 = 6;
+   |         ^ patterns `i32::MIN..=4_i32` and `6_i32..=i32::MAX` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+   = note: the matched value is of type `i32`
+help: you might want to use `if let` to ignore the variants that aren't matched
+   |
+LL |     if let 5 = 6 { todo!() }
+   |     ++           ~~~~~~~~~~~
+help: alternatively, you could prepend the pattern with an underscore to define a new named variable; identifiers cannot begin with digits
+   |
+LL |     let _5 = 6;
+   |         +
+
+error[E0005]: refutable pattern in local binding
+  --> $DIR/issue-106552.rs:5:9
+   |
+LL |     let x @ 5 = 6;
+   |         ^^^^^ patterns `i32::MIN..=4_i32` and `6_i32..=i32::MAX` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+   = note: the matched value is of type `i32`
+help: you might want to use `let else` to handle the variants that aren't matched
+   |
+LL |     let x @ 5 = 6 else { todo!() };
+   |                   ++++++++++++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/pattern/issue-11577.rs b/tests/ui/pattern/issue-11577.rs
index 70177c5ed..70177c5ed 100644
--- a/src/test/ui/pattern/issue-11577.rs
+++ b/tests/ui/pattern/issue-11577.rs
diff --git a/src/test/ui/pattern/issue-12582.rs b/tests/ui/pattern/issue-12582.rs
index f3366704e..f3366704e 100644
--- a/src/test/ui/pattern/issue-12582.rs
+++ b/tests/ui/pattern/issue-12582.rs
diff --git a/tests/ui/pattern/issue-14221.rs b/tests/ui/pattern/issue-14221.rs
new file mode 100644
index 000000000..13427d2c9
--- /dev/null
+++ b/tests/ui/pattern/issue-14221.rs
@@ -0,0 +1,21 @@
+#![deny(unreachable_patterns)]
+#![allow(unused_variables)]
+#![allow(non_snake_case)]
+
+pub enum E {
+    A,
+    B,
+}
+
+pub mod b {
+    pub fn key(e: ::E) -> &'static str {
+        match e {
+            A => "A",
+//~^ ERROR pattern binding `A` is named the same as one of the variants of the type `E`
+            B => "B", //~ ERROR: unreachable pattern
+//~^ ERROR pattern binding `B` is named the same as one of the variants of the type `E`
+        }
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/pattern/issue-14221.stderr b/tests/ui/pattern/issue-14221.stderr
new file mode 100644
index 000000000..7ea51b5f8
--- /dev/null
+++ b/tests/ui/pattern/issue-14221.stderr
@@ -0,0 +1,32 @@
+error[E0170]: pattern binding `A` is named the same as one of the variants of the type `E`
+  --> $DIR/issue-14221.rs:13:13
+   |
+LL |             A => "A",
+   |             ^ help: to match on the variant, qualify the path: `E::A`
+   |
+   = note: `#[deny(bindings_with_variant_name)]` on by default
+
+error[E0170]: pattern binding `B` is named the same as one of the variants of the type `E`
+  --> $DIR/issue-14221.rs:15:13
+   |
+LL |             B => "B",
+   |             ^ help: to match on the variant, qualify the path: `E::B`
+
+error: unreachable pattern
+  --> $DIR/issue-14221.rs:15:13
+   |
+LL |             A => "A",
+   |             - matches any value
+LL |
+LL |             B => "B",
+   |             ^ unreachable pattern
+   |
+note: the lint level is defined here
+  --> $DIR/issue-14221.rs:1:9
+   |
+LL | #![deny(unreachable_patterns)]
+   |         ^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0170`.
diff --git a/src/test/ui/pattern/issue-15080.rs b/tests/ui/pattern/issue-15080.rs
index 4dd6981d4..4dd6981d4 100644
--- a/src/test/ui/pattern/issue-15080.rs
+++ b/tests/ui/pattern/issue-15080.rs
diff --git a/src/test/ui/pattern/issue-17718-patterns.rs b/tests/ui/pattern/issue-17718-patterns.rs
index 2ca0f67f8..2ca0f67f8 100644
--- a/src/test/ui/pattern/issue-17718-patterns.rs
+++ b/tests/ui/pattern/issue-17718-patterns.rs
diff --git a/src/test/ui/pattern/issue-17718-patterns.stderr b/tests/ui/pattern/issue-17718-patterns.stderr
index 109091c2a..109091c2a 100644
--- a/src/test/ui/pattern/issue-17718-patterns.stderr
+++ b/tests/ui/pattern/issue-17718-patterns.stderr
diff --git a/src/test/ui/pattern/issue-22546.rs b/tests/ui/pattern/issue-22546.rs
index c26e457f9..c26e457f9 100644
--- a/src/test/ui/pattern/issue-22546.rs
+++ b/tests/ui/pattern/issue-22546.rs
diff --git a/src/test/ui/pattern/issue-27320.rs b/tests/ui/pattern/issue-27320.rs
index d1aa56b91..d1aa56b91 100644
--- a/src/test/ui/pattern/issue-27320.rs
+++ b/tests/ui/pattern/issue-27320.rs
diff --git a/src/test/ui/pattern/issue-52240.rs b/tests/ui/pattern/issue-52240.rs
index 5def55778..5def55778 100644
--- a/src/test/ui/pattern/issue-52240.rs
+++ b/tests/ui/pattern/issue-52240.rs
diff --git a/src/test/ui/pattern/issue-52240.stderr b/tests/ui/pattern/issue-52240.stderr
index 69b663b17..69b663b17 100644
--- a/src/test/ui/pattern/issue-52240.stderr
+++ b/tests/ui/pattern/issue-52240.stderr
diff --git a/src/test/ui/pattern/issue-6449.rs b/tests/ui/pattern/issue-6449.rs
index bfd4c1232..bfd4c1232 100644
--- a/src/test/ui/pattern/issue-6449.rs
+++ b/tests/ui/pattern/issue-6449.rs
diff --git a/src/test/ui/pattern/issue-66270-pat-struct-parser-recovery.rs b/tests/ui/pattern/issue-66270-pat-struct-parser-recovery.rs
index 48a8e0482..48a8e0482 100644
--- a/src/test/ui/pattern/issue-66270-pat-struct-parser-recovery.rs
+++ b/tests/ui/pattern/issue-66270-pat-struct-parser-recovery.rs
diff --git a/src/test/ui/pattern/issue-66270-pat-struct-parser-recovery.stderr b/tests/ui/pattern/issue-66270-pat-struct-parser-recovery.stderr
index f40642f30..f40642f30 100644
--- a/src/test/ui/pattern/issue-66270-pat-struct-parser-recovery.stderr
+++ b/tests/ui/pattern/issue-66270-pat-struct-parser-recovery.stderr
diff --git a/src/test/ui/pattern/issue-67037-pat-tup-scrut-ty-diff-less-fields.rs b/tests/ui/pattern/issue-67037-pat-tup-scrut-ty-diff-less-fields.rs
index ae28c1403..ae28c1403 100644
--- a/src/test/ui/pattern/issue-67037-pat-tup-scrut-ty-diff-less-fields.rs
+++ b/tests/ui/pattern/issue-67037-pat-tup-scrut-ty-diff-less-fields.rs
diff --git a/src/test/ui/pattern/issue-67037-pat-tup-scrut-ty-diff-less-fields.stderr b/tests/ui/pattern/issue-67037-pat-tup-scrut-ty-diff-less-fields.stderr
index 75a231f6b..75a231f6b 100644
--- a/src/test/ui/pattern/issue-67037-pat-tup-scrut-ty-diff-less-fields.stderr
+++ b/tests/ui/pattern/issue-67037-pat-tup-scrut-ty-diff-less-fields.stderr
diff --git a/tests/ui/pattern/issue-67776-match-same-name-enum-variant-refs.rs b/tests/ui/pattern/issue-67776-match-same-name-enum-variant-refs.rs
new file mode 100644
index 000000000..05d097eaf
--- /dev/null
+++ b/tests/ui/pattern/issue-67776-match-same-name-enum-variant-refs.rs
@@ -0,0 +1,40 @@
+// Test for issue #67776: binding named the same as enum variant
+// should report an error even when matching against a reference type
+
+#![allow(unused_variables)]
+#![allow(non_snake_case)]
+
+enum Foo {
+    Bar,
+    Baz,
+}
+
+
+fn fn1(e: Foo) {
+    match e {
+        Bar => {},
+        //~^ ERROR named the same as one of the variants of the type `Foo`
+        Baz => {},
+        //~^ ERROR named the same as one of the variants of the type `Foo`
+    }
+}
+
+fn fn2(e: &Foo) {
+    match e {
+        Bar => {},
+        //~^ ERROR named the same as one of the variants of the type `Foo`
+        Baz => {},
+        //~^ ERROR named the same as one of the variants of the type `Foo`
+    }
+}
+
+fn fn3(e: &mut &&mut Foo) {
+    match e {
+        Bar => {},
+        //~^ ERROR named the same as one of the variants of the type `Foo`
+        Baz => {},
+        //~^ ERROR named the same as one of the variants of the type `Foo`
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/pattern/issue-67776-match-same-name-enum-variant-refs.stderr b/tests/ui/pattern/issue-67776-match-same-name-enum-variant-refs.stderr
new file mode 100644
index 000000000..da580c7ac
--- /dev/null
+++ b/tests/ui/pattern/issue-67776-match-same-name-enum-variant-refs.stderr
@@ -0,0 +1,41 @@
+error[E0170]: pattern binding `Bar` is named the same as one of the variants of the type `Foo`
+  --> $DIR/issue-67776-match-same-name-enum-variant-refs.rs:15:9
+   |
+LL |         Bar => {},
+   |         ^^^ help: to match on the variant, qualify the path: `Foo::Bar`
+   |
+   = note: `#[deny(bindings_with_variant_name)]` on by default
+
+error[E0170]: pattern binding `Baz` is named the same as one of the variants of the type `Foo`
+  --> $DIR/issue-67776-match-same-name-enum-variant-refs.rs:17:9
+   |
+LL |         Baz => {},
+   |         ^^^ help: to match on the variant, qualify the path: `Foo::Baz`
+
+error[E0170]: pattern binding `Bar` is named the same as one of the variants of the type `Foo`
+  --> $DIR/issue-67776-match-same-name-enum-variant-refs.rs:24:9
+   |
+LL |         Bar => {},
+   |         ^^^ help: to match on the variant, qualify the path: `Foo::Bar`
+
+error[E0170]: pattern binding `Baz` is named the same as one of the variants of the type `Foo`
+  --> $DIR/issue-67776-match-same-name-enum-variant-refs.rs:26:9
+   |
+LL |         Baz => {},
+   |         ^^^ help: to match on the variant, qualify the path: `Foo::Baz`
+
+error[E0170]: pattern binding `Bar` is named the same as one of the variants of the type `Foo`
+  --> $DIR/issue-67776-match-same-name-enum-variant-refs.rs:33:9
+   |
+LL |         Bar => {},
+   |         ^^^ help: to match on the variant, qualify the path: `Foo::Bar`
+
+error[E0170]: pattern binding `Baz` is named the same as one of the variants of the type `Foo`
+  --> $DIR/issue-67776-match-same-name-enum-variant-refs.rs:35:9
+   |
+LL |         Baz => {},
+   |         ^^^ help: to match on the variant, qualify the path: `Foo::Baz`
+
+error: aborting due to 6 previous errors
+
+For more information about this error, try `rustc --explain E0170`.
diff --git a/src/test/ui/pattern/issue-68393-let-pat-assoc-constant.rs b/tests/ui/pattern/issue-68393-let-pat-assoc-constant.rs
index 95ead6b5d..95ead6b5d 100644
--- a/src/test/ui/pattern/issue-68393-let-pat-assoc-constant.rs
+++ b/tests/ui/pattern/issue-68393-let-pat-assoc-constant.rs
diff --git a/src/test/ui/pattern/issue-68393-let-pat-assoc-constant.stderr b/tests/ui/pattern/issue-68393-let-pat-assoc-constant.stderr
index 54ecc2498..54ecc2498 100644
--- a/src/test/ui/pattern/issue-68393-let-pat-assoc-constant.stderr
+++ b/tests/ui/pattern/issue-68393-let-pat-assoc-constant.stderr
diff --git a/src/test/ui/pattern/issue-72565.rs b/tests/ui/pattern/issue-72565.rs
index 1e262fd50..1e262fd50 100644
--- a/src/test/ui/pattern/issue-72565.rs
+++ b/tests/ui/pattern/issue-72565.rs
diff --git a/src/test/ui/pattern/issue-72565.stderr b/tests/ui/pattern/issue-72565.stderr
index 2f82616b2..2f82616b2 100644
--- a/src/test/ui/pattern/issue-72565.stderr
+++ b/tests/ui/pattern/issue-72565.stderr
diff --git a/src/test/ui/pattern/issue-72574-1.rs b/tests/ui/pattern/issue-72574-1.rs
index 1b80a2179..1b80a2179 100644
--- a/src/test/ui/pattern/issue-72574-1.rs
+++ b/tests/ui/pattern/issue-72574-1.rs
diff --git a/src/test/ui/pattern/issue-72574-1.stderr b/tests/ui/pattern/issue-72574-1.stderr
index 653869a23..653869a23 100644
--- a/src/test/ui/pattern/issue-72574-1.stderr
+++ b/tests/ui/pattern/issue-72574-1.stderr
diff --git a/src/test/ui/pattern/issue-72574-2.rs b/tests/ui/pattern/issue-72574-2.rs
index 0ad2db848..0ad2db848 100644
--- a/src/test/ui/pattern/issue-72574-2.rs
+++ b/tests/ui/pattern/issue-72574-2.rs
diff --git a/src/test/ui/pattern/issue-72574-2.stderr b/tests/ui/pattern/issue-72574-2.stderr
index 05650f05c..05650f05c 100644
--- a/src/test/ui/pattern/issue-72574-2.stderr
+++ b/tests/ui/pattern/issue-72574-2.stderr
diff --git a/src/test/ui/pattern/issue-74539.rs b/tests/ui/pattern/issue-74539.rs
index 0b25f87ec..0b25f87ec 100644
--- a/src/test/ui/pattern/issue-74539.rs
+++ b/tests/ui/pattern/issue-74539.rs
diff --git a/src/test/ui/pattern/issue-74539.stderr b/tests/ui/pattern/issue-74539.stderr
index 7443946c0..7443946c0 100644
--- a/src/test/ui/pattern/issue-74539.stderr
+++ b/tests/ui/pattern/issue-74539.stderr
diff --git a/src/test/ui/pattern/issue-74702.rs b/tests/ui/pattern/issue-74702.rs
index 0aeb3b217..0aeb3b217 100644
--- a/src/test/ui/pattern/issue-74702.rs
+++ b/tests/ui/pattern/issue-74702.rs
diff --git a/src/test/ui/pattern/issue-74702.stderr b/tests/ui/pattern/issue-74702.stderr
index f2e2c8f02..f2e2c8f02 100644
--- a/src/test/ui/pattern/issue-74702.stderr
+++ b/tests/ui/pattern/issue-74702.stderr
diff --git a/src/test/ui/pattern/issue-74954.rs b/tests/ui/pattern/issue-74954.rs
index 269ec3c7a..269ec3c7a 100644
--- a/src/test/ui/pattern/issue-74954.rs
+++ b/tests/ui/pattern/issue-74954.rs
diff --git a/src/test/ui/pattern/issue-80186-mut-binding-help-suggestion.rs b/tests/ui/pattern/issue-80186-mut-binding-help-suggestion.rs
index a5e9b1db5..a5e9b1db5 100644
--- a/src/test/ui/pattern/issue-80186-mut-binding-help-suggestion.rs
+++ b/tests/ui/pattern/issue-80186-mut-binding-help-suggestion.rs
diff --git a/src/test/ui/pattern/issue-80186-mut-binding-help-suggestion.stderr b/tests/ui/pattern/issue-80186-mut-binding-help-suggestion.stderr
index 75b6c163b..75b6c163b 100644
--- a/src/test/ui/pattern/issue-80186-mut-binding-help-suggestion.stderr
+++ b/tests/ui/pattern/issue-80186-mut-binding-help-suggestion.stderr
diff --git a/src/test/ui/pattern/issue-8351-1.rs b/tests/ui/pattern/issue-8351-1.rs
index 139f027cb..139f027cb 100644
--- a/src/test/ui/pattern/issue-8351-1.rs
+++ b/tests/ui/pattern/issue-8351-1.rs
diff --git a/src/test/ui/pattern/issue-8351-2.rs b/tests/ui/pattern/issue-8351-2.rs
index bc66cbb77..bc66cbb77 100644
--- a/src/test/ui/pattern/issue-8351-2.rs
+++ b/tests/ui/pattern/issue-8351-2.rs
diff --git a/src/test/ui/pattern/issue-88074-pat-range-type-inference-err.rs b/tests/ui/pattern/issue-88074-pat-range-type-inference-err.rs
index 16df272df..16df272df 100644
--- a/src/test/ui/pattern/issue-88074-pat-range-type-inference-err.rs
+++ b/tests/ui/pattern/issue-88074-pat-range-type-inference-err.rs
diff --git a/src/test/ui/pattern/issue-88074-pat-range-type-inference-err.stderr b/tests/ui/pattern/issue-88074-pat-range-type-inference-err.stderr
index 8e528f8c1..8e528f8c1 100644
--- a/src/test/ui/pattern/issue-88074-pat-range-type-inference-err.stderr
+++ b/tests/ui/pattern/issue-88074-pat-range-type-inference-err.stderr
diff --git a/src/test/ui/pattern/issue-88074-pat-range-type-inference.rs b/tests/ui/pattern/issue-88074-pat-range-type-inference.rs
index 27db7d8c7..27db7d8c7 100644
--- a/src/test/ui/pattern/issue-88074-pat-range-type-inference.rs
+++ b/tests/ui/pattern/issue-88074-pat-range-type-inference.rs
diff --git a/src/test/ui/pattern/issue-92074-macro-ice.rs b/tests/ui/pattern/issue-92074-macro-ice.rs
index 039d3b314..039d3b314 100644
--- a/src/test/ui/pattern/issue-92074-macro-ice.rs
+++ b/tests/ui/pattern/issue-92074-macro-ice.rs
diff --git a/src/test/ui/pattern/issue-92074-macro-ice.stderr b/tests/ui/pattern/issue-92074-macro-ice.stderr
index b340afff0..b340afff0 100644
--- a/src/test/ui/pattern/issue-92074-macro-ice.stderr
+++ b/tests/ui/pattern/issue-92074-macro-ice.stderr
diff --git a/src/test/ui/pattern/issue-95878.rs b/tests/ui/pattern/issue-95878.rs
index f59814468..f59814468 100644
--- a/src/test/ui/pattern/issue-95878.rs
+++ b/tests/ui/pattern/issue-95878.rs
diff --git a/src/test/ui/pattern/issue-95878.stderr b/tests/ui/pattern/issue-95878.stderr
index e0eea06e0..e0eea06e0 100644
--- a/src/test/ui/pattern/issue-95878.stderr
+++ b/tests/ui/pattern/issue-95878.stderr
diff --git a/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern-pass.rs b/tests/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern-pass.rs
index 5445696fd..5445696fd 100644
--- a/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern-pass.rs
+++ b/tests/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern-pass.rs
diff --git a/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.rs b/tests/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.rs
index a6144c949..a6144c949 100644
--- a/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.rs
+++ b/tests/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.rs
diff --git a/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.stderr b/tests/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.stderr
index bb7b81836..1b93267b3 100644
--- a/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.stderr
+++ b/tests/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.stderr
@@ -104,20 +104,24 @@ LL |     *_x0 = U;
 error[E0594]: cannot assign to `*_x0`, which is behind a `&` reference
   --> $DIR/borrowck-move-ref-pattern.rs:26:5
    |
-LL |     let (ref _x0, _x1, ref _x2, ..) = tup;
-   |          ------- help: consider changing this to be a mutable reference: `ref mut _x0`
-...
 LL |     *_x0 = U;
    |     ^^^^^^^^ `_x0` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let (ref mut _x0, _x1, ref _x2, ..) = tup;
+   |          ~~~~~~~~~~~
 
 error[E0594]: cannot assign to `*_x2`, which is behind a `&` reference
   --> $DIR/borrowck-move-ref-pattern.rs:27:5
    |
-LL |     let (ref _x0, _x1, ref _x2, ..) = tup;
-   |                        ------- help: consider changing this to be a mutable reference: `ref mut _x2`
-...
 LL |     *_x2 = U;
    |     ^^^^^^^^ `_x2` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let (ref _x0, _x1, ref mut _x2, ..) = tup;
+   |                        ~~~~~~~~~~~
 
 error[E0382]: use of moved value: `tup.1`
   --> $DIR/borrowck-move-ref-pattern.rs:28:10
diff --git a/src/test/ui/pattern/move-ref-patterns/by-move-sub-pat-unreachable.rs b/tests/ui/pattern/move-ref-patterns/by-move-sub-pat-unreachable.rs
index ff7b625a6..ff7b625a6 100644
--- a/src/test/ui/pattern/move-ref-patterns/by-move-sub-pat-unreachable.rs
+++ b/tests/ui/pattern/move-ref-patterns/by-move-sub-pat-unreachable.rs
diff --git a/src/test/ui/pattern/move-ref-patterns/issue-53840.rs b/tests/ui/pattern/move-ref-patterns/issue-53840.rs
index 80effc497..80effc497 100644
--- a/src/test/ui/pattern/move-ref-patterns/issue-53840.rs
+++ b/tests/ui/pattern/move-ref-patterns/issue-53840.rs
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.rs b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.rs
index ebb1683af..ebb1683af 100644
--- a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.rs
+++ b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.rs
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.stderr b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.stderr
index f19fed089..f19fed089 100644
--- a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.stderr
+++ b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.stderr
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-pass.rs b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-pass.rs
index 583f70f41..583f70f41 100644
--- a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-pass.rs
+++ b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-pass.rs
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.rs b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.rs
index cd619cc41..cd619cc41 100644
--- a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.rs
+++ b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.rs
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.stderr b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.stderr
index eba65a618..eba65a618 100644
--- a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.stderr
+++ b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.stderr
diff --git a/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes-fixable.fixed b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes-fixable.fixed
new file mode 100644
index 000000000..5f04fc83d
--- /dev/null
+++ b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes-fixable.fixed
@@ -0,0 +1,12 @@
+// run-rustfix
+#![allow(unused_variables)]
+fn main() {
+    struct U;
+
+    // A tuple is a "non-reference pattern".
+    // A `mut` binding pattern resets the binding mode to by-value.
+
+    let mut p = (U, U);
+    let (a, ref mut b) = &mut p;
+    //~^ ERROR cannot move out of a mutable reference
+}
diff --git a/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes-fixable.rs b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes-fixable.rs
new file mode 100644
index 000000000..5dc1ae2fe
--- /dev/null
+++ b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes-fixable.rs
@@ -0,0 +1,12 @@
+// run-rustfix
+#![allow(unused_variables)]
+fn main() {
+    struct U;
+
+    // A tuple is a "non-reference pattern".
+    // A `mut` binding pattern resets the binding mode to by-value.
+
+    let mut p = (U, U);
+    let (a, mut b) = &mut p;
+    //~^ ERROR cannot move out of a mutable reference
+}
diff --git a/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes-fixable.stderr b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes-fixable.stderr
new file mode 100644
index 000000000..d3ab533e3
--- /dev/null
+++ b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes-fixable.stderr
@@ -0,0 +1,17 @@
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/move-ref-patterns-default-binding-modes-fixable.rs:10:22
+   |
+LL |     let (a, mut b) = &mut p;
+   |             -----    ^^^^^^
+   |             |
+   |             data moved here
+   |             move occurs because `b` has type `U`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     let (a, ref mut b) = &mut p;
+   |             +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.rs b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.rs
new file mode 100644
index 000000000..6c913c245
--- /dev/null
+++ b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.rs
@@ -0,0 +1,10 @@
+fn main() {
+    struct U;
+
+    // A tuple is a "non-reference pattern".
+    // A `mut` binding pattern resets the binding mode to by-value.
+
+    let p = (U, U);
+    let (a, mut b) = &p;
+    //~^ ERROR cannot move out of a shared reference
+}
diff --git a/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.stderr b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.stderr
new file mode 100644
index 000000000..65030b622
--- /dev/null
+++ b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.stderr
@@ -0,0 +1,17 @@
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/move-ref-patterns-default-binding-modes.rs:8:22
+   |
+LL |     let (a, mut b) = &p;
+   |             -----    ^^
+   |             |
+   |             data moved here
+   |             move occurs because `b` has type `U`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     let (a, ref mut b) = &p;
+   |             +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-dynamic-semantics.rs b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-dynamic-semantics.rs
index 1d6d9acea..1d6d9acea 100644
--- a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-dynamic-semantics.rs
+++ b/tests/ui/pattern/move-ref-patterns/move-ref-patterns-dynamic-semantics.rs
diff --git a/src/test/ui/pattern/non-constant-in-const-path.rs b/tests/ui/pattern/non-constant-in-const-path.rs
index 3918485ba..3918485ba 100644
--- a/src/test/ui/pattern/non-constant-in-const-path.rs
+++ b/tests/ui/pattern/non-constant-in-const-path.rs
diff --git a/src/test/ui/pattern/non-constant-in-const-path.stderr b/tests/ui/pattern/non-constant-in-const-path.stderr
index 53c3974f7..53c3974f7 100644
--- a/src/test/ui/pattern/non-constant-in-const-path.stderr
+++ b/tests/ui/pattern/non-constant-in-const-path.stderr
diff --git a/src/test/ui/pattern/non-structural-match-types.rs b/tests/ui/pattern/non-structural-match-types.rs
index 5c3315473..5c3315473 100644
--- a/src/test/ui/pattern/non-structural-match-types.rs
+++ b/tests/ui/pattern/non-structural-match-types.rs
diff --git a/src/test/ui/pattern/non-structural-match-types.stderr b/tests/ui/pattern/non-structural-match-types.stderr
index dea7c4695..dea7c4695 100644
--- a/src/test/ui/pattern/non-structural-match-types.stderr
+++ b/tests/ui/pattern/non-structural-match-types.stderr
diff --git a/src/test/ui/pattern/pat-shadow-in-nested-binding.rs b/tests/ui/pattern/pat-shadow-in-nested-binding.rs
index 7badbb6b9..7badbb6b9 100644
--- a/src/test/ui/pattern/pat-shadow-in-nested-binding.rs
+++ b/tests/ui/pattern/pat-shadow-in-nested-binding.rs
diff --git a/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr b/tests/ui/pattern/pat-shadow-in-nested-binding.stderr
index 0c5824be9..0c5824be9 100644
--- a/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr
+++ b/tests/ui/pattern/pat-shadow-in-nested-binding.stderr
diff --git a/src/test/ui/pattern/pat-struct-field-expr-has-type.rs b/tests/ui/pattern/pat-struct-field-expr-has-type.rs
index 1d18214de..1d18214de 100644
--- a/src/test/ui/pattern/pat-struct-field-expr-has-type.rs
+++ b/tests/ui/pattern/pat-struct-field-expr-has-type.rs
diff --git a/src/test/ui/pattern/pat-struct-field-expr-has-type.stderr b/tests/ui/pattern/pat-struct-field-expr-has-type.stderr
index 3a61d4293..3a61d4293 100644
--- a/src/test/ui/pattern/pat-struct-field-expr-has-type.stderr
+++ b/tests/ui/pattern/pat-struct-field-expr-has-type.stderr
diff --git a/src/test/ui/pattern/pat-tuple-bad-type.rs b/tests/ui/pattern/pat-tuple-bad-type.rs
index 98481167a..98481167a 100644
--- a/src/test/ui/pattern/pat-tuple-bad-type.rs
+++ b/tests/ui/pattern/pat-tuple-bad-type.rs
diff --git a/src/test/ui/pattern/pat-tuple-bad-type.stderr b/tests/ui/pattern/pat-tuple-bad-type.stderr
index 3342b8e40..da369d333 100644
--- a/src/test/ui/pattern/pat-tuple-bad-type.stderr
+++ b/tests/ui/pattern/pat-tuple-bad-type.stderr
@@ -9,8 +9,8 @@ LL |         (..) => {}
    |
 help: consider giving `x` an explicit type
    |
-LL |     let x: _;
-   |          +++
+LL |     let x: /* Type */;
+   |          ++++++++++++
 
 error[E0308]: mismatched types
   --> $DIR/pat-tuple-bad-type.rs:10:9
diff --git a/src/test/ui/pattern/pat-tuple-field-count-cross.rs b/tests/ui/pattern/pat-tuple-field-count-cross.rs
index b63da4e15..b63da4e15 100644
--- a/src/test/ui/pattern/pat-tuple-field-count-cross.rs
+++ b/tests/ui/pattern/pat-tuple-field-count-cross.rs
diff --git a/src/test/ui/pattern/pat-tuple-field-count-cross.stderr b/tests/ui/pattern/pat-tuple-field-count-cross.stderr
index d92957461..d92957461 100644
--- a/src/test/ui/pattern/pat-tuple-field-count-cross.stderr
+++ b/tests/ui/pattern/pat-tuple-field-count-cross.stderr
diff --git a/src/test/ui/pattern/pat-tuple-overfield.rs b/tests/ui/pattern/pat-tuple-overfield.rs
index c863c6575..c863c6575 100644
--- a/src/test/ui/pattern/pat-tuple-overfield.rs
+++ b/tests/ui/pattern/pat-tuple-overfield.rs
diff --git a/src/test/ui/pattern/pat-tuple-overfield.stderr b/tests/ui/pattern/pat-tuple-overfield.stderr
index 54d89e031..54d89e031 100644
--- a/src/test/ui/pattern/pat-tuple-overfield.stderr
+++ b/tests/ui/pattern/pat-tuple-overfield.stderr
diff --git a/src/test/ui/pattern/pat-tuple-underfield.rs b/tests/ui/pattern/pat-tuple-underfield.rs
index dac60e3fa..dac60e3fa 100644
--- a/src/test/ui/pattern/pat-tuple-underfield.rs
+++ b/tests/ui/pattern/pat-tuple-underfield.rs
diff --git a/src/test/ui/pattern/pat-tuple-underfield.stderr b/tests/ui/pattern/pat-tuple-underfield.stderr
index e75f9b38d..e75f9b38d 100644
--- a/src/test/ui/pattern/pat-tuple-underfield.stderr
+++ b/tests/ui/pattern/pat-tuple-underfield.stderr
diff --git a/src/test/ui/pattern/pat-type-err-formal-param.rs b/tests/ui/pattern/pat-type-err-formal-param.rs
index 54336b349..54336b349 100644
--- a/src/test/ui/pattern/pat-type-err-formal-param.rs
+++ b/tests/ui/pattern/pat-type-err-formal-param.rs
diff --git a/src/test/ui/pattern/pat-type-err-formal-param.stderr b/tests/ui/pattern/pat-type-err-formal-param.stderr
index 206713a4b..206713a4b 100644
--- a/src/test/ui/pattern/pat-type-err-formal-param.stderr
+++ b/tests/ui/pattern/pat-type-err-formal-param.stderr
diff --git a/src/test/ui/pattern/pat-type-err-let-stmt.rs b/tests/ui/pattern/pat-type-err-let-stmt.rs
index 6e9850b65..6e9850b65 100644
--- a/src/test/ui/pattern/pat-type-err-let-stmt.rs
+++ b/tests/ui/pattern/pat-type-err-let-stmt.rs
diff --git a/src/test/ui/pattern/pat-type-err-let-stmt.stderr b/tests/ui/pattern/pat-type-err-let-stmt.stderr
index 090bd6711..090bd6711 100644
--- a/src/test/ui/pattern/pat-type-err-let-stmt.stderr
+++ b/tests/ui/pattern/pat-type-err-let-stmt.stderr
diff --git a/src/test/ui/pattern/patkind-litrange-no-expr.rs b/tests/ui/pattern/patkind-litrange-no-expr.rs
index 7ef541cb5..7ef541cb5 100644
--- a/src/test/ui/pattern/patkind-litrange-no-expr.rs
+++ b/tests/ui/pattern/patkind-litrange-no-expr.rs
diff --git a/src/test/ui/pattern/patkind-litrange-no-expr.stderr b/tests/ui/pattern/patkind-litrange-no-expr.stderr
index eb1ee7e45..eb1ee7e45 100644
--- a/src/test/ui/pattern/patkind-litrange-no-expr.stderr
+++ b/tests/ui/pattern/patkind-litrange-no-expr.stderr
diff --git a/src/test/ui/pattern/pattern-binding-disambiguation.rs b/tests/ui/pattern/pattern-binding-disambiguation.rs
index ce1d8c6c0..ce1d8c6c0 100644
--- a/src/test/ui/pattern/pattern-binding-disambiguation.rs
+++ b/tests/ui/pattern/pattern-binding-disambiguation.rs
diff --git a/src/test/ui/pattern/pattern-binding-disambiguation.stderr b/tests/ui/pattern/pattern-binding-disambiguation.stderr
index d54467b3c..d54467b3c 100644
--- a/src/test/ui/pattern/pattern-binding-disambiguation.stderr
+++ b/tests/ui/pattern/pattern-binding-disambiguation.stderr
diff --git a/src/test/ui/pattern/pattern-error-continue.rs b/tests/ui/pattern/pattern-error-continue.rs
index 0702a9986..0702a9986 100644
--- a/src/test/ui/pattern/pattern-error-continue.rs
+++ b/tests/ui/pattern/pattern-error-continue.rs
diff --git a/src/test/ui/pattern/pattern-error-continue.stderr b/tests/ui/pattern/pattern-error-continue.stderr
index 4c2eff63a..4c2eff63a 100644
--- a/src/test/ui/pattern/pattern-error-continue.stderr
+++ b/tests/ui/pattern/pattern-error-continue.stderr
diff --git a/src/test/ui/pattern/pattern-ident-path-generics.rs b/tests/ui/pattern/pattern-ident-path-generics.rs
index 48c02623f..48c02623f 100644
--- a/src/test/ui/pattern/pattern-ident-path-generics.rs
+++ b/tests/ui/pattern/pattern-ident-path-generics.rs
diff --git a/src/test/ui/pattern/pattern-ident-path-generics.stderr b/tests/ui/pattern/pattern-ident-path-generics.stderr
index 01b082bd3..01b082bd3 100644
--- a/src/test/ui/pattern/pattern-ident-path-generics.stderr
+++ b/tests/ui/pattern/pattern-ident-path-generics.stderr
diff --git a/src/test/ui/pattern/pattern-tyvar-2.rs b/tests/ui/pattern/pattern-tyvar-2.rs
index 7647c766e..7647c766e 100644
--- a/src/test/ui/pattern/pattern-tyvar-2.rs
+++ b/tests/ui/pattern/pattern-tyvar-2.rs
diff --git a/src/test/ui/pattern/pattern-tyvar-2.stderr b/tests/ui/pattern/pattern-tyvar-2.stderr
index 121817e70..121817e70 100644
--- a/src/test/ui/pattern/pattern-tyvar-2.stderr
+++ b/tests/ui/pattern/pattern-tyvar-2.stderr
diff --git a/src/test/ui/pattern/pattern-tyvar.rs b/tests/ui/pattern/pattern-tyvar.rs
index e2cbf0519..e2cbf0519 100644
--- a/src/test/ui/pattern/pattern-tyvar.rs
+++ b/tests/ui/pattern/pattern-tyvar.rs
diff --git a/src/test/ui/pattern/pattern-tyvar.stderr b/tests/ui/pattern/pattern-tyvar.stderr
index f1e2a9d72..f1e2a9d72 100644
--- a/src/test/ui/pattern/pattern-tyvar.stderr
+++ b/tests/ui/pattern/pattern-tyvar.stderr
diff --git a/src/test/ui/pattern/rest-pat-semantic-disallowed.rs b/tests/ui/pattern/rest-pat-semantic-disallowed.rs
index 156285e0f..156285e0f 100644
--- a/src/test/ui/pattern/rest-pat-semantic-disallowed.rs
+++ b/tests/ui/pattern/rest-pat-semantic-disallowed.rs
diff --git a/src/test/ui/pattern/rest-pat-semantic-disallowed.stderr b/tests/ui/pattern/rest-pat-semantic-disallowed.stderr
index e6a4e5f19..beba7def9 100644
--- a/src/test/ui/pattern/rest-pat-semantic-disallowed.stderr
+++ b/tests/ui/pattern/rest-pat-semantic-disallowed.stderr
@@ -193,8 +193,8 @@ LL |     let x @ ..;
    |
 help: consider giving this pattern a type
    |
-LL |     let x @ ..: _;
-   |               +++
+LL |     let x @ ..: /* Type */;
+   |               ++++++++++++
 
 error: aborting due to 23 previous errors
 
diff --git a/src/test/ui/pattern/rest-pat-syntactic.rs b/tests/ui/pattern/rest-pat-syntactic.rs
index 4da5a2db7..4da5a2db7 100644
--- a/src/test/ui/pattern/rest-pat-syntactic.rs
+++ b/tests/ui/pattern/rest-pat-syntactic.rs
diff --git a/src/test/ui/pattern/rest-pat-syntactic.stderr b/tests/ui/pattern/rest-pat-syntactic.stderr
index 37019b7d5..37019b7d5 100644
--- a/src/test/ui/pattern/rest-pat-syntactic.stderr
+++ b/tests/ui/pattern/rest-pat-syntactic.stderr
diff --git a/src/test/ui/pattern/size-and-align.rs b/tests/ui/pattern/size-and-align.rs
index a32b5de72..a32b5de72 100644
--- a/src/test/ui/pattern/size-and-align.rs
+++ b/tests/ui/pattern/size-and-align.rs
diff --git a/src/test/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.fixed b/tests/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.fixed
index b28dce881..b28dce881 100644
--- a/src/test/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.fixed
+++ b/tests/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.fixed
diff --git a/src/test/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.rs b/tests/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.rs
index 42493a632..42493a632 100644
--- a/src/test/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.rs
+++ b/tests/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.rs
diff --git a/src/test/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.stderr b/tests/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.stderr
index f3dca9bcb..2a016048f 100644
--- a/src/test/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.stderr
+++ b/tests/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.stderr
@@ -6,12 +6,9 @@ LL |     match Some(1) {
    |
 note: `Option<i32>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
+  ::: $SRC_DIR/core/src/option.rs:LL:COL
    |
-LL | pub enum Option<T> {
-   | ------------------
-...
-LL |     None,
-   |     ^^^^ not covered
+   = note: not covered
    = note: the matched value is of type `Option<i32>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
    |
diff --git a/src/test/ui/pattern/usefulness/always-inhabited-union-ref.rs b/tests/ui/pattern/usefulness/always-inhabited-union-ref.rs
index 7d1cac8a4..7d1cac8a4 100644
--- a/src/test/ui/pattern/usefulness/always-inhabited-union-ref.rs
+++ b/tests/ui/pattern/usefulness/always-inhabited-union-ref.rs
diff --git a/src/test/ui/pattern/usefulness/always-inhabited-union-ref.stderr b/tests/ui/pattern/usefulness/always-inhabited-union-ref.stderr
index cd5c283f9..cd5c283f9 100644
--- a/src/test/ui/pattern/usefulness/always-inhabited-union-ref.stderr
+++ b/tests/ui/pattern/usefulness/always-inhabited-union-ref.stderr
diff --git a/src/test/ui/pattern/usefulness/auxiliary/empty.rs b/tests/ui/pattern/usefulness/auxiliary/empty.rs
index 29a03c9e8..29a03c9e8 100644
--- a/src/test/ui/pattern/usefulness/auxiliary/empty.rs
+++ b/tests/ui/pattern/usefulness/auxiliary/empty.rs
diff --git a/src/test/ui/pattern/usefulness/auxiliary/hidden.rs b/tests/ui/pattern/usefulness/auxiliary/hidden.rs
index 364514ba1..364514ba1 100644
--- a/src/test/ui/pattern/usefulness/auxiliary/hidden.rs
+++ b/tests/ui/pattern/usefulness/auxiliary/hidden.rs
diff --git a/src/test/ui/pattern/usefulness/auxiliary/unstable.rs b/tests/ui/pattern/usefulness/auxiliary/unstable.rs
index a06b3a6e4..a06b3a6e4 100644
--- a/src/test/ui/pattern/usefulness/auxiliary/unstable.rs
+++ b/tests/ui/pattern/usefulness/auxiliary/unstable.rs
diff --git a/src/test/ui/pattern/usefulness/const-partial_eq-fallback-ice.rs b/tests/ui/pattern/usefulness/const-partial_eq-fallback-ice.rs
index 02599d7c0..02599d7c0 100644
--- a/src/test/ui/pattern/usefulness/const-partial_eq-fallback-ice.rs
+++ b/tests/ui/pattern/usefulness/const-partial_eq-fallback-ice.rs
diff --git a/src/test/ui/pattern/usefulness/const-partial_eq-fallback-ice.stderr b/tests/ui/pattern/usefulness/const-partial_eq-fallback-ice.stderr
index 358421cd6..358421cd6 100644
--- a/src/test/ui/pattern/usefulness/const-partial_eq-fallback-ice.stderr
+++ b/tests/ui/pattern/usefulness/const-partial_eq-fallback-ice.stderr
diff --git a/src/test/ui/pattern/usefulness/const-pat-ice.rs b/tests/ui/pattern/usefulness/const-pat-ice.rs
index abfacf393..abfacf393 100644
--- a/src/test/ui/pattern/usefulness/const-pat-ice.rs
+++ b/tests/ui/pattern/usefulness/const-pat-ice.rs
diff --git a/src/test/ui/pattern/usefulness/const-private-fields.rs b/tests/ui/pattern/usefulness/const-private-fields.rs
index 06c832ca4..06c832ca4 100644
--- a/src/test/ui/pattern/usefulness/const-private-fields.rs
+++ b/tests/ui/pattern/usefulness/const-private-fields.rs
diff --git a/src/test/ui/pattern/usefulness/consts-opaque.rs b/tests/ui/pattern/usefulness/consts-opaque.rs
index ca4fcd85b..ca4fcd85b 100644
--- a/src/test/ui/pattern/usefulness/consts-opaque.rs
+++ b/tests/ui/pattern/usefulness/consts-opaque.rs
diff --git a/src/test/ui/pattern/usefulness/consts-opaque.stderr b/tests/ui/pattern/usefulness/consts-opaque.stderr
index 35396751a..35396751a 100644
--- a/src/test/ui/pattern/usefulness/consts-opaque.stderr
+++ b/tests/ui/pattern/usefulness/consts-opaque.stderr
diff --git a/src/test/ui/pattern/usefulness/deny-irrefutable-let-patterns.rs b/tests/ui/pattern/usefulness/deny-irrefutable-let-patterns.rs
index c85af7f3b..c85af7f3b 100644
--- a/src/test/ui/pattern/usefulness/deny-irrefutable-let-patterns.rs
+++ b/tests/ui/pattern/usefulness/deny-irrefutable-let-patterns.rs
diff --git a/src/test/ui/pattern/usefulness/deny-irrefutable-let-patterns.stderr b/tests/ui/pattern/usefulness/deny-irrefutable-let-patterns.stderr
index cdb6b5c7a..cdb6b5c7a 100644
--- a/src/test/ui/pattern/usefulness/deny-irrefutable-let-patterns.stderr
+++ b/tests/ui/pattern/usefulness/deny-irrefutable-let-patterns.stderr
diff --git a/src/test/ui/pattern/usefulness/doc-hidden-fields.rs b/tests/ui/pattern/usefulness/doc-hidden-fields.rs
index 4163b87dc..4163b87dc 100644
--- a/src/test/ui/pattern/usefulness/doc-hidden-fields.rs
+++ b/tests/ui/pattern/usefulness/doc-hidden-fields.rs
diff --git a/src/test/ui/pattern/usefulness/doc-hidden-fields.stderr b/tests/ui/pattern/usefulness/doc-hidden-fields.stderr
index f277bfbc8..f277bfbc8 100644
--- a/src/test/ui/pattern/usefulness/doc-hidden-fields.stderr
+++ b/tests/ui/pattern/usefulness/doc-hidden-fields.stderr
diff --git a/src/test/ui/pattern/usefulness/doc-hidden-non-exhaustive.rs b/tests/ui/pattern/usefulness/doc-hidden-non-exhaustive.rs
index 5d4181a30..5d4181a30 100644
--- a/src/test/ui/pattern/usefulness/doc-hidden-non-exhaustive.rs
+++ b/tests/ui/pattern/usefulness/doc-hidden-non-exhaustive.rs
diff --git a/src/test/ui/pattern/usefulness/doc-hidden-non-exhaustive.stderr b/tests/ui/pattern/usefulness/doc-hidden-non-exhaustive.stderr
index b450a9aed..17e1a2304 100644
--- a/src/test/ui/pattern/usefulness/doc-hidden-non-exhaustive.stderr
+++ b/tests/ui/pattern/usefulness/doc-hidden-non-exhaustive.stderr
@@ -66,12 +66,9 @@ LL |     match None {
    |
 note: `Option<HiddenEnum>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
+  ::: $SRC_DIR/core/src/option.rs:LL:COL
    |
-LL | pub enum Option<T> {
-   | ------------------
-...
-LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^^^ not covered
+   = note: not covered
    = note: the matched value is of type `Option<HiddenEnum>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
    |
diff --git a/src/test/ui/pattern/usefulness/empty-match.exhaustive_patterns.stderr b/tests/ui/pattern/usefulness/empty-match.exhaustive_patterns.stderr
index 5e12bc1d2..5e12bc1d2 100644
--- a/src/test/ui/pattern/usefulness/empty-match.exhaustive_patterns.stderr
+++ b/tests/ui/pattern/usefulness/empty-match.exhaustive_patterns.stderr
diff --git a/src/test/ui/pattern/usefulness/empty-match.normal.stderr b/tests/ui/pattern/usefulness/empty-match.normal.stderr
index 5e12bc1d2..5e12bc1d2 100644
--- a/src/test/ui/pattern/usefulness/empty-match.normal.stderr
+++ b/tests/ui/pattern/usefulness/empty-match.normal.stderr
diff --git a/src/test/ui/pattern/usefulness/empty-match.rs b/tests/ui/pattern/usefulness/empty-match.rs
index 9cdc0413b..9cdc0413b 100644
--- a/src/test/ui/pattern/usefulness/empty-match.rs
+++ b/tests/ui/pattern/usefulness/empty-match.rs
diff --git a/src/test/ui/pattern/usefulness/floats.rs b/tests/ui/pattern/usefulness/floats.rs
index 095f5ac9a..095f5ac9a 100644
--- a/src/test/ui/pattern/usefulness/floats.rs
+++ b/tests/ui/pattern/usefulness/floats.rs
diff --git a/src/test/ui/pattern/usefulness/floats.stderr b/tests/ui/pattern/usefulness/floats.stderr
index c926e50b3..c926e50b3 100644
--- a/src/test/ui/pattern/usefulness/floats.stderr
+++ b/tests/ui/pattern/usefulness/floats.stderr
diff --git a/src/test/ui/pattern/usefulness/guards.rs b/tests/ui/pattern/usefulness/guards.rs
index b15440cf6..b15440cf6 100644
--- a/src/test/ui/pattern/usefulness/guards.rs
+++ b/tests/ui/pattern/usefulness/guards.rs
diff --git a/src/test/ui/pattern/usefulness/guards.stderr b/tests/ui/pattern/usefulness/guards.stderr
index 0c1563c16..0c1563c16 100644
--- a/src/test/ui/pattern/usefulness/guards.stderr
+++ b/tests/ui/pattern/usefulness/guards.stderr
diff --git a/src/test/ui/pattern/usefulness/integer-ranges/exhaustiveness.rs b/tests/ui/pattern/usefulness/integer-ranges/exhaustiveness.rs
index 0f5f49c4c..0f5f49c4c 100644
--- a/src/test/ui/pattern/usefulness/integer-ranges/exhaustiveness.rs
+++ b/tests/ui/pattern/usefulness/integer-ranges/exhaustiveness.rs
diff --git a/src/test/ui/pattern/usefulness/integer-ranges/exhaustiveness.stderr b/tests/ui/pattern/usefulness/integer-ranges/exhaustiveness.stderr
index f30ba05df..f30ba05df 100644
--- a/src/test/ui/pattern/usefulness/integer-ranges/exhaustiveness.stderr
+++ b/tests/ui/pattern/usefulness/integer-ranges/exhaustiveness.stderr
diff --git a/src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.rs b/tests/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.rs
index 5ea92b070..5ea92b070 100644
--- a/src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.rs
+++ b/tests/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.rs
diff --git a/src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.stderr b/tests/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.stderr
index ea0e8f6e4..ea0e8f6e4 100644
--- a/src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.stderr
+++ b/tests/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.stderr
diff --git a/src/test/ui/pattern/usefulness/integer-ranges/pointer-sized-int.allow.stderr b/tests/ui/pattern/usefulness/integer-ranges/pointer-sized-int.allow.stderr
index 9f277fa1e..9f277fa1e 100644
--- a/src/test/ui/pattern/usefulness/integer-ranges/pointer-sized-int.allow.stderr
+++ b/tests/ui/pattern/usefulness/integer-ranges/pointer-sized-int.allow.stderr
diff --git a/src/test/ui/pattern/usefulness/integer-ranges/pointer-sized-int.deny.stderr b/tests/ui/pattern/usefulness/integer-ranges/pointer-sized-int.deny.stderr
index e3eb98ccd..e3eb98ccd 100644
--- a/src/test/ui/pattern/usefulness/integer-ranges/pointer-sized-int.deny.stderr
+++ b/tests/ui/pattern/usefulness/integer-ranges/pointer-sized-int.deny.stderr
diff --git a/src/test/ui/pattern/usefulness/integer-ranges/pointer-sized-int.rs b/tests/ui/pattern/usefulness/integer-ranges/pointer-sized-int.rs
index 1ed18c267..1ed18c267 100644
--- a/src/test/ui/pattern/usefulness/integer-ranges/pointer-sized-int.rs
+++ b/tests/ui/pattern/usefulness/integer-ranges/pointer-sized-int.rs
diff --git a/src/test/ui/pattern/usefulness/integer-ranges/precise_pointer_matching-message.rs b/tests/ui/pattern/usefulness/integer-ranges/precise_pointer_matching-message.rs
index a2aa655ca..a2aa655ca 100644
--- a/src/test/ui/pattern/usefulness/integer-ranges/precise_pointer_matching-message.rs
+++ b/tests/ui/pattern/usefulness/integer-ranges/precise_pointer_matching-message.rs
diff --git a/src/test/ui/pattern/usefulness/integer-ranges/precise_pointer_matching-message.stderr b/tests/ui/pattern/usefulness/integer-ranges/precise_pointer_matching-message.stderr
index 30492c982..30492c982 100644
--- a/src/test/ui/pattern/usefulness/integer-ranges/precise_pointer_matching-message.stderr
+++ b/tests/ui/pattern/usefulness/integer-ranges/precise_pointer_matching-message.stderr
diff --git a/src/test/ui/pattern/usefulness/integer-ranges/reachability.rs b/tests/ui/pattern/usefulness/integer-ranges/reachability.rs
index fb4d59b05..fb4d59b05 100644
--- a/src/test/ui/pattern/usefulness/integer-ranges/reachability.rs
+++ b/tests/ui/pattern/usefulness/integer-ranges/reachability.rs
diff --git a/src/test/ui/pattern/usefulness/integer-ranges/reachability.stderr b/tests/ui/pattern/usefulness/integer-ranges/reachability.stderr
index 0ffb0ffd8..0ffb0ffd8 100644
--- a/src/test/ui/pattern/usefulness/integer-ranges/reachability.stderr
+++ b/tests/ui/pattern/usefulness/integer-ranges/reachability.stderr
diff --git a/src/test/ui/pattern/usefulness/irrefutable-let-patterns.rs b/tests/ui/pattern/usefulness/irrefutable-let-patterns.rs
index d400ef0bb..d400ef0bb 100644
--- a/src/test/ui/pattern/usefulness/irrefutable-let-patterns.rs
+++ b/tests/ui/pattern/usefulness/irrefutable-let-patterns.rs
diff --git a/src/test/ui/pattern/usefulness/irrefutable-unit.rs b/tests/ui/pattern/usefulness/irrefutable-unit.rs
index dd8f03b6d..dd8f03b6d 100644
--- a/src/test/ui/pattern/usefulness/irrefutable-unit.rs
+++ b/tests/ui/pattern/usefulness/irrefutable-unit.rs
diff --git a/src/test/ui/pattern/usefulness/issue-12116.rs b/tests/ui/pattern/usefulness/issue-12116.rs
index 3cb92a540..3cb92a540 100644
--- a/src/test/ui/pattern/usefulness/issue-12116.rs
+++ b/tests/ui/pattern/usefulness/issue-12116.rs
diff --git a/src/test/ui/pattern/usefulness/issue-12116.stderr b/tests/ui/pattern/usefulness/issue-12116.stderr
index 7f15c4703..7f15c4703 100644
--- a/src/test/ui/pattern/usefulness/issue-12116.stderr
+++ b/tests/ui/pattern/usefulness/issue-12116.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-12369.rs b/tests/ui/pattern/usefulness/issue-12369.rs
index 0481c1fd9..0481c1fd9 100644
--- a/src/test/ui/pattern/usefulness/issue-12369.rs
+++ b/tests/ui/pattern/usefulness/issue-12369.rs
diff --git a/src/test/ui/pattern/usefulness/issue-12369.stderr b/tests/ui/pattern/usefulness/issue-12369.stderr
index aab2be78c..aab2be78c 100644
--- a/src/test/ui/pattern/usefulness/issue-12369.stderr
+++ b/tests/ui/pattern/usefulness/issue-12369.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-13727.rs b/tests/ui/pattern/usefulness/issue-13727.rs
index 7fb565ef3..7fb565ef3 100644
--- a/src/test/ui/pattern/usefulness/issue-13727.rs
+++ b/tests/ui/pattern/usefulness/issue-13727.rs
diff --git a/src/test/ui/pattern/usefulness/issue-13727.stderr b/tests/ui/pattern/usefulness/issue-13727.stderr
index 07ca56a56..07ca56a56 100644
--- a/src/test/ui/pattern/usefulness/issue-13727.stderr
+++ b/tests/ui/pattern/usefulness/issue-13727.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-15129.rs b/tests/ui/pattern/usefulness/issue-15129.rs
index f02e5c0c6..f02e5c0c6 100644
--- a/src/test/ui/pattern/usefulness/issue-15129.rs
+++ b/tests/ui/pattern/usefulness/issue-15129.rs
diff --git a/src/test/ui/pattern/usefulness/issue-15129.stderr b/tests/ui/pattern/usefulness/issue-15129.stderr
index ee8410b76..ee8410b76 100644
--- a/src/test/ui/pattern/usefulness/issue-15129.stderr
+++ b/tests/ui/pattern/usefulness/issue-15129.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-2111.rs b/tests/ui/pattern/usefulness/issue-2111.rs
index d27beaeff..d27beaeff 100644
--- a/src/test/ui/pattern/usefulness/issue-2111.rs
+++ b/tests/ui/pattern/usefulness/issue-2111.rs
diff --git a/src/test/ui/pattern/usefulness/issue-2111.stderr b/tests/ui/pattern/usefulness/issue-2111.stderr
index 01890b73c..01890b73c 100644
--- a/src/test/ui/pattern/usefulness/issue-2111.stderr
+++ b/tests/ui/pattern/usefulness/issue-2111.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-30240-b.rs b/tests/ui/pattern/usefulness/issue-30240-b.rs
index 01a6e7d8c..01a6e7d8c 100644
--- a/src/test/ui/pattern/usefulness/issue-30240-b.rs
+++ b/tests/ui/pattern/usefulness/issue-30240-b.rs
diff --git a/src/test/ui/pattern/usefulness/issue-30240-b.stderr b/tests/ui/pattern/usefulness/issue-30240-b.stderr
index 59d64bc25..59d64bc25 100644
--- a/src/test/ui/pattern/usefulness/issue-30240-b.stderr
+++ b/tests/ui/pattern/usefulness/issue-30240-b.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-30240-rpass.rs b/tests/ui/pattern/usefulness/issue-30240-rpass.rs
index ab16614fd..ab16614fd 100644
--- a/src/test/ui/pattern/usefulness/issue-30240-rpass.rs
+++ b/tests/ui/pattern/usefulness/issue-30240-rpass.rs
diff --git a/src/test/ui/pattern/usefulness/issue-30240.rs b/tests/ui/pattern/usefulness/issue-30240.rs
index a0c0d1626..a0c0d1626 100644
--- a/src/test/ui/pattern/usefulness/issue-30240.rs
+++ b/tests/ui/pattern/usefulness/issue-30240.rs
diff --git a/src/test/ui/pattern/usefulness/issue-30240.stderr b/tests/ui/pattern/usefulness/issue-30240.stderr
index 759fdeafe..759fdeafe 100644
--- a/src/test/ui/pattern/usefulness/issue-30240.stderr
+++ b/tests/ui/pattern/usefulness/issue-30240.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-3096-1.rs b/tests/ui/pattern/usefulness/issue-3096-1.rs
index edc3b3223..edc3b3223 100644
--- a/src/test/ui/pattern/usefulness/issue-3096-1.rs
+++ b/tests/ui/pattern/usefulness/issue-3096-1.rs
diff --git a/src/test/ui/pattern/usefulness/issue-3096-1.stderr b/tests/ui/pattern/usefulness/issue-3096-1.stderr
index d8884394f..d8884394f 100644
--- a/src/test/ui/pattern/usefulness/issue-3096-1.stderr
+++ b/tests/ui/pattern/usefulness/issue-3096-1.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-3096-2.rs b/tests/ui/pattern/usefulness/issue-3096-2.rs
index a26e42580..a26e42580 100644
--- a/src/test/ui/pattern/usefulness/issue-3096-2.rs
+++ b/tests/ui/pattern/usefulness/issue-3096-2.rs
diff --git a/src/test/ui/pattern/usefulness/issue-3096-2.stderr b/tests/ui/pattern/usefulness/issue-3096-2.stderr
index 2df8911ba..2df8911ba 100644
--- a/src/test/ui/pattern/usefulness/issue-3096-2.stderr
+++ b/tests/ui/pattern/usefulness/issue-3096-2.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-31221.rs b/tests/ui/pattern/usefulness/issue-31221.rs
index e03f1ec5b..e03f1ec5b 100644
--- a/src/test/ui/pattern/usefulness/issue-31221.rs
+++ b/tests/ui/pattern/usefulness/issue-31221.rs
diff --git a/src/test/ui/pattern/usefulness/issue-31221.stderr b/tests/ui/pattern/usefulness/issue-31221.stderr
index 7d3491444..7d3491444 100644
--- a/src/test/ui/pattern/usefulness/issue-31221.stderr
+++ b/tests/ui/pattern/usefulness/issue-31221.stderr
diff --git a/tests/ui/pattern/usefulness/issue-31561.rs b/tests/ui/pattern/usefulness/issue-31561.rs
new file mode 100644
index 000000000..82414f041
--- /dev/null
+++ b/tests/ui/pattern/usefulness/issue-31561.rs
@@ -0,0 +1,11 @@
+enum Thing {
+    Foo(u8),
+    Bar,
+    Baz
+}
+
+fn main() {
+    let Thing::Foo(y) = Thing::Foo(1);
+    //~^ ERROR refutable pattern in local binding
+    //~| `Thing::Bar` and `Thing::Baz` not covered
+}
diff --git a/tests/ui/pattern/usefulness/issue-31561.stderr b/tests/ui/pattern/usefulness/issue-31561.stderr
new file mode 100644
index 000000000..5367de5e5
--- /dev/null
+++ b/tests/ui/pattern/usefulness/issue-31561.stderr
@@ -0,0 +1,27 @@
+error[E0005]: refutable pattern in local binding
+  --> $DIR/issue-31561.rs:8:9
+   |
+LL |     let Thing::Foo(y) = Thing::Foo(1);
+   |         ^^^^^^^^^^^^^ patterns `Thing::Bar` and `Thing::Baz` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+note: `Thing` defined here
+  --> $DIR/issue-31561.rs:1:6
+   |
+LL | enum Thing {
+   |      ^^^^^
+LL |     Foo(u8),
+LL |     Bar,
+   |     --- not covered
+LL |     Baz
+   |     --- not covered
+   = note: the matched value is of type `Thing`
+help: you might want to use `let else` to handle the variants that aren't matched
+   |
+LL |     let Thing::Foo(y) = Thing::Foo(1) else { todo!() };
+   |                                       ++++++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/pattern/usefulness/issue-35609.rs b/tests/ui/pattern/usefulness/issue-35609.rs
index 8ef75e351..8ef75e351 100644
--- a/src/test/ui/pattern/usefulness/issue-35609.rs
+++ b/tests/ui/pattern/usefulness/issue-35609.rs
diff --git a/src/test/ui/pattern/usefulness/issue-35609.stderr b/tests/ui/pattern/usefulness/issue-35609.stderr
index c9781d52e..12113957d 100644
--- a/src/test/ui/pattern/usefulness/issue-35609.stderr
+++ b/tests/ui/pattern/usefulness/issue-35609.stderr
@@ -107,9 +107,6 @@ LL |     match Some(A) {
    |
 note: `Option<Enum>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL | pub enum Option<T> {
-   | ^^^^^^^^^^^^^^^^^^
    = note: the matched value is of type `Option<Enum>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern as shown, or multiple match arms
    |
diff --git a/src/test/ui/pattern/usefulness/issue-3601.rs b/tests/ui/pattern/usefulness/issue-3601.rs
index 6215a2398..6215a2398 100644
--- a/src/test/ui/pattern/usefulness/issue-3601.rs
+++ b/tests/ui/pattern/usefulness/issue-3601.rs
diff --git a/src/test/ui/pattern/usefulness/issue-3601.stderr b/tests/ui/pattern/usefulness/issue-3601.stderr
index eb8c63919..59d7bcd4b 100644
--- a/src/test/ui/pattern/usefulness/issue-3601.stderr
+++ b/tests/ui/pattern/usefulness/issue-3601.stderr
@@ -6,12 +6,6 @@ LL |         box NodeKind::Element(ed) => match ed.kind {
    |
 note: `Box<ElementKind>` defined here
   --> $SRC_DIR/alloc/src/boxed.rs:LL:COL
-   |
-LL | / pub struct Box<
-LL | |     T: ?Sized,
-LL | |     #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global,
-LL | | >(Unique<T>, A);
-   | |_^
    = note: the matched value is of type `Box<ElementKind>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
    |
diff --git a/src/test/ui/pattern/usefulness/issue-39362.rs b/tests/ui/pattern/usefulness/issue-39362.rs
index ea3c8f88e..ea3c8f88e 100644
--- a/src/test/ui/pattern/usefulness/issue-39362.rs
+++ b/tests/ui/pattern/usefulness/issue-39362.rs
diff --git a/src/test/ui/pattern/usefulness/issue-39362.stderr b/tests/ui/pattern/usefulness/issue-39362.stderr
index b8b17918a..b8b17918a 100644
--- a/src/test/ui/pattern/usefulness/issue-39362.stderr
+++ b/tests/ui/pattern/usefulness/issue-39362.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-40221.rs b/tests/ui/pattern/usefulness/issue-40221.rs
index e1f7e975b..e1f7e975b 100644
--- a/src/test/ui/pattern/usefulness/issue-40221.rs
+++ b/tests/ui/pattern/usefulness/issue-40221.rs
diff --git a/src/test/ui/pattern/usefulness/issue-40221.stderr b/tests/ui/pattern/usefulness/issue-40221.stderr
index 4973e42b0..4973e42b0 100644
--- a/src/test/ui/pattern/usefulness/issue-40221.stderr
+++ b/tests/ui/pattern/usefulness/issue-40221.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-4321.rs b/tests/ui/pattern/usefulness/issue-4321.rs
index 9715f2eba..9715f2eba 100644
--- a/src/test/ui/pattern/usefulness/issue-4321.rs
+++ b/tests/ui/pattern/usefulness/issue-4321.rs
diff --git a/src/test/ui/pattern/usefulness/issue-4321.stderr b/tests/ui/pattern/usefulness/issue-4321.stderr
index 293273174..293273174 100644
--- a/src/test/ui/pattern/usefulness/issue-4321.stderr
+++ b/tests/ui/pattern/usefulness/issue-4321.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-50900.rs b/tests/ui/pattern/usefulness/issue-50900.rs
index 9cc760e9a..9cc760e9a 100644
--- a/src/test/ui/pattern/usefulness/issue-50900.rs
+++ b/tests/ui/pattern/usefulness/issue-50900.rs
diff --git a/src/test/ui/pattern/usefulness/issue-50900.stderr b/tests/ui/pattern/usefulness/issue-50900.stderr
index 348246d28..348246d28 100644
--- a/src/test/ui/pattern/usefulness/issue-50900.stderr
+++ b/tests/ui/pattern/usefulness/issue-50900.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-53820-slice-pattern-large-array.rs b/tests/ui/pattern/usefulness/issue-53820-slice-pattern-large-array.rs
index 5b0482de2..5b0482de2 100644
--- a/src/test/ui/pattern/usefulness/issue-53820-slice-pattern-large-array.rs
+++ b/tests/ui/pattern/usefulness/issue-53820-slice-pattern-large-array.rs
diff --git a/src/test/ui/pattern/usefulness/issue-56379.rs b/tests/ui/pattern/usefulness/issue-56379.rs
index 097cf98d0..097cf98d0 100644
--- a/src/test/ui/pattern/usefulness/issue-56379.rs
+++ b/tests/ui/pattern/usefulness/issue-56379.rs
diff --git a/src/test/ui/pattern/usefulness/issue-56379.stderr b/tests/ui/pattern/usefulness/issue-56379.stderr
index 6eed6bfae..6eed6bfae 100644
--- a/src/test/ui/pattern/usefulness/issue-56379.stderr
+++ b/tests/ui/pattern/usefulness/issue-56379.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-57472.rs b/tests/ui/pattern/usefulness/issue-57472.rs
index 113100637..113100637 100644
--- a/src/test/ui/pattern/usefulness/issue-57472.rs
+++ b/tests/ui/pattern/usefulness/issue-57472.rs
diff --git a/src/test/ui/pattern/usefulness/issue-57472.stderr b/tests/ui/pattern/usefulness/issue-57472.stderr
index 26efdf6db..26efdf6db 100644
--- a/src/test/ui/pattern/usefulness/issue-57472.stderr
+++ b/tests/ui/pattern/usefulness/issue-57472.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-65413-constants-and-slices-exhaustiveness.rs b/tests/ui/pattern/usefulness/issue-65413-constants-and-slices-exhaustiveness.rs
index 54dfa889e..54dfa889e 100644
--- a/src/test/ui/pattern/usefulness/issue-65413-constants-and-slices-exhaustiveness.rs
+++ b/tests/ui/pattern/usefulness/issue-65413-constants-and-slices-exhaustiveness.rs
diff --git a/src/test/ui/pattern/usefulness/issue-66501.rs b/tests/ui/pattern/usefulness/issue-66501.rs
index ffcfd4ad8..ffcfd4ad8 100644
--- a/src/test/ui/pattern/usefulness/issue-66501.rs
+++ b/tests/ui/pattern/usefulness/issue-66501.rs
diff --git a/src/test/ui/pattern/usefulness/issue-71930-type-of-match-scrutinee.rs b/tests/ui/pattern/usefulness/issue-71930-type-of-match-scrutinee.rs
index e2ff9ac87..e2ff9ac87 100644
--- a/src/test/ui/pattern/usefulness/issue-71930-type-of-match-scrutinee.rs
+++ b/tests/ui/pattern/usefulness/issue-71930-type-of-match-scrutinee.rs
diff --git a/src/test/ui/pattern/usefulness/issue-72377.rs b/tests/ui/pattern/usefulness/issue-72377.rs
index b5ad3075c..b5ad3075c 100644
--- a/src/test/ui/pattern/usefulness/issue-72377.rs
+++ b/tests/ui/pattern/usefulness/issue-72377.rs
diff --git a/src/test/ui/pattern/usefulness/issue-72377.stderr b/tests/ui/pattern/usefulness/issue-72377.stderr
index 123dd051d..123dd051d 100644
--- a/src/test/ui/pattern/usefulness/issue-72377.stderr
+++ b/tests/ui/pattern/usefulness/issue-72377.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-72476-and-89393-associated-type.rs b/tests/ui/pattern/usefulness/issue-72476-and-89393-associated-type.rs
index 058f41967..058f41967 100644
--- a/src/test/ui/pattern/usefulness/issue-72476-and-89393-associated-type.rs
+++ b/tests/ui/pattern/usefulness/issue-72476-and-89393-associated-type.rs
diff --git a/src/test/ui/pattern/usefulness/issue-78123-non-exhaustive-reference.rs b/tests/ui/pattern/usefulness/issue-78123-non-exhaustive-reference.rs
index cbfcf0eaf..cbfcf0eaf 100644
--- a/src/test/ui/pattern/usefulness/issue-78123-non-exhaustive-reference.rs
+++ b/tests/ui/pattern/usefulness/issue-78123-non-exhaustive-reference.rs
diff --git a/src/test/ui/pattern/usefulness/issue-78123-non-exhaustive-reference.stderr b/tests/ui/pattern/usefulness/issue-78123-non-exhaustive-reference.stderr
index bf05d616d..bf05d616d 100644
--- a/src/test/ui/pattern/usefulness/issue-78123-non-exhaustive-reference.stderr
+++ b/tests/ui/pattern/usefulness/issue-78123-non-exhaustive-reference.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-78549-ref-pat-and-str.rs b/tests/ui/pattern/usefulness/issue-78549-ref-pat-and-str.rs
index 2879caf2c..2879caf2c 100644
--- a/src/test/ui/pattern/usefulness/issue-78549-ref-pat-and-str.rs
+++ b/tests/ui/pattern/usefulness/issue-78549-ref-pat-and-str.rs
diff --git a/src/test/ui/pattern/usefulness/issue-80501-or-pat-and-macro.rs b/tests/ui/pattern/usefulness/issue-80501-or-pat-and-macro.rs
index aac7d7d53..aac7d7d53 100644
--- a/src/test/ui/pattern/usefulness/issue-80501-or-pat-and-macro.rs
+++ b/tests/ui/pattern/usefulness/issue-80501-or-pat-and-macro.rs
diff --git a/src/test/ui/pattern/usefulness/issue-82772-match-box-as-struct.rs b/tests/ui/pattern/usefulness/issue-82772-match-box-as-struct.rs
index c1bfcc734..c1bfcc734 100644
--- a/src/test/ui/pattern/usefulness/issue-82772-match-box-as-struct.rs
+++ b/tests/ui/pattern/usefulness/issue-82772-match-box-as-struct.rs
diff --git a/src/test/ui/pattern/usefulness/issue-82772-match-box-as-struct.stderr b/tests/ui/pattern/usefulness/issue-82772-match-box-as-struct.stderr
index 2c8c85bb1..2c8c85bb1 100644
--- a/src/test/ui/pattern/usefulness/issue-82772-match-box-as-struct.stderr
+++ b/tests/ui/pattern/usefulness/issue-82772-match-box-as-struct.stderr
diff --git a/src/test/ui/pattern/usefulness/issue-88747.rs b/tests/ui/pattern/usefulness/issue-88747.rs
index 948c99f9c..948c99f9c 100644
--- a/src/test/ui/pattern/usefulness/issue-88747.rs
+++ b/tests/ui/pattern/usefulness/issue-88747.rs
diff --git a/src/test/ui/pattern/usefulness/match-arm-statics-2.rs b/tests/ui/pattern/usefulness/match-arm-statics-2.rs
index 3c9c16561..3c9c16561 100644
--- a/src/test/ui/pattern/usefulness/match-arm-statics-2.rs
+++ b/tests/ui/pattern/usefulness/match-arm-statics-2.rs
diff --git a/src/test/ui/pattern/usefulness/match-arm-statics-2.stderr b/tests/ui/pattern/usefulness/match-arm-statics-2.stderr
index b0d7fe5eb..e4dd35a59 100644
--- a/src/test/ui/pattern/usefulness/match-arm-statics-2.stderr
+++ b/tests/ui/pattern/usefulness/match-arm-statics-2.stderr
@@ -19,15 +19,11 @@ LL |     match Some(Some(North)) {
    |
 note: `Option<Option<Direction>>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
+  ::: $SRC_DIR/core/src/option.rs:LL:COL
    |
-LL | pub enum Option<T> {
-   | ------------------
-...
-LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^^^
-   |     |
-   |     not covered
-   |     not covered
+   = note: not covered
+   |
+   = note: not covered
    = note: the matched value is of type `Option<Option<Direction>>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
    |
diff --git a/src/test/ui/pattern/usefulness/match-arm-statics.rs b/tests/ui/pattern/usefulness/match-arm-statics.rs
index 91db76ebb..91db76ebb 100644
--- a/src/test/ui/pattern/usefulness/match-arm-statics.rs
+++ b/tests/ui/pattern/usefulness/match-arm-statics.rs
diff --git a/src/test/ui/pattern/usefulness/match-arm-statics.stderr b/tests/ui/pattern/usefulness/match-arm-statics.stderr
index a5dffebf6..a5dffebf6 100644
--- a/src/test/ui/pattern/usefulness/match-arm-statics.stderr
+++ b/tests/ui/pattern/usefulness/match-arm-statics.stderr
diff --git a/src/test/ui/pattern/usefulness/match-byte-array-patterns-2.rs b/tests/ui/pattern/usefulness/match-byte-array-patterns-2.rs
index 33468d03f..33468d03f 100644
--- a/src/test/ui/pattern/usefulness/match-byte-array-patterns-2.rs
+++ b/tests/ui/pattern/usefulness/match-byte-array-patterns-2.rs
diff --git a/src/test/ui/pattern/usefulness/match-byte-array-patterns-2.stderr b/tests/ui/pattern/usefulness/match-byte-array-patterns-2.stderr
index a90f32f7a..a90f32f7a 100644
--- a/src/test/ui/pattern/usefulness/match-byte-array-patterns-2.stderr
+++ b/tests/ui/pattern/usefulness/match-byte-array-patterns-2.stderr
diff --git a/src/test/ui/pattern/usefulness/match-byte-array-patterns.rs b/tests/ui/pattern/usefulness/match-byte-array-patterns.rs
index 9b6c8bd55..9b6c8bd55 100644
--- a/src/test/ui/pattern/usefulness/match-byte-array-patterns.rs
+++ b/tests/ui/pattern/usefulness/match-byte-array-patterns.rs
diff --git a/src/test/ui/pattern/usefulness/match-byte-array-patterns.stderr b/tests/ui/pattern/usefulness/match-byte-array-patterns.stderr
index 0c582be8d..0c582be8d 100644
--- a/src/test/ui/pattern/usefulness/match-byte-array-patterns.stderr
+++ b/tests/ui/pattern/usefulness/match-byte-array-patterns.stderr
diff --git a/src/test/ui/pattern/usefulness/match-non-exhaustive.rs b/tests/ui/pattern/usefulness/match-non-exhaustive.rs
index 3b210a115..3b210a115 100644
--- a/src/test/ui/pattern/usefulness/match-non-exhaustive.rs
+++ b/tests/ui/pattern/usefulness/match-non-exhaustive.rs
diff --git a/src/test/ui/pattern/usefulness/match-non-exhaustive.stderr b/tests/ui/pattern/usefulness/match-non-exhaustive.stderr
index 08dde523a..08dde523a 100644
--- a/src/test/ui/pattern/usefulness/match-non-exhaustive.stderr
+++ b/tests/ui/pattern/usefulness/match-non-exhaustive.stderr
diff --git a/src/test/ui/pattern/usefulness/match-privately-empty.rs b/tests/ui/pattern/usefulness/match-privately-empty.rs
index 315eb03d1..315eb03d1 100644
--- a/src/test/ui/pattern/usefulness/match-privately-empty.rs
+++ b/tests/ui/pattern/usefulness/match-privately-empty.rs
diff --git a/src/test/ui/pattern/usefulness/match-privately-empty.stderr b/tests/ui/pattern/usefulness/match-privately-empty.stderr
index 4607cfaae..86f75d15c 100644
--- a/src/test/ui/pattern/usefulness/match-privately-empty.stderr
+++ b/tests/ui/pattern/usefulness/match-privately-empty.stderr
@@ -6,12 +6,9 @@ LL |     match private::DATA {
    |
 note: `Option<Private>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
+  ::: $SRC_DIR/core/src/option.rs:LL:COL
    |
-LL | pub enum Option<T> {
-   | ------------------
-...
-LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^^^ not covered
+   = note: not covered
    = note: the matched value is of type `Option<Private>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
    |
diff --git a/src/test/ui/pattern/usefulness/match-ref-ice.rs b/tests/ui/pattern/usefulness/match-ref-ice.rs
index dee110f96..dee110f96 100644
--- a/src/test/ui/pattern/usefulness/match-ref-ice.rs
+++ b/tests/ui/pattern/usefulness/match-ref-ice.rs
diff --git a/src/test/ui/pattern/usefulness/match-ref-ice.stderr b/tests/ui/pattern/usefulness/match-ref-ice.stderr
index fad0940ba..fad0940ba 100644
--- a/src/test/ui/pattern/usefulness/match-ref-ice.stderr
+++ b/tests/ui/pattern/usefulness/match-ref-ice.stderr
diff --git a/src/test/ui/pattern/usefulness/match-slice-patterns.rs b/tests/ui/pattern/usefulness/match-slice-patterns.rs
index 92d74b8c2..92d74b8c2 100644
--- a/src/test/ui/pattern/usefulness/match-slice-patterns.rs
+++ b/tests/ui/pattern/usefulness/match-slice-patterns.rs
diff --git a/src/test/ui/pattern/usefulness/match-slice-patterns.stderr b/tests/ui/pattern/usefulness/match-slice-patterns.stderr
index 961dd5901..961dd5901 100644
--- a/src/test/ui/pattern/usefulness/match-slice-patterns.stderr
+++ b/tests/ui/pattern/usefulness/match-slice-patterns.stderr
diff --git a/src/test/ui/pattern/usefulness/match-vec-fixed.rs b/tests/ui/pattern/usefulness/match-vec-fixed.rs
index e611779de..e611779de 100644
--- a/src/test/ui/pattern/usefulness/match-vec-fixed.rs
+++ b/tests/ui/pattern/usefulness/match-vec-fixed.rs
diff --git a/src/test/ui/pattern/usefulness/match-vec-fixed.stderr b/tests/ui/pattern/usefulness/match-vec-fixed.stderr
index e388a06cb..e388a06cb 100644
--- a/src/test/ui/pattern/usefulness/match-vec-fixed.stderr
+++ b/tests/ui/pattern/usefulness/match-vec-fixed.stderr
diff --git a/src/test/ui/pattern/usefulness/match-vec-unreachable.rs b/tests/ui/pattern/usefulness/match-vec-unreachable.rs
index 3342389be..3342389be 100644
--- a/src/test/ui/pattern/usefulness/match-vec-unreachable.rs
+++ b/tests/ui/pattern/usefulness/match-vec-unreachable.rs
diff --git a/src/test/ui/pattern/usefulness/match-vec-unreachable.stderr b/tests/ui/pattern/usefulness/match-vec-unreachable.stderr
index 672fd92fb..672fd92fb 100644
--- a/src/test/ui/pattern/usefulness/match-vec-unreachable.stderr
+++ b/tests/ui/pattern/usefulness/match-vec-unreachable.stderr
diff --git a/src/test/ui/pattern/usefulness/nested-exhaustive-match.rs b/tests/ui/pattern/usefulness/nested-exhaustive-match.rs
index 8b2294f84..8b2294f84 100644
--- a/src/test/ui/pattern/usefulness/nested-exhaustive-match.rs
+++ b/tests/ui/pattern/usefulness/nested-exhaustive-match.rs
diff --git a/tests/ui/pattern/usefulness/non-exhaustive-defined-here.rs b/tests/ui/pattern/usefulness/non-exhaustive-defined-here.rs
new file mode 100644
index 000000000..5145f7690
--- /dev/null
+++ b/tests/ui/pattern/usefulness/non-exhaustive-defined-here.rs
@@ -0,0 +1,107 @@
+// Test the "defined here" and "not covered" diagnostic hints.
+// We also make sure that references are peeled off from the scrutinee type
+// so that the diagnostics work better with default binding modes.
+
+#[derive(Clone)]
+enum E {
+    //~^ NOTE
+    //~| NOTE
+    //~| NOTE
+    //~| NOTE
+    //~| NOTE
+    //~| NOTE
+    A,
+    B,
+    //~^ NOTE `E` defined here
+    //~| NOTE `E` defined here
+    //~| NOTE `E` defined here
+    //~| NOTE  not covered
+    //~| NOTE  not covered
+    //~| NOTE  not covered
+    //~| NOTE  not covered
+    //~| NOTE  not covered
+    //~| NOTE  not covered
+    C
+    //~^ not covered
+    //~| not covered
+    //~| not covered
+    //~| not covered
+    //~| not covered
+    //~| not covered
+}
+
+fn by_val(e: E) {
+    let e1 = e.clone();
+    match e1 { //~ ERROR non-exhaustive patterns: `E::B` and `E::C` not covered
+        //~^ NOTE patterns `E::B` and `E::C` not covered
+        //~| NOTE the matched value is of type `E`
+        E::A => {}
+    }
+
+    let E::A = e;
+    //~^ ERROR refutable pattern in local binding
+    //~| patterns `E::B` and `E::C` not covered
+    //~| NOTE `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with
+    //~| NOTE for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+    //~| NOTE the matched value is of type `E`
+}
+
+fn by_ref_once(e: &E) {
+    match e {
+    //~^ ERROR non-exhaustive patterns
+    //~| patterns `&E::B` and `&E::C` not covered
+    //~| NOTE the matched value is of type `&E`
+        E::A => {}
+    }
+
+    let E::A = e;
+    //~^ ERROR refutable pattern in local binding
+    //~| patterns `&E::B` and `&E::C` not covered
+    //~| NOTE `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with
+    //~| NOTE for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+    //~| NOTE the matched value is of type `&E`
+}
+
+fn by_ref_thrice(e: & &mut &E) {
+    match e {
+    //~^ ERROR non-exhaustive patterns
+    //~| patterns `&&mut &E::B` and `&&mut &E::C` not covered
+    //~| NOTE the matched value is of type `&&mut &E`
+        E::A => {}
+    }
+
+    let E::A = e;
+    //~^ ERROR refutable pattern in local binding
+    //~| patterns `&&mut &E::B` and `&&mut &E::C` not covered
+    //~| NOTE `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with
+    //~| NOTE for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+    //~| NOTE the matched value is of type `&&mut &E`
+}
+
+enum Opt {
+    //~^ NOTE
+    //~| NOTE
+    Some(u8),
+    None,
+    //~^ NOTE `Opt` defined here
+    //~| NOTE not covered
+    //~| NOTE not covered
+}
+
+fn ref_pat(e: Opt) {
+    match e {
+        //~^ ERROR non-exhaustive patterns
+        //~| pattern `Opt::None` not covered
+        //~| NOTE the matched value is of type `Opt`
+        Opt::Some(ref _x) => {}
+    }
+
+    let Opt::Some(ref _x) = e;
+    //~^ ERROR refutable pattern in local binding
+    //~| NOTE the matched value is of type `Opt`
+    //~| NOTE pattern `Opt::None` not covered
+    //~| NOTE `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with
+    //~| NOTE for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+}
+
+fn main() {}
diff --git a/src/test/ui/pattern/usefulness/non-exhaustive-defined-here.stderr b/tests/ui/pattern/usefulness/non-exhaustive-defined-here.stderr
index 678c9b2ab..769d4070f 100644
--- a/src/test/ui/pattern/usefulness/non-exhaustive-defined-here.stderr
+++ b/tests/ui/pattern/usefulness/non-exhaustive-defined-here.stderr
@@ -1,5 +1,5 @@
 error[E0004]: non-exhaustive patterns: `E::B` and `E::C` not covered
-  --> $DIR/non-exhaustive-defined-here.rs:38:11
+  --> $DIR/non-exhaustive-defined-here.rs:35:11
    |
 LL |     match e1 {
    |           ^^ patterns `E::B` and `E::C` not covered
@@ -22,8 +22,8 @@ LL ~         E::A => {}
 LL +         E::B | E::C => todo!()
    |
 
-error[E0005]: refutable pattern in local binding: `E::B` and `E::C` not covered
-  --> $DIR/non-exhaustive-defined-here.rs:44:9
+error[E0005]: refutable pattern in local binding
+  --> $DIR/non-exhaustive-defined-here.rs:41:9
    |
 LL |     let E::A = e;
    |         ^^^^ patterns `E::B` and `E::C` not covered
@@ -31,16 +31,16 @@ LL |     let E::A = e;
    = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
    = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
 note: `E` defined here
-  --> $DIR/non-exhaustive-defined-here.rs:14:5
+  --> $DIR/non-exhaustive-defined-here.rs:6:6
    |
 LL | enum E {
-   |      -
+   |      ^
 ...
 LL |     B,
-   |     ^ not covered
+   |     - not covered
 ...
 LL |     C
-   |     ^ not covered
+   |     - not covered
    = note: the matched value is of type `E`
 help: you might want to use `if let` to ignore the variants that aren't matched
    |
@@ -48,7 +48,7 @@ LL |     if let E::A = e { todo!() }
    |     ++              ~~~~~~~~~~~
 
 error[E0004]: non-exhaustive patterns: `&E::B` and `&E::C` not covered
-  --> $DIR/non-exhaustive-defined-here.rs:52:11
+  --> $DIR/non-exhaustive-defined-here.rs:50:11
    |
 LL |     match e {
    |           ^ patterns `&E::B` and `&E::C` not covered
@@ -71,8 +71,8 @@ LL ~         E::A => {}
 LL +         &E::B | &E::C => todo!()
    |
 
-error[E0005]: refutable pattern in local binding: `&E::B` and `&E::C` not covered
-  --> $DIR/non-exhaustive-defined-here.rs:58:9
+error[E0005]: refutable pattern in local binding
+  --> $DIR/non-exhaustive-defined-here.rs:57:9
    |
 LL |     let E::A = e;
    |         ^^^^ patterns `&E::B` and `&E::C` not covered
@@ -80,16 +80,16 @@ LL |     let E::A = e;
    = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
    = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
 note: `E` defined here
-  --> $DIR/non-exhaustive-defined-here.rs:14:5
+  --> $DIR/non-exhaustive-defined-here.rs:6:6
    |
 LL | enum E {
-   |      -
+   |      ^
 ...
 LL |     B,
-   |     ^ not covered
+   |     - not covered
 ...
 LL |     C
-   |     ^ not covered
+   |     - not covered
    = note: the matched value is of type `&E`
 help: you might want to use `if let` to ignore the variants that aren't matched
    |
@@ -120,8 +120,8 @@ LL ~         E::A => {}
 LL +         &&mut &E::B | &&mut &E::C => todo!()
    |
 
-error[E0005]: refutable pattern in local binding: `&&mut &E::B` and `&&mut &E::C` not covered
-  --> $DIR/non-exhaustive-defined-here.rs:72:9
+error[E0005]: refutable pattern in local binding
+  --> $DIR/non-exhaustive-defined-here.rs:73:9
    |
 LL |     let E::A = e;
    |         ^^^^ patterns `&&mut &E::B` and `&&mut &E::C` not covered
@@ -129,16 +129,16 @@ LL |     let E::A = e;
    = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
    = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
 note: `E` defined here
-  --> $DIR/non-exhaustive-defined-here.rs:14:5
+  --> $DIR/non-exhaustive-defined-here.rs:6:6
    |
 LL | enum E {
-   |      -
+   |      ^
 ...
 LL |     B,
-   |     ^ not covered
+   |     - not covered
 ...
 LL |     C
-   |     ^ not covered
+   |     - not covered
    = note: the matched value is of type `&&mut &E`
 help: you might want to use `if let` to ignore the variants that aren't matched
    |
@@ -152,7 +152,7 @@ LL |     match e {
    |           ^ pattern `Opt::None` not covered
    |
 note: `Opt` defined here
-  --> $DIR/non-exhaustive-defined-here.rs:84:5
+  --> $DIR/non-exhaustive-defined-here.rs:85:5
    |
 LL | enum Opt {
    |      ---
@@ -166,8 +166,8 @@ LL ~         Opt::Some(ref _x) => {}
 LL +         Opt::None => todo!()
    |
 
-error[E0005]: refutable pattern in local binding: `Opt::None` not covered
-  --> $DIR/non-exhaustive-defined-here.rs:98:9
+error[E0005]: refutable pattern in local binding
+  --> $DIR/non-exhaustive-defined-here.rs:99:9
    |
 LL |     let Opt::Some(ref _x) = e;
    |         ^^^^^^^^^^^^^^^^^ pattern `Opt::None` not covered
@@ -175,19 +175,15 @@ LL |     let Opt::Some(ref _x) = e;
    = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
    = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
 note: `Opt` defined here
-  --> $DIR/non-exhaustive-defined-here.rs:84:5
+  --> $DIR/non-exhaustive-defined-here.rs:81:6
    |
 LL | enum Opt {
-   |      ---
+   |      ^^^
 ...
 LL |     None,
-   |     ^^^^ not covered
+   |     ---- not covered
    = note: the matched value is of type `Opt`
-help: you might want to use `if let` to ignore the variant that isn't matched
-   |
-LL |     let _x = if let Opt::Some(ref _x) = e { _x } else { todo!() };
-   |     +++++++++++                           +++++++++++++++++++++++
-help: alternatively, you might want to use let else to handle the variant that isn't matched
+help: you might want to use `let else` to handle the variant that isn't matched
    |
 LL |     let Opt::Some(ref _x) = e else { todo!() };
    |                               ++++++++++++++++
diff --git a/src/test/ui/pattern/usefulness/non-exhaustive-match-nested.rs b/tests/ui/pattern/usefulness/non-exhaustive-match-nested.rs
index 69c3c7658..69c3c7658 100644
--- a/src/test/ui/pattern/usefulness/non-exhaustive-match-nested.rs
+++ b/tests/ui/pattern/usefulness/non-exhaustive-match-nested.rs
diff --git a/src/test/ui/pattern/usefulness/non-exhaustive-match-nested.stderr b/tests/ui/pattern/usefulness/non-exhaustive-match-nested.stderr
index 44f327421..44f327421 100644
--- a/src/test/ui/pattern/usefulness/non-exhaustive-match-nested.stderr
+++ b/tests/ui/pattern/usefulness/non-exhaustive-match-nested.stderr
diff --git a/src/test/ui/pattern/usefulness/non-exhaustive-match.rs b/tests/ui/pattern/usefulness/non-exhaustive-match.rs
index 1cb58b8ce..1cb58b8ce 100644
--- a/src/test/ui/pattern/usefulness/non-exhaustive-match.rs
+++ b/tests/ui/pattern/usefulness/non-exhaustive-match.rs
diff --git a/src/test/ui/pattern/usefulness/non-exhaustive-match.stderr b/tests/ui/pattern/usefulness/non-exhaustive-match.stderr
index 4234600d0..e2260f50b 100644
--- a/src/test/ui/pattern/usefulness/non-exhaustive-match.stderr
+++ b/tests/ui/pattern/usefulness/non-exhaustive-match.stderr
@@ -36,12 +36,9 @@ LL |     match Some(10) {
    |
 note: `Option<i32>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
+  ::: $SRC_DIR/core/src/option.rs:LL:COL
    |
-LL | pub enum Option<T> {
-   | ------------------
-...
-LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^^^ not covered
+   = note: not covered
    = note: the matched value is of type `Option<i32>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
    |
diff --git a/src/test/ui/pattern/usefulness/non-exhaustive-pattern-witness.rs b/tests/ui/pattern/usefulness/non-exhaustive-pattern-witness.rs
index 4bd344219..4bd344219 100644
--- a/src/test/ui/pattern/usefulness/non-exhaustive-pattern-witness.rs
+++ b/tests/ui/pattern/usefulness/non-exhaustive-pattern-witness.rs
diff --git a/src/test/ui/pattern/usefulness/non-exhaustive-pattern-witness.stderr b/tests/ui/pattern/usefulness/non-exhaustive-pattern-witness.stderr
index b8af566de..b8af566de 100644
--- a/src/test/ui/pattern/usefulness/non-exhaustive-pattern-witness.stderr
+++ b/tests/ui/pattern/usefulness/non-exhaustive-pattern-witness.stderr
diff --git a/tests/ui/pattern/usefulness/refutable-pattern-errors.rs b/tests/ui/pattern/usefulness/refutable-pattern-errors.rs
new file mode 100644
index 000000000..7a3e991d5
--- /dev/null
+++ b/tests/ui/pattern/usefulness/refutable-pattern-errors.rs
@@ -0,0 +1,9 @@
+fn func((1, (Some(1), 2..=3)): (isize, (Option<isize>, isize))) { }
+//~^ ERROR refutable pattern in function argument
+//~| `(_, _)` not covered
+
+fn main() {
+    let (1, (Some(1), 2..=3)) = (1, (None, 2));
+    //~^ ERROR refutable pattern in local binding
+    //~| `(i32::MIN..=0_i32, _)` and `(2_i32..=i32::MAX, _)` not covered
+}
diff --git a/src/test/ui/pattern/usefulness/refutable-pattern-errors.stderr b/tests/ui/pattern/usefulness/refutable-pattern-errors.stderr
index d1dacc822..c518de477 100644
--- a/src/test/ui/pattern/usefulness/refutable-pattern-errors.stderr
+++ b/tests/ui/pattern/usefulness/refutable-pattern-errors.stderr
@@ -1,4 +1,4 @@
-error[E0005]: refutable pattern in function argument: `(_, _)` not covered
+error[E0005]: refutable pattern in function argument
   --> $DIR/refutable-pattern-errors.rs:1:9
    |
 LL | fn func((1, (Some(1), 2..=3)): (isize, (Option<isize>, isize))) { }
@@ -6,8 +6,8 @@ LL | fn func((1, (Some(1), 2..=3)): (isize, (Option<isize>, isize))) { }
    |
    = note: the matched value is of type `(isize, (Option<isize>, isize))`
 
-error[E0005]: refutable pattern in local binding: `(i32::MIN..=0_i32, _)` and `(2_i32..=i32::MAX, _)` not covered
-  --> $DIR/refutable-pattern-errors.rs:5:9
+error[E0005]: refutable pattern in local binding
+  --> $DIR/refutable-pattern-errors.rs:6:9
    |
 LL |     let (1, (Some(1), 2..=3)) = (1, (None, 2));
    |         ^^^^^^^^^^^^^^^^^^^^^ patterns `(i32::MIN..=0_i32, _)` and `(2_i32..=i32::MAX, _)` not covered
diff --git a/tests/ui/pattern/usefulness/refutable-pattern-in-fn-arg.rs b/tests/ui/pattern/usefulness/refutable-pattern-in-fn-arg.rs
new file mode 100644
index 000000000..17dc38ab2
--- /dev/null
+++ b/tests/ui/pattern/usefulness/refutable-pattern-in-fn-arg.rs
@@ -0,0 +1,6 @@
+fn main() {
+    let f = |3: isize| println!("hello");
+    //~^ ERROR refutable pattern in function argument
+    //~| `_` not covered
+    f(4);
+}
diff --git a/src/test/ui/pattern/usefulness/refutable-pattern-in-fn-arg.stderr b/tests/ui/pattern/usefulness/refutable-pattern-in-fn-arg.stderr
index c9d8cf43f..55f0b2319 100644
--- a/src/test/ui/pattern/usefulness/refutable-pattern-in-fn-arg.stderr
+++ b/tests/ui/pattern/usefulness/refutable-pattern-in-fn-arg.stderr
@@ -1,4 +1,4 @@
-error[E0005]: refutable pattern in function argument: `_` not covered
+error[E0005]: refutable pattern in function argument
   --> $DIR/refutable-pattern-in-fn-arg.rs:2:14
    |
 LL |     let f = |3: isize| println!("hello");
diff --git a/src/test/ui/pattern/usefulness/slice-pattern-const-2.rs b/tests/ui/pattern/usefulness/slice-pattern-const-2.rs
index 4bf8d0fd2..4bf8d0fd2 100644
--- a/src/test/ui/pattern/usefulness/slice-pattern-const-2.rs
+++ b/tests/ui/pattern/usefulness/slice-pattern-const-2.rs
diff --git a/src/test/ui/pattern/usefulness/slice-pattern-const-2.stderr b/tests/ui/pattern/usefulness/slice-pattern-const-2.stderr
index dcad11a38..dcad11a38 100644
--- a/src/test/ui/pattern/usefulness/slice-pattern-const-2.stderr
+++ b/tests/ui/pattern/usefulness/slice-pattern-const-2.stderr
diff --git a/src/test/ui/pattern/usefulness/slice-pattern-const-3.rs b/tests/ui/pattern/usefulness/slice-pattern-const-3.rs
index 2ca8323f0..2ca8323f0 100644
--- a/src/test/ui/pattern/usefulness/slice-pattern-const-3.rs
+++ b/tests/ui/pattern/usefulness/slice-pattern-const-3.rs
diff --git a/src/test/ui/pattern/usefulness/slice-pattern-const-3.stderr b/tests/ui/pattern/usefulness/slice-pattern-const-3.stderr
index b90b3a88a..b90b3a88a 100644
--- a/src/test/ui/pattern/usefulness/slice-pattern-const-3.stderr
+++ b/tests/ui/pattern/usefulness/slice-pattern-const-3.stderr
diff --git a/src/test/ui/pattern/usefulness/slice-pattern-const.rs b/tests/ui/pattern/usefulness/slice-pattern-const.rs
index 89195d5b1..89195d5b1 100644
--- a/src/test/ui/pattern/usefulness/slice-pattern-const.rs
+++ b/tests/ui/pattern/usefulness/slice-pattern-const.rs
diff --git a/src/test/ui/pattern/usefulness/slice-pattern-const.stderr b/tests/ui/pattern/usefulness/slice-pattern-const.stderr
index 1fffb9fed..1fffb9fed 100644
--- a/src/test/ui/pattern/usefulness/slice-pattern-const.stderr
+++ b/tests/ui/pattern/usefulness/slice-pattern-const.stderr
diff --git a/src/test/ui/pattern/usefulness/slice-patterns-exhaustiveness.rs b/tests/ui/pattern/usefulness/slice-patterns-exhaustiveness.rs
index 46e0da5be..46e0da5be 100644
--- a/src/test/ui/pattern/usefulness/slice-patterns-exhaustiveness.rs
+++ b/tests/ui/pattern/usefulness/slice-patterns-exhaustiveness.rs
diff --git a/src/test/ui/pattern/usefulness/slice-patterns-exhaustiveness.stderr b/tests/ui/pattern/usefulness/slice-patterns-exhaustiveness.stderr
index 5d1e170ae..5d1e170ae 100644
--- a/src/test/ui/pattern/usefulness/slice-patterns-exhaustiveness.stderr
+++ b/tests/ui/pattern/usefulness/slice-patterns-exhaustiveness.stderr
diff --git a/src/test/ui/pattern/usefulness/slice-patterns-irrefutable.rs b/tests/ui/pattern/usefulness/slice-patterns-irrefutable.rs
index cbf64e2c5..cbf64e2c5 100644
--- a/src/test/ui/pattern/usefulness/slice-patterns-irrefutable.rs
+++ b/tests/ui/pattern/usefulness/slice-patterns-irrefutable.rs
diff --git a/src/test/ui/pattern/usefulness/slice-patterns-reachability.rs b/tests/ui/pattern/usefulness/slice-patterns-reachability.rs
index 7c747b5e0..7c747b5e0 100644
--- a/src/test/ui/pattern/usefulness/slice-patterns-reachability.rs
+++ b/tests/ui/pattern/usefulness/slice-patterns-reachability.rs
diff --git a/src/test/ui/pattern/usefulness/slice-patterns-reachability.stderr b/tests/ui/pattern/usefulness/slice-patterns-reachability.stderr
index 607ffb765..607ffb765 100644
--- a/src/test/ui/pattern/usefulness/slice-patterns-reachability.stderr
+++ b/tests/ui/pattern/usefulness/slice-patterns-reachability.stderr
diff --git a/src/test/ui/pattern/usefulness/stable-gated-fields.rs b/tests/ui/pattern/usefulness/stable-gated-fields.rs
index 90f40a8d6..90f40a8d6 100644
--- a/src/test/ui/pattern/usefulness/stable-gated-fields.rs
+++ b/tests/ui/pattern/usefulness/stable-gated-fields.rs
diff --git a/src/test/ui/pattern/usefulness/stable-gated-fields.stderr b/tests/ui/pattern/usefulness/stable-gated-fields.stderr
index cf98c51a2..cf98c51a2 100644
--- a/src/test/ui/pattern/usefulness/stable-gated-fields.stderr
+++ b/tests/ui/pattern/usefulness/stable-gated-fields.stderr
diff --git a/src/test/ui/pattern/usefulness/stable-gated-patterns.rs b/tests/ui/pattern/usefulness/stable-gated-patterns.rs
index 03db01160..03db01160 100644
--- a/src/test/ui/pattern/usefulness/stable-gated-patterns.rs
+++ b/tests/ui/pattern/usefulness/stable-gated-patterns.rs
diff --git a/src/test/ui/pattern/usefulness/stable-gated-patterns.stderr b/tests/ui/pattern/usefulness/stable-gated-patterns.stderr
index 7b8588a3c..7b8588a3c 100644
--- a/src/test/ui/pattern/usefulness/stable-gated-patterns.stderr
+++ b/tests/ui/pattern/usefulness/stable-gated-patterns.stderr
diff --git a/src/test/ui/pattern/usefulness/struct-like-enum-nonexhaustive.rs b/tests/ui/pattern/usefulness/struct-like-enum-nonexhaustive.rs
index b1fc0f5ad..b1fc0f5ad 100644
--- a/src/test/ui/pattern/usefulness/struct-like-enum-nonexhaustive.rs
+++ b/tests/ui/pattern/usefulness/struct-like-enum-nonexhaustive.rs
diff --git a/src/test/ui/pattern/usefulness/struct-like-enum-nonexhaustive.stderr b/tests/ui/pattern/usefulness/struct-like-enum-nonexhaustive.stderr
index 85c97be29..85c97be29 100644
--- a/src/test/ui/pattern/usefulness/struct-like-enum-nonexhaustive.stderr
+++ b/tests/ui/pattern/usefulness/struct-like-enum-nonexhaustive.stderr
diff --git a/src/test/ui/pattern/usefulness/struct-pattern-match-useless.rs b/tests/ui/pattern/usefulness/struct-pattern-match-useless.rs
index 93f0a9317..93f0a9317 100644
--- a/src/test/ui/pattern/usefulness/struct-pattern-match-useless.rs
+++ b/tests/ui/pattern/usefulness/struct-pattern-match-useless.rs
diff --git a/src/test/ui/pattern/usefulness/struct-pattern-match-useless.stderr b/tests/ui/pattern/usefulness/struct-pattern-match-useless.stderr
index fbee33de6..fbee33de6 100644
--- a/src/test/ui/pattern/usefulness/struct-pattern-match-useless.stderr
+++ b/tests/ui/pattern/usefulness/struct-pattern-match-useless.stderr
diff --git a/src/test/ui/pattern/usefulness/top-level-alternation.rs b/tests/ui/pattern/usefulness/top-level-alternation.rs
index e8cd12ea4..e8cd12ea4 100644
--- a/src/test/ui/pattern/usefulness/top-level-alternation.rs
+++ b/tests/ui/pattern/usefulness/top-level-alternation.rs
diff --git a/src/test/ui/pattern/usefulness/top-level-alternation.stderr b/tests/ui/pattern/usefulness/top-level-alternation.stderr
index 17fa951c5..17fa951c5 100644
--- a/src/test/ui/pattern/usefulness/top-level-alternation.stderr
+++ b/tests/ui/pattern/usefulness/top-level-alternation.stderr
diff --git a/src/test/ui/pattern/usefulness/tuple-struct-nonexhaustive.rs b/tests/ui/pattern/usefulness/tuple-struct-nonexhaustive.rs
index 76bcf3fbd..76bcf3fbd 100644
--- a/src/test/ui/pattern/usefulness/tuple-struct-nonexhaustive.rs
+++ b/tests/ui/pattern/usefulness/tuple-struct-nonexhaustive.rs
diff --git a/src/test/ui/pattern/usefulness/tuple-struct-nonexhaustive.stderr b/tests/ui/pattern/usefulness/tuple-struct-nonexhaustive.stderr
index e2a65ff85..e2a65ff85 100644
--- a/src/test/ui/pattern/usefulness/tuple-struct-nonexhaustive.stderr
+++ b/tests/ui/pattern/usefulness/tuple-struct-nonexhaustive.stderr
diff --git a/src/test/ui/pattern/usefulness/type_polymorphic_byte_str_literals.rs b/tests/ui/pattern/usefulness/type_polymorphic_byte_str_literals.rs
index cb44c1da7..cb44c1da7 100644
--- a/src/test/ui/pattern/usefulness/type_polymorphic_byte_str_literals.rs
+++ b/tests/ui/pattern/usefulness/type_polymorphic_byte_str_literals.rs
diff --git a/src/test/ui/pattern/usefulness/type_polymorphic_byte_str_literals.stderr b/tests/ui/pattern/usefulness/type_polymorphic_byte_str_literals.stderr
index acae605da..acae605da 100644
--- a/src/test/ui/pattern/usefulness/type_polymorphic_byte_str_literals.stderr
+++ b/tests/ui/pattern/usefulness/type_polymorphic_byte_str_literals.stderr
diff --git a/src/test/ui/pattern/usefulness/uninhabited.rs b/tests/ui/pattern/usefulness/uninhabited.rs
index 5622808d4..5622808d4 100644
--- a/src/test/ui/pattern/usefulness/uninhabited.rs
+++ b/tests/ui/pattern/usefulness/uninhabited.rs
diff --git a/src/test/ui/pattern/usefulness/unstable-gated-fields.rs b/tests/ui/pattern/usefulness/unstable-gated-fields.rs
index 2b473ae98..2b473ae98 100644
--- a/src/test/ui/pattern/usefulness/unstable-gated-fields.rs
+++ b/tests/ui/pattern/usefulness/unstable-gated-fields.rs
diff --git a/src/test/ui/pattern/usefulness/unstable-gated-fields.stderr b/tests/ui/pattern/usefulness/unstable-gated-fields.stderr
index e4f5fa06b..e4f5fa06b 100644
--- a/src/test/ui/pattern/usefulness/unstable-gated-fields.stderr
+++ b/tests/ui/pattern/usefulness/unstable-gated-fields.stderr
diff --git a/src/test/ui/pattern/usefulness/unstable-gated-patterns.rs b/tests/ui/pattern/usefulness/unstable-gated-patterns.rs
index 7046555e0..7046555e0 100644
--- a/src/test/ui/pattern/usefulness/unstable-gated-patterns.rs
+++ b/tests/ui/pattern/usefulness/unstable-gated-patterns.rs
diff --git a/src/test/ui/pattern/usefulness/unstable-gated-patterns.stderr b/tests/ui/pattern/usefulness/unstable-gated-patterns.stderr
index 6dc9a4058..6dc9a4058 100644
--- a/src/test/ui/pattern/usefulness/unstable-gated-patterns.stderr
+++ b/tests/ui/pattern/usefulness/unstable-gated-patterns.stderr
diff --git a/src/test/ui/phantom-auto-trait.rs b/tests/ui/phantom-auto-trait.rs
index 0172ca335..0172ca335 100644
--- a/src/test/ui/phantom-auto-trait.rs
+++ b/tests/ui/phantom-auto-trait.rs
diff --git a/src/test/ui/phantom-auto-trait.stderr b/tests/ui/phantom-auto-trait.stderr
index 015c8fa4c..4769d53eb 100644
--- a/src/test/ui/phantom-auto-trait.stderr
+++ b/tests/ui/phantom-auto-trait.stderr
@@ -10,7 +10,7 @@ note: required for `&T` to implement `Zen`
   --> $DIR/phantom-auto-trait.rs:10:24
    |
 LL | unsafe impl<'a, T: 'a> Zen for &'a T where T: Sync {}
-   |                        ^^^     ^^^^^
+   |                        ^^^     ^^^^^          ---- unsatisfied trait bound introduced here
    = note: required because it appears within the type `PhantomData<&T>`
 note: required because it appears within the type `Guard<'_, T>`
   --> $DIR/phantom-auto-trait.rs:12:8
@@ -39,7 +39,7 @@ note: required for `&T` to implement `Zen`
   --> $DIR/phantom-auto-trait.rs:10:24
    |
 LL | unsafe impl<'a, T: 'a> Zen for &'a T where T: Sync {}
-   |                        ^^^     ^^^^^
+   |                        ^^^     ^^^^^          ---- unsatisfied trait bound introduced here
    = note: required because it appears within the type `PhantomData<&T>`
 note: required because it appears within the type `Guard<'_, T>`
   --> $DIR/phantom-auto-trait.rs:12:8
diff --git a/src/test/ui/pin-macro/cant_access_internals.rs b/tests/ui/pin-macro/cant_access_internals.rs
index 120d08894..5826a18b5 100644
--- a/src/test/ui/pin-macro/cant_access_internals.rs
+++ b/tests/ui/pin-macro/cant_access_internals.rs
@@ -1,5 +1,4 @@
 // edition:2018
-#![feature(pin_macro)]
 
 use core::{
     marker::PhantomPinned,
diff --git a/src/test/ui/pin-macro/cant_access_internals.stderr b/tests/ui/pin-macro/cant_access_internals.stderr
index 060c9c48c..d43027657 100644
--- a/src/test/ui/pin-macro/cant_access_internals.stderr
+++ b/tests/ui/pin-macro/cant_access_internals.stderr
@@ -1,5 +1,5 @@
 error[E0658]: use of unstable library feature 'unsafe_pin_internals'
-  --> $DIR/cant_access_internals.rs:12:15
+  --> $DIR/cant_access_internals.rs:11:15
    |
 LL |     mem::take(phantom_pinned.pointer);
    |               ^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/pin-macro/lifetime_errors_on_promotion_misusage.rs b/tests/ui/pin-macro/lifetime_errors_on_promotion_misusage.rs
index ca2b6cf75..59774bc75 100644
--- a/src/test/ui/pin-macro/lifetime_errors_on_promotion_misusage.rs
+++ b/tests/ui/pin-macro/lifetime_errors_on_promotion_misusage.rs
@@ -1,5 +1,4 @@
 // edition:2018
-#![feature(pin_macro)]
 
 use core::{
     convert::identity,
diff --git a/src/test/ui/pin-macro/lifetime_errors_on_promotion_misusage.stderr b/tests/ui/pin-macro/lifetime_errors_on_promotion_misusage.stderr
index fc1be052f..4ecc6370d 100644
--- a/src/test/ui/pin-macro/lifetime_errors_on_promotion_misusage.stderr
+++ b/tests/ui/pin-macro/lifetime_errors_on_promotion_misusage.stderr
@@ -1,5 +1,5 @@
 error[E0716]: temporary value dropped while borrowed
-  --> $DIR/lifetime_errors_on_promotion_misusage.rs:12:35
+  --> $DIR/lifetime_errors_on_promotion_misusage.rs:11:35
    |
 LL |     let phantom_pinned = identity(pin!(PhantomPinned));
    |                                   ^^^^^^^^^^^^^^^^^^^ - temporary value is freed at the end of this statement
@@ -13,7 +13,7 @@ LL |     stuff(phantom_pinned)
    = note: this error originates in the macro `pin` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0716]: temporary value dropped while borrowed
-  --> $DIR/lifetime_errors_on_promotion_misusage.rs:19:30
+  --> $DIR/lifetime_errors_on_promotion_misusage.rs:18:30
    |
 LL |     let phantom_pinned = {
    |         -------------- borrow later stored here
diff --git a/src/test/ui/point-to-type-err-cause-on-impl-trait-return-2.rs b/tests/ui/point-to-type-err-cause-on-impl-trait-return-2.rs
index 50f1fe873..50f1fe873 100644
--- a/src/test/ui/point-to-type-err-cause-on-impl-trait-return-2.rs
+++ b/tests/ui/point-to-type-err-cause-on-impl-trait-return-2.rs
diff --git a/src/test/ui/point-to-type-err-cause-on-impl-trait-return-2.stderr b/tests/ui/point-to-type-err-cause-on-impl-trait-return-2.stderr
index f5a5f1ab3..f5a5f1ab3 100644
--- a/src/test/ui/point-to-type-err-cause-on-impl-trait-return-2.stderr
+++ b/tests/ui/point-to-type-err-cause-on-impl-trait-return-2.stderr
diff --git a/src/test/ui/polymorphization/closure_in_upvar/fn.rs b/tests/ui/polymorphization/closure_in_upvar/fn.rs
index e10308588..e10308588 100644
--- a/src/test/ui/polymorphization/closure_in_upvar/fn.rs
+++ b/tests/ui/polymorphization/closure_in_upvar/fn.rs
diff --git a/src/test/ui/polymorphization/closure_in_upvar/fnmut.rs b/tests/ui/polymorphization/closure_in_upvar/fnmut.rs
index 62164ff94..62164ff94 100644
--- a/src/test/ui/polymorphization/closure_in_upvar/fnmut.rs
+++ b/tests/ui/polymorphization/closure_in_upvar/fnmut.rs
diff --git a/src/test/ui/polymorphization/closure_in_upvar/fnonce.rs b/tests/ui/polymorphization/closure_in_upvar/fnonce.rs
index 7a364882f..7a364882f 100644
--- a/src/test/ui/polymorphization/closure_in_upvar/fnonce.rs
+++ b/tests/ui/polymorphization/closure_in_upvar/fnonce.rs
diff --git a/src/test/ui/polymorphization/closure_in_upvar/other.rs b/tests/ui/polymorphization/closure_in_upvar/other.rs
index 27d59ec88..27d59ec88 100644
--- a/src/test/ui/polymorphization/closure_in_upvar/other.rs
+++ b/tests/ui/polymorphization/closure_in_upvar/other.rs
diff --git a/src/test/ui/polymorphization/const_parameters/closures.rs b/tests/ui/polymorphization/const_parameters/closures.rs
index 2f41beeb9..2f41beeb9 100644
--- a/src/test/ui/polymorphization/const_parameters/closures.rs
+++ b/tests/ui/polymorphization/const_parameters/closures.rs
diff --git a/src/test/ui/polymorphization/const_parameters/closures.stderr b/tests/ui/polymorphization/const_parameters/closures.stderr
index 4e927f773..4e927f773 100644
--- a/src/test/ui/polymorphization/const_parameters/closures.stderr
+++ b/tests/ui/polymorphization/const_parameters/closures.stderr
diff --git a/src/test/ui/polymorphization/const_parameters/functions.rs b/tests/ui/polymorphization/const_parameters/functions.rs
index cbc1b63fb..cbc1b63fb 100644
--- a/src/test/ui/polymorphization/const_parameters/functions.rs
+++ b/tests/ui/polymorphization/const_parameters/functions.rs
diff --git a/src/test/ui/polymorphization/const_parameters/functions.stderr b/tests/ui/polymorphization/const_parameters/functions.stderr
index 9d0922ac7..9d0922ac7 100644
--- a/src/test/ui/polymorphization/const_parameters/functions.stderr
+++ b/tests/ui/polymorphization/const_parameters/functions.stderr
diff --git a/src/test/ui/polymorphization/drop_shims/simple.rs b/tests/ui/polymorphization/drop_shims/simple.rs
index 2695dc6d4..2695dc6d4 100644
--- a/src/test/ui/polymorphization/drop_shims/simple.rs
+++ b/tests/ui/polymorphization/drop_shims/simple.rs
diff --git a/src/test/ui/polymorphization/drop_shims/transitive.rs b/tests/ui/polymorphization/drop_shims/transitive.rs
index c22891171..c22891171 100644
--- a/src/test/ui/polymorphization/drop_shims/transitive.rs
+++ b/tests/ui/polymorphization/drop_shims/transitive.rs
diff --git a/src/test/ui/polymorphization/generators.rs b/tests/ui/polymorphization/generators.rs
index 779bac0ac..779bac0ac 100644
--- a/src/test/ui/polymorphization/generators.rs
+++ b/tests/ui/polymorphization/generators.rs
diff --git a/src/test/ui/polymorphization/generators.stderr b/tests/ui/polymorphization/generators.stderr
index 84888f6fb..84888f6fb 100644
--- a/src/test/ui/polymorphization/generators.stderr
+++ b/tests/ui/polymorphization/generators.stderr
diff --git a/src/test/ui/polymorphization/issue-74614.rs b/tests/ui/polymorphization/issue-74614.rs
index 8b0c00b13..8b0c00b13 100644
--- a/src/test/ui/polymorphization/issue-74614.rs
+++ b/tests/ui/polymorphization/issue-74614.rs
diff --git a/src/test/ui/polymorphization/issue-74636.rs b/tests/ui/polymorphization/issue-74636.rs
index 4c532f451..4c532f451 100644
--- a/src/test/ui/polymorphization/issue-74636.rs
+++ b/tests/ui/polymorphization/issue-74636.rs
diff --git a/src/test/ui/polymorphization/lifetimes.rs b/tests/ui/polymorphization/lifetimes.rs
index f26df4523..f26df4523 100644
--- a/src/test/ui/polymorphization/lifetimes.rs
+++ b/tests/ui/polymorphization/lifetimes.rs
diff --git a/src/test/ui/polymorphization/lifetimes.stderr b/tests/ui/polymorphization/lifetimes.stderr
index 4773dd4fa..4773dd4fa 100644
--- a/src/test/ui/polymorphization/lifetimes.stderr
+++ b/tests/ui/polymorphization/lifetimes.stderr
diff --git a/src/test/ui/polymorphization/normalized_sig_types.rs b/tests/ui/polymorphization/normalized_sig_types.rs
index d732b1071..d732b1071 100644
--- a/src/test/ui/polymorphization/normalized_sig_types.rs
+++ b/tests/ui/polymorphization/normalized_sig_types.rs
diff --git a/src/test/ui/polymorphization/predicates.rs b/tests/ui/polymorphization/predicates.rs
index 6a5fc2e33..6a5fc2e33 100644
--- a/src/test/ui/polymorphization/predicates.rs
+++ b/tests/ui/polymorphization/predicates.rs
diff --git a/src/test/ui/polymorphization/predicates.stderr b/tests/ui/polymorphization/predicates.stderr
index 80bb2af25..80bb2af25 100644
--- a/src/test/ui/polymorphization/predicates.stderr
+++ b/tests/ui/polymorphization/predicates.stderr
diff --git a/src/test/ui/polymorphization/promoted-function-1.rs b/tests/ui/polymorphization/promoted-function-1.rs
index 2cd026734..2cd026734 100644
--- a/src/test/ui/polymorphization/promoted-function-1.rs
+++ b/tests/ui/polymorphization/promoted-function-1.rs
diff --git a/src/test/ui/polymorphization/promoted-function-1.stderr b/tests/ui/polymorphization/promoted-function-1.stderr
index fcbb86949..fcbb86949 100644
--- a/src/test/ui/polymorphization/promoted-function-1.stderr
+++ b/tests/ui/polymorphization/promoted-function-1.stderr
diff --git a/src/test/ui/polymorphization/promoted-function-2.rs b/tests/ui/polymorphization/promoted-function-2.rs
index d2d0f3368..d2d0f3368 100644
--- a/src/test/ui/polymorphization/promoted-function-2.rs
+++ b/tests/ui/polymorphization/promoted-function-2.rs
diff --git a/src/test/ui/polymorphization/promoted-function-2.stderr b/tests/ui/polymorphization/promoted-function-2.stderr
index 547569df7..547569df7 100644
--- a/src/test/ui/polymorphization/promoted-function-2.stderr
+++ b/tests/ui/polymorphization/promoted-function-2.stderr
diff --git a/src/test/ui/polymorphization/promoted-function-3.rs b/tests/ui/polymorphization/promoted-function-3.rs
index bbd991e36..bbd991e36 100644
--- a/src/test/ui/polymorphization/promoted-function-3.rs
+++ b/tests/ui/polymorphization/promoted-function-3.rs
diff --git a/src/test/ui/polymorphization/promoted-function.rs b/tests/ui/polymorphization/promoted-function.rs
index a56a8e70e..a56a8e70e 100644
--- a/src/test/ui/polymorphization/promoted-function.rs
+++ b/tests/ui/polymorphization/promoted-function.rs
diff --git a/src/test/ui/polymorphization/symbol-ambiguity.rs b/tests/ui/polymorphization/symbol-ambiguity.rs
index 6277a902f..6277a902f 100644
--- a/src/test/ui/polymorphization/symbol-ambiguity.rs
+++ b/tests/ui/polymorphization/symbol-ambiguity.rs
diff --git a/src/test/ui/polymorphization/too-many-generic-params.rs b/tests/ui/polymorphization/too-many-generic-params.rs
index ec6244630..ec6244630 100644
--- a/src/test/ui/polymorphization/too-many-generic-params.rs
+++ b/tests/ui/polymorphization/too-many-generic-params.rs
diff --git a/src/test/ui/polymorphization/type_parameters/closures.rs b/tests/ui/polymorphization/type_parameters/closures.rs
index 07ab1355a..07ab1355a 100644
--- a/src/test/ui/polymorphization/type_parameters/closures.rs
+++ b/tests/ui/polymorphization/type_parameters/closures.rs
diff --git a/src/test/ui/polymorphization/type_parameters/closures.stderr b/tests/ui/polymorphization/type_parameters/closures.stderr
index 94a4a08bd..94a4a08bd 100644
--- a/src/test/ui/polymorphization/type_parameters/closures.stderr
+++ b/tests/ui/polymorphization/type_parameters/closures.stderr
diff --git a/src/test/ui/polymorphization/type_parameters/functions.rs b/tests/ui/polymorphization/type_parameters/functions.rs
index aad957e1d..aad957e1d 100644
--- a/src/test/ui/polymorphization/type_parameters/functions.rs
+++ b/tests/ui/polymorphization/type_parameters/functions.rs
diff --git a/src/test/ui/polymorphization/type_parameters/functions.stderr b/tests/ui/polymorphization/type_parameters/functions.stderr
index d629ff7bb..d629ff7bb 100644
--- a/src/test/ui/polymorphization/type_parameters/functions.stderr
+++ b/tests/ui/polymorphization/type_parameters/functions.stderr
diff --git a/src/test/ui/polymorphization/unsized_cast.rs b/tests/ui/polymorphization/unsized_cast.rs
index b803fec2c..b803fec2c 100644
--- a/src/test/ui/polymorphization/unsized_cast.rs
+++ b/tests/ui/polymorphization/unsized_cast.rs
diff --git a/src/test/ui/polymorphization/unsized_cast.stderr b/tests/ui/polymorphization/unsized_cast.stderr
index 27f88d281..27f88d281 100644
--- a/src/test/ui/polymorphization/unsized_cast.stderr
+++ b/tests/ui/polymorphization/unsized_cast.stderr
diff --git a/src/test/ui/pptypedef.rs b/tests/ui/pptypedef.rs
index e28d323f8..e28d323f8 100644
--- a/src/test/ui/pptypedef.rs
+++ b/tests/ui/pptypedef.rs
diff --git a/tests/ui/pptypedef.stderr b/tests/ui/pptypedef.stderr
new file mode 100644
index 000000000..08b90b365
--- /dev/null
+++ b/tests/ui/pptypedef.stderr
@@ -0,0 +1,29 @@
+error[E0308]: mismatched types
+  --> $DIR/pptypedef.rs:4:37
+   |
+LL |     let_in(3u32, |i| { assert!(i == 3i32); });
+   |                                -    ^^^^ expected `u32`, found `i32`
+   |                                |
+   |                                expected because this is `u32`
+   |
+help: change the type of the numeric literal from `i32` to `u32`
+   |
+LL |     let_in(3u32, |i| { assert!(i == 3u32); });
+   |                                      ~~~
+
+error[E0308]: mismatched types
+  --> $DIR/pptypedef.rs:8:37
+   |
+LL |     let_in(3i32, |i| { assert!(i == 3u32); });
+   |                                -    ^^^^ expected `i32`, found `u32`
+   |                                |
+   |                                expected because this is `i32`
+   |
+help: change the type of the numeric literal from `u32` to `i32`
+   |
+LL |     let_in(3i32, |i| { assert!(i == 3i32); });
+   |                                      ~~~
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/primitive-binop-lhs-mut.rs b/tests/ui/primitive-binop-lhs-mut.rs
index 4f1c456ac..4f1c456ac 100644
--- a/src/test/ui/primitive-binop-lhs-mut.rs
+++ b/tests/ui/primitive-binop-lhs-mut.rs
diff --git a/src/test/ui/print-fuel/print-fuel.rs b/tests/ui/print-fuel/print-fuel.rs
index f68de00b9..f68de00b9 100644
--- a/src/test/ui/print-fuel/print-fuel.rs
+++ b/tests/ui/print-fuel/print-fuel.rs
diff --git a/src/test/ui/print-fuel/print-fuel.stderr b/tests/ui/print-fuel/print-fuel.stderr
index cc88cc077..cc88cc077 100644
--- a/src/test/ui/print-fuel/print-fuel.stderr
+++ b/tests/ui/print-fuel/print-fuel.stderr
diff --git a/src/test/ui/print-stdout-eprint-stderr.rs b/tests/ui/print-stdout-eprint-stderr.rs
index cfa9aec80..cfa9aec80 100644
--- a/src/test/ui/print-stdout-eprint-stderr.rs
+++ b/tests/ui/print-stdout-eprint-stderr.rs
diff --git a/src/test/ui/print_type_sizes/anonymous.rs b/tests/ui/print_type_sizes/anonymous.rs
index 2b008ca3b..2b008ca3b 100644
--- a/src/test/ui/print_type_sizes/anonymous.rs
+++ b/tests/ui/print_type_sizes/anonymous.rs
diff --git a/tests/ui/print_type_sizes/async.rs b/tests/ui/print_type_sizes/async.rs
new file mode 100644
index 000000000..1598b0696
--- /dev/null
+++ b/tests/ui/print_type_sizes/async.rs
@@ -0,0 +1,11 @@
+// compile-flags: -Z print-type-sizes --crate-type lib
+// edition:2021
+// build-pass
+// ignore-pass
+
+async fn wait() {}
+
+pub async fn test(arg: [u8; 8192]) {
+    wait().await;
+    drop(arg);
+}
diff --git a/tests/ui/print_type_sizes/async.stdout b/tests/ui/print_type_sizes/async.stdout
new file mode 100644
index 000000000..6e47bb493
--- /dev/null
+++ b/tests/ui/print_type_sizes/async.stdout
@@ -0,0 +1,34 @@
+print-type-size type: `[async fn body@$DIR/async.rs:8:36: 11:2]`: 16386 bytes, alignment: 1 bytes
+print-type-size     discriminant: 1 bytes
+print-type-size     variant `Suspend0`: 16385 bytes
+print-type-size         field `.arg`: 8192 bytes, offset: 0 bytes, alignment: 1 bytes
+print-type-size         field `.arg`: 8192 bytes
+print-type-size         field `.__awaitee`: 1 bytes
+print-type-size     variant `Unresumed`: 8192 bytes
+print-type-size         field `.arg`: 8192 bytes, offset: 0 bytes, alignment: 1 bytes
+print-type-size     variant `Returned`: 8192 bytes
+print-type-size         field `.arg`: 8192 bytes, offset: 0 bytes, alignment: 1 bytes
+print-type-size     variant `Panicked`: 8192 bytes
+print-type-size         field `.arg`: 8192 bytes, offset: 0 bytes, alignment: 1 bytes
+print-type-size type: `std::mem::ManuallyDrop<[u8; 8192]>`: 8192 bytes, alignment: 1 bytes
+print-type-size     field `.value`: 8192 bytes
+print-type-size type: `std::mem::MaybeUninit<[u8; 8192]>`: 8192 bytes, alignment: 1 bytes
+print-type-size     variant `MaybeUninit`: 8192 bytes
+print-type-size         field `.uninit`: 0 bytes
+print-type-size         field `.value`: 8192 bytes
+print-type-size type: `[async fn body@$DIR/async.rs:6:17: 6:19]`: 1 bytes, alignment: 1 bytes
+print-type-size     discriminant: 1 bytes
+print-type-size     variant `Unresumed`: 0 bytes
+print-type-size     variant `Returned`: 0 bytes
+print-type-size     variant `Panicked`: 0 bytes
+print-type-size type: `std::mem::ManuallyDrop<[async fn body@$DIR/async.rs:6:17: 6:19]>`: 1 bytes, alignment: 1 bytes
+print-type-size     field `.value`: 1 bytes
+print-type-size type: `std::mem::MaybeUninit<[async fn body@$DIR/async.rs:6:17: 6:19]>`: 1 bytes, alignment: 1 bytes
+print-type-size     variant `MaybeUninit`: 1 bytes
+print-type-size         field `.uninit`: 0 bytes
+print-type-size         field `.value`: 1 bytes
+print-type-size type: `std::task::Poll<()>`: 1 bytes, alignment: 1 bytes
+print-type-size     discriminant: 1 bytes
+print-type-size     variant `Ready`: 0 bytes
+print-type-size         field `.0`: 0 bytes
+print-type-size     variant `Pending`: 0 bytes
diff --git a/tests/ui/print_type_sizes/generator.rs b/tests/ui/print_type_sizes/generator.rs
new file mode 100644
index 000000000..d1cd36274
--- /dev/null
+++ b/tests/ui/print_type_sizes/generator.rs
@@ -0,0 +1,18 @@
+// compile-flags: -Z print-type-sizes --crate-type=lib
+// build-pass
+// ignore-pass
+
+#![feature(generators, generator_trait)]
+
+use std::ops::Generator;
+
+fn generator<const C: usize>(array: [u8; C]) -> impl Generator<Yield = (), Return = ()> {
+    move |()| {
+        yield ();
+        let _ = array;
+    }
+}
+
+pub fn foo() {
+    let _ = generator([0; 8192]);
+}
diff --git a/tests/ui/print_type_sizes/generator.stdout b/tests/ui/print_type_sizes/generator.stdout
new file mode 100644
index 000000000..28d4a6e6c
--- /dev/null
+++ b/tests/ui/print_type_sizes/generator.stdout
@@ -0,0 +1,10 @@
+print-type-size type: `[generator@$DIR/generator.rs:10:5: 10:14]`: 8193 bytes, alignment: 1 bytes
+print-type-size     discriminant: 1 bytes
+print-type-size     variant `Unresumed`: 8192 bytes
+print-type-size         field `.array`: 8192 bytes, offset: 0 bytes, alignment: 1 bytes
+print-type-size     variant `Returned`: 8192 bytes
+print-type-size         field `.array`: 8192 bytes, offset: 0 bytes, alignment: 1 bytes
+print-type-size     variant `Panicked`: 8192 bytes
+print-type-size         field `.array`: 8192 bytes, offset: 0 bytes, alignment: 1 bytes
+print-type-size     variant `Suspend0`: 8192 bytes
+print-type-size         field `.array`: 8192 bytes, offset: 0 bytes, alignment: 1 bytes
diff --git a/tests/ui/print_type_sizes/generator_discr_placement.rs b/tests/ui/print_type_sizes/generator_discr_placement.rs
new file mode 100644
index 000000000..1a85fe95b
--- /dev/null
+++ b/tests/ui/print_type_sizes/generator_discr_placement.rs
@@ -0,0 +1,23 @@
+// compile-flags: -Z print-type-sizes --crate-type lib
+// build-pass
+// ignore-pass
+
+// Tests a generator that has its discriminant as the *final* field.
+
+// Avoid emitting panic handlers, like the rest of these tests...
+#![feature(generators)]
+
+pub fn foo() {
+    let a = || {
+        {
+            let w: i32 = 4;
+            yield;
+            drop(w);
+        }
+        {
+            let z: i32 = 7;
+            yield;
+            drop(z);
+        }
+    };
+}
diff --git a/tests/ui/print_type_sizes/generator_discr_placement.stdout b/tests/ui/print_type_sizes/generator_discr_placement.stdout
new file mode 100644
index 000000000..7f8f4ccae
--- /dev/null
+++ b/tests/ui/print_type_sizes/generator_discr_placement.stdout
@@ -0,0 +1,11 @@
+print-type-size type: `[generator@$DIR/generator_discr_placement.rs:11:13: 11:15]`: 8 bytes, alignment: 4 bytes
+print-type-size     discriminant: 1 bytes
+print-type-size     variant `Suspend0`: 7 bytes
+print-type-size         padding: 3 bytes
+print-type-size         field `.w`: 4 bytes, alignment: 4 bytes
+print-type-size     variant `Suspend1`: 7 bytes
+print-type-size         padding: 3 bytes
+print-type-size         field `.z`: 4 bytes, alignment: 4 bytes
+print-type-size     variant `Unresumed`: 0 bytes
+print-type-size     variant `Returned`: 0 bytes
+print-type-size     variant `Panicked`: 0 bytes
diff --git a/tests/ui/print_type_sizes/generics.rs b/tests/ui/print_type_sizes/generics.rs
new file mode 100644
index 000000000..05097087d
--- /dev/null
+++ b/tests/ui/print_type_sizes/generics.rs
@@ -0,0 +1,51 @@
+// compile-flags: -Z print-type-sizes --crate-type=lib
+// build-pass
+// ignore-pass
+// ^-- needed because `--pass check` does not emit the output needed.
+//     FIXME: consider using an attribute instead of side-effects.
+
+// This file illustrates how generics are handled: types have to be
+// monomorphized, in the MIR of the original function in which they
+// occur, to have their size reported.
+
+#[derive(Copy, Clone)]
+pub struct Pair<T> {
+    _car: T,
+    _cdr: T,
+}
+
+impl<T> Pair<T> {
+    fn new(a: T, d: T) -> Self {
+        Pair {
+            _car: a,
+            _cdr: d,
+        }
+    }
+}
+
+#[derive(Copy, Clone)]
+pub struct SevenBytes([u8; 7]);
+pub struct FiftyBytes([u8; 50]);
+
+pub struct ZeroSized;
+
+impl SevenBytes {
+    fn new() -> Self { SevenBytes([0; 7]) }
+}
+
+impl FiftyBytes {
+    fn new() -> Self { FiftyBytes([0; 50]) }
+}
+
+pub fn f1<T:Copy>(x: T) {
+    let _v: Pair<T> = Pair::new(x, x);
+    let _v2: Pair<FiftyBytes> =
+        Pair::new(FiftyBytes::new(), FiftyBytes::new());
+}
+
+pub fn start() {
+    let _b: Pair<u8> = Pair::new(0, 0);
+    let _s: Pair<SevenBytes> = Pair::new(SevenBytes::new(), SevenBytes::new());
+    let ref _z: ZeroSized = ZeroSized;
+    f1::<SevenBytes>(SevenBytes::new());
+}
diff --git a/src/test/ui/print_type_sizes/generics.stdout b/tests/ui/print_type_sizes/generics.stdout
index 0f02f3979..0f02f3979 100644
--- a/src/test/ui/print_type_sizes/generics.stdout
+++ b/tests/ui/print_type_sizes/generics.stdout
diff --git a/tests/ui/print_type_sizes/multiple_types.rs b/tests/ui/print_type_sizes/multiple_types.rs
new file mode 100644
index 000000000..915903892
--- /dev/null
+++ b/tests/ui/print_type_sizes/multiple_types.rs
@@ -0,0 +1,13 @@
+// compile-flags: -Z print-type-sizes --crate-type=lib
+// build-pass
+
+// This file illustrates that when multiple structural types occur in
+// a function, every one of them is included in the output.
+
+pub struct SevenBytes([u8;  7]);
+pub struct FiftyBytes([u8; 50]);
+
+pub enum Enum {
+    Small(SevenBytes),
+    Large(FiftyBytes),
+}
diff --git a/src/test/ui/print_type_sizes/multiple_types.stdout b/tests/ui/print_type_sizes/multiple_types.stdout
index 641188154..641188154 100644
--- a/src/test/ui/print_type_sizes/multiple_types.stdout
+++ b/tests/ui/print_type_sizes/multiple_types.stdout
diff --git a/src/test/ui/print_type_sizes/niche-filling.rs b/tests/ui/print_type_sizes/niche-filling.rs
index 0716cee21..5e620f248 100644
--- a/src/test/ui/print_type_sizes/niche-filling.rs
+++ b/tests/ui/print_type_sizes/niche-filling.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z print-type-sizes
+// compile-flags: -Z print-type-sizes --crate-type=lib
 // build-pass
 // ignore-pass
 // ^-- needed because `--pass check` does not emit the output needed.
@@ -14,7 +14,6 @@
 // aligned (while on most it is 8-byte aligned) and so the resulting
 // padding and overall computed sizes can be quite different.
 
-#![feature(start)]
 #![feature(rustc_attrs)]
 #![allow(dead_code)]
 
@@ -56,7 +55,7 @@ pub struct NestedNonZero {
 
 impl Default for NestedNonZero {
     fn default() -> Self {
-        NestedNonZero { pre: 0, val: NonZeroU32::new(1).unwrap(), post: 0 }
+        NestedNonZero { pre: 0, val: unsafe { NonZeroU32::new_unchecked(1) }, post: 0 }
     }
 }
 
@@ -76,8 +75,7 @@ pub union Union2<A: Copy, B: Copy> {
     b: B,
 }
 
-#[start]
-fn start(_: isize, _: *const *const u8) -> isize {
+pub fn test() {
     let _x: MyOption<NonZeroU32> = Default::default();
     let _y: EmbeddedDiscr = Default::default();
     let _z: MyOption<IndirectNonZero> = Default::default();
@@ -96,6 +94,4 @@ fn start(_: isize, _: *const *const u8) -> isize {
     // ...even when theoretically possible.
     let _j: MyOption<Union1<NonZeroU32>> = Default::default();
     let _k: MyOption<Union2<NonZeroU32, NonZeroU32>> = Default::default();
-
-    0
 }
diff --git a/src/test/ui/print_type_sizes/niche-filling.stdout b/tests/ui/print_type_sizes/niche-filling.stdout
index d1753c26c..d1753c26c 100644
--- a/src/test/ui/print_type_sizes/niche-filling.stdout
+++ b/tests/ui/print_type_sizes/niche-filling.stdout
diff --git a/src/test/ui/print_type_sizes/no_duplicates.rs b/tests/ui/print_type_sizes/no_duplicates.rs
index e45e4794a..2ec5d9e64 100644
--- a/src/test/ui/print_type_sizes/no_duplicates.rs
+++ b/tests/ui/print_type_sizes/no_duplicates.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z print-type-sizes
+// compile-flags: -Z print-type-sizes --crate-type=lib
 // build-pass
 // ignore-pass
 // ^-- needed because `--pass check` does not emit the output needed.
@@ -8,16 +8,12 @@
 // (even if multiple functions), it is only printed once in the
 // print-type-sizes output.
 
-#![feature(start)]
-
 pub struct SevenBytes([u8; 7]);
 
 pub fn f1() {
     let _s: SevenBytes = SevenBytes([0; 7]);
 }
 
-#[start]
-fn start(_: isize, _: *const *const u8) -> isize {
+pub fn test() {
     let _s: SevenBytes = SevenBytes([0; 7]);
-    0
 }
diff --git a/src/test/ui/print_type_sizes/no_duplicates.stdout b/tests/ui/print_type_sizes/no_duplicates.stdout
index 50180f356..50180f356 100644
--- a/src/test/ui/print_type_sizes/no_duplicates.stdout
+++ b/tests/ui/print_type_sizes/no_duplicates.stdout
diff --git a/tests/ui/print_type_sizes/packed.rs b/tests/ui/print_type_sizes/packed.rs
new file mode 100644
index 000000000..5ddfe4bf4
--- /dev/null
+++ b/tests/ui/print_type_sizes/packed.rs
@@ -0,0 +1,59 @@
+// compile-flags: -Z print-type-sizes --crate-type=lib
+// build-pass
+// ignore-pass
+// ^-- needed because `--pass check` does not emit the output needed.
+//     FIXME: consider using an attribute instead of side-effects.
+
+// This file illustrates how packing is handled; it should cause
+// the elimination of padding that would normally be introduced
+// to satisfy alignment desirata.
+//
+// It avoids using u64/i64 because on some targets that is only 4-byte
+// aligned (while on most it is 8-byte aligned) and so the resulting
+// padding and overall computed sizes can be quite different.
+
+#![allow(dead_code)]
+
+#[derive(Default)]
+#[repr(packed)]
+pub struct Packed1 {
+    a: u8,
+    b: u8,
+    g: i32,
+    c: u8,
+    h: i16,
+    d: u8,
+}
+
+#[derive(Default)]
+#[repr(packed(2))]
+pub struct Packed2 {
+    a: u8,
+    b: u8,
+    g: i32,
+    c: u8,
+    h: i16,
+    d: u8,
+}
+
+#[derive(Default)]
+#[repr(packed(2))]
+#[repr(C)]
+pub struct Packed2C {
+    a: u8,
+    b: u8,
+    g: i32,
+    c: u8,
+    h: i16,
+    d: u8,
+}
+
+#[derive(Default)]
+pub struct Padded {
+    a: u8,
+    b: u8,
+    g: i32,
+    c: u8,
+    h: i16,
+    d: u8,
+}
diff --git a/src/test/ui/print_type_sizes/packed.stdout b/tests/ui/print_type_sizes/packed.stdout
index 58e1bac9e..58e1bac9e 100644
--- a/src/test/ui/print_type_sizes/packed.stdout
+++ b/tests/ui/print_type_sizes/packed.stdout
diff --git a/src/test/ui/print_type_sizes/padding.rs b/tests/ui/print_type_sizes/padding.rs
index d1acad16d..f41c677dc 100644
--- a/src/test/ui/print_type_sizes/padding.rs
+++ b/tests/ui/print_type_sizes/padding.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z print-type-sizes
+// compile-flags: -Z print-type-sizes --crate-type=lib
 // build-pass
 
 // This file illustrates how padding is handled: alignment
@@ -9,7 +9,6 @@
 // aligned (while on most it is 8-byte aligned) and so the resulting
 // padding and overall computed sizes can be quite different.
 
-#![feature(start)]
 #![allow(dead_code)]
 
 struct S {
@@ -27,8 +26,3 @@ enum E2 {
     A(i8, i32),
     B(S),
 }
-
-#[start]
-fn start(_: isize, _: *const *const u8) -> isize {
-    0
-}
diff --git a/src/test/ui/print_type_sizes/padding.stdout b/tests/ui/print_type_sizes/padding.stdout
index 9afdf7624..9afdf7624 100644
--- a/src/test/ui/print_type_sizes/padding.stdout
+++ b/tests/ui/print_type_sizes/padding.stdout
diff --git a/src/test/ui/print_type_sizes/repr-align.rs b/tests/ui/print_type_sizes/repr-align.rs
index 07544935b..0bd11ebc9 100644
--- a/src/test/ui/print_type_sizes/repr-align.rs
+++ b/tests/ui/print_type_sizes/repr-align.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z print-type-sizes
+// compile-flags: -Z print-type-sizes --crate-type=lib
 // build-pass
 // ignore-pass
 // ^-- needed because `--pass check` does not emit the output needed.
@@ -11,7 +11,7 @@
 // It avoids using u64/i64 because on some targets that is only 4-byte
 // aligned (while on most it is 8-byte aligned) and so the resulting
 // padding and overall computed sizes can be quite different.
-#![feature(start)]
+
 #![allow(dead_code)]
 
 #[repr(align(16))]
@@ -24,15 +24,9 @@ enum E {
 }
 
 #[derive(Default)]
-struct S {
+pub struct S {
     a: i32,
     b: i32,
     c: A,
     d: i8,
 }
-
-#[start]
-fn start(_: isize, _: *const *const u8) -> isize {
-    let _s: S = Default::default();
-    0
-}
diff --git a/src/test/ui/print_type_sizes/repr-align.stdout b/tests/ui/print_type_sizes/repr-align.stdout
index 33671bd8e..33671bd8e 100644
--- a/src/test/ui/print_type_sizes/repr-align.stdout
+++ b/tests/ui/print_type_sizes/repr-align.stdout
diff --git a/tests/ui/print_type_sizes/repr_int_c.rs b/tests/ui/print_type_sizes/repr_int_c.rs
new file mode 100644
index 000000000..6b103776a
--- /dev/null
+++ b/tests/ui/print_type_sizes/repr_int_c.rs
@@ -0,0 +1,19 @@
+// compile-flags: -Z print-type-sizes --crate-type=lib
+// build-pass
+
+// This test makes sure that the tag is not grown for `repr(C)` or `repr(u8)`
+// variants (see https://github.com/rust-lang/rust/issues/50098 for the original bug).
+
+#![allow(dead_code)]
+
+#[repr(C, u8)]
+enum ReprCu8 {
+    A(u16),
+    B,
+}
+
+#[repr(u8)]
+enum Repru8 {
+    A(u16),
+    B,
+}
diff --git a/src/test/ui/print_type_sizes/repr_int_c.stdout b/tests/ui/print_type_sizes/repr_int_c.stdout
index 254b3c7a8..254b3c7a8 100644
--- a/src/test/ui/print_type_sizes/repr_int_c.stdout
+++ b/tests/ui/print_type_sizes/repr_int_c.stdout
diff --git a/tests/ui/print_type_sizes/uninhabited.rs b/tests/ui/print_type_sizes/uninhabited.rs
new file mode 100644
index 000000000..86fab7b50
--- /dev/null
+++ b/tests/ui/print_type_sizes/uninhabited.rs
@@ -0,0 +1,13 @@
+// compile-flags: -Z print-type-sizes --crate-type=lib
+// build-pass
+// ignore-pass
+// ^-- needed because `--pass check` does not emit the output needed.
+//     FIXME: consider using an attribute instead of side-effects.
+
+#![feature(never_type)]
+
+pub fn test() {
+    let _x: Option<!> = None;
+    let _y: Result<u32, !> = Ok(42);
+    let _z: Result<!, !> = loop {};
+}
diff --git a/src/test/ui/print_type_sizes/uninhabited.stdout b/tests/ui/print_type_sizes/uninhabited.stdout
index 5eb5384bc..5eb5384bc 100644
--- a/src/test/ui/print_type_sizes/uninhabited.stdout
+++ b/tests/ui/print_type_sizes/uninhabited.stdout
diff --git a/tests/ui/print_type_sizes/variants.rs b/tests/ui/print_type_sizes/variants.rs
new file mode 100644
index 000000000..5a3020520
--- /dev/null
+++ b/tests/ui/print_type_sizes/variants.rs
@@ -0,0 +1,18 @@
+// compile-flags: -Z print-type-sizes --crate-type=lib
+// build-pass
+
+// This file illustrates two things:
+//
+// 1. Only types that appear in a monomorphized function appear in the
+//    print-type-sizes output, and
+//
+// 2. For an enum, the print-type-sizes output will also include the
+//    size of each variant.
+
+pub struct SevenBytes([u8;  7]);
+pub struct FiftyBytes([u8; 50]);
+
+pub enum Enum {
+    Small(SevenBytes),
+    Large(FiftyBytes),
+}
diff --git a/src/test/ui/print_type_sizes/variants.stdout b/tests/ui/print_type_sizes/variants.stdout
index 641188154..641188154 100644
--- a/src/test/ui/print_type_sizes/variants.stdout
+++ b/tests/ui/print_type_sizes/variants.stdout
diff --git a/src/test/ui/print_type_sizes/zero-sized-fields.rs b/tests/ui/print_type_sizes/zero-sized-fields.rs
index e02a33109..09415824d 100644
--- a/src/test/ui/print_type_sizes/zero-sized-fields.rs
+++ b/tests/ui/print_type_sizes/zero-sized-fields.rs
@@ -1,12 +1,10 @@
-// compile-flags: -Z print-type-sizes
+// compile-flags: -Z print-type-sizes --crate-type=lib
 // build-pass
 // ignore-pass
 
 // At one point, zero-sized fields such as those in this file were causing
 // incorrect output from `-Z print-type-sizes`.
 
-#![feature(start)]
-
 struct S1 {
     x: u32,
     y: u32,
@@ -28,8 +26,7 @@ struct S5<TagW, TagZ> {
     tagz: TagZ,
 }
 
-#[start]
-fn start(_: isize, _: *const *const u8) -> isize {
+pub fn test() {
     let _s1: S1 = S1 { x: 0, y: 0, tag: () };
 
     let _s5: S5<(), Empty> = S5 {
@@ -43,5 +40,4 @@ fn start(_: isize, _: *const *const u8) -> isize {
         z: 4,
         tagz: Empty {},
     };
-    0
 }
diff --git a/src/test/ui/print_type_sizes/zero-sized-fields.stdout b/tests/ui/print_type_sizes/zero-sized-fields.stdout
index 72f59c4bb..72f59c4bb 100644
--- a/src/test/ui/print_type_sizes/zero-sized-fields.stdout
+++ b/tests/ui/print_type_sizes/zero-sized-fields.stdout
diff --git a/src/test/ui/privacy/associated-item-privacy-inherent.rs b/tests/ui/privacy/associated-item-privacy-inherent.rs
index 7b7c734a9..7b7c734a9 100644
--- a/src/test/ui/privacy/associated-item-privacy-inherent.rs
+++ b/tests/ui/privacy/associated-item-privacy-inherent.rs
diff --git a/src/test/ui/privacy/associated-item-privacy-inherent.stderr b/tests/ui/privacy/associated-item-privacy-inherent.stderr
index f4d4ee459..f4d4ee459 100644
--- a/src/test/ui/privacy/associated-item-privacy-inherent.stderr
+++ b/tests/ui/privacy/associated-item-privacy-inherent.stderr
diff --git a/src/test/ui/privacy/associated-item-privacy-trait.rs b/tests/ui/privacy/associated-item-privacy-trait.rs
index ad9a5e15c..c686a2177 100644
--- a/src/test/ui/privacy/associated-item-privacy-trait.rs
+++ b/tests/ui/privacy/associated-item-privacy-trait.rs
@@ -19,9 +19,9 @@ mod priv_trait {
         Pub.method();
         //~^ ERROR type `for<'a> fn(&'a Self) {<Self as PrivTr>::method}` is private
         <Pub as PrivTr>::CONST;
-        //~^ ERROR associated constant `<Pub as PrivTr>::CONST` is private
+        //~^ ERROR associated constant `PrivTr::CONST` is private
         let _: <Pub as PrivTr>::AssocTy;
-        //~^ ERROR associated type `<Pub as PrivTr>::AssocTy` is private
+        //~^ ERROR associated type `PrivTr::AssocTy` is private
         pub type InSignatureTy = <Pub as PrivTr>::AssocTy;
         //~^ ERROR trait `PrivTr` is private
         pub trait InSignatureTr: PrivTr {}
diff --git a/src/test/ui/privacy/associated-item-privacy-trait.stderr b/tests/ui/privacy/associated-item-privacy-trait.stderr
index c4be1a9d9..eb905bf7e 100644
--- a/src/test/ui/privacy/associated-item-privacy-trait.stderr
+++ b/tests/ui/privacy/associated-item-privacy-trait.stderr
@@ -31,7 +31,7 @@ LL |     priv_trait::mac!();
    |
    = note: this error originates in the macro `priv_trait::mac` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: associated constant `<Pub as PrivTr>::CONST` is private
+error: associated constant `PrivTr::CONST` is private
   --> $DIR/associated-item-privacy-trait.rs:21:9
    |
 LL |         <Pub as PrivTr>::CONST;
@@ -42,7 +42,7 @@ LL |     priv_trait::mac!();
    |
    = note: this error originates in the macro `priv_trait::mac` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: associated type `<Pub as PrivTr>::AssocTy` is private
+error: associated type `PrivTr::AssocTy` is private
   --> $DIR/associated-item-privacy-trait.rs:23:16
    |
 LL |         let _: <Pub as PrivTr>::AssocTy;
diff --git a/src/test/ui/privacy/associated-item-privacy-type-binding.rs b/tests/ui/privacy/associated-item-privacy-type-binding.rs
index 9826b83a3..9826b83a3 100644
--- a/src/test/ui/privacy/associated-item-privacy-type-binding.rs
+++ b/tests/ui/privacy/associated-item-privacy-type-binding.rs
diff --git a/src/test/ui/privacy/associated-item-privacy-type-binding.stderr b/tests/ui/privacy/associated-item-privacy-type-binding.stderr
index de9893816..de9893816 100644
--- a/src/test/ui/privacy/associated-item-privacy-type-binding.stderr
+++ b/tests/ui/privacy/associated-item-privacy-type-binding.stderr
diff --git a/src/test/ui/privacy/auxiliary/cci_class.rs b/tests/ui/privacy/auxiliary/cci_class.rs
index de2945d74..de2945d74 100644
--- a/src/test/ui/privacy/auxiliary/cci_class.rs
+++ b/tests/ui/privacy/auxiliary/cci_class.rs
diff --git a/src/test/ui/privacy/auxiliary/cci_class_5.rs b/tests/ui/privacy/auxiliary/cci_class_5.rs
index 3aeaa83d3..3aeaa83d3 100644
--- a/src/test/ui/privacy/auxiliary/cci_class_5.rs
+++ b/tests/ui/privacy/auxiliary/cci_class_5.rs
diff --git a/src/test/ui/privacy/auxiliary/ctor_aux.rs b/tests/ui/privacy/auxiliary/ctor_aux.rs
index 9c99cca9a..9c99cca9a 100644
--- a/src/test/ui/privacy/auxiliary/ctor_aux.rs
+++ b/tests/ui/privacy/auxiliary/ctor_aux.rs
diff --git a/src/test/ui/privacy/auxiliary/impl_privacy_xc_2.rs b/tests/ui/privacy/auxiliary/impl_privacy_xc_2.rs
index 5f9c22681..5f9c22681 100644
--- a/src/test/ui/privacy/auxiliary/impl_privacy_xc_2.rs
+++ b/tests/ui/privacy/auxiliary/impl_privacy_xc_2.rs
diff --git a/src/test/ui/privacy/auxiliary/issue-17718-const-privacy.rs b/tests/ui/privacy/auxiliary/issue-17718-const-privacy.rs
index 93cf4bf3e..93cf4bf3e 100644
--- a/src/test/ui/privacy/auxiliary/issue-17718-const-privacy.rs
+++ b/tests/ui/privacy/auxiliary/issue-17718-const-privacy.rs
diff --git a/src/test/ui/privacy/auxiliary/issue-57264-1.rs b/tests/ui/privacy/auxiliary/issue-57264-1.rs
index 9302fa0d9..9302fa0d9 100644
--- a/src/test/ui/privacy/auxiliary/issue-57264-1.rs
+++ b/tests/ui/privacy/auxiliary/issue-57264-1.rs
diff --git a/src/test/ui/privacy/auxiliary/issue-57264-2.rs b/tests/ui/privacy/auxiliary/issue-57264-2.rs
index 416206b4f..416206b4f 100644
--- a/src/test/ui/privacy/auxiliary/issue-57264-2.rs
+++ b/tests/ui/privacy/auxiliary/issue-57264-2.rs
diff --git a/src/test/ui/privacy/auxiliary/issue-75907.rs b/tests/ui/privacy/auxiliary/issue-75907.rs
index 389c9c351..389c9c351 100644
--- a/src/test/ui/privacy/auxiliary/issue-75907.rs
+++ b/tests/ui/privacy/auxiliary/issue-75907.rs
diff --git a/src/test/ui/privacy/auxiliary/issue-92755.rs b/tests/ui/privacy/auxiliary/issue-92755.rs
index 6f8527346..6f8527346 100644
--- a/src/test/ui/privacy/auxiliary/issue-92755.rs
+++ b/tests/ui/privacy/auxiliary/issue-92755.rs
diff --git a/src/test/ui/privacy/auxiliary/priv-impl-prim-ty.rs b/tests/ui/privacy/auxiliary/priv-impl-prim-ty.rs
index 8ccbd3f12..8ccbd3f12 100644
--- a/src/test/ui/privacy/auxiliary/priv-impl-prim-ty.rs
+++ b/tests/ui/privacy/auxiliary/priv-impl-prim-ty.rs
diff --git a/src/test/ui/privacy/auxiliary/privacy_reexport.rs b/tests/ui/privacy/auxiliary/privacy_reexport.rs
index 6b72dbc92..6b72dbc92 100644
--- a/src/test/ui/privacy/auxiliary/privacy_reexport.rs
+++ b/tests/ui/privacy/auxiliary/privacy_reexport.rs
diff --git a/src/test/ui/privacy/auxiliary/privacy_tuple_struct.rs b/tests/ui/privacy/auxiliary/privacy_tuple_struct.rs
index 223cda4b2..223cda4b2 100644
--- a/src/test/ui/privacy/auxiliary/privacy_tuple_struct.rs
+++ b/tests/ui/privacy/auxiliary/privacy_tuple_struct.rs
diff --git a/src/test/ui/privacy/auxiliary/private-inferred-type.rs b/tests/ui/privacy/auxiliary/private-inferred-type.rs
index 7ac913f5b..7ac913f5b 100644
--- a/src/test/ui/privacy/auxiliary/private-inferred-type.rs
+++ b/tests/ui/privacy/auxiliary/private-inferred-type.rs
diff --git a/src/test/ui/privacy/auxiliary/pub_use_mods_xcrate.rs b/tests/ui/privacy/auxiliary/pub_use_mods_xcrate.rs
index 74d3504d5..74d3504d5 100644
--- a/src/test/ui/privacy/auxiliary/pub_use_mods_xcrate.rs
+++ b/tests/ui/privacy/auxiliary/pub_use_mods_xcrate.rs
diff --git a/src/test/ui/privacy/auxiliary/pub_use_xcrate1.rs b/tests/ui/privacy/auxiliary/pub_use_xcrate1.rs
index 772c9627a..772c9627a 100644
--- a/src/test/ui/privacy/auxiliary/pub_use_xcrate1.rs
+++ b/tests/ui/privacy/auxiliary/pub_use_xcrate1.rs
diff --git a/src/test/ui/privacy/auxiliary/pub_use_xcrate2.rs b/tests/ui/privacy/auxiliary/pub_use_xcrate2.rs
index 20d7066d3..20d7066d3 100644
--- a/src/test/ui/privacy/auxiliary/pub_use_xcrate2.rs
+++ b/tests/ui/privacy/auxiliary/pub_use_xcrate2.rs
diff --git a/src/test/ui/privacy/auxiliary/reachable-unnameable-items.rs b/tests/ui/privacy/auxiliary/reachable-unnameable-items.rs
index 20f110b1a..20f110b1a 100644
--- a/src/test/ui/privacy/auxiliary/reachable-unnameable-items.rs
+++ b/tests/ui/privacy/auxiliary/reachable-unnameable-items.rs
diff --git a/src/test/ui/privacy/crate-private-reexport.rs b/tests/ui/privacy/crate-private-reexport.rs
index fa4f88666..fa4f88666 100644
--- a/src/test/ui/privacy/crate-private-reexport.rs
+++ b/tests/ui/privacy/crate-private-reexport.rs
diff --git a/src/test/ui/privacy/crate-private-reexport.stderr b/tests/ui/privacy/crate-private-reexport.stderr
index 66e11e821..66e11e821 100644
--- a/src/test/ui/privacy/crate-private-reexport.stderr
+++ b/tests/ui/privacy/crate-private-reexport.stderr
diff --git a/src/test/ui/privacy/ctor.rs b/tests/ui/privacy/ctor.rs
index 0ec15d68e..0ec15d68e 100644
--- a/src/test/ui/privacy/ctor.rs
+++ b/tests/ui/privacy/ctor.rs
diff --git a/src/test/ui/privacy/decl-macro.rs b/tests/ui/privacy/decl-macro.rs
index 1eb49bd53..1eb49bd53 100644
--- a/src/test/ui/privacy/decl-macro.rs
+++ b/tests/ui/privacy/decl-macro.rs
diff --git a/src/test/ui/privacy/decl-macro.stderr b/tests/ui/privacy/decl-macro.stderr
index 5bc6f07ff..5bc6f07ff 100644
--- a/src/test/ui/privacy/decl-macro.stderr
+++ b/tests/ui/privacy/decl-macro.stderr
diff --git a/src/test/ui/privacy/effective_visibilities.rs b/tests/ui/privacy/effective_visibilities.rs
index ff20e20d3..ff20e20d3 100644
--- a/src/test/ui/privacy/effective_visibilities.rs
+++ b/tests/ui/privacy/effective_visibilities.rs
diff --git a/src/test/ui/privacy/effective_visibilities.stderr b/tests/ui/privacy/effective_visibilities.stderr
index 046b6095f..046b6095f 100644
--- a/src/test/ui/privacy/effective_visibilities.stderr
+++ b/tests/ui/privacy/effective_visibilities.stderr
diff --git a/src/test/ui/privacy/effective_visibilities_glob.rs b/tests/ui/privacy/effective_visibilities_glob.rs
index eb9dcd6cd..eb9dcd6cd 100644
--- a/src/test/ui/privacy/effective_visibilities_glob.rs
+++ b/tests/ui/privacy/effective_visibilities_glob.rs
diff --git a/src/test/ui/privacy/effective_visibilities_glob.stderr b/tests/ui/privacy/effective_visibilities_glob.stderr
index 0496cd5df..0496cd5df 100644
--- a/src/test/ui/privacy/effective_visibilities_glob.stderr
+++ b/tests/ui/privacy/effective_visibilities_glob.stderr
diff --git a/src/test/ui/privacy/effective_visibilities_invariants.rs b/tests/ui/privacy/effective_visibilities_invariants.rs
index af5a2bed6..af5a2bed6 100644
--- a/src/test/ui/privacy/effective_visibilities_invariants.rs
+++ b/tests/ui/privacy/effective_visibilities_invariants.rs
diff --git a/src/test/ui/privacy/effective_visibilities_invariants.stderr b/tests/ui/privacy/effective_visibilities_invariants.stderr
index fd205f405..fd205f405 100644
--- a/src/test/ui/privacy/effective_visibilities_invariants.stderr
+++ b/tests/ui/privacy/effective_visibilities_invariants.stderr
diff --git a/src/test/ui/privacy/export-tag-variant.rs b/tests/ui/privacy/export-tag-variant.rs
index 46c10067c..46c10067c 100644
--- a/src/test/ui/privacy/export-tag-variant.rs
+++ b/tests/ui/privacy/export-tag-variant.rs
diff --git a/src/test/ui/privacy/export-tag-variant.stderr b/tests/ui/privacy/export-tag-variant.stderr
index f73bd454d..f73bd454d 100644
--- a/src/test/ui/privacy/export-tag-variant.stderr
+++ b/tests/ui/privacy/export-tag-variant.stderr
diff --git a/src/test/ui/privacy/impl-privacy-xc-2.rs b/tests/ui/privacy/impl-privacy-xc-2.rs
index 390764588..390764588 100644
--- a/src/test/ui/privacy/impl-privacy-xc-2.rs
+++ b/tests/ui/privacy/impl-privacy-xc-2.rs
diff --git a/src/test/ui/privacy/issue-13641.rs b/tests/ui/privacy/issue-13641.rs
index 198cea428..198cea428 100644
--- a/src/test/ui/privacy/issue-13641.rs
+++ b/tests/ui/privacy/issue-13641.rs
diff --git a/src/test/ui/privacy/issue-13641.stderr b/tests/ui/privacy/issue-13641.stderr
index cdd0772d3..cdd0772d3 100644
--- a/src/test/ui/privacy/issue-13641.stderr
+++ b/tests/ui/privacy/issue-13641.stderr
diff --git a/src/test/ui/privacy/issue-17718-const-privacy.rs b/tests/ui/privacy/issue-17718-const-privacy.rs
index 6ab3a60df..6ab3a60df 100644
--- a/src/test/ui/privacy/issue-17718-const-privacy.rs
+++ b/tests/ui/privacy/issue-17718-const-privacy.rs
diff --git a/src/test/ui/privacy/issue-17718-const-privacy.stderr b/tests/ui/privacy/issue-17718-const-privacy.stderr
index 133a6360b..133a6360b 100644
--- a/src/test/ui/privacy/issue-17718-const-privacy.stderr
+++ b/tests/ui/privacy/issue-17718-const-privacy.stderr
diff --git a/src/test/ui/privacy/issue-29161.rs b/tests/ui/privacy/issue-29161.rs
index d80405aa8..d80405aa8 100644
--- a/src/test/ui/privacy/issue-29161.rs
+++ b/tests/ui/privacy/issue-29161.rs
diff --git a/src/test/ui/privacy/issue-29161.stderr b/tests/ui/privacy/issue-29161.stderr
index 7ce95e4b0..7ce95e4b0 100644
--- a/src/test/ui/privacy/issue-29161.stderr
+++ b/tests/ui/privacy/issue-29161.stderr
diff --git a/src/test/ui/privacy/issue-30079.rs b/tests/ui/privacy/issue-30079.rs
index a02a932d0..a02a932d0 100644
--- a/src/test/ui/privacy/issue-30079.rs
+++ b/tests/ui/privacy/issue-30079.rs
diff --git a/src/test/ui/privacy/issue-30079.stderr b/tests/ui/privacy/issue-30079.stderr
index 9179ff339..9179ff339 100644
--- a/src/test/ui/privacy/issue-30079.stderr
+++ b/tests/ui/privacy/issue-30079.stderr
diff --git a/src/test/ui/privacy/issue-46209-private-enum-variant-reexport.rs b/tests/ui/privacy/issue-46209-private-enum-variant-reexport.rs
index 6f115e78e..6f115e78e 100644
--- a/src/test/ui/privacy/issue-46209-private-enum-variant-reexport.rs
+++ b/tests/ui/privacy/issue-46209-private-enum-variant-reexport.rs
diff --git a/src/test/ui/privacy/issue-46209-private-enum-variant-reexport.stderr b/tests/ui/privacy/issue-46209-private-enum-variant-reexport.stderr
index 59b181fab..59b181fab 100644
--- a/src/test/ui/privacy/issue-46209-private-enum-variant-reexport.stderr
+++ b/tests/ui/privacy/issue-46209-private-enum-variant-reexport.stderr
diff --git a/src/test/ui/privacy/issue-57264-1.rs b/tests/ui/privacy/issue-57264-1.rs
index 59ebc4f54..59ebc4f54 100644
--- a/src/test/ui/privacy/issue-57264-1.rs
+++ b/tests/ui/privacy/issue-57264-1.rs
diff --git a/src/test/ui/privacy/issue-57264-2.rs b/tests/ui/privacy/issue-57264-2.rs
index 36ce5fd3b..36ce5fd3b 100644
--- a/src/test/ui/privacy/issue-57264-2.rs
+++ b/tests/ui/privacy/issue-57264-2.rs
diff --git a/src/test/ui/privacy/issue-75062-fieldless-tuple-struct.rs b/tests/ui/privacy/issue-75062-fieldless-tuple-struct.rs
index 4601a3d47..4601a3d47 100644
--- a/src/test/ui/privacy/issue-75062-fieldless-tuple-struct.rs
+++ b/tests/ui/privacy/issue-75062-fieldless-tuple-struct.rs
diff --git a/src/test/ui/privacy/issue-75062-fieldless-tuple-struct.stderr b/tests/ui/privacy/issue-75062-fieldless-tuple-struct.stderr
index 14a12003e..14a12003e 100644
--- a/src/test/ui/privacy/issue-75062-fieldless-tuple-struct.stderr
+++ b/tests/ui/privacy/issue-75062-fieldless-tuple-struct.stderr
diff --git a/src/test/ui/privacy/issue-75906.rs b/tests/ui/privacy/issue-75906.rs
index 710039d79..710039d79 100644
--- a/src/test/ui/privacy/issue-75906.rs
+++ b/tests/ui/privacy/issue-75906.rs
diff --git a/src/test/ui/privacy/issue-75906.stderr b/tests/ui/privacy/issue-75906.stderr
index 4c6a68646..600dc7c87 100644
--- a/src/test/ui/privacy/issue-75906.stderr
+++ b/tests/ui/privacy/issue-75906.stderr
@@ -9,6 +9,10 @@ note: constructor is not visible here due to private fields
    |
 LL |     pub struct Bar(u8);
    |                    ^^ private field
+help: consider making the field publicly accessible
+   |
+LL |     pub struct Bar(pub u8);
+   |                    +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/privacy/issue-75907.rs b/tests/ui/privacy/issue-75907.rs
index 6da99cf64..3bed841d1 100644
--- a/src/test/ui/privacy/issue-75907.rs
+++ b/tests/ui/privacy/issue-75907.rs
@@ -2,7 +2,7 @@
 
 mod foo {
     pub(crate) struct Foo(u8);
-    pub(crate) struct Bar(pub u8, u8, Foo);
+    pub(crate) struct Bar(pub u8, pub(in crate::foo) u8, Foo);
 
     pub(crate) fn make_bar() -> Bar {
         Bar(1, 12, Foo(10))
diff --git a/src/test/ui/privacy/issue-75907.stderr b/tests/ui/privacy/issue-75907.stderr
index 2f89e31a3..f7cb874c2 100644
--- a/src/test/ui/privacy/issue-75907.stderr
+++ b/tests/ui/privacy/issue-75907.stderr
@@ -11,6 +11,10 @@ LL |     let Bar(x, y, Foo(z)) = make_bar();
    |                ^  ^^^^^^ private field
    |                |
    |                private field
+help: consider making the fields publicly accessible
+   |
+LL |     pub(crate) struct Bar(pub u8, pub u8, pub Foo);
+   |                           ~~~     ~~~     +++
 
 error[E0532]: cannot match against a tuple struct which contains private fields
   --> $DIR/issue-75907.rs:15:19
@@ -23,6 +27,10 @@ note: constructor is not visible here due to private fields
    |
 LL |     let Bar(x, y, Foo(z)) = make_bar();
    |                       ^ private field
+help: consider making the field publicly accessible
+   |
+LL |     pub(crate) struct Foo(pub u8);
+   |                           +++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/privacy/issue-75907_b.rs b/tests/ui/privacy/issue-75907_b.rs
index fdfc5907c..fdfc5907c 100644
--- a/src/test/ui/privacy/issue-75907_b.rs
+++ b/tests/ui/privacy/issue-75907_b.rs
diff --git a/src/test/ui/privacy/issue-75907_b.stderr b/tests/ui/privacy/issue-75907_b.stderr
index b82d08473..b82d08473 100644
--- a/src/test/ui/privacy/issue-75907_b.stderr
+++ b/tests/ui/privacy/issue-75907_b.stderr
diff --git a/src/test/ui/privacy/issue-79593.rs b/tests/ui/privacy/issue-79593.rs
index 39c222f7c..39c222f7c 100644
--- a/src/test/ui/privacy/issue-79593.rs
+++ b/tests/ui/privacy/issue-79593.rs
diff --git a/src/test/ui/privacy/issue-79593.stderr b/tests/ui/privacy/issue-79593.stderr
index 21ba760ad..21ba760ad 100644
--- a/src/test/ui/privacy/issue-79593.stderr
+++ b/tests/ui/privacy/issue-79593.stderr
diff --git a/src/test/ui/privacy/issue-92755.rs b/tests/ui/privacy/issue-92755.rs
index 49559152b..49559152b 100644
--- a/src/test/ui/privacy/issue-92755.rs
+++ b/tests/ui/privacy/issue-92755.rs
diff --git a/src/test/ui/privacy/legacy-ctor-visibility.rs b/tests/ui/privacy/legacy-ctor-visibility.rs
index 5732b6446..5732b6446 100644
--- a/src/test/ui/privacy/legacy-ctor-visibility.rs
+++ b/tests/ui/privacy/legacy-ctor-visibility.rs
diff --git a/src/test/ui/privacy/legacy-ctor-visibility.stderr b/tests/ui/privacy/legacy-ctor-visibility.stderr
index c8057d85e..c8057d85e 100644
--- a/src/test/ui/privacy/legacy-ctor-visibility.stderr
+++ b/tests/ui/privacy/legacy-ctor-visibility.stderr
diff --git a/src/test/ui/privacy/macro-private-reexport.rs b/tests/ui/privacy/macro-private-reexport.rs
index d0aab528e..d0aab528e 100644
--- a/src/test/ui/privacy/macro-private-reexport.rs
+++ b/tests/ui/privacy/macro-private-reexport.rs
diff --git a/src/test/ui/privacy/macro-private-reexport.stderr b/tests/ui/privacy/macro-private-reexport.stderr
index b8768f361..b8768f361 100644
--- a/src/test/ui/privacy/macro-private-reexport.stderr
+++ b/tests/ui/privacy/macro-private-reexport.stderr
diff --git a/src/test/ui/privacy/priv-impl-prim-ty.rs b/tests/ui/privacy/priv-impl-prim-ty.rs
index 5d6a6b64e..5d6a6b64e 100644
--- a/src/test/ui/privacy/priv-impl-prim-ty.rs
+++ b/tests/ui/privacy/priv-impl-prim-ty.rs
diff --git a/src/test/ui/privacy/priv-in-bad-locations.rs b/tests/ui/privacy/priv-in-bad-locations.rs
index 76af8c6cd..76af8c6cd 100644
--- a/src/test/ui/privacy/priv-in-bad-locations.rs
+++ b/tests/ui/privacy/priv-in-bad-locations.rs
diff --git a/src/test/ui/privacy/priv-in-bad-locations.stderr b/tests/ui/privacy/priv-in-bad-locations.stderr
index 75bd2fe47..75bd2fe47 100644
--- a/src/test/ui/privacy/priv-in-bad-locations.stderr
+++ b/tests/ui/privacy/priv-in-bad-locations.stderr
diff --git a/src/test/ui/privacy/privacy-in-paths.rs b/tests/ui/privacy/privacy-in-paths.rs
index 9cee2b89d..9cee2b89d 100644
--- a/src/test/ui/privacy/privacy-in-paths.rs
+++ b/tests/ui/privacy/privacy-in-paths.rs
diff --git a/src/test/ui/privacy/privacy-in-paths.stderr b/tests/ui/privacy/privacy-in-paths.stderr
index 2eb3ebb51..2eb3ebb51 100644
--- a/src/test/ui/privacy/privacy-in-paths.stderr
+++ b/tests/ui/privacy/privacy-in-paths.stderr
diff --git a/src/test/ui/privacy/privacy-ns.rs b/tests/ui/privacy/privacy-ns.rs
index c32e3f178..c32e3f178 100644
--- a/src/test/ui/privacy/privacy-ns.rs
+++ b/tests/ui/privacy/privacy-ns.rs
diff --git a/src/test/ui/privacy/privacy-ns1.rs b/tests/ui/privacy/privacy-ns1.rs
index 1af5b857e..1af5b857e 100644
--- a/src/test/ui/privacy/privacy-ns1.rs
+++ b/tests/ui/privacy/privacy-ns1.rs
diff --git a/src/test/ui/privacy/privacy-ns1.stderr b/tests/ui/privacy/privacy-ns1.stderr
index 91bc84e70..91bc84e70 100644
--- a/src/test/ui/privacy/privacy-ns1.stderr
+++ b/tests/ui/privacy/privacy-ns1.stderr
diff --git a/src/test/ui/privacy/privacy-ns2.rs b/tests/ui/privacy/privacy-ns2.rs
index 47035ef3a..47035ef3a 100644
--- a/src/test/ui/privacy/privacy-ns2.rs
+++ b/tests/ui/privacy/privacy-ns2.rs
diff --git a/src/test/ui/privacy/privacy-ns2.stderr b/tests/ui/privacy/privacy-ns2.stderr
index 904e9013f..904e9013f 100644
--- a/src/test/ui/privacy/privacy-ns2.stderr
+++ b/tests/ui/privacy/privacy-ns2.stderr
diff --git a/src/test/ui/privacy/privacy-reexport.rs b/tests/ui/privacy/privacy-reexport.rs
index b3ec3af04..b3ec3af04 100644
--- a/src/test/ui/privacy/privacy-reexport.rs
+++ b/tests/ui/privacy/privacy-reexport.rs
diff --git a/src/test/ui/privacy/privacy-sanity.rs b/tests/ui/privacy/privacy-sanity.rs
index 8bbf1ab5d..8bbf1ab5d 100644
--- a/src/test/ui/privacy/privacy-sanity.rs
+++ b/tests/ui/privacy/privacy-sanity.rs
diff --git a/src/test/ui/privacy/privacy-sanity.stderr b/tests/ui/privacy/privacy-sanity.stderr
index c92553fd1..c92553fd1 100644
--- a/src/test/ui/privacy/privacy-sanity.stderr
+++ b/tests/ui/privacy/privacy-sanity.stderr
diff --git a/src/test/ui/privacy/privacy-ufcs.rs b/tests/ui/privacy/privacy-ufcs.rs
index fec7f4134..fec7f4134 100644
--- a/src/test/ui/privacy/privacy-ufcs.rs
+++ b/tests/ui/privacy/privacy-ufcs.rs
diff --git a/src/test/ui/privacy/privacy-ufcs.stderr b/tests/ui/privacy/privacy-ufcs.stderr
index e93a458ce..e93a458ce 100644
--- a/src/test/ui/privacy/privacy-ufcs.stderr
+++ b/tests/ui/privacy/privacy-ufcs.stderr
diff --git a/src/test/ui/privacy/privacy1-rpass.rs b/tests/ui/privacy/privacy1-rpass.rs
index 4e54780da..4e54780da 100644
--- a/src/test/ui/privacy/privacy1-rpass.rs
+++ b/tests/ui/privacy/privacy1-rpass.rs
diff --git a/src/test/ui/privacy/privacy1.rs b/tests/ui/privacy/privacy1.rs
index 3c9fa983d..3c9fa983d 100644
--- a/src/test/ui/privacy/privacy1.rs
+++ b/tests/ui/privacy/privacy1.rs
diff --git a/src/test/ui/privacy/privacy1.stderr b/tests/ui/privacy/privacy1.stderr
index 70e6fcb7a..70e6fcb7a 100644
--- a/src/test/ui/privacy/privacy1.stderr
+++ b/tests/ui/privacy/privacy1.stderr
diff --git a/src/test/ui/privacy/privacy2.rs b/tests/ui/privacy/privacy2.rs
index c8fa436bd..c8fa436bd 100644
--- a/src/test/ui/privacy/privacy2.rs
+++ b/tests/ui/privacy/privacy2.rs
diff --git a/src/test/ui/privacy/privacy2.stderr b/tests/ui/privacy/privacy2.stderr
index 882f31465..882f31465 100644
--- a/src/test/ui/privacy/privacy2.stderr
+++ b/tests/ui/privacy/privacy2.stderr
diff --git a/src/test/ui/privacy/privacy3.rs b/tests/ui/privacy/privacy3.rs
index 5a7cd76a9..5a7cd76a9 100644
--- a/src/test/ui/privacy/privacy3.rs
+++ b/tests/ui/privacy/privacy3.rs
diff --git a/src/test/ui/privacy/privacy3.stderr b/tests/ui/privacy/privacy3.stderr
index 42ce456d9..42ce456d9 100644
--- a/src/test/ui/privacy/privacy3.stderr
+++ b/tests/ui/privacy/privacy3.stderr
diff --git a/src/test/ui/privacy/privacy4.rs b/tests/ui/privacy/privacy4.rs
index fa257b800..fa257b800 100644
--- a/src/test/ui/privacy/privacy4.rs
+++ b/tests/ui/privacy/privacy4.rs
diff --git a/src/test/ui/privacy/privacy4.stderr b/tests/ui/privacy/privacy4.stderr
index 7552fa71a..7552fa71a 100644
--- a/src/test/ui/privacy/privacy4.stderr
+++ b/tests/ui/privacy/privacy4.stderr
diff --git a/src/test/ui/privacy/privacy5.rs b/tests/ui/privacy/privacy5.rs
index 3dc26b195..3dc26b195 100644
--- a/src/test/ui/privacy/privacy5.rs
+++ b/tests/ui/privacy/privacy5.rs
diff --git a/src/test/ui/privacy/privacy5.stderr b/tests/ui/privacy/privacy5.stderr
index 680161272..615b0af27 100644
--- a/src/test/ui/privacy/privacy5.stderr
+++ b/tests/ui/privacy/privacy5.stderr
@@ -12,6 +12,10 @@ note: the tuple struct constructor `A` is defined here
    |
 LL |     pub struct A(());
    |     ^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct A(pub ());
+   |                  +++
 
 error[E0603]: tuple struct constructor `B` is private
   --> $DIR/privacy5.rs:52:16
@@ -27,6 +31,10 @@ note: the tuple struct constructor `B` is defined here
    |
 LL |     pub struct B(isize);
    |     ^^^^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct B(pub isize);
+   |                  +++
 
 error[E0603]: tuple struct constructor `C` is private
   --> $DIR/privacy5.rs:53:16
@@ -42,6 +50,10 @@ note: the tuple struct constructor `C` is defined here
    |
 LL |     pub struct C(pub isize, isize);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the fields publicly accessible
+   |
+LL |     pub struct C(pub isize, pub isize);
+   |                  ~~~        +++
 
 error[E0603]: tuple struct constructor `A` is private
   --> $DIR/privacy5.rs:56:12
@@ -57,6 +69,10 @@ note: the tuple struct constructor `A` is defined here
    |
 LL |     pub struct A(());
    |     ^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct A(pub ());
+   |                  +++
 
 error[E0603]: tuple struct constructor `A` is private
   --> $DIR/privacy5.rs:57:12
@@ -72,6 +88,10 @@ note: the tuple struct constructor `A` is defined here
    |
 LL |     pub struct A(());
    |     ^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct A(pub ());
+   |                  +++
 
 error[E0603]: tuple struct constructor `A` is private
   --> $DIR/privacy5.rs:58:18
@@ -87,6 +107,10 @@ note: the tuple struct constructor `A` is defined here
    |
 LL |     pub struct A(());
    |     ^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct A(pub ());
+   |                  +++
 
 error[E0603]: tuple struct constructor `A` is private
   --> $DIR/privacy5.rs:59:18
@@ -102,6 +126,10 @@ note: the tuple struct constructor `A` is defined here
    |
 LL |     pub struct A(());
    |     ^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct A(pub ());
+   |                  +++
 
 error[E0603]: tuple struct constructor `B` is private
   --> $DIR/privacy5.rs:61:12
@@ -117,6 +145,10 @@ note: the tuple struct constructor `B` is defined here
    |
 LL |     pub struct B(isize);
    |     ^^^^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct B(pub isize);
+   |                  +++
 
 error[E0603]: tuple struct constructor `B` is private
   --> $DIR/privacy5.rs:62:12
@@ -132,6 +164,10 @@ note: the tuple struct constructor `B` is defined here
    |
 LL |     pub struct B(isize);
    |     ^^^^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct B(pub isize);
+   |                  +++
 
 error[E0603]: tuple struct constructor `B` is private
   --> $DIR/privacy5.rs:63:18
@@ -147,6 +183,10 @@ note: the tuple struct constructor `B` is defined here
    |
 LL |     pub struct B(isize);
    |     ^^^^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct B(pub isize);
+   |                  +++
 
 error[E0603]: tuple struct constructor `B` is private
   --> $DIR/privacy5.rs:64:18
@@ -162,6 +202,10 @@ note: the tuple struct constructor `B` is defined here
    |
 LL |     pub struct B(isize);
    |     ^^^^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct B(pub isize);
+   |                  +++
 
 error[E0603]: tuple struct constructor `B` is private
   --> $DIR/privacy5.rs:65:18
@@ -177,6 +221,10 @@ note: the tuple struct constructor `B` is defined here
    |
 LL |     pub struct B(isize);
    |     ^^^^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct B(pub isize);
+   |                  +++
 
 error[E0603]: tuple struct constructor `B` is private
   --> $DIR/privacy5.rs:65:32
@@ -192,6 +240,10 @@ note: the tuple struct constructor `B` is defined here
    |
 LL |     pub struct B(isize);
    |     ^^^^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct B(pub isize);
+   |                  +++
 
 error[E0603]: tuple struct constructor `C` is private
   --> $DIR/privacy5.rs:68:12
@@ -207,6 +259,10 @@ note: the tuple struct constructor `C` is defined here
    |
 LL |     pub struct C(pub isize, isize);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the fields publicly accessible
+   |
+LL |     pub struct C(pub isize, pub isize);
+   |                  ~~~        +++
 
 error[E0603]: tuple struct constructor `C` is private
   --> $DIR/privacy5.rs:69:12
@@ -222,6 +278,10 @@ note: the tuple struct constructor `C` is defined here
    |
 LL |     pub struct C(pub isize, isize);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the fields publicly accessible
+   |
+LL |     pub struct C(pub isize, pub isize);
+   |                  ~~~        +++
 
 error[E0603]: tuple struct constructor `C` is private
   --> $DIR/privacy5.rs:70:12
@@ -237,6 +297,10 @@ note: the tuple struct constructor `C` is defined here
    |
 LL |     pub struct C(pub isize, isize);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the fields publicly accessible
+   |
+LL |     pub struct C(pub isize, pub isize);
+   |                  ~~~        +++
 
 error[E0603]: tuple struct constructor `C` is private
   --> $DIR/privacy5.rs:71:12
@@ -252,6 +316,10 @@ note: the tuple struct constructor `C` is defined here
    |
 LL |     pub struct C(pub isize, isize);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the fields publicly accessible
+   |
+LL |     pub struct C(pub isize, pub isize);
+   |                  ~~~        +++
 
 error[E0603]: tuple struct constructor `C` is private
   --> $DIR/privacy5.rs:72:18
@@ -267,6 +335,10 @@ note: the tuple struct constructor `C` is defined here
    |
 LL |     pub struct C(pub isize, isize);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the fields publicly accessible
+   |
+LL |     pub struct C(pub isize, pub isize);
+   |                  ~~~        +++
 
 error[E0603]: tuple struct constructor `C` is private
   --> $DIR/privacy5.rs:73:18
@@ -282,6 +354,10 @@ note: the tuple struct constructor `C` is defined here
    |
 LL |     pub struct C(pub isize, isize);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the fields publicly accessible
+   |
+LL |     pub struct C(pub isize, pub isize);
+   |                  ~~~        +++
 
 error[E0603]: tuple struct constructor `C` is private
   --> $DIR/privacy5.rs:74:18
@@ -297,6 +373,10 @@ note: the tuple struct constructor `C` is defined here
    |
 LL |     pub struct C(pub isize, isize);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the fields publicly accessible
+   |
+LL |     pub struct C(pub isize, pub isize);
+   |                  ~~~        +++
 
 error[E0603]: tuple struct constructor `C` is private
   --> $DIR/privacy5.rs:75:18
@@ -312,6 +392,10 @@ note: the tuple struct constructor `C` is defined here
    |
 LL |     pub struct C(pub isize, isize);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the fields publicly accessible
+   |
+LL |     pub struct C(pub isize, pub isize);
+   |                  ~~~        +++
 
 error[E0603]: tuple struct constructor `A` is private
   --> $DIR/privacy5.rs:83:17
@@ -327,6 +411,10 @@ note: the tuple struct constructor `A` is defined here
    |
 LL |     pub struct A(());
    |     ^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct A(pub ());
+   |                  +++
 
 error[E0603]: tuple struct constructor `B` is private
   --> $DIR/privacy5.rs:84:17
@@ -342,6 +430,10 @@ note: the tuple struct constructor `B` is defined here
    |
 LL |     pub struct B(isize);
    |     ^^^^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct B(pub isize);
+   |                  +++
 
 error[E0603]: tuple struct constructor `C` is private
   --> $DIR/privacy5.rs:85:17
@@ -357,6 +449,10 @@ note: the tuple struct constructor `C` is defined here
    |
 LL |     pub struct C(pub isize, isize);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the fields publicly accessible
+   |
+LL |     pub struct C(pub isize, pub isize);
+   |                  ~~~        +++
 
 error[E0603]: tuple struct constructor `A` is private
   --> $DIR/privacy5.rs:90:20
diff --git a/src/test/ui/privacy/private-class-field.rs b/tests/ui/privacy/private-class-field.rs
index 98e32ee07..98e32ee07 100644
--- a/src/test/ui/privacy/private-class-field.rs
+++ b/tests/ui/privacy/private-class-field.rs
diff --git a/tests/ui/privacy/private-field-ty-err.rs b/tests/ui/privacy/private-field-ty-err.rs
new file mode 100644
index 000000000..10db60695
--- /dev/null
+++ b/tests/ui/privacy/private-field-ty-err.rs
@@ -0,0 +1,20 @@
+fn main() {
+    let x = foo::Foo::default();
+    if x.len {
+        //~^ ERROR field `len` of struct `Foo` is private
+        println!("foo");
+    }
+}
+
+mod foo {
+    #[derive(Default)]
+    pub struct Foo {
+        len: String,
+    }
+
+    impl Foo {
+        pub fn len(&self) -> usize {
+            42
+        }
+    }
+}
diff --git a/tests/ui/privacy/private-field-ty-err.stderr b/tests/ui/privacy/private-field-ty-err.stderr
new file mode 100644
index 000000000..98ba7856e
--- /dev/null
+++ b/tests/ui/privacy/private-field-ty-err.stderr
@@ -0,0 +1,9 @@
+error[E0616]: field `len` of struct `Foo` is private
+  --> $DIR/private-field-ty-err.rs:3:10
+   |
+LL |     if x.len {
+   |          ^^^ private field
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0616`.
diff --git a/src/test/ui/privacy/private-impl-method.rs b/tests/ui/privacy/private-impl-method.rs
index f7be6726c..f7be6726c 100644
--- a/src/test/ui/privacy/private-impl-method.rs
+++ b/tests/ui/privacy/private-impl-method.rs
diff --git a/src/test/ui/privacy/private-impl-method.stderr b/tests/ui/privacy/private-impl-method.stderr
index bb54dce7e..bb54dce7e 100644
--- a/src/test/ui/privacy/private-impl-method.stderr
+++ b/tests/ui/privacy/private-impl-method.stderr
diff --git a/src/test/ui/privacy/private-in-public-assoc-ty.rs b/tests/ui/privacy/private-in-public-assoc-ty.rs
index fba72c131..fba72c131 100644
--- a/src/test/ui/privacy/private-in-public-assoc-ty.rs
+++ b/tests/ui/privacy/private-in-public-assoc-ty.rs
diff --git a/src/test/ui/privacy/private-in-public-assoc-ty.stderr b/tests/ui/privacy/private-in-public-assoc-ty.stderr
index a59027d81..a59027d81 100644
--- a/src/test/ui/privacy/private-in-public-assoc-ty.stderr
+++ b/tests/ui/privacy/private-in-public-assoc-ty.stderr
diff --git a/src/test/ui/privacy/private-in-public-expr-pat.rs b/tests/ui/privacy/private-in-public-expr-pat.rs
index 5c9ecd13b..5c9ecd13b 100644
--- a/src/test/ui/privacy/private-in-public-expr-pat.rs
+++ b/tests/ui/privacy/private-in-public-expr-pat.rs
diff --git a/src/test/ui/privacy/private-in-public-ill-formed.rs b/tests/ui/privacy/private-in-public-ill-formed.rs
index 031e2874a..031e2874a 100644
--- a/src/test/ui/privacy/private-in-public-ill-formed.rs
+++ b/tests/ui/privacy/private-in-public-ill-formed.rs
diff --git a/src/test/ui/privacy/private-in-public-ill-formed.stderr b/tests/ui/privacy/private-in-public-ill-formed.stderr
index e7c94bc30..e7c94bc30 100644
--- a/src/test/ui/privacy/private-in-public-ill-formed.stderr
+++ b/tests/ui/privacy/private-in-public-ill-formed.stderr
diff --git a/src/test/ui/privacy/private-in-public-lint.rs b/tests/ui/privacy/private-in-public-lint.rs
index 8b6e43601..8b6e43601 100644
--- a/src/test/ui/privacy/private-in-public-lint.rs
+++ b/tests/ui/privacy/private-in-public-lint.rs
diff --git a/src/test/ui/privacy/private-in-public-lint.stderr b/tests/ui/privacy/private-in-public-lint.stderr
index 1e98e3bed..1e98e3bed 100644
--- a/src/test/ui/privacy/private-in-public-lint.stderr
+++ b/tests/ui/privacy/private-in-public-lint.stderr
diff --git a/src/test/ui/privacy/private-in-public-non-principal-2.rs b/tests/ui/privacy/private-in-public-non-principal-2.rs
index db451d334..db451d334 100644
--- a/src/test/ui/privacy/private-in-public-non-principal-2.rs
+++ b/tests/ui/privacy/private-in-public-non-principal-2.rs
diff --git a/src/test/ui/privacy/private-in-public-non-principal-2.stderr b/tests/ui/privacy/private-in-public-non-principal-2.stderr
index 7cc8bf0de..7cc8bf0de 100644
--- a/src/test/ui/privacy/private-in-public-non-principal-2.stderr
+++ b/tests/ui/privacy/private-in-public-non-principal-2.stderr
diff --git a/src/test/ui/privacy/private-in-public-non-principal.rs b/tests/ui/privacy/private-in-public-non-principal.rs
index ac1d5a9e6..ac1d5a9e6 100644
--- a/src/test/ui/privacy/private-in-public-non-principal.rs
+++ b/tests/ui/privacy/private-in-public-non-principal.rs
diff --git a/src/test/ui/privacy/private-in-public-non-principal.stderr b/tests/ui/privacy/private-in-public-non-principal.stderr
index de20cada4..de20cada4 100644
--- a/src/test/ui/privacy/private-in-public-non-principal.stderr
+++ b/tests/ui/privacy/private-in-public-non-principal.stderr
diff --git a/src/test/ui/privacy/private-in-public-type-alias-impl-trait.rs b/tests/ui/privacy/private-in-public-type-alias-impl-trait.rs
index c7df31529..c7df31529 100644
--- a/src/test/ui/privacy/private-in-public-type-alias-impl-trait.rs
+++ b/tests/ui/privacy/private-in-public-type-alias-impl-trait.rs
diff --git a/src/test/ui/privacy/private-in-public-warn.rs b/tests/ui/privacy/private-in-public-warn.rs
index 0fa1de975..0fa1de975 100644
--- a/src/test/ui/privacy/private-in-public-warn.rs
+++ b/tests/ui/privacy/private-in-public-warn.rs
diff --git a/src/test/ui/privacy/private-in-public-warn.stderr b/tests/ui/privacy/private-in-public-warn.stderr
index 66f91ce6f..66f91ce6f 100644
--- a/src/test/ui/privacy/private-in-public-warn.stderr
+++ b/tests/ui/privacy/private-in-public-warn.stderr
diff --git a/src/test/ui/privacy/private-in-public.rs b/tests/ui/privacy/private-in-public.rs
index dbd1c483f..dbd1c483f 100644
--- a/src/test/ui/privacy/private-in-public.rs
+++ b/tests/ui/privacy/private-in-public.rs
diff --git a/src/test/ui/privacy/private-in-public.stderr b/tests/ui/privacy/private-in-public.stderr
index 887eebf53..887eebf53 100644
--- a/src/test/ui/privacy/private-in-public.stderr
+++ b/tests/ui/privacy/private-in-public.stderr
diff --git a/src/test/ui/privacy/private-inferred-type-1.rs b/tests/ui/privacy/private-inferred-type-1.rs
index d633189e3..d633189e3 100644
--- a/src/test/ui/privacy/private-inferred-type-1.rs
+++ b/tests/ui/privacy/private-inferred-type-1.rs
diff --git a/src/test/ui/privacy/private-inferred-type-1.stderr b/tests/ui/privacy/private-inferred-type-1.stderr
index 245789f43..245789f43 100644
--- a/src/test/ui/privacy/private-inferred-type-1.stderr
+++ b/tests/ui/privacy/private-inferred-type-1.stderr
diff --git a/src/test/ui/privacy/private-inferred-type-2.rs b/tests/ui/privacy/private-inferred-type-2.rs
index 15b263b38..15b263b38 100644
--- a/src/test/ui/privacy/private-inferred-type-2.rs
+++ b/tests/ui/privacy/private-inferred-type-2.rs
diff --git a/src/test/ui/privacy/private-inferred-type-2.stderr b/tests/ui/privacy/private-inferred-type-2.stderr
index 3a0fc03b4..3a0fc03b4 100644
--- a/src/test/ui/privacy/private-inferred-type-2.stderr
+++ b/tests/ui/privacy/private-inferred-type-2.stderr
diff --git a/src/test/ui/privacy/private-inferred-type-3.rs b/tests/ui/privacy/private-inferred-type-3.rs
index 0337aedd0..cdbdcf60b 100644
--- a/src/test/ui/privacy/private-inferred-type-3.rs
+++ b/tests/ui/privacy/private-inferred-type-3.rs
@@ -1,7 +1,7 @@
 // aux-build:private-inferred-type.rs
 
 // error-pattern:type `fn() {ext::priv_fn}` is private
-// error-pattern:static `PRIV_STATIC` is private
+// error-pattern:static `ext::PRIV_STATIC` is private
 // error-pattern:type `ext::PrivEnum` is private
 // error-pattern:type `fn() {<u8 as ext::PrivTrait>::method}` is private
 // error-pattern:type `fn(u8) -> ext::PrivTupleStruct {ext::PrivTupleStruct}` is private
diff --git a/src/test/ui/privacy/private-inferred-type-3.stderr b/tests/ui/privacy/private-inferred-type-3.stderr
index 00b61512d..42faeb4bf 100644
--- a/src/test/ui/privacy/private-inferred-type-3.stderr
+++ b/tests/ui/privacy/private-inferred-type-3.stderr
@@ -6,7 +6,7 @@ LL |     ext::m!();
    |
    = note: this error originates in the macro `ext::m` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: static `PRIV_STATIC` is private
+error: static `ext::PRIV_STATIC` is private
   --> $DIR/private-inferred-type-3.rs:16:5
    |
 LL |     ext::m!();
diff --git a/src/test/ui/privacy/private-inferred-type.rs b/tests/ui/privacy/private-inferred-type.rs
index e8743dd96..e8743dd96 100644
--- a/src/test/ui/privacy/private-inferred-type.rs
+++ b/tests/ui/privacy/private-inferred-type.rs
diff --git a/src/test/ui/privacy/private-inferred-type.stderr b/tests/ui/privacy/private-inferred-type.stderr
index fc3f9ab62..fc3f9ab62 100644
--- a/src/test/ui/privacy/private-inferred-type.stderr
+++ b/tests/ui/privacy/private-inferred-type.stderr
diff --git a/src/test/ui/privacy/private-item-simple.rs b/tests/ui/privacy/private-item-simple.rs
index 1f718ed92..1f718ed92 100644
--- a/src/test/ui/privacy/private-item-simple.rs
+++ b/tests/ui/privacy/private-item-simple.rs
diff --git a/src/test/ui/privacy/private-item-simple.stderr b/tests/ui/privacy/private-item-simple.stderr
index e3d90150e..e3d90150e 100644
--- a/src/test/ui/privacy/private-item-simple.stderr
+++ b/tests/ui/privacy/private-item-simple.stderr
diff --git a/src/test/ui/privacy/private-method-cross-crate.rs b/tests/ui/privacy/private-method-cross-crate.rs
index ab3bbdfe4..ab3bbdfe4 100644
--- a/src/test/ui/privacy/private-method-cross-crate.rs
+++ b/tests/ui/privacy/private-method-cross-crate.rs
diff --git a/src/test/ui/privacy/private-method-cross-crate.stderr b/tests/ui/privacy/private-method-cross-crate.stderr
index 93f6a7f2f..93f6a7f2f 100644
--- a/src/test/ui/privacy/private-method-cross-crate.stderr
+++ b/tests/ui/privacy/private-method-cross-crate.stderr
diff --git a/src/test/ui/privacy/private-method-inherited.rs b/tests/ui/privacy/private-method-inherited.rs
index 2f6454288..2f6454288 100644
--- a/src/test/ui/privacy/private-method-inherited.rs
+++ b/tests/ui/privacy/private-method-inherited.rs
diff --git a/src/test/ui/privacy/private-method-inherited.stderr b/tests/ui/privacy/private-method-inherited.stderr
index 011a7fee4..011a7fee4 100644
--- a/src/test/ui/privacy/private-method-inherited.stderr
+++ b/tests/ui/privacy/private-method-inherited.stderr
diff --git a/src/test/ui/privacy/private-method-rpass.rs b/tests/ui/privacy/private-method-rpass.rs
index 726944fb2..726944fb2 100644
--- a/src/test/ui/privacy/private-method-rpass.rs
+++ b/tests/ui/privacy/private-method-rpass.rs
diff --git a/src/test/ui/privacy/private-method.rs b/tests/ui/privacy/private-method.rs
index 76a642cde..76a642cde 100644
--- a/src/test/ui/privacy/private-method.rs
+++ b/tests/ui/privacy/private-method.rs
diff --git a/src/test/ui/privacy/private-method.stderr b/tests/ui/privacy/private-method.stderr
index 17c7179dc..17c7179dc 100644
--- a/src/test/ui/privacy/private-method.stderr
+++ b/tests/ui/privacy/private-method.stderr
diff --git a/src/test/ui/privacy/private-struct-field-cross-crate.rs b/tests/ui/privacy/private-struct-field-cross-crate.rs
index 301cd37b7..301cd37b7 100644
--- a/src/test/ui/privacy/private-struct-field-cross-crate.rs
+++ b/tests/ui/privacy/private-struct-field-cross-crate.rs
diff --git a/src/test/ui/privacy/private-struct-field-cross-crate.stderr b/tests/ui/privacy/private-struct-field-cross-crate.stderr
index 40cf3448d..40cf3448d 100644
--- a/src/test/ui/privacy/private-struct-field-cross-crate.stderr
+++ b/tests/ui/privacy/private-struct-field-cross-crate.stderr
diff --git a/src/test/ui/privacy/private-struct-field-ctor.rs b/tests/ui/privacy/private-struct-field-ctor.rs
index 56e84a751..56e84a751 100644
--- a/src/test/ui/privacy/private-struct-field-ctor.rs
+++ b/tests/ui/privacy/private-struct-field-ctor.rs
diff --git a/src/test/ui/privacy/private-struct-field-ctor.stderr b/tests/ui/privacy/private-struct-field-ctor.stderr
index 9dc9db0ea..9dc9db0ea 100644
--- a/src/test/ui/privacy/private-struct-field-ctor.stderr
+++ b/tests/ui/privacy/private-struct-field-ctor.stderr
diff --git a/src/test/ui/privacy/private-struct-field-pattern.rs b/tests/ui/privacy/private-struct-field-pattern.rs
index 4a766500e..4a766500e 100644
--- a/src/test/ui/privacy/private-struct-field-pattern.rs
+++ b/tests/ui/privacy/private-struct-field-pattern.rs
diff --git a/src/test/ui/privacy/private-struct-field-pattern.stderr b/tests/ui/privacy/private-struct-field-pattern.stderr
index 630553036..630553036 100644
--- a/src/test/ui/privacy/private-struct-field-pattern.stderr
+++ b/tests/ui/privacy/private-struct-field-pattern.stderr
diff --git a/src/test/ui/privacy/private-struct-field.rs b/tests/ui/privacy/private-struct-field.rs
index 94cee4eff..94cee4eff 100644
--- a/src/test/ui/privacy/private-struct-field.rs
+++ b/tests/ui/privacy/private-struct-field.rs
diff --git a/src/test/ui/privacy/private-struct-field.stderr b/tests/ui/privacy/private-struct-field.stderr
index facf4e82f..facf4e82f 100644
--- a/src/test/ui/privacy/private-struct-field.stderr
+++ b/tests/ui/privacy/private-struct-field.stderr
diff --git a/src/test/ui/privacy/private-type-in-interface.rs b/tests/ui/privacy/private-type-in-interface.rs
index 7fbdbaf5f..7fbdbaf5f 100644
--- a/src/test/ui/privacy/private-type-in-interface.rs
+++ b/tests/ui/privacy/private-type-in-interface.rs
diff --git a/src/test/ui/privacy/private-type-in-interface.stderr b/tests/ui/privacy/private-type-in-interface.stderr
index 4e87caa34..4e87caa34 100644
--- a/src/test/ui/privacy/private-type-in-interface.stderr
+++ b/tests/ui/privacy/private-type-in-interface.stderr
diff --git a/src/test/ui/privacy/private-variant-reexport.rs b/tests/ui/privacy/private-variant-reexport.rs
index 688284460..688284460 100644
--- a/src/test/ui/privacy/private-variant-reexport.rs
+++ b/tests/ui/privacy/private-variant-reexport.rs
diff --git a/src/test/ui/privacy/private-variant-reexport.stderr b/tests/ui/privacy/private-variant-reexport.stderr
index 78771ee30..78771ee30 100644
--- a/src/test/ui/privacy/private-variant-reexport.stderr
+++ b/tests/ui/privacy/private-variant-reexport.stderr
diff --git a/src/test/ui/privacy/pub-extern-privacy.rs b/tests/ui/privacy/pub-extern-privacy.rs
index dbbbe4e3b..dbbbe4e3b 100644
--- a/src/test/ui/privacy/pub-extern-privacy.rs
+++ b/tests/ui/privacy/pub-extern-privacy.rs
diff --git a/src/test/ui/privacy/pub-priv-dep/auxiliary/priv_dep.rs b/tests/ui/privacy/pub-priv-dep/auxiliary/priv_dep.rs
index e7afeb84f..e7afeb84f 100644
--- a/src/test/ui/privacy/pub-priv-dep/auxiliary/priv_dep.rs
+++ b/tests/ui/privacy/pub-priv-dep/auxiliary/priv_dep.rs
diff --git a/src/test/ui/privacy/pub-priv-dep/auxiliary/pub_dep.rs b/tests/ui/privacy/pub-priv-dep/auxiliary/pub_dep.rs
index 3ebafd953..3ebafd953 100644
--- a/src/test/ui/privacy/pub-priv-dep/auxiliary/pub_dep.rs
+++ b/tests/ui/privacy/pub-priv-dep/auxiliary/pub_dep.rs
diff --git a/src/test/ui/privacy/pub-priv-dep/pub-priv1.rs b/tests/ui/privacy/pub-priv-dep/pub-priv1.rs
index ec8666f93..ec8666f93 100644
--- a/src/test/ui/privacy/pub-priv-dep/pub-priv1.rs
+++ b/tests/ui/privacy/pub-priv-dep/pub-priv1.rs
diff --git a/src/test/ui/privacy/pub-priv-dep/pub-priv1.stderr b/tests/ui/privacy/pub-priv-dep/pub-priv1.stderr
index e62a440d8..e62a440d8 100644
--- a/src/test/ui/privacy/pub-priv-dep/pub-priv1.stderr
+++ b/tests/ui/privacy/pub-priv-dep/pub-priv1.stderr
diff --git a/src/test/ui/privacy/pub-priv-dep/std-pub.rs b/tests/ui/privacy/pub-priv-dep/std-pub.rs
index e25aa93a0..e25aa93a0 100644
--- a/src/test/ui/privacy/pub-priv-dep/std-pub.rs
+++ b/tests/ui/privacy/pub-priv-dep/std-pub.rs
diff --git a/src/test/ui/privacy/pub-use-xcrate.rs b/tests/ui/privacy/pub-use-xcrate.rs
index e8a6e8cf1..e8a6e8cf1 100644
--- a/src/test/ui/privacy/pub-use-xcrate.rs
+++ b/tests/ui/privacy/pub-use-xcrate.rs
diff --git a/src/test/ui/privacy/pub_use_mods_xcrate_exe.rs b/tests/ui/privacy/pub_use_mods_xcrate_exe.rs
index f163619e7..f163619e7 100644
--- a/src/test/ui/privacy/pub_use_mods_xcrate_exe.rs
+++ b/tests/ui/privacy/pub_use_mods_xcrate_exe.rs
diff --git a/src/test/ui/privacy/reachable-unnameable-items.rs b/tests/ui/privacy/reachable-unnameable-items.rs
index 1babe0119..1babe0119 100644
--- a/src/test/ui/privacy/reachable-unnameable-items.rs
+++ b/tests/ui/privacy/reachable-unnameable-items.rs
diff --git a/src/test/ui/privacy/restricted/auxiliary/pub_restricted.rs b/tests/ui/privacy/restricted/auxiliary/pub_restricted.rs
index a4013e6ac..a4013e6ac 100644
--- a/src/test/ui/privacy/restricted/auxiliary/pub_restricted.rs
+++ b/tests/ui/privacy/restricted/auxiliary/pub_restricted.rs
diff --git a/src/test/ui/privacy/restricted/lookup-ignores-private.rs b/tests/ui/privacy/restricted/lookup-ignores-private.rs
index 240ce1e2b..240ce1e2b 100644
--- a/src/test/ui/privacy/restricted/lookup-ignores-private.rs
+++ b/tests/ui/privacy/restricted/lookup-ignores-private.rs
diff --git a/src/test/ui/privacy/restricted/private-in-public.rs b/tests/ui/privacy/restricted/private-in-public.rs
index 1e3dbdf73..1e3dbdf73 100644
--- a/src/test/ui/privacy/restricted/private-in-public.rs
+++ b/tests/ui/privacy/restricted/private-in-public.rs
diff --git a/src/test/ui/privacy/restricted/private-in-public.stderr b/tests/ui/privacy/restricted/private-in-public.stderr
index 65d996f0f..65d996f0f 100644
--- a/src/test/ui/privacy/restricted/private-in-public.stderr
+++ b/tests/ui/privacy/restricted/private-in-public.stderr
diff --git a/src/test/ui/privacy/restricted/relative-2018.rs b/tests/ui/privacy/restricted/relative-2018.rs
index 954169a9f..954169a9f 100644
--- a/src/test/ui/privacy/restricted/relative-2018.rs
+++ b/tests/ui/privacy/restricted/relative-2018.rs
diff --git a/src/test/ui/privacy/restricted/relative-2018.stderr b/tests/ui/privacy/restricted/relative-2018.stderr
index dec0d5157..dec0d5157 100644
--- a/src/test/ui/privacy/restricted/relative-2018.stderr
+++ b/tests/ui/privacy/restricted/relative-2018.stderr
diff --git a/src/test/ui/privacy/restricted/struct-literal-field.rs b/tests/ui/privacy/restricted/struct-literal-field.rs
index 9c6104755..9c6104755 100644
--- a/src/test/ui/privacy/restricted/struct-literal-field.rs
+++ b/tests/ui/privacy/restricted/struct-literal-field.rs
diff --git a/src/test/ui/privacy/restricted/struct-literal-field.stderr b/tests/ui/privacy/restricted/struct-literal-field.stderr
index eee964f02..eee964f02 100644
--- a/src/test/ui/privacy/restricted/struct-literal-field.stderr
+++ b/tests/ui/privacy/restricted/struct-literal-field.stderr
diff --git a/src/test/ui/privacy/restricted/test.rs b/tests/ui/privacy/restricted/test.rs
index a8c269378..a8c269378 100644
--- a/src/test/ui/privacy/restricted/test.rs
+++ b/tests/ui/privacy/restricted/test.rs
diff --git a/src/test/ui/privacy/restricted/test.stderr b/tests/ui/privacy/restricted/test.stderr
index 1acd221b4..1acd221b4 100644
--- a/src/test/ui/privacy/restricted/test.stderr
+++ b/tests/ui/privacy/restricted/test.stderr
diff --git a/tests/ui/privacy/suggest-making-field-public.fixed b/tests/ui/privacy/suggest-making-field-public.fixed
new file mode 100644
index 000000000..78e335b3d
--- /dev/null
+++ b/tests/ui/privacy/suggest-making-field-public.fixed
@@ -0,0 +1,15 @@
+// run-rustfix
+mod a {
+    pub struct A(pub String);
+}
+
+mod b {
+    use crate::a::A;
+    pub fn x() {
+        A("".into()); //~ ERROR cannot initialize a tuple struct which contains private fields
+    }
+}
+fn main() {
+    a::A("a".into()); //~ ERROR tuple struct constructor `A` is private
+    b::x();
+}
diff --git a/tests/ui/privacy/suggest-making-field-public.rs b/tests/ui/privacy/suggest-making-field-public.rs
new file mode 100644
index 000000000..b65c801d1
--- /dev/null
+++ b/tests/ui/privacy/suggest-making-field-public.rs
@@ -0,0 +1,15 @@
+// run-rustfix
+mod a {
+    pub struct A(pub(self)String);
+}
+
+mod b {
+    use crate::a::A;
+    pub fn x() {
+        A("".into()); //~ ERROR cannot initialize a tuple struct which contains private fields
+    }
+}
+fn main() {
+    a::A("a".into()); //~ ERROR tuple struct constructor `A` is private
+    b::x();
+}
diff --git a/tests/ui/privacy/suggest-making-field-public.stderr b/tests/ui/privacy/suggest-making-field-public.stderr
new file mode 100644
index 000000000..e92e9aae3
--- /dev/null
+++ b/tests/ui/privacy/suggest-making-field-public.stderr
@@ -0,0 +1,39 @@
+error[E0603]: tuple struct constructor `A` is private
+  --> $DIR/suggest-making-field-public.rs:13:8
+   |
+LL |     pub struct A(pub(self)String);
+   |                  --------------- a constructor is private if any of the fields is private
+...
+LL |     a::A("a".into());
+   |        ^ private tuple struct constructor
+   |
+note: the tuple struct constructor `A` is defined here
+  --> $DIR/suggest-making-field-public.rs:3:5
+   |
+LL |     pub struct A(pub(self)String);
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct A(pub String);
+   |                  ~~~
+
+error[E0423]: cannot initialize a tuple struct which contains private fields
+  --> $DIR/suggest-making-field-public.rs:9:9
+   |
+LL |         A("".into());
+   |         ^
+   |
+note: constructor is not visible here due to private fields
+  --> $DIR/suggest-making-field-public.rs:3:18
+   |
+LL |     pub struct A(pub(self)String);
+   |                  ^^^^^^^^^^^^^^^ private field
+help: consider making the field publicly accessible
+   |
+LL |     pub struct A(pub String);
+   |                  ~~~
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0423, E0603.
+For more information about an error, try `rustc --explain E0423`.
diff --git a/src/test/ui/privacy/union-field-privacy-1.rs b/tests/ui/privacy/union-field-privacy-1.rs
index 8a84bd86a..8a84bd86a 100644
--- a/src/test/ui/privacy/union-field-privacy-1.rs
+++ b/tests/ui/privacy/union-field-privacy-1.rs
diff --git a/src/test/ui/privacy/union-field-privacy-1.stderr b/tests/ui/privacy/union-field-privacy-1.stderr
index b1f0b785e..b1f0b785e 100644
--- a/src/test/ui/privacy/union-field-privacy-1.stderr
+++ b/tests/ui/privacy/union-field-privacy-1.stderr
diff --git a/src/test/ui/privacy/union-field-privacy-2.rs b/tests/ui/privacy/union-field-privacy-2.rs
index f02e0f8a9..f02e0f8a9 100644
--- a/src/test/ui/privacy/union-field-privacy-2.rs
+++ b/tests/ui/privacy/union-field-privacy-2.rs
diff --git a/src/test/ui/privacy/union-field-privacy-2.stderr b/tests/ui/privacy/union-field-privacy-2.stderr
index bf6a2b625..bf6a2b625 100644
--- a/src/test/ui/privacy/union-field-privacy-2.stderr
+++ b/tests/ui/privacy/union-field-privacy-2.stderr
diff --git a/src/test/ui/privacy/useless-pub.rs b/tests/ui/privacy/useless-pub.rs
index fde7cd5d8..fde7cd5d8 100644
--- a/src/test/ui/privacy/useless-pub.rs
+++ b/tests/ui/privacy/useless-pub.rs
diff --git a/src/test/ui/privacy/useless-pub.stderr b/tests/ui/privacy/useless-pub.stderr
index 14c4983ae..14c4983ae 100644
--- a/src/test/ui/privacy/useless-pub.stderr
+++ b/tests/ui/privacy/useless-pub.stderr
diff --git a/src/test/ui/privacy/where-priv-type.rs b/tests/ui/privacy/where-priv-type.rs
index 66ee9c4bb..66ee9c4bb 100644
--- a/src/test/ui/privacy/where-priv-type.rs
+++ b/tests/ui/privacy/where-priv-type.rs
diff --git a/src/test/ui/privacy/where-priv-type.stderr b/tests/ui/privacy/where-priv-type.stderr
index c5fb2cdb0..c5fb2cdb0 100644
--- a/src/test/ui/privacy/where-priv-type.stderr
+++ b/tests/ui/privacy/where-priv-type.stderr
diff --git a/src/test/ui/privacy/where-pub-type-impls-priv-trait.rs b/tests/ui/privacy/where-pub-type-impls-priv-trait.rs
index 87c211df1..87c211df1 100644
--- a/src/test/ui/privacy/where-pub-type-impls-priv-trait.rs
+++ b/tests/ui/privacy/where-pub-type-impls-priv-trait.rs
diff --git a/src/test/ui/privacy/where-pub-type-impls-priv-trait.stderr b/tests/ui/privacy/where-pub-type-impls-priv-trait.stderr
index a433cebbb..a433cebbb 100644
--- a/src/test/ui/privacy/where-pub-type-impls-priv-trait.stderr
+++ b/tests/ui/privacy/where-pub-type-impls-priv-trait.stderr
diff --git a/src/test/ui/proc-macro/add-impl.rs b/tests/ui/proc-macro/add-impl.rs
index ff2897a5e..ff2897a5e 100644
--- a/src/test/ui/proc-macro/add-impl.rs
+++ b/tests/ui/proc-macro/add-impl.rs
diff --git a/src/test/ui/proc-macro/allowed-attr-stmt-expr.rs b/tests/ui/proc-macro/allowed-attr-stmt-expr.rs
index 25243aeef..25243aeef 100644
--- a/src/test/ui/proc-macro/allowed-attr-stmt-expr.rs
+++ b/tests/ui/proc-macro/allowed-attr-stmt-expr.rs
diff --git a/src/test/ui/proc-macro/allowed-attr-stmt-expr.stdout b/tests/ui/proc-macro/allowed-attr-stmt-expr.stdout
index 091862de3..091862de3 100644
--- a/src/test/ui/proc-macro/allowed-attr-stmt-expr.stdout
+++ b/tests/ui/proc-macro/allowed-attr-stmt-expr.stdout
diff --git a/src/test/ui/proc-macro/ambiguous-builtin-attrs-test.rs b/tests/ui/proc-macro/ambiguous-builtin-attrs-test.rs
index 6a47e50f6..6a47e50f6 100644
--- a/src/test/ui/proc-macro/ambiguous-builtin-attrs-test.rs
+++ b/tests/ui/proc-macro/ambiguous-builtin-attrs-test.rs
diff --git a/src/test/ui/proc-macro/ambiguous-builtin-attrs-test.stderr b/tests/ui/proc-macro/ambiguous-builtin-attrs-test.stderr
index 316eb636b..316eb636b 100644
--- a/src/test/ui/proc-macro/ambiguous-builtin-attrs-test.stderr
+++ b/tests/ui/proc-macro/ambiguous-builtin-attrs-test.stderr
diff --git a/src/test/ui/proc-macro/ambiguous-builtin-attrs.rs b/tests/ui/proc-macro/ambiguous-builtin-attrs.rs
index 695ea69c8..695ea69c8 100644
--- a/src/test/ui/proc-macro/ambiguous-builtin-attrs.rs
+++ b/tests/ui/proc-macro/ambiguous-builtin-attrs.rs
diff --git a/src/test/ui/proc-macro/ambiguous-builtin-attrs.stderr b/tests/ui/proc-macro/ambiguous-builtin-attrs.stderr
index 0f4ddc065..0f4ddc065 100644
--- a/src/test/ui/proc-macro/ambiguous-builtin-attrs.stderr
+++ b/tests/ui/proc-macro/ambiguous-builtin-attrs.stderr
diff --git a/src/test/ui/proc-macro/amputate-span.fixed b/tests/ui/proc-macro/amputate-span.fixed
index 1afc3501a..1afc3501a 100644
--- a/src/test/ui/proc-macro/amputate-span.fixed
+++ b/tests/ui/proc-macro/amputate-span.fixed
diff --git a/src/test/ui/proc-macro/amputate-span.rs b/tests/ui/proc-macro/amputate-span.rs
index 894a06dd5..894a06dd5 100644
--- a/src/test/ui/proc-macro/amputate-span.rs
+++ b/tests/ui/proc-macro/amputate-span.rs
diff --git a/src/test/ui/proc-macro/amputate-span.stderr b/tests/ui/proc-macro/amputate-span.stderr
index ab4670411..ab4670411 100644
--- a/src/test/ui/proc-macro/amputate-span.stderr
+++ b/tests/ui/proc-macro/amputate-span.stderr
diff --git a/src/test/ui/proc-macro/append-impl.rs b/tests/ui/proc-macro/append-impl.rs
index a49384013..a49384013 100644
--- a/src/test/ui/proc-macro/append-impl.rs
+++ b/tests/ui/proc-macro/append-impl.rs
diff --git a/src/test/ui/proc-macro/attr-args.rs b/tests/ui/proc-macro/attr-args.rs
index 764f507ab..764f507ab 100644
--- a/src/test/ui/proc-macro/attr-args.rs
+++ b/tests/ui/proc-macro/attr-args.rs
diff --git a/src/test/ui/proc-macro/attr-cfg.rs b/tests/ui/proc-macro/attr-cfg.rs
index 2aed9e2e8..2aed9e2e8 100644
--- a/src/test/ui/proc-macro/attr-cfg.rs
+++ b/tests/ui/proc-macro/attr-cfg.rs
diff --git a/src/test/ui/proc-macro/attr-complex-fn.rs b/tests/ui/proc-macro/attr-complex-fn.rs
index 47734c94f..47734c94f 100644
--- a/src/test/ui/proc-macro/attr-complex-fn.rs
+++ b/tests/ui/proc-macro/attr-complex-fn.rs
diff --git a/src/test/ui/proc-macro/attr-complex-fn.stdout b/tests/ui/proc-macro/attr-complex-fn.stdout
index b12eb587f..b12eb587f 100644
--- a/src/test/ui/proc-macro/attr-complex-fn.stdout
+++ b/tests/ui/proc-macro/attr-complex-fn.stdout
diff --git a/src/test/ui/proc-macro/attr-invalid-exprs.rs b/tests/ui/proc-macro/attr-invalid-exprs.rs
index 9dcffc340..9dcffc340 100644
--- a/src/test/ui/proc-macro/attr-invalid-exprs.rs
+++ b/tests/ui/proc-macro/attr-invalid-exprs.rs
diff --git a/tests/ui/proc-macro/attr-invalid-exprs.stderr b/tests/ui/proc-macro/attr-invalid-exprs.stderr
new file mode 100644
index 000000000..f96939bb6
--- /dev/null
+++ b/tests/ui/proc-macro/attr-invalid-exprs.stderr
@@ -0,0 +1,32 @@
+error: expected expression, found end of macro arguments
+  --> $DIR/attr-invalid-exprs.rs:12:13
+   |
+LL |     let _ = #[no_output] "Hello, world!";
+   |             ^^^^^^^^^^^^
+
+error: macro expansion ignores token `,` and any following
+  --> $DIR/attr-invalid-exprs.rs:15:13
+   |
+LL |     let _ = #[duplicate] "Hello, world!";
+   |             ^^^^^^^^^^^^ caused by the macro expansion here
+   |
+   = note: the usage of `duplicate!` is likely invalid in expression context
+help: you might be missing a semicolon here
+   |
+LL |     let _ = #[duplicate]; "Hello, world!";
+   |                         +
+
+error: macro expansion ignores token `,` and any following
+  --> $DIR/attr-invalid-exprs.rs:24:9
+   |
+LL |         #[duplicate]
+   |         ^^^^^^^^^^^^ caused by the macro expansion here
+   |
+   = note: the usage of `duplicate!` is likely invalid in expression context
+help: you might be missing a semicolon here
+   |
+LL |         #[duplicate];
+   |                     +
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/proc-macro/attr-on-trait.rs b/tests/ui/proc-macro/attr-on-trait.rs
index e0edee630..e0edee630 100644
--- a/src/test/ui/proc-macro/attr-on-trait.rs
+++ b/tests/ui/proc-macro/attr-on-trait.rs
diff --git a/src/test/ui/proc-macro/attr-stmt-expr-rpass.rs b/tests/ui/proc-macro/attr-stmt-expr-rpass.rs
index 16b8fabfc..16b8fabfc 100644
--- a/src/test/ui/proc-macro/attr-stmt-expr-rpass.rs
+++ b/tests/ui/proc-macro/attr-stmt-expr-rpass.rs
diff --git a/src/test/ui/proc-macro/attr-stmt-expr.rs b/tests/ui/proc-macro/attr-stmt-expr.rs
index 0403684cd..0403684cd 100644
--- a/src/test/ui/proc-macro/attr-stmt-expr.rs
+++ b/tests/ui/proc-macro/attr-stmt-expr.rs
diff --git a/src/test/ui/proc-macro/attr-stmt-expr.stderr b/tests/ui/proc-macro/attr-stmt-expr.stderr
index 56178259d..56178259d 100644
--- a/src/test/ui/proc-macro/attr-stmt-expr.stderr
+++ b/tests/ui/proc-macro/attr-stmt-expr.stderr
diff --git a/src/test/ui/proc-macro/attr-stmt-expr.stdout b/tests/ui/proc-macro/attr-stmt-expr.stdout
index f9b2305c7..f9b2305c7 100644
--- a/src/test/ui/proc-macro/attr-stmt-expr.stdout
+++ b/tests/ui/proc-macro/attr-stmt-expr.stdout
diff --git a/src/test/ui/proc-macro/attribute-after-derive.rs b/tests/ui/proc-macro/attribute-after-derive.rs
index 0f0f27bff..0f0f27bff 100644
--- a/src/test/ui/proc-macro/attribute-after-derive.rs
+++ b/tests/ui/proc-macro/attribute-after-derive.rs
diff --git a/src/test/ui/proc-macro/attribute-after-derive.stdout b/tests/ui/proc-macro/attribute-after-derive.stdout
index 1b17d6047..1b17d6047 100644
--- a/src/test/ui/proc-macro/attribute-after-derive.stdout
+++ b/tests/ui/proc-macro/attribute-after-derive.stdout
diff --git a/src/test/ui/proc-macro/attribute-spans-preserved.rs b/tests/ui/proc-macro/attribute-spans-preserved.rs
index c01fce905..c01fce905 100644
--- a/src/test/ui/proc-macro/attribute-spans-preserved.rs
+++ b/tests/ui/proc-macro/attribute-spans-preserved.rs
diff --git a/src/test/ui/proc-macro/attribute-spans-preserved.stderr b/tests/ui/proc-macro/attribute-spans-preserved.stderr
index 193482a42..193482a42 100644
--- a/src/test/ui/proc-macro/attribute-spans-preserved.stderr
+++ b/tests/ui/proc-macro/attribute-spans-preserved.stderr
diff --git a/src/test/ui/proc-macro/attribute-spans-preserved.stdout b/tests/ui/proc-macro/attribute-spans-preserved.stdout
index cf9a97491..cf9a97491 100644
--- a/src/test/ui/proc-macro/attribute-spans-preserved.stdout
+++ b/tests/ui/proc-macro/attribute-spans-preserved.stdout
diff --git a/src/test/ui/proc-macro/attribute-with-error.rs b/tests/ui/proc-macro/attribute-with-error.rs
index aaa6c07dd..aaa6c07dd 100644
--- a/src/test/ui/proc-macro/attribute-with-error.rs
+++ b/tests/ui/proc-macro/attribute-with-error.rs
diff --git a/src/test/ui/proc-macro/attribute-with-error.stderr b/tests/ui/proc-macro/attribute-with-error.stderr
index 7f3a7e670..7f3a7e670 100644
--- a/src/test/ui/proc-macro/attribute-with-error.stderr
+++ b/tests/ui/proc-macro/attribute-with-error.stderr
diff --git a/src/test/ui/proc-macro/attribute.rs b/tests/ui/proc-macro/attribute.rs
index 5531b3236..9e40e4d9b 100644
--- a/src/test/ui/proc-macro/attribute.rs
+++ b/tests/ui/proc-macro/attribute.rs
@@ -53,19 +53,19 @@ pub fn foo11(input: TokenStream) -> TokenStream { input }
 pub fn foo12(input: TokenStream) -> TokenStream { input }
 
 #[proc_macro_derive(d13, attributes("a"))]
-//~^ ERROR: not a meta item
+//~^ ERROR: attribute must be a meta item, not a literal
 pub fn foo13(input: TokenStream) -> TokenStream { input }
 
 #[proc_macro_derive(d14, attributes(a = ""))]
-//~^ ERROR: must only be one word
+//~^ ERROR: attribute must only be a single word
 pub fn foo14(input: TokenStream) -> TokenStream { input }
 
 #[proc_macro_derive(d15, attributes(m::a))]
-//~^ ERROR: must only be one word
+//~^ ERROR: attribute must only be a single word
 pub fn foo15(input: TokenStream) -> TokenStream { input }
 
 #[proc_macro_derive(d16, attributes(a(b)))]
-//~^ ERROR: must only be one word
+//~^ ERROR: attribute must only be a single word
 pub fn foo16(input: TokenStream) -> TokenStream { input }
 
 #[proc_macro_derive(d17, attributes(self))]
diff --git a/src/test/ui/proc-macro/attribute.stderr b/tests/ui/proc-macro/attribute.stderr
index 021e7cad0..3269aaf7f 100644
--- a/src/test/ui/proc-macro/attribute.stderr
+++ b/tests/ui/proc-macro/attribute.stderr
@@ -70,25 +70,25 @@ error: attribute must be of form: `attributes(foo, bar)`
 LL | #[proc_macro_derive(d12, attributes)]
    |                          ^^^^^^^^^^
 
-error: not a meta item
+error: attribute must be a meta item, not a literal
   --> $DIR/attribute.rs:55:37
    |
 LL | #[proc_macro_derive(d13, attributes("a"))]
    |                                     ^^^
 
-error: must only be one word
+error: attribute must only be a single word
   --> $DIR/attribute.rs:59:37
    |
 LL | #[proc_macro_derive(d14, attributes(a = ""))]
    |                                     ^^^^^^
 
-error: must only be one word
+error: attribute must only be a single word
   --> $DIR/attribute.rs:63:37
    |
 LL | #[proc_macro_derive(d15, attributes(m::a))]
    |                                     ^^^^
 
-error: must only be one word
+error: attribute must only be a single word
   --> $DIR/attribute.rs:67:37
    |
 LL | #[proc_macro_derive(d16, attributes(a(b)))]
diff --git a/src/test/ui/proc-macro/attributes-included.rs b/tests/ui/proc-macro/attributes-included.rs
index 95e8e10a3..95e8e10a3 100644
--- a/src/test/ui/proc-macro/attributes-included.rs
+++ b/tests/ui/proc-macro/attributes-included.rs
diff --git a/src/test/ui/proc-macro/attributes-included.stderr b/tests/ui/proc-macro/attributes-included.stderr
index 72c88d5d8..72c88d5d8 100644
--- a/src/test/ui/proc-macro/attributes-included.stderr
+++ b/tests/ui/proc-macro/attributes-included.stderr
diff --git a/src/test/ui/proc-macro/attributes-on-definitions.rs b/tests/ui/proc-macro/attributes-on-definitions.rs
index c0733c8b4..c0733c8b4 100644
--- a/src/test/ui/proc-macro/attributes-on-definitions.rs
+++ b/tests/ui/proc-macro/attributes-on-definitions.rs
diff --git a/src/test/ui/proc-macro/attributes-on-definitions.stderr b/tests/ui/proc-macro/attributes-on-definitions.stderr
index c63dd0011..c63dd0011 100644
--- a/src/test/ui/proc-macro/attributes-on-definitions.stderr
+++ b/tests/ui/proc-macro/attributes-on-definitions.stderr
diff --git a/src/test/ui/proc-macro/attributes-on-modules-fail.rs b/tests/ui/proc-macro/attributes-on-modules-fail.rs
index 6c30e8f4f..6c30e8f4f 100644
--- a/src/test/ui/proc-macro/attributes-on-modules-fail.rs
+++ b/tests/ui/proc-macro/attributes-on-modules-fail.rs
diff --git a/src/test/ui/proc-macro/attributes-on-modules-fail.stderr b/tests/ui/proc-macro/attributes-on-modules-fail.stderr
index bb6cbb698..bb6cbb698 100644
--- a/src/test/ui/proc-macro/attributes-on-modules-fail.stderr
+++ b/tests/ui/proc-macro/attributes-on-modules-fail.stderr
diff --git a/src/test/ui/proc-macro/attributes-on-modules.rs b/tests/ui/proc-macro/attributes-on-modules.rs
index 6c73b0bf1..6c73b0bf1 100644
--- a/src/test/ui/proc-macro/attributes-on-modules.rs
+++ b/tests/ui/proc-macro/attributes-on-modules.rs
diff --git a/src/test/ui/proc-macro/auxiliary/add-impl.rs b/tests/ui/proc-macro/auxiliary/add-impl.rs
index 741e64875..741e64875 100644
--- a/src/test/ui/proc-macro/auxiliary/add-impl.rs
+++ b/tests/ui/proc-macro/auxiliary/add-impl.rs
diff --git a/src/test/ui/proc-macro/auxiliary/amputate-span.rs b/tests/ui/proc-macro/auxiliary/amputate-span.rs
index 1a82119ae..1a82119ae 100644
--- a/src/test/ui/proc-macro/auxiliary/amputate-span.rs
+++ b/tests/ui/proc-macro/auxiliary/amputate-span.rs
diff --git a/src/test/ui/proc-macro/auxiliary/api/cmp.rs b/tests/ui/proc-macro/auxiliary/api/cmp.rs
index 5784a6e5d..5784a6e5d 100644
--- a/src/test/ui/proc-macro/auxiliary/api/cmp.rs
+++ b/tests/ui/proc-macro/auxiliary/api/cmp.rs
diff --git a/src/test/ui/proc-macro/auxiliary/api/mod.rs b/tests/ui/proc-macro/auxiliary/api/mod.rs
index 739c25132..739c25132 100644
--- a/src/test/ui/proc-macro/auxiliary/api/mod.rs
+++ b/tests/ui/proc-macro/auxiliary/api/mod.rs
diff --git a/src/test/ui/proc-macro/auxiliary/api/parse.rs b/tests/ui/proc-macro/auxiliary/api/parse.rs
index 27391f831..27391f831 100644
--- a/src/test/ui/proc-macro/auxiliary/api/parse.rs
+++ b/tests/ui/proc-macro/auxiliary/api/parse.rs
diff --git a/src/test/ui/proc-macro/auxiliary/append-impl.rs b/tests/ui/proc-macro/auxiliary/append-impl.rs
index b032b1337..b032b1337 100644
--- a/src/test/ui/proc-macro/auxiliary/append-impl.rs
+++ b/tests/ui/proc-macro/auxiliary/append-impl.rs
diff --git a/src/test/ui/proc-macro/auxiliary/assert-span-pos.rs b/tests/ui/proc-macro/auxiliary/assert-span-pos.rs
index 455c5c7c3..455c5c7c3 100644
--- a/src/test/ui/proc-macro/auxiliary/assert-span-pos.rs
+++ b/tests/ui/proc-macro/auxiliary/assert-span-pos.rs
diff --git a/src/test/ui/proc-macro/auxiliary/attr-args.rs b/tests/ui/proc-macro/auxiliary/attr-args.rs
index 5f76a4484..5f76a4484 100644
--- a/src/test/ui/proc-macro/auxiliary/attr-args.rs
+++ b/tests/ui/proc-macro/auxiliary/attr-args.rs
diff --git a/src/test/ui/proc-macro/auxiliary/attr-cfg.rs b/tests/ui/proc-macro/auxiliary/attr-cfg.rs
index 2f0054cc1..2f0054cc1 100644
--- a/src/test/ui/proc-macro/auxiliary/attr-cfg.rs
+++ b/tests/ui/proc-macro/auxiliary/attr-cfg.rs
diff --git a/src/test/ui/proc-macro/auxiliary/attr-on-trait.rs b/tests/ui/proc-macro/auxiliary/attr-on-trait.rs
index 3787b8eec..3787b8eec 100644
--- a/src/test/ui/proc-macro/auxiliary/attr-on-trait.rs
+++ b/tests/ui/proc-macro/auxiliary/attr-on-trait.rs
diff --git a/src/test/ui/proc-macro/auxiliary/attr-stmt-expr-rpass.rs b/tests/ui/proc-macro/auxiliary/attr-stmt-expr-rpass.rs
index 5b386b46b..5b386b46b 100644
--- a/src/test/ui/proc-macro/auxiliary/attr-stmt-expr-rpass.rs
+++ b/tests/ui/proc-macro/auxiliary/attr-stmt-expr-rpass.rs
diff --git a/src/test/ui/proc-macro/auxiliary/attr-stmt-expr.rs b/tests/ui/proc-macro/auxiliary/attr-stmt-expr.rs
index 4d6dc06b4..4d6dc06b4 100644
--- a/src/test/ui/proc-macro/auxiliary/attr-stmt-expr.rs
+++ b/tests/ui/proc-macro/auxiliary/attr-stmt-expr.rs
diff --git a/src/test/ui/proc-macro/auxiliary/attribute-spans-preserved.rs b/tests/ui/proc-macro/auxiliary/attribute-spans-preserved.rs
index 4d3279584..4d3279584 100644
--- a/src/test/ui/proc-macro/auxiliary/attribute-spans-preserved.rs
+++ b/tests/ui/proc-macro/auxiliary/attribute-spans-preserved.rs
diff --git a/src/test/ui/proc-macro/auxiliary/attributes-included.rs b/tests/ui/proc-macro/auxiliary/attributes-included.rs
index a5eb40b28..a5eb40b28 100644
--- a/src/test/ui/proc-macro/auxiliary/attributes-included.rs
+++ b/tests/ui/proc-macro/auxiliary/attributes-included.rs
diff --git a/src/test/ui/proc-macro/auxiliary/attributes-on-definitions.rs b/tests/ui/proc-macro/auxiliary/attributes-on-definitions.rs
index 93a339840..93a339840 100644
--- a/src/test/ui/proc-macro/auxiliary/attributes-on-definitions.rs
+++ b/tests/ui/proc-macro/auxiliary/attributes-on-definitions.rs
diff --git a/src/test/ui/proc-macro/auxiliary/bang-macro.rs b/tests/ui/proc-macro/auxiliary/bang-macro.rs
index ff0002282..ff0002282 100644
--- a/src/test/ui/proc-macro/auxiliary/bang-macro.rs
+++ b/tests/ui/proc-macro/auxiliary/bang-macro.rs
diff --git a/src/test/ui/proc-macro/auxiliary/bang_proc_macro2.rs b/tests/ui/proc-macro/auxiliary/bang_proc_macro2.rs
index fcaaba602..fcaaba602 100644
--- a/src/test/ui/proc-macro/auxiliary/bang_proc_macro2.rs
+++ b/tests/ui/proc-macro/auxiliary/bang_proc_macro2.rs
diff --git a/src/test/ui/proc-macro/auxiliary/builtin-attrs.rs b/tests/ui/proc-macro/auxiliary/builtin-attrs.rs
index 6edafae39..6edafae39 100644
--- a/src/test/ui/proc-macro/auxiliary/builtin-attrs.rs
+++ b/tests/ui/proc-macro/auxiliary/builtin-attrs.rs
diff --git a/src/test/ui/proc-macro/auxiliary/call-deprecated.rs b/tests/ui/proc-macro/auxiliary/call-deprecated.rs
index 2f484809a..2f484809a 100644
--- a/src/test/ui/proc-macro/auxiliary/call-deprecated.rs
+++ b/tests/ui/proc-macro/auxiliary/call-deprecated.rs
diff --git a/src/test/ui/proc-macro/auxiliary/call-site.rs b/tests/ui/proc-macro/auxiliary/call-site.rs
index e64a5a343..e64a5a343 100644
--- a/src/test/ui/proc-macro/auxiliary/call-site.rs
+++ b/tests/ui/proc-macro/auxiliary/call-site.rs
diff --git a/src/test/ui/proc-macro/auxiliary/cond_plugin.rs b/tests/ui/proc-macro/auxiliary/cond_plugin.rs
index 8d3c4ec23..8d3c4ec23 100644
--- a/src/test/ui/proc-macro/auxiliary/cond_plugin.rs
+++ b/tests/ui/proc-macro/auxiliary/cond_plugin.rs
diff --git a/src/test/ui/proc-macro/auxiliary/count_compound_ops.rs b/tests/ui/proc-macro/auxiliary/count_compound_ops.rs
index 3a656d648..3a656d648 100644
--- a/src/test/ui/proc-macro/auxiliary/count_compound_ops.rs
+++ b/tests/ui/proc-macro/auxiliary/count_compound_ops.rs
diff --git a/src/test/ui/proc-macro/auxiliary/custom-attr-only-one-derive.rs b/tests/ui/proc-macro/auxiliary/custom-attr-only-one-derive.rs
index 41f73f596..41f73f596 100644
--- a/src/test/ui/proc-macro/auxiliary/custom-attr-only-one-derive.rs
+++ b/tests/ui/proc-macro/auxiliary/custom-attr-only-one-derive.rs
diff --git a/src/test/ui/proc-macro/auxiliary/custom-quote.rs b/tests/ui/proc-macro/auxiliary/custom-quote.rs
index 3b7811748..3b7811748 100644
--- a/src/test/ui/proc-macro/auxiliary/custom-quote.rs
+++ b/tests/ui/proc-macro/auxiliary/custom-quote.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-a.rs b/tests/ui/proc-macro/auxiliary/derive-a.rs
index 79a3864bf..79a3864bf 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-a.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-a.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-atob.rs b/tests/ui/proc-macro/auxiliary/derive-atob.rs
index 207b7fd32..207b7fd32 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-atob.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-atob.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-attr-cfg.rs b/tests/ui/proc-macro/auxiliary/derive-attr-cfg.rs
index e7e9634e0..e7e9634e0 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-attr-cfg.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-attr-cfg.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-b-rpass.rs b/tests/ui/proc-macro/auxiliary/derive-b-rpass.rs
index 641a95f78..641a95f78 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-b-rpass.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-b-rpass.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-b.rs b/tests/ui/proc-macro/auxiliary/derive-b.rs
index e7ab6c072..e7ab6c072 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-b.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-b.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-bad.rs b/tests/ui/proc-macro/auxiliary/derive-bad.rs
index 90bb9b1ba..90bb9b1ba 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-bad.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-bad.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-clona.rs b/tests/ui/proc-macro/auxiliary/derive-clona.rs
index 4a35c9d0d..4a35c9d0d 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-clona.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-clona.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-ctod.rs b/tests/ui/proc-macro/auxiliary/derive-ctod.rs
index 2efe5a913..2efe5a913 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-ctod.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-ctod.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-foo.rs b/tests/ui/proc-macro/auxiliary/derive-foo.rs
index 3ea027d4f..3ea027d4f 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-foo.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-foo.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-helper-shadowed-2.rs b/tests/ui/proc-macro/auxiliary/derive-helper-shadowed-2.rs
index ab532da29..ab532da29 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-helper-shadowed-2.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-helper-shadowed-2.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-helper-shadowing-2.rs b/tests/ui/proc-macro/auxiliary/derive-helper-shadowing-2.rs
index 370a1a279..370a1a279 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-helper-shadowing-2.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-helper-shadowing-2.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-helper-shadowing.rs b/tests/ui/proc-macro/auxiliary/derive-helper-shadowing.rs
index 41d3a1846..41d3a1846 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-helper-shadowing.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-helper-shadowing.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-nothing.rs b/tests/ui/proc-macro/auxiliary/derive-nothing.rs
index b6d1e133a..b6d1e133a 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-nothing.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-nothing.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-same-struct.rs b/tests/ui/proc-macro/auxiliary/derive-same-struct.rs
index 7598d632c..7598d632c 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-same-struct.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-same-struct.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-two-attrs.rs b/tests/ui/proc-macro/auxiliary/derive-two-attrs.rs
index a6f0eec12..a6f0eec12 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-two-attrs.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-two-attrs.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-union.rs b/tests/ui/proc-macro/auxiliary/derive-union.rs
index 05883170c..05883170c 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-union.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-union.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-unstable-2.rs b/tests/ui/proc-macro/auxiliary/derive-unstable-2.rs
index eac21b049..eac21b049 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-unstable-2.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-unstable-2.rs
diff --git a/src/test/ui/proc-macro/auxiliary/derive-unstable.rs b/tests/ui/proc-macro/auxiliary/derive-unstable.rs
index 2ccd3f882..2ccd3f882 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-unstable.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-unstable.rs
diff --git a/src/test/ui/proc-macro/auxiliary/dollar-crate-external.rs b/tests/ui/proc-macro/auxiliary/dollar-crate-external.rs
index bdcdb7922..bdcdb7922 100644
--- a/src/test/ui/proc-macro/auxiliary/dollar-crate-external.rs
+++ b/tests/ui/proc-macro/auxiliary/dollar-crate-external.rs
diff --git a/src/test/ui/proc-macro/auxiliary/double.rs b/tests/ui/proc-macro/auxiliary/double.rs
index 99eb4e375..99eb4e375 100644
--- a/src/test/ui/proc-macro/auxiliary/double.rs
+++ b/tests/ui/proc-macro/auxiliary/double.rs
diff --git a/src/test/ui/proc-macro/auxiliary/duplicate.rs b/tests/ui/proc-macro/auxiliary/duplicate.rs
index b8f82b46f..b8f82b46f 100644
--- a/src/test/ui/proc-macro/auxiliary/duplicate.rs
+++ b/tests/ui/proc-macro/auxiliary/duplicate.rs
diff --git a/src/test/ui/proc-macro/auxiliary/edition-imports-2015.rs b/tests/ui/proc-macro/auxiliary/edition-imports-2015.rs
index 27c59b805..27c59b805 100644
--- a/src/test/ui/proc-macro/auxiliary/edition-imports-2015.rs
+++ b/tests/ui/proc-macro/auxiliary/edition-imports-2015.rs
diff --git a/src/test/ui/proc-macro/auxiliary/empty-crate.rs b/tests/ui/proc-macro/auxiliary/empty-crate.rs
index 1cf7534b2..1cf7534b2 100644
--- a/src/test/ui/proc-macro/auxiliary/empty-crate.rs
+++ b/tests/ui/proc-macro/auxiliary/empty-crate.rs
diff --git a/src/test/ui/proc-macro/auxiliary/expand-expr.rs b/tests/ui/proc-macro/auxiliary/expand-expr.rs
index 1d6ef8a13..1d6ef8a13 100644
--- a/src/test/ui/proc-macro/auxiliary/expand-expr.rs
+++ b/tests/ui/proc-macro/auxiliary/expand-expr.rs
diff --git a/src/test/ui/proc-macro/auxiliary/expand-with-a-macro.rs b/tests/ui/proc-macro/auxiliary/expand-with-a-macro.rs
index d779d57af..d779d57af 100644
--- a/src/test/ui/proc-macro/auxiliary/expand-with-a-macro.rs
+++ b/tests/ui/proc-macro/auxiliary/expand-with-a-macro.rs
diff --git a/src/test/ui/proc-macro/auxiliary/external-crate-var.rs b/tests/ui/proc-macro/auxiliary/external-crate-var.rs
index 4319e9212..4319e9212 100644
--- a/src/test/ui/proc-macro/auxiliary/external-crate-var.rs
+++ b/tests/ui/proc-macro/auxiliary/external-crate-var.rs
diff --git a/src/test/ui/proc-macro/auxiliary/first-second.rs b/tests/ui/proc-macro/auxiliary/first-second.rs
index 6331608fb..6331608fb 100644
--- a/src/test/ui/proc-macro/auxiliary/first-second.rs
+++ b/tests/ui/proc-macro/auxiliary/first-second.rs
diff --git a/src/test/ui/proc-macro/auxiliary/gen-lifetime-token.rs b/tests/ui/proc-macro/auxiliary/gen-lifetime-token.rs
index d1a1c584f..d1a1c584f 100644
--- a/src/test/ui/proc-macro/auxiliary/gen-lifetime-token.rs
+++ b/tests/ui/proc-macro/auxiliary/gen-lifetime-token.rs
diff --git a/src/test/ui/proc-macro/auxiliary/gen-macro-rules-hygiene.rs b/tests/ui/proc-macro/auxiliary/gen-macro-rules-hygiene.rs
index 548fefe76..548fefe76 100644
--- a/src/test/ui/proc-macro/auxiliary/gen-macro-rules-hygiene.rs
+++ b/tests/ui/proc-macro/auxiliary/gen-macro-rules-hygiene.rs
diff --git a/src/test/ui/proc-macro/auxiliary/gen-macro-rules.rs b/tests/ui/proc-macro/auxiliary/gen-macro-rules.rs
index d4b67d6b0..d4b67d6b0 100644
--- a/src/test/ui/proc-macro/auxiliary/gen-macro-rules.rs
+++ b/tests/ui/proc-macro/auxiliary/gen-macro-rules.rs
diff --git a/src/test/ui/proc-macro/auxiliary/generate-dollar-ident.rs b/tests/ui/proc-macro/auxiliary/generate-dollar-ident.rs
index 3f3e12eed..3f3e12eed 100644
--- a/src/test/ui/proc-macro/auxiliary/generate-dollar-ident.rs
+++ b/tests/ui/proc-macro/auxiliary/generate-dollar-ident.rs
diff --git a/src/test/ui/proc-macro/auxiliary/generate-mod.rs b/tests/ui/proc-macro/auxiliary/generate-mod.rs
index e950f7d62..e950f7d62 100644
--- a/src/test/ui/proc-macro/auxiliary/generate-mod.rs
+++ b/tests/ui/proc-macro/auxiliary/generate-mod.rs
diff --git a/src/test/ui/proc-macro/auxiliary/hygiene_example.rs b/tests/ui/proc-macro/auxiliary/hygiene_example.rs
index f7e7e0b57..f7e7e0b57 100644
--- a/src/test/ui/proc-macro/auxiliary/hygiene_example.rs
+++ b/tests/ui/proc-macro/auxiliary/hygiene_example.rs
diff --git a/src/test/ui/proc-macro/auxiliary/hygiene_example_codegen.rs b/tests/ui/proc-macro/auxiliary/hygiene_example_codegen.rs
index 2bd4d3336..2bd4d3336 100644
--- a/src/test/ui/proc-macro/auxiliary/hygiene_example_codegen.rs
+++ b/tests/ui/proc-macro/auxiliary/hygiene_example_codegen.rs
diff --git a/src/test/ui/proc-macro/auxiliary/included-file.txt b/tests/ui/proc-macro/auxiliary/included-file.txt
index b4720047d..b4720047d 100644
--- a/src/test/ui/proc-macro/auxiliary/included-file.txt
+++ b/tests/ui/proc-macro/auxiliary/included-file.txt
diff --git a/src/test/ui/proc-macro/auxiliary/invalid-punct-ident.rs b/tests/ui/proc-macro/auxiliary/invalid-punct-ident.rs
index 518dfd0d6..518dfd0d6 100644
--- a/src/test/ui/proc-macro/auxiliary/invalid-punct-ident.rs
+++ b/tests/ui/proc-macro/auxiliary/invalid-punct-ident.rs
diff --git a/src/test/ui/proc-macro/auxiliary/is-available.rs b/tests/ui/proc-macro/auxiliary/is-available.rs
index 03f5265e3..03f5265e3 100644
--- a/src/test/ui/proc-macro/auxiliary/is-available.rs
+++ b/tests/ui/proc-macro/auxiliary/is-available.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue-104884.rs b/tests/ui/proc-macro/auxiliary/issue-104884.rs
index 0de59d005..0de59d005 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-104884.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-104884.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue-38586.rs b/tests/ui/proc-macro/auxiliary/issue-38586.rs
index f3a19081c..f3a19081c 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-38586.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-38586.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue-39889.rs b/tests/ui/proc-macro/auxiliary/issue-39889.rs
index e7af66da7..e7af66da7 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-39889.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-39889.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue-42708.rs b/tests/ui/proc-macro/auxiliary/issue-42708.rs
index dae05204b..dae05204b 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-42708.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-42708.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue-50061.rs b/tests/ui/proc-macro/auxiliary/issue-50061.rs
index f5fe8cabb..f5fe8cabb 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-50061.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-50061.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue-50493.rs b/tests/ui/proc-macro/auxiliary/issue-50493.rs
index f72024948..f72024948 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-50493.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-50493.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue-59191.rs b/tests/ui/proc-macro/auxiliary/issue-59191.rs
index d9ee77067..d9ee77067 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-59191.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-59191.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue-66286.rs b/tests/ui/proc-macro/auxiliary/issue-66286.rs
index 6217f1c7e..6217f1c7e 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-66286.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-66286.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue-75801.rs b/tests/ui/proc-macro/auxiliary/issue-75801.rs
index d6c031d7d..d6c031d7d 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-75801.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-75801.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue-79242.rs b/tests/ui/proc-macro/auxiliary/issue-79242.rs
index e586980f0..e586980f0 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-79242.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-79242.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue-79825.rs b/tests/ui/proc-macro/auxiliary/issue-79825.rs
index 930891b1d..930891b1d 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-79825.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-79825.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue-83510.rs b/tests/ui/proc-macro/auxiliary/issue-83510.rs
index 1d6ef3914..1d6ef3914 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-83510.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-83510.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue-91800-macro.rs b/tests/ui/proc-macro/auxiliary/issue-91800-macro.rs
index 958a8bed9..958a8bed9 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-91800-macro.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-91800-macro.rs
diff --git a/src/test/ui/proc-macro/auxiliary/lifetimes-rpass.rs b/tests/ui/proc-macro/auxiliary/lifetimes-rpass.rs
index 4e5d22e6e..4e5d22e6e 100644
--- a/src/test/ui/proc-macro/auxiliary/lifetimes-rpass.rs
+++ b/tests/ui/proc-macro/auxiliary/lifetimes-rpass.rs
diff --git a/src/test/ui/proc-macro/auxiliary/lifetimes.rs b/tests/ui/proc-macro/auxiliary/lifetimes.rs
index 212164dd2..212164dd2 100644
--- a/src/test/ui/proc-macro/auxiliary/lifetimes.rs
+++ b/tests/ui/proc-macro/auxiliary/lifetimes.rs
diff --git a/src/test/ui/proc-macro/auxiliary/macro-only-syntax.rs b/tests/ui/proc-macro/auxiliary/macro-only-syntax.rs
index c72306c3d..c72306c3d 100644
--- a/src/test/ui/proc-macro/auxiliary/macro-only-syntax.rs
+++ b/tests/ui/proc-macro/auxiliary/macro-only-syntax.rs
diff --git a/src/test/ui/proc-macro/auxiliary/make-macro.rs b/tests/ui/proc-macro/auxiliary/make-macro.rs
index 3c851b6de..3c851b6de 100644
--- a/src/test/ui/proc-macro/auxiliary/make-macro.rs
+++ b/tests/ui/proc-macro/auxiliary/make-macro.rs
diff --git a/src/test/ui/proc-macro/auxiliary/meta-delim.rs b/tests/ui/proc-macro/auxiliary/meta-delim.rs
index 54e3d7857..54e3d7857 100644
--- a/src/test/ui/proc-macro/auxiliary/meta-delim.rs
+++ b/tests/ui/proc-macro/auxiliary/meta-delim.rs
diff --git a/src/test/ui/proc-macro/auxiliary/meta-macro.rs b/tests/ui/proc-macro/auxiliary/meta-macro.rs
index 0a9b9887d..0a9b9887d 100644
--- a/src/test/ui/proc-macro/auxiliary/meta-macro.rs
+++ b/tests/ui/proc-macro/auxiliary/meta-macro.rs
diff --git a/src/test/ui/proc-macro/auxiliary/mixed-site-span.rs b/tests/ui/proc-macro/auxiliary/mixed-site-span.rs
index c2a498700..c2a498700 100644
--- a/src/test/ui/proc-macro/auxiliary/mixed-site-span.rs
+++ b/tests/ui/proc-macro/auxiliary/mixed-site-span.rs
diff --git a/src/test/ui/proc-macro/auxiliary/modify-ast.rs b/tests/ui/proc-macro/auxiliary/modify-ast.rs
index cc582c152..cc582c152 100644
--- a/src/test/ui/proc-macro/auxiliary/modify-ast.rs
+++ b/tests/ui/proc-macro/auxiliary/modify-ast.rs
diff --git a/src/test/ui/proc-macro/auxiliary/multiple-derives.rs b/tests/ui/proc-macro/auxiliary/multiple-derives.rs
index e3f6607b2..e3f6607b2 100644
--- a/src/test/ui/proc-macro/auxiliary/multiple-derives.rs
+++ b/tests/ui/proc-macro/auxiliary/multiple-derives.rs
diff --git a/src/test/ui/proc-macro/auxiliary/multispan.rs b/tests/ui/proc-macro/auxiliary/multispan.rs
index c05d15643..c05d15643 100644
--- a/src/test/ui/proc-macro/auxiliary/multispan.rs
+++ b/tests/ui/proc-macro/auxiliary/multispan.rs
diff --git a/src/test/ui/proc-macro/auxiliary/negative-token.rs b/tests/ui/proc-macro/auxiliary/negative-token.rs
index 8b89f2e37..8b89f2e37 100644
--- a/src/test/ui/proc-macro/auxiliary/negative-token.rs
+++ b/tests/ui/proc-macro/auxiliary/negative-token.rs
diff --git a/src/test/ui/proc-macro/auxiliary/nested-macro-rules.rs b/tests/ui/proc-macro/auxiliary/nested-macro-rules.rs
index 27676a5cb..27676a5cb 100644
--- a/src/test/ui/proc-macro/auxiliary/nested-macro-rules.rs
+++ b/tests/ui/proc-macro/auxiliary/nested-macro-rules.rs
diff --git a/src/test/ui/proc-macro/auxiliary/nonterminal-recollect-attr.rs b/tests/ui/proc-macro/auxiliary/nonterminal-recollect-attr.rs
index ea5ff4665..ea5ff4665 100644
--- a/src/test/ui/proc-macro/auxiliary/nonterminal-recollect-attr.rs
+++ b/tests/ui/proc-macro/auxiliary/nonterminal-recollect-attr.rs
diff --git a/src/test/ui/proc-macro/auxiliary/not-joint.rs b/tests/ui/proc-macro/auxiliary/not-joint.rs
index e6c09f762..e6c09f762 100644
--- a/src/test/ui/proc-macro/auxiliary/not-joint.rs
+++ b/tests/ui/proc-macro/auxiliary/not-joint.rs
diff --git a/src/test/ui/proc-macro/auxiliary/parent-source-spans.rs b/tests/ui/proc-macro/auxiliary/parent-source-spans.rs
index 594f10883..594f10883 100644
--- a/src/test/ui/proc-macro/auxiliary/parent-source-spans.rs
+++ b/tests/ui/proc-macro/auxiliary/parent-source-spans.rs
diff --git a/src/test/ui/proc-macro/auxiliary/proc-macro-panic.rs b/tests/ui/proc-macro/auxiliary/proc-macro-panic.rs
index fc15bb9c5..fc15bb9c5 100644
--- a/src/test/ui/proc-macro/auxiliary/proc-macro-panic.rs
+++ b/tests/ui/proc-macro/auxiliary/proc-macro-panic.rs
diff --git a/src/test/ui/proc-macro/auxiliary/raw-ident.rs b/tests/ui/proc-macro/auxiliary/raw-ident.rs
index 9daee21aa..9daee21aa 100644
--- a/src/test/ui/proc-macro/auxiliary/raw-ident.rs
+++ b/tests/ui/proc-macro/auxiliary/raw-ident.rs
diff --git a/src/test/ui/proc-macro/auxiliary/re-export.rs b/tests/ui/proc-macro/auxiliary/re-export.rs
index e8e9c9d3e..e8e9c9d3e 100644
--- a/src/test/ui/proc-macro/auxiliary/re-export.rs
+++ b/tests/ui/proc-macro/auxiliary/re-export.rs
diff --git a/src/test/ui/proc-macro/auxiliary/recollect.rs b/tests/ui/proc-macro/auxiliary/recollect.rs
index d4494a5af..d4494a5af 100644
--- a/src/test/ui/proc-macro/auxiliary/recollect.rs
+++ b/tests/ui/proc-macro/auxiliary/recollect.rs
diff --git a/src/test/ui/proc-macro/auxiliary/resolved-located-at.rs b/tests/ui/proc-macro/auxiliary/resolved-located-at.rs
index db660824f..db660824f 100644
--- a/src/test/ui/proc-macro/auxiliary/resolved-located-at.rs
+++ b/tests/ui/proc-macro/auxiliary/resolved-located-at.rs
diff --git a/src/test/ui/proc-macro/auxiliary/span-api-tests.rs b/tests/ui/proc-macro/auxiliary/span-api-tests.rs
index ad1e770a4..ad1e770a4 100644
--- a/src/test/ui/proc-macro/auxiliary/span-api-tests.rs
+++ b/tests/ui/proc-macro/auxiliary/span-api-tests.rs
diff --git a/src/test/ui/proc-macro/auxiliary/span-from-proc-macro.rs b/tests/ui/proc-macro/auxiliary/span-from-proc-macro.rs
index 49292acfe..49292acfe 100644
--- a/src/test/ui/proc-macro/auxiliary/span-from-proc-macro.rs
+++ b/tests/ui/proc-macro/auxiliary/span-from-proc-macro.rs
diff --git a/src/test/ui/proc-macro/auxiliary/span-test-macros.rs b/tests/ui/proc-macro/auxiliary/span-test-macros.rs
index 9a78f0a89..9a78f0a89 100644
--- a/src/test/ui/proc-macro/auxiliary/span-test-macros.rs
+++ b/tests/ui/proc-macro/auxiliary/span-test-macros.rs
diff --git a/src/test/ui/proc-macro/auxiliary/subspan.rs b/tests/ui/proc-macro/auxiliary/subspan.rs
index f92adc040..f92adc040 100644
--- a/src/test/ui/proc-macro/auxiliary/subspan.rs
+++ b/tests/ui/proc-macro/auxiliary/subspan.rs
diff --git a/src/test/ui/proc-macro/auxiliary/test-macros.rs b/tests/ui/proc-macro/auxiliary/test-macros.rs
index 7a46aee46..7a46aee46 100644
--- a/src/test/ui/proc-macro/auxiliary/test-macros.rs
+++ b/tests/ui/proc-macro/auxiliary/test-macros.rs
diff --git a/src/test/ui/proc-macro/auxiliary/three-equals.rs b/tests/ui/proc-macro/auxiliary/three-equals.rs
index e740e86e5..e740e86e5 100644
--- a/src/test/ui/proc-macro/auxiliary/three-equals.rs
+++ b/tests/ui/proc-macro/auxiliary/three-equals.rs
diff --git a/src/test/ui/proc-macro/auxiliary/weird-hygiene.rs b/tests/ui/proc-macro/auxiliary/weird-hygiene.rs
index 338e436df..338e436df 100644
--- a/src/test/ui/proc-macro/auxiliary/weird-hygiene.rs
+++ b/tests/ui/proc-macro/auxiliary/weird-hygiene.rs
diff --git a/src/test/ui/proc-macro/bang-macro.rs b/tests/ui/proc-macro/bang-macro.rs
index 928107913..928107913 100644
--- a/src/test/ui/proc-macro/bang-macro.rs
+++ b/tests/ui/proc-macro/bang-macro.rs
diff --git a/src/test/ui/proc-macro/break-token-spans.rs b/tests/ui/proc-macro/break-token-spans.rs
index 59dc3b504..59dc3b504 100644
--- a/src/test/ui/proc-macro/break-token-spans.rs
+++ b/tests/ui/proc-macro/break-token-spans.rs
diff --git a/src/test/ui/proc-macro/break-token-spans.stderr b/tests/ui/proc-macro/break-token-spans.stderr
index 0a0322b8a..0a0322b8a 100644
--- a/src/test/ui/proc-macro/break-token-spans.stderr
+++ b/tests/ui/proc-macro/break-token-spans.stderr
diff --git a/src/test/ui/proc-macro/call-deprecated.rs b/tests/ui/proc-macro/call-deprecated.rs
index cb634671b..cb634671b 100644
--- a/src/test/ui/proc-macro/call-deprecated.rs
+++ b/tests/ui/proc-macro/call-deprecated.rs
diff --git a/src/test/ui/proc-macro/call-deprecated.stderr b/tests/ui/proc-macro/call-deprecated.stderr
index 3506f9a16..3506f9a16 100644
--- a/src/test/ui/proc-macro/call-deprecated.stderr
+++ b/tests/ui/proc-macro/call-deprecated.stderr
diff --git a/src/test/ui/proc-macro/call-site.rs b/tests/ui/proc-macro/call-site.rs
index 12c77250c..12c77250c 100644
--- a/src/test/ui/proc-macro/call-site.rs
+++ b/tests/ui/proc-macro/call-site.rs
diff --git a/src/test/ui/proc-macro/capture-macro-rules-invoke.rs b/tests/ui/proc-macro/capture-macro-rules-invoke.rs
index de008a370..de008a370 100644
--- a/src/test/ui/proc-macro/capture-macro-rules-invoke.rs
+++ b/tests/ui/proc-macro/capture-macro-rules-invoke.rs
diff --git a/src/test/ui/proc-macro/capture-macro-rules-invoke.stdout b/tests/ui/proc-macro/capture-macro-rules-invoke.stdout
index b88fbd3e8..b88fbd3e8 100644
--- a/src/test/ui/proc-macro/capture-macro-rules-invoke.stdout
+++ b/tests/ui/proc-macro/capture-macro-rules-invoke.stdout
diff --git a/src/test/ui/proc-macro/capture-unglued-token.rs b/tests/ui/proc-macro/capture-unglued-token.rs
index 727b77977..727b77977 100644
--- a/src/test/ui/proc-macro/capture-unglued-token.rs
+++ b/tests/ui/proc-macro/capture-unglued-token.rs
diff --git a/src/test/ui/proc-macro/capture-unglued-token.stdout b/tests/ui/proc-macro/capture-unglued-token.stdout
index 7e6b54033..7e6b54033 100644
--- a/src/test/ui/proc-macro/capture-unglued-token.stdout
+++ b/tests/ui/proc-macro/capture-unglued-token.stdout
diff --git a/src/test/ui/proc-macro/cfg-eval-fail.rs b/tests/ui/proc-macro/cfg-eval-fail.rs
index a259aa2e6..a259aa2e6 100644
--- a/src/test/ui/proc-macro/cfg-eval-fail.rs
+++ b/tests/ui/proc-macro/cfg-eval-fail.rs
diff --git a/src/test/ui/proc-macro/cfg-eval-fail.stderr b/tests/ui/proc-macro/cfg-eval-fail.stderr
index df8b6d5f3..df8b6d5f3 100644
--- a/src/test/ui/proc-macro/cfg-eval-fail.stderr
+++ b/tests/ui/proc-macro/cfg-eval-fail.stderr
diff --git a/src/test/ui/proc-macro/cfg-eval-inner.rs b/tests/ui/proc-macro/cfg-eval-inner.rs
index 5fd3ca0d1..5fd3ca0d1 100644
--- a/src/test/ui/proc-macro/cfg-eval-inner.rs
+++ b/tests/ui/proc-macro/cfg-eval-inner.rs
diff --git a/src/test/ui/proc-macro/cfg-eval-inner.stdout b/tests/ui/proc-macro/cfg-eval-inner.stdout
index 9d25def58..9d25def58 100644
--- a/src/test/ui/proc-macro/cfg-eval-inner.stdout
+++ b/tests/ui/proc-macro/cfg-eval-inner.stdout
diff --git a/src/test/ui/proc-macro/cfg-eval.rs b/tests/ui/proc-macro/cfg-eval.rs
index fa6d015e4..fa6d015e4 100644
--- a/src/test/ui/proc-macro/cfg-eval.rs
+++ b/tests/ui/proc-macro/cfg-eval.rs
diff --git a/src/test/ui/proc-macro/cfg-eval.stdout b/tests/ui/proc-macro/cfg-eval.stdout
index 6732caf08..6732caf08 100644
--- a/src/test/ui/proc-macro/cfg-eval.stdout
+++ b/tests/ui/proc-macro/cfg-eval.stdout
diff --git a/src/test/ui/proc-macro/count_compound_ops.rs b/tests/ui/proc-macro/count_compound_ops.rs
index 2cb871844..2cb871844 100644
--- a/src/test/ui/proc-macro/count_compound_ops.rs
+++ b/tests/ui/proc-macro/count_compound_ops.rs
diff --git a/src/test/ui/proc-macro/crate-attrs-multiple.rs b/tests/ui/proc-macro/crate-attrs-multiple.rs
index 29a0eca41..29a0eca41 100644
--- a/src/test/ui/proc-macro/crate-attrs-multiple.rs
+++ b/tests/ui/proc-macro/crate-attrs-multiple.rs
diff --git a/src/test/ui/proc-macro/crate-var.rs b/tests/ui/proc-macro/crate-var.rs
index c0518e4b0..c0518e4b0 100644
--- a/src/test/ui/proc-macro/crate-var.rs
+++ b/tests/ui/proc-macro/crate-var.rs
diff --git a/src/test/ui/proc-macro/crt-static.rs b/tests/ui/proc-macro/crt-static.rs
index 6103acb7b..6103acb7b 100644
--- a/src/test/ui/proc-macro/crt-static.rs
+++ b/tests/ui/proc-macro/crt-static.rs
diff --git a/src/test/ui/proc-macro/custom-attr-only-one-derive.rs b/tests/ui/proc-macro/custom-attr-only-one-derive.rs
index 2cd5b4873..2cd5b4873 100644
--- a/src/test/ui/proc-macro/custom-attr-only-one-derive.rs
+++ b/tests/ui/proc-macro/custom-attr-only-one-derive.rs
diff --git a/src/test/ui/proc-macro/debug/auxiliary/macro-dump-debug.rs b/tests/ui/proc-macro/debug/auxiliary/macro-dump-debug.rs
index 56ad0612f..56ad0612f 100644
--- a/src/test/ui/proc-macro/debug/auxiliary/macro-dump-debug.rs
+++ b/tests/ui/proc-macro/debug/auxiliary/macro-dump-debug.rs
diff --git a/src/test/ui/proc-macro/debug/dump-debug-span-debug.rs b/tests/ui/proc-macro/debug/dump-debug-span-debug.rs
index 102bd6b7b..102bd6b7b 100644
--- a/src/test/ui/proc-macro/debug/dump-debug-span-debug.rs
+++ b/tests/ui/proc-macro/debug/dump-debug-span-debug.rs
diff --git a/src/test/ui/proc-macro/debug/dump-debug-span-debug.stderr b/tests/ui/proc-macro/debug/dump-debug-span-debug.stderr
index fa65cbbf1..fa65cbbf1 100644
--- a/src/test/ui/proc-macro/debug/dump-debug-span-debug.stderr
+++ b/tests/ui/proc-macro/debug/dump-debug-span-debug.stderr
diff --git a/src/test/ui/proc-macro/debug/dump-debug.rs b/tests/ui/proc-macro/debug/dump-debug.rs
index 0ed36b690..0ed36b690 100644
--- a/src/test/ui/proc-macro/debug/dump-debug.rs
+++ b/tests/ui/proc-macro/debug/dump-debug.rs
diff --git a/src/test/ui/proc-macro/debug/dump-debug.stderr b/tests/ui/proc-macro/debug/dump-debug.stderr
index db422b601..db422b601 100644
--- a/src/test/ui/proc-macro/debug/dump-debug.stderr
+++ b/tests/ui/proc-macro/debug/dump-debug.stderr
diff --git a/src/test/ui/proc-macro/define-two.rs b/tests/ui/proc-macro/define-two.rs
index b2184eae3..b2184eae3 100644
--- a/src/test/ui/proc-macro/define-two.rs
+++ b/tests/ui/proc-macro/define-two.rs
diff --git a/src/test/ui/proc-macro/define-two.stderr b/tests/ui/proc-macro/define-two.stderr
index bf1bd8427..bf1bd8427 100644
--- a/src/test/ui/proc-macro/define-two.stderr
+++ b/tests/ui/proc-macro/define-two.stderr
diff --git a/src/test/ui/proc-macro/derive-attr-cfg.rs b/tests/ui/proc-macro/derive-attr-cfg.rs
index 394774628..394774628 100644
--- a/src/test/ui/proc-macro/derive-attr-cfg.rs
+++ b/tests/ui/proc-macro/derive-attr-cfg.rs
diff --git a/src/test/ui/proc-macro/derive-b.rs b/tests/ui/proc-macro/derive-b.rs
index a026c2bd7..a026c2bd7 100644
--- a/src/test/ui/proc-macro/derive-b.rs
+++ b/tests/ui/proc-macro/derive-b.rs
diff --git a/src/test/ui/proc-macro/derive-bad.rs b/tests/ui/proc-macro/derive-bad.rs
index cb5188b5f..cb5188b5f 100644
--- a/src/test/ui/proc-macro/derive-bad.rs
+++ b/tests/ui/proc-macro/derive-bad.rs
diff --git a/src/test/ui/proc-macro/derive-bad.stderr b/tests/ui/proc-macro/derive-bad.stderr
index 241f99b28..241f99b28 100644
--- a/src/test/ui/proc-macro/derive-bad.stderr
+++ b/tests/ui/proc-macro/derive-bad.stderr
diff --git a/src/test/ui/proc-macro/derive-expand-order.rs b/tests/ui/proc-macro/derive-expand-order.rs
index 0cf1ceb91..0cf1ceb91 100644
--- a/src/test/ui/proc-macro/derive-expand-order.rs
+++ b/tests/ui/proc-macro/derive-expand-order.rs
diff --git a/src/test/ui/proc-macro/derive-expand-order.stdout b/tests/ui/proc-macro/derive-expand-order.stdout
index dffbbf149..dffbbf149 100644
--- a/src/test/ui/proc-macro/derive-expand-order.stdout
+++ b/tests/ui/proc-macro/derive-expand-order.stdout
diff --git a/src/test/ui/proc-macro/derive-helper-configured.rs b/tests/ui/proc-macro/derive-helper-configured.rs
index 243cf685e..243cf685e 100644
--- a/src/test/ui/proc-macro/derive-helper-configured.rs
+++ b/tests/ui/proc-macro/derive-helper-configured.rs
diff --git a/src/test/ui/proc-macro/derive-helper-legacy-limits.rs b/tests/ui/proc-macro/derive-helper-legacy-limits.rs
index ca904900d..ca904900d 100644
--- a/src/test/ui/proc-macro/derive-helper-legacy-limits.rs
+++ b/tests/ui/proc-macro/derive-helper-legacy-limits.rs
diff --git a/src/test/ui/proc-macro/derive-helper-legacy-limits.stderr b/tests/ui/proc-macro/derive-helper-legacy-limits.stderr
index 186f38a00..186f38a00 100644
--- a/src/test/ui/proc-macro/derive-helper-legacy-limits.stderr
+++ b/tests/ui/proc-macro/derive-helper-legacy-limits.stderr
diff --git a/src/test/ui/proc-macro/derive-helper-legacy-spurious.rs b/tests/ui/proc-macro/derive-helper-legacy-spurious.rs
index 4a7e48eed..4a7e48eed 100644
--- a/src/test/ui/proc-macro/derive-helper-legacy-spurious.rs
+++ b/tests/ui/proc-macro/derive-helper-legacy-spurious.rs
diff --git a/src/test/ui/proc-macro/derive-helper-legacy-spurious.stderr b/tests/ui/proc-macro/derive-helper-legacy-spurious.stderr
index fd1ed8a3d..fd1ed8a3d 100644
--- a/src/test/ui/proc-macro/derive-helper-legacy-spurious.stderr
+++ b/tests/ui/proc-macro/derive-helper-legacy-spurious.stderr
diff --git a/src/test/ui/proc-macro/derive-helper-shadowed.rs b/tests/ui/proc-macro/derive-helper-shadowed.rs
index e299454e0..e299454e0 100644
--- a/src/test/ui/proc-macro/derive-helper-shadowed.rs
+++ b/tests/ui/proc-macro/derive-helper-shadowed.rs
diff --git a/src/test/ui/proc-macro/derive-helper-shadowing-2.rs b/tests/ui/proc-macro/derive-helper-shadowing-2.rs
index 5204d72b9..5204d72b9 100644
--- a/src/test/ui/proc-macro/derive-helper-shadowing-2.rs
+++ b/tests/ui/proc-macro/derive-helper-shadowing-2.rs
diff --git a/src/test/ui/proc-macro/derive-helper-shadowing.rs b/tests/ui/proc-macro/derive-helper-shadowing.rs
index 80d982d25..80d982d25 100644
--- a/src/test/ui/proc-macro/derive-helper-shadowing.rs
+++ b/tests/ui/proc-macro/derive-helper-shadowing.rs
diff --git a/src/test/ui/proc-macro/derive-helper-shadowing.stderr b/tests/ui/proc-macro/derive-helper-shadowing.stderr
index 9c52ca422..de2c27a87 100644
--- a/src/test/ui/proc-macro/derive-helper-shadowing.stderr
+++ b/tests/ui/proc-macro/derive-helper-shadowing.stderr
@@ -16,7 +16,7 @@ error: cannot find attribute `empty_helper` in this scope
 LL |             #[derive(GenHelperUse)]
    |                      ^^^^^^^^^^^^
    |
-   = note: consider importing this attribute macro:
+   = help: consider importing this attribute macro:
            empty_helper
    = note: this error originates in the derive macro `GenHelperUse` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -29,7 +29,7 @@ LL |         #[empty_helper]
 LL |             gen_helper_use!();
    |             ----------------- in this macro invocation
    |
-   = note: consider importing this attribute macro:
+   = help: consider importing this attribute macro:
            crate::empty_helper
    = note: this error originates in the macro `gen_helper_use` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/proc-macro/derive-helper-vs-legacy.rs b/tests/ui/proc-macro/derive-helper-vs-legacy.rs
index 98836bcb8..98836bcb8 100644
--- a/src/test/ui/proc-macro/derive-helper-vs-legacy.rs
+++ b/tests/ui/proc-macro/derive-helper-vs-legacy.rs
diff --git a/src/test/ui/proc-macro/derive-in-mod.rs b/tests/ui/proc-macro/derive-in-mod.rs
index 8b5d4e9d0..8b5d4e9d0 100644
--- a/src/test/ui/proc-macro/derive-in-mod.rs
+++ b/tests/ui/proc-macro/derive-in-mod.rs
diff --git a/src/test/ui/proc-macro/derive-multiple-with-packed.rs b/tests/ui/proc-macro/derive-multiple-with-packed.rs
index 23578aa0e..23578aa0e 100644
--- a/src/test/ui/proc-macro/derive-multiple-with-packed.rs
+++ b/tests/ui/proc-macro/derive-multiple-with-packed.rs
diff --git a/src/test/ui/proc-macro/derive-same-struct.rs b/tests/ui/proc-macro/derive-same-struct.rs
index 528b0f22a..528b0f22a 100644
--- a/src/test/ui/proc-macro/derive-same-struct.rs
+++ b/tests/ui/proc-macro/derive-same-struct.rs
diff --git a/src/test/ui/proc-macro/derive-same-struct.stdout b/tests/ui/proc-macro/derive-same-struct.stdout
index 7478d9741..7478d9741 100644
--- a/src/test/ui/proc-macro/derive-same-struct.stdout
+++ b/tests/ui/proc-macro/derive-same-struct.stdout
diff --git a/src/test/ui/proc-macro/derive-still-gated.rs b/tests/ui/proc-macro/derive-still-gated.rs
index 3f8d6f071..3f8d6f071 100644
--- a/src/test/ui/proc-macro/derive-still-gated.rs
+++ b/tests/ui/proc-macro/derive-still-gated.rs
diff --git a/src/test/ui/proc-macro/derive-still-gated.stderr b/tests/ui/proc-macro/derive-still-gated.stderr
index 99289fdfe..99289fdfe 100644
--- a/src/test/ui/proc-macro/derive-still-gated.stderr
+++ b/tests/ui/proc-macro/derive-still-gated.stderr
diff --git a/src/test/ui/proc-macro/derive-test.rs b/tests/ui/proc-macro/derive-test.rs
index b81e38432..b81e38432 100644
--- a/src/test/ui/proc-macro/derive-test.rs
+++ b/tests/ui/proc-macro/derive-test.rs
diff --git a/src/test/ui/proc-macro/derive-two-attrs.rs b/tests/ui/proc-macro/derive-two-attrs.rs
index 08225b8e3..08225b8e3 100644
--- a/src/test/ui/proc-macro/derive-two-attrs.rs
+++ b/tests/ui/proc-macro/derive-two-attrs.rs
diff --git a/src/test/ui/proc-macro/derive-union.rs b/tests/ui/proc-macro/derive-union.rs
index e83eee093..e83eee093 100644
--- a/src/test/ui/proc-macro/derive-union.rs
+++ b/tests/ui/proc-macro/derive-union.rs
diff --git a/src/test/ui/proc-macro/disappearing-resolution.rs b/tests/ui/proc-macro/disappearing-resolution.rs
index 50f04b1ea..50f04b1ea 100644
--- a/src/test/ui/proc-macro/disappearing-resolution.rs
+++ b/tests/ui/proc-macro/disappearing-resolution.rs
diff --git a/src/test/ui/proc-macro/disappearing-resolution.stderr b/tests/ui/proc-macro/disappearing-resolution.stderr
index 5b969549a..5b969549a 100644
--- a/src/test/ui/proc-macro/disappearing-resolution.stderr
+++ b/tests/ui/proc-macro/disappearing-resolution.stderr
diff --git a/src/test/ui/proc-macro/doc-comment-preserved.rs b/tests/ui/proc-macro/doc-comment-preserved.rs
index ed8ca99bd..ed8ca99bd 100644
--- a/src/test/ui/proc-macro/doc-comment-preserved.rs
+++ b/tests/ui/proc-macro/doc-comment-preserved.rs
diff --git a/src/test/ui/proc-macro/doc-comment-preserved.stdout b/tests/ui/proc-macro/doc-comment-preserved.stdout
index f4160d7da..f4160d7da 100644
--- a/src/test/ui/proc-macro/doc-comment-preserved.stdout
+++ b/tests/ui/proc-macro/doc-comment-preserved.stdout
diff --git a/src/test/ui/proc-macro/dollar-crate-issue-101211.rs b/tests/ui/proc-macro/dollar-crate-issue-101211.rs
index fc1acfd32..fc1acfd32 100644
--- a/src/test/ui/proc-macro/dollar-crate-issue-101211.rs
+++ b/tests/ui/proc-macro/dollar-crate-issue-101211.rs
diff --git a/src/test/ui/proc-macro/dollar-crate-issue-57089.rs b/tests/ui/proc-macro/dollar-crate-issue-57089.rs
index 27bfa099f..27bfa099f 100644
--- a/src/test/ui/proc-macro/dollar-crate-issue-57089.rs
+++ b/tests/ui/proc-macro/dollar-crate-issue-57089.rs
diff --git a/src/test/ui/proc-macro/dollar-crate-issue-57089.stdout b/tests/ui/proc-macro/dollar-crate-issue-57089.stdout
index 2622c005d..2622c005d 100644
--- a/src/test/ui/proc-macro/dollar-crate-issue-57089.stdout
+++ b/tests/ui/proc-macro/dollar-crate-issue-57089.stdout
diff --git a/src/test/ui/proc-macro/dollar-crate-issue-62325.rs b/tests/ui/proc-macro/dollar-crate-issue-62325.rs
index d828fb9fd..d828fb9fd 100644
--- a/src/test/ui/proc-macro/dollar-crate-issue-62325.rs
+++ b/tests/ui/proc-macro/dollar-crate-issue-62325.rs
diff --git a/src/test/ui/proc-macro/dollar-crate-issue-62325.stdout b/tests/ui/proc-macro/dollar-crate-issue-62325.stdout
index a91908239..a91908239 100644
--- a/src/test/ui/proc-macro/dollar-crate-issue-62325.stdout
+++ b/tests/ui/proc-macro/dollar-crate-issue-62325.stdout
diff --git a/src/test/ui/proc-macro/dollar-crate.rs b/tests/ui/proc-macro/dollar-crate.rs
index ac27dfa1a..ac27dfa1a 100644
--- a/src/test/ui/proc-macro/dollar-crate.rs
+++ b/tests/ui/proc-macro/dollar-crate.rs
diff --git a/src/test/ui/proc-macro/dollar-crate.stdout b/tests/ui/proc-macro/dollar-crate.stdout
index 4e169d47e..4e169d47e 100644
--- a/src/test/ui/proc-macro/dollar-crate.stdout
+++ b/tests/ui/proc-macro/dollar-crate.stdout
diff --git a/src/test/ui/proc-macro/edition-imports-2018.rs b/tests/ui/proc-macro/edition-imports-2018.rs
index 5a77cd4ef..5a77cd4ef 100644
--- a/src/test/ui/proc-macro/edition-imports-2018.rs
+++ b/tests/ui/proc-macro/edition-imports-2018.rs
diff --git a/src/test/ui/proc-macro/empty-crate.rs b/tests/ui/proc-macro/empty-crate.rs
index 3e54c9fee..3e54c9fee 100644
--- a/src/test/ui/proc-macro/empty-crate.rs
+++ b/tests/ui/proc-macro/empty-crate.rs
diff --git a/src/test/ui/proc-macro/empty-where-clause.rs b/tests/ui/proc-macro/empty-where-clause.rs
index 719555c09..719555c09 100644
--- a/src/test/ui/proc-macro/empty-where-clause.rs
+++ b/tests/ui/proc-macro/empty-where-clause.rs
diff --git a/src/test/ui/proc-macro/empty-where-clause.stderr b/tests/ui/proc-macro/empty-where-clause.stderr
index 192a2b30f..192a2b30f 100644
--- a/src/test/ui/proc-macro/empty-where-clause.stderr
+++ b/tests/ui/proc-macro/empty-where-clause.stderr
diff --git a/src/test/ui/proc-macro/expand-expr.rs b/tests/ui/proc-macro/expand-expr.rs
index 901b3a951..700aac41c 100644
--- a/src/test/ui/proc-macro/expand-expr.rs
+++ b/tests/ui/proc-macro/expand-expr.rs
@@ -1,4 +1,6 @@
 // aux-build:expand-expr.rs
+// no-remap-src-base: check_expand_expr_file!() fails when enabled.
+
 #![feature(concat_bytes)]
 extern crate expand_expr;
 
@@ -8,7 +10,7 @@ use expand_expr::{
 
 // Check builtin macros can be expanded.
 
-expand_expr_is!(11u32, line!());
+expand_expr_is!(13u32, line!());
 expand_expr_is!(24u32, column!());
 
 expand_expr_is!("Hello, World!", concat!("Hello, ", "World", "!"));
diff --git a/tests/ui/proc-macro/expand-expr.stderr b/tests/ui/proc-macro/expand-expr.stderr
new file mode 100644
index 000000000..df61e9972
--- /dev/null
+++ b/tests/ui/proc-macro/expand-expr.stderr
@@ -0,0 +1,59 @@
+error: expected one of `.`, `?`, or an operator, found `;`
+  --> $DIR/expand-expr.rs:108:27
+   |
+LL | expand_expr_fail!("string"; hello);
+   |                           ^ expected one of `.`, `?`, or an operator
+
+error: expected expression, found `$`
+  --> $DIR/expand-expr.rs:111:19
+   |
+LL | expand_expr_fail!($);
+   |                   ^ expected expression
+
+error: expected expression, found `$`
+  --> $DIR/expand-expr.rs:40:23
+   |
+LL |     ($($t:tt)*) => { $($t)* };
+   |                       ^^^^ expected expression
+
+error: expected expression, found `$`
+  --> $DIR/expand-expr.rs:113:28
+   |
+LL | expand_expr_fail!(echo_pm!($));
+   |                            ^ expected expression
+
+error: macro expansion ignores token `hello` and any following
+  --> $DIR/expand-expr.rs:117:47
+   |
+LL | expand_expr_is!("string", echo_tts!("string"; hello));
+   |                           --------------------^^^^^- caused by the macro expansion here
+   |
+   = note: the usage of `echo_tts!` is likely invalid in expression context
+help: you might be missing a semicolon here
+   |
+LL | expand_expr_is!("string", echo_tts!("string"; hello););
+   |                                                     +
+
+error: macro expansion ignores token `;` and any following
+  --> $DIR/expand-expr.rs:118:44
+   |
+LL | expand_expr_is!("string", echo_pm!("string"; hello));
+   |                           -----------------^------- caused by the macro expansion here
+   |
+   = note: the usage of `echo_pm!` is likely invalid in expression context
+help: you might be missing a semicolon here
+   |
+LL | expand_expr_is!("string", echo_pm!("string"; hello););
+   |                                                    +
+
+error: recursion limit reached while expanding `recursive_expand!`
+  --> $DIR/expand-expr.rs:126:16
+   |
+LL | const _: u32 = recursive_expand!();
+   |                ^^^^^^^^^^^^^^^^^^^
+   |
+   = help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`expand_expr`)
+   = note: this error originates in the macro `recursive_expand` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 7 previous errors
+
diff --git a/src/test/ui/proc-macro/expand-to-derive.rs b/tests/ui/proc-macro/expand-to-derive.rs
index ff2876e84..ff2876e84 100644
--- a/src/test/ui/proc-macro/expand-to-derive.rs
+++ b/tests/ui/proc-macro/expand-to-derive.rs
diff --git a/src/test/ui/proc-macro/expand-to-derive.stdout b/tests/ui/proc-macro/expand-to-derive.stdout
index a6437982a..a6437982a 100644
--- a/src/test/ui/proc-macro/expand-to-derive.stdout
+++ b/tests/ui/proc-macro/expand-to-derive.stdout
diff --git a/src/test/ui/proc-macro/expand-to-unstable.rs b/tests/ui/proc-macro/expand-to-unstable.rs
index 0825c1a8e..0825c1a8e 100644
--- a/src/test/ui/proc-macro/expand-to-unstable.rs
+++ b/tests/ui/proc-macro/expand-to-unstable.rs
diff --git a/src/test/ui/proc-macro/expand-to-unstable.stderr b/tests/ui/proc-macro/expand-to-unstable.stderr
index b27dcd7e6..b27dcd7e6 100644
--- a/src/test/ui/proc-macro/expand-to-unstable.stderr
+++ b/tests/ui/proc-macro/expand-to-unstable.stderr
diff --git a/src/test/ui/proc-macro/expand-with-a-macro.rs b/tests/ui/proc-macro/expand-with-a-macro.rs
index 042a28365..042a28365 100644
--- a/src/test/ui/proc-macro/expand-with-a-macro.rs
+++ b/tests/ui/proc-macro/expand-with-a-macro.rs
diff --git a/src/test/ui/proc-macro/export-macro.rs b/tests/ui/proc-macro/export-macro.rs
index ad69fe5ee..ad69fe5ee 100644
--- a/src/test/ui/proc-macro/export-macro.rs
+++ b/tests/ui/proc-macro/export-macro.rs
diff --git a/src/test/ui/proc-macro/export-macro.stderr b/tests/ui/proc-macro/export-macro.stderr
index 36a6a9bb3..36a6a9bb3 100644
--- a/src/test/ui/proc-macro/export-macro.stderr
+++ b/tests/ui/proc-macro/export-macro.stderr
diff --git a/src/test/ui/proc-macro/exports.rs b/tests/ui/proc-macro/exports.rs
index a40c15908..a40c15908 100644
--- a/src/test/ui/proc-macro/exports.rs
+++ b/tests/ui/proc-macro/exports.rs
diff --git a/src/test/ui/proc-macro/exports.stderr b/tests/ui/proc-macro/exports.stderr
index 7b23d08f2..7b23d08f2 100644
--- a/src/test/ui/proc-macro/exports.stderr
+++ b/tests/ui/proc-macro/exports.stderr
diff --git a/src/test/ui/proc-macro/expr-stmt-nonterminal-tokens.rs b/tests/ui/proc-macro/expr-stmt-nonterminal-tokens.rs
index d4067a335..d4067a335 100644
--- a/src/test/ui/proc-macro/expr-stmt-nonterminal-tokens.rs
+++ b/tests/ui/proc-macro/expr-stmt-nonterminal-tokens.rs
diff --git a/src/test/ui/proc-macro/expr-stmt-nonterminal-tokens.stdout b/tests/ui/proc-macro/expr-stmt-nonterminal-tokens.stdout
index 686d53e88..686d53e88 100644
--- a/src/test/ui/proc-macro/expr-stmt-nonterminal-tokens.stdout
+++ b/tests/ui/proc-macro/expr-stmt-nonterminal-tokens.stdout
diff --git a/src/test/ui/proc-macro/extern-prelude-extern-crate-proc-macro.rs b/tests/ui/proc-macro/extern-prelude-extern-crate-proc-macro.rs
index a6e64e1b1..a6e64e1b1 100644
--- a/src/test/ui/proc-macro/extern-prelude-extern-crate-proc-macro.rs
+++ b/tests/ui/proc-macro/extern-prelude-extern-crate-proc-macro.rs
diff --git a/src/test/ui/proc-macro/gen-lifetime-token.rs b/tests/ui/proc-macro/gen-lifetime-token.rs
index 588bd2b76..588bd2b76 100644
--- a/src/test/ui/proc-macro/gen-lifetime-token.rs
+++ b/tests/ui/proc-macro/gen-lifetime-token.rs
diff --git a/src/test/ui/proc-macro/gen-macro-rules-hygiene.rs b/tests/ui/proc-macro/gen-macro-rules-hygiene.rs
index 195bda82e..195bda82e 100644
--- a/src/test/ui/proc-macro/gen-macro-rules-hygiene.rs
+++ b/tests/ui/proc-macro/gen-macro-rules-hygiene.rs
diff --git a/src/test/ui/proc-macro/gen-macro-rules-hygiene.stderr b/tests/ui/proc-macro/gen-macro-rules-hygiene.stderr
index df7c4f72e..df7c4f72e 100644
--- a/src/test/ui/proc-macro/gen-macro-rules-hygiene.stderr
+++ b/tests/ui/proc-macro/gen-macro-rules-hygiene.stderr
diff --git a/src/test/ui/proc-macro/gen-macro-rules.rs b/tests/ui/proc-macro/gen-macro-rules.rs
index 13ad27f93..13ad27f93 100644
--- a/src/test/ui/proc-macro/gen-macro-rules.rs
+++ b/tests/ui/proc-macro/gen-macro-rules.rs
diff --git a/src/test/ui/proc-macro/generate-dollar-ident.rs b/tests/ui/proc-macro/generate-dollar-ident.rs
index b838be9fb..b838be9fb 100644
--- a/src/test/ui/proc-macro/generate-dollar-ident.rs
+++ b/tests/ui/proc-macro/generate-dollar-ident.rs
diff --git a/src/test/ui/proc-macro/generate-mod.rs b/tests/ui/proc-macro/generate-mod.rs
index 471f317ed..471f317ed 100644
--- a/src/test/ui/proc-macro/generate-mod.rs
+++ b/tests/ui/proc-macro/generate-mod.rs
diff --git a/src/test/ui/proc-macro/generate-mod.stderr b/tests/ui/proc-macro/generate-mod.stderr
index 39bf28dba..db629b5b5 100644
--- a/src/test/ui/proc-macro/generate-mod.stderr
+++ b/tests/ui/proc-macro/generate-mod.stderr
@@ -4,7 +4,7 @@ error[E0412]: cannot find type `FromOutside` in this scope
 LL | generate_mod::check!();
    | ^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
    |
-   = note: consider importing this struct:
+   = help: consider importing this struct:
            FromOutside
    = note: this error originates in the macro `generate_mod::check` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -14,7 +14,7 @@ error[E0412]: cannot find type `Outer` in this scope
 LL | generate_mod::check!();
    | ^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
    |
-   = note: consider importing this struct:
+   = help: consider importing this struct:
            Outer
    = note: this error originates in the macro `generate_mod::check` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -24,7 +24,7 @@ error[E0412]: cannot find type `FromOutside` in this scope
 LL | #[generate_mod::check_attr]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
    |
-   = note: consider importing this struct:
+   = help: consider importing this struct:
            FromOutside
    = note: this error originates in the attribute macro `generate_mod::check_attr` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -34,7 +34,7 @@ error[E0412]: cannot find type `OuterAttr` in this scope
 LL | #[generate_mod::check_attr]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
    |
-   = note: consider importing this struct:
+   = help: consider importing this struct:
            OuterAttr
    = note: this error originates in the attribute macro `generate_mod::check_attr` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/proc-macro/helper-attr-blocked-by-import-ambig.rs b/tests/ui/proc-macro/helper-attr-blocked-by-import-ambig.rs
index 40c42d82f..40c42d82f 100644
--- a/src/test/ui/proc-macro/helper-attr-blocked-by-import-ambig.rs
+++ b/tests/ui/proc-macro/helper-attr-blocked-by-import-ambig.rs
diff --git a/src/test/ui/proc-macro/helper-attr-blocked-by-import-ambig.stderr b/tests/ui/proc-macro/helper-attr-blocked-by-import-ambig.stderr
index 9441cdcc8..9441cdcc8 100644
--- a/src/test/ui/proc-macro/helper-attr-blocked-by-import-ambig.stderr
+++ b/tests/ui/proc-macro/helper-attr-blocked-by-import-ambig.stderr
diff --git a/src/test/ui/proc-macro/helper-attr-blocked-by-import.rs b/tests/ui/proc-macro/helper-attr-blocked-by-import.rs
index 2e20a3de6..2e20a3de6 100644
--- a/src/test/ui/proc-macro/helper-attr-blocked-by-import.rs
+++ b/tests/ui/proc-macro/helper-attr-blocked-by-import.rs
diff --git a/src/test/ui/proc-macro/hygiene_example.rs b/tests/ui/proc-macro/hygiene_example.rs
index 346ed1207..346ed1207 100644
--- a/src/test/ui/proc-macro/hygiene_example.rs
+++ b/tests/ui/proc-macro/hygiene_example.rs
diff --git a/src/test/ui/proc-macro/illegal-proc-macro-derive-use.rs b/tests/ui/proc-macro/illegal-proc-macro-derive-use.rs
index 4efd9e952..4efd9e952 100644
--- a/src/test/ui/proc-macro/illegal-proc-macro-derive-use.rs
+++ b/tests/ui/proc-macro/illegal-proc-macro-derive-use.rs
diff --git a/src/test/ui/proc-macro/illegal-proc-macro-derive-use.stderr b/tests/ui/proc-macro/illegal-proc-macro-derive-use.stderr
index c0930ab71..c0930ab71 100644
--- a/src/test/ui/proc-macro/illegal-proc-macro-derive-use.stderr
+++ b/tests/ui/proc-macro/illegal-proc-macro-derive-use.stderr
diff --git a/src/test/ui/proc-macro/import.rs b/tests/ui/proc-macro/import.rs
index d1b1ff350..d1b1ff350 100644
--- a/src/test/ui/proc-macro/import.rs
+++ b/tests/ui/proc-macro/import.rs
diff --git a/src/test/ui/proc-macro/import.stderr b/tests/ui/proc-macro/import.stderr
index aae621193..aae621193 100644
--- a/src/test/ui/proc-macro/import.stderr
+++ b/tests/ui/proc-macro/import.stderr
diff --git a/src/test/ui/proc-macro/inert-attribute-order.rs b/tests/ui/proc-macro/inert-attribute-order.rs
index f80796756..f80796756 100644
--- a/src/test/ui/proc-macro/inert-attribute-order.rs
+++ b/tests/ui/proc-macro/inert-attribute-order.rs
diff --git a/src/test/ui/proc-macro/inert-attribute-order.stdout b/tests/ui/proc-macro/inert-attribute-order.stdout
index cc2155459..cc2155459 100644
--- a/src/test/ui/proc-macro/inert-attribute-order.stdout
+++ b/tests/ui/proc-macro/inert-attribute-order.stdout
diff --git a/src/test/ui/proc-macro/inner-attr-non-inline-mod.rs b/tests/ui/proc-macro/inner-attr-non-inline-mod.rs
index 30c2666df..30c2666df 100644
--- a/src/test/ui/proc-macro/inner-attr-non-inline-mod.rs
+++ b/tests/ui/proc-macro/inner-attr-non-inline-mod.rs
diff --git a/src/test/ui/proc-macro/inner-attr-non-inline-mod.stderr b/tests/ui/proc-macro/inner-attr-non-inline-mod.stderr
index 2d357d04d..2d357d04d 100644
--- a/src/test/ui/proc-macro/inner-attr-non-inline-mod.stderr
+++ b/tests/ui/proc-macro/inner-attr-non-inline-mod.stderr
diff --git a/src/test/ui/proc-macro/inner-attr-non-inline-mod.stdout b/tests/ui/proc-macro/inner-attr-non-inline-mod.stdout
index 6261d82e2..6261d82e2 100644
--- a/src/test/ui/proc-macro/inner-attr-non-inline-mod.stdout
+++ b/tests/ui/proc-macro/inner-attr-non-inline-mod.stdout
diff --git a/src/test/ui/proc-macro/inner-attrs.rs b/tests/ui/proc-macro/inner-attrs.rs
index 1000c9c75..1000c9c75 100644
--- a/src/test/ui/proc-macro/inner-attrs.rs
+++ b/tests/ui/proc-macro/inner-attrs.rs
diff --git a/src/test/ui/proc-macro/inner-attrs.stderr b/tests/ui/proc-macro/inner-attrs.stderr
index a332e143a..a332e143a 100644
--- a/src/test/ui/proc-macro/inner-attrs.stderr
+++ b/tests/ui/proc-macro/inner-attrs.stderr
diff --git a/src/test/ui/proc-macro/inner-attrs.stdout b/tests/ui/proc-macro/inner-attrs.stdout
index ee8adf0b4..ee8adf0b4 100644
--- a/src/test/ui/proc-macro/inner-attrs.stdout
+++ b/tests/ui/proc-macro/inner-attrs.stdout
diff --git a/src/test/ui/proc-macro/input-interpolated.rs b/tests/ui/proc-macro/input-interpolated.rs
index 5e49e330c..5e49e330c 100644
--- a/src/test/ui/proc-macro/input-interpolated.rs
+++ b/tests/ui/proc-macro/input-interpolated.rs
diff --git a/src/test/ui/proc-macro/input-interpolated.stdout b/tests/ui/proc-macro/input-interpolated.stdout
index 34566c780..34566c780 100644
--- a/src/test/ui/proc-macro/input-interpolated.stdout
+++ b/tests/ui/proc-macro/input-interpolated.stdout
diff --git a/src/test/ui/proc-macro/invalid-attributes.rs b/tests/ui/proc-macro/invalid-attributes.rs
index 6bbe022c6..6bbe022c6 100644
--- a/src/test/ui/proc-macro/invalid-attributes.rs
+++ b/tests/ui/proc-macro/invalid-attributes.rs
diff --git a/src/test/ui/proc-macro/invalid-attributes.stderr b/tests/ui/proc-macro/invalid-attributes.stderr
index fe411fa5e..fe411fa5e 100644
--- a/src/test/ui/proc-macro/invalid-attributes.stderr
+++ b/tests/ui/proc-macro/invalid-attributes.stderr
diff --git a/src/test/ui/proc-macro/invalid-punct-ident-1.rs b/tests/ui/proc-macro/invalid-punct-ident-1.rs
index 9a1802737..9a1802737 100644
--- a/src/test/ui/proc-macro/invalid-punct-ident-1.rs
+++ b/tests/ui/proc-macro/invalid-punct-ident-1.rs
diff --git a/src/test/ui/proc-macro/invalid-punct-ident-1.stderr b/tests/ui/proc-macro/invalid-punct-ident-1.stderr
index 78aa84401..78aa84401 100644
--- a/src/test/ui/proc-macro/invalid-punct-ident-1.stderr
+++ b/tests/ui/proc-macro/invalid-punct-ident-1.stderr
diff --git a/src/test/ui/proc-macro/invalid-punct-ident-2.rs b/tests/ui/proc-macro/invalid-punct-ident-2.rs
index afb6985e4..afb6985e4 100644
--- a/src/test/ui/proc-macro/invalid-punct-ident-2.rs
+++ b/tests/ui/proc-macro/invalid-punct-ident-2.rs
diff --git a/src/test/ui/proc-macro/invalid-punct-ident-2.stderr b/tests/ui/proc-macro/invalid-punct-ident-2.stderr
index 66979e756..66979e756 100644
--- a/src/test/ui/proc-macro/invalid-punct-ident-2.stderr
+++ b/tests/ui/proc-macro/invalid-punct-ident-2.stderr
diff --git a/src/test/ui/proc-macro/invalid-punct-ident-3.rs b/tests/ui/proc-macro/invalid-punct-ident-3.rs
index ff83695c5..ff83695c5 100644
--- a/src/test/ui/proc-macro/invalid-punct-ident-3.rs
+++ b/tests/ui/proc-macro/invalid-punct-ident-3.rs
diff --git a/src/test/ui/proc-macro/invalid-punct-ident-3.stderr b/tests/ui/proc-macro/invalid-punct-ident-3.stderr
index c096bc8c0..c096bc8c0 100644
--- a/src/test/ui/proc-macro/invalid-punct-ident-3.stderr
+++ b/tests/ui/proc-macro/invalid-punct-ident-3.stderr
diff --git a/src/test/ui/proc-macro/invalid-punct-ident-4.rs b/tests/ui/proc-macro/invalid-punct-ident-4.rs
index 2d2774bd1..2d2774bd1 100644
--- a/src/test/ui/proc-macro/invalid-punct-ident-4.rs
+++ b/tests/ui/proc-macro/invalid-punct-ident-4.rs
diff --git a/src/test/ui/proc-macro/invalid-punct-ident-4.stderr b/tests/ui/proc-macro/invalid-punct-ident-4.stderr
index ab4116141..ab4116141 100644
--- a/src/test/ui/proc-macro/invalid-punct-ident-4.stderr
+++ b/tests/ui/proc-macro/invalid-punct-ident-4.stderr
diff --git a/src/test/ui/proc-macro/is-available.rs b/tests/ui/proc-macro/is-available.rs
index b32bb61b4..b32bb61b4 100644
--- a/src/test/ui/proc-macro/is-available.rs
+++ b/tests/ui/proc-macro/is-available.rs
diff --git a/src/test/ui/proc-macro/issue-104884-trait-impl-sugg-err.rs b/tests/ui/proc-macro/issue-104884-trait-impl-sugg-err.rs
index a0d619c45..a0d619c45 100644
--- a/src/test/ui/proc-macro/issue-104884-trait-impl-sugg-err.rs
+++ b/tests/ui/proc-macro/issue-104884-trait-impl-sugg-err.rs
diff --git a/src/test/ui/proc-macro/issue-104884-trait-impl-sugg-err.stderr b/tests/ui/proc-macro/issue-104884-trait-impl-sugg-err.stderr
index ac49e04e3..3b2a5e701 100644
--- a/src/test/ui/proc-macro/issue-104884-trait-impl-sugg-err.stderr
+++ b/tests/ui/proc-macro/issue-104884-trait-impl-sugg-err.stderr
@@ -7,9 +7,6 @@ LL | #[derive(PartialOrd, AddImpl)]
    = help: the trait `PartialEq` is not implemented for `PriorityQueue<T>`
 note: required by a bound in `PartialOrd`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {
-   |                                           ^^^^^^^^^^^^^^ required by this bound in `PartialOrd`
    = note: this error originates in the derive macro `PartialOrd` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `PriorityQueue<T>: Eq` is not satisfied
@@ -20,9 +17,6 @@ LL | #[derive(PartialOrd, AddImpl)]
    |
 note: required by a bound in `Ord`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub trait Ord: Eq + PartialOrd<Self> {
-   |                ^^ required by this bound in `Ord`
    = note: this error originates in the derive macro `AddImpl` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `T` with `T`
@@ -35,12 +29,9 @@ note: required for `PriorityQueue<T>` to implement `PartialOrd`
   --> $DIR/issue-104884-trait-impl-sugg-err.rs:13:10
    |
 LL | #[derive(PartialOrd, AddImpl)]
-   |          ^^^^^^^^^^
+   |          ^^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `Ord`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub trait Ord: Eq + PartialOrd<Self> {
-   |                     ^^^^^^^^^^^^^^^^ required by this bound in `Ord`
    = note: this error originates in the derive macro `AddImpl` which comes from the expansion of the derive macro `PartialOrd` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/proc-macro/issue-36935.rs b/tests/ui/proc-macro/issue-36935.rs
index 03cdfa05e..03cdfa05e 100644
--- a/src/test/ui/proc-macro/issue-36935.rs
+++ b/tests/ui/proc-macro/issue-36935.rs
diff --git a/src/test/ui/proc-macro/issue-36935.stderr b/tests/ui/proc-macro/issue-36935.stderr
index 122903798..122903798 100644
--- a/src/test/ui/proc-macro/issue-36935.stderr
+++ b/tests/ui/proc-macro/issue-36935.stderr
diff --git a/src/test/ui/proc-macro/issue-37788.rs b/tests/ui/proc-macro/issue-37788.rs
index 73b1f0d58..73b1f0d58 100644
--- a/src/test/ui/proc-macro/issue-37788.rs
+++ b/tests/ui/proc-macro/issue-37788.rs
diff --git a/src/test/ui/proc-macro/issue-37788.stderr b/tests/ui/proc-macro/issue-37788.stderr
index 345520d48..345520d48 100644
--- a/src/test/ui/proc-macro/issue-37788.stderr
+++ b/tests/ui/proc-macro/issue-37788.stderr
diff --git a/src/test/ui/proc-macro/issue-38586.rs b/tests/ui/proc-macro/issue-38586.rs
index 24e88ed93..24e88ed93 100644
--- a/src/test/ui/proc-macro/issue-38586.rs
+++ b/tests/ui/proc-macro/issue-38586.rs
diff --git a/src/test/ui/proc-macro/issue-38586.stderr b/tests/ui/proc-macro/issue-38586.stderr
index ddd0a0874..ddd0a0874 100644
--- a/src/test/ui/proc-macro/issue-38586.stderr
+++ b/tests/ui/proc-macro/issue-38586.stderr
diff --git a/src/test/ui/proc-macro/issue-39889.rs b/tests/ui/proc-macro/issue-39889.rs
index 69bfb4f3c..69bfb4f3c 100644
--- a/src/test/ui/proc-macro/issue-39889.rs
+++ b/tests/ui/proc-macro/issue-39889.rs
diff --git a/src/test/ui/proc-macro/issue-42708.rs b/tests/ui/proc-macro/issue-42708.rs
index e8f445aaa..e8f445aaa 100644
--- a/src/test/ui/proc-macro/issue-42708.rs
+++ b/tests/ui/proc-macro/issue-42708.rs
diff --git a/src/test/ui/proc-macro/issue-50061.rs b/tests/ui/proc-macro/issue-50061.rs
index 01c6b80b4..01c6b80b4 100644
--- a/src/test/ui/proc-macro/issue-50061.rs
+++ b/tests/ui/proc-macro/issue-50061.rs
diff --git a/src/test/ui/proc-macro/issue-50493.rs b/tests/ui/proc-macro/issue-50493.rs
index ce0e0839f..ce0e0839f 100644
--- a/src/test/ui/proc-macro/issue-50493.rs
+++ b/tests/ui/proc-macro/issue-50493.rs
diff --git a/src/test/ui/proc-macro/issue-50493.stderr b/tests/ui/proc-macro/issue-50493.stderr
index 23e103dbf..23e103dbf 100644
--- a/src/test/ui/proc-macro/issue-50493.stderr
+++ b/tests/ui/proc-macro/issue-50493.stderr
diff --git a/src/test/ui/proc-macro/issue-53481.rs b/tests/ui/proc-macro/issue-53481.rs
index ae10a3baa..ae10a3baa 100644
--- a/src/test/ui/proc-macro/issue-53481.rs
+++ b/tests/ui/proc-macro/issue-53481.rs
diff --git a/src/test/ui/proc-macro/issue-59191-replace-root-with-fn.rs b/tests/ui/proc-macro/issue-59191-replace-root-with-fn.rs
index a4161d4fc..a4161d4fc 100644
--- a/src/test/ui/proc-macro/issue-59191-replace-root-with-fn.rs
+++ b/tests/ui/proc-macro/issue-59191-replace-root-with-fn.rs
diff --git a/src/test/ui/proc-macro/issue-59191-replace-root-with-fn.stderr b/tests/ui/proc-macro/issue-59191-replace-root-with-fn.stderr
index f7516c7d3..f7516c7d3 100644
--- a/src/test/ui/proc-macro/issue-59191-replace-root-with-fn.stderr
+++ b/tests/ui/proc-macro/issue-59191-replace-root-with-fn.stderr
diff --git a/src/test/ui/proc-macro/issue-66286.rs b/tests/ui/proc-macro/issue-66286.rs
index 2a67aeab4..2a67aeab4 100644
--- a/src/test/ui/proc-macro/issue-66286.rs
+++ b/tests/ui/proc-macro/issue-66286.rs
diff --git a/src/test/ui/proc-macro/issue-66286.stderr b/tests/ui/proc-macro/issue-66286.stderr
index fe2464b3b..fe2464b3b 100644
--- a/src/test/ui/proc-macro/issue-66286.stderr
+++ b/tests/ui/proc-macro/issue-66286.stderr
diff --git a/src/test/ui/proc-macro/issue-73933-procedural-masquerade.rs b/tests/ui/proc-macro/issue-73933-procedural-masquerade.rs
index a573c6e1c..a573c6e1c 100644
--- a/src/test/ui/proc-macro/issue-73933-procedural-masquerade.rs
+++ b/tests/ui/proc-macro/issue-73933-procedural-masquerade.rs
diff --git a/src/test/ui/proc-macro/issue-73933-procedural-masquerade.stdout b/tests/ui/proc-macro/issue-73933-procedural-masquerade.stdout
index 8cd981e03..8cd981e03 100644
--- a/src/test/ui/proc-macro/issue-73933-procedural-masquerade.stdout
+++ b/tests/ui/proc-macro/issue-73933-procedural-masquerade.stdout
diff --git a/src/test/ui/proc-macro/issue-75734-pp-paren.rs b/tests/ui/proc-macro/issue-75734-pp-paren.rs
index faa93787d..faa93787d 100644
--- a/src/test/ui/proc-macro/issue-75734-pp-paren.rs
+++ b/tests/ui/proc-macro/issue-75734-pp-paren.rs
diff --git a/src/test/ui/proc-macro/issue-75734-pp-paren.stdout b/tests/ui/proc-macro/issue-75734-pp-paren.stdout
index 0fda6654f..0fda6654f 100644
--- a/src/test/ui/proc-macro/issue-75734-pp-paren.stdout
+++ b/tests/ui/proc-macro/issue-75734-pp-paren.stdout
diff --git a/src/test/ui/proc-macro/issue-75801.rs b/tests/ui/proc-macro/issue-75801.rs
index b07cde0fa..b07cde0fa 100644
--- a/src/test/ui/proc-macro/issue-75801.rs
+++ b/tests/ui/proc-macro/issue-75801.rs
diff --git a/src/test/ui/proc-macro/issue-75801.stderr b/tests/ui/proc-macro/issue-75801.stderr
index ee0a9bd77..ee0a9bd77 100644
--- a/src/test/ui/proc-macro/issue-75801.stderr
+++ b/tests/ui/proc-macro/issue-75801.stderr
diff --git a/src/test/ui/proc-macro/issue-75930-derive-cfg.rs b/tests/ui/proc-macro/issue-75930-derive-cfg.rs
index ef56e8e02..ef56e8e02 100644
--- a/src/test/ui/proc-macro/issue-75930-derive-cfg.rs
+++ b/tests/ui/proc-macro/issue-75930-derive-cfg.rs
diff --git a/src/test/ui/proc-macro/issue-75930-derive-cfg.stderr b/tests/ui/proc-macro/issue-75930-derive-cfg.stderr
index 6d1efb0dc..6d1efb0dc 100644
--- a/src/test/ui/proc-macro/issue-75930-derive-cfg.stderr
+++ b/tests/ui/proc-macro/issue-75930-derive-cfg.stderr
diff --git a/src/test/ui/proc-macro/issue-75930-derive-cfg.stdout b/tests/ui/proc-macro/issue-75930-derive-cfg.stdout
index 83afd0d3e..83afd0d3e 100644
--- a/src/test/ui/proc-macro/issue-75930-derive-cfg.stdout
+++ b/tests/ui/proc-macro/issue-75930-derive-cfg.stdout
diff --git a/src/test/ui/proc-macro/issue-76182-leading-vert-pat.rs b/tests/ui/proc-macro/issue-76182-leading-vert-pat.rs
index 7d31de1d2..7d31de1d2 100644
--- a/src/test/ui/proc-macro/issue-76182-leading-vert-pat.rs
+++ b/tests/ui/proc-macro/issue-76182-leading-vert-pat.rs
diff --git a/src/test/ui/proc-macro/issue-76182-leading-vert-pat.stdout b/tests/ui/proc-macro/issue-76182-leading-vert-pat.stdout
index 09eb33f7e..09eb33f7e 100644
--- a/src/test/ui/proc-macro/issue-76182-leading-vert-pat.stdout
+++ b/tests/ui/proc-macro/issue-76182-leading-vert-pat.stdout
diff --git a/src/test/ui/proc-macro/issue-76270-panic-in-libproc-macro.rs b/tests/ui/proc-macro/issue-76270-panic-in-libproc-macro.rs
index 5aefec3ec..5aefec3ec 100644
--- a/src/test/ui/proc-macro/issue-76270-panic-in-libproc-macro.rs
+++ b/tests/ui/proc-macro/issue-76270-panic-in-libproc-macro.rs
diff --git a/src/test/ui/proc-macro/issue-76270-panic-in-libproc-macro.stderr b/tests/ui/proc-macro/issue-76270-panic-in-libproc-macro.stderr
index d69de23a4..d69de23a4 100644
--- a/src/test/ui/proc-macro/issue-76270-panic-in-libproc-macro.stderr
+++ b/tests/ui/proc-macro/issue-76270-panic-in-libproc-macro.stderr
diff --git a/src/test/ui/proc-macro/issue-78675-captured-inner-attrs.rs b/tests/ui/proc-macro/issue-78675-captured-inner-attrs.rs
index 478809324..478809324 100644
--- a/src/test/ui/proc-macro/issue-78675-captured-inner-attrs.rs
+++ b/tests/ui/proc-macro/issue-78675-captured-inner-attrs.rs
diff --git a/src/test/ui/proc-macro/issue-78675-captured-inner-attrs.stdout b/tests/ui/proc-macro/issue-78675-captured-inner-attrs.stdout
index 60a400a5d..60a400a5d 100644
--- a/src/test/ui/proc-macro/issue-78675-captured-inner-attrs.stdout
+++ b/tests/ui/proc-macro/issue-78675-captured-inner-attrs.stdout
diff --git a/src/test/ui/proc-macro/issue-79148.rs b/tests/ui/proc-macro/issue-79148.rs
index 3f01187a8..3f01187a8 100644
--- a/src/test/ui/proc-macro/issue-79148.rs
+++ b/tests/ui/proc-macro/issue-79148.rs
diff --git a/src/test/ui/proc-macro/issue-79148.stderr b/tests/ui/proc-macro/issue-79148.stderr
index a3b2de01d..a3b2de01d 100644
--- a/src/test/ui/proc-macro/issue-79148.stderr
+++ b/tests/ui/proc-macro/issue-79148.stderr
diff --git a/src/test/ui/proc-macro/issue-79242-slow-retokenize-check.rs b/tests/ui/proc-macro/issue-79242-slow-retokenize-check.rs
index b68f19c5d..b68f19c5d 100644
--- a/src/test/ui/proc-macro/issue-79242-slow-retokenize-check.rs
+++ b/tests/ui/proc-macro/issue-79242-slow-retokenize-check.rs
diff --git a/src/test/ui/proc-macro/issue-79825.rs b/tests/ui/proc-macro/issue-79825.rs
index f628469ce..f628469ce 100644
--- a/src/test/ui/proc-macro/issue-79825.rs
+++ b/tests/ui/proc-macro/issue-79825.rs
diff --git a/src/test/ui/proc-macro/issue-80760-empty-stmt.rs b/tests/ui/proc-macro/issue-80760-empty-stmt.rs
index 86865af0b..86865af0b 100644
--- a/src/test/ui/proc-macro/issue-80760-empty-stmt.rs
+++ b/tests/ui/proc-macro/issue-80760-empty-stmt.rs
diff --git a/src/test/ui/proc-macro/issue-80760-empty-stmt.stdout b/tests/ui/proc-macro/issue-80760-empty-stmt.stdout
index 4b7ed8743..4b7ed8743 100644
--- a/src/test/ui/proc-macro/issue-80760-empty-stmt.stdout
+++ b/tests/ui/proc-macro/issue-80760-empty-stmt.stdout
diff --git a/src/test/ui/proc-macro/issue-81007-item-attrs.rs b/tests/ui/proc-macro/issue-81007-item-attrs.rs
index ea27d54ee..ea27d54ee 100644
--- a/src/test/ui/proc-macro/issue-81007-item-attrs.rs
+++ b/tests/ui/proc-macro/issue-81007-item-attrs.rs
diff --git a/src/test/ui/proc-macro/issue-81007-item-attrs.stdout b/tests/ui/proc-macro/issue-81007-item-attrs.stdout
index 3c001e995..3c001e995 100644
--- a/src/test/ui/proc-macro/issue-81007-item-attrs.stdout
+++ b/tests/ui/proc-macro/issue-81007-item-attrs.stdout
diff --git a/src/test/ui/proc-macro/issue-81543-item-parse-err.rs b/tests/ui/proc-macro/issue-81543-item-parse-err.rs
index 027389556..027389556 100644
--- a/src/test/ui/proc-macro/issue-81543-item-parse-err.rs
+++ b/tests/ui/proc-macro/issue-81543-item-parse-err.rs
diff --git a/src/test/ui/proc-macro/issue-81543-item-parse-err.stderr b/tests/ui/proc-macro/issue-81543-item-parse-err.stderr
index ca5241760..ca5241760 100644
--- a/src/test/ui/proc-macro/issue-81543-item-parse-err.stderr
+++ b/tests/ui/proc-macro/issue-81543-item-parse-err.stderr
diff --git a/src/test/ui/proc-macro/issue-81555.rs b/tests/ui/proc-macro/issue-81555.rs
index 693f1f7dc..693f1f7dc 100644
--- a/src/test/ui/proc-macro/issue-81555.rs
+++ b/tests/ui/proc-macro/issue-81555.rs
diff --git a/src/test/ui/proc-macro/issue-83469-global-alloc-invalid-stmt.rs b/tests/ui/proc-macro/issue-83469-global-alloc-invalid-stmt.rs
index 25adc5d25..25adc5d25 100644
--- a/src/test/ui/proc-macro/issue-83469-global-alloc-invalid-stmt.rs
+++ b/tests/ui/proc-macro/issue-83469-global-alloc-invalid-stmt.rs
diff --git a/src/test/ui/proc-macro/issue-83469-global-alloc-invalid-stmt.stderr b/tests/ui/proc-macro/issue-83469-global-alloc-invalid-stmt.stderr
index ec0e3c4c7..ec0e3c4c7 100644
--- a/src/test/ui/proc-macro/issue-83469-global-alloc-invalid-stmt.stderr
+++ b/tests/ui/proc-macro/issue-83469-global-alloc-invalid-stmt.stderr
diff --git a/src/test/ui/proc-macro/issue-83510.rs b/tests/ui/proc-macro/issue-83510.rs
index 2b1aec4df..2b1aec4df 100644
--- a/src/test/ui/proc-macro/issue-83510.rs
+++ b/tests/ui/proc-macro/issue-83510.rs
diff --git a/src/test/ui/proc-macro/issue-83510.stderr b/tests/ui/proc-macro/issue-83510.stderr
index e0628a317..e0628a317 100644
--- a/src/test/ui/proc-macro/issue-83510.stderr
+++ b/tests/ui/proc-macro/issue-83510.stderr
diff --git a/src/test/ui/proc-macro/issue-86781-bad-inner-doc.fixed b/tests/ui/proc-macro/issue-86781-bad-inner-doc.fixed
index 426a5fa72..426a5fa72 100644
--- a/src/test/ui/proc-macro/issue-86781-bad-inner-doc.fixed
+++ b/tests/ui/proc-macro/issue-86781-bad-inner-doc.fixed
diff --git a/src/test/ui/proc-macro/issue-86781-bad-inner-doc.rs b/tests/ui/proc-macro/issue-86781-bad-inner-doc.rs
index 31e3f3c85..31e3f3c85 100644
--- a/src/test/ui/proc-macro/issue-86781-bad-inner-doc.rs
+++ b/tests/ui/proc-macro/issue-86781-bad-inner-doc.rs
diff --git a/src/test/ui/proc-macro/issue-86781-bad-inner-doc.stderr b/tests/ui/proc-macro/issue-86781-bad-inner-doc.stderr
index a92f07522..a92f07522 100644
--- a/src/test/ui/proc-macro/issue-86781-bad-inner-doc.stderr
+++ b/tests/ui/proc-macro/issue-86781-bad-inner-doc.stderr
diff --git a/src/test/ui/proc-macro/issue-91800.rs b/tests/ui/proc-macro/issue-91800.rs
index 0c1281de4..0c1281de4 100644
--- a/src/test/ui/proc-macro/issue-91800.rs
+++ b/tests/ui/proc-macro/issue-91800.rs
diff --git a/src/test/ui/proc-macro/issue-91800.stderr b/tests/ui/proc-macro/issue-91800.stderr
index 9c356263a..9c356263a 100644
--- a/src/test/ui/proc-macro/issue-91800.stderr
+++ b/tests/ui/proc-macro/issue-91800.stderr
diff --git a/src/test/ui/proc-macro/item-error.rs b/tests/ui/proc-macro/item-error.rs
index 64c203e54..64c203e54 100644
--- a/src/test/ui/proc-macro/item-error.rs
+++ b/tests/ui/proc-macro/item-error.rs
diff --git a/src/test/ui/proc-macro/item-error.stderr b/tests/ui/proc-macro/item-error.stderr
index b544be6e9..b544be6e9 100644
--- a/src/test/ui/proc-macro/item-error.stderr
+++ b/tests/ui/proc-macro/item-error.stderr
diff --git a/src/test/ui/proc-macro/keep-expr-tokens.rs b/tests/ui/proc-macro/keep-expr-tokens.rs
index 0bf889a85..0bf889a85 100644
--- a/src/test/ui/proc-macro/keep-expr-tokens.rs
+++ b/tests/ui/proc-macro/keep-expr-tokens.rs
diff --git a/src/test/ui/proc-macro/keep-expr-tokens.stderr b/tests/ui/proc-macro/keep-expr-tokens.stderr
index 1a1f83cc1..1a1f83cc1 100644
--- a/src/test/ui/proc-macro/keep-expr-tokens.stderr
+++ b/tests/ui/proc-macro/keep-expr-tokens.stderr
diff --git a/src/test/ui/proc-macro/keep-expr-tokens.stdout b/tests/ui/proc-macro/keep-expr-tokens.stdout
index fcd72a0e0..fcd72a0e0 100644
--- a/src/test/ui/proc-macro/keep-expr-tokens.stdout
+++ b/tests/ui/proc-macro/keep-expr-tokens.stdout
diff --git a/src/test/ui/proc-macro/lifetimes-rpass.rs b/tests/ui/proc-macro/lifetimes-rpass.rs
index a1d33ddca..a1d33ddca 100644
--- a/src/test/ui/proc-macro/lifetimes-rpass.rs
+++ b/tests/ui/proc-macro/lifetimes-rpass.rs
diff --git a/src/test/ui/proc-macro/lifetimes.rs b/tests/ui/proc-macro/lifetimes.rs
index 560569671..560569671 100644
--- a/src/test/ui/proc-macro/lifetimes.rs
+++ b/tests/ui/proc-macro/lifetimes.rs
diff --git a/src/test/ui/proc-macro/lifetimes.stderr b/tests/ui/proc-macro/lifetimes.stderr
index 0c99809ed..0c99809ed 100644
--- a/src/test/ui/proc-macro/lifetimes.stderr
+++ b/tests/ui/proc-macro/lifetimes.stderr
diff --git a/src/test/ui/proc-macro/lints_in_proc_macros.rs b/tests/ui/proc-macro/lints_in_proc_macros.rs
index 377a1f25b..377a1f25b 100644
--- a/src/test/ui/proc-macro/lints_in_proc_macros.rs
+++ b/tests/ui/proc-macro/lints_in_proc_macros.rs
diff --git a/src/test/ui/proc-macro/lints_in_proc_macros.stderr b/tests/ui/proc-macro/lints_in_proc_macros.stderr
index 4dd8be7d9..4dd8be7d9 100644
--- a/src/test/ui/proc-macro/lints_in_proc_macros.stderr
+++ b/tests/ui/proc-macro/lints_in_proc_macros.stderr
diff --git a/src/test/ui/proc-macro/load-panic-backtrace.rs b/tests/ui/proc-macro/load-panic-backtrace.rs
index bcdcb704a..bcdcb704a 100644
--- a/src/test/ui/proc-macro/load-panic-backtrace.rs
+++ b/tests/ui/proc-macro/load-panic-backtrace.rs
diff --git a/src/test/ui/proc-macro/load-panic-backtrace.stderr b/tests/ui/proc-macro/load-panic-backtrace.stderr
index 45d4fd1c9..45d4fd1c9 100644
--- a/src/test/ui/proc-macro/load-panic-backtrace.stderr
+++ b/tests/ui/proc-macro/load-panic-backtrace.stderr
diff --git a/src/test/ui/proc-macro/load-panic.rs b/tests/ui/proc-macro/load-panic.rs
index 6ce88c400..6ce88c400 100644
--- a/src/test/ui/proc-macro/load-panic.rs
+++ b/tests/ui/proc-macro/load-panic.rs
diff --git a/src/test/ui/proc-macro/load-panic.stderr b/tests/ui/proc-macro/load-panic.stderr
index f0d62f690..f0d62f690 100644
--- a/src/test/ui/proc-macro/load-panic.stderr
+++ b/tests/ui/proc-macro/load-panic.stderr
diff --git a/src/test/ui/proc-macro/load-two.rs b/tests/ui/proc-macro/load-two.rs
index 5ce0e6545..5ce0e6545 100644
--- a/src/test/ui/proc-macro/load-two.rs
+++ b/tests/ui/proc-macro/load-two.rs
diff --git a/src/test/ui/proc-macro/macro-brackets.rs b/tests/ui/proc-macro/macro-brackets.rs
index aa0046f45..aa0046f45 100644
--- a/src/test/ui/proc-macro/macro-brackets.rs
+++ b/tests/ui/proc-macro/macro-brackets.rs
diff --git a/src/test/ui/proc-macro/macro-brackets.stderr b/tests/ui/proc-macro/macro-brackets.stderr
index d35163752..d35163752 100644
--- a/src/test/ui/proc-macro/macro-brackets.stderr
+++ b/tests/ui/proc-macro/macro-brackets.stderr
diff --git a/src/test/ui/proc-macro/macro-crate-multi-decorator.rs b/tests/ui/proc-macro/macro-crate-multi-decorator.rs
index ec57dec14..ec57dec14 100644
--- a/src/test/ui/proc-macro/macro-crate-multi-decorator.rs
+++ b/tests/ui/proc-macro/macro-crate-multi-decorator.rs
diff --git a/src/test/ui/proc-macro/macro-namespace-reserved-2.rs b/tests/ui/proc-macro/macro-namespace-reserved-2.rs
index 470b22b48..470b22b48 100644
--- a/src/test/ui/proc-macro/macro-namespace-reserved-2.rs
+++ b/tests/ui/proc-macro/macro-namespace-reserved-2.rs
diff --git a/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr b/tests/ui/proc-macro/macro-namespace-reserved-2.stderr
index 633a6c6a0..633a6c6a0 100644
--- a/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr
+++ b/tests/ui/proc-macro/macro-namespace-reserved-2.stderr
diff --git a/src/test/ui/proc-macro/macro-namespace-reserved.rs b/tests/ui/proc-macro/macro-namespace-reserved.rs
index 60d379e41..60d379e41 100644
--- a/src/test/ui/proc-macro/macro-namespace-reserved.rs
+++ b/tests/ui/proc-macro/macro-namespace-reserved.rs
diff --git a/src/test/ui/proc-macro/macro-namespace-reserved.stderr b/tests/ui/proc-macro/macro-namespace-reserved.stderr
index f5d589c3a..f5d589c3a 100644
--- a/src/test/ui/proc-macro/macro-namespace-reserved.stderr
+++ b/tests/ui/proc-macro/macro-namespace-reserved.stderr
diff --git a/src/test/ui/proc-macro/macro-quote-cond.rs b/tests/ui/proc-macro/macro-quote-cond.rs
index 48307f4d9..48307f4d9 100644
--- a/src/test/ui/proc-macro/macro-quote-cond.rs
+++ b/tests/ui/proc-macro/macro-quote-cond.rs
diff --git a/src/test/ui/proc-macro/macro-rules-derive-cfg.rs b/tests/ui/proc-macro/macro-rules-derive-cfg.rs
index a221b9578..a221b9578 100644
--- a/src/test/ui/proc-macro/macro-rules-derive-cfg.rs
+++ b/tests/ui/proc-macro/macro-rules-derive-cfg.rs
diff --git a/src/test/ui/proc-macro/macro-rules-derive-cfg.stdout b/tests/ui/proc-macro/macro-rules-derive-cfg.stdout
index 74641058e..74641058e 100644
--- a/src/test/ui/proc-macro/macro-rules-derive-cfg.stdout
+++ b/tests/ui/proc-macro/macro-rules-derive-cfg.stdout
diff --git a/src/test/ui/proc-macro/macro-rules-derive.rs b/tests/ui/proc-macro/macro-rules-derive.rs
index e0c40bbc7..e0c40bbc7 100644
--- a/src/test/ui/proc-macro/macro-rules-derive.rs
+++ b/tests/ui/proc-macro/macro-rules-derive.rs
diff --git a/src/test/ui/proc-macro/macro-rules-derive.stderr b/tests/ui/proc-macro/macro-rules-derive.stderr
index 517cbabd5..517cbabd5 100644
--- a/src/test/ui/proc-macro/macro-rules-derive.stderr
+++ b/tests/ui/proc-macro/macro-rules-derive.stderr
diff --git a/src/test/ui/proc-macro/macro-use-attr.rs b/tests/ui/proc-macro/macro-use-attr.rs
index b101c09ed..b101c09ed 100644
--- a/src/test/ui/proc-macro/macro-use-attr.rs
+++ b/tests/ui/proc-macro/macro-use-attr.rs
diff --git a/src/test/ui/proc-macro/macro-use-bang.rs b/tests/ui/proc-macro/macro-use-bang.rs
index 4a0bf0b2f..4a0bf0b2f 100644
--- a/src/test/ui/proc-macro/macro-use-bang.rs
+++ b/tests/ui/proc-macro/macro-use-bang.rs
diff --git a/src/test/ui/proc-macro/macros-in-extern-derive.rs b/tests/ui/proc-macro/macros-in-extern-derive.rs
index c8b26b005..c8b26b005 100644
--- a/src/test/ui/proc-macro/macros-in-extern-derive.rs
+++ b/tests/ui/proc-macro/macros-in-extern-derive.rs
diff --git a/src/test/ui/proc-macro/macros-in-extern-derive.stderr b/tests/ui/proc-macro/macros-in-extern-derive.stderr
index efd9ff225..efd9ff225 100644
--- a/src/test/ui/proc-macro/macros-in-extern-derive.stderr
+++ b/tests/ui/proc-macro/macros-in-extern-derive.stderr
diff --git a/src/test/ui/proc-macro/macros-in-extern.rs b/tests/ui/proc-macro/macros-in-extern.rs
index 57e2066d8..57e2066d8 100644
--- a/src/test/ui/proc-macro/macros-in-extern.rs
+++ b/tests/ui/proc-macro/macros-in-extern.rs
diff --git a/src/test/ui/proc-macro/macros-in-type.rs b/tests/ui/proc-macro/macros-in-type.rs
index 19ed58ece..19ed58ece 100644
--- a/src/test/ui/proc-macro/macros-in-type.rs
+++ b/tests/ui/proc-macro/macros-in-type.rs
diff --git a/src/test/ui/proc-macro/meta-delim.rs b/tests/ui/proc-macro/meta-delim.rs
index 964291bc6..964291bc6 100644
--- a/src/test/ui/proc-macro/meta-delim.rs
+++ b/tests/ui/proc-macro/meta-delim.rs
diff --git a/src/test/ui/proc-macro/meta-macro-hygiene.rs b/tests/ui/proc-macro/meta-macro-hygiene.rs
index 70b8d8da1..70b8d8da1 100644
--- a/src/test/ui/proc-macro/meta-macro-hygiene.rs
+++ b/tests/ui/proc-macro/meta-macro-hygiene.rs
diff --git a/src/test/ui/proc-macro/meta-macro-hygiene.stdout b/tests/ui/proc-macro/meta-macro-hygiene.stdout
index 6b7b0c819..6b7b0c819 100644
--- a/src/test/ui/proc-macro/meta-macro-hygiene.stdout
+++ b/tests/ui/proc-macro/meta-macro-hygiene.stdout
diff --git a/src/test/ui/proc-macro/meta-macro.rs b/tests/ui/proc-macro/meta-macro.rs
index dbac90382..dbac90382 100644
--- a/src/test/ui/proc-macro/meta-macro.rs
+++ b/tests/ui/proc-macro/meta-macro.rs
diff --git a/src/test/ui/proc-macro/meta-macro.stdout b/tests/ui/proc-macro/meta-macro.stdout
index 662682d40..662682d40 100644
--- a/src/test/ui/proc-macro/meta-macro.stdout
+++ b/tests/ui/proc-macro/meta-macro.stdout
diff --git a/src/test/ui/proc-macro/mixed-site-span.rs b/tests/ui/proc-macro/mixed-site-span.rs
index 008384656..008384656 100644
--- a/src/test/ui/proc-macro/mixed-site-span.rs
+++ b/tests/ui/proc-macro/mixed-site-span.rs
diff --git a/src/test/ui/proc-macro/mixed-site-span.stderr b/tests/ui/proc-macro/mixed-site-span.stderr
index 137860801..137860801 100644
--- a/src/test/ui/proc-macro/mixed-site-span.stderr
+++ b/tests/ui/proc-macro/mixed-site-span.stderr
diff --git a/src/test/ui/proc-macro/modify-ast.rs b/tests/ui/proc-macro/modify-ast.rs
index ea9bf837c..ea9bf837c 100644
--- a/src/test/ui/proc-macro/modify-ast.rs
+++ b/tests/ui/proc-macro/modify-ast.rs
diff --git a/src/test/ui/proc-macro/module.rs b/tests/ui/proc-macro/module.rs
index 5777ed899..5777ed899 100644
--- a/src/test/ui/proc-macro/module.rs
+++ b/tests/ui/proc-macro/module.rs
diff --git a/src/test/ui/proc-macro/module_with_attrs.rs b/tests/ui/proc-macro/module_with_attrs.rs
index 63e66a62a..63e66a62a 100644
--- a/src/test/ui/proc-macro/module_with_attrs.rs
+++ b/tests/ui/proc-macro/module_with_attrs.rs
diff --git a/src/test/ui/proc-macro/multispan.rs b/tests/ui/proc-macro/multispan.rs
index e9e0349f2..e9e0349f2 100644
--- a/src/test/ui/proc-macro/multispan.rs
+++ b/tests/ui/proc-macro/multispan.rs
diff --git a/src/test/ui/proc-macro/multispan.stderr b/tests/ui/proc-macro/multispan.stderr
index 0aea02bbd..0aea02bbd 100644
--- a/src/test/ui/proc-macro/multispan.stderr
+++ b/tests/ui/proc-macro/multispan.stderr
diff --git a/src/test/ui/proc-macro/negative-token.rs b/tests/ui/proc-macro/negative-token.rs
index 2ed3cbc08..2ed3cbc08 100644
--- a/src/test/ui/proc-macro/negative-token.rs
+++ b/tests/ui/proc-macro/negative-token.rs
diff --git a/src/test/ui/proc-macro/nested-derive-cfg.rs b/tests/ui/proc-macro/nested-derive-cfg.rs
index 53cfbb7c9..53cfbb7c9 100644
--- a/src/test/ui/proc-macro/nested-derive-cfg.rs
+++ b/tests/ui/proc-macro/nested-derive-cfg.rs
diff --git a/src/test/ui/proc-macro/nested-derive-cfg.stdout b/tests/ui/proc-macro/nested-derive-cfg.stdout
index 9a562c971..9a562c971 100644
--- a/src/test/ui/proc-macro/nested-derive-cfg.stdout
+++ b/tests/ui/proc-macro/nested-derive-cfg.stdout
diff --git a/src/test/ui/proc-macro/nested-item-spans.rs b/tests/ui/proc-macro/nested-item-spans.rs
index 63da170d0..63da170d0 100644
--- a/src/test/ui/proc-macro/nested-item-spans.rs
+++ b/tests/ui/proc-macro/nested-item-spans.rs
diff --git a/src/test/ui/proc-macro/nested-item-spans.stderr b/tests/ui/proc-macro/nested-item-spans.stderr
index 44b338fa6..44b338fa6 100644
--- a/src/test/ui/proc-macro/nested-item-spans.stderr
+++ b/tests/ui/proc-macro/nested-item-spans.stderr
diff --git a/src/test/ui/proc-macro/nested-macro-rules.rs b/tests/ui/proc-macro/nested-macro-rules.rs
index 25ffcfad7..25ffcfad7 100644
--- a/src/test/ui/proc-macro/nested-macro-rules.rs
+++ b/tests/ui/proc-macro/nested-macro-rules.rs
diff --git a/src/test/ui/proc-macro/nested-macro-rules.stdout b/tests/ui/proc-macro/nested-macro-rules.stdout
index 311139040..311139040 100644
--- a/src/test/ui/proc-macro/nested-macro-rules.stdout
+++ b/tests/ui/proc-macro/nested-macro-rules.stdout
diff --git a/src/test/ui/proc-macro/nested-nonterminal-tokens.rs b/tests/ui/proc-macro/nested-nonterminal-tokens.rs
index 04d34e21c..04d34e21c 100644
--- a/src/test/ui/proc-macro/nested-nonterminal-tokens.rs
+++ b/tests/ui/proc-macro/nested-nonterminal-tokens.rs
diff --git a/src/test/ui/proc-macro/nested-nonterminal-tokens.stdout b/tests/ui/proc-macro/nested-nonterminal-tokens.stdout
index a3d24dd26..a3d24dd26 100644
--- a/src/test/ui/proc-macro/nested-nonterminal-tokens.stdout
+++ b/tests/ui/proc-macro/nested-nonterminal-tokens.stdout
diff --git a/src/test/ui/proc-macro/no-macro-use-attr.rs b/tests/ui/proc-macro/no-macro-use-attr.rs
index a8a8fa4e1..a8a8fa4e1 100644
--- a/src/test/ui/proc-macro/no-macro-use-attr.rs
+++ b/tests/ui/proc-macro/no-macro-use-attr.rs
diff --git a/src/test/ui/proc-macro/no-macro-use-attr.stderr b/tests/ui/proc-macro/no-macro-use-attr.stderr
index a9e5256a0..a9e5256a0 100644
--- a/src/test/ui/proc-macro/no-macro-use-attr.stderr
+++ b/tests/ui/proc-macro/no-macro-use-attr.stderr
diff --git a/src/test/ui/proc-macro/no-missing-docs.rs b/tests/ui/proc-macro/no-missing-docs.rs
index e1e821858..e1e821858 100644
--- a/src/test/ui/proc-macro/no-missing-docs.rs
+++ b/tests/ui/proc-macro/no-missing-docs.rs
diff --git a/src/test/ui/proc-macro/nodelim-groups.rs b/tests/ui/proc-macro/nodelim-groups.rs
index ec3019902..ec3019902 100644
--- a/src/test/ui/proc-macro/nodelim-groups.rs
+++ b/tests/ui/proc-macro/nodelim-groups.rs
diff --git a/src/test/ui/proc-macro/nodelim-groups.stdout b/tests/ui/proc-macro/nodelim-groups.stdout
index 6b410f0bf..6b410f0bf 100644
--- a/src/test/ui/proc-macro/nodelim-groups.stdout
+++ b/tests/ui/proc-macro/nodelim-groups.stdout
diff --git a/src/test/ui/proc-macro/non-root.rs b/tests/ui/proc-macro/non-root.rs
index a7c4ac00a..a7c4ac00a 100644
--- a/src/test/ui/proc-macro/non-root.rs
+++ b/tests/ui/proc-macro/non-root.rs
diff --git a/src/test/ui/proc-macro/non-root.stderr b/tests/ui/proc-macro/non-root.stderr
index 90f94b677..90f94b677 100644
--- a/src/test/ui/proc-macro/non-root.stderr
+++ b/tests/ui/proc-macro/non-root.stderr
diff --git a/src/test/ui/proc-macro/nonterminal-expansion.rs b/tests/ui/proc-macro/nonterminal-expansion.rs
index e62155871..e62155871 100644
--- a/src/test/ui/proc-macro/nonterminal-expansion.rs
+++ b/tests/ui/proc-macro/nonterminal-expansion.rs
diff --git a/src/test/ui/proc-macro/nonterminal-expansion.stdout b/tests/ui/proc-macro/nonterminal-expansion.stdout
index 4d884348f..4d884348f 100644
--- a/src/test/ui/proc-macro/nonterminal-expansion.stdout
+++ b/tests/ui/proc-macro/nonterminal-expansion.stdout
diff --git a/src/test/ui/proc-macro/nonterminal-recollect-attr.rs b/tests/ui/proc-macro/nonterminal-recollect-attr.rs
index 79c4ad4cd..79c4ad4cd 100644
--- a/src/test/ui/proc-macro/nonterminal-recollect-attr.rs
+++ b/tests/ui/proc-macro/nonterminal-recollect-attr.rs
diff --git a/src/test/ui/proc-macro/nonterminal-recollect-attr.stdout b/tests/ui/proc-macro/nonterminal-recollect-attr.stdout
index 6824395ae..6824395ae 100644
--- a/src/test/ui/proc-macro/nonterminal-recollect-attr.stdout
+++ b/tests/ui/proc-macro/nonterminal-recollect-attr.stdout
diff --git a/src/test/ui/proc-macro/nonterminal-token-hygiene.rs b/tests/ui/proc-macro/nonterminal-token-hygiene.rs
index fa52a975b..fa52a975b 100644
--- a/src/test/ui/proc-macro/nonterminal-token-hygiene.rs
+++ b/tests/ui/proc-macro/nonterminal-token-hygiene.rs
diff --git a/src/test/ui/proc-macro/nonterminal-token-hygiene.stdout b/tests/ui/proc-macro/nonterminal-token-hygiene.stdout
index c08e53081..c08e53081 100644
--- a/src/test/ui/proc-macro/nonterminal-token-hygiene.stdout
+++ b/tests/ui/proc-macro/nonterminal-token-hygiene.stdout
diff --git a/src/test/ui/proc-macro/not-joint.rs b/tests/ui/proc-macro/not-joint.rs
index 30da2811e..30da2811e 100644
--- a/src/test/ui/proc-macro/not-joint.rs
+++ b/tests/ui/proc-macro/not-joint.rs
diff --git a/src/test/ui/proc-macro/out-of-line-mod.rs b/tests/ui/proc-macro/out-of-line-mod.rs
index 658ed6c18..658ed6c18 100644
--- a/src/test/ui/proc-macro/out-of-line-mod.rs
+++ b/tests/ui/proc-macro/out-of-line-mod.rs
diff --git a/src/test/ui/proc-macro/outer/inner.rs b/tests/ui/proc-macro/outer/inner.rs
index 5777ed899..5777ed899 100644
--- a/src/test/ui/proc-macro/outer/inner.rs
+++ b/tests/ui/proc-macro/outer/inner.rs
diff --git a/tests/ui/proc-macro/panic-abort.rs b/tests/ui/proc-macro/panic-abort.rs
new file mode 100644
index 000000000..ad312a875
--- /dev/null
+++ b/tests/ui/proc-macro/panic-abort.rs
@@ -0,0 +1,4 @@
+// error-pattern: building proc macro crate with `panic=abort` may crash the compiler should the proc-macro panic
+// compile-flags: --crate-type proc-macro -Cpanic=abort
+// force-host
+// check-pass
diff --git a/tests/ui/proc-macro/panic-abort.stderr b/tests/ui/proc-macro/panic-abort.stderr
new file mode 100644
index 000000000..a6e18614f
--- /dev/null
+++ b/tests/ui/proc-macro/panic-abort.stderr
@@ -0,0 +1,4 @@
+warning: building proc macro crate with `panic=abort` may crash the compiler should the proc-macro panic
+
+warning: 1 warning emitted
+
diff --git a/src/test/ui/proc-macro/parent-source-spans.rs b/tests/ui/proc-macro/parent-source-spans.rs
index 354657db4..354657db4 100644
--- a/src/test/ui/proc-macro/parent-source-spans.rs
+++ b/tests/ui/proc-macro/parent-source-spans.rs
diff --git a/src/test/ui/proc-macro/parent-source-spans.stderr b/tests/ui/proc-macro/parent-source-spans.stderr
index 65ce24e55..a3b27fd7b 100644
--- a/src/test/ui/proc-macro/parent-source-spans.stderr
+++ b/tests/ui/proc-macro/parent-source-spans.stderr
@@ -144,11 +144,9 @@ LL |     parent_source_spans!($($tokens)*);
 ...
 LL |     one!("hello", "world");
    |     ---------------------- in this macro invocation
+  --> $SRC_DIR/core/src/result.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     -- similarly named tuple variant `Ok` defined here
+   = note: similarly named tuple variant `Ok` defined here
    |
    = note: this error originates in the macro `parent_source_spans` which comes from the expansion of the macro `one` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -160,11 +158,9 @@ LL |     parent_source_spans!($($tokens)*);
 ...
 LL |     two!("yay", "rust");
    |     ------------------- in this macro invocation
+  --> $SRC_DIR/core/src/result.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     -- similarly named tuple variant `Ok` defined here
+   = note: similarly named tuple variant `Ok` defined here
    |
    = note: this error originates in the macro `parent_source_spans` which comes from the expansion of the macro `two` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -176,11 +172,9 @@ LL |     parent_source_spans!($($tokens)*);
 ...
 LL |     three!("hip", "hop");
    |     -------------------- in this macro invocation
+  --> $SRC_DIR/core/src/result.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     -- similarly named tuple variant `Ok` defined here
+   = note: similarly named tuple variant `Ok` defined here
    |
    = note: this error originates in the macro `parent_source_spans` which comes from the expansion of the macro `three` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/proc-macro/pretty-print-hack-hide.rs b/tests/ui/proc-macro/pretty-print-hack-hide.rs
index f53e8fe82..f53e8fe82 100644
--- a/src/test/ui/proc-macro/pretty-print-hack-hide.rs
+++ b/tests/ui/proc-macro/pretty-print-hack-hide.rs
diff --git a/src/test/ui/proc-macro/pretty-print-hack-hide.stdout b/tests/ui/proc-macro/pretty-print-hack-hide.stdout
index ea796bb26..ea796bb26 100644
--- a/src/test/ui/proc-macro/pretty-print-hack-hide.stdout
+++ b/tests/ui/proc-macro/pretty-print-hack-hide.stdout
diff --git a/src/test/ui/proc-macro/pretty-print-hack-show.stderr b/tests/ui/proc-macro/pretty-print-hack-show.local.stderr
index 873054927..873054927 100644
--- a/src/test/ui/proc-macro/pretty-print-hack-show.stderr
+++ b/tests/ui/proc-macro/pretty-print-hack-show.local.stderr
diff --git a/src/test/ui/proc-macro/pretty-print-hack-show.stdout b/tests/ui/proc-macro/pretty-print-hack-show.local.stdout
index 3d793d2a0..3d793d2a0 100644
--- a/src/test/ui/proc-macro/pretty-print-hack-show.stdout
+++ b/tests/ui/proc-macro/pretty-print-hack-show.local.stdout
diff --git a/tests/ui/proc-macro/pretty-print-hack-show.remapped.stderr b/tests/ui/proc-macro/pretty-print-hack-show.remapped.stderr
new file mode 100644
index 000000000..873054927
--- /dev/null
+++ b/tests/ui/proc-macro/pretty-print-hack-show.remapped.stderr
@@ -0,0 +1,179 @@
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+   = note: `#[deny(proc_macro_back_compat)]` on by default
+
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/rental-0.5.5/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/rental-0.5.5/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/rental-0.5.5/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/rental-0.5.5/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+
+error: aborting due to 8 previous errors
+
+Future incompatibility report: Future breakage diagnostic:
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+   = note: `#[deny(proc_macro_back_compat)]` on by default
+
+Future breakage diagnostic:
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+   = note: `#[deny(proc_macro_back_compat)]` on by default
+
+Future breakage diagnostic:
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+   = note: `#[deny(proc_macro_back_compat)]` on by default
+
+Future breakage diagnostic:
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+   = note: `#[deny(proc_macro_back_compat)]` on by default
+
+Future breakage diagnostic:
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/rental-0.5.5/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+   = note: `#[deny(proc_macro_back_compat)]` on by default
+
+Future breakage diagnostic:
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/rental-0.5.5/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+   = note: `#[deny(proc_macro_back_compat)]` on by default
+
+Future breakage diagnostic:
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/rental-0.5.5/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+   = note: `#[deny(proc_macro_back_compat)]` on by default
+
+Future breakage diagnostic:
+error: using an old version of `rental`
+  --> $DIR/pretty-print-hack/rental-0.5.5/src/lib.rs:4:6
+   |
+LL | enum ProceduralMasqueradeDummyType {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
+   = note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
+   = note: `#[deny(proc_macro_back_compat)]` on by default
+
diff --git a/tests/ui/proc-macro/pretty-print-hack-show.remapped.stdout b/tests/ui/proc-macro/pretty-print-hack-show.remapped.stdout
new file mode 100644
index 000000000..3d793d2a0
--- /dev/null
+++ b/tests/ui/proc-macro/pretty-print-hack-show.remapped.stdout
@@ -0,0 +1,44 @@
+PRINT-DERIVE INPUT (DISPLAY): enum ProceduralMasqueradeDummyType { Input, }
+PRINT-DERIVE RE-COLLECTED (DISPLAY): enum ProceduralMasqueradeDummyType { Input }
+PRINT-DERIVE INPUT (DEBUG): TokenStream [
+    Ident {
+        ident: "enum",
+        span: $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:1: 4:5 (#0),
+    },
+    Ident {
+        ident: "ProceduralMasqueradeDummyType",
+        span: $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6: 4:35 (#0),
+    },
+    Group {
+        delimiter: Brace,
+        stream: TokenStream [
+            Ident {
+                ident: "Input",
+                span: $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:13:5: 13:10 (#0),
+            },
+        ],
+        span: $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:36: 14:2 (#0),
+    },
+]
+PRINT-DERIVE INPUT (DISPLAY): enum ProceduralMasqueradeDummyType { Input, }
+PRINT-DERIVE RE-COLLECTED (DISPLAY): enum ProceduralMasqueradeDummyType { Input }
+PRINT-DERIVE INPUT (DEBUG): TokenStream [
+    Ident {
+        ident: "enum",
+        span: $DIR/pretty-print-hack/rental-0.5.5/src/lib.rs:4:1: 4:5 (#0),
+    },
+    Ident {
+        ident: "ProceduralMasqueradeDummyType",
+        span: $DIR/pretty-print-hack/rental-0.5.5/src/lib.rs:4:6: 4:35 (#0),
+    },
+    Group {
+        delimiter: Brace,
+        stream: TokenStream [
+            Ident {
+                ident: "Input",
+                span: $DIR/pretty-print-hack/rental-0.5.5/src/lib.rs:13:5: 13:10 (#0),
+            },
+        ],
+        span: $DIR/pretty-print-hack/rental-0.5.5/src/lib.rs:4:36: 14:2 (#0),
+    },
+]
diff --git a/tests/ui/proc-macro/pretty-print-hack-show.rs b/tests/ui/proc-macro/pretty-print-hack-show.rs
new file mode 100644
index 000000000..24a389c45
--- /dev/null
+++ b/tests/ui/proc-macro/pretty-print-hack-show.rs
@@ -0,0 +1,20 @@
+// aux-build:test-macros.rs
+// compile-flags: -Z span-debug
+// revisions: local remapped
+// [local] no-remap-src-base: The hack should work regardless of remapping.
+// [remapped] remap-src-base
+
+#![no_std] // Don't load unnecessary hygiene information from std
+extern crate std;
+
+#[macro_use] extern crate test_macros;
+
+mod first {
+    include!("pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs");
+}
+
+mod second {
+    include!("pretty-print-hack/rental-0.5.5/src/lib.rs");
+}
+
+fn main() {}
diff --git a/src/test/ui/proc-macro/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs b/tests/ui/proc-macro/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs
index 9501980fa..9501980fa 100644
--- a/src/test/ui/proc-macro/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs
+++ b/tests/ui/proc-macro/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs
diff --git a/src/test/ui/proc-macro/pretty-print-hack/rental-0.5.5/src/lib.rs b/tests/ui/proc-macro/pretty-print-hack/rental-0.5.5/src/lib.rs
index 9501980fa..9501980fa 100644
--- a/src/test/ui/proc-macro/pretty-print-hack/rental-0.5.5/src/lib.rs
+++ b/tests/ui/proc-macro/pretty-print-hack/rental-0.5.5/src/lib.rs
diff --git a/src/test/ui/proc-macro/pretty-print-hack/rental-0.5.6/src/lib.rs b/tests/ui/proc-macro/pretty-print-hack/rental-0.5.6/src/lib.rs
index 9501980fa..9501980fa 100644
--- a/src/test/ui/proc-macro/pretty-print-hack/rental-0.5.6/src/lib.rs
+++ b/tests/ui/proc-macro/pretty-print-hack/rental-0.5.6/src/lib.rs
diff --git a/src/test/ui/proc-macro/pretty-print-tts.rs b/tests/ui/proc-macro/pretty-print-tts.rs
index ffe2a7415..ffe2a7415 100644
--- a/src/test/ui/proc-macro/pretty-print-tts.rs
+++ b/tests/ui/proc-macro/pretty-print-tts.rs
diff --git a/src/test/ui/proc-macro/pretty-print-tts.stdout b/tests/ui/proc-macro/pretty-print-tts.stdout
index f52e97a86..f52e97a86 100644
--- a/src/test/ui/proc-macro/pretty-print-tts.stdout
+++ b/tests/ui/proc-macro/pretty-print-tts.stdout
diff --git a/src/test/ui/proc-macro/proc-macro-attributes.rs b/tests/ui/proc-macro/proc-macro-attributes.rs
index 8d96381b9..8d96381b9 100644
--- a/src/test/ui/proc-macro/proc-macro-attributes.rs
+++ b/tests/ui/proc-macro/proc-macro-attributes.rs
diff --git a/src/test/ui/proc-macro/proc-macro-attributes.stderr b/tests/ui/proc-macro/proc-macro-attributes.stderr
index 140d87906..140d87906 100644
--- a/src/test/ui/proc-macro/proc-macro-attributes.stderr
+++ b/tests/ui/proc-macro/proc-macro-attributes.stderr
diff --git a/src/test/ui/proc-macro/proc-macro-deprecated-attr.rs b/tests/ui/proc-macro/proc-macro-deprecated-attr.rs
index f1144a4a5..f1144a4a5 100644
--- a/src/test/ui/proc-macro/proc-macro-deprecated-attr.rs
+++ b/tests/ui/proc-macro/proc-macro-deprecated-attr.rs
diff --git a/src/test/ui/proc-macro/proc-macro-gates.rs b/tests/ui/proc-macro/proc-macro-gates.rs
index e2cf4e739..e2cf4e739 100644
--- a/src/test/ui/proc-macro/proc-macro-gates.rs
+++ b/tests/ui/proc-macro/proc-macro-gates.rs
diff --git a/src/test/ui/proc-macro/proc-macro-gates.stderr b/tests/ui/proc-macro/proc-macro-gates.stderr
index 3feb9b829..3feb9b829 100644
--- a/src/test/ui/proc-macro/proc-macro-gates.stderr
+++ b/tests/ui/proc-macro/proc-macro-gates.stderr
diff --git a/src/test/ui/proc-macro/proc-macro-gates2.rs b/tests/ui/proc-macro/proc-macro-gates2.rs
index 38fbd4733..38fbd4733 100644
--- a/src/test/ui/proc-macro/proc-macro-gates2.rs
+++ b/tests/ui/proc-macro/proc-macro-gates2.rs
diff --git a/src/test/ui/proc-macro/proc-macro-gates2.stderr b/tests/ui/proc-macro/proc-macro-gates2.stderr
index 64df34e7c..64df34e7c 100644
--- a/src/test/ui/proc-macro/proc-macro-gates2.stderr
+++ b/tests/ui/proc-macro/proc-macro-gates2.stderr
diff --git a/src/test/ui/proc-macro/pub-at-crate-root.rs b/tests/ui/proc-macro/pub-at-crate-root.rs
index 54cf333a4..54cf333a4 100644
--- a/src/test/ui/proc-macro/pub-at-crate-root.rs
+++ b/tests/ui/proc-macro/pub-at-crate-root.rs
diff --git a/src/test/ui/proc-macro/pub-at-crate-root.stderr b/tests/ui/proc-macro/pub-at-crate-root.stderr
index 2e7536a0c..2e7536a0c 100644
--- a/src/test/ui/proc-macro/pub-at-crate-root.stderr
+++ b/tests/ui/proc-macro/pub-at-crate-root.stderr
diff --git a/src/test/ui/proc-macro/quote-debug.rs b/tests/ui/proc-macro/quote-debug.rs
index e0304a014..e0304a014 100644
--- a/src/test/ui/proc-macro/quote-debug.rs
+++ b/tests/ui/proc-macro/quote-debug.rs
diff --git a/src/test/ui/proc-macro/quote-debug.stdout b/tests/ui/proc-macro/quote-debug.stdout
index d2cc5c6e2..9f64a1e06 100644
--- a/src/test/ui/proc-macro/quote-debug.stdout
+++ b/tests/ui/proc-macro/quote-debug.stdout
@@ -42,6 +42,7 @@ const _: () =
     {
         extern crate proc_macro;
         #[rustc_proc_macro_decls]
+        #[used]
         #[allow(deprecated)]
         static _DECLS: &[proc_macro::bridge::client::ProcMacro] = &[];
     };
diff --git a/src/test/ui/proc-macro/raw-ident.rs b/tests/ui/proc-macro/raw-ident.rs
index 03cb45714..03cb45714 100644
--- a/src/test/ui/proc-macro/raw-ident.rs
+++ b/tests/ui/proc-macro/raw-ident.rs
diff --git a/src/test/ui/proc-macro/raw-ident.stderr b/tests/ui/proc-macro/raw-ident.stderr
index 905a5f946..905a5f946 100644
--- a/src/test/ui/proc-macro/raw-ident.stderr
+++ b/tests/ui/proc-macro/raw-ident.stderr
diff --git a/src/test/ui/proc-macro/reserved-macro-names.rs b/tests/ui/proc-macro/reserved-macro-names.rs
index c5e71a87d..c5e71a87d 100644
--- a/src/test/ui/proc-macro/reserved-macro-names.rs
+++ b/tests/ui/proc-macro/reserved-macro-names.rs
diff --git a/src/test/ui/proc-macro/reserved-macro-names.stderr b/tests/ui/proc-macro/reserved-macro-names.stderr
index 39bdd03be..39bdd03be 100644
--- a/src/test/ui/proc-macro/reserved-macro-names.stderr
+++ b/tests/ui/proc-macro/reserved-macro-names.stderr
diff --git a/src/test/ui/proc-macro/resolve-error.rs b/tests/ui/proc-macro/resolve-error.rs
index ad8a5bbb0..ad8a5bbb0 100644
--- a/src/test/ui/proc-macro/resolve-error.rs
+++ b/tests/ui/proc-macro/resolve-error.rs
diff --git a/src/test/ui/proc-macro/resolve-error.stderr b/tests/ui/proc-macro/resolve-error.stderr
index a534b9d53..3c3f24d0f 100644
--- a/src/test/ui/proc-macro/resolve-error.stderr
+++ b/tests/ui/proc-macro/resolve-error.stderr
@@ -72,22 +72,18 @@ error: cannot find derive macro `Dlone` in this scope
    |
 LL | #[derive(Dlone)]
    |          ^^^^^ help: a derive macro with a similar name exists: `Clone`
+  --> $SRC_DIR/core/src/clone.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/clone.rs:LL:COL
-   |
-LL | pub macro Clone($item:item) {
-   | --------------- similarly named derive macro `Clone` defined here
+   = note: similarly named derive macro `Clone` defined here
 
 error: cannot find derive macro `Dlone` in this scope
   --> $DIR/resolve-error.rs:35:10
    |
 LL | #[derive(Dlone)]
    |          ^^^^^ help: a derive macro with a similar name exists: `Clone`
+  --> $SRC_DIR/core/src/clone.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/clone.rs:LL:COL
-   |
-LL | pub macro Clone($item:item) {
-   | --------------- similarly named derive macro `Clone` defined here
+   = note: similarly named derive macro `Clone` defined here
 
 error: cannot find attribute `FooWithLongNan` in this scope
   --> $DIR/resolve-error.rs:32:3
diff --git a/src/test/ui/proc-macro/resolved-located-at.rs b/tests/ui/proc-macro/resolved-located-at.rs
index b785573f2..b785573f2 100644
--- a/src/test/ui/proc-macro/resolved-located-at.rs
+++ b/tests/ui/proc-macro/resolved-located-at.rs
diff --git a/src/test/ui/proc-macro/resolved-located-at.stderr b/tests/ui/proc-macro/resolved-located-at.stderr
index 422820e9d..422820e9d 100644
--- a/src/test/ui/proc-macro/resolved-located-at.stderr
+++ b/tests/ui/proc-macro/resolved-located-at.stderr
diff --git a/src/test/ui/proc-macro/shadow.rs b/tests/ui/proc-macro/shadow.rs
index 61959594c..61959594c 100644
--- a/src/test/ui/proc-macro/shadow.rs
+++ b/tests/ui/proc-macro/shadow.rs
diff --git a/src/test/ui/proc-macro/shadow.stderr b/tests/ui/proc-macro/shadow.stderr
index e7d95cc83..e7d95cc83 100644
--- a/src/test/ui/proc-macro/shadow.stderr
+++ b/tests/ui/proc-macro/shadow.stderr
diff --git a/src/test/ui/proc-macro/signature.rs b/tests/ui/proc-macro/signature.rs
index 230223825..230223825 100644
--- a/src/test/ui/proc-macro/signature.rs
+++ b/tests/ui/proc-macro/signature.rs
diff --git a/src/test/ui/proc-macro/signature.stderr b/tests/ui/proc-macro/signature.stderr
index 59b3e44c7..79f2001da 100644
--- a/src/test/ui/proc-macro/signature.stderr
+++ b/tests/ui/proc-macro/signature.stderr
@@ -14,9 +14,6 @@ LL | | }
    = note: unsafe function cannot be called generically without an unsafe block
 note: required by a bound in `ProcMacro::custom_derive`
   --> $SRC_DIR/proc_macro/src/bridge/client.rs:LL:COL
-   |
-LL |         expand: impl Fn(crate::TokenStream) -> crate::TokenStream + Copy,
-   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `ProcMacro::custom_derive`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/proc-macro/smoke.rs b/tests/ui/proc-macro/smoke.rs
index 04625559b..04625559b 100644
--- a/src/test/ui/proc-macro/smoke.rs
+++ b/tests/ui/proc-macro/smoke.rs
diff --git a/src/test/ui/proc-macro/span-absolute-posititions.rs b/tests/ui/proc-macro/span-absolute-posititions.rs
index 6d70fe611..6d70fe611 100644
--- a/src/test/ui/proc-macro/span-absolute-posititions.rs
+++ b/tests/ui/proc-macro/span-absolute-posititions.rs
diff --git a/src/test/ui/proc-macro/span-absolute-posititions.stderr b/tests/ui/proc-macro/span-absolute-posititions.stderr
index 6aca44a6b..6aca44a6b 100644
--- a/src/test/ui/proc-macro/span-absolute-posititions.stderr
+++ b/tests/ui/proc-macro/span-absolute-posititions.stderr
diff --git a/src/test/ui/proc-macro/span-api-tests.rs b/tests/ui/proc-macro/span-api-tests.rs
index 914ad54ed..3f04ba866 100644
--- a/src/test/ui/proc-macro/span-api-tests.rs
+++ b/tests/ui/proc-macro/span-api-tests.rs
@@ -2,6 +2,7 @@
 // ignore-pretty
 // aux-build:span-api-tests.rs
 // aux-build:span-test-macros.rs
+// compile-flags: -Ztranslate-remapped-path-to-local-path=yes
 
 #[macro_use]
 extern crate span_test_macros;
diff --git a/src/test/ui/proc-macro/span-from-proc-macro.rs b/tests/ui/proc-macro/span-from-proc-macro.rs
index ecff2d725..ecff2d725 100644
--- a/src/test/ui/proc-macro/span-from-proc-macro.rs
+++ b/tests/ui/proc-macro/span-from-proc-macro.rs
diff --git a/src/test/ui/proc-macro/span-from-proc-macro.stderr b/tests/ui/proc-macro/span-from-proc-macro.stderr
index 7beed505a..7beed505a 100644
--- a/src/test/ui/proc-macro/span-from-proc-macro.stderr
+++ b/tests/ui/proc-macro/span-from-proc-macro.stderr
diff --git a/src/test/ui/proc-macro/span-preservation.rs b/tests/ui/proc-macro/span-preservation.rs
index 0c7358655..0c7358655 100644
--- a/src/test/ui/proc-macro/span-preservation.rs
+++ b/tests/ui/proc-macro/span-preservation.rs
diff --git a/src/test/ui/proc-macro/span-preservation.stderr b/tests/ui/proc-macro/span-preservation.stderr
index 66c68be2f..66c68be2f 100644
--- a/src/test/ui/proc-macro/span-preservation.stderr
+++ b/tests/ui/proc-macro/span-preservation.stderr
diff --git a/src/test/ui/proc-macro/struct-field-macro.rs b/tests/ui/proc-macro/struct-field-macro.rs
index 460f4d9f7..460f4d9f7 100644
--- a/src/test/ui/proc-macro/struct-field-macro.rs
+++ b/tests/ui/proc-macro/struct-field-macro.rs
diff --git a/src/test/ui/proc-macro/subspan.rs b/tests/ui/proc-macro/subspan.rs
index a4187f9e7..a4187f9e7 100644
--- a/src/test/ui/proc-macro/subspan.rs
+++ b/tests/ui/proc-macro/subspan.rs
diff --git a/src/test/ui/proc-macro/subspan.stderr b/tests/ui/proc-macro/subspan.stderr
index b5dacba0e..b5dacba0e 100644
--- a/src/test/ui/proc-macro/subspan.stderr
+++ b/tests/ui/proc-macro/subspan.stderr
diff --git a/src/test/ui/proc-macro/test.rs b/tests/ui/proc-macro/test.rs
index c96aa7317..c96aa7317 100644
--- a/src/test/ui/proc-macro/test.rs
+++ b/tests/ui/proc-macro/test.rs
diff --git a/src/test/ui/proc-macro/three-equals.rs b/tests/ui/proc-macro/three-equals.rs
index 21b137c99..21b137c99 100644
--- a/src/test/ui/proc-macro/three-equals.rs
+++ b/tests/ui/proc-macro/three-equals.rs
diff --git a/src/test/ui/proc-macro/three-equals.stderr b/tests/ui/proc-macro/three-equals.stderr
index 9cdb2a21b..9cdb2a21b 100644
--- a/src/test/ui/proc-macro/three-equals.stderr
+++ b/tests/ui/proc-macro/three-equals.stderr
diff --git a/src/test/ui/proc-macro/trailing-plus.rs b/tests/ui/proc-macro/trailing-plus.rs
index 4f61de47d..4f61de47d 100644
--- a/src/test/ui/proc-macro/trailing-plus.rs
+++ b/tests/ui/proc-macro/trailing-plus.rs
diff --git a/src/test/ui/proc-macro/trailing-plus.stdout b/tests/ui/proc-macro/trailing-plus.stdout
index b90057cd6..b90057cd6 100644
--- a/src/test/ui/proc-macro/trailing-plus.stdout
+++ b/tests/ui/proc-macro/trailing-plus.stdout
diff --git a/src/test/ui/proc-macro/trait-fn-args-2015.rs b/tests/ui/proc-macro/trait-fn-args-2015.rs
index 6b8df78a0..6b8df78a0 100644
--- a/src/test/ui/proc-macro/trait-fn-args-2015.rs
+++ b/tests/ui/proc-macro/trait-fn-args-2015.rs
diff --git a/src/test/ui/proc-macro/two-crate-types-1.rs b/tests/ui/proc-macro/two-crate-types-1.rs
index 80bfd357f..80bfd357f 100644
--- a/src/test/ui/proc-macro/two-crate-types-1.rs
+++ b/tests/ui/proc-macro/two-crate-types-1.rs
diff --git a/src/test/ui/proc-macro/two-crate-types-1.stderr b/tests/ui/proc-macro/two-crate-types-1.stderr
index deaba1cf2..deaba1cf2 100644
--- a/src/test/ui/proc-macro/two-crate-types-1.stderr
+++ b/tests/ui/proc-macro/two-crate-types-1.stderr
diff --git a/src/test/ui/proc-macro/two-crate-types-2.rs b/tests/ui/proc-macro/two-crate-types-2.rs
index 39cbf7d3b..39cbf7d3b 100644
--- a/src/test/ui/proc-macro/two-crate-types-2.rs
+++ b/tests/ui/proc-macro/two-crate-types-2.rs
diff --git a/src/test/ui/proc-macro/two-crate-types-2.stderr b/tests/ui/proc-macro/two-crate-types-2.stderr
index deaba1cf2..deaba1cf2 100644
--- a/src/test/ui/proc-macro/two-crate-types-2.stderr
+++ b/tests/ui/proc-macro/two-crate-types-2.stderr
diff --git a/src/test/ui/proc-macro/unsafe-foreign-mod.rs b/tests/ui/proc-macro/unsafe-foreign-mod.rs
index 7bdfa93c2..7bdfa93c2 100644
--- a/src/test/ui/proc-macro/unsafe-foreign-mod.rs
+++ b/tests/ui/proc-macro/unsafe-foreign-mod.rs
diff --git a/src/test/ui/proc-macro/unsafe-mod.rs b/tests/ui/proc-macro/unsafe-mod.rs
index 8ff6e352c..8ff6e352c 100644
--- a/src/test/ui/proc-macro/unsafe-mod.rs
+++ b/tests/ui/proc-macro/unsafe-mod.rs
diff --git a/src/test/ui/proc-macro/visibility-path.rs b/tests/ui/proc-macro/visibility-path.rs
index a73430db2..a73430db2 100644
--- a/src/test/ui/proc-macro/visibility-path.rs
+++ b/tests/ui/proc-macro/visibility-path.rs
diff --git a/src/test/ui/proc-macro/visibility-path.stderr b/tests/ui/proc-macro/visibility-path.stderr
index 1a73cc196..1a73cc196 100644
--- a/src/test/ui/proc-macro/visibility-path.stderr
+++ b/tests/ui/proc-macro/visibility-path.stderr
diff --git a/src/test/ui/proc-macro/weird-braces.rs b/tests/ui/proc-macro/weird-braces.rs
index b9a7e08f9..b9a7e08f9 100644
--- a/src/test/ui/proc-macro/weird-braces.rs
+++ b/tests/ui/proc-macro/weird-braces.rs
diff --git a/src/test/ui/proc-macro/weird-braces.stdout b/tests/ui/proc-macro/weird-braces.stdout
index 9bf562217..9bf562217 100644
--- a/src/test/ui/proc-macro/weird-braces.stdout
+++ b/tests/ui/proc-macro/weird-braces.stdout
diff --git a/src/test/ui/proc-macro/weird-hygiene.rs b/tests/ui/proc-macro/weird-hygiene.rs
index 7ba3f98a7..7ba3f98a7 100644
--- a/src/test/ui/proc-macro/weird-hygiene.rs
+++ b/tests/ui/proc-macro/weird-hygiene.rs
diff --git a/src/test/ui/proc-macro/weird-hygiene.stderr b/tests/ui/proc-macro/weird-hygiene.stderr
index 256e68e89..256e68e89 100644
--- a/src/test/ui/proc-macro/weird-hygiene.stderr
+++ b/tests/ui/proc-macro/weird-hygiene.stderr
diff --git a/src/test/ui/process-termination/process-termination-blocking-io.rs b/tests/ui/process-termination/process-termination-blocking-io.rs
index b2dab5c93..b2dab5c93 100644
--- a/src/test/ui/process-termination/process-termination-blocking-io.rs
+++ b/tests/ui/process-termination/process-termination-blocking-io.rs
diff --git a/src/test/ui/process-termination/process-termination-simple.rs b/tests/ui/process-termination/process-termination-simple.rs
index 8f2e5b94c..8f2e5b94c 100644
--- a/src/test/ui/process-termination/process-termination-simple.rs
+++ b/tests/ui/process-termination/process-termination-simple.rs
diff --git a/src/test/ui/process/core-run-destroy.rs b/tests/ui/process/core-run-destroy.rs
index d0e97bf01..d0e97bf01 100644
--- a/src/test/ui/process/core-run-destroy.rs
+++ b/tests/ui/process/core-run-destroy.rs
diff --git a/src/test/ui/process/fds-are-cloexec.rs b/tests/ui/process/fds-are-cloexec.rs
index 4482b7032..4482b7032 100644
--- a/src/test/ui/process/fds-are-cloexec.rs
+++ b/tests/ui/process/fds-are-cloexec.rs
diff --git a/src/test/ui/process/issue-13304.rs b/tests/ui/process/issue-13304.rs
index b10f6d572..b10f6d572 100644
--- a/src/test/ui/process/issue-13304.rs
+++ b/tests/ui/process/issue-13304.rs
diff --git a/src/test/ui/process/issue-14456.rs b/tests/ui/process/issue-14456.rs
index 52a56eb77..52a56eb77 100644
--- a/src/test/ui/process/issue-14456.rs
+++ b/tests/ui/process/issue-14456.rs
diff --git a/src/test/ui/process/issue-14940.rs b/tests/ui/process/issue-14940.rs
index 98a4af0c4..98a4af0c4 100644
--- a/src/test/ui/process/issue-14940.rs
+++ b/tests/ui/process/issue-14940.rs
diff --git a/src/test/ui/process/issue-16272.rs b/tests/ui/process/issue-16272.rs
index 5cf3fd949..5cf3fd949 100644
--- a/src/test/ui/process/issue-16272.rs
+++ b/tests/ui/process/issue-16272.rs
diff --git a/src/test/ui/process/issue-20091.rs b/tests/ui/process/issue-20091.rs
index 86cc79d6b..86cc79d6b 100644
--- a/src/test/ui/process/issue-20091.rs
+++ b/tests/ui/process/issue-20091.rs
diff --git a/src/test/ui/process/multi-panic.rs b/tests/ui/process/multi-panic.rs
index a1887c218..a1887c218 100644
--- a/src/test/ui/process/multi-panic.rs
+++ b/tests/ui/process/multi-panic.rs
diff --git a/src/test/ui/process/no-stdio.rs b/tests/ui/process/no-stdio.rs
index 24985386a..24985386a 100644
--- a/src/test/ui/process/no-stdio.rs
+++ b/tests/ui/process/no-stdio.rs
diff --git a/src/test/ui/process/nofile-limit.rs b/tests/ui/process/nofile-limit.rs
index 3ddf8d6ef..3ddf8d6ef 100644
--- a/src/test/ui/process/nofile-limit.rs
+++ b/tests/ui/process/nofile-limit.rs
diff --git a/src/test/ui/process/process-envs.rs b/tests/ui/process/process-envs.rs
index f3a469791..f3a469791 100644
--- a/src/test/ui/process/process-envs.rs
+++ b/tests/ui/process/process-envs.rs
diff --git a/src/test/ui/process/process-exit.rs b/tests/ui/process/process-exit.rs
index d193e073e..d193e073e 100644
--- a/src/test/ui/process/process-exit.rs
+++ b/tests/ui/process/process-exit.rs
diff --git a/tests/ui/process/process-panic-after-fork.rs b/tests/ui/process/process-panic-after-fork.rs
new file mode 100644
index 000000000..da2683121
--- /dev/null
+++ b/tests/ui/process/process-panic-after-fork.rs
@@ -0,0 +1,197 @@
+// run-pass
+// no-prefer-dynamic
+// ignore-wasm32-bare no libc
+// ignore-windows
+// ignore-sgx no libc
+// ignore-emscripten no processes
+// ignore-sgx no processes
+// ignore-fuchsia no fork
+
+#![feature(rustc_private)]
+#![feature(never_type)]
+#![feature(panic_always_abort)]
+
+extern crate libc;
+
+use std::alloc::{GlobalAlloc, Layout};
+use std::fmt;
+use std::panic::{self, panic_any};
+use std::os::unix::process::{CommandExt, ExitStatusExt};
+use std::process::{self, Command, ExitStatus};
+use std::sync::atomic::{AtomicU32, Ordering};
+
+use libc::c_int;
+
+/// This stunt allocator allows us to spot heap allocations in the child.
+struct PidChecking<A> {
+    parent: A,
+    require_pid: AtomicU32,
+}
+
+#[global_allocator]
+static ALLOCATOR: PidChecking<std::alloc::System> = PidChecking {
+    parent: std::alloc::System,
+    require_pid: AtomicU32::new(0),
+};
+
+impl<A> PidChecking<A> {
+    fn engage(&self) {
+        let parent_pid = process::id();
+        eprintln!("engaging allocator trap, parent pid={}", parent_pid);
+        self.require_pid.store(parent_pid, Ordering::Release);
+    }
+    fn check(&self) {
+        let require_pid = self.require_pid.load(Ordering::Acquire);
+        if require_pid != 0 {
+            let actual_pid = process::id();
+            if require_pid != actual_pid {
+                unsafe {
+                    libc::raise(libc::SIGUSR1);
+                }
+            }
+        }
+    }
+}
+
+unsafe impl<A:GlobalAlloc> GlobalAlloc for PidChecking<A> {
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+        self.check();
+        self.parent.alloc(layout)
+    }
+
+    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
+        self.check();
+        self.parent.dealloc(ptr, layout)
+    }
+
+    unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
+        self.check();
+        self.parent.alloc_zeroed(layout)
+    }
+
+    unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
+        self.check();
+        self.parent.realloc(ptr, layout, new_size)
+    }
+}
+
+fn expect_aborted(status: ExitStatus) {
+    dbg!(status);
+    let signal = status.signal().expect("expected child process to die of signal");
+
+    #[cfg(not(target_os = "android"))]
+    assert!(signal == libc::SIGABRT || signal == libc::SIGILL || signal == libc::SIGTRAP);
+
+    #[cfg(target_os = "android")]
+    {
+        assert!(signal == libc::SIGABRT || signal == libc::SIGSEGV);
+
+        if signal == libc::SIGSEGV {
+            // Pre-KitKat versions of Android signal an abort() with SIGSEGV at address 0xdeadbaad
+            // See e.g. https://groups.google.com/g/android-ndk/c/laW1CJc7Icc
+            //
+            // This behavior was changed in KitKat to send a standard SIGABRT signal.
+            // See: https://r.android.com/60341
+            //
+            // Additional checks performed:
+            // 1. Find last tombstone (similar to coredump but in text format) from the
+            //    same executable (path) as we are (must be because of usage of fork):
+            //    This ensures that we look into the correct tombstone.
+            // 2. Cause of crash is a SIGSEGV with address 0xdeadbaad.
+            // 3. libc::abort call is in one of top two functions on callstack.
+            // The last two steps distinguish between a normal SIGSEGV and one caused
+            // by libc::abort.
+
+            let this_exe = std::env::current_exe().unwrap().into_os_string().into_string().unwrap();
+            let exe_string = format!(">>> {this_exe} <<<");
+            let tombstone = (0..100)
+                .map(|n| format!("/data/tombstones/tombstone_{n:02}"))
+                .filter(|f| std::path::Path::new(&f).exists())
+                .map(|f| std::fs::read_to_string(&f).expect("Cannot read tombstone file"))
+                .filter(|f| f.contains(&exe_string))
+                .last()
+                .expect("no tombstone found");
+
+            println!("Content of tombstone:\n{tombstone}");
+
+            assert!(tombstone
+                .contains("signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr deadbaad"));
+            let abort_on_top = tombstone
+                .lines()
+                .skip_while(|l| !l.contains("backtrace:"))
+                .skip(1)
+                .take_while(|l| l.starts_with("    #"))
+                .take(2)
+                .any(|f| f.contains("/system/lib/libc.so (abort"));
+            assert!(abort_on_top);
+        }
+    }
+}
+
+fn main() {
+    ALLOCATOR.engage();
+
+    fn run(do_panic: &dyn Fn()) -> ExitStatus {
+        let child = unsafe { libc::fork() };
+        assert!(child >= 0);
+        if child == 0 {
+            panic::always_abort();
+            do_panic();
+            process::exit(0);
+        }
+        let mut status: c_int = 0;
+        let got = unsafe { libc::waitpid(child, &mut status, 0) };
+        assert_eq!(got, child);
+        let status = ExitStatus::from_raw(status.into());
+        status
+    }
+
+    fn one(do_panic: &dyn Fn()) {
+        let status = run(do_panic);
+        expect_aborted(status);
+    }
+
+    one(&|| panic!());
+    one(&|| panic!("some message"));
+    one(&|| panic!("message with argument: {}", 42));
+
+    #[derive(Debug)]
+    struct Wotsit { }
+    one(&|| panic_any(Wotsit { }));
+
+    let mut c = Command::new("echo");
+    unsafe {
+        c.pre_exec(|| panic!("{}", "crash now!"));
+    }
+    let st = c.status().expect("failed to get command status");
+    expect_aborted(st);
+
+    struct DisplayWithHeap;
+    impl fmt::Display for DisplayWithHeap {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
+            let s = vec![0; 100];
+            let s = std::hint::black_box(s);
+            write!(f, "{:?}", s)
+        }
+    }
+
+    // Some panics in the stdlib that we want not to allocate, as
+    // otherwise these facilities become impossible to use in the
+    // child after fork, which is really quite awkward.
+
+    one(&|| { None::<DisplayWithHeap>.unwrap(); });
+    one(&|| { None::<DisplayWithHeap>.expect("unwrapped a none"); });
+    one(&|| { std::str::from_utf8(b"\xff").unwrap(); });
+    one(&|| {
+        let x = [0, 1, 2, 3];
+        let y = x[std::hint::black_box(4)];
+        let _z = std::hint::black_box(y);
+    });
+
+    // Finally, check that our stunt allocator can actually catch an allocation after fork.
+    // ie, that our test is effective.
+
+    let status = run(&|| panic!("allocating to display... {}", DisplayWithHeap));
+    dbg!(status);
+    assert_eq!(status.signal(), Some(libc::SIGUSR1));
+}
diff --git a/src/test/ui/process/process-remove-from-env.rs b/tests/ui/process/process-remove-from-env.rs
index ad027d685..ad027d685 100644
--- a/src/test/ui/process/process-remove-from-env.rs
+++ b/tests/ui/process/process-remove-from-env.rs
diff --git a/src/test/ui/process/process-sigpipe.rs b/tests/ui/process/process-sigpipe.rs
index 107eba45d..107eba45d 100644
--- a/src/test/ui/process/process-sigpipe.rs
+++ b/tests/ui/process/process-sigpipe.rs
diff --git a/src/test/ui/process/process-spawn-nonexistent.rs b/tests/ui/process/process-spawn-nonexistent.rs
index 9dd608986..9dd608986 100644
--- a/src/test/ui/process/process-spawn-nonexistent.rs
+++ b/tests/ui/process/process-spawn-nonexistent.rs
diff --git a/src/test/ui/process/process-spawn-with-unicode-params.rs b/tests/ui/process/process-spawn-with-unicode-params.rs
index 16dba6292..16dba6292 100644
--- a/src/test/ui/process/process-spawn-with-unicode-params.rs
+++ b/tests/ui/process/process-spawn-with-unicode-params.rs
diff --git a/src/test/ui/process/process-status-inherits-stdin.rs b/tests/ui/process/process-status-inherits-stdin.rs
index 7719dd9ad..7719dd9ad 100644
--- a/src/test/ui/process/process-status-inherits-stdin.rs
+++ b/tests/ui/process/process-status-inherits-stdin.rs
diff --git a/src/test/ui/process/signal-exit-status.rs b/tests/ui/process/signal-exit-status.rs
index 9519ed7b4..9519ed7b4 100644
--- a/src/test/ui/process/signal-exit-status.rs
+++ b/tests/ui/process/signal-exit-status.rs
diff --git a/src/test/ui/process/sigpipe-should-be-ignored.rs b/tests/ui/process/sigpipe-should-be-ignored.rs
index 144eeca23..144eeca23 100644
--- a/src/test/ui/process/sigpipe-should-be-ignored.rs
+++ b/tests/ui/process/sigpipe-should-be-ignored.rs
diff --git a/src/test/ui/process/tls-exit-status.rs b/tests/ui/process/tls-exit-status.rs
index 6296e5042..6296e5042 100644
--- a/src/test/ui/process/tls-exit-status.rs
+++ b/tests/ui/process/tls-exit-status.rs
diff --git a/src/test/ui/process/try-wait.rs b/tests/ui/process/try-wait.rs
index 692197210..692197210 100644
--- a/src/test/ui/process/try-wait.rs
+++ b/tests/ui/process/try-wait.rs
diff --git a/src/test/ui/project-cache-issue-31849.rs b/tests/ui/project-cache-issue-31849.rs
index 07fb6abae..07fb6abae 100644
--- a/src/test/ui/project-cache-issue-31849.rs
+++ b/tests/ui/project-cache-issue-31849.rs
diff --git a/src/test/ui/ptr-coercion-rpass.rs b/tests/ui/ptr-coercion-rpass.rs
index 1c3ce3303..1c3ce3303 100644
--- a/src/test/ui/ptr-coercion-rpass.rs
+++ b/tests/ui/ptr-coercion-rpass.rs
diff --git a/src/test/ui/ptr-coercion.rs b/tests/ui/ptr-coercion.rs
index 193899034..193899034 100644
--- a/src/test/ui/ptr-coercion.rs
+++ b/tests/ui/ptr-coercion.rs
diff --git a/src/test/ui/ptr-coercion.stderr b/tests/ui/ptr-coercion.stderr
index 29b7e5da8..29b7e5da8 100644
--- a/src/test/ui/ptr-coercion.stderr
+++ b/tests/ui/ptr-coercion.stderr
diff --git a/src/test/ui/ptr_ops/issue-80309-safe.rs b/tests/ui/ptr_ops/issue-80309-safe.rs
index 8a4ff1669..8a4ff1669 100644
--- a/src/test/ui/ptr_ops/issue-80309-safe.rs
+++ b/tests/ui/ptr_ops/issue-80309-safe.rs
diff --git a/src/test/ui/ptr_ops/issue-80309.rs b/tests/ui/ptr_ops/issue-80309.rs
index c13ce3c9c..c13ce3c9c 100644
--- a/src/test/ui/ptr_ops/issue-80309.rs
+++ b/tests/ui/ptr_ops/issue-80309.rs
diff --git a/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.rs b/tests/ui/pub/issue-33174-restricted-type-in-public-interface.rs
index 67f888c5e..67f888c5e 100644
--- a/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.rs
+++ b/tests/ui/pub/issue-33174-restricted-type-in-public-interface.rs
diff --git a/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.stderr b/tests/ui/pub/issue-33174-restricted-type-in-public-interface.stderr
index 39d4f5ac8..39d4f5ac8 100644
--- a/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.stderr
+++ b/tests/ui/pub/issue-33174-restricted-type-in-public-interface.stderr
diff --git a/src/test/ui/pub/pub-ident-fn-2.fixed b/tests/ui/pub/pub-ident-fn-2.fixed
index afd75a41f..afd75a41f 100644
--- a/src/test/ui/pub/pub-ident-fn-2.fixed
+++ b/tests/ui/pub/pub-ident-fn-2.fixed
diff --git a/src/test/ui/pub/pub-ident-fn-2.rs b/tests/ui/pub/pub-ident-fn-2.rs
index e7b86a909..e7b86a909 100644
--- a/src/test/ui/pub/pub-ident-fn-2.rs
+++ b/tests/ui/pub/pub-ident-fn-2.rs
diff --git a/src/test/ui/pub/pub-ident-fn-2.stderr b/tests/ui/pub/pub-ident-fn-2.stderr
index b5b667b41..b5b667b41 100644
--- a/src/test/ui/pub/pub-ident-fn-2.stderr
+++ b/tests/ui/pub/pub-ident-fn-2.stderr
diff --git a/src/test/ui/pub/pub-ident-fn-3.rs b/tests/ui/pub/pub-ident-fn-3.rs
index fdbea7cf4..fdbea7cf4 100644
--- a/src/test/ui/pub/pub-ident-fn-3.rs
+++ b/tests/ui/pub/pub-ident-fn-3.rs
diff --git a/src/test/ui/pub/pub-ident-fn-3.stderr b/tests/ui/pub/pub-ident-fn-3.stderr
index 6d3d4e592..6d3d4e592 100644
--- a/src/test/ui/pub/pub-ident-fn-3.stderr
+++ b/tests/ui/pub/pub-ident-fn-3.stderr
diff --git a/src/test/ui/pub/pub-ident-fn-or-struct-2.rs b/tests/ui/pub/pub-ident-fn-or-struct-2.rs
index 8f67cdd29..8f67cdd29 100644
--- a/src/test/ui/pub/pub-ident-fn-or-struct-2.rs
+++ b/tests/ui/pub/pub-ident-fn-or-struct-2.rs
diff --git a/src/test/ui/pub/pub-ident-fn-or-struct-2.stderr b/tests/ui/pub/pub-ident-fn-or-struct-2.stderr
index 047e66b18..047e66b18 100644
--- a/src/test/ui/pub/pub-ident-fn-or-struct-2.stderr
+++ b/tests/ui/pub/pub-ident-fn-or-struct-2.stderr
diff --git a/src/test/ui/pub/pub-ident-fn-or-struct.rs b/tests/ui/pub/pub-ident-fn-or-struct.rs
index 832831d29..832831d29 100644
--- a/src/test/ui/pub/pub-ident-fn-or-struct.rs
+++ b/tests/ui/pub/pub-ident-fn-or-struct.rs
diff --git a/src/test/ui/pub/pub-ident-fn-or-struct.stderr b/tests/ui/pub/pub-ident-fn-or-struct.stderr
index c4a196eb2..c4a196eb2 100644
--- a/src/test/ui/pub/pub-ident-fn-or-struct.stderr
+++ b/tests/ui/pub/pub-ident-fn-or-struct.stderr
diff --git a/src/test/ui/pub/pub-ident-fn-with-lifetime-2.rs b/tests/ui/pub/pub-ident-fn-with-lifetime-2.rs
index 1ee8c84f1..1ee8c84f1 100644
--- a/src/test/ui/pub/pub-ident-fn-with-lifetime-2.rs
+++ b/tests/ui/pub/pub-ident-fn-with-lifetime-2.rs
diff --git a/src/test/ui/pub/pub-ident-fn-with-lifetime-2.stderr b/tests/ui/pub/pub-ident-fn-with-lifetime-2.stderr
index 6a9aeaf4a..6a9aeaf4a 100644
--- a/src/test/ui/pub/pub-ident-fn-with-lifetime-2.stderr
+++ b/tests/ui/pub/pub-ident-fn-with-lifetime-2.stderr
diff --git a/src/test/ui/pub/pub-ident-fn-with-lifetime.fixed b/tests/ui/pub/pub-ident-fn-with-lifetime.fixed
index e510ace5f..e510ace5f 100644
--- a/src/test/ui/pub/pub-ident-fn-with-lifetime.fixed
+++ b/tests/ui/pub/pub-ident-fn-with-lifetime.fixed
diff --git a/src/test/ui/pub/pub-ident-fn-with-lifetime.rs b/tests/ui/pub/pub-ident-fn-with-lifetime.rs
index 63e6eca15..63e6eca15 100644
--- a/src/test/ui/pub/pub-ident-fn-with-lifetime.rs
+++ b/tests/ui/pub/pub-ident-fn-with-lifetime.rs
diff --git a/src/test/ui/pub/pub-ident-fn-with-lifetime.stderr b/tests/ui/pub/pub-ident-fn-with-lifetime.stderr
index c1ca0136b..c1ca0136b 100644
--- a/src/test/ui/pub/pub-ident-fn-with-lifetime.stderr
+++ b/tests/ui/pub/pub-ident-fn-with-lifetime.stderr
diff --git a/src/test/ui/pub/pub-ident-fn.fixed b/tests/ui/pub/pub-ident-fn.fixed
index 65ed8c7b4..65ed8c7b4 100644
--- a/src/test/ui/pub/pub-ident-fn.fixed
+++ b/tests/ui/pub/pub-ident-fn.fixed
diff --git a/src/test/ui/pub/pub-ident-fn.rs b/tests/ui/pub/pub-ident-fn.rs
index 2fe4d34fb..2fe4d34fb 100644
--- a/src/test/ui/pub/pub-ident-fn.rs
+++ b/tests/ui/pub/pub-ident-fn.rs
diff --git a/src/test/ui/pub/pub-ident-fn.stderr b/tests/ui/pub/pub-ident-fn.stderr
index cb94c48ad..cb94c48ad 100644
--- a/src/test/ui/pub/pub-ident-fn.stderr
+++ b/tests/ui/pub/pub-ident-fn.stderr
diff --git a/src/test/ui/pub/pub-ident-struct-with-lifetime.rs b/tests/ui/pub/pub-ident-struct-with-lifetime.rs
index 2feb02660..2feb02660 100644
--- a/src/test/ui/pub/pub-ident-struct-with-lifetime.rs
+++ b/tests/ui/pub/pub-ident-struct-with-lifetime.rs
diff --git a/src/test/ui/pub/pub-ident-struct-with-lifetime.stderr b/tests/ui/pub/pub-ident-struct-with-lifetime.stderr
index 562b68e35..562b68e35 100644
--- a/src/test/ui/pub/pub-ident-struct-with-lifetime.stderr
+++ b/tests/ui/pub/pub-ident-struct-with-lifetime.stderr
diff --git a/src/test/ui/pub/pub-ident-struct.fixed b/tests/ui/pub/pub-ident-struct.fixed
index 58cde8fd6..58cde8fd6 100644
--- a/src/test/ui/pub/pub-ident-struct.fixed
+++ b/tests/ui/pub/pub-ident-struct.fixed
diff --git a/src/test/ui/pub/pub-ident-struct.rs b/tests/ui/pub/pub-ident-struct.rs
index 3930e556e..3930e556e 100644
--- a/src/test/ui/pub/pub-ident-struct.rs
+++ b/tests/ui/pub/pub-ident-struct.rs
diff --git a/src/test/ui/pub/pub-ident-struct.stderr b/tests/ui/pub/pub-ident-struct.stderr
index d3a378786..d3a378786 100644
--- a/src/test/ui/pub/pub-ident-struct.stderr
+++ b/tests/ui/pub/pub-ident-struct.stderr
diff --git a/src/test/ui/pub/pub-ident-with-lifetime-incomplete.rs b/tests/ui/pub/pub-ident-with-lifetime-incomplete.rs
index c86a9f2fd..c86a9f2fd 100644
--- a/src/test/ui/pub/pub-ident-with-lifetime-incomplete.rs
+++ b/tests/ui/pub/pub-ident-with-lifetime-incomplete.rs
diff --git a/src/test/ui/pub/pub-ident-with-lifetime-incomplete.stderr b/tests/ui/pub/pub-ident-with-lifetime-incomplete.stderr
index 0e0b12705..0e0b12705 100644
--- a/src/test/ui/pub/pub-ident-with-lifetime-incomplete.stderr
+++ b/tests/ui/pub/pub-ident-with-lifetime-incomplete.stderr
diff --git a/src/test/ui/pub/pub-reexport-priv-extern-crate.rs b/tests/ui/pub/pub-reexport-priv-extern-crate.rs
index dd5cd420f..dd5cd420f 100644
--- a/src/test/ui/pub/pub-reexport-priv-extern-crate.rs
+++ b/tests/ui/pub/pub-reexport-priv-extern-crate.rs
diff --git a/src/test/ui/pub/pub-reexport-priv-extern-crate.stderr b/tests/ui/pub/pub-reexport-priv-extern-crate.stderr
index c7fadc6f9..c7fadc6f9 100644
--- a/src/test/ui/pub/pub-reexport-priv-extern-crate.stderr
+++ b/tests/ui/pub/pub-reexport-priv-extern-crate.stderr
diff --git a/src/test/ui/pub/pub-restricted-error-fn.rs b/tests/ui/pub/pub-restricted-error-fn.rs
index fc1aeae2b..fc1aeae2b 100644
--- a/src/test/ui/pub/pub-restricted-error-fn.rs
+++ b/tests/ui/pub/pub-restricted-error-fn.rs
diff --git a/src/test/ui/pub/pub-restricted-error-fn.stderr b/tests/ui/pub/pub-restricted-error-fn.stderr
index 0511a821a..0511a821a 100644
--- a/src/test/ui/pub/pub-restricted-error-fn.stderr
+++ b/tests/ui/pub/pub-restricted-error-fn.stderr
diff --git a/src/test/ui/pub/pub-restricted-error.rs b/tests/ui/pub/pub-restricted-error.rs
index 60fce3f51..60fce3f51 100644
--- a/src/test/ui/pub/pub-restricted-error.rs
+++ b/tests/ui/pub/pub-restricted-error.rs
diff --git a/src/test/ui/pub/pub-restricted-error.stderr b/tests/ui/pub/pub-restricted-error.stderr
index b47328f34..b47328f34 100644
--- a/src/test/ui/pub/pub-restricted-error.stderr
+++ b/tests/ui/pub/pub-restricted-error.stderr
diff --git a/src/test/ui/pub/pub-restricted-non-path.rs b/tests/ui/pub/pub-restricted-non-path.rs
index bdad18dbe..bdad18dbe 100644
--- a/src/test/ui/pub/pub-restricted-non-path.rs
+++ b/tests/ui/pub/pub-restricted-non-path.rs
diff --git a/src/test/ui/pub/pub-restricted-non-path.stderr b/tests/ui/pub/pub-restricted-non-path.stderr
index e0ea50621..e0ea50621 100644
--- a/src/test/ui/pub/pub-restricted-non-path.stderr
+++ b/tests/ui/pub/pub-restricted-non-path.stderr
diff --git a/src/test/ui/pub/pub-restricted.rs b/tests/ui/pub/pub-restricted.rs
index bcd21082f..bcd21082f 100644
--- a/src/test/ui/pub/pub-restricted.rs
+++ b/tests/ui/pub/pub-restricted.rs
diff --git a/src/test/ui/pub/pub-restricted.stderr b/tests/ui/pub/pub-restricted.stderr
index 4694530e5..4694530e5 100644
--- a/src/test/ui/pub/pub-restricted.stderr
+++ b/tests/ui/pub/pub-restricted.stderr
diff --git a/src/test/ui/qualified/qualified-path-params-2.rs b/tests/ui/qualified/qualified-path-params-2.rs
index d0cc1fa3d..d0cc1fa3d 100644
--- a/src/test/ui/qualified/qualified-path-params-2.rs
+++ b/tests/ui/qualified/qualified-path-params-2.rs
diff --git a/tests/ui/qualified/qualified-path-params-2.stderr b/tests/ui/qualified/qualified-path-params-2.stderr
new file mode 100644
index 000000000..b6cf19b82
--- /dev/null
+++ b/tests/ui/qualified/qualified-path-params-2.stderr
@@ -0,0 +1,14 @@
+error[E0223]: ambiguous associated type
+  --> $DIR/qualified-path-params-2.rs:18:10
+   |
+LL | type A = <S as Tr>::A::f<u8>;
+   |          ^^^^^^^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `f` implemented for `<S as Tr>::A`, you could use the fully-qualified path
+   |
+LL | type A = <<S as Tr>::A as Example>::f;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/qualified/qualified-path-params.rs b/tests/ui/qualified/qualified-path-params.rs
index e8a95a460..e8a95a460 100644
--- a/src/test/ui/qualified/qualified-path-params.rs
+++ b/tests/ui/qualified/qualified-path-params.rs
diff --git a/src/test/ui/qualified/qualified-path-params.stderr b/tests/ui/qualified/qualified-path-params.stderr
index a49ed6c8f..a49ed6c8f 100644
--- a/src/test/ui/qualified/qualified-path-params.stderr
+++ b/tests/ui/qualified/qualified-path-params.stderr
diff --git a/src/test/ui/query-system/fn-sig-cycle-arity.rs b/tests/ui/query-system/fn-sig-cycle-arity.rs
index 7a9b8469c..7a9b8469c 100644
--- a/src/test/ui/query-system/fn-sig-cycle-arity.rs
+++ b/tests/ui/query-system/fn-sig-cycle-arity.rs
diff --git a/src/test/ui/query-system/fn-sig-cycle-arity.stderr b/tests/ui/query-system/fn-sig-cycle-arity.stderr
index 67e0c2545..67e0c2545 100644
--- a/src/test/ui/query-system/fn-sig-cycle-arity.stderr
+++ b/tests/ui/query-system/fn-sig-cycle-arity.stderr
diff --git a/src/test/ui/query-system/issue-83479.rs b/tests/ui/query-system/issue-83479.rs
index 32676dfe9..32676dfe9 100644
--- a/src/test/ui/query-system/issue-83479.rs
+++ b/tests/ui/query-system/issue-83479.rs
diff --git a/src/test/ui/query-system/issue-83479.stderr b/tests/ui/query-system/issue-83479.stderr
index 7cb41f5cb..7cb41f5cb 100644
--- a/src/test/ui/query-system/issue-83479.stderr
+++ b/tests/ui/query-system/issue-83479.stderr
diff --git a/src/test/ui/query-system/query_depth.rs b/tests/ui/query-system/query_depth.rs
index e600c1c08..e600c1c08 100644
--- a/src/test/ui/query-system/query_depth.rs
+++ b/tests/ui/query-system/query_depth.rs
diff --git a/src/test/ui/query-system/query_depth.stderr b/tests/ui/query-system/query_depth.stderr
index 43a18b4e0..43a18b4e0 100644
--- a/src/test/ui/query-system/query_depth.stderr
+++ b/tests/ui/query-system/query_depth.stderr
diff --git a/src/test/ui/query-visibility.rs b/tests/ui/query-visibility.rs
index 09a289d85..09a289d85 100644
--- a/src/test/ui/query-visibility.rs
+++ b/tests/ui/query-visibility.rs
diff --git a/src/test/ui/range/exclusive-range-patterns-2021.rs b/tests/ui/range/exclusive-range-patterns-2021.rs
index de69c9bf2..de69c9bf2 100644
--- a/src/test/ui/range/exclusive-range-patterns-2021.rs
+++ b/tests/ui/range/exclusive-range-patterns-2021.rs
diff --git a/src/test/ui/range/exclusive-range-patterns-2021.stderr b/tests/ui/range/exclusive-range-patterns-2021.stderr
index a96743704..a96743704 100644
--- a/src/test/ui/range/exclusive-range-patterns-2021.stderr
+++ b/tests/ui/range/exclusive-range-patterns-2021.stderr
diff --git a/src/test/ui/range/issue-54505-no-literals.fixed b/tests/ui/range/issue-54505-no-literals.fixed
index 4d8f67182..4d8f67182 100644
--- a/src/test/ui/range/issue-54505-no-literals.fixed
+++ b/tests/ui/range/issue-54505-no-literals.fixed
diff --git a/src/test/ui/range/issue-54505-no-literals.rs b/tests/ui/range/issue-54505-no-literals.rs
index dc21dcbc2..dc21dcbc2 100644
--- a/src/test/ui/range/issue-54505-no-literals.rs
+++ b/tests/ui/range/issue-54505-no-literals.rs
diff --git a/src/test/ui/range/issue-54505-no-literals.stderr b/tests/ui/range/issue-54505-no-literals.stderr
index 4cbf8869d..070dc8445 100644
--- a/src/test/ui/range/issue-54505-no-literals.stderr
+++ b/tests/ui/range/issue-54505-no-literals.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 LL |     take_range(std::ops::Range { start: 0, end: 1 });
    |     ---------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |     |          |
-   |     |          expected reference, found struct `std::ops::Range`
+   |     |          expected reference, found struct `Range`
    |     |          help: consider borrowing here: `&std::ops::Range { start: 0, end: 1 }`
    |     arguments to this function are incorrect
    |
@@ -22,7 +22,7 @@ error[E0308]: mismatched types
 LL |     take_range(::std::ops::Range { start: 0, end: 1 });
    |     ---------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |     |          |
-   |     |          expected reference, found struct `std::ops::Range`
+   |     |          expected reference, found struct `Range`
    |     |          help: consider borrowing here: `&::std::ops::Range { start: 0, end: 1 }`
    |     arguments to this function are incorrect
    |
diff --git a/src/test/ui/range/issue-54505-no-std.rs b/tests/ui/range/issue-54505-no-std.rs
index 9f378b483..9f378b483 100644
--- a/src/test/ui/range/issue-54505-no-std.rs
+++ b/tests/ui/range/issue-54505-no-std.rs
diff --git a/src/test/ui/range/issue-54505-no-std.stderr b/tests/ui/range/issue-54505-no-std.stderr
index 9fb0e54a8..9fb0e54a8 100644
--- a/src/test/ui/range/issue-54505-no-std.stderr
+++ b/tests/ui/range/issue-54505-no-std.stderr
diff --git a/src/test/ui/range/issue-54505.fixed b/tests/ui/range/issue-54505.fixed
index f8298c0b5..f8298c0b5 100644
--- a/src/test/ui/range/issue-54505.fixed
+++ b/tests/ui/range/issue-54505.fixed
diff --git a/src/test/ui/range/issue-54505.rs b/tests/ui/range/issue-54505.rs
index 03673252d..03673252d 100644
--- a/src/test/ui/range/issue-54505.rs
+++ b/tests/ui/range/issue-54505.rs
diff --git a/src/test/ui/range/issue-54505.stderr b/tests/ui/range/issue-54505.stderr
index 38df6e144..9eec16940 100644
--- a/src/test/ui/range/issue-54505.stderr
+++ b/tests/ui/range/issue-54505.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 LL |     take_range(0..1);
    |     ---------- ^^^^
    |     |          |
-   |     |          expected reference, found struct `std::ops::Range`
+   |     |          expected reference, found struct `Range`
    |     |          help: consider borrowing here: `&(0..1)`
    |     arguments to this function are incorrect
    |
diff --git a/src/test/ui/range/issue-73553-misinterp-range-literal.rs b/tests/ui/range/issue-73553-misinterp-range-literal.rs
index e65dba0a0..e65dba0a0 100644
--- a/src/test/ui/range/issue-73553-misinterp-range-literal.rs
+++ b/tests/ui/range/issue-73553-misinterp-range-literal.rs
diff --git a/src/test/ui/range/issue-73553-misinterp-range-literal.stderr b/tests/ui/range/issue-73553-misinterp-range-literal.stderr
index 6badd998f..d08d9b134 100644
--- a/src/test/ui/range/issue-73553-misinterp-range-literal.stderr
+++ b/tests/ui/range/issue-73553-misinterp-range-literal.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 LL |     demo(tell(1)..tell(10));
    |     ---- ^^^^^^^^^^^^^^^^^
    |     |    |
-   |     |    expected reference, found struct `std::ops::Range`
+   |     |    expected `&Range<usize>`, found struct `Range`
    |     |    help: consider borrowing here: `&(tell(1)..tell(10))`
    |     arguments to this function are incorrect
    |
@@ -22,7 +22,7 @@ error[E0308]: mismatched types
 LL |     demo(1..10);
    |     ---- ^^^^^
    |     |    |
-   |     |    expected reference, found struct `std::ops::Range`
+   |     |    expected `&Range<usize>`, found struct `Range`
    |     |    help: consider borrowing here: `&(1..10)`
    |     arguments to this function are incorrect
    |
diff --git a/src/test/ui/range/range-1.rs b/tests/ui/range/range-1.rs
index 192426fe2..192426fe2 100644
--- a/src/test/ui/range/range-1.rs
+++ b/tests/ui/range/range-1.rs
diff --git a/src/test/ui/range/range-1.stderr b/tests/ui/range/range-1.stderr
index aaea91ce0..395639036 100644
--- a/src/test/ui/range/range-1.stderr
+++ b/tests/ui/range/range-1.stderr
@@ -32,9 +32,6 @@ LL |     let range = *arr..;
    = help: the trait `Sized` is not implemented for `[{integer}]`
 note: required by a bound in `RangeFrom`
   --> $SRC_DIR/core/src/ops/range.rs:LL:COL
-   |
-LL | pub struct RangeFrom<Idx> {
-   |                      ^^^ required by this bound in `RangeFrom`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/range/range-inclusive-pattern-precedence.fixed b/tests/ui/range/range-inclusive-pattern-precedence.fixed
index 38104bab7..38104bab7 100644
--- a/src/test/ui/range/range-inclusive-pattern-precedence.fixed
+++ b/tests/ui/range/range-inclusive-pattern-precedence.fixed
diff --git a/src/test/ui/range/range-inclusive-pattern-precedence.rs b/tests/ui/range/range-inclusive-pattern-precedence.rs
index b294e436f..b294e436f 100644
--- a/src/test/ui/range/range-inclusive-pattern-precedence.rs
+++ b/tests/ui/range/range-inclusive-pattern-precedence.rs
diff --git a/src/test/ui/range/range-inclusive-pattern-precedence.stderr b/tests/ui/range/range-inclusive-pattern-precedence.stderr
index f6788d034..f6788d034 100644
--- a/src/test/ui/range/range-inclusive-pattern-precedence.stderr
+++ b/tests/ui/range/range-inclusive-pattern-precedence.stderr
diff --git a/src/test/ui/range/range-inclusive-pattern-precedence2.rs b/tests/ui/range/range-inclusive-pattern-precedence2.rs
index bede9c579..bede9c579 100644
--- a/src/test/ui/range/range-inclusive-pattern-precedence2.rs
+++ b/tests/ui/range/range-inclusive-pattern-precedence2.rs
diff --git a/src/test/ui/range/range-inclusive-pattern-precedence2.stderr b/tests/ui/range/range-inclusive-pattern-precedence2.stderr
index bb4e3a13a..bb4e3a13a 100644
--- a/src/test/ui/range/range-inclusive-pattern-precedence2.stderr
+++ b/tests/ui/range/range-inclusive-pattern-precedence2.stderr
diff --git a/tests/ui/range/range-pattern-out-of-bounds-issue-68972.rs b/tests/ui/range/range-pattern-out-of-bounds-issue-68972.rs
new file mode 100644
index 000000000..d02caff1f
--- /dev/null
+++ b/tests/ui/range/range-pattern-out-of-bounds-issue-68972.rs
@@ -0,0 +1,13 @@
+#![feature(exclusive_range_pattern)]
+#![allow(unreachable_patterns)]
+fn main() {
+    match 0u8 {
+        251..257 => {}
+        //~^ ERROR literal out of range
+        //~| ERROR literal out of range
+        251..=256 => {}
+        //~^ ERROR literal out of range
+        //~| ERROR literal out of range
+        _ => {}
+    }
+}
diff --git a/tests/ui/range/range-pattern-out-of-bounds-issue-68972.stderr b/tests/ui/range/range-pattern-out-of-bounds-issue-68972.stderr
new file mode 100644
index 000000000..7b8309b9b
--- /dev/null
+++ b/tests/ui/range/range-pattern-out-of-bounds-issue-68972.stderr
@@ -0,0 +1,26 @@
+error: literal out of range for `u8`
+  --> $DIR/range-pattern-out-of-bounds-issue-68972.rs:5:14
+   |
+LL |         251..257 => {}
+   |              ^^^ this value doesn't fit in `u8` whose maximum value is `255`
+
+error: literal out of range for `u8`
+  --> $DIR/range-pattern-out-of-bounds-issue-68972.rs:8:15
+   |
+LL |         251..=256 => {}
+   |               ^^^ this value doesn't fit in `u8` whose maximum value is `255`
+
+error: literal out of range for `u8`
+  --> $DIR/range-pattern-out-of-bounds-issue-68972.rs:5:14
+   |
+LL |         251..257 => {}
+   |              ^^^ this value doesn't fit in `u8` whose maximum value is `255`
+
+error: literal out of range for `u8`
+  --> $DIR/range-pattern-out-of-bounds-issue-68972.rs:8:15
+   |
+LL |         251..=256 => {}
+   |               ^^^ this value doesn't fit in `u8` whose maximum value is `255`
+
+error: aborting due to 4 previous errors
+
diff --git a/src/test/ui/range/range_traits-1.rs b/tests/ui/range/range_traits-1.rs
index e28e47435..e28e47435 100644
--- a/src/test/ui/range/range_traits-1.rs
+++ b/tests/ui/range/range_traits-1.rs
diff --git a/src/test/ui/range/range_traits-1.stderr b/tests/ui/range/range_traits-1.stderr
index 617afc995..617afc995 100644
--- a/src/test/ui/range/range_traits-1.stderr
+++ b/tests/ui/range/range_traits-1.stderr
diff --git a/src/test/ui/range/range_traits-2.rs b/tests/ui/range/range_traits-2.rs
index 234d7a64d..234d7a64d 100644
--- a/src/test/ui/range/range_traits-2.rs
+++ b/tests/ui/range/range_traits-2.rs
diff --git a/src/test/ui/range/range_traits-2.stderr b/tests/ui/range/range_traits-2.stderr
index 61facba53..61facba53 100644
--- a/src/test/ui/range/range_traits-2.stderr
+++ b/tests/ui/range/range_traits-2.stderr
diff --git a/src/test/ui/range/range_traits-3.rs b/tests/ui/range/range_traits-3.rs
index 2d597cce5..2d597cce5 100644
--- a/src/test/ui/range/range_traits-3.rs
+++ b/tests/ui/range/range_traits-3.rs
diff --git a/src/test/ui/range/range_traits-3.stderr b/tests/ui/range/range_traits-3.stderr
index e54d17b32..e54d17b32 100644
--- a/src/test/ui/range/range_traits-3.stderr
+++ b/tests/ui/range/range_traits-3.stderr
diff --git a/src/test/ui/range/range_traits-4.rs b/tests/ui/range/range_traits-4.rs
index b8e88559b..b8e88559b 100644
--- a/src/test/ui/range/range_traits-4.rs
+++ b/tests/ui/range/range_traits-4.rs
diff --git a/src/test/ui/range/range_traits-5.rs b/tests/ui/range/range_traits-5.rs
index 4aec7a415..4aec7a415 100644
--- a/src/test/ui/range/range_traits-5.rs
+++ b/tests/ui/range/range_traits-5.rs
diff --git a/src/test/ui/range/range_traits-6.rs b/tests/ui/range/range_traits-6.rs
index bce106bbf..bce106bbf 100644
--- a/src/test/ui/range/range_traits-6.rs
+++ b/tests/ui/range/range_traits-6.rs
diff --git a/src/test/ui/range/range_traits-6.stderr b/tests/ui/range/range_traits-6.stderr
index addc525f1..addc525f1 100644
--- a/src/test/ui/range/range_traits-6.stderr
+++ b/tests/ui/range/range_traits-6.stderr
diff --git a/src/test/ui/range/range_traits-7.rs b/tests/ui/range/range_traits-7.rs
index c7b310562..c7b310562 100644
--- a/src/test/ui/range/range_traits-7.rs
+++ b/tests/ui/range/range_traits-7.rs
diff --git a/src/test/ui/range_inclusive.rs b/tests/ui/range_inclusive.rs
index c9107d24e..c9107d24e 100644
--- a/src/test/ui/range_inclusive.rs
+++ b/tests/ui/range_inclusive.rs
diff --git a/src/test/ui/raw-ref-op/feature-raw-ref-op.rs b/tests/ui/raw-ref-op/feature-raw-ref-op.rs
index 0a44b1cde..0a44b1cde 100644
--- a/src/test/ui/raw-ref-op/feature-raw-ref-op.rs
+++ b/tests/ui/raw-ref-op/feature-raw-ref-op.rs
diff --git a/src/test/ui/raw-ref-op/feature-raw-ref-op.stderr b/tests/ui/raw-ref-op/feature-raw-ref-op.stderr
index 1e5fd84ff..1e5fd84ff 100644
--- a/src/test/ui/raw-ref-op/feature-raw-ref-op.stderr
+++ b/tests/ui/raw-ref-op/feature-raw-ref-op.stderr
diff --git a/src/test/ui/raw-ref-op/raw-ref-op.rs b/tests/ui/raw-ref-op/raw-ref-op.rs
index 0c6e23a00..0c6e23a00 100644
--- a/src/test/ui/raw-ref-op/raw-ref-op.rs
+++ b/tests/ui/raw-ref-op/raw-ref-op.rs
diff --git a/src/test/ui/raw-ref-op/raw-ref-temp-deref.rs b/tests/ui/raw-ref-op/raw-ref-temp-deref.rs
index 2e075a1b9..2e075a1b9 100644
--- a/src/test/ui/raw-ref-op/raw-ref-temp-deref.rs
+++ b/tests/ui/raw-ref-op/raw-ref-temp-deref.rs
diff --git a/src/test/ui/raw-ref-op/raw-ref-temp.rs b/tests/ui/raw-ref-op/raw-ref-temp.rs
index 10e47cb34..10e47cb34 100644
--- a/src/test/ui/raw-ref-op/raw-ref-temp.rs
+++ b/tests/ui/raw-ref-op/raw-ref-temp.rs
diff --git a/src/test/ui/raw-ref-op/raw-ref-temp.stderr b/tests/ui/raw-ref-op/raw-ref-temp.stderr
index b96661625..b96661625 100644
--- a/src/test/ui/raw-ref-op/raw-ref-temp.stderr
+++ b/tests/ui/raw-ref-op/raw-ref-temp.stderr
diff --git a/src/test/ui/raw-ref-op/unusual_locations.rs b/tests/ui/raw-ref-op/unusual_locations.rs
index 6bf37408a..6bf37408a 100644
--- a/src/test/ui/raw-ref-op/unusual_locations.rs
+++ b/tests/ui/raw-ref-op/unusual_locations.rs
diff --git a/src/test/ui/raw-str.rs b/tests/ui/raw-str.rs
index 0916dddbb..0916dddbb 100644
--- a/src/test/ui/raw-str.rs
+++ b/tests/ui/raw-str.rs
diff --git a/src/test/ui/reachable-unnameable-type-alias.rs b/tests/ui/reachable-unnameable-type-alias.rs
index 461355f87..461355f87 100644
--- a/src/test/ui/reachable-unnameable-type-alias.rs
+++ b/tests/ui/reachable-unnameable-type-alias.rs
diff --git a/src/test/ui/reachable/README.md b/tests/ui/reachable/README.md
index 8bed5fba7..8bed5fba7 100644
--- a/src/test/ui/reachable/README.md
+++ b/tests/ui/reachable/README.md
diff --git a/src/test/ui/issues/auxiliary/issue-11225-1.rs b/tests/ui/reachable/auxiliary/issue-11225-1.rs
index 2c6f899a0..2c6f899a0 100644
--- a/src/test/ui/issues/auxiliary/issue-11225-1.rs
+++ b/tests/ui/reachable/auxiliary/issue-11225-1.rs
diff --git a/src/test/ui/issues/auxiliary/issue-11225-2.rs b/tests/ui/reachable/auxiliary/issue-11225-2.rs
index 4381f0a4e..4381f0a4e 100644
--- a/src/test/ui/issues/auxiliary/issue-11225-2.rs
+++ b/tests/ui/reachable/auxiliary/issue-11225-2.rs
diff --git a/src/test/ui/issues/auxiliary/issue-11225-3.rs b/tests/ui/reachable/auxiliary/issue-11225-3.rs
index 266e42a10..266e42a10 100644
--- a/src/test/ui/issues/auxiliary/issue-11225-3.rs
+++ b/tests/ui/reachable/auxiliary/issue-11225-3.rs
diff --git a/src/test/ui/reachable/auxiliary/unreachable_variant.rs b/tests/ui/reachable/auxiliary/unreachable_variant.rs
index 4e94a4b5e..4e94a4b5e 100644
--- a/src/test/ui/reachable/auxiliary/unreachable_variant.rs
+++ b/tests/ui/reachable/auxiliary/unreachable_variant.rs
diff --git a/src/test/ui/reachable/expr_add.rs b/tests/ui/reachable/expr_add.rs
index b45e5daf4..b45e5daf4 100644
--- a/src/test/ui/reachable/expr_add.rs
+++ b/tests/ui/reachable/expr_add.rs
diff --git a/src/test/ui/reachable/expr_add.stderr b/tests/ui/reachable/expr_add.stderr
index 692bd20f5..692bd20f5 100644
--- a/src/test/ui/reachable/expr_add.stderr
+++ b/tests/ui/reachable/expr_add.stderr
diff --git a/src/test/ui/reachable/expr_again.rs b/tests/ui/reachable/expr_again.rs
index 604932133..604932133 100644
--- a/src/test/ui/reachable/expr_again.rs
+++ b/tests/ui/reachable/expr_again.rs
diff --git a/src/test/ui/reachable/expr_again.stderr b/tests/ui/reachable/expr_again.stderr
index a3c54e135..a3c54e135 100644
--- a/src/test/ui/reachable/expr_again.stderr
+++ b/tests/ui/reachable/expr_again.stderr
diff --git a/src/test/ui/reachable/expr_andand.rs b/tests/ui/reachable/expr_andand.rs
index d37eb0a3b..d37eb0a3b 100644
--- a/src/test/ui/reachable/expr_andand.rs
+++ b/tests/ui/reachable/expr_andand.rs
diff --git a/src/test/ui/reachable/expr_array.rs b/tests/ui/reachable/expr_array.rs
index e6bdb9705..e6bdb9705 100644
--- a/src/test/ui/reachable/expr_array.rs
+++ b/tests/ui/reachable/expr_array.rs
diff --git a/src/test/ui/reachable/expr_array.stderr b/tests/ui/reachable/expr_array.stderr
index e144d7184..e144d7184 100644
--- a/src/test/ui/reachable/expr_array.stderr
+++ b/tests/ui/reachable/expr_array.stderr
diff --git a/src/test/ui/reachable/expr_assign.rs b/tests/ui/reachable/expr_assign.rs
index e547f75e2..e547f75e2 100644
--- a/src/test/ui/reachable/expr_assign.rs
+++ b/tests/ui/reachable/expr_assign.rs
diff --git a/src/test/ui/reachable/expr_assign.stderr b/tests/ui/reachable/expr_assign.stderr
index c51156b3f..c51156b3f 100644
--- a/src/test/ui/reachable/expr_assign.stderr
+++ b/tests/ui/reachable/expr_assign.stderr
diff --git a/src/test/ui/reachable/expr_block.rs b/tests/ui/reachable/expr_block.rs
index 136bccce8..136bccce8 100644
--- a/src/test/ui/reachable/expr_block.rs
+++ b/tests/ui/reachable/expr_block.rs
diff --git a/src/test/ui/reachable/expr_block.stderr b/tests/ui/reachable/expr_block.stderr
index d5f248a24..d5f248a24 100644
--- a/src/test/ui/reachable/expr_block.stderr
+++ b/tests/ui/reachable/expr_block.stderr
diff --git a/src/test/ui/reachable/expr_box.rs b/tests/ui/reachable/expr_box.rs
index 00328ea01..00328ea01 100644
--- a/src/test/ui/reachable/expr_box.rs
+++ b/tests/ui/reachable/expr_box.rs
diff --git a/src/test/ui/reachable/expr_box.stderr b/tests/ui/reachable/expr_box.stderr
index ea6472cbe..ea6472cbe 100644
--- a/src/test/ui/reachable/expr_box.stderr
+++ b/tests/ui/reachable/expr_box.stderr
diff --git a/src/test/ui/reachable/expr_call.rs b/tests/ui/reachable/expr_call.rs
index 1eaa96c3c..1eaa96c3c 100644
--- a/src/test/ui/reachable/expr_call.rs
+++ b/tests/ui/reachable/expr_call.rs
diff --git a/src/test/ui/reachable/expr_call.stderr b/tests/ui/reachable/expr_call.stderr
index a5ad9a329..a5ad9a329 100644
--- a/src/test/ui/reachable/expr_call.stderr
+++ b/tests/ui/reachable/expr_call.stderr
diff --git a/src/test/ui/reachable/expr_cast.rs b/tests/ui/reachable/expr_cast.rs
index e8e477ea4..e8e477ea4 100644
--- a/src/test/ui/reachable/expr_cast.rs
+++ b/tests/ui/reachable/expr_cast.rs
diff --git a/src/test/ui/reachable/expr_cast.stderr b/tests/ui/reachable/expr_cast.stderr
index 6643f1784..6643f1784 100644
--- a/src/test/ui/reachable/expr_cast.stderr
+++ b/tests/ui/reachable/expr_cast.stderr
diff --git a/src/test/ui/reachable/expr_if.rs b/tests/ui/reachable/expr_if.rs
index 3c04eaf48..3c04eaf48 100644
--- a/src/test/ui/reachable/expr_if.rs
+++ b/tests/ui/reachable/expr_if.rs
diff --git a/src/test/ui/reachable/expr_if.stderr b/tests/ui/reachable/expr_if.stderr
index ebd0b5a3e..ebd0b5a3e 100644
--- a/src/test/ui/reachable/expr_if.stderr
+++ b/tests/ui/reachable/expr_if.stderr
diff --git a/src/test/ui/reachable/expr_loop.rs b/tests/ui/reachable/expr_loop.rs
index 7eab6f7bb..7eab6f7bb 100644
--- a/src/test/ui/reachable/expr_loop.rs
+++ b/tests/ui/reachable/expr_loop.rs
diff --git a/src/test/ui/reachable/expr_loop.stderr b/tests/ui/reachable/expr_loop.stderr
index 918584686..918584686 100644
--- a/src/test/ui/reachable/expr_loop.stderr
+++ b/tests/ui/reachable/expr_loop.stderr
diff --git a/src/test/ui/reachable/expr_match.rs b/tests/ui/reachable/expr_match.rs
index 2fd26b54e..2fd26b54e 100644
--- a/src/test/ui/reachable/expr_match.rs
+++ b/tests/ui/reachable/expr_match.rs
diff --git a/src/test/ui/reachable/expr_match.stderr b/tests/ui/reachable/expr_match.stderr
index d15208609..d15208609 100644
--- a/src/test/ui/reachable/expr_match.stderr
+++ b/tests/ui/reachable/expr_match.stderr
diff --git a/src/test/ui/reachable/expr_method.rs b/tests/ui/reachable/expr_method.rs
index d917df05b..d917df05b 100644
--- a/src/test/ui/reachable/expr_method.rs
+++ b/tests/ui/reachable/expr_method.rs
diff --git a/src/test/ui/reachable/expr_method.stderr b/tests/ui/reachable/expr_method.stderr
index 41c3b8a39..41c3b8a39 100644
--- a/src/test/ui/reachable/expr_method.stderr
+++ b/tests/ui/reachable/expr_method.stderr
diff --git a/src/test/ui/reachable/expr_oror.rs b/tests/ui/reachable/expr_oror.rs
index e95062de4..e95062de4 100644
--- a/src/test/ui/reachable/expr_oror.rs
+++ b/tests/ui/reachable/expr_oror.rs
diff --git a/src/test/ui/reachable/expr_repeat.rs b/tests/ui/reachable/expr_repeat.rs
index 0fd13c6cb..0fd13c6cb 100644
--- a/src/test/ui/reachable/expr_repeat.rs
+++ b/tests/ui/reachable/expr_repeat.rs
diff --git a/src/test/ui/reachable/expr_repeat.stderr b/tests/ui/reachable/expr_repeat.stderr
index defa87046..defa87046 100644
--- a/src/test/ui/reachable/expr_repeat.stderr
+++ b/tests/ui/reachable/expr_repeat.stderr
diff --git a/src/test/ui/reachable/expr_return.rs b/tests/ui/reachable/expr_return.rs
index 0fc43f450..0fc43f450 100644
--- a/src/test/ui/reachable/expr_return.rs
+++ b/tests/ui/reachable/expr_return.rs
diff --git a/src/test/ui/reachable/expr_return.stderr b/tests/ui/reachable/expr_return.stderr
index e1bef80ae..e1bef80ae 100644
--- a/src/test/ui/reachable/expr_return.stderr
+++ b/tests/ui/reachable/expr_return.stderr
diff --git a/src/test/ui/reachable/expr_return_in_macro.rs b/tests/ui/reachable/expr_return_in_macro.rs
index 4e57618bf..4e57618bf 100644
--- a/src/test/ui/reachable/expr_return_in_macro.rs
+++ b/tests/ui/reachable/expr_return_in_macro.rs
diff --git a/src/test/ui/reachable/expr_return_in_macro.stderr b/tests/ui/reachable/expr_return_in_macro.stderr
index 3c562a7ee..3c562a7ee 100644
--- a/src/test/ui/reachable/expr_return_in_macro.stderr
+++ b/tests/ui/reachable/expr_return_in_macro.stderr
diff --git a/src/test/ui/reachable/expr_struct.rs b/tests/ui/reachable/expr_struct.rs
index 31ab40582..31ab40582 100644
--- a/src/test/ui/reachable/expr_struct.rs
+++ b/tests/ui/reachable/expr_struct.rs
diff --git a/src/test/ui/reachable/expr_struct.stderr b/tests/ui/reachable/expr_struct.stderr
index 36b070456..36b070456 100644
--- a/src/test/ui/reachable/expr_struct.stderr
+++ b/tests/ui/reachable/expr_struct.stderr
diff --git a/src/test/ui/reachable/expr_tup.rs b/tests/ui/reachable/expr_tup.rs
index 90d4382e2..90d4382e2 100644
--- a/src/test/ui/reachable/expr_tup.rs
+++ b/tests/ui/reachable/expr_tup.rs
diff --git a/src/test/ui/reachable/expr_tup.stderr b/tests/ui/reachable/expr_tup.stderr
index 5ea6bf4ab..5ea6bf4ab 100644
--- a/src/test/ui/reachable/expr_tup.stderr
+++ b/tests/ui/reachable/expr_tup.stderr
diff --git a/src/test/ui/reachable/expr_type.rs b/tests/ui/reachable/expr_type.rs
index 1ceb2f859..1ceb2f859 100644
--- a/src/test/ui/reachable/expr_type.rs
+++ b/tests/ui/reachable/expr_type.rs
diff --git a/src/test/ui/reachable/expr_type.stderr b/tests/ui/reachable/expr_type.stderr
index 3cb4a32e0..3cb4a32e0 100644
--- a/src/test/ui/reachable/expr_type.stderr
+++ b/tests/ui/reachable/expr_type.stderr
diff --git a/src/test/ui/reachable/expr_unary.rs b/tests/ui/reachable/expr_unary.rs
index 190c7447d..190c7447d 100644
--- a/src/test/ui/reachable/expr_unary.rs
+++ b/tests/ui/reachable/expr_unary.rs
diff --git a/src/test/ui/reachable/expr_unary.stderr b/tests/ui/reachable/expr_unary.stderr
index 0a763087c..0a763087c 100644
--- a/src/test/ui/reachable/expr_unary.stderr
+++ b/tests/ui/reachable/expr_unary.stderr
diff --git a/src/test/ui/reachable/expr_while.rs b/tests/ui/reachable/expr_while.rs
index 5005f3833..5005f3833 100644
--- a/src/test/ui/reachable/expr_while.rs
+++ b/tests/ui/reachable/expr_while.rs
diff --git a/src/test/ui/reachable/expr_while.stderr b/tests/ui/reachable/expr_while.stderr
index b1859f619..b1859f619 100644
--- a/src/test/ui/reachable/expr_while.stderr
+++ b/tests/ui/reachable/expr_while.stderr
diff --git a/src/test/ui/issues/issue-11225-1.rs b/tests/ui/reachable/issue-11225-1.rs
index d1f2ea5e7..d1f2ea5e7 100644
--- a/src/test/ui/issues/issue-11225-1.rs
+++ b/tests/ui/reachable/issue-11225-1.rs
diff --git a/src/test/ui/issues/issue-11225-2.rs b/tests/ui/reachable/issue-11225-2.rs
index d41c75443..d41c75443 100644
--- a/src/test/ui/issues/issue-11225-2.rs
+++ b/tests/ui/reachable/issue-11225-2.rs
diff --git a/src/test/ui/issues/issue-11225-3.rs b/tests/ui/reachable/issue-11225-3.rs
index e69496baa..e69496baa 100644
--- a/src/test/ui/issues/issue-11225-3.rs
+++ b/tests/ui/reachable/issue-11225-3.rs
diff --git a/src/test/ui/reachable/unreachable-arm.rs b/tests/ui/reachable/unreachable-arm.rs
index 3277bf0d5..3277bf0d5 100644
--- a/src/test/ui/reachable/unreachable-arm.rs
+++ b/tests/ui/reachable/unreachable-arm.rs
diff --git a/src/test/ui/reachable/unreachable-arm.stderr b/tests/ui/reachable/unreachable-arm.stderr
index 1cbea8288..1cbea8288 100644
--- a/src/test/ui/reachable/unreachable-arm.stderr
+++ b/tests/ui/reachable/unreachable-arm.stderr
diff --git a/src/test/ui/reachable/unreachable-code-ret.rs b/tests/ui/reachable/unreachable-code-ret.rs
index fad35794f..fad35794f 100644
--- a/src/test/ui/reachable/unreachable-code-ret.rs
+++ b/tests/ui/reachable/unreachable-code-ret.rs
diff --git a/src/test/ui/reachable/unreachable-code-ret.stderr b/tests/ui/reachable/unreachable-code-ret.stderr
index 263a1b5a9..263a1b5a9 100644
--- a/src/test/ui/reachable/unreachable-code-ret.stderr
+++ b/tests/ui/reachable/unreachable-code-ret.stderr
diff --git a/src/test/ui/reachable/unreachable-code.rs b/tests/ui/reachable/unreachable-code.rs
index ad0dc8a8b..ad0dc8a8b 100644
--- a/src/test/ui/reachable/unreachable-code.rs
+++ b/tests/ui/reachable/unreachable-code.rs
diff --git a/src/test/ui/reachable/unreachable-code.stderr b/tests/ui/reachable/unreachable-code.stderr
index cb1b760c2..cb1b760c2 100644
--- a/src/test/ui/reachable/unreachable-code.stderr
+++ b/tests/ui/reachable/unreachable-code.stderr
diff --git a/src/test/ui/reachable/unreachable-in-call.rs b/tests/ui/reachable/unreachable-in-call.rs
index dd94e79f4..dd94e79f4 100644
--- a/src/test/ui/reachable/unreachable-in-call.rs
+++ b/tests/ui/reachable/unreachable-in-call.rs
diff --git a/src/test/ui/reachable/unreachable-in-call.stderr b/tests/ui/reachable/unreachable-in-call.stderr
index cdfa79bf8..cdfa79bf8 100644
--- a/src/test/ui/reachable/unreachable-in-call.stderr
+++ b/tests/ui/reachable/unreachable-in-call.stderr
diff --git a/src/test/ui/reachable/unreachable-loop-patterns.rs b/tests/ui/reachable/unreachable-loop-patterns.rs
index e9cef5f47..e9cef5f47 100644
--- a/src/test/ui/reachable/unreachable-loop-patterns.rs
+++ b/tests/ui/reachable/unreachable-loop-patterns.rs
diff --git a/src/test/ui/reachable/unreachable-loop-patterns.stderr b/tests/ui/reachable/unreachable-loop-patterns.stderr
index 80ffa5d73..80ffa5d73 100644
--- a/src/test/ui/reachable/unreachable-loop-patterns.stderr
+++ b/tests/ui/reachable/unreachable-loop-patterns.stderr
diff --git a/src/test/ui/reachable/unreachable-try-pattern.rs b/tests/ui/reachable/unreachable-try-pattern.rs
index 23360e73f..23360e73f 100644
--- a/src/test/ui/reachable/unreachable-try-pattern.rs
+++ b/tests/ui/reachable/unreachable-try-pattern.rs
diff --git a/src/test/ui/reachable/unreachable-try-pattern.stderr b/tests/ui/reachable/unreachable-try-pattern.stderr
index 8f3e23119..8f3e23119 100644
--- a/src/test/ui/reachable/unreachable-try-pattern.stderr
+++ b/tests/ui/reachable/unreachable-try-pattern.stderr
diff --git a/src/test/ui/reachable/unreachable-variant.rs b/tests/ui/reachable/unreachable-variant.rs
index 008c2d476..008c2d476 100644
--- a/src/test/ui/reachable/unreachable-variant.rs
+++ b/tests/ui/reachable/unreachable-variant.rs
diff --git a/src/test/ui/reachable/unreachable-variant.stderr b/tests/ui/reachable/unreachable-variant.stderr
index 6c27a2756..6c27a2756 100644
--- a/src/test/ui/reachable/unreachable-variant.stderr
+++ b/tests/ui/reachable/unreachable-variant.stderr
diff --git a/src/test/ui/reachable/unwarned-match-on-never.rs b/tests/ui/reachable/unwarned-match-on-never.rs
index 71f8fe3a7..71f8fe3a7 100644
--- a/src/test/ui/reachable/unwarned-match-on-never.rs
+++ b/tests/ui/reachable/unwarned-match-on-never.rs
diff --git a/src/test/ui/reachable/unwarned-match-on-never.stderr b/tests/ui/reachable/unwarned-match-on-never.stderr
index a296d2a05..a296d2a05 100644
--- a/src/test/ui/reachable/unwarned-match-on-never.stderr
+++ b/tests/ui/reachable/unwarned-match-on-never.stderr
diff --git a/src/test/ui/realloc-16687.rs b/tests/ui/realloc-16687.rs
index 92d98c16c..92d98c16c 100644
--- a/src/test/ui/realloc-16687.rs
+++ b/tests/ui/realloc-16687.rs
diff --git a/src/test/ui/reassign-ref-mut.rs b/tests/ui/reassign-ref-mut.rs
index d6d41e959..d6d41e959 100644
--- a/src/test/ui/reassign-ref-mut.rs
+++ b/tests/ui/reassign-ref-mut.rs
diff --git a/src/test/ui/reassign-ref-mut.stderr b/tests/ui/reassign-ref-mut.stderr
index e623578e0..e623578e0 100644
--- a/src/test/ui/reassign-ref-mut.stderr
+++ b/tests/ui/reassign-ref-mut.stderr
diff --git a/src/test/ui/recursion/auxiliary/recursive_reexports.rs b/tests/ui/recursion/auxiliary/recursive_reexports.rs
index f98fa7100..f98fa7100 100644
--- a/src/test/ui/recursion/auxiliary/recursive_reexports.rs
+++ b/tests/ui/recursion/auxiliary/recursive_reexports.rs
diff --git a/src/test/ui/recursion/instantiable.rs b/tests/ui/recursion/instantiable.rs
index ad0cf3f4a..ad0cf3f4a 100644
--- a/src/test/ui/recursion/instantiable.rs
+++ b/tests/ui/recursion/instantiable.rs
diff --git a/src/test/ui/recursion/issue-26548-recursion-via-normalize.rs b/tests/ui/recursion/issue-26548-recursion-via-normalize.rs
index 91958dffc..91958dffc 100644
--- a/src/test/ui/recursion/issue-26548-recursion-via-normalize.rs
+++ b/tests/ui/recursion/issue-26548-recursion-via-normalize.rs
diff --git a/src/test/ui/recursion/issue-26548-recursion-via-normalize.stderr b/tests/ui/recursion/issue-26548-recursion-via-normalize.stderr
index a75097cdb..a75097cdb 100644
--- a/src/test/ui/recursion/issue-26548-recursion-via-normalize.stderr
+++ b/tests/ui/recursion/issue-26548-recursion-via-normalize.stderr
diff --git a/src/test/ui/recursion/issue-38591-non-regular-dropck-recursion.polonius.stderr b/tests/ui/recursion/issue-38591-non-regular-dropck-recursion.polonius.stderr
index 4b4fc4fb7..4b4fc4fb7 100644
--- a/src/test/ui/recursion/issue-38591-non-regular-dropck-recursion.polonius.stderr
+++ b/tests/ui/recursion/issue-38591-non-regular-dropck-recursion.polonius.stderr
diff --git a/src/test/ui/recursion/issue-38591-non-regular-dropck-recursion.rs b/tests/ui/recursion/issue-38591-non-regular-dropck-recursion.rs
index c9e93174e..c9e93174e 100644
--- a/src/test/ui/recursion/issue-38591-non-regular-dropck-recursion.rs
+++ b/tests/ui/recursion/issue-38591-non-regular-dropck-recursion.rs
diff --git a/src/test/ui/recursion/issue-38591-non-regular-dropck-recursion.stderr b/tests/ui/recursion/issue-38591-non-regular-dropck-recursion.stderr
index 1da29be43..002dfe115 100644
--- a/src/test/ui/recursion/issue-38591-non-regular-dropck-recursion.stderr
+++ b/tests/ui/recursion/issue-38591-non-regular-dropck-recursion.stderr
@@ -8,3 +8,4 @@ LL | fn f(x: S<u32>) {}
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0320`.
diff --git a/src/test/ui/recursion/issue-83150.rs b/tests/ui/recursion/issue-83150.rs
index 38353d161..38353d161 100644
--- a/src/test/ui/recursion/issue-83150.rs
+++ b/tests/ui/recursion/issue-83150.rs
diff --git a/src/test/ui/recursion/issue-83150.stderr b/tests/ui/recursion/issue-83150.stderr
index dde8ad1b6..dde8ad1b6 100644
--- a/src/test/ui/recursion/issue-83150.stderr
+++ b/tests/ui/recursion/issue-83150.stderr
diff --git a/src/test/ui/recursion/issue-86784.rs b/tests/ui/recursion/issue-86784.rs
index 34f4aaedb..34f4aaedb 100644
--- a/src/test/ui/recursion/issue-86784.rs
+++ b/tests/ui/recursion/issue-86784.rs
diff --git a/src/test/ui/recursion/issue-95134.rs b/tests/ui/recursion/issue-95134.rs
index fdc4d5369..fdc4d5369 100644
--- a/src/test/ui/recursion/issue-95134.rs
+++ b/tests/ui/recursion/issue-95134.rs
diff --git a/src/test/ui/recursion/recursion.polonius.stderr b/tests/ui/recursion/recursion.polonius.stderr
index c727fe551..c727fe551 100644
--- a/src/test/ui/recursion/recursion.polonius.stderr
+++ b/tests/ui/recursion/recursion.polonius.stderr
diff --git a/src/test/ui/recursion/recursion.rs b/tests/ui/recursion/recursion.rs
index b3ba0ec3a..b3ba0ec3a 100644
--- a/src/test/ui/recursion/recursion.rs
+++ b/tests/ui/recursion/recursion.rs
diff --git a/src/test/ui/recursion/recursion.stderr b/tests/ui/recursion/recursion.stderr
index cf0809537..cf0809537 100644
--- a/src/test/ui/recursion/recursion.stderr
+++ b/tests/ui/recursion/recursion.stderr
diff --git a/src/test/ui/recursion/recursive-enum.rs b/tests/ui/recursion/recursive-enum.rs
index 32e707607..32e707607 100644
--- a/src/test/ui/recursion/recursive-enum.rs
+++ b/tests/ui/recursion/recursive-enum.rs
diff --git a/src/test/ui/recursion/recursive-enum.stderr b/tests/ui/recursion/recursive-enum.stderr
index d662d1022..d662d1022 100644
--- a/src/test/ui/recursion/recursive-enum.stderr
+++ b/tests/ui/recursion/recursive-enum.stderr
diff --git a/src/test/ui/recursion/recursive-reexports.rs b/tests/ui/recursion/recursive-reexports.rs
index 0e17f2251..0e17f2251 100644
--- a/src/test/ui/recursion/recursive-reexports.rs
+++ b/tests/ui/recursion/recursive-reexports.rs
diff --git a/src/test/ui/recursion/recursive-reexports.stderr b/tests/ui/recursion/recursive-reexports.stderr
index f39d0a0d5..f39d0a0d5 100644
--- a/src/test/ui/recursion/recursive-reexports.stderr
+++ b/tests/ui/recursion/recursive-reexports.stderr
diff --git a/src/test/ui/recursion/recursive-requirements.rs b/tests/ui/recursion/recursive-requirements.rs
index 9cfbee5f1..9cfbee5f1 100644
--- a/src/test/ui/recursion/recursive-requirements.rs
+++ b/tests/ui/recursion/recursive-requirements.rs
diff --git a/src/test/ui/recursion/recursive-requirements.stderr b/tests/ui/recursion/recursive-requirements.stderr
index 8ee154ce5..8ee154ce5 100644
--- a/src/test/ui/recursion/recursive-requirements.stderr
+++ b/tests/ui/recursion/recursive-requirements.stderr
diff --git a/src/test/ui/recursion/recursive-static-definition.rs b/tests/ui/recursion/recursive-static-definition.rs
index f59ef7316..f59ef7316 100644
--- a/src/test/ui/recursion/recursive-static-definition.rs
+++ b/tests/ui/recursion/recursive-static-definition.rs
diff --git a/src/test/ui/recursion/recursive-static-definition.stderr b/tests/ui/recursion/recursive-static-definition.stderr
index 135976145..135976145 100644
--- a/src/test/ui/recursion/recursive-static-definition.stderr
+++ b/tests/ui/recursion/recursive-static-definition.stderr
diff --git a/src/test/ui/recursion/recursive-types-are-not-uninhabited.rs b/tests/ui/recursion/recursive-types-are-not-uninhabited.rs
index 448930363..448930363 100644
--- a/src/test/ui/recursion/recursive-types-are-not-uninhabited.rs
+++ b/tests/ui/recursion/recursive-types-are-not-uninhabited.rs
diff --git a/tests/ui/recursion/recursive-types-are-not-uninhabited.stderr b/tests/ui/recursion/recursive-types-are-not-uninhabited.stderr
new file mode 100644
index 000000000..1b4d80d90
--- /dev/null
+++ b/tests/ui/recursion/recursive-types-are-not-uninhabited.stderr
@@ -0,0 +1,17 @@
+error[E0005]: refutable pattern in local binding
+  --> $DIR/recursive-types-are-not-uninhabited.rs:6:9
+   |
+LL |     let Ok(x) = res;
+   |         ^^^^^ pattern `Err(_)` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+   = note: the matched value is of type `Result<u32, &R<'_>>`
+help: you might want to use `let else` to handle the variant that isn't matched
+   |
+LL |     let Ok(x) = res else { todo!() };
+   |                     ++++++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/recursion_limit/empty.rs b/tests/ui/recursion_limit/empty.rs
index 59dae106c..59dae106c 100644
--- a/src/test/ui/recursion_limit/empty.rs
+++ b/tests/ui/recursion_limit/empty.rs
diff --git a/src/test/ui/recursion_limit/empty.stderr b/tests/ui/recursion_limit/empty.stderr
index cb5c0c35a..cb5c0c35a 100644
--- a/src/test/ui/recursion_limit/empty.stderr
+++ b/tests/ui/recursion_limit/empty.stderr
diff --git a/src/test/ui/recursion_limit/invalid_digit.rs b/tests/ui/recursion_limit/invalid_digit.rs
index 03df3e7a9..03df3e7a9 100644
--- a/src/test/ui/recursion_limit/invalid_digit.rs
+++ b/tests/ui/recursion_limit/invalid_digit.rs
diff --git a/src/test/ui/recursion_limit/invalid_digit.stderr b/tests/ui/recursion_limit/invalid_digit.stderr
index 4dc93ad5f..4dc93ad5f 100644
--- a/src/test/ui/recursion_limit/invalid_digit.stderr
+++ b/tests/ui/recursion_limit/invalid_digit.stderr
diff --git a/src/test/ui/recursion_limit/invalid_digit_type.rs b/tests/ui/recursion_limit/invalid_digit_type.rs
index e408109b3..e408109b3 100644
--- a/src/test/ui/recursion_limit/invalid_digit_type.rs
+++ b/tests/ui/recursion_limit/invalid_digit_type.rs
diff --git a/src/test/ui/recursion_limit/invalid_digit_type.stderr b/tests/ui/recursion_limit/invalid_digit_type.stderr
index 6d1409bb3..6d1409bb3 100644
--- a/src/test/ui/recursion_limit/invalid_digit_type.stderr
+++ b/tests/ui/recursion_limit/invalid_digit_type.stderr
diff --git a/src/test/ui/recursion_limit/invalid_macro.rs b/tests/ui/recursion_limit/invalid_macro.rs
index 7db67a8d1..7db67a8d1 100644
--- a/src/test/ui/recursion_limit/invalid_macro.rs
+++ b/tests/ui/recursion_limit/invalid_macro.rs
diff --git a/src/test/ui/recursion_limit/invalid_macro.stderr b/tests/ui/recursion_limit/invalid_macro.stderr
index 0189e99da..0189e99da 100644
--- a/src/test/ui/recursion_limit/invalid_macro.stderr
+++ b/tests/ui/recursion_limit/invalid_macro.stderr
diff --git a/src/test/ui/recursion_limit/no-value.rs b/tests/ui/recursion_limit/no-value.rs
index 2202e5b77..2202e5b77 100644
--- a/src/test/ui/recursion_limit/no-value.rs
+++ b/tests/ui/recursion_limit/no-value.rs
diff --git a/src/test/ui/recursion_limit/no-value.stderr b/tests/ui/recursion_limit/no-value.stderr
index 35ac2c4cd..35ac2c4cd 100644
--- a/src/test/ui/recursion_limit/no-value.stderr
+++ b/tests/ui/recursion_limit/no-value.stderr
diff --git a/src/test/ui/recursion_limit/overflow.rs b/tests/ui/recursion_limit/overflow.rs
index c733ba6b9..c733ba6b9 100644
--- a/src/test/ui/recursion_limit/overflow.rs
+++ b/tests/ui/recursion_limit/overflow.rs
diff --git a/src/test/ui/recursion_limit/overflow.stderr b/tests/ui/recursion_limit/overflow.stderr
index 2f622d28b..2f622d28b 100644
--- a/src/test/ui/recursion_limit/overflow.stderr
+++ b/tests/ui/recursion_limit/overflow.stderr
diff --git a/src/test/ui/recursion_limit/zero-overflow.rs b/tests/ui/recursion_limit/zero-overflow.rs
index 77bd81856..77bd81856 100644
--- a/src/test/ui/recursion_limit/zero-overflow.rs
+++ b/tests/ui/recursion_limit/zero-overflow.rs
diff --git a/src/test/ui/recursion_limit/zero-overflow.stderr b/tests/ui/recursion_limit/zero-overflow.stderr
index 9007ec0d7..9007ec0d7 100644
--- a/src/test/ui/recursion_limit/zero-overflow.stderr
+++ b/tests/ui/recursion_limit/zero-overflow.stderr
diff --git a/src/test/ui/recursion_limit/zero.rs b/tests/ui/recursion_limit/zero.rs
index 3a2d904cb..3a2d904cb 100644
--- a/src/test/ui/recursion_limit/zero.rs
+++ b/tests/ui/recursion_limit/zero.rs
diff --git a/src/test/ui/recursion_limit/zero.stderr b/tests/ui/recursion_limit/zero.stderr
index b43565909..b43565909 100644
--- a/src/test/ui/recursion_limit/zero.stderr
+++ b/tests/ui/recursion_limit/zero.stderr
diff --git a/src/test/ui/reexport-test-harness-main.rs b/tests/ui/reexport-test-harness-main.rs
index 2582975e2..2582975e2 100644
--- a/src/test/ui/reexport-test-harness-main.rs
+++ b/tests/ui/reexport-test-harness-main.rs
diff --git a/src/test/ui/regions/auxiliary/rbmtp_cross_crate_lib.rs b/tests/ui/regions/auxiliary/rbmtp_cross_crate_lib.rs
index ce2a3a7db..ce2a3a7db 100644
--- a/src/test/ui/regions/auxiliary/rbmtp_cross_crate_lib.rs
+++ b/tests/ui/regions/auxiliary/rbmtp_cross_crate_lib.rs
diff --git a/src/test/ui/regions/closure-in-projection-issue-97405.rs b/tests/ui/regions/closure-in-projection-issue-97405.rs
index e567d5c27..e567d5c27 100644
--- a/src/test/ui/regions/closure-in-projection-issue-97405.rs
+++ b/tests/ui/regions/closure-in-projection-issue-97405.rs
diff --git a/src/test/ui/regions/closure-in-projection-issue-97405.stderr b/tests/ui/regions/closure-in-projection-issue-97405.stderr
index c08f1059e..c08f1059e 100644
--- a/src/test/ui/regions/closure-in-projection-issue-97405.stderr
+++ b/tests/ui/regions/closure-in-projection-issue-97405.stderr
diff --git a/src/test/ui/regions/do-not-suggest-adding-bound-to-opaque-type.rs b/tests/ui/regions/do-not-suggest-adding-bound-to-opaque-type.rs
index a1e801e39..a1e801e39 100644
--- a/src/test/ui/regions/do-not-suggest-adding-bound-to-opaque-type.rs
+++ b/tests/ui/regions/do-not-suggest-adding-bound-to-opaque-type.rs
diff --git a/src/test/ui/regions/do-not-suggest-adding-bound-to-opaque-type.stderr b/tests/ui/regions/do-not-suggest-adding-bound-to-opaque-type.stderr
index 6ea238f30..6ea238f30 100644
--- a/src/test/ui/regions/do-not-suggest-adding-bound-to-opaque-type.stderr
+++ b/tests/ui/regions/do-not-suggest-adding-bound-to-opaque-type.stderr
diff --git a/src/test/ui/regions/forall-wf-ref-reflexive.rs b/tests/ui/regions/forall-wf-ref-reflexive.rs
index 9c37d72d5..9c37d72d5 100644
--- a/src/test/ui/regions/forall-wf-ref-reflexive.rs
+++ b/tests/ui/regions/forall-wf-ref-reflexive.rs
diff --git a/src/test/ui/regions/forall-wf-ref-reflexive.stderr b/tests/ui/regions/forall-wf-ref-reflexive.stderr
index 3d059ccec..3d059ccec 100644
--- a/src/test/ui/regions/forall-wf-ref-reflexive.stderr
+++ b/tests/ui/regions/forall-wf-ref-reflexive.stderr
diff --git a/src/test/ui/regions/forall-wf-reflexive.rs b/tests/ui/regions/forall-wf-reflexive.rs
index 8e6b8224b..8e6b8224b 100644
--- a/src/test/ui/regions/forall-wf-reflexive.rs
+++ b/tests/ui/regions/forall-wf-reflexive.rs
diff --git a/src/test/ui/regions/init-res-into-things.rs b/tests/ui/regions/init-res-into-things.rs
index 7f416262d..7f416262d 100644
--- a/src/test/ui/regions/init-res-into-things.rs
+++ b/tests/ui/regions/init-res-into-things.rs
diff --git a/src/test/ui/regions/issue-101280.rs b/tests/ui/regions/issue-101280.rs
index 29f158366..29f158366 100644
--- a/src/test/ui/regions/issue-101280.rs
+++ b/tests/ui/regions/issue-101280.rs
diff --git a/src/test/ui/regions/issue-101280.stderr b/tests/ui/regions/issue-101280.stderr
index 320d008ae..320d008ae 100644
--- a/src/test/ui/regions/issue-101280.stderr
+++ b/tests/ui/regions/issue-101280.stderr
diff --git a/src/test/ui/regions/issue-102374.rs b/tests/ui/regions/issue-102374.rs
index fd71248d9..fd71248d9 100644
--- a/src/test/ui/regions/issue-102374.rs
+++ b/tests/ui/regions/issue-102374.rs
diff --git a/src/test/ui/regions/issue-102374.stderr b/tests/ui/regions/issue-102374.stderr
index 157850693..157850693 100644
--- a/src/test/ui/regions/issue-102374.stderr
+++ b/tests/ui/regions/issue-102374.stderr
diff --git a/src/test/ui/regions/issue-102392.rs b/tests/ui/regions/issue-102392.rs
index 87cc1a8e7..87cc1a8e7 100644
--- a/src/test/ui/regions/issue-102392.rs
+++ b/tests/ui/regions/issue-102392.rs
diff --git a/src/test/ui/regions/issue-102392.stderr b/tests/ui/regions/issue-102392.stderr
index 56f4c0c5d..56f4c0c5d 100644
--- a/src/test/ui/regions/issue-102392.stderr
+++ b/tests/ui/regions/issue-102392.stderr
diff --git a/src/test/ui/regions/issue-11612.rs b/tests/ui/regions/issue-11612.rs
index 9f7f1cc6f..9f7f1cc6f 100644
--- a/src/test/ui/regions/issue-11612.rs
+++ b/tests/ui/regions/issue-11612.rs
diff --git a/src/test/ui/regions/issue-12470.rs b/tests/ui/regions/issue-12470.rs
index d8f2abb0c..d8f2abb0c 100644
--- a/src/test/ui/regions/issue-12470.rs
+++ b/tests/ui/regions/issue-12470.rs
diff --git a/src/test/ui/regions/issue-12470.stderr b/tests/ui/regions/issue-12470.stderr
index c97e59195..c97e59195 100644
--- a/src/test/ui/regions/issue-12470.stderr
+++ b/tests/ui/regions/issue-12470.stderr
diff --git a/src/test/ui/regions/issue-21520.rs b/tests/ui/regions/issue-21520.rs
index ab4ac7237..ab4ac7237 100644
--- a/src/test/ui/regions/issue-21520.rs
+++ b/tests/ui/regions/issue-21520.rs
diff --git a/src/test/ui/regions/issue-24085.rs b/tests/ui/regions/issue-24085.rs
index 86e94beb7..86e94beb7 100644
--- a/src/test/ui/regions/issue-24085.rs
+++ b/tests/ui/regions/issue-24085.rs
diff --git a/src/test/ui/regions/issue-26448-1.rs b/tests/ui/regions/issue-26448-1.rs
index 7d2d75bf2..7d2d75bf2 100644
--- a/src/test/ui/regions/issue-26448-1.rs
+++ b/tests/ui/regions/issue-26448-1.rs
diff --git a/src/test/ui/regions/issue-26448-2.rs b/tests/ui/regions/issue-26448-2.rs
index c60e06c3c..c60e06c3c 100644
--- a/src/test/ui/regions/issue-26448-2.rs
+++ b/tests/ui/regions/issue-26448-2.rs
diff --git a/src/test/ui/regions/issue-26448-3.rs b/tests/ui/regions/issue-26448-3.rs
index d48022c09..d48022c09 100644
--- a/src/test/ui/regions/issue-26448-3.rs
+++ b/tests/ui/regions/issue-26448-3.rs
diff --git a/src/test/ui/regions/issue-2718.rs b/tests/ui/regions/issue-2718.rs
index 6449337ee..6449337ee 100644
--- a/src/test/ui/regions/issue-2718.rs
+++ b/tests/ui/regions/issue-2718.rs
diff --git a/src/test/ui/regions/issue-28848.rs b/tests/ui/regions/issue-28848.rs
index 0eb3d89c5..0eb3d89c5 100644
--- a/src/test/ui/regions/issue-28848.rs
+++ b/tests/ui/regions/issue-28848.rs
diff --git a/src/test/ui/regions/issue-28848.stderr b/tests/ui/regions/issue-28848.stderr
index a29dac4c9..a29dac4c9 100644
--- a/src/test/ui/regions/issue-28848.stderr
+++ b/tests/ui/regions/issue-28848.stderr
diff --git a/src/test/ui/regions/issue-5243.rs b/tests/ui/regions/issue-5243.rs
index c511d45f0..c511d45f0 100644
--- a/src/test/ui/regions/issue-5243.rs
+++ b/tests/ui/regions/issue-5243.rs
diff --git a/src/test/ui/regions/issue-56537-closure-uses-region-from-container.rs b/tests/ui/regions/issue-56537-closure-uses-region-from-container.rs
index a8f7a41c4..a8f7a41c4 100644
--- a/src/test/ui/regions/issue-56537-closure-uses-region-from-container.rs
+++ b/tests/ui/regions/issue-56537-closure-uses-region-from-container.rs
diff --git a/src/test/ui/regions/issue-6157.rs b/tests/ui/regions/issue-6157.rs
index b7a44ed86..b7a44ed86 100644
--- a/src/test/ui/regions/issue-6157.rs
+++ b/tests/ui/regions/issue-6157.rs
diff --git a/src/test/ui/regions/issue-72051-member-region-hang.rs b/tests/ui/regions/issue-72051-member-region-hang.rs
index b7340b79d..b7340b79d 100644
--- a/src/test/ui/regions/issue-72051-member-region-hang.rs
+++ b/tests/ui/regions/issue-72051-member-region-hang.rs
diff --git a/src/test/ui/regions/issue-78262.base.stderr b/tests/ui/regions/issue-78262.base.stderr
index 7f232e4a7..7f232e4a7 100644
--- a/src/test/ui/regions/issue-78262.base.stderr
+++ b/tests/ui/regions/issue-78262.base.stderr
diff --git a/src/test/ui/regions/issue-78262.polonius.stderr b/tests/ui/regions/issue-78262.polonius.stderr
index 7f232e4a7..7f232e4a7 100644
--- a/src/test/ui/regions/issue-78262.polonius.stderr
+++ b/tests/ui/regions/issue-78262.polonius.stderr
diff --git a/src/test/ui/regions/issue-78262.rs b/tests/ui/regions/issue-78262.rs
index 642dbd7f8..642dbd7f8 100644
--- a/src/test/ui/regions/issue-78262.rs
+++ b/tests/ui/regions/issue-78262.rs
diff --git a/src/test/ui/regions/outlives-with-missing.rs b/tests/ui/regions/outlives-with-missing.rs
index 29d89718b..29d89718b 100644
--- a/src/test/ui/regions/outlives-with-missing.rs
+++ b/tests/ui/regions/outlives-with-missing.rs
diff --git a/src/test/ui/regions/outlives-with-missing.stderr b/tests/ui/regions/outlives-with-missing.stderr
index e204c9187..e204c9187 100644
--- a/src/test/ui/regions/outlives-with-missing.stderr
+++ b/tests/ui/regions/outlives-with-missing.stderr
diff --git a/src/test/ui/regions/owned-implies-static.rs b/tests/ui/regions/owned-implies-static.rs
index 2efa8cc02..2efa8cc02 100644
--- a/src/test/ui/regions/owned-implies-static.rs
+++ b/tests/ui/regions/owned-implies-static.rs
diff --git a/src/test/ui/regions/rcvr-borrowed-to-region.rs b/tests/ui/regions/rcvr-borrowed-to-region.rs
index 7f32b8b91..7f32b8b91 100644
--- a/src/test/ui/regions/rcvr-borrowed-to-region.rs
+++ b/tests/ui/regions/rcvr-borrowed-to-region.rs
diff --git a/src/test/ui/regions/region-borrow-params-issue-29793-big.rs b/tests/ui/regions/region-borrow-params-issue-29793-big.rs
index 83b1a6eab..83b1a6eab 100644
--- a/src/test/ui/regions/region-borrow-params-issue-29793-big.rs
+++ b/tests/ui/regions/region-borrow-params-issue-29793-big.rs
diff --git a/src/test/ui/regions/region-borrow-params-issue-29793-big.stderr b/tests/ui/regions/region-borrow-params-issue-29793-big.stderr
index 561dd64b4..561dd64b4 100644
--- a/src/test/ui/regions/region-borrow-params-issue-29793-big.stderr
+++ b/tests/ui/regions/region-borrow-params-issue-29793-big.stderr
diff --git a/src/test/ui/regions/region-borrow-params-issue-29793-small.rs b/tests/ui/regions/region-borrow-params-issue-29793-small.rs
index 5f1c2ed08..5f1c2ed08 100644
--- a/src/test/ui/regions/region-borrow-params-issue-29793-small.rs
+++ b/tests/ui/regions/region-borrow-params-issue-29793-small.rs
diff --git a/src/test/ui/regions/region-borrow-params-issue-29793-small.stderr b/tests/ui/regions/region-borrow-params-issue-29793-small.stderr
index e446f2a00..e446f2a00 100644
--- a/src/test/ui/regions/region-borrow-params-issue-29793-small.stderr
+++ b/tests/ui/regions/region-borrow-params-issue-29793-small.stderr
diff --git a/src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.rs b/tests/ui/regions/region-bound-extra-bound-in-inherent-impl.rs
index 72d82da45..72d82da45 100644
--- a/src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.rs
+++ b/tests/ui/regions/region-bound-extra-bound-in-inherent-impl.rs
diff --git a/src/test/ui/regions/region-bound-on-closure-outlives-call.rs b/tests/ui/regions/region-bound-on-closure-outlives-call.rs
index 1311d5121..1311d5121 100644
--- a/src/test/ui/regions/region-bound-on-closure-outlives-call.rs
+++ b/tests/ui/regions/region-bound-on-closure-outlives-call.rs
diff --git a/src/test/ui/regions/region-bound-on-closure-outlives-call.stderr b/tests/ui/regions/region-bound-on-closure-outlives-call.stderr
index ea43dde11..ea43dde11 100644
--- a/src/test/ui/regions/region-bound-on-closure-outlives-call.stderr
+++ b/tests/ui/regions/region-bound-on-closure-outlives-call.stderr
diff --git a/src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.rs b/tests/ui/regions/region-bound-same-bounds-in-trait-and-impl.rs
index 68056370c..68056370c 100644
--- a/src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.rs
+++ b/tests/ui/regions/region-bound-same-bounds-in-trait-and-impl.rs
diff --git a/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.rs b/tests/ui/regions/region-bounds-on-objects-and-type-parameters.rs
index 40d2b740b..40d2b740b 100644
--- a/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.rs
+++ b/tests/ui/regions/region-bounds-on-objects-and-type-parameters.rs
diff --git a/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.stderr b/tests/ui/regions/region-bounds-on-objects-and-type-parameters.stderr
index 2ec2ca49b..2ec2ca49b 100644
--- a/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.stderr
+++ b/tests/ui/regions/region-bounds-on-objects-and-type-parameters.stderr
diff --git a/src/test/ui/regions/region-invariant-static-error-reporting.rs b/tests/ui/regions/region-invariant-static-error-reporting.rs
index c8288b592..c8288b592 100644
--- a/src/test/ui/regions/region-invariant-static-error-reporting.rs
+++ b/tests/ui/regions/region-invariant-static-error-reporting.rs
diff --git a/src/test/ui/regions/region-invariant-static-error-reporting.stderr b/tests/ui/regions/region-invariant-static-error-reporting.stderr
index 2ad39b000..2ad39b000 100644
--- a/src/test/ui/regions/region-invariant-static-error-reporting.stderr
+++ b/tests/ui/regions/region-invariant-static-error-reporting.stderr
diff --git a/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.rs b/tests/ui/regions/region-lifetime-bounds-on-fns-where-clause.rs
index d364c4677..d364c4677 100644
--- a/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.rs
+++ b/tests/ui/regions/region-lifetime-bounds-on-fns-where-clause.rs
diff --git a/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.stderr b/tests/ui/regions/region-lifetime-bounds-on-fns-where-clause.stderr
index 3b62c7b61..3b62c7b61 100644
--- a/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.stderr
+++ b/tests/ui/regions/region-lifetime-bounds-on-fns-where-clause.stderr
diff --git a/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.rs b/tests/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.rs
index 60dafdd52..60dafdd52 100644
--- a/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.rs
+++ b/tests/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.rs
diff --git a/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.stderr b/tests/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.stderr
index 8a18a234b..8a18a234b 100644
--- a/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.stderr
+++ b/tests/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.stderr
diff --git a/src/test/ui/regions/region-object-lifetime-1.rs b/tests/ui/regions/region-object-lifetime-1.rs
index ddf3be690..ddf3be690 100644
--- a/src/test/ui/regions/region-object-lifetime-1.rs
+++ b/tests/ui/regions/region-object-lifetime-1.rs
diff --git a/src/test/ui/regions/region-object-lifetime-2.rs b/tests/ui/regions/region-object-lifetime-2.rs
index cfdb8fefe..cfdb8fefe 100644
--- a/src/test/ui/regions/region-object-lifetime-2.rs
+++ b/tests/ui/regions/region-object-lifetime-2.rs
diff --git a/src/test/ui/regions/region-object-lifetime-2.stderr b/tests/ui/regions/region-object-lifetime-2.stderr
index d95289f3f..d95289f3f 100644
--- a/src/test/ui/regions/region-object-lifetime-2.stderr
+++ b/tests/ui/regions/region-object-lifetime-2.stderr
diff --git a/src/test/ui/regions/region-object-lifetime-3.rs b/tests/ui/regions/region-object-lifetime-3.rs
index 0536fa2a2..0536fa2a2 100644
--- a/src/test/ui/regions/region-object-lifetime-3.rs
+++ b/tests/ui/regions/region-object-lifetime-3.rs
diff --git a/src/test/ui/regions/region-object-lifetime-4.rs b/tests/ui/regions/region-object-lifetime-4.rs
index 8f42df831..8f42df831 100644
--- a/src/test/ui/regions/region-object-lifetime-4.rs
+++ b/tests/ui/regions/region-object-lifetime-4.rs
diff --git a/src/test/ui/regions/region-object-lifetime-4.stderr b/tests/ui/regions/region-object-lifetime-4.stderr
index fda66a241..fda66a241 100644
--- a/src/test/ui/regions/region-object-lifetime-4.stderr
+++ b/tests/ui/regions/region-object-lifetime-4.stderr
diff --git a/src/test/ui/regions/region-object-lifetime-5.rs b/tests/ui/regions/region-object-lifetime-5.rs
index ad3593671..ad3593671 100644
--- a/src/test/ui/regions/region-object-lifetime-5.rs
+++ b/tests/ui/regions/region-object-lifetime-5.rs
diff --git a/src/test/ui/regions/region-object-lifetime-5.stderr b/tests/ui/regions/region-object-lifetime-5.stderr
index b82b58c7a..b82b58c7a 100644
--- a/src/test/ui/regions/region-object-lifetime-5.stderr
+++ b/tests/ui/regions/region-object-lifetime-5.stderr
diff --git a/src/test/ui/regions/region-object-lifetime-in-coercion.rs b/tests/ui/regions/region-object-lifetime-in-coercion.rs
index 95708de04..95708de04 100644
--- a/src/test/ui/regions/region-object-lifetime-in-coercion.rs
+++ b/tests/ui/regions/region-object-lifetime-in-coercion.rs
diff --git a/src/test/ui/regions/region-object-lifetime-in-coercion.stderr b/tests/ui/regions/region-object-lifetime-in-coercion.stderr
index b5bb08c73..b5bb08c73 100644
--- a/src/test/ui/regions/region-object-lifetime-in-coercion.stderr
+++ b/tests/ui/regions/region-object-lifetime-in-coercion.stderr
diff --git a/src/test/ui/regions/regions-addr-of-arg.rs b/tests/ui/regions/regions-addr-of-arg.rs
index 1805141c4..1805141c4 100644
--- a/src/test/ui/regions/regions-addr-of-arg.rs
+++ b/tests/ui/regions/regions-addr-of-arg.rs
diff --git a/src/test/ui/regions/regions-addr-of-arg.stderr b/tests/ui/regions/regions-addr-of-arg.stderr
index e77289287..e77289287 100644
--- a/src/test/ui/regions/regions-addr-of-arg.stderr
+++ b/tests/ui/regions/regions-addr-of-arg.stderr
diff --git a/src/test/ui/regions/regions-addr-of-interior-of-unique-box.rs b/tests/ui/regions/regions-addr-of-interior-of-unique-box.rs
index 4221ebfdf..4221ebfdf 100644
--- a/src/test/ui/regions/regions-addr-of-interior-of-unique-box.rs
+++ b/tests/ui/regions/regions-addr-of-interior-of-unique-box.rs
diff --git a/src/test/ui/regions/regions-addr-of-ret.rs b/tests/ui/regions/regions-addr-of-ret.rs
index e5dcd6db0..e5dcd6db0 100644
--- a/src/test/ui/regions/regions-addr-of-ret.rs
+++ b/tests/ui/regions/regions-addr-of-ret.rs
diff --git a/src/test/ui/regions/regions-addr-of-self.rs b/tests/ui/regions/regions-addr-of-self.rs
index 23647182f..23647182f 100644
--- a/src/test/ui/regions/regions-addr-of-self.rs
+++ b/tests/ui/regions/regions-addr-of-self.rs
diff --git a/src/test/ui/regions/regions-addr-of-self.stderr b/tests/ui/regions/regions-addr-of-self.stderr
index 3d7aac74b..3d7aac74b 100644
--- a/src/test/ui/regions/regions-addr-of-self.stderr
+++ b/tests/ui/regions/regions-addr-of-self.stderr
diff --git a/src/test/ui/regions/regions-addr-of-upvar-self.rs b/tests/ui/regions/regions-addr-of-upvar-self.rs
index 171eca32e..171eca32e 100644
--- a/src/test/ui/regions/regions-addr-of-upvar-self.rs
+++ b/tests/ui/regions/regions-addr-of-upvar-self.rs
diff --git a/src/test/ui/regions/regions-addr-of-upvar-self.stderr b/tests/ui/regions/regions-addr-of-upvar-self.stderr
index c16a6f858..c16a6f858 100644
--- a/src/test/ui/regions/regions-addr-of-upvar-self.stderr
+++ b/tests/ui/regions/regions-addr-of-upvar-self.stderr
diff --git a/src/test/ui/regions/regions-adjusted-lvalue-op.rs b/tests/ui/regions/regions-adjusted-lvalue-op.rs
index 5aa5a3ecb..5aa5a3ecb 100644
--- a/src/test/ui/regions/regions-adjusted-lvalue-op.rs
+++ b/tests/ui/regions/regions-adjusted-lvalue-op.rs
diff --git a/src/test/ui/regions/regions-adjusted-lvalue-op.stderr b/tests/ui/regions/regions-adjusted-lvalue-op.stderr
index 2c5563444..2c5563444 100644
--- a/src/test/ui/regions/regions-adjusted-lvalue-op.stderr
+++ b/tests/ui/regions/regions-adjusted-lvalue-op.stderr
diff --git a/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs b/tests/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs
index eb6e66818..eb6e66818 100644
--- a/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs
+++ b/tests/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs
diff --git a/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.stderr b/tests/ui/regions/regions-assoc-type-in-supertrait-outlives-container.stderr
index 87e33e1cc..2a2625203 100644
--- a/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.stderr
+++ b/tests/ui/regions/regions-assoc-type-in-supertrait-outlives-container.stderr
@@ -7,7 +7,7 @@ LL | fn with_assoc<'a,'b>() {
    |               lifetime `'a` defined here
 ...
 LL |     let _: &'a WithAssoc<TheType<'b>> = loop { };
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^ type annotation requires that `'b` must outlive `'a`
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'b` must outlive `'a`
    |
    = help: consider adding the following bound: `'b: 'a`
 
diff --git a/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.rs b/tests/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.rs
index 575dfafe1..575dfafe1 100644
--- a/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.rs
+++ b/tests/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.rs
diff --git a/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.stderr b/tests/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.stderr
index ac6154139..ac6154139 100644
--- a/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.stderr
+++ b/tests/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.stderr
diff --git a/src/test/ui/regions/regions-assoc-type-region-bound.rs b/tests/ui/regions/regions-assoc-type-region-bound.rs
index cbb7d1726..cbb7d1726 100644
--- a/src/test/ui/regions/regions-assoc-type-region-bound.rs
+++ b/tests/ui/regions/regions-assoc-type-region-bound.rs
diff --git a/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.rs b/tests/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.rs
index 00100e0e9..00100e0e9 100644
--- a/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.rs
+++ b/tests/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.rs
diff --git a/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.stderr b/tests/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.stderr
index a96f5612f..a96f5612f 100644
--- a/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.stderr
+++ b/tests/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.stderr
diff --git a/src/test/ui/regions/regions-assoc-type-static-bound.rs b/tests/ui/regions/regions-assoc-type-static-bound.rs
index 1458787ea..1458787ea 100644
--- a/src/test/ui/regions/regions-assoc-type-static-bound.rs
+++ b/tests/ui/regions/regions-assoc-type-static-bound.rs
diff --git a/src/test/ui/regions/regions-borrow-at.rs b/tests/ui/regions/regions-borrow-at.rs
index 152abe109..152abe109 100644
--- a/src/test/ui/regions/regions-borrow-at.rs
+++ b/tests/ui/regions/regions-borrow-at.rs
diff --git a/src/test/ui/regions/regions-borrow-evec-fixed.rs b/tests/ui/regions/regions-borrow-evec-fixed.rs
index ed828312b..ed828312b 100644
--- a/src/test/ui/regions/regions-borrow-evec-fixed.rs
+++ b/tests/ui/regions/regions-borrow-evec-fixed.rs
diff --git a/src/test/ui/regions/regions-borrow-evec-uniq.rs b/tests/ui/regions/regions-borrow-evec-uniq.rs
index bbf7ba79e..bbf7ba79e 100644
--- a/src/test/ui/regions/regions-borrow-evec-uniq.rs
+++ b/tests/ui/regions/regions-borrow-evec-uniq.rs
diff --git a/src/test/ui/regions/regions-borrow-uniq.rs b/tests/ui/regions/regions-borrow-uniq.rs
index adc6b1939..adc6b1939 100644
--- a/src/test/ui/regions/regions-borrow-uniq.rs
+++ b/tests/ui/regions/regions-borrow-uniq.rs
diff --git a/src/test/ui/regions/regions-bot.rs b/tests/ui/regions/regions-bot.rs
index 580162936..580162936 100644
--- a/src/test/ui/regions/regions-bot.rs
+++ b/tests/ui/regions/regions-bot.rs
diff --git a/src/test/ui/regions/regions-bound-lists-feature-gate-2.rs b/tests/ui/regions/regions-bound-lists-feature-gate-2.rs
index 2c7503799..2c7503799 100644
--- a/src/test/ui/regions/regions-bound-lists-feature-gate-2.rs
+++ b/tests/ui/regions/regions-bound-lists-feature-gate-2.rs
diff --git a/src/test/ui/regions/regions-bound-lists-feature-gate.rs b/tests/ui/regions/regions-bound-lists-feature-gate.rs
index 3815498f8..3815498f8 100644
--- a/src/test/ui/regions/regions-bound-lists-feature-gate.rs
+++ b/tests/ui/regions/regions-bound-lists-feature-gate.rs
diff --git a/src/test/ui/regions/regions-bounded-by-trait-requiring-static.rs b/tests/ui/regions/regions-bounded-by-trait-requiring-static.rs
index 7d02a4619..7d02a4619 100644
--- a/src/test/ui/regions/regions-bounded-by-trait-requiring-static.rs
+++ b/tests/ui/regions/regions-bounded-by-trait-requiring-static.rs
diff --git a/src/test/ui/regions/regions-bounded-by-trait-requiring-static.stderr b/tests/ui/regions/regions-bounded-by-trait-requiring-static.stderr
index eea68cc8f..eea68cc8f 100644
--- a/src/test/ui/regions/regions-bounded-by-trait-requiring-static.stderr
+++ b/tests/ui/regions/regions-bounded-by-trait-requiring-static.stderr
diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.rs b/tests/ui/regions/regions-bounded-method-type-parameters-cross-crate.rs
index c014b2ccf..c014b2ccf 100644
--- a/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.rs
+++ b/tests/ui/regions/regions-bounded-method-type-parameters-cross-crate.rs
diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.stderr b/tests/ui/regions/regions-bounded-method-type-parameters-cross-crate.stderr
index 6193bf02f..6193bf02f 100644
--- a/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.stderr
+++ b/tests/ui/regions/regions-bounded-method-type-parameters-cross-crate.stderr
diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.rs b/tests/ui/regions/regions-bounded-method-type-parameters-trait-bound.rs
index 5548cb915..5548cb915 100644
--- a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.rs
+++ b/tests/ui/regions/regions-bounded-method-type-parameters-trait-bound.rs
diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.stderr b/tests/ui/regions/regions-bounded-method-type-parameters-trait-bound.stderr
index 0e0086be9..0e0086be9 100644
--- a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.stderr
+++ b/tests/ui/regions/regions-bounded-method-type-parameters-trait-bound.stderr
diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters.rs b/tests/ui/regions/regions-bounded-method-type-parameters.rs
index 56e750003..56e750003 100644
--- a/src/test/ui/regions/regions-bounded-method-type-parameters.rs
+++ b/tests/ui/regions/regions-bounded-method-type-parameters.rs
diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters.stderr b/tests/ui/regions/regions-bounded-method-type-parameters.stderr
index b6d7b8aac..b6d7b8aac 100644
--- a/src/test/ui/regions/regions-bounded-method-type-parameters.stderr
+++ b/tests/ui/regions/regions-bounded-method-type-parameters.stderr
diff --git a/src/test/ui/regions/regions-bounds.rs b/tests/ui/regions/regions-bounds.rs
index fd4d75ab6..fd4d75ab6 100644
--- a/src/test/ui/regions/regions-bounds.rs
+++ b/tests/ui/regions/regions-bounds.rs
diff --git a/src/test/ui/regions/regions-bounds.stderr b/tests/ui/regions/regions-bounds.stderr
index 430909e54..430909e54 100644
--- a/src/test/ui/regions/regions-bounds.stderr
+++ b/tests/ui/regions/regions-bounds.stderr
diff --git a/src/test/ui/regions/regions-close-associated-type-into-object.rs b/tests/ui/regions/regions-close-associated-type-into-object.rs
index 428477e24..428477e24 100644
--- a/src/test/ui/regions/regions-close-associated-type-into-object.rs
+++ b/tests/ui/regions/regions-close-associated-type-into-object.rs
diff --git a/src/test/ui/regions/regions-close-associated-type-into-object.stderr b/tests/ui/regions/regions-close-associated-type-into-object.stderr
index f7dcaa9d9..f7dcaa9d9 100644
--- a/src/test/ui/regions/regions-close-associated-type-into-object.stderr
+++ b/tests/ui/regions/regions-close-associated-type-into-object.stderr
diff --git a/src/test/ui/regions/regions-close-object-into-object-1.rs b/tests/ui/regions/regions-close-object-into-object-1.rs
index 2dc33d567..2dc33d567 100644
--- a/src/test/ui/regions/regions-close-object-into-object-1.rs
+++ b/tests/ui/regions/regions-close-object-into-object-1.rs
diff --git a/src/test/ui/regions/regions-close-object-into-object-1.stderr b/tests/ui/regions/regions-close-object-into-object-1.stderr
index 5bfaeb295..5bfaeb295 100644
--- a/src/test/ui/regions/regions-close-object-into-object-1.stderr
+++ b/tests/ui/regions/regions-close-object-into-object-1.stderr
diff --git a/src/test/ui/regions/regions-close-object-into-object-2.rs b/tests/ui/regions/regions-close-object-into-object-2.rs
index 6960af72c..6960af72c 100644
--- a/src/test/ui/regions/regions-close-object-into-object-2.rs
+++ b/tests/ui/regions/regions-close-object-into-object-2.rs
diff --git a/src/test/ui/regions/regions-close-object-into-object-2.stderr b/tests/ui/regions/regions-close-object-into-object-2.stderr
index aacb5ea4e..aacb5ea4e 100644
--- a/src/test/ui/regions/regions-close-object-into-object-2.stderr
+++ b/tests/ui/regions/regions-close-object-into-object-2.stderr
diff --git a/src/test/ui/regions/regions-close-object-into-object-3.rs b/tests/ui/regions/regions-close-object-into-object-3.rs
index 78d93b0ec..78d93b0ec 100644
--- a/src/test/ui/regions/regions-close-object-into-object-3.rs
+++ b/tests/ui/regions/regions-close-object-into-object-3.rs
diff --git a/src/test/ui/regions/regions-close-object-into-object-3.stderr b/tests/ui/regions/regions-close-object-into-object-3.stderr
index 9f92c40e1..9f92c40e1 100644
--- a/src/test/ui/regions/regions-close-object-into-object-3.stderr
+++ b/tests/ui/regions/regions-close-object-into-object-3.stderr
diff --git a/src/test/ui/regions/regions-close-object-into-object-4.rs b/tests/ui/regions/regions-close-object-into-object-4.rs
index 3bbad9cbf..3bbad9cbf 100644
--- a/src/test/ui/regions/regions-close-object-into-object-4.rs
+++ b/tests/ui/regions/regions-close-object-into-object-4.rs
diff --git a/src/test/ui/regions/regions-close-object-into-object-4.stderr b/tests/ui/regions/regions-close-object-into-object-4.stderr
index 7a9f1ab00..7a9f1ab00 100644
--- a/src/test/ui/regions/regions-close-object-into-object-4.stderr
+++ b/tests/ui/regions/regions-close-object-into-object-4.stderr
diff --git a/src/test/ui/regions/regions-close-object-into-object-5.rs b/tests/ui/regions/regions-close-object-into-object-5.rs
index d534c3749..d534c3749 100644
--- a/src/test/ui/regions/regions-close-object-into-object-5.rs
+++ b/tests/ui/regions/regions-close-object-into-object-5.rs
diff --git a/src/test/ui/regions/regions-close-object-into-object-5.stderr b/tests/ui/regions/regions-close-object-into-object-5.stderr
index 311e8868c..311e8868c 100644
--- a/src/test/ui/regions/regions-close-object-into-object-5.stderr
+++ b/tests/ui/regions/regions-close-object-into-object-5.stderr
diff --git a/src/test/ui/regions/regions-close-over-type-parameter-1.rs b/tests/ui/regions/regions-close-over-type-parameter-1.rs
index 610f75745..610f75745 100644
--- a/src/test/ui/regions/regions-close-over-type-parameter-1.rs
+++ b/tests/ui/regions/regions-close-over-type-parameter-1.rs
diff --git a/src/test/ui/regions/regions-close-over-type-parameter-1.stderr b/tests/ui/regions/regions-close-over-type-parameter-1.stderr
index b7b557d7a..b7b557d7a 100644
--- a/src/test/ui/regions/regions-close-over-type-parameter-1.stderr
+++ b/tests/ui/regions/regions-close-over-type-parameter-1.stderr
diff --git a/src/test/ui/regions/regions-close-over-type-parameter-multiple.rs b/tests/ui/regions/regions-close-over-type-parameter-multiple.rs
index e032a94c3..e032a94c3 100644
--- a/src/test/ui/regions/regions-close-over-type-parameter-multiple.rs
+++ b/tests/ui/regions/regions-close-over-type-parameter-multiple.rs
diff --git a/src/test/ui/regions/regions-close-over-type-parameter-multiple.stderr b/tests/ui/regions/regions-close-over-type-parameter-multiple.stderr
index baa0506d0..baa0506d0 100644
--- a/src/test/ui/regions/regions-close-over-type-parameter-multiple.stderr
+++ b/tests/ui/regions/regions-close-over-type-parameter-multiple.stderr
diff --git a/src/test/ui/regions/regions-close-over-type-parameter-successfully.rs b/tests/ui/regions/regions-close-over-type-parameter-successfully.rs
index 48aad9481..48aad9481 100644
--- a/src/test/ui/regions/regions-close-over-type-parameter-successfully.rs
+++ b/tests/ui/regions/regions-close-over-type-parameter-successfully.rs
diff --git a/src/test/ui/regions/regions-close-param-into-object.rs b/tests/ui/regions/regions-close-param-into-object.rs
index 2760e5eed..2760e5eed 100644
--- a/src/test/ui/regions/regions-close-param-into-object.rs
+++ b/tests/ui/regions/regions-close-param-into-object.rs
diff --git a/src/test/ui/regions/regions-close-param-into-object.stderr b/tests/ui/regions/regions-close-param-into-object.stderr
index 9162be5b9..9162be5b9 100644
--- a/src/test/ui/regions/regions-close-param-into-object.stderr
+++ b/tests/ui/regions/regions-close-param-into-object.stderr
diff --git a/src/test/ui/regions/regions-copy-closure.rs b/tests/ui/regions/regions-copy-closure.rs
index 436400797..436400797 100644
--- a/src/test/ui/regions/regions-copy-closure.rs
+++ b/tests/ui/regions/regions-copy-closure.rs
diff --git a/src/test/ui/regions/regions-creating-enums.rs b/tests/ui/regions/regions-creating-enums.rs
index 6ed68f803..6ed68f803 100644
--- a/src/test/ui/regions/regions-creating-enums.rs
+++ b/tests/ui/regions/regions-creating-enums.rs
diff --git a/src/test/ui/regions/regions-creating-enums.stderr b/tests/ui/regions/regions-creating-enums.stderr
index a95d84629..a95d84629 100644
--- a/src/test/ui/regions/regions-creating-enums.stderr
+++ b/tests/ui/regions/regions-creating-enums.stderr
diff --git a/src/test/ui/regions/regions-creating-enums2.rs b/tests/ui/regions/regions-creating-enums2.rs
index 7b16fb1a8..7b16fb1a8 100644
--- a/src/test/ui/regions/regions-creating-enums2.rs
+++ b/tests/ui/regions/regions-creating-enums2.rs
diff --git a/src/test/ui/regions/regions-creating-enums3.rs b/tests/ui/regions/regions-creating-enums3.rs
index 39dbb3d8a..39dbb3d8a 100644
--- a/src/test/ui/regions/regions-creating-enums3.rs
+++ b/tests/ui/regions/regions-creating-enums3.rs
diff --git a/src/test/ui/regions/regions-creating-enums3.stderr b/tests/ui/regions/regions-creating-enums3.stderr
index 41d609b56..41d609b56 100644
--- a/src/test/ui/regions/regions-creating-enums3.stderr
+++ b/tests/ui/regions/regions-creating-enums3.stderr
diff --git a/src/test/ui/regions/regions-creating-enums4.rs b/tests/ui/regions/regions-creating-enums4.rs
index c9eab08cb..c9eab08cb 100644
--- a/src/test/ui/regions/regions-creating-enums4.rs
+++ b/tests/ui/regions/regions-creating-enums4.rs
diff --git a/src/test/ui/regions/regions-creating-enums4.stderr b/tests/ui/regions/regions-creating-enums4.stderr
index 91cf57e09..91cf57e09 100644
--- a/src/test/ui/regions/regions-creating-enums4.stderr
+++ b/tests/ui/regions/regions-creating-enums4.stderr
diff --git a/src/test/ui/regions/regions-creating-enums5.rs b/tests/ui/regions/regions-creating-enums5.rs
index ad3d9748b..ad3d9748b 100644
--- a/src/test/ui/regions/regions-creating-enums5.rs
+++ b/tests/ui/regions/regions-creating-enums5.rs
diff --git a/src/test/ui/regions/regions-debruijn-of-object.rs b/tests/ui/regions/regions-debruijn-of-object.rs
index 0b5510489..0b5510489 100644
--- a/src/test/ui/regions/regions-debruijn-of-object.rs
+++ b/tests/ui/regions/regions-debruijn-of-object.rs
diff --git a/src/test/ui/regions/regions-dependent-addr-of.rs b/tests/ui/regions/regions-dependent-addr-of.rs
index a6cb56e31..a6cb56e31 100644
--- a/src/test/ui/regions/regions-dependent-addr-of.rs
+++ b/tests/ui/regions/regions-dependent-addr-of.rs
diff --git a/src/test/ui/regions/regions-dependent-autofn.rs b/tests/ui/regions/regions-dependent-autofn.rs
index 246dbb556..246dbb556 100644
--- a/src/test/ui/regions/regions-dependent-autofn.rs
+++ b/tests/ui/regions/regions-dependent-autofn.rs
diff --git a/src/test/ui/regions/regions-dependent-autoslice.rs b/tests/ui/regions/regions-dependent-autoslice.rs
index 4c5b35ec4..4c5b35ec4 100644
--- a/src/test/ui/regions/regions-dependent-autoslice.rs
+++ b/tests/ui/regions/regions-dependent-autoslice.rs
diff --git a/src/test/ui/regions/regions-dependent-let-ref.rs b/tests/ui/regions/regions-dependent-let-ref.rs
index 94e3df4b3..94e3df4b3 100644
--- a/src/test/ui/regions/regions-dependent-let-ref.rs
+++ b/tests/ui/regions/regions-dependent-let-ref.rs
diff --git a/src/test/ui/regions/regions-early-bound-error-method.rs b/tests/ui/regions/regions-early-bound-error-method.rs
index 7edcc677d..7edcc677d 100644
--- a/src/test/ui/regions/regions-early-bound-error-method.rs
+++ b/tests/ui/regions/regions-early-bound-error-method.rs
diff --git a/src/test/ui/regions/regions-early-bound-error-method.stderr b/tests/ui/regions/regions-early-bound-error-method.stderr
index 7f10c051f..7f10c051f 100644
--- a/src/test/ui/regions/regions-early-bound-error-method.stderr
+++ b/tests/ui/regions/regions-early-bound-error-method.stderr
diff --git a/src/test/ui/regions/regions-early-bound-error.rs b/tests/ui/regions/regions-early-bound-error.rs
index 98a69c24f..98a69c24f 100644
--- a/src/test/ui/regions/regions-early-bound-error.rs
+++ b/tests/ui/regions/regions-early-bound-error.rs
diff --git a/src/test/ui/regions/regions-early-bound-error.stderr b/tests/ui/regions/regions-early-bound-error.stderr
index eb4cd5ca7..eb4cd5ca7 100644
--- a/src/test/ui/regions/regions-early-bound-error.stderr
+++ b/tests/ui/regions/regions-early-bound-error.stderr
diff --git a/src/test/ui/regions/regions-early-bound-lifetime-in-assoc-fn.rs b/tests/ui/regions/regions-early-bound-lifetime-in-assoc-fn.rs
index fe50a7dd1..fe50a7dd1 100644
--- a/src/test/ui/regions/regions-early-bound-lifetime-in-assoc-fn.rs
+++ b/tests/ui/regions/regions-early-bound-lifetime-in-assoc-fn.rs
diff --git a/src/test/ui/regions/regions-early-bound-trait-param.rs b/tests/ui/regions/regions-early-bound-trait-param.rs
index a28bd14ba..a28bd14ba 100644
--- a/src/test/ui/regions/regions-early-bound-trait-param.rs
+++ b/tests/ui/regions/regions-early-bound-trait-param.rs
diff --git a/src/test/ui/regions/regions-early-bound-used-in-bound-method.rs b/tests/ui/regions/regions-early-bound-used-in-bound-method.rs
index a778dae1e..a778dae1e 100644
--- a/src/test/ui/regions/regions-early-bound-used-in-bound-method.rs
+++ b/tests/ui/regions/regions-early-bound-used-in-bound-method.rs
diff --git a/src/test/ui/regions/regions-early-bound-used-in-bound.rs b/tests/ui/regions/regions-early-bound-used-in-bound.rs
index 6ccc99e84..6ccc99e84 100644
--- a/src/test/ui/regions/regions-early-bound-used-in-bound.rs
+++ b/tests/ui/regions/regions-early-bound-used-in-bound.rs
diff --git a/src/test/ui/regions/regions-early-bound-used-in-type-param.rs b/tests/ui/regions/regions-early-bound-used-in-type-param.rs
index d58c17ad9..d58c17ad9 100644
--- a/src/test/ui/regions/regions-early-bound-used-in-type-param.rs
+++ b/tests/ui/regions/regions-early-bound-used-in-type-param.rs
diff --git a/src/test/ui/regions/regions-escape-into-other-fn.rs b/tests/ui/regions/regions-escape-into-other-fn.rs
index 65f4c1b6a..65f4c1b6a 100644
--- a/src/test/ui/regions/regions-escape-into-other-fn.rs
+++ b/tests/ui/regions/regions-escape-into-other-fn.rs
diff --git a/src/test/ui/regions/regions-escape-method.rs b/tests/ui/regions/regions-escape-method.rs
index 69c01ae69..69c01ae69 100644
--- a/src/test/ui/regions/regions-escape-method.rs
+++ b/tests/ui/regions/regions-escape-method.rs
diff --git a/src/test/ui/regions/regions-escape-method.stderr b/tests/ui/regions/regions-escape-method.stderr
index 9f425125b..9f425125b 100644
--- a/src/test/ui/regions/regions-escape-method.stderr
+++ b/tests/ui/regions/regions-escape-method.stderr
diff --git a/src/test/ui/regions/regions-escape-via-trait-or-not.rs b/tests/ui/regions/regions-escape-via-trait-or-not.rs
index ac0e56de4..ac0e56de4 100644
--- a/src/test/ui/regions/regions-escape-via-trait-or-not.rs
+++ b/tests/ui/regions/regions-escape-via-trait-or-not.rs
diff --git a/src/test/ui/regions/regions-escape-via-trait-or-not.stderr b/tests/ui/regions/regions-escape-via-trait-or-not.stderr
index cae6c33ac..cae6c33ac 100644
--- a/src/test/ui/regions/regions-escape-via-trait-or-not.stderr
+++ b/tests/ui/regions/regions-escape-via-trait-or-not.stderr
diff --git a/src/test/ui/regions/regions-expl-self.rs b/tests/ui/regions/regions-expl-self.rs
index f7315d628..f7315d628 100644
--- a/src/test/ui/regions/regions-expl-self.rs
+++ b/tests/ui/regions/regions-expl-self.rs
diff --git a/src/test/ui/regions/regions-fn-subtyping-2.rs b/tests/ui/regions/regions-fn-subtyping-2.rs
index 83949ddba..83949ddba 100644
--- a/src/test/ui/regions/regions-fn-subtyping-2.rs
+++ b/tests/ui/regions/regions-fn-subtyping-2.rs
diff --git a/src/test/ui/regions/regions-fn-subtyping-return-static-fail.rs b/tests/ui/regions/regions-fn-subtyping-return-static-fail.rs
index 539221b5a..539221b5a 100644
--- a/src/test/ui/regions/regions-fn-subtyping-return-static-fail.rs
+++ b/tests/ui/regions/regions-fn-subtyping-return-static-fail.rs
diff --git a/src/test/ui/regions/regions-fn-subtyping-return-static-fail.stderr b/tests/ui/regions/regions-fn-subtyping-return-static-fail.stderr
index 8d82ff958..8d82ff958 100644
--- a/src/test/ui/regions/regions-fn-subtyping-return-static-fail.stderr
+++ b/tests/ui/regions/regions-fn-subtyping-return-static-fail.stderr
diff --git a/src/test/ui/regions/regions-fn-subtyping-return-static.rs b/tests/ui/regions/regions-fn-subtyping-return-static.rs
index de14d5ba8..de14d5ba8 100644
--- a/src/test/ui/regions/regions-fn-subtyping-return-static.rs
+++ b/tests/ui/regions/regions-fn-subtyping-return-static.rs
diff --git a/src/test/ui/regions/regions-fn-subtyping.rs b/tests/ui/regions/regions-fn-subtyping.rs
index 9570359c6..9570359c6 100644
--- a/src/test/ui/regions/regions-fn-subtyping.rs
+++ b/tests/ui/regions/regions-fn-subtyping.rs
diff --git a/src/test/ui/regions/regions-free-region-ordering-callee-4.rs b/tests/ui/regions/regions-free-region-ordering-callee-4.rs
index de58dd0b1..de58dd0b1 100644
--- a/src/test/ui/regions/regions-free-region-ordering-callee-4.rs
+++ b/tests/ui/regions/regions-free-region-ordering-callee-4.rs
diff --git a/src/test/ui/regions/regions-free-region-ordering-callee-4.stderr b/tests/ui/regions/regions-free-region-ordering-callee-4.stderr
index 1df7ca0e3..1df7ca0e3 100644
--- a/src/test/ui/regions/regions-free-region-ordering-callee-4.stderr
+++ b/tests/ui/regions/regions-free-region-ordering-callee-4.stderr
diff --git a/src/test/ui/regions/regions-free-region-ordering-callee.rs b/tests/ui/regions/regions-free-region-ordering-callee.rs
index 8158e81e1..8158e81e1 100644
--- a/src/test/ui/regions/regions-free-region-ordering-callee.rs
+++ b/tests/ui/regions/regions-free-region-ordering-callee.rs
diff --git a/src/test/ui/regions/regions-free-region-ordering-callee.stderr b/tests/ui/regions/regions-free-region-ordering-callee.stderr
index a1b46a692..a1b46a692 100644
--- a/src/test/ui/regions/regions-free-region-ordering-callee.stderr
+++ b/tests/ui/regions/regions-free-region-ordering-callee.stderr
diff --git a/src/test/ui/regions/regions-free-region-ordering-caller.rs b/tests/ui/regions/regions-free-region-ordering-caller.rs
index 2e83c3258..2e83c3258 100644
--- a/src/test/ui/regions/regions-free-region-ordering-caller.rs
+++ b/tests/ui/regions/regions-free-region-ordering-caller.rs
diff --git a/src/test/ui/regions/regions-free-region-ordering-caller.stderr b/tests/ui/regions/regions-free-region-ordering-caller.stderr
index c79ed50c6..cdf70d2a5 100644
--- a/src/test/ui/regions/regions-free-region-ordering-caller.stderr
+++ b/tests/ui/regions/regions-free-region-ordering-caller.stderr
@@ -6,7 +6,7 @@ LL | fn call2<'a, 'b>(a: &'a usize, b: &'b usize) {
    |          |
    |          lifetime `'a` defined here
 LL |     let z: Option<&'b &'a usize> = None;
-   |            ^^^^^^^^^^^^^^^^^^^^^ type annotation requires that `'a` must outlive `'b`
+   |            ^^^^^^^^^^^^^^^^^^^^^ requires that `'a` must outlive `'b`
    |
    = help: consider adding the following bound: `'a: 'b`
 
@@ -19,7 +19,7 @@ LL | fn call3<'a, 'b>(a: &'a usize, b: &'b usize) {
    |          lifetime `'a` defined here
 LL |     let y: Paramd<'a> = Paramd { x: a };
 LL |     let z: Option<&'b Paramd<'a>> = None;
-   |            ^^^^^^^^^^^^^^^^^^^^^^ type annotation requires that `'a` must outlive `'b`
+   |            ^^^^^^^^^^^^^^^^^^^^^^ requires that `'a` must outlive `'b`
    |
    = help: consider adding the following bound: `'a: 'b`
 
@@ -31,7 +31,7 @@ LL | fn call4<'a, 'b>(a: &'a usize, b: &'b usize) {
    |          |
    |          lifetime `'a` defined here
 LL |     let z: Option<&'a &'b usize> = None;
-   |            ^^^^^^^^^^^^^^^^^^^^^ type annotation requires that `'b` must outlive `'a`
+   |            ^^^^^^^^^^^^^^^^^^^^^ requires that `'b` must outlive `'a`
    |
    = help: consider adding the following bound: `'b: 'a`
 
diff --git a/src/test/ui/regions/regions-free-region-ordering-caller1.rs b/tests/ui/regions/regions-free-region-ordering-caller1.rs
index f32455616..f32455616 100644
--- a/src/test/ui/regions/regions-free-region-ordering-caller1.rs
+++ b/tests/ui/regions/regions-free-region-ordering-caller1.rs
diff --git a/src/test/ui/regions/regions-free-region-ordering-caller1.stderr b/tests/ui/regions/regions-free-region-ordering-caller1.stderr
index 8ef7e2253..8ef7e2253 100644
--- a/src/test/ui/regions/regions-free-region-ordering-caller1.stderr
+++ b/tests/ui/regions/regions-free-region-ordering-caller1.stderr
diff --git a/src/test/ui/regions/regions-free-region-ordering-incorrect.rs b/tests/ui/regions/regions-free-region-ordering-incorrect.rs
index 1aee6e876..1aee6e876 100644
--- a/src/test/ui/regions/regions-free-region-ordering-incorrect.rs
+++ b/tests/ui/regions/regions-free-region-ordering-incorrect.rs
diff --git a/src/test/ui/regions/regions-free-region-ordering-incorrect.stderr b/tests/ui/regions/regions-free-region-ordering-incorrect.stderr
index f7c75033c..f7c75033c 100644
--- a/src/test/ui/regions/regions-free-region-ordering-incorrect.stderr
+++ b/tests/ui/regions/regions-free-region-ordering-incorrect.stderr
diff --git a/src/test/ui/regions/regions-free-region-outlives-static-outlives-free-region.rs b/tests/ui/regions/regions-free-region-outlives-static-outlives-free-region.rs
index 7c2e1aeee..7c2e1aeee 100644
--- a/src/test/ui/regions/regions-free-region-outlives-static-outlives-free-region.rs
+++ b/tests/ui/regions/regions-free-region-outlives-static-outlives-free-region.rs
diff --git a/src/test/ui/regions/regions-free-region-outlives-static-outlives-free-region.stderr b/tests/ui/regions/regions-free-region-outlives-static-outlives-free-region.stderr
index 70ed418d5..70ed418d5 100644
--- a/src/test/ui/regions/regions-free-region-outlives-static-outlives-free-region.stderr
+++ b/tests/ui/regions/regions-free-region-outlives-static-outlives-free-region.stderr
diff --git a/src/test/ui/regions/regions-glb-free-free.rs b/tests/ui/regions/regions-glb-free-free.rs
index 0370a5192..0370a5192 100644
--- a/src/test/ui/regions/regions-glb-free-free.rs
+++ b/tests/ui/regions/regions-glb-free-free.rs
diff --git a/src/test/ui/regions/regions-glb-free-free.stderr b/tests/ui/regions/regions-glb-free-free.stderr
index 575037a0a..575037a0a 100644
--- a/src/test/ui/regions/regions-glb-free-free.stderr
+++ b/tests/ui/regions/regions-glb-free-free.stderr
diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-1.rs b/tests/ui/regions/regions-implied-bounds-projection-gap-1.rs
index 38fc9c462..38fc9c462 100644
--- a/src/test/ui/regions/regions-implied-bounds-projection-gap-1.rs
+++ b/tests/ui/regions/regions-implied-bounds-projection-gap-1.rs
diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-1.stderr b/tests/ui/regions/regions-implied-bounds-projection-gap-1.stderr
index 7c9f40556..7c9f40556 100644
--- a/src/test/ui/regions/regions-implied-bounds-projection-gap-1.stderr
+++ b/tests/ui/regions/regions-implied-bounds-projection-gap-1.stderr
diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-2.rs b/tests/ui/regions/regions-implied-bounds-projection-gap-2.rs
index a481a9cc5..a481a9cc5 100644
--- a/src/test/ui/regions/regions-implied-bounds-projection-gap-2.rs
+++ b/tests/ui/regions/regions-implied-bounds-projection-gap-2.rs
diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-3.rs b/tests/ui/regions/regions-implied-bounds-projection-gap-3.rs
index a627cbbd8..a627cbbd8 100644
--- a/src/test/ui/regions/regions-implied-bounds-projection-gap-3.rs
+++ b/tests/ui/regions/regions-implied-bounds-projection-gap-3.rs
diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-4.rs b/tests/ui/regions/regions-implied-bounds-projection-gap-4.rs
index 5158c2893..5158c2893 100644
--- a/src/test/ui/regions/regions-implied-bounds-projection-gap-4.rs
+++ b/tests/ui/regions/regions-implied-bounds-projection-gap-4.rs
diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.rs b/tests/ui/regions/regions-implied-bounds-projection-gap-hr-1.rs
index 110635203..110635203 100644
--- a/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.rs
+++ b/tests/ui/regions/regions-implied-bounds-projection-gap-hr-1.rs
diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.stderr b/tests/ui/regions/regions-implied-bounds-projection-gap-hr-1.stderr
index 66f592c34..3fd39810d 100644
--- a/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.stderr
+++ b/tests/ui/regions/regions-implied-bounds-projection-gap-hr-1.stderr
@@ -1,12 +1,8 @@
 error[E0277]: the trait bound `for<'z> T: Trait2<'y, 'z>` is not satisfied
-  --> $DIR/regions-implied-bounds-projection-gap-hr-1.rs:21:1
+  --> $DIR/regions-implied-bounds-projection-gap-hr-1.rs:21:49
    |
-LL | / fn callee<'x, 'y, T>(t: &'x dyn for<'z> Trait1< <T as Trait2<'y, 'z>>::Foo >)
-LL | |
-LL | |
-LL | | {
-LL | | }
-   | |_^ the trait `for<'z> Trait2<'y, 'z>` is not implemented for `T`
+LL | fn callee<'x, 'y, T>(t: &'x dyn for<'z> Trait1< <T as Trait2<'y, 'z>>::Foo >)
+   |                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `for<'z> Trait2<'y, 'z>` is not implemented for `T`
    |
 help: consider restricting type parameter `T`
    |
@@ -14,10 +10,14 @@ LL | fn callee<'x, 'y, T: for<'z> Trait2<'y, 'z>>(t: &'x dyn for<'z> Trait1< <T
    |                    ++++++++++++++++++++++++
 
 error[E0277]: the trait bound `for<'z> T: Trait2<'y, 'z>` is not satisfied
-  --> $DIR/regions-implied-bounds-projection-gap-hr-1.rs:21:49
+  --> $DIR/regions-implied-bounds-projection-gap-hr-1.rs:21:1
    |
-LL | fn callee<'x, 'y, T>(t: &'x dyn for<'z> Trait1< <T as Trait2<'y, 'z>>::Foo >)
-   |                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `for<'z> Trait2<'y, 'z>` is not implemented for `T`
+LL | / fn callee<'x, 'y, T>(t: &'x dyn for<'z> Trait1< <T as Trait2<'y, 'z>>::Foo >)
+LL | |
+LL | |
+LL | | {
+LL | | }
+   | |_^ the trait `for<'z> Trait2<'y, 'z>` is not implemented for `T`
    |
 help: consider restricting type parameter `T`
    |
diff --git a/src/test/ui/regions/regions-in-enums-anon.rs b/tests/ui/regions/regions-in-enums-anon.rs
index da65cb791..da65cb791 100644
--- a/src/test/ui/regions/regions-in-enums-anon.rs
+++ b/tests/ui/regions/regions-in-enums-anon.rs
diff --git a/src/test/ui/regions/regions-in-enums-anon.stderr b/tests/ui/regions/regions-in-enums-anon.stderr
index ed547aa9c..ed547aa9c 100644
--- a/src/test/ui/regions/regions-in-enums-anon.stderr
+++ b/tests/ui/regions/regions-in-enums-anon.stderr
diff --git a/src/test/ui/regions/regions-in-enums.rs b/tests/ui/regions/regions-in-enums.rs
index 8cf553a0f..8cf553a0f 100644
--- a/src/test/ui/regions/regions-in-enums.rs
+++ b/tests/ui/regions/regions-in-enums.rs
diff --git a/src/test/ui/regions/regions-in-enums.stderr b/tests/ui/regions/regions-in-enums.stderr
index 665376532..665376532 100644
--- a/src/test/ui/regions/regions-in-enums.stderr
+++ b/tests/ui/regions/regions-in-enums.stderr
diff --git a/src/test/ui/regions/regions-in-structs-anon.rs b/tests/ui/regions/regions-in-structs-anon.rs
index 7cb2ce0db..7cb2ce0db 100644
--- a/src/test/ui/regions/regions-in-structs-anon.rs
+++ b/tests/ui/regions/regions-in-structs-anon.rs
diff --git a/src/test/ui/regions/regions-in-structs-anon.stderr b/tests/ui/regions/regions-in-structs-anon.stderr
index 992d25c9f..992d25c9f 100644
--- a/src/test/ui/regions/regions-in-structs-anon.stderr
+++ b/tests/ui/regions/regions-in-structs-anon.stderr
diff --git a/src/test/ui/regions/regions-in-structs.rs b/tests/ui/regions/regions-in-structs.rs
index 71f718ba2..71f718ba2 100644
--- a/src/test/ui/regions/regions-in-structs.rs
+++ b/tests/ui/regions/regions-in-structs.rs
diff --git a/src/test/ui/regions/regions-in-structs.stderr b/tests/ui/regions/regions-in-structs.stderr
index 5dfdc2ee9..5dfdc2ee9 100644
--- a/src/test/ui/regions/regions-in-structs.stderr
+++ b/tests/ui/regions/regions-in-structs.stderr
diff --git a/src/test/ui/regions/regions-infer-at-fn-not-param.rs b/tests/ui/regions/regions-infer-at-fn-not-param.rs
index fb9c5d5c2..fb9c5d5c2 100644
--- a/src/test/ui/regions/regions-infer-at-fn-not-param.rs
+++ b/tests/ui/regions/regions-infer-at-fn-not-param.rs
diff --git a/src/test/ui/regions/regions-infer-at-fn-not-param.stderr b/tests/ui/regions/regions-infer-at-fn-not-param.stderr
index 8cfc44f6a..8cfc44f6a 100644
--- a/src/test/ui/regions/regions-infer-at-fn-not-param.stderr
+++ b/tests/ui/regions/regions-infer-at-fn-not-param.stderr
diff --git a/src/test/ui/regions/regions-infer-borrow-scope-addr-of.rs b/tests/ui/regions/regions-infer-borrow-scope-addr-of.rs
index 5d8ad932e..5d8ad932e 100644
--- a/src/test/ui/regions/regions-infer-borrow-scope-addr-of.rs
+++ b/tests/ui/regions/regions-infer-borrow-scope-addr-of.rs
diff --git a/src/test/ui/regions/regions-infer-borrow-scope-too-big.rs b/tests/ui/regions/regions-infer-borrow-scope-too-big.rs
index 250b41da5..250b41da5 100644
--- a/src/test/ui/regions/regions-infer-borrow-scope-too-big.rs
+++ b/tests/ui/regions/regions-infer-borrow-scope-too-big.rs
diff --git a/src/test/ui/regions/regions-infer-borrow-scope-too-big.stderr b/tests/ui/regions/regions-infer-borrow-scope-too-big.stderr
index 2c7a6e8b5..2c7a6e8b5 100644
--- a/src/test/ui/regions/regions-infer-borrow-scope-too-big.stderr
+++ b/tests/ui/regions/regions-infer-borrow-scope-too-big.stderr
diff --git a/src/test/ui/regions/regions-infer-borrow-scope-view.rs b/tests/ui/regions/regions-infer-borrow-scope-view.rs
index 349b52044..349b52044 100644
--- a/src/test/ui/regions/regions-infer-borrow-scope-view.rs
+++ b/tests/ui/regions/regions-infer-borrow-scope-view.rs
diff --git a/src/test/ui/regions/regions-infer-borrow-scope-within-loop-ok.rs b/tests/ui/regions/regions-infer-borrow-scope-within-loop-ok.rs
index dca26742d..dca26742d 100644
--- a/src/test/ui/regions/regions-infer-borrow-scope-within-loop-ok.rs
+++ b/tests/ui/regions/regions-infer-borrow-scope-within-loop-ok.rs
diff --git a/src/test/ui/regions/regions-infer-borrow-scope.rs b/tests/ui/regions/regions-infer-borrow-scope.rs
index b4a050bf1..b4a050bf1 100644
--- a/src/test/ui/regions/regions-infer-borrow-scope.rs
+++ b/tests/ui/regions/regions-infer-borrow-scope.rs
diff --git a/src/test/ui/regions/regions-infer-bound-from-trait-self.rs b/tests/ui/regions/regions-infer-bound-from-trait-self.rs
index d15bfffe9..d15bfffe9 100644
--- a/src/test/ui/regions/regions-infer-bound-from-trait-self.rs
+++ b/tests/ui/regions/regions-infer-bound-from-trait-self.rs
diff --git a/src/test/ui/regions/regions-infer-bound-from-trait-self.stderr b/tests/ui/regions/regions-infer-bound-from-trait-self.stderr
index e88f79a3a..e88f79a3a 100644
--- a/src/test/ui/regions/regions-infer-bound-from-trait-self.stderr
+++ b/tests/ui/regions/regions-infer-bound-from-trait-self.stderr
diff --git a/src/test/ui/regions/regions-infer-bound-from-trait.rs b/tests/ui/regions/regions-infer-bound-from-trait.rs
index 610452182..610452182 100644
--- a/src/test/ui/regions/regions-infer-bound-from-trait.rs
+++ b/tests/ui/regions/regions-infer-bound-from-trait.rs
diff --git a/src/test/ui/regions/regions-infer-bound-from-trait.stderr b/tests/ui/regions/regions-infer-bound-from-trait.stderr
index 3ee71543d..3ee71543d 100644
--- a/src/test/ui/regions/regions-infer-bound-from-trait.stderr
+++ b/tests/ui/regions/regions-infer-bound-from-trait.stderr
diff --git a/src/test/ui/regions/regions-infer-call-2.rs b/tests/ui/regions/regions-infer-call-2.rs
index a288d2e4d..a288d2e4d 100644
--- a/src/test/ui/regions/regions-infer-call-2.rs
+++ b/tests/ui/regions/regions-infer-call-2.rs
diff --git a/src/test/ui/regions/regions-infer-call-3.rs b/tests/ui/regions/regions-infer-call-3.rs
index 063ec8428..063ec8428 100644
--- a/src/test/ui/regions/regions-infer-call-3.rs
+++ b/tests/ui/regions/regions-infer-call-3.rs
diff --git a/src/test/ui/regions/regions-infer-call-3.stderr b/tests/ui/regions/regions-infer-call-3.stderr
index ca51555a0..ca51555a0 100644
--- a/src/test/ui/regions/regions-infer-call-3.stderr
+++ b/tests/ui/regions/regions-infer-call-3.stderr
diff --git a/src/test/ui/regions/regions-infer-call.rs b/tests/ui/regions/regions-infer-call.rs
index 248f9e923..248f9e923 100644
--- a/src/test/ui/regions/regions-infer-call.rs
+++ b/tests/ui/regions/regions-infer-call.rs
diff --git a/src/test/ui/regions/regions-infer-contravariance-due-to-decl.rs b/tests/ui/regions/regions-infer-contravariance-due-to-decl.rs
index fbc0cec56..fbc0cec56 100644
--- a/src/test/ui/regions/regions-infer-contravariance-due-to-decl.rs
+++ b/tests/ui/regions/regions-infer-contravariance-due-to-decl.rs
diff --git a/src/test/ui/regions/regions-infer-contravariance-due-to-decl.stderr b/tests/ui/regions/regions-infer-contravariance-due-to-decl.stderr
index 94b80852d..94b80852d 100644
--- a/src/test/ui/regions/regions-infer-contravariance-due-to-decl.stderr
+++ b/tests/ui/regions/regions-infer-contravariance-due-to-decl.stderr
diff --git a/src/test/ui/regions/regions-infer-contravariance-due-to-ret.rs b/tests/ui/regions/regions-infer-contravariance-due-to-ret.rs
index fbd895015..fbd895015 100644
--- a/src/test/ui/regions/regions-infer-contravariance-due-to-ret.rs
+++ b/tests/ui/regions/regions-infer-contravariance-due-to-ret.rs
diff --git a/src/test/ui/regions/regions-infer-covariance-due-to-decl.rs b/tests/ui/regions/regions-infer-covariance-due-to-decl.rs
index 03c0e436e..03c0e436e 100644
--- a/src/test/ui/regions/regions-infer-covariance-due-to-decl.rs
+++ b/tests/ui/regions/regions-infer-covariance-due-to-decl.rs
diff --git a/src/test/ui/regions/regions-infer-covariance-due-to-decl.stderr b/tests/ui/regions/regions-infer-covariance-due-to-decl.stderr
index f44a0fad5..f44a0fad5 100644
--- a/src/test/ui/regions/regions-infer-covariance-due-to-decl.stderr
+++ b/tests/ui/regions/regions-infer-covariance-due-to-decl.stderr
diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-decl.rs b/tests/ui/regions/regions-infer-invariance-due-to-decl.rs
index 102abc0e0..102abc0e0 100644
--- a/src/test/ui/regions/regions-infer-invariance-due-to-decl.rs
+++ b/tests/ui/regions/regions-infer-invariance-due-to-decl.rs
diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-decl.stderr b/tests/ui/regions/regions-infer-invariance-due-to-decl.stderr
index c8c7808e0..c8c7808e0 100644
--- a/src/test/ui/regions/regions-infer-invariance-due-to-decl.stderr
+++ b/tests/ui/regions/regions-infer-invariance-due-to-decl.stderr
diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.rs b/tests/ui/regions/regions-infer-invariance-due-to-mutability-3.rs
index c1fb41bd9..c1fb41bd9 100644
--- a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.rs
+++ b/tests/ui/regions/regions-infer-invariance-due-to-mutability-3.rs
diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.stderr b/tests/ui/regions/regions-infer-invariance-due-to-mutability-3.stderr
index 1165011c1..1165011c1 100644
--- a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.stderr
+++ b/tests/ui/regions/regions-infer-invariance-due-to-mutability-3.stderr
diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.rs b/tests/ui/regions/regions-infer-invariance-due-to-mutability-4.rs
index 1078f77a0..1078f77a0 100644
--- a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.rs
+++ b/tests/ui/regions/regions-infer-invariance-due-to-mutability-4.rs
diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.stderr b/tests/ui/regions/regions-infer-invariance-due-to-mutability-4.stderr
index f3973a93b..f3973a93b 100644
--- a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.stderr
+++ b/tests/ui/regions/regions-infer-invariance-due-to-mutability-4.stderr
diff --git a/src/test/ui/regions/regions-infer-not-param.rs b/tests/ui/regions/regions-infer-not-param.rs
index c3766bce1..c3766bce1 100644
--- a/src/test/ui/regions/regions-infer-not-param.rs
+++ b/tests/ui/regions/regions-infer-not-param.rs
diff --git a/src/test/ui/regions/regions-infer-not-param.stderr b/tests/ui/regions/regions-infer-not-param.stderr
index d12f07a77..d12f07a77 100644
--- a/src/test/ui/regions/regions-infer-not-param.stderr
+++ b/tests/ui/regions/regions-infer-not-param.stderr
diff --git a/src/test/ui/regions/regions-infer-paramd-indirect.rs b/tests/ui/regions/regions-infer-paramd-indirect.rs
index 978c84e53..978c84e53 100644
--- a/src/test/ui/regions/regions-infer-paramd-indirect.rs
+++ b/tests/ui/regions/regions-infer-paramd-indirect.rs
diff --git a/src/test/ui/regions/regions-infer-paramd-indirect.stderr b/tests/ui/regions/regions-infer-paramd-indirect.stderr
index afabdc1de..afabdc1de 100644
--- a/src/test/ui/regions/regions-infer-paramd-indirect.stderr
+++ b/tests/ui/regions/regions-infer-paramd-indirect.stderr
diff --git a/src/test/ui/regions/regions-infer-proc-static-upvar.rs b/tests/ui/regions/regions-infer-proc-static-upvar.rs
index 5a64aa734..5a64aa734 100644
--- a/src/test/ui/regions/regions-infer-proc-static-upvar.rs
+++ b/tests/ui/regions/regions-infer-proc-static-upvar.rs
diff --git a/src/test/ui/regions/regions-infer-proc-static-upvar.stderr b/tests/ui/regions/regions-infer-proc-static-upvar.stderr
index 803d0d744..803d0d744 100644
--- a/src/test/ui/regions/regions-infer-proc-static-upvar.stderr
+++ b/tests/ui/regions/regions-infer-proc-static-upvar.stderr
diff --git a/src/test/ui/regions/regions-infer-reborrow-ref-mut-recurse.rs b/tests/ui/regions/regions-infer-reborrow-ref-mut-recurse.rs
index 31a48b4ad..31a48b4ad 100644
--- a/src/test/ui/regions/regions-infer-reborrow-ref-mut-recurse.rs
+++ b/tests/ui/regions/regions-infer-reborrow-ref-mut-recurse.rs
diff --git a/src/test/ui/regions/regions-infer-region-in-fn-but-not-type.rs b/tests/ui/regions/regions-infer-region-in-fn-but-not-type.rs
index 6aa5d8217..6aa5d8217 100644
--- a/src/test/ui/regions/regions-infer-region-in-fn-but-not-type.rs
+++ b/tests/ui/regions/regions-infer-region-in-fn-but-not-type.rs
diff --git a/src/test/ui/regions/regions-infer-static-from-proc.rs b/tests/ui/regions/regions-infer-static-from-proc.rs
index 39501e2d6..39501e2d6 100644
--- a/src/test/ui/regions/regions-infer-static-from-proc.rs
+++ b/tests/ui/regions/regions-infer-static-from-proc.rs
diff --git a/src/test/ui/regions/regions-issue-21422.rs b/tests/ui/regions/regions-issue-21422.rs
index 198b71466..198b71466 100644
--- a/src/test/ui/regions/regions-issue-21422.rs
+++ b/tests/ui/regions/regions-issue-21422.rs
diff --git a/src/test/ui/regions/regions-issue-22246.rs b/tests/ui/regions/regions-issue-22246.rs
index 085883367..085883367 100644
--- a/src/test/ui/regions/regions-issue-22246.rs
+++ b/tests/ui/regions/regions-issue-22246.rs
diff --git a/src/test/ui/regions/regions-lifetime-bounds-on-fns.rs b/tests/ui/regions/regions-lifetime-bounds-on-fns.rs
index 177f52fa7..177f52fa7 100644
--- a/src/test/ui/regions/regions-lifetime-bounds-on-fns.rs
+++ b/tests/ui/regions/regions-lifetime-bounds-on-fns.rs
diff --git a/src/test/ui/regions/regions-lifetime-bounds-on-fns.stderr b/tests/ui/regions/regions-lifetime-bounds-on-fns.stderr
index 17a901943..17a901943 100644
--- a/src/test/ui/regions/regions-lifetime-bounds-on-fns.stderr
+++ b/tests/ui/regions/regions-lifetime-bounds-on-fns.stderr
diff --git a/src/test/ui/regions/regions-lifetime-nonfree-late-bound.rs b/tests/ui/regions/regions-lifetime-nonfree-late-bound.rs
index 3852a14d9..3852a14d9 100644
--- a/src/test/ui/regions/regions-lifetime-nonfree-late-bound.rs
+++ b/tests/ui/regions/regions-lifetime-nonfree-late-bound.rs
diff --git a/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.rs b/tests/ui/regions/regions-lifetime-of-struct-or-enum-variant.rs
index 1b25294c7..1b25294c7 100644
--- a/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.rs
+++ b/tests/ui/regions/regions-lifetime-of-struct-or-enum-variant.rs
diff --git a/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.stderr b/tests/ui/regions/regions-lifetime-of-struct-or-enum-variant.stderr
index b4bf2ab31..b4bf2ab31 100644
--- a/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.stderr
+++ b/tests/ui/regions/regions-lifetime-of-struct-or-enum-variant.stderr
diff --git a/src/test/ui/regions/regions-lifetime-static-items-enclosing-scopes.rs b/tests/ui/regions/regions-lifetime-static-items-enclosing-scopes.rs
index b6a89e29e..b6a89e29e 100644
--- a/src/test/ui/regions/regions-lifetime-static-items-enclosing-scopes.rs
+++ b/tests/ui/regions/regions-lifetime-static-items-enclosing-scopes.rs
diff --git a/src/test/ui/regions/regions-link-fn-args.rs b/tests/ui/regions/regions-link-fn-args.rs
index 231407b22..231407b22 100644
--- a/src/test/ui/regions/regions-link-fn-args.rs
+++ b/tests/ui/regions/regions-link-fn-args.rs
diff --git a/src/test/ui/regions/regions-lub-ref-ref-rc.rs b/tests/ui/regions/regions-lub-ref-ref-rc.rs
index 96c71b084..96c71b084 100644
--- a/src/test/ui/regions/regions-lub-ref-ref-rc.rs
+++ b/tests/ui/regions/regions-lub-ref-ref-rc.rs
diff --git a/src/test/ui/regions/regions-mock-codegen.rs b/tests/ui/regions/regions-mock-codegen.rs
index 9d0ca76e4..9d0ca76e4 100644
--- a/src/test/ui/regions/regions-mock-codegen.rs
+++ b/tests/ui/regions/regions-mock-codegen.rs
diff --git a/src/test/ui/regions/regions-name-duplicated.rs b/tests/ui/regions/regions-name-duplicated.rs
index f6616591a..f6616591a 100644
--- a/src/test/ui/regions/regions-name-duplicated.rs
+++ b/tests/ui/regions/regions-name-duplicated.rs
diff --git a/src/test/ui/regions/regions-name-duplicated.stderr b/tests/ui/regions/regions-name-duplicated.stderr
index cef73c18d..cef73c18d 100644
--- a/src/test/ui/regions/regions-name-duplicated.stderr
+++ b/tests/ui/regions/regions-name-duplicated.stderr
diff --git a/src/test/ui/regions/regions-name-static.rs b/tests/ui/regions/regions-name-static.rs
index da316c6ef..da316c6ef 100644
--- a/src/test/ui/regions/regions-name-static.rs
+++ b/tests/ui/regions/regions-name-static.rs
diff --git a/src/test/ui/regions/regions-name-static.stderr b/tests/ui/regions/regions-name-static.stderr
index 4b7026e65..4b7026e65 100644
--- a/src/test/ui/regions/regions-name-static.stderr
+++ b/tests/ui/regions/regions-name-static.stderr
diff --git a/src/test/ui/regions/regions-name-undeclared.rs b/tests/ui/regions/regions-name-undeclared.rs
index 7b6ede193..7b6ede193 100644
--- a/src/test/ui/regions/regions-name-undeclared.rs
+++ b/tests/ui/regions/regions-name-undeclared.rs
diff --git a/src/test/ui/regions/regions-name-undeclared.stderr b/tests/ui/regions/regions-name-undeclared.stderr
index 532603de5..532603de5 100644
--- a/src/test/ui/regions/regions-name-undeclared.stderr
+++ b/tests/ui/regions/regions-name-undeclared.stderr
diff --git a/src/test/ui/regions/regions-nested-fns-2.rs b/tests/ui/regions/regions-nested-fns-2.rs
index 3b3e26c45..3b3e26c45 100644
--- a/src/test/ui/regions/regions-nested-fns-2.rs
+++ b/tests/ui/regions/regions-nested-fns-2.rs
diff --git a/src/test/ui/regions/regions-nested-fns-2.stderr b/tests/ui/regions/regions-nested-fns-2.stderr
index 43c8d1272..43c8d1272 100644
--- a/src/test/ui/regions/regions-nested-fns-2.stderr
+++ b/tests/ui/regions/regions-nested-fns-2.stderr
diff --git a/src/test/ui/regions/regions-nested-fns.rs b/tests/ui/regions/regions-nested-fns.rs
index d9698ced3..d9698ced3 100644
--- a/src/test/ui/regions/regions-nested-fns.rs
+++ b/tests/ui/regions/regions-nested-fns.rs
diff --git a/src/test/ui/regions/regions-nested-fns.stderr b/tests/ui/regions/regions-nested-fns.stderr
index bb2740310..bb2740310 100644
--- a/src/test/ui/regions/regions-nested-fns.stderr
+++ b/tests/ui/regions/regions-nested-fns.stderr
diff --git a/src/test/ui/regions/regions-no-bound-in-argument-cleanup.rs b/tests/ui/regions/regions-no-bound-in-argument-cleanup.rs
index aafab5d86..aafab5d86 100644
--- a/src/test/ui/regions/regions-no-bound-in-argument-cleanup.rs
+++ b/tests/ui/regions/regions-no-bound-in-argument-cleanup.rs
diff --git a/src/test/ui/regions/regions-no-variance-from-fn-generics.rs b/tests/ui/regions/regions-no-variance-from-fn-generics.rs
index 76706a827..76706a827 100644
--- a/src/test/ui/regions/regions-no-variance-from-fn-generics.rs
+++ b/tests/ui/regions/regions-no-variance-from-fn-generics.rs
diff --git a/src/test/ui/regions/regions-normalize-in-where-clause-list.rs b/tests/ui/regions/regions-normalize-in-where-clause-list.rs
index 389f82e79..389f82e79 100644
--- a/src/test/ui/regions/regions-normalize-in-where-clause-list.rs
+++ b/tests/ui/regions/regions-normalize-in-where-clause-list.rs
diff --git a/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr b/tests/ui/regions/regions-normalize-in-where-clause-list.stderr
index 567283729..567283729 100644
--- a/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr
+++ b/tests/ui/regions/regions-normalize-in-where-clause-list.stderr
diff --git a/src/test/ui/regions/regions-nullary-variant.rs b/tests/ui/regions/regions-nullary-variant.rs
index 82470af82..82470af82 100644
--- a/src/test/ui/regions/regions-nullary-variant.rs
+++ b/tests/ui/regions/regions-nullary-variant.rs
diff --git a/src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.rs b/tests/ui/regions/regions-outlives-nominal-type-enum-region-rev.rs
index 15deaba56..15deaba56 100644
--- a/src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.rs
+++ b/tests/ui/regions/regions-outlives-nominal-type-enum-region-rev.rs
diff --git a/src/test/ui/regions/regions-outlives-nominal-type-enum-region.rs b/tests/ui/regions/regions-outlives-nominal-type-enum-region.rs
index 7767c13c8..7767c13c8 100644
--- a/src/test/ui/regions/regions-outlives-nominal-type-enum-region.rs
+++ b/tests/ui/regions/regions-outlives-nominal-type-enum-region.rs
diff --git a/src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.rs b/tests/ui/regions/regions-outlives-nominal-type-enum-type-rev.rs
index 374159942..374159942 100644
--- a/src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.rs
+++ b/tests/ui/regions/regions-outlives-nominal-type-enum-type-rev.rs
diff --git a/src/test/ui/regions/regions-outlives-nominal-type-enum-type.rs b/tests/ui/regions/regions-outlives-nominal-type-enum-type.rs
index 2e7f198d8..2e7f198d8 100644
--- a/src/test/ui/regions/regions-outlives-nominal-type-enum-type.rs
+++ b/tests/ui/regions/regions-outlives-nominal-type-enum-type.rs
diff --git a/src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.rs b/tests/ui/regions/regions-outlives-nominal-type-struct-region-rev.rs
index 45155c721..45155c721 100644
--- a/src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.rs
+++ b/tests/ui/regions/regions-outlives-nominal-type-struct-region-rev.rs
diff --git a/src/test/ui/regions/regions-outlives-nominal-type-struct-region.rs b/tests/ui/regions/regions-outlives-nominal-type-struct-region.rs
index bba8b2445..bba8b2445 100644
--- a/src/test/ui/regions/regions-outlives-nominal-type-struct-region.rs
+++ b/tests/ui/regions/regions-outlives-nominal-type-struct-region.rs
diff --git a/src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.rs b/tests/ui/regions/regions-outlives-nominal-type-struct-type-rev.rs
index 220d2e83c..220d2e83c 100644
--- a/src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.rs
+++ b/tests/ui/regions/regions-outlives-nominal-type-struct-type-rev.rs
diff --git a/src/test/ui/regions/regions-outlives-nominal-type-struct-type.rs b/tests/ui/regions/regions-outlives-nominal-type-struct-type.rs
index 9ddcdb649..9ddcdb649 100644
--- a/src/test/ui/regions/regions-outlives-nominal-type-struct-type.rs
+++ b/tests/ui/regions/regions-outlives-nominal-type-struct-type.rs
diff --git a/src/test/ui/regions/regions-outlives-projection-container-hrtb.rs b/tests/ui/regions/regions-outlives-projection-container-hrtb.rs
index 152eed5ac..152eed5ac 100644
--- a/src/test/ui/regions/regions-outlives-projection-container-hrtb.rs
+++ b/tests/ui/regions/regions-outlives-projection-container-hrtb.rs
diff --git a/src/test/ui/regions/regions-outlives-projection-container-hrtb.stderr b/tests/ui/regions/regions-outlives-projection-container-hrtb.stderr
index 187e9056e..6a7c908fa 100644
--- a/src/test/ui/regions/regions-outlives-projection-container-hrtb.stderr
+++ b/tests/ui/regions/regions-outlives-projection-container-hrtb.stderr
@@ -7,7 +7,7 @@ LL | fn with_assoc<'a,'b>() {
    |               lifetime `'a` defined here
 ...
 LL |     let _: &'a WithHrAssoc<TheType<'b>> = loop { };
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type annotation requires that `'b` must outlive `'a`
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'b` must outlive `'a`
    |
    = help: consider adding the following bound: `'b: 'a`
 
@@ -20,7 +20,7 @@ LL | fn with_assoc_sub<'a,'b>() {
    |                   lifetime `'a` defined here
 ...
 LL |     let _: &'a WithHrAssocSub<TheType<'b>> = loop { };
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type annotation requires that `'b` must outlive `'a`
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'b` must outlive `'a`
    |
    = help: consider adding the following bound: `'b: 'a`
 
diff --git a/src/test/ui/regions/regions-outlives-projection-container-wc.rs b/tests/ui/regions/regions-outlives-projection-container-wc.rs
index 4fda7774b..4fda7774b 100644
--- a/src/test/ui/regions/regions-outlives-projection-container-wc.rs
+++ b/tests/ui/regions/regions-outlives-projection-container-wc.rs
diff --git a/src/test/ui/regions/regions-outlives-projection-container-wc.stderr b/tests/ui/regions/regions-outlives-projection-container-wc.stderr
index 4178e951c..eba2a0d58 100644
--- a/src/test/ui/regions/regions-outlives-projection-container-wc.stderr
+++ b/tests/ui/regions/regions-outlives-projection-container-wc.stderr
@@ -7,7 +7,7 @@ LL | fn with_assoc<'a,'b>() {
    |               lifetime `'a` defined here
 ...
 LL |     let _: &'a WithAssoc<TheType<'b>> = loop { };
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^ type annotation requires that `'b` must outlive `'a`
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'b` must outlive `'a`
    |
    = help: consider adding the following bound: `'b: 'a`
 
diff --git a/src/test/ui/regions/regions-outlives-projection-container.rs b/tests/ui/regions/regions-outlives-projection-container.rs
index 7b9829cf8..7b9829cf8 100644
--- a/src/test/ui/regions/regions-outlives-projection-container.rs
+++ b/tests/ui/regions/regions-outlives-projection-container.rs
diff --git a/src/test/ui/regions/regions-outlives-projection-container.stderr b/tests/ui/regions/regions-outlives-projection-container.stderr
index 073a31900..d20a2f06a 100644
--- a/src/test/ui/regions/regions-outlives-projection-container.stderr
+++ b/tests/ui/regions/regions-outlives-projection-container.stderr
@@ -7,7 +7,7 @@ LL | fn with_assoc<'a,'b>() {
    |               lifetime `'a` defined here
 ...
 LL |     let _x: &'a WithAssoc<TheType<'b>> = loop { };
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^ type annotation requires that `'b` must outlive `'a`
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'b` must outlive `'a`
    |
    = help: consider adding the following bound: `'b: 'a`
 
@@ -20,7 +20,7 @@ LL | fn without_assoc<'a,'b>() {
    |                  lifetime `'a` defined here
 ...
 LL |     let _x: &'a WithoutAssoc<TheType<'b>> = loop { };
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type annotation requires that `'b` must outlive `'a`
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'b` must outlive `'a`
    |
    = help: consider adding the following bound: `'b: 'a`
 
diff --git a/src/test/ui/regions/regions-outlives-projection-hrtype.rs b/tests/ui/regions/regions-outlives-projection-hrtype.rs
index 5f9700df1..5f9700df1 100644
--- a/src/test/ui/regions/regions-outlives-projection-hrtype.rs
+++ b/tests/ui/regions/regions-outlives-projection-hrtype.rs
diff --git a/src/test/ui/regions/regions-outlives-projection-trait-def.rs b/tests/ui/regions/regions-outlives-projection-trait-def.rs
index 5c37a585a..5c37a585a 100644
--- a/src/test/ui/regions/regions-outlives-projection-trait-def.rs
+++ b/tests/ui/regions/regions-outlives-projection-trait-def.rs
diff --git a/src/test/ui/regions/regions-outlives-scalar.rs b/tests/ui/regions/regions-outlives-scalar.rs
index ce34ffcc8..ce34ffcc8 100644
--- a/src/test/ui/regions/regions-outlives-scalar.rs
+++ b/tests/ui/regions/regions-outlives-scalar.rs
diff --git a/src/test/ui/regions/regions-params.rs b/tests/ui/regions/regions-params.rs
index 04f3b8eaf..04f3b8eaf 100644
--- a/src/test/ui/regions/regions-params.rs
+++ b/tests/ui/regions/regions-params.rs
diff --git a/src/test/ui/regions/regions-pattern-typing-issue-19552.rs b/tests/ui/regions/regions-pattern-typing-issue-19552.rs
index a64ab1c85..a64ab1c85 100644
--- a/src/test/ui/regions/regions-pattern-typing-issue-19552.rs
+++ b/tests/ui/regions/regions-pattern-typing-issue-19552.rs
diff --git a/src/test/ui/regions/regions-pattern-typing-issue-19552.stderr b/tests/ui/regions/regions-pattern-typing-issue-19552.stderr
index f77d94a24..f77d94a24 100644
--- a/src/test/ui/regions/regions-pattern-typing-issue-19552.stderr
+++ b/tests/ui/regions/regions-pattern-typing-issue-19552.stderr
diff --git a/src/test/ui/regions/regions-pattern-typing-issue-19997.rs b/tests/ui/regions/regions-pattern-typing-issue-19997.rs
index 39190697f..39190697f 100644
--- a/src/test/ui/regions/regions-pattern-typing-issue-19997.rs
+++ b/tests/ui/regions/regions-pattern-typing-issue-19997.rs
diff --git a/src/test/ui/regions/regions-pattern-typing-issue-19997.stderr b/tests/ui/regions/regions-pattern-typing-issue-19997.stderr
index ae60e3c0d..ae60e3c0d 100644
--- a/src/test/ui/regions/regions-pattern-typing-issue-19997.stderr
+++ b/tests/ui/regions/regions-pattern-typing-issue-19997.stderr
diff --git a/src/test/ui/regions/regions-proc-bound-capture.rs b/tests/ui/regions/regions-proc-bound-capture.rs
index f79d9dc90..f79d9dc90 100644
--- a/src/test/ui/regions/regions-proc-bound-capture.rs
+++ b/tests/ui/regions/regions-proc-bound-capture.rs
diff --git a/src/test/ui/regions/regions-proc-bound-capture.stderr b/tests/ui/regions/regions-proc-bound-capture.stderr
index 60c5246e2..60c5246e2 100644
--- a/src/test/ui/regions/regions-proc-bound-capture.stderr
+++ b/tests/ui/regions/regions-proc-bound-capture.stderr
diff --git a/src/test/ui/regions/regions-reassign-let-bound-pointer.rs b/tests/ui/regions/regions-reassign-let-bound-pointer.rs
index 948b11e0f..948b11e0f 100644
--- a/src/test/ui/regions/regions-reassign-let-bound-pointer.rs
+++ b/tests/ui/regions/regions-reassign-let-bound-pointer.rs
diff --git a/src/test/ui/regions/regions-reassign-match-bound-pointer.rs b/tests/ui/regions/regions-reassign-match-bound-pointer.rs
index ca52659c4..ca52659c4 100644
--- a/src/test/ui/regions/regions-reassign-match-bound-pointer.rs
+++ b/tests/ui/regions/regions-reassign-match-bound-pointer.rs
diff --git a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.rs b/tests/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.rs
index 57871b098..57871b098 100644
--- a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.rs
+++ b/tests/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.rs
diff --git a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.stderr b/tests/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.stderr
index dc905d076..dc905d076 100644
--- a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.stderr
+++ b/tests/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.stderr
diff --git a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.rs b/tests/ui/regions/regions-reborrow-from-shorter-mut-ref.rs
index 88cc54650..88cc54650 100644
--- a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.rs
+++ b/tests/ui/regions/regions-reborrow-from-shorter-mut-ref.rs
diff --git a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.stderr b/tests/ui/regions/regions-reborrow-from-shorter-mut-ref.stderr
index c98ec4774..c98ec4774 100644
--- a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.stderr
+++ b/tests/ui/regions/regions-reborrow-from-shorter-mut-ref.stderr
diff --git a/src/test/ui/regions/regions-ref-in-fn-arg.rs b/tests/ui/regions/regions-ref-in-fn-arg.rs
index 3df529c9f..3df529c9f 100644
--- a/src/test/ui/regions/regions-ref-in-fn-arg.rs
+++ b/tests/ui/regions/regions-ref-in-fn-arg.rs
diff --git a/src/test/ui/regions/regions-ref-in-fn-arg.stderr b/tests/ui/regions/regions-ref-in-fn-arg.stderr
index ccba6c59b..ccba6c59b 100644
--- a/src/test/ui/regions/regions-ref-in-fn-arg.stderr
+++ b/tests/ui/regions/regions-ref-in-fn-arg.stderr
diff --git a/src/test/ui/regions/regions-refcell.rs b/tests/ui/regions/regions-refcell.rs
index 39ad0c53f..39ad0c53f 100644
--- a/src/test/ui/regions/regions-refcell.rs
+++ b/tests/ui/regions/regions-refcell.rs
diff --git a/src/test/ui/regions/regions-relate-bound-regions-on-closures-to-inference-variables.rs b/tests/ui/regions/regions-relate-bound-regions-on-closures-to-inference-variables.rs
index b1bdb813a..b1bdb813a 100644
--- a/src/test/ui/regions/regions-relate-bound-regions-on-closures-to-inference-variables.rs
+++ b/tests/ui/regions/regions-relate-bound-regions-on-closures-to-inference-variables.rs
diff --git a/src/test/ui/regions/regions-ret-borrowed-1.rs b/tests/ui/regions/regions-ret-borrowed-1.rs
index 54630caff..54630caff 100644
--- a/src/test/ui/regions/regions-ret-borrowed-1.rs
+++ b/tests/ui/regions/regions-ret-borrowed-1.rs
diff --git a/src/test/ui/regions/regions-ret-borrowed-1.stderr b/tests/ui/regions/regions-ret-borrowed-1.stderr
index 0784e894e..0784e894e 100644
--- a/src/test/ui/regions/regions-ret-borrowed-1.stderr
+++ b/tests/ui/regions/regions-ret-borrowed-1.stderr
diff --git a/src/test/ui/regions/regions-ret-borrowed.rs b/tests/ui/regions/regions-ret-borrowed.rs
index bdb0341c9..bdb0341c9 100644
--- a/src/test/ui/regions/regions-ret-borrowed.rs
+++ b/tests/ui/regions/regions-ret-borrowed.rs
diff --git a/src/test/ui/regions/regions-ret-borrowed.stderr b/tests/ui/regions/regions-ret-borrowed.stderr
index d9be5ef89..d9be5ef89 100644
--- a/src/test/ui/regions/regions-ret-borrowed.stderr
+++ b/tests/ui/regions/regions-ret-borrowed.stderr
diff --git a/src/test/ui/regions/regions-ret.rs b/tests/ui/regions/regions-ret.rs
index 580545ef8..580545ef8 100644
--- a/src/test/ui/regions/regions-ret.rs
+++ b/tests/ui/regions/regions-ret.rs
diff --git a/src/test/ui/regions/regions-ret.stderr b/tests/ui/regions/regions-ret.stderr
index 0e4875ac9..0e4875ac9 100644
--- a/src/test/ui/regions/regions-ret.stderr
+++ b/tests/ui/regions/regions-ret.stderr
diff --git a/src/test/ui/regions/regions-return-interior-of-option.rs b/tests/ui/regions/regions-return-interior-of-option.rs
index 2dc91ec84..2dc91ec84 100644
--- a/src/test/ui/regions/regions-return-interior-of-option.rs
+++ b/tests/ui/regions/regions-return-interior-of-option.rs
diff --git a/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.rs b/tests/ui/regions/regions-return-ref-to-upvar-issue-17403.rs
index 86e759f08..86e759f08 100644
--- a/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.rs
+++ b/tests/ui/regions/regions-return-ref-to-upvar-issue-17403.rs
diff --git a/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.stderr b/tests/ui/regions/regions-return-ref-to-upvar-issue-17403.stderr
index b087e03b4..b087e03b4 100644
--- a/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.stderr
+++ b/tests/ui/regions/regions-return-ref-to-upvar-issue-17403.stderr
diff --git a/src/test/ui/regions/regions-return-stack-allocated-vec.rs b/tests/ui/regions/regions-return-stack-allocated-vec.rs
index 97fbdbf46..97fbdbf46 100644
--- a/src/test/ui/regions/regions-return-stack-allocated-vec.rs
+++ b/tests/ui/regions/regions-return-stack-allocated-vec.rs
diff --git a/src/test/ui/regions/regions-return-stack-allocated-vec.stderr b/tests/ui/regions/regions-return-stack-allocated-vec.stderr
index 9d87fe266..9d87fe266 100644
--- a/src/test/ui/regions/regions-return-stack-allocated-vec.stderr
+++ b/tests/ui/regions/regions-return-stack-allocated-vec.stderr
diff --git a/src/test/ui/regions/regions-scope-chain-example.rs b/tests/ui/regions/regions-scope-chain-example.rs
index 2beb20add..2beb20add 100644
--- a/src/test/ui/regions/regions-scope-chain-example.rs
+++ b/tests/ui/regions/regions-scope-chain-example.rs
diff --git a/src/test/ui/regions/regions-self-impls.rs b/tests/ui/regions/regions-self-impls.rs
index 80b88568e..80b88568e 100644
--- a/src/test/ui/regions/regions-self-impls.rs
+++ b/tests/ui/regions/regions-self-impls.rs
diff --git a/src/test/ui/regions/regions-self-in-enums.rs b/tests/ui/regions/regions-self-in-enums.rs
index c2e4b2ff1..c2e4b2ff1 100644
--- a/src/test/ui/regions/regions-self-in-enums.rs
+++ b/tests/ui/regions/regions-self-in-enums.rs
diff --git a/src/test/ui/regions/regions-simple.rs b/tests/ui/regions/regions-simple.rs
index fff1b47f5..fff1b47f5 100644
--- a/src/test/ui/regions/regions-simple.rs
+++ b/tests/ui/regions/regions-simple.rs
diff --git a/src/test/ui/regions/regions-static-bound-rpass.rs b/tests/ui/regions/regions-static-bound-rpass.rs
index 25232b455..25232b455 100644
--- a/src/test/ui/regions/regions-static-bound-rpass.rs
+++ b/tests/ui/regions/regions-static-bound-rpass.rs
diff --git a/src/test/ui/regions/regions-static-bound-rpass.stderr b/tests/ui/regions/regions-static-bound-rpass.stderr
index 9355a409d..9355a409d 100644
--- a/src/test/ui/regions/regions-static-bound-rpass.stderr
+++ b/tests/ui/regions/regions-static-bound-rpass.stderr
diff --git a/src/test/ui/regions/regions-static-bound.rs b/tests/ui/regions/regions-static-bound.rs
index 4d2455470..4d2455470 100644
--- a/src/test/ui/regions/regions-static-bound.rs
+++ b/tests/ui/regions/regions-static-bound.rs
diff --git a/src/test/ui/regions/regions-static-bound.stderr b/tests/ui/regions/regions-static-bound.stderr
index 2886ec3ea..2886ec3ea 100644
--- a/src/test/ui/regions/regions-static-bound.stderr
+++ b/tests/ui/regions/regions-static-bound.stderr
diff --git a/src/test/ui/regions/regions-static-closure.rs b/tests/ui/regions/regions-static-closure.rs
index 09cd56220..09cd56220 100644
--- a/src/test/ui/regions/regions-static-closure.rs
+++ b/tests/ui/regions/regions-static-closure.rs
diff --git a/src/test/ui/regions/regions-steal-closure.rs b/tests/ui/regions/regions-steal-closure.rs
index 83e93522c..83e93522c 100644
--- a/src/test/ui/regions/regions-steal-closure.rs
+++ b/tests/ui/regions/regions-steal-closure.rs
diff --git a/src/test/ui/regions/regions-steal-closure.stderr b/tests/ui/regions/regions-steal-closure.stderr
index 5b0efaf95..5b0efaf95 100644
--- a/src/test/ui/regions/regions-steal-closure.stderr
+++ b/tests/ui/regions/regions-steal-closure.stderr
diff --git a/src/test/ui/regions/regions-trait-1.rs b/tests/ui/regions/regions-trait-1.rs
index b6dab1c32..b6dab1c32 100644
--- a/src/test/ui/regions/regions-trait-1.rs
+++ b/tests/ui/regions/regions-trait-1.rs
diff --git a/src/test/ui/regions/regions-trait-object-1.rs b/tests/ui/regions/regions-trait-object-1.rs
index e2520d978..e2520d978 100644
--- a/src/test/ui/regions/regions-trait-object-1.rs
+++ b/tests/ui/regions/regions-trait-object-1.rs
diff --git a/src/test/ui/regions/regions-trait-object-subtyping.rs b/tests/ui/regions/regions-trait-object-subtyping.rs
index 1d7a766de..1d7a766de 100644
--- a/src/test/ui/regions/regions-trait-object-subtyping.rs
+++ b/tests/ui/regions/regions-trait-object-subtyping.rs
diff --git a/src/test/ui/regions/regions-trait-object-subtyping.stderr b/tests/ui/regions/regions-trait-object-subtyping.stderr
index 1b3a116d5..1b3a116d5 100644
--- a/src/test/ui/regions/regions-trait-object-subtyping.stderr
+++ b/tests/ui/regions/regions-trait-object-subtyping.stderr
diff --git a/src/test/ui/regions/regions-trait-variance.rs b/tests/ui/regions/regions-trait-variance.rs
index 94ffb85c9..94ffb85c9 100644
--- a/src/test/ui/regions/regions-trait-variance.rs
+++ b/tests/ui/regions/regions-trait-variance.rs
diff --git a/src/test/ui/regions/regions-trait-variance.stderr b/tests/ui/regions/regions-trait-variance.stderr
index 56c9f89e1..56c9f89e1 100644
--- a/src/test/ui/regions/regions-trait-variance.stderr
+++ b/tests/ui/regions/regions-trait-variance.stderr
diff --git a/src/test/ui/regions/regions-undeclared.rs b/tests/ui/regions/regions-undeclared.rs
index 1edd998aa..1edd998aa 100644
--- a/src/test/ui/regions/regions-undeclared.rs
+++ b/tests/ui/regions/regions-undeclared.rs
diff --git a/src/test/ui/regions/regions-undeclared.stderr b/tests/ui/regions/regions-undeclared.stderr
index 6bfde5524..6bfde5524 100644
--- a/src/test/ui/regions/regions-undeclared.stderr
+++ b/tests/ui/regions/regions-undeclared.stderr
diff --git a/src/test/ui/regions/regions-var-type-out-of-scope.rs b/tests/ui/regions/regions-var-type-out-of-scope.rs
index aba55e9df..aba55e9df 100644
--- a/src/test/ui/regions/regions-var-type-out-of-scope.rs
+++ b/tests/ui/regions/regions-var-type-out-of-scope.rs
diff --git a/src/test/ui/regions/regions-var-type-out-of-scope.stderr b/tests/ui/regions/regions-var-type-out-of-scope.stderr
index c32bbe0ee..c32bbe0ee 100644
--- a/src/test/ui/regions/regions-var-type-out-of-scope.stderr
+++ b/tests/ui/regions/regions-var-type-out-of-scope.stderr
diff --git a/src/test/ui/regions/regions-variance-contravariant-use-contravariant.rs b/tests/ui/regions/regions-variance-contravariant-use-contravariant.rs
index e63778670..e63778670 100644
--- a/src/test/ui/regions/regions-variance-contravariant-use-contravariant.rs
+++ b/tests/ui/regions/regions-variance-contravariant-use-contravariant.rs
diff --git a/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.rs b/tests/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.rs
index f23ca537f..f23ca537f 100644
--- a/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.rs
+++ b/tests/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.rs
diff --git a/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.stderr b/tests/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.stderr
index 5352be430..5352be430 100644
--- a/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.stderr
+++ b/tests/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.stderr
diff --git a/src/test/ui/regions/regions-variance-contravariant-use-covariant.rs b/tests/ui/regions/regions-variance-contravariant-use-covariant.rs
index c73577cb3..c73577cb3 100644
--- a/src/test/ui/regions/regions-variance-contravariant-use-covariant.rs
+++ b/tests/ui/regions/regions-variance-contravariant-use-covariant.rs
diff --git a/src/test/ui/regions/regions-variance-contravariant-use-covariant.stderr b/tests/ui/regions/regions-variance-contravariant-use-covariant.stderr
index 22c9b915b..22c9b915b 100644
--- a/src/test/ui/regions/regions-variance-contravariant-use-covariant.stderr
+++ b/tests/ui/regions/regions-variance-contravariant-use-covariant.stderr
diff --git a/src/test/ui/regions/regions-variance-covariant-use-contravariant.rs b/tests/ui/regions/regions-variance-covariant-use-contravariant.rs
index a2183b491..a2183b491 100644
--- a/src/test/ui/regions/regions-variance-covariant-use-contravariant.rs
+++ b/tests/ui/regions/regions-variance-covariant-use-contravariant.rs
diff --git a/src/test/ui/regions/regions-variance-covariant-use-contravariant.stderr b/tests/ui/regions/regions-variance-covariant-use-contravariant.stderr
index a07181ad5..a07181ad5 100644
--- a/src/test/ui/regions/regions-variance-covariant-use-contravariant.stderr
+++ b/tests/ui/regions/regions-variance-covariant-use-contravariant.stderr
diff --git a/src/test/ui/regions/regions-variance-covariant-use-covariant.rs b/tests/ui/regions/regions-variance-covariant-use-covariant.rs
index c5c80ce54..c5c80ce54 100644
--- a/src/test/ui/regions/regions-variance-covariant-use-covariant.rs
+++ b/tests/ui/regions/regions-variance-covariant-use-covariant.rs
diff --git a/src/test/ui/regions/regions-variance-invariant-use-contravariant.rs b/tests/ui/regions/regions-variance-invariant-use-contravariant.rs
index a81aaa9c7..a81aaa9c7 100644
--- a/src/test/ui/regions/regions-variance-invariant-use-contravariant.rs
+++ b/tests/ui/regions/regions-variance-invariant-use-contravariant.rs
diff --git a/src/test/ui/regions/regions-variance-invariant-use-contravariant.stderr b/tests/ui/regions/regions-variance-invariant-use-contravariant.stderr
index b35a2cb90..b35a2cb90 100644
--- a/src/test/ui/regions/regions-variance-invariant-use-contravariant.stderr
+++ b/tests/ui/regions/regions-variance-invariant-use-contravariant.stderr
diff --git a/src/test/ui/regions/regions-variance-invariant-use-covariant.rs b/tests/ui/regions/regions-variance-invariant-use-covariant.rs
index ab6a82ee7..ab6a82ee7 100644
--- a/src/test/ui/regions/regions-variance-invariant-use-covariant.rs
+++ b/tests/ui/regions/regions-variance-invariant-use-covariant.rs
diff --git a/src/test/ui/regions/regions-variance-invariant-use-covariant.stderr b/tests/ui/regions/regions-variance-invariant-use-covariant.stderr
index 761e78d17..761e78d17 100644
--- a/src/test/ui/regions/regions-variance-invariant-use-covariant.stderr
+++ b/tests/ui/regions/regions-variance-invariant-use-covariant.stderr
diff --git a/src/test/ui/regions/regions-wf-trait-object.rs b/tests/ui/regions/regions-wf-trait-object.rs
index d0053b202..d0053b202 100644
--- a/src/test/ui/regions/regions-wf-trait-object.rs
+++ b/tests/ui/regions/regions-wf-trait-object.rs
diff --git a/src/test/ui/regions/regions-wf-trait-object.stderr b/tests/ui/regions/regions-wf-trait-object.stderr
index f6006ca04..f6006ca04 100644
--- a/src/test/ui/regions/regions-wf-trait-object.stderr
+++ b/tests/ui/regions/regions-wf-trait-object.stderr
diff --git a/src/test/ui/regions/type-param-outlives-reempty-issue-74429-2.rs b/tests/ui/regions/type-param-outlives-reempty-issue-74429-2.rs
index a65c17e0e..a65c17e0e 100644
--- a/src/test/ui/regions/type-param-outlives-reempty-issue-74429-2.rs
+++ b/tests/ui/regions/type-param-outlives-reempty-issue-74429-2.rs
diff --git a/src/test/ui/regions/type-param-outlives-reempty-issue-74429.rs b/tests/ui/regions/type-param-outlives-reempty-issue-74429.rs
index d463f311c..d463f311c 100644
--- a/src/test/ui/regions/type-param-outlives-reempty-issue-74429.rs
+++ b/tests/ui/regions/type-param-outlives-reempty-issue-74429.rs
diff --git a/src/test/ui/regions/wf-bound-region-in-object-type.rs b/tests/ui/regions/wf-bound-region-in-object-type.rs
index 7c4dd3ec8..7c4dd3ec8 100644
--- a/src/test/ui/regions/wf-bound-region-in-object-type.rs
+++ b/tests/ui/regions/wf-bound-region-in-object-type.rs
diff --git a/src/test/ui/reify-intrinsic.rs b/tests/ui/reify-intrinsic.rs
index 9eb2f7240..9eb2f7240 100644
--- a/src/test/ui/reify-intrinsic.rs
+++ b/tests/ui/reify-intrinsic.rs
diff --git a/src/test/ui/reify-intrinsic.stderr b/tests/ui/reify-intrinsic.stderr
index f78f1d822..f78f1d822 100644
--- a/src/test/ui/reify-intrinsic.stderr
+++ b/tests/ui/reify-intrinsic.stderr
diff --git a/src/test/ui/removing-extern-crate.fixed b/tests/ui/removing-extern-crate.fixed
index 8dbd0395b..8dbd0395b 100644
--- a/src/test/ui/removing-extern-crate.fixed
+++ b/tests/ui/removing-extern-crate.fixed
diff --git a/src/test/ui/removing-extern-crate.rs b/tests/ui/removing-extern-crate.rs
index 465e1360c..465e1360c 100644
--- a/src/test/ui/removing-extern-crate.rs
+++ b/tests/ui/removing-extern-crate.rs
diff --git a/src/test/ui/removing-extern-crate.stderr b/tests/ui/removing-extern-crate.stderr
index 4dddf160c..4dddf160c 100644
--- a/src/test/ui/removing-extern-crate.stderr
+++ b/tests/ui/removing-extern-crate.stderr
diff --git a/src/test/ui/repeat-expr/infer.rs b/tests/ui/repeat-expr/infer.rs
index 8197713b9..8197713b9 100644
--- a/src/test/ui/repeat-expr/infer.rs
+++ b/tests/ui/repeat-expr/infer.rs
diff --git a/src/test/ui/repeat-expr/repeat-expr-in-static.rs b/tests/ui/repeat-expr/repeat-expr-in-static.rs
index 0b8953793..0b8953793 100644
--- a/src/test/ui/repeat-expr/repeat-expr-in-static.rs
+++ b/tests/ui/repeat-expr/repeat-expr-in-static.rs
diff --git a/src/test/ui/repeat-expr/repeat-to-run-dtor-twice.rs b/tests/ui/repeat-expr/repeat-to-run-dtor-twice.rs
index 0cd8eceef..0cd8eceef 100644
--- a/src/test/ui/repeat-expr/repeat-to-run-dtor-twice.rs
+++ b/tests/ui/repeat-expr/repeat-to-run-dtor-twice.rs
diff --git a/src/test/ui/repeat-expr/repeat-to-run-dtor-twice.stderr b/tests/ui/repeat-expr/repeat-to-run-dtor-twice.stderr
index 36b936163..36b936163 100644
--- a/src/test/ui/repeat-expr/repeat-to-run-dtor-twice.stderr
+++ b/tests/ui/repeat-expr/repeat-to-run-dtor-twice.stderr
diff --git a/src/test/ui/repeat-expr/repeat_count.rs b/tests/ui/repeat-expr/repeat_count.rs
index 96abff4ab..96abff4ab 100644
--- a/src/test/ui/repeat-expr/repeat_count.rs
+++ b/tests/ui/repeat-expr/repeat_count.rs
diff --git a/src/test/ui/repeat-expr/repeat_count.stderr b/tests/ui/repeat-expr/repeat_count.stderr
index e222c141f..e222c141f 100644
--- a/src/test/ui/repeat-expr/repeat_count.stderr
+++ b/tests/ui/repeat-expr/repeat_count.stderr
diff --git a/src/test/ui/repr/align-with-extern-c-fn.rs b/tests/ui/repr/align-with-extern-c-fn.rs
index 9e490e27a..9e490e27a 100644
--- a/src/test/ui/repr/align-with-extern-c-fn.rs
+++ b/tests/ui/repr/align-with-extern-c-fn.rs
diff --git a/src/test/ui/repr/aligned_enum_cast.rs b/tests/ui/repr/aligned_enum_cast.rs
index 1ddf12717..1ddf12717 100644
--- a/src/test/ui/repr/aligned_enum_cast.rs
+++ b/tests/ui/repr/aligned_enum_cast.rs
diff --git a/src/test/ui/repr/attr-usage-repr.rs b/tests/ui/repr/attr-usage-repr.rs
index 8965decc3..8965decc3 100644
--- a/src/test/ui/repr/attr-usage-repr.rs
+++ b/tests/ui/repr/attr-usage-repr.rs
diff --git a/src/test/ui/repr/attr-usage-repr.stderr b/tests/ui/repr/attr-usage-repr.stderr
index 42f65625a..42f65625a 100644
--- a/src/test/ui/repr/attr-usage-repr.stderr
+++ b/tests/ui/repr/attr-usage-repr.stderr
diff --git a/src/test/ui/repr/auxiliary/repr-transparent-non-exhaustive.rs b/tests/ui/repr/auxiliary/repr-transparent-non-exhaustive.rs
index 4bf6b54fe..4bf6b54fe 100644
--- a/src/test/ui/repr/auxiliary/repr-transparent-non-exhaustive.rs
+++ b/tests/ui/repr/auxiliary/repr-transparent-non-exhaustive.rs
diff --git a/src/test/ui/repr/invalid_repr_list_help.rs b/tests/ui/repr/invalid_repr_list_help.rs
index c32098453..c32098453 100644
--- a/src/test/ui/repr/invalid_repr_list_help.rs
+++ b/tests/ui/repr/invalid_repr_list_help.rs
diff --git a/src/test/ui/repr/invalid_repr_list_help.stderr b/tests/ui/repr/invalid_repr_list_help.stderr
index 2acd56d9a..2acd56d9a 100644
--- a/src/test/ui/repr/invalid_repr_list_help.stderr
+++ b/tests/ui/repr/invalid_repr_list_help.stderr
diff --git a/src/test/ui/repr/issue-83505-repr-simd.rs b/tests/ui/repr/issue-83505-repr-simd.rs
index 280b771d0..280b771d0 100644
--- a/src/test/ui/repr/issue-83505-repr-simd.rs
+++ b/tests/ui/repr/issue-83505-repr-simd.rs
diff --git a/src/test/ui/repr/issue-83505-repr-simd.stderr b/tests/ui/repr/issue-83505-repr-simd.stderr
index df99baaf5..df99baaf5 100644
--- a/src/test/ui/repr/issue-83505-repr-simd.stderr
+++ b/tests/ui/repr/issue-83505-repr-simd.stderr
diff --git a/src/test/ui/repr/issue-83921-ice.rs b/tests/ui/repr/issue-83921-ice.rs
index 70583eb9b..70583eb9b 100644
--- a/src/test/ui/repr/issue-83921-ice.rs
+++ b/tests/ui/repr/issue-83921-ice.rs
diff --git a/src/test/ui/repr/issue-83921-ice.stderr b/tests/ui/repr/issue-83921-ice.stderr
index 32c450410..32c450410 100644
--- a/src/test/ui/repr/issue-83921-ice.stderr
+++ b/tests/ui/repr/issue-83921-ice.stderr
diff --git a/src/test/ui/repr/repr-align-assign.fixed b/tests/ui/repr/repr-align-assign.fixed
index 59ca22e97..59ca22e97 100644
--- a/src/test/ui/repr/repr-align-assign.fixed
+++ b/tests/ui/repr/repr-align-assign.fixed
diff --git a/src/test/ui/repr/repr-align-assign.rs b/tests/ui/repr/repr-align-assign.rs
index 6b7799297..6b7799297 100644
--- a/src/test/ui/repr/repr-align-assign.rs
+++ b/tests/ui/repr/repr-align-assign.rs
diff --git a/src/test/ui/repr/repr-align-assign.stderr b/tests/ui/repr/repr-align-assign.stderr
index b878ae0d1..b878ae0d1 100644
--- a/src/test/ui/repr/repr-align-assign.stderr
+++ b/tests/ui/repr/repr-align-assign.stderr
diff --git a/src/test/ui/repr/repr-align.rs b/tests/ui/repr/repr-align.rs
index 58ecf9a51..58ecf9a51 100644
--- a/src/test/ui/repr/repr-align.rs
+++ b/tests/ui/repr/repr-align.rs
diff --git a/src/test/ui/repr/repr-align.stderr b/tests/ui/repr/repr-align.stderr
index 900a811bb..900a811bb 100644
--- a/src/test/ui/repr/repr-align.stderr
+++ b/tests/ui/repr/repr-align.stderr
diff --git a/src/test/ui/repr/repr-disallow-on-variant.rs b/tests/ui/repr/repr-disallow-on-variant.rs
index d9bd0b0e3..d9bd0b0e3 100644
--- a/src/test/ui/repr/repr-disallow-on-variant.rs
+++ b/tests/ui/repr/repr-disallow-on-variant.rs
diff --git a/src/test/ui/repr/repr-disallow-on-variant.stderr b/tests/ui/repr/repr-disallow-on-variant.stderr
index f7e4dcc9d..f7e4dcc9d 100644
--- a/src/test/ui/repr/repr-disallow-on-variant.stderr
+++ b/tests/ui/repr/repr-disallow-on-variant.stderr
diff --git a/src/test/ui/repr/repr-packed-contains-align.rs b/tests/ui/repr/repr-packed-contains-align.rs
index bef5c7d8c..bef5c7d8c 100644
--- a/src/test/ui/repr/repr-packed-contains-align.rs
+++ b/tests/ui/repr/repr-packed-contains-align.rs
diff --git a/src/test/ui/repr/repr-packed-contains-align.stderr b/tests/ui/repr/repr-packed-contains-align.stderr
index 4c3a960ca..4c3a960ca 100644
--- a/src/test/ui/repr/repr-packed-contains-align.stderr
+++ b/tests/ui/repr/repr-packed-contains-align.stderr
diff --git a/src/test/ui/repr/repr-transparent-issue-87496.rs b/tests/ui/repr/repr-transparent-issue-87496.rs
index a4dd45c63..a4dd45c63 100644
--- a/src/test/ui/repr/repr-transparent-issue-87496.rs
+++ b/tests/ui/repr/repr-transparent-issue-87496.rs
diff --git a/src/test/ui/repr/repr-transparent-issue-87496.stderr b/tests/ui/repr/repr-transparent-issue-87496.stderr
index aee31212b..aee31212b 100644
--- a/src/test/ui/repr/repr-transparent-issue-87496.stderr
+++ b/tests/ui/repr/repr-transparent-issue-87496.stderr
diff --git a/src/test/ui/repr/repr-transparent-non-exhaustive.rs b/tests/ui/repr/repr-transparent-non-exhaustive.rs
index 506f1dcf3..506f1dcf3 100644
--- a/src/test/ui/repr/repr-transparent-non-exhaustive.rs
+++ b/tests/ui/repr/repr-transparent-non-exhaustive.rs
diff --git a/src/test/ui/repr/repr-transparent-non-exhaustive.stderr b/tests/ui/repr/repr-transparent-non-exhaustive.stderr
index 16edf59c7..16edf59c7 100644
--- a/src/test/ui/repr/repr-transparent-non-exhaustive.stderr
+++ b/tests/ui/repr/repr-transparent-non-exhaustive.stderr
diff --git a/src/test/ui/repr/repr-transparent-other-items.rs b/tests/ui/repr/repr-transparent-other-items.rs
index e537e3e1a..e537e3e1a 100644
--- a/src/test/ui/repr/repr-transparent-other-items.rs
+++ b/tests/ui/repr/repr-transparent-other-items.rs
diff --git a/src/test/ui/repr/repr-transparent-other-items.stderr b/tests/ui/repr/repr-transparent-other-items.stderr
index 14e6f13e1..14e6f13e1 100644
--- a/src/test/ui/repr/repr-transparent-other-items.stderr
+++ b/tests/ui/repr/repr-transparent-other-items.stderr
diff --git a/src/test/ui/repr/repr-transparent-other-reprs.rs b/tests/ui/repr/repr-transparent-other-reprs.rs
index 0cd0edf32..0cd0edf32 100644
--- a/src/test/ui/repr/repr-transparent-other-reprs.rs
+++ b/tests/ui/repr/repr-transparent-other-reprs.rs
diff --git a/src/test/ui/repr/repr-transparent-other-reprs.stderr b/tests/ui/repr/repr-transparent-other-reprs.stderr
index d92c35811..d92c35811 100644
--- a/src/test/ui/repr/repr-transparent-other-reprs.stderr
+++ b/tests/ui/repr/repr-transparent-other-reprs.stderr
diff --git a/src/test/ui/repr/repr-transparent.rs b/tests/ui/repr/repr-transparent.rs
index 8c9d1639c..8c9d1639c 100644
--- a/src/test/ui/repr/repr-transparent.rs
+++ b/tests/ui/repr/repr-transparent.rs
diff --git a/src/test/ui/repr/repr-transparent.stderr b/tests/ui/repr/repr-transparent.stderr
index f1c570b95..f1c570b95 100644
--- a/src/test/ui/repr/repr-transparent.stderr
+++ b/tests/ui/repr/repr-transparent.stderr
diff --git a/src/test/ui/repr/repr.rs b/tests/ui/repr/repr.rs
index 564d67326..564d67326 100644
--- a/src/test/ui/repr/repr.rs
+++ b/tests/ui/repr/repr.rs
diff --git a/src/test/ui/repr/repr.stderr b/tests/ui/repr/repr.stderr
index e0bec6663..e0bec6663 100644
--- a/src/test/ui/repr/repr.stderr
+++ b/tests/ui/repr/repr.stderr
diff --git a/src/test/ui/repr/repr_c_int_align.rs b/tests/ui/repr/repr_c_int_align.rs
index fdd14fc2d..fdd14fc2d 100644
--- a/src/test/ui/repr/repr_c_int_align.rs
+++ b/tests/ui/repr/repr_c_int_align.rs
diff --git a/tests/ui/repr/transparent-enum-too-many-variants.rs b/tests/ui/repr/transparent-enum-too-many-variants.rs
new file mode 100644
index 000000000..0dd4b4e68
--- /dev/null
+++ b/tests/ui/repr/transparent-enum-too-many-variants.rs
@@ -0,0 +1,10 @@
+use std::mem::size_of;
+
+#[repr(transparent)]
+enum Foo { //~ ERROR E0731
+    A(u8), B(u8),
+}
+
+fn main() {
+    println!("Foo: {}", size_of::<Foo>());
+}
diff --git a/tests/ui/repr/transparent-enum-too-many-variants.stderr b/tests/ui/repr/transparent-enum-too-many-variants.stderr
new file mode 100644
index 000000000..fb44757ef
--- /dev/null
+++ b/tests/ui/repr/transparent-enum-too-many-variants.stderr
@@ -0,0 +1,11 @@
+error[E0731]: transparent enum needs exactly one variant, but has 2
+  --> $DIR/transparent-enum-too-many-variants.rs:4:1
+   |
+LL | enum Foo {
+   | ^^^^^^^^ needs exactly one variant, but has 2
+LL |     A(u8), B(u8),
+   |     -      - too many variants in `Foo`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0731`.
diff --git a/src/test/ui/reserved/reserved-attr-on-macro.rs b/tests/ui/reserved/reserved-attr-on-macro.rs
index 2630db0d0..2630db0d0 100644
--- a/src/test/ui/reserved/reserved-attr-on-macro.rs
+++ b/tests/ui/reserved/reserved-attr-on-macro.rs
diff --git a/src/test/ui/reserved/reserved-attr-on-macro.stderr b/tests/ui/reserved/reserved-attr-on-macro.stderr
index e55b58bef..e55b58bef 100644
--- a/src/test/ui/reserved/reserved-attr-on-macro.stderr
+++ b/tests/ui/reserved/reserved-attr-on-macro.stderr
diff --git a/src/test/ui/reserved/reserved-become.rs b/tests/ui/reserved/reserved-become.rs
index 56645255e..56645255e 100644
--- a/src/test/ui/reserved/reserved-become.rs
+++ b/tests/ui/reserved/reserved-become.rs
diff --git a/src/test/ui/reserved/reserved-become.stderr b/tests/ui/reserved/reserved-become.stderr
index 0703b76d6..0703b76d6 100644
--- a/src/test/ui/reserved/reserved-become.stderr
+++ b/tests/ui/reserved/reserved-become.stderr
diff --git a/src/test/ui/resolve/associated-fn-called-as-fn.rs b/tests/ui/resolve/associated-fn-called-as-fn.rs
index f31f3d67b..f31f3d67b 100644
--- a/src/test/ui/resolve/associated-fn-called-as-fn.rs
+++ b/tests/ui/resolve/associated-fn-called-as-fn.rs
diff --git a/src/test/ui/resolve/associated-fn-called-as-fn.stderr b/tests/ui/resolve/associated-fn-called-as-fn.stderr
index fbdea30d5..fbdea30d5 100644
--- a/src/test/ui/resolve/associated-fn-called-as-fn.stderr
+++ b/tests/ui/resolve/associated-fn-called-as-fn.stderr
diff --git a/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo.rs b/tests/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo.rs
index cf769f31b..cf769f31b 100644
--- a/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo.rs
+++ b/tests/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo.rs
diff --git a/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo2.rs b/tests/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
index 81c16ede9..81c16ede9 100644
--- a/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
+++ b/tests/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
diff --git a/src/test/ui/resolve/auxiliary/extern-prelude-vec.rs b/tests/ui/resolve/auxiliary/extern-prelude-vec.rs
index a643c8889..a643c8889 100644
--- a/src/test/ui/resolve/auxiliary/extern-prelude-vec.rs
+++ b/tests/ui/resolve/auxiliary/extern-prelude-vec.rs
diff --git a/src/test/ui/resolve/auxiliary/extern-prelude.rs b/tests/ui/resolve/auxiliary/extern-prelude.rs
index 2fdfd85a1..2fdfd85a1 100644
--- a/src/test/ui/resolve/auxiliary/extern-prelude.rs
+++ b/tests/ui/resolve/auxiliary/extern-prelude.rs
diff --git a/src/test/ui/resolve/auxiliary/issue-19452-aux.rs b/tests/ui/resolve/auxiliary/issue-19452-aux.rs
index 9c7bcec51..9c7bcec51 100644
--- a/src/test/ui/resolve/auxiliary/issue-19452-aux.rs
+++ b/tests/ui/resolve/auxiliary/issue-19452-aux.rs
diff --git a/src/test/ui/resolve/auxiliary/issue-21221-3.rs b/tests/ui/resolve/auxiliary/issue-21221-3.rs
index 176c23180..176c23180 100644
--- a/src/test/ui/resolve/auxiliary/issue-21221-3.rs
+++ b/tests/ui/resolve/auxiliary/issue-21221-3.rs
diff --git a/src/test/ui/resolve/auxiliary/issue-21221-4.rs b/tests/ui/resolve/auxiliary/issue-21221-4.rs
index 5e0d6cbdf..5e0d6cbdf 100644
--- a/src/test/ui/resolve/auxiliary/issue-21221-4.rs
+++ b/tests/ui/resolve/auxiliary/issue-21221-4.rs
diff --git a/src/test/ui/issues/auxiliary/issue-30535.rs b/tests/ui/resolve/auxiliary/issue-30535.rs
index 3608d4a2f..3608d4a2f 100644
--- a/src/test/ui/issues/auxiliary/issue-30535.rs
+++ b/tests/ui/resolve/auxiliary/issue-30535.rs
diff --git a/src/test/ui/resolve/auxiliary/issue-3907.rs b/tests/ui/resolve/auxiliary/issue-3907.rs
index 5dc502930..5dc502930 100644
--- a/src/test/ui/resolve/auxiliary/issue-3907.rs
+++ b/tests/ui/resolve/auxiliary/issue-3907.rs
diff --git a/src/test/ui/resolve/auxiliary/issue-80079.rs b/tests/ui/resolve/auxiliary/issue-80079.rs
index 190ca75ab..190ca75ab 100644
--- a/src/test/ui/resolve/auxiliary/issue-80079.rs
+++ b/tests/ui/resolve/auxiliary/issue-80079.rs
diff --git a/src/test/ui/resolve/auxiliary/namespaced_enums.rs b/tests/ui/resolve/auxiliary/namespaced_enums.rs
index d3548c76c..d3548c76c 100644
--- a/src/test/ui/resolve/auxiliary/namespaced_enums.rs
+++ b/tests/ui/resolve/auxiliary/namespaced_enums.rs
diff --git a/src/test/ui/resolve/auxiliary/privacy-struct-ctor.rs b/tests/ui/resolve/auxiliary/privacy-struct-ctor.rs
index 6d0bc7285..6d0bc7285 100644
--- a/src/test/ui/resolve/auxiliary/privacy-struct-ctor.rs
+++ b/tests/ui/resolve/auxiliary/privacy-struct-ctor.rs
diff --git a/src/test/ui/resolve/bad-env-capture.rs b/tests/ui/resolve/bad-env-capture.rs
index 83fd2544f..83fd2544f 100644
--- a/src/test/ui/resolve/bad-env-capture.rs
+++ b/tests/ui/resolve/bad-env-capture.rs
diff --git a/src/test/ui/resolve/bad-env-capture.stderr b/tests/ui/resolve/bad-env-capture.stderr
index 59b1fabfd..59b1fabfd 100644
--- a/src/test/ui/resolve/bad-env-capture.stderr
+++ b/tests/ui/resolve/bad-env-capture.stderr
diff --git a/src/test/ui/resolve/bad-env-capture2.rs b/tests/ui/resolve/bad-env-capture2.rs
index b04569c9d..b04569c9d 100644
--- a/src/test/ui/resolve/bad-env-capture2.rs
+++ b/tests/ui/resolve/bad-env-capture2.rs
diff --git a/src/test/ui/resolve/bad-env-capture2.stderr b/tests/ui/resolve/bad-env-capture2.stderr
index 811c259de..811c259de 100644
--- a/src/test/ui/resolve/bad-env-capture2.stderr
+++ b/tests/ui/resolve/bad-env-capture2.stderr
diff --git a/src/test/ui/resolve/bad-env-capture3.rs b/tests/ui/resolve/bad-env-capture3.rs
index 62f12fd1a..62f12fd1a 100644
--- a/src/test/ui/resolve/bad-env-capture3.rs
+++ b/tests/ui/resolve/bad-env-capture3.rs
diff --git a/src/test/ui/resolve/bad-env-capture3.stderr b/tests/ui/resolve/bad-env-capture3.stderr
index eab37fde9..eab37fde9 100644
--- a/src/test/ui/resolve/bad-env-capture3.stderr
+++ b/tests/ui/resolve/bad-env-capture3.stderr
diff --git a/src/test/ui/resolve/bad-expr-path.rs b/tests/ui/resolve/bad-expr-path.rs
index 31fc9cf2c..31fc9cf2c 100644
--- a/src/test/ui/resolve/bad-expr-path.rs
+++ b/tests/ui/resolve/bad-expr-path.rs
diff --git a/src/test/ui/resolve/bad-expr-path.stderr b/tests/ui/resolve/bad-expr-path.stderr
index 8261e8e53..8261e8e53 100644
--- a/src/test/ui/resolve/bad-expr-path.stderr
+++ b/tests/ui/resolve/bad-expr-path.stderr
diff --git a/src/test/ui/resolve/bad-expr-path2.rs b/tests/ui/resolve/bad-expr-path2.rs
index eb88edb90..eb88edb90 100644
--- a/src/test/ui/resolve/bad-expr-path2.rs
+++ b/tests/ui/resolve/bad-expr-path2.rs
diff --git a/src/test/ui/resolve/bad-expr-path2.stderr b/tests/ui/resolve/bad-expr-path2.stderr
index 6e11296d9..6e11296d9 100644
--- a/src/test/ui/resolve/bad-expr-path2.stderr
+++ b/tests/ui/resolve/bad-expr-path2.stderr
diff --git a/src/test/ui/resolve/bad-module.rs b/tests/ui/resolve/bad-module.rs
index b23e97c2c..b23e97c2c 100644
--- a/src/test/ui/resolve/bad-module.rs
+++ b/tests/ui/resolve/bad-module.rs
diff --git a/src/test/ui/resolve/bad-module.stderr b/tests/ui/resolve/bad-module.stderr
index 558760c67..558760c67 100644
--- a/src/test/ui/resolve/bad-module.stderr
+++ b/tests/ui/resolve/bad-module.stderr
diff --git a/src/test/ui/resolve/bad-type-env-capture.rs b/tests/ui/resolve/bad-type-env-capture.rs
index 53dfb1313..53dfb1313 100644
--- a/src/test/ui/resolve/bad-type-env-capture.rs
+++ b/tests/ui/resolve/bad-type-env-capture.rs
diff --git a/src/test/ui/resolve/bad-type-env-capture.stderr b/tests/ui/resolve/bad-type-env-capture.stderr
index b6282c2d0..b6282c2d0 100644
--- a/src/test/ui/resolve/bad-type-env-capture.stderr
+++ b/tests/ui/resolve/bad-type-env-capture.stderr
diff --git a/src/test/ui/resolve/blind-item-local-shadow.rs b/tests/ui/resolve/blind-item-local-shadow.rs
index 942aeb6fd..942aeb6fd 100644
--- a/src/test/ui/resolve/blind-item-local-shadow.rs
+++ b/tests/ui/resolve/blind-item-local-shadow.rs
diff --git a/src/test/ui/resolve/blind-item-mixed-crate-use-item.rs b/tests/ui/resolve/blind-item-mixed-crate-use-item.rs
index 36d8ab151..36d8ab151 100644
--- a/src/test/ui/resolve/blind-item-mixed-crate-use-item.rs
+++ b/tests/ui/resolve/blind-item-mixed-crate-use-item.rs
diff --git a/src/test/ui/resolve/blind-item-mixed-use-item.rs b/tests/ui/resolve/blind-item-mixed-use-item.rs
index 4a3905496..4a3905496 100644
--- a/src/test/ui/resolve/blind-item-mixed-use-item.rs
+++ b/tests/ui/resolve/blind-item-mixed-use-item.rs
diff --git a/src/test/ui/resolve/block-with-trait-parent.rs b/tests/ui/resolve/block-with-trait-parent.rs
index bc86f94e9..bc86f94e9 100644
--- a/src/test/ui/resolve/block-with-trait-parent.rs
+++ b/tests/ui/resolve/block-with-trait-parent.rs
diff --git a/src/test/ui/resolve/crate-called-as-function.rs b/tests/ui/resolve/crate-called-as-function.rs
index e8f52c0c0..e8f52c0c0 100644
--- a/src/test/ui/resolve/crate-called-as-function.rs
+++ b/tests/ui/resolve/crate-called-as-function.rs
diff --git a/src/test/ui/resolve/crate-called-as-function.stderr b/tests/ui/resolve/crate-called-as-function.stderr
index eb42349af..eb42349af 100644
--- a/src/test/ui/resolve/crate-called-as-function.stderr
+++ b/tests/ui/resolve/crate-called-as-function.stderr
diff --git a/src/test/ui/resolve/crate-in-paths.rs b/tests/ui/resolve/crate-in-paths.rs
index 7ebd25918..7ebd25918 100644
--- a/src/test/ui/resolve/crate-in-paths.rs
+++ b/tests/ui/resolve/crate-in-paths.rs
diff --git a/src/test/ui/resolve/crate-in-paths.stderr b/tests/ui/resolve/crate-in-paths.stderr
index b7cf49507..b7cf49507 100644
--- a/src/test/ui/resolve/crate-in-paths.stderr
+++ b/tests/ui/resolve/crate-in-paths.stderr
diff --git a/src/test/ui/resolve/editions-crate-root-2015.rs b/tests/ui/resolve/editions-crate-root-2015.rs
index 4c890e3ae..4c890e3ae 100644
--- a/src/test/ui/resolve/editions-crate-root-2015.rs
+++ b/tests/ui/resolve/editions-crate-root-2015.rs
diff --git a/src/test/ui/resolve/editions-crate-root-2015.stderr b/tests/ui/resolve/editions-crate-root-2015.stderr
index 00cdd0c58..00cdd0c58 100644
--- a/src/test/ui/resolve/editions-crate-root-2015.stderr
+++ b/tests/ui/resolve/editions-crate-root-2015.stderr
diff --git a/src/test/ui/resolve/editions-crate-root-2018.rs b/tests/ui/resolve/editions-crate-root-2018.rs
index 61e4329bb..61e4329bb 100644
--- a/src/test/ui/resolve/editions-crate-root-2018.rs
+++ b/tests/ui/resolve/editions-crate-root-2018.rs
diff --git a/src/test/ui/resolve/editions-crate-root-2018.stderr b/tests/ui/resolve/editions-crate-root-2018.stderr
index 967a5a2fc..967a5a2fc 100644
--- a/src/test/ui/resolve/editions-crate-root-2018.stderr
+++ b/tests/ui/resolve/editions-crate-root-2018.stderr
diff --git a/src/test/ui/resolve/enums-are-namespaced-xc.rs b/tests/ui/resolve/enums-are-namespaced-xc.rs
index dfc16d6ce..dfc16d6ce 100644
--- a/src/test/ui/resolve/enums-are-namespaced-xc.rs
+++ b/tests/ui/resolve/enums-are-namespaced-xc.rs
diff --git a/src/test/ui/resolve/enums-are-namespaced-xc.stderr b/tests/ui/resolve/enums-are-namespaced-xc.stderr
index 6448e596d..6448e596d 100644
--- a/src/test/ui/resolve/enums-are-namespaced-xc.stderr
+++ b/tests/ui/resolve/enums-are-namespaced-xc.stderr
diff --git a/src/test/ui/resolve/enums-pats-not-idents.rs b/tests/ui/resolve/enums-pats-not-idents.rs
index 5b918eef6..5b918eef6 100644
--- a/src/test/ui/resolve/enums-pats-not-idents.rs
+++ b/tests/ui/resolve/enums-pats-not-idents.rs
diff --git a/src/test/ui/resolve/enums-pats-not-idents.stderr b/tests/ui/resolve/enums-pats-not-idents.stderr
index 072b88716..072b88716 100644
--- a/src/test/ui/resolve/enums-pats-not-idents.stderr
+++ b/tests/ui/resolve/enums-pats-not-idents.stderr
diff --git a/src/test/ui/resolve/export-fully-qualified.rs b/tests/ui/resolve/export-fully-qualified.rs
index 4e73a2c54..4e73a2c54 100644
--- a/src/test/ui/resolve/export-fully-qualified.rs
+++ b/tests/ui/resolve/export-fully-qualified.rs
diff --git a/src/test/ui/resolve/export-fully-qualified.stderr b/tests/ui/resolve/export-fully-qualified.stderr
index 7ee352e12..7ee352e12 100644
--- a/src/test/ui/resolve/export-fully-qualified.stderr
+++ b/tests/ui/resolve/export-fully-qualified.stderr
diff --git a/src/test/ui/resolve/extern-prelude-fail.rs b/tests/ui/resolve/extern-prelude-fail.rs
index 7d387025a..7d387025a 100644
--- a/src/test/ui/resolve/extern-prelude-fail.rs
+++ b/tests/ui/resolve/extern-prelude-fail.rs
diff --git a/src/test/ui/resolve/extern-prelude-fail.stderr b/tests/ui/resolve/extern-prelude-fail.stderr
index a1591914b..a1591914b 100644
--- a/src/test/ui/resolve/extern-prelude-fail.stderr
+++ b/tests/ui/resolve/extern-prelude-fail.stderr
diff --git a/src/test/ui/resolve/extern-prelude.rs b/tests/ui/resolve/extern-prelude.rs
index 50fed6034..50fed6034 100644
--- a/src/test/ui/resolve/extern-prelude.rs
+++ b/tests/ui/resolve/extern-prelude.rs
diff --git a/src/test/ui/resolve/filter-intrinsics.rs b/tests/ui/resolve/filter-intrinsics.rs
index c0956ef85..c0956ef85 100644
--- a/src/test/ui/resolve/filter-intrinsics.rs
+++ b/tests/ui/resolve/filter-intrinsics.rs
diff --git a/src/test/ui/resolve/filter-intrinsics.stderr b/tests/ui/resolve/filter-intrinsics.stderr
index 955070891..955070891 100644
--- a/src/test/ui/resolve/filter-intrinsics.stderr
+++ b/tests/ui/resolve/filter-intrinsics.stderr
diff --git a/src/test/ui/resolve/impl-items-vis-unresolved.rs b/tests/ui/resolve/impl-items-vis-unresolved.rs
index 1494c1cf9..1494c1cf9 100644
--- a/src/test/ui/resolve/impl-items-vis-unresolved.rs
+++ b/tests/ui/resolve/impl-items-vis-unresolved.rs
diff --git a/src/test/ui/resolve/impl-items-vis-unresolved.stderr b/tests/ui/resolve/impl-items-vis-unresolved.stderr
index f2293d28e..f2293d28e 100644
--- a/src/test/ui/resolve/impl-items-vis-unresolved.stderr
+++ b/tests/ui/resolve/impl-items-vis-unresolved.stderr
diff --git a/src/test/ui/resolve/issue-100365.rs b/tests/ui/resolve/issue-100365.rs
index 1d8835036..1d8835036 100644
--- a/src/test/ui/resolve/issue-100365.rs
+++ b/tests/ui/resolve/issue-100365.rs
diff --git a/src/test/ui/resolve/issue-100365.stderr b/tests/ui/resolve/issue-100365.stderr
index 372d77266..372d77266 100644
--- a/src/test/ui/resolve/issue-100365.stderr
+++ b/tests/ui/resolve/issue-100365.stderr
diff --git a/src/test/ui/resolve/issue-101749-2.rs b/tests/ui/resolve/issue-101749-2.rs
index 4d3d46944..4d3d46944 100644
--- a/src/test/ui/resolve/issue-101749-2.rs
+++ b/tests/ui/resolve/issue-101749-2.rs
diff --git a/src/test/ui/resolve/issue-101749-2.stderr b/tests/ui/resolve/issue-101749-2.stderr
index 370d4b145..370d4b145 100644
--- a/src/test/ui/resolve/issue-101749-2.stderr
+++ b/tests/ui/resolve/issue-101749-2.stderr
diff --git a/src/test/ui/resolve/issue-101749.fixed b/tests/ui/resolve/issue-101749.fixed
index 3e5544296..3e5544296 100644
--- a/src/test/ui/resolve/issue-101749.fixed
+++ b/tests/ui/resolve/issue-101749.fixed
diff --git a/src/test/ui/resolve/issue-101749.rs b/tests/ui/resolve/issue-101749.rs
index fd67ccab6..fd67ccab6 100644
--- a/src/test/ui/resolve/issue-101749.rs
+++ b/tests/ui/resolve/issue-101749.rs
diff --git a/src/test/ui/resolve/issue-101749.stderr b/tests/ui/resolve/issue-101749.stderr
index dd29d7fc0..dd29d7fc0 100644
--- a/src/test/ui/resolve/issue-101749.stderr
+++ b/tests/ui/resolve/issue-101749.stderr
diff --git a/src/test/ui/resolve/issue-10200.rs b/tests/ui/resolve/issue-10200.rs
index fe36a7e00..fe36a7e00 100644
--- a/src/test/ui/resolve/issue-10200.rs
+++ b/tests/ui/resolve/issue-10200.rs
diff --git a/src/test/ui/resolve/issue-10200.stderr b/tests/ui/resolve/issue-10200.stderr
index e60489f5b..e60489f5b 100644
--- a/src/test/ui/resolve/issue-10200.stderr
+++ b/tests/ui/resolve/issue-10200.stderr
diff --git a/src/test/ui/resolve/issue-102946.rs b/tests/ui/resolve/issue-102946.rs
index c6feca6f3..c6feca6f3 100644
--- a/src/test/ui/resolve/issue-102946.rs
+++ b/tests/ui/resolve/issue-102946.rs
diff --git a/src/test/ui/resolve/issue-102946.stderr b/tests/ui/resolve/issue-102946.stderr
index 65be0258e..65be0258e 100644
--- a/src/test/ui/resolve/issue-102946.stderr
+++ b/tests/ui/resolve/issue-102946.stderr
diff --git a/src/test/ui/resolve/issue-103202.rs b/tests/ui/resolve/issue-103202.rs
index 469d9d7c8..469d9d7c8 100644
--- a/src/test/ui/resolve/issue-103202.rs
+++ b/tests/ui/resolve/issue-103202.rs
diff --git a/tests/ui/resolve/issue-103202.stderr b/tests/ui/resolve/issue-103202.stderr
new file mode 100644
index 000000000..d4d141fb0
--- /dev/null
+++ b/tests/ui/resolve/issue-103202.stderr
@@ -0,0 +1,14 @@
+error[E0223]: ambiguous associated type
+  --> $DIR/issue-103202.rs:4:17
+   |
+LL |     fn f(self: &S::x) {}
+   |                 ^^^^
+   |
+help: if there were a trait named `Example` with associated type `x` implemented for `S`, you could use the fully-qualified path
+   |
+LL |     fn f(self: &<S as Example>::x) {}
+   |                 ~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/resolve/issue-103474.rs b/tests/ui/resolve/issue-103474.rs
index 14f2259e1..14f2259e1 100644
--- a/src/test/ui/resolve/issue-103474.rs
+++ b/tests/ui/resolve/issue-103474.rs
diff --git a/src/test/ui/resolve/issue-103474.stderr b/tests/ui/resolve/issue-103474.stderr
index 415d23155..415d23155 100644
--- a/src/test/ui/resolve/issue-103474.stderr
+++ b/tests/ui/resolve/issue-103474.stderr
diff --git a/tests/ui/resolve/issue-104700-inner_scope.rs b/tests/ui/resolve/issue-104700-inner_scope.rs
new file mode 100644
index 000000000..e8f28c113
--- /dev/null
+++ b/tests/ui/resolve/issue-104700-inner_scope.rs
@@ -0,0 +1,11 @@
+fn main() {
+    let foo = 1;
+    {
+        let bar = 2;
+        let test_func = |x| x > 3;
+    }
+    if bar == 2 { //~ ERROR cannot find value
+        println!("yes");
+    }
+    test_func(1); //~ ERROR cannot find function
+}
diff --git a/tests/ui/resolve/issue-104700-inner_scope.stderr b/tests/ui/resolve/issue-104700-inner_scope.stderr
new file mode 100644
index 000000000..051b234fc
--- /dev/null
+++ b/tests/ui/resolve/issue-104700-inner_scope.stderr
@@ -0,0 +1,21 @@
+error[E0425]: cannot find value `bar` in this scope
+  --> $DIR/issue-104700-inner_scope.rs:7:8
+   |
+LL |     if bar == 2 {
+   |        ^^^
+   |
+help: the binding `bar` is available in a different scope in the same function
+  --> $DIR/issue-104700-inner_scope.rs:4:13
+   |
+LL |         let bar = 2;
+   |             ^^^
+
+error[E0425]: cannot find function `test_func` in this scope
+  --> $DIR/issue-104700-inner_scope.rs:10:5
+   |
+LL |     test_func(1);
+   |     ^^^^^^^^^ not found in this scope
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/resolve/issue-105069.rs b/tests/ui/resolve/issue-105069.rs
index 73455cf77..73455cf77 100644
--- a/src/test/ui/resolve/issue-105069.rs
+++ b/tests/ui/resolve/issue-105069.rs
diff --git a/src/test/ui/resolve/issue-105069.stderr b/tests/ui/resolve/issue-105069.stderr
index 1e6c9c6e2..1e6c9c6e2 100644
--- a/src/test/ui/resolve/issue-105069.stderr
+++ b/tests/ui/resolve/issue-105069.stderr
diff --git a/src/test/ui/resolve/issue-12796.rs b/tests/ui/resolve/issue-12796.rs
index 942d6b9a5..942d6b9a5 100644
--- a/src/test/ui/resolve/issue-12796.rs
+++ b/tests/ui/resolve/issue-12796.rs
diff --git a/src/test/ui/resolve/issue-12796.stderr b/tests/ui/resolve/issue-12796.stderr
index a01fd2d65..a01fd2d65 100644
--- a/src/test/ui/resolve/issue-12796.stderr
+++ b/tests/ui/resolve/issue-12796.stderr
diff --git a/src/test/ui/resolve/issue-14254.rs b/tests/ui/resolve/issue-14254.rs
index 78add29ca..78add29ca 100644
--- a/src/test/ui/resolve/issue-14254.rs
+++ b/tests/ui/resolve/issue-14254.rs
diff --git a/src/test/ui/resolve/issue-14254.stderr b/tests/ui/resolve/issue-14254.stderr
index 690a40f7e..690a40f7e 100644
--- a/src/test/ui/resolve/issue-14254.stderr
+++ b/tests/ui/resolve/issue-14254.stderr
diff --git a/src/test/ui/resolve/issue-16058.rs b/tests/ui/resolve/issue-16058.rs
index 048aaf65f..048aaf65f 100644
--- a/src/test/ui/resolve/issue-16058.rs
+++ b/tests/ui/resolve/issue-16058.rs
diff --git a/src/test/ui/resolve/issue-16058.stderr b/tests/ui/resolve/issue-16058.stderr
index c47d22cef..c47d22cef 100644
--- a/src/test/ui/resolve/issue-16058.stderr
+++ b/tests/ui/resolve/issue-16058.stderr
diff --git a/src/test/ui/resolve/issue-17518.rs b/tests/ui/resolve/issue-17518.rs
index edaebc812..edaebc812 100644
--- a/src/test/ui/resolve/issue-17518.rs
+++ b/tests/ui/resolve/issue-17518.rs
diff --git a/src/test/ui/resolve/issue-17518.stderr b/tests/ui/resolve/issue-17518.stderr
index 034d0d01b..034d0d01b 100644
--- a/src/test/ui/resolve/issue-17518.stderr
+++ b/tests/ui/resolve/issue-17518.stderr
diff --git a/src/test/ui/resolve/issue-18252.rs b/tests/ui/resolve/issue-18252.rs
index f6ebe2920..f6ebe2920 100644
--- a/src/test/ui/resolve/issue-18252.rs
+++ b/tests/ui/resolve/issue-18252.rs
diff --git a/src/test/ui/resolve/issue-18252.stderr b/tests/ui/resolve/issue-18252.stderr
index d9006c0a6..d9006c0a6 100644
--- a/src/test/ui/resolve/issue-18252.stderr
+++ b/tests/ui/resolve/issue-18252.stderr
diff --git a/src/test/ui/resolve/issue-19452.rs b/tests/ui/resolve/issue-19452.rs
index 1d3aa49ea..1d3aa49ea 100644
--- a/src/test/ui/resolve/issue-19452.rs
+++ b/tests/ui/resolve/issue-19452.rs
diff --git a/src/test/ui/resolve/issue-19452.stderr b/tests/ui/resolve/issue-19452.stderr
index eff89241f..eff89241f 100644
--- a/src/test/ui/resolve/issue-19452.stderr
+++ b/tests/ui/resolve/issue-19452.stderr
diff --git a/src/test/ui/resolve/issue-21221-1.rs b/tests/ui/resolve/issue-21221-1.rs
index b180624d2..b180624d2 100644
--- a/src/test/ui/resolve/issue-21221-1.rs
+++ b/tests/ui/resolve/issue-21221-1.rs
diff --git a/src/test/ui/resolve/issue-21221-1.stderr b/tests/ui/resolve/issue-21221-1.stderr
index 538eeead9..538eeead9 100644
--- a/src/test/ui/resolve/issue-21221-1.stderr
+++ b/tests/ui/resolve/issue-21221-1.stderr
diff --git a/src/test/ui/resolve/issue-21221-2.rs b/tests/ui/resolve/issue-21221-2.rs
index dc13e46cb..dc13e46cb 100644
--- a/src/test/ui/resolve/issue-21221-2.rs
+++ b/tests/ui/resolve/issue-21221-2.rs
diff --git a/src/test/ui/resolve/issue-21221-2.stderr b/tests/ui/resolve/issue-21221-2.stderr
index d4fd7cb12..d4fd7cb12 100644
--- a/src/test/ui/resolve/issue-21221-2.stderr
+++ b/tests/ui/resolve/issue-21221-2.stderr
diff --git a/src/test/ui/resolve/issue-21221-3.rs b/tests/ui/resolve/issue-21221-3.rs
index f0c0a9fd6..f0c0a9fd6 100644
--- a/src/test/ui/resolve/issue-21221-3.rs
+++ b/tests/ui/resolve/issue-21221-3.rs
diff --git a/src/test/ui/resolve/issue-21221-3.stderr b/tests/ui/resolve/issue-21221-3.stderr
index f12e5b09b..f12e5b09b 100644
--- a/src/test/ui/resolve/issue-21221-3.stderr
+++ b/tests/ui/resolve/issue-21221-3.stderr
diff --git a/src/test/ui/resolve/issue-21221-4.rs b/tests/ui/resolve/issue-21221-4.rs
index 88d5bd06c..88d5bd06c 100644
--- a/src/test/ui/resolve/issue-21221-4.rs
+++ b/tests/ui/resolve/issue-21221-4.rs
diff --git a/src/test/ui/resolve/issue-21221-4.stderr b/tests/ui/resolve/issue-21221-4.stderr
index fc15444d0..fc15444d0 100644
--- a/src/test/ui/resolve/issue-21221-4.stderr
+++ b/tests/ui/resolve/issue-21221-4.stderr
diff --git a/src/test/ui/resolve/issue-22692.rs b/tests/ui/resolve/issue-22692.rs
index 31a762614..31a762614 100644
--- a/src/test/ui/resolve/issue-22692.rs
+++ b/tests/ui/resolve/issue-22692.rs
diff --git a/src/test/ui/resolve/issue-22692.stderr b/tests/ui/resolve/issue-22692.stderr
index 6962aa161..6962aa161 100644
--- a/src/test/ui/resolve/issue-22692.stderr
+++ b/tests/ui/resolve/issue-22692.stderr
diff --git a/src/test/ui/resolve/issue-2330.rs b/tests/ui/resolve/issue-2330.rs
index 4560caba0..4560caba0 100644
--- a/src/test/ui/resolve/issue-2330.rs
+++ b/tests/ui/resolve/issue-2330.rs
diff --git a/src/test/ui/resolve/issue-2330.stderr b/tests/ui/resolve/issue-2330.stderr
index 877cf68b5..877cf68b5 100644
--- a/src/test/ui/resolve/issue-2330.stderr
+++ b/tests/ui/resolve/issue-2330.stderr
diff --git a/src/test/ui/resolve/issue-23305.rs b/tests/ui/resolve/issue-23305.rs
index 6d7fe7c50..6d7fe7c50 100644
--- a/src/test/ui/resolve/issue-23305.rs
+++ b/tests/ui/resolve/issue-23305.rs
diff --git a/src/test/ui/resolve/issue-23305.stderr b/tests/ui/resolve/issue-23305.stderr
index aad1b583a..aad1b583a 100644
--- a/src/test/ui/resolve/issue-23305.stderr
+++ b/tests/ui/resolve/issue-23305.stderr
diff --git a/src/test/ui/resolve/issue-2356.rs b/tests/ui/resolve/issue-2356.rs
index fe9bf4d44..fe9bf4d44 100644
--- a/src/test/ui/resolve/issue-2356.rs
+++ b/tests/ui/resolve/issue-2356.rs
diff --git a/src/test/ui/resolve/issue-2356.stderr b/tests/ui/resolve/issue-2356.stderr
index 36f3da7c9..36f3da7c9 100644
--- a/src/test/ui/resolve/issue-2356.stderr
+++ b/tests/ui/resolve/issue-2356.stderr
diff --git a/src/test/ui/resolve/issue-23716.rs b/tests/ui/resolve/issue-23716.rs
index e9139c0aa..e9139c0aa 100644
--- a/src/test/ui/resolve/issue-23716.rs
+++ b/tests/ui/resolve/issue-23716.rs
diff --git a/src/test/ui/resolve/issue-23716.stderr b/tests/ui/resolve/issue-23716.stderr
index 8b89c350c..8b89c350c 100644
--- a/src/test/ui/resolve/issue-23716.stderr
+++ b/tests/ui/resolve/issue-23716.stderr
diff --git a/src/test/ui/resolve/issue-24968.rs b/tests/ui/resolve/issue-24968.rs
index 19e16abce..19e16abce 100644
--- a/src/test/ui/resolve/issue-24968.rs
+++ b/tests/ui/resolve/issue-24968.rs
diff --git a/src/test/ui/resolve/issue-24968.stderr b/tests/ui/resolve/issue-24968.stderr
index 82f5a1d5b..82f5a1d5b 100644
--- a/src/test/ui/resolve/issue-24968.stderr
+++ b/tests/ui/resolve/issue-24968.stderr
diff --git a/src/test/ui/resolve/issue-26545.rs b/tests/ui/resolve/issue-26545.rs
index 5652ee747..5652ee747 100644
--- a/src/test/ui/resolve/issue-26545.rs
+++ b/tests/ui/resolve/issue-26545.rs
diff --git a/src/test/ui/resolve/issue-26545.stderr b/tests/ui/resolve/issue-26545.stderr
index d3c866925..d3c866925 100644
--- a/src/test/ui/resolve/issue-26545.stderr
+++ b/tests/ui/resolve/issue-26545.stderr
diff --git a/src/test/ui/resolve/issue-3021-c.rs b/tests/ui/resolve/issue-3021-c.rs
index 94ed1fdf7..94ed1fdf7 100644
--- a/src/test/ui/resolve/issue-3021-c.rs
+++ b/tests/ui/resolve/issue-3021-c.rs
diff --git a/src/test/ui/resolve/issue-3021-c.stderr b/tests/ui/resolve/issue-3021-c.stderr
index 5176efc3a..5176efc3a 100644
--- a/src/test/ui/resolve/issue-3021-c.stderr
+++ b/tests/ui/resolve/issue-3021-c.stderr
diff --git a/src/test/ui/resolve/issue-3021.rs b/tests/ui/resolve/issue-3021.rs
index a672261f8..a672261f8 100644
--- a/src/test/ui/resolve/issue-3021.rs
+++ b/tests/ui/resolve/issue-3021.rs
diff --git a/src/test/ui/resolve/issue-3021.stderr b/tests/ui/resolve/issue-3021.stderr
index d5b015eec..d5b015eec 100644
--- a/src/test/ui/resolve/issue-3021.stderr
+++ b/tests/ui/resolve/issue-3021.stderr
diff --git a/src/test/ui/issues/issue-30535.rs b/tests/ui/resolve/issue-30535.rs
index d48f00d5a..d48f00d5a 100644
--- a/src/test/ui/issues/issue-30535.rs
+++ b/tests/ui/resolve/issue-30535.rs
diff --git a/src/test/ui/issues/issue-30535.stderr b/tests/ui/resolve/issue-30535.stderr
index e3692934b..e3692934b 100644
--- a/src/test/ui/issues/issue-30535.stderr
+++ b/tests/ui/resolve/issue-30535.stderr
diff --git a/src/test/ui/resolve/issue-31845.rs b/tests/ui/resolve/issue-31845.rs
index f6dc11502..f6dc11502 100644
--- a/src/test/ui/resolve/issue-31845.rs
+++ b/tests/ui/resolve/issue-31845.rs
diff --git a/src/test/ui/resolve/issue-31845.stderr b/tests/ui/resolve/issue-31845.stderr
index 562819385..562819385 100644
--- a/src/test/ui/resolve/issue-31845.stderr
+++ b/tests/ui/resolve/issue-31845.stderr
diff --git a/src/test/ui/resolve/issue-33876.rs b/tests/ui/resolve/issue-33876.rs
index e233ec631..e233ec631 100644
--- a/src/test/ui/resolve/issue-33876.rs
+++ b/tests/ui/resolve/issue-33876.rs
diff --git a/src/test/ui/resolve/issue-33876.stderr b/tests/ui/resolve/issue-33876.stderr
index 52308f2a7..52308f2a7 100644
--- a/src/test/ui/resolve/issue-33876.stderr
+++ b/tests/ui/resolve/issue-33876.stderr
diff --git a/src/test/ui/resolve/issue-35675.rs b/tests/ui/resolve/issue-35675.rs
index 683761667..683761667 100644
--- a/src/test/ui/resolve/issue-35675.rs
+++ b/tests/ui/resolve/issue-35675.rs
diff --git a/src/test/ui/resolve/issue-35675.stderr b/tests/ui/resolve/issue-35675.stderr
index 4a06196d5..4a06196d5 100644
--- a/src/test/ui/resolve/issue-35675.stderr
+++ b/tests/ui/resolve/issue-35675.stderr
diff --git a/src/test/ui/resolve/issue-3907-2.rs b/tests/ui/resolve/issue-3907-2.rs
index 46f145e63..46f145e63 100644
--- a/src/test/ui/resolve/issue-3907-2.rs
+++ b/tests/ui/resolve/issue-3907-2.rs
diff --git a/src/test/ui/resolve/issue-3907-2.stderr b/tests/ui/resolve/issue-3907-2.stderr
index 782cfeec4..782cfeec4 100644
--- a/src/test/ui/resolve/issue-3907-2.stderr
+++ b/tests/ui/resolve/issue-3907-2.stderr
diff --git a/src/test/ui/resolve/issue-3907.rs b/tests/ui/resolve/issue-3907.rs
index 6211de427..6211de427 100644
--- a/src/test/ui/resolve/issue-3907.rs
+++ b/tests/ui/resolve/issue-3907.rs
diff --git a/src/test/ui/resolve/issue-3907.stderr b/tests/ui/resolve/issue-3907.stderr
index 6fc61cae8..6fc61cae8 100644
--- a/src/test/ui/resolve/issue-3907.stderr
+++ b/tests/ui/resolve/issue-3907.stderr
diff --git a/src/test/ui/resolve/issue-39226.rs b/tests/ui/resolve/issue-39226.rs
index 0f784f02b..0f784f02b 100644
--- a/src/test/ui/resolve/issue-39226.rs
+++ b/tests/ui/resolve/issue-39226.rs
diff --git a/src/test/ui/resolve/issue-39226.stderr b/tests/ui/resolve/issue-39226.stderr
index 5045ec6c3..5045ec6c3 100644
--- a/src/test/ui/resolve/issue-39226.stderr
+++ b/tests/ui/resolve/issue-39226.stderr
diff --git a/src/test/ui/issues/issue-39559-2.rs b/tests/ui/resolve/issue-39559-2.rs
index 07d3a82b1..07d3a82b1 100644
--- a/src/test/ui/issues/issue-39559-2.rs
+++ b/tests/ui/resolve/issue-39559-2.rs
diff --git a/src/test/ui/issues/issue-39559-2.stderr b/tests/ui/resolve/issue-39559-2.stderr
index ea27e7bd2..e9d8eb083 100644
--- a/src/test/ui/issues/issue-39559-2.stderr
+++ b/tests/ui/resolve/issue-39559-2.stderr
@@ -5,6 +5,7 @@ LL |     let array: [usize; Dim3::dim()]
    |                        ^^^^^^^^^^^
    |
    = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error[E0015]: cannot call non-const fn `<Dim3 as Dim>::dim` in constants
   --> $DIR/issue-39559-2.rs:16:15
@@ -13,6 +14,7 @@ LL |         = [0; Dim3::dim()];
    |               ^^^^^^^^^^^
    |
    = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-39559.rs b/tests/ui/resolve/issue-39559.rs
index 58d259407..58d259407 100644
--- a/src/test/ui/issues/issue-39559.rs
+++ b/tests/ui/resolve/issue-39559.rs
diff --git a/src/test/ui/issues/issue-39559.stderr b/tests/ui/resolve/issue-39559.stderr
index 7626f827f..7626f827f 100644
--- a/src/test/ui/issues/issue-39559.stderr
+++ b/tests/ui/resolve/issue-39559.stderr
diff --git a/src/test/ui/resolve/issue-42944.rs b/tests/ui/resolve/issue-42944.rs
index a4404857a..7e439c10b 100644
--- a/src/test/ui/resolve/issue-42944.rs
+++ b/tests/ui/resolve/issue-42944.rs
@@ -1,5 +1,5 @@
 mod foo {
-    pub struct Bx(());
+    pub struct Bx(pub(in crate::foo) ());
 }
 
 mod bar {
diff --git a/tests/ui/resolve/issue-42944.stderr b/tests/ui/resolve/issue-42944.stderr
new file mode 100644
index 000000000..4ffa9402c
--- /dev/null
+++ b/tests/ui/resolve/issue-42944.stderr
@@ -0,0 +1,32 @@
+error[E0425]: cannot find function, tuple struct or tuple variant `Bx` in this scope
+  --> $DIR/issue-42944.rs:16:9
+   |
+LL |         Bx(());
+   |         ^^ not found in this scope
+   |
+note: tuple struct `foo::Bx` exists but is inaccessible
+  --> $DIR/issue-42944.rs:2:5
+   |
+LL |     pub struct Bx(pub(in crate::foo) ());
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not accessible
+
+error[E0423]: cannot initialize a tuple struct which contains private fields
+  --> $DIR/issue-42944.rs:9:9
+   |
+LL |         Bx(());
+   |         ^^
+   |
+note: constructor is not visible here due to private fields
+  --> $DIR/issue-42944.rs:2:19
+   |
+LL |     pub struct Bx(pub(in crate::foo) ());
+   |                   ^^^^^^^^^^^^^^^^^^^^^ private field
+help: consider making the field publicly accessible
+   |
+LL |     pub struct Bx(pub ());
+   |                   ~~~
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0423, E0425.
+For more information about an error, try `rustc --explain E0423`.
diff --git a/src/test/ui/resolve/issue-49074.rs b/tests/ui/resolve/issue-49074.rs
index 752bb345b..752bb345b 100644
--- a/src/test/ui/resolve/issue-49074.rs
+++ b/tests/ui/resolve/issue-49074.rs
diff --git a/src/test/ui/resolve/issue-49074.stderr b/tests/ui/resolve/issue-49074.stderr
index bbfeb4ea9..bbfeb4ea9 100644
--- a/src/test/ui/resolve/issue-49074.stderr
+++ b/tests/ui/resolve/issue-49074.stderr
diff --git a/src/test/ui/resolve/issue-5035-2.rs b/tests/ui/resolve/issue-5035-2.rs
index b831bb4be..b831bb4be 100644
--- a/src/test/ui/resolve/issue-5035-2.rs
+++ b/tests/ui/resolve/issue-5035-2.rs
diff --git a/src/test/ui/resolve/issue-5035-2.stderr b/tests/ui/resolve/issue-5035-2.stderr
index 939392733..558e6b7b1 100644
--- a/src/test/ui/resolve/issue-5035-2.stderr
+++ b/tests/ui/resolve/issue-5035-2.stderr
@@ -6,6 +6,10 @@ LL | fn foo(_x: K) {}
    |
    = help: the trait `Sized` is not implemented for `(dyn I + 'static)`
    = help: unsized fn params are gated as an unstable feature
+help: you can use `impl Trait` as the argument type
+   |
+LL | fn foo(_x: impl K) {}
+   |            ++++
 help: function arguments must have a statically known size, borrowed types always have a known size
    |
 LL | fn foo(_x: &K) {}
diff --git a/src/test/ui/resolve/issue-5035.rs b/tests/ui/resolve/issue-5035.rs
index 49fa312f9..49fa312f9 100644
--- a/src/test/ui/resolve/issue-5035.rs
+++ b/tests/ui/resolve/issue-5035.rs
diff --git a/src/test/ui/resolve/issue-5035.stderr b/tests/ui/resolve/issue-5035.stderr
index 32b972b21..32b972b21 100644
--- a/src/test/ui/resolve/issue-5035.stderr
+++ b/tests/ui/resolve/issue-5035.stderr
diff --git a/src/test/ui/resolve/issue-50599.rs b/tests/ui/resolve/issue-50599.rs
index 72238a591..72238a591 100644
--- a/src/test/ui/resolve/issue-50599.rs
+++ b/tests/ui/resolve/issue-50599.rs
diff --git a/src/test/ui/resolve/issue-50599.stderr b/tests/ui/resolve/issue-50599.stderr
index b07482c83..b07482c83 100644
--- a/src/test/ui/resolve/issue-50599.stderr
+++ b/tests/ui/resolve/issue-50599.stderr
diff --git a/src/test/ui/resolve/issue-5099.rs b/tests/ui/resolve/issue-5099.rs
index b5abccb4b..b5abccb4b 100644
--- a/src/test/ui/resolve/issue-5099.rs
+++ b/tests/ui/resolve/issue-5099.rs
diff --git a/src/test/ui/resolve/issue-5099.stderr b/tests/ui/resolve/issue-5099.stderr
index e9b2a9c4d..e9b2a9c4d 100644
--- a/src/test/ui/resolve/issue-5099.stderr
+++ b/tests/ui/resolve/issue-5099.stderr
diff --git a/src/test/ui/resolve/issue-54379.rs b/tests/ui/resolve/issue-54379.rs
index 807c54393..807c54393 100644
--- a/src/test/ui/resolve/issue-54379.rs
+++ b/tests/ui/resolve/issue-54379.rs
diff --git a/src/test/ui/resolve/issue-54379.stderr b/tests/ui/resolve/issue-54379.stderr
index 750727273..750727273 100644
--- a/src/test/ui/resolve/issue-54379.stderr
+++ b/tests/ui/resolve/issue-54379.stderr
diff --git a/src/test/ui/resolve/issue-55673.rs b/tests/ui/resolve/issue-55673.rs
index 0436bd397..0436bd397 100644
--- a/src/test/ui/resolve/issue-55673.rs
+++ b/tests/ui/resolve/issue-55673.rs
diff --git a/src/test/ui/resolve/issue-55673.stderr b/tests/ui/resolve/issue-55673.stderr
index 39318f959..39318f959 100644
--- a/src/test/ui/resolve/issue-55673.stderr
+++ b/tests/ui/resolve/issue-55673.stderr
diff --git a/src/test/ui/resolve/issue-57523.rs b/tests/ui/resolve/issue-57523.rs
index 976238cc3..976238cc3 100644
--- a/src/test/ui/resolve/issue-57523.rs
+++ b/tests/ui/resolve/issue-57523.rs
diff --git a/src/test/ui/resolve/issue-5927.rs b/tests/ui/resolve/issue-5927.rs
index 14f95827b..14f95827b 100644
--- a/src/test/ui/resolve/issue-5927.rs
+++ b/tests/ui/resolve/issue-5927.rs
diff --git a/src/test/ui/resolve/issue-5927.stderr b/tests/ui/resolve/issue-5927.stderr
index d6cd6853d..d6cd6853d 100644
--- a/src/test/ui/resolve/issue-5927.stderr
+++ b/tests/ui/resolve/issue-5927.stderr
diff --git a/src/test/ui/resolve/issue-60057.rs b/tests/ui/resolve/issue-60057.rs
index b52343ada..b52343ada 100644
--- a/src/test/ui/resolve/issue-60057.rs
+++ b/tests/ui/resolve/issue-60057.rs
diff --git a/src/test/ui/resolve/issue-60057.stderr b/tests/ui/resolve/issue-60057.stderr
index 4d915fcd9..4d915fcd9 100644
--- a/src/test/ui/resolve/issue-60057.stderr
+++ b/tests/ui/resolve/issue-60057.stderr
diff --git a/src/test/ui/resolve/issue-65025-extern-static-parent-generics.rs b/tests/ui/resolve/issue-65025-extern-static-parent-generics.rs
index ce45f630e..ce45f630e 100644
--- a/src/test/ui/resolve/issue-65025-extern-static-parent-generics.rs
+++ b/tests/ui/resolve/issue-65025-extern-static-parent-generics.rs
diff --git a/src/test/ui/resolve/issue-65025-extern-static-parent-generics.stderr b/tests/ui/resolve/issue-65025-extern-static-parent-generics.stderr
index 6bbf76dd1..6bbf76dd1 100644
--- a/src/test/ui/resolve/issue-65025-extern-static-parent-generics.stderr
+++ b/tests/ui/resolve/issue-65025-extern-static-parent-generics.stderr
diff --git a/src/test/ui/resolve/issue-65035-static-with-parent-generics.rs b/tests/ui/resolve/issue-65035-static-with-parent-generics.rs
index f96c04841..f96c04841 100644
--- a/src/test/ui/resolve/issue-65035-static-with-parent-generics.rs
+++ b/tests/ui/resolve/issue-65035-static-with-parent-generics.rs
diff --git a/src/test/ui/resolve/issue-65035-static-with-parent-generics.stderr b/tests/ui/resolve/issue-65035-static-with-parent-generics.stderr
index 7ed572f80..7ed572f80 100644
--- a/src/test/ui/resolve/issue-65035-static-with-parent-generics.stderr
+++ b/tests/ui/resolve/issue-65035-static-with-parent-generics.stderr
diff --git a/src/test/ui/resolve/issue-6702.rs b/tests/ui/resolve/issue-6702.rs
index 954dc36f3..954dc36f3 100644
--- a/src/test/ui/resolve/issue-6702.rs
+++ b/tests/ui/resolve/issue-6702.rs
diff --git a/src/test/ui/resolve/issue-6702.stderr b/tests/ui/resolve/issue-6702.stderr
index a118f9419..a118f9419 100644
--- a/src/test/ui/resolve/issue-6702.stderr
+++ b/tests/ui/resolve/issue-6702.stderr
diff --git a/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.rs b/tests/ui/resolve/issue-69401-trait-fn-no-body-ty-local.rs
index c377ecea9..c377ecea9 100644
--- a/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.rs
+++ b/tests/ui/resolve/issue-69401-trait-fn-no-body-ty-local.rs
diff --git a/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr b/tests/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr
index 109409d27..109409d27 100644
--- a/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr
+++ b/tests/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr
diff --git a/src/test/ui/resolve/issue-70736-async-fn-no-body-def-collector.rs b/tests/ui/resolve/issue-70736-async-fn-no-body-def-collector.rs
index 49462f52f..49462f52f 100644
--- a/src/test/ui/resolve/issue-70736-async-fn-no-body-def-collector.rs
+++ b/tests/ui/resolve/issue-70736-async-fn-no-body-def-collector.rs
diff --git a/src/test/ui/resolve/issue-70736-async-fn-no-body-def-collector.stderr b/tests/ui/resolve/issue-70736-async-fn-no-body-def-collector.stderr
index 1354abb4f..1354abb4f 100644
--- a/src/test/ui/resolve/issue-70736-async-fn-no-body-def-collector.stderr
+++ b/tests/ui/resolve/issue-70736-async-fn-no-body-def-collector.stderr
diff --git a/src/test/ui/resolve/issue-73427.rs b/tests/ui/resolve/issue-73427.rs
index 5c2459a59..5c2459a59 100644
--- a/src/test/ui/resolve/issue-73427.rs
+++ b/tests/ui/resolve/issue-73427.rs
diff --git a/src/test/ui/resolve/issue-73427.stderr b/tests/ui/resolve/issue-73427.stderr
index 4af5f29d8..4af5f29d8 100644
--- a/src/test/ui/resolve/issue-73427.stderr
+++ b/tests/ui/resolve/issue-73427.stderr
diff --git a/src/test/ui/resolve/issue-80079.rs b/tests/ui/resolve/issue-80079.rs
index 4795ed062..4795ed062 100644
--- a/src/test/ui/resolve/issue-80079.rs
+++ b/tests/ui/resolve/issue-80079.rs
diff --git a/src/test/ui/resolve/issue-80079.stderr b/tests/ui/resolve/issue-80079.stderr
index 93e8c0341..93e8c0341 100644
--- a/src/test/ui/resolve/issue-80079.stderr
+++ b/tests/ui/resolve/issue-80079.stderr
diff --git a/src/test/ui/resolve/issue-81508.rs b/tests/ui/resolve/issue-81508.rs
index 23605cd2f..23605cd2f 100644
--- a/src/test/ui/resolve/issue-81508.rs
+++ b/tests/ui/resolve/issue-81508.rs
diff --git a/src/test/ui/resolve/issue-81508.stderr b/tests/ui/resolve/issue-81508.stderr
index 7258174ba..7258174ba 100644
--- a/src/test/ui/resolve/issue-81508.stderr
+++ b/tests/ui/resolve/issue-81508.stderr
diff --git a/src/test/ui/resolve/issue-82156.rs b/tests/ui/resolve/issue-82156.rs
index 6215259e4..6215259e4 100644
--- a/src/test/ui/resolve/issue-82156.rs
+++ b/tests/ui/resolve/issue-82156.rs
diff --git a/src/test/ui/resolve/issue-82156.stderr b/tests/ui/resolve/issue-82156.stderr
index d53599dcc..d53599dcc 100644
--- a/src/test/ui/resolve/issue-82156.stderr
+++ b/tests/ui/resolve/issue-82156.stderr
diff --git a/src/test/ui/resolve/issue-82865.rs b/tests/ui/resolve/issue-82865.rs
index 07d88c413..07d88c413 100644
--- a/src/test/ui/resolve/issue-82865.rs
+++ b/tests/ui/resolve/issue-82865.rs
diff --git a/src/test/ui/resolve/issue-82865.stderr b/tests/ui/resolve/issue-82865.stderr
index 730fd6d60..730fd6d60 100644
--- a/src/test/ui/resolve/issue-82865.stderr
+++ b/tests/ui/resolve/issue-82865.stderr
diff --git a/src/test/ui/resolve/issue-85348.rs b/tests/ui/resolve/issue-85348.rs
index 3a33c1934..3a33c1934 100644
--- a/src/test/ui/resolve/issue-85348.rs
+++ b/tests/ui/resolve/issue-85348.rs
diff --git a/src/test/ui/resolve/issue-85348.stderr b/tests/ui/resolve/issue-85348.stderr
index f839dd927..42b43f825 100644
--- a/src/test/ui/resolve/issue-85348.stderr
+++ b/tests/ui/resolve/issue-85348.stderr
@@ -21,8 +21,8 @@ LL |         let mut N;
    |
 help: consider giving `N` an explicit type
    |
-LL |         let mut N: _;
-   |                  +++
+LL |         let mut N: /* Type */;
+   |                  ++++++++++++
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/resolve/issue-85671.rs b/tests/ui/resolve/issue-85671.rs
index 337ec307e..337ec307e 100644
--- a/src/test/ui/resolve/issue-85671.rs
+++ b/tests/ui/resolve/issue-85671.rs
diff --git a/src/test/ui/resolve/issue-88472.rs b/tests/ui/resolve/issue-88472.rs
index 6bf7caedd..6bf7caedd 100644
--- a/src/test/ui/resolve/issue-88472.rs
+++ b/tests/ui/resolve/issue-88472.rs
diff --git a/src/test/ui/resolve/issue-88472.stderr b/tests/ui/resolve/issue-88472.stderr
index 8431fc977..8431fc977 100644
--- a/src/test/ui/resolve/issue-88472.stderr
+++ b/tests/ui/resolve/issue-88472.stderr
diff --git a/src/test/ui/resolve/issue-90113.rs b/tests/ui/resolve/issue-90113.rs
index f6658b45e..f6658b45e 100644
--- a/src/test/ui/resolve/issue-90113.rs
+++ b/tests/ui/resolve/issue-90113.rs
diff --git a/src/test/ui/resolve/issue-90113.stderr b/tests/ui/resolve/issue-90113.stderr
index 1b7872057..1b7872057 100644
--- a/src/test/ui/resolve/issue-90113.stderr
+++ b/tests/ui/resolve/issue-90113.stderr
diff --git a/src/test/ui/resolve/levenshtein.rs b/tests/ui/resolve/levenshtein.rs
index a6f471625..a6f471625 100644
--- a/src/test/ui/resolve/levenshtein.rs
+++ b/tests/ui/resolve/levenshtein.rs
diff --git a/src/test/ui/resolve/levenshtein.stderr b/tests/ui/resolve/levenshtein.stderr
index 9a2d61ea4..cf4782101 100644
--- a/src/test/ui/resolve/levenshtein.stderr
+++ b/tests/ui/resolve/levenshtein.stderr
@@ -18,11 +18,9 @@ error[E0412]: cannot find type `Opiton` in this scope
    |
 LL | type B = Opiton<u8>; // Misspelled type name from the prelude.
    |          ^^^^^^ help: an enum with a similar name exists: `Option`
+  --> $SRC_DIR/core/src/option.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL | pub enum Option<T> {
-   | ------------------ similarly named enum `Option` defined here
+   = note: similarly named enum `Option` defined here
 
 error[E0412]: cannot find type `Baz` in this scope
   --> $DIR/levenshtein.rs:16:14
diff --git a/src/test/ui/resolve/macro-determinacy-non-module.rs b/tests/ui/resolve/macro-determinacy-non-module.rs
index 3215e0cd3..3215e0cd3 100644
--- a/src/test/ui/resolve/macro-determinacy-non-module.rs
+++ b/tests/ui/resolve/macro-determinacy-non-module.rs
diff --git a/src/test/ui/resolve/missing-in-namespace.rs b/tests/ui/resolve/missing-in-namespace.rs
index e1dedb072..e1dedb072 100644
--- a/src/test/ui/resolve/missing-in-namespace.rs
+++ b/tests/ui/resolve/missing-in-namespace.rs
diff --git a/src/test/ui/resolve/missing-in-namespace.stderr b/tests/ui/resolve/missing-in-namespace.stderr
index fc925ba3b..fc925ba3b 100644
--- a/src/test/ui/resolve/missing-in-namespace.stderr
+++ b/tests/ui/resolve/missing-in-namespace.stderr
diff --git a/src/test/ui/resolve/name-clash-nullary.rs b/tests/ui/resolve/name-clash-nullary.rs
index b5f5e1214..b5f5e1214 100644
--- a/src/test/ui/resolve/name-clash-nullary.rs
+++ b/tests/ui/resolve/name-clash-nullary.rs
diff --git a/src/test/ui/resolve/name-clash-nullary.stderr b/tests/ui/resolve/name-clash-nullary.stderr
index 76c4b5914..76c4b5914 100644
--- a/src/test/ui/resolve/name-clash-nullary.stderr
+++ b/tests/ui/resolve/name-clash-nullary.stderr
diff --git a/src/test/ui/resolve/name-collision-in-trait-fn-sig.rs b/tests/ui/resolve/name-collision-in-trait-fn-sig.rs
index fba4ffa1c..fba4ffa1c 100644
--- a/src/test/ui/resolve/name-collision-in-trait-fn-sig.rs
+++ b/tests/ui/resolve/name-collision-in-trait-fn-sig.rs
diff --git a/src/test/ui/resolve/no-implicit-prelude-nested.rs b/tests/ui/resolve/no-implicit-prelude-nested.rs
index c314967da..c314967da 100644
--- a/src/test/ui/resolve/no-implicit-prelude-nested.rs
+++ b/tests/ui/resolve/no-implicit-prelude-nested.rs
diff --git a/src/test/ui/resolve/no-implicit-prelude-nested.stderr b/tests/ui/resolve/no-implicit-prelude-nested.stderr
index 198b630c5..198b630c5 100644
--- a/src/test/ui/resolve/no-implicit-prelude-nested.stderr
+++ b/tests/ui/resolve/no-implicit-prelude-nested.stderr
diff --git a/src/test/ui/resolve/no-implicit-prelude.rs b/tests/ui/resolve/no-implicit-prelude.rs
index 4b0ca4d52..4b0ca4d52 100644
--- a/src/test/ui/resolve/no-implicit-prelude.rs
+++ b/tests/ui/resolve/no-implicit-prelude.rs
diff --git a/src/test/ui/resolve/no-implicit-prelude.stderr b/tests/ui/resolve/no-implicit-prelude.stderr
index 36a9b65b7..36a9b65b7 100644
--- a/src/test/ui/resolve/no-implicit-prelude.stderr
+++ b/tests/ui/resolve/no-implicit-prelude.stderr
diff --git a/src/test/ui/resolve/no-std-1.rs b/tests/ui/resolve/no-std-1.rs
index 5b59e9b4e..5b59e9b4e 100644
--- a/src/test/ui/resolve/no-std-1.rs
+++ b/tests/ui/resolve/no-std-1.rs
diff --git a/src/test/ui/resolve/no-std-2.rs b/tests/ui/resolve/no-std-2.rs
index 487d41649..487d41649 100644
--- a/src/test/ui/resolve/no-std-2.rs
+++ b/tests/ui/resolve/no-std-2.rs
diff --git a/src/test/ui/resolve/no-std-3.rs b/tests/ui/resolve/no-std-3.rs
index f6c4ed579..f6c4ed579 100644
--- a/src/test/ui/resolve/no-std-3.rs
+++ b/tests/ui/resolve/no-std-3.rs
diff --git a/src/test/ui/resolve/pathless-extern-ok.rs b/tests/ui/resolve/pathless-extern-ok.rs
index 0ffa5eb89..0ffa5eb89 100644
--- a/src/test/ui/resolve/pathless-extern-ok.rs
+++ b/tests/ui/resolve/pathless-extern-ok.rs
diff --git a/src/test/ui/resolve/point-at-type-parameter-shadowing-another-type.rs b/tests/ui/resolve/point-at-type-parameter-shadowing-another-type.rs
index bd496875e..bd496875e 100644
--- a/src/test/ui/resolve/point-at-type-parameter-shadowing-another-type.rs
+++ b/tests/ui/resolve/point-at-type-parameter-shadowing-another-type.rs
diff --git a/src/test/ui/resolve/point-at-type-parameter-shadowing-another-type.stderr b/tests/ui/resolve/point-at-type-parameter-shadowing-another-type.stderr
index 5790e425c..5790e425c 100644
--- a/src/test/ui/resolve/point-at-type-parameter-shadowing-another-type.stderr
+++ b/tests/ui/resolve/point-at-type-parameter-shadowing-another-type.stderr
diff --git a/src/test/ui/resolve/privacy-enum-ctor.rs b/tests/ui/resolve/privacy-enum-ctor.rs
index f0d2cf8c0..f0d2cf8c0 100644
--- a/src/test/ui/resolve/privacy-enum-ctor.rs
+++ b/tests/ui/resolve/privacy-enum-ctor.rs
diff --git a/src/test/ui/resolve/privacy-enum-ctor.stderr b/tests/ui/resolve/privacy-enum-ctor.stderr
index d734fa76b..a24fe4d23 100644
--- a/src/test/ui/resolve/privacy-enum-ctor.stderr
+++ b/tests/ui/resolve/privacy-enum-ctor.stderr
@@ -264,15 +264,15 @@ error[E0308]: mismatched types
   --> $DIR/privacy-enum-ctor.rs:27:20
    |
 LL |             Fn(u8),
-   |             -- fn(u8) -> Z {Z::Fn} defined here
+   |             -- `Fn` defines an enum variant constructor here, which should be called
 ...
 LL |         let _: Z = Z::Fn;
-   |                -   ^^^^^ expected enum `Z`, found fn item
+   |                -   ^^^^^ expected enum `Z`, found enum constructor
    |                |
    |                expected due to this
    |
-   = note: expected enum `Z`
-           found fn item `fn(u8) -> Z {Z::Fn}`
+   = note:          expected enum `Z`
+           found enum constructor `fn(u8) -> Z {Z::Fn}`
 help: use parentheses to construct this tuple variant
    |
 LL |         let _: Z = Z::Fn(/* u8 */);
@@ -305,15 +305,15 @@ error[E0308]: mismatched types
   --> $DIR/privacy-enum-ctor.rs:43:16
    |
 LL |         Fn(u8),
-   |         -- fn(u8) -> E {E::Fn} defined here
+   |         -- `Fn` defines an enum variant constructor here, which should be called
 ...
 LL |     let _: E = m::E::Fn;
-   |            -   ^^^^^^^^ expected enum `E`, found fn item
+   |            -   ^^^^^^^^ expected enum `E`, found enum constructor
    |            |
    |            expected due to this
    |
-   = note: expected enum `E`
-           found fn item `fn(u8) -> E {E::Fn}`
+   = note:          expected enum `E`
+           found enum constructor `fn(u8) -> E {E::Fn}`
 help: use parentheses to construct this tuple variant
    |
 LL |     let _: E = m::E::Fn(/* u8 */);
@@ -346,15 +346,15 @@ error[E0308]: mismatched types
   --> $DIR/privacy-enum-ctor.rs:51:16
    |
 LL |         Fn(u8),
-   |         -- fn(u8) -> E {E::Fn} defined here
+   |         -- `Fn` defines an enum variant constructor here, which should be called
 ...
 LL |     let _: E = E::Fn;
-   |            -   ^^^^^ expected enum `E`, found fn item
+   |            -   ^^^^^ expected enum `E`, found enum constructor
    |            |
    |            expected due to this
    |
-   = note: expected enum `E`
-           found fn item `fn(u8) -> E {E::Fn}`
+   = note:          expected enum `E`
+           found enum constructor `fn(u8) -> E {E::Fn}`
 help: use parentheses to construct this tuple variant
    |
 LL |     let _: E = E::Fn(/* u8 */);
diff --git a/src/test/ui/resolve/privacy-struct-ctor.rs b/tests/ui/resolve/privacy-struct-ctor.rs
index 0eecc7f8c..0eecc7f8c 100644
--- a/src/test/ui/resolve/privacy-struct-ctor.rs
+++ b/tests/ui/resolve/privacy-struct-ctor.rs
diff --git a/src/test/ui/resolve/privacy-struct-ctor.stderr b/tests/ui/resolve/privacy-struct-ctor.stderr
index 17a666a40..c1fcaaf05 100644
--- a/src/test/ui/resolve/privacy-struct-ctor.stderr
+++ b/tests/ui/resolve/privacy-struct-ctor.stderr
@@ -53,6 +53,10 @@ note: the tuple struct constructor `Z` is defined here
    |
 LL |         pub(in m) struct Z(pub(in m::n) u8);
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |         pub(in m) struct Z(pub u8);
+   |                            ~~~
 
 error[E0603]: tuple struct constructor `S` is private
   --> $DIR/privacy-struct-ctor.rs:29:8
@@ -68,6 +72,10 @@ note: the tuple struct constructor `S` is defined here
    |
 LL |     pub struct S(u8);
    |     ^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct S(pub u8);
+   |                  +++
 
 error[E0603]: tuple struct constructor `S` is private
   --> $DIR/privacy-struct-ctor.rs:31:19
@@ -83,6 +91,10 @@ note: the tuple struct constructor `S` is defined here
    |
 LL |     pub struct S(u8);
    |     ^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct S(pub u8);
+   |                  +++
 
 error[E0603]: tuple struct constructor `Z` is private
   --> $DIR/privacy-struct-ctor.rs:35:11
@@ -98,6 +110,10 @@ note: the tuple struct constructor `Z` is defined here
    |
 LL |         pub(in m) struct Z(pub(in m::n) u8);
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |         pub(in m) struct Z(pub u8);
+   |                            ~~~
 
 error[E0603]: tuple struct constructor `S` is private
   --> $DIR/privacy-struct-ctor.rs:41:16
diff --git a/src/test/ui/resolve/raw-ident-in-path.rs b/tests/ui/resolve/raw-ident-in-path.rs
index 7f1163beb..7f1163beb 100644
--- a/src/test/ui/resolve/raw-ident-in-path.rs
+++ b/tests/ui/resolve/raw-ident-in-path.rs
diff --git a/src/test/ui/resolve/raw-ident-in-path.stderr b/tests/ui/resolve/raw-ident-in-path.stderr
index 771dacbbb..771dacbbb 100644
--- a/src/test/ui/resolve/raw-ident-in-path.stderr
+++ b/tests/ui/resolve/raw-ident-in-path.stderr
diff --git a/src/test/ui/resolve/resolve-assoc-suggestions.rs b/tests/ui/resolve/resolve-assoc-suggestions.rs
index ee9bce60c..ee9bce60c 100644
--- a/src/test/ui/resolve/resolve-assoc-suggestions.rs
+++ b/tests/ui/resolve/resolve-assoc-suggestions.rs
diff --git a/src/test/ui/resolve/resolve-assoc-suggestions.stderr b/tests/ui/resolve/resolve-assoc-suggestions.stderr
index 8def9aa20..8def9aa20 100644
--- a/src/test/ui/resolve/resolve-assoc-suggestions.stderr
+++ b/tests/ui/resolve/resolve-assoc-suggestions.stderr
diff --git a/src/test/ui/resolve/resolve-bad-import-prefix.rs b/tests/ui/resolve/resolve-bad-import-prefix.rs
index 325c69b43..325c69b43 100644
--- a/src/test/ui/resolve/resolve-bad-import-prefix.rs
+++ b/tests/ui/resolve/resolve-bad-import-prefix.rs
diff --git a/src/test/ui/resolve/resolve-bad-import-prefix.stderr b/tests/ui/resolve/resolve-bad-import-prefix.stderr
index 852b9c6af..852b9c6af 100644
--- a/src/test/ui/resolve/resolve-bad-import-prefix.stderr
+++ b/tests/ui/resolve/resolve-bad-import-prefix.stderr
diff --git a/src/test/ui/resolve/resolve-bad-visibility.rs b/tests/ui/resolve/resolve-bad-visibility.rs
index 7d48bb97b..7d48bb97b 100644
--- a/src/test/ui/resolve/resolve-bad-visibility.rs
+++ b/tests/ui/resolve/resolve-bad-visibility.rs
diff --git a/src/test/ui/resolve/resolve-bad-visibility.stderr b/tests/ui/resolve/resolve-bad-visibility.stderr
index 2ac41b875..2ac41b875 100644
--- a/src/test/ui/resolve/resolve-bad-visibility.stderr
+++ b/tests/ui/resolve/resolve-bad-visibility.stderr
diff --git a/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.rs b/tests/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.rs
index 3cb6ab52e..3cb6ab52e 100644
--- a/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.rs
+++ b/tests/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.rs
diff --git a/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr b/tests/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr
index ea6cb9eb0..ea6cb9eb0 100644
--- a/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr
+++ b/tests/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr
diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.rs b/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.rs
index 10772e7a4..10772e7a4 100644
--- a/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.rs
+++ b/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.rs
diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr b/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr
index abf068a1f..abf068a1f 100644
--- a/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr
+++ b/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr
diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-import.fixed b/tests/ui/resolve/resolve-conflict-import-vs-import.fixed
index e429513b5..e429513b5 100644
--- a/src/test/ui/resolve/resolve-conflict-import-vs-import.fixed
+++ b/tests/ui/resolve/resolve-conflict-import-vs-import.fixed
diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-import.rs b/tests/ui/resolve/resolve-conflict-import-vs-import.rs
index 43853117a..43853117a 100644
--- a/src/test/ui/resolve/resolve-conflict-import-vs-import.rs
+++ b/tests/ui/resolve/resolve-conflict-import-vs-import.rs
diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-import.stderr b/tests/ui/resolve/resolve-conflict-import-vs-import.stderr
index 632be50f4..632be50f4 100644
--- a/src/test/ui/resolve/resolve-conflict-import-vs-import.stderr
+++ b/tests/ui/resolve/resolve-conflict-import-vs-import.stderr
diff --git a/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.rs b/tests/ui/resolve/resolve-conflict-item-vs-extern-crate.rs
index 122606249..122606249 100644
--- a/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.rs
+++ b/tests/ui/resolve/resolve-conflict-item-vs-extern-crate.rs
diff --git a/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr b/tests/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr
index 7b9fb6c63..7b9fb6c63 100644
--- a/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr
+++ b/tests/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr
diff --git a/src/test/ui/resolve/resolve-conflict-item-vs-import.rs b/tests/ui/resolve/resolve-conflict-item-vs-import.rs
index 4308c7a27..4308c7a27 100644
--- a/src/test/ui/resolve/resolve-conflict-item-vs-import.rs
+++ b/tests/ui/resolve/resolve-conflict-item-vs-import.rs
diff --git a/src/test/ui/resolve/resolve-conflict-item-vs-import.stderr b/tests/ui/resolve/resolve-conflict-item-vs-import.stderr
index 5e5c9f6b3..5e5c9f6b3 100644
--- a/src/test/ui/resolve/resolve-conflict-item-vs-import.stderr
+++ b/tests/ui/resolve/resolve-conflict-item-vs-import.stderr
diff --git a/src/test/ui/resolve/resolve-conflict-type-vs-import.rs b/tests/ui/resolve/resolve-conflict-type-vs-import.rs
index 3abce8396..3abce8396 100644
--- a/src/test/ui/resolve/resolve-conflict-type-vs-import.rs
+++ b/tests/ui/resolve/resolve-conflict-type-vs-import.rs
diff --git a/src/test/ui/resolve/resolve-conflict-type-vs-import.stderr b/tests/ui/resolve/resolve-conflict-type-vs-import.stderr
index 198ef1031..198ef1031 100644
--- a/src/test/ui/resolve/resolve-conflict-type-vs-import.stderr
+++ b/tests/ui/resolve/resolve-conflict-type-vs-import.stderr
diff --git a/src/test/ui/resolve/resolve-hint-macro.fixed b/tests/ui/resolve/resolve-hint-macro.fixed
index 54e016084..54e016084 100644
--- a/src/test/ui/resolve/resolve-hint-macro.fixed
+++ b/tests/ui/resolve/resolve-hint-macro.fixed
diff --git a/src/test/ui/resolve/resolve-hint-macro.rs b/tests/ui/resolve/resolve-hint-macro.rs
index f16e8c075..f16e8c075 100644
--- a/src/test/ui/resolve/resolve-hint-macro.rs
+++ b/tests/ui/resolve/resolve-hint-macro.rs
diff --git a/src/test/ui/resolve/resolve-hint-macro.stderr b/tests/ui/resolve/resolve-hint-macro.stderr
index 1e7ab48ef..1e7ab48ef 100644
--- a/src/test/ui/resolve/resolve-hint-macro.stderr
+++ b/tests/ui/resolve/resolve-hint-macro.stderr
diff --git a/src/test/ui/resolve/resolve-inconsistent-binding-mode.rs b/tests/ui/resolve/resolve-inconsistent-binding-mode.rs
index 43e9378b7..43e9378b7 100644
--- a/src/test/ui/resolve/resolve-inconsistent-binding-mode.rs
+++ b/tests/ui/resolve/resolve-inconsistent-binding-mode.rs
diff --git a/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr b/tests/ui/resolve/resolve-inconsistent-binding-mode.stderr
index c805c9eb1..c805c9eb1 100644
--- a/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr
+++ b/tests/ui/resolve/resolve-inconsistent-binding-mode.stderr
diff --git a/src/test/ui/resolve/resolve-inconsistent-names.rs b/tests/ui/resolve/resolve-inconsistent-names.rs
index 9a40b2034..9a40b2034 100644
--- a/src/test/ui/resolve/resolve-inconsistent-names.rs
+++ b/tests/ui/resolve/resolve-inconsistent-names.rs
diff --git a/src/test/ui/resolve/resolve-inconsistent-names.stderr b/tests/ui/resolve/resolve-inconsistent-names.stderr
index 773c9f6cd..773c9f6cd 100644
--- a/src/test/ui/resolve/resolve-inconsistent-names.stderr
+++ b/tests/ui/resolve/resolve-inconsistent-names.stderr
diff --git a/src/test/ui/resolve/resolve-issue-2428.rs b/tests/ui/resolve/resolve-issue-2428.rs
index 5f3473e9f..5f3473e9f 100644
--- a/src/test/ui/resolve/resolve-issue-2428.rs
+++ b/tests/ui/resolve/resolve-issue-2428.rs
diff --git a/src/test/ui/resolve/resolve-label.rs b/tests/ui/resolve/resolve-label.rs
index ac5410cd3..ac5410cd3 100644
--- a/src/test/ui/resolve/resolve-label.rs
+++ b/tests/ui/resolve/resolve-label.rs
diff --git a/src/test/ui/resolve/resolve-label.stderr b/tests/ui/resolve/resolve-label.stderr
index 5729348ef..5729348ef 100644
--- a/src/test/ui/resolve/resolve-label.stderr
+++ b/tests/ui/resolve/resolve-label.stderr
diff --git a/src/test/ui/resolve/resolve-primitive-fallback.rs b/tests/ui/resolve/resolve-primitive-fallback.rs
index 992bcd797..05cabd9e3 100644
--- a/src/test/ui/resolve/resolve-primitive-fallback.rs
+++ b/tests/ui/resolve/resolve-primitive-fallback.rs
@@ -2,7 +2,7 @@ fn main() {
     // Make sure primitive type fallback doesn't work in value namespace
     std::mem::size_of(u16);
     //~^ ERROR expected value, found builtin type `u16`
-    //~| ERROR this function takes 0 arguments but 1 argument was supplied
+    //~| ERROR function takes 0 arguments but 1 argument was supplied
 
     // Make sure primitive type fallback doesn't work with global paths
     let _: ::u8;
diff --git a/src/test/ui/resolve/resolve-primitive-fallback.stderr b/tests/ui/resolve/resolve-primitive-fallback.stderr
index 6d5d5bad9..964302e92 100644
--- a/src/test/ui/resolve/resolve-primitive-fallback.stderr
+++ b/tests/ui/resolve/resolve-primitive-fallback.stderr
@@ -28,9 +28,6 @@ LL |     std::mem::size_of(u16);
    |
 note: function defined here
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |              ^^^^^^^
 help: remove the extra argument
    |
 LL |     std::mem::size_of();
diff --git a/src/test/ui/resolve/resolve-pseudo-shadowing.rs b/tests/ui/resolve/resolve-pseudo-shadowing.rs
index 85c684ca0..85c684ca0 100644
--- a/src/test/ui/resolve/resolve-pseudo-shadowing.rs
+++ b/tests/ui/resolve/resolve-pseudo-shadowing.rs
diff --git a/src/test/ui/resolve/resolve-self-in-impl-2.rs b/tests/ui/resolve/resolve-self-in-impl-2.rs
index f586760c8..f586760c8 100644
--- a/src/test/ui/resolve/resolve-self-in-impl-2.rs
+++ b/tests/ui/resolve/resolve-self-in-impl-2.rs
diff --git a/src/test/ui/resolve/resolve-self-in-impl-2.stderr b/tests/ui/resolve/resolve-self-in-impl-2.stderr
index 3791fe90a..3791fe90a 100644
--- a/src/test/ui/resolve/resolve-self-in-impl-2.stderr
+++ b/tests/ui/resolve/resolve-self-in-impl-2.stderr
diff --git a/src/test/ui/resolve/resolve-self-in-impl.rs b/tests/ui/resolve/resolve-self-in-impl.rs
index d0872d1b7..d0872d1b7 100644
--- a/src/test/ui/resolve/resolve-self-in-impl.rs
+++ b/tests/ui/resolve/resolve-self-in-impl.rs
diff --git a/src/test/ui/resolve/resolve-self-in-impl.stderr b/tests/ui/resolve/resolve-self-in-impl.stderr
index b3042d413..b3042d413 100644
--- a/src/test/ui/resolve/resolve-self-in-impl.stderr
+++ b/tests/ui/resolve/resolve-self-in-impl.stderr
diff --git a/src/test/ui/resolve/resolve-speculative-adjustment.rs b/tests/ui/resolve/resolve-speculative-adjustment.rs
index 81f757829..81f757829 100644
--- a/src/test/ui/resolve/resolve-speculative-adjustment.rs
+++ b/tests/ui/resolve/resolve-speculative-adjustment.rs
diff --git a/src/test/ui/resolve/resolve-speculative-adjustment.stderr b/tests/ui/resolve/resolve-speculative-adjustment.stderr
index be11a7ebe..be11a7ebe 100644
--- a/src/test/ui/resolve/resolve-speculative-adjustment.stderr
+++ b/tests/ui/resolve/resolve-speculative-adjustment.stderr
diff --git a/src/test/ui/resolve/resolve-type-param-in-item-in-trait.rs b/tests/ui/resolve/resolve-type-param-in-item-in-trait.rs
index c77a66524..c77a66524 100644
--- a/src/test/ui/resolve/resolve-type-param-in-item-in-trait.rs
+++ b/tests/ui/resolve/resolve-type-param-in-item-in-trait.rs
diff --git a/src/test/ui/resolve/resolve-type-param-in-item-in-trait.stderr b/tests/ui/resolve/resolve-type-param-in-item-in-trait.stderr
index 0a6d1cc3b..0a6d1cc3b 100644
--- a/src/test/ui/resolve/resolve-type-param-in-item-in-trait.stderr
+++ b/tests/ui/resolve/resolve-type-param-in-item-in-trait.stderr
diff --git a/src/test/ui/resolve/resolve-unknown-trait.rs b/tests/ui/resolve/resolve-unknown-trait.rs
index 290893bbb..290893bbb 100644
--- a/src/test/ui/resolve/resolve-unknown-trait.rs
+++ b/tests/ui/resolve/resolve-unknown-trait.rs
diff --git a/src/test/ui/resolve/resolve-unknown-trait.stderr b/tests/ui/resolve/resolve-unknown-trait.stderr
index e19cfe617..e19cfe617 100644
--- a/src/test/ui/resolve/resolve-unknown-trait.stderr
+++ b/tests/ui/resolve/resolve-unknown-trait.stderr
diff --git a/src/test/ui/resolve/resolve-variant-assoc-item.rs b/tests/ui/resolve/resolve-variant-assoc-item.rs
index db4fedfb0..db4fedfb0 100644
--- a/src/test/ui/resolve/resolve-variant-assoc-item.rs
+++ b/tests/ui/resolve/resolve-variant-assoc-item.rs
diff --git a/src/test/ui/resolve/resolve-variant-assoc-item.stderr b/tests/ui/resolve/resolve-variant-assoc-item.stderr
index 4be101996..4be101996 100644
--- a/src/test/ui/resolve/resolve-variant-assoc-item.stderr
+++ b/tests/ui/resolve/resolve-variant-assoc-item.stderr
diff --git a/src/test/ui/resolve/shadow-const-param.rs b/tests/ui/resolve/shadow-const-param.rs
index c435c16dc..c435c16dc 100644
--- a/src/test/ui/resolve/shadow-const-param.rs
+++ b/tests/ui/resolve/shadow-const-param.rs
diff --git a/src/test/ui/resolve/shadow-const-param.stderr b/tests/ui/resolve/shadow-const-param.stderr
index fbd0d8110..fbd0d8110 100644
--- a/src/test/ui/resolve/shadow-const-param.stderr
+++ b/tests/ui/resolve/shadow-const-param.stderr
diff --git a/src/test/ui/resolve/suggest-path-for-tuple-struct.rs b/tests/ui/resolve/suggest-path-for-tuple-struct.rs
index c8bc3e79f..c8bc3e79f 100644
--- a/src/test/ui/resolve/suggest-path-for-tuple-struct.rs
+++ b/tests/ui/resolve/suggest-path-for-tuple-struct.rs
diff --git a/src/test/ui/resolve/suggest-path-for-tuple-struct.stderr b/tests/ui/resolve/suggest-path-for-tuple-struct.stderr
index 4764cf2db..4764cf2db 100644
--- a/src/test/ui/resolve/suggest-path-for-tuple-struct.stderr
+++ b/tests/ui/resolve/suggest-path-for-tuple-struct.stderr
diff --git a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.rs b/tests/ui/resolve/suggest-path-instead-of-mod-dot-item.rs
index d5d6b13d6..d5d6b13d6 100644
--- a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.rs
+++ b/tests/ui/resolve/suggest-path-instead-of-mod-dot-item.rs
diff --git a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr b/tests/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
index a4ce0deeb..a4ce0deeb 100644
--- a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
+++ b/tests/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
diff --git a/src/test/ui/resolve/token-error-correct-2.rs b/tests/ui/resolve/token-error-correct-2.rs
index f7c7d908c..f7c7d908c 100644
--- a/src/test/ui/resolve/token-error-correct-2.rs
+++ b/tests/ui/resolve/token-error-correct-2.rs
diff --git a/src/test/ui/resolve/token-error-correct-2.stderr b/tests/ui/resolve/token-error-correct-2.stderr
index cca9f2dc8..cca9f2dc8 100644
--- a/src/test/ui/resolve/token-error-correct-2.stderr
+++ b/tests/ui/resolve/token-error-correct-2.stderr
diff --git a/src/test/ui/resolve/token-error-correct-3.rs b/tests/ui/resolve/token-error-correct-3.rs
index 52934085f..52934085f 100644
--- a/src/test/ui/resolve/token-error-correct-3.rs
+++ b/tests/ui/resolve/token-error-correct-3.rs
diff --git a/src/test/ui/resolve/token-error-correct-3.stderr b/tests/ui/resolve/token-error-correct-3.stderr
index 77c87c784..77c87c784 100644
--- a/src/test/ui/resolve/token-error-correct-3.stderr
+++ b/tests/ui/resolve/token-error-correct-3.stderr
diff --git a/src/test/ui/resolve/token-error-correct-4.fixed b/tests/ui/resolve/token-error-correct-4.fixed
index 064b9e74e..064b9e74e 100644
--- a/src/test/ui/resolve/token-error-correct-4.fixed
+++ b/tests/ui/resolve/token-error-correct-4.fixed
diff --git a/src/test/ui/resolve/token-error-correct-4.rs b/tests/ui/resolve/token-error-correct-4.rs
index 5e31d71e7..5e31d71e7 100644
--- a/src/test/ui/resolve/token-error-correct-4.rs
+++ b/tests/ui/resolve/token-error-correct-4.rs
diff --git a/src/test/ui/resolve/token-error-correct-4.stderr b/tests/ui/resolve/token-error-correct-4.stderr
index 81e5a1336..81e5a1336 100644
--- a/src/test/ui/resolve/token-error-correct-4.stderr
+++ b/tests/ui/resolve/token-error-correct-4.stderr
diff --git a/src/test/ui/resolve/token-error-correct.rs b/tests/ui/resolve/token-error-correct.rs
index 4f74df0bf..4f74df0bf 100644
--- a/src/test/ui/resolve/token-error-correct.rs
+++ b/tests/ui/resolve/token-error-correct.rs
diff --git a/src/test/ui/resolve/token-error-correct.stderr b/tests/ui/resolve/token-error-correct.stderr
index ca0c4c18a..ca0c4c18a 100644
--- a/src/test/ui/resolve/token-error-correct.stderr
+++ b/tests/ui/resolve/token-error-correct.stderr
diff --git a/src/test/ui/resolve/tuple-struct-alias.rs b/tests/ui/resolve/tuple-struct-alias.rs
index 298e7e479..298e7e479 100644
--- a/src/test/ui/resolve/tuple-struct-alias.rs
+++ b/tests/ui/resolve/tuple-struct-alias.rs
diff --git a/src/test/ui/resolve/tuple-struct-alias.stderr b/tests/ui/resolve/tuple-struct-alias.stderr
index a739ea43e..a739ea43e 100644
--- a/src/test/ui/resolve/tuple-struct-alias.stderr
+++ b/tests/ui/resolve/tuple-struct-alias.stderr
diff --git a/src/test/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.rs b/tests/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.rs
index ecd3f5881..ecd3f5881 100644
--- a/src/test/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.rs
+++ b/tests/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.rs
diff --git a/src/test/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.stderr b/tests/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.stderr
index f32e0404e..f32e0404e 100644
--- a/src/test/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.stderr
+++ b/tests/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.stderr
diff --git a/src/test/ui/resolve/typo-suggestion-mistyped-in-path.rs b/tests/ui/resolve/typo-suggestion-mistyped-in-path.rs
index 3ce17a14f..3ce17a14f 100644
--- a/src/test/ui/resolve/typo-suggestion-mistyped-in-path.rs
+++ b/tests/ui/resolve/typo-suggestion-mistyped-in-path.rs
diff --git a/src/test/ui/resolve/typo-suggestion-mistyped-in-path.stderr b/tests/ui/resolve/typo-suggestion-mistyped-in-path.stderr
index 89b69e140..89b69e140 100644
--- a/src/test/ui/resolve/typo-suggestion-mistyped-in-path.stderr
+++ b/tests/ui/resolve/typo-suggestion-mistyped-in-path.stderr
diff --git a/src/test/ui/resolve/typo-suggestion-named-underscore.rs b/tests/ui/resolve/typo-suggestion-named-underscore.rs
index a2b05db03..a2b05db03 100644
--- a/src/test/ui/resolve/typo-suggestion-named-underscore.rs
+++ b/tests/ui/resolve/typo-suggestion-named-underscore.rs
diff --git a/src/test/ui/resolve/typo-suggestion-named-underscore.stderr b/tests/ui/resolve/typo-suggestion-named-underscore.stderr
index 65d1b084a..65d1b084a 100644
--- a/src/test/ui/resolve/typo-suggestion-named-underscore.stderr
+++ b/tests/ui/resolve/typo-suggestion-named-underscore.stderr
diff --git a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.rs b/tests/ui/resolve/unboxed-closure-sugar-nonexistent-trait.rs
index 87f9ce097..87f9ce097 100644
--- a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.rs
+++ b/tests/ui/resolve/unboxed-closure-sugar-nonexistent-trait.rs
diff --git a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr b/tests/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr
index 8addc0303..8addc0303 100644
--- a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr
+++ b/tests/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr
diff --git a/src/test/ui/resolve/unresolved_static_type_field.rs b/tests/ui/resolve/unresolved_static_type_field.rs
index 494ad083f..494ad083f 100644
--- a/src/test/ui/resolve/unresolved_static_type_field.rs
+++ b/tests/ui/resolve/unresolved_static_type_field.rs
diff --git a/src/test/ui/resolve/unresolved_static_type_field.stderr b/tests/ui/resolve/unresolved_static_type_field.stderr
index 06926b53d..06926b53d 100644
--- a/src/test/ui/resolve/unresolved_static_type_field.stderr
+++ b/tests/ui/resolve/unresolved_static_type_field.stderr
diff --git a/src/test/ui/resolve/use-self-in-inner-fn.rs b/tests/ui/resolve/use-self-in-inner-fn.rs
index eccb315fe..eccb315fe 100644
--- a/src/test/ui/resolve/use-self-in-inner-fn.rs
+++ b/tests/ui/resolve/use-self-in-inner-fn.rs
diff --git a/src/test/ui/resolve/use-self-in-inner-fn.stderr b/tests/ui/resolve/use-self-in-inner-fn.stderr
index 966093499..966093499 100644
--- a/src/test/ui/resolve/use-self-in-inner-fn.stderr
+++ b/tests/ui/resolve/use-self-in-inner-fn.stderr
diff --git a/src/test/ui/resolve/use_suggestion.rs b/tests/ui/resolve/use_suggestion.rs
index 8c9bc6d76..8c9bc6d76 100644
--- a/src/test/ui/resolve/use_suggestion.rs
+++ b/tests/ui/resolve/use_suggestion.rs
diff --git a/src/test/ui/resolve/use_suggestion.stderr b/tests/ui/resolve/use_suggestion.stderr
index 54ad85383..54ad85383 100644
--- a/src/test/ui/resolve/use_suggestion.stderr
+++ b/tests/ui/resolve/use_suggestion.stderr
diff --git a/src/test/ui/resolve/use_suggestion_placement.fixed b/tests/ui/resolve/use_suggestion_placement.fixed
index d1686f7fd..d1686f7fd 100644
--- a/src/test/ui/resolve/use_suggestion_placement.fixed
+++ b/tests/ui/resolve/use_suggestion_placement.fixed
diff --git a/src/test/ui/resolve/use_suggestion_placement.rs b/tests/ui/resolve/use_suggestion_placement.rs
index 5be91f270..5be91f270 100644
--- a/src/test/ui/resolve/use_suggestion_placement.rs
+++ b/tests/ui/resolve/use_suggestion_placement.rs
diff --git a/src/test/ui/resolve/use_suggestion_placement.stderr b/tests/ui/resolve/use_suggestion_placement.stderr
index 0aadd82f6..0aadd82f6 100644
--- a/src/test/ui/resolve/use_suggestion_placement.stderr
+++ b/tests/ui/resolve/use_suggestion_placement.stderr
diff --git a/src/test/ui/resolve/visibility-indeterminate.rs b/tests/ui/resolve/visibility-indeterminate.rs
index 0e1142db3..0e1142db3 100644
--- a/src/test/ui/resolve/visibility-indeterminate.rs
+++ b/tests/ui/resolve/visibility-indeterminate.rs
diff --git a/src/test/ui/resolve/visibility-indeterminate.stderr b/tests/ui/resolve/visibility-indeterminate.stderr
index 84d82ce85..84d82ce85 100644
--- a/src/test/ui/resolve/visibility-indeterminate.stderr
+++ b/tests/ui/resolve/visibility-indeterminate.stderr
diff --git a/src/test/ui/resource-assign-is-not-copy.rs b/tests/ui/resource-assign-is-not-copy.rs
index c1de139a9..c1de139a9 100644
--- a/src/test/ui/resource-assign-is-not-copy.rs
+++ b/tests/ui/resource-assign-is-not-copy.rs
diff --git a/src/test/ui/resource-destruct.rs b/tests/ui/resource-destruct.rs
index c4756a21a..c4756a21a 100644
--- a/src/test/ui/resource-destruct.rs
+++ b/tests/ui/resource-destruct.rs
diff --git a/src/test/ui/ret-bang.rs b/tests/ui/ret-bang.rs
index 6618992e0..6618992e0 100644
--- a/src/test/ui/ret-bang.rs
+++ b/tests/ui/ret-bang.rs
diff --git a/src/test/ui/ret-non-nil.rs b/tests/ui/ret-non-nil.rs
index 86c02bf38..86c02bf38 100644
--- a/src/test/ui/ret-non-nil.rs
+++ b/tests/ui/ret-non-nil.rs
diff --git a/src/test/ui/ret-non-nil.stderr b/tests/ui/ret-non-nil.stderr
index 2029c6d9d..2029c6d9d 100644
--- a/src/test/ui/ret-non-nil.stderr
+++ b/tests/ui/ret-non-nil.stderr
diff --git a/src/test/ui/return-disjoint-regions.rs b/tests/ui/return-disjoint-regions.rs
index d0feb3b65..d0feb3b65 100644
--- a/src/test/ui/return-disjoint-regions.rs
+++ b/tests/ui/return-disjoint-regions.rs
diff --git a/src/test/ui/return-disjoint-regions.stderr b/tests/ui/return-disjoint-regions.stderr
index ed1592988..ed1592988 100644
--- a/src/test/ui/return-disjoint-regions.stderr
+++ b/tests/ui/return-disjoint-regions.stderr
diff --git a/src/test/ui/return-nil.rs b/tests/ui/return-nil.rs
index fd5203ff0..fd5203ff0 100644
--- a/src/test/ui/return-nil.rs
+++ b/tests/ui/return-nil.rs
diff --git a/src/test/ui/return/issue-64620.rs b/tests/ui/return/issue-64620.rs
index a62e5bf8d..a62e5bf8d 100644
--- a/src/test/ui/return/issue-64620.rs
+++ b/tests/ui/return/issue-64620.rs
diff --git a/src/test/ui/return/issue-64620.stderr b/tests/ui/return/issue-64620.stderr
index f40ac4de3..f40ac4de3 100644
--- a/src/test/ui/return/issue-64620.stderr
+++ b/tests/ui/return/issue-64620.stderr
diff --git a/src/test/ui/return/issue-82612-return-mutable-reference.rs b/tests/ui/return/issue-82612-return-mutable-reference.rs
index db0d08ddb..db0d08ddb 100644
--- a/src/test/ui/return/issue-82612-return-mutable-reference.rs
+++ b/tests/ui/return/issue-82612-return-mutable-reference.rs
diff --git a/src/test/ui/return/issue-82612-return-mutable-reference.stderr b/tests/ui/return/issue-82612-return-mutable-reference.stderr
index eb2322d51..eb2322d51 100644
--- a/src/test/ui/return/issue-82612-return-mutable-reference.stderr
+++ b/tests/ui/return/issue-82612-return-mutable-reference.stderr
diff --git a/src/test/ui/return/issue-86188-return-not-in-fn-body.rs b/tests/ui/return/issue-86188-return-not-in-fn-body.rs
index 4f076fa06..4f076fa06 100644
--- a/src/test/ui/return/issue-86188-return-not-in-fn-body.rs
+++ b/tests/ui/return/issue-86188-return-not-in-fn-body.rs
diff --git a/src/test/ui/return/issue-86188-return-not-in-fn-body.stderr b/tests/ui/return/issue-86188-return-not-in-fn-body.stderr
index 4f938670e..4f938670e 100644
--- a/src/test/ui/return/issue-86188-return-not-in-fn-body.stderr
+++ b/tests/ui/return/issue-86188-return-not-in-fn-body.stderr
diff --git a/src/test/ui/return/return-from-diverging.rs b/tests/ui/return/return-from-diverging.rs
index 2ee48e7bc..2ee48e7bc 100644
--- a/src/test/ui/return/return-from-diverging.rs
+++ b/tests/ui/return/return-from-diverging.rs
diff --git a/src/test/ui/return/return-from-diverging.stderr b/tests/ui/return/return-from-diverging.stderr
index 0c1fb4d9c..0c1fb4d9c 100644
--- a/src/test/ui/return/return-from-diverging.stderr
+++ b/tests/ui/return/return-from-diverging.stderr
diff --git a/src/test/ui/return/return-impl-trait-bad.rs b/tests/ui/return/return-impl-trait-bad.rs
index e3f6ddb9a..e3f6ddb9a 100644
--- a/src/test/ui/return/return-impl-trait-bad.rs
+++ b/tests/ui/return/return-impl-trait-bad.rs
diff --git a/src/test/ui/return/return-impl-trait-bad.stderr b/tests/ui/return/return-impl-trait-bad.stderr
index 237b85ee6..237b85ee6 100644
--- a/src/test/ui/return/return-impl-trait-bad.stderr
+++ b/tests/ui/return/return-impl-trait-bad.stderr
diff --git a/src/test/ui/return/return-impl-trait.fixed b/tests/ui/return/return-impl-trait.fixed
index ff2b02f73..ff2b02f73 100644
--- a/src/test/ui/return/return-impl-trait.fixed
+++ b/tests/ui/return/return-impl-trait.fixed
diff --git a/src/test/ui/return/return-impl-trait.rs b/tests/ui/return/return-impl-trait.rs
index e905d712f..e905d712f 100644
--- a/src/test/ui/return/return-impl-trait.rs
+++ b/tests/ui/return/return-impl-trait.rs
diff --git a/src/test/ui/return/return-impl-trait.stderr b/tests/ui/return/return-impl-trait.stderr
index 43d40972f..43d40972f 100644
--- a/src/test/ui/return/return-impl-trait.stderr
+++ b/tests/ui/return/return-impl-trait.stderr
diff --git a/src/test/ui/return/return-match-array-const.rs b/tests/ui/return/return-match-array-const.rs
index b619a4d57..b619a4d57 100644
--- a/src/test/ui/return/return-match-array-const.rs
+++ b/tests/ui/return/return-match-array-const.rs
diff --git a/src/test/ui/return/return-match-array-const.stderr b/tests/ui/return/return-match-array-const.stderr
index 85a733adf..85a733adf 100644
--- a/src/test/ui/return/return-match-array-const.stderr
+++ b/tests/ui/return/return-match-array-const.stderr
diff --git a/src/test/ui/return/return-type.rs b/tests/ui/return/return-type.rs
index 9f951ee0d..9f951ee0d 100644
--- a/src/test/ui/return/return-type.rs
+++ b/tests/ui/return/return-type.rs
diff --git a/src/test/ui/return/return-type.stderr b/tests/ui/return/return-type.stderr
index 5af136e60..5af136e60 100644
--- a/src/test/ui/return/return-type.stderr
+++ b/tests/ui/return/return-type.stderr
diff --git a/src/test/ui/return/return-unit-from-diverging.rs b/tests/ui/return/return-unit-from-diverging.rs
index 48417599b..48417599b 100644
--- a/src/test/ui/return/return-unit-from-diverging.rs
+++ b/tests/ui/return/return-unit-from-diverging.rs
diff --git a/src/test/ui/return/return-unit-from-diverging.stderr b/tests/ui/return/return-unit-from-diverging.stderr
index befc57563..befc57563 100644
--- a/src/test/ui/return/return-unit-from-diverging.stderr
+++ b/tests/ui/return/return-unit-from-diverging.stderr
diff --git a/src/test/ui/return/tail-expr-as-potential-return.rs b/tests/ui/return/tail-expr-as-potential-return.rs
index f46e088b8..f46e088b8 100644
--- a/src/test/ui/return/tail-expr-as-potential-return.rs
+++ b/tests/ui/return/tail-expr-as-potential-return.rs
diff --git a/src/test/ui/return/tail-expr-as-potential-return.stderr b/tests/ui/return/tail-expr-as-potential-return.stderr
index 9183b4599..9183b4599 100644
--- a/src/test/ui/return/tail-expr-as-potential-return.stderr
+++ b/tests/ui/return/tail-expr-as-potential-return.stderr
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs b/tests/ui/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs
index 1e086160f..1e086160f 100644
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs
+++ b/tests/ui/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs b/tests/ui/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs
index 3161d6fbb..3161d6fbb 100644
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs
+++ b/tests/ui/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs b/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs
index b716fc870..b716fc870 100644
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs
+++ b/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs
diff --git a/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs b/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs
new file mode 100644
index 000000000..6f0d2b045
--- /dev/null
+++ b/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs
@@ -0,0 +1,24 @@
+#![feature(if_let_guard)]
+
+enum VecWrapper { A(Vec<i32>) }
+
+fn if_guard(x: VecWrapper) -> usize {
+    match x {
+        VecWrapper::A(v) if { drop(v); false } => 1,
+        //~^ ERROR cannot move out of `v` in pattern guard
+        VecWrapper::A(v) => v.len()
+    }
+}
+
+fn if_let_guard(x: VecWrapper) -> usize {
+    match x {
+        VecWrapper::A(v) if let Some(()) = { drop(v); None } => 1,
+        //~^ ERROR cannot move out of `v` in pattern guard
+        VecWrapper::A(v) => v.len()
+    }
+}
+
+fn main() {
+    if_guard(VecWrapper::A(vec![107]));
+    if_let_guard(VecWrapper::A(vec![107]));
+}
diff --git a/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr b/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr
new file mode 100644
index 000000000..a749361bf
--- /dev/null
+++ b/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr
@@ -0,0 +1,19 @@
+error[E0507]: cannot move out of `v` in pattern guard
+  --> $DIR/rfc-reject-double-move-across-arms.rs:7:36
+   |
+LL |         VecWrapper::A(v) if { drop(v); false } => 1,
+   |                                    ^ move occurs because `v` has type `Vec<i32>`, which does not implement the `Copy` trait
+   |
+   = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
+
+error[E0507]: cannot move out of `v` in pattern guard
+  --> $DIR/rfc-reject-double-move-across-arms.rs:15:51
+   |
+LL |         VecWrapper::A(v) if let Some(()) = { drop(v); None } => 1,
+   |                                                   ^ move occurs because `v` has type `Vec<i32>`, which does not implement the `Copy` trait
+   |
+   = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs b/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs
new file mode 100644
index 000000000..827335f6a
--- /dev/null
+++ b/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs
@@ -0,0 +1,26 @@
+#![feature(if_let_guard)]
+
+struct A { a: Box<i32> }
+
+fn if_guard(n: i32) {
+    let x = A { a: Box::new(n) };
+    let _y = match x {
+        A { a: v } if { drop(v); true } => v,
+        //~^ ERROR cannot move out of `v` in pattern guard
+        _ => Box::new(0),
+    };
+}
+
+fn if_let_guard(n: i32) {
+    let x = A { a: Box::new(n) };
+    let _y = match x {
+        A { a: v } if let Some(()) = { drop(v); Some(()) } => v,
+        //~^ ERROR cannot move out of `v` in pattern guard
+        _ => Box::new(0),
+    };
+}
+
+fn main() {
+    if_guard(107);
+    if_let_guard(107);
+}
diff --git a/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr b/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr
new file mode 100644
index 000000000..9285492b2
--- /dev/null
+++ b/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr
@@ -0,0 +1,19 @@
+error[E0507]: cannot move out of `v` in pattern guard
+  --> $DIR/rfc-reject-double-move-in-first-arm.rs:8:30
+   |
+LL |         A { a: v } if { drop(v); true } => v,
+   |                              ^ move occurs because `v` has type `Box<i32>`, which does not implement the `Copy` trait
+   |
+   = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
+
+error[E0507]: cannot move out of `v` in pattern guard
+  --> $DIR/rfc-reject-double-move-in-first-arm.rs:17:45
+   |
+LL |         A { a: v } if let Some(()) = { drop(v); Some(()) } => v,
+   |                                             ^ move occurs because `v` has type `Box<i32>`, which does not implement the `Copy` trait
+   |
+   = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs
index 1914e1554..1914e1554 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs
index e713b003b..e713b003b 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs
index 04da14c54..04da14c54 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs
index 8313c25e7..8313c25e7 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs
index dca8aaef1..dca8aaef1 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs
index 7623839fd..7623839fd 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr
index c73a6cf13..c73a6cf13 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs
index 93022a23d..93022a23d 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr
index 6fdf9db89..6fdf9db89 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs
index 894739ff7..894739ff7 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr
index 10dd635ff..10dd635ff 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs
index 1699dae46..1699dae46 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr
index 66aecbc4f..66aecbc4f 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs
index 2672bdd9e..2672bdd9e 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr
index ee92954a6..ee92954a6 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs
index 3489995ae..3489995ae 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr
index f0c492d6a..f0c492d6a 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr
index bd2940479..bd2940479 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.rs
index ee6674097..ee6674097 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr
index 623fd585a..623fd585a 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs
index 2b3fbd2a4..2b3fbd2a4 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs
index 2a915d61e..2a915d61e 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr
index 0bf369fa8..0bf369fa8 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs
index 46d8ee3b6..46d8ee3b6 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr
index 955ab4b54..955ab4b54 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs
index 567685950..567685950 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr
index d6afc0255..d6afc0255 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.rs
index 0260caa82..0260caa82 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.stderr
index f37255d08..f37255d08 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs
index 7ba0f3a9e..7ba0f3a9e 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs
index 59a22c337..59a22c337 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr
index 616ed9e48..616ed9e48 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs
index 151a475c9..151a475c9 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr
index 371f8a0aa..371f8a0aa 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs
index a8deb8a75..a8deb8a75 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr
index 4157cf652..4157cf652 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr
diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs b/tests/ui/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs
index 50f91420c..50f91420c 100644
--- a/src/test/ui/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs
+++ b/tests/ui/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs
diff --git a/src/test/ui/rfc-1717-dllimport/missing-link-attr.rs b/tests/ui/rfc-1717-dllimport/missing-link-attr.rs
index b46d85160..b46d85160 100644
--- a/src/test/ui/rfc-1717-dllimport/missing-link-attr.rs
+++ b/tests/ui/rfc-1717-dllimport/missing-link-attr.rs
diff --git a/src/test/ui/rfc-1717-dllimport/missing-link-attr.stderr b/tests/ui/rfc-1717-dllimport/missing-link-attr.stderr
index d4410e147..d4410e147 100644
--- a/src/test/ui/rfc-1717-dllimport/missing-link-attr.stderr
+++ b/tests/ui/rfc-1717-dllimport/missing-link-attr.stderr
diff --git a/src/test/ui/rfc-1717-dllimport/multiple-renames.rs b/tests/ui/rfc-1717-dllimport/multiple-renames.rs
index 106f196b4..106f196b4 100644
--- a/src/test/ui/rfc-1717-dllimport/multiple-renames.rs
+++ b/tests/ui/rfc-1717-dllimport/multiple-renames.rs
diff --git a/src/test/ui/rfc-1717-dllimport/multiple-renames.stderr b/tests/ui/rfc-1717-dllimport/multiple-renames.stderr
index a6fec9c4e..a6fec9c4e 100644
--- a/src/test/ui/rfc-1717-dllimport/multiple-renames.stderr
+++ b/tests/ui/rfc-1717-dllimport/multiple-renames.stderr
diff --git a/src/test/ui/rfc-1717-dllimport/rename-modifiers.rs b/tests/ui/rfc-1717-dllimport/rename-modifiers.rs
index 30f4db718..30f4db718 100644
--- a/src/test/ui/rfc-1717-dllimport/rename-modifiers.rs
+++ b/tests/ui/rfc-1717-dllimport/rename-modifiers.rs
diff --git a/src/test/ui/rfc-1717-dllimport/rename-modifiers.stderr b/tests/ui/rfc-1717-dllimport/rename-modifiers.stderr
index bee639bf2..bee639bf2 100644
--- a/src/test/ui/rfc-1717-dllimport/rename-modifiers.stderr
+++ b/tests/ui/rfc-1717-dllimport/rename-modifiers.stderr
diff --git a/src/test/ui/rfc-1717-dllimport/rename-to-empty.rs b/tests/ui/rfc-1717-dllimport/rename-to-empty.rs
index 9356c4129..9356c4129 100644
--- a/src/test/ui/rfc-1717-dllimport/rename-to-empty.rs
+++ b/tests/ui/rfc-1717-dllimport/rename-to-empty.rs
diff --git a/src/test/ui/rfc-1717-dllimport/rename-to-empty.stderr b/tests/ui/rfc-1717-dllimport/rename-to-empty.stderr
index aca839d80..aca839d80 100644
--- a/src/test/ui/rfc-1717-dllimport/rename-to-empty.stderr
+++ b/tests/ui/rfc-1717-dllimport/rename-to-empty.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/issue-103052-1.rs b/tests/ui/rfc-1937-termination-trait/issue-103052-1.rs
index a75c91cc9..a75c91cc9 100644
--- a/src/test/ui/rfc-1937-termination-trait/issue-103052-1.rs
+++ b/tests/ui/rfc-1937-termination-trait/issue-103052-1.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/issue-103052-1.stderr b/tests/ui/rfc-1937-termination-trait/issue-103052-1.stderr
index 409dede1a..409dede1a 100644
--- a/src/test/ui/rfc-1937-termination-trait/issue-103052-1.stderr
+++ b/tests/ui/rfc-1937-termination-trait/issue-103052-1.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/issue-103052-2.rs b/tests/ui/rfc-1937-termination-trait/issue-103052-2.rs
index fa9182b6d..fa9182b6d 100644
--- a/src/test/ui/rfc-1937-termination-trait/issue-103052-2.rs
+++ b/tests/ui/rfc-1937-termination-trait/issue-103052-2.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/issue-103052-2.stderr b/tests/ui/rfc-1937-termination-trait/issue-103052-2.stderr
index a700c72ea..a700c72ea 100644
--- a/src/test/ui/rfc-1937-termination-trait/issue-103052-2.stderr
+++ b/tests/ui/rfc-1937-termination-trait/issue-103052-2.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
index 10dc6115d..10dc6115d 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-never.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-for-never.rs
index faf2526c8..faf2526c8 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-never.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-for-never.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
index 6a625fb05..6a625fb05 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-str.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-for-str.rs
index 94f16c6fd..94f16c6fd 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-str.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-for-str.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs
index 3b60cbc57..3b60cbc57 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr b/tests/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr
index 5ee6d127e..5ee6d127e 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs
index 96808a3ed..96808a3ed 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr b/tests/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr
index 7f6749fc9..7f6749fc9 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-in-test.rs
index 43888cece..43888cece 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-in-test.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs
index 10f7d2215..10f7d2215 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr b/tests/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr
index 53779d365..53779d365 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
index 687d5f144..687d5f144 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr b/tests/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr
index bc8fd92ce..bc8fd92ce 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs
index 4c6168abb..4c6168abb 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr b/tests/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr
index cb329548d..cb329548d 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs
index 193a523ae..193a523ae 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr b/tests/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr
index 957795211..a19750cc7 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr
@@ -9,9 +9,6 @@ LL | fn can_parse_zero_as_f32() -> Result<f32, ParseFloatError> {
    = note: required for `Result<f32, ParseFloatError>` to implement `Termination`
 note: required by a bound in `assert_test_result`
   --> $SRC_DIR/test/src/lib.rs:LL:COL
-   |
-LL | pub fn assert_test_result<T: Termination>(result: T) -> Result<(), String> {
-   |                              ^^^^^^^^^^^ required by this bound in `assert_test_result`
    = note: this error originates in the attribute macro `test` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
diff --git a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs b/tests/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs
index 54ab9f0ad..54ab9f0ad 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr b/tests/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr
index b7c0b0bb6..b7c0b0bb6 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/const.rs b/tests/ui/rfc-2005-default-binding-mode/const.rs
index 93df88040..93df88040 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/const.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/const.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/const.stderr b/tests/ui/rfc-2005-default-binding-mode/const.stderr
index 0f5671254..0f5671254 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/const.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/const.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/enum.rs b/tests/ui/rfc-2005-default-binding-mode/enum.rs
index 4e57769d6..4e57769d6 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/enum.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/enum.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/enum.stderr b/tests/ui/rfc-2005-default-binding-mode/enum.stderr
index 21e3d3d27..21e3d3d27 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/enum.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/enum.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.rs b/tests/ui/rfc-2005-default-binding-mode/explicit-mut.rs
index b8fde2208..b8fde2208 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/explicit-mut.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr b/tests/ui/rfc-2005-default-binding-mode/explicit-mut.stderr
index c3f64f65a..c3f64f65a 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/explicit-mut.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/for.rs b/tests/ui/rfc-2005-default-binding-mode/for.rs
index d6c5a13b1..d6c5a13b1 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/for.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/for.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/for.stderr b/tests/ui/rfc-2005-default-binding-mode/for.stderr
index 9cc20a7bf..07991af6e 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/for.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/for.stderr
@@ -6,6 +6,11 @@ LL |     for (n, mut m) in &tups {
    |             |
    |             data moved here
    |             move occurs because `m` has type `Foo`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     for (n, ref mut m) in &tups {
+   |             +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs b/tests/ui/rfc-2005-default-binding-mode/issue-44912-or.rs
index b4a0d8145..b4a0d8145 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/issue-44912-or.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr b/tests/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr
index e1e1bf7f6..e1e1bf7f6 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/lit.rs b/tests/ui/rfc-2005-default-binding-mode/lit.rs
index ce79cfbdc..ce79cfbdc 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/lit.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/lit.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr b/tests/ui/rfc-2005-default-binding-mode/lit.stderr
index 11bc170cd..11bc170cd 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/lit.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.rs b/tests/ui/rfc-2005-default-binding-mode/no-double-error.rs
index 46fdfd678..46fdfd678 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/no-double-error.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr b/tests/ui/rfc-2005-default-binding-mode/no-double-error.stderr
index c672acee0..c672acee0 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/no-double-error.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/slice.rs b/tests/ui/rfc-2005-default-binding-mode/slice.rs
index 363a0e3e6..363a0e3e6 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/slice.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/slice.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/slice.stderr b/tests/ui/rfc-2005-default-binding-mode/slice.stderr
index 60c1f5420..60c1f5420 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/slice.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/slice.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs b/tests/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs
index cb2b585ab..cb2b585ab 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/monovariants.rs b/tests/ui/rfc-2008-non-exhaustive/auxiliary/monovariants.rs
index 5f86db86d..5f86db86d 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/monovariants.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/auxiliary/monovariants.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs b/tests/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs
index 78db6b170..78db6b170 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/unstable.rs b/tests/ui/rfc-2008-non-exhaustive/auxiliary/unstable.rs
index 11df44461..11df44461 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/unstable.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/auxiliary/unstable.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs b/tests/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs
index 02672d545..02672d545 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/borrowck-exhaustive.rs b/tests/ui/rfc-2008-non-exhaustive/borrowck-exhaustive.rs
index be775b37f..be775b37f 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/borrowck-exhaustive.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/borrowck-exhaustive.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.rs b/tests/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.rs
index 2ad92b794..2ad92b794 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.stderr b/tests/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.stderr
index de730ce10..de730ce10 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum-as-cast.rs b/tests/ui/rfc-2008-non-exhaustive/enum-as-cast.rs
index 5dce8180f..5dce8180f 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/enum-as-cast.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/enum-as-cast.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum-as-cast.stderr b/tests/ui/rfc-2008-non-exhaustive/enum-as-cast.stderr
index a61dcf839..a61dcf839 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/enum-as-cast.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/enum-as-cast.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum.rs b/tests/ui/rfc-2008-non-exhaustive/enum.rs
index 9d2855f5c..9d2855f5c 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/enum.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/enum.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum.stderr b/tests/ui/rfc-2008-non-exhaustive/enum.stderr
index 872cb9b8b..872cb9b8b 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/enum.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/enum.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum_same_crate.rs b/tests/ui/rfc-2008-non-exhaustive/enum_same_crate.rs
index 54e42917f..54e42917f 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/enum_same_crate.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/enum_same_crate.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.rs b/tests/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.rs
index 69a283c31..69a283c31 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.stderr b/tests/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.stderr
index de1bf8be8..de1bf8be8 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/auxiliary/types.rs b/tests/ui/rfc-2008-non-exhaustive/improper_ctypes/auxiliary/types.rs
index d6251fcb7..d6251fcb7 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/auxiliary/types.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/improper_ctypes/auxiliary/types.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.rs b/tests/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.rs
index 15c0c695f..15c0c695f 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr b/tests/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr
index 43c8e1015..43c8e1015 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/same_crate_proper.rs b/tests/ui/rfc-2008-non-exhaustive/improper_ctypes/same_crate_proper.rs
index fe4ae345d..fe4ae345d 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/same_crate_proper.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/improper_ctypes/same_crate_proper.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.rs b/tests/ui/rfc-2008-non-exhaustive/invalid-attribute.rs
index 143f9a300..143f9a300 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/invalid-attribute.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr b/tests/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr
index 136cd763b..136cd763b 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/omitted-patterns.rs b/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.rs
index d8f07bb8f..d8f07bb8f 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/omitted-patterns.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/omitted-patterns.stderr b/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.stderr
index 996bd4a12..996bd4a12 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/omitted-patterns.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/stable-omitted-patterns.rs b/tests/ui/rfc-2008-non-exhaustive/stable-omitted-patterns.rs
index 82ee68687..82ee68687 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/stable-omitted-patterns.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/stable-omitted-patterns.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/stable-omitted-patterns.stderr b/tests/ui/rfc-2008-non-exhaustive/stable-omitted-patterns.stderr
index f38368590..f38368590 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/stable-omitted-patterns.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/stable-omitted-patterns.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/struct.rs b/tests/ui/rfc-2008-non-exhaustive/struct.rs
index 07e093c15..07e093c15 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/struct.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/struct.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/struct.stderr b/tests/ui/rfc-2008-non-exhaustive/struct.stderr
index 2cb9ba0d1..2cb9ba0d1 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/struct.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/struct.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/structs_same_crate.rs b/tests/ui/rfc-2008-non-exhaustive/structs_same_crate.rs
index 5f76b0cb2..5f76b0cb2 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/structs_same_crate.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/structs_same_crate.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs
index a2735d4cb..a2735d4cb 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions.rs
index 80b9dc4c1..80b9dc4c1 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.stderr b/tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions.stderr
index f8ed156b5..f8ed156b5 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs
index 6b911dd98..6b911dd98 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr b/tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr
index fd2c56974..fd2c56974 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs
index 98a7fdbc5..98a7fdbc5 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr
index 66e93291c..66e93291c 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs
index 8f090fe88..8f090fe88 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr
index c12190541..c12190541 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs
index be86519ec..be86519ec 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr
index ef97c1fa1..ef97c1fa1 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs
index 60289aa78..60289aa78 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.rs
index 230ac7529..230ac7529 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr b/tests/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr
index f39e6ee29..f39e6ee29 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match.rs
index e54098d4d..e54098d4d 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr
index a9c54af04..a9c54af04 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs
index ebbdfba15..ebbdfba15 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr
index ec2a2f6f0..ec2a2f6f0 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs
index 900dfff65..900dfff65 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr
index b6b777ec5..b6b777ec5 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs
index de5530485..de5530485 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/patterns.rs
index 221b5cf6b..221b5cf6b 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/patterns.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs b/tests/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs
index ffc496a97..ffc496a97 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr b/tests/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr
index 8bfd6e91f..8bfd6e91f 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/variant.rs b/tests/ui/rfc-2008-non-exhaustive/variant.rs
index bc346aea5..bc346aea5 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/variant.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/variant.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/variant.stderr b/tests/ui/rfc-2008-non-exhaustive/variant.stderr
index 720b7b119..720b7b119 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/variant.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/variant.stderr
diff --git a/src/test/ui/rfc-2008-non-exhaustive/variants_fictive_visibility.rs b/tests/ui/rfc-2008-non-exhaustive/variants_fictive_visibility.rs
index dacaf489a..dacaf489a 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/variants_fictive_visibility.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/variants_fictive_visibility.rs
diff --git a/src/test/ui/rfc-2008-non-exhaustive/variants_same_crate.rs b/tests/ui/rfc-2008-non-exhaustive/variants_same_crate.rs
index 5f2816ec6..5f2816ec6 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/variants_same_crate.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/variants_same_crate.rs
diff --git a/src/test/ui/rfc-2027-object-safe-for-dispatch/downcast-unsafe-trait-objects.rs b/tests/ui/rfc-2027-object-safe-for-dispatch/downcast-unsafe-trait-objects.rs
index fa04f4b12..fa04f4b12 100644
--- a/src/test/ui/rfc-2027-object-safe-for-dispatch/downcast-unsafe-trait-objects.rs
+++ b/tests/ui/rfc-2027-object-safe-for-dispatch/downcast-unsafe-trait-objects.rs
diff --git a/src/test/ui/rfc-2027-object-safe-for-dispatch/manual-self-impl-for-unsafe-obj.rs b/tests/ui/rfc-2027-object-safe-for-dispatch/manual-self-impl-for-unsafe-obj.rs
index 721890db4..721890db4 100644
--- a/src/test/ui/rfc-2027-object-safe-for-dispatch/manual-self-impl-for-unsafe-obj.rs
+++ b/tests/ui/rfc-2027-object-safe-for-dispatch/manual-self-impl-for-unsafe-obj.rs
diff --git a/src/test/ui/rfc-2027-object-safe-for-dispatch/static-dispatch-unsafe-object.rs b/tests/ui/rfc-2027-object-safe-for-dispatch/static-dispatch-unsafe-object.rs
index df97d2c13..df97d2c13 100644
--- a/src/test/ui/rfc-2027-object-safe-for-dispatch/static-dispatch-unsafe-object.rs
+++ b/tests/ui/rfc-2027-object-safe-for-dispatch/static-dispatch-unsafe-object.rs
diff --git a/src/test/ui/rfc-2091-track-caller/call-chain.rs b/tests/ui/rfc-2091-track-caller/call-chain.rs
index fefb84de7..28b3f76c9 100644
--- a/src/test/ui/rfc-2091-track-caller/call-chain.rs
+++ b/tests/ui/rfc-2091-track-caller/call-chain.rs
@@ -1,10 +1,14 @@
 // run-pass
+// revisions: default mir-opt
+//[default] compile-flags: -Zinline-mir=no
+//[mir-opt] compile-flags: -Zmir-opt-level=4
 
 use std::panic::Location;
 
 struct Foo;
 
 impl Foo {
+    #[inline(always)]
     #[track_caller]
     fn check_loc(&self, line: u32, col: u32) -> &Self {
         let loc = Location::caller();
diff --git a/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs b/tests/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs
index a3bed707e..a3bed707e 100644
--- a/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs
+++ b/tests/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs
diff --git a/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr b/tests/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr
index cf8ca5771..cf8ca5771 100644
--- a/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr
+++ b/tests/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/caller-location-intrinsic.rs b/tests/ui/rfc-2091-track-caller/caller-location-intrinsic.rs
index e5754d355..e5754d355 100644
--- a/src/test/ui/rfc-2091-track-caller/caller-location-intrinsic.rs
+++ b/tests/ui/rfc-2091-track-caller/caller-location-intrinsic.rs
diff --git a/src/test/ui/rfc-2091-track-caller/const-caller-location.rs b/tests/ui/rfc-2091-track-caller/const-caller-location.rs
index 6e15cf3fe..6e15cf3fe 100644
--- a/src/test/ui/rfc-2091-track-caller/const-caller-location.rs
+++ b/tests/ui/rfc-2091-track-caller/const-caller-location.rs
diff --git a/src/test/ui/rfc-2091-track-caller/diverging-caller-location.rs b/tests/ui/rfc-2091-track-caller/diverging-caller-location.rs
index 668111955..668111955 100644
--- a/src/test/ui/rfc-2091-track-caller/diverging-caller-location.rs
+++ b/tests/ui/rfc-2091-track-caller/diverging-caller-location.rs
diff --git a/src/test/ui/rfc-2091-track-caller/error-odd-syntax.rs b/tests/ui/rfc-2091-track-caller/error-odd-syntax.rs
index 6f4290e2a..6f4290e2a 100644
--- a/src/test/ui/rfc-2091-track-caller/error-odd-syntax.rs
+++ b/tests/ui/rfc-2091-track-caller/error-odd-syntax.rs
diff --git a/src/test/ui/rfc-2091-track-caller/error-odd-syntax.stderr b/tests/ui/rfc-2091-track-caller/error-odd-syntax.stderr
index e7ddf8df4..e7ddf8df4 100644
--- a/src/test/ui/rfc-2091-track-caller/error-odd-syntax.stderr
+++ b/tests/ui/rfc-2091-track-caller/error-odd-syntax.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.rs b/tests/ui/rfc-2091-track-caller/error-with-invalid-abi.rs
index 074e1ceb7..074e1ceb7 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.rs
+++ b/tests/ui/rfc-2091-track-caller/error-with-invalid-abi.rs
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr b/tests/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr
index bcc0c8170..bcc0c8170 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr
+++ b/tests/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-main.rs b/tests/ui/rfc-2091-track-caller/error-with-main.rs
index b2ea31bb5..b2ea31bb5 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-main.rs
+++ b/tests/ui/rfc-2091-track-caller/error-with-main.rs
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-main.stderr b/tests/ui/rfc-2091-track-caller/error-with-main.stderr
index 7e2ec3524..7e2ec3524 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-main.stderr
+++ b/tests/ui/rfc-2091-track-caller/error-with-main.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-naked.rs b/tests/ui/rfc-2091-track-caller/error-with-naked.rs
index 43e33cbb1..43e33cbb1 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-naked.rs
+++ b/tests/ui/rfc-2091-track-caller/error-with-naked.rs
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-naked.stderr b/tests/ui/rfc-2091-track-caller/error-with-naked.stderr
index 3f7d0df42..3f7d0df42 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-naked.stderr
+++ b/tests/ui/rfc-2091-track-caller/error-with-naked.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-start.rs b/tests/ui/rfc-2091-track-caller/error-with-start.rs
index 0cab47170..0cab47170 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-start.rs
+++ b/tests/ui/rfc-2091-track-caller/error-with-start.rs
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-start.stderr b/tests/ui/rfc-2091-track-caller/error-with-start.stderr
index 454c98ff9..454c98ff9 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-start.stderr
+++ b/tests/ui/rfc-2091-track-caller/error-with-start.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/intrinsic-wrapper.rs b/tests/ui/rfc-2091-track-caller/intrinsic-wrapper.rs
index 87e52881c..87e52881c 100644
--- a/src/test/ui/rfc-2091-track-caller/intrinsic-wrapper.rs
+++ b/tests/ui/rfc-2091-track-caller/intrinsic-wrapper.rs
diff --git a/src/test/ui/rfc-2091-track-caller/macro-declaration.rs b/tests/ui/rfc-2091-track-caller/macro-declaration.rs
index 6ca09fac8..6ca09fac8 100644
--- a/src/test/ui/rfc-2091-track-caller/macro-declaration.rs
+++ b/tests/ui/rfc-2091-track-caller/macro-declaration.rs
diff --git a/src/test/ui/rfc-2091-track-caller/only-for-fns.rs b/tests/ui/rfc-2091-track-caller/only-for-fns.rs
index 2d2b01b6f..2d2b01b6f 100644
--- a/src/test/ui/rfc-2091-track-caller/only-for-fns.rs
+++ b/tests/ui/rfc-2091-track-caller/only-for-fns.rs
diff --git a/src/test/ui/rfc-2091-track-caller/only-for-fns.stderr b/tests/ui/rfc-2091-track-caller/only-for-fns.stderr
index b36597bde..b36597bde 100644
--- a/src/test/ui/rfc-2091-track-caller/only-for-fns.stderr
+++ b/tests/ui/rfc-2091-track-caller/only-for-fns.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/pass.rs b/tests/ui/rfc-2091-track-caller/pass.rs
index 1b13ea3e9..1b13ea3e9 100644
--- a/src/test/ui/rfc-2091-track-caller/pass.rs
+++ b/tests/ui/rfc-2091-track-caller/pass.rs
diff --git a/src/test/ui/rfc-2091-track-caller/std-panic-locations.rs b/tests/ui/rfc-2091-track-caller/std-panic-locations.rs
index f11456250..f11456250 100644
--- a/src/test/ui/rfc-2091-track-caller/std-panic-locations.rs
+++ b/tests/ui/rfc-2091-track-caller/std-panic-locations.rs
diff --git a/src/test/ui/rfc-2091-track-caller/track-caller-attribute.rs b/tests/ui/rfc-2091-track-caller/track-caller-attribute.rs
index 9d28eb9de..9d28eb9de 100644
--- a/src/test/ui/rfc-2091-track-caller/track-caller-attribute.rs
+++ b/tests/ui/rfc-2091-track-caller/track-caller-attribute.rs
diff --git a/src/test/ui/rfc-2091-track-caller/track-caller-ffi.rs b/tests/ui/rfc-2091-track-caller/track-caller-ffi.rs
index 5115f687c..5115f687c 100644
--- a/src/test/ui/rfc-2091-track-caller/track-caller-ffi.rs
+++ b/tests/ui/rfc-2091-track-caller/track-caller-ffi.rs
diff --git a/src/test/ui/rfc-2091-track-caller/tracked-closure.rs b/tests/ui/rfc-2091-track-caller/tracked-closure.rs
index 670c423a7..670c423a7 100644
--- a/src/test/ui/rfc-2091-track-caller/tracked-closure.rs
+++ b/tests/ui/rfc-2091-track-caller/tracked-closure.rs
diff --git a/src/test/ui/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs b/tests/ui/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs
index 658812578..658812578 100644
--- a/src/test/ui/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs
+++ b/tests/ui/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs
diff --git a/src/test/ui/rfc-2091-track-caller/tracked-fn-ptr.rs b/tests/ui/rfc-2091-track-caller/tracked-fn-ptr.rs
index 8bb4dd288..8bb4dd288 100644
--- a/src/test/ui/rfc-2091-track-caller/tracked-fn-ptr.rs
+++ b/tests/ui/rfc-2091-track-caller/tracked-fn-ptr.rs
diff --git a/src/test/ui/rfc-2091-track-caller/tracked-trait-impls.rs b/tests/ui/rfc-2091-track-caller/tracked-trait-impls.rs
index 4db4c29e5..4db4c29e5 100644
--- a/src/test/ui/rfc-2091-track-caller/tracked-trait-impls.rs
+++ b/tests/ui/rfc-2091-track-caller/tracked-trait-impls.rs
diff --git a/src/test/ui/rfc-2091-track-caller/tracked-trait-obj.rs b/tests/ui/rfc-2091-track-caller/tracked-trait-obj.rs
index 06883a857..06883a857 100644
--- a/src/test/ui/rfc-2091-track-caller/tracked-trait-obj.rs
+++ b/tests/ui/rfc-2091-track-caller/tracked-trait-obj.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/cross-crate.rs b/tests/ui/rfc-2093-infer-outlives/cross-crate.rs
index a9bfeabf1..a9bfeabf1 100644
--- a/src/test/ui/rfc-2093-infer-outlives/cross-crate.rs
+++ b/tests/ui/rfc-2093-infer-outlives/cross-crate.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/cross-crate.stderr b/tests/ui/rfc-2093-infer-outlives/cross-crate.stderr
index 76300cce5..76300cce5 100644
--- a/src/test/ui/rfc-2093-infer-outlives/cross-crate.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/cross-crate.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.rs b/tests/ui/rfc-2093-infer-outlives/dont-infer-static.rs
index d3940b13b..d3940b13b 100644
--- a/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.rs
+++ b/tests/ui/rfc-2093-infer-outlives/dont-infer-static.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr b/tests/ui/rfc-2093-infer-outlives/dont-infer-static.stderr
index 0c388f5fe..0c388f5fe 100644
--- a/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/dont-infer-static.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/enum.rs b/tests/ui/rfc-2093-infer-outlives/enum.rs
index 71d2d3222..71d2d3222 100644
--- a/src/test/ui/rfc-2093-infer-outlives/enum.rs
+++ b/tests/ui/rfc-2093-infer-outlives/enum.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/enum.stderr b/tests/ui/rfc-2093-infer-outlives/enum.stderr
index b6ce2450e..b6ce2450e 100644
--- a/src/test/ui/rfc-2093-infer-outlives/enum.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/enum.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.rs b/tests/ui/rfc-2093-infer-outlives/explicit-dyn.rs
index 419fb0a0e..419fb0a0e 100644
--- a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.rs
+++ b/tests/ui/rfc-2093-infer-outlives/explicit-dyn.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.stderr b/tests/ui/rfc-2093-infer-outlives/explicit-dyn.stderr
index 595a5c280..595a5c280 100644
--- a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/explicit-dyn.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-enum.rs b/tests/ui/rfc-2093-infer-outlives/explicit-enum.rs
index c330c27fe..c330c27fe 100644
--- a/src/test/ui/rfc-2093-infer-outlives/explicit-enum.rs
+++ b/tests/ui/rfc-2093-infer-outlives/explicit-enum.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-enum.stderr b/tests/ui/rfc-2093-infer-outlives/explicit-enum.stderr
index 3059f95ae..3059f95ae 100644
--- a/src/test/ui/rfc-2093-infer-outlives/explicit-enum.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/explicit-enum.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-projection.rs b/tests/ui/rfc-2093-infer-outlives/explicit-projection.rs
index 00b895288..00b895288 100644
--- a/src/test/ui/rfc-2093-infer-outlives/explicit-projection.rs
+++ b/tests/ui/rfc-2093-infer-outlives/explicit-projection.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-projection.stderr b/tests/ui/rfc-2093-infer-outlives/explicit-projection.stderr
index 589e95899..589e95899 100644
--- a/src/test/ui/rfc-2093-infer-outlives/explicit-projection.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/explicit-projection.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-struct.rs b/tests/ui/rfc-2093-infer-outlives/explicit-struct.rs
index 3d5e610b9..3d5e610b9 100644
--- a/src/test/ui/rfc-2093-infer-outlives/explicit-struct.rs
+++ b/tests/ui/rfc-2093-infer-outlives/explicit-struct.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-struct.stderr b/tests/ui/rfc-2093-infer-outlives/explicit-struct.stderr
index 9912e36b2..9912e36b2 100644
--- a/src/test/ui/rfc-2093-infer-outlives/explicit-struct.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/explicit-struct.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-union.rs b/tests/ui/rfc-2093-infer-outlives/explicit-union.rs
index 871208b5b..871208b5b 100644
--- a/src/test/ui/rfc-2093-infer-outlives/explicit-union.rs
+++ b/tests/ui/rfc-2093-infer-outlives/explicit-union.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-union.stderr b/tests/ui/rfc-2093-infer-outlives/explicit-union.stderr
index 16b64bdc2..16b64bdc2 100644
--- a/src/test/ui/rfc-2093-infer-outlives/explicit-union.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/explicit-union.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/issue-54467.rs b/tests/ui/rfc-2093-infer-outlives/issue-54467.rs
index c712f15e3..c712f15e3 100644
--- a/src/test/ui/rfc-2093-infer-outlives/issue-54467.rs
+++ b/tests/ui/rfc-2093-infer-outlives/issue-54467.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-enum.rs b/tests/ui/rfc-2093-infer-outlives/nested-enum.rs
index 0cd706e7a..0cd706e7a 100644
--- a/src/test/ui/rfc-2093-infer-outlives/nested-enum.rs
+++ b/tests/ui/rfc-2093-infer-outlives/nested-enum.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-enum.stderr b/tests/ui/rfc-2093-infer-outlives/nested-enum.stderr
index 4350e6e8b..4350e6e8b 100644
--- a/src/test/ui/rfc-2093-infer-outlives/nested-enum.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/nested-enum.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-regions.rs b/tests/ui/rfc-2093-infer-outlives/nested-regions.rs
index a01c50681..a01c50681 100644
--- a/src/test/ui/rfc-2093-infer-outlives/nested-regions.rs
+++ b/tests/ui/rfc-2093-infer-outlives/nested-regions.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-regions.stderr b/tests/ui/rfc-2093-infer-outlives/nested-regions.stderr
index c08add7ed..c08add7ed 100644
--- a/src/test/ui/rfc-2093-infer-outlives/nested-regions.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/nested-regions.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-structs.rs b/tests/ui/rfc-2093-infer-outlives/nested-structs.rs
index ac6817d22..ac6817d22 100644
--- a/src/test/ui/rfc-2093-infer-outlives/nested-structs.rs
+++ b/tests/ui/rfc-2093-infer-outlives/nested-structs.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-structs.stderr b/tests/ui/rfc-2093-infer-outlives/nested-structs.stderr
index 769555234..769555234 100644
--- a/src/test/ui/rfc-2093-infer-outlives/nested-structs.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/nested-structs.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-union.rs b/tests/ui/rfc-2093-infer-outlives/nested-union.rs
index 27ebd0b54..27ebd0b54 100644
--- a/src/test/ui/rfc-2093-infer-outlives/nested-union.rs
+++ b/tests/ui/rfc-2093-infer-outlives/nested-union.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-union.stderr b/tests/ui/rfc-2093-infer-outlives/nested-union.stderr
index a785c63ce..a785c63ce 100644
--- a/src/test/ui/rfc-2093-infer-outlives/nested-union.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/nested-union.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/privacy.rs b/tests/ui/rfc-2093-infer-outlives/privacy.rs
index 180f5ac6c..180f5ac6c 100644
--- a/src/test/ui/rfc-2093-infer-outlives/privacy.rs
+++ b/tests/ui/rfc-2093-infer-outlives/privacy.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/projection.rs b/tests/ui/rfc-2093-infer-outlives/projection.rs
index 411c86da1..411c86da1 100644
--- a/src/test/ui/rfc-2093-infer-outlives/projection.rs
+++ b/tests/ui/rfc-2093-infer-outlives/projection.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/projection.stderr b/tests/ui/rfc-2093-infer-outlives/projection.stderr
index d9342013f..d9342013f 100644
--- a/src/test/ui/rfc-2093-infer-outlives/projection.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/projection.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/reference.rs b/tests/ui/rfc-2093-infer-outlives/reference.rs
index a48a3315a..a48a3315a 100644
--- a/src/test/ui/rfc-2093-infer-outlives/reference.rs
+++ b/tests/ui/rfc-2093-infer-outlives/reference.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/reference.stderr b/tests/ui/rfc-2093-infer-outlives/reference.stderr
index 508114357..508114357 100644
--- a/src/test/ui/rfc-2093-infer-outlives/reference.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/reference.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-enum-not-wf.rs b/tests/ui/rfc-2093-infer-outlives/regions-enum-not-wf.rs
index 8b491ee4e..8b491ee4e 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-enum-not-wf.rs
+++ b/tests/ui/rfc-2093-infer-outlives/regions-enum-not-wf.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-enum-not-wf.stderr b/tests/ui/rfc-2093-infer-outlives/regions-enum-not-wf.stderr
index 2c660b285..2c660b285 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-enum-not-wf.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/regions-enum-not-wf.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs
index 36b024d2e..36b024d2e 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs
+++ b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.stderr b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.stderr
index 5dff4c8ff..5dff4c8ff 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs
index 47a38f7c4..47a38f7c4 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs
+++ b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.stderr b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.stderr
index 975776cdd..975776cdd 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs
index 083ba8948..083ba8948 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs
+++ b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.stderr b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.stderr
index be05ecec0..be05ecec0 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs
index f3e4e39ac..f3e4e39ac 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs
+++ b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.stderr b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.stderr
index 4ba1778d6..4ba1778d6 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-struct-not-wf.rs b/tests/ui/rfc-2093-infer-outlives/regions-struct-not-wf.rs
index 552c6cf00..552c6cf00 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-struct-not-wf.rs
+++ b/tests/ui/rfc-2093-infer-outlives/regions-struct-not-wf.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-struct-not-wf.stderr b/tests/ui/rfc-2093-infer-outlives/regions-struct-not-wf.stderr
index 34ff1362c..34ff1362c 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-struct-not-wf.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/regions-struct-not-wf.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/self-dyn.rs b/tests/ui/rfc-2093-infer-outlives/self-dyn.rs
index c53d6c18f..c53d6c18f 100644
--- a/src/test/ui/rfc-2093-infer-outlives/self-dyn.rs
+++ b/tests/ui/rfc-2093-infer-outlives/self-dyn.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/self-dyn.stderr b/tests/ui/rfc-2093-infer-outlives/self-dyn.stderr
index 9c836b190..9c836b190 100644
--- a/src/test/ui/rfc-2093-infer-outlives/self-dyn.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/self-dyn.stderr
diff --git a/src/test/ui/rfc-2093-infer-outlives/self-structs.rs b/tests/ui/rfc-2093-infer-outlives/self-structs.rs
index 8f2d29d6f..8f2d29d6f 100644
--- a/src/test/ui/rfc-2093-infer-outlives/self-structs.rs
+++ b/tests/ui/rfc-2093-infer-outlives/self-structs.rs
diff --git a/src/test/ui/rfc-2093-infer-outlives/self-structs.stderr b/tests/ui/rfc-2093-infer-outlives/self-structs.stderr
index 2b4625f77..2b4625f77 100644
--- a/src/test/ui/rfc-2093-infer-outlives/self-structs.stderr
+++ b/tests/ui/rfc-2093-infer-outlives/self-structs.stderr
diff --git a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs b/tests/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs
index 79f6b0dfe..79f6b0dfe 100644
--- a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs
+++ b/tests/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs
diff --git a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr b/tests/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr
index 7e7ee3ce0..7e7ee3ce0 100644
--- a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr
+++ b/tests/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr
diff --git a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs b/tests/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs
index 019ef8e9d..019ef8e9d 100644
--- a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs
+++ b/tests/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs
diff --git a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr b/tests/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr
index c39a70f66..c39a70f66 100644
--- a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr
+++ b/tests/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs b/tests/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
index c4d444764..c4d444764 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
+++ b/tests/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs b/tests/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs
index 9c0e0bef4..9c0e0bef4 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs
+++ b/tests/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr b/tests/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr
index 818915721..818915721 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr
+++ b/tests/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs b/tests/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs
index def60feb5..def60feb5 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs
+++ b/tests/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr b/tests/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr
index 7df4f06d1..7df4f06d1 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr
+++ b/tests/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs b/tests/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs
index 486159c0e..486159c0e 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs
+++ b/tests/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr b/tests/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr
index bd6778cf3..bd6778cf3 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr
+++ b/tests/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.rs b/tests/ui/rfc-2126-extern-absolute-paths/not-allowed.rs
index acb4bbebe..acb4bbebe 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.rs
+++ b/tests/ui/rfc-2126-extern-absolute-paths/not-allowed.rs
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr b/tests/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr
index 761089cd3..122e8fd35 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr
+++ b/tests/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr
@@ -7,9 +7,9 @@ LL | use alloc;
 help: consider importing one of these items instead
    |
 LL | use core::alloc;
-   |     ~~~~~~~~~~~~
-LL | use std::alloc;
    |     ~~~~~~~~~~~
+LL | use std::alloc;
+   |     ~~~~~~~~~~
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs b/tests/ui/rfc-2126-extern-absolute-paths/single-segment.rs
index 72e50d78b..72e50d78b 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs
+++ b/tests/ui/rfc-2126-extern-absolute-paths/single-segment.rs
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr b/tests/ui/rfc-2126-extern-absolute-paths/single-segment.stderr
index 253cc1bc5..253cc1bc5 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr
+++ b/tests/ui/rfc-2126-extern-absolute-paths/single-segment.stderr
diff --git a/src/test/ui/rfc-2294-if-let-guard/bindings.rs b/tests/ui/rfc-2294-if-let-guard/bindings.rs
index 1f32e4af1..1f32e4af1 100644
--- a/src/test/ui/rfc-2294-if-let-guard/bindings.rs
+++ b/tests/ui/rfc-2294-if-let-guard/bindings.rs
diff --git a/src/test/ui/rfc-2294-if-let-guard/bindings.stderr b/tests/ui/rfc-2294-if-let-guard/bindings.stderr
index 2463b7f3e..2463b7f3e 100644
--- a/src/test/ui/rfc-2294-if-let-guard/bindings.stderr
+++ b/tests/ui/rfc-2294-if-let-guard/bindings.stderr
diff --git a/src/test/ui/rfc-2294-if-let-guard/feature-gate.rs b/tests/ui/rfc-2294-if-let-guard/feature-gate.rs
index f0105e08e..f0105e08e 100644
--- a/src/test/ui/rfc-2294-if-let-guard/feature-gate.rs
+++ b/tests/ui/rfc-2294-if-let-guard/feature-gate.rs
diff --git a/src/test/ui/rfc-2294-if-let-guard/feature-gate.stderr b/tests/ui/rfc-2294-if-let-guard/feature-gate.stderr
index 96fe11911..96fe11911 100644
--- a/src/test/ui/rfc-2294-if-let-guard/feature-gate.stderr
+++ b/tests/ui/rfc-2294-if-let-guard/feature-gate.stderr
diff --git a/src/test/ui/rfc-2294-if-let-guard/run-pass.rs b/tests/ui/rfc-2294-if-let-guard/run-pass.rs
index a303a0d1f..a303a0d1f 100644
--- a/src/test/ui/rfc-2294-if-let-guard/run-pass.rs
+++ b/tests/ui/rfc-2294-if-let-guard/run-pass.rs
diff --git a/src/test/ui/rfc-2294-if-let-guard/typeck.rs b/tests/ui/rfc-2294-if-let-guard/typeck.rs
index ad178dfa4..ad178dfa4 100644
--- a/src/test/ui/rfc-2294-if-let-guard/typeck.rs
+++ b/tests/ui/rfc-2294-if-let-guard/typeck.rs
diff --git a/src/test/ui/rfc-2294-if-let-guard/typeck.stderr b/tests/ui/rfc-2294-if-let-guard/typeck.stderr
index dd1f4826f..dd1f4826f 100644
--- a/src/test/ui/rfc-2294-if-let-guard/typeck.stderr
+++ b/tests/ui/rfc-2294-if-let-guard/typeck.stderr
diff --git a/src/test/ui/rfc-2294-if-let-guard/warns.rs b/tests/ui/rfc-2294-if-let-guard/warns.rs
index 3ad1a50c6..3ad1a50c6 100644
--- a/src/test/ui/rfc-2294-if-let-guard/warns.rs
+++ b/tests/ui/rfc-2294-if-let-guard/warns.rs
diff --git a/src/test/ui/rfc-2294-if-let-guard/warns.stderr b/tests/ui/rfc-2294-if-let-guard/warns.stderr
index 75f22ac8d..75f22ac8d 100644
--- a/src/test/ui/rfc-2294-if-let-guard/warns.stderr
+++ b/tests/ui/rfc-2294-if-let-guard/warns.stderr
diff --git a/src/test/ui/rfc-2306/convert-id-const-with-gate.rs b/tests/ui/rfc-2306/convert-id-const-with-gate.rs
index 762dfbe48..762dfbe48 100644
--- a/src/test/ui/rfc-2306/convert-id-const-with-gate.rs
+++ b/tests/ui/rfc-2306/convert-id-const-with-gate.rs
diff --git a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.rs b/tests/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.rs
index 04d924a9a..04d924a9a 100644
--- a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.rs
+++ b/tests/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.rs
diff --git a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.run.stderr b/tests/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.run.stderr
index 49d72158e..49d72158e 100644
--- a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.run.stderr
+++ b/tests/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.run.stderr
diff --git a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.rs b/tests/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.rs
index 9f3c567b6..9f3c567b6 100644
--- a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.rs
+++ b/tests/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.rs
diff --git a/tests/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr b/tests/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr
new file mode 100644
index 000000000..e97fdcce1
--- /dev/null
+++ b/tests/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr
@@ -0,0 +1,14 @@
+error[E0382]: use of moved value: `a`
+  --> $DIR/dbg-macro-move-semantics.rs:9:18
+   |
+LL |     let a = NoCopy(0);
+   |         - move occurs because `a` has type `NoCopy`, which does not implement the `Copy` trait
+LL |     let _ = dbg!(a);
+   |             ------- value moved here
+LL |     let _ = dbg!(a);
+   |                  ^ value used here after move
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.rs b/tests/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.rs
index f2fb62d76..f2fb62d76 100644
--- a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.rs
+++ b/tests/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.rs
diff --git a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr b/tests/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr
index d8b5a9e63..d8b5a9e63 100644
--- a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr
+++ b/tests/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr
diff --git a/tests/ui/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.rs b/tests/ui/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.rs
new file mode 100644
index 000000000..5053c115b
--- /dev/null
+++ b/tests/ui/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.rs
@@ -0,0 +1,21 @@
+#![feature(do_not_recommend)]
+
+pub trait Foo {
+}
+
+impl Foo for i32 {
+}
+
+pub trait Bar {
+}
+
+#[do_not_recommend]
+impl<T: Foo> Bar for T {
+}
+
+fn stuff<T: Bar>(_: T) {}
+
+fn main() {
+    stuff(1u8);
+    //~^ the trait bound `u8: Foo` is not satisfied
+}
diff --git a/tests/ui/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.stderr b/tests/ui/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.stderr
new file mode 100644
index 000000000..a3e559054
--- /dev/null
+++ b/tests/ui/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.stderr
@@ -0,0 +1,25 @@
+error[E0277]: the trait bound `u8: Foo` is not satisfied
+  --> $DIR/feature-gate-do_not_recommend.rs:19:11
+   |
+LL |     stuff(1u8);
+   |     ----- ^^^ the trait `Foo` is not implemented for `u8`
+   |     |
+   |     required by a bound introduced by this call
+   |
+   = help: the trait `Foo` is implemented for `i32`
+note: required for `u8` to implement `Bar`
+  --> $DIR/feature-gate-do_not_recommend.rs:13:14
+   |
+LL | impl<T: Foo> Bar for T {
+   |         ---  ^^^     ^
+   |         |
+   |         unsatisfied trait bound introduced here
+note: required by a bound in `stuff`
+  --> $DIR/feature-gate-do_not_recommend.rs:16:13
+   |
+LL | fn stuff<T: Bar>(_: T) {}
+   |             ^^^ required by this bound in `stuff`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/rfc-2397-do-not-recommend/incorrect-locations.rs b/tests/ui/rfc-2397-do-not-recommend/incorrect-locations.rs
new file mode 100644
index 000000000..91863f5e4
--- /dev/null
+++ b/tests/ui/rfc-2397-do-not-recommend/incorrect-locations.rs
@@ -0,0 +1,45 @@
+#![feature(do_not_recommend)]
+
+#[do_not_recommend]
+//~^ `#[do_not_recommend]` can only be placed
+const CONST: () = ();
+
+#[do_not_recommend]
+//~^ `#[do_not_recommend]` can only be placed
+static Static: () = ();
+
+#[do_not_recommend]
+//~^ `#[do_not_recommend]` can only be placed
+type Type = ();
+
+#[do_not_recommend]
+//~^ `#[do_not_recommend]` can only be placed
+enum Enum {
+}
+
+#[do_not_recommend]
+//~^ `#[do_not_recommend]` can only be placed
+extern {
+}
+
+#[do_not_recommend]
+//~^ `#[do_not_recommend]` can only be placed
+fn fun() {
+}
+
+#[do_not_recommend]
+//~^ `#[do_not_recommend]` can only be placed
+struct Struct {
+}
+
+#[do_not_recommend]
+//~^ `#[do_not_recommend]` can only be placed
+trait Trait {
+}
+
+#[do_not_recommend]
+impl Trait for i32 {
+}
+
+fn main() {
+}
diff --git a/tests/ui/rfc-2397-do-not-recommend/incorrect-locations.stderr b/tests/ui/rfc-2397-do-not-recommend/incorrect-locations.stderr
new file mode 100644
index 000000000..01ebc23c8
--- /dev/null
+++ b/tests/ui/rfc-2397-do-not-recommend/incorrect-locations.stderr
@@ -0,0 +1,50 @@
+error: `#[do_not_recommend]` can only be placed on trait implementations
+  --> $DIR/incorrect-locations.rs:3:1
+   |
+LL | #[do_not_recommend]
+   | ^^^^^^^^^^^^^^^^^^^
+
+error: `#[do_not_recommend]` can only be placed on trait implementations
+  --> $DIR/incorrect-locations.rs:7:1
+   |
+LL | #[do_not_recommend]
+   | ^^^^^^^^^^^^^^^^^^^
+
+error: `#[do_not_recommend]` can only be placed on trait implementations
+  --> $DIR/incorrect-locations.rs:11:1
+   |
+LL | #[do_not_recommend]
+   | ^^^^^^^^^^^^^^^^^^^
+
+error: `#[do_not_recommend]` can only be placed on trait implementations
+  --> $DIR/incorrect-locations.rs:15:1
+   |
+LL | #[do_not_recommend]
+   | ^^^^^^^^^^^^^^^^^^^
+
+error: `#[do_not_recommend]` can only be placed on trait implementations
+  --> $DIR/incorrect-locations.rs:20:1
+   |
+LL | #[do_not_recommend]
+   | ^^^^^^^^^^^^^^^^^^^
+
+error: `#[do_not_recommend]` can only be placed on trait implementations
+  --> $DIR/incorrect-locations.rs:25:1
+   |
+LL | #[do_not_recommend]
+   | ^^^^^^^^^^^^^^^^^^^
+
+error: `#[do_not_recommend]` can only be placed on trait implementations
+  --> $DIR/incorrect-locations.rs:30:1
+   |
+LL | #[do_not_recommend]
+   | ^^^^^^^^^^^^^^^^^^^
+
+error: `#[do_not_recommend]` can only be placed on trait implementations
+  --> $DIR/incorrect-locations.rs:35:1
+   |
+LL | #[do_not_recommend]
+   | ^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 8 previous errors
+
diff --git a/tests/ui/rfc-2397-do-not-recommend/unstable-feature.rs b/tests/ui/rfc-2397-do-not-recommend/unstable-feature.rs
new file mode 100644
index 000000000..f0c5c222e
--- /dev/null
+++ b/tests/ui/rfc-2397-do-not-recommend/unstable-feature.rs
@@ -0,0 +1,10 @@
+trait Foo {
+}
+
+#[do_not_recommend]
+//~^ ERROR the `#[do_not_recommend]` attribute is an experimental feature
+impl Foo for i32 {
+}
+
+fn main() {
+}
diff --git a/tests/ui/rfc-2397-do-not-recommend/unstable-feature.stderr b/tests/ui/rfc-2397-do-not-recommend/unstable-feature.stderr
new file mode 100644
index 000000000..1597e5be4
--- /dev/null
+++ b/tests/ui/rfc-2397-do-not-recommend/unstable-feature.stderr
@@ -0,0 +1,12 @@
+error[E0658]: the `#[do_not_recommend]` attribute is an experimental feature
+  --> $DIR/unstable-feature.rs:4:1
+   |
+LL | #[do_not_recommend]
+   | ^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #51992 <https://github.com/rust-lang/rust/issues/51992> for more information
+   = help: add `#![feature(do_not_recommend)]` 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/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs b/tests/ui/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs
index e373b6438..e373b6438 100644
--- a/src/test/ui/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs
+++ b/tests/ui/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs
diff --git a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.rs b/tests/ui/rfc-2457/crate_name_nonascii_forbidden-1.rs
index c07ba54af..c07ba54af 100644
--- a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.rs
+++ b/tests/ui/rfc-2457/crate_name_nonascii_forbidden-1.rs
diff --git a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.stderr b/tests/ui/rfc-2457/crate_name_nonascii_forbidden-1.stderr
index a8f3abe59..a8f3abe59 100644
--- a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.stderr
+++ b/tests/ui/rfc-2457/crate_name_nonascii_forbidden-1.stderr
diff --git a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.rs b/tests/ui/rfc-2457/crate_name_nonascii_forbidden-2.rs
index f8e033937..f8e033937 100644
--- a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.rs
+++ b/tests/ui/rfc-2457/crate_name_nonascii_forbidden-2.rs
diff --git a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.stderr b/tests/ui/rfc-2457/crate_name_nonascii_forbidden-2.stderr
index 05fc4fb22..05fc4fb22 100644
--- a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.stderr
+++ b/tests/ui/rfc-2457/crate_name_nonascii_forbidden-2.stderr
diff --git a/src/test/ui/rfc-2457/extern_block_nonascii_forbidden.rs b/tests/ui/rfc-2457/extern_block_nonascii_forbidden.rs
index ad6825404..ad6825404 100644
--- a/src/test/ui/rfc-2457/extern_block_nonascii_forbidden.rs
+++ b/tests/ui/rfc-2457/extern_block_nonascii_forbidden.rs
diff --git a/src/test/ui/rfc-2457/extern_block_nonascii_forbidden.stderr b/tests/ui/rfc-2457/extern_block_nonascii_forbidden.stderr
index ca1b8a6e7..ca1b8a6e7 100644
--- a/src/test/ui/rfc-2457/extern_block_nonascii_forbidden.stderr
+++ b/tests/ui/rfc-2457/extern_block_nonascii_forbidden.stderr
diff --git a/src/test/ui/rfc-2457/idents-normalized.rs b/tests/ui/rfc-2457/idents-normalized.rs
index 1023fee37..1023fee37 100644
--- a/src/test/ui/rfc-2457/idents-normalized.rs
+++ b/tests/ui/rfc-2457/idents-normalized.rs
diff --git a/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.rs b/tests/ui/rfc-2457/mod_file_nonascii_forbidden.rs
index e949e2319..e949e2319 100644
--- a/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.rs
+++ b/tests/ui/rfc-2457/mod_file_nonascii_forbidden.rs
diff --git a/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.stderr b/tests/ui/rfc-2457/mod_file_nonascii_forbidden.stderr
index dd0dac95e..dd0dac95e 100644
--- a/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.stderr
+++ b/tests/ui/rfc-2457/mod_file_nonascii_forbidden.stderr
diff --git a/src/test/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs b/tests/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs
index 94327846d..94327846d 100644
--- a/src/test/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs
+++ b/tests/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs
diff --git a/src/test/ui/rfc-2457/mod_inline_nonascii_allowed.rs b/tests/ui/rfc-2457/mod_inline_nonascii_allowed.rs
index e1d836b7c..e1d836b7c 100644
--- a/src/test/ui/rfc-2457/mod_inline_nonascii_allowed.rs
+++ b/tests/ui/rfc-2457/mod_inline_nonascii_allowed.rs
diff --git a/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.rs b/tests/ui/rfc-2457/no_mangle_nonascii_forbidden.rs
index f4c126a6e..f4c126a6e 100644
--- a/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.rs
+++ b/tests/ui/rfc-2457/no_mangle_nonascii_forbidden.rs
diff --git a/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr b/tests/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr
index 459d5d6b5..459d5d6b5 100644
--- a/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr
+++ b/tests/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr
diff --git a/src/test/ui/rfc-2497-if-let-chains/ast-lowering-does-not-wrap-let-chains.rs b/tests/ui/rfc-2497-if-let-chains/ast-lowering-does-not-wrap-let-chains.rs
index d851fac8e..d851fac8e 100644
--- a/src/test/ui/rfc-2497-if-let-chains/ast-lowering-does-not-wrap-let-chains.rs
+++ b/tests/ui/rfc-2497-if-let-chains/ast-lowering-does-not-wrap-let-chains.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/ast-pretty-check.rs b/tests/ui/rfc-2497-if-let-chains/ast-pretty-check.rs
index 69bc189dd..69bc189dd 100644
--- a/src/test/ui/rfc-2497-if-let-chains/ast-pretty-check.rs
+++ b/tests/ui/rfc-2497-if-let-chains/ast-pretty-check.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/ast-pretty-check.stdout b/tests/ui/rfc-2497-if-let-chains/ast-pretty-check.stdout
index e737ef26e..e737ef26e 100644
--- a/src/test/ui/rfc-2497-if-let-chains/ast-pretty-check.stdout
+++ b/tests/ui/rfc-2497-if-let-chains/ast-pretty-check.stdout
diff --git a/src/test/ui/rfc-2497-if-let-chains/chains-without-let.rs b/tests/ui/rfc-2497-if-let-chains/chains-without-let.rs
index e0dded152..e0dded152 100644
--- a/src/test/ui/rfc-2497-if-let-chains/chains-without-let.rs
+++ b/tests/ui/rfc-2497-if-let-chains/chains-without-let.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/chains-without-let.stderr b/tests/ui/rfc-2497-if-let-chains/chains-without-let.stderr
index 30d5a6779..30d5a6779 100644
--- a/src/test/ui/rfc-2497-if-let-chains/chains-without-let.stderr
+++ b/tests/ui/rfc-2497-if-let-chains/chains-without-let.stderr
diff --git a/src/test/ui/rfc-2497-if-let-chains/disallowed-positions.rs b/tests/ui/rfc-2497-if-let-chains/disallowed-positions.rs
index 2a9a5472b..2a9a5472b 100644
--- a/src/test/ui/rfc-2497-if-let-chains/disallowed-positions.rs
+++ b/tests/ui/rfc-2497-if-let-chains/disallowed-positions.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/disallowed-positions.stderr b/tests/ui/rfc-2497-if-let-chains/disallowed-positions.stderr
index 91c001151..3028f8dbd 100644
--- a/src/test/ui/rfc-2497-if-let-chains/disallowed-positions.stderr
+++ b/tests/ui/rfc-2497-if-let-chains/disallowed-positions.stderr
@@ -1516,7 +1516,7 @@ error[E0308]: mismatched types
   --> $DIR/disallowed-positions.rs:157:8
    |
 LL |     if true..(let 0 = 0) {}
-   |        ^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |        ^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<bool>`
@@ -1545,7 +1545,7 @@ error[E0308]: mismatched types
 LL |     if let Range { start: _, end: _ } = true..true && false {}
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^   ---- this expression has type `bool`
    |            |
-   |            expected `bool`, found struct `std::ops::Range`
+   |            expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<_>`
@@ -1554,7 +1554,7 @@ error[E0308]: mismatched types
   --> $DIR/disallowed-positions.rs:171:8
    |
 LL |     if let Range { start: _, end: _ } = true..true && false {}
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<bool>`
@@ -1565,7 +1565,7 @@ error[E0308]: mismatched types
 LL |     if let Range { start: _, end: _ } = true..true || false {}
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^   ---- this expression has type `bool`
    |            |
-   |            expected `bool`, found struct `std::ops::Range`
+   |            expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<_>`
@@ -1574,7 +1574,7 @@ error[E0308]: mismatched types
   --> $DIR/disallowed-positions.rs:175:8
    |
 LL |     if let Range { start: _, end: _ } = true..true || false {}
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<bool>`
@@ -1585,7 +1585,7 @@ error[E0308]: mismatched types
 LL |     if let Range { start: F, end } = F..|| true {}
    |            ^^^^^^^^^^^^^^^^^^^^^^^   - this expression has type `fn() -> bool`
    |            |
-   |            expected fn pointer, found struct `std::ops::Range`
+   |            expected fn pointer, found struct `Range`
    |
    = note: expected fn pointer `fn() -> bool`
                   found struct `std::ops::Range<_>`
@@ -1607,7 +1607,7 @@ error[E0308]: mismatched types
   --> $DIR/disallowed-positions.rs:182:8
    |
 LL |     if let Range { start: F, end } = F..|| true {}
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<bool>`
@@ -1618,7 +1618,7 @@ error[E0308]: mismatched types
 LL |     if let Range { start: true, end } = t..&&false {}
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^   - this expression has type `&&bool`
    |            |
-   |            expected `bool`, found struct `std::ops::Range`
+   |            expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<_>`
@@ -1639,7 +1639,7 @@ error[E0308]: mismatched types
   --> $DIR/disallowed-positions.rs:190:8
    |
 LL |     if let Range { start: true, end } = t..&&false {}
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<bool>`
@@ -1710,7 +1710,7 @@ error[E0308]: mismatched types
   --> $DIR/disallowed-positions.rs:249:11
    |
 LL |     while true..(let 0 = 0) {}
-   |           ^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |           ^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<bool>`
@@ -1739,7 +1739,7 @@ error[E0308]: mismatched types
 LL |     while let Range { start: _, end: _ } = true..true && false {}
    |               ^^^^^^^^^^^^^^^^^^^^^^^^^^   ---- this expression has type `bool`
    |               |
-   |               expected `bool`, found struct `std::ops::Range`
+   |               expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<_>`
@@ -1748,7 +1748,7 @@ error[E0308]: mismatched types
   --> $DIR/disallowed-positions.rs:263:11
    |
 LL |     while let Range { start: _, end: _ } = true..true && false {}
-   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<bool>`
@@ -1759,7 +1759,7 @@ error[E0308]: mismatched types
 LL |     while let Range { start: _, end: _ } = true..true || false {}
    |               ^^^^^^^^^^^^^^^^^^^^^^^^^^   ---- this expression has type `bool`
    |               |
-   |               expected `bool`, found struct `std::ops::Range`
+   |               expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<_>`
@@ -1768,7 +1768,7 @@ error[E0308]: mismatched types
   --> $DIR/disallowed-positions.rs:267:11
    |
 LL |     while let Range { start: _, end: _ } = true..true || false {}
-   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<bool>`
@@ -1779,7 +1779,7 @@ error[E0308]: mismatched types
 LL |     while let Range { start: F, end } = F..|| true {}
    |               ^^^^^^^^^^^^^^^^^^^^^^^   - this expression has type `fn() -> bool`
    |               |
-   |               expected fn pointer, found struct `std::ops::Range`
+   |               expected fn pointer, found struct `Range`
    |
    = note: expected fn pointer `fn() -> bool`
                   found struct `std::ops::Range<_>`
@@ -1801,7 +1801,7 @@ error[E0308]: mismatched types
   --> $DIR/disallowed-positions.rs:274:11
    |
 LL |     while let Range { start: F, end } = F..|| true {}
-   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<bool>`
@@ -1812,7 +1812,7 @@ error[E0308]: mismatched types
 LL |     while let Range { start: true, end } = t..&&false {}
    |               ^^^^^^^^^^^^^^^^^^^^^^^^^^   - this expression has type `&&bool`
    |               |
-   |               expected `bool`, found struct `std::ops::Range`
+   |               expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<_>`
@@ -1833,7 +1833,7 @@ error[E0308]: mismatched types
   --> $DIR/disallowed-positions.rs:282:11
    |
 LL |     while let Range { start: true, end } = t..&&false {}
-   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<bool>`
@@ -1883,7 +1883,7 @@ error[E0308]: mismatched types
 LL |     (let Range { start: _, end: _ } = true..true || false);
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^^   ---- this expression has type `bool`
    |          |
-   |          expected `bool`, found struct `std::ops::Range`
+   |          expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<_>`
diff --git a/src/test/ui/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.rs b/tests/ui/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.rs
index 2a6c14435..2a6c14435 100644
--- a/src/test/ui/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.rs
+++ b/tests/ui/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.stderr b/tests/ui/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.stderr
index 498a112fa..498a112fa 100644
--- a/src/test/ui/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.stderr
+++ b/tests/ui/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.stderr
diff --git a/src/test/ui/rfc-2497-if-let-chains/feature-gate.rs b/tests/ui/rfc-2497-if-let-chains/feature-gate.rs
index 2b407ef51..2b407ef51 100644
--- a/src/test/ui/rfc-2497-if-let-chains/feature-gate.rs
+++ b/tests/ui/rfc-2497-if-let-chains/feature-gate.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/feature-gate.stderr b/tests/ui/rfc-2497-if-let-chains/feature-gate.stderr
index 7a43b71fc..7a43b71fc 100644
--- a/src/test/ui/rfc-2497-if-let-chains/feature-gate.stderr
+++ b/tests/ui/rfc-2497-if-let-chains/feature-gate.stderr
diff --git a/src/test/ui/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.rs b/tests/ui/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.rs
index a942d1f4c..a942d1f4c 100644
--- a/src/test/ui/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.rs
+++ b/tests/ui/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.stderr b/tests/ui/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.stderr
index d1ce83c72..d1ce83c72 100644
--- a/src/test/ui/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.stderr
+++ b/tests/ui/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.stderr
diff --git a/src/test/ui/rfc-2497-if-let-chains/irrefutable-lets.disallowed.stderr b/tests/ui/rfc-2497-if-let-chains/irrefutable-lets.disallowed.stderr
index be4a52315..be4a52315 100644
--- a/src/test/ui/rfc-2497-if-let-chains/irrefutable-lets.disallowed.stderr
+++ b/tests/ui/rfc-2497-if-let-chains/irrefutable-lets.disallowed.stderr
diff --git a/src/test/ui/rfc-2497-if-let-chains/irrefutable-lets.rs b/tests/ui/rfc-2497-if-let-chains/irrefutable-lets.rs
index 9afb6853b..9afb6853b 100644
--- a/src/test/ui/rfc-2497-if-let-chains/irrefutable-lets.rs
+++ b/tests/ui/rfc-2497-if-let-chains/irrefutable-lets.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/issue-88498.rs b/tests/ui/rfc-2497-if-let-chains/issue-88498.rs
index 3eb8a9ad0..3eb8a9ad0 100644
--- a/src/test/ui/rfc-2497-if-let-chains/issue-88498.rs
+++ b/tests/ui/rfc-2497-if-let-chains/issue-88498.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/issue-90722.rs b/tests/ui/rfc-2497-if-let-chains/issue-90722.rs
index 6b7d88356..6b7d88356 100644
--- a/src/test/ui/rfc-2497-if-let-chains/issue-90722.rs
+++ b/tests/ui/rfc-2497-if-let-chains/issue-90722.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/issue-92145.rs b/tests/ui/rfc-2497-if-let-chains/issue-92145.rs
index 7c7e31f4d..7c7e31f4d 100644
--- a/src/test/ui/rfc-2497-if-let-chains/issue-92145.rs
+++ b/tests/ui/rfc-2497-if-let-chains/issue-92145.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/issue-93150.rs b/tests/ui/rfc-2497-if-let-chains/issue-93150.rs
index f90b9ab0d..f90b9ab0d 100644
--- a/src/test/ui/rfc-2497-if-let-chains/issue-93150.rs
+++ b/tests/ui/rfc-2497-if-let-chains/issue-93150.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/issue-93150.stderr b/tests/ui/rfc-2497-if-let-chains/issue-93150.stderr
index b25f299a2..b25f299a2 100644
--- a/src/test/ui/rfc-2497-if-let-chains/issue-93150.stderr
+++ b/tests/ui/rfc-2497-if-let-chains/issue-93150.stderr
diff --git a/src/test/ui/rfc-2497-if-let-chains/issue-99938.rs b/tests/ui/rfc-2497-if-let-chains/issue-99938.rs
index bd81ce0b1..bd81ce0b1 100644
--- a/src/test/ui/rfc-2497-if-let-chains/issue-99938.rs
+++ b/tests/ui/rfc-2497-if-let-chains/issue-99938.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/no-double-assigments.rs b/tests/ui/rfc-2497-if-let-chains/no-double-assigments.rs
index 6b91c455e..6b91c455e 100644
--- a/src/test/ui/rfc-2497-if-let-chains/no-double-assigments.rs
+++ b/tests/ui/rfc-2497-if-let-chains/no-double-assigments.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/protect-precedences.rs b/tests/ui/rfc-2497-if-let-chains/protect-precedences.rs
index fcc09b159..fcc09b159 100644
--- a/src/test/ui/rfc-2497-if-let-chains/protect-precedences.rs
+++ b/tests/ui/rfc-2497-if-let-chains/protect-precedences.rs
diff --git a/src/test/ui/rfc-2497-if-let-chains/protect-precedences.stderr b/tests/ui/rfc-2497-if-let-chains/protect-precedences.stderr
index 24b35a2ab..24b35a2ab 100644
--- a/src/test/ui/rfc-2497-if-let-chains/protect-precedences.stderr
+++ b/tests/ui/rfc-2497-if-let-chains/protect-precedences.stderr
diff --git a/src/test/ui/rfc-2497-if-let-chains/then-else-blocks.rs b/tests/ui/rfc-2497-if-let-chains/then-else-blocks.rs
index e061174f6..e061174f6 100644
--- a/src/test/ui/rfc-2497-if-let-chains/then-else-blocks.rs
+++ b/tests/ui/rfc-2497-if-let-chains/then-else-blocks.rs
diff --git a/src/test/ui/rfc-2565-param-attrs/attr-without-param.rs b/tests/ui/rfc-2565-param-attrs/attr-without-param.rs
index eeb2191ba..eeb2191ba 100644
--- a/src/test/ui/rfc-2565-param-attrs/attr-without-param.rs
+++ b/tests/ui/rfc-2565-param-attrs/attr-without-param.rs
diff --git a/src/test/ui/rfc-2565-param-attrs/attr-without-param.stderr b/tests/ui/rfc-2565-param-attrs/attr-without-param.stderr
index 26dff4d4b..26dff4d4b 100644
--- a/src/test/ui/rfc-2565-param-attrs/attr-without-param.stderr
+++ b/tests/ui/rfc-2565-param-attrs/attr-without-param.stderr
diff --git a/src/test/ui/rfc-2565-param-attrs/auxiliary/ident-mac.rs b/tests/ui/rfc-2565-param-attrs/auxiliary/ident-mac.rs
index b62cf3120..b62cf3120 100644
--- a/src/test/ui/rfc-2565-param-attrs/auxiliary/ident-mac.rs
+++ b/tests/ui/rfc-2565-param-attrs/auxiliary/ident-mac.rs
diff --git a/src/test/ui/rfc-2565-param-attrs/auxiliary/param-attrs.rs b/tests/ui/rfc-2565-param-attrs/auxiliary/param-attrs.rs
index 82c4120b4..82c4120b4 100644
--- a/src/test/ui/rfc-2565-param-attrs/auxiliary/param-attrs.rs
+++ b/tests/ui/rfc-2565-param-attrs/auxiliary/param-attrs.rs
diff --git a/src/test/ui/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs b/tests/ui/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs
index 670303906..670303906 100644
--- a/src/test/ui/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs
+++ b/tests/ui/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs
diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-2018.rs b/tests/ui/rfc-2565-param-attrs/param-attrs-2018.rs
index a6f693bd5..a6f693bd5 100644
--- a/src/test/ui/rfc-2565-param-attrs/param-attrs-2018.rs
+++ b/tests/ui/rfc-2565-param-attrs/param-attrs-2018.rs
diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-2018.stderr b/tests/ui/rfc-2565-param-attrs/param-attrs-2018.stderr
index 593821bf9..593821bf9 100644
--- a/src/test/ui/rfc-2565-param-attrs/param-attrs-2018.stderr
+++ b/tests/ui/rfc-2565-param-attrs/param-attrs-2018.stderr
diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-allowed.rs b/tests/ui/rfc-2565-param-attrs/param-attrs-allowed.rs
index a547d09d0..a547d09d0 100644
--- a/src/test/ui/rfc-2565-param-attrs/param-attrs-allowed.rs
+++ b/tests/ui/rfc-2565-param-attrs/param-attrs-allowed.rs
diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs b/tests/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs
index 151659e35..151659e35 100644
--- a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs
+++ b/tests/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs
diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr b/tests/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr
index 7573e39d8..7573e39d8 100644
--- a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr
+++ b/tests/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr
diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-cfg.rs b/tests/ui/rfc-2565-param-attrs/param-attrs-cfg.rs
index a4d9d32b5..a4d9d32b5 100644
--- a/src/test/ui/rfc-2565-param-attrs/param-attrs-cfg.rs
+++ b/tests/ui/rfc-2565-param-attrs/param-attrs-cfg.rs
diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-cfg.stderr b/tests/ui/rfc-2565-param-attrs/param-attrs-cfg.stderr
index 6d18d295c..6d18d295c 100644
--- a/src/test/ui/rfc-2565-param-attrs/param-attrs-cfg.stderr
+++ b/tests/ui/rfc-2565-param-attrs/param-attrs-cfg.stderr
diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-pretty.rs b/tests/ui/rfc-2565-param-attrs/param-attrs-pretty.rs
index 1183ac65b..1183ac65b 100644
--- a/src/test/ui/rfc-2565-param-attrs/param-attrs-pretty.rs
+++ b/tests/ui/rfc-2565-param-attrs/param-attrs-pretty.rs
diff --git a/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs b/tests/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs
index 54f2f451b..54f2f451b 100644
--- a/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs
+++ b/tests/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs
diff --git a/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr b/tests/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr
index e74d05d49..e74d05d49 100644
--- a/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr
+++ b/tests/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.rs b/tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.rs
index 22d57f8be..22d57f8be 100644
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.rs
+++ b/tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr b/tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr
index 0e95fec29..0e95fec29 100644
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-multiple.rs b/tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.rs
index 7ccb0082f..7ccb0082f 100644
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-multiple.rs
+++ b/tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-multiple.stderr b/tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.stderr
index 7c0e0be91..7c0e0be91 100644
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-multiple.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.rs b/tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.rs
index f728a578d..f728a578d 100644
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.rs
+++ b/tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr b/tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr
index 2b299f2fe..2b299f2fe 100644
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs b/tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs
index ae9207864..ae9207864 100644
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs
+++ b/tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.stderr b/tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.stderr
index 5898cd875..5898cd875 100644
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-x86-only.rs b/tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.rs
index 346ea18a8..346ea18a8 100644
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-x86-only.rs
+++ b/tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-x86-only.stderr b/tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.stderr
index b56449299..b56449299 100644
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-x86-only.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs
index 1a128c87a..1a128c87a 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-and-name.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.stderr
index 481a06d27..481a06d27 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-and-name.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs
index 7c8da050c..7c8da050c 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr
index 55cdcad75..55cdcad75 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs
index 9feed3941..9feed3941 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.stderr
index 853cdad8c..853cdad8c 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-multiple.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.rs
index 631c363d4..631c363d4 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-multiple.rs
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-multiple.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.stderr
index c0453d2bf..c0453d2bf 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-multiple.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs
index 54e614164..54e614164 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.stderr
index ec4104fbe..ec4104fbe 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs
index 46731581e..46731581e 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-large.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.stderr
index fef6de6ae..fef6de6ae 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-large.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs
index 71e0ac9f3..71e0ac9f3 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.stderr
index 7e0fcd845..7e0fcd845 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs
index 329c93fc1..329c93fc1 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.stderr
index 5fbffbda5..5fbffbda5 100644
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/multiple-declarations.rs b/tests/ui/rfc-2627-raw-dylib/multiple-declarations.rs
index 6542faad2..6542faad2 100644
--- a/src/test/ui/rfc-2627-raw-dylib/multiple-declarations.rs
+++ b/tests/ui/rfc-2627-raw-dylib/multiple-declarations.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/multiple-declarations.stderr b/tests/ui/rfc-2627-raw-dylib/multiple-declarations.stderr
index c6808bec7..c6808bec7 100644
--- a/src/test/ui/rfc-2627-raw-dylib/multiple-declarations.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/multiple-declarations.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs b/tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs
index 4efffbd53..4efffbd53 100644
--- a/src/test/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs
+++ b/tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr b/tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr
index 14e791f1f..14e791f1f 100644
--- a/src/test/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr
diff --git a/src/test/ui/rfc-2627-raw-dylib/unsupported-abi.rs b/tests/ui/rfc-2627-raw-dylib/unsupported-abi.rs
index 2f5a23e47..2f5a23e47 100644
--- a/src/test/ui/rfc-2627-raw-dylib/unsupported-abi.rs
+++ b/tests/ui/rfc-2627-raw-dylib/unsupported-abi.rs
diff --git a/src/test/ui/rfc-2627-raw-dylib/unsupported-abi.stderr b/tests/ui/rfc-2627-raw-dylib/unsupported-abi.stderr
index f8265ae69..f8265ae69 100644
--- a/src/test/ui/rfc-2627-raw-dylib/unsupported-abi.stderr
+++ b/tests/ui/rfc-2627-raw-dylib/unsupported-abi.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/assoc-type-const-bound-usage.rs b/tests/ui/rfc-2632-const-trait-impl/assoc-type-const-bound-usage.rs
index 780a510c5..780a510c5 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/assoc-type-const-bound-usage.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/assoc-type-const-bound-usage.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/assoc-type.rs b/tests/ui/rfc-2632-const-trait-impl/assoc-type.rs
index 7d9dae52c..7d9dae52c 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/assoc-type.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/assoc-type.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/assoc-type.stderr b/tests/ui/rfc-2632-const-trait-impl/assoc-type.stderr
index 89177b0f1..89177b0f1 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/assoc-type.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/assoc-type.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/attr-misuse.rs b/tests/ui/rfc-2632-const-trait-impl/attr-misuse.rs
index 01ac74fef..01ac74fef 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/attr-misuse.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/attr-misuse.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/attr-misuse.stderr b/tests/ui/rfc-2632-const-trait-impl/attr-misuse.stderr
index b18f33218..b18f33218 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/attr-misuse.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/attr-misuse.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/auxiliary/cross-crate.rs b/tests/ui/rfc-2632-const-trait-impl/auxiliary/cross-crate.rs
index e73082c11..e73082c11 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/auxiliary/cross-crate.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/auxiliary/cross-crate.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/auxiliary/staged-api.rs b/tests/ui/rfc-2632-const-trait-impl/auxiliary/staged-api.rs
index 589e3f024..589e3f024 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/auxiliary/staged-api.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/auxiliary/staged-api.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs b/tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs
index dd9933974..dd9933974 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr b/tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr
index 7350909ba..7350909ba 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs b/tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs
index b64161b6a..b64161b6a 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-in-impl.rs b/tests/ui/rfc-2632-const-trait-impl/call-generic-in-impl.rs
index 50c465790..50c465790 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/call-generic-in-impl.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/call-generic-in-impl.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-chain.rs b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-chain.rs
index b00ff1f2f..b00ff1f2f 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-chain.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-chain.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs
index c8ded0fa7..c8ded0fa7 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-fail.rs b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-fail.rs
index 2bc5ee512..2bc5ee512 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-fail.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-fail.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-fail.stderr b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-fail.stderr
index 31e6dbdab..31e6dbdab 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-fail.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-fail.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst-bound.rs b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst-bound.rs
index e197c8b73..e197c8b73 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst-bound.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst-bound.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs
index 414a8c87d..414a8c87d 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.stderr b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.stderr
index 706f52343..706f52343 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-pass.rs b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-pass.rs
index 40565d1b7..40565d1b7 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-pass.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/call-generic-method-pass.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/call.rs b/tests/ui/rfc-2632-const-trait-impl/call.rs
new file mode 100644
index 000000000..5f48c2353
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/call.rs
@@ -0,0 +1,10 @@
+// check-pass
+
+#![feature(const_closures, const_trait_impl)]
+#![allow(incomplete_features)]
+
+pub const _: () = {
+    assert!((const || true)());
+};
+
+fn main() {}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.rs b/tests/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.rs
index f66d63da6..f66d63da6 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr b/tests/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr
index 36a09add4..36a09add4 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs b/tests/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs
index 52984fb6b..52984fb6b 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr b/tests/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr
index c8783de4c..c8783de4c 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method-fail.rs b/tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method-fail.rs
new file mode 100644
index 000000000..b5f19e40c
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method-fail.rs
@@ -0,0 +1,19 @@
+#![feature(const_trait_impl)]
+
+#[const_trait]
+trait Tr {
+    fn a(self) -> i32;
+}
+
+impl Tr for () {
+    fn a(self) -> i32 { 42 }
+}
+
+const fn need_const_closure<T: ~const FnOnce(()) -> i32>(x: T) -> i32 {
+    x(())
+}
+
+const _: () = assert!(need_const_closure(Tr::a) == 42);
+//~^ ERROR: the trait bound
+
+fn main() {}
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method-fail.stderr b/tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method-fail.stderr
new file mode 100644
index 000000000..4470e287c
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method-fail.stderr
@@ -0,0 +1,23 @@
+error[E0277]: the trait bound `(): ~const Tr` is not satisfied in `fn(()) -> i32 {<() as Tr>::a}`
+  --> $DIR/const-closure-trait-method-fail.rs:16:42
+   |
+LL | const _: () = assert!(need_const_closure(Tr::a) == 42);
+   |                       ------------------ ^^^^^ within `fn(()) -> i32 {<() as Tr>::a}`, the trait `~const Tr` is not implemented for `()`
+   |                       |
+   |                       required by a bound introduced by this call
+   |
+note: the trait `Tr` is implemented for `()`, but that implementation is not `const`
+  --> $DIR/const-closure-trait-method-fail.rs:16:42
+   |
+LL | const _: () = assert!(need_const_closure(Tr::a) == 42);
+   |                                          ^^^^^
+   = note: required because it appears within the type `fn(()) -> i32 {<() as Tr>::a}`
+note: required by a bound in `need_const_closure`
+  --> $DIR/const-closure-trait-method-fail.rs:12:32
+   |
+LL | const fn need_const_closure<T: ~const FnOnce(()) -> i32>(x: T) -> i32 {
+   |                                ^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `need_const_closure`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method.rs b/tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method.rs
new file mode 100644
index 000000000..3e6d19088
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method.rs
@@ -0,0 +1,19 @@
+// check-pass
+#![feature(const_trait_impl)]
+
+#[const_trait]
+trait Tr {
+    fn a(self) -> i32;
+}
+
+impl const Tr for () {
+    fn a(self) -> i32 { 42 }
+}
+
+const fn need_const_closure<T: ~const FnOnce(()) -> i32>(x: T) -> i32 {
+    x(())
+}
+
+const _: () = assert!(need_const_closure(Tr::a) == 42);
+
+fn main() {}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-closures.rs b/tests/ui/rfc-2632-const-trait-impl/const-closures.rs
index 755d85398..755d85398 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-closures.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/const-closures.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-default-method-bodies.rs b/tests/ui/rfc-2632-const-trait-impl/const-default-method-bodies.rs
index 140a06a73..140a06a73 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-default-method-bodies.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/const-default-method-bodies.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-default-method-bodies.stderr b/tests/ui/rfc-2632-const-trait-impl/const-default-method-bodies.stderr
new file mode 100644
index 000000000..f9d0d1f78
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/const-default-method-bodies.stderr
@@ -0,0 +1,15 @@
+error[E0277]: the trait bound `NonConstImpl: ~const ConstDefaultFn` is not satisfied
+  --> $DIR/const-default-method-bodies.rs:24:18
+   |
+LL |     NonConstImpl.a();
+   |                  ^ the trait `~const ConstDefaultFn` is not implemented for `NonConstImpl`
+   |
+note: the trait `ConstDefaultFn` is implemented for `NonConstImpl`, but that implementation is not `const`
+  --> $DIR/const-default-method-bodies.rs:24:5
+   |
+LL |     NonConstImpl.a();
+   |     ^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-drop-bound.rs b/tests/ui/rfc-2632-const-trait-impl/const-drop-bound.rs
index 948f0efbc..948f0efbc 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-drop-bound.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/const-drop-bound.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-drop-fail.precise.stderr b/tests/ui/rfc-2632-const-trait-impl/const-drop-fail.precise.stderr
index 796c0d388..796c0d388 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-drop-fail.precise.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/const-drop-fail.precise.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-drop-fail.rs b/tests/ui/rfc-2632-const-trait-impl/const-drop-fail.rs
index d36c7f81c..d36c7f81c 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-drop-fail.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/const-drop-fail.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-drop-fail.stock.stderr b/tests/ui/rfc-2632-const-trait-impl/const-drop-fail.stock.stderr
index 796c0d388..796c0d388 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-drop-fail.stock.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/const-drop-fail.stock.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-drop.rs b/tests/ui/rfc-2632-const-trait-impl/const-drop.rs
index b0fc3adf9..b0fc3adf9 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-drop.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/const-drop.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-impl-norecover.rs b/tests/ui/rfc-2632-const-trait-impl/const-impl-norecover.rs
index bed4e9fd1..bed4e9fd1 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-impl-norecover.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/const-impl-norecover.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-impl-norecover.stderr b/tests/ui/rfc-2632-const-trait-impl/const-impl-norecover.stderr
index 603f6b7d2..603f6b7d2 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-impl-norecover.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/const-impl-norecover.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-impl-recovery.rs b/tests/ui/rfc-2632-const-trait-impl/const-impl-recovery.rs
index 837124db0..837124db0 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-impl-recovery.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/const-impl-recovery.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-impl-recovery.stderr b/tests/ui/rfc-2632-const-trait-impl/const-impl-recovery.stderr
index 7217fc855..7217fc855 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-impl-recovery.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/const-impl-recovery.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-impl-requires-const-trait.rs b/tests/ui/rfc-2632-const-trait-impl/const-impl-requires-const-trait.rs
index 2b4963991..2b4963991 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-impl-requires-const-trait.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/const-impl-requires-const-trait.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-impl-requires-const-trait.stderr b/tests/ui/rfc-2632-const-trait-impl/const-impl-requires-const-trait.stderr
index 478adcf3e..478adcf3e 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-impl-requires-const-trait.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/const-impl-requires-const-trait.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-impl-trait.rs b/tests/ui/rfc-2632-const-trait-impl/const-impl-trait.rs
new file mode 100644
index 000000000..0622f96e7
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/const-impl-trait.rs
@@ -0,0 +1,55 @@
+// check-pass
+#![allow(incomplete_features)]
+#![feature(
+    associated_type_bounds,
+    const_trait_impl,
+    const_cmp,
+    return_position_impl_trait_in_trait,
+)]
+
+use std::marker::Destruct;
+
+const fn cmp(a: &impl ~const PartialEq) -> bool {
+    a == a
+}
+
+const fn wrap(x: impl ~const PartialEq + ~const Destruct)
+    -> impl ~const PartialEq + ~const Destruct
+{
+    x
+}
+
+#[const_trait]
+trait Foo {
+    fn huh() -> impl ~const PartialEq + ~const Destruct + Copy;
+}
+
+impl const Foo for () {
+    fn huh() -> impl ~const PartialEq + ~const Destruct + Copy {
+        123
+    }
+}
+
+const _: () = {
+    assert!(cmp(&0xDEADBEEFu32));
+    assert!(cmp(&()));
+    assert!(wrap(123) == wrap(123));
+    assert!(wrap(123) != wrap(456));
+    let x = <() as Foo>::huh();
+    assert!(x == x);
+};
+
+#[const_trait]
+trait T {}
+struct S;
+impl const T for S {}
+
+const fn rpit() -> impl ~const T { S }
+
+const fn apit(_: impl ~const T + ~const Destruct) {}
+
+const fn rpit_assoc_bound() -> impl IntoIterator<Item: ~const T> { Some(S) }
+
+const fn apit_assoc_bound(_: impl IntoIterator<Item: ~const T> + ~const Destruct) {}
+
+fn main() {}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.rs b/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.rs
index 348ca0ab1..348ca0ab1 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.stderr b/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.stderr
index cc9bdd271..cc9bdd271 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.rs b/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.rs
index 92843a8a2..92843a8a2 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.stderr b/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.stderr
index d463c774e..96e0c78b9 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.stderr
@@ -7,6 +7,7 @@ LL | pub struct S(A);
    |              ^
    |
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
    = note: this error originates in the derive macro `Default` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-use.rs b/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-use.rs
index d1fbeac85..d1fbeac85 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-use.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-use.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/cross-crate-default-method-body-is-const.rs b/tests/ui/rfc-2632-const-trait-impl/cross-crate-default-method-body-is-const.rs
index bde8bf20f..bde8bf20f 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/cross-crate-default-method-body-is-const.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/cross-crate-default-method-body-is-const.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/cross-crate.gatednc.stderr b/tests/ui/rfc-2632-const-trait-impl/cross-crate.gatednc.stderr
new file mode 100644
index 000000000..633b7cc25
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/cross-crate.gatednc.stderr
@@ -0,0 +1,15 @@
+error[E0277]: the trait bound `cross_crate::NonConst: ~const cross_crate::MyTrait` is not satisfied
+  --> $DIR/cross-crate.rs:17:14
+   |
+LL |     NonConst.func();
+   |              ^^^^ the trait `~const cross_crate::MyTrait` is not implemented for `cross_crate::NonConst`
+   |
+note: the trait `cross_crate::MyTrait` is implemented for `cross_crate::NonConst`, but that implementation is not `const`
+  --> $DIR/cross-crate.rs:17:5
+   |
+LL |     NonConst.func();
+   |     ^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/rfc-2632-const-trait-impl/cross-crate.rs b/tests/ui/rfc-2632-const-trait-impl/cross-crate.rs
index 6df47022c..6df47022c 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/cross-crate.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/cross-crate.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/cross-crate.stock.stderr b/tests/ui/rfc-2632-const-trait-impl/cross-crate.stock.stderr
index 086547542..22f13a741 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/cross-crate.stock.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/cross-crate.stock.stderr
@@ -5,6 +5,7 @@ LL |     Const.func();
    |           ^^^^^^
    |
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error: aborting due to previous error
 
diff --git a/tests/ui/rfc-2632-const-trait-impl/cross-crate.stocknc.stderr b/tests/ui/rfc-2632-const-trait-impl/cross-crate.stocknc.stderr
new file mode 100644
index 000000000..9e97d3f11
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/cross-crate.stocknc.stderr
@@ -0,0 +1,15 @@
+error[E0277]: the trait bound `cross_crate::NonConst: cross_crate::MyTrait` is not satisfied
+  --> $DIR/cross-crate.rs:17:14
+   |
+LL |     NonConst.func();
+   |              ^^^^ the trait `~const cross_crate::MyTrait` is not implemented for `cross_crate::NonConst`
+   |
+note: the trait `cross_crate::MyTrait` is implemented for `cross_crate::NonConst`, but that implementation is not `const`
+  --> $DIR/cross-crate.rs:17:5
+   |
+LL |     NonConst.func();
+   |     ^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.rs b/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.rs
index 96acdc300..96acdc300 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.stderr b/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.stderr
index a244ab10c..a244ab10c 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.rs b/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.rs
index f70ecbc37..f70ecbc37 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.stderr b/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.stderr
new file mode 100644
index 000000000..21ecddaff
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.stderr
@@ -0,0 +1,15 @@
+error[E0277]: the trait bound `(): ~const Tr` is not satisfied
+  --> $DIR/default-method-body-is-const-same-trait-ck.rs:8:12
+   |
+LL |         ().a()
+   |            ^ the trait `~const Tr` is not implemented for `()`
+   |
+note: the trait `Tr` is implemented for `()`, but that implementation is not `const`
+  --> $DIR/default-method-body-is-const-same-trait-ck.rs:8:9
+   |
+LL |         ().a()
+   |         ^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/rfc-2632-const-trait-impl/default-method-body-is-const-with-staged-api.rs b/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-with-staged-api.rs
index 1b45cd9aa..1b45cd9aa 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/default-method-body-is-const-with-staged-api.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-with-staged-api.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.gated.stderr b/tests/ui/rfc-2632-const-trait-impl/feature-gate.gated.stderr
index 4c630d33c..4c630d33c 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.gated.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/feature-gate.gated.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.rs b/tests/ui/rfc-2632-const-trait-impl/feature-gate.rs
index 0b409fbaa..0b409fbaa 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/feature-gate.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.stock.stderr b/tests/ui/rfc-2632-const-trait-impl/feature-gate.stock.stderr
index 0e938c1c5..0e938c1c5 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.stock.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/feature-gate.stock.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/gate.rs b/tests/ui/rfc-2632-const-trait-impl/gate.rs
new file mode 100644
index 000000000..f2cd26c91
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/gate.rs
@@ -0,0 +1,5 @@
+// gate-test-const_closures
+fn main() {
+    (const || {})();
+    //~^ ERROR: const closures are experimental
+}
diff --git a/tests/ui/rfc-2632-const-trait-impl/gate.stderr b/tests/ui/rfc-2632-const-trait-impl/gate.stderr
new file mode 100644
index 000000000..30edc4127
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/gate.stderr
@@ -0,0 +1,12 @@
+error[E0658]: const closures are experimental
+  --> $DIR/gate.rs:3:6
+   |
+LL |     (const || {})();
+   |      ^^^^^^^^^^^
+   |
+   = note: see issue #106003 <https://github.com/rust-lang/rust/issues/106003> for more information
+   = help: add `#![feature(const_closures)]` 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/rfc-2632-const-trait-impl/generic-bound.rs b/tests/ui/rfc-2632-const-trait-impl/generic-bound.rs
index 5495b531c..5495b531c 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/generic-bound.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/generic-bound.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/hir-const-check.rs b/tests/ui/rfc-2632-const-trait-impl/hir-const-check.rs
index 337c73340..337c73340 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/hir-const-check.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/hir-const-check.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/hir-const-check.stderr b/tests/ui/rfc-2632-const-trait-impl/hir-const-check.stderr
index 6d2be1daa..6d2be1daa 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/hir-const-check.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/hir-const-check.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/impl-tilde-const-trait.rs b/tests/ui/rfc-2632-const-trait-impl/impl-tilde-const-trait.rs
index 05b26465c..05b26465c 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/impl-tilde-const-trait.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/impl-tilde-const-trait.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/impl-tilde-const-trait.stderr b/tests/ui/rfc-2632-const-trait-impl/impl-tilde-const-trait.stderr
index 0a91719e1..0a91719e1 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/impl-tilde-const-trait.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/impl-tilde-const-trait.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/impl-with-default-fn-fail.rs b/tests/ui/rfc-2632-const-trait-impl/impl-with-default-fn-fail.rs
index 6df9696f2..6df9696f2 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/impl-with-default-fn-fail.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/impl-with-default-fn-fail.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/impl-with-default-fn-fail.stderr b/tests/ui/rfc-2632-const-trait-impl/impl-with-default-fn-fail.stderr
index 6c6ca9f5d..6c6ca9f5d 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/impl-with-default-fn-fail.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/impl-with-default-fn-fail.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/impl-with-default-fn-pass.rs b/tests/ui/rfc-2632-const-trait-impl/impl-with-default-fn-pass.rs
index ae81421e9..ae81421e9 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/impl-with-default-fn-pass.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/impl-with-default-fn-pass.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/inherent-impl-const-bounds.rs b/tests/ui/rfc-2632-const-trait-impl/inherent-impl-const-bounds.rs
index f8ac793e4..f8ac793e4 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/inherent-impl-const-bounds.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/inherent-impl-const-bounds.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.rs b/tests/ui/rfc-2632-const-trait-impl/inherent-impl.rs
index afd0d137b..afd0d137b 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/inherent-impl.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.stderr b/tests/ui/rfc-2632-const-trait-impl/inherent-impl.stderr
index 8c5562703..8c5562703 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/inherent-impl.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-100222.rs b/tests/ui/rfc-2632-const-trait-impl/issue-100222.rs
index 9f3f38ad4..9f3f38ad4 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-100222.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-100222.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-102156.rs b/tests/ui/rfc-2632-const-trait-impl/issue-102156.rs
index fe4e91081..fe4e91081 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-102156.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-102156.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-102156.stderr b/tests/ui/rfc-2632-const-trait-impl/issue-102156.stderr
index 8bf00eaff..8bf00eaff 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-102156.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-102156.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-102985.rs b/tests/ui/rfc-2632-const-trait-impl/issue-102985.rs
index 07d3f51ed..07d3f51ed 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-102985.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-102985.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-102985.stderr b/tests/ui/rfc-2632-const-trait-impl/issue-102985.stderr
index b98ccbe5d..b98ccbe5d 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-102985.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-102985.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-103677.rs b/tests/ui/rfc-2632-const-trait-impl/issue-103677.rs
index d81724a36..d81724a36 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-103677.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-103677.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-79450.rs b/tests/ui/rfc-2632-const-trait-impl/issue-79450.rs
index b604c65d7..b604c65d7 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-79450.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-79450.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-79450.stderr b/tests/ui/rfc-2632-const-trait-impl/issue-79450.stderr
index 082c0333f..082c0333f 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-79450.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-79450.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-88155.rs b/tests/ui/rfc-2632-const-trait-impl/issue-88155.rs
index b132c395a..b132c395a 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-88155.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-88155.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-88155.stderr b/tests/ui/rfc-2632-const-trait-impl/issue-88155.stderr
index 955923505..955923505 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-88155.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-88155.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-90052.rs b/tests/ui/rfc-2632-const-trait-impl/issue-90052.rs
index 21ddf4ab4..21ddf4ab4 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-90052.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-90052.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-90052.stderr b/tests/ui/rfc-2632-const-trait-impl/issue-90052.stderr
index b2a936537..b2a936537 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-90052.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-90052.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-92111.rs b/tests/ui/rfc-2632-const-trait-impl/issue-92111.rs
index 96a3e386e..96a3e386e 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-92111.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-92111.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-92230-wf-super-trait-env.rs b/tests/ui/rfc-2632-const-trait-impl/issue-92230-wf-super-trait-env.rs
index 4d3469653..4d3469653 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-92230-wf-super-trait-env.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/issue-92230-wf-super-trait-env.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/nested-closure.rs b/tests/ui/rfc-2632-const-trait-impl/nested-closure.rs
index a85113600..a85113600 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/nested-closure.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/nested-closure.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.rs b/tests/ui/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.rs
new file mode 100644
index 000000000..cd8bb5963
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.rs
@@ -0,0 +1,15 @@
+#![feature(const_closures, const_trait_impl)]
+#![allow(incomplete_features)]
+
+trait Foo {
+    fn foo(&self);
+}
+
+impl Foo for () {
+    fn foo(&self) {}
+}
+
+fn main() {
+    (const || { (()).foo() })();
+    //~^ ERROR: cannot call non-const fn
+}
diff --git a/tests/ui/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.stderr b/tests/ui/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.stderr
new file mode 100644
index 000000000..979d7febb
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.stderr
@@ -0,0 +1,11 @@
+error[E0015]: cannot call non-const fn `<() as Foo>::foo` in constant functions
+  --> $DIR/non-const-op-const-closure-non-const-outer.rs:13:22
+   |
+LL |     (const || { (()).foo() })();
+   |                      ^^^^^
+   |
+   = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0015`.
diff --git a/src/test/ui/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.rs b/tests/ui/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.rs
index 1a4509b18..1a4509b18 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.rs b/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.rs
index 3ac909924..3ac909924 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.stderr b/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.stderr
index 4aea19794..4aea19794 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/specialization/const-default-const-specialized.rs b/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-const-specialized.rs
index 9ddea427c..9ddea427c 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/specialization/const-default-const-specialized.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-const-specialized.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.rs b/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.rs
index a3bb9b3f9..a3bb9b3f9 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.stderr b/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.stderr
index 247668047..247668047 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/specialization/default-keyword.rs b/tests/ui/rfc-2632-const-trait-impl/specialization/default-keyword.rs
index 2aac0a2b4..2aac0a2b4 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/specialization/default-keyword.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/specialization/default-keyword.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/specialization/issue-95186-specialize-on-tilde-const.rs b/tests/ui/rfc-2632-const-trait-impl/specialization/issue-95186-specialize-on-tilde-const.rs
index 9c2c2cf16..9c2c2cf16 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/specialization/issue-95186-specialize-on-tilde-const.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/specialization/issue-95186-specialize-on-tilde-const.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/specialization/issue-95187-same-trait-bound-different-constness.rs b/tests/ui/rfc-2632-const-trait-impl/specialization/issue-95187-same-trait-bound-different-constness.rs
index 1e6b1c651..1e6b1c651 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/specialization/issue-95187-same-trait-bound-different-constness.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/specialization/issue-95187-same-trait-bound-different-constness.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/specialization/non-const-default-const-specialized.rs b/tests/ui/rfc-2632-const-trait-impl/specialization/non-const-default-const-specialized.rs
index 35aa52fbd..35aa52fbd 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/specialization/non-const-default-const-specialized.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/specialization/non-const-default-const-specialized.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/specializing-constness-2.rs b/tests/ui/rfc-2632-const-trait-impl/specializing-constness-2.rs
index 633543700..633543700 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/specializing-constness-2.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/specializing-constness-2.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/specializing-constness-2.stderr b/tests/ui/rfc-2632-const-trait-impl/specializing-constness-2.stderr
index c554671e1..8923416f4 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/specializing-constness-2.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/specializing-constness-2.stderr
@@ -8,7 +8,9 @@ note: required for `T` to implement `~const A`
   --> $DIR/specializing-constness-2.rs:20:37
    |
 LL | impl<T: Default + ~const Sup> const A for T {
-   |                                     ^     ^
+   |                   ----------        ^     ^
+   |                   |
+   |                   unsatisfied trait bound introduced here
 help: consider further restricting this bound
    |
 LL | const fn generic<T: Default + ~const Sup>() {
diff --git a/src/test/ui/rfc-2632-const-trait-impl/specializing-constness.rs b/tests/ui/rfc-2632-const-trait-impl/specializing-constness.rs
index 9ab170f09..9ab170f09 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/specializing-constness.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/specializing-constness.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/specializing-constness.stderr b/tests/ui/rfc-2632-const-trait-impl/specializing-constness.stderr
index 843fc6ce8..843fc6ce8 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/specializing-constness.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/specializing-constness.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/staged-api-user-crate.rs b/tests/ui/rfc-2632-const-trait-impl/staged-api-user-crate.rs
index fc0d82727..fc0d82727 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/staged-api-user-crate.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/staged-api-user-crate.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/staged-api-user-crate.stderr b/tests/ui/rfc-2632-const-trait-impl/staged-api-user-crate.stderr
index 61f9840e0..d7aa0d95c 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/staged-api-user-crate.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/staged-api-user-crate.stderr
@@ -5,6 +5,7 @@ LL |     Unstable::func();
    |     ^^^^^^^^^^^^^^^^
    |
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2632-const-trait-impl/staged-api.rs b/tests/ui/rfc-2632-const-trait-impl/staged-api.rs
index 1d79f5adf..1d79f5adf 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/staged-api.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/staged-api.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/staged-api.stable.stderr b/tests/ui/rfc-2632-const-trait-impl/staged-api.stable.stderr
index a1aca762e..a1aca762e 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/staged-api.stable.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/staged-api.stable.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/staged-api.unstable.stderr b/tests/ui/rfc-2632-const-trait-impl/staged-api.unstable.stderr
index c38d1a81a..c38d1a81a 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/staged-api.unstable.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/staged-api.unstable.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/static-const-trait-bound.rs b/tests/ui/rfc-2632-const-trait-impl/static-const-trait-bound.rs
index 4520a3696..4520a3696 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/static-const-trait-bound.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/static-const-trait-bound.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/std-impl-gate.rs b/tests/ui/rfc-2632-const-trait-impl/std-impl-gate.rs
index 2f54c09e3..2f54c09e3 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/std-impl-gate.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/std-impl-gate.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/std-impl-gate.stock.stderr b/tests/ui/rfc-2632-const-trait-impl/std-impl-gate.stock.stderr
index 0b450a947..6a3396401 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/std-impl-gate.stock.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/std-impl-gate.stock.stderr
@@ -5,6 +5,7 @@ LL |     Default::default()
    |     ^^^^^^^^^^^^^^^^^^
    |
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-2.nn.stderr b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.nn.stderr
index d4f42b787..d4f42b787 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-2.nn.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.nn.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-2.ny.stderr b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.ny.stderr
index d4f42b787..d4f42b787 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-2.ny.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.ny.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-2.rs b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.rs
index d183efde2..d183efde2 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-2.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.yn.stderr b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.yn.stderr
new file mode 100644
index 000000000..13fc719f2
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.yn.stderr
@@ -0,0 +1,19 @@
+error[E0277]: the trait bound `T: ~const Foo` is not satisfied
+  --> $DIR/super-traits-fail-2.rs:15:7
+   |
+LL |     x.a();
+   |       ^ the trait `~const Foo` is not implemented for `T`
+   |
+note: the trait `Foo` is implemented for `T`, but that implementation is not `const`
+  --> $DIR/super-traits-fail-2.rs:15:5
+   |
+LL |     x.a();
+   |     ^
+help: consider further restricting this bound
+   |
+LL | const fn foo<T: Bar + ~const Foo>(x: &T) {
+   |                     ++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.yy.stderr b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.yy.stderr
new file mode 100644
index 000000000..13fc719f2
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.yy.stderr
@@ -0,0 +1,19 @@
+error[E0277]: the trait bound `T: ~const Foo` is not satisfied
+  --> $DIR/super-traits-fail-2.rs:15:7
+   |
+LL |     x.a();
+   |       ^ the trait `~const Foo` is not implemented for `T`
+   |
+note: the trait `Foo` is implemented for `T`, but that implementation is not `const`
+  --> $DIR/super-traits-fail-2.rs:15:5
+   |
+LL |     x.a();
+   |     ^
+help: consider further restricting this bound
+   |
+LL | const fn foo<T: Bar + ~const Foo>(x: &T) {
+   |                     ++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-3.nn.stderr b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.nn.stderr
index d433e1cfa..d433e1cfa 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-3.nn.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.nn.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-3.ny.stderr b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.ny.stderr
index 2a7e8e00b..2a7e8e00b 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-3.ny.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.ny.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-3.rs b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.rs
index 70d2936d3..70d2936d3 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-3.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-3.yn.stderr b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.yn.stderr
index e5978c12a..e5978c12a 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail-3.yn.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.yn.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail.rs b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail.rs
index 3e2b81368..3e2b81368 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/super-traits-fail.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail.stderr b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail.stderr
new file mode 100644
index 000000000..bf12ef1ca
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/super-traits-fail.stderr
@@ -0,0 +1,20 @@
+error[E0277]: the trait bound `S: ~const Foo` is not satisfied
+  --> $DIR/super-traits-fail.rs:15:20
+   |
+LL | impl const Bar for S {}
+   |                    ^ the trait `~const Foo` is not implemented for `S`
+   |
+note: the trait `Foo` is implemented for `S`, but that implementation is not `const`
+  --> $DIR/super-traits-fail.rs:15:20
+   |
+LL | impl const Bar for S {}
+   |                    ^
+note: required by a bound in `Bar`
+  --> $DIR/super-traits-fail.rs:8:12
+   |
+LL | trait Bar: ~const Foo {}
+   |            ^^^^^^^^^^ required by this bound in `Bar`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/rfc-2632-const-trait-impl/super-traits.rs b/tests/ui/rfc-2632-const-trait-impl/super-traits.rs
index df96f6fb4..df96f6fb4 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/super-traits.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/super-traits.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/syntax.rs b/tests/ui/rfc-2632-const-trait-impl/syntax.rs
index 7ac2458e3..7ac2458e3 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/syntax.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/syntax.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/tilde-const-and-const-params.rs b/tests/ui/rfc-2632-const-trait-impl/tilde-const-and-const-params.rs
index 78a64b901..78a64b901 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/tilde-const-and-const-params.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/tilde-const-and-const-params.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/tilde-const-and-const-params.stderr b/tests/ui/rfc-2632-const-trait-impl/tilde-const-and-const-params.stderr
index aae72f36e..aae72f36e 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/tilde-const-and-const-params.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/tilde-const-and-const-params.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/tilde-const-invalid-places.rs b/tests/ui/rfc-2632-const-trait-impl/tilde-const-invalid-places.rs
new file mode 100644
index 000000000..95f7aaba0
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/tilde-const-invalid-places.rs
@@ -0,0 +1,7 @@
+#![feature(const_trait_impl)]
+#![feature(associated_type_bounds)]
+
+struct TildeQuestion<T: ~const ?Sized>(std::marker::PhantomData<T>);
+//~^ ERROR `~const` and `?` are mutually exclusive
+
+fn main() {}
diff --git a/tests/ui/rfc-2632-const-trait-impl/tilde-const-invalid-places.stderr b/tests/ui/rfc-2632-const-trait-impl/tilde-const-invalid-places.stderr
new file mode 100644
index 000000000..d20f146df
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/tilde-const-invalid-places.stderr
@@ -0,0 +1,8 @@
+error: `~const` and `?` are mutually exclusive
+  --> $DIR/tilde-const-invalid-places.rs:4:25
+   |
+LL | struct TildeQuestion<T: ~const ?Sized>(std::marker::PhantomData<T>);
+   |                         ^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/rfc-2632-const-trait-impl/tilde-const-syntax.rs b/tests/ui/rfc-2632-const-trait-impl/tilde-const-syntax.rs
index 9b3c2cf2a..9b3c2cf2a 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/tilde-const-syntax.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/tilde-const-syntax.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/tilde-twice.rs b/tests/ui/rfc-2632-const-trait-impl/tilde-twice.rs
index 06e4ede8b..06e4ede8b 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/tilde-twice.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/tilde-twice.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/tilde-twice.stderr b/tests/ui/rfc-2632-const-trait-impl/tilde-twice.stderr
index 928d23e8a..928d23e8a 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/tilde-twice.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/tilde-twice.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/tilde_const_on_impl_bound.rs b/tests/ui/rfc-2632-const-trait-impl/tilde_const_on_impl_bound.rs
index 285cef571..285cef571 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/tilde_const_on_impl_bound.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/tilde_const_on_impl_bound.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/trait-default-body-stability.rs b/tests/ui/rfc-2632-const-trait-impl/trait-default-body-stability.rs
index 334fc4cb8..334fc4cb8 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/trait-default-body-stability.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/trait-default-body-stability.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/trait-where-clause-const.rs b/tests/ui/rfc-2632-const-trait-impl/trait-where-clause-const.rs
index bfe98b98c..bfe98b98c 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/trait-where-clause-const.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/trait-where-clause-const.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/trait-where-clause-const.stderr b/tests/ui/rfc-2632-const-trait-impl/trait-where-clause-const.stderr
index f2846b6a6..f2846b6a6 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/trait-where-clause-const.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/trait-where-clause-const.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/trait-where-clause-run.rs b/tests/ui/rfc-2632-const-trait-impl/trait-where-clause-run.rs
index 4b8b00406..4b8b00406 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/trait-where-clause-run.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/trait-where-clause-run.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/trait-where-clause-self-referential.rs b/tests/ui/rfc-2632-const-trait-impl/trait-where-clause-self-referential.rs
index 3b028ac48..3b028ac48 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/trait-where-clause-self-referential.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/trait-where-clause-self-referential.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/trait-where-clause.rs b/tests/ui/rfc-2632-const-trait-impl/trait-where-clause.rs
index 85ca5fc90..85ca5fc90 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/trait-where-clause.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/trait-where-clause.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/trait-where-clause.stderr b/tests/ui/rfc-2632-const-trait-impl/trait-where-clause.stderr
index 11f0c4016..11f0c4016 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/trait-where-clause.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/trait-where-clause.stderr
diff --git a/src/test/ui/rfc-2632-const-trait-impl/without-tilde.rs b/tests/ui/rfc-2632-const-trait-impl/without-tilde.rs
index d63381b5f..d63381b5f 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/without-tilde.rs
+++ b/tests/ui/rfc-2632-const-trait-impl/without-tilde.rs
diff --git a/src/test/ui/rfc-2632-const-trait-impl/without-tilde.stderr b/tests/ui/rfc-2632-const-trait-impl/without-tilde.stderr
index 31300354a..31300354a 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/without-tilde.stderr
+++ b/tests/ui/rfc-2632-const-trait-impl/without-tilde.stderr
diff --git a/src/test/ui/rfcs/rfc-1014-2.rs b/tests/ui/rfcs/rfc-1014-2.rs
index 7dd65701f..7dd65701f 100644
--- a/src/test/ui/rfcs/rfc-1014-2.rs
+++ b/tests/ui/rfcs/rfc-1014-2.rs
diff --git a/src/test/ui/rfcs/rfc-1014.rs b/tests/ui/rfcs/rfc-1014.rs
index c454dfa4e..c454dfa4e 100644
--- a/src/test/ui/rfcs/rfc-1014.rs
+++ b/tests/ui/rfcs/rfc-1014.rs
diff --git a/src/test/ui/rfcs/rfc-1789-as-cell/from-mut.rs b/tests/ui/rfcs/rfc-1789-as-cell/from-mut.rs
index 329fadb15..329fadb15 100644
--- a/src/test/ui/rfcs/rfc-1789-as-cell/from-mut.rs
+++ b/tests/ui/rfcs/rfc-1789-as-cell/from-mut.rs
diff --git a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
index e98582cbc..e98582cbc 100644
--- a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
+++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
diff --git a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-empty.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-empty.rs
index bac695d4e..bac695d4e 100644
--- a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-empty.rs
+++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-empty.rs
diff --git a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-exitcode.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-exitcode.rs
index 6d4c15620..6d4c15620 100644
--- a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-exitcode.rs
+++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-exitcode.rs
diff --git a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs
index c06a135dc..c06a135dc 100644
--- a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs
+++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs
diff --git a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs
index b0e932e1f..b0e932e1f 100644
--- a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs
+++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs
diff --git a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result.rs
index 30f36c244..30f36c244 100644
--- a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result.rs
+++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result.rs
diff --git a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs
index f0591c38c..f0591c38c 100644
--- a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs
+++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs
diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/box.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/box.rs
index 0d1cded36..0d1cded36 100644
--- a/src/test/ui/rfcs/rfc-2005-default-binding-mode/box.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/box.rs
diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/constref.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/constref.rs
index d5bca6a24..d5bca6a24 100644
--- a/src/test/ui/rfcs/rfc-2005-default-binding-mode/constref.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/constref.rs
diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/enum.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/enum.rs
index 52fbb90ed..52fbb90ed 100644
--- a/src/test/ui/rfcs/rfc-2005-default-binding-mode/enum.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/enum.rs
diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/for.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/for.rs
index a5a24a806..a5a24a806 100644
--- a/src/test/ui/rfcs/rfc-2005-default-binding-mode/for.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/for.rs
diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/general.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/general.rs
index 0207f607b..0207f607b 100644
--- a/src/test/ui/rfcs/rfc-2005-default-binding-mode/general.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/general.rs
diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/lit.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/lit.rs
index 937975359..937975359 100644
--- a/src/test/ui/rfcs/rfc-2005-default-binding-mode/lit.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/lit.rs
diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/range.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/range.rs
index f8abd1b96..f8abd1b96 100644
--- a/src/test/ui/rfcs/rfc-2005-default-binding-mode/range.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/range.rs
diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/ref-region.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/ref-region.rs
index b74e45c93..b74e45c93 100644
--- a/src/test/ui/rfcs/rfc-2005-default-binding-mode/ref-region.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/ref-region.rs
diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/reset-mode.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/reset-mode.rs
index 3b9d07610..3b9d07610 100644
--- a/src/test/ui/rfcs/rfc-2005-default-binding-mode/reset-mode.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/reset-mode.rs
diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/slice.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/slice.rs
index 33229a205..33229a205 100644
--- a/src/test/ui/rfcs/rfc-2005-default-binding-mode/slice.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/slice.rs
diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/struct.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/struct.rs
index 5a00e5b68..5a00e5b68 100644
--- a/src/test/ui/rfcs/rfc-2005-default-binding-mode/struct.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/struct.rs
diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/tuple-struct.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/tuple-struct.rs
index 0cf9ba1b4..0cf9ba1b4 100644
--- a/src/test/ui/rfcs/rfc-2005-default-binding-mode/tuple-struct.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/tuple-struct.rs
diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/tuple.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/tuple.rs
index 4c22aa2d7..4c22aa2d7 100644
--- a/src/test/ui/rfcs/rfc-2005-default-binding-mode/tuple.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/tuple.rs
diff --git a/src/test/ui/rfcs/rfc-2151-raw-identifiers/attr.rs b/tests/ui/rfcs/rfc-2151-raw-identifiers/attr.rs
index d359067f6..d359067f6 100644
--- a/src/test/ui/rfcs/rfc-2151-raw-identifiers/attr.rs
+++ b/tests/ui/rfcs/rfc-2151-raw-identifiers/attr.rs
diff --git a/src/test/ui/rfcs/rfc-2151-raw-identifiers/basic.rs b/tests/ui/rfcs/rfc-2151-raw-identifiers/basic.rs
index f2fe59668..f2fe59668 100644
--- a/src/test/ui/rfcs/rfc-2151-raw-identifiers/basic.rs
+++ b/tests/ui/rfcs/rfc-2151-raw-identifiers/basic.rs
diff --git a/src/test/ui/rfcs/rfc-2151-raw-identifiers/items.rs b/tests/ui/rfcs/rfc-2151-raw-identifiers/items.rs
index 466522517..466522517 100644
--- a/src/test/ui/rfcs/rfc-2151-raw-identifiers/items.rs
+++ b/tests/ui/rfcs/rfc-2151-raw-identifiers/items.rs
diff --git a/src/test/ui/rfcs/rfc-2151-raw-identifiers/macros.rs b/tests/ui/rfcs/rfc-2151-raw-identifiers/macros.rs
index 0ab7e17f8..0ab7e17f8 100644
--- a/src/test/ui/rfcs/rfc-2151-raw-identifiers/macros.rs
+++ b/tests/ui/rfcs/rfc-2151-raw-identifiers/macros.rs
diff --git a/src/test/ui/rfcs/rfc-2175-or-if-while-let/basic.rs b/tests/ui/rfcs/rfc-2175-or-if-while-let/basic.rs
index 22f04c58f..22f04c58f 100644
--- a/src/test/ui/rfcs/rfc-2175-or-if-while-let/basic.rs
+++ b/tests/ui/rfcs/rfc-2175-or-if-while-let/basic.rs
diff --git a/src/test/ui/rfcs/rfc-2302-self-struct-ctor.rs b/tests/ui/rfcs/rfc-2302-self-struct-ctor.rs
index 1ec20c500..1ec20c500 100644
--- a/src/test/ui/rfcs/rfc-2302-self-struct-ctor.rs
+++ b/tests/ui/rfcs/rfc-2302-self-struct-ctor.rs
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/check-pass.rs b/tests/ui/rfcs/rfc-2396-target_feature-11/check-pass.rs
index e0842bfa4..e0842bfa4 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/check-pass.rs
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/check-pass.rs
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/closures-inherit-target_feature.rs b/tests/ui/rfcs/rfc-2396-target_feature-11/closures-inherit-target_feature.rs
index a59d7c2d7..a59d7c2d7 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/closures-inherit-target_feature.rs
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/closures-inherit-target_feature.rs
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/feature-gate-target_feature_11.rs b/tests/ui/rfcs/rfc-2396-target_feature-11/feature-gate-target_feature_11.rs
index 975d7a1f6..975d7a1f6 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/feature-gate-target_feature_11.rs
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/feature-gate-target_feature_11.rs
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/feature-gate-target_feature_11.stderr b/tests/ui/rfcs/rfc-2396-target_feature-11/feature-gate-target_feature_11.stderr
index 18917fd25..18917fd25 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/feature-gate-target_feature_11.stderr
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/feature-gate-target_feature_11.stderr
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.mir.stderr b/tests/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.mir.stderr
index cf5815df5..cf5815df5 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.mir.stderr
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.mir.stderr
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.rs b/tests/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.rs
index c95d4a08e..c95d4a08e 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.rs
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.rs
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.thir.stderr b/tests/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.thir.stderr
index cf5815df5..cf5815df5 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.thir.stderr
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.thir.stderr
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/fn-traits.rs b/tests/ui/rfcs/rfc-2396-target_feature-11/fn-traits.rs
index 43bda4962..43bda4962 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/fn-traits.rs
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/fn-traits.rs
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/fn-traits.stderr b/tests/ui/rfcs/rfc-2396-target_feature-11/fn-traits.stderr
index fc7bf2277..fc7bf2277 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/fn-traits.stderr
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/fn-traits.stderr
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/issue-99876.rs b/tests/ui/rfcs/rfc-2396-target_feature-11/issue-99876.rs
index 033dcdfc0..033dcdfc0 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/issue-99876.rs
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/issue-99876.rs
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/safe-calls.mir.stderr b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.mir.stderr
index 0ef7b8b09..0ef7b8b09 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/safe-calls.mir.stderr
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.mir.stderr
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs
index cebc6f947..cebc6f947 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/safe-calls.thir.stderr b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.thir.stderr
index c75ac6e8b..c75ac6e8b 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/safe-calls.thir.stderr
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.thir.stderr
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/trait-impl.rs b/tests/ui/rfcs/rfc-2396-target_feature-11/trait-impl.rs
index 7314fa8cc..7314fa8cc 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/trait-impl.rs
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/trait-impl.rs
diff --git a/src/test/ui/rfcs/rfc-2396-target_feature-11/trait-impl.stderr b/tests/ui/rfcs/rfc-2396-target_feature-11/trait-impl.stderr
index 07d6e0900..07d6e0900 100644
--- a/src/test/ui/rfcs/rfc-2396-target_feature-11/trait-impl.stderr
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/trait-impl.stderr
diff --git a/src/test/ui/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs b/tests/ui/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs
index 6d7bca4da..6d7bca4da 100644
--- a/src/test/ui/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs
+++ b/tests/ui/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs
diff --git a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/coerce-in-base-expr.rs b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/coerce-in-base-expr.rs
index 75e48bf4a..75e48bf4a 100644
--- a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/coerce-in-base-expr.rs
+++ b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/coerce-in-base-expr.rs
diff --git a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/feature-gate.rs b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/feature-gate.rs
index 1e8b99ba5..1e8b99ba5 100644
--- a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/feature-gate.rs
+++ b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/feature-gate.rs
diff --git a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/feature-gate.stderr b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/feature-gate.stderr
index 2217b8c04..2217b8c04 100644
--- a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/feature-gate.stderr
+++ b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/feature-gate.stderr
diff --git a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/issue-92010-trait-bound-not-satisfied.rs b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/issue-92010-trait-bound-not-satisfied.rs
index f1a54ee58..f1a54ee58 100644
--- a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/issue-92010-trait-bound-not-satisfied.rs
+++ b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/issue-92010-trait-bound-not-satisfied.rs
diff --git a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/issue-92010-trait-bound-not-satisfied.stderr b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/issue-92010-trait-bound-not-satisfied.stderr
index 5957ea7c9..5957ea7c9 100644
--- a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/issue-92010-trait-bound-not-satisfied.stderr
+++ b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/issue-92010-trait-bound-not-satisfied.stderr
diff --git a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/issue-96878.rs b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/issue-96878.rs
index 3dfbef0ee..3dfbef0ee 100644
--- a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/issue-96878.rs
+++ b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/issue-96878.rs
diff --git a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/lifetime-update.rs b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/lifetime-update.rs
index df2fef55d..df2fef55d 100644
--- a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/lifetime-update.rs
+++ b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/lifetime-update.rs
diff --git a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/lifetime-update.stderr b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/lifetime-update.stderr
index 5f93ad6e0..5f93ad6e0 100644
--- a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/lifetime-update.stderr
+++ b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/lifetime-update.stderr
diff --git a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/type-generic-update.rs b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/type-generic-update.rs
index dae1241d3..dae1241d3 100644
--- a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/type-generic-update.rs
+++ b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/type-generic-update.rs
diff --git a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/type-generic-update.stderr b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/type-generic-update.stderr
index 6f31b1a96..6f31b1a96 100644
--- a/src/test/ui/rfcs/rfc-2528-type-changing-struct-update/type-generic-update.stderr
+++ b/tests/ui/rfcs/rfc-2528-type-changing-struct-update/type-generic-update.stderr
diff --git a/src/test/ui/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs b/tests/ui/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs
index 17174e22c..17174e22c 100644
--- a/src/test/ui/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs
+++ b/tests/ui/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs
diff --git a/src/test/ui/rfcs/rfc1445/eq-allows-match.rs b/tests/ui/rfcs/rfc1445/eq-allows-match.rs
index 405a69c94..405a69c94 100644
--- a/src/test/ui/rfcs/rfc1445/eq-allows-match.rs
+++ b/tests/ui/rfcs/rfc1445/eq-allows-match.rs
diff --git a/src/test/ui/rfcs/rfc1623-2.rs b/tests/ui/rfcs/rfc1623-2.rs
index c0e13a5f5..c0e13a5f5 100644
--- a/src/test/ui/rfcs/rfc1623-2.rs
+++ b/tests/ui/rfcs/rfc1623-2.rs
diff --git a/src/test/ui/rfcs/rfc1623-2.stderr b/tests/ui/rfcs/rfc1623-2.stderr
index d183eaaa6..d183eaaa6 100644
--- a/src/test/ui/rfcs/rfc1623-2.stderr
+++ b/tests/ui/rfcs/rfc1623-2.stderr
diff --git a/src/test/ui/rfcs/rfc1623-3.rs b/tests/ui/rfcs/rfc1623-3.rs
index 26fa6fdb5..26fa6fdb5 100644
--- a/src/test/ui/rfcs/rfc1623-3.rs
+++ b/tests/ui/rfcs/rfc1623-3.rs
diff --git a/src/test/ui/rfcs/rfc1623-3.stderr b/tests/ui/rfcs/rfc1623-3.stderr
index 77fc3f041..77fc3f041 100644
--- a/src/test/ui/rfcs/rfc1623-3.stderr
+++ b/tests/ui/rfcs/rfc1623-3.stderr
diff --git a/src/test/ui/rfcs/rfc1623.rs b/tests/ui/rfcs/rfc1623.rs
index adaf25c6b..adaf25c6b 100644
--- a/src/test/ui/rfcs/rfc1623.rs
+++ b/tests/ui/rfcs/rfc1623.rs
diff --git a/src/test/ui/rfcs/rfc1717/library-override.rs b/tests/ui/rfcs/rfc1717/library-override.rs
index 014ccac31..014ccac31 100644
--- a/src/test/ui/rfcs/rfc1717/library-override.rs
+++ b/tests/ui/rfcs/rfc1717/library-override.rs
diff --git a/src/test/ui/rfcs/rfc1857-drop-order.rs b/tests/ui/rfcs/rfc1857-drop-order.rs
index 4c4816c2f..4c4816c2f 100644
--- a/src/test/ui/rfcs/rfc1857-drop-order.rs
+++ b/tests/ui/rfcs/rfc1857-drop-order.rs
diff --git a/src/test/ui/rmeta/auxiliary/rmeta-meta.rs b/tests/ui/rmeta/auxiliary/rmeta-meta.rs
index 6d8ed95bd..6d8ed95bd 100644
--- a/src/test/ui/rmeta/auxiliary/rmeta-meta.rs
+++ b/tests/ui/rmeta/auxiliary/rmeta-meta.rs
diff --git a/src/test/ui/rmeta/auxiliary/rmeta-rlib-rpass.rs b/tests/ui/rmeta/auxiliary/rmeta-rlib-rpass.rs
index f5e8c3d2a..f5e8c3d2a 100644
--- a/src/test/ui/rmeta/auxiliary/rmeta-rlib-rpass.rs
+++ b/tests/ui/rmeta/auxiliary/rmeta-rlib-rpass.rs
diff --git a/src/test/ui/rmeta/auxiliary/rmeta-rlib.rs b/tests/ui/rmeta/auxiliary/rmeta-rlib.rs
index 4a05710db..4a05710db 100644
--- a/src/test/ui/rmeta/auxiliary/rmeta-rlib.rs
+++ b/tests/ui/rmeta/auxiliary/rmeta-rlib.rs
diff --git a/src/test/ui/rmeta/auxiliary/rmeta-rmeta.rs b/tests/ui/rmeta/auxiliary/rmeta-rmeta.rs
index 4a6d055a8..4a6d055a8 100644
--- a/src/test/ui/rmeta/auxiliary/rmeta-rmeta.rs
+++ b/tests/ui/rmeta/auxiliary/rmeta-rmeta.rs
diff --git a/src/test/ui/rmeta/emit-artifact-notifications.polonius.stderr b/tests/ui/rmeta/emit-artifact-notifications.polonius.stderr
index 255c7b370..255c7b370 100644
--- a/src/test/ui/rmeta/emit-artifact-notifications.polonius.stderr
+++ b/tests/ui/rmeta/emit-artifact-notifications.polonius.stderr
diff --git a/src/test/ui/rmeta/emit-artifact-notifications.rs b/tests/ui/rmeta/emit-artifact-notifications.rs
index 984a7fabb..984a7fabb 100644
--- a/src/test/ui/rmeta/emit-artifact-notifications.rs
+++ b/tests/ui/rmeta/emit-artifact-notifications.rs
diff --git a/src/test/ui/rmeta/emit-artifact-notifications.stderr b/tests/ui/rmeta/emit-artifact-notifications.stderr
index b2f0aa757..b2f0aa757 100644
--- a/src/test/ui/rmeta/emit-artifact-notifications.stderr
+++ b/tests/ui/rmeta/emit-artifact-notifications.stderr
diff --git a/src/test/ui/rmeta/emit-metadata-obj.rs b/tests/ui/rmeta/emit-metadata-obj.rs
index 334c7cc5b..334c7cc5b 100644
--- a/src/test/ui/rmeta/emit-metadata-obj.rs
+++ b/tests/ui/rmeta/emit-metadata-obj.rs
diff --git a/src/test/ui/rmeta/rmeta-lib-pass.rs b/tests/ui/rmeta/rmeta-lib-pass.rs
index fdd0516e4..fdd0516e4 100644
--- a/src/test/ui/rmeta/rmeta-lib-pass.rs
+++ b/tests/ui/rmeta/rmeta-lib-pass.rs
diff --git a/src/test/ui/rmeta/rmeta-pass.rs b/tests/ui/rmeta/rmeta-pass.rs
index 4f0db23f4..4f0db23f4 100644
--- a/src/test/ui/rmeta/rmeta-pass.rs
+++ b/tests/ui/rmeta/rmeta-pass.rs
diff --git a/src/test/ui/rmeta/rmeta-priv-warn.rs b/tests/ui/rmeta/rmeta-priv-warn.rs
index 430c1f06f..430c1f06f 100644
--- a/src/test/ui/rmeta/rmeta-priv-warn.rs
+++ b/tests/ui/rmeta/rmeta-priv-warn.rs
diff --git a/src/test/ui/rmeta/rmeta-rpass.rs b/tests/ui/rmeta/rmeta-rpass.rs
index 173a6a394..173a6a394 100644
--- a/src/test/ui/rmeta/rmeta-rpass.rs
+++ b/tests/ui/rmeta/rmeta-rpass.rs
diff --git a/src/test/ui/rmeta/rmeta.rs b/tests/ui/rmeta/rmeta.rs
index 63ed23650..63ed23650 100644
--- a/src/test/ui/rmeta/rmeta.rs
+++ b/tests/ui/rmeta/rmeta.rs
diff --git a/src/test/ui/rmeta/rmeta.stderr b/tests/ui/rmeta/rmeta.stderr
index d15caeb66..d15caeb66 100644
--- a/src/test/ui/rmeta/rmeta.stderr
+++ b/tests/ui/rmeta/rmeta.stderr
diff --git a/src/test/ui/rmeta/rmeta_lib.rs b/tests/ui/rmeta/rmeta_lib.rs
index fa6826450..fa6826450 100644
--- a/src/test/ui/rmeta/rmeta_lib.rs
+++ b/tests/ui/rmeta/rmeta_lib.rs
diff --git a/src/test/ui/rmeta/rmeta_lib.stderr b/tests/ui/rmeta/rmeta_lib.stderr
index 8a9179cca..8a9179cca 100644
--- a/src/test/ui/rmeta/rmeta_lib.stderr
+++ b/tests/ui/rmeta/rmeta_lib.stderr
diff --git a/src/test/ui/rmeta/rmeta_meta_main.rs b/tests/ui/rmeta/rmeta_meta_main.rs
index 839f350d7..839f350d7 100644
--- a/src/test/ui/rmeta/rmeta_meta_main.rs
+++ b/tests/ui/rmeta/rmeta_meta_main.rs
diff --git a/src/test/ui/rmeta/rmeta_meta_main.stderr b/tests/ui/rmeta/rmeta_meta_main.stderr
index 0c6ed9afd..0c6ed9afd 100644
--- a/src/test/ui/rmeta/rmeta_meta_main.stderr
+++ b/tests/ui/rmeta/rmeta_meta_main.stderr
diff --git a/src/test/ui/runtime/atomic-print.rs b/tests/ui/runtime/atomic-print.rs
index fe5791053..fe5791053 100644
--- a/src/test/ui/runtime/atomic-print.rs
+++ b/tests/ui/runtime/atomic-print.rs
diff --git a/src/test/ui/runtime/backtrace-debuginfo-aux.rs b/tests/ui/runtime/backtrace-debuginfo-aux.rs
index 1411bcf89..1411bcf89 100644
--- a/src/test/ui/runtime/backtrace-debuginfo-aux.rs
+++ b/tests/ui/runtime/backtrace-debuginfo-aux.rs
diff --git a/src/test/ui/runtime/backtrace-debuginfo.rs b/tests/ui/runtime/backtrace-debuginfo.rs
index 8b5466b6c..8b5466b6c 100644
--- a/src/test/ui/runtime/backtrace-debuginfo.rs
+++ b/tests/ui/runtime/backtrace-debuginfo.rs
diff --git a/src/test/ui/runtime/native-print-no-runtime.rs b/tests/ui/runtime/native-print-no-runtime.rs
index f17c9fa6c..f17c9fa6c 100644
--- a/src/test/ui/runtime/native-print-no-runtime.rs
+++ b/tests/ui/runtime/native-print-no-runtime.rs
diff --git a/src/test/ui/runtime/out-of-stack.rs b/tests/ui/runtime/out-of-stack.rs
index 6873abc49..6873abc49 100644
--- a/src/test/ui/runtime/out-of-stack.rs
+++ b/tests/ui/runtime/out-of-stack.rs
diff --git a/src/test/ui/runtime/rt-explody-panic-payloads.rs b/tests/ui/runtime/rt-explody-panic-payloads.rs
index 755d3df42..755d3df42 100644
--- a/src/test/ui/runtime/rt-explody-panic-payloads.rs
+++ b/tests/ui/runtime/rt-explody-panic-payloads.rs
diff --git a/src/test/ui/runtime/running-with-no-runtime.rs b/tests/ui/runtime/running-with-no-runtime.rs
index c575a6bec..c575a6bec 100644
--- a/src/test/ui/runtime/running-with-no-runtime.rs
+++ b/tests/ui/runtime/running-with-no-runtime.rs
diff --git a/src/test/ui/runtime/signal-alternate-stack-cleanup.rs b/tests/ui/runtime/signal-alternate-stack-cleanup.rs
index 8a6d73895..8a6d73895 100644
--- a/src/test/ui/runtime/signal-alternate-stack-cleanup.rs
+++ b/tests/ui/runtime/signal-alternate-stack-cleanup.rs
diff --git a/src/test/ui/runtime/stdout-during-shutdown.rs b/tests/ui/runtime/stdout-during-shutdown.rs
index a6cf812ca..a6cf812ca 100644
--- a/src/test/ui/runtime/stdout-during-shutdown.rs
+++ b/tests/ui/runtime/stdout-during-shutdown.rs
diff --git a/src/test/ui/runtime/stdout-during-shutdown.run.stdout b/tests/ui/runtime/stdout-during-shutdown.run.stdout
index 30f51a3fb..30f51a3fb 100644
--- a/src/test/ui/runtime/stdout-during-shutdown.run.stdout
+++ b/tests/ui/runtime/stdout-during-shutdown.run.stdout
diff --git a/src/test/ui/rust-2018/async-ident-allowed.rs b/tests/ui/rust-2018/async-ident-allowed.rs
index 8efcfbb70..8efcfbb70 100644
--- a/src/test/ui/rust-2018/async-ident-allowed.rs
+++ b/tests/ui/rust-2018/async-ident-allowed.rs
diff --git a/src/test/ui/rust-2018/async-ident-allowed.stderr b/tests/ui/rust-2018/async-ident-allowed.stderr
index 992b29750..992b29750 100644
--- a/src/test/ui/rust-2018/async-ident-allowed.stderr
+++ b/tests/ui/rust-2018/async-ident-allowed.stderr
diff --git a/src/test/ui/rust-2018/async-ident.fixed b/tests/ui/rust-2018/async-ident.fixed
index e909c7907..e909c7907 100644
--- a/src/test/ui/rust-2018/async-ident.fixed
+++ b/tests/ui/rust-2018/async-ident.fixed
diff --git a/src/test/ui/rust-2018/async-ident.rs b/tests/ui/rust-2018/async-ident.rs
index 2bfbc3871..2bfbc3871 100644
--- a/src/test/ui/rust-2018/async-ident.rs
+++ b/tests/ui/rust-2018/async-ident.rs
diff --git a/src/test/ui/rust-2018/async-ident.stderr b/tests/ui/rust-2018/async-ident.stderr
index d15250c54..d15250c54 100644
--- a/src/test/ui/rust-2018/async-ident.stderr
+++ b/tests/ui/rust-2018/async-ident.stderr
diff --git a/src/test/ui/rust-2018/auxiliary/baz.rs b/tests/ui/rust-2018/auxiliary/baz.rs
index b317c8a45..b317c8a45 100644
--- a/src/test/ui/rust-2018/auxiliary/baz.rs
+++ b/tests/ui/rust-2018/auxiliary/baz.rs
diff --git a/src/test/ui/rust-2018/auxiliary/edition-lint-infer-outlives-macro.rs b/tests/ui/rust-2018/auxiliary/edition-lint-infer-outlives-macro.rs
index d45fa10f0..d45fa10f0 100644
--- a/src/test/ui/rust-2018/auxiliary/edition-lint-infer-outlives-macro.rs
+++ b/tests/ui/rust-2018/auxiliary/edition-lint-infer-outlives-macro.rs
diff --git a/src/test/ui/rust-2018/auxiliary/edition-lint-paths.rs b/tests/ui/rust-2018/auxiliary/edition-lint-paths.rs
index dd22df89e..dd22df89e 100644
--- a/src/test/ui/rust-2018/auxiliary/edition-lint-paths.rs
+++ b/tests/ui/rust-2018/auxiliary/edition-lint-paths.rs
diff --git a/src/test/ui/rust-2018/auxiliary/macro-use-warned-against.rs b/tests/ui/rust-2018/auxiliary/macro-use-warned-against.rs
index b497c74e6..b497c74e6 100644
--- a/src/test/ui/rust-2018/auxiliary/macro-use-warned-against.rs
+++ b/tests/ui/rust-2018/auxiliary/macro-use-warned-against.rs
diff --git a/src/test/ui/rust-2018/auxiliary/macro-use-warned-against2.rs b/tests/ui/rust-2018/auxiliary/macro-use-warned-against2.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/ui/rust-2018/auxiliary/macro-use-warned-against2.rs
+++ b/tests/ui/rust-2018/auxiliary/macro-use-warned-against2.rs
diff --git a/src/test/ui/rust-2018/auxiliary/remove-extern-crate.rs b/tests/ui/rust-2018/auxiliary/remove-extern-crate.rs
index 890af683a..890af683a 100644
--- a/src/test/ui/rust-2018/auxiliary/remove-extern-crate.rs
+++ b/tests/ui/rust-2018/auxiliary/remove-extern-crate.rs
diff --git a/src/test/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs b/tests/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs
index 7472443dc..7472443dc 100644
--- a/src/test/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs
+++ b/tests/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs
diff --git a/src/test/ui/rust-2018/auxiliary/trait-import-suggestions.rs b/tests/ui/rust-2018/auxiliary/trait-import-suggestions.rs
index d356f3294..d356f3294 100644
--- a/src/test/ui/rust-2018/auxiliary/trait-import-suggestions.rs
+++ b/tests/ui/rust-2018/auxiliary/trait-import-suggestions.rs
diff --git a/src/test/ui/rust-2018/dyn-keyword.fixed b/tests/ui/rust-2018/dyn-keyword.fixed
index 044824cbb..044824cbb 100644
--- a/src/test/ui/rust-2018/dyn-keyword.fixed
+++ b/tests/ui/rust-2018/dyn-keyword.fixed
diff --git a/src/test/ui/rust-2018/dyn-keyword.rs b/tests/ui/rust-2018/dyn-keyword.rs
index 5989cfa1c..5989cfa1c 100644
--- a/src/test/ui/rust-2018/dyn-keyword.rs
+++ b/tests/ui/rust-2018/dyn-keyword.rs
diff --git a/src/test/ui/rust-2018/dyn-keyword.stderr b/tests/ui/rust-2018/dyn-keyword.stderr
index b6f5b10cf..b6f5b10cf 100644
--- a/src/test/ui/rust-2018/dyn-keyword.stderr
+++ b/tests/ui/rust-2018/dyn-keyword.stderr
diff --git a/src/test/ui/rust-2018/dyn-trait-compatibility.rs b/tests/ui/rust-2018/dyn-trait-compatibility.rs
index 377c85fef..377c85fef 100644
--- a/src/test/ui/rust-2018/dyn-trait-compatibility.rs
+++ b/tests/ui/rust-2018/dyn-trait-compatibility.rs
diff --git a/src/test/ui/rust-2018/dyn-trait-compatibility.stderr b/tests/ui/rust-2018/dyn-trait-compatibility.stderr
index cf4d6c19c..cf4d6c19c 100644
--- a/src/test/ui/rust-2018/dyn-trait-compatibility.stderr
+++ b/tests/ui/rust-2018/dyn-trait-compatibility.stderr
diff --git a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed b/tests/ui/rust-2018/edition-lint-fully-qualified-paths.fixed
index 85d106bc1..85d106bc1 100644
--- a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed
+++ b/tests/ui/rust-2018/edition-lint-fully-qualified-paths.fixed
diff --git a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs b/tests/ui/rust-2018/edition-lint-fully-qualified-paths.rs
index 9ff3c2e5f..9ff3c2e5f 100644
--- a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs
+++ b/tests/ui/rust-2018/edition-lint-fully-qualified-paths.rs
diff --git a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr b/tests/ui/rust-2018/edition-lint-fully-qualified-paths.stderr
index e1709db09..e1709db09 100644
--- a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr
+++ b/tests/ui/rust-2018/edition-lint-fully-qualified-paths.stderr
diff --git a/tests/ui/rust-2018/edition-lint-infer-outlives-macro.fixed b/tests/ui/rust-2018/edition-lint-infer-outlives-macro.fixed
new file mode 100644
index 000000000..8cdb08e81
--- /dev/null
+++ b/tests/ui/rust-2018/edition-lint-infer-outlives-macro.fixed
@@ -0,0 +1,137 @@
+// edition:2018
+// aux-build:edition-lint-infer-outlives-macro.rs
+// run-rustfix
+
+#![deny(explicit_outlives_requirements)]
+#![allow(dead_code)]
+
+#[macro_use]
+extern crate edition_lint_infer_outlives_macro;
+
+// Test that the lint does not fire if the predicate is from the local crate,
+// but all the bounds are from an external macro.
+macro_rules! make_foo {
+    ($a:tt) => {
+        struct Foo<$a, 'b: $a> {
+            foo: &$a &'b (),
+        }
+
+        struct FooWhere<$a, 'b> where 'b: $a {
+            foo: &$a &'b (),
+        }
+    }
+}
+
+gimme_a! {make_foo!}
+
+struct Bar<'a, 'b> {
+    //~^ ERROR: outlives requirements can be inferred
+    bar: &'a &'b (),
+}
+
+struct BarWhere<'a, 'b> {
+    //~^ ERROR: outlives requirements can be inferred
+    bar: &'a &'b (),
+}
+
+// Test that the lint *does* fire if the predicate is contained in a local macro.
+mod everything_inside {
+    macro_rules! m {
+        ('b: 'a) => {
+            struct Foo<'a, 'b>(&'a &'b ());
+            //~^ ERROR: outlives requirements can be inferred
+            struct Bar<'a, 'b>(&'a &'b ()) ;
+            //~^ ERROR: outlives requirements can be inferred
+            struct Baz<'a, 'b>(&'a &'b ()) where (): Sized, ;
+            //~^ ERROR: outlives requirements can be inferred
+        };
+    }
+    m!('b: 'a);
+}
+
+mod inner_lifetime_outside_colon_inside {
+    macro_rules! m {
+        ($b:lifetime: 'a) => {
+            struct Foo<'a, $b>(&'a &$b ());
+            //~^ ERROR: outlives requirements can be inferred
+            struct Bar<'a, $b>(&'a &$b ()) ;
+            //~^ ERROR: outlives requirements can be inferred
+            struct Baz<'a, $b>(&'a &$b ()) where (): Sized, ;
+            //~^ ERROR: outlives requirements can be inferred
+        }
+    }
+    m!('b: 'a);
+}
+
+mod outer_lifetime_outside_colon_inside {
+    macro_rules! m {
+        ('b: $a:lifetime) => {
+            struct Foo<$a, 'b: $a>(&$a &'b ());
+            struct Bar<$a, 'b>(&$a &'b ()) where 'b: $a;
+            struct Baz<$a, 'b>(&$a &'b ()) where (): Sized, 'b: $a;
+        }
+    }
+    m!('b: 'a);
+}
+
+mod both_lifetimes_outside_colon_inside {
+    macro_rules! m {
+        ($b:lifetime: $a:lifetime) => {
+            struct Foo<$a, $b: $a>(&$a &$b ());
+            struct Bar<$a, $b>(&$a &$b ()) where $b: $a;
+            struct Baz<$a, $b>(&$a &$b ()) where (): Sized, $b: $a;
+        }
+    }
+    m!('b: 'a);
+}
+
+mod everything_outside {
+    macro_rules! m {
+        ($b:lifetime $colon:tt $a:lifetime) => {
+            struct Foo<$a, $b $colon $a>(&$a &$b ());
+            struct Bar<$a, $b>(&$a &$b ()) where $b $colon $a;
+            struct Baz<$a, $b>(&$a &$b ()) where (): Sized, $b $colon $a;
+        }
+    }
+    m!('b: 'a);
+}
+
+mod everything_outside_with_tt_inner {
+    macro_rules! m {
+        ($b:tt $colon:tt $a:lifetime) => {
+            struct Foo<$a, $b $colon $a>(&$a &$b ());
+            struct Bar<$a, $b>(&$a &$b ()) where $b $colon $a;
+            struct Baz<$a, $b>(&$a &$b ()) where (): Sized, $b $colon $a;
+        }
+    }
+    m!('b: 'a);
+}
+
+// FIXME: These should be consistent.
+mod everything_outside_with_tt_outer {
+    macro_rules! m {
+        ($b:lifetime $colon:tt $a:tt) => {
+            struct Foo<$a, $b >(&$a &$b ());
+            //~^ ERROR: outlives requirements can be inferred
+            struct Bar<$a, $b>(&$a &$b ()) where $b $colon $a;
+            struct Baz<$a, $b>(&$a &$b ()) where (): Sized, $b $colon $a;
+        }
+    }
+    m!('b: 'a);
+}
+
+mod everything_outside_with_tt_both {
+    macro_rules! m {
+        ($b:tt $colon:tt $a:tt) => {
+            struct Foo<$a, $b >(&$a &$b ());
+            //~^ ERROR: outlives requirements can be inferred
+            struct Bar<$a, $b>(&$a &$b ()) where ;
+            //~^ ERROR: outlives requirements can be inferred
+            struct Baz<$a, $b>(&$a &$b ()) where (): Sized, ;
+            //~^ ERROR: outlives requirements can be inferred
+        }
+    }
+    m!('b: 'a);
+}
+
+fn main() {}
diff --git a/tests/ui/rust-2018/edition-lint-infer-outlives-macro.rs b/tests/ui/rust-2018/edition-lint-infer-outlives-macro.rs
new file mode 100644
index 000000000..647906c2d
--- /dev/null
+++ b/tests/ui/rust-2018/edition-lint-infer-outlives-macro.rs
@@ -0,0 +1,137 @@
+// edition:2018
+// aux-build:edition-lint-infer-outlives-macro.rs
+// run-rustfix
+
+#![deny(explicit_outlives_requirements)]
+#![allow(dead_code)]
+
+#[macro_use]
+extern crate edition_lint_infer_outlives_macro;
+
+// Test that the lint does not fire if the predicate is from the local crate,
+// but all the bounds are from an external macro.
+macro_rules! make_foo {
+    ($a:tt) => {
+        struct Foo<$a, 'b: $a> {
+            foo: &$a &'b (),
+        }
+
+        struct FooWhere<$a, 'b> where 'b: $a {
+            foo: &$a &'b (),
+        }
+    }
+}
+
+gimme_a! {make_foo!}
+
+struct Bar<'a, 'b: 'a> {
+    //~^ ERROR: outlives requirements can be inferred
+    bar: &'a &'b (),
+}
+
+struct BarWhere<'a, 'b> where 'b: 'a {
+    //~^ ERROR: outlives requirements can be inferred
+    bar: &'a &'b (),
+}
+
+// Test that the lint *does* fire if the predicate is contained in a local macro.
+mod everything_inside {
+    macro_rules! m {
+        ('b: 'a) => {
+            struct Foo<'a, 'b: 'a>(&'a &'b ());
+            //~^ ERROR: outlives requirements can be inferred
+            struct Bar<'a, 'b>(&'a &'b ()) where 'b: 'a;
+            //~^ ERROR: outlives requirements can be inferred
+            struct Baz<'a, 'b>(&'a &'b ()) where (): Sized, 'b: 'a;
+            //~^ ERROR: outlives requirements can be inferred
+        };
+    }
+    m!('b: 'a);
+}
+
+mod inner_lifetime_outside_colon_inside {
+    macro_rules! m {
+        ($b:lifetime: 'a) => {
+            struct Foo<'a, $b: 'a>(&'a &$b ());
+            //~^ ERROR: outlives requirements can be inferred
+            struct Bar<'a, $b>(&'a &$b ()) where $b: 'a;
+            //~^ ERROR: outlives requirements can be inferred
+            struct Baz<'a, $b>(&'a &$b ()) where (): Sized, $b: 'a;
+            //~^ ERROR: outlives requirements can be inferred
+        }
+    }
+    m!('b: 'a);
+}
+
+mod outer_lifetime_outside_colon_inside {
+    macro_rules! m {
+        ('b: $a:lifetime) => {
+            struct Foo<$a, 'b: $a>(&$a &'b ());
+            struct Bar<$a, 'b>(&$a &'b ()) where 'b: $a;
+            struct Baz<$a, 'b>(&$a &'b ()) where (): Sized, 'b: $a;
+        }
+    }
+    m!('b: 'a);
+}
+
+mod both_lifetimes_outside_colon_inside {
+    macro_rules! m {
+        ($b:lifetime: $a:lifetime) => {
+            struct Foo<$a, $b: $a>(&$a &$b ());
+            struct Bar<$a, $b>(&$a &$b ()) where $b: $a;
+            struct Baz<$a, $b>(&$a &$b ()) where (): Sized, $b: $a;
+        }
+    }
+    m!('b: 'a);
+}
+
+mod everything_outside {
+    macro_rules! m {
+        ($b:lifetime $colon:tt $a:lifetime) => {
+            struct Foo<$a, $b $colon $a>(&$a &$b ());
+            struct Bar<$a, $b>(&$a &$b ()) where $b $colon $a;
+            struct Baz<$a, $b>(&$a &$b ()) where (): Sized, $b $colon $a;
+        }
+    }
+    m!('b: 'a);
+}
+
+mod everything_outside_with_tt_inner {
+    macro_rules! m {
+        ($b:tt $colon:tt $a:lifetime) => {
+            struct Foo<$a, $b $colon $a>(&$a &$b ());
+            struct Bar<$a, $b>(&$a &$b ()) where $b $colon $a;
+            struct Baz<$a, $b>(&$a &$b ()) where (): Sized, $b $colon $a;
+        }
+    }
+    m!('b: 'a);
+}
+
+// FIXME: These should be consistent.
+mod everything_outside_with_tt_outer {
+    macro_rules! m {
+        ($b:lifetime $colon:tt $a:tt) => {
+            struct Foo<$a, $b $colon $a>(&$a &$b ());
+            //~^ ERROR: outlives requirements can be inferred
+            struct Bar<$a, $b>(&$a &$b ()) where $b $colon $a;
+            struct Baz<$a, $b>(&$a &$b ()) where (): Sized, $b $colon $a;
+        }
+    }
+    m!('b: 'a);
+}
+
+mod everything_outside_with_tt_both {
+    macro_rules! m {
+        ($b:tt $colon:tt $a:tt) => {
+            struct Foo<$a, $b $colon $a>(&$a &$b ());
+            //~^ ERROR: outlives requirements can be inferred
+            struct Bar<$a, $b>(&$a &$b ()) where $b $colon $a;
+            //~^ ERROR: outlives requirements can be inferred
+            struct Baz<$a, $b>(&$a &$b ()) where (): Sized, $b $colon $a;
+            //~^ ERROR: outlives requirements can be inferred
+        }
+    }
+    m!('b: 'a);
+}
+
+fn main() {}
diff --git a/tests/ui/rust-2018/edition-lint-infer-outlives-macro.stderr b/tests/ui/rust-2018/edition-lint-infer-outlives-macro.stderr
new file mode 100644
index 000000000..734ae6879
--- /dev/null
+++ b/tests/ui/rust-2018/edition-lint-infer-outlives-macro.stderr
@@ -0,0 +1,110 @@
+error: outlives requirements can be inferred
+  --> $DIR/edition-lint-infer-outlives-macro.rs:27:18
+   |
+LL | struct Bar<'a, 'b: 'a> {
+   |                  ^^^^ help: remove this bound
+   |
+note: the lint level is defined here
+  --> $DIR/edition-lint-infer-outlives-macro.rs:5:9
+   |
+LL | #![deny(explicit_outlives_requirements)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: outlives requirements can be inferred
+  --> $DIR/edition-lint-infer-outlives-macro.rs:32:24
+   |
+LL | struct BarWhere<'a, 'b> where 'b: 'a {
+   |                        ^^^^^^^^^^^^^ help: remove this bound
+
+error: outlives requirements can be inferred
+  --> $DIR/edition-lint-infer-outlives-macro.rs:41:30
+   |
+LL |             struct Foo<'a, 'b: 'a>(&'a &'b ());
+   |                              ^^^^ help: remove this bound
+...
+LL |     m!('b: 'a);
+   |     ---------- in this macro invocation
+   |
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: outlives requirements can be inferred
+  --> $DIR/edition-lint-infer-outlives-macro.rs:43:44
+   |
+LL |             struct Bar<'a, 'b>(&'a &'b ()) where 'b: 'a;
+   |                                            ^^^^^^^^^^^^ help: remove this bound
+...
+LL |     m!('b: 'a);
+   |     ---------- in this macro invocation
+   |
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: outlives requirements can be inferred
+  --> $DIR/edition-lint-infer-outlives-macro.rs:45:61
+   |
+LL |             struct Baz<'a, 'b>(&'a &'b ()) where (): Sized, 'b: 'a;
+   |                                                             ^^^^^^ help: remove this bound
+...
+LL |     m!('b: 'a);
+   |     ---------- in this macro invocation
+   |
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: outlives requirements can be inferred
+  --> $DIR/edition-lint-infer-outlives-macro.rs:55:30
+   |
+LL |             struct Foo<'a, $b: 'a>(&'a &$b ());
+   |                              ^^^^ help: remove this bound
+...
+LL |     m!('b: 'a);
+   |     ---------- in this macro invocation
+   |
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: outlives requirements can be inferred
+  --> $DIR/edition-lint-infer-outlives-macro.rs:57:44
+   |
+LL |             struct Bar<'a, $b>(&'a &$b ()) where $b: 'a;
+   |                                            ^^^^^^^^^^^^ help: remove this bound
+...
+LL |     m!('b: 'a);
+   |     ---------- in this macro invocation
+   |
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: outlives requirements can be inferred
+  --> $DIR/edition-lint-infer-outlives-macro.rs:59:61
+   |
+LL |             struct Baz<'a, $b>(&'a &$b ()) where (): Sized, $b: 'a;
+   |                                                             ^^^^^^ help: remove this bound
+...
+LL |     m!('b: 'a);
+   |     ---------- in this macro invocation
+   |
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: outlives requirements can be inferred
+  --> $DIR/edition-lint-infer-outlives-macro.rs:114:31
+   |
+LL |             struct Foo<$a, $b $colon $a>(&$a &$b ());
+   |                               ^^^^^^^^^ help: remove this bound
+
+error: outlives requirements can be inferred
+  --> $DIR/edition-lint-infer-outlives-macro.rs:126:31
+   |
+LL |             struct Foo<$a, $b $colon $a>(&$a &$b ());
+   |                               ^^^^^^^^^ help: remove this bound
+
+error: outlives requirements can be inferred
+  --> $DIR/edition-lint-infer-outlives-macro.rs:128:50
+   |
+LL |             struct Bar<$a, $b>(&$a &$b ()) where $b $colon $a;
+   |                                                  ^^^^^^^^^^^^ help: remove this bound
+
+error: outlives requirements can be inferred
+  --> $DIR/edition-lint-infer-outlives-macro.rs:130:61
+   |
+LL |             struct Baz<$a, $b>(&$a &$b ()) where (): Sized, $b $colon $a;
+   |                                                             ^^^^^^^^^^^^ help: remove this bound
+
+error: aborting due to 12 previous errors
+
diff --git a/src/test/ui/rust-2018/edition-lint-infer-outlives-multispan.rs b/tests/ui/rust-2018/edition-lint-infer-outlives-multispan.rs
index 0b3de0df2..0b3de0df2 100644
--- a/src/test/ui/rust-2018/edition-lint-infer-outlives-multispan.rs
+++ b/tests/ui/rust-2018/edition-lint-infer-outlives-multispan.rs
diff --git a/src/test/ui/rust-2018/edition-lint-infer-outlives-multispan.stderr b/tests/ui/rust-2018/edition-lint-infer-outlives-multispan.stderr
index 251d74094..251d74094 100644
--- a/src/test/ui/rust-2018/edition-lint-infer-outlives-multispan.stderr
+++ b/tests/ui/rust-2018/edition-lint-infer-outlives-multispan.stderr
diff --git a/src/test/ui/rust-2018/edition-lint-infer-outlives.fixed b/tests/ui/rust-2018/edition-lint-infer-outlives.fixed
index 13645244d..13645244d 100644
--- a/src/test/ui/rust-2018/edition-lint-infer-outlives.fixed
+++ b/tests/ui/rust-2018/edition-lint-infer-outlives.fixed
diff --git a/src/test/ui/rust-2018/edition-lint-infer-outlives.rs b/tests/ui/rust-2018/edition-lint-infer-outlives.rs
index d9486ba66..d9486ba66 100644
--- a/src/test/ui/rust-2018/edition-lint-infer-outlives.rs
+++ b/tests/ui/rust-2018/edition-lint-infer-outlives.rs
diff --git a/src/test/ui/rust-2018/edition-lint-infer-outlives.stderr b/tests/ui/rust-2018/edition-lint-infer-outlives.stderr
index faa9f21e3..faa9f21e3 100644
--- a/src/test/ui/rust-2018/edition-lint-infer-outlives.stderr
+++ b/tests/ui/rust-2018/edition-lint-infer-outlives.stderr
diff --git a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed b/tests/ui/rust-2018/edition-lint-nested-empty-paths.fixed
index f25d46ce3..f25d46ce3 100644
--- a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed
+++ b/tests/ui/rust-2018/edition-lint-nested-empty-paths.fixed
diff --git a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs b/tests/ui/rust-2018/edition-lint-nested-empty-paths.rs
index 9be1680c1..9be1680c1 100644
--- a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs
+++ b/tests/ui/rust-2018/edition-lint-nested-empty-paths.rs
diff --git a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr b/tests/ui/rust-2018/edition-lint-nested-empty-paths.stderr
index 8769cbb35..8769cbb35 100644
--- a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr
+++ b/tests/ui/rust-2018/edition-lint-nested-empty-paths.stderr
diff --git a/src/test/ui/rust-2018/edition-lint-nested-paths.fixed b/tests/ui/rust-2018/edition-lint-nested-paths.fixed
index a04937ae8..a04937ae8 100644
--- a/src/test/ui/rust-2018/edition-lint-nested-paths.fixed
+++ b/tests/ui/rust-2018/edition-lint-nested-paths.fixed
diff --git a/src/test/ui/rust-2018/edition-lint-nested-paths.rs b/tests/ui/rust-2018/edition-lint-nested-paths.rs
index e622a8e24..e622a8e24 100644
--- a/src/test/ui/rust-2018/edition-lint-nested-paths.rs
+++ b/tests/ui/rust-2018/edition-lint-nested-paths.rs
diff --git a/src/test/ui/rust-2018/edition-lint-nested-paths.stderr b/tests/ui/rust-2018/edition-lint-nested-paths.stderr
index 354a6fe32..354a6fe32 100644
--- a/src/test/ui/rust-2018/edition-lint-nested-paths.stderr
+++ b/tests/ui/rust-2018/edition-lint-nested-paths.stderr
diff --git a/src/test/ui/rust-2018/edition-lint-paths-2018.rs b/tests/ui/rust-2018/edition-lint-paths-2018.rs
index 2005d8f4d..2005d8f4d 100644
--- a/src/test/ui/rust-2018/edition-lint-paths-2018.rs
+++ b/tests/ui/rust-2018/edition-lint-paths-2018.rs
diff --git a/src/test/ui/rust-2018/edition-lint-paths.fixed b/tests/ui/rust-2018/edition-lint-paths.fixed
index 47f82c51d..47f82c51d 100644
--- a/src/test/ui/rust-2018/edition-lint-paths.fixed
+++ b/tests/ui/rust-2018/edition-lint-paths.fixed
diff --git a/src/test/ui/rust-2018/edition-lint-paths.rs b/tests/ui/rust-2018/edition-lint-paths.rs
index e278983da..e278983da 100644
--- a/src/test/ui/rust-2018/edition-lint-paths.rs
+++ b/tests/ui/rust-2018/edition-lint-paths.rs
diff --git a/src/test/ui/rust-2018/edition-lint-paths.stderr b/tests/ui/rust-2018/edition-lint-paths.stderr
index 42652be94..42652be94 100644
--- a/src/test/ui/rust-2018/edition-lint-paths.stderr
+++ b/tests/ui/rust-2018/edition-lint-paths.stderr
diff --git a/src/test/ui/rust-2018/edition-lint-uninferable-outlives.rs b/tests/ui/rust-2018/edition-lint-uninferable-outlives.rs
index 950ad1f50..950ad1f50 100644
--- a/src/test/ui/rust-2018/edition-lint-uninferable-outlives.rs
+++ b/tests/ui/rust-2018/edition-lint-uninferable-outlives.rs
diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.fixed b/tests/ui/rust-2018/extern-crate-idiomatic-in-2018.fixed
index e51ce5d1d..e51ce5d1d 100644
--- a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.fixed
+++ b/tests/ui/rust-2018/extern-crate-idiomatic-in-2018.fixed
diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.rs b/tests/ui/rust-2018/extern-crate-idiomatic-in-2018.rs
index debbf085d..debbf085d 100644
--- a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.rs
+++ b/tests/ui/rust-2018/extern-crate-idiomatic-in-2018.rs
diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr b/tests/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr
index bb50ec3f5..bb50ec3f5 100644
--- a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr
+++ b/tests/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr
diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic.fixed b/tests/ui/rust-2018/extern-crate-idiomatic.fixed
index 3111b1dab..3111b1dab 100644
--- a/src/test/ui/rust-2018/extern-crate-idiomatic.fixed
+++ b/tests/ui/rust-2018/extern-crate-idiomatic.fixed
diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic.rs b/tests/ui/rust-2018/extern-crate-idiomatic.rs
index 3111b1dab..3111b1dab 100644
--- a/src/test/ui/rust-2018/extern-crate-idiomatic.rs
+++ b/tests/ui/rust-2018/extern-crate-idiomatic.rs
diff --git a/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.fixed b/tests/ui/rust-2018/extern-crate-referenced-by-self-path.fixed
index 11b9a67ed..11b9a67ed 100644
--- a/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.fixed
+++ b/tests/ui/rust-2018/extern-crate-referenced-by-self-path.fixed
diff --git a/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.rs b/tests/ui/rust-2018/extern-crate-referenced-by-self-path.rs
index 11b9a67ed..11b9a67ed 100644
--- a/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.rs
+++ b/tests/ui/rust-2018/extern-crate-referenced-by-self-path.rs
diff --git a/src/test/ui/rust-2018/extern-crate-rename.fixed b/tests/ui/rust-2018/extern-crate-rename.fixed
index ea832ef3e..ea832ef3e 100644
--- a/src/test/ui/rust-2018/extern-crate-rename.fixed
+++ b/tests/ui/rust-2018/extern-crate-rename.fixed
diff --git a/src/test/ui/rust-2018/extern-crate-rename.rs b/tests/ui/rust-2018/extern-crate-rename.rs
index b1f617dd8..b1f617dd8 100644
--- a/src/test/ui/rust-2018/extern-crate-rename.rs
+++ b/tests/ui/rust-2018/extern-crate-rename.rs
diff --git a/src/test/ui/rust-2018/extern-crate-rename.stderr b/tests/ui/rust-2018/extern-crate-rename.stderr
index eb040f5de..eb040f5de 100644
--- a/src/test/ui/rust-2018/extern-crate-rename.stderr
+++ b/tests/ui/rust-2018/extern-crate-rename.stderr
diff --git a/src/test/ui/rust-2018/extern-crate-submod.fixed b/tests/ui/rust-2018/extern-crate-submod.fixed
index 9b0b0dd8e..9b0b0dd8e 100644
--- a/src/test/ui/rust-2018/extern-crate-submod.fixed
+++ b/tests/ui/rust-2018/extern-crate-submod.fixed
diff --git a/src/test/ui/rust-2018/extern-crate-submod.rs b/tests/ui/rust-2018/extern-crate-submod.rs
index dfce9128c..dfce9128c 100644
--- a/src/test/ui/rust-2018/extern-crate-submod.rs
+++ b/tests/ui/rust-2018/extern-crate-submod.rs
diff --git a/src/test/ui/rust-2018/extern-crate-submod.stderr b/tests/ui/rust-2018/extern-crate-submod.stderr
index 1a9aa7578..1a9aa7578 100644
--- a/src/test/ui/rust-2018/extern-crate-submod.stderr
+++ b/tests/ui/rust-2018/extern-crate-submod.stderr
diff --git a/src/test/ui/rust-2018/future-proofing-locals.rs b/tests/ui/rust-2018/future-proofing-locals.rs
index 2c388cf37..2c388cf37 100644
--- a/src/test/ui/rust-2018/future-proofing-locals.rs
+++ b/tests/ui/rust-2018/future-proofing-locals.rs
diff --git a/src/test/ui/rust-2018/future-proofing-locals.stderr b/tests/ui/rust-2018/future-proofing-locals.stderr
index 7021489a6..7021489a6 100644
--- a/src/test/ui/rust-2018/future-proofing-locals.stderr
+++ b/tests/ui/rust-2018/future-proofing-locals.stderr
diff --git a/src/test/ui/rust-2018/issue-51008-1.rs b/tests/ui/rust-2018/issue-51008-1.rs
index 8ae5e8278..8ae5e8278 100644
--- a/src/test/ui/rust-2018/issue-51008-1.rs
+++ b/tests/ui/rust-2018/issue-51008-1.rs
diff --git a/src/test/ui/rust-2018/issue-51008.rs b/tests/ui/rust-2018/issue-51008.rs
index b62609e32..b62609e32 100644
--- a/src/test/ui/rust-2018/issue-51008.rs
+++ b/tests/ui/rust-2018/issue-51008.rs
diff --git a/src/test/ui/rust-2018/issue-52202-use-suggestions.rs b/tests/ui/rust-2018/issue-52202-use-suggestions.rs
index 1c0426808..1c0426808 100644
--- a/src/test/ui/rust-2018/issue-52202-use-suggestions.rs
+++ b/tests/ui/rust-2018/issue-52202-use-suggestions.rs
diff --git a/src/test/ui/rust-2018/issue-52202-use-suggestions.stderr b/tests/ui/rust-2018/issue-52202-use-suggestions.stderr
index 38cd9713d..38cd9713d 100644
--- a/src/test/ui/rust-2018/issue-52202-use-suggestions.stderr
+++ b/tests/ui/rust-2018/issue-52202-use-suggestions.stderr
diff --git a/src/test/ui/rust-2018/issue-54006.rs b/tests/ui/rust-2018/issue-54006.rs
index a7a4770fc..a7a4770fc 100644
--- a/src/test/ui/rust-2018/issue-54006.rs
+++ b/tests/ui/rust-2018/issue-54006.rs
diff --git a/src/test/ui/rust-2018/issue-54006.stderr b/tests/ui/rust-2018/issue-54006.stderr
index 1978138a6..1978138a6 100644
--- a/src/test/ui/rust-2018/issue-54006.stderr
+++ b/tests/ui/rust-2018/issue-54006.stderr
diff --git a/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.fixed b/tests/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.fixed
index d59243800..d59243800 100644
--- a/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.fixed
+++ b/tests/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.fixed
diff --git a/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.rs b/tests/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.rs
index a948baee5..a948baee5 100644
--- a/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.rs
+++ b/tests/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.rs
diff --git a/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.stderr b/tests/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.stderr
index 2ef97e7f2..2ef97e7f2 100644
--- a/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.stderr
+++ b/tests/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.stderr
diff --git a/src/test/ui/rust-2018/local-path-suggestions-2015.rs b/tests/ui/rust-2018/local-path-suggestions-2015.rs
index 32e9c0c33..32e9c0c33 100644
--- a/src/test/ui/rust-2018/local-path-suggestions-2015.rs
+++ b/tests/ui/rust-2018/local-path-suggestions-2015.rs
diff --git a/src/test/ui/rust-2018/local-path-suggestions-2015.stderr b/tests/ui/rust-2018/local-path-suggestions-2015.stderr
index 666864a18..666864a18 100644
--- a/src/test/ui/rust-2018/local-path-suggestions-2015.stderr
+++ b/tests/ui/rust-2018/local-path-suggestions-2015.stderr
diff --git a/src/test/ui/rust-2018/local-path-suggestions-2018.rs b/tests/ui/rust-2018/local-path-suggestions-2018.rs
index 5eafbb2c2..5eafbb2c2 100644
--- a/src/test/ui/rust-2018/local-path-suggestions-2018.rs
+++ b/tests/ui/rust-2018/local-path-suggestions-2018.rs
diff --git a/src/test/ui/rust-2018/local-path-suggestions-2018.stderr b/tests/ui/rust-2018/local-path-suggestions-2018.stderr
index 40f3d6bf1..40f3d6bf1 100644
--- a/src/test/ui/rust-2018/local-path-suggestions-2018.stderr
+++ b/tests/ui/rust-2018/local-path-suggestions-2018.stderr
diff --git a/src/test/ui/rust-2018/macro-use-warned-against.rs b/tests/ui/rust-2018/macro-use-warned-against.rs
index 72f2868e0..72f2868e0 100644
--- a/src/test/ui/rust-2018/macro-use-warned-against.rs
+++ b/tests/ui/rust-2018/macro-use-warned-against.rs
diff --git a/src/test/ui/rust-2018/macro-use-warned-against.stderr b/tests/ui/rust-2018/macro-use-warned-against.stderr
index 6b46f002e..6b46f002e 100644
--- a/src/test/ui/rust-2018/macro-use-warned-against.stderr
+++ b/tests/ui/rust-2018/macro-use-warned-against.stderr
diff --git a/src/test/ui/rust-2018/proc-macro-crate-in-paths.rs b/tests/ui/rust-2018/proc-macro-crate-in-paths.rs
index 2d4cb6514..2d4cb6514 100644
--- a/src/test/ui/rust-2018/proc-macro-crate-in-paths.rs
+++ b/tests/ui/rust-2018/proc-macro-crate-in-paths.rs
diff --git a/src/test/ui/rust-2018/remove-extern-crate.fixed b/tests/ui/rust-2018/remove-extern-crate.fixed
index 832632268..832632268 100644
--- a/src/test/ui/rust-2018/remove-extern-crate.fixed
+++ b/tests/ui/rust-2018/remove-extern-crate.fixed
diff --git a/src/test/ui/rust-2018/remove-extern-crate.rs b/tests/ui/rust-2018/remove-extern-crate.rs
index bbb84cd46..bbb84cd46 100644
--- a/src/test/ui/rust-2018/remove-extern-crate.rs
+++ b/tests/ui/rust-2018/remove-extern-crate.rs
diff --git a/src/test/ui/rust-2018/remove-extern-crate.stderr b/tests/ui/rust-2018/remove-extern-crate.stderr
index bde4c1808..bde4c1808 100644
--- a/src/test/ui/rust-2018/remove-extern-crate.stderr
+++ b/tests/ui/rust-2018/remove-extern-crate.stderr
diff --git a/src/test/ui/rust-2018/suggestions-not-always-applicable.fixed b/tests/ui/rust-2018/suggestions-not-always-applicable.fixed
index f5afbad9f..f5afbad9f 100644
--- a/src/test/ui/rust-2018/suggestions-not-always-applicable.fixed
+++ b/tests/ui/rust-2018/suggestions-not-always-applicable.fixed
diff --git a/src/test/ui/rust-2018/suggestions-not-always-applicable.rs b/tests/ui/rust-2018/suggestions-not-always-applicable.rs
index f5afbad9f..f5afbad9f 100644
--- a/src/test/ui/rust-2018/suggestions-not-always-applicable.rs
+++ b/tests/ui/rust-2018/suggestions-not-always-applicable.rs
diff --git a/src/test/ui/rust-2018/trait-import-suggestions.rs b/tests/ui/rust-2018/trait-import-suggestions.rs
index 9c67c3f4b..9c67c3f4b 100644
--- a/src/test/ui/rust-2018/trait-import-suggestions.rs
+++ b/tests/ui/rust-2018/trait-import-suggestions.rs
diff --git a/src/test/ui/rust-2018/trait-import-suggestions.stderr b/tests/ui/rust-2018/trait-import-suggestions.stderr
index 6454b6045..6454b6045 100644
--- a/src/test/ui/rust-2018/trait-import-suggestions.stderr
+++ b/tests/ui/rust-2018/trait-import-suggestions.stderr
diff --git a/src/test/ui/rust-2018/try-ident.fixed b/tests/ui/rust-2018/try-ident.fixed
index 985348665..985348665 100644
--- a/src/test/ui/rust-2018/try-ident.fixed
+++ b/tests/ui/rust-2018/try-ident.fixed
diff --git a/src/test/ui/rust-2018/try-ident.rs b/tests/ui/rust-2018/try-ident.rs
index 2c02b7596..2c02b7596 100644
--- a/src/test/ui/rust-2018/try-ident.rs
+++ b/tests/ui/rust-2018/try-ident.rs
diff --git a/src/test/ui/rust-2018/try-ident.stderr b/tests/ui/rust-2018/try-ident.stderr
index 74015ac9d..74015ac9d 100644
--- a/src/test/ui/rust-2018/try-ident.stderr
+++ b/tests/ui/rust-2018/try-ident.stderr
diff --git a/src/test/ui/rust-2018/try-macro.fixed b/tests/ui/rust-2018/try-macro.fixed
index 3308870f6..3308870f6 100644
--- a/src/test/ui/rust-2018/try-macro.fixed
+++ b/tests/ui/rust-2018/try-macro.fixed
diff --git a/src/test/ui/rust-2018/try-macro.rs b/tests/ui/rust-2018/try-macro.rs
index 69e87a1ff..69e87a1ff 100644
--- a/src/test/ui/rust-2018/try-macro.rs
+++ b/tests/ui/rust-2018/try-macro.rs
diff --git a/src/test/ui/rust-2018/try-macro.stderr b/tests/ui/rust-2018/try-macro.stderr
index 760378f09..760378f09 100644
--- a/src/test/ui/rust-2018/try-macro.stderr
+++ b/tests/ui/rust-2018/try-macro.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.rs b/tests/ui/rust-2018/uniform-paths/ambiguity-macros-nested.rs
index 678b4774d..678b4774d 100644
--- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.rs
+++ b/tests/ui/rust-2018/uniform-paths/ambiguity-macros-nested.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr b/tests/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr
index 7e008d465..7e008d465 100644
--- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr
+++ b/tests/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.rs b/tests/ui/rust-2018/uniform-paths/ambiguity-macros.rs
index 56ea726d7..56ea726d7 100644
--- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.rs
+++ b/tests/ui/rust-2018/uniform-paths/ambiguity-macros.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr b/tests/ui/rust-2018/uniform-paths/ambiguity-macros.stderr
index 771d2c10c..771d2c10c 100644
--- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr
+++ b/tests/ui/rust-2018/uniform-paths/ambiguity-macros.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.rs b/tests/ui/rust-2018/uniform-paths/ambiguity-nested.rs
index 50c8fc822..50c8fc822 100644
--- a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.rs
+++ b/tests/ui/rust-2018/uniform-paths/ambiguity-nested.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.stderr b/tests/ui/rust-2018/uniform-paths/ambiguity-nested.stderr
index defb16f79..defb16f79 100644
--- a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.stderr
+++ b/tests/ui/rust-2018/uniform-paths/ambiguity-nested.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity.rs b/tests/ui/rust-2018/uniform-paths/ambiguity.rs
index 60f77a1c6..60f77a1c6 100644
--- a/src/test/ui/rust-2018/uniform-paths/ambiguity.rs
+++ b/tests/ui/rust-2018/uniform-paths/ambiguity.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity.stderr b/tests/ui/rust-2018/uniform-paths/ambiguity.stderr
index 2d735c7e3..2d735c7e3 100644
--- a/src/test/ui/rust-2018/uniform-paths/ambiguity.stderr
+++ b/tests/ui/rust-2018/uniform-paths/ambiguity.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/auxiliary/cross-crate.rs b/tests/ui/rust-2018/uniform-paths/auxiliary/cross-crate.rs
index 4aa5d1870..4aa5d1870 100644
--- a/src/test/ui/rust-2018/uniform-paths/auxiliary/cross-crate.rs
+++ b/tests/ui/rust-2018/uniform-paths/auxiliary/cross-crate.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-55779-extern-trait.rs b/tests/ui/rust-2018/uniform-paths/auxiliary/issue-55779-extern-trait.rs
index 1ce9841c1..1ce9841c1 100644
--- a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-55779-extern-trait.rs
+++ b/tests/ui/rust-2018/uniform-paths/auxiliary/issue-55779-extern-trait.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596-2.rs b/tests/ui/rust-2018/uniform-paths/auxiliary/issue-56596-2.rs
index db723075f..db723075f 100644
--- a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596-2.rs
+++ b/tests/ui/rust-2018/uniform-paths/auxiliary/issue-56596-2.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596.rs b/tests/ui/rust-2018/uniform-paths/auxiliary/issue-56596.rs
index bc010a3dd..bc010a3dd 100644
--- a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596.rs
+++ b/tests/ui/rust-2018/uniform-paths/auxiliary/issue-56596.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-87932-a.rs b/tests/ui/rust-2018/uniform-paths/auxiliary/issue-87932-a.rs
index 8fd2d77be..8fd2d77be 100644
--- a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-87932-a.rs
+++ b/tests/ui/rust-2018/uniform-paths/auxiliary/issue-87932-a.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.rs b/tests/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.rs
index 3f5897901..3f5897901 100644
--- a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.rs
+++ b/tests/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.stderr b/tests/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.stderr
index 3d45a8140..3d45a8140 100644
--- a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.stderr
+++ b/tests/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.rs b/tests/ui/rust-2018/uniform-paths/block-scoped-shadow.rs
index 828ee4fe4..828ee4fe4 100644
--- a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.rs
+++ b/tests/ui/rust-2018/uniform-paths/block-scoped-shadow.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.stderr b/tests/ui/rust-2018/uniform-paths/block-scoped-shadow.stderr
index b068312ce..b068312ce 100644
--- a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.stderr
+++ b/tests/ui/rust-2018/uniform-paths/block-scoped-shadow.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/cross-crate.rs b/tests/ui/rust-2018/uniform-paths/cross-crate.rs
index 0ca7fa37a..0ca7fa37a 100644
--- a/src/test/ui/rust-2018/uniform-paths/cross-crate.rs
+++ b/tests/ui/rust-2018/uniform-paths/cross-crate.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/cross-crate.stderr b/tests/ui/rust-2018/uniform-paths/cross-crate.stderr
index 45f77a0c9..45f77a0c9 100644
--- a/src/test/ui/rust-2018/uniform-paths/cross-crate.stderr
+++ b/tests/ui/rust-2018/uniform-paths/cross-crate.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/deadlock.rs b/tests/ui/rust-2018/uniform-paths/deadlock.rs
index 2427bde6d..2427bde6d 100644
--- a/src/test/ui/rust-2018/uniform-paths/deadlock.rs
+++ b/tests/ui/rust-2018/uniform-paths/deadlock.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/deadlock.stderr b/tests/ui/rust-2018/uniform-paths/deadlock.stderr
index 8b9863948..8b9863948 100644
--- a/src/test/ui/rust-2018/uniform-paths/deadlock.stderr
+++ b/tests/ui/rust-2018/uniform-paths/deadlock.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/fn-local-enum.rs b/tests/ui/rust-2018/uniform-paths/fn-local-enum.rs
index c6525869b..c6525869b 100644
--- a/src/test/ui/rust-2018/uniform-paths/fn-local-enum.rs
+++ b/tests/ui/rust-2018/uniform-paths/fn-local-enum.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/from-decl-macro.rs b/tests/ui/rust-2018/uniform-paths/from-decl-macro.rs
index 9af520a07..9af520a07 100644
--- a/src/test/ui/rust-2018/uniform-paths/from-decl-macro.rs
+++ b/tests/ui/rust-2018/uniform-paths/from-decl-macro.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/issue-54253.rs b/tests/ui/rust-2018/uniform-paths/issue-54253.rs
index 7db469945..7db469945 100644
--- a/src/test/ui/rust-2018/uniform-paths/issue-54253.rs
+++ b/tests/ui/rust-2018/uniform-paths/issue-54253.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/issue-54253.stderr b/tests/ui/rust-2018/uniform-paths/issue-54253.stderr
index adde63590..adde63590 100644
--- a/src/test/ui/rust-2018/uniform-paths/issue-54253.stderr
+++ b/tests/ui/rust-2018/uniform-paths/issue-54253.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/issue-55779.rs b/tests/ui/rust-2018/uniform-paths/issue-55779.rs
index 0af17a89b..0af17a89b 100644
--- a/src/test/ui/rust-2018/uniform-paths/issue-55779.rs
+++ b/tests/ui/rust-2018/uniform-paths/issue-55779.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/issue-56596-2.rs b/tests/ui/rust-2018/uniform-paths/issue-56596-2.rs
index 9ea7e496d..9ea7e496d 100644
--- a/src/test/ui/rust-2018/uniform-paths/issue-56596-2.rs
+++ b/tests/ui/rust-2018/uniform-paths/issue-56596-2.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/issue-56596.rs b/tests/ui/rust-2018/uniform-paths/issue-56596.rs
index ec5bb656a..ec5bb656a 100644
--- a/src/test/ui/rust-2018/uniform-paths/issue-56596.rs
+++ b/tests/ui/rust-2018/uniform-paths/issue-56596.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/issue-56596.stderr b/tests/ui/rust-2018/uniform-paths/issue-56596.stderr
index 8b8ab26dc..8b8ab26dc 100644
--- a/src/test/ui/rust-2018/uniform-paths/issue-56596.stderr
+++ b/tests/ui/rust-2018/uniform-paths/issue-56596.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/issue-87932.rs b/tests/ui/rust-2018/uniform-paths/issue-87932.rs
index 70a641d8a..70a641d8a 100644
--- a/src/test/ui/rust-2018/uniform-paths/issue-87932.rs
+++ b/tests/ui/rust-2018/uniform-paths/issue-87932.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/issue-87932.stderr b/tests/ui/rust-2018/uniform-paths/issue-87932.stderr
index b52720ae3..b52720ae3 100644
--- a/src/test/ui/rust-2018/uniform-paths/issue-87932.stderr
+++ b/tests/ui/rust-2018/uniform-paths/issue-87932.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/macro-rules.rs b/tests/ui/rust-2018/uniform-paths/macro-rules.rs
index 2d9a6a9a9..2d9a6a9a9 100644
--- a/src/test/ui/rust-2018/uniform-paths/macro-rules.rs
+++ b/tests/ui/rust-2018/uniform-paths/macro-rules.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/macro-rules.stderr b/tests/ui/rust-2018/uniform-paths/macro-rules.stderr
index 9f8c928c3..9f8c928c3 100644
--- a/src/test/ui/rust-2018/uniform-paths/macro-rules.stderr
+++ b/tests/ui/rust-2018/uniform-paths/macro-rules.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/prelude-fail-2.rs b/tests/ui/rust-2018/uniform-paths/prelude-fail-2.rs
index 44da71de0..44da71de0 100644
--- a/src/test/ui/rust-2018/uniform-paths/prelude-fail-2.rs
+++ b/tests/ui/rust-2018/uniform-paths/prelude-fail-2.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/prelude-fail-2.stderr b/tests/ui/rust-2018/uniform-paths/prelude-fail-2.stderr
index 908bb4985..908bb4985 100644
--- a/src/test/ui/rust-2018/uniform-paths/prelude-fail-2.stderr
+++ b/tests/ui/rust-2018/uniform-paths/prelude-fail-2.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/prelude-fail.rs b/tests/ui/rust-2018/uniform-paths/prelude-fail.rs
index 48c33d720..48c33d720 100644
--- a/src/test/ui/rust-2018/uniform-paths/prelude-fail.rs
+++ b/tests/ui/rust-2018/uniform-paths/prelude-fail.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/prelude-fail.stderr b/tests/ui/rust-2018/uniform-paths/prelude-fail.stderr
index 97d4c7367..97d4c7367 100644
--- a/src/test/ui/rust-2018/uniform-paths/prelude-fail.stderr
+++ b/tests/ui/rust-2018/uniform-paths/prelude-fail.stderr
diff --git a/src/test/ui/rust-2018/uniform-paths/prelude.rs b/tests/ui/rust-2018/uniform-paths/prelude.rs
index 65763614c..65763614c 100644
--- a/src/test/ui/rust-2018/uniform-paths/prelude.rs
+++ b/tests/ui/rust-2018/uniform-paths/prelude.rs
diff --git a/src/test/ui/rust-2018/uniform-paths/redundant.rs b/tests/ui/rust-2018/uniform-paths/redundant.rs
index fd7fc7fbd..fd7fc7fbd 100644
--- a/src/test/ui/rust-2018/uniform-paths/redundant.rs
+++ b/tests/ui/rust-2018/uniform-paths/redundant.rs
diff --git a/src/test/ui/rust-2018/unresolved-asterisk-imports.rs b/tests/ui/rust-2018/unresolved-asterisk-imports.rs
index ad1064570..ad1064570 100644
--- a/src/test/ui/rust-2018/unresolved-asterisk-imports.rs
+++ b/tests/ui/rust-2018/unresolved-asterisk-imports.rs
diff --git a/src/test/ui/rust-2018/unresolved-asterisk-imports.stderr b/tests/ui/rust-2018/unresolved-asterisk-imports.stderr
index 09e9edc63..09e9edc63 100644
--- a/src/test/ui/rust-2018/unresolved-asterisk-imports.stderr
+++ b/tests/ui/rust-2018/unresolved-asterisk-imports.stderr
diff --git a/src/test/ui/rust-2021/array-into-iter-ambiguous.fixed b/tests/ui/rust-2021/array-into-iter-ambiguous.fixed
index 76f661bae..76f661bae 100644
--- a/src/test/ui/rust-2021/array-into-iter-ambiguous.fixed
+++ b/tests/ui/rust-2021/array-into-iter-ambiguous.fixed
diff --git a/src/test/ui/rust-2021/array-into-iter-ambiguous.rs b/tests/ui/rust-2021/array-into-iter-ambiguous.rs
index 83fbf8f6c..83fbf8f6c 100644
--- a/src/test/ui/rust-2021/array-into-iter-ambiguous.rs
+++ b/tests/ui/rust-2021/array-into-iter-ambiguous.rs
diff --git a/src/test/ui/rust-2021/array-into-iter-ambiguous.stderr b/tests/ui/rust-2021/array-into-iter-ambiguous.stderr
index 2a724bd30..2a724bd30 100644
--- a/src/test/ui/rust-2021/array-into-iter-ambiguous.stderr
+++ b/tests/ui/rust-2021/array-into-iter-ambiguous.stderr
diff --git a/src/test/ui/rust-2021/auxiliary/reserved-prefixes-macro-2018.rs b/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2018.rs
index eb301e5e1..eb301e5e1 100644
--- a/src/test/ui/rust-2021/auxiliary/reserved-prefixes-macro-2018.rs
+++ b/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2018.rs
diff --git a/src/test/ui/rust-2021/auxiliary/reserved-prefixes-macro-2021.rs b/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2021.rs
index 691bfdc15..691bfdc15 100644
--- a/src/test/ui/rust-2021/auxiliary/reserved-prefixes-macro-2021.rs
+++ b/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2021.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.fixed b/tests/ui/rust-2021/future-prelude-collision-generic-trait.fixed
index a1b6f5b16..a1b6f5b16 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.fixed
+++ b/tests/ui/rust-2021/future-prelude-collision-generic-trait.fixed
diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.rs b/tests/ui/rust-2021/future-prelude-collision-generic-trait.rs
index 142ba5520..142ba5520 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-generic-trait.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.stderr b/tests/ui/rust-2021/future-prelude-collision-generic-trait.stderr
index f38da132b..f38da132b 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision-generic-trait.stderr
diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic.fixed b/tests/ui/rust-2021/future-prelude-collision-generic.fixed
index 1bb9ba377..1bb9ba377 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-generic.fixed
+++ b/tests/ui/rust-2021/future-prelude-collision-generic.fixed
diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic.rs b/tests/ui/rust-2021/future-prelude-collision-generic.rs
index d7f8affc6..d7f8affc6 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-generic.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-generic.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic.stderr b/tests/ui/rust-2021/future-prelude-collision-generic.stderr
index 9893b3eba..9893b3eba 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-generic.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision-generic.stderr
diff --git a/src/test/ui/rust-2021/future-prelude-collision-imported.fixed b/tests/ui/rust-2021/future-prelude-collision-imported.fixed
index 15ccff749..15ccff749 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-imported.fixed
+++ b/tests/ui/rust-2021/future-prelude-collision-imported.fixed
diff --git a/src/test/ui/rust-2021/future-prelude-collision-imported.rs b/tests/ui/rust-2021/future-prelude-collision-imported.rs
index cdffcaf75..cdffcaf75 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-imported.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-imported.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-imported.stderr b/tests/ui/rust-2021/future-prelude-collision-imported.stderr
index c1d72d0df..c1d72d0df 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-imported.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision-imported.stderr
diff --git a/src/test/ui/rust-2021/future-prelude-collision-macros.fixed b/tests/ui/rust-2021/future-prelude-collision-macros.fixed
index a97dc176e..a97dc176e 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-macros.fixed
+++ b/tests/ui/rust-2021/future-prelude-collision-macros.fixed
diff --git a/src/test/ui/rust-2021/future-prelude-collision-macros.rs b/tests/ui/rust-2021/future-prelude-collision-macros.rs
index 82484b5b3..82484b5b3 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-macros.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-macros.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-macros.stderr b/tests/ui/rust-2021/future-prelude-collision-macros.stderr
index 4d4a07699..4d4a07699 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-macros.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision-macros.stderr
diff --git a/src/test/ui/rust-2021/future-prelude-collision-shadow.rs b/tests/ui/rust-2021/future-prelude-collision-shadow.rs
index 27891a8d1..27891a8d1 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-shadow.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-shadow.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-shadow.stderr b/tests/ui/rust-2021/future-prelude-collision-shadow.stderr
index 3d21b735a..3d21b735a 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-shadow.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision-shadow.stderr
diff --git a/src/test/ui/rust-2021/future-prelude-collision-turbofish.fixed b/tests/ui/rust-2021/future-prelude-collision-turbofish.fixed
index 3e76fced7..3e76fced7 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-turbofish.fixed
+++ b/tests/ui/rust-2021/future-prelude-collision-turbofish.fixed
diff --git a/src/test/ui/rust-2021/future-prelude-collision-turbofish.rs b/tests/ui/rust-2021/future-prelude-collision-turbofish.rs
index abb292ef9..abb292ef9 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-turbofish.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-turbofish.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-turbofish.stderr b/tests/ui/rust-2021/future-prelude-collision-turbofish.stderr
index c0ef80fd8..c0ef80fd8 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-turbofish.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision-turbofish.stderr
diff --git a/src/test/ui/rust-2021/future-prelude-collision-unneeded.rs b/tests/ui/rust-2021/future-prelude-collision-unneeded.rs
index 247d5884b..247d5884b 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-unneeded.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-unneeded.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision.fixed b/tests/ui/rust-2021/future-prelude-collision.fixed
index 43b0ec1c3..43b0ec1c3 100644
--- a/src/test/ui/rust-2021/future-prelude-collision.fixed
+++ b/tests/ui/rust-2021/future-prelude-collision.fixed
diff --git a/src/test/ui/rust-2021/future-prelude-collision.rs b/tests/ui/rust-2021/future-prelude-collision.rs
index 4c7a47ffb..4c7a47ffb 100644
--- a/src/test/ui/rust-2021/future-prelude-collision.rs
+++ b/tests/ui/rust-2021/future-prelude-collision.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision.stderr b/tests/ui/rust-2021/future-prelude-collision.stderr
index cae113ff7..cae113ff7 100644
--- a/src/test/ui/rust-2021/future-prelude-collision.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision.stderr
diff --git a/src/test/ui/rust-2021/generic-type-collision.fixed b/tests/ui/rust-2021/generic-type-collision.fixed
index feba7d19b..feba7d19b 100644
--- a/src/test/ui/rust-2021/generic-type-collision.fixed
+++ b/tests/ui/rust-2021/generic-type-collision.fixed
diff --git a/src/test/ui/rust-2021/generic-type-collision.rs b/tests/ui/rust-2021/generic-type-collision.rs
index 335e7e520..335e7e520 100644
--- a/src/test/ui/rust-2021/generic-type-collision.rs
+++ b/tests/ui/rust-2021/generic-type-collision.rs
diff --git a/src/test/ui/rust-2021/generic-type-collision.stderr b/tests/ui/rust-2021/generic-type-collision.stderr
index 1ec61044f..1ec61044f 100644
--- a/src/test/ui/rust-2021/generic-type-collision.stderr
+++ b/tests/ui/rust-2021/generic-type-collision.stderr
diff --git a/src/test/ui/rust-2021/inherent-dyn-collision.fixed b/tests/ui/rust-2021/inherent-dyn-collision.fixed
index 5789a9039..5789a9039 100644
--- a/src/test/ui/rust-2021/inherent-dyn-collision.fixed
+++ b/tests/ui/rust-2021/inherent-dyn-collision.fixed
diff --git a/src/test/ui/rust-2021/inherent-dyn-collision.rs b/tests/ui/rust-2021/inherent-dyn-collision.rs
index a3893c033..a3893c033 100644
--- a/src/test/ui/rust-2021/inherent-dyn-collision.rs
+++ b/tests/ui/rust-2021/inherent-dyn-collision.rs
diff --git a/src/test/ui/rust-2021/inherent-dyn-collision.stderr b/tests/ui/rust-2021/inherent-dyn-collision.stderr
index f5905574a..f5905574a 100644
--- a/src/test/ui/rust-2021/inherent-dyn-collision.stderr
+++ b/tests/ui/rust-2021/inherent-dyn-collision.stderr
diff --git a/src/test/ui/rust-2021/inherent-method-collision.rs b/tests/ui/rust-2021/inherent-method-collision.rs
index 507105207..507105207 100644
--- a/src/test/ui/rust-2021/inherent-method-collision.rs
+++ b/tests/ui/rust-2021/inherent-method-collision.rs
diff --git a/src/test/ui/rust-2021/panic.rs b/tests/ui/rust-2021/panic.rs
index 394fc3c8f..394fc3c8f 100644
--- a/src/test/ui/rust-2021/panic.rs
+++ b/tests/ui/rust-2021/panic.rs
diff --git a/src/test/ui/rust-2021/panic.stderr b/tests/ui/rust-2021/panic.stderr
index 40b62d279..40b62d279 100644
--- a/src/test/ui/rust-2021/panic.stderr
+++ b/tests/ui/rust-2021/panic.stderr
diff --git a/src/test/ui/rust-2021/prelude2021.rs b/tests/ui/rust-2021/prelude2021.rs
index a63b6fcf2..a63b6fcf2 100644
--- a/src/test/ui/rust-2021/prelude2021.rs
+++ b/tests/ui/rust-2021/prelude2021.rs
diff --git a/src/test/ui/rust-2021/reserved-prefixes-migration.fixed b/tests/ui/rust-2021/reserved-prefixes-migration.fixed
index eed2f313a..eed2f313a 100644
--- a/src/test/ui/rust-2021/reserved-prefixes-migration.fixed
+++ b/tests/ui/rust-2021/reserved-prefixes-migration.fixed
diff --git a/src/test/ui/rust-2021/reserved-prefixes-migration.rs b/tests/ui/rust-2021/reserved-prefixes-migration.rs
index 0565db793..0565db793 100644
--- a/src/test/ui/rust-2021/reserved-prefixes-migration.rs
+++ b/tests/ui/rust-2021/reserved-prefixes-migration.rs
diff --git a/src/test/ui/rust-2021/reserved-prefixes-migration.stderr b/tests/ui/rust-2021/reserved-prefixes-migration.stderr
index 20914d1b9..20914d1b9 100644
--- a/src/test/ui/rust-2021/reserved-prefixes-migration.stderr
+++ b/tests/ui/rust-2021/reserved-prefixes-migration.stderr
diff --git a/src/test/ui/rust-2021/reserved-prefixes-via-macro-2.rs b/tests/ui/rust-2021/reserved-prefixes-via-macro-2.rs
index 74f206606..74f206606 100644
--- a/src/test/ui/rust-2021/reserved-prefixes-via-macro-2.rs
+++ b/tests/ui/rust-2021/reserved-prefixes-via-macro-2.rs
diff --git a/src/test/ui/rust-2021/reserved-prefixes-via-macro-2.stderr b/tests/ui/rust-2021/reserved-prefixes-via-macro-2.stderr
index ae7c5d60c..ae7c5d60c 100644
--- a/src/test/ui/rust-2021/reserved-prefixes-via-macro-2.stderr
+++ b/tests/ui/rust-2021/reserved-prefixes-via-macro-2.stderr
diff --git a/src/test/ui/rust-2021/reserved-prefixes-via-macro.rs b/tests/ui/rust-2021/reserved-prefixes-via-macro.rs
index 110b6d64c..110b6d64c 100644
--- a/src/test/ui/rust-2021/reserved-prefixes-via-macro.rs
+++ b/tests/ui/rust-2021/reserved-prefixes-via-macro.rs
diff --git a/src/test/ui/rust-2021/reserved-prefixes.rs b/tests/ui/rust-2021/reserved-prefixes.rs
index 1994f25b6..1994f25b6 100644
--- a/src/test/ui/rust-2021/reserved-prefixes.rs
+++ b/tests/ui/rust-2021/reserved-prefixes.rs
diff --git a/src/test/ui/rust-2021/reserved-prefixes.stderr b/tests/ui/rust-2021/reserved-prefixes.stderr
index 807d6d98b..807d6d98b 100644
--- a/src/test/ui/rust-2021/reserved-prefixes.stderr
+++ b/tests/ui/rust-2021/reserved-prefixes.stderr
diff --git a/src/test/ui/rustc-error.rs b/tests/ui/rustc-error.rs
index 69d57948f..69d57948f 100644
--- a/src/test/ui/rustc-error.rs
+++ b/tests/ui/rustc-error.rs
diff --git a/src/test/ui/rustc-error.stderr b/tests/ui/rustc-error.stderr
index de27e9b8f..de27e9b8f 100644
--- a/src/test/ui/rustc-error.stderr
+++ b/tests/ui/rustc-error.stderr
diff --git a/src/test/ui/rustc-rust-log.rs b/tests/ui/rustc-rust-log.rs
index 52e7dcf44..52e7dcf44 100644
--- a/src/test/ui/rustc-rust-log.rs
+++ b/tests/ui/rustc-rust-log.rs
diff --git a/src/test/ui/rustdoc/README.md b/tests/ui/rustdoc/README.md
index 1c98ab038..1c98ab038 100644
--- a/src/test/ui/rustdoc/README.md
+++ b/tests/ui/rustdoc/README.md
diff --git a/src/test/ui/rustdoc/cfg-rustdoc.rs b/tests/ui/rustdoc/cfg-rustdoc.rs
index dd8e1ed97..dd8e1ed97 100644
--- a/src/test/ui/rustdoc/cfg-rustdoc.rs
+++ b/tests/ui/rustdoc/cfg-rustdoc.rs
diff --git a/src/test/ui/rustdoc/cfg-rustdoc.stderr b/tests/ui/rustdoc/cfg-rustdoc.stderr
index c687d1869..c687d1869 100644
--- a/src/test/ui/rustdoc/cfg-rustdoc.stderr
+++ b/tests/ui/rustdoc/cfg-rustdoc.stderr
diff --git a/src/test/ui/rustdoc/check-doc-alias-attr-location.rs b/tests/ui/rustdoc/check-doc-alias-attr-location.rs
index 10609e5d8..10609e5d8 100644
--- a/src/test/ui/rustdoc/check-doc-alias-attr-location.rs
+++ b/tests/ui/rustdoc/check-doc-alias-attr-location.rs
diff --git a/src/test/ui/rustdoc/check-doc-alias-attr-location.stderr b/tests/ui/rustdoc/check-doc-alias-attr-location.stderr
index 23c93a4ed..23c93a4ed 100644
--- a/src/test/ui/rustdoc/check-doc-alias-attr-location.stderr
+++ b/tests/ui/rustdoc/check-doc-alias-attr-location.stderr
diff --git a/src/test/ui/rustdoc/check-doc-alias-attr.rs b/tests/ui/rustdoc/check-doc-alias-attr.rs
index 719b98604..719b98604 100644
--- a/src/test/ui/rustdoc/check-doc-alias-attr.rs
+++ b/tests/ui/rustdoc/check-doc-alias-attr.rs
diff --git a/src/test/ui/rustdoc/check-doc-alias-attr.stderr b/tests/ui/rustdoc/check-doc-alias-attr.stderr
index 250568be3..250568be3 100644
--- a/src/test/ui/rustdoc/check-doc-alias-attr.stderr
+++ b/tests/ui/rustdoc/check-doc-alias-attr.stderr
diff --git a/src/test/ui/rustdoc/deny-invalid-doc-attrs.rs b/tests/ui/rustdoc/deny-invalid-doc-attrs.rs
index 02e9c6791..02e9c6791 100644
--- a/src/test/ui/rustdoc/deny-invalid-doc-attrs.rs
+++ b/tests/ui/rustdoc/deny-invalid-doc-attrs.rs
diff --git a/src/test/ui/rustdoc/deny-invalid-doc-attrs.stderr b/tests/ui/rustdoc/deny-invalid-doc-attrs.stderr
index e9a4c1dd5..e9a4c1dd5 100644
--- a/src/test/ui/rustdoc/deny-invalid-doc-attrs.stderr
+++ b/tests/ui/rustdoc/deny-invalid-doc-attrs.stderr
diff --git a/src/test/ui/rustdoc/doc-alias-crate-level.rs b/tests/ui/rustdoc/doc-alias-crate-level.rs
index c7783aae5..c7783aae5 100644
--- a/src/test/ui/rustdoc/doc-alias-crate-level.rs
+++ b/tests/ui/rustdoc/doc-alias-crate-level.rs
diff --git a/src/test/ui/rustdoc/doc-alias-crate-level.stderr b/tests/ui/rustdoc/doc-alias-crate-level.stderr
index bd32609ad..bd32609ad 100644
--- a/src/test/ui/rustdoc/doc-alias-crate-level.stderr
+++ b/tests/ui/rustdoc/doc-alias-crate-level.stderr
diff --git a/src/test/ui/rustdoc/doc-alias-same-name.rs b/tests/ui/rustdoc/doc-alias-same-name.rs
index da97c2676..da97c2676 100644
--- a/src/test/ui/rustdoc/doc-alias-same-name.rs
+++ b/tests/ui/rustdoc/doc-alias-same-name.rs
diff --git a/src/test/ui/rustdoc/doc-alias-same-name.stderr b/tests/ui/rustdoc/doc-alias-same-name.stderr
index 5ba09a2ea..5ba09a2ea 100644
--- a/src/test/ui/rustdoc/doc-alias-same-name.stderr
+++ b/tests/ui/rustdoc/doc-alias-same-name.stderr
diff --git a/src/test/ui/rustdoc/doc-inline-extern-crate.rs b/tests/ui/rustdoc/doc-inline-extern-crate.rs
index 0eb4c1490..0eb4c1490 100644
--- a/src/test/ui/rustdoc/doc-inline-extern-crate.rs
+++ b/tests/ui/rustdoc/doc-inline-extern-crate.rs
diff --git a/src/test/ui/rustdoc/doc-inline-extern-crate.stderr b/tests/ui/rustdoc/doc-inline-extern-crate.stderr
index 41518295b..41518295b 100644
--- a/src/test/ui/rustdoc/doc-inline-extern-crate.stderr
+++ b/tests/ui/rustdoc/doc-inline-extern-crate.stderr
diff --git a/src/test/ui/rustdoc/doc-test-attr-pass.rs b/tests/ui/rustdoc/doc-test-attr-pass.rs
index 7884addd1..7884addd1 100644
--- a/src/test/ui/rustdoc/doc-test-attr-pass.rs
+++ b/tests/ui/rustdoc/doc-test-attr-pass.rs
diff --git a/src/test/ui/rustdoc/doc-test-attr.rs b/tests/ui/rustdoc/doc-test-attr.rs
index 46178ad86..46178ad86 100644
--- a/src/test/ui/rustdoc/doc-test-attr.rs
+++ b/tests/ui/rustdoc/doc-test-attr.rs
diff --git a/src/test/ui/rustdoc/doc-test-attr.stderr b/tests/ui/rustdoc/doc-test-attr.stderr
index 5e6014954..5e6014954 100644
--- a/src/test/ui/rustdoc/doc-test-attr.stderr
+++ b/tests/ui/rustdoc/doc-test-attr.stderr
diff --git a/src/test/ui/rustdoc/doc_keyword.rs b/tests/ui/rustdoc/doc_keyword.rs
index 68a8802b2..68a8802b2 100644
--- a/src/test/ui/rustdoc/doc_keyword.rs
+++ b/tests/ui/rustdoc/doc_keyword.rs
diff --git a/src/test/ui/rustdoc/doc_keyword.stderr b/tests/ui/rustdoc/doc_keyword.stderr
index a1d0e4ffc..a1d0e4ffc 100644
--- a/src/test/ui/rustdoc/doc_keyword.stderr
+++ b/tests/ui/rustdoc/doc_keyword.stderr
diff --git a/src/test/ui/rustdoc/duplicate_doc_alias.rs b/tests/ui/rustdoc/duplicate_doc_alias.rs
index a564ab645..a564ab645 100644
--- a/src/test/ui/rustdoc/duplicate_doc_alias.rs
+++ b/tests/ui/rustdoc/duplicate_doc_alias.rs
diff --git a/src/test/ui/rustdoc/duplicate_doc_alias.stderr b/tests/ui/rustdoc/duplicate_doc_alias.stderr
index 4b2dd1f8e..4b2dd1f8e 100644
--- a/src/test/ui/rustdoc/duplicate_doc_alias.stderr
+++ b/tests/ui/rustdoc/duplicate_doc_alias.stderr
diff --git a/src/test/ui/rustdoc/feature-gate-doc_primitive.rs b/tests/ui/rustdoc/feature-gate-doc_primitive.rs
index 18e99e72f..18e99e72f 100644
--- a/src/test/ui/rustdoc/feature-gate-doc_primitive.rs
+++ b/tests/ui/rustdoc/feature-gate-doc_primitive.rs
diff --git a/src/test/ui/rustdoc/feature-gate-doc_primitive.stderr b/tests/ui/rustdoc/feature-gate-doc_primitive.stderr
index 194b2d87d..194b2d87d 100644
--- a/src/test/ui/rustdoc/feature-gate-doc_primitive.stderr
+++ b/tests/ui/rustdoc/feature-gate-doc_primitive.stderr
diff --git a/src/test/ui/rustdoc/hidden-doc-associated-item.rs b/tests/ui/rustdoc/hidden-doc-associated-item.rs
index d431f9e89..d431f9e89 100644
--- a/src/test/ui/rustdoc/hidden-doc-associated-item.rs
+++ b/tests/ui/rustdoc/hidden-doc-associated-item.rs
diff --git a/src/test/ui/rustdoc/renamed-features-rustdoc_internals.rs b/tests/ui/rustdoc/renamed-features-rustdoc_internals.rs
index 739c624d0..739c624d0 100644
--- a/src/test/ui/rustdoc/renamed-features-rustdoc_internals.rs
+++ b/tests/ui/rustdoc/renamed-features-rustdoc_internals.rs
diff --git a/src/test/ui/rustdoc/renamed-features-rustdoc_internals.stderr b/tests/ui/rustdoc/renamed-features-rustdoc_internals.stderr
index d0979ce97..d0979ce97 100644
--- a/src/test/ui/rustdoc/renamed-features-rustdoc_internals.stderr
+++ b/tests/ui/rustdoc/renamed-features-rustdoc_internals.stderr
diff --git a/src/test/ui/rustdoc/unterminated-doc-comment.rs b/tests/ui/rustdoc/unterminated-doc-comment.rs
index 82546fe73..82546fe73 100644
--- a/src/test/ui/rustdoc/unterminated-doc-comment.rs
+++ b/tests/ui/rustdoc/unterminated-doc-comment.rs
diff --git a/src/test/ui/rustdoc/unterminated-doc-comment.stderr b/tests/ui/rustdoc/unterminated-doc-comment.stderr
index 2d5e53797..2d5e53797 100644
--- a/src/test/ui/rustdoc/unterminated-doc-comment.stderr
+++ b/tests/ui/rustdoc/unterminated-doc-comment.stderr
diff --git a/src/test/ui/sanitize/address.rs b/tests/ui/sanitize/address.rs
index 5b2cea875..5b2cea875 100644
--- a/src/test/ui/sanitize/address.rs
+++ b/tests/ui/sanitize/address.rs
diff --git a/src/test/ui/sanitize/badfree.rs b/tests/ui/sanitize/badfree.rs
index 095a6f469..095a6f469 100644
--- a/src/test/ui/sanitize/badfree.rs
+++ b/tests/ui/sanitize/badfree.rs
diff --git a/src/test/ui/sanitize/cfg.rs b/tests/ui/sanitize/cfg.rs
index 79dfe58f0..79dfe58f0 100644
--- a/src/test/ui/sanitize/cfg.rs
+++ b/tests/ui/sanitize/cfg.rs
diff --git a/src/test/ui/sanitize/crt-static.rs b/tests/ui/sanitize/crt-static.rs
index 7a6b9eda3..7a6b9eda3 100644
--- a/src/test/ui/sanitize/crt-static.rs
+++ b/tests/ui/sanitize/crt-static.rs
diff --git a/src/test/ui/sanitize/crt-static.stderr b/tests/ui/sanitize/crt-static.stderr
index 9f74235fe..9f74235fe 100644
--- a/src/test/ui/sanitize/crt-static.stderr
+++ b/tests/ui/sanitize/crt-static.stderr
diff --git a/src/test/ui/sanitize/hwaddress.rs b/tests/ui/sanitize/hwaddress.rs
index f9b37a155..f9b37a155 100644
--- a/src/test/ui/sanitize/hwaddress.rs
+++ b/tests/ui/sanitize/hwaddress.rs
diff --git a/src/test/ui/sanitize/incompatible.rs b/tests/ui/sanitize/incompatible.rs
index bcafc2891..bcafc2891 100644
--- a/src/test/ui/sanitize/incompatible.rs
+++ b/tests/ui/sanitize/incompatible.rs
diff --git a/src/test/ui/sanitize/incompatible.stderr b/tests/ui/sanitize/incompatible.stderr
index f86db41ba..f86db41ba 100644
--- a/src/test/ui/sanitize/incompatible.stderr
+++ b/tests/ui/sanitize/incompatible.stderr
diff --git a/src/test/ui/sanitize/inline-always.rs b/tests/ui/sanitize/inline-always.rs
index 52dc55781..52dc55781 100644
--- a/src/test/ui/sanitize/inline-always.rs
+++ b/tests/ui/sanitize/inline-always.rs
diff --git a/src/test/ui/sanitize/inline-always.stderr b/tests/ui/sanitize/inline-always.stderr
index 74fba3c0e..74fba3c0e 100644
--- a/src/test/ui/sanitize/inline-always.stderr
+++ b/tests/ui/sanitize/inline-always.stderr
diff --git a/src/test/ui/sanitize/issue-72154-lifetime-markers.rs b/tests/ui/sanitize/issue-72154-lifetime-markers.rs
index b2e182238..b2e182238 100644
--- a/src/test/ui/sanitize/issue-72154-lifetime-markers.rs
+++ b/tests/ui/sanitize/issue-72154-lifetime-markers.rs
diff --git a/src/test/ui/sanitize/leak.rs b/tests/ui/sanitize/leak.rs
index cbb44ae8a..cbb44ae8a 100644
--- a/src/test/ui/sanitize/leak.rs
+++ b/tests/ui/sanitize/leak.rs
diff --git a/src/test/ui/sanitize/memory-eager.rs b/tests/ui/sanitize/memory-eager.rs
index 0018c2f75..0018c2f75 100644
--- a/src/test/ui/sanitize/memory-eager.rs
+++ b/tests/ui/sanitize/memory-eager.rs
diff --git a/src/test/ui/sanitize/memory-passing.rs b/tests/ui/sanitize/memory-passing.rs
index 6d9b70ad6..6d9b70ad6 100644
--- a/src/test/ui/sanitize/memory-passing.rs
+++ b/tests/ui/sanitize/memory-passing.rs
diff --git a/src/test/ui/sanitize/memory.rs b/tests/ui/sanitize/memory.rs
index 1a9ac3a4f..1a9ac3a4f 100644
--- a/src/test/ui/sanitize/memory.rs
+++ b/tests/ui/sanitize/memory.rs
diff --git a/src/test/ui/sanitize/new-llvm-pass-manager-thin-lto.rs b/tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs
index 33e18e355..33e18e355 100644
--- a/src/test/ui/sanitize/new-llvm-pass-manager-thin-lto.rs
+++ b/tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs
diff --git a/src/test/ui/sanitize/thread.rs b/tests/ui/sanitize/thread.rs
index c70cf5acc..c70cf5acc 100644
--- a/src/test/ui/sanitize/thread.rs
+++ b/tests/ui/sanitize/thread.rs
diff --git a/src/test/ui/sanitize/unsupported-target.rs b/tests/ui/sanitize/unsupported-target.rs
index 9f29c7635..9f29c7635 100644
--- a/src/test/ui/sanitize/unsupported-target.rs
+++ b/tests/ui/sanitize/unsupported-target.rs
diff --git a/src/test/ui/sanitize/unsupported-target.stderr b/tests/ui/sanitize/unsupported-target.stderr
index 9bb840502..9bb840502 100644
--- a/src/test/ui/sanitize/unsupported-target.stderr
+++ b/tests/ui/sanitize/unsupported-target.stderr
diff --git a/src/test/ui/sanitize/use-after-scope.rs b/tests/ui/sanitize/use-after-scope.rs
index 30be2ae6f..30be2ae6f 100644
--- a/src/test/ui/sanitize/use-after-scope.rs
+++ b/tests/ui/sanitize/use-after-scope.rs
diff --git a/src/test/ui/save-analysis/emit-notifications.polonius.stderr b/tests/ui/save-analysis/emit-notifications.polonius.stderr
index a1a1b8c63..a1a1b8c63 100644
--- a/src/test/ui/save-analysis/emit-notifications.polonius.stderr
+++ b/tests/ui/save-analysis/emit-notifications.polonius.stderr
diff --git a/src/test/ui/save-analysis/emit-notifications.rs b/tests/ui/save-analysis/emit-notifications.rs
index 9179944a6..9179944a6 100644
--- a/src/test/ui/save-analysis/emit-notifications.rs
+++ b/tests/ui/save-analysis/emit-notifications.rs
diff --git a/src/test/ui/save-analysis/emit-notifications.stderr b/tests/ui/save-analysis/emit-notifications.stderr
index e16f60f8b..e16f60f8b 100644
--- a/src/test/ui/save-analysis/emit-notifications.stderr
+++ b/tests/ui/save-analysis/emit-notifications.stderr
diff --git a/src/test/ui/save-analysis/issue-26459.rs b/tests/ui/save-analysis/issue-26459.rs
index 2ba05a0a4..2ba05a0a4 100644
--- a/src/test/ui/save-analysis/issue-26459.rs
+++ b/tests/ui/save-analysis/issue-26459.rs
diff --git a/src/test/ui/save-analysis/issue-26459.stderr b/tests/ui/save-analysis/issue-26459.stderr
index 9f594990c..9f594990c 100644
--- a/src/test/ui/save-analysis/issue-26459.stderr
+++ b/tests/ui/save-analysis/issue-26459.stderr
diff --git a/src/test/ui/save-analysis/issue-37323.rs b/tests/ui/save-analysis/issue-37323.rs
index 55f5c5a95..55f5c5a95 100644
--- a/src/test/ui/save-analysis/issue-37323.rs
+++ b/tests/ui/save-analysis/issue-37323.rs
diff --git a/src/test/ui/save-analysis/issue-59134-0.rs b/tests/ui/save-analysis/issue-59134-0.rs
index a0871ca18..a0871ca18 100644
--- a/src/test/ui/save-analysis/issue-59134-0.rs
+++ b/tests/ui/save-analysis/issue-59134-0.rs
diff --git a/src/test/ui/save-analysis/issue-59134-0.stderr b/tests/ui/save-analysis/issue-59134-0.stderr
index 4e9b2e6fd..4e9b2e6fd 100644
--- a/src/test/ui/save-analysis/issue-59134-0.stderr
+++ b/tests/ui/save-analysis/issue-59134-0.stderr
diff --git a/src/test/ui/save-analysis/issue-59134-1.rs b/tests/ui/save-analysis/issue-59134-1.rs
index 3cb629777..3cb629777 100644
--- a/src/test/ui/save-analysis/issue-59134-1.rs
+++ b/tests/ui/save-analysis/issue-59134-1.rs
diff --git a/src/test/ui/save-analysis/issue-59134-1.stderr b/tests/ui/save-analysis/issue-59134-1.stderr
index bdc335eaa..bdc335eaa 100644
--- a/src/test/ui/save-analysis/issue-59134-1.stderr
+++ b/tests/ui/save-analysis/issue-59134-1.stderr
diff --git a/src/test/ui/save-analysis/issue-63663.rs b/tests/ui/save-analysis/issue-63663.rs
index 92e85884f..92e85884f 100644
--- a/src/test/ui/save-analysis/issue-63663.rs
+++ b/tests/ui/save-analysis/issue-63663.rs
diff --git a/src/test/ui/save-analysis/issue-64659.rs b/tests/ui/save-analysis/issue-64659.rs
index a3d88a203..a3d88a203 100644
--- a/src/test/ui/save-analysis/issue-64659.rs
+++ b/tests/ui/save-analysis/issue-64659.rs
diff --git a/src/test/ui/save-analysis/issue-65411.rs b/tests/ui/save-analysis/issue-65411.rs
index 9e58b8da5..9e58b8da5 100644
--- a/src/test/ui/save-analysis/issue-65411.rs
+++ b/tests/ui/save-analysis/issue-65411.rs
diff --git a/src/test/ui/save-analysis/issue-65590.rs b/tests/ui/save-analysis/issue-65590.rs
index 27874f865..27874f865 100644
--- a/src/test/ui/save-analysis/issue-65590.rs
+++ b/tests/ui/save-analysis/issue-65590.rs
diff --git a/src/test/ui/save-analysis/issue-68621.rs b/tests/ui/save-analysis/issue-68621.rs
index 30479580f..30479580f 100644
--- a/src/test/ui/save-analysis/issue-68621.rs
+++ b/tests/ui/save-analysis/issue-68621.rs
diff --git a/src/test/ui/save-analysis/issue-68621.stderr b/tests/ui/save-analysis/issue-68621.stderr
index 4452ee791..4452ee791 100644
--- a/src/test/ui/save-analysis/issue-68621.stderr
+++ b/tests/ui/save-analysis/issue-68621.stderr
diff --git a/src/test/ui/save-analysis/issue-72267.rs b/tests/ui/save-analysis/issue-72267.rs
index eea0a7fea..eea0a7fea 100644
--- a/src/test/ui/save-analysis/issue-72267.rs
+++ b/tests/ui/save-analysis/issue-72267.rs
diff --git a/src/test/ui/save-analysis/issue-72267.stderr b/tests/ui/save-analysis/issue-72267.stderr
index 76fc6c57c..76fc6c57c 100644
--- a/src/test/ui/save-analysis/issue-72267.stderr
+++ b/tests/ui/save-analysis/issue-72267.stderr
diff --git a/src/test/ui/save-analysis/issue-73020.rs b/tests/ui/save-analysis/issue-73020.rs
index 87ce09336..87ce09336 100644
--- a/src/test/ui/save-analysis/issue-73020.rs
+++ b/tests/ui/save-analysis/issue-73020.rs
diff --git a/src/test/ui/save-analysis/issue-73020.stderr b/tests/ui/save-analysis/issue-73020.stderr
index 5bb3aae99..5bb3aae99 100644
--- a/src/test/ui/save-analysis/issue-73020.stderr
+++ b/tests/ui/save-analysis/issue-73020.stderr
diff --git a/src/test/ui/save-analysis/issue-73022.rs b/tests/ui/save-analysis/issue-73022.rs
index 9ad89a319..9ad89a319 100644
--- a/src/test/ui/save-analysis/issue-73022.rs
+++ b/tests/ui/save-analysis/issue-73022.rs
diff --git a/src/test/ui/save-analysis/issue-89066.rs b/tests/ui/save-analysis/issue-89066.rs
index 2873f5237..c65e2d73f 100644
--- a/src/test/ui/save-analysis/issue-89066.rs
+++ b/tests/ui/save-analysis/issue-89066.rs
@@ -1,7 +1,7 @@
 // compile-flags: -Zsave-analysis
 
 // Check that this does not ICE.
-// Stolen from src/test/ui/const-generics/generic_arg_infer/infer-arg-test.rs
+// Stolen from tests/ui/const-generics/generic_arg_infer/infer-arg-test.rs
 
 #![feature(generic_arg_infer)]
 
diff --git a/src/test/ui/save-analysis/issue-89066.stderr b/tests/ui/save-analysis/issue-89066.stderr
index 5ef04936e..5ef04936e 100644
--- a/src/test/ui/save-analysis/issue-89066.stderr
+++ b/tests/ui/save-analysis/issue-89066.stderr
diff --git a/src/test/ui/self/arbitrary-self-types-not-object-safe.curr.stderr b/tests/ui/self/arbitrary-self-types-not-object-safe.curr.stderr
index 0ec0d4be5..0ec0d4be5 100644
--- a/src/test/ui/self/arbitrary-self-types-not-object-safe.curr.stderr
+++ b/tests/ui/self/arbitrary-self-types-not-object-safe.curr.stderr
diff --git a/src/test/ui/self/arbitrary-self-types-not-object-safe.object_safe_for_dispatch.stderr b/tests/ui/self/arbitrary-self-types-not-object-safe.object_safe_for_dispatch.stderr
index b494b448e..b494b448e 100644
--- a/src/test/ui/self/arbitrary-self-types-not-object-safe.object_safe_for_dispatch.stderr
+++ b/tests/ui/self/arbitrary-self-types-not-object-safe.object_safe_for_dispatch.stderr
diff --git a/src/test/ui/self/arbitrary-self-types-not-object-safe.rs b/tests/ui/self/arbitrary-self-types-not-object-safe.rs
index 40e8df339..40e8df339 100644
--- a/src/test/ui/self/arbitrary-self-types-not-object-safe.rs
+++ b/tests/ui/self/arbitrary-self-types-not-object-safe.rs
diff --git a/src/test/ui/self/arbitrary_self_types_nested.rs b/tests/ui/self/arbitrary_self_types_nested.rs
index 680196fbb..680196fbb 100644
--- a/src/test/ui/self/arbitrary_self_types_nested.rs
+++ b/tests/ui/self/arbitrary_self_types_nested.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime-async.rs b/tests/ui/self/arbitrary_self_types_pin_lifetime-async.rs
index f3474bc1f..f3474bc1f 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime-async.rs
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime-async.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime.rs b/tests/ui/self/arbitrary_self_types_pin_lifetime.rs
index 300201388..300201388 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime.rs
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.rs b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.rs
index a1e7f4aa8..a1e7f4aa8 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.rs
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.stderr b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.stderr
index eb3d3e4a6..eb3d3e4a6 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.stderr
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.stderr
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.rs b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.rs
index 4db2fa7dc..4db2fa7dc 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.rs
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.stderr b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.stderr
index 2c0b2a0d9..2c0b2a0d9 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.stderr
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.stderr
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.rs b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.rs
index a2b7f0805..a2b7f0805 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.rs
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.stderr b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.stderr
index 6180e1e0f..6180e1e0f 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.stderr
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.stderr
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.rs b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch.rs
index f1a3fb018..f1a3fb018 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.rs
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr
index fccee5d43..fccee5d43 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr
diff --git a/src/test/ui/self/arbitrary_self_types_pointers_and_wrappers.rs b/tests/ui/self/arbitrary_self_types_pointers_and_wrappers.rs
index 65fec3bec..65fec3bec 100644
--- a/src/test/ui/self/arbitrary_self_types_pointers_and_wrappers.rs
+++ b/tests/ui/self/arbitrary_self_types_pointers_and_wrappers.rs
diff --git a/src/test/ui/self/arbitrary_self_types_raw_pointer_struct.rs b/tests/ui/self/arbitrary_self_types_raw_pointer_struct.rs
index 0eab7617f..0eab7617f 100644
--- a/src/test/ui/self/arbitrary_self_types_raw_pointer_struct.rs
+++ b/tests/ui/self/arbitrary_self_types_raw_pointer_struct.rs
diff --git a/src/test/ui/self/arbitrary_self_types_raw_pointer_trait.rs b/tests/ui/self/arbitrary_self_types_raw_pointer_trait.rs
index 0a9370e6f..0a9370e6f 100644
--- a/src/test/ui/self/arbitrary_self_types_raw_pointer_trait.rs
+++ b/tests/ui/self/arbitrary_self_types_raw_pointer_trait.rs
diff --git a/src/test/ui/self/arbitrary_self_types_silly.rs b/tests/ui/self/arbitrary_self_types_silly.rs
index fb5f9012b..fb5f9012b 100644
--- a/src/test/ui/self/arbitrary_self_types_silly.rs
+++ b/tests/ui/self/arbitrary_self_types_silly.rs
diff --git a/src/test/ui/self/arbitrary_self_types_stdlib_pointers.rs b/tests/ui/self/arbitrary_self_types_stdlib_pointers.rs
index 29563fbbd..29563fbbd 100644
--- a/src/test/ui/self/arbitrary_self_types_stdlib_pointers.rs
+++ b/tests/ui/self/arbitrary_self_types_stdlib_pointers.rs
diff --git a/src/test/ui/self/arbitrary_self_types_struct.rs b/tests/ui/self/arbitrary_self_types_struct.rs
index 905ad83b6..905ad83b6 100644
--- a/src/test/ui/self/arbitrary_self_types_struct.rs
+++ b/tests/ui/self/arbitrary_self_types_struct.rs
diff --git a/src/test/ui/self/arbitrary_self_types_trait.rs b/tests/ui/self/arbitrary_self_types_trait.rs
index 973c7cae8..973c7cae8 100644
--- a/src/test/ui/self/arbitrary_self_types_trait.rs
+++ b/tests/ui/self/arbitrary_self_types_trait.rs
diff --git a/src/test/ui/self/arbitrary_self_types_unsized_struct.rs b/tests/ui/self/arbitrary_self_types_unsized_struct.rs
index d43f31328..d43f31328 100644
--- a/src/test/ui/self/arbitrary_self_types_unsized_struct.rs
+++ b/tests/ui/self/arbitrary_self_types_unsized_struct.rs
diff --git a/src/test/ui/self/auxiliary/explicit_self_xcrate.rs b/tests/ui/self/auxiliary/explicit_self_xcrate.rs
index 25cdfa909..25cdfa909 100644
--- a/src/test/ui/self/auxiliary/explicit_self_xcrate.rs
+++ b/tests/ui/self/auxiliary/explicit_self_xcrate.rs
diff --git a/src/test/ui/self/builtin-superkinds-self-type.rs b/tests/ui/self/builtin-superkinds-self-type.rs
index c56542bb4..c56542bb4 100644
--- a/src/test/ui/self/builtin-superkinds-self-type.rs
+++ b/tests/ui/self/builtin-superkinds-self-type.rs
diff --git a/src/test/ui/self/by-value-self-in-mut-slot.rs b/tests/ui/self/by-value-self-in-mut-slot.rs
index 267afd1dc..267afd1dc 100644
--- a/src/test/ui/self/by-value-self-in-mut-slot.rs
+++ b/tests/ui/self/by-value-self-in-mut-slot.rs
diff --git a/src/test/ui/self/class-missing-self.rs b/tests/ui/self/class-missing-self.rs
index 8ad347d20..8ad347d20 100644
--- a/src/test/ui/self/class-missing-self.rs
+++ b/tests/ui/self/class-missing-self.rs
diff --git a/src/test/ui/self/class-missing-self.stderr b/tests/ui/self/class-missing-self.stderr
index 063c3f013..063c3f013 100644
--- a/src/test/ui/self/class-missing-self.stderr
+++ b/tests/ui/self/class-missing-self.stderr
diff --git a/src/test/ui/self/elision/README.md b/tests/ui/self/elision/README.md
index 3bd7a6c00..3bd7a6c00 100644
--- a/src/test/ui/self/elision/README.md
+++ b/tests/ui/self/elision/README.md
diff --git a/src/test/ui/self/elision/alias-async.rs b/tests/ui/self/elision/alias-async.rs
index 7c0dd0686..7c0dd0686 100644
--- a/src/test/ui/self/elision/alias-async.rs
+++ b/tests/ui/self/elision/alias-async.rs
diff --git a/src/test/ui/self/elision/alias.rs b/tests/ui/self/elision/alias.rs
index 0c801d702..0c801d702 100644
--- a/src/test/ui/self/elision/alias.rs
+++ b/tests/ui/self/elision/alias.rs
diff --git a/src/test/ui/self/elision/assoc-async.rs b/tests/ui/self/elision/assoc-async.rs
index 363b7fc2a..363b7fc2a 100644
--- a/src/test/ui/self/elision/assoc-async.rs
+++ b/tests/ui/self/elision/assoc-async.rs
diff --git a/src/test/ui/self/elision/assoc.rs b/tests/ui/self/elision/assoc.rs
index fa39a2b47..fa39a2b47 100644
--- a/src/test/ui/self/elision/assoc.rs
+++ b/tests/ui/self/elision/assoc.rs
diff --git a/src/test/ui/self/elision/lt-alias-async.rs b/tests/ui/self/elision/lt-alias-async.rs
index 3a6f8471e..3a6f8471e 100644
--- a/src/test/ui/self/elision/lt-alias-async.rs
+++ b/tests/ui/self/elision/lt-alias-async.rs
diff --git a/src/test/ui/self/elision/lt-alias.rs b/tests/ui/self/elision/lt-alias.rs
index bbba88e4e..bbba88e4e 100644
--- a/src/test/ui/self/elision/lt-alias.rs
+++ b/tests/ui/self/elision/lt-alias.rs
diff --git a/src/test/ui/self/elision/lt-assoc-async.rs b/tests/ui/self/elision/lt-assoc-async.rs
index 0d3ff630d..0d3ff630d 100644
--- a/src/test/ui/self/elision/lt-assoc-async.rs
+++ b/tests/ui/self/elision/lt-assoc-async.rs
diff --git a/src/test/ui/self/elision/lt-assoc.rs b/tests/ui/self/elision/lt-assoc.rs
index 8f3543135..8f3543135 100644
--- a/src/test/ui/self/elision/lt-assoc.rs
+++ b/tests/ui/self/elision/lt-assoc.rs
diff --git a/src/test/ui/self/elision/lt-ref-self-async.rs b/tests/ui/self/elision/lt-ref-self-async.rs
index a2325ba7f..a2325ba7f 100644
--- a/src/test/ui/self/elision/lt-ref-self-async.rs
+++ b/tests/ui/self/elision/lt-ref-self-async.rs
diff --git a/src/test/ui/self/elision/lt-ref-self-async.stderr b/tests/ui/self/elision/lt-ref-self-async.stderr
index 787afd4dc..787afd4dc 100644
--- a/src/test/ui/self/elision/lt-ref-self-async.stderr
+++ b/tests/ui/self/elision/lt-ref-self-async.stderr
diff --git a/src/test/ui/self/elision/lt-ref-self.rs b/tests/ui/self/elision/lt-ref-self.rs
index d37ed5acb..d37ed5acb 100644
--- a/src/test/ui/self/elision/lt-ref-self.rs
+++ b/tests/ui/self/elision/lt-ref-self.rs
diff --git a/src/test/ui/self/elision/lt-ref-self.stderr b/tests/ui/self/elision/lt-ref-self.stderr
index 49af638e4..49af638e4 100644
--- a/src/test/ui/self/elision/lt-ref-self.stderr
+++ b/tests/ui/self/elision/lt-ref-self.stderr
diff --git a/src/test/ui/self/elision/lt-self-async.rs b/tests/ui/self/elision/lt-self-async.rs
index 4cedaf79d..4cedaf79d 100644
--- a/src/test/ui/self/elision/lt-self-async.rs
+++ b/tests/ui/self/elision/lt-self-async.rs
diff --git a/src/test/ui/self/elision/lt-self.rs b/tests/ui/self/elision/lt-self.rs
index cf74f892b..cf74f892b 100644
--- a/src/test/ui/self/elision/lt-self.rs
+++ b/tests/ui/self/elision/lt-self.rs
diff --git a/src/test/ui/self/elision/lt-struct-async.rs b/tests/ui/self/elision/lt-struct-async.rs
index abbee7fdf..abbee7fdf 100644
--- a/src/test/ui/self/elision/lt-struct-async.rs
+++ b/tests/ui/self/elision/lt-struct-async.rs
diff --git a/src/test/ui/self/elision/lt-struct.rs b/tests/ui/self/elision/lt-struct.rs
index 799c6c079..799c6c079 100644
--- a/src/test/ui/self/elision/lt-struct.rs
+++ b/tests/ui/self/elision/lt-struct.rs
diff --git a/src/test/ui/self/elision/multiple-ref-self-async.rs b/tests/ui/self/elision/multiple-ref-self-async.rs
index be073c6ed..be073c6ed 100644
--- a/src/test/ui/self/elision/multiple-ref-self-async.rs
+++ b/tests/ui/self/elision/multiple-ref-self-async.rs
diff --git a/src/test/ui/self/elision/multiple-ref-self.rs b/tests/ui/self/elision/multiple-ref-self.rs
index f39613d0c..f39613d0c 100644
--- a/src/test/ui/self/elision/multiple-ref-self.rs
+++ b/tests/ui/self/elision/multiple-ref-self.rs
diff --git a/src/test/ui/self/elision/ref-alias-async.rs b/tests/ui/self/elision/ref-alias-async.rs
index 15f16525b..15f16525b 100644
--- a/src/test/ui/self/elision/ref-alias-async.rs
+++ b/tests/ui/self/elision/ref-alias-async.rs
diff --git a/src/test/ui/self/elision/ref-alias.rs b/tests/ui/self/elision/ref-alias.rs
index 341f5b52d..341f5b52d 100644
--- a/src/test/ui/self/elision/ref-alias.rs
+++ b/tests/ui/self/elision/ref-alias.rs
diff --git a/src/test/ui/self/elision/ref-assoc-async.rs b/tests/ui/self/elision/ref-assoc-async.rs
index ad10d8ba4..ad10d8ba4 100644
--- a/src/test/ui/self/elision/ref-assoc-async.rs
+++ b/tests/ui/self/elision/ref-assoc-async.rs
diff --git a/src/test/ui/self/elision/ref-assoc.rs b/tests/ui/self/elision/ref-assoc.rs
index 2f02cb5f3..2f02cb5f3 100644
--- a/src/test/ui/self/elision/ref-assoc.rs
+++ b/tests/ui/self/elision/ref-assoc.rs
diff --git a/src/test/ui/self/elision/ref-mut-alias-async.rs b/tests/ui/self/elision/ref-mut-alias-async.rs
index 2c3f971d2..2c3f971d2 100644
--- a/src/test/ui/self/elision/ref-mut-alias-async.rs
+++ b/tests/ui/self/elision/ref-mut-alias-async.rs
diff --git a/src/test/ui/self/elision/ref-mut-alias.rs b/tests/ui/self/elision/ref-mut-alias.rs
index ce1ab3ffc..ce1ab3ffc 100644
--- a/src/test/ui/self/elision/ref-mut-alias.rs
+++ b/tests/ui/self/elision/ref-mut-alias.rs
diff --git a/src/test/ui/self/elision/ref-mut-self-async.rs b/tests/ui/self/elision/ref-mut-self-async.rs
index e07bc8564..e07bc8564 100644
--- a/src/test/ui/self/elision/ref-mut-self-async.rs
+++ b/tests/ui/self/elision/ref-mut-self-async.rs
diff --git a/src/test/ui/self/elision/ref-mut-self-async.stderr b/tests/ui/self/elision/ref-mut-self-async.stderr
index dff50aee9..dff50aee9 100644
--- a/src/test/ui/self/elision/ref-mut-self-async.stderr
+++ b/tests/ui/self/elision/ref-mut-self-async.stderr
diff --git a/src/test/ui/self/elision/ref-mut-self.rs b/tests/ui/self/elision/ref-mut-self.rs
index bb82e6be7..bb82e6be7 100644
--- a/src/test/ui/self/elision/ref-mut-self.rs
+++ b/tests/ui/self/elision/ref-mut-self.rs
diff --git a/src/test/ui/self/elision/ref-mut-self.stderr b/tests/ui/self/elision/ref-mut-self.stderr
index ccf183016..ccf183016 100644
--- a/src/test/ui/self/elision/ref-mut-self.stderr
+++ b/tests/ui/self/elision/ref-mut-self.stderr
diff --git a/src/test/ui/self/elision/ref-mut-struct-async.rs b/tests/ui/self/elision/ref-mut-struct-async.rs
index 392bf1d6b..392bf1d6b 100644
--- a/src/test/ui/self/elision/ref-mut-struct-async.rs
+++ b/tests/ui/self/elision/ref-mut-struct-async.rs
diff --git a/src/test/ui/self/elision/ref-mut-struct-async.stderr b/tests/ui/self/elision/ref-mut-struct-async.stderr
index 5b7ad026f..5b7ad026f 100644
--- a/src/test/ui/self/elision/ref-mut-struct-async.stderr
+++ b/tests/ui/self/elision/ref-mut-struct-async.stderr
diff --git a/src/test/ui/self/elision/ref-mut-struct.rs b/tests/ui/self/elision/ref-mut-struct.rs
index ca8bd8da1..ca8bd8da1 100644
--- a/src/test/ui/self/elision/ref-mut-struct.rs
+++ b/tests/ui/self/elision/ref-mut-struct.rs
diff --git a/src/test/ui/self/elision/ref-mut-struct.stderr b/tests/ui/self/elision/ref-mut-struct.stderr
index b9c71e843..b9c71e843 100644
--- a/src/test/ui/self/elision/ref-mut-struct.stderr
+++ b/tests/ui/self/elision/ref-mut-struct.stderr
diff --git a/src/test/ui/self/elision/ref-self-async.rs b/tests/ui/self/elision/ref-self-async.rs
index b0133ec1b..b0133ec1b 100644
--- a/src/test/ui/self/elision/ref-self-async.rs
+++ b/tests/ui/self/elision/ref-self-async.rs
diff --git a/src/test/ui/self/elision/ref-self-async.stderr b/tests/ui/self/elision/ref-self-async.stderr
index 26ef9779b..26ef9779b 100644
--- a/src/test/ui/self/elision/ref-self-async.stderr
+++ b/tests/ui/self/elision/ref-self-async.stderr
diff --git a/src/test/ui/self/elision/ref-self.rs b/tests/ui/self/elision/ref-self.rs
index dd07fe1b0..dd07fe1b0 100644
--- a/src/test/ui/self/elision/ref-self.rs
+++ b/tests/ui/self/elision/ref-self.rs
diff --git a/src/test/ui/self/elision/ref-self.stderr b/tests/ui/self/elision/ref-self.stderr
index 32448f3a6..32448f3a6 100644
--- a/src/test/ui/self/elision/ref-self.stderr
+++ b/tests/ui/self/elision/ref-self.stderr
diff --git a/src/test/ui/self/elision/ref-struct-async.rs b/tests/ui/self/elision/ref-struct-async.rs
index 0be748745..0be748745 100644
--- a/src/test/ui/self/elision/ref-struct-async.rs
+++ b/tests/ui/self/elision/ref-struct-async.rs
diff --git a/src/test/ui/self/elision/ref-struct-async.stderr b/tests/ui/self/elision/ref-struct-async.stderr
index edb5c54ab..edb5c54ab 100644
--- a/src/test/ui/self/elision/ref-struct-async.stderr
+++ b/tests/ui/self/elision/ref-struct-async.stderr
diff --git a/src/test/ui/self/elision/ref-struct.rs b/tests/ui/self/elision/ref-struct.rs
index 13a42cd1a..13a42cd1a 100644
--- a/src/test/ui/self/elision/ref-struct.rs
+++ b/tests/ui/self/elision/ref-struct.rs
diff --git a/src/test/ui/self/elision/ref-struct.stderr b/tests/ui/self/elision/ref-struct.stderr
index 4492ed4aa..4492ed4aa 100644
--- a/src/test/ui/self/elision/ref-struct.stderr
+++ b/tests/ui/self/elision/ref-struct.stderr
diff --git a/src/test/ui/self/elision/self-async.rs b/tests/ui/self/elision/self-async.rs
index eb01cfc97..eb01cfc97 100644
--- a/src/test/ui/self/elision/self-async.rs
+++ b/tests/ui/self/elision/self-async.rs
diff --git a/src/test/ui/self/elision/self.rs b/tests/ui/self/elision/self.rs
index 574b7e7c9..574b7e7c9 100644
--- a/src/test/ui/self/elision/self.rs
+++ b/tests/ui/self/elision/self.rs
diff --git a/src/test/ui/self/elision/struct-async.rs b/tests/ui/self/elision/struct-async.rs
index e018e0daf..e018e0daf 100644
--- a/src/test/ui/self/elision/struct-async.rs
+++ b/tests/ui/self/elision/struct-async.rs
diff --git a/src/test/ui/self/elision/struct.rs b/tests/ui/self/elision/struct.rs
index d1ac99d13..d1ac99d13 100644
--- a/src/test/ui/self/elision/struct.rs
+++ b/tests/ui/self/elision/struct.rs
diff --git a/src/test/ui/self/explicit-self-closures.rs b/tests/ui/self/explicit-self-closures.rs
index b409dfd7a..b409dfd7a 100644
--- a/src/test/ui/self/explicit-self-closures.rs
+++ b/tests/ui/self/explicit-self-closures.rs
diff --git a/src/test/ui/self/explicit-self-generic.rs b/tests/ui/self/explicit-self-generic.rs
index 8f6bed3b0..8f6bed3b0 100644
--- a/src/test/ui/self/explicit-self-generic.rs
+++ b/tests/ui/self/explicit-self-generic.rs
diff --git a/src/test/ui/self/explicit-self-objects-uniq.rs b/tests/ui/self/explicit-self-objects-uniq.rs
index 250ea12e5..250ea12e5 100644
--- a/src/test/ui/self/explicit-self-objects-uniq.rs
+++ b/tests/ui/self/explicit-self-objects-uniq.rs
diff --git a/src/test/ui/self/explicit-self.rs b/tests/ui/self/explicit-self.rs
index 873c3621a..873c3621a 100644
--- a/src/test/ui/self/explicit-self.rs
+++ b/tests/ui/self/explicit-self.rs
diff --git a/src/test/ui/self/explicit_self_xcrate_exe.rs b/tests/ui/self/explicit_self_xcrate_exe.rs
index c3796f73a..c3796f73a 100644
--- a/src/test/ui/self/explicit_self_xcrate_exe.rs
+++ b/tests/ui/self/explicit_self_xcrate_exe.rs
diff --git a/src/test/ui/self/issue-61882-2.rs b/tests/ui/self/issue-61882-2.rs
index 1209b54bc..1209b54bc 100644
--- a/src/test/ui/self/issue-61882-2.rs
+++ b/tests/ui/self/issue-61882-2.rs
diff --git a/src/test/ui/self/issue-61882-2.stderr b/tests/ui/self/issue-61882-2.stderr
index 0b8e134c9..0b8e134c9 100644
--- a/src/test/ui/self/issue-61882-2.stderr
+++ b/tests/ui/self/issue-61882-2.stderr
diff --git a/src/test/ui/self/issue-61882.rs b/tests/ui/self/issue-61882.rs
index 013398b45..013398b45 100644
--- a/src/test/ui/self/issue-61882.rs
+++ b/tests/ui/self/issue-61882.rs
diff --git a/src/test/ui/self/issue-61882.stderr b/tests/ui/self/issue-61882.stderr
index dd7194dc2..dd7194dc2 100644
--- a/src/test/ui/self/issue-61882.stderr
+++ b/tests/ui/self/issue-61882.stderr
diff --git a/src/test/ui/self/move-self.rs b/tests/ui/self/move-self.rs
index 66032780b..66032780b 100644
--- a/src/test/ui/self/move-self.rs
+++ b/tests/ui/self/move-self.rs
diff --git a/src/test/ui/self/object-safety-sized-self-by-value-self.rs b/tests/ui/self/object-safety-sized-self-by-value-self.rs
index 43b1d8b91..43b1d8b91 100644
--- a/src/test/ui/self/object-safety-sized-self-by-value-self.rs
+++ b/tests/ui/self/object-safety-sized-self-by-value-self.rs
diff --git a/src/test/ui/self/object-safety-sized-self-generic-method.rs b/tests/ui/self/object-safety-sized-self-generic-method.rs
index e0b0526a3..e0b0526a3 100644
--- a/src/test/ui/self/object-safety-sized-self-generic-method.rs
+++ b/tests/ui/self/object-safety-sized-self-generic-method.rs
diff --git a/src/test/ui/self/object-safety-sized-self-return-Self.rs b/tests/ui/self/object-safety-sized-self-return-Self.rs
index 222c75439..222c75439 100644
--- a/src/test/ui/self/object-safety-sized-self-return-Self.rs
+++ b/tests/ui/self/object-safety-sized-self-return-Self.rs
diff --git a/src/test/ui/self/objects-owned-object-owned-method.rs b/tests/ui/self/objects-owned-object-owned-method.rs
index 15677a518..15677a518 100644
--- a/src/test/ui/self/objects-owned-object-owned-method.rs
+++ b/tests/ui/self/objects-owned-object-owned-method.rs
diff --git a/src/test/ui/self/point-at-arbitrary-self-type-method.rs b/tests/ui/self/point-at-arbitrary-self-type-method.rs
index 0f7deeaca..0f7deeaca 100644
--- a/src/test/ui/self/point-at-arbitrary-self-type-method.rs
+++ b/tests/ui/self/point-at-arbitrary-self-type-method.rs
diff --git a/src/test/ui/self/point-at-arbitrary-self-type-method.stderr b/tests/ui/self/point-at-arbitrary-self-type-method.stderr
index 3c7cccfc9..3c7cccfc9 100644
--- a/src/test/ui/self/point-at-arbitrary-self-type-method.stderr
+++ b/tests/ui/self/point-at-arbitrary-self-type-method.stderr
diff --git a/src/test/ui/self/point-at-arbitrary-self-type-trait-method.rs b/tests/ui/self/point-at-arbitrary-self-type-trait-method.rs
index 53d992771..53d992771 100644
--- a/src/test/ui/self/point-at-arbitrary-self-type-trait-method.rs
+++ b/tests/ui/self/point-at-arbitrary-self-type-trait-method.rs
diff --git a/src/test/ui/self/point-at-arbitrary-self-type-trait-method.stderr b/tests/ui/self/point-at-arbitrary-self-type-trait-method.stderr
index 366c14f76..366c14f76 100644
--- a/src/test/ui/self/point-at-arbitrary-self-type-trait-method.stderr
+++ b/tests/ui/self/point-at-arbitrary-self-type-trait-method.stderr
diff --git a/src/test/ui/self/self-impl-2.rs b/tests/ui/self/self-impl-2.rs
index 7eed3f056..7eed3f056 100644
--- a/src/test/ui/self/self-impl-2.rs
+++ b/tests/ui/self/self-impl-2.rs
diff --git a/src/test/ui/self/self-impl.rs b/tests/ui/self/self-impl.rs
index ed250ce52..ed250ce52 100644
--- a/src/test/ui/self/self-impl.rs
+++ b/tests/ui/self/self-impl.rs
diff --git a/tests/ui/self/self-impl.stderr b/tests/ui/self/self-impl.stderr
new file mode 100644
index 000000000..36372b644
--- /dev/null
+++ b/tests/ui/self/self-impl.stderr
@@ -0,0 +1,15 @@
+error[E0223]: ambiguous associated type
+  --> $DIR/self-impl.rs:23:16
+   |
+LL |         let _: <Self>::Baz = true;
+   |                ^^^^^^^^^^^ help: use the fully-qualified path: `<Bar as Foo>::Baz`
+
+error[E0223]: ambiguous associated type
+  --> $DIR/self-impl.rs:25:16
+   |
+LL |         let _: Self::Baz = true;
+   |                ^^^^^^^^^ help: use the fully-qualified path: `<Bar as Foo>::Baz`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/self/self-in-mut-slot-default-method.rs b/tests/ui/self/self-in-mut-slot-default-method.rs
index 45e122c8d..45e122c8d 100644
--- a/src/test/ui/self/self-in-mut-slot-default-method.rs
+++ b/tests/ui/self/self-in-mut-slot-default-method.rs
diff --git a/src/test/ui/self/self-in-mut-slot-immediate-value.rs b/tests/ui/self/self-in-mut-slot-immediate-value.rs
index 60865304f..60865304f 100644
--- a/src/test/ui/self/self-in-mut-slot-immediate-value.rs
+++ b/tests/ui/self/self-in-mut-slot-immediate-value.rs
diff --git a/src/test/ui/self/self-in-typedefs.rs b/tests/ui/self/self-in-typedefs.rs
index 81e557d53..81e557d53 100644
--- a/src/test/ui/self/self-in-typedefs.rs
+++ b/tests/ui/self/self-in-typedefs.rs
diff --git a/src/test/ui/self/self-infer.rs b/tests/ui/self/self-infer.rs
index 9839b8880..9839b8880 100644
--- a/src/test/ui/self/self-infer.rs
+++ b/tests/ui/self/self-infer.rs
diff --git a/src/test/ui/self/self-infer.stderr b/tests/ui/self/self-infer.stderr
index 4f9e3f21d..4f9e3f21d 100644
--- a/src/test/ui/self/self-infer.stderr
+++ b/tests/ui/self/self-infer.stderr
diff --git a/src/test/ui/self/self-re-assign.rs b/tests/ui/self/self-re-assign.rs
index 9595ebf96..9595ebf96 100644
--- a/src/test/ui/self/self-re-assign.rs
+++ b/tests/ui/self/self-re-assign.rs
diff --git a/src/test/ui/self/self-shadowing-import.rs b/tests/ui/self/self-shadowing-import.rs
index 1d60c6c22..1d60c6c22 100644
--- a/src/test/ui/self/self-shadowing-import.rs
+++ b/tests/ui/self/self-shadowing-import.rs
diff --git a/src/test/ui/self/self-type-param.rs b/tests/ui/self/self-type-param.rs
index 5eb8c3622..5eb8c3622 100644
--- a/src/test/ui/self/self-type-param.rs
+++ b/tests/ui/self/self-type-param.rs
diff --git a/src/test/ui/self/self-vs-path-ambiguity.rs b/tests/ui/self/self-vs-path-ambiguity.rs
index 5a06d56c8..5a06d56c8 100644
--- a/src/test/ui/self/self-vs-path-ambiguity.rs
+++ b/tests/ui/self/self-vs-path-ambiguity.rs
diff --git a/src/test/ui/self/self-vs-path-ambiguity.stderr b/tests/ui/self/self-vs-path-ambiguity.stderr
index 2beef50cd..2beef50cd 100644
--- a/src/test/ui/self/self-vs-path-ambiguity.stderr
+++ b/tests/ui/self/self-vs-path-ambiguity.stderr
diff --git a/src/test/ui/self/self_lifetime-async.rs b/tests/ui/self/self_lifetime-async.rs
index c3c6e5658..c3c6e5658 100644
--- a/src/test/ui/self/self_lifetime-async.rs
+++ b/tests/ui/self/self_lifetime-async.rs
diff --git a/src/test/ui/self/self_lifetime.rs b/tests/ui/self/self_lifetime.rs
index f04bd83ab..f04bd83ab 100644
--- a/src/test/ui/self/self_lifetime.rs
+++ b/tests/ui/self/self_lifetime.rs
diff --git a/src/test/ui/self/self_type_keyword-2.rs b/tests/ui/self/self_type_keyword-2.rs
index cfb87f518..cfb87f518 100644
--- a/src/test/ui/self/self_type_keyword-2.rs
+++ b/tests/ui/self/self_type_keyword-2.rs
diff --git a/src/test/ui/self/self_type_keyword-2.stderr b/tests/ui/self/self_type_keyword-2.stderr
index 4e931f91f..4e931f91f 100644
--- a/src/test/ui/self/self_type_keyword-2.stderr
+++ b/tests/ui/self/self_type_keyword-2.stderr
diff --git a/src/test/ui/self/self_type_keyword.rs b/tests/ui/self/self_type_keyword.rs
index b42bf8eea..b42bf8eea 100644
--- a/src/test/ui/self/self_type_keyword.rs
+++ b/tests/ui/self/self_type_keyword.rs
diff --git a/src/test/ui/self/self_type_keyword.stderr b/tests/ui/self/self_type_keyword.stderr
index aca08d811..aca08d811 100644
--- a/src/test/ui/self/self_type_keyword.stderr
+++ b/tests/ui/self/self_type_keyword.stderr
diff --git a/src/test/ui/self/string-self-append.rs b/tests/ui/self/string-self-append.rs
index e63dc0090..e63dc0090 100644
--- a/src/test/ui/self/string-self-append.rs
+++ b/tests/ui/self/string-self-append.rs
diff --git a/src/test/ui/self/suggest-self-2.rs b/tests/ui/self/suggest-self-2.rs
index 1e001827e..1e001827e 100644
--- a/src/test/ui/self/suggest-self-2.rs
+++ b/tests/ui/self/suggest-self-2.rs
diff --git a/src/test/ui/self/suggest-self-2.stderr b/tests/ui/self/suggest-self-2.stderr
index 4bd025ea0..4bd025ea0 100644
--- a/src/test/ui/self/suggest-self-2.stderr
+++ b/tests/ui/self/suggest-self-2.stderr
diff --git a/src/test/ui/self/suggest-self.rs b/tests/ui/self/suggest-self.rs
index 1cc17116e..1cc17116e 100644
--- a/src/test/ui/self/suggest-self.rs
+++ b/tests/ui/self/suggest-self.rs
diff --git a/src/test/ui/self/suggest-self.stderr b/tests/ui/self/suggest-self.stderr
index 0d38b9d87..0d38b9d87 100644
--- a/src/test/ui/self/suggest-self.stderr
+++ b/tests/ui/self/suggest-self.stderr
diff --git a/src/test/ui/self/ufcs-explicit-self.rs b/tests/ui/self/ufcs-explicit-self.rs
index d83af14d3..d83af14d3 100644
--- a/src/test/ui/self/ufcs-explicit-self.rs
+++ b/tests/ui/self/ufcs-explicit-self.rs
diff --git a/src/test/ui/self/uniq-self-in-mut-slot.rs b/tests/ui/self/uniq-self-in-mut-slot.rs
index 71e57d8c1..71e57d8c1 100644
--- a/src/test/ui/self/uniq-self-in-mut-slot.rs
+++ b/tests/ui/self/uniq-self-in-mut-slot.rs
diff --git a/src/test/ui/self/where-for-self.rs b/tests/ui/self/where-for-self.rs
index 76c592dc4..76c592dc4 100644
--- a/src/test/ui/self/where-for-self.rs
+++ b/tests/ui/self/where-for-self.rs
diff --git a/src/test/ui/sepcomp/auxiliary/sepcomp-extern-lib.rs b/tests/ui/sepcomp/auxiliary/sepcomp-extern-lib.rs
index 73fb5e8f3..73fb5e8f3 100644
--- a/src/test/ui/sepcomp/auxiliary/sepcomp-extern-lib.rs
+++ b/tests/ui/sepcomp/auxiliary/sepcomp-extern-lib.rs
diff --git a/src/test/ui/sepcomp/auxiliary/sepcomp_cci_lib.rs b/tests/ui/sepcomp/auxiliary/sepcomp_cci_lib.rs
index 64e34a56d..64e34a56d 100644
--- a/src/test/ui/sepcomp/auxiliary/sepcomp_cci_lib.rs
+++ b/tests/ui/sepcomp/auxiliary/sepcomp_cci_lib.rs
diff --git a/src/test/ui/sepcomp/auxiliary/sepcomp_lib.rs b/tests/ui/sepcomp/auxiliary/sepcomp_lib.rs
index 1536228c2..1536228c2 100644
--- a/src/test/ui/sepcomp/auxiliary/sepcomp_lib.rs
+++ b/tests/ui/sepcomp/auxiliary/sepcomp_lib.rs
diff --git a/src/test/ui/sepcomp/sepcomp-cci.rs b/tests/ui/sepcomp/sepcomp-cci.rs
index 02bbab30e..02bbab30e 100644
--- a/src/test/ui/sepcomp/sepcomp-cci.rs
+++ b/tests/ui/sepcomp/sepcomp-cci.rs
diff --git a/src/test/ui/sepcomp/sepcomp-extern.rs b/tests/ui/sepcomp/sepcomp-extern.rs
index 6323bf664..6323bf664 100644
--- a/src/test/ui/sepcomp/sepcomp-extern.rs
+++ b/tests/ui/sepcomp/sepcomp-extern.rs
diff --git a/src/test/ui/sepcomp/sepcomp-fns-backwards.rs b/tests/ui/sepcomp/sepcomp-fns-backwards.rs
index f56769e2b..f56769e2b 100644
--- a/src/test/ui/sepcomp/sepcomp-fns-backwards.rs
+++ b/tests/ui/sepcomp/sepcomp-fns-backwards.rs
diff --git a/src/test/ui/sepcomp/sepcomp-fns.rs b/tests/ui/sepcomp/sepcomp-fns.rs
index a432c8960..a432c8960 100644
--- a/src/test/ui/sepcomp/sepcomp-fns.rs
+++ b/tests/ui/sepcomp/sepcomp-fns.rs
diff --git a/src/test/ui/sepcomp/sepcomp-lib-lto.rs b/tests/ui/sepcomp/sepcomp-lib-lto.rs
index 51a572899..51a572899 100644
--- a/src/test/ui/sepcomp/sepcomp-lib-lto.rs
+++ b/tests/ui/sepcomp/sepcomp-lib-lto.rs
diff --git a/src/test/ui/sepcomp/sepcomp-lib.rs b/tests/ui/sepcomp/sepcomp-lib.rs
index 728dc078b..728dc078b 100644
--- a/src/test/ui/sepcomp/sepcomp-lib.rs
+++ b/tests/ui/sepcomp/sepcomp-lib.rs
diff --git a/src/test/ui/sepcomp/sepcomp-statics.rs b/tests/ui/sepcomp/sepcomp-statics.rs
index 5457c8a0a..5457c8a0a 100644
--- a/src/test/ui/sepcomp/sepcomp-statics.rs
+++ b/tests/ui/sepcomp/sepcomp-statics.rs
diff --git a/src/test/ui/sepcomp/sepcomp-unwind.rs b/tests/ui/sepcomp/sepcomp-unwind.rs
index a59e25a27..a59e25a27 100644
--- a/src/test/ui/sepcomp/sepcomp-unwind.rs
+++ b/tests/ui/sepcomp/sepcomp-unwind.rs
diff --git a/src/test/ui/seq-args.rs b/tests/ui/seq-args.rs
index a5ebeecd3..a5ebeecd3 100644
--- a/src/test/ui/seq-args.rs
+++ b/tests/ui/seq-args.rs
diff --git a/src/test/ui/seq-args.stderr b/tests/ui/seq-args.stderr
index c404d9574..c404d9574 100644
--- a/src/test/ui/seq-args.stderr
+++ b/tests/ui/seq-args.stderr
diff --git a/src/test/ui/shadow-bool.rs b/tests/ui/shadow-bool.rs
index f290a329e..f290a329e 100644
--- a/src/test/ui/shadow-bool.rs
+++ b/tests/ui/shadow-bool.rs
diff --git a/src/test/ui/shadowed-use-visibility.rs b/tests/ui/shadowed-use-visibility.rs
index 350fbfeae..350fbfeae 100644
--- a/src/test/ui/shadowed-use-visibility.rs
+++ b/tests/ui/shadowed-use-visibility.rs
diff --git a/src/test/ui/shadowed/shadowed-lifetime.rs b/tests/ui/shadowed/shadowed-lifetime.rs
index 9487b4f4e..9487b4f4e 100644
--- a/src/test/ui/shadowed/shadowed-lifetime.rs
+++ b/tests/ui/shadowed/shadowed-lifetime.rs
diff --git a/src/test/ui/shadowed/shadowed-lifetime.stderr b/tests/ui/shadowed/shadowed-lifetime.stderr
index 68cc505d3..68cc505d3 100644
--- a/src/test/ui/shadowed/shadowed-lifetime.stderr
+++ b/tests/ui/shadowed/shadowed-lifetime.stderr
diff --git a/src/test/ui/shadowed/shadowed-trait-methods.rs b/tests/ui/shadowed/shadowed-trait-methods.rs
index f9c25d979..f9c25d979 100644
--- a/src/test/ui/shadowed/shadowed-trait-methods.rs
+++ b/tests/ui/shadowed/shadowed-trait-methods.rs
diff --git a/src/test/ui/shadowed/shadowed-trait-methods.stderr b/tests/ui/shadowed/shadowed-trait-methods.stderr
index c3b9084af..c3b9084af 100644
--- a/src/test/ui/shadowed/shadowed-trait-methods.stderr
+++ b/tests/ui/shadowed/shadowed-trait-methods.stderr
diff --git a/src/test/ui/shadowed/shadowed-type-parameter.rs b/tests/ui/shadowed/shadowed-type-parameter.rs
index 66fd68a9f..66fd68a9f 100644
--- a/src/test/ui/shadowed/shadowed-type-parameter.rs
+++ b/tests/ui/shadowed/shadowed-type-parameter.rs
diff --git a/src/test/ui/shadowed/shadowed-type-parameter.stderr b/tests/ui/shadowed/shadowed-type-parameter.stderr
index 0ea82f983..0ea82f983 100644
--- a/src/test/ui/shadowed/shadowed-type-parameter.stderr
+++ b/tests/ui/shadowed/shadowed-type-parameter.stderr
diff --git a/src/test/ui/shadowed/shadowed-use-visibility.rs b/tests/ui/shadowed/shadowed-use-visibility.rs
index 6b801972f..6b801972f 100644
--- a/src/test/ui/shadowed/shadowed-use-visibility.rs
+++ b/tests/ui/shadowed/shadowed-use-visibility.rs
diff --git a/src/test/ui/shadowed/shadowed-use-visibility.stderr b/tests/ui/shadowed/shadowed-use-visibility.stderr
index 1a642ae6e..1a642ae6e 100644
--- a/src/test/ui/shadowed/shadowed-use-visibility.stderr
+++ b/tests/ui/shadowed/shadowed-use-visibility.stderr
diff --git a/src/test/ui/shadowed/shadowing-in-the-same-pattern.rs b/tests/ui/shadowed/shadowing-in-the-same-pattern.rs
index f5872f9fb..f5872f9fb 100644
--- a/src/test/ui/shadowed/shadowing-in-the-same-pattern.rs
+++ b/tests/ui/shadowed/shadowing-in-the-same-pattern.rs
diff --git a/src/test/ui/shadowed/shadowing-in-the-same-pattern.stderr b/tests/ui/shadowed/shadowing-in-the-same-pattern.stderr
index 1c51653db..1c51653db 100644
--- a/src/test/ui/shadowed/shadowing-in-the-same-pattern.stderr
+++ b/tests/ui/shadowed/shadowing-in-the-same-pattern.stderr
diff --git a/src/test/ui/short-error-format.rs b/tests/ui/short-error-format.rs
index acba4674a..acba4674a 100644
--- a/src/test/ui/short-error-format.rs
+++ b/tests/ui/short-error-format.rs
diff --git a/src/test/ui/short-error-format.stderr b/tests/ui/short-error-format.stderr
index 8a22d673b..8a22d673b 100644
--- a/src/test/ui/short-error-format.stderr
+++ b/tests/ui/short-error-format.stderr
diff --git a/src/test/ui/simd/array-trait.rs b/tests/ui/simd/array-trait.rs
index 45c10b378..45c10b378 100644
--- a/src/test/ui/simd/array-trait.rs
+++ b/tests/ui/simd/array-trait.rs
diff --git a/src/test/ui/simd/array-trait.stderr b/tests/ui/simd/array-trait.stderr
index 765215c39..765215c39 100644
--- a/src/test/ui/simd/array-trait.stderr
+++ b/tests/ui/simd/array-trait.stderr
diff --git a/src/test/ui/simd/array-type.rs b/tests/ui/simd/array-type.rs
index 7d66395a3..7d66395a3 100644
--- a/src/test/ui/simd/array-type.rs
+++ b/tests/ui/simd/array-type.rs
diff --git a/src/test/ui/simd/generics.rs b/tests/ui/simd/generics.rs
index fa9d35ee4..fa9d35ee4 100644
--- a/src/test/ui/simd/generics.rs
+++ b/tests/ui/simd/generics.rs
diff --git a/src/test/ui/simd/intrinsic/float-math-pass.rs b/tests/ui/simd/intrinsic/float-math-pass.rs
index 7a4f74665..7a4f74665 100644
--- a/src/test/ui/simd/intrinsic/float-math-pass.rs
+++ b/tests/ui/simd/intrinsic/float-math-pass.rs
diff --git a/src/test/ui/simd/intrinsic/float-minmax-pass.rs b/tests/ui/simd/intrinsic/float-minmax-pass.rs
index d79be61f9..d79be61f9 100644
--- a/src/test/ui/simd/intrinsic/float-minmax-pass.rs
+++ b/tests/ui/simd/intrinsic/float-minmax-pass.rs
diff --git a/src/test/ui/simd/intrinsic/generic-arithmetic-2.rs b/tests/ui/simd/intrinsic/generic-arithmetic-2.rs
index 3576eed71..3576eed71 100644
--- a/src/test/ui/simd/intrinsic/generic-arithmetic-2.rs
+++ b/tests/ui/simd/intrinsic/generic-arithmetic-2.rs
diff --git a/src/test/ui/simd/intrinsic/generic-arithmetic-2.stderr b/tests/ui/simd/intrinsic/generic-arithmetic-2.stderr
index 0f0a7ea66..0f0a7ea66 100644
--- a/src/test/ui/simd/intrinsic/generic-arithmetic-2.stderr
+++ b/tests/ui/simd/intrinsic/generic-arithmetic-2.stderr
diff --git a/src/test/ui/simd/intrinsic/generic-arithmetic-pass.rs b/tests/ui/simd/intrinsic/generic-arithmetic-pass.rs
index c507b8d31..c507b8d31 100644
--- a/src/test/ui/simd/intrinsic/generic-arithmetic-pass.rs
+++ b/tests/ui/simd/intrinsic/generic-arithmetic-pass.rs
diff --git a/src/test/ui/simd/intrinsic/generic-arithmetic-saturating-2.rs b/tests/ui/simd/intrinsic/generic-arithmetic-saturating-2.rs
index 9736d1b96..9736d1b96 100644
--- a/src/test/ui/simd/intrinsic/generic-arithmetic-saturating-2.rs
+++ b/tests/ui/simd/intrinsic/generic-arithmetic-saturating-2.rs
diff --git a/src/test/ui/simd/intrinsic/generic-arithmetic-saturating-2.stderr b/tests/ui/simd/intrinsic/generic-arithmetic-saturating-2.stderr
index f349cb565..f349cb565 100644
--- a/src/test/ui/simd/intrinsic/generic-arithmetic-saturating-2.stderr
+++ b/tests/ui/simd/intrinsic/generic-arithmetic-saturating-2.stderr
diff --git a/src/test/ui/simd/intrinsic/generic-arithmetic-saturating-pass.rs b/tests/ui/simd/intrinsic/generic-arithmetic-saturating-pass.rs
index c11d14b99..c11d14b99 100644
--- a/src/test/ui/simd/intrinsic/generic-arithmetic-saturating-pass.rs
+++ b/tests/ui/simd/intrinsic/generic-arithmetic-saturating-pass.rs
diff --git a/src/test/ui/simd/intrinsic/generic-as.rs b/tests/ui/simd/intrinsic/generic-as.rs
index a975190a2..a975190a2 100644
--- a/src/test/ui/simd/intrinsic/generic-as.rs
+++ b/tests/ui/simd/intrinsic/generic-as.rs
diff --git a/src/test/ui/simd/intrinsic/generic-bitmask-pass.rs b/tests/ui/simd/intrinsic/generic-bitmask-pass.rs
index 8c436841b..8c436841b 100644
--- a/src/test/ui/simd/intrinsic/generic-bitmask-pass.rs
+++ b/tests/ui/simd/intrinsic/generic-bitmask-pass.rs
diff --git a/src/test/ui/simd/intrinsic/generic-bitmask.rs b/tests/ui/simd/intrinsic/generic-bitmask.rs
index 9a23dae77..9a23dae77 100644
--- a/src/test/ui/simd/intrinsic/generic-bitmask.rs
+++ b/tests/ui/simd/intrinsic/generic-bitmask.rs
diff --git a/src/test/ui/simd/intrinsic/generic-bitmask.stderr b/tests/ui/simd/intrinsic/generic-bitmask.stderr
index 0de3f8eea..0de3f8eea 100644
--- a/src/test/ui/simd/intrinsic/generic-bitmask.stderr
+++ b/tests/ui/simd/intrinsic/generic-bitmask.stderr
diff --git a/src/test/ui/simd/intrinsic/generic-cast-pass.rs b/tests/ui/simd/intrinsic/generic-cast-pass.rs
index 15f232e2c..15f232e2c 100644
--- a/src/test/ui/simd/intrinsic/generic-cast-pass.rs
+++ b/tests/ui/simd/intrinsic/generic-cast-pass.rs
diff --git a/src/test/ui/simd/intrinsic/generic-cast-pointer-width.rs b/tests/ui/simd/intrinsic/generic-cast-pointer-width.rs
index b9382310d..b9382310d 100644
--- a/src/test/ui/simd/intrinsic/generic-cast-pointer-width.rs
+++ b/tests/ui/simd/intrinsic/generic-cast-pointer-width.rs
diff --git a/src/test/ui/simd/intrinsic/generic-cast.rs b/tests/ui/simd/intrinsic/generic-cast.rs
index 4f4fa06b0..4f4fa06b0 100644
--- a/src/test/ui/simd/intrinsic/generic-cast.rs
+++ b/tests/ui/simd/intrinsic/generic-cast.rs
diff --git a/src/test/ui/simd/intrinsic/generic-cast.stderr b/tests/ui/simd/intrinsic/generic-cast.stderr
index 2226bbbe1..2226bbbe1 100644
--- a/src/test/ui/simd/intrinsic/generic-cast.stderr
+++ b/tests/ui/simd/intrinsic/generic-cast.stderr
diff --git a/src/test/ui/simd/intrinsic/generic-comparison-pass.rs b/tests/ui/simd/intrinsic/generic-comparison-pass.rs
index da5c42a1a..da5c42a1a 100644
--- a/src/test/ui/simd/intrinsic/generic-comparison-pass.rs
+++ b/tests/ui/simd/intrinsic/generic-comparison-pass.rs
diff --git a/src/test/ui/simd/intrinsic/generic-comparison.rs b/tests/ui/simd/intrinsic/generic-comparison.rs
index 3cd38042f..3cd38042f 100644
--- a/src/test/ui/simd/intrinsic/generic-comparison.rs
+++ b/tests/ui/simd/intrinsic/generic-comparison.rs
diff --git a/src/test/ui/simd/intrinsic/generic-comparison.stderr b/tests/ui/simd/intrinsic/generic-comparison.stderr
index 0eae2688b..0eae2688b 100644
--- a/src/test/ui/simd/intrinsic/generic-comparison.stderr
+++ b/tests/ui/simd/intrinsic/generic-comparison.stderr
diff --git a/src/test/ui/simd/intrinsic/generic-elements-pass.rs b/tests/ui/simd/intrinsic/generic-elements-pass.rs
index 3c913c0ad..3c913c0ad 100644
--- a/src/test/ui/simd/intrinsic/generic-elements-pass.rs
+++ b/tests/ui/simd/intrinsic/generic-elements-pass.rs
diff --git a/src/test/ui/simd/intrinsic/generic-elements.rs b/tests/ui/simd/intrinsic/generic-elements.rs
index abde69163..abde69163 100644
--- a/src/test/ui/simd/intrinsic/generic-elements.rs
+++ b/tests/ui/simd/intrinsic/generic-elements.rs
diff --git a/src/test/ui/simd/intrinsic/generic-elements.stderr b/tests/ui/simd/intrinsic/generic-elements.stderr
index 5b423f704..5b423f704 100644
--- a/src/test/ui/simd/intrinsic/generic-elements.stderr
+++ b/tests/ui/simd/intrinsic/generic-elements.stderr
diff --git a/src/test/ui/simd/intrinsic/generic-gather-pass.rs b/tests/ui/simd/intrinsic/generic-gather-pass.rs
index 805caebe5..805caebe5 100644
--- a/src/test/ui/simd/intrinsic/generic-gather-pass.rs
+++ b/tests/ui/simd/intrinsic/generic-gather-pass.rs
diff --git a/src/test/ui/simd/intrinsic/generic-reduction-pass.rs b/tests/ui/simd/intrinsic/generic-reduction-pass.rs
index 4a54afee8..4a54afee8 100644
--- a/src/test/ui/simd/intrinsic/generic-reduction-pass.rs
+++ b/tests/ui/simd/intrinsic/generic-reduction-pass.rs
diff --git a/src/test/ui/simd/intrinsic/generic-reduction.rs b/tests/ui/simd/intrinsic/generic-reduction.rs
index ede4b26d1..ede4b26d1 100644
--- a/src/test/ui/simd/intrinsic/generic-reduction.rs
+++ b/tests/ui/simd/intrinsic/generic-reduction.rs
diff --git a/src/test/ui/simd/intrinsic/generic-reduction.stderr b/tests/ui/simd/intrinsic/generic-reduction.stderr
index 1028faf69..1028faf69 100644
--- a/src/test/ui/simd/intrinsic/generic-reduction.stderr
+++ b/tests/ui/simd/intrinsic/generic-reduction.stderr
diff --git a/src/test/ui/simd/intrinsic/generic-select-pass.rs b/tests/ui/simd/intrinsic/generic-select-pass.rs
index b850cf975..b850cf975 100644
--- a/src/test/ui/simd/intrinsic/generic-select-pass.rs
+++ b/tests/ui/simd/intrinsic/generic-select-pass.rs
diff --git a/src/test/ui/simd/intrinsic/generic-select.rs b/tests/ui/simd/intrinsic/generic-select.rs
index 248e82ea2..248e82ea2 100644
--- a/src/test/ui/simd/intrinsic/generic-select.rs
+++ b/tests/ui/simd/intrinsic/generic-select.rs
diff --git a/src/test/ui/simd/intrinsic/generic-select.stderr b/tests/ui/simd/intrinsic/generic-select.stderr
index d576f1bc7..d576f1bc7 100644
--- a/src/test/ui/simd/intrinsic/generic-select.stderr
+++ b/tests/ui/simd/intrinsic/generic-select.stderr
diff --git a/src/test/ui/simd/intrinsic/generic-shuffle.rs b/tests/ui/simd/intrinsic/generic-shuffle.rs
index 9611780ac..9611780ac 100644
--- a/src/test/ui/simd/intrinsic/generic-shuffle.rs
+++ b/tests/ui/simd/intrinsic/generic-shuffle.rs
diff --git a/src/test/ui/simd/intrinsic/generic-shuffle.stderr b/tests/ui/simd/intrinsic/generic-shuffle.stderr
index 81e641612..81e641612 100644
--- a/src/test/ui/simd/intrinsic/generic-shuffle.stderr
+++ b/tests/ui/simd/intrinsic/generic-shuffle.stderr
diff --git a/src/test/ui/simd/intrinsic/inlining-issue67557-ice.rs b/tests/ui/simd/intrinsic/inlining-issue67557-ice.rs
index 7221b3ab7..7221b3ab7 100644
--- a/src/test/ui/simd/intrinsic/inlining-issue67557-ice.rs
+++ b/tests/ui/simd/intrinsic/inlining-issue67557-ice.rs
diff --git a/src/test/ui/simd/intrinsic/inlining-issue67557.rs b/tests/ui/simd/intrinsic/inlining-issue67557.rs
index 0d1542709..0d1542709 100644
--- a/src/test/ui/simd/intrinsic/inlining-issue67557.rs
+++ b/tests/ui/simd/intrinsic/inlining-issue67557.rs
diff --git a/src/test/ui/simd/intrinsic/issue-85855.rs b/tests/ui/simd/intrinsic/issue-85855.rs
index f276fbd66..f276fbd66 100644
--- a/src/test/ui/simd/intrinsic/issue-85855.rs
+++ b/tests/ui/simd/intrinsic/issue-85855.rs
diff --git a/src/test/ui/simd/intrinsic/issue-85855.stderr b/tests/ui/simd/intrinsic/issue-85855.stderr
index fb2f1fbc5..fb2f1fbc5 100644
--- a/src/test/ui/simd/intrinsic/issue-85855.stderr
+++ b/tests/ui/simd/intrinsic/issue-85855.stderr
diff --git a/src/test/ui/simd/intrinsic/ptr-cast.rs b/tests/ui/simd/intrinsic/ptr-cast.rs
index 1d13720bc..1d13720bc 100644
--- a/src/test/ui/simd/intrinsic/ptr-cast.rs
+++ b/tests/ui/simd/intrinsic/ptr-cast.rs
diff --git a/src/test/ui/simd/issue-17170.rs b/tests/ui/simd/issue-17170.rs
index 8d70dacdc..8d70dacdc 100644
--- a/src/test/ui/simd/issue-17170.rs
+++ b/tests/ui/simd/issue-17170.rs
diff --git a/src/test/ui/simd/issue-32947.rs b/tests/ui/simd/issue-32947.rs
index b07def21e..b07def21e 100644
--- a/src/test/ui/simd/issue-32947.rs
+++ b/tests/ui/simd/issue-32947.rs
diff --git a/src/test/ui/simd/issue-39720.rs b/tests/ui/simd/issue-39720.rs
index 8cf841f93..8cf841f93 100644
--- a/src/test/ui/simd/issue-39720.rs
+++ b/tests/ui/simd/issue-39720.rs
diff --git a/src/test/ui/simd/issue-85915-simd-ptrs.rs b/tests/ui/simd/issue-85915-simd-ptrs.rs
index 6fe415545..6fe415545 100644
--- a/src/test/ui/simd/issue-85915-simd-ptrs.rs
+++ b/tests/ui/simd/issue-85915-simd-ptrs.rs
diff --git a/src/test/ui/simd/issue-89193.rs b/tests/ui/simd/issue-89193.rs
index 79c4e6a31..79c4e6a31 100644
--- a/src/test/ui/simd/issue-89193.rs
+++ b/tests/ui/simd/issue-89193.rs
diff --git a/src/test/ui/simd/libm_no_std_cant_float.rs b/tests/ui/simd/libm_no_std_cant_float.rs
index 50ac8e208..50ac8e208 100644
--- a/src/test/ui/simd/libm_no_std_cant_float.rs
+++ b/tests/ui/simd/libm_no_std_cant_float.rs
diff --git a/src/test/ui/simd/libm_no_std_cant_float.stderr b/tests/ui/simd/libm_no_std_cant_float.stderr
index 97e0b7efe..97e0b7efe 100644
--- a/src/test/ui/simd/libm_no_std_cant_float.stderr
+++ b/tests/ui/simd/libm_no_std_cant_float.stderr
diff --git a/src/test/ui/simd/libm_std_can_float.rs b/tests/ui/simd/libm_std_can_float.rs
index 1c520856e..1c520856e 100644
--- a/src/test/ui/simd/libm_std_can_float.rs
+++ b/tests/ui/simd/libm_std_can_float.rs
diff --git a/src/test/ui/simd/monomorphize-shuffle-index.rs b/tests/ui/simd/monomorphize-shuffle-index.rs
index 2467baa08..2467baa08 100644
--- a/src/test/ui/simd/monomorphize-shuffle-index.rs
+++ b/tests/ui/simd/monomorphize-shuffle-index.rs
diff --git a/src/test/ui/simd/portable-intrinsics-arent-exposed.rs b/tests/ui/simd/portable-intrinsics-arent-exposed.rs
index 667c8b67b..667c8b67b 100644
--- a/src/test/ui/simd/portable-intrinsics-arent-exposed.rs
+++ b/tests/ui/simd/portable-intrinsics-arent-exposed.rs
diff --git a/src/test/ui/simd/portable-intrinsics-arent-exposed.stderr b/tests/ui/simd/portable-intrinsics-arent-exposed.stderr
index 8881ede0d..f8b3e6d65 100644
--- a/src/test/ui/simd/portable-intrinsics-arent-exposed.stderr
+++ b/tests/ui/simd/portable-intrinsics-arent-exposed.stderr
@@ -15,7 +15,7 @@ LL | use std::simd::intrinsics;
 help: consider importing this module instead
    |
 LL | use std::intrinsics;
-   |     ~~~~~~~~~~~~~~~~
+   |     ~~~~~~~~~~~~~~~
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/simd/shuffle-not-out-of-bounds.rs b/tests/ui/simd/shuffle-not-out-of-bounds.rs
index 0dee3a0e8..0dee3a0e8 100644
--- a/src/test/ui/simd/shuffle-not-out-of-bounds.rs
+++ b/tests/ui/simd/shuffle-not-out-of-bounds.rs
diff --git a/src/test/ui/simd/shuffle-not-out-of-bounds.stderr b/tests/ui/simd/shuffle-not-out-of-bounds.stderr
index 415f04d93..415f04d93 100644
--- a/src/test/ui/simd/shuffle-not-out-of-bounds.stderr
+++ b/tests/ui/simd/shuffle-not-out-of-bounds.stderr
diff --git a/src/test/ui/simd/shuffle.rs b/tests/ui/simd/shuffle.rs
index 3592adfdc..3592adfdc 100644
--- a/src/test/ui/simd/shuffle.rs
+++ b/tests/ui/simd/shuffle.rs
diff --git a/src/test/ui/simd/simd-bitmask.rs b/tests/ui/simd/simd-bitmask.rs
index 14ee2e741..14ee2e741 100644
--- a/src/test/ui/simd/simd-bitmask.rs
+++ b/tests/ui/simd/simd-bitmask.rs
diff --git a/src/test/ui/simd/size-align.rs b/tests/ui/simd/size-align.rs
index 0afa49472..0afa49472 100644
--- a/src/test/ui/simd/size-align.rs
+++ b/tests/ui/simd/size-align.rs
diff --git a/src/test/ui/simd/target-feature-mixup.rs b/tests/ui/simd/target-feature-mixup.rs
index 5dd163715..5dd163715 100644
--- a/src/test/ui/simd/target-feature-mixup.rs
+++ b/tests/ui/simd/target-feature-mixup.rs
diff --git a/src/test/ui/simd/type-generic-monomorphisation-empty.rs b/tests/ui/simd/type-generic-monomorphisation-empty.rs
index 2bf6641e9..2bf6641e9 100644
--- a/src/test/ui/simd/type-generic-monomorphisation-empty.rs
+++ b/tests/ui/simd/type-generic-monomorphisation-empty.rs
diff --git a/src/test/ui/simd/type-generic-monomorphisation-empty.stderr b/tests/ui/simd/type-generic-monomorphisation-empty.stderr
index b334b1f4b..b334b1f4b 100644
--- a/src/test/ui/simd/type-generic-monomorphisation-empty.stderr
+++ b/tests/ui/simd/type-generic-monomorphisation-empty.stderr
diff --git a/src/test/ui/simd/type-generic-monomorphisation-extern-nonnull-ptr.rs b/tests/ui/simd/type-generic-monomorphisation-extern-nonnull-ptr.rs
index ae321c974..ae321c974 100644
--- a/src/test/ui/simd/type-generic-monomorphisation-extern-nonnull-ptr.rs
+++ b/tests/ui/simd/type-generic-monomorphisation-extern-nonnull-ptr.rs
diff --git a/src/test/ui/simd/type-generic-monomorphisation-non-primitive.rs b/tests/ui/simd/type-generic-monomorphisation-non-primitive.rs
index 0bc73b155..0bc73b155 100644
--- a/src/test/ui/simd/type-generic-monomorphisation-non-primitive.rs
+++ b/tests/ui/simd/type-generic-monomorphisation-non-primitive.rs
diff --git a/src/test/ui/simd/type-generic-monomorphisation-non-primitive.stderr b/tests/ui/simd/type-generic-monomorphisation-non-primitive.stderr
index 9e8f06b82..9e8f06b82 100644
--- a/src/test/ui/simd/type-generic-monomorphisation-non-primitive.stderr
+++ b/tests/ui/simd/type-generic-monomorphisation-non-primitive.stderr
diff --git a/src/test/ui/simd/type-generic-monomorphisation-oversized.rs b/tests/ui/simd/type-generic-monomorphisation-oversized.rs
index a7dc482f3..a7dc482f3 100644
--- a/src/test/ui/simd/type-generic-monomorphisation-oversized.rs
+++ b/tests/ui/simd/type-generic-monomorphisation-oversized.rs
diff --git a/src/test/ui/simd/type-generic-monomorphisation-oversized.stderr b/tests/ui/simd/type-generic-monomorphisation-oversized.stderr
index a2dba1222..a2dba1222 100644
--- a/src/test/ui/simd/type-generic-monomorphisation-oversized.stderr
+++ b/tests/ui/simd/type-generic-monomorphisation-oversized.stderr
diff --git a/src/test/ui/simd/type-generic-monomorphisation-power-of-two.rs b/tests/ui/simd/type-generic-monomorphisation-power-of-two.rs
index 9b645d363..9b645d363 100644
--- a/src/test/ui/simd/type-generic-monomorphisation-power-of-two.rs
+++ b/tests/ui/simd/type-generic-monomorphisation-power-of-two.rs
diff --git a/src/test/ui/simd/type-generic-monomorphisation-wide-ptr.rs b/tests/ui/simd/type-generic-monomorphisation-wide-ptr.rs
index 3e02b08ce..3e02b08ce 100644
--- a/src/test/ui/simd/type-generic-monomorphisation-wide-ptr.rs
+++ b/tests/ui/simd/type-generic-monomorphisation-wide-ptr.rs
diff --git a/src/test/ui/simd/type-generic-monomorphisation-wide-ptr.stderr b/tests/ui/simd/type-generic-monomorphisation-wide-ptr.stderr
index 3888e7a0f..3888e7a0f 100644
--- a/src/test/ui/simd/type-generic-monomorphisation-wide-ptr.stderr
+++ b/tests/ui/simd/type-generic-monomorphisation-wide-ptr.stderr
diff --git a/src/test/ui/simd/type-generic-monomorphisation.rs b/tests/ui/simd/type-generic-monomorphisation.rs
index 12f9d65d7..12f9d65d7 100644
--- a/src/test/ui/simd/type-generic-monomorphisation.rs
+++ b/tests/ui/simd/type-generic-monomorphisation.rs
diff --git a/src/test/ui/simd/type-generic-monomorphisation.stderr b/tests/ui/simd/type-generic-monomorphisation.stderr
index 7f23893ac..7f23893ac 100644
--- a/src/test/ui/simd/type-generic-monomorphisation.stderr
+++ b/tests/ui/simd/type-generic-monomorphisation.stderr
diff --git a/src/test/ui/simd/type-len.rs b/tests/ui/simd/type-len.rs
index d82c70b8d..d82c70b8d 100644
--- a/src/test/ui/simd/type-len.rs
+++ b/tests/ui/simd/type-len.rs
diff --git a/src/test/ui/simd/type-len.stderr b/tests/ui/simd/type-len.stderr
index 2a6bd1b0f..2a6bd1b0f 100644
--- a/src/test/ui/simd/type-len.stderr
+++ b/tests/ui/simd/type-len.stderr
diff --git a/src/test/ui/simd/type-wide-ptr.rs b/tests/ui/simd/type-wide-ptr.rs
index 88f62a07e..88f62a07e 100644
--- a/src/test/ui/simd/type-wide-ptr.rs
+++ b/tests/ui/simd/type-wide-ptr.rs
diff --git a/src/test/ui/simd/type-wide-ptr.stderr b/tests/ui/simd/type-wide-ptr.stderr
index 51d3c0050..51d3c0050 100644
--- a/src/test/ui/simd/type-wide-ptr.stderr
+++ b/tests/ui/simd/type-wide-ptr.stderr
diff --git a/src/test/ui/simd/wasm-simd-indirect.rs b/tests/ui/simd/wasm-simd-indirect.rs
index 88f92fce2..88f92fce2 100644
--- a/src/test/ui/simd/wasm-simd-indirect.rs
+++ b/tests/ui/simd/wasm-simd-indirect.rs
diff --git a/src/test/ui/simple_global_asm.rs b/tests/ui/simple_global_asm.rs
index 3c69379ff..3c69379ff 100644
--- a/src/test/ui/simple_global_asm.rs
+++ b/tests/ui/simple_global_asm.rs
diff --git a/src/test/ui/single-use-lifetime/derive-eq.rs b/tests/ui/single-use-lifetime/derive-eq.rs
index e5bdfc55d..e5bdfc55d 100644
--- a/src/test/ui/single-use-lifetime/derive-eq.rs
+++ b/tests/ui/single-use-lifetime/derive-eq.rs
diff --git a/src/test/ui/single-use-lifetime/fn-types.rs b/tests/ui/single-use-lifetime/fn-types.rs
index 018535f64..018535f64 100644
--- a/src/test/ui/single-use-lifetime/fn-types.rs
+++ b/tests/ui/single-use-lifetime/fn-types.rs
diff --git a/src/test/ui/single-use-lifetime/fn-types.stderr b/tests/ui/single-use-lifetime/fn-types.stderr
index 55959def4..55959def4 100644
--- a/src/test/ui/single-use-lifetime/fn-types.stderr
+++ b/tests/ui/single-use-lifetime/fn-types.stderr
diff --git a/tests/ui/single-use-lifetime/issue-104440.rs b/tests/ui/single-use-lifetime/issue-104440.rs
new file mode 100644
index 000000000..0795e9530
--- /dev/null
+++ b/tests/ui/single-use-lifetime/issue-104440.rs
@@ -0,0 +1,100 @@
+#![feature(decl_macro, rustc_attrs)]
+#![deny(single_use_lifetimes)]
+
+mod type_params {
+    macro m($T:ident) {
+        fn f<$T: Clone, T: PartialEq>(t1: $T, t2: T) -> ($T, bool) {
+            (t1.clone(), t2 == t2)
+        }
+    }
+
+    #[rustc_macro_transparency = "semitransparent"]
+    macro n($T:ident) {
+        fn g<$T: Clone>(t1: $T, t2: T) -> (T, $T) {
+            (t1.clone(), t2.clone())
+        }
+        fn h<T: Clone>(t1: $T, t2: T) -> (T, $T) {
+            (t1.clone(), t2.clone())
+        }
+    }
+
+    #[rustc_macro_transparency = "transparent"]
+    macro p($T:ident) {
+        fn j<$T: Clone>(t1: $T, t2: T) -> (T, $T) {
+            (t1.clone(), t2.clone())
+        }
+        fn k<T: Clone>(t1: $T, t2: T) -> (T, $T) {
+            (t1.clone(), t2.clone())
+        }
+    }
+
+    m!(T);
+    n!(T);
+    p!(T);
+}
+
+mod lifetime_params {
+    macro m($a:lifetime) {
+        fn f<'b, 'c, $a: 'b, 'a: 'c>(t1: &$a(), t2: &'a ()) -> (&'b (), &'c ()) { //~ ERROR lifetime parameter `'a` only used once
+            (t1, t2)
+        }
+    }
+
+    #[rustc_macro_transparency = "semitransparent"]
+    macro n($a:lifetime) {
+        fn g<$a>(t1: &$a(), t2: &'a ()) -> (&'a (), &$a ()) {
+            (t1, t2)
+        }
+        fn h<'a>(t1: &$a(), t2: &'a ()) -> (&'a (), &$a ()) {
+            (t1, t2)
+        }
+    }
+
+    #[rustc_macro_transparency = "transparent"]
+    macro p($a:lifetime) {
+        fn j<$a>(t1: &$a(), t2: &'a ()) -> (&'a (), &$a ()) {
+            (t1, t2)
+        }
+        fn k<'a>(t1: &$a(), t2: &'a ()) -> (&'a (), &$a ()) {
+            (t1, t2)
+        }
+    }
+
+    m!('a); //~ ERROR lifetime parameter `'a` only used once
+    n!('a);
+    p!('a);
+}
+
+mod const_params {
+    macro m($C:ident) {
+        fn f<const $C: usize, const C: usize>(t1: [(); $C], t2: [(); C]) -> ([(); $C], [(); C]) {
+            (t1, t2)
+        }
+    }
+
+    #[rustc_macro_transparency = "semitransparent"]
+    macro n($C:ident) {
+        fn g<const $C: usize>(t1: [(); $C], t2: [(); C]) -> ([(); C], [(); $C]) {
+            (t1, t2)
+        }
+        fn h<const C: usize>(t1: [(); $C], t2: [(); C]) -> ([(); C], [(); $C]) {
+            (t1, t2)
+        }
+    }
+
+    #[rustc_macro_transparency = "transparent"]
+    macro p($C:ident) {
+        fn j<const $C: usize>(t1: [(); $C], t2: [(); C]) -> ([(); C], [(); $C]) {
+            (t1, t2)
+        }
+        fn k<const C: usize>(t1: [(); $C], t2: [(); C]) -> ([(); C], [(); $C]) {
+            (t1, t2)
+        }
+    }
+
+    m!(C);
+    n!(C);
+    p!(C);
+}
+
+fn main() {}
diff --git a/tests/ui/single-use-lifetime/issue-104440.stderr b/tests/ui/single-use-lifetime/issue-104440.stderr
new file mode 100644
index 000000000..54ded31dc
--- /dev/null
+++ b/tests/ui/single-use-lifetime/issue-104440.stderr
@@ -0,0 +1,28 @@
+error: lifetime parameter `'a` only used once
+  --> $DIR/issue-104440.rs:63:8
+   |
+LL |     m!('a);
+   |        ^^
+   |        |
+   |        this lifetime...
+   |        ...is used only here
+   |
+note: the lint level is defined here
+  --> $DIR/issue-104440.rs:2:9
+   |
+LL | #![deny(single_use_lifetimes)]
+   |         ^^^^^^^^^^^^^^^^^^^^
+
+error: lifetime parameter `'a` only used once
+  --> $DIR/issue-104440.rs:38:30
+   |
+LL |         fn f<'b, 'c, $a: 'b, 'a: 'c>(t1: &$a(), t2: &'a ()) -> (&'b (), &'c ()) {
+   |                              ^^ this lifetime...     -- ...is used only here
+...
+LL |     m!('a);
+   |     ------ in this macro invocation
+   |
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.rs b/tests/ui/single-use-lifetime/one-use-in-fn-argument.rs
index 7919ef820..7919ef820 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.rs
+++ b/tests/ui/single-use-lifetime/one-use-in-fn-argument.rs
diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr b/tests/ui/single-use-lifetime/one-use-in-fn-argument.stderr
index 93f16f5ba..93f16f5ba 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr
+++ b/tests/ui/single-use-lifetime/one-use-in-fn-argument.stderr
diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-return.rs b/tests/ui/single-use-lifetime/one-use-in-fn-return.rs
index 1ade01eed..1ade01eed 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-fn-return.rs
+++ b/tests/ui/single-use-lifetime/one-use-in-fn-return.rs
diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.rs b/tests/ui/single-use-lifetime/one-use-in-inherent-impl-header.rs
index 64f1c9118..64f1c9118 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.rs
+++ b/tests/ui/single-use-lifetime/one-use-in-inherent-impl-header.rs
diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr b/tests/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr
index 94129560f..94129560f 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr
+++ b/tests/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr
diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.rs b/tests/ui/single-use-lifetime/one-use-in-inherent-method-argument.rs
index eecd715ef..eecd715ef 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.rs
+++ b/tests/ui/single-use-lifetime/one-use-in-inherent-method-argument.rs
diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr b/tests/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr
index 39507785b..39507785b 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr
+++ b/tests/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr
diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.rs b/tests/ui/single-use-lifetime/one-use-in-inherent-method-return.rs
index c5938f4a1..c5938f4a1 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.rs
+++ b/tests/ui/single-use-lifetime/one-use-in-inherent-method-return.rs
diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr b/tests/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr
index 69578fe2f..69578fe2f 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr
+++ b/tests/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr
diff --git a/src/test/ui/single-use-lifetime/one-use-in-struct.rs b/tests/ui/single-use-lifetime/one-use-in-struct.rs
index 9cad942e7..9cad942e7 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-struct.rs
+++ b/tests/ui/single-use-lifetime/one-use-in-struct.rs
diff --git a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.rs b/tests/ui/single-use-lifetime/one-use-in-trait-method-argument.rs
index 1848fc91c..1848fc91c 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.rs
+++ b/tests/ui/single-use-lifetime/one-use-in-trait-method-argument.rs
diff --git a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr b/tests/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr
index 1a6e8310d..1a6e8310d 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr
+++ b/tests/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr
diff --git a/src/test/ui/single-use-lifetime/two-uses-in-fn-argument-and-return.rs b/tests/ui/single-use-lifetime/two-uses-in-fn-argument-and-return.rs
index f80f3f63c..f80f3f63c 100644
--- a/src/test/ui/single-use-lifetime/two-uses-in-fn-argument-and-return.rs
+++ b/tests/ui/single-use-lifetime/two-uses-in-fn-argument-and-return.rs
diff --git a/src/test/ui/single-use-lifetime/two-uses-in-fn-arguments.rs b/tests/ui/single-use-lifetime/two-uses-in-fn-arguments.rs
index 51724ebf8..51724ebf8 100644
--- a/src/test/ui/single-use-lifetime/two-uses-in-fn-arguments.rs
+++ b/tests/ui/single-use-lifetime/two-uses-in-fn-arguments.rs
diff --git a/src/test/ui/single-use-lifetime/two-uses-in-inherent-impl-header.rs b/tests/ui/single-use-lifetime/two-uses-in-inherent-impl-header.rs
index 125a395db..125a395db 100644
--- a/src/test/ui/single-use-lifetime/two-uses-in-inherent-impl-header.rs
+++ b/tests/ui/single-use-lifetime/two-uses-in-inherent-impl-header.rs
diff --git a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.rs b/tests/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.rs
index 06ab6cdbf..06ab6cdbf 100644
--- a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.rs
+++ b/tests/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.rs
diff --git a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr b/tests/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr
index 4794566ea..4794566ea 100644
--- a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr
+++ b/tests/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr
diff --git a/src/test/ui/single-use-lifetime/two-uses-in-trait-impl.rs b/tests/ui/single-use-lifetime/two-uses-in-trait-impl.rs
index 16431a39f..16431a39f 100644
--- a/src/test/ui/single-use-lifetime/two-uses-in-trait-impl.rs
+++ b/tests/ui/single-use-lifetime/two-uses-in-trait-impl.rs
diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-fn.fixed b/tests/ui/single-use-lifetime/zero-uses-in-fn.fixed
index 0f26a975a..0f26a975a 100644
--- a/src/test/ui/single-use-lifetime/zero-uses-in-fn.fixed
+++ b/tests/ui/single-use-lifetime/zero-uses-in-fn.fixed
diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-fn.rs b/tests/ui/single-use-lifetime/zero-uses-in-fn.rs
index 7f9504fe5..7f9504fe5 100644
--- a/src/test/ui/single-use-lifetime/zero-uses-in-fn.rs
+++ b/tests/ui/single-use-lifetime/zero-uses-in-fn.rs
diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr b/tests/ui/single-use-lifetime/zero-uses-in-fn.stderr
index 59c0164e3..59c0164e3 100644
--- a/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr
+++ b/tests/ui/single-use-lifetime/zero-uses-in-fn.stderr
diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-impl.rs b/tests/ui/single-use-lifetime/zero-uses-in-impl.rs
index 54803e1d2..54803e1d2 100644
--- a/src/test/ui/single-use-lifetime/zero-uses-in-impl.rs
+++ b/tests/ui/single-use-lifetime/zero-uses-in-impl.rs
diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr b/tests/ui/single-use-lifetime/zero-uses-in-impl.stderr
index b6e42d3e7..b6e42d3e7 100644
--- a/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr
+++ b/tests/ui/single-use-lifetime/zero-uses-in-impl.stderr
diff --git a/src/test/ui/sized-borrowed-pointer.rs b/tests/ui/sized-borrowed-pointer.rs
index 319b80269..319b80269 100644
--- a/src/test/ui/sized-borrowed-pointer.rs
+++ b/tests/ui/sized-borrowed-pointer.rs
diff --git a/src/test/ui/sized-cycle-note.rs b/tests/ui/sized-cycle-note.rs
index 766a5fa0d..766a5fa0d 100644
--- a/src/test/ui/sized-cycle-note.rs
+++ b/tests/ui/sized-cycle-note.rs
diff --git a/src/test/ui/sized-cycle-note.stderr b/tests/ui/sized-cycle-note.stderr
index 06c87b61f..06c87b61f 100644
--- a/src/test/ui/sized-cycle-note.stderr
+++ b/tests/ui/sized-cycle-note.stderr
diff --git a/src/test/ui/sized-owned-pointer.rs b/tests/ui/sized-owned-pointer.rs
index 2abf0a1e0..2abf0a1e0 100644
--- a/src/test/ui/sized-owned-pointer.rs
+++ b/tests/ui/sized-owned-pointer.rs
diff --git a/src/test/ui/sized/coinductive-1-gat.rs b/tests/ui/sized/coinductive-1-gat.rs
index cdf70920f..cdf70920f 100644
--- a/src/test/ui/sized/coinductive-1-gat.rs
+++ b/tests/ui/sized/coinductive-1-gat.rs
diff --git a/src/test/ui/sized/coinductive-1.rs b/tests/ui/sized/coinductive-1.rs
index 7bcd0f1fd..7bcd0f1fd 100644
--- a/src/test/ui/sized/coinductive-1.rs
+++ b/tests/ui/sized/coinductive-1.rs
diff --git a/src/test/ui/sized/coinductive-2.rs b/tests/ui/sized/coinductive-2.rs
index 212274d2e..212274d2e 100644
--- a/src/test/ui/sized/coinductive-2.rs
+++ b/tests/ui/sized/coinductive-2.rs
diff --git a/src/test/ui/sized/recursive-type-1.rs b/tests/ui/sized/recursive-type-1.rs
index cd6805967..cd6805967 100644
--- a/src/test/ui/sized/recursive-type-1.rs
+++ b/tests/ui/sized/recursive-type-1.rs
diff --git a/src/test/ui/sized/recursive-type-2.rs b/tests/ui/sized/recursive-type-2.rs
index 7d95417a6..7d95417a6 100644
--- a/src/test/ui/sized/recursive-type-2.rs
+++ b/tests/ui/sized/recursive-type-2.rs
diff --git a/src/test/ui/sized/recursive-type-2.stderr b/tests/ui/sized/recursive-type-2.stderr
index d0e6e9db0..d0e6e9db0 100644
--- a/src/test/ui/sized/recursive-type-2.stderr
+++ b/tests/ui/sized/recursive-type-2.stderr
diff --git a/src/test/ui/slightly-nice-generic-literal-messages.rs b/tests/ui/slightly-nice-generic-literal-messages.rs
index a48598ce8..a48598ce8 100644
--- a/src/test/ui/slightly-nice-generic-literal-messages.rs
+++ b/tests/ui/slightly-nice-generic-literal-messages.rs
diff --git a/src/test/ui/slightly-nice-generic-literal-messages.stderr b/tests/ui/slightly-nice-generic-literal-messages.stderr
index 14f01f0eb..14f01f0eb 100644
--- a/src/test/ui/slightly-nice-generic-literal-messages.stderr
+++ b/tests/ui/slightly-nice-generic-literal-messages.stderr
diff --git a/src/test/ui/span/E0046.rs b/tests/ui/span/E0046.rs
index 961109892..961109892 100644
--- a/src/test/ui/span/E0046.rs
+++ b/tests/ui/span/E0046.rs
diff --git a/src/test/ui/span/E0046.stderr b/tests/ui/span/E0046.stderr
index 1323524f2..1323524f2 100644
--- a/src/test/ui/span/E0046.stderr
+++ b/tests/ui/span/E0046.stderr
diff --git a/src/test/ui/span/E0072.rs b/tests/ui/span/E0072.rs
index bc284cdcb..bc284cdcb 100644
--- a/src/test/ui/span/E0072.rs
+++ b/tests/ui/span/E0072.rs
diff --git a/src/test/ui/span/E0072.stderr b/tests/ui/span/E0072.stderr
index 20f2e0df0..20f2e0df0 100644
--- a/src/test/ui/span/E0072.stderr
+++ b/tests/ui/span/E0072.stderr
diff --git a/src/test/ui/span/E0204.rs b/tests/ui/span/E0204.rs
index 174de8cdd..174de8cdd 100644
--- a/src/test/ui/span/E0204.rs
+++ b/tests/ui/span/E0204.rs
diff --git a/src/test/ui/span/E0204.stderr b/tests/ui/span/E0204.stderr
index 0b2166eed..0b2166eed 100644
--- a/src/test/ui/span/E0204.stderr
+++ b/tests/ui/span/E0204.stderr
diff --git a/src/test/ui/span/E0493.rs b/tests/ui/span/E0493.rs
index 625da25a7..625da25a7 100644
--- a/src/test/ui/span/E0493.rs
+++ b/tests/ui/span/E0493.rs
diff --git a/src/test/ui/span/E0493.stderr b/tests/ui/span/E0493.stderr
index 9db627562..9db627562 100644
--- a/src/test/ui/span/E0493.stderr
+++ b/tests/ui/span/E0493.stderr
diff --git a/src/test/ui/span/E0535.rs b/tests/ui/span/E0535.rs
index e26334e9b..e26334e9b 100644
--- a/src/test/ui/span/E0535.rs
+++ b/tests/ui/span/E0535.rs
diff --git a/src/test/ui/span/E0535.stderr b/tests/ui/span/E0535.stderr
index b1411bc43..b1411bc43 100644
--- a/src/test/ui/span/E0535.stderr
+++ b/tests/ui/span/E0535.stderr
diff --git a/src/test/ui/span/E0536.rs b/tests/ui/span/E0536.rs
index 72de7b6f4..72de7b6f4 100644
--- a/src/test/ui/span/E0536.rs
+++ b/tests/ui/span/E0536.rs
diff --git a/src/test/ui/span/E0536.stderr b/tests/ui/span/E0536.stderr
index 820b0d744..820b0d744 100644
--- a/src/test/ui/span/E0536.stderr
+++ b/tests/ui/span/E0536.stderr
diff --git a/src/test/ui/span/E0537.rs b/tests/ui/span/E0537.rs
index 4088a9ae5..4088a9ae5 100644
--- a/src/test/ui/span/E0537.rs
+++ b/tests/ui/span/E0537.rs
diff --git a/src/test/ui/span/E0537.stderr b/tests/ui/span/E0537.stderr
index 5478c3fbc..5478c3fbc 100644
--- a/src/test/ui/span/E0537.stderr
+++ b/tests/ui/span/E0537.stderr
diff --git a/src/test/ui/span/auxiliary/transitive_dep_three.rs b/tests/ui/span/auxiliary/transitive_dep_three.rs
index 99b51625a..99b51625a 100644
--- a/src/test/ui/span/auxiliary/transitive_dep_three.rs
+++ b/tests/ui/span/auxiliary/transitive_dep_three.rs
diff --git a/src/test/ui/span/auxiliary/transitive_dep_two.rs b/tests/ui/span/auxiliary/transitive_dep_two.rs
index 5110c4276..5110c4276 100644
--- a/src/test/ui/span/auxiliary/transitive_dep_two.rs
+++ b/tests/ui/span/auxiliary/transitive_dep_two.rs
diff --git a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.rs b/tests/ui/span/borrowck-borrow-overloaded-auto-deref-mut.rs
index 76a1d12ea..76a1d12ea 100644
--- a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.rs
+++ b/tests/ui/span/borrowck-borrow-overloaded-auto-deref-mut.rs
diff --git a/tests/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr b/tests/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr
new file mode 100644
index 000000000..570328fc2
--- /dev/null
+++ b/tests/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr
@@ -0,0 +1,112 @@
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:53:24
+   |
+LL |     let __isize = &mut x.y;
+   |                        ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn deref_mut_field1(mut x: Own<Point>) {
+   |                     +++
+
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:65:10
+   |
+LL |     &mut x.y
+   |          ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn deref_extend_mut_field1(x: &mut Own<Point>) -> &mut isize {
+   |                               ~~~~~~~~~~~~~~~
+
+error[E0499]: cannot borrow `*x` as mutable more than once at a time
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:78:19
+   |
+LL |     let _x = &mut x.x;
+   |                   - first mutable borrow occurs here
+LL |     let _y = &mut x.y;
+   |                   ^ second mutable borrow occurs here
+LL |     use_mut(_x);
+   |             -- first borrow later used here
+
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:88:5
+   |
+LL |     x.y = 3;
+   |     ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn assign_field1<'a>(mut x: Own<Point>) {
+   |                      +++
+
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:92:5
+   |
+LL |     x.y = 3;
+   |     ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn assign_field2<'a>(x: &'a mut Own<Point>) {
+   |                         ~~~~~~~~~~~~~~~~~~
+
+error[E0499]: cannot borrow `*x` as mutable more than once at a time
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:101:5
+   |
+LL |     let _p: &mut Point = &mut **x;
+   |                                -- first mutable borrow occurs here
+LL |     x.y = 3;
+   |     ^ second mutable borrow occurs here
+LL |     use_mut(_p);
+   |             -- first borrow later used here
+
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:109:5
+   |
+LL |     x.set(0, 0);
+   |     ^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn deref_mut_method1(mut x: Own<Point>) {
+   |                      +++
+
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:121:5
+   |
+LL |     x.y_mut()
+   |     ^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn deref_extend_mut_method1(x: &mut Own<Point>) -> &mut isize {
+   |                                ~~~~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:129:6
+   |
+LL |     *x.y_mut() = 3;
+   |      ^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn assign_method1<'a>(mut x: Own<Point>) {
+   |                       +++
+
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:133:6
+   |
+LL |     *x.y_mut() = 3;
+   |      ^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn assign_method2<'a>(x: &'a mut Own<Point>) {
+   |                          ~~~~~~~~~~~~~~~~~~
+
+error: aborting due to 10 previous errors
+
+Some errors have detailed explanations: E0499, E0596.
+For more information about an error, try `rustc --explain E0499`.
diff --git a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.rs b/tests/ui/span/borrowck-borrow-overloaded-deref-mut.rs
index 8d43d5da4..8d43d5da4 100644
--- a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.rs
+++ b/tests/ui/span/borrowck-borrow-overloaded-deref-mut.rs
diff --git a/tests/ui/span/borrowck-borrow-overloaded-deref-mut.stderr b/tests/ui/span/borrowck-borrow-overloaded-deref-mut.stderr
new file mode 100644
index 000000000..3fed7b3f4
--- /dev/null
+++ b/tests/ui/span/borrowck-borrow-overloaded-deref-mut.stderr
@@ -0,0 +1,47 @@
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:29:25
+   |
+LL |     let __isize = &mut *x;
+   |                         ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn deref_mut1(mut x: Own<isize>) {
+   |               +++
+
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:41:11
+   |
+LL |     &mut **x
+   |           ^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn deref_extend_mut1<'a>(x: &'a mut Own<isize>) -> &'a mut isize {
+   |                             ~~~~~~~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:49:6
+   |
+LL |     *x = 3;
+   |      ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn assign1<'a>(mut x: Own<isize>) {
+   |                +++
+
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:53:6
+   |
+LL |     **x = 3;
+   |      ^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn assign2<'a>(x: &'a mut Own<isize>) {
+   |                   ~~~~~~~~~~~~~~~~~~
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.rs b/tests/ui/span/borrowck-call-is-borrow-issue-12224.rs
index 938fdaf11..938fdaf11 100644
--- a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.rs
+++ b/tests/ui/span/borrowck-call-is-borrow-issue-12224.rs
diff --git a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr b/tests/ui/span/borrowck-call-is-borrow-issue-12224.stderr
index 6b43801b5..48b42bc78 100644
--- a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr
+++ b/tests/ui/span/borrowck-call-is-borrow-issue-12224.stderr
@@ -13,18 +13,24 @@ LL |         f((Box::new(|| {})))
 error[E0596]: cannot borrow `*f` as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-call-is-borrow-issue-12224.rs:25:5
    |
-LL | fn test2<F>(f: &F) where F: FnMut() {
-   |                -- help: consider changing this to be a mutable reference: `&mut F`
 LL |     (*f)();
    |     ^^^^ `f` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn test2<F>(f: &mut F) where F: FnMut() {
+   |                ~~~~~~
 
 error[E0596]: cannot borrow `f.f` as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-call-is-borrow-issue-12224.rs:34:5
    |
-LL | fn test4(f: &Test) {
-   |             ----- help: consider changing this to be a mutable reference: `&mut Test<'_>`
 LL |     f.f.call_mut(())
    |     ^^^^^^^^^^^^^^^^ `f` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn test4(f: &mut Test<'_>) {
+   |             ~~~~~~~~~~~~~
 
 error[E0507]: cannot move out of `f`, a captured variable in an `FnMut` closure
   --> $DIR/borrowck-call-is-borrow-issue-12224.rs:57:13
diff --git a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.rs b/tests/ui/span/borrowck-call-method-from-mut-aliasable.rs
index caf2d2a55..caf2d2a55 100644
--- a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.rs
+++ b/tests/ui/span/borrowck-call-method-from-mut-aliasable.rs
diff --git a/tests/ui/span/borrowck-call-method-from-mut-aliasable.stderr b/tests/ui/span/borrowck-call-method-from-mut-aliasable.stderr
new file mode 100644
index 000000000..2a842f5a2
--- /dev/null
+++ b/tests/ui/span/borrowck-call-method-from-mut-aliasable.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-call-method-from-mut-aliasable.rs:17:5
+   |
+LL |     x.h();
+   |     ^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn b(x: &mut Foo) {
+   |         ~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/borrowck-fn-in-const-b.rs b/tests/ui/span/borrowck-fn-in-const-b.rs
index 822083efe..822083efe 100644
--- a/src/test/ui/span/borrowck-fn-in-const-b.rs
+++ b/tests/ui/span/borrowck-fn-in-const-b.rs
diff --git a/tests/ui/span/borrowck-fn-in-const-b.stderr b/tests/ui/span/borrowck-fn-in-const-b.stderr
new file mode 100644
index 000000000..1df19deb1
--- /dev/null
+++ b/tests/ui/span/borrowck-fn-in-const-b.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-fn-in-const-b.rs:7:9
+   |
+LL |         x.push(format!("this is broken"));
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn broken(x: &mut Vec<String>) {
+   |                  ~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/borrowck-let-suggestion-suffixes.rs b/tests/ui/span/borrowck-let-suggestion-suffixes.rs
index 18abfb5c3..18abfb5c3 100644
--- a/src/test/ui/span/borrowck-let-suggestion-suffixes.rs
+++ b/tests/ui/span/borrowck-let-suggestion-suffixes.rs
diff --git a/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr b/tests/ui/span/borrowck-let-suggestion-suffixes.stderr
index 2dc29a78d..2dc29a78d 100644
--- a/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr
+++ b/tests/ui/span/borrowck-let-suggestion-suffixes.stderr
diff --git a/src/test/ui/span/borrowck-object-mutability.rs b/tests/ui/span/borrowck-object-mutability.rs
index f5adc2cc1..f5adc2cc1 100644
--- a/src/test/ui/span/borrowck-object-mutability.rs
+++ b/tests/ui/span/borrowck-object-mutability.rs
diff --git a/tests/ui/span/borrowck-object-mutability.stderr b/tests/ui/span/borrowck-object-mutability.stderr
new file mode 100644
index 000000000..b6517e0b3
--- /dev/null
+++ b/tests/ui/span/borrowck-object-mutability.stderr
@@ -0,0 +1,25 @@
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-object-mutability.rs:8:5
+   |
+LL |     x.borrowed_mut();
+   |     ^^^^^^^^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn borrowed_receiver(x: &mut dyn Foo) {
+   |                         ~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `*x` as mutable, as `x` is not declared as mutable
+  --> $DIR/borrowck-object-mutability.rs:18:5
+   |
+LL |     x.borrowed_mut();
+   |     ^^^^^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn owned_receiver(mut x: Box<dyn Foo>) {
+   |                   +++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/borrowck-ref-into-rvalue.fixed b/tests/ui/span/borrowck-ref-into-rvalue.fixed
index 51f65e534..51f65e534 100644
--- a/src/test/ui/span/borrowck-ref-into-rvalue.fixed
+++ b/tests/ui/span/borrowck-ref-into-rvalue.fixed
diff --git a/src/test/ui/span/borrowck-ref-into-rvalue.rs b/tests/ui/span/borrowck-ref-into-rvalue.rs
index 7b09fad92..7b09fad92 100644
--- a/src/test/ui/span/borrowck-ref-into-rvalue.rs
+++ b/tests/ui/span/borrowck-ref-into-rvalue.rs
diff --git a/src/test/ui/span/borrowck-ref-into-rvalue.stderr b/tests/ui/span/borrowck-ref-into-rvalue.stderr
index 25e344fed..25e344fed 100644
--- a/src/test/ui/span/borrowck-ref-into-rvalue.stderr
+++ b/tests/ui/span/borrowck-ref-into-rvalue.stderr
diff --git a/src/test/ui/span/coerce-suggestions.rs b/tests/ui/span/coerce-suggestions.rs
index 7920ae0b2..7920ae0b2 100644
--- a/src/test/ui/span/coerce-suggestions.rs
+++ b/tests/ui/span/coerce-suggestions.rs
diff --git a/src/test/ui/span/coerce-suggestions.stderr b/tests/ui/span/coerce-suggestions.stderr
index db784d5fe..db784d5fe 100644
--- a/src/test/ui/span/coerce-suggestions.stderr
+++ b/tests/ui/span/coerce-suggestions.stderr
diff --git a/src/test/ui/span/destructor-restrictions.rs b/tests/ui/span/destructor-restrictions.rs
index 7fb348a14..7fb348a14 100644
--- a/src/test/ui/span/destructor-restrictions.rs
+++ b/tests/ui/span/destructor-restrictions.rs
diff --git a/src/test/ui/span/destructor-restrictions.stderr b/tests/ui/span/destructor-restrictions.stderr
index 53c940462..53c940462 100644
--- a/src/test/ui/span/destructor-restrictions.stderr
+++ b/tests/ui/span/destructor-restrictions.stderr
diff --git a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.rs b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.rs
index 4559da91e..4559da91e 100644
--- a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.rs
+++ b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.rs
diff --git a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr
index df1cafdb7..df1cafdb7 100644
--- a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr
+++ b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr
diff --git a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.rs b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.rs
index a776e5089..a776e5089 100644
--- a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.rs
+++ b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.rs
diff --git a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.stderr b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.stderr
index 37b2f4138..37b2f4138 100644
--- a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.stderr
+++ b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.stderr
diff --git a/src/test/ui/span/dropck-object-cycle.rs b/tests/ui/span/dropck-object-cycle.rs
index a26123d52..a26123d52 100644
--- a/src/test/ui/span/dropck-object-cycle.rs
+++ b/tests/ui/span/dropck-object-cycle.rs
diff --git a/src/test/ui/span/dropck-object-cycle.stderr b/tests/ui/span/dropck-object-cycle.stderr
index 229d17e1c..229d17e1c 100644
--- a/src/test/ui/span/dropck-object-cycle.stderr
+++ b/tests/ui/span/dropck-object-cycle.stderr
diff --git a/src/test/ui/span/dropck_arr_cycle_checked.rs b/tests/ui/span/dropck_arr_cycle_checked.rs
index a14db5ff0..a14db5ff0 100644
--- a/src/test/ui/span/dropck_arr_cycle_checked.rs
+++ b/tests/ui/span/dropck_arr_cycle_checked.rs
diff --git a/src/test/ui/span/dropck_arr_cycle_checked.stderr b/tests/ui/span/dropck_arr_cycle_checked.stderr
index 068c779ae..068c779ae 100644
--- a/src/test/ui/span/dropck_arr_cycle_checked.stderr
+++ b/tests/ui/span/dropck_arr_cycle_checked.stderr
diff --git a/src/test/ui/span/dropck_direct_cycle_with_drop.rs b/tests/ui/span/dropck_direct_cycle_with_drop.rs
index 14d6e6654..14d6e6654 100644
--- a/src/test/ui/span/dropck_direct_cycle_with_drop.rs
+++ b/tests/ui/span/dropck_direct_cycle_with_drop.rs
diff --git a/src/test/ui/span/dropck_direct_cycle_with_drop.stderr b/tests/ui/span/dropck_direct_cycle_with_drop.stderr
index 07ae138ac..07ae138ac 100644
--- a/src/test/ui/span/dropck_direct_cycle_with_drop.stderr
+++ b/tests/ui/span/dropck_direct_cycle_with_drop.stderr
diff --git a/src/test/ui/span/dropck_misc_variants.rs b/tests/ui/span/dropck_misc_variants.rs
index 5818a94bc..5818a94bc 100644
--- a/src/test/ui/span/dropck_misc_variants.rs
+++ b/tests/ui/span/dropck_misc_variants.rs
diff --git a/src/test/ui/span/dropck_misc_variants.stderr b/tests/ui/span/dropck_misc_variants.stderr
index 76e90574c..76e90574c 100644
--- a/src/test/ui/span/dropck_misc_variants.stderr
+++ b/tests/ui/span/dropck_misc_variants.stderr
diff --git a/src/test/ui/span/dropck_vec_cycle_checked.rs b/tests/ui/span/dropck_vec_cycle_checked.rs
index c5d21507d..c5d21507d 100644
--- a/src/test/ui/span/dropck_vec_cycle_checked.rs
+++ b/tests/ui/span/dropck_vec_cycle_checked.rs
diff --git a/src/test/ui/span/dropck_vec_cycle_checked.stderr b/tests/ui/span/dropck_vec_cycle_checked.stderr
index 7ff991c0c..7ff991c0c 100644
--- a/src/test/ui/span/dropck_vec_cycle_checked.stderr
+++ b/tests/ui/span/dropck_vec_cycle_checked.stderr
diff --git a/src/test/ui/span/gated-features-attr-spans.rs b/tests/ui/span/gated-features-attr-spans.rs
index 69511ab8e..69511ab8e 100644
--- a/src/test/ui/span/gated-features-attr-spans.rs
+++ b/tests/ui/span/gated-features-attr-spans.rs
diff --git a/src/test/ui/span/gated-features-attr-spans.stderr b/tests/ui/span/gated-features-attr-spans.stderr
index c8b8f346b..c8b8f346b 100644
--- a/src/test/ui/span/gated-features-attr-spans.stderr
+++ b/tests/ui/span/gated-features-attr-spans.stderr
diff --git a/src/test/ui/span/impl-wrong-item-for-trait.rs b/tests/ui/span/impl-wrong-item-for-trait.rs
index bf3358686..bf3358686 100644
--- a/src/test/ui/span/impl-wrong-item-for-trait.rs
+++ b/tests/ui/span/impl-wrong-item-for-trait.rs
diff --git a/src/test/ui/span/impl-wrong-item-for-trait.stderr b/tests/ui/span/impl-wrong-item-for-trait.stderr
index f919092f9..f919092f9 100644
--- a/src/test/ui/span/impl-wrong-item-for-trait.stderr
+++ b/tests/ui/span/impl-wrong-item-for-trait.stderr
diff --git a/src/test/ui/span/import-ty-params.rs b/tests/ui/span/import-ty-params.rs
index 313cd227b..313cd227b 100644
--- a/src/test/ui/span/import-ty-params.rs
+++ b/tests/ui/span/import-ty-params.rs
diff --git a/src/test/ui/span/import-ty-params.stderr b/tests/ui/span/import-ty-params.stderr
index 701cd0c04..701cd0c04 100644
--- a/src/test/ui/span/import-ty-params.stderr
+++ b/tests/ui/span/import-ty-params.stderr
diff --git a/src/test/ui/span/issue-11925.rs b/tests/ui/span/issue-11925.rs
index cac9fd5bf..cac9fd5bf 100644
--- a/src/test/ui/span/issue-11925.rs
+++ b/tests/ui/span/issue-11925.rs
diff --git a/src/test/ui/span/issue-11925.stderr b/tests/ui/span/issue-11925.stderr
index 1d317fc33..1d317fc33 100644
--- a/src/test/ui/span/issue-11925.stderr
+++ b/tests/ui/span/issue-11925.stderr
diff --git a/src/test/ui/span/issue-15480.fixed b/tests/ui/span/issue-15480.fixed
index e6d1a4dd3..e6d1a4dd3 100644
--- a/src/test/ui/span/issue-15480.fixed
+++ b/tests/ui/span/issue-15480.fixed
diff --git a/src/test/ui/span/issue-15480.rs b/tests/ui/span/issue-15480.rs
index 916ce4b1e..916ce4b1e 100644
--- a/src/test/ui/span/issue-15480.rs
+++ b/tests/ui/span/issue-15480.rs
diff --git a/src/test/ui/span/issue-15480.stderr b/tests/ui/span/issue-15480.stderr
index d9cce2254..d9cce2254 100644
--- a/src/test/ui/span/issue-15480.stderr
+++ b/tests/ui/span/issue-15480.stderr
diff --git a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.rs b/tests/ui/span/issue-23338-locals-die-before-temps-of-body.rs
index a92ea4ddc..a92ea4ddc 100644
--- a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.rs
+++ b/tests/ui/span/issue-23338-locals-die-before-temps-of-body.rs
diff --git a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr b/tests/ui/span/issue-23338-locals-die-before-temps-of-body.stderr
index 3c2022748..3c2022748 100644
--- a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr
+++ b/tests/ui/span/issue-23338-locals-die-before-temps-of-body.stderr
diff --git a/src/test/ui/span/issue-23729.rs b/tests/ui/span/issue-23729.rs
index ca33f9c77..ca33f9c77 100644
--- a/src/test/ui/span/issue-23729.rs
+++ b/tests/ui/span/issue-23729.rs
diff --git a/src/test/ui/span/issue-23729.stderr b/tests/ui/span/issue-23729.stderr
index f88ce6c88..f88ce6c88 100644
--- a/src/test/ui/span/issue-23729.stderr
+++ b/tests/ui/span/issue-23729.stderr
diff --git a/src/test/ui/span/issue-23827.rs b/tests/ui/span/issue-23827.rs
index 6b065bf6c..6b065bf6c 100644
--- a/src/test/ui/span/issue-23827.rs
+++ b/tests/ui/span/issue-23827.rs
diff --git a/src/test/ui/span/issue-23827.stderr b/tests/ui/span/issue-23827.stderr
index 46a820f1b..46a820f1b 100644
--- a/src/test/ui/span/issue-23827.stderr
+++ b/tests/ui/span/issue-23827.stderr
diff --git a/src/test/ui/span/issue-24356.rs b/tests/ui/span/issue-24356.rs
index 7ec05aab2..7ec05aab2 100644
--- a/src/test/ui/span/issue-24356.rs
+++ b/tests/ui/span/issue-24356.rs
diff --git a/src/test/ui/span/issue-24356.stderr b/tests/ui/span/issue-24356.stderr
index a1f9b2550..a1f9b2550 100644
--- a/src/test/ui/span/issue-24356.stderr
+++ b/tests/ui/span/issue-24356.stderr
diff --git a/src/test/ui/span/issue-24690.rs b/tests/ui/span/issue-24690.rs
index 2b7349c55..2b7349c55 100644
--- a/src/test/ui/span/issue-24690.rs
+++ b/tests/ui/span/issue-24690.rs
diff --git a/src/test/ui/span/issue-24690.stderr b/tests/ui/span/issue-24690.stderr
index 73e166e64..73e166e64 100644
--- a/src/test/ui/span/issue-24690.stderr
+++ b/tests/ui/span/issue-24690.stderr
diff --git a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.rs b/tests/ui/span/issue-24805-dropck-child-has-items-via-parent.rs
index 9c772052f..9c772052f 100644
--- a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.rs
+++ b/tests/ui/span/issue-24805-dropck-child-has-items-via-parent.rs
diff --git a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr b/tests/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
index 809e60a8c..809e60a8c 100644
--- a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
+++ b/tests/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
diff --git a/src/test/ui/span/issue-24805-dropck-trait-has-items.rs b/tests/ui/span/issue-24805-dropck-trait-has-items.rs
index b5c410cd3..b5c410cd3 100644
--- a/src/test/ui/span/issue-24805-dropck-trait-has-items.rs
+++ b/tests/ui/span/issue-24805-dropck-trait-has-items.rs
diff --git a/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr b/tests/ui/span/issue-24805-dropck-trait-has-items.stderr
index 2e2170669..2e2170669 100644
--- a/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr
+++ b/tests/ui/span/issue-24805-dropck-trait-has-items.stderr
diff --git a/src/test/ui/span/issue-24895-copy-clone-dropck.rs b/tests/ui/span/issue-24895-copy-clone-dropck.rs
index 904cd8f67..904cd8f67 100644
--- a/src/test/ui/span/issue-24895-copy-clone-dropck.rs
+++ b/tests/ui/span/issue-24895-copy-clone-dropck.rs
diff --git a/src/test/ui/span/issue-24895-copy-clone-dropck.stderr b/tests/ui/span/issue-24895-copy-clone-dropck.stderr
index 18a3dc9e6..18a3dc9e6 100644
--- a/src/test/ui/span/issue-24895-copy-clone-dropck.stderr
+++ b/tests/ui/span/issue-24895-copy-clone-dropck.stderr
diff --git a/src/test/ui/span/issue-25199.rs b/tests/ui/span/issue-25199.rs
index dbc3b1900..dbc3b1900 100644
--- a/src/test/ui/span/issue-25199.rs
+++ b/tests/ui/span/issue-25199.rs
diff --git a/src/test/ui/span/issue-25199.stderr b/tests/ui/span/issue-25199.stderr
index d70a4afc1..d70a4afc1 100644
--- a/src/test/ui/span/issue-25199.stderr
+++ b/tests/ui/span/issue-25199.stderr
diff --git a/src/test/ui/span/issue-26656.rs b/tests/ui/span/issue-26656.rs
index cde68da18..cde68da18 100644
--- a/src/test/ui/span/issue-26656.rs
+++ b/tests/ui/span/issue-26656.rs
diff --git a/src/test/ui/span/issue-26656.stderr b/tests/ui/span/issue-26656.stderr
index 1e939c484..1e939c484 100644
--- a/src/test/ui/span/issue-26656.stderr
+++ b/tests/ui/span/issue-26656.stderr
diff --git a/src/test/ui/span/issue-27522.rs b/tests/ui/span/issue-27522.rs
index 7a0cfb679..7a0cfb679 100644
--- a/src/test/ui/span/issue-27522.rs
+++ b/tests/ui/span/issue-27522.rs
diff --git a/src/test/ui/span/issue-27522.stderr b/tests/ui/span/issue-27522.stderr
index 8a254a968..8a254a968 100644
--- a/src/test/ui/span/issue-27522.stderr
+++ b/tests/ui/span/issue-27522.stderr
diff --git a/src/test/ui/span/issue-29106.rs b/tests/ui/span/issue-29106.rs
index 1be8d4cba..1be8d4cba 100644
--- a/src/test/ui/span/issue-29106.rs
+++ b/tests/ui/span/issue-29106.rs
diff --git a/src/test/ui/span/issue-29106.stderr b/tests/ui/span/issue-29106.stderr
index 71fbd60ee..71fbd60ee 100644
--- a/src/test/ui/span/issue-29106.stderr
+++ b/tests/ui/span/issue-29106.stderr
diff --git a/src/test/ui/span/issue-29595.rs b/tests/ui/span/issue-29595.rs
index 87d7c4cfd..87d7c4cfd 100644
--- a/src/test/ui/span/issue-29595.rs
+++ b/tests/ui/span/issue-29595.rs
diff --git a/src/test/ui/span/issue-29595.stderr b/tests/ui/span/issue-29595.stderr
index 92445e407..92445e407 100644
--- a/src/test/ui/span/issue-29595.stderr
+++ b/tests/ui/span/issue-29595.stderr
diff --git a/src/test/ui/span/issue-33884.rs b/tests/ui/span/issue-33884.rs
index 5d927a5ac..5d927a5ac 100644
--- a/src/test/ui/span/issue-33884.rs
+++ b/tests/ui/span/issue-33884.rs
diff --git a/src/test/ui/span/issue-33884.stderr b/tests/ui/span/issue-33884.stderr
index aee153085..aee153085 100644
--- a/src/test/ui/span/issue-33884.stderr
+++ b/tests/ui/span/issue-33884.stderr
diff --git a/tests/ui/span/issue-34264.rs b/tests/ui/span/issue-34264.rs
new file mode 100644
index 000000000..9227ee482
--- /dev/null
+++ b/tests/ui/span/issue-34264.rs
@@ -0,0 +1,11 @@
+fn foo(Option<i32>, String) {} //~ ERROR expected one of
+//~^ ERROR expected one of
+fn bar(x, y: usize) {} //~ ERROR expected one of
+
+fn main() {
+    foo(Some(42), 2);
+    foo(Some(42), 2, ""); //~ ERROR function takes
+    bar("", ""); //~ ERROR mismatched types
+    bar(1, 2);
+    bar(1, 2, 3); //~ ERROR function takes
+}
diff --git a/src/test/ui/span/issue-34264.stderr b/tests/ui/span/issue-34264.stderr
index 15179954a..15179954a 100644
--- a/src/test/ui/span/issue-34264.stderr
+++ b/tests/ui/span/issue-34264.stderr
diff --git a/src/test/ui/span/issue-35987.rs b/tests/ui/span/issue-35987.rs
index 3a6e6ffe2..3a6e6ffe2 100644
--- a/src/test/ui/span/issue-35987.rs
+++ b/tests/ui/span/issue-35987.rs
diff --git a/src/test/ui/span/issue-35987.stderr b/tests/ui/span/issue-35987.stderr
index 057d40ac0..057d40ac0 100644
--- a/src/test/ui/span/issue-35987.stderr
+++ b/tests/ui/span/issue-35987.stderr
diff --git a/src/test/ui/span/issue-36537.rs b/tests/ui/span/issue-36537.rs
index a5546ccbb..a5546ccbb 100644
--- a/src/test/ui/span/issue-36537.rs
+++ b/tests/ui/span/issue-36537.rs
diff --git a/src/test/ui/span/issue-36537.stderr b/tests/ui/span/issue-36537.stderr
index 79a0ebaeb..79a0ebaeb 100644
--- a/src/test/ui/span/issue-36537.stderr
+++ b/tests/ui/span/issue-36537.stderr
diff --git a/src/test/ui/span/issue-37767.rs b/tests/ui/span/issue-37767.rs
index 9e34c2c1f..9e34c2c1f 100644
--- a/src/test/ui/span/issue-37767.rs
+++ b/tests/ui/span/issue-37767.rs
diff --git a/src/test/ui/span/issue-37767.stderr b/tests/ui/span/issue-37767.stderr
index f7732847a..f7732847a 100644
--- a/src/test/ui/span/issue-37767.stderr
+++ b/tests/ui/span/issue-37767.stderr
diff --git a/src/test/ui/span/issue-39018.rs b/tests/ui/span/issue-39018.rs
index b6db4008d..b6db4008d 100644
--- a/src/test/ui/span/issue-39018.rs
+++ b/tests/ui/span/issue-39018.rs
diff --git a/src/test/ui/span/issue-39018.stderr b/tests/ui/span/issue-39018.stderr
index eea94643e..5d4d692b2 100644
--- a/src/test/ui/span/issue-39018.stderr
+++ b/tests/ui/span/issue-39018.stderr
@@ -26,11 +26,8 @@ note: an implementation of `Add<_>` might be missing for `World`
    |
 LL | enum World {
    | ^^^^^^^^^^ must implement `Add<_>`
-note: the following trait must be implemented
+note: the trait `Add` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Add<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: cannot add `String` to `&str`
   --> $DIR/issue-39018.rs:11:22
diff --git a/src/test/ui/span/issue-39698.rs b/tests/ui/span/issue-39698.rs
index 1079bae2c..1079bae2c 100644
--- a/src/test/ui/span/issue-39698.rs
+++ b/tests/ui/span/issue-39698.rs
diff --git a/src/test/ui/span/issue-39698.stderr b/tests/ui/span/issue-39698.stderr
index 25c35fd54..25c35fd54 100644
--- a/src/test/ui/span/issue-39698.stderr
+++ b/tests/ui/span/issue-39698.stderr
diff --git a/src/test/ui/span/issue-40157.rs b/tests/ui/span/issue-40157.rs
index 03ad21ae7..03ad21ae7 100644
--- a/src/test/ui/span/issue-40157.rs
+++ b/tests/ui/span/issue-40157.rs
diff --git a/src/test/ui/span/issue-40157.stderr b/tests/ui/span/issue-40157.stderr
index 57f80214a..57f80214a 100644
--- a/src/test/ui/span/issue-40157.stderr
+++ b/tests/ui/span/issue-40157.stderr
diff --git a/src/test/ui/span/issue-42234-unknown-receiver-type.full.stderr b/tests/ui/span/issue-42234-unknown-receiver-type.full.stderr
index 2b1789908..2b1789908 100644
--- a/src/test/ui/span/issue-42234-unknown-receiver-type.full.stderr
+++ b/tests/ui/span/issue-42234-unknown-receiver-type.full.stderr
diff --git a/src/test/ui/span/issue-42234-unknown-receiver-type.generic_arg.stderr b/tests/ui/span/issue-42234-unknown-receiver-type.generic_arg.stderr
index d93d54e87..d93d54e87 100644
--- a/src/test/ui/span/issue-42234-unknown-receiver-type.generic_arg.stderr
+++ b/tests/ui/span/issue-42234-unknown-receiver-type.generic_arg.stderr
diff --git a/src/test/ui/span/issue-42234-unknown-receiver-type.rs b/tests/ui/span/issue-42234-unknown-receiver-type.rs
index fd5312120..fd5312120 100644
--- a/src/test/ui/span/issue-42234-unknown-receiver-type.rs
+++ b/tests/ui/span/issue-42234-unknown-receiver-type.rs
diff --git a/src/test/ui/span/issue-43927-non-ADT-derive.rs b/tests/ui/span/issue-43927-non-ADT-derive.rs
index 935bfa001..935bfa001 100644
--- a/src/test/ui/span/issue-43927-non-ADT-derive.rs
+++ b/tests/ui/span/issue-43927-non-ADT-derive.rs
diff --git a/src/test/ui/span/issue-43927-non-ADT-derive.stderr b/tests/ui/span/issue-43927-non-ADT-derive.stderr
index e3ae37e36..e3ae37e36 100644
--- a/src/test/ui/span/issue-43927-non-ADT-derive.stderr
+++ b/tests/ui/span/issue-43927-non-ADT-derive.stderr
diff --git a/src/test/ui/span/issue-71363.rs b/tests/ui/span/issue-71363.rs
index f187d0efa..8014f3796 100644
--- a/src/test/ui/span/issue-71363.rs
+++ b/tests/ui/span/issue-71363.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z simulate-remapped-rust-src-base=/rustc/FAKE_PREFIX -Z translate-remapped-path-to-local-path=no -Z ui-testing=no
+// compile-flags: -Z ui-testing=no
 
 struct MyError;
 impl std::error::Error for MyError {}
diff --git a/tests/ui/span/issue-71363.stderr b/tests/ui/span/issue-71363.stderr
new file mode 100644
index 000000000..cb5cc3202
--- /dev/null
+++ b/tests/ui/span/issue-71363.stderr
@@ -0,0 +1,29 @@
+error[E0277]: `MyError` doesn't implement `std::fmt::Display`
+ --> $DIR/issue-71363.rs:4:28
+  |
+4 | impl std::error::Error for MyError {}
+  |                            ^^^^^^^ `MyError` cannot be formatted with the default formatter
+  |
+  = help: the trait `std::fmt::Display` is not implemented for `MyError`
+  = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+note: required by a bound in `std::error::Error`
+ --> $SRC_DIR/core/src/error.rs:LL:COL
+
+error[E0277]: `MyError` doesn't implement `Debug`
+ --> $DIR/issue-71363.rs:4:28
+  |
+4 | impl std::error::Error for MyError {}
+  |                            ^^^^^^^ `MyError` cannot be formatted using `{:?}`
+  |
+  = help: the trait `Debug` is not implemented for `MyError`
+  = note: add `#[derive(Debug)]` to `MyError` or manually `impl Debug for MyError`
+note: required by a bound in `std::error::Error`
+ --> $SRC_DIR/core/src/error.rs:LL:COL
+help: consider annotating `MyError` with `#[derive(Debug)]`
+  |
+3 | #[derive(Debug)]
+  |
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/span/issue-81800.rs b/tests/ui/span/issue-81800.rs
index 6ac66fdcb..6ac66fdcb 100644
--- a/src/test/ui/span/issue-81800.rs
+++ b/tests/ui/span/issue-81800.rs
diff --git a/src/test/ui/span/issue-81800.stderr b/tests/ui/span/issue-81800.stderr
index 86c64573b..86c64573b 100644
--- a/src/test/ui/span/issue-81800.stderr
+++ b/tests/ui/span/issue-81800.stderr
diff --git a/src/test/ui/span/issue28498-reject-ex1.rs b/tests/ui/span/issue28498-reject-ex1.rs
index 4d1b41255..4d1b41255 100644
--- a/src/test/ui/span/issue28498-reject-ex1.rs
+++ b/tests/ui/span/issue28498-reject-ex1.rs
diff --git a/src/test/ui/span/issue28498-reject-ex1.stderr b/tests/ui/span/issue28498-reject-ex1.stderr
index 86e2d8c56..86e2d8c56 100644
--- a/src/test/ui/span/issue28498-reject-ex1.stderr
+++ b/tests/ui/span/issue28498-reject-ex1.stderr
diff --git a/src/test/ui/span/issue28498-reject-lifetime-param.rs b/tests/ui/span/issue28498-reject-lifetime-param.rs
index 1e7190157..1e7190157 100644
--- a/src/test/ui/span/issue28498-reject-lifetime-param.rs
+++ b/tests/ui/span/issue28498-reject-lifetime-param.rs
diff --git a/src/test/ui/span/issue28498-reject-lifetime-param.stderr b/tests/ui/span/issue28498-reject-lifetime-param.stderr
index 3119ddd03..3119ddd03 100644
--- a/src/test/ui/span/issue28498-reject-lifetime-param.stderr
+++ b/tests/ui/span/issue28498-reject-lifetime-param.stderr
diff --git a/src/test/ui/span/issue28498-reject-passed-to-fn.rs b/tests/ui/span/issue28498-reject-passed-to-fn.rs
index dcd2e9ad4..dcd2e9ad4 100644
--- a/src/test/ui/span/issue28498-reject-passed-to-fn.rs
+++ b/tests/ui/span/issue28498-reject-passed-to-fn.rs
diff --git a/src/test/ui/span/issue28498-reject-passed-to-fn.stderr b/tests/ui/span/issue28498-reject-passed-to-fn.stderr
index 60e8a648c..60e8a648c 100644
--- a/src/test/ui/span/issue28498-reject-passed-to-fn.stderr
+++ b/tests/ui/span/issue28498-reject-passed-to-fn.stderr
diff --git a/src/test/ui/span/issue28498-reject-trait-bound.rs b/tests/ui/span/issue28498-reject-trait-bound.rs
index 444cebb19..444cebb19 100644
--- a/src/test/ui/span/issue28498-reject-trait-bound.rs
+++ b/tests/ui/span/issue28498-reject-trait-bound.rs
diff --git a/src/test/ui/span/issue28498-reject-trait-bound.stderr b/tests/ui/span/issue28498-reject-trait-bound.stderr
index 22e4a8205..22e4a8205 100644
--- a/src/test/ui/span/issue28498-reject-trait-bound.stderr
+++ b/tests/ui/span/issue28498-reject-trait-bound.stderr
diff --git a/src/test/ui/span/lint-unused-unsafe-thir.rs b/tests/ui/span/lint-unused-unsafe-thir.rs
index adb72c26b..adb72c26b 100644
--- a/src/test/ui/span/lint-unused-unsafe-thir.rs
+++ b/tests/ui/span/lint-unused-unsafe-thir.rs
diff --git a/src/test/ui/span/lint-unused-unsafe-thir.stderr b/tests/ui/span/lint-unused-unsafe-thir.stderr
index 3bcbb7597..3bcbb7597 100644
--- a/src/test/ui/span/lint-unused-unsafe-thir.stderr
+++ b/tests/ui/span/lint-unused-unsafe-thir.stderr
diff --git a/src/test/ui/span/lint-unused-unsafe.mir.stderr b/tests/ui/span/lint-unused-unsafe.mir.stderr
index d8412908c..d8412908c 100644
--- a/src/test/ui/span/lint-unused-unsafe.mir.stderr
+++ b/tests/ui/span/lint-unused-unsafe.mir.stderr
diff --git a/src/test/ui/span/lint-unused-unsafe.rs b/tests/ui/span/lint-unused-unsafe.rs
index 5d042768b..5d042768b 100644
--- a/src/test/ui/span/lint-unused-unsafe.rs
+++ b/tests/ui/span/lint-unused-unsafe.rs
diff --git a/src/test/ui/span/macro-span-replacement.rs b/tests/ui/span/macro-span-replacement.rs
index 66973c58d..66973c58d 100644
--- a/src/test/ui/span/macro-span-replacement.rs
+++ b/tests/ui/span/macro-span-replacement.rs
diff --git a/src/test/ui/span/macro-span-replacement.stderr b/tests/ui/span/macro-span-replacement.stderr
index 5dd563428..5dd563428 100644
--- a/src/test/ui/span/macro-span-replacement.stderr
+++ b/tests/ui/span/macro-span-replacement.stderr
diff --git a/src/test/ui/span/macro-ty-params.rs b/tests/ui/span/macro-ty-params.rs
index cf28b0255..cf28b0255 100644
--- a/src/test/ui/span/macro-ty-params.rs
+++ b/tests/ui/span/macro-ty-params.rs
diff --git a/src/test/ui/span/macro-ty-params.stderr b/tests/ui/span/macro-ty-params.stderr
index 7023ef8cd..7023ef8cd 100644
--- a/src/test/ui/span/macro-ty-params.stderr
+++ b/tests/ui/span/macro-ty-params.stderr
diff --git a/src/test/ui/span/method-and-field-eager-resolution.rs b/tests/ui/span/method-and-field-eager-resolution.rs
index a0f0d8810..a0f0d8810 100644
--- a/src/test/ui/span/method-and-field-eager-resolution.rs
+++ b/tests/ui/span/method-and-field-eager-resolution.rs
diff --git a/src/test/ui/span/method-and-field-eager-resolution.stderr b/tests/ui/span/method-and-field-eager-resolution.stderr
index 7d240589a..f6efbe40b 100644
--- a/src/test/ui/span/method-and-field-eager-resolution.stderr
+++ b/tests/ui/span/method-and-field-eager-resolution.stderr
@@ -9,8 +9,8 @@ LL |     x.0;
    |
 help: consider giving `x` an explicit type
    |
-LL |     let mut x: _ = Default::default();
-   |              +++
+LL |     let mut x: /* Type */ = Default::default();
+   |              ++++++++++++
 
 error[E0282]: type annotations needed
   --> $DIR/method-and-field-eager-resolution.rs:11:9
@@ -23,8 +23,8 @@ LL |     x[0];
    |
 help: consider giving `x` an explicit type
    |
-LL |     let mut x: _ = Default::default();
-   |              +++
+LL |     let mut x: /* Type */ = Default::default();
+   |              ++++++++++++
 
 error: aborting due to 2 previous errors
 
diff --git a/tests/ui/span/missing-unit-argument.rs b/tests/ui/span/missing-unit-argument.rs
new file mode 100644
index 000000000..db96ae223
--- /dev/null
+++ b/tests/ui/span/missing-unit-argument.rs
@@ -0,0 +1,17 @@
+fn foo(():(), ():()) {}
+fn bar(():()) {}
+
+struct S;
+impl S {
+    fn baz(self, (): ()) { }
+    fn generic<T>(self, _: T) { }
+}
+
+fn main() {
+    let _: Result<(), String> = Ok(); //~ ERROR this enum variant takes
+    foo(); //~ ERROR function takes
+    foo(()); //~ ERROR function takes
+    bar(); //~ ERROR function takes
+    S.baz(); //~ ERROR this method takes
+    S.generic::<()>(); //~ ERROR this method takes
+}
diff --git a/src/test/ui/span/missing-unit-argument.stderr b/tests/ui/span/missing-unit-argument.stderr
index b76a3ab30..ef4d732b5 100644
--- a/src/test/ui/span/missing-unit-argument.stderr
+++ b/tests/ui/span/missing-unit-argument.stderr
@@ -6,9 +6,6 @@ LL |     let _: Result<(), String> = Ok();
    |
 note: tuple variant defined here
   --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^
 help: provide the argument
    |
 LL |     let _: Result<(), String> = Ok(());
@@ -62,7 +59,7 @@ help: provide the argument
 LL |     bar(());
    |        ~~~~
 
-error[E0061]: this function takes 1 argument but 0 arguments were supplied
+error[E0061]: this method takes 1 argument but 0 arguments were supplied
   --> $DIR/missing-unit-argument.rs:15:7
    |
 LL |     S.baz();
@@ -78,7 +75,7 @@ help: provide the argument
 LL |     S.baz(());
    |          ~~~~
 
-error[E0061]: this function takes 1 argument but 0 arguments were supplied
+error[E0061]: this method takes 1 argument but 0 arguments were supplied
   --> $DIR/missing-unit-argument.rs:16:7
    |
 LL |     S.generic::<()>();
diff --git a/src/test/ui/span/move-closure.rs b/tests/ui/span/move-closure.rs
index bdd7951b3..bdd7951b3 100644
--- a/src/test/ui/span/move-closure.rs
+++ b/tests/ui/span/move-closure.rs
diff --git a/src/test/ui/span/move-closure.stderr b/tests/ui/span/move-closure.stderr
index dcc607896..dcc607896 100644
--- a/src/test/ui/span/move-closure.stderr
+++ b/tests/ui/span/move-closure.stderr
diff --git a/src/test/ui/span/multiline-span-E0072.rs b/tests/ui/span/multiline-span-E0072.rs
index 728b47d65..728b47d65 100644
--- a/src/test/ui/span/multiline-span-E0072.rs
+++ b/tests/ui/span/multiline-span-E0072.rs
diff --git a/src/test/ui/span/multiline-span-E0072.stderr b/tests/ui/span/multiline-span-E0072.stderr
index fc2f6e662..fc2f6e662 100644
--- a/src/test/ui/span/multiline-span-E0072.stderr
+++ b/tests/ui/span/multiline-span-E0072.stderr
diff --git a/src/test/ui/span/multiline-span-simple.rs b/tests/ui/span/multiline-span-simple.rs
index 204a7f6b1..204a7f6b1 100644
--- a/src/test/ui/span/multiline-span-simple.rs
+++ b/tests/ui/span/multiline-span-simple.rs
diff --git a/src/test/ui/span/multiline-span-simple.stderr b/tests/ui/span/multiline-span-simple.stderr
index b44df962a..b44df962a 100644
--- a/src/test/ui/span/multiline-span-simple.stderr
+++ b/tests/ui/span/multiline-span-simple.stderr
diff --git a/src/test/ui/span/multispan-import-lint.rs b/tests/ui/span/multispan-import-lint.rs
index 3ce7f2ce3..3ce7f2ce3 100644
--- a/src/test/ui/span/multispan-import-lint.rs
+++ b/tests/ui/span/multispan-import-lint.rs
diff --git a/src/test/ui/span/multispan-import-lint.stderr b/tests/ui/span/multispan-import-lint.stderr
index 4a955d1b3..4a955d1b3 100644
--- a/src/test/ui/span/multispan-import-lint.stderr
+++ b/tests/ui/span/multispan-import-lint.stderr
diff --git a/src/test/ui/span/mut-arg-hint.rs b/tests/ui/span/mut-arg-hint.rs
index d7ff1f0de..d7ff1f0de 100644
--- a/src/test/ui/span/mut-arg-hint.rs
+++ b/tests/ui/span/mut-arg-hint.rs
diff --git a/tests/ui/span/mut-arg-hint.stderr b/tests/ui/span/mut-arg-hint.stderr
new file mode 100644
index 000000000..96ce4d5bc
--- /dev/null
+++ b/tests/ui/span/mut-arg-hint.stderr
@@ -0,0 +1,36 @@
+error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference
+  --> $DIR/mut-arg-hint.rs:3:9
+   |
+LL |         a.push_str("bar");
+   |         ^^^^^^^^^^^^^^^^^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo(mut a: &mut String) {
+   |                   ~~~~~~~~~~~
+
+error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference
+  --> $DIR/mut-arg-hint.rs:8:5
+   |
+LL |     a.push_str("foo");
+   |     ^^^^^^^^^^^^^^^^^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | pub fn foo<'a>(mut a: &'a mut String) {
+   |                       ~~~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference
+  --> $DIR/mut-arg-hint.rs:15:9
+   |
+LL |         a.push_str("foo");
+   |         ^^^^^^^^^^^^^^^^^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     pub fn foo(mut a: &mut String) {
+   |                       ~~~~~~~~~~~
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/mut-ptr-cant-outlive-ref.rs b/tests/ui/span/mut-ptr-cant-outlive-ref.rs
index b8c752d73..b8c752d73 100644
--- a/src/test/ui/span/mut-ptr-cant-outlive-ref.rs
+++ b/tests/ui/span/mut-ptr-cant-outlive-ref.rs
diff --git a/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr b/tests/ui/span/mut-ptr-cant-outlive-ref.stderr
index 4d976a7bb..4d976a7bb 100644
--- a/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr
+++ b/tests/ui/span/mut-ptr-cant-outlive-ref.stderr
diff --git a/src/test/ui/span/non-existing-module-import.rs b/tests/ui/span/non-existing-module-import.rs
index d2ce7ec4f..d2ce7ec4f 100644
--- a/src/test/ui/span/non-existing-module-import.rs
+++ b/tests/ui/span/non-existing-module-import.rs
diff --git a/src/test/ui/span/non-existing-module-import.stderr b/tests/ui/span/non-existing-module-import.stderr
index 25c099590..25c099590 100644
--- a/src/test/ui/span/non-existing-module-import.stderr
+++ b/tests/ui/span/non-existing-module-import.stderr
diff --git a/src/test/ui/span/pub-struct-field.rs b/tests/ui/span/pub-struct-field.rs
index e149b9dbf..e149b9dbf 100644
--- a/src/test/ui/span/pub-struct-field.rs
+++ b/tests/ui/span/pub-struct-field.rs
diff --git a/src/test/ui/span/pub-struct-field.stderr b/tests/ui/span/pub-struct-field.stderr
index 065340f44..065340f44 100644
--- a/src/test/ui/span/pub-struct-field.stderr
+++ b/tests/ui/span/pub-struct-field.stderr
diff --git a/src/test/ui/span/range-2.rs b/tests/ui/span/range-2.rs
index c4bb16f44..c4bb16f44 100644
--- a/src/test/ui/span/range-2.rs
+++ b/tests/ui/span/range-2.rs
diff --git a/src/test/ui/span/range-2.stderr b/tests/ui/span/range-2.stderr
index 8ca8156b0..8ca8156b0 100644
--- a/src/test/ui/span/range-2.stderr
+++ b/tests/ui/span/range-2.stderr
diff --git a/src/test/ui/span/recursive-type-field.rs b/tests/ui/span/recursive-type-field.rs
index bd4c43534..bd4c43534 100644
--- a/src/test/ui/span/recursive-type-field.rs
+++ b/tests/ui/span/recursive-type-field.rs
diff --git a/src/test/ui/span/recursive-type-field.stderr b/tests/ui/span/recursive-type-field.stderr
index 10af4c36b..10af4c36b 100644
--- a/src/test/ui/span/recursive-type-field.stderr
+++ b/tests/ui/span/recursive-type-field.stderr
diff --git a/src/test/ui/span/regionck-unboxed-closure-lifetimes.rs b/tests/ui/span/regionck-unboxed-closure-lifetimes.rs
index 60ccaa872..60ccaa872 100644
--- a/src/test/ui/span/regionck-unboxed-closure-lifetimes.rs
+++ b/tests/ui/span/regionck-unboxed-closure-lifetimes.rs
diff --git a/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr b/tests/ui/span/regionck-unboxed-closure-lifetimes.stderr
index 0b985de60..0b985de60 100644
--- a/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr
+++ b/tests/ui/span/regionck-unboxed-closure-lifetimes.stderr
diff --git a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.rs b/tests/ui/span/regions-close-over-borrowed-ref-in-obj.rs
index 16b4cc258..16b4cc258 100644
--- a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.rs
+++ b/tests/ui/span/regions-close-over-borrowed-ref-in-obj.rs
diff --git a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr b/tests/ui/span/regions-close-over-borrowed-ref-in-obj.stderr
index 81e858fa0..81e858fa0 100644
--- a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr
+++ b/tests/ui/span/regions-close-over-borrowed-ref-in-obj.stderr
diff --git a/src/test/ui/span/regions-close-over-type-parameter-2.rs b/tests/ui/span/regions-close-over-type-parameter-2.rs
index aca3972cb..aca3972cb 100644
--- a/src/test/ui/span/regions-close-over-type-parameter-2.rs
+++ b/tests/ui/span/regions-close-over-type-parameter-2.rs
diff --git a/src/test/ui/span/regions-close-over-type-parameter-2.stderr b/tests/ui/span/regions-close-over-type-parameter-2.stderr
index 2e584d9a8..2e584d9a8 100644
--- a/src/test/ui/span/regions-close-over-type-parameter-2.stderr
+++ b/tests/ui/span/regions-close-over-type-parameter-2.stderr
diff --git a/src/test/ui/span/regions-escape-loop-via-variable.rs b/tests/ui/span/regions-escape-loop-via-variable.rs
index ad468896b..ad468896b 100644
--- a/src/test/ui/span/regions-escape-loop-via-variable.rs
+++ b/tests/ui/span/regions-escape-loop-via-variable.rs
diff --git a/src/test/ui/span/regions-escape-loop-via-variable.stderr b/tests/ui/span/regions-escape-loop-via-variable.stderr
index 42df66852..42df66852 100644
--- a/src/test/ui/span/regions-escape-loop-via-variable.stderr
+++ b/tests/ui/span/regions-escape-loop-via-variable.stderr
diff --git a/src/test/ui/span/regions-escape-loop-via-vec.rs b/tests/ui/span/regions-escape-loop-via-vec.rs
index 1fceb0969..1fceb0969 100644
--- a/src/test/ui/span/regions-escape-loop-via-vec.rs
+++ b/tests/ui/span/regions-escape-loop-via-vec.rs
diff --git a/src/test/ui/span/regions-escape-loop-via-vec.stderr b/tests/ui/span/regions-escape-loop-via-vec.stderr
index 2b6493077..2b6493077 100644
--- a/src/test/ui/span/regions-escape-loop-via-vec.stderr
+++ b/tests/ui/span/regions-escape-loop-via-vec.stderr
diff --git a/src/test/ui/span/regions-infer-borrow-scope-within-loop.rs b/tests/ui/span/regions-infer-borrow-scope-within-loop.rs
index 3b20285b1..3b20285b1 100644
--- a/src/test/ui/span/regions-infer-borrow-scope-within-loop.rs
+++ b/tests/ui/span/regions-infer-borrow-scope-within-loop.rs
diff --git a/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr b/tests/ui/span/regions-infer-borrow-scope-within-loop.stderr
index fd67c65c4..fd67c65c4 100644
--- a/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr
+++ b/tests/ui/span/regions-infer-borrow-scope-within-loop.stderr
diff --git a/src/test/ui/span/send-is-not-static-ensures-scoping.rs b/tests/ui/span/send-is-not-static-ensures-scoping.rs
index 2aecc2a7e..2aecc2a7e 100644
--- a/src/test/ui/span/send-is-not-static-ensures-scoping.rs
+++ b/tests/ui/span/send-is-not-static-ensures-scoping.rs
diff --git a/src/test/ui/span/send-is-not-static-ensures-scoping.stderr b/tests/ui/span/send-is-not-static-ensures-scoping.stderr
index 65d10c130..65d10c130 100644
--- a/src/test/ui/span/send-is-not-static-ensures-scoping.stderr
+++ b/tests/ui/span/send-is-not-static-ensures-scoping.stderr
diff --git a/src/test/ui/span/send-is-not-static-std-sync-2.rs b/tests/ui/span/send-is-not-static-std-sync-2.rs
index 38746d4cb..38746d4cb 100644
--- a/src/test/ui/span/send-is-not-static-std-sync-2.rs
+++ b/tests/ui/span/send-is-not-static-std-sync-2.rs
diff --git a/src/test/ui/span/send-is-not-static-std-sync-2.stderr b/tests/ui/span/send-is-not-static-std-sync-2.stderr
index bcd07e116..bcd07e116 100644
--- a/src/test/ui/span/send-is-not-static-std-sync-2.stderr
+++ b/tests/ui/span/send-is-not-static-std-sync-2.stderr
diff --git a/src/test/ui/span/send-is-not-static-std-sync.rs b/tests/ui/span/send-is-not-static-std-sync.rs
index f8ab5243c..f8ab5243c 100644
--- a/src/test/ui/span/send-is-not-static-std-sync.rs
+++ b/tests/ui/span/send-is-not-static-std-sync.rs
diff --git a/src/test/ui/span/send-is-not-static-std-sync.stderr b/tests/ui/span/send-is-not-static-std-sync.stderr
index 5d493a3e4..5d493a3e4 100644
--- a/src/test/ui/span/send-is-not-static-std-sync.stderr
+++ b/tests/ui/span/send-is-not-static-std-sync.stderr
diff --git a/src/test/ui/span/slice-borrow.rs b/tests/ui/span/slice-borrow.rs
index 38cd7acbd..38cd7acbd 100644
--- a/src/test/ui/span/slice-borrow.rs
+++ b/tests/ui/span/slice-borrow.rs
diff --git a/src/test/ui/span/slice-borrow.stderr b/tests/ui/span/slice-borrow.stderr
index b70bf69d6..b70bf69d6 100644
--- a/src/test/ui/span/slice-borrow.stderr
+++ b/tests/ui/span/slice-borrow.stderr
diff --git a/src/test/ui/span/suggestion-non-ascii.rs b/tests/ui/span/suggestion-non-ascii.rs
index 914efd85a..914efd85a 100644
--- a/src/test/ui/span/suggestion-non-ascii.rs
+++ b/tests/ui/span/suggestion-non-ascii.rs
diff --git a/src/test/ui/span/suggestion-non-ascii.stderr b/tests/ui/span/suggestion-non-ascii.stderr
index b14632d4e..b14632d4e 100644
--- a/src/test/ui/span/suggestion-non-ascii.stderr
+++ b/tests/ui/span/suggestion-non-ascii.stderr
diff --git a/src/test/ui/span/transitive-dep-span.rs b/tests/ui/span/transitive-dep-span.rs
index 2d46f74ad..2d46f74ad 100644
--- a/src/test/ui/span/transitive-dep-span.rs
+++ b/tests/ui/span/transitive-dep-span.rs
diff --git a/src/test/ui/span/transitive-dep-span.stderr b/tests/ui/span/transitive-dep-span.stderr
index 4dc3e5721..4dc3e5721 100644
--- a/src/test/ui/span/transitive-dep-span.stderr
+++ b/tests/ui/span/transitive-dep-span.stderr
diff --git a/src/test/ui/span/type-annotations-needed-expr.rs b/tests/ui/span/type-annotations-needed-expr.rs
index f64dab4d7..f64dab4d7 100644
--- a/src/test/ui/span/type-annotations-needed-expr.rs
+++ b/tests/ui/span/type-annotations-needed-expr.rs
diff --git a/src/test/ui/span/type-annotations-needed-expr.stderr b/tests/ui/span/type-annotations-needed-expr.stderr
index 9dff6c64d..9dff6c64d 100644
--- a/src/test/ui/span/type-annotations-needed-expr.stderr
+++ b/tests/ui/span/type-annotations-needed-expr.stderr
diff --git a/src/test/ui/span/type-binding.rs b/tests/ui/span/type-binding.rs
index 32016e127..32016e127 100644
--- a/src/test/ui/span/type-binding.rs
+++ b/tests/ui/span/type-binding.rs
diff --git a/src/test/ui/span/type-binding.stderr b/tests/ui/span/type-binding.stderr
index cb0aefe06..cb0aefe06 100644
--- a/src/test/ui/span/type-binding.stderr
+++ b/tests/ui/span/type-binding.stderr
diff --git a/src/test/ui/span/typo-suggestion.rs b/tests/ui/span/typo-suggestion.rs
index e9d7bc65e..e9d7bc65e 100644
--- a/src/test/ui/span/typo-suggestion.rs
+++ b/tests/ui/span/typo-suggestion.rs
diff --git a/src/test/ui/span/typo-suggestion.stderr b/tests/ui/span/typo-suggestion.stderr
index 61d4e0611..61d4e0611 100644
--- a/src/test/ui/span/typo-suggestion.stderr
+++ b/tests/ui/span/typo-suggestion.stderr
diff --git a/src/test/ui/span/unused-warning-point-at-identifier.rs b/tests/ui/span/unused-warning-point-at-identifier.rs
index af4834503..af4834503 100644
--- a/src/test/ui/span/unused-warning-point-at-identifier.rs
+++ b/tests/ui/span/unused-warning-point-at-identifier.rs
diff --git a/src/test/ui/span/unused-warning-point-at-identifier.stderr b/tests/ui/span/unused-warning-point-at-identifier.stderr
index c2cb56231..c2cb56231 100644
--- a/src/test/ui/span/unused-warning-point-at-identifier.stderr
+++ b/tests/ui/span/unused-warning-point-at-identifier.stderr
diff --git a/src/test/ui/span/vec-must-not-hide-type-from-dropck.rs b/tests/ui/span/vec-must-not-hide-type-from-dropck.rs
index 9bfbfab06..9bfbfab06 100644
--- a/src/test/ui/span/vec-must-not-hide-type-from-dropck.rs
+++ b/tests/ui/span/vec-must-not-hide-type-from-dropck.rs
diff --git a/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr b/tests/ui/span/vec-must-not-hide-type-from-dropck.stderr
index f87c32d1a..f87c32d1a 100644
--- a/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr
+++ b/tests/ui/span/vec-must-not-hide-type-from-dropck.stderr
diff --git a/src/test/ui/span/vec_refs_data_with_early_death.rs b/tests/ui/span/vec_refs_data_with_early_death.rs
index c23c52115..c23c52115 100644
--- a/src/test/ui/span/vec_refs_data_with_early_death.rs
+++ b/tests/ui/span/vec_refs_data_with_early_death.rs
diff --git a/src/test/ui/span/vec_refs_data_with_early_death.stderr b/tests/ui/span/vec_refs_data_with_early_death.stderr
index 684e78453..684e78453 100644
--- a/src/test/ui/span/vec_refs_data_with_early_death.stderr
+++ b/tests/ui/span/vec_refs_data_with_early_death.stderr
diff --git a/src/test/ui/span/visibility-ty-params.rs b/tests/ui/span/visibility-ty-params.rs
index d77febe0a..d77febe0a 100644
--- a/src/test/ui/span/visibility-ty-params.rs
+++ b/tests/ui/span/visibility-ty-params.rs
diff --git a/src/test/ui/span/visibility-ty-params.stderr b/tests/ui/span/visibility-ty-params.stderr
index 067893fd2..067893fd2 100644
--- a/src/test/ui/span/visibility-ty-params.stderr
+++ b/tests/ui/span/visibility-ty-params.stderr
diff --git a/src/test/ui/span/wf-method-late-bound-regions.rs b/tests/ui/span/wf-method-late-bound-regions.rs
index ca9f73d0a..ca9f73d0a 100644
--- a/src/test/ui/span/wf-method-late-bound-regions.rs
+++ b/tests/ui/span/wf-method-late-bound-regions.rs
diff --git a/src/test/ui/span/wf-method-late-bound-regions.stderr b/tests/ui/span/wf-method-late-bound-regions.stderr
index 6b0b00820..6b0b00820 100644
--- a/src/test/ui/span/wf-method-late-bound-regions.stderr
+++ b/tests/ui/span/wf-method-late-bound-regions.stderr
diff --git a/src/test/ui/specialization/README-rpass.md b/tests/ui/specialization/README-rpass.md
index c1486ce1e..c1486ce1e 100644
--- a/src/test/ui/specialization/README-rpass.md
+++ b/tests/ui/specialization/README-rpass.md
diff --git a/src/test/ui/specialization/README.md b/tests/ui/specialization/README.md
index f2b4bf946..f2b4bf946 100644
--- a/src/test/ui/specialization/README.md
+++ b/tests/ui/specialization/README.md
diff --git a/src/test/ui/specialization/assoc-ty-graph-cycle.rs b/tests/ui/specialization/assoc-ty-graph-cycle.rs
index fc39b553a..fc39b553a 100644
--- a/src/test/ui/specialization/assoc-ty-graph-cycle.rs
+++ b/tests/ui/specialization/assoc-ty-graph-cycle.rs
diff --git a/src/test/ui/specialization/assoc-ty-graph-cycle.stderr b/tests/ui/specialization/assoc-ty-graph-cycle.stderr
index f5529c24d..f5529c24d 100644
--- a/src/test/ui/specialization/assoc-ty-graph-cycle.stderr
+++ b/tests/ui/specialization/assoc-ty-graph-cycle.stderr
diff --git a/src/test/ui/specialization/auxiliary/cross_crates_defaults.rs b/tests/ui/specialization/auxiliary/cross_crates_defaults.rs
index 1e5555355..1e5555355 100644
--- a/src/test/ui/specialization/auxiliary/cross_crates_defaults.rs
+++ b/tests/ui/specialization/auxiliary/cross_crates_defaults.rs
diff --git a/src/test/ui/specialization/auxiliary/go_trait.rs b/tests/ui/specialization/auxiliary/go_trait.rs
index aa0ec2289..aa0ec2289 100644
--- a/src/test/ui/specialization/auxiliary/go_trait.rs
+++ b/tests/ui/specialization/auxiliary/go_trait.rs
diff --git a/src/test/ui/specialization/auxiliary/specialization_cross_crate.rs b/tests/ui/specialization/auxiliary/specialization_cross_crate.rs
index 8caa8524f..8caa8524f 100644
--- a/src/test/ui/specialization/auxiliary/specialization_cross_crate.rs
+++ b/tests/ui/specialization/auxiliary/specialization_cross_crate.rs
diff --git a/src/test/ui/specialization/const_trait_impl.rs b/tests/ui/specialization/const_trait_impl.rs
index 05ba4c8d4..05ba4c8d4 100644
--- a/src/test/ui/specialization/const_trait_impl.rs
+++ b/tests/ui/specialization/const_trait_impl.rs
diff --git a/src/test/ui/specialization/cross-crate-defaults.rs b/tests/ui/specialization/cross-crate-defaults.rs
index fc28d0c81..fc28d0c81 100644
--- a/src/test/ui/specialization/cross-crate-defaults.rs
+++ b/tests/ui/specialization/cross-crate-defaults.rs
diff --git a/src/test/ui/specialization/cross-crate-defaults.stderr b/tests/ui/specialization/cross-crate-defaults.stderr
index ee5c77a76..ee5c77a76 100644
--- a/src/test/ui/specialization/cross-crate-defaults.stderr
+++ b/tests/ui/specialization/cross-crate-defaults.stderr
diff --git a/src/test/ui/specialization/default-associated-type-bound-1.rs b/tests/ui/specialization/default-associated-type-bound-1.rs
index c043114b5..c043114b5 100644
--- a/src/test/ui/specialization/default-associated-type-bound-1.rs
+++ b/tests/ui/specialization/default-associated-type-bound-1.rs
diff --git a/src/test/ui/specialization/default-associated-type-bound-1.stderr b/tests/ui/specialization/default-associated-type-bound-1.stderr
index e498187c0..e498187c0 100644
--- a/src/test/ui/specialization/default-associated-type-bound-1.stderr
+++ b/tests/ui/specialization/default-associated-type-bound-1.stderr
diff --git a/src/test/ui/specialization/default-associated-type-bound-2.rs b/tests/ui/specialization/default-associated-type-bound-2.rs
index 0a21b1f09..0a21b1f09 100644
--- a/src/test/ui/specialization/default-associated-type-bound-2.rs
+++ b/tests/ui/specialization/default-associated-type-bound-2.rs
diff --git a/src/test/ui/specialization/default-associated-type-bound-2.stderr b/tests/ui/specialization/default-associated-type-bound-2.stderr
index 4dbe251ed..4dbe251ed 100644
--- a/src/test/ui/specialization/default-associated-type-bound-2.stderr
+++ b/tests/ui/specialization/default-associated-type-bound-2.stderr
diff --git a/src/test/ui/specialization/default-generic-associated-type-bound.rs b/tests/ui/specialization/default-generic-associated-type-bound.rs
index 31a0685d0..31a0685d0 100644
--- a/src/test/ui/specialization/default-generic-associated-type-bound.rs
+++ b/tests/ui/specialization/default-generic-associated-type-bound.rs
diff --git a/src/test/ui/specialization/default-generic-associated-type-bound.stderr b/tests/ui/specialization/default-generic-associated-type-bound.stderr
index c597eed37..c597eed37 100644
--- a/src/test/ui/specialization/default-generic-associated-type-bound.stderr
+++ b/tests/ui/specialization/default-generic-associated-type-bound.stderr
diff --git a/src/test/ui/specialization/defaultimpl/allowed-cross-crate.rs b/tests/ui/specialization/defaultimpl/allowed-cross-crate.rs
index 5d67160eb..5d67160eb 100644
--- a/src/test/ui/specialization/defaultimpl/allowed-cross-crate.rs
+++ b/tests/ui/specialization/defaultimpl/allowed-cross-crate.rs
diff --git a/src/test/ui/specialization/defaultimpl/allowed-cross-crate.stderr b/tests/ui/specialization/defaultimpl/allowed-cross-crate.stderr
index 02f13d461..02f13d461 100644
--- a/src/test/ui/specialization/defaultimpl/allowed-cross-crate.stderr
+++ b/tests/ui/specialization/defaultimpl/allowed-cross-crate.stderr
diff --git a/src/test/ui/specialization/defaultimpl/auxiliary/go_trait.rs b/tests/ui/specialization/defaultimpl/auxiliary/go_trait.rs
index c065593b4..c065593b4 100644
--- a/src/test/ui/specialization/defaultimpl/auxiliary/go_trait.rs
+++ b/tests/ui/specialization/defaultimpl/auxiliary/go_trait.rs
diff --git a/src/test/ui/specialization/defaultimpl/out-of-order.rs b/tests/ui/specialization/defaultimpl/out-of-order.rs
index 13258ac8c..13258ac8c 100644
--- a/src/test/ui/specialization/defaultimpl/out-of-order.rs
+++ b/tests/ui/specialization/defaultimpl/out-of-order.rs
diff --git a/src/test/ui/specialization/defaultimpl/out-of-order.stderr b/tests/ui/specialization/defaultimpl/out-of-order.stderr
index 2cf1ac909..2cf1ac909 100644
--- a/src/test/ui/specialization/defaultimpl/out-of-order.stderr
+++ b/tests/ui/specialization/defaultimpl/out-of-order.stderr
diff --git a/src/test/ui/specialization/defaultimpl/overlap-projection.rs b/tests/ui/specialization/defaultimpl/overlap-projection.rs
index 0add4d551..0add4d551 100644
--- a/src/test/ui/specialization/defaultimpl/overlap-projection.rs
+++ b/tests/ui/specialization/defaultimpl/overlap-projection.rs
diff --git a/src/test/ui/specialization/defaultimpl/overlap-projection.stderr b/tests/ui/specialization/defaultimpl/overlap-projection.stderr
index 75fdfafd9..75fdfafd9 100644
--- a/src/test/ui/specialization/defaultimpl/overlap-projection.stderr
+++ b/tests/ui/specialization/defaultimpl/overlap-projection.stderr
diff --git a/src/test/ui/specialization/defaultimpl/projection.rs b/tests/ui/specialization/defaultimpl/projection.rs
index f19c55b04..f19c55b04 100644
--- a/src/test/ui/specialization/defaultimpl/projection.rs
+++ b/tests/ui/specialization/defaultimpl/projection.rs
diff --git a/src/test/ui/specialization/defaultimpl/projection.stderr b/tests/ui/specialization/defaultimpl/projection.stderr
index cc3fe8237..cc3fe8237 100644
--- a/src/test/ui/specialization/defaultimpl/projection.stderr
+++ b/tests/ui/specialization/defaultimpl/projection.stderr
diff --git a/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.rs b/tests/ui/specialization/defaultimpl/specialization-feature-gate-default.rs
index 89158b65a..89158b65a 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.rs
+++ b/tests/ui/specialization/defaultimpl/specialization-feature-gate-default.rs
diff --git a/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr b/tests/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr
index 64e14f580..64e14f580 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr
+++ b/tests/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr
diff --git a/src/test/ui/specialization/defaultimpl/specialization-no-default.rs b/tests/ui/specialization/defaultimpl/specialization-no-default.rs
index 661724eef..661724eef 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-no-default.rs
+++ b/tests/ui/specialization/defaultimpl/specialization-no-default.rs
diff --git a/src/test/ui/specialization/defaultimpl/specialization-no-default.stderr b/tests/ui/specialization/defaultimpl/specialization-no-default.stderr
index 770be2af2..770be2af2 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-no-default.stderr
+++ b/tests/ui/specialization/defaultimpl/specialization-no-default.stderr
diff --git a/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented-rpass.rs b/tests/ui/specialization/defaultimpl/specialization-trait-item-not-implemented-rpass.rs
index 89fef5b5e..89fef5b5e 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented-rpass.rs
+++ b/tests/ui/specialization/defaultimpl/specialization-trait-item-not-implemented-rpass.rs
diff --git a/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented-rpass.stderr b/tests/ui/specialization/defaultimpl/specialization-trait-item-not-implemented-rpass.stderr
index 407c1ab77..407c1ab77 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented-rpass.stderr
+++ b/tests/ui/specialization/defaultimpl/specialization-trait-item-not-implemented-rpass.stderr
diff --git a/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.rs b/tests/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.rs
index 3c5414469..3c5414469 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.rs
+++ b/tests/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.rs
diff --git a/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.stderr b/tests/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.stderr
index f19975060..f19975060 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.stderr
+++ b/tests/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.stderr
diff --git a/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.rs b/tests/ui/specialization/defaultimpl/specialization-trait-not-implemented.rs
index 6834d5736..6834d5736 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.rs
+++ b/tests/ui/specialization/defaultimpl/specialization-trait-not-implemented.rs
diff --git a/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr b/tests/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr
index 33ca7a2c2..37788612f 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr
+++ b/tests/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr
@@ -27,7 +27,7 @@ LL | default impl<T> Foo for T {
    | ^^^^^^^^^^^^^^^^---^^^^^-
    | |
    | unsatisfied trait bound introduced here
-note: the following trait must be implemented
+note: the trait `Foo` must be implemented
   --> $DIR/specialization-trait-not-implemented.rs:7:1
    |
 LL | trait Foo {
diff --git a/src/test/ui/specialization/defaultimpl/specialization-wfcheck.rs b/tests/ui/specialization/defaultimpl/specialization-wfcheck.rs
index eb18d6eaa..eb18d6eaa 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-wfcheck.rs
+++ b/tests/ui/specialization/defaultimpl/specialization-wfcheck.rs
diff --git a/src/test/ui/specialization/defaultimpl/specialization-wfcheck.stderr b/tests/ui/specialization/defaultimpl/specialization-wfcheck.stderr
index e78016034..e78016034 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-wfcheck.stderr
+++ b/tests/ui/specialization/defaultimpl/specialization-wfcheck.stderr
diff --git a/src/test/ui/specialization/defaultimpl/validation.rs b/tests/ui/specialization/defaultimpl/validation.rs
index 8558a1efb..8558a1efb 100644
--- a/src/test/ui/specialization/defaultimpl/validation.rs
+++ b/tests/ui/specialization/defaultimpl/validation.rs
diff --git a/src/test/ui/specialization/defaultimpl/validation.stderr b/tests/ui/specialization/defaultimpl/validation.stderr
index eb6dc9355..eb6dc9355 100644
--- a/src/test/ui/specialization/defaultimpl/validation.stderr
+++ b/tests/ui/specialization/defaultimpl/validation.stderr
diff --git a/src/test/ui/specialization/issue-33017.rs b/tests/ui/specialization/issue-33017.rs
index 8dbadf58d..8dbadf58d 100644
--- a/src/test/ui/specialization/issue-33017.rs
+++ b/tests/ui/specialization/issue-33017.rs
diff --git a/src/test/ui/specialization/issue-33017.stderr b/tests/ui/specialization/issue-33017.stderr
index 78e94cec2..78e94cec2 100644
--- a/src/test/ui/specialization/issue-33017.stderr
+++ b/tests/ui/specialization/issue-33017.stderr
diff --git a/src/test/ui/specialization/issue-35376.rs b/tests/ui/specialization/issue-35376.rs
index cc35213b9..cc35213b9 100644
--- a/src/test/ui/specialization/issue-35376.rs
+++ b/tests/ui/specialization/issue-35376.rs
diff --git a/src/test/ui/specialization/issue-35376.stderr b/tests/ui/specialization/issue-35376.stderr
index 6c4167f3f..6c4167f3f 100644
--- a/src/test/ui/specialization/issue-35376.stderr
+++ b/tests/ui/specialization/issue-35376.stderr
diff --git a/src/test/ui/specialization/issue-36804.rs b/tests/ui/specialization/issue-36804.rs
index 89350602f..89350602f 100644
--- a/src/test/ui/specialization/issue-36804.rs
+++ b/tests/ui/specialization/issue-36804.rs
diff --git a/src/test/ui/specialization/issue-36804.stderr b/tests/ui/specialization/issue-36804.stderr
index c2113b25f..c2113b25f 100644
--- a/src/test/ui/specialization/issue-36804.stderr
+++ b/tests/ui/specialization/issue-36804.stderr
diff --git a/src/test/ui/specialization/issue-38091-2.rs b/tests/ui/specialization/issue-38091-2.rs
index 9ed0b240d..9ed0b240d 100644
--- a/src/test/ui/specialization/issue-38091-2.rs
+++ b/tests/ui/specialization/issue-38091-2.rs
diff --git a/src/test/ui/specialization/issue-38091-2.stderr b/tests/ui/specialization/issue-38091-2.stderr
index 117fb10bb..5a05f9c27 100644
--- a/src/test/ui/specialization/issue-38091-2.stderr
+++ b/tests/ui/specialization/issue-38091-2.stderr
@@ -15,6 +15,9 @@ note: required for `i32` to implement `Iterate<'_>`
    |
 LL | impl<'a, T> Iterate<'a> for T
    |             ^^^^^^^^^^^     ^
+LL | where
+LL |     T: Check,
+   |        ----- unsatisfied trait bound introduced here
 
 error: aborting due to previous error; 1 warning emitted
 
diff --git a/src/test/ui/specialization/issue-38091.rs b/tests/ui/specialization/issue-38091.rs
index 5b398368a..5b398368a 100644
--- a/src/test/ui/specialization/issue-38091.rs
+++ b/tests/ui/specialization/issue-38091.rs
diff --git a/src/test/ui/specialization/issue-38091.stderr b/tests/ui/specialization/issue-38091.stderr
index f2210a407..f2210a407 100644
--- a/src/test/ui/specialization/issue-38091.stderr
+++ b/tests/ui/specialization/issue-38091.stderr
diff --git a/src/test/ui/specialization/issue-39448.rs b/tests/ui/specialization/issue-39448.rs
index a15c4bd6b..a15c4bd6b 100644
--- a/src/test/ui/specialization/issue-39448.rs
+++ b/tests/ui/specialization/issue-39448.rs
diff --git a/src/test/ui/specialization/issue-39448.stderr b/tests/ui/specialization/issue-39448.stderr
index 60157d9a3..9ce51d113 100644
--- a/src/test/ui/specialization/issue-39448.stderr
+++ b/tests/ui/specialization/issue-39448.stderr
@@ -18,12 +18,17 @@ note: required for `T` to implement `FromA<U>`
   --> $DIR/issue-39448.rs:24:29
    |
 LL | impl<T: A, U: A + FromA<T>> FromA<T> for U {
-   |                             ^^^^^^^^     ^
+   |                   --------  ^^^^^^^^     ^
+   |                   |
+   |                   unsatisfied trait bound introduced here
 note: required for `U` to implement `ToA<T>`
   --> $DIR/issue-39448.rs:34:12
    |
 LL | impl<T, U> ToA<U> for T
    |            ^^^^^^     ^
+LL | where
+LL |     U: FromA<T>,
+   |        -------- unsatisfied trait bound introduced here
 
 error: aborting due to previous error; 1 warning emitted
 
diff --git a/src/test/ui/specialization/issue-39618.rs b/tests/ui/specialization/issue-39618.rs
index 72630ee9c..72630ee9c 100644
--- a/src/test/ui/specialization/issue-39618.rs
+++ b/tests/ui/specialization/issue-39618.rs
diff --git a/src/test/ui/specialization/issue-39618.stderr b/tests/ui/specialization/issue-39618.stderr
index 19de60c7c..19de60c7c 100644
--- a/src/test/ui/specialization/issue-39618.stderr
+++ b/tests/ui/specialization/issue-39618.stderr
diff --git a/src/test/ui/specialization/issue-43037.current.stderr b/tests/ui/specialization/issue-43037.current.stderr
index 26db9d7c9..26db9d7c9 100644
--- a/src/test/ui/specialization/issue-43037.current.stderr
+++ b/tests/ui/specialization/issue-43037.current.stderr
diff --git a/src/test/ui/specialization/issue-43037.negative.stderr b/tests/ui/specialization/issue-43037.negative.stderr
index 26db9d7c9..26db9d7c9 100644
--- a/src/test/ui/specialization/issue-43037.negative.stderr
+++ b/tests/ui/specialization/issue-43037.negative.stderr
diff --git a/src/test/ui/specialization/issue-43037.rs b/tests/ui/specialization/issue-43037.rs
index a1e3f998b..a1e3f998b 100644
--- a/src/test/ui/specialization/issue-43037.rs
+++ b/tests/ui/specialization/issue-43037.rs
diff --git a/src/test/ui/specialization/issue-44861.rs b/tests/ui/specialization/issue-44861.rs
index 79d9b9490..79d9b9490 100644
--- a/src/test/ui/specialization/issue-44861.rs
+++ b/tests/ui/specialization/issue-44861.rs
diff --git a/src/test/ui/specialization/issue-44861.stderr b/tests/ui/specialization/issue-44861.stderr
index 1941d40fe..1941d40fe 100644
--- a/src/test/ui/specialization/issue-44861.stderr
+++ b/tests/ui/specialization/issue-44861.stderr
diff --git a/src/test/ui/specialization/issue-45814.current.stderr b/tests/ui/specialization/issue-45814.current.stderr
index 5013559b8..5013559b8 100644
--- a/src/test/ui/specialization/issue-45814.current.stderr
+++ b/tests/ui/specialization/issue-45814.current.stderr
diff --git a/src/test/ui/specialization/issue-45814.negative.stderr b/tests/ui/specialization/issue-45814.negative.stderr
index 5013559b8..5013559b8 100644
--- a/src/test/ui/specialization/issue-45814.negative.stderr
+++ b/tests/ui/specialization/issue-45814.negative.stderr
diff --git a/src/test/ui/specialization/issue-45814.rs b/tests/ui/specialization/issue-45814.rs
index fce236390..fce236390 100644
--- a/src/test/ui/specialization/issue-45814.rs
+++ b/tests/ui/specialization/issue-45814.rs
diff --git a/src/test/ui/specialization/issue-50452-fail.rs b/tests/ui/specialization/issue-50452-fail.rs
index fe21e9b6e..fe21e9b6e 100644
--- a/src/test/ui/specialization/issue-50452-fail.rs
+++ b/tests/ui/specialization/issue-50452-fail.rs
diff --git a/src/test/ui/specialization/issue-50452-fail.stderr b/tests/ui/specialization/issue-50452-fail.stderr
index 5c136adc4..5c136adc4 100644
--- a/src/test/ui/specialization/issue-50452-fail.stderr
+++ b/tests/ui/specialization/issue-50452-fail.stderr
diff --git a/src/test/ui/specialization/issue-50452.rs b/tests/ui/specialization/issue-50452.rs
index 29fc12066..29fc12066 100644
--- a/src/test/ui/specialization/issue-50452.rs
+++ b/tests/ui/specialization/issue-50452.rs
diff --git a/src/test/ui/specialization/issue-50452.stderr b/tests/ui/specialization/issue-50452.stderr
index 48cab9dcd..48cab9dcd 100644
--- a/src/test/ui/specialization/issue-50452.stderr
+++ b/tests/ui/specialization/issue-50452.stderr
diff --git a/src/test/ui/specialization/issue-51892.rs b/tests/ui/specialization/issue-51892.rs
index 5c0625414..5c0625414 100644
--- a/src/test/ui/specialization/issue-51892.rs
+++ b/tests/ui/specialization/issue-51892.rs
diff --git a/src/test/ui/specialization/issue-51892.stderr b/tests/ui/specialization/issue-51892.stderr
index cb46db836..cb46db836 100644
--- a/src/test/ui/specialization/issue-51892.stderr
+++ b/tests/ui/specialization/issue-51892.stderr
diff --git a/src/test/ui/specialization/issue-52050.rs b/tests/ui/specialization/issue-52050.rs
index 804658702..804658702 100644
--- a/src/test/ui/specialization/issue-52050.rs
+++ b/tests/ui/specialization/issue-52050.rs
diff --git a/src/test/ui/specialization/issue-52050.stderr b/tests/ui/specialization/issue-52050.stderr
index c263fe467..c263fe467 100644
--- a/src/test/ui/specialization/issue-52050.stderr
+++ b/tests/ui/specialization/issue-52050.stderr
diff --git a/src/test/ui/specialization/issue-59435.rs b/tests/ui/specialization/issue-59435.rs
index 323900256..323900256 100644
--- a/src/test/ui/specialization/issue-59435.rs
+++ b/tests/ui/specialization/issue-59435.rs
diff --git a/src/test/ui/specialization/issue-59435.stderr b/tests/ui/specialization/issue-59435.stderr
index 211459406..211459406 100644
--- a/src/test/ui/specialization/issue-59435.stderr
+++ b/tests/ui/specialization/issue-59435.stderr
diff --git a/src/test/ui/specialization/issue-63716-parse-async.rs b/tests/ui/specialization/issue-63716-parse-async.rs
index 10f185c33..10f185c33 100644
--- a/src/test/ui/specialization/issue-63716-parse-async.rs
+++ b/tests/ui/specialization/issue-63716-parse-async.rs
diff --git a/src/test/ui/specialization/issue-63716-parse-async.stderr b/tests/ui/specialization/issue-63716-parse-async.stderr
index a00572da8..a00572da8 100644
--- a/src/test/ui/specialization/issue-63716-parse-async.stderr
+++ b/tests/ui/specialization/issue-63716-parse-async.stderr
diff --git a/src/test/ui/specialization/issue-68830-spurious-diagnostics.rs b/tests/ui/specialization/issue-68830-spurious-diagnostics.rs
index d11ec7983..d11ec7983 100644
--- a/src/test/ui/specialization/issue-68830-spurious-diagnostics.rs
+++ b/tests/ui/specialization/issue-68830-spurious-diagnostics.rs
diff --git a/src/test/ui/specialization/issue-68830-spurious-diagnostics.stderr b/tests/ui/specialization/issue-68830-spurious-diagnostics.stderr
index 833f61dca..833f61dca 100644
--- a/src/test/ui/specialization/issue-68830-spurious-diagnostics.stderr
+++ b/tests/ui/specialization/issue-68830-spurious-diagnostics.stderr
diff --git a/src/test/ui/specialization/issue-70442.rs b/tests/ui/specialization/issue-70442.rs
index d41b5355c..d41b5355c 100644
--- a/src/test/ui/specialization/issue-70442.rs
+++ b/tests/ui/specialization/issue-70442.rs
diff --git a/src/test/ui/specialization/issue-70442.stderr b/tests/ui/specialization/issue-70442.stderr
index aa72c3286..aa72c3286 100644
--- a/src/test/ui/specialization/issue-70442.stderr
+++ b/tests/ui/specialization/issue-70442.stderr
diff --git a/src/test/ui/specialization/min_specialization/auxiliary/specialization-trait.rs b/tests/ui/specialization/min_specialization/auxiliary/specialization-trait.rs
index 6ec0d261d..6ec0d261d 100644
--- a/src/test/ui/specialization/min_specialization/auxiliary/specialization-trait.rs
+++ b/tests/ui/specialization/min_specialization/auxiliary/specialization-trait.rs
diff --git a/src/test/ui/specialization/min_specialization/dyn-trait-assoc-types.rs b/tests/ui/specialization/min_specialization/dyn-trait-assoc-types.rs
index 03cab00b0..03cab00b0 100644
--- a/src/test/ui/specialization/min_specialization/dyn-trait-assoc-types.rs
+++ b/tests/ui/specialization/min_specialization/dyn-trait-assoc-types.rs
diff --git a/src/test/ui/specialization/min_specialization/dyn-trait-assoc-types.stderr b/tests/ui/specialization/min_specialization/dyn-trait-assoc-types.stderr
index db5558f16..db5558f16 100644
--- a/src/test/ui/specialization/min_specialization/dyn-trait-assoc-types.stderr
+++ b/tests/ui/specialization/min_specialization/dyn-trait-assoc-types.stderr
diff --git a/src/test/ui/specialization/min_specialization/impl-on-nonexisting.rs b/tests/ui/specialization/min_specialization/impl-on-nonexisting.rs
index 77a64320d..77a64320d 100644
--- a/src/test/ui/specialization/min_specialization/impl-on-nonexisting.rs
+++ b/tests/ui/specialization/min_specialization/impl-on-nonexisting.rs
diff --git a/src/test/ui/specialization/min_specialization/impl-on-nonexisting.stderr b/tests/ui/specialization/min_specialization/impl-on-nonexisting.stderr
index b032ccbe5..b032ccbe5 100644
--- a/src/test/ui/specialization/min_specialization/impl-on-nonexisting.stderr
+++ b/tests/ui/specialization/min_specialization/impl-on-nonexisting.stderr
diff --git a/src/test/ui/specialization/min_specialization/impl_specialization_trait.rs b/tests/ui/specialization/min_specialization/impl_specialization_trait.rs
index 723ed71c3..723ed71c3 100644
--- a/src/test/ui/specialization/min_specialization/impl_specialization_trait.rs
+++ b/tests/ui/specialization/min_specialization/impl_specialization_trait.rs
diff --git a/src/test/ui/specialization/min_specialization/impl_specialization_trait.stderr b/tests/ui/specialization/min_specialization/impl_specialization_trait.stderr
index 934103d49..934103d49 100644
--- a/src/test/ui/specialization/min_specialization/impl_specialization_trait.stderr
+++ b/tests/ui/specialization/min_specialization/impl_specialization_trait.stderr
diff --git a/src/test/ui/specialization/min_specialization/implcit-well-formed-bounds.rs b/tests/ui/specialization/min_specialization/implcit-well-formed-bounds.rs
index 98d7f9194..98d7f9194 100644
--- a/src/test/ui/specialization/min_specialization/implcit-well-formed-bounds.rs
+++ b/tests/ui/specialization/min_specialization/implcit-well-formed-bounds.rs
diff --git a/tests/ui/specialization/min_specialization/issue-79224.rs b/tests/ui/specialization/min_specialization/issue-79224.rs
new file mode 100644
index 000000000..104bddd07
--- /dev/null
+++ b/tests/ui/specialization/min_specialization/issue-79224.rs
@@ -0,0 +1,26 @@
+#![feature(min_specialization)]
+use std::fmt::{self, Display};
+
+pub enum Cow<'a, B: ?Sized + 'a, O = <B as ToOwned>::Owned>
+where
+    B: ToOwned,
+{
+    Borrowed(&'a B),
+    Owned(O),
+}
+
+impl ToString for Cow<'_, str> {
+    fn to_string(&self) -> String {
+        String::new()
+    }
+}
+
+impl<B: ?Sized> Display for Cow<'_, B> {
+    //~^ ERROR: the trait bound `B: Clone` is not satisfied [E0277]
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        //~^ ERROR: the trait bound `B: Clone` is not satisfied [E0277]
+        write!(f, "foo")
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/specialization/min_specialization/issue-79224.stderr b/tests/ui/specialization/min_specialization/issue-79224.stderr
new file mode 100644
index 000000000..505baa23c
--- /dev/null
+++ b/tests/ui/specialization/min_specialization/issue-79224.stderr
@@ -0,0 +1,27 @@
+error[E0277]: the trait bound `B: Clone` is not satisfied
+  --> $DIR/issue-79224.rs:18:29
+   |
+LL | impl<B: ?Sized> Display for Cow<'_, B> {
+   |                             ^^^^^^^^^^ the trait `Clone` is not implemented for `B`
+   |
+   = note: required for `B` to implement `ToOwned`
+help: consider further restricting this bound
+   |
+LL | impl<B: ?Sized + std::clone::Clone> Display for Cow<'_, B> {
+   |                +++++++++++++++++++
+
+error[E0277]: the trait bound `B: Clone` is not satisfied
+  --> $DIR/issue-79224.rs:20:12
+   |
+LL |     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+   |            ^^^^^ the trait `Clone` is not implemented for `B`
+   |
+   = note: required for `B` to implement `ToOwned`
+help: consider further restricting this bound
+   |
+LL | impl<B: ?Sized + std::clone::Clone> Display for Cow<'_, B> {
+   |                +++++++++++++++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/specialization/min_specialization/repeated_projection_type.rs b/tests/ui/specialization/min_specialization/repeated_projection_type.rs
index f21f39f06..f21f39f06 100644
--- a/src/test/ui/specialization/min_specialization/repeated_projection_type.rs
+++ b/tests/ui/specialization/min_specialization/repeated_projection_type.rs
diff --git a/src/test/ui/specialization/min_specialization/repeated_projection_type.stderr b/tests/ui/specialization/min_specialization/repeated_projection_type.stderr
index a751ba793..a751ba793 100644
--- a/src/test/ui/specialization/min_specialization/repeated_projection_type.stderr
+++ b/tests/ui/specialization/min_specialization/repeated_projection_type.stderr
diff --git a/src/test/ui/specialization/min_specialization/repeating_lifetimes.rs b/tests/ui/specialization/min_specialization/repeating_lifetimes.rs
index 49bfacec0..49bfacec0 100644
--- a/src/test/ui/specialization/min_specialization/repeating_lifetimes.rs
+++ b/tests/ui/specialization/min_specialization/repeating_lifetimes.rs
diff --git a/src/test/ui/specialization/min_specialization/repeating_lifetimes.stderr b/tests/ui/specialization/min_specialization/repeating_lifetimes.stderr
index 16dccb10b..16dccb10b 100644
--- a/src/test/ui/specialization/min_specialization/repeating_lifetimes.stderr
+++ b/tests/ui/specialization/min_specialization/repeating_lifetimes.stderr
diff --git a/src/test/ui/specialization/min_specialization/repeating_param.rs b/tests/ui/specialization/min_specialization/repeating_param.rs
index 5a1c97fd3..5a1c97fd3 100644
--- a/src/test/ui/specialization/min_specialization/repeating_param.rs
+++ b/tests/ui/specialization/min_specialization/repeating_param.rs
diff --git a/src/test/ui/specialization/min_specialization/repeating_param.stderr b/tests/ui/specialization/min_specialization/repeating_param.stderr
index 5e6adf723..5e6adf723 100644
--- a/src/test/ui/specialization/min_specialization/repeating_param.stderr
+++ b/tests/ui/specialization/min_specialization/repeating_param.stderr
diff --git a/src/test/ui/specialization/min_specialization/spec-iter.rs b/tests/ui/specialization/min_specialization/spec-iter.rs
index e17e9dd5f..e17e9dd5f 100644
--- a/src/test/ui/specialization/min_specialization/spec-iter.rs
+++ b/tests/ui/specialization/min_specialization/spec-iter.rs
diff --git a/src/test/ui/specialization/min_specialization/spec-marker-supertraits.rs b/tests/ui/specialization/min_specialization/spec-marker-supertraits.rs
index 3bb2480e9..3bb2480e9 100644
--- a/src/test/ui/specialization/min_specialization/spec-marker-supertraits.rs
+++ b/tests/ui/specialization/min_specialization/spec-marker-supertraits.rs
diff --git a/src/test/ui/specialization/min_specialization/spec-marker-supertraits.stderr b/tests/ui/specialization/min_specialization/spec-marker-supertraits.stderr
index ba9d6bbe3..ba9d6bbe3 100644
--- a/src/test/ui/specialization/min_specialization/spec-marker-supertraits.stderr
+++ b/tests/ui/specialization/min_specialization/spec-marker-supertraits.stderr
diff --git a/src/test/ui/specialization/min_specialization/spec-reference.rs b/tests/ui/specialization/min_specialization/spec-reference.rs
index 377889e2c..377889e2c 100644
--- a/src/test/ui/specialization/min_specialization/spec-reference.rs
+++ b/tests/ui/specialization/min_specialization/spec-reference.rs
diff --git a/src/test/ui/specialization/min_specialization/specialization_marker.rs b/tests/ui/specialization/min_specialization/specialization_marker.rs
index 93462d02e..93462d02e 100644
--- a/src/test/ui/specialization/min_specialization/specialization_marker.rs
+++ b/tests/ui/specialization/min_specialization/specialization_marker.rs
diff --git a/src/test/ui/specialization/min_specialization/specialization_marker.stderr b/tests/ui/specialization/min_specialization/specialization_marker.stderr
index b47c14f3c..b47c14f3c 100644
--- a/src/test/ui/specialization/min_specialization/specialization_marker.stderr
+++ b/tests/ui/specialization/min_specialization/specialization_marker.stderr
diff --git a/src/test/ui/specialization/min_specialization/specialization_super_trait.rs b/tests/ui/specialization/min_specialization/specialization_super_trait.rs
index 145f376ed..145f376ed 100644
--- a/src/test/ui/specialization/min_specialization/specialization_super_trait.rs
+++ b/tests/ui/specialization/min_specialization/specialization_super_trait.rs
diff --git a/src/test/ui/specialization/min_specialization/specialization_super_trait.stderr b/tests/ui/specialization/min_specialization/specialization_super_trait.stderr
index e93578662..e93578662 100644
--- a/src/test/ui/specialization/min_specialization/specialization_super_trait.stderr
+++ b/tests/ui/specialization/min_specialization/specialization_super_trait.stderr
diff --git a/src/test/ui/specialization/min_specialization/specialization_trait.rs b/tests/ui/specialization/min_specialization/specialization_trait.rs
index d597278d2..d597278d2 100644
--- a/src/test/ui/specialization/min_specialization/specialization_trait.rs
+++ b/tests/ui/specialization/min_specialization/specialization_trait.rs
diff --git a/src/test/ui/specialization/min_specialization/specialization_trait.stderr b/tests/ui/specialization/min_specialization/specialization_trait.stderr
index bc87ae0f8..bc87ae0f8 100644
--- a/src/test/ui/specialization/min_specialization/specialization_trait.stderr
+++ b/tests/ui/specialization/min_specialization/specialization_trait.stderr
diff --git a/src/test/ui/specialization/min_specialization/specialize_on_marker.rs b/tests/ui/specialization/min_specialization/specialize_on_marker.rs
index 4219bd13b..4219bd13b 100644
--- a/src/test/ui/specialization/min_specialization/specialize_on_marker.rs
+++ b/tests/ui/specialization/min_specialization/specialize_on_marker.rs
diff --git a/src/test/ui/specialization/min_specialization/specialize_on_spec_trait.rs b/tests/ui/specialization/min_specialization/specialize_on_spec_trait.rs
index abbab5c23..abbab5c23 100644
--- a/src/test/ui/specialization/min_specialization/specialize_on_spec_trait.rs
+++ b/tests/ui/specialization/min_specialization/specialize_on_spec_trait.rs
diff --git a/src/test/ui/specialization/min_specialization/specialize_on_static.rs b/tests/ui/specialization/min_specialization/specialize_on_static.rs
index dd1b05401..dd1b05401 100644
--- a/src/test/ui/specialization/min_specialization/specialize_on_static.rs
+++ b/tests/ui/specialization/min_specialization/specialize_on_static.rs
diff --git a/src/test/ui/specialization/min_specialization/specialize_on_static.stderr b/tests/ui/specialization/min_specialization/specialize_on_static.stderr
index 9a16798f1..9a16798f1 100644
--- a/src/test/ui/specialization/min_specialization/specialize_on_static.stderr
+++ b/tests/ui/specialization/min_specialization/specialize_on_static.stderr
diff --git a/src/test/ui/specialization/min_specialization/specialize_on_trait.rs b/tests/ui/specialization/min_specialization/specialize_on_trait.rs
index 0588442c3..0588442c3 100644
--- a/src/test/ui/specialization/min_specialization/specialize_on_trait.rs
+++ b/tests/ui/specialization/min_specialization/specialize_on_trait.rs
diff --git a/src/test/ui/specialization/min_specialization/specialize_on_trait.stderr b/tests/ui/specialization/min_specialization/specialize_on_trait.stderr
index 7b79c7eb4..7b79c7eb4 100644
--- a/src/test/ui/specialization/min_specialization/specialize_on_trait.stderr
+++ b/tests/ui/specialization/min_specialization/specialize_on_trait.stderr
diff --git a/src/test/ui/specialization/non-defaulted-item-fail.rs b/tests/ui/specialization/non-defaulted-item-fail.rs
index b7d6ac829..b7d6ac829 100644
--- a/src/test/ui/specialization/non-defaulted-item-fail.rs
+++ b/tests/ui/specialization/non-defaulted-item-fail.rs
diff --git a/src/test/ui/specialization/non-defaulted-item-fail.stderr b/tests/ui/specialization/non-defaulted-item-fail.stderr
index faa14555a..faa14555a 100644
--- a/src/test/ui/specialization/non-defaulted-item-fail.stderr
+++ b/tests/ui/specialization/non-defaulted-item-fail.stderr
diff --git a/src/test/ui/specialization/soundness/partial_eq_range_inclusive.rs b/tests/ui/specialization/soundness/partial_eq_range_inclusive.rs
index 923dec892..923dec892 100644
--- a/src/test/ui/specialization/soundness/partial_eq_range_inclusive.rs
+++ b/tests/ui/specialization/soundness/partial_eq_range_inclusive.rs
diff --git a/src/test/ui/specialization/soundness/partial_ord_slice.rs b/tests/ui/specialization/soundness/partial_ord_slice.rs
index b9e80a48d..b9e80a48d 100644
--- a/src/test/ui/specialization/soundness/partial_ord_slice.rs
+++ b/tests/ui/specialization/soundness/partial_ord_slice.rs
diff --git a/src/test/ui/specialization/specialization-allowed-cross-crate.rs b/tests/ui/specialization/specialization-allowed-cross-crate.rs
index 5d67160eb..5d67160eb 100644
--- a/src/test/ui/specialization/specialization-allowed-cross-crate.rs
+++ b/tests/ui/specialization/specialization-allowed-cross-crate.rs
diff --git a/src/test/ui/specialization/specialization-allowed-cross-crate.stderr b/tests/ui/specialization/specialization-allowed-cross-crate.stderr
index 3eea4a53b..3eea4a53b 100644
--- a/src/test/ui/specialization/specialization-allowed-cross-crate.stderr
+++ b/tests/ui/specialization/specialization-allowed-cross-crate.stderr
diff --git a/src/test/ui/specialization/specialization-assoc-fns.rs b/tests/ui/specialization/specialization-assoc-fns.rs
index cbfcb4719..cbfcb4719 100644
--- a/src/test/ui/specialization/specialization-assoc-fns.rs
+++ b/tests/ui/specialization/specialization-assoc-fns.rs
diff --git a/src/test/ui/specialization/specialization-assoc-fns.stderr b/tests/ui/specialization/specialization-assoc-fns.stderr
index 69f7cece7..69f7cece7 100644
--- a/src/test/ui/specialization/specialization-assoc-fns.stderr
+++ b/tests/ui/specialization/specialization-assoc-fns.stderr
diff --git a/src/test/ui/specialization/specialization-basics.rs b/tests/ui/specialization/specialization-basics.rs
index 721c934db..721c934db 100644
--- a/src/test/ui/specialization/specialization-basics.rs
+++ b/tests/ui/specialization/specialization-basics.rs
diff --git a/src/test/ui/specialization/specialization-basics.stderr b/tests/ui/specialization/specialization-basics.stderr
index 7714d4af4..7714d4af4 100644
--- a/src/test/ui/specialization/specialization-basics.stderr
+++ b/tests/ui/specialization/specialization-basics.stderr
diff --git a/src/test/ui/specialization/specialization-cross-crate-no-gate.rs b/tests/ui/specialization/specialization-cross-crate-no-gate.rs
index f744b16de..f744b16de 100644
--- a/src/test/ui/specialization/specialization-cross-crate-no-gate.rs
+++ b/tests/ui/specialization/specialization-cross-crate-no-gate.rs
diff --git a/src/test/ui/specialization/specialization-cross-crate.rs b/tests/ui/specialization/specialization-cross-crate.rs
index d9381d661..d9381d661 100644
--- a/src/test/ui/specialization/specialization-cross-crate.rs
+++ b/tests/ui/specialization/specialization-cross-crate.rs
diff --git a/src/test/ui/specialization/specialization-cross-crate.stderr b/tests/ui/specialization/specialization-cross-crate.stderr
index 06818bb56..06818bb56 100644
--- a/src/test/ui/specialization/specialization-cross-crate.stderr
+++ b/tests/ui/specialization/specialization-cross-crate.stderr
diff --git a/src/test/ui/specialization/specialization-default-methods.rs b/tests/ui/specialization/specialization-default-methods.rs
index dcf68afa9..dcf68afa9 100644
--- a/src/test/ui/specialization/specialization-default-methods.rs
+++ b/tests/ui/specialization/specialization-default-methods.rs
diff --git a/src/test/ui/specialization/specialization-default-methods.stderr b/tests/ui/specialization/specialization-default-methods.stderr
index d78d30bd8..d78d30bd8 100644
--- a/src/test/ui/specialization/specialization-default-methods.stderr
+++ b/tests/ui/specialization/specialization-default-methods.stderr
diff --git a/src/test/ui/specialization/specialization-default-projection.rs b/tests/ui/specialization/specialization-default-projection.rs
index 7f3ae9512..7f3ae9512 100644
--- a/src/test/ui/specialization/specialization-default-projection.rs
+++ b/tests/ui/specialization/specialization-default-projection.rs
diff --git a/src/test/ui/specialization/specialization-default-projection.stderr b/tests/ui/specialization/specialization-default-projection.stderr
index b8b81876d..b8b81876d 100644
--- a/src/test/ui/specialization/specialization-default-projection.stderr
+++ b/tests/ui/specialization/specialization-default-projection.stderr
diff --git a/src/test/ui/specialization/specialization-default-types.rs b/tests/ui/specialization/specialization-default-types.rs
index 346471f11..346471f11 100644
--- a/src/test/ui/specialization/specialization-default-types.rs
+++ b/tests/ui/specialization/specialization-default-types.rs
diff --git a/src/test/ui/specialization/specialization-default-types.stderr b/tests/ui/specialization/specialization-default-types.stderr
index 61a556a93..61a556a93 100644
--- a/src/test/ui/specialization/specialization-default-types.stderr
+++ b/tests/ui/specialization/specialization-default-types.stderr
diff --git a/src/test/ui/specialization/specialization-feature-gate-default.rs b/tests/ui/specialization/specialization-feature-gate-default.rs
index 8bad3ac0a..8bad3ac0a 100644
--- a/src/test/ui/specialization/specialization-feature-gate-default.rs
+++ b/tests/ui/specialization/specialization-feature-gate-default.rs
diff --git a/src/test/ui/specialization/specialization-feature-gate-default.stderr b/tests/ui/specialization/specialization-feature-gate-default.stderr
index 42dbb200c..42dbb200c 100644
--- a/src/test/ui/specialization/specialization-feature-gate-default.stderr
+++ b/tests/ui/specialization/specialization-feature-gate-default.stderr
diff --git a/src/test/ui/specialization/specialization-feature-gate-overlap.rs b/tests/ui/specialization/specialization-feature-gate-overlap.rs
index b83c84ab8..b83c84ab8 100644
--- a/src/test/ui/specialization/specialization-feature-gate-overlap.rs
+++ b/tests/ui/specialization/specialization-feature-gate-overlap.rs
diff --git a/src/test/ui/specialization/specialization-feature-gate-overlap.stderr b/tests/ui/specialization/specialization-feature-gate-overlap.stderr
index 9157ad0d4..9157ad0d4 100644
--- a/src/test/ui/specialization/specialization-feature-gate-overlap.stderr
+++ b/tests/ui/specialization/specialization-feature-gate-overlap.stderr
diff --git a/src/test/ui/specialization/specialization-no-default.rs b/tests/ui/specialization/specialization-no-default.rs
index ae739b235..ae739b235 100644
--- a/src/test/ui/specialization/specialization-no-default.rs
+++ b/tests/ui/specialization/specialization-no-default.rs
diff --git a/src/test/ui/specialization/specialization-no-default.stderr b/tests/ui/specialization/specialization-no-default.stderr
index 842cec9c7..842cec9c7 100644
--- a/src/test/ui/specialization/specialization-no-default.stderr
+++ b/tests/ui/specialization/specialization-no-default.stderr
diff --git a/src/test/ui/specialization/specialization-on-projection.rs b/tests/ui/specialization/specialization-on-projection.rs
index be8dcc423..be8dcc423 100644
--- a/src/test/ui/specialization/specialization-on-projection.rs
+++ b/tests/ui/specialization/specialization-on-projection.rs
diff --git a/src/test/ui/specialization/specialization-on-projection.stderr b/tests/ui/specialization/specialization-on-projection.stderr
index 00fc7ffc5..00fc7ffc5 100644
--- a/src/test/ui/specialization/specialization-on-projection.stderr
+++ b/tests/ui/specialization/specialization-on-projection.stderr
diff --git a/src/test/ui/specialization/specialization-out-of-order.rs b/tests/ui/specialization/specialization-out-of-order.rs
index cb7563e27..cb7563e27 100644
--- a/src/test/ui/specialization/specialization-out-of-order.rs
+++ b/tests/ui/specialization/specialization-out-of-order.rs
diff --git a/src/test/ui/specialization/specialization-out-of-order.stderr b/tests/ui/specialization/specialization-out-of-order.stderr
index b524e00f0..b524e00f0 100644
--- a/src/test/ui/specialization/specialization-out-of-order.stderr
+++ b/tests/ui/specialization/specialization-out-of-order.stderr
diff --git a/src/test/ui/specialization/specialization-overlap-hygiene.rs b/tests/ui/specialization/specialization-overlap-hygiene.rs
index 93e7c8325..93e7c8325 100644
--- a/src/test/ui/specialization/specialization-overlap-hygiene.rs
+++ b/tests/ui/specialization/specialization-overlap-hygiene.rs
diff --git a/src/test/ui/specialization/specialization-overlap-hygiene.stderr b/tests/ui/specialization/specialization-overlap-hygiene.stderr
index 81efd46cc..81efd46cc 100644
--- a/src/test/ui/specialization/specialization-overlap-hygiene.stderr
+++ b/tests/ui/specialization/specialization-overlap-hygiene.stderr
diff --git a/src/test/ui/specialization/specialization-overlap-negative.rs b/tests/ui/specialization/specialization-overlap-negative.rs
index 550d37082..550d37082 100644
--- a/src/test/ui/specialization/specialization-overlap-negative.rs
+++ b/tests/ui/specialization/specialization-overlap-negative.rs
diff --git a/src/test/ui/specialization/specialization-overlap-negative.stderr b/tests/ui/specialization/specialization-overlap-negative.stderr
index 1fe4869ff..1fe4869ff 100644
--- a/src/test/ui/specialization/specialization-overlap-negative.stderr
+++ b/tests/ui/specialization/specialization-overlap-negative.stderr
diff --git a/src/test/ui/specialization/specialization-overlap-projection.rs b/tests/ui/specialization/specialization-overlap-projection.rs
index b07efb2a5..b07efb2a5 100644
--- a/src/test/ui/specialization/specialization-overlap-projection.rs
+++ b/tests/ui/specialization/specialization-overlap-projection.rs
diff --git a/src/test/ui/specialization/specialization-overlap-projection.stderr b/tests/ui/specialization/specialization-overlap-projection.stderr
index 708c0817f..708c0817f 100644
--- a/src/test/ui/specialization/specialization-overlap-projection.stderr
+++ b/tests/ui/specialization/specialization-overlap-projection.stderr
diff --git a/src/test/ui/specialization/specialization-overlap.rs b/tests/ui/specialization/specialization-overlap.rs
index 6bee22ceb..6bee22ceb 100644
--- a/src/test/ui/specialization/specialization-overlap.rs
+++ b/tests/ui/specialization/specialization-overlap.rs
diff --git a/src/test/ui/specialization/specialization-overlap.stderr b/tests/ui/specialization/specialization-overlap.stderr
index 098bf4a70..098bf4a70 100644
--- a/src/test/ui/specialization/specialization-overlap.stderr
+++ b/tests/ui/specialization/specialization-overlap.stderr
diff --git a/src/test/ui/specialization/specialization-polarity.rs b/tests/ui/specialization/specialization-polarity.rs
index b3cd8255b..b3cd8255b 100644
--- a/src/test/ui/specialization/specialization-polarity.rs
+++ b/tests/ui/specialization/specialization-polarity.rs
diff --git a/src/test/ui/specialization/specialization-polarity.stderr b/tests/ui/specialization/specialization-polarity.stderr
index f287018ba..f287018ba 100644
--- a/src/test/ui/specialization/specialization-polarity.stderr
+++ b/tests/ui/specialization/specialization-polarity.stderr
diff --git a/src/test/ui/specialization/specialization-projection-alias.rs b/tests/ui/specialization/specialization-projection-alias.rs
index f1f0b47bb..f1f0b47bb 100644
--- a/src/test/ui/specialization/specialization-projection-alias.rs
+++ b/tests/ui/specialization/specialization-projection-alias.rs
diff --git a/src/test/ui/specialization/specialization-projection-alias.stderr b/tests/ui/specialization/specialization-projection-alias.stderr
index c94d9ed07..c94d9ed07 100644
--- a/src/test/ui/specialization/specialization-projection-alias.stderr
+++ b/tests/ui/specialization/specialization-projection-alias.stderr
diff --git a/src/test/ui/specialization/specialization-projection.rs b/tests/ui/specialization/specialization-projection.rs
index 78afe7a94..78afe7a94 100644
--- a/src/test/ui/specialization/specialization-projection.rs
+++ b/tests/ui/specialization/specialization-projection.rs
diff --git a/src/test/ui/specialization/specialization-projection.stderr b/tests/ui/specialization/specialization-projection.stderr
index bfc4e0a0f..bfc4e0a0f 100644
--- a/src/test/ui/specialization/specialization-projection.stderr
+++ b/tests/ui/specialization/specialization-projection.stderr
diff --git a/src/test/ui/specialization/specialization-supertraits.rs b/tests/ui/specialization/specialization-supertraits.rs
index fb85d8019..fb85d8019 100644
--- a/src/test/ui/specialization/specialization-supertraits.rs
+++ b/tests/ui/specialization/specialization-supertraits.rs
diff --git a/src/test/ui/specialization/specialization-supertraits.stderr b/tests/ui/specialization/specialization-supertraits.stderr
index e716bc215..e716bc215 100644
--- a/src/test/ui/specialization/specialization-supertraits.stderr
+++ b/tests/ui/specialization/specialization-supertraits.stderr
diff --git a/src/test/ui/specialization/specialization-translate-projections-with-lifetimes.rs b/tests/ui/specialization/specialization-translate-projections-with-lifetimes.rs
index 904aeaa08..904aeaa08 100644
--- a/src/test/ui/specialization/specialization-translate-projections-with-lifetimes.rs
+++ b/tests/ui/specialization/specialization-translate-projections-with-lifetimes.rs
diff --git a/src/test/ui/specialization/specialization-translate-projections-with-lifetimes.stderr b/tests/ui/specialization/specialization-translate-projections-with-lifetimes.stderr
index c7aad3c0f..c7aad3c0f 100644
--- a/src/test/ui/specialization/specialization-translate-projections-with-lifetimes.stderr
+++ b/tests/ui/specialization/specialization-translate-projections-with-lifetimes.stderr
diff --git a/src/test/ui/specialization/specialization-translate-projections-with-params.rs b/tests/ui/specialization/specialization-translate-projections-with-params.rs
index 62d63590a..62d63590a 100644
--- a/src/test/ui/specialization/specialization-translate-projections-with-params.rs
+++ b/tests/ui/specialization/specialization-translate-projections-with-params.rs
diff --git a/src/test/ui/specialization/specialization-translate-projections-with-params.stderr b/tests/ui/specialization/specialization-translate-projections-with-params.stderr
index 1c4fd9325..1c4fd9325 100644
--- a/src/test/ui/specialization/specialization-translate-projections-with-params.stderr
+++ b/tests/ui/specialization/specialization-translate-projections-with-params.stderr
diff --git a/src/test/ui/specialization/specialization-translate-projections.rs b/tests/ui/specialization/specialization-translate-projections.rs
index 92ea9e2b8..92ea9e2b8 100644
--- a/src/test/ui/specialization/specialization-translate-projections.rs
+++ b/tests/ui/specialization/specialization-translate-projections.rs
diff --git a/src/test/ui/specialization/specialization-translate-projections.stderr b/tests/ui/specialization/specialization-translate-projections.stderr
index 22bbb12a0..22bbb12a0 100644
--- a/src/test/ui/specialization/specialization-translate-projections.stderr
+++ b/tests/ui/specialization/specialization-translate-projections.stderr
diff --git a/src/test/ui/specialization/transmute-specialization.rs b/tests/ui/specialization/transmute-specialization.rs
index 499334d98..499334d98 100644
--- a/src/test/ui/specialization/transmute-specialization.rs
+++ b/tests/ui/specialization/transmute-specialization.rs
diff --git a/src/test/ui/specialization/transmute-specialization.stderr b/tests/ui/specialization/transmute-specialization.stderr
index b1c26d7da..b1c26d7da 100644
--- a/src/test/ui/specialization/transmute-specialization.stderr
+++ b/tests/ui/specialization/transmute-specialization.stderr
diff --git a/src/test/ui/sse2.rs b/tests/ui/sse2.rs
index 172f40798..172f40798 100644
--- a/src/test/ui/sse2.rs
+++ b/tests/ui/sse2.rs
diff --git a/src/test/ui/stability-attribute/accidental-stable-in-unstable.rs b/tests/ui/stability-attribute/accidental-stable-in-unstable.rs
index f8bbe90cf..f8bbe90cf 100644
--- a/src/test/ui/stability-attribute/accidental-stable-in-unstable.rs
+++ b/tests/ui/stability-attribute/accidental-stable-in-unstable.rs
diff --git a/src/test/ui/stability-attribute/accidental-stable-in-unstable.stderr b/tests/ui/stability-attribute/accidental-stable-in-unstable.stderr
index ff733822c..ff733822c 100644
--- a/src/test/ui/stability-attribute/accidental-stable-in-unstable.stderr
+++ b/tests/ui/stability-attribute/accidental-stable-in-unstable.stderr
diff --git a/src/test/ui/stability-attribute/allow-unstable-reexport.rs b/tests/ui/stability-attribute/allow-unstable-reexport.rs
index 937913954..937913954 100644
--- a/src/test/ui/stability-attribute/allow-unstable-reexport.rs
+++ b/tests/ui/stability-attribute/allow-unstable-reexport.rs
diff --git a/src/test/ui/stability-attribute/allow-unstable-reexport.stderr b/tests/ui/stability-attribute/allow-unstable-reexport.stderr
index a11da9dc8..a11da9dc8 100644
--- a/src/test/ui/stability-attribute/allow-unstable-reexport.stderr
+++ b/tests/ui/stability-attribute/allow-unstable-reexport.stderr
diff --git a/src/test/ui/stability-attribute/allowed-through-unstable.rs b/tests/ui/stability-attribute/allowed-through-unstable.rs
index ff0228e4d..ff0228e4d 100644
--- a/src/test/ui/stability-attribute/allowed-through-unstable.rs
+++ b/tests/ui/stability-attribute/allowed-through-unstable.rs
diff --git a/src/test/ui/stability-attribute/allowed-through-unstable.stderr b/tests/ui/stability-attribute/allowed-through-unstable.stderr
index 132c00b89..132c00b89 100644
--- a/src/test/ui/stability-attribute/allowed-through-unstable.stderr
+++ b/tests/ui/stability-attribute/allowed-through-unstable.stderr
diff --git a/src/test/ui/stability-attribute/auxiliary/allowed-through-unstable-core.rs b/tests/ui/stability-attribute/auxiliary/allowed-through-unstable-core.rs
index b597009a3..b597009a3 100644
--- a/src/test/ui/stability-attribute/auxiliary/allowed-through-unstable-core.rs
+++ b/tests/ui/stability-attribute/auxiliary/allowed-through-unstable-core.rs
diff --git a/src/test/ui/stability-attribute/auxiliary/ctor-stability.rs b/tests/ui/stability-attribute/auxiliary/ctor-stability.rs
index 74c6023d7..74c6023d7 100644
--- a/src/test/ui/stability-attribute/auxiliary/ctor-stability.rs
+++ b/tests/ui/stability-attribute/auxiliary/ctor-stability.rs
diff --git a/src/test/ui/stability-attribute/auxiliary/default_body.rs b/tests/ui/stability-attribute/auxiliary/default_body.rs
index 3a177419d..3a177419d 100644
--- a/src/test/ui/stability-attribute/auxiliary/default_body.rs
+++ b/tests/ui/stability-attribute/auxiliary/default_body.rs
diff --git a/src/test/ui/stability-attribute/auxiliary/lint-stability-reexport.rs b/tests/ui/stability-attribute/auxiliary/lint-stability-reexport.rs
index 9884731d5..9884731d5 100644
--- a/src/test/ui/stability-attribute/auxiliary/lint-stability-reexport.rs
+++ b/tests/ui/stability-attribute/auxiliary/lint-stability-reexport.rs
diff --git a/src/test/ui/stability-attribute/auxiliary/lint-stability.rs b/tests/ui/stability-attribute/auxiliary/lint-stability.rs
index 99c29dcdd..99c29dcdd 100644
--- a/src/test/ui/stability-attribute/auxiliary/lint-stability.rs
+++ b/tests/ui/stability-attribute/auxiliary/lint-stability.rs
diff --git a/src/test/ui/stability-attribute/auxiliary/stability-attribute-implies.rs b/tests/ui/stability-attribute/auxiliary/stability-attribute-implies.rs
index 468be1bc1..468be1bc1 100644
--- a/src/test/ui/stability-attribute/auxiliary/stability-attribute-implies.rs
+++ b/tests/ui/stability-attribute/auxiliary/stability-attribute-implies.rs
diff --git a/src/test/ui/stability-attribute/auxiliary/stability_attribute_issue.rs b/tests/ui/stability-attribute/auxiliary/stability_attribute_issue.rs
index 4e5333289..4e5333289 100644
--- a/src/test/ui/stability-attribute/auxiliary/stability_attribute_issue.rs
+++ b/tests/ui/stability-attribute/auxiliary/stability_attribute_issue.rs
diff --git a/src/test/ui/stability-attribute/auxiliary/stable-in-unstable-core.rs b/tests/ui/stability-attribute/auxiliary/stable-in-unstable-core.rs
index e45b00f99..e45b00f99 100644
--- a/src/test/ui/stability-attribute/auxiliary/stable-in-unstable-core.rs
+++ b/tests/ui/stability-attribute/auxiliary/stable-in-unstable-core.rs
diff --git a/src/test/ui/stability-attribute/auxiliary/stable-in-unstable-std.rs b/tests/ui/stability-attribute/auxiliary/stable-in-unstable-std.rs
index 28ad8c28d..28ad8c28d 100644
--- a/src/test/ui/stability-attribute/auxiliary/stable-in-unstable-std.rs
+++ b/tests/ui/stability-attribute/auxiliary/stable-in-unstable-std.rs
diff --git a/src/test/ui/stability-attribute/auxiliary/unstable_generic_param.rs b/tests/ui/stability-attribute/auxiliary/unstable_generic_param.rs
index 1d6a6bd4e..1d6a6bd4e 100644
--- a/src/test/ui/stability-attribute/auxiliary/unstable_generic_param.rs
+++ b/tests/ui/stability-attribute/auxiliary/unstable_generic_param.rs
diff --git a/src/test/ui/stability-attribute/ctor-stability.rs b/tests/ui/stability-attribute/ctor-stability.rs
index fcab0cb10..fcab0cb10 100644
--- a/src/test/ui/stability-attribute/ctor-stability.rs
+++ b/tests/ui/stability-attribute/ctor-stability.rs
diff --git a/src/test/ui/stability-attribute/default-body-stability-err.rs b/tests/ui/stability-attribute/default-body-stability-err.rs
index ecb281bcc..ecb281bcc 100644
--- a/src/test/ui/stability-attribute/default-body-stability-err.rs
+++ b/tests/ui/stability-attribute/default-body-stability-err.rs
diff --git a/src/test/ui/stability-attribute/default-body-stability-err.stderr b/tests/ui/stability-attribute/default-body-stability-err.stderr
index ef666f30f..ef666f30f 100644
--- a/src/test/ui/stability-attribute/default-body-stability-err.stderr
+++ b/tests/ui/stability-attribute/default-body-stability-err.stderr
diff --git a/src/test/ui/stability-attribute/default-body-stability-ok-enables.rs b/tests/ui/stability-attribute/default-body-stability-ok-enables.rs
index bdc7522f4..bdc7522f4 100644
--- a/src/test/ui/stability-attribute/default-body-stability-ok-enables.rs
+++ b/tests/ui/stability-attribute/default-body-stability-ok-enables.rs
diff --git a/src/test/ui/stability-attribute/default-body-stability-ok-impls.rs b/tests/ui/stability-attribute/default-body-stability-ok-impls.rs
index e1f5c0170..e1f5c0170 100644
--- a/src/test/ui/stability-attribute/default-body-stability-ok-impls.rs
+++ b/tests/ui/stability-attribute/default-body-stability-ok-impls.rs
diff --git a/src/test/ui/stability-attribute/generics-default-stability-trait.rs b/tests/ui/stability-attribute/generics-default-stability-trait.rs
index d436088e4..d436088e4 100644
--- a/src/test/ui/stability-attribute/generics-default-stability-trait.rs
+++ b/tests/ui/stability-attribute/generics-default-stability-trait.rs
diff --git a/src/test/ui/stability-attribute/generics-default-stability-trait.stderr b/tests/ui/stability-attribute/generics-default-stability-trait.stderr
index 03e61b78e..03e61b78e 100644
--- a/src/test/ui/stability-attribute/generics-default-stability-trait.stderr
+++ b/tests/ui/stability-attribute/generics-default-stability-trait.stderr
diff --git a/src/test/ui/stability-attribute/generics-default-stability-where.rs b/tests/ui/stability-attribute/generics-default-stability-where.rs
index 4afbca262..4afbca262 100644
--- a/src/test/ui/stability-attribute/generics-default-stability-where.rs
+++ b/tests/ui/stability-attribute/generics-default-stability-where.rs
diff --git a/src/test/ui/stability-attribute/generics-default-stability-where.stderr b/tests/ui/stability-attribute/generics-default-stability-where.stderr
index 61253adc8..61253adc8 100644
--- a/src/test/ui/stability-attribute/generics-default-stability-where.stderr
+++ b/tests/ui/stability-attribute/generics-default-stability-where.stderr
diff --git a/src/test/ui/stability-attribute/generics-default-stability.rs b/tests/ui/stability-attribute/generics-default-stability.rs
index 300cc34d6..300cc34d6 100644
--- a/src/test/ui/stability-attribute/generics-default-stability.rs
+++ b/tests/ui/stability-attribute/generics-default-stability.rs
diff --git a/src/test/ui/stability-attribute/generics-default-stability.stderr b/tests/ui/stability-attribute/generics-default-stability.stderr
index e094a10c8..e094a10c8 100644
--- a/src/test/ui/stability-attribute/generics-default-stability.stderr
+++ b/tests/ui/stability-attribute/generics-default-stability.stderr
diff --git a/tests/ui/stability-attribute/issue-106589.rs b/tests/ui/stability-attribute/issue-106589.rs
new file mode 100644
index 000000000..3cad9a3d2
--- /dev/null
+++ b/tests/ui/stability-attribute/issue-106589.rs
@@ -0,0 +1,10 @@
+// #![feature(staged_api)] // note: `staged_api` not enabled
+
+#![stable(feature = "foo", since = "1.0.0")]
+//~^ ERROR stability attributes may not be used outside of the standard library
+
+#[unstable(feature = "foo", issue = "none")]
+//~^ ERROR stability attributes may not be used outside of the standard library
+fn foo_unstable() {}
+
+fn main() {}
diff --git a/tests/ui/stability-attribute/issue-106589.stderr b/tests/ui/stability-attribute/issue-106589.stderr
new file mode 100644
index 000000000..ccf3f7164
--- /dev/null
+++ b/tests/ui/stability-attribute/issue-106589.stderr
@@ -0,0 +1,15 @@
+error[E0734]: stability attributes may not be used outside of the standard library
+  --> $DIR/issue-106589.rs:6:1
+   |
+LL | #[unstable(feature = "foo", issue = "none")]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0734]: stability attributes may not be used outside of the standard library
+  --> $DIR/issue-106589.rs:3:1
+   |
+LL | #![stable(feature = "foo", since = "1.0.0")]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0734`.
diff --git a/src/test/ui/stability-attribute/issue-28075.rs b/tests/ui/stability-attribute/issue-28075.rs
index 6b4ea46f3..6b4ea46f3 100644
--- a/src/test/ui/stability-attribute/issue-28075.rs
+++ b/tests/ui/stability-attribute/issue-28075.rs
diff --git a/src/test/ui/stability-attribute/issue-28075.stderr b/tests/ui/stability-attribute/issue-28075.stderr
index 7e53bb544..7e53bb544 100644
--- a/src/test/ui/stability-attribute/issue-28075.stderr
+++ b/tests/ui/stability-attribute/issue-28075.stderr
diff --git a/src/test/ui/stability-attribute/issue-28388-3.rs b/tests/ui/stability-attribute/issue-28388-3.rs
index 7ba993501..7ba993501 100644
--- a/src/test/ui/stability-attribute/issue-28388-3.rs
+++ b/tests/ui/stability-attribute/issue-28388-3.rs
diff --git a/src/test/ui/stability-attribute/issue-28388-3.stderr b/tests/ui/stability-attribute/issue-28388-3.stderr
index d2e46683b..d2e46683b 100644
--- a/src/test/ui/stability-attribute/issue-28388-3.stderr
+++ b/tests/ui/stability-attribute/issue-28388-3.stderr
diff --git a/src/test/ui/stability-attribute/issue-99286-stable-intrinsics.rs b/tests/ui/stability-attribute/issue-99286-stable-intrinsics.rs
index b9eee9922..b9eee9922 100644
--- a/src/test/ui/stability-attribute/issue-99286-stable-intrinsics.rs
+++ b/tests/ui/stability-attribute/issue-99286-stable-intrinsics.rs
diff --git a/src/test/ui/stability-attribute/missing-const-stability.rs b/tests/ui/stability-attribute/missing-const-stability.rs
index 6eff899bf..6eff899bf 100644
--- a/src/test/ui/stability-attribute/missing-const-stability.rs
+++ b/tests/ui/stability-attribute/missing-const-stability.rs
diff --git a/src/test/ui/stability-attribute/missing-const-stability.stderr b/tests/ui/stability-attribute/missing-const-stability.stderr
index 4cfbe1528..4cfbe1528 100644
--- a/src/test/ui/stability-attribute/missing-const-stability.stderr
+++ b/tests/ui/stability-attribute/missing-const-stability.stderr
diff --git a/src/test/ui/stability-attribute/missing-stability-attr-at-top-level.rs b/tests/ui/stability-attribute/missing-stability-attr-at-top-level.rs
index 38faa2469..38faa2469 100644
--- a/src/test/ui/stability-attribute/missing-stability-attr-at-top-level.rs
+++ b/tests/ui/stability-attribute/missing-stability-attr-at-top-level.rs
diff --git a/src/test/ui/stability-attribute/missing-stability-attr-at-top-level.stderr b/tests/ui/stability-attribute/missing-stability-attr-at-top-level.stderr
index c7ade234d..c7ade234d 100644
--- a/src/test/ui/stability-attribute/missing-stability-attr-at-top-level.stderr
+++ b/tests/ui/stability-attribute/missing-stability-attr-at-top-level.stderr
diff --git a/src/test/ui/stability-attribute/stability-attribute-implies-missing.rs b/tests/ui/stability-attribute/stability-attribute-implies-missing.rs
index 613878536..613878536 100644
--- a/src/test/ui/stability-attribute/stability-attribute-implies-missing.rs
+++ b/tests/ui/stability-attribute/stability-attribute-implies-missing.rs
diff --git a/src/test/ui/stability-attribute/stability-attribute-implies-missing.stderr b/tests/ui/stability-attribute/stability-attribute-implies-missing.stderr
index ff1856f17..ff1856f17 100644
--- a/src/test/ui/stability-attribute/stability-attribute-implies-missing.stderr
+++ b/tests/ui/stability-attribute/stability-attribute-implies-missing.stderr
diff --git a/src/test/ui/stability-attribute/stability-attribute-implies-no-feature.rs b/tests/ui/stability-attribute/stability-attribute-implies-no-feature.rs
index 947f9f73e..947f9f73e 100644
--- a/src/test/ui/stability-attribute/stability-attribute-implies-no-feature.rs
+++ b/tests/ui/stability-attribute/stability-attribute-implies-no-feature.rs
diff --git a/src/test/ui/stability-attribute/stability-attribute-implies-no-feature.stderr b/tests/ui/stability-attribute/stability-attribute-implies-no-feature.stderr
index c2331f676..c2331f676 100644
--- a/src/test/ui/stability-attribute/stability-attribute-implies-no-feature.stderr
+++ b/tests/ui/stability-attribute/stability-attribute-implies-no-feature.stderr
diff --git a/src/test/ui/stability-attribute/stability-attribute-implies-using-stable.rs b/tests/ui/stability-attribute/stability-attribute-implies-using-stable.rs
index 1a2d8e271..1a2d8e271 100644
--- a/src/test/ui/stability-attribute/stability-attribute-implies-using-stable.rs
+++ b/tests/ui/stability-attribute/stability-attribute-implies-using-stable.rs
diff --git a/src/test/ui/stability-attribute/stability-attribute-implies-using-stable.stderr b/tests/ui/stability-attribute/stability-attribute-implies-using-stable.stderr
index c9b3f07cc..c9b3f07cc 100644
--- a/src/test/ui/stability-attribute/stability-attribute-implies-using-stable.stderr
+++ b/tests/ui/stability-attribute/stability-attribute-implies-using-stable.stderr
diff --git a/src/test/ui/stability-attribute/stability-attribute-implies-using-unstable.rs b/tests/ui/stability-attribute/stability-attribute-implies-using-unstable.rs
index 3c73c5abf..3c73c5abf 100644
--- a/src/test/ui/stability-attribute/stability-attribute-implies-using-unstable.rs
+++ b/tests/ui/stability-attribute/stability-attribute-implies-using-unstable.rs
diff --git a/src/test/ui/stability-attribute/stability-attribute-implies-using-unstable.stderr b/tests/ui/stability-attribute/stability-attribute-implies-using-unstable.stderr
index 9a5c7ef5a..9a5c7ef5a 100644
--- a/src/test/ui/stability-attribute/stability-attribute-implies-using-unstable.stderr
+++ b/tests/ui/stability-attribute/stability-attribute-implies-using-unstable.stderr
diff --git a/src/test/ui/stability-attribute/stability-attribute-issue-43027.rs b/tests/ui/stability-attribute/stability-attribute-issue-43027.rs
index 3f4fdfd01..3f4fdfd01 100644
--- a/src/test/ui/stability-attribute/stability-attribute-issue-43027.rs
+++ b/tests/ui/stability-attribute/stability-attribute-issue-43027.rs
diff --git a/src/test/ui/stability-attribute/stability-attribute-issue.rs b/tests/ui/stability-attribute/stability-attribute-issue.rs
index cda1aff13..cda1aff13 100644
--- a/src/test/ui/stability-attribute/stability-attribute-issue.rs
+++ b/tests/ui/stability-attribute/stability-attribute-issue.rs
diff --git a/src/test/ui/stability-attribute/stability-attribute-issue.stderr b/tests/ui/stability-attribute/stability-attribute-issue.stderr
index df4aec7e5..df4aec7e5 100644
--- a/src/test/ui/stability-attribute/stability-attribute-issue.stderr
+++ b/tests/ui/stability-attribute/stability-attribute-issue.stderr
diff --git a/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.rs b/tests/ui/stability-attribute/stability-attribute-non-staged-force-unstable.rs
index f61acc8aa..f61acc8aa 100644
--- a/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.rs
+++ b/tests/ui/stability-attribute/stability-attribute-non-staged-force-unstable.rs
diff --git a/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.stderr b/tests/ui/stability-attribute/stability-attribute-non-staged-force-unstable.stderr
index 45d965ea0..45d965ea0 100644
--- a/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.stderr
+++ b/tests/ui/stability-attribute/stability-attribute-non-staged-force-unstable.stderr
diff --git a/src/test/ui/stability-attribute/stability-attribute-non-staged.rs b/tests/ui/stability-attribute/stability-attribute-non-staged.rs
index 4015f2f97..4015f2f97 100644
--- a/src/test/ui/stability-attribute/stability-attribute-non-staged.rs
+++ b/tests/ui/stability-attribute/stability-attribute-non-staged.rs
diff --git a/src/test/ui/stability-attribute/stability-attribute-non-staged.stderr b/tests/ui/stability-attribute/stability-attribute-non-staged.stderr
index 391f3c274..391f3c274 100644
--- a/src/test/ui/stability-attribute/stability-attribute-non-staged.stderr
+++ b/tests/ui/stability-attribute/stability-attribute-non-staged.stderr
diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity-2.rs b/tests/ui/stability-attribute/stability-attribute-sanity-2.rs
index de3ea4eac..de3ea4eac 100644
--- a/src/test/ui/stability-attribute/stability-attribute-sanity-2.rs
+++ b/tests/ui/stability-attribute/stability-attribute-sanity-2.rs
diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr b/tests/ui/stability-attribute/stability-attribute-sanity-2.stderr
index 8dbcc6c97..8dbcc6c97 100644
--- a/src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr
+++ b/tests/ui/stability-attribute/stability-attribute-sanity-2.stderr
diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity-3.rs b/tests/ui/stability-attribute/stability-attribute-sanity-3.rs
index 13ef3d3f5..13ef3d3f5 100644
--- a/src/test/ui/stability-attribute/stability-attribute-sanity-3.rs
+++ b/tests/ui/stability-attribute/stability-attribute-sanity-3.rs
diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity-3.stderr b/tests/ui/stability-attribute/stability-attribute-sanity-3.stderr
index b1c56ef22..b1c56ef22 100644
--- a/src/test/ui/stability-attribute/stability-attribute-sanity-3.stderr
+++ b/tests/ui/stability-attribute/stability-attribute-sanity-3.stderr
diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity-4.rs b/tests/ui/stability-attribute/stability-attribute-sanity-4.rs
index 64f996352..64f996352 100644
--- a/src/test/ui/stability-attribute/stability-attribute-sanity-4.rs
+++ b/tests/ui/stability-attribute/stability-attribute-sanity-4.rs
diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity-4.stderr b/tests/ui/stability-attribute/stability-attribute-sanity-4.stderr
index a76f5be1e..a76f5be1e 100644
--- a/src/test/ui/stability-attribute/stability-attribute-sanity-4.stderr
+++ b/tests/ui/stability-attribute/stability-attribute-sanity-4.stderr
diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity.rs b/tests/ui/stability-attribute/stability-attribute-sanity.rs
index cc30e6ab9..cc30e6ab9 100644
--- a/src/test/ui/stability-attribute/stability-attribute-sanity.rs
+++ b/tests/ui/stability-attribute/stability-attribute-sanity.rs
diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity.stderr b/tests/ui/stability-attribute/stability-attribute-sanity.stderr
index 079230b2a..89a8425f5 100644
--- a/src/test/ui/stability-attribute/stability-attribute-sanity.stderr
+++ b/tests/ui/stability-attribute/stability-attribute-sanity.stderr
@@ -132,5 +132,5 @@ LL | #[stable(feature = "a", since = "1.0.0")]
 
 error: aborting due to 20 previous errors
 
-Some errors have detailed explanations: E0539, E0541, E0542, E0543, E0544, E0546, E0547, E0549.
+Some errors have detailed explanations: E0539, E0541, E0542, E0543, E0544, E0546, E0547, E0549, E0711.
 For more information about an error, try `rustc --explain E0539`.
diff --git a/src/test/ui/stability-attribute/stability-attribute-trait-impl.rs b/tests/ui/stability-attribute/stability-attribute-trait-impl.rs
index 0c771ae87..0c771ae87 100644
--- a/src/test/ui/stability-attribute/stability-attribute-trait-impl.rs
+++ b/tests/ui/stability-attribute/stability-attribute-trait-impl.rs
diff --git a/src/test/ui/stability-attribute/stability-attribute-trait-impl.stderr b/tests/ui/stability-attribute/stability-attribute-trait-impl.stderr
index b91a1d2e1..b91a1d2e1 100644
--- a/src/test/ui/stability-attribute/stability-attribute-trait-impl.stderr
+++ b/tests/ui/stability-attribute/stability-attribute-trait-impl.stderr
diff --git a/src/test/ui/stability-attribute/stability-in-private-module.rs b/tests/ui/stability-attribute/stability-in-private-module.rs
index f12e9198b..f12e9198b 100644
--- a/src/test/ui/stability-attribute/stability-in-private-module.rs
+++ b/tests/ui/stability-attribute/stability-in-private-module.rs
diff --git a/src/test/ui/stability-attribute/stability-in-private-module.stderr b/tests/ui/stability-attribute/stability-in-private-module.stderr
index e64f2acbd..2f02a2496 100644
--- a/src/test/ui/stability-attribute/stability-in-private-module.stderr
+++ b/tests/ui/stability-attribute/stability-in-private-module.stderr
@@ -6,9 +6,6 @@ LL |     let _ = std::thread::thread_info::current_thread();
    |
 note: the module `thread_info` is defined here
   --> $SRC_DIR/std/src/thread/mod.rs:LL:COL
-   |
-LL | use crate::sys_common::thread_info;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/stability-attribute/stable-in-unstable.rs b/tests/ui/stability-attribute/stable-in-unstable.rs
index 226367c39..226367c39 100644
--- a/src/test/ui/stability-attribute/stable-in-unstable.rs
+++ b/tests/ui/stability-attribute/stable-in-unstable.rs
diff --git a/src/test/ui/stability-attribute/stable-in-unstable.stderr b/tests/ui/stability-attribute/stable-in-unstable.stderr
index b5e3e5f12..b5e3e5f12 100644
--- a/src/test/ui/stability-attribute/stable-in-unstable.stderr
+++ b/tests/ui/stability-attribute/stable-in-unstable.stderr
diff --git a/src/test/ui/stability-attribute/suggest-vec-allocator-api.rs b/tests/ui/stability-attribute/suggest-vec-allocator-api.rs
index fac52ab77..fac52ab77 100644
--- a/src/test/ui/stability-attribute/suggest-vec-allocator-api.rs
+++ b/tests/ui/stability-attribute/suggest-vec-allocator-api.rs
diff --git a/src/test/ui/stability-attribute/suggest-vec-allocator-api.stderr b/tests/ui/stability-attribute/suggest-vec-allocator-api.stderr
index 41e5787b8..41e5787b8 100644
--- a/src/test/ui/stability-attribute/suggest-vec-allocator-api.stderr
+++ b/tests/ui/stability-attribute/suggest-vec-allocator-api.stderr
diff --git a/src/test/ui/stable-addr-of.rs b/tests/ui/stable-addr-of.rs
index 99839166e..99839166e 100644
--- a/src/test/ui/stable-addr-of.rs
+++ b/tests/ui/stable-addr-of.rs
diff --git a/src/test/ui/stack-protector/warn-stack-protector-unsupported.all.stderr b/tests/ui/stack-protector/warn-stack-protector-unsupported.all.stderr
index 548877155..548877155 100644
--- a/src/test/ui/stack-protector/warn-stack-protector-unsupported.all.stderr
+++ b/tests/ui/stack-protector/warn-stack-protector-unsupported.all.stderr
diff --git a/src/test/ui/stack-protector/warn-stack-protector-unsupported.basic.stderr b/tests/ui/stack-protector/warn-stack-protector-unsupported.basic.stderr
index f7a1ee39f..f7a1ee39f 100644
--- a/src/test/ui/stack-protector/warn-stack-protector-unsupported.basic.stderr
+++ b/tests/ui/stack-protector/warn-stack-protector-unsupported.basic.stderr
diff --git a/src/test/ui/stack-protector/warn-stack-protector-unsupported.rs b/tests/ui/stack-protector/warn-stack-protector-unsupported.rs
index 6df5d3cd5..6df5d3cd5 100644
--- a/src/test/ui/stack-protector/warn-stack-protector-unsupported.rs
+++ b/tests/ui/stack-protector/warn-stack-protector-unsupported.rs
diff --git a/src/test/ui/stack-protector/warn-stack-protector-unsupported.strong.stderr b/tests/ui/stack-protector/warn-stack-protector-unsupported.strong.stderr
index ccc2f9f2c..ccc2f9f2c 100644
--- a/src/test/ui/stack-protector/warn-stack-protector-unsupported.strong.stderr
+++ b/tests/ui/stack-protector/warn-stack-protector-unsupported.strong.stderr
diff --git a/src/test/ui/static/auxiliary/extern-statics.rs b/tests/ui/static/auxiliary/extern-statics.rs
index c090bc79f..c090bc79f 100644
--- a/src/test/ui/static/auxiliary/extern-statics.rs
+++ b/tests/ui/static/auxiliary/extern-statics.rs
diff --git a/src/test/ui/static/auxiliary/issue_24843.rs b/tests/ui/static/auxiliary/issue_24843.rs
index 6ca04f860..6ca04f860 100644
--- a/src/test/ui/static/auxiliary/issue_24843.rs
+++ b/tests/ui/static/auxiliary/issue_24843.rs
diff --git a/src/test/ui/static/auxiliary/nested_item.rs b/tests/ui/static/auxiliary/nested_item.rs
index 9db9d19d6..9db9d19d6 100644
--- a/src/test/ui/static/auxiliary/nested_item.rs
+++ b/tests/ui/static/auxiliary/nested_item.rs
diff --git a/src/test/ui/static/auxiliary/static-priv-by-default.rs b/tests/ui/static/auxiliary/static-priv-by-default.rs
index 41f368f46..41f368f46 100644
--- a/src/test/ui/static/auxiliary/static-priv-by-default.rs
+++ b/tests/ui/static/auxiliary/static-priv-by-default.rs
diff --git a/src/test/ui/static/auxiliary/static_priv_by_default.rs b/tests/ui/static/auxiliary/static_priv_by_default.rs
index 39f912066..39f912066 100644
--- a/src/test/ui/static/auxiliary/static_priv_by_default.rs
+++ b/tests/ui/static/auxiliary/static_priv_by_default.rs
diff --git a/src/test/ui/static/bad-const-type.rs b/tests/ui/static/bad-const-type.rs
index 934ee353d..934ee353d 100644
--- a/src/test/ui/static/bad-const-type.rs
+++ b/tests/ui/static/bad-const-type.rs
diff --git a/src/test/ui/static/bad-const-type.stderr b/tests/ui/static/bad-const-type.stderr
index dcc1ee07c..dcc1ee07c 100644
--- a/src/test/ui/static/bad-const-type.stderr
+++ b/tests/ui/static/bad-const-type.stderr
diff --git a/src/test/ui/issues/issue-18118-2.rs b/tests/ui/static/issue-18118-2.rs
index f712a2eed..f712a2eed 100644
--- a/src/test/ui/issues/issue-18118-2.rs
+++ b/tests/ui/static/issue-18118-2.rs
diff --git a/src/test/ui/issues/issue-18118-2.stderr b/tests/ui/static/issue-18118-2.stderr
index 4fc3ca78f..4fc3ca78f 100644
--- a/src/test/ui/issues/issue-18118-2.stderr
+++ b/tests/ui/static/issue-18118-2.stderr
diff --git a/src/test/ui/issues/issue-18118.rs b/tests/ui/static/issue-18118.rs
index f58a3de28..f58a3de28 100644
--- a/src/test/ui/issues/issue-18118.rs
+++ b/tests/ui/static/issue-18118.rs
diff --git a/src/test/ui/issues/issue-18118.stderr b/tests/ui/static/issue-18118.stderr
index 49798a148..49798a148 100644
--- a/src/test/ui/issues/issue-18118.stderr
+++ b/tests/ui/static/issue-18118.stderr
diff --git a/src/test/ui/static/issue-24843.rs b/tests/ui/static/issue-24843.rs
index 0b3397e21..0b3397e21 100644
--- a/src/test/ui/static/issue-24843.rs
+++ b/tests/ui/static/issue-24843.rs
diff --git a/src/test/ui/static/issue-34194.rs b/tests/ui/static/issue-34194.rs
index 6dce556e9..6dce556e9 100644
--- a/src/test/ui/static/issue-34194.rs
+++ b/tests/ui/static/issue-34194.rs
diff --git a/src/test/ui/static/issue-5216.rs b/tests/ui/static/issue-5216.rs
index 4072a57cb..4072a57cb 100644
--- a/src/test/ui/static/issue-5216.rs
+++ b/tests/ui/static/issue-5216.rs
diff --git a/src/test/ui/static/issue-5216.stderr b/tests/ui/static/issue-5216.stderr
index 1afff28f0..1afff28f0 100644
--- a/src/test/ui/static/issue-5216.stderr
+++ b/tests/ui/static/issue-5216.stderr
diff --git a/src/test/ui/static/nested_item_main.rs b/tests/ui/static/nested_item_main.rs
index 2fe00aede..2fe00aede 100644
--- a/src/test/ui/static/nested_item_main.rs
+++ b/tests/ui/static/nested_item_main.rs
diff --git a/src/test/ui/static/refer-to-other-statics-by-value.rs b/tests/ui/static/refer-to-other-statics-by-value.rs
index 90f1980f8..90f1980f8 100644
--- a/src/test/ui/static/refer-to-other-statics-by-value.rs
+++ b/tests/ui/static/refer-to-other-statics-by-value.rs
diff --git a/src/test/ui/static/safe-extern-statics-mut.mir.stderr b/tests/ui/static/safe-extern-statics-mut.mir.stderr
index cec5f9d9c..cec5f9d9c 100644
--- a/src/test/ui/static/safe-extern-statics-mut.mir.stderr
+++ b/tests/ui/static/safe-extern-statics-mut.mir.stderr
diff --git a/src/test/ui/static/safe-extern-statics-mut.rs b/tests/ui/static/safe-extern-statics-mut.rs
index 389a4589a..389a4589a 100644
--- a/src/test/ui/static/safe-extern-statics-mut.rs
+++ b/tests/ui/static/safe-extern-statics-mut.rs
diff --git a/src/test/ui/static/safe-extern-statics-mut.thir.stderr b/tests/ui/static/safe-extern-statics-mut.thir.stderr
index 8e6d2805a..8e6d2805a 100644
--- a/src/test/ui/static/safe-extern-statics-mut.thir.stderr
+++ b/tests/ui/static/safe-extern-statics-mut.thir.stderr
diff --git a/src/test/ui/static/safe-extern-statics.mir.stderr b/tests/ui/static/safe-extern-statics.mir.stderr
index 102abd081..102abd081 100644
--- a/src/test/ui/static/safe-extern-statics.mir.stderr
+++ b/tests/ui/static/safe-extern-statics.mir.stderr
diff --git a/src/test/ui/static/safe-extern-statics.rs b/tests/ui/static/safe-extern-statics.rs
index 0aa90c442..0aa90c442 100644
--- a/src/test/ui/static/safe-extern-statics.rs
+++ b/tests/ui/static/safe-extern-statics.rs
diff --git a/src/test/ui/static/safe-extern-statics.thir.stderr b/tests/ui/static/safe-extern-statics.thir.stderr
index 7fd2182c4..7fd2182c4 100644
--- a/src/test/ui/static/safe-extern-statics.thir.stderr
+++ b/tests/ui/static/safe-extern-statics.thir.stderr
diff --git a/src/test/ui/static/static-closures.rs b/tests/ui/static/static-closures.rs
index 1bd518d6f..1bd518d6f 100644
--- a/src/test/ui/static/static-closures.rs
+++ b/tests/ui/static/static-closures.rs
diff --git a/src/test/ui/static/static-closures.stderr b/tests/ui/static/static-closures.stderr
index 99235e26e..99235e26e 100644
--- a/src/test/ui/static/static-closures.stderr
+++ b/tests/ui/static/static-closures.stderr
diff --git a/src/test/ui/static/static-drop-scope.rs b/tests/ui/static/static-drop-scope.rs
index 34afa9873..34afa9873 100644
--- a/src/test/ui/static/static-drop-scope.rs
+++ b/tests/ui/static/static-drop-scope.rs
diff --git a/src/test/ui/static/static-drop-scope.stderr b/tests/ui/static/static-drop-scope.stderr
index cedcb7367..cedcb7367 100644
--- a/src/test/ui/static/static-drop-scope.stderr
+++ b/tests/ui/static/static-drop-scope.stderr
diff --git a/src/test/ui/static/static-extern-type.rs b/tests/ui/static/static-extern-type.rs
index 4fa48fa13..4fa48fa13 100644
--- a/src/test/ui/static/static-extern-type.rs
+++ b/tests/ui/static/static-extern-type.rs
diff --git a/src/test/ui/static/static-items-cant-move.rs b/tests/ui/static/static-items-cant-move.rs
index 3e7aaa0b0..3e7aaa0b0 100644
--- a/src/test/ui/static/static-items-cant-move.rs
+++ b/tests/ui/static/static-items-cant-move.rs
diff --git a/src/test/ui/static/static-items-cant-move.stderr b/tests/ui/static/static-items-cant-move.stderr
index 235e9ee9b..235e9ee9b 100644
--- a/src/test/ui/static/static-items-cant-move.stderr
+++ b/tests/ui/static/static-items-cant-move.stderr
diff --git a/src/test/ui/static/static-lifetime-bound.rs b/tests/ui/static/static-lifetime-bound.rs
index b5da91ec3..b5da91ec3 100644
--- a/src/test/ui/static/static-lifetime-bound.rs
+++ b/tests/ui/static/static-lifetime-bound.rs
diff --git a/src/test/ui/static/static-lifetime-bound.stderr b/tests/ui/static/static-lifetime-bound.stderr
index ef07a8931..ef07a8931 100644
--- a/src/test/ui/static/static-lifetime-bound.stderr
+++ b/tests/ui/static/static-lifetime-bound.stderr
diff --git a/src/test/ui/static/static-lifetime.rs b/tests/ui/static/static-lifetime.rs
index ce1eeb610..ce1eeb610 100644
--- a/src/test/ui/static/static-lifetime.rs
+++ b/tests/ui/static/static-lifetime.rs
diff --git a/src/test/ui/static/static-lifetime.stderr b/tests/ui/static/static-lifetime.stderr
index 4af3370c7..4af3370c7 100644
--- a/src/test/ui/static/static-lifetime.stderr
+++ b/tests/ui/static/static-lifetime.stderr
diff --git a/src/test/ui/static/static-method-privacy.rs b/tests/ui/static/static-method-privacy.rs
index 9ee59b320..9ee59b320 100644
--- a/src/test/ui/static/static-method-privacy.rs
+++ b/tests/ui/static/static-method-privacy.rs
diff --git a/src/test/ui/static/static-method-privacy.stderr b/tests/ui/static/static-method-privacy.stderr
index 4be1b22fc..4be1b22fc 100644
--- a/src/test/ui/static/static-method-privacy.stderr
+++ b/tests/ui/static/static-method-privacy.stderr
diff --git a/src/test/ui/static/static-mut-bad-types.rs b/tests/ui/static/static-mut-bad-types.rs
index 8a98b1b7f..8a98b1b7f 100644
--- a/src/test/ui/static/static-mut-bad-types.rs
+++ b/tests/ui/static/static-mut-bad-types.rs
diff --git a/src/test/ui/static/static-mut-bad-types.stderr b/tests/ui/static/static-mut-bad-types.stderr
index 983e1026f..983e1026f 100644
--- a/src/test/ui/static/static-mut-bad-types.stderr
+++ b/tests/ui/static/static-mut-bad-types.stderr
diff --git a/src/test/ui/static/static-mut-foreign-requires-unsafe.mir.stderr b/tests/ui/static/static-mut-foreign-requires-unsafe.mir.stderr
index a4659bc87..a4659bc87 100644
--- a/src/test/ui/static/static-mut-foreign-requires-unsafe.mir.stderr
+++ b/tests/ui/static/static-mut-foreign-requires-unsafe.mir.stderr
diff --git a/src/test/ui/static/static-mut-foreign-requires-unsafe.rs b/tests/ui/static/static-mut-foreign-requires-unsafe.rs
index 4f96acb33..4f96acb33 100644
--- a/src/test/ui/static/static-mut-foreign-requires-unsafe.rs
+++ b/tests/ui/static/static-mut-foreign-requires-unsafe.rs
diff --git a/src/test/ui/static/static-mut-foreign-requires-unsafe.thir.stderr b/tests/ui/static/static-mut-foreign-requires-unsafe.thir.stderr
index 2c62d4d8f..2c62d4d8f 100644
--- a/src/test/ui/static/static-mut-foreign-requires-unsafe.thir.stderr
+++ b/tests/ui/static/static-mut-foreign-requires-unsafe.thir.stderr
diff --git a/src/test/ui/static/static-mut-not-constant.rs b/tests/ui/static/static-mut-not-constant.rs
index 2091fffd4..2091fffd4 100644
--- a/src/test/ui/static/static-mut-not-constant.rs
+++ b/tests/ui/static/static-mut-not-constant.rs
diff --git a/src/test/ui/static/static-mut-not-constant.stderr b/tests/ui/static/static-mut-not-constant.stderr
index a0fa24515..a0fa24515 100644
--- a/src/test/ui/static/static-mut-not-constant.stderr
+++ b/tests/ui/static/static-mut-not-constant.stderr
diff --git a/src/test/ui/static/static-mut-not-pat.rs b/tests/ui/static/static-mut-not-pat.rs
index ce5ae164c..ce5ae164c 100644
--- a/src/test/ui/static/static-mut-not-pat.rs
+++ b/tests/ui/static/static-mut-not-pat.rs
diff --git a/src/test/ui/static/static-mut-not-pat.stderr b/tests/ui/static/static-mut-not-pat.stderr
index 33c1cd6a5..33c1cd6a5 100644
--- a/src/test/ui/static/static-mut-not-pat.stderr
+++ b/tests/ui/static/static-mut-not-pat.stderr
diff --git a/src/test/ui/static/static-mut-requires-unsafe.mir.stderr b/tests/ui/static/static-mut-requires-unsafe.mir.stderr
index 0d4ce056f..0d4ce056f 100644
--- a/src/test/ui/static/static-mut-requires-unsafe.mir.stderr
+++ b/tests/ui/static/static-mut-requires-unsafe.mir.stderr
diff --git a/src/test/ui/static/static-mut-requires-unsafe.rs b/tests/ui/static/static-mut-requires-unsafe.rs
index ea3ba0950..ea3ba0950 100644
--- a/src/test/ui/static/static-mut-requires-unsafe.rs
+++ b/tests/ui/static/static-mut-requires-unsafe.rs
diff --git a/src/test/ui/static/static-mut-requires-unsafe.thir.stderr b/tests/ui/static/static-mut-requires-unsafe.thir.stderr
index 1a1cf1427..1a1cf1427 100644
--- a/src/test/ui/static/static-mut-requires-unsafe.thir.stderr
+++ b/tests/ui/static/static-mut-requires-unsafe.thir.stderr
diff --git a/src/test/ui/static/static-priv-by-default2.rs b/tests/ui/static/static-priv-by-default2.rs
index bbbdb253b..bbbdb253b 100644
--- a/src/test/ui/static/static-priv-by-default2.rs
+++ b/tests/ui/static/static-priv-by-default2.rs
diff --git a/src/test/ui/static/static-priv-by-default2.stderr b/tests/ui/static/static-priv-by-default2.stderr
index b14e096d6..b14e096d6 100644
--- a/src/test/ui/static/static-priv-by-default2.stderr
+++ b/tests/ui/static/static-priv-by-default2.stderr
diff --git a/src/test/ui/static/static-reference-to-fn-1.rs b/tests/ui/static/static-reference-to-fn-1.rs
index c15634dbf..c15634dbf 100644
--- a/src/test/ui/static/static-reference-to-fn-1.rs
+++ b/tests/ui/static/static-reference-to-fn-1.rs
diff --git a/src/test/ui/static/static-reference-to-fn-1.stderr b/tests/ui/static/static-reference-to-fn-1.stderr
index 67b478bdb..67b478bdb 100644
--- a/src/test/ui/static/static-reference-to-fn-1.stderr
+++ b/tests/ui/static/static-reference-to-fn-1.stderr
diff --git a/src/test/ui/static/static-reference-to-fn-2.rs b/tests/ui/static/static-reference-to-fn-2.rs
index 6693667c0..6693667c0 100644
--- a/src/test/ui/static/static-reference-to-fn-2.rs
+++ b/tests/ui/static/static-reference-to-fn-2.rs
diff --git a/src/test/ui/static/static-reference-to-fn-2.stderr b/tests/ui/static/static-reference-to-fn-2.stderr
index 133d8ec2e..133d8ec2e 100644
--- a/src/test/ui/static/static-reference-to-fn-2.stderr
+++ b/tests/ui/static/static-reference-to-fn-2.stderr
diff --git a/src/test/ui/static/static-region-bound.rs b/tests/ui/static/static-region-bound.rs
index d70706e57..d70706e57 100644
--- a/src/test/ui/static/static-region-bound.rs
+++ b/tests/ui/static/static-region-bound.rs
diff --git a/src/test/ui/static/static-region-bound.stderr b/tests/ui/static/static-region-bound.stderr
index 1a607e3c0..1a607e3c0 100644
--- a/src/test/ui/static/static-region-bound.stderr
+++ b/tests/ui/static/static-region-bound.stderr
diff --git a/src/test/ui/static/static-vec-repeat-not-constant.rs b/tests/ui/static/static-vec-repeat-not-constant.rs
index 61c87b144..61c87b144 100644
--- a/src/test/ui/static/static-vec-repeat-not-constant.rs
+++ b/tests/ui/static/static-vec-repeat-not-constant.rs
diff --git a/src/test/ui/static/static-vec-repeat-not-constant.stderr b/tests/ui/static/static-vec-repeat-not-constant.stderr
index dec012318..dec012318 100644
--- a/src/test/ui/static/static-vec-repeat-not-constant.stderr
+++ b/tests/ui/static/static-vec-repeat-not-constant.stderr
diff --git a/src/test/ui/static/static_sized_requirement.rs b/tests/ui/static/static_sized_requirement.rs
index 3943b2608..3943b2608 100644
--- a/src/test/ui/static/static_sized_requirement.rs
+++ b/tests/ui/static/static_sized_requirement.rs
diff --git a/src/test/ui/static/thread-local-in-ctfe.rs b/tests/ui/static/thread-local-in-ctfe.rs
index 547e5445a..547e5445a 100644
--- a/src/test/ui/static/thread-local-in-ctfe.rs
+++ b/tests/ui/static/thread-local-in-ctfe.rs
diff --git a/src/test/ui/static/thread-local-in-ctfe.stderr b/tests/ui/static/thread-local-in-ctfe.stderr
index fd9676046..fd9676046 100644
--- a/src/test/ui/static/thread-local-in-ctfe.stderr
+++ b/tests/ui/static/thread-local-in-ctfe.stderr
diff --git a/src/test/ui/statics/auxiliary/static-function-pointer-aux.rs b/tests/ui/statics/auxiliary/static-function-pointer-aux.rs
index 4dfc25764..4dfc25764 100644
--- a/src/test/ui/statics/auxiliary/static-function-pointer-aux.rs
+++ b/tests/ui/statics/auxiliary/static-function-pointer-aux.rs
diff --git a/src/test/ui/statics/auxiliary/static-methods-crate.rs b/tests/ui/statics/auxiliary/static-methods-crate.rs
index 7ff3bc0dd..7ff3bc0dd 100644
--- a/src/test/ui/statics/auxiliary/static-methods-crate.rs
+++ b/tests/ui/statics/auxiliary/static-methods-crate.rs
diff --git a/src/test/ui/statics/auxiliary/static_fn_inline_xc_aux.rs b/tests/ui/statics/auxiliary/static_fn_inline_xc_aux.rs
index 8d0f7f61c..8d0f7f61c 100644
--- a/src/test/ui/statics/auxiliary/static_fn_inline_xc_aux.rs
+++ b/tests/ui/statics/auxiliary/static_fn_inline_xc_aux.rs
diff --git a/src/test/ui/statics/auxiliary/static_fn_trait_xc_aux.rs b/tests/ui/statics/auxiliary/static_fn_trait_xc_aux.rs
index b8aed2c5f..b8aed2c5f 100644
--- a/src/test/ui/statics/auxiliary/static_fn_trait_xc_aux.rs
+++ b/tests/ui/statics/auxiliary/static_fn_trait_xc_aux.rs
diff --git a/src/test/ui/statics/auxiliary/static_mut_xc.rs b/tests/ui/statics/auxiliary/static_mut_xc.rs
index 264a2243a..264a2243a 100644
--- a/src/test/ui/statics/auxiliary/static_mut_xc.rs
+++ b/tests/ui/statics/auxiliary/static_mut_xc.rs
diff --git a/src/test/ui/statics/issue-14227.mir.stderr b/tests/ui/statics/issue-14227.mir.stderr
index 8e7a2514d..8e7a2514d 100644
--- a/src/test/ui/statics/issue-14227.mir.stderr
+++ b/tests/ui/statics/issue-14227.mir.stderr
diff --git a/src/test/ui/statics/issue-14227.rs b/tests/ui/statics/issue-14227.rs
index 5f866ec90..5f866ec90 100644
--- a/src/test/ui/statics/issue-14227.rs
+++ b/tests/ui/statics/issue-14227.rs
diff --git a/src/test/ui/statics/issue-14227.thir.stderr b/tests/ui/statics/issue-14227.thir.stderr
index 8e7a2514d..8e7a2514d 100644
--- a/src/test/ui/statics/issue-14227.thir.stderr
+++ b/tests/ui/statics/issue-14227.thir.stderr
diff --git a/src/test/ui/statics/issue-15261.rs b/tests/ui/statics/issue-15261.rs
index ec413f6d1..ec413f6d1 100644
--- a/src/test/ui/statics/issue-15261.rs
+++ b/tests/ui/statics/issue-15261.rs
diff --git a/src/test/ui/statics/issue-17233.rs b/tests/ui/statics/issue-17233.rs
index 54a12fdf8..54a12fdf8 100644
--- a/src/test/ui/statics/issue-17233.rs
+++ b/tests/ui/statics/issue-17233.rs
diff --git a/src/test/ui/statics/issue-17718-static-sync.rs b/tests/ui/statics/issue-17718-static-sync.rs
index 6f278d76b..6f278d76b 100644
--- a/src/test/ui/statics/issue-17718-static-sync.rs
+++ b/tests/ui/statics/issue-17718-static-sync.rs
diff --git a/src/test/ui/statics/issue-17718-static-sync.stderr b/tests/ui/statics/issue-17718-static-sync.stderr
index bc6e45e59..bc6e45e59 100644
--- a/src/test/ui/statics/issue-17718-static-sync.stderr
+++ b/tests/ui/statics/issue-17718-static-sync.stderr
diff --git a/src/test/ui/statics/issue-17718-static-unsafe-interior.rs b/tests/ui/statics/issue-17718-static-unsafe-interior.rs
index 65a8713ba..65a8713ba 100644
--- a/src/test/ui/statics/issue-17718-static-unsafe-interior.rs
+++ b/tests/ui/statics/issue-17718-static-unsafe-interior.rs
diff --git a/src/test/ui/statics/issue-44373-2.rs b/tests/ui/statics/issue-44373-2.rs
index 194ce1dca..194ce1dca 100644
--- a/src/test/ui/statics/issue-44373-2.rs
+++ b/tests/ui/statics/issue-44373-2.rs
diff --git a/src/test/ui/statics/issue-44373.rs b/tests/ui/statics/issue-44373.rs
index 0d011d096..0d011d096 100644
--- a/src/test/ui/statics/issue-44373.rs
+++ b/tests/ui/statics/issue-44373.rs
diff --git a/src/test/ui/statics/issue-44373.stderr b/tests/ui/statics/issue-44373.stderr
index 2d29dec88..2d29dec88 100644
--- a/src/test/ui/statics/issue-44373.stderr
+++ b/tests/ui/statics/issue-44373.stderr
diff --git a/src/test/ui/statics/issue-91050-1.rs b/tests/ui/statics/issue-91050-1.rs
index 403a41462..403a41462 100644
--- a/src/test/ui/statics/issue-91050-1.rs
+++ b/tests/ui/statics/issue-91050-1.rs
diff --git a/src/test/ui/statics/issue-91050-2.rs b/tests/ui/statics/issue-91050-2.rs
index 2ff954d15..2ff954d15 100644
--- a/src/test/ui/statics/issue-91050-2.rs
+++ b/tests/ui/statics/issue-91050-2.rs
diff --git a/src/test/ui/statics/static-fn-inline-xc.rs b/tests/ui/statics/static-fn-inline-xc.rs
index a400b9c8d..a400b9c8d 100644
--- a/src/test/ui/statics/static-fn-inline-xc.rs
+++ b/tests/ui/statics/static-fn-inline-xc.rs
diff --git a/src/test/ui/statics/static-fn-trait-xc.rs b/tests/ui/statics/static-fn-trait-xc.rs
index 1d3126128..1d3126128 100644
--- a/src/test/ui/statics/static-fn-trait-xc.rs
+++ b/tests/ui/statics/static-fn-trait-xc.rs
diff --git a/src/test/ui/statics/static-function-pointer-xc.rs b/tests/ui/statics/static-function-pointer-xc.rs
index 2d063a751..2d063a751 100644
--- a/src/test/ui/statics/static-function-pointer-xc.rs
+++ b/tests/ui/statics/static-function-pointer-xc.rs
diff --git a/src/test/ui/statics/static-function-pointer.rs b/tests/ui/statics/static-function-pointer.rs
index 6c52dfecd..6c52dfecd 100644
--- a/src/test/ui/statics/static-function-pointer.rs
+++ b/tests/ui/statics/static-function-pointer.rs
diff --git a/src/test/ui/statics/static-impl.rs b/tests/ui/statics/static-impl.rs
index e7bdb38ee..e7bdb38ee 100644
--- a/src/test/ui/statics/static-impl.rs
+++ b/tests/ui/statics/static-impl.rs
diff --git a/src/test/ui/statics/static-method-in-trait-with-tps-intracrate.rs b/tests/ui/statics/static-method-in-trait-with-tps-intracrate.rs
index cd3ccfee0..cd3ccfee0 100644
--- a/src/test/ui/statics/static-method-in-trait-with-tps-intracrate.rs
+++ b/tests/ui/statics/static-method-in-trait-with-tps-intracrate.rs
diff --git a/src/test/ui/statics/static-method-xcrate.rs b/tests/ui/statics/static-method-xcrate.rs
index 1d1cb3810..1d1cb3810 100644
--- a/src/test/ui/statics/static-method-xcrate.rs
+++ b/tests/ui/statics/static-method-xcrate.rs
diff --git a/src/test/ui/statics/static-methods-in-traits.rs b/tests/ui/statics/static-methods-in-traits.rs
index ff76d4e4a..ff76d4e4a 100644
--- a/src/test/ui/statics/static-methods-in-traits.rs
+++ b/tests/ui/statics/static-methods-in-traits.rs
diff --git a/src/test/ui/statics/static-methods-in-traits2.rs b/tests/ui/statics/static-methods-in-traits2.rs
index 2c43ff6a7..2c43ff6a7 100644
--- a/src/test/ui/statics/static-methods-in-traits2.rs
+++ b/tests/ui/statics/static-methods-in-traits2.rs
diff --git a/src/test/ui/statics/static-mut-xc.rs b/tests/ui/statics/static-mut-xc.rs
index 1d172d26a..1d172d26a 100644
--- a/src/test/ui/statics/static-mut-xc.rs
+++ b/tests/ui/statics/static-mut-xc.rs
diff --git a/src/test/ui/statics/static-promotion.rs b/tests/ui/statics/static-promotion.rs
index b9eff4691..b9eff4691 100644
--- a/src/test/ui/statics/static-promotion.rs
+++ b/tests/ui/statics/static-promotion.rs
diff --git a/src/test/ui/statics/static-recursive.rs b/tests/ui/statics/static-recursive.rs
index 95dadc81f..95dadc81f 100644
--- a/src/test/ui/statics/static-recursive.rs
+++ b/tests/ui/statics/static-recursive.rs
diff --git a/src/test/ui/statics/uninhabited-static.rs b/tests/ui/statics/uninhabited-static.rs
index f5c6f4443..f5c6f4443 100644
--- a/src/test/ui/statics/uninhabited-static.rs
+++ b/tests/ui/statics/uninhabited-static.rs
diff --git a/src/test/ui/statics/uninhabited-static.stderr b/tests/ui/statics/uninhabited-static.stderr
index ef794bb36..ef794bb36 100644
--- a/src/test/ui/statics/uninhabited-static.stderr
+++ b/tests/ui/statics/uninhabited-static.stderr
diff --git a/src/test/ui/stats/hir-stats.rs b/tests/ui/stats/hir-stats.rs
index 0b89d0b16..0b89d0b16 100644
--- a/src/test/ui/stats/hir-stats.rs
+++ b/tests/ui/stats/hir-stats.rs
diff --git a/src/test/ui/stats/hir-stats.stderr b/tests/ui/stats/hir-stats.stderr
index 15900bef7..7d9ff2dfb 100644
--- a/src/test/ui/stats/hir-stats.stderr
+++ b/tests/ui/stats/hir-stats.stderr
@@ -41,8 +41,8 @@ ast-stats-1 - Wild                      88 ( 1.2%)             1
 ast-stats-1 - Ident                    440 ( 5.9%)             5
 ast-stats-1 PathSegment              720 ( 9.7%)            30            24
 ast-stats-1 Ty                       896 (12.1%)            14            64
-ast-stats-1 - Rptr                      64 ( 0.9%)             1
 ast-stats-1 - Ptr                       64 ( 0.9%)             1
+ast-stats-1 - Ref                       64 ( 0.9%)             1
 ast-stats-1 - ImplicitSelf             128 ( 1.7%)             2
 ast-stats-1 - Path                     640 ( 8.6%)            10
 ast-stats-1 Item                   1_656 (22.3%)             9           184
@@ -100,8 +100,8 @@ ast-stats-2 - Lit                      144 ( 1.8%)             2
 ast-stats-2 - Block                    216 ( 2.7%)             3
 ast-stats-2 PathSegment              792 ( 9.8%)            33            24
 ast-stats-2 Ty                       896 (11.0%)            14            64
-ast-stats-2 - Rptr                      64 ( 0.8%)             1
 ast-stats-2 - Ptr                       64 ( 0.8%)             1
+ast-stats-2 - Ref                       64 ( 0.8%)             1
 ast-stats-2 - ImplicitSelf             128 ( 1.6%)             2
 ast-stats-2 - Path                     640 ( 7.9%)            10
 ast-stats-2 Item                   2_024 (25.0%)            11           184
@@ -154,7 +154,7 @@ hir-stats GenericParam             400 ( 4.4%)             5            80
 hir-stats Generics                 560 ( 6.2%)            10            56
 hir-stats Ty                       720 ( 8.0%)            15            48
 hir-stats - Ptr                       48 ( 0.5%)             1
-hir-stats - Rptr                      48 ( 0.5%)             1
+hir-stats - Ref                       48 ( 0.5%)             1
 hir-stats - Path                     624 ( 6.9%)            13
 hir-stats Expr                     768 ( 8.5%)            12            64
 hir-stats - Path                      64 ( 0.7%)             1
diff --git a/src/test/ui/std-backtrace.rs b/tests/ui/std-backtrace.rs
index 59574b471..59574b471 100644
--- a/src/test/ui/std-backtrace.rs
+++ b/tests/ui/std-backtrace.rs
diff --git a/src/test/ui/std-uncopyable-atomics.rs b/tests/ui/std-uncopyable-atomics.rs
index d85864eca..d85864eca 100644
--- a/src/test/ui/std-uncopyable-atomics.rs
+++ b/tests/ui/std-uncopyable-atomics.rs
diff --git a/tests/ui/std-uncopyable-atomics.stderr b/tests/ui/std-uncopyable-atomics.stderr
new file mode 100644
index 000000000..8c5d0b960
--- /dev/null
+++ b/tests/ui/std-uncopyable-atomics.stderr
@@ -0,0 +1,51 @@
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/std-uncopyable-atomics.rs:9:13
+   |
+LL |     let x = *&x;
+   |             ^^^ move occurs because value has type `std::sync::atomic::AtomicBool`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let x = *&x;
+LL +     let x = &x;
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/std-uncopyable-atomics.rs:11:13
+   |
+LL |     let x = *&x;
+   |             ^^^ move occurs because value has type `std::sync::atomic::AtomicIsize`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let x = *&x;
+LL +     let x = &x;
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/std-uncopyable-atomics.rs:13:13
+   |
+LL |     let x = *&x;
+   |             ^^^ move occurs because value has type `std::sync::atomic::AtomicUsize`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let x = *&x;
+LL +     let x = &x;
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/std-uncopyable-atomics.rs:15:13
+   |
+LL |     let x = *&x;
+   |             ^^^ move occurs because value has type `std::sync::atomic::AtomicPtr<usize>`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let x = *&x;
+LL +     let x = &x;
+   |
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/stdio-is-blocking.rs b/tests/ui/stdio-is-blocking.rs
index 4b67dbf79..4b67dbf79 100644
--- a/src/test/ui/stdio-is-blocking.rs
+++ b/tests/ui/stdio-is-blocking.rs
diff --git a/src/test/ui/stdlib-unit-tests/builtin-clone.rs b/tests/ui/stdlib-unit-tests/builtin-clone.rs
index 0874d5bc3..0874d5bc3 100644
--- a/src/test/ui/stdlib-unit-tests/builtin-clone.rs
+++ b/tests/ui/stdlib-unit-tests/builtin-clone.rs
diff --git a/src/test/ui/stdlib-unit-tests/eq-multidispatch.rs b/tests/ui/stdlib-unit-tests/eq-multidispatch.rs
index 69d83f496..69d83f496 100644
--- a/src/test/ui/stdlib-unit-tests/eq-multidispatch.rs
+++ b/tests/ui/stdlib-unit-tests/eq-multidispatch.rs
diff --git a/src/test/ui/issues/issue-21058.rs b/tests/ui/stdlib-unit-tests/issue-21058.rs
index 6facf0b2d..6facf0b2d 100644
--- a/src/test/ui/issues/issue-21058.rs
+++ b/tests/ui/stdlib-unit-tests/issue-21058.rs
diff --git a/src/test/ui/stdlib-unit-tests/istr.rs b/tests/ui/stdlib-unit-tests/istr.rs
index dca6d40d5..dca6d40d5 100644
--- a/src/test/ui/stdlib-unit-tests/istr.rs
+++ b/tests/ui/stdlib-unit-tests/istr.rs
diff --git a/src/test/ui/stdlib-unit-tests/log-knows-the-names-of-variants-in-std.rs b/tests/ui/stdlib-unit-tests/log-knows-the-names-of-variants-in-std.rs
index c5a40edbe..c5a40edbe 100644
--- a/src/test/ui/stdlib-unit-tests/log-knows-the-names-of-variants-in-std.rs
+++ b/tests/ui/stdlib-unit-tests/log-knows-the-names-of-variants-in-std.rs
diff --git a/src/test/ui/stdlib-unit-tests/matches2021.rs b/tests/ui/stdlib-unit-tests/matches2021.rs
index 9143a8cdd..9143a8cdd 100644
--- a/src/test/ui/stdlib-unit-tests/matches2021.rs
+++ b/tests/ui/stdlib-unit-tests/matches2021.rs
diff --git a/src/test/ui/stdlib-unit-tests/minmax-stability-issue-23687.rs b/tests/ui/stdlib-unit-tests/minmax-stability-issue-23687.rs
index 9100bfbde..9100bfbde 100644
--- a/src/test/ui/stdlib-unit-tests/minmax-stability-issue-23687.rs
+++ b/tests/ui/stdlib-unit-tests/minmax-stability-issue-23687.rs
diff --git a/src/test/ui/stdlib-unit-tests/not-sync.rs b/tests/ui/stdlib-unit-tests/not-sync.rs
index f4648994f..f4648994f 100644
--- a/src/test/ui/stdlib-unit-tests/not-sync.rs
+++ b/tests/ui/stdlib-unit-tests/not-sync.rs
diff --git a/src/test/ui/stdlib-unit-tests/not-sync.stderr b/tests/ui/stdlib-unit-tests/not-sync.stderr
index 1ee358ba8..1ee358ba8 100644
--- a/src/test/ui/stdlib-unit-tests/not-sync.stderr
+++ b/tests/ui/stdlib-unit-tests/not-sync.stderr
diff --git a/src/test/ui/stdlib-unit-tests/raw-fat-ptr.rs b/tests/ui/stdlib-unit-tests/raw-fat-ptr.rs
index 6b0b09c98..6b0b09c98 100644
--- a/src/test/ui/stdlib-unit-tests/raw-fat-ptr.rs
+++ b/tests/ui/stdlib-unit-tests/raw-fat-ptr.rs
diff --git a/src/test/ui/stdlib-unit-tests/seq-compare.rs b/tests/ui/stdlib-unit-tests/seq-compare.rs
index 4078326b5..4078326b5 100644
--- a/src/test/ui/stdlib-unit-tests/seq-compare.rs
+++ b/tests/ui/stdlib-unit-tests/seq-compare.rs
diff --git a/src/test/ui/stdlib-unit-tests/volatile-fat-ptr.rs b/tests/ui/stdlib-unit-tests/volatile-fat-ptr.rs
index f73e7e1c3..f73e7e1c3 100644
--- a/src/test/ui/stdlib-unit-tests/volatile-fat-ptr.rs
+++ b/tests/ui/stdlib-unit-tests/volatile-fat-ptr.rs
diff --git a/src/test/ui/stmt_expr_attrs_no_feature.rs b/tests/ui/stmt_expr_attrs_no_feature.rs
index 627c97da0..627c97da0 100644
--- a/src/test/ui/stmt_expr_attrs_no_feature.rs
+++ b/tests/ui/stmt_expr_attrs_no_feature.rs
diff --git a/src/test/ui/stmt_expr_attrs_no_feature.stderr b/tests/ui/stmt_expr_attrs_no_feature.stderr
index dc06521fe..dc06521fe 100644
--- a/src/test/ui/stmt_expr_attrs_no_feature.stderr
+++ b/tests/ui/stmt_expr_attrs_no_feature.stderr
diff --git a/src/test/ui/str/str-array-assignment.rs b/tests/ui/str/str-array-assignment.rs
index 323eefb38..323eefb38 100644
--- a/src/test/ui/str/str-array-assignment.rs
+++ b/tests/ui/str/str-array-assignment.rs
diff --git a/src/test/ui/str/str-array-assignment.stderr b/tests/ui/str/str-array-assignment.stderr
index c23400a1d..c23400a1d 100644
--- a/src/test/ui/str/str-array-assignment.stderr
+++ b/tests/ui/str/str-array-assignment.stderr
diff --git a/src/test/ui/str/str-as-char.fixed b/tests/ui/str/str-as-char.fixed
index 42bbef839..42bbef839 100644
--- a/src/test/ui/str/str-as-char.fixed
+++ b/tests/ui/str/str-as-char.fixed
diff --git a/src/test/ui/str/str-as-char.rs b/tests/ui/str/str-as-char.rs
index 09b9dfc59..09b9dfc59 100644
--- a/src/test/ui/str/str-as-char.rs
+++ b/tests/ui/str/str-as-char.rs
diff --git a/src/test/ui/str/str-as-char.stderr b/tests/ui/str/str-as-char.stderr
index c3cb488e3..c3cb488e3 100644
--- a/src/test/ui/str/str-as-char.stderr
+++ b/tests/ui/str/str-as-char.stderr
diff --git a/src/test/ui/str/str-concat-on-double-ref.rs b/tests/ui/str/str-concat-on-double-ref.rs
index e68210d53..e68210d53 100644
--- a/src/test/ui/str/str-concat-on-double-ref.rs
+++ b/tests/ui/str/str-concat-on-double-ref.rs
diff --git a/src/test/ui/str/str-concat-on-double-ref.stderr b/tests/ui/str/str-concat-on-double-ref.stderr
index bd354679f..bd354679f 100644
--- a/src/test/ui/str/str-concat-on-double-ref.stderr
+++ b/tests/ui/str/str-concat-on-double-ref.stderr
diff --git a/src/test/ui/str/str-escape.rs b/tests/ui/str/str-escape.rs
index 0264632fd..0264632fd 100644
--- a/src/test/ui/str/str-escape.rs
+++ b/tests/ui/str/str-escape.rs
diff --git a/src/test/ui/str/str-escape.stderr b/tests/ui/str/str-escape.stderr
index b2501f1a2..b2501f1a2 100644
--- a/src/test/ui/str/str-escape.stderr
+++ b/tests/ui/str/str-escape.stderr
diff --git a/src/test/ui/str/str-idx.rs b/tests/ui/str/str-idx.rs
index 1b32ed553..1b32ed553 100644
--- a/src/test/ui/str/str-idx.rs
+++ b/tests/ui/str/str-idx.rs
diff --git a/src/test/ui/str/str-idx.stderr b/tests/ui/str/str-idx.stderr
index 019305def..cb1a6fcac 100644
--- a/src/test/ui/str/str-idx.stderr
+++ b/tests/ui/str/str-idx.stderr
@@ -24,9 +24,6 @@ LL |     let _ = s.get(4);
    = help: the trait `SliceIndex<[T]>` is implemented for `usize`
 note: required by a bound in `core::str::<impl str>::get`
   --> $SRC_DIR/core/src/str/mod.rs:LL:COL
-   |
-LL |     pub const fn get<I: ~const SliceIndex<str>>(&self, i: I) -> Option<&I::Output> {
-   |                         ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `core::str::<impl str>::get`
 
 error[E0277]: the type `str` cannot be indexed by `{integer}`
   --> $DIR/str-idx.rs:5:29
@@ -42,9 +39,6 @@ LL |     let _ = s.get_unchecked(4);
    = help: the trait `SliceIndex<[T]>` is implemented for `usize`
 note: required by a bound in `core::str::<impl str>::get_unchecked`
   --> $SRC_DIR/core/src/str/mod.rs:LL:COL
-   |
-LL |     pub const unsafe fn get_unchecked<I: ~const SliceIndex<str>>(&self, i: I) -> &I::Output {
-   |                                          ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `core::str::<impl str>::get_unchecked`
 
 error[E0277]: the type `str` cannot be indexed by `char`
   --> $DIR/str-idx.rs:6:19
diff --git a/src/test/ui/str/str-lit-type-mismatch.rs b/tests/ui/str/str-lit-type-mismatch.rs
index 12637c7b9..12637c7b9 100644
--- a/src/test/ui/str/str-lit-type-mismatch.rs
+++ b/tests/ui/str/str-lit-type-mismatch.rs
diff --git a/src/test/ui/str/str-lit-type-mismatch.stderr b/tests/ui/str/str-lit-type-mismatch.stderr
index 6b56cd6f3..6b56cd6f3 100644
--- a/src/test/ui/str/str-lit-type-mismatch.stderr
+++ b/tests/ui/str/str-lit-type-mismatch.stderr
diff --git a/src/test/ui/str/str-mut-idx.rs b/tests/ui/str/str-mut-idx.rs
index 575a9eae8..575a9eae8 100644
--- a/src/test/ui/str/str-mut-idx.rs
+++ b/tests/ui/str/str-mut-idx.rs
diff --git a/src/test/ui/str/str-mut-idx.stderr b/tests/ui/str/str-mut-idx.stderr
index b165c4825..ca4b86ba3 100644
--- a/src/test/ui/str/str-mut-idx.stderr
+++ b/tests/ui/str/str-mut-idx.stderr
@@ -48,9 +48,6 @@ LL |     s.get_mut(1);
    = help: the trait `SliceIndex<[T]>` is implemented for `usize`
 note: required by a bound in `core::str::<impl str>::get_mut`
   --> $SRC_DIR/core/src/str/mod.rs:LL:COL
-   |
-LL |     pub const fn get_mut<I: ~const SliceIndex<str>>(&mut self, i: I) -> Option<&mut I::Output> {
-   |                             ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `core::str::<impl str>::get_mut`
 
 error[E0277]: the type `str` cannot be indexed by `{integer}`
   --> $DIR/str-mut-idx.rs:11:25
@@ -66,9 +63,6 @@ LL |     s.get_unchecked_mut(1);
    = help: the trait `SliceIndex<[T]>` is implemented for `usize`
 note: required by a bound in `core::str::<impl str>::get_unchecked_mut`
   --> $SRC_DIR/core/src/str/mod.rs:LL:COL
-   |
-LL |     pub const unsafe fn get_unchecked_mut<I: ~const SliceIndex<str>>(
-   |                                              ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `core::str::<impl str>::get_unchecked_mut`
 
 error[E0277]: the type `str` cannot be indexed by `char`
   --> $DIR/str-mut-idx.rs:13:7
diff --git a/src/test/ui/str/str-overrun.rs b/tests/ui/str/str-overrun.rs
index a3ec89413..a3ec89413 100644
--- a/src/test/ui/str/str-overrun.rs
+++ b/tests/ui/str/str-overrun.rs
diff --git a/src/test/ui/string-box-error.rs b/tests/ui/string-box-error.rs
index 11a5bd07c..11a5bd07c 100644
--- a/src/test/ui/string-box-error.rs
+++ b/tests/ui/string-box-error.rs
diff --git a/src/test/ui/struct-ctor-mangling.rs b/tests/ui/struct-ctor-mangling.rs
index ba6abbf03..ba6abbf03 100644
--- a/src/test/ui/struct-ctor-mangling.rs
+++ b/tests/ui/struct-ctor-mangling.rs
diff --git a/src/test/ui/structs-enums/align-enum.rs b/tests/ui/structs-enums/align-enum.rs
index fa872caa3..fa872caa3 100644
--- a/src/test/ui/structs-enums/align-enum.rs
+++ b/tests/ui/structs-enums/align-enum.rs
diff --git a/src/test/ui/structs-enums/align-struct.rs b/tests/ui/structs-enums/align-struct.rs
index f5418e754..f5418e754 100644
--- a/src/test/ui/structs-enums/align-struct.rs
+++ b/tests/ui/structs-enums/align-struct.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class.rs b/tests/ui/structs-enums/auxiliary/cci_class.rs
index de2945d74..de2945d74 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class_2.rs b/tests/ui/structs-enums/auxiliary/cci_class_2.rs
index c3de3150e..c3de3150e 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class_2.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class_2.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class_3.rs b/tests/ui/structs-enums/auxiliary/cci_class_3.rs
index fb7fad0b5..fb7fad0b5 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class_3.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class_3.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class_4.rs b/tests/ui/structs-enums/auxiliary/cci_class_4.rs
index 85aa3bc8c..85aa3bc8c 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class_4.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class_4.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class_6.rs b/tests/ui/structs-enums/auxiliary/cci_class_6.rs
index 35f93d0c6..35f93d0c6 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class_6.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class_6.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class_cast.rs b/tests/ui/structs-enums/auxiliary/cci_class_cast.rs
index dfc3c56dd..dfc3c56dd 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class_cast.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class_cast.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class_trait.rs b/tests/ui/structs-enums/auxiliary/cci_class_trait.rs
index 2d02b591c..2d02b591c 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class_trait.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class_trait.rs
diff --git a/src/test/ui/structs-enums/auxiliary/empty-struct.rs b/tests/ui/structs-enums/auxiliary/empty-struct.rs
index 93275e714..93275e714 100644
--- a/src/test/ui/structs-enums/auxiliary/empty-struct.rs
+++ b/tests/ui/structs-enums/auxiliary/empty-struct.rs
diff --git a/src/test/ui/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs b/tests/ui/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs
index 55e6b34ac..55e6b34ac 100644
--- a/src/test/ui/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs
+++ b/tests/ui/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs
diff --git a/src/test/ui/structs-enums/auxiliary/namespaced_enums.rs b/tests/ui/structs-enums/auxiliary/namespaced_enums.rs
index d3548c76c..d3548c76c 100644
--- a/src/test/ui/structs-enums/auxiliary/namespaced_enums.rs
+++ b/tests/ui/structs-enums/auxiliary/namespaced_enums.rs
diff --git a/src/test/ui/structs-enums/auxiliary/newtype_struct_xc.rs b/tests/ui/structs-enums/auxiliary/newtype_struct_xc.rs
index 9d1e0742e..9d1e0742e 100644
--- a/src/test/ui/structs-enums/auxiliary/newtype_struct_xc.rs
+++ b/tests/ui/structs-enums/auxiliary/newtype_struct_xc.rs
diff --git a/src/test/ui/structs-enums/auxiliary/struct_destructuring_cross_crate.rs b/tests/ui/structs-enums/auxiliary/struct_destructuring_cross_crate.rs
index 3665ae7e8..3665ae7e8 100644
--- a/src/test/ui/structs-enums/auxiliary/struct_destructuring_cross_crate.rs
+++ b/tests/ui/structs-enums/auxiliary/struct_destructuring_cross_crate.rs
diff --git a/src/test/ui/structs-enums/auxiliary/struct_variant_xc_aux.rs b/tests/ui/structs-enums/auxiliary/struct_variant_xc_aux.rs
index e919df611..e919df611 100644
--- a/src/test/ui/structs-enums/auxiliary/struct_variant_xc_aux.rs
+++ b/tests/ui/structs-enums/auxiliary/struct_variant_xc_aux.rs
diff --git a/src/test/ui/structs-enums/auxiliary/xcrate_struct_aliases.rs b/tests/ui/structs-enums/auxiliary/xcrate_struct_aliases.rs
index bc8879aa3..bc8879aa3 100644
--- a/src/test/ui/structs-enums/auxiliary/xcrate_struct_aliases.rs
+++ b/tests/ui/structs-enums/auxiliary/xcrate_struct_aliases.rs
diff --git a/src/test/ui/structs-enums/borrow-tuple-fields.rs b/tests/ui/structs-enums/borrow-tuple-fields.rs
index b1d8f9164..b1d8f9164 100644
--- a/src/test/ui/structs-enums/borrow-tuple-fields.rs
+++ b/tests/ui/structs-enums/borrow-tuple-fields.rs
diff --git a/src/test/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs b/tests/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs
index f870096fd..f870096fd 100644
--- a/src/test/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs
+++ b/tests/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs
diff --git a/src/test/ui/structs-enums/class-cast-to-trait-multiple-types.rs b/tests/ui/structs-enums/class-cast-to-trait-multiple-types.rs
index ca35a615d..ca35a615d 100644
--- a/src/test/ui/structs-enums/class-cast-to-trait-multiple-types.rs
+++ b/tests/ui/structs-enums/class-cast-to-trait-multiple-types.rs
diff --git a/src/test/ui/structs-enums/class-cast-to-trait.rs b/tests/ui/structs-enums/class-cast-to-trait.rs
index 1019bb300..1019bb300 100644
--- a/src/test/ui/structs-enums/class-cast-to-trait.rs
+++ b/tests/ui/structs-enums/class-cast-to-trait.rs
diff --git a/src/test/ui/structs-enums/class-dtor.rs b/tests/ui/structs-enums/class-dtor.rs
index 583a5e240..583a5e240 100644
--- a/src/test/ui/structs-enums/class-dtor.rs
+++ b/tests/ui/structs-enums/class-dtor.rs
diff --git a/src/test/ui/structs-enums/class-exports.rs b/tests/ui/structs-enums/class-exports.rs
index ee20887cb..ee20887cb 100644
--- a/src/test/ui/structs-enums/class-exports.rs
+++ b/tests/ui/structs-enums/class-exports.rs
diff --git a/src/test/ui/structs-enums/class-impl-very-parameterized-trait.rs b/tests/ui/structs-enums/class-impl-very-parameterized-trait.rs
index 5e7830296..5e7830296 100644
--- a/src/test/ui/structs-enums/class-impl-very-parameterized-trait.rs
+++ b/tests/ui/structs-enums/class-impl-very-parameterized-trait.rs
diff --git a/src/test/ui/structs-enums/class-implement-trait-cross-crate.rs b/tests/ui/structs-enums/class-implement-trait-cross-crate.rs
index 31b795175..31b795175 100644
--- a/src/test/ui/structs-enums/class-implement-trait-cross-crate.rs
+++ b/tests/ui/structs-enums/class-implement-trait-cross-crate.rs
diff --git a/src/test/ui/structs-enums/class-implement-traits.rs b/tests/ui/structs-enums/class-implement-traits.rs
index 732aa146c..732aa146c 100644
--- a/src/test/ui/structs-enums/class-implement-traits.rs
+++ b/tests/ui/structs-enums/class-implement-traits.rs
diff --git a/src/test/ui/structs-enums/class-method-cross-crate.rs b/tests/ui/structs-enums/class-method-cross-crate.rs
index 519f0685f..519f0685f 100644
--- a/src/test/ui/structs-enums/class-method-cross-crate.rs
+++ b/tests/ui/structs-enums/class-method-cross-crate.rs
diff --git a/src/test/ui/structs-enums/class-methods-cross-crate.rs b/tests/ui/structs-enums/class-methods-cross-crate.rs
index c342af313..c342af313 100644
--- a/src/test/ui/structs-enums/class-methods-cross-crate.rs
+++ b/tests/ui/structs-enums/class-methods-cross-crate.rs
diff --git a/src/test/ui/structs-enums/class-methods.rs b/tests/ui/structs-enums/class-methods.rs
index 83f4a5fd3..83f4a5fd3 100644
--- a/src/test/ui/structs-enums/class-methods.rs
+++ b/tests/ui/structs-enums/class-methods.rs
diff --git a/src/test/ui/structs-enums/class-poly-methods-cross-crate.rs b/tests/ui/structs-enums/class-poly-methods-cross-crate.rs
index 0307ba78d..0307ba78d 100644
--- a/src/test/ui/structs-enums/class-poly-methods-cross-crate.rs
+++ b/tests/ui/structs-enums/class-poly-methods-cross-crate.rs
diff --git a/src/test/ui/structs-enums/class-poly-methods.rs b/tests/ui/structs-enums/class-poly-methods.rs
index da2870b58..da2870b58 100644
--- a/src/test/ui/structs-enums/class-poly-methods.rs
+++ b/tests/ui/structs-enums/class-poly-methods.rs
diff --git a/src/test/ui/structs-enums/class-separate-impl.rs b/tests/ui/structs-enums/class-separate-impl.rs
index 3d6da1cc2..3d6da1cc2 100644
--- a/src/test/ui/structs-enums/class-separate-impl.rs
+++ b/tests/ui/structs-enums/class-separate-impl.rs
diff --git a/src/test/ui/structs-enums/class-str-field.rs b/tests/ui/structs-enums/class-str-field.rs
index a3dc66aab..a3dc66aab 100644
--- a/src/test/ui/structs-enums/class-str-field.rs
+++ b/tests/ui/structs-enums/class-str-field.rs
diff --git a/src/test/ui/structs-enums/class-typarams.rs b/tests/ui/structs-enums/class-typarams.rs
index 4b2d4b12e..4b2d4b12e 100644
--- a/src/test/ui/structs-enums/class-typarams.rs
+++ b/tests/ui/structs-enums/class-typarams.rs
diff --git a/src/test/ui/structs-enums/classes-cross-crate.rs b/tests/ui/structs-enums/classes-cross-crate.rs
index ca362c7a7..ca362c7a7 100644
--- a/src/test/ui/structs-enums/classes-cross-crate.rs
+++ b/tests/ui/structs-enums/classes-cross-crate.rs
diff --git a/src/test/ui/structs-enums/classes-self-referential.rs b/tests/ui/structs-enums/classes-self-referential.rs
index 27d6ebf2c..27d6ebf2c 100644
--- a/src/test/ui/structs-enums/classes-self-referential.rs
+++ b/tests/ui/structs-enums/classes-self-referential.rs
diff --git a/src/test/ui/structs-enums/classes-simple-cross-crate.rs b/tests/ui/structs-enums/classes-simple-cross-crate.rs
index 6ff0970c0..6ff0970c0 100644
--- a/src/test/ui/structs-enums/classes-simple-cross-crate.rs
+++ b/tests/ui/structs-enums/classes-simple-cross-crate.rs
diff --git a/src/test/ui/structs-enums/classes-simple-method.rs b/tests/ui/structs-enums/classes-simple-method.rs
index f3d98337d..f3d98337d 100644
--- a/src/test/ui/structs-enums/classes-simple-method.rs
+++ b/tests/ui/structs-enums/classes-simple-method.rs
diff --git a/src/test/ui/structs-enums/classes-simple.rs b/tests/ui/structs-enums/classes-simple.rs
index 568fbb29f..568fbb29f 100644
--- a/src/test/ui/structs-enums/classes-simple.rs
+++ b/tests/ui/structs-enums/classes-simple.rs
diff --git a/src/test/ui/structs-enums/classes.rs b/tests/ui/structs-enums/classes.rs
index 51d84b909..51d84b909 100644
--- a/src/test/ui/structs-enums/classes.rs
+++ b/tests/ui/structs-enums/classes.rs
diff --git a/src/test/ui/structs-enums/codegen-tag-static-padding.rs b/tests/ui/structs-enums/codegen-tag-static-padding.rs
index 8aa087c01..8aa087c01 100644
--- a/src/test/ui/structs-enums/codegen-tag-static-padding.rs
+++ b/tests/ui/structs-enums/codegen-tag-static-padding.rs
diff --git a/src/test/ui/structs-enums/compare-generic-enums.rs b/tests/ui/structs-enums/compare-generic-enums.rs
index 84f953b1f..84f953b1f 100644
--- a/src/test/ui/structs-enums/compare-generic-enums.rs
+++ b/tests/ui/structs-enums/compare-generic-enums.rs
diff --git a/src/test/ui/structs-enums/cross-crate-newtype-struct-pat.rs b/tests/ui/structs-enums/cross-crate-newtype-struct-pat.rs
index eabffc161..eabffc161 100644
--- a/src/test/ui/structs-enums/cross-crate-newtype-struct-pat.rs
+++ b/tests/ui/structs-enums/cross-crate-newtype-struct-pat.rs
diff --git a/src/test/ui/structs-enums/discrim-explicit-23030.rs b/tests/ui/structs-enums/discrim-explicit-23030.rs
index e17025e9e..e17025e9e 100644
--- a/src/test/ui/structs-enums/discrim-explicit-23030.rs
+++ b/tests/ui/structs-enums/discrim-explicit-23030.rs
diff --git a/src/test/ui/structs-enums/empty-struct-braces.rs b/tests/ui/structs-enums/empty-struct-braces.rs
index 0663687c9..0663687c9 100644
--- a/src/test/ui/structs-enums/empty-struct-braces.rs
+++ b/tests/ui/structs-enums/empty-struct-braces.rs
diff --git a/src/test/ui/structs-enums/empty-tag.rs b/tests/ui/structs-enums/empty-tag.rs
index 271ab72c7..271ab72c7 100644
--- a/src/test/ui/structs-enums/empty-tag.rs
+++ b/tests/ui/structs-enums/empty-tag.rs
diff --git a/src/test/ui/structs-enums/enum-alignment.rs b/tests/ui/structs-enums/enum-alignment.rs
index 108dfe2e6..108dfe2e6 100644
--- a/src/test/ui/structs-enums/enum-alignment.rs
+++ b/tests/ui/structs-enums/enum-alignment.rs
diff --git a/src/test/ui/structs-enums/enum-clike-ffi-as-int.rs b/tests/ui/structs-enums/enum-clike-ffi-as-int.rs
index e2b2b43de..e2b2b43de 100644
--- a/src/test/ui/structs-enums/enum-clike-ffi-as-int.rs
+++ b/tests/ui/structs-enums/enum-clike-ffi-as-int.rs
diff --git a/src/test/ui/structs-enums/enum-discr.rs b/tests/ui/structs-enums/enum-discr.rs
index bdd6df82d..bdd6df82d 100644
--- a/src/test/ui/structs-enums/enum-discr.rs
+++ b/tests/ui/structs-enums/enum-discr.rs
diff --git a/src/test/ui/structs-enums/enum-discrim-autosizing.rs b/tests/ui/structs-enums/enum-discrim-autosizing.rs
index f68fdda60..f68fdda60 100644
--- a/src/test/ui/structs-enums/enum-discrim-autosizing.rs
+++ b/tests/ui/structs-enums/enum-discrim-autosizing.rs
diff --git a/src/test/ui/structs-enums/enum-discrim-manual-sizing.rs b/tests/ui/structs-enums/enum-discrim-manual-sizing.rs
index c8b362c99..c8b362c99 100644
--- a/src/test/ui/structs-enums/enum-discrim-manual-sizing.rs
+++ b/tests/ui/structs-enums/enum-discrim-manual-sizing.rs
diff --git a/src/test/ui/structs-enums/enum-discrim-range-overflow.rs b/tests/ui/structs-enums/enum-discrim-range-overflow.rs
index 9c4c61e68..9c4c61e68 100644
--- a/src/test/ui/structs-enums/enum-discrim-range-overflow.rs
+++ b/tests/ui/structs-enums/enum-discrim-range-overflow.rs
diff --git a/src/test/ui/structs-enums/enum-discrim-width-stuff.rs b/tests/ui/structs-enums/enum-discrim-width-stuff.rs
index f278ae2d0..f278ae2d0 100644
--- a/src/test/ui/structs-enums/enum-discrim-width-stuff.rs
+++ b/tests/ui/structs-enums/enum-discrim-width-stuff.rs
diff --git a/src/test/ui/structs-enums/enum-disr-val-pretty.rs b/tests/ui/structs-enums/enum-disr-val-pretty.rs
index ef1333e0e..ef1333e0e 100644
--- a/src/test/ui/structs-enums/enum-disr-val-pretty.rs
+++ b/tests/ui/structs-enums/enum-disr-val-pretty.rs
diff --git a/src/test/ui/structs-enums/enum-export-inheritance.rs b/tests/ui/structs-enums/enum-export-inheritance.rs
index 6a36a004a..6a36a004a 100644
--- a/src/test/ui/structs-enums/enum-export-inheritance.rs
+++ b/tests/ui/structs-enums/enum-export-inheritance.rs
diff --git a/src/test/ui/structs-enums/enum-layout-optimization.rs b/tests/ui/structs-enums/enum-layout-optimization.rs
index 05d297906..05d297906 100644
--- a/src/test/ui/structs-enums/enum-layout-optimization.rs
+++ b/tests/ui/structs-enums/enum-layout-optimization.rs
diff --git a/src/test/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs b/tests/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs
index 7d15d607d..7d15d607d 100644
--- a/src/test/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs
+++ b/tests/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs
diff --git a/src/test/ui/structs-enums/enum-non-c-like-repr-c.rs b/tests/ui/structs-enums/enum-non-c-like-repr-c.rs
index fc9efdeca..fc9efdeca 100644
--- a/src/test/ui/structs-enums/enum-non-c-like-repr-c.rs
+++ b/tests/ui/structs-enums/enum-non-c-like-repr-c.rs
diff --git a/src/test/ui/structs-enums/enum-non-c-like-repr-int.rs b/tests/ui/structs-enums/enum-non-c-like-repr-int.rs
index f9e96c1a0..f9e96c1a0 100644
--- a/src/test/ui/structs-enums/enum-non-c-like-repr-int.rs
+++ b/tests/ui/structs-enums/enum-non-c-like-repr-int.rs
diff --git a/src/test/ui/structs-enums/enum-null-pointer-opt.rs b/tests/ui/structs-enums/enum-null-pointer-opt.rs
index 85fa1eac2..85fa1eac2 100644
--- a/src/test/ui/structs-enums/enum-null-pointer-opt.rs
+++ b/tests/ui/structs-enums/enum-null-pointer-opt.rs
diff --git a/src/test/ui/structs-enums/enum-nullable-const-null-with-fields.rs b/tests/ui/structs-enums/enum-nullable-const-null-with-fields.rs
index ae267e798..ae267e798 100644
--- a/src/test/ui/structs-enums/enum-nullable-const-null-with-fields.rs
+++ b/tests/ui/structs-enums/enum-nullable-const-null-with-fields.rs
diff --git a/src/test/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs b/tests/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs
index a05cf8b93..a05cf8b93 100644
--- a/src/test/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs
+++ b/tests/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs
diff --git a/src/test/ui/structs-enums/enum-univariant-repr.rs b/tests/ui/structs-enums/enum-univariant-repr.rs
index 1e0f67887..1e0f67887 100644
--- a/src/test/ui/structs-enums/enum-univariant-repr.rs
+++ b/tests/ui/structs-enums/enum-univariant-repr.rs
diff --git a/src/test/ui/structs-enums/enum-variants.rs b/tests/ui/structs-enums/enum-variants.rs
index 9ac5aae72..9ac5aae72 100644
--- a/src/test/ui/structs-enums/enum-variants.rs
+++ b/tests/ui/structs-enums/enum-variants.rs
diff --git a/src/test/ui/structs-enums/enum-vec-initializer.rs b/tests/ui/structs-enums/enum-vec-initializer.rs
index 42ee8ba97..42ee8ba97 100644
--- a/src/test/ui/structs-enums/enum-vec-initializer.rs
+++ b/tests/ui/structs-enums/enum-vec-initializer.rs
diff --git a/src/test/ui/structs-enums/export-abstract-tag.rs b/tests/ui/structs-enums/export-abstract-tag.rs
index 76ac73321..76ac73321 100644
--- a/src/test/ui/structs-enums/export-abstract-tag.rs
+++ b/tests/ui/structs-enums/export-abstract-tag.rs
diff --git a/src/test/ui/structs-enums/export-tag-variant.rs b/tests/ui/structs-enums/export-tag-variant.rs
index 52e0aba09..52e0aba09 100644
--- a/src/test/ui/structs-enums/export-tag-variant.rs
+++ b/tests/ui/structs-enums/export-tag-variant.rs
diff --git a/src/test/ui/structs-enums/expr-if-struct.rs b/tests/ui/structs-enums/expr-if-struct.rs
index e62d47c6f..e62d47c6f 100644
--- a/src/test/ui/structs-enums/expr-if-struct.rs
+++ b/tests/ui/structs-enums/expr-if-struct.rs
diff --git a/src/test/ui/structs-enums/expr-match-struct.rs b/tests/ui/structs-enums/expr-match-struct.rs
index f0e8d8972..f0e8d8972 100644
--- a/src/test/ui/structs-enums/expr-match-struct.rs
+++ b/tests/ui/structs-enums/expr-match-struct.rs
diff --git a/src/test/ui/structs-enums/field-destruction-order.rs b/tests/ui/structs-enums/field-destruction-order.rs
index a75a742d9..a75a742d9 100644
--- a/src/test/ui/structs-enums/field-destruction-order.rs
+++ b/tests/ui/structs-enums/field-destruction-order.rs
diff --git a/src/test/ui/structs-enums/foreign-struct.rs b/tests/ui/structs-enums/foreign-struct.rs
index 00a23b354..00a23b354 100644
--- a/src/test/ui/structs-enums/foreign-struct.rs
+++ b/tests/ui/structs-enums/foreign-struct.rs
diff --git a/src/test/ui/structs-enums/functional-struct-upd.rs b/tests/ui/structs-enums/functional-struct-upd.rs
index 68ff73a08..68ff73a08 100644
--- a/src/test/ui/structs-enums/functional-struct-upd.rs
+++ b/tests/ui/structs-enums/functional-struct-upd.rs
diff --git a/src/test/ui/structs-enums/issue-1701.rs b/tests/ui/structs-enums/issue-1701.rs
index bae32a777..bae32a777 100644
--- a/src/test/ui/structs-enums/issue-1701.rs
+++ b/tests/ui/structs-enums/issue-1701.rs
diff --git a/src/test/ui/structs-enums/issue-2718-a.rs b/tests/ui/structs-enums/issue-2718-a.rs
index 6c4915845..6c4915845 100644
--- a/src/test/ui/structs-enums/issue-2718-a.rs
+++ b/tests/ui/structs-enums/issue-2718-a.rs
diff --git a/src/test/ui/structs-enums/issue-2718-a.stderr b/tests/ui/structs-enums/issue-2718-a.stderr
index 7ea620f38..7ea620f38 100644
--- a/src/test/ui/structs-enums/issue-2718-a.stderr
+++ b/tests/ui/structs-enums/issue-2718-a.stderr
diff --git a/src/test/ui/structs-enums/issue-38002.rs b/tests/ui/structs-enums/issue-38002.rs
index fdb31fc44..fdb31fc44 100644
--- a/src/test/ui/structs-enums/issue-38002.rs
+++ b/tests/ui/structs-enums/issue-38002.rs
diff --git a/src/test/ui/structs-enums/issue-50731.rs b/tests/ui/structs-enums/issue-50731.rs
index 209c1e127..209c1e127 100644
--- a/src/test/ui/structs-enums/issue-50731.rs
+++ b/tests/ui/structs-enums/issue-50731.rs
diff --git a/src/test/ui/structs-enums/ivec-tag.rs b/tests/ui/structs-enums/ivec-tag.rs
index c39368a2b..c39368a2b 100644
--- a/src/test/ui/structs-enums/ivec-tag.rs
+++ b/tests/ui/structs-enums/ivec-tag.rs
diff --git a/src/test/ui/structs-enums/module-qualified-struct-destructure.rs b/tests/ui/structs-enums/module-qualified-struct-destructure.rs
index 57be37cdf..57be37cdf 100644
--- a/src/test/ui/structs-enums/module-qualified-struct-destructure.rs
+++ b/tests/ui/structs-enums/module-qualified-struct-destructure.rs
diff --git a/src/test/ui/structs-enums/multiple-reprs.rs b/tests/ui/structs-enums/multiple-reprs.rs
index 4be503a0e..4be503a0e 100644
--- a/src/test/ui/structs-enums/multiple-reprs.rs
+++ b/tests/ui/structs-enums/multiple-reprs.rs
diff --git a/src/test/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs b/tests/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs
index 30cf64582..30cf64582 100644
--- a/src/test/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs
+++ b/tests/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs
diff --git a/src/test/ui/structs-enums/namespaced-enum-emulate-flat.rs b/tests/ui/structs-enums/namespaced-enum-emulate-flat.rs
index f6c395059..f6c395059 100644
--- a/src/test/ui/structs-enums/namespaced-enum-emulate-flat.rs
+++ b/tests/ui/structs-enums/namespaced-enum-emulate-flat.rs
diff --git a/src/test/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs b/tests/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs
index d2ccadea0..d2ccadea0 100644
--- a/src/test/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs
+++ b/tests/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs
diff --git a/src/test/ui/structs-enums/namespaced-enum-glob-import.rs b/tests/ui/structs-enums/namespaced-enum-glob-import.rs
index f36ac69dc..f36ac69dc 100644
--- a/src/test/ui/structs-enums/namespaced-enum-glob-import.rs
+++ b/tests/ui/structs-enums/namespaced-enum-glob-import.rs
diff --git a/src/test/ui/structs-enums/namespaced-enums-xcrate.rs b/tests/ui/structs-enums/namespaced-enums-xcrate.rs
index 5e10c3ec1..5e10c3ec1 100644
--- a/src/test/ui/structs-enums/namespaced-enums-xcrate.rs
+++ b/tests/ui/structs-enums/namespaced-enums-xcrate.rs
diff --git a/src/test/ui/structs-enums/namespaced-enums.rs b/tests/ui/structs-enums/namespaced-enums.rs
index 6a2602501..6a2602501 100644
--- a/src/test/ui/structs-enums/namespaced-enums.rs
+++ b/tests/ui/structs-enums/namespaced-enums.rs
diff --git a/src/test/ui/structs-enums/nested-enum-same-names.rs b/tests/ui/structs-enums/nested-enum-same-names.rs
index 111b9ba94..111b9ba94 100644
--- a/src/test/ui/structs-enums/nested-enum-same-names.rs
+++ b/tests/ui/structs-enums/nested-enum-same-names.rs
diff --git a/src/test/ui/structs-enums/newtype-struct-drop-run.rs b/tests/ui/structs-enums/newtype-struct-drop-run.rs
index 0754f3187..0754f3187 100644
--- a/src/test/ui/structs-enums/newtype-struct-drop-run.rs
+++ b/tests/ui/structs-enums/newtype-struct-drop-run.rs
diff --git a/src/test/ui/structs-enums/newtype-struct-with-dtor.rs b/tests/ui/structs-enums/newtype-struct-with-dtor.rs
index f73b492df..f73b492df 100644
--- a/src/test/ui/structs-enums/newtype-struct-with-dtor.rs
+++ b/tests/ui/structs-enums/newtype-struct-with-dtor.rs
diff --git a/src/test/ui/structs-enums/newtype-struct-xc-2.rs b/tests/ui/structs-enums/newtype-struct-xc-2.rs
index 40837321b..40837321b 100644
--- a/src/test/ui/structs-enums/newtype-struct-xc-2.rs
+++ b/tests/ui/structs-enums/newtype-struct-xc-2.rs
diff --git a/src/test/ui/structs-enums/newtype-struct-xc.rs b/tests/ui/structs-enums/newtype-struct-xc.rs
index 0c6466d97..0c6466d97 100644
--- a/src/test/ui/structs-enums/newtype-struct-xc.rs
+++ b/tests/ui/structs-enums/newtype-struct-xc.rs
diff --git a/src/test/ui/structs-enums/nonzero-enum.rs b/tests/ui/structs-enums/nonzero-enum.rs
index 15b571be5..15b571be5 100644
--- a/src/test/ui/structs-enums/nonzero-enum.rs
+++ b/tests/ui/structs-enums/nonzero-enum.rs
diff --git a/src/test/ui/structs-enums/numeric-fields.rs b/tests/ui/structs-enums/numeric-fields.rs
index 6ff3afc38..6ff3afc38 100644
--- a/src/test/ui/structs-enums/numeric-fields.rs
+++ b/tests/ui/structs-enums/numeric-fields.rs
diff --git a/src/test/ui/structs-enums/rec-align-u32.rs b/tests/ui/structs-enums/rec-align-u32.rs
index ee704198d..ee704198d 100644
--- a/src/test/ui/structs-enums/rec-align-u32.rs
+++ b/tests/ui/structs-enums/rec-align-u32.rs
diff --git a/src/test/ui/structs-enums/rec-align-u64.rs b/tests/ui/structs-enums/rec-align-u64.rs
index 40ede9705..40ede9705 100644
--- a/src/test/ui/structs-enums/rec-align-u64.rs
+++ b/tests/ui/structs-enums/rec-align-u64.rs
diff --git a/src/test/ui/structs-enums/rec-auto.rs b/tests/ui/structs-enums/rec-auto.rs
index c2ef13ede..c2ef13ede 100644
--- a/src/test/ui/structs-enums/rec-auto.rs
+++ b/tests/ui/structs-enums/rec-auto.rs
diff --git a/src/test/ui/structs-enums/rec-extend.rs b/tests/ui/structs-enums/rec-extend.rs
index 4c91cd185..4c91cd185 100644
--- a/src/test/ui/structs-enums/rec-extend.rs
+++ b/tests/ui/structs-enums/rec-extend.rs
diff --git a/src/test/ui/structs-enums/rec-tup.rs b/tests/ui/structs-enums/rec-tup.rs
index b85d28fdf..b85d28fdf 100644
--- a/src/test/ui/structs-enums/rec-tup.rs
+++ b/tests/ui/structs-enums/rec-tup.rs
diff --git a/src/test/ui/structs-enums/rec.rs b/tests/ui/structs-enums/rec.rs
index 82c84ebd6..82c84ebd6 100644
--- a/src/test/ui/structs-enums/rec.rs
+++ b/tests/ui/structs-enums/rec.rs
diff --git a/src/test/ui/structs-enums/record-pat.rs b/tests/ui/structs-enums/record-pat.rs
index 1acaf2a32..1acaf2a32 100644
--- a/src/test/ui/structs-enums/record-pat.rs
+++ b/tests/ui/structs-enums/record-pat.rs
diff --git a/src/test/ui/structs-enums/resource-in-struct.rs b/tests/ui/structs-enums/resource-in-struct.rs
index 9613ca62a..9613ca62a 100644
--- a/src/test/ui/structs-enums/resource-in-struct.rs
+++ b/tests/ui/structs-enums/resource-in-struct.rs
diff --git a/src/test/ui/structs-enums/simple-generic-tag.rs b/tests/ui/structs-enums/simple-generic-tag.rs
index dbd2834d4..dbd2834d4 100644
--- a/src/test/ui/structs-enums/simple-generic-tag.rs
+++ b/tests/ui/structs-enums/simple-generic-tag.rs
diff --git a/src/test/ui/structs-enums/simple-match-generic-tag.rs b/tests/ui/structs-enums/simple-match-generic-tag.rs
index 762fd49ad..762fd49ad 100644
--- a/src/test/ui/structs-enums/simple-match-generic-tag.rs
+++ b/tests/ui/structs-enums/simple-match-generic-tag.rs
diff --git a/src/test/ui/structs-enums/small-enum-range-edge.rs b/tests/ui/structs-enums/small-enum-range-edge.rs
index 306129479..306129479 100644
--- a/src/test/ui/structs-enums/small-enum-range-edge.rs
+++ b/tests/ui/structs-enums/small-enum-range-edge.rs
diff --git a/src/test/ui/structs-enums/small-enums-with-fields.rs b/tests/ui/structs-enums/small-enums-with-fields.rs
index 565ec1bd4..565ec1bd4 100644
--- a/src/test/ui/structs-enums/small-enums-with-fields.rs
+++ b/tests/ui/structs-enums/small-enums-with-fields.rs
diff --git a/src/test/ui/structs-enums/struct-aliases-xcrate.rs b/tests/ui/structs-enums/struct-aliases-xcrate.rs
index ffe7b22f8..ffe7b22f8 100644
--- a/src/test/ui/structs-enums/struct-aliases-xcrate.rs
+++ b/tests/ui/structs-enums/struct-aliases-xcrate.rs
diff --git a/src/test/ui/structs-enums/struct-aliases.rs b/tests/ui/structs-enums/struct-aliases.rs
index b7aeed7bc..b7aeed7bc 100644
--- a/src/test/ui/structs-enums/struct-aliases.rs
+++ b/tests/ui/structs-enums/struct-aliases.rs
diff --git a/src/test/ui/structs-enums/struct-destructuring-cross-crate.rs b/tests/ui/structs-enums/struct-destructuring-cross-crate.rs
index 19e0a0bbd..19e0a0bbd 100644
--- a/src/test/ui/structs-enums/struct-destructuring-cross-crate.rs
+++ b/tests/ui/structs-enums/struct-destructuring-cross-crate.rs
diff --git a/src/test/ui/structs-enums/struct-enum-ignoring-field-with-underscore.rs b/tests/ui/structs-enums/struct-enum-ignoring-field-with-underscore.rs
index c30b8a1e1..c30b8a1e1 100644
--- a/src/test/ui/structs-enums/struct-enum-ignoring-field-with-underscore.rs
+++ b/tests/ui/structs-enums/struct-enum-ignoring-field-with-underscore.rs
diff --git a/src/test/ui/structs-enums/struct-enum-ignoring-field-with-underscore.stderr b/tests/ui/structs-enums/struct-enum-ignoring-field-with-underscore.stderr
index 16f751444..16f751444 100644
--- a/src/test/ui/structs-enums/struct-enum-ignoring-field-with-underscore.stderr
+++ b/tests/ui/structs-enums/struct-enum-ignoring-field-with-underscore.stderr
diff --git a/src/test/ui/structs-enums/struct-field-shorthand.rs b/tests/ui/structs-enums/struct-field-shorthand.rs
index ed650c683..ed650c683 100644
--- a/src/test/ui/structs-enums/struct-field-shorthand.rs
+++ b/tests/ui/structs-enums/struct-field-shorthand.rs
diff --git a/src/test/ui/structs-enums/struct-like-variant-construct.rs b/tests/ui/structs-enums/struct-like-variant-construct.rs
index 60fc7ce39..60fc7ce39 100644
--- a/src/test/ui/structs-enums/struct-like-variant-construct.rs
+++ b/tests/ui/structs-enums/struct-like-variant-construct.rs
diff --git a/src/test/ui/structs-enums/struct-like-variant-match.rs b/tests/ui/structs-enums/struct-like-variant-match.rs
index ade1a6970..ade1a6970 100644
--- a/src/test/ui/structs-enums/struct-like-variant-match.rs
+++ b/tests/ui/structs-enums/struct-like-variant-match.rs
diff --git a/src/test/ui/structs-enums/struct-lit-functional-no-fields.rs b/tests/ui/structs-enums/struct-lit-functional-no-fields.rs
index f19604e95..f19604e95 100644
--- a/src/test/ui/structs-enums/struct-lit-functional-no-fields.rs
+++ b/tests/ui/structs-enums/struct-lit-functional-no-fields.rs
diff --git a/src/test/ui/structs-enums/struct-literal-dtor.rs b/tests/ui/structs-enums/struct-literal-dtor.rs
index 6d1b1dfb9..6d1b1dfb9 100644
--- a/src/test/ui/structs-enums/struct-literal-dtor.rs
+++ b/tests/ui/structs-enums/struct-literal-dtor.rs
diff --git a/src/test/ui/structs-enums/struct-new-as-field-name.rs b/tests/ui/structs-enums/struct-new-as-field-name.rs
index 641fc3c58..641fc3c58 100644
--- a/src/test/ui/structs-enums/struct-new-as-field-name.rs
+++ b/tests/ui/structs-enums/struct-new-as-field-name.rs
diff --git a/src/test/ui/structs-enums/struct-order-of-eval-1.rs b/tests/ui/structs-enums/struct-order-of-eval-1.rs
index f3fe99538..f3fe99538 100644
--- a/src/test/ui/structs-enums/struct-order-of-eval-1.rs
+++ b/tests/ui/structs-enums/struct-order-of-eval-1.rs
diff --git a/src/test/ui/structs-enums/struct-order-of-eval-2.rs b/tests/ui/structs-enums/struct-order-of-eval-2.rs
index a4e0edc97..a4e0edc97 100644
--- a/src/test/ui/structs-enums/struct-order-of-eval-2.rs
+++ b/tests/ui/structs-enums/struct-order-of-eval-2.rs
diff --git a/src/test/ui/structs-enums/struct-order-of-eval-3.rs b/tests/ui/structs-enums/struct-order-of-eval-3.rs
index 60887f8d0..60887f8d0 100644
--- a/src/test/ui/structs-enums/struct-order-of-eval-3.rs
+++ b/tests/ui/structs-enums/struct-order-of-eval-3.rs
diff --git a/src/test/ui/structs-enums/struct-order-of-eval-4.rs b/tests/ui/structs-enums/struct-order-of-eval-4.rs
index 547df6318..547df6318 100644
--- a/src/test/ui/structs-enums/struct-order-of-eval-4.rs
+++ b/tests/ui/structs-enums/struct-order-of-eval-4.rs
diff --git a/src/test/ui/structs-enums/struct-partial-move-1.rs b/tests/ui/structs-enums/struct-partial-move-1.rs
index c15701593..c15701593 100644
--- a/src/test/ui/structs-enums/struct-partial-move-1.rs
+++ b/tests/ui/structs-enums/struct-partial-move-1.rs
diff --git a/src/test/ui/structs-enums/struct-partial-move-2.rs b/tests/ui/structs-enums/struct-partial-move-2.rs
index 4315e5c29..4315e5c29 100644
--- a/src/test/ui/structs-enums/struct-partial-move-2.rs
+++ b/tests/ui/structs-enums/struct-partial-move-2.rs
diff --git a/src/test/ui/structs-enums/struct-path-associated-type.rs b/tests/ui/structs-enums/struct-path-associated-type.rs
index 2235dfe4b..2235dfe4b 100644
--- a/src/test/ui/structs-enums/struct-path-associated-type.rs
+++ b/tests/ui/structs-enums/struct-path-associated-type.rs
diff --git a/src/test/ui/structs-enums/struct-path-self.rs b/tests/ui/structs-enums/struct-path-self.rs
index e7a59858f..e7a59858f 100644
--- a/src/test/ui/structs-enums/struct-path-self.rs
+++ b/tests/ui/structs-enums/struct-path-self.rs
diff --git a/src/test/ui/structs-enums/struct-pattern-matching.rs b/tests/ui/structs-enums/struct-pattern-matching.rs
index 89361bf24..89361bf24 100644
--- a/src/test/ui/structs-enums/struct-pattern-matching.rs
+++ b/tests/ui/structs-enums/struct-pattern-matching.rs
diff --git a/src/test/ui/structs-enums/struct-rec/issue-74224.rs b/tests/ui/structs-enums/struct-rec/issue-74224.rs
index f3b72c5df..f3b72c5df 100644
--- a/src/test/ui/structs-enums/struct-rec/issue-74224.rs
+++ b/tests/ui/structs-enums/struct-rec/issue-74224.rs
diff --git a/src/test/ui/structs-enums/struct-rec/issue-74224.stderr b/tests/ui/structs-enums/struct-rec/issue-74224.stderr
index f1d50bc8a..f1d50bc8a 100644
--- a/src/test/ui/structs-enums/struct-rec/issue-74224.stderr
+++ b/tests/ui/structs-enums/struct-rec/issue-74224.stderr
diff --git a/src/test/ui/structs-enums/struct-rec/issue-84611.rs b/tests/ui/structs-enums/struct-rec/issue-84611.rs
index 4c356af3e..4c356af3e 100644
--- a/src/test/ui/structs-enums/struct-rec/issue-84611.rs
+++ b/tests/ui/structs-enums/struct-rec/issue-84611.rs
diff --git a/src/test/ui/structs-enums/struct-rec/issue-84611.stderr b/tests/ui/structs-enums/struct-rec/issue-84611.stderr
index 536f54e3e..536f54e3e 100644
--- a/src/test/ui/structs-enums/struct-rec/issue-84611.stderr
+++ b/tests/ui/structs-enums/struct-rec/issue-84611.stderr
diff --git a/src/test/ui/structs-enums/struct-rec/mutual-struct-recursion.rs b/tests/ui/structs-enums/struct-rec/mutual-struct-recursion.rs
index 3bfce8b4f..3bfce8b4f 100644
--- a/src/test/ui/structs-enums/struct-rec/mutual-struct-recursion.rs
+++ b/tests/ui/structs-enums/struct-rec/mutual-struct-recursion.rs
diff --git a/src/test/ui/structs-enums/struct-rec/mutual-struct-recursion.stderr b/tests/ui/structs-enums/struct-rec/mutual-struct-recursion.stderr
index 881bc2819..881bc2819 100644
--- a/src/test/ui/structs-enums/struct-rec/mutual-struct-recursion.stderr
+++ b/tests/ui/structs-enums/struct-rec/mutual-struct-recursion.stderr
diff --git a/src/test/ui/structs-enums/struct-variant-field-visibility.rs b/tests/ui/structs-enums/struct-variant-field-visibility.rs
index 7896c829a..7896c829a 100644
--- a/src/test/ui/structs-enums/struct-variant-field-visibility.rs
+++ b/tests/ui/structs-enums/struct-variant-field-visibility.rs
diff --git a/src/test/ui/structs-enums/struct_variant_xc.rs b/tests/ui/structs-enums/struct_variant_xc.rs
index 9c8d1a69a..9c8d1a69a 100644
--- a/src/test/ui/structs-enums/struct_variant_xc.rs
+++ b/tests/ui/structs-enums/struct_variant_xc.rs
diff --git a/src/test/ui/structs-enums/struct_variant_xc_match.rs b/tests/ui/structs-enums/struct_variant_xc_match.rs
index 5358d13fa..5358d13fa 100644
--- a/src/test/ui/structs-enums/struct_variant_xc_match.rs
+++ b/tests/ui/structs-enums/struct_variant_xc_match.rs
diff --git a/src/test/ui/structs-enums/tag-align-dyn-u64.rs b/tests/ui/structs-enums/tag-align-dyn-u64.rs
index 3f7a5e3e5..3f7a5e3e5 100644
--- a/src/test/ui/structs-enums/tag-align-dyn-u64.rs
+++ b/tests/ui/structs-enums/tag-align-dyn-u64.rs
diff --git a/src/test/ui/structs-enums/tag-align-dyn-variants.rs b/tests/ui/structs-enums/tag-align-dyn-variants.rs
index 4d075b04c..4d075b04c 100644
--- a/src/test/ui/structs-enums/tag-align-dyn-variants.rs
+++ b/tests/ui/structs-enums/tag-align-dyn-variants.rs
diff --git a/src/test/ui/structs-enums/tag-align-shape.rs b/tests/ui/structs-enums/tag-align-shape.rs
index ce5995823..ce5995823 100644
--- a/src/test/ui/structs-enums/tag-align-shape.rs
+++ b/tests/ui/structs-enums/tag-align-shape.rs
diff --git a/src/test/ui/structs-enums/tag-align-u64.rs b/tests/ui/structs-enums/tag-align-u64.rs
index 684b27cd0..684b27cd0 100644
--- a/src/test/ui/structs-enums/tag-align-u64.rs
+++ b/tests/ui/structs-enums/tag-align-u64.rs
diff --git a/src/test/ui/structs-enums/tag-disr-val-shape.rs b/tests/ui/structs-enums/tag-disr-val-shape.rs
index 51052626c..51052626c 100644
--- a/src/test/ui/structs-enums/tag-disr-val-shape.rs
+++ b/tests/ui/structs-enums/tag-disr-val-shape.rs
diff --git a/src/test/ui/structs-enums/tag-exports.rs b/tests/ui/structs-enums/tag-exports.rs
index 1bcb7d35d..1bcb7d35d 100644
--- a/src/test/ui/structs-enums/tag-exports.rs
+++ b/tests/ui/structs-enums/tag-exports.rs
diff --git a/src/test/ui/structs-enums/tag-in-block.rs b/tests/ui/structs-enums/tag-in-block.rs
index 03d4dd9b0..03d4dd9b0 100644
--- a/src/test/ui/structs-enums/tag-in-block.rs
+++ b/tests/ui/structs-enums/tag-in-block.rs
diff --git a/src/test/ui/structs-enums/tag-variant-disr-type-mismatch.rs b/tests/ui/structs-enums/tag-variant-disr-type-mismatch.rs
index 3f59db383..3f59db383 100644
--- a/src/test/ui/structs-enums/tag-variant-disr-type-mismatch.rs
+++ b/tests/ui/structs-enums/tag-variant-disr-type-mismatch.rs
diff --git a/src/test/ui/structs-enums/tag-variant-disr-val.rs b/tests/ui/structs-enums/tag-variant-disr-val.rs
index 297d85c58..297d85c58 100644
--- a/src/test/ui/structs-enums/tag-variant-disr-val.rs
+++ b/tests/ui/structs-enums/tag-variant-disr-val.rs
diff --git a/src/test/ui/structs-enums/tag.rs b/tests/ui/structs-enums/tag.rs
index 5fcd64b7c..5fcd64b7c 100644
--- a/src/test/ui/structs-enums/tag.rs
+++ b/tests/ui/structs-enums/tag.rs
diff --git a/src/test/ui/structs-enums/tuple-struct-construct.rs b/tests/ui/structs-enums/tuple-struct-construct.rs
index fbf97e6b2..fbf97e6b2 100644
--- a/src/test/ui/structs-enums/tuple-struct-construct.rs
+++ b/tests/ui/structs-enums/tuple-struct-construct.rs
diff --git a/src/test/ui/structs-enums/tuple-struct-constructor-pointer.rs b/tests/ui/structs-enums/tuple-struct-constructor-pointer.rs
index 23f065163..23f065163 100644
--- a/src/test/ui/structs-enums/tuple-struct-constructor-pointer.rs
+++ b/tests/ui/structs-enums/tuple-struct-constructor-pointer.rs
diff --git a/src/test/ui/structs-enums/tuple-struct-destructuring.rs b/tests/ui/structs-enums/tuple-struct-destructuring.rs
index dff87ead0..dff87ead0 100644
--- a/src/test/ui/structs-enums/tuple-struct-destructuring.rs
+++ b/tests/ui/structs-enums/tuple-struct-destructuring.rs
diff --git a/src/test/ui/structs-enums/tuple-struct-matching.rs b/tests/ui/structs-enums/tuple-struct-matching.rs
index 432be1d1f..432be1d1f 100644
--- a/src/test/ui/structs-enums/tuple-struct-matching.rs
+++ b/tests/ui/structs-enums/tuple-struct-matching.rs
diff --git a/src/test/ui/structs-enums/tuple-struct-trivial.rs b/tests/ui/structs-enums/tuple-struct-trivial.rs
index c8651fd29..c8651fd29 100644
--- a/src/test/ui/structs-enums/tuple-struct-trivial.rs
+++ b/tests/ui/structs-enums/tuple-struct-trivial.rs
diff --git a/src/test/ui/structs-enums/type-sizes.rs b/tests/ui/structs-enums/type-sizes.rs
index 63e2f3150..63e2f3150 100644
--- a/src/test/ui/structs-enums/type-sizes.rs
+++ b/tests/ui/structs-enums/type-sizes.rs
diff --git a/src/test/ui/structs-enums/uninstantiable-struct.rs b/tests/ui/structs-enums/uninstantiable-struct.rs
index b24effe5a..b24effe5a 100644
--- a/src/test/ui/structs-enums/uninstantiable-struct.rs
+++ b/tests/ui/structs-enums/uninstantiable-struct.rs
diff --git a/src/test/ui/structs-enums/unit-like-struct-drop-run.rs b/tests/ui/structs-enums/unit-like-struct-drop-run.rs
index 1e9c269a4..1e9c269a4 100644
--- a/src/test/ui/structs-enums/unit-like-struct-drop-run.rs
+++ b/tests/ui/structs-enums/unit-like-struct-drop-run.rs
diff --git a/src/test/ui/structs-enums/unit-like-struct.rs b/tests/ui/structs-enums/unit-like-struct.rs
index 636ec9926..636ec9926 100644
--- a/src/test/ui/structs-enums/unit-like-struct.rs
+++ b/tests/ui/structs-enums/unit-like-struct.rs
diff --git a/src/test/ui/structs-enums/variant-structs-trivial.rs b/tests/ui/structs-enums/variant-structs-trivial.rs
index 31fa610a6..31fa610a6 100644
--- a/src/test/ui/structs-enums/variant-structs-trivial.rs
+++ b/tests/ui/structs-enums/variant-structs-trivial.rs
diff --git a/src/test/ui/structs/auxiliary/struct_field_privacy.rs b/tests/ui/structs/auxiliary/struct_field_privacy.rs
index 9765af1a7..9765af1a7 100644
--- a/src/test/ui/structs/auxiliary/struct_field_privacy.rs
+++ b/tests/ui/structs/auxiliary/struct_field_privacy.rs
diff --git a/src/test/ui/structs/auxiliary/struct_variant_privacy.rs b/tests/ui/structs/auxiliary/struct_variant_privacy.rs
index 425ec0e96..425ec0e96 100644
--- a/src/test/ui/structs/auxiliary/struct_variant_privacy.rs
+++ b/tests/ui/structs/auxiliary/struct_variant_privacy.rs
diff --git a/src/test/ui/structs/incomplete-fn-in-struct-definition.rs b/tests/ui/structs/incomplete-fn-in-struct-definition.rs
index cd8a79ba6..cd8a79ba6 100644
--- a/src/test/ui/structs/incomplete-fn-in-struct-definition.rs
+++ b/tests/ui/structs/incomplete-fn-in-struct-definition.rs
diff --git a/src/test/ui/structs/incomplete-fn-in-struct-definition.stderr b/tests/ui/structs/incomplete-fn-in-struct-definition.stderr
index 0d12ba9c9..0d12ba9c9 100644
--- a/src/test/ui/structs/incomplete-fn-in-struct-definition.stderr
+++ b/tests/ui/structs/incomplete-fn-in-struct-definition.stderr
diff --git a/src/test/ui/structs/issue-80853.rs b/tests/ui/structs/issue-80853.rs
index 242d0af95..242d0af95 100644
--- a/src/test/ui/structs/issue-80853.rs
+++ b/tests/ui/structs/issue-80853.rs
diff --git a/src/test/ui/structs/issue-80853.stderr b/tests/ui/structs/issue-80853.stderr
index 1c7d52b6d..1c7d52b6d 100644
--- a/src/test/ui/structs/issue-80853.stderr
+++ b/tests/ui/structs/issue-80853.stderr
diff --git a/src/test/ui/structs/large-records.rs b/tests/ui/structs/large-records.rs
index 7f850a94e..7f850a94e 100644
--- a/src/test/ui/structs/large-records.rs
+++ b/tests/ui/structs/large-records.rs
diff --git a/src/test/ui/structs/multi-line-fru-suggestion.rs b/tests/ui/structs/multi-line-fru-suggestion.rs
index 7b2b13914..7b2b13914 100644
--- a/src/test/ui/structs/multi-line-fru-suggestion.rs
+++ b/tests/ui/structs/multi-line-fru-suggestion.rs
diff --git a/src/test/ui/structs/multi-line-fru-suggestion.stderr b/tests/ui/structs/multi-line-fru-suggestion.stderr
index 8bbd3ace7..8bbd3ace7 100644
--- a/src/test/ui/structs/multi-line-fru-suggestion.stderr
+++ b/tests/ui/structs/multi-line-fru-suggestion.stderr
diff --git a/src/test/ui/structs/rhs-type.rs b/tests/ui/structs/rhs-type.rs
index c48e7c08e..c48e7c08e 100644
--- a/src/test/ui/structs/rhs-type.rs
+++ b/tests/ui/structs/rhs-type.rs
diff --git a/src/test/ui/structs/struct-base-wrong-type.rs b/tests/ui/structs/struct-base-wrong-type.rs
index b64c6b499..b64c6b499 100644
--- a/src/test/ui/structs/struct-base-wrong-type.rs
+++ b/tests/ui/structs/struct-base-wrong-type.rs
diff --git a/src/test/ui/structs/struct-base-wrong-type.stderr b/tests/ui/structs/struct-base-wrong-type.stderr
index b039ce2cc..b039ce2cc 100644
--- a/src/test/ui/structs/struct-base-wrong-type.stderr
+++ b/tests/ui/structs/struct-base-wrong-type.stderr
diff --git a/src/test/ui/structs/struct-duplicate-comma.fixed b/tests/ui/structs/struct-duplicate-comma.fixed
index c804cf57a..c804cf57a 100644
--- a/src/test/ui/structs/struct-duplicate-comma.fixed
+++ b/tests/ui/structs/struct-duplicate-comma.fixed
diff --git a/src/test/ui/structs/struct-duplicate-comma.rs b/tests/ui/structs/struct-duplicate-comma.rs
index db2e7cb3d..db2e7cb3d 100644
--- a/src/test/ui/structs/struct-duplicate-comma.rs
+++ b/tests/ui/structs/struct-duplicate-comma.rs
diff --git a/src/test/ui/structs/struct-duplicate-comma.stderr b/tests/ui/structs/struct-duplicate-comma.stderr
index 834b3c5c1..834b3c5c1 100644
--- a/src/test/ui/structs/struct-duplicate-comma.stderr
+++ b/tests/ui/structs/struct-duplicate-comma.stderr
diff --git a/src/test/ui/structs/struct-field-cfg.rs b/tests/ui/structs/struct-field-cfg.rs
index 42cab8ab9..42cab8ab9 100644
--- a/src/test/ui/structs/struct-field-cfg.rs
+++ b/tests/ui/structs/struct-field-cfg.rs
diff --git a/src/test/ui/structs/struct-field-cfg.stderr b/tests/ui/structs/struct-field-cfg.stderr
index 5ec47c093..5ec47c093 100644
--- a/src/test/ui/structs/struct-field-cfg.stderr
+++ b/tests/ui/structs/struct-field-cfg.stderr
diff --git a/src/test/ui/structs/struct-field-init-syntax.rs b/tests/ui/structs/struct-field-init-syntax.rs
index 161f7e93a..161f7e93a 100644
--- a/src/test/ui/structs/struct-field-init-syntax.rs
+++ b/tests/ui/structs/struct-field-init-syntax.rs
diff --git a/src/test/ui/structs/struct-field-init-syntax.stderr b/tests/ui/structs/struct-field-init-syntax.stderr
index 0b72c5cf7..0b72c5cf7 100644
--- a/src/test/ui/structs/struct-field-init-syntax.stderr
+++ b/tests/ui/structs/struct-field-init-syntax.stderr
diff --git a/src/test/ui/structs/struct-field-privacy.rs b/tests/ui/structs/struct-field-privacy.rs
index 898ca475c..898ca475c 100644
--- a/src/test/ui/structs/struct-field-privacy.rs
+++ b/tests/ui/structs/struct-field-privacy.rs
diff --git a/src/test/ui/structs/struct-field-privacy.stderr b/tests/ui/structs/struct-field-privacy.stderr
index ee83e0d6c..ee83e0d6c 100644
--- a/src/test/ui/structs/struct-field-privacy.stderr
+++ b/tests/ui/structs/struct-field-privacy.stderr
diff --git a/src/test/ui/structs/struct-fields-decl-dupe.rs b/tests/ui/structs/struct-fields-decl-dupe.rs
index 6ddf3d976..6ddf3d976 100644
--- a/src/test/ui/structs/struct-fields-decl-dupe.rs
+++ b/tests/ui/structs/struct-fields-decl-dupe.rs
diff --git a/src/test/ui/structs/struct-fields-decl-dupe.stderr b/tests/ui/structs/struct-fields-decl-dupe.stderr
index d7ce9bb89..d7ce9bb89 100644
--- a/src/test/ui/structs/struct-fields-decl-dupe.stderr
+++ b/tests/ui/structs/struct-fields-decl-dupe.stderr
diff --git a/src/test/ui/structs/struct-fields-dupe.rs b/tests/ui/structs/struct-fields-dupe.rs
index 2fa25a335..2fa25a335 100644
--- a/src/test/ui/structs/struct-fields-dupe.rs
+++ b/tests/ui/structs/struct-fields-dupe.rs
diff --git a/src/test/ui/structs/struct-fields-dupe.stderr b/tests/ui/structs/struct-fields-dupe.stderr
index aaf2533dc..aaf2533dc 100644
--- a/src/test/ui/structs/struct-fields-dupe.stderr
+++ b/tests/ui/structs/struct-fields-dupe.stderr
diff --git a/src/test/ui/structs/struct-fields-hints-no-dupe.rs b/tests/ui/structs/struct-fields-hints-no-dupe.rs
index 987cf726f..987cf726f 100644
--- a/src/test/ui/structs/struct-fields-hints-no-dupe.rs
+++ b/tests/ui/structs/struct-fields-hints-no-dupe.rs
diff --git a/src/test/ui/structs/struct-fields-hints-no-dupe.stderr b/tests/ui/structs/struct-fields-hints-no-dupe.stderr
index 1a88f2693..1a88f2693 100644
--- a/src/test/ui/structs/struct-fields-hints-no-dupe.stderr
+++ b/tests/ui/structs/struct-fields-hints-no-dupe.stderr
diff --git a/src/test/ui/structs/struct-fields-hints.rs b/tests/ui/structs/struct-fields-hints.rs
index 08df0930e..08df0930e 100644
--- a/src/test/ui/structs/struct-fields-hints.rs
+++ b/tests/ui/structs/struct-fields-hints.rs
diff --git a/src/test/ui/structs/struct-fields-hints.stderr b/tests/ui/structs/struct-fields-hints.stderr
index 3b8a2b5c7..3b8a2b5c7 100644
--- a/src/test/ui/structs/struct-fields-hints.stderr
+++ b/tests/ui/structs/struct-fields-hints.stderr
diff --git a/src/test/ui/structs/struct-fields-missing.rs b/tests/ui/structs/struct-fields-missing.rs
index 0c7919d02..0c7919d02 100644
--- a/src/test/ui/structs/struct-fields-missing.rs
+++ b/tests/ui/structs/struct-fields-missing.rs
diff --git a/src/test/ui/structs/struct-fields-missing.stderr b/tests/ui/structs/struct-fields-missing.stderr
index b3e42a948..b3e42a948 100644
--- a/src/test/ui/structs/struct-fields-missing.stderr
+++ b/tests/ui/structs/struct-fields-missing.stderr
diff --git a/src/test/ui/structs/struct-fields-shorthand-unresolved.rs b/tests/ui/structs/struct-fields-shorthand-unresolved.rs
index caad14916..caad14916 100644
--- a/src/test/ui/structs/struct-fields-shorthand-unresolved.rs
+++ b/tests/ui/structs/struct-fields-shorthand-unresolved.rs
diff --git a/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr b/tests/ui/structs/struct-fields-shorthand-unresolved.stderr
index 09fc4f7ee..09fc4f7ee 100644
--- a/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr
+++ b/tests/ui/structs/struct-fields-shorthand-unresolved.stderr
diff --git a/src/test/ui/structs/struct-fields-shorthand.rs b/tests/ui/structs/struct-fields-shorthand.rs
index 1bdcc8315..1bdcc8315 100644
--- a/src/test/ui/structs/struct-fields-shorthand.rs
+++ b/tests/ui/structs/struct-fields-shorthand.rs
diff --git a/src/test/ui/structs/struct-fields-shorthand.stderr b/tests/ui/structs/struct-fields-shorthand.stderr
index a285a3921..a285a3921 100644
--- a/src/test/ui/structs/struct-fields-shorthand.stderr
+++ b/tests/ui/structs/struct-fields-shorthand.stderr
diff --git a/src/test/ui/structs/struct-fields-too-many.rs b/tests/ui/structs/struct-fields-too-many.rs
index 8be8dcbf1..8be8dcbf1 100644
--- a/src/test/ui/structs/struct-fields-too-many.rs
+++ b/tests/ui/structs/struct-fields-too-many.rs
diff --git a/src/test/ui/structs/struct-fields-too-many.stderr b/tests/ui/structs/struct-fields-too-many.stderr
index a1b7a7a31..a1b7a7a31 100644
--- a/src/test/ui/structs/struct-fields-too-many.stderr
+++ b/tests/ui/structs/struct-fields-too-many.stderr
diff --git a/src/test/ui/structs/struct-fields-typo.rs b/tests/ui/structs/struct-fields-typo.rs
index 0e9b2ae51..0e9b2ae51 100644
--- a/src/test/ui/structs/struct-fields-typo.rs
+++ b/tests/ui/structs/struct-fields-typo.rs
diff --git a/src/test/ui/structs/struct-fields-typo.stderr b/tests/ui/structs/struct-fields-typo.stderr
index 6949a0a4a..6949a0a4a 100644
--- a/src/test/ui/structs/struct-fields-typo.stderr
+++ b/tests/ui/structs/struct-fields-typo.stderr
diff --git a/src/test/ui/structs/struct-fn-in-definition.rs b/tests/ui/structs/struct-fn-in-definition.rs
index 7f48f55fe..7f48f55fe 100644
--- a/src/test/ui/structs/struct-fn-in-definition.rs
+++ b/tests/ui/structs/struct-fn-in-definition.rs
diff --git a/src/test/ui/structs/struct-fn-in-definition.stderr b/tests/ui/structs/struct-fn-in-definition.stderr
index 439c86ec2..439c86ec2 100644
--- a/src/test/ui/structs/struct-fn-in-definition.stderr
+++ b/tests/ui/structs/struct-fn-in-definition.stderr
diff --git a/src/test/ui/structs/struct-missing-comma.fixed b/tests/ui/structs/struct-missing-comma.fixed
index a28179ba2..a28179ba2 100644
--- a/src/test/ui/structs/struct-missing-comma.fixed
+++ b/tests/ui/structs/struct-missing-comma.fixed
diff --git a/src/test/ui/structs/struct-missing-comma.rs b/tests/ui/structs/struct-missing-comma.rs
index b6d6c9b8f..b6d6c9b8f 100644
--- a/src/test/ui/structs/struct-missing-comma.rs
+++ b/tests/ui/structs/struct-missing-comma.rs
diff --git a/src/test/ui/structs/struct-missing-comma.stderr b/tests/ui/structs/struct-missing-comma.stderr
index eceec65e7..eceec65e7 100644
--- a/src/test/ui/structs/struct-missing-comma.stderr
+++ b/tests/ui/structs/struct-missing-comma.stderr
diff --git a/src/test/ui/structs/struct-pat-derived-error.rs b/tests/ui/structs/struct-pat-derived-error.rs
index f49a8ff8b..f49a8ff8b 100644
--- a/src/test/ui/structs/struct-pat-derived-error.rs
+++ b/tests/ui/structs/struct-pat-derived-error.rs
diff --git a/src/test/ui/structs/struct-pat-derived-error.stderr b/tests/ui/structs/struct-pat-derived-error.stderr
index a91e47657..a91e47657 100644
--- a/src/test/ui/structs/struct-pat-derived-error.stderr
+++ b/tests/ui/structs/struct-pat-derived-error.stderr
diff --git a/src/test/ui/structs/struct-path-alias-bounds.rs b/tests/ui/structs/struct-path-alias-bounds.rs
index 1e2c4b836..1e2c4b836 100644
--- a/src/test/ui/structs/struct-path-alias-bounds.rs
+++ b/tests/ui/structs/struct-path-alias-bounds.rs
diff --git a/src/test/ui/structs/struct-path-alias-bounds.stderr b/tests/ui/structs/struct-path-alias-bounds.stderr
index 266291f62..266291f62 100644
--- a/src/test/ui/structs/struct-path-alias-bounds.stderr
+++ b/tests/ui/structs/struct-path-alias-bounds.stderr
diff --git a/src/test/ui/structs/struct-path-associated-type.rs b/tests/ui/structs/struct-path-associated-type.rs
index 2dd7174a9..2dd7174a9 100644
--- a/src/test/ui/structs/struct-path-associated-type.rs
+++ b/tests/ui/structs/struct-path-associated-type.rs
diff --git a/src/test/ui/structs/struct-path-associated-type.stderr b/tests/ui/structs/struct-path-associated-type.stderr
index abb445214..ca5f0b7e2 100644
--- a/src/test/ui/structs/struct-path-associated-type.stderr
+++ b/tests/ui/structs/struct-path-associated-type.stderr
@@ -48,19 +48,19 @@ error[E0223]: ambiguous associated type
   --> $DIR/struct-path-associated-type.rs:32:13
    |
 LL |     let s = S::A {};
-   |             ^^^^ help: use fully-qualified syntax: `<S as Trait>::A`
+   |             ^^^^ help: use the fully-qualified path: `<S as Tr>::A`
 
 error[E0223]: ambiguous associated type
   --> $DIR/struct-path-associated-type.rs:33:13
    |
 LL |     let z = S::A::<u8> {};
-   |             ^^^^ help: use fully-qualified syntax: `<S as Trait>::A`
+   |             ^^^^ help: use the fully-qualified path: `<S as Tr>::A`
 
 error[E0223]: ambiguous associated type
   --> $DIR/struct-path-associated-type.rs:35:9
    |
 LL |         S::A {} => {}
-   |         ^^^^ help: use fully-qualified syntax: `<S as Trait>::A`
+   |         ^^^^ help: use the fully-qualified path: `<S as Tr>::A`
 
 error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/structs/struct-path-self-type-mismatch.rs b/tests/ui/structs/struct-path-self-type-mismatch.rs
index c0c557eca..c0c557eca 100644
--- a/src/test/ui/structs/struct-path-self-type-mismatch.rs
+++ b/tests/ui/structs/struct-path-self-type-mismatch.rs
diff --git a/src/test/ui/structs/struct-path-self-type-mismatch.stderr b/tests/ui/structs/struct-path-self-type-mismatch.stderr
index b55a2cbf7..b55a2cbf7 100644
--- a/src/test/ui/structs/struct-path-self-type-mismatch.stderr
+++ b/tests/ui/structs/struct-path-self-type-mismatch.stderr
diff --git a/src/test/ui/structs/struct-path-self.rs b/tests/ui/structs/struct-path-self.rs
index 6e529c7ed..6e529c7ed 100644
--- a/src/test/ui/structs/struct-path-self.rs
+++ b/tests/ui/structs/struct-path-self.rs
diff --git a/src/test/ui/structs/struct-path-self.stderr b/tests/ui/structs/struct-path-self.stderr
index c2a8623f9..c2a8623f9 100644
--- a/src/test/ui/structs/struct-path-self.stderr
+++ b/tests/ui/structs/struct-path-self.stderr
diff --git a/src/test/ui/structs/struct-record-suggestion.fixed b/tests/ui/structs/struct-record-suggestion.fixed
index d93a62185..d93a62185 100644
--- a/src/test/ui/structs/struct-record-suggestion.fixed
+++ b/tests/ui/structs/struct-record-suggestion.fixed
diff --git a/src/test/ui/structs/struct-record-suggestion.rs b/tests/ui/structs/struct-record-suggestion.rs
index f0fd1c94e..f0fd1c94e 100644
--- a/src/test/ui/structs/struct-record-suggestion.rs
+++ b/tests/ui/structs/struct-record-suggestion.rs
diff --git a/src/test/ui/structs/struct-record-suggestion.stderr b/tests/ui/structs/struct-record-suggestion.stderr
index f4fd655e6..9b751d1b6 100644
--- a/src/test/ui/structs/struct-record-suggestion.stderr
+++ b/tests/ui/structs/struct-record-suggestion.stderr
@@ -18,7 +18,7 @@ error[E0308]: mismatched types
   --> $DIR/struct-record-suggestion.rs:23:20
    |
 LL |     let q = B { b: 1..Default::default() };
-   |                    ^^^^^^^^^^^^^^^^^^^^^ expected `u32`, found struct `std::ops::Range`
+   |                    ^^^^^^^^^^^^^^^^^^^^^ expected `u32`, found struct `Range`
    |
    = note: expected type `u32`
             found struct `std::ops::Range<{integer}>`
diff --git a/src/test/ui/structs/struct-tuple-field-names.rs b/tests/ui/structs/struct-tuple-field-names.rs
index 7bd54af1d..7bd54af1d 100644
--- a/src/test/ui/structs/struct-tuple-field-names.rs
+++ b/tests/ui/structs/struct-tuple-field-names.rs
diff --git a/src/test/ui/structs/struct-tuple-field-names.stderr b/tests/ui/structs/struct-tuple-field-names.stderr
index 5494c29a6..5494c29a6 100644
--- a/src/test/ui/structs/struct-tuple-field-names.stderr
+++ b/tests/ui/structs/struct-tuple-field-names.stderr
diff --git a/src/test/ui/structs/struct-variant-privacy-xc.rs b/tests/ui/structs/struct-variant-privacy-xc.rs
index 763ab9527..763ab9527 100644
--- a/src/test/ui/structs/struct-variant-privacy-xc.rs
+++ b/tests/ui/structs/struct-variant-privacy-xc.rs
diff --git a/src/test/ui/structs/struct-variant-privacy-xc.stderr b/tests/ui/structs/struct-variant-privacy-xc.stderr
index 1c1caaef8..1c1caaef8 100644
--- a/src/test/ui/structs/struct-variant-privacy-xc.stderr
+++ b/tests/ui/structs/struct-variant-privacy-xc.stderr
diff --git a/src/test/ui/structs/struct-variant-privacy.rs b/tests/ui/structs/struct-variant-privacy.rs
index fcdf9a22b..fcdf9a22b 100644
--- a/src/test/ui/structs/struct-variant-privacy.rs
+++ b/tests/ui/structs/struct-variant-privacy.rs
diff --git a/src/test/ui/structs/struct-variant-privacy.stderr b/tests/ui/structs/struct-variant-privacy.stderr
index eafd26c71..eafd26c71 100644
--- a/src/test/ui/structs/struct-variant-privacy.stderr
+++ b/tests/ui/structs/struct-variant-privacy.stderr
diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.rs b/tests/ui/structs/structure-constructor-type-mismatch.rs
index a03ef590c..a03ef590c 100644
--- a/src/test/ui/structs/structure-constructor-type-mismatch.rs
+++ b/tests/ui/structs/structure-constructor-type-mismatch.rs
diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.stderr b/tests/ui/structs/structure-constructor-type-mismatch.stderr
index 3d64fc601..3d64fc601 100644
--- a/src/test/ui/structs/structure-constructor-type-mismatch.stderr
+++ b/tests/ui/structs/structure-constructor-type-mismatch.stderr
diff --git a/src/test/ui/structs/suggest-private-fields.rs b/tests/ui/structs/suggest-private-fields.rs
index 8267a82fe..8267a82fe 100644
--- a/src/test/ui/structs/suggest-private-fields.rs
+++ b/tests/ui/structs/suggest-private-fields.rs
diff --git a/src/test/ui/structs/suggest-private-fields.stderr b/tests/ui/structs/suggest-private-fields.stderr
index d628bd162..d628bd162 100644
--- a/src/test/ui/structs/suggest-private-fields.stderr
+++ b/tests/ui/structs/suggest-private-fields.stderr
diff --git a/src/test/ui/structs/suggest-replacing-field-when-specifying-same-type.rs b/tests/ui/structs/suggest-replacing-field-when-specifying-same-type.rs
index dd2fe7973..dd2fe7973 100644
--- a/src/test/ui/structs/suggest-replacing-field-when-specifying-same-type.rs
+++ b/tests/ui/structs/suggest-replacing-field-when-specifying-same-type.rs
diff --git a/src/test/ui/structs/suggest-replacing-field-when-specifying-same-type.stderr b/tests/ui/structs/suggest-replacing-field-when-specifying-same-type.stderr
index e8503f540..e8503f540 100644
--- a/src/test/ui/structs/suggest-replacing-field-when-specifying-same-type.stderr
+++ b/tests/ui/structs/suggest-replacing-field-when-specifying-same-type.stderr
diff --git a/src/test/ui/structs/unresolved-struct-with-fru.rs b/tests/ui/structs/unresolved-struct-with-fru.rs
index c9fdca457..c9fdca457 100644
--- a/src/test/ui/structs/unresolved-struct-with-fru.rs
+++ b/tests/ui/structs/unresolved-struct-with-fru.rs
diff --git a/src/test/ui/structs/unresolved-struct-with-fru.stderr b/tests/ui/structs/unresolved-struct-with-fru.stderr
index a5796a222..a5796a222 100644
--- a/src/test/ui/structs/unresolved-struct-with-fru.stderr
+++ b/tests/ui/structs/unresolved-struct-with-fru.stderr
diff --git a/src/test/ui/suggestions/abi-typo.fixed b/tests/ui/suggestions/abi-typo.fixed
index 04d265865..04d265865 100644
--- a/src/test/ui/suggestions/abi-typo.fixed
+++ b/tests/ui/suggestions/abi-typo.fixed
diff --git a/src/test/ui/suggestions/abi-typo.rs b/tests/ui/suggestions/abi-typo.rs
index 6d80db522..6d80db522 100644
--- a/src/test/ui/suggestions/abi-typo.rs
+++ b/tests/ui/suggestions/abi-typo.rs
diff --git a/src/test/ui/suggestions/abi-typo.stderr b/tests/ui/suggestions/abi-typo.stderr
index 67a84f119..67a84f119 100644
--- a/src/test/ui/suggestions/abi-typo.stderr
+++ b/tests/ui/suggestions/abi-typo.stderr
diff --git a/src/test/ui/suggestions/adt-param-with-implicit-sized-bound.rs b/tests/ui/suggestions/adt-param-with-implicit-sized-bound.rs
index ef64d799b..ef64d799b 100644
--- a/src/test/ui/suggestions/adt-param-with-implicit-sized-bound.rs
+++ b/tests/ui/suggestions/adt-param-with-implicit-sized-bound.rs
diff --git a/src/test/ui/suggestions/adt-param-with-implicit-sized-bound.stderr b/tests/ui/suggestions/adt-param-with-implicit-sized-bound.stderr
index b77c8c7fd..b77c8c7fd 100644
--- a/src/test/ui/suggestions/adt-param-with-implicit-sized-bound.stderr
+++ b/tests/ui/suggestions/adt-param-with-implicit-sized-bound.stderr
diff --git a/src/test/ui/suggestions/args-instead-of-tuple-errors.rs b/tests/ui/suggestions/args-instead-of-tuple-errors.rs
index 5403b8d6d..f5931a1ba 100644
--- a/src/test/ui/suggestions/args-instead-of-tuple-errors.rs
+++ b/tests/ui/suggestions/args-instead-of-tuple-errors.rs
@@ -6,7 +6,7 @@ fn main() {
     let _: Option<(i32, bool)> = Some(1, 2);
     //~^ ERROR this enum variant takes 1 argument but 2 arguments were supplied
     int_bool(1, 2);
-    //~^ ERROR this function takes 1 argument but 2 arguments were supplied
+    //~^ ERROR function takes 1 argument but 2 arguments were supplied
 
     let _: Option<(i8,)> = Some();
     //~^ ERROR this enum variant takes 1 argument but 0 arguments were supplied
diff --git a/tests/ui/suggestions/args-instead-of-tuple-errors.stderr b/tests/ui/suggestions/args-instead-of-tuple-errors.stderr
new file mode 100644
index 000000000..bc097bf6e
--- /dev/null
+++ b/tests/ui/suggestions/args-instead-of-tuple-errors.stderr
@@ -0,0 +1,107 @@
+error[E0061]: this enum variant takes 1 argument but 2 arguments were supplied
+  --> $DIR/args-instead-of-tuple-errors.rs:6:34
+   |
+LL |     let _: Option<(i32, bool)> = Some(1, 2);
+   |                                  ^^^^    - argument of type `{integer}` unexpected
+   |
+note: expected tuple, found integer
+  --> $DIR/args-instead-of-tuple-errors.rs:6:39
+   |
+LL |     let _: Option<(i32, bool)> = Some(1, 2);
+   |                                       ^
+   = note: expected tuple `(i32, bool)`
+               found type `{integer}`
+help: the type constructed contains `{integer}` due to the type of the argument passed
+  --> $DIR/args-instead-of-tuple-errors.rs:6:34
+   |
+LL |     let _: Option<(i32, bool)> = Some(1, 2);
+   |                                  ^^^^^-^^^^
+   |                                       |
+   |                                       this argument influences the type of `Some`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+help: remove the extra argument
+   |
+LL |     let _: Option<(i32, bool)> = Some(/* (i32, bool) */);
+   |                                      ~~~~~~~~~~~~~~~~~~~
+
+error[E0061]: this function takes 1 argument but 2 arguments were supplied
+  --> $DIR/args-instead-of-tuple-errors.rs:8:5
+   |
+LL |     int_bool(1, 2);
+   |     ^^^^^^^^    - argument of type `{integer}` unexpected
+   |
+note: expected tuple, found integer
+  --> $DIR/args-instead-of-tuple-errors.rs:8:14
+   |
+LL |     int_bool(1, 2);
+   |              ^
+   = note: expected tuple `(i32, bool)`
+               found type `{integer}`
+note: function defined here
+  --> $DIR/args-instead-of-tuple-errors.rs:21:4
+   |
+LL | fn int_bool(_: (i32, bool)) {
+   |    ^^^^^^^^ --------------
+help: remove the extra argument
+   |
+LL |     int_bool(/* (i32, bool) */);
+   |             ~~~~~~~~~~~~~~~~~~~
+
+error[E0061]: this enum variant takes 1 argument but 0 arguments were supplied
+  --> $DIR/args-instead-of-tuple-errors.rs:11:28
+   |
+LL |     let _: Option<(i8,)> = Some();
+   |                            ^^^^-- an argument of type `(i8,)` is missing
+   |
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+help: provide the argument
+   |
+LL |     let _: Option<(i8,)> = Some(/* (i8,) */);
+   |                                ~~~~~~~~~~~~~
+
+error[E0308]: mismatched types
+  --> $DIR/args-instead-of-tuple-errors.rs:14:34
+   |
+LL |     let _: Option<(i32,)> = Some(5_usize);
+   |                             ---- ^^^^^^^ expected tuple, found `usize`
+   |                             |
+   |                             arguments to this enum variant are incorrect
+   |
+   = note: expected tuple `(i32,)`
+               found type `usize`
+help: the type constructed contains `usize` due to the type of the argument passed
+  --> $DIR/args-instead-of-tuple-errors.rs:14:29
+   |
+LL |     let _: Option<(i32,)> = Some(5_usize);
+   |                             ^^^^^-------^
+   |                                  |
+   |                                  this argument influences the type of `Some`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+
+error[E0308]: mismatched types
+  --> $DIR/args-instead-of-tuple-errors.rs:17:34
+   |
+LL |     let _: Option<(i32,)> = Some((5_usize));
+   |                             ---- ^^^^^^^^^ expected tuple, found `usize`
+   |                             |
+   |                             arguments to this enum variant are incorrect
+   |
+   = note: expected tuple `(i32,)`
+               found type `usize`
+help: the type constructed contains `usize` due to the type of the argument passed
+  --> $DIR/args-instead-of-tuple-errors.rs:17:29
+   |
+LL |     let _: Option<(i32,)> = Some((5_usize));
+   |                             ^^^^^---------^
+   |                                  |
+   |                                  this argument influences the type of `Some`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+
+error: aborting due to 5 previous errors
+
+Some errors have detailed explanations: E0061, E0308.
+For more information about an error, try `rustc --explain E0061`.
diff --git a/tests/ui/suggestions/args-instead-of-tuple.fixed b/tests/ui/suggestions/args-instead-of-tuple.fixed
new file mode 100644
index 000000000..f913995d7
--- /dev/null
+++ b/tests/ui/suggestions/args-instead-of-tuple.fixed
@@ -0,0 +1,33 @@
+// Test suggesting tuples where bare arguments may have been passed
+// See issue #86481 for details.
+
+// run-rustfix
+
+fn main() {
+    let _: Result<(i32, i8), ()> = Ok((1, 2));
+    //~^ ERROR enum variant takes 1 argument but 2 arguments were supplied
+    let _: Option<(i32, i8, &'static str)> = Some((1, 2, "hi"));
+    //~^ ERROR enum variant takes 1 argument but 3 arguments were supplied
+    let _: Option<()> = Some(());
+    //~^ ERROR enum variant takes 1 argument but 0 arguments were supplied
+
+    let _: Option<(i32,)> = Some((3,));
+    //~^ ERROR mismatched types
+
+    let _: Option<(i32,)> = Some((3,));
+    //~^ ERROR mismatched types
+
+    two_ints((1, 2)); //~ ERROR function takes 1 argument
+
+    with_generic((3, 4)); //~ ERROR function takes 1 argument
+}
+
+fn two_ints(_: (i32, i32)) {
+}
+
+fn with_generic<T: Copy + Send>((a, b): (i32, T)) {
+    if false {
+        // test generics/bound handling
+        with_generic((a, b)); //~ ERROR function takes 1 argument
+    }
+}
diff --git a/tests/ui/suggestions/args-instead-of-tuple.rs b/tests/ui/suggestions/args-instead-of-tuple.rs
new file mode 100644
index 000000000..1c65407b3
--- /dev/null
+++ b/tests/ui/suggestions/args-instead-of-tuple.rs
@@ -0,0 +1,33 @@
+// Test suggesting tuples where bare arguments may have been passed
+// See issue #86481 for details.
+
+// run-rustfix
+
+fn main() {
+    let _: Result<(i32, i8), ()> = Ok(1, 2);
+    //~^ ERROR enum variant takes 1 argument but 2 arguments were supplied
+    let _: Option<(i32, i8, &'static str)> = Some(1, 2, "hi");
+    //~^ ERROR enum variant takes 1 argument but 3 arguments were supplied
+    let _: Option<()> = Some();
+    //~^ ERROR enum variant takes 1 argument but 0 arguments were supplied
+
+    let _: Option<(i32,)> = Some(3);
+    //~^ ERROR mismatched types
+
+    let _: Option<(i32,)> = Some((3));
+    //~^ ERROR mismatched types
+
+    two_ints(1, 2); //~ ERROR function takes 1 argument
+
+    with_generic(3, 4); //~ ERROR function takes 1 argument
+}
+
+fn two_ints(_: (i32, i32)) {
+}
+
+fn with_generic<T: Copy + Send>((a, b): (i32, T)) {
+    if false {
+        // test generics/bound handling
+        with_generic(a, b); //~ ERROR function takes 1 argument
+    }
+}
diff --git a/src/test/ui/suggestions/args-instead-of-tuple.stderr b/tests/ui/suggestions/args-instead-of-tuple.stderr
index 20f9e5259..3ed9dbf4a 100644
--- a/src/test/ui/suggestions/args-instead-of-tuple.stderr
+++ b/tests/ui/suggestions/args-instead-of-tuple.stderr
@@ -1,4 +1,4 @@
-error[E0061]: this enum variant takes 1 argument but 2 arguments were supplied
+error[E0061]: enum variant takes 1 argument but 2 arguments were supplied
   --> $DIR/args-instead-of-tuple.rs:7:36
    |
 LL |     let _: Result<(i32, i8), ()> = Ok(1, 2);
@@ -6,15 +6,12 @@ LL |     let _: Result<(i32, i8), ()> = Ok(1, 2);
    |
 note: tuple variant defined here
   --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^
 help: wrap these arguments in parentheses to construct a tuple
    |
 LL |     let _: Result<(i32, i8), ()> = Ok((1, 2));
    |                                       +    +
 
-error[E0061]: this enum variant takes 1 argument but 3 arguments were supplied
+error[E0061]: enum variant takes 1 argument but 3 arguments were supplied
   --> $DIR/args-instead-of-tuple.rs:9:46
    |
 LL |     let _: Option<(i32, i8, &'static str)> = Some(1, 2, "hi");
@@ -22,9 +19,6 @@ LL |     let _: Option<(i32, i8, &'static str)> = Some(1, 2, "hi");
    |
 note: tuple variant defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^^^
 help: wrap these arguments in parentheses to construct a tuple
    |
 LL |     let _: Option<(i32, i8, &'static str)> = Some((1, 2, "hi"));
@@ -38,9 +32,6 @@ LL |     let _: Option<()> = Some();
    |
 note: tuple variant defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^^^
 help: provide the argument
    |
 LL |     let _: Option<()> = Some(());
@@ -58,9 +49,6 @@ LL |     let _: Option<(i32,)> = Some(3);
                found type `{integer}`
 note: tuple variant defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^^^
 help: use a trailing comma to create a tuple with one element
    |
 LL |     let _: Option<(i32,)> = Some((3,));
@@ -78,15 +66,12 @@ LL |     let _: Option<(i32,)> = Some((3));
                found type `{integer}`
 note: tuple variant defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^^^
 help: use a trailing comma to create a tuple with one element
    |
 LL |     let _: Option<(i32,)> = Some((3,));
    |                                    +
 
-error[E0061]: this function takes 1 argument but 2 arguments were supplied
+error[E0061]: function takes 1 argument but 2 arguments were supplied
   --> $DIR/args-instead-of-tuple.rs:20:5
    |
 LL |     two_ints(1, 2);
@@ -102,7 +87,7 @@ help: wrap these arguments in parentheses to construct a tuple
 LL |     two_ints((1, 2));
    |              +    +
 
-error[E0061]: this function takes 1 argument but 2 arguments were supplied
+error[E0061]: function takes 1 argument but 2 arguments were supplied
   --> $DIR/args-instead-of-tuple.rs:22:5
    |
 LL |     with_generic(3, 4);
@@ -118,7 +103,7 @@ help: wrap these arguments in parentheses to construct a tuple
 LL |     with_generic((3, 4));
    |                  +    +
 
-error[E0061]: this function takes 1 argument but 2 arguments were supplied
+error[E0061]: function takes 1 argument but 2 arguments were supplied
   --> $DIR/args-instead-of-tuple.rs:31:9
    |
 LL |         with_generic(a, b);
diff --git a/src/test/ui/suggestions/as-ref-2.rs b/tests/ui/suggestions/as-ref-2.rs
index b22f409b4..b22f409b4 100644
--- a/src/test/ui/suggestions/as-ref-2.rs
+++ b/tests/ui/suggestions/as-ref-2.rs
diff --git a/src/test/ui/suggestions/as-ref-2.stderr b/tests/ui/suggestions/as-ref-2.stderr
index e15e45d86..e2129b450 100644
--- a/src/test/ui/suggestions/as-ref-2.stderr
+++ b/tests/ui/suggestions/as-ref-2.stderr
@@ -10,11 +10,8 @@ LL |     let _x: Option<Struct> = foo.map(|s| bar(&s));
 LL |     let _y = foo;
    |              ^^^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `foo`
+note: `Option::<T>::map` takes ownership of the receiver `self`, which moves `foo`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL |     pub const fn map<U, F>(self, f: F) -> Option<U>
-   |                            ^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/suggestions/as-ref.rs b/tests/ui/suggestions/as-ref.rs
index a05353441..a05353441 100644
--- a/src/test/ui/suggestions/as-ref.rs
+++ b/tests/ui/suggestions/as-ref.rs
diff --git a/src/test/ui/suggestions/as-ref.stderr b/tests/ui/suggestions/as-ref.stderr
index deafa9f48..deafa9f48 100644
--- a/src/test/ui/suggestions/as-ref.stderr
+++ b/tests/ui/suggestions/as-ref.stderr
diff --git a/src/test/ui/suggestions/assoc-const-as-field.rs b/tests/ui/suggestions/assoc-const-as-field.rs
index 678b58936..678b58936 100644
--- a/src/test/ui/suggestions/assoc-const-as-field.rs
+++ b/tests/ui/suggestions/assoc-const-as-field.rs
diff --git a/src/test/ui/suggestions/assoc-const-as-field.stderr b/tests/ui/suggestions/assoc-const-as-field.stderr
index 78e5634b2..78e5634b2 100644
--- a/src/test/ui/suggestions/assoc-const-as-field.stderr
+++ b/tests/ui/suggestions/assoc-const-as-field.stderr
diff --git a/src/test/ui/suggestions/assoc-const-as-fn.rs b/tests/ui/suggestions/assoc-const-as-fn.rs
index 4b4595dd5..4b4595dd5 100644
--- a/src/test/ui/suggestions/assoc-const-as-fn.rs
+++ b/tests/ui/suggestions/assoc-const-as-fn.rs
diff --git a/src/test/ui/suggestions/assoc-const-as-fn.stderr b/tests/ui/suggestions/assoc-const-as-fn.stderr
index 3b6e947c5..3b6e947c5 100644
--- a/src/test/ui/suggestions/assoc-const-as-fn.stderr
+++ b/tests/ui/suggestions/assoc-const-as-fn.stderr
diff --git a/tests/ui/suggestions/assoc-ct-for-assoc-method.rs b/tests/ui/suggestions/assoc-ct-for-assoc-method.rs
new file mode 100644
index 000000000..fe2227769
--- /dev/null
+++ b/tests/ui/suggestions/assoc-ct-for-assoc-method.rs
@@ -0,0 +1,25 @@
+struct MyS;
+
+impl MyS {
+    const FOO: i32 = 1;
+    fn foo() -> MyS {
+        MyS
+    }
+}
+
+fn main() {
+    let x: i32 = MyS::foo;
+    //~^ ERROR mismatched types
+    //~| HELP try referring to the
+
+    let z: i32 = i32::max;
+    //~^ ERROR mismatched types
+    //~| HELP try referring to the
+
+    // This example is still broken though... This is a hard suggestion to make,
+    // because we don't have access to the associated const probing code to make
+    // this suggestion where it's emitted, i.e. in trait selection.
+    let y: i32 = i32::max - 42;
+    //~^ ERROR cannot subtract
+    //~| HELP use parentheses
+}
diff --git a/tests/ui/suggestions/assoc-ct-for-assoc-method.stderr b/tests/ui/suggestions/assoc-ct-for-assoc-method.stderr
new file mode 100644
index 000000000..afef38f12
--- /dev/null
+++ b/tests/ui/suggestions/assoc-ct-for-assoc-method.stderr
@@ -0,0 +1,47 @@
+error[E0308]: mismatched types
+  --> $DIR/assoc-ct-for-assoc-method.rs:11:18
+   |
+LL |     let x: i32 = MyS::foo;
+   |            ---   ^^^^^^^^ expected `i32`, found fn item
+   |            |
+   |            expected due to this
+   |
+   = note: expected type `i32`
+           found fn item `fn() -> MyS {MyS::foo}`
+help: try referring to the associated const `FOO` instead
+   |
+LL |     let x: i32 = MyS::FOO;
+   |                       ~~~
+
+error[E0308]: mismatched types
+  --> $DIR/assoc-ct-for-assoc-method.rs:15:18
+   |
+LL |     let z: i32 = i32::max;
+   |            ---   ^^^^^^^^ expected `i32`, found fn item
+   |            |
+   |            expected due to this
+   |
+   = note: expected type `i32`
+           found fn item `fn(i32, i32) -> i32 {<i32 as Ord>::max}`
+help: try referring to the associated const `MAX` instead
+   |
+LL |     let z: i32 = i32::MAX;
+   |                       ~~~
+
+error[E0369]: cannot subtract `{integer}` from `fn(i32, i32) -> i32 {<i32 as Ord>::max}`
+  --> $DIR/assoc-ct-for-assoc-method.rs:22:27
+   |
+LL |     let y: i32 = i32::max - 42;
+   |                  -------- ^ -- {integer}
+   |                  |
+   |                  fn(i32, i32) -> i32 {<i32 as Ord>::max}
+   |
+help: use parentheses to call this associated function
+   |
+LL |     let y: i32 = i32::max(/* i32 */, /* i32 */) - 42;
+   |                          ++++++++++++++++++++++
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0308, E0369.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/assoc-type-in-method-return.rs b/tests/ui/suggestions/assoc-type-in-method-return.rs
index 9bde65998..9bde65998 100644
--- a/src/test/ui/suggestions/assoc-type-in-method-return.rs
+++ b/tests/ui/suggestions/assoc-type-in-method-return.rs
diff --git a/src/test/ui/suggestions/assoc-type-in-method-return.stderr b/tests/ui/suggestions/assoc-type-in-method-return.stderr
index 202e4a16e..202e4a16e 100644
--- a/src/test/ui/suggestions/assoc-type-in-method-return.stderr
+++ b/tests/ui/suggestions/assoc-type-in-method-return.stderr
diff --git a/src/test/ui/suggestions/assoc_fn_without_self.rs b/tests/ui/suggestions/assoc_fn_without_self.rs
index 778d98477..778d98477 100644
--- a/src/test/ui/suggestions/assoc_fn_without_self.rs
+++ b/tests/ui/suggestions/assoc_fn_without_self.rs
diff --git a/src/test/ui/suggestions/assoc_fn_without_self.stderr b/tests/ui/suggestions/assoc_fn_without_self.stderr
index febdd6733..febdd6733 100644
--- a/src/test/ui/suggestions/assoc_fn_without_self.stderr
+++ b/tests/ui/suggestions/assoc_fn_without_self.stderr
diff --git a/src/test/ui/suggestions/async-fn-ctor-passed-as-arg-where-it-should-have-been-called.rs b/tests/ui/suggestions/async-fn-ctor-passed-as-arg-where-it-should-have-been-called.rs
index 156162c90..156162c90 100644
--- a/src/test/ui/suggestions/async-fn-ctor-passed-as-arg-where-it-should-have-been-called.rs
+++ b/tests/ui/suggestions/async-fn-ctor-passed-as-arg-where-it-should-have-been-called.rs
diff --git a/src/test/ui/suggestions/async-fn-ctor-passed-as-arg-where-it-should-have-been-called.stderr b/tests/ui/suggestions/async-fn-ctor-passed-as-arg-where-it-should-have-been-called.stderr
index 8ed62f854..8ed62f854 100644
--- a/src/test/ui/suggestions/async-fn-ctor-passed-as-arg-where-it-should-have-been-called.stderr
+++ b/tests/ui/suggestions/async-fn-ctor-passed-as-arg-where-it-should-have-been-called.stderr
diff --git a/src/test/ui/suggestions/attribute-typos.rs b/tests/ui/suggestions/attribute-typos.rs
index 7c8231bbb..7c8231bbb 100644
--- a/src/test/ui/suggestions/attribute-typos.rs
+++ b/tests/ui/suggestions/attribute-typos.rs
diff --git a/src/test/ui/suggestions/attribute-typos.stderr b/tests/ui/suggestions/attribute-typos.stderr
index 54122cb73..b871c9b45 100644
--- a/src/test/ui/suggestions/attribute-typos.stderr
+++ b/tests/ui/suggestions/attribute-typos.stderr
@@ -15,11 +15,9 @@ error: cannot find attribute `tests` in this scope
    |
 LL | #[tests]
    |   ^^^^^ help: an attribute macro with a similar name exists: `test`
+  --> $SRC_DIR/core/src/macros/mod.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/macros/mod.rs:LL:COL
-   |
-LL |     pub macro test($item:item) {
-   |     -------------- similarly named attribute macro `test` defined here
+   = note: similarly named attribute macro `test` defined here
 
 error: cannot find attribute `deprcated` in this scope
   --> $DIR/attribute-typos.rs:1:3
diff --git a/src/test/ui/suggestions/auxiliary/foo.rs b/tests/ui/suggestions/auxiliary/foo.rs
index e90bbef6d..e90bbef6d 100644
--- a/src/test/ui/suggestions/auxiliary/foo.rs
+++ b/tests/ui/suggestions/auxiliary/foo.rs
diff --git a/src/test/ui/suggestions/auxiliary/issue-61963-1.rs b/tests/ui/suggestions/auxiliary/issue-61963-1.rs
index 6c2df7e84..6c2df7e84 100644
--- a/src/test/ui/suggestions/auxiliary/issue-61963-1.rs
+++ b/tests/ui/suggestions/auxiliary/issue-61963-1.rs
diff --git a/src/test/ui/suggestions/auxiliary/issue-61963.rs b/tests/ui/suggestions/auxiliary/issue-61963.rs
index e86f1610a..e86f1610a 100644
--- a/src/test/ui/suggestions/auxiliary/issue-61963.rs
+++ b/tests/ui/suggestions/auxiliary/issue-61963.rs
diff --git a/src/test/ui/suggestions/auxiliary/issue-81839.rs b/tests/ui/suggestions/auxiliary/issue-81839.rs
index 5683c45ad..5683c45ad 100644
--- a/src/test/ui/suggestions/auxiliary/issue-81839.rs
+++ b/tests/ui/suggestions/auxiliary/issue-81839.rs
diff --git a/src/test/ui/suggestions/auxiliary/meow.rs b/tests/ui/suggestions/auxiliary/meow.rs
index 115df70a6..115df70a6 100644
--- a/src/test/ui/suggestions/auxiliary/meow.rs
+++ b/tests/ui/suggestions/auxiliary/meow.rs
diff --git a/src/test/ui/suggestions/auxiliary/not-object-safe.rs b/tests/ui/suggestions/auxiliary/not-object-safe.rs
index 7c9829b82..7c9829b82 100644
--- a/src/test/ui/suggestions/auxiliary/not-object-safe.rs
+++ b/tests/ui/suggestions/auxiliary/not-object-safe.rs
diff --git a/src/test/ui/suggestions/auxiliary/proc-macro-type-error.rs b/tests/ui/suggestions/auxiliary/proc-macro-type-error.rs
index d71747f96..d71747f96 100644
--- a/src/test/ui/suggestions/auxiliary/proc-macro-type-error.rs
+++ b/tests/ui/suggestions/auxiliary/proc-macro-type-error.rs
diff --git a/tests/ui/suggestions/bad-hex-float-lit.rs b/tests/ui/suggestions/bad-hex-float-lit.rs
new file mode 100644
index 000000000..cd6fdbde9
--- /dev/null
+++ b/tests/ui/suggestions/bad-hex-float-lit.rs
@@ -0,0 +1,13 @@
+fn main() {
+    let _f: f32 = 0xAAf32;
+    //~^ ERROR mismatched types
+    //~| HELP rewrite this
+
+    let _f: f32 = 0xAB_f32;
+    //~^ ERROR mismatched types
+    //~| HELP rewrite this
+
+    let _f: f64 = 0xFF_f64;
+    //~^ ERROR mismatched types
+    //~| HELP rewrite this
+}
diff --git a/tests/ui/suggestions/bad-hex-float-lit.stderr b/tests/ui/suggestions/bad-hex-float-lit.stderr
new file mode 100644
index 000000000..bc09abb1a
--- /dev/null
+++ b/tests/ui/suggestions/bad-hex-float-lit.stderr
@@ -0,0 +1,48 @@
+error[E0308]: mismatched types
+  --> $DIR/bad-hex-float-lit.rs:2:19
+   |
+LL |     let _f: f32 = 0xAAf32;
+   |             ---   ^^^^^^^ expected `f32`, found integer
+   |             |
+   |             expected due to this
+   |
+help: rewrite this as a decimal floating point literal, or use `as` to turn a hex literal into a float
+   |
+LL |     let _f: f32 = 0xAA as f32;
+   |                   ~~~~~~~~~~~
+LL |     let _f: f32 = 170_f32;
+   |                   ~~~~~~~
+
+error[E0308]: mismatched types
+  --> $DIR/bad-hex-float-lit.rs:6:19
+   |
+LL |     let _f: f32 = 0xAB_f32;
+   |             ---   ^^^^^^^^ expected `f32`, found integer
+   |             |
+   |             expected due to this
+   |
+help: rewrite this as a decimal floating point literal, or use `as` to turn a hex literal into a float
+   |
+LL |     let _f: f32 = 0xAB as f32;
+   |                   ~~~~~~~~~~~
+LL |     let _f: f32 = 171_f32;
+   |                   ~~~~~~~
+
+error[E0308]: mismatched types
+  --> $DIR/bad-hex-float-lit.rs:10:19
+   |
+LL |     let _f: f64 = 0xFF_f64;
+   |             ---   ^^^^^^^^ expected `f64`, found integer
+   |             |
+   |             expected due to this
+   |
+help: rewrite this as a decimal floating point literal, or use `as` to turn a hex literal into a float
+   |
+LL |     let _f: f64 = 0xFF as f64;
+   |                   ~~~~~~~~~~~
+LL |     let _f: f64 = 255_f64;
+   |                   ~~~~~~~
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/bool_typo_err_suggest.rs b/tests/ui/suggestions/bool_typo_err_suggest.rs
index deab0fb05..deab0fb05 100644
--- a/src/test/ui/suggestions/bool_typo_err_suggest.rs
+++ b/tests/ui/suggestions/bool_typo_err_suggest.rs
diff --git a/src/test/ui/suggestions/bool_typo_err_suggest.stderr b/tests/ui/suggestions/bool_typo_err_suggest.stderr
index 52bde07ca..52bde07ca 100644
--- a/src/test/ui/suggestions/bool_typo_err_suggest.stderr
+++ b/tests/ui/suggestions/bool_typo_err_suggest.stderr
diff --git a/src/test/ui/suggestions/borrow-for-loop-head.rs b/tests/ui/suggestions/borrow-for-loop-head.rs
index c2bda55e5..c2bda55e5 100644
--- a/src/test/ui/suggestions/borrow-for-loop-head.rs
+++ b/tests/ui/suggestions/borrow-for-loop-head.rs
diff --git a/src/test/ui/suggestions/borrow-for-loop-head.stderr b/tests/ui/suggestions/borrow-for-loop-head.stderr
index 0cc8994fe..cbdb94877 100644
--- a/src/test/ui/suggestions/borrow-for-loop-head.stderr
+++ b/tests/ui/suggestions/borrow-for-loop-head.stderr
@@ -16,11 +16,8 @@ LL |     for i in &a {
 LL |         for j in a {
    |                  ^ `a` moved due to this implicit call to `.into_iter()`, in previous iteration of loop
    |
-note: this function takes ownership of the receiver `self`, which moves `a`
+note: `into_iter` takes ownership of the receiver `self`, which moves `a`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
 help: consider iterating over a slice of the `Vec<i32>`'s content to avoid moving into the `for` loop
    |
 LL |         for j in &a {
diff --git a/src/test/ui/suggestions/bound-suggestions.fixed b/tests/ui/suggestions/bound-suggestions.fixed
index 17a019c69..17a019c69 100644
--- a/src/test/ui/suggestions/bound-suggestions.fixed
+++ b/tests/ui/suggestions/bound-suggestions.fixed
diff --git a/src/test/ui/suggestions/bound-suggestions.rs b/tests/ui/suggestions/bound-suggestions.rs
index 86f708d42..86f708d42 100644
--- a/src/test/ui/suggestions/bound-suggestions.rs
+++ b/tests/ui/suggestions/bound-suggestions.rs
diff --git a/src/test/ui/suggestions/bound-suggestions.stderr b/tests/ui/suggestions/bound-suggestions.stderr
index d53715937..cd27947f0 100644
--- a/src/test/ui/suggestions/bound-suggestions.stderr
+++ b/tests/ui/suggestions/bound-suggestions.stderr
@@ -78,9 +78,6 @@ LL |     const SIZE: usize = core::mem::size_of::<Self>();
    |
 note: required by a bound in `std::mem::size_of`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |                      ^ required by this bound in `std::mem::size_of`
 help: consider further restricting `Self`
    |
 LL | trait Foo<T>: Sized {
@@ -94,9 +91,6 @@ LL |     const SIZE: usize = core::mem::size_of::<Self>();
    |
 note: required by a bound in `std::mem::size_of`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |                      ^ required by this bound in `std::mem::size_of`
 help: consider further restricting `Self`
    |
 LL | trait Bar: std::fmt::Display + Sized {
@@ -110,9 +104,6 @@ LL |     const SIZE: usize = core::mem::size_of::<Self>();
    |
 note: required by a bound in `std::mem::size_of`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |                      ^ required by this bound in `std::mem::size_of`
 help: consider further restricting `Self`
    |
 LL | trait Baz: Sized where Self: std::fmt::Display {
@@ -126,9 +117,6 @@ LL |     const SIZE: usize = core::mem::size_of::<Self>();
    |
 note: required by a bound in `std::mem::size_of`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |                      ^ required by this bound in `std::mem::size_of`
 help: consider further restricting `Self`
    |
 LL | trait Qux<T>: Sized where Self: std::fmt::Display {
@@ -142,9 +130,6 @@ LL |     const SIZE: usize = core::mem::size_of::<Self>();
    |
 note: required by a bound in `std::mem::size_of`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |                      ^ required by this bound in `std::mem::size_of`
 help: consider further restricting `Self`
    |
 LL | trait Bat<T>: std::fmt::Display + Sized {
diff --git a/src/test/ui/suggestions/box-future-wrong-output.rs b/tests/ui/suggestions/box-future-wrong-output.rs
index d49819fcb..d49819fcb 100644
--- a/src/test/ui/suggestions/box-future-wrong-output.rs
+++ b/tests/ui/suggestions/box-future-wrong-output.rs
diff --git a/src/test/ui/suggestions/box-future-wrong-output.stderr b/tests/ui/suggestions/box-future-wrong-output.stderr
index e0c57af25..e0c57af25 100644
--- a/src/test/ui/suggestions/box-future-wrong-output.stderr
+++ b/tests/ui/suggestions/box-future-wrong-output.stderr
diff --git a/src/test/ui/suggestions/boxed-variant-field.rs b/tests/ui/suggestions/boxed-variant-field.rs
index 6050963c4..6050963c4 100644
--- a/src/test/ui/suggestions/boxed-variant-field.rs
+++ b/tests/ui/suggestions/boxed-variant-field.rs
diff --git a/src/test/ui/suggestions/boxed-variant-field.stderr b/tests/ui/suggestions/boxed-variant-field.stderr
index 9ae36a06a..9ae36a06a 100644
--- a/src/test/ui/suggestions/boxed-variant-field.stderr
+++ b/tests/ui/suggestions/boxed-variant-field.stderr
diff --git a/src/test/ui/suggestions/call-boxed.rs b/tests/ui/suggestions/call-boxed.rs
index d19e4596a..d19e4596a 100644
--- a/src/test/ui/suggestions/call-boxed.rs
+++ b/tests/ui/suggestions/call-boxed.rs
diff --git a/src/test/ui/suggestions/call-boxed.stderr b/tests/ui/suggestions/call-boxed.stderr
index 9b619ac9a..9b619ac9a 100644
--- a/src/test/ui/suggestions/call-boxed.stderr
+++ b/tests/ui/suggestions/call-boxed.stderr
diff --git a/src/test/ui/suggestions/call-on-missing.rs b/tests/ui/suggestions/call-on-missing.rs
index 25ced84dd..25ced84dd 100644
--- a/src/test/ui/suggestions/call-on-missing.rs
+++ b/tests/ui/suggestions/call-on-missing.rs
diff --git a/src/test/ui/suggestions/call-on-missing.stderr b/tests/ui/suggestions/call-on-missing.stderr
index ca9abc7e9..ca9abc7e9 100644
--- a/src/test/ui/suggestions/call-on-missing.stderr
+++ b/tests/ui/suggestions/call-on-missing.stderr
diff --git a/src/test/ui/suggestions/call-on-unimplemented-ctor.rs b/tests/ui/suggestions/call-on-unimplemented-ctor.rs
index 5f811044e..5f811044e 100644
--- a/src/test/ui/suggestions/call-on-unimplemented-ctor.rs
+++ b/tests/ui/suggestions/call-on-unimplemented-ctor.rs
diff --git a/src/test/ui/suggestions/call-on-unimplemented-ctor.stderr b/tests/ui/suggestions/call-on-unimplemented-ctor.stderr
index 58612cbfb..58612cbfb 100644
--- a/src/test/ui/suggestions/call-on-unimplemented-ctor.stderr
+++ b/tests/ui/suggestions/call-on-unimplemented-ctor.stderr
diff --git a/src/test/ui/suggestions/call-on-unimplemented-fn-ptr.rs b/tests/ui/suggestions/call-on-unimplemented-fn-ptr.rs
index 86490c724..86490c724 100644
--- a/src/test/ui/suggestions/call-on-unimplemented-fn-ptr.rs
+++ b/tests/ui/suggestions/call-on-unimplemented-fn-ptr.rs
diff --git a/src/test/ui/suggestions/call-on-unimplemented-fn-ptr.stderr b/tests/ui/suggestions/call-on-unimplemented-fn-ptr.stderr
index 167f7e592..167f7e592 100644
--- a/src/test/ui/suggestions/call-on-unimplemented-fn-ptr.stderr
+++ b/tests/ui/suggestions/call-on-unimplemented-fn-ptr.stderr
diff --git a/tests/ui/suggestions/call-on-unimplemented-with-autoderef.rs b/tests/ui/suggestions/call-on-unimplemented-with-autoderef.rs
new file mode 100644
index 000000000..9021dd752
--- /dev/null
+++ b/tests/ui/suggestions/call-on-unimplemented-with-autoderef.rs
@@ -0,0 +1,13 @@
+trait Foo {}
+
+impl Foo for i32 {}
+
+fn needs_foo(_: impl Foo) {}
+
+fn test(x: &Box<dyn Fn() -> i32>) {
+    needs_foo(x);
+    //~^ ERROR the trait bound
+    //~| HELP use parentheses to call this trait object
+}
+
+fn main() {}
diff --git a/tests/ui/suggestions/call-on-unimplemented-with-autoderef.stderr b/tests/ui/suggestions/call-on-unimplemented-with-autoderef.stderr
new file mode 100644
index 000000000..90f44cce0
--- /dev/null
+++ b/tests/ui/suggestions/call-on-unimplemented-with-autoderef.stderr
@@ -0,0 +1,21 @@
+error[E0277]: the trait bound `&Box<dyn Fn() -> i32>: Foo` is not satisfied
+  --> $DIR/call-on-unimplemented-with-autoderef.rs:8:15
+   |
+LL |     needs_foo(x);
+   |     --------- ^ the trait `Foo` is not implemented for `&Box<dyn Fn() -> i32>`
+   |     |
+   |     required by a bound introduced by this call
+   |
+note: required by a bound in `needs_foo`
+  --> $DIR/call-on-unimplemented-with-autoderef.rs:5:22
+   |
+LL | fn needs_foo(_: impl Foo) {}
+   |                      ^^^ required by this bound in `needs_foo`
+help: use parentheses to call this trait object
+   |
+LL |     needs_foo(x());
+   |                ++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/suggestions/chain-method-call-mutation-in-place.rs b/tests/ui/suggestions/chain-method-call-mutation-in-place.rs
index cb92ab87a..cb92ab87a 100644
--- a/src/test/ui/suggestions/chain-method-call-mutation-in-place.rs
+++ b/tests/ui/suggestions/chain-method-call-mutation-in-place.rs
diff --git a/src/test/ui/suggestions/chain-method-call-mutation-in-place.stderr b/tests/ui/suggestions/chain-method-call-mutation-in-place.stderr
index 965dbb967..965dbb967 100644
--- a/src/test/ui/suggestions/chain-method-call-mutation-in-place.stderr
+++ b/tests/ui/suggestions/chain-method-call-mutation-in-place.stderr
diff --git a/tests/ui/suggestions/clone-on-unconstrained-borrowed-type-param.fixed b/tests/ui/suggestions/clone-on-unconstrained-borrowed-type-param.fixed
new file mode 100644
index 000000000..4f9e93a47
--- /dev/null
+++ b/tests/ui/suggestions/clone-on-unconstrained-borrowed-type-param.fixed
@@ -0,0 +1,16 @@
+// run-rustfix
+fn wat<T: Clone>(t: &T) -> T {
+    t.clone() //~ ERROR E0308
+}
+
+#[derive(Clone)]
+struct Foo;
+
+fn wut(t: &Foo) -> Foo {
+    t.clone() //~ ERROR E0308
+}
+
+fn main() {
+    wat(&42);
+    wut(&Foo);
+}
diff --git a/tests/ui/suggestions/clone-on-unconstrained-borrowed-type-param.rs b/tests/ui/suggestions/clone-on-unconstrained-borrowed-type-param.rs
new file mode 100644
index 000000000..89b077d67
--- /dev/null
+++ b/tests/ui/suggestions/clone-on-unconstrained-borrowed-type-param.rs
@@ -0,0 +1,15 @@
+// run-rustfix
+fn wat<T>(t: &T) -> T {
+    t.clone() //~ ERROR E0308
+}
+
+struct Foo;
+
+fn wut(t: &Foo) -> Foo {
+    t.clone() //~ ERROR E0308
+}
+
+fn main() {
+    wat(&42);
+    wut(&Foo);
+}
diff --git a/tests/ui/suggestions/clone-on-unconstrained-borrowed-type-param.stderr b/tests/ui/suggestions/clone-on-unconstrained-borrowed-type-param.stderr
new file mode 100644
index 000000000..26ab515d9
--- /dev/null
+++ b/tests/ui/suggestions/clone-on-unconstrained-borrowed-type-param.stderr
@@ -0,0 +1,43 @@
+error[E0308]: mismatched types
+  --> $DIR/clone-on-unconstrained-borrowed-type-param.rs:3:5
+   |
+LL | fn wat<T>(t: &T) -> T {
+   |        -            - expected `T` because of return type
+   |        |
+   |        this type parameter
+LL |     t.clone()
+   |     ^^^^^^^^^ expected type parameter `T`, found `&T`
+   |
+   = note: expected type parameter `T`
+                   found reference `&T`
+note: `T` does not implement `Clone`, so `&T` was cloned instead
+  --> $DIR/clone-on-unconstrained-borrowed-type-param.rs:3:5
+   |
+LL |     t.clone()
+   |     ^
+help: consider restricting type parameter `T`
+   |
+LL | fn wat<T: Clone>(t: &T) -> T {
+   |         +++++++
+
+error[E0308]: mismatched types
+  --> $DIR/clone-on-unconstrained-borrowed-type-param.rs:9:5
+   |
+LL | fn wut(t: &Foo) -> Foo {
+   |                    --- expected `Foo` because of return type
+LL |     t.clone()
+   |     ^^^^^^^^^ expected struct `Foo`, found `&Foo`
+   |
+note: `Foo` does not implement `Clone`, so `&Foo` was cloned instead
+  --> $DIR/clone-on-unconstrained-borrowed-type-param.rs:9:5
+   |
+LL |     t.clone()
+   |     ^
+help: consider annotating `Foo` with `#[derive(Clone)]`
+   |
+LL | #[derive(Clone)]
+   |
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/const-in-struct-pat.rs b/tests/ui/suggestions/const-in-struct-pat.rs
index 1cbba9354..1cbba9354 100644
--- a/src/test/ui/suggestions/const-in-struct-pat.rs
+++ b/tests/ui/suggestions/const-in-struct-pat.rs
diff --git a/src/test/ui/suggestions/const-in-struct-pat.stderr b/tests/ui/suggestions/const-in-struct-pat.stderr
index c8b93f3dc..c8b93f3dc 100644
--- a/src/test/ui/suggestions/const-in-struct-pat.stderr
+++ b/tests/ui/suggestions/const-in-struct-pat.stderr
diff --git a/src/test/ui/suggestions/const-no-type.rs b/tests/ui/suggestions/const-no-type.rs
index c6fdcdadb..c6fdcdadb 100644
--- a/src/test/ui/suggestions/const-no-type.rs
+++ b/tests/ui/suggestions/const-no-type.rs
diff --git a/src/test/ui/suggestions/const-no-type.stderr b/tests/ui/suggestions/const-no-type.stderr
index bd703992f..bd703992f 100644
--- a/src/test/ui/suggestions/const-no-type.stderr
+++ b/tests/ui/suggestions/const-no-type.stderr
diff --git a/tests/ui/suggestions/const-pat-non-exaustive-let-new-var.rs b/tests/ui/suggestions/const-pat-non-exaustive-let-new-var.rs
new file mode 100644
index 000000000..15f08486f
--- /dev/null
+++ b/tests/ui/suggestions/const-pat-non-exaustive-let-new-var.rs
@@ -0,0 +1,11 @@
+fn main() {
+    let A = 3;
+    //~^ ERROR refutable pattern in local binding
+    //~| patterns `i32::MIN..=1_i32` and `3_i32..=i32::MAX` not covered
+    //~| missing patterns are not covered because `a` is interpreted as a constant pattern, not a new variable
+    //~| HELP introduce a variable instead
+    //~| SUGGESTION a_var
+
+    const A: i32 = 2;
+    //~^ constant defined here
+}
diff --git a/tests/ui/suggestions/const-pat-non-exaustive-let-new-var.stderr b/tests/ui/suggestions/const-pat-non-exaustive-let-new-var.stderr
new file mode 100644
index 000000000..1c1cab25f
--- /dev/null
+++ b/tests/ui/suggestions/const-pat-non-exaustive-let-new-var.stderr
@@ -0,0 +1,18 @@
+error[E0005]: refutable pattern in local binding
+  --> $DIR/const-pat-non-exaustive-let-new-var.rs:2:9
+   |
+LL |     let A = 3;
+   |         ^
+   |         |
+   |         patterns `i32::MIN..=1_i32` and `3_i32..=i32::MAX` not covered
+   |         missing patterns are not covered because `a` is interpreted as a constant pattern, not a new variable
+   |         help: introduce a variable instead: `a_var`
+...
+LL |     const A: i32 = 2;
+   |     ------------ constant defined here
+   |
+   = note: the matched value is of type `i32`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/suggestions/constrain-suggest-ice.rs b/tests/ui/suggestions/constrain-suggest-ice.rs
index 69b874bed..69b874bed 100644
--- a/src/test/ui/suggestions/constrain-suggest-ice.rs
+++ b/tests/ui/suggestions/constrain-suggest-ice.rs
diff --git a/src/test/ui/suggestions/constrain-suggest-ice.stderr b/tests/ui/suggestions/constrain-suggest-ice.stderr
index 477eb2786..2af7c2f69 100644
--- a/src/test/ui/suggestions/constrain-suggest-ice.stderr
+++ b/tests/ui/suggestions/constrain-suggest-ice.stderr
@@ -24,16 +24,7 @@ error[E0425]: cannot find value `F` in this scope
   --> $DIR/constrain-suggest-ice.rs:6:9
    |
 LL |         F
-   |         ^
-   |
-help: a local variable with a similar name exists
-   |
-LL |         x
-   |         ~
-help: you might be missing a type parameter
-   |
-LL | struct Bug<S, F>{
-   |             +++
+   |         ^ help: a local variable with a similar name exists: `x`
 
 error: generic `Self` types are currently not permitted in anonymous constants
   --> $DIR/constrain-suggest-ice.rs:3:21
diff --git a/src/test/ui/suggestions/constrain-trait.fixed b/tests/ui/suggestions/constrain-trait.fixed
index f292f27f0..f292f27f0 100644
--- a/src/test/ui/suggestions/constrain-trait.fixed
+++ b/tests/ui/suggestions/constrain-trait.fixed
diff --git a/src/test/ui/suggestions/constrain-trait.rs b/tests/ui/suggestions/constrain-trait.rs
index 99ccf7a7f..99ccf7a7f 100644
--- a/src/test/ui/suggestions/constrain-trait.rs
+++ b/tests/ui/suggestions/constrain-trait.rs
diff --git a/src/test/ui/suggestions/constrain-trait.stderr b/tests/ui/suggestions/constrain-trait.stderr
index a26f86917..a26f86917 100644
--- a/src/test/ui/suggestions/constrain-trait.stderr
+++ b/tests/ui/suggestions/constrain-trait.stderr
diff --git a/src/test/ui/suggestions/copied-and-cloned.fixed b/tests/ui/suggestions/copied-and-cloned.fixed
index f801403fe..f801403fe 100644
--- a/src/test/ui/suggestions/copied-and-cloned.fixed
+++ b/tests/ui/suggestions/copied-and-cloned.fixed
diff --git a/src/test/ui/suggestions/copied-and-cloned.rs b/tests/ui/suggestions/copied-and-cloned.rs
index 640450b76..640450b76 100644
--- a/src/test/ui/suggestions/copied-and-cloned.rs
+++ b/tests/ui/suggestions/copied-and-cloned.rs
diff --git a/src/test/ui/suggestions/copied-and-cloned.stderr b/tests/ui/suggestions/copied-and-cloned.stderr
index a6336281b..a6336281b 100644
--- a/src/test/ui/suggestions/copied-and-cloned.stderr
+++ b/tests/ui/suggestions/copied-and-cloned.stderr
diff --git a/src/test/ui/suggestions/core-std-import-order-issue-83564.rs b/tests/ui/suggestions/core-std-import-order-issue-83564.rs
index b7fe5af7b..b7fe5af7b 100644
--- a/src/test/ui/suggestions/core-std-import-order-issue-83564.rs
+++ b/tests/ui/suggestions/core-std-import-order-issue-83564.rs
diff --git a/src/test/ui/suggestions/core-std-import-order-issue-83564.stderr b/tests/ui/suggestions/core-std-import-order-issue-83564.stderr
index e4e1fc591..e4e1fc591 100644
--- a/src/test/ui/suggestions/core-std-import-order-issue-83564.stderr
+++ b/tests/ui/suggestions/core-std-import-order-issue-83564.stderr
diff --git a/src/test/ui/suggestions/count2len.rs b/tests/ui/suggestions/count2len.rs
index f11a789ef..f11a789ef 100644
--- a/src/test/ui/suggestions/count2len.rs
+++ b/tests/ui/suggestions/count2len.rs
diff --git a/src/test/ui/suggestions/count2len.stderr b/tests/ui/suggestions/count2len.stderr
index 6394a84dd..6394a84dd 100644
--- a/src/test/ui/suggestions/count2len.stderr
+++ b/tests/ui/suggestions/count2len.stderr
diff --git a/src/test/ui/suggestions/crate-or-module-typo.rs b/tests/ui/suggestions/crate-or-module-typo.rs
index 2471b11c6..2471b11c6 100644
--- a/src/test/ui/suggestions/crate-or-module-typo.rs
+++ b/tests/ui/suggestions/crate-or-module-typo.rs
diff --git a/src/test/ui/suggestions/crate-or-module-typo.stderr b/tests/ui/suggestions/crate-or-module-typo.stderr
index 98b88b4fb..98b88b4fb 100644
--- a/src/test/ui/suggestions/crate-or-module-typo.stderr
+++ b/tests/ui/suggestions/crate-or-module-typo.stderr
diff --git a/src/test/ui/suggestions/deref-path-method.rs b/tests/ui/suggestions/deref-path-method.rs
index 0281cdb6b..0281cdb6b 100644
--- a/src/test/ui/suggestions/deref-path-method.rs
+++ b/tests/ui/suggestions/deref-path-method.rs
diff --git a/src/test/ui/suggestions/deref-path-method.stderr b/tests/ui/suggestions/deref-path-method.stderr
index 1cc37d611..1cc37d611 100644
--- a/src/test/ui/suggestions/deref-path-method.stderr
+++ b/tests/ui/suggestions/deref-path-method.stderr
diff --git a/src/test/ui/suggestions/derive-clone-for-eq.fixed b/tests/ui/suggestions/derive-clone-for-eq.fixed
index f07784d53..f07784d53 100644
--- a/src/test/ui/suggestions/derive-clone-for-eq.fixed
+++ b/tests/ui/suggestions/derive-clone-for-eq.fixed
diff --git a/src/test/ui/suggestions/derive-clone-for-eq.rs b/tests/ui/suggestions/derive-clone-for-eq.rs
index 15c0d4659..15c0d4659 100644
--- a/src/test/ui/suggestions/derive-clone-for-eq.rs
+++ b/tests/ui/suggestions/derive-clone-for-eq.rs
diff --git a/src/test/ui/suggestions/derive-clone-for-eq.stderr b/tests/ui/suggestions/derive-clone-for-eq.stderr
index 0645f0cdd..9d843c251 100644
--- a/src/test/ui/suggestions/derive-clone-for-eq.stderr
+++ b/tests/ui/suggestions/derive-clone-for-eq.stderr
@@ -8,12 +8,11 @@ note: required for `Struct<T>` to implement `PartialEq`
   --> $DIR/derive-clone-for-eq.rs:9:19
    |
 LL | impl<T: Clone, U> PartialEq<U> for Struct<T>
-   |                   ^^^^^^^^^^^^     ^^^^^^^^^
+   |         -----     ^^^^^^^^^^^^     ^^^^^^^^^
+   |         |
+   |         unsatisfied trait bound introduced here
 note: required by a bound in `Eq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub trait Eq: PartialEq<Self> {
-   |               ^^^^^^^^^^^^^^^ required by this bound in `Eq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider restricting type parameter `T`
    |
diff --git a/src/test/ui/suggestions/derive-macro-missing-bounds.rs b/tests/ui/suggestions/derive-macro-missing-bounds.rs
index 56c218f97..56c218f97 100644
--- a/src/test/ui/suggestions/derive-macro-missing-bounds.rs
+++ b/tests/ui/suggestions/derive-macro-missing-bounds.rs
diff --git a/src/test/ui/suggestions/derive-macro-missing-bounds.stderr b/tests/ui/suggestions/derive-macro-missing-bounds.stderr
index b9f773965..79036279d 100644
--- a/src/test/ui/suggestions/derive-macro-missing-bounds.stderr
+++ b/tests/ui/suggestions/derive-macro-missing-bounds.stderr
@@ -30,7 +30,9 @@ note: required for `c::Inner<T>` to implement `Debug`
   --> $DIR/derive-macro-missing-bounds.rs:34:28
    |
 LL |     impl<T: Debug + Trait> Debug for Inner<T> {
-   |                            ^^^^^     ^^^^^^^^
+   |                     -----  ^^^^^     ^^^^^^^^
+   |                     |
+   |                     unsatisfied trait bound introduced here
    = note: 1 redundant requirement hidden
    = note: required for `&c::Inner<T>` to implement `Debug`
    = note: required for the cast from `&c::Inner<T>` to the object type `dyn Debug`
@@ -52,7 +54,7 @@ note: required for `d::Inner<T>` to implement `Debug`
   --> $DIR/derive-macro-missing-bounds.rs:49:13
    |
 LL |     impl<T> Debug for Inner<T> where T: Debug, T: Trait {
-   |             ^^^^^     ^^^^^^^^
+   |             ^^^^^     ^^^^^^^^                    ----- unsatisfied trait bound introduced here
    = note: 1 redundant requirement hidden
    = note: required for `&d::Inner<T>` to implement `Debug`
    = note: required for the cast from `&d::Inner<T>` to the object type `dyn Debug`
@@ -74,7 +76,7 @@ note: required for `e::Inner<T>` to implement `Debug`
   --> $DIR/derive-macro-missing-bounds.rs:64:13
    |
 LL |     impl<T> Debug for Inner<T> where T: Debug + Trait {
-   |             ^^^^^     ^^^^^^^^
+   |             ^^^^^     ^^^^^^^^                  ----- unsatisfied trait bound introduced here
    = note: 1 redundant requirement hidden
    = note: required for `&e::Inner<T>` to implement `Debug`
    = note: required for the cast from `&e::Inner<T>` to the object type `dyn Debug`
@@ -96,7 +98,7 @@ note: required for `f::Inner<T>` to implement `Debug`
   --> $DIR/derive-macro-missing-bounds.rs:79:20
    |
 LL |     impl<T: Debug> Debug for Inner<T> where T: Trait {
-   |                    ^^^^^     ^^^^^^^^
+   |                    ^^^^^     ^^^^^^^^          ----- unsatisfied trait bound introduced here
    = note: 1 redundant requirement hidden
    = note: required for `&f::Inner<T>` to implement `Debug`
    = note: required for the cast from `&f::Inner<T>` to the object type `dyn Debug`
diff --git a/src/test/ui/suggestions/derive-trait-for-method-call.rs b/tests/ui/suggestions/derive-trait-for-method-call.rs
index 25043da52..25043da52 100644
--- a/src/test/ui/suggestions/derive-trait-for-method-call.rs
+++ b/tests/ui/suggestions/derive-trait-for-method-call.rs
diff --git a/tests/ui/suggestions/derive-trait-for-method-call.stderr b/tests/ui/suggestions/derive-trait-for-method-call.stderr
new file mode 100644
index 000000000..924b26a8c
--- /dev/null
+++ b/tests/ui/suggestions/derive-trait-for-method-call.stderr
@@ -0,0 +1,105 @@
+error[E0599]: the method `test` exists for struct `Foo<Enum, CloneEnum>`, but its trait bounds were not satisfied
+  --> $DIR/derive-trait-for-method-call.rs:28:15
+   |
+LL | enum Enum {
+   | ---------
+   | |
+   | doesn't satisfy `Enum: Clone`
+   | doesn't satisfy `Enum: Default`
+...
+LL | enum CloneEnum {
+   | -------------- doesn't satisfy `CloneEnum: Default`
+...
+LL | struct Foo<X, Y> (X, Y);
+   | ---------------- method `test` not found for this struct
+...
+LL |     let y = x.test();
+   |               ^^^^ method cannot be called on `Foo<Enum, CloneEnum>` due to unsatisfied trait bounds
+   |
+note: the following trait bounds were not satisfied:
+      `CloneEnum: Default`
+      `Enum: Clone`
+      `Enum: Default`
+  --> $DIR/derive-trait-for-method-call.rs:20:9
+   |
+LL | impl<X: Clone + Default + , Y: Clone + Default> Foo<X, Y> {
+   |         ^^^^^   ^^^^^^^                ^^^^^^^  ---------
+   |         |       |                      |
+   |         |       |                      unsatisfied trait bound introduced here
+   |         |       unsatisfied trait bound introduced here
+   |         unsatisfied trait bound introduced here
+note: the trait `Default` must be implemented
+  --> $SRC_DIR/core/src/default.rs:LL:COL
+help: consider annotating `Enum` with `#[derive(Clone)]`
+   |
+LL | #[derive(Clone)]
+   |
+
+error[E0599]: the method `test` exists for struct `Foo<Struct, CloneStruct>`, but its trait bounds were not satisfied
+  --> $DIR/derive-trait-for-method-call.rs:34:15
+   |
+LL | struct Struct {
+   | -------------
+   | |
+   | doesn't satisfy `Struct: Clone`
+   | doesn't satisfy `Struct: Default`
+...
+LL | struct CloneStruct {
+   | ------------------ doesn't satisfy `CloneStruct: Default`
+...
+LL | struct Foo<X, Y> (X, Y);
+   | ---------------- method `test` not found for this struct
+...
+LL |     let y = x.test();
+   |               ^^^^ method cannot be called on `Foo<Struct, CloneStruct>` due to unsatisfied trait bounds
+   |
+note: the following trait bounds were not satisfied:
+      `CloneStruct: Default`
+      `Struct: Clone`
+      `Struct: Default`
+  --> $DIR/derive-trait-for-method-call.rs:20:9
+   |
+LL | impl<X: Clone + Default + , Y: Clone + Default> Foo<X, Y> {
+   |         ^^^^^   ^^^^^^^                ^^^^^^^  ---------
+   |         |       |                      |
+   |         |       |                      unsatisfied trait bound introduced here
+   |         |       unsatisfied trait bound introduced here
+   |         unsatisfied trait bound introduced here
+help: consider annotating `CloneStruct` with `#[derive(Default)]`
+   |
+LL | #[derive(Default)]
+   |
+help: consider annotating `Struct` with `#[derive(Clone, Default)]`
+   |
+LL | #[derive(Clone, Default)]
+   |
+
+error[E0599]: the method `test` exists for struct `Foo<Vec<Enum>, Instant>`, but its trait bounds were not satisfied
+  --> $DIR/derive-trait-for-method-call.rs:40:15
+   |
+LL | struct Foo<X, Y> (X, Y);
+   | ---------------- method `test` not found for this struct
+...
+LL |     let y = x.test();
+   |               ^^^^ method cannot be called on `Foo<Vec<Enum>, Instant>` due to unsatisfied trait bounds
+  --> $SRC_DIR/std/src/time.rs:LL:COL
+   |
+   = note: doesn't satisfy `Instant: Default`
+  --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
+   |
+   = note: doesn't satisfy `Vec<Enum>: Clone`
+   |
+note: the following trait bounds were not satisfied:
+      `Instant: Default`
+      `Vec<Enum>: Clone`
+  --> $DIR/derive-trait-for-method-call.rs:20:9
+   |
+LL | impl<X: Clone + Default + , Y: Clone + Default> Foo<X, Y> {
+   |         ^^^^^                          ^^^^^^^  ---------
+   |         |                              |
+   |         |                              unsatisfied trait bound introduced here
+   |         unsatisfied trait bound introduced here
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/suggestions/do-not-attempt-to-add-suggestions-with-no-changes.rs b/tests/ui/suggestions/do-not-attempt-to-add-suggestions-with-no-changes.rs
index a25be862a..a25be862a 100644
--- a/src/test/ui/suggestions/do-not-attempt-to-add-suggestions-with-no-changes.rs
+++ b/tests/ui/suggestions/do-not-attempt-to-add-suggestions-with-no-changes.rs
diff --git a/src/test/ui/suggestions/do-not-attempt-to-add-suggestions-with-no-changes.stderr b/tests/ui/suggestions/do-not-attempt-to-add-suggestions-with-no-changes.stderr
index 7bdc8e00f..0cd6267b3 100644
--- a/src/test/ui/suggestions/do-not-attempt-to-add-suggestions-with-no-changes.stderr
+++ b/tests/ui/suggestions/do-not-attempt-to-add-suggestions-with-no-changes.stderr
@@ -3,11 +3,9 @@ error[E0573]: expected type, found module `result`
    |
 LL | impl result {
    |      ^^^^^^ help: an enum with a similar name exists: `Result`
+  --> $SRC_DIR/core/src/result.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   | --------------------- similarly named enum `Result` defined here
+   = note: similarly named enum `Result` defined here
 
 error[E0573]: expected type, found variant `Err`
   --> $DIR/do-not-attempt-to-add-suggestions-with-no-changes.rs:3:25
diff --git a/src/test/ui/suggestions/dont-suggest-deref-inside-macro-issue-58298.rs b/tests/ui/suggestions/dont-suggest-deref-inside-macro-issue-58298.rs
index ef1c09d21..ef1c09d21 100644
--- a/src/test/ui/suggestions/dont-suggest-deref-inside-macro-issue-58298.rs
+++ b/tests/ui/suggestions/dont-suggest-deref-inside-macro-issue-58298.rs
diff --git a/src/test/ui/suggestions/dont-suggest-deref-inside-macro-issue-58298.stderr b/tests/ui/suggestions/dont-suggest-deref-inside-macro-issue-58298.stderr
index 5dc4e6444..5dc4e6444 100644
--- a/src/test/ui/suggestions/dont-suggest-deref-inside-macro-issue-58298.stderr
+++ b/tests/ui/suggestions/dont-suggest-deref-inside-macro-issue-58298.stderr
diff --git a/src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/auxiliary/hidden-child.rs b/tests/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/auxiliary/hidden-child.rs
index 15e0af1de..15e0af1de 100644
--- a/src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/auxiliary/hidden-child.rs
+++ b/tests/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/auxiliary/hidden-child.rs
diff --git a/src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/auxiliary/hidden-parent.rs b/tests/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/auxiliary/hidden-parent.rs
index 5a5079d82..5a5079d82 100644
--- a/src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/auxiliary/hidden-parent.rs
+++ b/tests/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/auxiliary/hidden-parent.rs
diff --git a/src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-child.rs b/tests/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-child.rs
index 38dabc9d7..38dabc9d7 100644
--- a/src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-child.rs
+++ b/tests/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-child.rs
diff --git a/src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-child.stderr b/tests/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-child.stderr
index 67f4ac08d..67f4ac08d 100644
--- a/src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-child.stderr
+++ b/tests/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-child.stderr
diff --git a/src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-parent.rs b/tests/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-parent.rs
index 4d96d6c16..4d96d6c16 100644
--- a/src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-parent.rs
+++ b/tests/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-parent.rs
diff --git a/src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-parent.stderr b/tests/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-parent.stderr
index d92b81279..d92b81279 100644
--- a/src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-parent.stderr
+++ b/tests/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-parent.stderr
diff --git a/src/test/ui/suggestions/dont-suggest-pin-array-dot-set.rs b/tests/ui/suggestions/dont-suggest-pin-array-dot-set.rs
index acb897571..acb897571 100644
--- a/src/test/ui/suggestions/dont-suggest-pin-array-dot-set.rs
+++ b/tests/ui/suggestions/dont-suggest-pin-array-dot-set.rs
diff --git a/src/test/ui/suggestions/dont-suggest-pin-array-dot-set.stderr b/tests/ui/suggestions/dont-suggest-pin-array-dot-set.stderr
index c66da3ea6..c66da3ea6 100644
--- a/src/test/ui/suggestions/dont-suggest-pin-array-dot-set.stderr
+++ b/tests/ui/suggestions/dont-suggest-pin-array-dot-set.stderr
diff --git a/tests/ui/suggestions/dont-suggest-ref/duplicate-suggestions.rs b/tests/ui/suggestions/dont-suggest-ref/duplicate-suggestions.rs
new file mode 100644
index 000000000..e19d497f2
--- /dev/null
+++ b/tests/ui/suggestions/dont-suggest-ref/duplicate-suggestions.rs
@@ -0,0 +1,131 @@
+#[derive(Clone)]
+enum Either {
+    One(X),
+    Two(X),
+}
+
+#[derive(Clone)]
+struct X(Y);
+
+#[derive(Clone)]
+struct Y;
+
+
+pub fn main() {
+    let e = Either::One(X(Y));
+    let mut em = Either::One(X(Y));
+
+    let r = &e;
+    let rm = &mut Either::One(X(Y));
+
+    let x = X(Y);
+    let mut xm = X(Y);
+
+    let s = &x;
+    let sm = &mut X(Y);
+
+    let ve = vec![Either::One(X(Y))];
+
+    let vr = &ve;
+    let vrm = &mut vec![Either::One(X(Y))];
+
+    let vx = vec![X(Y)];
+
+    let vs = &vx;
+    let vsm = &mut vec![X(Y)];
+
+    // test for duplicate suggestions
+
+    let &(X(_t), X(_u)) = &(x.clone(), x.clone());
+    //~^ ERROR cannot move
+    //~| HELP consider removing the borrow
+    if let &(Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing the borrow
+    while let &(Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing the borrow
+    match &(e.clone(), e.clone()) {
+        //~^ ERROR cannot move
+        &(Either::One(_t), Either::Two(_u)) => (),
+        //~^ HELP consider removing the borrow
+        &(Either::Two(_t), Either::One(_u)) => (),
+        //~^ HELP consider removing the borrow
+        _ => (),
+    }
+    match &(e.clone(), e.clone()) {
+        //~^ ERROR cannot move
+        &(Either::One(_t), Either::Two(_u))
+        //~^ HELP consider removing the borrow
+        | &(Either::Two(_t), Either::One(_u)) => (),
+        // FIXME: would really like a suggestion here too
+        _ => (),
+    }
+    match &(e.clone(), e.clone()) {
+        //~^ ERROR cannot move
+        &(Either::One(_t), Either::Two(_u)) => (),
+        //~^ HELP consider removing the borrow
+        &(Either::Two(ref _t), Either::One(ref _u)) => (),
+        _ => (),
+    }
+    match &(e.clone(), e.clone()) {
+        //~^ ERROR cannot move
+        &(Either::One(_t), Either::Two(_u)) => (),
+        //~^ HELP consider removing the borrow
+        (Either::Two(_t), Either::One(_u)) => (),
+        _ => (),
+    }
+    fn f5(&(X(_t), X(_u)): &(X, X)) { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing the borrow
+
+    let &mut (X(_t), X(_u)) = &mut (xm.clone(), xm.clone());
+    //~^ ERROR cannot move
+    //~| HELP consider removing the mutable borrow
+    if let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing the mutable borrow
+    while let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing the mutable borrow
+    match &mut (em.clone(), em.clone()) {
+        //~^ ERROR cannot move
+        &mut (Either::One(_t), Either::Two(_u)) => (),
+        //~^ HELP consider removing the mutable borrow
+        &mut (Either::Two(_t), Either::One(_u)) => (),
+        //~^ HELP consider removing the mutable borrow
+        _ => (),
+    }
+    match &mut (em.clone(), em.clone()) {
+        //~^ ERROR cannot move
+        &mut (Either::One(_t), Either::Two(_u))
+        //~^ HELP consider removing the mutable borrow
+        | &mut (Either::Two(_t), Either::One(_u)) => (),
+        // FIXME: would really like a suggestion here too
+        _ => (),
+    }
+    match &mut (em.clone(), em.clone()) {
+        //~^ ERROR cannot move
+        &mut (Either::One(_t), Either::Two(_u)) => (),
+        //~^ HELP consider removing the mutable borrow
+        &mut (Either::Two(ref _t), Either::One(ref _u)) => (),
+        _ => (),
+    }
+    match &mut (em.clone(), em.clone()) {
+        //~^ ERROR cannot move
+        &mut (Either::One(_t), Either::Two(_u)) => (),
+        //~^ HELP consider removing the mutable borrow
+        &mut (Either::Two(ref mut _t), Either::One(ref mut _u)) => (),
+        _ => (),
+    }
+    match &mut (em.clone(), em.clone()) {
+        //~^ ERROR cannot move
+        &mut (Either::One(_t), Either::Two(_u)) => (),
+        //~^ HELP consider removing the mutable borrow
+        (Either::Two(_t), Either::One(_u)) => (),
+        _ => (),
+    }
+    fn f6(&mut (X(_t), X(_u)): &mut (X, X)) { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing the mutable borrow
+}
diff --git a/tests/ui/suggestions/dont-suggest-ref/duplicate-suggestions.stderr b/tests/ui/suggestions/dont-suggest-ref/duplicate-suggestions.stderr
new file mode 100644
index 000000000..b96b3713f
--- /dev/null
+++ b/tests/ui/suggestions/dont-suggest-ref/duplicate-suggestions.stderr
@@ -0,0 +1,309 @@
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/duplicate-suggestions.rs:39:27
+   |
+LL |     let &(X(_t), X(_u)) = &(x.clone(), x.clone());
+   |             --     --     ^^^^^^^^^^^^^^^^^^^^^^^
+   |             |      |
+   |             |      ...and here
+   |             data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the borrow
+   |
+LL -     let &(X(_t), X(_u)) = &(x.clone(), x.clone());
+LL +     let (X(_t), X(_u)) = &(x.clone(), x.clone());
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/duplicate-suggestions.rs:42:50
+   |
+LL |     if let &(Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) { }
+   |                          --               --     ^^^^^^^^^^^^^^^^^^^^^^^
+   |                          |                |
+   |                          |                ...and here
+   |                          data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the borrow
+   |
+LL -     if let &(Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) { }
+LL +     if let (Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) { }
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/duplicate-suggestions.rs:45:53
+   |
+LL |     while let &(Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) { }
+   |                             --               --     ^^^^^^^^^^^^^^^^^^^^^^^
+   |                             |                |
+   |                             |                ...and here
+   |                             data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the borrow
+   |
+LL -     while let &(Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) { }
+LL +     while let (Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) { }
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/duplicate-suggestions.rs:48:11
+   |
+LL |     match &(e.clone(), e.clone()) {
+   |           ^^^^^^^^^^^^^^^^^^^^^^^
+LL |
+LL |         &(Either::One(_t), Either::Two(_u)) => (),
+   |                       --               -- ...and here
+   |                       |
+   |                       data moved here
+LL |
+LL |         &(Either::Two(_t), Either::One(_u)) => (),
+   |                       -- ...and here   -- ...and here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the borrow
+   |
+LL -         &(Either::One(_t), Either::Two(_u)) => (),
+LL +         (Either::One(_t), Either::Two(_u)) => (),
+   |
+help: consider removing the borrow
+   |
+LL -         &(Either::Two(_t), Either::One(_u)) => (),
+LL +         (Either::Two(_t), Either::One(_u)) => (),
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/duplicate-suggestions.rs:56:11
+   |
+LL |     match &(e.clone(), e.clone()) {
+   |           ^^^^^^^^^^^^^^^^^^^^^^^
+LL |
+LL |         &(Either::One(_t), Either::Two(_u))
+   |                       --               -- ...and here
+   |                       |
+   |                       data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the borrow
+   |
+LL -         &(Either::One(_t), Either::Two(_u))
+LL +         (Either::One(_t), Either::Two(_u))
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/duplicate-suggestions.rs:64:11
+   |
+LL |     match &(e.clone(), e.clone()) {
+   |           ^^^^^^^^^^^^^^^^^^^^^^^
+LL |
+LL |         &(Either::One(_t), Either::Two(_u)) => (),
+   |                       --               -- ...and here
+   |                       |
+   |                       data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the borrow
+   |
+LL -         &(Either::One(_t), Either::Two(_u)) => (),
+LL +         (Either::One(_t), Either::Two(_u)) => (),
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/duplicate-suggestions.rs:71:11
+   |
+LL |     match &(e.clone(), e.clone()) {
+   |           ^^^^^^^^^^^^^^^^^^^^^^^
+LL |
+LL |         &(Either::One(_t), Either::Two(_u)) => (),
+   |                       --               -- ...and here
+   |                       |
+   |                       data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the borrow
+   |
+LL -         &(Either::One(_t), Either::Two(_u)) => (),
+LL +         (Either::One(_t), Either::Two(_u)) => (),
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/duplicate-suggestions.rs:82:31
+   |
+LL |     let &mut (X(_t), X(_u)) = &mut (xm.clone(), xm.clone());
+   |                 --     --     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                 |      |
+   |                 |      ...and here
+   |                 data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the mutable borrow
+   |
+LL -     let &mut (X(_t), X(_u)) = &mut (xm.clone(), xm.clone());
+LL +     let (X(_t), X(_u)) = &mut (xm.clone(), xm.clone());
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/duplicate-suggestions.rs:85:54
+   |
+LL |     if let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
+   |                              --               --     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                              |                |
+   |                              |                ...and here
+   |                              data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the mutable borrow
+   |
+LL -     if let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
+LL +     if let (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/duplicate-suggestions.rs:88:57
+   |
+LL |     while let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
+   |                                 --               --     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                                 |                |
+   |                                 |                ...and here
+   |                                 data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the mutable borrow
+   |
+LL -     while let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
+LL +     while let (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/duplicate-suggestions.rs:91:11
+   |
+LL |     match &mut (em.clone(), em.clone()) {
+   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |
+LL |         &mut (Either::One(_t), Either::Two(_u)) => (),
+   |                           --               -- ...and here
+   |                           |
+   |                           data moved here
+LL |
+LL |         &mut (Either::Two(_t), Either::One(_u)) => (),
+   |                           -- ...and here   -- ...and here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the mutable borrow
+   |
+LL -         &mut (Either::One(_t), Either::Two(_u)) => (),
+LL +         (Either::One(_t), Either::Two(_u)) => (),
+   |
+help: consider removing the mutable borrow
+   |
+LL -         &mut (Either::Two(_t), Either::One(_u)) => (),
+LL +         (Either::Two(_t), Either::One(_u)) => (),
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/duplicate-suggestions.rs:99:11
+   |
+LL |     match &mut (em.clone(), em.clone()) {
+   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |
+LL |         &mut (Either::One(_t), Either::Two(_u))
+   |                           --               -- ...and here
+   |                           |
+   |                           data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the mutable borrow
+   |
+LL -         &mut (Either::One(_t), Either::Two(_u))
+LL +         (Either::One(_t), Either::Two(_u))
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/duplicate-suggestions.rs:107:11
+   |
+LL |     match &mut (em.clone(), em.clone()) {
+   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |
+LL |         &mut (Either::One(_t), Either::Two(_u)) => (),
+   |                           --               -- ...and here
+   |                           |
+   |                           data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the mutable borrow
+   |
+LL -         &mut (Either::One(_t), Either::Two(_u)) => (),
+LL +         (Either::One(_t), Either::Two(_u)) => (),
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/duplicate-suggestions.rs:114:11
+   |
+LL |     match &mut (em.clone(), em.clone()) {
+   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |
+LL |         &mut (Either::One(_t), Either::Two(_u)) => (),
+   |                           --               -- ...and here
+   |                           |
+   |                           data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the mutable borrow
+   |
+LL -         &mut (Either::One(_t), Either::Two(_u)) => (),
+LL +         (Either::One(_t), Either::Two(_u)) => (),
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/duplicate-suggestions.rs:121:11
+   |
+LL |     match &mut (em.clone(), em.clone()) {
+   |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |
+LL |         &mut (Either::One(_t), Either::Two(_u)) => (),
+   |                           --               -- ...and here
+   |                           |
+   |                           data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the mutable borrow
+   |
+LL -         &mut (Either::One(_t), Either::Two(_u)) => (),
+LL +         (Either::One(_t), Either::Two(_u)) => (),
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/duplicate-suggestions.rs:78:11
+   |
+LL |     fn f5(&(X(_t), X(_u)): &(X, X)) { }
+   |           ^^^^--^^^^^--^^
+   |               |      |
+   |               |      ...and here
+   |               data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the borrow
+   |
+LL -     fn f5(&(X(_t), X(_u)): &(X, X)) { }
+LL +     fn f5((X(_t), X(_u)): &(X, X)) { }
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/duplicate-suggestions.rs:128:11
+   |
+LL |     fn f6(&mut (X(_t), X(_u)): &mut (X, X)) { }
+   |           ^^^^^^^^--^^^^^--^^
+   |                   |      |
+   |                   |      ...and here
+   |                   data moved here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the mutable borrow
+   |
+LL -     fn f6(&mut (X(_t), X(_u)): &mut (X, X)) { }
+LL +     fn f6((X(_t), X(_u)): &mut (X, X)) { }
+   |
+
+error: aborting due to 17 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/suggestions/dont-suggest-ref/move-into-closure.rs b/tests/ui/suggestions/dont-suggest-ref/move-into-closure.rs
index f1e043c30..44eac3691 100644
--- a/src/test/ui/suggestions/dont-suggest-ref/move-into-closure.rs
+++ b/tests/ui/suggestions/dont-suggest-ref/move-into-closure.rs
@@ -28,26 +28,21 @@ fn move_into_fn() {
         let X(_t) = x;
         //~^ ERROR cannot move
         //~| HELP consider borrowing here
-        //~| SUGGESTION &x
         if let Either::One(_t) = e { }
         //~^ ERROR cannot move
         //~| HELP consider borrowing here
-        //~| SUGGESTION &e
         while let Either::One(_t) = e { }
         //~^ ERROR cannot move
         //~| HELP consider borrowing here
-        //~| SUGGESTION &e
         match e {
             //~^ ERROR cannot move
             //~| HELP consider borrowing here
-            //~| SUGGESTION &e
             Either::One(_t)
             | Either::Two(_t) => (),
         }
         match e {
             //~^ ERROR cannot move
             //~| HELP consider borrowing here
-            //~| SUGGESTION &e
             Either::One(_t) => (),
             Either::Two(ref _t) => (),
             // FIXME: should suggest removing `ref` too
@@ -56,26 +51,21 @@ fn move_into_fn() {
         let X(mut _t) = x;
         //~^ ERROR cannot move
         //~| HELP consider borrowing here
-        //~| SUGGESTION &x
         if let Either::One(mut _t) = em { }
         //~^ ERROR cannot move
         //~| HELP consider borrowing here
-        //~| SUGGESTION &em
         while let Either::One(mut _t) = em { }
         //~^ ERROR cannot move
         //~| HELP consider borrowing here
-        //~| SUGGESTION &em
         match em {
             //~^ ERROR cannot move
             //~| HELP consider borrowing here
-            //~| SUGGESTION &em
             Either::One(mut _t)
             | Either::Two(mut _t) => (),
         }
         match em {
             //~^ ERROR cannot move
             //~| HELP consider borrowing here
-            //~| SUGGESTION &em
             Either::One(mut _t) => (),
             Either::Two(ref _t) => (),
             // FIXME: should suggest removing `ref` too
@@ -95,26 +85,21 @@ fn move_into_fnmut() {
         let X(_t) = x;
         //~^ ERROR cannot move
         //~| HELP consider borrowing here
-        //~| SUGGESTION &x
         if let Either::One(_t) = e { }
         //~^ ERROR cannot move
         //~| HELP consider borrowing here
-        //~| SUGGESTION &e
         while let Either::One(_t) = e { }
         //~^ ERROR cannot move
         //~| HELP consider borrowing here
-        //~| SUGGESTION &e
         match e {
             //~^ ERROR cannot move
             //~| HELP consider borrowing here
-            //~| SUGGESTION &e
             Either::One(_t)
             | Either::Two(_t) => (),
         }
         match e {
             //~^ ERROR cannot move
             //~| HELP consider borrowing here
-            //~| SUGGESTION &e
             Either::One(_t) => (),
             Either::Two(ref _t) => (),
             // FIXME: should suggest removing `ref` too
@@ -123,26 +108,21 @@ fn move_into_fnmut() {
         let X(mut _t) = x;
         //~^ ERROR cannot move
         //~| HELP consider borrowing here
-        //~| SUGGESTION &x
         if let Either::One(mut _t) = em { }
         //~^ ERROR cannot move
         //~| HELP consider borrowing here
-        //~| SUGGESTION &em
         while let Either::One(mut _t) = em { }
         //~^ ERROR cannot move
         //~| HELP consider borrowing here
-        //~| SUGGESTION &em
         match em {
             //~^ ERROR cannot move
             //~| HELP consider borrowing here
-            //~| SUGGESTION &em
             Either::One(mut _t)
             | Either::Two(mut _t) => (),
         }
         match em {
             //~^ ERROR cannot move
             //~| HELP consider borrowing here
-            //~| SUGGESTION &em
             Either::One(mut _t) => (),
             Either::Two(ref _t) => (),
             // FIXME: should suggest removing `ref` too
@@ -150,7 +130,6 @@ fn move_into_fnmut() {
         match em {
             //~^ ERROR cannot move
             //~| HELP consider borrowing here
-            //~| SUGGESTION &em
             Either::One(mut _t) => (),
             Either::Two(ref mut _t) => (),
             // FIXME: should suggest removing `ref` too
diff --git a/src/test/ui/suggestions/dont-suggest-ref/move-into-closure.stderr b/tests/ui/suggestions/dont-suggest-ref/move-into-closure.stderr
index e06ee4290..edda2cbc7 100644
--- a/src/test/ui/suggestions/dont-suggest-ref/move-into-closure.stderr
+++ b/tests/ui/suggestions/dont-suggest-ref/move-into-closure.stderr
@@ -7,13 +7,18 @@ LL |     let x = X(Y);
 LL |     consume_fn(|| {
    |                -- captured by this `Fn` closure
 LL |         let X(_t) = x;
-   |               --    ^ help: consider borrowing here: `&x`
+   |               --    ^
    |               |
    |               data moved here
    |               move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         let X(_t) = &x;
+   |                     +
 
 error[E0507]: cannot move out of `e.0`, as `e` is a captured variable in an `Fn` closure
-  --> $DIR/move-into-closure.rs:32:34
+  --> $DIR/move-into-closure.rs:31:34
    |
 LL |     let e = Either::One(X(Y));
    |         - captured outer variable
@@ -22,13 +27,18 @@ LL |     consume_fn(|| {
    |                -- captured by this `Fn` closure
 ...
 LL |         if let Either::One(_t) = e { }
-   |                            --    ^ help: consider borrowing here: `&e`
+   |                            --    ^
    |                            |
    |                            data moved here
    |                            move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         if let Either::One(_t) = &e { }
+   |                                  +
 
 error[E0507]: cannot move out of `e.0`, as `e` is a captured variable in an `Fn` closure
-  --> $DIR/move-into-closure.rs:36:37
+  --> $DIR/move-into-closure.rs:34:37
    |
 LL |     let e = Either::One(X(Y));
    |         - captured outer variable
@@ -37,13 +47,18 @@ LL |     consume_fn(|| {
    |                -- captured by this `Fn` closure
 ...
 LL |         while let Either::One(_t) = e { }
-   |                               --    ^ help: consider borrowing here: `&e`
+   |                               --    ^
    |                               |
    |                               data moved here
    |                               move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         while let Either::One(_t) = &e { }
+   |                                     +
 
 error[E0507]: cannot move out of `e.0`, as `e` is a captured variable in an `Fn` closure
-  --> $DIR/move-into-closure.rs:40:15
+  --> $DIR/move-into-closure.rs:37:15
    |
 LL |     let e = Either::One(X(Y));
    |         - captured outer variable
@@ -52,16 +67,21 @@ LL |     consume_fn(|| {
    |                -- captured by this `Fn` closure
 ...
 LL |         match e {
-   |               ^ help: consider borrowing here: `&e`
+   |               ^
 ...
 LL |             Either::One(_t)
    |                         --
    |                         |
    |                         data moved here
    |                         move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         match &e {
+   |               +
 
 error[E0507]: cannot move out of `e.0`, as `e` is a captured variable in an `Fn` closure
-  --> $DIR/move-into-closure.rs:47:15
+  --> $DIR/move-into-closure.rs:43:15
    |
 LL |     let e = Either::One(X(Y));
    |         - captured outer variable
@@ -70,16 +90,21 @@ LL |     consume_fn(|| {
    |                -- captured by this `Fn` closure
 ...
 LL |         match e {
-   |               ^ help: consider borrowing here: `&e`
+   |               ^
 ...
 LL |             Either::One(_t) => (),
    |                         --
    |                         |
    |                         data moved here
    |                         move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         match &e {
+   |               +
 
 error[E0507]: cannot move out of `x.0`, as `x` is a captured variable in an `Fn` closure
-  --> $DIR/move-into-closure.rs:56:25
+  --> $DIR/move-into-closure.rs:51:25
    |
 LL |     let x = X(Y);
    |         - captured outer variable
@@ -88,13 +113,18 @@ LL |     consume_fn(|| {
    |                -- captured by this `Fn` closure
 ...
 LL |         let X(mut _t) = x;
-   |               ------    ^ help: consider borrowing here: `&x`
+   |               ------    ^
    |               |
    |               data moved here
    |               move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         let X(mut _t) = &x;
+   |                         +
 
 error[E0507]: cannot move out of `em.0`, as `em` is a captured variable in an `Fn` closure
-  --> $DIR/move-into-closure.rs:60:38
+  --> $DIR/move-into-closure.rs:54:38
    |
 LL |     let mut em = Either::One(X(Y));
    |         ------ captured outer variable
@@ -103,13 +133,18 @@ LL |     consume_fn(|| {
    |                -- captured by this `Fn` closure
 ...
 LL |         if let Either::One(mut _t) = em { }
-   |                            ------    ^^ help: consider borrowing here: `&em`
+   |                            ------    ^^
    |                            |
    |                            data moved here
    |                            move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         if let Either::One(mut _t) = &em { }
+   |                                      +
 
 error[E0507]: cannot move out of `em.0`, as `em` is a captured variable in an `Fn` closure
-  --> $DIR/move-into-closure.rs:64:41
+  --> $DIR/move-into-closure.rs:57:41
    |
 LL |     let mut em = Either::One(X(Y));
    |         ------ captured outer variable
@@ -118,13 +153,18 @@ LL |     consume_fn(|| {
    |                -- captured by this `Fn` closure
 ...
 LL |         while let Either::One(mut _t) = em { }
-   |                               ------    ^^ help: consider borrowing here: `&em`
+   |                               ------    ^^
    |                               |
    |                               data moved here
    |                               move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         while let Either::One(mut _t) = &em { }
+   |                                         +
 
 error[E0507]: cannot move out of `em.0`, as `em` is a captured variable in an `Fn` closure
-  --> $DIR/move-into-closure.rs:68:15
+  --> $DIR/move-into-closure.rs:60:15
    |
 LL |     let mut em = Either::One(X(Y));
    |         ------ captured outer variable
@@ -133,16 +173,21 @@ LL |     consume_fn(|| {
    |                -- captured by this `Fn` closure
 ...
 LL |         match em {
-   |               ^^ help: consider borrowing here: `&em`
+   |               ^^
 ...
 LL |             Either::One(mut _t)
    |                         ------
    |                         |
    |                         data moved here
    |                         move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         match &em {
+   |               +
 
 error[E0507]: cannot move out of `em.0`, as `em` is a captured variable in an `Fn` closure
-  --> $DIR/move-into-closure.rs:75:15
+  --> $DIR/move-into-closure.rs:66:15
    |
 LL |     let mut em = Either::One(X(Y));
    |         ------ captured outer variable
@@ -151,16 +196,21 @@ LL |     consume_fn(|| {
    |                -- captured by this `Fn` closure
 ...
 LL |         match em {
-   |               ^^ help: consider borrowing here: `&em`
+   |               ^^
 ...
 LL |             Either::One(mut _t) => (),
    |                         ------
    |                         |
    |                         data moved here
    |                         move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         match &em {
+   |               +
 
 error[E0507]: cannot move out of `x.0`, as `x` is a captured variable in an `FnMut` closure
-  --> $DIR/move-into-closure.rs:95:21
+  --> $DIR/move-into-closure.rs:85:21
    |
 LL |     let x = X(Y);
    |         - captured outer variable
@@ -168,13 +218,18 @@ LL |     let x = X(Y);
 LL |     consume_fnmut(|| {
    |                   -- captured by this `FnMut` closure
 LL |         let X(_t) = x;
-   |               --    ^ help: consider borrowing here: `&x`
+   |               --    ^
    |               |
    |               data moved here
    |               move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         let X(_t) = &x;
+   |                     +
 
 error[E0507]: cannot move out of `e.0`, as `e` is a captured variable in an `FnMut` closure
-  --> $DIR/move-into-closure.rs:99:34
+  --> $DIR/move-into-closure.rs:88:34
    |
 LL |     let e = Either::One(X(Y));
    |         - captured outer variable
@@ -183,13 +238,18 @@ LL |     consume_fnmut(|| {
    |                   -- captured by this `FnMut` closure
 ...
 LL |         if let Either::One(_t) = e { }
-   |                            --    ^ help: consider borrowing here: `&e`
+   |                            --    ^
    |                            |
    |                            data moved here
    |                            move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         if let Either::One(_t) = &e { }
+   |                                  +
 
 error[E0507]: cannot move out of `e.0`, as `e` is a captured variable in an `FnMut` closure
-  --> $DIR/move-into-closure.rs:103:37
+  --> $DIR/move-into-closure.rs:91:37
    |
 LL |     let e = Either::One(X(Y));
    |         - captured outer variable
@@ -198,13 +258,18 @@ LL |     consume_fnmut(|| {
    |                   -- captured by this `FnMut` closure
 ...
 LL |         while let Either::One(_t) = e { }
-   |                               --    ^ help: consider borrowing here: `&e`
+   |                               --    ^
    |                               |
    |                               data moved here
    |                               move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         while let Either::One(_t) = &e { }
+   |                                     +
 
 error[E0507]: cannot move out of `e.0`, as `e` is a captured variable in an `FnMut` closure
-  --> $DIR/move-into-closure.rs:107:15
+  --> $DIR/move-into-closure.rs:94:15
    |
 LL |     let e = Either::One(X(Y));
    |         - captured outer variable
@@ -213,16 +278,21 @@ LL |     consume_fnmut(|| {
    |                   -- captured by this `FnMut` closure
 ...
 LL |         match e {
-   |               ^ help: consider borrowing here: `&e`
+   |               ^
 ...
 LL |             Either::One(_t)
    |                         --
    |                         |
    |                         data moved here
    |                         move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         match &e {
+   |               +
 
 error[E0507]: cannot move out of `e.0`, as `e` is a captured variable in an `FnMut` closure
-  --> $DIR/move-into-closure.rs:114:15
+  --> $DIR/move-into-closure.rs:100:15
    |
 LL |     let e = Either::One(X(Y));
    |         - captured outer variable
@@ -231,16 +301,21 @@ LL |     consume_fnmut(|| {
    |                   -- captured by this `FnMut` closure
 ...
 LL |         match e {
-   |               ^ help: consider borrowing here: `&e`
+   |               ^
 ...
 LL |             Either::One(_t) => (),
    |                         --
    |                         |
    |                         data moved here
    |                         move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         match &e {
+   |               +
 
 error[E0507]: cannot move out of `x.0`, as `x` is a captured variable in an `FnMut` closure
-  --> $DIR/move-into-closure.rs:123:25
+  --> $DIR/move-into-closure.rs:108:25
    |
 LL |     let x = X(Y);
    |         - captured outer variable
@@ -249,13 +324,18 @@ LL |     consume_fnmut(|| {
    |                   -- captured by this `FnMut` closure
 ...
 LL |         let X(mut _t) = x;
-   |               ------    ^ help: consider borrowing here: `&x`
+   |               ------    ^
    |               |
    |               data moved here
    |               move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         let X(mut _t) = &x;
+   |                         +
 
 error[E0507]: cannot move out of `em.0`, as `em` is a captured variable in an `FnMut` closure
-  --> $DIR/move-into-closure.rs:127:38
+  --> $DIR/move-into-closure.rs:111:38
    |
 LL |     let mut em = Either::One(X(Y));
    |         ------ captured outer variable
@@ -264,13 +344,18 @@ LL |     consume_fnmut(|| {
    |                   -- captured by this `FnMut` closure
 ...
 LL |         if let Either::One(mut _t) = em { }
-   |                            ------    ^^ help: consider borrowing here: `&em`
+   |                            ------    ^^
    |                            |
    |                            data moved here
    |                            move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         if let Either::One(mut _t) = &em { }
+   |                                      +
 
 error[E0507]: cannot move out of `em.0`, as `em` is a captured variable in an `FnMut` closure
-  --> $DIR/move-into-closure.rs:131:41
+  --> $DIR/move-into-closure.rs:114:41
    |
 LL |     let mut em = Either::One(X(Y));
    |         ------ captured outer variable
@@ -279,13 +364,18 @@ LL |     consume_fnmut(|| {
    |                   -- captured by this `FnMut` closure
 ...
 LL |         while let Either::One(mut _t) = em { }
-   |                               ------    ^^ help: consider borrowing here: `&em`
+   |                               ------    ^^
    |                               |
    |                               data moved here
    |                               move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         while let Either::One(mut _t) = &em { }
+   |                                         +
 
 error[E0507]: cannot move out of `em.0`, as `em` is a captured variable in an `FnMut` closure
-  --> $DIR/move-into-closure.rs:135:15
+  --> $DIR/move-into-closure.rs:117:15
    |
 LL |     let mut em = Either::One(X(Y));
    |         ------ captured outer variable
@@ -294,16 +384,21 @@ LL |     consume_fnmut(|| {
    |                   -- captured by this `FnMut` closure
 ...
 LL |         match em {
-   |               ^^ help: consider borrowing here: `&em`
+   |               ^^
 ...
 LL |             Either::One(mut _t)
    |                         ------
    |                         |
    |                         data moved here
    |                         move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         match &em {
+   |               +
 
 error[E0507]: cannot move out of `em.0`, as `em` is a captured variable in an `FnMut` closure
-  --> $DIR/move-into-closure.rs:142:15
+  --> $DIR/move-into-closure.rs:123:15
    |
 LL |     let mut em = Either::One(X(Y));
    |         ------ captured outer variable
@@ -312,16 +407,21 @@ LL |     consume_fnmut(|| {
    |                   -- captured by this `FnMut` closure
 ...
 LL |         match em {
-   |               ^^ help: consider borrowing here: `&em`
+   |               ^^
 ...
 LL |             Either::One(mut _t) => (),
    |                         ------
    |                         |
    |                         data moved here
    |                         move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         match &em {
+   |               +
 
 error[E0507]: cannot move out of `em.0`, as `em` is a captured variable in an `FnMut` closure
-  --> $DIR/move-into-closure.rs:150:15
+  --> $DIR/move-into-closure.rs:130:15
    |
 LL |     let mut em = Either::One(X(Y));
    |         ------ captured outer variable
@@ -330,13 +430,18 @@ LL |     consume_fnmut(|| {
    |                   -- captured by this `FnMut` closure
 ...
 LL |         match em {
-   |               ^^ help: consider borrowing here: `&em`
+   |               ^^
 ...
 LL |             Either::One(mut _t) => (),
    |                         ------
    |                         |
    |                         data moved here
    |                         move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |         match &em {
+   |               +
 
 error: aborting due to 21 previous errors
 
diff --git a/tests/ui/suggestions/dont-suggest-ref/simple.rs b/tests/ui/suggestions/dont-suggest-ref/simple.rs
new file mode 100644
index 000000000..1e40e60a1
--- /dev/null
+++ b/tests/ui/suggestions/dont-suggest-ref/simple.rs
@@ -0,0 +1,336 @@
+#[derive(Clone)]
+enum Either {
+    One(X),
+    Two(X),
+}
+
+#[derive(Clone)]
+struct X(Y);
+
+#[derive(Clone)]
+struct Y;
+
+pub fn main() {
+    let e = Either::One(X(Y));
+    let mut em = Either::One(X(Y));
+
+    let r = &e;
+    let rm = &mut Either::One(X(Y));
+
+    let x = X(Y);
+    let mut xm = X(Y);
+
+    let s = &x;
+    let sm = &mut X(Y);
+
+    let ve = vec![Either::One(X(Y))];
+
+    let vr = &ve;
+    let vrm = &mut vec![Either::One(X(Y))];
+
+    let vx = vec![X(Y)];
+
+    let vs = &vx;
+    let vsm = &mut vec![X(Y)];
+
+    // move from Either/X place
+
+    let X(_t) = *s;
+    //~^ ERROR cannot move
+    //~| HELP consider removing the dereference here
+    if let Either::One(_t) = *r { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing the dereference here
+    while let Either::One(_t) = *r { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing the dereference here
+    match *r {
+        //~^ ERROR cannot move
+        //~| HELP consider removing the dereference here
+        Either::One(_t)
+        | Either::Two(_t) => (),
+    }
+    match *r {
+        //~^ ERROR cannot move
+        //~| HELP consider removing the dereference here
+        Either::One(_t) => (),
+        Either::Two(ref _t) => (),
+        // FIXME: should suggest removing `ref` too
+    }
+
+    let X(_t) = *sm;
+    //~^ ERROR cannot move
+    //~| HELP consider removing the dereference here
+    if let Either::One(_t) = *rm { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing the dereference here
+    while let Either::One(_t) = *rm { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing the dereference here
+    match *rm {
+        //~^ ERROR cannot move
+        //~| HELP consider removing the dereference here
+        Either::One(_t)
+        | Either::Two(_t) => (),
+    }
+    match *rm {
+        //~^ ERROR cannot move
+        //~| HELP consider removing the dereference here
+        Either::One(_t) => (),
+        Either::Two(ref _t) => (),
+        // FIXME: should suggest removing `ref` too
+    }
+    match *rm {
+        //~^ ERROR cannot move
+        //~| HELP consider removing the dereference here
+        Either::One(_t) => (),
+        Either::Two(ref mut _t) => (),
+        // FIXME: should suggest removing `ref` too
+    }
+
+    let X(_t) = vs[0];
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing here
+    if let Either::One(_t) = vr[0] { }
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing here
+    while let Either::One(_t) = vr[0] { }
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing here
+    match vr[0] {
+        //~^ ERROR cannot move
+        //~| HELP consider borrowing here
+        Either::One(_t)
+        | Either::Two(_t) => (),
+    }
+    match vr[0] {
+        //~^ ERROR cannot move
+        //~| HELP consider borrowing here
+        Either::One(_t) => (),
+        Either::Two(ref _t) => (),
+        // FIXME: should suggest removing `ref` too
+    }
+
+    let X(_t) = vsm[0];
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing here
+    if let Either::One(_t) = vrm[0] { }
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing here
+    while let Either::One(_t) = vrm[0] { }
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing here
+    match vrm[0] {
+        //~^ ERROR cannot move
+        //~| HELP consider borrowing here
+        Either::One(_t)
+        | Either::Two(_t) => (),
+    }
+    match vrm[0] {
+        //~^ ERROR cannot move
+        //~| HELP consider borrowing here
+        Either::One(_t) => (),
+        Either::Two(ref _t) => (),
+        // FIXME: should suggest removing `ref` too
+    }
+    match vrm[0] {
+        //~^ ERROR cannot move
+        //~| HELP consider borrowing here
+        Either::One(_t) => (),
+        Either::Two(ref mut _t) => (),
+        // FIXME: should suggest removing `ref` too
+    }
+
+    // move from &Either/&X place
+
+    let &X(_t) = s;
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+    if let &Either::One(_t) = r { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+    while let &Either::One(_t) = r { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+    match r {
+        //~^ ERROR cannot move
+        &Either::One(_t)
+        //~^ HELP consider removing
+        | &Either::Two(_t) => (),
+        // FIXME: would really like a suggestion here too
+    }
+    match r {
+        //~^ ERROR cannot move
+        &Either::One(_t) => (),
+        //~^ HELP consider removing
+        &Either::Two(ref _t) => (),
+    }
+    match r {
+        //~^ ERROR cannot move
+        &Either::One(_t) => (),
+        //~^ HELP consider removing
+        Either::Two(_t) => (),
+    }
+    fn f1(&X(_t): &X) { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+
+    let &mut X(_t) = sm;
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+    if let &mut Either::One(_t) = rm { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+    while let &mut Either::One(_t) = rm { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+    match rm {
+        //~^ ERROR cannot move
+        &mut Either::One(_t) => (),
+        //~^ HELP consider removing
+        &mut Either::Two(_t) => (),
+        //~^ HELP consider removing
+    }
+    match rm {
+        //~^ ERROR cannot move
+        &mut Either::One(_t) => (),
+        //~^ HELP consider removing
+        &mut Either::Two(ref _t) => (),
+    }
+    match rm {
+        //~^ ERROR cannot move
+        &mut Either::One(_t) => (),
+        //~^ HELP consider removing
+        &mut Either::Two(ref mut _t) => (),
+    }
+    match rm {
+        //~^ ERROR cannot move
+        &mut Either::One(_t) => (),
+        //~^ HELP consider removing
+        Either::Two(_t) => (),
+    }
+    fn f2(&mut X(_t): &mut X) { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+
+    // move from tuple of &Either/&X
+
+    // FIXME: These should have suggestions.
+
+    let (&X(_t),) = (&x.clone(),);
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing the pattern binding
+    if let (&Either::One(_t),) = (&e.clone(),) { }
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing the pattern binding
+    while let (&Either::One(_t),) = (&e.clone(),) { }
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing the pattern binding
+    match (&e.clone(),) {
+        //~^ ERROR cannot move
+        (&Either::One(_t),)
+        //~^ HELP consider borrowing the pattern binding
+        | (&Either::Two(_t),) => (),
+    }
+    fn f3((&X(_t),): (&X,)) { }
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing the pattern binding
+
+    let (&mut X(_t),) = (&mut xm.clone(),);
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing the pattern binding
+    if let (&mut Either::One(_t),) = (&mut em.clone(),) { }
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing the pattern binding
+    while let (&mut Either::One(_t),) = (&mut em.clone(),) { }
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing the pattern binding
+    match (&mut em.clone(),) {
+        //~^ ERROR cannot move
+        (&mut Either::One(_t),) => (),
+        //~^ HELP consider borrowing the pattern binding
+        (&mut Either::Two(_t),) => (),
+        //~^ HELP consider borrowing the pattern binding
+    }
+    fn f4((&mut X(_t),): (&mut X,)) { }
+    //~^ ERROR cannot move
+    //~| HELP consider borrowing the pattern binding
+
+    // move from &Either/&X value
+
+    let &X(_t) = &x;
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+    if let &Either::One(_t) = &e { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+    while let &Either::One(_t) = &e { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+    match &e {
+        //~^ ERROR cannot move
+        &Either::One(_t)
+        //~^ HELP consider removing
+        | &Either::Two(_t) => (),
+        // FIXME: would really like a suggestion here too
+    }
+    match &e {
+        //~^ ERROR cannot move
+        &Either::One(_t) => (),
+        //~^ HELP consider removing
+        &Either::Two(ref _t) => (),
+    }
+    match &e {
+        //~^ ERROR cannot move
+        &Either::One(_t) => (),
+        //~^ HELP consider removing
+        Either::Two(_t) => (),
+    }
+
+    let &mut X(_t) = &mut xm;
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+    if let &mut Either::One(_t) = &mut em { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+    while let &mut Either::One(_t) = &mut em { }
+    //~^ ERROR cannot move
+    //~| HELP consider removing
+    match &mut em {
+        //~^ ERROR cannot move
+        &mut Either::One(_t)
+        //~^ HELP consider removing
+        | &mut Either::Two(_t) => (),
+        // FIXME: would really like a suggestion here too
+    }
+    match &mut em {
+        //~^ ERROR cannot move
+        &mut Either::One(_t) => (),
+        //~^ HELP consider removing
+        &mut Either::Two(ref _t) => (),
+    }
+    match &mut em {
+        //~^ ERROR cannot move
+        &mut Either::One(_t) => (),
+        //~^ HELP consider removing
+        &mut Either::Two(ref mut _t) => (),
+    }
+    match &mut em {
+        //~^ ERROR cannot move
+        &mut Either::One(_t) => (),
+        //~^ HELP consider removing
+        Either::Two(_t) => (),
+    }
+}
+
+struct Testing {
+    a: Option<String>
+}
+
+fn testing(a: &Testing) {
+    let Some(_s) = a.a else {
+        //~^ ERROR cannot move
+        //~| HELP consider borrowing the pattern binding
+        return;
+    };
+}
diff --git a/tests/ui/suggestions/dont-suggest-ref/simple.stderr b/tests/ui/suggestions/dont-suggest-ref/simple.stderr
new file mode 100644
index 000000000..526326524
--- /dev/null
+++ b/tests/ui/suggestions/dont-suggest-ref/simple.stderr
@@ -0,0 +1,985 @@
+error[E0507]: cannot move out of `s` which is behind a shared reference
+  --> $DIR/simple.rs:38:17
+   |
+LL |     let X(_t) = *s;
+   |           --    ^^
+   |           |
+   |           data moved here
+   |           move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let X(_t) = *s;
+LL +     let X(_t) = s;
+   |
+
+error[E0507]: cannot move out of `r` as enum variant `One` which is behind a shared reference
+  --> $DIR/simple.rs:41:30
+   |
+LL |     if let Either::One(_t) = *r { }
+   |                        --    ^^
+   |                        |
+   |                        data moved here
+   |                        move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     if let Either::One(_t) = *r { }
+LL +     if let Either::One(_t) = r { }
+   |
+
+error[E0507]: cannot move out of `r` as enum variant `One` which is behind a shared reference
+  --> $DIR/simple.rs:44:33
+   |
+LL |     while let Either::One(_t) = *r { }
+   |                           --    ^^
+   |                           |
+   |                           data moved here
+   |                           move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     while let Either::One(_t) = *r { }
+LL +     while let Either::One(_t) = r { }
+   |
+
+error[E0507]: cannot move out of `r` as enum variant `Two` which is behind a shared reference
+  --> $DIR/simple.rs:47:11
+   |
+LL |     match *r {
+   |           ^^
+...
+LL |         Either::One(_t)
+   |                     --
+   |                     |
+   |                     data moved here
+   |                     move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     match *r {
+LL +     match r {
+   |
+
+error[E0507]: cannot move out of `r` as enum variant `One` which is behind a shared reference
+  --> $DIR/simple.rs:53:11
+   |
+LL |     match *r {
+   |           ^^
+...
+LL |         Either::One(_t) => (),
+   |                     --
+   |                     |
+   |                     data moved here
+   |                     move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     match *r {
+LL +     match r {
+   |
+
+error[E0507]: cannot move out of `sm` which is behind a mutable reference
+  --> $DIR/simple.rs:61:17
+   |
+LL |     let X(_t) = *sm;
+   |           --    ^^^
+   |           |
+   |           data moved here
+   |           move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     let X(_t) = *sm;
+LL +     let X(_t) = sm;
+   |
+
+error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
+  --> $DIR/simple.rs:64:30
+   |
+LL |     if let Either::One(_t) = *rm { }
+   |                        --    ^^^
+   |                        |
+   |                        data moved here
+   |                        move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     if let Either::One(_t) = *rm { }
+LL +     if let Either::One(_t) = rm { }
+   |
+
+error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
+  --> $DIR/simple.rs:67:33
+   |
+LL |     while let Either::One(_t) = *rm { }
+   |                           --    ^^^
+   |                           |
+   |                           data moved here
+   |                           move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     while let Either::One(_t) = *rm { }
+LL +     while let Either::One(_t) = rm { }
+   |
+
+error[E0507]: cannot move out of `rm` as enum variant `Two` which is behind a mutable reference
+  --> $DIR/simple.rs:70:11
+   |
+LL |     match *rm {
+   |           ^^^
+...
+LL |         Either::One(_t)
+   |                     --
+   |                     |
+   |                     data moved here
+   |                     move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     match *rm {
+LL +     match rm {
+   |
+
+error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
+  --> $DIR/simple.rs:76:11
+   |
+LL |     match *rm {
+   |           ^^^
+...
+LL |         Either::One(_t) => (),
+   |                     --
+   |                     |
+   |                     data moved here
+   |                     move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     match *rm {
+LL +     match rm {
+   |
+
+error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
+  --> $DIR/simple.rs:83:11
+   |
+LL |     match *rm {
+   |           ^^^
+...
+LL |         Either::One(_t) => (),
+   |                     --
+   |                     |
+   |                     data moved here
+   |                     move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the dereference here
+   |
+LL -     match *rm {
+LL +     match rm {
+   |
+
+error[E0507]: cannot move out of index of `Vec<X>`
+  --> $DIR/simple.rs:91:17
+   |
+LL |     let X(_t) = vs[0];
+   |           --    ^^^^^
+   |           |
+   |           data moved here
+   |           move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let X(_t) = &vs[0];
+   |                 +
+
+error[E0507]: cannot move out of index of `Vec<Either>`
+  --> $DIR/simple.rs:94:30
+   |
+LL |     if let Either::One(_t) = vr[0] { }
+   |                        --    ^^^^^
+   |                        |
+   |                        data moved here
+   |                        move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     if let Either::One(_t) = &vr[0] { }
+   |                              +
+
+error[E0507]: cannot move out of index of `Vec<Either>`
+  --> $DIR/simple.rs:97:33
+   |
+LL |     while let Either::One(_t) = vr[0] { }
+   |                           --    ^^^^^
+   |                           |
+   |                           data moved here
+   |                           move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     while let Either::One(_t) = &vr[0] { }
+   |                                 +
+
+error[E0507]: cannot move out of index of `Vec<Either>`
+  --> $DIR/simple.rs:100:11
+   |
+LL |     match vr[0] {
+   |           ^^^^^
+...
+LL |         Either::One(_t)
+   |                     --
+   |                     |
+   |                     data moved here
+   |                     move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     match &vr[0] {
+   |           +
+
+error[E0507]: cannot move out of index of `Vec<Either>`
+  --> $DIR/simple.rs:106:11
+   |
+LL |     match vr[0] {
+   |           ^^^^^
+...
+LL |         Either::One(_t) => (),
+   |                     --
+   |                     |
+   |                     data moved here
+   |                     move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     match &vr[0] {
+   |           +
+
+error[E0507]: cannot move out of index of `Vec<X>`
+  --> $DIR/simple.rs:114:17
+   |
+LL |     let X(_t) = vsm[0];
+   |           --    ^^^^^^
+   |           |
+   |           data moved here
+   |           move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let X(_t) = &vsm[0];
+   |                 +
+
+error[E0507]: cannot move out of index of `Vec<Either>`
+  --> $DIR/simple.rs:117:30
+   |
+LL |     if let Either::One(_t) = vrm[0] { }
+   |                        --    ^^^^^^
+   |                        |
+   |                        data moved here
+   |                        move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     if let Either::One(_t) = &vrm[0] { }
+   |                              +
+
+error[E0507]: cannot move out of index of `Vec<Either>`
+  --> $DIR/simple.rs:120:33
+   |
+LL |     while let Either::One(_t) = vrm[0] { }
+   |                           --    ^^^^^^
+   |                           |
+   |                           data moved here
+   |                           move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     while let Either::One(_t) = &vrm[0] { }
+   |                                 +
+
+error[E0507]: cannot move out of index of `Vec<Either>`
+  --> $DIR/simple.rs:123:11
+   |
+LL |     match vrm[0] {
+   |           ^^^^^^
+...
+LL |         Either::One(_t)
+   |                     --
+   |                     |
+   |                     data moved here
+   |                     move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     match &vrm[0] {
+   |           +
+
+error[E0507]: cannot move out of index of `Vec<Either>`
+  --> $DIR/simple.rs:129:11
+   |
+LL |     match vrm[0] {
+   |           ^^^^^^
+...
+LL |         Either::One(_t) => (),
+   |                     --
+   |                     |
+   |                     data moved here
+   |                     move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     match &vrm[0] {
+   |           +
+
+error[E0507]: cannot move out of index of `Vec<Either>`
+  --> $DIR/simple.rs:136:11
+   |
+LL |     match vrm[0] {
+   |           ^^^^^^
+...
+LL |         Either::One(_t) => (),
+   |                     --
+   |                     |
+   |                     data moved here
+   |                     move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     match &vrm[0] {
+   |           +
+
+error[E0507]: cannot move out of `s` which is behind a shared reference
+  --> $DIR/simple.rs:146:18
+   |
+LL |     let &X(_t) = s;
+   |            --    ^
+   |            |
+   |            data moved here
+   |            move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     let &X(_t) = s;
+LL +     let X(_t) = s;
+   |
+
+error[E0507]: cannot move out of `r` as enum variant `One` which is behind a shared reference
+  --> $DIR/simple.rs:149:31
+   |
+LL |     if let &Either::One(_t) = r { }
+   |                         --    ^
+   |                         |
+   |                         data moved here
+   |                         move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     if let &Either::One(_t) = r { }
+LL +     if let Either::One(_t) = r { }
+   |
+
+error[E0507]: cannot move out of `r` as enum variant `One` which is behind a shared reference
+  --> $DIR/simple.rs:152:34
+   |
+LL |     while let &Either::One(_t) = r { }
+   |                            --    ^
+   |                            |
+   |                            data moved here
+   |                            move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     while let &Either::One(_t) = r { }
+LL +     while let Either::One(_t) = r { }
+   |
+
+error[E0507]: cannot move out of `r` as enum variant `Two` which is behind a shared reference
+  --> $DIR/simple.rs:155:11
+   |
+LL |     match r {
+   |           ^
+LL |
+LL |         &Either::One(_t)
+   |                      --
+   |                      |
+   |                      data moved here
+   |                      move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -         &Either::One(_t)
+LL +         Either::One(_t)
+   |
+
+error[E0507]: cannot move out of `r` as enum variant `One` which is behind a shared reference
+  --> $DIR/simple.rs:162:11
+   |
+LL |     match r {
+   |           ^
+LL |
+LL |         &Either::One(_t) => (),
+   |                      --
+   |                      |
+   |                      data moved here
+   |                      move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -         &Either::One(_t) => (),
+LL +         Either::One(_t) => (),
+   |
+
+error[E0507]: cannot move out of `r` as enum variant `One` which is behind a shared reference
+  --> $DIR/simple.rs:168:11
+   |
+LL |     match r {
+   |           ^
+LL |
+LL |         &Either::One(_t) => (),
+   |                      --
+   |                      |
+   |                      data moved here
+   |                      move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -         &Either::One(_t) => (),
+LL +         Either::One(_t) => (),
+   |
+
+error[E0507]: cannot move out of `sm` which is behind a mutable reference
+  --> $DIR/simple.rs:178:22
+   |
+LL |     let &mut X(_t) = sm;
+   |                --    ^^
+   |                |
+   |                data moved here
+   |                move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -     let &mut X(_t) = sm;
+LL +     let X(_t) = sm;
+   |
+
+error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
+  --> $DIR/simple.rs:181:35
+   |
+LL |     if let &mut Either::One(_t) = rm { }
+   |                             --    ^^
+   |                             |
+   |                             data moved here
+   |                             move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -     if let &mut Either::One(_t) = rm { }
+LL +     if let Either::One(_t) = rm { }
+   |
+
+error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
+  --> $DIR/simple.rs:184:38
+   |
+LL |     while let &mut Either::One(_t) = rm { }
+   |                                --    ^^
+   |                                |
+   |                                data moved here
+   |                                move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -     while let &mut Either::One(_t) = rm { }
+LL +     while let Either::One(_t) = rm { }
+   |
+
+error[E0507]: cannot move out of `rm` as enum variant `Two` which is behind a mutable reference
+  --> $DIR/simple.rs:187:11
+   |
+LL |     match rm {
+   |           ^^
+LL |
+LL |         &mut Either::One(_t) => (),
+   |                          -- data moved here
+LL |
+LL |         &mut Either::Two(_t) => (),
+   |                          -- ...and here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the mutable borrow
+   |
+LL -         &mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
+   |
+help: consider removing the mutable borrow
+   |
+LL -         &mut Either::Two(_t) => (),
+LL +         Either::Two(_t) => (),
+   |
+
+error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
+  --> $DIR/simple.rs:194:11
+   |
+LL |     match rm {
+   |           ^^
+LL |
+LL |         &mut Either::One(_t) => (),
+   |                          --
+   |                          |
+   |                          data moved here
+   |                          move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -         &mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
+   |
+
+error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
+  --> $DIR/simple.rs:200:11
+   |
+LL |     match rm {
+   |           ^^
+LL |
+LL |         &mut Either::One(_t) => (),
+   |                          --
+   |                          |
+   |                          data moved here
+   |                          move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -         &mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
+   |
+
+error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
+  --> $DIR/simple.rs:206:11
+   |
+LL |     match rm {
+   |           ^^
+LL |
+LL |         &mut Either::One(_t) => (),
+   |                          --
+   |                          |
+   |                          data moved here
+   |                          move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -         &mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/simple.rs:220:21
+   |
+LL |     let (&X(_t),) = (&x.clone(),);
+   |             --      ^^^^^^^^^^^^^
+   |             |
+   |             data moved here
+   |             move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     let (&X(ref _t),) = (&x.clone(),);
+   |             +++
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/simple.rs:223:34
+   |
+LL |     if let (&Either::One(_t),) = (&e.clone(),) { }
+   |                          --      ^^^^^^^^^^^^^
+   |                          |
+   |                          data moved here
+   |                          move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     if let (&Either::One(ref _t),) = (&e.clone(),) { }
+   |                          +++
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/simple.rs:226:37
+   |
+LL |     while let (&Either::One(_t),) = (&e.clone(),) { }
+   |                             --      ^^^^^^^^^^^^^
+   |                             |
+   |                             data moved here
+   |                             move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     while let (&Either::One(ref _t),) = (&e.clone(),) { }
+   |                             +++
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/simple.rs:229:11
+   |
+LL |     match (&e.clone(),) {
+   |           ^^^^^^^^^^^^^
+LL |
+LL |         (&Either::One(_t),)
+   |                       --
+   |                       |
+   |                       data moved here
+   |                       move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |         (&Either::One(ref _t),)
+   |                       +++
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/simple.rs:239:25
+   |
+LL |     let (&mut X(_t),) = (&mut xm.clone(),);
+   |                 --      ^^^^^^^^^^^^^^^^^^
+   |                 |
+   |                 data moved here
+   |                 move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     let (&mut X(ref _t),) = (&mut xm.clone(),);
+   |                 +++
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/simple.rs:242:38
+   |
+LL |     if let (&mut Either::One(_t),) = (&mut em.clone(),) { }
+   |                              --      ^^^^^^^^^^^^^^^^^^
+   |                              |
+   |                              data moved here
+   |                              move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     if let (&mut Either::One(ref _t),) = (&mut em.clone(),) { }
+   |                              +++
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/simple.rs:245:41
+   |
+LL |     while let (&mut Either::One(_t),) = (&mut em.clone(),) { }
+   |                                 --      ^^^^^^^^^^^^^^^^^^
+   |                                 |
+   |                                 data moved here
+   |                                 move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     while let (&mut Either::One(ref _t),) = (&mut em.clone(),) { }
+   |                                 +++
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/simple.rs:248:11
+   |
+LL |     match (&mut em.clone(),) {
+   |           ^^^^^^^^^^^^^^^^^^
+LL |
+LL |         (&mut Either::One(_t),) => (),
+   |                           -- data moved here
+LL |
+LL |         (&mut Either::Two(_t),) => (),
+   |                           -- ...and here
+   |
+   = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider borrowing the pattern binding
+   |
+LL |         (&mut Either::One(ref _t),) => (),
+   |                           +++
+help: consider borrowing the pattern binding
+   |
+LL |         (&mut Either::Two(ref _t),) => (),
+   |                           +++
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/simple.rs:261:18
+   |
+LL |     let &X(_t) = &x;
+   |            --    ^^
+   |            |
+   |            data moved here
+   |            move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     let &X(_t) = &x;
+LL +     let X(_t) = &x;
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/simple.rs:264:31
+   |
+LL |     if let &Either::One(_t) = &e { }
+   |                         --    ^^
+   |                         |
+   |                         data moved here
+   |                         move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     if let &Either::One(_t) = &e { }
+LL +     if let Either::One(_t) = &e { }
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/simple.rs:267:34
+   |
+LL |     while let &Either::One(_t) = &e { }
+   |                            --    ^^
+   |                            |
+   |                            data moved here
+   |                            move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     while let &Either::One(_t) = &e { }
+LL +     while let Either::One(_t) = &e { }
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/simple.rs:270:11
+   |
+LL |     match &e {
+   |           ^^
+LL |
+LL |         &Either::One(_t)
+   |                      --
+   |                      |
+   |                      data moved here
+   |                      move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -         &Either::One(_t)
+LL +         Either::One(_t)
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/simple.rs:277:11
+   |
+LL |     match &e {
+   |           ^^
+LL |
+LL |         &Either::One(_t) => (),
+   |                      --
+   |                      |
+   |                      data moved here
+   |                      move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -         &Either::One(_t) => (),
+LL +         Either::One(_t) => (),
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/simple.rs:283:11
+   |
+LL |     match &e {
+   |           ^^
+LL |
+LL |         &Either::One(_t) => (),
+   |                      --
+   |                      |
+   |                      data moved here
+   |                      move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -         &Either::One(_t) => (),
+LL +         Either::One(_t) => (),
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/simple.rs:290:22
+   |
+LL |     let &mut X(_t) = &mut xm;
+   |                --    ^^^^^^^
+   |                |
+   |                data moved here
+   |                move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -     let &mut X(_t) = &mut xm;
+LL +     let X(_t) = &mut xm;
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/simple.rs:293:35
+   |
+LL |     if let &mut Either::One(_t) = &mut em { }
+   |                             --    ^^^^^^^
+   |                             |
+   |                             data moved here
+   |                             move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -     if let &mut Either::One(_t) = &mut em { }
+LL +     if let Either::One(_t) = &mut em { }
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/simple.rs:296:38
+   |
+LL |     while let &mut Either::One(_t) = &mut em { }
+   |                                --    ^^^^^^^
+   |                                |
+   |                                data moved here
+   |                                move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -     while let &mut Either::One(_t) = &mut em { }
+LL +     while let Either::One(_t) = &mut em { }
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/simple.rs:299:11
+   |
+LL |     match &mut em {
+   |           ^^^^^^^
+LL |
+LL |         &mut Either::One(_t)
+   |                          --
+   |                          |
+   |                          data moved here
+   |                          move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -         &mut Either::One(_t)
+LL +         Either::One(_t)
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/simple.rs:306:11
+   |
+LL |     match &mut em {
+   |           ^^^^^^^
+LL |
+LL |         &mut Either::One(_t) => (),
+   |                          --
+   |                          |
+   |                          data moved here
+   |                          move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -         &mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/simple.rs:312:11
+   |
+LL |     match &mut em {
+   |           ^^^^^^^
+LL |
+LL |         &mut Either::One(_t) => (),
+   |                          --
+   |                          |
+   |                          data moved here
+   |                          move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -         &mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/simple.rs:318:11
+   |
+LL |     match &mut em {
+   |           ^^^^^^^
+LL |
+LL |         &mut Either::One(_t) => (),
+   |                          --
+   |                          |
+   |                          data moved here
+   |                          move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -         &mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/simple.rs:174:11
+   |
+LL |     fn f1(&X(_t): &X) { }
+   |           ^^^--^
+   |              |
+   |              data moved here
+   |              move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider removing the borrow
+   |
+LL -     fn f1(&X(_t): &X) { }
+LL +     fn f1(X(_t): &X) { }
+   |
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/simple.rs:212:11
+   |
+LL |     fn f2(&mut X(_t): &mut X) { }
+   |           ^^^^^^^--^
+   |                  |
+   |                  data moved here
+   |                  move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider removing the mutable borrow
+   |
+LL -     fn f2(&mut X(_t): &mut X) { }
+LL +     fn f2(X(_t): &mut X) { }
+   |
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/simple.rs:235:11
+   |
+LL |     fn f3((&X(_t),): (&X,)) { }
+   |           ^^^^--^^^
+   |               |
+   |               data moved here
+   |               move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     fn f3((&X(ref _t),): (&X,)) { }
+   |               +++
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/simple.rs:255:11
+   |
+LL |     fn f4((&mut X(_t),): (&mut X,)) { }
+   |           ^^^^^^^^--^^^
+   |                   |
+   |                   data moved here
+   |                   move occurs because `_t` has type `Y`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     fn f4((&mut X(ref _t),): (&mut X,)) { }
+   |                   +++
+
+error[E0507]: cannot move out of `a.a` as enum variant `Some` which is behind a shared reference
+  --> $DIR/simple.rs:331:20
+   |
+LL |     let Some(_s) = a.a else {
+   |              --    ^^^
+   |              |
+   |              data moved here
+   |              move occurs because `_s` has type `String`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     let Some(ref _s) = a.a else {
+   |              +++
+
+error: aborting due to 61 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/suggestions/dont-suggest-try_into-in-macros.rs b/tests/ui/suggestions/dont-suggest-try_into-in-macros.rs
index d625199c9..d625199c9 100644
--- a/src/test/ui/suggestions/dont-suggest-try_into-in-macros.rs
+++ b/tests/ui/suggestions/dont-suggest-try_into-in-macros.rs
diff --git a/tests/ui/suggestions/dont-suggest-try_into-in-macros.stderr b/tests/ui/suggestions/dont-suggest-try_into-in-macros.stderr
new file mode 100644
index 000000000..bc6342004
--- /dev/null
+++ b/tests/ui/suggestions/dont-suggest-try_into-in-macros.stderr
@@ -0,0 +1,14 @@
+error[E0308]: mismatched types
+  --> $DIR/dont-suggest-try_into-in-macros.rs:2:5
+   |
+LL |     assert_eq!(10u64, 10usize);
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |     |
+   |     expected `u64`, found `usize`
+   |     expected because this is `u64`
+   |
+   = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/dont-suggest-ufcs-for-const.rs b/tests/ui/suggestions/dont-suggest-ufcs-for-const.rs
index 06cf243f1..06cf243f1 100644
--- a/src/test/ui/suggestions/dont-suggest-ufcs-for-const.rs
+++ b/tests/ui/suggestions/dont-suggest-ufcs-for-const.rs
diff --git a/src/test/ui/suggestions/dont-suggest-ufcs-for-const.stderr b/tests/ui/suggestions/dont-suggest-ufcs-for-const.stderr
index 0d9543e0b..0d9543e0b 100644
--- a/src/test/ui/suggestions/dont-suggest-ufcs-for-const.stderr
+++ b/tests/ui/suggestions/dont-suggest-ufcs-for-const.stderr
diff --git a/src/test/ui/suggestions/dont-try-removing-the-field.rs b/tests/ui/suggestions/dont-try-removing-the-field.rs
index 948aa2b94..948aa2b94 100644
--- a/src/test/ui/suggestions/dont-try-removing-the-field.rs
+++ b/tests/ui/suggestions/dont-try-removing-the-field.rs
diff --git a/src/test/ui/suggestions/dont-try-removing-the-field.stderr b/tests/ui/suggestions/dont-try-removing-the-field.stderr
index 263171a4a..263171a4a 100644
--- a/src/test/ui/suggestions/dont-try-removing-the-field.stderr
+++ b/tests/ui/suggestions/dont-try-removing-the-field.stderr
diff --git a/src/test/ui/suggestions/dont-wrap-ambiguous-receivers.rs b/tests/ui/suggestions/dont-wrap-ambiguous-receivers.rs
index baa2128eb..baa2128eb 100644
--- a/src/test/ui/suggestions/dont-wrap-ambiguous-receivers.rs
+++ b/tests/ui/suggestions/dont-wrap-ambiguous-receivers.rs
diff --git a/src/test/ui/suggestions/dont-wrap-ambiguous-receivers.stderr b/tests/ui/suggestions/dont-wrap-ambiguous-receivers.stderr
index 4658ecb3a..4658ecb3a 100644
--- a/src/test/ui/suggestions/dont-wrap-ambiguous-receivers.stderr
+++ b/tests/ui/suggestions/dont-wrap-ambiguous-receivers.stderr
diff --git a/src/test/ui/suggestions/enum-method-probe.fixed b/tests/ui/suggestions/enum-method-probe.fixed
index 6499c92bc..6499c92bc 100644
--- a/src/test/ui/suggestions/enum-method-probe.fixed
+++ b/tests/ui/suggestions/enum-method-probe.fixed
diff --git a/src/test/ui/suggestions/enum-method-probe.rs b/tests/ui/suggestions/enum-method-probe.rs
index 18ea8ed8a..18ea8ed8a 100644
--- a/src/test/ui/suggestions/enum-method-probe.rs
+++ b/tests/ui/suggestions/enum-method-probe.rs
diff --git a/src/test/ui/suggestions/enum-method-probe.stderr b/tests/ui/suggestions/enum-method-probe.stderr
index 6ed14984f..6ed14984f 100644
--- a/src/test/ui/suggestions/enum-method-probe.stderr
+++ b/tests/ui/suggestions/enum-method-probe.stderr
diff --git a/tests/ui/suggestions/enum-variant-arg-mismatch.rs b/tests/ui/suggestions/enum-variant-arg-mismatch.rs
new file mode 100644
index 000000000..8de5bae92
--- /dev/null
+++ b/tests/ui/suggestions/enum-variant-arg-mismatch.rs
@@ -0,0 +1,10 @@
+pub enum Sexpr<'a> {
+    Ident(&'a str),
+}
+
+fn map<'a, F: Fn(String) -> Sexpr<'a>>(f: F) {}
+
+fn main() {
+    map(Sexpr::Ident);
+    //~^ ERROR type mismatch in function arguments
+}
diff --git a/tests/ui/suggestions/enum-variant-arg-mismatch.stderr b/tests/ui/suggestions/enum-variant-arg-mismatch.stderr
new file mode 100644
index 000000000..f76019b70
--- /dev/null
+++ b/tests/ui/suggestions/enum-variant-arg-mismatch.stderr
@@ -0,0 +1,22 @@
+error[E0631]: type mismatch in function arguments
+  --> $DIR/enum-variant-arg-mismatch.rs:8:9
+   |
+LL |     Ident(&'a str),
+   |     ----- found signature defined here
+...
+LL |     map(Sexpr::Ident);
+   |     --- ^^^^^^^^^^^^ expected due to this
+   |     |
+   |     required by a bound introduced by this call
+   |
+   = note: expected function signature `fn(String) -> _`
+              found function signature `fn(&str) -> _`
+note: required by a bound in `map`
+  --> $DIR/enum-variant-arg-mismatch.rs:5:15
+   |
+LL | fn map<'a, F: Fn(String) -> Sexpr<'a>>(f: F) {}
+   |               ^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `map`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0631`.
diff --git a/src/test/ui/suggestions/expected-boxed-future-isnt-pinned.rs b/tests/ui/suggestions/expected-boxed-future-isnt-pinned.rs
index 7e9c5492d..7e9c5492d 100644
--- a/src/test/ui/suggestions/expected-boxed-future-isnt-pinned.rs
+++ b/tests/ui/suggestions/expected-boxed-future-isnt-pinned.rs
diff --git a/src/test/ui/suggestions/expected-boxed-future-isnt-pinned.stderr b/tests/ui/suggestions/expected-boxed-future-isnt-pinned.stderr
index 34ff59a9b..b1e04dab8 100644
--- a/src/test/ui/suggestions/expected-boxed-future-isnt-pinned.stderr
+++ b/tests/ui/suggestions/expected-boxed-future-isnt-pinned.stderr
@@ -41,9 +41,6 @@ LL |     Pin::new(x)
            found type parameter `F`
 note: associated function defined here
   --> $SRC_DIR/core/src/pin.rs:LL:COL
-   |
-LL |     pub const fn new(pointer: P) -> Pin<P> {
-   |                  ^^^
 
 error[E0277]: `dyn Future<Output = i32> + Send` cannot be unpinned
   --> $DIR/expected-boxed-future-isnt-pinned.rs:19:14
@@ -56,9 +53,6 @@ LL |     Pin::new(x)
    = note: consider using `Box::pin`
 note: required by a bound in `Pin::<P>::new`
   --> $SRC_DIR/core/src/pin.rs:LL:COL
-   |
-LL | impl<P: Deref<Target: Unpin>> Pin<P> {
-   |                       ^^^^^ required by this bound in `Pin::<P>::new`
 
 error[E0277]: `dyn Future<Output = i32> + Send` cannot be unpinned
   --> $DIR/expected-boxed-future-isnt-pinned.rs:24:14
@@ -71,9 +65,6 @@ LL |     Pin::new(Box::new(x))
    = note: consider using `Box::pin`
 note: required by a bound in `Pin::<P>::new`
   --> $SRC_DIR/core/src/pin.rs:LL:COL
-   |
-LL | impl<P: Deref<Target: Unpin>> Pin<P> {
-   |                       ^^^^^ required by this bound in `Pin::<P>::new`
 
 error[E0308]: mismatched types
   --> $DIR/expected-boxed-future-isnt-pinned.rs:28:5
@@ -90,9 +81,6 @@ LL | |     }
            found `async` block `[async block@$DIR/expected-boxed-future-isnt-pinned.rs:28:5: 30:6]`
 note: function defined here
   --> $SRC_DIR/core/src/future/mod.rs:LL:COL
-   |
-LL | pub const fn identity_future<O, Fut: Future<Output = O>>(f: Fut) -> Fut {
-   |              ^^^^^^^^^^^^^^^
 help: you need to pin and box this expression
    |
 LL ~     Box::pin(async {
diff --git a/src/test/ui/suggestions/field-access-considering-privacy.rs b/tests/ui/suggestions/field-access-considering-privacy.rs
index 3de06b214..3de06b214 100644
--- a/src/test/ui/suggestions/field-access-considering-privacy.rs
+++ b/tests/ui/suggestions/field-access-considering-privacy.rs
diff --git a/src/test/ui/suggestions/field-access-considering-privacy.stderr b/tests/ui/suggestions/field-access-considering-privacy.stderr
index cbf6f3d10..cbf6f3d10 100644
--- a/src/test/ui/suggestions/field-access-considering-privacy.stderr
+++ b/tests/ui/suggestions/field-access-considering-privacy.stderr
diff --git a/src/test/ui/suggestions/field-access.fixed b/tests/ui/suggestions/field-access.fixed
index ed9aef6e3..ed9aef6e3 100644
--- a/src/test/ui/suggestions/field-access.fixed
+++ b/tests/ui/suggestions/field-access.fixed
diff --git a/src/test/ui/suggestions/field-access.rs b/tests/ui/suggestions/field-access.rs
index d80488e8a..d80488e8a 100644
--- a/src/test/ui/suggestions/field-access.rs
+++ b/tests/ui/suggestions/field-access.rs
diff --git a/src/test/ui/suggestions/field-access.stderr b/tests/ui/suggestions/field-access.stderr
index b9f0f788b..b9f0f788b 100644
--- a/src/test/ui/suggestions/field-access.stderr
+++ b/tests/ui/suggestions/field-access.stderr
diff --git a/src/test/ui/suggestions/field-has-method.rs b/tests/ui/suggestions/field-has-method.rs
index 980000151..980000151 100644
--- a/src/test/ui/suggestions/field-has-method.rs
+++ b/tests/ui/suggestions/field-has-method.rs
diff --git a/src/test/ui/suggestions/field-has-method.stderr b/tests/ui/suggestions/field-has-method.stderr
index def164017..def164017 100644
--- a/src/test/ui/suggestions/field-has-method.stderr
+++ b/tests/ui/suggestions/field-has-method.stderr
diff --git a/src/test/ui/suggestions/fn-ctor-passed-as-arg-where-it-should-have-been-called.rs b/tests/ui/suggestions/fn-ctor-passed-as-arg-where-it-should-have-been-called.rs
index 4303e5c54..4303e5c54 100644
--- a/src/test/ui/suggestions/fn-ctor-passed-as-arg-where-it-should-have-been-called.rs
+++ b/tests/ui/suggestions/fn-ctor-passed-as-arg-where-it-should-have-been-called.rs
diff --git a/src/test/ui/suggestions/fn-ctor-passed-as-arg-where-it-should-have-been-called.stderr b/tests/ui/suggestions/fn-ctor-passed-as-arg-where-it-should-have-been-called.stderr
index 955148315..955148315 100644
--- a/src/test/ui/suggestions/fn-ctor-passed-as-arg-where-it-should-have-been-called.stderr
+++ b/tests/ui/suggestions/fn-ctor-passed-as-arg-where-it-should-have-been-called.stderr
diff --git a/src/test/ui/suggestions/fn-missing-lifetime-in-item.rs b/tests/ui/suggestions/fn-missing-lifetime-in-item.rs
index dac6610b3..dac6610b3 100644
--- a/src/test/ui/suggestions/fn-missing-lifetime-in-item.rs
+++ b/tests/ui/suggestions/fn-missing-lifetime-in-item.rs
diff --git a/src/test/ui/suggestions/fn-missing-lifetime-in-item.stderr b/tests/ui/suggestions/fn-missing-lifetime-in-item.stderr
index 6d7c3d730..6d7c3d730 100644
--- a/src/test/ui/suggestions/fn-missing-lifetime-in-item.stderr
+++ b/tests/ui/suggestions/fn-missing-lifetime-in-item.stderr
diff --git a/src/test/ui/suggestions/fn-needing-specified-return-type-param.rs b/tests/ui/suggestions/fn-needing-specified-return-type-param.rs
index bcc91b5cb..bcc91b5cb 100644
--- a/src/test/ui/suggestions/fn-needing-specified-return-type-param.rs
+++ b/tests/ui/suggestions/fn-needing-specified-return-type-param.rs
diff --git a/src/test/ui/suggestions/fn-needing-specified-return-type-param.stderr b/tests/ui/suggestions/fn-needing-specified-return-type-param.stderr
index 9dea667fb..9dea667fb 100644
--- a/src/test/ui/suggestions/fn-needing-specified-return-type-param.stderr
+++ b/tests/ui/suggestions/fn-needing-specified-return-type-param.stderr
diff --git a/src/test/ui/suggestions/fn-or-tuple-struct-with-underscore-args.rs b/tests/ui/suggestions/fn-or-tuple-struct-with-underscore-args.rs
index ae1dbfeea..ae1dbfeea 100644
--- a/src/test/ui/suggestions/fn-or-tuple-struct-with-underscore-args.rs
+++ b/tests/ui/suggestions/fn-or-tuple-struct-with-underscore-args.rs
diff --git a/src/test/ui/suggestions/fn-or-tuple-struct-with-underscore-args.stderr b/tests/ui/suggestions/fn-or-tuple-struct-with-underscore-args.stderr
index aa5620306..aa5620306 100644
--- a/src/test/ui/suggestions/fn-or-tuple-struct-with-underscore-args.stderr
+++ b/tests/ui/suggestions/fn-or-tuple-struct-with-underscore-args.stderr
diff --git a/src/test/ui/suggestions/fn-or-tuple-struct-without-args.rs b/tests/ui/suggestions/fn-or-tuple-struct-without-args.rs
index dd5af3e34..dd5af3e34 100644
--- a/src/test/ui/suggestions/fn-or-tuple-struct-without-args.rs
+++ b/tests/ui/suggestions/fn-or-tuple-struct-without-args.rs
diff --git a/src/test/ui/suggestions/fn-or-tuple-struct-without-args.stderr b/tests/ui/suggestions/fn-or-tuple-struct-without-args.stderr
index d0ddb34d9..4cbcd31fa 100644
--- a/src/test/ui/suggestions/fn-or-tuple-struct-without-args.stderr
+++ b/tests/ui/suggestions/fn-or-tuple-struct-without-args.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:29:20
    |
 LL | fn foo(a: usize, b: usize) -> usize { a }
-   | ----------------------------------- fn(usize, usize) -> usize {foo} defined here
+   | ----------------------------------- function `foo` defined here
 ...
 LL |     let _: usize = foo;
    |            -----   ^^^ expected `usize`, found fn item
@@ -20,15 +20,15 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:30:16
    |
 LL | struct S(usize, usize);
-   | -------- fn(usize, usize) -> S {S} defined here
+   | -------- `S` defines a struct constructor here, which should be called
 ...
 LL |     let _: S = S;
-   |            -   ^ expected struct `S`, found fn item
+   |            -   ^ expected struct `S`, found struct constructor
    |            |
    |            expected due to this
    |
-   = note: expected struct `S`
-             found fn item `fn(usize, usize) -> S {S}`
+   = note:          expected struct `S`
+           found struct constructor `fn(usize, usize) -> S {S}`
 help: use parentheses to construct this tuple struct
    |
 LL |     let _: S = S(/* usize */, /* usize */);
@@ -38,7 +38,7 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:31:20
    |
 LL | fn bar() -> usize { 42 }
-   | ----------------- fn() -> usize {bar} defined here
+   | ----------------- function `bar` defined here
 ...
 LL |     let _: usize = bar;
    |            -----   ^^^ expected `usize`, found fn item
@@ -56,15 +56,15 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:32:16
    |
 LL | struct V();
-   | -------- fn() -> V {V} defined here
+   | -------- `V` defines a struct constructor here, which should be called
 ...
 LL |     let _: V = V;
-   |            -   ^ expected struct `V`, found fn item
+   |            -   ^ expected struct `V`, found struct constructor
    |            |
    |            expected due to this
    |
-   = note: expected struct `V`
-             found fn item `fn() -> V {V}`
+   = note:          expected struct `V`
+           found struct constructor `fn() -> V {V}`
 help: use parentheses to construct this tuple struct
    |
 LL |     let _: V = V();
@@ -74,7 +74,7 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:33:20
    |
 LL |     fn baz(x: usize, y: usize) -> usize { x }
-   |     ----------------------------------- fn(usize, usize) -> usize {<_ as T>::baz} defined here
+   |     ----------------------------------- associated function `baz` defined here
 ...
 LL |     let _: usize = T::baz;
    |            -----   ^^^^^^ expected `usize`, found fn item
@@ -92,7 +92,7 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:34:20
    |
 LL |     fn bat(x: usize) -> usize { 42 }
-   |     ------------------------- fn(usize) -> usize {<_ as T>::bat} defined here
+   |     ------------------------- associated function `bat` defined here
 ...
 LL |     let _: usize = T::bat;
    |            -----   ^^^^^^ expected `usize`, found fn item
@@ -110,15 +110,15 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:35:16
    |
 LL |     A(usize),
-   |     - fn(usize) -> E {E::A} defined here
+   |     - `A` defines an enum variant constructor here, which should be called
 ...
 LL |     let _: E = E::A;
-   |            -   ^^^^ expected enum `E`, found fn item
+   |            -   ^^^^ expected enum `E`, found enum constructor
    |            |
    |            expected due to this
    |
-   = note: expected enum `E`
-           found fn item `fn(usize) -> E {E::A}`
+   = note:          expected enum `E`
+           found enum constructor `fn(usize) -> E {E::A}`
 help: use parentheses to construct this tuple variant
    |
 LL |     let _: E = E::A(/* usize */);
@@ -134,7 +134,7 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:37:20
    |
 LL |     fn baz(x: usize, y: usize) -> usize { x }
-   |     ----------------------------------- fn(usize, usize) -> usize {<X as T>::baz} defined here
+   |     ----------------------------------- associated function `baz` defined here
 ...
 LL |     let _: usize = X::baz;
    |            -----   ^^^^^^ expected `usize`, found fn item
@@ -152,7 +152,7 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:38:20
    |
 LL |     fn bat(x: usize) -> usize { 42 }
-   |     ------------------------- fn(usize) -> usize {<X as T>::bat} defined here
+   |     ------------------------- associated function `bat` defined here
 ...
 LL |     let _: usize = X::bat;
    |            -----   ^^^^^^ expected `usize`, found fn item
@@ -170,7 +170,7 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:39:20
    |
 LL |     fn bax(x: usize) -> usize { 42 }
-   |     ------------------------- fn(usize) -> usize {<X as T>::bax} defined here
+   |     ------------------------- associated function `bax` defined here
 ...
 LL |     let _: usize = X::bax;
    |            -----   ^^^^^^ expected `usize`, found fn item
@@ -188,7 +188,7 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:40:20
    |
 LL |     fn bach(x: usize) -> usize;
-   |     --------------------------- fn(usize) -> usize {<X as T>::bach} defined here
+   |     --------------------------- associated function `bach` defined here
 ...
 LL |     let _: usize = X::bach;
    |            -----   ^^^^^^^ expected `usize`, found fn item
@@ -206,7 +206,7 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:41:20
    |
 LL |     fn ban(&self) -> usize { 42 }
-   |     ---------------------- for<'a> fn(&'a X) -> usize {<X as T>::ban} defined here
+   |     ---------------------- associated function `ban` defined here
 ...
 LL |     let _: usize = X::ban;
    |            -----   ^^^^^^ expected `usize`, found fn item
@@ -224,7 +224,7 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:42:20
    |
 LL |     fn bal(&self) -> usize;
-   |     ----------------------- for<'a> fn(&'a X) -> usize {<X as T>::bal} defined here
+   |     ----------------------- associated function `bal` defined here
 ...
 LL |     let _: usize = X::bal;
    |            -----   ^^^^^^ expected `usize`, found fn item
diff --git a/tests/ui/suggestions/fn-to-method-deeply-nested.rs b/tests/ui/suggestions/fn-to-method-deeply-nested.rs
new file mode 100644
index 000000000..58ee3d640
--- /dev/null
+++ b/tests/ui/suggestions/fn-to-method-deeply-nested.rs
@@ -0,0 +1,13 @@
+fn main() -> Result<(), ()> {
+    a(b(c(d(e(
+        //~^ ERROR cannot find function `a` in this scope
+        //~| ERROR cannot find function `b` in this scope
+        //~| ERROR cannot find function `c` in this scope
+        //~| ERROR cannot find function `d` in this scope
+        //~| ERROR cannot find function `e` in this scope
+        z????????????????????????????????????????????????????????????????????????????????????????
+        ?????????????????????????????????????????????????????????????????????????????????????????
+        ??????????????????????????????????????????????????????????????????
+        //~^^^ ERROR cannot find value `z` in this scope
+    )))))
+}
diff --git a/tests/ui/suggestions/fn-to-method-deeply-nested.stderr b/tests/ui/suggestions/fn-to-method-deeply-nested.stderr
new file mode 100644
index 000000000..ce813ea7a
--- /dev/null
+++ b/tests/ui/suggestions/fn-to-method-deeply-nested.stderr
@@ -0,0 +1,39 @@
+error[E0425]: cannot find value `z` in this scope
+  --> $DIR/fn-to-method-deeply-nested.rs:8:9
+   |
+LL |         z????????????????????????????????????????????????????????????????????????????????????????
+   |         ^ not found in this scope
+
+error[E0425]: cannot find function `e` in this scope
+  --> $DIR/fn-to-method-deeply-nested.rs:2:13
+   |
+LL |     a(b(c(d(e(
+   |             ^ not found in this scope
+
+error[E0425]: cannot find function `d` in this scope
+  --> $DIR/fn-to-method-deeply-nested.rs:2:11
+   |
+LL |     a(b(c(d(e(
+   |           ^ not found in this scope
+
+error[E0425]: cannot find function `c` in this scope
+  --> $DIR/fn-to-method-deeply-nested.rs:2:9
+   |
+LL |     a(b(c(d(e(
+   |         ^ not found in this scope
+
+error[E0425]: cannot find function `b` in this scope
+  --> $DIR/fn-to-method-deeply-nested.rs:2:7
+   |
+LL |     a(b(c(d(e(
+   |       ^ not found in this scope
+
+error[E0425]: cannot find function `a` in this scope
+  --> $DIR/fn-to-method-deeply-nested.rs:2:5
+   |
+LL |     a(b(c(d(e(
+   |     ^ not found in this scope
+
+error: aborting due to 6 previous errors
+
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/suggestions/fn-to-method.rs b/tests/ui/suggestions/fn-to-method.rs
index 9a35c3efc..9a35c3efc 100644
--- a/src/test/ui/suggestions/fn-to-method.rs
+++ b/tests/ui/suggestions/fn-to-method.rs
diff --git a/src/test/ui/suggestions/fn-to-method.stderr b/tests/ui/suggestions/fn-to-method.stderr
index 36c17e60d..36c17e60d 100644
--- a/src/test/ui/suggestions/fn-to-method.stderr
+++ b/tests/ui/suggestions/fn-to-method.stderr
diff --git a/src/test/ui/suggestions/fn-trait-notation.fixed b/tests/ui/suggestions/fn-trait-notation.fixed
index cf940f4e9..cf940f4e9 100644
--- a/src/test/ui/suggestions/fn-trait-notation.fixed
+++ b/tests/ui/suggestions/fn-trait-notation.fixed
diff --git a/src/test/ui/suggestions/fn-trait-notation.rs b/tests/ui/suggestions/fn-trait-notation.rs
index f0bb03315..f0bb03315 100644
--- a/src/test/ui/suggestions/fn-trait-notation.rs
+++ b/tests/ui/suggestions/fn-trait-notation.rs
diff --git a/src/test/ui/suggestions/fn-trait-notation.stderr b/tests/ui/suggestions/fn-trait-notation.stderr
index 3e3b54174..3e3b54174 100644
--- a/src/test/ui/suggestions/fn-trait-notation.stderr
+++ b/tests/ui/suggestions/fn-trait-notation.stderr
diff --git a/src/test/ui/suggestions/for-i-in-vec.fixed b/tests/ui/suggestions/for-i-in-vec.fixed
index 4f2007bef..4f2007bef 100644
--- a/src/test/ui/suggestions/for-i-in-vec.fixed
+++ b/tests/ui/suggestions/for-i-in-vec.fixed
diff --git a/src/test/ui/suggestions/for-i-in-vec.rs b/tests/ui/suggestions/for-i-in-vec.rs
index 55fc7ad4e..55fc7ad4e 100644
--- a/src/test/ui/suggestions/for-i-in-vec.rs
+++ b/tests/ui/suggestions/for-i-in-vec.rs
diff --git a/src/test/ui/suggestions/for-i-in-vec.stderr b/tests/ui/suggestions/for-i-in-vec.stderr
index 88be9e30a..c5b81e6b8 100644
--- a/src/test/ui/suggestions/for-i-in-vec.stderr
+++ b/tests/ui/suggestions/for-i-in-vec.stderr
@@ -7,11 +7,8 @@ LL |         for _ in self.v {
    |                  `self.v` moved due to this implicit call to `.into_iter()`
    |                  move occurs because `self.v` has type `Vec<u32>`, which does not implement the `Copy` trait
    |
-note: this function takes ownership of the receiver `self`, which moves `self.v`
+note: `into_iter` takes ownership of the receiver `self`, which moves `self.v`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
 help: consider iterating over a slice of the `Vec<u32>`'s content to avoid moving into the `for` loop
    |
 LL |         for _ in &self.v {
@@ -40,11 +37,8 @@ LL |     for loader in *LOADERS {
    |                   value moved due to this implicit call to `.into_iter()`
    |                   move occurs because value has type `Vec<&u8>`, which does not implement the `Copy` trait
    |
-note: this function takes ownership of the receiver `self`, which moves value
+note: `into_iter` takes ownership of the receiver `self`, which moves value
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
 help: consider iterating over a slice of the `Vec<&u8>`'s content to avoid moving into the `for` loop
    |
 LL |     for loader in &*LOADERS {
diff --git a/src/test/ui/suggestions/format-borrow.rs b/tests/ui/suggestions/format-borrow.rs
index 599a79fc0..599a79fc0 100644
--- a/src/test/ui/suggestions/format-borrow.rs
+++ b/tests/ui/suggestions/format-borrow.rs
diff --git a/src/test/ui/suggestions/format-borrow.stderr b/tests/ui/suggestions/format-borrow.stderr
index 8ed2b9c9a..8ed2b9c9a 100644
--- a/src/test/ui/suggestions/format-borrow.stderr
+++ b/tests/ui/suggestions/format-borrow.stderr
diff --git a/src/test/ui/suggestions/if-let-typo.rs b/tests/ui/suggestions/if-let-typo.rs
index 375bd3f03..375bd3f03 100644
--- a/src/test/ui/suggestions/if-let-typo.rs
+++ b/tests/ui/suggestions/if-let-typo.rs
diff --git a/src/test/ui/suggestions/if-let-typo.stderr b/tests/ui/suggestions/if-let-typo.stderr
index 02148b7f7..02148b7f7 100644
--- a/src/test/ui/suggestions/if-let-typo.stderr
+++ b/tests/ui/suggestions/if-let-typo.stderr
diff --git a/src/test/ui/suggestions/if-then-neeing-semi.rs b/tests/ui/suggestions/if-then-neeing-semi.rs
index b487f013d..b487f013d 100644
--- a/src/test/ui/suggestions/if-then-neeing-semi.rs
+++ b/tests/ui/suggestions/if-then-neeing-semi.rs
diff --git a/src/test/ui/suggestions/if-then-neeing-semi.stderr b/tests/ui/suggestions/if-then-neeing-semi.stderr
index d7c5818ab..d7c5818ab 100644
--- a/src/test/ui/suggestions/if-then-neeing-semi.stderr
+++ b/tests/ui/suggestions/if-then-neeing-semi.stderr
diff --git a/src/test/ui/suggestions/ignore-nested-field-binding.fixed b/tests/ui/suggestions/ignore-nested-field-binding.fixed
index 1dc44838e..1dc44838e 100644
--- a/src/test/ui/suggestions/ignore-nested-field-binding.fixed
+++ b/tests/ui/suggestions/ignore-nested-field-binding.fixed
diff --git a/src/test/ui/suggestions/ignore-nested-field-binding.rs b/tests/ui/suggestions/ignore-nested-field-binding.rs
index 6dc0263ec..6dc0263ec 100644
--- a/src/test/ui/suggestions/ignore-nested-field-binding.rs
+++ b/tests/ui/suggestions/ignore-nested-field-binding.rs
diff --git a/src/test/ui/suggestions/ignore-nested-field-binding.stderr b/tests/ui/suggestions/ignore-nested-field-binding.stderr
index b2936a22a..b2936a22a 100644
--- a/src/test/ui/suggestions/ignore-nested-field-binding.stderr
+++ b/tests/ui/suggestions/ignore-nested-field-binding.stderr
diff --git a/src/test/ui/suggestions/imm-ref-trait-object-literal-bound-regions.rs b/tests/ui/suggestions/imm-ref-trait-object-literal-bound-regions.rs
index 319789c4e..319789c4e 100644
--- a/src/test/ui/suggestions/imm-ref-trait-object-literal-bound-regions.rs
+++ b/tests/ui/suggestions/imm-ref-trait-object-literal-bound-regions.rs
diff --git a/src/test/ui/suggestions/imm-ref-trait-object-literal-bound-regions.stderr b/tests/ui/suggestions/imm-ref-trait-object-literal-bound-regions.stderr
index 864ab0535..864ab0535 100644
--- a/src/test/ui/suggestions/imm-ref-trait-object-literal-bound-regions.stderr
+++ b/tests/ui/suggestions/imm-ref-trait-object-literal-bound-regions.stderr
diff --git a/src/test/ui/suggestions/imm-ref-trait-object-literal.rs b/tests/ui/suggestions/imm-ref-trait-object-literal.rs
index 22ca6dde4..22ca6dde4 100644
--- a/src/test/ui/suggestions/imm-ref-trait-object-literal.rs
+++ b/tests/ui/suggestions/imm-ref-trait-object-literal.rs
diff --git a/src/test/ui/suggestions/imm-ref-trait-object-literal.stderr b/tests/ui/suggestions/imm-ref-trait-object-literal.stderr
index e01102e38..e01102e38 100644
--- a/src/test/ui/suggestions/imm-ref-trait-object-literal.stderr
+++ b/tests/ui/suggestions/imm-ref-trait-object-literal.stderr
diff --git a/src/test/ui/suggestions/imm-ref-trait-object.rs b/tests/ui/suggestions/imm-ref-trait-object.rs
index 288d6c699..c1c969b90 100644
--- a/src/test/ui/suggestions/imm-ref-trait-object.rs
+++ b/tests/ui/suggestions/imm-ref-trait-object.rs
@@ -1,5 +1,5 @@
 fn test(t: &dyn Iterator<Item=&u64>) -> u64 {
-     t.min().unwrap() //~ ERROR the `min` method cannot be invoked on a trait object
+     t.min().unwrap() //~ ERROR the `min` method cannot be invoked on `&dyn Iterator<Item = &u64>`
 }
 
 fn main() {
diff --git a/tests/ui/suggestions/imm-ref-trait-object.stderr b/tests/ui/suggestions/imm-ref-trait-object.stderr
new file mode 100644
index 000000000..f7f7902c1
--- /dev/null
+++ b/tests/ui/suggestions/imm-ref-trait-object.stderr
@@ -0,0 +1,13 @@
+error: the `min` method cannot be invoked on `&dyn Iterator<Item = &u64>`
+  --> $DIR/imm-ref-trait-object.rs:2:8
+   |
+LL |      t.min().unwrap()
+   |        ^^^
+   |
+help: you need `&mut dyn Iterator<Item = &u64>` instead of `&dyn Iterator<Item = &u64>`
+   |
+LL | fn test(t: &mut dyn Iterator<Item=&u64>) -> u64 {
+   |             +++
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.rs b/tests/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.rs
index 711cbbd38..711cbbd38 100644
--- a/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.rs
+++ b/tests/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.rs
diff --git a/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.stderr b/tests/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.stderr
index 2dc300ac7..2dc300ac7 100644
--- a/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.stderr
+++ b/tests/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.stderr
diff --git a/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound.rs b/tests/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound.rs
index ae3cd315c..ae3cd315c 100644
--- a/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound.rs
+++ b/tests/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound.rs
diff --git a/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound.stderr b/tests/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound.stderr
index 679ebd61e..679ebd61e 100644
--- a/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound.stderr
+++ b/tests/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound.stderr
diff --git a/src/test/ui/suggestions/impl-trait-missing-lifetime-gated.rs b/tests/ui/suggestions/impl-trait-missing-lifetime-gated.rs
index a1a51c481..a1a51c481 100644
--- a/src/test/ui/suggestions/impl-trait-missing-lifetime-gated.rs
+++ b/tests/ui/suggestions/impl-trait-missing-lifetime-gated.rs
diff --git a/src/test/ui/suggestions/impl-trait-missing-lifetime-gated.stderr b/tests/ui/suggestions/impl-trait-missing-lifetime-gated.stderr
index 50806a672..50806a672 100644
--- a/src/test/ui/suggestions/impl-trait-missing-lifetime-gated.stderr
+++ b/tests/ui/suggestions/impl-trait-missing-lifetime-gated.stderr
diff --git a/src/test/ui/suggestions/impl-trait-missing-lifetime.rs b/tests/ui/suggestions/impl-trait-missing-lifetime.rs
index 6f7c912d7..6f7c912d7 100644
--- a/src/test/ui/suggestions/impl-trait-missing-lifetime.rs
+++ b/tests/ui/suggestions/impl-trait-missing-lifetime.rs
diff --git a/src/test/ui/suggestions/impl-trait-missing-lifetime.stderr b/tests/ui/suggestions/impl-trait-missing-lifetime.stderr
index b476d6101..b476d6101 100644
--- a/src/test/ui/suggestions/impl-trait-missing-lifetime.stderr
+++ b/tests/ui/suggestions/impl-trait-missing-lifetime.stderr
diff --git a/src/test/ui/suggestions/impl-trait-return-trailing-semicolon.rs b/tests/ui/suggestions/impl-trait-return-trailing-semicolon.rs
index cd3741356..cd3741356 100644
--- a/src/test/ui/suggestions/impl-trait-return-trailing-semicolon.rs
+++ b/tests/ui/suggestions/impl-trait-return-trailing-semicolon.rs
diff --git a/src/test/ui/suggestions/impl-trait-return-trailing-semicolon.stderr b/tests/ui/suggestions/impl-trait-return-trailing-semicolon.stderr
index e74c2c421..e74c2c421 100644
--- a/src/test/ui/suggestions/impl-trait-return-trailing-semicolon.stderr
+++ b/tests/ui/suggestions/impl-trait-return-trailing-semicolon.stderr
diff --git a/src/test/ui/suggestions/impl-trait-with-missing-bounds.rs b/tests/ui/suggestions/impl-trait-with-missing-bounds.rs
index 949b23600..949b23600 100644
--- a/src/test/ui/suggestions/impl-trait-with-missing-bounds.rs
+++ b/tests/ui/suggestions/impl-trait-with-missing-bounds.rs
diff --git a/src/test/ui/suggestions/impl-trait-with-missing-bounds.stderr b/tests/ui/suggestions/impl-trait-with-missing-bounds.stderr
index a763eb6f2..a763eb6f2 100644
--- a/src/test/ui/suggestions/impl-trait-with-missing-bounds.stderr
+++ b/tests/ui/suggestions/impl-trait-with-missing-bounds.stderr
diff --git a/src/test/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.fixed b/tests/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.fixed
index 5109511f9..5109511f9 100644
--- a/src/test/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.fixed
+++ b/tests/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.fixed
diff --git a/src/test/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.rs b/tests/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.rs
index cd05b7738..cd05b7738 100644
--- a/src/test/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.rs
+++ b/tests/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.rs
diff --git a/src/test/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.stderr b/tests/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.stderr
index 20f8e65f7..20f8e65f7 100644
--- a/src/test/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.stderr
+++ b/tests/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.stderr
diff --git a/src/test/ui/suggestions/import-trait-for-method-call.rs b/tests/ui/suggestions/import-trait-for-method-call.rs
index 4dbadbdf9..4dbadbdf9 100644
--- a/src/test/ui/suggestions/import-trait-for-method-call.rs
+++ b/tests/ui/suggestions/import-trait-for-method-call.rs
diff --git a/src/test/ui/suggestions/import-trait-for-method-call.stderr b/tests/ui/suggestions/import-trait-for-method-call.stderr
index bac8de798..f159b51a2 100644
--- a/src/test/ui/suggestions/import-trait-for-method-call.stderr
+++ b/tests/ui/suggestions/import-trait-for-method-call.stderr
@@ -3,11 +3,9 @@ error[E0599]: no method named `finish` found for struct `DefaultHasher` in the c
    |
 LL |     h.finish()
    |       ^^^^^^ method not found in `DefaultHasher`
+  --> $SRC_DIR/core/src/hash/mod.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/hash/mod.rs:LL:COL
-   |
-LL |     fn finish(&self) -> u64;
-   |        ------ the method is available for `DefaultHasher` here
+   = note: the method is available for `DefaultHasher` here
    |
    = help: items from traits can only be used if the trait is in scope
 help: the following trait is implemented but not in scope; perhaps add a `use` for it:
diff --git a/src/test/ui/suggestions/inner_type.fixed b/tests/ui/suggestions/inner_type.fixed
index 7af7391ca..7af7391ca 100644
--- a/src/test/ui/suggestions/inner_type.fixed
+++ b/tests/ui/suggestions/inner_type.fixed
diff --git a/src/test/ui/suggestions/inner_type.rs b/tests/ui/suggestions/inner_type.rs
index 4aca50716..4aca50716 100644
--- a/src/test/ui/suggestions/inner_type.rs
+++ b/tests/ui/suggestions/inner_type.rs
diff --git a/src/test/ui/suggestions/inner_type.stderr b/tests/ui/suggestions/inner_type.stderr
index 5ac3d04f1..5ac3d04f1 100644
--- a/src/test/ui/suggestions/inner_type.stderr
+++ b/tests/ui/suggestions/inner_type.stderr
diff --git a/src/test/ui/suggestions/inner_type2.rs b/tests/ui/suggestions/inner_type2.rs
index fac68c053..fac68c053 100644
--- a/src/test/ui/suggestions/inner_type2.rs
+++ b/tests/ui/suggestions/inner_type2.rs
diff --git a/src/test/ui/suggestions/inner_type2.stderr b/tests/ui/suggestions/inner_type2.stderr
index 984366123..984366123 100644
--- a/src/test/ui/suggestions/inner_type2.stderr
+++ b/tests/ui/suggestions/inner_type2.stderr
diff --git a/src/test/ui/suggestions/into-convert.rs b/tests/ui/suggestions/into-convert.rs
index 1c9a9e0aa..1c9a9e0aa 100644
--- a/src/test/ui/suggestions/into-convert.rs
+++ b/tests/ui/suggestions/into-convert.rs
diff --git a/src/test/ui/suggestions/into-convert.stderr b/tests/ui/suggestions/into-convert.stderr
index d43104a21..d43104a21 100644
--- a/src/test/ui/suggestions/into-convert.stderr
+++ b/tests/ui/suggestions/into-convert.stderr
diff --git a/src/test/ui/suggestions/into-str.rs b/tests/ui/suggestions/into-str.rs
index 606e44b2e..606e44b2e 100644
--- a/src/test/ui/suggestions/into-str.rs
+++ b/tests/ui/suggestions/into-str.rs
diff --git a/src/test/ui/suggestions/into-str.stderr b/tests/ui/suggestions/into-str.stderr
index a56a2a188..a56a2a188 100644
--- a/src/test/ui/suggestions/into-str.stderr
+++ b/tests/ui/suggestions/into-str.stderr
diff --git a/src/test/ui/suggestions/invalid-bin-op.rs b/tests/ui/suggestions/invalid-bin-op.rs
index bea1b9155..bea1b9155 100644
--- a/src/test/ui/suggestions/invalid-bin-op.rs
+++ b/tests/ui/suggestions/invalid-bin-op.rs
diff --git a/src/test/ui/suggestions/invalid-bin-op.stderr b/tests/ui/suggestions/invalid-bin-op.stderr
index 08502dfeb..08502dfeb 100644
--- a/src/test/ui/suggestions/invalid-bin-op.stderr
+++ b/tests/ui/suggestions/invalid-bin-op.stderr
diff --git a/src/test/ui/suggestions/issue-101065.fixed b/tests/ui/suggestions/issue-101065.fixed
index 88c716cc8..88c716cc8 100644
--- a/src/test/ui/suggestions/issue-101065.fixed
+++ b/tests/ui/suggestions/issue-101065.fixed
diff --git a/src/test/ui/suggestions/issue-101065.rs b/tests/ui/suggestions/issue-101065.rs
index 2715f1027..2715f1027 100644
--- a/src/test/ui/suggestions/issue-101065.rs
+++ b/tests/ui/suggestions/issue-101065.rs
diff --git a/src/test/ui/suggestions/issue-101065.stderr b/tests/ui/suggestions/issue-101065.stderr
index 6f7ecd24c..6f7ecd24c 100644
--- a/src/test/ui/suggestions/issue-101065.stderr
+++ b/tests/ui/suggestions/issue-101065.stderr
diff --git a/src/test/ui/suggestions/issue-101421.rs b/tests/ui/suggestions/issue-101421.rs
index b615997d1..b615997d1 100644
--- a/src/test/ui/suggestions/issue-101421.rs
+++ b/tests/ui/suggestions/issue-101421.rs
diff --git a/src/test/ui/suggestions/issue-101421.stderr b/tests/ui/suggestions/issue-101421.stderr
index f8e1efb88..f8e1efb88 100644
--- a/src/test/ui/suggestions/issue-101421.stderr
+++ b/tests/ui/suggestions/issue-101421.stderr
diff --git a/src/test/ui/suggestions/issue-101465.rs b/tests/ui/suggestions/issue-101465.rs
index 8e42e2c22..8e42e2c22 100644
--- a/src/test/ui/suggestions/issue-101465.rs
+++ b/tests/ui/suggestions/issue-101465.rs
diff --git a/src/test/ui/suggestions/issue-101465.stderr b/tests/ui/suggestions/issue-101465.stderr
index e2ca77712..e2ca77712 100644
--- a/src/test/ui/suggestions/issue-101465.stderr
+++ b/tests/ui/suggestions/issue-101465.stderr
diff --git a/src/test/ui/suggestions/issue-101623.rs b/tests/ui/suggestions/issue-101623.rs
index d18a4a21f..d18a4a21f 100644
--- a/src/test/ui/suggestions/issue-101623.rs
+++ b/tests/ui/suggestions/issue-101623.rs
diff --git a/src/test/ui/suggestions/issue-101623.stderr b/tests/ui/suggestions/issue-101623.stderr
index 361483cc0..361483cc0 100644
--- a/src/test/ui/suggestions/issue-101623.stderr
+++ b/tests/ui/suggestions/issue-101623.stderr
diff --git a/src/test/ui/suggestions/issue-101984.rs b/tests/ui/suggestions/issue-101984.rs
index 5f7ecb77e..5f7ecb77e 100644
--- a/src/test/ui/suggestions/issue-101984.rs
+++ b/tests/ui/suggestions/issue-101984.rs
diff --git a/src/test/ui/suggestions/issue-101984.stderr b/tests/ui/suggestions/issue-101984.stderr
index 81758a700..81758a700 100644
--- a/src/test/ui/suggestions/issue-101984.stderr
+++ b/tests/ui/suggestions/issue-101984.stderr
diff --git a/src/test/ui/suggestions/issue-102354.rs b/tests/ui/suggestions/issue-102354.rs
index f881feb00..f881feb00 100644
--- a/src/test/ui/suggestions/issue-102354.rs
+++ b/tests/ui/suggestions/issue-102354.rs
diff --git a/src/test/ui/suggestions/issue-102354.stderr b/tests/ui/suggestions/issue-102354.stderr
index 08d4b9955..08d4b9955 100644
--- a/src/test/ui/suggestions/issue-102354.stderr
+++ b/tests/ui/suggestions/issue-102354.stderr
diff --git a/src/test/ui/suggestions/issue-102892.rs b/tests/ui/suggestions/issue-102892.rs
index c1a791d8d..c1a791d8d 100644
--- a/src/test/ui/suggestions/issue-102892.rs
+++ b/tests/ui/suggestions/issue-102892.rs
diff --git a/src/test/ui/suggestions/issue-102892.stderr b/tests/ui/suggestions/issue-102892.stderr
index a3dbc7cb8..a3dbc7cb8 100644
--- a/src/test/ui/suggestions/issue-102892.stderr
+++ b/tests/ui/suggestions/issue-102892.stderr
diff --git a/src/test/ui/suggestions/issue-103112.rs b/tests/ui/suggestions/issue-103112.rs
index 111ae7c73..111ae7c73 100644
--- a/src/test/ui/suggestions/issue-103112.rs
+++ b/tests/ui/suggestions/issue-103112.rs
diff --git a/src/test/ui/suggestions/issue-103112.stderr b/tests/ui/suggestions/issue-103112.stderr
index 4ca7fdf9b..4ca7fdf9b 100644
--- a/src/test/ui/suggestions/issue-103112.stderr
+++ b/tests/ui/suggestions/issue-103112.stderr
diff --git a/src/test/ui/suggestions/issue-104086-suggest-let.rs b/tests/ui/suggestions/issue-104086-suggest-let.rs
index d22ad27d0..d22ad27d0 100644
--- a/src/test/ui/suggestions/issue-104086-suggest-let.rs
+++ b/tests/ui/suggestions/issue-104086-suggest-let.rs
diff --git a/src/test/ui/suggestions/issue-104086-suggest-let.stderr b/tests/ui/suggestions/issue-104086-suggest-let.stderr
index fb4ea3121..fb4ea3121 100644
--- a/src/test/ui/suggestions/issue-104086-suggest-let.stderr
+++ b/tests/ui/suggestions/issue-104086-suggest-let.stderr
diff --git a/tests/ui/suggestions/issue-104287.rs b/tests/ui/suggestions/issue-104287.rs
new file mode 100644
index 000000000..e3fa22a8f
--- /dev/null
+++ b/tests/ui/suggestions/issue-104287.rs
@@ -0,0 +1,13 @@
+// The purpose of this test is not to validate the output of the compiler.
+// Instead, it ensures the suggestion is generated without performing an arithmetic overflow.
+
+struct S;
+impl S {
+    fn foo(&self) {}
+}
+fn main() {
+    let x = S;
+    foo::<()>(x);
+    //~^ ERROR this associated function takes 0 generic arguments but 1 generic argument was supplied
+    //~| ERROR cannot find function `foo` in this scope
+}
diff --git a/tests/ui/suggestions/issue-104287.stderr b/tests/ui/suggestions/issue-104287.stderr
new file mode 100644
index 000000000..602a01828
--- /dev/null
+++ b/tests/ui/suggestions/issue-104287.stderr
@@ -0,0 +1,30 @@
+error[E0107]: this associated function takes 0 generic arguments but 1 generic argument was supplied
+  --> $DIR/issue-104287.rs:10:5
+   |
+LL |     foo::<()>(x);
+   |     ^^^------ help: remove these generics
+   |     |
+   |     expected 0 generic arguments
+   |
+note: associated function defined here, with 0 generic parameters
+  --> $DIR/issue-104287.rs:6:8
+   |
+LL |     fn foo(&self) {}
+   |        ^^^
+
+error[E0425]: cannot find function `foo` in this scope
+  --> $DIR/issue-104287.rs:10:5
+   |
+LL |     foo::<()>(x);
+   |     ^^^ not found in this scope
+   |
+help: use the `.` operator to call the method `foo` on `&S`
+   |
+LL -     foo::<()>(x);
+LL +     x.foo();
+   |
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0107, E0425.
+For more information about an error, try `rustc --explain E0107`.
diff --git a/tests/ui/suggestions/issue-104327.rs b/tests/ui/suggestions/issue-104327.rs
new file mode 100644
index 000000000..dd621ae71
--- /dev/null
+++ b/tests/ui/suggestions/issue-104327.rs
@@ -0,0 +1,12 @@
+trait Bar {}
+
+trait Foo {
+    fn f() {}
+}
+
+impl Foo for dyn Bar {}
+
+fn main() {
+    Foo::f();
+    //~^ ERROR cannot call associated function on trait without specifying the corresponding `impl` type
+}
diff --git a/tests/ui/suggestions/issue-104327.stderr b/tests/ui/suggestions/issue-104327.stderr
new file mode 100644
index 000000000..acec3a55d
--- /dev/null
+++ b/tests/ui/suggestions/issue-104327.stderr
@@ -0,0 +1,17 @@
+error[E0790]: cannot call associated function on trait without specifying the corresponding `impl` type
+  --> $DIR/issue-104327.rs:10:5
+   |
+LL |     fn f() {}
+   |     --------- `Foo::f` defined here
+...
+LL |     Foo::f();
+   |     ^^^^^^ cannot call associated function of trait
+   |
+help: use the fully-qualified path to the only available implementation
+   |
+LL |     <(dyn Bar + 'static) as Foo>::f();
+   |     +++++++++++++++++++++++    +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0790`.
diff --git a/tests/ui/suggestions/issue-104328.rs b/tests/ui/suggestions/issue-104328.rs
new file mode 100644
index 000000000..c3707baf7
--- /dev/null
+++ b/tests/ui/suggestions/issue-104328.rs
@@ -0,0 +1,12 @@
+#![feature(object_safe_for_dispatch)]
+
+trait Foo {
+    fn f() {}
+}
+
+impl Foo for dyn Sized {}
+
+fn main() {
+    Foo::f();
+    //~^ ERROR cannot call associated function on trait without specifying the corresponding `impl` type
+}
diff --git a/tests/ui/suggestions/issue-104328.stderr b/tests/ui/suggestions/issue-104328.stderr
new file mode 100644
index 000000000..b31b84781
--- /dev/null
+++ b/tests/ui/suggestions/issue-104328.stderr
@@ -0,0 +1,17 @@
+error[E0790]: cannot call associated function on trait without specifying the corresponding `impl` type
+  --> $DIR/issue-104328.rs:10:5
+   |
+LL |     fn f() {}
+   |     --------- `Foo::f` defined here
+...
+LL |     Foo::f();
+   |     ^^^^^^ cannot call associated function of trait
+   |
+help: use the fully-qualified path to the only available implementation
+   |
+LL |     <(dyn Sized + 'static) as Foo>::f();
+   |     +++++++++++++++++++++++++    +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0790`.
diff --git a/tests/ui/suggestions/issue-105226.rs b/tests/ui/suggestions/issue-105226.rs
new file mode 100644
index 000000000..f123dbf4c
--- /dev/null
+++ b/tests/ui/suggestions/issue-105226.rs
@@ -0,0 +1,22 @@
+use std::fmt;
+
+struct S {
+}
+
+impl S {
+    fn hello<P>(&self, val: &P) where P: fmt::Display; {
+        //~^ ERROR non-item in item list
+        //~| ERROR associated function in `impl` without body
+        println!("val: {}", val);
+    }
+}
+
+impl S {
+    fn hello_empty<P>(&self, val: &P) where P: fmt::Display;
+    //~^ ERROR associated function in `impl` without body
+}
+
+fn main() {
+    let s = S{};
+    s.hello(&32);
+}
diff --git a/tests/ui/suggestions/issue-105226.stderr b/tests/ui/suggestions/issue-105226.stderr
new file mode 100644
index 000000000..f16a80901
--- /dev/null
+++ b/tests/ui/suggestions/issue-105226.stderr
@@ -0,0 +1,31 @@
+error: non-item in item list
+  --> $DIR/issue-105226.rs:7:56
+   |
+LL | impl S {
+   |        - item list starts here
+LL |     fn hello<P>(&self, val: &P) where P: fmt::Display; {
+   |                                                      - ^ non-item starts here
+   |                                                      |
+   |                                                      help: consider removing this semicolon
+...
+LL | }
+   | - item list ends here
+
+error: associated function in `impl` without body
+  --> $DIR/issue-105226.rs:7:5
+   |
+LL |     fn hello<P>(&self, val: &P) where P: fmt::Display; {
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
+   |                                                      |
+   |                                                      help: provide a definition for the function: `{ <body> }`
+
+error: associated function in `impl` without body
+  --> $DIR/issue-105226.rs:15:5
+   |
+LL |     fn hello_empty<P>(&self, val: &P) where P: fmt::Display;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
+   |                                                            |
+   |                                                            help: provide a definition for the function: `{ <body> }`
+
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/suggestions/issue-105494.rs b/tests/ui/suggestions/issue-105494.rs
new file mode 100644
index 000000000..8b409232c
--- /dev/null
+++ b/tests/ui/suggestions/issue-105494.rs
@@ -0,0 +1,22 @@
+fn test1() {
+    let _v: i32 = (1 as i32).to_string(); //~ ERROR mismatched types
+
+    // won't suggestion
+    let _v: i32 = (1 as i128).to_string(); //~ ERROR mismatched types
+
+    let _v: &str = "foo".to_string(); //~ ERROR mismatched types
+}
+
+fn test2() {
+    let mut path: String = "/usr".to_string();
+    let folder: String = "lib".to_string();
+
+    path = format!("{}/{}", path, folder).as_str(); //~ ERROR mismatched types
+
+    println!("{}", &path);
+}
+
+fn main() {
+    test1();
+    test2();
+}
diff --git a/tests/ui/suggestions/issue-105494.stderr b/tests/ui/suggestions/issue-105494.stderr
new file mode 100644
index 000000000..5aa3f2af7
--- /dev/null
+++ b/tests/ui/suggestions/issue-105494.stderr
@@ -0,0 +1,54 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-105494.rs:2:19
+   |
+LL |     let _v: i32 = (1 as i32).to_string();
+   |             ---   ^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found struct `String`
+   |             |
+   |             expected due to this
+   |
+help: try removing the method call
+   |
+LL -     let _v: i32 = (1 as i32).to_string();
+LL +     let _v: i32 = (1 as i32);
+   |
+
+error[E0308]: mismatched types
+  --> $DIR/issue-105494.rs:5:19
+   |
+LL |     let _v: i32 = (1 as i128).to_string();
+   |             ---   ^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found struct `String`
+   |             |
+   |             expected due to this
+
+error[E0308]: mismatched types
+  --> $DIR/issue-105494.rs:7:20
+   |
+LL |     let _v: &str = "foo".to_string();
+   |             ----   ^^^^^^^^^^^^^^^^^ expected `&str`, found struct `String`
+   |             |
+   |             expected due to this
+   |
+help: try removing the method call
+   |
+LL -     let _v: &str = "foo".to_string();
+LL +     let _v: &str = "foo";
+   |
+
+error[E0308]: mismatched types
+  --> $DIR/issue-105494.rs:14:12
+   |
+LL |     let mut path: String = "/usr".to_string();
+   |                   ------ expected due to this type
+...
+LL |     path = format!("{}/{}", path, folder).as_str();
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `String`, found `&str`
+   |
+help: try removing the method call
+   |
+LL -     path = format!("{}/{}", path, folder).as_str();
+LL +     path = format!("{}/{}", path, folder);
+   |
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/suggestions/issue-105645.rs b/tests/ui/suggestions/issue-105645.rs
new file mode 100644
index 000000000..681ce1c6e
--- /dev/null
+++ b/tests/ui/suggestions/issue-105645.rs
@@ -0,0 +1,8 @@
+fn main() {
+    let mut buf = [0u8; 50];
+    let mut bref = buf.as_slice();
+    foo(&mut bref);
+    //~^ ERROR 4:9: 4:18: the trait bound `&[u8]: std::io::Write` is not satisfied [E0277]
+}
+
+fn foo(_: &mut impl std::io::Write) {}
diff --git a/tests/ui/suggestions/issue-105645.stderr b/tests/ui/suggestions/issue-105645.stderr
new file mode 100644
index 000000000..895f5ffd1
--- /dev/null
+++ b/tests/ui/suggestions/issue-105645.stderr
@@ -0,0 +1,18 @@
+error[E0277]: the trait bound `&[u8]: std::io::Write` is not satisfied
+  --> $DIR/issue-105645.rs:4:9
+   |
+LL |     foo(&mut bref);
+   |     --- ^^^^^^^^^ the trait `std::io::Write` is not implemented for `&[u8]`
+   |     |
+   |     required by a bound introduced by this call
+   |
+   = help: the trait `std::io::Write` is implemented for `&mut [u8]`
+note: required by a bound in `foo`
+  --> $DIR/issue-105645.rs:8:21
+   |
+LL | fn foo(_: &mut impl std::io::Write) {}
+   |                     ^^^^^^^^^^^^^^ required by this bound in `foo`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/suggestions/issue-105761-suggest-self-for-closure.fixed b/tests/ui/suggestions/issue-105761-suggest-self-for-closure.fixed
new file mode 100644
index 000000000..78e48364b
--- /dev/null
+++ b/tests/ui/suggestions/issue-105761-suggest-self-for-closure.fixed
@@ -0,0 +1,28 @@
+//run-rustfix
+#![allow(unused)]
+
+struct S;
+impl S {
+    fn foo(&mut self) {
+        let x = |this: &Self, v: i32| {
+            this.bar();
+            this.hel();
+        };
+        self.qux(); //~ ERROR cannot borrow `*self` as mutable because it is also borrowed as immutable
+        x(self, 1);
+        x(self, 3);
+    }
+    fn bar(&self) {}
+    fn hel(&self) {}
+    fn qux(&mut self) {}
+
+    fn hello(&mut self) {
+        let y = |this: &Self| {
+            this.bar();
+        };
+        self.qux(); //~ ERROR cannot borrow `*self` as mutable because it is also borrowed as immutable
+        y(self);
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/suggestions/issue-105761-suggest-self-for-closure.rs b/tests/ui/suggestions/issue-105761-suggest-self-for-closure.rs
new file mode 100644
index 000000000..6d8a9ffc1
--- /dev/null
+++ b/tests/ui/suggestions/issue-105761-suggest-self-for-closure.rs
@@ -0,0 +1,28 @@
+//run-rustfix
+#![allow(unused)]
+
+struct S;
+impl S {
+    fn foo(&mut self) {
+        let x = |v: i32| {
+            self.bar();
+            self.hel();
+        };
+        self.qux(); //~ ERROR cannot borrow `*self` as mutable because it is also borrowed as immutable
+        x(1);
+        x(3);
+    }
+    fn bar(&self) {}
+    fn hel(&self) {}
+    fn qux(&mut self) {}
+
+    fn hello(&mut self) {
+        let y = || {
+            self.bar();
+        };
+        self.qux(); //~ ERROR cannot borrow `*self` as mutable because it is also borrowed as immutable
+        y();
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/suggestions/issue-105761-suggest-self-for-closure.stderr b/tests/ui/suggestions/issue-105761-suggest-self-for-closure.stderr
new file mode 100644
index 000000000..bc97d32eb
--- /dev/null
+++ b/tests/ui/suggestions/issue-105761-suggest-self-for-closure.stderr
@@ -0,0 +1,49 @@
+error[E0502]: cannot borrow `*self` as mutable because it is also borrowed as immutable
+  --> $DIR/issue-105761-suggest-self-for-closure.rs:11:9
+   |
+LL |         let x = |v: i32| {
+   |                 -------- immutable borrow occurs here
+LL |             self.bar();
+   |             ---- first borrow occurs due to use of `self` in closure
+...
+LL |         self.qux();
+   |         ^^^^^^^^^^ mutable borrow occurs here
+LL |         x(1);
+   |         - immutable borrow later used here
+   |
+help: try explicitly pass `&Self` into the Closure as an argument
+   |
+LL ~         let x = |this: &Self, v: i32| {
+LL ~             this.bar();
+LL ~             this.hel();
+LL |         };
+LL |         self.qux();
+LL ~         x(self, 1);
+LL ~         x(self, 3);
+   |
+
+error[E0502]: cannot borrow `*self` as mutable because it is also borrowed as immutable
+  --> $DIR/issue-105761-suggest-self-for-closure.rs:23:9
+   |
+LL |         let y = || {
+   |                 -- immutable borrow occurs here
+LL |             self.bar();
+   |             ---- first borrow occurs due to use of `self` in closure
+LL |         };
+LL |         self.qux();
+   |         ^^^^^^^^^^ mutable borrow occurs here
+LL |         y();
+   |         - immutable borrow later used here
+   |
+help: try explicitly pass `&Self` into the Closure as an argument
+   |
+LL ~         let y = |this: &Self| {
+LL ~             this.bar();
+LL |         };
+LL |         self.qux();
+LL ~         y(self);
+   |
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0502`.
diff --git a/tests/ui/suggestions/issue-106443-sugg-clone-for-arg.rs b/tests/ui/suggestions/issue-106443-sugg-clone-for-arg.rs
new file mode 100644
index 000000000..48efdb82c
--- /dev/null
+++ b/tests/ui/suggestions/issue-106443-sugg-clone-for-arg.rs
@@ -0,0 +1,23 @@
+#[derive(Clone)]
+struct S;
+
+// without Clone
+struct T;
+
+fn foo(_: S) {}
+
+fn test1() {
+    let s = &S;
+    foo(s); //~ ERROR mismatched types
+}
+
+fn bar(_: T) {}
+fn test2() {
+    let t = &T;
+    bar(t); //~ ERROR mismatched types
+}
+
+fn main() {
+    test1();
+    test2();
+}
diff --git a/tests/ui/suggestions/issue-106443-sugg-clone-for-arg.stderr b/tests/ui/suggestions/issue-106443-sugg-clone-for-arg.stderr
new file mode 100644
index 000000000..1e66fe3af
--- /dev/null
+++ b/tests/ui/suggestions/issue-106443-sugg-clone-for-arg.stderr
@@ -0,0 +1,35 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-106443-sugg-clone-for-arg.rs:11:9
+   |
+LL |     foo(s);
+   |     --- ^ expected struct `S`, found `&S`
+   |     |
+   |     arguments to this function are incorrect
+   |
+note: function defined here
+  --> $DIR/issue-106443-sugg-clone-for-arg.rs:7:4
+   |
+LL | fn foo(_: S) {}
+   |    ^^^ ----
+help: consider using clone here
+   |
+LL |     foo(s.clone());
+   |          ++++++++
+
+error[E0308]: mismatched types
+  --> $DIR/issue-106443-sugg-clone-for-arg.rs:17:9
+   |
+LL |     bar(t);
+   |     --- ^ expected struct `T`, found `&T`
+   |     |
+   |     arguments to this function are incorrect
+   |
+note: function defined here
+  --> $DIR/issue-106443-sugg-clone-for-arg.rs:14:4
+   |
+LL | fn bar(_: T) {}
+   |    ^^^ ----
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/suggestions/issue-106443-sugg-clone-for-bound.rs b/tests/ui/suggestions/issue-106443-sugg-clone-for-bound.rs
new file mode 100644
index 000000000..3b2e316b2
--- /dev/null
+++ b/tests/ui/suggestions/issue-106443-sugg-clone-for-bound.rs
@@ -0,0 +1,20 @@
+#[derive(Clone)]
+struct S;
+
+trait X {}
+
+impl X for S {}
+
+fn foo<T: X>(_: T) {}
+fn bar<T: X>(s: &T) {
+    foo(s); //~ ERROR the trait bound `&T: X` is not satisfied
+}
+
+fn bar_with_clone<T: X + Clone>(s: &T) {
+    foo(s); //~ ERROR the trait bound `&T: X` is not satisfied
+}
+
+fn main() {
+    let s = &S;
+    bar(s);
+}
diff --git a/tests/ui/suggestions/issue-106443-sugg-clone-for-bound.stderr b/tests/ui/suggestions/issue-106443-sugg-clone-for-bound.stderr
new file mode 100644
index 000000000..8607917ed
--- /dev/null
+++ b/tests/ui/suggestions/issue-106443-sugg-clone-for-bound.stderr
@@ -0,0 +1,29 @@
+error[E0277]: the trait bound `&T: X` is not satisfied
+  --> $DIR/issue-106443-sugg-clone-for-bound.rs:10:9
+   |
+LL |     foo(s);
+   |         ^ the trait `X` is not implemented for `&T`
+   |
+help: consider further restricting this bound
+   |
+LL | fn bar<T: X + Clone>(s: &T) {
+   |             +++++++
+help: consider using clone here
+   |
+LL |     foo(s.clone());
+   |          ++++++++
+
+error[E0277]: the trait bound `&T: X` is not satisfied
+  --> $DIR/issue-106443-sugg-clone-for-bound.rs:14:9
+   |
+LL |     foo(s);
+   |         ^ the trait `X` is not implemented for `&T`
+   |
+help: consider using clone here
+   |
+LL |     foo(s.clone());
+   |          ++++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/suggestions/issue-21673.rs b/tests/ui/suggestions/issue-21673.rs
index 9d66cae05..9d66cae05 100644
--- a/src/test/ui/suggestions/issue-21673.rs
+++ b/tests/ui/suggestions/issue-21673.rs
diff --git a/src/test/ui/suggestions/issue-21673.stderr b/tests/ui/suggestions/issue-21673.stderr
index 523d7a7cc..523d7a7cc 100644
--- a/src/test/ui/suggestions/issue-21673.stderr
+++ b/tests/ui/suggestions/issue-21673.stderr
diff --git a/src/test/ui/suggestions/issue-51055-missing-semicolon-between-call-and-tuple.rs b/tests/ui/suggestions/issue-51055-missing-semicolon-between-call-and-tuple.rs
index 37f078285..37f078285 100644
--- a/src/test/ui/suggestions/issue-51055-missing-semicolon-between-call-and-tuple.rs
+++ b/tests/ui/suggestions/issue-51055-missing-semicolon-between-call-and-tuple.rs
diff --git a/src/test/ui/suggestions/issue-51055-missing-semicolon-between-call-and-tuple.stderr b/tests/ui/suggestions/issue-51055-missing-semicolon-between-call-and-tuple.stderr
index 438075083..438075083 100644
--- a/src/test/ui/suggestions/issue-51055-missing-semicolon-between-call-and-tuple.stderr
+++ b/tests/ui/suggestions/issue-51055-missing-semicolon-between-call-and-tuple.stderr
diff --git a/src/test/ui/suggestions/issue-52820.fixed b/tests/ui/suggestions/issue-52820.fixed
index 514690de4..514690de4 100644
--- a/src/test/ui/suggestions/issue-52820.fixed
+++ b/tests/ui/suggestions/issue-52820.fixed
diff --git a/src/test/ui/suggestions/issue-52820.rs b/tests/ui/suggestions/issue-52820.rs
index 17cd9224c..17cd9224c 100644
--- a/src/test/ui/suggestions/issue-52820.rs
+++ b/tests/ui/suggestions/issue-52820.rs
diff --git a/src/test/ui/suggestions/issue-52820.stderr b/tests/ui/suggestions/issue-52820.stderr
index 09269ed4e..09269ed4e 100644
--- a/src/test/ui/suggestions/issue-52820.stderr
+++ b/tests/ui/suggestions/issue-52820.stderr
diff --git a/src/test/ui/suggestions/issue-53692.fixed b/tests/ui/suggestions/issue-53692.fixed
index 35a677b47..35a677b47 100644
--- a/src/test/ui/suggestions/issue-53692.fixed
+++ b/tests/ui/suggestions/issue-53692.fixed
diff --git a/src/test/ui/suggestions/issue-53692.rs b/tests/ui/suggestions/issue-53692.rs
index 6f6707be5..6f6707be5 100644
--- a/src/test/ui/suggestions/issue-53692.rs
+++ b/tests/ui/suggestions/issue-53692.rs
diff --git a/src/test/ui/suggestions/issue-53692.stderr b/tests/ui/suggestions/issue-53692.stderr
index 3a1b624f4..3a1b624f4 100644
--- a/src/test/ui/suggestions/issue-53692.stderr
+++ b/tests/ui/suggestions/issue-53692.stderr
diff --git a/src/test/ui/suggestions/issue-57672.rs b/tests/ui/suggestions/issue-57672.rs
index ee999d83e..ee999d83e 100644
--- a/src/test/ui/suggestions/issue-57672.rs
+++ b/tests/ui/suggestions/issue-57672.rs
diff --git a/src/test/ui/suggestions/issue-59819.fixed b/tests/ui/suggestions/issue-59819.fixed
index 644d2a4e4..644d2a4e4 100644
--- a/src/test/ui/suggestions/issue-59819.fixed
+++ b/tests/ui/suggestions/issue-59819.fixed
diff --git a/src/test/ui/suggestions/issue-59819.rs b/tests/ui/suggestions/issue-59819.rs
index 8e8ff8372..8e8ff8372 100644
--- a/src/test/ui/suggestions/issue-59819.rs
+++ b/tests/ui/suggestions/issue-59819.rs
diff --git a/src/test/ui/suggestions/issue-59819.stderr b/tests/ui/suggestions/issue-59819.stderr
index 40e4c7b78..40e4c7b78 100644
--- a/src/test/ui/suggestions/issue-59819.stderr
+++ b/tests/ui/suggestions/issue-59819.stderr
diff --git a/src/test/ui/suggestions/issue-61226.fixed b/tests/ui/suggestions/issue-61226.fixed
index 6e9d74344..6e9d74344 100644
--- a/src/test/ui/suggestions/issue-61226.fixed
+++ b/tests/ui/suggestions/issue-61226.fixed
diff --git a/src/test/ui/suggestions/issue-61226.rs b/tests/ui/suggestions/issue-61226.rs
index 695fe7341..695fe7341 100644
--- a/src/test/ui/suggestions/issue-61226.rs
+++ b/tests/ui/suggestions/issue-61226.rs
diff --git a/src/test/ui/suggestions/issue-61226.stderr b/tests/ui/suggestions/issue-61226.stderr
index cda962a90..cda962a90 100644
--- a/src/test/ui/suggestions/issue-61226.stderr
+++ b/tests/ui/suggestions/issue-61226.stderr
diff --git a/src/test/ui/suggestions/issue-61963.rs b/tests/ui/suggestions/issue-61963.rs
index a27c38452..a27c38452 100644
--- a/src/test/ui/suggestions/issue-61963.rs
+++ b/tests/ui/suggestions/issue-61963.rs
diff --git a/src/test/ui/suggestions/issue-61963.stderr b/tests/ui/suggestions/issue-61963.stderr
index b99b1b0b9..b99b1b0b9 100644
--- a/src/test/ui/suggestions/issue-61963.stderr
+++ b/tests/ui/suggestions/issue-61963.stderr
diff --git a/src/test/ui/suggestions/issue-62843.rs b/tests/ui/suggestions/issue-62843.rs
index d96b12fd1..d96b12fd1 100644
--- a/src/test/ui/suggestions/issue-62843.rs
+++ b/tests/ui/suggestions/issue-62843.rs
diff --git a/src/test/ui/suggestions/issue-62843.stderr b/tests/ui/suggestions/issue-62843.stderr
index 62f0943d4..b6e271de8 100644
--- a/src/test/ui/suggestions/issue-62843.stderr
+++ b/tests/ui/suggestions/issue-62843.stderr
@@ -10,9 +10,6 @@ LL |     println!("{:?}", line.find(pattern));
    = note: required for `String` to implement `Pattern<'_>`
 note: required by a bound in `core::str::<impl str>::find`
   --> $SRC_DIR/core/src/str/mod.rs:LL:COL
-   |
-LL |     pub fn find<'a, P: Pattern<'a>>(&'a self, pat: P) -> Option<usize> {
-   |                        ^^^^^^^^^^^ required by this bound in `core::str::<impl str>::find`
 help: consider borrowing here
    |
 LL |     println!("{:?}", line.find(&pattern));
diff --git a/src/test/ui/suggestions/issue-64252-self-type.rs b/tests/ui/suggestions/issue-64252-self-type.rs
index 128d5e85c..128d5e85c 100644
--- a/src/test/ui/suggestions/issue-64252-self-type.rs
+++ b/tests/ui/suggestions/issue-64252-self-type.rs
diff --git a/src/test/ui/suggestions/issue-64252-self-type.stderr b/tests/ui/suggestions/issue-64252-self-type.stderr
index c3418dab0..c3418dab0 100644
--- a/src/test/ui/suggestions/issue-64252-self-type.stderr
+++ b/tests/ui/suggestions/issue-64252-self-type.stderr
diff --git a/src/test/ui/suggestions/issue-66968-suggest-sorted-words.rs b/tests/ui/suggestions/issue-66968-suggest-sorted-words.rs
index 440bb653a..440bb653a 100644
--- a/src/test/ui/suggestions/issue-66968-suggest-sorted-words.rs
+++ b/tests/ui/suggestions/issue-66968-suggest-sorted-words.rs
diff --git a/src/test/ui/suggestions/issue-66968-suggest-sorted-words.stderr b/tests/ui/suggestions/issue-66968-suggest-sorted-words.stderr
index d7b33ea41..d7b33ea41 100644
--- a/src/test/ui/suggestions/issue-66968-suggest-sorted-words.stderr
+++ b/tests/ui/suggestions/issue-66968-suggest-sorted-words.stderr
diff --git a/src/test/ui/suggestions/issue-68049-1.rs b/tests/ui/suggestions/issue-68049-1.rs
index 0acb7b1bf..0acb7b1bf 100644
--- a/src/test/ui/suggestions/issue-68049-1.rs
+++ b/tests/ui/suggestions/issue-68049-1.rs
diff --git a/src/test/ui/suggestions/issue-68049-1.stderr b/tests/ui/suggestions/issue-68049-1.stderr
index 7f931f0cd..7f931f0cd 100644
--- a/src/test/ui/suggestions/issue-68049-1.stderr
+++ b/tests/ui/suggestions/issue-68049-1.stderr
diff --git a/src/test/ui/suggestions/issue-68049-2.rs b/tests/ui/suggestions/issue-68049-2.rs
index 1c3430c14..1c3430c14 100644
--- a/src/test/ui/suggestions/issue-68049-2.rs
+++ b/tests/ui/suggestions/issue-68049-2.rs
diff --git a/tests/ui/suggestions/issue-68049-2.stderr b/tests/ui/suggestions/issue-68049-2.stderr
new file mode 100644
index 000000000..de35aa5b1
--- /dev/null
+++ b/tests/ui/suggestions/issue-68049-2.stderr
@@ -0,0 +1,25 @@
+error[E0594]: cannot assign to `*input`, which is behind a `&` reference
+  --> $DIR/issue-68049-2.rs:9:7
+   |
+LL |       *input = self.0;
+   |       ^^^^^^^^^^^^^^^ `input` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing that to be a mutable reference
+   |
+LL |   fn example(&self, input: &mut i32); // should suggest here
+   |                            ~~~~~~~~
+
+error[E0594]: cannot assign to `self.0`, which is behind a `&` reference
+  --> $DIR/issue-68049-2.rs:17:5
+   |
+LL |     self.0 += *input;
+   |     ^^^^^^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing that to be a mutable reference
+   |
+LL |   fn example(&mut self, input: &i32); // should suggest here
+   |              ~~~~~~~~~
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/suggestions/issue-71394-no-from-impl.rs b/tests/ui/suggestions/issue-71394-no-from-impl.rs
index 0c35deb51..0c35deb51 100644
--- a/src/test/ui/suggestions/issue-71394-no-from-impl.rs
+++ b/tests/ui/suggestions/issue-71394-no-from-impl.rs
diff --git a/tests/ui/suggestions/issue-71394-no-from-impl.stderr b/tests/ui/suggestions/issue-71394-no-from-impl.stderr
new file mode 100644
index 000000000..a5e6f5b5f
--- /dev/null
+++ b/tests/ui/suggestions/issue-71394-no-from-impl.stderr
@@ -0,0 +1,14 @@
+error[E0277]: the trait bound `&[i8]: From<&[u8]>` is not satisfied
+  --> $DIR/issue-71394-no-from-impl.rs:3:25
+   |
+LL |     let _: &[i8] = data.into();
+   |                         ^^^^ the trait `From<&[u8]>` is not implemented for `&[i8]`
+   |
+   = help: the following other types implement trait `From<T>`:
+             <[T; LANES] as From<Simd<T, LANES>>>
+             <[bool; LANES] as From<Mask<T, LANES>>>
+   = note: required for `&[u8]` to implement `Into<&[i8]>`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/suggestions/issue-72766.rs b/tests/ui/suggestions/issue-72766.rs
index c54be7f5d..c54be7f5d 100644
--- a/src/test/ui/suggestions/issue-72766.rs
+++ b/tests/ui/suggestions/issue-72766.rs
diff --git a/src/test/ui/suggestions/issue-72766.stderr b/tests/ui/suggestions/issue-72766.stderr
index f257bb9b0..f257bb9b0 100644
--- a/src/test/ui/suggestions/issue-72766.stderr
+++ b/tests/ui/suggestions/issue-72766.stderr
diff --git a/src/test/ui/suggestions/issue-79843-impl-trait-with-missing-bounds-on-async-fn.rs b/tests/ui/suggestions/issue-79843-impl-trait-with-missing-bounds-on-async-fn.rs
index 3cd6d336e..3cd6d336e 100644
--- a/src/test/ui/suggestions/issue-79843-impl-trait-with-missing-bounds-on-async-fn.rs
+++ b/tests/ui/suggestions/issue-79843-impl-trait-with-missing-bounds-on-async-fn.rs
diff --git a/src/test/ui/suggestions/issue-79843-impl-trait-with-missing-bounds-on-async-fn.stderr b/tests/ui/suggestions/issue-79843-impl-trait-with-missing-bounds-on-async-fn.stderr
index a3ab0b8ef..a3ab0b8ef 100644
--- a/src/test/ui/suggestions/issue-79843-impl-trait-with-missing-bounds-on-async-fn.stderr
+++ b/tests/ui/suggestions/issue-79843-impl-trait-with-missing-bounds-on-async-fn.stderr
diff --git a/src/test/ui/suggestions/issue-81098.rs b/tests/ui/suggestions/issue-81098.rs
index a601b5866..a601b5866 100644
--- a/src/test/ui/suggestions/issue-81098.rs
+++ b/tests/ui/suggestions/issue-81098.rs
diff --git a/src/test/ui/suggestions/issue-81098.stderr b/tests/ui/suggestions/issue-81098.stderr
index 4dc47a202..4dc47a202 100644
--- a/src/test/ui/suggestions/issue-81098.stderr
+++ b/tests/ui/suggestions/issue-81098.stderr
diff --git a/src/test/ui/suggestions/issue-81839.rs b/tests/ui/suggestions/issue-81839.rs
index 0b9b7aefe..0b9b7aefe 100644
--- a/src/test/ui/suggestions/issue-81839.rs
+++ b/tests/ui/suggestions/issue-81839.rs
diff --git a/src/test/ui/suggestions/issue-81839.stderr b/tests/ui/suggestions/issue-81839.stderr
index fae474ced..fae474ced 100644
--- a/src/test/ui/suggestions/issue-81839.stderr
+++ b/tests/ui/suggestions/issue-81839.stderr
diff --git a/src/test/ui/suggestions/issue-82361.fixed b/tests/ui/suggestions/issue-82361.fixed
index d72de982b..d72de982b 100644
--- a/src/test/ui/suggestions/issue-82361.fixed
+++ b/tests/ui/suggestions/issue-82361.fixed
diff --git a/src/test/ui/suggestions/issue-82361.rs b/tests/ui/suggestions/issue-82361.rs
index c068f6d22..c068f6d22 100644
--- a/src/test/ui/suggestions/issue-82361.rs
+++ b/tests/ui/suggestions/issue-82361.rs
diff --git a/src/test/ui/suggestions/issue-82361.stderr b/tests/ui/suggestions/issue-82361.stderr
index e4e8ad15d..e4e8ad15d 100644
--- a/src/test/ui/suggestions/issue-82361.stderr
+++ b/tests/ui/suggestions/issue-82361.stderr
diff --git a/src/test/ui/suggestions/issue-82566-1.rs b/tests/ui/suggestions/issue-82566-1.rs
index 95c31fbaa..95c31fbaa 100644
--- a/src/test/ui/suggestions/issue-82566-1.rs
+++ b/tests/ui/suggestions/issue-82566-1.rs
diff --git a/src/test/ui/suggestions/issue-82566-1.stderr b/tests/ui/suggestions/issue-82566-1.stderr
index 72f0f45fb..72f0f45fb 100644
--- a/src/test/ui/suggestions/issue-82566-1.stderr
+++ b/tests/ui/suggestions/issue-82566-1.stderr
diff --git a/src/test/ui/suggestions/issue-82566-2.rs b/tests/ui/suggestions/issue-82566-2.rs
index 80c8034bd..80c8034bd 100644
--- a/src/test/ui/suggestions/issue-82566-2.rs
+++ b/tests/ui/suggestions/issue-82566-2.rs
diff --git a/src/test/ui/suggestions/issue-82566-2.stderr b/tests/ui/suggestions/issue-82566-2.stderr
index ef9a41430..ef9a41430 100644
--- a/src/test/ui/suggestions/issue-82566-2.stderr
+++ b/tests/ui/suggestions/issue-82566-2.stderr
diff --git a/src/test/ui/suggestions/issue-83892.fixed b/tests/ui/suggestions/issue-83892.fixed
index dd093a7a0..dd093a7a0 100644
--- a/src/test/ui/suggestions/issue-83892.fixed
+++ b/tests/ui/suggestions/issue-83892.fixed
diff --git a/src/test/ui/suggestions/issue-83892.rs b/tests/ui/suggestions/issue-83892.rs
index 1d56ecee8..1d56ecee8 100644
--- a/src/test/ui/suggestions/issue-83892.rs
+++ b/tests/ui/suggestions/issue-83892.rs
diff --git a/src/test/ui/suggestions/issue-83892.stderr b/tests/ui/suggestions/issue-83892.stderr
index baf6b1447..baf6b1447 100644
--- a/src/test/ui/suggestions/issue-83892.stderr
+++ b/tests/ui/suggestions/issue-83892.stderr
diff --git a/src/test/ui/suggestions/issue-83943.fixed b/tests/ui/suggestions/issue-83943.fixed
index e0d4ee29e..e0d4ee29e 100644
--- a/src/test/ui/suggestions/issue-83943.fixed
+++ b/tests/ui/suggestions/issue-83943.fixed
diff --git a/src/test/ui/suggestions/issue-83943.rs b/tests/ui/suggestions/issue-83943.rs
index 68d50c177..68d50c177 100644
--- a/src/test/ui/suggestions/issue-83943.rs
+++ b/tests/ui/suggestions/issue-83943.rs
diff --git a/src/test/ui/suggestions/issue-83943.stderr b/tests/ui/suggestions/issue-83943.stderr
index 885106e84..885106e84 100644
--- a/src/test/ui/suggestions/issue-83943.stderr
+++ b/tests/ui/suggestions/issue-83943.stderr
diff --git a/src/test/ui/suggestions/issue-84592.rs b/tests/ui/suggestions/issue-84592.rs
index aa246aaa3..aa246aaa3 100644
--- a/src/test/ui/suggestions/issue-84592.rs
+++ b/tests/ui/suggestions/issue-84592.rs
diff --git a/src/test/ui/suggestions/issue-84592.stderr b/tests/ui/suggestions/issue-84592.stderr
index 70c96feb1..70c96feb1 100644
--- a/src/test/ui/suggestions/issue-84592.stderr
+++ b/tests/ui/suggestions/issue-84592.stderr
diff --git a/src/test/ui/suggestions/issue-84700.rs b/tests/ui/suggestions/issue-84700.rs
index a27169fdb..a27169fdb 100644
--- a/src/test/ui/suggestions/issue-84700.rs
+++ b/tests/ui/suggestions/issue-84700.rs
diff --git a/src/test/ui/suggestions/issue-84700.stderr b/tests/ui/suggestions/issue-84700.stderr
index ac9f5ab0b..ac9f5ab0b 100644
--- a/src/test/ui/suggestions/issue-84700.stderr
+++ b/tests/ui/suggestions/issue-84700.stderr
diff --git a/src/test/ui/suggestions/issue-84973-2.rs b/tests/ui/suggestions/issue-84973-2.rs
index 050cf8c64..050cf8c64 100644
--- a/src/test/ui/suggestions/issue-84973-2.rs
+++ b/tests/ui/suggestions/issue-84973-2.rs
diff --git a/src/test/ui/suggestions/issue-84973-2.stderr b/tests/ui/suggestions/issue-84973-2.stderr
index 513bf28fb..513bf28fb 100644
--- a/src/test/ui/suggestions/issue-84973-2.stderr
+++ b/tests/ui/suggestions/issue-84973-2.stderr
diff --git a/src/test/ui/suggestions/issue-84973-blacklist.rs b/tests/ui/suggestions/issue-84973-blacklist.rs
index 6813b07a2..6813b07a2 100644
--- a/src/test/ui/suggestions/issue-84973-blacklist.rs
+++ b/tests/ui/suggestions/issue-84973-blacklist.rs
diff --git a/src/test/ui/suggestions/issue-84973-blacklist.stderr b/tests/ui/suggestions/issue-84973-blacklist.stderr
index c20cc8164..c20cc8164 100644
--- a/src/test/ui/suggestions/issue-84973-blacklist.stderr
+++ b/tests/ui/suggestions/issue-84973-blacklist.stderr
diff --git a/src/test/ui/suggestions/issue-84973-negative.rs b/tests/ui/suggestions/issue-84973-negative.rs
index f339251e5..f339251e5 100644
--- a/src/test/ui/suggestions/issue-84973-negative.rs
+++ b/tests/ui/suggestions/issue-84973-negative.rs
diff --git a/src/test/ui/suggestions/issue-84973-negative.stderr b/tests/ui/suggestions/issue-84973-negative.stderr
index ce838bce0..ce838bce0 100644
--- a/src/test/ui/suggestions/issue-84973-negative.stderr
+++ b/tests/ui/suggestions/issue-84973-negative.stderr
diff --git a/src/test/ui/suggestions/issue-84973.rs b/tests/ui/suggestions/issue-84973.rs
index 42468478e..42468478e 100644
--- a/src/test/ui/suggestions/issue-84973.rs
+++ b/tests/ui/suggestions/issue-84973.rs
diff --git a/src/test/ui/suggestions/issue-84973.stderr b/tests/ui/suggestions/issue-84973.stderr
index ae2bf5aac..ae2bf5aac 100644
--- a/src/test/ui/suggestions/issue-84973.stderr
+++ b/tests/ui/suggestions/issue-84973.stderr
diff --git a/src/test/ui/suggestions/issue-85347.rs b/tests/ui/suggestions/issue-85347.rs
index 02b5fb618..02b5fb618 100644
--- a/src/test/ui/suggestions/issue-85347.rs
+++ b/tests/ui/suggestions/issue-85347.rs
diff --git a/src/test/ui/suggestions/issue-85347.stderr b/tests/ui/suggestions/issue-85347.stderr
index 17c1b7dc4..17c1b7dc4 100644
--- a/src/test/ui/suggestions/issue-85347.stderr
+++ b/tests/ui/suggestions/issue-85347.stderr
diff --git a/src/test/ui/suggestions/issue-85943-no-suggest-unsized-indirection-in-where-clause.rs b/tests/ui/suggestions/issue-85943-no-suggest-unsized-indirection-in-where-clause.rs
index 390d8bbdd..390d8bbdd 100644
--- a/src/test/ui/suggestions/issue-85943-no-suggest-unsized-indirection-in-where-clause.rs
+++ b/tests/ui/suggestions/issue-85943-no-suggest-unsized-indirection-in-where-clause.rs
diff --git a/src/test/ui/suggestions/issue-85943-no-suggest-unsized-indirection-in-where-clause.stderr b/tests/ui/suggestions/issue-85943-no-suggest-unsized-indirection-in-where-clause.stderr
index 752533cdc..752533cdc 100644
--- a/src/test/ui/suggestions/issue-85943-no-suggest-unsized-indirection-in-where-clause.stderr
+++ b/tests/ui/suggestions/issue-85943-no-suggest-unsized-indirection-in-where-clause.stderr
diff --git a/src/test/ui/suggestions/issue-85945-check-where-clause-before-suggesting-unsized.rs b/tests/ui/suggestions/issue-85945-check-where-clause-before-suggesting-unsized.rs
index 1a36f6e8e..1a36f6e8e 100644
--- a/src/test/ui/suggestions/issue-85945-check-where-clause-before-suggesting-unsized.rs
+++ b/tests/ui/suggestions/issue-85945-check-where-clause-before-suggesting-unsized.rs
diff --git a/src/test/ui/suggestions/issue-85945-check-where-clause-before-suggesting-unsized.stderr b/tests/ui/suggestions/issue-85945-check-where-clause-before-suggesting-unsized.stderr
index 92be9f764..92be9f764 100644
--- a/src/test/ui/suggestions/issue-85945-check-where-clause-before-suggesting-unsized.stderr
+++ b/tests/ui/suggestions/issue-85945-check-where-clause-before-suggesting-unsized.stderr
diff --git a/src/test/ui/suggestions/issue-86100-tuple-paren-comma.rs b/tests/ui/suggestions/issue-86100-tuple-paren-comma.rs
index fa9d1a889..fa9d1a889 100644
--- a/src/test/ui/suggestions/issue-86100-tuple-paren-comma.rs
+++ b/tests/ui/suggestions/issue-86100-tuple-paren-comma.rs
diff --git a/src/test/ui/suggestions/issue-86100-tuple-paren-comma.stderr b/tests/ui/suggestions/issue-86100-tuple-paren-comma.stderr
index 8c9a41a20..8c9a41a20 100644
--- a/src/test/ui/suggestions/issue-86100-tuple-paren-comma.stderr
+++ b/tests/ui/suggestions/issue-86100-tuple-paren-comma.stderr
diff --git a/src/test/ui/suggestions/issue-86667.rs b/tests/ui/suggestions/issue-86667.rs
index 366787df1..366787df1 100644
--- a/src/test/ui/suggestions/issue-86667.rs
+++ b/tests/ui/suggestions/issue-86667.rs
diff --git a/src/test/ui/suggestions/issue-86667.stderr b/tests/ui/suggestions/issue-86667.stderr
index 8d6116416..8d6116416 100644
--- a/src/test/ui/suggestions/issue-86667.stderr
+++ b/tests/ui/suggestions/issue-86667.stderr
diff --git a/tests/ui/suggestions/issue-88730.rs b/tests/ui/suggestions/issue-88730.rs
new file mode 100644
index 000000000..d161ed284
--- /dev/null
+++ b/tests/ui/suggestions/issue-88730.rs
@@ -0,0 +1,15 @@
+#![allow(unused, nonstandard_style)]
+
+// If an enum has two different variants,
+// then it cannot be matched upon in a function argument.
+// It still gets an error, but no suggestions.
+enum Foo {
+    C,
+    D,
+}
+
+fn foo(C: Foo) {} //~ERROR
+
+fn main() {
+    let C = Foo::D; //~ERROR
+}
diff --git a/tests/ui/suggestions/issue-88730.stderr b/tests/ui/suggestions/issue-88730.stderr
new file mode 100644
index 000000000..0bd1b7ba4
--- /dev/null
+++ b/tests/ui/suggestions/issue-88730.stderr
@@ -0,0 +1,17 @@
+error[E0170]: pattern binding `C` is named the same as one of the variants of the type `Foo`
+  --> $DIR/issue-88730.rs:11:8
+   |
+LL | fn foo(C: Foo) {}
+   |        ^
+   |
+   = note: `#[deny(bindings_with_variant_name)]` on by default
+
+error[E0170]: pattern binding `C` is named the same as one of the variants of the type `Foo`
+  --> $DIR/issue-88730.rs:14:9
+   |
+LL |     let C = Foo::D;
+   |         ^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0170`.
diff --git a/src/test/ui/suggestions/issue-89064.rs b/tests/ui/suggestions/issue-89064.rs
index fa5fc899d..fa5fc899d 100644
--- a/src/test/ui/suggestions/issue-89064.rs
+++ b/tests/ui/suggestions/issue-89064.rs
diff --git a/src/test/ui/suggestions/issue-89064.stderr b/tests/ui/suggestions/issue-89064.stderr
index 8b2a38816..93d8da226 100644
--- a/src/test/ui/suggestions/issue-89064.stderr
+++ b/tests/ui/suggestions/issue-89064.stderr
@@ -62,11 +62,6 @@ error[E0107]: this associated function takes 0 generic arguments but 1 generic a
 LL |     let _ = 42.into::<Option<_>>();
    |                ^^^^ expected 0 generic arguments
    |
-note: associated function defined here, with 0 generic parameters
-  --> $SRC_DIR/core/src/convert/mod.rs:LL:COL
-   |
-LL |     fn into(self) -> T;
-   |        ^^^^
 help: consider moving this generic argument to the `Into` trait, which takes up to 1 argument
    |
 LL |     let _ = Into::<Option<_>>::into(42);
diff --git a/src/test/ui/suggestions/issue-89333.rs b/tests/ui/suggestions/issue-89333.rs
index 03ed28ede..03ed28ede 100644
--- a/src/test/ui/suggestions/issue-89333.rs
+++ b/tests/ui/suggestions/issue-89333.rs
diff --git a/src/test/ui/suggestions/issue-89333.stderr b/tests/ui/suggestions/issue-89333.stderr
index f73f1147d..f73f1147d 100644
--- a/src/test/ui/suggestions/issue-89333.stderr
+++ b/tests/ui/suggestions/issue-89333.stderr
diff --git a/src/test/ui/suggestions/issue-90213-expected-boxfuture-self-ice.rs b/tests/ui/suggestions/issue-90213-expected-boxfuture-self-ice.rs
index 1e36b2fab..1e36b2fab 100644
--- a/src/test/ui/suggestions/issue-90213-expected-boxfuture-self-ice.rs
+++ b/tests/ui/suggestions/issue-90213-expected-boxfuture-self-ice.rs
diff --git a/src/test/ui/suggestions/issue-90213-expected-boxfuture-self-ice.stderr b/tests/ui/suggestions/issue-90213-expected-boxfuture-self-ice.stderr
index 611f7d5dd..611f7d5dd 100644
--- a/src/test/ui/suggestions/issue-90213-expected-boxfuture-self-ice.stderr
+++ b/tests/ui/suggestions/issue-90213-expected-boxfuture-self-ice.stderr
diff --git a/src/test/ui/suggestions/issue-90974.rs b/tests/ui/suggestions/issue-90974.rs
index 83590dbf7..83590dbf7 100644
--- a/src/test/ui/suggestions/issue-90974.rs
+++ b/tests/ui/suggestions/issue-90974.rs
diff --git a/src/test/ui/suggestions/issue-90974.stderr b/tests/ui/suggestions/issue-90974.stderr
index e1fb479a3..e1fb479a3 100644
--- a/src/test/ui/suggestions/issue-90974.stderr
+++ b/tests/ui/suggestions/issue-90974.stderr
diff --git a/src/test/ui/suggestions/issue-96223.rs b/tests/ui/suggestions/issue-96223.rs
index 85667bb84..85667bb84 100644
--- a/src/test/ui/suggestions/issue-96223.rs
+++ b/tests/ui/suggestions/issue-96223.rs
diff --git a/src/test/ui/suggestions/issue-96223.stderr b/tests/ui/suggestions/issue-96223.stderr
index 72a9a739a..d4e9433df 100644
--- a/src/test/ui/suggestions/issue-96223.stderr
+++ b/tests/ui/suggestions/issue-96223.stderr
@@ -11,12 +11,15 @@ note: required for `Baz<EmptyBis<'de>>` to implement `for<'de> Foo<'de>`
   --> $DIR/issue-96223.rs:16:14
    |
 LL | impl<'de, T> Foo<'de> for Baz<T> where T: Foo<'de> {}
-   |              ^^^^^^^^     ^^^^^^
+   |              ^^^^^^^^     ^^^^^^          -------- unsatisfied trait bound introduced here
 note: required for `Empty` to implement `Dummy<EmptyMarker>`
   --> $DIR/issue-96223.rs:20:9
    |
 LL | impl<M> Dummy<M> for Empty
    |         ^^^^^^^^     ^^^^^
+...
+LL |     for<'de> Baz<<M::Bar as Bar<'de>>::Inner>: Foo<'de>,
+   |                                                -------- unsatisfied trait bound introduced here
 note: required by a bound in `icey_bounds`
   --> $DIR/issue-96223.rs:45:19
    |
diff --git a/src/test/ui/suggestions/issue-96555.rs b/tests/ui/suggestions/issue-96555.rs
index 9f0a047c6..9f0a047c6 100644
--- a/src/test/ui/suggestions/issue-96555.rs
+++ b/tests/ui/suggestions/issue-96555.rs
diff --git a/src/test/ui/suggestions/issue-96555.stderr b/tests/ui/suggestions/issue-96555.stderr
index 9a8a183dc..9a8a183dc 100644
--- a/src/test/ui/suggestions/issue-96555.stderr
+++ b/tests/ui/suggestions/issue-96555.stderr
diff --git a/src/test/ui/suggestions/issue-97677.fixed b/tests/ui/suggestions/issue-97677.fixed
index 1e7569fa4..1e7569fa4 100644
--- a/src/test/ui/suggestions/issue-97677.fixed
+++ b/tests/ui/suggestions/issue-97677.fixed
diff --git a/src/test/ui/suggestions/issue-97677.rs b/tests/ui/suggestions/issue-97677.rs
index 2abf2af33..2abf2af33 100644
--- a/src/test/ui/suggestions/issue-97677.rs
+++ b/tests/ui/suggestions/issue-97677.rs
diff --git a/src/test/ui/suggestions/issue-97677.stderr b/tests/ui/suggestions/issue-97677.stderr
index 575d79267..575d79267 100644
--- a/src/test/ui/suggestions/issue-97677.stderr
+++ b/tests/ui/suggestions/issue-97677.stderr
diff --git a/src/test/ui/suggestions/issue-97704.fixed b/tests/ui/suggestions/issue-97704.fixed
index c42bdfff5..c42bdfff5 100644
--- a/src/test/ui/suggestions/issue-97704.fixed
+++ b/tests/ui/suggestions/issue-97704.fixed
diff --git a/src/test/ui/suggestions/issue-97704.rs b/tests/ui/suggestions/issue-97704.rs
index 5dfee6cac..5dfee6cac 100644
--- a/src/test/ui/suggestions/issue-97704.rs
+++ b/tests/ui/suggestions/issue-97704.rs
diff --git a/src/test/ui/suggestions/issue-97704.stderr b/tests/ui/suggestions/issue-97704.stderr
index ca017be45..ca017be45 100644
--- a/src/test/ui/suggestions/issue-97704.stderr
+++ b/tests/ui/suggestions/issue-97704.stderr
diff --git a/src/test/ui/suggestions/issue-97760.rs b/tests/ui/suggestions/issue-97760.rs
index cf9c3c58d..cf9c3c58d 100644
--- a/src/test/ui/suggestions/issue-97760.rs
+++ b/tests/ui/suggestions/issue-97760.rs
diff --git a/src/test/ui/suggestions/issue-97760.stderr b/tests/ui/suggestions/issue-97760.stderr
index bbcc3693f..bbcc3693f 100644
--- a/src/test/ui/suggestions/issue-97760.stderr
+++ b/tests/ui/suggestions/issue-97760.stderr
diff --git a/src/test/ui/suggestions/issue-98500.rs b/tests/ui/suggestions/issue-98500.rs
index a2717fd92..a2717fd92 100644
--- a/src/test/ui/suggestions/issue-98500.rs
+++ b/tests/ui/suggestions/issue-98500.rs
diff --git a/src/test/ui/suggestions/issue-98500.stderr b/tests/ui/suggestions/issue-98500.stderr
index e7251d735..e7251d735 100644
--- a/src/test/ui/suggestions/issue-98500.stderr
+++ b/tests/ui/suggestions/issue-98500.stderr
diff --git a/src/test/ui/suggestions/issue-99080.rs b/tests/ui/suggestions/issue-99080.rs
index 91f574f35..91f574f35 100644
--- a/src/test/ui/suggestions/issue-99080.rs
+++ b/tests/ui/suggestions/issue-99080.rs
diff --git a/src/test/ui/suggestions/issue-99080.stderr b/tests/ui/suggestions/issue-99080.stderr
index d1908dd9d..d1908dd9d 100644
--- a/src/test/ui/suggestions/issue-99080.stderr
+++ b/tests/ui/suggestions/issue-99080.stderr
diff --git a/src/test/ui/suggestions/issue-99240-2.rs b/tests/ui/suggestions/issue-99240-2.rs
index 0a418b5ae..0a418b5ae 100644
--- a/src/test/ui/suggestions/issue-99240-2.rs
+++ b/tests/ui/suggestions/issue-99240-2.rs
diff --git a/src/test/ui/suggestions/issue-99240-2.stderr b/tests/ui/suggestions/issue-99240-2.stderr
index 260df8565..a2b559784 100644
--- a/src/test/ui/suggestions/issue-99240-2.stderr
+++ b/tests/ui/suggestions/issue-99240-2.stderr
@@ -4,10 +4,7 @@ error[E0618]: expected function, found enum variant `Alias::Unit`
 LL |        Unit,
    |        ---- enum variant `Alias::Unit` defined here
 ...
-LL |        Alias::
-   |  ______^
-   | | _____|
-   | ||
+LL | //     Alias::
 LL | ||     Unit();
    | ||________^_- call expression requires function
    |  |________|
diff --git a/src/test/ui/suggestions/issue-99240.rs b/tests/ui/suggestions/issue-99240.rs
index 2115a4266..2115a4266 100644
--- a/src/test/ui/suggestions/issue-99240.rs
+++ b/tests/ui/suggestions/issue-99240.rs
diff --git a/src/test/ui/suggestions/issue-99240.stderr b/tests/ui/suggestions/issue-99240.stderr
index f1bea688b..f1bea688b 100644
--- a/src/test/ui/suggestions/issue-99240.stderr
+++ b/tests/ui/suggestions/issue-99240.stderr
diff --git a/src/test/ui/suggestions/js-style-comparison-op-separate-eq-token.rs b/tests/ui/suggestions/js-style-comparison-op-separate-eq-token.rs
index b24d25648..b24d25648 100644
--- a/src/test/ui/suggestions/js-style-comparison-op-separate-eq-token.rs
+++ b/tests/ui/suggestions/js-style-comparison-op-separate-eq-token.rs
diff --git a/src/test/ui/suggestions/js-style-comparison-op-separate-eq-token.stderr b/tests/ui/suggestions/js-style-comparison-op-separate-eq-token.stderr
index 6adefe3de..6adefe3de 100644
--- a/src/test/ui/suggestions/js-style-comparison-op-separate-eq-token.stderr
+++ b/tests/ui/suggestions/js-style-comparison-op-separate-eq-token.stderr
diff --git a/src/test/ui/suggestions/js-style-comparison-op.fixed b/tests/ui/suggestions/js-style-comparison-op.fixed
index f7e977b91..f7e977b91 100644
--- a/src/test/ui/suggestions/js-style-comparison-op.fixed
+++ b/tests/ui/suggestions/js-style-comparison-op.fixed
diff --git a/src/test/ui/suggestions/js-style-comparison-op.rs b/tests/ui/suggestions/js-style-comparison-op.rs
index c89c1052e..c89c1052e 100644
--- a/src/test/ui/suggestions/js-style-comparison-op.rs
+++ b/tests/ui/suggestions/js-style-comparison-op.rs
diff --git a/src/test/ui/suggestions/js-style-comparison-op.stderr b/tests/ui/suggestions/js-style-comparison-op.stderr
index 33f7a0844..33f7a0844 100644
--- a/src/test/ui/suggestions/js-style-comparison-op.stderr
+++ b/tests/ui/suggestions/js-style-comparison-op.stderr
diff --git a/src/test/ui/suggestions/let-binding-init-expr-as-ty.rs b/tests/ui/suggestions/let-binding-init-expr-as-ty.rs
index 06ee421fc..06ee421fc 100644
--- a/src/test/ui/suggestions/let-binding-init-expr-as-ty.rs
+++ b/tests/ui/suggestions/let-binding-init-expr-as-ty.rs
diff --git a/src/test/ui/suggestions/let-binding-init-expr-as-ty.stderr b/tests/ui/suggestions/let-binding-init-expr-as-ty.stderr
index 2bf072ef5..b90ae051f 100644
--- a/src/test/ui/suggestions/let-binding-init-expr-as-ty.stderr
+++ b/tests/ui/suggestions/let-binding-init-expr-as-ty.stderr
@@ -21,7 +21,12 @@ error[E0223]: ambiguous associated type
   --> $DIR/let-binding-init-expr-as-ty.rs:2:14
    |
 LL |     let foo: i32::from_be(num);
-   |              ^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<i32 as Trait>::from_be`
+   |              ^^^^^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `from_be` implemented for `i32`, you could use the fully-qualified path
+   |
+LL |     let foo: <i32 as Example>::from_be;
+   |              ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 error: aborting due to 3 previous errors
 
diff --git a/tests/ui/suggestions/lifetimes/issue-105544.fixed b/tests/ui/suggestions/lifetimes/issue-105544.fixed
new file mode 100644
index 000000000..47087eb47
--- /dev/null
+++ b/tests/ui/suggestions/lifetimes/issue-105544.fixed
@@ -0,0 +1,45 @@
+// run-rustfix
+
+#![allow(warnings)]
+
+fn foo<'a>(d: impl Sized + 'a, p: &'a mut ()) -> impl Sized + '_ { //~ NOTE the parameter type `impl Sized` must be valid for the anonymous lifetime defined here...
+//~^ HELP consider adding an explicit lifetime bound
+    (d, p)
+    //~^ ERROR the parameter type `impl Sized` may not live long enough
+    //~| NOTE ...so that the type `impl Sized` will meet its required lifetime bounds
+}
+
+fn foo1<'b>(d: impl Sized + 'b, p: &'b mut ()) -> impl Sized + '_ {
+//~^ HELP consider adding an explicit lifetime bound...
+    (d, p) //~ NOTE ...so that the type `impl Sized` will meet its required lifetime bounds
+    //~^ ERROR the parameter type `impl Sized` may not live long enough
+}
+
+fn foo2<'b, 'a>(d: impl Sized + 'a + 'b, p: &'b mut ()) -> impl Sized + '_ { //~ NOTE the parameter type `impl Sized + 'a` must be valid for the anonymous lifetime defined here...
+//~^ HELP consider adding an explicit lifetime bound
+    (d, p)
+    //~^ ERROR the parameter type `impl Sized + 'a` may not live long enough
+    //~| NOTE ...so that the type `impl Sized + 'a` will meet its required lifetime bounds
+}
+
+fn bar<'a, T : Sized + 'a>(d: T, p: &'a mut ()) -> impl Sized + '_ { //~ NOTE the parameter type `T` must be valid for the anonymous lifetime defined here...
+//~^ HELP consider adding an explicit lifetime bound
+    (d, p)
+    //~^ ERROR the parameter type `T` may not live long enough
+    //~| NOTE ...so that the type `T` will meet its required lifetime bounds
+}
+
+fn bar1<'b, T : Sized + 'b>(d: T, p: &'b mut ()) -> impl Sized + '_ {
+//~^ HELP consider adding an explicit lifetime bound...
+    (d, p) //~ NOTE ...so that the type `T` will meet its required lifetime bounds
+    //~^ ERROR the parameter type `T` may not live long enough
+}
+
+fn bar2<'b, 'a, T : Sized + 'a + 'b>(d: T, p: &'b mut ()) -> impl Sized + '_ { //~ NOTE the parameter type `T` must be valid for the anonymous lifetime defined here...
+//~^ HELP consider adding an explicit lifetime bound
+    (d, p)
+    //~^ ERROR the parameter type `T` may not live long enough
+    //~| NOTE ...so that the type `T` will meet its required lifetime bounds
+}
+
+fn main() {}
diff --git a/tests/ui/suggestions/lifetimes/issue-105544.rs b/tests/ui/suggestions/lifetimes/issue-105544.rs
new file mode 100644
index 000000000..bd3bc1ef9
--- /dev/null
+++ b/tests/ui/suggestions/lifetimes/issue-105544.rs
@@ -0,0 +1,45 @@
+// run-rustfix
+
+#![allow(warnings)]
+
+fn foo(d: impl Sized, p: &mut ()) -> impl Sized + '_ { //~ NOTE the parameter type `impl Sized` must be valid for the anonymous lifetime defined here...
+//~^ HELP consider adding an explicit lifetime bound
+    (d, p)
+    //~^ ERROR the parameter type `impl Sized` may not live long enough
+    //~| NOTE ...so that the type `impl Sized` will meet its required lifetime bounds
+}
+
+fn foo1<'b>(d: impl Sized, p: &'b mut ()) -> impl Sized + '_ {
+//~^ HELP consider adding an explicit lifetime bound...
+    (d, p) //~ NOTE ...so that the type `impl Sized` will meet its required lifetime bounds
+    //~^ ERROR the parameter type `impl Sized` may not live long enough
+}
+
+fn foo2<'a>(d: impl Sized + 'a, p: &mut ()) -> impl Sized + '_ { //~ NOTE the parameter type `impl Sized + 'a` must be valid for the anonymous lifetime defined here...
+//~^ HELP consider adding an explicit lifetime bound
+    (d, p)
+    //~^ ERROR the parameter type `impl Sized + 'a` may not live long enough
+    //~| NOTE ...so that the type `impl Sized + 'a` will meet its required lifetime bounds
+}
+
+fn bar<T : Sized>(d: T, p: & mut ()) -> impl Sized + '_ { //~ NOTE the parameter type `T` must be valid for the anonymous lifetime defined here...
+//~^ HELP consider adding an explicit lifetime bound
+    (d, p)
+    //~^ ERROR the parameter type `T` may not live long enough
+    //~| NOTE ...so that the type `T` will meet its required lifetime bounds
+}
+
+fn bar1<'b, T : Sized>(d: T, p: &'b mut ()) -> impl Sized + '_ {
+//~^ HELP consider adding an explicit lifetime bound...
+    (d, p) //~ NOTE ...so that the type `T` will meet its required lifetime bounds
+    //~^ ERROR the parameter type `T` may not live long enough
+}
+
+fn bar2<'a, T : Sized + 'a>(d: T, p: &mut ()) -> impl Sized + '_ { //~ NOTE the parameter type `T` must be valid for the anonymous lifetime defined here...
+//~^ HELP consider adding an explicit lifetime bound
+    (d, p)
+    //~^ ERROR the parameter type `T` may not live long enough
+    //~| NOTE ...so that the type `T` will meet its required lifetime bounds
+}
+
+fn main() {}
diff --git a/tests/ui/suggestions/lifetimes/issue-105544.stderr b/tests/ui/suggestions/lifetimes/issue-105544.stderr
new file mode 100644
index 000000000..08fe21b11
--- /dev/null
+++ b/tests/ui/suggestions/lifetimes/issue-105544.stderr
@@ -0,0 +1,110 @@
+error[E0311]: the parameter type `impl Sized` may not live long enough
+  --> $DIR/issue-105544.rs:7:5
+   |
+LL |     (d, p)
+   |     ^^^^^^
+   |
+note: the parameter type `impl Sized` must be valid for the anonymous lifetime defined here...
+  --> $DIR/issue-105544.rs:5:26
+   |
+LL | fn foo(d: impl Sized, p: &mut ()) -> impl Sized + '_ {
+   |                          ^^^^^^^
+note: ...so that the type `impl Sized` will meet its required lifetime bounds
+  --> $DIR/issue-105544.rs:7:5
+   |
+LL |     (d, p)
+   |     ^^^^^^
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn foo<'a>(d: impl Sized + 'a, p: &'a mut ()) -> impl Sized + '_ {
+   |       ++++               ++++      ++
+
+error[E0309]: the parameter type `impl Sized` may not live long enough
+  --> $DIR/issue-105544.rs:14:5
+   |
+LL |     (d, p)
+   |     ^^^^^^ ...so that the type `impl Sized` will meet its required lifetime bounds
+   |
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn foo1<'b>(d: impl Sized + 'b, p: &'b mut ()) -> impl Sized + '_ {
+   |                           ++++
+
+error[E0311]: the parameter type `impl Sized + 'a` may not live long enough
+  --> $DIR/issue-105544.rs:20:5
+   |
+LL |     (d, p)
+   |     ^^^^^^
+   |
+note: the parameter type `impl Sized + 'a` must be valid for the anonymous lifetime defined here...
+  --> $DIR/issue-105544.rs:18:36
+   |
+LL | fn foo2<'a>(d: impl Sized + 'a, p: &mut ()) -> impl Sized + '_ {
+   |                                    ^^^^^^^
+note: ...so that the type `impl Sized + 'a` will meet its required lifetime bounds
+  --> $DIR/issue-105544.rs:20:5
+   |
+LL |     (d, p)
+   |     ^^^^^^
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn foo2<'b, 'a>(d: impl Sized + 'a + 'b, p: &'b mut ()) -> impl Sized + '_ {
+   |         +++                        ++++      ++
+
+error[E0311]: the parameter type `T` may not live long enough
+  --> $DIR/issue-105544.rs:27:5
+   |
+LL |     (d, p)
+   |     ^^^^^^
+   |
+note: the parameter type `T` must be valid for the anonymous lifetime defined here...
+  --> $DIR/issue-105544.rs:25:28
+   |
+LL | fn bar<T : Sized>(d: T, p: & mut ()) -> impl Sized + '_ {
+   |                            ^^^^^^^^
+note: ...so that the type `T` will meet its required lifetime bounds
+  --> $DIR/issue-105544.rs:27:5
+   |
+LL |     (d, p)
+   |     ^^^^^^
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn bar<'a, T : Sized + 'a>(d: T, p: &'a mut ()) -> impl Sized + '_ {
+   |        +++           ++++            ++
+
+error[E0309]: the parameter type `T` may not live long enough
+  --> $DIR/issue-105544.rs:34:5
+   |
+LL |     (d, p)
+   |     ^^^^^^ ...so that the type `T` will meet its required lifetime bounds
+   |
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn bar1<'b, T : Sized + 'b>(d: T, p: &'b mut ()) -> impl Sized + '_ {
+   |                       ++++
+
+error[E0311]: the parameter type `T` may not live long enough
+  --> $DIR/issue-105544.rs:40:5
+   |
+LL |     (d, p)
+   |     ^^^^^^
+   |
+note: the parameter type `T` must be valid for the anonymous lifetime defined here...
+  --> $DIR/issue-105544.rs:38:38
+   |
+LL | fn bar2<'a, T : Sized + 'a>(d: T, p: &mut ()) -> impl Sized + '_ {
+   |                                      ^^^^^^^
+note: ...so that the type `T` will meet its required lifetime bounds
+  --> $DIR/issue-105544.rs:40:5
+   |
+LL |     (d, p)
+   |     ^^^^^^
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn bar2<'b, 'a, T : Sized + 'a + 'b>(d: T, p: &'b mut ()) -> impl Sized + '_ {
+   |         +++                    ++++            ++
+
+error: aborting due to 6 previous errors
+
+Some errors have detailed explanations: E0309, E0311.
+For more information about an error, try `rustc --explain E0309`.
diff --git a/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-2.fixed b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-2.fixed
new file mode 100644
index 000000000..4013d98c3
--- /dev/null
+++ b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-2.fixed
@@ -0,0 +1,29 @@
+// Regression test for #81650
+// run-rustfix
+
+#![allow(warnings)]
+
+struct Foo<'a> {
+    x: &'a mut &'a i32,
+}
+
+impl<'a> Foo<'a> {
+    fn bar<F, T>(&self, f: F)
+    where
+        F: FnOnce(&Foo<'a>) -> T,
+        F: 'a,
+    {}
+}
+
+trait Test {
+    fn test(&self);
+}
+
+fn func<'a, T: Test + 'a>(foo: &'a Foo<'a>, t: T) {
+    foo.bar(move |_| {
+    //~^ ERROR the parameter type `T` may not live long enough
+        t.test();
+    });
+}
+
+fn main() {}
diff --git a/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature-2.rs b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-2.rs
index c6802ac6c..4096d95e5 100644
--- a/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature-2.rs
+++ b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-2.rs
@@ -1,4 +1,7 @@
 // Regression test for #81650
+// run-rustfix
+
+#![allow(warnings)]
 
 struct Foo<'a> {
     x: &'a mut &'a i32,
diff --git a/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-2.stderr b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-2.stderr
new file mode 100644
index 000000000..936d87f79
--- /dev/null
+++ b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-2.stderr
@@ -0,0 +1,30 @@
+error[E0311]: the parameter type `T` may not live long enough
+  --> $DIR/missing-lifetimes-in-signature-2.rs:23:5
+   |
+LL | /     foo.bar(move |_| {
+LL | |
+LL | |         t.test();
+LL | |     });
+   | |______^
+   |
+note: the parameter type `T` must be valid for the anonymous lifetime defined here...
+  --> $DIR/missing-lifetimes-in-signature-2.rs:22:24
+   |
+LL | fn func<T: Test>(foo: &Foo, t: T) {
+   |                        ^^^
+note: ...so that the type `T` will meet its required lifetime bounds
+  --> $DIR/missing-lifetimes-in-signature-2.rs:23:5
+   |
+LL | /     foo.bar(move |_| {
+LL | |
+LL | |         t.test();
+LL | |     });
+   | |______^
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn func<'a, T: Test + 'a>(foo: &'a Foo<'a>, t: T) {
+   |         +++         ++++        ++    ++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0311`.
diff --git a/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.fixed b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.fixed
index 3c06f4f88..3c06f4f88 100644
--- a/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.fixed
+++ b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.fixed
diff --git a/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.rs b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.rs
index 110468cbb..110468cbb 100644
--- a/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.rs
+++ b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.rs
diff --git a/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.stderr b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.stderr
index 7b126c90e..7b126c90e 100644
--- a/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.stderr
+++ b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.stderr
diff --git a/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature.rs b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature.rs
index b641f5941..b641f5941 100644
--- a/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature.rs
+++ b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature.rs
diff --git a/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature.stderr b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature.stderr
index fa758bf05..c5c3f7b46 100644
--- a/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature.stderr
+++ b/tests/ui/suggestions/lifetimes/missing-lifetimes-in-signature.stderr
@@ -47,7 +47,7 @@ LL | |     }
    | |_____^
 help: consider adding an explicit lifetime bound...
    |
-LL ~ fn bar<'a, G, T>(g: G, dest: &mut T) -> impl FnOnce() + '_
+LL ~ fn bar<'a, G, T>(g: G, dest: &'a mut T) -> impl FnOnce() + '_
 LL | where
 LL ~     G: Get<T> + 'a,
    |
@@ -76,8 +76,8 @@ LL | |     }
    | |_____^
 help: consider adding an explicit lifetime bound...
    |
-LL | fn qux<'b, 'a, G: 'a + 'b, T>(g: G, dest: &mut T) -> impl FnOnce() + '_
-   |        +++           ++++
+LL | fn qux<'b, 'a, G: 'a + 'b, T>(g: G, dest: &'b mut T) -> impl FnOnce() + '_
+   |        +++           ++++                  ++
 
 error[E0311]: the parameter type `G` may not live long enough
   --> $DIR/missing-lifetimes-in-signature.rs:61:9
@@ -103,8 +103,8 @@ LL | |         }
    | |_________^
 help: consider adding an explicit lifetime bound...
    |
-LL |     fn qux<'c, 'b, G: Get<T> + 'b + 'c, T>(g: G, dest: &mut T) -> impl FnOnce() + '_ {
-   |            +++                    ++++
+LL |     fn qux<'c, 'b, G: Get<T> + 'b + 'c, T>(g: G, dest: &'c mut T) -> impl FnOnce() + '_ {
+   |            +++                    ++++                  ++
 
 error[E0311]: the parameter type `G` may not live long enough
   --> $DIR/missing-lifetimes-in-signature.rs:73:5
@@ -132,8 +132,8 @@ LL | |     }
    | |_____^
 help: consider adding an explicit lifetime bound...
    |
-LL | fn bat<'b, 'a, G: 'a + 'b, T>(g: G, dest: &mut T) -> impl FnOnce() + '_ + 'a
-   |        +++           ++++
+LL | fn bat<'b, 'a, G: 'a + 'b, T>(g: G, dest: &'b mut T) -> impl FnOnce() + '_ + 'a
+   |        +++           ++++                  ++
 
 error[E0621]: explicit lifetime required in the type of `dest`
   --> $DIR/missing-lifetimes-in-signature.rs:73:5
diff --git a/src/test/ui/suggestions/lifetimes/trait-object-nested-in-impl-trait.rs b/tests/ui/suggestions/lifetimes/trait-object-nested-in-impl-trait.rs
index ff27011f8..ff27011f8 100644
--- a/src/test/ui/suggestions/lifetimes/trait-object-nested-in-impl-trait.rs
+++ b/tests/ui/suggestions/lifetimes/trait-object-nested-in-impl-trait.rs
diff --git a/src/test/ui/suggestions/lifetimes/trait-object-nested-in-impl-trait.stderr b/tests/ui/suggestions/lifetimes/trait-object-nested-in-impl-trait.stderr
index c77ef79e7..c77ef79e7 100644
--- a/src/test/ui/suggestions/lifetimes/trait-object-nested-in-impl-trait.stderr
+++ b/tests/ui/suggestions/lifetimes/trait-object-nested-in-impl-trait.stderr
diff --git a/src/test/ui/suggestions/many-type-ascription.rs b/tests/ui/suggestions/many-type-ascription.rs
index 31ac556b9..31ac556b9 100644
--- a/src/test/ui/suggestions/many-type-ascription.rs
+++ b/tests/ui/suggestions/many-type-ascription.rs
diff --git a/src/test/ui/suggestions/many-type-ascription.stderr b/tests/ui/suggestions/many-type-ascription.stderr
index 3706bbae9..3706bbae9 100644
--- a/src/test/ui/suggestions/many-type-ascription.stderr
+++ b/tests/ui/suggestions/many-type-ascription.stderr
diff --git a/src/test/ui/suggestions/match-ergonomics.rs b/tests/ui/suggestions/match-ergonomics.rs
index c4fc01469..c4fc01469 100644
--- a/src/test/ui/suggestions/match-ergonomics.rs
+++ b/tests/ui/suggestions/match-ergonomics.rs
diff --git a/src/test/ui/suggestions/match-ergonomics.stderr b/tests/ui/suggestions/match-ergonomics.stderr
index aa2b407bf..aa2b407bf 100644
--- a/src/test/ui/suggestions/match-ergonomics.stderr
+++ b/tests/ui/suggestions/match-ergonomics.stderr
diff --git a/src/test/ui/suggestions/match-needing-semi.rs b/tests/ui/suggestions/match-needing-semi.rs
index 833555d0e..833555d0e 100644
--- a/src/test/ui/suggestions/match-needing-semi.rs
+++ b/tests/ui/suggestions/match-needing-semi.rs
diff --git a/src/test/ui/suggestions/match-needing-semi.stderr b/tests/ui/suggestions/match-needing-semi.stderr
index b5f01d703..b5f01d703 100644
--- a/src/test/ui/suggestions/match-needing-semi.stderr
+++ b/tests/ui/suggestions/match-needing-semi.stderr
diff --git a/src/test/ui/suggestions/match-prev-arm-needing-semi.rs b/tests/ui/suggestions/match-prev-arm-needing-semi.rs
index 8c8abe047..8c8abe047 100644
--- a/src/test/ui/suggestions/match-prev-arm-needing-semi.rs
+++ b/tests/ui/suggestions/match-prev-arm-needing-semi.rs
diff --git a/src/test/ui/suggestions/match-prev-arm-needing-semi.stderr b/tests/ui/suggestions/match-prev-arm-needing-semi.stderr
index 8d735b71f..8d735b71f 100644
--- a/src/test/ui/suggestions/match-prev-arm-needing-semi.stderr
+++ b/tests/ui/suggestions/match-prev-arm-needing-semi.stderr
diff --git a/src/test/ui/suggestions/match-with-different-arm-types-as-stmt-instead-of-expr.rs b/tests/ui/suggestions/match-with-different-arm-types-as-stmt-instead-of-expr.rs
index 0360ce6e6..0360ce6e6 100644
--- a/src/test/ui/suggestions/match-with-different-arm-types-as-stmt-instead-of-expr.rs
+++ b/tests/ui/suggestions/match-with-different-arm-types-as-stmt-instead-of-expr.rs
diff --git a/src/test/ui/suggestions/match-with-different-arm-types-as-stmt-instead-of-expr.stderr b/tests/ui/suggestions/match-with-different-arm-types-as-stmt-instead-of-expr.stderr
index 00aa7d18a..00aa7d18a 100644
--- a/src/test/ui/suggestions/match-with-different-arm-types-as-stmt-instead-of-expr.stderr
+++ b/tests/ui/suggestions/match-with-different-arm-types-as-stmt-instead-of-expr.stderr
diff --git a/tests/ui/suggestions/method-access-to-range-literal-typo.fixed b/tests/ui/suggestions/method-access-to-range-literal-typo.fixed
new file mode 100644
index 000000000..13601eef6
--- /dev/null
+++ b/tests/ui/suggestions/method-access-to-range-literal-typo.fixed
@@ -0,0 +1,34 @@
+// run-rustfix
+
+#![allow(unused)]
+
+fn as_ref() -> Option<Vec<u8>> {
+    None
+}
+struct Type {
+    option: Option<Vec<u8>>
+}
+trait Trait {
+    fn foo(&self) -> &Vec<u8>;
+}
+impl Trait for Option<Vec<u8>> {
+    fn foo(&self) -> &Vec<u8> {
+        self.as_ref().unwrap()
+    }
+}
+
+impl Type {
+    fn method(&self) -> Option<&Vec<u8>> {
+        self.option.as_ref().map(|x| x)
+        //~^ ERROR E0308
+    }
+    fn method2(&self) -> Option<&u8> {
+        self.option.foo().get(0)
+        //~^ ERROR E0425
+        //~| ERROR E0308
+    }
+}
+
+fn main() {
+    let _ = Type { option: None }.method();
+}
diff --git a/tests/ui/suggestions/method-access-to-range-literal-typo.rs b/tests/ui/suggestions/method-access-to-range-literal-typo.rs
new file mode 100644
index 000000000..fdcd6425d
--- /dev/null
+++ b/tests/ui/suggestions/method-access-to-range-literal-typo.rs
@@ -0,0 +1,34 @@
+// run-rustfix
+
+#![allow(unused)]
+
+fn as_ref() -> Option<Vec<u8>> {
+    None
+}
+struct Type {
+    option: Option<Vec<u8>>
+}
+trait Trait {
+    fn foo(&self) -> &Vec<u8>;
+}
+impl Trait for Option<Vec<u8>> {
+    fn foo(&self) -> &Vec<u8> {
+        self.as_ref().unwrap()
+    }
+}
+
+impl Type {
+    fn method(&self) -> Option<&Vec<u8>> {
+        self.option..as_ref().map(|x| x)
+        //~^ ERROR E0308
+    }
+    fn method2(&self) -> Option<&u8> {
+        self.option..foo().get(0)
+        //~^ ERROR E0425
+        //~| ERROR E0308
+    }
+}
+
+fn main() {
+    let _ = Type { option: None }.method();
+}
diff --git a/tests/ui/suggestions/method-access-to-range-literal-typo.stderr b/tests/ui/suggestions/method-access-to-range-literal-typo.stderr
new file mode 100644
index 000000000..f42140894
--- /dev/null
+++ b/tests/ui/suggestions/method-access-to-range-literal-typo.stderr
@@ -0,0 +1,48 @@
+error[E0425]: cannot find function `foo` in this scope
+  --> $DIR/method-access-to-range-literal-typo.rs:26:22
+   |
+LL |         self.option..foo().get(0)
+   |                      ^^^ not found in this scope
+   |
+help: you might have meant to write `.` instead of `..`
+   |
+LL -         self.option..foo().get(0)
+LL +         self.option.foo().get(0)
+   |
+
+error[E0308]: mismatched types
+  --> $DIR/method-access-to-range-literal-typo.rs:22:9
+   |
+LL |     fn method(&self) -> Option<&Vec<u8>> {
+   |                         ---------------- expected `Option<&Vec<u8>>` because of return type
+LL |         self.option..as_ref().map(|x| x)
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected enum `Option`, found struct `Range`
+   |
+   = note: expected enum `Option<&Vec<u8>>`
+            found struct `std::ops::Range<Option<Vec<u8>>>`
+help: you likely meant to write a method call instead of a range
+   |
+LL -         self.option..as_ref().map(|x| x)
+LL +         self.option.as_ref().map(|x| x)
+   |
+
+error[E0308]: mismatched types
+  --> $DIR/method-access-to-range-literal-typo.rs:26:9
+   |
+LL |     fn method2(&self) -> Option<&u8> {
+   |                          ----------- expected `Option<&u8>` because of return type
+LL |         self.option..foo().get(0)
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^ expected enum `Option`, found struct `Range`
+   |
+   = note: expected enum `Option<&u8>`
+            found struct `std::ops::Range<Option<Vec<u8>>>`
+help: you likely meant to write a method call instead of a range
+   |
+LL -         self.option..foo().get(0)
+LL +         self.option.foo().get(0)
+   |
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0308, E0425.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/method-missing-parentheses.rs b/tests/ui/suggestions/method-missing-parentheses.rs
index f10bfb56d..f10bfb56d 100644
--- a/src/test/ui/suggestions/method-missing-parentheses.rs
+++ b/tests/ui/suggestions/method-missing-parentheses.rs
diff --git a/src/test/ui/suggestions/method-missing-parentheses.stderr b/tests/ui/suggestions/method-missing-parentheses.stderr
index 1bfff56a6..1bfff56a6 100644
--- a/src/test/ui/suggestions/method-missing-parentheses.stderr
+++ b/tests/ui/suggestions/method-missing-parentheses.stderr
diff --git a/src/test/ui/suggestions/mismatched-types-numeric-from.rs b/tests/ui/suggestions/mismatched-types-numeric-from.rs
index 56549da9c..56549da9c 100644
--- a/src/test/ui/suggestions/mismatched-types-numeric-from.rs
+++ b/tests/ui/suggestions/mismatched-types-numeric-from.rs
diff --git a/src/test/ui/suggestions/mismatched-types-numeric-from.stderr b/tests/ui/suggestions/mismatched-types-numeric-from.stderr
index 4d44d893a..4d44d893a 100644
--- a/src/test/ui/suggestions/mismatched-types-numeric-from.stderr
+++ b/tests/ui/suggestions/mismatched-types-numeric-from.stderr
diff --git a/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.fixed b/tests/ui/suggestions/missing-assoc-fn-applicable-suggestions.fixed
index a0cb39a3f..a0cb39a3f 100644
--- a/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.fixed
+++ b/tests/ui/suggestions/missing-assoc-fn-applicable-suggestions.fixed
diff --git a/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.rs b/tests/ui/suggestions/missing-assoc-fn-applicable-suggestions.rs
index c80ede1b2..c80ede1b2 100644
--- a/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.rs
+++ b/tests/ui/suggestions/missing-assoc-fn-applicable-suggestions.rs
diff --git a/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.stderr b/tests/ui/suggestions/missing-assoc-fn-applicable-suggestions.stderr
index 4c75fbe4c..4c75fbe4c 100644
--- a/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.stderr
+++ b/tests/ui/suggestions/missing-assoc-fn-applicable-suggestions.stderr
diff --git a/src/test/ui/suggestions/missing-assoc-fn.rs b/tests/ui/suggestions/missing-assoc-fn.rs
index 9af8e5a93..9af8e5a93 100644
--- a/src/test/ui/suggestions/missing-assoc-fn.rs
+++ b/tests/ui/suggestions/missing-assoc-fn.rs
diff --git a/src/test/ui/suggestions/missing-assoc-fn.stderr b/tests/ui/suggestions/missing-assoc-fn.stderr
index 136ec2152..136ec2152 100644
--- a/src/test/ui/suggestions/missing-assoc-fn.stderr
+++ b/tests/ui/suggestions/missing-assoc-fn.stderr
diff --git a/src/test/ui/suggestions/missing-assoc-type-bound-restriction.rs b/tests/ui/suggestions/missing-assoc-type-bound-restriction.rs
index 4954a8a69..4954a8a69 100644
--- a/src/test/ui/suggestions/missing-assoc-type-bound-restriction.rs
+++ b/tests/ui/suggestions/missing-assoc-type-bound-restriction.rs
diff --git a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl-2.fixed b/tests/ui/suggestions/missing-bound-in-derive-copy-impl-2.fixed
index ac0b14fba..ac0b14fba 100644
--- a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl-2.fixed
+++ b/tests/ui/suggestions/missing-bound-in-derive-copy-impl-2.fixed
diff --git a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl-2.rs b/tests/ui/suggestions/missing-bound-in-derive-copy-impl-2.rs
index 31f8cd6fc..31f8cd6fc 100644
--- a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl-2.rs
+++ b/tests/ui/suggestions/missing-bound-in-derive-copy-impl-2.rs
diff --git a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl-2.stderr b/tests/ui/suggestions/missing-bound-in-derive-copy-impl-2.stderr
index 03082be69..03082be69 100644
--- a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl-2.stderr
+++ b/tests/ui/suggestions/missing-bound-in-derive-copy-impl-2.stderr
diff --git a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl-3.fixed b/tests/ui/suggestions/missing-bound-in-derive-copy-impl-3.fixed
index 304360d48..304360d48 100644
--- a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl-3.fixed
+++ b/tests/ui/suggestions/missing-bound-in-derive-copy-impl-3.fixed
diff --git a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl-3.rs b/tests/ui/suggestions/missing-bound-in-derive-copy-impl-3.rs
index 14e1fbb33..14e1fbb33 100644
--- a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl-3.rs
+++ b/tests/ui/suggestions/missing-bound-in-derive-copy-impl-3.rs
diff --git a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl-3.stderr b/tests/ui/suggestions/missing-bound-in-derive-copy-impl-3.stderr
index faf730a5c..faf730a5c 100644
--- a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl-3.stderr
+++ b/tests/ui/suggestions/missing-bound-in-derive-copy-impl-3.stderr
diff --git a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl.rs b/tests/ui/suggestions/missing-bound-in-derive-copy-impl.rs
index 52163bddd..52163bddd 100644
--- a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl.rs
+++ b/tests/ui/suggestions/missing-bound-in-derive-copy-impl.rs
diff --git a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl.stderr b/tests/ui/suggestions/missing-bound-in-derive-copy-impl.stderr
index 11bc54099..11bc54099 100644
--- a/src/test/ui/suggestions/missing-bound-in-derive-copy-impl.stderr
+++ b/tests/ui/suggestions/missing-bound-in-derive-copy-impl.stderr
diff --git a/src/test/ui/suggestions/missing-bound-in-manual-copy-impl-2.fixed b/tests/ui/suggestions/missing-bound-in-manual-copy-impl-2.fixed
index 691e7553a..691e7553a 100644
--- a/src/test/ui/suggestions/missing-bound-in-manual-copy-impl-2.fixed
+++ b/tests/ui/suggestions/missing-bound-in-manual-copy-impl-2.fixed
diff --git a/src/test/ui/suggestions/missing-bound-in-manual-copy-impl-2.rs b/tests/ui/suggestions/missing-bound-in-manual-copy-impl-2.rs
index e3185e7ef..e3185e7ef 100644
--- a/src/test/ui/suggestions/missing-bound-in-manual-copy-impl-2.rs
+++ b/tests/ui/suggestions/missing-bound-in-manual-copy-impl-2.rs
diff --git a/src/test/ui/suggestions/missing-bound-in-manual-copy-impl-2.stderr b/tests/ui/suggestions/missing-bound-in-manual-copy-impl-2.stderr
index 9e6f0d9eb..9e6f0d9eb 100644
--- a/src/test/ui/suggestions/missing-bound-in-manual-copy-impl-2.stderr
+++ b/tests/ui/suggestions/missing-bound-in-manual-copy-impl-2.stderr
diff --git a/src/test/ui/suggestions/missing-bound-in-manual-copy-impl.fixed b/tests/ui/suggestions/missing-bound-in-manual-copy-impl.fixed
index 32a7215c5..32a7215c5 100644
--- a/src/test/ui/suggestions/missing-bound-in-manual-copy-impl.fixed
+++ b/tests/ui/suggestions/missing-bound-in-manual-copy-impl.fixed
diff --git a/src/test/ui/suggestions/missing-bound-in-manual-copy-impl.rs b/tests/ui/suggestions/missing-bound-in-manual-copy-impl.rs
index c688f4d41..c688f4d41 100644
--- a/src/test/ui/suggestions/missing-bound-in-manual-copy-impl.rs
+++ b/tests/ui/suggestions/missing-bound-in-manual-copy-impl.rs
diff --git a/src/test/ui/suggestions/missing-bound-in-manual-copy-impl.stderr b/tests/ui/suggestions/missing-bound-in-manual-copy-impl.stderr
index fe2d133c8..fe2d133c8 100644
--- a/src/test/ui/suggestions/missing-bound-in-manual-copy-impl.stderr
+++ b/tests/ui/suggestions/missing-bound-in-manual-copy-impl.stderr
diff --git a/src/test/ui/suggestions/missing-lifetime-in-assoc-const-type.rs b/tests/ui/suggestions/missing-lifetime-in-assoc-const-type.rs
index 38332627f..38332627f 100644
--- a/src/test/ui/suggestions/missing-lifetime-in-assoc-const-type.rs
+++ b/tests/ui/suggestions/missing-lifetime-in-assoc-const-type.rs
diff --git a/src/test/ui/suggestions/missing-lifetime-in-assoc-const-type.stderr b/tests/ui/suggestions/missing-lifetime-in-assoc-const-type.stderr
index 233f1bc5a..233f1bc5a 100644
--- a/src/test/ui/suggestions/missing-lifetime-in-assoc-const-type.stderr
+++ b/tests/ui/suggestions/missing-lifetime-in-assoc-const-type.stderr
diff --git a/src/test/ui/suggestions/missing-lifetime-specifier.rs b/tests/ui/suggestions/missing-lifetime-specifier.rs
index 24f5f782f..24f5f782f 100644
--- a/src/test/ui/suggestions/missing-lifetime-specifier.rs
+++ b/tests/ui/suggestions/missing-lifetime-specifier.rs
diff --git a/src/test/ui/suggestions/missing-lifetime-specifier.stderr b/tests/ui/suggestions/missing-lifetime-specifier.stderr
index 997bbb5e9..997bbb5e9 100644
--- a/src/test/ui/suggestions/missing-lifetime-specifier.stderr
+++ b/tests/ui/suggestions/missing-lifetime-specifier.stderr
diff --git a/src/test/ui/suggestions/missing-lt-for-hrtb.rs b/tests/ui/suggestions/missing-lt-for-hrtb.rs
index 04ea3d831..04ea3d831 100644
--- a/src/test/ui/suggestions/missing-lt-for-hrtb.rs
+++ b/tests/ui/suggestions/missing-lt-for-hrtb.rs
diff --git a/src/test/ui/suggestions/missing-lt-for-hrtb.stderr b/tests/ui/suggestions/missing-lt-for-hrtb.stderr
index fa5156444..fa5156444 100644
--- a/src/test/ui/suggestions/missing-lt-for-hrtb.stderr
+++ b/tests/ui/suggestions/missing-lt-for-hrtb.stderr
diff --git a/src/test/ui/suggestions/missing-trait-item.fixed b/tests/ui/suggestions/missing-trait-item.fixed
index a1cf359ec..a1cf359ec 100644
--- a/src/test/ui/suggestions/missing-trait-item.fixed
+++ b/tests/ui/suggestions/missing-trait-item.fixed
diff --git a/src/test/ui/suggestions/missing-trait-item.rs b/tests/ui/suggestions/missing-trait-item.rs
index b4fca25ba..b4fca25ba 100644
--- a/src/test/ui/suggestions/missing-trait-item.rs
+++ b/tests/ui/suggestions/missing-trait-item.rs
diff --git a/src/test/ui/suggestions/missing-trait-item.stderr b/tests/ui/suggestions/missing-trait-item.stderr
index 4a9d7b472..4a9d7b472 100644
--- a/src/test/ui/suggestions/missing-trait-item.stderr
+++ b/tests/ui/suggestions/missing-trait-item.stderr
diff --git a/tests/ui/suggestions/missing-type-param-used-in-param.fixed b/tests/ui/suggestions/missing-type-param-used-in-param.fixed
new file mode 100644
index 000000000..be4394031
--- /dev/null
+++ b/tests/ui/suggestions/missing-type-param-used-in-param.fixed
@@ -0,0 +1,8 @@
+// run-rustfix
+
+fn two_type_params<A, B>(_: B) {}
+
+fn main() {
+    two_type_params::<String, _>(100); //~ ERROR function takes 2 generic arguments
+    two_type_params::<String, _>(100);
+}
diff --git a/tests/ui/suggestions/missing-type-param-used-in-param.rs b/tests/ui/suggestions/missing-type-param-used-in-param.rs
new file mode 100644
index 000000000..d444998d3
--- /dev/null
+++ b/tests/ui/suggestions/missing-type-param-used-in-param.rs
@@ -0,0 +1,8 @@
+// run-rustfix
+
+fn two_type_params<A, B>(_: B) {}
+
+fn main() {
+    two_type_params::<String>(100); //~ ERROR function takes 2 generic arguments
+    two_type_params::<String, _>(100);
+}
diff --git a/src/test/ui/suggestions/missing-type-param-used-in-param.stderr b/tests/ui/suggestions/missing-type-param-used-in-param.stderr
index 4f7058a64..4f7058a64 100644
--- a/src/test/ui/suggestions/missing-type-param-used-in-param.stderr
+++ b/tests/ui/suggestions/missing-type-param-used-in-param.stderr
diff --git a/src/test/ui/suggestions/move-generic-to-trait-in-method-with-params.rs b/tests/ui/suggestions/move-generic-to-trait-in-method-with-params.rs
index 2f540060a..2f540060a 100644
--- a/src/test/ui/suggestions/move-generic-to-trait-in-method-with-params.rs
+++ b/tests/ui/suggestions/move-generic-to-trait-in-method-with-params.rs
diff --git a/src/test/ui/suggestions/move-generic-to-trait-in-method-with-params.stderr b/tests/ui/suggestions/move-generic-to-trait-in-method-with-params.stderr
index 9557220f6..9557220f6 100644
--- a/src/test/ui/suggestions/move-generic-to-trait-in-method-with-params.stderr
+++ b/tests/ui/suggestions/move-generic-to-trait-in-method-with-params.stderr
diff --git a/src/test/ui/suggestions/multibyte-escapes.rs b/tests/ui/suggestions/multibyte-escapes.rs
index c41051862..c41051862 100644
--- a/src/test/ui/suggestions/multibyte-escapes.rs
+++ b/tests/ui/suggestions/multibyte-escapes.rs
diff --git a/src/test/ui/suggestions/multibyte-escapes.stderr b/tests/ui/suggestions/multibyte-escapes.stderr
index 1e7c43e65..1e7c43e65 100644
--- a/src/test/ui/suggestions/multibyte-escapes.stderr
+++ b/tests/ui/suggestions/multibyte-escapes.stderr
diff --git a/src/test/ui/suggestions/mut-borrow-needed-by-trait.rs b/tests/ui/suggestions/mut-borrow-needed-by-trait.rs
index 66e1e77c9..66e1e77c9 100644
--- a/src/test/ui/suggestions/mut-borrow-needed-by-trait.rs
+++ b/tests/ui/suggestions/mut-borrow-needed-by-trait.rs
diff --git a/src/test/ui/suggestions/mut-borrow-needed-by-trait.stderr b/tests/ui/suggestions/mut-borrow-needed-by-trait.stderr
index d121932c8..6910b77d9 100644
--- a/src/test/ui/suggestions/mut-borrow-needed-by-trait.stderr
+++ b/tests/ui/suggestions/mut-borrow-needed-by-trait.stderr
@@ -9,9 +9,6 @@ LL |     let fp = BufWriter::new(fp);
    = note: `std::io::Write` is implemented for `&mut dyn std::io::Write`, but not for `&dyn std::io::Write`
 note: required by a bound in `BufWriter::<W>::new`
   --> $SRC_DIR/std/src/io/buffered/bufwriter.rs:LL:COL
-   |
-LL | impl<W: Write> BufWriter<W> {
-   |         ^^^^^ required by this bound in `BufWriter::<W>::new`
 
 error[E0277]: the trait bound `&dyn std::io::Write: std::io::Write` is not satisfied
   --> $DIR/mut-borrow-needed-by-trait.rs:17:14
@@ -22,20 +19,15 @@ LL |     let fp = BufWriter::new(fp);
    = note: `std::io::Write` is implemented for `&mut dyn std::io::Write`, but not for `&dyn std::io::Write`
 note: required by a bound in `BufWriter`
   --> $SRC_DIR/std/src/io/buffered/bufwriter.rs:LL:COL
-   |
-LL | pub struct BufWriter<W: Write> {
-   |                         ^^^^^ required by this bound in `BufWriter`
 
-error[E0599]: the method `write_fmt` exists for struct `BufWriter<&dyn std::io::Write>`, but its trait bounds were not satisfied
+error[E0599]: the method `write_fmt` exists for struct `BufWriter<&dyn Write>`, but its trait bounds were not satisfied
   --> $DIR/mut-borrow-needed-by-trait.rs:21:5
    |
 LL |     writeln!(fp, "hello world").unwrap();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ method cannot be called on `BufWriter<&dyn std::io::Write>` due to unsatisfied trait bounds
-   |
-  ::: $SRC_DIR/std/src/io/buffered/bufwriter.rs:LL:COL
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ method cannot be called on `BufWriter<&dyn Write>` due to unsatisfied trait bounds
+  --> $SRC_DIR/std/src/io/buffered/bufwriter.rs:LL:COL
    |
-LL | pub struct BufWriter<W: Write> {
-   | ------------------------------ doesn't satisfy `BufWriter<&dyn std::io::Write>: std::io::Write`
+   = note: doesn't satisfy `BufWriter<&dyn std::io::Write>: std::io::Write`
    |
    = note: the following trait bounds were not satisfied:
            `&dyn std::io::Write: std::io::Write`
diff --git a/src/test/ui/suggestions/mut-ref-reassignment.rs b/tests/ui/suggestions/mut-ref-reassignment.rs
index 142832493..142832493 100644
--- a/src/test/ui/suggestions/mut-ref-reassignment.rs
+++ b/tests/ui/suggestions/mut-ref-reassignment.rs
diff --git a/src/test/ui/suggestions/mut-ref-reassignment.stderr b/tests/ui/suggestions/mut-ref-reassignment.stderr
index b3cb6dd06..b3cb6dd06 100644
--- a/src/test/ui/suggestions/mut-ref-reassignment.stderr
+++ b/tests/ui/suggestions/mut-ref-reassignment.stderr
diff --git a/src/test/ui/suggestions/negative-literal-index.fixed b/tests/ui/suggestions/negative-literal-index.fixed
index e52714cf9..e52714cf9 100644
--- a/src/test/ui/suggestions/negative-literal-index.fixed
+++ b/tests/ui/suggestions/negative-literal-index.fixed
diff --git a/src/test/ui/suggestions/negative-literal-index.rs b/tests/ui/suggestions/negative-literal-index.rs
index d88b66e67..d88b66e67 100644
--- a/src/test/ui/suggestions/negative-literal-index.rs
+++ b/tests/ui/suggestions/negative-literal-index.rs
diff --git a/src/test/ui/suggestions/negative-literal-index.stderr b/tests/ui/suggestions/negative-literal-index.stderr
index 2b51bf7b7..2b51bf7b7 100644
--- a/src/test/ui/suggestions/negative-literal-index.stderr
+++ b/tests/ui/suggestions/negative-literal-index.stderr
diff --git a/src/test/ui/suggestions/nested-non-tuple-tuple-struct.rs b/tests/ui/suggestions/nested-non-tuple-tuple-struct.rs
index 308adcf01..308adcf01 100644
--- a/src/test/ui/suggestions/nested-non-tuple-tuple-struct.rs
+++ b/tests/ui/suggestions/nested-non-tuple-tuple-struct.rs
diff --git a/src/test/ui/suggestions/nested-non-tuple-tuple-struct.stderr b/tests/ui/suggestions/nested-non-tuple-tuple-struct.stderr
index 948f09fc3..948f09fc3 100644
--- a/src/test/ui/suggestions/nested-non-tuple-tuple-struct.stderr
+++ b/tests/ui/suggestions/nested-non-tuple-tuple-struct.stderr
diff --git a/src/test/ui/suggestions/no-extern-crate-in-type.rs b/tests/ui/suggestions/no-extern-crate-in-type.rs
index bb93ef454..bb93ef454 100644
--- a/src/test/ui/suggestions/no-extern-crate-in-type.rs
+++ b/tests/ui/suggestions/no-extern-crate-in-type.rs
diff --git a/src/test/ui/suggestions/no-extern-crate-in-type.stderr b/tests/ui/suggestions/no-extern-crate-in-type.stderr
index 876eef2b6..876eef2b6 100644
--- a/src/test/ui/suggestions/no-extern-crate-in-type.stderr
+++ b/tests/ui/suggestions/no-extern-crate-in-type.stderr
diff --git a/src/test/ui/suggestions/non-existent-field-present-in-subfield-recursion-limit.rs b/tests/ui/suggestions/non-existent-field-present-in-subfield-recursion-limit.rs
index a7a3f9818..a7a3f9818 100644
--- a/src/test/ui/suggestions/non-existent-field-present-in-subfield-recursion-limit.rs
+++ b/tests/ui/suggestions/non-existent-field-present-in-subfield-recursion-limit.rs
diff --git a/src/test/ui/suggestions/non-existent-field-present-in-subfield-recursion-limit.stderr b/tests/ui/suggestions/non-existent-field-present-in-subfield-recursion-limit.stderr
index b294f4da7..b294f4da7 100644
--- a/src/test/ui/suggestions/non-existent-field-present-in-subfield-recursion-limit.stderr
+++ b/tests/ui/suggestions/non-existent-field-present-in-subfield-recursion-limit.stderr
diff --git a/src/test/ui/suggestions/non-existent-field-present-in-subfield.fixed b/tests/ui/suggestions/non-existent-field-present-in-subfield.fixed
index e58b4e6ca..e58b4e6ca 100644
--- a/src/test/ui/suggestions/non-existent-field-present-in-subfield.fixed
+++ b/tests/ui/suggestions/non-existent-field-present-in-subfield.fixed
diff --git a/src/test/ui/suggestions/non-existent-field-present-in-subfield.rs b/tests/ui/suggestions/non-existent-field-present-in-subfield.rs
index 7e273ac23..7e273ac23 100644
--- a/src/test/ui/suggestions/non-existent-field-present-in-subfield.rs
+++ b/tests/ui/suggestions/non-existent-field-present-in-subfield.rs
diff --git a/src/test/ui/suggestions/non-existent-field-present-in-subfield.stderr b/tests/ui/suggestions/non-existent-field-present-in-subfield.stderr
index cc991b915..cc991b915 100644
--- a/src/test/ui/suggestions/non-existent-field-present-in-subfield.stderr
+++ b/tests/ui/suggestions/non-existent-field-present-in-subfield.stderr
diff --git a/src/test/ui/suggestions/object-unsafe-trait-references-self.rs b/tests/ui/suggestions/object-unsafe-trait-references-self.rs
index 07bf053e9..07bf053e9 100644
--- a/src/test/ui/suggestions/object-unsafe-trait-references-self.rs
+++ b/tests/ui/suggestions/object-unsafe-trait-references-self.rs
diff --git a/src/test/ui/suggestions/object-unsafe-trait-references-self.stderr b/tests/ui/suggestions/object-unsafe-trait-references-self.stderr
index 54f19fe9d..54f19fe9d 100644
--- a/src/test/ui/suggestions/object-unsafe-trait-references-self.stderr
+++ b/tests/ui/suggestions/object-unsafe-trait-references-self.stderr
diff --git a/src/test/ui/suggestions/object-unsafe-trait-should-use-self.rs b/tests/ui/suggestions/object-unsafe-trait-should-use-self.rs
index 75f99075e..75f99075e 100644
--- a/src/test/ui/suggestions/object-unsafe-trait-should-use-self.rs
+++ b/tests/ui/suggestions/object-unsafe-trait-should-use-self.rs
diff --git a/src/test/ui/suggestions/object-unsafe-trait-should-use-self.stderr b/tests/ui/suggestions/object-unsafe-trait-should-use-self.stderr
index 55047b426..55047b426 100644
--- a/src/test/ui/suggestions/object-unsafe-trait-should-use-self.stderr
+++ b/tests/ui/suggestions/object-unsafe-trait-should-use-self.stderr
diff --git a/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.fixed b/tests/ui/suggestions/object-unsafe-trait-should-use-where-sized.fixed
index 69487c565..69487c565 100644
--- a/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.fixed
+++ b/tests/ui/suggestions/object-unsafe-trait-should-use-where-sized.fixed
diff --git a/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.rs b/tests/ui/suggestions/object-unsafe-trait-should-use-where-sized.rs
index 38d9aea16..38d9aea16 100644
--- a/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.rs
+++ b/tests/ui/suggestions/object-unsafe-trait-should-use-where-sized.rs
diff --git a/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.stderr b/tests/ui/suggestions/object-unsafe-trait-should-use-where-sized.stderr
index c0dc71df0..c0dc71df0 100644
--- a/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.stderr
+++ b/tests/ui/suggestions/object-unsafe-trait-should-use-where-sized.stderr
diff --git a/src/test/ui/suggestions/opaque-type-error.rs b/tests/ui/suggestions/opaque-type-error.rs
index 5e1147403..5e1147403 100644
--- a/src/test/ui/suggestions/opaque-type-error.rs
+++ b/tests/ui/suggestions/opaque-type-error.rs
diff --git a/src/test/ui/suggestions/opaque-type-error.stderr b/tests/ui/suggestions/opaque-type-error.stderr
index 133ffb058..133ffb058 100644
--- a/src/test/ui/suggestions/opaque-type-error.stderr
+++ b/tests/ui/suggestions/opaque-type-error.stderr
diff --git a/src/test/ui/suggestions/option-content-move-from-tuple-match.rs b/tests/ui/suggestions/option-content-move-from-tuple-match.rs
index 7f22d8136..7f22d8136 100644
--- a/src/test/ui/suggestions/option-content-move-from-tuple-match.rs
+++ b/tests/ui/suggestions/option-content-move-from-tuple-match.rs
diff --git a/src/test/ui/suggestions/option-content-move-from-tuple-match.stderr b/tests/ui/suggestions/option-content-move-from-tuple-match.stderr
index debb8caba..97d05d9dc 100644
--- a/src/test/ui/suggestions/option-content-move-from-tuple-match.stderr
+++ b/tests/ui/suggestions/option-content-move-from-tuple-match.stderr
@@ -9,6 +9,11 @@ LL |         (None, &c) => &c.unwrap(),
    |                 |
    |                 data moved here
    |                 move occurs because `c` has type `Option<String>`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |         (None, &ref c) => &c.unwrap(),
+   |                 +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/suggestions/option-content-move.rs b/tests/ui/suggestions/option-content-move.rs
index 46c895b95..46c895b95 100644
--- a/src/test/ui/suggestions/option-content-move.rs
+++ b/tests/ui/suggestions/option-content-move.rs
diff --git a/tests/ui/suggestions/option-content-move.stderr b/tests/ui/suggestions/option-content-move.stderr
new file mode 100644
index 000000000..474a72093
--- /dev/null
+++ b/tests/ui/suggestions/option-content-move.stderr
@@ -0,0 +1,35 @@
+error[E0507]: cannot move out of `selection.1` which is behind a shared reference
+  --> $DIR/option-content-move.rs:9:20
+   |
+LL |                 if selection.1.unwrap().contains(selection.0) {
+   |                    ^^^^^^^^^^^ -------- `selection.1` moved due to this method call
+   |                    |
+   |                    help: consider calling `.as_ref()` or `.as_mut()` to borrow the type's contents
+   |                    move occurs because `selection.1` has type `Option<String>`, which does not implement the `Copy` trait
+   |
+note: `Option::<T>::unwrap` takes ownership of the receiver `self`, which moves `selection.1`
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+help: you can `clone` the value and consume it, but this might not be your desired behavior
+   |
+LL |                 if selection.1.clone().unwrap().contains(selection.0) {
+   |                                ++++++++
+
+error[E0507]: cannot move out of `selection.1` which is behind a shared reference
+  --> $DIR/option-content-move.rs:27:20
+   |
+LL |                 if selection.1.unwrap().contains(selection.0) {
+   |                    ^^^^^^^^^^^ -------- `selection.1` moved due to this method call
+   |                    |
+   |                    help: consider calling `.as_ref()` or `.as_mut()` to borrow the type's contents
+   |                    move occurs because `selection.1` has type `Result<String, String>`, which does not implement the `Copy` trait
+   |
+note: `Result::<T, E>::unwrap` takes ownership of the receiver `self`, which moves `selection.1`
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+help: you can `clone` the value and consume it, but this might not be your desired behavior
+   |
+LL |                 if selection.1.clone().unwrap().contains(selection.0) {
+   |                                ++++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/suggestions/option-content-move2.rs b/tests/ui/suggestions/option-content-move2.rs
index 88e8a5b7a..88e8a5b7a 100644
--- a/src/test/ui/suggestions/option-content-move2.rs
+++ b/tests/ui/suggestions/option-content-move2.rs
diff --git a/src/test/ui/suggestions/option-content-move2.stderr b/tests/ui/suggestions/option-content-move2.stderr
index 1d3dff3be..1d3dff3be 100644
--- a/src/test/ui/suggestions/option-content-move2.stderr
+++ b/tests/ui/suggestions/option-content-move2.stderr
diff --git a/src/test/ui/suggestions/option-to-bool.rs b/tests/ui/suggestions/option-to-bool.rs
index 2a1823b15..2a1823b15 100644
--- a/src/test/ui/suggestions/option-to-bool.rs
+++ b/tests/ui/suggestions/option-to-bool.rs
diff --git a/src/test/ui/suggestions/option-to-bool.stderr b/tests/ui/suggestions/option-to-bool.stderr
index 57a934b83..4050c7be8 100644
--- a/src/test/ui/suggestions/option-to-bool.stderr
+++ b/tests/ui/suggestions/option-to-bool.stderr
@@ -2,7 +2,9 @@ error[E0308]: mismatched types
   --> $DIR/option-to-bool.rs:4:16
    |
 LL |     if true && x {}
-   |                ^ expected `bool`, found enum `Option`
+   |        ----    ^ expected `bool`, found enum `Option`
+   |        |
+   |        expected because this is `bool`
    |
    = note: expected type `bool`
               found enum `Option<i32>`
diff --git a/src/test/ui/suggestions/parenthesized-deref-suggestion.rs b/tests/ui/suggestions/parenthesized-deref-suggestion.rs
index 0b4ccdd5a..0b4ccdd5a 100644
--- a/src/test/ui/suggestions/parenthesized-deref-suggestion.rs
+++ b/tests/ui/suggestions/parenthesized-deref-suggestion.rs
diff --git a/src/test/ui/suggestions/parenthesized-deref-suggestion.stderr b/tests/ui/suggestions/parenthesized-deref-suggestion.stderr
index cafddbe26..cafddbe26 100644
--- a/src/test/ui/suggestions/parenthesized-deref-suggestion.stderr
+++ b/tests/ui/suggestions/parenthesized-deref-suggestion.stderr
diff --git a/src/test/ui/suggestions/path-by-value.rs b/tests/ui/suggestions/path-by-value.rs
index c875ca674..c875ca674 100644
--- a/src/test/ui/suggestions/path-by-value.rs
+++ b/tests/ui/suggestions/path-by-value.rs
diff --git a/src/test/ui/suggestions/path-by-value.stderr b/tests/ui/suggestions/path-by-value.stderr
index bbeaa26a9..bbeaa26a9 100644
--- a/src/test/ui/suggestions/path-by-value.stderr
+++ b/tests/ui/suggestions/path-by-value.stderr
diff --git a/src/test/ui/suggestions/path-display.rs b/tests/ui/suggestions/path-display.rs
index 3a022e6b0..3a022e6b0 100644
--- a/src/test/ui/suggestions/path-display.rs
+++ b/tests/ui/suggestions/path-display.rs
diff --git a/src/test/ui/suggestions/path-display.stderr b/tests/ui/suggestions/path-display.stderr
index 8359b3658..8359b3658 100644
--- a/src/test/ui/suggestions/path-display.stderr
+++ b/tests/ui/suggestions/path-display.stderr
diff --git a/src/test/ui/suggestions/pattern-slice-vec.fixed b/tests/ui/suggestions/pattern-slice-vec.fixed
index f8144641f..f8144641f 100644
--- a/src/test/ui/suggestions/pattern-slice-vec.fixed
+++ b/tests/ui/suggestions/pattern-slice-vec.fixed
diff --git a/src/test/ui/suggestions/pattern-slice-vec.rs b/tests/ui/suggestions/pattern-slice-vec.rs
index 444687c85..444687c85 100644
--- a/src/test/ui/suggestions/pattern-slice-vec.rs
+++ b/tests/ui/suggestions/pattern-slice-vec.rs
diff --git a/src/test/ui/suggestions/pattern-slice-vec.stderr b/tests/ui/suggestions/pattern-slice-vec.stderr
index f69e7de97..f69e7de97 100644
--- a/src/test/ui/suggestions/pattern-slice-vec.stderr
+++ b/tests/ui/suggestions/pattern-slice-vec.stderr
diff --git a/src/test/ui/suggestions/pattern-struct-with-slice-vec-field.rs b/tests/ui/suggestions/pattern-struct-with-slice-vec-field.rs
index 5b223a91f..5b223a91f 100644
--- a/src/test/ui/suggestions/pattern-struct-with-slice-vec-field.rs
+++ b/tests/ui/suggestions/pattern-struct-with-slice-vec-field.rs
diff --git a/src/test/ui/suggestions/pattern-struct-with-slice-vec-field.stderr b/tests/ui/suggestions/pattern-struct-with-slice-vec-field.stderr
index 5b48a8b18..5b48a8b18 100644
--- a/src/test/ui/suggestions/pattern-struct-with-slice-vec-field.stderr
+++ b/tests/ui/suggestions/pattern-struct-with-slice-vec-field.stderr
diff --git a/src/test/ui/suggestions/private-field.rs b/tests/ui/suggestions/private-field.rs
index 1cc4d2a4d..1cc4d2a4d 100644
--- a/src/test/ui/suggestions/private-field.rs
+++ b/tests/ui/suggestions/private-field.rs
diff --git a/src/test/ui/suggestions/private-field.stderr b/tests/ui/suggestions/private-field.stderr
index c38c795e0..c38c795e0 100644
--- a/src/test/ui/suggestions/private-field.stderr
+++ b/tests/ui/suggestions/private-field.stderr
diff --git a/src/test/ui/suggestions/raw-byte-string-prefix.rs b/tests/ui/suggestions/raw-byte-string-prefix.rs
index 576561c31..576561c31 100644
--- a/src/test/ui/suggestions/raw-byte-string-prefix.rs
+++ b/tests/ui/suggestions/raw-byte-string-prefix.rs
diff --git a/src/test/ui/suggestions/raw-byte-string-prefix.stderr b/tests/ui/suggestions/raw-byte-string-prefix.stderr
index 4f5106849..4f5106849 100644
--- a/src/test/ui/suggestions/raw-byte-string-prefix.stderr
+++ b/tests/ui/suggestions/raw-byte-string-prefix.stderr
diff --git a/src/test/ui/suggestions/raw-name-use-suggestion.rs b/tests/ui/suggestions/raw-name-use-suggestion.rs
index 0a8073c0b..0a8073c0b 100644
--- a/src/test/ui/suggestions/raw-name-use-suggestion.rs
+++ b/tests/ui/suggestions/raw-name-use-suggestion.rs
diff --git a/src/test/ui/suggestions/raw-name-use-suggestion.stderr b/tests/ui/suggestions/raw-name-use-suggestion.stderr
index 95c26b9ad..95c26b9ad 100644
--- a/src/test/ui/suggestions/raw-name-use-suggestion.stderr
+++ b/tests/ui/suggestions/raw-name-use-suggestion.stderr
diff --git a/src/test/ui/suggestions/recover-from-semicolon-trailing-item.rs b/tests/ui/suggestions/recover-from-semicolon-trailing-item.rs
index 82935af0a..82935af0a 100644
--- a/src/test/ui/suggestions/recover-from-semicolon-trailing-item.rs
+++ b/tests/ui/suggestions/recover-from-semicolon-trailing-item.rs
diff --git a/src/test/ui/suggestions/recover-from-semicolon-trailing-item.stderr b/tests/ui/suggestions/recover-from-semicolon-trailing-item.stderr
index 9588eedc9..9588eedc9 100644
--- a/src/test/ui/suggestions/recover-from-semicolon-trailing-item.stderr
+++ b/tests/ui/suggestions/recover-from-semicolon-trailing-item.stderr
diff --git a/src/test/ui/suggestions/recover-invalid-float.fixed b/tests/ui/suggestions/recover-invalid-float.fixed
index 62389ba61..62389ba61 100644
--- a/src/test/ui/suggestions/recover-invalid-float.fixed
+++ b/tests/ui/suggestions/recover-invalid-float.fixed
diff --git a/src/test/ui/suggestions/recover-invalid-float.rs b/tests/ui/suggestions/recover-invalid-float.rs
index a5a7efe5e..a5a7efe5e 100644
--- a/src/test/ui/suggestions/recover-invalid-float.rs
+++ b/tests/ui/suggestions/recover-invalid-float.rs
diff --git a/src/test/ui/suggestions/recover-invalid-float.stderr b/tests/ui/suggestions/recover-invalid-float.stderr
index dd24746ea..dd24746ea 100644
--- a/src/test/ui/suggestions/recover-invalid-float.stderr
+++ b/tests/ui/suggestions/recover-invalid-float.stderr
diff --git a/src/test/ui/suggestions/recover-missing-turbofish-surrounding-angle-braket.rs b/tests/ui/suggestions/recover-missing-turbofish-surrounding-angle-braket.rs
index 333dce390..333dce390 100644
--- a/src/test/ui/suggestions/recover-missing-turbofish-surrounding-angle-braket.rs
+++ b/tests/ui/suggestions/recover-missing-turbofish-surrounding-angle-braket.rs
diff --git a/src/test/ui/suggestions/recover-missing-turbofish-surrounding-angle-braket.stderr b/tests/ui/suggestions/recover-missing-turbofish-surrounding-angle-braket.stderr
index 618ccba0d..618ccba0d 100644
--- a/src/test/ui/suggestions/recover-missing-turbofish-surrounding-angle-braket.stderr
+++ b/tests/ui/suggestions/recover-missing-turbofish-surrounding-angle-braket.stderr
diff --git a/src/test/ui/suggestions/ref-pattern-binding.fixed b/tests/ui/suggestions/ref-pattern-binding.fixed
index c36040eec..c36040eec 100644
--- a/src/test/ui/suggestions/ref-pattern-binding.fixed
+++ b/tests/ui/suggestions/ref-pattern-binding.fixed
diff --git a/src/test/ui/suggestions/ref-pattern-binding.rs b/tests/ui/suggestions/ref-pattern-binding.rs
index c0d4feb03..c0d4feb03 100644
--- a/src/test/ui/suggestions/ref-pattern-binding.rs
+++ b/tests/ui/suggestions/ref-pattern-binding.rs
diff --git a/src/test/ui/suggestions/ref-pattern-binding.stderr b/tests/ui/suggestions/ref-pattern-binding.stderr
index 10447ba70..10447ba70 100644
--- a/src/test/ui/suggestions/ref-pattern-binding.stderr
+++ b/tests/ui/suggestions/ref-pattern-binding.stderr
diff --git a/src/test/ui/suggestions/removal-of-multiline-trait-bound-in-where-clause.rs b/tests/ui/suggestions/removal-of-multiline-trait-bound-in-where-clause.rs
index 56aed77c1..56aed77c1 100644
--- a/src/test/ui/suggestions/removal-of-multiline-trait-bound-in-where-clause.rs
+++ b/tests/ui/suggestions/removal-of-multiline-trait-bound-in-where-clause.rs
diff --git a/src/test/ui/suggestions/removal-of-multiline-trait-bound-in-where-clause.stderr b/tests/ui/suggestions/removal-of-multiline-trait-bound-in-where-clause.stderr
index 6071b10d3..6071b10d3 100644
--- a/src/test/ui/suggestions/removal-of-multiline-trait-bound-in-where-clause.stderr
+++ b/tests/ui/suggestions/removal-of-multiline-trait-bound-in-where-clause.stderr
diff --git a/src/test/ui/suggestions/remove-as_str.rs b/tests/ui/suggestions/remove-as_str.rs
index 289a784ba..289a784ba 100644
--- a/src/test/ui/suggestions/remove-as_str.rs
+++ b/tests/ui/suggestions/remove-as_str.rs
diff --git a/src/test/ui/suggestions/remove-as_str.stderr b/tests/ui/suggestions/remove-as_str.stderr
index 534c49778..534c49778 100644
--- a/src/test/ui/suggestions/remove-as_str.stderr
+++ b/tests/ui/suggestions/remove-as_str.stderr
diff --git a/src/test/ui/suggestions/restrict-type-argument.rs b/tests/ui/suggestions/restrict-type-argument.rs
index c4ebfbe92..c4ebfbe92 100644
--- a/src/test/ui/suggestions/restrict-type-argument.rs
+++ b/tests/ui/suggestions/restrict-type-argument.rs
diff --git a/src/test/ui/suggestions/restrict-type-argument.stderr b/tests/ui/suggestions/restrict-type-argument.stderr
index 01c2de798..01c2de798 100644
--- a/src/test/ui/suggestions/restrict-type-argument.stderr
+++ b/tests/ui/suggestions/restrict-type-argument.stderr
diff --git a/src/test/ui/suggestions/restrict-type-not-param.rs b/tests/ui/suggestions/restrict-type-not-param.rs
index 60f5ba45c..60f5ba45c 100644
--- a/src/test/ui/suggestions/restrict-type-not-param.rs
+++ b/tests/ui/suggestions/restrict-type-not-param.rs
diff --git a/src/test/ui/suggestions/restrict-type-not-param.stderr b/tests/ui/suggestions/restrict-type-not-param.stderr
index e7d9c5ecb..5434472ce 100644
--- a/src/test/ui/suggestions/restrict-type-not-param.stderr
+++ b/tests/ui/suggestions/restrict-type-not-param.stderr
@@ -11,11 +11,8 @@ note: an implementation of `Add<_>` might be missing for `Wrapper<T>`
    |
 LL | struct Wrapper<T>(T);
    | ^^^^^^^^^^^^^^^^^ must implement `Add<_>`
-note: the following trait must be implemented
+note: the trait `Add` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Add<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 help: consider introducing a `where` clause, but there might be an alternative better way to express this requirement
    |
 LL | fn qux<T>(a: Wrapper<T>, b: T) -> T where Wrapper<T>: Add<T, Output = T> {
diff --git a/src/test/ui/suggestions/return-bindings-multi.rs b/tests/ui/suggestions/return-bindings-multi.rs
index 8c3bd641e..8c3bd641e 100644
--- a/src/test/ui/suggestions/return-bindings-multi.rs
+++ b/tests/ui/suggestions/return-bindings-multi.rs
diff --git a/src/test/ui/suggestions/return-bindings-multi.stderr b/tests/ui/suggestions/return-bindings-multi.stderr
index 738e3f2f4..738e3f2f4 100644
--- a/src/test/ui/suggestions/return-bindings-multi.stderr
+++ b/tests/ui/suggestions/return-bindings-multi.stderr
diff --git a/src/test/ui/suggestions/return-bindings.rs b/tests/ui/suggestions/return-bindings.rs
index fa1bad376..fa1bad376 100644
--- a/src/test/ui/suggestions/return-bindings.rs
+++ b/tests/ui/suggestions/return-bindings.rs
diff --git a/src/test/ui/suggestions/return-bindings.stderr b/tests/ui/suggestions/return-bindings.stderr
index c14fb3367..c14fb3367 100644
--- a/src/test/ui/suggestions/return-bindings.stderr
+++ b/tests/ui/suggestions/return-bindings.stderr
diff --git a/src/test/ui/suggestions/return-closures.rs b/tests/ui/suggestions/return-closures.rs
index 86c7c1537..86c7c1537 100644
--- a/src/test/ui/suggestions/return-closures.rs
+++ b/tests/ui/suggestions/return-closures.rs
diff --git a/src/test/ui/suggestions/return-closures.stderr b/tests/ui/suggestions/return-closures.stderr
index 8b856d8de..8b856d8de 100644
--- a/src/test/ui/suggestions/return-closures.stderr
+++ b/tests/ui/suggestions/return-closures.stderr
diff --git a/src/test/ui/suggestions/return-cycle-2.rs b/tests/ui/suggestions/return-cycle-2.rs
index d6d24be1b..d6d24be1b 100644
--- a/src/test/ui/suggestions/return-cycle-2.rs
+++ b/tests/ui/suggestions/return-cycle-2.rs
diff --git a/src/test/ui/suggestions/return-cycle-2.stderr b/tests/ui/suggestions/return-cycle-2.stderr
index 3a1a0f7f4..3a1a0f7f4 100644
--- a/src/test/ui/suggestions/return-cycle-2.stderr
+++ b/tests/ui/suggestions/return-cycle-2.stderr
diff --git a/src/test/ui/suggestions/return-cycle.rs b/tests/ui/suggestions/return-cycle.rs
index 60b80e35a..60b80e35a 100644
--- a/src/test/ui/suggestions/return-cycle.rs
+++ b/tests/ui/suggestions/return-cycle.rs
diff --git a/src/test/ui/suggestions/return-cycle.stderr b/tests/ui/suggestions/return-cycle.stderr
index 63fa9e040..63fa9e040 100644
--- a/src/test/ui/suggestions/return-cycle.stderr
+++ b/tests/ui/suggestions/return-cycle.stderr
diff --git a/src/test/ui/suggestions/return-elided-lifetime.rs b/tests/ui/suggestions/return-elided-lifetime.rs
index 012d5492a..012d5492a 100644
--- a/src/test/ui/suggestions/return-elided-lifetime.rs
+++ b/tests/ui/suggestions/return-elided-lifetime.rs
diff --git a/src/test/ui/suggestions/return-elided-lifetime.stderr b/tests/ui/suggestions/return-elided-lifetime.stderr
index 273d95bc7..273d95bc7 100644
--- a/src/test/ui/suggestions/return-elided-lifetime.stderr
+++ b/tests/ui/suggestions/return-elided-lifetime.stderr
diff --git a/src/test/ui/suggestions/return-without-lifetime.rs b/tests/ui/suggestions/return-without-lifetime.rs
index 9bfce11be..9bfce11be 100644
--- a/src/test/ui/suggestions/return-without-lifetime.rs
+++ b/tests/ui/suggestions/return-without-lifetime.rs
diff --git a/src/test/ui/suggestions/return-without-lifetime.stderr b/tests/ui/suggestions/return-without-lifetime.stderr
index 5028e8d62..5028e8d62 100644
--- a/src/test/ui/suggestions/return-without-lifetime.stderr
+++ b/tests/ui/suggestions/return-without-lifetime.stderr
diff --git a/tests/ui/suggestions/shadowed-lplace-method-2.rs b/tests/ui/suggestions/shadowed-lplace-method-2.rs
new file mode 100644
index 000000000..dab99fbac
--- /dev/null
+++ b/tests/ui/suggestions/shadowed-lplace-method-2.rs
@@ -0,0 +1,23 @@
+#![allow(unused)]
+
+struct X {
+    x: (),
+}
+pub trait A {
+    fn foo(&mut self, _: usize) -> &mut ();
+}
+impl A for X {
+    fn foo(&mut self, _: usize) -> &mut () {
+        &mut self.x
+    }
+}
+impl X {
+    fn foo(&mut self, _: usize) -> &mut Self {
+        self
+    }
+}
+
+fn main() {
+    let mut x = X { x: () };
+    *x.foo(0) = (); //~ ERROR E0308
+}
diff --git a/tests/ui/suggestions/shadowed-lplace-method-2.stderr b/tests/ui/suggestions/shadowed-lplace-method-2.stderr
new file mode 100644
index 000000000..94eef15f3
--- /dev/null
+++ b/tests/ui/suggestions/shadowed-lplace-method-2.stderr
@@ -0,0 +1,25 @@
+error[E0308]: mismatched types
+  --> $DIR/shadowed-lplace-method-2.rs:22:17
+   |
+LL |     *x.foo(0) = ();
+   |     ---------   ^^ expected struct `X`, found `()`
+   |     |
+   |     expected due to the type of this binding
+   |
+note: the `foo` call is resolved to the method in `X`, shadowing the method of the same name on trait `A`
+  --> $DIR/shadowed-lplace-method-2.rs:22:8
+   |
+LL |     *x.foo(0) = ();
+   |        ^^^ refers to `X::foo`
+help: you might have meant to call the other method; you can use the fully-qualified path to call it explicitly
+   |
+LL |     *<_ as A>::foo(&mut x, 0) = ();
+   |      ++++++++++++++++++  ~
+help: try wrapping the expression in `X`
+   |
+LL |     *x.foo(0) = X { x: () };
+   |                 ++++++    +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/suggestions/shadowed-lplace-method.fixed b/tests/ui/suggestions/shadowed-lplace-method.fixed
new file mode 100644
index 000000000..740ac77ee
--- /dev/null
+++ b/tests/ui/suggestions/shadowed-lplace-method.fixed
@@ -0,0 +1,10 @@
+// run-rustfix
+#![allow(unused_imports)]
+use std::borrow::BorrowMut;
+use std::cell::RefCell;
+use std::rc::Rc;
+
+fn main() {
+    let rc = Rc::new(RefCell::new(true));
+    *std::cell::RefCell::<_>::borrow_mut(&rc) = false; //~ ERROR E0308
+}
diff --git a/tests/ui/suggestions/shadowed-lplace-method.rs b/tests/ui/suggestions/shadowed-lplace-method.rs
new file mode 100644
index 000000000..6bf12879e
--- /dev/null
+++ b/tests/ui/suggestions/shadowed-lplace-method.rs
@@ -0,0 +1,10 @@
+// run-rustfix
+#![allow(unused_imports)]
+use std::borrow::BorrowMut;
+use std::cell::RefCell;
+use std::rc::Rc;
+
+fn main() {
+    let rc = Rc::new(RefCell::new(true));
+    *rc.borrow_mut() = false; //~ ERROR E0308
+}
diff --git a/tests/ui/suggestions/shadowed-lplace-method.stderr b/tests/ui/suggestions/shadowed-lplace-method.stderr
new file mode 100644
index 000000000..91d0d1200
--- /dev/null
+++ b/tests/ui/suggestions/shadowed-lplace-method.stderr
@@ -0,0 +1,26 @@
+error[E0308]: mismatched types
+  --> $DIR/shadowed-lplace-method.rs:9:24
+   |
+LL |     *rc.borrow_mut() = false;
+   |     ----------------   ^^^^^ expected struct `Rc`, found `bool`
+   |     |
+   |     expected due to the type of this binding
+   |
+   = note: expected struct `Rc<RefCell<bool>>`
+                found type `bool`
+note: the `borrow_mut` call is resolved to the method in `std::borrow::BorrowMut`, shadowing the method of the same name on the inherent impl for `std::cell::RefCell<T>`
+  --> $DIR/shadowed-lplace-method.rs:9:9
+   |
+LL | use std::borrow::BorrowMut;
+   |     ---------------------- `std::borrow::BorrowMut` imported here
+...
+LL |     *rc.borrow_mut() = false;
+   |         ^^^^^^^^^^ refers to `std::borrow::BorrowMut::borrow_mut`
+help: you might have meant to call the other method; you can use the fully-qualified path to call it explicitly
+   |
+LL |     *std::cell::RefCell::<_>::borrow_mut(&rc) = false;
+   |      +++++++++++++++++++++++++++++++++++++  ~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/slice-issue-87994.rs b/tests/ui/suggestions/slice-issue-87994.rs
index ecb7f54ea..ecb7f54ea 100644
--- a/src/test/ui/suggestions/slice-issue-87994.rs
+++ b/tests/ui/suggestions/slice-issue-87994.rs
diff --git a/src/test/ui/suggestions/slice-issue-87994.stderr b/tests/ui/suggestions/slice-issue-87994.stderr
index 84ecd749b..84ecd749b 100644
--- a/src/test/ui/suggestions/slice-issue-87994.stderr
+++ b/tests/ui/suggestions/slice-issue-87994.stderr
diff --git a/src/test/ui/suggestions/struct-field-type-including-single-colon.rs b/tests/ui/suggestions/struct-field-type-including-single-colon.rs
index b7ad6d996..b7ad6d996 100644
--- a/src/test/ui/suggestions/struct-field-type-including-single-colon.rs
+++ b/tests/ui/suggestions/struct-field-type-including-single-colon.rs
diff --git a/src/test/ui/suggestions/struct-field-type-including-single-colon.stderr b/tests/ui/suggestions/struct-field-type-including-single-colon.stderr
index 4dd514480..4dd514480 100644
--- a/src/test/ui/suggestions/struct-field-type-including-single-colon.stderr
+++ b/tests/ui/suggestions/struct-field-type-including-single-colon.stderr
diff --git a/src/test/ui/suggestions/struct-initializer-comma.fixed b/tests/ui/suggestions/struct-initializer-comma.fixed
index 6a4ee39b1..6a4ee39b1 100644
--- a/src/test/ui/suggestions/struct-initializer-comma.fixed
+++ b/tests/ui/suggestions/struct-initializer-comma.fixed
diff --git a/src/test/ui/suggestions/struct-initializer-comma.rs b/tests/ui/suggestions/struct-initializer-comma.rs
index c137f0594..c137f0594 100644
--- a/src/test/ui/suggestions/struct-initializer-comma.rs
+++ b/tests/ui/suggestions/struct-initializer-comma.rs
diff --git a/src/test/ui/suggestions/struct-initializer-comma.stderr b/tests/ui/suggestions/struct-initializer-comma.stderr
index 5eff43f32..5eff43f32 100644
--- a/src/test/ui/suggestions/struct-initializer-comma.stderr
+++ b/tests/ui/suggestions/struct-initializer-comma.stderr
diff --git a/src/test/ui/suggestions/sugg-else-for-closure.fixed b/tests/ui/suggestions/sugg-else-for-closure.fixed
index cf381d9da..cf381d9da 100644
--- a/src/test/ui/suggestions/sugg-else-for-closure.fixed
+++ b/tests/ui/suggestions/sugg-else-for-closure.fixed
diff --git a/src/test/ui/suggestions/sugg-else-for-closure.rs b/tests/ui/suggestions/sugg-else-for-closure.rs
index 540ced91f..540ced91f 100644
--- a/src/test/ui/suggestions/sugg-else-for-closure.rs
+++ b/tests/ui/suggestions/sugg-else-for-closure.rs
diff --git a/tests/ui/suggestions/sugg-else-for-closure.stderr b/tests/ui/suggestions/sugg-else-for-closure.stderr
new file mode 100644
index 000000000..7f05832bc
--- /dev/null
+++ b/tests/ui/suggestions/sugg-else-for-closure.stderr
@@ -0,0 +1,27 @@
+error[E0308]: mismatched types
+  --> $DIR/sugg-else-for-closure.rs:6:26
+   |
+LL |     let _s = y.unwrap_or(|| x.split('.').nth(1).unwrap());
+   |                --------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `&str`, found closure
+   |                |
+   |                arguments to this method are incorrect
+   |
+   = note: expected reference `&str`
+                found closure `[closure@$DIR/sugg-else-for-closure.rs:6:26: 6:28]`
+help: the return type of this call is `[closure@$DIR/sugg-else-for-closure.rs:6:26: 6:28]` due to the type of the argument passed
+  --> $DIR/sugg-else-for-closure.rs:6:14
+   |
+LL |     let _s = y.unwrap_or(|| x.split('.').nth(1).unwrap());
+   |              ^^^^^^^^^^^^-------------------------------^
+   |                          |
+   |                          this argument influences the return type of `unwrap_or`
+note: associated function defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+help: try calling `unwrap_or_else` instead
+   |
+LL |     let _s = y.unwrap_or_else(|| x.split('.').nth(1).unwrap());
+   |                         +++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/sugg_with_positional_args_and_debug_fmt.rs b/tests/ui/suggestions/sugg_with_positional_args_and_debug_fmt.rs
index 21ab6830b..21ab6830b 100644
--- a/src/test/ui/suggestions/sugg_with_positional_args_and_debug_fmt.rs
+++ b/tests/ui/suggestions/sugg_with_positional_args_and_debug_fmt.rs
diff --git a/src/test/ui/suggestions/sugg_with_positional_args_and_debug_fmt.stderr b/tests/ui/suggestions/sugg_with_positional_args_and_debug_fmt.stderr
index 850f69f2d..850f69f2d 100644
--- a/src/test/ui/suggestions/sugg_with_positional_args_and_debug_fmt.stderr
+++ b/tests/ui/suggestions/sugg_with_positional_args_and_debug_fmt.stderr
diff --git a/src/test/ui/suggestions/suggest-add-self.rs b/tests/ui/suggestions/suggest-add-self.rs
index 40692c8df..40692c8df 100644
--- a/src/test/ui/suggestions/suggest-add-self.rs
+++ b/tests/ui/suggestions/suggest-add-self.rs
diff --git a/src/test/ui/suggestions/suggest-add-self.stderr b/tests/ui/suggestions/suggest-add-self.stderr
index a5e8f93de..a5e8f93de 100644
--- a/src/test/ui/suggestions/suggest-add-self.stderr
+++ b/tests/ui/suggestions/suggest-add-self.stderr
diff --git a/src/test/ui/suggestions/suggest-adding-reference-to-trait-assoc-item.fixed b/tests/ui/suggestions/suggest-adding-reference-to-trait-assoc-item.fixed
index e9b8a9caa..e9b8a9caa 100644
--- a/src/test/ui/suggestions/suggest-adding-reference-to-trait-assoc-item.fixed
+++ b/tests/ui/suggestions/suggest-adding-reference-to-trait-assoc-item.fixed
diff --git a/src/test/ui/suggestions/suggest-adding-reference-to-trait-assoc-item.rs b/tests/ui/suggestions/suggest-adding-reference-to-trait-assoc-item.rs
index 5fae21ccc..5fae21ccc 100644
--- a/src/test/ui/suggestions/suggest-adding-reference-to-trait-assoc-item.rs
+++ b/tests/ui/suggestions/suggest-adding-reference-to-trait-assoc-item.rs
diff --git a/src/test/ui/suggestions/suggest-adding-reference-to-trait-assoc-item.stderr b/tests/ui/suggestions/suggest-adding-reference-to-trait-assoc-item.stderr
index 125a8b44f..125a8b44f 100644
--- a/src/test/ui/suggestions/suggest-adding-reference-to-trait-assoc-item.stderr
+++ b/tests/ui/suggestions/suggest-adding-reference-to-trait-assoc-item.stderr
diff --git a/src/test/ui/suggestions/suggest-assoc-fn-call-deref.fixed b/tests/ui/suggestions/suggest-assoc-fn-call-deref.fixed
index 8d96cf590..8d96cf590 100644
--- a/src/test/ui/suggestions/suggest-assoc-fn-call-deref.fixed
+++ b/tests/ui/suggestions/suggest-assoc-fn-call-deref.fixed
diff --git a/src/test/ui/suggestions/suggest-assoc-fn-call-deref.rs b/tests/ui/suggestions/suggest-assoc-fn-call-deref.rs
index 186901f75..186901f75 100644
--- a/src/test/ui/suggestions/suggest-assoc-fn-call-deref.rs
+++ b/tests/ui/suggestions/suggest-assoc-fn-call-deref.rs
diff --git a/src/test/ui/suggestions/suggest-assoc-fn-call-deref.stderr b/tests/ui/suggestions/suggest-assoc-fn-call-deref.stderr
index 00fb96f03..00fb96f03 100644
--- a/src/test/ui/suggestions/suggest-assoc-fn-call-deref.stderr
+++ b/tests/ui/suggestions/suggest-assoc-fn-call-deref.stderr
diff --git a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish-placeholder.rs b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish-placeholder.rs
index a39b8711d..a39b8711d 100644
--- a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish-placeholder.rs
+++ b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish-placeholder.rs
diff --git a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish-placeholder.stderr b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish-placeholder.stderr
index c247e73b3..c247e73b3 100644
--- a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish-placeholder.stderr
+++ b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish-placeholder.stderr
diff --git a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish-through-deref.rs b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish-through-deref.rs
index f738a1f21..f738a1f21 100644
--- a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish-through-deref.rs
+++ b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish-through-deref.rs
diff --git a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish-through-deref.stderr b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish-through-deref.stderr
index 7c9f0b6c2..7c9f0b6c2 100644
--- a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish-through-deref.stderr
+++ b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish-through-deref.stderr
diff --git a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish.fixed b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish.fixed
index 02dd0715c..02dd0715c 100644
--- a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish.fixed
+++ b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish.fixed
diff --git a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish.rs b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish.rs
index 1d0ca8e78..1d0ca8e78 100644
--- a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish.rs
+++ b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish.rs
diff --git a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish.stderr b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish.stderr
index 92b03fc77..92b03fc77 100644
--- a/src/test/ui/suggestions/suggest-assoc-fn-call-with-turbofish.stderr
+++ b/tests/ui/suggestions/suggest-assoc-fn-call-with-turbofish.stderr
diff --git a/src/test/ui/suggestions/suggest-blanket-impl-local-trait.rs b/tests/ui/suggestions/suggest-blanket-impl-local-trait.rs
index 14fef1b52..14fef1b52 100644
--- a/src/test/ui/suggestions/suggest-blanket-impl-local-trait.rs
+++ b/tests/ui/suggestions/suggest-blanket-impl-local-trait.rs
diff --git a/src/test/ui/suggestions/suggest-blanket-impl-local-trait.stderr b/tests/ui/suggestions/suggest-blanket-impl-local-trait.stderr
index 398caa98b..398caa98b 100644
--- a/src/test/ui/suggestions/suggest-blanket-impl-local-trait.stderr
+++ b/tests/ui/suggestions/suggest-blanket-impl-local-trait.stderr
diff --git a/src/test/ui/suggestions/suggest-borrow-to-dyn-object.rs b/tests/ui/suggestions/suggest-borrow-to-dyn-object.rs
index 120fc5383..120fc5383 100644
--- a/src/test/ui/suggestions/suggest-borrow-to-dyn-object.rs
+++ b/tests/ui/suggestions/suggest-borrow-to-dyn-object.rs
diff --git a/src/test/ui/suggestions/suggest-borrow-to-dyn-object.stderr b/tests/ui/suggestions/suggest-borrow-to-dyn-object.stderr
index 6ce9bfd9d..6ce9bfd9d 100644
--- a/src/test/ui/suggestions/suggest-borrow-to-dyn-object.stderr
+++ b/tests/ui/suggestions/suggest-borrow-to-dyn-object.stderr
diff --git a/src/test/ui/suggestions/suggest-box.fixed b/tests/ui/suggestions/suggest-box.fixed
index 3de02cd0b..3de02cd0b 100644
--- a/src/test/ui/suggestions/suggest-box.fixed
+++ b/tests/ui/suggestions/suggest-box.fixed
diff --git a/src/test/ui/suggestions/suggest-box.rs b/tests/ui/suggestions/suggest-box.rs
index e680a61db..e680a61db 100644
--- a/src/test/ui/suggestions/suggest-box.rs
+++ b/tests/ui/suggestions/suggest-box.rs
diff --git a/src/test/ui/suggestions/suggest-box.stderr b/tests/ui/suggestions/suggest-box.stderr
index 2bdaa4e97..2bdaa4e97 100644
--- a/src/test/ui/suggestions/suggest-box.stderr
+++ b/tests/ui/suggestions/suggest-box.stderr
diff --git a/src/test/ui/suggestions/suggest-change-mut.rs b/tests/ui/suggestions/suggest-change-mut.rs
index 47dc7c343..47dc7c343 100644
--- a/src/test/ui/suggestions/suggest-change-mut.rs
+++ b/tests/ui/suggestions/suggest-change-mut.rs
diff --git a/src/test/ui/suggestions/suggest-change-mut.stderr b/tests/ui/suggestions/suggest-change-mut.stderr
index 889b11a74..d194afeaf 100644
--- a/src/test/ui/suggestions/suggest-change-mut.stderr
+++ b/tests/ui/suggestions/suggest-change-mut.stderr
@@ -8,9 +8,6 @@ LL |         let mut stream_reader = BufReader::new(&stream);
    |
 note: required by a bound in `BufReader::<R>::new`
   --> $SRC_DIR/std/src/io/buffered/bufreader.rs:LL:COL
-   |
-LL | impl<R: Read> BufReader<R> {
-   |         ^^^^ required by this bound in `BufReader::<R>::new`
 help: consider removing the leading `&`-reference
    |
 LL -         let mut stream_reader = BufReader::new(&stream);
@@ -30,11 +27,9 @@ error[E0599]: the method `read_until` exists for struct `BufReader<&T>`, but its
    |
 LL |         stream_reader.read_until(b'\n', &mut buffer).expect("Reading into buffer failed");
    |                       ^^^^^^^^^^ method cannot be called on `BufReader<&T>` due to unsatisfied trait bounds
+  --> $SRC_DIR/std/src/io/buffered/bufreader.rs:LL:COL
    |
-  ::: $SRC_DIR/std/src/io/buffered/bufreader.rs:LL:COL
-   |
-LL | pub struct BufReader<R> {
-   | ----------------------- doesn't satisfy `BufReader<&T>: BufRead`
+   = note: doesn't satisfy `BufReader<&T>: BufRead`
    |
    = note: the following trait bounds were not satisfied:
            `&T: std::io::Read`
diff --git a/src/test/ui/suggestions/suggest-closure-return-type-1.rs b/tests/ui/suggestions/suggest-closure-return-type-1.rs
index 8bb421903..8bb421903 100644
--- a/src/test/ui/suggestions/suggest-closure-return-type-1.rs
+++ b/tests/ui/suggestions/suggest-closure-return-type-1.rs
diff --git a/src/test/ui/suggestions/suggest-closure-return-type-1.stderr b/tests/ui/suggestions/suggest-closure-return-type-1.stderr
index f4c2eb7ff..f4c2eb7ff 100644
--- a/src/test/ui/suggestions/suggest-closure-return-type-1.stderr
+++ b/tests/ui/suggestions/suggest-closure-return-type-1.stderr
diff --git a/src/test/ui/suggestions/suggest-closure-return-type-2.rs b/tests/ui/suggestions/suggest-closure-return-type-2.rs
index 25ed1882e..25ed1882e 100644
--- a/src/test/ui/suggestions/suggest-closure-return-type-2.rs
+++ b/tests/ui/suggestions/suggest-closure-return-type-2.rs
diff --git a/src/test/ui/suggestions/suggest-closure-return-type-2.stderr b/tests/ui/suggestions/suggest-closure-return-type-2.stderr
index 88bf26304..88bf26304 100644
--- a/src/test/ui/suggestions/suggest-closure-return-type-2.stderr
+++ b/tests/ui/suggestions/suggest-closure-return-type-2.stderr
diff --git a/src/test/ui/suggestions/suggest-closure-return-type-3.rs b/tests/ui/suggestions/suggest-closure-return-type-3.rs
index 3de6c55cf..3de6c55cf 100644
--- a/src/test/ui/suggestions/suggest-closure-return-type-3.rs
+++ b/tests/ui/suggestions/suggest-closure-return-type-3.rs
diff --git a/src/test/ui/suggestions/suggest-closure-return-type-3.stderr b/tests/ui/suggestions/suggest-closure-return-type-3.stderr
index bc4107528..bc4107528 100644
--- a/src/test/ui/suggestions/suggest-closure-return-type-3.stderr
+++ b/tests/ui/suggestions/suggest-closure-return-type-3.stderr
diff --git a/src/test/ui/suggestions/suggest-dereferencing-index.fixed b/tests/ui/suggestions/suggest-dereferencing-index.fixed
index dd4ae4eb1..dd4ae4eb1 100644
--- a/src/test/ui/suggestions/suggest-dereferencing-index.fixed
+++ b/tests/ui/suggestions/suggest-dereferencing-index.fixed
diff --git a/src/test/ui/suggestions/suggest-dereferencing-index.rs b/tests/ui/suggestions/suggest-dereferencing-index.rs
index 82ebacc49..82ebacc49 100644
--- a/src/test/ui/suggestions/suggest-dereferencing-index.rs
+++ b/tests/ui/suggestions/suggest-dereferencing-index.rs
diff --git a/src/test/ui/suggestions/suggest-dereferencing-index.stderr b/tests/ui/suggestions/suggest-dereferencing-index.stderr
index 147dc9234..147dc9234 100644
--- a/src/test/ui/suggestions/suggest-dereferencing-index.stderr
+++ b/tests/ui/suggestions/suggest-dereferencing-index.stderr
diff --git a/src/test/ui/suggestions/suggest-full-enum-variant-for-local-module.rs b/tests/ui/suggestions/suggest-full-enum-variant-for-local-module.rs
index 1dfc07866..1dfc07866 100644
--- a/src/test/ui/suggestions/suggest-full-enum-variant-for-local-module.rs
+++ b/tests/ui/suggestions/suggest-full-enum-variant-for-local-module.rs
diff --git a/src/test/ui/suggestions/suggest-full-enum-variant-for-local-module.stderr b/tests/ui/suggestions/suggest-full-enum-variant-for-local-module.stderr
index 9b6dba7e9..9b6dba7e9 100644
--- a/src/test/ui/suggestions/suggest-full-enum-variant-for-local-module.stderr
+++ b/tests/ui/suggestions/suggest-full-enum-variant-for-local-module.stderr
diff --git a/src/test/ui/suggestions/suggest-imm-mut-trait-implementations.rs b/tests/ui/suggestions/suggest-imm-mut-trait-implementations.rs
index a62669d5b..a62669d5b 100644
--- a/src/test/ui/suggestions/suggest-imm-mut-trait-implementations.rs
+++ b/tests/ui/suggestions/suggest-imm-mut-trait-implementations.rs
diff --git a/src/test/ui/suggestions/suggest-imm-mut-trait-implementations.stderr b/tests/ui/suggestions/suggest-imm-mut-trait-implementations.stderr
index f2eb651ea..f2eb651ea 100644
--- a/src/test/ui/suggestions/suggest-imm-mut-trait-implementations.stderr
+++ b/tests/ui/suggestions/suggest-imm-mut-trait-implementations.stderr
diff --git a/src/test/ui/suggestions/suggest-impl-trait-lifetime.fixed b/tests/ui/suggestions/suggest-impl-trait-lifetime.fixed
index 589ee1a47..589ee1a47 100644
--- a/src/test/ui/suggestions/suggest-impl-trait-lifetime.fixed
+++ b/tests/ui/suggestions/suggest-impl-trait-lifetime.fixed
diff --git a/src/test/ui/suggestions/suggest-impl-trait-lifetime.rs b/tests/ui/suggestions/suggest-impl-trait-lifetime.rs
index 9a87129fb..9a87129fb 100644
--- a/src/test/ui/suggestions/suggest-impl-trait-lifetime.rs
+++ b/tests/ui/suggestions/suggest-impl-trait-lifetime.rs
diff --git a/src/test/ui/suggestions/suggest-impl-trait-lifetime.stderr b/tests/ui/suggestions/suggest-impl-trait-lifetime.stderr
index cf912f4aa..cf912f4aa 100644
--- a/src/test/ui/suggestions/suggest-impl-trait-lifetime.stderr
+++ b/tests/ui/suggestions/suggest-impl-trait-lifetime.stderr
diff --git a/src/test/ui/suggestions/suggest-labels.rs b/tests/ui/suggestions/suggest-labels.rs
index 159f45855..159f45855 100644
--- a/src/test/ui/suggestions/suggest-labels.rs
+++ b/tests/ui/suggestions/suggest-labels.rs
diff --git a/src/test/ui/suggestions/suggest-labels.stderr b/tests/ui/suggestions/suggest-labels.stderr
index aac6515b5..aac6515b5 100644
--- a/src/test/ui/suggestions/suggest-labels.stderr
+++ b/tests/ui/suggestions/suggest-labels.stderr
diff --git a/src/test/ui/suggestions/suggest-let-for-assignment.fixed b/tests/ui/suggestions/suggest-let-for-assignment.fixed
index 3a25e25ee..3a25e25ee 100644
--- a/src/test/ui/suggestions/suggest-let-for-assignment.fixed
+++ b/tests/ui/suggestions/suggest-let-for-assignment.fixed
diff --git a/src/test/ui/suggestions/suggest-let-for-assignment.rs b/tests/ui/suggestions/suggest-let-for-assignment.rs
index 67705fe06..67705fe06 100644
--- a/src/test/ui/suggestions/suggest-let-for-assignment.rs
+++ b/tests/ui/suggestions/suggest-let-for-assignment.rs
diff --git a/src/test/ui/suggestions/suggest-let-for-assignment.stderr b/tests/ui/suggestions/suggest-let-for-assignment.stderr
index 3f6a3da4b..3f6a3da4b 100644
--- a/src/test/ui/suggestions/suggest-let-for-assignment.stderr
+++ b/tests/ui/suggestions/suggest-let-for-assignment.stderr
diff --git a/src/test/ui/suggestions/suggest-methods.rs b/tests/ui/suggestions/suggest-methods.rs
index f40b9ed99..f40b9ed99 100644
--- a/src/test/ui/suggestions/suggest-methods.rs
+++ b/tests/ui/suggestions/suggest-methods.rs
diff --git a/src/test/ui/suggestions/suggest-methods.stderr b/tests/ui/suggestions/suggest-methods.stderr
index 03cb9c779..03cb9c779 100644
--- a/src/test/ui/suggestions/suggest-methods.stderr
+++ b/tests/ui/suggestions/suggest-methods.stderr
diff --git a/src/test/ui/suggestions/suggest-move-lifetimes.rs b/tests/ui/suggestions/suggest-move-lifetimes.rs
index 6b26f1214..6b26f1214 100644
--- a/src/test/ui/suggestions/suggest-move-lifetimes.rs
+++ b/tests/ui/suggestions/suggest-move-lifetimes.rs
diff --git a/src/test/ui/suggestions/suggest-move-lifetimes.stderr b/tests/ui/suggestions/suggest-move-lifetimes.stderr
index b1a49447d..b1a49447d 100644
--- a/src/test/ui/suggestions/suggest-move-lifetimes.stderr
+++ b/tests/ui/suggestions/suggest-move-lifetimes.stderr
diff --git a/src/test/ui/suggestions/suggest-move-types.rs b/tests/ui/suggestions/suggest-move-types.rs
index 27930626a..27930626a 100644
--- a/src/test/ui/suggestions/suggest-move-types.rs
+++ b/tests/ui/suggestions/suggest-move-types.rs
diff --git a/src/test/ui/suggestions/suggest-move-types.stderr b/tests/ui/suggestions/suggest-move-types.stderr
index b222e8142..b222e8142 100644
--- a/src/test/ui/suggestions/suggest-move-types.stderr
+++ b/tests/ui/suggestions/suggest-move-types.stderr
diff --git a/src/test/ui/suggestions/suggest-mut-method-for-loop-hashmap.fixed b/tests/ui/suggestions/suggest-mut-method-for-loop-hashmap.fixed
index b69bad988..b69bad988 100644
--- a/src/test/ui/suggestions/suggest-mut-method-for-loop-hashmap.fixed
+++ b/tests/ui/suggestions/suggest-mut-method-for-loop-hashmap.fixed
diff --git a/src/test/ui/suggestions/suggest-mut-method-for-loop-hashmap.rs b/tests/ui/suggestions/suggest-mut-method-for-loop-hashmap.rs
index 9284410df..9284410df 100644
--- a/src/test/ui/suggestions/suggest-mut-method-for-loop-hashmap.rs
+++ b/tests/ui/suggestions/suggest-mut-method-for-loop-hashmap.rs
diff --git a/src/test/ui/suggestions/suggest-mut-method-for-loop-hashmap.stderr b/tests/ui/suggestions/suggest-mut-method-for-loop-hashmap.stderr
index 74433daa6..74433daa6 100644
--- a/src/test/ui/suggestions/suggest-mut-method-for-loop-hashmap.stderr
+++ b/tests/ui/suggestions/suggest-mut-method-for-loop-hashmap.stderr
diff --git a/src/test/ui/suggestions/suggest-mut-method-for-loop.rs b/tests/ui/suggestions/suggest-mut-method-for-loop.rs
index 756768bce..756768bce 100644
--- a/src/test/ui/suggestions/suggest-mut-method-for-loop.rs
+++ b/tests/ui/suggestions/suggest-mut-method-for-loop.rs
diff --git a/src/test/ui/suggestions/suggest-mut-method-for-loop.stderr b/tests/ui/suggestions/suggest-mut-method-for-loop.stderr
index 3eb9e1031..3eb9e1031 100644
--- a/src/test/ui/suggestions/suggest-mut-method-for-loop.stderr
+++ b/tests/ui/suggestions/suggest-mut-method-for-loop.stderr
diff --git a/src/test/ui/suggestions/suggest-on-bare-closure-call.rs b/tests/ui/suggestions/suggest-on-bare-closure-call.rs
index 496c305bc..496c305bc 100644
--- a/src/test/ui/suggestions/suggest-on-bare-closure-call.rs
+++ b/tests/ui/suggestions/suggest-on-bare-closure-call.rs
diff --git a/src/test/ui/suggestions/suggest-on-bare-closure-call.stderr b/tests/ui/suggestions/suggest-on-bare-closure-call.stderr
index e65a6eb49..e65a6eb49 100644
--- a/src/test/ui/suggestions/suggest-on-bare-closure-call.stderr
+++ b/tests/ui/suggestions/suggest-on-bare-closure-call.stderr
diff --git a/src/test/ui/suggestions/suggest-ref-macro.rs b/tests/ui/suggestions/suggest-ref-macro.rs
index 6f780f32a..6f780f32a 100644
--- a/src/test/ui/suggestions/suggest-ref-macro.rs
+++ b/tests/ui/suggestions/suggest-ref-macro.rs
diff --git a/src/test/ui/suggestions/suggest-ref-macro.stderr b/tests/ui/suggestions/suggest-ref-macro.stderr
index 17de49fbd..17de49fbd 100644
--- a/src/test/ui/suggestions/suggest-ref-macro.stderr
+++ b/tests/ui/suggestions/suggest-ref-macro.stderr
diff --git a/src/test/ui/suggestions/suggest-ref-mut.rs b/tests/ui/suggestions/suggest-ref-mut.rs
index d04113ffc..d04113ffc 100644
--- a/src/test/ui/suggestions/suggest-ref-mut.rs
+++ b/tests/ui/suggestions/suggest-ref-mut.rs
diff --git a/tests/ui/suggestions/suggest-ref-mut.stderr b/tests/ui/suggestions/suggest-ref-mut.stderr
new file mode 100644
index 000000000..7973759bf
--- /dev/null
+++ b/tests/ui/suggestions/suggest-ref-mut.stderr
@@ -0,0 +1,47 @@
+error[E0594]: cannot assign to `self.0`, which is behind a `&` reference
+  --> $DIR/suggest-ref-mut.rs:7:9
+   |
+LL |         self.0 = 32;
+   |         ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn zap(&mut self) {
+   |            ~~~~~~~~~
+
+error[E0594]: cannot assign to `*foo`, which is behind a `&` reference
+  --> $DIR/suggest-ref-mut.rs:16:5
+   |
+LL |     *foo = 32;
+   |     ^^^^^^^^^ `foo` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let ref mut foo = 16;
+   |         ~~~~~~~~~~~
+
+error[E0594]: cannot assign to `*bar`, which is behind a `&` reference
+  --> $DIR/suggest-ref-mut.rs:21:9
+   |
+LL |         *bar = 32;
+   |         ^^^^^^^^^ `bar` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     if let Some(ref mut bar) = Some(16) {
+   |                 ~~~~~~~~~~~
+
+error[E0594]: cannot assign to `*quo`, which is behind a `&` reference
+  --> $DIR/suggest-ref-mut.rs:25:22
+   |
+LL |         ref quo => { *quo = 32; },
+   |                      ^^^^^^^^^ `quo` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |         ref mut quo => { *quo = 32; },
+   |         ~~~~~~~~~~~
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/suggestions/suggest-remove-refs-1.fixed b/tests/ui/suggestions/suggest-remove-refs-1.fixed
index a39e0fbd1..a39e0fbd1 100644
--- a/src/test/ui/suggestions/suggest-remove-refs-1.fixed
+++ b/tests/ui/suggestions/suggest-remove-refs-1.fixed
diff --git a/src/test/ui/suggestions/suggest-remove-refs-1.rs b/tests/ui/suggestions/suggest-remove-refs-1.rs
index 6f767f2c1..6f767f2c1 100644
--- a/src/test/ui/suggestions/suggest-remove-refs-1.rs
+++ b/tests/ui/suggestions/suggest-remove-refs-1.rs
diff --git a/tests/ui/suggestions/suggest-remove-refs-1.stderr b/tests/ui/suggestions/suggest-remove-refs-1.stderr
new file mode 100644
index 000000000..387770535
--- /dev/null
+++ b/tests/ui/suggestions/suggest-remove-refs-1.stderr
@@ -0,0 +1,17 @@
+error[E0277]: `&Enumerate<std::slice::Iter<'_, {integer}>>` is not an iterator
+  --> $DIR/suggest-remove-refs-1.rs:6:19
+   |
+LL |     for (i, _) in &v.iter().enumerate() {
+   |                   ^^^^^^^^^^^^^^^^^^^^^ `&Enumerate<std::slice::Iter<'_, {integer}>>` is not an iterator
+   |
+   = help: the trait `Iterator` is not implemented for `&Enumerate<std::slice::Iter<'_, {integer}>>`
+   = note: required for `&Enumerate<std::slice::Iter<'_, {integer}>>` to implement `IntoIterator`
+help: consider removing the leading `&`-reference
+   |
+LL -     for (i, _) in &v.iter().enumerate() {
+LL +     for (i, _) in v.iter().enumerate() {
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/suggestions/suggest-remove-refs-2.fixed b/tests/ui/suggestions/suggest-remove-refs-2.fixed
index 0f9c3abfe..0f9c3abfe 100644
--- a/src/test/ui/suggestions/suggest-remove-refs-2.fixed
+++ b/tests/ui/suggestions/suggest-remove-refs-2.fixed
diff --git a/src/test/ui/suggestions/suggest-remove-refs-2.rs b/tests/ui/suggestions/suggest-remove-refs-2.rs
index 6c94b12d2..6c94b12d2 100644
--- a/src/test/ui/suggestions/suggest-remove-refs-2.rs
+++ b/tests/ui/suggestions/suggest-remove-refs-2.rs
diff --git a/tests/ui/suggestions/suggest-remove-refs-2.stderr b/tests/ui/suggestions/suggest-remove-refs-2.stderr
new file mode 100644
index 000000000..1632b2abb
--- /dev/null
+++ b/tests/ui/suggestions/suggest-remove-refs-2.stderr
@@ -0,0 +1,17 @@
+error[E0277]: `&&&&&Enumerate<std::slice::Iter<'_, {integer}>>` is not an iterator
+  --> $DIR/suggest-remove-refs-2.rs:6:19
+   |
+LL |     for (i, _) in & & & & &v.iter().enumerate() {
+   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `&&&&&Enumerate<std::slice::Iter<'_, {integer}>>` is not an iterator
+   |
+   = help: the trait `Iterator` is not implemented for `&&&&&Enumerate<std::slice::Iter<'_, {integer}>>`
+   = note: required for `&&&&&Enumerate<std::slice::Iter<'_, {integer}>>` to implement `IntoIterator`
+help: consider removing 5 leading `&`-references
+   |
+LL -     for (i, _) in & & & & &v.iter().enumerate() {
+LL +     for (i, _) in v.iter().enumerate() {
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/suggestions/suggest-remove-refs-3.fixed b/tests/ui/suggestions/suggest-remove-refs-3.fixed
index 3148fcbe5..3148fcbe5 100644
--- a/src/test/ui/suggestions/suggest-remove-refs-3.fixed
+++ b/tests/ui/suggestions/suggest-remove-refs-3.fixed
diff --git a/src/test/ui/suggestions/suggest-remove-refs-3.rs b/tests/ui/suggestions/suggest-remove-refs-3.rs
index 0622adada..0622adada 100644
--- a/src/test/ui/suggestions/suggest-remove-refs-3.rs
+++ b/tests/ui/suggestions/suggest-remove-refs-3.rs
diff --git a/tests/ui/suggestions/suggest-remove-refs-3.stderr b/tests/ui/suggestions/suggest-remove-refs-3.stderr
new file mode 100644
index 000000000..7bf421a77
--- /dev/null
+++ b/tests/ui/suggestions/suggest-remove-refs-3.stderr
@@ -0,0 +1,21 @@
+error[E0277]: `&&&&&Enumerate<std::slice::Iter<'_, {integer}>>` is not an iterator
+  --> $DIR/suggest-remove-refs-3.rs:6:19
+   |
+LL |       for (i, _) in & & &
+   |  ___________________^
+LL | |         & &v
+LL | |         .iter()
+LL | |         .enumerate() {
+   | |____________________^ `&&&&&Enumerate<std::slice::Iter<'_, {integer}>>` is not an iterator
+   |
+   = help: the trait `Iterator` is not implemented for `&&&&&Enumerate<std::slice::Iter<'_, {integer}>>`
+   = note: required for `&&&&&Enumerate<std::slice::Iter<'_, {integer}>>` to implement `IntoIterator`
+help: consider removing 5 leading `&`-references
+   |
+LL -     for (i, _) in & & &
+LL +     for (i, _) in v
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/suggestions/suggest-remove-refs-4.fixed b/tests/ui/suggestions/suggest-remove-refs-4.fixed
new file mode 100644
index 000000000..dd63d2159
--- /dev/null
+++ b/tests/ui/suggestions/suggest-remove-refs-4.fixed
@@ -0,0 +1,5 @@
+// run-rustfix
+fn main() {
+    let foo = [1,2,3].iter();
+    for _i in foo {} //~ ERROR E0277
+}
diff --git a/tests/ui/suggestions/suggest-remove-refs-4.rs b/tests/ui/suggestions/suggest-remove-refs-4.rs
new file mode 100644
index 000000000..3c3d9b1b3
--- /dev/null
+++ b/tests/ui/suggestions/suggest-remove-refs-4.rs
@@ -0,0 +1,5 @@
+// run-rustfix
+fn main() {
+    let foo = &[1,2,3].iter();
+    for _i in &foo {} //~ ERROR E0277
+}
diff --git a/tests/ui/suggestions/suggest-remove-refs-4.stderr b/tests/ui/suggestions/suggest-remove-refs-4.stderr
new file mode 100644
index 000000000..e4ad17e06
--- /dev/null
+++ b/tests/ui/suggestions/suggest-remove-refs-4.stderr
@@ -0,0 +1,17 @@
+error[E0277]: `&&std::slice::Iter<'_, {integer}>` is not an iterator
+  --> $DIR/suggest-remove-refs-4.rs:4:15
+   |
+LL |     for _i in &foo {}
+   |               ^^^^ `&&std::slice::Iter<'_, {integer}>` is not an iterator
+   |
+   = help: the trait `Iterator` is not implemented for `&&std::slice::Iter<'_, {integer}>`
+   = note: required for `&&std::slice::Iter<'_, {integer}>` to implement `IntoIterator`
+help: consider removing 2 leading `&`-references
+   |
+LL ~     let foo = [1,2,3].iter();
+LL ~     for _i in foo {}
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/suggestions/suggest-remove-refs-5.fixed b/tests/ui/suggestions/suggest-remove-refs-5.fixed
new file mode 100644
index 000000000..9f59f9c19
--- /dev/null
+++ b/tests/ui/suggestions/suggest-remove-refs-5.fixed
@@ -0,0 +1,8 @@
+// run-rustfix
+fn main() {
+    let v = &mut Vec::<i32>::new();
+    for _ in v {} //~ ERROR E0277
+
+    let v = &mut [1u8];
+    for _ in v {} //~ ERROR E0277
+}
diff --git a/tests/ui/suggestions/suggest-remove-refs-5.rs b/tests/ui/suggestions/suggest-remove-refs-5.rs
new file mode 100644
index 000000000..d56aa0c9c
--- /dev/null
+++ b/tests/ui/suggestions/suggest-remove-refs-5.rs
@@ -0,0 +1,8 @@
+// run-rustfix
+fn main() {
+    let v = &mut &mut Vec::<i32>::new();
+    for _ in &mut &mut v {} //~ ERROR E0277
+
+    let v = &mut &mut [1u8];
+    for _ in &mut v {} //~ ERROR E0277
+}
diff --git a/tests/ui/suggestions/suggest-remove-refs-5.stderr b/tests/ui/suggestions/suggest-remove-refs-5.stderr
new file mode 100644
index 000000000..7de84d612
--- /dev/null
+++ b/tests/ui/suggestions/suggest-remove-refs-5.stderr
@@ -0,0 +1,37 @@
+error[E0277]: `Vec<i32>` is not an iterator
+  --> $DIR/suggest-remove-refs-5.rs:4:14
+   |
+LL |     for _ in &mut &mut v {}
+   |              ^^^^^^^^^^^ `Vec<i32>` is not an iterator; try calling `.into_iter()` or `.iter()`
+   |
+   = help: the trait `Iterator` is not implemented for `Vec<i32>`
+   = note: required for `&mut Vec<i32>` to implement `Iterator`
+   = note: 3 redundant requirements hidden
+   = note: required for `&mut &mut &mut &mut Vec<i32>` to implement `Iterator`
+   = note: required for `&mut &mut &mut &mut Vec<i32>` to implement `IntoIterator`
+help: consider removing 3 leading `&`-references
+   |
+LL ~     let v = &mut Vec::<i32>::new();
+LL ~     for _ in v {}
+   |
+
+error[E0277]: `[u8; 1]` is not an iterator
+  --> $DIR/suggest-remove-refs-5.rs:7:14
+   |
+LL |     for _ in &mut v {}
+   |              ^^^^^^ `[u8; 1]` is not an iterator; try calling `.into_iter()` or `.iter()`
+   |
+   = help: the trait `Iterator` is not implemented for `[u8; 1]`
+   = note: required for `&mut [u8; 1]` to implement `Iterator`
+   = note: 2 redundant requirements hidden
+   = note: required for `&mut &mut &mut [u8; 1]` to implement `Iterator`
+   = note: required for `&mut &mut &mut [u8; 1]` to implement `IntoIterator`
+help: consider removing 2 leading `&`-references
+   |
+LL ~     let v = &mut [1u8];
+LL ~     for _ in v {}
+   |
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/suggestions/suggest-semicolon-for-fn-in-extern-block.fixed b/tests/ui/suggestions/suggest-semicolon-for-fn-in-extern-block.fixed
index 5c55566ff..5c55566ff 100644
--- a/src/test/ui/suggestions/suggest-semicolon-for-fn-in-extern-block.fixed
+++ b/tests/ui/suggestions/suggest-semicolon-for-fn-in-extern-block.fixed
diff --git a/src/test/ui/suggestions/suggest-semicolon-for-fn-in-extern-block.rs b/tests/ui/suggestions/suggest-semicolon-for-fn-in-extern-block.rs
index 91971cba3..91971cba3 100644
--- a/src/test/ui/suggestions/suggest-semicolon-for-fn-in-extern-block.rs
+++ b/tests/ui/suggestions/suggest-semicolon-for-fn-in-extern-block.rs
diff --git a/src/test/ui/suggestions/suggest-semicolon-for-fn-in-extern-block.stderr b/tests/ui/suggestions/suggest-semicolon-for-fn-in-extern-block.stderr
index c5df72c4a..c5df72c4a 100644
--- a/src/test/ui/suggestions/suggest-semicolon-for-fn-in-extern-block.stderr
+++ b/tests/ui/suggestions/suggest-semicolon-for-fn-in-extern-block.stderr
diff --git a/src/test/ui/suggestions/suggest-split-at-mut.rs b/tests/ui/suggestions/suggest-split-at-mut.rs
index d294c20b8..d294c20b8 100644
--- a/src/test/ui/suggestions/suggest-split-at-mut.rs
+++ b/tests/ui/suggestions/suggest-split-at-mut.rs
diff --git a/src/test/ui/suggestions/suggest-split-at-mut.stderr b/tests/ui/suggestions/suggest-split-at-mut.stderr
index 330f012b2..330f012b2 100644
--- a/src/test/ui/suggestions/suggest-split-at-mut.stderr
+++ b/tests/ui/suggestions/suggest-split-at-mut.stderr
diff --git a/src/test/ui/suggestions/suggest-std-when-using-type.fixed b/tests/ui/suggestions/suggest-std-when-using-type.fixed
index 102c5c186..102c5c186 100644
--- a/src/test/ui/suggestions/suggest-std-when-using-type.fixed
+++ b/tests/ui/suggestions/suggest-std-when-using-type.fixed
diff --git a/src/test/ui/suggestions/suggest-std-when-using-type.rs b/tests/ui/suggestions/suggest-std-when-using-type.rs
index 5abc016de..5abc016de 100644
--- a/src/test/ui/suggestions/suggest-std-when-using-type.rs
+++ b/tests/ui/suggestions/suggest-std-when-using-type.rs
diff --git a/src/test/ui/suggestions/suggest-std-when-using-type.stderr b/tests/ui/suggestions/suggest-std-when-using-type.stderr
index 6f890b87b..6f890b87b 100644
--- a/src/test/ui/suggestions/suggest-std-when-using-type.stderr
+++ b/tests/ui/suggestions/suggest-std-when-using-type.stderr
diff --git a/src/test/ui/suggestions/suggest-swapping-self-ty-and-trait-edition-2021.rs b/tests/ui/suggestions/suggest-swapping-self-ty-and-trait-edition-2021.rs
index 03c7ed347..03c7ed347 100644
--- a/src/test/ui/suggestions/suggest-swapping-self-ty-and-trait-edition-2021.rs
+++ b/tests/ui/suggestions/suggest-swapping-self-ty-and-trait-edition-2021.rs
diff --git a/src/test/ui/suggestions/suggest-swapping-self-ty-and-trait-edition-2021.stderr b/tests/ui/suggestions/suggest-swapping-self-ty-and-trait-edition-2021.stderr
index 87e716436..87e716436 100644
--- a/src/test/ui/suggestions/suggest-swapping-self-ty-and-trait-edition-2021.stderr
+++ b/tests/ui/suggestions/suggest-swapping-self-ty-and-trait-edition-2021.stderr
diff --git a/src/test/ui/suggestions/suggest-swapping-self-ty-and-trait.rs b/tests/ui/suggestions/suggest-swapping-self-ty-and-trait.rs
index 947bc2c79..947bc2c79 100644
--- a/src/test/ui/suggestions/suggest-swapping-self-ty-and-trait.rs
+++ b/tests/ui/suggestions/suggest-swapping-self-ty-and-trait.rs
diff --git a/src/test/ui/suggestions/suggest-swapping-self-ty-and-trait.stderr b/tests/ui/suggestions/suggest-swapping-self-ty-and-trait.stderr
index ffd505fff..ffd505fff 100644
--- a/src/test/ui/suggestions/suggest-swapping-self-ty-and-trait.stderr
+++ b/tests/ui/suggestions/suggest-swapping-self-ty-and-trait.stderr
diff --git a/src/test/ui/suggestions/suggest-trait-items.rs b/tests/ui/suggestions/suggest-trait-items.rs
index 9d42a7342..9d42a7342 100644
--- a/src/test/ui/suggestions/suggest-trait-items.rs
+++ b/tests/ui/suggestions/suggest-trait-items.rs
diff --git a/src/test/ui/suggestions/suggest-trait-items.stderr b/tests/ui/suggestions/suggest-trait-items.stderr
index 8bc3df7b8..8bc3df7b8 100644
--- a/src/test/ui/suggestions/suggest-trait-items.stderr
+++ b/tests/ui/suggestions/suggest-trait-items.stderr
diff --git a/src/test/ui/suggestions/suggest-tryinto-edition-change.rs b/tests/ui/suggestions/suggest-tryinto-edition-change.rs
index 70c4b210d..70c4b210d 100644
--- a/src/test/ui/suggestions/suggest-tryinto-edition-change.rs
+++ b/tests/ui/suggestions/suggest-tryinto-edition-change.rs
diff --git a/src/test/ui/suggestions/suggest-tryinto-edition-change.stderr b/tests/ui/suggestions/suggest-tryinto-edition-change.stderr
index 3d1f24923..018083f9e 100644
--- a/src/test/ui/suggestions/suggest-tryinto-edition-change.stderr
+++ b/tests/ui/suggestions/suggest-tryinto-edition-change.stderr
@@ -52,11 +52,9 @@ error[E0599]: no method named `try_into` found for type `i32` in the current sco
    |
 LL |     let _i: i16 = 0_i32.try_into().unwrap();
    |                         ^^^^^^^^ method not found in `i32`
+  --> $SRC_DIR/core/src/convert/mod.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/convert/mod.rs:LL:COL
-   |
-LL |     fn try_into(self) -> Result<T, Self::Error>;
-   |        -------- the method is available for `i32` here
+   = note: the method is available for `i32` here
    |
    = help: items from traits can only be used if the trait is in scope
    = note: 'std::convert::TryInto' is included in the prelude starting in Edition 2021
diff --git a/src/test/ui/suggestions/suggest-using-chars.rs b/tests/ui/suggestions/suggest-using-chars.rs
index 95732881b..95732881b 100644
--- a/src/test/ui/suggestions/suggest-using-chars.rs
+++ b/tests/ui/suggestions/suggest-using-chars.rs
diff --git a/src/test/ui/suggestions/suggest-using-chars.stderr b/tests/ui/suggestions/suggest-using-chars.stderr
index 99bcfb08a..99bcfb08a 100644
--- a/src/test/ui/suggestions/suggest-using-chars.stderr
+++ b/tests/ui/suggestions/suggest-using-chars.stderr
diff --git a/src/test/ui/suggestions/suggest-variants.rs b/tests/ui/suggestions/suggest-variants.rs
index dd05d0f04..dd05d0f04 100644
--- a/src/test/ui/suggestions/suggest-variants.rs
+++ b/tests/ui/suggestions/suggest-variants.rs
diff --git a/src/test/ui/suggestions/suggest-variants.stderr b/tests/ui/suggestions/suggest-variants.stderr
index a422bc656..a422bc656 100644
--- a/src/test/ui/suggestions/suggest-variants.stderr
+++ b/tests/ui/suggestions/suggest-variants.stderr
diff --git a/src/test/ui/suggestions/suggest_print_over_printf.rs b/tests/ui/suggestions/suggest_print_over_printf.rs
index 124ddec50..124ddec50 100644
--- a/src/test/ui/suggestions/suggest_print_over_printf.rs
+++ b/tests/ui/suggestions/suggest_print_over_printf.rs
diff --git a/src/test/ui/suggestions/suggest_print_over_printf.stderr b/tests/ui/suggestions/suggest_print_over_printf.stderr
index 1214bec16..1214bec16 100644
--- a/src/test/ui/suggestions/suggest_print_over_printf.stderr
+++ b/tests/ui/suggestions/suggest_print_over_printf.stderr
diff --git a/src/test/ui/suggestions/too-many-field-suggestions.rs b/tests/ui/suggestions/too-many-field-suggestions.rs
index 905f9502c..905f9502c 100644
--- a/src/test/ui/suggestions/too-many-field-suggestions.rs
+++ b/tests/ui/suggestions/too-many-field-suggestions.rs
diff --git a/src/test/ui/suggestions/too-many-field-suggestions.stderr b/tests/ui/suggestions/too-many-field-suggestions.stderr
index 63ad6fdb1..63ad6fdb1 100644
--- a/src/test/ui/suggestions/too-many-field-suggestions.stderr
+++ b/tests/ui/suggestions/too-many-field-suggestions.stderr
diff --git a/src/test/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.fixed b/tests/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.fixed
index 8ef7e34ab..8ef7e34ab 100644
--- a/src/test/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.fixed
+++ b/tests/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.fixed
diff --git a/src/test/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.rs b/tests/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.rs
index 7bd38d0d4..7bd38d0d4 100644
--- a/src/test/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.rs
+++ b/tests/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.rs
diff --git a/src/test/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.stderr b/tests/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.stderr
index ac839ff7e..ac839ff7e 100644
--- a/src/test/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.stderr
+++ b/tests/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.stderr
diff --git a/src/test/ui/suggestions/trait-with-missing-associated-type-restriction.rs b/tests/ui/suggestions/trait-with-missing-associated-type-restriction.rs
index 0d90e4495..0d90e4495 100644
--- a/src/test/ui/suggestions/trait-with-missing-associated-type-restriction.rs
+++ b/tests/ui/suggestions/trait-with-missing-associated-type-restriction.rs
diff --git a/src/test/ui/suggestions/trait-with-missing-associated-type-restriction.stderr b/tests/ui/suggestions/trait-with-missing-associated-type-restriction.stderr
index 7583c875a..f520d88c6 100644
--- a/src/test/ui/suggestions/trait-with-missing-associated-type-restriction.stderr
+++ b/tests/ui/suggestions/trait-with-missing-associated-type-restriction.stderr
@@ -78,7 +78,7 @@ error[E0308]: mismatched types
 LL |     x.funk(3);
    |       ---- ^ expected associated type, found integer
    |       |
-   |       arguments to this function are incorrect
+   |       arguments to this method are incorrect
    |
    = note: expected associated type `<T as Trait<i32>>::A`
                          found type `{integer}`
diff --git a/src/test/ui/suggestions/try-operator-dont-suggest-semicolon.rs b/tests/ui/suggestions/try-operator-dont-suggest-semicolon.rs
index f882a159f..f882a159f 100644
--- a/src/test/ui/suggestions/try-operator-dont-suggest-semicolon.rs
+++ b/tests/ui/suggestions/try-operator-dont-suggest-semicolon.rs
diff --git a/src/test/ui/suggestions/try-operator-dont-suggest-semicolon.stderr b/tests/ui/suggestions/try-operator-dont-suggest-semicolon.stderr
index 939285498..939285498 100644
--- a/src/test/ui/suggestions/try-operator-dont-suggest-semicolon.stderr
+++ b/tests/ui/suggestions/try-operator-dont-suggest-semicolon.stderr
diff --git a/src/test/ui/suggestions/try-removing-the-field.rs b/tests/ui/suggestions/try-removing-the-field.rs
index 1b7289b22..1b7289b22 100644
--- a/src/test/ui/suggestions/try-removing-the-field.rs
+++ b/tests/ui/suggestions/try-removing-the-field.rs
diff --git a/src/test/ui/suggestions/try-removing-the-field.stderr b/tests/ui/suggestions/try-removing-the-field.stderr
index 7a6013d4a..7a6013d4a 100644
--- a/src/test/ui/suggestions/try-removing-the-field.stderr
+++ b/tests/ui/suggestions/try-removing-the-field.stderr
diff --git a/src/test/ui/suggestions/type-ascription-and-other-error.rs b/tests/ui/suggestions/type-ascription-and-other-error.rs
index 99ab2f3c8..99ab2f3c8 100644
--- a/src/test/ui/suggestions/type-ascription-and-other-error.rs
+++ b/tests/ui/suggestions/type-ascription-and-other-error.rs
diff --git a/src/test/ui/suggestions/type-ascription-and-other-error.stderr b/tests/ui/suggestions/type-ascription-and-other-error.stderr
index eadf634bb..eadf634bb 100644
--- a/src/test/ui/suggestions/type-ascription-and-other-error.stderr
+++ b/tests/ui/suggestions/type-ascription-and-other-error.stderr
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-let.rs b/tests/ui/suggestions/type-ascription-instead-of-let.rs
index 0e1c30750..0e1c30750 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-let.rs
+++ b/tests/ui/suggestions/type-ascription-instead-of-let.rs
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-let.stderr b/tests/ui/suggestions/type-ascription-instead-of-let.stderr
index 92e4b5798..92e4b5798 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-let.stderr
+++ b/tests/ui/suggestions/type-ascription-instead-of-let.stderr
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-method.fixed b/tests/ui/suggestions/type-ascription-instead-of-method.fixed
index 56b740b0d..56b740b0d 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-method.fixed
+++ b/tests/ui/suggestions/type-ascription-instead-of-method.fixed
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-method.rs b/tests/ui/suggestions/type-ascription-instead-of-method.rs
index a603e09e7..a603e09e7 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-method.rs
+++ b/tests/ui/suggestions/type-ascription-instead-of-method.rs
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-method.stderr b/tests/ui/suggestions/type-ascription-instead-of-method.stderr
index 83bc33f41..83bc33f41 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-method.stderr
+++ b/tests/ui/suggestions/type-ascription-instead-of-method.stderr
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-path-2.fixed b/tests/ui/suggestions/type-ascription-instead-of-path-2.fixed
index 787fcc120..787fcc120 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-path-2.fixed
+++ b/tests/ui/suggestions/type-ascription-instead-of-path-2.fixed
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-path-2.rs b/tests/ui/suggestions/type-ascription-instead-of-path-2.rs
index 934016b3b..934016b3b 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-path-2.rs
+++ b/tests/ui/suggestions/type-ascription-instead-of-path-2.rs
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-path-2.stderr b/tests/ui/suggestions/type-ascription-instead-of-path-2.stderr
index 970b220b7..970b220b7 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-path-2.stderr
+++ b/tests/ui/suggestions/type-ascription-instead-of-path-2.stderr
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-path-in-type.rs b/tests/ui/suggestions/type-ascription-instead-of-path-in-type.rs
index 48d19f6dd..48d19f6dd 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-path-in-type.rs
+++ b/tests/ui/suggestions/type-ascription-instead-of-path-in-type.rs
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-path-in-type.stderr b/tests/ui/suggestions/type-ascription-instead-of-path-in-type.stderr
index 951ff23d6..fcff02e09 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-path-in-type.stderr
+++ b/tests/ui/suggestions/type-ascription-instead-of-path-in-type.stderr
@@ -24,11 +24,6 @@ error[E0107]: this struct takes at least 1 generic argument but 0 generic argume
 LL |     let _: Vec<A:B> = A::B;
    |            ^^^ expected at least 1 generic argument
    |
-note: struct defined here, with at least 1 generic parameter: `T`
-  --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-   |
-LL | pub struct Vec<T, #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global> {
-   |            ^^^ -
 help: add missing generic argument
    |
 LL |     let _: Vec<T, A:B> = A::B;
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-path.rs b/tests/ui/suggestions/type-ascription-instead-of-path.rs
index ce40b55f1..ce40b55f1 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-path.rs
+++ b/tests/ui/suggestions/type-ascription-instead-of-path.rs
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-path.stderr b/tests/ui/suggestions/type-ascription-instead-of-path.stderr
index 518660cfa..518660cfa 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-path.stderr
+++ b/tests/ui/suggestions/type-ascription-instead-of-path.stderr
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-variant.fixed b/tests/ui/suggestions/type-ascription-instead-of-variant.fixed
index b3247e128..b3247e128 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-variant.fixed
+++ b/tests/ui/suggestions/type-ascription-instead-of-variant.fixed
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-variant.rs b/tests/ui/suggestions/type-ascription-instead-of-variant.rs
index 6fd2c1954..6fd2c1954 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-variant.rs
+++ b/tests/ui/suggestions/type-ascription-instead-of-variant.rs
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-variant.stderr b/tests/ui/suggestions/type-ascription-instead-of-variant.stderr
index f59ba78d4..f59ba78d4 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-variant.stderr
+++ b/tests/ui/suggestions/type-ascription-instead-of-variant.stderr
diff --git a/tests/ui/suggestions/type-mismatch-byte-literal.rs b/tests/ui/suggestions/type-mismatch-byte-literal.rs
new file mode 100644
index 000000000..34199f8c3
--- /dev/null
+++ b/tests/ui/suggestions/type-mismatch-byte-literal.rs
@@ -0,0 +1,18 @@
+// Tests that a suggestion is issued for type mismatch errors when a
+// u8 is expected and a char literal which is ASCII is supplied.
+
+fn foo(_t: u8) {}
+
+fn main() {
+    let _x: u8 = 'X';
+    //~^ ERROR: mismatched types [E0308]
+    //~| HELP: if you meant to write a byte literal, prefix with `b`
+
+    foo('#');
+    //~^ ERROR: mismatched types [E0308]
+    //~| HELP: if you meant to write a byte literal, prefix with `b`
+
+    // Do not issue the suggestion if the char literal isn't ASCII
+    let _t: u8 = '€';
+    //~^ ERROR: mismatched types [E0308]
+}
diff --git a/tests/ui/suggestions/type-mismatch-byte-literal.stderr b/tests/ui/suggestions/type-mismatch-byte-literal.stderr
new file mode 100644
index 000000000..c9c2e7498
--- /dev/null
+++ b/tests/ui/suggestions/type-mismatch-byte-literal.stderr
@@ -0,0 +1,42 @@
+error[E0308]: mismatched types
+  --> $DIR/type-mismatch-byte-literal.rs:7:18
+   |
+LL |     let _x: u8 = 'X';
+   |             --   ^^^ expected `u8`, found `char`
+   |             |
+   |             expected due to this
+   |
+help: if you meant to write a byte literal, prefix with `b`
+   |
+LL |     let _x: u8 = b'X';
+   |                  ~~~~
+
+error[E0308]: mismatched types
+  --> $DIR/type-mismatch-byte-literal.rs:11:9
+   |
+LL |     foo('#');
+   |     --- ^^^ expected `u8`, found `char`
+   |     |
+   |     arguments to this function are incorrect
+   |
+note: function defined here
+  --> $DIR/type-mismatch-byte-literal.rs:4:4
+   |
+LL | fn foo(_t: u8) {}
+   |    ^^^ ------
+help: if you meant to write a byte literal, prefix with `b`
+   |
+LL |     foo(b'#');
+   |         ~~~~
+
+error[E0308]: mismatched types
+  --> $DIR/type-mismatch-byte-literal.rs:16:18
+   |
+LL |     let _t: u8 = '€';
+   |             --   ^^^ expected `u8`, found `char`
+   |             |
+   |             expected due to this
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/type-mismatch-struct-field-shorthand-2.rs b/tests/ui/suggestions/type-mismatch-struct-field-shorthand-2.rs
index 2ce122207..2ce122207 100644
--- a/src/test/ui/suggestions/type-mismatch-struct-field-shorthand-2.rs
+++ b/tests/ui/suggestions/type-mismatch-struct-field-shorthand-2.rs
diff --git a/src/test/ui/suggestions/type-mismatch-struct-field-shorthand-2.stderr b/tests/ui/suggestions/type-mismatch-struct-field-shorthand-2.stderr
index 12466868f..12466868f 100644
--- a/src/test/ui/suggestions/type-mismatch-struct-field-shorthand-2.stderr
+++ b/tests/ui/suggestions/type-mismatch-struct-field-shorthand-2.stderr
diff --git a/src/test/ui/suggestions/type-mismatch-struct-field-shorthand.fixed b/tests/ui/suggestions/type-mismatch-struct-field-shorthand.fixed
index 91758c0b2..91758c0b2 100644
--- a/src/test/ui/suggestions/type-mismatch-struct-field-shorthand.fixed
+++ b/tests/ui/suggestions/type-mismatch-struct-field-shorthand.fixed
diff --git a/src/test/ui/suggestions/type-mismatch-struct-field-shorthand.rs b/tests/ui/suggestions/type-mismatch-struct-field-shorthand.rs
index 9d3a17a72..9d3a17a72 100644
--- a/src/test/ui/suggestions/type-mismatch-struct-field-shorthand.rs
+++ b/tests/ui/suggestions/type-mismatch-struct-field-shorthand.rs
diff --git a/src/test/ui/suggestions/type-mismatch-struct-field-shorthand.stderr b/tests/ui/suggestions/type-mismatch-struct-field-shorthand.stderr
index 72c84d167..72c84d167 100644
--- a/src/test/ui/suggestions/type-mismatch-struct-field-shorthand.stderr
+++ b/tests/ui/suggestions/type-mismatch-struct-field-shorthand.stderr
diff --git a/src/test/ui/suggestions/type-not-found-in-adt-field.rs b/tests/ui/suggestions/type-not-found-in-adt-field.rs
index 4cbfe58d3..4cbfe58d3 100644
--- a/src/test/ui/suggestions/type-not-found-in-adt-field.rs
+++ b/tests/ui/suggestions/type-not-found-in-adt-field.rs
diff --git a/src/test/ui/suggestions/type-not-found-in-adt-field.stderr b/tests/ui/suggestions/type-not-found-in-adt-field.stderr
index e990fb5ba..934ba87bb 100644
--- a/src/test/ui/suggestions/type-not-found-in-adt-field.stderr
+++ b/tests/ui/suggestions/type-not-found-in-adt-field.stderr
@@ -7,10 +7,13 @@ LL |     m: Vec<Someunknownname<String, ()>>,
 error[E0412]: cannot find type `K` in this scope
   --> $DIR/type-not-found-in-adt-field.rs:6:8
    |
-LL | struct OtherStruct {
-   |                   - help: you might be missing a type parameter: `<K>`
 LL |     m: K,
    |        ^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+LL | struct OtherStruct<K> {
+   |                   +++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/suggestions/undeclared-module-alloc.rs b/tests/ui/suggestions/undeclared-module-alloc.rs
index 1defa1cef..1defa1cef 100644
--- a/src/test/ui/suggestions/undeclared-module-alloc.rs
+++ b/tests/ui/suggestions/undeclared-module-alloc.rs
diff --git a/src/test/ui/suggestions/undeclared-module-alloc.stderr b/tests/ui/suggestions/undeclared-module-alloc.stderr
index 39169dfa9..39169dfa9 100644
--- a/src/test/ui/suggestions/undeclared-module-alloc.stderr
+++ b/tests/ui/suggestions/undeclared-module-alloc.stderr
diff --git a/src/test/ui/suggestions/unnamable-types.rs b/tests/ui/suggestions/unnamable-types.rs
index f2485041d..f2485041d 100644
--- a/src/test/ui/suggestions/unnamable-types.rs
+++ b/tests/ui/suggestions/unnamable-types.rs
diff --git a/src/test/ui/suggestions/unnamable-types.stderr b/tests/ui/suggestions/unnamable-types.stderr
index ede3ebfa7..24bedb529 100644
--- a/src/test/ui/suggestions/unnamable-types.stderr
+++ b/tests/ui/suggestions/unnamable-types.stderr
@@ -19,7 +19,7 @@ error[E0121]: the placeholder `_` is not allowed within types on item signatures
 LL | const C: _ = || 42;
    |          ^ not allowed in type signatures
    |
-note: however, the inferred type `[closure@$DIR/unnamable-types.rs:17:14: 17:16]` cannot be named
+note: however, the inferred type `[closure@unnamable-types.rs:17:14]` cannot be named
   --> $DIR/unnamable-types.rs:17:14
    |
 LL | const C: _ = || 42;
@@ -31,7 +31,7 @@ error: missing type for `const` item
 LL | const D = S { t: { let i = 0; move || -> i32 { i } } };
    |        ^
    |
-note: however, the inferred type `S<[closure@$DIR/unnamable-types.rs:23:31: 23:45]>` cannot be named
+note: however, the inferred type `S<[closure@unnamable-types.rs:23:31]>` cannot be named
   --> $DIR/unnamable-types.rs:23:11
    |
 LL | const D = S { t: { let i = 0; move || -> i32 { i } } };
diff --git a/src/test/ui/suggestions/unnecessary_dot_for_floating_point_literal.rs b/tests/ui/suggestions/unnecessary_dot_for_floating_point_literal.rs
index c1a944562..c1a944562 100644
--- a/src/test/ui/suggestions/unnecessary_dot_for_floating_point_literal.rs
+++ b/tests/ui/suggestions/unnecessary_dot_for_floating_point_literal.rs
diff --git a/src/test/ui/suggestions/unnecessary_dot_for_floating_point_literal.stderr b/tests/ui/suggestions/unnecessary_dot_for_floating_point_literal.stderr
index 773f1392a..34eaa8322 100644
--- a/src/test/ui/suggestions/unnecessary_dot_for_floating_point_literal.stderr
+++ b/tests/ui/suggestions/unnecessary_dot_for_floating_point_literal.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/unnecessary_dot_for_floating_point_literal.rs:2:18
    |
 LL |     let _: f64 = 0..10;
-   |            ---   ^^^^^ expected `f64`, found struct `std::ops::Range`
+   |            ---   ^^^^^ expected `f64`, found struct `Range`
    |            |
    |            expected due to this
    |
@@ -47,7 +47,7 @@ error[E0308]: mismatched types
   --> $DIR/unnecessary_dot_for_floating_point_literal.rs:5:18
    |
 LL |     let _: f64 = std::ops::Range { start: 0, end: 1 };
-   |            ---   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `f64`, found struct `std::ops::Range`
+   |            ---   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `f64`, found struct `Range`
    |            |
    |            expected due to this
    |
diff --git a/src/test/ui/suggestions/unsized-function-parameter.fixed b/tests/ui/suggestions/unsized-function-parameter.fixed
index 18e93cb96..18e93cb96 100644
--- a/src/test/ui/suggestions/unsized-function-parameter.fixed
+++ b/tests/ui/suggestions/unsized-function-parameter.fixed
diff --git a/src/test/ui/suggestions/unsized-function-parameter.rs b/tests/ui/suggestions/unsized-function-parameter.rs
index 344ee71c1..344ee71c1 100644
--- a/src/test/ui/suggestions/unsized-function-parameter.rs
+++ b/tests/ui/suggestions/unsized-function-parameter.rs
diff --git a/src/test/ui/suggestions/unsized-function-parameter.stderr b/tests/ui/suggestions/unsized-function-parameter.stderr
index 55d8d1ab1..55d8d1ab1 100644
--- a/src/test/ui/suggestions/unsized-function-parameter.stderr
+++ b/tests/ui/suggestions/unsized-function-parameter.stderr
diff --git a/src/test/ui/suggestions/unused-closure-argument.rs b/tests/ui/suggestions/unused-closure-argument.rs
index 677003ebf..677003ebf 100644
--- a/src/test/ui/suggestions/unused-closure-argument.rs
+++ b/tests/ui/suggestions/unused-closure-argument.rs
diff --git a/src/test/ui/suggestions/unused-closure-argument.stderr b/tests/ui/suggestions/unused-closure-argument.stderr
index 55195ce50..55195ce50 100644
--- a/src/test/ui/suggestions/unused-closure-argument.stderr
+++ b/tests/ui/suggestions/unused-closure-argument.stderr
diff --git a/src/test/ui/suggestions/use-placement-resolve.fixed b/tests/ui/suggestions/use-placement-resolve.fixed
index afe74cff2..afe74cff2 100644
--- a/src/test/ui/suggestions/use-placement-resolve.fixed
+++ b/tests/ui/suggestions/use-placement-resolve.fixed
diff --git a/src/test/ui/suggestions/use-placement-resolve.rs b/tests/ui/suggestions/use-placement-resolve.rs
index b30ddb3af..b30ddb3af 100644
--- a/src/test/ui/suggestions/use-placement-resolve.rs
+++ b/tests/ui/suggestions/use-placement-resolve.rs
diff --git a/src/test/ui/suggestions/use-placement-resolve.stderr b/tests/ui/suggestions/use-placement-resolve.stderr
index 9da9e8e27..9da9e8e27 100644
--- a/src/test/ui/suggestions/use-placement-resolve.stderr
+++ b/tests/ui/suggestions/use-placement-resolve.stderr
diff --git a/src/test/ui/suggestions/use-placement-typeck.fixed b/tests/ui/suggestions/use-placement-typeck.fixed
index 37335da06..37335da06 100644
--- a/src/test/ui/suggestions/use-placement-typeck.fixed
+++ b/tests/ui/suggestions/use-placement-typeck.fixed
diff --git a/src/test/ui/suggestions/use-placement-typeck.rs b/tests/ui/suggestions/use-placement-typeck.rs
index aab20d2e9..aab20d2e9 100644
--- a/src/test/ui/suggestions/use-placement-typeck.rs
+++ b/tests/ui/suggestions/use-placement-typeck.rs
diff --git a/src/test/ui/suggestions/use-placement-typeck.stderr b/tests/ui/suggestions/use-placement-typeck.stderr
index 3b2749773..3b2749773 100644
--- a/src/test/ui/suggestions/use-placement-typeck.stderr
+++ b/tests/ui/suggestions/use-placement-typeck.stderr
diff --git a/src/test/ui/suggestions/use-type-argument-instead-of-assoc-type.rs b/tests/ui/suggestions/use-type-argument-instead-of-assoc-type.rs
index 8b6e8cfd7..8b6e8cfd7 100644
--- a/src/test/ui/suggestions/use-type-argument-instead-of-assoc-type.rs
+++ b/tests/ui/suggestions/use-type-argument-instead-of-assoc-type.rs
diff --git a/src/test/ui/suggestions/use-type-argument-instead-of-assoc-type.stderr b/tests/ui/suggestions/use-type-argument-instead-of-assoc-type.stderr
index 75b919232..75b919232 100644
--- a/src/test/ui/suggestions/use-type-argument-instead-of-assoc-type.stderr
+++ b/tests/ui/suggestions/use-type-argument-instead-of-assoc-type.stderr
diff --git a/src/test/ui/suggestions/while-let-typo.rs b/tests/ui/suggestions/while-let-typo.rs
index dbbcdee3c..dbbcdee3c 100644
--- a/src/test/ui/suggestions/while-let-typo.rs
+++ b/tests/ui/suggestions/while-let-typo.rs
diff --git a/src/test/ui/suggestions/while-let-typo.stderr b/tests/ui/suggestions/while-let-typo.stderr
index 7cc2ed314..7cc2ed314 100644
--- a/src/test/ui/suggestions/while-let-typo.stderr
+++ b/tests/ui/suggestions/while-let-typo.stderr
diff --git a/src/test/ui/super-at-top-level.rs b/tests/ui/super-at-top-level.rs
index e4d587bc9..e4d587bc9 100644
--- a/src/test/ui/super-at-top-level.rs
+++ b/tests/ui/super-at-top-level.rs
diff --git a/src/test/ui/super-at-top-level.stderr b/tests/ui/super-at-top-level.stderr
index 23613df67..23613df67 100644
--- a/src/test/ui/super-at-top-level.stderr
+++ b/tests/ui/super-at-top-level.stderr
diff --git a/src/test/ui/super-fast-paren-parsing.rs b/tests/ui/super-fast-paren-parsing.rs
index cb42ff2c6..cb42ff2c6 100644
--- a/src/test/ui/super-fast-paren-parsing.rs
+++ b/tests/ui/super-fast-paren-parsing.rs
diff --git a/src/test/ui/super.rs b/tests/ui/super.rs
index 86c720288..86c720288 100644
--- a/src/test/ui/super.rs
+++ b/tests/ui/super.rs
diff --git a/src/test/ui/suppressed-error.rs b/tests/ui/suppressed-error.rs
index 256ec1713..256ec1713 100644
--- a/src/test/ui/suppressed-error.rs
+++ b/tests/ui/suppressed-error.rs
diff --git a/src/test/ui/suppressed-error.stderr b/tests/ui/suppressed-error.stderr
index c2874ae9a..c2874ae9a 100644
--- a/src/test/ui/suppressed-error.stderr
+++ b/tests/ui/suppressed-error.stderr
diff --git a/src/test/ui/svh-add-nothing.rs b/tests/ui/svh-add-nothing.rs
index d7d037f0b..d7d037f0b 100644
--- a/src/test/ui/svh-add-nothing.rs
+++ b/tests/ui/svh-add-nothing.rs
diff --git a/src/test/ui/svh/auxiliary/changing-crates-a1.rs b/tests/ui/svh/auxiliary/changing-crates-a1.rs
index bc0559b8b..bc0559b8b 100644
--- a/src/test/ui/svh/auxiliary/changing-crates-a1.rs
+++ b/tests/ui/svh/auxiliary/changing-crates-a1.rs
diff --git a/src/test/ui/svh/auxiliary/changing-crates-a2.rs b/tests/ui/svh/auxiliary/changing-crates-a2.rs
index fafc6d5b1..fafc6d5b1 100644
--- a/src/test/ui/svh/auxiliary/changing-crates-a2.rs
+++ b/tests/ui/svh/auxiliary/changing-crates-a2.rs
diff --git a/src/test/ui/svh/auxiliary/changing-crates-b.rs b/tests/ui/svh/auxiliary/changing-crates-b.rs
index f9ce29e4c..f9ce29e4c 100644
--- a/src/test/ui/svh/auxiliary/changing-crates-b.rs
+++ b/tests/ui/svh/auxiliary/changing-crates-b.rs
diff --git a/src/test/ui/svh/auxiliary/svh-a-base.rs b/tests/ui/svh/auxiliary/svh-a-base.rs
index 36b41fc81..36b41fc81 100644
--- a/src/test/ui/svh/auxiliary/svh-a-base.rs
+++ b/tests/ui/svh/auxiliary/svh-a-base.rs
diff --git a/src/test/ui/svh/auxiliary/svh-a-change-lit.rs b/tests/ui/svh/auxiliary/svh-a-change-lit.rs
index c76f2c992..c76f2c992 100644
--- a/src/test/ui/svh/auxiliary/svh-a-change-lit.rs
+++ b/tests/ui/svh/auxiliary/svh-a-change-lit.rs
diff --git a/src/test/ui/svh/auxiliary/svh-a-change-significant-cfg.rs b/tests/ui/svh/auxiliary/svh-a-change-significant-cfg.rs
index 37f59c97e..37f59c97e 100644
--- a/src/test/ui/svh/auxiliary/svh-a-change-significant-cfg.rs
+++ b/tests/ui/svh/auxiliary/svh-a-change-significant-cfg.rs
diff --git a/src/test/ui/svh/auxiliary/svh-a-change-trait-bound.rs b/tests/ui/svh/auxiliary/svh-a-change-trait-bound.rs
index be24b1e22..be24b1e22 100644
--- a/src/test/ui/svh/auxiliary/svh-a-change-trait-bound.rs
+++ b/tests/ui/svh/auxiliary/svh-a-change-trait-bound.rs
diff --git a/src/test/ui/svh/auxiliary/svh-a-change-type-arg.rs b/tests/ui/svh/auxiliary/svh-a-change-type-arg.rs
index 3fe102245..3fe102245 100644
--- a/src/test/ui/svh/auxiliary/svh-a-change-type-arg.rs
+++ b/tests/ui/svh/auxiliary/svh-a-change-type-arg.rs
diff --git a/src/test/ui/svh/auxiliary/svh-a-change-type-ret.rs b/tests/ui/svh/auxiliary/svh-a-change-type-ret.rs
index 06e4fad06..06e4fad06 100644
--- a/src/test/ui/svh/auxiliary/svh-a-change-type-ret.rs
+++ b/tests/ui/svh/auxiliary/svh-a-change-type-ret.rs
diff --git a/src/test/ui/svh/auxiliary/svh-a-change-type-static.rs b/tests/ui/svh/auxiliary/svh-a-change-type-static.rs
index 440cb3213..440cb3213 100644
--- a/src/test/ui/svh/auxiliary/svh-a-change-type-static.rs
+++ b/tests/ui/svh/auxiliary/svh-a-change-type-static.rs
diff --git a/src/test/ui/svh/auxiliary/svh-b.rs b/tests/ui/svh/auxiliary/svh-b.rs
index 57029f708..57029f708 100644
--- a/src/test/ui/svh/auxiliary/svh-b.rs
+++ b/tests/ui/svh/auxiliary/svh-b.rs
diff --git a/src/test/ui/svh/auxiliary/svh-uta-base.rs b/tests/ui/svh/auxiliary/svh-uta-base.rs
index 221a096e0..221a096e0 100644
--- a/src/test/ui/svh/auxiliary/svh-uta-base.rs
+++ b/tests/ui/svh/auxiliary/svh-uta-base.rs
diff --git a/src/test/ui/svh/auxiliary/svh-uta-change-use-trait.rs b/tests/ui/svh/auxiliary/svh-uta-change-use-trait.rs
index 823d29571..823d29571 100644
--- a/src/test/ui/svh/auxiliary/svh-uta-change-use-trait.rs
+++ b/tests/ui/svh/auxiliary/svh-uta-change-use-trait.rs
diff --git a/src/test/ui/svh/auxiliary/svh-utb.rs b/tests/ui/svh/auxiliary/svh-utb.rs
index a03e29dce..a03e29dce 100644
--- a/src/test/ui/svh/auxiliary/svh-utb.rs
+++ b/tests/ui/svh/auxiliary/svh-utb.rs
diff --git a/src/test/ui/svh/changing-crates.rs b/tests/ui/svh/changing-crates.rs
index 66298e06e..66298e06e 100644
--- a/src/test/ui/svh/changing-crates.rs
+++ b/tests/ui/svh/changing-crates.rs
diff --git a/src/test/ui/svh/changing-crates.stderr b/tests/ui/svh/changing-crates.stderr
index 7244919e8..caefdfc96 100644
--- a/src/test/ui/svh/changing-crates.stderr
+++ b/tests/ui/svh/changing-crates.stderr
@@ -11,3 +11,4 @@ LL | extern crate b;
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/svh/svh-change-lit.rs b/tests/ui/svh/svh-change-lit.rs
index ea500711b..ea500711b 100644
--- a/src/test/ui/svh/svh-change-lit.rs
+++ b/tests/ui/svh/svh-change-lit.rs
diff --git a/src/test/ui/svh/svh-change-lit.stderr b/tests/ui/svh/svh-change-lit.stderr
index 1e97e9d05..5e890c6aa 100644
--- a/src/test/ui/svh/svh-change-lit.stderr
+++ b/tests/ui/svh/svh-change-lit.stderr
@@ -11,3 +11,4 @@ LL | extern crate b;
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/svh/svh-change-significant-cfg.rs b/tests/ui/svh/svh-change-significant-cfg.rs
index ff919ea83..ff919ea83 100644
--- a/src/test/ui/svh/svh-change-significant-cfg.rs
+++ b/tests/ui/svh/svh-change-significant-cfg.rs
diff --git a/src/test/ui/svh/svh-change-significant-cfg.stderr b/tests/ui/svh/svh-change-significant-cfg.stderr
index f04046f4c..dcc250d52 100644
--- a/src/test/ui/svh/svh-change-significant-cfg.stderr
+++ b/tests/ui/svh/svh-change-significant-cfg.stderr
@@ -11,3 +11,4 @@ LL | extern crate b;
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/svh/svh-change-trait-bound.rs b/tests/ui/svh/svh-change-trait-bound.rs
index a4ba06eaf..a4ba06eaf 100644
--- a/src/test/ui/svh/svh-change-trait-bound.rs
+++ b/tests/ui/svh/svh-change-trait-bound.rs
diff --git a/src/test/ui/svh/svh-change-trait-bound.stderr b/tests/ui/svh/svh-change-trait-bound.stderr
index a778c6180..2035993d2 100644
--- a/src/test/ui/svh/svh-change-trait-bound.stderr
+++ b/tests/ui/svh/svh-change-trait-bound.stderr
@@ -11,3 +11,4 @@ LL | extern crate b;
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/svh/svh-change-type-arg.rs b/tests/ui/svh/svh-change-type-arg.rs
index d1651814b..d1651814b 100644
--- a/src/test/ui/svh/svh-change-type-arg.rs
+++ b/tests/ui/svh/svh-change-type-arg.rs
diff --git a/src/test/ui/svh/svh-change-type-arg.stderr b/tests/ui/svh/svh-change-type-arg.stderr
index f09babf93..eef85aa95 100644
--- a/src/test/ui/svh/svh-change-type-arg.stderr
+++ b/tests/ui/svh/svh-change-type-arg.stderr
@@ -11,3 +11,4 @@ LL | extern crate b;
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/svh/svh-change-type-ret.rs b/tests/ui/svh/svh-change-type-ret.rs
index a4be50a64..a4be50a64 100644
--- a/src/test/ui/svh/svh-change-type-ret.rs
+++ b/tests/ui/svh/svh-change-type-ret.rs
diff --git a/src/test/ui/svh/svh-change-type-ret.stderr b/tests/ui/svh/svh-change-type-ret.stderr
index 0998cd4b5..247f74e50 100644
--- a/src/test/ui/svh/svh-change-type-ret.stderr
+++ b/tests/ui/svh/svh-change-type-ret.stderr
@@ -11,3 +11,4 @@ LL | extern crate b;
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/svh/svh-change-type-static.rs b/tests/ui/svh/svh-change-type-static.rs
index c470761be..c470761be 100644
--- a/src/test/ui/svh/svh-change-type-static.rs
+++ b/tests/ui/svh/svh-change-type-static.rs
diff --git a/src/test/ui/svh/svh-change-type-static.stderr b/tests/ui/svh/svh-change-type-static.stderr
index 9c48cbd30..78b54f227 100644
--- a/src/test/ui/svh/svh-change-type-static.stderr
+++ b/tests/ui/svh/svh-change-type-static.stderr
@@ -11,3 +11,4 @@ LL | extern crate b;
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/svh/svh-use-trait.rs b/tests/ui/svh/svh-use-trait.rs
index e144fdffb..e144fdffb 100644
--- a/src/test/ui/svh/svh-use-trait.rs
+++ b/tests/ui/svh/svh-use-trait.rs
diff --git a/src/test/ui/svh/svh-use-trait.stderr b/tests/ui/svh/svh-use-trait.stderr
index 5780cfef3..d8a81864d 100644
--- a/src/test/ui/svh/svh-use-trait.stderr
+++ b/tests/ui/svh/svh-use-trait.stderr
@@ -11,3 +11,4 @@ LL | extern crate utb;
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/swap-1.rs b/tests/ui/swap-1.rs
index d87114748..d87114748 100644
--- a/src/test/ui/swap-1.rs
+++ b/tests/ui/swap-1.rs
diff --git a/src/test/ui/swap-overlapping.rs b/tests/ui/swap-overlapping.rs
index 85b357e0c..85b357e0c 100644
--- a/src/test/ui/swap-overlapping.rs
+++ b/tests/ui/swap-overlapping.rs
diff --git a/src/test/ui/switched-expectations.rs b/tests/ui/switched-expectations.rs
index c5bc84de5..c5bc84de5 100644
--- a/src/test/ui/switched-expectations.rs
+++ b/tests/ui/switched-expectations.rs
diff --git a/src/test/ui/switched-expectations.stderr b/tests/ui/switched-expectations.stderr
index 82fea0f14..82fea0f14 100644
--- a/src/test/ui/switched-expectations.stderr
+++ b/tests/ui/switched-expectations.stderr
diff --git a/src/test/ui/symbol-names/basic.legacy.stderr b/tests/ui/symbol-names/basic.legacy.stderr
index 3ad4ed24c..3ad4ed24c 100644
--- a/src/test/ui/symbol-names/basic.legacy.stderr
+++ b/tests/ui/symbol-names/basic.legacy.stderr
diff --git a/src/test/ui/symbol-names/basic.rs b/tests/ui/symbol-names/basic.rs
index 65a632628..65a632628 100644
--- a/src/test/ui/symbol-names/basic.rs
+++ b/tests/ui/symbol-names/basic.rs
diff --git a/src/test/ui/symbol-names/basic.v0.stderr b/tests/ui/symbol-names/basic.v0.stderr
index 1f0278136..1f0278136 100644
--- a/src/test/ui/symbol-names/basic.v0.stderr
+++ b/tests/ui/symbol-names/basic.v0.stderr
diff --git a/src/test/ui/symbol-names/const-generics-demangling.legacy.stderr b/tests/ui/symbol-names/const-generics-demangling.legacy.stderr
index bebbb7aac..bebbb7aac 100644
--- a/src/test/ui/symbol-names/const-generics-demangling.legacy.stderr
+++ b/tests/ui/symbol-names/const-generics-demangling.legacy.stderr
diff --git a/src/test/ui/symbol-names/const-generics-demangling.rs b/tests/ui/symbol-names/const-generics-demangling.rs
index 4a04eca67..4a04eca67 100644
--- a/src/test/ui/symbol-names/const-generics-demangling.rs
+++ b/tests/ui/symbol-names/const-generics-demangling.rs
diff --git a/src/test/ui/symbol-names/const-generics-demangling.v0.stderr b/tests/ui/symbol-names/const-generics-demangling.v0.stderr
index 7238a8493..7238a8493 100644
--- a/src/test/ui/symbol-names/const-generics-demangling.v0.stderr
+++ b/tests/ui/symbol-names/const-generics-demangling.v0.stderr
diff --git a/src/test/ui/symbol-names/const-generics-str-demangling.rs b/tests/ui/symbol-names/const-generics-str-demangling.rs
index 619b34f25..619b34f25 100644
--- a/src/test/ui/symbol-names/const-generics-str-demangling.rs
+++ b/tests/ui/symbol-names/const-generics-str-demangling.rs
diff --git a/src/test/ui/symbol-names/const-generics-str-demangling.stderr b/tests/ui/symbol-names/const-generics-str-demangling.stderr
index 06d3cdda2..06d3cdda2 100644
--- a/src/test/ui/symbol-names/const-generics-str-demangling.stderr
+++ b/tests/ui/symbol-names/const-generics-str-demangling.stderr
diff --git a/src/test/ui/symbol-names/const-generics-structural-demangling.rs b/tests/ui/symbol-names/const-generics-structural-demangling.rs
index df09ba494..df09ba494 100644
--- a/src/test/ui/symbol-names/const-generics-structural-demangling.rs
+++ b/tests/ui/symbol-names/const-generics-structural-demangling.rs
diff --git a/src/test/ui/symbol-names/const-generics-structural-demangling.stderr b/tests/ui/symbol-names/const-generics-structural-demangling.stderr
index a4c997477..a4c997477 100644
--- a/src/test/ui/symbol-names/const-generics-structural-demangling.stderr
+++ b/tests/ui/symbol-names/const-generics-structural-demangling.stderr
diff --git a/src/test/ui/symbol-names/const-generics.rs b/tests/ui/symbol-names/const-generics.rs
index 1242126e0..1242126e0 100644
--- a/src/test/ui/symbol-names/const-generics.rs
+++ b/tests/ui/symbol-names/const-generics.rs
diff --git a/src/test/ui/symbol-names/foreign-types.rs b/tests/ui/symbol-names/foreign-types.rs
index 8f5b07769..8f5b07769 100644
--- a/src/test/ui/symbol-names/foreign-types.rs
+++ b/tests/ui/symbol-names/foreign-types.rs
diff --git a/src/test/ui/symbol-names/foreign-types.stderr b/tests/ui/symbol-names/foreign-types.stderr
index d6ee388dd..d6ee388dd 100644
--- a/src/test/ui/symbol-names/foreign-types.stderr
+++ b/tests/ui/symbol-names/foreign-types.stderr
diff --git a/src/test/ui/symbol-names/impl1.legacy.stderr b/tests/ui/symbol-names/impl1.legacy.stderr
index 3d438df92..3d438df92 100644
--- a/src/test/ui/symbol-names/impl1.legacy.stderr
+++ b/tests/ui/symbol-names/impl1.legacy.stderr
diff --git a/src/test/ui/symbol-names/impl1.rs b/tests/ui/symbol-names/impl1.rs
index 629c2f33d..629c2f33d 100644
--- a/src/test/ui/symbol-names/impl1.rs
+++ b/tests/ui/symbol-names/impl1.rs
diff --git a/src/test/ui/symbol-names/impl1.v0.stderr b/tests/ui/symbol-names/impl1.v0.stderr
index 33caad71f..33caad71f 100644
--- a/src/test/ui/symbol-names/impl1.v0.stderr
+++ b/tests/ui/symbol-names/impl1.v0.stderr
diff --git a/tests/ui/symbol-names/impl2.rs b/tests/ui/symbol-names/impl2.rs
new file mode 100644
index 000000000..81aba403d
--- /dev/null
+++ b/tests/ui/symbol-names/impl2.rs
@@ -0,0 +1,15 @@
+// build-fail
+
+#![feature(rustc_attrs)]
+#![allow(dead_code)]
+
+trait Foo {
+    fn baz();
+}
+
+impl Foo for [u8; 1 + 2] {
+    #[rustc_def_path] //~ ERROR def-path(<[u8; 1 + 2] as Foo>::baz)
+    fn baz() {}
+}
+
+fn main() {}
diff --git a/tests/ui/symbol-names/impl2.stderr b/tests/ui/symbol-names/impl2.stderr
new file mode 100644
index 000000000..0c3205e01
--- /dev/null
+++ b/tests/ui/symbol-names/impl2.stderr
@@ -0,0 +1,8 @@
+error: def-path(<[u8; 1 + 2] as Foo>::baz)
+  --> $DIR/impl2.rs:11:5
+   |
+LL |     #[rustc_def_path]
+   |     ^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/symbol-names/issue-53912.rs b/tests/ui/symbol-names/issue-53912.rs
index 65b6825a8..65b6825a8 100644
--- a/src/test/ui/symbol-names/issue-53912.rs
+++ b/tests/ui/symbol-names/issue-53912.rs
diff --git a/src/test/ui/symbol-names/issue-60925.legacy.stderr b/tests/ui/symbol-names/issue-60925.legacy.stderr
index 21bf21ee7..21bf21ee7 100644
--- a/src/test/ui/symbol-names/issue-60925.legacy.stderr
+++ b/tests/ui/symbol-names/issue-60925.legacy.stderr
diff --git a/src/test/ui/symbol-names/issue-60925.rs b/tests/ui/symbol-names/issue-60925.rs
index ab0a3a7df..ab0a3a7df 100644
--- a/src/test/ui/symbol-names/issue-60925.rs
+++ b/tests/ui/symbol-names/issue-60925.rs
diff --git a/src/test/ui/symbol-names/issue-60925.v0.stderr b/tests/ui/symbol-names/issue-60925.v0.stderr
index 408c957c6..408c957c6 100644
--- a/src/test/ui/symbol-names/issue-60925.v0.stderr
+++ b/tests/ui/symbol-names/issue-60925.v0.stderr
diff --git a/src/test/ui/symbol-names/issue-75326.legacy.stderr b/tests/ui/symbol-names/issue-75326.legacy.stderr
index aadc0cf43..aadc0cf43 100644
--- a/src/test/ui/symbol-names/issue-75326.legacy.stderr
+++ b/tests/ui/symbol-names/issue-75326.legacy.stderr
diff --git a/src/test/ui/symbol-names/issue-75326.rs b/tests/ui/symbol-names/issue-75326.rs
index 4a1f5a212..4a1f5a212 100644
--- a/src/test/ui/symbol-names/issue-75326.rs
+++ b/tests/ui/symbol-names/issue-75326.rs
diff --git a/src/test/ui/symbol-names/issue-75326.v0.stderr b/tests/ui/symbol-names/issue-75326.v0.stderr
index 3d7803a0c..3d7803a0c 100644
--- a/src/test/ui/symbol-names/issue-75326.v0.stderr
+++ b/tests/ui/symbol-names/issue-75326.v0.stderr
diff --git a/src/test/ui/symbol-names/issue-76365.rs b/tests/ui/symbol-names/issue-76365.rs
index 932057b65..932057b65 100644
--- a/src/test/ui/symbol-names/issue-76365.rs
+++ b/tests/ui/symbol-names/issue-76365.rs
diff --git a/src/test/ui/symbol-names/trait-objects.rs b/tests/ui/symbol-names/trait-objects.rs
index 5bcbc0841..5bcbc0841 100644
--- a/src/test/ui/symbol-names/trait-objects.rs
+++ b/tests/ui/symbol-names/trait-objects.rs
diff --git a/src/test/ui/symbol-names/trait-objects.v0.stderr b/tests/ui/symbol-names/trait-objects.v0.stderr
index 47192ce5b..47192ce5b 100644
--- a/src/test/ui/symbol-names/trait-objects.v0.stderr
+++ b/tests/ui/symbol-names/trait-objects.v0.stderr
diff --git a/src/test/ui/symbol-names/types.legacy.stderr b/tests/ui/symbol-names/types.legacy.stderr
index a4984d562..a4984d562 100644
--- a/src/test/ui/symbol-names/types.legacy.stderr
+++ b/tests/ui/symbol-names/types.legacy.stderr
diff --git a/src/test/ui/symbol-names/types.rs b/tests/ui/symbol-names/types.rs
index 0ae699c93..0ae699c93 100644
--- a/src/test/ui/symbol-names/types.rs
+++ b/tests/ui/symbol-names/types.rs
diff --git a/src/test/ui/symbol-names/types.verbose-legacy.stderr b/tests/ui/symbol-names/types.verbose-legacy.stderr
index a4984d562..a4984d562 100644
--- a/src/test/ui/symbol-names/types.verbose-legacy.stderr
+++ b/tests/ui/symbol-names/types.verbose-legacy.stderr
diff --git a/src/test/ui/symbol-names/verbose.rs b/tests/ui/symbol-names/verbose.rs
index e00c592b6..e00c592b6 100644
--- a/src/test/ui/symbol-names/verbose.rs
+++ b/tests/ui/symbol-names/verbose.rs
diff --git a/src/test/ui/symbol-names/x86-stdcall.rs b/tests/ui/symbol-names/x86-stdcall.rs
index 9948488c0..9948488c0 100644
--- a/src/test/ui/symbol-names/x86-stdcall.rs
+++ b/tests/ui/symbol-names/x86-stdcall.rs
diff --git a/src/test/ui/syntax-extension-minor.rs b/tests/ui/syntax-extension-minor.rs
index 2d6710af3..2d6710af3 100644
--- a/src/test/ui/syntax-extension-minor.rs
+++ b/tests/ui/syntax-extension-minor.rs
diff --git a/src/test/ui/tag-that-dare-not-speak-its-name.rs b/tests/ui/tag-that-dare-not-speak-its-name.rs
index 36e22f0b5..36e22f0b5 100644
--- a/src/test/ui/tag-that-dare-not-speak-its-name.rs
+++ b/tests/ui/tag-that-dare-not-speak-its-name.rs
diff --git a/src/test/ui/tag-that-dare-not-speak-its-name.stderr b/tests/ui/tag-that-dare-not-speak-its-name.stderr
index 96bab1526..96bab1526 100644
--- a/src/test/ui/tag-that-dare-not-speak-its-name.stderr
+++ b/tests/ui/tag-that-dare-not-speak-its-name.stderr
diff --git a/src/test/ui/tag-type-args.rs b/tests/ui/tag-type-args.rs
index 660d860ba..660d860ba 100644
--- a/src/test/ui/tag-type-args.rs
+++ b/tests/ui/tag-type-args.rs
diff --git a/src/test/ui/tag-type-args.stderr b/tests/ui/tag-type-args.stderr
index 107af7641..5b54880a6 100644
--- a/src/test/ui/tag-type-args.stderr
+++ b/tests/ui/tag-type-args.stderr
@@ -12,7 +12,7 @@ LL | enum Quux<T> { Bar }
 help: add missing generic argument
    |
 LL | fn foo(c: Quux<T>) { assert!((false)); }
-   |           ~~~~~~~
+   |               +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/tag-variant-cast-non-nullary.fixed b/tests/ui/tag-variant-cast-non-nullary.fixed
index 53e68c2ac..53e68c2ac 100644
--- a/src/test/ui/tag-variant-cast-non-nullary.fixed
+++ b/tests/ui/tag-variant-cast-non-nullary.fixed
diff --git a/src/test/ui/tag-variant-cast-non-nullary.rs b/tests/ui/tag-variant-cast-non-nullary.rs
index 0d0c6188a..0d0c6188a 100644
--- a/src/test/ui/tag-variant-cast-non-nullary.rs
+++ b/tests/ui/tag-variant-cast-non-nullary.rs
diff --git a/src/test/ui/tag-variant-cast-non-nullary.stderr b/tests/ui/tag-variant-cast-non-nullary.stderr
index ae2f5a7ae..ae2f5a7ae 100644
--- a/src/test/ui/tag-variant-cast-non-nullary.stderr
+++ b/tests/ui/tag-variant-cast-non-nullary.stderr
diff --git a/src/test/ui/tail-call-arg-leak.rs b/tests/ui/tail-call-arg-leak.rs
index a60944b63..a60944b63 100644
--- a/src/test/ui/tail-call-arg-leak.rs
+++ b/tests/ui/tail-call-arg-leak.rs
diff --git a/src/test/ui/tail-cps.rs b/tests/ui/tail-cps.rs
index f186683ea..f186683ea 100644
--- a/src/test/ui/tail-cps.rs
+++ b/tests/ui/tail-cps.rs
diff --git a/src/test/ui/tail-typeck.rs b/tests/ui/tail-typeck.rs
index 37a7694c8..37a7694c8 100644
--- a/src/test/ui/tail-typeck.rs
+++ b/tests/ui/tail-typeck.rs
diff --git a/src/test/ui/tail-typeck.stderr b/tests/ui/tail-typeck.stderr
index 10dfd2de7..10dfd2de7 100644
--- a/src/test/ui/tail-typeck.stderr
+++ b/tests/ui/tail-typeck.stderr
diff --git a/src/test/ui/target-feature/aarch64-neon-works.rs b/tests/ui/target-feature/aarch64-neon-works.rs
index 3878806fd..3878806fd 100644
--- a/src/test/ui/target-feature/aarch64-neon-works.rs
+++ b/tests/ui/target-feature/aarch64-neon-works.rs
diff --git a/src/test/ui/target-feature/feature-hierarchy.rs b/tests/ui/target-feature/feature-hierarchy.rs
index 5fbd5e8a2..5fbd5e8a2 100644
--- a/src/test/ui/target-feature/feature-hierarchy.rs
+++ b/tests/ui/target-feature/feature-hierarchy.rs
diff --git a/src/test/ui/target-feature/gate.rs b/tests/ui/target-feature/gate.rs
index 2382c98f8..2382c98f8 100644
--- a/src/test/ui/target-feature/gate.rs
+++ b/tests/ui/target-feature/gate.rs
diff --git a/src/test/ui/target-feature/gate.stderr b/tests/ui/target-feature/gate.stderr
index ee542b60a..ee542b60a 100644
--- a/src/test/ui/target-feature/gate.stderr
+++ b/tests/ui/target-feature/gate.stderr
diff --git a/src/test/ui/target-feature/invalid-attribute.rs b/tests/ui/target-feature/invalid-attribute.rs
index ad1b6e96b..ad1b6e96b 100644
--- a/src/test/ui/target-feature/invalid-attribute.rs
+++ b/tests/ui/target-feature/invalid-attribute.rs
diff --git a/src/test/ui/target-feature/invalid-attribute.stderr b/tests/ui/target-feature/invalid-attribute.stderr
index a2adfc67f..a2adfc67f 100644
--- a/src/test/ui/target-feature/invalid-attribute.stderr
+++ b/tests/ui/target-feature/invalid-attribute.stderr
diff --git a/src/test/ui/target-feature/missing-plusminus-2.rs b/tests/ui/target-feature/missing-plusminus-2.rs
index 131687289..131687289 100644
--- a/src/test/ui/target-feature/missing-plusminus-2.rs
+++ b/tests/ui/target-feature/missing-plusminus-2.rs
diff --git a/src/test/ui/target-feature/missing-plusminus-2.stderr b/tests/ui/target-feature/missing-plusminus-2.stderr
index 5ed2652a0..5ed2652a0 100644
--- a/src/test/ui/target-feature/missing-plusminus-2.stderr
+++ b/tests/ui/target-feature/missing-plusminus-2.stderr
diff --git a/src/test/ui/target-feature/missing-plusminus.rs b/tests/ui/target-feature/missing-plusminus.rs
index efee65929..efee65929 100644
--- a/src/test/ui/target-feature/missing-plusminus.rs
+++ b/tests/ui/target-feature/missing-plusminus.rs
diff --git a/src/test/ui/target-feature/missing-plusminus.stderr b/tests/ui/target-feature/missing-plusminus.stderr
index 93abf3508..93abf3508 100644
--- a/src/test/ui/target-feature/missing-plusminus.stderr
+++ b/tests/ui/target-feature/missing-plusminus.stderr
diff --git a/src/test/ui/target-feature/no-llvm-leaks.rs b/tests/ui/target-feature/no-llvm-leaks.rs
index 5a71b2166..5a71b2166 100644
--- a/src/test/ui/target-feature/no-llvm-leaks.rs
+++ b/tests/ui/target-feature/no-llvm-leaks.rs
diff --git a/src/test/ui/target-feature/rust-specific-name-no-warnings.rs b/tests/ui/target-feature/rust-specific-name-no-warnings.rs
index 1708a71a9..1708a71a9 100644
--- a/src/test/ui/target-feature/rust-specific-name-no-warnings.rs
+++ b/tests/ui/target-feature/rust-specific-name-no-warnings.rs
diff --git a/src/test/ui/target-feature/similar-feature-suggestion.rs b/tests/ui/target-feature/similar-feature-suggestion.rs
index 4e4e2160c..4e4e2160c 100644
--- a/src/test/ui/target-feature/similar-feature-suggestion.rs
+++ b/tests/ui/target-feature/similar-feature-suggestion.rs
diff --git a/src/test/ui/target-feature/similar-feature-suggestion.stderr b/tests/ui/target-feature/similar-feature-suggestion.stderr
index 2f376065f..2f376065f 100644
--- a/src/test/ui/target-feature/similar-feature-suggestion.stderr
+++ b/tests/ui/target-feature/similar-feature-suggestion.stderr
diff --git a/src/test/ui/target-feature/tied-features-cli.one.stderr b/tests/ui/target-feature/tied-features-cli.one.stderr
index b4b50d981..b4b50d981 100644
--- a/src/test/ui/target-feature/tied-features-cli.one.stderr
+++ b/tests/ui/target-feature/tied-features-cli.one.stderr
diff --git a/src/test/ui/target-feature/tied-features-cli.rs b/tests/ui/target-feature/tied-features-cli.rs
index 72b7e3da5..72b7e3da5 100644
--- a/src/test/ui/target-feature/tied-features-cli.rs
+++ b/tests/ui/target-feature/tied-features-cli.rs
diff --git a/src/test/ui/target-feature/tied-features-cli.three.stderr b/tests/ui/target-feature/tied-features-cli.three.stderr
index b4b50d981..b4b50d981 100644
--- a/src/test/ui/target-feature/tied-features-cli.three.stderr
+++ b/tests/ui/target-feature/tied-features-cli.three.stderr
diff --git a/src/test/ui/target-feature/tied-features-cli.two.stderr b/tests/ui/target-feature/tied-features-cli.two.stderr
index b4b50d981..b4b50d981 100644
--- a/src/test/ui/target-feature/tied-features-cli.two.stderr
+++ b/tests/ui/target-feature/tied-features-cli.two.stderr
diff --git a/src/test/ui/target-feature/tied-features.rs b/tests/ui/target-feature/tied-features.rs
index 15f01505e..15f01505e 100644
--- a/src/test/ui/target-feature/tied-features.rs
+++ b/tests/ui/target-feature/tied-features.rs
diff --git a/src/test/ui/target-feature/tied-features.stderr b/tests/ui/target-feature/tied-features.stderr
index 525c90843..525c90843 100644
--- a/src/test/ui/target-feature/tied-features.stderr
+++ b/tests/ui/target-feature/tied-features.stderr
diff --git a/src/test/ui/target-feature/wasm-safe.rs b/tests/ui/target-feature/wasm-safe.rs
index 4b868684a..4b868684a 100644
--- a/src/test/ui/target-feature/wasm-safe.rs
+++ b/tests/ui/target-feature/wasm-safe.rs
diff --git a/src/test/ui/terr-in-field.rs b/tests/ui/terr-in-field.rs
index aa801fd0a..aa801fd0a 100644
--- a/src/test/ui/terr-in-field.rs
+++ b/tests/ui/terr-in-field.rs
diff --git a/src/test/ui/terr-in-field.stderr b/tests/ui/terr-in-field.stderr
index d2fda09c0..d2fda09c0 100644
--- a/src/test/ui/terr-in-field.stderr
+++ b/tests/ui/terr-in-field.stderr
diff --git a/src/test/ui/terr-sorts.rs b/tests/ui/terr-sorts.rs
index c1e2f7dae..c1e2f7dae 100644
--- a/src/test/ui/terr-sorts.rs
+++ b/tests/ui/terr-sorts.rs
diff --git a/src/test/ui/terr-sorts.stderr b/tests/ui/terr-sorts.stderr
index 5a61a2fab..5a61a2fab 100644
--- a/src/test/ui/terr-sorts.stderr
+++ b/tests/ui/terr-sorts.stderr
diff --git a/src/test/ui/test-attrs/auxiliary/test_macro.rs b/tests/ui/test-attrs/auxiliary/test_macro.rs
index 60a98ab6a..60a98ab6a 100644
--- a/src/test/ui/test-attrs/auxiliary/test_macro.rs
+++ b/tests/ui/test-attrs/auxiliary/test_macro.rs
diff --git a/src/test/ui/test-attrs/decl-macro-test.rs b/tests/ui/test-attrs/decl-macro-test.rs
index fcbe9f49e..fcbe9f49e 100644
--- a/src/test/ui/test-attrs/decl-macro-test.rs
+++ b/tests/ui/test-attrs/decl-macro-test.rs
diff --git a/src/test/ui/test-attrs/inaccessible-test-modules.rs b/tests/ui/test-attrs/inaccessible-test-modules.rs
index f5b347937..f5b347937 100644
--- a/src/test/ui/test-attrs/inaccessible-test-modules.rs
+++ b/tests/ui/test-attrs/inaccessible-test-modules.rs
diff --git a/tests/ui/test-attrs/inaccessible-test-modules.stderr b/tests/ui/test-attrs/inaccessible-test-modules.stderr
new file mode 100644
index 000000000..7635f579d
--- /dev/null
+++ b/tests/ui/test-attrs/inaccessible-test-modules.stderr
@@ -0,0 +1,20 @@
+error[E0432]: unresolved import `main`
+  --> $DIR/inaccessible-test-modules.rs:5:5
+   |
+LL | use main as x;
+   |     ^^^^^^^^^ no `main` in the root
+
+error[E0432]: unresolved import `test`
+  --> $DIR/inaccessible-test-modules.rs:6:5
+   |
+LL | use test as y;
+   |     ^^^^^^^^^ no `test` in the root
+   |
+help: consider importing this module instead
+   |
+LL | use test::test as y;
+   |     ~~~~~~~~~~~~~~~
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/test-attrs/issue-16597-empty.rs b/tests/ui/test-attrs/issue-16597-empty.rs
index 2bdd08575..2bdd08575 100644
--- a/src/test/ui/test-attrs/issue-16597-empty.rs
+++ b/tests/ui/test-attrs/issue-16597-empty.rs
diff --git a/src/test/ui/test-attrs/issue-16597.rs b/tests/ui/test-attrs/issue-16597.rs
index 35769bfc1..35769bfc1 100644
--- a/src/test/ui/test-attrs/issue-16597.rs
+++ b/tests/ui/test-attrs/issue-16597.rs
diff --git a/src/test/ui/test-attrs/issue-20823.rs b/tests/ui/test-attrs/issue-20823.rs
index 9e209d5d3..9e209d5d3 100644
--- a/src/test/ui/test-attrs/issue-20823.rs
+++ b/tests/ui/test-attrs/issue-20823.rs
diff --git a/src/test/ui/test-attrs/issue-36768.rs b/tests/ui/test-attrs/issue-36768.rs
index f671cbc82..f671cbc82 100644
--- a/src/test/ui/test-attrs/issue-36768.rs
+++ b/tests/ui/test-attrs/issue-36768.rs
diff --git a/src/test/ui/issues/issue-52557.rs b/tests/ui/test-attrs/issue-52557.rs
index 09f7a8c51..09f7a8c51 100644
--- a/src/test/ui/issues/issue-52557.rs
+++ b/tests/ui/test-attrs/issue-52557.rs
diff --git a/src/test/ui/test-attrs/issue-53675-a-test-called-panic.rs b/tests/ui/test-attrs/issue-53675-a-test-called-panic.rs
index e57303898..e57303898 100644
--- a/src/test/ui/test-attrs/issue-53675-a-test-called-panic.rs
+++ b/tests/ui/test-attrs/issue-53675-a-test-called-panic.rs
diff --git a/src/test/ui/test-attrs/run-unexported-tests.rs b/tests/ui/test-attrs/run-unexported-tests.rs
index f533a3ef8..f533a3ef8 100644
--- a/src/test/ui/test-attrs/run-unexported-tests.rs
+++ b/tests/ui/test-attrs/run-unexported-tests.rs
diff --git a/src/test/ui/test-attrs/test-attr-non-associated-functions.rs b/tests/ui/test-attrs/test-attr-non-associated-functions.rs
index 31e567c39..31e567c39 100644
--- a/src/test/ui/test-attrs/test-attr-non-associated-functions.rs
+++ b/tests/ui/test-attrs/test-attr-non-associated-functions.rs
diff --git a/src/test/ui/test-attrs/test-attr-non-associated-functions.stderr b/tests/ui/test-attrs/test-attr-non-associated-functions.stderr
index a81b8f398..a81b8f398 100644
--- a/src/test/ui/test-attrs/test-attr-non-associated-functions.stderr
+++ b/tests/ui/test-attrs/test-attr-non-associated-functions.stderr
diff --git a/src/test/ui/test-attrs/test-cant-be-shadowed.rs b/tests/ui/test-attrs/test-cant-be-shadowed.rs
index 831372d45..831372d45 100644
--- a/src/test/ui/test-attrs/test-cant-be-shadowed.rs
+++ b/tests/ui/test-attrs/test-cant-be-shadowed.rs
diff --git a/src/test/ui/test-attrs/test-filter-multiple.rs b/tests/ui/test-attrs/test-filter-multiple.rs
index 04dd83b7f..04dd83b7f 100644
--- a/src/test/ui/test-attrs/test-filter-multiple.rs
+++ b/tests/ui/test-attrs/test-filter-multiple.rs
diff --git a/src/test/ui/test-attrs/test-filter-multiple.run.stdout b/tests/ui/test-attrs/test-filter-multiple.run.stdout
index 1aa684ed5..1aa684ed5 100644
--- a/src/test/ui/test-attrs/test-filter-multiple.run.stdout
+++ b/tests/ui/test-attrs/test-filter-multiple.run.stdout
diff --git a/src/test/ui/test-attrs/test-fn-signature-verification-for-explicit-return-type.rs b/tests/ui/test-attrs/test-fn-signature-verification-for-explicit-return-type.rs
index 585874e27..585874e27 100644
--- a/src/test/ui/test-attrs/test-fn-signature-verification-for-explicit-return-type.rs
+++ b/tests/ui/test-attrs/test-fn-signature-verification-for-explicit-return-type.rs
diff --git a/src/test/ui/test-attrs/test-main-not-dead-attr.rs b/tests/ui/test-attrs/test-main-not-dead-attr.rs
index 0b2a9a354..0b2a9a354 100644
--- a/src/test/ui/test-attrs/test-main-not-dead-attr.rs
+++ b/tests/ui/test-attrs/test-main-not-dead-attr.rs
diff --git a/src/test/ui/test-attrs/test-main-not-dead.rs b/tests/ui/test-attrs/test-main-not-dead.rs
index 30a9c85e3..30a9c85e3 100644
--- a/src/test/ui/test-attrs/test-main-not-dead.rs
+++ b/tests/ui/test-attrs/test-main-not-dead.rs
diff --git a/src/test/ui/test-attrs/test-on-not-fn.rs b/tests/ui/test-attrs/test-on-not-fn.rs
index a460480af..a460480af 100644
--- a/src/test/ui/test-attrs/test-on-not-fn.rs
+++ b/tests/ui/test-attrs/test-on-not-fn.rs
diff --git a/src/test/ui/test-attrs/test-on-not-fn.stderr b/tests/ui/test-attrs/test-on-not-fn.stderr
index fc2c5f62b..fc2c5f62b 100644
--- a/src/test/ui/test-attrs/test-on-not-fn.stderr
+++ b/tests/ui/test-attrs/test-on-not-fn.stderr
diff --git a/src/test/ui/test-attrs/test-panic-abort-disabled.rs b/tests/ui/test-attrs/test-panic-abort-disabled.rs
index 874dbdb42..874dbdb42 100644
--- a/src/test/ui/test-attrs/test-panic-abort-disabled.rs
+++ b/tests/ui/test-attrs/test-panic-abort-disabled.rs
diff --git a/src/test/ui/test-attrs/test-panic-abort-disabled.stderr b/tests/ui/test-attrs/test-panic-abort-disabled.stderr
index 9c65c7360..9c65c7360 100644
--- a/src/test/ui/test-attrs/test-panic-abort-disabled.stderr
+++ b/tests/ui/test-attrs/test-panic-abort-disabled.stderr
diff --git a/src/test/ui/test-attrs/test-panic-abort-nocapture.rs b/tests/ui/test-attrs/test-panic-abort-nocapture.rs
index af530cc1a..af530cc1a 100644
--- a/src/test/ui/test-attrs/test-panic-abort-nocapture.rs
+++ b/tests/ui/test-attrs/test-panic-abort-nocapture.rs
diff --git a/src/test/ui/test-attrs/test-panic-abort-nocapture.run.stderr b/tests/ui/test-attrs/test-panic-abort-nocapture.run.stderr
index 727e9691c..727e9691c 100644
--- a/src/test/ui/test-attrs/test-panic-abort-nocapture.run.stderr
+++ b/tests/ui/test-attrs/test-panic-abort-nocapture.run.stderr
diff --git a/src/test/ui/test-attrs/test-panic-abort-nocapture.run.stdout b/tests/ui/test-attrs/test-panic-abort-nocapture.run.stdout
index 8a91732a7..8a91732a7 100644
--- a/src/test/ui/test-attrs/test-panic-abort-nocapture.run.stdout
+++ b/tests/ui/test-attrs/test-panic-abort-nocapture.run.stdout
diff --git a/src/test/ui/test-attrs/test-panic-abort.rs b/tests/ui/test-attrs/test-panic-abort.rs
index 931b7993c..931b7993c 100644
--- a/src/test/ui/test-attrs/test-panic-abort.rs
+++ b/tests/ui/test-attrs/test-panic-abort.rs
diff --git a/src/test/ui/test-attrs/test-panic-abort.run.stdout b/tests/ui/test-attrs/test-panic-abort.run.stdout
index f608a8cdc..f608a8cdc 100644
--- a/src/test/ui/test-attrs/test-panic-abort.run.stdout
+++ b/tests/ui/test-attrs/test-panic-abort.run.stdout
diff --git a/src/test/ui/test-attrs/test-panic-while-printing.rs b/tests/ui/test-attrs/test-panic-while-printing.rs
index 033c8beb4..033c8beb4 100644
--- a/src/test/ui/test-attrs/test-panic-while-printing.rs
+++ b/tests/ui/test-attrs/test-panic-while-printing.rs
diff --git a/src/test/ui/test-attrs/test-passed-wasm.rs b/tests/ui/test-attrs/test-passed-wasm.rs
index 578aa4b17..578aa4b17 100644
--- a/src/test/ui/test-attrs/test-passed-wasm.rs
+++ b/tests/ui/test-attrs/test-passed-wasm.rs
diff --git a/src/test/ui/test-attrs/test-passed-wasm.run.stdout b/tests/ui/test-attrs/test-passed-wasm.run.stdout
index c3005a779..c3005a779 100644
--- a/src/test/ui/test-attrs/test-passed-wasm.run.stdout
+++ b/tests/ui/test-attrs/test-passed-wasm.run.stdout
diff --git a/src/test/ui/test-attrs/test-passed.rs b/tests/ui/test-attrs/test-passed.rs
index f65f00030..f65f00030 100644
--- a/src/test/ui/test-attrs/test-passed.rs
+++ b/tests/ui/test-attrs/test-passed.rs
diff --git a/src/test/ui/test-attrs/test-passed.run.stdout b/tests/ui/test-attrs/test-passed.run.stdout
index 17f70d607..17f70d607 100644
--- a/src/test/ui/test-attrs/test-passed.run.stdout
+++ b/tests/ui/test-attrs/test-passed.run.stdout
diff --git a/src/test/ui/test-attrs/test-runner-hides-buried-main.rs b/tests/ui/test-attrs/test-runner-hides-buried-main.rs
index 346aa868e..346aa868e 100644
--- a/src/test/ui/test-attrs/test-runner-hides-buried-main.rs
+++ b/tests/ui/test-attrs/test-runner-hides-buried-main.rs
diff --git a/src/test/ui/test-attrs/test-runner-hides-main.rs b/tests/ui/test-attrs/test-runner-hides-main.rs
index 0de1d64f0..0de1d64f0 100644
--- a/src/test/ui/test-attrs/test-runner-hides-main.rs
+++ b/tests/ui/test-attrs/test-runner-hides-main.rs
diff --git a/src/test/ui/test-attrs/test-runner-hides-start.rs b/tests/ui/test-attrs/test-runner-hides-start.rs
index 56212bb6f..56212bb6f 100644
--- a/src/test/ui/test-attrs/test-runner-hides-start.rs
+++ b/tests/ui/test-attrs/test-runner-hides-start.rs
diff --git a/src/test/ui/test-attrs/test-should-fail-good-message.rs b/tests/ui/test-attrs/test-should-fail-good-message.rs
index 83519c452..83519c452 100644
--- a/src/test/ui/test-attrs/test-should-fail-good-message.rs
+++ b/tests/ui/test-attrs/test-should-fail-good-message.rs
diff --git a/src/test/ui/test-attrs/test-should-panic-attr.rs b/tests/ui/test-attrs/test-should-panic-attr.rs
index b71878406..b71878406 100644
--- a/src/test/ui/test-attrs/test-should-panic-attr.rs
+++ b/tests/ui/test-attrs/test-should-panic-attr.rs
diff --git a/src/test/ui/test-attrs/test-should-panic-attr.stderr b/tests/ui/test-attrs/test-should-panic-attr.stderr
index 492d1d5e0..492d1d5e0 100644
--- a/src/test/ui/test-attrs/test-should-panic-attr.stderr
+++ b/tests/ui/test-attrs/test-should-panic-attr.stderr
diff --git a/src/test/ui/test-attrs/test-thread-capture.rs b/tests/ui/test-attrs/test-thread-capture.rs
index 53acca341..53acca341 100644
--- a/src/test/ui/test-attrs/test-thread-capture.rs
+++ b/tests/ui/test-attrs/test-thread-capture.rs
diff --git a/src/test/ui/test-attrs/test-thread-capture.run.stdout b/tests/ui/test-attrs/test-thread-capture.run.stdout
index 513c8cf2a..513c8cf2a 100644
--- a/src/test/ui/test-attrs/test-thread-capture.run.stdout
+++ b/tests/ui/test-attrs/test-thread-capture.run.stdout
diff --git a/src/test/ui/test-attrs/test-thread-nocapture.rs b/tests/ui/test-attrs/test-thread-nocapture.rs
index 2b57eb8aa..2b57eb8aa 100644
--- a/src/test/ui/test-attrs/test-thread-nocapture.rs
+++ b/tests/ui/test-attrs/test-thread-nocapture.rs
diff --git a/src/test/ui/test-attrs/test-thread-nocapture.run.stderr b/tests/ui/test-attrs/test-thread-nocapture.run.stderr
index 8c905d1af..8c905d1af 100644
--- a/src/test/ui/test-attrs/test-thread-nocapture.run.stderr
+++ b/tests/ui/test-attrs/test-thread-nocapture.run.stderr
diff --git a/src/test/ui/test-attrs/test-thread-nocapture.run.stdout b/tests/ui/test-attrs/test-thread-nocapture.run.stdout
index 9d2da5082..9d2da5082 100644
--- a/src/test/ui/test-attrs/test-thread-nocapture.run.stdout
+++ b/tests/ui/test-attrs/test-thread-nocapture.run.stdout
diff --git a/src/test/ui/test-attrs/test-type.rs b/tests/ui/test-attrs/test-type.rs
index f99e476ea..f99e476ea 100644
--- a/src/test/ui/test-attrs/test-type.rs
+++ b/tests/ui/test-attrs/test-type.rs
diff --git a/src/test/ui/test-attrs/test-type.run.stdout b/tests/ui/test-attrs/test-type.run.stdout
index 143c13a36..143c13a36 100644
--- a/src/test/ui/test-attrs/test-type.run.stdout
+++ b/tests/ui/test-attrs/test-type.run.stdout
diff --git a/src/test/ui/test-attrs/test-vs-cfg-test.rs b/tests/ui/test-attrs/test-vs-cfg-test.rs
index cd1cd33c2..cd1cd33c2 100644
--- a/src/test/ui/test-attrs/test-vs-cfg-test.rs
+++ b/tests/ui/test-attrs/test-vs-cfg-test.rs
diff --git a/src/test/ui/test-attrs/test-warns-dead-code.rs b/tests/ui/test-attrs/test-warns-dead-code.rs
index 4190885b6..4190885b6 100644
--- a/src/test/ui/test-attrs/test-warns-dead-code.rs
+++ b/tests/ui/test-attrs/test-warns-dead-code.rs
diff --git a/src/test/ui/test-attrs/test-warns-dead-code.stderr b/tests/ui/test-attrs/test-warns-dead-code.stderr
index 6c0f28841..6c0f28841 100644
--- a/src/test/ui/test-attrs/test-warns-dead-code.stderr
+++ b/tests/ui/test-attrs/test-warns-dead-code.stderr
diff --git a/src/test/ui/thir-tree.rs b/tests/ui/thir-tree.rs
index 32df7905a..32df7905a 100644
--- a/src/test/ui/thir-tree.rs
+++ b/tests/ui/thir-tree.rs
diff --git a/src/test/ui/thir-tree.stdout b/tests/ui/thir-tree.stdout
index 7fb90581f..4b6915f77 100644
--- a/src/test/ui/thir-tree.stdout
+++ b/tests/ui/thir-tree.stdout
@@ -32,12 +32,7 @@ Thir {
             kind: Scope {
                 region_scope: Node(2),
                 lint_level: Explicit(
-                    HirId {
-                        owner: OwnerId {
-                            def_id: DefId(0:3 ~ thir_tree[8f1d]::main),
-                        },
-                        local_id: 2,
-                    },
+                    HirId(DefId(0:3 ~ thir_tree[8f1d]::main).2),
                 ),
                 value: e0,
             },
diff --git a/src/test/ui/thread-local-mutation.rs b/tests/ui/thread-local-mutation.rs
index e738225ce..e738225ce 100644
--- a/src/test/ui/thread-local-mutation.rs
+++ b/tests/ui/thread-local-mutation.rs
diff --git a/src/test/ui/thread-local-mutation.stderr b/tests/ui/thread-local-mutation.stderr
index e5dc0e72e..e5dc0e72e 100644
--- a/src/test/ui/thread-local-mutation.stderr
+++ b/tests/ui/thread-local-mutation.stderr
diff --git a/src/test/ui/thread-local-static.rs b/tests/ui/thread-local-static.rs
index c7fee9e6b..c7fee9e6b 100644
--- a/src/test/ui/thread-local-static.rs
+++ b/tests/ui/thread-local-static.rs
diff --git a/src/test/ui/thread-local-static.stderr b/tests/ui/thread-local-static.stderr
index 712050a25..712050a25 100644
--- a/src/test/ui/thread-local-static.stderr
+++ b/tests/ui/thread-local-static.stderr
diff --git a/src/test/ui/thread-local/name-collision.rs b/tests/ui/thread-local/name-collision.rs
index dcff9183a..dcff9183a 100644
--- a/src/test/ui/thread-local/name-collision.rs
+++ b/tests/ui/thread-local/name-collision.rs
diff --git a/src/test/ui/thread-local/non-static.rs b/tests/ui/thread-local/non-static.rs
index f1c427387..f1c427387 100644
--- a/src/test/ui/thread-local/non-static.rs
+++ b/tests/ui/thread-local/non-static.rs
diff --git a/src/test/ui/thread-local/non-static.stderr b/tests/ui/thread-local/non-static.stderr
index 09a1618d6..09a1618d6 100644
--- a/src/test/ui/thread-local/non-static.stderr
+++ b/tests/ui/thread-local/non-static.stderr
diff --git a/src/test/ui/thread-local/thread-local-issue-37508.rs b/tests/ui/thread-local/thread-local-issue-37508.rs
index 219108c77..219108c77 100644
--- a/src/test/ui/thread-local/thread-local-issue-37508.rs
+++ b/tests/ui/thread-local/thread-local-issue-37508.rs
diff --git a/src/test/ui/thread-local/tls.rs b/tests/ui/thread-local/tls.rs
index fbd341388..fbd341388 100644
--- a/src/test/ui/thread-local/tls.rs
+++ b/tests/ui/thread-local/tls.rs
diff --git a/src/test/ui/threads-sendsync/auxiliary/thread-local-extern-static.rs b/tests/ui/threads-sendsync/auxiliary/thread-local-extern-static.rs
index 4d3c4e8ac..4d3c4e8ac 100644
--- a/src/test/ui/threads-sendsync/auxiliary/thread-local-extern-static.rs
+++ b/tests/ui/threads-sendsync/auxiliary/thread-local-extern-static.rs
diff --git a/src/test/ui/threads-sendsync/child-outlives-parent.rs b/tests/ui/threads-sendsync/child-outlives-parent.rs
index e3a39a44b..e3a39a44b 100644
--- a/src/test/ui/threads-sendsync/child-outlives-parent.rs
+++ b/tests/ui/threads-sendsync/child-outlives-parent.rs
diff --git a/src/test/ui/threads-sendsync/clone-with-exterior.rs b/tests/ui/threads-sendsync/clone-with-exterior.rs
index 9fc661b14..9fc661b14 100644
--- a/src/test/ui/threads-sendsync/clone-with-exterior.rs
+++ b/tests/ui/threads-sendsync/clone-with-exterior.rs
diff --git a/src/test/ui/threads-sendsync/comm.rs b/tests/ui/threads-sendsync/comm.rs
index aa86e174d..aa86e174d 100644
--- a/src/test/ui/threads-sendsync/comm.rs
+++ b/tests/ui/threads-sendsync/comm.rs
diff --git a/src/test/ui/threads-sendsync/eprint-on-tls-drop.rs b/tests/ui/threads-sendsync/eprint-on-tls-drop.rs
index f52430773..f52430773 100644
--- a/src/test/ui/threads-sendsync/eprint-on-tls-drop.rs
+++ b/tests/ui/threads-sendsync/eprint-on-tls-drop.rs
diff --git a/src/test/ui/threads-sendsync/issue-24313.rs b/tests/ui/threads-sendsync/issue-24313.rs
index c28b4ca96..c28b4ca96 100644
--- a/src/test/ui/threads-sendsync/issue-24313.rs
+++ b/tests/ui/threads-sendsync/issue-24313.rs
diff --git a/src/test/ui/threads-sendsync/issue-29488.rs b/tests/ui/threads-sendsync/issue-29488.rs
index 3c9a6a80d..3c9a6a80d 100644
--- a/src/test/ui/threads-sendsync/issue-29488.rs
+++ b/tests/ui/threads-sendsync/issue-29488.rs
diff --git a/src/test/ui/threads-sendsync/issue-43733-2.rs b/tests/ui/threads-sendsync/issue-43733-2.rs
index 32baeec43..32baeec43 100644
--- a/src/test/ui/threads-sendsync/issue-43733-2.rs
+++ b/tests/ui/threads-sendsync/issue-43733-2.rs
diff --git a/src/test/ui/threads-sendsync/issue-43733.mir.stderr b/tests/ui/threads-sendsync/issue-43733.mir.stderr
index 1e21a6b37..1e21a6b37 100644
--- a/src/test/ui/threads-sendsync/issue-43733.mir.stderr
+++ b/tests/ui/threads-sendsync/issue-43733.mir.stderr
diff --git a/src/test/ui/threads-sendsync/issue-43733.rs b/tests/ui/threads-sendsync/issue-43733.rs
index 935e02944..935e02944 100644
--- a/src/test/ui/threads-sendsync/issue-43733.rs
+++ b/tests/ui/threads-sendsync/issue-43733.rs
diff --git a/src/test/ui/threads-sendsync/issue-43733.thir.stderr b/tests/ui/threads-sendsync/issue-43733.thir.stderr
index ea7ff4080..ea7ff4080 100644
--- a/src/test/ui/threads-sendsync/issue-43733.thir.stderr
+++ b/tests/ui/threads-sendsync/issue-43733.thir.stderr
diff --git a/src/test/ui/threads-sendsync/issue-4446.rs b/tests/ui/threads-sendsync/issue-4446.rs
index 948f2a7bd..948f2a7bd 100644
--- a/src/test/ui/threads-sendsync/issue-4446.rs
+++ b/tests/ui/threads-sendsync/issue-4446.rs
diff --git a/src/test/ui/threads-sendsync/issue-4448.rs b/tests/ui/threads-sendsync/issue-4448.rs
index 27d032689..27d032689 100644
--- a/src/test/ui/threads-sendsync/issue-4448.rs
+++ b/tests/ui/threads-sendsync/issue-4448.rs
diff --git a/src/test/ui/threads-sendsync/issue-8827.rs b/tests/ui/threads-sendsync/issue-8827.rs
index 95be7616a..95be7616a 100644
--- a/src/test/ui/threads-sendsync/issue-8827.rs
+++ b/tests/ui/threads-sendsync/issue-8827.rs
diff --git a/src/test/ui/threads-sendsync/issue-9396.rs b/tests/ui/threads-sendsync/issue-9396.rs
index 3e7e9a51c..3e7e9a51c 100644
--- a/src/test/ui/threads-sendsync/issue-9396.rs
+++ b/tests/ui/threads-sendsync/issue-9396.rs
diff --git a/src/test/ui/threads-sendsync/mpsc_stress.rs b/tests/ui/threads-sendsync/mpsc_stress.rs
index c2e1912de..c2e1912de 100644
--- a/src/test/ui/threads-sendsync/mpsc_stress.rs
+++ b/tests/ui/threads-sendsync/mpsc_stress.rs
diff --git a/src/test/ui/threads-sendsync/send-is-not-static-par-for.rs b/tests/ui/threads-sendsync/send-is-not-static-par-for.rs
index dbe465551..dbe465551 100644
--- a/src/test/ui/threads-sendsync/send-is-not-static-par-for.rs
+++ b/tests/ui/threads-sendsync/send-is-not-static-par-for.rs
diff --git a/src/test/ui/threads-sendsync/send-resource.rs b/tests/ui/threads-sendsync/send-resource.rs
index 023a84d6b..023a84d6b 100644
--- a/src/test/ui/threads-sendsync/send-resource.rs
+++ b/tests/ui/threads-sendsync/send-resource.rs
diff --git a/src/test/ui/threads-sendsync/send-type-inference.rs b/tests/ui/threads-sendsync/send-type-inference.rs
index 0d9af7512..0d9af7512 100644
--- a/src/test/ui/threads-sendsync/send-type-inference.rs
+++ b/tests/ui/threads-sendsync/send-type-inference.rs
diff --git a/src/test/ui/threads-sendsync/send_str_hashmap.rs b/tests/ui/threads-sendsync/send_str_hashmap.rs
index 7d4cca8ad..7d4cca8ad 100644
--- a/src/test/ui/threads-sendsync/send_str_hashmap.rs
+++ b/tests/ui/threads-sendsync/send_str_hashmap.rs
diff --git a/src/test/ui/threads-sendsync/send_str_treemap.rs b/tests/ui/threads-sendsync/send_str_treemap.rs
index 4d4631745..4d4631745 100644
--- a/src/test/ui/threads-sendsync/send_str_treemap.rs
+++ b/tests/ui/threads-sendsync/send_str_treemap.rs
diff --git a/src/test/ui/threads-sendsync/sendable-class.rs b/tests/ui/threads-sendsync/sendable-class.rs
index 7facf245b..7facf245b 100644
--- a/src/test/ui/threads-sendsync/sendable-class.rs
+++ b/tests/ui/threads-sendsync/sendable-class.rs
diff --git a/src/test/ui/threads-sendsync/sendfn-is-a-block.rs b/tests/ui/threads-sendsync/sendfn-is-a-block.rs
index 62807d894..62807d894 100644
--- a/src/test/ui/threads-sendsync/sendfn-is-a-block.rs
+++ b/tests/ui/threads-sendsync/sendfn-is-a-block.rs
diff --git a/src/test/ui/threads-sendsync/sendfn-spawn-with-fn-arg.rs b/tests/ui/threads-sendsync/sendfn-spawn-with-fn-arg.rs
index 1e598b9e7..1e598b9e7 100644
--- a/src/test/ui/threads-sendsync/sendfn-spawn-with-fn-arg.rs
+++ b/tests/ui/threads-sendsync/sendfn-spawn-with-fn-arg.rs
diff --git a/src/test/ui/threads-sendsync/spawn-fn.rs b/tests/ui/threads-sendsync/spawn-fn.rs
index 1243bb257..1243bb257 100644
--- a/src/test/ui/threads-sendsync/spawn-fn.rs
+++ b/tests/ui/threads-sendsync/spawn-fn.rs
diff --git a/src/test/ui/threads-sendsync/spawn-types.rs b/tests/ui/threads-sendsync/spawn-types.rs
index 1bead6e1b..1bead6e1b 100644
--- a/src/test/ui/threads-sendsync/spawn-types.rs
+++ b/tests/ui/threads-sendsync/spawn-types.rs
diff --git a/src/test/ui/threads-sendsync/spawn.rs b/tests/ui/threads-sendsync/spawn.rs
index b1dcc9417..b1dcc9417 100644
--- a/src/test/ui/threads-sendsync/spawn.rs
+++ b/tests/ui/threads-sendsync/spawn.rs
diff --git a/src/test/ui/threads-sendsync/spawn2.rs b/tests/ui/threads-sendsync/spawn2.rs
index 83e066aef..83e066aef 100644
--- a/src/test/ui/threads-sendsync/spawn2.rs
+++ b/tests/ui/threads-sendsync/spawn2.rs
diff --git a/src/test/ui/threads-sendsync/spawning-with-debug.rs b/tests/ui/threads-sendsync/spawning-with-debug.rs
index 9d3487ffb..9d3487ffb 100644
--- a/src/test/ui/threads-sendsync/spawning-with-debug.rs
+++ b/tests/ui/threads-sendsync/spawning-with-debug.rs
diff --git a/src/test/ui/threads-sendsync/std-sync-right-kind-impls.rs b/tests/ui/threads-sendsync/std-sync-right-kind-impls.rs
index bc64c8162..bc64c8162 100644
--- a/src/test/ui/threads-sendsync/std-sync-right-kind-impls.rs
+++ b/tests/ui/threads-sendsync/std-sync-right-kind-impls.rs
diff --git a/src/test/ui/threads-sendsync/sync-send-atomics.rs b/tests/ui/threads-sendsync/sync-send-atomics.rs
index 0466f4f0e..0466f4f0e 100644
--- a/src/test/ui/threads-sendsync/sync-send-atomics.rs
+++ b/tests/ui/threads-sendsync/sync-send-atomics.rs
diff --git a/src/test/ui/threads-sendsync/sync-send-in-std.rs b/tests/ui/threads-sendsync/sync-send-in-std.rs
index 6d1fba64e..6d1fba64e 100644
--- a/src/test/ui/threads-sendsync/sync-send-in-std.rs
+++ b/tests/ui/threads-sendsync/sync-send-in-std.rs
diff --git a/src/test/ui/threads-sendsync/sync-send-iterators-in-libcollections.rs b/tests/ui/threads-sendsync/sync-send-iterators-in-libcollections.rs
index fd53bb607..fd53bb607 100644
--- a/src/test/ui/threads-sendsync/sync-send-iterators-in-libcollections.rs
+++ b/tests/ui/threads-sendsync/sync-send-iterators-in-libcollections.rs
diff --git a/src/test/ui/threads-sendsync/sync-send-iterators-in-libcore.rs b/tests/ui/threads-sendsync/sync-send-iterators-in-libcore.rs
index 2f6d35f01..2f6d35f01 100644
--- a/src/test/ui/threads-sendsync/sync-send-iterators-in-libcore.rs
+++ b/tests/ui/threads-sendsync/sync-send-iterators-in-libcore.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-0.rs b/tests/ui/threads-sendsync/task-comm-0.rs
index 2b9a50e4d..2b9a50e4d 100644
--- a/src/test/ui/threads-sendsync/task-comm-0.rs
+++ b/tests/ui/threads-sendsync/task-comm-0.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-1.rs b/tests/ui/threads-sendsync/task-comm-1.rs
index 68ca62909..68ca62909 100644
--- a/src/test/ui/threads-sendsync/task-comm-1.rs
+++ b/tests/ui/threads-sendsync/task-comm-1.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-10.rs b/tests/ui/threads-sendsync/task-comm-10.rs
index 4cac0dc90..4cac0dc90 100644
--- a/src/test/ui/threads-sendsync/task-comm-10.rs
+++ b/tests/ui/threads-sendsync/task-comm-10.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-11.rs b/tests/ui/threads-sendsync/task-comm-11.rs
index 8541e143f..8541e143f 100644
--- a/src/test/ui/threads-sendsync/task-comm-11.rs
+++ b/tests/ui/threads-sendsync/task-comm-11.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-12.rs b/tests/ui/threads-sendsync/task-comm-12.rs
index 613a5cee5..613a5cee5 100644
--- a/src/test/ui/threads-sendsync/task-comm-12.rs
+++ b/tests/ui/threads-sendsync/task-comm-12.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-13.rs b/tests/ui/threads-sendsync/task-comm-13.rs
index 327eaaf8f..327eaaf8f 100644
--- a/src/test/ui/threads-sendsync/task-comm-13.rs
+++ b/tests/ui/threads-sendsync/task-comm-13.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-14.rs b/tests/ui/threads-sendsync/task-comm-14.rs
index 88d6b0902..88d6b0902 100644
--- a/src/test/ui/threads-sendsync/task-comm-14.rs
+++ b/tests/ui/threads-sendsync/task-comm-14.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-15.rs b/tests/ui/threads-sendsync/task-comm-15.rs
index adb14abdc..adb14abdc 100644
--- a/src/test/ui/threads-sendsync/task-comm-15.rs
+++ b/tests/ui/threads-sendsync/task-comm-15.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-16.rs b/tests/ui/threads-sendsync/task-comm-16.rs
index d808fd9ac..d808fd9ac 100644
--- a/src/test/ui/threads-sendsync/task-comm-16.rs
+++ b/tests/ui/threads-sendsync/task-comm-16.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-17.rs b/tests/ui/threads-sendsync/task-comm-17.rs
index 722497870..722497870 100644
--- a/src/test/ui/threads-sendsync/task-comm-17.rs
+++ b/tests/ui/threads-sendsync/task-comm-17.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-3.rs b/tests/ui/threads-sendsync/task-comm-3.rs
index 570ae0a82..570ae0a82 100644
--- a/src/test/ui/threads-sendsync/task-comm-3.rs
+++ b/tests/ui/threads-sendsync/task-comm-3.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-4.rs b/tests/ui/threads-sendsync/task-comm-4.rs
index b259d69d1..b259d69d1 100644
--- a/src/test/ui/threads-sendsync/task-comm-4.rs
+++ b/tests/ui/threads-sendsync/task-comm-4.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-5.rs b/tests/ui/threads-sendsync/task-comm-5.rs
index cdedf034a..cdedf034a 100644
--- a/src/test/ui/threads-sendsync/task-comm-5.rs
+++ b/tests/ui/threads-sendsync/task-comm-5.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-6.rs b/tests/ui/threads-sendsync/task-comm-6.rs
index 990205ad3..990205ad3 100644
--- a/src/test/ui/threads-sendsync/task-comm-6.rs
+++ b/tests/ui/threads-sendsync/task-comm-6.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-7.rs b/tests/ui/threads-sendsync/task-comm-7.rs
index 0b9673e00..0b9673e00 100644
--- a/src/test/ui/threads-sendsync/task-comm-7.rs
+++ b/tests/ui/threads-sendsync/task-comm-7.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-9.rs b/tests/ui/threads-sendsync/task-comm-9.rs
index 5ed330121..5ed330121 100644
--- a/src/test/ui/threads-sendsync/task-comm-9.rs
+++ b/tests/ui/threads-sendsync/task-comm-9.rs
diff --git a/src/test/ui/threads-sendsync/task-comm-chan-nil.rs b/tests/ui/threads-sendsync/task-comm-chan-nil.rs
index a93ddff43..a93ddff43 100644
--- a/src/test/ui/threads-sendsync/task-comm-chan-nil.rs
+++ b/tests/ui/threads-sendsync/task-comm-chan-nil.rs
diff --git a/src/test/ui/threads-sendsync/task-life-0.rs b/tests/ui/threads-sendsync/task-life-0.rs
index 785cff9a0..785cff9a0 100644
--- a/src/test/ui/threads-sendsync/task-life-0.rs
+++ b/tests/ui/threads-sendsync/task-life-0.rs
diff --git a/src/test/ui/threads-sendsync/task-spawn-barefn.rs b/tests/ui/threads-sendsync/task-spawn-barefn.rs
index e5b899e0a..e5b899e0a 100644
--- a/src/test/ui/threads-sendsync/task-spawn-barefn.rs
+++ b/tests/ui/threads-sendsync/task-spawn-barefn.rs
diff --git a/src/test/ui/threads-sendsync/task-spawn-move-and-copy.rs b/tests/ui/threads-sendsync/task-spawn-move-and-copy.rs
index a63903778..a63903778 100644
--- a/src/test/ui/threads-sendsync/task-spawn-move-and-copy.rs
+++ b/tests/ui/threads-sendsync/task-spawn-move-and-copy.rs
diff --git a/src/test/ui/threads-sendsync/task-stderr.rs b/tests/ui/threads-sendsync/task-stderr.rs
index 68d226ffb..68d226ffb 100644
--- a/src/test/ui/threads-sendsync/task-stderr.rs
+++ b/tests/ui/threads-sendsync/task-stderr.rs
diff --git a/src/test/ui/threads-sendsync/tcp-stress.rs b/tests/ui/threads-sendsync/tcp-stress.rs
index 175663643..175663643 100644
--- a/src/test/ui/threads-sendsync/tcp-stress.rs
+++ b/tests/ui/threads-sendsync/tcp-stress.rs
diff --git a/src/test/ui/threads-sendsync/test-tasks-invalid-value.rs b/tests/ui/threads-sendsync/test-tasks-invalid-value.rs
index 641142142..641142142 100644
--- a/src/test/ui/threads-sendsync/test-tasks-invalid-value.rs
+++ b/tests/ui/threads-sendsync/test-tasks-invalid-value.rs
diff --git a/src/test/ui/threads-sendsync/thread-local-extern-static.rs b/tests/ui/threads-sendsync/thread-local-extern-static.rs
index a2dda31aa..a2dda31aa 100644
--- a/src/test/ui/threads-sendsync/thread-local-extern-static.rs
+++ b/tests/ui/threads-sendsync/thread-local-extern-static.rs
diff --git a/src/test/ui/threads-sendsync/thread-local-syntax.rs b/tests/ui/threads-sendsync/thread-local-syntax.rs
index 2f4805e47..2f4805e47 100644
--- a/src/test/ui/threads-sendsync/thread-local-syntax.rs
+++ b/tests/ui/threads-sendsync/thread-local-syntax.rs
diff --git a/src/test/ui/threads-sendsync/threads.rs b/tests/ui/threads-sendsync/threads.rs
index e3da83aa1..e3da83aa1 100644
--- a/src/test/ui/threads-sendsync/threads.rs
+++ b/tests/ui/threads-sendsync/threads.rs
diff --git a/src/test/ui/threads-sendsync/tls-dtors-are-run-in-a-static-binary.rs b/tests/ui/threads-sendsync/tls-dtors-are-run-in-a-static-binary.rs
index 8baef4334..8baef4334 100644
--- a/src/test/ui/threads-sendsync/tls-dtors-are-run-in-a-static-binary.rs
+++ b/tests/ui/threads-sendsync/tls-dtors-are-run-in-a-static-binary.rs
diff --git a/src/test/ui/threads-sendsync/tls-init-on-init.rs b/tests/ui/threads-sendsync/tls-init-on-init.rs
index 193c18151..193c18151 100644
--- a/src/test/ui/threads-sendsync/tls-init-on-init.rs
+++ b/tests/ui/threads-sendsync/tls-init-on-init.rs
diff --git a/src/test/ui/threads-sendsync/tls-try-with.rs b/tests/ui/threads-sendsync/tls-try-with.rs
index f36ab4e4f..f36ab4e4f 100644
--- a/src/test/ui/threads-sendsync/tls-try-with.rs
+++ b/tests/ui/threads-sendsync/tls-try-with.rs
diff --git a/src/test/ui/threads-sendsync/trivial-message.rs b/tests/ui/threads-sendsync/trivial-message.rs
index 5831e867b..5831e867b 100644
--- a/src/test/ui/threads-sendsync/trivial-message.rs
+++ b/tests/ui/threads-sendsync/trivial-message.rs
diff --git a/src/test/ui/threads-sendsync/unwind-resource.rs b/tests/ui/threads-sendsync/unwind-resource.rs
index 6950a9c40..6950a9c40 100644
--- a/src/test/ui/threads-sendsync/unwind-resource.rs
+++ b/tests/ui/threads-sendsync/unwind-resource.rs
diff --git a/src/test/ui/threads-sendsync/yield.rs b/tests/ui/threads-sendsync/yield.rs
index e83ba5560..e83ba5560 100644
--- a/src/test/ui/threads-sendsync/yield.rs
+++ b/tests/ui/threads-sendsync/yield.rs
diff --git a/src/test/ui/threads-sendsync/yield1.rs b/tests/ui/threads-sendsync/yield1.rs
index 002e59055..002e59055 100644
--- a/src/test/ui/threads-sendsync/yield1.rs
+++ b/tests/ui/threads-sendsync/yield1.rs
diff --git a/src/test/ui/threads-sendsync/yield2.rs b/tests/ui/threads-sendsync/yield2.rs
index 376faab0c..376faab0c 100644
--- a/src/test/ui/threads-sendsync/yield2.rs
+++ b/tests/ui/threads-sendsync/yield2.rs
diff --git a/src/test/ui/tool-attributes/diagnostic_item.rs b/tests/ui/tool-attributes/diagnostic_item.rs
index 26a52ce60..26a52ce60 100644
--- a/src/test/ui/tool-attributes/diagnostic_item.rs
+++ b/tests/ui/tool-attributes/diagnostic_item.rs
diff --git a/src/test/ui/tool-attributes/diagnostic_item.stderr b/tests/ui/tool-attributes/diagnostic_item.stderr
index 743e4b658..743e4b658 100644
--- a/src/test/ui/tool-attributes/diagnostic_item.stderr
+++ b/tests/ui/tool-attributes/diagnostic_item.stderr
diff --git a/src/test/ui/tool-attributes/diagnostic_item2.rs b/tests/ui/tool-attributes/diagnostic_item2.rs
index b32a66b16..b32a66b16 100644
--- a/src/test/ui/tool-attributes/diagnostic_item2.rs
+++ b/tests/ui/tool-attributes/diagnostic_item2.rs
diff --git a/src/test/ui/tool-attributes/diagnostic_item3.rs b/tests/ui/tool-attributes/diagnostic_item3.rs
index c1a236ed1..c1a236ed1 100644
--- a/src/test/ui/tool-attributes/diagnostic_item3.rs
+++ b/tests/ui/tool-attributes/diagnostic_item3.rs
diff --git a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs b/tests/ui/tool-attributes/tool-attributes-misplaced-1.rs
index bf45ba2ed..bf45ba2ed 100644
--- a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs
+++ b/tests/ui/tool-attributes/tool-attributes-misplaced-1.rs
diff --git a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr b/tests/ui/tool-attributes/tool-attributes-misplaced-1.stderr
index 71fd5f1d4..71fd5f1d4 100644
--- a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr
+++ b/tests/ui/tool-attributes/tool-attributes-misplaced-1.stderr
diff --git a/src/test/ui/tool-attributes/tool-attributes-misplaced-2.rs b/tests/ui/tool-attributes/tool-attributes-misplaced-2.rs
index b5666e4ea..b5666e4ea 100644
--- a/src/test/ui/tool-attributes/tool-attributes-misplaced-2.rs
+++ b/tests/ui/tool-attributes/tool-attributes-misplaced-2.rs
diff --git a/src/test/ui/tool-attributes/tool-attributes-misplaced-2.stderr b/tests/ui/tool-attributes/tool-attributes-misplaced-2.stderr
index 6d0f826e6..6d0f826e6 100644
--- a/src/test/ui/tool-attributes/tool-attributes-misplaced-2.stderr
+++ b/tests/ui/tool-attributes/tool-attributes-misplaced-2.stderr
diff --git a/src/test/ui/tool-attributes/tool-attributes-shadowing.rs b/tests/ui/tool-attributes/tool-attributes-shadowing.rs
index 21bbaa3a7..21bbaa3a7 100644
--- a/src/test/ui/tool-attributes/tool-attributes-shadowing.rs
+++ b/tests/ui/tool-attributes/tool-attributes-shadowing.rs
diff --git a/src/test/ui/tool-attributes/tool-attributes-shadowing.stderr b/tests/ui/tool-attributes/tool-attributes-shadowing.stderr
index 98ad109a0..98ad109a0 100644
--- a/src/test/ui/tool-attributes/tool-attributes-shadowing.stderr
+++ b/tests/ui/tool-attributes/tool-attributes-shadowing.stderr
diff --git a/src/test/ui/tool_lints-fail.rs b/tests/ui/tool_lints-fail.rs
index 5cbd63be5..5cbd63be5 100644
--- a/src/test/ui/tool_lints-fail.rs
+++ b/tests/ui/tool_lints-fail.rs
diff --git a/src/test/ui/tool_lints-fail.stderr b/tests/ui/tool_lints-fail.stderr
index 16f678144..16f678144 100644
--- a/src/test/ui/tool_lints-fail.stderr
+++ b/tests/ui/tool_lints-fail.stderr
diff --git a/src/test/ui/tool_lints-rpass.rs b/tests/ui/tool_lints-rpass.rs
index e467d3437..e467d3437 100644
--- a/src/test/ui/tool_lints-rpass.rs
+++ b/tests/ui/tool_lints-rpass.rs
diff --git a/src/test/ui/tool_lints.rs b/tests/ui/tool_lints.rs
index ef27532f6..ef27532f6 100644
--- a/src/test/ui/tool_lints.rs
+++ b/tests/ui/tool_lints.rs
diff --git a/src/test/ui/tool_lints.stderr b/tests/ui/tool_lints.stderr
index d36cd193b..d36cd193b 100644
--- a/src/test/ui/tool_lints.stderr
+++ b/tests/ui/tool_lints.stderr
diff --git a/src/test/ui/tool_lints_2018_preview.rs b/tests/ui/tool_lints_2018_preview.rs
index 190f0b99d..190f0b99d 100644
--- a/src/test/ui/tool_lints_2018_preview.rs
+++ b/tests/ui/tool_lints_2018_preview.rs
diff --git a/src/test/ui/track-diagnostics/track.rs b/tests/ui/track-diagnostics/track.rs
index 61b9137ea..61b9137ea 100644
--- a/src/test/ui/track-diagnostics/track.rs
+++ b/tests/ui/track-diagnostics/track.rs
diff --git a/src/test/ui/track-diagnostics/track.stderr b/tests/ui/track-diagnostics/track.stderr
index 8256c1f5f..8256c1f5f 100644
--- a/src/test/ui/track-diagnostics/track.stderr
+++ b/tests/ui/track-diagnostics/track.stderr
diff --git a/src/test/ui/track-diagnostics/track2.rs b/tests/ui/track-diagnostics/track2.rs
index dc105c61d..dc105c61d 100644
--- a/src/test/ui/track-diagnostics/track2.rs
+++ b/tests/ui/track-diagnostics/track2.rs
diff --git a/src/test/ui/track-diagnostics/track2.stderr b/tests/ui/track-diagnostics/track2.stderr
index fe13e5ef3..fe13e5ef3 100644
--- a/src/test/ui/track-diagnostics/track2.stderr
+++ b/tests/ui/track-diagnostics/track2.stderr
diff --git a/src/test/ui/track-diagnostics/track3.rs b/tests/ui/track-diagnostics/track3.rs
index 069923950..069923950 100644
--- a/src/test/ui/track-diagnostics/track3.rs
+++ b/tests/ui/track-diagnostics/track3.rs
diff --git a/src/test/ui/track-diagnostics/track3.stderr b/tests/ui/track-diagnostics/track3.stderr
index dc468d7e8..dc468d7e8 100644
--- a/src/test/ui/track-diagnostics/track3.stderr
+++ b/tests/ui/track-diagnostics/track3.stderr
diff --git a/src/test/ui/track-diagnostics/track4.rs b/tests/ui/track-diagnostics/track4.rs
index 35eec799b..35eec799b 100644
--- a/src/test/ui/track-diagnostics/track4.rs
+++ b/tests/ui/track-diagnostics/track4.rs
diff --git a/src/test/ui/track-diagnostics/track4.stderr b/tests/ui/track-diagnostics/track4.stderr
index c4668444c..c4668444c 100644
--- a/src/test/ui/track-diagnostics/track4.stderr
+++ b/tests/ui/track-diagnostics/track4.stderr
diff --git a/src/test/ui/track-diagnostics/track5.rs b/tests/ui/track-diagnostics/track5.rs
index c41d9424e..c41d9424e 100644
--- a/src/test/ui/track-diagnostics/track5.rs
+++ b/tests/ui/track-diagnostics/track5.rs
diff --git a/src/test/ui/track-diagnostics/track5.stderr b/tests/ui/track-diagnostics/track5.stderr
index aa54f92b6..aa54f92b6 100644
--- a/src/test/ui/track-diagnostics/track5.stderr
+++ b/tests/ui/track-diagnostics/track5.stderr
diff --git a/src/test/ui/track-diagnostics/track6.rs b/tests/ui/track-diagnostics/track6.rs
index 307e31018..307e31018 100644
--- a/src/test/ui/track-diagnostics/track6.rs
+++ b/tests/ui/track-diagnostics/track6.rs
diff --git a/src/test/ui/track-diagnostics/track6.stderr b/tests/ui/track-diagnostics/track6.stderr
index 1c7537633..1c7537633 100644
--- a/src/test/ui/track-diagnostics/track6.stderr
+++ b/tests/ui/track-diagnostics/track6.stderr
diff --git a/src/test/ui/trailing-comma.rs b/tests/ui/trailing-comma.rs
index 90adba99e..90adba99e 100644
--- a/src/test/ui/trailing-comma.rs
+++ b/tests/ui/trailing-comma.rs
diff --git a/src/test/ui/trait-bounds/impl-bound-with-references-error.rs b/tests/ui/trait-bounds/impl-bound-with-references-error.rs
index e5d0a1aae..e5d0a1aae 100644
--- a/src/test/ui/trait-bounds/impl-bound-with-references-error.rs
+++ b/tests/ui/trait-bounds/impl-bound-with-references-error.rs
diff --git a/src/test/ui/trait-bounds/impl-bound-with-references-error.stderr b/tests/ui/trait-bounds/impl-bound-with-references-error.stderr
index 95fd6bd50..95fd6bd50 100644
--- a/src/test/ui/trait-bounds/impl-bound-with-references-error.stderr
+++ b/tests/ui/trait-bounds/impl-bound-with-references-error.stderr
diff --git a/src/test/ui/trait-bounds/impl-derived-implicit-sized-bound-2.rs b/tests/ui/trait-bounds/impl-derived-implicit-sized-bound-2.rs
index 557d89088..557d89088 100644
--- a/src/test/ui/trait-bounds/impl-derived-implicit-sized-bound-2.rs
+++ b/tests/ui/trait-bounds/impl-derived-implicit-sized-bound-2.rs
diff --git a/src/test/ui/trait-bounds/impl-derived-implicit-sized-bound-2.stderr b/tests/ui/trait-bounds/impl-derived-implicit-sized-bound-2.stderr
index 543ceac8e..543ceac8e 100644
--- a/src/test/ui/trait-bounds/impl-derived-implicit-sized-bound-2.stderr
+++ b/tests/ui/trait-bounds/impl-derived-implicit-sized-bound-2.stderr
diff --git a/src/test/ui/trait-bounds/impl-derived-implicit-sized-bound.rs b/tests/ui/trait-bounds/impl-derived-implicit-sized-bound.rs
index 28da41a0c..28da41a0c 100644
--- a/src/test/ui/trait-bounds/impl-derived-implicit-sized-bound.rs
+++ b/tests/ui/trait-bounds/impl-derived-implicit-sized-bound.rs
diff --git a/src/test/ui/trait-bounds/impl-derived-implicit-sized-bound.stderr b/tests/ui/trait-bounds/impl-derived-implicit-sized-bound.stderr
index f08d68583..f08d68583 100644
--- a/src/test/ui/trait-bounds/impl-derived-implicit-sized-bound.stderr
+++ b/tests/ui/trait-bounds/impl-derived-implicit-sized-bound.stderr
diff --git a/src/test/ui/trait-bounds/impl-missing-where-clause-lifetimes-from-trait.rs b/tests/ui/trait-bounds/impl-missing-where-clause-lifetimes-from-trait.rs
index dcdbd0228..dcdbd0228 100644
--- a/src/test/ui/trait-bounds/impl-missing-where-clause-lifetimes-from-trait.rs
+++ b/tests/ui/trait-bounds/impl-missing-where-clause-lifetimes-from-trait.rs
diff --git a/src/test/ui/trait-bounds/impl-missing-where-clause-lifetimes-from-trait.stderr b/tests/ui/trait-bounds/impl-missing-where-clause-lifetimes-from-trait.stderr
index e26cb2216..e26cb2216 100644
--- a/src/test/ui/trait-bounds/impl-missing-where-clause-lifetimes-from-trait.stderr
+++ b/tests/ui/trait-bounds/impl-missing-where-clause-lifetimes-from-trait.stderr
diff --git a/src/test/ui/trait-bounds/issue-75961.rs b/tests/ui/trait-bounds/issue-75961.rs
index 367eac718..367eac718 100644
--- a/src/test/ui/trait-bounds/issue-75961.rs
+++ b/tests/ui/trait-bounds/issue-75961.rs
diff --git a/src/test/ui/trait-bounds/issue-93008.rs b/tests/ui/trait-bounds/issue-93008.rs
index f4d21a160..f4d21a160 100644
--- a/src/test/ui/trait-bounds/issue-93008.rs
+++ b/tests/ui/trait-bounds/issue-93008.rs
diff --git a/src/test/ui/trait-bounds/issue-94680.rs b/tests/ui/trait-bounds/issue-94680.rs
index 58e892079..58e892079 100644
--- a/src/test/ui/trait-bounds/issue-94680.rs
+++ b/tests/ui/trait-bounds/issue-94680.rs
diff --git a/src/test/ui/trait-bounds/issue-94999.rs b/tests/ui/trait-bounds/issue-94999.rs
index e13190234..e13190234 100644
--- a/src/test/ui/trait-bounds/issue-94999.rs
+++ b/tests/ui/trait-bounds/issue-94999.rs
diff --git a/src/test/ui/trait-bounds/issue-95640.rs b/tests/ui/trait-bounds/issue-95640.rs
index e4e998b5d..e4e998b5d 100644
--- a/src/test/ui/trait-bounds/issue-95640.rs
+++ b/tests/ui/trait-bounds/issue-95640.rs
diff --git a/src/test/ui/trait-bounds/mismatch-fn-trait.rs b/tests/ui/trait-bounds/mismatch-fn-trait.rs
index 0ed64043a..0ed64043a 100644
--- a/src/test/ui/trait-bounds/mismatch-fn-trait.rs
+++ b/tests/ui/trait-bounds/mismatch-fn-trait.rs
diff --git a/src/test/ui/trait-bounds/mismatch-fn-trait.stderr b/tests/ui/trait-bounds/mismatch-fn-trait.stderr
index 961e6d88f..961e6d88f 100644
--- a/src/test/ui/trait-bounds/mismatch-fn-trait.stderr
+++ b/tests/ui/trait-bounds/mismatch-fn-trait.stderr
diff --git a/src/test/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.fixed b/tests/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.fixed
index 39e90d7a3..39e90d7a3 100644
--- a/src/test/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.fixed
+++ b/tests/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.fixed
diff --git a/src/test/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.rs b/tests/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.rs
index ee6ed0cae..ee6ed0cae 100644
--- a/src/test/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.rs
+++ b/tests/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.rs
diff --git a/src/test/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.stderr b/tests/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.stderr
index b29766295..b29766295 100644
--- a/src/test/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.stderr
+++ b/tests/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.stderr
diff --git a/src/test/ui/trait-bounds/unsized-bound.rs b/tests/ui/trait-bounds/unsized-bound.rs
index 035b8ef1b..035b8ef1b 100644
--- a/src/test/ui/trait-bounds/unsized-bound.rs
+++ b/tests/ui/trait-bounds/unsized-bound.rs
diff --git a/src/test/ui/trait-bounds/unsized-bound.stderr b/tests/ui/trait-bounds/unsized-bound.stderr
index ec85ada7a..da27ba1c5 100644
--- a/src/test/ui/trait-bounds/unsized-bound.stderr
+++ b/tests/ui/trait-bounds/unsized-bound.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the size for values of type `B` cannot be known at compilation time
-  --> $DIR/unsized-bound.rs:2:12
+  --> $DIR/unsized-bound.rs:2:30
    |
 LL | impl<A, B> Trait<(A, B)> for (A, B) where A: ?Sized, B: ?Sized, {}
-   |         -  ^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |         -                    ^^^^^^ doesn't have a size known at compile-time
    |         |
    |         this type parameter needs to be `std::marker::Sized`
    |
@@ -38,10 +38,10 @@ LL + impl<A, B> Trait<(A, B)> for (A, B) where B: ?Sized, {}
    |
 
 error[E0277]: the size for values of type `C` cannot be known at compilation time
-  --> $DIR/unsized-bound.rs:5:31
+  --> $DIR/unsized-bound.rs:5:52
    |
 LL | impl<A, B: ?Sized, C: ?Sized> Trait<(A, B, C)> for (A, B, C) where A: ?Sized, {}
-   |                    -          ^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |                    -                               ^^^^^^^^^ doesn't have a size known at compile-time
    |                    |
    |                    this type parameter needs to be `std::marker::Sized`
    |
@@ -92,10 +92,10 @@ LL + impl<A, B, C: ?Sized> Trait<(A, B, C)> for (A, B, C) where A: ?Sized, {}
    |
 
 error[E0277]: the size for values of type `B` cannot be known at compilation time
-  --> $DIR/unsized-bound.rs:10:28
+  --> $DIR/unsized-bound.rs:10:47
    |
 LL | impl<A: ?Sized, B: ?Sized> Trait2<(A, B)> for (A, B) {}
-   |                 -          ^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |                 -                             ^^^^^^ doesn't have a size known at compile-time
    |                 |
    |                 this type parameter needs to be `std::marker::Sized`
    |
@@ -131,10 +131,10 @@ LL + impl<A, B: ?Sized> Trait2<(A, B)> for (A, B) {}
    |
 
 error[E0277]: the size for values of type `A` cannot be known at compilation time
-  --> $DIR/unsized-bound.rs:14:9
+  --> $DIR/unsized-bound.rs:14:23
    |
 LL | impl<A> Trait3<A> for A where A: ?Sized {}
-   |      -  ^^^^^^^^^ doesn't have a size known at compile-time
+   |      -                ^ doesn't have a size known at compile-time
    |      |
    |      this type parameter needs to be `std::marker::Sized`
    |
@@ -154,10 +154,10 @@ LL | trait Trait3<A: ?Sized> {}
    |               ++++++++
 
 error[E0277]: the size for values of type `A` cannot be known at compilation time
-  --> $DIR/unsized-bound.rs:17:17
+  --> $DIR/unsized-bound.rs:17:31
    |
 LL | impl<A: ?Sized> Trait4<A> for A {}
-   |      -          ^^^^^^^^^ doesn't have a size known at compile-time
+   |      -                        ^ doesn't have a size known at compile-time
    |      |
    |      this type parameter needs to be `std::marker::Sized`
    |
@@ -177,10 +177,10 @@ LL | trait Trait4<A: ?Sized> {}
    |               ++++++++
 
 error[E0277]: the size for values of type `X` cannot be known at compilation time
-  --> $DIR/unsized-bound.rs:20:12
+  --> $DIR/unsized-bound.rs:20:29
    |
 LL | impl<X, Y> Trait5<X, Y> for X where X: ?Sized {}
-   |      -     ^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |      -                      ^ doesn't have a size known at compile-time
    |      |
    |      this type parameter needs to be `std::marker::Sized`
    |
@@ -200,10 +200,10 @@ LL | trait Trait5<A: ?Sized, B> {}
    |               ++++++++
 
 error[E0277]: the size for values of type `X` cannot be known at compilation time
-  --> $DIR/unsized-bound.rs:23:20
+  --> $DIR/unsized-bound.rs:23:37
    |
 LL | impl<X: ?Sized, Y> Trait6<X, Y> for X {}
-   |      -             ^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |      -                              ^ doesn't have a size known at compile-time
    |      |
    |      this type parameter needs to be `std::marker::Sized`
    |
diff --git a/src/test/ui/trait-impl-bound-suggestions.fixed b/tests/ui/trait-impl-bound-suggestions.fixed
index 744e7bef0..744e7bef0 100644
--- a/src/test/ui/trait-impl-bound-suggestions.fixed
+++ b/tests/ui/trait-impl-bound-suggestions.fixed
diff --git a/src/test/ui/trait-impl-bound-suggestions.rs b/tests/ui/trait-impl-bound-suggestions.rs
index bf7517517..bf7517517 100644
--- a/src/test/ui/trait-impl-bound-suggestions.rs
+++ b/tests/ui/trait-impl-bound-suggestions.rs
diff --git a/src/test/ui/trait-impl-bound-suggestions.stderr b/tests/ui/trait-impl-bound-suggestions.stderr
index 38679679c..38679679c 100644
--- a/src/test/ui/trait-impl-bound-suggestions.stderr
+++ b/tests/ui/trait-impl-bound-suggestions.stderr
diff --git a/src/test/ui/trait-method-number-parameters.rs b/tests/ui/trait-method-number-parameters.rs
index 719005d66..719005d66 100644
--- a/src/test/ui/trait-method-number-parameters.rs
+++ b/tests/ui/trait-method-number-parameters.rs
diff --git a/src/test/ui/trait-method-number-parameters.stderr b/tests/ui/trait-method-number-parameters.stderr
index e47fe1a80..e47fe1a80 100644
--- a/src/test/ui/trait-method-number-parameters.stderr
+++ b/tests/ui/trait-method-number-parameters.stderr
diff --git a/src/test/ui/traits/alias/ambiguous.rs b/tests/ui/traits/alias/ambiguous.rs
index 28409e0c6..28409e0c6 100644
--- a/src/test/ui/traits/alias/ambiguous.rs
+++ b/tests/ui/traits/alias/ambiguous.rs
diff --git a/src/test/ui/traits/alias/ambiguous.stderr b/tests/ui/traits/alias/ambiguous.stderr
index 0fe1a7967..0fe1a7967 100644
--- a/src/test/ui/traits/alias/ambiguous.stderr
+++ b/tests/ui/traits/alias/ambiguous.stderr
diff --git a/src/test/ui/traits/alias/auxiliary/greeter.rs b/tests/ui/traits/alias/auxiliary/greeter.rs
index 9e4122155..9e4122155 100644
--- a/src/test/ui/traits/alias/auxiliary/greeter.rs
+++ b/tests/ui/traits/alias/auxiliary/greeter.rs
diff --git a/src/test/ui/traits/alias/auxiliary/send_sync.rs b/tests/ui/traits/alias/auxiliary/send_sync.rs
index 9e56b87e0..9e56b87e0 100644
--- a/src/test/ui/traits/alias/auxiliary/send_sync.rs
+++ b/tests/ui/traits/alias/auxiliary/send_sync.rs
diff --git a/src/test/ui/traits/alias/basic.rs b/tests/ui/traits/alias/basic.rs
index d8168f299..d8168f299 100644
--- a/src/test/ui/traits/alias/basic.rs
+++ b/tests/ui/traits/alias/basic.rs
diff --git a/src/test/ui/traits/alias/bounds.rs b/tests/ui/traits/alias/bounds.rs
index b97eb38c5..b97eb38c5 100644
--- a/src/test/ui/traits/alias/bounds.rs
+++ b/tests/ui/traits/alias/bounds.rs
diff --git a/src/test/ui/traits/alias/cross-crate.rs b/tests/ui/traits/alias/cross-crate.rs
index 8919c6434..8919c6434 100644
--- a/src/test/ui/traits/alias/cross-crate.rs
+++ b/tests/ui/traits/alias/cross-crate.rs
diff --git a/src/test/ui/traits/alias/cross-crate.stderr b/tests/ui/traits/alias/cross-crate.stderr
index ae9d7d0a9..ae9d7d0a9 100644
--- a/src/test/ui/traits/alias/cross-crate.stderr
+++ b/tests/ui/traits/alias/cross-crate.stderr
diff --git a/src/test/ui/traits/alias/generic-default-in-dyn.rs b/tests/ui/traits/alias/generic-default-in-dyn.rs
index d44e1c2a9..d44e1c2a9 100644
--- a/src/test/ui/traits/alias/generic-default-in-dyn.rs
+++ b/tests/ui/traits/alias/generic-default-in-dyn.rs
diff --git a/src/test/ui/traits/alias/generic-default-in-dyn.stderr b/tests/ui/traits/alias/generic-default-in-dyn.stderr
index 76a068e86..0d3f794aa 100644
--- a/src/test/ui/traits/alias/generic-default-in-dyn.stderr
+++ b/tests/ui/traits/alias/generic-default-in-dyn.stderr
@@ -12,11 +12,9 @@ error[E0393]: the type parameter `Rhs` must be explicitly specified
    |
 LL | struct Foo<T>(dyn SendEqAlias<T>);
    |                   ^^^^^^^^^^^^^^ missing reference to `Rhs`
+  --> $SRC_DIR/core/src/cmp.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub trait PartialEq<Rhs: ?Sized = Self> {
-   | --------------------------------------- type parameter `Rhs` must be specified for this
+   = note: type parameter `Rhs` must be specified for this
    |
    = note: because of the default `Self` reference, type parameters must be specified on object types
 
@@ -25,11 +23,9 @@ error[E0393]: the type parameter `Rhs` must be explicitly specified
    |
 LL | struct Bar<T>(dyn SendEqAlias<T>, T);
    |                   ^^^^^^^^^^^^^^ missing reference to `Rhs`
+  --> $SRC_DIR/core/src/cmp.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub trait PartialEq<Rhs: ?Sized = Self> {
-   | --------------------------------------- type parameter `Rhs` must be specified for this
+   = note: type parameter `Rhs` must be specified for this
    |
    = note: because of the default `Self` reference, type parameters must be specified on object types
 
diff --git a/src/test/ui/traits/alias/impl.rs b/tests/ui/traits/alias/impl.rs
index 6e35793a0..6e35793a0 100644
--- a/src/test/ui/traits/alias/impl.rs
+++ b/tests/ui/traits/alias/impl.rs
diff --git a/src/test/ui/traits/alias/impl.stderr b/tests/ui/traits/alias/impl.stderr
index cedcd1021..cedcd1021 100644
--- a/src/test/ui/traits/alias/impl.stderr
+++ b/tests/ui/traits/alias/impl.stderr
diff --git a/src/test/ui/traits/alias/import-cross-crate.rs b/tests/ui/traits/alias/import-cross-crate.rs
index 868585cd0..868585cd0 100644
--- a/src/test/ui/traits/alias/import-cross-crate.rs
+++ b/tests/ui/traits/alias/import-cross-crate.rs
diff --git a/src/test/ui/traits/alias/import.rs b/tests/ui/traits/alias/import.rs
index 802a8f156..802a8f156 100644
--- a/src/test/ui/traits/alias/import.rs
+++ b/tests/ui/traits/alias/import.rs
diff --git a/src/test/ui/traits/alias/issue-60021-assoc-method-resolve.rs b/tests/ui/traits/alias/issue-60021-assoc-method-resolve.rs
index 5e27ed3c6..5e27ed3c6 100644
--- a/src/test/ui/traits/alias/issue-60021-assoc-method-resolve.rs
+++ b/tests/ui/traits/alias/issue-60021-assoc-method-resolve.rs
diff --git a/src/test/ui/traits/alias/issue-72415-assoc-const-resolve.rs b/tests/ui/traits/alias/issue-72415-assoc-const-resolve.rs
index e49125d10..e49125d10 100644
--- a/src/test/ui/traits/alias/issue-72415-assoc-const-resolve.rs
+++ b/tests/ui/traits/alias/issue-72415-assoc-const-resolve.rs
diff --git a/src/test/ui/traits/alias/issue-75983.rs b/tests/ui/traits/alias/issue-75983.rs
index f9a7f36de..f9a7f36de 100644
--- a/src/test/ui/traits/alias/issue-75983.rs
+++ b/tests/ui/traits/alias/issue-75983.rs
diff --git a/src/test/ui/traits/alias/issue-83613.rs b/tests/ui/traits/alias/issue-83613.rs
index 2462e703a..2462e703a 100644
--- a/src/test/ui/traits/alias/issue-83613.rs
+++ b/tests/ui/traits/alias/issue-83613.rs
diff --git a/src/test/ui/traits/alias/issue-83613.stderr b/tests/ui/traits/alias/issue-83613.stderr
index a78294da6..a78294da6 100644
--- a/src/test/ui/traits/alias/issue-83613.stderr
+++ b/tests/ui/traits/alias/issue-83613.stderr
diff --git a/src/test/ui/traits/alias/maybe-bound.rs b/tests/ui/traits/alias/maybe-bound.rs
index 284baa481..284baa481 100644
--- a/src/test/ui/traits/alias/maybe-bound.rs
+++ b/tests/ui/traits/alias/maybe-bound.rs
diff --git a/src/test/ui/traits/alias/no-duplicates.rs b/tests/ui/traits/alias/no-duplicates.rs
index 88feb8917..88feb8917 100644
--- a/src/test/ui/traits/alias/no-duplicates.rs
+++ b/tests/ui/traits/alias/no-duplicates.rs
diff --git a/src/test/ui/traits/alias/no-duplicates.stderr b/tests/ui/traits/alias/no-duplicates.stderr
index bf244b97e..bf244b97e 100644
--- a/src/test/ui/traits/alias/no-duplicates.stderr
+++ b/tests/ui/traits/alias/no-duplicates.stderr
diff --git a/src/test/ui/traits/alias/no-extra-traits.rs b/tests/ui/traits/alias/no-extra-traits.rs
index 4dad8c0f8..4dad8c0f8 100644
--- a/src/test/ui/traits/alias/no-extra-traits.rs
+++ b/tests/ui/traits/alias/no-extra-traits.rs
diff --git a/src/test/ui/traits/alias/no-extra-traits.stderr b/tests/ui/traits/alias/no-extra-traits.stderr
index 4b1ddf684..4b1ddf684 100644
--- a/src/test/ui/traits/alias/no-extra-traits.stderr
+++ b/tests/ui/traits/alias/no-extra-traits.stderr
diff --git a/src/test/ui/traits/alias/object-fail.rs b/tests/ui/traits/alias/object-fail.rs
index 5c753ff20..5c753ff20 100644
--- a/src/test/ui/traits/alias/object-fail.rs
+++ b/tests/ui/traits/alias/object-fail.rs
diff --git a/src/test/ui/traits/alias/object-fail.stderr b/tests/ui/traits/alias/object-fail.stderr
index 325bc6d28..048a150df 100644
--- a/src/test/ui/traits/alias/object-fail.stderr
+++ b/tests/ui/traits/alias/object-fail.stderr
@@ -7,8 +7,7 @@ LL |     let _: &dyn EqAlias = &123;
 note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
    |
-LL | pub trait Eq: PartialEq<Self> {
-   |               ^^^^^^^^^^^^^^^ the trait cannot be made into an object because it uses `Self` as a type parameter
+   = note: the trait cannot be made into an object because it uses `Self` as a type parameter
 
 error[E0191]: the value of the associated type `Item` (from trait `Iterator`) must be specified
   --> $DIR/object-fail.rs:9:17
diff --git a/src/test/ui/traits/alias/object-wf.rs b/tests/ui/traits/alias/object-wf.rs
index 1440f02df..1440f02df 100644
--- a/src/test/ui/traits/alias/object-wf.rs
+++ b/tests/ui/traits/alias/object-wf.rs
diff --git a/src/test/ui/traits/alias/object.rs b/tests/ui/traits/alias/object.rs
index 12177cd82..12177cd82 100644
--- a/src/test/ui/traits/alias/object.rs
+++ b/tests/ui/traits/alias/object.rs
diff --git a/src/test/ui/traits/alias/only-maybe-bound.rs b/tests/ui/traits/alias/only-maybe-bound.rs
index e4abf314e..e4abf314e 100644
--- a/src/test/ui/traits/alias/only-maybe-bound.rs
+++ b/tests/ui/traits/alias/only-maybe-bound.rs
diff --git a/src/test/ui/traits/alias/only-maybe-bound.stderr b/tests/ui/traits/alias/only-maybe-bound.stderr
index 175ec8120..175ec8120 100644
--- a/src/test/ui/traits/alias/only-maybe-bound.stderr
+++ b/tests/ui/traits/alias/only-maybe-bound.stderr
diff --git a/src/test/ui/traits/alias/self-in-const-generics.rs b/tests/ui/traits/alias/self-in-const-generics.rs
index b0de8ccd6..b0de8ccd6 100644
--- a/src/test/ui/traits/alias/self-in-const-generics.rs
+++ b/tests/ui/traits/alias/self-in-const-generics.rs
diff --git a/src/test/ui/traits/alias/self-in-const-generics.stderr b/tests/ui/traits/alias/self-in-const-generics.stderr
index 61cc217cf..61cc217cf 100644
--- a/src/test/ui/traits/alias/self-in-const-generics.stderr
+++ b/tests/ui/traits/alias/self-in-const-generics.stderr
diff --git a/src/test/ui/traits/alias/self-in-generics.rs b/tests/ui/traits/alias/self-in-generics.rs
index 0bb6335f9..0bb6335f9 100644
--- a/src/test/ui/traits/alias/self-in-generics.rs
+++ b/tests/ui/traits/alias/self-in-generics.rs
diff --git a/src/test/ui/traits/alias/self-in-generics.stderr b/tests/ui/traits/alias/self-in-generics.stderr
index 110d60e6e..110d60e6e 100644
--- a/src/test/ui/traits/alias/self-in-generics.stderr
+++ b/tests/ui/traits/alias/self-in-generics.stderr
diff --git a/src/test/ui/traits/alias/style_lint.rs b/tests/ui/traits/alias/style_lint.rs
index 33be20054..33be20054 100644
--- a/src/test/ui/traits/alias/style_lint.rs
+++ b/tests/ui/traits/alias/style_lint.rs
diff --git a/src/test/ui/traits/alias/style_lint.stderr b/tests/ui/traits/alias/style_lint.stderr
index 91e2ea90e..91e2ea90e 100644
--- a/src/test/ui/traits/alias/style_lint.stderr
+++ b/tests/ui/traits/alias/style_lint.stderr
diff --git a/src/test/ui/traits/alias/suggest-trait-alias-instead-of-type.fixed b/tests/ui/traits/alias/suggest-trait-alias-instead-of-type.fixed
index 8a94abaeb..8a94abaeb 100644
--- a/src/test/ui/traits/alias/suggest-trait-alias-instead-of-type.fixed
+++ b/tests/ui/traits/alias/suggest-trait-alias-instead-of-type.fixed
diff --git a/src/test/ui/traits/alias/suggest-trait-alias-instead-of-type.rs b/tests/ui/traits/alias/suggest-trait-alias-instead-of-type.rs
index 40c678c28..40c678c28 100644
--- a/src/test/ui/traits/alias/suggest-trait-alias-instead-of-type.rs
+++ b/tests/ui/traits/alias/suggest-trait-alias-instead-of-type.rs
diff --git a/src/test/ui/traits/alias/suggest-trait-alias-instead-of-type.stderr b/tests/ui/traits/alias/suggest-trait-alias-instead-of-type.stderr
index 6e03eeada..6e03eeada 100644
--- a/src/test/ui/traits/alias/suggest-trait-alias-instead-of-type.stderr
+++ b/tests/ui/traits/alias/suggest-trait-alias-instead-of-type.stderr
diff --git a/src/test/ui/traits/alias/syntax-fail.rs b/tests/ui/traits/alias/syntax-fail.rs
index 039bbce8c..039bbce8c 100644
--- a/src/test/ui/traits/alias/syntax-fail.rs
+++ b/tests/ui/traits/alias/syntax-fail.rs
diff --git a/src/test/ui/traits/alias/syntax-fail.stderr b/tests/ui/traits/alias/syntax-fail.stderr
index 748b92056..748b92056 100644
--- a/src/test/ui/traits/alias/syntax-fail.stderr
+++ b/tests/ui/traits/alias/syntax-fail.stderr
diff --git a/src/test/ui/traits/alias/syntax.rs b/tests/ui/traits/alias/syntax.rs
index 17557a51a..17557a51a 100644
--- a/src/test/ui/traits/alias/syntax.rs
+++ b/tests/ui/traits/alias/syntax.rs
diff --git a/src/test/ui/traits/alias/wf.rs b/tests/ui/traits/alias/wf.rs
index d10e2abb0..d10e2abb0 100644
--- a/src/test/ui/traits/alias/wf.rs
+++ b/tests/ui/traits/alias/wf.rs
diff --git a/src/test/ui/traits/alias/wf.stderr b/tests/ui/traits/alias/wf.stderr
index 7172008d3..7172008d3 100644
--- a/src/test/ui/traits/alias/wf.stderr
+++ b/tests/ui/traits/alias/wf.stderr
diff --git a/src/test/ui/traits/alignment-gep-tup-like-1.rs b/tests/ui/traits/alignment-gep-tup-like-1.rs
index eb503dcf3..eb503dcf3 100644
--- a/src/test/ui/traits/alignment-gep-tup-like-1.rs
+++ b/tests/ui/traits/alignment-gep-tup-like-1.rs
diff --git a/src/test/ui/traits/anon-static-method.rs b/tests/ui/traits/anon-static-method.rs
index ede01afae..ede01afae 100644
--- a/src/test/ui/traits/anon-static-method.rs
+++ b/tests/ui/traits/anon-static-method.rs
diff --git a/src/test/ui/traits/anon_trait_static_method_exe.rs b/tests/ui/traits/anon_trait_static_method_exe.rs
index b49302954..b49302954 100644
--- a/src/test/ui/traits/anon_trait_static_method_exe.rs
+++ b/tests/ui/traits/anon_trait_static_method_exe.rs
diff --git a/src/test/ui/traits/as-struct-constructor.rs b/tests/ui/traits/as-struct-constructor.rs
index 13ebf9d8d..13ebf9d8d 100644
--- a/src/test/ui/traits/as-struct-constructor.rs
+++ b/tests/ui/traits/as-struct-constructor.rs
diff --git a/src/test/ui/traits/as-struct-constructor.stderr b/tests/ui/traits/as-struct-constructor.stderr
index d06e85f3a..d06e85f3a 100644
--- a/src/test/ui/traits/as-struct-constructor.stderr
+++ b/tests/ui/traits/as-struct-constructor.stderr
diff --git a/src/test/ui/traits/assignability-trait.rs b/tests/ui/traits/assignability-trait.rs
index a8547c1d2..a8547c1d2 100644
--- a/src/test/ui/traits/assignability-trait.rs
+++ b/tests/ui/traits/assignability-trait.rs
diff --git a/tests/ui/traits/assoc-type-in-superbad.rs b/tests/ui/traits/assoc-type-in-superbad.rs
new file mode 100644
index 000000000..65340b2a2
--- /dev/null
+++ b/tests/ui/traits/assoc-type-in-superbad.rs
@@ -0,0 +1,16 @@
+// Test case where an associated type is referenced from within the
+// supertrait definition, and the impl makes the wrong
+// associations. Issue #20220.
+
+use std::vec::IntoIter;
+
+pub trait Foo: Iterator<Item = <Self as Foo>::Key> {
+    type Key;
+}
+
+impl Foo for IntoIter<i32> {
+    type Key = u32;
+    //~^ ERROR expected `IntoIter<i32>` to be an iterator that yields `u32`, but it yields `i32`
+}
+
+fn main() {}
diff --git a/src/test/ui/traits/assoc-type-in-superbad.stderr b/tests/ui/traits/assoc-type-in-superbad.stderr
index 3e2d9d903..7fa1d2c2e 100644
--- a/src/test/ui/traits/assoc-type-in-superbad.stderr
+++ b/tests/ui/traits/assoc-type-in-superbad.stderr
@@ -1,4 +1,4 @@
-error[E0271]: expected `std::vec::IntoIter<i32>` to be an iterator that yields `u32`, but it yields `i32`
+error[E0271]: expected `IntoIter<i32>` to be an iterator that yields `u32`, but it yields `i32`
   --> $DIR/assoc-type-in-superbad.rs:12:16
    |
 LL |     type Key = u32;
diff --git a/src/test/ui/traits/assoc-type-in-supertrait.rs b/tests/ui/traits/assoc-type-in-supertrait.rs
index 7d6a754cc..7d6a754cc 100644
--- a/src/test/ui/traits/assoc-type-in-supertrait.rs
+++ b/tests/ui/traits/assoc-type-in-supertrait.rs
diff --git a/src/test/ui/traits/associated_type_bound/assoc_type_bound_with_struct.rs b/tests/ui/traits/associated_type_bound/assoc_type_bound_with_struct.rs
index 471a6b836..471a6b836 100644
--- a/src/test/ui/traits/associated_type_bound/assoc_type_bound_with_struct.rs
+++ b/tests/ui/traits/associated_type_bound/assoc_type_bound_with_struct.rs
diff --git a/src/test/ui/traits/associated_type_bound/assoc_type_bound_with_struct.stderr b/tests/ui/traits/associated_type_bound/assoc_type_bound_with_struct.stderr
index 9ca446a0a..5be334986 100644
--- a/src/test/ui/traits/associated_type_bound/assoc_type_bound_with_struct.stderr
+++ b/tests/ui/traits/associated_type_bound/assoc_type_bound_with_struct.stderr
@@ -9,11 +9,9 @@ error[E0404]: expected trait, found struct `String`
    |
 LL | struct Foo<T> where T: Bar, <T as Bar>::Baz: String {
    |                                              ^^^^^^ not a trait
+  --> $SRC_DIR/alloc/src/string.rs:LL:COL
    |
-  ::: $SRC_DIR/alloc/src/string.rs:LL:COL
-   |
-LL | pub trait ToString {
-   | ------------------ similarly named trait `ToString` defined here
+   = note: similarly named trait `ToString` defined here
    |
 help: constrain the associated type to `String`
    |
@@ -29,11 +27,9 @@ error[E0404]: expected trait, found struct `String`
    |
 LL | struct Qux<'a, T> where T: Bar, <&'a T as Bar>::Baz: String {
    |                                                      ^^^^^^ not a trait
+  --> $SRC_DIR/alloc/src/string.rs:LL:COL
    |
-  ::: $SRC_DIR/alloc/src/string.rs:LL:COL
-   |
-LL | pub trait ToString {
-   | ------------------ similarly named trait `ToString` defined here
+   = note: similarly named trait `ToString` defined here
    |
 help: constrain the associated type to `String`
    |
@@ -49,11 +45,9 @@ error[E0404]: expected trait, found struct `String`
    |
 LL | fn foo<T: Bar>(_: T) where <T as Bar>::Baz: String {
    |                                             ^^^^^^ not a trait
+  --> $SRC_DIR/alloc/src/string.rs:LL:COL
    |
-  ::: $SRC_DIR/alloc/src/string.rs:LL:COL
-   |
-LL | pub trait ToString {
-   | ------------------ similarly named trait `ToString` defined here
+   = note: similarly named trait `ToString` defined here
    |
 help: constrain the associated type to `String`
    |
@@ -69,11 +63,9 @@ error[E0404]: expected trait, found struct `String`
    |
 LL | fn qux<'a, T: Bar>(_: &'a T) where <&'a T as Bar>::Baz: String {
    |                                                         ^^^^^^ not a trait
+  --> $SRC_DIR/alloc/src/string.rs:LL:COL
    |
-  ::: $SRC_DIR/alloc/src/string.rs:LL:COL
-   |
-LL | pub trait ToString {
-   | ------------------ similarly named trait `ToString` defined here
+   = note: similarly named trait `ToString` defined here
    |
 help: constrain the associated type to `String`
    |
@@ -89,11 +81,9 @@ error[E0404]: expected trait, found struct `String`
    |
 LL | fn issue_95327() where <u8 as Unresolved>::Assoc: String {}
    |                                                   ^^^^^^ help: a trait with a similar name exists: `ToString`
+  --> $SRC_DIR/alloc/src/string.rs:LL:COL
    |
-  ::: $SRC_DIR/alloc/src/string.rs:LL:COL
-   |
-LL | pub trait ToString {
-   | ------------------ similarly named trait `ToString` defined here
+   = note: similarly named trait `ToString` defined here
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-1.rs b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-1.rs
index b1f124c7e..b1f124c7e 100644
--- a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-1.rs
+++ b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-1.rs
diff --git a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-1.stderr b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-1.stderr
index fa7a8a2a0..fa7a8a2a0 100644
--- a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-1.stderr
+++ b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-1.stderr
diff --git a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-2-ok.rs b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-2-ok.rs
index 1422dda27..1422dda27 100644
--- a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-2-ok.rs
+++ b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-2-ok.rs
diff --git a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-2.rs b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-2.rs
index eb2fb6e84..eb2fb6e84 100644
--- a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-2.rs
+++ b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-2.rs
diff --git a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-2.stderr b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-2.stderr
index 10e82c54e..10e82c54e 100644
--- a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-2.stderr
+++ b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-2.stderr
diff --git a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-3.rs b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-3.rs
index ba04fd93a..ba04fd93a 100644
--- a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-3.rs
+++ b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-3.rs
diff --git a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-3.stderr b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-3.stderr
index ade552c4b..ade552c4b 100644
--- a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-3.stderr
+++ b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-3.stderr
diff --git a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-4.rs b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-4.rs
index e9ca1563f..e9ca1563f 100644
--- a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-4.rs
+++ b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-4.rs
diff --git a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-4.stderr b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-4.stderr
index 4891ee9c2..4891ee9c2 100644
--- a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-4.stderr
+++ b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-4.stderr
diff --git a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-5.rs b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-5.rs
index 7d733ad26..7d733ad26 100644
--- a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-5.rs
+++ b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-5.rs
diff --git a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-5.stderr b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-5.stderr
index 00fdb3753..00fdb3753 100644
--- a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-5.stderr
+++ b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-5.stderr
diff --git a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-6.rs b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-6.rs
index cb196d67f..cb196d67f 100644
--- a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-6.rs
+++ b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-6.rs
diff --git a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-6.stderr b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-6.stderr
index 9b0975e5e..9b0975e5e 100644
--- a/src/test/ui/traits/associated_type_bound/check-trait-object-bounds-6.stderr
+++ b/tests/ui/traits/associated_type_bound/check-trait-object-bounds-6.stderr
diff --git a/src/test/ui/traits/associated_type_bound/issue-51446.rs b/tests/ui/traits/associated_type_bound/issue-51446.rs
index 7dd95de73..7dd95de73 100644
--- a/src/test/ui/traits/associated_type_bound/issue-51446.rs
+++ b/tests/ui/traits/associated_type_bound/issue-51446.rs
diff --git a/src/test/ui/traits/astconv-cycle-between-and-type.rs b/tests/ui/traits/astconv-cycle-between-and-type.rs
index cc8f9dc51..cc8f9dc51 100644
--- a/src/test/ui/traits/astconv-cycle-between-and-type.rs
+++ b/tests/ui/traits/astconv-cycle-between-and-type.rs
diff --git a/src/test/ui/traits/augmented-assignments-trait.rs b/tests/ui/traits/augmented-assignments-trait.rs
index 747a5393f..747a5393f 100644
--- a/src/test/ui/traits/augmented-assignments-trait.rs
+++ b/tests/ui/traits/augmented-assignments-trait.rs
diff --git a/src/test/ui/traits/auxiliary/anon_trait_static_method_lib.rs b/tests/ui/traits/auxiliary/anon_trait_static_method_lib.rs
index dceec7e3e..dceec7e3e 100644
--- a/src/test/ui/traits/auxiliary/anon_trait_static_method_lib.rs
+++ b/tests/ui/traits/auxiliary/anon_trait_static_method_lib.rs
diff --git a/src/test/ui/traits/auxiliary/go_trait.rs b/tests/ui/traits/auxiliary/go_trait.rs
index aa0ec2289..aa0ec2289 100644
--- a/src/test/ui/traits/auxiliary/go_trait.rs
+++ b/tests/ui/traits/auxiliary/go_trait.rs
diff --git a/src/test/ui/traits/auxiliary/issue_89119_intercrate_caching.rs b/tests/ui/traits/auxiliary/issue_89119_intercrate_caching.rs
index 769e89731..769e89731 100644
--- a/src/test/ui/traits/auxiliary/issue_89119_intercrate_caching.rs
+++ b/tests/ui/traits/auxiliary/issue_89119_intercrate_caching.rs
diff --git a/src/test/ui/traits/auxiliary/trait_safety_lib.rs b/tests/ui/traits/auxiliary/trait_safety_lib.rs
index 6fc432ed4..6fc432ed4 100644
--- a/src/test/ui/traits/auxiliary/trait_safety_lib.rs
+++ b/tests/ui/traits/auxiliary/trait_safety_lib.rs
diff --git a/src/test/ui/traits/auxiliary/traitimpl.rs b/tests/ui/traits/auxiliary/traitimpl.rs
index fda5314cd..fda5314cd 100644
--- a/src/test/ui/traits/auxiliary/traitimpl.rs
+++ b/tests/ui/traits/auxiliary/traitimpl.rs
diff --git a/src/test/ui/traits/bad-method-typaram-kind.rs b/tests/ui/traits/bad-method-typaram-kind.rs
index b088eae1c..b088eae1c 100644
--- a/src/test/ui/traits/bad-method-typaram-kind.rs
+++ b/tests/ui/traits/bad-method-typaram-kind.rs
diff --git a/src/test/ui/traits/bad-method-typaram-kind.stderr b/tests/ui/traits/bad-method-typaram-kind.stderr
index 56acfbe80..56acfbe80 100644
--- a/src/test/ui/traits/bad-method-typaram-kind.stderr
+++ b/tests/ui/traits/bad-method-typaram-kind.stderr
diff --git a/src/test/ui/traits/bad-sized.rs b/tests/ui/traits/bad-sized.rs
index a15219679..a15219679 100644
--- a/src/test/ui/traits/bad-sized.rs
+++ b/tests/ui/traits/bad-sized.rs
diff --git a/src/test/ui/traits/bad-sized.stderr b/tests/ui/traits/bad-sized.stderr
index 6f9113fff..fb9900bc5 100644
--- a/src/test/ui/traits/bad-sized.stderr
+++ b/tests/ui/traits/bad-sized.stderr
@@ -18,9 +18,6 @@ LL |     let x: Vec<dyn Trait + Sized> = Vec::new();
    = help: the trait `Sized` is not implemented for `dyn Trait`
 note: required by a bound in `Vec`
   --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-   |
-LL | pub struct Vec<T, #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global> {
-   |                ^ required by this bound in `Vec`
 
 error[E0277]: the size for values of type `dyn Trait` cannot be known at compilation time
   --> $DIR/bad-sized.rs:4:37
@@ -31,9 +28,6 @@ LL |     let x: Vec<dyn Trait + Sized> = Vec::new();
    = help: the trait `Sized` is not implemented for `dyn Trait`
 note: required by a bound in `Vec::<T>::new`
   --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-   |
-LL | impl<T> Vec<T> {
-   |      ^ required by this bound in `Vec::<T>::new`
 
 error[E0277]: the size for values of type `dyn Trait` cannot be known at compilation time
   --> $DIR/bad-sized.rs:4:37
@@ -44,9 +38,6 @@ LL |     let x: Vec<dyn Trait + Sized> = Vec::new();
    = help: the trait `Sized` is not implemented for `dyn Trait`
 note: required by a bound in `Vec`
   --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-   |
-LL | pub struct Vec<T, #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global> {
-   |                ^ required by this bound in `Vec`
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/traits/bound/assoc-fn-bound-root-obligation.rs b/tests/ui/traits/bound/assoc-fn-bound-root-obligation.rs
index f9a934764..f9a934764 100644
--- a/src/test/ui/traits/bound/assoc-fn-bound-root-obligation.rs
+++ b/tests/ui/traits/bound/assoc-fn-bound-root-obligation.rs
diff --git a/src/test/ui/traits/bound/assoc-fn-bound-root-obligation.stderr b/tests/ui/traits/bound/assoc-fn-bound-root-obligation.stderr
index ce9ab2d81..ce9ab2d81 100644
--- a/src/test/ui/traits/bound/assoc-fn-bound-root-obligation.stderr
+++ b/tests/ui/traits/bound/assoc-fn-bound-root-obligation.stderr
diff --git a/src/test/ui/traits/bound/auxiliary/crate_a1.rs b/tests/ui/traits/bound/auxiliary/crate_a1.rs
index 6aa010258..6aa010258 100644
--- a/src/test/ui/traits/bound/auxiliary/crate_a1.rs
+++ b/tests/ui/traits/bound/auxiliary/crate_a1.rs
diff --git a/src/test/ui/traits/bound/auxiliary/crate_a2.rs b/tests/ui/traits/bound/auxiliary/crate_a2.rs
index d6057db5e..d6057db5e 100644
--- a/src/test/ui/traits/bound/auxiliary/crate_a2.rs
+++ b/tests/ui/traits/bound/auxiliary/crate_a2.rs
diff --git a/src/test/ui/traits/bound/auxiliary/on_structs_and_enums_xc.rs b/tests/ui/traits/bound/auxiliary/on_structs_and_enums_xc.rs
index 7e9592eee..7e9592eee 100644
--- a/src/test/ui/traits/bound/auxiliary/on_structs_and_enums_xc.rs
+++ b/tests/ui/traits/bound/auxiliary/on_structs_and_enums_xc.rs
diff --git a/src/test/ui/traits/bound/basic.rs b/tests/ui/traits/bound/basic.rs
index 8c8a7eb7d..8c8a7eb7d 100644
--- a/src/test/ui/traits/bound/basic.rs
+++ b/tests/ui/traits/bound/basic.rs
diff --git a/src/test/ui/traits/bound/generic_trait.rs b/tests/ui/traits/bound/generic_trait.rs
index 18382bb59..18382bb59 100644
--- a/src/test/ui/traits/bound/generic_trait.rs
+++ b/tests/ui/traits/bound/generic_trait.rs
diff --git a/src/test/ui/traits/bound/impl-comparison-duplicates.rs b/tests/ui/traits/bound/impl-comparison-duplicates.rs
index de6c2afa2..de6c2afa2 100644
--- a/src/test/ui/traits/bound/impl-comparison-duplicates.rs
+++ b/tests/ui/traits/bound/impl-comparison-duplicates.rs
diff --git a/src/test/ui/traits/bound/in-arc.rs b/tests/ui/traits/bound/in-arc.rs
index a1492c0b9..a1492c0b9 100644
--- a/src/test/ui/traits/bound/in-arc.rs
+++ b/tests/ui/traits/bound/in-arc.rs
diff --git a/src/test/ui/traits/bound/multiple.rs b/tests/ui/traits/bound/multiple.rs
index 868b33407..868b33407 100644
--- a/src/test/ui/traits/bound/multiple.rs
+++ b/tests/ui/traits/bound/multiple.rs
diff --git a/src/test/ui/traits/bound/not-on-bare-trait.rs b/tests/ui/traits/bound/not-on-bare-trait.rs
index daf18c670..daf18c670 100644
--- a/src/test/ui/traits/bound/not-on-bare-trait.rs
+++ b/tests/ui/traits/bound/not-on-bare-trait.rs
diff --git a/src/test/ui/traits/bound/not-on-bare-trait.stderr b/tests/ui/traits/bound/not-on-bare-trait.stderr
index 8da0b6d6b..36b08a7d3 100644
--- a/src/test/ui/traits/bound/not-on-bare-trait.stderr
+++ b/tests/ui/traits/bound/not-on-bare-trait.stderr
@@ -20,6 +20,10 @@ LL | fn foo(_x: Foo + Send) {
    |
    = help: the trait `Sized` is not implemented for `(dyn Foo + Send + 'static)`
    = help: unsized fn params are gated as an unstable feature
+help: you can use `impl Trait` as the argument type
+   |
+LL | fn foo(_x: impl Foo + Send) {
+   |            ++++
 help: function arguments must have a statically known size, borrowed types always have a known size
    |
 LL | fn foo(_x: &Foo + Send) {
diff --git a/src/test/ui/traits/bound/not-on-struct.rs b/tests/ui/traits/bound/not-on-struct.rs
index 8633e9d7a..8633e9d7a 100644
--- a/src/test/ui/traits/bound/not-on-struct.rs
+++ b/tests/ui/traits/bound/not-on-struct.rs
diff --git a/src/test/ui/traits/bound/not-on-struct.stderr b/tests/ui/traits/bound/not-on-struct.stderr
index 2de35dc7f..2de35dc7f 100644
--- a/src/test/ui/traits/bound/not-on-struct.stderr
+++ b/tests/ui/traits/bound/not-on-struct.stderr
diff --git a/src/test/ui/traits/bound/on-structs-and-enums-in-fns.rs b/tests/ui/traits/bound/on-structs-and-enums-in-fns.rs
index 6a6fcf530..6a6fcf530 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums-in-fns.rs
+++ b/tests/ui/traits/bound/on-structs-and-enums-in-fns.rs
diff --git a/src/test/ui/traits/bound/on-structs-and-enums-in-fns.stderr b/tests/ui/traits/bound/on-structs-and-enums-in-fns.stderr
index 61237a63e..61237a63e 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums-in-fns.stderr
+++ b/tests/ui/traits/bound/on-structs-and-enums-in-fns.stderr
diff --git a/src/test/ui/traits/bound/on-structs-and-enums-in-impls.rs b/tests/ui/traits/bound/on-structs-and-enums-in-impls.rs
index d37949952..d37949952 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums-in-impls.rs
+++ b/tests/ui/traits/bound/on-structs-and-enums-in-impls.rs
diff --git a/src/test/ui/traits/bound/on-structs-and-enums-in-impls.stderr b/tests/ui/traits/bound/on-structs-and-enums-in-impls.stderr
index 8a4374226..8a4374226 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums-in-impls.stderr
+++ b/tests/ui/traits/bound/on-structs-and-enums-in-impls.stderr
diff --git a/src/test/ui/traits/bound/on-structs-and-enums-locals.rs b/tests/ui/traits/bound/on-structs-and-enums-locals.rs
index 60ba343bb..60ba343bb 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums-locals.rs
+++ b/tests/ui/traits/bound/on-structs-and-enums-locals.rs
diff --git a/src/test/ui/traits/bound/on-structs-and-enums-locals.stderr b/tests/ui/traits/bound/on-structs-and-enums-locals.stderr
index 20bbe69c0..20bbe69c0 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums-locals.stderr
+++ b/tests/ui/traits/bound/on-structs-and-enums-locals.stderr
diff --git a/src/test/ui/traits/bound/on-structs-and-enums-rpass.rs b/tests/ui/traits/bound/on-structs-and-enums-rpass.rs
index 4dc4fecc9..4dc4fecc9 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums-rpass.rs
+++ b/tests/ui/traits/bound/on-structs-and-enums-rpass.rs
diff --git a/src/test/ui/traits/bound/on-structs-and-enums-static.rs b/tests/ui/traits/bound/on-structs-and-enums-static.rs
index df3f8b8a5..df3f8b8a5 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums-static.rs
+++ b/tests/ui/traits/bound/on-structs-and-enums-static.rs
diff --git a/src/test/ui/traits/bound/on-structs-and-enums-static.stderr b/tests/ui/traits/bound/on-structs-and-enums-static.stderr
index fda734e85..fda734e85 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums-static.stderr
+++ b/tests/ui/traits/bound/on-structs-and-enums-static.stderr
diff --git a/src/test/ui/traits/bound/on-structs-and-enums-xc.rs b/tests/ui/traits/bound/on-structs-and-enums-xc.rs
index 94316d240..94316d240 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums-xc.rs
+++ b/tests/ui/traits/bound/on-structs-and-enums-xc.rs
diff --git a/src/test/ui/traits/bound/on-structs-and-enums-xc.stderr b/tests/ui/traits/bound/on-structs-and-enums-xc.stderr
index 5064b60bf..5064b60bf 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums-xc.stderr
+++ b/tests/ui/traits/bound/on-structs-and-enums-xc.stderr
diff --git a/src/test/ui/traits/bound/on-structs-and-enums-xc1.rs b/tests/ui/traits/bound/on-structs-and-enums-xc1.rs
index 5ef35b513..5ef35b513 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums-xc1.rs
+++ b/tests/ui/traits/bound/on-structs-and-enums-xc1.rs
diff --git a/src/test/ui/traits/bound/on-structs-and-enums-xc1.stderr b/tests/ui/traits/bound/on-structs-and-enums-xc1.stderr
index 3fb5decb7..3fb5decb7 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums-xc1.stderr
+++ b/tests/ui/traits/bound/on-structs-and-enums-xc1.stderr
diff --git a/src/test/ui/traits/bound/on-structs-and-enums.rs b/tests/ui/traits/bound/on-structs-and-enums.rs
index 024084fa7..024084fa7 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums.rs
+++ b/tests/ui/traits/bound/on-structs-and-enums.rs
diff --git a/src/test/ui/traits/bound/on-structs-and-enums.stderr b/tests/ui/traits/bound/on-structs-and-enums.stderr
index fe05b8634..fe05b8634 100644
--- a/src/test/ui/traits/bound/on-structs-and-enums.stderr
+++ b/tests/ui/traits/bound/on-structs-and-enums.stderr
diff --git a/src/test/ui/traits/bound/recursion.rs b/tests/ui/traits/bound/recursion.rs
index 0023ff654..0023ff654 100644
--- a/src/test/ui/traits/bound/recursion.rs
+++ b/tests/ui/traits/bound/recursion.rs
diff --git a/src/test/ui/traits/bound/same-crate-name.rs b/tests/ui/traits/bound/same-crate-name.rs
index 8d646a414..8d646a414 100644
--- a/src/test/ui/traits/bound/same-crate-name.rs
+++ b/tests/ui/traits/bound/same-crate-name.rs
diff --git a/src/test/ui/traits/bound/same-crate-name.stderr b/tests/ui/traits/bound/same-crate-name.stderr
index f66cad77f..f66cad77f 100644
--- a/src/test/ui/traits/bound/same-crate-name.stderr
+++ b/tests/ui/traits/bound/same-crate-name.stderr
diff --git a/src/test/ui/traits/bound/sugar.rs b/tests/ui/traits/bound/sugar.rs
index 65b6f6faa..65b6f6faa 100644
--- a/src/test/ui/traits/bound/sugar.rs
+++ b/tests/ui/traits/bound/sugar.rs
diff --git a/src/test/ui/traits/bound/sugar.stderr b/tests/ui/traits/bound/sugar.stderr
index b67648c7b..b67648c7b 100644
--- a/src/test/ui/traits/bound/sugar.stderr
+++ b/tests/ui/traits/bound/sugar.stderr
diff --git a/src/test/ui/traits/bug-7183-generics.rs b/tests/ui/traits/bug-7183-generics.rs
index f53a17361..f53a17361 100644
--- a/src/test/ui/traits/bug-7183-generics.rs
+++ b/tests/ui/traits/bug-7183-generics.rs
diff --git a/src/test/ui/traits/bug-7295.rs b/tests/ui/traits/bug-7295.rs
index 156ff2ee8..156ff2ee8 100644
--- a/src/test/ui/traits/bug-7295.rs
+++ b/tests/ui/traits/bug-7295.rs
diff --git a/src/test/ui/traits/cache-issue-18209.rs b/tests/ui/traits/cache-issue-18209.rs
index 15676e455..15676e455 100644
--- a/src/test/ui/traits/cache-issue-18209.rs
+++ b/tests/ui/traits/cache-issue-18209.rs
diff --git a/src/test/ui/traits/cache-reached-depth-ice.rs b/tests/ui/traits/cache-reached-depth-ice.rs
index c36ac0857..c36ac0857 100644
--- a/src/test/ui/traits/cache-reached-depth-ice.rs
+++ b/tests/ui/traits/cache-reached-depth-ice.rs
diff --git a/src/test/ui/traits/cache-reached-depth-ice.stderr b/tests/ui/traits/cache-reached-depth-ice.stderr
index 082aa0f5c..082aa0f5c 100644
--- a/src/test/ui/traits/cache-reached-depth-ice.stderr
+++ b/tests/ui/traits/cache-reached-depth-ice.stderr
diff --git a/src/test/ui/traits/coercion-generic-bad.rs b/tests/ui/traits/coercion-generic-bad.rs
index 2e115c732..2e115c732 100644
--- a/src/test/ui/traits/coercion-generic-bad.rs
+++ b/tests/ui/traits/coercion-generic-bad.rs
diff --git a/src/test/ui/traits/coercion-generic-bad.stderr b/tests/ui/traits/coercion-generic-bad.stderr
index 93d6770eb..93d6770eb 100644
--- a/src/test/ui/traits/coercion-generic-bad.stderr
+++ b/tests/ui/traits/coercion-generic-bad.stderr
diff --git a/src/test/ui/traits/coercion-generic-regions.rs b/tests/ui/traits/coercion-generic-regions.rs
index af478df6d..af478df6d 100644
--- a/src/test/ui/traits/coercion-generic-regions.rs
+++ b/tests/ui/traits/coercion-generic-regions.rs
diff --git a/src/test/ui/traits/coercion-generic-regions.stderr b/tests/ui/traits/coercion-generic-regions.stderr
index 5cfb64901..5cfb64901 100644
--- a/src/test/ui/traits/coercion-generic-regions.stderr
+++ b/tests/ui/traits/coercion-generic-regions.stderr
diff --git a/src/test/ui/traits/coercion-generic.rs b/tests/ui/traits/coercion-generic.rs
index bf4dda495..bf4dda495 100644
--- a/src/test/ui/traits/coercion-generic.rs
+++ b/tests/ui/traits/coercion-generic.rs
diff --git a/src/test/ui/traits/coercion.rs b/tests/ui/traits/coercion.rs
index e62742bac..e62742bac 100644
--- a/src/test/ui/traits/coercion.rs
+++ b/tests/ui/traits/coercion.rs
diff --git a/src/test/ui/traits/composition-trivial.rs b/tests/ui/traits/composition-trivial.rs
index 90e5dcd68..90e5dcd68 100644
--- a/src/test/ui/traits/composition-trivial.rs
+++ b/tests/ui/traits/composition-trivial.rs
diff --git a/src/test/ui/traits/conditional-dispatch.rs b/tests/ui/traits/conditional-dispatch.rs
index dd882dce6..dd882dce6 100644
--- a/src/test/ui/traits/conditional-dispatch.rs
+++ b/tests/ui/traits/conditional-dispatch.rs
diff --git a/src/test/ui/traits/conditional-model-fn.rs b/tests/ui/traits/conditional-model-fn.rs
index ba8867003..ba8867003 100644
--- a/src/test/ui/traits/conditional-model-fn.rs
+++ b/tests/ui/traits/conditional-model-fn.rs
diff --git a/src/test/ui/traits/conservative_impl_trait.rs b/tests/ui/traits/conservative_impl_trait.rs
index 4f25e57be..4f25e57be 100644
--- a/src/test/ui/traits/conservative_impl_trait.rs
+++ b/tests/ui/traits/conservative_impl_trait.rs
diff --git a/src/test/ui/traits/copy-guessing.rs b/tests/ui/traits/copy-guessing.rs
index f031dd9ca..f031dd9ca 100644
--- a/src/test/ui/traits/copy-guessing.rs
+++ b/tests/ui/traits/copy-guessing.rs
diff --git a/src/test/ui/traits/copy-impl-cannot-normalize.rs b/tests/ui/traits/copy-impl-cannot-normalize.rs
index a78ff046e..a78ff046e 100644
--- a/src/test/ui/traits/copy-impl-cannot-normalize.rs
+++ b/tests/ui/traits/copy-impl-cannot-normalize.rs
diff --git a/tests/ui/traits/copy-impl-cannot-normalize.stderr b/tests/ui/traits/copy-impl-cannot-normalize.stderr
new file mode 100644
index 000000000..86c511c08
--- /dev/null
+++ b/tests/ui/traits/copy-impl-cannot-normalize.stderr
@@ -0,0 +1,24 @@
+error[E0277]: the trait bound `T: TraitFoo` is not satisfied
+  --> $DIR/copy-impl-cannot-normalize.rs:22:18
+   |
+LL | impl<T> Copy for Foo<T> {}
+   |                  ^^^^^^ the trait `TraitFoo` is not implemented for `T`
+   |
+note: required for `Foo<T>` to implement `Clone`
+  --> $DIR/copy-impl-cannot-normalize.rs:12:9
+   |
+LL | impl<T> Clone for Foo<T>
+   |         ^^^^^     ^^^^^^
+LL | where
+LL |     T: TraitFoo,
+   |        -------- unsatisfied trait bound introduced here
+note: required by a bound in `Copy`
+  --> $SRC_DIR/core/src/marker.rs:LL:COL
+help: consider restricting type parameter `T`
+   |
+LL | impl<T: TraitFoo> Copy for Foo<T> {}
+   |       ++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/traits/copy-is-not-modulo-regions.not_static.stderr b/tests/ui/traits/copy-is-not-modulo-regions.not_static.stderr
new file mode 100644
index 000000000..edd94d201
--- /dev/null
+++ b/tests/ui/traits/copy-is-not-modulo-regions.not_static.stderr
@@ -0,0 +1,22 @@
+error[E0204]: the trait `Copy` may not be implemented for this type
+  --> $DIR/copy-is-not-modulo-regions.rs:13:21
+   |
+LL | struct Bar<'lt>(Foo<'lt>);
+   |                 -------- this field does not implement `Copy`
+...
+LL | impl<'any> Copy for Bar<'any> {}
+   |                     ^^^^^^^^^
+   |
+note: the `Copy` impl for `Foo<'any>` requires that `'any: 'static`
+  --> $DIR/copy-is-not-modulo-regions.rs:10:17
+   |
+LL | struct Bar<'lt>(Foo<'lt>);
+   |                 ^^^^^^^^
+help: consider restricting type parameter `'any`
+   |
+LL | impl<'any: 'static> Copy for Bar<'any> {}
+   |          +++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0204`.
diff --git a/tests/ui/traits/copy-is-not-modulo-regions.rs b/tests/ui/traits/copy-is-not-modulo-regions.rs
new file mode 100644
index 000000000..adb870237
--- /dev/null
+++ b/tests/ui/traits/copy-is-not-modulo-regions.rs
@@ -0,0 +1,19 @@
+// revisions: not_static yes_static
+//[yes_static] check-pass
+
+#[derive(Clone)]
+struct Foo<'lt>(&'lt ());
+
+impl Copy for Foo<'static> {}
+
+#[derive(Clone)]
+struct Bar<'lt>(Foo<'lt>);
+
+#[cfg(not_static)]
+impl<'any> Copy for Bar<'any> {}
+//[not_static]~^ the trait `Copy` may not be implemented for this type
+
+#[cfg(yes_static)]
+impl<'any> Copy for Bar<'static> {}
+
+fn main() {}
diff --git a/tests/ui/traits/copy-requires-self-wf.rs b/tests/ui/traits/copy-requires-self-wf.rs
new file mode 100644
index 000000000..9abfdfab9
--- /dev/null
+++ b/tests/ui/traits/copy-requires-self-wf.rs
@@ -0,0 +1,14 @@
+// check-pass
+
+#[derive(Clone)]
+struct A<'a, T>(&'a T);
+
+impl<'a, T: Copy + 'a> Copy for A<'a, T> {}
+
+#[derive(Clone)]
+struct B<'a, T>(A<'a, T>);
+
+// `T: '_` should be implied by `WF(B<'_, T>)`.
+impl<T: Copy> Copy for B<'_, T> {}
+
+fn main() {}
diff --git a/src/test/ui/traits/cycle-cache-err-60010.rs b/tests/ui/traits/cycle-cache-err-60010.rs
index 94e718317..94e718317 100644
--- a/src/test/ui/traits/cycle-cache-err-60010.rs
+++ b/tests/ui/traits/cycle-cache-err-60010.rs
diff --git a/src/test/ui/traits/cycle-cache-err-60010.stderr b/tests/ui/traits/cycle-cache-err-60010.stderr
index 2478eb354..eeee99760 100644
--- a/src/test/ui/traits/cycle-cache-err-60010.stderr
+++ b/tests/ui/traits/cycle-cache-err-60010.stderr
@@ -22,11 +22,17 @@ note: required for `RootDatabase` to implement `SourceDatabase`
    |
 LL | impl<T> SourceDatabase for T
    |         ^^^^^^^^^^^^^^     ^
+LL | where
+LL |     T: RefUnwindSafe,
+   |        ------------- unsatisfied trait bound introduced here
 note: required for `ParseQuery` to implement `Query<RootDatabase>`
   --> $DIR/cycle-cache-err-60010.rs:37:10
    |
 LL | impl<DB> Query<DB> for ParseQuery
    |          ^^^^^^^^^     ^^^^^^^^^^
+LL | where
+LL |     DB: SourceDatabase,
+   |         -------------- unsatisfied trait bound introduced here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/traits/cycle-generic-bound.rs b/tests/ui/traits/cycle-generic-bound.rs
index 9241f3789..9241f3789 100644
--- a/src/test/ui/traits/cycle-generic-bound.rs
+++ b/tests/ui/traits/cycle-generic-bound.rs
diff --git a/src/test/ui/traits/cycle-type-trait.rs b/tests/ui/traits/cycle-type-trait.rs
index c62d01403..c62d01403 100644
--- a/src/test/ui/traits/cycle-type-trait.rs
+++ b/tests/ui/traits/cycle-type-trait.rs
diff --git a/src/test/ui/traits/default-method/auxiliary/xc.rs b/tests/ui/traits/default-method/auxiliary/xc.rs
index 0fb26af80..0fb26af80 100644
--- a/src/test/ui/traits/default-method/auxiliary/xc.rs
+++ b/tests/ui/traits/default-method/auxiliary/xc.rs
diff --git a/src/test/ui/traits/default-method/auxiliary/xc_2.rs b/tests/ui/traits/default-method/auxiliary/xc_2.rs
index 979233820..979233820 100644
--- a/src/test/ui/traits/default-method/auxiliary/xc_2.rs
+++ b/tests/ui/traits/default-method/auxiliary/xc_2.rs
diff --git a/src/test/ui/traits/default-method/bound-subst.rs b/tests/ui/traits/default-method/bound-subst.rs
index 6a5d5c8ba..6a5d5c8ba 100644
--- a/src/test/ui/traits/default-method/bound-subst.rs
+++ b/tests/ui/traits/default-method/bound-subst.rs
diff --git a/src/test/ui/traits/default-method/bound-subst2.rs b/tests/ui/traits/default-method/bound-subst2.rs
index 78eabba2d..78eabba2d 100644
--- a/src/test/ui/traits/default-method/bound-subst2.rs
+++ b/tests/ui/traits/default-method/bound-subst2.rs
diff --git a/src/test/ui/traits/default-method/bound-subst3.rs b/tests/ui/traits/default-method/bound-subst3.rs
index dd39dec4b..dd39dec4b 100644
--- a/src/test/ui/traits/default-method/bound-subst3.rs
+++ b/tests/ui/traits/default-method/bound-subst3.rs
diff --git a/src/test/ui/traits/default-method/bound-subst4.rs b/tests/ui/traits/default-method/bound-subst4.rs
index ef1330645..ef1330645 100644
--- a/src/test/ui/traits/default-method/bound-subst4.rs
+++ b/tests/ui/traits/default-method/bound-subst4.rs
diff --git a/src/test/ui/traits/default-method/bound.rs b/tests/ui/traits/default-method/bound.rs
index 0855a9db8..0855a9db8 100644
--- a/src/test/ui/traits/default-method/bound.rs
+++ b/tests/ui/traits/default-method/bound.rs
diff --git a/src/test/ui/traits/default-method/macro.rs b/tests/ui/traits/default-method/macro.rs
index 2b50ee9b4..2b50ee9b4 100644
--- a/src/test/ui/traits/default-method/macro.rs
+++ b/tests/ui/traits/default-method/macro.rs
diff --git a/src/test/ui/traits/default-method/mut.rs b/tests/ui/traits/default-method/mut.rs
index 5f8e983b0..5f8e983b0 100644
--- a/src/test/ui/traits/default-method/mut.rs
+++ b/tests/ui/traits/default-method/mut.rs
diff --git a/src/test/ui/traits/default-method/rustc_must_implement_one_of.rs b/tests/ui/traits/default-method/rustc_must_implement_one_of.rs
index 5ba2f5ce3..5ba2f5ce3 100644
--- a/src/test/ui/traits/default-method/rustc_must_implement_one_of.rs
+++ b/tests/ui/traits/default-method/rustc_must_implement_one_of.rs
diff --git a/src/test/ui/traits/default-method/rustc_must_implement_one_of.stderr b/tests/ui/traits/default-method/rustc_must_implement_one_of.stderr
index 5a4dd1388..5a4dd1388 100644
--- a/src/test/ui/traits/default-method/rustc_must_implement_one_of.stderr
+++ b/tests/ui/traits/default-method/rustc_must_implement_one_of.stderr
diff --git a/tests/ui/traits/default-method/rustc_must_implement_one_of_duplicates.rs b/tests/ui/traits/default-method/rustc_must_implement_one_of_duplicates.rs
new file mode 100644
index 000000000..8db5fa615
--- /dev/null
+++ b/tests/ui/traits/default-method/rustc_must_implement_one_of_duplicates.rs
@@ -0,0 +1,19 @@
+#![feature(rustc_attrs)]
+
+#[rustc_must_implement_one_of(a, a)]
+//~^ functions names are duplicated
+trait Trait {
+    fn a() {}
+}
+
+#[rustc_must_implement_one_of(b, a, a, c, b, c)]
+//~^ functions names are duplicated
+//~| functions names are duplicated
+//~| functions names are duplicated
+trait Trait1 {
+    fn a() {}
+    fn b() {}
+    fn c() {}
+}
+
+fn main() {}
diff --git a/tests/ui/traits/default-method/rustc_must_implement_one_of_duplicates.stderr b/tests/ui/traits/default-method/rustc_must_implement_one_of_duplicates.stderr
new file mode 100644
index 000000000..cd1476a6e
--- /dev/null
+++ b/tests/ui/traits/default-method/rustc_must_implement_one_of_duplicates.stderr
@@ -0,0 +1,34 @@
+error: functions names are duplicated
+  --> $DIR/rustc_must_implement_one_of_duplicates.rs:3:31
+   |
+LL | #[rustc_must_implement_one_of(a, a)]
+   |                               ^  ^
+   |
+   = note: all `#[rustc_must_implement_one_of]` arguments must be unique
+
+error: functions names are duplicated
+  --> $DIR/rustc_must_implement_one_of_duplicates.rs:9:34
+   |
+LL | #[rustc_must_implement_one_of(b, a, a, c, b, c)]
+   |                                  ^  ^
+   |
+   = note: all `#[rustc_must_implement_one_of]` arguments must be unique
+
+error: functions names are duplicated
+  --> $DIR/rustc_must_implement_one_of_duplicates.rs:9:31
+   |
+LL | #[rustc_must_implement_one_of(b, a, a, c, b, c)]
+   |                               ^           ^
+   |
+   = note: all `#[rustc_must_implement_one_of]` arguments must be unique
+
+error: functions names are duplicated
+  --> $DIR/rustc_must_implement_one_of_duplicates.rs:9:40
+   |
+LL | #[rustc_must_implement_one_of(b, a, a, c, b, c)]
+   |                                        ^     ^
+   |
+   = note: all `#[rustc_must_implement_one_of]` arguments must be unique
+
+error: aborting due to 4 previous errors
+
diff --git a/src/test/ui/traits/default-method/rustc_must_implement_one_of_gated.rs b/tests/ui/traits/default-method/rustc_must_implement_one_of_gated.rs
index ec2995872..ec2995872 100644
--- a/src/test/ui/traits/default-method/rustc_must_implement_one_of_gated.rs
+++ b/tests/ui/traits/default-method/rustc_must_implement_one_of_gated.rs
diff --git a/src/test/ui/traits/default-method/rustc_must_implement_one_of_gated.stderr b/tests/ui/traits/default-method/rustc_must_implement_one_of_gated.stderr
index 228bc3e35..228bc3e35 100644
--- a/src/test/ui/traits/default-method/rustc_must_implement_one_of_gated.stderr
+++ b/tests/ui/traits/default-method/rustc_must_implement_one_of_gated.stderr
diff --git a/tests/ui/traits/default-method/rustc_must_implement_one_of_misuse.rs b/tests/ui/traits/default-method/rustc_must_implement_one_of_misuse.rs
new file mode 100644
index 000000000..b1b91966c
--- /dev/null
+++ b/tests/ui/traits/default-method/rustc_must_implement_one_of_misuse.rs
@@ -0,0 +1,46 @@
+#![feature(rustc_attrs)]
+
+#[rustc_must_implement_one_of(a, b)]
+//~^ function not found in this trait
+//~| function not found in this trait
+trait Tr0 {}
+
+#[rustc_must_implement_one_of(a, b)]
+//~^ function not found in this trait
+trait Tr1 {
+    fn a() {}
+}
+
+#[rustc_must_implement_one_of(a)]
+//~^ the `#[rustc_must_implement_one_of]` attribute must be used with at least 2 args
+trait Tr2 {
+    fn a() {}
+}
+
+#[rustc_must_implement_one_of]
+//~^ malformed `rustc_must_implement_one_of` attribute input
+trait Tr3 {}
+
+#[rustc_must_implement_one_of(A, B)]
+trait Tr4 {
+    const A: u8 = 1; //~ not a function
+
+    type B; //~ not a function
+}
+
+#[rustc_must_implement_one_of(a, b)]
+trait Tr5 {
+    fn a(); //~ function doesn't have a default implementation
+
+    fn b(); //~ function doesn't have a default implementation
+}
+
+#[rustc_must_implement_one_of(abc, xyz)]
+//~^ attribute should be applied to a trait
+fn function() {}
+
+#[rustc_must_implement_one_of(abc, xyz)]
+//~^ attribute should be applied to a trait
+struct Struct {}
+
+fn main() {}
diff --git a/src/test/ui/traits/default-method/rustc_must_implement_one_of_misuse.stderr b/tests/ui/traits/default-method/rustc_must_implement_one_of_misuse.stderr
index 869184f0d..38e692521 100644
--- a/src/test/ui/traits/default-method/rustc_must_implement_one_of_misuse.stderr
+++ b/tests/ui/traits/default-method/rustc_must_implement_one_of_misuse.stderr
@@ -22,19 +22,19 @@ LL |
 LL | struct Struct {}
    | ---------------- not a trait
 
-error: Function not found in this trait
+error: function not found in this trait
   --> $DIR/rustc_must_implement_one_of_misuse.rs:3:31
    |
 LL | #[rustc_must_implement_one_of(a, b)]
    |                               ^
 
-error: Function not found in this trait
+error: function not found in this trait
   --> $DIR/rustc_must_implement_one_of_misuse.rs:3:34
    |
 LL | #[rustc_must_implement_one_of(a, b)]
    |                                  ^
 
-error: Function not found in this trait
+error: function not found in this trait
   --> $DIR/rustc_must_implement_one_of_misuse.rs:8:34
    |
 LL | #[rustc_must_implement_one_of(a, b)]
@@ -46,7 +46,7 @@ error: the `#[rustc_must_implement_one_of]` attribute must be used with at least
 LL | #[rustc_must_implement_one_of(a)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: Not a function
+error: not a function
   --> $DIR/rustc_must_implement_one_of_misuse.rs:26:5
    |
 LL |     const A: u8 = 1;
@@ -57,9 +57,9 @@ note: required by this annotation
    |
 LL | #[rustc_must_implement_one_of(A, B)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   = note: All `#[rustc_must_implement_one_of]` arguments must be associated function names
+   = note: all `#[rustc_must_implement_one_of]` arguments must be associated function names
 
-error: Not a function
+error: not a function
   --> $DIR/rustc_must_implement_one_of_misuse.rs:28:5
    |
 LL |     type B;
@@ -70,9 +70,9 @@ note: required by this annotation
    |
 LL | #[rustc_must_implement_one_of(A, B)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   = note: All `#[rustc_must_implement_one_of]` arguments must be associated function names
+   = note: all `#[rustc_must_implement_one_of]` arguments must be associated function names
 
-error: This function doesn't have a default implementation
+error: function doesn't have a default implementation
   --> $DIR/rustc_must_implement_one_of_misuse.rs:33:5
    |
 LL |     fn a();
@@ -84,7 +84,7 @@ note: required by this annotation
 LL | #[rustc_must_implement_one_of(a, b)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: This function doesn't have a default implementation
+error: function doesn't have a default implementation
   --> $DIR/rustc_must_implement_one_of_misuse.rs:35:5
    |
 LL |     fn b();
diff --git a/src/test/ui/traits/default-method/self.rs b/tests/ui/traits/default-method/self.rs
index cdf4d1e14..cdf4d1e14 100644
--- a/src/test/ui/traits/default-method/self.rs
+++ b/tests/ui/traits/default-method/self.rs
diff --git a/src/test/ui/traits/default-method/supervtable.rs b/tests/ui/traits/default-method/supervtable.rs
index 939ad5135..939ad5135 100644
--- a/src/test/ui/traits/default-method/supervtable.rs
+++ b/tests/ui/traits/default-method/supervtable.rs
diff --git a/src/test/ui/traits/default-method/trivial.rs b/tests/ui/traits/default-method/trivial.rs
index dc41938ec..dc41938ec 100644
--- a/src/test/ui/traits/default-method/trivial.rs
+++ b/tests/ui/traits/default-method/trivial.rs
diff --git a/src/test/ui/traits/default-method/xc-2.rs b/tests/ui/traits/default-method/xc-2.rs
index 1de61dcf8..1de61dcf8 100644
--- a/src/test/ui/traits/default-method/xc-2.rs
+++ b/tests/ui/traits/default-method/xc-2.rs
diff --git a/src/test/ui/traits/default-method/xc.rs b/tests/ui/traits/default-method/xc.rs
index 76a1573d6..76a1573d6 100644
--- a/src/test/ui/traits/default-method/xc.rs
+++ b/tests/ui/traits/default-method/xc.rs
diff --git a/src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.rs b/tests/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.rs
index 9a444be50..9a444be50 100644
--- a/src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.rs
+++ b/tests/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.rs
diff --git a/src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.stderr b/tests/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.stderr
index 57b2587ae..57b2587ae 100644
--- a/src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.stderr
+++ b/tests/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.stderr
diff --git a/src/test/ui/traits/duplicate-methods.rs b/tests/ui/traits/duplicate-methods.rs
index 1f9bdf56f..1f9bdf56f 100644
--- a/src/test/ui/traits/duplicate-methods.rs
+++ b/tests/ui/traits/duplicate-methods.rs
diff --git a/src/test/ui/traits/duplicate-methods.stderr b/tests/ui/traits/duplicate-methods.stderr
index 6aa88d0df..6aa88d0df 100644
--- a/src/test/ui/traits/duplicate-methods.stderr
+++ b/tests/ui/traits/duplicate-methods.stderr
diff --git a/src/test/ui/traits/dyn-trait.rs b/tests/ui/traits/dyn-trait.rs
index e1c1a8de5..e1c1a8de5 100644
--- a/src/test/ui/traits/dyn-trait.rs
+++ b/tests/ui/traits/dyn-trait.rs
diff --git a/src/test/ui/traits/early-vtbl-resolution.rs b/tests/ui/traits/early-vtbl-resolution.rs
index f4b69c140..f4b69c140 100644
--- a/src/test/ui/traits/early-vtbl-resolution.rs
+++ b/tests/ui/traits/early-vtbl-resolution.rs
diff --git a/src/test/ui/traits/elaborate-type-region.rs b/tests/ui/traits/elaborate-type-region.rs
index 03aef0184..03aef0184 100644
--- a/src/test/ui/traits/elaborate-type-region.rs
+++ b/tests/ui/traits/elaborate-type-region.rs
diff --git a/src/test/ui/traits/false-ambiguity-where-clause-builtin-bound.rs b/tests/ui/traits/false-ambiguity-where-clause-builtin-bound.rs
index 3413db6a6..3413db6a6 100644
--- a/src/test/ui/traits/false-ambiguity-where-clause-builtin-bound.rs
+++ b/tests/ui/traits/false-ambiguity-where-clause-builtin-bound.rs
diff --git a/src/test/ui/traits/fmt-pointer-trait.rs b/tests/ui/traits/fmt-pointer-trait.rs
index b7876b9bd..b7876b9bd 100644
--- a/src/test/ui/traits/fmt-pointer-trait.rs
+++ b/tests/ui/traits/fmt-pointer-trait.rs
diff --git a/tests/ui/traits/fn-trait-cast-diagnostic.rs b/tests/ui/traits/fn-trait-cast-diagnostic.rs
new file mode 100644
index 000000000..e20aa210e
--- /dev/null
+++ b/tests/ui/traits/fn-trait-cast-diagnostic.rs
@@ -0,0 +1,26 @@
+// There are two different instances to check that even if
+// the trait is implemented for the output of a function,
+// it will still be displayed if the function itself implements a trait.
+trait Foo {}
+
+impl Foo for fn() -> bool {}
+impl Foo for bool {}
+
+fn example() -> bool {
+    true
+}
+
+trait NoOtherFoo {}
+
+impl NoOtherFoo for fn() -> bool {}
+
+fn do_on_foo(v: impl Foo) {}
+fn do_on_single_foo(v: impl NoOtherFoo) {}
+
+fn main() {
+    do_on_foo(example);
+    //~^ ERROR the trait bound
+
+    do_on_single_foo(example);
+    //~^ ERROR the trait bound
+}
diff --git a/tests/ui/traits/fn-trait-cast-diagnostic.stderr b/tests/ui/traits/fn-trait-cast-diagnostic.stderr
new file mode 100644
index 000000000..6851dcdd5
--- /dev/null
+++ b/tests/ui/traits/fn-trait-cast-diagnostic.stderr
@@ -0,0 +1,43 @@
+error[E0277]: the trait bound `fn() -> bool {example}: Foo` is not satisfied
+  --> $DIR/fn-trait-cast-diagnostic.rs:21:15
+   |
+LL |     do_on_foo(example);
+   |     --------- ^^^^^^^ the trait `Foo` is not implemented for fn item `fn() -> bool {example}`
+   |     |
+   |     required by a bound introduced by this call
+   |
+note: required by a bound in `do_on_foo`
+  --> $DIR/fn-trait-cast-diagnostic.rs:17:22
+   |
+LL | fn do_on_foo(v: impl Foo) {}
+   |                      ^^^ required by this bound in `do_on_foo`
+help: use parentheses to call this function
+   |
+LL |     do_on_foo(example());
+   |                      ++
+help: the trait `Foo` is implemented for fn pointer `fn() -> bool`, try casting using `as`
+   |
+LL |     do_on_foo(example as fn() -> bool);
+   |                       +++++++++++++++
+
+error[E0277]: the trait bound `fn() -> bool {example}: NoOtherFoo` is not satisfied
+  --> $DIR/fn-trait-cast-diagnostic.rs:24:22
+   |
+LL |     do_on_single_foo(example);
+   |     ---------------- ^^^^^^^ the trait `NoOtherFoo` is not implemented for fn item `fn() -> bool {example}`
+   |     |
+   |     required by a bound introduced by this call
+   |
+note: required by a bound in `do_on_single_foo`
+  --> $DIR/fn-trait-cast-diagnostic.rs:18:29
+   |
+LL | fn do_on_single_foo(v: impl NoOtherFoo) {}
+   |                             ^^^^^^^^^^ required by this bound in `do_on_single_foo`
+help: the trait `NoOtherFoo` is implemented for fn pointer `fn() -> bool`, try casting using `as`
+   |
+LL |     do_on_single_foo(example as fn() -> bool);
+   |                              +++++++++++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/traits/generic.rs b/tests/ui/traits/generic.rs
index 80efe1c93..80efe1c93 100644
--- a/src/test/ui/traits/generic.rs
+++ b/tests/ui/traits/generic.rs
diff --git a/tests/ui/traits/ignore-err-impls.rs b/tests/ui/traits/ignore-err-impls.rs
new file mode 100644
index 000000000..67e880b00
--- /dev/null
+++ b/tests/ui/traits/ignore-err-impls.rs
@@ -0,0 +1,9 @@
+pub struct S;
+
+trait Generic<T> {}
+
+impl<'a, T> Generic<&'a T> for S {}
+impl Generic<Type> for S {}
+//~^ ERROR cannot find type `Type` in this scope
+
+fn main() {}
diff --git a/tests/ui/traits/ignore-err-impls.stderr b/tests/ui/traits/ignore-err-impls.stderr
new file mode 100644
index 000000000..45bd533b5
--- /dev/null
+++ b/tests/ui/traits/ignore-err-impls.stderr
@@ -0,0 +1,14 @@
+error[E0412]: cannot find type `Type` in this scope
+  --> $DIR/ignore-err-impls.rs:6:14
+   |
+LL | impl Generic<Type> for S {}
+   |              ^^^^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+LL | impl<Type> Generic<Type> for S {}
+   |     ++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/traits/impl-1.rs b/tests/ui/traits/impl-1.rs
index d22ac72d1..d22ac72d1 100644
--- a/src/test/ui/traits/impl-1.rs
+++ b/tests/ui/traits/impl-1.rs
diff --git a/src/test/ui/traits/impl-1.stderr b/tests/ui/traits/impl-1.stderr
index 7694e3f5c..7694e3f5c 100644
--- a/src/test/ui/traits/impl-1.stderr
+++ b/tests/ui/traits/impl-1.stderr
diff --git a/src/test/ui/traits/impl-2.rs b/tests/ui/traits/impl-2.rs
index 804ffec12..804ffec12 100644
--- a/src/test/ui/traits/impl-2.rs
+++ b/tests/ui/traits/impl-2.rs
diff --git a/src/test/ui/traits/impl-bounds-checking.rs b/tests/ui/traits/impl-bounds-checking.rs
index 5e65a27bf..5e65a27bf 100644
--- a/src/test/ui/traits/impl-bounds-checking.rs
+++ b/tests/ui/traits/impl-bounds-checking.rs
diff --git a/src/test/ui/traits/impl-bounds-checking.stderr b/tests/ui/traits/impl-bounds-checking.stderr
index b01bacdb8..1f969efe1 100644
--- a/src/test/ui/traits/impl-bounds-checking.stderr
+++ b/tests/ui/traits/impl-bounds-checking.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the trait bound `isize: Clone2` is not satisfied
-  --> $DIR/impl-bounds-checking.rs:10:6
+  --> $DIR/impl-bounds-checking.rs:10:24
    |
 LL | impl Getter<isize> for isize {
-   |      ^^^^^^^^^^^^^ the trait `Clone2` is not implemented for `isize`
+   |                        ^^^^^ the trait `Clone2` is not implemented for `isize`
    |
 note: required by a bound in `Getter`
   --> $DIR/impl-bounds-checking.rs:6:17
diff --git a/src/test/ui/traits/impl-can-not-have-untraitful-items.rs b/tests/ui/traits/impl-can-not-have-untraitful-items.rs
index 0c885447b..0c885447b 100644
--- a/src/test/ui/traits/impl-can-not-have-untraitful-items.rs
+++ b/tests/ui/traits/impl-can-not-have-untraitful-items.rs
diff --git a/src/test/ui/traits/impl-can-not-have-untraitful-items.stderr b/tests/ui/traits/impl-can-not-have-untraitful-items.stderr
index 7f56f34ea..7f56f34ea 100644
--- a/src/test/ui/traits/impl-can-not-have-untraitful-items.stderr
+++ b/tests/ui/traits/impl-can-not-have-untraitful-items.stderr
diff --git a/src/test/ui/traits/impl-different-num-params.rs b/tests/ui/traits/impl-different-num-params.rs
index 53400622d..53400622d 100644
--- a/src/test/ui/traits/impl-different-num-params.rs
+++ b/tests/ui/traits/impl-different-num-params.rs
diff --git a/src/test/ui/traits/impl-different-num-params.stderr b/tests/ui/traits/impl-different-num-params.stderr
index 910ba3510..910ba3510 100644
--- a/src/test/ui/traits/impl-different-num-params.stderr
+++ b/tests/ui/traits/impl-different-num-params.stderr
diff --git a/src/test/ui/traits/impl-evaluation-order.rs b/tests/ui/traits/impl-evaluation-order.rs
index 57809d89a..57809d89a 100644
--- a/src/test/ui/traits/impl-evaluation-order.rs
+++ b/tests/ui/traits/impl-evaluation-order.rs
diff --git a/src/test/ui/traits/impl-for-module.rs b/tests/ui/traits/impl-for-module.rs
index 9004627c5..9004627c5 100644
--- a/src/test/ui/traits/impl-for-module.rs
+++ b/tests/ui/traits/impl-for-module.rs
diff --git a/src/test/ui/traits/impl-for-module.stderr b/tests/ui/traits/impl-for-module.stderr
index 6ec4083b5..6ec4083b5 100644
--- a/src/test/ui/traits/impl-for-module.stderr
+++ b/tests/ui/traits/impl-for-module.stderr
diff --git a/src/test/ui/traits/impl-implicit-trait.rs b/tests/ui/traits/impl-implicit-trait.rs
index fac2bcce2..fac2bcce2 100644
--- a/src/test/ui/traits/impl-implicit-trait.rs
+++ b/tests/ui/traits/impl-implicit-trait.rs
diff --git a/src/test/ui/traits/impl-inherent-prefer-over-trait.rs b/tests/ui/traits/impl-inherent-prefer-over-trait.rs
index 827607888..827607888 100644
--- a/src/test/ui/traits/impl-inherent-prefer-over-trait.rs
+++ b/tests/ui/traits/impl-inherent-prefer-over-trait.rs
diff --git a/src/test/ui/traits/impl-method-mismatch.rs b/tests/ui/traits/impl-method-mismatch.rs
index 683b1c1aa..62580755c 100644
--- a/src/test/ui/traits/impl-method-mismatch.rs
+++ b/tests/ui/traits/impl-method-mismatch.rs
@@ -6,8 +6,8 @@ impl Mumbo for usize {
     // Cannot have a larger effect than the trait:
     unsafe fn jumbo(&self, x: &usize) { *self + *x; }
     //~^ ERROR method `jumbo` has an incompatible type for trait
-    //~| expected fn pointer `fn
-    //~| found fn pointer `unsafe fn
+    //~| expected signature `fn
+    //~| found signature `unsafe fn
 }
 
 fn main() {}
diff --git a/src/test/ui/traits/impl-method-mismatch.stderr b/tests/ui/traits/impl-method-mismatch.stderr
index 30aa97d29..252b5aff9 100644
--- a/src/test/ui/traits/impl-method-mismatch.stderr
+++ b/tests/ui/traits/impl-method-mismatch.stderr
@@ -9,8 +9,8 @@ note: type in trait
    |
 LL |     fn jumbo(&self, x: &usize) -> usize;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   = note: expected fn pointer `fn(&usize, &usize) -> usize`
-              found fn pointer `unsafe fn(&usize, &usize)`
+   = note: expected signature `fn(&usize, &usize) -> usize`
+              found signature `unsafe fn(&usize, &usize)`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/traits/impl-object-overlap-issue-23853.rs b/tests/ui/traits/impl-object-overlap-issue-23853.rs
index e490967b6..e490967b6 100644
--- a/src/test/ui/traits/impl-object-overlap-issue-23853.rs
+++ b/tests/ui/traits/impl-object-overlap-issue-23853.rs
diff --git a/src/test/ui/traits/impl-of-supertrait-has-wrong-lifetime-parameters.rs b/tests/ui/traits/impl-of-supertrait-has-wrong-lifetime-parameters.rs
index 05b9db972..05b9db972 100644
--- a/src/test/ui/traits/impl-of-supertrait-has-wrong-lifetime-parameters.rs
+++ b/tests/ui/traits/impl-of-supertrait-has-wrong-lifetime-parameters.rs
diff --git a/src/test/ui/traits/impl-of-supertrait-has-wrong-lifetime-parameters.stderr b/tests/ui/traits/impl-of-supertrait-has-wrong-lifetime-parameters.stderr
index 5572c6515..1bace8ab2 100644
--- a/src/test/ui/traits/impl-of-supertrait-has-wrong-lifetime-parameters.stderr
+++ b/tests/ui/traits/impl-of-supertrait-has-wrong-lifetime-parameters.stderr
@@ -1,8 +1,8 @@
 error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'b` due to conflicting requirements
-  --> $DIR/impl-of-supertrait-has-wrong-lifetime-parameters.rs:24:13
+  --> $DIR/impl-of-supertrait-has-wrong-lifetime-parameters.rs:24:28
    |
 LL | impl<'a,'b> T2<'a, 'b> for S<'a, 'b> {
-   |             ^^^^^^^^^^
+   |                            ^^^^^^^^^
    |
 note: first, the lifetime cannot outlive the lifetime `'a` as defined here...
   --> $DIR/impl-of-supertrait-has-wrong-lifetime-parameters.rs:24:6
@@ -15,10 +15,10 @@ note: ...but the lifetime must also be valid for the lifetime `'b` as defined he
 LL | impl<'a,'b> T2<'a, 'b> for S<'a, 'b> {
    |         ^^
 note: ...so that the types are compatible
-  --> $DIR/impl-of-supertrait-has-wrong-lifetime-parameters.rs:24:13
+  --> $DIR/impl-of-supertrait-has-wrong-lifetime-parameters.rs:24:28
    |
 LL | impl<'a,'b> T2<'a, 'b> for S<'a, 'b> {
-   |             ^^^^^^^^^^
+   |                            ^^^^^^^^^
    = note: expected `T1<'a>`
               found `T1<'_>`
 
diff --git a/src/test/ui/traits/impl.rs b/tests/ui/traits/impl.rs
index f512d91eb..f512d91eb 100644
--- a/src/test/ui/traits/impl.rs
+++ b/tests/ui/traits/impl.rs
diff --git a/src/test/ui/traits/impl_trait_as_trait_return_position.rs b/tests/ui/traits/impl_trait_as_trait_return_position.rs
index c3325fd80..c3325fd80 100644
--- a/src/test/ui/traits/impl_trait_as_trait_return_position.rs
+++ b/tests/ui/traits/impl_trait_as_trait_return_position.rs
diff --git a/src/test/ui/traits/inductive-overflow/lifetime.rs b/tests/ui/traits/inductive-overflow/lifetime.rs
index 004e47737..bf536d21c 100644
--- a/src/test/ui/traits/inductive-overflow/lifetime.rs
+++ b/tests/ui/traits/inductive-overflow/lifetime.rs
@@ -16,6 +16,7 @@ struct C<'a>(&'a ());
 struct X<T: Y>(T::P);
 
 impl<T: NotAuto> NotAuto for Box<T> {} //~ NOTE: required
+//~^ NOTE unsatisfied trait bound introduced here
 impl<T: Y> NotAuto for X<T> where T::P: NotAuto {}
 impl<'a> NotAuto for C<'a> {}
 
diff --git a/src/test/ui/traits/inductive-overflow/lifetime.stderr b/tests/ui/traits/inductive-overflow/lifetime.stderr
index b72d53bdd..357e59991 100644
--- a/src/test/ui/traits/inductive-overflow/lifetime.stderr
+++ b/tests/ui/traits/inductive-overflow/lifetime.stderr
@@ -1,5 +1,5 @@
 error[E0275]: overflow evaluating the requirement `X<C<'_>>: NotAuto`
-  --> $DIR/lifetime.rs:28:5
+  --> $DIR/lifetime.rs:29:5
    |
 LL |     is_send::<X<C<'static>>>();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -8,11 +8,13 @@ note: required for `Box<X<C<'_>>>` to implement `NotAuto`
   --> $DIR/lifetime.rs:18:18
    |
 LL | impl<T: NotAuto> NotAuto for Box<T> {}
-   |                  ^^^^^^^     ^^^^^^
+   |         -------  ^^^^^^^     ^^^^^^
+   |         |
+   |         unsatisfied trait bound introduced here
    = note: 3 redundant requirements hidden
    = note: required for `X<C<'static>>` to implement `NotAuto`
 note: required by a bound in `is_send`
-  --> $DIR/lifetime.rs:22:15
+  --> $DIR/lifetime.rs:23:15
    |
 LL | fn is_send<S: NotAuto>() {}
    |               ^^^^^^^ required by this bound in `is_send`
diff --git a/src/test/ui/traits/inductive-overflow/simultaneous.rs b/tests/ui/traits/inductive-overflow/simultaneous.rs
index 40ac92146..40ac92146 100644
--- a/src/test/ui/traits/inductive-overflow/simultaneous.rs
+++ b/tests/ui/traits/inductive-overflow/simultaneous.rs
diff --git a/src/test/ui/traits/inductive-overflow/simultaneous.stderr b/tests/ui/traits/inductive-overflow/simultaneous.stderr
index 09930e60e..e3b4ec07d 100644
--- a/src/test/ui/traits/inductive-overflow/simultaneous.stderr
+++ b/tests/ui/traits/inductive-overflow/simultaneous.stderr
@@ -8,7 +8,9 @@ note: required for `{integer}` to implement `Combo`
   --> $DIR/simultaneous.rs:11:34
    |
 LL | impl<T: Tweedledee + Tweedledum> Combo for T {}
-   |                                  ^^^^^     ^
+   |                      ----------  ^^^^^     ^
+   |                      |
+   |                      unsatisfied trait bound introduced here
 note: required by a bound in `is_ee`
   --> $DIR/simultaneous.rs:13:13
    |
diff --git a/src/test/ui/traits/inductive-overflow/supertrait-auto-trait.rs b/tests/ui/traits/inductive-overflow/supertrait-auto-trait.rs
index 5fea47a1b..5fea47a1b 100644
--- a/src/test/ui/traits/inductive-overflow/supertrait-auto-trait.rs
+++ b/tests/ui/traits/inductive-overflow/supertrait-auto-trait.rs
diff --git a/src/test/ui/traits/inductive-overflow/supertrait-auto-trait.stderr b/tests/ui/traits/inductive-overflow/supertrait-auto-trait.stderr
index 3ec288d13..3ec288d13 100644
--- a/src/test/ui/traits/inductive-overflow/supertrait-auto-trait.stderr
+++ b/tests/ui/traits/inductive-overflow/supertrait-auto-trait.stderr
diff --git a/src/test/ui/traits/inductive-overflow/supertrait.rs b/tests/ui/traits/inductive-overflow/supertrait.rs
index c7aa4d90f..c7aa4d90f 100644
--- a/src/test/ui/traits/inductive-overflow/supertrait.rs
+++ b/tests/ui/traits/inductive-overflow/supertrait.rs
diff --git a/src/test/ui/traits/inductive-overflow/supertrait.stderr b/tests/ui/traits/inductive-overflow/supertrait.stderr
index 4b862cf79..b537ecf17 100644
--- a/src/test/ui/traits/inductive-overflow/supertrait.stderr
+++ b/tests/ui/traits/inductive-overflow/supertrait.stderr
@@ -8,7 +8,9 @@ note: required for `NoClone` to implement `Magic`
   --> $DIR/supertrait.rs:5:16
    |
 LL | impl<T: Magic> Magic for T {}
-   |                ^^^^^     ^
+   |         -----  ^^^^^     ^
+   |         |
+   |         unsatisfied trait bound introduced here
 note: required by a bound in `copy`
   --> $DIR/supertrait.rs:7:12
    |
diff --git a/src/test/ui/traits/inductive-overflow/two-traits.rs b/tests/ui/traits/inductive-overflow/two-traits.rs
index 463b55d85..463b55d85 100644
--- a/src/test/ui/traits/inductive-overflow/two-traits.rs
+++ b/tests/ui/traits/inductive-overflow/two-traits.rs
diff --git a/src/test/ui/traits/inductive-overflow/two-traits.stderr b/tests/ui/traits/inductive-overflow/two-traits.stderr
index 0d0bf8861..0d0bf8861 100644
--- a/src/test/ui/traits/inductive-overflow/two-traits.stderr
+++ b/tests/ui/traits/inductive-overflow/two-traits.stderr
diff --git a/src/test/ui/traits/infer-from-object-issue-26952.rs b/tests/ui/traits/infer-from-object-issue-26952.rs
index ed258dbb2..ed258dbb2 100644
--- a/src/test/ui/traits/infer-from-object-issue-26952.rs
+++ b/tests/ui/traits/infer-from-object-issue-26952.rs
diff --git a/src/test/ui/traits/inherent-method-order.rs b/tests/ui/traits/inherent-method-order.rs
index f632ae8a9..f632ae8a9 100644
--- a/src/test/ui/traits/inherent-method-order.rs
+++ b/tests/ui/traits/inherent-method-order.rs
diff --git a/src/test/ui/traits/inheritance/auto-xc-2.rs b/tests/ui/traits/inheritance/auto-xc-2.rs
index f2130228d..f2130228d 100644
--- a/src/test/ui/traits/inheritance/auto-xc-2.rs
+++ b/tests/ui/traits/inheritance/auto-xc-2.rs
diff --git a/src/test/ui/traits/inheritance/auto-xc.rs b/tests/ui/traits/inheritance/auto-xc.rs
index 3d5ae182a..3d5ae182a 100644
--- a/src/test/ui/traits/inheritance/auto-xc.rs
+++ b/tests/ui/traits/inheritance/auto-xc.rs
diff --git a/src/test/ui/traits/inheritance/auto.rs b/tests/ui/traits/inheritance/auto.rs
index 0be67a55e..0be67a55e 100644
--- a/src/test/ui/traits/inheritance/auto.rs
+++ b/tests/ui/traits/inheritance/auto.rs
diff --git a/src/test/ui/traits/inheritance/auxiliary/auto_xc.rs b/tests/ui/traits/inheritance/auxiliary/auto_xc.rs
index 9af26cb2e..9af26cb2e 100644
--- a/src/test/ui/traits/inheritance/auxiliary/auto_xc.rs
+++ b/tests/ui/traits/inheritance/auxiliary/auto_xc.rs
diff --git a/src/test/ui/traits/inheritance/auxiliary/auto_xc_2.rs b/tests/ui/traits/inheritance/auxiliary/auto_xc_2.rs
index e9327676d..e9327676d 100644
--- a/src/test/ui/traits/inheritance/auxiliary/auto_xc_2.rs
+++ b/tests/ui/traits/inheritance/auxiliary/auto_xc_2.rs
diff --git a/src/test/ui/traits/inheritance/auxiliary/overloading_xc.rs b/tests/ui/traits/inheritance/auxiliary/overloading_xc.rs
index a25704412..a25704412 100644
--- a/src/test/ui/traits/inheritance/auxiliary/overloading_xc.rs
+++ b/tests/ui/traits/inheritance/auxiliary/overloading_xc.rs
diff --git a/src/test/ui/traits/inheritance/auxiliary/xc_call.rs b/tests/ui/traits/inheritance/auxiliary/xc_call.rs
index b76c52e62..b76c52e62 100644
--- a/src/test/ui/traits/inheritance/auxiliary/xc_call.rs
+++ b/tests/ui/traits/inheritance/auxiliary/xc_call.rs
diff --git a/src/test/ui/traits/inheritance/basic.rs b/tests/ui/traits/inheritance/basic.rs
index 5bfa60b1a..5bfa60b1a 100644
--- a/src/test/ui/traits/inheritance/basic.rs
+++ b/tests/ui/traits/inheritance/basic.rs
diff --git a/src/test/ui/traits/inheritance/call-bound-inherited.rs b/tests/ui/traits/inheritance/call-bound-inherited.rs
index 37c2ff63c..37c2ff63c 100644
--- a/src/test/ui/traits/inheritance/call-bound-inherited.rs
+++ b/tests/ui/traits/inheritance/call-bound-inherited.rs
diff --git a/src/test/ui/traits/inheritance/call-bound-inherited2.rs b/tests/ui/traits/inheritance/call-bound-inherited2.rs
index 8576d29f2..8576d29f2 100644
--- a/src/test/ui/traits/inheritance/call-bound-inherited2.rs
+++ b/tests/ui/traits/inheritance/call-bound-inherited2.rs
diff --git a/src/test/ui/traits/inheritance/cast-without-call-to-supertrait.rs b/tests/ui/traits/inheritance/cast-without-call-to-supertrait.rs
index 25159c1ad..25159c1ad 100644
--- a/src/test/ui/traits/inheritance/cast-without-call-to-supertrait.rs
+++ b/tests/ui/traits/inheritance/cast-without-call-to-supertrait.rs
diff --git a/src/test/ui/traits/inheritance/cast.rs b/tests/ui/traits/inheritance/cast.rs
index 9070b9d1f..9070b9d1f 100644
--- a/src/test/ui/traits/inheritance/cast.rs
+++ b/tests/ui/traits/inheritance/cast.rs
diff --git a/src/test/ui/traits/inheritance/cross-trait-call-xc.rs b/tests/ui/traits/inheritance/cross-trait-call-xc.rs
index 99fbb5c61..99fbb5c61 100644
--- a/src/test/ui/traits/inheritance/cross-trait-call-xc.rs
+++ b/tests/ui/traits/inheritance/cross-trait-call-xc.rs
diff --git a/src/test/ui/traits/inheritance/cross-trait-call.rs b/tests/ui/traits/inheritance/cross-trait-call.rs
index 512c928ca..512c928ca 100644
--- a/src/test/ui/traits/inheritance/cross-trait-call.rs
+++ b/tests/ui/traits/inheritance/cross-trait-call.rs
diff --git a/src/test/ui/traits/inheritance/diamond.rs b/tests/ui/traits/inheritance/diamond.rs
index 32ad0fb4d..32ad0fb4d 100644
--- a/src/test/ui/traits/inheritance/diamond.rs
+++ b/tests/ui/traits/inheritance/diamond.rs
diff --git a/src/test/ui/traits/inheritance/multiple-inheritors.rs b/tests/ui/traits/inheritance/multiple-inheritors.rs
index 77ecbd8eb..77ecbd8eb 100644
--- a/src/test/ui/traits/inheritance/multiple-inheritors.rs
+++ b/tests/ui/traits/inheritance/multiple-inheritors.rs
diff --git a/src/test/ui/traits/inheritance/multiple-params.rs b/tests/ui/traits/inheritance/multiple-params.rs
index 8ff5ba541..8ff5ba541 100644
--- a/src/test/ui/traits/inheritance/multiple-params.rs
+++ b/tests/ui/traits/inheritance/multiple-params.rs
diff --git a/src/test/ui/traits/inheritance/num.rs b/tests/ui/traits/inheritance/num.rs
index 3d63d78ca..3d63d78ca 100644
--- a/src/test/ui/traits/inheritance/num.rs
+++ b/tests/ui/traits/inheritance/num.rs
diff --git a/src/test/ui/traits/inheritance/num0.rs b/tests/ui/traits/inheritance/num0.rs
index cee52542d..cee52542d 100644
--- a/src/test/ui/traits/inheritance/num0.rs
+++ b/tests/ui/traits/inheritance/num0.rs
diff --git a/src/test/ui/traits/inheritance/num1.rs b/tests/ui/traits/inheritance/num1.rs
index 663dd3a5e..663dd3a5e 100644
--- a/src/test/ui/traits/inheritance/num1.rs
+++ b/tests/ui/traits/inheritance/num1.rs
diff --git a/src/test/ui/traits/inheritance/num2.rs b/tests/ui/traits/inheritance/num2.rs
index b713c66a3..b713c66a3 100644
--- a/src/test/ui/traits/inheritance/num2.rs
+++ b/tests/ui/traits/inheritance/num2.rs
diff --git a/src/test/ui/traits/inheritance/num3.rs b/tests/ui/traits/inheritance/num3.rs
index c40be6f83..c40be6f83 100644
--- a/src/test/ui/traits/inheritance/num3.rs
+++ b/tests/ui/traits/inheritance/num3.rs
diff --git a/src/test/ui/traits/inheritance/num5.rs b/tests/ui/traits/inheritance/num5.rs
index f478618f7..f478618f7 100644
--- a/src/test/ui/traits/inheritance/num5.rs
+++ b/tests/ui/traits/inheritance/num5.rs
diff --git a/src/test/ui/traits/inheritance/overloading-simple.rs b/tests/ui/traits/inheritance/overloading-simple.rs
index c306aa2cd..c306aa2cd 100644
--- a/src/test/ui/traits/inheritance/overloading-simple.rs
+++ b/tests/ui/traits/inheritance/overloading-simple.rs
diff --git a/src/test/ui/traits/inheritance/overloading-xc-exe.rs b/tests/ui/traits/inheritance/overloading-xc-exe.rs
index 08778061b..08778061b 100644
--- a/src/test/ui/traits/inheritance/overloading-xc-exe.rs
+++ b/tests/ui/traits/inheritance/overloading-xc-exe.rs
diff --git a/src/test/ui/traits/inheritance/overloading.rs b/tests/ui/traits/inheritance/overloading.rs
index 083643e82..083643e82 100644
--- a/src/test/ui/traits/inheritance/overloading.rs
+++ b/tests/ui/traits/inheritance/overloading.rs
diff --git a/src/test/ui/traits/inheritance/repeated-supertrait-ambig.rs b/tests/ui/traits/inheritance/repeated-supertrait-ambig.rs
index 727897d20..727897d20 100644
--- a/src/test/ui/traits/inheritance/repeated-supertrait-ambig.rs
+++ b/tests/ui/traits/inheritance/repeated-supertrait-ambig.rs
diff --git a/src/test/ui/traits/inheritance/repeated-supertrait-ambig.stderr b/tests/ui/traits/inheritance/repeated-supertrait-ambig.stderr
index 656e0d0bf..656e0d0bf 100644
--- a/src/test/ui/traits/inheritance/repeated-supertrait-ambig.stderr
+++ b/tests/ui/traits/inheritance/repeated-supertrait-ambig.stderr
diff --git a/src/test/ui/traits/inheritance/repeated-supertrait.rs b/tests/ui/traits/inheritance/repeated-supertrait.rs
index cb2581ffa..cb2581ffa 100644
--- a/src/test/ui/traits/inheritance/repeated-supertrait.rs
+++ b/tests/ui/traits/inheritance/repeated-supertrait.rs
diff --git a/src/test/ui/traits/inheritance/self-in-supertype.rs b/tests/ui/traits/inheritance/self-in-supertype.rs
index e8a2bd791..e8a2bd791 100644
--- a/src/test/ui/traits/inheritance/self-in-supertype.rs
+++ b/tests/ui/traits/inheritance/self-in-supertype.rs
diff --git a/src/test/ui/traits/inheritance/self.rs b/tests/ui/traits/inheritance/self.rs
index 5f2559f48..5f2559f48 100644
--- a/src/test/ui/traits/inheritance/self.rs
+++ b/tests/ui/traits/inheritance/self.rs
diff --git a/src/test/ui/traits/inheritance/simple.rs b/tests/ui/traits/inheritance/simple.rs
index ca3a284e5..ca3a284e5 100644
--- a/src/test/ui/traits/inheritance/simple.rs
+++ b/tests/ui/traits/inheritance/simple.rs
diff --git a/src/test/ui/traits/inheritance/static.rs b/tests/ui/traits/inheritance/static.rs
index 16218fbd2..16218fbd2 100644
--- a/src/test/ui/traits/inheritance/static.rs
+++ b/tests/ui/traits/inheritance/static.rs
diff --git a/src/test/ui/traits/inheritance/static2.rs b/tests/ui/traits/inheritance/static2.rs
index bc78e1e23..bc78e1e23 100644
--- a/src/test/ui/traits/inheritance/static2.rs
+++ b/tests/ui/traits/inheritance/static2.rs
diff --git a/src/test/ui/traits/inheritance/subst.rs b/tests/ui/traits/inheritance/subst.rs
index b2b650366..b2b650366 100644
--- a/src/test/ui/traits/inheritance/subst.rs
+++ b/tests/ui/traits/inheritance/subst.rs
diff --git a/src/test/ui/traits/inheritance/subst2.rs b/tests/ui/traits/inheritance/subst2.rs
index ccc9628c7..ccc9628c7 100644
--- a/src/test/ui/traits/inheritance/subst2.rs
+++ b/tests/ui/traits/inheritance/subst2.rs
diff --git a/src/test/ui/traits/inheritance/visibility.rs b/tests/ui/traits/inheritance/visibility.rs
index 6ad864926..6ad864926 100644
--- a/src/test/ui/traits/inheritance/visibility.rs
+++ b/tests/ui/traits/inheritance/visibility.rs
diff --git a/src/test/ui/traits/invalid_operator_trait.rs b/tests/ui/traits/invalid_operator_trait.rs
index 7ea3b0d5b..7ea3b0d5b 100644
--- a/src/test/ui/traits/invalid_operator_trait.rs
+++ b/tests/ui/traits/invalid_operator_trait.rs
diff --git a/src/test/ui/traits/invalid_operator_trait.stderr b/tests/ui/traits/invalid_operator_trait.stderr
index 8c6e36959..8c6e36959 100644
--- a/src/test/ui/traits/invalid_operator_trait.stderr
+++ b/tests/ui/traits/invalid_operator_trait.stderr
diff --git a/src/test/ui/traits/issue-102989.rs b/tests/ui/traits/issue-102989.rs
index 216cd78e5..216cd78e5 100644
--- a/src/test/ui/traits/issue-102989.rs
+++ b/tests/ui/traits/issue-102989.rs
diff --git a/src/test/ui/traits/issue-102989.stderr b/tests/ui/traits/issue-102989.stderr
index 7d0098fe8..7d0098fe8 100644
--- a/src/test/ui/traits/issue-102989.stderr
+++ b/tests/ui/traits/issue-102989.stderr
diff --git a/src/test/ui/traits/issue-104322.rs b/tests/ui/traits/issue-104322.rs
index dcc27f1f0..dcc27f1f0 100644
--- a/src/test/ui/traits/issue-104322.rs
+++ b/tests/ui/traits/issue-104322.rs
diff --git a/tests/ui/traits/issue-106072.rs b/tests/ui/traits/issue-106072.rs
new file mode 100644
index 000000000..7064a39d2
--- /dev/null
+++ b/tests/ui/traits/issue-106072.rs
@@ -0,0 +1,5 @@
+#[derive(Clone)] //~  trait objects must include the `dyn` keyword
+                 //~| trait objects must include the `dyn` keyword
+struct Foo;
+trait Foo {} //~ the name `Foo` is defined multiple times
+fn main() {}
diff --git a/tests/ui/traits/issue-106072.stderr b/tests/ui/traits/issue-106072.stderr
new file mode 100644
index 000000000..f9b7b8146
--- /dev/null
+++ b/tests/ui/traits/issue-106072.stderr
@@ -0,0 +1,30 @@
+error[E0428]: the name `Foo` is defined multiple times
+  --> $DIR/issue-106072.rs:4:1
+   |
+LL | struct Foo;
+   | ----------- previous definition of the type `Foo` here
+LL | trait Foo {}
+   | ^^^^^^^^^ `Foo` redefined here
+   |
+   = note: `Foo` must be defined only once in the type namespace of this module
+
+error[E0782]: trait objects must include the `dyn` keyword
+  --> $DIR/issue-106072.rs:1:10
+   |
+LL | #[derive(Clone)]
+   |          ^^^^^
+   |
+   = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0782]: trait objects must include the `dyn` keyword
+  --> $DIR/issue-106072.rs:1:10
+   |
+LL | #[derive(Clone)]
+   |          ^^^^^
+   |
+   = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0428, E0782.
+For more information about an error, try `rustc --explain E0428`.
diff --git a/src/test/ui/traits/issue-18400.rs b/tests/ui/traits/issue-18400.rs
index fdd11512d..fdd11512d 100644
--- a/src/test/ui/traits/issue-18400.rs
+++ b/tests/ui/traits/issue-18400.rs
diff --git a/src/test/ui/traits/issue-18400.stderr b/tests/ui/traits/issue-18400.stderr
index 4394e6f7e..edaf08f49 100644
--- a/src/test/ui/traits/issue-18400.stderr
+++ b/tests/ui/traits/issue-18400.stderr
@@ -9,7 +9,9 @@ note: required for `{integer}` to implement `Set<&[_]>`
   --> $DIR/issue-18400.rs:6:16
    |
 LL | impl<'a, T, S> Set<&'a [T]> for S where
-   |                ^^^^^^^^^^^^     ^
+   |          -     ^^^^^^^^^^^^     ^
+   |          |
+   |          unsatisfied trait bound introduced here
    = note: 128 redundant requirements hidden
    = note: required for `{integer}` to implement `Set<&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[&[_]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]>`
 
diff --git a/src/test/ui/traits/issue-18412.rs b/tests/ui/traits/issue-18412.rs
index fe1cfb3df..fe1cfb3df 100644
--- a/src/test/ui/traits/issue-18412.rs
+++ b/tests/ui/traits/issue-18412.rs
diff --git a/src/test/ui/traits/issue-20692.rs b/tests/ui/traits/issue-20692.rs
index 1cb2d8c73..1cb2d8c73 100644
--- a/src/test/ui/traits/issue-20692.rs
+++ b/tests/ui/traits/issue-20692.rs
diff --git a/src/test/ui/traits/issue-20692.stderr b/tests/ui/traits/issue-20692.stderr
index 2028994cd..2028994cd 100644
--- a/src/test/ui/traits/issue-20692.stderr
+++ b/tests/ui/traits/issue-20692.stderr
diff --git a/src/test/ui/traits/issue-22019.rs b/tests/ui/traits/issue-22019.rs
index 1a887f0f3..1a887f0f3 100644
--- a/src/test/ui/traits/issue-22019.rs
+++ b/tests/ui/traits/issue-22019.rs
diff --git a/src/test/ui/traits/issue-22110.rs b/tests/ui/traits/issue-22110.rs
index bdbfee799..bdbfee799 100644
--- a/src/test/ui/traits/issue-22110.rs
+++ b/tests/ui/traits/issue-22110.rs
diff --git a/src/test/ui/traits/issue-22655.rs b/tests/ui/traits/issue-22655.rs
index bc08ca0a2..bc08ca0a2 100644
--- a/src/test/ui/traits/issue-22655.rs
+++ b/tests/ui/traits/issue-22655.rs
diff --git a/src/test/ui/traits/issue-23003-overflow.rs b/tests/ui/traits/issue-23003-overflow.rs
index c5f471f23..c5f471f23 100644
--- a/src/test/ui/traits/issue-23003-overflow.rs
+++ b/tests/ui/traits/issue-23003-overflow.rs
diff --git a/src/test/ui/traits/issue-23003.rs b/tests/ui/traits/issue-23003.rs
index 24c2b2ad6..24c2b2ad6 100644
--- a/src/test/ui/traits/issue-23003.rs
+++ b/tests/ui/traits/issue-23003.rs
diff --git a/src/test/ui/traits/issue-23825.rs b/tests/ui/traits/issue-23825.rs
index a9f0095d2..a9f0095d2 100644
--- a/src/test/ui/traits/issue-23825.rs
+++ b/tests/ui/traits/issue-23825.rs
diff --git a/src/test/ui/traits/issue-24010.rs b/tests/ui/traits/issue-24010.rs
index f18185334..f18185334 100644
--- a/src/test/ui/traits/issue-24010.rs
+++ b/tests/ui/traits/issue-24010.rs
diff --git a/src/test/ui/traits/issue-26339.rs b/tests/ui/traits/issue-26339.rs
index bedd87cc4..bedd87cc4 100644
--- a/src/test/ui/traits/issue-26339.rs
+++ b/tests/ui/traits/issue-26339.rs
diff --git a/src/test/ui/traits/issue-28576.rs b/tests/ui/traits/issue-28576.rs
index 972c839b6..972c839b6 100644
--- a/src/test/ui/traits/issue-28576.rs
+++ b/tests/ui/traits/issue-28576.rs
diff --git a/src/test/ui/traits/issue-28576.stderr b/tests/ui/traits/issue-28576.stderr
index 203cd0630..203cd0630 100644
--- a/src/test/ui/traits/issue-28576.stderr
+++ b/tests/ui/traits/issue-28576.stderr
diff --git a/src/test/ui/traits/issue-32963.rs b/tests/ui/traits/issue-32963.rs
index 56a68f3a2..56a68f3a2 100644
--- a/src/test/ui/traits/issue-32963.rs
+++ b/tests/ui/traits/issue-32963.rs
diff --git a/src/test/ui/traits/issue-32963.stderr b/tests/ui/traits/issue-32963.stderr
index bad45e54d..bad45e54d 100644
--- a/src/test/ui/traits/issue-32963.stderr
+++ b/tests/ui/traits/issue-32963.stderr
diff --git a/src/test/ui/traits/issue-33140-hack-boundaries.rs b/tests/ui/traits/issue-33140-hack-boundaries.rs
index d091162fc..d091162fc 100644
--- a/src/test/ui/traits/issue-33140-hack-boundaries.rs
+++ b/tests/ui/traits/issue-33140-hack-boundaries.rs
diff --git a/src/test/ui/traits/issue-33140-hack-boundaries.stderr b/tests/ui/traits/issue-33140-hack-boundaries.stderr
index 80a502c63..80a502c63 100644
--- a/src/test/ui/traits/issue-33140-hack-boundaries.stderr
+++ b/tests/ui/traits/issue-33140-hack-boundaries.stderr
diff --git a/src/test/ui/traits/issue-33140.rs b/tests/ui/traits/issue-33140.rs
index 9bdac4b83..9bdac4b83 100644
--- a/src/test/ui/traits/issue-33140.rs
+++ b/tests/ui/traits/issue-33140.rs
diff --git a/src/test/ui/traits/issue-33140.stderr b/tests/ui/traits/issue-33140.stderr
index d31281f72..d31281f72 100644
--- a/src/test/ui/traits/issue-33140.stderr
+++ b/tests/ui/traits/issue-33140.stderr
diff --git a/src/test/ui/traits/issue-35869.rs b/tests/ui/traits/issue-35869.rs
index b9b4c972e..b9b4c972e 100644
--- a/src/test/ui/traits/issue-35869.rs
+++ b/tests/ui/traits/issue-35869.rs
diff --git a/src/test/ui/traits/issue-35869.stderr b/tests/ui/traits/issue-35869.stderr
index 0780109b8..6d985bdea 100644
--- a/src/test/ui/traits/issue-35869.stderr
+++ b/tests/ui/traits/issue-35869.stderr
@@ -12,8 +12,8 @@ note: type in trait
    |
 LL |     fn foo(_: fn(u8) -> ());
    |               ^^^^^^^^^^^^
-   = note: expected fn pointer `fn(fn(u8))`
-              found fn pointer `fn(fn(u16))`
+   = note: expected signature `fn(fn(u8))`
+              found signature `fn(fn(u16))`
 
 error[E0053]: method `bar` has an incompatible type for trait
   --> $DIR/issue-35869.rs:13:15
@@ -29,8 +29,8 @@ note: type in trait
    |
 LL |     fn bar(_: Option<u8>);
    |               ^^^^^^^^^^
-   = note: expected fn pointer `fn(Option<u8>)`
-              found fn pointer `fn(Option<u16>)`
+   = note: expected signature `fn(Option<u8>)`
+              found signature `fn(Option<u16>)`
 
 error[E0053]: method `baz` has an incompatible type for trait
   --> $DIR/issue-35869.rs:15:15
@@ -46,8 +46,8 @@ note: type in trait
    |
 LL |     fn baz(_: (u8, u16));
    |               ^^^^^^^^^
-   = note: expected fn pointer `fn((u8, _))`
-              found fn pointer `fn((u16, _))`
+   = note: expected signature `fn((u8, _))`
+              found signature `fn((u16, _))`
 
 error[E0053]: method `qux` has an incompatible type for trait
   --> $DIR/issue-35869.rs:17:17
@@ -63,8 +63,8 @@ note: type in trait
    |
 LL |     fn qux() -> u8;
    |                 ^^
-   = note: expected fn pointer `fn() -> u8`
-              found fn pointer `fn() -> u16`
+   = note: expected signature `fn() -> u8`
+              found signature `fn() -> u16`
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/traits/issue-3683.rs b/tests/ui/traits/issue-3683.rs
index b12c450c9..b12c450c9 100644
--- a/src/test/ui/traits/issue-3683.rs
+++ b/tests/ui/traits/issue-3683.rs
diff --git a/src/test/ui/traits/issue-38033.rs b/tests/ui/traits/issue-38033.rs
index 16b867ec8..16b867ec8 100644
--- a/src/test/ui/traits/issue-38033.rs
+++ b/tests/ui/traits/issue-38033.rs
diff --git a/src/test/ui/issues/issue-38404.rs b/tests/ui/traits/issue-38404.rs
index 1a92acc34..1a92acc34 100644
--- a/src/test/ui/issues/issue-38404.rs
+++ b/tests/ui/traits/issue-38404.rs
diff --git a/src/test/ui/issues/issue-38404.stderr b/tests/ui/traits/issue-38404.stderr
index d7721d7e6..d7721d7e6 100644
--- a/src/test/ui/issues/issue-38404.stderr
+++ b/tests/ui/traits/issue-38404.stderr
diff --git a/src/test/ui/traits/issue-38604.rs b/tests/ui/traits/issue-38604.rs
index 002a3c43f..002a3c43f 100644
--- a/src/test/ui/traits/issue-38604.rs
+++ b/tests/ui/traits/issue-38604.rs
diff --git a/src/test/ui/traits/issue-38604.stderr b/tests/ui/traits/issue-38604.stderr
index 50d6fb054..50d6fb054 100644
--- a/src/test/ui/traits/issue-38604.stderr
+++ b/tests/ui/traits/issue-38604.stderr
diff --git a/src/test/ui/traits/issue-3973.rs b/tests/ui/traits/issue-3973.rs
index a5ed5b870..a5ed5b870 100644
--- a/src/test/ui/traits/issue-3973.rs
+++ b/tests/ui/traits/issue-3973.rs
diff --git a/src/test/ui/traits/issue-3973.stderr b/tests/ui/traits/issue-3973.stderr
index 87ee08049..87ee08049 100644
--- a/src/test/ui/traits/issue-3973.stderr
+++ b/tests/ui/traits/issue-3973.stderr
diff --git a/src/test/ui/traits/issue-4107.rs b/tests/ui/traits/issue-4107.rs
index 98433e806..98433e806 100644
--- a/src/test/ui/traits/issue-4107.rs
+++ b/tests/ui/traits/issue-4107.rs
diff --git a/src/test/ui/traits/issue-43132.rs b/tests/ui/traits/issue-43132.rs
index c886f4b0a..c886f4b0a 100644
--- a/src/test/ui/traits/issue-43132.rs
+++ b/tests/ui/traits/issue-43132.rs
diff --git a/src/test/ui/traits/issue-43784-supertrait.rs b/tests/ui/traits/issue-43784-supertrait.rs
index 55c26ccd2..55c26ccd2 100644
--- a/src/test/ui/traits/issue-43784-supertrait.rs
+++ b/tests/ui/traits/issue-43784-supertrait.rs
diff --git a/tests/ui/traits/issue-43784-supertrait.stderr b/tests/ui/traits/issue-43784-supertrait.stderr
new file mode 100644
index 000000000..6b5b72138
--- /dev/null
+++ b/tests/ui/traits/issue-43784-supertrait.stderr
@@ -0,0 +1,24 @@
+error[E0277]: the trait bound `T: Copy` is not satisfied
+  --> $DIR/issue-43784-supertrait.rs:8:22
+   |
+LL | impl<T> Complete for T {}
+   |                      ^ the trait `Copy` is not implemented for `T`
+   |
+note: required for `T` to implement `Partial`
+  --> $DIR/issue-43784-supertrait.rs:1:11
+   |
+LL | pub trait Partial: Copy {
+   |           ^^^^^^^
+note: required by a bound in `Complete`
+  --> $DIR/issue-43784-supertrait.rs:4:21
+   |
+LL | pub trait Complete: Partial {
+   |                     ^^^^^^^ required by this bound in `Complete`
+help: consider restricting type parameter `T`
+   |
+LL | impl<T: std::marker::Copy> Complete for T {}
+   |       +++++++++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/issues/issue-50480.rs b/tests/ui/traits/issue-50480.rs
index 10597caf5..005939e0c 100644
--- a/src/test/ui/issues/issue-50480.rs
+++ b/tests/ui/traits/issue-50480.rs
@@ -5,13 +5,11 @@ struct Foo(N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
 //~| ERROR cannot find type `NotDefined` in this scope
 //~| ERROR cannot find type `N` in this scope
 //~| ERROR cannot find type `N` in this scope
-//~| ERROR `i32` is not an iterator
 
 #[derive(Clone, Copy)]
 //~^ ERROR the trait `Copy` may not be implemented for this type
 struct Bar<T>(T, N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
 //~^ ERROR cannot find type `NotDefined` in this scope
 //~| ERROR cannot find type `N` in this scope
-//~| ERROR `i32` is not an iterator
 
 fn main() {}
diff --git a/tests/ui/traits/issue-50480.stderr b/tests/ui/traits/issue-50480.stderr
new file mode 100644
index 000000000..5063fdca0
--- /dev/null
+++ b/tests/ui/traits/issue-50480.stderr
@@ -0,0 +1,92 @@
+error[E0412]: cannot find type `N` in this scope
+  --> $DIR/issue-50480.rs:3:12
+   |
+LL | struct Foo(N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
+   |            ^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+LL | struct Foo<N>(N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
+   |           +++
+
+error[E0412]: cannot find type `NotDefined` in this scope
+  --> $DIR/issue-50480.rs:3:15
+   |
+LL | struct Foo(N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
+   |               ^^^^^^^^^^ not found in this scope
+
+error[E0412]: cannot find type `N` in this scope
+  --> $DIR/issue-50480.rs:3:12
+   |
+LL | struct Foo(N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
+   |            ^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+LL | struct Foo<N>(N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
+   |           +++
+
+error[E0412]: cannot find type `NotDefined` in this scope
+  --> $DIR/issue-50480.rs:3:15
+   |
+LL | struct Foo(N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
+   |               ^^^^^^^^^^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+LL | struct Foo<NotDefined>(N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
+   |           ++++++++++++
+
+error[E0412]: cannot find type `N` in this scope
+  --> $DIR/issue-50480.rs:11:18
+   |
+LL | struct Bar<T>(T, N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
+   |            -     ^
+   |            |
+   |            similarly named type parameter `T` defined here
+   |
+help: a type parameter with a similar name exists
+   |
+LL | struct Bar<T>(T, T, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
+   |                  ~
+help: you might be missing a type parameter
+   |
+LL | struct Bar<T, N>(T, N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
+   |             +++
+
+error[E0412]: cannot find type `NotDefined` in this scope
+  --> $DIR/issue-50480.rs:11:21
+   |
+LL | struct Bar<T>(T, N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
+   |                     ^^^^^^^^^^ not found in this scope
+
+error[E0204]: the trait `Copy` may not be implemented for this type
+  --> $DIR/issue-50480.rs:1:17
+   |
+LL | #[derive(Clone, Copy)]
+   |                 ^^^^
+LL |
+LL | struct Foo(N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
+   |                                                    --------  ------ this field does not implement `Copy`
+   |                                                    |
+   |                                                    this field does not implement `Copy`
+   |
+   = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0204]: the trait `Copy` may not be implemented for this type
+  --> $DIR/issue-50480.rs:9:17
+   |
+LL | #[derive(Clone, Copy)]
+   |                 ^^^^
+LL |
+LL | struct Bar<T>(T, N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
+   |                                                          --------  ------ this field does not implement `Copy`
+   |                                                          |
+   |                                                          this field does not implement `Copy`
+   |
+   = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 8 previous errors
+
+Some errors have detailed explanations: E0204, E0412.
+For more information about an error, try `rustc --explain E0204`.
diff --git a/src/test/ui/traits/issue-52893.rs b/tests/ui/traits/issue-52893.rs
index d72598d5d..d72598d5d 100644
--- a/src/test/ui/traits/issue-52893.rs
+++ b/tests/ui/traits/issue-52893.rs
diff --git a/tests/ui/traits/issue-52893.stderr b/tests/ui/traits/issue-52893.stderr
new file mode 100644
index 000000000..a11867c03
--- /dev/null
+++ b/tests/ui/traits/issue-52893.stderr
@@ -0,0 +1,29 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-52893.rs:53:22
+   |
+LL | impl<F, Name, P> AddClass<Name, F> for Class<P>
+   |      - this type parameter
+...
+LL |         builder.push(output);
+   |                 ---- ^^^^^^ expected type parameter `F`, found struct `Class`
+   |                 |
+   |                 arguments to this method are incorrect
+   |
+   = note: expected type parameter `F`
+                      found struct `Class<P>`
+help: the return type of this call is `Class<P>` due to the type of the argument passed
+  --> $DIR/issue-52893.rs:53:9
+   |
+LL |         builder.push(output);
+   |         ^^^^^^^^^^^^^------^
+   |                      |
+   |                      this argument influences the return type of `push`
+note: associated function defined here
+  --> $DIR/issue-52893.rs:11:8
+   |
+LL |     fn push(self, other: T) -> Self::PushRes;
+   |        ^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/traits/issue-56202.rs b/tests/ui/traits/issue-56202.rs
index 0952843e6..0952843e6 100644
--- a/src/test/ui/traits/issue-56202.rs
+++ b/tests/ui/traits/issue-56202.rs
diff --git a/src/test/ui/traits/issue-56488.rs b/tests/ui/traits/issue-56488.rs
index e2f399692..e2f399692 100644
--- a/src/test/ui/traits/issue-56488.rs
+++ b/tests/ui/traits/issue-56488.rs
diff --git a/src/test/ui/traits/issue-59029-1.rs b/tests/ui/traits/issue-59029-1.rs
index 8ab47a4af..8ab47a4af 100644
--- a/src/test/ui/traits/issue-59029-1.rs
+++ b/tests/ui/traits/issue-59029-1.rs
diff --git a/src/test/ui/traits/issue-59029-1.stderr b/tests/ui/traits/issue-59029-1.stderr
index 203a89285..203a89285 100644
--- a/src/test/ui/traits/issue-59029-1.stderr
+++ b/tests/ui/traits/issue-59029-1.stderr
diff --git a/src/test/ui/traits/issue-59029-2.rs b/tests/ui/traits/issue-59029-2.rs
index 2bdb128d8..2bdb128d8 100644
--- a/src/test/ui/traits/issue-59029-2.rs
+++ b/tests/ui/traits/issue-59029-2.rs
diff --git a/src/test/ui/traits/issue-6128.rs b/tests/ui/traits/issue-6128.rs
index 07d92f8f8..07d92f8f8 100644
--- a/src/test/ui/traits/issue-6128.rs
+++ b/tests/ui/traits/issue-6128.rs
diff --git a/src/test/ui/traits/issue-6334.rs b/tests/ui/traits/issue-6334.rs
index acf48da15..acf48da15 100644
--- a/src/test/ui/traits/issue-6334.rs
+++ b/tests/ui/traits/issue-6334.rs
diff --git a/src/test/ui/traits/issue-65284-suggest-generic-trait-bound.rs b/tests/ui/traits/issue-65284-suggest-generic-trait-bound.rs
index 018ce0459..018ce0459 100644
--- a/src/test/ui/traits/issue-65284-suggest-generic-trait-bound.rs
+++ b/tests/ui/traits/issue-65284-suggest-generic-trait-bound.rs
diff --git a/src/test/ui/traits/issue-65284-suggest-generic-trait-bound.stderr b/tests/ui/traits/issue-65284-suggest-generic-trait-bound.stderr
index ae33e61d8..ae33e61d8 100644
--- a/src/test/ui/traits/issue-65284-suggest-generic-trait-bound.stderr
+++ b/tests/ui/traits/issue-65284-suggest-generic-trait-bound.stderr
diff --git a/src/test/ui/traits/issue-65673.rs b/tests/ui/traits/issue-65673.rs
index e5c2fccb2..e5c2fccb2 100644
--- a/src/test/ui/traits/issue-65673.rs
+++ b/tests/ui/traits/issue-65673.rs
diff --git a/src/test/ui/traits/issue-65673.stderr b/tests/ui/traits/issue-65673.stderr
index 8f01d7c53..8f01d7c53 100644
--- a/src/test/ui/traits/issue-65673.stderr
+++ b/tests/ui/traits/issue-65673.stderr
diff --git a/src/test/ui/traits/issue-68295.rs b/tests/ui/traits/issue-68295.rs
index 7ff54539a..7ff54539a 100644
--- a/src/test/ui/traits/issue-68295.rs
+++ b/tests/ui/traits/issue-68295.rs
diff --git a/src/test/ui/traits/issue-68295.stderr b/tests/ui/traits/issue-68295.stderr
index cb6e6e076..cb6e6e076 100644
--- a/src/test/ui/traits/issue-68295.stderr
+++ b/tests/ui/traits/issue-68295.stderr
diff --git a/src/test/ui/traits/issue-7013.rs b/tests/ui/traits/issue-7013.rs
index 1fb01303c..1fb01303c 100644
--- a/src/test/ui/traits/issue-7013.rs
+++ b/tests/ui/traits/issue-7013.rs
diff --git a/src/test/ui/traits/issue-7013.stderr b/tests/ui/traits/issue-7013.stderr
index 4575f4dba..4575f4dba 100644
--- a/src/test/ui/traits/issue-7013.stderr
+++ b/tests/ui/traits/issue-7013.stderr
diff --git a/src/test/ui/traits/issue-70944.rs b/tests/ui/traits/issue-70944.rs
index 3286de9d5..3286de9d5 100644
--- a/src/test/ui/traits/issue-70944.rs
+++ b/tests/ui/traits/issue-70944.rs
diff --git a/src/test/ui/traits/issue-71036.rs b/tests/ui/traits/issue-71036.rs
index 69eed0c04..69eed0c04 100644
--- a/src/test/ui/traits/issue-71036.rs
+++ b/tests/ui/traits/issue-71036.rs
diff --git a/src/test/ui/traits/issue-71036.stderr b/tests/ui/traits/issue-71036.stderr
index 79eb7a2ae..79eb7a2ae 100644
--- a/src/test/ui/traits/issue-71036.stderr
+++ b/tests/ui/traits/issue-71036.stderr
diff --git a/src/test/ui/traits/issue-71136.rs b/tests/ui/traits/issue-71136.rs
index b21756e2b..b21756e2b 100644
--- a/src/test/ui/traits/issue-71136.rs
+++ b/tests/ui/traits/issue-71136.rs
diff --git a/src/test/ui/traits/issue-71136.stderr b/tests/ui/traits/issue-71136.stderr
index f54173392..f54173392 100644
--- a/src/test/ui/traits/issue-71136.stderr
+++ b/tests/ui/traits/issue-71136.stderr
diff --git a/src/test/ui/traits/issue-72410.rs b/tests/ui/traits/issue-72410.rs
index c95f1dfdc..c95f1dfdc 100644
--- a/src/test/ui/traits/issue-72410.rs
+++ b/tests/ui/traits/issue-72410.rs
diff --git a/src/test/ui/traits/issue-72410.stderr b/tests/ui/traits/issue-72410.stderr
index c7beb834b..c7beb834b 100644
--- a/src/test/ui/traits/issue-72410.stderr
+++ b/tests/ui/traits/issue-72410.stderr
diff --git a/src/test/ui/traits/issue-72455.rs b/tests/ui/traits/issue-72455.rs
index b6c3bb222..b6c3bb222 100644
--- a/src/test/ui/traits/issue-72455.rs
+++ b/tests/ui/traits/issue-72455.rs
diff --git a/src/test/ui/traits/issue-75627.rs b/tests/ui/traits/issue-75627.rs
index 93a2ec1cc..93a2ec1cc 100644
--- a/src/test/ui/traits/issue-75627.rs
+++ b/tests/ui/traits/issue-75627.rs
diff --git a/tests/ui/traits/issue-75627.stderr b/tests/ui/traits/issue-75627.stderr
new file mode 100644
index 000000000..1675edc9f
--- /dev/null
+++ b/tests/ui/traits/issue-75627.stderr
@@ -0,0 +1,14 @@
+error[E0412]: cannot find type `T` in this scope
+  --> $DIR/issue-75627.rs:3:26
+   |
+LL | unsafe impl Send for Foo<T> {}
+   |                          ^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+LL | unsafe impl<T> Send for Foo<T> {}
+   |            +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/traits/issue-77982.rs b/tests/ui/traits/issue-77982.rs
index f5be6cf21..f5be6cf21 100644
--- a/src/test/ui/traits/issue-77982.rs
+++ b/tests/ui/traits/issue-77982.rs
diff --git a/src/test/ui/traits/issue-77982.stderr b/tests/ui/traits/issue-77982.stderr
index b6a045855..0b57a8212 100644
--- a/src/test/ui/traits/issue-77982.stderr
+++ b/tests/ui/traits/issue-77982.stderr
@@ -12,9 +12,6 @@ LL |     opts.get(opt.as_ref());
              where T: ?Sized;
 note: required by a bound in `HashMap::<K, V, S>::get`
   --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
-   |
-LL |         K: Borrow<Q>,
-   |            ^^^^^^^^^ required by this bound in `HashMap::<K, V, S>::get`
 help: consider specifying the generic argument
    |
 LL |     opts.get::<Q>(opt.as_ref());
@@ -46,7 +43,15 @@ LL |     let ips: Vec<_> = (0..100_000).map(|_| u32::from(0u32.into())).collect(
    |                                            |
    |                                            required by a bound introduced by this call
    |
-   = note: cannot satisfy `u32: From<_>`
+   = note: multiple `impl`s satisfying `u32: From<_>` found in the following crates: `core`, `std`:
+           - impl From<Ipv4Addr> for u32;
+           - impl From<NonZeroU32> for u32;
+           - impl From<bool> for u32;
+           - impl From<char> for u32;
+           - impl From<u16> for u32;
+           - impl From<u8> for u32;
+           - impl<T> From<!> for T;
+           - impl<T> From<T> for T;
 help: try using a fully qualified path to specify the expected types
    |
 LL |     let ips: Vec<_> = (0..100_000).map(|_| u32::from(<u32 as Into<T>>::into(0u32))).collect();
diff --git a/src/test/ui/traits/issue-78372.rs b/tests/ui/traits/issue-78372.rs
index 92f9f4b46..92f9f4b46 100644
--- a/src/test/ui/traits/issue-78372.rs
+++ b/tests/ui/traits/issue-78372.rs
diff --git a/src/test/ui/traits/issue-78372.stderr b/tests/ui/traits/issue-78372.stderr
index 7e781016e..8e7fd5f25 100644
--- a/src/test/ui/traits/issue-78372.stderr
+++ b/tests/ui/traits/issue-78372.stderr
@@ -30,9 +30,12 @@ error[E0412]: cannot find type `MISC` in this scope
   --> $DIR/issue-78372.rs:3:34
    |
 LL | impl<T> DispatchFromDyn<Smaht<U, MISC>> for T {}
-   |       -                          ^^^^ not found in this scope
-   |       |
-   |       help: you might be missing a type parameter: `, MISC`
+   |                                  ^^^^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+LL | impl<T, MISC> DispatchFromDyn<Smaht<U, MISC>> for T {}
+   |       ++++++
 
 error[E0658]: use of unstable library feature 'dispatch_from_dyn'
   --> $DIR/issue-78372.rs:1:5
diff --git a/src/test/ui/traits/issue-78632.rs b/tests/ui/traits/issue-78632.rs
index c72a2aef4..c72a2aef4 100644
--- a/src/test/ui/traits/issue-78632.rs
+++ b/tests/ui/traits/issue-78632.rs
diff --git a/src/test/ui/traits/issue-79458.rs b/tests/ui/traits/issue-79458.rs
index a41add6a1..a41add6a1 100644
--- a/src/test/ui/traits/issue-79458.rs
+++ b/tests/ui/traits/issue-79458.rs
diff --git a/src/test/ui/traits/issue-79458.stderr b/tests/ui/traits/issue-79458.stderr
index 08f7bbbf0..08f7bbbf0 100644
--- a/src/test/ui/traits/issue-79458.stderr
+++ b/tests/ui/traits/issue-79458.stderr
diff --git a/src/test/ui/traits/issue-8153.rs b/tests/ui/traits/issue-8153.rs
index 81a8f5338..81a8f5338 100644
--- a/src/test/ui/traits/issue-8153.rs
+++ b/tests/ui/traits/issue-8153.rs
diff --git a/src/test/ui/traits/issue-8153.stderr b/tests/ui/traits/issue-8153.stderr
index ae214bb9e..ae214bb9e 100644
--- a/src/test/ui/traits/issue-8153.stderr
+++ b/tests/ui/traits/issue-8153.stderr
diff --git a/src/test/ui/traits/issue-82830.rs b/tests/ui/traits/issue-82830.rs
index 37bae2e90..37bae2e90 100644
--- a/src/test/ui/traits/issue-82830.rs
+++ b/tests/ui/traits/issue-82830.rs
diff --git a/src/test/ui/traits/issue-83538-tainted-cache-after-cycle.rs b/tests/ui/traits/issue-83538-tainted-cache-after-cycle.rs
index 3cd68ff6f..3cd68ff6f 100644
--- a/src/test/ui/traits/issue-83538-tainted-cache-after-cycle.rs
+++ b/tests/ui/traits/issue-83538-tainted-cache-after-cycle.rs
diff --git a/src/test/ui/traits/issue-83538-tainted-cache-after-cycle.stderr b/tests/ui/traits/issue-83538-tainted-cache-after-cycle.stderr
index 7c4041144..7c4041144 100644
--- a/src/test/ui/traits/issue-83538-tainted-cache-after-cycle.stderr
+++ b/tests/ui/traits/issue-83538-tainted-cache-after-cycle.stderr
diff --git a/src/test/ui/traits/issue-84399-bad-fresh-caching.rs b/tests/ui/traits/issue-84399-bad-fresh-caching.rs
index 149400156..149400156 100644
--- a/src/test/ui/traits/issue-84399-bad-fresh-caching.rs
+++ b/tests/ui/traits/issue-84399-bad-fresh-caching.rs
diff --git a/src/test/ui/traits/issue-85360-eval-obligation-ice.rs b/tests/ui/traits/issue-85360-eval-obligation-ice.rs
index 19131684a..19131684a 100644
--- a/src/test/ui/traits/issue-85360-eval-obligation-ice.rs
+++ b/tests/ui/traits/issue-85360-eval-obligation-ice.rs
diff --git a/src/test/ui/traits/issue-85360-eval-obligation-ice.stderr b/tests/ui/traits/issue-85360-eval-obligation-ice.stderr
index ebf977dd6..ebf977dd6 100644
--- a/src/test/ui/traits/issue-85360-eval-obligation-ice.stderr
+++ b/tests/ui/traits/issue-85360-eval-obligation-ice.stderr
diff --git a/src/test/ui/traits/issue-85735.rs b/tests/ui/traits/issue-85735.rs
index fb387a9c9..fb387a9c9 100644
--- a/src/test/ui/traits/issue-85735.rs
+++ b/tests/ui/traits/issue-85735.rs
diff --git a/tests/ui/traits/issue-85735.stderr b/tests/ui/traits/issue-85735.stderr
new file mode 100644
index 000000000..9e80497ca
--- /dev/null
+++ b/tests/ui/traits/issue-85735.stderr
@@ -0,0 +1,18 @@
+error[E0283]: type annotations needed: cannot satisfy `T: FnMut<(&'a (),)>`
+  --> $DIR/issue-85735.rs:7:8
+   |
+LL |     T: FnMut(&'a ()),
+   |        ^^^^^^^^^^^^^
+   |
+note: multiple `impl`s or `where` clauses satisfying `T: FnMut<(&'a (),)>` found
+  --> $DIR/issue-85735.rs:7:8
+   |
+LL |     T: FnMut(&'a ()),
+   |        ^^^^^^^^^^^^^
+LL |
+LL |     T: FnMut(&'b ()),
+   |        ^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0283`.
diff --git a/src/test/ui/traits/issue-87558.rs b/tests/ui/traits/issue-87558.rs
index c5d86bd63..c5d86bd63 100644
--- a/src/test/ui/traits/issue-87558.rs
+++ b/tests/ui/traits/issue-87558.rs
diff --git a/src/test/ui/traits/issue-87558.stderr b/tests/ui/traits/issue-87558.stderr
index 494274d8c..494274d8c 100644
--- a/src/test/ui/traits/issue-87558.stderr
+++ b/tests/ui/traits/issue-87558.stderr
diff --git a/src/test/ui/traits/issue-89119.rs b/tests/ui/traits/issue-89119.rs
index 170f69915..170f69915 100644
--- a/src/test/ui/traits/issue-89119.rs
+++ b/tests/ui/traits/issue-89119.rs
diff --git a/src/test/ui/traits/issue-90195-2.rs b/tests/ui/traits/issue-90195-2.rs
index b739dc46e..b739dc46e 100644
--- a/src/test/ui/traits/issue-90195-2.rs
+++ b/tests/ui/traits/issue-90195-2.rs
diff --git a/src/test/ui/traits/issue-90195.rs b/tests/ui/traits/issue-90195.rs
index 543c9f197..543c9f197 100644
--- a/src/test/ui/traits/issue-90195.rs
+++ b/tests/ui/traits/issue-90195.rs
diff --git a/src/test/ui/traits/issue-90662-projection-caching.rs b/tests/ui/traits/issue-90662-projection-caching.rs
index 879f30071..879f30071 100644
--- a/src/test/ui/traits/issue-90662-projection-caching.rs
+++ b/tests/ui/traits/issue-90662-projection-caching.rs
diff --git a/src/test/ui/traits/issue-91594.rs b/tests/ui/traits/issue-91594.rs
index 930f7f0c6..930f7f0c6 100644
--- a/src/test/ui/traits/issue-91594.rs
+++ b/tests/ui/traits/issue-91594.rs
diff --git a/tests/ui/traits/issue-91594.stderr b/tests/ui/traits/issue-91594.stderr
new file mode 100644
index 000000000..85d903fad
--- /dev/null
+++ b/tests/ui/traits/issue-91594.stderr
@@ -0,0 +1,18 @@
+error[E0277]: the trait bound `Foo: HasComponent<()>` is not satisfied
+  --> $DIR/issue-91594.rs:10:19
+   |
+LL | impl HasComponent<<Foo as Component<Foo>>::Interface> for Foo {}
+   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `HasComponent<()>` is not implemented for `Foo`
+   |
+   = help: the trait `HasComponent<<Foo as Component<Foo>>::Interface>` is implemented for `Foo`
+note: required for `Foo` to implement `Component<Foo>`
+  --> $DIR/issue-91594.rs:13:27
+   |
+LL | impl<M: HasComponent<()>> Component<M> for Foo {
+   |         ----------------  ^^^^^^^^^^^^     ^^^
+   |         |
+   |         unsatisfied trait bound introduced here
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/traits/issue-91949-hangs-on-recursion.rs b/tests/ui/traits/issue-91949-hangs-on-recursion.rs
index 6474b2b38..6474b2b38 100644
--- a/src/test/ui/traits/issue-91949-hangs-on-recursion.rs
+++ b/tests/ui/traits/issue-91949-hangs-on-recursion.rs
diff --git a/src/test/ui/traits/issue-91949-hangs-on-recursion.stderr b/tests/ui/traits/issue-91949-hangs-on-recursion.stderr
index 1f18c5daf..1f18c5daf 100644
--- a/src/test/ui/traits/issue-91949-hangs-on-recursion.stderr
+++ b/tests/ui/traits/issue-91949-hangs-on-recursion.stderr
diff --git a/src/test/ui/traits/issue-92292.rs b/tests/ui/traits/issue-92292.rs
index bb3700a2b..bb3700a2b 100644
--- a/src/test/ui/traits/issue-92292.rs
+++ b/tests/ui/traits/issue-92292.rs
diff --git a/src/test/ui/traits/issue-9394-inherited-calls.rs b/tests/ui/traits/issue-9394-inherited-calls.rs
index cc0dd4fc1..cc0dd4fc1 100644
--- a/src/test/ui/traits/issue-9394-inherited-calls.rs
+++ b/tests/ui/traits/issue-9394-inherited-calls.rs
diff --git a/src/test/ui/traits/issue-95311.rs b/tests/ui/traits/issue-95311.rs
index 9d40d254a..9d40d254a 100644
--- a/src/test/ui/traits/issue-95311.rs
+++ b/tests/ui/traits/issue-95311.rs
diff --git a/src/test/ui/traits/issue-95898.rs b/tests/ui/traits/issue-95898.rs
index 41a20b899..41a20b899 100644
--- a/src/test/ui/traits/issue-95898.rs
+++ b/tests/ui/traits/issue-95898.rs
diff --git a/src/test/ui/traits/issue-95898.stderr b/tests/ui/traits/issue-95898.stderr
index ca7bacdbf..ca7bacdbf 100644
--- a/src/test/ui/traits/issue-95898.stderr
+++ b/tests/ui/traits/issue-95898.stderr
diff --git a/src/test/ui/traits/issue-96664.rs b/tests/ui/traits/issue-96664.rs
index 3c5314af7..3c5314af7 100644
--- a/src/test/ui/traits/issue-96664.rs
+++ b/tests/ui/traits/issue-96664.rs
diff --git a/src/test/ui/traits/issue-96665.rs b/tests/ui/traits/issue-96665.rs
index a571d48d9..a571d48d9 100644
--- a/src/test/ui/traits/issue-96665.rs
+++ b/tests/ui/traits/issue-96665.rs
diff --git a/src/test/ui/traits/issue-97576.rs b/tests/ui/traits/issue-97576.rs
index fdc85e9fa..fdc85e9fa 100644
--- a/src/test/ui/traits/issue-97576.rs
+++ b/tests/ui/traits/issue-97576.rs
diff --git a/tests/ui/traits/issue-97576.stderr b/tests/ui/traits/issue-97576.stderr
new file mode 100644
index 000000000..9062a0fab
--- /dev/null
+++ b/tests/ui/traits/issue-97576.stderr
@@ -0,0 +1,11 @@
+error[E0277]: the trait bound `String: From<impl ToString>` is not satisfied
+  --> $DIR/issue-97576.rs:8:22
+   |
+LL |             bar: bar.into(),
+   |                      ^^^^ the trait `From<impl ToString>` is not implemented for `String`
+   |
+   = note: required for `impl ToString` to implement `Into<String>`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/traits/issue-97695-double-trivial-bound.rs b/tests/ui/traits/issue-97695-double-trivial-bound.rs
index 213605b51..213605b51 100644
--- a/src/test/ui/traits/issue-97695-double-trivial-bound.rs
+++ b/tests/ui/traits/issue-97695-double-trivial-bound.rs
diff --git a/src/test/ui/issues/issue-99875.rs b/tests/ui/traits/issue-99875.rs
index cf73fd8d3..cf73fd8d3 100644
--- a/src/test/ui/issues/issue-99875.rs
+++ b/tests/ui/traits/issue-99875.rs
diff --git a/src/test/ui/issues/issue-99875.stderr b/tests/ui/traits/issue-99875.stderr
index 3ff8f12f1..fb6eebbd2 100644
--- a/src/test/ui/issues/issue-99875.stderr
+++ b/tests/ui/traits/issue-99875.stderr
@@ -6,12 +6,15 @@ LL |     takes(function);
    |     |
    |     required by a bound introduced by this call
    |
-   = help: the trait `Trait` is implemented for fn pointer `fn(Argument) -> Return`
 note: required by a bound in `takes`
   --> $DIR/issue-99875.rs:9:18
    |
 LL | fn takes(_: impl Trait) {}
    |                  ^^^^^ required by this bound in `takes`
+help: the trait `Trait` is implemented for fn pointer `fn(Argument) -> Return`, try casting using `as`
+   |
+LL |     takes(function as fn(Argument) -> Return);
+   |                    +++++++++++++++++++++++++
 
 error[E0277]: the trait bound `[closure@$DIR/issue-99875.rs:14:11: 14:34]: Trait` is not satisfied
   --> $DIR/issue-99875.rs:14:11
diff --git a/src/test/ui/traits/item-inside-macro.rs b/tests/ui/traits/item-inside-macro.rs
index 54bf872d0..54bf872d0 100644
--- a/src/test/ui/traits/item-inside-macro.rs
+++ b/tests/ui/traits/item-inside-macro.rs
diff --git a/src/test/ui/traits/item-privacy.rs b/tests/ui/traits/item-privacy.rs
index 38d06b967..38d06b967 100644
--- a/src/test/ui/traits/item-privacy.rs
+++ b/tests/ui/traits/item-privacy.rs
diff --git a/src/test/ui/traits/item-privacy.stderr b/tests/ui/traits/item-privacy.stderr
index f137a298a..293cfbda8 100644
--- a/src/test/ui/traits/item-privacy.stderr
+++ b/tests/ui/traits/item-privacy.stderr
@@ -148,19 +148,24 @@ error[E0223]: ambiguous associated type
   --> $DIR/item-privacy.rs:115:12
    |
 LL |     let _: S::A;
-   |            ^^^^ help: use fully-qualified syntax: `<S as Trait>::A`
+   |            ^^^^
+   |
+help: if there were a trait named `Example` with associated type `A` implemented for `S`, you could use the fully-qualified path
+   |
+LL |     let _: <S as Example>::A;
+   |            ~~~~~~~~~~~~~~~~~
 
 error[E0223]: ambiguous associated type
   --> $DIR/item-privacy.rs:116:12
    |
 LL |     let _: S::B;
-   |            ^^^^ help: use fully-qualified syntax: `<S as Trait>::B`
+   |            ^^^^ help: use the fully-qualified path: `<S as assoc_ty::B>::B`
 
 error[E0223]: ambiguous associated type
   --> $DIR/item-privacy.rs:117:12
    |
 LL |     let _: S::C;
-   |            ^^^^ help: use fully-qualified syntax: `<S as Trait>::C`
+   |            ^^^^ help: use the fully-qualified path: `<S as assoc_ty::C>::C`
 
 error[E0624]: associated type `A` is private
   --> $DIR/item-privacy.rs:119:12
diff --git a/src/test/ui/traits/kindck-owned-contains-1.rs b/tests/ui/traits/kindck-owned-contains-1.rs
index 8adb06ba3..8adb06ba3 100644
--- a/src/test/ui/traits/kindck-owned-contains-1.rs
+++ b/tests/ui/traits/kindck-owned-contains-1.rs
diff --git a/src/test/ui/traits/map-types.rs b/tests/ui/traits/map-types.rs
index dc33b9618..dc33b9618 100644
--- a/src/test/ui/traits/map-types.rs
+++ b/tests/ui/traits/map-types.rs
diff --git a/src/test/ui/traits/map-types.stderr b/tests/ui/traits/map-types.stderr
index f685c50b0..f685c50b0 100644
--- a/src/test/ui/traits/map-types.stderr
+++ b/tests/ui/traits/map-types.stderr
diff --git a/src/test/ui/traits/matching-lifetimes.rs b/tests/ui/traits/matching-lifetimes.rs
index 1430dc655..1430dc655 100644
--- a/src/test/ui/traits/matching-lifetimes.rs
+++ b/tests/ui/traits/matching-lifetimes.rs
diff --git a/src/test/ui/traits/matching-lifetimes.stderr b/tests/ui/traits/matching-lifetimes.stderr
index de1c878a5..f8119ed41 100644
--- a/src/test/ui/traits/matching-lifetimes.stderr
+++ b/tests/ui/traits/matching-lifetimes.stderr
@@ -4,8 +4,8 @@ error[E0308]: method not compatible with trait
 LL |     fn foo(x: Foo<'b,'a>) {
    |     ^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
-   = note: expected fn pointer `fn(Foo<'a, 'b>)`
-              found fn pointer `fn(Foo<'b, 'a>)`
+   = note: expected signature `fn(Foo<'a, 'b>)`
+              found signature `fn(Foo<'b, 'a>)`
 note: the lifetime `'b` as defined here...
   --> $DIR/matching-lifetimes.rs:13:9
    |
@@ -23,8 +23,8 @@ error[E0308]: method not compatible with trait
 LL |     fn foo(x: Foo<'b,'a>) {
    |     ^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
-   = note: expected fn pointer `fn(Foo<'a, 'b>)`
-              found fn pointer `fn(Foo<'b, 'a>)`
+   = note: expected signature `fn(Foo<'a, 'b>)`
+              found signature `fn(Foo<'b, 'a>)`
 note: the lifetime `'a` as defined here...
   --> $DIR/matching-lifetimes.rs:13:6
    |
diff --git a/src/test/ui/traits/method-private.rs b/tests/ui/traits/method-private.rs
index 4cd184854..4cd184854 100644
--- a/src/test/ui/traits/method-private.rs
+++ b/tests/ui/traits/method-private.rs
diff --git a/src/test/ui/traits/method-private.stderr b/tests/ui/traits/method-private.stderr
index 8e991ec01..8e991ec01 100644
--- a/src/test/ui/traits/method-private.stderr
+++ b/tests/ui/traits/method-private.stderr
diff --git a/src/test/ui/traits/monad.rs b/tests/ui/traits/monad.rs
index 5d0612cf8..5d0612cf8 100644
--- a/src/test/ui/traits/monad.rs
+++ b/tests/ui/traits/monad.rs
diff --git a/src/test/ui/traits/monomorphized-callees-with-ty-params-3314.rs b/tests/ui/traits/monomorphized-callees-with-ty-params-3314.rs
index bc314a39d..bc314a39d 100644
--- a/src/test/ui/traits/monomorphized-callees-with-ty-params-3314.rs
+++ b/tests/ui/traits/monomorphized-callees-with-ty-params-3314.rs
diff --git a/src/test/ui/traits/multidispatch-bad.rs b/tests/ui/traits/multidispatch-bad.rs
index b625b9615..b625b9615 100644
--- a/src/test/ui/traits/multidispatch-bad.rs
+++ b/tests/ui/traits/multidispatch-bad.rs
diff --git a/src/test/ui/traits/multidispatch-bad.stderr b/tests/ui/traits/multidispatch-bad.stderr
index d58f1e2d9..d58f1e2d9 100644
--- a/src/test/ui/traits/multidispatch-bad.stderr
+++ b/tests/ui/traits/multidispatch-bad.stderr
diff --git a/src/test/ui/traits/multidispatch-conditional-impl-not-considered.rs b/tests/ui/traits/multidispatch-conditional-impl-not-considered.rs
index f845e198a..f845e198a 100644
--- a/src/test/ui/traits/multidispatch-conditional-impl-not-considered.rs
+++ b/tests/ui/traits/multidispatch-conditional-impl-not-considered.rs
diff --git a/src/test/ui/traits/multidispatch-convert-ambig-dest.rs b/tests/ui/traits/multidispatch-convert-ambig-dest.rs
index aa74e11c3..aa74e11c3 100644
--- a/src/test/ui/traits/multidispatch-convert-ambig-dest.rs
+++ b/tests/ui/traits/multidispatch-convert-ambig-dest.rs
diff --git a/src/test/ui/traits/multidispatch-convert-ambig-dest.stderr b/tests/ui/traits/multidispatch-convert-ambig-dest.stderr
index 6e6172eea..6e6172eea 100644
--- a/src/test/ui/traits/multidispatch-convert-ambig-dest.stderr
+++ b/tests/ui/traits/multidispatch-convert-ambig-dest.stderr
diff --git a/src/test/ui/traits/multidispatch-infer-convert-target.rs b/tests/ui/traits/multidispatch-infer-convert-target.rs
index 626e1ae71..626e1ae71 100644
--- a/src/test/ui/traits/multidispatch-infer-convert-target.rs
+++ b/tests/ui/traits/multidispatch-infer-convert-target.rs
diff --git a/src/test/ui/traits/multidispatch1.rs b/tests/ui/traits/multidispatch1.rs
index f2469e149..f2469e149 100644
--- a/src/test/ui/traits/multidispatch1.rs
+++ b/tests/ui/traits/multidispatch1.rs
diff --git a/src/test/ui/traits/multidispatch2.rs b/tests/ui/traits/multidispatch2.rs
index 20608aabb..20608aabb 100644
--- a/src/test/ui/traits/multidispatch2.rs
+++ b/tests/ui/traits/multidispatch2.rs
diff --git a/src/test/ui/traits/mutual-recursion-issue-75860.rs b/tests/ui/traits/mutual-recursion-issue-75860.rs
index d7d7307b4..d7d7307b4 100644
--- a/src/test/ui/traits/mutual-recursion-issue-75860.rs
+++ b/tests/ui/traits/mutual-recursion-issue-75860.rs
diff --git a/src/test/ui/traits/mutual-recursion-issue-75860.stderr b/tests/ui/traits/mutual-recursion-issue-75860.stderr
index 920f66121..23e182738 100644
--- a/src/test/ui/traits/mutual-recursion-issue-75860.stderr
+++ b/tests/ui/traits/mutual-recursion-issue-75860.stderr
@@ -7,9 +7,6 @@ LL |     iso(left, right)
    = help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`mutual_recursion_issue_75860`)
 note: required by a bound in `Option`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL | pub enum Option<T> {
-   |                 ^ required by this bound in `Option`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/traits/negative-impls/auxiliary/foreign_trait.rs b/tests/ui/traits/negative-impls/auxiliary/foreign_trait.rs
index 0e17f0890..0e17f0890 100644
--- a/src/test/ui/traits/negative-impls/auxiliary/foreign_trait.rs
+++ b/tests/ui/traits/negative-impls/auxiliary/foreign_trait.rs
diff --git a/src/test/ui/traits/negative-impls/eager-mono.rs b/tests/ui/traits/negative-impls/eager-mono.rs
index ce770376c..ce770376c 100644
--- a/src/test/ui/traits/negative-impls/eager-mono.rs
+++ b/tests/ui/traits/negative-impls/eager-mono.rs
diff --git a/src/test/ui/traits/negative-impls/explicitly-unimplemented-error-message.rs b/tests/ui/traits/negative-impls/explicitly-unimplemented-error-message.rs
index 17ddaa312..17ddaa312 100644
--- a/src/test/ui/traits/negative-impls/explicitly-unimplemented-error-message.rs
+++ b/tests/ui/traits/negative-impls/explicitly-unimplemented-error-message.rs
diff --git a/src/test/ui/traits/negative-impls/explicitly-unimplemented-error-message.stderr b/tests/ui/traits/negative-impls/explicitly-unimplemented-error-message.stderr
index b29442d7b..b29442d7b 100644
--- a/src/test/ui/traits/negative-impls/explicitly-unimplemented-error-message.stderr
+++ b/tests/ui/traits/negative-impls/explicitly-unimplemented-error-message.stderr
diff --git a/src/test/ui/traits/negative-impls/feature-gate-negative_impls.rs b/tests/ui/traits/negative-impls/feature-gate-negative_impls.rs
index 683fd6db6..683fd6db6 100644
--- a/src/test/ui/traits/negative-impls/feature-gate-negative_impls.rs
+++ b/tests/ui/traits/negative-impls/feature-gate-negative_impls.rs
diff --git a/src/test/ui/traits/negative-impls/feature-gate-negative_impls.stderr b/tests/ui/traits/negative-impls/feature-gate-negative_impls.stderr
index b253fbd0d..b253fbd0d 100644
--- a/src/test/ui/traits/negative-impls/feature-gate-negative_impls.stderr
+++ b/tests/ui/traits/negative-impls/feature-gate-negative_impls.stderr
diff --git a/src/test/ui/traits/negative-impls/negated-auto-traits-error.rs b/tests/ui/traits/negative-impls/negated-auto-traits-error.rs
index 4bdad5dc5..4bdad5dc5 100644
--- a/src/test/ui/traits/negative-impls/negated-auto-traits-error.rs
+++ b/tests/ui/traits/negative-impls/negated-auto-traits-error.rs
diff --git a/src/test/ui/traits/negative-impls/negated-auto-traits-error.stderr b/tests/ui/traits/negative-impls/negated-auto-traits-error.stderr
index 41fc3600f..ce690b749 100644
--- a/src/test/ui/traits/negative-impls/negated-auto-traits-error.stderr
+++ b/tests/ui/traits/negative-impls/negated-auto-traits-error.stderr
@@ -50,7 +50,7 @@ LL |     is_send((8, TestType));
    |     required by a bound introduced by this call
    |
    = help: within `({integer}, dummy1c::TestType)`, the trait `Send` is not implemented for `dummy1c::TestType`
-   = note: required because it appears within the type `({integer}, dummy1c::TestType)`
+   = note: required because it appears within the type `({integer}, TestType)`
 note: required by a bound in `is_send`
   --> $DIR/negated-auto-traits-error.rs:16:15
    |
@@ -67,7 +67,7 @@ LL |     is_send(Box::new(TestType));
    |
    = note: the trait bound `Unique<dummy2::TestType>: Send` is not satisfied
    = note: required for `Unique<dummy2::TestType>` to implement `Send`
-   = note: required because it appears within the type `Box<dummy2::TestType>`
+   = note: required because it appears within the type `Box<TestType>`
 note: required by a bound in `is_send`
   --> $DIR/negated-auto-traits-error.rs:16:15
    |
@@ -87,13 +87,13 @@ LL |     is_send(Box::new(Outer2(TestType)));
    |     required by a bound introduced by this call
    |
    = help: within `Outer2<dummy3::TestType>`, the trait `Send` is not implemented for `dummy3::TestType`
-note: required because it appears within the type `Outer2<dummy3::TestType>`
+note: required because it appears within the type `Outer2<TestType>`
   --> $DIR/negated-auto-traits-error.rs:12:8
    |
 LL | struct Outer2<T>(T);
    |        ^^^^^^
    = note: required for `Unique<Outer2<dummy3::TestType>>` to implement `Send`
-   = note: required because it appears within the type `Box<Outer2<dummy3::TestType>>`
+   = note: required because it appears within the type `Box<Outer2<TestType>>`
 note: required by a bound in `is_send`
   --> $DIR/negated-auto-traits-error.rs:16:15
    |
@@ -113,7 +113,9 @@ note: required for `Outer2<main::TestType>` to implement `Sync`
   --> $DIR/negated-auto-traits-error.rs:14:22
    |
 LL | unsafe impl<T: Send> Sync for Outer2<T> {}
-   |                      ^^^^     ^^^^^^^^^
+   |                ----  ^^^^     ^^^^^^^^^
+   |                |
+   |                unsatisfied trait bound introduced here
 note: required by a bound in `is_sync`
   --> $DIR/negated-auto-traits-error.rs:17:15
    |
diff --git a/src/test/ui/traits/negative-impls/negated-auto-traits-rpass.rs b/tests/ui/traits/negative-impls/negated-auto-traits-rpass.rs
index a1042f831..a1042f831 100644
--- a/src/test/ui/traits/negative-impls/negated-auto-traits-rpass.rs
+++ b/tests/ui/traits/negative-impls/negated-auto-traits-rpass.rs
diff --git a/src/test/ui/traits/negative-impls/negative-default-impls.rs b/tests/ui/traits/negative-impls/negative-default-impls.rs
index c68bca432..c68bca432 100644
--- a/src/test/ui/traits/negative-impls/negative-default-impls.rs
+++ b/tests/ui/traits/negative-impls/negative-default-impls.rs
diff --git a/src/test/ui/traits/negative-impls/negative-default-impls.stderr b/tests/ui/traits/negative-impls/negative-default-impls.stderr
index 7b54cf542..7b54cf542 100644
--- a/src/test/ui/traits/negative-impls/negative-default-impls.stderr
+++ b/tests/ui/traits/negative-impls/negative-default-impls.stderr
diff --git a/src/test/ui/traits/negative-impls/negative-impls-basic.rs b/tests/ui/traits/negative-impls/negative-impls-basic.rs
index 474e03817..474e03817 100644
--- a/src/test/ui/traits/negative-impls/negative-impls-basic.rs
+++ b/tests/ui/traits/negative-impls/negative-impls-basic.rs
diff --git a/src/test/ui/traits/negative-impls/negative-specializes-negative.rs b/tests/ui/traits/negative-impls/negative-specializes-negative.rs
index 35297ab12..35297ab12 100644
--- a/src/test/ui/traits/negative-impls/negative-specializes-negative.rs
+++ b/tests/ui/traits/negative-impls/negative-specializes-negative.rs
diff --git a/src/test/ui/traits/negative-impls/negative-specializes-negative.stderr b/tests/ui/traits/negative-impls/negative-specializes-negative.stderr
index 751e29c3b..751e29c3b 100644
--- a/src/test/ui/traits/negative-impls/negative-specializes-negative.stderr
+++ b/tests/ui/traits/negative-impls/negative-specializes-negative.stderr
diff --git a/src/test/ui/traits/negative-impls/negative-specializes-positive-item.rs b/tests/ui/traits/negative-impls/negative-specializes-positive-item.rs
index 4281eedaf..4281eedaf 100644
--- a/src/test/ui/traits/negative-impls/negative-specializes-positive-item.rs
+++ b/tests/ui/traits/negative-impls/negative-specializes-positive-item.rs
diff --git a/src/test/ui/traits/negative-impls/negative-specializes-positive-item.stderr b/tests/ui/traits/negative-impls/negative-specializes-positive-item.stderr
index 1cfa49b20..1cfa49b20 100644
--- a/src/test/ui/traits/negative-impls/negative-specializes-positive-item.stderr
+++ b/tests/ui/traits/negative-impls/negative-specializes-positive-item.stderr
diff --git a/src/test/ui/traits/negative-impls/negative-specializes-positive.rs b/tests/ui/traits/negative-impls/negative-specializes-positive.rs
index 0e227691e..0e227691e 100644
--- a/src/test/ui/traits/negative-impls/negative-specializes-positive.rs
+++ b/tests/ui/traits/negative-impls/negative-specializes-positive.rs
diff --git a/src/test/ui/traits/negative-impls/negative-specializes-positive.stderr b/tests/ui/traits/negative-impls/negative-specializes-positive.stderr
index 9f9e28678..9f9e28678 100644
--- a/src/test/ui/traits/negative-impls/negative-specializes-positive.stderr
+++ b/tests/ui/traits/negative-impls/negative-specializes-positive.stderr
diff --git a/src/test/ui/traits/negative-impls/no-items.rs b/tests/ui/traits/negative-impls/no-items.rs
index 5fc6be9b3..5fc6be9b3 100644
--- a/src/test/ui/traits/negative-impls/no-items.rs
+++ b/tests/ui/traits/negative-impls/no-items.rs
diff --git a/src/test/ui/traits/negative-impls/no-items.stderr b/tests/ui/traits/negative-impls/no-items.stderr
index 67b94bba1..67b94bba1 100644
--- a/src/test/ui/traits/negative-impls/no-items.stderr
+++ b/tests/ui/traits/negative-impls/no-items.stderr
diff --git a/src/test/ui/traits/negative-impls/pin-unsound-issue-66544-clone.rs b/tests/ui/traits/negative-impls/pin-unsound-issue-66544-clone.rs
index a5b856465..a5b856465 100644
--- a/src/test/ui/traits/negative-impls/pin-unsound-issue-66544-clone.rs
+++ b/tests/ui/traits/negative-impls/pin-unsound-issue-66544-clone.rs
diff --git a/src/test/ui/traits/negative-impls/pin-unsound-issue-66544-clone.stderr b/tests/ui/traits/negative-impls/pin-unsound-issue-66544-clone.stderr
index a87acb1fb..a87acb1fb 100644
--- a/src/test/ui/traits/negative-impls/pin-unsound-issue-66544-clone.stderr
+++ b/tests/ui/traits/negative-impls/pin-unsound-issue-66544-clone.stderr
diff --git a/src/test/ui/traits/negative-impls/pin-unsound-issue-66544-derefmut.rs b/tests/ui/traits/negative-impls/pin-unsound-issue-66544-derefmut.rs
index 606cc65a8..606cc65a8 100644
--- a/src/test/ui/traits/negative-impls/pin-unsound-issue-66544-derefmut.rs
+++ b/tests/ui/traits/negative-impls/pin-unsound-issue-66544-derefmut.rs
diff --git a/src/test/ui/traits/negative-impls/pin-unsound-issue-66544-derefmut.stderr b/tests/ui/traits/negative-impls/pin-unsound-issue-66544-derefmut.stderr
index 9185e8f84..9185e8f84 100644
--- a/src/test/ui/traits/negative-impls/pin-unsound-issue-66544-derefmut.stderr
+++ b/tests/ui/traits/negative-impls/pin-unsound-issue-66544-derefmut.stderr
diff --git a/src/test/ui/traits/negative-impls/positive-specializes-negative.rs b/tests/ui/traits/negative-impls/positive-specializes-negative.rs
index a06b35765..a06b35765 100644
--- a/src/test/ui/traits/negative-impls/positive-specializes-negative.rs
+++ b/tests/ui/traits/negative-impls/positive-specializes-negative.rs
diff --git a/src/test/ui/traits/negative-impls/positive-specializes-negative.stderr b/tests/ui/traits/negative-impls/positive-specializes-negative.stderr
index 545f94143..545f94143 100644
--- a/src/test/ui/traits/negative-impls/positive-specializes-negative.stderr
+++ b/tests/ui/traits/negative-impls/positive-specializes-negative.stderr
diff --git a/src/test/ui/traits/negative-impls/rely-on-negative-impl-in-coherence.rs b/tests/ui/traits/negative-impls/rely-on-negative-impl-in-coherence.rs
index c1f96ab8c..c1f96ab8c 100644
--- a/src/test/ui/traits/negative-impls/rely-on-negative-impl-in-coherence.rs
+++ b/tests/ui/traits/negative-impls/rely-on-negative-impl-in-coherence.rs
diff --git a/tests/ui/traits/new-solver/fn-trait-closure.rs b/tests/ui/traits/new-solver/fn-trait-closure.rs
new file mode 100644
index 000000000..c0ecf1c91
--- /dev/null
+++ b/tests/ui/traits/new-solver/fn-trait-closure.rs
@@ -0,0 +1,15 @@
+// compile-flags: -Ztrait-solver=next
+// known-bug: unknown
+// failure-status: 101
+// dont-check-compiler-stderr
+
+// This test will fail until we fix `FulfillmentCtxt::relationships`. That's
+// because we create a type variable for closure upvar types, which is not
+// constrained until after we try to do fallback on diverging type variables.
+// Thus, we will call that function, which is unimplemented.
+
+fn require_fn(_: impl Fn() -> i32) {}
+
+fn main() {
+    require_fn(|| -> i32 { 1i32 });
+}
diff --git a/tests/ui/traits/new-solver/fn-trait.rs b/tests/ui/traits/new-solver/fn-trait.rs
new file mode 100644
index 000000000..d566ead10
--- /dev/null
+++ b/tests/ui/traits/new-solver/fn-trait.rs
@@ -0,0 +1,13 @@
+// compile-flags: -Ztrait-solver=next
+// check-pass
+
+fn require_fn(_: impl Fn() -> i32) {}
+
+fn f() -> i32 {
+    1i32
+}
+
+fn main() {
+    require_fn(f);
+    require_fn(f as fn() -> i32);
+}
diff --git a/tests/ui/traits/new-solver/pointer-sized.rs b/tests/ui/traits/new-solver/pointer-sized.rs
new file mode 100644
index 000000000..15681cd13
--- /dev/null
+++ b/tests/ui/traits/new-solver/pointer-sized.rs
@@ -0,0 +1,12 @@
+#![feature(pointer_sized_trait)]
+
+use std::marker::PointerSized;
+
+fn require_pointer_sized(_: impl PointerSized) {}
+
+fn main() {
+    require_pointer_sized(1usize);
+    require_pointer_sized(1u16);
+    //~^ ERROR `u16` needs to be a pointer-sized type
+    require_pointer_sized(&1i16);
+}
diff --git a/tests/ui/traits/new-solver/pointer-sized.stderr b/tests/ui/traits/new-solver/pointer-sized.stderr
new file mode 100644
index 000000000..b250b1331
--- /dev/null
+++ b/tests/ui/traits/new-solver/pointer-sized.stderr
@@ -0,0 +1,24 @@
+error[E0277]: `u16` needs to be a pointer-sized type
+  --> $DIR/pointer-sized.rs:9:27
+   |
+LL |     require_pointer_sized(1u16);
+   |     --------------------- ^^^^ the trait `PointerSized` is not implemented for `u16`
+   |     |
+   |     required by a bound introduced by this call
+   |
+   = note: the trait bound `u16: PointerSized` is not satisfied
+note: required by a bound in `require_pointer_sized`
+  --> $DIR/pointer-sized.rs:5:34
+   |
+LL | fn require_pointer_sized(_: impl PointerSized) {}
+   |                                  ^^^^^^^^^^^^ required by this bound in `require_pointer_sized`
+help: consider borrowing here
+   |
+LL |     require_pointer_sized(&1u16);
+   |                           +
+LL |     require_pointer_sized(&mut 1u16);
+   |                           ++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/traits/no-fallback-multiple-impls.rs b/tests/ui/traits/no-fallback-multiple-impls.rs
index 7ed3796f0..7ed3796f0 100644
--- a/src/test/ui/traits/no-fallback-multiple-impls.rs
+++ b/tests/ui/traits/no-fallback-multiple-impls.rs
diff --git a/src/test/ui/traits/no-fallback-multiple-impls.stderr b/tests/ui/traits/no-fallback-multiple-impls.stderr
index 61c9e5aaa..61c9e5aaa 100644
--- a/src/test/ui/traits/no-fallback-multiple-impls.stderr
+++ b/tests/ui/traits/no-fallback-multiple-impls.stderr
diff --git a/src/test/ui/traits/no_send-struct.rs b/tests/ui/traits/no_send-struct.rs
index 75a363f9f..75a363f9f 100644
--- a/src/test/ui/traits/no_send-struct.rs
+++ b/tests/ui/traits/no_send-struct.rs
diff --git a/src/test/ui/traits/no_send-struct.stderr b/tests/ui/traits/no_send-struct.stderr
index ee7bdf282..ee7bdf282 100644
--- a/src/test/ui/traits/no_send-struct.stderr
+++ b/tests/ui/traits/no_send-struct.stderr
diff --git a/src/test/ui/traits/normalize-supertrait.rs b/tests/ui/traits/normalize-supertrait.rs
index 021a93eac..021a93eac 100644
--- a/src/test/ui/traits/normalize-supertrait.rs
+++ b/tests/ui/traits/normalize-supertrait.rs
diff --git a/src/test/ui/traits/not-suggest-non-existing-fully-qualified-path.rs b/tests/ui/traits/not-suggest-non-existing-fully-qualified-path.rs
index 538e74ee1..538e74ee1 100644
--- a/src/test/ui/traits/not-suggest-non-existing-fully-qualified-path.rs
+++ b/tests/ui/traits/not-suggest-non-existing-fully-qualified-path.rs
diff --git a/src/test/ui/traits/not-suggest-non-existing-fully-qualified-path.stderr b/tests/ui/traits/not-suggest-non-existing-fully-qualified-path.stderr
index 53178328c..92d9d32cf 100644
--- a/src/test/ui/traits/not-suggest-non-existing-fully-qualified-path.stderr
+++ b/tests/ui/traits/not-suggest-non-existing-fully-qualified-path.stderr
@@ -27,6 +27,9 @@ note: required for `A<B>` to implement `V<_>`
    |
 LL | impl<T, U> V<U> for A<T>
    |            ^^^^     ^^^^
+LL | where
+LL |     T: I<U>,
+   |        ---- unsatisfied trait bound introduced here
 help: try using a fully qualified path to specify the expected types
    |
 LL |     <A<B> as V<U>>::method(a);
diff --git a/src/test/ui/traits/object-does-not-impl-trait.rs b/tests/ui/traits/object-does-not-impl-trait.rs
index b3b679813..b3b679813 100644
--- a/src/test/ui/traits/object-does-not-impl-trait.rs
+++ b/tests/ui/traits/object-does-not-impl-trait.rs
diff --git a/src/test/ui/traits/object-does-not-impl-trait.stderr b/tests/ui/traits/object-does-not-impl-trait.stderr
index f1dd508a4..f1dd508a4 100644
--- a/src/test/ui/traits/object-does-not-impl-trait.stderr
+++ b/tests/ui/traits/object-does-not-impl-trait.stderr
diff --git a/src/test/ui/traits/object-one-type-two-traits.rs b/tests/ui/traits/object-one-type-two-traits.rs
index 86a2094ee..86a2094ee 100644
--- a/src/test/ui/traits/object-one-type-two-traits.rs
+++ b/tests/ui/traits/object-one-type-two-traits.rs
diff --git a/src/test/ui/traits/object/auto-dedup-in-impl.rs b/tests/ui/traits/object/auto-dedup-in-impl.rs
index 85698f194..85698f194 100644
--- a/src/test/ui/traits/object/auto-dedup-in-impl.rs
+++ b/tests/ui/traits/object/auto-dedup-in-impl.rs
diff --git a/src/test/ui/traits/object/auto-dedup-in-impl.stderr b/tests/ui/traits/object/auto-dedup-in-impl.stderr
index 5f13c7813..5f13c7813 100644
--- a/src/test/ui/traits/object/auto-dedup-in-impl.stderr
+++ b/tests/ui/traits/object/auto-dedup-in-impl.stderr
diff --git a/src/test/ui/traits/object/auto-dedup.rs b/tests/ui/traits/object/auto-dedup.rs
index 39d25eb7f..39d25eb7f 100644
--- a/src/test/ui/traits/object/auto-dedup.rs
+++ b/tests/ui/traits/object/auto-dedup.rs
diff --git a/src/test/ui/traits/object/bounds-cycle-1.rs b/tests/ui/traits/object/bounds-cycle-1.rs
index 314676492..314676492 100644
--- a/src/test/ui/traits/object/bounds-cycle-1.rs
+++ b/tests/ui/traits/object/bounds-cycle-1.rs
diff --git a/src/test/ui/traits/object/bounds-cycle-2.rs b/tests/ui/traits/object/bounds-cycle-2.rs
index 4c1df3805..4c1df3805 100644
--- a/src/test/ui/traits/object/bounds-cycle-2.rs
+++ b/tests/ui/traits/object/bounds-cycle-2.rs
diff --git a/src/test/ui/traits/object/bounds-cycle-3.rs b/tests/ui/traits/object/bounds-cycle-3.rs
index 55726a5ae..55726a5ae 100644
--- a/src/test/ui/traits/object/bounds-cycle-3.rs
+++ b/tests/ui/traits/object/bounds-cycle-3.rs
diff --git a/src/test/ui/traits/object/bounds-cycle-4.rs b/tests/ui/traits/object/bounds-cycle-4.rs
index f83cb75c7..f83cb75c7 100644
--- a/src/test/ui/traits/object/bounds-cycle-4.rs
+++ b/tests/ui/traits/object/bounds-cycle-4.rs
diff --git a/src/test/ui/traits/object/enforce-supertrait-projection.rs b/tests/ui/traits/object/enforce-supertrait-projection.rs
index 2c9b41eea..2c9b41eea 100644
--- a/src/test/ui/traits/object/enforce-supertrait-projection.rs
+++ b/tests/ui/traits/object/enforce-supertrait-projection.rs
diff --git a/src/test/ui/traits/object/enforce-supertrait-projection.stderr b/tests/ui/traits/object/enforce-supertrait-projection.stderr
index cbf093866..cbf093866 100644
--- a/src/test/ui/traits/object/enforce-supertrait-projection.stderr
+++ b/tests/ui/traits/object/enforce-supertrait-projection.stderr
diff --git a/src/test/ui/traits/object/exclusion.rs b/tests/ui/traits/object/exclusion.rs
index 766dceeaf..766dceeaf 100644
--- a/src/test/ui/traits/object/exclusion.rs
+++ b/tests/ui/traits/object/exclusion.rs
diff --git a/src/test/ui/traits/object/generics.rs b/tests/ui/traits/object/generics.rs
index 5a4a6aecc..5a4a6aecc 100644
--- a/src/test/ui/traits/object/generics.rs
+++ b/tests/ui/traits/object/generics.rs
diff --git a/src/test/ui/traits/object/issue-33140-traitobject-crate.rs b/tests/ui/traits/object/issue-33140-traitobject-crate.rs
index 8abd92da3..8abd92da3 100644
--- a/src/test/ui/traits/object/issue-33140-traitobject-crate.rs
+++ b/tests/ui/traits/object/issue-33140-traitobject-crate.rs
diff --git a/src/test/ui/traits/object/issue-33140-traitobject-crate.stderr b/tests/ui/traits/object/issue-33140-traitobject-crate.stderr
index 525401f9d..525401f9d 100644
--- a/src/test/ui/traits/object/issue-33140-traitobject-crate.stderr
+++ b/tests/ui/traits/object/issue-33140-traitobject-crate.stderr
diff --git a/tests/ui/traits/object/issue-44454-1.rs b/tests/ui/traits/object/issue-44454-1.rs
new file mode 100644
index 000000000..bbaf3188a
--- /dev/null
+++ b/tests/ui/traits/object/issue-44454-1.rs
@@ -0,0 +1,22 @@
+// Taken from https://github.com/rust-lang/rust/issues/44454#issue-256435333
+
+trait Animal<X>: 'static {}
+
+fn foo<Y, X>()
+where
+    Y: Animal<X> + ?Sized,
+{
+    // `Y` implements `Animal<X>` so `Y` is 'static.
+    baz::<Y>()
+}
+
+fn bar<'a>(_arg: &'a i32) {
+    foo::<dyn Animal<&'a i32>, &'a i32>() //~ ERROR: lifetime may not live long enough
+}
+
+fn baz<T: 'static + ?Sized>() {}
+
+fn main() {
+    let a = 5;
+    bar(&a);
+}
diff --git a/tests/ui/traits/object/issue-44454-1.stderr b/tests/ui/traits/object/issue-44454-1.stderr
new file mode 100644
index 000000000..859487f50
--- /dev/null
+++ b/tests/ui/traits/object/issue-44454-1.stderr
@@ -0,0 +1,10 @@
+error: lifetime may not live long enough
+  --> $DIR/issue-44454-1.rs:14:5
+   |
+LL | fn bar<'a>(_arg: &'a i32) {
+   |        -- lifetime `'a` defined here
+LL |     foo::<dyn Animal<&'a i32>, &'a i32>()
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: aborting due to previous error
+
diff --git a/tests/ui/traits/object/issue-44454-2.rs b/tests/ui/traits/object/issue-44454-2.rs
new file mode 100644
index 000000000..f5178bcdb
--- /dev/null
+++ b/tests/ui/traits/object/issue-44454-2.rs
@@ -0,0 +1,22 @@
+// Taken from https://github.com/rust-lang/rust/issues/44454#issuecomment-1175925928
+
+trait Trait<ARG: 'static>: 'static {
+    type Assoc: AsRef<str>;
+}
+
+fn hr<T: ?Sized, ARG>(x: T::Assoc) -> Box<dyn AsRef<str> + 'static>
+where
+    T: Trait<ARG>
+{
+    Box::new(x)
+}
+
+fn extend_lt<'a>(x: &'a str) -> Box<dyn AsRef<str> + 'static> {
+    type DynTrait = dyn for<'a> Trait<&'a str, Assoc = &'a str>;
+    hr::<DynTrait, _>(x) //~ ERROR: borrowed data escapes outside of function
+}
+
+fn main() {
+    let extended = extend_lt(&String::from("hello"));
+    println!("{}", extended.as_ref().as_ref());
+}
diff --git a/tests/ui/traits/object/issue-44454-2.stderr b/tests/ui/traits/object/issue-44454-2.stderr
new file mode 100644
index 000000000..7f574769b
--- /dev/null
+++ b/tests/ui/traits/object/issue-44454-2.stderr
@@ -0,0 +1,17 @@
+error[E0521]: borrowed data escapes outside of function
+  --> $DIR/issue-44454-2.rs:16:5
+   |
+LL | fn extend_lt<'a>(x: &'a str) -> Box<dyn AsRef<str> + 'static> {
+   |              --  - `x` is a reference that is only valid in the function body
+   |              |
+   |              lifetime `'a` defined here
+LL |     type DynTrait = dyn for<'a> Trait<&'a str, Assoc = &'a str>;
+LL |     hr::<DynTrait, _>(x)
+   |     ^^^^^^^^^^^^^^^^^^^^
+   |     |
+   |     `x` escapes the function body here
+   |     argument requires that `'a` must outlive `'static`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0521`.
diff --git a/tests/ui/traits/object/issue-44454-3.rs b/tests/ui/traits/object/issue-44454-3.rs
new file mode 100644
index 000000000..bff727035
--- /dev/null
+++ b/tests/ui/traits/object/issue-44454-3.rs
@@ -0,0 +1,33 @@
+// Taken from https://github.com/rust-lang/rust/issues/44454#issuecomment-1332781290
+
+use std::any::Any;
+
+trait Animal<X>: 'static {}
+
+trait Projector {
+    type Foo;
+}
+
+impl<X> Projector for dyn Animal<X> {
+    type Foo = X;
+}
+
+fn make_static<'a, T>(t: &'a T) -> &'static T {
+    let x: <dyn Animal<&'a T> as Projector>::Foo = t;
+    let any = generic::<dyn Animal<&'a T>, &'a T>(x);
+    //~^ ERROR: lifetime may not live long enough
+    any.downcast_ref::<&'static T>().unwrap()
+}
+
+fn generic<T: Projector + Animal<U> + ?Sized, U>(x: <T as Projector>::Foo) -> Box<dyn Any> {
+    make_static_any(x)
+}
+
+fn make_static_any<U: 'static>(u: U) -> Box<dyn Any> {
+    Box::new(u)
+}
+
+fn main() {
+    let a = make_static(&"salut".to_string());
+    println!("{}", *a);
+}
diff --git a/tests/ui/traits/object/issue-44454-3.stderr b/tests/ui/traits/object/issue-44454-3.stderr
new file mode 100644
index 000000000..294684d26
--- /dev/null
+++ b/tests/ui/traits/object/issue-44454-3.stderr
@@ -0,0 +1,11 @@
+error: lifetime may not live long enough
+  --> $DIR/issue-44454-3.rs:17:15
+   |
+LL | fn make_static<'a, T>(t: &'a T) -> &'static T {
+   |                -- lifetime `'a` defined here
+LL |     let x: <dyn Animal<&'a T> as Projector>::Foo = t;
+LL |     let any = generic::<dyn Animal<&'a T>, &'a T>(x);
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/traits/object/lifetime-first.rs b/tests/ui/traits/object/lifetime-first.rs
index 33757cb7c..33757cb7c 100644
--- a/src/test/ui/traits/object/lifetime-first.rs
+++ b/tests/ui/traits/object/lifetime-first.rs
diff --git a/src/test/ui/traits/object/macro-matcher.rs b/tests/ui/traits/object/macro-matcher.rs
index 910978749..910978749 100644
--- a/src/test/ui/traits/object/macro-matcher.rs
+++ b/tests/ui/traits/object/macro-matcher.rs
diff --git a/src/test/ui/traits/object/macro-matcher.stderr b/tests/ui/traits/object/macro-matcher.stderr
index 6d1e236c0..6d1e236c0 100644
--- a/src/test/ui/traits/object/macro-matcher.stderr
+++ b/tests/ui/traits/object/macro-matcher.stderr
diff --git a/src/test/ui/traits/object/safety.rs b/tests/ui/traits/object/safety.rs
index f43d332d6..f43d332d6 100644
--- a/src/test/ui/traits/object/safety.rs
+++ b/tests/ui/traits/object/safety.rs
diff --git a/src/test/ui/traits/object/safety.stderr b/tests/ui/traits/object/safety.stderr
index dc18adeaf..dc18adeaf 100644
--- a/src/test/ui/traits/object/safety.stderr
+++ b/tests/ui/traits/object/safety.stderr
diff --git a/src/test/ui/traits/object/supertrait-lifetime-bound.rs b/tests/ui/traits/object/supertrait-lifetime-bound.rs
index f929a9bb6..f929a9bb6 100644
--- a/src/test/ui/traits/object/supertrait-lifetime-bound.rs
+++ b/tests/ui/traits/object/supertrait-lifetime-bound.rs
diff --git a/src/test/ui/traits/object/supertrait-lifetime-bound.stderr b/tests/ui/traits/object/supertrait-lifetime-bound.stderr
index ed2f86243..ed2f86243 100644
--- a/src/test/ui/traits/object/supertrait-lifetime-bound.stderr
+++ b/tests/ui/traits/object/supertrait-lifetime-bound.stderr
diff --git a/src/test/ui/traits/object/vs-lifetime-2.rs b/tests/ui/traits/object/vs-lifetime-2.rs
index 0b33dc7f6..0b33dc7f6 100644
--- a/src/test/ui/traits/object/vs-lifetime-2.rs
+++ b/tests/ui/traits/object/vs-lifetime-2.rs
diff --git a/src/test/ui/traits/object/vs-lifetime-2.stderr b/tests/ui/traits/object/vs-lifetime-2.stderr
index 9b8e793df..9b8e793df 100644
--- a/src/test/ui/traits/object/vs-lifetime-2.stderr
+++ b/tests/ui/traits/object/vs-lifetime-2.stderr
diff --git a/src/test/ui/traits/object/vs-lifetime.rs b/tests/ui/traits/object/vs-lifetime.rs
index 14ae67cff..14ae67cff 100644
--- a/src/test/ui/traits/object/vs-lifetime.rs
+++ b/tests/ui/traits/object/vs-lifetime.rs
diff --git a/src/test/ui/traits/object/vs-lifetime.stderr b/tests/ui/traits/object/vs-lifetime.stderr
index 224465228..224465228 100644
--- a/src/test/ui/traits/object/vs-lifetime.stderr
+++ b/tests/ui/traits/object/vs-lifetime.stderr
diff --git a/src/test/ui/traits/object/with-lifetime-bound.rs b/tests/ui/traits/object/with-lifetime-bound.rs
index 05aab5e3b..05aab5e3b 100644
--- a/src/test/ui/traits/object/with-lifetime-bound.rs
+++ b/tests/ui/traits/object/with-lifetime-bound.rs
diff --git a/src/test/ui/traits/object/with-self-in-projection-output-bad.rs b/tests/ui/traits/object/with-self-in-projection-output-bad.rs
index f34fa80a0..f34fa80a0 100644
--- a/src/test/ui/traits/object/with-self-in-projection-output-bad.rs
+++ b/tests/ui/traits/object/with-self-in-projection-output-bad.rs
diff --git a/src/test/ui/traits/object/with-self-in-projection-output-bad.stderr b/tests/ui/traits/object/with-self-in-projection-output-bad.stderr
index 641bfe236..641bfe236 100644
--- a/src/test/ui/traits/object/with-self-in-projection-output-bad.stderr
+++ b/tests/ui/traits/object/with-self-in-projection-output-bad.stderr
diff --git a/src/test/ui/traits/object/with-self-in-projection-output-good.rs b/tests/ui/traits/object/with-self-in-projection-output-good.rs
index d1b7bf6c2..d1b7bf6c2 100644
--- a/src/test/ui/traits/object/with-self-in-projection-output-good.rs
+++ b/tests/ui/traits/object/with-self-in-projection-output-good.rs
diff --git a/src/test/ui/traits/object/with-self-in-projection-output-repeated-supertrait.rs b/tests/ui/traits/object/with-self-in-projection-output-repeated-supertrait.rs
index 39e817168..39e817168 100644
--- a/src/test/ui/traits/object/with-self-in-projection-output-repeated-supertrait.rs
+++ b/tests/ui/traits/object/with-self-in-projection-output-repeated-supertrait.rs
diff --git a/src/test/ui/traits/objects-owned-object-borrowed-method-headerless.rs b/tests/ui/traits/objects-owned-object-borrowed-method-headerless.rs
index fce1341fc..fce1341fc 100644
--- a/src/test/ui/traits/objects-owned-object-borrowed-method-headerless.rs
+++ b/tests/ui/traits/objects-owned-object-borrowed-method-headerless.rs
diff --git a/src/test/ui/traits/operator-overloading-issue-52025.rs b/tests/ui/traits/operator-overloading-issue-52025.rs
index 7ce638832..7ce638832 100644
--- a/src/test/ui/traits/operator-overloading-issue-52025.rs
+++ b/tests/ui/traits/operator-overloading-issue-52025.rs
diff --git a/src/test/ui/traits/overlap-not-permitted-for-builtin-trait.rs b/tests/ui/traits/overlap-not-permitted-for-builtin-trait.rs
index 4106f56d6..4106f56d6 100644
--- a/src/test/ui/traits/overlap-not-permitted-for-builtin-trait.rs
+++ b/tests/ui/traits/overlap-not-permitted-for-builtin-trait.rs
diff --git a/src/test/ui/traits/overlap-not-permitted-for-builtin-trait.stderr b/tests/ui/traits/overlap-not-permitted-for-builtin-trait.stderr
index e24ed695d..e24ed695d 100644
--- a/src/test/ui/traits/overlap-not-permitted-for-builtin-trait.stderr
+++ b/tests/ui/traits/overlap-not-permitted-for-builtin-trait.stderr
diff --git a/src/test/ui/traits/overlap-permitted-for-marker-traits.rs b/tests/ui/traits/overlap-permitted-for-marker-traits.rs
index 00823d13b..00823d13b 100644
--- a/src/test/ui/traits/overlap-permitted-for-marker-traits.rs
+++ b/tests/ui/traits/overlap-permitted-for-marker-traits.rs
diff --git a/src/test/ui/traits/param-without-lifetime-constraint.rs b/tests/ui/traits/param-without-lifetime-constraint.rs
index a79b74dcd..a79b74dcd 100644
--- a/src/test/ui/traits/param-without-lifetime-constraint.rs
+++ b/tests/ui/traits/param-without-lifetime-constraint.rs
diff --git a/src/test/ui/traits/param-without-lifetime-constraint.stderr b/tests/ui/traits/param-without-lifetime-constraint.stderr
index 118b2cf3e..b128b6518 100644
--- a/src/test/ui/traits/param-without-lifetime-constraint.stderr
+++ b/tests/ui/traits/param-without-lifetime-constraint.stderr
@@ -7,8 +7,8 @@ LL |     fn get_relation(&self) -> To;
 LL |     fn get_relation(&self) -> &ProofReader {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found `fn(&'1 Article) -> &'1 ProofReader`
    |
-   = note: expected `fn(&'1 Article) -> &'2 ProofReader`
-              found `fn(&'1 Article) -> &'1 ProofReader`
+   = note: expected signature `fn(&'1 Article) -> &'2 ProofReader`
+              found signature `fn(&'1 Article) -> &'1 ProofReader`
 help: the lifetime requirements from the `impl` do not correspond to the requirements in the `trait`
   --> $DIR/param-without-lifetime-constraint.rs:10:31
    |
diff --git a/src/test/ui/traits/parameterized-with-bounds.rs b/tests/ui/traits/parameterized-with-bounds.rs
index 832d4f6c8..832d4f6c8 100644
--- a/src/test/ui/traits/parameterized-with-bounds.rs
+++ b/tests/ui/traits/parameterized-with-bounds.rs
diff --git a/src/test/ui/traits/pointee-deduction.rs b/tests/ui/traits/pointee-deduction.rs
index c333b0129..c333b0129 100644
--- a/src/test/ui/traits/pointee-deduction.rs
+++ b/tests/ui/traits/pointee-deduction.rs
diff --git a/src/test/ui/traits/pointee-tail-is-generic-errors.rs b/tests/ui/traits/pointee-tail-is-generic-errors.rs
index 28bc1da96..28bc1da96 100644
--- a/src/test/ui/traits/pointee-tail-is-generic-errors.rs
+++ b/tests/ui/traits/pointee-tail-is-generic-errors.rs
diff --git a/src/test/ui/traits/pointee-tail-is-generic-errors.stderr b/tests/ui/traits/pointee-tail-is-generic-errors.stderr
index 0c3d7060d..0c3d7060d 100644
--- a/src/test/ui/traits/pointee-tail-is-generic-errors.stderr
+++ b/tests/ui/traits/pointee-tail-is-generic-errors.stderr
diff --git a/src/test/ui/traits/pointee-tail-is-generic.rs b/tests/ui/traits/pointee-tail-is-generic.rs
index e0da0fc38..e0da0fc38 100644
--- a/src/test/ui/traits/pointee-tail-is-generic.rs
+++ b/tests/ui/traits/pointee-tail-is-generic.rs
diff --git a/src/test/ui/traits/principal-less-objects.rs b/tests/ui/traits/principal-less-objects.rs
index 62bad0d7d..62bad0d7d 100644
--- a/src/test/ui/traits/principal-less-objects.rs
+++ b/tests/ui/traits/principal-less-objects.rs
diff --git a/src/test/ui/traits/privacy.rs b/tests/ui/traits/privacy.rs
index 17a2e05e9..17a2e05e9 100644
--- a/src/test/ui/traits/privacy.rs
+++ b/tests/ui/traits/privacy.rs
diff --git a/src/test/ui/traits/project-modulo-regions.rs b/tests/ui/traits/project-modulo-regions.rs
index f0c0dd3ed..f0c0dd3ed 100644
--- a/src/test/ui/traits/project-modulo-regions.rs
+++ b/tests/ui/traits/project-modulo-regions.rs
diff --git a/src/test/ui/traits/project-modulo-regions.with_clause.stderr b/tests/ui/traits/project-modulo-regions.with_clause.stderr
index 2434c32c8..2434c32c8 100644
--- a/src/test/ui/traits/project-modulo-regions.with_clause.stderr
+++ b/tests/ui/traits/project-modulo-regions.with_clause.stderr
diff --git a/src/test/ui/traits/project-modulo-regions.without_clause.stderr b/tests/ui/traits/project-modulo-regions.without_clause.stderr
index 9d35690d5..9d35690d5 100644
--- a/src/test/ui/traits/project-modulo-regions.without_clause.stderr
+++ b/tests/ui/traits/project-modulo-regions.without_clause.stderr
diff --git a/src/test/ui/traits/region-pointer-simple.rs b/tests/ui/traits/region-pointer-simple.rs
index 0456ca931..0456ca931 100644
--- a/src/test/ui/traits/region-pointer-simple.rs
+++ b/tests/ui/traits/region-pointer-simple.rs
diff --git a/src/test/ui/traits/reservation-impl/coherence-conflict.rs b/tests/ui/traits/reservation-impl/coherence-conflict.rs
index fa4a30931..fa4a30931 100644
--- a/src/test/ui/traits/reservation-impl/coherence-conflict.rs
+++ b/tests/ui/traits/reservation-impl/coherence-conflict.rs
diff --git a/src/test/ui/traits/reservation-impl/coherence-conflict.stderr b/tests/ui/traits/reservation-impl/coherence-conflict.stderr
index a811d7e32..a811d7e32 100644
--- a/src/test/ui/traits/reservation-impl/coherence-conflict.stderr
+++ b/tests/ui/traits/reservation-impl/coherence-conflict.stderr
diff --git a/src/test/ui/traits/reservation-impl/no-use.rs b/tests/ui/traits/reservation-impl/no-use.rs
index 65a55d9e2..65a55d9e2 100644
--- a/src/test/ui/traits/reservation-impl/no-use.rs
+++ b/tests/ui/traits/reservation-impl/no-use.rs
diff --git a/src/test/ui/traits/reservation-impl/no-use.stderr b/tests/ui/traits/reservation-impl/no-use.stderr
index cefb2a879..cefb2a879 100644
--- a/src/test/ui/traits/reservation-impl/no-use.stderr
+++ b/tests/ui/traits/reservation-impl/no-use.stderr
diff --git a/src/test/ui/traits/reservation-impl/non-lattice-ok.rs b/tests/ui/traits/reservation-impl/non-lattice-ok.rs
index a71051243..a71051243 100644
--- a/src/test/ui/traits/reservation-impl/non-lattice-ok.rs
+++ b/tests/ui/traits/reservation-impl/non-lattice-ok.rs
diff --git a/src/test/ui/traits/reservation-impl/ok.rs b/tests/ui/traits/reservation-impl/ok.rs
index 611c8d884..611c8d884 100644
--- a/src/test/ui/traits/reservation-impl/ok.rs
+++ b/tests/ui/traits/reservation-impl/ok.rs
diff --git a/src/test/ui/traits/resolution-in-overloaded-op.rs b/tests/ui/traits/resolution-in-overloaded-op.rs
index a9bacc357..a9bacc357 100644
--- a/src/test/ui/traits/resolution-in-overloaded-op.rs
+++ b/tests/ui/traits/resolution-in-overloaded-op.rs
diff --git a/src/test/ui/traits/resolution-in-overloaded-op.stderr b/tests/ui/traits/resolution-in-overloaded-op.stderr
index fe5e1d6d2..fe5e1d6d2 100644
--- a/src/test/ui/traits/resolution-in-overloaded-op.stderr
+++ b/tests/ui/traits/resolution-in-overloaded-op.stderr
diff --git a/src/test/ui/traits/safety-fn-body.mir.stderr b/tests/ui/traits/safety-fn-body.mir.stderr
index ea7b2048e..ea7b2048e 100644
--- a/src/test/ui/traits/safety-fn-body.mir.stderr
+++ b/tests/ui/traits/safety-fn-body.mir.stderr
diff --git a/src/test/ui/traits/safety-fn-body.rs b/tests/ui/traits/safety-fn-body.rs
index 2cc4fe1b3..2cc4fe1b3 100644
--- a/src/test/ui/traits/safety-fn-body.rs
+++ b/tests/ui/traits/safety-fn-body.rs
diff --git a/src/test/ui/traits/safety-fn-body.thir.stderr b/tests/ui/traits/safety-fn-body.thir.stderr
index 23696c32b..23696c32b 100644
--- a/src/test/ui/traits/safety-fn-body.thir.stderr
+++ b/tests/ui/traits/safety-fn-body.thir.stderr
diff --git a/src/test/ui/traits/safety-inherent-impl.rs b/tests/ui/traits/safety-inherent-impl.rs
index 50e15f0d2..50e15f0d2 100644
--- a/src/test/ui/traits/safety-inherent-impl.rs
+++ b/tests/ui/traits/safety-inherent-impl.rs
diff --git a/src/test/ui/traits/safety-inherent-impl.stderr b/tests/ui/traits/safety-inherent-impl.stderr
index 1c8f43fec..1c8f43fec 100644
--- a/src/test/ui/traits/safety-inherent-impl.stderr
+++ b/tests/ui/traits/safety-inherent-impl.stderr
diff --git a/src/test/ui/traits/safety-ok-cc.rs b/tests/ui/traits/safety-ok-cc.rs
index 099ba80e5..099ba80e5 100644
--- a/src/test/ui/traits/safety-ok-cc.rs
+++ b/tests/ui/traits/safety-ok-cc.rs
diff --git a/src/test/ui/traits/safety-ok.rs b/tests/ui/traits/safety-ok.rs
index d456a78b6..d456a78b6 100644
--- a/src/test/ui/traits/safety-ok.rs
+++ b/tests/ui/traits/safety-ok.rs
diff --git a/src/test/ui/traits/safety-trait-impl-cc.rs b/tests/ui/traits/safety-trait-impl-cc.rs
index 6f125e5f9..6f125e5f9 100644
--- a/src/test/ui/traits/safety-trait-impl-cc.rs
+++ b/tests/ui/traits/safety-trait-impl-cc.rs
diff --git a/src/test/ui/traits/safety-trait-impl-cc.stderr b/tests/ui/traits/safety-trait-impl-cc.stderr
index 0b1fb3047..0ca565787 100644
--- a/src/test/ui/traits/safety-trait-impl-cc.stderr
+++ b/tests/ui/traits/safety-trait-impl-cc.stderr
@@ -1,12 +1,8 @@
 error[E0200]: the trait `Foo` requires an `unsafe impl` declaration
   --> $DIR/safety-trait-impl-cc.rs:9:1
    |
-LL | / impl lib::Foo for Bar {
-LL | |     fn foo(&self) -> isize {
-LL | |         panic!();
-LL | |     }
-LL | | }
-   | |_^
+LL | impl lib::Foo for Bar {
+   | ^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the trait `Foo` enforces invariants that the compiler can't check. Review the trait documentation and make sure this implementation upholds those invariants before adding the `unsafe` keyword
 help: add `unsafe` to this trait implementation
diff --git a/src/test/ui/traits/safety-trait-impl.rs b/tests/ui/traits/safety-trait-impl.rs
index 45258b78d..45258b78d 100644
--- a/src/test/ui/traits/safety-trait-impl.rs
+++ b/tests/ui/traits/safety-trait-impl.rs
diff --git a/src/test/ui/traits/safety-trait-impl.stderr b/tests/ui/traits/safety-trait-impl.stderr
index 721e2b48b..e78e0e3a6 100644
--- a/src/test/ui/traits/safety-trait-impl.stderr
+++ b/tests/ui/traits/safety-trait-impl.stderr
@@ -2,7 +2,7 @@ error[E0200]: the trait `UnsafeTrait` requires an `unsafe impl` declaration
   --> $DIR/safety-trait-impl.rs:14:1
    |
 LL | impl UnsafeTrait for u16 { }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the trait `UnsafeTrait` enforces invariants that the compiler can't check. Review the trait documentation and make sure this implementation upholds those invariants before adding the `unsafe` keyword
 help: add `unsafe` to this trait implementation
@@ -14,7 +14,7 @@ error[E0199]: implementing the trait `SafeTrait` is not unsafe
   --> $DIR/safety-trait-impl.rs:16:1
    |
 LL | unsafe impl SafeTrait for u32 { }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: remove `unsafe` from this trait implementation
    |
diff --git a/src/test/ui/traits/self-without-lifetime-constraint.rs b/tests/ui/traits/self-without-lifetime-constraint.rs
index 99013d32a..99013d32a 100644
--- a/src/test/ui/traits/self-without-lifetime-constraint.rs
+++ b/tests/ui/traits/self-without-lifetime-constraint.rs
diff --git a/src/test/ui/traits/self-without-lifetime-constraint.stderr b/tests/ui/traits/self-without-lifetime-constraint.stderr
index 85fada3b8..05a49820a 100644
--- a/src/test/ui/traits/self-without-lifetime-constraint.stderr
+++ b/tests/ui/traits/self-without-lifetime-constraint.stderr
@@ -7,8 +7,8 @@ LL |     fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self, &Self>;
 LL |     fn column_result(value: ValueRef<'_>) -> FromSqlResult<&str, &&str> {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found `fn(ValueRef<'1>) -> Result<(&'1 str, &'1 &'1 str), FromSqlError>`
    |
-   = note: expected `fn(ValueRef<'1>) -> Result<(&'2 str, &'1 &'2 str), FromSqlError>`
-              found `fn(ValueRef<'1>) -> Result<(&'1 str, &'1 &'1 str), FromSqlError>`
+   = note: expected signature `fn(ValueRef<'1>) -> Result<(&'2 str, &'1 &'2 str), FromSqlError>`
+              found signature `fn(ValueRef<'1>) -> Result<(&'1 str, &'1 &'1 str), FromSqlError>`
 help: the lifetime requirements from the `impl` do not correspond to the requirements in the `trait`
   --> $DIR/self-without-lifetime-constraint.rs:41:60
    |
diff --git a/tests/ui/traits/solver-cycles/inductive-canonical-cycle.rs b/tests/ui/traits/solver-cycles/inductive-canonical-cycle.rs
new file mode 100644
index 000000000..5449f5f00
--- /dev/null
+++ b/tests/ui/traits/solver-cycles/inductive-canonical-cycle.rs
@@ -0,0 +1,69 @@
+// check-pass
+
+// This test checks that we're correctly dealing with inductive cycles
+// with canonical inference variables.
+
+trait Trait<T, U> {}
+
+trait IsNotU32 {}
+impl IsNotU32 for i32 {}
+impl<T: IsNotU32, U> Trait<T, U> for () // impl 1
+where
+    (): Trait<U, T>
+{}
+
+impl<T> Trait<u32, T> for () {} // impl 2
+
+// If we now check whether `(): Trait<?0, ?1>` holds this has to
+// result in ambiguity as both `for<T> (): Trait<u32, T>` and `(): Trait<i32, u32>`
+// applies. The remainder of this test asserts that.
+
+// If we were to error on inductive cycles with canonical inference variables
+// this would be wrong:
+
+// (): Trait<?0, ?1>
+//  - impl 1
+//      - ?0: IsNotU32 // ambig
+//      - (): Trait<?1, ?0> // canonical cycle -> err
+//      - ERR
+//  - impl 2
+//      - OK ?0 == u32
+//
+// Result: OK ?0 == u32.
+
+// (): Trait<i32, u32>
+//  - impl 1
+//      - i32: IsNotU32 // ok
+//      - (): Trait<u32, i32>
+//          - impl 1
+//              - u32: IsNotU32 // err
+//              - ERR
+//          - impl 2
+//              - OK
+//      - OK
+//  - impl 2 (trivial ERR)
+//
+// Result OK
+
+// This would mean that `(): Trait<?0, ?1>` is not complete,
+// which is unsound if we're in coherence.
+
+fn implements_trait<T, U>() -> (T, U)
+where
+    (): Trait<T, U>,
+{
+    todo!()
+}
+
+// A hack to only constrain the infer vars after first checking
+// the `(): Trait<_, _>`.
+trait Constrain<T> {}
+impl<T> Constrain<T> for  T {}
+fn constrain<T: Constrain<U>, U>(_: U) {}
+
+fn main() {
+    let (x, y) = implements_trait::<_, _>();
+
+    constrain::<i32, _>(x);
+    constrain::<u32, _>(y);
+}
diff --git a/src/test/ui/traits/static-method-generic-inference.rs b/tests/ui/traits/static-method-generic-inference.rs
index f4e94c4f7..f4e94c4f7 100644
--- a/src/test/ui/traits/static-method-generic-inference.rs
+++ b/tests/ui/traits/static-method-generic-inference.rs
diff --git a/src/test/ui/traits/static-method-generic-inference.stderr b/tests/ui/traits/static-method-generic-inference.stderr
index 5f74d0c3b..575ace237 100644
--- a/src/test/ui/traits/static-method-generic-inference.stderr
+++ b/tests/ui/traits/static-method-generic-inference.stderr
@@ -9,8 +9,8 @@ LL |     let _f: base::Foo = base::HasNew::new();
    |
 help: use the fully-qualified path to the only available implementation
    |
-LL |     let _f: base::Foo = base::<Foo as HasNew>::new();
-   |                               +++++++       +
+LL |     let _f: base::Foo = <Foo as base::HasNew>::new();
+   |                         +++++++             +
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/traits/static-method-overwriting.rs b/tests/ui/traits/static-method-overwriting.rs
index f669ffae6..f669ffae6 100644
--- a/src/test/ui/traits/static-method-overwriting.rs
+++ b/tests/ui/traits/static-method-overwriting.rs
diff --git a/src/test/ui/traits/static-outlives-a-where-clause.rs b/tests/ui/traits/static-outlives-a-where-clause.rs
index f0c2c1082..f0c2c1082 100644
--- a/src/test/ui/traits/static-outlives-a-where-clause.rs
+++ b/tests/ui/traits/static-outlives-a-where-clause.rs
diff --git a/src/test/ui/traits/staticness-mismatch.rs b/tests/ui/traits/staticness-mismatch.rs
index 8710d0112..8710d0112 100644
--- a/src/test/ui/traits/staticness-mismatch.rs
+++ b/tests/ui/traits/staticness-mismatch.rs
diff --git a/src/test/ui/traits/staticness-mismatch.stderr b/tests/ui/traits/staticness-mismatch.stderr
index b67ac5adb..b67ac5adb 100644
--- a/src/test/ui/traits/staticness-mismatch.stderr
+++ b/tests/ui/traits/staticness-mismatch.stderr
diff --git a/src/test/ui/traits/suggest-deferences/issue-39029.fixed b/tests/ui/traits/suggest-deferences/issue-39029.fixed
index a1abf668b..a1abf668b 100644
--- a/src/test/ui/traits/suggest-deferences/issue-39029.fixed
+++ b/tests/ui/traits/suggest-deferences/issue-39029.fixed
diff --git a/src/test/ui/traits/suggest-deferences/issue-39029.rs b/tests/ui/traits/suggest-deferences/issue-39029.rs
index 90d097105..90d097105 100644
--- a/src/test/ui/traits/suggest-deferences/issue-39029.rs
+++ b/tests/ui/traits/suggest-deferences/issue-39029.rs
diff --git a/src/test/ui/traits/suggest-deferences/issue-39029.stderr b/tests/ui/traits/suggest-deferences/issue-39029.stderr
index eb2b88059..49e20c6a7 100644
--- a/src/test/ui/traits/suggest-deferences/issue-39029.stderr
+++ b/tests/ui/traits/suggest-deferences/issue-39029.stderr
@@ -9,9 +9,6 @@ LL |     let _errors = TcpListener::bind(&bad);
    = note: required for `&NoToSocketAddrs` to implement `ToSocketAddrs`
 note: required by a bound in `TcpListener::bind`
   --> $SRC_DIR/std/src/net/tcp.rs:LL:COL
-   |
-LL |     pub fn bind<A: ToSocketAddrs>(addr: A) -> io::Result<TcpListener> {
-   |                    ^^^^^^^^^^^^^ required by this bound in `TcpListener::bind`
 help: consider dereferencing here
    |
 LL |     let _errors = TcpListener::bind(&*bad);
diff --git a/src/test/ui/traits/suggest-deferences/issue-62530.fixed b/tests/ui/traits/suggest-deferences/issue-62530.fixed
index 406caaa00..406caaa00 100644
--- a/src/test/ui/traits/suggest-deferences/issue-62530.fixed
+++ b/tests/ui/traits/suggest-deferences/issue-62530.fixed
diff --git a/src/test/ui/traits/suggest-deferences/issue-62530.rs b/tests/ui/traits/suggest-deferences/issue-62530.rs
index 53846be73..53846be73 100644
--- a/src/test/ui/traits/suggest-deferences/issue-62530.rs
+++ b/tests/ui/traits/suggest-deferences/issue-62530.rs
diff --git a/src/test/ui/traits/suggest-deferences/issue-62530.stderr b/tests/ui/traits/suggest-deferences/issue-62530.stderr
index e47ae0b65..e47ae0b65 100644
--- a/src/test/ui/traits/suggest-deferences/issue-62530.stderr
+++ b/tests/ui/traits/suggest-deferences/issue-62530.stderr
diff --git a/src/test/ui/traits/suggest-deferences/multiple-0.fixed b/tests/ui/traits/suggest-deferences/multiple-0.fixed
index b7160b75c..b7160b75c 100644
--- a/src/test/ui/traits/suggest-deferences/multiple-0.fixed
+++ b/tests/ui/traits/suggest-deferences/multiple-0.fixed
diff --git a/src/test/ui/traits/suggest-deferences/multiple-0.rs b/tests/ui/traits/suggest-deferences/multiple-0.rs
index 9ac55177f..9ac55177f 100644
--- a/src/test/ui/traits/suggest-deferences/multiple-0.rs
+++ b/tests/ui/traits/suggest-deferences/multiple-0.rs
diff --git a/src/test/ui/traits/suggest-deferences/multiple-0.stderr b/tests/ui/traits/suggest-deferences/multiple-0.stderr
index 6a4d4b8d5..6a4d4b8d5 100644
--- a/src/test/ui/traits/suggest-deferences/multiple-0.stderr
+++ b/tests/ui/traits/suggest-deferences/multiple-0.stderr
diff --git a/src/test/ui/traits/suggest-deferences/multiple-1.rs b/tests/ui/traits/suggest-deferences/multiple-1.rs
index 91c6c7924..91c6c7924 100644
--- a/src/test/ui/traits/suggest-deferences/multiple-1.rs
+++ b/tests/ui/traits/suggest-deferences/multiple-1.rs
diff --git a/src/test/ui/traits/suggest-deferences/multiple-1.stderr b/tests/ui/traits/suggest-deferences/multiple-1.stderr
index 6e12321c2..6e12321c2 100644
--- a/src/test/ui/traits/suggest-deferences/multiple-1.stderr
+++ b/tests/ui/traits/suggest-deferences/multiple-1.stderr
diff --git a/src/test/ui/traits/suggest-deferences/root-obligation.fixed b/tests/ui/traits/suggest-deferences/root-obligation.fixed
index 7a8433f90..7a8433f90 100644
--- a/src/test/ui/traits/suggest-deferences/root-obligation.fixed
+++ b/tests/ui/traits/suggest-deferences/root-obligation.fixed
diff --git a/src/test/ui/traits/suggest-deferences/root-obligation.rs b/tests/ui/traits/suggest-deferences/root-obligation.rs
index 51bac2107..51bac2107 100644
--- a/src/test/ui/traits/suggest-deferences/root-obligation.rs
+++ b/tests/ui/traits/suggest-deferences/root-obligation.rs
diff --git a/src/test/ui/traits/suggest-deferences/root-obligation.stderr b/tests/ui/traits/suggest-deferences/root-obligation.stderr
index 76663ace7..1363fb8c4 100644
--- a/src/test/ui/traits/suggest-deferences/root-obligation.stderr
+++ b/tests/ui/traits/suggest-deferences/root-obligation.stderr
@@ -11,9 +11,6 @@ LL |         .filter(|c| "aeiou".contains(c))
    = note: required for `&char` to implement `Pattern<'_>`
 note: required by a bound in `core::str::<impl str>::contains`
   --> $SRC_DIR/core/src/str/mod.rs:LL:COL
-   |
-LL |     pub fn contains<'a, P: Pattern<'a>>(&'a self, pat: P) -> bool {
-   |                            ^^^^^^^^^^^ required by this bound in `core::str::<impl str>::contains`
 help: consider dereferencing here
    |
 LL |         .filter(|c| "aeiou".contains(*c))
diff --git a/tests/ui/traits/suggest-deferences/suggest-dereferencing-receiver-argument.fixed b/tests/ui/traits/suggest-deferences/suggest-dereferencing-receiver-argument.fixed
new file mode 100644
index 000000000..ea3d1bf85
--- /dev/null
+++ b/tests/ui/traits/suggest-deferences/suggest-dereferencing-receiver-argument.fixed
@@ -0,0 +1,14 @@
+// run-rustfix
+
+struct TargetStruct;
+
+impl From<usize> for TargetStruct {
+    fn from(_unchecked: usize) -> Self {
+        TargetStruct
+    }
+}
+
+fn main() {
+    let a = &3;
+    let _b: TargetStruct = (*a).into(); //~ ERROR the trait bound `TargetStruct: From<&{integer}>` is not satisfied
+}
diff --git a/tests/ui/traits/suggest-deferences/suggest-dereferencing-receiver-argument.rs b/tests/ui/traits/suggest-deferences/suggest-dereferencing-receiver-argument.rs
new file mode 100644
index 000000000..9eda68027
--- /dev/null
+++ b/tests/ui/traits/suggest-deferences/suggest-dereferencing-receiver-argument.rs
@@ -0,0 +1,14 @@
+// run-rustfix
+
+struct TargetStruct;
+
+impl From<usize> for TargetStruct {
+    fn from(_unchecked: usize) -> Self {
+        TargetStruct
+    }
+}
+
+fn main() {
+    let a = &3;
+    let _b: TargetStruct = a.into(); //~ ERROR the trait bound `TargetStruct: From<&{integer}>` is not satisfied
+}
diff --git a/tests/ui/traits/suggest-deferences/suggest-dereferencing-receiver-argument.stderr b/tests/ui/traits/suggest-deferences/suggest-dereferencing-receiver-argument.stderr
new file mode 100644
index 000000000..ede31a2c7
--- /dev/null
+++ b/tests/ui/traits/suggest-deferences/suggest-dereferencing-receiver-argument.stderr
@@ -0,0 +1,15 @@
+error[E0277]: the trait bound `TargetStruct: From<&{integer}>` is not satisfied
+  --> $DIR/suggest-dereferencing-receiver-argument.rs:13:30
+   |
+LL |     let _b: TargetStruct = a.into();
+   |                              ^^^^ the trait `From<&{integer}>` is not implemented for `TargetStruct`
+   |
+   = note: required for `&{integer}` to implement `Into<TargetStruct>`
+help: consider dereferencing here
+   |
+LL |     let _b: TargetStruct = (*a).into();
+   |                            ++ +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/traits/suggest-fully-qualified-closure.rs b/tests/ui/traits/suggest-fully-qualified-closure.rs
index c077921c0..c077921c0 100644
--- a/src/test/ui/traits/suggest-fully-qualified-closure.rs
+++ b/tests/ui/traits/suggest-fully-qualified-closure.rs
diff --git a/src/test/ui/traits/suggest-fully-qualified-closure.stderr b/tests/ui/traits/suggest-fully-qualified-closure.stderr
index 3df623c14..3df623c14 100644
--- a/src/test/ui/traits/suggest-fully-qualified-closure.stderr
+++ b/tests/ui/traits/suggest-fully-qualified-closure.stderr
diff --git a/src/test/ui/traits/suggest-fully-qualified-path-with-adjustment.rs b/tests/ui/traits/suggest-fully-qualified-path-with-adjustment.rs
index 9a2cf469d..9a2cf469d 100644
--- a/src/test/ui/traits/suggest-fully-qualified-path-with-adjustment.rs
+++ b/tests/ui/traits/suggest-fully-qualified-path-with-adjustment.rs
diff --git a/src/test/ui/traits/suggest-fully-qualified-path-with-adjustment.stderr b/tests/ui/traits/suggest-fully-qualified-path-with-adjustment.stderr
index 68b31a1ca..68b31a1ca 100644
--- a/src/test/ui/traits/suggest-fully-qualified-path-with-adjustment.stderr
+++ b/tests/ui/traits/suggest-fully-qualified-path-with-adjustment.stderr
diff --git a/src/test/ui/traits/suggest-fully-qualified-path-without-adjustment.rs b/tests/ui/traits/suggest-fully-qualified-path-without-adjustment.rs
index da640c8c8..da640c8c8 100644
--- a/src/test/ui/traits/suggest-fully-qualified-path-without-adjustment.rs
+++ b/tests/ui/traits/suggest-fully-qualified-path-without-adjustment.rs
diff --git a/src/test/ui/traits/suggest-fully-qualified-path-without-adjustment.stderr b/tests/ui/traits/suggest-fully-qualified-path-without-adjustment.stderr
index 27518a54e..27518a54e 100644
--- a/src/test/ui/traits/suggest-fully-qualified-path-without-adjustment.stderr
+++ b/tests/ui/traits/suggest-fully-qualified-path-without-adjustment.stderr
diff --git a/src/test/ui/traits/suggest-where-clause.rs b/tests/ui/traits/suggest-where-clause.rs
index 46d047a2d..46d047a2d 100644
--- a/src/test/ui/traits/suggest-where-clause.rs
+++ b/tests/ui/traits/suggest-where-clause.rs
diff --git a/src/test/ui/traits/suggest-where-clause.stderr b/tests/ui/traits/suggest-where-clause.stderr
index 747e2477b..44e63b78c 100644
--- a/src/test/ui/traits/suggest-where-clause.stderr
+++ b/tests/ui/traits/suggest-where-clause.stderr
@@ -9,9 +9,6 @@ LL |     mem::size_of::<U>();
    |
 note: required by a bound in `std::mem::size_of`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |                      ^ required by this bound in `std::mem::size_of`
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
    |
 LL - fn check<T: Iterator, U: ?Sized>() {
@@ -34,9 +31,6 @@ LL | struct Misc<T:?Sized>(T);
    |        ^^^^
 note: required by a bound in `std::mem::size_of`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |                      ^ required by this bound in `std::mem::size_of`
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
    |
 LL - fn check<T: Iterator, U: ?Sized>() {
@@ -80,9 +74,6 @@ LL |     mem::size_of::<[T]>();
    = help: the trait `Sized` is not implemented for `[T]`
 note: required by a bound in `std::mem::size_of`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |                      ^ required by this bound in `std::mem::size_of`
 
 error[E0277]: the size for values of type `[&U]` cannot be known at compilation time
   --> $DIR/suggest-where-clause.rs:31:20
@@ -93,9 +84,6 @@ LL |     mem::size_of::<[&U]>();
    = help: the trait `Sized` is not implemented for `[&U]`
 note: required by a bound in `std::mem::size_of`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |                      ^ required by this bound in `std::mem::size_of`
 
 error: aborting due to 7 previous errors
 
diff --git a/src/test/ui/traits/superdefault-generics.rs b/tests/ui/traits/superdefault-generics.rs
index e862c0e97..e862c0e97 100644
--- a/src/test/ui/traits/superdefault-generics.rs
+++ b/tests/ui/traits/superdefault-generics.rs
diff --git a/src/test/ui/traits/syntax-polarity.rs b/tests/ui/traits/syntax-polarity.rs
index c809f9e89..c809f9e89 100644
--- a/src/test/ui/traits/syntax-polarity.rs
+++ b/tests/ui/traits/syntax-polarity.rs
diff --git a/src/test/ui/traits/syntax-trait-polarity.rs b/tests/ui/traits/syntax-trait-polarity.rs
index ed2947493..ed2947493 100644
--- a/src/test/ui/traits/syntax-trait-polarity.rs
+++ b/tests/ui/traits/syntax-trait-polarity.rs
diff --git a/src/test/ui/traits/syntax-trait-polarity.stderr b/tests/ui/traits/syntax-trait-polarity.stderr
index 1fd40fb66..1fd40fb66 100644
--- a/src/test/ui/traits/syntax-trait-polarity.stderr
+++ b/tests/ui/traits/syntax-trait-polarity.stderr
diff --git a/src/test/ui/traits/test-2.rs b/tests/ui/traits/test-2.rs
index 342928e88..342928e88 100644
--- a/src/test/ui/traits/test-2.rs
+++ b/tests/ui/traits/test-2.rs
diff --git a/src/test/ui/traits/test-2.stderr b/tests/ui/traits/test-2.stderr
index eaa20b0b4..eaa20b0b4 100644
--- a/src/test/ui/traits/test-2.stderr
+++ b/tests/ui/traits/test-2.stderr
diff --git a/src/test/ui/traits/test.rs b/tests/ui/traits/test.rs
index 72fc66f74..72fc66f74 100644
--- a/src/test/ui/traits/test.rs
+++ b/tests/ui/traits/test.rs
diff --git a/src/test/ui/traits/test.stderr b/tests/ui/traits/test.stderr
index 668228abe..668228abe 100644
--- a/src/test/ui/traits/test.stderr
+++ b/tests/ui/traits/test.stderr
diff --git a/src/test/ui/traits/to-str.rs b/tests/ui/traits/to-str.rs
index 9670edbfa..9670edbfa 100644
--- a/src/test/ui/traits/to-str.rs
+++ b/tests/ui/traits/to-str.rs
diff --git a/tests/ui/traits/track-obligations.rs b/tests/ui/traits/track-obligations.rs
new file mode 100644
index 000000000..77e753c13
--- /dev/null
+++ b/tests/ui/traits/track-obligations.rs
@@ -0,0 +1,88 @@
+// These are simplifications of the tower traits by the same name:
+
+pub trait Service<Request> {
+    type Response;
+}
+
+pub trait Layer<C> {
+    type Service;
+}
+
+// Any type will do here:
+
+pub struct Req;
+pub struct Res;
+
+// This is encoding a trait alias.
+
+pub trait ParticularService:
+    Service<Req, Response = Res> {
+}
+
+impl<T> ParticularService for T
+where
+    T: Service<Req, Response = Res>,
+{
+}
+
+// This is also a trait alias.
+// The weird = <Self as ...> bound is there so that users of the trait do not
+// need to repeat the bounds. See https://github.com/rust-lang/rust/issues/20671
+// for context, and in particular the workaround in:
+// https://github.com/rust-lang/rust/issues/20671#issuecomment-529752828
+
+pub trait ParticularServiceLayer<C>:
+    Layer<C, Service = <Self as ParticularServiceLayer<C>>::Service>
+{
+    type Service: ParticularService;
+}
+
+impl<T, C> ParticularServiceLayer<C> for T
+where
+    T: Layer<C>,
+    T::Service: ParticularService,
+{
+    type Service = T::Service;
+}
+
+// These are types that implement the traits that the trait aliases refer to.
+// They should also implement the alias traits due to the blanket impls.
+
+struct ALayer<C>(C);
+impl<C> Layer<C> for ALayer<C> {
+    type Service = AService;
+}
+
+struct AService;
+impl Service<Req> for AService {
+    // However, AService does _not_ meet the blanket implementation,
+    // since its Response type is bool, not Res as it should be.
+    type Response = bool;
+}
+
+// This is a wrapper type around ALayer that uses the trait alias
+// as a way to communicate the requirements of the provided types.
+struct Client<C>(C);
+
+// The method and the free-standing function below both have the same bounds.
+
+impl<C> Client<C>
+where
+    ALayer<C>: ParticularServiceLayer<C>,
+{
+    fn check(&self) {}
+}
+
+fn check<C>(_: C) where ALayer<C>: ParticularServiceLayer<C> {}
+
+// But, they give very different error messages.
+
+fn main() {
+    // This gives a very poor error message that does nothing to point the user
+    // at the underlying cause of why the types involved do not meet the bounds.
+    Client(()).check(); //~ ERROR E0599
+
+    // This gives a good(ish) error message that points the user at _why_ the
+    // bound isn't met, and thus how they might fix it.
+    check(()); //~ ERROR E0271
+}
diff --git a/tests/ui/traits/track-obligations.stderr b/tests/ui/traits/track-obligations.stderr
new file mode 100644
index 000000000..894774759
--- /dev/null
+++ b/tests/ui/traits/track-obligations.stderr
@@ -0,0 +1,76 @@
+error[E0599]: the method `check` exists for struct `Client<()>`, but its trait bounds were not satisfied
+  --> $DIR/track-obligations.rs:83:16
+   |
+LL | struct ALayer<C>(C);
+   | ----------------
+   | |
+   | doesn't satisfy `<_ as Layer<()>>::Service = <ALayer<()> as ParticularServiceLayer<()>>::Service`
+   | doesn't satisfy `ALayer<()>: ParticularServiceLayer<()>`
+...
+LL | struct Client<C>(C);
+   | ---------------- method `check` not found for this struct
+...
+LL |     Client(()).check();
+   |                ^^^^^ method cannot be called on `Client<()>` due to unsatisfied trait bounds
+   |
+note: trait bound `<ALayer<()> as Layer<()>>::Service = <ALayer<()> as ParticularServiceLayer<()>>::Service` was not satisfied
+  --> $DIR/track-obligations.rs:35:14
+   |
+LL | pub trait ParticularServiceLayer<C>:
+   |           ----------------------
+LL |     Layer<C, Service = <Self as ParticularServiceLayer<C>>::Service>
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unsatisfied trait bound introduced here
+note: trait bound `ALayer<()>: ParticularServiceLayer<()>` was not satisfied
+  --> $DIR/track-obligations.rs:71:16
+   |
+LL | impl<C> Client<C>
+   |         ---------
+LL | where
+LL |     ALayer<C>: ParticularServiceLayer<C>,
+   |                ^^^^^^^^^^^^^^^^^^^^^^^^^ unsatisfied trait bound introduced here
+note: the trait `ParticularServiceLayer` must be implemented
+  --> $DIR/track-obligations.rs:34:1
+   |
+LL | / pub trait ParticularServiceLayer<C>:
+LL | |     Layer<C, Service = <Self as ParticularServiceLayer<C>>::Service>
+   | |____________________________________________________________________^
+
+error[E0271]: type mismatch resolving `<AService as Service<Req>>::Response == Res`
+  --> $DIR/track-obligations.rs:87:11
+   |
+LL |     check(());
+   |     ----- ^^ type mismatch resolving `<AService as Service<Req>>::Response == Res`
+   |     |
+   |     required by a bound introduced by this call
+   |
+note: expected this to be `Res`
+  --> $DIR/track-obligations.rs:60:21
+   |
+LL |     type Response = bool;
+   |                     ^^^^
+note: required for `AService` to implement `ParticularService`
+  --> $DIR/track-obligations.rs:22:9
+   |
+LL | impl<T> ParticularService for T
+   |         ^^^^^^^^^^^^^^^^^     ^
+LL | where
+LL |     T: Service<Req, Response = Res>,
+   |                     -------------- unsatisfied trait bound introduced here
+note: required for `ALayer<_>` to implement `ParticularServiceLayer<_>`
+  --> $DIR/track-obligations.rs:40:12
+   |
+LL | impl<T, C> ParticularServiceLayer<C> for T
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^     ^
+...
+LL |     T::Service: ParticularService,
+   |                 ----------------- unsatisfied trait bound introduced here
+note: required by a bound in `check`
+  --> $DIR/track-obligations.rs:76:36
+   |
+LL | fn check<C>(_: C) where ALayer<C>: ParticularServiceLayer<C> {}
+   |                                    ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `check`
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0271, E0599.
+For more information about an error, try `rustc --explain E0271`.
diff --git a/src/test/ui/traits/trait-or-new-type-instead.rs b/tests/ui/traits/trait-or-new-type-instead.rs
index 572b03efc..572b03efc 100644
--- a/src/test/ui/traits/trait-or-new-type-instead.rs
+++ b/tests/ui/traits/trait-or-new-type-instead.rs
diff --git a/src/test/ui/traits/trait-or-new-type-instead.stderr b/tests/ui/traits/trait-or-new-type-instead.stderr
index 4726b0668..4726b0668 100644
--- a/src/test/ui/traits/trait-or-new-type-instead.stderr
+++ b/tests/ui/traits/trait-or-new-type-instead.stderr
diff --git a/src/test/ui/traits/trait-upcasting/basic.rs b/tests/ui/traits/trait-upcasting/basic.rs
index 570ec5160..570ec5160 100644
--- a/src/test/ui/traits/trait-upcasting/basic.rs
+++ b/tests/ui/traits/trait-upcasting/basic.rs
diff --git a/src/test/ui/traits/trait-upcasting/correct-supertrait-substitution.rs b/tests/ui/traits/trait-upcasting/correct-supertrait-substitution.rs
index eae5cf8d5..eae5cf8d5 100644
--- a/src/test/ui/traits/trait-upcasting/correct-supertrait-substitution.rs
+++ b/tests/ui/traits/trait-upcasting/correct-supertrait-substitution.rs
diff --git a/src/test/ui/traits/trait-upcasting/cyclic-trait-resolution.rs b/tests/ui/traits/trait-upcasting/cyclic-trait-resolution.rs
index 511e41562..511e41562 100644
--- a/src/test/ui/traits/trait-upcasting/cyclic-trait-resolution.rs
+++ b/tests/ui/traits/trait-upcasting/cyclic-trait-resolution.rs
diff --git a/src/test/ui/traits/trait-upcasting/cyclic-trait-resolution.stderr b/tests/ui/traits/trait-upcasting/cyclic-trait-resolution.stderr
index 15faab16a..15faab16a 100644
--- a/src/test/ui/traits/trait-upcasting/cyclic-trait-resolution.stderr
+++ b/tests/ui/traits/trait-upcasting/cyclic-trait-resolution.stderr
diff --git a/src/test/ui/traits/trait-upcasting/diamond.rs b/tests/ui/traits/trait-upcasting/diamond.rs
index a4f81c464..a4f81c464 100644
--- a/src/test/ui/traits/trait-upcasting/diamond.rs
+++ b/tests/ui/traits/trait-upcasting/diamond.rs
diff --git a/src/test/ui/traits/trait-upcasting/invalid-upcast.rs b/tests/ui/traits/trait-upcasting/invalid-upcast.rs
index e634bbd5a..e634bbd5a 100644
--- a/src/test/ui/traits/trait-upcasting/invalid-upcast.rs
+++ b/tests/ui/traits/trait-upcasting/invalid-upcast.rs
diff --git a/src/test/ui/traits/trait-upcasting/invalid-upcast.stderr b/tests/ui/traits/trait-upcasting/invalid-upcast.stderr
index 3aa21ee3d..3aa21ee3d 100644
--- a/src/test/ui/traits/trait-upcasting/invalid-upcast.stderr
+++ b/tests/ui/traits/trait-upcasting/invalid-upcast.stderr
diff --git a/src/test/ui/traits/trait-upcasting/issue-11515-upcast-fn_mut-fn.rs b/tests/ui/traits/trait-upcasting/issue-11515-upcast-fn_mut-fn.rs
index b672963ae..b672963ae 100644
--- a/src/test/ui/traits/trait-upcasting/issue-11515-upcast-fn_mut-fn.rs
+++ b/tests/ui/traits/trait-upcasting/issue-11515-upcast-fn_mut-fn.rs
diff --git a/src/test/ui/traits/trait-upcasting/lifetime.rs b/tests/ui/traits/trait-upcasting/lifetime.rs
index 9825158c2..9825158c2 100644
--- a/src/test/ui/traits/trait-upcasting/lifetime.rs
+++ b/tests/ui/traits/trait-upcasting/lifetime.rs
diff --git a/src/test/ui/traits/trait-upcasting/migrate-lint-deny.rs b/tests/ui/traits/trait-upcasting/migrate-lint-deny.rs
index d62418756..d62418756 100644
--- a/src/test/ui/traits/trait-upcasting/migrate-lint-deny.rs
+++ b/tests/ui/traits/trait-upcasting/migrate-lint-deny.rs
diff --git a/src/test/ui/traits/trait-upcasting/migrate-lint-deny.stderr b/tests/ui/traits/trait-upcasting/migrate-lint-deny.stderr
index 4533b1163..4533b1163 100644
--- a/src/test/ui/traits/trait-upcasting/migrate-lint-deny.stderr
+++ b/tests/ui/traits/trait-upcasting/migrate-lint-deny.stderr
diff --git a/src/test/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.rs b/tests/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.rs
index 2e53a00a9..2e53a00a9 100644
--- a/src/test/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.rs
+++ b/tests/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.rs
diff --git a/src/test/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.stderr b/tests/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.stderr
index 0ad18be03..0ad18be03 100644
--- a/src/test/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.stderr
+++ b/tests/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.stderr
diff --git a/src/test/ui/traits/trait-upcasting/replace-vptr.rs b/tests/ui/traits/trait-upcasting/replace-vptr.rs
index 9ccfc9306..9ccfc9306 100644
--- a/src/test/ui/traits/trait-upcasting/replace-vptr.rs
+++ b/tests/ui/traits/trait-upcasting/replace-vptr.rs
diff --git a/src/test/ui/traits/trait-upcasting/struct.rs b/tests/ui/traits/trait-upcasting/struct.rs
index a3e416969..a3e416969 100644
--- a/src/test/ui/traits/trait-upcasting/struct.rs
+++ b/tests/ui/traits/trait-upcasting/struct.rs
diff --git a/src/test/ui/traits/trait-upcasting/subtrait-method.rs b/tests/ui/traits/trait-upcasting/subtrait-method.rs
index 136d15af0..136d15af0 100644
--- a/src/test/ui/traits/trait-upcasting/subtrait-method.rs
+++ b/tests/ui/traits/trait-upcasting/subtrait-method.rs
diff --git a/src/test/ui/traits/trait-upcasting/subtrait-method.stderr b/tests/ui/traits/trait-upcasting/subtrait-method.stderr
index 918159e84..918159e84 100644
--- a/src/test/ui/traits/trait-upcasting/subtrait-method.stderr
+++ b/tests/ui/traits/trait-upcasting/subtrait-method.stderr
diff --git a/src/test/ui/traits/trait-upcasting/type-checking-test-1.rs b/tests/ui/traits/trait-upcasting/type-checking-test-1.rs
index 6bc9f4a75..6bc9f4a75 100644
--- a/src/test/ui/traits/trait-upcasting/type-checking-test-1.rs
+++ b/tests/ui/traits/trait-upcasting/type-checking-test-1.rs
diff --git a/src/test/ui/traits/trait-upcasting/type-checking-test-1.stderr b/tests/ui/traits/trait-upcasting/type-checking-test-1.stderr
index fe269d8e9..fe269d8e9 100644
--- a/src/test/ui/traits/trait-upcasting/type-checking-test-1.stderr
+++ b/tests/ui/traits/trait-upcasting/type-checking-test-1.stderr
diff --git a/src/test/ui/traits/trait-upcasting/type-checking-test-2.rs b/tests/ui/traits/trait-upcasting/type-checking-test-2.rs
index 36b11dffd..36b11dffd 100644
--- a/src/test/ui/traits/trait-upcasting/type-checking-test-2.rs
+++ b/tests/ui/traits/trait-upcasting/type-checking-test-2.rs
diff --git a/src/test/ui/traits/trait-upcasting/type-checking-test-2.stderr b/tests/ui/traits/trait-upcasting/type-checking-test-2.stderr
index ef007d5cb..ef007d5cb 100644
--- a/src/test/ui/traits/trait-upcasting/type-checking-test-2.stderr
+++ b/tests/ui/traits/trait-upcasting/type-checking-test-2.stderr
diff --git a/src/test/ui/traits/trait-upcasting/type-checking-test-3.polonius.stderr b/tests/ui/traits/trait-upcasting/type-checking-test-3.polonius.stderr
index e6cb6a753..e6cb6a753 100644
--- a/src/test/ui/traits/trait-upcasting/type-checking-test-3.polonius.stderr
+++ b/tests/ui/traits/trait-upcasting/type-checking-test-3.polonius.stderr
diff --git a/src/test/ui/traits/trait-upcasting/type-checking-test-3.rs b/tests/ui/traits/trait-upcasting/type-checking-test-3.rs
index b2db3a127..b2db3a127 100644
--- a/src/test/ui/traits/trait-upcasting/type-checking-test-3.rs
+++ b/tests/ui/traits/trait-upcasting/type-checking-test-3.rs
diff --git a/src/test/ui/traits/trait-upcasting/type-checking-test-3.stderr b/tests/ui/traits/trait-upcasting/type-checking-test-3.stderr
index e6cb6a753..e6cb6a753 100644
--- a/src/test/ui/traits/trait-upcasting/type-checking-test-3.stderr
+++ b/tests/ui/traits/trait-upcasting/type-checking-test-3.stderr
diff --git a/src/test/ui/traits/trait-upcasting/type-checking-test-4.polonius.stderr b/tests/ui/traits/trait-upcasting/type-checking-test-4.polonius.stderr
index 8d506e580..8d506e580 100644
--- a/src/test/ui/traits/trait-upcasting/type-checking-test-4.polonius.stderr
+++ b/tests/ui/traits/trait-upcasting/type-checking-test-4.polonius.stderr
diff --git a/src/test/ui/traits/trait-upcasting/type-checking-test-4.rs b/tests/ui/traits/trait-upcasting/type-checking-test-4.rs
index f40c48f0d..f40c48f0d 100644
--- a/src/test/ui/traits/trait-upcasting/type-checking-test-4.rs
+++ b/tests/ui/traits/trait-upcasting/type-checking-test-4.rs
diff --git a/src/test/ui/traits/trait-upcasting/type-checking-test-4.stderr b/tests/ui/traits/trait-upcasting/type-checking-test-4.stderr
index 8d506e580..8d506e580 100644
--- a/src/test/ui/traits/trait-upcasting/type-checking-test-4.stderr
+++ b/tests/ui/traits/trait-upcasting/type-checking-test-4.stderr
diff --git a/src/test/ui/traits/typeclasses-eq-example-static.rs b/tests/ui/traits/typeclasses-eq-example-static.rs
index f982ad6a0..f982ad6a0 100644
--- a/src/test/ui/traits/typeclasses-eq-example-static.rs
+++ b/tests/ui/traits/typeclasses-eq-example-static.rs
diff --git a/src/test/ui/traits/typeclasses-eq-example.rs b/tests/ui/traits/typeclasses-eq-example.rs
index 4400301e6..4400301e6 100644
--- a/src/test/ui/traits/typeclasses-eq-example.rs
+++ b/tests/ui/traits/typeclasses-eq-example.rs
diff --git a/src/test/ui/traits/ufcs-object.rs b/tests/ui/traits/ufcs-object.rs
index 700488c22..700488c22 100644
--- a/src/test/ui/traits/ufcs-object.rs
+++ b/tests/ui/traits/ufcs-object.rs
diff --git a/src/test/ui/traits/unspecified-self-in-trait-ref.rs b/tests/ui/traits/unspecified-self-in-trait-ref.rs
index 158b5a985..158b5a985 100644
--- a/src/test/ui/traits/unspecified-self-in-trait-ref.rs
+++ b/tests/ui/traits/unspecified-self-in-trait-ref.rs
diff --git a/src/test/ui/traits/unspecified-self-in-trait-ref.stderr b/tests/ui/traits/unspecified-self-in-trait-ref.stderr
index b5e8e8867..b5e8e8867 100644
--- a/src/test/ui/traits/unspecified-self-in-trait-ref.stderr
+++ b/tests/ui/traits/unspecified-self-in-trait-ref.stderr
diff --git a/src/test/ui/traits/use-before-def.rs b/tests/ui/traits/use-before-def.rs
index 1ee2b9419..1ee2b9419 100644
--- a/src/test/ui/traits/use-before-def.rs
+++ b/tests/ui/traits/use-before-def.rs
diff --git a/src/test/ui/traits/vtable-res-trait-param.rs b/tests/ui/traits/vtable-res-trait-param.rs
index 3d7c2eb08..3d7c2eb08 100644
--- a/src/test/ui/traits/vtable-res-trait-param.rs
+++ b/tests/ui/traits/vtable-res-trait-param.rs
diff --git a/src/test/ui/traits/vtable-res-trait-param.stderr b/tests/ui/traits/vtable-res-trait-param.stderr
index 2b3e3de9b..2b3e3de9b 100644
--- a/src/test/ui/traits/vtable-res-trait-param.stderr
+++ b/tests/ui/traits/vtable-res-trait-param.stderr
diff --git a/src/test/ui/traits/vtable/issue-91807.rs b/tests/ui/traits/vtable/issue-91807.rs
index f435ff09d..f435ff09d 100644
--- a/src/test/ui/traits/vtable/issue-91807.rs
+++ b/tests/ui/traits/vtable/issue-91807.rs
diff --git a/src/test/ui/traits/vtable/issue-97381.rs b/tests/ui/traits/vtable/issue-97381.rs
index 393cf91ef..393cf91ef 100644
--- a/src/test/ui/traits/vtable/issue-97381.rs
+++ b/tests/ui/traits/vtable/issue-97381.rs
diff --git a/src/test/ui/traits/vtable/issue-97381.stderr b/tests/ui/traits/vtable/issue-97381.stderr
index c4f8294e2..c4f8294e2 100644
--- a/src/test/ui/traits/vtable/issue-97381.stderr
+++ b/tests/ui/traits/vtable/issue-97381.stderr
diff --git a/src/test/ui/traits/vtable/vtable-diamond.rs b/tests/ui/traits/vtable/vtable-diamond.rs
index dc3c17ac3..dc3c17ac3 100644
--- a/src/test/ui/traits/vtable/vtable-diamond.rs
+++ b/tests/ui/traits/vtable/vtable-diamond.rs
diff --git a/src/test/ui/traits/vtable/vtable-diamond.stderr b/tests/ui/traits/vtable/vtable-diamond.stderr
index f3718c5d8..f3718c5d8 100644
--- a/src/test/ui/traits/vtable/vtable-diamond.stderr
+++ b/tests/ui/traits/vtable/vtable-diamond.stderr
diff --git a/src/test/ui/traits/vtable/vtable-multi-level.rs b/tests/ui/traits/vtable/vtable-multi-level.rs
index ebd55bcf3..ebd55bcf3 100644
--- a/src/test/ui/traits/vtable/vtable-multi-level.rs
+++ b/tests/ui/traits/vtable/vtable-multi-level.rs
diff --git a/src/test/ui/traits/vtable/vtable-multi-level.stderr b/tests/ui/traits/vtable/vtable-multi-level.stderr
index c4389e23f..c4389e23f 100644
--- a/src/test/ui/traits/vtable/vtable-multi-level.stderr
+++ b/tests/ui/traits/vtable/vtable-multi-level.stderr
diff --git a/src/test/ui/traits/vtable/vtable-multiple.rs b/tests/ui/traits/vtable/vtable-multiple.rs
index 7a0111c5e..7a0111c5e 100644
--- a/src/test/ui/traits/vtable/vtable-multiple.rs
+++ b/tests/ui/traits/vtable/vtable-multiple.rs
diff --git a/src/test/ui/traits/vtable/vtable-multiple.stderr b/tests/ui/traits/vtable/vtable-multiple.stderr
index 0dcd84433..0dcd84433 100644
--- a/src/test/ui/traits/vtable/vtable-multiple.stderr
+++ b/tests/ui/traits/vtable/vtable-multiple.stderr
diff --git a/src/test/ui/traits/vtable/vtable-non-object-safe.rs b/tests/ui/traits/vtable/vtable-non-object-safe.rs
index 7661bb574..7661bb574 100644
--- a/src/test/ui/traits/vtable/vtable-non-object-safe.rs
+++ b/tests/ui/traits/vtable/vtable-non-object-safe.rs
diff --git a/src/test/ui/traits/vtable/vtable-non-object-safe.stderr b/tests/ui/traits/vtable/vtable-non-object-safe.stderr
index 9345c2711..9345c2711 100644
--- a/src/test/ui/traits/vtable/vtable-non-object-safe.stderr
+++ b/tests/ui/traits/vtable/vtable-non-object-safe.stderr
diff --git a/src/test/ui/traits/vtable/vtable-vacant.rs b/tests/ui/traits/vtable/vtable-vacant.rs
index a64796358..a64796358 100644
--- a/src/test/ui/traits/vtable/vtable-vacant.rs
+++ b/tests/ui/traits/vtable/vtable-vacant.rs
diff --git a/src/test/ui/traits/vtable/vtable-vacant.stderr b/tests/ui/traits/vtable/vtable-vacant.stderr
index 5346a7027..5346a7027 100644
--- a/src/test/ui/traits/vtable/vtable-vacant.stderr
+++ b/tests/ui/traits/vtable/vtable-vacant.stderr
diff --git a/src/test/ui/traits/wf-object/maybe-bound.rs b/tests/ui/traits/wf-object/maybe-bound.rs
index 17771e976..17771e976 100644
--- a/src/test/ui/traits/wf-object/maybe-bound.rs
+++ b/tests/ui/traits/wf-object/maybe-bound.rs
diff --git a/src/test/ui/traits/wf-object/maybe-bound.stderr b/tests/ui/traits/wf-object/maybe-bound.stderr
index 2fe3f0fc3..2fe3f0fc3 100644
--- a/src/test/ui/traits/wf-object/maybe-bound.stderr
+++ b/tests/ui/traits/wf-object/maybe-bound.stderr
diff --git a/src/test/ui/traits/wf-object/no-duplicates.rs b/tests/ui/traits/wf-object/no-duplicates.rs
index 678ede582..678ede582 100644
--- a/src/test/ui/traits/wf-object/no-duplicates.rs
+++ b/tests/ui/traits/wf-object/no-duplicates.rs
diff --git a/src/test/ui/traits/wf-object/no-duplicates.stderr b/tests/ui/traits/wf-object/no-duplicates.stderr
index 50dfcf956..50dfcf956 100644
--- a/src/test/ui/traits/wf-object/no-duplicates.stderr
+++ b/tests/ui/traits/wf-object/no-duplicates.stderr
diff --git a/src/test/ui/traits/wf-object/only-maybe-bound.rs b/tests/ui/traits/wf-object/only-maybe-bound.rs
index 3e6db3e99..3e6db3e99 100644
--- a/src/test/ui/traits/wf-object/only-maybe-bound.rs
+++ b/tests/ui/traits/wf-object/only-maybe-bound.rs
diff --git a/src/test/ui/traits/wf-object/only-maybe-bound.stderr b/tests/ui/traits/wf-object/only-maybe-bound.stderr
index cbc41feec..cbc41feec 100644
--- a/src/test/ui/traits/wf-object/only-maybe-bound.stderr
+++ b/tests/ui/traits/wf-object/only-maybe-bound.stderr
diff --git a/src/test/ui/traits/wf-object/reverse-order.rs b/tests/ui/traits/wf-object/reverse-order.rs
index 4f676cbe3..4f676cbe3 100644
--- a/src/test/ui/traits/wf-object/reverse-order.rs
+++ b/tests/ui/traits/wf-object/reverse-order.rs
diff --git a/src/test/ui/traits/where-clause-vs-impl.rs b/tests/ui/traits/where-clause-vs-impl.rs
index 7cfee27ef..7cfee27ef 100644
--- a/src/test/ui/traits/where-clause-vs-impl.rs
+++ b/tests/ui/traits/where-clause-vs-impl.rs
diff --git a/src/test/ui/traits/with-bounds-default.rs b/tests/ui/traits/with-bounds-default.rs
index 31f73d79c..31f73d79c 100644
--- a/src/test/ui/traits/with-bounds-default.rs
+++ b/tests/ui/traits/with-bounds-default.rs
diff --git a/src/test/ui/traits/with-dst.rs b/tests/ui/traits/with-dst.rs
index a3e3b31df..a3e3b31df 100644
--- a/src/test/ui/traits/with-dst.rs
+++ b/tests/ui/traits/with-dst.rs
diff --git a/src/test/ui/transmutability/abstraction/abstracted_assume.rs b/tests/ui/transmutability/abstraction/abstracted_assume.rs
index 0225c4230..0225c4230 100644
--- a/src/test/ui/transmutability/abstraction/abstracted_assume.rs
+++ b/tests/ui/transmutability/abstraction/abstracted_assume.rs
diff --git a/src/test/ui/transmutability/abstraction/const_generic_fn.rs b/tests/ui/transmutability/abstraction/const_generic_fn.rs
index e693a0957..e693a0957 100644
--- a/src/test/ui/transmutability/abstraction/const_generic_fn.rs
+++ b/tests/ui/transmutability/abstraction/const_generic_fn.rs
diff --git a/src/test/ui/transmutability/arrays/issue-103783-array-length.rs b/tests/ui/transmutability/arrays/issue-103783-array-length.rs
index cb36e539e..cb36e539e 100644
--- a/src/test/ui/transmutability/arrays/issue-103783-array-length.rs
+++ b/tests/ui/transmutability/arrays/issue-103783-array-length.rs
diff --git a/src/test/ui/transmutability/arrays/issue-103783-array-length.stderr b/tests/ui/transmutability/arrays/issue-103783-array-length.stderr
index 37774c59e..37774c59e 100644
--- a/src/test/ui/transmutability/arrays/issue-103783-array-length.stderr
+++ b/tests/ui/transmutability/arrays/issue-103783-array-length.stderr
diff --git a/src/test/ui/transmutability/arrays/should_have_correct_length.rs b/tests/ui/transmutability/arrays/should_have_correct_length.rs
index 353797d0c..353797d0c 100644
--- a/src/test/ui/transmutability/arrays/should_have_correct_length.rs
+++ b/tests/ui/transmutability/arrays/should_have_correct_length.rs
diff --git a/src/test/ui/transmutability/arrays/should_inherit_alignment.rs b/tests/ui/transmutability/arrays/should_inherit_alignment.rs
index b00e5c7e4..b00e5c7e4 100644
--- a/src/test/ui/transmutability/arrays/should_inherit_alignment.rs
+++ b/tests/ui/transmutability/arrays/should_inherit_alignment.rs
diff --git a/src/test/ui/transmutability/arrays/should_require_well_defined_layout.rs b/tests/ui/transmutability/arrays/should_require_well_defined_layout.rs
index 853bd9cbc..853bd9cbc 100644
--- a/src/test/ui/transmutability/arrays/should_require_well_defined_layout.rs
+++ b/tests/ui/transmutability/arrays/should_require_well_defined_layout.rs
diff --git a/src/test/ui/transmutability/arrays/should_require_well_defined_layout.stderr b/tests/ui/transmutability/arrays/should_require_well_defined_layout.stderr
index 96a2fdc54..96a2fdc54 100644
--- a/src/test/ui/transmutability/arrays/should_require_well_defined_layout.stderr
+++ b/tests/ui/transmutability/arrays/should_require_well_defined_layout.stderr
diff --git a/src/test/ui/transmutability/enums/repr/primitive_reprs_should_have_correct_length.rs b/tests/ui/transmutability/enums/repr/primitive_reprs_should_have_correct_length.rs
index 940f070e7..940f070e7 100644
--- a/src/test/ui/transmutability/enums/repr/primitive_reprs_should_have_correct_length.rs
+++ b/tests/ui/transmutability/enums/repr/primitive_reprs_should_have_correct_length.rs
diff --git a/src/test/ui/transmutability/enums/repr/primitive_reprs_should_have_correct_length.stderr b/tests/ui/transmutability/enums/repr/primitive_reprs_should_have_correct_length.stderr
index 4da5fcea3..4da5fcea3 100644
--- a/src/test/ui/transmutability/enums/repr/primitive_reprs_should_have_correct_length.stderr
+++ b/tests/ui/transmutability/enums/repr/primitive_reprs_should_have_correct_length.stderr
diff --git a/src/test/ui/transmutability/enums/repr/should_require_well_defined_layout.rs b/tests/ui/transmutability/enums/repr/should_require_well_defined_layout.rs
index 102111ae2..102111ae2 100644
--- a/src/test/ui/transmutability/enums/repr/should_require_well_defined_layout.rs
+++ b/tests/ui/transmutability/enums/repr/should_require_well_defined_layout.rs
diff --git a/src/test/ui/transmutability/enums/repr/should_require_well_defined_layout.stderr b/tests/ui/transmutability/enums/repr/should_require_well_defined_layout.stderr
index 510b8c56e..510b8c56e 100644
--- a/src/test/ui/transmutability/enums/repr/should_require_well_defined_layout.stderr
+++ b/tests/ui/transmutability/enums/repr/should_require_well_defined_layout.stderr
diff --git a/src/test/ui/transmutability/enums/should_order_correctly.rs b/tests/ui/transmutability/enums/should_order_correctly.rs
index 1335cc9d2..1335cc9d2 100644
--- a/src/test/ui/transmutability/enums/should_order_correctly.rs
+++ b/tests/ui/transmutability/enums/should_order_correctly.rs
diff --git a/src/test/ui/transmutability/enums/should_pad_variants.rs b/tests/ui/transmutability/enums/should_pad_variants.rs
index c077c52a3..c077c52a3 100644
--- a/src/test/ui/transmutability/enums/should_pad_variants.rs
+++ b/tests/ui/transmutability/enums/should_pad_variants.rs
diff --git a/src/test/ui/transmutability/enums/should_pad_variants.stderr b/tests/ui/transmutability/enums/should_pad_variants.stderr
index a823503d5..a823503d5 100644
--- a/src/test/ui/transmutability/enums/should_pad_variants.stderr
+++ b/tests/ui/transmutability/enums/should_pad_variants.stderr
diff --git a/src/test/ui/transmutability/enums/should_respect_endianness.rs b/tests/ui/transmutability/enums/should_respect_endianness.rs
index f3567b405..f3567b405 100644
--- a/src/test/ui/transmutability/enums/should_respect_endianness.rs
+++ b/tests/ui/transmutability/enums/should_respect_endianness.rs
diff --git a/src/test/ui/transmutability/enums/should_respect_endianness.stderr b/tests/ui/transmutability/enums/should_respect_endianness.stderr
index 0845a5edf..0845a5edf 100644
--- a/src/test/ui/transmutability/enums/should_respect_endianness.stderr
+++ b/tests/ui/transmutability/enums/should_respect_endianness.stderr
diff --git a/src/test/ui/transmutability/issue-101739-1.rs b/tests/ui/transmutability/issue-101739-1.rs
index bcb8b158e..bcb8b158e 100644
--- a/src/test/ui/transmutability/issue-101739-1.rs
+++ b/tests/ui/transmutability/issue-101739-1.rs
diff --git a/src/test/ui/transmutability/issue-101739-1.stderr b/tests/ui/transmutability/issue-101739-1.stderr
index 5fa741f26..5fa741f26 100644
--- a/src/test/ui/transmutability/issue-101739-1.stderr
+++ b/tests/ui/transmutability/issue-101739-1.stderr
diff --git a/src/test/ui/transmutability/issue-101739-2.rs b/tests/ui/transmutability/issue-101739-2.rs
index 964a7e49e..964a7e49e 100644
--- a/src/test/ui/transmutability/issue-101739-2.rs
+++ b/tests/ui/transmutability/issue-101739-2.rs
diff --git a/tests/ui/transmutability/issue-101739-2.stderr b/tests/ui/transmutability/issue-101739-2.stderr
new file mode 100644
index 000000000..1b3d20259
--- /dev/null
+++ b/tests/ui/transmutability/issue-101739-2.stderr
@@ -0,0 +1,14 @@
+error[E0107]: this trait takes at most 3 generic arguments but 6 generic arguments were supplied
+  --> $DIR/issue-101739-2.rs:18:14
+   |
+LL |           Dst: BikeshedIntrinsicFrom<
+   |                ^^^^^^^^^^^^^^^^^^^^^ expected at most 3 generic arguments
+...
+LL | /             ASSUME_LIFETIMES,
+LL | |             ASSUME_VALIDITY,
+LL | |             ASSUME_VISIBILITY,
+   | |_____________________________- help: remove these generic arguments
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0107`.
diff --git a/src/test/ui/transmutability/malformed-program-gracefulness/feature-missing.rs b/tests/ui/transmutability/malformed-program-gracefulness/feature-missing.rs
index 30c381745..30c381745 100644
--- a/src/test/ui/transmutability/malformed-program-gracefulness/feature-missing.rs
+++ b/tests/ui/transmutability/malformed-program-gracefulness/feature-missing.rs
diff --git a/src/test/ui/transmutability/malformed-program-gracefulness/feature-missing.stderr b/tests/ui/transmutability/malformed-program-gracefulness/feature-missing.stderr
index ba8093f86..ba8093f86 100644
--- a/src/test/ui/transmutability/malformed-program-gracefulness/feature-missing.stderr
+++ b/tests/ui/transmutability/malformed-program-gracefulness/feature-missing.stderr
diff --git a/src/test/ui/transmutability/malformed-program-gracefulness/unknown_dst.rs b/tests/ui/transmutability/malformed-program-gracefulness/unknown_dst.rs
index b3a1e13b8..b3a1e13b8 100644
--- a/src/test/ui/transmutability/malformed-program-gracefulness/unknown_dst.rs
+++ b/tests/ui/transmutability/malformed-program-gracefulness/unknown_dst.rs
diff --git a/tests/ui/transmutability/malformed-program-gracefulness/unknown_dst.stderr b/tests/ui/transmutability/malformed-program-gracefulness/unknown_dst.stderr
new file mode 100644
index 000000000..b4591778f
--- /dev/null
+++ b/tests/ui/transmutability/malformed-program-gracefulness/unknown_dst.stderr
@@ -0,0 +1,14 @@
+error[E0412]: cannot find type `Dst` in this scope
+  --> $DIR/unknown_dst.rs:20:36
+   |
+LL |     assert::is_transmutable::<Src, Dst, Context>();
+   |                                    ^^^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+LL | fn should_gracefully_handle_unknown_dst<Dst>() {
+   |                                        +++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/transmutability/malformed-program-gracefulness/unknown_src.rs b/tests/ui/transmutability/malformed-program-gracefulness/unknown_src.rs
index 092b205b7..092b205b7 100644
--- a/src/test/ui/transmutability/malformed-program-gracefulness/unknown_src.rs
+++ b/tests/ui/transmutability/malformed-program-gracefulness/unknown_src.rs
diff --git a/tests/ui/transmutability/malformed-program-gracefulness/unknown_src.stderr b/tests/ui/transmutability/malformed-program-gracefulness/unknown_src.stderr
new file mode 100644
index 000000000..a55d71d80
--- /dev/null
+++ b/tests/ui/transmutability/malformed-program-gracefulness/unknown_src.stderr
@@ -0,0 +1,14 @@
+error[E0412]: cannot find type `Src` in this scope
+  --> $DIR/unknown_src.rs:20:31
+   |
+LL |     assert::is_transmutable::<Src, Dst, Context>();
+   |                               ^^^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+LL | fn should_gracefully_handle_unknown_src<Src>() {
+   |                                        +++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/transmutability/malformed-program-gracefulness/unknown_src_field.rs b/tests/ui/transmutability/malformed-program-gracefulness/unknown_src_field.rs
index ebe34e134..ebe34e134 100644
--- a/src/test/ui/transmutability/malformed-program-gracefulness/unknown_src_field.rs
+++ b/tests/ui/transmutability/malformed-program-gracefulness/unknown_src_field.rs
diff --git a/src/test/ui/transmutability/malformed-program-gracefulness/unknown_src_field.stderr b/tests/ui/transmutability/malformed-program-gracefulness/unknown_src_field.stderr
index 475e6f429..475e6f429 100644
--- a/src/test/ui/transmutability/malformed-program-gracefulness/unknown_src_field.stderr
+++ b/tests/ui/transmutability/malformed-program-gracefulness/unknown_src_field.stderr
diff --git a/src/test/ui/transmutability/malformed-program-gracefulness/wrong-type-assume.rs b/tests/ui/transmutability/malformed-program-gracefulness/wrong-type-assume.rs
index 52aa4bb31..52aa4bb31 100644
--- a/src/test/ui/transmutability/malformed-program-gracefulness/wrong-type-assume.rs
+++ b/tests/ui/transmutability/malformed-program-gracefulness/wrong-type-assume.rs
diff --git a/src/test/ui/transmutability/malformed-program-gracefulness/wrong-type-assume.stderr b/tests/ui/transmutability/malformed-program-gracefulness/wrong-type-assume.stderr
index c6d93876c..c6d93876c 100644
--- a/src/test/ui/transmutability/malformed-program-gracefulness/wrong-type-assume.stderr
+++ b/tests/ui/transmutability/malformed-program-gracefulness/wrong-type-assume.stderr
diff --git a/src/test/ui/transmutability/primitives/bool.rs b/tests/ui/transmutability/primitives/bool.rs
index eebb74fff..eebb74fff 100644
--- a/src/test/ui/transmutability/primitives/bool.rs
+++ b/tests/ui/transmutability/primitives/bool.rs
diff --git a/src/test/ui/transmutability/primitives/bool.stderr b/tests/ui/transmutability/primitives/bool.stderr
index 214b5e150..214b5e150 100644
--- a/src/test/ui/transmutability/primitives/bool.stderr
+++ b/tests/ui/transmutability/primitives/bool.stderr
diff --git a/src/test/ui/transmutability/primitives/numbers.rs b/tests/ui/transmutability/primitives/numbers.rs
index 0df43d204..0df43d204 100644
--- a/src/test/ui/transmutability/primitives/numbers.rs
+++ b/tests/ui/transmutability/primitives/numbers.rs
diff --git a/src/test/ui/transmutability/primitives/numbers.stderr b/tests/ui/transmutability/primitives/numbers.stderr
index 7cb7ca8e6..7cb7ca8e6 100644
--- a/src/test/ui/transmutability/primitives/numbers.stderr
+++ b/tests/ui/transmutability/primitives/numbers.stderr
diff --git a/src/test/ui/transmutability/primitives/unit.rs b/tests/ui/transmutability/primitives/unit.rs
index 1975a61de..1975a61de 100644
--- a/src/test/ui/transmutability/primitives/unit.rs
+++ b/tests/ui/transmutability/primitives/unit.rs
diff --git a/src/test/ui/transmutability/primitives/unit.stderr b/tests/ui/transmutability/primitives/unit.stderr
index 8cabe44a0..8cabe44a0 100644
--- a/src/test/ui/transmutability/primitives/unit.stderr
+++ b/tests/ui/transmutability/primitives/unit.stderr
diff --git a/src/test/ui/transmutability/references.rs b/tests/ui/transmutability/references.rs
index af3ff0ec1..af3ff0ec1 100644
--- a/src/test/ui/transmutability/references.rs
+++ b/tests/ui/transmutability/references.rs
diff --git a/src/test/ui/transmutability/references.stderr b/tests/ui/transmutability/references.stderr
index e9c7b144a..e9c7b144a 100644
--- a/src/test/ui/transmutability/references.stderr
+++ b/tests/ui/transmutability/references.stderr
diff --git a/src/test/ui/transmutability/structs/repr/should_handle_align.rs b/tests/ui/transmutability/structs/repr/should_handle_align.rs
index ea9bf2a23..ea9bf2a23 100644
--- a/src/test/ui/transmutability/structs/repr/should_handle_align.rs
+++ b/tests/ui/transmutability/structs/repr/should_handle_align.rs
diff --git a/src/test/ui/transmutability/structs/repr/should_handle_packed.rs b/tests/ui/transmutability/structs/repr/should_handle_packed.rs
index 17dc995fc..17dc995fc 100644
--- a/src/test/ui/transmutability/structs/repr/should_handle_packed.rs
+++ b/tests/ui/transmutability/structs/repr/should_handle_packed.rs
diff --git a/src/test/ui/transmutability/structs/repr/should_require_well_defined_layout.rs b/tests/ui/transmutability/structs/repr/should_require_well_defined_layout.rs
index 9a65b4d70..9a65b4d70 100644
--- a/src/test/ui/transmutability/structs/repr/should_require_well_defined_layout.rs
+++ b/tests/ui/transmutability/structs/repr/should_require_well_defined_layout.rs
diff --git a/src/test/ui/transmutability/structs/repr/should_require_well_defined_layout.stderr b/tests/ui/transmutability/structs/repr/should_require_well_defined_layout.stderr
index 621dbee84..621dbee84 100644
--- a/src/test/ui/transmutability/structs/repr/should_require_well_defined_layout.stderr
+++ b/tests/ui/transmutability/structs/repr/should_require_well_defined_layout.stderr
diff --git a/src/test/ui/transmutability/structs/should_order_fields_correctly.rs b/tests/ui/transmutability/structs/should_order_fields_correctly.rs
index 28724562b..28724562b 100644
--- a/src/test/ui/transmutability/structs/should_order_fields_correctly.rs
+++ b/tests/ui/transmutability/structs/should_order_fields_correctly.rs
diff --git a/src/test/ui/transmutability/unions/boolish.rs b/tests/ui/transmutability/unions/boolish.rs
index e469c4973..e469c4973 100644
--- a/src/test/ui/transmutability/unions/boolish.rs
+++ b/tests/ui/transmutability/unions/boolish.rs
diff --git a/src/test/ui/transmutability/unions/repr/should_handle_align.rs b/tests/ui/transmutability/unions/repr/should_handle_align.rs
index 09c13cc4d..09c13cc4d 100644
--- a/src/test/ui/transmutability/unions/repr/should_handle_align.rs
+++ b/tests/ui/transmutability/unions/repr/should_handle_align.rs
diff --git a/src/test/ui/transmutability/unions/repr/should_handle_packed.rs b/tests/ui/transmutability/unions/repr/should_handle_packed.rs
index 24c2abd69..24c2abd69 100644
--- a/src/test/ui/transmutability/unions/repr/should_handle_packed.rs
+++ b/tests/ui/transmutability/unions/repr/should_handle_packed.rs
diff --git a/src/test/ui/transmutability/unions/repr/should_require_well_defined_layout.rs b/tests/ui/transmutability/unions/repr/should_require_well_defined_layout.rs
index b1d5f71dc..b1d5f71dc 100644
--- a/src/test/ui/transmutability/unions/repr/should_require_well_defined_layout.rs
+++ b/tests/ui/transmutability/unions/repr/should_require_well_defined_layout.rs
diff --git a/src/test/ui/transmutability/unions/repr/should_require_well_defined_layout.stderr b/tests/ui/transmutability/unions/repr/should_require_well_defined_layout.stderr
index 523bde85a..523bde85a 100644
--- a/src/test/ui/transmutability/unions/repr/should_require_well_defined_layout.stderr
+++ b/tests/ui/transmutability/unions/repr/should_require_well_defined_layout.stderr
diff --git a/src/test/ui/transmutability/unions/should_pad_variants.rs b/tests/ui/transmutability/unions/should_pad_variants.rs
index cabe54467..cabe54467 100644
--- a/src/test/ui/transmutability/unions/should_pad_variants.rs
+++ b/tests/ui/transmutability/unions/should_pad_variants.rs
diff --git a/src/test/ui/transmutability/unions/should_pad_variants.stderr b/tests/ui/transmutability/unions/should_pad_variants.stderr
index a823503d5..a823503d5 100644
--- a/src/test/ui/transmutability/unions/should_pad_variants.stderr
+++ b/tests/ui/transmutability/unions/should_pad_variants.stderr
diff --git a/src/test/ui/transmutability/unions/should_permit_intersecting_if_validity_is_assumed.rs b/tests/ui/transmutability/unions/should_permit_intersecting_if_validity_is_assumed.rs
index 1007fdd79..1007fdd79 100644
--- a/src/test/ui/transmutability/unions/should_permit_intersecting_if_validity_is_assumed.rs
+++ b/tests/ui/transmutability/unions/should_permit_intersecting_if_validity_is_assumed.rs
diff --git a/src/test/ui/transmutability/unions/should_reject_contraction.rs b/tests/ui/transmutability/unions/should_reject_contraction.rs
index a24dfccd3..a24dfccd3 100644
--- a/src/test/ui/transmutability/unions/should_reject_contraction.rs
+++ b/tests/ui/transmutability/unions/should_reject_contraction.rs
diff --git a/src/test/ui/transmutability/unions/should_reject_contraction.stderr b/tests/ui/transmutability/unions/should_reject_contraction.stderr
index 41f0cedc3..41f0cedc3 100644
--- a/src/test/ui/transmutability/unions/should_reject_contraction.stderr
+++ b/tests/ui/transmutability/unions/should_reject_contraction.stderr
diff --git a/src/test/ui/transmutability/unions/should_reject_disjoint.rs b/tests/ui/transmutability/unions/should_reject_disjoint.rs
index 43aaa6905..43aaa6905 100644
--- a/src/test/ui/transmutability/unions/should_reject_disjoint.rs
+++ b/tests/ui/transmutability/unions/should_reject_disjoint.rs
diff --git a/src/test/ui/transmutability/unions/should_reject_disjoint.stderr b/tests/ui/transmutability/unions/should_reject_disjoint.stderr
index 4323f9740..4323f9740 100644
--- a/src/test/ui/transmutability/unions/should_reject_disjoint.stderr
+++ b/tests/ui/transmutability/unions/should_reject_disjoint.stderr
diff --git a/src/test/ui/transmutability/unions/should_reject_intersecting.rs b/tests/ui/transmutability/unions/should_reject_intersecting.rs
index 9cd4233ee..9cd4233ee 100644
--- a/src/test/ui/transmutability/unions/should_reject_intersecting.rs
+++ b/tests/ui/transmutability/unions/should_reject_intersecting.rs
diff --git a/src/test/ui/transmutability/unions/should_reject_intersecting.stderr b/tests/ui/transmutability/unions/should_reject_intersecting.stderr
index e009888ae..e009888ae 100644
--- a/src/test/ui/transmutability/unions/should_reject_intersecting.stderr
+++ b/tests/ui/transmutability/unions/should_reject_intersecting.stderr
diff --git a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_private_field.rs b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_private_field.rs
index 8a41669c6..8a41669c6 100644
--- a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_private_field.rs
+++ b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_private_field.rs
diff --git a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_private_variant.rs b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_private_variant.rs
index dd57b877d..dd57b877d 100644
--- a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_private_variant.rs
+++ b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_private_variant.rs
diff --git a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_tricky_unreachable_field.rs b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_tricky_unreachable_field.rs
index ebce8ce87..ebce8ce87 100644
--- a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_tricky_unreachable_field.rs
+++ b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_tricky_unreachable_field.rs
diff --git a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_field.rs b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_field.rs
index 546fcbaa3..546fcbaa3 100644
--- a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_field.rs
+++ b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_field.rs
diff --git a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_field.stderr b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_field.stderr
index be83b7ce3..be83b7ce3 100644
--- a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_field.stderr
+++ b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_field.stderr
diff --git a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_ty.rs b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_ty.rs
index b9b74d183..b9b74d183 100644
--- a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_ty.rs
+++ b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_ty.rs
diff --git a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_ty.stderr b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_ty.stderr
index 827df05de..827df05de 100644
--- a/src/test/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_ty.stderr
+++ b/tests/ui/transmutability/visibility/assume/should_accept_if_dst_has_unreachable_ty.stderr
diff --git a/src/test/ui/transmutability/visibility/should_accept_if_src_has_private_field.rs b/tests/ui/transmutability/visibility/should_accept_if_src_has_private_field.rs
index 5a0df09d4..5a0df09d4 100644
--- a/src/test/ui/transmutability/visibility/should_accept_if_src_has_private_field.rs
+++ b/tests/ui/transmutability/visibility/should_accept_if_src_has_private_field.rs
diff --git a/src/test/ui/transmutability/visibility/should_accept_if_src_has_private_variant.rs b/tests/ui/transmutability/visibility/should_accept_if_src_has_private_variant.rs
index 0f69630cc..0f69630cc 100644
--- a/src/test/ui/transmutability/visibility/should_accept_if_src_has_private_variant.rs
+++ b/tests/ui/transmutability/visibility/should_accept_if_src_has_private_variant.rs
diff --git a/src/test/ui/transmutability/visibility/should_accept_if_src_has_unreachable_field.rs b/tests/ui/transmutability/visibility/should_accept_if_src_has_unreachable_field.rs
index 9c8345a8e..9c8345a8e 100644
--- a/src/test/ui/transmutability/visibility/should_accept_if_src_has_unreachable_field.rs
+++ b/tests/ui/transmutability/visibility/should_accept_if_src_has_unreachable_field.rs
diff --git a/src/test/ui/transmutability/visibility/should_accept_if_src_has_unreachable_field.stderr b/tests/ui/transmutability/visibility/should_accept_if_src_has_unreachable_field.stderr
index 39b73302e..39b73302e 100644
--- a/src/test/ui/transmutability/visibility/should_accept_if_src_has_unreachable_field.stderr
+++ b/tests/ui/transmutability/visibility/should_accept_if_src_has_unreachable_field.stderr
diff --git a/src/test/ui/transmutability/visibility/should_accept_if_src_has_unreachable_ty.rs b/tests/ui/transmutability/visibility/should_accept_if_src_has_unreachable_ty.rs
index acf9f2302..acf9f2302 100644
--- a/src/test/ui/transmutability/visibility/should_accept_if_src_has_unreachable_ty.rs
+++ b/tests/ui/transmutability/visibility/should_accept_if_src_has_unreachable_ty.rs
diff --git a/src/test/ui/transmutability/visibility/should_accept_if_src_has_unreachable_ty.stderr b/tests/ui/transmutability/visibility/should_accept_if_src_has_unreachable_ty.stderr
index 76dc7f340..76dc7f340 100644
--- a/src/test/ui/transmutability/visibility/should_accept_if_src_has_unreachable_ty.stderr
+++ b/tests/ui/transmutability/visibility/should_accept_if_src_has_unreachable_ty.stderr
diff --git a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_private_field.rs b/tests/ui/transmutability/visibility/should_reject_if_dst_has_private_field.rs
index e8c3fbc9a..e8c3fbc9a 100644
--- a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_private_field.rs
+++ b/tests/ui/transmutability/visibility/should_reject_if_dst_has_private_field.rs
diff --git a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_private_field.stderr b/tests/ui/transmutability/visibility/should_reject_if_dst_has_private_field.stderr
index d5d6d431b..d5d6d431b 100644
--- a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_private_field.stderr
+++ b/tests/ui/transmutability/visibility/should_reject_if_dst_has_private_field.stderr
diff --git a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_private_variant.rs b/tests/ui/transmutability/visibility/should_reject_if_dst_has_private_variant.rs
index 47bca27ab..47bca27ab 100644
--- a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_private_variant.rs
+++ b/tests/ui/transmutability/visibility/should_reject_if_dst_has_private_variant.rs
diff --git a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_private_variant.stderr b/tests/ui/transmutability/visibility/should_reject_if_dst_has_private_variant.stderr
index a1ca2ced5..a1ca2ced5 100644
--- a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_private_variant.stderr
+++ b/tests/ui/transmutability/visibility/should_reject_if_dst_has_private_variant.stderr
diff --git a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_tricky_unreachable_field.rs b/tests/ui/transmutability/visibility/should_reject_if_dst_has_tricky_unreachable_field.rs
index 662c32af1..662c32af1 100644
--- a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_tricky_unreachable_field.rs
+++ b/tests/ui/transmutability/visibility/should_reject_if_dst_has_tricky_unreachable_field.rs
diff --git a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_field.rs b/tests/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_field.rs
index d7e21676f..d7e21676f 100644
--- a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_field.rs
+++ b/tests/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_field.rs
diff --git a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_field.stderr b/tests/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_field.stderr
index 4e648664d..4e648664d 100644
--- a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_field.stderr
+++ b/tests/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_field.stderr
diff --git a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_ty.rs b/tests/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_ty.rs
index c7b59f15b..c7b59f15b 100644
--- a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_ty.rs
+++ b/tests/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_ty.rs
diff --git a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_ty.stderr b/tests/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_ty.stderr
index bd72d64cc..bd72d64cc 100644
--- a/src/test/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_ty.stderr
+++ b/tests/ui/transmutability/visibility/should_reject_if_dst_has_unreachable_ty.stderr
diff --git a/src/test/ui/transmute-equal-assoc-types.rs b/tests/ui/transmute-equal-assoc-types.rs
index d1b593b7f..d1b593b7f 100644
--- a/src/test/ui/transmute-equal-assoc-types.rs
+++ b/tests/ui/transmute-equal-assoc-types.rs
diff --git a/src/test/ui/transmute-non-immediate-to-immediate.rs b/tests/ui/transmute-non-immediate-to-immediate.rs
index cf77c113f..cf77c113f 100644
--- a/src/test/ui/transmute-non-immediate-to-immediate.rs
+++ b/tests/ui/transmute-non-immediate-to-immediate.rs
diff --git a/src/test/ui/transmute/lifetimes.rs b/tests/ui/transmute/lifetimes.rs
index 943191551..943191551 100644
--- a/src/test/ui/transmute/lifetimes.rs
+++ b/tests/ui/transmute/lifetimes.rs
diff --git a/src/test/ui/transmute/main.rs b/tests/ui/transmute/main.rs
index da4a0a660..da4a0a660 100644
--- a/src/test/ui/transmute/main.rs
+++ b/tests/ui/transmute/main.rs
diff --git a/src/test/ui/transmute/main.stderr b/tests/ui/transmute/main.stderr
index 6cb0d7f67..6cb0d7f67 100644
--- a/src/test/ui/transmute/main.stderr
+++ b/tests/ui/transmute/main.stderr
diff --git a/src/test/ui/transmute/transmute-different-sizes.rs b/tests/ui/transmute/transmute-different-sizes.rs
index 690decf63..690decf63 100644
--- a/src/test/ui/transmute/transmute-different-sizes.rs
+++ b/tests/ui/transmute/transmute-different-sizes.rs
diff --git a/src/test/ui/transmute/transmute-different-sizes.stderr b/tests/ui/transmute/transmute-different-sizes.stderr
index 07a38df69..07a38df69 100644
--- a/src/test/ui/transmute/transmute-different-sizes.stderr
+++ b/tests/ui/transmute/transmute-different-sizes.stderr
diff --git a/src/test/ui/transmute/transmute-fat-pointers.rs b/tests/ui/transmute/transmute-fat-pointers.rs
index 7c1beffd1..7c1beffd1 100644
--- a/src/test/ui/transmute/transmute-fat-pointers.rs
+++ b/tests/ui/transmute/transmute-fat-pointers.rs
diff --git a/src/test/ui/transmute/transmute-fat-pointers.stderr b/tests/ui/transmute/transmute-fat-pointers.stderr
index e8335fcbe..e8335fcbe 100644
--- a/src/test/ui/transmute/transmute-fat-pointers.stderr
+++ b/tests/ui/transmute/transmute-fat-pointers.stderr
diff --git a/src/test/ui/transmute/transmute-from-fn-item-types-error.rs b/tests/ui/transmute/transmute-from-fn-item-types-error.rs
index f858a199e..f858a199e 100644
--- a/src/test/ui/transmute/transmute-from-fn-item-types-error.rs
+++ b/tests/ui/transmute/transmute-from-fn-item-types-error.rs
diff --git a/src/test/ui/transmute/transmute-from-fn-item-types-error.stderr b/tests/ui/transmute/transmute-from-fn-item-types-error.stderr
index aefe3fb8e..aefe3fb8e 100644
--- a/src/test/ui/transmute/transmute-from-fn-item-types-error.stderr
+++ b/tests/ui/transmute/transmute-from-fn-item-types-error.stderr
diff --git a/src/test/ui/transmute/transmute-impl.rs b/tests/ui/transmute/transmute-impl.rs
index df422bda1..df422bda1 100644
--- a/src/test/ui/transmute/transmute-impl.rs
+++ b/tests/ui/transmute/transmute-impl.rs
diff --git a/src/test/ui/transmute/transmute-impl.stderr b/tests/ui/transmute/transmute-impl.stderr
index dd19bcd54..dd19bcd54 100644
--- a/src/test/ui/transmute/transmute-impl.stderr
+++ b/tests/ui/transmute/transmute-impl.stderr
diff --git a/src/test/ui/transmute/transmute-imut-to-mut.rs b/tests/ui/transmute/transmute-imut-to-mut.rs
index 9f3f76c1e..9f3f76c1e 100644
--- a/src/test/ui/transmute/transmute-imut-to-mut.rs
+++ b/tests/ui/transmute/transmute-imut-to-mut.rs
diff --git a/src/test/ui/transmute/transmute-imut-to-mut.stderr b/tests/ui/transmute/transmute-imut-to-mut.stderr
index 1e9dff3ce..1e9dff3ce 100644
--- a/src/test/ui/transmute/transmute-imut-to-mut.stderr
+++ b/tests/ui/transmute/transmute-imut-to-mut.stderr
diff --git a/src/test/ui/transmute/transmute-padding-ice.rs b/tests/ui/transmute/transmute-padding-ice.rs
index a1be7075a..a1be7075a 100644
--- a/src/test/ui/transmute/transmute-padding-ice.rs
+++ b/tests/ui/transmute/transmute-padding-ice.rs
diff --git a/src/test/ui/transmute/transmute-padding-ice.stderr b/tests/ui/transmute/transmute-padding-ice.stderr
index c9233890f..c9233890f 100644
--- a/src/test/ui/transmute/transmute-padding-ice.stderr
+++ b/tests/ui/transmute/transmute-padding-ice.stderr
diff --git a/src/test/ui/transmute/transmute-type-parameters.rs b/tests/ui/transmute/transmute-type-parameters.rs
index 5f44b2d0f..5f44b2d0f 100644
--- a/src/test/ui/transmute/transmute-type-parameters.rs
+++ b/tests/ui/transmute/transmute-type-parameters.rs
diff --git a/src/test/ui/transmute/transmute-type-parameters.stderr b/tests/ui/transmute/transmute-type-parameters.stderr
index 220b929d4..220b929d4 100644
--- a/src/test/ui/transmute/transmute-type-parameters.stderr
+++ b/tests/ui/transmute/transmute-type-parameters.stderr
diff --git a/src/test/ui/treat-err-as-bug/delay_span_bug.rs b/tests/ui/treat-err-as-bug/delay_span_bug.rs
index 832afddf8..832afddf8 100644
--- a/src/test/ui/treat-err-as-bug/delay_span_bug.rs
+++ b/tests/ui/treat-err-as-bug/delay_span_bug.rs
diff --git a/src/test/ui/treat-err-as-bug/delay_span_bug.stderr b/tests/ui/treat-err-as-bug/delay_span_bug.stderr
index e9457c8fa..e9457c8fa 100644
--- a/src/test/ui/treat-err-as-bug/delay_span_bug.stderr
+++ b/tests/ui/treat-err-as-bug/delay_span_bug.stderr
diff --git a/src/test/ui/treat-err-as-bug/err.rs b/tests/ui/treat-err-as-bug/err.rs
index de3e9ed6c..de3e9ed6c 100644
--- a/src/test/ui/treat-err-as-bug/err.rs
+++ b/tests/ui/treat-err-as-bug/err.rs
diff --git a/src/test/ui/treat-err-as-bug/err.stderr b/tests/ui/treat-err-as-bug/err.stderr
index 8f67571c2..8f67571c2 100644
--- a/src/test/ui/treat-err-as-bug/err.stderr
+++ b/tests/ui/treat-err-as-bug/err.stderr
diff --git a/src/test/ui/trivial-bounds/issue-73021-impossible-inline.inline.stderr b/tests/ui/trivial-bounds/issue-73021-impossible-inline.inline.stderr
index 40829f537..40829f537 100644
--- a/src/test/ui/trivial-bounds/issue-73021-impossible-inline.inline.stderr
+++ b/tests/ui/trivial-bounds/issue-73021-impossible-inline.inline.stderr
diff --git a/src/test/ui/trivial-bounds/issue-73021-impossible-inline.no-opt.stderr b/tests/ui/trivial-bounds/issue-73021-impossible-inline.no-opt.stderr
index 40829f537..40829f537 100644
--- a/src/test/ui/trivial-bounds/issue-73021-impossible-inline.no-opt.stderr
+++ b/tests/ui/trivial-bounds/issue-73021-impossible-inline.no-opt.stderr
diff --git a/src/test/ui/trivial-bounds/issue-73021-impossible-inline.rs b/tests/ui/trivial-bounds/issue-73021-impossible-inline.rs
index ab6677e91..ab6677e91 100644
--- a/src/test/ui/trivial-bounds/issue-73021-impossible-inline.rs
+++ b/tests/ui/trivial-bounds/issue-73021-impossible-inline.rs
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-associated-functions.rs b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-associated-functions.rs
index 69eee66e6..69eee66e6 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-associated-functions.rs
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-associated-functions.rs
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.rs b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.rs
index b1ff23fd0..b1ff23fd0 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.rs
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.rs
diff --git a/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.stderr b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.stderr
new file mode 100644
index 000000000..39b60c311
--- /dev/null
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.stderr
@@ -0,0 +1,25 @@
+error[E0596]: cannot borrow `**t` as mutable, as it is behind a `&` reference
+  --> $DIR/trivial-bounds-inconsistent-copy-reborrow.rs:6:5
+   |
+LL |     *t
+   |     ^^ `t` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn reborrow_mut<'a>(t: &'a mut &'a mut i32) -> &'a mut i32 where &'a mut i32: Copy {
+   |                        ~~~~~~~~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `**t` as mutable, as it is behind a `&` reference
+  --> $DIR/trivial-bounds-inconsistent-copy-reborrow.rs:10:6
+   |
+LL |     {*t}
+   |      ^^ `t` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn copy_reborrow_mut<'a>(t: &'a mut &'a mut i32) -> &'a mut i32 where &'a mut i32: Copy {
+   |                             ~~~~~~~~~~~~~~~~~~~
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.rs b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy.rs
index 3416503b8..3416503b8 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.rs
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy.rs
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr
index 1e2662389..1e2662389 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.rs b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.rs
index e0f299630..e0f299630 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.rs
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.rs
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr
index 26679e713..26679e713 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.rs b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-projection.rs
index b13956673..b13956673 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.rs
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-projection.rs
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr
index ddc13c512..ddc13c512 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.rs b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-sized.rs
index bfa083655..bfa083655 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.rs
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-sized.rs
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr
index cf24d811c..cf24d811c 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.rs b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.rs
index 9efa22b10..9efa22b10 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.rs
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.rs
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr
index 8f58a99a8..8f58a99a8 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.rs b/tests/ui/trivial-bounds/trivial-bounds-inconsistent.rs
index 7148f5d6d..7148f5d6d 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.rs
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent.rs
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.stderr b/tests/ui/trivial-bounds/trivial-bounds-inconsistent.stderr
index d66e46887..d66e46887 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.stderr
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent.stderr
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.rs b/tests/ui/trivial-bounds/trivial-bounds-leak-copy.rs
index cecc0b2da..cecc0b2da 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.rs
+++ b/tests/ui/trivial-bounds/trivial-bounds-leak-copy.rs
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.stderr b/tests/ui/trivial-bounds/trivial-bounds-leak-copy.stderr
index b3ec3cd8d..b3ec3cd8d 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.stderr
+++ b/tests/ui/trivial-bounds/trivial-bounds-leak-copy.stderr
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-leak.rs b/tests/ui/trivial-bounds/trivial-bounds-leak.rs
index 249051d80..249051d80 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-leak.rs
+++ b/tests/ui/trivial-bounds/trivial-bounds-leak.rs
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr b/tests/ui/trivial-bounds/trivial-bounds-leak.stderr
index 02c5d5d24..02c5d5d24 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr
+++ b/tests/ui/trivial-bounds/trivial-bounds-leak.stderr
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-lint.rs b/tests/ui/trivial-bounds/trivial-bounds-lint.rs
index 078578372..078578372 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-lint.rs
+++ b/tests/ui/trivial-bounds/trivial-bounds-lint.rs
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-lint.stderr b/tests/ui/trivial-bounds/trivial-bounds-lint.stderr
index 20e0ddfc2..20e0ddfc2 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-lint.stderr
+++ b/tests/ui/trivial-bounds/trivial-bounds-lint.stderr
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-object.rs b/tests/ui/trivial-bounds/trivial-bounds-object.rs
index f5feeea7c..f5feeea7c 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-object.rs
+++ b/tests/ui/trivial-bounds/trivial-bounds-object.rs
diff --git a/src/test/ui/trivial_casts-rpass.rs b/tests/ui/trivial_casts-rpass.rs
index 8e49468bf..8e49468bf 100644
--- a/src/test/ui/trivial_casts-rpass.rs
+++ b/tests/ui/trivial_casts-rpass.rs
diff --git a/src/test/ui/try-block/issue-45124.rs b/tests/ui/try-block/issue-45124.rs
index 942014c91..942014c91 100644
--- a/src/test/ui/try-block/issue-45124.rs
+++ b/tests/ui/try-block/issue-45124.rs
diff --git a/src/test/ui/try-block/try-block-bad-lifetime.rs b/tests/ui/try-block/try-block-bad-lifetime.rs
index d9524e99f..d9524e99f 100644
--- a/src/test/ui/try-block/try-block-bad-lifetime.rs
+++ b/tests/ui/try-block/try-block-bad-lifetime.rs
diff --git a/src/test/ui/try-block/try-block-bad-lifetime.stderr b/tests/ui/try-block/try-block-bad-lifetime.stderr
index ea079e30d..ea079e30d 100644
--- a/src/test/ui/try-block/try-block-bad-lifetime.stderr
+++ b/tests/ui/try-block/try-block-bad-lifetime.stderr
diff --git a/src/test/ui/try-block/try-block-bad-type.rs b/tests/ui/try-block/try-block-bad-type.rs
index 30ae96763..30ae96763 100644
--- a/src/test/ui/try-block/try-block-bad-type.rs
+++ b/tests/ui/try-block/try-block-bad-type.rs
diff --git a/src/test/ui/try-block/try-block-bad-type.stderr b/tests/ui/try-block/try-block-bad-type.stderr
index e11c3f810..e11c3f810 100644
--- a/src/test/ui/try-block/try-block-bad-type.stderr
+++ b/tests/ui/try-block/try-block-bad-type.stderr
diff --git a/src/test/ui/try-block/try-block-catch.rs b/tests/ui/try-block/try-block-catch.rs
index d16501561..d16501561 100644
--- a/src/test/ui/try-block/try-block-catch.rs
+++ b/tests/ui/try-block/try-block-catch.rs
diff --git a/src/test/ui/try-block/try-block-catch.stderr b/tests/ui/try-block/try-block-catch.stderr
index 39cf943f4..39cf943f4 100644
--- a/src/test/ui/try-block/try-block-catch.stderr
+++ b/tests/ui/try-block/try-block-catch.stderr
diff --git a/src/test/ui/try-block/try-block-in-edition2015.rs b/tests/ui/try-block/try-block-in-edition2015.rs
index 009642973..009642973 100644
--- a/src/test/ui/try-block/try-block-in-edition2015.rs
+++ b/tests/ui/try-block/try-block-in-edition2015.rs
diff --git a/src/test/ui/try-block/try-block-in-edition2015.stderr b/tests/ui/try-block/try-block-in-edition2015.stderr
index a00064c44..a00064c44 100644
--- a/src/test/ui/try-block/try-block-in-edition2015.stderr
+++ b/tests/ui/try-block/try-block-in-edition2015.stderr
diff --git a/src/test/ui/try-block/try-block-in-match.rs b/tests/ui/try-block/try-block-in-match.rs
index cd0b967e7..cd0b967e7 100644
--- a/src/test/ui/try-block/try-block-in-match.rs
+++ b/tests/ui/try-block/try-block-in-match.rs
diff --git a/src/test/ui/try-block/try-block-in-return.rs b/tests/ui/try-block/try-block-in-return.rs
index a15bfeef1..a15bfeef1 100644
--- a/src/test/ui/try-block/try-block-in-return.rs
+++ b/tests/ui/try-block/try-block-in-return.rs
diff --git a/src/test/ui/try-block/try-block-in-while.rs b/tests/ui/try-block/try-block-in-while.rs
index 69793df52..69793df52 100644
--- a/src/test/ui/try-block/try-block-in-while.rs
+++ b/tests/ui/try-block/try-block-in-while.rs
diff --git a/src/test/ui/try-block/try-block-in-while.stderr b/tests/ui/try-block/try-block-in-while.stderr
index 62cc26dd4..62cc26dd4 100644
--- a/src/test/ui/try-block/try-block-in-while.stderr
+++ b/tests/ui/try-block/try-block-in-while.stderr
diff --git a/src/test/ui/try-block/try-block-maybe-bad-lifetime.rs b/tests/ui/try-block/try-block-maybe-bad-lifetime.rs
index cd2ddf63a..cd2ddf63a 100644
--- a/src/test/ui/try-block/try-block-maybe-bad-lifetime.rs
+++ b/tests/ui/try-block/try-block-maybe-bad-lifetime.rs
diff --git a/src/test/ui/try-block/try-block-maybe-bad-lifetime.stderr b/tests/ui/try-block/try-block-maybe-bad-lifetime.stderr
index f738b03ee..f738b03ee 100644
--- a/src/test/ui/try-block/try-block-maybe-bad-lifetime.stderr
+++ b/tests/ui/try-block/try-block-maybe-bad-lifetime.stderr
diff --git a/src/test/ui/try-block/try-block-opt-init.rs b/tests/ui/try-block/try-block-opt-init.rs
index f4f45abcc..f4f45abcc 100644
--- a/src/test/ui/try-block/try-block-opt-init.rs
+++ b/tests/ui/try-block/try-block-opt-init.rs
diff --git a/src/test/ui/try-block/try-block-opt-init.stderr b/tests/ui/try-block/try-block-opt-init.stderr
index c39738501..c39738501 100644
--- a/src/test/ui/try-block/try-block-opt-init.stderr
+++ b/tests/ui/try-block/try-block-opt-init.stderr
diff --git a/src/test/ui/try-block/try-block-type-error.rs b/tests/ui/try-block/try-block-type-error.rs
index fe1993a37..fe1993a37 100644
--- a/src/test/ui/try-block/try-block-type-error.rs
+++ b/tests/ui/try-block/try-block-type-error.rs
diff --git a/src/test/ui/try-block/try-block-type-error.stderr b/tests/ui/try-block/try-block-type-error.stderr
index 3e9a584a5..3e9a584a5 100644
--- a/src/test/ui/try-block/try-block-type-error.stderr
+++ b/tests/ui/try-block/try-block-type-error.stderr
diff --git a/src/test/ui/try-block/try-block-unreachable-code-lint.rs b/tests/ui/try-block/try-block-unreachable-code-lint.rs
index e1d82ea36..e1d82ea36 100644
--- a/src/test/ui/try-block/try-block-unreachable-code-lint.rs
+++ b/tests/ui/try-block/try-block-unreachable-code-lint.rs
diff --git a/src/test/ui/try-block/try-block-unreachable-code-lint.stderr b/tests/ui/try-block/try-block-unreachable-code-lint.stderr
index 9fc0b661f..9fc0b661f 100644
--- a/src/test/ui/try-block/try-block-unreachable-code-lint.stderr
+++ b/tests/ui/try-block/try-block-unreachable-code-lint.stderr
diff --git a/src/test/ui/try-block/try-block-unused-delims.fixed b/tests/ui/try-block/try-block-unused-delims.fixed
index 756081738..756081738 100644
--- a/src/test/ui/try-block/try-block-unused-delims.fixed
+++ b/tests/ui/try-block/try-block-unused-delims.fixed
diff --git a/src/test/ui/try-block/try-block-unused-delims.rs b/tests/ui/try-block/try-block-unused-delims.rs
index ce087fb35..ce087fb35 100644
--- a/src/test/ui/try-block/try-block-unused-delims.rs
+++ b/tests/ui/try-block/try-block-unused-delims.rs
diff --git a/src/test/ui/try-block/try-block-unused-delims.stderr b/tests/ui/try-block/try-block-unused-delims.stderr
index 765cd9c0f..765cd9c0f 100644
--- a/src/test/ui/try-block/try-block-unused-delims.stderr
+++ b/tests/ui/try-block/try-block-unused-delims.stderr
diff --git a/src/test/ui/try-block/try-block.rs b/tests/ui/try-block/try-block.rs
index c29ccc704..c29ccc704 100644
--- a/src/test/ui/try-block/try-block.rs
+++ b/tests/ui/try-block/try-block.rs
diff --git a/src/test/ui/try-block/try-is-identifier-edition2015.rs b/tests/ui/try-block/try-is-identifier-edition2015.rs
index 90f56d5fa..90f56d5fa 100644
--- a/src/test/ui/try-block/try-is-identifier-edition2015.rs
+++ b/tests/ui/try-block/try-is-identifier-edition2015.rs
diff --git a/src/test/ui/try-from-int-error-partial-eq.rs b/tests/ui/try-from-int-error-partial-eq.rs
index 6ee4a4cf3..6ee4a4cf3 100644
--- a/src/test/ui/try-from-int-error-partial-eq.rs
+++ b/tests/ui/try-from-int-error-partial-eq.rs
diff --git a/src/test/ui/try-operator-hygiene.rs b/tests/ui/try-operator-hygiene.rs
index 0b24b4305..0b24b4305 100644
--- a/src/test/ui/try-operator-hygiene.rs
+++ b/tests/ui/try-operator-hygiene.rs
diff --git a/src/test/ui/try-operator.rs b/tests/ui/try-operator.rs
index 516ae4c40..516ae4c40 100644
--- a/src/test/ui/try-operator.rs
+++ b/tests/ui/try-operator.rs
diff --git a/src/test/ui/try-trait/bad-interconversion.rs b/tests/ui/try-trait/bad-interconversion.rs
index 385f5510f..385f5510f 100644
--- a/src/test/ui/try-trait/bad-interconversion.rs
+++ b/tests/ui/try-trait/bad-interconversion.rs
diff --git a/src/test/ui/try-trait/bad-interconversion.stderr b/tests/ui/try-trait/bad-interconversion.stderr
index a49630adb..a49630adb 100644
--- a/src/test/ui/try-trait/bad-interconversion.stderr
+++ b/tests/ui/try-trait/bad-interconversion.stderr
diff --git a/src/test/ui/try-trait/option-to-result.rs b/tests/ui/try-trait/option-to-result.rs
index 45aaf361a..45aaf361a 100644
--- a/src/test/ui/try-trait/option-to-result.rs
+++ b/tests/ui/try-trait/option-to-result.rs
diff --git a/src/test/ui/try-trait/option-to-result.stderr b/tests/ui/try-trait/option-to-result.stderr
index fabc1ff2c..fabc1ff2c 100644
--- a/src/test/ui/try-trait/option-to-result.stderr
+++ b/tests/ui/try-trait/option-to-result.stderr
diff --git a/src/test/ui/try-trait/try-as-monad.rs b/tests/ui/try-trait/try-as-monad.rs
index cf09838b3..cf09838b3 100644
--- a/src/test/ui/try-trait/try-as-monad.rs
+++ b/tests/ui/try-trait/try-as-monad.rs
diff --git a/src/test/ui/try-trait/try-on-option-diagnostics.rs b/tests/ui/try-trait/try-on-option-diagnostics.rs
index 7ffa0de6c..7ffa0de6c 100644
--- a/src/test/ui/try-trait/try-on-option-diagnostics.rs
+++ b/tests/ui/try-trait/try-on-option-diagnostics.rs
diff --git a/src/test/ui/try-trait/try-on-option-diagnostics.stderr b/tests/ui/try-trait/try-on-option-diagnostics.stderr
index 9ee540c79..9ee540c79 100644
--- a/src/test/ui/try-trait/try-on-option-diagnostics.stderr
+++ b/tests/ui/try-trait/try-on-option-diagnostics.stderr
diff --git a/src/test/ui/try-trait/try-on-option.rs b/tests/ui/try-trait/try-on-option.rs
index 8519932a6..8519932a6 100644
--- a/src/test/ui/try-trait/try-on-option.rs
+++ b/tests/ui/try-trait/try-on-option.rs
diff --git a/src/test/ui/try-trait/try-on-option.stderr b/tests/ui/try-trait/try-on-option.stderr
index fad6a1fe8..fad6a1fe8 100644
--- a/src/test/ui/try-trait/try-on-option.stderr
+++ b/tests/ui/try-trait/try-on-option.stderr
diff --git a/src/test/ui/try-trait/try-operator-custom.rs b/tests/ui/try-trait/try-operator-custom.rs
index 45636a7fc..45636a7fc 100644
--- a/src/test/ui/try-trait/try-operator-custom.rs
+++ b/tests/ui/try-trait/try-operator-custom.rs
diff --git a/src/test/ui/try-trait/try-operator-on-main.rs b/tests/ui/try-trait/try-operator-on-main.rs
index 3b364f7e7..3b364f7e7 100644
--- a/src/test/ui/try-trait/try-operator-on-main.rs
+++ b/tests/ui/try-trait/try-operator-on-main.rs
diff --git a/src/test/ui/try-trait/try-operator-on-main.stderr b/tests/ui/try-trait/try-operator-on-main.stderr
index 7cd38e0cf..7cd38e0cf 100644
--- a/src/test/ui/try-trait/try-operator-on-main.stderr
+++ b/tests/ui/try-trait/try-operator-on-main.stderr
diff --git a/src/test/ui/try-trait/try-poll.rs b/tests/ui/try-trait/try-poll.rs
index d42e51c74..d42e51c74 100644
--- a/src/test/ui/try-trait/try-poll.rs
+++ b/tests/ui/try-trait/try-poll.rs
diff --git a/src/test/ui/try-trait/yeet-for-option.rs b/tests/ui/try-trait/yeet-for-option.rs
index 753fbc1de..753fbc1de 100644
--- a/src/test/ui/try-trait/yeet-for-option.rs
+++ b/tests/ui/try-trait/yeet-for-option.rs
diff --git a/src/test/ui/try-trait/yeet-for-result.rs b/tests/ui/try-trait/yeet-for-result.rs
index b7b113797..b7b113797 100644
--- a/src/test/ui/try-trait/yeet-for-result.rs
+++ b/tests/ui/try-trait/yeet-for-result.rs
diff --git a/src/test/ui/tuple-index.rs b/tests/ui/tuple-index.rs
index 3e1d92b42..3e1d92b42 100644
--- a/src/test/ui/tuple-index.rs
+++ b/tests/ui/tuple-index.rs
diff --git a/tests/ui/tuple/add-tuple-within-arguments.rs b/tests/ui/tuple/add-tuple-within-arguments.rs
new file mode 100644
index 000000000..01b13b29f
--- /dev/null
+++ b/tests/ui/tuple/add-tuple-within-arguments.rs
@@ -0,0 +1,10 @@
+fn foo(s: &str, a: (i32, i32), s2: &str) {}
+
+fn bar(s: &str, a: (&str,), s2: &str) {}
+
+fn main() {
+    foo("hi", 1, 2, "hi");
+    //~^ ERROR function takes 3 arguments but 4 arguments were supplied
+    bar("hi", "hi", "hi");
+    //~^ ERROR mismatched types
+}
diff --git a/src/test/ui/tuple/add-tuple-within-arguments.stderr b/tests/ui/tuple/add-tuple-within-arguments.stderr
index 7029d298d..2e20a4cca 100644
--- a/src/test/ui/tuple/add-tuple-within-arguments.stderr
+++ b/tests/ui/tuple/add-tuple-within-arguments.stderr
@@ -1,4 +1,4 @@
-error[E0061]: this function takes 3 arguments but 4 arguments were supplied
+error[E0061]: function takes 3 arguments but 4 arguments were supplied
   --> $DIR/add-tuple-within-arguments.rs:6:5
    |
 LL |     foo("hi", 1, 2, "hi");
diff --git a/src/test/ui/tuple/array-diagnostics.rs b/tests/ui/tuple/array-diagnostics.rs
index 1929dab07..1929dab07 100644
--- a/src/test/ui/tuple/array-diagnostics.rs
+++ b/tests/ui/tuple/array-diagnostics.rs
diff --git a/src/test/ui/tuple/array-diagnostics.stderr b/tests/ui/tuple/array-diagnostics.stderr
index a10d7af47..a10d7af47 100644
--- a/src/test/ui/tuple/array-diagnostics.stderr
+++ b/tests/ui/tuple/array-diagnostics.stderr
diff --git a/src/test/ui/tuple/builtin-fail.rs b/tests/ui/tuple/builtin-fail.rs
index 312080961..312080961 100644
--- a/src/test/ui/tuple/builtin-fail.rs
+++ b/tests/ui/tuple/builtin-fail.rs
diff --git a/src/test/ui/tuple/builtin-fail.stderr b/tests/ui/tuple/builtin-fail.stderr
index e3e29a73f..e3e29a73f 100644
--- a/src/test/ui/tuple/builtin-fail.stderr
+++ b/tests/ui/tuple/builtin-fail.stderr
diff --git a/src/test/ui/tuple/builtin.rs b/tests/ui/tuple/builtin.rs
index d87ce5263..d87ce5263 100644
--- a/src/test/ui/tuple/builtin.rs
+++ b/tests/ui/tuple/builtin.rs
diff --git a/src/test/ui/tuple/index-float.rs b/tests/ui/tuple/index-float.rs
index eda2bf485..eda2bf485 100644
--- a/src/test/ui/tuple/index-float.rs
+++ b/tests/ui/tuple/index-float.rs
diff --git a/src/test/ui/tuple/index-invalid.rs b/tests/ui/tuple/index-invalid.rs
index d36f6cfe3..d36f6cfe3 100644
--- a/src/test/ui/tuple/index-invalid.rs
+++ b/tests/ui/tuple/index-invalid.rs
diff --git a/src/test/ui/tuple/index-invalid.stderr b/tests/ui/tuple/index-invalid.stderr
index 8d22f458a..8d22f458a 100644
--- a/src/test/ui/tuple/index-invalid.stderr
+++ b/tests/ui/tuple/index-invalid.stderr
diff --git a/src/test/ui/tuple/indexing-in-macro.rs b/tests/ui/tuple/indexing-in-macro.rs
index bef4a69ab..bef4a69ab 100644
--- a/src/test/ui/tuple/indexing-in-macro.rs
+++ b/tests/ui/tuple/indexing-in-macro.rs
diff --git a/src/test/ui/tuple/nested-index.rs b/tests/ui/tuple/nested-index.rs
index a3232d6fc..a3232d6fc 100644
--- a/src/test/ui/tuple/nested-index.rs
+++ b/tests/ui/tuple/nested-index.rs
diff --git a/src/test/ui/tuple/one-tuple.rs b/tests/ui/tuple/one-tuple.rs
index 00fbadce1..00fbadce1 100644
--- a/src/test/ui/tuple/one-tuple.rs
+++ b/tests/ui/tuple/one-tuple.rs
diff --git a/src/test/ui/tuple/tup.rs b/tests/ui/tuple/tup.rs
index 160477b0b..160477b0b 100644
--- a/src/test/ui/tuple/tup.rs
+++ b/tests/ui/tuple/tup.rs
diff --git a/src/test/ui/tuple/tuple-arity-mismatch.rs b/tests/ui/tuple/tuple-arity-mismatch.rs
index f1e525c93..f1e525c93 100644
--- a/src/test/ui/tuple/tuple-arity-mismatch.rs
+++ b/tests/ui/tuple/tuple-arity-mismatch.rs
diff --git a/src/test/ui/tuple/tuple-arity-mismatch.stderr b/tests/ui/tuple/tuple-arity-mismatch.stderr
index fff7be987..fff7be987 100644
--- a/src/test/ui/tuple/tuple-arity-mismatch.stderr
+++ b/tests/ui/tuple/tuple-arity-mismatch.stderr
diff --git a/src/test/ui/tuple/tuple-index-fat-types.rs b/tests/ui/tuple/tuple-index-fat-types.rs
index 5dda1ed97..5dda1ed97 100644
--- a/src/test/ui/tuple/tuple-index-fat-types.rs
+++ b/tests/ui/tuple/tuple-index-fat-types.rs
diff --git a/src/test/ui/tuple/tuple-index-not-tuple.rs b/tests/ui/tuple/tuple-index-not-tuple.rs
index c478e1c67..c478e1c67 100644
--- a/src/test/ui/tuple/tuple-index-not-tuple.rs
+++ b/tests/ui/tuple/tuple-index-not-tuple.rs
diff --git a/src/test/ui/tuple/tuple-index-not-tuple.stderr b/tests/ui/tuple/tuple-index-not-tuple.stderr
index a1bcdfaed..a1bcdfaed 100644
--- a/src/test/ui/tuple/tuple-index-not-tuple.stderr
+++ b/tests/ui/tuple/tuple-index-not-tuple.stderr
diff --git a/src/test/ui/tuple/tuple-index-out-of-bounds.rs b/tests/ui/tuple/tuple-index-out-of-bounds.rs
index c772c0daa..c772c0daa 100644
--- a/src/test/ui/tuple/tuple-index-out-of-bounds.rs
+++ b/tests/ui/tuple/tuple-index-out-of-bounds.rs
diff --git a/src/test/ui/tuple/tuple-index-out-of-bounds.stderr b/tests/ui/tuple/tuple-index-out-of-bounds.stderr
index 7d7c5cd78..7d7c5cd78 100644
--- a/src/test/ui/tuple/tuple-index-out-of-bounds.stderr
+++ b/tests/ui/tuple/tuple-index-out-of-bounds.stderr
diff --git a/src/test/ui/tuple/tuple-struct-fields/test.rs b/tests/ui/tuple/tuple-struct-fields/test.rs
index 00677090d..00677090d 100644
--- a/src/test/ui/tuple/tuple-struct-fields/test.rs
+++ b/tests/ui/tuple/tuple-struct-fields/test.rs
diff --git a/src/test/ui/tuple/tuple-struct-fields/test.stderr b/tests/ui/tuple/tuple-struct-fields/test.stderr
index bfa0b32fd..bfa0b32fd 100644
--- a/src/test/ui/tuple/tuple-struct-fields/test.stderr
+++ b/tests/ui/tuple/tuple-struct-fields/test.stderr
diff --git a/src/test/ui/tuple/tuple-struct-fields/test2.rs b/tests/ui/tuple/tuple-struct-fields/test2.rs
index 2b2a2c127..2b2a2c127 100644
--- a/src/test/ui/tuple/tuple-struct-fields/test2.rs
+++ b/tests/ui/tuple/tuple-struct-fields/test2.rs
diff --git a/src/test/ui/tuple/tuple-struct-fields/test2.stderr b/tests/ui/tuple/tuple-struct-fields/test2.stderr
index 64a9ac135..64a9ac135 100644
--- a/src/test/ui/tuple/tuple-struct-fields/test2.stderr
+++ b/tests/ui/tuple/tuple-struct-fields/test2.stderr
diff --git a/src/test/ui/tuple/tuple-struct-fields/test3.rs b/tests/ui/tuple/tuple-struct-fields/test3.rs
index 98d19426e..98d19426e 100644
--- a/src/test/ui/tuple/tuple-struct-fields/test3.rs
+++ b/tests/ui/tuple/tuple-struct-fields/test3.rs
diff --git a/src/test/ui/tuple/tuple-struct-fields/test3.stderr b/tests/ui/tuple/tuple-struct-fields/test3.stderr
index 75262ed57..75262ed57 100644
--- a/src/test/ui/tuple/tuple-struct-fields/test3.stderr
+++ b/tests/ui/tuple/tuple-struct-fields/test3.stderr
diff --git a/tests/ui/tuple/wrong_argument_ice-2.rs b/tests/ui/tuple/wrong_argument_ice-2.rs
new file mode 100644
index 000000000..e1c1d748f
--- /dev/null
+++ b/tests/ui/tuple/wrong_argument_ice-2.rs
@@ -0,0 +1,17 @@
+fn test(t: (i32, i32)) {}
+
+struct Foo;
+
+impl Foo {
+    fn qux(&self) -> i32 {
+        0
+    }
+}
+
+fn bar() {
+    let x = Foo;
+    test(x.qux(), x.qux());
+    //~^ ERROR function takes 1 argument but 2 arguments were supplied
+}
+
+fn main() {}
diff --git a/src/test/ui/tuple/wrong_argument_ice-2.stderr b/tests/ui/tuple/wrong_argument_ice-2.stderr
index 0c2a4c414..412442092 100644
--- a/src/test/ui/tuple/wrong_argument_ice-2.stderr
+++ b/tests/ui/tuple/wrong_argument_ice-2.stderr
@@ -1,4 +1,4 @@
-error[E0061]: this function takes 1 argument but 2 arguments were supplied
+error[E0061]: function takes 1 argument but 2 arguments were supplied
   --> $DIR/wrong_argument_ice-2.rs:13:5
    |
 LL |     test(x.qux(), x.qux());
diff --git a/src/test/ui/tuple/wrong_argument_ice-3.rs b/tests/ui/tuple/wrong_argument_ice-3.rs
index 951687c37..96633180b 100644
--- a/src/test/ui/tuple/wrong_argument_ice-3.rs
+++ b/tests/ui/tuple/wrong_argument_ice-3.rs
@@ -7,7 +7,7 @@ fn test(process: &Process, groups: Vec<Group>) -> Vec<Group> {
 
     if groups.capacity() == 0 {
         groups.push(new_group, vec![process]);
-        //~^ ERROR this function takes 1 argument but 2 arguments were supplied
+        //~^ ERROR this method takes 1 argument but 2 arguments were supplied
         return groups;
     }
 
diff --git a/src/test/ui/tuple/wrong_argument_ice-3.stderr b/tests/ui/tuple/wrong_argument_ice-3.stderr
index f3a547fa2..0a503e1fe 100644
--- a/src/test/ui/tuple/wrong_argument_ice-3.stderr
+++ b/tests/ui/tuple/wrong_argument_ice-3.stderr
@@ -1,4 +1,4 @@
-error[E0061]: this function takes 1 argument but 2 arguments were supplied
+error[E0061]: this method takes 1 argument but 2 arguments were supplied
   --> $DIR/wrong_argument_ice-3.rs:9:16
    |
 LL |         groups.push(new_group, vec![process]);
@@ -13,9 +13,6 @@ LL |         groups.push(new_group, vec![process]);
              found struct `Vec<String>`
 note: associated function defined here
   --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-   |
-LL |     pub fn push(&mut self, value: T) {
-   |            ^^^^
 help: remove the extra argument
    |
 LL |         groups.push(/* (Vec<String>, Vec<Process>) */);
diff --git a/tests/ui/tuple/wrong_argument_ice-4.rs b/tests/ui/tuple/wrong_argument_ice-4.rs
new file mode 100644
index 000000000..883d92dcc
--- /dev/null
+++ b/tests/ui/tuple/wrong_argument_ice-4.rs
@@ -0,0 +1,6 @@
+fn main() {
+    (|| {})(|| {
+        //~^ ERROR function takes 0 arguments but 1 argument was supplied
+        let b = 1;
+    });
+}
diff --git a/src/test/ui/tuple/wrong_argument_ice-4.stderr b/tests/ui/tuple/wrong_argument_ice-4.stderr
index a2686ab94..a2686ab94 100644
--- a/src/test/ui/tuple/wrong_argument_ice-4.stderr
+++ b/tests/ui/tuple/wrong_argument_ice-4.stderr
diff --git a/src/test/ui/tuple/wrong_argument_ice.rs b/tests/ui/tuple/wrong_argument_ice.rs
index da967d8c1..b7e0225fe 100644
--- a/src/test/ui/tuple/wrong_argument_ice.rs
+++ b/tests/ui/tuple/wrong_argument_ice.rs
@@ -9,7 +9,7 @@ pub struct BuildPlanBuilder {
 impl BuildPlanBuilder {
     pub fn or(&mut self) -> &mut Self {
         self.acc.push_back(self.current_provides, self.current_requires);
-        //~^ ERROR this function takes 1 argument but 2 arguments were supplied
+        //~^ ERROR method takes 1 argument but 2 arguments were supplied
         self
     }
 }
diff --git a/src/test/ui/tuple/wrong_argument_ice.stderr b/tests/ui/tuple/wrong_argument_ice.stderr
index ec07f1e70..f1b00ae0b 100644
--- a/src/test/ui/tuple/wrong_argument_ice.stderr
+++ b/tests/ui/tuple/wrong_argument_ice.stderr
@@ -1,4 +1,4 @@
-error[E0061]: this function takes 1 argument but 2 arguments were supplied
+error[E0061]: method takes 1 argument but 2 arguments were supplied
   --> $DIR/wrong_argument_ice.rs:11:18
    |
 LL |         self.acc.push_back(self.current_provides, self.current_requires);
@@ -6,9 +6,6 @@ LL |         self.acc.push_back(self.current_provides, self.current_requires);
    |
 note: associated function defined here
   --> $SRC_DIR/alloc/src/collections/vec_deque/mod.rs:LL:COL
-   |
-LL |     pub fn push_back(&mut self, value: T) {
-   |            ^^^^^^^^^
 help: wrap these arguments in parentheses to construct a tuple
    |
 LL |         self.acc.push_back((self.current_provides, self.current_requires));
diff --git a/src/test/ui/tydesc-name.rs b/tests/ui/tydesc-name.rs
index c432e5b54..c432e5b54 100644
--- a/src/test/ui/tydesc-name.rs
+++ b/tests/ui/tydesc-name.rs
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pass.rs b/tests/ui/type-alias-enum-variants/enum-variant-generic-args-pass.rs
index 0aa644db0..0aa644db0 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pass.rs
+++ b/tests/ui/type-alias-enum-variants/enum-variant-generic-args-pass.rs
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-generic-args.rs b/tests/ui/type-alias-enum-variants/enum-variant-generic-args.rs
index 0031a4665..0031a4665 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-generic-args.rs
+++ b/tests/ui/type-alias-enum-variants/enum-variant-generic-args.rs
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-generic-args.stderr b/tests/ui/type-alias-enum-variants/enum-variant-generic-args.stderr
index a922d7a5e..a922d7a5e 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-generic-args.stderr
+++ b/tests/ui/type-alias-enum-variants/enum-variant-generic-args.stderr
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.rs b/tests/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.rs
index 3a8712f2a..3a8712f2a 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.rs
+++ b/tests/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.rs
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.stderr b/tests/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.stderr
index eb58ee73c..eb58ee73c 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.stderr
+++ b/tests/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.stderr
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.rs b/tests/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.rs
index acbf15dcb..acbf15dcb 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.rs
+++ b/tests/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.rs
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr b/tests/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr
index 0202a2fea..0202a2fea 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr
+++ b/tests/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr
diff --git a/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-Self-issue-58006.rs b/tests/ui/type-alias-enum-variants/incorrect-variant-form-through-Self-issue-58006.rs
index ab40bf580..ab40bf580 100644
--- a/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-Self-issue-58006.rs
+++ b/tests/ui/type-alias-enum-variants/incorrect-variant-form-through-Self-issue-58006.rs
diff --git a/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-Self-issue-58006.stderr b/tests/ui/type-alias-enum-variants/incorrect-variant-form-through-Self-issue-58006.stderr
index 6870b9d7d..6870b9d7d 100644
--- a/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-Self-issue-58006.stderr
+++ b/tests/ui/type-alias-enum-variants/incorrect-variant-form-through-Self-issue-58006.stderr
diff --git a/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.rs b/tests/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.rs
index 5ed7988e4..5ed7988e4 100644
--- a/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.rs
+++ b/tests/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.rs
diff --git a/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.stderr b/tests/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.stderr
index c9ac99ede..c9ac99ede 100644
--- a/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.stderr
+++ b/tests/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.stderr
diff --git a/src/test/ui/type-alias-enum-variants/issue-57866.rs b/tests/ui/type-alias-enum-variants/issue-57866.rs
index 5e105b20a..5e105b20a 100644
--- a/src/test/ui/type-alias-enum-variants/issue-57866.rs
+++ b/tests/ui/type-alias-enum-variants/issue-57866.rs
diff --git a/src/test/ui/type-alias-enum-variants/issue-61801-path-pattern-can-infer.rs b/tests/ui/type-alias-enum-variants/issue-61801-path-pattern-can-infer.rs
index 9c9eaab8d..9c9eaab8d 100644
--- a/src/test/ui/type-alias-enum-variants/issue-61801-path-pattern-can-infer.rs
+++ b/tests/ui/type-alias-enum-variants/issue-61801-path-pattern-can-infer.rs
diff --git a/src/test/ui/type-alias-enum-variants/issue-63151-dead-code-lint-fields-in-patterns.rs b/tests/ui/type-alias-enum-variants/issue-63151-dead-code-lint-fields-in-patterns.rs
index 66fb8dd0d..66fb8dd0d 100644
--- a/src/test/ui/type-alias-enum-variants/issue-63151-dead-code-lint-fields-in-patterns.rs
+++ b/tests/ui/type-alias-enum-variants/issue-63151-dead-code-lint-fields-in-patterns.rs
diff --git a/src/test/ui/type-alias-enum-variants/no-type-application-on-aliased-enum-variant.rs b/tests/ui/type-alias-enum-variants/no-type-application-on-aliased-enum-variant.rs
index 872ece0c0..872ece0c0 100644
--- a/src/test/ui/type-alias-enum-variants/no-type-application-on-aliased-enum-variant.rs
+++ b/tests/ui/type-alias-enum-variants/no-type-application-on-aliased-enum-variant.rs
diff --git a/src/test/ui/type-alias-enum-variants/no-type-application-on-aliased-enum-variant.stderr b/tests/ui/type-alias-enum-variants/no-type-application-on-aliased-enum-variant.stderr
index 51b1c8a10..51b1c8a10 100644
--- a/src/test/ui/type-alias-enum-variants/no-type-application-on-aliased-enum-variant.stderr
+++ b/tests/ui/type-alias-enum-variants/no-type-application-on-aliased-enum-variant.stderr
diff --git a/src/test/ui/type-alias-enum-variants/resolve-to-enum-variant-in-type-namespace-and-error.rs b/tests/ui/type-alias-enum-variants/resolve-to-enum-variant-in-type-namespace-and-error.rs
index 11f4b05d0..11f4b05d0 100644
--- a/src/test/ui/type-alias-enum-variants/resolve-to-enum-variant-in-type-namespace-and-error.rs
+++ b/tests/ui/type-alias-enum-variants/resolve-to-enum-variant-in-type-namespace-and-error.rs
diff --git a/src/test/ui/type-alias-enum-variants/resolve-to-enum-variant-in-type-namespace-and-error.stderr b/tests/ui/type-alias-enum-variants/resolve-to-enum-variant-in-type-namespace-and-error.stderr
index f190bfb69..f190bfb69 100644
--- a/src/test/ui/type-alias-enum-variants/resolve-to-enum-variant-in-type-namespace-and-error.stderr
+++ b/tests/ui/type-alias-enum-variants/resolve-to-enum-variant-in-type-namespace-and-error.stderr
diff --git a/src/test/ui/type-alias-enum-variants/self-in-enum-definition.rs b/tests/ui/type-alias-enum-variants/self-in-enum-definition.rs
index 8dadd77fc..8dadd77fc 100644
--- a/src/test/ui/type-alias-enum-variants/self-in-enum-definition.rs
+++ b/tests/ui/type-alias-enum-variants/self-in-enum-definition.rs
diff --git a/src/test/ui/type-alias-enum-variants/self-in-enum-definition.stderr b/tests/ui/type-alias-enum-variants/self-in-enum-definition.stderr
index 576fc6a4f..576fc6a4f 100644
--- a/src/test/ui/type-alias-enum-variants/self-in-enum-definition.stderr
+++ b/tests/ui/type-alias-enum-variants/self-in-enum-definition.stderr
diff --git a/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-pass.rs b/tests/ui/type-alias-enum-variants/type-alias-enum-variants-pass.rs
index 39677733d..39677733d 100644
--- a/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-pass.rs
+++ b/tests/ui/type-alias-enum-variants/type-alias-enum-variants-pass.rs
diff --git a/src/test/ui/type-alias-impl-trait/argument-types.rs b/tests/ui/type-alias-impl-trait/argument-types.rs
index 185207b98..185207b98 100644
--- a/src/test/ui/type-alias-impl-trait/argument-types.rs
+++ b/tests/ui/type-alias-impl-trait/argument-types.rs
diff --git a/src/test/ui/type-alias-impl-trait/assoc-projection-ice.rs b/tests/ui/type-alias-impl-trait/assoc-projection-ice.rs
index 703e3e869..703e3e869 100644
--- a/src/test/ui/type-alias-impl-trait/assoc-projection-ice.rs
+++ b/tests/ui/type-alias-impl-trait/assoc-projection-ice.rs
diff --git a/src/test/ui/type-alias-impl-trait/assoc-type-const.rs b/tests/ui/type-alias-impl-trait/assoc-type-const.rs
index 0ade36daf..0ade36daf 100644
--- a/src/test/ui/type-alias-impl-trait/assoc-type-const.rs
+++ b/tests/ui/type-alias-impl-trait/assoc-type-const.rs
diff --git a/src/test/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.rs b/tests/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.rs
index 3f34b00ec..3f34b00ec 100644
--- a/src/test/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.rs
+++ b/tests/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.rs
diff --git a/src/test/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.stderr b/tests/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.stderr
index e594dc577..e594dc577 100644
--- a/src/test/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.stderr
+++ b/tests/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.stderr
diff --git a/src/test/ui/type-alias-impl-trait/assoc-type-lifetime.rs b/tests/ui/type-alias-impl-trait/assoc-type-lifetime.rs
index 39f785d8c..39f785d8c 100644
--- a/src/test/ui/type-alias-impl-trait/assoc-type-lifetime.rs
+++ b/tests/ui/type-alias-impl-trait/assoc-type-lifetime.rs
diff --git a/src/test/ui/type-alias-impl-trait/associated-type-alias-impl-trait.rs b/tests/ui/type-alias-impl-trait/associated-type-alias-impl-trait.rs
index 42f07d49f..42f07d49f 100644
--- a/src/test/ui/type-alias-impl-trait/associated-type-alias-impl-trait.rs
+++ b/tests/ui/type-alias-impl-trait/associated-type-alias-impl-trait.rs
diff --git a/tests/ui/type-alias-impl-trait/associated-type-impl-trait-lifetime.rs b/tests/ui/type-alias-impl-trait/associated-type-impl-trait-lifetime.rs
new file mode 100644
index 000000000..962606508
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/associated-type-impl-trait-lifetime.rs
@@ -0,0 +1,20 @@
+//check-pass
+
+#![feature(type_alias_impl_trait)]
+
+trait Trait {
+    type Opaque1;
+    type Opaque2;
+    fn constrain(self);
+}
+
+impl<'a> Trait for &'a () {
+    type Opaque1 = impl Sized;
+    type Opaque2 = impl Sized + 'a;
+    fn constrain(self) {
+        let _: Self::Opaque1 = ();
+        let _: Self::Opaque2 = self;
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/type-alias-impl-trait/auto-trait-leakage.rs b/tests/ui/type-alias-impl-trait/auto-trait-leakage.rs
index a1584581e..a1584581e 100644
--- a/src/test/ui/type-alias-impl-trait/auto-trait-leakage.rs
+++ b/tests/ui/type-alias-impl-trait/auto-trait-leakage.rs
diff --git a/src/test/ui/type-alias-impl-trait/auto-trait-leakage2.rs b/tests/ui/type-alias-impl-trait/auto-trait-leakage2.rs
index fc89b0e87..fc89b0e87 100644
--- a/src/test/ui/type-alias-impl-trait/auto-trait-leakage2.rs
+++ b/tests/ui/type-alias-impl-trait/auto-trait-leakage2.rs
diff --git a/src/test/ui/type-alias-impl-trait/auto-trait-leakage2.stderr b/tests/ui/type-alias-impl-trait/auto-trait-leakage2.stderr
index d7247302d..d7247302d 100644
--- a/src/test/ui/type-alias-impl-trait/auto-trait-leakage2.stderr
+++ b/tests/ui/type-alias-impl-trait/auto-trait-leakage2.stderr
diff --git a/src/test/ui/type-alias-impl-trait/auto-trait-leakage3.rs b/tests/ui/type-alias-impl-trait/auto-trait-leakage3.rs
index 5fb7a9473..5fb7a9473 100644
--- a/src/test/ui/type-alias-impl-trait/auto-trait-leakage3.rs
+++ b/tests/ui/type-alias-impl-trait/auto-trait-leakage3.rs
diff --git a/src/test/ui/type-alias-impl-trait/auto-trait-leakage3.stderr b/tests/ui/type-alias-impl-trait/auto-trait-leakage3.stderr
index 1e9a45aac..1e9a45aac 100644
--- a/src/test/ui/type-alias-impl-trait/auto-trait-leakage3.stderr
+++ b/tests/ui/type-alias-impl-trait/auto-trait-leakage3.stderr
diff --git a/tests/ui/type-alias-impl-trait/auxiliary/coherence_cross_crate_trait_decl.rs b/tests/ui/type-alias-impl-trait/auxiliary/coherence_cross_crate_trait_decl.rs
new file mode 100644
index 000000000..712ed5543
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/auxiliary/coherence_cross_crate_trait_decl.rs
@@ -0,0 +1,9 @@
+pub trait SomeTrait {}
+
+impl SomeTrait for () {}
+
+// Adding this `impl` would cause errors in this crate's dependent,
+// so it would be a breaking change. We explicitly don't add this impl,
+// as the dependent crate already assumes this impl exists and thus already
+// does not compile.
+//impl SomeTrait for i32 {}
diff --git a/src/test/ui/type-alias-impl-trait/auxiliary/collect_hidden_types.rs b/tests/ui/type-alias-impl-trait/auxiliary/collect_hidden_types.rs
index 75d20a6fe..75d20a6fe 100644
--- a/src/test/ui/type-alias-impl-trait/auxiliary/collect_hidden_types.rs
+++ b/tests/ui/type-alias-impl-trait/auxiliary/collect_hidden_types.rs
diff --git a/src/test/ui/type-alias-impl-trait/auxiliary/cross_crate_ice.rs b/tests/ui/type-alias-impl-trait/auxiliary/cross_crate_ice.rs
index e7bca2231..e7bca2231 100644
--- a/src/test/ui/type-alias-impl-trait/auxiliary/cross_crate_ice.rs
+++ b/tests/ui/type-alias-impl-trait/auxiliary/cross_crate_ice.rs
diff --git a/src/test/ui/type-alias-impl-trait/auxiliary/cross_crate_ice2.rs b/tests/ui/type-alias-impl-trait/auxiliary/cross_crate_ice2.rs
index 119f7df1f..119f7df1f 100644
--- a/src/test/ui/type-alias-impl-trait/auxiliary/cross_crate_ice2.rs
+++ b/tests/ui/type-alias-impl-trait/auxiliary/cross_crate_ice2.rs
diff --git a/src/test/ui/type-alias-impl-trait/auxiliary/foreign-crate.rs b/tests/ui/type-alias-impl-trait/auxiliary/foreign-crate.rs
index 52802dd8f..52802dd8f 100644
--- a/src/test/ui/type-alias-impl-trait/auxiliary/foreign-crate.rs
+++ b/tests/ui/type-alias-impl-trait/auxiliary/foreign-crate.rs
diff --git a/src/test/ui/type-alias-impl-trait/bound_reduction.rs b/tests/ui/type-alias-impl-trait/bound_reduction.rs
index b9b50f0b7..b9b50f0b7 100644
--- a/src/test/ui/type-alias-impl-trait/bound_reduction.rs
+++ b/tests/ui/type-alias-impl-trait/bound_reduction.rs
diff --git a/tests/ui/type-alias-impl-trait/bound_reduction2.rs b/tests/ui/type-alias-impl-trait/bound_reduction2.rs
new file mode 100644
index 000000000..0bcc9e002
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/bound_reduction2.rs
@@ -0,0 +1,18 @@
+#![feature(type_alias_impl_trait)]
+
+fn main() {}
+
+trait TraitWithAssoc {
+    type Assoc;
+}
+
+type Foo<V> = impl Trait<V>;
+
+trait Trait<U> {}
+
+impl<W> Trait<W> for () {}
+
+fn foo_desugared<T: TraitWithAssoc>(_: T) -> Foo<T::Assoc> {
+    ()
+    //~^ ERROR expected generic type parameter, found `<T as TraitWithAssoc>::Assoc`
+}
diff --git a/tests/ui/type-alias-impl-trait/bound_reduction2.stderr b/tests/ui/type-alias-impl-trait/bound_reduction2.stderr
new file mode 100644
index 000000000..3c259bd9e
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/bound_reduction2.stderr
@@ -0,0 +1,12 @@
+error[E0792]: expected generic type parameter, found `<T as TraitWithAssoc>::Assoc`
+  --> $DIR/bound_reduction2.rs:16:5
+   |
+LL | type Foo<V> = impl Trait<V>;
+   |          - this generic parameter must be used with a generic type parameter
+...
+LL |     ()
+   |     ^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0792`.
diff --git a/src/test/ui/type-alias-impl-trait/bounds-are-checked-2.rs b/tests/ui/type-alias-impl-trait/bounds-are-checked-2.rs
index 55b4dc8dc..55b4dc8dc 100644
--- a/src/test/ui/type-alias-impl-trait/bounds-are-checked-2.rs
+++ b/tests/ui/type-alias-impl-trait/bounds-are-checked-2.rs
diff --git a/src/test/ui/type-alias-impl-trait/bounds-are-checked-2.stderr b/tests/ui/type-alias-impl-trait/bounds-are-checked-2.stderr
index 8678e9b33..8678e9b33 100644
--- a/src/test/ui/type-alias-impl-trait/bounds-are-checked-2.stderr
+++ b/tests/ui/type-alias-impl-trait/bounds-are-checked-2.stderr
diff --git a/src/test/ui/type-alias-impl-trait/bounds-are-checked.rs b/tests/ui/type-alias-impl-trait/bounds-are-checked.rs
index 83d22161e..83d22161e 100644
--- a/src/test/ui/type-alias-impl-trait/bounds-are-checked.rs
+++ b/tests/ui/type-alias-impl-trait/bounds-are-checked.rs
diff --git a/src/test/ui/type-alias-impl-trait/bounds-are-checked.stderr b/tests/ui/type-alias-impl-trait/bounds-are-checked.stderr
index 920eef11d..920eef11d 100644
--- a/src/test/ui/type-alias-impl-trait/bounds-are-checked.stderr
+++ b/tests/ui/type-alias-impl-trait/bounds-are-checked.stderr
diff --git a/src/test/ui/type-alias-impl-trait/closure_args.rs b/tests/ui/type-alias-impl-trait/closure_args.rs
index c5e7af81d..c5e7af81d 100644
--- a/src/test/ui/type-alias-impl-trait/closure_args.rs
+++ b/tests/ui/type-alias-impl-trait/closure_args.rs
diff --git a/src/test/ui/type-alias-impl-trait/closure_args2.rs b/tests/ui/type-alias-impl-trait/closure_args2.rs
index 82386c280..82386c280 100644
--- a/src/test/ui/type-alias-impl-trait/closure_args2.rs
+++ b/tests/ui/type-alias-impl-trait/closure_args2.rs
diff --git a/src/test/ui/type-alias-impl-trait/closure_parent_substs.rs b/tests/ui/type-alias-impl-trait/closure_parent_substs.rs
index 475f4724f..475f4724f 100644
--- a/src/test/ui/type-alias-impl-trait/closure_parent_substs.rs
+++ b/tests/ui/type-alias-impl-trait/closure_parent_substs.rs
diff --git a/src/test/ui/type-alias-impl-trait/closure_wf_outlives.rs b/tests/ui/type-alias-impl-trait/closure_wf_outlives.rs
index 53974dbb3..53974dbb3 100644
--- a/src/test/ui/type-alias-impl-trait/closure_wf_outlives.rs
+++ b/tests/ui/type-alias-impl-trait/closure_wf_outlives.rs
diff --git a/src/test/ui/type-alias-impl-trait/closure_wf_outlives.stderr b/tests/ui/type-alias-impl-trait/closure_wf_outlives.stderr
index ae6462bb6..ae6462bb6 100644
--- a/src/test/ui/type-alias-impl-trait/closure_wf_outlives.stderr
+++ b/tests/ui/type-alias-impl-trait/closure_wf_outlives.stderr
diff --git a/src/test/ui/type-alias-impl-trait/closures_in_branches.rs b/tests/ui/type-alias-impl-trait/closures_in_branches.rs
index 7bb490bbe..7bb490bbe 100644
--- a/src/test/ui/type-alias-impl-trait/closures_in_branches.rs
+++ b/tests/ui/type-alias-impl-trait/closures_in_branches.rs
diff --git a/src/test/ui/type-alias-impl-trait/closures_in_branches.stderr b/tests/ui/type-alias-impl-trait/closures_in_branches.stderr
index 48b7946ea..9cc15f14a 100644
--- a/src/test/ui/type-alias-impl-trait/closures_in_branches.stderr
+++ b/tests/ui/type-alias-impl-trait/closures_in_branches.stderr
@@ -6,8 +6,8 @@ LL |         |x| x.len()
    |
 help: consider giving this closure parameter an explicit type
    |
-LL |         |x: _| x.len()
-   |           +++
+LL |         |x: /* Type */| x.len()
+   |           ++++++++++++
 
 error[E0282]: type annotations needed
   --> $DIR/closures_in_branches.rs:21:10
@@ -17,8 +17,8 @@ LL |         |x| x.len()
    |
 help: consider giving this closure parameter an explicit type
    |
-LL |         |x: _| x.len()
-   |           +++
+LL |         |x: /* Type */| x.len()
+   |           ++++++++++++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/type-alias-impl-trait/coherence.rs b/tests/ui/type-alias-impl-trait/coherence.rs
index 077a31494..077a31494 100644
--- a/src/test/ui/type-alias-impl-trait/coherence.rs
+++ b/tests/ui/type-alias-impl-trait/coherence.rs
diff --git a/src/test/ui/type-alias-impl-trait/coherence.stderr b/tests/ui/type-alias-impl-trait/coherence.stderr
index c923eb08a..00b0dbbb5 100644
--- a/src/test/ui/type-alias-impl-trait/coherence.stderr
+++ b/tests/ui/type-alias-impl-trait/coherence.stderr
@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl<T> foreign_crate::ForeignTrait for AliasOfForeignType<T> {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---------------------
    | |                                       |
-   | |                                       `AliasOfForeignType<T>` is not defined in the current crate
+   | |                                       type alias impl trait is treated as if it were foreign, because its hidden type could be from a foreign crate
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
diff --git a/tests/ui/type-alias-impl-trait/coherence_cross_crate.rs b/tests/ui/type-alias-impl-trait/coherence_cross_crate.rs
new file mode 100644
index 000000000..a63e0a1ee
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/coherence_cross_crate.rs
@@ -0,0 +1,24 @@
+// aux-build: coherence_cross_crate_trait_decl.rs
+// This test ensures that adding an `impl SomeTrait for i32` within
+// `coherence_cross_crate_trait_decl` is not a breaking change, by
+// making sure that even without such an impl this test fails to compile.
+
+#![feature(type_alias_impl_trait)]
+
+extern crate coherence_cross_crate_trait_decl;
+
+use coherence_cross_crate_trait_decl::SomeTrait;
+
+trait OtherTrait {}
+
+type Alias = impl SomeTrait;
+
+fn constrain() -> Alias {
+    ()
+}
+
+impl OtherTrait for Alias {}
+impl OtherTrait for i32 {}
+//~^ ERROR: conflicting implementations of trait `OtherTrait` for type `Alias`
+
+fn main() {}
diff --git a/tests/ui/type-alias-impl-trait/coherence_cross_crate.stderr b/tests/ui/type-alias-impl-trait/coherence_cross_crate.stderr
new file mode 100644
index 000000000..63a3ce29c
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/coherence_cross_crate.stderr
@@ -0,0 +1,13 @@
+error[E0119]: conflicting implementations of trait `OtherTrait` for type `Alias`
+  --> $DIR/coherence_cross_crate.rs:21:1
+   |
+LL | impl OtherTrait for Alias {}
+   | ------------------------- first implementation here
+LL | impl OtherTrait for i32 {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Alias`
+   |
+   = note: upstream crates may add a new impl of trait `coherence_cross_crate_trait_decl::SomeTrait` for type `i32` in future versions
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/type-alias-impl-trait/coherence_generalization.rs b/tests/ui/type-alias-impl-trait/coherence_generalization.rs
index 5c9ad9498..5c9ad9498 100644
--- a/src/test/ui/type-alias-impl-trait/coherence_generalization.rs
+++ b/tests/ui/type-alias-impl-trait/coherence_generalization.rs
diff --git a/src/test/ui/type-alias-impl-trait/collect_hidden_types.rs b/tests/ui/type-alias-impl-trait/collect_hidden_types.rs
index e78f178e4..e78f178e4 100644
--- a/src/test/ui/type-alias-impl-trait/collect_hidden_types.rs
+++ b/tests/ui/type-alias-impl-trait/collect_hidden_types.rs
diff --git a/src/test/ui/type-alias-impl-trait/constrain_inputs.rs b/tests/ui/type-alias-impl-trait/constrain_inputs.rs
index 03fb64b7b..03fb64b7b 100644
--- a/src/test/ui/type-alias-impl-trait/constrain_inputs.rs
+++ b/tests/ui/type-alias-impl-trait/constrain_inputs.rs
diff --git a/src/test/ui/type-alias-impl-trait/constrain_inputs.stderr b/tests/ui/type-alias-impl-trait/constrain_inputs.stderr
index 93953fd06..93953fd06 100644
--- a/src/test/ui/type-alias-impl-trait/constrain_inputs.stderr
+++ b/tests/ui/type-alias-impl-trait/constrain_inputs.stderr
diff --git a/src/test/ui/type-alias-impl-trait/constrain_inputs_unsound.rs b/tests/ui/type-alias-impl-trait/constrain_inputs_unsound.rs
index 3bae0f173..3bae0f173 100644
--- a/src/test/ui/type-alias-impl-trait/constrain_inputs_unsound.rs
+++ b/tests/ui/type-alias-impl-trait/constrain_inputs_unsound.rs
diff --git a/src/test/ui/type-alias-impl-trait/constrain_inputs_unsound.stderr b/tests/ui/type-alias-impl-trait/constrain_inputs_unsound.stderr
index d5fc46cb1..d5fc46cb1 100644
--- a/src/test/ui/type-alias-impl-trait/constrain_inputs_unsound.stderr
+++ b/tests/ui/type-alias-impl-trait/constrain_inputs_unsound.stderr
diff --git a/src/test/ui/type-alias-impl-trait/cross_crate_ice.rs b/tests/ui/type-alias-impl-trait/cross_crate_ice.rs
index c30608176..c30608176 100644
--- a/src/test/ui/type-alias-impl-trait/cross_crate_ice.rs
+++ b/tests/ui/type-alias-impl-trait/cross_crate_ice.rs
diff --git a/src/test/ui/type-alias-impl-trait/cross_crate_ice2.rs b/tests/ui/type-alias-impl-trait/cross_crate_ice2.rs
index 3a7e49026..3a7e49026 100644
--- a/src/test/ui/type-alias-impl-trait/cross_crate_ice2.rs
+++ b/tests/ui/type-alias-impl-trait/cross_crate_ice2.rs
diff --git a/src/test/ui/type-alias-impl-trait/cross_inference.rs b/tests/ui/type-alias-impl-trait/cross_inference.rs
index dafaf40a6..dafaf40a6 100644
--- a/src/test/ui/type-alias-impl-trait/cross_inference.rs
+++ b/tests/ui/type-alias-impl-trait/cross_inference.rs
diff --git a/src/test/ui/type-alias-impl-trait/cross_inference_pattern_bug.rs b/tests/ui/type-alias-impl-trait/cross_inference_pattern_bug.rs
index 9a50c0f98..9a50c0f98 100644
--- a/src/test/ui/type-alias-impl-trait/cross_inference_pattern_bug.rs
+++ b/tests/ui/type-alias-impl-trait/cross_inference_pattern_bug.rs
diff --git a/src/test/ui/type-alias-impl-trait/cross_inference_pattern_bug_no_type.rs b/tests/ui/type-alias-impl-trait/cross_inference_pattern_bug_no_type.rs
index b929122a6..b929122a6 100644
--- a/src/test/ui/type-alias-impl-trait/cross_inference_pattern_bug_no_type.rs
+++ b/tests/ui/type-alias-impl-trait/cross_inference_pattern_bug_no_type.rs
diff --git a/src/test/ui/type-alias-impl-trait/cross_inference_rpit.rs b/tests/ui/type-alias-impl-trait/cross_inference_rpit.rs
index f6affbf17..f6affbf17 100644
--- a/src/test/ui/type-alias-impl-trait/cross_inference_rpit.rs
+++ b/tests/ui/type-alias-impl-trait/cross_inference_rpit.rs
diff --git a/src/test/ui/type-alias-impl-trait/declared_but_never_defined.rs b/tests/ui/type-alias-impl-trait/declared_but_never_defined.rs
index 6febd0715..6febd0715 100644
--- a/src/test/ui/type-alias-impl-trait/declared_but_never_defined.rs
+++ b/tests/ui/type-alias-impl-trait/declared_but_never_defined.rs
diff --git a/src/test/ui/type-alias-impl-trait/declared_but_never_defined.stderr b/tests/ui/type-alias-impl-trait/declared_but_never_defined.stderr
index 60bc24320..60bc24320 100644
--- a/src/test/ui/type-alias-impl-trait/declared_but_never_defined.stderr
+++ b/tests/ui/type-alias-impl-trait/declared_but_never_defined.stderr
diff --git a/src/test/ui/type-alias-impl-trait/declared_but_not_defined_in_scope.rs b/tests/ui/type-alias-impl-trait/declared_but_not_defined_in_scope.rs
index 5bda5f0fc..5bda5f0fc 100644
--- a/src/test/ui/type-alias-impl-trait/declared_but_not_defined_in_scope.rs
+++ b/tests/ui/type-alias-impl-trait/declared_but_not_defined_in_scope.rs
diff --git a/src/test/ui/type-alias-impl-trait/declared_but_not_defined_in_scope.stderr b/tests/ui/type-alias-impl-trait/declared_but_not_defined_in_scope.stderr
index fbfa0ccf1..fbfa0ccf1 100644
--- a/src/test/ui/type-alias-impl-trait/declared_but_not_defined_in_scope.stderr
+++ b/tests/ui/type-alias-impl-trait/declared_but_not_defined_in_scope.stderr
diff --git a/src/test/ui/type-alias-impl-trait/defining-use-submodule.rs b/tests/ui/type-alias-impl-trait/defining-use-submodule.rs
index 8b51f5571..8b51f5571 100644
--- a/src/test/ui/type-alias-impl-trait/defining-use-submodule.rs
+++ b/tests/ui/type-alias-impl-trait/defining-use-submodule.rs
diff --git a/tests/ui/type-alias-impl-trait/destructuring.rs b/tests/ui/type-alias-impl-trait/destructuring.rs
new file mode 100644
index 000000000..b752e5838
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/destructuring.rs
@@ -0,0 +1,10 @@
+#![feature(type_alias_impl_trait)]
+
+// check-pass
+
+// issue: https://github.com/rust-lang/rust/issues/104551
+
+fn main() {
+    type T = impl Sized;
+    let (_a, _b): T = (1u32, 2u32);
+}
diff --git a/src/test/ui/type-alias-impl-trait/different_defining_uses.rs b/tests/ui/type-alias-impl-trait/different_defining_uses.rs
index 4505c4d95..4505c4d95 100644
--- a/src/test/ui/type-alias-impl-trait/different_defining_uses.rs
+++ b/tests/ui/type-alias-impl-trait/different_defining_uses.rs
diff --git a/src/test/ui/type-alias-impl-trait/different_defining_uses.stderr b/tests/ui/type-alias-impl-trait/different_defining_uses.stderr
index a8b4cd7af..a8b4cd7af 100644
--- a/src/test/ui/type-alias-impl-trait/different_defining_uses.stderr
+++ b/tests/ui/type-alias-impl-trait/different_defining_uses.stderr
diff --git a/src/test/ui/type-alias-impl-trait/different_defining_uses_never_type.rs b/tests/ui/type-alias-impl-trait/different_defining_uses_never_type.rs
index 0b8157fe3..0b8157fe3 100644
--- a/src/test/ui/type-alias-impl-trait/different_defining_uses_never_type.rs
+++ b/tests/ui/type-alias-impl-trait/different_defining_uses_never_type.rs
diff --git a/src/test/ui/type-alias-impl-trait/different_defining_uses_never_type.stderr b/tests/ui/type-alias-impl-trait/different_defining_uses_never_type.stderr
index 09dadb0af..09dadb0af 100644
--- a/src/test/ui/type-alias-impl-trait/different_defining_uses_never_type.stderr
+++ b/tests/ui/type-alias-impl-trait/different_defining_uses_never_type.stderr
diff --git a/src/test/ui/type-alias-impl-trait/different_defining_uses_never_type2.rs b/tests/ui/type-alias-impl-trait/different_defining_uses_never_type2.rs
index 8549687ea..8549687ea 100644
--- a/src/test/ui/type-alias-impl-trait/different_defining_uses_never_type2.rs
+++ b/tests/ui/type-alias-impl-trait/different_defining_uses_never_type2.rs
diff --git a/src/test/ui/type-alias-impl-trait/different_defining_uses_never_type3.rs b/tests/ui/type-alias-impl-trait/different_defining_uses_never_type3.rs
index bc827a8f2..bc827a8f2 100644
--- a/src/test/ui/type-alias-impl-trait/different_defining_uses_never_type3.rs
+++ b/tests/ui/type-alias-impl-trait/different_defining_uses_never_type3.rs
diff --git a/src/test/ui/type-alias-impl-trait/different_defining_uses_never_type3.stderr b/tests/ui/type-alias-impl-trait/different_defining_uses_never_type3.stderr
index 146a57cbb..146a57cbb 100644
--- a/src/test/ui/type-alias-impl-trait/different_defining_uses_never_type3.stderr
+++ b/tests/ui/type-alias-impl-trait/different_defining_uses_never_type3.stderr
diff --git a/src/test/ui/type-alias-impl-trait/different_lifetimes_defining_uses.rs b/tests/ui/type-alias-impl-trait/different_lifetimes_defining_uses.rs
index 5f75fdc71..5f75fdc71 100644
--- a/src/test/ui/type-alias-impl-trait/different_lifetimes_defining_uses.rs
+++ b/tests/ui/type-alias-impl-trait/different_lifetimes_defining_uses.rs
diff --git a/src/test/ui/type-alias-impl-trait/different_lifetimes_defining_uses.stderr b/tests/ui/type-alias-impl-trait/different_lifetimes_defining_uses.stderr
index 546598e8a..546598e8a 100644
--- a/src/test/ui/type-alias-impl-trait/different_lifetimes_defining_uses.stderr
+++ b/tests/ui/type-alias-impl-trait/different_lifetimes_defining_uses.stderr
diff --git a/src/test/ui/type-alias-impl-trait/fallback.rs b/tests/ui/type-alias-impl-trait/fallback.rs
index d8cf7d71f..d8cf7d71f 100644
--- a/src/test/ui/type-alias-impl-trait/fallback.rs
+++ b/tests/ui/type-alias-impl-trait/fallback.rs
diff --git a/src/test/ui/type-alias-impl-trait/fallback.stderr b/tests/ui/type-alias-impl-trait/fallback.stderr
index e767bfdb0..e767bfdb0 100644
--- a/src/test/ui/type-alias-impl-trait/fallback.stderr
+++ b/tests/ui/type-alias-impl-trait/fallback.stderr
diff --git a/src/test/ui/type-alias-impl-trait/field-types.rs b/tests/ui/type-alias-impl-trait/field-types.rs
index d99ed5812..d99ed5812 100644
--- a/src/test/ui/type-alias-impl-trait/field-types.rs
+++ b/tests/ui/type-alias-impl-trait/field-types.rs
diff --git a/src/test/ui/type-alias-impl-trait/future.rs b/tests/ui/type-alias-impl-trait/future.rs
index 56323216e..56323216e 100644
--- a/src/test/ui/type-alias-impl-trait/future.rs
+++ b/tests/ui/type-alias-impl-trait/future.rs
diff --git a/src/test/ui/type-alias-impl-trait/future.stderr b/tests/ui/type-alias-impl-trait/future.stderr
index 7e76c120a..7e76c120a 100644
--- a/src/test/ui/type-alias-impl-trait/future.stderr
+++ b/tests/ui/type-alias-impl-trait/future.stderr
diff --git a/src/test/ui/type-alias-impl-trait/generic_different_defining_uses.rs b/tests/ui/type-alias-impl-trait/generic_different_defining_uses.rs
index 8b683ad28..8b683ad28 100644
--- a/src/test/ui/type-alias-impl-trait/generic_different_defining_uses.rs
+++ b/tests/ui/type-alias-impl-trait/generic_different_defining_uses.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_different_defining_uses.stderr b/tests/ui/type-alias-impl-trait/generic_different_defining_uses.stderr
index 47ac33462..47ac33462 100644
--- a/src/test/ui/type-alias-impl-trait/generic_different_defining_uses.stderr
+++ b/tests/ui/type-alias-impl-trait/generic_different_defining_uses.stderr
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_lifetime_param.rs b/tests/ui/type-alias-impl-trait/generic_duplicate_lifetime_param.rs
index 9d938a616..9d938a616 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_lifetime_param.rs
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_lifetime_param.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_lifetime_param.stderr b/tests/ui/type-alias-impl-trait/generic_duplicate_lifetime_param.stderr
index 72e1ef4b4..72e1ef4b4 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_lifetime_param.stderr
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_lifetime_param.stderr
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use.rs b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use.rs
index 80462f8ac..80462f8ac 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use.rs
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use.stderr b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use.stderr
index 98e4bfea1..98e4bfea1 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use.stderr
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use.stderr
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use10.rs b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use10.rs
index c17d595db..c17d595db 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use10.rs
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use10.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use2.rs b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use2.rs
index 201535efe..201535efe 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use2.rs
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use2.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use2.stderr b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use2.stderr
index 3dbfff745..3dbfff745 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use2.stderr
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use2.stderr
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.rs b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use3.rs
index e7a25fc72..e7a25fc72 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.rs
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use3.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.stderr b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use3.stderr
index 7bec38220..7bec38220 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.stderr
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use3.stderr
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use4.rs b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use4.rs
index d1e5a0f01..d1e5a0f01 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use4.rs
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use4.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use4.stderr b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use4.stderr
index 21a5369d9..21a5369d9 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use4.stderr
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use4.stderr
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use5.rs b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use5.rs
index 3bd1dda63..3bd1dda63 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use5.rs
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use5.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use5.stderr b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use5.stderr
index 586ea8234..586ea8234 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use5.stderr
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use5.stderr
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use6.rs b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use6.rs
index 5120925e5..5120925e5 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use6.rs
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use6.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use6.stderr b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use6.stderr
index cb162d382..cb162d382 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use6.stderr
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use6.stderr
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use7.rs b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use7.rs
index feebf81ee..feebf81ee 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use7.rs
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use7.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use8.rs b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use8.rs
index 3a4b5047b..3a4b5047b 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use8.rs
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use8.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use8.stderr b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use8.stderr
index 14cbfb380..14cbfb380 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use8.stderr
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use8.stderr
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use9.rs b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use9.rs
index 6afcdfe4d..6afcdfe4d 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use9.rs
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use9.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use9.stderr b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use9.stderr
index 722693e42..722693e42 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use9.stderr
+++ b/tests/ui/type-alias-impl-trait/generic_duplicate_param_use9.stderr
diff --git a/src/test/ui/type-alias-impl-trait/generic_lifetime_param.rs b/tests/ui/type-alias-impl-trait/generic_lifetime_param.rs
index 106efefba..106efefba 100644
--- a/src/test/ui/type-alias-impl-trait/generic_lifetime_param.rs
+++ b/tests/ui/type-alias-impl-trait/generic_lifetime_param.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_nondefining_use.rs b/tests/ui/type-alias-impl-trait/generic_nondefining_use.rs
index f39741a6a..f5045d382 100644
--- a/src/test/ui/type-alias-impl-trait/generic_nondefining_use.rs
+++ b/tests/ui/type-alias-impl-trait/generic_nondefining_use.rs
@@ -10,12 +10,11 @@ type OneLifetime<'a> = impl Debug;
 
 type OneConst<const X: usize> = impl Debug;
 
-
 // Not defining uses, because they doesn't define *all* possible generics.
 
 fn concrete_ty() -> OneTy<u32> {
     5u32
-    //~^ ERROR non-defining opaque type use in defining scope
+    //~^ ERROR expected generic type parameter, found `u32`
 }
 
 fn concrete_lifetime() -> OneLifetime<'static> {
@@ -25,5 +24,5 @@ fn concrete_lifetime() -> OneLifetime<'static> {
 
 fn concrete_const() -> OneConst<{ 123 }> {
     7u32
-    //~^ ERROR non-defining opaque type use in defining scope
+    //~^ ERROR expected generic constant parameter, found `123`
 }
diff --git a/tests/ui/type-alias-impl-trait/generic_nondefining_use.stderr b/tests/ui/type-alias-impl-trait/generic_nondefining_use.stderr
new file mode 100644
index 000000000..564648630
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/generic_nondefining_use.stderr
@@ -0,0 +1,30 @@
+error[E0792]: expected generic type parameter, found `u32`
+  --> $DIR/generic_nondefining_use.rs:16:5
+   |
+LL | type OneTy<T> = impl Debug;
+   |            - this generic parameter must be used with a generic type parameter
+...
+LL |     5u32
+   |     ^^^^
+
+error: non-defining opaque type use in defining scope
+  --> $DIR/generic_nondefining_use.rs:21:5
+   |
+LL | type OneLifetime<'a> = impl Debug;
+   |                  -- cannot use static lifetime; use a bound lifetime instead or remove the lifetime parameter from the opaque type
+...
+LL |     6u32
+   |     ^^^^
+
+error[E0792]: expected generic constant parameter, found `123`
+  --> $DIR/generic_nondefining_use.rs:26:5
+   |
+LL | type OneConst<const X: usize> = impl Debug;
+   |               -------------- this generic parameter must be used with a generic constant parameter
+...
+LL |     7u32
+   |     ^^^^
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0792`.
diff --git a/src/test/ui/type-alias-impl-trait/generic_not_used.rs b/tests/ui/type-alias-impl-trait/generic_not_used.rs
index c70f473cf..c70f473cf 100644
--- a/src/test/ui/type-alias-impl-trait/generic_not_used.rs
+++ b/tests/ui/type-alias-impl-trait/generic_not_used.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_not_used.stderr b/tests/ui/type-alias-impl-trait/generic_not_used.stderr
index fd720239a..fd720239a 100644
--- a/src/test/ui/type-alias-impl-trait/generic_not_used.stderr
+++ b/tests/ui/type-alias-impl-trait/generic_not_used.stderr
diff --git a/src/test/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.rs b/tests/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.rs
index cb9077647..d3e169a70 100644
--- a/src/test/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.rs
+++ b/tests/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.rs
@@ -4,7 +4,7 @@ fn main() {
     let y = 42;
     let x = wrong_generic(&y);
     let z: i32 = x;
-    //~^ ERROR non-defining opaque type use
+    //~^ ERROR expected generic type parameter, found `&'static i32
 }
 
 type WrongGeneric<T> = impl 'static;
diff --git a/tests/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.stderr b/tests/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.stderr
new file mode 100644
index 000000000..19115fd28
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.stderr
@@ -0,0 +1,30 @@
+error: at least one trait must be specified
+  --> $DIR/generic_type_does_not_live_long_enough.rs:10:24
+   |
+LL | type WrongGeneric<T> = impl 'static;
+   |                        ^^^^^^^^^^^^
+
+error[E0792]: expected generic type parameter, found `&'static i32`
+  --> $DIR/generic_type_does_not_live_long_enough.rs:6:18
+   |
+LL |     let z: i32 = x;
+   |                  ^
+...
+LL | type WrongGeneric<T> = impl 'static;
+   |                   - this generic parameter must be used with a generic type parameter
+
+error[E0310]: the parameter type `T` may not live long enough
+  --> $DIR/generic_type_does_not_live_long_enough.rs:14:5
+   |
+LL |     t
+   |     ^ ...so that the type `T` will meet its required lifetime bounds
+   |
+help: consider adding an explicit lifetime bound...
+   |
+LL | fn wrong_generic<T: 'static>(t: T) -> WrongGeneric<T> {
+   |                   +++++++++
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0310, E0792.
+For more information about an error, try `rustc --explain E0310`.
diff --git a/src/test/ui/type-alias-impl-trait/generic_underconstrained.rs b/tests/ui/type-alias-impl-trait/generic_underconstrained.rs
index d87a25aad..d87a25aad 100644
--- a/src/test/ui/type-alias-impl-trait/generic_underconstrained.rs
+++ b/tests/ui/type-alias-impl-trait/generic_underconstrained.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_underconstrained.stderr b/tests/ui/type-alias-impl-trait/generic_underconstrained.stderr
index c73288329..c73288329 100644
--- a/src/test/ui/type-alias-impl-trait/generic_underconstrained.stderr
+++ b/tests/ui/type-alias-impl-trait/generic_underconstrained.stderr
diff --git a/src/test/ui/type-alias-impl-trait/generic_underconstrained2.rs b/tests/ui/type-alias-impl-trait/generic_underconstrained2.rs
index 8adc0bf32..8adc0bf32 100644
--- a/src/test/ui/type-alias-impl-trait/generic_underconstrained2.rs
+++ b/tests/ui/type-alias-impl-trait/generic_underconstrained2.rs
diff --git a/src/test/ui/type-alias-impl-trait/generic_underconstrained2.stderr b/tests/ui/type-alias-impl-trait/generic_underconstrained2.stderr
index d77d978aa..d77d978aa 100644
--- a/src/test/ui/type-alias-impl-trait/generic_underconstrained2.stderr
+++ b/tests/ui/type-alias-impl-trait/generic_underconstrained2.stderr
diff --git a/src/test/ui/type-alias-impl-trait/impl-with-unconstrained-param.rs b/tests/ui/type-alias-impl-trait/impl-with-unconstrained-param.rs
index 851c2f66c..851c2f66c 100644
--- a/src/test/ui/type-alias-impl-trait/impl-with-unconstrained-param.rs
+++ b/tests/ui/type-alias-impl-trait/impl-with-unconstrained-param.rs
diff --git a/src/test/ui/type-alias-impl-trait/impl-with-unconstrained-param.stderr b/tests/ui/type-alias-impl-trait/impl-with-unconstrained-param.stderr
index 8cf8fb1d1..8cf8fb1d1 100644
--- a/src/test/ui/type-alias-impl-trait/impl-with-unconstrained-param.stderr
+++ b/tests/ui/type-alias-impl-trait/impl-with-unconstrained-param.stderr
diff --git a/src/test/ui/type-alias-impl-trait/impl_trait_for_generic_tait.rs b/tests/ui/type-alias-impl-trait/impl_trait_for_generic_tait.rs
index 0efbd1c2b..0efbd1c2b 100644
--- a/src/test/ui/type-alias-impl-trait/impl_trait_for_generic_tait.rs
+++ b/tests/ui/type-alias-impl-trait/impl_trait_for_generic_tait.rs
diff --git a/src/test/ui/type-alias-impl-trait/impl_trait_for_same_tait.rs b/tests/ui/type-alias-impl-trait/impl_trait_for_same_tait.rs
index 3f1a9d12b..3f1a9d12b 100644
--- a/src/test/ui/type-alias-impl-trait/impl_trait_for_same_tait.rs
+++ b/tests/ui/type-alias-impl-trait/impl_trait_for_same_tait.rs
diff --git a/src/test/ui/type-alias-impl-trait/impl_trait_for_same_tait.stderr b/tests/ui/type-alias-impl-trait/impl_trait_for_same_tait.stderr
index aaf75cc3d..aaf75cc3d 100644
--- a/src/test/ui/type-alias-impl-trait/impl_trait_for_same_tait.stderr
+++ b/tests/ui/type-alias-impl-trait/impl_trait_for_same_tait.stderr
diff --git a/src/test/ui/type-alias-impl-trait/impl_trait_for_tait.rs b/tests/ui/type-alias-impl-trait/impl_trait_for_tait.rs
index 9f32c5d88..9f32c5d88 100644
--- a/src/test/ui/type-alias-impl-trait/impl_trait_for_tait.rs
+++ b/tests/ui/type-alias-impl-trait/impl_trait_for_tait.rs
diff --git a/src/test/ui/type-alias-impl-trait/impl_trait_for_tait_bound.rs b/tests/ui/type-alias-impl-trait/impl_trait_for_tait_bound.rs
index 8ec20acef..8ec20acef 100644
--- a/src/test/ui/type-alias-impl-trait/impl_trait_for_tait_bound.rs
+++ b/tests/ui/type-alias-impl-trait/impl_trait_for_tait_bound.rs
diff --git a/src/test/ui/type-alias-impl-trait/impl_trait_for_tait_bound.stderr b/tests/ui/type-alias-impl-trait/impl_trait_for_tait_bound.stderr
index 1c83105a1..1c83105a1 100644
--- a/src/test/ui/type-alias-impl-trait/impl_trait_for_tait_bound.stderr
+++ b/tests/ui/type-alias-impl-trait/impl_trait_for_tait_bound.stderr
diff --git a/src/test/ui/type-alias-impl-trait/impl_trait_for_tait_bound2.rs b/tests/ui/type-alias-impl-trait/impl_trait_for_tait_bound2.rs
index a4b8c2d19..a4b8c2d19 100644
--- a/src/test/ui/type-alias-impl-trait/impl_trait_for_tait_bound2.rs
+++ b/tests/ui/type-alias-impl-trait/impl_trait_for_tait_bound2.rs
diff --git a/src/test/ui/type-alias-impl-trait/impl_trait_for_tait_bound2.stderr b/tests/ui/type-alias-impl-trait/impl_trait_for_tait_bound2.stderr
index a6440f02c..a6440f02c 100644
--- a/src/test/ui/type-alias-impl-trait/impl_trait_for_tait_bound2.stderr
+++ b/tests/ui/type-alias-impl-trait/impl_trait_for_tait_bound2.stderr
diff --git a/src/test/ui/type-alias-impl-trait/implied_bounds.rs b/tests/ui/type-alias-impl-trait/implied_bounds.rs
index 53cbf8d22..53cbf8d22 100644
--- a/src/test/ui/type-alias-impl-trait/implied_bounds.rs
+++ b/tests/ui/type-alias-impl-trait/implied_bounds.rs
diff --git a/src/test/ui/type-alias-impl-trait/implied_bounds.stderr b/tests/ui/type-alias-impl-trait/implied_bounds.stderr
index 6f11b6663..6f11b6663 100644
--- a/src/test/ui/type-alias-impl-trait/implied_bounds.stderr
+++ b/tests/ui/type-alias-impl-trait/implied_bounds.stderr
diff --git a/src/test/ui/type-alias-impl-trait/implied_bounds2.rs b/tests/ui/type-alias-impl-trait/implied_bounds2.rs
index b4c4c013c..b4c4c013c 100644
--- a/src/test/ui/type-alias-impl-trait/implied_bounds2.rs
+++ b/tests/ui/type-alias-impl-trait/implied_bounds2.rs
diff --git a/src/test/ui/type-alias-impl-trait/implied_bounds3.rs b/tests/ui/type-alias-impl-trait/implied_bounds3.rs
index e39c61328..e39c61328 100644
--- a/src/test/ui/type-alias-impl-trait/implied_bounds3.rs
+++ b/tests/ui/type-alias-impl-trait/implied_bounds3.rs
diff --git a/src/test/ui/type-alias-impl-trait/implied_bounds_closure.rs b/tests/ui/type-alias-impl-trait/implied_bounds_closure.rs
index 4cf35f951..4cf35f951 100644
--- a/src/test/ui/type-alias-impl-trait/implied_bounds_closure.rs
+++ b/tests/ui/type-alias-impl-trait/implied_bounds_closure.rs
diff --git a/src/test/ui/type-alias-impl-trait/implied_bounds_closure.stderr b/tests/ui/type-alias-impl-trait/implied_bounds_closure.stderr
index 151564c3b..151564c3b 100644
--- a/src/test/ui/type-alias-impl-trait/implied_bounds_closure.stderr
+++ b/tests/ui/type-alias-impl-trait/implied_bounds_closure.stderr
diff --git a/src/test/ui/type-alias-impl-trait/implied_bounds_from_types.rs b/tests/ui/type-alias-impl-trait/implied_bounds_from_types.rs
index 8023cd24f..8023cd24f 100644
--- a/src/test/ui/type-alias-impl-trait/implied_bounds_from_types.rs
+++ b/tests/ui/type-alias-impl-trait/implied_bounds_from_types.rs
diff --git a/src/test/ui/type-alias-impl-trait/implied_bounds_from_types.stderr b/tests/ui/type-alias-impl-trait/implied_bounds_from_types.stderr
index cbc5e6073..cbc5e6073 100644
--- a/src/test/ui/type-alias-impl-trait/implied_bounds_from_types.stderr
+++ b/tests/ui/type-alias-impl-trait/implied_bounds_from_types.stderr
diff --git a/src/test/ui/type-alias-impl-trait/implied_lifetime_wf_check.rs b/tests/ui/type-alias-impl-trait/implied_lifetime_wf_check.rs
index b6a7264a5..b6a7264a5 100644
--- a/src/test/ui/type-alias-impl-trait/implied_lifetime_wf_check.rs
+++ b/tests/ui/type-alias-impl-trait/implied_lifetime_wf_check.rs
diff --git a/src/test/ui/type-alias-impl-trait/implied_lifetime_wf_check3.rs b/tests/ui/type-alias-impl-trait/implied_lifetime_wf_check3.rs
index 07f825aea..07f825aea 100644
--- a/src/test/ui/type-alias-impl-trait/implied_lifetime_wf_check3.rs
+++ b/tests/ui/type-alias-impl-trait/implied_lifetime_wf_check3.rs
diff --git a/src/test/ui/type-alias-impl-trait/implied_lifetime_wf_check3.stderr b/tests/ui/type-alias-impl-trait/implied_lifetime_wf_check3.stderr
index 887620a4d..887620a4d 100644
--- a/src/test/ui/type-alias-impl-trait/implied_lifetime_wf_check3.stderr
+++ b/tests/ui/type-alias-impl-trait/implied_lifetime_wf_check3.stderr
diff --git a/src/test/ui/type-alias-impl-trait/implied_lifetime_wf_check4_static.rs b/tests/ui/type-alias-impl-trait/implied_lifetime_wf_check4_static.rs
index ac32dbde0..ac32dbde0 100644
--- a/src/test/ui/type-alias-impl-trait/implied_lifetime_wf_check4_static.rs
+++ b/tests/ui/type-alias-impl-trait/implied_lifetime_wf_check4_static.rs
diff --git a/src/test/ui/type-alias-impl-trait/implied_lifetime_wf_check4_static.stderr b/tests/ui/type-alias-impl-trait/implied_lifetime_wf_check4_static.stderr
index 47bc31e78..47bc31e78 100644
--- a/src/test/ui/type-alias-impl-trait/implied_lifetime_wf_check4_static.stderr
+++ b/tests/ui/type-alias-impl-trait/implied_lifetime_wf_check4_static.stderr
diff --git a/src/test/ui/type-alias-impl-trait/imply_bounds_from_bounds.rs b/tests/ui/type-alias-impl-trait/imply_bounds_from_bounds.rs
index ee9bce15d..ee9bce15d 100644
--- a/src/test/ui/type-alias-impl-trait/imply_bounds_from_bounds.rs
+++ b/tests/ui/type-alias-impl-trait/imply_bounds_from_bounds.rs
diff --git a/src/test/ui/type-alias-impl-trait/imply_bounds_from_bounds_param.rs b/tests/ui/type-alias-impl-trait/imply_bounds_from_bounds_param.rs
index ae21a9134..ae21a9134 100644
--- a/src/test/ui/type-alias-impl-trait/imply_bounds_from_bounds_param.rs
+++ b/tests/ui/type-alias-impl-trait/imply_bounds_from_bounds_param.rs
diff --git a/src/test/ui/type-alias-impl-trait/imply_bounds_from_bounds_param.stderr b/tests/ui/type-alias-impl-trait/imply_bounds_from_bounds_param.stderr
index 0ed8a703b..0ed8a703b 100644
--- a/src/test/ui/type-alias-impl-trait/imply_bounds_from_bounds_param.stderr
+++ b/tests/ui/type-alias-impl-trait/imply_bounds_from_bounds_param.stderr
diff --git a/src/test/ui/type-alias-impl-trait/incoherent-assoc-imp-trait.rs b/tests/ui/type-alias-impl-trait/incoherent-assoc-imp-trait.rs
index 685d76ee3..685d76ee3 100644
--- a/src/test/ui/type-alias-impl-trait/incoherent-assoc-imp-trait.rs
+++ b/tests/ui/type-alias-impl-trait/incoherent-assoc-imp-trait.rs
diff --git a/src/test/ui/type-alias-impl-trait/incoherent-assoc-imp-trait.stderr b/tests/ui/type-alias-impl-trait/incoherent-assoc-imp-trait.stderr
index b93ea955c..b93ea955c 100644
--- a/src/test/ui/type-alias-impl-trait/incoherent-assoc-imp-trait.stderr
+++ b/tests/ui/type-alias-impl-trait/incoherent-assoc-imp-trait.stderr
diff --git a/src/test/ui/type-alias-impl-trait/incomplete-inference.rs b/tests/ui/type-alias-impl-trait/incomplete-inference.rs
index 4c8bf2cfc..4c8bf2cfc 100644
--- a/src/test/ui/type-alias-impl-trait/incomplete-inference.rs
+++ b/tests/ui/type-alias-impl-trait/incomplete-inference.rs
diff --git a/src/test/ui/type-alias-impl-trait/incomplete-inference.stderr b/tests/ui/type-alias-impl-trait/incomplete-inference.stderr
index 9a0e71b4e..9a0e71b4e 100644
--- a/src/test/ui/type-alias-impl-trait/incomplete-inference.stderr
+++ b/tests/ui/type-alias-impl-trait/incomplete-inference.stderr
diff --git a/src/test/ui/type-alias-impl-trait/inference-cycle.rs b/tests/ui/type-alias-impl-trait/inference-cycle.rs
index 79caddf79..79caddf79 100644
--- a/src/test/ui/type-alias-impl-trait/inference-cycle.rs
+++ b/tests/ui/type-alias-impl-trait/inference-cycle.rs
diff --git a/src/test/ui/type-alias-impl-trait/inference-cycle.stderr b/tests/ui/type-alias-impl-trait/inference-cycle.stderr
index b9d646b92..b9d646b92 100644
--- a/src/test/ui/type-alias-impl-trait/inference-cycle.stderr
+++ b/tests/ui/type-alias-impl-trait/inference-cycle.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-101750.rs b/tests/ui/type-alias-impl-trait/issue-101750.rs
index f564f4fa7..f564f4fa7 100644
--- a/src/test/ui/type-alias-impl-trait/issue-101750.rs
+++ b/tests/ui/type-alias-impl-trait/issue-101750.rs
diff --git a/tests/ui/type-alias-impl-trait/issue-104817.rs b/tests/ui/type-alias-impl-trait/issue-104817.rs
new file mode 100644
index 000000000..0d3bace4d
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/issue-104817.rs
@@ -0,0 +1,19 @@
+#![feature(type_alias_impl_trait)]
+#![cfg_attr(specialized, feature(specialization))]
+#![allow(incomplete_features)]
+
+// revisions: stock specialized
+// [specialized]check-pass
+
+trait OpaqueTrait {}
+impl<T> OpaqueTrait for T {}
+type OpaqueType = impl OpaqueTrait;
+fn mk_opaque() -> OpaqueType {
+    || 0
+}
+trait AnotherTrait {}
+impl<T: Send> AnotherTrait for T {}
+impl AnotherTrait for OpaqueType {}
+//[stock]~^ conflicting implementations of trait `AnotherTrait` for type `OpaqueType`
+
+fn main() {}
diff --git a/tests/ui/type-alias-impl-trait/issue-104817.stock.stderr b/tests/ui/type-alias-impl-trait/issue-104817.stock.stderr
new file mode 100644
index 000000000..47bae8bd1
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/issue-104817.stock.stderr
@@ -0,0 +1,11 @@
+error[E0119]: conflicting implementations of trait `AnotherTrait` for type `OpaqueType`
+  --> $DIR/issue-104817.rs:16:1
+   |
+LL | impl<T: Send> AnotherTrait for T {}
+   | -------------------------------- first implementation here
+LL | impl AnotherTrait for OpaqueType {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `OpaqueType`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/type-alias-impl-trait/issue-52843-closure-constrain.rs b/tests/ui/type-alias-impl-trait/issue-52843-closure-constrain.rs
index 50eeff0b1..50eeff0b1 100644
--- a/src/test/ui/type-alias-impl-trait/issue-52843-closure-constrain.rs
+++ b/tests/ui/type-alias-impl-trait/issue-52843-closure-constrain.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-52843-closure-constrain.stderr b/tests/ui/type-alias-impl-trait/issue-52843-closure-constrain.stderr
index 4c5fd2255..4c5fd2255 100644
--- a/src/test/ui/type-alias-impl-trait/issue-52843-closure-constrain.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-52843-closure-constrain.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-52843.rs b/tests/ui/type-alias-impl-trait/issue-52843.rs
index 159d3ccd2..159d3ccd2 100644
--- a/src/test/ui/type-alias-impl-trait/issue-52843.rs
+++ b/tests/ui/type-alias-impl-trait/issue-52843.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-52843.stderr b/tests/ui/type-alias-impl-trait/issue-52843.stderr
index acd40f980..acd40f980 100644
--- a/src/test/ui/type-alias-impl-trait/issue-52843.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-52843.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-53092-2.rs b/tests/ui/type-alias-impl-trait/issue-53092-2.rs
index 438ac35fd..057930f0c 100644
--- a/src/test/ui/type-alias-impl-trait/issue-53092-2.rs
+++ b/tests/ui/type-alias-impl-trait/issue-53092-2.rs
@@ -4,7 +4,6 @@
 type Bug<T, U> = impl Fn(T) -> U + Copy; //~ ERROR cycle detected
 
 const CONST_BUG: Bug<u8, ()> = unsafe { std::mem::transmute(|_: u8| ()) };
-//~^ ERROR: cannot transmute
 
 fn make_bug<T, U: From<T>>() -> Bug<T, U> {
     |x| x.into() //~ ERROR the trait bound `U: From<T>` is not satisfied
diff --git a/tests/ui/type-alias-impl-trait/issue-53092-2.stderr b/tests/ui/type-alias-impl-trait/issue-53092-2.stderr
new file mode 100644
index 000000000..2565a28b4
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/issue-53092-2.stderr
@@ -0,0 +1,46 @@
+error[E0391]: cycle detected when computing type of `Bug::{opaque#0}`
+  --> $DIR/issue-53092-2.rs:4:18
+   |
+LL | type Bug<T, U> = impl Fn(T) -> U + Copy;
+   |                  ^^^^^^^^^^^^^^^^^^^^^^
+   |
+note: ...which requires type-checking `CONST_BUG`...
+  --> $DIR/issue-53092-2.rs:6:1
+   |
+LL | const CONST_BUG: Bug<u8, ()> = unsafe { std::mem::transmute(|_: u8| ()) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: ...which requires computing layout of `Bug<u8, ()>`...
+   = note: ...which requires normalizing `Bug<u8, ()>`...
+   = note: ...which again requires computing type of `Bug::{opaque#0}`, completing the cycle
+note: cycle used when checking item types in top-level module
+  --> $DIR/issue-53092-2.rs:1:1
+   |
+LL | / #![feature(type_alias_impl_trait)]
+LL | | #![allow(dead_code)]
+LL | |
+LL | | type Bug<T, U> = impl Fn(T) -> U + Copy;
+...  |
+LL | |     CONST_BUG(0);
+LL | | }
+   | |_^
+
+error[E0277]: the trait bound `U: From<T>` is not satisfied
+  --> $DIR/issue-53092-2.rs:9:5
+   |
+LL |     |x| x.into()
+   |     ^^^^^^^^^^^^ the trait `From<T>` is not implemented for `U`
+   |
+note: required by a bound in `make_bug`
+  --> $DIR/issue-53092-2.rs:8:19
+   |
+LL | fn make_bug<T, U: From<T>>() -> Bug<T, U> {
+   |                   ^^^^^^^ required by this bound in `make_bug`
+help: consider restricting type parameter `U`
+   |
+LL | type Bug<T, U: std::convert::From<T>> = impl Fn(T) -> U + Copy;
+   |              +++++++++++++++++++++++
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0277, E0391.
+For more information about an error, try `rustc --explain E0277`.
diff --git a/src/test/ui/type-alias-impl-trait/issue-53092.rs b/tests/ui/type-alias-impl-trait/issue-53092.rs
index 1be5b46d6..1be5b46d6 100644
--- a/src/test/ui/type-alias-impl-trait/issue-53092.rs
+++ b/tests/ui/type-alias-impl-trait/issue-53092.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-53092.stderr b/tests/ui/type-alias-impl-trait/issue-53092.stderr
index 2109cf8a7..2109cf8a7 100644
--- a/src/test/ui/type-alias-impl-trait/issue-53092.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-53092.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-53096.rs b/tests/ui/type-alias-impl-trait/issue-53096.rs
index 007dcf3bc..007dcf3bc 100644
--- a/src/test/ui/type-alias-impl-trait/issue-53096.rs
+++ b/tests/ui/type-alias-impl-trait/issue-53096.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-53096.stderr b/tests/ui/type-alias-impl-trait/issue-53096.stderr
index 0af3a75f8..0af3a75f8 100644
--- a/src/test/ui/type-alias-impl-trait/issue-53096.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-53096.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-53398-cyclic-types.rs b/tests/ui/type-alias-impl-trait/issue-53398-cyclic-types.rs
index 4a11bb502..4a11bb502 100644
--- a/src/test/ui/type-alias-impl-trait/issue-53398-cyclic-types.rs
+++ b/tests/ui/type-alias-impl-trait/issue-53398-cyclic-types.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-53398-cyclic-types.stderr b/tests/ui/type-alias-impl-trait/issue-53398-cyclic-types.stderr
index 0a34e8486..0a34e8486 100644
--- a/src/test/ui/type-alias-impl-trait/issue-53398-cyclic-types.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-53398-cyclic-types.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-53598.rs b/tests/ui/type-alias-impl-trait/issue-53598.rs
index 9c1cbf926..9c1cbf926 100644
--- a/src/test/ui/type-alias-impl-trait/issue-53598.rs
+++ b/tests/ui/type-alias-impl-trait/issue-53598.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-53598.stderr b/tests/ui/type-alias-impl-trait/issue-53598.stderr
index f8b8201e2..f8b8201e2 100644
--- a/src/test/ui/type-alias-impl-trait/issue-53598.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-53598.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-53678-generator-and-const-fn.rs b/tests/ui/type-alias-impl-trait/issue-53678-generator-and-const-fn.rs
index a3f126d56..a3f126d56 100644
--- a/src/test/ui/type-alias-impl-trait/issue-53678-generator-and-const-fn.rs
+++ b/tests/ui/type-alias-impl-trait/issue-53678-generator-and-const-fn.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-53678-generator-and-const-fn.stderr b/tests/ui/type-alias-impl-trait/issue-53678-generator-and-const-fn.stderr
index eb1c9603a..eb1c9603a 100644
--- a/src/test/ui/type-alias-impl-trait/issue-53678-generator-and-const-fn.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-53678-generator-and-const-fn.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-55099-lifetime-inference.rs b/tests/ui/type-alias-impl-trait/issue-55099-lifetime-inference.rs
index af0780ab0..af0780ab0 100644
--- a/src/test/ui/type-alias-impl-trait/issue-55099-lifetime-inference.rs
+++ b/tests/ui/type-alias-impl-trait/issue-55099-lifetime-inference.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-57188-associate-impl-capture.rs b/tests/ui/type-alias-impl-trait/issue-57188-associate-impl-capture.rs
index 3a7a5da07..3a7a5da07 100644
--- a/src/test/ui/type-alias-impl-trait/issue-57188-associate-impl-capture.rs
+++ b/tests/ui/type-alias-impl-trait/issue-57188-associate-impl-capture.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-57611-trait-alias.rs b/tests/ui/type-alias-impl-trait/issue-57611-trait-alias.rs
index cad3e0f66..cad3e0f66 100644
--- a/src/test/ui/type-alias-impl-trait/issue-57611-trait-alias.rs
+++ b/tests/ui/type-alias-impl-trait/issue-57611-trait-alias.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-57700.rs b/tests/ui/type-alias-impl-trait/issue-57700.rs
index 484589387..484589387 100644
--- a/src/test/ui/type-alias-impl-trait/issue-57700.rs
+++ b/tests/ui/type-alias-impl-trait/issue-57700.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-57700.stderr b/tests/ui/type-alias-impl-trait/issue-57700.stderr
index 31b6df5d4..31b6df5d4 100644
--- a/src/test/ui/type-alias-impl-trait/issue-57700.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-57700.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-57807-associated-type.rs b/tests/ui/type-alias-impl-trait/issue-57807-associated-type.rs
index fcab2c7db..fcab2c7db 100644
--- a/src/test/ui/type-alias-impl-trait/issue-57807-associated-type.rs
+++ b/tests/ui/type-alias-impl-trait/issue-57807-associated-type.rs
diff --git a/tests/ui/type-alias-impl-trait/issue-57961.rs b/tests/ui/type-alias-impl-trait/issue-57961.rs
new file mode 100644
index 000000000..4aa5966ff
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/issue-57961.rs
@@ -0,0 +1,18 @@
+#![feature(type_alias_impl_trait)]
+
+type X = impl Sized;
+
+trait Foo {
+    type Bar: Iterator<Item = X>;
+}
+
+impl Foo for () {
+    type Bar = std::vec::IntoIter<u32>;
+    //~^ ERROR expected `IntoIter<u32>` to be an iterator that yields `X`, but it yields `u32`
+}
+
+fn incoherent() {
+    let f: X = 22_i32;
+}
+
+fn main() {}
diff --git a/src/test/ui/type-alias-impl-trait/issue-57961.stderr b/tests/ui/type-alias-impl-trait/issue-57961.stderr
index fb40895c4..8d11b4888 100644
--- a/src/test/ui/type-alias-impl-trait/issue-57961.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-57961.stderr
@@ -1,4 +1,4 @@
-error[E0271]: expected `std::vec::IntoIter<u32>` to be an iterator that yields `X`, but it yields `u32`
+error[E0271]: expected `IntoIter<u32>` to be an iterator that yields `X`, but it yields `u32`
   --> $DIR/issue-57961.rs:10:16
    |
 LL | type X = impl Sized;
diff --git a/src/test/ui/type-alias-impl-trait/issue-58662-generator-with-lifetime.rs b/tests/ui/type-alias-impl-trait/issue-58662-generator-with-lifetime.rs
index 477b61390..477b61390 100644
--- a/src/test/ui/type-alias-impl-trait/issue-58662-generator-with-lifetime.rs
+++ b/tests/ui/type-alias-impl-trait/issue-58662-generator-with-lifetime.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-58662-simplified.rs b/tests/ui/type-alias-impl-trait/issue-58662-simplified.rs
index 27ca7d0fd..27ca7d0fd 100644
--- a/src/test/ui/type-alias-impl-trait/issue-58662-simplified.rs
+++ b/tests/ui/type-alias-impl-trait/issue-58662-simplified.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-58887.rs b/tests/ui/type-alias-impl-trait/issue-58887.rs
index 96ac78602..96ac78602 100644
--- a/src/test/ui/type-alias-impl-trait/issue-58887.rs
+++ b/tests/ui/type-alias-impl-trait/issue-58887.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-58951-2.rs b/tests/ui/type-alias-impl-trait/issue-58951-2.rs
index e4ba7f8e2..e4ba7f8e2 100644
--- a/src/test/ui/type-alias-impl-trait/issue-58951-2.rs
+++ b/tests/ui/type-alias-impl-trait/issue-58951-2.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-58951.rs b/tests/ui/type-alias-impl-trait/issue-58951.rs
index 7303cbab4..7303cbab4 100644
--- a/src/test/ui/type-alias-impl-trait/issue-58951.rs
+++ b/tests/ui/type-alias-impl-trait/issue-58951.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-60371.rs b/tests/ui/type-alias-impl-trait/issue-60371.rs
index 9a40f3d9b..9a40f3d9b 100644
--- a/src/test/ui/type-alias-impl-trait/issue-60371.rs
+++ b/tests/ui/type-alias-impl-trait/issue-60371.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-60371.stderr b/tests/ui/type-alias-impl-trait/issue-60371.stderr
index d0c04371b..d0c04371b 100644
--- a/src/test/ui/type-alias-impl-trait/issue-60371.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-60371.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-60407.rs b/tests/ui/type-alias-impl-trait/issue-60407.rs
index b833429c7..b833429c7 100644
--- a/src/test/ui/type-alias-impl-trait/issue-60407.rs
+++ b/tests/ui/type-alias-impl-trait/issue-60407.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-60407.stderr b/tests/ui/type-alias-impl-trait/issue-60407.stderr
index fecee2779..fecee2779 100644
--- a/src/test/ui/type-alias-impl-trait/issue-60407.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-60407.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-60564-working.rs b/tests/ui/type-alias-impl-trait/issue-60564-working.rs
index 38accc824..38accc824 100644
--- a/src/test/ui/type-alias-impl-trait/issue-60564-working.rs
+++ b/tests/ui/type-alias-impl-trait/issue-60564-working.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-60564.rs b/tests/ui/type-alias-impl-trait/issue-60564.rs
index 4fc767931..c2f4c3708 100644
--- a/src/test/ui/type-alias-impl-trait/issue-60564.rs
+++ b/tests/ui/type-alias-impl-trait/issue-60564.rs
@@ -18,7 +18,7 @@ where
     type BitsIter = IterBitsIter<T, E, u8>;
     fn iter_bits(self, n: u8) -> Self::BitsIter {
         (0u8..n).rev().map(move |shift| ((self >> T::from(shift)) & T::from(1)).try_into().unwrap())
-        //~^ ERROR non-defining opaque type use in defining scope
+        //~^ ERROR expected generic type parameter, found `u8`
     }
 }
 
diff --git a/tests/ui/type-alias-impl-trait/issue-60564.stderr b/tests/ui/type-alias-impl-trait/issue-60564.stderr
new file mode 100644
index 000000000..f8fdb004d
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/issue-60564.stderr
@@ -0,0 +1,12 @@
+error[E0792]: expected generic type parameter, found `u8`
+  --> $DIR/issue-60564.rs:20:9
+   |
+LL | type IterBitsIter<T, E, I> = impl std::iter::Iterator<Item = I>;
+   |                         - this generic parameter must be used with a generic type parameter
+...
+LL |         (0u8..n).rev().map(move |shift| ((self >> T::from(shift)) & T::from(1)).try_into().unwrap())
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0792`.
diff --git a/src/test/ui/type-alias-impl-trait/issue-60662.rs b/tests/ui/type-alias-impl-trait/issue-60662.rs
index b9faa668b..b9faa668b 100644
--- a/src/test/ui/type-alias-impl-trait/issue-60662.rs
+++ b/tests/ui/type-alias-impl-trait/issue-60662.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-60662.stdout b/tests/ui/type-alias-impl-trait/issue-60662.stdout
index 5b3d7375d..5b3d7375d 100644
--- a/src/test/ui/type-alias-impl-trait/issue-60662.stdout
+++ b/tests/ui/type-alias-impl-trait/issue-60662.stdout
diff --git a/src/test/ui/type-alias-impl-trait/issue-62000-associate-impl-trait-lifetimes.rs b/tests/ui/type-alias-impl-trait/issue-62000-associate-impl-trait-lifetimes.rs
index 36779a0ce..36779a0ce 100644
--- a/src/test/ui/type-alias-impl-trait/issue-62000-associate-impl-trait-lifetimes.rs
+++ b/tests/ui/type-alias-impl-trait/issue-62000-associate-impl-trait-lifetimes.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-63263-closure-return.rs b/tests/ui/type-alias-impl-trait/issue-63263-closure-return.rs
index 7414611a7..7414611a7 100644
--- a/src/test/ui/type-alias-impl-trait/issue-63263-closure-return.rs
+++ b/tests/ui/type-alias-impl-trait/issue-63263-closure-return.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-63279.rs b/tests/ui/type-alias-impl-trait/issue-63279.rs
index 97332e16d..97332e16d 100644
--- a/src/test/ui/type-alias-impl-trait/issue-63279.rs
+++ b/tests/ui/type-alias-impl-trait/issue-63279.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-63279.stderr b/tests/ui/type-alias-impl-trait/issue-63279.stderr
index 110b8d1ee..110b8d1ee 100644
--- a/src/test/ui/type-alias-impl-trait/issue-63279.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-63279.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-63355.rs b/tests/ui/type-alias-impl-trait/issue-63355.rs
index 7066a0535..7066a0535 100644
--- a/src/test/ui/type-alias-impl-trait/issue-63355.rs
+++ b/tests/ui/type-alias-impl-trait/issue-63355.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-63677-type-alias-coherence.rs b/tests/ui/type-alias-impl-trait/issue-63677-type-alias-coherence.rs
index 28f4a85c9..28f4a85c9 100644
--- a/src/test/ui/type-alias-impl-trait/issue-63677-type-alias-coherence.rs
+++ b/tests/ui/type-alias-impl-trait/issue-63677-type-alias-coherence.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-65384.rs b/tests/ui/type-alias-impl-trait/issue-65384.rs
index 9a9b2269f..9a9b2269f 100644
--- a/src/test/ui/type-alias-impl-trait/issue-65384.rs
+++ b/tests/ui/type-alias-impl-trait/issue-65384.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-65384.stderr b/tests/ui/type-alias-impl-trait/issue-65384.stderr
index f6692ae32..f6692ae32 100644
--- a/src/test/ui/type-alias-impl-trait/issue-65384.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-65384.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-65679-inst-opaque-ty-from-val-twice.rs b/tests/ui/type-alias-impl-trait/issue-65679-inst-opaque-ty-from-val-twice.rs
index 72c22827f..72c22827f 100644
--- a/src/test/ui/type-alias-impl-trait/issue-65679-inst-opaque-ty-from-val-twice.rs
+++ b/tests/ui/type-alias-impl-trait/issue-65679-inst-opaque-ty-from-val-twice.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-65918.rs b/tests/ui/type-alias-impl-trait/issue-65918.rs
index af6d50109..af6d50109 100644
--- a/src/test/ui/type-alias-impl-trait/issue-65918.rs
+++ b/tests/ui/type-alias-impl-trait/issue-65918.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-66580-closure-coherence.rs b/tests/ui/type-alias-impl-trait/issue-66580-closure-coherence.rs
index d97270c31..d97270c31 100644
--- a/src/test/ui/type-alias-impl-trait/issue-66580-closure-coherence.rs
+++ b/tests/ui/type-alias-impl-trait/issue-66580-closure-coherence.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-67844-nested-opaque.rs b/tests/ui/type-alias-impl-trait/issue-67844-nested-opaque.rs
index cd219328a..cd219328a 100644
--- a/src/test/ui/type-alias-impl-trait/issue-67844-nested-opaque.rs
+++ b/tests/ui/type-alias-impl-trait/issue-67844-nested-opaque.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-68368-non-defining-use-2.rs b/tests/ui/type-alias-impl-trait/issue-68368-non-defining-use-2.rs
index 5223fb1c7..5e0a82a72 100644
--- a/src/test/ui/type-alias-impl-trait/issue-68368-non-defining-use-2.rs
+++ b/tests/ui/type-alias-impl-trait/issue-68368-non-defining-use-2.rs
@@ -7,7 +7,7 @@ trait Trait<T> {}
 type Alias<'a, U> = impl Trait<U>;
 
 fn f<'a>() -> Alias<'a, ()> {}
-//~^ ERROR non-defining opaque type use in defining scope
+//~^ ERROR expected generic type parameter, found `()`
 
 fn main() {}
 
diff --git a/tests/ui/type-alias-impl-trait/issue-68368-non-defining-use-2.stderr b/tests/ui/type-alias-impl-trait/issue-68368-non-defining-use-2.stderr
new file mode 100644
index 000000000..271743a40
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/issue-68368-non-defining-use-2.stderr
@@ -0,0 +1,12 @@
+error[E0792]: expected generic type parameter, found `()`
+  --> $DIR/issue-68368-non-defining-use-2.rs:9:29
+   |
+LL | type Alias<'a, U> = impl Trait<U>;
+   |                - this generic parameter must be used with a generic type parameter
+LL |
+LL | fn f<'a>() -> Alias<'a, ()> {}
+   |                             ^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0792`.
diff --git a/src/test/ui/type-alias-impl-trait/issue-68368-non-defining-use.rs b/tests/ui/type-alias-impl-trait/issue-68368-non-defining-use.rs
index b50462bf2..3b32260c9 100644
--- a/src/test/ui/type-alias-impl-trait/issue-68368-non-defining-use.rs
+++ b/tests/ui/type-alias-impl-trait/issue-68368-non-defining-use.rs
@@ -7,7 +7,7 @@ trait Trait<T> {}
 type Alias<'a, U> = impl Trait<U>;
 
 fn f<'a>() -> Alias<'a, ()> {}
-//~^ ERROR non-defining opaque type use in defining scope
+//~^ ERROR expected generic type parameter, found `()`
 
 fn main() {}
 
diff --git a/tests/ui/type-alias-impl-trait/issue-68368-non-defining-use.stderr b/tests/ui/type-alias-impl-trait/issue-68368-non-defining-use.stderr
new file mode 100644
index 000000000..4d9a8d6ee
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/issue-68368-non-defining-use.stderr
@@ -0,0 +1,12 @@
+error[E0792]: expected generic type parameter, found `()`
+  --> $DIR/issue-68368-non-defining-use.rs:9:29
+   |
+LL | type Alias<'a, U> = impl Trait<U>;
+   |                - this generic parameter must be used with a generic type parameter
+LL |
+LL | fn f<'a>() -> Alias<'a, ()> {}
+   |                             ^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0792`.
diff --git a/src/test/ui/type-alias-impl-trait/issue-69136-inner-lifetime-resolve-error.rs b/tests/ui/type-alias-impl-trait/issue-69136-inner-lifetime-resolve-error.rs
index 428454bc0..7657fe2fb 100644
--- a/src/test/ui/type-alias-impl-trait/issue-69136-inner-lifetime-resolve-error.rs
+++ b/tests/ui/type-alias-impl-trait/issue-69136-inner-lifetime-resolve-error.rs
@@ -18,6 +18,6 @@ type Return<A> = impl WithAssoc<A, AssocType = impl SomeTrait + 'a>;
 //~^ ERROR use of undeclared lifetime name `'a`
 
 fn my_fun() -> Return<()> {}
-//~^ ERROR non-defining opaque type use in defining scope
+//~^ ERROR expected generic type parameter, found `()`
 
 fn main() {}
diff --git a/src/test/ui/type-alias-impl-trait/issue-69136-inner-lifetime-resolve-error.stderr b/tests/ui/type-alias-impl-trait/issue-69136-inner-lifetime-resolve-error.stderr
index 7b50c8af2..d1250786d 100644
--- a/src/test/ui/type-alias-impl-trait/issue-69136-inner-lifetime-resolve-error.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-69136-inner-lifetime-resolve-error.stderr
@@ -14,18 +14,16 @@ help: consider introducing lifetime `'a` here
 LL | type Return<'a, A> = impl WithAssoc<A, AssocType = impl SomeTrait + 'a>;
    |             +++
 
-error: non-defining opaque type use in defining scope
+error[E0792]: expected generic type parameter, found `()`
   --> $DIR/issue-69136-inner-lifetime-resolve-error.rs:20:27
    |
+LL | type Return<A> = impl WithAssoc<A, AssocType = impl SomeTrait + 'a>;
+   |             - this generic parameter must be used with a generic type parameter
+...
 LL | fn my_fun() -> Return<()> {}
    |                           ^^
-   |
-note: used non-generic type `()` for generic parameter
-  --> $DIR/issue-69136-inner-lifetime-resolve-error.rs:17:13
-   |
-LL | type Return<A> = impl WithAssoc<A, AssocType = impl SomeTrait + 'a>;
-   |             ^
 
 error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0261`.
+Some errors have detailed explanations: E0261, E0792.
+For more information about an error, try `rustc --explain E0261`.
diff --git a/src/test/ui/type-alias-impl-trait/issue-69136-inner-lifetime-resolve-ok.rs b/tests/ui/type-alias-impl-trait/issue-69136-inner-lifetime-resolve-ok.rs
index a6916eda8..a6916eda8 100644
--- a/src/test/ui/type-alias-impl-trait/issue-69136-inner-lifetime-resolve-ok.rs
+++ b/tests/ui/type-alias-impl-trait/issue-69136-inner-lifetime-resolve-ok.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-69323.rs b/tests/ui/type-alias-impl-trait/issue-69323.rs
index a9bd6daf2..a9bd6daf2 100644
--- a/src/test/ui/type-alias-impl-trait/issue-69323.rs
+++ b/tests/ui/type-alias-impl-trait/issue-69323.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-70121.rs b/tests/ui/type-alias-impl-trait/issue-70121.rs
index dff0d89d4..dff0d89d4 100644
--- a/src/test/ui/type-alias-impl-trait/issue-70121.rs
+++ b/tests/ui/type-alias-impl-trait/issue-70121.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-72793.rs b/tests/ui/type-alias-impl-trait/issue-72793.rs
index 828c87114..828c87114 100644
--- a/src/test/ui/type-alias-impl-trait/issue-72793.rs
+++ b/tests/ui/type-alias-impl-trait/issue-72793.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-74244.rs b/tests/ui/type-alias-impl-trait/issue-74244.rs
index bb4104b3d..bb4104b3d 100644
--- a/src/test/ui/type-alias-impl-trait/issue-74244.rs
+++ b/tests/ui/type-alias-impl-trait/issue-74244.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-74244.stderr b/tests/ui/type-alias-impl-trait/issue-74244.stderr
index ff6bacd27..ff6bacd27 100644
--- a/src/test/ui/type-alias-impl-trait/issue-74244.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-74244.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-74280.rs b/tests/ui/type-alias-impl-trait/issue-74280.rs
index ad641eaa0..ad641eaa0 100644
--- a/src/test/ui/type-alias-impl-trait/issue-74280.rs
+++ b/tests/ui/type-alias-impl-trait/issue-74280.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-74280.stderr b/tests/ui/type-alias-impl-trait/issue-74280.stderr
index 66886db6e..66886db6e 100644
--- a/src/test/ui/type-alias-impl-trait/issue-74280.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-74280.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-74761-2.rs b/tests/ui/type-alias-impl-trait/issue-74761-2.rs
index d26ca5c3e..d26ca5c3e 100644
--- a/src/test/ui/type-alias-impl-trait/issue-74761-2.rs
+++ b/tests/ui/type-alias-impl-trait/issue-74761-2.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-74761-2.stderr b/tests/ui/type-alias-impl-trait/issue-74761-2.stderr
index f15d0a069..f15d0a069 100644
--- a/src/test/ui/type-alias-impl-trait/issue-74761-2.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-74761-2.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-74761.rs b/tests/ui/type-alias-impl-trait/issue-74761.rs
index d26ca5c3e..d26ca5c3e 100644
--- a/src/test/ui/type-alias-impl-trait/issue-74761.rs
+++ b/tests/ui/type-alias-impl-trait/issue-74761.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-74761.stderr b/tests/ui/type-alias-impl-trait/issue-74761.stderr
index 1d016fe07..1d016fe07 100644
--- a/src/test/ui/type-alias-impl-trait/issue-74761.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-74761.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-76202-trait-impl-for-tait.rs b/tests/ui/type-alias-impl-trait/issue-76202-trait-impl-for-tait.rs
index b97e444c6..b97e444c6 100644
--- a/src/test/ui/type-alias-impl-trait/issue-76202-trait-impl-for-tait.rs
+++ b/tests/ui/type-alias-impl-trait/issue-76202-trait-impl-for-tait.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-77179.rs b/tests/ui/type-alias-impl-trait/issue-77179.rs
index 8d818d4a3..8d818d4a3 100644
--- a/src/test/ui/type-alias-impl-trait/issue-77179.rs
+++ b/tests/ui/type-alias-impl-trait/issue-77179.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-77179.stderr b/tests/ui/type-alias-impl-trait/issue-77179.stderr
index 053546e4b..053546e4b 100644
--- a/src/test/ui/type-alias-impl-trait/issue-77179.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-77179.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-78450.rs b/tests/ui/type-alias-impl-trait/issue-78450.rs
index fccbfb74f..fccbfb74f 100644
--- a/src/test/ui/type-alias-impl-trait/issue-78450.rs
+++ b/tests/ui/type-alias-impl-trait/issue-78450.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-84660-trait-impl-for-tait.rs b/tests/ui/type-alias-impl-trait/issue-84660-trait-impl-for-tait.rs
index 2ba4befea..2ba4befea 100644
--- a/src/test/ui/type-alias-impl-trait/issue-84660-trait-impl-for-tait.rs
+++ b/tests/ui/type-alias-impl-trait/issue-84660-trait-impl-for-tait.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-84660-unsoundness.rs b/tests/ui/type-alias-impl-trait/issue-84660-unsoundness.rs
index 48d4b0c96..48d4b0c96 100644
--- a/src/test/ui/type-alias-impl-trait/issue-84660-unsoundness.rs
+++ b/tests/ui/type-alias-impl-trait/issue-84660-unsoundness.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-84660-unsoundness.stderr b/tests/ui/type-alias-impl-trait/issue-84660-unsoundness.stderr
index 6a75e1bd2..6a75e1bd2 100644
--- a/src/test/ui/type-alias-impl-trait/issue-84660-unsoundness.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-84660-unsoundness.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-87455-static-lifetime-ice.rs b/tests/ui/type-alias-impl-trait/issue-87455-static-lifetime-ice.rs
index 80a74eb63..80a74eb63 100644
--- a/src/test/ui/type-alias-impl-trait/issue-87455-static-lifetime-ice.rs
+++ b/tests/ui/type-alias-impl-trait/issue-87455-static-lifetime-ice.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-89686.rs b/tests/ui/type-alias-impl-trait/issue-89686.rs
index 058417bdb..058417bdb 100644
--- a/src/test/ui/type-alias-impl-trait/issue-89686.rs
+++ b/tests/ui/type-alias-impl-trait/issue-89686.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-89686.stderr b/tests/ui/type-alias-impl-trait/issue-89686.stderr
index 3b95a575a..3b95a575a 100644
--- a/src/test/ui/type-alias-impl-trait/issue-89686.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-89686.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-89952.rs b/tests/ui/type-alias-impl-trait/issue-89952.rs
index dc0f19c04..dc0f19c04 100644
--- a/src/test/ui/type-alias-impl-trait/issue-89952.rs
+++ b/tests/ui/type-alias-impl-trait/issue-89952.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-90400-1.rs b/tests/ui/type-alias-impl-trait/issue-90400-1.rs
index 15aead2f6..15aead2f6 100644
--- a/src/test/ui/type-alias-impl-trait/issue-90400-1.rs
+++ b/tests/ui/type-alias-impl-trait/issue-90400-1.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-90400-1.stderr b/tests/ui/type-alias-impl-trait/issue-90400-1.stderr
index ead28769f..ead28769f 100644
--- a/src/test/ui/type-alias-impl-trait/issue-90400-1.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-90400-1.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-90400-2.rs b/tests/ui/type-alias-impl-trait/issue-90400-2.rs
index 4c6e893c1..4c6e893c1 100644
--- a/src/test/ui/type-alias-impl-trait/issue-90400-2.rs
+++ b/tests/ui/type-alias-impl-trait/issue-90400-2.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-90400-2.stderr b/tests/ui/type-alias-impl-trait/issue-90400-2.stderr
index 50b2dc049..0c45046f5 100644
--- a/src/test/ui/type-alias-impl-trait/issue-90400-2.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-90400-2.stderr
@@ -8,7 +8,9 @@ note: required for `MyBaz<B>` to implement `Baz`
   --> $DIR/issue-90400-2.rs:30:14
    |
 LL | impl<B: Bar> Baz for MyBaz<B> {
-   |              ^^^     ^^^^^^^^
+   |         ---  ^^^     ^^^^^^^^
+   |         |
+   |         unsatisfied trait bound introduced here
 help: consider restricting type parameter `B`
    |
 LL |     type FooFn<B: Bar> = impl Baz;
diff --git a/src/test/ui/type-alias-impl-trait/issue-93411.rs b/tests/ui/type-alias-impl-trait/issue-93411.rs
index 1f8c78926..1f8c78926 100644
--- a/src/test/ui/type-alias-impl-trait/issue-93411.rs
+++ b/tests/ui/type-alias-impl-trait/issue-93411.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-94429.rs b/tests/ui/type-alias-impl-trait/issue-94429.rs
index 2c965b875..2c965b875 100644
--- a/src/test/ui/type-alias-impl-trait/issue-94429.rs
+++ b/tests/ui/type-alias-impl-trait/issue-94429.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-94429.stderr b/tests/ui/type-alias-impl-trait/issue-94429.stderr
index 8d7f7a07b..8d7f7a07b 100644
--- a/src/test/ui/type-alias-impl-trait/issue-94429.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-94429.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-96572-unconstrained-mismatch.rs b/tests/ui/type-alias-impl-trait/issue-96572-unconstrained-mismatch.rs
index 825710851..825710851 100644
--- a/src/test/ui/type-alias-impl-trait/issue-96572-unconstrained-mismatch.rs
+++ b/tests/ui/type-alias-impl-trait/issue-96572-unconstrained-mismatch.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-96572-unconstrained-mismatch.stderr b/tests/ui/type-alias-impl-trait/issue-96572-unconstrained-mismatch.stderr
index 728244a18..728244a18 100644
--- a/src/test/ui/type-alias-impl-trait/issue-96572-unconstrained-mismatch.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-96572-unconstrained-mismatch.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-96572-unconstrained.rs b/tests/ui/type-alias-impl-trait/issue-96572-unconstrained.rs
index 2c740ccc1..2c740ccc1 100644
--- a/src/test/ui/type-alias-impl-trait/issue-96572-unconstrained.rs
+++ b/tests/ui/type-alias-impl-trait/issue-96572-unconstrained.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-98604.rs b/tests/ui/type-alias-impl-trait/issue-98604.rs
index 32c2f9ed5..32c2f9ed5 100644
--- a/src/test/ui/type-alias-impl-trait/issue-98604.rs
+++ b/tests/ui/type-alias-impl-trait/issue-98604.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-98604.stderr b/tests/ui/type-alias-impl-trait/issue-98604.stderr
index 92d01eb0d..92d01eb0d 100644
--- a/src/test/ui/type-alias-impl-trait/issue-98604.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-98604.stderr
diff --git a/src/test/ui/type-alias-impl-trait/issue-98608.rs b/tests/ui/type-alias-impl-trait/issue-98608.rs
index 1f89af045..1f89af045 100644
--- a/src/test/ui/type-alias-impl-trait/issue-98608.rs
+++ b/tests/ui/type-alias-impl-trait/issue-98608.rs
diff --git a/src/test/ui/type-alias-impl-trait/issue-98608.stderr b/tests/ui/type-alias-impl-trait/issue-98608.stderr
index 916a58451..916a58451 100644
--- a/src/test/ui/type-alias-impl-trait/issue-98608.stderr
+++ b/tests/ui/type-alias-impl-trait/issue-98608.stderr
diff --git a/src/test/ui/type-alias-impl-trait/missing_lifetime_bound.rs b/tests/ui/type-alias-impl-trait/missing_lifetime_bound.rs
index 01d1f5db1..01d1f5db1 100644
--- a/src/test/ui/type-alias-impl-trait/missing_lifetime_bound.rs
+++ b/tests/ui/type-alias-impl-trait/missing_lifetime_bound.rs
diff --git a/src/test/ui/type-alias-impl-trait/missing_lifetime_bound.stderr b/tests/ui/type-alias-impl-trait/missing_lifetime_bound.stderr
index 65a0af0d2..65a0af0d2 100644
--- a/src/test/ui/type-alias-impl-trait/missing_lifetime_bound.stderr
+++ b/tests/ui/type-alias-impl-trait/missing_lifetime_bound.stderr
diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-infer.rs b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-infer.rs
index b887fcf30..b887fcf30 100644
--- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-infer.rs
+++ b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-infer.rs
diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-infer.stderr b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-infer.stderr
index 278117009..278117009 100644
--- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-infer.stderr
+++ b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-infer.stderr
diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-lifetimes.rs b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-lifetimes.rs
index 65eb2952e..65eb2952e 100644
--- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-lifetimes.rs
+++ b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-lifetimes.rs
diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-lifetimes.stderr b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-lifetimes.stderr
index d7676b8e9..d7676b8e9 100644
--- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-lifetimes.stderr
+++ b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-lifetimes.stderr
diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-pass.rs b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-pass.rs
index 21fca047a..21fca047a 100644
--- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-pass.rs
+++ b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-pass.rs
diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn.rs b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn.rs
index da845e861..da845e861 100644
--- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn.rs
+++ b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn.rs
diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn.stderr b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn.stderr
index 66a6b0bbf..66a6b0bbf 100644
--- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn.stderr
+++ b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn.stderr
diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn2.rs b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn2.rs
index 14510a529..14510a529 100644
--- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn2.rs
+++ b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn2.rs
diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn2.stderr b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn2.stderr
index 0f752212a..0f752212a 100644
--- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn2.stderr
+++ b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn2.stderr
diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn3.rs b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn3.rs
index 11a922443..11a922443 100644
--- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn3.rs
+++ b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn3.rs
diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn3.stderr b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn3.stderr
index bbe709dcc..bbe709dcc 100644
--- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn3.stderr
+++ b/tests/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn3.stderr
diff --git a/src/test/ui/type-alias-impl-trait/multiple_definitions.rs b/tests/ui/type-alias-impl-trait/multiple_definitions.rs
index 9e6268e63..9e6268e63 100644
--- a/src/test/ui/type-alias-impl-trait/multiple_definitions.rs
+++ b/tests/ui/type-alias-impl-trait/multiple_definitions.rs
diff --git a/src/test/ui/type-alias-impl-trait/nested-tait-inference.rs b/tests/ui/type-alias-impl-trait/nested-tait-inference.rs
index 822489716..822489716 100644
--- a/src/test/ui/type-alias-impl-trait/nested-tait-inference.rs
+++ b/tests/ui/type-alias-impl-trait/nested-tait-inference.rs
diff --git a/src/test/ui/type-alias-impl-trait/nested-tait-inference.stderr b/tests/ui/type-alias-impl-trait/nested-tait-inference.stderr
index 62db019ed..62db019ed 100644
--- a/src/test/ui/type-alias-impl-trait/nested-tait-inference.stderr
+++ b/tests/ui/type-alias-impl-trait/nested-tait-inference.stderr
diff --git a/src/test/ui/type-alias-impl-trait/nested-tait-inference2.rs b/tests/ui/type-alias-impl-trait/nested-tait-inference2.rs
index 0d7f5bad2..0d7f5bad2 100644
--- a/src/test/ui/type-alias-impl-trait/nested-tait-inference2.rs
+++ b/tests/ui/type-alias-impl-trait/nested-tait-inference2.rs
diff --git a/src/test/ui/type-alias-impl-trait/nested-tait-inference2.stderr b/tests/ui/type-alias-impl-trait/nested-tait-inference2.stderr
index f4d96038d..f4d96038d 100644
--- a/src/test/ui/type-alias-impl-trait/nested-tait-inference2.stderr
+++ b/tests/ui/type-alias-impl-trait/nested-tait-inference2.stderr
diff --git a/src/test/ui/type-alias-impl-trait/nested-tait-inference3.rs b/tests/ui/type-alias-impl-trait/nested-tait-inference3.rs
index b0ebdd1bf..b0ebdd1bf 100644
--- a/src/test/ui/type-alias-impl-trait/nested-tait-inference3.rs
+++ b/tests/ui/type-alias-impl-trait/nested-tait-inference3.rs
diff --git a/src/test/ui/type-alias-impl-trait/nested-tait-inference3.stderr b/tests/ui/type-alias-impl-trait/nested-tait-inference3.stderr
index b1d947a9c..b1d947a9c 100644
--- a/src/test/ui/type-alias-impl-trait/nested-tait-inference3.stderr
+++ b/tests/ui/type-alias-impl-trait/nested-tait-inference3.stderr
diff --git a/src/test/ui/type-alias-impl-trait/nested.rs b/tests/ui/type-alias-impl-trait/nested.rs
index 6b866be7d..6b866be7d 100644
--- a/src/test/ui/type-alias-impl-trait/nested.rs
+++ b/tests/ui/type-alias-impl-trait/nested.rs
diff --git a/src/test/ui/type-alias-impl-trait/nested.stderr b/tests/ui/type-alias-impl-trait/nested.stderr
index 732af5c0b..732af5c0b 100644
--- a/src/test/ui/type-alias-impl-trait/nested.stderr
+++ b/tests/ui/type-alias-impl-trait/nested.stderr
diff --git a/src/test/ui/type-alias-impl-trait/nested_type_alias_impl_trait.rs b/tests/ui/type-alias-impl-trait/nested_type_alias_impl_trait.rs
index 60b6e1aac..60b6e1aac 100644
--- a/src/test/ui/type-alias-impl-trait/nested_type_alias_impl_trait.rs
+++ b/tests/ui/type-alias-impl-trait/nested_type_alias_impl_trait.rs
diff --git a/src/test/ui/type-alias-impl-trait/nested_type_alias_impl_trait.stderr b/tests/ui/type-alias-impl-trait/nested_type_alias_impl_trait.stderr
index fa6ecf68d..fa6ecf68d 100644
--- a/src/test/ui/type-alias-impl-trait/nested_type_alias_impl_trait.stderr
+++ b/tests/ui/type-alias-impl-trait/nested_type_alias_impl_trait.stderr
diff --git a/src/test/ui/type-alias-impl-trait/never_reveal_concrete_type.rs b/tests/ui/type-alias-impl-trait/never_reveal_concrete_type.rs
index fed5ac07c..fed5ac07c 100644
--- a/src/test/ui/type-alias-impl-trait/never_reveal_concrete_type.rs
+++ b/tests/ui/type-alias-impl-trait/never_reveal_concrete_type.rs
diff --git a/src/test/ui/type-alias-impl-trait/no_inferrable_concrete_type.rs b/tests/ui/type-alias-impl-trait/no_inferrable_concrete_type.rs
index 46621362e..0f0a02e97 100644
--- a/src/test/ui/type-alias-impl-trait/no_inferrable_concrete_type.rs
+++ b/tests/ui/type-alias-impl-trait/no_inferrable_concrete_type.rs
@@ -15,5 +15,4 @@ mod foo {
 
 fn main() {
     let _: foo::Foo = std::mem::transmute(0u8);
-    //~^ ERROR cannot transmute between types of different sizes, or dependently-sized types
 }
diff --git a/tests/ui/type-alias-impl-trait/no_inferrable_concrete_type.stderr b/tests/ui/type-alias-impl-trait/no_inferrable_concrete_type.stderr
new file mode 100644
index 000000000..f3e8ae9c7
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/no_inferrable_concrete_type.stderr
@@ -0,0 +1,10 @@
+error: unconstrained opaque type
+  --> $DIR/no_inferrable_concrete_type.rs:7:20
+   |
+LL |     pub type Foo = impl Copy;
+   |                    ^^^^^^^^^
+   |
+   = note: `Foo` must be used in combination with a concrete type within the same module
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/type-alias-impl-trait/no_revealing_outside_defining_module.rs b/tests/ui/type-alias-impl-trait/no_revealing_outside_defining_module.rs
index 61153b1e1..61153b1e1 100644
--- a/src/test/ui/type-alias-impl-trait/no_revealing_outside_defining_module.rs
+++ b/tests/ui/type-alias-impl-trait/no_revealing_outside_defining_module.rs
diff --git a/src/test/ui/type-alias-impl-trait/no_revealing_outside_defining_module.stderr b/tests/ui/type-alias-impl-trait/no_revealing_outside_defining_module.stderr
index ae03a5b3e..ae03a5b3e 100644
--- a/src/test/ui/type-alias-impl-trait/no_revealing_outside_defining_module.stderr
+++ b/tests/ui/type-alias-impl-trait/no_revealing_outside_defining_module.stderr
diff --git a/src/test/ui/type-alias-impl-trait/not_a_defining_use.rs b/tests/ui/type-alias-impl-trait/not_a_defining_use.rs
index fa47d13f5..fa47d13f5 100644
--- a/src/test/ui/type-alias-impl-trait/not_a_defining_use.rs
+++ b/tests/ui/type-alias-impl-trait/not_a_defining_use.rs
diff --git a/src/test/ui/type-alias-impl-trait/not_a_defining_use.stderr b/tests/ui/type-alias-impl-trait/not_a_defining_use.stderr
index b11198c58..b11198c58 100644
--- a/src/test/ui/type-alias-impl-trait/not_a_defining_use.stderr
+++ b/tests/ui/type-alias-impl-trait/not_a_defining_use.stderr
diff --git a/src/test/ui/type-alias-impl-trait/not_well_formed.rs b/tests/ui/type-alias-impl-trait/not_well_formed.rs
index fbb7a4d58..fbb7a4d58 100644
--- a/src/test/ui/type-alias-impl-trait/not_well_formed.rs
+++ b/tests/ui/type-alias-impl-trait/not_well_formed.rs
diff --git a/src/test/ui/type-alias-impl-trait/not_well_formed.stderr b/tests/ui/type-alias-impl-trait/not_well_formed.stderr
index c36b95f47..c36b95f47 100644
--- a/src/test/ui/type-alias-impl-trait/not_well_formed.stderr
+++ b/tests/ui/type-alias-impl-trait/not_well_formed.stderr
diff --git a/tests/ui/type-alias-impl-trait/outlives-bound-var.rs b/tests/ui/type-alias-impl-trait/outlives-bound-var.rs
new file mode 100644
index 000000000..b8fac45b7
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/outlives-bound-var.rs
@@ -0,0 +1,18 @@
+// Here we process outlive obligations involving
+// opaque types with bound vars in substs.
+// This was an ICE.
+//
+// check-pass
+#![feature(type_alias_impl_trait)]
+
+type Ty<'a> = impl Sized + 'a;
+fn define<'a>() -> Ty<'a> {}
+
+// Ty<'^0>: 'static
+fn test1(_: &'static fn(Ty<'_>)) {}
+
+fn test2() {
+    None::<&fn(Ty<'_>)>;
+}
+
+fn main() { }
diff --git a/src/test/ui/type-alias-impl-trait/reveal_local.rs b/tests/ui/type-alias-impl-trait/reveal_local.rs
index 7ecb55353..7ecb55353 100644
--- a/src/test/ui/type-alias-impl-trait/reveal_local.rs
+++ b/tests/ui/type-alias-impl-trait/reveal_local.rs
diff --git a/src/test/ui/type-alias-impl-trait/reveal_local.stderr b/tests/ui/type-alias-impl-trait/reveal_local.stderr
index 27fded333..27fded333 100644
--- a/src/test/ui/type-alias-impl-trait/reveal_local.stderr
+++ b/tests/ui/type-alias-impl-trait/reveal_local.stderr
diff --git a/src/test/ui/type-alias-impl-trait/self-referential-2.rs b/tests/ui/type-alias-impl-trait/self-referential-2.rs
index 8781196c3..8781196c3 100644
--- a/src/test/ui/type-alias-impl-trait/self-referential-2.rs
+++ b/tests/ui/type-alias-impl-trait/self-referential-2.rs
diff --git a/src/test/ui/type-alias-impl-trait/self-referential-2.stderr b/tests/ui/type-alias-impl-trait/self-referential-2.stderr
index c2cf70687..c2cf70687 100644
--- a/src/test/ui/type-alias-impl-trait/self-referential-2.stderr
+++ b/tests/ui/type-alias-impl-trait/self-referential-2.stderr
diff --git a/src/test/ui/type-alias-impl-trait/self-referential-3.rs b/tests/ui/type-alias-impl-trait/self-referential-3.rs
index d40715717..d40715717 100644
--- a/src/test/ui/type-alias-impl-trait/self-referential-3.rs
+++ b/tests/ui/type-alias-impl-trait/self-referential-3.rs
diff --git a/src/test/ui/type-alias-impl-trait/self-referential-4.rs b/tests/ui/type-alias-impl-trait/self-referential-4.rs
index 36742c8ad..36742c8ad 100644
--- a/src/test/ui/type-alias-impl-trait/self-referential-4.rs
+++ b/tests/ui/type-alias-impl-trait/self-referential-4.rs
diff --git a/src/test/ui/type-alias-impl-trait/self-referential-4.stderr b/tests/ui/type-alias-impl-trait/self-referential-4.stderr
index 98c762e3d..98c762e3d 100644
--- a/src/test/ui/type-alias-impl-trait/self-referential-4.stderr
+++ b/tests/ui/type-alias-impl-trait/self-referential-4.stderr
diff --git a/src/test/ui/type-alias-impl-trait/self-referential.rs b/tests/ui/type-alias-impl-trait/self-referential.rs
index 3ff5406a3..3ff5406a3 100644
--- a/src/test/ui/type-alias-impl-trait/self-referential.rs
+++ b/tests/ui/type-alias-impl-trait/self-referential.rs
diff --git a/src/test/ui/type-alias-impl-trait/self-referential.stderr b/tests/ui/type-alias-impl-trait/self-referential.stderr
index aff489d70..aff489d70 100644
--- a/src/test/ui/type-alias-impl-trait/self-referential.stderr
+++ b/tests/ui/type-alias-impl-trait/self-referential.stderr
diff --git a/src/test/ui/type-alias-impl-trait/self_implication.rs b/tests/ui/type-alias-impl-trait/self_implication.rs
index 4e805ee30..4e805ee30 100644
--- a/src/test/ui/type-alias-impl-trait/self_implication.rs
+++ b/tests/ui/type-alias-impl-trait/self_implication.rs
diff --git a/src/test/ui/type-alias-impl-trait/static-const-types.rs b/tests/ui/type-alias-impl-trait/static-const-types.rs
index 748a279e4..748a279e4 100644
--- a/src/test/ui/type-alias-impl-trait/static-const-types.rs
+++ b/tests/ui/type-alias-impl-trait/static-const-types.rs
diff --git a/src/test/ui/type-alias-impl-trait/structural-match-no-leak.rs b/tests/ui/type-alias-impl-trait/structural-match-no-leak.rs
index c2ab6a9d1..c2ab6a9d1 100644
--- a/src/test/ui/type-alias-impl-trait/structural-match-no-leak.rs
+++ b/tests/ui/type-alias-impl-trait/structural-match-no-leak.rs
diff --git a/src/test/ui/type-alias-impl-trait/structural-match-no-leak.stderr b/tests/ui/type-alias-impl-trait/structural-match-no-leak.stderr
index dbc183f54..dbc183f54 100644
--- a/src/test/ui/type-alias-impl-trait/structural-match-no-leak.stderr
+++ b/tests/ui/type-alias-impl-trait/structural-match-no-leak.stderr
diff --git a/src/test/ui/type-alias-impl-trait/structural-match.rs b/tests/ui/type-alias-impl-trait/structural-match.rs
index 7cc9ccaab..7cc9ccaab 100644
--- a/src/test/ui/type-alias-impl-trait/structural-match.rs
+++ b/tests/ui/type-alias-impl-trait/structural-match.rs
diff --git a/src/test/ui/type-alias-impl-trait/structural-match.stderr b/tests/ui/type-alias-impl-trait/structural-match.stderr
index 61287f268..61287f268 100644
--- a/src/test/ui/type-alias-impl-trait/structural-match.stderr
+++ b/tests/ui/type-alias-impl-trait/structural-match.stderr
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-assoc-dyn.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-assoc-dyn.rs
index f6a830296..f6a830296 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-assoc-dyn.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-assoc-dyn.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-assoc-impl-trait.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-assoc-impl-trait.rs
index fddecfcac..fddecfcac 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-assoc-impl-trait.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-assoc-impl-trait.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-const.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-const.rs
index 5630e036b..5630e036b 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-const.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-const.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-fn-type.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-fn-type.rs
index 857066c78..857066c78 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-fn-type.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-fn-type.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-fn-type.stderr b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-fn-type.stderr
index a31cf1a51..a31cf1a51 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-fn-type.stderr
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-fn-type.stderr
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-fns.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-fns.rs
index 07c891f06..07c891f06 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-fns.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-fns.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-sized.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-sized.rs
index c5e8068e5..c5e8068e5 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-sized.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-sized.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-struct.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-struct.rs
index 1a4064055..1a4064055 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-struct.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-struct.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-tuple.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-tuple.rs
index 1f2d0e47e..1f2d0e47e 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-tuple.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-tuple.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-unconstrained-lifetime.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-unconstrained-lifetime.rs
index efbf4f1e3..efbf4f1e3 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-unconstrained-lifetime.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-unconstrained-lifetime.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-unconstrained-lifetime.stderr b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-unconstrained-lifetime.stderr
index 8cdce2f8e..8cdce2f8e 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-unconstrained-lifetime.stderr
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-unconstrained-lifetime.stderr
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error.rs
index e5e7fb677..e5e7fb677 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error.stderr b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error.stderr
index a770eeac3..a770eeac3 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error.stderr
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error.stderr
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error2.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error2.rs
index 7c7a1b405..7c7a1b405 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error2.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error2.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error2.stderr b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error2.stderr
index 3f3699ce5..3f3699ce5 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error2.stderr
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-with-cycle-error2.stderr
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-with-no-traits.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-with-no-traits.rs
index 8ca279eec..8ca279eec 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-with-no-traits.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-with-no-traits.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-with-no-traits.stderr b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-with-no-traits.stderr
index 3f7acd338..3f7acd338 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-with-no-traits.stderr
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait-with-no-traits.stderr
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait.rs
index 70c2ee427..70c2ee427 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait2.rs b/tests/ui/type-alias-impl-trait/type-alias-impl-trait2.rs
index 67f56bcde..67f56bcde 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait2.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-impl-trait2.rs
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-nested-impl-trait.rs b/tests/ui/type-alias-impl-trait/type-alias-nested-impl-trait.rs
index fd954801d..fd954801d 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-nested-impl-trait.rs
+++ b/tests/ui/type-alias-impl-trait/type-alias-nested-impl-trait.rs
diff --git a/src/test/ui/type-alias-impl-trait/type_of_a_let.rs b/tests/ui/type-alias-impl-trait/type_of_a_let.rs
index 4e9d1788b..4e9d1788b 100644
--- a/src/test/ui/type-alias-impl-trait/type_of_a_let.rs
+++ b/tests/ui/type-alias-impl-trait/type_of_a_let.rs
diff --git a/src/test/ui/type-alias-impl-trait/type_of_a_let.stderr b/tests/ui/type-alias-impl-trait/type_of_a_let.stderr
index 1dabe4586..1dabe4586 100644
--- a/src/test/ui/type-alias-impl-trait/type_of_a_let.stderr
+++ b/tests/ui/type-alias-impl-trait/type_of_a_let.stderr
diff --git a/src/test/ui/type-alias-impl-trait/unbounded_opaque_type.rs b/tests/ui/type-alias-impl-trait/unbounded_opaque_type.rs
index f43ad7dce..f43ad7dce 100644
--- a/src/test/ui/type-alias-impl-trait/unbounded_opaque_type.rs
+++ b/tests/ui/type-alias-impl-trait/unbounded_opaque_type.rs
diff --git a/src/test/ui/type-alias-impl-trait/underconstrained_generic.rs b/tests/ui/type-alias-impl-trait/underconstrained_generic.rs
index aa537dfc9..aa537dfc9 100644
--- a/src/test/ui/type-alias-impl-trait/underconstrained_generic.rs
+++ b/tests/ui/type-alias-impl-trait/underconstrained_generic.rs
diff --git a/src/test/ui/type-alias-impl-trait/underconstrained_generic.stderr b/tests/ui/type-alias-impl-trait/underconstrained_generic.stderr
index 95fb6f6a5..103636b6c 100644
--- a/src/test/ui/type-alias-impl-trait/underconstrained_generic.stderr
+++ b/tests/ui/type-alias-impl-trait/underconstrained_generic.stderr
@@ -8,7 +8,9 @@ note: required for `()` to implement `ProofForConversion<T>`
   --> $DIR/underconstrained_generic.rs:13:16
    |
 LL | impl<X: Trait> ProofForConversion<X> for () {
-   |                ^^^^^^^^^^^^^^^^^^^^^     ^^
+   |         -----  ^^^^^^^^^^^^^^^^^^^^^     ^^
+   |         |
+   |         unsatisfied trait bound introduced here
 help: consider restricting type parameter `T`
    |
 LL | type Converter<T: Trait> = impl ProofForConversion<T>;
diff --git a/src/test/ui/type-alias-impl-trait/underconstrained_lifetime.rs b/tests/ui/type-alias-impl-trait/underconstrained_lifetime.rs
index c5b2e8a1c..c5b2e8a1c 100644
--- a/src/test/ui/type-alias-impl-trait/underconstrained_lifetime.rs
+++ b/tests/ui/type-alias-impl-trait/underconstrained_lifetime.rs
diff --git a/src/test/ui/type-alias-impl-trait/underconstrained_lifetime.stderr b/tests/ui/type-alias-impl-trait/underconstrained_lifetime.stderr
index 12d85a49d..12d85a49d 100644
--- a/src/test/ui/type-alias-impl-trait/underconstrained_lifetime.stderr
+++ b/tests/ui/type-alias-impl-trait/underconstrained_lifetime.stderr
diff --git a/tests/ui/type-alias-impl-trait/unnameable_type.rs b/tests/ui/type-alias-impl-trait/unnameable_type.rs
new file mode 100644
index 000000000..1739ab006
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/unnameable_type.rs
@@ -0,0 +1,24 @@
+#![feature(type_alias_impl_trait)]
+
+// This test ensures that unnameable types stay unnameable
+// https://github.com/rust-lang/rust/issues/63063#issuecomment-1360053614
+
+// library
+mod private {
+    pub struct Private;
+    pub trait Trait {
+        fn dont_define_this(_private: Private) {}
+    }
+}
+
+use private::Trait;
+
+// downstream
+type MyPrivate = impl Sized;
+//~^ ERROR: unconstrained opaque type
+impl Trait for u32 {
+    fn dont_define_this(_private: MyPrivate) {}
+    //~^ ERROR: incompatible type for trait
+}
+
+fn main() {}
diff --git a/tests/ui/type-alias-impl-trait/unnameable_type.stderr b/tests/ui/type-alias-impl-trait/unnameable_type.stderr
new file mode 100644
index 000000000..7dc6efc4b
--- /dev/null
+++ b/tests/ui/type-alias-impl-trait/unnameable_type.stderr
@@ -0,0 +1,31 @@
+error: unconstrained opaque type
+  --> $DIR/unnameable_type.rs:17:18
+   |
+LL | type MyPrivate = impl Sized;
+   |                  ^^^^^^^^^^
+   |
+   = note: `MyPrivate` must be used in combination with a concrete type within the same module
+
+error[E0053]: method `dont_define_this` has an incompatible type for trait
+  --> $DIR/unnameable_type.rs:20:35
+   |
+LL | type MyPrivate = impl Sized;
+   |                  ---------- the found opaque type
+...
+LL |     fn dont_define_this(_private: MyPrivate) {}
+   |                                   ^^^^^^^^^
+   |                                   |
+   |                                   expected struct `Private`, found opaque type
+   |                                   help: change the parameter type to match the trait: `Private`
+   |
+note: type in trait
+  --> $DIR/unnameable_type.rs:10:39
+   |
+LL |         fn dont_define_this(_private: Private) {}
+   |                                       ^^^^^^^
+   = note: expected signature `fn(Private)`
+              found signature `fn(MyPrivate)`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0053`.
diff --git a/src/test/ui/type-alias-impl-trait/unused_generic_param.rs b/tests/ui/type-alias-impl-trait/unused_generic_param.rs
index ad5e4918c..ad5e4918c 100644
--- a/src/test/ui/type-alias-impl-trait/unused_generic_param.rs
+++ b/tests/ui/type-alias-impl-trait/unused_generic_param.rs
diff --git a/src/test/ui/type-alias-impl-trait/weird-return-types.rs b/tests/ui/type-alias-impl-trait/weird-return-types.rs
index faad5ee95..faad5ee95 100644
--- a/src/test/ui/type-alias-impl-trait/weird-return-types.rs
+++ b/tests/ui/type-alias-impl-trait/weird-return-types.rs
diff --git a/src/test/ui/type-alias-impl-trait/wf-check-fn-def.rs b/tests/ui/type-alias-impl-trait/wf-check-fn-def.rs
index 449e9fbd0..449e9fbd0 100644
--- a/src/test/ui/type-alias-impl-trait/wf-check-fn-def.rs
+++ b/tests/ui/type-alias-impl-trait/wf-check-fn-def.rs
diff --git a/src/test/ui/type-alias-impl-trait/wf-check-fn-def.stderr b/tests/ui/type-alias-impl-trait/wf-check-fn-def.stderr
index e0005489d..e0005489d 100644
--- a/src/test/ui/type-alias-impl-trait/wf-check-fn-def.stderr
+++ b/tests/ui/type-alias-impl-trait/wf-check-fn-def.stderr
diff --git a/src/test/ui/type-alias-impl-trait/wf-check-fn-ptrs.rs b/tests/ui/type-alias-impl-trait/wf-check-fn-ptrs.rs
index 3b8470e4a..3b8470e4a 100644
--- a/src/test/ui/type-alias-impl-trait/wf-check-fn-ptrs.rs
+++ b/tests/ui/type-alias-impl-trait/wf-check-fn-ptrs.rs
diff --git a/src/test/ui/type-alias-impl-trait/wf_check_closures.rs b/tests/ui/type-alias-impl-trait/wf_check_closures.rs
index 2c70696ff..2c70696ff 100644
--- a/src/test/ui/type-alias-impl-trait/wf_check_closures.rs
+++ b/tests/ui/type-alias-impl-trait/wf_check_closures.rs
diff --git a/src/test/ui/type-alias-impl-trait/wf_check_closures.stderr b/tests/ui/type-alias-impl-trait/wf_check_closures.stderr
index 58ae8617b..58ae8617b 100644
--- a/src/test/ui/type-alias-impl-trait/wf_check_closures.stderr
+++ b/tests/ui/type-alias-impl-trait/wf_check_closures.stderr
diff --git a/src/test/ui/type-alias/issue-14933.rs b/tests/ui/type-alias/issue-14933.rs
index bd95332ca..bd95332ca 100644
--- a/src/test/ui/type-alias/issue-14933.rs
+++ b/tests/ui/type-alias/issue-14933.rs
diff --git a/src/test/ui/issues/issue-37515.rs b/tests/ui/type-alias/issue-37515.rs
index b3a870d50..b3a870d50 100644
--- a/src/test/ui/issues/issue-37515.rs
+++ b/tests/ui/type-alias/issue-37515.rs
diff --git a/src/test/ui/issues/issue-37515.stderr b/tests/ui/type-alias/issue-37515.stderr
index f1e83ca74..f1e83ca74 100644
--- a/src/test/ui/issues/issue-37515.stderr
+++ b/tests/ui/type-alias/issue-37515.stderr
diff --git a/src/test/ui/type-alias/issue-62263-self-in-atb.rs b/tests/ui/type-alias/issue-62263-self-in-atb.rs
index 91522d891..91522d891 100644
--- a/src/test/ui/type-alias/issue-62263-self-in-atb.rs
+++ b/tests/ui/type-alias/issue-62263-self-in-atb.rs
diff --git a/src/test/ui/type-alias/issue-62263-self-in-atb.stderr b/tests/ui/type-alias/issue-62263-self-in-atb.stderr
index c20074dc2..c20074dc2 100644
--- a/src/test/ui/type-alias/issue-62263-self-in-atb.stderr
+++ b/tests/ui/type-alias/issue-62263-self-in-atb.stderr
diff --git a/src/test/ui/type-alias/issue-62305-self-assoc-ty.rs b/tests/ui/type-alias/issue-62305-self-assoc-ty.rs
index a4d9a2854..a4d9a2854 100644
--- a/src/test/ui/type-alias/issue-62305-self-assoc-ty.rs
+++ b/tests/ui/type-alias/issue-62305-self-assoc-ty.rs
diff --git a/src/test/ui/type-alias/issue-62305-self-assoc-ty.stderr b/tests/ui/type-alias/issue-62305-self-assoc-ty.stderr
index f3da50df9..f3da50df9 100644
--- a/src/test/ui/type-alias/issue-62305-self-assoc-ty.stderr
+++ b/tests/ui/type-alias/issue-62305-self-assoc-ty.stderr
diff --git a/src/test/ui/type-alias/issue-62364-self-ty-arg.rs b/tests/ui/type-alias/issue-62364-self-ty-arg.rs
index bebb4a902..bebb4a902 100644
--- a/src/test/ui/type-alias/issue-62364-self-ty-arg.rs
+++ b/tests/ui/type-alias/issue-62364-self-ty-arg.rs
diff --git a/src/test/ui/type-alias/issue-62364-self-ty-arg.stderr b/tests/ui/type-alias/issue-62364-self-ty-arg.stderr
index 7e15e42e3..7e15e42e3 100644
--- a/src/test/ui/type-alias/issue-62364-self-ty-arg.stderr
+++ b/tests/ui/type-alias/issue-62364-self-ty-arg.stderr
diff --git a/src/test/ui/type-id-higher-rank-2.rs b/tests/ui/type-id-higher-rank-2.rs
index 5391c849d..5391c849d 100644
--- a/src/test/ui/type-id-higher-rank-2.rs
+++ b/tests/ui/type-id-higher-rank-2.rs
diff --git a/src/test/ui/type-inference/issue-30225.rs b/tests/ui/type-inference/issue-30225.rs
index 42315332c..42315332c 100644
--- a/src/test/ui/type-inference/issue-30225.rs
+++ b/tests/ui/type-inference/issue-30225.rs
diff --git a/src/test/ui/type-inference/issue-30225.stderr b/tests/ui/type-inference/issue-30225.stderr
index ccd05fa6b..ccd05fa6b 100644
--- a/src/test/ui/type-inference/issue-30225.stderr
+++ b/tests/ui/type-inference/issue-30225.stderr
diff --git a/src/test/ui/type-inference/or_else-multiple-type-params.rs b/tests/ui/type-inference/or_else-multiple-type-params.rs
index b15de2a45..b15de2a45 100644
--- a/src/test/ui/type-inference/or_else-multiple-type-params.rs
+++ b/tests/ui/type-inference/or_else-multiple-type-params.rs
diff --git a/src/test/ui/type-inference/or_else-multiple-type-params.stderr b/tests/ui/type-inference/or_else-multiple-type-params.stderr
index 6ac63a91e..6ac63a91e 100644
--- a/src/test/ui/type-inference/or_else-multiple-type-params.stderr
+++ b/tests/ui/type-inference/or_else-multiple-type-params.stderr
diff --git a/src/test/ui/type-inference/sort_by_key.rs b/tests/ui/type-inference/sort_by_key.rs
index afc4d90b8..afc4d90b8 100644
--- a/src/test/ui/type-inference/sort_by_key.rs
+++ b/tests/ui/type-inference/sort_by_key.rs
diff --git a/src/test/ui/type-inference/sort_by_key.stderr b/tests/ui/type-inference/sort_by_key.stderr
index 0a48d5756..0a48d5756 100644
--- a/src/test/ui/type-inference/sort_by_key.stderr
+++ b/tests/ui/type-inference/sort_by_key.stderr
diff --git a/src/test/ui/type-inference/unbounded-associated-type.rs b/tests/ui/type-inference/unbounded-associated-type.rs
index 0167e9436..0167e9436 100644
--- a/src/test/ui/type-inference/unbounded-associated-type.rs
+++ b/tests/ui/type-inference/unbounded-associated-type.rs
diff --git a/src/test/ui/type-inference/unbounded-associated-type.stderr b/tests/ui/type-inference/unbounded-associated-type.stderr
index e0fecc72f..e0fecc72f 100644
--- a/src/test/ui/type-inference/unbounded-associated-type.stderr
+++ b/tests/ui/type-inference/unbounded-associated-type.stderr
diff --git a/src/test/ui/type-inference/unbounded-type-param-in-fn-with-assoc-type.rs b/tests/ui/type-inference/unbounded-type-param-in-fn-with-assoc-type.rs
index 81d054b3a..81d054b3a 100644
--- a/src/test/ui/type-inference/unbounded-type-param-in-fn-with-assoc-type.rs
+++ b/tests/ui/type-inference/unbounded-type-param-in-fn-with-assoc-type.rs
diff --git a/src/test/ui/type-inference/unbounded-type-param-in-fn-with-assoc-type.stderr b/tests/ui/type-inference/unbounded-type-param-in-fn-with-assoc-type.stderr
index 209abfe5c..209abfe5c 100644
--- a/src/test/ui/type-inference/unbounded-type-param-in-fn-with-assoc-type.stderr
+++ b/tests/ui/type-inference/unbounded-type-param-in-fn-with-assoc-type.stderr
diff --git a/src/test/ui/type-inference/unbounded-type-param-in-fn.rs b/tests/ui/type-inference/unbounded-type-param-in-fn.rs
index 1f336ed59..1f336ed59 100644
--- a/src/test/ui/type-inference/unbounded-type-param-in-fn.rs
+++ b/tests/ui/type-inference/unbounded-type-param-in-fn.rs
diff --git a/src/test/ui/type-inference/unbounded-type-param-in-fn.stderr b/tests/ui/type-inference/unbounded-type-param-in-fn.stderr
index d92892eeb..d92892eeb 100644
--- a/src/test/ui/type-inference/unbounded-type-param-in-fn.stderr
+++ b/tests/ui/type-inference/unbounded-type-param-in-fn.stderr
diff --git a/src/test/ui/type-namespace.rs b/tests/ui/type-namespace.rs
index 3cc0bc447..3cc0bc447 100644
--- a/src/test/ui/type-namespace.rs
+++ b/tests/ui/type-namespace.rs
diff --git a/src/test/ui/type-param-constraints.rs b/tests/ui/type-param-constraints.rs
index 3d87a089f..3d87a089f 100644
--- a/src/test/ui/type-param-constraints.rs
+++ b/tests/ui/type-param-constraints.rs
diff --git a/src/test/ui/type-param.rs b/tests/ui/type-param.rs
index ca2f24d37..ca2f24d37 100644
--- a/src/test/ui/type-param.rs
+++ b/tests/ui/type-param.rs
diff --git a/src/test/ui/type-ptr.rs b/tests/ui/type-ptr.rs
index 7c2438d38..7c2438d38 100644
--- a/src/test/ui/type-ptr.rs
+++ b/tests/ui/type-ptr.rs
diff --git a/src/test/ui/type-use-i1-versus-i8.rs b/tests/ui/type-use-i1-versus-i8.rs
index 7315cd2fe..7315cd2fe 100644
--- a/src/test/ui/type-use-i1-versus-i8.rs
+++ b/tests/ui/type-use-i1-versus-i8.rs
diff --git a/src/test/ui/type/ascription/issue-34255-1.rs b/tests/ui/type/ascription/issue-34255-1.rs
index 44b47cc4e..44b47cc4e 100644
--- a/src/test/ui/type/ascription/issue-34255-1.rs
+++ b/tests/ui/type/ascription/issue-34255-1.rs
diff --git a/src/test/ui/type/ascription/issue-34255-1.stderr b/tests/ui/type/ascription/issue-34255-1.stderr
index 6819d14bb..fafff19f8 100644
--- a/src/test/ui/type/ascription/issue-34255-1.stderr
+++ b/tests/ui/type/ascription/issue-34255-1.stderr
@@ -25,15 +25,10 @@ error[E0107]: missing generics for struct `Vec`
 LL |         input_cells: Vec::new()
    |                      ^^^ expected at least 1 generic argument
    |
-note: struct defined here, with at least 1 generic parameter: `T`
-  --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-   |
-LL | pub struct Vec<T, #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global> {
-   |            ^^^ -
 help: add missing generic argument
    |
 LL |         input_cells: Vec<T>::new()
-   |                      ~~~~~~
+   |                         +++
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/type/ascription/issue-47666.fixed b/tests/ui/type/ascription/issue-47666.fixed
index c4db74755..c4db74755 100644
--- a/src/test/ui/type/ascription/issue-47666.fixed
+++ b/tests/ui/type/ascription/issue-47666.fixed
diff --git a/src/test/ui/type/ascription/issue-47666.rs b/tests/ui/type/ascription/issue-47666.rs
index c67202e21..c67202e21 100644
--- a/src/test/ui/type/ascription/issue-47666.rs
+++ b/tests/ui/type/ascription/issue-47666.rs
diff --git a/src/test/ui/type/ascription/issue-47666.stderr b/tests/ui/type/ascription/issue-47666.stderr
index 0f90fce3a..0f90fce3a 100644
--- a/src/test/ui/type/ascription/issue-47666.stderr
+++ b/tests/ui/type/ascription/issue-47666.stderr
diff --git a/src/test/ui/type/ascription/issue-54516.fixed b/tests/ui/type/ascription/issue-54516.fixed
index f78268894..f78268894 100644
--- a/src/test/ui/type/ascription/issue-54516.fixed
+++ b/tests/ui/type/ascription/issue-54516.fixed
diff --git a/src/test/ui/type/ascription/issue-54516.rs b/tests/ui/type/ascription/issue-54516.rs
index 1f34e6943..1f34e6943 100644
--- a/src/test/ui/type/ascription/issue-54516.rs
+++ b/tests/ui/type/ascription/issue-54516.rs
diff --git a/src/test/ui/type/ascription/issue-54516.stderr b/tests/ui/type/ascription/issue-54516.stderr
index 1ab9093e5..1ab9093e5 100644
--- a/src/test/ui/type/ascription/issue-54516.stderr
+++ b/tests/ui/type/ascription/issue-54516.stderr
diff --git a/src/test/ui/type/ascription/issue-60933.fixed b/tests/ui/type/ascription/issue-60933.fixed
index 3e8be3875..3e8be3875 100644
--- a/src/test/ui/type/ascription/issue-60933.fixed
+++ b/tests/ui/type/ascription/issue-60933.fixed
diff --git a/src/test/ui/type/ascription/issue-60933.rs b/tests/ui/type/ascription/issue-60933.rs
index 2a4ad7bdc..2a4ad7bdc 100644
--- a/src/test/ui/type/ascription/issue-60933.rs
+++ b/tests/ui/type/ascription/issue-60933.rs
diff --git a/src/test/ui/type/ascription/issue-60933.stderr b/tests/ui/type/ascription/issue-60933.stderr
index 0b7f8edf6..0b7f8edf6 100644
--- a/src/test/ui/type/ascription/issue-60933.stderr
+++ b/tests/ui/type/ascription/issue-60933.stderr
diff --git a/src/test/ui/type/auxiliary/crate_a1.rs b/tests/ui/type/auxiliary/crate_a1.rs
index e2e185005..e2e185005 100644
--- a/src/test/ui/type/auxiliary/crate_a1.rs
+++ b/tests/ui/type/auxiliary/crate_a1.rs
diff --git a/src/test/ui/type/auxiliary/crate_a2.rs b/tests/ui/type/auxiliary/crate_a2.rs
index d16a4ac10..d16a4ac10 100644
--- a/src/test/ui/type/auxiliary/crate_a2.rs
+++ b/tests/ui/type/auxiliary/crate_a2.rs
diff --git a/tests/ui/type/binding-assigned-block-without-tail-expression.rs b/tests/ui/type/binding-assigned-block-without-tail-expression.rs
new file mode 100644
index 000000000..09afd27a0
--- /dev/null
+++ b/tests/ui/type/binding-assigned-block-without-tail-expression.rs
@@ -0,0 +1,22 @@
+struct S;
+fn main() {
+    let x = {
+        println!("foo");
+        42;
+    };
+    let y = {};
+    let z = {
+        "hi";
+    };
+    let s = {
+        S;
+    };
+    println!("{}", x); //~ ERROR E0277
+    println!("{}", y); //~ ERROR E0277
+    println!("{}", z); //~ ERROR E0277
+    println!("{}", s); //~ ERROR E0277
+    let _: i32 = x; //~ ERROR E0308
+    let _: i32 = y; //~ ERROR E0308
+    let _: i32 = z; //~ ERROR E0308
+    let _: i32 = s; //~ ERROR E0308
+}
diff --git a/tests/ui/type/binding-assigned-block-without-tail-expression.stderr b/tests/ui/type/binding-assigned-block-without-tail-expression.stderr
new file mode 100644
index 000000000..3e96d7f31
--- /dev/null
+++ b/tests/ui/type/binding-assigned-block-without-tail-expression.stderr
@@ -0,0 +1,109 @@
+error[E0277]: `()` doesn't implement `std::fmt::Display`
+  --> $DIR/binding-assigned-block-without-tail-expression.rs:14:20
+   |
+LL |         42;
+   |           - help: remove this semicolon
+...
+LL |     println!("{}", x);
+   |                    ^ `()` cannot be formatted with the default formatter
+   |
+   = help: the trait `std::fmt::Display` is not implemented for `()`
+   = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+   = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: `()` doesn't implement `std::fmt::Display`
+  --> $DIR/binding-assigned-block-without-tail-expression.rs:15:20
+   |
+LL |     let y = {};
+   |             -- this empty block is missing a tail expression
+...
+LL |     println!("{}", y);
+   |                    ^ `()` cannot be formatted with the default formatter
+   |
+   = help: the trait `std::fmt::Display` is not implemented for `()`
+   = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+   = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: `()` doesn't implement `std::fmt::Display`
+  --> $DIR/binding-assigned-block-without-tail-expression.rs:16:20
+   |
+LL |         "hi";
+   |             - help: remove this semicolon
+...
+LL |     println!("{}", z);
+   |                    ^ `()` cannot be formatted with the default formatter
+   |
+   = help: the trait `std::fmt::Display` is not implemented for `()`
+   = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+   = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: `()` doesn't implement `std::fmt::Display`
+  --> $DIR/binding-assigned-block-without-tail-expression.rs:17:20
+   |
+LL |       let s = {
+   |  _____________-
+LL | |         S;
+LL | |     };
+   | |_____- this block is missing a tail expression
+...
+LL |       println!("{}", s);
+   |                      ^ `()` cannot be formatted with the default formatter
+   |
+   = help: the trait `std::fmt::Display` is not implemented for `()`
+   = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+   = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0308]: mismatched types
+  --> $DIR/binding-assigned-block-without-tail-expression.rs:18:18
+   |
+LL |         42;
+   |           - help: remove this semicolon
+...
+LL |     let _: i32 = x;
+   |            ---   ^ expected `i32`, found `()`
+   |            |
+   |            expected due to this
+
+error[E0308]: mismatched types
+  --> $DIR/binding-assigned-block-without-tail-expression.rs:19:18
+   |
+LL |     let y = {};
+   |             -- this empty block is missing a tail expression
+...
+LL |     let _: i32 = y;
+   |            ---   ^ expected `i32`, found `()`
+   |            |
+   |            expected due to this
+
+error[E0308]: mismatched types
+  --> $DIR/binding-assigned-block-without-tail-expression.rs:20:18
+   |
+LL |       let z = {
+   |  _____________-
+LL | |         "hi";
+LL | |     };
+   | |_____- this block is missing a tail expression
+...
+LL |       let _: i32 = z;
+   |              ---   ^ expected `i32`, found `()`
+   |              |
+   |              expected due to this
+
+error[E0308]: mismatched types
+  --> $DIR/binding-assigned-block-without-tail-expression.rs:21:18
+   |
+LL |       let s = {
+   |  _____________-
+LL | |         S;
+LL | |     };
+   | |_____- this block is missing a tail expression
+...
+LL |       let _: i32 = s;
+   |              ---   ^ expected `i32`, found `()`
+   |              |
+   |              expected due to this
+
+error: aborting due to 8 previous errors
+
+Some errors have detailed explanations: E0277, E0308.
+For more information about an error, try `rustc --explain E0277`.
diff --git a/tests/ui/type/closure-with-wrong-borrows.rs b/tests/ui/type/closure-with-wrong-borrows.rs
new file mode 100644
index 000000000..5f6a78351
--- /dev/null
+++ b/tests/ui/type/closure-with-wrong-borrows.rs
@@ -0,0 +1,10 @@
+struct S<'a>(&'a str);
+
+fn f(inner: fn(&str, &S)) {
+}
+
+#[allow(unreachable_code)]
+fn main() {
+    let inner: fn(_, _) = unimplemented!();
+    f(inner); //~ ERROR mismatched types
+}
diff --git a/tests/ui/type/closure-with-wrong-borrows.stderr b/tests/ui/type/closure-with-wrong-borrows.stderr
new file mode 100644
index 000000000..7370bc764
--- /dev/null
+++ b/tests/ui/type/closure-with-wrong-borrows.stderr
@@ -0,0 +1,19 @@
+error[E0308]: mismatched types
+  --> $DIR/closure-with-wrong-borrows.rs:9:7
+   |
+LL |     f(inner);
+   |     - ^^^^^ one type is more general than the other
+   |     |
+   |     arguments to this function are incorrect
+   |
+   = note: expected fn pointer `for<'a, 'b, 'c> fn(&'a str, &'b S<'c>)`
+              found fn pointer `fn(_, _)`
+note: function defined here
+  --> $DIR/closure-with-wrong-borrows.rs:3:4
+   |
+LL | fn f(inner: fn(&str, &S)) {
+   |    ^ -------------------
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/type/issue-100584.rs b/tests/ui/type/issue-100584.rs
index 102846563..102846563 100644
--- a/src/test/ui/type/issue-100584.rs
+++ b/tests/ui/type/issue-100584.rs
diff --git a/src/test/ui/type/issue-100584.stderr b/tests/ui/type/issue-100584.stderr
index e1db14d1f..e1db14d1f 100644
--- a/src/test/ui/type/issue-100584.stderr
+++ b/tests/ui/type/issue-100584.stderr
diff --git a/src/test/ui/type/issue-101866.rs b/tests/ui/type/issue-101866.rs
index d332c4adb..d332c4adb 100644
--- a/src/test/ui/type/issue-101866.rs
+++ b/tests/ui/type/issue-101866.rs
diff --git a/src/test/ui/type/issue-101866.stderr b/tests/ui/type/issue-101866.stderr
index fe9982119..fe9982119 100644
--- a/src/test/ui/type/issue-101866.stderr
+++ b/tests/ui/type/issue-101866.stderr
diff --git a/tests/ui/type/issue-102598.rs b/tests/ui/type/issue-102598.rs
new file mode 100644
index 000000000..93808f18b
--- /dev/null
+++ b/tests/ui/type/issue-102598.rs
@@ -0,0 +1,8 @@
+fn foo<'a>(_: impl 'a Sized) {}
+//~^ ERROR: expected `+` between lifetime and Sized
+//~| ERROR: expected one of `:`, `@`, or `|`, found `)`
+//~| ERROR: expected one of `)`, `+`, or `,`, found `Sized`
+//~| ERROR: at least one trait must be specified
+
+fn main(){
+}
diff --git a/tests/ui/type/issue-102598.stderr b/tests/ui/type/issue-102598.stderr
new file mode 100644
index 000000000..a232395ce
--- /dev/null
+++ b/tests/ui/type/issue-102598.stderr
@@ -0,0 +1,43 @@
+error: expected `+` between lifetime and Sized
+  --> $DIR/issue-102598.rs:1:20
+   |
+LL | fn foo<'a>(_: impl 'a Sized) {}
+   |                    ^^
+   |
+help: add `+`
+   |
+LL | fn foo<'a>(_: impl 'a + Sized) {}
+   |                       +
+
+error: expected one of `:`, `@`, or `|`, found `)`
+  --> $DIR/issue-102598.rs:1:28
+   |
+LL | fn foo<'a>(_: impl 'a Sized) {}
+   |                            ^ expected one of `:`, `@`, or `|`
+   |
+   = note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
+help: if this is a parameter name, give it a type
+   |
+LL | fn foo<'a>(_: impl 'a Sized: TypeName) {}
+   |                            ++++++++++
+help: if this is a type, explicitly ignore the parameter name
+   |
+LL | fn foo<'a>(_: impl 'a _: Sized) {}
+   |                       ++
+
+error: expected one of `)`, `+`, or `,`, found `Sized`
+  --> $DIR/issue-102598.rs:1:23
+   |
+LL | fn foo<'a>(_: impl 'a Sized) {}
+   |                      -^^^^^ expected one of `)`, `+`, or `,`
+   |                      |
+   |                      help: missing `,`
+
+error: at least one trait must be specified
+  --> $DIR/issue-102598.rs:1:15
+   |
+LL | fn foo<'a>(_: impl 'a Sized) {}
+   |               ^^^^^^^
+
+error: aborting due to 4 previous errors
+
diff --git a/src/test/ui/type/issue-103271.rs b/tests/ui/type/issue-103271.rs
index 7cd76286a..7cd76286a 100644
--- a/src/test/ui/type/issue-103271.rs
+++ b/tests/ui/type/issue-103271.rs
diff --git a/src/test/ui/type/issue-103271.stderr b/tests/ui/type/issue-103271.stderr
index f4dac51b2..f4dac51b2 100644
--- a/src/test/ui/type/issue-103271.stderr
+++ b/tests/ui/type/issue-103271.stderr
diff --git a/tests/ui/type/issue-58355.rs b/tests/ui/type/issue-58355.rs
new file mode 100644
index 000000000..3b62fdece
--- /dev/null
+++ b/tests/ui/type/issue-58355.rs
@@ -0,0 +1,7 @@
+#![crate_type = "lib"]
+
+pub fn foo(callback: fn() -> dyn ToString) {
+    let mut x: Option<Box<dyn Fn() -> dyn ToString>> = None;
+    x = Some(Box::new(callback));
+    //~^ ERROR: the size for values of type `dyn ToString` cannot be known at compilation time
+}
diff --git a/tests/ui/type/issue-58355.stderr b/tests/ui/type/issue-58355.stderr
new file mode 100644
index 000000000..6f89a7b00
--- /dev/null
+++ b/tests/ui/type/issue-58355.stderr
@@ -0,0 +1,13 @@
+error[E0277]: the size for values of type `dyn ToString` cannot be known at compilation time
+  --> $DIR/issue-58355.rs:5:14
+   |
+LL |     x = Some(Box::new(callback));
+   |              ^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |
+   = help: within `fn() -> dyn ToString`, the trait `Sized` is not implemented for `dyn ToString`
+   = note: required because it appears within the type `fn() -> dyn ToString`
+   = note: required for the cast from `fn() -> dyn ToString` to the object type `dyn Fn() -> (dyn ToString + 'static)`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/type/issue-67690-type-alias-bound-diagnostic-crash.rs b/tests/ui/type/issue-67690-type-alias-bound-diagnostic-crash.rs
index 68aadcf60..68aadcf60 100644
--- a/src/test/ui/type/issue-67690-type-alias-bound-diagnostic-crash.rs
+++ b/tests/ui/type/issue-67690-type-alias-bound-diagnostic-crash.rs
diff --git a/src/test/ui/type/issue-67690-type-alias-bound-diagnostic-crash.stderr b/tests/ui/type/issue-67690-type-alias-bound-diagnostic-crash.stderr
index 125ffbbb4..125ffbbb4 100644
--- a/src/test/ui/type/issue-67690-type-alias-bound-diagnostic-crash.stderr
+++ b/tests/ui/type/issue-67690-type-alias-bound-diagnostic-crash.stderr
diff --git a/src/test/ui/type/issue-91268.rs b/tests/ui/type/issue-91268.rs
index f1e16bc7b..f1e16bc7b 100644
--- a/src/test/ui/type/issue-91268.rs
+++ b/tests/ui/type/issue-91268.rs
diff --git a/src/test/ui/type/issue-91268.stderr b/tests/ui/type/issue-91268.stderr
index 6c9ee9945..6c9ee9945 100644
--- a/src/test/ui/type/issue-91268.stderr
+++ b/tests/ui/type/issue-91268.stderr
diff --git a/src/test/ui/type/issue-94187-verbose-type-name.rs b/tests/ui/type/issue-94187-verbose-type-name.rs
index 3713a32eb..3713a32eb 100644
--- a/src/test/ui/type/issue-94187-verbose-type-name.rs
+++ b/tests/ui/type/issue-94187-verbose-type-name.rs
diff --git a/src/test/ui/type/missing-let-in-binding.fixed b/tests/ui/type/missing-let-in-binding.fixed
index d17876889..d17876889 100644
--- a/src/test/ui/type/missing-let-in-binding.fixed
+++ b/tests/ui/type/missing-let-in-binding.fixed
diff --git a/src/test/ui/type/missing-let-in-binding.rs b/tests/ui/type/missing-let-in-binding.rs
index ca42f2e6e..ca42f2e6e 100644
--- a/src/test/ui/type/missing-let-in-binding.rs
+++ b/tests/ui/type/missing-let-in-binding.rs
diff --git a/src/test/ui/type/missing-let-in-binding.stderr b/tests/ui/type/missing-let-in-binding.stderr
index 12759c509..12759c509 100644
--- a/src/test/ui/type/missing-let-in-binding.stderr
+++ b/tests/ui/type/missing-let-in-binding.stderr
diff --git a/src/test/ui/type/type-alias-bounds.rs b/tests/ui/type/type-alias-bounds.rs
index e49731725..e49731725 100644
--- a/src/test/ui/type/type-alias-bounds.rs
+++ b/tests/ui/type/type-alias-bounds.rs
diff --git a/src/test/ui/type/type-alias-bounds.stderr b/tests/ui/type/type-alias-bounds.stderr
index 92e573393..92e573393 100644
--- a/src/test/ui/type/type-alias-bounds.stderr
+++ b/tests/ui/type/type-alias-bounds.stderr
diff --git a/src/test/ui/type/type-annotation-needed.rs b/tests/ui/type/type-annotation-needed.rs
index 347887f4b..347887f4b 100644
--- a/src/test/ui/type/type-annotation-needed.rs
+++ b/tests/ui/type/type-annotation-needed.rs
diff --git a/src/test/ui/type/type-annotation-needed.stderr b/tests/ui/type/type-annotation-needed.stderr
index 4af4c22f7..87bba3166 100644
--- a/src/test/ui/type/type-annotation-needed.stderr
+++ b/tests/ui/type/type-annotation-needed.stderr
@@ -10,7 +10,7 @@ note: required by a bound in `foo`
    |
 LL | fn foo<T: Into<String>>(x: i32) {}
    |           ^^^^^^^^^^^^ required by this bound in `foo`
-help: consider specifying the type argument in the function call
+help: consider specifying the generic argument
    |
 LL |     foo::<T>(42);
    |        +++++
diff --git a/src/test/ui/type/type-arg-out-of-scope.rs b/tests/ui/type/type-arg-out-of-scope.rs
index 02aad0077..02aad0077 100644
--- a/src/test/ui/type/type-arg-out-of-scope.rs
+++ b/tests/ui/type/type-arg-out-of-scope.rs
diff --git a/src/test/ui/type/type-arg-out-of-scope.stderr b/tests/ui/type/type-arg-out-of-scope.stderr
index 7f18b4510..7f18b4510 100644
--- a/src/test/ui/type/type-arg-out-of-scope.stderr
+++ b/tests/ui/type/type-arg-out-of-scope.stderr
diff --git a/tests/ui/type/type-ascription-instead-of-initializer.rs b/tests/ui/type/type-ascription-instead-of-initializer.rs
new file mode 100644
index 000000000..8978c85ed
--- /dev/null
+++ b/tests/ui/type/type-ascription-instead-of-initializer.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let x: Vec::with_capacity(10, 20);  //~ ERROR expected type, found `10`
+    //~^ ERROR function takes 1 argument
+}
diff --git a/src/test/ui/type/type-ascription-instead-of-initializer.stderr b/tests/ui/type/type-ascription-instead-of-initializer.stderr
index de578ca93..ba8d15d0b 100644
--- a/src/test/ui/type/type-ascription-instead-of-initializer.stderr
+++ b/tests/ui/type/type-ascription-instead-of-initializer.stderr
@@ -15,9 +15,6 @@ LL |     let x: Vec::with_capacity(10, 20);
    |
 note: associated function defined here
   --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-   |
-LL |     pub fn with_capacity(capacity: usize) -> Self {
-   |            ^^^^^^^^^^^^^
 help: remove the extra argument
    |
 LL |     let x: Vec::with_capacity(10);
diff --git a/src/test/ui/type/type-ascription-instead-of-statement-end.rs b/tests/ui/type/type-ascription-instead-of-statement-end.rs
index 1d5565ab5..1d5565ab5 100644
--- a/src/test/ui/type/type-ascription-instead-of-statement-end.rs
+++ b/tests/ui/type/type-ascription-instead-of-statement-end.rs
diff --git a/src/test/ui/type/type-ascription-instead-of-statement-end.stderr b/tests/ui/type/type-ascription-instead-of-statement-end.stderr
index 521ebcdf1..521ebcdf1 100644
--- a/src/test/ui/type/type-ascription-instead-of-statement-end.stderr
+++ b/tests/ui/type/type-ascription-instead-of-statement-end.stderr
diff --git a/src/test/ui/type/type-ascription-precedence.rs b/tests/ui/type/type-ascription-precedence.rs
index d3aef929b..d3aef929b 100644
--- a/src/test/ui/type/type-ascription-precedence.rs
+++ b/tests/ui/type/type-ascription-precedence.rs
diff --git a/src/test/ui/type/type-ascription-precedence.stderr b/tests/ui/type/type-ascription-precedence.stderr
index a8139063d..edc5aeffd 100644
--- a/src/test/ui/type/type-ascription-precedence.stderr
+++ b/tests/ui/type/type-ascription-precedence.stderr
@@ -33,11 +33,8 @@ note: an implementation of `std::ops::Neg` might be missing for `Z`
    |
 LL | struct Z;
    | ^^^^^^^^ must implement `std::ops::Neg`
-note: the following trait must be implemented
+note: the trait `std::ops::Neg` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Neg {
-   | ^^^^^^^^^^^^^
 
 error[E0308]: mismatched types
   --> $DIR/type-ascription-precedence.rs:45:5
@@ -55,7 +52,7 @@ error[E0308]: mismatched types
   --> $DIR/type-ascription-precedence.rs:53:5
    |
 LL |     (S .. S): S;
-   |     ^^^^^^^^ expected struct `S`, found struct `std::ops::Range`
+   |     ^^^^^^^^ expected struct `S`, found struct `Range`
    |
    = note: expected struct `S`
               found struct `std::ops::Range<S>`
diff --git a/src/test/ui/type/type-ascription-soundness.rs b/tests/ui/type/type-ascription-soundness.rs
index 08316cdcd..08316cdcd 100644
--- a/src/test/ui/type/type-ascription-soundness.rs
+++ b/tests/ui/type/type-ascription-soundness.rs
diff --git a/src/test/ui/type/type-ascription-soundness.stderr b/tests/ui/type/type-ascription-soundness.stderr
index 522d5b2e3..522d5b2e3 100644
--- a/src/test/ui/type/type-ascription-soundness.stderr
+++ b/tests/ui/type/type-ascription-soundness.stderr
diff --git a/src/test/ui/type/type-ascription-with-fn-call.fixed b/tests/ui/type/type-ascription-with-fn-call.fixed
index 6d96c4303..6d96c4303 100644
--- a/src/test/ui/type/type-ascription-with-fn-call.fixed
+++ b/tests/ui/type/type-ascription-with-fn-call.fixed
diff --git a/src/test/ui/type/type-ascription-with-fn-call.rs b/tests/ui/type/type-ascription-with-fn-call.rs
index ed4f7c904..ed4f7c904 100644
--- a/src/test/ui/type/type-ascription-with-fn-call.rs
+++ b/tests/ui/type/type-ascription-with-fn-call.rs
diff --git a/src/test/ui/type/type-ascription-with-fn-call.stderr b/tests/ui/type/type-ascription-with-fn-call.stderr
index d78fd08fd..d78fd08fd 100644
--- a/src/test/ui/type/type-ascription-with-fn-call.stderr
+++ b/tests/ui/type/type-ascription-with-fn-call.stderr
diff --git a/src/test/ui/type/type-ascription.rs b/tests/ui/type/type-ascription.rs
index e4a4c89d0..e4a4c89d0 100644
--- a/src/test/ui/type/type-ascription.rs
+++ b/tests/ui/type/type-ascription.rs
diff --git a/src/test/ui/type/type-check-defaults.rs b/tests/ui/type/type-check-defaults.rs
index 6a0a7ed33..6a0a7ed33 100644
--- a/src/test/ui/type/type-check-defaults.rs
+++ b/tests/ui/type/type-check-defaults.rs
diff --git a/src/test/ui/type/type-check-defaults.stderr b/tests/ui/type/type-check-defaults.stderr
index 9ba63ffe9..9ba63ffe9 100644
--- a/src/test/ui/type/type-check-defaults.stderr
+++ b/tests/ui/type/type-check-defaults.stderr
diff --git a/src/test/ui/type/type-check/assignment-expected-bool.rs b/tests/ui/type/type-check/assignment-expected-bool.rs
index 191939bdb..191939bdb 100644
--- a/src/test/ui/type/type-check/assignment-expected-bool.rs
+++ b/tests/ui/type/type-check/assignment-expected-bool.rs
diff --git a/src/test/ui/type/type-check/assignment-expected-bool.stderr b/tests/ui/type/type-check/assignment-expected-bool.stderr
index 56494baff..56494baff 100644
--- a/src/test/ui/type/type-check/assignment-expected-bool.stderr
+++ b/tests/ui/type/type-check/assignment-expected-bool.stderr
diff --git a/src/test/ui/type/type-check/assignment-in-if.rs b/tests/ui/type/type-check/assignment-in-if.rs
index ada250df2..ada250df2 100644
--- a/src/test/ui/type/type-check/assignment-in-if.rs
+++ b/tests/ui/type/type-check/assignment-in-if.rs
diff --git a/src/test/ui/type/type-check/assignment-in-if.stderr b/tests/ui/type/type-check/assignment-in-if.stderr
index 8ab08e25e..9f4558ada 100644
--- a/src/test/ui/type/type-check/assignment-in-if.stderr
+++ b/tests/ui/type/type-check/assignment-in-if.stderr
@@ -68,7 +68,9 @@ error[E0308]: mismatched types
   --> $DIR/assignment-in-if.rs:44:18
    |
 LL |     if x == x && x = x && x == x {
-   |                  ^ expected `bool`, found `usize`
+   |        ------    ^ expected `bool`, found `usize`
+   |        |
+   |        expected because this is `bool`
 
 error[E0308]: mismatched types
   --> $DIR/assignment-in-if.rs:44:22
@@ -91,7 +93,9 @@ error[E0308]: mismatched types
   --> $DIR/assignment-in-if.rs:51:28
    |
 LL |     if x == x && x == x && x = x {
-   |                            ^ expected `bool`, found `usize`
+   |        ----------------    ^ expected `bool`, found `usize`
+   |        |
+   |        expected because this is `bool`
 
 error[E0308]: mismatched types
   --> $DIR/assignment-in-if.rs:51:8
diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_array.rs b/tests/ui/type/type-check/cannot_infer_local_or_array.rs
index af7552523..af7552523 100644
--- a/src/test/ui/type/type-check/cannot_infer_local_or_array.rs
+++ b/tests/ui/type/type-check/cannot_infer_local_or_array.rs
diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_array.stderr b/tests/ui/type/type-check/cannot_infer_local_or_array.stderr
index e823bad26..e823bad26 100644
--- a/src/test/ui/type/type-check/cannot_infer_local_or_array.stderr
+++ b/tests/ui/type/type-check/cannot_infer_local_or_array.stderr
diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_vec.rs b/tests/ui/type/type-check/cannot_infer_local_or_vec.rs
index e72ddabf3..e72ddabf3 100644
--- a/src/test/ui/type/type-check/cannot_infer_local_or_vec.rs
+++ b/tests/ui/type/type-check/cannot_infer_local_or_vec.rs
diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_vec.stderr b/tests/ui/type/type-check/cannot_infer_local_or_vec.stderr
index b63d2a3b6..b63d2a3b6 100644
--- a/src/test/ui/type/type-check/cannot_infer_local_or_vec.stderr
+++ b/tests/ui/type/type-check/cannot_infer_local_or_vec.stderr
diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.rs b/tests/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.rs
index d21456439..d21456439 100644
--- a/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.rs
+++ b/tests/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.rs
diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr b/tests/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr
index be60cda68..e544b3695 100644
--- a/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr
+++ b/tests/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr
@@ -2,7 +2,7 @@ error[E0282]: type annotations needed for `(Vec<T>,)`
   --> $DIR/cannot_infer_local_or_vec_in_tuples.rs:2:9
    |
 LL |     let (x, ) = (vec![], );
-   |         ^^^^^
+   |         ^^^^^   ---------- type must be known at this point
    |
 help: consider giving this pattern a type, where the type for type parameter `T` is specified
    |
diff --git a/src/test/ui/type/type-check/issue-22897.rs b/tests/ui/type/type-check/issue-22897.rs
index 8171a0ef1..8171a0ef1 100644
--- a/src/test/ui/type/type-check/issue-22897.rs
+++ b/tests/ui/type/type-check/issue-22897.rs
diff --git a/src/test/ui/type/type-check/issue-22897.stderr b/tests/ui/type/type-check/issue-22897.stderr
index fae7b7926..fae7b7926 100644
--- a/src/test/ui/type/type-check/issue-22897.stderr
+++ b/tests/ui/type/type-check/issue-22897.stderr
diff --git a/src/test/ui/type/type-check/issue-40294.rs b/tests/ui/type/type-check/issue-40294.rs
index 5493a4e5f..5493a4e5f 100644
--- a/src/test/ui/type/type-check/issue-40294.rs
+++ b/tests/ui/type/type-check/issue-40294.rs
diff --git a/tests/ui/type/type-check/issue-40294.stderr b/tests/ui/type/type-check/issue-40294.stderr
new file mode 100644
index 000000000..d15fd2341
--- /dev/null
+++ b/tests/ui/type/type-check/issue-40294.stderr
@@ -0,0 +1,17 @@
+error[E0283]: type annotations needed: cannot satisfy `&'a T: Foo`
+  --> $DIR/issue-40294.rs:6:19
+   |
+LL |     where &'a T : Foo,
+   |                   ^^^
+   |
+note: multiple `impl`s or `where` clauses satisfying `&'a T: Foo` found
+  --> $DIR/issue-40294.rs:6:19
+   |
+LL |     where &'a T : Foo,
+   |                   ^^^
+LL |           &'b T : Foo
+   |                   ^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0283`.
diff --git a/src/test/ui/type/type-check/issue-41314.rs b/tests/ui/type/type-check/issue-41314.rs
index cbd39f5f9..cbd39f5f9 100644
--- a/src/test/ui/type/type-check/issue-41314.rs
+++ b/tests/ui/type/type-check/issue-41314.rs
diff --git a/src/test/ui/type/type-check/issue-41314.stderr b/tests/ui/type/type-check/issue-41314.stderr
index 4a9bf6106..4a9bf6106 100644
--- a/src/test/ui/type/type-check/issue-41314.stderr
+++ b/tests/ui/type/type-check/issue-41314.stderr
diff --git a/src/test/ui/type/type-check/issue-67273-assignment-match-prior-arm-bool-expected-unit.rs b/tests/ui/type/type-check/issue-67273-assignment-match-prior-arm-bool-expected-unit.rs
index c39ab9544..c39ab9544 100644
--- a/src/test/ui/type/type-check/issue-67273-assignment-match-prior-arm-bool-expected-unit.rs
+++ b/tests/ui/type/type-check/issue-67273-assignment-match-prior-arm-bool-expected-unit.rs
diff --git a/src/test/ui/type/type-check/issue-67273-assignment-match-prior-arm-bool-expected-unit.stderr b/tests/ui/type/type-check/issue-67273-assignment-match-prior-arm-bool-expected-unit.stderr
index a431fe89c..a431fe89c 100644
--- a/src/test/ui/type/type-check/issue-67273-assignment-match-prior-arm-bool-expected-unit.stderr
+++ b/tests/ui/type/type-check/issue-67273-assignment-match-prior-arm-bool-expected-unit.stderr
diff --git a/src/test/ui/type/type-check/issue-88577-check-fn-with-more-than-65535-arguments.rs b/tests/ui/type/type-check/issue-88577-check-fn-with-more-than-65535-arguments.rs
index e50cc5865..e50cc5865 100644
--- a/src/test/ui/type/type-check/issue-88577-check-fn-with-more-than-65535-arguments.rs
+++ b/tests/ui/type/type-check/issue-88577-check-fn-with-more-than-65535-arguments.rs
diff --git a/src/test/ui/type/type-check/issue-88577-check-fn-with-more-than-65535-arguments.stderr b/tests/ui/type/type-check/issue-88577-check-fn-with-more-than-65535-arguments.stderr
index 847bc517e..847bc517e 100644
--- a/src/test/ui/type/type-check/issue-88577-check-fn-with-more-than-65535-arguments.stderr
+++ b/tests/ui/type/type-check/issue-88577-check-fn-with-more-than-65535-arguments.stderr
diff --git a/src/test/ui/type/type-check/missing_trait_impl.rs b/tests/ui/type/type-check/missing_trait_impl.rs
index 0e3e703a2..0e3e703a2 100644
--- a/src/test/ui/type/type-check/missing_trait_impl.rs
+++ b/tests/ui/type/type-check/missing_trait_impl.rs
diff --git a/src/test/ui/type/type-check/missing_trait_impl.stderr b/tests/ui/type/type-check/missing_trait_impl.stderr
index 2b58cd418..2b58cd418 100644
--- a/src/test/ui/type/type-check/missing_trait_impl.stderr
+++ b/tests/ui/type/type-check/missing_trait_impl.stderr
diff --git a/tests/ui/type/type-check/point-at-inference-2.rs b/tests/ui/type/type-check/point-at-inference-2.rs
new file mode 100644
index 000000000..6557d7fa1
--- /dev/null
+++ b/tests/ui/type/type-check/point-at-inference-2.rs
@@ -0,0 +1,13 @@
+fn bar(_: Vec<i32>) {}
+fn baz(_: &Vec<&i32>) {}
+fn main() {
+    let v = vec![&1];
+    bar(v); //~ ERROR E0308
+    let v = vec![];
+    baz(&v);
+    baz(&v);
+    bar(v); //~ ERROR E0308
+    let v = vec![];
+    baz(&v);
+    bar(v); //~ ERROR E0308
+}
diff --git a/tests/ui/type/type-check/point-at-inference-2.stderr b/tests/ui/type/type-check/point-at-inference-2.stderr
new file mode 100644
index 000000000..1368aba0d
--- /dev/null
+++ b/tests/ui/type/type-check/point-at-inference-2.stderr
@@ -0,0 +1,51 @@
+error[E0308]: mismatched types
+  --> $DIR/point-at-inference-2.rs:5:9
+   |
+LL |     bar(v);
+   |     --- ^ expected `i32`, found `&{integer}`
+   |     |
+   |     arguments to this function are incorrect
+   |
+   = note: expected struct `Vec<i32>`
+              found struct `Vec<&{integer}>`
+note: function defined here
+  --> $DIR/point-at-inference-2.rs:1:4
+   |
+LL | fn bar(_: Vec<i32>) {}
+   |    ^^^ -----------
+
+error[E0308]: mismatched types
+  --> $DIR/point-at-inference-2.rs:9:9
+   |
+LL |     bar(v);
+   |     --- ^ expected `i32`, found `&i32`
+   |     |
+   |     arguments to this function are incorrect
+   |
+   = note: expected struct `Vec<i32>`
+              found struct `Vec<&i32>`
+note: function defined here
+  --> $DIR/point-at-inference-2.rs:1:4
+   |
+LL | fn bar(_: Vec<i32>) {}
+   |    ^^^ -----------
+
+error[E0308]: mismatched types
+  --> $DIR/point-at-inference-2.rs:12:9
+   |
+LL |     bar(v);
+   |     --- ^ expected `i32`, found `&i32`
+   |     |
+   |     arguments to this function are incorrect
+   |
+   = note: expected struct `Vec<i32>`
+              found struct `Vec<&i32>`
+note: function defined here
+  --> $DIR/point-at-inference-2.rs:1:4
+   |
+LL | fn bar(_: Vec<i32>) {}
+   |    ^^^ -----------
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/type/type-check/point-at-inference-3.fixed b/tests/ui/type/type-check/point-at-inference-3.fixed
new file mode 100644
index 000000000..44c057c0d
--- /dev/null
+++ b/tests/ui/type/type-check/point-at-inference-3.fixed
@@ -0,0 +1,11 @@
+// run-rustfix
+fn main() {
+    let mut v = Vec::new();
+    v.push(0i32);
+    v.push(0);
+    v.push(1i32); //~ ERROR mismatched types
+    //~^ NOTE expected `i32`, found `u32`
+    //~| NOTE arguments to this method are incorrect
+    //~| NOTE associated function defined here
+    //~| HELP change the type of the numeric literal from `u32` to `i32`
+}
diff --git a/tests/ui/type/type-check/point-at-inference-3.rs b/tests/ui/type/type-check/point-at-inference-3.rs
new file mode 100644
index 000000000..e7ae54384
--- /dev/null
+++ b/tests/ui/type/type-check/point-at-inference-3.rs
@@ -0,0 +1,11 @@
+// run-rustfix
+fn main() {
+    let mut v = Vec::new();
+    v.push(0i32);
+    v.push(0);
+    v.push(1u32); //~ ERROR mismatched types
+    //~^ NOTE expected `i32`, found `u32`
+    //~| NOTE arguments to this method are incorrect
+    //~| NOTE associated function defined here
+    //~| HELP change the type of the numeric literal from `u32` to `i32`
+}
diff --git a/tests/ui/type/type-check/point-at-inference-3.stderr b/tests/ui/type/type-check/point-at-inference-3.stderr
new file mode 100644
index 000000000..d7936e39c
--- /dev/null
+++ b/tests/ui/type/type-check/point-at-inference-3.stderr
@@ -0,0 +1,18 @@
+error[E0308]: mismatched types
+  --> $DIR/point-at-inference-3.rs:6:12
+   |
+LL |     v.push(1u32);
+   |       ---- ^^^^ expected `i32`, found `u32`
+   |       |
+   |       arguments to this method are incorrect
+   |
+note: associated function defined here
+  --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
+help: change the type of the numeric literal from `u32` to `i32`
+   |
+LL |     v.push(1i32);
+   |             ~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/type/type-check/point-at-inference.rs b/tests/ui/type/type-check/point-at-inference.rs
new file mode 100644
index 000000000..5c46dd4ed
--- /dev/null
+++ b/tests/ui/type/type-check/point-at-inference.rs
@@ -0,0 +1,12 @@
+fn bar(_: Vec<i32>) {}
+fn baz(_: &impl std::any::Any) {}
+fn main() {
+    let v = vec![1, 2, 3, 4, 5];
+    let mut foo = vec![];
+    baz(&foo);
+    for i in &v {
+        foo.push(i);
+    }
+    baz(&foo);
+    bar(foo); //~ ERROR E0308
+}
diff --git a/tests/ui/type/type-check/point-at-inference.stderr b/tests/ui/type/type-check/point-at-inference.stderr
new file mode 100644
index 000000000..2e17e5c5f
--- /dev/null
+++ b/tests/ui/type/type-check/point-at-inference.stderr
@@ -0,0 +1,19 @@
+error[E0308]: mismatched types
+  --> $DIR/point-at-inference.rs:11:9
+   |
+LL |     bar(foo);
+   |     --- ^^^ expected `i32`, found `&{integer}`
+   |     |
+   |     arguments to this function are incorrect
+   |
+   = note: expected struct `Vec<i32>`
+              found struct `Vec<&{integer}>`
+note: function defined here
+  --> $DIR/point-at-inference.rs:1:4
+   |
+LL | fn bar(_: Vec<i32>) {}
+   |    ^^^ -----------
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/type/type-check/unknown_type_for_closure.rs b/tests/ui/type/type-check/unknown_type_for_closure.rs
index 167687c18..167687c18 100644
--- a/src/test/ui/type/type-check/unknown_type_for_closure.rs
+++ b/tests/ui/type/type-check/unknown_type_for_closure.rs
diff --git a/src/test/ui/type/type-check/unknown_type_for_closure.stderr b/tests/ui/type/type-check/unknown_type_for_closure.stderr
index 9ae97f390..e5e29aabf 100644
--- a/src/test/ui/type/type-check/unknown_type_for_closure.stderr
+++ b/tests/ui/type/type-check/unknown_type_for_closure.stderr
@@ -12,8 +12,8 @@ LL |     let x = |_| {};
    |
 help: consider giving this closure parameter an explicit type
    |
-LL |     let x = |_: _| {};
-   |               +++
+LL |     let x = |_: /* Type */| {};
+   |               ++++++++++++
 
 error[E0282]: type annotations needed
   --> $DIR/unknown_type_for_closure.rs:10:14
diff --git a/src/test/ui/type/type-dependent-def-issue-49241.rs b/tests/ui/type/type-dependent-def-issue-49241.rs
index caf5bade5..caf5bade5 100644
--- a/src/test/ui/type/type-dependent-def-issue-49241.rs
+++ b/tests/ui/type/type-dependent-def-issue-49241.rs
diff --git a/src/test/ui/type/type-dependent-def-issue-49241.stderr b/tests/ui/type/type-dependent-def-issue-49241.stderr
index af16a6e8f..af16a6e8f 100644
--- a/src/test/ui/type/type-dependent-def-issue-49241.stderr
+++ b/tests/ui/type/type-dependent-def-issue-49241.stderr
diff --git a/src/test/ui/type/type-error-break-tail.rs b/tests/ui/type/type-error-break-tail.rs
index d4e3e93d0..d4e3e93d0 100644
--- a/src/test/ui/type/type-error-break-tail.rs
+++ b/tests/ui/type/type-error-break-tail.rs
diff --git a/src/test/ui/type/type-error-break-tail.stderr b/tests/ui/type/type-error-break-tail.stderr
index 16dc6475c..16dc6475c 100644
--- a/src/test/ui/type/type-error-break-tail.stderr
+++ b/tests/ui/type/type-error-break-tail.stderr
diff --git a/src/test/ui/type/type-mismatch-multiple.rs b/tests/ui/type/type-mismatch-multiple.rs
index 55d6ceef1..55d6ceef1 100644
--- a/src/test/ui/type/type-mismatch-multiple.rs
+++ b/tests/ui/type/type-mismatch-multiple.rs
diff --git a/src/test/ui/type/type-mismatch-multiple.stderr b/tests/ui/type/type-mismatch-multiple.stderr
index 2e8654d31..2e8654d31 100644
--- a/src/test/ui/type/type-mismatch-multiple.stderr
+++ b/tests/ui/type/type-mismatch-multiple.stderr
diff --git a/src/test/ui/type/type-mismatch-same-crate-name.rs b/tests/ui/type/type-mismatch-same-crate-name.rs
index c9cdc874c..c9cdc874c 100644
--- a/src/test/ui/type/type-mismatch-same-crate-name.rs
+++ b/tests/ui/type/type-mismatch-same-crate-name.rs
diff --git a/src/test/ui/type/type-mismatch-same-crate-name.stderr b/tests/ui/type/type-mismatch-same-crate-name.stderr
index fcafd315e..fcafd315e 100644
--- a/src/test/ui/type/type-mismatch-same-crate-name.stderr
+++ b/tests/ui/type/type-mismatch-same-crate-name.stderr
diff --git a/src/test/ui/type/type-mismatch.rs b/tests/ui/type/type-mismatch.rs
index 11bfa3a72..11bfa3a72 100644
--- a/src/test/ui/type/type-mismatch.rs
+++ b/tests/ui/type/type-mismatch.rs
diff --git a/src/test/ui/type/type-mismatch.stderr b/tests/ui/type/type-mismatch.stderr
index 6c187bad0..6c187bad0 100644
--- a/src/test/ui/type/type-mismatch.stderr
+++ b/tests/ui/type/type-mismatch.stderr
diff --git a/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.rs b/tests/ui/type/type-parameter-defaults-referencing-Self-ppaux.rs
index 444453dc6..444453dc6 100644
--- a/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.rs
+++ b/tests/ui/type/type-parameter-defaults-referencing-Self-ppaux.rs
diff --git a/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr b/tests/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr
index 8a296dc7e..8a296dc7e 100644
--- a/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr
+++ b/tests/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr
diff --git a/src/test/ui/type/type-parameter-defaults-referencing-Self.rs b/tests/ui/type/type-parameter-defaults-referencing-Self.rs
index e5c81556e..e5c81556e 100644
--- a/src/test/ui/type/type-parameter-defaults-referencing-Self.rs
+++ b/tests/ui/type/type-parameter-defaults-referencing-Self.rs
diff --git a/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr b/tests/ui/type/type-parameter-defaults-referencing-Self.stderr
index 67a4745b3..67a4745b3 100644
--- a/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr
+++ b/tests/ui/type/type-parameter-defaults-referencing-Self.stderr
diff --git a/src/test/ui/type/type-parameter-names.rs b/tests/ui/type/type-parameter-names.rs
index b54a3fae0..b54a3fae0 100644
--- a/src/test/ui/type/type-parameter-names.rs
+++ b/tests/ui/type/type-parameter-names.rs
diff --git a/src/test/ui/type/type-parameter-names.stderr b/tests/ui/type/type-parameter-names.stderr
index f0ca8afca..f0ca8afca 100644
--- a/src/test/ui/type/type-parameter-names.stderr
+++ b/tests/ui/type/type-parameter-names.stderr
diff --git a/src/test/ui/type/type-params-in-different-spaces-1.rs b/tests/ui/type/type-params-in-different-spaces-1.rs
index 6efd14d37..6efd14d37 100644
--- a/src/test/ui/type/type-params-in-different-spaces-1.rs
+++ b/tests/ui/type/type-params-in-different-spaces-1.rs
diff --git a/src/test/ui/type/type-params-in-different-spaces-1.stderr b/tests/ui/type/type-params-in-different-spaces-1.stderr
index 4e73e10a3..7529f25bd 100644
--- a/src/test/ui/type/type-params-in-different-spaces-1.stderr
+++ b/tests/ui/type/type-params-in-different-spaces-1.stderr
@@ -6,7 +6,9 @@ LL | trait BrokenAdd: Copy + Add<Output=Self> {
 LL |     fn broken_add<T>(&self, rhs: T) -> Self {
    |                   - found type parameter
 LL |         *self + rhs
-   |                 ^^^ expected type parameter `Self`, found type parameter `T`
+   |         -----   ^^^ expected type parameter `Self`, found type parameter `T`
+   |         |
+   |         expected because this is `Self`
    |
    = note: expected type parameter `Self`
               found type parameter `T`
diff --git a/src/test/ui/type/type-params-in-different-spaces-2.rs b/tests/ui/type/type-params-in-different-spaces-2.rs
index 1211e465b..1211e465b 100644
--- a/src/test/ui/type/type-params-in-different-spaces-2.rs
+++ b/tests/ui/type/type-params-in-different-spaces-2.rs
diff --git a/src/test/ui/type/type-params-in-different-spaces-2.stderr b/tests/ui/type/type-params-in-different-spaces-2.stderr
index 220b3929c..220b3929c 100644
--- a/src/test/ui/type/type-params-in-different-spaces-2.stderr
+++ b/tests/ui/type/type-params-in-different-spaces-2.stderr
diff --git a/src/test/ui/type/type-params-in-different-spaces-3.rs b/tests/ui/type/type-params-in-different-spaces-3.rs
index ac7b0c11f..ac7b0c11f 100644
--- a/src/test/ui/type/type-params-in-different-spaces-3.rs
+++ b/tests/ui/type/type-params-in-different-spaces-3.rs
diff --git a/src/test/ui/type/type-params-in-different-spaces-3.stderr b/tests/ui/type/type-params-in-different-spaces-3.stderr
index c538d6731..c538d6731 100644
--- a/src/test/ui/type/type-params-in-different-spaces-3.stderr
+++ b/tests/ui/type/type-params-in-different-spaces-3.stderr
diff --git a/src/test/ui/type/type-path-err-node-types.rs b/tests/ui/type/type-path-err-node-types.rs
index b3795772e..b3795772e 100644
--- a/src/test/ui/type/type-path-err-node-types.rs
+++ b/tests/ui/type/type-path-err-node-types.rs
diff --git a/src/test/ui/type/type-path-err-node-types.stderr b/tests/ui/type/type-path-err-node-types.stderr
index c1ae10efa..1aed1dbe4 100644
--- a/src/test/ui/type/type-path-err-node-types.stderr
+++ b/tests/ui/type/type-path-err-node-types.stderr
@@ -30,8 +30,8 @@ LL |     let _ = |a, b: _| -> _ { 0 };
    |
 help: consider giving this closure parameter an explicit type
    |
-LL |     let _ = |a: _, b: _| -> _ { 0 };
-   |               +++
+LL |     let _ = |a: /* Type */, b: _| -> _ { 0 };
+   |               ++++++++++++
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/type/type-recursive-box-shadowed.rs b/tests/ui/type/type-recursive-box-shadowed.rs
index e141c2149..e141c2149 100644
--- a/src/test/ui/type/type-recursive-box-shadowed.rs
+++ b/tests/ui/type/type-recursive-box-shadowed.rs
diff --git a/src/test/ui/type/type-recursive-box-shadowed.stderr b/tests/ui/type/type-recursive-box-shadowed.stderr
index cb0e98287..cb0e98287 100644
--- a/src/test/ui/type/type-recursive-box-shadowed.stderr
+++ b/tests/ui/type/type-recursive-box-shadowed.stderr
diff --git a/src/test/ui/type/type-recursive.rs b/tests/ui/type/type-recursive.rs
index e8084f0d0..e8084f0d0 100644
--- a/src/test/ui/type/type-recursive.rs
+++ b/tests/ui/type/type-recursive.rs
diff --git a/src/test/ui/type/type-recursive.stderr b/tests/ui/type/type-recursive.stderr
index 9a4d798f6..9a4d798f6 100644
--- a/src/test/ui/type/type-recursive.stderr
+++ b/tests/ui/type/type-recursive.stderr
diff --git a/src/test/ui/type/type-shadow.rs b/tests/ui/type/type-shadow.rs
index 48a68a390..48a68a390 100644
--- a/src/test/ui/type/type-shadow.rs
+++ b/tests/ui/type/type-shadow.rs
diff --git a/src/test/ui/type/type-shadow.stderr b/tests/ui/type/type-shadow.stderr
index 25b4bff4d..25b4bff4d 100644
--- a/src/test/ui/type/type-shadow.stderr
+++ b/tests/ui/type/type-shadow.stderr
diff --git a/src/test/ui/type/type-unsatisfiable.rs b/tests/ui/type/type-unsatisfiable.rs
index 7fbbb50dc..7fbbb50dc 100644
--- a/src/test/ui/type/type-unsatisfiable.rs
+++ b/tests/ui/type/type-unsatisfiable.rs
diff --git a/src/test/ui/type/type-unsatisfiable.usage.stderr b/tests/ui/type/type-unsatisfiable.usage.stderr
index 56e2e30af..56e2e30af 100644
--- a/src/test/ui/type/type-unsatisfiable.usage.stderr
+++ b/tests/ui/type/type-unsatisfiable.usage.stderr
diff --git a/tests/ui/type/wrong-call-return-type-due-to-generic-arg.rs b/tests/ui/type/wrong-call-return-type-due-to-generic-arg.rs
new file mode 100644
index 000000000..ba5b9f542
--- /dev/null
+++ b/tests/ui/type/wrong-call-return-type-due-to-generic-arg.rs
@@ -0,0 +1,28 @@
+fn function<T>(x: T, y: bool) -> T {
+    x
+}
+
+struct S {}
+impl S {
+    fn method<T>(&self, x: T) -> T {
+        x
+    }
+}
+
+fn wrong_arg_type(x: u32) -> u32 {
+    x
+}
+
+fn main() {
+    // Should not trigger.
+    let x = wrong_arg_type(0u16); //~ ERROR mismatched types
+    let x: u16 = function(0, 0u8); //~ ERROR mismatched types
+
+    // Should trigger exactly once for the first argument.
+    let x: u16 = function(0u32, 0u8); //~ ERROR arguments to this function are incorrect
+
+    // Should trigger.
+    let x: u16 = function(0u32, true); //~ ERROR mismatched types
+    let x: u16 = (S {}).method(0u32); //~ ERROR mismatched types
+    function(0u32, 8u8) //~ ERROR arguments to this function are incorrect
+}
diff --git a/tests/ui/type/wrong-call-return-type-due-to-generic-arg.stderr b/tests/ui/type/wrong-call-return-type-due-to-generic-arg.stderr
new file mode 100644
index 000000000..4d012cb15
--- /dev/null
+++ b/tests/ui/type/wrong-call-return-type-due-to-generic-arg.stderr
@@ -0,0 +1,131 @@
+error[E0308]: mismatched types
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:18:28
+   |
+LL |     let x = wrong_arg_type(0u16);
+   |             -------------- ^^^^ expected `u32`, found `u16`
+   |             |
+   |             arguments to this function are incorrect
+   |
+note: function defined here
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:12:4
+   |
+LL | fn wrong_arg_type(x: u32) -> u32 {
+   |    ^^^^^^^^^^^^^^ ------
+help: change the type of the numeric literal from `u16` to `u32`
+   |
+LL |     let x = wrong_arg_type(0u32);
+   |                             ~~~
+
+error[E0308]: mismatched types
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:19:30
+   |
+LL |     let x: u16 = function(0, 0u8);
+   |                  --------    ^^^ expected `bool`, found `u8`
+   |                  |
+   |                  arguments to this function are incorrect
+   |
+note: function defined here
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:1:4
+   |
+LL | fn function<T>(x: T, y: bool) -> T {
+   |    ^^^^^^^^          -------
+
+error[E0308]: arguments to this function are incorrect
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:22:18
+   |
+LL |     let x: u16 = function(0u32, 0u8);
+   |                  ^^^^^^^^ ----  --- expected `bool`, found `u8`
+   |                           |
+   |                           expected `u16`, found `u32`
+   |
+help: the return type of this call is `u32` due to the type of the argument passed
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:22:18
+   |
+LL |     let x: u16 = function(0u32, 0u8);
+   |                  ^^^^^^^^^----^^^^^^
+   |                           |
+   |                           this argument influences the return type of `function`
+note: function defined here
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:1:4
+   |
+LL | fn function<T>(x: T, y: bool) -> T {
+   |    ^^^^^^^^    ----  -------
+help: change the type of the numeric literal from `u32` to `u16`
+   |
+LL |     let x: u16 = function(0u16, 0u8);
+   |                            ~~~
+
+error[E0308]: mismatched types
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:25:27
+   |
+LL |     let x: u16 = function(0u32, true);
+   |                  -------- ^^^^ expected `u16`, found `u32`
+   |                  |
+   |                  arguments to this function are incorrect
+   |
+help: the return type of this call is `u32` due to the type of the argument passed
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:25:18
+   |
+LL |     let x: u16 = function(0u32, true);
+   |                  ^^^^^^^^^----^^^^^^^
+   |                           |
+   |                           this argument influences the return type of `function`
+note: function defined here
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:1:4
+   |
+LL | fn function<T>(x: T, y: bool) -> T {
+   |    ^^^^^^^^    ----
+help: change the type of the numeric literal from `u32` to `u16`
+   |
+LL |     let x: u16 = function(0u16, true);
+   |                            ~~~
+
+error[E0308]: mismatched types
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:26:32
+   |
+LL |     let x: u16 = (S {}).method(0u32);
+   |                         ------ ^^^^ expected `u16`, found `u32`
+   |                         |
+   |                         arguments to this method are incorrect
+   |
+help: the return type of this call is `u32` due to the type of the argument passed
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:26:18
+   |
+LL |     let x: u16 = (S {}).method(0u32);
+   |                  ^^^^^^^^^^^^^^----^
+   |                                |
+   |                                this argument influences the return type of `method`
+note: associated function defined here
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:7:8
+   |
+LL |     fn method<T>(&self, x: T) -> T {
+   |        ^^^^^^           ----
+help: change the type of the numeric literal from `u32` to `u16`
+   |
+LL |     let x: u16 = (S {}).method(0u16);
+   |                                 ~~~
+
+error[E0308]: arguments to this function are incorrect
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:27:5
+   |
+LL |     function(0u32, 8u8)
+   |     ^^^^^^^^ ----  --- expected `bool`, found `u8`
+   |              |
+   |              expected `()`, found `u32`
+   |
+help: the return type of this call is `u32` due to the type of the argument passed
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:27:5
+   |
+LL |     function(0u32, 8u8)
+   |     ^^^^^^^^^----^^^^^^
+   |              |
+   |              this argument influences the return type of `function`
+note: function defined here
+  --> $DIR/wrong-call-return-type-due-to-generic-arg.rs:1:4
+   |
+LL | fn function<T>(x: T, y: bool) -> T {
+   |    ^^^^^^^^    ----  -------
+
+error: aborting due to 6 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/type_length_limit.polonius.stderr b/tests/ui/type_length_limit.polonius.stderr
index 82d066b2a..82d066b2a 100644
--- a/src/test/ui/type_length_limit.polonius.stderr
+++ b/tests/ui/type_length_limit.polonius.stderr
diff --git a/src/test/ui/type_length_limit.rs b/tests/ui/type_length_limit.rs
index b3c127474..b3c127474 100644
--- a/src/test/ui/type_length_limit.rs
+++ b/tests/ui/type_length_limit.rs
diff --git a/src/test/ui/type_length_limit.stderr b/tests/ui/type_length_limit.stderr
index ff4874669..5b00d387a 100644
--- a/src/test/ui/type_length_limit.stderr
+++ b/tests/ui/type_length_limit.stderr
@@ -1,9 +1,6 @@
 error: reached the type-length limit while instantiating `std::mem::drop::<Option<((((..., ..., ...), ..., ...), ..., ...), ..., ...)>>`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
    |
-LL | pub fn drop<T>(_x: T) {}
-   | ^^^^^^^^^^^^^^^^^^^^^
-   |
    = help: consider adding a `#![type_length_limit="10"]` attribute to your crate
    = note: the full type name has been written to '$TEST_BUILD_DIR/type_length_limit/type_length_limit.long-type.txt'
 
diff --git a/src/test/ui/typeck/assign-non-lval-derefmut.fixed b/tests/ui/typeck/assign-non-lval-derefmut.fixed
index 0c23199af..0c23199af 100644
--- a/src/test/ui/typeck/assign-non-lval-derefmut.fixed
+++ b/tests/ui/typeck/assign-non-lval-derefmut.fixed
diff --git a/src/test/ui/typeck/assign-non-lval-derefmut.rs b/tests/ui/typeck/assign-non-lval-derefmut.rs
index ec1882f52..ec1882f52 100644
--- a/src/test/ui/typeck/assign-non-lval-derefmut.rs
+++ b/tests/ui/typeck/assign-non-lval-derefmut.rs
diff --git a/src/test/ui/typeck/assign-non-lval-derefmut.stderr b/tests/ui/typeck/assign-non-lval-derefmut.stderr
index e394cf820..e394cf820 100644
--- a/src/test/ui/typeck/assign-non-lval-derefmut.stderr
+++ b/tests/ui/typeck/assign-non-lval-derefmut.stderr
diff --git a/src/test/ui/typeck/assign-non-lval-mut-ref.fixed b/tests/ui/typeck/assign-non-lval-mut-ref.fixed
index 10c7b9dbf..10c7b9dbf 100644
--- a/src/test/ui/typeck/assign-non-lval-mut-ref.fixed
+++ b/tests/ui/typeck/assign-non-lval-mut-ref.fixed
diff --git a/src/test/ui/typeck/assign-non-lval-mut-ref.rs b/tests/ui/typeck/assign-non-lval-mut-ref.rs
index bceff0ef0..bceff0ef0 100644
--- a/src/test/ui/typeck/assign-non-lval-mut-ref.rs
+++ b/tests/ui/typeck/assign-non-lval-mut-ref.rs
diff --git a/src/test/ui/typeck/assign-non-lval-mut-ref.stderr b/tests/ui/typeck/assign-non-lval-mut-ref.stderr
index cbdc960ba..cbdc960ba 100644
--- a/src/test/ui/typeck/assign-non-lval-mut-ref.stderr
+++ b/tests/ui/typeck/assign-non-lval-mut-ref.stderr
diff --git a/src/test/ui/typeck/assign-non-lval-needs-deref.rs b/tests/ui/typeck/assign-non-lval-needs-deref.rs
index c979d76b4..c979d76b4 100644
--- a/src/test/ui/typeck/assign-non-lval-needs-deref.rs
+++ b/tests/ui/typeck/assign-non-lval-needs-deref.rs
diff --git a/src/test/ui/typeck/assign-non-lval-needs-deref.stderr b/tests/ui/typeck/assign-non-lval-needs-deref.stderr
index ee83b1453..ee83b1453 100644
--- a/src/test/ui/typeck/assign-non-lval-needs-deref.stderr
+++ b/tests/ui/typeck/assign-non-lval-needs-deref.stderr
diff --git a/src/test/ui/typeck/autoderef-with-param-env-error.rs b/tests/ui/typeck/autoderef-with-param-env-error.rs
index ec96c61c6..ec96c61c6 100644
--- a/src/test/ui/typeck/autoderef-with-param-env-error.rs
+++ b/tests/ui/typeck/autoderef-with-param-env-error.rs
diff --git a/tests/ui/typeck/autoderef-with-param-env-error.stderr b/tests/ui/typeck/autoderef-with-param-env-error.stderr
new file mode 100644
index 000000000..182612d5e
--- /dev/null
+++ b/tests/ui/typeck/autoderef-with-param-env-error.stderr
@@ -0,0 +1,14 @@
+error[E0412]: cannot find type `T` in this scope
+  --> $DIR/autoderef-with-param-env-error.rs:3:5
+   |
+LL |     T: Send,
+   |     ^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+LL | fn foo<T>()
+   |       +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/typeck/auxiliary/issue-36708.rs b/tests/ui/typeck/auxiliary/issue-36708.rs
index bd8580f97..bd8580f97 100644
--- a/src/test/ui/typeck/auxiliary/issue-36708.rs
+++ b/tests/ui/typeck/auxiliary/issue-36708.rs
diff --git a/src/test/ui/typeck/auxiliary/issue-81943-lib.rs b/tests/ui/typeck/auxiliary/issue-81943-lib.rs
index 521c54f89..521c54f89 100644
--- a/src/test/ui/typeck/auxiliary/issue-81943-lib.rs
+++ b/tests/ui/typeck/auxiliary/issue-81943-lib.rs
diff --git a/src/test/ui/typeck/auxiliary/tdticc_coherence_lib.rs b/tests/ui/typeck/auxiliary/tdticc_coherence_lib.rs
index ef2cd415f..ef2cd415f 100644
--- a/src/test/ui/typeck/auxiliary/tdticc_coherence_lib.rs
+++ b/tests/ui/typeck/auxiliary/tdticc_coherence_lib.rs
diff --git a/src/test/ui/typeck/auxiliary/xcrate-issue-43189-a.rs b/tests/ui/typeck/auxiliary/xcrate-issue-43189-a.rs
index 9ab570fd1..9ab570fd1 100644
--- a/src/test/ui/typeck/auxiliary/xcrate-issue-43189-a.rs
+++ b/tests/ui/typeck/auxiliary/xcrate-issue-43189-a.rs
diff --git a/src/test/ui/typeck/auxiliary/xcrate-issue-43189-b.rs b/tests/ui/typeck/auxiliary/xcrate-issue-43189-b.rs
index 31dfb050b..31dfb050b 100644
--- a/src/test/ui/typeck/auxiliary/xcrate-issue-43189-b.rs
+++ b/tests/ui/typeck/auxiliary/xcrate-issue-43189-b.rs
diff --git a/src/test/ui/typeck/auxiliary/xcrate-issue-46112-rexport-core.rs b/tests/ui/typeck/auxiliary/xcrate-issue-46112-rexport-core.rs
index 2b517b578..2b517b578 100644
--- a/src/test/ui/typeck/auxiliary/xcrate-issue-46112-rexport-core.rs
+++ b/tests/ui/typeck/auxiliary/xcrate-issue-46112-rexport-core.rs
diff --git a/src/test/ui/typeck/auxiliary/xcrate-issue-61711-b.rs b/tests/ui/typeck/auxiliary/xcrate-issue-61711-b.rs
index 88a040529..88a040529 100644
--- a/src/test/ui/typeck/auxiliary/xcrate-issue-61711-b.rs
+++ b/tests/ui/typeck/auxiliary/xcrate-issue-61711-b.rs
diff --git a/src/test/ui/typeck/call-block.rs b/tests/ui/typeck/call-block.rs
index 0390d7db0..0390d7db0 100644
--- a/src/test/ui/typeck/call-block.rs
+++ b/tests/ui/typeck/call-block.rs
diff --git a/src/test/ui/typeck/call-block.stderr b/tests/ui/typeck/call-block.stderr
index 68984bc1c..68984bc1c 100644
--- a/src/test/ui/typeck/call-block.stderr
+++ b/tests/ui/typeck/call-block.stderr
diff --git a/tests/ui/typeck/check-args-on-fn-err-2.rs b/tests/ui/typeck/check-args-on-fn-err-2.rs
new file mode 100644
index 000000000..af57dbe33
--- /dev/null
+++ b/tests/ui/typeck/check-args-on-fn-err-2.rs
@@ -0,0 +1,5 @@
+fn main() {
+    a((), 1i32 == 2u32);
+    //~^ ERROR cannot find function `a` in this scope
+    //~| ERROR mismatched types
+}
diff --git a/tests/ui/typeck/check-args-on-fn-err-2.stderr b/tests/ui/typeck/check-args-on-fn-err-2.stderr
new file mode 100644
index 000000000..301bb88db
--- /dev/null
+++ b/tests/ui/typeck/check-args-on-fn-err-2.stderr
@@ -0,0 +1,23 @@
+error[E0308]: mismatched types
+  --> $DIR/check-args-on-fn-err-2.rs:2:19
+   |
+LL |     a((), 1i32 == 2u32);
+   |           ----    ^^^^ expected `i32`, found `u32`
+   |           |
+   |           expected because this is `i32`
+   |
+help: change the type of the numeric literal from `u32` to `i32`
+   |
+LL |     a((), 1i32 == 2i32);
+   |                    ~~~
+
+error[E0425]: cannot find function `a` in this scope
+  --> $DIR/check-args-on-fn-err-2.rs:2:5
+   |
+LL |     a((), 1i32 == 2u32);
+   |     ^ not found in this scope
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0308, E0425.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/tests/ui/typeck/check-args-on-fn-err.rs b/tests/ui/typeck/check-args-on-fn-err.rs
new file mode 100644
index 000000000..04b98ddd9
--- /dev/null
+++ b/tests/ui/typeck/check-args-on-fn-err.rs
@@ -0,0 +1,6 @@
+fn main() {
+    unknown(1, |glyf| {
+        //~^ ERROR: cannot find function `unknown` in this scope
+        let actual = glyf;
+    });
+}
diff --git a/tests/ui/typeck/check-args-on-fn-err.stderr b/tests/ui/typeck/check-args-on-fn-err.stderr
new file mode 100644
index 000000000..864d33e0e
--- /dev/null
+++ b/tests/ui/typeck/check-args-on-fn-err.stderr
@@ -0,0 +1,9 @@
+error[E0425]: cannot find function `unknown` in this scope
+  --> $DIR/check-args-on-fn-err.rs:2:5
+   |
+LL |     unknown(1, |glyf| {
+   |     ^^^^^^^ not found in this scope
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/typeck/conversion-methods.rs b/tests/ui/typeck/conversion-methods.rs
index 46c2e511f..46c2e511f 100644
--- a/src/test/ui/typeck/conversion-methods.rs
+++ b/tests/ui/typeck/conversion-methods.rs
diff --git a/src/test/ui/typeck/conversion-methods.stderr b/tests/ui/typeck/conversion-methods.stderr
index 091502bdd..091502bdd 100644
--- a/src/test/ui/typeck/conversion-methods.stderr
+++ b/tests/ui/typeck/conversion-methods.stderr
diff --git a/src/test/ui/typeck/deref-multi.rs b/tests/ui/typeck/deref-multi.rs
index 3dc4771fe..3dc4771fe 100644
--- a/src/test/ui/typeck/deref-multi.rs
+++ b/tests/ui/typeck/deref-multi.rs
diff --git a/src/test/ui/typeck/deref-multi.stderr b/tests/ui/typeck/deref-multi.stderr
index bd6575c73..bd6575c73 100644
--- a/src/test/ui/typeck/deref-multi.stderr
+++ b/tests/ui/typeck/deref-multi.stderr
diff --git a/src/test/ui/typeck/do-not-suggest-adding-missing-zero-to-floating-point-number.rs b/tests/ui/typeck/do-not-suggest-adding-missing-zero-to-floating-point-number.rs
index 501f4b6ef..501f4b6ef 100644
--- a/src/test/ui/typeck/do-not-suggest-adding-missing-zero-to-floating-point-number.rs
+++ b/tests/ui/typeck/do-not-suggest-adding-missing-zero-to-floating-point-number.rs
diff --git a/src/test/ui/typeck/do-not-suggest-adding-missing-zero-to-floating-point-number.stderr b/tests/ui/typeck/do-not-suggest-adding-missing-zero-to-floating-point-number.stderr
index 1ef1d4c28..1ef1d4c28 100644
--- a/src/test/ui/typeck/do-not-suggest-adding-missing-zero-to-floating-point-number.stderr
+++ b/tests/ui/typeck/do-not-suggest-adding-missing-zero-to-floating-point-number.stderr
diff --git a/src/test/ui/typeck/do-not-suggest-placeholder-to-const-static-without-type.rs b/tests/ui/typeck/do-not-suggest-placeholder-to-const-static-without-type.rs
index 97e0b213f..97e0b213f 100644
--- a/src/test/ui/typeck/do-not-suggest-placeholder-to-const-static-without-type.rs
+++ b/tests/ui/typeck/do-not-suggest-placeholder-to-const-static-without-type.rs
diff --git a/src/test/ui/typeck/do-not-suggest-placeholder-to-const-static-without-type.stderr b/tests/ui/typeck/do-not-suggest-placeholder-to-const-static-without-type.stderr
index 8982d6285..8982d6285 100644
--- a/src/test/ui/typeck/do-not-suggest-placeholder-to-const-static-without-type.stderr
+++ b/tests/ui/typeck/do-not-suggest-placeholder-to-const-static-without-type.stderr
diff --git a/src/test/ui/typeck/explain_clone_autoref.rs b/tests/ui/typeck/explain_clone_autoref.rs
index 9279e4c39..9279e4c39 100644
--- a/src/test/ui/typeck/explain_clone_autoref.rs
+++ b/tests/ui/typeck/explain_clone_autoref.rs
diff --git a/src/test/ui/typeck/explain_clone_autoref.stderr b/tests/ui/typeck/explain_clone_autoref.stderr
index faac680ea..ff36e18d2 100644
--- a/src/test/ui/typeck/explain_clone_autoref.stderr
+++ b/tests/ui/typeck/explain_clone_autoref.stderr
@@ -12,6 +12,10 @@ note: `NotClone` does not implement `Clone`, so `&NotClone` was cloned instead
    |
 LL |     nc.clone()
    |     ^^
+help: consider annotating `NotClone` with `#[derive(Clone)]`
+   |
+LL | #[derive(Clone)]
+   |
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/typeck/issue-100164.fixed b/tests/ui/typeck/issue-100164.fixed
index a5f68beb1..a5f68beb1 100644
--- a/src/test/ui/typeck/issue-100164.fixed
+++ b/tests/ui/typeck/issue-100164.fixed
diff --git a/src/test/ui/typeck/issue-100164.rs b/tests/ui/typeck/issue-100164.rs
index 7efb9ac62..7efb9ac62 100644
--- a/src/test/ui/typeck/issue-100164.rs
+++ b/tests/ui/typeck/issue-100164.rs
diff --git a/src/test/ui/typeck/issue-100164.stderr b/tests/ui/typeck/issue-100164.stderr
index 06a132d65..06a132d65 100644
--- a/src/test/ui/typeck/issue-100164.stderr
+++ b/tests/ui/typeck/issue-100164.stderr
diff --git a/src/test/ui/typeck/issue-100246.rs b/tests/ui/typeck/issue-100246.rs
index 8f0b34bab..8f0b34bab 100644
--- a/src/test/ui/typeck/issue-100246.rs
+++ b/tests/ui/typeck/issue-100246.rs
diff --git a/src/test/ui/typeck/issue-100246.stderr b/tests/ui/typeck/issue-100246.stderr
index 8b77de94e..8b77de94e 100644
--- a/src/test/ui/typeck/issue-100246.stderr
+++ b/tests/ui/typeck/issue-100246.stderr
diff --git a/src/test/ui/typeck/issue-100285.rs b/tests/ui/typeck/issue-100285.rs
index e206469b8..e206469b8 100644
--- a/src/test/ui/typeck/issue-100285.rs
+++ b/tests/ui/typeck/issue-100285.rs
diff --git a/src/test/ui/typeck/issue-100285.stderr b/tests/ui/typeck/issue-100285.stderr
index 42c64b039..42c64b039 100644
--- a/src/test/ui/typeck/issue-100285.stderr
+++ b/tests/ui/typeck/issue-100285.stderr
diff --git a/src/test/ui/typeck/issue-103899.rs b/tests/ui/typeck/issue-103899.rs
index ac9e4c716..ac9e4c716 100644
--- a/src/test/ui/typeck/issue-103899.rs
+++ b/tests/ui/typeck/issue-103899.rs
diff --git a/src/test/ui/typeck/issue-10401.rs b/tests/ui/typeck/issue-10401.rs
index d77ff381e..d77ff381e 100644
--- a/src/test/ui/typeck/issue-10401.rs
+++ b/tests/ui/typeck/issue-10401.rs
diff --git a/src/test/ui/typeck/issue-10401.stderr b/tests/ui/typeck/issue-10401.stderr
index 1f68abcfb..1f68abcfb 100644
--- a/src/test/ui/typeck/issue-10401.stderr
+++ b/tests/ui/typeck/issue-10401.stderr
diff --git a/src/test/ui/typeck/issue-104510-ice.rs b/tests/ui/typeck/issue-104510-ice.rs
index 157bdf07e..157bdf07e 100644
--- a/src/test/ui/typeck/issue-104510-ice.rs
+++ b/tests/ui/typeck/issue-104510-ice.rs
diff --git a/src/test/ui/typeck/issue-104510-ice.stderr b/tests/ui/typeck/issue-104510-ice.stderr
index ddb510ef0..ddb510ef0 100644
--- a/src/test/ui/typeck/issue-104510-ice.stderr
+++ b/tests/ui/typeck/issue-104510-ice.stderr
diff --git a/src/test/ui/typeck/issue-104513-ice.rs b/tests/ui/typeck/issue-104513-ice.rs
index bcac0fa1e..bcac0fa1e 100644
--- a/src/test/ui/typeck/issue-104513-ice.rs
+++ b/tests/ui/typeck/issue-104513-ice.rs
diff --git a/src/test/ui/typeck/issue-104513-ice.stderr b/tests/ui/typeck/issue-104513-ice.stderr
index 2b3b1b9ef..42cfe38ae 100644
--- a/src/test/ui/typeck/issue-104513-ice.stderr
+++ b/tests/ui/typeck/issue-104513-ice.stderr
@@ -1,8 +1,6 @@
 error[E0405]: cannot find trait `Oops` in this scope
   --> $DIR/issue-104513-ice.rs:3:19
    |
-LL | fn f() {
-   |     - help: you might be missing a type parameter: `<Oops>`
 LL |     let _: S<impl Oops> = S;
    |                   ^^^^ not found in this scope
 
diff --git a/tests/ui/typeck/issue-104582.rs b/tests/ui/typeck/issue-104582.rs
new file mode 100644
index 000000000..104669dad
--- /dev/null
+++ b/tests/ui/typeck/issue-104582.rs
@@ -0,0 +1,5 @@
+fn main(){
+    let my_var: String(String?);
+    //~^ ERROR: invalid `?` in type
+    //~| ERROR: parenthesized type parameters may only be used with a `Fn` trait
+}
diff --git a/tests/ui/typeck/issue-104582.stderr b/tests/ui/typeck/issue-104582.stderr
new file mode 100644
index 000000000..61b6b2364
--- /dev/null
+++ b/tests/ui/typeck/issue-104582.stderr
@@ -0,0 +1,25 @@
+error: invalid `?` in type
+  --> $DIR/issue-104582.rs:2:30
+   |
+LL |     let my_var: String(String?);
+   |                              ^ `?` is only allowed on expressions, not types
+   |
+help: if you meant to express that the type might not contain a value, use the `Option` wrapper type
+   |
+LL |     let my_var: String(Option<String>);
+   |                        +++++++      ~
+
+error[E0214]: parenthesized type parameters may only be used with a `Fn` trait
+  --> $DIR/issue-104582.rs:2:17
+   |
+LL |     let my_var: String(String?);
+   |                 ^^^^^^^^^^^^^^^ only `Fn` traits may use parentheses
+   |
+help: use angle brackets instead
+   |
+LL |     let my_var: String<String?>;
+   |                       ~       ~
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0214`.
diff --git a/tests/ui/typeck/issue-105946.rs b/tests/ui/typeck/issue-105946.rs
new file mode 100644
index 000000000..bf01751d5
--- /dev/null
+++ b/tests/ui/typeck/issue-105946.rs
@@ -0,0 +1,12 @@
+fn digit() -> str {
+  return {};
+  //~^ ERROR: mismatched types [E0308]
+}
+fn main() {
+    let [_y..] = [box 1, box 2];
+    //~^ ERROR: cannot find value `_y` in this scope [E0425]
+    //~| ERROR: `X..` patterns in slices are experimental [E0658]
+    //~| ERROR: box expression syntax is experimental; you can call `Box::new` instead [E0658]
+    //~| ERROR: box expression syntax is experimental; you can call `Box::new` instead [E0658]
+    //~| ERROR: pattern requires 1 element but array has 2 [E0527]
+}
diff --git a/tests/ui/typeck/issue-105946.stderr b/tests/ui/typeck/issue-105946.stderr
new file mode 100644
index 000000000..d803de4df
--- /dev/null
+++ b/tests/ui/typeck/issue-105946.stderr
@@ -0,0 +1,49 @@
+error[E0425]: cannot find value `_y` in this scope
+  --> $DIR/issue-105946.rs:6:10
+   |
+LL |     let [_y..] = [box 1, box 2];
+   |          ^^ not found in this scope
+
+error[E0658]: `X..` patterns in slices are experimental
+  --> $DIR/issue-105946.rs:6:10
+   |
+LL |     let [_y..] = [box 1, box 2];
+   |          ^^^^
+   |
+   = note: see issue #67264 <https://github.com/rust-lang/rust/issues/67264> for more information
+   = help: add `#![feature(half_open_range_patterns_in_slices)]` to the crate attributes to enable
+
+error[E0658]: box expression syntax is experimental; you can call `Box::new` instead
+  --> $DIR/issue-105946.rs:6:19
+   |
+LL |     let [_y..] = [box 1, box 2];
+   |                   ^^^^^
+   |
+   = note: see issue #49733 <https://github.com/rust-lang/rust/issues/49733> for more information
+   = help: add `#![feature(box_syntax)]` to the crate attributes to enable
+
+error[E0658]: box expression syntax is experimental; you can call `Box::new` instead
+  --> $DIR/issue-105946.rs:6:26
+   |
+LL |     let [_y..] = [box 1, box 2];
+   |                          ^^^^^
+   |
+   = note: see issue #49733 <https://github.com/rust-lang/rust/issues/49733> for more information
+   = help: add `#![feature(box_syntax)]` to the crate attributes to enable
+
+error[E0308]: mismatched types
+  --> $DIR/issue-105946.rs:2:10
+   |
+LL |   return {};
+   |          ^^ expected `str`, found `()`
+
+error[E0527]: pattern requires 1 element but array has 2
+  --> $DIR/issue-105946.rs:6:9
+   |
+LL |     let [_y..] = [box 1, box 2];
+   |         ^^^^^^ expected 2 elements
+
+error: aborting due to 6 previous errors
+
+Some errors have detailed explanations: E0308, E0425, E0527, E0658.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/typeck/issue-10969.rs b/tests/ui/typeck/issue-10969.rs
index 0b78fc1bb..0b78fc1bb 100644
--- a/src/test/ui/typeck/issue-10969.rs
+++ b/tests/ui/typeck/issue-10969.rs
diff --git a/src/test/ui/typeck/issue-10969.stderr b/tests/ui/typeck/issue-10969.stderr
index f64b61aae..f64b61aae 100644
--- a/src/test/ui/typeck/issue-10969.stderr
+++ b/tests/ui/typeck/issue-10969.stderr
diff --git a/src/test/ui/typeck/issue-13853-2.rs b/tests/ui/typeck/issue-13853-2.rs
index 27319c98d..27319c98d 100644
--- a/src/test/ui/typeck/issue-13853-2.rs
+++ b/tests/ui/typeck/issue-13853-2.rs
diff --git a/src/test/ui/typeck/issue-13853-2.stderr b/tests/ui/typeck/issue-13853-2.stderr
index 92068df6c..92068df6c 100644
--- a/src/test/ui/typeck/issue-13853-2.stderr
+++ b/tests/ui/typeck/issue-13853-2.stderr
diff --git a/src/test/ui/typeck/issue-13853-5.rs b/tests/ui/typeck/issue-13853-5.rs
index 2afdf95aa..2afdf95aa 100644
--- a/src/test/ui/typeck/issue-13853-5.rs
+++ b/tests/ui/typeck/issue-13853-5.rs
diff --git a/src/test/ui/typeck/issue-13853-5.stderr b/tests/ui/typeck/issue-13853-5.stderr
index 3d8f824ec..3d8f824ec 100644
--- a/src/test/ui/typeck/issue-13853-5.stderr
+++ b/tests/ui/typeck/issue-13853-5.stderr
diff --git a/src/test/ui/typeck/issue-13853.rs b/tests/ui/typeck/issue-13853.rs
index ac9886d2e..ac9886d2e 100644
--- a/src/test/ui/typeck/issue-13853.rs
+++ b/tests/ui/typeck/issue-13853.rs
diff --git a/src/test/ui/typeck/issue-13853.stderr b/tests/ui/typeck/issue-13853.stderr
index 657bda5f6..876ac2c67 100644
--- a/src/test/ui/typeck/issue-13853.stderr
+++ b/tests/ui/typeck/issue-13853.stderr
@@ -5,7 +5,7 @@ LL |     fn nodes<'a, I: Iterator<Item=&'a N>>(&self) -> I
    |                  - this type parameter              - expected `I` because of return type
 ...
 LL |         self.iter()
-   |         ^^^^^^^^^^^ expected type parameter `I`, found struct `std::slice::Iter`
+   |         ^^^^^^^^^^^ expected type parameter `I`, found struct `Iter`
    |
    = note: expected type parameter `I`
                       found struct `std::slice::Iter<'_, N>`
diff --git a/src/test/ui/issues/issue-18937-1.rs b/tests/ui/typeck/issue-18937-1.rs
index 57e56d832..57e56d832 100644
--- a/src/test/ui/issues/issue-18937-1.rs
+++ b/tests/ui/typeck/issue-18937-1.rs
diff --git a/src/test/ui/issues/issue-18937.rs b/tests/ui/typeck/issue-18937.rs
index af85e5b2b..af85e5b2b 100644
--- a/src/test/ui/issues/issue-18937.rs
+++ b/tests/ui/typeck/issue-18937.rs
diff --git a/src/test/ui/issues/issue-18937.stderr b/tests/ui/typeck/issue-18937.stderr
index 5e2ba0ef4..5e2ba0ef4 100644
--- a/src/test/ui/issues/issue-18937.stderr
+++ b/tests/ui/typeck/issue-18937.stderr
diff --git a/src/test/ui/issues/issue-22375.rs b/tests/ui/typeck/issue-22375.rs
index 21a1a4c83..21a1a4c83 100644
--- a/src/test/ui/issues/issue-22375.rs
+++ b/tests/ui/typeck/issue-22375.rs
diff --git a/src/test/ui/typeck/issue-29124.rs b/tests/ui/typeck/issue-29124.rs
index dd2784841..dd2784841 100644
--- a/src/test/ui/typeck/issue-29124.rs
+++ b/tests/ui/typeck/issue-29124.rs
diff --git a/src/test/ui/typeck/issue-29124.stderr b/tests/ui/typeck/issue-29124.stderr
index a837a7d2d..a837a7d2d 100644
--- a/src/test/ui/typeck/issue-29124.stderr
+++ b/tests/ui/typeck/issue-29124.stderr
diff --git a/tests/ui/typeck/issue-31173.rs b/tests/ui/typeck/issue-31173.rs
new file mode 100644
index 000000000..f678df5b4
--- /dev/null
+++ b/tests/ui/typeck/issue-31173.rs
@@ -0,0 +1,15 @@
+use std::vec::IntoIter;
+
+pub fn get_tok(it: &mut IntoIter<u8>) {
+    let mut found_e = false;
+
+    let temp: Vec<u8> = it
+        .take_while(|&x| {
+            found_e = true;
+            false
+        })
+        .cloned() //~ ERROR to be an iterator that yields `&_`, but it yields `u8`
+        .collect(); //~ ERROR the method
+}
+
+fn main() {}
diff --git a/tests/ui/typeck/issue-31173.stderr b/tests/ui/typeck/issue-31173.stderr
new file mode 100644
index 000000000..f3be99f9b
--- /dev/null
+++ b/tests/ui/typeck/issue-31173.stderr
@@ -0,0 +1,45 @@
+error[E0271]: expected `TakeWhile<&mut IntoIter<u8>, [closure@issue-31173.rs:7:21]>` to be an iterator that yields `&_`, but it yields `u8`
+  --> $DIR/issue-31173.rs:11:10
+   |
+LL |         .cloned()
+   |          ^^^^^^ expected reference, found `u8`
+   |
+   = note: expected reference `&_`
+                   found type `u8`
+note: the method call chain might not have had the expected associated types
+  --> $DIR/issue-31173.rs:3:20
+   |
+LL |   pub fn get_tok(it: &mut IntoIter<u8>) {
+   |                      ^^^^^^^^^^^^^^^^^ `Iterator::Item` is `u8` here
+...
+LL |           .take_while(|&x| {
+   |  __________-
+LL | |             found_e = true;
+LL | |             false
+LL | |         })
+   | |__________- `Iterator::Item` remains `u8` here
+note: required by a bound in `cloned`
+  --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
+
+error[E0599]: the method `collect` exists for struct `Cloned<TakeWhile<&mut IntoIter<u8>, [closure@issue-31173.rs:7:21]>>`, but its trait bounds were not satisfied
+  --> $DIR/issue-31173.rs:12:10
+   |
+LL |         .collect();
+   |          ^^^^^^^ method cannot be called due to unsatisfied trait bounds
+  --> $SRC_DIR/core/src/iter/adapters/take_while.rs:LL:COL
+   |
+   = note: doesn't satisfy `<_ as Iterator>::Item = &_`
+  --> $SRC_DIR/core/src/iter/adapters/cloned.rs:LL:COL
+   |
+   = note: doesn't satisfy `_: Iterator`
+   |
+   = note: the following trait bounds were not satisfied:
+           `<TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:7:21: 7:25]> as Iterator>::Item = &_`
+           which is required by `Cloned<TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:7:21: 7:25]>>: Iterator`
+           `Cloned<TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:7:21: 7:25]>>: Iterator`
+           which is required by `&mut Cloned<TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:7:21: 7:25]>>: Iterator`
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0271, E0599.
+For more information about an error, try `rustc --explain E0271`.
diff --git a/src/test/ui/issues/issue-33575.rs b/tests/ui/typeck/issue-33575.rs
index de544afae..de544afae 100644
--- a/src/test/ui/issues/issue-33575.rs
+++ b/tests/ui/typeck/issue-33575.rs
diff --git a/src/test/ui/issues/issue-33575.stderr b/tests/ui/typeck/issue-33575.stderr
index bbd8042d1..bbd8042d1 100644
--- a/src/test/ui/issues/issue-33575.stderr
+++ b/tests/ui/typeck/issue-33575.stderr
diff --git a/src/test/ui/typeck/issue-36708.rs b/tests/ui/typeck/issue-36708.rs
index c9d9f2a6d..c9d9f2a6d 100644
--- a/src/test/ui/typeck/issue-36708.rs
+++ b/tests/ui/typeck/issue-36708.rs
diff --git a/src/test/ui/typeck/issue-36708.stderr b/tests/ui/typeck/issue-36708.stderr
index 140f19f1f..140f19f1f 100644
--- a/src/test/ui/typeck/issue-36708.stderr
+++ b/tests/ui/typeck/issue-36708.stderr
diff --git a/src/test/ui/typeck/issue-43189.rs b/tests/ui/typeck/issue-43189.rs
index ce667a500..ce667a500 100644
--- a/src/test/ui/typeck/issue-43189.rs
+++ b/tests/ui/typeck/issue-43189.rs
diff --git a/src/test/ui/typeck/issue-43189.stderr b/tests/ui/typeck/issue-43189.stderr
index caf7530b8..caf7530b8 100644
--- a/src/test/ui/typeck/issue-43189.stderr
+++ b/tests/ui/typeck/issue-43189.stderr
diff --git a/src/test/ui/typeck/issue-46112.rs b/tests/ui/typeck/issue-46112.rs
index 0cdd2c27f..0cdd2c27f 100644
--- a/src/test/ui/typeck/issue-46112.rs
+++ b/tests/ui/typeck/issue-46112.rs
diff --git a/tests/ui/typeck/issue-46112.stderr b/tests/ui/typeck/issue-46112.stderr
new file mode 100644
index 000000000..8f5ff51fb
--- /dev/null
+++ b/tests/ui/typeck/issue-46112.stderr
@@ -0,0 +1,27 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-46112.rs:9:21
+   |
+LL | fn main() { test(Ok(())); }
+   |                  -- ^^ expected enum `Option`, found `()`
+   |                  |
+   |                  arguments to this enum variant are incorrect
+   |
+   = note:   expected enum `Option<()>`
+           found unit type `()`
+help: the type constructed contains `()` due to the type of the argument passed
+  --> $DIR/issue-46112.rs:9:18
+   |
+LL | fn main() { test(Ok(())); }
+   |                  ^^^--^
+   |                     |
+   |                     this argument influences the type of `Ok`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+help: try wrapping the expression in `Some`
+   |
+LL | fn main() { test(Ok(Some(()))); }
+   |                     +++++  +
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/typeck/issue-50687-ice-on-borrow.rs b/tests/ui/typeck/issue-50687-ice-on-borrow.rs
index 7a8a12c2a..7a8a12c2a 100644
--- a/src/test/ui/typeck/issue-50687-ice-on-borrow.rs
+++ b/tests/ui/typeck/issue-50687-ice-on-borrow.rs
diff --git a/src/test/ui/typeck/issue-50687-ice-on-borrow.stderr b/tests/ui/typeck/issue-50687-ice-on-borrow.stderr
index e6a0edac4..e6a0edac4 100644
--- a/src/test/ui/typeck/issue-50687-ice-on-borrow.stderr
+++ b/tests/ui/typeck/issue-50687-ice-on-borrow.stderr
diff --git a/src/test/ui/typeck/issue-52082-type-param-shadows-existing-type.rs b/tests/ui/typeck/issue-52082-type-param-shadows-existing-type.rs
index 7bf151514..7bf151514 100644
--- a/src/test/ui/typeck/issue-52082-type-param-shadows-existing-type.rs
+++ b/tests/ui/typeck/issue-52082-type-param-shadows-existing-type.rs
diff --git a/src/test/ui/typeck/issue-52082-type-param-shadows-existing-type.stderr b/tests/ui/typeck/issue-52082-type-param-shadows-existing-type.stderr
index 4be4c91df..4be4c91df 100644
--- a/src/test/ui/typeck/issue-52082-type-param-shadows-existing-type.stderr
+++ b/tests/ui/typeck/issue-52082-type-param-shadows-existing-type.stderr
diff --git a/src/test/ui/typeck/issue-55810-must-typeck-match-pats-before-guards.rs b/tests/ui/typeck/issue-55810-must-typeck-match-pats-before-guards.rs
index 23ea0ad61..23ea0ad61 100644
--- a/src/test/ui/typeck/issue-55810-must-typeck-match-pats-before-guards.rs
+++ b/tests/ui/typeck/issue-55810-must-typeck-match-pats-before-guards.rs
diff --git a/tests/ui/typeck/issue-57404.rs b/tests/ui/typeck/issue-57404.rs
new file mode 100644
index 000000000..ecabca66a
--- /dev/null
+++ b/tests/ui/typeck/issue-57404.rs
@@ -0,0 +1,7 @@
+#![feature(unboxed_closures)]
+#![feature(fn_traits)]
+
+fn main() {
+    let handlers: Option<Box<dyn for<'a> FnMut<&'a mut (), Output=()>>> = None;
+    handlers.unwrap().as_mut().call_mut(&mut ()); //~ ERROR: `&mut ()` is not a tuple
+}
diff --git a/tests/ui/typeck/issue-57404.stderr b/tests/ui/typeck/issue-57404.stderr
new file mode 100644
index 000000000..a631dbb39
--- /dev/null
+++ b/tests/ui/typeck/issue-57404.stderr
@@ -0,0 +1,19 @@
+error[E0277]: `&mut ()` is not a tuple
+  --> $DIR/issue-57404.rs:6:41
+   |
+LL |     handlers.unwrap().as_mut().call_mut(&mut ());
+   |                                -------- ^^^^^^^ the trait `Tuple` is not implemented for `&mut ()`
+   |                                |
+   |                                required by a bound introduced by this call
+   |
+note: required by a bound in `call_mut`
+  --> $SRC_DIR/core/src/ops/function.rs:LL:COL
+help: consider removing the leading `&`-reference
+   |
+LL -     handlers.unwrap().as_mut().call_mut(&mut ());
+LL +     handlers.unwrap().as_mut().call_mut(());
+   |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/typeck/issue-57673-ice-on-deref-of-boxed-trait.rs b/tests/ui/typeck/issue-57673-ice-on-deref-of-boxed-trait.rs
index 0a4e7da2b..0a4e7da2b 100644
--- a/src/test/ui/typeck/issue-57673-ice-on-deref-of-boxed-trait.rs
+++ b/tests/ui/typeck/issue-57673-ice-on-deref-of-boxed-trait.rs
diff --git a/src/test/ui/typeck/issue-57673-ice-on-deref-of-boxed-trait.stderr b/tests/ui/typeck/issue-57673-ice-on-deref-of-boxed-trait.stderr
index b92a6f2ec..b92a6f2ec 100644
--- a/src/test/ui/typeck/issue-57673-ice-on-deref-of-boxed-trait.stderr
+++ b/tests/ui/typeck/issue-57673-ice-on-deref-of-boxed-trait.stderr
diff --git a/src/test/ui/typeck/issue-61711-once-caused-rustc-inf-loop.rs b/tests/ui/typeck/issue-61711-once-caused-rustc-inf-loop.rs
index de7d6a0d8..de7d6a0d8 100644
--- a/src/test/ui/typeck/issue-61711-once-caused-rustc-inf-loop.rs
+++ b/tests/ui/typeck/issue-61711-once-caused-rustc-inf-loop.rs
diff --git a/src/test/ui/typeck/issue-65611.rs b/tests/ui/typeck/issue-65611.rs
index 764531149..764531149 100644
--- a/src/test/ui/typeck/issue-65611.rs
+++ b/tests/ui/typeck/issue-65611.rs
diff --git a/src/test/ui/typeck/issue-65611.stderr b/tests/ui/typeck/issue-65611.stderr
index 003c63079..003c63079 100644
--- a/src/test/ui/typeck/issue-65611.stderr
+++ b/tests/ui/typeck/issue-65611.stderr
diff --git a/src/test/ui/typeck/issue-67971.rs b/tests/ui/typeck/issue-67971.rs
index 8bf725cb5..8bf725cb5 100644
--- a/src/test/ui/typeck/issue-67971.rs
+++ b/tests/ui/typeck/issue-67971.rs
diff --git a/src/test/ui/typeck/issue-67971.stderr b/tests/ui/typeck/issue-67971.stderr
index 5d07f9cc7..5d07f9cc7 100644
--- a/src/test/ui/typeck/issue-67971.stderr
+++ b/tests/ui/typeck/issue-67971.stderr
diff --git a/src/test/ui/typeck/issue-68590-reborrow-through-derefmut.rs b/tests/ui/typeck/issue-68590-reborrow-through-derefmut.rs
index e4436260e..e4436260e 100644
--- a/src/test/ui/typeck/issue-68590-reborrow-through-derefmut.rs
+++ b/tests/ui/typeck/issue-68590-reborrow-through-derefmut.rs
diff --git a/src/test/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.rs b/tests/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.rs
index 571692a53..571692a53 100644
--- a/src/test/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.rs
+++ b/tests/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.rs
diff --git a/src/test/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.stderr b/tests/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.stderr
index fc7c23a22..fc7c23a22 100644
--- a/src/test/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.stderr
+++ b/tests/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.stderr
diff --git a/src/test/ui/typeck/issue-72225-call-fnmut-through-derefmut.rs b/tests/ui/typeck/issue-72225-call-fnmut-through-derefmut.rs
index 3ea05389f..3ea05389f 100644
--- a/src/test/ui/typeck/issue-72225-call-fnmut-through-derefmut.rs
+++ b/tests/ui/typeck/issue-72225-call-fnmut-through-derefmut.rs
diff --git a/src/test/ui/typeck/issue-73592-borrow_mut-through-deref.fixed b/tests/ui/typeck/issue-73592-borrow_mut-through-deref.fixed
index 7fdd618c2..7fdd618c2 100644
--- a/src/test/ui/typeck/issue-73592-borrow_mut-through-deref.fixed
+++ b/tests/ui/typeck/issue-73592-borrow_mut-through-deref.fixed
diff --git a/src/test/ui/typeck/issue-73592-borrow_mut-through-deref.rs b/tests/ui/typeck/issue-73592-borrow_mut-through-deref.rs
index 3b399e629..3b399e629 100644
--- a/src/test/ui/typeck/issue-73592-borrow_mut-through-deref.rs
+++ b/tests/ui/typeck/issue-73592-borrow_mut-through-deref.rs
diff --git a/src/test/ui/typeck/issue-73592-borrow_mut-through-deref.stderr b/tests/ui/typeck/issue-73592-borrow_mut-through-deref.stderr
index 5f5f672c3..5f5f672c3 100644
--- a/src/test/ui/typeck/issue-73592-borrow_mut-through-deref.stderr
+++ b/tests/ui/typeck/issue-73592-borrow_mut-through-deref.stderr
diff --git a/src/test/ui/typeck/issue-74086.rs b/tests/ui/typeck/issue-74086.rs
index 9b7c0d7cc..9b7c0d7cc 100644
--- a/src/test/ui/typeck/issue-74086.rs
+++ b/tests/ui/typeck/issue-74086.rs
diff --git a/src/test/ui/typeck/issue-74086.stderr b/tests/ui/typeck/issue-74086.stderr
index 95ebf9a90..95ebf9a90 100644
--- a/src/test/ui/typeck/issue-74086.stderr
+++ b/tests/ui/typeck/issue-74086.stderr
diff --git a/src/test/ui/typeck/issue-74933.rs b/tests/ui/typeck/issue-74933.rs
index 4b6c173b8..4b6c173b8 100644
--- a/src/test/ui/typeck/issue-74933.rs
+++ b/tests/ui/typeck/issue-74933.rs
diff --git a/src/test/ui/typeck/issue-75883.rs b/tests/ui/typeck/issue-75883.rs
index 885acc482..885acc482 100644
--- a/src/test/ui/typeck/issue-75883.rs
+++ b/tests/ui/typeck/issue-75883.rs
diff --git a/src/test/ui/typeck/issue-75883.stderr b/tests/ui/typeck/issue-75883.stderr
index 3861e0507..f5adcabe3 100644
--- a/src/test/ui/typeck/issue-75883.stderr
+++ b/tests/ui/typeck/issue-75883.stderr
@@ -6,11 +6,6 @@ LL |     pub fn run() -> Result<_> {
    |                     |
    |                     expected 2 generic arguments
    |
-note: enum defined here, with 2 generic parameters: `T`, `E`
-  --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   |          ^^^^^^ -  -
 help: add missing generic argument
    |
 LL |     pub fn run() -> Result<_, E> {
@@ -24,11 +19,6 @@ LL |     pub fn interact(&mut self) -> Result<_> {
    |                                   |
    |                                   expected 2 generic arguments
    |
-note: enum defined here, with 2 generic parameters: `T`, `E`
-  --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   |          ^^^^^^ -  -
 help: add missing generic argument
    |
 LL |     pub fn interact(&mut self) -> Result<_, E> {
diff --git a/src/test/ui/typeck/issue-75889.rs b/tests/ui/typeck/issue-75889.rs
index 84c067ed0..84c067ed0 100644
--- a/src/test/ui/typeck/issue-75889.rs
+++ b/tests/ui/typeck/issue-75889.rs
diff --git a/src/test/ui/typeck/issue-75889.stderr b/tests/ui/typeck/issue-75889.stderr
index 1438f481e..1438f481e 100644
--- a/src/test/ui/typeck/issue-75889.stderr
+++ b/tests/ui/typeck/issue-75889.stderr
diff --git a/src/test/ui/typeck/issue-79040.rs b/tests/ui/typeck/issue-79040.rs
index 941612542..941612542 100644
--- a/src/test/ui/typeck/issue-79040.rs
+++ b/tests/ui/typeck/issue-79040.rs
diff --git a/src/test/ui/typeck/issue-79040.stderr b/tests/ui/typeck/issue-79040.stderr
index c820d1e08..c820d1e08 100644
--- a/src/test/ui/typeck/issue-79040.stderr
+++ b/tests/ui/typeck/issue-79040.stderr
diff --git a/src/test/ui/typeck/issue-80207-unsized-return.rs b/tests/ui/typeck/issue-80207-unsized-return.rs
index 75430da14..75430da14 100644
--- a/src/test/ui/typeck/issue-80207-unsized-return.rs
+++ b/tests/ui/typeck/issue-80207-unsized-return.rs
diff --git a/src/test/ui/typeck/issue-80779.rs b/tests/ui/typeck/issue-80779.rs
index 1624f6b77..1624f6b77 100644
--- a/src/test/ui/typeck/issue-80779.rs
+++ b/tests/ui/typeck/issue-80779.rs
diff --git a/src/test/ui/typeck/issue-80779.stderr b/tests/ui/typeck/issue-80779.stderr
index 2261ba616..2261ba616 100644
--- a/src/test/ui/typeck/issue-80779.stderr
+++ b/tests/ui/typeck/issue-80779.stderr
diff --git a/src/test/ui/typeck/issue-81293.rs b/tests/ui/typeck/issue-81293.rs
index 076b8c944..076b8c944 100644
--- a/src/test/ui/typeck/issue-81293.rs
+++ b/tests/ui/typeck/issue-81293.rs
diff --git a/src/test/ui/typeck/issue-81293.stderr b/tests/ui/typeck/issue-81293.stderr
index 6976be711..6976be711 100644
--- a/src/test/ui/typeck/issue-81293.stderr
+++ b/tests/ui/typeck/issue-81293.stderr
diff --git a/src/test/ui/typeck/issue-81885.rs b/tests/ui/typeck/issue-81885.rs
index fb3949478..fb3949478 100644
--- a/src/test/ui/typeck/issue-81885.rs
+++ b/tests/ui/typeck/issue-81885.rs
diff --git a/src/test/ui/typeck/issue-81885.stderr b/tests/ui/typeck/issue-81885.stderr
index 91c08bd82..91c08bd82 100644
--- a/src/test/ui/typeck/issue-81885.stderr
+++ b/tests/ui/typeck/issue-81885.stderr
diff --git a/src/test/ui/typeck/issue-81943.rs b/tests/ui/typeck/issue-81943.rs
index 18f5970a3..18f5970a3 100644
--- a/src/test/ui/typeck/issue-81943.rs
+++ b/tests/ui/typeck/issue-81943.rs
diff --git a/src/test/ui/typeck/issue-81943.stderr b/tests/ui/typeck/issue-81943.stderr
index 041ff1075..041ff1075 100644
--- a/src/test/ui/typeck/issue-81943.stderr
+++ b/tests/ui/typeck/issue-81943.stderr
diff --git a/src/test/ui/typeck/issue-82772.rs b/tests/ui/typeck/issue-82772.rs
index 326273bfe..326273bfe 100644
--- a/src/test/ui/typeck/issue-82772.rs
+++ b/tests/ui/typeck/issue-82772.rs
diff --git a/src/test/ui/typeck/issue-82772.stderr b/tests/ui/typeck/issue-82772.stderr
index 321143cb9..321143cb9 100644
--- a/src/test/ui/typeck/issue-82772.stderr
+++ b/tests/ui/typeck/issue-82772.stderr
diff --git a/src/test/ui/typeck/issue-83621-placeholder-static-in-extern.rs b/tests/ui/typeck/issue-83621-placeholder-static-in-extern.rs
index 16ec2a546..16ec2a546 100644
--- a/src/test/ui/typeck/issue-83621-placeholder-static-in-extern.rs
+++ b/tests/ui/typeck/issue-83621-placeholder-static-in-extern.rs
diff --git a/src/test/ui/typeck/issue-83621-placeholder-static-in-extern.stderr b/tests/ui/typeck/issue-83621-placeholder-static-in-extern.stderr
index 9376e8bcf..9376e8bcf 100644
--- a/src/test/ui/typeck/issue-83621-placeholder-static-in-extern.stderr
+++ b/tests/ui/typeck/issue-83621-placeholder-static-in-extern.stderr
diff --git a/src/test/ui/typeck/issue-83693.rs b/tests/ui/typeck/issue-83693.rs
index a42558220..a42558220 100644
--- a/src/test/ui/typeck/issue-83693.rs
+++ b/tests/ui/typeck/issue-83693.rs
diff --git a/src/test/ui/typeck/issue-83693.stderr b/tests/ui/typeck/issue-83693.stderr
index 1e45c2d35..ce4f73b82 100644
--- a/src/test/ui/typeck/issue-83693.stderr
+++ b/tests/ui/typeck/issue-83693.stderr
@@ -3,11 +3,9 @@ error[E0412]: cannot find type `F` in this scope
    |
 LL | impl F {
    |      ^ help: a trait with a similar name exists: `Fn`
+  --> $SRC_DIR/core/src/ops/function.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/ops/function.rs:LL:COL
-   |
-LL | pub trait Fn<Args: Tuple>: FnMut<Args> {
-   | -------------------------------------- similarly named trait `Fn` defined here
+   = note: similarly named trait `Fn` defined here
 
 error[E0412]: cannot find type `TestResult` in this scope
   --> $DIR/issue-83693.rs:9:22
diff --git a/src/test/ui/typeck/issue-84160.rs b/tests/ui/typeck/issue-84160.rs
index 7b444df85..7b444df85 100644
--- a/src/test/ui/typeck/issue-84160.rs
+++ b/tests/ui/typeck/issue-84160.rs
diff --git a/src/test/ui/typeck/issue-84160.stderr b/tests/ui/typeck/issue-84160.stderr
index 24c188b3f..24c188b3f 100644
--- a/src/test/ui/typeck/issue-84160.stderr
+++ b/tests/ui/typeck/issue-84160.stderr
diff --git a/src/test/ui/typeck/issue-84768.rs b/tests/ui/typeck/issue-84768.rs
index ffa92823b..ffa92823b 100644
--- a/src/test/ui/typeck/issue-84768.rs
+++ b/tests/ui/typeck/issue-84768.rs
diff --git a/tests/ui/typeck/issue-84768.stderr b/tests/ui/typeck/issue-84768.stderr
new file mode 100644
index 000000000..09f3aee2d
--- /dev/null
+++ b/tests/ui/typeck/issue-84768.stderr
@@ -0,0 +1,30 @@
+error[E0229]: associated type bindings are not allowed here
+  --> $DIR/issue-84768.rs:7:11
+   |
+LL |     <F as FnOnce(&mut u8)>::call_once(f, 1)
+   |           ^^^^^^^^^^^^^^^ associated type not allowed here
+
+error[E0308]: mismatched types
+  --> $DIR/issue-84768.rs:7:42
+   |
+LL |     <F as FnOnce(&mut u8)>::call_once(f, 1)
+   |     ---------------------------------    ^ expected tuple, found integer
+   |     |
+   |     arguments to this function are incorrect
+   |
+   = note: expected tuple `(&mut u8,)`
+               found type `{integer}`
+help: the return type of this call is `{integer}` due to the type of the argument passed
+  --> $DIR/issue-84768.rs:7:5
+   |
+LL |     <F as FnOnce(&mut u8)>::call_once(f, 1)
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-^
+   |                                          |
+   |                                          this argument influences the return type of `FnOnce`
+note: associated function defined here
+  --> $SRC_DIR/core/src/ops/function.rs:LL:COL
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0229, E0308.
+For more information about an error, try `rustc --explain E0229`.
diff --git a/src/test/ui/typeck/issue-84831.rs b/tests/ui/typeck/issue-84831.rs
index c646f7107..c646f7107 100644
--- a/src/test/ui/typeck/issue-84831.rs
+++ b/tests/ui/typeck/issue-84831.rs
diff --git a/src/test/ui/typeck/issue-84831.stderr b/tests/ui/typeck/issue-84831.stderr
index 461ccb142..461ccb142 100644
--- a/src/test/ui/typeck/issue-84831.stderr
+++ b/tests/ui/typeck/issue-84831.stderr
diff --git a/src/test/ui/typeck/issue-86721-return-expr-ice.rev1.stderr b/tests/ui/typeck/issue-86721-return-expr-ice.rev1.stderr
index b1111fcf1..b1111fcf1 100644
--- a/src/test/ui/typeck/issue-86721-return-expr-ice.rev1.stderr
+++ b/tests/ui/typeck/issue-86721-return-expr-ice.rev1.stderr
diff --git a/src/test/ui/typeck/issue-86721-return-expr-ice.rev2.stderr b/tests/ui/typeck/issue-86721-return-expr-ice.rev2.stderr
index f489ae200..f489ae200 100644
--- a/src/test/ui/typeck/issue-86721-return-expr-ice.rev2.stderr
+++ b/tests/ui/typeck/issue-86721-return-expr-ice.rev2.stderr
diff --git a/src/test/ui/typeck/issue-86721-return-expr-ice.rs b/tests/ui/typeck/issue-86721-return-expr-ice.rs
index cd7135f18..cd7135f18 100644
--- a/src/test/ui/typeck/issue-86721-return-expr-ice.rs
+++ b/tests/ui/typeck/issue-86721-return-expr-ice.rs
diff --git a/tests/ui/typeck/issue-87181/empty-tuple-method.rs b/tests/ui/typeck/issue-87181/empty-tuple-method.rs
new file mode 100644
index 000000000..96b3f8dab
--- /dev/null
+++ b/tests/ui/typeck/issue-87181/empty-tuple-method.rs
@@ -0,0 +1,14 @@
+struct Bar<T> {
+    bar: T
+}
+
+struct Foo();
+impl Foo {
+    fn foo(&self) { }
+}
+
+fn main() {
+    let thing = Bar { bar: Foo };
+    thing.bar.foo();
+    //~^ ERROR no method named `foo` found for struct constructor `fn() -> Foo {Foo}` in the current scope [E0599]
+}
diff --git a/src/test/ui/typeck/issue-87181/empty-tuple-method.stderr b/tests/ui/typeck/issue-87181/empty-tuple-method.stderr
index 23e7b7cc3..f0ca49e6d 100644
--- a/src/test/ui/typeck/issue-87181/empty-tuple-method.stderr
+++ b/tests/ui/typeck/issue-87181/empty-tuple-method.stderr
@@ -1,4 +1,4 @@
-error[E0599]: no method named `foo` found for fn item `fn() -> Foo {Foo}` in the current scope
+error[E0599]: no method named `foo` found for struct constructor `fn() -> Foo {Foo}` in the current scope
   --> $DIR/empty-tuple-method.rs:12:15
    |
 LL |     thing.bar.foo();
diff --git a/tests/ui/typeck/issue-87181/enum-variant.rs b/tests/ui/typeck/issue-87181/enum-variant.rs
new file mode 100644
index 000000000..ed01656ce
--- /dev/null
+++ b/tests/ui/typeck/issue-87181/enum-variant.rs
@@ -0,0 +1,16 @@
+struct Bar<T> {
+    bar: T
+}
+
+enum Foo{
+    Tup()
+}
+impl Foo {
+    fn foo(&self) { }
+}
+
+fn main() {
+    let thing = Bar { bar: Foo::Tup };
+    thing.bar.foo();
+    //~^ ERROR no method named `foo` found for enum constructor `fn() -> Foo {Foo::Tup}` in the current scope [E0599]
+}
diff --git a/src/test/ui/typeck/issue-87181/enum-variant.stderr b/tests/ui/typeck/issue-87181/enum-variant.stderr
index 2247ea270..d313a887a 100644
--- a/src/test/ui/typeck/issue-87181/enum-variant.stderr
+++ b/tests/ui/typeck/issue-87181/enum-variant.stderr
@@ -1,4 +1,4 @@
-error[E0599]: no method named `foo` found for fn item `fn() -> Foo {Foo::Tup}` in the current scope
+error[E0599]: no method named `foo` found for enum constructor `fn() -> Foo {Foo::Tup}` in the current scope
   --> $DIR/enum-variant.rs:14:15
    |
 LL |     thing.bar.foo();
diff --git a/src/test/ui/typeck/issue-87181/tuple-field.rs b/tests/ui/typeck/issue-87181/tuple-field.rs
index 00e3b460e..00e3b460e 100644
--- a/src/test/ui/typeck/issue-87181/tuple-field.rs
+++ b/tests/ui/typeck/issue-87181/tuple-field.rs
diff --git a/src/test/ui/typeck/issue-87181/tuple-field.stderr b/tests/ui/typeck/issue-87181/tuple-field.stderr
index 0a7d30b61..0a7d30b61 100644
--- a/src/test/ui/typeck/issue-87181/tuple-field.stderr
+++ b/tests/ui/typeck/issue-87181/tuple-field.stderr
diff --git a/tests/ui/typeck/issue-87181/tuple-method.rs b/tests/ui/typeck/issue-87181/tuple-method.rs
new file mode 100644
index 000000000..631098443
--- /dev/null
+++ b/tests/ui/typeck/issue-87181/tuple-method.rs
@@ -0,0 +1,14 @@
+struct Bar<T> {
+    bar: T
+}
+
+struct Foo(u8, i32);
+impl Foo {
+    fn foo() { }
+}
+
+fn main() {
+    let thing = Bar { bar: Foo };
+    thing.bar.foo();
+    //~^ ERROR no method named `foo` found for struct constructor `fn(u8, i32) -> Foo {Foo}` in the current scope [E0599]
+}
diff --git a/tests/ui/typeck/issue-87181/tuple-method.stderr b/tests/ui/typeck/issue-87181/tuple-method.stderr
new file mode 100644
index 000000000..de3dc15a5
--- /dev/null
+++ b/tests/ui/typeck/issue-87181/tuple-method.stderr
@@ -0,0 +1,9 @@
+error[E0599]: no method named `foo` found for struct constructor `fn(u8, i32) -> Foo {Foo}` in the current scope
+  --> $DIR/tuple-method.rs:12:15
+   |
+LL |     thing.bar.foo();
+   |               ^^^ method not found in `fn(u8, i32) -> Foo {Foo}`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/typeck/issue-87771-ice-assign-assign-to-bool.rs b/tests/ui/typeck/issue-87771-ice-assign-assign-to-bool.rs
index 751dc8719..751dc8719 100644
--- a/src/test/ui/typeck/issue-87771-ice-assign-assign-to-bool.rs
+++ b/tests/ui/typeck/issue-87771-ice-assign-assign-to-bool.rs
diff --git a/src/test/ui/typeck/issue-87771-ice-assign-assign-to-bool.stderr b/tests/ui/typeck/issue-87771-ice-assign-assign-to-bool.stderr
index 56817ee2c..56817ee2c 100644
--- a/src/test/ui/typeck/issue-87771-ice-assign-assign-to-bool.stderr
+++ b/tests/ui/typeck/issue-87771-ice-assign-assign-to-bool.stderr
diff --git a/src/test/ui/typeck/issue-87872-missing-inaccessible-field-literal.rs b/tests/ui/typeck/issue-87872-missing-inaccessible-field-literal.rs
index 326e958aa..326e958aa 100644
--- a/src/test/ui/typeck/issue-87872-missing-inaccessible-field-literal.rs
+++ b/tests/ui/typeck/issue-87872-missing-inaccessible-field-literal.rs
diff --git a/src/test/ui/typeck/issue-87872-missing-inaccessible-field-literal.stderr b/tests/ui/typeck/issue-87872-missing-inaccessible-field-literal.stderr
index f0bd3e0dd..f0bd3e0dd 100644
--- a/src/test/ui/typeck/issue-87872-missing-inaccessible-field-literal.stderr
+++ b/tests/ui/typeck/issue-87872-missing-inaccessible-field-literal.stderr
diff --git a/src/test/ui/typeck/issue-87872-missing-inaccessible-field-pattern.rs b/tests/ui/typeck/issue-87872-missing-inaccessible-field-pattern.rs
index d28e17559..d28e17559 100644
--- a/src/test/ui/typeck/issue-87872-missing-inaccessible-field-pattern.rs
+++ b/tests/ui/typeck/issue-87872-missing-inaccessible-field-pattern.rs
diff --git a/src/test/ui/typeck/issue-87872-missing-inaccessible-field-pattern.stderr b/tests/ui/typeck/issue-87872-missing-inaccessible-field-pattern.stderr
index dc3097510..dc3097510 100644
--- a/src/test/ui/typeck/issue-87872-missing-inaccessible-field-pattern.stderr
+++ b/tests/ui/typeck/issue-87872-missing-inaccessible-field-pattern.stderr
diff --git a/src/test/ui/typeck/issue-87935-unsized-box-expr.rs b/tests/ui/typeck/issue-87935-unsized-box-expr.rs
index cd2a82074..cd2a82074 100644
--- a/src/test/ui/typeck/issue-87935-unsized-box-expr.rs
+++ b/tests/ui/typeck/issue-87935-unsized-box-expr.rs
diff --git a/src/test/ui/typeck/issue-87935-unsized-box-expr.stderr b/tests/ui/typeck/issue-87935-unsized-box-expr.stderr
index 9ff822352..9ff822352 100644
--- a/src/test/ui/typeck/issue-87935-unsized-box-expr.stderr
+++ b/tests/ui/typeck/issue-87935-unsized-box-expr.stderr
diff --git a/src/test/ui/typeck/issue-88609.rs b/tests/ui/typeck/issue-88609.rs
index dc459c885..dc459c885 100644
--- a/src/test/ui/typeck/issue-88609.rs
+++ b/tests/ui/typeck/issue-88609.rs
diff --git a/src/test/ui/typeck/issue-88643.rs b/tests/ui/typeck/issue-88643.rs
index 4435cba02..4435cba02 100644
--- a/src/test/ui/typeck/issue-88643.rs
+++ b/tests/ui/typeck/issue-88643.rs
diff --git a/src/test/ui/typeck/issue-88643.stderr b/tests/ui/typeck/issue-88643.stderr
index d5d596b6f..d5d596b6f 100644
--- a/src/test/ui/typeck/issue-88643.stderr
+++ b/tests/ui/typeck/issue-88643.stderr
diff --git a/src/test/ui/typeck/issue-88803-call-expr-method.fixed b/tests/ui/typeck/issue-88803-call-expr-method.fixed
index 19b96ecf3..19b96ecf3 100644
--- a/src/test/ui/typeck/issue-88803-call-expr-method.fixed
+++ b/tests/ui/typeck/issue-88803-call-expr-method.fixed
diff --git a/src/test/ui/typeck/issue-88803-call-expr-method.rs b/tests/ui/typeck/issue-88803-call-expr-method.rs
index a06199466..a06199466 100644
--- a/src/test/ui/typeck/issue-88803-call-expr-method.rs
+++ b/tests/ui/typeck/issue-88803-call-expr-method.rs
diff --git a/src/test/ui/typeck/issue-88803-call-expr-method.stderr b/tests/ui/typeck/issue-88803-call-expr-method.stderr
index 645c04b87..645c04b87 100644
--- a/src/test/ui/typeck/issue-88803-call-expr-method.stderr
+++ b/tests/ui/typeck/issue-88803-call-expr-method.stderr
diff --git a/src/test/ui/typeck/issue-88844.rs b/tests/ui/typeck/issue-88844.rs
index 116c75aab..116c75aab 100644
--- a/src/test/ui/typeck/issue-88844.rs
+++ b/tests/ui/typeck/issue-88844.rs
diff --git a/src/test/ui/typeck/issue-88844.stderr b/tests/ui/typeck/issue-88844.stderr
index 90bba90be..90bba90be 100644
--- a/src/test/ui/typeck/issue-88844.stderr
+++ b/tests/ui/typeck/issue-88844.stderr
diff --git a/src/test/ui/typeck/issue-89044-wrapped-expr-method.fixed b/tests/ui/typeck/issue-89044-wrapped-expr-method.fixed
index 0a3086a34..0a3086a34 100644
--- a/src/test/ui/typeck/issue-89044-wrapped-expr-method.fixed
+++ b/tests/ui/typeck/issue-89044-wrapped-expr-method.fixed
diff --git a/src/test/ui/typeck/issue-89044-wrapped-expr-method.rs b/tests/ui/typeck/issue-89044-wrapped-expr-method.rs
index 83617e035..83617e035 100644
--- a/src/test/ui/typeck/issue-89044-wrapped-expr-method.rs
+++ b/tests/ui/typeck/issue-89044-wrapped-expr-method.rs
diff --git a/src/test/ui/typeck/issue-89044-wrapped-expr-method.stderr b/tests/ui/typeck/issue-89044-wrapped-expr-method.stderr
index 6fa0915dc..6fa0915dc 100644
--- a/src/test/ui/typeck/issue-89044-wrapped-expr-method.stderr
+++ b/tests/ui/typeck/issue-89044-wrapped-expr-method.stderr
diff --git a/src/test/ui/typeck/issue-89275.rs b/tests/ui/typeck/issue-89275.rs
index b91c00175..b91c00175 100644
--- a/src/test/ui/typeck/issue-89275.rs
+++ b/tests/ui/typeck/issue-89275.rs
diff --git a/src/test/ui/typeck/issue-89275.stderr b/tests/ui/typeck/issue-89275.stderr
index d73e647d2..d73e647d2 100644
--- a/src/test/ui/typeck/issue-89275.stderr
+++ b/tests/ui/typeck/issue-89275.stderr
diff --git a/src/test/ui/typeck/issue-89806.rs b/tests/ui/typeck/issue-89806.rs
index 69cec0865..69cec0865 100644
--- a/src/test/ui/typeck/issue-89806.rs
+++ b/tests/ui/typeck/issue-89806.rs
diff --git a/src/test/ui/typeck/issue-89806.stderr b/tests/ui/typeck/issue-89806.stderr
index c36b4967e..c36b4967e 100644
--- a/src/test/ui/typeck/issue-89806.stderr
+++ b/tests/ui/typeck/issue-89806.stderr
diff --git a/src/test/ui/typeck/issue-89856.rs b/tests/ui/typeck/issue-89856.rs
index b021e349e..b021e349e 100644
--- a/src/test/ui/typeck/issue-89856.rs
+++ b/tests/ui/typeck/issue-89856.rs
diff --git a/src/test/ui/typeck/issue-89856.stderr b/tests/ui/typeck/issue-89856.stderr
index 5fa1ae1a5..5fa1ae1a5 100644
--- a/src/test/ui/typeck/issue-89856.stderr
+++ b/tests/ui/typeck/issue-89856.stderr
diff --git a/src/test/ui/typeck/issue-89935.rs b/tests/ui/typeck/issue-89935.rs
index 03f8f09a7..03f8f09a7 100644
--- a/src/test/ui/typeck/issue-89935.rs
+++ b/tests/ui/typeck/issue-89935.rs
diff --git a/src/test/ui/typeck/issue-90101.rs b/tests/ui/typeck/issue-90101.rs
index 1954ee6f1..1954ee6f1 100644
--- a/src/test/ui/typeck/issue-90101.rs
+++ b/tests/ui/typeck/issue-90101.rs
diff --git a/src/test/ui/typeck/issue-90101.stderr b/tests/ui/typeck/issue-90101.stderr
index d2729d853..d2729d853 100644
--- a/src/test/ui/typeck/issue-90101.stderr
+++ b/tests/ui/typeck/issue-90101.stderr
diff --git a/src/test/ui/typeck/issue-90164.rs b/tests/ui/typeck/issue-90164.rs
index 63350433e..63350433e 100644
--- a/src/test/ui/typeck/issue-90164.rs
+++ b/tests/ui/typeck/issue-90164.rs
diff --git a/src/test/ui/typeck/issue-90164.stderr b/tests/ui/typeck/issue-90164.stderr
index 1e2f1bae3..1e2f1bae3 100644
--- a/src/test/ui/typeck/issue-90164.stderr
+++ b/tests/ui/typeck/issue-90164.stderr
diff --git a/src/test/ui/typeck/issue-90319.rs b/tests/ui/typeck/issue-90319.rs
index 57e6ac7cf..57e6ac7cf 100644
--- a/src/test/ui/typeck/issue-90319.rs
+++ b/tests/ui/typeck/issue-90319.rs
diff --git a/src/test/ui/typeck/issue-90319.stderr b/tests/ui/typeck/issue-90319.stderr
index 61549dd70..61549dd70 100644
--- a/src/test/ui/typeck/issue-90319.stderr
+++ b/tests/ui/typeck/issue-90319.stderr
diff --git a/src/test/ui/typeck/issue-90483-inaccessible-field-adjustment.rs b/tests/ui/typeck/issue-90483-inaccessible-field-adjustment.rs
index 74e50d46e..74e50d46e 100644
--- a/src/test/ui/typeck/issue-90483-inaccessible-field-adjustment.rs
+++ b/tests/ui/typeck/issue-90483-inaccessible-field-adjustment.rs
diff --git a/src/test/ui/typeck/issue-90483-inaccessible-field-adjustment.stderr b/tests/ui/typeck/issue-90483-inaccessible-field-adjustment.stderr
index 02cdc102c..02cdc102c 100644
--- a/src/test/ui/typeck/issue-90483-inaccessible-field-adjustment.stderr
+++ b/tests/ui/typeck/issue-90483-inaccessible-field-adjustment.stderr
diff --git a/src/test/ui/typeck/issue-90804-incorrect-reference-suggestion.rs b/tests/ui/typeck/issue-90804-incorrect-reference-suggestion.rs
index f891a42fc..f891a42fc 100644
--- a/src/test/ui/typeck/issue-90804-incorrect-reference-suggestion.rs
+++ b/tests/ui/typeck/issue-90804-incorrect-reference-suggestion.rs
diff --git a/src/test/ui/typeck/issue-90804-incorrect-reference-suggestion.stderr b/tests/ui/typeck/issue-90804-incorrect-reference-suggestion.stderr
index 08eab0253..08eab0253 100644
--- a/src/test/ui/typeck/issue-90804-incorrect-reference-suggestion.stderr
+++ b/tests/ui/typeck/issue-90804-incorrect-reference-suggestion.stderr
diff --git a/src/test/ui/typeck/issue-91210-ptr-method.fixed b/tests/ui/typeck/issue-91210-ptr-method.fixed
index 94200cce7..94200cce7 100644
--- a/src/test/ui/typeck/issue-91210-ptr-method.fixed
+++ b/tests/ui/typeck/issue-91210-ptr-method.fixed
diff --git a/src/test/ui/typeck/issue-91210-ptr-method.rs b/tests/ui/typeck/issue-91210-ptr-method.rs
index ed0ce6eff..ed0ce6eff 100644
--- a/src/test/ui/typeck/issue-91210-ptr-method.rs
+++ b/tests/ui/typeck/issue-91210-ptr-method.rs
diff --git a/src/test/ui/typeck/issue-91210-ptr-method.stderr b/tests/ui/typeck/issue-91210-ptr-method.stderr
index 7a0cfb2cf..7a0cfb2cf 100644
--- a/src/test/ui/typeck/issue-91210-ptr-method.stderr
+++ b/tests/ui/typeck/issue-91210-ptr-method.stderr
diff --git a/src/test/ui/typeck/issue-91267.rs b/tests/ui/typeck/issue-91267.rs
index 4e39cfab5..4e39cfab5 100644
--- a/src/test/ui/typeck/issue-91267.rs
+++ b/tests/ui/typeck/issue-91267.rs
diff --git a/src/test/ui/typeck/issue-91267.stderr b/tests/ui/typeck/issue-91267.stderr
index 72acd9c67..72acd9c67 100644
--- a/src/test/ui/typeck/issue-91267.stderr
+++ b/tests/ui/typeck/issue-91267.stderr
diff --git a/src/test/ui/typeck/issue-91328.fixed b/tests/ui/typeck/issue-91328.fixed
index c0384399a..c0384399a 100644
--- a/src/test/ui/typeck/issue-91328.fixed
+++ b/tests/ui/typeck/issue-91328.fixed
diff --git a/src/test/ui/typeck/issue-91328.rs b/tests/ui/typeck/issue-91328.rs
index 63602d26f..63602d26f 100644
--- a/src/test/ui/typeck/issue-91328.rs
+++ b/tests/ui/typeck/issue-91328.rs
diff --git a/src/test/ui/typeck/issue-91328.stderr b/tests/ui/typeck/issue-91328.stderr
index f2f407bca..f2f407bca 100644
--- a/src/test/ui/typeck/issue-91328.stderr
+++ b/tests/ui/typeck/issue-91328.stderr
diff --git a/src/test/ui/typeck/issue-91334.rs b/tests/ui/typeck/issue-91334.rs
index bf9a5a626..bf9a5a626 100644
--- a/src/test/ui/typeck/issue-91334.rs
+++ b/tests/ui/typeck/issue-91334.rs
diff --git a/src/test/ui/typeck/issue-91334.stderr b/tests/ui/typeck/issue-91334.stderr
index 8508f7a38..8508f7a38 100644
--- a/src/test/ui/typeck/issue-91334.stderr
+++ b/tests/ui/typeck/issue-91334.stderr
diff --git a/src/test/ui/typeck/issue-91450-inner-ty-error.rs b/tests/ui/typeck/issue-91450-inner-ty-error.rs
index 3c7c990d4..3c7c990d4 100644
--- a/src/test/ui/typeck/issue-91450-inner-ty-error.rs
+++ b/tests/ui/typeck/issue-91450-inner-ty-error.rs
diff --git a/src/test/ui/typeck/issue-91450-inner-ty-error.stderr b/tests/ui/typeck/issue-91450-inner-ty-error.stderr
index 32f4c8f6f..32f4c8f6f 100644
--- a/src/test/ui/typeck/issue-91450-inner-ty-error.stderr
+++ b/tests/ui/typeck/issue-91450-inner-ty-error.stderr
diff --git a/src/test/ui/typeck/issue-91633.rs b/tests/ui/typeck/issue-91633.rs
index 331a798dd..331a798dd 100644
--- a/src/test/ui/typeck/issue-91633.rs
+++ b/tests/ui/typeck/issue-91633.rs
diff --git a/tests/ui/typeck/issue-92481.rs b/tests/ui/typeck/issue-92481.rs
new file mode 100644
index 000000000..0a6b1843d
--- /dev/null
+++ b/tests/ui/typeck/issue-92481.rs
@@ -0,0 +1,14 @@
+//check-fail
+
+#![crate_type="lib"]
+
+fn r({) {
+    Ok {             //~ ERROR mismatched types [E0308]
+        d..||_=m
+    }
+}
+//~^^^^^ ERROR expected parameter name, found `{`
+//~| ERROR expected one of `,`, `:`, or `}`, found `..`
+//~^^^^^ ERROR cannot find value `d` in this scope [E0425]
+//~| ERROR cannot find value `m` in this scope [E0425]
+//~| ERROR variant `Result<_, _>::Ok` has no field named `d` [E0559]
diff --git a/tests/ui/typeck/issue-92481.stderr b/tests/ui/typeck/issue-92481.stderr
new file mode 100644
index 000000000..cd778a649
--- /dev/null
+++ b/tests/ui/typeck/issue-92481.stderr
@@ -0,0 +1,60 @@
+error: expected parameter name, found `{`
+  --> $DIR/issue-92481.rs:5:6
+   |
+LL | fn r({) {
+   |      ^ expected parameter name
+
+error: expected one of `,`, `:`, or `}`, found `..`
+  --> $DIR/issue-92481.rs:5:6
+   |
+LL | fn r({) {
+   |      ^ unclosed delimiter
+LL |     Ok {
+LL |         d..||_=m
+   |          -^
+   |          |
+   |          help: `}` may belong here
+
+error[E0425]: cannot find value `d` in this scope
+  --> $DIR/issue-92481.rs:7:9
+   |
+LL |         d..||_=m
+   |         ^ not found in this scope
+
+error[E0425]: cannot find value `m` in this scope
+  --> $DIR/issue-92481.rs:7:16
+   |
+LL |         d..||_=m
+   |                ^ not found in this scope
+
+error[E0559]: variant `Result<_, _>::Ok` has no field named `d`
+  --> $DIR/issue-92481.rs:7:9
+   |
+LL |         d..||_=m
+   |         ^ field does not exist
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+   |
+   = note: `Result<_, _>::Ok` defined here
+   |
+help: `Result<_, _>::Ok` is a tuple variant, use the appropriate syntax
+   |
+LL |     Result<_, _>::Ok(/* fields */)
+   |
+
+error[E0308]: mismatched types
+  --> $DIR/issue-92481.rs:6:5
+   |
+LL |   fn r({) {
+   |           - help: a return type might be missing here: `-> _`
+LL | /     Ok {
+LL | |         d..||_=m
+LL | |     }
+   | |_____^ expected `()`, found enum `Result`
+   |
+   = note: expected unit type `()`
+                   found enum `Result<_, _>`
+
+error: aborting due to 6 previous errors
+
+Some errors have detailed explanations: E0308, E0425, E0559.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/typeck/issue-93486.rs b/tests/ui/typeck/issue-93486.rs
index f8f98d5c1..f8f98d5c1 100644
--- a/src/test/ui/typeck/issue-93486.rs
+++ b/tests/ui/typeck/issue-93486.rs
diff --git a/src/test/ui/typeck/issue-93486.stderr b/tests/ui/typeck/issue-93486.stderr
index 167edc894..167edc894 100644
--- a/src/test/ui/typeck/issue-93486.stderr
+++ b/tests/ui/typeck/issue-93486.stderr
diff --git a/tests/ui/typeck/issue-96530.rs b/tests/ui/typeck/issue-96530.rs
new file mode 100644
index 000000000..4ab93ab49
--- /dev/null
+++ b/tests/ui/typeck/issue-96530.rs
@@ -0,0 +1,20 @@
+struct Person {
+    first_name: String,
+    age: u32,
+}
+
+fn first_woman(man: &Person) -> Person {
+    Person {
+        first_name: "Eve".to_string(),
+        ..man.clone() //~ ERROR: mismatched types
+    }
+}
+
+fn main() {
+    let adam = Person {
+        first_name: "Adam".to_string(),
+        age: 0,
+    };
+
+    let eve = first_woman(&adam);
+}
diff --git a/tests/ui/typeck/issue-96530.stderr b/tests/ui/typeck/issue-96530.stderr
new file mode 100644
index 000000000..4b4568b1d
--- /dev/null
+++ b/tests/ui/typeck/issue-96530.stderr
@@ -0,0 +1,9 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-96530.rs:9:11
+   |
+LL |         ..man.clone()
+   |           ^^^^^^^^^^^ expected struct `Person`, found `&Person`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/typeck/issue-96738.rs b/tests/ui/typeck/issue-96738.rs
index ce2556f86..ce2556f86 100644
--- a/src/test/ui/typeck/issue-96738.rs
+++ b/tests/ui/typeck/issue-96738.rs
diff --git a/src/test/ui/typeck/issue-96738.stderr b/tests/ui/typeck/issue-96738.stderr
index 0d4d87ef4..547cffffa 100644
--- a/src/test/ui/typeck/issue-96738.stderr
+++ b/tests/ui/typeck/issue-96738.stderr
@@ -1,4 +1,4 @@
-error[E0599]: no method named `nonexistent_method` found for fn item `fn(_) -> Option<_> {Option::<_>::Some}` in the current scope
+error[E0599]: no method named `nonexistent_method` found for enum constructor `fn(_) -> Option<_> {Option::<_>::Some}` in the current scope
   --> $DIR/issue-96738.rs:2:10
    |
 LL |     Some.nonexistent_method();
diff --git a/src/test/ui/typeck/issue-98260.rs b/tests/ui/typeck/issue-98260.rs
index cf48294e1..cf48294e1 100644
--- a/src/test/ui/typeck/issue-98260.rs
+++ b/tests/ui/typeck/issue-98260.rs
diff --git a/src/test/ui/typeck/issue-98260.stderr b/tests/ui/typeck/issue-98260.stderr
index 08a1d17e2..08a1d17e2 100644
--- a/src/test/ui/typeck/issue-98260.stderr
+++ b/tests/ui/typeck/issue-98260.stderr
diff --git a/src/test/ui/typeck/issue-98982.rs b/tests/ui/typeck/issue-98982.rs
index 2553824bb..2553824bb 100644
--- a/src/test/ui/typeck/issue-98982.rs
+++ b/tests/ui/typeck/issue-98982.rs
diff --git a/src/test/ui/typeck/issue-98982.stderr b/tests/ui/typeck/issue-98982.stderr
index 3c9806ac9..3c9806ac9 100644
--- a/src/test/ui/typeck/issue-98982.stderr
+++ b/tests/ui/typeck/issue-98982.stderr
diff --git a/src/test/ui/typeck/missing-private-fields-in-struct-literal.rs b/tests/ui/typeck/missing-private-fields-in-struct-literal.rs
index 9f1560bfb..9f1560bfb 100644
--- a/src/test/ui/typeck/missing-private-fields-in-struct-literal.rs
+++ b/tests/ui/typeck/missing-private-fields-in-struct-literal.rs
diff --git a/src/test/ui/typeck/missing-private-fields-in-struct-literal.stderr b/tests/ui/typeck/missing-private-fields-in-struct-literal.stderr
index 234110f31..234110f31 100644
--- a/src/test/ui/typeck/missing-private-fields-in-struct-literal.stderr
+++ b/tests/ui/typeck/missing-private-fields-in-struct-literal.stderr
diff --git a/src/test/ui/typeck/no-type-for-node-ice.rs b/tests/ui/typeck/no-type-for-node-ice.rs
index d0cfdbf50..d0cfdbf50 100644
--- a/src/test/ui/typeck/no-type-for-node-ice.rs
+++ b/tests/ui/typeck/no-type-for-node-ice.rs
diff --git a/src/test/ui/typeck/no-type-for-node-ice.stderr b/tests/ui/typeck/no-type-for-node-ice.stderr
index b50241fb1..b50241fb1 100644
--- a/src/test/ui/typeck/no-type-for-node-ice.stderr
+++ b/tests/ui/typeck/no-type-for-node-ice.stderr
diff --git a/tests/ui/typeck/nonexistent-field-not-ambiguous.rs b/tests/ui/typeck/nonexistent-field-not-ambiguous.rs
new file mode 100644
index 000000000..1cd192b78
--- /dev/null
+++ b/tests/ui/typeck/nonexistent-field-not-ambiguous.rs
@@ -0,0 +1,8 @@
+struct Foo {
+    val: MissingType,
+    //~^ ERROR cannot find type `MissingType` in this scope
+}
+
+fn main() {
+    Foo { val: Default::default() };
+}
diff --git a/tests/ui/typeck/nonexistent-field-not-ambiguous.stderr b/tests/ui/typeck/nonexistent-field-not-ambiguous.stderr
new file mode 100644
index 000000000..76a2a5f99
--- /dev/null
+++ b/tests/ui/typeck/nonexistent-field-not-ambiguous.stderr
@@ -0,0 +1,9 @@
+error[E0412]: cannot find type `MissingType` in this scope
+  --> $DIR/nonexistent-field-not-ambiguous.rs:2:10
+   |
+LL |     val: MissingType,
+   |          ^^^^^^^^^^^ not found in this scope
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/typeck/path-to-method-sugg-unresolved-expr.rs b/tests/ui/typeck/path-to-method-sugg-unresolved-expr.rs
index fb56b3944..fb56b3944 100644
--- a/src/test/ui/typeck/path-to-method-sugg-unresolved-expr.rs
+++ b/tests/ui/typeck/path-to-method-sugg-unresolved-expr.rs
diff --git a/src/test/ui/typeck/path-to-method-sugg-unresolved-expr.stderr b/tests/ui/typeck/path-to-method-sugg-unresolved-expr.stderr
index b01e30be5..b01e30be5 100644
--- a/src/test/ui/typeck/path-to-method-sugg-unresolved-expr.stderr
+++ b/tests/ui/typeck/path-to-method-sugg-unresolved-expr.stderr
diff --git a/src/test/ui/typeck/point-at-type-param-in-path-expr.rs b/tests/ui/typeck/point-at-type-param-in-path-expr.rs
index 9a21536f9..9a21536f9 100644
--- a/src/test/ui/typeck/point-at-type-param-in-path-expr.rs
+++ b/tests/ui/typeck/point-at-type-param-in-path-expr.rs
diff --git a/src/test/ui/typeck/point-at-type-param-in-path-expr.stderr b/tests/ui/typeck/point-at-type-param-in-path-expr.stderr
index 1feaa0508..1feaa0508 100644
--- a/src/test/ui/typeck/point-at-type-param-in-path-expr.stderr
+++ b/tests/ui/typeck/point-at-type-param-in-path-expr.stderr
diff --git a/src/test/ui/typeck/point-at-type-parameter-definition.rs b/tests/ui/typeck/point-at-type-parameter-definition.rs
index 856c0db08..856c0db08 100644
--- a/src/test/ui/typeck/point-at-type-parameter-definition.rs
+++ b/tests/ui/typeck/point-at-type-parameter-definition.rs
diff --git a/src/test/ui/typeck/point-at-type-parameter-definition.stderr b/tests/ui/typeck/point-at-type-parameter-definition.stderr
index 8a6ab6110..8a6ab6110 100644
--- a/src/test/ui/typeck/point-at-type-parameter-definition.stderr
+++ b/tests/ui/typeck/point-at-type-parameter-definition.stderr
diff --git a/src/test/ui/typeck/prim-with-args.fixed b/tests/ui/typeck/prim-with-args.fixed
index e3f99479a..e3f99479a 100644
--- a/src/test/ui/typeck/prim-with-args.fixed
+++ b/tests/ui/typeck/prim-with-args.fixed
diff --git a/src/test/ui/typeck/prim-with-args.rs b/tests/ui/typeck/prim-with-args.rs
index b10471ecc..b10471ecc 100644
--- a/src/test/ui/typeck/prim-with-args.rs
+++ b/tests/ui/typeck/prim-with-args.rs
diff --git a/src/test/ui/typeck/prim-with-args.stderr b/tests/ui/typeck/prim-with-args.stderr
index 2ddad5ad7..2ddad5ad7 100644
--- a/src/test/ui/typeck/prim-with-args.stderr
+++ b/tests/ui/typeck/prim-with-args.stderr
diff --git a/src/test/ui/typeck/project-cache-issue-37154.rs b/tests/ui/typeck/project-cache-issue-37154.rs
index b10239c22..b10239c22 100644
--- a/src/test/ui/typeck/project-cache-issue-37154.rs
+++ b/tests/ui/typeck/project-cache-issue-37154.rs
diff --git a/tests/ui/typeck/quiet-type-err-let-binding.rs b/tests/ui/typeck/quiet-type-err-let-binding.rs
new file mode 100644
index 000000000..a6eab536a
--- /dev/null
+++ b/tests/ui/typeck/quiet-type-err-let-binding.rs
@@ -0,0 +1,17 @@
+// fn foo() -> String {
+//    String::new()
+// }
+
+fn test(s: &str) {
+    println!("{}", s);
+}
+
+fn test2(s: String) {
+    println!("{}", s);
+}
+
+fn main() {
+    let x = foo(); //~ERROR cannot find function `foo` in this scope
+    test(&x);
+    test2(x); // Does not complain about `x` being a `&str`.
+}
diff --git a/tests/ui/typeck/quiet-type-err-let-binding.stderr b/tests/ui/typeck/quiet-type-err-let-binding.stderr
new file mode 100644
index 000000000..ad7f85e01
--- /dev/null
+++ b/tests/ui/typeck/quiet-type-err-let-binding.stderr
@@ -0,0 +1,9 @@
+error[E0425]: cannot find function `foo` in this scope
+  --> $DIR/quiet-type-err-let-binding.rs:14:13
+   |
+LL |     let x = foo();
+   |             ^^^ not found in this scope
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/typeck/remove-extra-argument.fixed b/tests/ui/typeck/remove-extra-argument.fixed
new file mode 100644
index 000000000..d09306bf7
--- /dev/null
+++ b/tests/ui/typeck/remove-extra-argument.fixed
@@ -0,0 +1,9 @@
+// run-rustfix
+// Check that the HELP suggestion is `l(vec![])` instead of `l($crate::vec::Vec::new())`
+fn l(_a: Vec<u8>) {}
+
+fn main() {
+    l(vec![])
+    //~^ ERROR function takes 1 argument but 2 arguments were supplied
+    //~| HELP remove the extra argument
+}
diff --git a/tests/ui/typeck/remove-extra-argument.rs b/tests/ui/typeck/remove-extra-argument.rs
new file mode 100644
index 000000000..2181c37ce
--- /dev/null
+++ b/tests/ui/typeck/remove-extra-argument.rs
@@ -0,0 +1,9 @@
+// run-rustfix
+// Check that the HELP suggestion is `l(vec![])` instead of `l($crate::vec::Vec::new())`
+fn l(_a: Vec<u8>) {}
+
+fn main() {
+    l(vec![], vec![])
+    //~^ ERROR function takes 1 argument but 2 arguments were supplied
+    //~| HELP remove the extra argument
+}
diff --git a/src/test/ui/typeck/remove-extra-argument.stderr b/tests/ui/typeck/remove-extra-argument.stderr
index b734bcd4e..b734bcd4e 100644
--- a/src/test/ui/typeck/remove-extra-argument.stderr
+++ b/tests/ui/typeck/remove-extra-argument.stderr
diff --git a/src/test/ui/typeck/return_type_containing_closure.rs b/tests/ui/typeck/return_type_containing_closure.rs
index 29624e08a..29624e08a 100644
--- a/src/test/ui/typeck/return_type_containing_closure.rs
+++ b/tests/ui/typeck/return_type_containing_closure.rs
diff --git a/src/test/ui/typeck/return_type_containing_closure.stderr b/tests/ui/typeck/return_type_containing_closure.stderr
index 101aee395..101aee395 100644
--- a/src/test/ui/typeck/return_type_containing_closure.stderr
+++ b/tests/ui/typeck/return_type_containing_closure.stderr
diff --git a/src/test/ui/typeck/slow-lhs-suggestion.rs b/tests/ui/typeck/slow-lhs-suggestion.rs
index 80dfd6835..80dfd6835 100644
--- a/src/test/ui/typeck/slow-lhs-suggestion.rs
+++ b/tests/ui/typeck/slow-lhs-suggestion.rs
diff --git a/src/test/ui/typeck/slow-lhs-suggestion.stderr b/tests/ui/typeck/slow-lhs-suggestion.stderr
index c5bf795ee..c5bf795ee 100644
--- a/src/test/ui/typeck/slow-lhs-suggestion.stderr
+++ b/tests/ui/typeck/slow-lhs-suggestion.stderr
diff --git a/src/test/ui/typeck/struct-enum-wrong-args.rs b/tests/ui/typeck/struct-enum-wrong-args.rs
index 19de4d677..19de4d677 100644
--- a/src/test/ui/typeck/struct-enum-wrong-args.rs
+++ b/tests/ui/typeck/struct-enum-wrong-args.rs
diff --git a/src/test/ui/typeck/struct-enum-wrong-args.stderr b/tests/ui/typeck/struct-enum-wrong-args.stderr
index ea94bcbc2..fbced928a 100644
--- a/src/test/ui/typeck/struct-enum-wrong-args.stderr
+++ b/tests/ui/typeck/struct-enum-wrong-args.stderr
@@ -6,9 +6,6 @@ LL |     let _ = Some(3, 2);
    |
 note: tuple variant defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^^^
 help: remove the extra argument
    |
 LL |     let _ = Some(3);
@@ -24,9 +21,6 @@ LL |     let _ = Ok(3, 6, 2);
    |
 note: tuple variant defined here
   --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^
 help: remove the extra arguments
    |
 LL |     let _ = Ok(3);
@@ -40,9 +34,6 @@ LL |     let _ = Ok();
    |
 note: tuple variant defined here
   --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^
 help: provide the argument
    |
 LL |     let _ = Ok(/* value */);
diff --git a/src/test/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.fixed b/tests/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.fixed
index ba83e7900..ba83e7900 100644
--- a/src/test/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.fixed
+++ b/tests/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.fixed
diff --git a/src/test/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.rs b/tests/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.rs
index c102447f6..c102447f6 100644
--- a/src/test/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.rs
+++ b/tests/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.rs
diff --git a/src/test/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.stderr b/tests/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.stderr
index 503015f3b..503015f3b 100644
--- a/src/test/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.stderr
+++ b/tests/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.stderr
diff --git a/src/test/ui/typeck/type-placeholder-fn-in-const.rs b/tests/ui/typeck/type-placeholder-fn-in-const.rs
index ab2e2d8c5..ab2e2d8c5 100644
--- a/src/test/ui/typeck/type-placeholder-fn-in-const.rs
+++ b/tests/ui/typeck/type-placeholder-fn-in-const.rs
diff --git a/src/test/ui/typeck/type-placeholder-fn-in-const.stderr b/tests/ui/typeck/type-placeholder-fn-in-const.stderr
index e7b2e554a..e7b2e554a 100644
--- a/src/test/ui/typeck/type-placeholder-fn-in-const.stderr
+++ b/tests/ui/typeck/type-placeholder-fn-in-const.stderr
diff --git a/src/test/ui/typeck/typeck-builtin-bound-type-parameters.rs b/tests/ui/typeck/typeck-builtin-bound-type-parameters.rs
index c463a8ad0..c463a8ad0 100644
--- a/src/test/ui/typeck/typeck-builtin-bound-type-parameters.rs
+++ b/tests/ui/typeck/typeck-builtin-bound-type-parameters.rs
diff --git a/tests/ui/typeck/typeck-builtin-bound-type-parameters.stderr b/tests/ui/typeck/typeck-builtin-bound-type-parameters.stderr
new file mode 100644
index 000000000..331540d1e
--- /dev/null
+++ b/tests/ui/typeck/typeck-builtin-bound-type-parameters.stderr
@@ -0,0 +1,51 @@
+error[E0107]: this trait takes 0 generic arguments but 1 generic argument was supplied
+  --> $DIR/typeck-builtin-bound-type-parameters.rs:1:11
+   |
+LL | fn foo1<T:Copy<U>, U>(x: T) {}
+   |           ^^^^--- help: remove these generics
+   |           |
+   |           expected 0 generic arguments
+
+error[E0107]: this trait takes 0 generic arguments but 1 generic argument was supplied
+  --> $DIR/typeck-builtin-bound-type-parameters.rs:4:14
+   |
+LL | trait Trait: Copy<dyn Send> {}
+   |              ^^^^---------- help: remove these generics
+   |              |
+   |              expected 0 generic arguments
+
+error[E0107]: this trait takes 0 generic arguments but 1 generic argument was supplied
+  --> $DIR/typeck-builtin-bound-type-parameters.rs:7:21
+   |
+LL | struct MyStruct1<T: Copy<T>>;
+   |                     ^^^^--- help: remove these generics
+   |                     |
+   |                     expected 0 generic arguments
+
+error[E0107]: this trait takes 0 lifetime arguments but 1 lifetime argument was supplied
+  --> $DIR/typeck-builtin-bound-type-parameters.rs:10:25
+   |
+LL | struct MyStruct2<'a, T: Copy<'a>>;
+   |                         ^^^^---- help: remove these generics
+   |                         |
+   |                         expected 0 lifetime arguments
+
+error[E0107]: this trait takes 0 lifetime arguments but 1 lifetime argument was supplied
+  --> $DIR/typeck-builtin-bound-type-parameters.rs:13:15
+   |
+LL | fn foo2<'a, T:Copy<'a, U>, U>(x: T) {}
+   |               ^^^^ -- help: remove this lifetime argument
+   |               |
+   |               expected 0 lifetime arguments
+
+error[E0107]: this trait takes 0 generic arguments but 1 generic argument was supplied
+  --> $DIR/typeck-builtin-bound-type-parameters.rs:13:15
+   |
+LL | fn foo2<'a, T:Copy<'a, U>, U>(x: T) {}
+   |               ^^^^     - help: remove this generic argument
+   |               |
+   |               expected 0 generic arguments
+
+error: aborting due to 6 previous errors
+
+For more information about this error, try `rustc --explain E0107`.
diff --git a/src/test/ui/typeck/typeck-cast-pointer-to-float.rs b/tests/ui/typeck/typeck-cast-pointer-to-float.rs
index 2af7a3cf2..2af7a3cf2 100644
--- a/src/test/ui/typeck/typeck-cast-pointer-to-float.rs
+++ b/tests/ui/typeck/typeck-cast-pointer-to-float.rs
diff --git a/src/test/ui/typeck/typeck-cast-pointer-to-float.stderr b/tests/ui/typeck/typeck-cast-pointer-to-float.stderr
index 81d968454..81d968454 100644
--- a/src/test/ui/typeck/typeck-cast-pointer-to-float.stderr
+++ b/tests/ui/typeck/typeck-cast-pointer-to-float.stderr
diff --git a/src/test/ui/typeck/typeck-closure-to-unsafe-fn-ptr.rs b/tests/ui/typeck/typeck-closure-to-unsafe-fn-ptr.rs
index 2530a1e96..2530a1e96 100644
--- a/src/test/ui/typeck/typeck-closure-to-unsafe-fn-ptr.rs
+++ b/tests/ui/typeck/typeck-closure-to-unsafe-fn-ptr.rs
diff --git a/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.fixed b/tests/ui/typeck/typeck-default-trait-impl-assoc-type.fixed
index a9107f998..a9107f998 100644
--- a/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.fixed
+++ b/tests/ui/typeck/typeck-default-trait-impl-assoc-type.fixed
diff --git a/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.rs b/tests/ui/typeck/typeck-default-trait-impl-assoc-type.rs
index bafc16577..bafc16577 100644
--- a/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.rs
+++ b/tests/ui/typeck/typeck-default-trait-impl-assoc-type.rs
diff --git a/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.stderr b/tests/ui/typeck/typeck-default-trait-impl-assoc-type.stderr
index 468a14762..468a14762 100644
--- a/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.stderr
+++ b/tests/ui/typeck/typeck-default-trait-impl-assoc-type.stderr
diff --git a/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.rs b/tests/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.rs
index cc75cd490..cc75cd490 100644
--- a/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.rs
+++ b/tests/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.rs
diff --git a/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.stderr b/tests/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.stderr
index fc3778b79..fc3778b79 100644
--- a/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.stderr
+++ b/tests/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.stderr
diff --git a/src/test/ui/typeck/typeck-default-trait-impl-negation-send.rs b/tests/ui/typeck/typeck-default-trait-impl-negation-send.rs
index 3a2fc39d4..3a2fc39d4 100644
--- a/src/test/ui/typeck/typeck-default-trait-impl-negation-send.rs
+++ b/tests/ui/typeck/typeck-default-trait-impl-negation-send.rs
diff --git a/src/test/ui/typeck/typeck-default-trait-impl-negation-send.stderr b/tests/ui/typeck/typeck-default-trait-impl-negation-send.stderr
index 2ce32990e..2ce32990e 100644
--- a/src/test/ui/typeck/typeck-default-trait-impl-negation-send.stderr
+++ b/tests/ui/typeck/typeck-default-trait-impl-negation-send.stderr
diff --git a/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.rs b/tests/ui/typeck/typeck-default-trait-impl-negation-sync.rs
index b9042188a..b9042188a 100644
--- a/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.rs
+++ b/tests/ui/typeck/typeck-default-trait-impl-negation-sync.rs
diff --git a/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.stderr b/tests/ui/typeck/typeck-default-trait-impl-negation-sync.stderr
index b9fca1a1b..b9fca1a1b 100644
--- a/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.stderr
+++ b/tests/ui/typeck/typeck-default-trait-impl-negation-sync.stderr
diff --git a/src/test/ui/typeck/typeck-default-trait-impl-send-param.rs b/tests/ui/typeck/typeck-default-trait-impl-send-param.rs
index 7948cd101..7948cd101 100644
--- a/src/test/ui/typeck/typeck-default-trait-impl-send-param.rs
+++ b/tests/ui/typeck/typeck-default-trait-impl-send-param.rs
diff --git a/src/test/ui/typeck/typeck-default-trait-impl-send-param.stderr b/tests/ui/typeck/typeck-default-trait-impl-send-param.stderr
index 887a1ddbb..887a1ddbb 100644
--- a/src/test/ui/typeck/typeck-default-trait-impl-send-param.stderr
+++ b/tests/ui/typeck/typeck-default-trait-impl-send-param.stderr
diff --git a/src/test/ui/typeck/typeck-fn-to-unsafe-fn-ptr.rs b/tests/ui/typeck/typeck-fn-to-unsafe-fn-ptr.rs
index 1e954f569..1e954f569 100644
--- a/src/test/ui/typeck/typeck-fn-to-unsafe-fn-ptr.rs
+++ b/tests/ui/typeck/typeck-fn-to-unsafe-fn-ptr.rs
diff --git a/src/test/ui/typeck/typeck-unsafe-always-share.rs b/tests/ui/typeck/typeck-unsafe-always-share.rs
index be87ab172..be87ab172 100644
--- a/src/test/ui/typeck/typeck-unsafe-always-share.rs
+++ b/tests/ui/typeck/typeck-unsafe-always-share.rs
diff --git a/src/test/ui/typeck/typeck-unsafe-always-share.stderr b/tests/ui/typeck/typeck-unsafe-always-share.stderr
index 154e50499..154e50499 100644
--- a/src/test/ui/typeck/typeck-unsafe-always-share.stderr
+++ b/tests/ui/typeck/typeck-unsafe-always-share.stderr
diff --git a/src/test/ui/typeck/typeck_type_placeholder_1.rs b/tests/ui/typeck/typeck_type_placeholder_1.rs
index ea7aa5285..ea7aa5285 100644
--- a/src/test/ui/typeck/typeck_type_placeholder_1.rs
+++ b/tests/ui/typeck/typeck_type_placeholder_1.rs
diff --git a/src/test/ui/typeck/typeck_type_placeholder_item.rs b/tests/ui/typeck/typeck_type_placeholder_item.rs
index 22fedb22d..b96c52713 100644
--- a/src/test/ui/typeck/typeck_type_placeholder_item.rs
+++ b/tests/ui/typeck/typeck_type_placeholder_item.rs
@@ -220,3 +220,11 @@ fn value() -> Option<&'static _> {
 
 const _: Option<_> = map(value);
 //~^ ERROR the placeholder `_` is not allowed within types on item signatures for constants
+
+fn evens_squared(n: usize) -> _ {
+//~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types
+    (1..n).filter(|x| x % 2 == 0).map(|x| x * x)
+}
+
+const _: _ = (1..10).filter(|x| x % 2 == 0).map(|x| x * x);
+//~^ ERROR the placeholder `_` is not allowed within types on item signatures for constants
diff --git a/src/test/ui/typeck/typeck_type_placeholder_item.stderr b/tests/ui/typeck/typeck_type_placeholder_item.stderr
index c57f71b80..bc02547c6 100644
--- a/src/test/ui/typeck/typeck_type_placeholder_item.stderr
+++ b/tests/ui/typeck/typeck_type_placeholder_item.stderr
@@ -428,6 +428,27 @@ LL | const _: Option<_> = map(value);
    |          not allowed in type signatures
    |          help: replace with the correct type: `Option<u8>`
 
+error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
+  --> $DIR/typeck_type_placeholder_item.rs:224:31
+   |
+LL | fn evens_squared(n: usize) -> _ {
+   |                               ^
+   |                               |
+   |                               not allowed in type signatures
+   |                               help: replace with an appropriate return type: `impl Iterator<Item = usize>`
+
+error[E0121]: the placeholder `_` is not allowed within types on item signatures for constants
+  --> $DIR/typeck_type_placeholder_item.rs:229:10
+   |
+LL | const _: _ = (1..10).filter(|x| x % 2 == 0).map(|x| x * x);
+   |          ^ not allowed in type signatures
+   |
+note: however, the inferred type `Map<Filter<Range<i32>, [closure@typeck_type_placeholder_item.rs:229:29]>, [closure@typeck_type_placeholder_item.rs:229:49]>` cannot be named
+  --> $DIR/typeck_type_placeholder_item.rs:229:14
+   |
+LL | const _: _ = (1..10).filter(|x| x % 2 == 0).map(|x| x * x);
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 error[E0121]: the placeholder `_` is not allowed within types on item signatures for functions
   --> $DIR/typeck_type_placeholder_item.rs:140:31
    |
@@ -636,7 +657,7 @@ LL |     const D: _ = 42;
    |              not allowed in type signatures
    |              help: replace with the correct type: `i32`
 
-error: aborting due to 69 previous errors
+error: aborting due to 71 previous errors
 
 Some errors have detailed explanations: E0121, E0282, E0403.
 For more information about an error, try `rustc --explain E0121`.
diff --git a/src/test/ui/typeck/typeck_type_placeholder_item_help.rs b/tests/ui/typeck/typeck_type_placeholder_item_help.rs
index c459d8c3c..c459d8c3c 100644
--- a/src/test/ui/typeck/typeck_type_placeholder_item_help.rs
+++ b/tests/ui/typeck/typeck_type_placeholder_item_help.rs
diff --git a/src/test/ui/typeck/typeck_type_placeholder_item_help.stderr b/tests/ui/typeck/typeck_type_placeholder_item_help.stderr
index 07a5dbd93..07a5dbd93 100644
--- a/src/test/ui/typeck/typeck_type_placeholder_item_help.stderr
+++ b/tests/ui/typeck/typeck_type_placeholder_item_help.stderr
diff --git a/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.rs b/tests/ui/typeck/typeck_type_placeholder_lifetime_1.rs
index 43e46c5b6..43e46c5b6 100644
--- a/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.rs
+++ b/tests/ui/typeck/typeck_type_placeholder_lifetime_1.rs
diff --git a/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.stderr b/tests/ui/typeck/typeck_type_placeholder_lifetime_1.stderr
index a89c6b85c..a89c6b85c 100644
--- a/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.stderr
+++ b/tests/ui/typeck/typeck_type_placeholder_lifetime_1.stderr
diff --git a/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.rs b/tests/ui/typeck/typeck_type_placeholder_lifetime_2.rs
index 178b8b122..178b8b122 100644
--- a/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.rs
+++ b/tests/ui/typeck/typeck_type_placeholder_lifetime_2.rs
diff --git a/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.stderr b/tests/ui/typeck/typeck_type_placeholder_lifetime_2.stderr
index f30766bdf..f30766bdf 100644
--- a/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.stderr
+++ b/tests/ui/typeck/typeck_type_placeholder_lifetime_2.stderr
diff --git a/src/test/ui/typeck/typeck_type_placeholder_mismatch.rs b/tests/ui/typeck/typeck_type_placeholder_mismatch.rs
index 2f9cfcf8d..2f9cfcf8d 100644
--- a/src/test/ui/typeck/typeck_type_placeholder_mismatch.rs
+++ b/tests/ui/typeck/typeck_type_placeholder_mismatch.rs
diff --git a/src/test/ui/typeck/typeck_type_placeholder_mismatch.stderr b/tests/ui/typeck/typeck_type_placeholder_mismatch.stderr
index 867412a24..867412a24 100644
--- a/src/test/ui/typeck/typeck_type_placeholder_mismatch.stderr
+++ b/tests/ui/typeck/typeck_type_placeholder_mismatch.stderr
diff --git a/src/test/ui/typeck/ufcs-type-params.rs b/tests/ui/typeck/ufcs-type-params.rs
index eee2b55b2..eee2b55b2 100644
--- a/src/test/ui/typeck/ufcs-type-params.rs
+++ b/tests/ui/typeck/ufcs-type-params.rs
diff --git a/src/test/ui/typeck/unify-return-ty.rs b/tests/ui/typeck/unify-return-ty.rs
index da1d82e89..da1d82e89 100644
--- a/src/test/ui/typeck/unify-return-ty.rs
+++ b/tests/ui/typeck/unify-return-ty.rs
diff --git a/src/test/ui/typeck/while-loop-block-cond.rs b/tests/ui/typeck/while-loop-block-cond.rs
index 929759766..929759766 100644
--- a/src/test/ui/typeck/while-loop-block-cond.rs
+++ b/tests/ui/typeck/while-loop-block-cond.rs
diff --git a/src/test/ui/typeck/while-loop-block-cond.stderr b/tests/ui/typeck/while-loop-block-cond.stderr
index 598273af9..598273af9 100644
--- a/src/test/ui/typeck/while-loop-block-cond.stderr
+++ b/tests/ui/typeck/while-loop-block-cond.stderr
diff --git a/src/test/ui/typeid-intrinsic.rs b/tests/ui/typeid-intrinsic.rs
index 5bc4e0c21..5bc4e0c21 100644
--- a/src/test/ui/typeid-intrinsic.rs
+++ b/tests/ui/typeid-intrinsic.rs
diff --git a/src/test/ui/typeof/issue-100183.rs b/tests/ui/typeof/issue-100183.rs
index 13e9493ea..13e9493ea 100644
--- a/src/test/ui/typeof/issue-100183.rs
+++ b/tests/ui/typeof/issue-100183.rs
diff --git a/src/test/ui/typeof/issue-100183.stderr b/tests/ui/typeof/issue-100183.stderr
index 01d3079b2..01d3079b2 100644
--- a/src/test/ui/typeof/issue-100183.stderr
+++ b/tests/ui/typeof/issue-100183.stderr
diff --git a/src/test/ui/typeof/issue-29184.rs b/tests/ui/typeof/issue-29184.rs
index c77e364c3..c77e364c3 100644
--- a/src/test/ui/typeof/issue-29184.rs
+++ b/tests/ui/typeof/issue-29184.rs
diff --git a/src/test/ui/typeof/issue-29184.stderr b/tests/ui/typeof/issue-29184.stderr
index 75b6c64f2..75b6c64f2 100644
--- a/src/test/ui/typeof/issue-29184.stderr
+++ b/tests/ui/typeof/issue-29184.stderr
diff --git a/src/test/ui/typeof/issue-42060.rs b/tests/ui/typeof/issue-42060.rs
index 1740b2383..1740b2383 100644
--- a/src/test/ui/typeof/issue-42060.rs
+++ b/tests/ui/typeof/issue-42060.rs
diff --git a/src/test/ui/typeof/issue-42060.stderr b/tests/ui/typeof/issue-42060.stderr
index effcbe4d7..effcbe4d7 100644
--- a/src/test/ui/typeof/issue-42060.stderr
+++ b/tests/ui/typeof/issue-42060.stderr
diff --git a/src/test/ui/typeof/type_mismatch.rs b/tests/ui/typeof/type_mismatch.rs
index 3f8339fa5..3f8339fa5 100644
--- a/src/test/ui/typeof/type_mismatch.rs
+++ b/tests/ui/typeof/type_mismatch.rs
diff --git a/src/test/ui/typeof/type_mismatch.stderr b/tests/ui/typeof/type_mismatch.stderr
index e75214cd3..e75214cd3 100644
--- a/src/test/ui/typeof/type_mismatch.stderr
+++ b/tests/ui/typeof/type_mismatch.stderr
diff --git a/src/test/ui/typestate-multi-decl.rs b/tests/ui/typestate-multi-decl.rs
index 9f9416205..9f9416205 100644
--- a/src/test/ui/typestate-multi-decl.rs
+++ b/tests/ui/typestate-multi-decl.rs
diff --git a/src/test/ui/ufcs-polymorphic-paths.rs b/tests/ui/ufcs-polymorphic-paths.rs
index a14ebd6a4..a14ebd6a4 100644
--- a/src/test/ui/ufcs-polymorphic-paths.rs
+++ b/tests/ui/ufcs-polymorphic-paths.rs
diff --git a/src/test/ui/ufcs/ufcs-explicit-self-bad.rs b/tests/ui/ufcs/ufcs-explicit-self-bad.rs
index cb1fac0ba..cb1fac0ba 100644
--- a/src/test/ui/ufcs/ufcs-explicit-self-bad.rs
+++ b/tests/ui/ufcs/ufcs-explicit-self-bad.rs
diff --git a/src/test/ui/ufcs/ufcs-explicit-self-bad.stderr b/tests/ui/ufcs/ufcs-explicit-self-bad.stderr
index f325d1d81..f325d1d81 100644
--- a/src/test/ui/ufcs/ufcs-explicit-self-bad.stderr
+++ b/tests/ui/ufcs/ufcs-explicit-self-bad.stderr
diff --git a/src/test/ui/ufcs/ufcs-partially-resolved.rs b/tests/ui/ufcs/ufcs-partially-resolved.rs
index e6470aa6d..e6470aa6d 100644
--- a/src/test/ui/ufcs/ufcs-partially-resolved.rs
+++ b/tests/ui/ufcs/ufcs-partially-resolved.rs
diff --git a/src/test/ui/ufcs/ufcs-partially-resolved.stderr b/tests/ui/ufcs/ufcs-partially-resolved.stderr
index 3950dc987..72fccea8a 100644
--- a/src/test/ui/ufcs/ufcs-partially-resolved.stderr
+++ b/tests/ui/ufcs/ufcs-partially-resolved.stderr
@@ -205,7 +205,12 @@ error[E0223]: ambiguous associated type
   --> $DIR/ufcs-partially-resolved.rs:36:12
    |
 LL |     let _: <u8 as Tr>::Y::NN;
-   |            ^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<u16 as Trait>::NN`
+   |            ^^^^^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `NN` implemented for `<u8 as Tr>::Y`, you could use the fully-qualified path
+   |
+LL |     let _: <<u8 as Tr>::Y as Example>::NN;
+   |            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0599]: no associated item named `NN` found for type `u16` in the current scope
   --> $DIR/ufcs-partially-resolved.rs:38:20
diff --git a/src/test/ui/ufcs/ufcs-qpath-missing-params.rs b/tests/ui/ufcs/ufcs-qpath-missing-params.rs
index 766351634..766351634 100644
--- a/src/test/ui/ufcs/ufcs-qpath-missing-params.rs
+++ b/tests/ui/ufcs/ufcs-qpath-missing-params.rs
diff --git a/src/test/ui/ufcs/ufcs-qpath-missing-params.stderr b/tests/ui/ufcs/ufcs-qpath-missing-params.stderr
index a832964d2..d0ec47d61 100644
--- a/src/test/ui/ufcs/ufcs-qpath-missing-params.stderr
+++ b/tests/ui/ufcs/ufcs-qpath-missing-params.stderr
@@ -12,7 +12,7 @@ LL | pub trait IntoCow<'a, B: ?Sized> where B: ToOwned {
 help: add missing generic argument
    |
 LL |     <String as IntoCow<B>>::into_cow("foo".to_string());
-   |                ~~~~~~~~~~
+   |                       +++
 
 error[E0107]: missing generics for trait `IntoCow`
   --> $DIR/ufcs-qpath-missing-params.rs:17:16
@@ -28,7 +28,7 @@ LL | pub trait IntoCow<'a, B: ?Sized> where B: ToOwned {
 help: add missing generic argument
    |
 LL |     <String as IntoCow<B>>::into_cow::<str>("foo".to_string());
-   |                ~~~~~~~~~~
+   |                       +++
 
 error[E0107]: this associated function takes 0 generic arguments but 1 generic argument was supplied
   --> $DIR/ufcs-qpath-missing-params.rs:17:26
diff --git a/src/test/ui/ufcs/ufcs-qpath-self-mismatch.rs b/tests/ui/ufcs/ufcs-qpath-self-mismatch.rs
index ec86213f8..ec86213f8 100644
--- a/src/test/ui/ufcs/ufcs-qpath-self-mismatch.rs
+++ b/tests/ui/ufcs/ufcs-qpath-self-mismatch.rs
diff --git a/src/test/ui/ufcs/ufcs-qpath-self-mismatch.stderr b/tests/ui/ufcs/ufcs-qpath-self-mismatch.stderr
index ed56e1cf9..e85144a31 100644
--- a/src/test/ui/ufcs/ufcs-qpath-self-mismatch.stderr
+++ b/tests/ui/ufcs/ufcs-qpath-self-mismatch.stderr
@@ -21,11 +21,15 @@ LL |     <i32 as Add<i32>>::add(1u32, 2);
    |     |
    |     arguments to this function are incorrect
    |
+help: the return type of this call is `u32` due to the type of the argument passed
+  --> $DIR/ufcs-qpath-self-mismatch.rs:7:5
+   |
+LL |     <i32 as Add<i32>>::add(1u32, 2);
+   |     ^^^^^^^^^^^^^^^^^^^^^^^----^^^^
+   |                            |
+   |                            this argument influences the return type of `Add`
 note: associated function defined here
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn add(self, rhs: Rhs) -> Self::Output;
-   |        ^^^
 help: change the type of the numeric literal from `u32` to `i32`
    |
 LL |     <i32 as Add<i32>>::add(1i32, 2);
@@ -39,11 +43,15 @@ LL |     <i32 as Add<i32>>::add(1, 2u32);
    |     |
    |     arguments to this function are incorrect
    |
+help: the return type of this call is `u32` due to the type of the argument passed
+  --> $DIR/ufcs-qpath-self-mismatch.rs:9:5
+   |
+LL |     <i32 as Add<i32>>::add(1, 2u32);
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^----^
+   |                               |
+   |                               this argument influences the return type of `Add`
 note: associated function defined here
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn add(self, rhs: Rhs) -> Self::Output;
-   |        ^^^
 help: change the type of the numeric literal from `u32` to `i32`
    |
 LL |     <i32 as Add<i32>>::add(1, 2i32);
diff --git a/src/test/ui/unboxed-closures/auxiliary/unboxed-closures-cross-crate.rs b/tests/ui/unboxed-closures/auxiliary/unboxed-closures-cross-crate.rs
index ac0a74eeb..ac0a74eeb 100644
--- a/src/test/ui/unboxed-closures/auxiliary/unboxed-closures-cross-crate.rs
+++ b/tests/ui/unboxed-closures/auxiliary/unboxed-closures-cross-crate.rs
diff --git a/src/test/ui/unboxed-closures/issue-18652.rs b/tests/ui/unboxed-closures/issue-18652.rs
index 59aa01568..59aa01568 100644
--- a/src/test/ui/unboxed-closures/issue-18652.rs
+++ b/tests/ui/unboxed-closures/issue-18652.rs
diff --git a/src/test/ui/unboxed-closures/issue-18661.rs b/tests/ui/unboxed-closures/issue-18661.rs
index e24272432..e24272432 100644
--- a/src/test/ui/unboxed-closures/issue-18661.rs
+++ b/tests/ui/unboxed-closures/issue-18661.rs
diff --git a/src/test/ui/unboxed-closures/issue-30906.rs b/tests/ui/unboxed-closures/issue-30906.rs
index e2d219e47..e2d219e47 100644
--- a/src/test/ui/unboxed-closures/issue-30906.rs
+++ b/tests/ui/unboxed-closures/issue-30906.rs
diff --git a/src/test/ui/unboxed-closures/issue-30906.stderr b/tests/ui/unboxed-closures/issue-30906.stderr
index 147a20974..147a20974 100644
--- a/src/test/ui/unboxed-closures/issue-30906.stderr
+++ b/tests/ui/unboxed-closures/issue-30906.stderr
diff --git a/src/test/ui/unboxed-closures/issue-53448.rs b/tests/ui/unboxed-closures/issue-53448.rs
index ea1edf7d4..ea1edf7d4 100644
--- a/src/test/ui/unboxed-closures/issue-53448.rs
+++ b/tests/ui/unboxed-closures/issue-53448.rs
diff --git a/src/test/ui/unboxed-closures/non-tupled-arg-mismatch.rs b/tests/ui/unboxed-closures/non-tupled-arg-mismatch.rs
index d2e486002..d2e486002 100644
--- a/src/test/ui/unboxed-closures/non-tupled-arg-mismatch.rs
+++ b/tests/ui/unboxed-closures/non-tupled-arg-mismatch.rs
diff --git a/src/test/ui/unboxed-closures/non-tupled-arg-mismatch.stderr b/tests/ui/unboxed-closures/non-tupled-arg-mismatch.stderr
index 1c18eb0fc..cfbe1c6f2 100644
--- a/src/test/ui/unboxed-closures/non-tupled-arg-mismatch.stderr
+++ b/tests/ui/unboxed-closures/non-tupled-arg-mismatch.stderr
@@ -6,9 +6,6 @@ LL | fn a<F: Fn<usize>>(f: F) {}
    |
 note: required by a bound in `Fn`
   --> $SRC_DIR/core/src/ops/function.rs:LL:COL
-   |
-LL | pub trait Fn<Args: Tuple>: FnMut<Args> {
-   |                    ^^^^^ required by this bound in `Fn`
 
 error: aborting due to previous error
 
diff --git a/tests/ui/unboxed-closures/non-tupled-call.rs b/tests/ui/unboxed-closures/non-tupled-call.rs
new file mode 100644
index 000000000..08bea4f16
--- /dev/null
+++ b/tests/ui/unboxed-closures/non-tupled-call.rs
@@ -0,0 +1,17 @@
+#![feature(fn_traits, unboxed_closures, tuple_trait)]
+
+use std::default::Default;
+use std::marker::Tuple;
+
+fn wrap<P: Tuple + Default, T>(func: impl Fn<P, Output = T>) {
+    let x: P = Default::default();
+    // Should be: `func.call(x);`
+    func(x);
+    //~^ ERROR cannot use call notation; the first type parameter for the function trait is neither a tuple nor unit
+}
+
+fn foo() {}
+
+fn main() {
+    wrap(foo);
+}
diff --git a/tests/ui/unboxed-closures/non-tupled-call.stderr b/tests/ui/unboxed-closures/non-tupled-call.stderr
new file mode 100644
index 000000000..35ac9ebe2
--- /dev/null
+++ b/tests/ui/unboxed-closures/non-tupled-call.stderr
@@ -0,0 +1,9 @@
+error[E0059]: cannot use call notation; the first type parameter for the function trait is neither a tuple nor unit
+  --> $DIR/non-tupled-call.rs:9:5
+   |
+LL |     func(x);
+   |     ^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0059`.
diff --git a/src/test/ui/unboxed-closures/type-id-higher-rank.rs b/tests/ui/unboxed-closures/type-id-higher-rank.rs
index 1f8aec205..1f8aec205 100644
--- a/src/test/ui/unboxed-closures/type-id-higher-rank.rs
+++ b/tests/ui/unboxed-closures/type-id-higher-rank.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.rs b/tests/ui/unboxed-closures/unboxed-closure-feature-gate.rs
index d8b201bf8..d8b201bf8 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-feature-gate.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.stderr b/tests/ui/unboxed-closures/unboxed-closure-feature-gate.stderr
index b824d160d..b824d160d 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-feature-gate.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.rs b/tests/ui/unboxed-closures/unboxed-closure-illegal-move.rs
index 7377359b6..7377359b6 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-illegal-move.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.stderr b/tests/ui/unboxed-closures/unboxed-closure-illegal-move.stderr
index bfa3061de..bfa3061de 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-illegal-move.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.rs b/tests/ui/unboxed-closures/unboxed-closure-immutable-capture.rs
index 3eba9c4d4..3eba9c4d4 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-immutable-capture.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.stderr b/tests/ui/unboxed-closures/unboxed-closure-immutable-capture.stderr
index ad5451ced..ad5451ced 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-immutable-capture.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.rs b/tests/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.rs
index 9d0aa4132..9d0aa4132 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.rs
diff --git a/tests/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.stderr b/tests/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.stderr
new file mode 100644
index 000000000..6d5dbca05
--- /dev/null
+++ b/tests/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.stderr
@@ -0,0 +1,19 @@
+error[E0644]: closure/generator type that references itself
+  --> $DIR/unboxed-closure-no-cyclic-sig.rs:8:7
+   |
+LL |     g(|_| {  });
+   |       ^^^ cyclic type of infinite size
+   |
+   = note: closures cannot capture themselves or take themselves as argument;
+           this error may be the result of a recent compiler bug-fix,
+           see issue #46062 <https://github.com/rust-lang/rust/issues/46062>
+           for more information
+note: required by a bound in `g`
+  --> $DIR/unboxed-closure-no-cyclic-sig.rs:5:24
+   |
+LL | fn g<F>(_: F) where F: FnOnce(Option<F>) {}
+   |                        ^^^^^^^^^^^^^^^^^ required by this bound in `g`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0644`.
diff --git a/tests/ui/unboxed-closures/unboxed-closure-region.rs b/tests/ui/unboxed-closures/unboxed-closure-region.rs
new file mode 100644
index 000000000..51fe118c9
--- /dev/null
+++ b/tests/ui/unboxed-closures/unboxed-closure-region.rs
@@ -0,0 +1,11 @@
+// Test that an unboxed closure that captures a free variable by
+// reference cannot escape the region of that variable.
+
+
+fn main() {
+    let _f = {
+        let x = 0;
+        || x //~ ERROR closure may outlive the current block, but it borrows `x`
+    };
+    _f;
+}
diff --git a/tests/ui/unboxed-closures/unboxed-closure-region.stderr b/tests/ui/unboxed-closures/unboxed-closure-region.stderr
new file mode 100644
index 000000000..43e9af24a
--- /dev/null
+++ b/tests/ui/unboxed-closures/unboxed-closure-region.stderr
@@ -0,0 +1,21 @@
+error[E0373]: closure may outlive the current block, but it borrows `x`, which is owned by the current block
+  --> $DIR/unboxed-closure-region.rs:8:9
+   |
+LL |         || x
+   |         ^^ - `x` is borrowed here
+   |         |
+   |         may outlive borrowed value `x`
+   |
+note: block requires argument type to outlive `'1`
+  --> $DIR/unboxed-closure-region.rs:6:9
+   |
+LL |     let _f = {
+   |         ^^
+help: to force the closure to take ownership of `x` (and any other referenced variables), use the `move` keyword
+   |
+LL |         move || x
+   |         ++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0373`.
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.rs b/tests/ui/unboxed-closures/unboxed-closure-sugar-default.rs
index f1c83f060..f1c83f060 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-default.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.stderr b/tests/ui/unboxed-closures/unboxed-closure-sugar-default.stderr
index a3b32d2c1..a3b32d2c1 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-default.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.rs b/tests/ui/unboxed-closures/unboxed-closure-sugar-equiv.rs
index acf0227a7..acf0227a7 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-equiv.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.stderr b/tests/ui/unboxed-closures/unboxed-closure-sugar-equiv.stderr
index bccbf307a..bccbf307a 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-equiv.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.rs b/tests/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.rs
index d11d663f1..d11d663f1 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr b/tests/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr
index 2b8fec86c..2b8fec86c 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.rs b/tests/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.rs
index 6d6ed4b56..6d6ed4b56 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr b/tests/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr
index 9da36906d..9da36906d 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.rs b/tests/ui/unboxed-closures/unboxed-closure-sugar-region.rs
index 65f40075b..65f40075b 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-region.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.stderr b/tests/ui/unboxed-closures/unboxed-closure-sugar-region.stderr
index 016fc4dfb..016fc4dfb 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-region.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.rs b/tests/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.rs
index 462f6fb7b..462f6fb7b 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.stderr b/tests/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.stderr
index 29ea5735c..29ea5735c 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.rs b/tests/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.rs
index 79ced1ecf..79ced1ecf 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.stderr b/tests/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.stderr
index 4df404e81..4df404e81 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.rs b/tests/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.rs
index bd61cbd80..bd61cbd80 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.stderr b/tests/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.stderr
index 427ba3414..427ba3414 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.rs b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.rs
index a6c86311b..a6c86311b 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.stderr b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.stderr
index 59e7bc8c8..59e7bc8c8 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs
index f26ad8e93..f26ad8e93 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.stderr b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.stderr
index ebaacf0a6..ebaacf0a6 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.rs b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.rs
index 4465b43a7..4465b43a7 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr
index 9601e64c1..9601e64c1 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.rs b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.rs
index 4bcf90552..4bcf90552 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.rs
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.stderr b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.stderr
index 3ff05fb23..3ff05fb23 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-all-traits.rs b/tests/ui/unboxed-closures/unboxed-closures-all-traits.rs
index dfccb0200..dfccb0200 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-all-traits.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-all-traits.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-blanket-fn-mut.rs b/tests/ui/unboxed-closures/unboxed-closures-blanket-fn-mut.rs
index a10016735..a10016735 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-blanket-fn-mut.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-blanket-fn-mut.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-blanket-fn.rs b/tests/ui/unboxed-closures/unboxed-closures-blanket-fn.rs
index ca1d31ca5..ca1d31ca5 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-blanket-fn.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-blanket-fn.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.rs b/tests/ui/unboxed-closures/unboxed-closures-borrow-conflict.rs
index 835a1f598..835a1f598 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-borrow-conflict.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.stderr b/tests/ui/unboxed-closures/unboxed-closures-borrow-conflict.stderr
index 21d6b4fde..21d6b4fde 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-borrow-conflict.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-boxed.rs b/tests/ui/unboxed-closures/unboxed-closures-boxed.rs
index 3f550fd04..3f550fd04 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-boxed.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-boxed.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-by-ref.rs b/tests/ui/unboxed-closures/unboxed-closures-by-ref.rs
index cf4d4d3e1..cf4d4d3e1 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-by-ref.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-by-ref.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-call-fn-autoderef.rs b/tests/ui/unboxed-closures/unboxed-closures-call-fn-autoderef.rs
index e23a75ab3..e23a75ab3 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-call-fn-autoderef.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-call-fn-autoderef.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-call-sugar-autoderef.rs b/tests/ui/unboxed-closures/unboxed-closures-call-sugar-autoderef.rs
index 9b8a3f409..9b8a3f409 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-call-sugar-autoderef.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-call-sugar-autoderef.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-call-sugar-object-autoderef.rs b/tests/ui/unboxed-closures/unboxed-closures-call-sugar-object-autoderef.rs
index d47ceea0f..d47ceea0f 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-call-sugar-object-autoderef.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-call-sugar-object-autoderef.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-call-sugar-object.rs b/tests/ui/unboxed-closures/unboxed-closures-call-sugar-object.rs
index f77733d10..f77733d10 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-call-sugar-object.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-call-sugar-object.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-counter-not-moved.rs b/tests/ui/unboxed-closures/unboxed-closures-counter-not-moved.rs
index 390386e57..390386e57 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-counter-not-moved.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-counter-not-moved.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-counter-not-moved.stderr b/tests/ui/unboxed-closures/unboxed-closures-counter-not-moved.stderr
index 6450cc30a..6450cc30a 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-counter-not-moved.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-counter-not-moved.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-cross-crate.rs b/tests/ui/unboxed-closures/unboxed-closures-cross-crate.rs
index 39cc26072..39cc26072 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-cross-crate.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-cross-crate.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-direct-sugary-call.rs b/tests/ui/unboxed-closures/unboxed-closures-direct-sugary-call.rs
index 1c5e74e59..1c5e74e59 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-direct-sugary-call.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-direct-sugary-call.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-drop.rs b/tests/ui/unboxed-closures/unboxed-closures-drop.rs
index ba3c61ca2..ba3c61ca2 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-drop.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-drop.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-extern-fn-hr.rs b/tests/ui/unboxed-closures/unboxed-closures-extern-fn-hr.rs
index 3ee1aeb10..3ee1aeb10 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-extern-fn-hr.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-extern-fn-hr.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-extern-fn.rs b/tests/ui/unboxed-closures/unboxed-closures-extern-fn.rs
index 677cd259a..677cd259a 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-extern-fn.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-extern-fn.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.rs b/tests/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.rs
index 1358ba0f9..1358ba0f9 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr b/tests/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr
index cbdb4dd0f..cbdb4dd0f 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.rs b/tests/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.rs
index 25c2dbe19..25c2dbe19 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.stderr b/tests/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.stderr
index ff2a597be..ff2a597be 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-fn-as-fnmut-and-fnonce.rs b/tests/ui/unboxed-closures/unboxed-closures-fn-as-fnmut-and-fnonce.rs
index 851f3d2fe..851f3d2fe 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-fn-as-fnmut-and-fnonce.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-fn-as-fnmut-and-fnonce.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.rs b/tests/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.rs
index 867e5fb1d..867e5fb1d 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr b/tests/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr
index 0ea1c1dcd..0ea1c1dcd 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fnonce.rs b/tests/ui/unboxed-closures/unboxed-closures-fnmut-as-fnonce.rs
index bd577f7c4..bd577f7c4 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fnonce.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-fnmut-as-fnonce.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-generic.rs b/tests/ui/unboxed-closures/unboxed-closures-generic.rs
index 740b8b2a7..740b8b2a7 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-generic.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-generic.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-bound.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-bound.rs
index e0c910576..e0c910576 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-bound.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-bound.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-object-type.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-object-type.rs
index d2eaee304..d2eaee304 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-object-type.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-object-type.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs
index c3abdd8aa..c3abdd8aa 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.rs
index 6765da421..6765da421 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.stderr b/tests/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.stderr
index e97157b83..e97157b83 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-explicit-call-early.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-explicit-call-early.rs
index 9135c82b4..9135c82b4 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-explicit-call-early.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-explicit-call-early.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.rs
index 6e404c616..6e404c616 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.stderr b/tests/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.stderr
index 635ebbb71..635ebbb71 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs
index 6401b5e01..6401b5e01 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.stderr b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.stderr
index a0ed56d4b..5c93ed6d7 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.stderr
@@ -12,13 +12,16 @@ LL |         tick1();
 error[E0596]: cannot borrow `tick2` as mutable, as it is not declared as mutable
   --> $DIR/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs:19:5
    |
-LL |     let tick2 = || {
-   |         ----- help: consider changing this to be mutable: `mut tick2`
 LL |         tick1();
    |         ----- calling `tick2` requires mutable binding due to mutable borrow of `tick1`
 ...
 LL |     tick2();
    |     ^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut tick2 = || {
+   |         +++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut.rs
index 73f488a4f..73f488a4f 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.rs
index 5c0ceb23d..5c0ceb23d 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.rs
diff --git a/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.stderr b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.stderr
new file mode 100644
index 000000000..3f539c42d
--- /dev/null
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.stderr
@@ -0,0 +1,16 @@
+error[E0596]: cannot borrow `tick` as mutable, as it is not declared as mutable
+  --> $DIR/unboxed-closures-infer-fnmut-missing-mut.rs:7:5
+   |
+LL |     let tick = || counter += 1;
+   |                   ------- calling `tick` requires mutable binding due to mutable borrow of `counter`
+LL |     tick();
+   |     ^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut tick = || counter += 1;
+   |         +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.rs
index 144a674ac..144a674ac 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.rs
diff --git a/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.stderr b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.stderr
new file mode 100644
index 000000000..e3b19297b
--- /dev/null
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.stderr
@@ -0,0 +1,16 @@
+error[E0596]: cannot borrow `tick` as mutable, as it is not declared as mutable
+  --> $DIR/unboxed-closures-infer-fnmut-move-missing-mut.rs:7:5
+   |
+LL |     let tick = move || counter += 1;
+   |                        ------- calling `tick` requires mutable binding due to possible mutation of `counter`
+LL |     tick();
+   |     ^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut tick = move || counter += 1;
+   |         +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-move.rs
index 7ac1ae30f..7ac1ae30f 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut-move.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut.rs
index 0fbb504c2..0fbb504c2 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnmut.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.rs
index a98a01ca5..a98a01ca5 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.stderr b/tests/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.stderr
index ab6f06518..ab6f06518 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.rs
index f87be4a06..f87be4a06 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.stderr b/tests/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.stderr
index 8d70a2b17..8d70a2b17 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-fnonce-move.rs
index 6381386c4..6381386c4 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnonce-move.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-fnonce.rs
index 3c8ea7d85..3c8ea7d85 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-fnonce.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-kind.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-kind.rs
index fc01bd9b6..fc01bd9b6 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-kind.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-kind.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-recursive-fn.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-recursive-fn.rs
index a0fbbafe2..a0fbbafe2 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-recursive-fn.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-recursive-fn.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-upvar.rs b/tests/ui/unboxed-closures/unboxed-closures-infer-upvar.rs
index 6a5e5b9c2..6a5e5b9c2 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-infer-upvar.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-infer-upvar.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-manual-impl.rs b/tests/ui/unboxed-closures/unboxed-closures-manual-impl.rs
index df60b42ab..df60b42ab 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-manual-impl.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-manual-impl.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-monomorphization.rs b/tests/ui/unboxed-closures/unboxed-closures-monomorphization.rs
index 2df360d4a..2df360d4a 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-monomorphization.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-monomorphization.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-move-from-projection-issue-30046.rs b/tests/ui/unboxed-closures/unboxed-closures-move-from-projection-issue-30046.rs
index 4388e6bcf..4388e6bcf 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-move-from-projection-issue-30046.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-move-from-projection-issue-30046.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-move-mutable.rs b/tests/ui/unboxed-closures/unboxed-closures-move-mutable.rs
index 470904fd3..470904fd3 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-move-mutable.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-move-mutable.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-move-mutable.stderr b/tests/ui/unboxed-closures/unboxed-closures-move-mutable.stderr
index 5c06f4e62..5c06f4e62 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-move-mutable.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-move-mutable.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-move-some-upvars-in-by-ref-closure.rs b/tests/ui/unboxed-closures/unboxed-closures-move-some-upvars-in-by-ref-closure.rs
index 2d219643f..2d219643f 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-move-some-upvars-in-by-ref-closure.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-move-some-upvars-in-by-ref-closure.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.rs b/tests/ui/unboxed-closures/unboxed-closures-mutate-upvar.rs
index c57312b43..c57312b43 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-mutate-upvar.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr b/tests/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr
index 26f97b519..26f97b519 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.rs b/tests/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.rs
index 174ad245d..174ad245d 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.stderr b/tests/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.stderr
index 7d15cd0c8..7d15cd0c8 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-prelude.rs b/tests/ui/unboxed-closures/unboxed-closures-prelude.rs
index 89a273b7a..89a273b7a 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-prelude.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-prelude.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs b/tests/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs
index 5e354cb6f..5e354cb6f 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.stderr b/tests/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.stderr
index 830f6bc99..830f6bc99 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-simple.rs b/tests/ui/unboxed-closures/unboxed-closures-simple.rs
index 144955402..144955402 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-simple.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-simple.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-single-word-env.rs b/tests/ui/unboxed-closures/unboxed-closures-single-word-env.rs
index 8ada7494e..8ada7494e 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-single-word-env.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-single-word-env.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-static-call-fn-once.rs b/tests/ui/unboxed-closures/unboxed-closures-static-call-fn-once.rs
index 054f284ea..054f284ea 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-static-call-fn-once.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-static-call-fn-once.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.rs b/tests/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.rs
index 7289d9322..7289d9322 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.rs
diff --git a/tests/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.stderr b/tests/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.stderr
new file mode 100644
index 000000000..99ec51783
--- /dev/null
+++ b/tests/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.stderr
@@ -0,0 +1,9 @@
+error[E0599]: no method named `call` found for closure `[closure@unboxed-closures-static-call-wrong-trait.rs:6:26]` in the current scope
+  --> $DIR/unboxed-closures-static-call-wrong-trait.rs:7:10
+   |
+LL |     mut_.call((0, ));
+   |          ^^^^ method not found in `[closure@unboxed-closures-static-call-wrong-trait.rs:6:26]`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-sugar-object.rs b/tests/ui/unboxed-closures/unboxed-closures-sugar-object.rs
index 1ca25517c..1ca25517c 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-sugar-object.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-sugar-object.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.rs b/tests/ui/unboxed-closures/unboxed-closures-type-mismatch.rs
index 9f76849e5..9f76849e5 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-type-mismatch.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.stderr b/tests/ui/unboxed-closures/unboxed-closures-type-mismatch.stderr
index 455f83f57..455f83f57 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-type-mismatch.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-unique-type-id.rs b/tests/ui/unboxed-closures/unboxed-closures-unique-type-id.rs
index 4b7016def..4b7016def 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-unique-type-id.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-unique-type-id.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.rs b/tests/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.rs
index e2082d4f7..e2082d4f7 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.stderr b/tests/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.stderr
index 802696e1b..802696e1b 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.rs b/tests/ui/unboxed-closures/unboxed-closures-wrong-abi.rs
index dd76c597d..dd76c597d 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-wrong-abi.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.stderr b/tests/ui/unboxed-closures/unboxed-closures-wrong-abi.stderr
index 0bbb9836c..0bbb9836c 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-wrong-abi.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.rs b/tests/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.rs
index 02e8b7b47..02e8b7b47 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.rs
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.stderr b/tests/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.stderr
index 31a66790c..31a66790c 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.stderr
+++ b/tests/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.stderr
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-zero-args.rs b/tests/ui/unboxed-closures/unboxed-closures-zero-args.rs
index 6f41c3558..6f41c3558 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-zero-args.rs
+++ b/tests/ui/unboxed-closures/unboxed-closures-zero-args.rs
diff --git a/src/test/ui/unconstrained-none.rs b/tests/ui/unconstrained-none.rs
index e180b3163..e180b3163 100644
--- a/src/test/ui/unconstrained-none.rs
+++ b/tests/ui/unconstrained-none.rs
diff --git a/src/test/ui/unconstrained-none.stderr b/tests/ui/unconstrained-none.stderr
index 19ac74fdf..19ac74fdf 100644
--- a/src/test/ui/unconstrained-none.stderr
+++ b/tests/ui/unconstrained-none.stderr
diff --git a/src/test/ui/unconstrained-ref.rs b/tests/ui/unconstrained-ref.rs
index 473ca954b..473ca954b 100644
--- a/src/test/ui/unconstrained-ref.rs
+++ b/tests/ui/unconstrained-ref.rs
diff --git a/src/test/ui/unconstrained-ref.stderr b/tests/ui/unconstrained-ref.stderr
index 1df6d8b44..1df6d8b44 100644
--- a/src/test/ui/unconstrained-ref.stderr
+++ b/tests/ui/unconstrained-ref.stderr
diff --git a/src/test/ui/underscore-ident-matcher.rs b/tests/ui/underscore-ident-matcher.rs
index bddc8c80a..bddc8c80a 100644
--- a/src/test/ui/underscore-ident-matcher.rs
+++ b/tests/ui/underscore-ident-matcher.rs
diff --git a/src/test/ui/underscore-ident-matcher.stderr b/tests/ui/underscore-ident-matcher.stderr
index b0e4d88f6..b0e4d88f6 100644
--- a/src/test/ui/underscore-ident-matcher.stderr
+++ b/tests/ui/underscore-ident-matcher.stderr
diff --git a/src/test/ui/underscore-imports/auxiliary/duplicate.rs b/tests/ui/underscore-imports/auxiliary/duplicate.rs
index 92d741b6a..92d741b6a 100644
--- a/src/test/ui/underscore-imports/auxiliary/duplicate.rs
+++ b/tests/ui/underscore-imports/auxiliary/duplicate.rs
diff --git a/src/test/ui/underscore-imports/auxiliary/underscore-imports.rs b/tests/ui/underscore-imports/auxiliary/underscore-imports.rs
index c335336be..c335336be 100644
--- a/src/test/ui/underscore-imports/auxiliary/underscore-imports.rs
+++ b/tests/ui/underscore-imports/auxiliary/underscore-imports.rs
diff --git a/src/test/ui/underscore-imports/basic.rs b/tests/ui/underscore-imports/basic.rs
index c021ad5ee..c021ad5ee 100644
--- a/src/test/ui/underscore-imports/basic.rs
+++ b/tests/ui/underscore-imports/basic.rs
diff --git a/src/test/ui/underscore-imports/basic.stderr b/tests/ui/underscore-imports/basic.stderr
index c51493562..c51493562 100644
--- a/src/test/ui/underscore-imports/basic.stderr
+++ b/tests/ui/underscore-imports/basic.stderr
diff --git a/src/test/ui/underscore-imports/cycle.rs b/tests/ui/underscore-imports/cycle.rs
index bacf9b2d5..bacf9b2d5 100644
--- a/src/test/ui/underscore-imports/cycle.rs
+++ b/tests/ui/underscore-imports/cycle.rs
diff --git a/src/test/ui/underscore-imports/duplicate.rs b/tests/ui/underscore-imports/duplicate.rs
index 20bc7848a..20bc7848a 100644
--- a/src/test/ui/underscore-imports/duplicate.rs
+++ b/tests/ui/underscore-imports/duplicate.rs
diff --git a/src/test/ui/underscore-imports/hygiene-2.rs b/tests/ui/underscore-imports/hygiene-2.rs
index 510d91d0d..510d91d0d 100644
--- a/src/test/ui/underscore-imports/hygiene-2.rs
+++ b/tests/ui/underscore-imports/hygiene-2.rs
diff --git a/src/test/ui/underscore-imports/hygiene.rs b/tests/ui/underscore-imports/hygiene.rs
index c4db65245..c4db65245 100644
--- a/src/test/ui/underscore-imports/hygiene.rs
+++ b/tests/ui/underscore-imports/hygiene.rs
diff --git a/src/test/ui/underscore-imports/intercrate.rs b/tests/ui/underscore-imports/intercrate.rs
index 144f95bac..144f95bac 100644
--- a/src/test/ui/underscore-imports/intercrate.rs
+++ b/tests/ui/underscore-imports/intercrate.rs
diff --git a/src/test/ui/underscore-imports/macro-expanded.rs b/tests/ui/underscore-imports/macro-expanded.rs
index 43f527bc9..43f527bc9 100644
--- a/src/test/ui/underscore-imports/macro-expanded.rs
+++ b/tests/ui/underscore-imports/macro-expanded.rs
diff --git a/src/test/ui/underscore-imports/shadow.rs b/tests/ui/underscore-imports/shadow.rs
index 325f2001b..325f2001b 100644
--- a/src/test/ui/underscore-imports/shadow.rs
+++ b/tests/ui/underscore-imports/shadow.rs
diff --git a/src/test/ui/underscore-imports/shadow.stderr b/tests/ui/underscore-imports/shadow.stderr
index 7faede4e6..7faede4e6 100644
--- a/src/test/ui/underscore-imports/shadow.stderr
+++ b/tests/ui/underscore-imports/shadow.stderr
diff --git a/src/test/ui/underscore-imports/unused-2018.rs b/tests/ui/underscore-imports/unused-2018.rs
index d06a26a5f..d06a26a5f 100644
--- a/src/test/ui/underscore-imports/unused-2018.rs
+++ b/tests/ui/underscore-imports/unused-2018.rs
diff --git a/src/test/ui/underscore-imports/unused-2018.stderr b/tests/ui/underscore-imports/unused-2018.stderr
index 2afb9a10e..2afb9a10e 100644
--- a/src/test/ui/underscore-imports/unused-2018.stderr
+++ b/tests/ui/underscore-imports/unused-2018.stderr
diff --git a/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.rs b/tests/ui/underscore-lifetime/dyn-trait-underscore-in-struct.rs
index e1deab736..e1deab736 100644
--- a/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.rs
+++ b/tests/ui/underscore-lifetime/dyn-trait-underscore-in-struct.rs
diff --git a/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.stderr b/tests/ui/underscore-lifetime/dyn-trait-underscore-in-struct.stderr
index fd0860028..fd0860028 100644
--- a/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.stderr
+++ b/tests/ui/underscore-lifetime/dyn-trait-underscore-in-struct.stderr
diff --git a/src/test/ui/underscore-lifetime/dyn-trait-underscore.rs b/tests/ui/underscore-lifetime/dyn-trait-underscore.rs
index fa6e65c7d..fa6e65c7d 100644
--- a/src/test/ui/underscore-lifetime/dyn-trait-underscore.rs
+++ b/tests/ui/underscore-lifetime/dyn-trait-underscore.rs
diff --git a/src/test/ui/underscore-lifetime/dyn-trait-underscore.stderr b/tests/ui/underscore-lifetime/dyn-trait-underscore.stderr
index 60b0b3ee7..60b0b3ee7 100644
--- a/src/test/ui/underscore-lifetime/dyn-trait-underscore.stderr
+++ b/tests/ui/underscore-lifetime/dyn-trait-underscore.stderr
diff --git a/src/test/ui/underscore-lifetime/in-binder.rs b/tests/ui/underscore-lifetime/in-binder.rs
index 74dc331b0..74dc331b0 100644
--- a/src/test/ui/underscore-lifetime/in-binder.rs
+++ b/tests/ui/underscore-lifetime/in-binder.rs
diff --git a/src/test/ui/underscore-lifetime/in-binder.stderr b/tests/ui/underscore-lifetime/in-binder.stderr
index fcd7eddb5..fcd7eddb5 100644
--- a/src/test/ui/underscore-lifetime/in-binder.stderr
+++ b/tests/ui/underscore-lifetime/in-binder.stderr
diff --git a/src/test/ui/underscore-lifetime/in-fn-return-illegal.rs b/tests/ui/underscore-lifetime/in-fn-return-illegal.rs
index a46ece7d4..a46ece7d4 100644
--- a/src/test/ui/underscore-lifetime/in-fn-return-illegal.rs
+++ b/tests/ui/underscore-lifetime/in-fn-return-illegal.rs
diff --git a/src/test/ui/underscore-lifetime/in-fn-return-illegal.stderr b/tests/ui/underscore-lifetime/in-fn-return-illegal.stderr
index 6a104e8f9..6a104e8f9 100644
--- a/src/test/ui/underscore-lifetime/in-fn-return-illegal.stderr
+++ b/tests/ui/underscore-lifetime/in-fn-return-illegal.stderr
diff --git a/src/test/ui/underscore-lifetime/in-struct.rs b/tests/ui/underscore-lifetime/in-struct.rs
index bed89c7dc..bed89c7dc 100644
--- a/src/test/ui/underscore-lifetime/in-struct.rs
+++ b/tests/ui/underscore-lifetime/in-struct.rs
diff --git a/src/test/ui/underscore-lifetime/in-struct.stderr b/tests/ui/underscore-lifetime/in-struct.stderr
index 84183f61e..84183f61e 100644
--- a/src/test/ui/underscore-lifetime/in-struct.stderr
+++ b/tests/ui/underscore-lifetime/in-struct.stderr
diff --git a/src/test/ui/underscore-lifetime/underscore-lifetime-binders.rs b/tests/ui/underscore-lifetime/underscore-lifetime-binders.rs
index 3d049cc56..3d049cc56 100644
--- a/src/test/ui/underscore-lifetime/underscore-lifetime-binders.rs
+++ b/tests/ui/underscore-lifetime/underscore-lifetime-binders.rs
diff --git a/src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr b/tests/ui/underscore-lifetime/underscore-lifetime-binders.stderr
index 50401791e..50401791e 100644
--- a/src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr
+++ b/tests/ui/underscore-lifetime/underscore-lifetime-binders.stderr
diff --git a/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.rs b/tests/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.rs
index c61126884..c61126884 100644
--- a/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.rs
+++ b/tests/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.rs
diff --git a/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.stderr b/tests/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.stderr
index 2b34f0c55..2b34f0c55 100644
--- a/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.stderr
+++ b/tests/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.stderr
diff --git a/src/test/ui/underscore-lifetime/underscore-outlives-bounds.rs b/tests/ui/underscore-lifetime/underscore-outlives-bounds.rs
index 567cc7a3f..567cc7a3f 100644
--- a/src/test/ui/underscore-lifetime/underscore-outlives-bounds.rs
+++ b/tests/ui/underscore-lifetime/underscore-outlives-bounds.rs
diff --git a/src/test/ui/underscore-lifetime/underscore-outlives-bounds.stderr b/tests/ui/underscore-lifetime/underscore-outlives-bounds.stderr
index 4b38a26f9..4b38a26f9 100644
--- a/src/test/ui/underscore-lifetime/underscore-outlives-bounds.stderr
+++ b/tests/ui/underscore-lifetime/underscore-outlives-bounds.stderr
diff --git a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rs b/tests/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rs
index 43de30944..43de30944 100644
--- a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rs
+++ b/tests/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rs
diff --git a/tests/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2015.stderr b/tests/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2015.stderr
new file mode 100644
index 000000000..f4d14b5f8
--- /dev/null
+++ b/tests/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2015.stderr
@@ -0,0 +1,15 @@
+error[E0637]: `&` without an explicit lifetime name cannot be used here
+  --> $DIR/where-clause-inherent-impl-ampersand.rs:13:17
+   |
+LL |     T: WithType<&u32>
+   |                 ^ explicit lifetime name needed here
+   |
+help: consider introducing a higher-ranked lifetime here with `for<'a>`
+  --> $DIR/where-clause-inherent-impl-ampersand.rs:13:8
+   |
+LL |     T: WithType<&u32>
+   |        ^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0637`.
diff --git a/tests/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2018.stderr b/tests/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2018.stderr
new file mode 100644
index 000000000..f4d14b5f8
--- /dev/null
+++ b/tests/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2018.stderr
@@ -0,0 +1,15 @@
+error[E0637]: `&` without an explicit lifetime name cannot be used here
+  --> $DIR/where-clause-inherent-impl-ampersand.rs:13:17
+   |
+LL |     T: WithType<&u32>
+   |                 ^ explicit lifetime name needed here
+   |
+help: consider introducing a higher-ranked lifetime here with `for<'a>`
+  --> $DIR/where-clause-inherent-impl-ampersand.rs:13:8
+   |
+LL |     T: WithType<&u32>
+   |        ^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rs b/tests/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rs
index 38189816d..38189816d 100644
--- a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rs
+++ b/tests/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rs
diff --git a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2015.stderr b/tests/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2015.stderr
index 95939fd6b..95939fd6b 100644
--- a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2015.stderr
+++ b/tests/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2015.stderr
diff --git a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2018.stderr b/tests/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2018.stderr
index 95939fd6b..95939fd6b 100644
--- a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2018.stderr
+++ b/tests/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2018.stderr
diff --git a/src/test/ui/underscore-lifetime/where-clause-trait-impl-region.rs b/tests/ui/underscore-lifetime/where-clause-trait-impl-region.rs
index 09e5bbd84..09e5bbd84 100644
--- a/src/test/ui/underscore-lifetime/where-clause-trait-impl-region.rs
+++ b/tests/ui/underscore-lifetime/where-clause-trait-impl-region.rs
diff --git a/tests/ui/underscore-lifetime/where-clause-trait-impl-region.rust2015.stderr b/tests/ui/underscore-lifetime/where-clause-trait-impl-region.rust2015.stderr
new file mode 100644
index 000000000..63fc1a19b
--- /dev/null
+++ b/tests/ui/underscore-lifetime/where-clause-trait-impl-region.rust2015.stderr
@@ -0,0 +1,15 @@
+error[E0637]: `&` without an explicit lifetime name cannot be used here
+  --> $DIR/where-clause-trait-impl-region.rs:11:17
+   |
+LL |     T: WithType<&u32>
+   |                 ^ explicit lifetime name needed here
+   |
+help: consider introducing a higher-ranked lifetime here with `for<'a>`
+  --> $DIR/where-clause-trait-impl-region.rs:11:8
+   |
+LL |     T: WithType<&u32>
+   |        ^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0637`.
diff --git a/tests/ui/underscore-lifetime/where-clause-trait-impl-region.rust2018.stderr b/tests/ui/underscore-lifetime/where-clause-trait-impl-region.rust2018.stderr
new file mode 100644
index 000000000..63fc1a19b
--- /dev/null
+++ b/tests/ui/underscore-lifetime/where-clause-trait-impl-region.rust2018.stderr
@@ -0,0 +1,15 @@
+error[E0637]: `&` without an explicit lifetime name cannot be used here
+  --> $DIR/where-clause-trait-impl-region.rs:11:17
+   |
+LL |     T: WithType<&u32>
+   |                 ^ explicit lifetime name needed here
+   |
+help: consider introducing a higher-ranked lifetime here with `for<'a>`
+  --> $DIR/where-clause-trait-impl-region.rs:11:8
+   |
+LL |     T: WithType<&u32>
+   |        ^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rs b/tests/ui/underscore-lifetime/where-clause-trait-impl-underscore.rs
index 371d2e4ba..371d2e4ba 100644
--- a/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rs
+++ b/tests/ui/underscore-lifetime/where-clause-trait-impl-underscore.rs
diff --git a/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2015.stderr b/tests/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2015.stderr
index 92caff0dc..92caff0dc 100644
--- a/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2015.stderr
+++ b/tests/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2015.stderr
diff --git a/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2018.stderr b/tests/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2018.stderr
index 92caff0dc..92caff0dc 100644
--- a/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2018.stderr
+++ b/tests/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2018.stderr
diff --git a/src/test/ui/underscore-lifetime/where-clauses.rs b/tests/ui/underscore-lifetime/where-clauses.rs
index ee6823b80..ee6823b80 100644
--- a/src/test/ui/underscore-lifetime/where-clauses.rs
+++ b/tests/ui/underscore-lifetime/where-clauses.rs
diff --git a/src/test/ui/underscore-lifetime/where-clauses.stderr b/tests/ui/underscore-lifetime/where-clauses.stderr
index 1a3ea4af7..1a3ea4af7 100644
--- a/src/test/ui/underscore-lifetime/where-clauses.stderr
+++ b/tests/ui/underscore-lifetime/where-clauses.stderr
diff --git a/src/test/ui/underscore-lifetimes.rs b/tests/ui/underscore-lifetimes.rs
index a1593880d..a1593880d 100644
--- a/src/test/ui/underscore-lifetimes.rs
+++ b/tests/ui/underscore-lifetimes.rs
diff --git a/src/test/ui/underscore-method-after-integer.rs b/tests/ui/underscore-method-after-integer.rs
index 7fb8607f9..7fb8607f9 100644
--- a/src/test/ui/underscore-method-after-integer.rs
+++ b/tests/ui/underscore-method-after-integer.rs
diff --git a/src/test/ui/unevaluated_fixed_size_array_len.rs b/tests/ui/unevaluated_fixed_size_array_len.rs
index 6c545913d..6c545913d 100644
--- a/src/test/ui/unevaluated_fixed_size_array_len.rs
+++ b/tests/ui/unevaluated_fixed_size_array_len.rs
diff --git a/src/test/ui/unevaluated_fixed_size_array_len.stderr b/tests/ui/unevaluated_fixed_size_array_len.stderr
index 5e67b2c44..5e67b2c44 100644
--- a/src/test/ui/unevaluated_fixed_size_array_len.stderr
+++ b/tests/ui/unevaluated_fixed_size_array_len.stderr
diff --git a/src/test/ui/uniform-paths/auxiliary/issue-53691.rs b/tests/ui/uniform-paths/auxiliary/issue-53691.rs
index a46533178..a46533178 100644
--- a/src/test/ui/uniform-paths/auxiliary/issue-53691.rs
+++ b/tests/ui/uniform-paths/auxiliary/issue-53691.rs
diff --git a/src/test/ui/uniform-paths/basic-nested.rs b/tests/ui/uniform-paths/basic-nested.rs
index dcf0eb646..dcf0eb646 100644
--- a/src/test/ui/uniform-paths/basic-nested.rs
+++ b/tests/ui/uniform-paths/basic-nested.rs
diff --git a/src/test/ui/uniform-paths/basic.rs b/tests/ui/uniform-paths/basic.rs
index ce611a7ca..ce611a7ca 100644
--- a/src/test/ui/uniform-paths/basic.rs
+++ b/tests/ui/uniform-paths/basic.rs
diff --git a/src/test/ui/uniform-paths/issue-53691.rs b/tests/ui/uniform-paths/issue-53691.rs
index 5c5ca5b70..5c5ca5b70 100644
--- a/src/test/ui/uniform-paths/issue-53691.rs
+++ b/tests/ui/uniform-paths/issue-53691.rs
diff --git a/src/test/ui/uniform-paths/macros-nested.rs b/tests/ui/uniform-paths/macros-nested.rs
index 175ccd34e..175ccd34e 100644
--- a/src/test/ui/uniform-paths/macros-nested.rs
+++ b/tests/ui/uniform-paths/macros-nested.rs
diff --git a/src/test/ui/uniform-paths/macros.rs b/tests/ui/uniform-paths/macros.rs
index bf512b305..bf512b305 100644
--- a/src/test/ui/uniform-paths/macros.rs
+++ b/tests/ui/uniform-paths/macros.rs
diff --git a/src/test/ui/uniform-paths/same-crate.rs b/tests/ui/uniform-paths/same-crate.rs
index ce4cc13d9..ce4cc13d9 100644
--- a/src/test/ui/uniform-paths/same-crate.rs
+++ b/tests/ui/uniform-paths/same-crate.rs
diff --git a/src/test/ui/uninhabited/exhaustive-wo-nevertype-issue-51221.rs b/tests/ui/uninhabited/exhaustive-wo-nevertype-issue-51221.rs
index b59432078..b59432078 100644
--- a/src/test/ui/uninhabited/exhaustive-wo-nevertype-issue-51221.rs
+++ b/tests/ui/uninhabited/exhaustive-wo-nevertype-issue-51221.rs
diff --git a/src/test/ui/uninhabited/privately-uninhabited-dead-code.rs b/tests/ui/uninhabited/privately-uninhabited-dead-code.rs
index f476704cd..f476704cd 100644
--- a/src/test/ui/uninhabited/privately-uninhabited-dead-code.rs
+++ b/tests/ui/uninhabited/privately-uninhabited-dead-code.rs
diff --git a/src/test/ui/uninhabited/privately-uninhabited-mir-call.rs b/tests/ui/uninhabited/privately-uninhabited-mir-call.rs
index 2764bb563..2764bb563 100644
--- a/src/test/ui/uninhabited/privately-uninhabited-mir-call.rs
+++ b/tests/ui/uninhabited/privately-uninhabited-mir-call.rs
diff --git a/src/test/ui/uninhabited/privately-uninhabited-mir-call.stderr b/tests/ui/uninhabited/privately-uninhabited-mir-call.stderr
index 0dfd22a30..0dfd22a30 100644
--- a/src/test/ui/uninhabited/privately-uninhabited-mir-call.stderr
+++ b/tests/ui/uninhabited/privately-uninhabited-mir-call.stderr
diff --git a/src/test/ui/uninhabited/uninhabited-enum-cast.rs b/tests/ui/uninhabited/uninhabited-enum-cast.rs
index 5a75c94c4..5a75c94c4 100644
--- a/src/test/ui/uninhabited/uninhabited-enum-cast.rs
+++ b/tests/ui/uninhabited/uninhabited-enum-cast.rs
diff --git a/src/test/ui/uninhabited/uninhabited-irrefutable.rs b/tests/ui/uninhabited/uninhabited-irrefutable.rs
index 1a0f3c5e5..4b001aca2 100644
--- a/src/test/ui/uninhabited/uninhabited-irrefutable.rs
+++ b/tests/ui/uninhabited/uninhabited-irrefutable.rs
@@ -24,5 +24,7 @@ enum Foo {
 
 fn main() {
     let x: Foo = Foo::D(123, 456);
-    let Foo::D(_y, _z) = x; //~ ERROR refutable pattern in local binding: `Foo::A(_)` not covered
+    let Foo::D(_y, _z) = x;
+    //~^ ERROR refutable pattern in local binding
+    //~| `Foo::A(_)` not covered
 }
diff --git a/tests/ui/uninhabited/uninhabited-irrefutable.stderr b/tests/ui/uninhabited/uninhabited-irrefutable.stderr
new file mode 100644
index 000000000..8cafea555
--- /dev/null
+++ b/tests/ui/uninhabited/uninhabited-irrefutable.stderr
@@ -0,0 +1,24 @@
+error[E0005]: refutable pattern in local binding
+  --> $DIR/uninhabited-irrefutable.rs:27:9
+   |
+LL |     let Foo::D(_y, _z) = x;
+   |         ^^^^^^^^^^^^^^ pattern `Foo::A(_)` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+note: `Foo` defined here
+  --> $DIR/uninhabited-irrefutable.rs:18:6
+   |
+LL | enum Foo {
+   |      ^^^
+LL |     A(foo::SecretlyEmpty),
+   |     - not covered
+   = note: the matched value is of type `Foo`
+help: you might want to use `let else` to handle the variant that isn't matched
+   |
+LL |     let Foo::D(_y, _z) = x else { todo!() };
+   |                            ++++++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/uninhabited/uninhabited-matches-feature-gated.rs b/tests/ui/uninhabited/uninhabited-matches-feature-gated.rs
index e804afcf9..e804afcf9 100644
--- a/src/test/ui/uninhabited/uninhabited-matches-feature-gated.rs
+++ b/tests/ui/uninhabited/uninhabited-matches-feature-gated.rs
diff --git a/src/test/ui/uninhabited/uninhabited-matches-feature-gated.stderr b/tests/ui/uninhabited/uninhabited-matches-feature-gated.stderr
index c78829634..466d7f2ea 100644
--- a/src/test/ui/uninhabited/uninhabited-matches-feature-gated.stderr
+++ b/tests/ui/uninhabited/uninhabited-matches-feature-gated.stderr
@@ -6,12 +6,9 @@ LL |     let _ = match x {
    |
 note: `Result<u32, &Void>` defined here
   --> $SRC_DIR/core/src/result.rs:LL:COL
+  ::: $SRC_DIR/core/src/result.rs:LL:COL
    |
-LL | pub enum Result<T, E> {
-   | ---------------------
-...
-LL |     Err(#[stable(feature = "rust1", since = "1.0.0")] E),
-   |     ^^^ not covered
+   = note: not covered
    = note: the matched value is of type `Result<u32, &Void>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
    |
@@ -88,12 +85,9 @@ LL |     let _ = match x {
    |
 note: `Result<u32, Void>` defined here
   --> $SRC_DIR/core/src/result.rs:LL:COL
+  ::: $SRC_DIR/core/src/result.rs:LL:COL
    |
-LL | pub enum Result<T, E> {
-   | ---------------------
-...
-LL |     Err(#[stable(feature = "rust1", since = "1.0.0")] E),
-   |     ^^^ not covered
+   = note: not covered
    = note: the matched value is of type `Result<u32, Void>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
    |
@@ -101,7 +95,7 @@ LL ~         Ok(x) => x,
 LL ~         Err(_) => todo!(),
    |
 
-error[E0005]: refutable pattern in local binding: `Err(_)` not covered
+error[E0005]: refutable pattern in local binding
   --> $DIR/uninhabited-matches-feature-gated.rs:37:9
    |
 LL |     let Ok(x) = x;
@@ -109,20 +103,8 @@ LL |     let Ok(x) = x;
    |
    = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
    = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
-note: `Result<u32, Void>` defined here
-  --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   | ---------------------
-...
-LL |     Err(#[stable(feature = "rust1", since = "1.0.0")] E),
-   |     ^^^ not covered
    = note: the matched value is of type `Result<u32, Void>`
-help: you might want to use `if let` to ignore the variant that isn't matched
-   |
-LL |     let x = if let Ok(x) = x { x } else { todo!() };
-   |     ++++++++++               ++++++++++++++++++++++
-help: alternatively, you might want to use let else to handle the variant that isn't matched
+help: you might want to use `let else` to handle the variant that isn't matched
    |
 LL |     let Ok(x) = x else { todo!() };
    |                   ++++++++++++++++
diff --git a/src/test/ui/uninhabited/uninhabited-patterns.rs b/tests/ui/uninhabited/uninhabited-patterns.rs
index f1573b6ad..f1573b6ad 100644
--- a/src/test/ui/uninhabited/uninhabited-patterns.rs
+++ b/tests/ui/uninhabited/uninhabited-patterns.rs
diff --git a/src/test/ui/uninhabited/uninhabited-patterns.stderr b/tests/ui/uninhabited/uninhabited-patterns.stderr
index 655569ad6..655569ad6 100644
--- a/src/test/ui/uninhabited/uninhabited-patterns.stderr
+++ b/tests/ui/uninhabited/uninhabited-patterns.stderr
diff --git a/src/test/ui/uninit-empty-types.rs b/tests/ui/uninit-empty-types.rs
index b21de882b..b21de882b 100644
--- a/src/test/ui/uninit-empty-types.rs
+++ b/tests/ui/uninit-empty-types.rs
diff --git a/src/test/ui/union/auxiliary/union.rs b/tests/ui/union/auxiliary/union.rs
index e785e35ae..e785e35ae 100644
--- a/src/test/ui/union/auxiliary/union.rs
+++ b/tests/ui/union/auxiliary/union.rs
diff --git a/src/test/ui/union/field_checks.rs b/tests/ui/union/field_checks.rs
index d5d1e44ac..d5d1e44ac 100644
--- a/src/test/ui/union/field_checks.rs
+++ b/tests/ui/union/field_checks.rs
diff --git a/src/test/ui/union/field_checks.stderr b/tests/ui/union/field_checks.stderr
index 1f97e97ac..1f97e97ac 100644
--- a/src/test/ui/union/field_checks.stderr
+++ b/tests/ui/union/field_checks.stderr
diff --git a/src/test/ui/union/issue-41073.rs b/tests/ui/union/issue-41073.rs
index 4dfdc606b..4dfdc606b 100644
--- a/src/test/ui/union/issue-41073.rs
+++ b/tests/ui/union/issue-41073.rs
diff --git a/src/test/ui/union/issue-41073.stderr b/tests/ui/union/issue-41073.stderr
index b3887fa0f..b3887fa0f 100644
--- a/src/test/ui/union/issue-41073.stderr
+++ b/tests/ui/union/issue-41073.stderr
diff --git a/src/test/ui/union/issue-81199.rs b/tests/ui/union/issue-81199.rs
index 628e7c6ed..628e7c6ed 100644
--- a/src/test/ui/union/issue-81199.rs
+++ b/tests/ui/union/issue-81199.rs
diff --git a/src/test/ui/union/issue-81199.stderr b/tests/ui/union/issue-81199.stderr
index 5bb986753..5bb986753 100644
--- a/src/test/ui/union/issue-81199.stderr
+++ b/tests/ui/union/issue-81199.stderr
diff --git a/src/test/ui/union/issue-99375.rs b/tests/ui/union/issue-99375.rs
index 175018a7d..175018a7d 100644
--- a/src/test/ui/union/issue-99375.rs
+++ b/tests/ui/union/issue-99375.rs
diff --git a/src/test/ui/union/union-align.rs b/tests/ui/union/union-align.rs
index 6a44f27db..6a44f27db 100644
--- a/src/test/ui/union/union-align.rs
+++ b/tests/ui/union/union-align.rs
diff --git a/src/test/ui/union/union-backcomp.rs b/tests/ui/union/union-backcomp.rs
index b19eab9f5..b19eab9f5 100644
--- a/src/test/ui/union/union-backcomp.rs
+++ b/tests/ui/union/union-backcomp.rs
diff --git a/src/test/ui/union/union-basic.rs b/tests/ui/union/union-basic.rs
index dcc552ac7..dcc552ac7 100644
--- a/src/test/ui/union/union-basic.rs
+++ b/tests/ui/union/union-basic.rs
diff --git a/src/test/ui/union/union-borrow-move-parent-sibling.mirunsafeck.stderr b/tests/ui/union/union-borrow-move-parent-sibling.mirunsafeck.stderr
index ca02de4c6..7f931b49a 100644
--- a/src/test/ui/union/union-borrow-move-parent-sibling.mirunsafeck.stderr
+++ b/tests/ui/union/union-borrow-move-parent-sibling.mirunsafeck.stderr
@@ -14,10 +14,12 @@ error[E0507]: cannot move out of dereference of `ManuallyDrop<((MockVec<u8>, Moc
   --> $DIR/union-borrow-move-parent-sibling.rs:62:13
    |
 LL |     let a = u.x.0;
-   |             ^^^^^
-   |             |
-   |             move occurs because value has type `(MockVec<u8>, MockVec<u8>)`, which does not implement the `Copy` trait
-   |             help: consider borrowing here: `&u.x.0`
+   |             ^^^^^ move occurs because value has type `(MockVec<u8>, MockVec<u8>)`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let a = &u.x.0;
+   |             +
 
 error[E0382]: use of moved value: `u`
   --> $DIR/union-borrow-move-parent-sibling.rs:64:13
@@ -46,10 +48,12 @@ error[E0507]: cannot move out of dereference of `ManuallyDrop<((MockVec<u8>, Moc
   --> $DIR/union-borrow-move-parent-sibling.rs:76:13
    |
 LL |     let a = (u.x.0).0;
-   |             ^^^^^^^^^
-   |             |
-   |             move occurs because value has type `MockVec<u8>`, which does not implement the `Copy` trait
-   |             help: consider borrowing here: `&(u.x.0).0`
+   |             ^^^^^^^^^ move occurs because value has type `MockVec<u8>`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let a = &(u.x.0).0;
+   |             +
 
 error[E0382]: use of moved value: `u`
   --> $DIR/union-borrow-move-parent-sibling.rs:78:13
diff --git a/src/test/ui/union/union-borrow-move-parent-sibling.rs b/tests/ui/union/union-borrow-move-parent-sibling.rs
index 83781c5e5..83781c5e5 100644
--- a/src/test/ui/union/union-borrow-move-parent-sibling.rs
+++ b/tests/ui/union/union-borrow-move-parent-sibling.rs
diff --git a/src/test/ui/union/union-borrow-move-parent-sibling.thirunsafeck.stderr b/tests/ui/union/union-borrow-move-parent-sibling.thirunsafeck.stderr
index ca02de4c6..7f931b49a 100644
--- a/src/test/ui/union/union-borrow-move-parent-sibling.thirunsafeck.stderr
+++ b/tests/ui/union/union-borrow-move-parent-sibling.thirunsafeck.stderr
@@ -14,10 +14,12 @@ error[E0507]: cannot move out of dereference of `ManuallyDrop<((MockVec<u8>, Moc
   --> $DIR/union-borrow-move-parent-sibling.rs:62:13
    |
 LL |     let a = u.x.0;
-   |             ^^^^^
-   |             |
-   |             move occurs because value has type `(MockVec<u8>, MockVec<u8>)`, which does not implement the `Copy` trait
-   |             help: consider borrowing here: `&u.x.0`
+   |             ^^^^^ move occurs because value has type `(MockVec<u8>, MockVec<u8>)`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let a = &u.x.0;
+   |             +
 
 error[E0382]: use of moved value: `u`
   --> $DIR/union-borrow-move-parent-sibling.rs:64:13
@@ -46,10 +48,12 @@ error[E0507]: cannot move out of dereference of `ManuallyDrop<((MockVec<u8>, Moc
   --> $DIR/union-borrow-move-parent-sibling.rs:76:13
    |
 LL |     let a = (u.x.0).0;
-   |             ^^^^^^^^^
-   |             |
-   |             move occurs because value has type `MockVec<u8>`, which does not implement the `Copy` trait
-   |             help: consider borrowing here: `&(u.x.0).0`
+   |             ^^^^^^^^^ move occurs because value has type `MockVec<u8>`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let a = &(u.x.0).0;
+   |             +
 
 error[E0382]: use of moved value: `u`
   --> $DIR/union-borrow-move-parent-sibling.rs:78:13
diff --git a/src/test/ui/union/union-const-codegen.rs b/tests/ui/union/union-const-codegen.rs
index 32a546cf3..32a546cf3 100644
--- a/src/test/ui/union/union-const-codegen.rs
+++ b/tests/ui/union/union-const-codegen.rs
diff --git a/src/test/ui/union/union-const-eval-field.rs b/tests/ui/union/union-const-eval-field.rs
index ca48785cd..ca48785cd 100644
--- a/src/test/ui/union/union-const-eval-field.rs
+++ b/tests/ui/union/union-const-eval-field.rs
diff --git a/src/test/ui/union/union-const-eval.rs b/tests/ui/union/union-const-eval.rs
index 32ee4a739..32ee4a739 100644
--- a/src/test/ui/union/union-const-eval.rs
+++ b/tests/ui/union/union-const-eval.rs
diff --git a/src/test/ui/union/union-const-pat.rs b/tests/ui/union/union-const-pat.rs
index e7cb248a2..e7cb248a2 100644
--- a/src/test/ui/union/union-const-pat.rs
+++ b/tests/ui/union/union-const-pat.rs
diff --git a/src/test/ui/union/union-const-pat.stderr b/tests/ui/union/union-const-pat.stderr
index dc87f4de5..dc87f4de5 100644
--- a/src/test/ui/union/union-const-pat.stderr
+++ b/tests/ui/union/union-const-pat.stderr
diff --git a/src/test/ui/union/union-copy.rs b/tests/ui/union/union-copy.rs
index 5c3f8d908..5c3f8d908 100644
--- a/src/test/ui/union/union-copy.rs
+++ b/tests/ui/union/union-copy.rs
diff --git a/src/test/ui/union/union-copy.stderr b/tests/ui/union/union-copy.stderr
index 53ee4dd2e..53ee4dd2e 100644
--- a/src/test/ui/union/union-copy.stderr
+++ b/tests/ui/union/union-copy.stderr
diff --git a/src/test/ui/union/union-deref.mirunsafeck.stderr b/tests/ui/union/union-deref.mirunsafeck.stderr
index be5e60ab8..be5e60ab8 100644
--- a/src/test/ui/union/union-deref.mirunsafeck.stderr
+++ b/tests/ui/union/union-deref.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-deref.rs b/tests/ui/union/union-deref.rs
index 5aa28d93f..5aa28d93f 100644
--- a/src/test/ui/union/union-deref.rs
+++ b/tests/ui/union/union-deref.rs
diff --git a/src/test/ui/union/union-deref.thirunsafeck.stderr b/tests/ui/union/union-deref.thirunsafeck.stderr
index be5e60ab8..be5e60ab8 100644
--- a/src/test/ui/union/union-deref.thirunsafeck.stderr
+++ b/tests/ui/union/union-deref.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-derive-clone.mirunsafeck.stderr b/tests/ui/union/union-derive-clone.mirunsafeck.stderr
index 148fb5046..b80e8b988 100644
--- a/src/test/ui/union/union-derive-clone.mirunsafeck.stderr
+++ b/tests/ui/union/union-derive-clone.mirunsafeck.stderr
@@ -6,9 +6,6 @@ LL | #[derive(Clone)]
    |
 note: required by a bound in `AssertParamIsCopy`
   --> $SRC_DIR/core/src/clone.rs:LL:COL
-   |
-LL | pub struct AssertParamIsCopy<T: Copy + ?Sized> {
-   |                                 ^^^^ required by this bound in `AssertParamIsCopy`
    = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `U1` with `#[derive(Copy)]`
    |
@@ -35,9 +32,6 @@ note: trait bound `CloneNoCopy: Copy` was not satisfied
    |
 LL | #[derive(Clone, Copy)]
    |          ^^^^^ unsatisfied trait bound introduced in this `derive` macro
-   = note: the following trait bounds were not satisfied:
-           `CloneNoCopy: Copy`
-           which is required by `U5<CloneNoCopy>: Clone`
 help: consider annotating `CloneNoCopy` with `#[derive(Clone, Copy)]`
    |
 LL | #[derive(Clone, Copy)]
diff --git a/src/test/ui/union/union-derive-clone.rs b/tests/ui/union/union-derive-clone.rs
index 7aa62146e..7aa62146e 100644
--- a/src/test/ui/union/union-derive-clone.rs
+++ b/tests/ui/union/union-derive-clone.rs
diff --git a/src/test/ui/union/union-derive-clone.thirunsafeck.stderr b/tests/ui/union/union-derive-clone.thirunsafeck.stderr
index 148fb5046..b80e8b988 100644
--- a/src/test/ui/union/union-derive-clone.thirunsafeck.stderr
+++ b/tests/ui/union/union-derive-clone.thirunsafeck.stderr
@@ -6,9 +6,6 @@ LL | #[derive(Clone)]
    |
 note: required by a bound in `AssertParamIsCopy`
   --> $SRC_DIR/core/src/clone.rs:LL:COL
-   |
-LL | pub struct AssertParamIsCopy<T: Copy + ?Sized> {
-   |                                 ^^^^ required by this bound in `AssertParamIsCopy`
    = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `U1` with `#[derive(Copy)]`
    |
@@ -35,9 +32,6 @@ note: trait bound `CloneNoCopy: Copy` was not satisfied
    |
 LL | #[derive(Clone, Copy)]
    |          ^^^^^ unsatisfied trait bound introduced in this `derive` macro
-   = note: the following trait bounds were not satisfied:
-           `CloneNoCopy: Copy`
-           which is required by `U5<CloneNoCopy>: Clone`
 help: consider annotating `CloneNoCopy` with `#[derive(Clone, Copy)]`
    |
 LL | #[derive(Clone, Copy)]
diff --git a/src/test/ui/union/union-derive-eq.mirunsafeck.stderr b/tests/ui/union/union-derive-eq.mirunsafeck.stderr
index 99505f316..9e55390b5 100644
--- a/src/test/ui/union/union-derive-eq.mirunsafeck.stderr
+++ b/tests/ui/union/union-derive-eq.mirunsafeck.stderr
@@ -9,9 +9,6 @@ LL |     a: PartialEqNotEq,
    |
 note: required by a bound in `AssertParamIsEq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub struct AssertParamIsEq<T: Eq + ?Sized> {
-   |                               ^^ required by this bound in `AssertParamIsEq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `PartialEqNotEq` with `#[derive(Eq)]`
    |
diff --git a/src/test/ui/union/union-derive-eq.rs b/tests/ui/union/union-derive-eq.rs
index b7e7f343f..b7e7f343f 100644
--- a/src/test/ui/union/union-derive-eq.rs
+++ b/tests/ui/union/union-derive-eq.rs
diff --git a/src/test/ui/union/union-derive-eq.thirunsafeck.stderr b/tests/ui/union/union-derive-eq.thirunsafeck.stderr
index 99505f316..9e55390b5 100644
--- a/src/test/ui/union/union-derive-eq.thirunsafeck.stderr
+++ b/tests/ui/union/union-derive-eq.thirunsafeck.stderr
@@ -9,9 +9,6 @@ LL |     a: PartialEqNotEq,
    |
 note: required by a bound in `AssertParamIsEq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub struct AssertParamIsEq<T: Eq + ?Sized> {
-   |                               ^^ required by this bound in `AssertParamIsEq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `PartialEqNotEq` with `#[derive(Eq)]`
    |
diff --git a/src/test/ui/union/union-derive-rpass.rs b/tests/ui/union/union-derive-rpass.rs
index 8276bc635..8276bc635 100644
--- a/src/test/ui/union/union-derive-rpass.rs
+++ b/tests/ui/union/union-derive-rpass.rs
diff --git a/src/test/ui/union/union-derive.rs b/tests/ui/union/union-derive.rs
index 652a6b24c..652a6b24c 100644
--- a/src/test/ui/union/union-derive.rs
+++ b/tests/ui/union/union-derive.rs
diff --git a/src/test/ui/union/union-derive.stderr b/tests/ui/union/union-derive.stderr
index 6ef72c901..6ef72c901 100644
--- a/src/test/ui/union/union-derive.stderr
+++ b/tests/ui/union/union-derive.stderr
diff --git a/src/test/ui/union/union-drop-assign.rs b/tests/ui/union/union-drop-assign.rs
index 215666bdd..215666bdd 100644
--- a/src/test/ui/union/union-drop-assign.rs
+++ b/tests/ui/union/union-drop-assign.rs
diff --git a/src/test/ui/union/union-drop.rs b/tests/ui/union/union-drop.rs
index c3d7d41ca..c3d7d41ca 100644
--- a/src/test/ui/union/union-drop.rs
+++ b/tests/ui/union/union-drop.rs
diff --git a/src/test/ui/union/union-empty.rs b/tests/ui/union/union-empty.rs
index 79b7e68ee..79b7e68ee 100644
--- a/src/test/ui/union/union-empty.rs
+++ b/tests/ui/union/union-empty.rs
diff --git a/src/test/ui/union/union-empty.stderr b/tests/ui/union/union-empty.stderr
index a80b27e6e..a80b27e6e 100644
--- a/src/test/ui/union/union-empty.stderr
+++ b/tests/ui/union/union-empty.stderr
diff --git a/src/test/ui/union/union-fields-1.mirunsafeck.stderr b/tests/ui/union/union-fields-1.mirunsafeck.stderr
index 0c9981c69..0c9981c69 100644
--- a/src/test/ui/union/union-fields-1.mirunsafeck.stderr
+++ b/tests/ui/union/union-fields-1.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-fields-1.rs b/tests/ui/union/union-fields-1.rs
index cf2ef4c03..cf2ef4c03 100644
--- a/src/test/ui/union/union-fields-1.rs
+++ b/tests/ui/union/union-fields-1.rs
diff --git a/src/test/ui/union/union-fields-1.thirunsafeck.stderr b/tests/ui/union/union-fields-1.thirunsafeck.stderr
index 0c9981c69..0c9981c69 100644
--- a/src/test/ui/union/union-fields-1.thirunsafeck.stderr
+++ b/tests/ui/union/union-fields-1.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-fields-2.mirunsafeck.stderr b/tests/ui/union/union-fields-2.mirunsafeck.stderr
index 90ad16402..90ad16402 100644
--- a/src/test/ui/union/union-fields-2.mirunsafeck.stderr
+++ b/tests/ui/union/union-fields-2.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-fields-2.rs b/tests/ui/union/union-fields-2.rs
index e738b1847..e738b1847 100644
--- a/src/test/ui/union/union-fields-2.rs
+++ b/tests/ui/union/union-fields-2.rs
diff --git a/src/test/ui/union/union-fields-2.thirunsafeck.stderr b/tests/ui/union/union-fields-2.thirunsafeck.stderr
index 90ad16402..90ad16402 100644
--- a/src/test/ui/union/union-fields-2.thirunsafeck.stderr
+++ b/tests/ui/union/union-fields-2.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-generic-rpass.rs b/tests/ui/union/union-generic-rpass.rs
index 25f1f5050..25f1f5050 100644
--- a/src/test/ui/union/union-generic-rpass.rs
+++ b/tests/ui/union/union-generic-rpass.rs
diff --git a/src/test/ui/union/union-generic.mirunsafeck.stderr b/tests/ui/union/union-generic.mirunsafeck.stderr
index 037022a91..037022a91 100644
--- a/src/test/ui/union/union-generic.mirunsafeck.stderr
+++ b/tests/ui/union/union-generic.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-generic.rs b/tests/ui/union/union-generic.rs
index 3d68ecb87..3d68ecb87 100644
--- a/src/test/ui/union/union-generic.rs
+++ b/tests/ui/union/union-generic.rs
diff --git a/src/test/ui/union/union-generic.thirunsafeck.stderr b/tests/ui/union/union-generic.thirunsafeck.stderr
index 037022a91..037022a91 100644
--- a/src/test/ui/union/union-generic.thirunsafeck.stderr
+++ b/tests/ui/union/union-generic.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-inherent-method.rs b/tests/ui/union/union-inherent-method.rs
index b0fd22da7..b0fd22da7 100644
--- a/src/test/ui/union/union-inherent-method.rs
+++ b/tests/ui/union/union-inherent-method.rs
diff --git a/src/test/ui/union/union-lint-dead-code.mirunsafeck.stderr b/tests/ui/union/union-lint-dead-code.mirunsafeck.stderr
index 6e21584c3..6e21584c3 100644
--- a/src/test/ui/union/union-lint-dead-code.mirunsafeck.stderr
+++ b/tests/ui/union/union-lint-dead-code.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-lint-dead-code.rs b/tests/ui/union/union-lint-dead-code.rs
index 65aaf0a1d..65aaf0a1d 100644
--- a/src/test/ui/union/union-lint-dead-code.rs
+++ b/tests/ui/union/union-lint-dead-code.rs
diff --git a/src/test/ui/union/union-lint-dead-code.thirunsafeck.stderr b/tests/ui/union/union-lint-dead-code.thirunsafeck.stderr
index 6e21584c3..6e21584c3 100644
--- a/src/test/ui/union/union-lint-dead-code.thirunsafeck.stderr
+++ b/tests/ui/union/union-lint-dead-code.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-macro.rs b/tests/ui/union/union-macro.rs
index 7fd9d8221..7fd9d8221 100644
--- a/src/test/ui/union/union-macro.rs
+++ b/tests/ui/union/union-macro.rs
diff --git a/src/test/ui/union/union-manuallydrop-rpass.rs b/tests/ui/union/union-manuallydrop-rpass.rs
index 826bdf07c..826bdf07c 100644
--- a/src/test/ui/union/union-manuallydrop-rpass.rs
+++ b/tests/ui/union/union-manuallydrop-rpass.rs
diff --git a/src/test/ui/union/union-move.mirunsafeck.stderr b/tests/ui/union/union-move.mirunsafeck.stderr
index 6381ae874..6381ae874 100644
--- a/src/test/ui/union/union-move.mirunsafeck.stderr
+++ b/tests/ui/union/union-move.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-move.rs b/tests/ui/union/union-move.rs
index b8b1ac804..b8b1ac804 100644
--- a/src/test/ui/union/union-move.rs
+++ b/tests/ui/union/union-move.rs
diff --git a/src/test/ui/union/union-move.thirunsafeck.stderr b/tests/ui/union/union-move.thirunsafeck.stderr
index 6381ae874..6381ae874 100644
--- a/src/test/ui/union/union-move.thirunsafeck.stderr
+++ b/tests/ui/union/union-move.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-nodrop.rs b/tests/ui/union/union-nodrop.rs
index 6e6b105a7..6e6b105a7 100644
--- a/src/test/ui/union/union-nodrop.rs
+++ b/tests/ui/union/union-nodrop.rs
diff --git a/src/test/ui/union/union-nonrepresentable.rs b/tests/ui/union/union-nonrepresentable.rs
index 4bdf7c687..4bdf7c687 100644
--- a/src/test/ui/union/union-nonrepresentable.rs
+++ b/tests/ui/union/union-nonrepresentable.rs
diff --git a/src/test/ui/union/union-nonrepresentable.stderr b/tests/ui/union/union-nonrepresentable.stderr
index c266d2e9e..c266d2e9e 100644
--- a/src/test/ui/union/union-nonrepresentable.stderr
+++ b/tests/ui/union/union-nonrepresentable.stderr
diff --git a/src/test/ui/union/union-nonzero.rs b/tests/ui/union/union-nonzero.rs
index 3f4f7ea1c..3f4f7ea1c 100644
--- a/src/test/ui/union/union-nonzero.rs
+++ b/tests/ui/union/union-nonzero.rs
diff --git a/src/test/ui/union/union-overwrite.rs b/tests/ui/union/union-overwrite.rs
index 0eea14d9d..0eea14d9d 100644
--- a/src/test/ui/union/union-overwrite.rs
+++ b/tests/ui/union/union-overwrite.rs
diff --git a/src/test/ui/union/union-packed.rs b/tests/ui/union/union-packed.rs
index 9c6398bf5..9c6398bf5 100644
--- a/src/test/ui/union/union-packed.rs
+++ b/tests/ui/union/union-packed.rs
diff --git a/src/test/ui/union/union-pat-refutability.rs b/tests/ui/union/union-pat-refutability.rs
index d628a200a..d628a200a 100644
--- a/src/test/ui/union/union-pat-refutability.rs
+++ b/tests/ui/union/union-pat-refutability.rs
diff --git a/src/test/ui/union/union-repr-c.rs b/tests/ui/union/union-repr-c.rs
index 1367835e6..1367835e6 100644
--- a/src/test/ui/union/union-repr-c.rs
+++ b/tests/ui/union/union-repr-c.rs
diff --git a/src/test/ui/union/union-repr-c.stderr b/tests/ui/union/union-repr-c.stderr
index 49124eee5..49124eee5 100644
--- a/src/test/ui/union/union-repr-c.stderr
+++ b/tests/ui/union/union-repr-c.stderr
diff --git a/src/test/ui/union/union-sized-field.rs b/tests/ui/union/union-sized-field.rs
index cb852eff0..cb852eff0 100644
--- a/src/test/ui/union/union-sized-field.rs
+++ b/tests/ui/union/union-sized-field.rs
diff --git a/src/test/ui/union/union-sized-field.stderr b/tests/ui/union/union-sized-field.stderr
index 771e8f261..771e8f261 100644
--- a/src/test/ui/union/union-sized-field.stderr
+++ b/tests/ui/union/union-sized-field.stderr
diff --git a/src/test/ui/union/union-suggest-field.mirunsafeck.stderr b/tests/ui/union/union-suggest-field.mirunsafeck.stderr
index 58b1f5cb0..58b1f5cb0 100644
--- a/src/test/ui/union/union-suggest-field.mirunsafeck.stderr
+++ b/tests/ui/union/union-suggest-field.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-suggest-field.rs b/tests/ui/union/union-suggest-field.rs
index 601a22a06..601a22a06 100644
--- a/src/test/ui/union/union-suggest-field.rs
+++ b/tests/ui/union/union-suggest-field.rs
diff --git a/src/test/ui/union/union-suggest-field.thirunsafeck.stderr b/tests/ui/union/union-suggest-field.thirunsafeck.stderr
index 58b1f5cb0..58b1f5cb0 100644
--- a/src/test/ui/union/union-suggest-field.thirunsafeck.stderr
+++ b/tests/ui/union/union-suggest-field.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-trait-impl.rs b/tests/ui/union/union-trait-impl.rs
index 6134e91f3..6134e91f3 100644
--- a/src/test/ui/union/union-trait-impl.rs
+++ b/tests/ui/union/union-trait-impl.rs
diff --git a/src/test/ui/union/union-transmute.rs b/tests/ui/union/union-transmute.rs
index 1a3b32d55..1a3b32d55 100644
--- a/src/test/ui/union/union-transmute.rs
+++ b/tests/ui/union/union-transmute.rs
diff --git a/src/test/ui/union/union-unsafe.mir.stderr b/tests/ui/union/union-unsafe.mir.stderr
index 544213dbc..544213dbc 100644
--- a/src/test/ui/union/union-unsafe.mir.stderr
+++ b/tests/ui/union/union-unsafe.mir.stderr
diff --git a/src/test/ui/union/union-unsafe.rs b/tests/ui/union/union-unsafe.rs
index 5e1837a90..5e1837a90 100644
--- a/src/test/ui/union/union-unsafe.rs
+++ b/tests/ui/union/union-unsafe.rs
diff --git a/src/test/ui/union/union-unsafe.thir.stderr b/tests/ui/union/union-unsafe.thir.stderr
index f959fe5bd..f959fe5bd 100644
--- a/src/test/ui/union/union-unsafe.thir.stderr
+++ b/tests/ui/union/union-unsafe.thir.stderr
diff --git a/src/test/ui/union/union-unsized.mirunsafeck.stderr b/tests/ui/union/union-unsized.mirunsafeck.stderr
index 59ab835fb..59ab835fb 100644
--- a/src/test/ui/union/union-unsized.mirunsafeck.stderr
+++ b/tests/ui/union/union-unsized.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-unsized.rs b/tests/ui/union/union-unsized.rs
index 8e897d7d3..8e897d7d3 100644
--- a/src/test/ui/union/union-unsized.rs
+++ b/tests/ui/union/union-unsized.rs
diff --git a/src/test/ui/union/union-unsized.thirunsafeck.stderr b/tests/ui/union/union-unsized.thirunsafeck.stderr
index 59ab835fb..59ab835fb 100644
--- a/src/test/ui/union/union-unsized.thirunsafeck.stderr
+++ b/tests/ui/union/union-unsized.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-with-drop-fields.mirunsafeck.stderr b/tests/ui/union/union-with-drop-fields.mirunsafeck.stderr
index 93fe996d2..93fe996d2 100644
--- a/src/test/ui/union/union-with-drop-fields.mirunsafeck.stderr
+++ b/tests/ui/union/union-with-drop-fields.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-with-drop-fields.rs b/tests/ui/union/union-with-drop-fields.rs
index a7a8b69e7..a7a8b69e7 100644
--- a/src/test/ui/union/union-with-drop-fields.rs
+++ b/tests/ui/union/union-with-drop-fields.rs
diff --git a/src/test/ui/union/union-with-drop-fields.thirunsafeck.stderr b/tests/ui/union/union-with-drop-fields.thirunsafeck.stderr
index 93fe996d2..93fe996d2 100644
--- a/src/test/ui/union/union-with-drop-fields.thirunsafeck.stderr
+++ b/tests/ui/union/union-with-drop-fields.thirunsafeck.stderr
diff --git a/src/test/ui/unique-object-noncopyable.rs b/tests/ui/unique-object-noncopyable.rs
index 2c40dfc7a..2c40dfc7a 100644
--- a/src/test/ui/unique-object-noncopyable.rs
+++ b/tests/ui/unique-object-noncopyable.rs
diff --git a/src/test/ui/unique-object-noncopyable.stderr b/tests/ui/unique-object-noncopyable.stderr
index 98a9bd07e..db42ed9ba 100644
--- a/src/test/ui/unique-object-noncopyable.stderr
+++ b/tests/ui/unique-object-noncopyable.stderr
@@ -9,14 +9,10 @@ LL |   trait Foo {
 ...
 LL |       let _z = y.clone();
    |                  ^^^^^ method cannot be called on `Box<dyn Foo>` due to unsatisfied trait bounds
-   |
+  --> $SRC_DIR/alloc/src/boxed.rs:LL:COL
   ::: $SRC_DIR/alloc/src/boxed.rs:LL:COL
    |
-LL | / pub struct Box<
-LL | |     T: ?Sized,
-LL | |     #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global,
-LL | | >(Unique<T>, A);
-   | |_- doesn't satisfy `Box<dyn Foo>: Clone`
+   = note: doesn't satisfy `Box<dyn Foo>: Clone`
    |
    = note: the following trait bounds were not satisfied:
            `dyn Foo: Sized`
diff --git a/src/test/ui/unique-pinned-nocopy.rs b/tests/ui/unique-pinned-nocopy.rs
index 8edaeef51..8edaeef51 100644
--- a/src/test/ui/unique-pinned-nocopy.rs
+++ b/tests/ui/unique-pinned-nocopy.rs
diff --git a/src/test/ui/unique-pinned-nocopy.stderr b/tests/ui/unique-pinned-nocopy.stderr
index 7af9c684b..de6611324 100644
--- a/src/test/ui/unique-pinned-nocopy.stderr
+++ b/tests/ui/unique-pinned-nocopy.stderr
@@ -6,14 +6,10 @@ LL |   struct R {
 ...
 LL |       let _j = i.clone();
    |                  ^^^^^ method cannot be called on `Box<R>` due to unsatisfied trait bounds
-   |
+  --> $SRC_DIR/alloc/src/boxed.rs:LL:COL
   ::: $SRC_DIR/alloc/src/boxed.rs:LL:COL
    |
-LL | / pub struct Box<
-LL | |     T: ?Sized,
-LL | |     #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global,
-LL | | >(Unique<T>, A);
-   | |_- doesn't satisfy `Box<R>: Clone`
+   = note: doesn't satisfy `Box<R>: Clone`
    |
    = note: the following trait bounds were not satisfied:
            `R: Clone`
diff --git a/src/test/ui/unique/unique-assign-copy.rs b/tests/ui/unique/unique-assign-copy.rs
index b742973ce..b742973ce 100644
--- a/src/test/ui/unique/unique-assign-copy.rs
+++ b/tests/ui/unique/unique-assign-copy.rs
diff --git a/src/test/ui/unique/unique-assign-drop.rs b/tests/ui/unique/unique-assign-drop.rs
index e7685b589..e7685b589 100644
--- a/src/test/ui/unique/unique-assign-drop.rs
+++ b/tests/ui/unique/unique-assign-drop.rs
diff --git a/src/test/ui/unique/unique-assign-generic.rs b/tests/ui/unique/unique-assign-generic.rs
index d4932d833..d4932d833 100644
--- a/src/test/ui/unique/unique-assign-generic.rs
+++ b/tests/ui/unique/unique-assign-generic.rs
diff --git a/src/test/ui/unique/unique-assign.rs b/tests/ui/unique/unique-assign.rs
index d598744f1..d598744f1 100644
--- a/src/test/ui/unique/unique-assign.rs
+++ b/tests/ui/unique/unique-assign.rs
diff --git a/src/test/ui/unique/unique-autoderef-field.rs b/tests/ui/unique/unique-autoderef-field.rs
index 64147e11f..64147e11f 100644
--- a/src/test/ui/unique/unique-autoderef-field.rs
+++ b/tests/ui/unique/unique-autoderef-field.rs
diff --git a/src/test/ui/unique/unique-autoderef-index.rs b/tests/ui/unique/unique-autoderef-index.rs
index ea6598a7f..ea6598a7f 100644
--- a/src/test/ui/unique/unique-autoderef-index.rs
+++ b/tests/ui/unique/unique-autoderef-index.rs
diff --git a/src/test/ui/unique/unique-cmp.rs b/tests/ui/unique/unique-cmp.rs
index ee05dd5a3..ee05dd5a3 100644
--- a/src/test/ui/unique/unique-cmp.rs
+++ b/tests/ui/unique/unique-cmp.rs
diff --git a/src/test/ui/unique/unique-containing-tag.rs b/tests/ui/unique/unique-containing-tag.rs
index 6c31ae99b..6c31ae99b 100644
--- a/src/test/ui/unique/unique-containing-tag.rs
+++ b/tests/ui/unique/unique-containing-tag.rs
diff --git a/src/test/ui/unique/unique-create.rs b/tests/ui/unique/unique-create.rs
index c566e7962..c566e7962 100644
--- a/src/test/ui/unique/unique-create.rs
+++ b/tests/ui/unique/unique-create.rs
diff --git a/src/test/ui/unique/unique-decl-init-copy.rs b/tests/ui/unique/unique-decl-init-copy.rs
index 5b9576fcc..5b9576fcc 100644
--- a/src/test/ui/unique/unique-decl-init-copy.rs
+++ b/tests/ui/unique/unique-decl-init-copy.rs
diff --git a/src/test/ui/unique/unique-decl-init.rs b/tests/ui/unique/unique-decl-init.rs
index 1d70860c7..1d70860c7 100644
--- a/src/test/ui/unique/unique-decl-init.rs
+++ b/tests/ui/unique/unique-decl-init.rs
diff --git a/src/test/ui/unique/unique-decl-move.rs b/tests/ui/unique/unique-decl-move.rs
index 21187510f..21187510f 100644
--- a/src/test/ui/unique/unique-decl-move.rs
+++ b/tests/ui/unique/unique-decl-move.rs
diff --git a/src/test/ui/unique/unique-decl.rs b/tests/ui/unique/unique-decl.rs
index 84a1b2a5b..84a1b2a5b 100644
--- a/src/test/ui/unique/unique-decl.rs
+++ b/tests/ui/unique/unique-decl.rs
diff --git a/src/test/ui/unique/unique-deref.rs b/tests/ui/unique/unique-deref.rs
index 33a1e9932..33a1e9932 100644
--- a/src/test/ui/unique/unique-deref.rs
+++ b/tests/ui/unique/unique-deref.rs
diff --git a/src/test/ui/unique/unique-destructure.rs b/tests/ui/unique/unique-destructure.rs
index 7207ac962..7207ac962 100644
--- a/src/test/ui/unique/unique-destructure.rs
+++ b/tests/ui/unique/unique-destructure.rs
diff --git a/src/test/ui/unique/unique-drop-complex.rs b/tests/ui/unique/unique-drop-complex.rs
index 2324f1e1a..2324f1e1a 100644
--- a/src/test/ui/unique/unique-drop-complex.rs
+++ b/tests/ui/unique/unique-drop-complex.rs
diff --git a/src/test/ui/unique/unique-ffi-symbols.rs b/tests/ui/unique/unique-ffi-symbols.rs
index 77b5ead26..77b5ead26 100644
--- a/src/test/ui/unique/unique-ffi-symbols.rs
+++ b/tests/ui/unique/unique-ffi-symbols.rs
diff --git a/src/test/ui/unique/unique-fn-arg-move.rs b/tests/ui/unique/unique-fn-arg-move.rs
index 6d42df218..6d42df218 100644
--- a/src/test/ui/unique/unique-fn-arg-move.rs
+++ b/tests/ui/unique/unique-fn-arg-move.rs
diff --git a/src/test/ui/unique/unique-fn-arg-mut.rs b/tests/ui/unique/unique-fn-arg-mut.rs
index 01510200b..01510200b 100644
--- a/src/test/ui/unique/unique-fn-arg-mut.rs
+++ b/tests/ui/unique/unique-fn-arg-mut.rs
diff --git a/src/test/ui/unique/unique-fn-arg.rs b/tests/ui/unique/unique-fn-arg.rs
index b4f3bc4b2..b4f3bc4b2 100644
--- a/src/test/ui/unique/unique-fn-arg.rs
+++ b/tests/ui/unique/unique-fn-arg.rs
diff --git a/src/test/ui/unique/unique-fn-ret.rs b/tests/ui/unique/unique-fn-ret.rs
index 773a9bce1..773a9bce1 100644
--- a/src/test/ui/unique/unique-fn-ret.rs
+++ b/tests/ui/unique/unique-fn-ret.rs
diff --git a/src/test/ui/unique/unique-generic-assign.rs b/tests/ui/unique/unique-generic-assign.rs
index 9c4405aa8..9c4405aa8 100644
--- a/src/test/ui/unique/unique-generic-assign.rs
+++ b/tests/ui/unique/unique-generic-assign.rs
diff --git a/src/test/ui/unique/unique-in-tag.rs b/tests/ui/unique/unique-in-tag.rs
index 6daa06fb1..6daa06fb1 100644
--- a/src/test/ui/unique/unique-in-tag.rs
+++ b/tests/ui/unique/unique-in-tag.rs
diff --git a/src/test/ui/unique/unique-in-vec-copy.rs b/tests/ui/unique/unique-in-vec-copy.rs
index ce52d15ef..ce52d15ef 100644
--- a/src/test/ui/unique/unique-in-vec-copy.rs
+++ b/tests/ui/unique/unique-in-vec-copy.rs
diff --git a/src/test/ui/unique/unique-in-vec.rs b/tests/ui/unique/unique-in-vec.rs
index 1e8d05e3d..1e8d05e3d 100644
--- a/src/test/ui/unique/unique-in-vec.rs
+++ b/tests/ui/unique/unique-in-vec.rs
diff --git a/src/test/ui/unique/unique-init.rs b/tests/ui/unique/unique-init.rs
index d19605046..d19605046 100644
--- a/src/test/ui/unique/unique-init.rs
+++ b/tests/ui/unique/unique-init.rs
diff --git a/src/test/ui/unique/unique-kinds.rs b/tests/ui/unique/unique-kinds.rs
index f02d0b507..f02d0b507 100644
--- a/src/test/ui/unique/unique-kinds.rs
+++ b/tests/ui/unique/unique-kinds.rs
diff --git a/src/test/ui/unique/unique-log.rs b/tests/ui/unique/unique-log.rs
index 0715d1662..0715d1662 100644
--- a/src/test/ui/unique/unique-log.rs
+++ b/tests/ui/unique/unique-log.rs
diff --git a/src/test/ui/unique/unique-match-discrim.rs b/tests/ui/unique/unique-match-discrim.rs
index 6e6d74322..6e6d74322 100644
--- a/src/test/ui/unique/unique-match-discrim.rs
+++ b/tests/ui/unique/unique-match-discrim.rs
diff --git a/src/test/ui/unique/unique-move-drop.rs b/tests/ui/unique/unique-move-drop.rs
index c0f5d8f90..c0f5d8f90 100644
--- a/src/test/ui/unique/unique-move-drop.rs
+++ b/tests/ui/unique/unique-move-drop.rs
diff --git a/src/test/ui/unique/unique-move-temp.rs b/tests/ui/unique/unique-move-temp.rs
index 103af8e1f..103af8e1f 100644
--- a/src/test/ui/unique/unique-move-temp.rs
+++ b/tests/ui/unique/unique-move-temp.rs
diff --git a/src/test/ui/unique/unique-move.rs b/tests/ui/unique/unique-move.rs
index 40a2718e4..40a2718e4 100644
--- a/src/test/ui/unique/unique-move.rs
+++ b/tests/ui/unique/unique-move.rs
diff --git a/src/test/ui/unique/unique-mutable.rs b/tests/ui/unique/unique-mutable.rs
index 0367c0809..0367c0809 100644
--- a/src/test/ui/unique/unique-mutable.rs
+++ b/tests/ui/unique/unique-mutable.rs
diff --git a/src/test/ui/unique/unique-object-move.rs b/tests/ui/unique/unique-object-move.rs
index bb35a9b2d..bb35a9b2d 100644
--- a/src/test/ui/unique/unique-object-move.rs
+++ b/tests/ui/unique/unique-object-move.rs
diff --git a/src/test/ui/unique/unique-pat-2.rs b/tests/ui/unique/unique-pat-2.rs
index 9c73fd220..9c73fd220 100644
--- a/src/test/ui/unique/unique-pat-2.rs
+++ b/tests/ui/unique/unique-pat-2.rs
diff --git a/src/test/ui/unique/unique-pat-3.rs b/tests/ui/unique/unique-pat-3.rs
index 2e81f898d..2e81f898d 100644
--- a/src/test/ui/unique/unique-pat-3.rs
+++ b/tests/ui/unique/unique-pat-3.rs
diff --git a/src/test/ui/unique/unique-pat.rs b/tests/ui/unique/unique-pat.rs
index c2474d0e7..c2474d0e7 100644
--- a/src/test/ui/unique/unique-pat.rs
+++ b/tests/ui/unique/unique-pat.rs
diff --git a/src/test/ui/unique/unique-rec.rs b/tests/ui/unique/unique-rec.rs
index 9f8ad9bb0..9f8ad9bb0 100644
--- a/src/test/ui/unique/unique-rec.rs
+++ b/tests/ui/unique/unique-rec.rs
diff --git a/src/test/ui/unique/unique-send-2.rs b/tests/ui/unique/unique-send-2.rs
index 23ddd2cdc..23ddd2cdc 100644
--- a/src/test/ui/unique/unique-send-2.rs
+++ b/tests/ui/unique/unique-send-2.rs
diff --git a/src/test/ui/unique/unique-send.rs b/tests/ui/unique/unique-send.rs
index 431cc2be5..431cc2be5 100644
--- a/src/test/ui/unique/unique-send.rs
+++ b/tests/ui/unique/unique-send.rs
diff --git a/src/test/ui/unique/unique-swap.rs b/tests/ui/unique/unique-swap.rs
index 4f33ff9a8..4f33ff9a8 100644
--- a/src/test/ui/unique/unique-swap.rs
+++ b/tests/ui/unique/unique-swap.rs
diff --git a/src/test/ui/unit.rs b/tests/ui/unit.rs
index 4f2dd4194..4f2dd4194 100644
--- a/src/test/ui/unit.rs
+++ b/tests/ui/unit.rs
diff --git a/src/test/ui/unknown-language-item.rs b/tests/ui/unknown-language-item.rs
index 20ffef714..20ffef714 100644
--- a/src/test/ui/unknown-language-item.rs
+++ b/tests/ui/unknown-language-item.rs
diff --git a/src/test/ui/unknown-language-item.stderr b/tests/ui/unknown-language-item.stderr
index c5fe9b8ad..c5fe9b8ad 100644
--- a/src/test/ui/unknown-language-item.stderr
+++ b/tests/ui/unknown-language-item.stderr
diff --git a/src/test/ui/unknown-lint-tool-name.rs b/tests/ui/unknown-lint-tool-name.rs
index cd5d2f028..cd5d2f028 100644
--- a/src/test/ui/unknown-lint-tool-name.rs
+++ b/tests/ui/unknown-lint-tool-name.rs
diff --git a/src/test/ui/unknown-lint-tool-name.stderr b/tests/ui/unknown-lint-tool-name.stderr
index 5f8349ce6..5f8349ce6 100644
--- a/src/test/ui/unknown-lint-tool-name.stderr
+++ b/tests/ui/unknown-lint-tool-name.stderr
diff --git a/src/test/ui/unknown-llvm-arg.rs b/tests/ui/unknown-llvm-arg.rs
index 289bae24f..289bae24f 100644
--- a/src/test/ui/unknown-llvm-arg.rs
+++ b/tests/ui/unknown-llvm-arg.rs
diff --git a/src/test/ui/unknown-llvm-arg.stderr b/tests/ui/unknown-llvm-arg.stderr
index e1d3cfea2..e1d3cfea2 100644
--- a/src/test/ui/unknown-llvm-arg.stderr
+++ b/tests/ui/unknown-llvm-arg.stderr
diff --git a/src/test/ui/unknown-tool-name.rs b/tests/ui/unknown-tool-name.rs
index 73fca61c6..73fca61c6 100644
--- a/src/test/ui/unknown-tool-name.rs
+++ b/tests/ui/unknown-tool-name.rs
diff --git a/src/test/ui/unknown-tool-name.stderr b/tests/ui/unknown-tool-name.stderr
index 4a1370ba8..4a1370ba8 100644
--- a/src/test/ui/unknown-tool-name.stderr
+++ b/tests/ui/unknown-tool-name.stderr
diff --git a/src/test/ui/unknown-unstable-lints/allow-unknown-unstable-lint-command-line.rs b/tests/ui/unknown-unstable-lints/allow-unknown-unstable-lint-command-line.rs
index 80e30f239..80e30f239 100644
--- a/src/test/ui/unknown-unstable-lints/allow-unknown-unstable-lint-command-line.rs
+++ b/tests/ui/unknown-unstable-lints/allow-unknown-unstable-lint-command-line.rs
diff --git a/src/test/ui/unknown-unstable-lints/allow-unknown-unstable-lint-inline.rs b/tests/ui/unknown-unstable-lints/allow-unknown-unstable-lint-inline.rs
index 992472c89..992472c89 100644
--- a/src/test/ui/unknown-unstable-lints/allow-unknown-unstable-lint-inline.rs
+++ b/tests/ui/unknown-unstable-lints/allow-unknown-unstable-lint-inline.rs
diff --git a/src/test/ui/unknown-unstable-lints/deny-unstable-lint-command-line.rs b/tests/ui/unknown-unstable-lints/deny-unstable-lint-command-line.rs
index dcc06850d..dcc06850d 100644
--- a/src/test/ui/unknown-unstable-lints/deny-unstable-lint-command-line.rs
+++ b/tests/ui/unknown-unstable-lints/deny-unstable-lint-command-line.rs
diff --git a/src/test/ui/unknown-unstable-lints/deny-unstable-lint-command-line.stderr b/tests/ui/unknown-unstable-lints/deny-unstable-lint-command-line.stderr
index aa73b824a..aa73b824a 100644
--- a/src/test/ui/unknown-unstable-lints/deny-unstable-lint-command-line.stderr
+++ b/tests/ui/unknown-unstable-lints/deny-unstable-lint-command-line.stderr
diff --git a/src/test/ui/unknown-unstable-lints/deny-unstable-lint-inline.rs b/tests/ui/unknown-unstable-lints/deny-unstable-lint-inline.rs
index c6c60b12d..c6c60b12d 100644
--- a/src/test/ui/unknown-unstable-lints/deny-unstable-lint-inline.rs
+++ b/tests/ui/unknown-unstable-lints/deny-unstable-lint-inline.rs
diff --git a/src/test/ui/unknown-unstable-lints/deny-unstable-lint-inline.stderr b/tests/ui/unknown-unstable-lints/deny-unstable-lint-inline.stderr
index 2a2a9811b..2a2a9811b 100644
--- a/src/test/ui/unknown-unstable-lints/deny-unstable-lint-inline.stderr
+++ b/tests/ui/unknown-unstable-lints/deny-unstable-lint-inline.stderr
diff --git a/src/test/ui/unknown-unstable-lints/warn-unknown-unstable-lint-command-line.rs b/tests/ui/unknown-unstable-lints/warn-unknown-unstable-lint-command-line.rs
index 3778291eb..3778291eb 100644
--- a/src/test/ui/unknown-unstable-lints/warn-unknown-unstable-lint-command-line.rs
+++ b/tests/ui/unknown-unstable-lints/warn-unknown-unstable-lint-command-line.rs
diff --git a/src/test/ui/unknown-unstable-lints/warn-unknown-unstable-lint-command-line.stderr b/tests/ui/unknown-unstable-lints/warn-unknown-unstable-lint-command-line.stderr
index 82851c800..82851c800 100644
--- a/src/test/ui/unknown-unstable-lints/warn-unknown-unstable-lint-command-line.stderr
+++ b/tests/ui/unknown-unstable-lints/warn-unknown-unstable-lint-command-line.stderr
diff --git a/src/test/ui/unknown-unstable-lints/warn-unknown-unstable-lint-inline.rs b/tests/ui/unknown-unstable-lints/warn-unknown-unstable-lint-inline.rs
index f4247e456..f4247e456 100644
--- a/src/test/ui/unknown-unstable-lints/warn-unknown-unstable-lint-inline.rs
+++ b/tests/ui/unknown-unstable-lints/warn-unknown-unstable-lint-inline.rs
diff --git a/src/test/ui/unknown-unstable-lints/warn-unknown-unstable-lint-inline.stderr b/tests/ui/unknown-unstable-lints/warn-unknown-unstable-lint-inline.stderr
index 0548cd226..0548cd226 100644
--- a/src/test/ui/unknown-unstable-lints/warn-unknown-unstable-lint-inline.stderr
+++ b/tests/ui/unknown-unstable-lints/warn-unknown-unstable-lint-inline.stderr
diff --git a/src/test/ui/unnamed_argument_mode.rs b/tests/ui/unnamed_argument_mode.rs
index 5b7b4002f..5b7b4002f 100644
--- a/src/test/ui/unnamed_argument_mode.rs
+++ b/tests/ui/unnamed_argument_mode.rs
diff --git a/src/test/ui/unop-move-semantics.rs b/tests/ui/unop-move-semantics.rs
index 8168da824..8168da824 100644
--- a/src/test/ui/unop-move-semantics.rs
+++ b/tests/ui/unop-move-semantics.rs
diff --git a/src/test/ui/unop-move-semantics.stderr b/tests/ui/unop-move-semantics.stderr
index d52a92b88..2a3ca1443 100644
--- a/src/test/ui/unop-move-semantics.stderr
+++ b/tests/ui/unop-move-semantics.stderr
@@ -11,9 +11,6 @@ LL |     x.clone();
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL |     fn not(self) -> Self::Output;
-   |            ^^^^
 help: consider cloning the value if the performance cost is acceptable
    |
 LL |     !x.clone();
@@ -57,9 +54,6 @@ LL |     !*m;
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL |     fn not(self) -> Self::Output;
-   |            ^^^^
 
 error[E0507]: cannot move out of `*n` which is behind a shared reference
   --> $DIR/unop-move-semantics.rs:26:6
diff --git a/src/test/ui/unop-neg-bool.rs b/tests/ui/unop-neg-bool.rs
index 6f1f1aba4..6f1f1aba4 100644
--- a/src/test/ui/unop-neg-bool.rs
+++ b/tests/ui/unop-neg-bool.rs
diff --git a/src/test/ui/unop-neg-bool.stderr b/tests/ui/unop-neg-bool.stderr
index 9913747b8..9913747b8 100644
--- a/src/test/ui/unop-neg-bool.stderr
+++ b/tests/ui/unop-neg-bool.stderr
diff --git a/src/test/ui/unpretty-expr-fn-arg.rs b/tests/ui/unpretty-expr-fn-arg.rs
index 6e1132a33..6e1132a33 100644
--- a/src/test/ui/unpretty-expr-fn-arg.rs
+++ b/tests/ui/unpretty-expr-fn-arg.rs
diff --git a/src/test/ui/unpretty-expr-fn-arg.stdout b/tests/ui/unpretty-expr-fn-arg.stdout
index b745b9886..b745b9886 100644
--- a/src/test/ui/unpretty-expr-fn-arg.stdout
+++ b/tests/ui/unpretty-expr-fn-arg.stdout
diff --git a/src/test/ui/unpretty/avoid-crash.rs b/tests/ui/unpretty/avoid-crash.rs
index fd84b70d9..fd84b70d9 100644
--- a/src/test/ui/unpretty/avoid-crash.rs
+++ b/tests/ui/unpretty/avoid-crash.rs
diff --git a/src/test/ui/unpretty/avoid-crash.stderr b/tests/ui/unpretty/avoid-crash.stderr
index 11cd3866f..11cd3866f 100644
--- a/src/test/ui/unpretty/avoid-crash.stderr
+++ b/tests/ui/unpretty/avoid-crash.stderr
diff --git a/src/test/ui/unpretty/bad-literal.rs b/tests/ui/unpretty/bad-literal.rs
index 6dcc0da30..6dcc0da30 100644
--- a/src/test/ui/unpretty/bad-literal.rs
+++ b/tests/ui/unpretty/bad-literal.rs
diff --git a/src/test/ui/unpretty/bad-literal.stderr b/tests/ui/unpretty/bad-literal.stderr
index f3fcb4a4e..f3fcb4a4e 100644
--- a/src/test/ui/unpretty/bad-literal.stderr
+++ b/tests/ui/unpretty/bad-literal.stderr
diff --git a/src/test/ui/unpretty/bad-literal.stdout b/tests/ui/unpretty/bad-literal.stdout
index 8df933270..8df933270 100644
--- a/src/test/ui/unpretty/bad-literal.stdout
+++ b/tests/ui/unpretty/bad-literal.stdout
diff --git a/src/test/ui/unpretty/pretty-let-else.rs b/tests/ui/unpretty/pretty-let-else.rs
index b5ae52969..b5ae52969 100644
--- a/src/test/ui/unpretty/pretty-let-else.rs
+++ b/tests/ui/unpretty/pretty-let-else.rs
diff --git a/src/test/ui/unpretty/pretty-let-else.stdout b/tests/ui/unpretty/pretty-let-else.stdout
index 35ad1cd1b..35ad1cd1b 100644
--- a/src/test/ui/unpretty/pretty-let-else.stdout
+++ b/tests/ui/unpretty/pretty-let-else.stdout
diff --git a/src/test/ui/unreachable-code-1.rs b/tests/ui/unreachable-code-1.rs
index ee44f3999..ee44f3999 100644
--- a/src/test/ui/unreachable-code-1.rs
+++ b/tests/ui/unreachable-code-1.rs
diff --git a/src/test/ui/unreachable-code.rs b/tests/ui/unreachable-code.rs
index 28b938edc..28b938edc 100644
--- a/src/test/ui/unreachable-code.rs
+++ b/tests/ui/unreachable-code.rs
diff --git a/src/test/ui/unresolved/unresolved-asterisk-imports.rs b/tests/ui/unresolved/unresolved-asterisk-imports.rs
index 2d853a66c..2d853a66c 100644
--- a/src/test/ui/unresolved/unresolved-asterisk-imports.rs
+++ b/tests/ui/unresolved/unresolved-asterisk-imports.rs
diff --git a/src/test/ui/unresolved/unresolved-asterisk-imports.stderr b/tests/ui/unresolved/unresolved-asterisk-imports.stderr
index 8df8eab34..8df8eab34 100644
--- a/src/test/ui/unresolved/unresolved-asterisk-imports.stderr
+++ b/tests/ui/unresolved/unresolved-asterisk-imports.stderr
diff --git a/src/test/ui/unresolved/unresolved-candidates.rs b/tests/ui/unresolved/unresolved-candidates.rs
index 38b227f60..38b227f60 100644
--- a/src/test/ui/unresolved/unresolved-candidates.rs
+++ b/tests/ui/unresolved/unresolved-candidates.rs
diff --git a/src/test/ui/unresolved/unresolved-candidates.stderr b/tests/ui/unresolved/unresolved-candidates.stderr
index bbd3eec2a..ea737c567 100644
--- a/src/test/ui/unresolved/unresolved-candidates.stderr
+++ b/tests/ui/unresolved/unresolved-candidates.stderr
@@ -7,7 +7,7 @@ LL |     use Trait;
 help: consider importing this trait instead
    |
 LL |     use a::Trait;
-   |         ~~~~~~~~~
+   |         ~~~~~~~~
 
 error[E0405]: cannot find trait `Trait` in this scope
   --> $DIR/unresolved-candidates.rs:10:10
diff --git a/src/test/ui/unresolved/unresolved-extern-mod-suggestion.rs b/tests/ui/unresolved/unresolved-extern-mod-suggestion.rs
index a1bf0f210..a1bf0f210 100644
--- a/src/test/ui/unresolved/unresolved-extern-mod-suggestion.rs
+++ b/tests/ui/unresolved/unresolved-extern-mod-suggestion.rs
diff --git a/src/test/ui/unresolved/unresolved-extern-mod-suggestion.stderr b/tests/ui/unresolved/unresolved-extern-mod-suggestion.stderr
index 28333228a..28333228a 100644
--- a/src/test/ui/unresolved/unresolved-extern-mod-suggestion.stderr
+++ b/tests/ui/unresolved/unresolved-extern-mod-suggestion.stderr
diff --git a/src/test/ui/unresolved/unresolved-import-recovery.rs b/tests/ui/unresolved/unresolved-import-recovery.rs
index 0b0653378..0b0653378 100644
--- a/src/test/ui/unresolved/unresolved-import-recovery.rs
+++ b/tests/ui/unresolved/unresolved-import-recovery.rs
diff --git a/src/test/ui/unresolved/unresolved-import-recovery.stderr b/tests/ui/unresolved/unresolved-import-recovery.stderr
index 5e371b70b..5e371b70b 100644
--- a/src/test/ui/unresolved/unresolved-import-recovery.stderr
+++ b/tests/ui/unresolved/unresolved-import-recovery.stderr
diff --git a/src/test/ui/unresolved/unresolved-import.rs b/tests/ui/unresolved/unresolved-import.rs
index 4125c593c..4125c593c 100644
--- a/src/test/ui/unresolved/unresolved-import.rs
+++ b/tests/ui/unresolved/unresolved-import.rs
diff --git a/src/test/ui/unresolved/unresolved-import.stderr b/tests/ui/unresolved/unresolved-import.stderr
index 0dd928c8b..0dd928c8b 100644
--- a/src/test/ui/unresolved/unresolved-import.stderr
+++ b/tests/ui/unresolved/unresolved-import.stderr
diff --git a/src/test/ui/unsafe-fn-called-from-unsafe-blk.rs b/tests/ui/unsafe-fn-called-from-unsafe-blk.rs
index 3713a7065..3713a7065 100644
--- a/src/test/ui/unsafe-fn-called-from-unsafe-blk.rs
+++ b/tests/ui/unsafe-fn-called-from-unsafe-blk.rs
diff --git a/src/test/ui/unsafe-fn-called-from-unsafe-fn.rs b/tests/ui/unsafe-fn-called-from-unsafe-fn.rs
index 5e9531076..5e9531076 100644
--- a/src/test/ui/unsafe-fn-called-from-unsafe-fn.rs
+++ b/tests/ui/unsafe-fn-called-from-unsafe-fn.rs
diff --git a/src/test/ui/unsafe-pointer-assignability.rs b/tests/ui/unsafe-pointer-assignability.rs
index db822bb6a..db822bb6a 100644
--- a/src/test/ui/unsafe-pointer-assignability.rs
+++ b/tests/ui/unsafe-pointer-assignability.rs
diff --git a/src/test/ui/unsafe/access_union_field.mir.stderr b/tests/ui/unsafe/access_union_field.mir.stderr
index 98bc40777..98bc40777 100644
--- a/src/test/ui/unsafe/access_union_field.mir.stderr
+++ b/tests/ui/unsafe/access_union_field.mir.stderr
diff --git a/src/test/ui/unsafe/access_union_field.rs b/tests/ui/unsafe/access_union_field.rs
index 5c4e695df..5c4e695df 100644
--- a/src/test/ui/unsafe/access_union_field.rs
+++ b/tests/ui/unsafe/access_union_field.rs
diff --git a/src/test/ui/unsafe/access_union_field.thir.stderr b/tests/ui/unsafe/access_union_field.thir.stderr
index 98bc40777..98bc40777 100644
--- a/src/test/ui/unsafe/access_union_field.thir.stderr
+++ b/tests/ui/unsafe/access_union_field.thir.stderr
diff --git a/tests/ui/unsafe/auxiliary/issue-106126.rs b/tests/ui/unsafe/auxiliary/issue-106126.rs
new file mode 100644
index 000000000..091a3edb7
--- /dev/null
+++ b/tests/ui/unsafe/auxiliary/issue-106126.rs
@@ -0,0 +1,9 @@
+#[macro_export]
+macro_rules! foo {
+    () => {
+        unsafe fn __unsf() {}
+        unsafe fn __foo() {
+            __unsf();
+        }
+    };
+}
diff --git a/src/test/ui/unsafe/inline_asm.mir.stderr b/tests/ui/unsafe/inline_asm.mir.stderr
index 633f1edb2..633f1edb2 100644
--- a/src/test/ui/unsafe/inline_asm.mir.stderr
+++ b/tests/ui/unsafe/inline_asm.mir.stderr
diff --git a/src/test/ui/unsafe/inline_asm.rs b/tests/ui/unsafe/inline_asm.rs
index 12c7efe4f..12c7efe4f 100644
--- a/src/test/ui/unsafe/inline_asm.rs
+++ b/tests/ui/unsafe/inline_asm.rs
diff --git a/src/test/ui/unsafe/inline_asm.thir.stderr b/tests/ui/unsafe/inline_asm.thir.stderr
index 633f1edb2..633f1edb2 100644
--- a/src/test/ui/unsafe/inline_asm.thir.stderr
+++ b/tests/ui/unsafe/inline_asm.thir.stderr
diff --git a/tests/ui/unsafe/issue-106126-good-path-bug.rs b/tests/ui/unsafe/issue-106126-good-path-bug.rs
new file mode 100644
index 000000000..93f478ee3
--- /dev/null
+++ b/tests/ui/unsafe/issue-106126-good-path-bug.rs
@@ -0,0 +1,12 @@
+// Regression test for #106126.
+// check-pass
+// aux-build:issue-106126.rs
+
+#![deny(unsafe_op_in_unsafe_fn)]
+
+#[macro_use]
+extern crate issue_106126;
+
+foo!();
+
+fn main() {}
diff --git a/src/test/ui/unsafe/issue-3080.mir.stderr b/tests/ui/unsafe/issue-3080.mir.stderr
index f395c30b8..f395c30b8 100644
--- a/src/test/ui/unsafe/issue-3080.mir.stderr
+++ b/tests/ui/unsafe/issue-3080.mir.stderr
diff --git a/src/test/ui/unsafe/issue-3080.rs b/tests/ui/unsafe/issue-3080.rs
index 2b5269dda..2b5269dda 100644
--- a/src/test/ui/unsafe/issue-3080.rs
+++ b/tests/ui/unsafe/issue-3080.rs
diff --git a/src/test/ui/unsafe/issue-3080.thir.stderr b/tests/ui/unsafe/issue-3080.thir.stderr
index 4d8acac61..4d8acac61 100644
--- a/src/test/ui/unsafe/issue-3080.thir.stderr
+++ b/tests/ui/unsafe/issue-3080.thir.stderr
diff --git a/src/test/ui/unsafe/issue-45087-unreachable-unsafe.mir.stderr b/tests/ui/unsafe/issue-45087-unreachable-unsafe.mir.stderr
index e79609607..e79609607 100644
--- a/src/test/ui/unsafe/issue-45087-unreachable-unsafe.mir.stderr
+++ b/tests/ui/unsafe/issue-45087-unreachable-unsafe.mir.stderr
diff --git a/src/test/ui/unsafe/issue-45087-unreachable-unsafe.rs b/tests/ui/unsafe/issue-45087-unreachable-unsafe.rs
index 3e3da667c..3e3da667c 100644
--- a/src/test/ui/unsafe/issue-45087-unreachable-unsafe.rs
+++ b/tests/ui/unsafe/issue-45087-unreachable-unsafe.rs
diff --git a/src/test/ui/unsafe/issue-45087-unreachable-unsafe.thir.stderr b/tests/ui/unsafe/issue-45087-unreachable-unsafe.thir.stderr
index e81adad45..e81adad45 100644
--- a/src/test/ui/unsafe/issue-45087-unreachable-unsafe.thir.stderr
+++ b/tests/ui/unsafe/issue-45087-unreachable-unsafe.thir.stderr
diff --git a/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.mir.stderr b/tests/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.mir.stderr
index 9e9cbcf33..9e9cbcf33 100644
--- a/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.mir.stderr
+++ b/tests/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.mir.stderr
diff --git a/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.rs b/tests/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.rs
index ac1cfd62a..ac1cfd62a 100644
--- a/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.rs
+++ b/tests/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.rs
diff --git a/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.thir.stderr b/tests/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.thir.stderr
index 9e9cbcf33..9e9cbcf33 100644
--- a/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.thir.stderr
+++ b/tests/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.thir.stderr
diff --git a/src/test/ui/unsafe/issue-47412.mir.stderr b/tests/ui/unsafe/issue-47412.mir.stderr
index 305f482e8..305f482e8 100644
--- a/src/test/ui/unsafe/issue-47412.mir.stderr
+++ b/tests/ui/unsafe/issue-47412.mir.stderr
diff --git a/src/test/ui/unsafe/issue-47412.rs b/tests/ui/unsafe/issue-47412.rs
index df6d6e422..df6d6e422 100644
--- a/src/test/ui/unsafe/issue-47412.rs
+++ b/tests/ui/unsafe/issue-47412.rs
diff --git a/src/test/ui/unsafe/issue-47412.thir.stderr b/tests/ui/unsafe/issue-47412.thir.stderr
index 305f482e8..305f482e8 100644
--- a/src/test/ui/unsafe/issue-47412.thir.stderr
+++ b/tests/ui/unsafe/issue-47412.thir.stderr
diff --git a/src/test/ui/unsafe/issue-85435-unsafe-op-in-let-under-unsafe-under-closure.rs b/tests/ui/unsafe/issue-85435-unsafe-op-in-let-under-unsafe-under-closure.rs
index 72f7b6747..72f7b6747 100644
--- a/src/test/ui/unsafe/issue-85435-unsafe-op-in-let-under-unsafe-under-closure.rs
+++ b/tests/ui/unsafe/issue-85435-unsafe-op-in-let-under-unsafe-under-closure.rs
diff --git a/src/test/ui/unsafe/issue-87414-query-cycle.rs b/tests/ui/unsafe/issue-87414-query-cycle.rs
index 99e40ba4b..99e40ba4b 100644
--- a/src/test/ui/unsafe/issue-87414-query-cycle.rs
+++ b/tests/ui/unsafe/issue-87414-query-cycle.rs
diff --git a/src/test/ui/unsafe/ranged_ints.mir.stderr b/tests/ui/unsafe/ranged_ints.mir.stderr
index f9ef7834e..f9ef7834e 100644
--- a/src/test/ui/unsafe/ranged_ints.mir.stderr
+++ b/tests/ui/unsafe/ranged_ints.mir.stderr
diff --git a/src/test/ui/unsafe/ranged_ints.rs b/tests/ui/unsafe/ranged_ints.rs
index 05efe87ba..05efe87ba 100644
--- a/src/test/ui/unsafe/ranged_ints.rs
+++ b/tests/ui/unsafe/ranged_ints.rs
diff --git a/src/test/ui/unsafe/ranged_ints.thir.stderr b/tests/ui/unsafe/ranged_ints.thir.stderr
index f9ef7834e..f9ef7834e 100644
--- a/src/test/ui/unsafe/ranged_ints.thir.stderr
+++ b/tests/ui/unsafe/ranged_ints.thir.stderr
diff --git a/src/test/ui/unsafe/ranged_ints2.mirunsafeck.stderr b/tests/ui/unsafe/ranged_ints2.mirunsafeck.stderr
index 427843f8d..427843f8d 100644
--- a/src/test/ui/unsafe/ranged_ints2.mirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints2.mirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints2.rs b/tests/ui/unsafe/ranged_ints2.rs
index 9a6bb18f9..9a6bb18f9 100644
--- a/src/test/ui/unsafe/ranged_ints2.rs
+++ b/tests/ui/unsafe/ranged_ints2.rs
diff --git a/src/test/ui/unsafe/ranged_ints2.thirunsafeck.stderr b/tests/ui/unsafe/ranged_ints2.thirunsafeck.stderr
index 427843f8d..427843f8d 100644
--- a/src/test/ui/unsafe/ranged_ints2.thirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints2.thirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints2_const.mirunsafeck.stderr b/tests/ui/unsafe/ranged_ints2_const.mirunsafeck.stderr
index c16550a58..c16550a58 100644
--- a/src/test/ui/unsafe/ranged_ints2_const.mirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints2_const.mirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints2_const.rs b/tests/ui/unsafe/ranged_ints2_const.rs
index 56f5407bb..56f5407bb 100644
--- a/src/test/ui/unsafe/ranged_ints2_const.rs
+++ b/tests/ui/unsafe/ranged_ints2_const.rs
diff --git a/src/test/ui/unsafe/ranged_ints2_const.thirunsafeck.stderr b/tests/ui/unsafe/ranged_ints2_const.thirunsafeck.stderr
index b3f139f72..b3f139f72 100644
--- a/src/test/ui/unsafe/ranged_ints2_const.thirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints2_const.thirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints3.mirunsafeck.stderr b/tests/ui/unsafe/ranged_ints3.mirunsafeck.stderr
index 9eec0b09e..9eec0b09e 100644
--- a/src/test/ui/unsafe/ranged_ints3.mirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints3.mirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints3.rs b/tests/ui/unsafe/ranged_ints3.rs
index 76d4bfe95..76d4bfe95 100644
--- a/src/test/ui/unsafe/ranged_ints3.rs
+++ b/tests/ui/unsafe/ranged_ints3.rs
diff --git a/src/test/ui/unsafe/ranged_ints3.thirunsafeck.stderr b/tests/ui/unsafe/ranged_ints3.thirunsafeck.stderr
index 9eec0b09e..9eec0b09e 100644
--- a/src/test/ui/unsafe/ranged_ints3.thirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints3.thirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints3_const.mirunsafeck.stderr b/tests/ui/unsafe/ranged_ints3_const.mirunsafeck.stderr
index 62df93330..62df93330 100644
--- a/src/test/ui/unsafe/ranged_ints3_const.mirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints3_const.mirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints3_const.rs b/tests/ui/unsafe/ranged_ints3_const.rs
index 637198d36..637198d36 100644
--- a/src/test/ui/unsafe/ranged_ints3_const.rs
+++ b/tests/ui/unsafe/ranged_ints3_const.rs
diff --git a/src/test/ui/unsafe/ranged_ints3_const.thirunsafeck.stderr b/tests/ui/unsafe/ranged_ints3_const.thirunsafeck.stderr
index 5dbc563aa..5dbc563aa 100644
--- a/src/test/ui/unsafe/ranged_ints3_const.thirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints3_const.thirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints3_match.mirunsafeck.stderr b/tests/ui/unsafe/ranged_ints3_match.mirunsafeck.stderr
index 27c066409..27c066409 100644
--- a/src/test/ui/unsafe/ranged_ints3_match.mirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints3_match.mirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints3_match.rs b/tests/ui/unsafe/ranged_ints3_match.rs
index d9fcf0bd6..d9fcf0bd6 100644
--- a/src/test/ui/unsafe/ranged_ints3_match.rs
+++ b/tests/ui/unsafe/ranged_ints3_match.rs
diff --git a/src/test/ui/unsafe/ranged_ints3_match.thirunsafeck.stderr b/tests/ui/unsafe/ranged_ints3_match.thirunsafeck.stderr
index 27c066409..27c066409 100644
--- a/src/test/ui/unsafe/ranged_ints3_match.thirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints3_match.thirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints4.mirunsafeck.stderr b/tests/ui/unsafe/ranged_ints4.mirunsafeck.stderr
index 493483d2c..493483d2c 100644
--- a/src/test/ui/unsafe/ranged_ints4.mirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints4.mirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints4.rs b/tests/ui/unsafe/ranged_ints4.rs
index fe80af454..fe80af454 100644
--- a/src/test/ui/unsafe/ranged_ints4.rs
+++ b/tests/ui/unsafe/ranged_ints4.rs
diff --git a/src/test/ui/unsafe/ranged_ints4.thirunsafeck.stderr b/tests/ui/unsafe/ranged_ints4.thirunsafeck.stderr
index 493483d2c..493483d2c 100644
--- a/src/test/ui/unsafe/ranged_ints4.thirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints4.thirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints4_const.mirunsafeck.stderr b/tests/ui/unsafe/ranged_ints4_const.mirunsafeck.stderr
index a06c6f479..a06c6f479 100644
--- a/src/test/ui/unsafe/ranged_ints4_const.mirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints4_const.mirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints4_const.rs b/tests/ui/unsafe/ranged_ints4_const.rs
index a43c8be71..a43c8be71 100644
--- a/src/test/ui/unsafe/ranged_ints4_const.rs
+++ b/tests/ui/unsafe/ranged_ints4_const.rs
diff --git a/src/test/ui/unsafe/ranged_ints4_const.thirunsafeck.stderr b/tests/ui/unsafe/ranged_ints4_const.thirunsafeck.stderr
index a06c6f479..a06c6f479 100644
--- a/src/test/ui/unsafe/ranged_ints4_const.thirunsafeck.stderr
+++ b/tests/ui/unsafe/ranged_ints4_const.thirunsafeck.stderr
diff --git a/src/test/ui/unsafe/ranged_ints_const.mir.stderr b/tests/ui/unsafe/ranged_ints_const.mir.stderr
index 33d134c7c..33d134c7c 100644
--- a/src/test/ui/unsafe/ranged_ints_const.mir.stderr
+++ b/tests/ui/unsafe/ranged_ints_const.mir.stderr
diff --git a/src/test/ui/unsafe/ranged_ints_const.rs b/tests/ui/unsafe/ranged_ints_const.rs
index 472b09681..472b09681 100644
--- a/src/test/ui/unsafe/ranged_ints_const.rs
+++ b/tests/ui/unsafe/ranged_ints_const.rs
diff --git a/src/test/ui/unsafe/ranged_ints_const.thir.stderr b/tests/ui/unsafe/ranged_ints_const.thir.stderr
index 33d134c7c..33d134c7c 100644
--- a/src/test/ui/unsafe/ranged_ints_const.thir.stderr
+++ b/tests/ui/unsafe/ranged_ints_const.thir.stderr
diff --git a/src/test/ui/unsafe/ranged_ints_macro.rs b/tests/ui/unsafe/ranged_ints_macro.rs
index 8293d0299..8293d0299 100644
--- a/src/test/ui/unsafe/ranged_ints_macro.rs
+++ b/tests/ui/unsafe/ranged_ints_macro.rs
diff --git a/src/test/ui/unsafe/rfc-2585-unsafe_op_in_unsafe_fn.mir.stderr b/tests/ui/unsafe/rfc-2585-unsafe_op_in_unsafe_fn.mir.stderr
index 6f005fe89..6f005fe89 100644
--- a/src/test/ui/unsafe/rfc-2585-unsafe_op_in_unsafe_fn.mir.stderr
+++ b/tests/ui/unsafe/rfc-2585-unsafe_op_in_unsafe_fn.mir.stderr
diff --git a/src/test/ui/unsafe/rfc-2585-unsafe_op_in_unsafe_fn.rs b/tests/ui/unsafe/rfc-2585-unsafe_op_in_unsafe_fn.rs
index db1e916a3..db1e916a3 100644
--- a/src/test/ui/unsafe/rfc-2585-unsafe_op_in_unsafe_fn.rs
+++ b/tests/ui/unsafe/rfc-2585-unsafe_op_in_unsafe_fn.rs
diff --git a/src/test/ui/unsafe/rfc-2585-unsafe_op_in_unsafe_fn.thir.stderr b/tests/ui/unsafe/rfc-2585-unsafe_op_in_unsafe_fn.thir.stderr
index 13c080e5b..13c080e5b 100644
--- a/src/test/ui/unsafe/rfc-2585-unsafe_op_in_unsafe_fn.thir.stderr
+++ b/tests/ui/unsafe/rfc-2585-unsafe_op_in_unsafe_fn.thir.stderr
diff --git a/src/test/ui/unsafe/union-assignop.mirunsafeck.stderr b/tests/ui/unsafe/union-assignop.mirunsafeck.stderr
index 0ecd5203d..0ecd5203d 100644
--- a/src/test/ui/unsafe/union-assignop.mirunsafeck.stderr
+++ b/tests/ui/unsafe/union-assignop.mirunsafeck.stderr
diff --git a/src/test/ui/unsafe/union-assignop.rs b/tests/ui/unsafe/union-assignop.rs
index 5e667cd10..5e667cd10 100644
--- a/src/test/ui/unsafe/union-assignop.rs
+++ b/tests/ui/unsafe/union-assignop.rs
diff --git a/src/test/ui/unsafe/union-assignop.thirunsafeck.stderr b/tests/ui/unsafe/union-assignop.thirunsafeck.stderr
index 24b357e76..24b357e76 100644
--- a/src/test/ui/unsafe/union-assignop.thirunsafeck.stderr
+++ b/tests/ui/unsafe/union-assignop.thirunsafeck.stderr
diff --git a/src/test/ui/unsafe/union-modification.rs b/tests/ui/unsafe/union-modification.rs
index 9a53ef908..9a53ef908 100644
--- a/src/test/ui/unsafe/union-modification.rs
+++ b/tests/ui/unsafe/union-modification.rs
diff --git a/src/test/ui/unsafe/union.mir.stderr b/tests/ui/unsafe/union.mir.stderr
index 787714cdd..787714cdd 100644
--- a/src/test/ui/unsafe/union.mir.stderr
+++ b/tests/ui/unsafe/union.mir.stderr
diff --git a/src/test/ui/unsafe/union.rs b/tests/ui/unsafe/union.rs
index 4338d78ea..4338d78ea 100644
--- a/src/test/ui/unsafe/union.rs
+++ b/tests/ui/unsafe/union.rs
diff --git a/src/test/ui/unsafe/union.thir.stderr b/tests/ui/unsafe/union.thir.stderr
index e1a1bd634..e1a1bd634 100644
--- a/src/test/ui/unsafe/union.thir.stderr
+++ b/tests/ui/unsafe/union.thir.stderr
diff --git a/src/test/ui/unsafe/union_access_through_block.rs b/tests/ui/unsafe/union_access_through_block.rs
index e4c0976b8..e4c0976b8 100644
--- a/src/test/ui/unsafe/union_access_through_block.rs
+++ b/tests/ui/unsafe/union_access_through_block.rs
diff --git a/src/test/ui/unsafe/union_destructure.mir.stderr b/tests/ui/unsafe/union_destructure.mir.stderr
index 818f5ce03..818f5ce03 100644
--- a/src/test/ui/unsafe/union_destructure.mir.stderr
+++ b/tests/ui/unsafe/union_destructure.mir.stderr
diff --git a/src/test/ui/unsafe/union_destructure.rs b/tests/ui/unsafe/union_destructure.rs
index 6c88344b5..6c88344b5 100644
--- a/src/test/ui/unsafe/union_destructure.rs
+++ b/tests/ui/unsafe/union_destructure.rs
diff --git a/src/test/ui/unsafe/union_wild_or_wild.rs b/tests/ui/unsafe/union_wild_or_wild.rs
index 52a0a7abf..52a0a7abf 100644
--- a/src/test/ui/unsafe/union_wild_or_wild.rs
+++ b/tests/ui/unsafe/union_wild_or_wild.rs
diff --git a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.mir.stderr b/tests/ui/unsafe/unsafe-around-compiler-generated-unsafe.mir.stderr
index 62199e5a2..62199e5a2 100644
--- a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.mir.stderr
+++ b/tests/ui/unsafe/unsafe-around-compiler-generated-unsafe.mir.stderr
diff --git a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.rs b/tests/ui/unsafe/unsafe-around-compiler-generated-unsafe.rs
index c1a327640..c1a327640 100644
--- a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.rs
+++ b/tests/ui/unsafe/unsafe-around-compiler-generated-unsafe.rs
diff --git a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.thir.stderr b/tests/ui/unsafe/unsafe-around-compiler-generated-unsafe.thir.stderr
index 62199e5a2..62199e5a2 100644
--- a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.thir.stderr
+++ b/tests/ui/unsafe/unsafe-around-compiler-generated-unsafe.thir.stderr
diff --git a/src/test/ui/unsafe/unsafe-assign.mirunsafeck.stderr b/tests/ui/unsafe/unsafe-assign.mirunsafeck.stderr
index 9abc51424..9abc51424 100644
--- a/src/test/ui/unsafe/unsafe-assign.mirunsafeck.stderr
+++ b/tests/ui/unsafe/unsafe-assign.mirunsafeck.stderr
diff --git a/src/test/ui/unsafe/unsafe-assign.rs b/tests/ui/unsafe/unsafe-assign.rs
index 15273165b..15273165b 100644
--- a/src/test/ui/unsafe/unsafe-assign.rs
+++ b/tests/ui/unsafe/unsafe-assign.rs
diff --git a/src/test/ui/unsafe/unsafe-assign.thirunsafeck.stderr b/tests/ui/unsafe/unsafe-assign.thirunsafeck.stderr
index 9abc51424..9abc51424 100644
--- a/src/test/ui/unsafe/unsafe-assign.thirunsafeck.stderr
+++ b/tests/ui/unsafe/unsafe-assign.thirunsafeck.stderr
diff --git a/src/test/ui/unsafe/unsafe-block-without-braces.rs b/tests/ui/unsafe/unsafe-block-without-braces.rs
index 4e4611618..4e4611618 100644
--- a/src/test/ui/unsafe/unsafe-block-without-braces.rs
+++ b/tests/ui/unsafe/unsafe-block-without-braces.rs
diff --git a/src/test/ui/unsafe/unsafe-block-without-braces.stderr b/tests/ui/unsafe/unsafe-block-without-braces.stderr
index 44f77b99c..44f77b99c 100644
--- a/src/test/ui/unsafe/unsafe-block-without-braces.stderr
+++ b/tests/ui/unsafe/unsafe-block-without-braces.stderr
diff --git a/src/test/ui/unsafe/unsafe-borrow.mirunsafeck.stderr b/tests/ui/unsafe/unsafe-borrow.mirunsafeck.stderr
index a20672249..a20672249 100644
--- a/src/test/ui/unsafe/unsafe-borrow.mirunsafeck.stderr
+++ b/tests/ui/unsafe/unsafe-borrow.mirunsafeck.stderr
diff --git a/src/test/ui/unsafe/unsafe-borrow.rs b/tests/ui/unsafe/unsafe-borrow.rs
index 8dddc70be..8dddc70be 100644
--- a/src/test/ui/unsafe/unsafe-borrow.rs
+++ b/tests/ui/unsafe/unsafe-borrow.rs
diff --git a/src/test/ui/unsafe/unsafe-borrow.thirunsafeck.stderr b/tests/ui/unsafe/unsafe-borrow.thirunsafeck.stderr
index a20672249..a20672249 100644
--- a/src/test/ui/unsafe/unsafe-borrow.thirunsafeck.stderr
+++ b/tests/ui/unsafe/unsafe-borrow.thirunsafeck.stderr
diff --git a/src/test/ui/unsafe/unsafe-const-fn.mir.stderr b/tests/ui/unsafe/unsafe-const-fn.mir.stderr
index 3031be720..3031be720 100644
--- a/src/test/ui/unsafe/unsafe-const-fn.mir.stderr
+++ b/tests/ui/unsafe/unsafe-const-fn.mir.stderr
diff --git a/src/test/ui/unsafe/unsafe-const-fn.rs b/tests/ui/unsafe/unsafe-const-fn.rs
index 65e3acf30..65e3acf30 100644
--- a/src/test/ui/unsafe/unsafe-const-fn.rs
+++ b/tests/ui/unsafe/unsafe-const-fn.rs
diff --git a/src/test/ui/unsafe/unsafe-const-fn.thir.stderr b/tests/ui/unsafe/unsafe-const-fn.thir.stderr
index 1a77adf44..1a77adf44 100644
--- a/src/test/ui/unsafe/unsafe-const-fn.thir.stderr
+++ b/tests/ui/unsafe/unsafe-const-fn.thir.stderr
diff --git a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.mir.stderr b/tests/ui/unsafe/unsafe-fn-assign-deref-ptr.mir.stderr
index fee645e41..fee645e41 100644
--- a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.mir.stderr
+++ b/tests/ui/unsafe/unsafe-fn-assign-deref-ptr.mir.stderr
diff --git a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs b/tests/ui/unsafe/unsafe-fn-assign-deref-ptr.rs
index a94e94375..a94e94375 100644
--- a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs
+++ b/tests/ui/unsafe/unsafe-fn-assign-deref-ptr.rs
diff --git a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.thir.stderr b/tests/ui/unsafe/unsafe-fn-assign-deref-ptr.thir.stderr
index bbe4a415b..bbe4a415b 100644
--- a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.thir.stderr
+++ b/tests/ui/unsafe/unsafe-fn-assign-deref-ptr.thir.stderr
diff --git a/src/test/ui/unsafe/unsafe-fn-autoderef.rs b/tests/ui/unsafe/unsafe-fn-autoderef.rs
index 60460fc6e..60460fc6e 100644
--- a/src/test/ui/unsafe/unsafe-fn-autoderef.rs
+++ b/tests/ui/unsafe/unsafe-fn-autoderef.rs
diff --git a/src/test/ui/unsafe/unsafe-fn-autoderef.stderr b/tests/ui/unsafe/unsafe-fn-autoderef.stderr
index 20a88c356..20a88c356 100644
--- a/src/test/ui/unsafe/unsafe-fn-autoderef.stderr
+++ b/tests/ui/unsafe/unsafe-fn-autoderef.stderr
diff --git a/src/test/ui/unsafe/unsafe-fn-called-from-safe.mir.stderr b/tests/ui/unsafe/unsafe-fn-called-from-safe.mir.stderr
index 1d6fa4cbf..1d6fa4cbf 100644
--- a/src/test/ui/unsafe/unsafe-fn-called-from-safe.mir.stderr
+++ b/tests/ui/unsafe/unsafe-fn-called-from-safe.mir.stderr
diff --git a/src/test/ui/unsafe/unsafe-fn-called-from-safe.rs b/tests/ui/unsafe/unsafe-fn-called-from-safe.rs
index 55072dcc6..55072dcc6 100644
--- a/src/test/ui/unsafe/unsafe-fn-called-from-safe.rs
+++ b/tests/ui/unsafe/unsafe-fn-called-from-safe.rs
diff --git a/src/test/ui/unsafe/unsafe-fn-called-from-safe.thir.stderr b/tests/ui/unsafe/unsafe-fn-called-from-safe.thir.stderr
index 206dbd90a..206dbd90a 100644
--- a/src/test/ui/unsafe/unsafe-fn-called-from-safe.thir.stderr
+++ b/tests/ui/unsafe/unsafe-fn-called-from-safe.thir.stderr
diff --git a/src/test/ui/unsafe/unsafe-fn-deref-ptr.mir.stderr b/tests/ui/unsafe/unsafe-fn-deref-ptr.mir.stderr
index a26149924..a26149924 100644
--- a/src/test/ui/unsafe/unsafe-fn-deref-ptr.mir.stderr
+++ b/tests/ui/unsafe/unsafe-fn-deref-ptr.mir.stderr
diff --git a/src/test/ui/unsafe/unsafe-fn-deref-ptr.rs b/tests/ui/unsafe/unsafe-fn-deref-ptr.rs
index dc989535b..dc989535b 100644
--- a/src/test/ui/unsafe/unsafe-fn-deref-ptr.rs
+++ b/tests/ui/unsafe/unsafe-fn-deref-ptr.rs
diff --git a/src/test/ui/unsafe/unsafe-fn-deref-ptr.thir.stderr b/tests/ui/unsafe/unsafe-fn-deref-ptr.thir.stderr
index a26149924..a26149924 100644
--- a/src/test/ui/unsafe/unsafe-fn-deref-ptr.thir.stderr
+++ b/tests/ui/unsafe/unsafe-fn-deref-ptr.thir.stderr
diff --git a/src/test/ui/unsafe/unsafe-fn-used-as-value.mir.stderr b/tests/ui/unsafe/unsafe-fn-used-as-value.mir.stderr
index b08a7109d..b08a7109d 100644
--- a/src/test/ui/unsafe/unsafe-fn-used-as-value.mir.stderr
+++ b/tests/ui/unsafe/unsafe-fn-used-as-value.mir.stderr
diff --git a/src/test/ui/unsafe/unsafe-fn-used-as-value.rs b/tests/ui/unsafe/unsafe-fn-used-as-value.rs
index 9517598c7..9517598c7 100644
--- a/src/test/ui/unsafe/unsafe-fn-used-as-value.rs
+++ b/tests/ui/unsafe/unsafe-fn-used-as-value.rs
diff --git a/src/test/ui/unsafe/unsafe-fn-used-as-value.thir.stderr b/tests/ui/unsafe/unsafe-fn-used-as-value.thir.stderr
index e81dd3b2b..e81dd3b2b 100644
--- a/src/test/ui/unsafe/unsafe-fn-used-as-value.thir.stderr
+++ b/tests/ui/unsafe/unsafe-fn-used-as-value.thir.stderr
diff --git a/src/test/ui/unsafe/unsafe-not-inherited.rs b/tests/ui/unsafe/unsafe-not-inherited.rs
index 6d797caa0..6d797caa0 100644
--- a/src/test/ui/unsafe/unsafe-not-inherited.rs
+++ b/tests/ui/unsafe/unsafe-not-inherited.rs
diff --git a/src/test/ui/unsafe/unsafe-not-inherited.stderr b/tests/ui/unsafe/unsafe-not-inherited.stderr
index 3bc5ca5c9..3bc5ca5c9 100644
--- a/src/test/ui/unsafe/unsafe-not-inherited.stderr
+++ b/tests/ui/unsafe/unsafe-not-inherited.stderr
diff --git a/src/test/ui/unsafe/unsafe-subtyping.rs b/tests/ui/unsafe/unsafe-subtyping.rs
index a4b748a50..a4b748a50 100644
--- a/src/test/ui/unsafe/unsafe-subtyping.rs
+++ b/tests/ui/unsafe/unsafe-subtyping.rs
diff --git a/src/test/ui/unsafe/unsafe-subtyping.stderr b/tests/ui/unsafe/unsafe-subtyping.stderr
index 2db7cc312..2db7cc312 100644
--- a/src/test/ui/unsafe/unsafe-subtyping.stderr
+++ b/tests/ui/unsafe/unsafe-subtyping.stderr
diff --git a/tests/ui/unsafe/unsafe-trait-impl.rs b/tests/ui/unsafe/unsafe-trait-impl.rs
new file mode 100644
index 000000000..1fc84ca02
--- /dev/null
+++ b/tests/ui/unsafe/unsafe-trait-impl.rs
@@ -0,0 +1,14 @@
+// Check that safe fns are not a subtype of unsafe fns.
+
+trait Foo {
+    unsafe fn len(&self) -> u32;
+}
+
+impl Foo for u32 {
+    fn len(&self) -> u32 { *self }
+    //~^ ERROR method `len` has an incompatible type for trait
+    //~| expected signature `unsafe fn(&u32) -> _`
+    //~| found signature `fn(&u32) -> _`
+}
+
+fn main() { }
diff --git a/src/test/ui/unsafe/unsafe-trait-impl.stderr b/tests/ui/unsafe/unsafe-trait-impl.stderr
index 8a0cba1fa..18ba79404 100644
--- a/src/test/ui/unsafe/unsafe-trait-impl.stderr
+++ b/tests/ui/unsafe/unsafe-trait-impl.stderr
@@ -9,8 +9,8 @@ note: type in trait
    |
 LL |     unsafe fn len(&self) -> u32;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   = note: expected fn pointer `unsafe fn(&u32) -> _`
-              found fn pointer `fn(&u32) -> _`
+   = note: expected signature `unsafe fn(&u32) -> _`
+              found signature `fn(&u32) -> _`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/unsafe/unsafe-unstable-const-fn.mir.stderr b/tests/ui/unsafe/unsafe-unstable-const-fn.mir.stderr
index dcb84a80c..dcb84a80c 100644
--- a/src/test/ui/unsafe/unsafe-unstable-const-fn.mir.stderr
+++ b/tests/ui/unsafe/unsafe-unstable-const-fn.mir.stderr
diff --git a/src/test/ui/unsafe/unsafe-unstable-const-fn.rs b/tests/ui/unsafe/unsafe-unstable-const-fn.rs
index 581b15cdf..581b15cdf 100644
--- a/src/test/ui/unsafe/unsafe-unstable-const-fn.rs
+++ b/tests/ui/unsafe/unsafe-unstable-const-fn.rs
diff --git a/src/test/ui/unsafe/unsafe-unstable-const-fn.thir.stderr b/tests/ui/unsafe/unsafe-unstable-const-fn.thir.stderr
index dcb84a80c..dcb84a80c 100644
--- a/src/test/ui/unsafe/unsafe-unstable-const-fn.thir.stderr
+++ b/tests/ui/unsafe/unsafe-unstable-const-fn.thir.stderr
diff --git a/src/test/ui/unsigned-literal-negation.rs b/tests/ui/unsigned-literal-negation.rs
index 943c7f797..943c7f797 100644
--- a/src/test/ui/unsigned-literal-negation.rs
+++ b/tests/ui/unsigned-literal-negation.rs
diff --git a/src/test/ui/unsigned-literal-negation.stderr b/tests/ui/unsigned-literal-negation.stderr
index 0aaa8c3b7..0aaa8c3b7 100644
--- a/src/test/ui/unsigned-literal-negation.stderr
+++ b/tests/ui/unsigned-literal-negation.stderr
diff --git a/src/test/ui/unsized-locals/autoderef.rs b/tests/ui/unsized-locals/autoderef.rs
index 5dd5898c1..5dd5898c1 100644
--- a/src/test/ui/unsized-locals/autoderef.rs
+++ b/tests/ui/unsized-locals/autoderef.rs
diff --git a/src/test/ui/unsized-locals/auxiliary/ufuncs.rs b/tests/ui/unsized-locals/auxiliary/ufuncs.rs
index 5954abf3a..5954abf3a 100644
--- a/src/test/ui/unsized-locals/auxiliary/ufuncs.rs
+++ b/tests/ui/unsized-locals/auxiliary/ufuncs.rs
diff --git a/src/test/ui/unsized-locals/borrow-after-move.rs b/tests/ui/unsized-locals/borrow-after-move.rs
index ad73b720f..ad73b720f 100644
--- a/src/test/ui/unsized-locals/borrow-after-move.rs
+++ b/tests/ui/unsized-locals/borrow-after-move.rs
diff --git a/src/test/ui/unsized-locals/borrow-after-move.stderr b/tests/ui/unsized-locals/borrow-after-move.stderr
index d8bffd4f9..9e3c345dd 100644
--- a/src/test/ui/unsized-locals/borrow-after-move.stderr
+++ b/tests/ui/unsized-locals/borrow-after-move.stderr
@@ -59,7 +59,7 @@ LL |         y.foo();
 LL |         println!("{}", &y);
    |                        ^^ value borrowed here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `y`
+note: `Foo::foo` takes ownership of the receiver `self`, which moves `y`
   --> $DIR/borrow-after-move.rs:5:12
    |
 LL |     fn foo(self) -> String;
diff --git a/src/test/ui/unsized-locals/box-fnonce.rs b/tests/ui/unsized-locals/box-fnonce.rs
index 8b2f9b4c9..8b2f9b4c9 100644
--- a/src/test/ui/unsized-locals/box-fnonce.rs
+++ b/tests/ui/unsized-locals/box-fnonce.rs
diff --git a/src/test/ui/unsized-locals/by-value-trait-object-safety-rpass.rs b/tests/ui/unsized-locals/by-value-trait-object-safety-rpass.rs
index b9881defa..b9881defa 100644
--- a/src/test/ui/unsized-locals/by-value-trait-object-safety-rpass.rs
+++ b/tests/ui/unsized-locals/by-value-trait-object-safety-rpass.rs
diff --git a/src/test/ui/unsized-locals/by-value-trait-object-safety-withdefault.rs b/tests/ui/unsized-locals/by-value-trait-object-safety-withdefault.rs
index 957991f85..957991f85 100644
--- a/src/test/ui/unsized-locals/by-value-trait-object-safety-withdefault.rs
+++ b/tests/ui/unsized-locals/by-value-trait-object-safety-withdefault.rs
diff --git a/src/test/ui/unsized-locals/by-value-trait-object-safety.rs b/tests/ui/unsized-locals/by-value-trait-object-safety.rs
index d0ba6944a..d0ba6944a 100644
--- a/src/test/ui/unsized-locals/by-value-trait-object-safety.rs
+++ b/tests/ui/unsized-locals/by-value-trait-object-safety.rs
diff --git a/src/test/ui/unsized-locals/by-value-trait-object-safety.stderr b/tests/ui/unsized-locals/by-value-trait-object-safety.stderr
index 4f13ec7ac..4f13ec7ac 100644
--- a/src/test/ui/unsized-locals/by-value-trait-object-safety.stderr
+++ b/tests/ui/unsized-locals/by-value-trait-object-safety.stderr
diff --git a/src/test/ui/unsized-locals/double-move.rs b/tests/ui/unsized-locals/double-move.rs
index 9e46ef9be..9e46ef9be 100644
--- a/src/test/ui/unsized-locals/double-move.rs
+++ b/tests/ui/unsized-locals/double-move.rs
diff --git a/src/test/ui/unsized-locals/double-move.stderr b/tests/ui/unsized-locals/double-move.stderr
index 715348181..49b906bbe 100644
--- a/src/test/ui/unsized-locals/double-move.stderr
+++ b/tests/ui/unsized-locals/double-move.stderr
@@ -55,7 +55,7 @@ LL |         y.foo();
 LL |         y.foo();
    |         ^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `y`
+note: `Foo::foo` takes ownership of the receiver `self`, which moves `y`
   --> $DIR/double-move.rs:5:12
    |
 LL |     fn foo(self) -> String;
diff --git a/src/test/ui/unsized-locals/issue-30276-feature-flagged.rs b/tests/ui/unsized-locals/issue-30276-feature-flagged.rs
index 635d34f82..635d34f82 100644
--- a/src/test/ui/unsized-locals/issue-30276-feature-flagged.rs
+++ b/tests/ui/unsized-locals/issue-30276-feature-flagged.rs
diff --git a/src/test/ui/unsized-locals/issue-30276-feature-flagged.stderr b/tests/ui/unsized-locals/issue-30276-feature-flagged.stderr
index b6002cf89..b6002cf89 100644
--- a/src/test/ui/unsized-locals/issue-30276-feature-flagged.stderr
+++ b/tests/ui/unsized-locals/issue-30276-feature-flagged.stderr
diff --git a/src/test/ui/unsized-locals/issue-30276.rs b/tests/ui/unsized-locals/issue-30276.rs
index 9c4bf062a..9c4bf062a 100644
--- a/src/test/ui/unsized-locals/issue-30276.rs
+++ b/tests/ui/unsized-locals/issue-30276.rs
diff --git a/src/test/ui/unsized-locals/issue-30276.stderr b/tests/ui/unsized-locals/issue-30276.stderr
index 8cccbd792..8cccbd792 100644
--- a/src/test/ui/unsized-locals/issue-30276.stderr
+++ b/tests/ui/unsized-locals/issue-30276.stderr
diff --git a/src/test/ui/unsized-locals/issue-50940-with-feature.rs b/tests/ui/unsized-locals/issue-50940-with-feature.rs
index 63b0e830b..63b0e830b 100644
--- a/src/test/ui/unsized-locals/issue-50940-with-feature.rs
+++ b/tests/ui/unsized-locals/issue-50940-with-feature.rs
diff --git a/src/test/ui/unsized-locals/issue-50940-with-feature.stderr b/tests/ui/unsized-locals/issue-50940-with-feature.stderr
index 8bbe317ec..8bbe317ec 100644
--- a/src/test/ui/unsized-locals/issue-50940-with-feature.stderr
+++ b/tests/ui/unsized-locals/issue-50940-with-feature.stderr
diff --git a/src/test/ui/unsized-locals/issue-50940.rs b/tests/ui/unsized-locals/issue-50940.rs
index 7ba809b7e..7ba809b7e 100644
--- a/src/test/ui/unsized-locals/issue-50940.rs
+++ b/tests/ui/unsized-locals/issue-50940.rs
diff --git a/src/test/ui/unsized-locals/issue-50940.stderr b/tests/ui/unsized-locals/issue-50940.stderr
index 8f09b460e..8f09b460e 100644
--- a/src/test/ui/unsized-locals/issue-50940.stderr
+++ b/tests/ui/unsized-locals/issue-50940.stderr
diff --git a/src/test/ui/unsized-locals/reference-unsized-locals.rs b/tests/ui/unsized-locals/reference-unsized-locals.rs
index 4e887f327..4e887f327 100644
--- a/src/test/ui/unsized-locals/reference-unsized-locals.rs
+++ b/tests/ui/unsized-locals/reference-unsized-locals.rs
diff --git a/src/test/ui/unsized-locals/simple-unsized-locals.rs b/tests/ui/unsized-locals/simple-unsized-locals.rs
index 02b7c299a..02b7c299a 100644
--- a/src/test/ui/unsized-locals/simple-unsized-locals.rs
+++ b/tests/ui/unsized-locals/simple-unsized-locals.rs
diff --git a/tests/ui/unsized-locals/suggest-borrow.rs b/tests/ui/unsized-locals/suggest-borrow.rs
new file mode 100644
index 000000000..086948579
--- /dev/null
+++ b/tests/ui/unsized-locals/suggest-borrow.rs
@@ -0,0 +1,7 @@
+fn main() {
+    let x: [u8] = vec!(1, 2, 3)[..]; //~ ERROR E0277
+    let x: &[u8] = vec!(1, 2, 3)[..]; //~ ERROR E0308
+    let x: [u8] = &vec!(1, 2, 3)[..]; //~ ERROR E0308
+    //~^ ERROR E0277
+    let x: &[u8] = &vec!(1, 2, 3)[..];
+}
diff --git a/tests/ui/unsized-locals/suggest-borrow.stderr b/tests/ui/unsized-locals/suggest-borrow.stderr
new file mode 100644
index 000000000..08745eab2
--- /dev/null
+++ b/tests/ui/unsized-locals/suggest-borrow.stderr
@@ -0,0 +1,60 @@
+error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
+  --> $DIR/suggest-borrow.rs:2:9
+   |
+LL |     let x: [u8] = vec!(1, 2, 3)[..];
+   |         ^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `[u8]`
+   = note: all local variables must have a statically known size
+   = help: unsized locals are gated as an unstable feature
+help: consider borrowing here
+   |
+LL |     let x: &[u8] = vec!(1, 2, 3)[..];
+   |            +
+
+error[E0308]: mismatched types
+  --> $DIR/suggest-borrow.rs:3:20
+   |
+LL |     let x: &[u8] = vec!(1, 2, 3)[..];
+   |            -----   ^^^^^^^^^^^^^^^^^
+   |            |       |
+   |            |       expected `&[u8]`, found slice `[{integer}]`
+   |            |       help: consider borrowing here: `&vec!(1, 2, 3)[..]`
+   |            expected due to this
+
+error[E0308]: mismatched types
+  --> $DIR/suggest-borrow.rs:4:19
+   |
+LL |     let x: [u8] = &vec!(1, 2, 3)[..];
+   |            ----   ^^^^^^^^^^^^^^^^^^ expected slice `[u8]`, found `&[{integer}]`
+   |            |
+   |            expected due to this
+   |
+help: consider removing the borrow
+   |
+LL -     let x: [u8] = &vec!(1, 2, 3)[..];
+LL +     let x: [u8] = vec!(1, 2, 3)[..];
+   |
+help: alternatively, consider changing the type annotation
+   |
+LL |     let x: &[u8] = &vec!(1, 2, 3)[..];
+   |            +
+
+error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
+  --> $DIR/suggest-borrow.rs:4:9
+   |
+LL |     let x: [u8] = &vec!(1, 2, 3)[..];
+   |         ^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `[u8]`
+   = note: all local variables must have a statically known size
+   = help: unsized locals are gated as an unstable feature
+help: consider borrowing here
+   |
+LL |     let x: &[u8] = &vec!(1, 2, 3)[..];
+   |            +
+
+error: aborting due to 4 previous errors
+
+Some errors have detailed explanations: E0277, E0308.
+For more information about an error, try `rustc --explain E0277`.
diff --git a/src/test/ui/unsized-locals/unsized-exprs-rpass.rs b/tests/ui/unsized-locals/unsized-exprs-rpass.rs
index 175b02fcb..175b02fcb 100644
--- a/src/test/ui/unsized-locals/unsized-exprs-rpass.rs
+++ b/tests/ui/unsized-locals/unsized-exprs-rpass.rs
diff --git a/src/test/ui/unsized-locals/unsized-exprs.rs b/tests/ui/unsized-locals/unsized-exprs.rs
index 1729b9ffa..1729b9ffa 100644
--- a/src/test/ui/unsized-locals/unsized-exprs.rs
+++ b/tests/ui/unsized-locals/unsized-exprs.rs
diff --git a/src/test/ui/unsized-locals/unsized-exprs.stderr b/tests/ui/unsized-locals/unsized-exprs.stderr
index a7f57e3fd..a7f57e3fd 100644
--- a/src/test/ui/unsized-locals/unsized-exprs.stderr
+++ b/tests/ui/unsized-locals/unsized-exprs.stderr
diff --git a/src/test/ui/unsized-locals/unsized-exprs2.rs b/tests/ui/unsized-locals/unsized-exprs2.rs
index 127d8717e..127d8717e 100644
--- a/src/test/ui/unsized-locals/unsized-exprs2.rs
+++ b/tests/ui/unsized-locals/unsized-exprs2.rs
diff --git a/src/test/ui/unsized-locals/unsized-exprs2.stderr b/tests/ui/unsized-locals/unsized-exprs2.stderr
index 88269f237..88269f237 100644
--- a/src/test/ui/unsized-locals/unsized-exprs2.stderr
+++ b/tests/ui/unsized-locals/unsized-exprs2.stderr
diff --git a/src/test/ui/unsized-locals/unsized-exprs3.rs b/tests/ui/unsized-locals/unsized-exprs3.rs
index 2133b01e0..2133b01e0 100644
--- a/src/test/ui/unsized-locals/unsized-exprs3.rs
+++ b/tests/ui/unsized-locals/unsized-exprs3.rs
diff --git a/src/test/ui/unsized-locals/unsized-exprs3.stderr b/tests/ui/unsized-locals/unsized-exprs3.stderr
index 57d997822..57d997822 100644
--- a/src/test/ui/unsized-locals/unsized-exprs3.stderr
+++ b/tests/ui/unsized-locals/unsized-exprs3.stderr
diff --git a/src/test/ui/unsized-locals/unsized-index.rs b/tests/ui/unsized-locals/unsized-index.rs
index e8782e894..e8782e894 100644
--- a/src/test/ui/unsized-locals/unsized-index.rs
+++ b/tests/ui/unsized-locals/unsized-index.rs
diff --git a/src/test/ui/unsized-locals/unsized-locals-using-unsized-fn-params.rs b/tests/ui/unsized-locals/unsized-locals-using-unsized-fn-params.rs
index 15263954c..15263954c 100644
--- a/src/test/ui/unsized-locals/unsized-locals-using-unsized-fn-params.rs
+++ b/tests/ui/unsized-locals/unsized-locals-using-unsized-fn-params.rs
diff --git a/src/test/ui/unsized-locals/unsized-locals-using-unsized-fn-params.stderr b/tests/ui/unsized-locals/unsized-locals-using-unsized-fn-params.stderr
index da7702667..ace5a8718 100644
--- a/src/test/ui/unsized-locals/unsized-locals-using-unsized-fn-params.stderr
+++ b/tests/ui/unsized-locals/unsized-locals-using-unsized-fn-params.stderr
@@ -27,6 +27,10 @@ LL |     let _foo: [u8] = *foo;
    = help: the trait `Sized` is not implemented for `[u8]`
    = note: all local variables must have a statically known size
    = help: unsized locals are gated as an unstable feature
+help: consider borrowing here
+   |
+LL |     let _foo: &[u8] = *foo;
+   |               +
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/unsized-locals/unsized-parameters.rs b/tests/ui/unsized-locals/unsized-parameters.rs
index a1b772a7e..a1b772a7e 100644
--- a/src/test/ui/unsized-locals/unsized-parameters.rs
+++ b/tests/ui/unsized-locals/unsized-parameters.rs
diff --git a/src/test/ui/unsized/box-instead-of-dyn-fn.rs b/tests/ui/unsized/box-instead-of-dyn-fn.rs
index 2fa741bc1..2fa741bc1 100644
--- a/src/test/ui/unsized/box-instead-of-dyn-fn.rs
+++ b/tests/ui/unsized/box-instead-of-dyn-fn.rs
diff --git a/src/test/ui/unsized/box-instead-of-dyn-fn.stderr b/tests/ui/unsized/box-instead-of-dyn-fn.stderr
index c96c59afc..c96c59afc 100644
--- a/src/test/ui/unsized/box-instead-of-dyn-fn.stderr
+++ b/tests/ui/unsized/box-instead-of-dyn-fn.stderr
diff --git a/src/test/ui/unsized/issue-30355.rs b/tests/ui/unsized/issue-30355.rs
index 6ff5b37f6..6ff5b37f6 100644
--- a/src/test/ui/unsized/issue-30355.rs
+++ b/tests/ui/unsized/issue-30355.rs
diff --git a/src/test/ui/unsized/issue-30355.stderr b/tests/ui/unsized/issue-30355.stderr
index 71bbdf5de..71bbdf5de 100644
--- a/src/test/ui/unsized/issue-30355.stderr
+++ b/tests/ui/unsized/issue-30355.stderr
diff --git a/src/test/ui/unsized/issue-40231-1.rs b/tests/ui/unsized/issue-40231-1.rs
index 999399ec8..999399ec8 100644
--- a/src/test/ui/unsized/issue-40231-1.rs
+++ b/tests/ui/unsized/issue-40231-1.rs
diff --git a/src/test/ui/unsized/issue-40231-2.rs b/tests/ui/unsized/issue-40231-2.rs
index 780433b28..780433b28 100644
--- a/src/test/ui/unsized/issue-40231-2.rs
+++ b/tests/ui/unsized/issue-40231-2.rs
diff --git a/src/test/ui/unsized/issue-71659.rs b/tests/ui/unsized/issue-71659.rs
index 3524ca02b..3524ca02b 100644
--- a/src/test/ui/unsized/issue-71659.rs
+++ b/tests/ui/unsized/issue-71659.rs
diff --git a/tests/ui/unsized/issue-71659.stderr b/tests/ui/unsized/issue-71659.stderr
new file mode 100644
index 000000000..d7b95f557
--- /dev/null
+++ b/tests/ui/unsized/issue-71659.stderr
@@ -0,0 +1,18 @@
+error[E0277]: the trait bound `dyn Foo: CastTo<[i32]>` is not satisfied
+  --> $DIR/issue-71659.rs:30:15
+   |
+LL |     let x = x.cast::<[i32]>();
+   |               ^^^^ the trait `CastTo<[i32]>` is not implemented for `dyn Foo`
+   |
+note: required by a bound in `Cast::cast`
+  --> $DIR/issue-71659.rs:19:15
+   |
+LL |     fn cast<T: ?Sized>(&self) -> &T
+   |        ---- required by a bound in this
+LL |     where
+LL |         Self: CastTo<T>,
+   |               ^^^^^^^^^ required by this bound in `Cast::cast`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/unsized/issue-75707.rs b/tests/ui/unsized/issue-75707.rs
index 9f04cdbb9..9f04cdbb9 100644
--- a/src/test/ui/unsized/issue-75707.rs
+++ b/tests/ui/unsized/issue-75707.rs
diff --git a/src/test/ui/unsized/issue-75707.stderr b/tests/ui/unsized/issue-75707.stderr
index 97618ed05..97618ed05 100644
--- a/src/test/ui/unsized/issue-75707.stderr
+++ b/tests/ui/unsized/issue-75707.stderr
diff --git a/src/test/ui/unsized/issue-75899-but-gats.rs b/tests/ui/unsized/issue-75899-but-gats.rs
index 5716817f4..5716817f4 100644
--- a/src/test/ui/unsized/issue-75899-but-gats.rs
+++ b/tests/ui/unsized/issue-75899-but-gats.rs
diff --git a/src/test/ui/unsized/issue-75899.rs b/tests/ui/unsized/issue-75899.rs
index abff17e11..abff17e11 100644
--- a/src/test/ui/unsized/issue-75899.rs
+++ b/tests/ui/unsized/issue-75899.rs
diff --git a/src/test/ui/unsized/issue-91801.rs b/tests/ui/unsized/issue-91801.rs
index 096b1a935..096b1a935 100644
--- a/src/test/ui/unsized/issue-91801.rs
+++ b/tests/ui/unsized/issue-91801.rs
diff --git a/src/test/ui/unsized/issue-91801.stderr b/tests/ui/unsized/issue-91801.stderr
index 8795aa168..8795aa168 100644
--- a/src/test/ui/unsized/issue-91801.stderr
+++ b/tests/ui/unsized/issue-91801.stderr
diff --git a/src/test/ui/unsized/issue-91803.rs b/tests/ui/unsized/issue-91803.rs
index c74897cc4..c74897cc4 100644
--- a/src/test/ui/unsized/issue-91803.rs
+++ b/tests/ui/unsized/issue-91803.rs
diff --git a/src/test/ui/unsized/issue-91803.stderr b/tests/ui/unsized/issue-91803.stderr
index 2dad9e892..2dad9e892 100644
--- a/src/test/ui/unsized/issue-91803.stderr
+++ b/tests/ui/unsized/issue-91803.stderr
diff --git a/src/test/ui/unsized/issue-97732.rs b/tests/ui/unsized/issue-97732.rs
index 72f765033..72f765033 100644
--- a/src/test/ui/unsized/issue-97732.rs
+++ b/tests/ui/unsized/issue-97732.rs
diff --git a/src/test/ui/unsized/maybe-bounds-where-cpass.rs b/tests/ui/unsized/maybe-bounds-where-cpass.rs
index 0e018cdab..0e018cdab 100644
--- a/src/test/ui/unsized/maybe-bounds-where-cpass.rs
+++ b/tests/ui/unsized/maybe-bounds-where-cpass.rs
diff --git a/src/test/ui/unsized/maybe-bounds-where.rs b/tests/ui/unsized/maybe-bounds-where.rs
index d7af0c424..d7af0c424 100644
--- a/src/test/ui/unsized/maybe-bounds-where.rs
+++ b/tests/ui/unsized/maybe-bounds-where.rs
diff --git a/src/test/ui/unsized/maybe-bounds-where.stderr b/tests/ui/unsized/maybe-bounds-where.stderr
index 39bc1b88e..39bc1b88e 100644
--- a/src/test/ui/unsized/maybe-bounds-where.stderr
+++ b/tests/ui/unsized/maybe-bounds-where.stderr
diff --git a/src/test/ui/unsized/param-mentioned-by-different-field.rs b/tests/ui/unsized/param-mentioned-by-different-field.rs
index cda94b306..cda94b306 100644
--- a/src/test/ui/unsized/param-mentioned-by-different-field.rs
+++ b/tests/ui/unsized/param-mentioned-by-different-field.rs
diff --git a/src/test/ui/unsized/param-mentioned-by-different-field.stderr b/tests/ui/unsized/param-mentioned-by-different-field.stderr
index d18fa6456..d18fa6456 100644
--- a/src/test/ui/unsized/param-mentioned-by-different-field.stderr
+++ b/tests/ui/unsized/param-mentioned-by-different-field.stderr
diff --git a/src/test/ui/unsized/return-unsized-from-trait-method.rs b/tests/ui/unsized/return-unsized-from-trait-method.rs
index f053f4b0a..f053f4b0a 100644
--- a/src/test/ui/unsized/return-unsized-from-trait-method.rs
+++ b/tests/ui/unsized/return-unsized-from-trait-method.rs
diff --git a/src/test/ui/unsized/return-unsized-from-trait-method.stderr b/tests/ui/unsized/return-unsized-from-trait-method.stderr
index 671d40993..671d40993 100644
--- a/src/test/ui/unsized/return-unsized-from-trait-method.stderr
+++ b/tests/ui/unsized/return-unsized-from-trait-method.stderr
diff --git a/src/test/ui/unsized/unchanged-param.rs b/tests/ui/unsized/unchanged-param.rs
index 6bdc89310..6bdc89310 100644
--- a/src/test/ui/unsized/unchanged-param.rs
+++ b/tests/ui/unsized/unchanged-param.rs
diff --git a/src/test/ui/unsized/unsized-bare-typaram.rs b/tests/ui/unsized/unsized-bare-typaram.rs
index e611da915..e611da915 100644
--- a/src/test/ui/unsized/unsized-bare-typaram.rs
+++ b/tests/ui/unsized/unsized-bare-typaram.rs
diff --git a/src/test/ui/unsized/unsized-bare-typaram.stderr b/tests/ui/unsized/unsized-bare-typaram.stderr
index 1eff14be8..1eff14be8 100644
--- a/src/test/ui/unsized/unsized-bare-typaram.stderr
+++ b/tests/ui/unsized/unsized-bare-typaram.stderr
diff --git a/src/test/ui/unsized/unsized-enum.rs b/tests/ui/unsized/unsized-enum.rs
index 02ad1c878..02ad1c878 100644
--- a/src/test/ui/unsized/unsized-enum.rs
+++ b/tests/ui/unsized/unsized-enum.rs
diff --git a/src/test/ui/unsized/unsized-enum.stderr b/tests/ui/unsized/unsized-enum.stderr
index 5f2e22430..5f2e22430 100644
--- a/src/test/ui/unsized/unsized-enum.stderr
+++ b/tests/ui/unsized/unsized-enum.stderr
diff --git a/src/test/ui/unsized/unsized-enum2.rs b/tests/ui/unsized/unsized-enum2.rs
index d589f5ae5..d589f5ae5 100644
--- a/src/test/ui/unsized/unsized-enum2.rs
+++ b/tests/ui/unsized/unsized-enum2.rs
diff --git a/src/test/ui/unsized/unsized-enum2.stderr b/tests/ui/unsized/unsized-enum2.stderr
index 00b80327c..00b80327c 100644
--- a/src/test/ui/unsized/unsized-enum2.stderr
+++ b/tests/ui/unsized/unsized-enum2.stderr
diff --git a/src/test/ui/unsized/unsized-fn-arg.fixed b/tests/ui/unsized/unsized-fn-arg.fixed
index fd9b159a4..fd9b159a4 100644
--- a/src/test/ui/unsized/unsized-fn-arg.fixed
+++ b/tests/ui/unsized/unsized-fn-arg.fixed
diff --git a/src/test/ui/unsized/unsized-fn-arg.rs b/tests/ui/unsized/unsized-fn-arg.rs
index 9fc08bd6d..9fc08bd6d 100644
--- a/src/test/ui/unsized/unsized-fn-arg.rs
+++ b/tests/ui/unsized/unsized-fn-arg.rs
diff --git a/src/test/ui/unsized/unsized-fn-arg.stderr b/tests/ui/unsized/unsized-fn-arg.stderr
index 404fa5291..404fa5291 100644
--- a/src/test/ui/unsized/unsized-fn-arg.stderr
+++ b/tests/ui/unsized/unsized-fn-arg.stderr
diff --git a/src/test/ui/unsized/unsized-fn-param.rs b/tests/ui/unsized/unsized-fn-param.rs
index 32efc7e17..32efc7e17 100644
--- a/src/test/ui/unsized/unsized-fn-param.rs
+++ b/tests/ui/unsized/unsized-fn-param.rs
diff --git a/src/test/ui/unsized/unsized-fn-param.stderr b/tests/ui/unsized/unsized-fn-param.stderr
index b47726054..b47726054 100644
--- a/src/test/ui/unsized/unsized-fn-param.stderr
+++ b/tests/ui/unsized/unsized-fn-param.stderr
diff --git a/src/test/ui/unsized/unsized-inherent-impl-self-type.rs b/tests/ui/unsized/unsized-inherent-impl-self-type.rs
index 8bdf80c94..8bdf80c94 100644
--- a/src/test/ui/unsized/unsized-inherent-impl-self-type.rs
+++ b/tests/ui/unsized/unsized-inherent-impl-self-type.rs
diff --git a/src/test/ui/unsized/unsized-inherent-impl-self-type.stderr b/tests/ui/unsized/unsized-inherent-impl-self-type.stderr
index a952aa063..a952aa063 100644
--- a/src/test/ui/unsized/unsized-inherent-impl-self-type.stderr
+++ b/tests/ui/unsized/unsized-inherent-impl-self-type.stderr
diff --git a/src/test/ui/unsized/unsized-struct.rs b/tests/ui/unsized/unsized-struct.rs
index bfa5aa0a5..bfa5aa0a5 100644
--- a/src/test/ui/unsized/unsized-struct.rs
+++ b/tests/ui/unsized/unsized-struct.rs
diff --git a/src/test/ui/unsized/unsized-struct.stderr b/tests/ui/unsized/unsized-struct.stderr
index dff1b0a51..dff1b0a51 100644
--- a/src/test/ui/unsized/unsized-struct.stderr
+++ b/tests/ui/unsized/unsized-struct.stderr
diff --git a/src/test/ui/unsized/unsized-trait-impl-self-type.rs b/tests/ui/unsized/unsized-trait-impl-self-type.rs
index df571a833..df571a833 100644
--- a/src/test/ui/unsized/unsized-trait-impl-self-type.rs
+++ b/tests/ui/unsized/unsized-trait-impl-self-type.rs
diff --git a/src/test/ui/unsized/unsized-trait-impl-self-type.stderr b/tests/ui/unsized/unsized-trait-impl-self-type.stderr
index f6ba9a80c..f6ba9a80c 100644
--- a/src/test/ui/unsized/unsized-trait-impl-self-type.stderr
+++ b/tests/ui/unsized/unsized-trait-impl-self-type.stderr
diff --git a/src/test/ui/unsized/unsized-trait-impl-trait-arg.rs b/tests/ui/unsized/unsized-trait-impl-trait-arg.rs
index 96e7e371f..96e7e371f 100644
--- a/src/test/ui/unsized/unsized-trait-impl-trait-arg.rs
+++ b/tests/ui/unsized/unsized-trait-impl-trait-arg.rs
diff --git a/src/test/ui/unsized/unsized-trait-impl-trait-arg.stderr b/tests/ui/unsized/unsized-trait-impl-trait-arg.stderr
index f81487d52..f81487d52 100644
--- a/src/test/ui/unsized/unsized-trait-impl-trait-arg.stderr
+++ b/tests/ui/unsized/unsized-trait-impl-trait-arg.stderr
diff --git a/src/test/ui/unsized/unsized-tuple-impls.rs b/tests/ui/unsized/unsized-tuple-impls.rs
index 5e385f33b..5e385f33b 100644
--- a/src/test/ui/unsized/unsized-tuple-impls.rs
+++ b/tests/ui/unsized/unsized-tuple-impls.rs
diff --git a/src/test/ui/unsized/unsized.rs b/tests/ui/unsized/unsized.rs
index 54304834d..54304834d 100644
--- a/src/test/ui/unsized/unsized.rs
+++ b/tests/ui/unsized/unsized.rs
diff --git a/src/test/ui/unsized/unsized2.rs b/tests/ui/unsized/unsized2.rs
index bbeb00d5f..bbeb00d5f 100644
--- a/src/test/ui/unsized/unsized2.rs
+++ b/tests/ui/unsized/unsized2.rs
diff --git a/src/test/ui/unsized/unsized3-rpass.rs b/tests/ui/unsized/unsized3-rpass.rs
index 4d5e89575..4d5e89575 100644
--- a/src/test/ui/unsized/unsized3-rpass.rs
+++ b/tests/ui/unsized/unsized3-rpass.rs
diff --git a/src/test/ui/unsized/unsized3.rs b/tests/ui/unsized/unsized3.rs
index af76aca2c..af76aca2c 100644
--- a/src/test/ui/unsized/unsized3.rs
+++ b/tests/ui/unsized/unsized3.rs
diff --git a/src/test/ui/unsized/unsized3.stderr b/tests/ui/unsized/unsized3.stderr
index 9ad1ac6b4..9ad1ac6b4 100644
--- a/src/test/ui/unsized/unsized3.stderr
+++ b/tests/ui/unsized/unsized3.stderr
diff --git a/src/test/ui/unsized/unsized5.rs b/tests/ui/unsized/unsized5.rs
index befd2244d..befd2244d 100644
--- a/src/test/ui/unsized/unsized5.rs
+++ b/tests/ui/unsized/unsized5.rs
diff --git a/src/test/ui/unsized/unsized5.stderr b/tests/ui/unsized/unsized5.stderr
index 03ed0c457..03ed0c457 100644
--- a/src/test/ui/unsized/unsized5.stderr
+++ b/tests/ui/unsized/unsized5.stderr
diff --git a/src/test/ui/unsized/unsized6.rs b/tests/ui/unsized/unsized6.rs
index 79133554d..79133554d 100644
--- a/src/test/ui/unsized/unsized6.rs
+++ b/tests/ui/unsized/unsized6.rs
diff --git a/src/test/ui/unsized/unsized6.stderr b/tests/ui/unsized/unsized6.stderr
index 011f2b426..18ac1ea18 100644
--- a/src/test/ui/unsized/unsized6.stderr
+++ b/tests/ui/unsized/unsized6.stderr
@@ -14,6 +14,10 @@ help: consider removing the `?Sized` bound to make the type parameter `Sized`
 LL - fn f1<W: ?Sized, X: ?Sized, Y: ?Sized, Z: ?Sized>(x: &X) {
 LL + fn f1<W: ?Sized, X: ?Sized, Y, Z: ?Sized>(x: &X) {
    |
+help: consider borrowing here
+   |
+LL |     let y: &Y;
+   |            +
 
 error[E0277]: the size for values of type `X` cannot be known at compilation time
   --> $DIR/unsized6.rs:7:12
@@ -62,6 +66,10 @@ help: consider removing the `?Sized` bound to make the type parameter `Sized`
 LL - fn f2<X: ?Sized, Y: ?Sized>(x: &X) {
 LL + fn f2<X, Y: ?Sized>(x: &X) {
    |
+help: consider borrowing here
+   |
+LL |     let y: &X;
+   |            +
 
 error[E0277]: the size for values of type `Y` cannot be known at compilation time
   --> $DIR/unsized6.rs:17:12
@@ -94,6 +102,10 @@ help: consider removing the `?Sized` bound to make the type parameter `Sized`
 LL - fn f3<X: ?Sized>(x1: Box<X>, x2: Box<X>, x3: Box<X>) {
 LL + fn f3<X>(x1: Box<X>, x2: Box<X>, x3: Box<X>) {
    |
+help: consider borrowing here
+   |
+LL |     let y: &X = *x1;
+   |            +
 
 error[E0277]: the size for values of type `X` cannot be known at compilation time
   --> $DIR/unsized6.rs:24:9
@@ -144,6 +156,10 @@ help: consider removing the `?Sized` bound to make the type parameter `Sized`
 LL - fn f4<X: ?Sized + T>(x1: Box<X>, x2: Box<X>, x3: Box<X>) {
 LL + fn f4<X: T>(x1: Box<X>, x2: Box<X>, x3: Box<X>) {
    |
+help: consider borrowing here
+   |
+LL |     let y: &X = *x1;
+   |            +
 
 error[E0277]: the size for values of type `X` cannot be known at compilation time
   --> $DIR/unsized6.rs:32:9
diff --git a/src/test/ui/unsized/unsized7.rs b/tests/ui/unsized/unsized7.rs
index 422a78481..422a78481 100644
--- a/src/test/ui/unsized/unsized7.rs
+++ b/tests/ui/unsized/unsized7.rs
diff --git a/src/test/ui/unsized/unsized7.stderr b/tests/ui/unsized/unsized7.stderr
index 1555b9df4..1555b9df4 100644
--- a/src/test/ui/unsized/unsized7.stderr
+++ b/tests/ui/unsized/unsized7.stderr
diff --git a/src/test/ui/unterminated-comment.rs b/tests/ui/unterminated-comment.rs
index 1cfdfb1fb..1cfdfb1fb 100644
--- a/src/test/ui/unterminated-comment.rs
+++ b/tests/ui/unterminated-comment.rs
diff --git a/src/test/ui/unterminated-comment.stderr b/tests/ui/unterminated-comment.stderr
index c513fafee..c513fafee 100644
--- a/src/test/ui/unterminated-comment.stderr
+++ b/tests/ui/unterminated-comment.stderr
diff --git a/src/test/ui/unterminated-nested-comment.rs b/tests/ui/unterminated-nested-comment.rs
index db5f2f3ba..db5f2f3ba 100644
--- a/src/test/ui/unterminated-nested-comment.rs
+++ b/tests/ui/unterminated-nested-comment.rs
diff --git a/src/test/ui/unterminated-nested-comment.stderr b/tests/ui/unterminated-nested-comment.stderr
index 3653e76c9..3653e76c9 100644
--- a/src/test/ui/unterminated-nested-comment.stderr
+++ b/tests/ui/unterminated-nested-comment.stderr
diff --git a/src/test/ui/unused-crate-deps/auxiliary/bar.rs b/tests/ui/unused-crate-deps/auxiliary/bar.rs
index 1d3824e7a..1d3824e7a 100644
--- a/src/test/ui/unused-crate-deps/auxiliary/bar.rs
+++ b/tests/ui/unused-crate-deps/auxiliary/bar.rs
diff --git a/src/test/ui/unused-crate-deps/auxiliary/foo.rs b/tests/ui/unused-crate-deps/auxiliary/foo.rs
index 0ef03eb9e..0ef03eb9e 100644
--- a/src/test/ui/unused-crate-deps/auxiliary/foo.rs
+++ b/tests/ui/unused-crate-deps/auxiliary/foo.rs
diff --git a/src/test/ui/unused-crate-deps/deny-attr.rs b/tests/ui/unused-crate-deps/deny-attr.rs
index e9ab18ff6..e9ab18ff6 100644
--- a/src/test/ui/unused-crate-deps/deny-attr.rs
+++ b/tests/ui/unused-crate-deps/deny-attr.rs
diff --git a/src/test/ui/unused-crate-deps/deny-attr.stderr b/tests/ui/unused-crate-deps/deny-attr.stderr
index 93694f682..93694f682 100644
--- a/src/test/ui/unused-crate-deps/deny-attr.stderr
+++ b/tests/ui/unused-crate-deps/deny-attr.stderr
diff --git a/src/test/ui/unused-crate-deps/deny-cmdline-json-silent.rs b/tests/ui/unused-crate-deps/deny-cmdline-json-silent.rs
index fd9a61d6c..fd9a61d6c 100644
--- a/src/test/ui/unused-crate-deps/deny-cmdline-json-silent.rs
+++ b/tests/ui/unused-crate-deps/deny-cmdline-json-silent.rs
diff --git a/src/test/ui/unused-crate-deps/deny-cmdline-json-silent.stderr b/tests/ui/unused-crate-deps/deny-cmdline-json-silent.stderr
index 595619f3a..595619f3a 100644
--- a/src/test/ui/unused-crate-deps/deny-cmdline-json-silent.stderr
+++ b/tests/ui/unused-crate-deps/deny-cmdline-json-silent.stderr
diff --git a/src/test/ui/unused-crate-deps/deny-cmdline-json.rs b/tests/ui/unused-crate-deps/deny-cmdline-json.rs
index 2b369dee5..2b369dee5 100644
--- a/src/test/ui/unused-crate-deps/deny-cmdline-json.rs
+++ b/tests/ui/unused-crate-deps/deny-cmdline-json.rs
diff --git a/src/test/ui/unused-crate-deps/deny-cmdline-json.stderr b/tests/ui/unused-crate-deps/deny-cmdline-json.stderr
index 595619f3a..595619f3a 100644
--- a/src/test/ui/unused-crate-deps/deny-cmdline-json.stderr
+++ b/tests/ui/unused-crate-deps/deny-cmdline-json.stderr
diff --git a/src/test/ui/unused-crate-deps/deny-cmdline.rs b/tests/ui/unused-crate-deps/deny-cmdline.rs
index 69e28b331..69e28b331 100644
--- a/src/test/ui/unused-crate-deps/deny-cmdline.rs
+++ b/tests/ui/unused-crate-deps/deny-cmdline.rs
diff --git a/src/test/ui/unused-crate-deps/deny-cmdline.stderr b/tests/ui/unused-crate-deps/deny-cmdline.stderr
index 0951dc670..0951dc670 100644
--- a/src/test/ui/unused-crate-deps/deny-cmdline.stderr
+++ b/tests/ui/unused-crate-deps/deny-cmdline.stderr
diff --git a/src/test/ui/unused-crate-deps/ignore-pathless-extern.rs b/tests/ui/unused-crate-deps/ignore-pathless-extern.rs
index 8c273cb53..8c273cb53 100644
--- a/src/test/ui/unused-crate-deps/ignore-pathless-extern.rs
+++ b/tests/ui/unused-crate-deps/ignore-pathless-extern.rs
diff --git a/src/test/ui/unused-crate-deps/libfib.rs b/tests/ui/unused-crate-deps/libfib.rs
index c1545dca9..c1545dca9 100644
--- a/src/test/ui/unused-crate-deps/libfib.rs
+++ b/tests/ui/unused-crate-deps/libfib.rs
diff --git a/src/test/ui/unused-crate-deps/libfib.stderr b/tests/ui/unused-crate-deps/libfib.stderr
index 15833126b..15833126b 100644
--- a/src/test/ui/unused-crate-deps/libfib.stderr
+++ b/tests/ui/unused-crate-deps/libfib.stderr
diff --git a/src/test/ui/unused-crate-deps/lint-group.rs b/tests/ui/unused-crate-deps/lint-group.rs
index e21ffb5de..e21ffb5de 100644
--- a/src/test/ui/unused-crate-deps/lint-group.rs
+++ b/tests/ui/unused-crate-deps/lint-group.rs
diff --git a/src/test/ui/unused-crate-deps/suppress.rs b/tests/ui/unused-crate-deps/suppress.rs
index 8904d04bc..8904d04bc 100644
--- a/src/test/ui/unused-crate-deps/suppress.rs
+++ b/tests/ui/unused-crate-deps/suppress.rs
diff --git a/src/test/ui/unused-crate-deps/test-use-ok.rs b/tests/ui/unused-crate-deps/test-use-ok.rs
index 66d6440c9..66d6440c9 100644
--- a/src/test/ui/unused-crate-deps/test-use-ok.rs
+++ b/tests/ui/unused-crate-deps/test-use-ok.rs
diff --git a/src/test/ui/unused-crate-deps/test.mk b/tests/ui/unused-crate-deps/test.mk
index 0b98b4e44..0b98b4e44 100644
--- a/src/test/ui/unused-crate-deps/test.mk
+++ b/tests/ui/unused-crate-deps/test.mk
diff --git a/src/test/ui/unused-crate-deps/unused-aliases.rs b/tests/ui/unused-crate-deps/unused-aliases.rs
index 1b7cb9b97..1b7cb9b97 100644
--- a/src/test/ui/unused-crate-deps/unused-aliases.rs
+++ b/tests/ui/unused-crate-deps/unused-aliases.rs
diff --git a/src/test/ui/unused-crate-deps/unused-aliases.stderr b/tests/ui/unused-crate-deps/unused-aliases.stderr
index c8c6c4507..c8c6c4507 100644
--- a/src/test/ui/unused-crate-deps/unused-aliases.stderr
+++ b/tests/ui/unused-crate-deps/unused-aliases.stderr
diff --git a/src/test/ui/unused-crate-deps/use_extern_crate_2015.rs b/tests/ui/unused-crate-deps/use_extern_crate_2015.rs
index f15c87fa0..f15c87fa0 100644
--- a/src/test/ui/unused-crate-deps/use_extern_crate_2015.rs
+++ b/tests/ui/unused-crate-deps/use_extern_crate_2015.rs
diff --git a/src/test/ui/unused-crate-deps/warn-attr.rs b/tests/ui/unused-crate-deps/warn-attr.rs
index 1acb307ab..1acb307ab 100644
--- a/src/test/ui/unused-crate-deps/warn-attr.rs
+++ b/tests/ui/unused-crate-deps/warn-attr.rs
diff --git a/src/test/ui/unused-crate-deps/warn-attr.stderr b/tests/ui/unused-crate-deps/warn-attr.stderr
index 0d3831570..0d3831570 100644
--- a/src/test/ui/unused-crate-deps/warn-attr.stderr
+++ b/tests/ui/unused-crate-deps/warn-attr.stderr
diff --git a/src/test/ui/unused-crate-deps/warn-cmdline-json.rs b/tests/ui/unused-crate-deps/warn-cmdline-json.rs
index 4826c0062..4826c0062 100644
--- a/src/test/ui/unused-crate-deps/warn-cmdline-json.rs
+++ b/tests/ui/unused-crate-deps/warn-cmdline-json.rs
diff --git a/src/test/ui/unused-crate-deps/warn-cmdline-json.stderr b/tests/ui/unused-crate-deps/warn-cmdline-json.stderr
index 98dbd7639..98dbd7639 100644
--- a/src/test/ui/unused-crate-deps/warn-cmdline-json.stderr
+++ b/tests/ui/unused-crate-deps/warn-cmdline-json.stderr
diff --git a/src/test/ui/unused-crate-deps/warn-cmdline-static.rs b/tests/ui/unused-crate-deps/warn-cmdline-static.rs
index c609529a6..c609529a6 100644
--- a/src/test/ui/unused-crate-deps/warn-cmdline-static.rs
+++ b/tests/ui/unused-crate-deps/warn-cmdline-static.rs
diff --git a/src/test/ui/unused-crate-deps/warn-cmdline-static.stderr b/tests/ui/unused-crate-deps/warn-cmdline-static.stderr
index 65956461d..65956461d 100644
--- a/src/test/ui/unused-crate-deps/warn-cmdline-static.stderr
+++ b/tests/ui/unused-crate-deps/warn-cmdline-static.stderr
diff --git a/src/test/ui/unused-crate-deps/warn-cmdline.rs b/tests/ui/unused-crate-deps/warn-cmdline.rs
index 3bae61c3e..3bae61c3e 100644
--- a/src/test/ui/unused-crate-deps/warn-cmdline.rs
+++ b/tests/ui/unused-crate-deps/warn-cmdline.rs
diff --git a/src/test/ui/unused-crate-deps/warn-cmdline.stderr b/tests/ui/unused-crate-deps/warn-cmdline.stderr
index ea675ba9a..ea675ba9a 100644
--- a/src/test/ui/unused-crate-deps/warn-cmdline.stderr
+++ b/tests/ui/unused-crate-deps/warn-cmdline.stderr
diff --git a/src/test/ui/unused-move-capture.rs b/tests/ui/unused-move-capture.rs
index efaf10da4..efaf10da4 100644
--- a/src/test/ui/unused-move-capture.rs
+++ b/tests/ui/unused-move-capture.rs
diff --git a/src/test/ui/unused-move.rs b/tests/ui/unused-move.rs
index 697434d47..697434d47 100644
--- a/src/test/ui/unused-move.rs
+++ b/tests/ui/unused-move.rs
diff --git a/src/test/ui/unwind-abis/feature-gate-c-unwind-enabled.rs b/tests/ui/unwind-abis/feature-gate-c-unwind-enabled.rs
index 6ff5dbda2..6ff5dbda2 100644
--- a/src/test/ui/unwind-abis/feature-gate-c-unwind-enabled.rs
+++ b/tests/ui/unwind-abis/feature-gate-c-unwind-enabled.rs
diff --git a/src/test/ui/unwind-abis/feature-gate-c-unwind.rs b/tests/ui/unwind-abis/feature-gate-c-unwind.rs
index ba72f74f2..ba72f74f2 100644
--- a/src/test/ui/unwind-abis/feature-gate-c-unwind.rs
+++ b/tests/ui/unwind-abis/feature-gate-c-unwind.rs
diff --git a/src/test/ui/unwind-abis/feature-gate-c-unwind.stderr b/tests/ui/unwind-abis/feature-gate-c-unwind.stderr
index 214ddc45c..214ddc45c 100644
--- a/src/test/ui/unwind-abis/feature-gate-c-unwind.stderr
+++ b/tests/ui/unwind-abis/feature-gate-c-unwind.stderr
diff --git a/src/test/ui/unwind-abis/feature-gate-stdcall-unwind.rs b/tests/ui/unwind-abis/feature-gate-stdcall-unwind.rs
index cfa8eb3ca..cfa8eb3ca 100644
--- a/src/test/ui/unwind-abis/feature-gate-stdcall-unwind.rs
+++ b/tests/ui/unwind-abis/feature-gate-stdcall-unwind.rs
diff --git a/src/test/ui/unwind-abis/feature-gate-stdcall-unwind.stderr b/tests/ui/unwind-abis/feature-gate-stdcall-unwind.stderr
index c2cce0e11..c2cce0e11 100644
--- a/src/test/ui/unwind-abis/feature-gate-stdcall-unwind.stderr
+++ b/tests/ui/unwind-abis/feature-gate-stdcall-unwind.stderr
diff --git a/src/test/ui/unwind-abis/feature-gate-system-unwind.rs b/tests/ui/unwind-abis/feature-gate-system-unwind.rs
index 26c2de4e8..26c2de4e8 100644
--- a/src/test/ui/unwind-abis/feature-gate-system-unwind.rs
+++ b/tests/ui/unwind-abis/feature-gate-system-unwind.rs
diff --git a/src/test/ui/unwind-abis/feature-gate-system-unwind.stderr b/tests/ui/unwind-abis/feature-gate-system-unwind.stderr
index 878773364..878773364 100644
--- a/src/test/ui/unwind-abis/feature-gate-system-unwind.stderr
+++ b/tests/ui/unwind-abis/feature-gate-system-unwind.stderr
diff --git a/src/test/ui/unwind-abis/feature-gate-thiscall-unwind.rs b/tests/ui/unwind-abis/feature-gate-thiscall-unwind.rs
index 0a323e50f..0a323e50f 100644
--- a/src/test/ui/unwind-abis/feature-gate-thiscall-unwind.rs
+++ b/tests/ui/unwind-abis/feature-gate-thiscall-unwind.rs
diff --git a/src/test/ui/unwind-abis/feature-gate-thiscall-unwind.stderr b/tests/ui/unwind-abis/feature-gate-thiscall-unwind.stderr
index 9ca00a55c..9ca00a55c 100644
--- a/src/test/ui/unwind-abis/feature-gate-thiscall-unwind.stderr
+++ b/tests/ui/unwind-abis/feature-gate-thiscall-unwind.stderr
diff --git a/src/test/ui/unwind-abis/ffi-unwind-calls-lint.rs b/tests/ui/unwind-abis/ffi-unwind-calls-lint.rs
index 9a324f004..9a324f004 100644
--- a/src/test/ui/unwind-abis/ffi-unwind-calls-lint.rs
+++ b/tests/ui/unwind-abis/ffi-unwind-calls-lint.rs
diff --git a/src/test/ui/unwind-abis/ffi-unwind-calls-lint.stderr b/tests/ui/unwind-abis/ffi-unwind-calls-lint.stderr
index 937a2b3df..937a2b3df 100644
--- a/src/test/ui/unwind-abis/ffi-unwind-calls-lint.stderr
+++ b/tests/ui/unwind-abis/ffi-unwind-calls-lint.stderr
diff --git a/src/test/ui/unwind-no-uwtable.rs b/tests/ui/unwind-no-uwtable.rs
index 3bc309233..3bc309233 100644
--- a/src/test/ui/unwind-no-uwtable.rs
+++ b/tests/ui/unwind-no-uwtable.rs
diff --git a/src/test/ui/unwind-unique.rs b/tests/ui/unwind-unique.rs
index 50ecf751a..50ecf751a 100644
--- a/src/test/ui/unwind-unique.rs
+++ b/tests/ui/unwind-unique.rs
diff --git a/src/test/ui/use-import-export.rs b/tests/ui/use-import-export.rs
index 07a6866ba..07a6866ba 100644
--- a/src/test/ui/use-import-export.rs
+++ b/tests/ui/use-import-export.rs
diff --git a/src/test/ui/use-keyword-2.rs b/tests/ui/use-keyword-2.rs
index ebddb5d1a..ebddb5d1a 100644
--- a/src/test/ui/use-keyword-2.rs
+++ b/tests/ui/use-keyword-2.rs
diff --git a/src/test/ui/use-module-level-int-consts.rs b/tests/ui/use-module-level-int-consts.rs
index 200f742d7..200f742d7 100644
--- a/src/test/ui/use-module-level-int-consts.rs
+++ b/tests/ui/use-module-level-int-consts.rs
diff --git a/src/test/ui/use-nested-groups.rs b/tests/ui/use-nested-groups.rs
index 5c739709e..5c739709e 100644
--- a/src/test/ui/use-nested-groups.rs
+++ b/tests/ui/use-nested-groups.rs
diff --git a/src/test/ui/use.rs b/tests/ui/use.rs
index 1beee4a51..1beee4a51 100644
--- a/src/test/ui/use.rs
+++ b/tests/ui/use.rs
diff --git a/src/test/ui/use/auxiliary/extern-use-primitive-type-lib.rs b/tests/ui/use/auxiliary/extern-use-primitive-type-lib.rs
index 3c7756ef7..3c7756ef7 100644
--- a/src/test/ui/use/auxiliary/extern-use-primitive-type-lib.rs
+++ b/tests/ui/use/auxiliary/extern-use-primitive-type-lib.rs
diff --git a/src/test/ui/use/auxiliary/use-from-trait-xc.rs b/tests/ui/use/auxiliary/use-from-trait-xc.rs
index 4abe11941..4abe11941 100644
--- a/src/test/ui/use/auxiliary/use-from-trait-xc.rs
+++ b/tests/ui/use/auxiliary/use-from-trait-xc.rs
diff --git a/src/test/ui/use/issue-18986.rs b/tests/ui/use/issue-18986.rs
index f0b292f29..f0b292f29 100644
--- a/src/test/ui/use/issue-18986.rs
+++ b/tests/ui/use/issue-18986.rs
diff --git a/src/test/ui/use/issue-18986.stderr b/tests/ui/use/issue-18986.stderr
index 6c23178c7..6c23178c7 100644
--- a/src/test/ui/use/issue-18986.stderr
+++ b/tests/ui/use/issue-18986.stderr
diff --git a/src/test/ui/use/issue-60976-extern-use-primitive-type.rs b/tests/ui/use/issue-60976-extern-use-primitive-type.rs
index 4cd458302..4cd458302 100644
--- a/src/test/ui/use/issue-60976-extern-use-primitive-type.rs
+++ b/tests/ui/use/issue-60976-extern-use-primitive-type.rs
diff --git a/src/test/ui/use/use-after-move-based-on-type.rs b/tests/ui/use/use-after-move-based-on-type.rs
index ba7aa0345..ba7aa0345 100644
--- a/src/test/ui/use/use-after-move-based-on-type.rs
+++ b/tests/ui/use/use-after-move-based-on-type.rs
diff --git a/src/test/ui/use/use-after-move-based-on-type.stderr b/tests/ui/use/use-after-move-based-on-type.stderr
index 7b4d24549..7b4d24549 100644
--- a/src/test/ui/use/use-after-move-based-on-type.stderr
+++ b/tests/ui/use/use-after-move-based-on-type.stderr
diff --git a/src/test/ui/use/use-after-move-implicity-coerced-object.rs b/tests/ui/use/use-after-move-implicity-coerced-object.rs
index 47fbb5bf1..47fbb5bf1 100644
--- a/src/test/ui/use/use-after-move-implicity-coerced-object.rs
+++ b/tests/ui/use/use-after-move-implicity-coerced-object.rs
diff --git a/src/test/ui/use/use-after-move-implicity-coerced-object.stderr b/tests/ui/use/use-after-move-implicity-coerced-object.stderr
index dfa0c0483..dfa0c0483 100644
--- a/src/test/ui/use/use-after-move-implicity-coerced-object.stderr
+++ b/tests/ui/use/use-after-move-implicity-coerced-object.stderr
diff --git a/src/test/ui/use/use-after-move-self-based-on-type.rs b/tests/ui/use/use-after-move-self-based-on-type.rs
index 932583495..932583495 100644
--- a/src/test/ui/use/use-after-move-self-based-on-type.rs
+++ b/tests/ui/use/use-after-move-self-based-on-type.rs
diff --git a/src/test/ui/use/use-after-move-self-based-on-type.stderr b/tests/ui/use/use-after-move-self-based-on-type.stderr
index 7fdc4ab25..1bdf49801 100644
--- a/src/test/ui/use/use-after-move-self-based-on-type.stderr
+++ b/tests/ui/use/use-after-move-self-based-on-type.stderr
@@ -8,7 +8,7 @@ LL |         self.bar();
 LL |         return self.x;
    |                ^^^^^^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `self`
+note: `S::bar` takes ownership of the receiver `self`, which moves `self`
   --> $DIR/use-after-move-self-based-on-type.rs:15:16
    |
 LL |     pub fn bar(self) {}
diff --git a/src/test/ui/use/use-after-move-self.rs b/tests/ui/use/use-after-move-self.rs
index f7a3c0ecc..f7a3c0ecc 100644
--- a/src/test/ui/use/use-after-move-self.rs
+++ b/tests/ui/use/use-after-move-self.rs
diff --git a/src/test/ui/use/use-after-move-self.stderr b/tests/ui/use/use-after-move-self.stderr
index 073deee63..59cc22ead 100644
--- a/src/test/ui/use/use-after-move-self.stderr
+++ b/tests/ui/use/use-after-move-self.stderr
@@ -8,7 +8,7 @@ LL |         self.bar();
 LL |         return *self.x;
    |                ^^^^^^^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `self`
+note: `S::bar` takes ownership of the receiver `self`, which moves `self`
   --> $DIR/use-after-move-self.rs:13:16
    |
 LL |     pub fn bar(self) {}
diff --git a/src/test/ui/use/use-associated-const.rs b/tests/ui/use/use-associated-const.rs
index 714fbdabb..714fbdabb 100644
--- a/src/test/ui/use/use-associated-const.rs
+++ b/tests/ui/use/use-associated-const.rs
diff --git a/src/test/ui/use/use-associated-const.stderr b/tests/ui/use/use-associated-const.stderr
index 4bc0d7e61..4bc0d7e61 100644
--- a/src/test/ui/use/use-associated-const.stderr
+++ b/tests/ui/use/use-associated-const.stderr
diff --git a/src/test/ui/use/use-crate-self.rs b/tests/ui/use/use-crate-self.rs
index 65ab94814..65ab94814 100644
--- a/src/test/ui/use/use-crate-self.rs
+++ b/tests/ui/use/use-crate-self.rs
diff --git a/src/test/ui/use/use-crate-self.stderr b/tests/ui/use/use-crate-self.stderr
index dd4036bff..dd4036bff 100644
--- a/src/test/ui/use/use-crate-self.stderr
+++ b/tests/ui/use/use-crate-self.stderr
diff --git a/src/test/ui/use/use-from-trait-xc.rs b/tests/ui/use/use-from-trait-xc.rs
index 695ed66a1..695ed66a1 100644
--- a/src/test/ui/use/use-from-trait-xc.rs
+++ b/tests/ui/use/use-from-trait-xc.rs
diff --git a/src/test/ui/use/use-from-trait-xc.stderr b/tests/ui/use/use-from-trait-xc.stderr
index 4c4c2f622..4c4c2f622 100644
--- a/src/test/ui/use/use-from-trait-xc.stderr
+++ b/tests/ui/use/use-from-trait-xc.stderr
diff --git a/src/test/ui/use/use-from-trait.rs b/tests/ui/use/use-from-trait.rs
index eab4bb6e3..eab4bb6e3 100644
--- a/src/test/ui/use/use-from-trait.rs
+++ b/tests/ui/use/use-from-trait.rs
diff --git a/src/test/ui/use/use-from-trait.stderr b/tests/ui/use/use-from-trait.stderr
index a5b0e356b..a5b0e356b 100644
--- a/src/test/ui/use/use-from-trait.stderr
+++ b/tests/ui/use/use-from-trait.stderr
diff --git a/src/test/ui/use/use-keyword.rs b/tests/ui/use/use-keyword.rs
index c30c2e06c..c30c2e06c 100644
--- a/src/test/ui/use/use-keyword.rs
+++ b/tests/ui/use/use-keyword.rs
diff --git a/src/test/ui/use/use-keyword.stderr b/tests/ui/use/use-keyword.stderr
index 501d14be5..501d14be5 100644
--- a/src/test/ui/use/use-keyword.stderr
+++ b/tests/ui/use/use-keyword.stderr
diff --git a/src/test/ui/use/use-meta-mismatch.rs b/tests/ui/use/use-meta-mismatch.rs
index 975209efb..975209efb 100644
--- a/src/test/ui/use/use-meta-mismatch.rs
+++ b/tests/ui/use/use-meta-mismatch.rs
diff --git a/src/test/ui/use/use-meta-mismatch.stderr b/tests/ui/use/use-meta-mismatch.stderr
index 62b71fe8e..62b71fe8e 100644
--- a/src/test/ui/use/use-meta-mismatch.stderr
+++ b/tests/ui/use/use-meta-mismatch.stderr
diff --git a/src/test/ui/use/use-mod.rs b/tests/ui/use/use-mod.rs
index 87064c6a4..87064c6a4 100644
--- a/src/test/ui/use/use-mod.rs
+++ b/tests/ui/use/use-mod.rs
diff --git a/src/test/ui/use/use-mod.stderr b/tests/ui/use/use-mod.stderr
index 0cae5eb14..0cae5eb14 100644
--- a/src/test/ui/use/use-mod.stderr
+++ b/tests/ui/use/use-mod.stderr
diff --git a/src/test/ui/use/use-mod/use-mod-2.rs b/tests/ui/use/use-mod/use-mod-2.rs
index 9373a62ba..9373a62ba 100644
--- a/src/test/ui/use/use-mod/use-mod-2.rs
+++ b/tests/ui/use/use-mod/use-mod-2.rs
diff --git a/src/test/ui/use/use-mod/use-mod-2.stderr b/tests/ui/use/use-mod/use-mod-2.stderr
index 843767849..843767849 100644
--- a/src/test/ui/use/use-mod/use-mod-2.stderr
+++ b/tests/ui/use/use-mod/use-mod-2.stderr
diff --git a/src/test/ui/use/use-mod/use-mod-3.rs b/tests/ui/use/use-mod/use-mod-3.rs
index 0afa486b9..0afa486b9 100644
--- a/src/test/ui/use/use-mod/use-mod-3.rs
+++ b/tests/ui/use/use-mod/use-mod-3.rs
diff --git a/src/test/ui/use/use-mod/use-mod-3.stderr b/tests/ui/use/use-mod/use-mod-3.stderr
index 1b12b3c6f..1b12b3c6f 100644
--- a/src/test/ui/use/use-mod/use-mod-3.stderr
+++ b/tests/ui/use/use-mod/use-mod-3.stderr
diff --git a/src/test/ui/use/use-mod/use-mod-4.rs b/tests/ui/use/use-mod/use-mod-4.rs
index 46ae8ddad..46ae8ddad 100644
--- a/src/test/ui/use/use-mod/use-mod-4.rs
+++ b/tests/ui/use/use-mod/use-mod-4.rs
diff --git a/src/test/ui/use/use-mod/use-mod-4.stderr b/tests/ui/use/use-mod/use-mod-4.stderr
index 0b4fbadb4..0b4fbadb4 100644
--- a/src/test/ui/use/use-mod/use-mod-4.stderr
+++ b/tests/ui/use/use-mod/use-mod-4.stderr
diff --git a/src/test/ui/use/use-mod/use-mod-5.rs b/tests/ui/use/use-mod/use-mod-5.rs
index df5b423ec..df5b423ec 100644
--- a/src/test/ui/use/use-mod/use-mod-5.rs
+++ b/tests/ui/use/use-mod/use-mod-5.rs
diff --git a/src/test/ui/use/use-mod/use-mod-5.stderr b/tests/ui/use/use-mod/use-mod-5.stderr
index 62859e261..62859e261 100644
--- a/src/test/ui/use/use-mod/use-mod-5.stderr
+++ b/tests/ui/use/use-mod/use-mod-5.stderr
diff --git a/src/test/ui/use/use-mod/use-mod-6.rs b/tests/ui/use/use-mod/use-mod-6.rs
index 1f8777dac..1f8777dac 100644
--- a/src/test/ui/use/use-mod/use-mod-6.rs
+++ b/tests/ui/use/use-mod/use-mod-6.rs
diff --git a/src/test/ui/use/use-mod/use-mod-6.stderr b/tests/ui/use/use-mod/use-mod-6.stderr
index 2d2c90067..2d2c90067 100644
--- a/src/test/ui/use/use-mod/use-mod-6.stderr
+++ b/tests/ui/use/use-mod/use-mod-6.stderr
diff --git a/src/test/ui/use/use-nested-groups-error.rs b/tests/ui/use/use-nested-groups-error.rs
index d8b189d19..d8b189d19 100644
--- a/src/test/ui/use/use-nested-groups-error.rs
+++ b/tests/ui/use/use-nested-groups-error.rs
diff --git a/src/test/ui/use/use-nested-groups-error.stderr b/tests/ui/use/use-nested-groups-error.stderr
index 7234c8ec6..7234c8ec6 100644
--- a/src/test/ui/use/use-nested-groups-error.stderr
+++ b/tests/ui/use/use-nested-groups-error.stderr
diff --git a/src/test/ui/use/use-nested-groups-unused-imports.rs b/tests/ui/use/use-nested-groups-unused-imports.rs
index ca6b8ba94..ca6b8ba94 100644
--- a/src/test/ui/use/use-nested-groups-unused-imports.rs
+++ b/tests/ui/use/use-nested-groups-unused-imports.rs
diff --git a/src/test/ui/use/use-nested-groups-unused-imports.stderr b/tests/ui/use/use-nested-groups-unused-imports.stderr
index 6610f8ecd..6610f8ecd 100644
--- a/src/test/ui/use/use-nested-groups-unused-imports.stderr
+++ b/tests/ui/use/use-nested-groups-unused-imports.stderr
diff --git a/src/test/ui/use/use-paths-as-items.rs b/tests/ui/use/use-paths-as-items.rs
index 7b5eb56b1..7b5eb56b1 100644
--- a/src/test/ui/use/use-paths-as-items.rs
+++ b/tests/ui/use/use-paths-as-items.rs
diff --git a/src/test/ui/use/use-paths-as-items.stderr b/tests/ui/use/use-paths-as-items.stderr
index b09001a9b..b09001a9b 100644
--- a/src/test/ui/use/use-paths-as-items.stderr
+++ b/tests/ui/use/use-paths-as-items.stderr
diff --git a/src/test/ui/use/use-self-type.rs b/tests/ui/use/use-self-type.rs
index 3b4ce4297..3b4ce4297 100644
--- a/src/test/ui/use/use-self-type.rs
+++ b/tests/ui/use/use-self-type.rs
diff --git a/src/test/ui/use/use-self-type.stderr b/tests/ui/use/use-self-type.stderr
index e61539411..e61539411 100644
--- a/src/test/ui/use/use-self-type.stderr
+++ b/tests/ui/use/use-self-type.stderr
diff --git a/src/test/ui/use/use-super-global-path.rs b/tests/ui/use/use-super-global-path.rs
index 64bfd14b7..64bfd14b7 100644
--- a/src/test/ui/use/use-super-global-path.rs
+++ b/tests/ui/use/use-super-global-path.rs
diff --git a/src/test/ui/use/use-super-global-path.stderr b/tests/ui/use/use-super-global-path.stderr
index 7014a12e9..7014a12e9 100644
--- a/src/test/ui/use/use-super-global-path.stderr
+++ b/tests/ui/use/use-super-global-path.stderr
diff --git a/src/test/ui/used.rs b/tests/ui/used.rs
index f008724f4..f008724f4 100644
--- a/src/test/ui/used.rs
+++ b/tests/ui/used.rs
diff --git a/src/test/ui/used.stderr b/tests/ui/used.stderr
index ea77f129d..ea77f129d 100644
--- a/src/test/ui/used.stderr
+++ b/tests/ui/used.stderr
diff --git a/src/test/ui/user-defined-macro-rules.rs b/tests/ui/user-defined-macro-rules.rs
index 09e071ec4..09e071ec4 100644
--- a/src/test/ui/user-defined-macro-rules.rs
+++ b/tests/ui/user-defined-macro-rules.rs
diff --git a/src/test/ui/using-target-feature-unstable.rs b/tests/ui/using-target-feature-unstable.rs
index c5da45c08..c5da45c08 100644
--- a/src/test/ui/using-target-feature-unstable.rs
+++ b/tests/ui/using-target-feature-unstable.rs
diff --git a/src/test/ui/usize-generic-argument-parent.rs b/tests/ui/usize-generic-argument-parent.rs
index 4ab80d944..4ab80d944 100644
--- a/src/test/ui/usize-generic-argument-parent.rs
+++ b/tests/ui/usize-generic-argument-parent.rs
diff --git a/src/test/ui/usize-generic-argument-parent.stderr b/tests/ui/usize-generic-argument-parent.stderr
index 131c476aa..131c476aa 100644
--- a/src/test/ui/usize-generic-argument-parent.stderr
+++ b/tests/ui/usize-generic-argument-parent.stderr
diff --git a/src/test/ui/utf8-bom.rs b/tests/ui/utf8-bom.rs
index a3cb0e9a5..a3cb0e9a5 100644
--- a/src/test/ui/utf8-bom.rs
+++ b/tests/ui/utf8-bom.rs
diff --git a/src/test/ui/utf8_idents.rs b/tests/ui/utf8_idents.rs
index 1f6326dd9..1f6326dd9 100644
--- a/src/test/ui/utf8_idents.rs
+++ b/tests/ui/utf8_idents.rs
diff --git a/src/test/ui/variance-intersection-of-ref-and-opt-ref.rs b/tests/ui/variance-intersection-of-ref-and-opt-ref.rs
index 74707a98d..74707a98d 100644
--- a/src/test/ui/variance-intersection-of-ref-and-opt-ref.rs
+++ b/tests/ui/variance-intersection-of-ref-and-opt-ref.rs
diff --git a/src/test/ui/variance-iterators-in-libcore.rs b/tests/ui/variance-iterators-in-libcore.rs
index a542e44d5..a542e44d5 100644
--- a/src/test/ui/variance-iterators-in-libcore.rs
+++ b/tests/ui/variance-iterators-in-libcore.rs
diff --git a/src/test/ui/variance/variance-associated-consts.rs b/tests/ui/variance/variance-associated-consts.rs
index da55bc962..da55bc962 100644
--- a/src/test/ui/variance/variance-associated-consts.rs
+++ b/tests/ui/variance/variance-associated-consts.rs
diff --git a/src/test/ui/variance/variance-associated-consts.stderr b/tests/ui/variance/variance-associated-consts.stderr
index 219f5bca9..4df2d8da3 100644
--- a/src/test/ui/variance/variance-associated-consts.stderr
+++ b/tests/ui/variance/variance-associated-consts.stderr
@@ -1,4 +1,4 @@
-error[E0208]: [o]
+error: [o]
   --> $DIR/variance-associated-consts.rs:13:1
    |
 LL | struct Foo<T: Trait> {
diff --git a/src/test/ui/variance/variance-associated-types.rs b/tests/ui/variance/variance-associated-types.rs
index 1165fb53c..1165fb53c 100644
--- a/src/test/ui/variance/variance-associated-types.rs
+++ b/tests/ui/variance/variance-associated-types.rs
diff --git a/src/test/ui/variance/variance-associated-types.stderr b/tests/ui/variance/variance-associated-types.stderr
index 94f770eda..51f17c7c2 100644
--- a/src/test/ui/variance/variance-associated-types.stderr
+++ b/tests/ui/variance/variance-associated-types.stderr
@@ -1,10 +1,10 @@
-error[E0208]: [-, +]
+error: [-, +]
   --> $DIR/variance-associated-types.rs:13:1
    |
 LL | struct Foo<'a, T : Trait<'a>> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o, o]
+error: [o, o]
   --> $DIR/variance-associated-types.rs:18:1
    |
 LL | struct Bar<'a, T : Trait<'a>> {
diff --git a/src/test/ui/variance/variance-associated-types2.rs b/tests/ui/variance/variance-associated-types2.rs
index e487eefea..e487eefea 100644
--- a/src/test/ui/variance/variance-associated-types2.rs
+++ b/tests/ui/variance/variance-associated-types2.rs
diff --git a/src/test/ui/variance/variance-associated-types2.stderr b/tests/ui/variance/variance-associated-types2.stderr
index 35871c123..35871c123 100644
--- a/src/test/ui/variance/variance-associated-types2.stderr
+++ b/tests/ui/variance/variance-associated-types2.stderr
diff --git a/src/test/ui/variance/variance-btree-invariant-types.rs b/tests/ui/variance/variance-btree-invariant-types.rs
index 09c93d001..09c93d001 100644
--- a/src/test/ui/variance/variance-btree-invariant-types.rs
+++ b/tests/ui/variance/variance-btree-invariant-types.rs
diff --git a/src/test/ui/variance/variance-btree-invariant-types.stderr b/tests/ui/variance/variance-btree-invariant-types.stderr
index 6f7910021..6f7910021 100644
--- a/src/test/ui/variance/variance-btree-invariant-types.stderr
+++ b/tests/ui/variance/variance-btree-invariant-types.stderr
diff --git a/src/test/ui/variance/variance-cell-is-invariant.rs b/tests/ui/variance/variance-cell-is-invariant.rs
index 62ce4f91f..62ce4f91f 100644
--- a/src/test/ui/variance/variance-cell-is-invariant.rs
+++ b/tests/ui/variance/variance-cell-is-invariant.rs
diff --git a/src/test/ui/variance/variance-cell-is-invariant.stderr b/tests/ui/variance/variance-cell-is-invariant.stderr
index ab5435d16..ab5435d16 100644
--- a/src/test/ui/variance/variance-cell-is-invariant.stderr
+++ b/tests/ui/variance/variance-cell-is-invariant.stderr
diff --git a/src/test/ui/variance/variance-contravariant-arg-object.rs b/tests/ui/variance/variance-contravariant-arg-object.rs
index 701fcaf69..701fcaf69 100644
--- a/src/test/ui/variance/variance-contravariant-arg-object.rs
+++ b/tests/ui/variance/variance-contravariant-arg-object.rs
diff --git a/src/test/ui/variance/variance-contravariant-arg-object.stderr b/tests/ui/variance/variance-contravariant-arg-object.stderr
index ab28315e1..ab28315e1 100644
--- a/src/test/ui/variance/variance-contravariant-arg-object.stderr
+++ b/tests/ui/variance/variance-contravariant-arg-object.stderr
diff --git a/src/test/ui/variance/variance-contravariant-arg-trait-match.rs b/tests/ui/variance/variance-contravariant-arg-trait-match.rs
index e0b280105..e0b280105 100644
--- a/src/test/ui/variance/variance-contravariant-arg-trait-match.rs
+++ b/tests/ui/variance/variance-contravariant-arg-trait-match.rs
diff --git a/src/test/ui/variance/variance-contravariant-arg-trait-match.stderr b/tests/ui/variance/variance-contravariant-arg-trait-match.stderr
index df9d93907..df9d93907 100644
--- a/src/test/ui/variance/variance-contravariant-arg-trait-match.stderr
+++ b/tests/ui/variance/variance-contravariant-arg-trait-match.stderr
diff --git a/src/test/ui/variance/variance-contravariant-self-trait-match.rs b/tests/ui/variance/variance-contravariant-self-trait-match.rs
index 8a10554f3..8a10554f3 100644
--- a/src/test/ui/variance/variance-contravariant-self-trait-match.rs
+++ b/tests/ui/variance/variance-contravariant-self-trait-match.rs
diff --git a/src/test/ui/variance/variance-contravariant-self-trait-match.stderr b/tests/ui/variance/variance-contravariant-self-trait-match.stderr
index bfea1b1b3..bfea1b1b3 100644
--- a/src/test/ui/variance/variance-contravariant-self-trait-match.stderr
+++ b/tests/ui/variance/variance-contravariant-self-trait-match.stderr
diff --git a/src/test/ui/variance/variance-covariant-arg-object.rs b/tests/ui/variance/variance-covariant-arg-object.rs
index 89cf3117a..89cf3117a 100644
--- a/src/test/ui/variance/variance-covariant-arg-object.rs
+++ b/tests/ui/variance/variance-covariant-arg-object.rs
diff --git a/src/test/ui/variance/variance-covariant-arg-object.stderr b/tests/ui/variance/variance-covariant-arg-object.stderr
index 51f8cb3ec..51f8cb3ec 100644
--- a/src/test/ui/variance/variance-covariant-arg-object.stderr
+++ b/tests/ui/variance/variance-covariant-arg-object.stderr
diff --git a/src/test/ui/variance/variance-covariant-arg-trait-match.rs b/tests/ui/variance/variance-covariant-arg-trait-match.rs
index 68dd449d5..68dd449d5 100644
--- a/src/test/ui/variance/variance-covariant-arg-trait-match.rs
+++ b/tests/ui/variance/variance-covariant-arg-trait-match.rs
diff --git a/src/test/ui/variance/variance-covariant-arg-trait-match.stderr b/tests/ui/variance/variance-covariant-arg-trait-match.stderr
index 4c7b6cf7c..4c7b6cf7c 100644
--- a/src/test/ui/variance/variance-covariant-arg-trait-match.stderr
+++ b/tests/ui/variance/variance-covariant-arg-trait-match.stderr
diff --git a/src/test/ui/variance/variance-covariant-self-trait-match.rs b/tests/ui/variance/variance-covariant-self-trait-match.rs
index 93c25e980..93c25e980 100644
--- a/src/test/ui/variance/variance-covariant-self-trait-match.rs
+++ b/tests/ui/variance/variance-covariant-self-trait-match.rs
diff --git a/src/test/ui/variance/variance-covariant-self-trait-match.stderr b/tests/ui/variance/variance-covariant-self-trait-match.stderr
index 9b7ba3b66..9b7ba3b66 100644
--- a/src/test/ui/variance/variance-covariant-self-trait-match.stderr
+++ b/tests/ui/variance/variance-covariant-self-trait-match.stderr
diff --git a/src/test/ui/variance/variance-invariant-arg-object.rs b/tests/ui/variance/variance-invariant-arg-object.rs
index 7381b4130..7381b4130 100644
--- a/src/test/ui/variance/variance-invariant-arg-object.rs
+++ b/tests/ui/variance/variance-invariant-arg-object.rs
diff --git a/src/test/ui/variance/variance-invariant-arg-object.stderr b/tests/ui/variance/variance-invariant-arg-object.stderr
index 9793a36be..9793a36be 100644
--- a/src/test/ui/variance/variance-invariant-arg-object.stderr
+++ b/tests/ui/variance/variance-invariant-arg-object.stderr
diff --git a/src/test/ui/variance/variance-invariant-arg-trait-match.rs b/tests/ui/variance/variance-invariant-arg-trait-match.rs
index fbcc24387..fbcc24387 100644
--- a/src/test/ui/variance/variance-invariant-arg-trait-match.rs
+++ b/tests/ui/variance/variance-invariant-arg-trait-match.rs
diff --git a/src/test/ui/variance/variance-invariant-arg-trait-match.stderr b/tests/ui/variance/variance-invariant-arg-trait-match.stderr
index 60ffdd029..60ffdd029 100644
--- a/src/test/ui/variance/variance-invariant-arg-trait-match.stderr
+++ b/tests/ui/variance/variance-invariant-arg-trait-match.stderr
diff --git a/src/test/ui/variance/variance-invariant-self-trait-match.rs b/tests/ui/variance/variance-invariant-self-trait-match.rs
index 95c4c2403..95c4c2403 100644
--- a/src/test/ui/variance/variance-invariant-self-trait-match.rs
+++ b/tests/ui/variance/variance-invariant-self-trait-match.rs
diff --git a/src/test/ui/variance/variance-invariant-self-trait-match.stderr b/tests/ui/variance/variance-invariant-self-trait-match.stderr
index 5b64bd091..5b64bd091 100644
--- a/src/test/ui/variance/variance-invariant-self-trait-match.stderr
+++ b/tests/ui/variance/variance-invariant-self-trait-match.stderr
diff --git a/src/test/ui/variance/variance-issue-20533.rs b/tests/ui/variance/variance-issue-20533.rs
index a2459f873..a2459f873 100644
--- a/src/test/ui/variance/variance-issue-20533.rs
+++ b/tests/ui/variance/variance-issue-20533.rs
diff --git a/src/test/ui/variance/variance-issue-20533.stderr b/tests/ui/variance/variance-issue-20533.stderr
index 008e2a002..008e2a002 100644
--- a/src/test/ui/variance/variance-issue-20533.stderr
+++ b/tests/ui/variance/variance-issue-20533.stderr
diff --git a/src/test/ui/variance/variance-object-types.rs b/tests/ui/variance/variance-object-types.rs
index 6ded24cd1..6ded24cd1 100644
--- a/src/test/ui/variance/variance-object-types.rs
+++ b/tests/ui/variance/variance-object-types.rs
diff --git a/src/test/ui/variance/variance-object-types.stderr b/tests/ui/variance/variance-object-types.stderr
index ceee53aff..55a760425 100644
--- a/src/test/ui/variance/variance-object-types.stderr
+++ b/tests/ui/variance/variance-object-types.stderr
@@ -1,4 +1,4 @@
-error[E0208]: [o]
+error: [o]
   --> $DIR/variance-object-types.rs:7:1
    |
 LL | struct Foo<'a> {
diff --git a/src/test/ui/variance/variance-regions-direct.rs b/tests/ui/variance/variance-regions-direct.rs
index 3f34e7655..3f34e7655 100644
--- a/src/test/ui/variance/variance-regions-direct.rs
+++ b/tests/ui/variance/variance-regions-direct.rs
diff --git a/src/test/ui/variance/variance-regions-direct.stderr b/tests/ui/variance/variance-regions-direct.stderr
index 25fb22732..eda02e9b0 100644
--- a/src/test/ui/variance/variance-regions-direct.stderr
+++ b/tests/ui/variance/variance-regions-direct.stderr
@@ -1,40 +1,40 @@
-error[E0208]: [-, -, -]
+error: [-, -, -]
   --> $DIR/variance-regions-direct.rs:9:1
    |
 LL | struct Test2<'a, 'b, 'c> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, +, +]
+error: [+, +, +]
   --> $DIR/variance-regions-direct.rs:18:1
    |
 LL | struct Test3<'a, 'b, 'c> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [-, o]
+error: [-, o]
   --> $DIR/variance-regions-direct.rs:27:1
    |
 LL | struct Test4<'a, 'b:'a> {
    | ^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, o]
+error: [+, o]
   --> $DIR/variance-regions-direct.rs:35:1
    |
 LL | struct Test5<'a, 'b:'a> {
    | ^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [-, o]
+error: [-, o]
   --> $DIR/variance-regions-direct.rs:45:1
    |
 LL | struct Test6<'a, 'b:'a> {
    | ^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [*]
+error: [*]
   --> $DIR/variance-regions-direct.rs:52:1
    |
 LL | struct Test7<'a> {
    | ^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, -, o]
+error: [+, -, o]
   --> $DIR/variance-regions-direct.rs:59:1
    |
 LL | enum Test8<'a, 'b, 'c:'b> {
diff --git a/src/test/ui/variance/variance-regions-indirect.rs b/tests/ui/variance/variance-regions-indirect.rs
index f84f25ada..f84f25ada 100644
--- a/src/test/ui/variance/variance-regions-indirect.rs
+++ b/tests/ui/variance/variance-regions-indirect.rs
diff --git a/src/test/ui/variance/variance-regions-indirect.stderr b/tests/ui/variance/variance-regions-indirect.stderr
index fc52492d7..fa2f4d507 100644
--- a/src/test/ui/variance/variance-regions-indirect.stderr
+++ b/tests/ui/variance/variance-regions-indirect.stderr
@@ -1,28 +1,28 @@
-error[E0208]: [+, -, o, *]
+error: [+, -, o, *]
   --> $DIR/variance-regions-indirect.rs:8:1
    |
 LL | enum Base<'a, 'b, 'c:'b, 'd> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [*, o, -, +]
+error: [*, o, -, +]
   --> $DIR/variance-regions-indirect.rs:15:1
    |
 LL | struct Derived1<'w, 'x:'y, 'y, 'z> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o, o, *]
+error: [o, o, *]
   --> $DIR/variance-regions-indirect.rs:20:1
    |
 LL | struct Derived2<'a, 'b:'a, 'c> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o, -, *]
+error: [o, -, *]
   --> $DIR/variance-regions-indirect.rs:25:1
    |
 LL | struct Derived3<'a:'b, 'b, 'c> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, -, o]
+error: [+, -, o]
   --> $DIR/variance-regions-indirect.rs:30:1
    |
 LL | struct Derived4<'a, 'b, 'c:'b> {
diff --git a/src/test/ui/variance/variance-regions-unused-direct.rs b/tests/ui/variance/variance-regions-unused-direct.rs
index 2afe012bd..2afe012bd 100644
--- a/src/test/ui/variance/variance-regions-unused-direct.rs
+++ b/tests/ui/variance/variance-regions-unused-direct.rs
diff --git a/src/test/ui/variance/variance-regions-unused-direct.stderr b/tests/ui/variance/variance-regions-unused-direct.stderr
index 1a600f5b0..1a600f5b0 100644
--- a/src/test/ui/variance/variance-regions-unused-direct.stderr
+++ b/tests/ui/variance/variance-regions-unused-direct.stderr
diff --git a/src/test/ui/variance/variance-regions-unused-indirect.rs b/tests/ui/variance/variance-regions-unused-indirect.rs
index 6c2c24ddb..6c2c24ddb 100644
--- a/src/test/ui/variance/variance-regions-unused-indirect.rs
+++ b/tests/ui/variance/variance-regions-unused-indirect.rs
diff --git a/src/test/ui/variance/variance-regions-unused-indirect.stderr b/tests/ui/variance/variance-regions-unused-indirect.stderr
index 14fdd8492..14fdd8492 100644
--- a/src/test/ui/variance/variance-regions-unused-indirect.stderr
+++ b/tests/ui/variance/variance-regions-unused-indirect.stderr
diff --git a/src/test/ui/variance/variance-trait-bounds.rs b/tests/ui/variance/variance-trait-bounds.rs
index ad5334602..ad5334602 100644
--- a/src/test/ui/variance/variance-trait-bounds.rs
+++ b/tests/ui/variance/variance-trait-bounds.rs
diff --git a/src/test/ui/variance/variance-trait-bounds.stderr b/tests/ui/variance/variance-trait-bounds.stderr
index e3ef339f4..5a73e541c 100644
--- a/src/test/ui/variance/variance-trait-bounds.stderr
+++ b/tests/ui/variance/variance-trait-bounds.stderr
@@ -1,22 +1,22 @@
-error[E0208]: [+, +]
+error: [+, +]
   --> $DIR/variance-trait-bounds.rs:16:1
    |
 LL | struct TestStruct<U,T:Setter<U>> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [*, +]
+error: [*, +]
   --> $DIR/variance-trait-bounds.rs:21:1
    |
 LL | enum TestEnum<U,T:Setter<U>> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [*, +]
+error: [*, +]
   --> $DIR/variance-trait-bounds.rs:26:1
    |
 LL | struct TestContraStruct<U,T:Setter<U>> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [*, +]
+error: [*, +]
   --> $DIR/variance-trait-bounds.rs:31:1
    |
 LL | struct TestBox<U,T:Getter<U>+Setter<U>> {
diff --git a/src/test/ui/variance/variance-trait-matching.rs b/tests/ui/variance/variance-trait-matching.rs
index b4efee7d6..b4efee7d6 100644
--- a/src/test/ui/variance/variance-trait-matching.rs
+++ b/tests/ui/variance/variance-trait-matching.rs
diff --git a/src/test/ui/variance/variance-trait-matching.stderr b/tests/ui/variance/variance-trait-matching.stderr
index 3308cc6d2..3308cc6d2 100644
--- a/src/test/ui/variance/variance-trait-matching.stderr
+++ b/tests/ui/variance/variance-trait-matching.stderr
diff --git a/src/test/ui/variance/variance-trait-object-bound.rs b/tests/ui/variance/variance-trait-object-bound.rs
index ec3c973bc..ec3c973bc 100644
--- a/src/test/ui/variance/variance-trait-object-bound.rs
+++ b/tests/ui/variance/variance-trait-object-bound.rs
diff --git a/src/test/ui/variance/variance-trait-object-bound.stderr b/tests/ui/variance/variance-trait-object-bound.stderr
index c86cf1f82..7c46b553f 100644
--- a/src/test/ui/variance/variance-trait-object-bound.stderr
+++ b/tests/ui/variance/variance-trait-object-bound.stderr
@@ -1,4 +1,4 @@
-error[E0208]: [-]
+error: [-]
   --> $DIR/variance-trait-object-bound.rs:14:1
    |
 LL | struct TOption<'a> {
diff --git a/src/test/ui/variance/variance-types-bounds.rs b/tests/ui/variance/variance-types-bounds.rs
index d1814dd97..d1814dd97 100644
--- a/src/test/ui/variance/variance-types-bounds.rs
+++ b/tests/ui/variance/variance-types-bounds.rs
diff --git a/src/test/ui/variance/variance-types-bounds.stderr b/tests/ui/variance/variance-types-bounds.stderr
index dbe8af75d..bb8164434 100644
--- a/src/test/ui/variance/variance-types-bounds.stderr
+++ b/tests/ui/variance/variance-types-bounds.stderr
@@ -1,28 +1,28 @@
-error[E0208]: [+, +]
+error: [+, +]
   --> $DIR/variance-types-bounds.rs:7:1
    |
 LL | struct TestImm<A, B> {
    | ^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, o]
+error: [+, o]
   --> $DIR/variance-types-bounds.rs:13:1
    |
 LL | struct TestMut<A, B:'static> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, o]
+error: [+, o]
   --> $DIR/variance-types-bounds.rs:19:1
    |
 LL | struct TestIndirect<A:'static, B:'static> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o, o]
+error: [o, o]
   --> $DIR/variance-types-bounds.rs:24:1
    |
 LL | struct TestIndirect2<A:'static, B:'static> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o, o]
+error: [o, o]
   --> $DIR/variance-types-bounds.rs:38:1
    |
 LL | struct TestObject<A, R> {
diff --git a/src/test/ui/variance/variance-types.rs b/tests/ui/variance/variance-types.rs
index b9b6d9c9b..b9b6d9c9b 100644
--- a/src/test/ui/variance/variance-types.rs
+++ b/tests/ui/variance/variance-types.rs
diff --git a/src/test/ui/variance/variance-types.stderr b/tests/ui/variance/variance-types.stderr
index 8358b18b7..9f7f1d9b0 100644
--- a/src/test/ui/variance/variance-types.stderr
+++ b/tests/ui/variance/variance-types.stderr
@@ -1,34 +1,34 @@
-error[E0208]: [-, o, o]
+error: [-, o, o]
   --> $DIR/variance-types.rs:10:1
    |
 LL | struct InvariantMut<'a,A:'a,B:'a> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o]
+error: [o]
   --> $DIR/variance-types.rs:15:1
    |
 LL | struct InvariantCell<A> {
    | ^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o]
+error: [o]
   --> $DIR/variance-types.rs:20:1
    |
 LL | struct InvariantIndirect<A> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+]
+error: [+]
   --> $DIR/variance-types.rs:25:1
    |
 LL | struct Covariant<A> {
    | ^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [-]
+error: [-]
   --> $DIR/variance-types.rs:30:1
    |
 LL | struct Contravariant<A> {
    | ^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, -, o]
+error: [+, -, o]
   --> $DIR/variance-types.rs:35:1
    |
 LL | enum Enum<A,B,C> {
diff --git a/src/test/ui/variance/variance-unused-region-param.rs b/tests/ui/variance/variance-unused-region-param.rs
index f0e4e03c9..f0e4e03c9 100644
--- a/src/test/ui/variance/variance-unused-region-param.rs
+++ b/tests/ui/variance/variance-unused-region-param.rs
diff --git a/src/test/ui/variance/variance-unused-region-param.stderr b/tests/ui/variance/variance-unused-region-param.stderr
index 7c7ec40ba..7c7ec40ba 100644
--- a/src/test/ui/variance/variance-unused-region-param.stderr
+++ b/tests/ui/variance/variance-unused-region-param.stderr
diff --git a/src/test/ui/variance/variance-unused-type-param.rs b/tests/ui/variance/variance-unused-type-param.rs
index d11140643..d11140643 100644
--- a/src/test/ui/variance/variance-unused-type-param.rs
+++ b/tests/ui/variance/variance-unused-type-param.rs
diff --git a/src/test/ui/variance/variance-unused-type-param.stderr b/tests/ui/variance/variance-unused-type-param.stderr
index e612da118..e612da118 100644
--- a/src/test/ui/variance/variance-unused-type-param.stderr
+++ b/tests/ui/variance/variance-unused-type-param.stderr
diff --git a/src/test/ui/variance/variance-use-contravariant-struct-1.rs b/tests/ui/variance/variance-use-contravariant-struct-1.rs
index 40781fbf0..40781fbf0 100644
--- a/src/test/ui/variance/variance-use-contravariant-struct-1.rs
+++ b/tests/ui/variance/variance-use-contravariant-struct-1.rs
diff --git a/src/test/ui/variance/variance-use-contravariant-struct-1.stderr b/tests/ui/variance/variance-use-contravariant-struct-1.stderr
index 50de7c90f..50de7c90f 100644
--- a/src/test/ui/variance/variance-use-contravariant-struct-1.stderr
+++ b/tests/ui/variance/variance-use-contravariant-struct-1.stderr
diff --git a/src/test/ui/variance/variance-use-contravariant-struct-2.rs b/tests/ui/variance/variance-use-contravariant-struct-2.rs
index d4b2d0834..d4b2d0834 100644
--- a/src/test/ui/variance/variance-use-contravariant-struct-2.rs
+++ b/tests/ui/variance/variance-use-contravariant-struct-2.rs
diff --git a/src/test/ui/variance/variance-use-covariant-struct-1.rs b/tests/ui/variance/variance-use-covariant-struct-1.rs
index f0fd7b26e..f0fd7b26e 100644
--- a/src/test/ui/variance/variance-use-covariant-struct-1.rs
+++ b/tests/ui/variance/variance-use-covariant-struct-1.rs
diff --git a/src/test/ui/variance/variance-use-covariant-struct-1.stderr b/tests/ui/variance/variance-use-covariant-struct-1.stderr
index bab858c5a..bab858c5a 100644
--- a/src/test/ui/variance/variance-use-covariant-struct-1.stderr
+++ b/tests/ui/variance/variance-use-covariant-struct-1.stderr
diff --git a/src/test/ui/variance/variance-use-covariant-struct-2.rs b/tests/ui/variance/variance-use-covariant-struct-2.rs
index ecd2204c9..ecd2204c9 100644
--- a/src/test/ui/variance/variance-use-covariant-struct-2.rs
+++ b/tests/ui/variance/variance-use-covariant-struct-2.rs
diff --git a/src/test/ui/variance/variance-use-invariant-struct-1.rs b/tests/ui/variance/variance-use-invariant-struct-1.rs
index 72f50f345..72f50f345 100644
--- a/src/test/ui/variance/variance-use-invariant-struct-1.rs
+++ b/tests/ui/variance/variance-use-invariant-struct-1.rs
diff --git a/src/test/ui/variance/variance-use-invariant-struct-1.stderr b/tests/ui/variance/variance-use-invariant-struct-1.stderr
index b9ca6e7d5..b9ca6e7d5 100644
--- a/src/test/ui/variance/variance-use-invariant-struct-1.stderr
+++ b/tests/ui/variance/variance-use-invariant-struct-1.stderr
diff --git a/src/test/ui/variants/auxiliary/variant-namespacing.rs b/tests/ui/variants/auxiliary/variant-namespacing.rs
index 7ba601a88..7ba601a88 100644
--- a/src/test/ui/variants/auxiliary/variant-namespacing.rs
+++ b/tests/ui/variants/auxiliary/variant-namespacing.rs
diff --git a/src/test/ui/variants/variant-namespacing.rs b/tests/ui/variants/variant-namespacing.rs
index 975e471fe..975e471fe 100644
--- a/src/test/ui/variants/variant-namespacing.rs
+++ b/tests/ui/variants/variant-namespacing.rs
diff --git a/src/test/ui/variants/variant-namespacing.stderr b/tests/ui/variants/variant-namespacing.stderr
index 9e91ff717..9e91ff717 100644
--- a/src/test/ui/variants/variant-namespacing.stderr
+++ b/tests/ui/variants/variant-namespacing.stderr
diff --git a/src/test/ui/variants/variant-size-differences.rs b/tests/ui/variants/variant-size-differences.rs
index 219819951..219819951 100644
--- a/src/test/ui/variants/variant-size-differences.rs
+++ b/tests/ui/variants/variant-size-differences.rs
diff --git a/src/test/ui/variants/variant-size-differences.stderr b/tests/ui/variants/variant-size-differences.stderr
index 241a757d4..241a757d4 100644
--- a/src/test/ui/variants/variant-size-differences.stderr
+++ b/tests/ui/variants/variant-size-differences.stderr
diff --git a/src/test/ui/variants/variant-used-as-type.rs b/tests/ui/variants/variant-used-as-type.rs
index f27db1024..f27db1024 100644
--- a/src/test/ui/variants/variant-used-as-type.rs
+++ b/tests/ui/variants/variant-used-as-type.rs
diff --git a/src/test/ui/variants/variant-used-as-type.stderr b/tests/ui/variants/variant-used-as-type.stderr
index 64424abbc..64424abbc 100644
--- a/src/test/ui/variants/variant-used-as-type.stderr
+++ b/tests/ui/variants/variant-used-as-type.stderr
diff --git a/src/test/ui/wait-forked-but-failed-child.rs b/tests/ui/wait-forked-but-failed-child.rs
index 674c26a43..674c26a43 100644
--- a/src/test/ui/wait-forked-but-failed-child.rs
+++ b/tests/ui/wait-forked-but-failed-child.rs
diff --git a/src/test/ui/walk-struct-literal-with.rs b/tests/ui/walk-struct-literal-with.rs
index ee1a77eb9..ee1a77eb9 100644
--- a/src/test/ui/walk-struct-literal-with.rs
+++ b/tests/ui/walk-struct-literal-with.rs
diff --git a/src/test/ui/walk-struct-literal-with.stderr b/tests/ui/walk-struct-literal-with.stderr
index 4384e345e..2b85fa9be 100644
--- a/src/test/ui/walk-struct-literal-with.stderr
+++ b/tests/ui/walk-struct-literal-with.stderr
@@ -8,7 +8,7 @@ LL |     let end = Mine{other_val:1, ..start.make_string_bar()};
 LL |     println!("{}", start.test);
    |                    ^^^^^^^^^^ value borrowed here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `start`
+note: `Mine::make_string_bar` takes ownership of the receiver `self`, which moves `start`
   --> $DIR/walk-struct-literal-with.rs:7:28
    |
 LL |     fn make_string_bar(mut self) -> Mine{
diff --git a/src/test/ui/wasm-custom-section-relocations.rs b/tests/ui/wasm-custom-section-relocations.rs
index c3cca3a35..c3cca3a35 100644
--- a/src/test/ui/wasm-custom-section-relocations.rs
+++ b/tests/ui/wasm-custom-section-relocations.rs
diff --git a/src/test/ui/wasm-custom-section-relocations.stderr b/tests/ui/wasm-custom-section-relocations.stderr
index a37edc51d..a37edc51d 100644
--- a/src/test/ui/wasm-custom-section-relocations.stderr
+++ b/tests/ui/wasm-custom-section-relocations.stderr
diff --git a/src/test/ui/wasm/simd-to-array-80108.rs b/tests/ui/wasm/simd-to-array-80108.rs
index 0576c2e6b..0576c2e6b 100644
--- a/src/test/ui/wasm/simd-to-array-80108.rs
+++ b/tests/ui/wasm/simd-to-array-80108.rs
diff --git a/src/test/ui/wasm/wasm-hang-issue-76281.rs b/tests/ui/wasm/wasm-hang-issue-76281.rs
index a4adfa6d0..a4adfa6d0 100644
--- a/src/test/ui/wasm/wasm-hang-issue-76281.rs
+++ b/tests/ui/wasm/wasm-hang-issue-76281.rs
diff --git a/src/test/ui/wasm/wasm-import-module.rs b/tests/ui/wasm/wasm-import-module.rs
index bff08847d..bff08847d 100644
--- a/src/test/ui/wasm/wasm-import-module.rs
+++ b/tests/ui/wasm/wasm-import-module.rs
diff --git a/src/test/ui/wasm/wasm-import-module.stderr b/tests/ui/wasm/wasm-import-module.stderr
index e792c33e9..e792c33e9 100644
--- a/src/test/ui/wasm/wasm-import-module.stderr
+++ b/tests/ui/wasm/wasm-import-module.stderr
diff --git a/src/test/ui/weak-new-uninhabited-issue-48493.rs b/tests/ui/weak-new-uninhabited-issue-48493.rs
index 39fbf3c9e..39fbf3c9e 100644
--- a/src/test/ui/weak-new-uninhabited-issue-48493.rs
+++ b/tests/ui/weak-new-uninhabited-issue-48493.rs
diff --git a/src/test/ui/weird-exit-code.rs b/tests/ui/weird-exit-code.rs
index a067b7b5b..a067b7b5b 100644
--- a/src/test/ui/weird-exit-code.rs
+++ b/tests/ui/weird-exit-code.rs
diff --git a/src/test/ui/weird-exprs.rs b/tests/ui/weird-exprs.rs
index d65703ef5..d65703ef5 100644
--- a/src/test/ui/weird-exprs.rs
+++ b/tests/ui/weird-exprs.rs
diff --git a/tests/ui/wf/hir-wf-canonicalized.rs b/tests/ui/wf/hir-wf-canonicalized.rs
new file mode 100644
index 000000000..bdb84409d
--- /dev/null
+++ b/tests/ui/wf/hir-wf-canonicalized.rs
@@ -0,0 +1,18 @@
+// incremental
+
+trait Foo {
+    type V;
+}
+
+trait Callback<T: Foo>: Fn(&Bar<'_, T>, &T::V) {}
+
+struct Bar<'a, T> {
+    callback: Box<dyn Callback<dyn Callback<Bar<'a, T>>>>,
+    //~^ ERROR the trait bound `Bar<'a, T>: Foo` is not satisfied
+    //~| ERROR the trait bound `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static): Foo` is not satisfied
+    //~| ERROR the size for values of type `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static)` cannot be known at compilation time
+}
+
+impl<T: Foo> Bar<'_, Bar<'_, T>> {}
+
+fn main() {}
diff --git a/tests/ui/wf/hir-wf-canonicalized.stderr b/tests/ui/wf/hir-wf-canonicalized.stderr
new file mode 100644
index 000000000..9fd0f9c81
--- /dev/null
+++ b/tests/ui/wf/hir-wf-canonicalized.stderr
@@ -0,0 +1,32 @@
+error[E0277]: the trait bound `Bar<'a, T>: Foo` is not satisfied
+  --> $DIR/hir-wf-canonicalized.rs:10:15
+   |
+LL |     callback: Box<dyn Callback<dyn Callback<Bar<'a, T>>>>,
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `Bar<'a, T>`
+
+error[E0277]: the trait bound `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static): Foo` is not satisfied
+  --> $DIR/hir-wf-canonicalized.rs:10:15
+   |
+LL |     callback: Box<dyn Callback<dyn Callback<Bar<'a, T>>>>,
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static)`
+
+error[E0277]: the size for values of type `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static)` cannot be known at compilation time
+  --> $DIR/hir-wf-canonicalized.rs:10:15
+   |
+LL |     callback: Box<dyn Callback<dyn Callback<Bar<'a, T>>>>,
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static)`
+note: required by a bound in `Bar`
+  --> $DIR/hir-wf-canonicalized.rs:9:16
+   |
+LL | struct Bar<'a, T> {
+   |                ^ required by this bound in `Bar`
+help: consider relaxing the implicit `Sized` restriction
+   |
+LL | struct Bar<'a, T: ?Sized> {
+   |                 ++++++++
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/wf/hir-wf-check-erase-regions.rs b/tests/ui/wf/hir-wf-check-erase-regions.rs
index 2b4b480df..2b4b480df 100644
--- a/src/test/ui/wf/hir-wf-check-erase-regions.rs
+++ b/tests/ui/wf/hir-wf-check-erase-regions.rs
diff --git a/src/test/ui/wf/hir-wf-check-erase-regions.stderr b/tests/ui/wf/hir-wf-check-erase-regions.stderr
index b04588c57..7bc19dd2e 100644
--- a/src/test/ui/wf/hir-wf-check-erase-regions.stderr
+++ b/tests/ui/wf/hir-wf-check-erase-regions.stderr
@@ -9,9 +9,6 @@ LL |     type IntoIter = std::iter::Flatten<std::slice::Iter<'a, T>>;
    = note: required for `&T` to implement `IntoIterator`
 note: required by a bound in `Flatten`
   --> $SRC_DIR/core/src/iter/adapters/flatten.rs:LL:COL
-   |
-LL | pub struct Flatten<I: Iterator<Item: IntoIterator>> {
-   |                                      ^^^^^^^^^^^^ required by this bound in `Flatten`
 
 error[E0277]: `&T` is not an iterator
   --> $DIR/hir-wf-check-erase-regions.rs:10:27
@@ -24,9 +21,6 @@ LL |     fn into_iter(self) -> Self::IntoIter {
    = note: required for `&T` to implement `IntoIterator`
 note: required by a bound in `Flatten`
   --> $SRC_DIR/core/src/iter/adapters/flatten.rs:LL:COL
-   |
-LL | pub struct Flatten<I: Iterator<Item: IntoIterator>> {
-   |                                      ^^^^^^^^^^^^ required by this bound in `Flatten`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/wf/issue-103573.rs b/tests/ui/wf/issue-103573.rs
index bcbf4f941..bcbf4f941 100644
--- a/src/test/ui/wf/issue-103573.rs
+++ b/tests/ui/wf/issue-103573.rs
diff --git a/src/test/ui/wf/issue-103573.stderr b/tests/ui/wf/issue-103573.stderr
index fcf3f15e4..5227badb7 100644
--- a/src/test/ui/wf/issue-103573.stderr
+++ b/tests/ui/wf/issue-103573.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the trait bound `<<Self as TraitC<E>>::TypeC<'a> as TraitB>::TypeB: TraitA` is not satisfied
-  --> $DIR/issue-103573.rs:18:5
+  --> $DIR/issue-103573.rs:18:18
    |
 LL |     fn g<'a>(_: &<<Self::TypeC<'a> as TraitB>::TypeB as TraitA>::TypeA);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `TraitA` is not implemented for `<<Self as TraitC<E>>::TypeC<'a> as TraitB>::TypeB`
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `TraitA` is not implemented for `<<Self as TraitC<E>>::TypeC<'a> as TraitB>::TypeB`
    |
 help: consider further restricting the associated type
    |
diff --git a/src/test/ui/wf/issue-48638.rs b/tests/ui/wf/issue-48638.rs
index f07843103..f07843103 100644
--- a/src/test/ui/wf/issue-48638.rs
+++ b/tests/ui/wf/issue-48638.rs
diff --git a/src/test/ui/wf/issue-87495.rs b/tests/ui/wf/issue-87495.rs
index 5aab74311..5aab74311 100644
--- a/src/test/ui/wf/issue-87495.rs
+++ b/tests/ui/wf/issue-87495.rs
diff --git a/src/test/ui/wf/issue-87495.stderr b/tests/ui/wf/issue-87495.stderr
index c924cd879..c924cd879 100644
--- a/src/test/ui/wf/issue-87495.stderr
+++ b/tests/ui/wf/issue-87495.stderr
diff --git a/src/test/ui/wf/issue-95665.rs b/tests/ui/wf/issue-95665.rs
index 67923cbb2..67923cbb2 100644
--- a/src/test/ui/wf/issue-95665.rs
+++ b/tests/ui/wf/issue-95665.rs
diff --git a/src/test/ui/wf/issue-95665.stderr b/tests/ui/wf/issue-95665.stderr
index b1cda59a9..b1cda59a9 100644
--- a/src/test/ui/wf/issue-95665.stderr
+++ b/tests/ui/wf/issue-95665.stderr
diff --git a/src/test/ui/wf/issue-96810.rs b/tests/ui/wf/issue-96810.rs
index c2948086b..c2948086b 100644
--- a/src/test/ui/wf/issue-96810.rs
+++ b/tests/ui/wf/issue-96810.rs
diff --git a/src/test/ui/wf/issue-96810.stderr b/tests/ui/wf/issue-96810.stderr
index 1407e62b1..1407e62b1 100644
--- a/src/test/ui/wf/issue-96810.stderr
+++ b/tests/ui/wf/issue-96810.stderr
diff --git a/src/test/ui/wf/wf-array-elem-sized.rs b/tests/ui/wf/wf-array-elem-sized.rs
index 34bf22034..34bf22034 100644
--- a/src/test/ui/wf/wf-array-elem-sized.rs
+++ b/tests/ui/wf/wf-array-elem-sized.rs
diff --git a/src/test/ui/wf/wf-array-elem-sized.stderr b/tests/ui/wf/wf-array-elem-sized.stderr
index 7f3c58d6b..7f3c58d6b 100644
--- a/src/test/ui/wf/wf-array-elem-sized.stderr
+++ b/tests/ui/wf/wf-array-elem-sized.stderr
diff --git a/src/test/ui/wf/wf-complex-assoc-type.rs b/tests/ui/wf/wf-complex-assoc-type.rs
index c3811e823..c3811e823 100644
--- a/src/test/ui/wf/wf-complex-assoc-type.rs
+++ b/tests/ui/wf/wf-complex-assoc-type.rs
diff --git a/src/test/ui/wf/wf-complex-assoc-type.stderr b/tests/ui/wf/wf-complex-assoc-type.stderr
index ef613e313..ef613e313 100644
--- a/src/test/ui/wf/wf-complex-assoc-type.stderr
+++ b/tests/ui/wf/wf-complex-assoc-type.stderr
diff --git a/src/test/ui/wf/wf-const-type.rs b/tests/ui/wf/wf-const-type.rs
index df79aa267..df79aa267 100644
--- a/src/test/ui/wf/wf-const-type.rs
+++ b/tests/ui/wf/wf-const-type.rs
diff --git a/src/test/ui/wf/wf-const-type.stderr b/tests/ui/wf/wf-const-type.stderr
index 85938364e..85938364e 100644
--- a/src/test/ui/wf/wf-const-type.stderr
+++ b/tests/ui/wf/wf-const-type.stderr
diff --git a/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.rs b/tests/ui/wf/wf-convert-unsafe-trait-obj-box.rs
index ffdb49a3b..ffdb49a3b 100644
--- a/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.rs
+++ b/tests/ui/wf/wf-convert-unsafe-trait-obj-box.rs
diff --git a/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.stderr b/tests/ui/wf/wf-convert-unsafe-trait-obj-box.stderr
index 6cf4f33f9..6cf4f33f9 100644
--- a/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.stderr
+++ b/tests/ui/wf/wf-convert-unsafe-trait-obj-box.stderr
diff --git a/src/test/ui/wf/wf-convert-unsafe-trait-obj.rs b/tests/ui/wf/wf-convert-unsafe-trait-obj.rs
index 143b854ed..143b854ed 100644
--- a/src/test/ui/wf/wf-convert-unsafe-trait-obj.rs
+++ b/tests/ui/wf/wf-convert-unsafe-trait-obj.rs
diff --git a/src/test/ui/wf/wf-convert-unsafe-trait-obj.stderr b/tests/ui/wf/wf-convert-unsafe-trait-obj.stderr
index c9bd4549a..c9bd4549a 100644
--- a/src/test/ui/wf/wf-convert-unsafe-trait-obj.stderr
+++ b/tests/ui/wf/wf-convert-unsafe-trait-obj.stderr
diff --git a/src/test/ui/wf/wf-enum-bound.rs b/tests/ui/wf/wf-enum-bound.rs
index 042a2cb09..042a2cb09 100644
--- a/src/test/ui/wf/wf-enum-bound.rs
+++ b/tests/ui/wf/wf-enum-bound.rs
diff --git a/src/test/ui/wf/wf-enum-bound.stderr b/tests/ui/wf/wf-enum-bound.stderr
index d39fc0c6a..d39fc0c6a 100644
--- a/src/test/ui/wf/wf-enum-bound.stderr
+++ b/tests/ui/wf/wf-enum-bound.stderr
diff --git a/src/test/ui/wf/wf-enum-fields-struct-variant.rs b/tests/ui/wf/wf-enum-fields-struct-variant.rs
index c25622fa7..c25622fa7 100644
--- a/src/test/ui/wf/wf-enum-fields-struct-variant.rs
+++ b/tests/ui/wf/wf-enum-fields-struct-variant.rs
diff --git a/src/test/ui/wf/wf-enum-fields-struct-variant.stderr b/tests/ui/wf/wf-enum-fields-struct-variant.stderr
index c12d62521..c12d62521 100644
--- a/src/test/ui/wf/wf-enum-fields-struct-variant.stderr
+++ b/tests/ui/wf/wf-enum-fields-struct-variant.stderr
diff --git a/src/test/ui/wf/wf-enum-fields.rs b/tests/ui/wf/wf-enum-fields.rs
index a465ffe5e..a465ffe5e 100644
--- a/src/test/ui/wf/wf-enum-fields.rs
+++ b/tests/ui/wf/wf-enum-fields.rs
diff --git a/src/test/ui/wf/wf-enum-fields.stderr b/tests/ui/wf/wf-enum-fields.stderr
index ac3301a96..ac3301a96 100644
--- a/src/test/ui/wf/wf-enum-fields.stderr
+++ b/tests/ui/wf/wf-enum-fields.stderr
diff --git a/src/test/ui/wf/wf-fn-where-clause.rs b/tests/ui/wf/wf-fn-where-clause.rs
index adae53613..adae53613 100644
--- a/src/test/ui/wf/wf-fn-where-clause.rs
+++ b/tests/ui/wf/wf-fn-where-clause.rs
diff --git a/src/test/ui/wf/wf-fn-where-clause.stderr b/tests/ui/wf/wf-fn-where-clause.stderr
index 2aec641e7..2aec641e7 100644
--- a/src/test/ui/wf/wf-fn-where-clause.stderr
+++ b/tests/ui/wf/wf-fn-where-clause.stderr
diff --git a/src/test/ui/wf/wf-foreign-fn-decl-ret.rs b/tests/ui/wf/wf-foreign-fn-decl-ret.rs
index b9d956c05..b9d956c05 100644
--- a/src/test/ui/wf/wf-foreign-fn-decl-ret.rs
+++ b/tests/ui/wf/wf-foreign-fn-decl-ret.rs
diff --git a/src/test/ui/wf/wf-foreign-fn-decl-ret.stderr b/tests/ui/wf/wf-foreign-fn-decl-ret.stderr
index 78312a091..b03023b5f 100644
--- a/src/test/ui/wf/wf-foreign-fn-decl-ret.stderr
+++ b/tests/ui/wf/wf-foreign-fn-decl-ret.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the trait bound `(): Foo` is not satisfied
-  --> $DIR/wf-foreign-fn-decl-ret.rs:11:5
+  --> $DIR/wf-foreign-fn-decl-ret.rs:11:25
    |
 LL |     pub fn lint_me() -> <() as Foo>::Assoc;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `()`
+   |                         ^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `()`
 
 error[E0277]: the trait bound `u32: Unsatisfied` is not satisfied
   --> $DIR/wf-foreign-fn-decl-ret.rs:14:32
diff --git a/src/test/ui/wf/wf-impl-associated-type-region.rs b/tests/ui/wf/wf-impl-associated-type-region.rs
index 1bf8d3663..1bf8d3663 100644
--- a/src/test/ui/wf/wf-impl-associated-type-region.rs
+++ b/tests/ui/wf/wf-impl-associated-type-region.rs
diff --git a/src/test/ui/wf/wf-impl-associated-type-region.stderr b/tests/ui/wf/wf-impl-associated-type-region.stderr
index b9d4857a3..b9d4857a3 100644
--- a/src/test/ui/wf/wf-impl-associated-type-region.stderr
+++ b/tests/ui/wf/wf-impl-associated-type-region.stderr
diff --git a/src/test/ui/wf/wf-impl-associated-type-trait.rs b/tests/ui/wf/wf-impl-associated-type-trait.rs
index 84e628e21..84e628e21 100644
--- a/src/test/ui/wf/wf-impl-associated-type-trait.rs
+++ b/tests/ui/wf/wf-impl-associated-type-trait.rs
diff --git a/src/test/ui/wf/wf-impl-associated-type-trait.stderr b/tests/ui/wf/wf-impl-associated-type-trait.stderr
index bdf8bba5e..bdf8bba5e 100644
--- a/src/test/ui/wf/wf-impl-associated-type-trait.stderr
+++ b/tests/ui/wf/wf-impl-associated-type-trait.stderr
diff --git a/src/test/ui/wf/wf-impl-self-type.rs b/tests/ui/wf/wf-impl-self-type.rs
index 2dd9b4ef0..2dd9b4ef0 100644
--- a/src/test/ui/wf/wf-impl-self-type.rs
+++ b/tests/ui/wf/wf-impl-self-type.rs
diff --git a/src/test/ui/wf/wf-impl-self-type.stderr b/tests/ui/wf/wf-impl-self-type.stderr
index 371321793..1ca368729 100644
--- a/src/test/ui/wf/wf-impl-self-type.stderr
+++ b/tests/ui/wf/wf-impl-self-type.stderr
@@ -7,9 +7,6 @@ LL | impl Foo for Option<[u8]> {}
    = help: the trait `Sized` is not implemented for `[u8]`
 note: required by a bound in `Option`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL | pub enum Option<T> {
-   |                 ^ required by this bound in `Option`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-in-fn-arg.rs b/tests/ui/wf/wf-in-fn-arg.rs
index 18df72336..18df72336 100644
--- a/src/test/ui/wf/wf-in-fn-arg.rs
+++ b/tests/ui/wf/wf-in-fn-arg.rs
diff --git a/src/test/ui/wf/wf-in-fn-arg.stderr b/tests/ui/wf/wf-in-fn-arg.stderr
index 83a4a592a..83a4a592a 100644
--- a/src/test/ui/wf/wf-in-fn-arg.stderr
+++ b/tests/ui/wf/wf-in-fn-arg.stderr
diff --git a/src/test/ui/wf/wf-in-fn-ret.rs b/tests/ui/wf/wf-in-fn-ret.rs
index 4c9535184..4c9535184 100644
--- a/src/test/ui/wf/wf-in-fn-ret.rs
+++ b/tests/ui/wf/wf-in-fn-ret.rs
diff --git a/src/test/ui/wf/wf-in-fn-ret.stderr b/tests/ui/wf/wf-in-fn-ret.stderr
index 7eeb97472..7eeb97472 100644
--- a/src/test/ui/wf/wf-in-fn-ret.stderr
+++ b/tests/ui/wf/wf-in-fn-ret.stderr
diff --git a/src/test/ui/wf/wf-in-fn-type-arg.rs b/tests/ui/wf/wf-in-fn-type-arg.rs
index 2917a8aa9..2917a8aa9 100644
--- a/src/test/ui/wf/wf-in-fn-type-arg.rs
+++ b/tests/ui/wf/wf-in-fn-type-arg.rs
diff --git a/src/test/ui/wf/wf-in-fn-type-arg.stderr b/tests/ui/wf/wf-in-fn-type-arg.stderr
index be5e9d418..be5e9d418 100644
--- a/src/test/ui/wf/wf-in-fn-type-arg.stderr
+++ b/tests/ui/wf/wf-in-fn-type-arg.stderr
diff --git a/src/test/ui/wf/wf-in-fn-type-ret.rs b/tests/ui/wf/wf-in-fn-type-ret.rs
index ab8e697e3..ab8e697e3 100644
--- a/src/test/ui/wf/wf-in-fn-type-ret.rs
+++ b/tests/ui/wf/wf-in-fn-type-ret.rs
diff --git a/src/test/ui/wf/wf-in-fn-type-ret.stderr b/tests/ui/wf/wf-in-fn-type-ret.stderr
index 8fcfcb0b2..8fcfcb0b2 100644
--- a/src/test/ui/wf/wf-in-fn-type-ret.stderr
+++ b/tests/ui/wf/wf-in-fn-type-ret.stderr
diff --git a/src/test/ui/wf/wf-in-fn-type-static.rs b/tests/ui/wf/wf-in-fn-type-static.rs
index 73071dd23..73071dd23 100644
--- a/src/test/ui/wf/wf-in-fn-type-static.rs
+++ b/tests/ui/wf/wf-in-fn-type-static.rs
diff --git a/src/test/ui/wf/wf-in-fn-type-static.stderr b/tests/ui/wf/wf-in-fn-type-static.stderr
index 73fbb9ca6..73fbb9ca6 100644
--- a/src/test/ui/wf/wf-in-fn-type-static.stderr
+++ b/tests/ui/wf/wf-in-fn-type-static.stderr
diff --git a/src/test/ui/wf/wf-in-fn-where-clause.rs b/tests/ui/wf/wf-in-fn-where-clause.rs
index e55295a3b..e55295a3b 100644
--- a/src/test/ui/wf/wf-in-fn-where-clause.rs
+++ b/tests/ui/wf/wf-in-fn-where-clause.rs
diff --git a/src/test/ui/wf/wf-in-fn-where-clause.stderr b/tests/ui/wf/wf-in-fn-where-clause.stderr
index 160a73840..160a73840 100644
--- a/src/test/ui/wf/wf-in-fn-where-clause.stderr
+++ b/tests/ui/wf/wf-in-fn-where-clause.stderr
diff --git a/src/test/ui/wf/wf-in-foreign-fn-decls-issue-80468.rs b/tests/ui/wf/wf-in-foreign-fn-decls-issue-80468.rs
index 4fcf8f403..4fcf8f403 100644
--- a/src/test/ui/wf/wf-in-foreign-fn-decls-issue-80468.rs
+++ b/tests/ui/wf/wf-in-foreign-fn-decls-issue-80468.rs
diff --git a/src/test/ui/wf/wf-in-foreign-fn-decls-issue-80468.stderr b/tests/ui/wf/wf-in-foreign-fn-decls-issue-80468.stderr
index 94f6dc266..94f6dc266 100644
--- a/src/test/ui/wf/wf-in-foreign-fn-decls-issue-80468.stderr
+++ b/tests/ui/wf/wf-in-foreign-fn-decls-issue-80468.stderr
diff --git a/src/test/ui/wf/wf-in-obj-type-static.rs b/tests/ui/wf/wf-in-obj-type-static.rs
index 1ad2fd1ed..1ad2fd1ed 100644
--- a/src/test/ui/wf/wf-in-obj-type-static.rs
+++ b/tests/ui/wf/wf-in-obj-type-static.rs
diff --git a/src/test/ui/wf/wf-in-obj-type-static.stderr b/tests/ui/wf/wf-in-obj-type-static.stderr
index c3ad42dd5..c3ad42dd5 100644
--- a/src/test/ui/wf/wf-in-obj-type-static.stderr
+++ b/tests/ui/wf/wf-in-obj-type-static.stderr
diff --git a/src/test/ui/wf/wf-in-obj-type-trait.rs b/tests/ui/wf/wf-in-obj-type-trait.rs
index 170fad55f..170fad55f 100644
--- a/src/test/ui/wf/wf-in-obj-type-trait.rs
+++ b/tests/ui/wf/wf-in-obj-type-trait.rs
diff --git a/src/test/ui/wf/wf-in-obj-type-trait.stderr b/tests/ui/wf/wf-in-obj-type-trait.stderr
index f556b678e..f556b678e 100644
--- a/src/test/ui/wf/wf-in-obj-type-trait.stderr
+++ b/tests/ui/wf/wf-in-obj-type-trait.stderr
diff --git a/src/test/ui/wf/wf-inherent-impl-method-where-clause.rs b/tests/ui/wf/wf-inherent-impl-method-where-clause.rs
index eb50fc010..eb50fc010 100644
--- a/src/test/ui/wf/wf-inherent-impl-method-where-clause.rs
+++ b/tests/ui/wf/wf-inherent-impl-method-where-clause.rs
diff --git a/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr b/tests/ui/wf/wf-inherent-impl-method-where-clause.stderr
index e723d1ba7..e723d1ba7 100644
--- a/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr
+++ b/tests/ui/wf/wf-inherent-impl-method-where-clause.stderr
diff --git a/src/test/ui/wf/wf-inherent-impl-where-clause.rs b/tests/ui/wf/wf-inherent-impl-where-clause.rs
index ac194fb13..ac194fb13 100644
--- a/src/test/ui/wf/wf-inherent-impl-where-clause.rs
+++ b/tests/ui/wf/wf-inherent-impl-where-clause.rs
diff --git a/src/test/ui/wf/wf-inherent-impl-where-clause.stderr b/tests/ui/wf/wf-inherent-impl-where-clause.stderr
index 39e0d348e..39e0d348e 100644
--- a/src/test/ui/wf/wf-inherent-impl-where-clause.stderr
+++ b/tests/ui/wf/wf-inherent-impl-where-clause.stderr
diff --git a/src/test/ui/wf/wf-misc-methods-issue-28609.rs b/tests/ui/wf/wf-misc-methods-issue-28609.rs
index 050f866e1..050f866e1 100644
--- a/src/test/ui/wf/wf-misc-methods-issue-28609.rs
+++ b/tests/ui/wf/wf-misc-methods-issue-28609.rs
diff --git a/src/test/ui/wf/wf-misc-methods-issue-28609.stderr b/tests/ui/wf/wf-misc-methods-issue-28609.stderr
index fc5898434..fc5898434 100644
--- a/src/test/ui/wf/wf-misc-methods-issue-28609.stderr
+++ b/tests/ui/wf/wf-misc-methods-issue-28609.stderr
diff --git a/src/test/ui/wf/wf-object-safe.rs b/tests/ui/wf/wf-object-safe.rs
index 42e691755..42e691755 100644
--- a/src/test/ui/wf/wf-object-safe.rs
+++ b/tests/ui/wf/wf-object-safe.rs
diff --git a/src/test/ui/wf/wf-object-safe.stderr b/tests/ui/wf/wf-object-safe.stderr
index 64969fbe3..64969fbe3 100644
--- a/src/test/ui/wf/wf-object-safe.stderr
+++ b/tests/ui/wf/wf-object-safe.stderr
diff --git a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.rs b/tests/ui/wf/wf-outlives-ty-in-fn-or-trait.rs
index 85a332e24..85a332e24 100644
--- a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.rs
+++ b/tests/ui/wf/wf-outlives-ty-in-fn-or-trait.rs
diff --git a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr b/tests/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr
index 4d4d8b2ab..4d4d8b2ab 100644
--- a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr
+++ b/tests/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr
diff --git a/src/test/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.rs b/tests/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.rs
index d0167c8c2..d0167c8c2 100644
--- a/src/test/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.rs
+++ b/tests/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.rs
diff --git a/src/test/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.stderr b/tests/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.stderr
index e460cdcd3..e460cdcd3 100644
--- a/src/test/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.stderr
+++ b/tests/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.stderr
diff --git a/src/test/ui/wf/wf-static-method.rs b/tests/ui/wf/wf-static-method.rs
index 7ff195230..7ff195230 100644
--- a/src/test/ui/wf/wf-static-method.rs
+++ b/tests/ui/wf/wf-static-method.rs
diff --git a/src/test/ui/wf/wf-static-method.stderr b/tests/ui/wf/wf-static-method.stderr
index 161609a5f..161609a5f 100644
--- a/src/test/ui/wf/wf-static-method.stderr
+++ b/tests/ui/wf/wf-static-method.stderr
diff --git a/src/test/ui/wf/wf-static-type.rs b/tests/ui/wf/wf-static-type.rs
index 1c35e1daf..1c35e1daf 100644
--- a/src/test/ui/wf/wf-static-type.rs
+++ b/tests/ui/wf/wf-static-type.rs
diff --git a/src/test/ui/wf/wf-static-type.stderr b/tests/ui/wf/wf-static-type.stderr
index 16c6124b6..16c6124b6 100644
--- a/src/test/ui/wf/wf-static-type.stderr
+++ b/tests/ui/wf/wf-static-type.stderr
diff --git a/src/test/ui/wf/wf-struct-bound.rs b/tests/ui/wf/wf-struct-bound.rs
index 6e558ca8f..6e558ca8f 100644
--- a/src/test/ui/wf/wf-struct-bound.rs
+++ b/tests/ui/wf/wf-struct-bound.rs
diff --git a/src/test/ui/wf/wf-struct-bound.stderr b/tests/ui/wf/wf-struct-bound.stderr
index 6248e3e4e..6248e3e4e 100644
--- a/src/test/ui/wf/wf-struct-bound.stderr
+++ b/tests/ui/wf/wf-struct-bound.stderr
diff --git a/src/test/ui/wf/wf-struct-field.rs b/tests/ui/wf/wf-struct-field.rs
index 63f8b4382..63f8b4382 100644
--- a/src/test/ui/wf/wf-struct-field.rs
+++ b/tests/ui/wf/wf-struct-field.rs
diff --git a/src/test/ui/wf/wf-struct-field.stderr b/tests/ui/wf/wf-struct-field.stderr
index 78a8da860..78a8da860 100644
--- a/src/test/ui/wf/wf-struct-field.stderr
+++ b/tests/ui/wf/wf-struct-field.stderr
diff --git a/src/test/ui/wf/wf-trait-associated-type-bound.rs b/tests/ui/wf/wf-trait-associated-type-bound.rs
index 2f20e65e5..2f20e65e5 100644
--- a/src/test/ui/wf/wf-trait-associated-type-bound.rs
+++ b/tests/ui/wf/wf-trait-associated-type-bound.rs
diff --git a/src/test/ui/wf/wf-trait-associated-type-bound.stderr b/tests/ui/wf/wf-trait-associated-type-bound.stderr
index 829770017..829770017 100644
--- a/src/test/ui/wf/wf-trait-associated-type-bound.stderr
+++ b/tests/ui/wf/wf-trait-associated-type-bound.stderr
diff --git a/src/test/ui/wf/wf-trait-associated-type-region.rs b/tests/ui/wf/wf-trait-associated-type-region.rs
index 0dfc9f098..0dfc9f098 100644
--- a/src/test/ui/wf/wf-trait-associated-type-region.rs
+++ b/tests/ui/wf/wf-trait-associated-type-region.rs
diff --git a/src/test/ui/wf/wf-trait-associated-type-region.stderr b/tests/ui/wf/wf-trait-associated-type-region.stderr
index 6e2cc8aba..6e2cc8aba 100644
--- a/src/test/ui/wf/wf-trait-associated-type-region.stderr
+++ b/tests/ui/wf/wf-trait-associated-type-region.stderr
diff --git a/src/test/ui/wf/wf-trait-associated-type-trait.rs b/tests/ui/wf/wf-trait-associated-type-trait.rs
index d67e110ed..d67e110ed 100644
--- a/src/test/ui/wf/wf-trait-associated-type-trait.rs
+++ b/tests/ui/wf/wf-trait-associated-type-trait.rs
diff --git a/src/test/ui/wf/wf-trait-associated-type-trait.stderr b/tests/ui/wf/wf-trait-associated-type-trait.stderr
index a73c3a2ae..a73c3a2ae 100644
--- a/src/test/ui/wf/wf-trait-associated-type-trait.stderr
+++ b/tests/ui/wf/wf-trait-associated-type-trait.stderr
diff --git a/src/test/ui/wf/wf-trait-bound.rs b/tests/ui/wf/wf-trait-bound.rs
index 62a1eb5b0..62a1eb5b0 100644
--- a/src/test/ui/wf/wf-trait-bound.rs
+++ b/tests/ui/wf/wf-trait-bound.rs
diff --git a/src/test/ui/wf/wf-trait-bound.stderr b/tests/ui/wf/wf-trait-bound.stderr
index bace3e3ef..bace3e3ef 100644
--- a/src/test/ui/wf/wf-trait-bound.stderr
+++ b/tests/ui/wf/wf-trait-bound.stderr
diff --git a/src/test/ui/wf/wf-trait-default-fn-arg.rs b/tests/ui/wf/wf-trait-default-fn-arg.rs
index 64fc35aeb..64fc35aeb 100644
--- a/src/test/ui/wf/wf-trait-default-fn-arg.rs
+++ b/tests/ui/wf/wf-trait-default-fn-arg.rs
diff --git a/src/test/ui/wf/wf-trait-default-fn-arg.stderr b/tests/ui/wf/wf-trait-default-fn-arg.stderr
index 8c3d0568f..8c3d0568f 100644
--- a/src/test/ui/wf/wf-trait-default-fn-arg.stderr
+++ b/tests/ui/wf/wf-trait-default-fn-arg.stderr
diff --git a/src/test/ui/wf/wf-trait-default-fn-ret.rs b/tests/ui/wf/wf-trait-default-fn-ret.rs
index 2103dae8d..2103dae8d 100644
--- a/src/test/ui/wf/wf-trait-default-fn-ret.rs
+++ b/tests/ui/wf/wf-trait-default-fn-ret.rs
diff --git a/src/test/ui/wf/wf-trait-default-fn-ret.stderr b/tests/ui/wf/wf-trait-default-fn-ret.stderr
index 6422e862d..6422e862d 100644
--- a/src/test/ui/wf/wf-trait-default-fn-ret.stderr
+++ b/tests/ui/wf/wf-trait-default-fn-ret.stderr
diff --git a/src/test/ui/wf/wf-trait-default-fn-where-clause.rs b/tests/ui/wf/wf-trait-default-fn-where-clause.rs
index ded97214f..ded97214f 100644
--- a/src/test/ui/wf/wf-trait-default-fn-where-clause.rs
+++ b/tests/ui/wf/wf-trait-default-fn-where-clause.rs
diff --git a/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr b/tests/ui/wf/wf-trait-default-fn-where-clause.stderr
index f260d5750..f260d5750 100644
--- a/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr
+++ b/tests/ui/wf/wf-trait-default-fn-where-clause.stderr
diff --git a/src/test/ui/wf/wf-trait-fn-arg.rs b/tests/ui/wf/wf-trait-fn-arg.rs
index 044569942..044569942 100644
--- a/src/test/ui/wf/wf-trait-fn-arg.rs
+++ b/tests/ui/wf/wf-trait-fn-arg.rs
diff --git a/src/test/ui/wf/wf-trait-fn-arg.stderr b/tests/ui/wf/wf-trait-fn-arg.stderr
index 3bd1f4892..3bd1f4892 100644
--- a/src/test/ui/wf/wf-trait-fn-arg.stderr
+++ b/tests/ui/wf/wf-trait-fn-arg.stderr
diff --git a/src/test/ui/wf/wf-trait-fn-ret.rs b/tests/ui/wf/wf-trait-fn-ret.rs
index f49e43087..f49e43087 100644
--- a/src/test/ui/wf/wf-trait-fn-ret.rs
+++ b/tests/ui/wf/wf-trait-fn-ret.rs
diff --git a/src/test/ui/wf/wf-trait-fn-ret.stderr b/tests/ui/wf/wf-trait-fn-ret.stderr
index 9bd3cc771..9bd3cc771 100644
--- a/src/test/ui/wf/wf-trait-fn-ret.stderr
+++ b/tests/ui/wf/wf-trait-fn-ret.stderr
diff --git a/src/test/ui/wf/wf-trait-fn-where-clause.rs b/tests/ui/wf/wf-trait-fn-where-clause.rs
index 1d2427ff9..1d2427ff9 100644
--- a/src/test/ui/wf/wf-trait-fn-where-clause.rs
+++ b/tests/ui/wf/wf-trait-fn-where-clause.rs
diff --git a/src/test/ui/wf/wf-trait-fn-where-clause.stderr b/tests/ui/wf/wf-trait-fn-where-clause.stderr
index d064f7fc5..d064f7fc5 100644
--- a/src/test/ui/wf/wf-trait-fn-where-clause.stderr
+++ b/tests/ui/wf/wf-trait-fn-where-clause.stderr
diff --git a/src/test/ui/wf/wf-trait-superbound.rs b/tests/ui/wf/wf-trait-superbound.rs
index 8905a8820..8905a8820 100644
--- a/src/test/ui/wf/wf-trait-superbound.rs
+++ b/tests/ui/wf/wf-trait-superbound.rs
diff --git a/src/test/ui/wf/wf-trait-superbound.stderr b/tests/ui/wf/wf-trait-superbound.stderr
index cd49243a4..cd49243a4 100644
--- a/src/test/ui/wf/wf-trait-superbound.stderr
+++ b/tests/ui/wf/wf-trait-superbound.stderr
diff --git a/src/test/ui/wf/wf-unsafe-trait-obj-match.rs b/tests/ui/wf/wf-unsafe-trait-obj-match.rs
index c8731a8ec..c8731a8ec 100644
--- a/src/test/ui/wf/wf-unsafe-trait-obj-match.rs
+++ b/tests/ui/wf/wf-unsafe-trait-obj-match.rs
diff --git a/src/test/ui/wf/wf-unsafe-trait-obj-match.stderr b/tests/ui/wf/wf-unsafe-trait-obj-match.stderr
index 96fc1d36b..96fc1d36b 100644
--- a/src/test/ui/wf/wf-unsafe-trait-obj-match.stderr
+++ b/tests/ui/wf/wf-unsafe-trait-obj-match.stderr
diff --git a/src/test/ui/where-clauses/auxiliary/where_clauses_xc.rs b/tests/ui/where-clauses/auxiliary/where_clauses_xc.rs
index 7c8043b20..7c8043b20 100644
--- a/src/test/ui/where-clauses/auxiliary/where_clauses_xc.rs
+++ b/tests/ui/where-clauses/auxiliary/where_clauses_xc.rs
diff --git a/src/test/ui/where-clauses/higher-ranked-fn-type.quiet.stderr b/tests/ui/where-clauses/higher-ranked-fn-type.quiet.stderr
index 30248a7a3..30248a7a3 100644
--- a/src/test/ui/where-clauses/higher-ranked-fn-type.quiet.stderr
+++ b/tests/ui/where-clauses/higher-ranked-fn-type.quiet.stderr
diff --git a/src/test/ui/where-clauses/higher-ranked-fn-type.rs b/tests/ui/where-clauses/higher-ranked-fn-type.rs
index c19e75eb7..c19e75eb7 100644
--- a/src/test/ui/where-clauses/higher-ranked-fn-type.rs
+++ b/tests/ui/where-clauses/higher-ranked-fn-type.rs
diff --git a/src/test/ui/where-clauses/higher-ranked-fn-type.verbose.stderr b/tests/ui/where-clauses/higher-ranked-fn-type.verbose.stderr
index 268cef6e2..268cef6e2 100644
--- a/src/test/ui/where-clauses/higher-ranked-fn-type.verbose.stderr
+++ b/tests/ui/where-clauses/higher-ranked-fn-type.verbose.stderr
diff --git a/tests/ui/where-clauses/ignore-err-clauses.rs b/tests/ui/where-clauses/ignore-err-clauses.rs
new file mode 100644
index 000000000..c76f0e1a8
--- /dev/null
+++ b/tests/ui/where-clauses/ignore-err-clauses.rs
@@ -0,0 +1,14 @@
+use std::ops::Add;
+
+fn dbl<T>(x: T) -> <T as Add>::Output
+where
+    T: Copy + Add,
+    UUU: Copy,
+    //~^ ERROR cannot find type `UUU` in this scope
+{
+    x + x
+}
+
+fn main() {
+    println!("{}", dbl(3));
+}
diff --git a/tests/ui/where-clauses/ignore-err-clauses.stderr b/tests/ui/where-clauses/ignore-err-clauses.stderr
new file mode 100644
index 000000000..cfddc3e10
--- /dev/null
+++ b/tests/ui/where-clauses/ignore-err-clauses.stderr
@@ -0,0 +1,9 @@
+error[E0412]: cannot find type `UUU` in this scope
+  --> $DIR/ignore-err-clauses.rs:6:5
+   |
+LL |     UUU: Copy,
+   |     ^^^ not found in this scope
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/where-clauses/where-clause-bounds-inconsistency.rs b/tests/ui/where-clauses/where-clause-bounds-inconsistency.rs
index cf7d06b61..cf7d06b61 100644
--- a/src/test/ui/where-clauses/where-clause-bounds-inconsistency.rs
+++ b/tests/ui/where-clauses/where-clause-bounds-inconsistency.rs
diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.rs b/tests/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.rs
index 0e8bb61a7..0e8bb61a7 100644
--- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.rs
+++ b/tests/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.rs
diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr b/tests/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr
index 43fbc0a90..43fbc0a90 100644
--- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr
+++ b/tests/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr
diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.rs b/tests/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.rs
index 25c46330e..25c46330e 100644
--- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.rs
+++ b/tests/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.rs
diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr b/tests/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr
index f2db8fcc4..f2db8fcc4 100644
--- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr
+++ b/tests/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr
diff --git a/src/test/ui/where-clauses/where-clause-early-bound-lifetimes.rs b/tests/ui/where-clauses/where-clause-early-bound-lifetimes.rs
index 6fc570b9b..6fc570b9b 100644
--- a/src/test/ui/where-clauses/where-clause-early-bound-lifetimes.rs
+++ b/tests/ui/where-clauses/where-clause-early-bound-lifetimes.rs
diff --git a/src/test/ui/where-clauses/where-clause-method-substituion-rpass.rs b/tests/ui/where-clauses/where-clause-method-substituion-rpass.rs
index daa3c8dd8..daa3c8dd8 100644
--- a/src/test/ui/where-clauses/where-clause-method-substituion-rpass.rs
+++ b/tests/ui/where-clauses/where-clause-method-substituion-rpass.rs
diff --git a/src/test/ui/where-clauses/where-clause-method-substituion.rs b/tests/ui/where-clauses/where-clause-method-substituion.rs
index 4607783c0..4607783c0 100644
--- a/src/test/ui/where-clauses/where-clause-method-substituion.rs
+++ b/tests/ui/where-clauses/where-clause-method-substituion.rs
diff --git a/src/test/ui/where-clauses/where-clause-method-substituion.stderr b/tests/ui/where-clauses/where-clause-method-substituion.stderr
index 8c47ed6d4..8c47ed6d4 100644
--- a/src/test/ui/where-clauses/where-clause-method-substituion.stderr
+++ b/tests/ui/where-clauses/where-clause-method-substituion.stderr
diff --git a/src/test/ui/where-clauses/where-clause-region-outlives.rs b/tests/ui/where-clauses/where-clause-region-outlives.rs
index 84925345d..84925345d 100644
--- a/src/test/ui/where-clauses/where-clause-region-outlives.rs
+++ b/tests/ui/where-clauses/where-clause-region-outlives.rs
diff --git a/src/test/ui/where-clauses/where-clauses-cross-crate.rs b/tests/ui/where-clauses/where-clauses-cross-crate.rs
index 9edf0bd5b..9edf0bd5b 100644
--- a/src/test/ui/where-clauses/where-clauses-cross-crate.rs
+++ b/tests/ui/where-clauses/where-clauses-cross-crate.rs
diff --git a/src/test/ui/where-clauses/where-clauses-lifetimes.rs b/tests/ui/where-clauses/where-clauses-lifetimes.rs
index 4bfd9e659..4bfd9e659 100644
--- a/src/test/ui/where-clauses/where-clauses-lifetimes.rs
+++ b/tests/ui/where-clauses/where-clauses-lifetimes.rs
diff --git a/src/test/ui/where-clauses/where-clauses-method-unsatisfied.rs b/tests/ui/where-clauses/where-clauses-method-unsatisfied.rs
index a8ae02964..a8ae02964 100644
--- a/src/test/ui/where-clauses/where-clauses-method-unsatisfied.rs
+++ b/tests/ui/where-clauses/where-clauses-method-unsatisfied.rs
diff --git a/src/test/ui/where-clauses/where-clauses-method-unsatisfied.stderr b/tests/ui/where-clauses/where-clauses-method-unsatisfied.stderr
index e90502977..e90502977 100644
--- a/src/test/ui/where-clauses/where-clauses-method-unsatisfied.stderr
+++ b/tests/ui/where-clauses/where-clauses-method-unsatisfied.stderr
diff --git a/src/test/ui/where-clauses/where-clauses-method.rs b/tests/ui/where-clauses/where-clauses-method.rs
index feecff435..feecff435 100644
--- a/src/test/ui/where-clauses/where-clauses-method.rs
+++ b/tests/ui/where-clauses/where-clauses-method.rs
diff --git a/src/test/ui/where-clauses/where-clauses-unboxed-closures.rs b/tests/ui/where-clauses/where-clauses-unboxed-closures.rs
index 6964cfa2e..6964cfa2e 100644
--- a/src/test/ui/where-clauses/where-clauses-unboxed-closures.rs
+++ b/tests/ui/where-clauses/where-clauses-unboxed-closures.rs
diff --git a/src/test/ui/where-clauses/where-clauses-unsatisfied.rs b/tests/ui/where-clauses/where-clauses-unsatisfied.rs
index 8b067d30a..8b067d30a 100644
--- a/src/test/ui/where-clauses/where-clauses-unsatisfied.rs
+++ b/tests/ui/where-clauses/where-clauses-unsatisfied.rs
diff --git a/src/test/ui/where-clauses/where-clauses-unsatisfied.stderr b/tests/ui/where-clauses/where-clauses-unsatisfied.stderr
index b1805a452..b1805a452 100644
--- a/src/test/ui/where-clauses/where-clauses-unsatisfied.stderr
+++ b/tests/ui/where-clauses/where-clauses-unsatisfied.stderr
diff --git a/src/test/ui/where-clauses/where-clauses.rs b/tests/ui/where-clauses/where-clauses.rs
index 905ef7c5e..905ef7c5e 100644
--- a/src/test/ui/where-clauses/where-clauses.rs
+++ b/tests/ui/where-clauses/where-clauses.rs
diff --git a/src/test/ui/where-clauses/where-equality-constraints.rs b/tests/ui/where-clauses/where-equality-constraints.rs
index 8828f09d9..8828f09d9 100644
--- a/src/test/ui/where-clauses/where-equality-constraints.rs
+++ b/tests/ui/where-clauses/where-equality-constraints.rs
diff --git a/src/test/ui/where-clauses/where-equality-constraints.stderr b/tests/ui/where-clauses/where-equality-constraints.stderr
index 9d8fac02e..9d8fac02e 100644
--- a/src/test/ui/where-clauses/where-equality-constraints.stderr
+++ b/tests/ui/where-clauses/where-equality-constraints.stderr
diff --git a/src/test/ui/where-clauses/where-for-self-2.rs b/tests/ui/where-clauses/where-for-self-2.rs
index 37c6954fd..37c6954fd 100644
--- a/src/test/ui/where-clauses/where-for-self-2.rs
+++ b/tests/ui/where-clauses/where-for-self-2.rs
diff --git a/src/test/ui/where-clauses/where-for-self-2.stderr b/tests/ui/where-clauses/where-for-self-2.stderr
index f65db78fc..f65db78fc 100644
--- a/src/test/ui/where-clauses/where-for-self-2.stderr
+++ b/tests/ui/where-clauses/where-for-self-2.stderr
diff --git a/src/test/ui/where-clauses/where-for-self.rs b/tests/ui/where-clauses/where-for-self.rs
index 9380e72cd..9380e72cd 100644
--- a/src/test/ui/where-clauses/where-for-self.rs
+++ b/tests/ui/where-clauses/where-for-self.rs
diff --git a/src/test/ui/where-clauses/where-for-self.stderr b/tests/ui/where-clauses/where-for-self.stderr
index d06afc1e4..d06afc1e4 100644
--- a/src/test/ui/where-clauses/where-for-self.stderr
+++ b/tests/ui/where-clauses/where-for-self.stderr
diff --git a/src/test/ui/where-clauses/where-lifetime-resolution.rs b/tests/ui/where-clauses/where-lifetime-resolution.rs
index d8677ee95..d8677ee95 100644
--- a/src/test/ui/where-clauses/where-lifetime-resolution.rs
+++ b/tests/ui/where-clauses/where-lifetime-resolution.rs
diff --git a/src/test/ui/where-clauses/where-lifetime-resolution.stderr b/tests/ui/where-clauses/where-lifetime-resolution.stderr
index e8df02fba..e8df02fba 100644
--- a/src/test/ui/where-clauses/where-lifetime-resolution.stderr
+++ b/tests/ui/where-clauses/where-lifetime-resolution.stderr
diff --git a/src/test/ui/while-type-error.rs b/tests/ui/while-type-error.rs
index 8098bfcd8..8098bfcd8 100644
--- a/src/test/ui/while-type-error.rs
+++ b/tests/ui/while-type-error.rs
diff --git a/src/test/ui/while-type-error.stderr b/tests/ui/while-type-error.stderr
index 529cbff05..529cbff05 100644
--- a/src/test/ui/while-type-error.stderr
+++ b/tests/ui/while-type-error.stderr
diff --git a/src/test/ui/windows-subsystem-invalid.rs b/tests/ui/windows-subsystem-invalid.rs
index 0336678b7..0336678b7 100644
--- a/src/test/ui/windows-subsystem-invalid.rs
+++ b/tests/ui/windows-subsystem-invalid.rs
diff --git a/src/test/ui/windows-subsystem-invalid.stderr b/tests/ui/windows-subsystem-invalid.stderr
index 0cb843cf0..0cb843cf0 100644
--- a/src/test/ui/windows-subsystem-invalid.stderr
+++ b/tests/ui/windows-subsystem-invalid.stderr
diff --git a/src/test/ui/write-fmt-errors.rs b/tests/ui/write-fmt-errors.rs
index 3fcaefaa6..3fcaefaa6 100644
--- a/src/test/ui/write-fmt-errors.rs
+++ b/tests/ui/write-fmt-errors.rs
diff --git a/src/test/ui/writing-to-immutable-vec.rs b/tests/ui/writing-to-immutable-vec.rs
index dbcc3f0bb..dbcc3f0bb 100644
--- a/src/test/ui/writing-to-immutable-vec.rs
+++ b/tests/ui/writing-to-immutable-vec.rs
diff --git a/tests/ui/writing-to-immutable-vec.stderr b/tests/ui/writing-to-immutable-vec.stderr
new file mode 100644
index 000000000..286267c38
--- /dev/null
+++ b/tests/ui/writing-to-immutable-vec.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `v` as mutable, as it is not declared as mutable
+  --> $DIR/writing-to-immutable-vec.rs:3:5
+   |
+LL |     v[1] = 4;
+   |     ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut v: Vec<isize> = vec![1, 2, 3];
+   |         +++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/wrong-hashset-issue-42918.rs b/tests/ui/wrong-hashset-issue-42918.rs
index ef834d915..ef834d915 100644
--- a/src/test/ui/wrong-hashset-issue-42918.rs
+++ b/tests/ui/wrong-hashset-issue-42918.rs
diff --git a/src/test/ui/wrong-mul-method-signature.rs b/tests/ui/wrong-mul-method-signature.rs
index 1c2f86559..1c2f86559 100644
--- a/src/test/ui/wrong-mul-method-signature.rs
+++ b/tests/ui/wrong-mul-method-signature.rs
diff --git a/src/test/ui/wrong-mul-method-signature.stderr b/tests/ui/wrong-mul-method-signature.stderr
index 9f8896f01..504a6032b 100644
--- a/src/test/ui/wrong-mul-method-signature.stderr
+++ b/tests/ui/wrong-mul-method-signature.stderr
@@ -7,8 +7,8 @@ LL |     fn mul(self, s: &f64) -> Vec1 {
    |                     expected `f64`, found `&f64`
    |                     help: change the parameter type to match the trait: `f64`
    |
-   = note: expected fn pointer `fn(Vec1, f64) -> Vec1`
-              found fn pointer `fn(Vec1, &f64) -> Vec1`
+   = note: expected signature `fn(Vec1, f64) -> Vec1`
+              found signature `fn(Vec1, &f64) -> Vec1`
 
 error[E0053]: method `mul` has an incompatible type for trait
   --> $DIR/wrong-mul-method-signature.rs:33:21
@@ -19,8 +19,8 @@ LL |     fn mul(self, s: f64) -> Vec2 {
    |                     expected struct `Vec2`, found `f64`
    |                     help: change the parameter type to match the trait: `Vec2`
    |
-   = note: expected fn pointer `fn(Vec2, Vec2) -> f64`
-              found fn pointer `fn(Vec2, f64) -> Vec2`
+   = note: expected signature `fn(Vec2, Vec2) -> f64`
+              found signature `fn(Vec2, f64) -> Vec2`
 
 error[E0053]: method `mul` has an incompatible type for trait
   --> $DIR/wrong-mul-method-signature.rs:52:29
@@ -31,14 +31,16 @@ LL |     fn mul(self, s: f64) -> f64 {
    |                             expected `i32`, found `f64`
    |                             help: change the output type to match the trait: `i32`
    |
-   = note: expected fn pointer `fn(Vec3, _) -> i32`
-              found fn pointer `fn(Vec3, _) -> f64`
+   = note: expected signature `fn(Vec3, _) -> i32`
+              found signature `fn(Vec3, _) -> f64`
 
 error[E0308]: mismatched types
   --> $DIR/wrong-mul-method-signature.rs:63:45
    |
 LL |     let x: Vec2 = Vec2 { x: 1.0, y: 2.0 } * 2.0; // trait had reversed order
-   |                                             ^^^ expected struct `Vec2`, found floating-point number
+   |                   -----------------------   ^^^ expected struct `Vec2`, found floating-point number
+   |                   |
+   |                   expected because this is `Vec2`
 
 error[E0308]: mismatched types
   --> $DIR/wrong-mul-method-signature.rs:63:19
diff --git a/src/test/ui/wrong-ret-type.rs b/tests/ui/wrong-ret-type.rs
index cbff8dbae..cbff8dbae 100644
--- a/src/test/ui/wrong-ret-type.rs
+++ b/tests/ui/wrong-ret-type.rs
diff --git a/src/test/ui/wrong-ret-type.stderr b/tests/ui/wrong-ret-type.stderr
index c686a0b2f..c686a0b2f 100644
--- a/src/test/ui/wrong-ret-type.stderr
+++ b/tests/ui/wrong-ret-type.stderr
diff --git a/src/test/ui/xc-private-method.rs b/tests/ui/xc-private-method.rs
index f05994646..f05994646 100644
--- a/src/test/ui/xc-private-method.rs
+++ b/tests/ui/xc-private-method.rs
diff --git a/src/test/ui/xc-private-method.stderr b/tests/ui/xc-private-method.stderr
index 0eabc592a..0eabc592a 100644
--- a/src/test/ui/xc-private-method.stderr
+++ b/tests/ui/xc-private-method.stderr
diff --git a/src/test/ui/xc-private-method2.rs b/tests/ui/xc-private-method2.rs
index 92946923f..92946923f 100644
--- a/src/test/ui/xc-private-method2.rs
+++ b/tests/ui/xc-private-method2.rs
diff --git a/src/test/ui/xc-private-method2.stderr b/tests/ui/xc-private-method2.stderr
index b569882f8..b569882f8 100644
--- a/src/test/ui/xc-private-method2.stderr
+++ b/tests/ui/xc-private-method2.stderr
diff --git a/src/test/ui/xcrate/auxiliary/static_priv_by_default.rs b/tests/ui/xcrate/auxiliary/static_priv_by_default.rs
index 39f912066..39f912066 100644
--- a/src/test/ui/xcrate/auxiliary/static_priv_by_default.rs
+++ b/tests/ui/xcrate/auxiliary/static_priv_by_default.rs
diff --git a/src/test/ui/xcrate/auxiliary/xcrate_unit_struct.rs b/tests/ui/xcrate/auxiliary/xcrate_unit_struct.rs
index 69ed498e7..69ed498e7 100644
--- a/src/test/ui/xcrate/auxiliary/xcrate_unit_struct.rs
+++ b/tests/ui/xcrate/auxiliary/xcrate_unit_struct.rs
diff --git a/src/test/ui/xcrate/xcrate-private-by-default.rs b/tests/ui/xcrate/xcrate-private-by-default.rs
index 299cff54f..299cff54f 100644
--- a/src/test/ui/xcrate/xcrate-private-by-default.rs
+++ b/tests/ui/xcrate/xcrate-private-by-default.rs
diff --git a/src/test/ui/xcrate/xcrate-private-by-default.stderr b/tests/ui/xcrate/xcrate-private-by-default.stderr
index 0bdd4002f..0bdd4002f 100644
--- a/src/test/ui/xcrate/xcrate-private-by-default.stderr
+++ b/tests/ui/xcrate/xcrate-private-by-default.stderr
diff --git a/src/test/ui/xcrate/xcrate-unit-struct-2.rs b/tests/ui/xcrate/xcrate-unit-struct-2.rs
index 7aa3eb0d6..7aa3eb0d6 100644
--- a/src/test/ui/xcrate/xcrate-unit-struct-2.rs
+++ b/tests/ui/xcrate/xcrate-unit-struct-2.rs
diff --git a/src/test/ui/xcrate/xcrate-unit-struct.rs b/tests/ui/xcrate/xcrate-unit-struct.rs
index c99cf77ce..c99cf77ce 100644
--- a/src/test/ui/xcrate/xcrate-unit-struct.rs
+++ b/tests/ui/xcrate/xcrate-unit-struct.rs
diff --git a/src/test/ui/xcrate/xcrate-unit-struct.stderr b/tests/ui/xcrate/xcrate-unit-struct.stderr
index cee314568..cee314568 100644
--- a/src/test/ui/xcrate/xcrate-unit-struct.stderr
+++ b/tests/ui/xcrate/xcrate-unit-struct.stderr
diff --git a/src/test/ui/zero-sized/zero-size-type-destructors.rs b/tests/ui/zero-sized/zero-size-type-destructors.rs
index fb87d8ea0..fb87d8ea0 100644
--- a/src/test/ui/zero-sized/zero-size-type-destructors.rs
+++ b/tests/ui/zero-sized/zero-size-type-destructors.rs
diff --git a/src/test/ui/zero-sized/zero-sized-binary-heap-push.rs b/tests/ui/zero-sized/zero-sized-binary-heap-push.rs
index 6553c5adb..6553c5adb 100644
--- a/src/test/ui/zero-sized/zero-sized-binary-heap-push.rs
+++ b/tests/ui/zero-sized/zero-sized-binary-heap-push.rs
diff --git a/src/test/ui/zero-sized/zero-sized-btreemap-insert.rs b/tests/ui/zero-sized/zero-sized-btreemap-insert.rs
index 52edb33d6..52edb33d6 100644
--- a/src/test/ui/zero-sized/zero-sized-btreemap-insert.rs
+++ b/tests/ui/zero-sized/zero-sized-btreemap-insert.rs
diff --git a/src/test/ui/zero-sized/zero-sized-linkedlist-push.rs b/tests/ui/zero-sized/zero-sized-linkedlist-push.rs
index 03724085f..03724085f 100644
--- a/src/test/ui/zero-sized/zero-sized-linkedlist-push.rs
+++ b/tests/ui/zero-sized/zero-sized-linkedlist-push.rs
diff --git a/src/test/ui/zero-sized/zero-sized-tuple-struct.rs b/tests/ui/zero-sized/zero-sized-tuple-struct.rs
index 2208590f7..2208590f7 100644
--- a/src/test/ui/zero-sized/zero-sized-tuple-struct.rs
+++ b/tests/ui/zero-sized/zero-sized-tuple-struct.rs